From e932840bdd1e511f6b6849166757d216863196c3 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 22 Apr 2019 00:29:57 +0300
Subject: [PATCH 001/383] jingle-s5b progress

---
 src/xmpp/xmpp-im/jingle-s5b.cpp | 133 ++++++++++++++++++++++----------
 1 file changed, 94 insertions(+), 39 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index c895022d..73347990 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -221,7 +221,7 @@ class Transport::Private : public QSharedData {
     bool signalNegotiated = false;
     bool remoteReportedCandidateError = false;
     bool localReportedCandidateError = false;
-    bool proxyDiscoveryInProgress = false;
+    bool proxyDiscoveryInProgress = false; // if we have valid proxy requests
     quint16 pendingActions;
     int proxiesInDiscoCount = 0;
     quint32 minimalPriority = 0;
@@ -229,8 +229,8 @@ class Transport::Private : public QSharedData {
     QMap<QString,Candidate> localCandidates; // cid to candidate mapping
     QMap<QString,Candidate> remoteCandidates;
     QSet<QPair<QString,Origin>> signalingCandidates; // origin here is session role. so for remote it's != session->role
-    Candidate localUsedCandidate; // we received "candidate-used" for this candidate
-    Candidate remoteUsedCandidate;
+    Candidate localUsedCandidate; // we received "candidate-used" for this candidate from localCandidates list
+    Candidate remoteUsedCandidate; // we sent "candidate-used" for this candidate from remoteCandidates list
     QString dstaddr;
     QString sid;
     Transport::Mode mode = Transport::Tcp;
@@ -333,6 +333,48 @@ class Transport::Private : public QSharedData {
         }
         // TODO start connecting to the candidate here
     }
+
+    bool hasUnaknowledgedLocalCandidates() const
+    {
+        // now ensure all local were sent to remote and no hope left
+        if (proxyDiscoveryInProgress) {
+            return true;
+        }
+        // Note: When upnp support is added we have one more check here
+
+        // now local candidates
+        for (const auto &c: localCandidates) {
+            auto s = c.state();
+            if (s == Candidate::Probing || s == Candidate::New || s == Candidate::Unacked) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    void checkAndSendLocalCandidatesExhausted()
+    {
+        // so the situation: we discarded all remote candidates (failed to connect)
+        // but we have some local candidates which are still in Probing state (upnp for example)
+        // if we send candidate-error while we have unsent candidates this may trigger transport failure.
+        // So for candidate-error two conditions have to be met 1) all remote failed 2) all local were sent no more
+        // local candidates are expected to be discovered
+        for (const auto &c: remoteCandidates) {
+            if (c.state() != Candidate::Discarded) {
+                // we have other cadidates to handle. so we don't need candidate-error to be sent to remote yet
+                return;
+            }
+        }
+        if (hasUnaknowledgedLocalCandidates()) {
+            return;
+        }
+
+        // so no pending local candidates discovery and all discovered candidates were already sent to remote.
+        // since all remote candidates are failed as well, we can't do anything here. time to accept the failure.
+        pendingActions |= Private::CandidateError;
+        emit q->updated();
+    }
 };
 
 Transport::Transport(const TransportManagerPad::Ptr &pad) :
@@ -408,9 +450,8 @@ void Transport::prepare()
                              ServerInfoManager::SQ_CheckAllOnNoMatch,
                              [this](const QList<DiscoItem> &items)
     {
-        if (d->minimalPriority >= (Candidate::TunnelPreference << 16)) {
+        if (!d->proxyDiscoveryInProgress) { // check if new results are ever/still expected
             // seems like we have successful connection via higher priority channel. so nobody cares about proxy
-            d->proxyDiscoveryInProgress = false;
             return;
         }
         auto m = static_cast<Manager*>(d->pad->manager());
@@ -421,15 +462,23 @@ void Transport::prepare()
             d->proxiesInDiscoCount++;
             auto query = new JT_S5B(d->pad->session()->manager()->client()->rootTask());
             connect(query, &JT_S5B::finished, this, [this,query,cid](){
+                if (!d->proxyDiscoveryInProgress) {
+                    return;
+                }
                 bool candidateUpdated = false;
-                if (query->success()) {
-                    auto sh = query->proxyInfo();
-                    auto c = d->localCandidates.value(cid);
-                    if (c && c.state() == Candidate::Probing) { // it can discarded by this moment. so we have to check.
+                auto c = d->localCandidates.value(cid);
+                if (c && c.state() == Candidate::Probing) {
+                    if (query->success()) {
+                        auto sh = query->proxyInfo();
+                        // it can be discarded by this moment (e.g. got success on a higher priority candidate).
+                        // so we have to check.
                         c.setHost(sh.host());
                         c.setPort(sh.port());
                         c.setState(Candidate::New);
                         candidateUpdated = true;
+                        d->pendingActions |= Private::NewCandidate;
+                    } else {
+                        c.setState(Candidate::Discarded);
                     }
                 }
                 d->proxiesInDiscoCount--;
@@ -437,8 +486,10 @@ void Transport::prepare()
                     d->proxyDiscoveryInProgress = false;
                 }
                 if (candidateUpdated) {
-                    d->pendingActions |= Private::NewCandidate;
                     emit updated();
+                } else if (!d->proxiesInDiscoCount) {
+                    // it's possible it was our last hope and probaby we have to send candidate-error now.
+                    d->checkAndSendLocalCandidatesExhausted();
                 }
             });
             query->requestProxyInfo(j);
@@ -464,26 +515,7 @@ void Transport::prepare()
         } else if (items.count() == 0) {
             // seems like we don't have any proxy
             d->proxyDiscoveryInProgress = false;
-            // but it's possible it was our last hope and probaby we have to send candidate-error now.
-            // so the situation: we discarded all remote candidates (failed to connect)
-            // and all our candidates were already sent to remote
-            // if we send candidate-error while we have unsent candidates this may trigger transport failure.
-            // So for candidate-error two conditions have to be met 1) all remote failed 2) all local were sent no more
-            // local candidates are expected to be discovered
-            for (const auto &c: d->remoteCandidates) {
-                if (c.state() != Candidate::Discarded) {
-                    // we have other cadidates to handle. so we don't need candidate-error to be sent to remote yet
-                    return;
-                }
-            }
-            // now ensure all local were sent to remote and no hope left
-            for (const auto &c: d->localCandidates) {
-                auto s = c.state();
-                if (s == Candidate::Probing || s == Candidate::New) {
-                    return;
-                }
-            }
-            d->pendingActions |= Private::CandidateError;
+            d->checkAndSendLocalCandidatesExhausted();
         }
     });
 
@@ -502,8 +534,10 @@ void Transport::start()
 
 bool Transport::update(const QDomElement &transportEl)
 {
+    // we can just on type of elements in transport-info
+    // so return as soon as any type handled. Though it leaves a room for  remote to send invalid transport-info
     QString contentTag(QStringLiteral("candidate"));
-    bool candidatesAdded = false;;
+    int candidatesAdded = 0;
     for(QDomElement ce = transportEl.firstChildElement(contentTag);
         !ce.isNull(); ce = ce.nextSiblingElement(contentTag)) {
         Candidate c(ce);
@@ -511,7 +545,7 @@ bool Transport::update(const QDomElement &transportEl)
             return false;
         }
         d->remoteCandidates.insert(c.cid(), c); // TODO check for collisions!
-        candidatesAdded = true;
+        candidatesAdded++;
     }
     if (candidatesAdded) {
         d->localReportedCandidateError = false;
@@ -529,37 +563,58 @@ bool Transport::update(const QDomElement &transportEl)
         }
         cUsed.setState(Candidate::Accepted);
         d->localUsedCandidate = cUsed;
-        cUsed.setState(Candidate::Accepted);
+        for (auto &c: d->localCandidates) {
+            if (c.priority() < cUsed.priority() && c.state() != Candidate::Discarded) {
+                c.setState(Candidate::Discarded);
+            }
+        }
+        quint32 prio = cUsed.priority() >> 16;
+        if (d->proxyDiscoveryInProgress && prio > Candidate::ProxyPreference) {
+            // all proxies do no make sense anymore. we have successful higher priority candidate
+            d->proxyDiscoveryInProgress = false;
+        }
+        // TODO check upnp too when implemented
+        d->checkAndSendLocalCandidatesExhausted();
+        // TODO here we can emit connected() if did send candidate-error or candidate-used before
         QTimer::singleShot(0, this, [this](){ d->updateSelfState(); });
+        return true;
     }
 
     el = transportEl.firstChildElement(QStringLiteral("candidate-error"));
     if (!el.isNull()) {
         d->remoteReportedCandidateError = true;
-        QTimer::singleShot(0, this, [this](){ d->updateSelfState(); });
+        for (auto &c: d->localCandidates) {
+            if (c.state() == Candidate::Pending) {
+                c.setState(Candidate::Discarded);
+            }
+        }
+        d->checkAndSendLocalCandidatesExhausted();
+        return true;
     }
 
     el = transportEl.firstChildElement(QStringLiteral("activated"));
     if (!el.isNull()) {
         auto c = d->localCandidates.value(el.attribute(QStringLiteral("cid")));
-        if (!c) {
+        if (!(c && c.type() == Candidate::Proxy && c.state() == Candidate::Accepted && c == d->localUsedCandidate)) {
             return false;
         }
         c.setState(Candidate::Active);
-        QTimer::singleShot(0, this, [this](){ d->updateSelfState(); });
+        QTimer::singleShot(0, this, [this](){ emit connected(); });
+        return true;
     }
 
     el = transportEl.firstChildElement(QStringLiteral("proxy-error"));
     if (!el.isNull()) {
         auto c = d->localCandidates.value(el.attribute(QStringLiteral("cid")));
-        if (!c) {
+        if (!c || c.state() != Candidate::Accepted) {
             return false;
         }
         c.setState(Candidate::Discarded);
-        QTimer::singleShot(0, this, [this](){ d->updateSelfState(); });
+        d->checkAndSendLocalCandidatesExhausted();
+        return true;
     }
 
-    return true;
+    return false;
 }
 
 Action Transport::outgoingUpdateType() const

From 0c123ab22c20e0513475a0839878e9f7f60a5e1b Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 22 Apr 2019 07:54:40 +0300
Subject: [PATCH 002/383] jingle-s5b: updte minimal priority in separate
 function

---
 src/xmpp/xmpp-im/jingle-s5b.cpp | 38 ++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 73347990..3ad35d2e 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -375,6 +375,33 @@ class Transport::Private : public QSharedData {
         pendingActions |= Private::CandidateError;
         emit q->updated();
     }
+
+    void updateMinimalPriority() {
+        quint32 prio = 0;
+        if (localUsedCandidate && minimalPriority < localUsedCandidate.priority() && localUsedCandidate.state() != Candidate::Discarded) {
+            prio = localUsedCandidate.priority();
+        } else if (remoteUsedCandidate && minimalPriority < remoteUsedCandidate.priority() && remoteUsedCandidate.state() != Candidate::Discarded) {
+            prio = remoteUsedCandidate.priority();
+        }
+        if (prio < minimalPriority) {
+            return;
+        }
+        for (auto &c: localCandidates) {
+            if (c.priority() < prio && c.state() != Candidate::Discarded) {
+                c.setState(Candidate::Discarded);
+            }
+        }
+        for (auto &c: remoteCandidates) {
+            if (c.priority() < prio && c.state() != Candidate::Discarded) {
+                c.setState(Candidate::Discarded);
+            }
+        }
+        prio >>= 16;
+        if (proxyDiscoveryInProgress && prio > Candidate::ProxyPreference) {
+            // all proxies do no make sense anymore. we have successful higher priority candidate
+            proxyDiscoveryInProgress = false;
+        }
+    }
 };
 
 Transport::Transport(const TransportManagerPad::Ptr &pad) :
@@ -563,16 +590,7 @@ bool Transport::update(const QDomElement &transportEl)
         }
         cUsed.setState(Candidate::Accepted);
         d->localUsedCandidate = cUsed;
-        for (auto &c: d->localCandidates) {
-            if (c.priority() < cUsed.priority() && c.state() != Candidate::Discarded) {
-                c.setState(Candidate::Discarded);
-            }
-        }
-        quint32 prio = cUsed.priority() >> 16;
-        if (d->proxyDiscoveryInProgress && prio > Candidate::ProxyPreference) {
-            // all proxies do no make sense anymore. we have successful higher priority candidate
-            d->proxyDiscoveryInProgress = false;
-        }
+        d->updateMinimalPriority();
         // TODO check upnp too when implemented
         d->checkAndSendLocalCandidatesExhausted();
         // TODO here we can emit connected() if did send candidate-error or candidate-used before

From d558c745410355cd042e225f6a7a07c52c5d274f Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <Sergey.Ilinykh@xa.epicgames.com>
Date: Mon, 22 Apr 2019 10:54:38 +0300
Subject: [PATCH 003/383] jingle-s5b: more states magic

---
 src/xmpp/xmpp-im/jingle-s5b.cpp | 47 +++++++++++++++++++++++++++++----
 1 file changed, 42 insertions(+), 5 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 3ad35d2e..f01ef3b5 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -313,6 +313,8 @@ class Transport::Private : public QSharedData {
         // seems like we don't have better candidates,
         // so we are going to use the d->localUsedCandidate
         signalNegotiated = true;
+
+        // TODO emit connected() if ready
     }
 
     void tryConnectToRemoteCandidate()
@@ -360,6 +362,12 @@ class Transport::Private : public QSharedData {
         // if we send candidate-error while we have unsent candidates this may trigger transport failure.
         // So for candidate-error two conditions have to be met 1) all remote failed 2) all local were sent no more
         // local candidates are expected to be discovered
+
+        // if we already sent candidate-error or candidate-used then just silently exit
+        if (remoteUsedCandidate || localReportedCandidateError || (pendingActions & Private::CandidateError)) {
+            return;
+        }
+
         for (const auto &c: remoteCandidates) {
             if (c.state() != Candidate::Discarded) {
                 // we have other cadidates to handle. so we don't need candidate-error to be sent to remote yet
@@ -401,6 +409,13 @@ class Transport::Private : public QSharedData {
             // all proxies do no make sense anymore. we have successful higher priority candidate
             proxyDiscoveryInProgress = false;
         }
+        // if we discarded "used" candidates then reset them to invalid
+        if (localUsedCandidate && localUsedCandidate.state() == Candidate::Discarded) {
+            localUsedCandidate = Candidate();
+        }
+        if (remoteUsedCandidate && remoteUsedCandidate.state() == Candidate::Discarded) {
+            remoteUsedCandidate = Candidate();
+        }
     }
 };
 
@@ -593,7 +608,6 @@ bool Transport::update(const QDomElement &transportEl)
         d->updateMinimalPriority();
         // TODO check upnp too when implemented
         d->checkAndSendLocalCandidatesExhausted();
-        // TODO here we can emit connected() if did send candidate-error or candidate-used before
         QTimer::singleShot(0, this, [this](){ d->updateSelfState(); });
         return true;
     }
@@ -607,15 +621,20 @@ bool Transport::update(const QDomElement &transportEl)
             }
         }
         d->checkAndSendLocalCandidatesExhausted();
+        QTimer::singleShot(0, this, [this](){ d->updateSelfState(); });
         return true;
     }
 
     el = transportEl.firstChildElement(QStringLiteral("activated"));
     if (!el.isNull()) {
         auto c = d->localCandidates.value(el.attribute(QStringLiteral("cid")));
-        if (!(c && c.type() == Candidate::Proxy && c.state() == Candidate::Accepted && c == d->localUsedCandidate)) {
+        if (!c) {
             return false;
         }
+        if (!(c.type() == Candidate::Proxy && c.state() == Candidate::Accepted && c == d->localUsedCandidate)) {
+            qDebug("Received <activated> on a candidate in an inappropriate state. Ignored.");
+            return true;
+        }
         c.setState(Candidate::Active);
         QTimer::singleShot(0, this, [this](){ emit connected(); });
         return true;
@@ -624,11 +643,29 @@ bool Transport::update(const QDomElement &transportEl)
     el = transportEl.firstChildElement(QStringLiteral("proxy-error"));
     if (!el.isNull()) {
         auto c = d->localCandidates.value(el.attribute(QStringLiteral("cid")));
-        if (!c || c.state() != Candidate::Accepted) {
+        if (!c) {
             return false;
         }
-        c.setState(Candidate::Discarded);
-        d->checkAndSendLocalCandidatesExhausted();
+        if (c != d->localUsedCandidate || c.state() != Candidate::Accepted) {
+            qDebug("Received <proxy-error> on a candidate in an inappropriate state. Ignored.");
+            return true;
+        }
+
+        // if we got proxy-error then the transport has to be considered failed according to spec
+        // so never send proxy-error while we have unaknowledged local non-proxy candidates,
+        // but we have to follow the standard.
+
+        // Discard everything
+        for (auto &c: d->localCandidates) {
+            c.setState(Candidate::Discarded);
+        }
+        for (auto &c: d->remoteCandidates) {
+            c.setState(Candidate::Discarded);
+        }
+        d->proxyDiscoveryInProgress = false;
+        // TODO do the same for upnp when implemented
+
+        QTimer::singleShot(0, this, [this](){ emit failed(); });
         return true;
     }
 

From 2f895d8596f52ce764682a4f7980cdc320f97b98 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 28 Apr 2019 00:10:15 +0300
Subject: [PATCH 004/383] jingle-s5b: check connection negotiation complete

---
 src/xmpp/xmpp-im/jingle-s5b.cpp | 177 +++++++++++++++++++-------------
 src/xmpp/xmpp-im/jingle-s5b.h   |   1 +
 2 files changed, 108 insertions(+), 70 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index f01ef3b5..619fc4cb 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -1,4 +1,4 @@
-/*
+/*
  * jignle-s5b.cpp - Jingle SOCKS5 transport
  * Copyright (C) 2019  Sergey Ilinykh
  *
@@ -87,6 +87,12 @@ Candidate::Candidate(const QDomElement &el)
         return;
     }
 
+    if ((candidateType == Proxy && !jid.isValid()) ||
+            (candidateType != Proxy && (host.isEmpty() || !port)))
+    {
+        return;
+    }
+
     auto d = new Private;
     d->cid = cid;
     d->host = host;
@@ -205,20 +211,26 @@ QDomElement Candidate::toXml(QDomDocument *doc) const
     return e;
 }
 
+void Candidate::connectToHost(std::function<void(bool)> callback)
+{
+    // TODO negotiate socks5 connection to host and port
+    Q_UNUSED(callback)
+}
+
 class Transport::Private : public QSharedData {
 public:
     enum PendingActions {
-        NewCandidate,
-        CandidateUsed,
-        CandidateError,
-        Activated,
-        ProxyError
+        NewCandidate    = 1,
+        CandidateUsed   = 2,
+        CandidateError  = 4,
+        Activated       = 8,
+        ProxyError      = 16
     };
 
     Transport *q = NULL;
     Pad::Ptr pad;
+    bool waitingAck = true;
     bool aborted = false;
-    bool signalNegotiated = false;
     bool remoteReportedCandidateError = false;
     bool localReportedCandidateError = false;
     bool proxyDiscoveryInProgress = false; // if we have valid proxy requests
@@ -273,50 +285,6 @@ class Transport::Private : public QSharedData {
         return false;
     }
 
-    void updateSelfState()
-    {
-        // TODO code below is from handler of "candidate-used". it has to be updated
-        bool hasMoreCandidates = false;
-        for (auto &c: localCandidates) {
-            auto s = c.state();
-            if (s < Candidate::Pending && c.priority() > localUsedCandidate.priority()) {
-                hasMoreCandidates = true;
-                continue; // we have more high priority candidates to be handled by remote
-            }
-            c.setState(Candidate::Discarded);
-        }
-
-        if (hasMoreCandidates) {
-            return;
-        }
-
-        // let's check remote candidates too before we decide to use this local candidate
-        for (auto &c: remoteCandidates) {
-            auto s = c.state();
-            if (c.priority() > localUsedCandidate.priority() && (s == Candidate::Pending ||
-                                                    s == Candidate::Probing ||
-                                                    s == Candidate::New)) {
-                hasMoreCandidates = true;
-                continue; // we have more high priority candidates to be handled by remote
-            } else if (c.priority() == localUsedCandidate.priority() && s == Candidate::Unacked &&
-                       pad->session()->role() == Origin::Initiator) {
-                hasMoreCandidates = true;
-                continue; // see 2.4 Completing the Negotiation (p.4)
-            }
-            c.setState(Candidate::Discarded); // TODO stop any probing as well
-        }
-
-        if (hasMoreCandidates) {
-            return;
-        }
-
-        // seems like we don't have better candidates,
-        // so we are going to use the d->localUsedCandidate
-        signalNegotiated = true;
-
-        // TODO emit connected() if ready
-    }
-
     void tryConnectToRemoteCandidate()
     {
         if (application->state() != State::Connecting) {
@@ -355,35 +323,96 @@ class Transport::Private : public QSharedData {
         return false;
     }
 
-    void checkAndSendLocalCandidatesExhausted()
+    void checkAndFinishNegotiation()
     {
+        // Why we can't send candidate-used/error right when this happens:
         // so the situation: we discarded all remote candidates (failed to connect)
         // but we have some local candidates which are still in Probing state (upnp for example)
         // if we send candidate-error while we have unsent candidates this may trigger transport failure.
         // So for candidate-error two conditions have to be met 1) all remote failed 2) all local were sent no more
         // local candidates are expected to be discovered
 
-        // if we already sent candidate-error or candidate-used then just silently exit
-        if (remoteUsedCandidate || localReportedCandidateError || (pendingActions & Private::CandidateError)) {
+        if (application->state() != State::Connecting) {
+            return; // we can't finish anything in this state. Only Connecting is acceptable
+        }
+
+        // sort out already handled states or states which will bring us here a little later
+        if (waitingAck || pendingActions || hasUnaknowledgedLocalCandidates())
+        {
+            // waitingAck some query waits for ack and in the callback this func will be called again
+            // pendingActions means we reported to app we have data to send but the app didn't take this data yet,
+            // but as soon as it's taken it will switch to waitingAck.
+            // And with unacknowledged local candidates we can't send used/error as well as report connected()/failure()
+            // until tried them all
             return;
         }
 
+        // if we already sent used/error. In other words if we already have finished local part of negotiation
+        if (localReportedCandidateError || remoteUsedCandidate) {
+            // maybe it's time to report connected()/failure()
+            if (remoteReportedCandidateError || localUsedCandidate) {
+                // so remote seems to be finished too.
+                // tell application about it and it has to change its state immediatelly
+                if (localUsedCandidate || remoteUsedCandidate) {
+                    auto c = localUsedCandidate? localUsedCandidate : remoteUsedCandidate;
+                    if (c.type() == Candidate::Proxy) {
+                        // If it's proxy, first it has to be activated
+                        if (localUsedCandidate) {
+                            // it's our side who proposed proxy. so we have to connect to it and activate
+                            c.connectToHost([this](bool success){
+                                if (success) {
+                                    pendingActions |= Private::Activated;
+                                } else {
+                                    pendingActions |= Private::ProxyError;
+                                }
+                                emit q->updated();
+                            });
+                        } else {
+                            return; // let's just wait for <activated> from remote
+                        }
+                    } else {
+                        c.setState(Candidate::Active);
+                        emit q->connected();
+                    }
+                } else {
+                    emit q->failed();
+                }
+            } // else we have to wait till remote reports its status
+            return;
+        }
+
+        // if we are here then neither candidate-used nor candidate-error was sent to remote,
+        // but we can send it now.
+        // first let's check if we can send candidate-used
+        bool allRemoteDiscarded = true;
+        bool hasConnectedRemoteCandidate = false;
         for (const auto &c: remoteCandidates) {
-            if (c.state() != Candidate::Discarded) {
-                // we have other cadidates to handle. so we don't need candidate-error to be sent to remote yet
-                return;
+            auto s = c.state();
+            if (s != Candidate::Discarded) {
+                allRemoteDiscarded = false;
+            }
+            if (s == Candidate::Pending) { // connected but not yet sent
+                hasConnectedRemoteCandidate = true;
             }
         }
-        if (hasUnaknowledgedLocalCandidates()) {
+
+        // if we have connection to remote candidate it's time to send it
+        if (hasConnectedRemoteCandidate) {
+            pendingActions |= Private::CandidateUsed;
+            emit q->updated();
             return;
         }
 
-        // so no pending local candidates discovery and all discovered candidates were already sent to remote.
-        // since all remote candidates are failed as well, we can't do anything here. time to accept the failure.
-        pendingActions |= Private::CandidateError;
-        emit q->updated();
+        if (allRemoteDiscarded) {
+            pendingActions |= Private::CandidateError;
+            emit q->updated();
+            return;
+        }
+
+        // apparently we haven't connected anywhere but there are more remote candidates to try
     }
 
+    // take used-candidate with highest priority and discard all with lower. also update used candidates themselves
     void updateMinimalPriority() {
         quint32 prio = 0;
         if (localUsedCandidate && minimalPriority < localUsedCandidate.priority() && localUsedCandidate.state() != Candidate::Discarded) {
@@ -416,6 +445,16 @@ class Transport::Private : public QSharedData {
         if (remoteUsedCandidate && remoteUsedCandidate.state() == Candidate::Discarded) {
             remoteUsedCandidate = Candidate();
         }
+        if (localUsedCandidate && remoteUsedCandidate) {
+            if (application->creator() == pad->session()->role()) {
+                // i'm initiator. see 2.4.4
+                localUsedCandidate.setState(Candidate::Discarded);
+                localUsedCandidate = Candidate();
+            } else {
+                remoteUsedCandidate.setState(Candidate::Discarded);
+                remoteUsedCandidate = Candidate();
+            }
+        }
     }
 };
 
@@ -531,7 +570,7 @@ void Transport::prepare()
                     emit updated();
                 } else if (!d->proxiesInDiscoCount) {
                     // it's possible it was our last hope and probaby we have to send candidate-error now.
-                    d->checkAndSendLocalCandidatesExhausted();
+                    d->checkAndFinishNegotiation();
                 }
             });
             query->requestProxyInfo(j);
@@ -557,7 +596,7 @@ void Transport::prepare()
         } else if (items.count() == 0) {
             // seems like we don't have any proxy
             d->proxyDiscoveryInProgress = false;
-            d->checkAndSendLocalCandidatesExhausted();
+            d->checkAndFinishNegotiation();
         }
     });
 
@@ -590,6 +629,7 @@ bool Transport::update(const QDomElement &transportEl)
         candidatesAdded++;
     }
     if (candidatesAdded) {
+        d->pendingActions &= ~Private::CandidateError;
         d->localReportedCandidateError = false;
         QTimer::singleShot(0, this, [this](){
             d->tryConnectToRemoteCandidate();
@@ -606,9 +646,7 @@ bool Transport::update(const QDomElement &transportEl)
         cUsed.setState(Candidate::Accepted);
         d->localUsedCandidate = cUsed;
         d->updateMinimalPriority();
-        // TODO check upnp too when implemented
-        d->checkAndSendLocalCandidatesExhausted();
-        QTimer::singleShot(0, this, [this](){ d->updateSelfState(); });
+        QTimer::singleShot(0, this, [this](){ d->checkAndFinishNegotiation(); });
         return true;
     }
 
@@ -620,8 +658,7 @@ bool Transport::update(const QDomElement &transportEl)
                 c.setState(Candidate::Discarded);
             }
         }
-        d->checkAndSendLocalCandidatesExhausted();
-        QTimer::singleShot(0, this, [this](){ d->updateSelfState(); });
+        QTimer::singleShot(0, this, [this](){ d->checkAndFinishNegotiation(); });
         return true;
     }
 
@@ -674,7 +711,7 @@ bool Transport::update(const QDomElement &transportEl)
 
 Action Transport::outgoingUpdateType() const
 {
-    if (isValid() && d->application) {
+    if (isValid() && d->application && d->pendingActions) {
         // if we are preparing local offer and have at least one candidate, we have to sent it.
         // otherwise it's not first update to remote from this transport, so we have to send just signalling candidates
         if ((d->application->state() == State::PrepareLocalOffer && d->localCandidates.size()) ||
diff --git a/src/xmpp/xmpp-im/jingle-s5b.h b/src/xmpp/xmpp-im/jingle-s5b.h
index 6275a892..320c21bb 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.h
+++ b/src/xmpp/xmpp-im/jingle-s5b.h
@@ -110,6 +110,7 @@ class Candidate {
 
     QDomElement toXml(QDomDocument *doc) const;
 
+    void connectToHost(std::function<void (bool)> callback);
 private:
     class Private;
     QExplicitlySharedDataPointer<Private> d;

From feb3e7a2ecc4d1056712f25c68f1eb415c13791a Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 28 Apr 2019 13:30:22 +0300
Subject: [PATCH 005/383] jingle-s5b: actually send local events

---
 src/xmpp/xmpp-im/jingle-s5b.cpp | 156 ++++++++++++++++++++++++--------
 1 file changed, 116 insertions(+), 40 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 619fc4cb..78126cbe 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -240,7 +240,6 @@ class Transport::Private : public QSharedData {
     Application *application = nullptr;
     QMap<QString,Candidate> localCandidates; // cid to candidate mapping
     QMap<QString,Candidate> remoteCandidates;
-    QSet<QPair<QString,Origin>> signalingCandidates; // origin here is session role. so for remote it's != session->role
     Candidate localUsedCandidate; // we received "candidate-used" for this candidate from localCandidates list
     Candidate remoteUsedCandidate; // we sent "candidate-used" for this candidate from remoteCandidates list
     QString dstaddr;
@@ -261,6 +260,11 @@ class Transport::Private : public QSharedData {
         return senders == Origin::Both || senders == negateOrigin(application->creator());
     }
 
+    bool amICreator() const
+    {
+        return application->creator() == pad->session()->role();
+    }
+
     inline Jid remoteJid() const
     {
         return pad->session()->peer();
@@ -355,26 +359,28 @@ class Transport::Private : public QSharedData {
                 // tell application about it and it has to change its state immediatelly
                 if (localUsedCandidate || remoteUsedCandidate) {
                     auto c = localUsedCandidate? localUsedCandidate : remoteUsedCandidate;
-                    if (c.type() == Candidate::Proxy) {
-                        // If it's proxy, first it has to be activated
-                        if (localUsedCandidate) {
-                            // it's our side who proposed proxy. so we have to connect to it and activate
-                            c.connectToHost([this](bool success){
-                                if (success) {
-                                    pendingActions |= Private::Activated;
-                                } else {
-                                    pendingActions |= Private::ProxyError;
-                                }
-                                emit q->updated();
-                            });
+                    if (c.state() != Candidate::Active) {
+                        if (c.type() == Candidate::Proxy) {
+                            // If it's proxy, first it has to be activated
+                            if (localUsedCandidate) {
+                                // it's our side who proposed proxy. so we have to connect to it and activate
+                                c.connectToHost([this](bool success){
+                                    if (success) {
+                                        pendingActions |= Private::Activated;
+                                    } else {
+                                        pendingActions |= Private::ProxyError;
+                                    }
+                                    emit q->updated();
+                                });
+                            } // else so it's remote proxy. let's just wait for <activated> from remote
                         } else {
-                            return; // let's just wait for <activated> from remote
+                            c.setState(Candidate::Active);
                         }
-                    } else {
-                        c.setState(Candidate::Active);
+                    }
+                    if (c.state() == Candidate::Active) {
                         emit q->connected();
                     }
-                } else {
+                } else { // both sides reported candidate error
                     emit q->failed();
                 }
             } // else we have to wait till remote reports its status
@@ -446,7 +452,7 @@ class Transport::Private : public QSharedData {
             remoteUsedCandidate = Candidate();
         }
         if (localUsedCandidate && remoteUsedCandidate) {
-            if (application->creator() == pad->session()->role()) {
+            if (amICreator()) {
                 // i'm initiator. see 2.4.4
                 localUsedCandidate.setState(Candidate::Discarded);
                 localUsedCandidate = Candidate();
@@ -549,8 +555,8 @@ void Transport::prepare()
                 bool candidateUpdated = false;
                 auto c = d->localCandidates.value(cid);
                 if (c && c.state() == Candidate::Probing) {
-                    if (query->success()) {
-                        auto sh = query->proxyInfo();
+                    auto sh = query->proxyInfo();
+                    if (query->success() && !sh.host().isEmpty() && sh.port()) {
                         // it can be discarded by this moment (e.g. got success on a higher priority candidate).
                         // so we have to check.
                         c.setHost(sh.host());
@@ -600,10 +606,6 @@ void Transport::prepare()
         }
     });
 
-    for (auto const &c: d->localCandidates) {
-        d->signalingCandidates.insert(QPair<QString,Origin>{c.cid(),d->pad->session()->role()});
-    }
-
     // TODO nat-assisted candidates..
     emit updated();
 }
@@ -715,8 +717,7 @@ Action Transport::outgoingUpdateType() const
         // if we are preparing local offer and have at least one candidate, we have to sent it.
         // otherwise it's not first update to remote from this transport, so we have to send just signalling candidates
         if ((d->application->state() == State::PrepareLocalOffer && d->localCandidates.size()) ||
-                (d->application->state() > State::PrepareLocalOffer && d->application->state() < State::Finished &&
-                 !d->signalingCandidates.isEmpty()))
+                (d->application->state() > State::PrepareLocalOffer && d->application->state() < State::Finished))
         {
             return Action::TransportInfo;
         }
@@ -732,26 +733,27 @@ OutgoingUpdate Transport::takeOutgoingUpdate()
         return upd;
     }
 
-    auto sessRole = d->pad->session()->role();
     auto doc = d->pad->session()->manager()->client()->doc();
 
-    if (appState == State::PrepareLocalOffer && !d->localCandidates.isEmpty()) {
-        QDomElement tel = doc->createElementNS(NS, "transport");
-        tel.setAttribute(QStringLiteral("sid"), d->sid);
-        if (d->mode != Tcp) {
-            tel.setAttribute(QStringLiteral("mode"), "udp");
-        }
+    QDomElement tel = doc->createElementNS(NS, "transport");
+    tel.setAttribute(QStringLiteral("sid"), d->sid);
+    if (d->amICreator() && d->mode != Tcp) {
+        tel.setAttribute(QStringLiteral("mode"), "udp");
+    }
+
+    if (d->pendingActions & Private::NewCandidate) {
+        d->pendingActions &= ~Private::NewCandidate;
         bool useProxy = false;
         QList<Candidate> candidatesToSend;
         for (auto &c: d->localCandidates) {
+            if (c.state() != Candidate::New) {
+                continue;
+            }
             if (c.type() == Candidate::Proxy) {
                 useProxy = true;
             }
-            if (!c.host().isEmpty()) {
-                tel.appendChild(c.toXml(doc));
-            }
+            tel.appendChild(c.toXml(doc));
             candidatesToSend.append(c);
-            d->signalingCandidates.remove(QPair<QString,Origin>{c.cid(),sessRole});
             c.setState(Candidate::Unacked);
         }
         if (useProxy) {
@@ -761,12 +763,86 @@ OutgoingUpdate Transport::takeOutgoingUpdate()
                                                        QCryptographicHash::Sha1);
             tel.setAttribute(QStringLiteral("dstaddr"), dstaddr);
         }
-        OutgoingUpdate{tel, [this, candidatesToSend]() mutable {
+        if (!candidatesToSend.isEmpty()) {
+            d->waitingAck = true;
+            upd = OutgoingUpdate{tel, [this, candidatesToSend]() mutable {
+                d->waitingAck = false;
                 for (auto &c: candidatesToSend) {
-                    c.setState(Candidate::Pending);
+                    if (c.state() == Candidate::Unacked) {
+                        c.setState(Candidate::Pending);
+                    }
+                }
+                d->checkAndFinishNegotiation();
+            }};
+        }
+    } else if (d->pendingActions & Private::CandidateUsed) {
+        d->pendingActions &= ~Private::NewCandidate;
+        // we should have the only remote candidate in Pending state
+        for (auto &c: d->remoteCandidates) {
+            if (c.state() != Candidate::Pending) {
+                continue;
+            }
+            auto el = tel.appendChild(doc->createElement(QStringLiteral("candidate-used"))).toElement();
+            el.setAttribute(QStringLiteral("cid"), c.cid());
+            c.setState(Candidate::Unacked);
+
+            d->waitingAck = true;
+            upd = OutgoingUpdate{tel, [this, c]() mutable {
+                d->waitingAck = false;
+                if (c.state() == Candidate::Unacked) {
+                    c.setState(Candidate::Accepted);
+                    d->remoteUsedCandidate = c;
+                }
+                d->checkAndFinishNegotiation();
+            }};
+
+            break;
+        }
+    } else if (d->pendingActions & Private::CandidateError) {
+        d->pendingActions &= ~Private::CandidateError;
+        // we are here because all remote are already in Discardd state
+        tel.appendChild(doc->createElement(QStringLiteral("candidate-error")));
+        d->waitingAck = true;
+        upd = OutgoingUpdate{tel, [this]() mutable {
+            d->waitingAck = false;
+            d->localReportedCandidateError = true;
+            d->checkAndFinishNegotiation();
+        }};
+    } else if (d->pendingActions & Private::Activated) {
+        d->pendingActions &= ~Private::Activated;
+        if (d->localUsedCandidate) {
+            auto cand = d->localUsedCandidate;
+            auto el = tel.appendChild(doc->createElement(QStringLiteral("activated"))).toElement();
+            el.setAttribute(QStringLiteral("cid"), cand.cid());
+            d->waitingAck = true;
+            upd = OutgoingUpdate{tel, [this, cand]() mutable {
+                d->waitingAck = false;
+                if (cand.state() != Candidate::Accepted || d->localUsedCandidate != cand) {
+                    return; // seems like state was changed while we was waiting for an ack
                 }
-            }}; // FIXME we should update candidates status here
+                cand.setState(Candidate::Active);
+                d->checkAndFinishNegotiation();
+            }};
+        }
+    } else if (d->pendingActions & Private::ProxyError) {
+        // we send proxy error only for local proxy
+        d->pendingActions &= ~Private::ProxyError;
+        if (d->localUsedCandidate) {
+            auto cand = d->localUsedCandidate;
+            tel.appendChild(doc->createElement(QStringLiteral("proxy-error")));
+            d->waitingAck = true;
+            upd = OutgoingUpdate{tel, [this, cand]() mutable {
+                d->waitingAck = false;
+                if (cand.state() != Candidate::Accepted || d->localUsedCandidate != cand) {
+                    return; // seems like state was changed while we was waiting for an ack
+                }
+                cand.setState(Candidate::Discarded);
+                d->localUsedCandidate = Candidate();
+                emit failed();
+            }};
+        }
     }
+
     return upd; // TODO
 }
 

From 2b51a42277c0153af95066a330571e0591ff67b8 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 30 Apr 2019 15:42:07 +0300
Subject: [PATCH 006/383] jingle: commont code from session-initiate
 content-add moved to separate function

---
 src/xmpp/xmpp-im/jingle.cpp | 220 +++++++++++++++++-------------------
 src/xmpp/xmpp-im/jingle.h   |   1 +
 2 files changed, 106 insertions(+), 115 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index cefa1059..412b2021 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -577,8 +577,6 @@ class Session::Private
     Origin  role  = Origin::Initiator; // my role in the session
     XMPP::Stanza::Error lastError;
     Reason terminateReason;
-    Action outgoingUpdateType = Action::NoAction;
-    QDomElement outgoingUpdate;
     QMap<QString,QWeakPointer<ApplicationManagerPad>> applicationPads;
     QMap<QString,QWeakPointer<TransportManagerPad>> transportPads;
     //QMap<QString,Application*> myContent;     // content::creator=(role == Session::Role::Initiator?initiator:responder)
@@ -793,7 +791,7 @@ class Session::Private
         Unsupported
     };
 
-    std::tuple<AddContentError, Reason::Condition, Application*> addContent(const QDomElement &ce)
+    std::tuple<AddContentError, Reason::Condition, Application*> parseContent(const QDomElement &ce)
     {
         QDomElement descriptionEl = ce.firstChildElement(QLatin1String("description"));
         QDomElement transportEl = ce.firstChildElement(QLatin1String("transport"));
@@ -835,6 +833,62 @@ class Session::Private
 
         return result{Unparsed, Reason::Success, nullptr};
     }
+
+
+    typedef std::tuple<AddContentError, Reason::Condition, QList<Application*>, QList<QDomElement>> ParseContentListResult;
+
+    ParseContentListResult parseContentList(const QDomElement &jingleEl)
+    {
+        QMap<QString,Application *> addSet;
+        QMap<QString,std::pair<QDomElement,Reason::Condition>> rejectSet;
+
+        QString contentTag(QStringLiteral("content"));
+        for(QDomElement ce = jingleEl.firstChildElement(contentTag);
+            !ce.isNull(); ce = ce.nextSiblingElement(contentTag))
+        {
+
+            Private::AddContentError err;
+            Reason::Condition cond;
+            Application *app;
+
+            std::tie(err, cond, app) = parseContent(ce);
+            if (err == Private::AddContentError::Unparsed) {
+                lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
+                qDeleteAll(addSet);
+                return ParseContentListResult(Unparsed, cond, QList<Application*>(), QList<QDomElement>());
+            }
+
+            auto contentName = app->contentName();
+            auto it = addSet.find(contentName);
+            if (err != Private::AddContentError::Ok) {
+                // can't continue as well
+                if (app) { // we are going to reject it completely so delete
+                    delete app;
+                }
+
+                if (it == addSet.end()) {
+                    rejectSet.insert(contentName, std::make_pair(ce, cond));
+                }
+                continue;
+            }
+
+            rejectSet.remove(contentName);
+            if (it == addSet.end() || (*it)->wantBetterTransport(app->transport())) { // probably not wantBetterTransport but wantBetterApplication
+                delete *it; // unpreferred app
+                *it = app;
+            }
+        }
+
+        if (rejectSet.size()) {
+            QList<QDomElement> rejectList;
+            for (auto const &i: rejectSet) {
+                rejectList.append(i.first);
+            }
+            return ParseContentListResult(Unsupported, rejectSet.first().second, addSet.values(), rejectList);
+        }
+
+        return ParseContentListResult(Ok, Reason::Success, addSet.values(), QList<QDomElement>());
+    }
 };
 
 Session::Session(Manager *manager, const Jid &peer) :
@@ -1029,142 +1083,78 @@ bool Session::incomingInitiate(const Jingle &jingle, const QDomElement &jingleEl
     if (jingle.initiator().isValid() && !jingle.initiator().compare(d->origFrom)) {
         d->otherParty = jingle.initiator();
     }
-    //auto key = qMakePair(from, jingle.sid());
-
-    QMap<QString,std::tuple<Reason::Condition, Application *>> addSet; // application to supported
-
-    QString contentTag(QStringLiteral("content"));
-    for(QDomElement ce = jingleEl.firstChildElement(contentTag);
-        !ce.isNull(); ce = ce.nextSiblingElement(contentTag)) {
-        Private::AddContentError err;
-        Reason::Condition cond;
-        Application *app;
-        auto r = d->addContent(ce);
-        std::tie(err, cond, app) = r;
-        if (err == Private::AddContentError::Unparsed) {
-            for (auto const &i: addSet) {
-                delete std::get<1>(i);
-            }
-            d->lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
-            return false;
-        }
-        if (err == Private::AddContentError::Unsupported) {
-            if (cond == Reason::Condition::UnsupportedTransports) {
 
-            }
-            // can't continue as well
-            for (auto const &i: addSet) {
-                delete std::get<1>(i);
-            }
-            d->outgoingUpdateType = Action::SessionTerminate;
-            Reason r(cond);
-            d->outgoingUpdate = r.toXml(d->manager->client()->doc());
-            return true;
-        }
-        QString contentName = ce.attribute(QStringLiteral("name"));
-        if (err == Private::AddContentError::Ok) {
-            auto et = addSet.value(contentName);
-            auto eapp = std::get<1>(et);
-            if (!eapp || eapp->wantBetterTransport(app->transport())) {
-                addSet.insert(contentName, std::make_tuple(cond,app));
-            }
-        } else if (!std::get<1>(addSet.value(contentName))) {
-            // something unsupported. but lets parse all items. maybe it will get replaced
-            addSet.insert(contentName, std::make_tuple(cond,app));
-        }
-
-        // TODO at this point if all addSet items have application it's success,
-        // otherwise we have to think what to do with this. for example replace transport if it's unsupported.
+    Private::AddContentError err;
+    Reason::Condition cond;
+    QList<Application *> apps;
+    QList<QDomElement> rejects;
 
-        for (auto const &i: addSet) {
-            Reason::Condition cond;
-            Application *app;
-            std::tie(cond, app) = i;
-            if (!app) {
-                // TODO
-                return false; // FIXME. memory release
-            }
+    std::tie(err, cond, apps, rejects) = d->parseContentList(jingleEl);
+    switch (err) {
+    case Private::AddContentError::Unparsed:
+        return false;
+    case Private::AddContentError::Unsupported:
+        QTimer::singleShot(0, this, [this, cond](){
+            d->sendJingle(Action::SessionTerminate, QList<QDomElement>() << Reason(cond).toXml(d->manager->client()->doc()));
+            d->state = State::Finished;
+            emit terminated();
+        });
+        return true;
+    case Private::AddContentError::Ok:
+        for (auto app: apps) {
             d->contentList.insert(ContentKey{app->contentName(), Origin::Initiator}, app);
         }
+        d->planStep();
+        return true;
     }
-    d->planStep();
-    return true;
+
+    return false;
 }
 
 bool Session::updateFromXml(Action action, const QDomElement &jingleEl)
 {
-    if (action == Action::SessionInfo) {
-
-    }
-
-    if (action != Action::ContentAdd) {
+    if (d->state == State::Finished) {
+        d->lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::UnexpectedRequest); // TODO OutOfOrder
         return false;
     }
 
-    QMap<QString,Application *> addSet; // application to supported
-    bool parsed = true;
-    int unsupported = 0;
-    Reason::Condition rejectCond = Reason::Condition::Success;
+    if (action == Action::SessionInfo) {
 
-    QString contentTag(QStringLiteral("content"));
-    for(QDomElement ce = jingleEl.firstChildElement(contentTag);
-        !ce.isNull(); ce = ce.nextSiblingElement(contentTag)) {
+    }
+
+    if (action == Action::ContentAdd) {
         Private::AddContentError err;
         Reason::Condition cond;
-        Application *app;
-        QString contentName = ce.attribute(QStringLiteral("name"));
-        if (!contentName.size()) {
-            parsed = false;
+        QList<Application *> apps;
+        QList<QDomElement> rejects;
+
+        std::tie(err, cond, apps, rejects) = d->parseContentList(jingleEl);
+        switch (err) {
+        case Private::AddContentError::Unparsed:
+            return false;
+        case Private::AddContentError::Unsupported:
+            QTimer::singleShot(0, this, [this, cond, rejects]() mutable {
+                rejects += Reason(cond).toXml(d->manager->client()->doc());
+                d->sendJingle(Action::ContentReject, rejects);
+            });
+            break;
+        case Private::AddContentError::Ok:
             break;
         }
 
-        std::tie(err, cond, app) = d->addContent(ce);
-        bool alreadyAdded = addSet.contains(contentName);
-        if (err != Private::AddContentError::Ok) {
-            // can't continue as well
-            if (app) { // we are going to reject it completely so delete
-                delete app;
-            }
-            if (err == Private::AddContentError::Unsupported) {
-                rejectCond = cond;
+        if (apps.size()) {
+            Origin remoteRole = negateOrigin(d->role);
+            for (auto app: apps) {
+                d->contentList.insert(ContentKey{app->contentName(), remoteRole}, app); // TODO check conflicts
             }
-            if (!alreadyAdded) {
-                unsupported++;
-                addSet.insert(contentName, nullptr);
-            } // else just ignore this unsupported content. we aready have one
-            continue;
+            QTimer::singleShot(0, this, [this](){ emit newContentReceived(); });
         }
 
-        auto eapp = addSet.value(contentName);
-        if (alreadyAdded && !eapp) {
-            unsupported--; // we are going to overwrite previous with successful
-        }
-        if (!eapp || eapp->wantBetterTransport(app->transport())) {
-            addSet.insert(contentName, app);
-        }
-    }
-
-    if (unsupported && rejectCond == Reason::Condition::Success) {
-        parsed = false; // the only way it's possible
-    }
-    if (!parsed) {
-        d->lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
-        qDeleteAll(addSet);
-        return false;
-    } else if (unsupported) {
-        d->outgoingUpdateType = Action::ContentReject;
-        Reason r(rejectCond);
-        d->outgoingUpdate = r.toXml(d->manager->client()->doc());
-        qDeleteAll(addSet);
         return true;
     }
 
-    Origin remoteRole = negateOrigin(d->role);
-    for (auto const &app: addSet) {
-        d->contentList.insert(ContentKey{app->contentName(), remoteRole}, app); // TODO check conflicts
-    }
-
-    return true;
+    d->lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::UnexpectedRequest);
+    return false;
 }
 
 
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index 43a294d3..c5e6f77c 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -391,6 +391,7 @@ class Session : public QObject
     void managerPadAdded(const QString &ns);
     void activated();
     void terminated();
+    void newContentReceived();
 
 private:
     friend class Manager;

From cad08f63603c828101436e815dcfad015996004d Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Fri, 3 May 2019 21:37:03 +0300
Subject: [PATCH 007/383] jingle: handle content add/accept

---
 src/xmpp/xmpp-im/jingle-ft.cpp  |  47 ++--
 src/xmpp/xmpp-im/jingle-ft.h    |   1 +
 src/xmpp/xmpp-im/jingle-s5b.cpp |  75 ++-----
 src/xmpp/xmpp-im/jingle-s5b.h   |   5 +-
 src/xmpp/xmpp-im/jingle.cpp     | 375 ++++++++++++++++++++++++++------
 src/xmpp/xmpp-im/jingle.h       |  35 ++-
 6 files changed, 389 insertions(+), 149 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index db291459..f5def76c 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -463,7 +463,6 @@ bool Application::setTransport(const QSharedPointer<Transport> &transport)
         }
         d->availableTransports.removeAt(nsIndex);
         d->transport = transport;
-        d->transport->setApplication(this);
         d->state = State::Pending;
         return true;
     }
@@ -481,14 +480,17 @@ Action Application::outgoingUpdateType() const
     case State::Created:
         break;
     case State::PrepareLocalOffer:
-        if (!d->transport && !d->availableTransports.size()) {
-            break; // not yet ready
+        if (d->transport->hasUpdates()) {
+            return d->creator == d->pad->session()->role()? Action::ContentAdd : Action::ContentAccept;
         }
-        return Action::ContentAdd;
+        break;
     case State::Connecting:
     case State::Active:
-        return d->transport->outgoingUpdateType();
     case State::Pending:
+        if (d->transport->hasUpdates()) {
+            return Action::TransportInfo;
+        }
+        break;
     default:
         break;
     }
@@ -500,17 +502,14 @@ OutgoingUpdate Application::takeOutgoingUpdate()
     if (!isValid() || d->state == State::Created) {
         return OutgoingUpdate();
     }
-    if (d->state == State::Connecting || d->state == State::Active) {
-        return d->transport->takeOutgoingUpdate();
-    }
+
+    auto client = d->pad->session()->manager()->client();
+    auto doc = client->doc();
     if (d->state == State::PrepareLocalOffer) { // basically when we come to this function Created is possible only for outgoing content
-        if (!d->transport && d->availableTransports.size()) {
-            selectNextTransport();
-        }
-        if (!d->transport || d->transport->outgoingUpdateType() == Action::NoAction) { // failed to select next transport. can't continue
+        if (!d->transport->hasUpdates()) { // failed to select next transport. can't continue
             return OutgoingUpdate();
         }
-        auto client = d->pad->session()->manager()->client();
+
         if (d->file.thumbnail().data.size()) {
             auto thumb = d->file.thumbnail();
             auto bm = client->bobManager();
@@ -518,7 +517,6 @@ OutgoingUpdate Application::takeOutgoingUpdate()
             thumb.uri = QLatin1String("cid:") + data.cid();
             d->file.setThumbnail(thumb);
         }
-        auto doc = client->doc();
         ContentBase cb(d->pad->session()->role(), d->contentName);
         cb.senders = d->senders;
         auto cel = cb.toXml(doc, "content");
@@ -529,13 +527,25 @@ OutgoingUpdate Application::takeOutgoingUpdate()
         cel.appendChild(tel);
 
         d->state = State::Unacked;
-        return OutgoingUpdate{cel, [this, trCallback](){
+        return OutgoingUpdate{QList<QDomElement>()<<cel, [this, trCallback](){
                 if (trCallback) {
                     trCallback();
                 }
                 d->state = d->pad->session()->role() == Origin::Initiator? State::Pending : State::Active;
             }};
     }
+    if (d->state == State::Connecting || d->state == State::Active || d->state == State::Pending) {
+        if (d->transport->hasUpdates()) { // failed to select next transport. can't continue
+            ContentBase cb(d->pad->session()->role(), d->contentName);
+            cb.senders = d->senders;
+            auto cel = cb.toXml(doc, "content");
+            QDomElement tel;
+            OutgoingUpdateCB trCallback;
+            std::tie(tel, trCallback) = d->transport->takeOutgoingUpdate();
+            cel.appendChild(tel);
+            return OutgoingUpdate{QList<QDomElement>()<<cel, trCallback};
+        }
+    }
     return OutgoingUpdate(); // TODO
 }
 
@@ -550,7 +560,6 @@ bool Application::selectNextTransport()
     if (d->availableTransports.size()) {
         QString ns = d->availableTransports.takeFirst();
         d->transport = d->pad->session()->newOutgoingTransport(ns);
-        d->transport->setApplication(this);
         return true;
     }
     return false;
@@ -576,6 +585,12 @@ void Application::start()
     // TODO we nedd QIODevice somewhere here
 }
 
+bool Application::accept(const QDomElement &el)
+{
+    Q_UNUSED(el);
+    return true; // TODO!!!
+}
+
 bool Application::isValid() const
 {
     return d->file.isValid() && d->transport &&  d->contentName.size() > 0 &&
diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index 0a23a00a..e2c2171c 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -135,6 +135,7 @@ class Application : public XMPP::Jingle::Application
     bool selectNextTransport() override;
     void prepare() override;
     void start() override;
+    bool accept(const QDomElement &el) override;
 
     bool isValid() const;
 
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 78126cbe..15b6295c 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -229,6 +229,8 @@ class Transport::Private : public QSharedData {
 
     Transport *q = NULL;
     Pad::Ptr pad;
+    bool meCreator = true; // content.content is local side
+    bool connectionStarted = false; // where start() was called
     bool waitingAck = true;
     bool aborted = false;
     bool remoteReportedCandidateError = false;
@@ -246,25 +248,6 @@ class Transport::Private : public QSharedData {
     QString sid;
     Transport::Mode mode = Transport::Tcp;
 
-    bool amISender() const
-    {
-        Q_ASSERT(application);
-        auto senders = application->senders();
-        return senders == Origin::Both || senders == application->creator();
-    }
-
-    bool amIReceiver() const
-    {
-        Q_ASSERT(application);
-        auto senders = application->senders();
-        return senders == Origin::Both || senders == negateOrigin(application->creator());
-    }
-
-    bool amICreator() const
-    {
-        return application->creator() == pad->session()->role();
-    }
-
     inline Jid remoteJid() const
     {
         return pad->session()->peer();
@@ -291,7 +274,7 @@ class Transport::Private : public QSharedData {
 
     void tryConnectToRemoteCandidate()
     {
-        if (application->state() != State::Connecting) {
+        if (!connectionStarted) {
             return; // will come back later
         }
         quint64 priority = 0;
@@ -336,7 +319,7 @@ class Transport::Private : public QSharedData {
         // So for candidate-error two conditions have to be met 1) all remote failed 2) all local were sent no more
         // local candidates are expected to be discovered
 
-        if (application->state() != State::Connecting) {
+        if (!connectionStarted) {
             return; // we can't finish anything in this state. Only Connecting is acceptable
         }
 
@@ -452,7 +435,7 @@ class Transport::Private : public QSharedData {
             remoteUsedCandidate = Candidate();
         }
         if (localUsedCandidate && remoteUsedCandidate) {
-            if (amICreator()) {
+            if (meCreator) {
                 // i'm initiator. see 2.4.4
                 localUsedCandidate.setState(Candidate::Discarded);
                 localUsedCandidate = Candidate();
@@ -478,6 +461,7 @@ Transport::Transport(const TransportManagerPad::Ptr &pad) :
 Transport::Transport(const TransportManagerPad::Ptr &pad, const QDomElement &transportEl) :
     Transport::Transport(pad)
 {
+    d->meCreator = false;
     d->dstaddr = transportEl.attribute(QStringLiteral("dstaddr"));
     d->sid = transportEl.attribute(QStringLiteral("sid"));
     if (d->sid.isEmpty() || !update(transportEl)) {
@@ -496,18 +480,13 @@ TransportManagerPad::Ptr Transport::pad() const
     return d->pad.staticCast<TransportManagerPad>();
 }
 
-void Transport::setApplication(Application *app)
+void Transport::prepare()
 {
-    d->application = app;
-    if (app->creator() == d->pad->session()->role()) { // I'm a creator
+    auto m = static_cast<Manager*>(d->pad->manager());
+    if (d->meCreator) {
         d->sid = d->pad->generateSid();
     }
     d->pad->registerSid(d->sid);
-}
-
-void Transport::prepare()
-{
-    auto m = static_cast<Manager*>(d->pad->manager());
 
     auto serv = m->socksServ();
     if (serv) {
@@ -610,9 +589,11 @@ void Transport::prepare()
     emit updated();
 }
 
+// we got content acceptance from any side and not can connect
 void Transport::start()
 {
-    // TODO start connecting to remote candidates
+    d->connectionStarted = true;
+    d->tryConnectToRemoteCandidate();
 }
 
 bool Transport::update(const QDomElement &transportEl)
@@ -711,25 +692,15 @@ bool Transport::update(const QDomElement &transportEl)
     return false;
 }
 
-Action Transport::outgoingUpdateType() const
+bool Transport::hasUpdates() const
 {
-    if (isValid() && d->application && d->pendingActions) {
-        // if we are preparing local offer and have at least one candidate, we have to sent it.
-        // otherwise it's not first update to remote from this transport, so we have to send just signalling candidates
-        if ((d->application->state() == State::PrepareLocalOffer && d->localCandidates.size()) ||
-                (d->application->state() > State::PrepareLocalOffer && d->application->state() < State::Finished))
-        {
-            return Action::TransportInfo;
-        }
-    }
-    return Action::NoAction; // TODO
+    return isValid() && d->pendingActions;
 }
 
-OutgoingUpdate Transport::takeOutgoingUpdate()
+OutgoingTransportInfoUpdate Transport::takeOutgoingUpdate()
 {
-    OutgoingUpdate upd;
-    State appState;
-    if (!isValid() || !d->application || (appState = d->application->state()) == State::Finished) {
+    OutgoingTransportInfoUpdate upd;
+    if (!isValid()) {
         return upd;
     }
 
@@ -737,7 +708,7 @@ OutgoingUpdate Transport::takeOutgoingUpdate()
 
     QDomElement tel = doc->createElementNS(NS, "transport");
     tel.setAttribute(QStringLiteral("sid"), d->sid);
-    if (d->amICreator() && d->mode != Tcp) {
+    if (d->meCreator && d->mode != Tcp) {
         tel.setAttribute(QStringLiteral("mode"), "udp");
     }
 
@@ -765,7 +736,7 @@ OutgoingUpdate Transport::takeOutgoingUpdate()
         }
         if (!candidatesToSend.isEmpty()) {
             d->waitingAck = true;
-            upd = OutgoingUpdate{tel, [this, candidatesToSend]() mutable {
+            upd = OutgoingTransportInfoUpdate{tel, [this, candidatesToSend]() mutable {
                 d->waitingAck = false;
                 for (auto &c: candidatesToSend) {
                     if (c.state() == Candidate::Unacked) {
@@ -787,7 +758,7 @@ OutgoingUpdate Transport::takeOutgoingUpdate()
             c.setState(Candidate::Unacked);
 
             d->waitingAck = true;
-            upd = OutgoingUpdate{tel, [this, c]() mutable {
+            upd = OutgoingTransportInfoUpdate{tel, [this, c]() mutable {
                 d->waitingAck = false;
                 if (c.state() == Candidate::Unacked) {
                     c.setState(Candidate::Accepted);
@@ -803,7 +774,7 @@ OutgoingUpdate Transport::takeOutgoingUpdate()
         // we are here because all remote are already in Discardd state
         tel.appendChild(doc->createElement(QStringLiteral("candidate-error")));
         d->waitingAck = true;
-        upd = OutgoingUpdate{tel, [this]() mutable {
+        upd = OutgoingTransportInfoUpdate{tel, [this]() mutable {
             d->waitingAck = false;
             d->localReportedCandidateError = true;
             d->checkAndFinishNegotiation();
@@ -815,7 +786,7 @@ OutgoingUpdate Transport::takeOutgoingUpdate()
             auto el = tel.appendChild(doc->createElement(QStringLiteral("activated"))).toElement();
             el.setAttribute(QStringLiteral("cid"), cand.cid());
             d->waitingAck = true;
-            upd = OutgoingUpdate{tel, [this, cand]() mutable {
+            upd = OutgoingTransportInfoUpdate{tel, [this, cand]() mutable {
                 d->waitingAck = false;
                 if (cand.state() != Candidate::Accepted || d->localUsedCandidate != cand) {
                     return; // seems like state was changed while we was waiting for an ack
@@ -831,7 +802,7 @@ OutgoingUpdate Transport::takeOutgoingUpdate()
             auto cand = d->localUsedCandidate;
             tel.appendChild(doc->createElement(QStringLiteral("proxy-error")));
             d->waitingAck = true;
-            upd = OutgoingUpdate{tel, [this, cand]() mutable {
+            upd = OutgoingTransportInfoUpdate{tel, [this, cand]() mutable {
                 d->waitingAck = false;
                 if (cand.state() != Candidate::Accepted || d->localUsedCandidate != cand) {
                     return; // seems like state was changed while we was waiting for an ack
diff --git a/src/xmpp/xmpp-im/jingle-s5b.h b/src/xmpp/xmpp-im/jingle-s5b.h
index 320c21bb..e4edb4c1 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.h
+++ b/src/xmpp/xmpp-im/jingle-s5b.h
@@ -131,13 +131,12 @@ class Transport : public XMPP::Jingle::Transport
     ~Transport();
 
     TransportManagerPad::Ptr pad() const override;
-    void setApplication(Application *app) override;
 
     void prepare() override;
     void start() override;
     bool update(const QDomElement &transportEl) override;
-    Action outgoingUpdateType() const override;
-    OutgoingUpdate takeOutgoingUpdate() override;
+    bool hasUpdates() const override;
+    OutgoingTransportInfoUpdate takeOutgoingUpdate() override;
     bool isValid() const override;
     Features features() const override;
 
diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index 412b2021..8c0ef35d 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -33,6 +33,7 @@
 #include <QTimer>
 #include <functional>
 #include <QDebug>
+#include <QTimer>
 
 namespace XMPP {
 namespace Jingle {
@@ -583,12 +584,26 @@ class Session::Private
     //QMap<QString,Application*> remoteContent; // content::creator=(role == Session::Role::Responder?initiator:responder)
     QMap<ContentKey,Application*> contentList;
     QSet<Application*> signalingContent;
+    QHash<Action,OutgoingUpdate> outgoingUpdates; // session level updates. session-info for example or some rejected apps
     QString sid;
     Jid origFrom; // "from" attr of IQ.
     Jid otherParty; // either "from" or initiator/responder. it's where to send all requests.
     Jid localParty; // that one will be set as initiator/responder if provided
     bool waitingAck = false;
 
+    void setSessionFinished()
+    {
+        state = State::Finished;
+        emit q->terminated();
+        signalingContent.clear();
+        auto vals = contentList.values();
+        contentList.clear();
+        while (vals.size()) {
+            vals.takeLast()->deleteLater();
+        }
+        q->deleteLater();
+    }
+
     void sendJingle(Action action, QList<QDomElement> update, std::function<void()> successCB = std::function<void()>())
     {
         QDomDocument &doc = *manager->client()->doc();
@@ -616,10 +631,8 @@ class Session::Private
                     planStep();
                 }
             } else {
-                state = State::Finished;
                 lastError = jt->error();
-                emit q->terminated();
-                q->deleteLater();
+                setSessionFinished();
             }
         });
         waitingAck = true;
@@ -644,14 +657,29 @@ class Session::Private
             if (state != State::Created || role == Origin::Responder) {
                 sendJingle(Action::SessionTerminate, QList<QDomElement>() << terminateReason.toXml(manager->client()->doc()));
             }
-            state = State::Finished;
-            q->deleteLater();
-            emit q->terminated();
+            setSessionFinished();
             return;
         }
         if (state == State::Created || state == State::Finished) {
             return; // we will start doing something when initiate() is called
         }
+
+        if (outgoingUpdates.size()) {
+            auto it = outgoingUpdates.begin();
+            auto action = it.key();
+            auto updates = it.value();
+            auto elements = std::get<0>(updates);
+            auto cb = std::get<1>(updates);
+            outgoingUpdates.erase(it);
+            sendJingle(action, elements, [this, cb](){
+                if (cb) {
+                    cb();
+                }
+                planStep();
+            });
+            return;
+        }
+
         typedef std::tuple<QPointer<Application>,OutgoingUpdateCB> AckHndl; // will be used from callback on iq ack
         if (state == State::PrepareLocalOffer) { // we are going to send session-initiate/accept (already accepted by the user but not sent yet)
             /*
@@ -671,9 +699,7 @@ class Session::Private
                 auto out = c->outgoingUpdateType();
                 if (out == Action::ContentReject) { // yeah we are rejecting local content. invalid?
                     lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
-                    state = State::Finished;
-                    q->deleteLater();
-                    emit q->terminated();
+                    setSessionFinished();
                     return;
                 }
                 if (out != expectedContentAction) {
@@ -695,10 +721,10 @@ class Session::Private
                 if (p->creator() != role) {
                     continue; // we care only about local content for now.
                 }
-                QDomElement xml;
+                QList<QDomElement> xml;
                 OutgoingUpdateCB callback;
                 std::tie(xml, callback) = p->takeOutgoingUpdate();
-                contents.append(xml);
+                contents += xml;
                 //p->setState(State::Unacked);
                 if (callback) {
                     acceptApps.append(AckHndl{p, callback});
@@ -739,7 +765,7 @@ class Session::Private
 
         QMultiMap<Action, Application*> updates;
 
-        for (auto app : contentList) {
+        for (auto app : signalingContent) {
             Action updateType = app->outgoingUpdateType();
             if (updateType != Action::NoAction) {
                 updates.insert(updateType, app);
@@ -748,13 +774,13 @@ class Session::Private
 
         QList<AckHndl> acceptApps;
         if (updates.size()) {
-            Action action = updates.begin().key();
+            Action action = updates.begin().key(); // NOTE maybe some actions have more priority than another
             auto apps = updates.values(action);
             for (auto app: apps) {
-                QDomElement xml;
+                QList<QDomElement> xml;
                 OutgoingUpdateCB callback;
                 std::tie(xml, callback) = app->takeOutgoingUpdate();
-                updateXml.append(xml);
+                updateXml += xml;
                 if (callback) {
                     acceptApps.append(AckHndl{app, callback});
                 }
@@ -785,13 +811,37 @@ class Session::Private
         return reason;
     }
 
+    void addAndInitContent(Origin creator, Application *content)
+    {
+        contentList.insert(ContentKey{content->contentName(), creator}, content);
+        if (state != State::Created && content->outgoingUpdateType() != Action::NoAction) {
+            signalingContent.insert(content);
+        }
+        QObject::connect(content, &Application::updated, q, [this, content](){
+            signalingContent.insert(content);
+            if (!waitingAck && !stepTimer.isActive()) {
+                stepTimer.start();
+            }
+        });
+        QObject::connect(content, &Application::destroyed, q, [this, content](){
+            signalingContent.remove(content);
+            for (auto it = contentList.begin(); it != contentList.end(); ++it) { // optimize for large lists?
+                if (it.value() == content) {
+                    contentList.erase(it);
+                    break;
+                }
+            }
+        });
+    }
+
     enum AddContentError {
         Ok,
         Unparsed,
+        Unexpected,
         Unsupported
     };
 
-    std::tuple<AddContentError, Reason::Condition, Application*> parseContent(const QDomElement &ce)
+    std::tuple<AddContentError, Reason::Condition, Application*> parseContentAdd(const QDomElement &ce)
     {
         QDomElement descriptionEl = ce.firstChildElement(QLatin1String("description"));
         QDomElement transportEl = ce.firstChildElement(QLatin1String("transport"));
@@ -837,7 +887,7 @@ class Session::Private
 
     typedef std::tuple<AddContentError, Reason::Condition, QList<Application*>, QList<QDomElement>> ParseContentListResult;
 
-    ParseContentListResult parseContentList(const QDomElement &jingleEl)
+    ParseContentListResult parseContentAddList(const QDomElement &jingleEl)
     {
         QMap<QString,Application *> addSet;
         QMap<QString,std::pair<QDomElement,Reason::Condition>> rejectSet;
@@ -851,7 +901,7 @@ class Session::Private
             Reason::Condition cond;
             Application *app;
 
-            std::tie(err, cond, app) = parseContent(ce);
+            std::tie(err, cond, app) = parseContentAdd(ce);
             if (err == Private::AddContentError::Unparsed) {
                 lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
                 qDeleteAll(addSet);
@@ -875,7 +925,11 @@ class Session::Private
             rejectSet.remove(contentName);
             if (it == addSet.end() || (*it)->wantBetterTransport(app->transport())) { // probably not wantBetterTransport but wantBetterApplication
                 delete *it; // unpreferred app
-                *it = app;
+                if (it == addSet.end()) {
+                    addSet.insert(contentName, app);
+                } else {
+                    *it = app;
+                }
             }
         }
 
@@ -889,6 +943,197 @@ class Session::Private
 
         return ParseContentListResult(Ok, Reason::Success, addSet.values(), QList<QDomElement>());
     }
+
+    std::tuple<AddContentError, Reason::Condition, Application*> parseContentAccept(const QDomElement &ce)
+    {
+        QDomElement descriptionEl = ce.firstChildElement(QLatin1String("description"));
+        QDomElement transportEl = ce.firstChildElement(QLatin1String("transport"));
+        QString descriptionNS = descriptionEl.attribute(QStringLiteral("xmlns"));
+        QString transportNS = transportEl.attribute(QStringLiteral("xmlns"));
+        typedef std::tuple<AddContentError, Reason::Condition, Application*> result;
+
+        ContentBase c(ce);
+        if (!c.isValid() || role != c.creator || descriptionEl.isNull() || transportEl.isNull() ||
+                descriptionNS.isEmpty() || transportNS.isEmpty())
+        {
+            return result{Unparsed, Reason::NoReason, nullptr};
+        }
+
+        auto app = q->content(c.name, role);
+        if (!(app && app->state() == State::Pending)) { // reaccept is possible
+            return result{AddContentError::Unexpected, Reason::NoReason, app};
+        }
+
+        if (app->pad()->ns() != descriptionNS || app->transport()->pad()->ns() != transportNS) {
+            // well it's more than unexpected. let's send unparsed
+            return result{AddContentError::Unparsed, Reason::NoReason, app};
+        }
+
+        if (!app->transport()->update(transportEl) || !app->accept(descriptionEl)) {
+            // clearly unparsed. otherwise the app will generate failure event with a Reason.
+            return result{AddContentError::Unparsed, Reason::NoReason, app};
+        }
+
+        if (app->state() != State::Accepted) { // parsed but was not accepted. so it's somehow incompatible
+            return result{AddContentError::Unsupported, Reason::IncompatibleParameters, app};
+        }
+
+        return result{AddContentError::Ok, Reason::Success, app};
+    }
+
+    std::tuple<bool,QList<Application*>> parseContentAcceptList(const QDomElement &jingleEl)
+    {
+        QMap<QString,Application *> acceptSet;
+        QMap<QString,std::pair<QDomElement,Reason::Condition>> rejectSet;
+
+        QString contentTag(QStringLiteral("content"));
+        for(QDomElement ce = jingleEl.firstChildElement(contentTag);
+            !ce.isNull(); ce = ce.nextSiblingElement(contentTag))
+        {
+
+            Private::AddContentError err;
+            Reason::Condition cond;
+            Application *app;
+
+            std::tie(err, cond, app) = parseContentAccept(ce);
+            if (err == Private::AddContentError::Unparsed || err == Private::AddContentError::Unexpected) {
+                for (auto &a: acceptSet) {
+                    a->setState(State::Pending); // reset state to pending for already passed validation before passing error back
+                }
+                lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, err == Private::AddContentError::Unexpected?
+                                                    XMPP::Stanza::Error::UnexpectedRequest : XMPP::Stanza::Error::BadRequest);
+                return std::tuple<bool,QList<Application*>>(false, QList<Application*>());
+            }
+
+            auto contentName = app->contentName();
+            auto it = acceptSet.find(contentName);
+            auto rit = rejectSet.find(contentName);
+            if (it != acceptSet.end() || rit != rejectSet.end()) {
+                // duplicates are not allowed in accept request
+                for (auto &a: acceptSet) {
+                    a->setState(State::Pending); // reset state to pending for already passed validation before passing error back
+                }
+                lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
+                return std::tuple<bool,QList<Application*>>(false, QList<Application*>());
+            }
+
+            if (err != Private::AddContentError::Ok) {
+                app->setState(State::Finished); // we can't keep working with this content for whatever reason. if "accept" failed there is no fallback
+                rejectSet.insert(contentName, std::make_pair(ce, cond)); // NOTE, probably instead of ce we have to generate original description
+                continue;
+            }
+            acceptSet.insert(contentName, app);
+        }
+
+        if (rejectSet.size()) {
+            QTimer::singleShot(0, q, [this, rejectSet]() mutable {
+                auto cond = rejectSet.first().second;
+                QList<QDomElement> rejects;
+                for (auto const &i: rejectSet) {
+                    rejects.append(i.first);
+                }
+                rejects += Reason(cond).toXml(manager->client()->doc());
+                outgoingUpdates.insert(
+                            Action::ContentRemove,
+                            OutgoingUpdate{
+                                rejects,
+                                [this, rejects]() {
+                                    for (auto &r: rejects) {
+                                        ContentBase c(r);
+                                        delete contentList.take(ContentKey{c.name, role});
+                                    }
+                                    if (contentList.isEmpty()) {
+                                        // the other party has to generate session-terminate but we do not care already
+                                        setSessionFinished();
+                                    }
+                                }
+                            });
+            });
+        }
+        return std::tuple<bool,QList<Application*>>(true, acceptSet.values());
+    }
+
+
+    bool handleIncomingContentAdd(const QDomElement &jingleEl)
+    {
+        Private::AddContentError err;
+        Reason::Condition cond;
+        QList<Application *> apps;
+        QList<QDomElement> rejects;
+
+        std::tie(err, cond, apps, rejects) = parseContentAddList(jingleEl);
+        switch (err) {
+        case Private::AddContentError::Unparsed:
+        case Private::AddContentError::Unexpected:
+            return false;
+        case Private::AddContentError::Unsupported:
+            rejects += Reason(cond).toXml(manager->client()->doc());
+            outgoingUpdates.insert(Action::ContentReject, OutgoingUpdate{rejects, OutgoingUpdateCB()});
+            break;
+        case Private::AddContentError::Ok:
+            break;
+        }
+
+        if (apps.size()) {
+            Origin remoteRole = negateOrigin(role);
+            for (auto app: apps) {
+                addAndInitContent(remoteRole, app); // TODO check conflicts
+            }
+            QTimer::singleShot(0, q, [this](){ emit q->newContentReceived(); });
+        }
+        planStep();
+
+        return true;
+    }
+
+    bool handleIncomingSessionTerminate(const QDomElement &jingleEl)
+    {
+        terminateReason = Reason(jingleEl.firstChildElement(QString::fromLatin1("reason")));
+        setSessionFinished();
+        return true;
+    }
+
+    bool handleIncomingSessionAccept(const QDomElement &jingleEl)
+    {
+        bool parsed;
+        QList<Application *> apps;
+
+        std::tie(parsed, apps) = parseContentAcceptList(jingleEl);
+        if (!parsed) {
+            return false;
+        }
+
+        state = State::Connecting;
+        if (apps.size()) {
+            for (auto app: apps) {
+                app->start();
+            }
+        }
+        QTimer::singleShot(0, q, [this](){ emit q->activated(); });
+        planStep();
+
+        return true;
+    }
+
+    bool handleIncomingContentAccept(const QDomElement &jingleEl)
+    {
+        bool parsed;
+        QList<Application *> apps;
+
+        std::tie(parsed, apps) = parseContentAcceptList(jingleEl); // marks valid apps as accepted
+        if (!parsed) {
+            return false;
+        }
+
+        if (apps.size() && state >= State::Active) {
+            for (auto app: apps) {
+                app->start(); // start accepted app. connection establishing and data transfer are inside
+            }
+        }
+        planStep();
+
+        return true;
+    }
 };
 
 Session::Session(Manager *manager, const Jid &peer) :
@@ -964,16 +1209,7 @@ Application *Session::content(const QString &contentName, Origin creator)
 
 void Session::addContent(Application *content)
 {
-    d->contentList.insert(ContentKey{content->contentName(), d->role}, content);
-    if (d->state != State::Created && content->outgoingUpdateType() != Action::NoAction) {
-        d->signalingContent.insert(content);
-    }
-    connect(content, &Application::updated, this, [this](){
-        d->signalingContent.insert(static_cast<Application*>(sender()));
-        if (!d->waitingAck && !d->stepTimer.isActive()) {
-            d->stepTimer.start();
-        }
-    });
+    d->addAndInitContent(d->role, content);
 }
 
 const QMap<ContentKey, Application *> &Session::contentList() const
@@ -1089,20 +1325,18 @@ bool Session::incomingInitiate(const Jingle &jingle, const QDomElement &jingleEl
     QList<Application *> apps;
     QList<QDomElement> rejects;
 
-    std::tie(err, cond, apps, rejects) = d->parseContentList(jingleEl);
+    std::tie(err, cond, apps, rejects) = d->parseContentAddList(jingleEl);
     switch (err) {
     case Private::AddContentError::Unparsed:
+    case Private::AddContentError::Unexpected:
         return false;
     case Private::AddContentError::Unsupported:
-        QTimer::singleShot(0, this, [this, cond](){
-            d->sendJingle(Action::SessionTerminate, QList<QDomElement>() << Reason(cond).toXml(d->manager->client()->doc()));
-            d->state = State::Finished;
-            emit terminated();
-        });
+        d->terminateReason = Reason(cond);
+        d->planStep();
         return true;
     case Private::AddContentError::Ok:
         for (auto app: apps) {
-            d->contentList.insert(ContentKey{app->contentName(), Origin::Initiator}, app);
+            d->addAndInitContent(Origin::Initiator, app);
         }
         d->planStep();
         return true;
@@ -1118,42 +1352,43 @@ bool Session::updateFromXml(Action action, const QDomElement &jingleEl)
         return false;
     }
 
-    if (action == Action::SessionInfo) {
-
-    }
-
-    if (action == Action::ContentAdd) {
-        Private::AddContentError err;
-        Reason::Condition cond;
-        QList<Application *> apps;
-        QList<QDomElement> rejects;
-
-        std::tie(err, cond, apps, rejects) = d->parseContentList(jingleEl);
-        switch (err) {
-        case Private::AddContentError::Unparsed:
-            return false;
-        case Private::AddContentError::Unsupported:
-            QTimer::singleShot(0, this, [this, cond, rejects]() mutable {
-                rejects += Reason(cond).toXml(d->manager->client()->doc());
-                d->sendJingle(Action::ContentReject, rejects);
-            });
-            break;
-        case Private::AddContentError::Ok:
-            break;
-        }
-
-        if (apps.size()) {
-            Origin remoteRole = negateOrigin(d->role);
-            for (auto app: apps) {
-                d->contentList.insert(ContentKey{app->contentName(), remoteRole}, app); // TODO check conflicts
-            }
-            QTimer::singleShot(0, this, [this](){ emit newContentReceived(); });
-        }
-
-        return true;
+    switch (action) {
+    case Action::ContentAccept:
+        return d->handleIncomingContentAccept(jingleEl);
+    case Action::ContentAdd:
+        return d->handleIncomingContentAdd(jingleEl);
+    case Action::ContentModify:
+        break;
+    case Action::ContentReject:
+        break;
+    case Action::ContentRemove:
+        break;
+    case Action::DescriptionInfo:
+        break;
+    case Action::SecurityInfo:
+        break;
+    case Action::SessionAccept:
+        return d->handleIncomingSessionAccept(jingleEl);
+    case Action::SessionInfo:
+        break;
+    case Action::SessionInitiate: // impossible case. but let compiler be happy
+        break;
+    case Action::SessionTerminate:
+        return d->handleIncomingSessionTerminate(jingleEl);
+    case Action::TransportAccept:
+        break;
+    case Action::TransportInfo:
+        break;
+    case Action::TransportReject:
+        break;
+    case Action::TransportReplace:
+        break;
+    case Action::NoAction:
+    default:
+        break;
     }
 
-    d->lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::UnexpectedRequest);
+    d->lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::FeatureNotImplemented);
     return false;
 }
 
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index c5e6f77c..fb32c9b2 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -51,15 +51,28 @@ inline uint qHash(const XMPP::Jingle::Origin &o, uint seed = 0)
     return ::qHash(int(o), seed);
 }
 
+/*
+ Session states:
+  * Created           - new session
+  * PrepareLocalOffer - user accepted session but it's not yet ready for session-initiate/accept message
+  * Unacked           - session-initiate/accept was sent. wait for IQ ack
+  * Pending           - session-initiate was acknowledged. awaits session-accept.
+  * Active            - session was accepted and now active.
+  * Finihed           - session-terminate was sent/received
+
+ Locally initiated session passes all the above and remotely initiated skips Pending.
+*/
 enum class State {
     Created,     // just after constructor
     PrepareLocalOffer, // content accepted by local user but we are not ready yet to send content-accept or session-accept.
                        // same for content-add/session-initiate, where user already already sent/added in ui and it's network turn.
-    Unacked,     // local conten offer is sent to remote but no IQ ack yet
+    Unacked,     // local content offer is sent to remote but no IQ ack yet
     Pending,     // waits for session-accept or content-accept from remote
-    Connecting,  // s5b/ice probes etc (particular application state. can be omited for other entities)
-    Active,      // active transfer. transport is connected
-    Finished     // transfering is finished for whatever reason
+    Accepted,    // app only: local: "accept" received, waits for start(). remote: "accept" sent and acknowledged, waits for start()
+    Connecting,  // app only: s5b/ice probes etc (particular application state. can be omited for other entities)
+    Active,      // active transfer. transport is connected. For session it means it was accepted
+    Finishing,   // app only: basically it's finished but has some pending operations. like sending content-reject/remove to remote
+    Finished     // transfering is finished for whatever reason. no more signals/state changes etc. can be deleted
 };
 
 enum class Action {
@@ -81,9 +94,15 @@ enum class Action {
     TransportReplace
 };
 
+inline uint qHash(const XMPP::Jingle::Action &o, uint seed = 0)
+{
+    return ::qHash(int(o), seed);
+}
+
 typedef QPair<QString,Origin> ContentKey;
 typedef std::function<void ()> OutgoingUpdateCB;
-typedef std::tuple<QDomElement, OutgoingUpdateCB> OutgoingUpdate;
+typedef std::tuple<QList<QDomElement>, OutgoingUpdateCB> OutgoingUpdate; // list of elements to b inserted to <jingle> and success callback
+typedef std::tuple<QDomElement, OutgoingUpdateCB> OutgoingTransportInfoUpdate; // transport element and success callback
 
 class Jingle
 {
@@ -286,12 +305,11 @@ class Transport : public QObject {
                                 // for remote transport try to connect to all proposed hosts in order their priority.
                                 // in-band transport may just emit updated() here
     virtual bool update(const QDomElement &el) = 0; // accepts transport element on incoming transport-info
-    virtual Action outgoingUpdateType() const = 0;
-    virtual OutgoingUpdate takeOutgoingUpdate() = 0;
+    virtual bool hasUpdates() const = 0;
+    virtual OutgoingTransportInfoUpdate takeOutgoingUpdate() = 0;
     virtual bool isValid() const = 0;
     virtual Features features() const = 0;
     virtual TransportManagerPad::Ptr pad() const = 0;
-    virtual void setApplication(Application *) = 0;
 signals:
     void updated(); // found some candidates and they have to be sent. takeUpdate has to be called from this signal handler.
                     // if it's just always ready then signal has to be sent at least once otherwise session-initiate won't be sent.
@@ -336,6 +354,7 @@ class Application : public QObject
      *  When ready, the application first set update type to ContentAdd and then emit updated()
      */
     virtual void prepare() = 0;
+    virtual bool accept(const QDomElement &el) = 0; // remote accepted our content
     virtual void start() = 0;
 
 signals:

From 46b55f6b3f75be43f3e882f7d0b16338b1541d40 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sat, 11 May 2019 11:01:34 +0300
Subject: [PATCH 008/383] jingle-s5b: socks5 connection establishment

---
 src/irisnet/noncore/cutestuff/socks.cpp |  10 +-
 src/xmpp/xmpp-im/jingle-ft.cpp          |  66 +++++-
 src/xmpp/xmpp-im/jingle-ft.h            |   1 +
 src/xmpp/xmpp-im/jingle-s5b.cpp         | 265 ++++++++++++++++++++----
 src/xmpp/xmpp-im/jingle-s5b.h           |  18 +-
 src/xmpp/xmpp-im/jingle.cpp             |  10 +
 src/xmpp/xmpp-im/jingle.h               |  53 ++++-
 src/xmpp/xmpp-im/s5b.cpp                |  12 +-
 src/xmpp/xmpp-im/s5b.h                  |   2 +
 9 files changed, 379 insertions(+), 58 deletions(-)

diff --git a/src/irisnet/noncore/cutestuff/socks.cpp b/src/irisnet/noncore/cutestuff/socks.cpp
index 7dd8f4f6..8162ca65 100644
--- a/src/irisnet/noncore/cutestuff/socks.cpp
+++ b/src/irisnet/noncore/cutestuff/socks.cpp
@@ -1126,12 +1126,14 @@ void SocksServer::connectionError()
 void SocksServer::sd_activated()
 {
     while (d->sd->hasPendingDatagrams()) {
-        QByteArray datagram;
+        QByteArray datagram(d->sd->pendingDatagramSize(), Qt::Uninitialized);
         QHostAddress sender;
         quint16 senderPort;
-        datagram.resize(d->sd->pendingDatagramSize());
-        d->sd->readDatagram(datagram.data(), datagram.size(), &sender, &senderPort);
-        incomingUDP(sender.toString(), senderPort, d->sd->peerAddress(), d->sd->peerPort(), datagram);
+        auto sz = d->sd->readDatagram(datagram.data(), datagram.size(), &sender, &senderPort);
+        if (sz >= 0) {
+            datagram.truncate(sz);
+            incomingUDP(sender.toString(), senderPort, d->sd->peerAddress(), d->sd->peerPort(), datagram);
+        }
     }
 }
 
diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index f5def76c..ab4363ee 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -380,7 +380,7 @@ QStringList Manager::availableTransports() const
 class Application::Private
 {
 public:
-
+    Application *q = nullptr;
     State   state = State::Created;
     QSharedPointer<Pad> pad;
     QString contentName;
@@ -389,11 +389,19 @@ class Application::Private
     Origin  senders;
     QSharedPointer<Transport> transport;
     QStringList availableTransports;
+    bool transportFailed = false;
+
+    void setState(State s)
+    {
+        state = s;
+        emit q->stateChanged(s);
+    }
 };
 
 Application::Application(const QSharedPointer<Pad> &pad, const QString &contentName, Origin creator, Origin senders) :
     d(new Private)
 {
+    d->q       = this;
     d->pad     = pad;
     d->contentName = contentName;
     d->creator = creator;
@@ -456,6 +464,9 @@ File Application::file() const
 // incoming one? or we have to check real direction
 bool Application::setTransport(const QSharedPointer<Transport> &transport)
 {
+    if (d->transport) {
+        d->transport->disconnect(this);
+    }
     if (transport->features() & Transport::Reliable) {
         int nsIndex = d->availableTransports.indexOf(transport->pad()->ns());
         if (nsIndex == -1) {
@@ -463,7 +474,18 @@ bool Application::setTransport(const QSharedPointer<Transport> &transport)
         }
         d->availableTransports.removeAt(nsIndex);
         d->transport = transport;
-        d->state = State::Pending;
+        d->setState(State::Pending);
+        connect(transport.data(), &Transport::updated, this, &Application::updated);
+        connect(transport.data(), &Transport::connected, this, [this](){
+
+        });
+        connect(transport.data(), &Transport::failed, this, [this](){
+            if (d->availableTransports.size()) { // we can do transport-replace here
+                // TODO
+            }
+            d->transportFailed = true;
+            d->setState(State::Finishing);
+        });
         return true;
     }
     return false;
@@ -491,6 +513,11 @@ Action Application::outgoingUpdateType() const
             return Action::TransportInfo;
         }
         break;
+    case State::Finishing:
+        if (d->transportFailed) {
+            return Action::ContentRemove;
+        }
+        return Action::SecurityInfo;
     default:
         break;
     }
@@ -526,7 +553,7 @@ OutgoingUpdate Application::takeOutgoingUpdate()
         std::tie(tel, trCallback) = d->transport->takeOutgoingUpdate();
         cel.appendChild(tel);
 
-        d->state = State::Unacked;
+        d->setState(State::Unacked);
         return OutgoingUpdate{QList<QDomElement>()<<cel, [this, trCallback](){
                 if (trCallback) {
                     trCallback();
@@ -546,6 +573,24 @@ OutgoingUpdate Application::takeOutgoingUpdate()
             return OutgoingUpdate{QList<QDomElement>()<<cel, trCallback};
         }
     }
+    if (d->state == State::Finishing) {
+        if (d->transportFailed) {
+            ContentBase cb(d->pad->session()->role(), d->contentName);
+            QList<QDomElement> updates;
+            updates << cb.toXml(doc, "content");
+            updates << Reason(Reason::Condition::FailedTransport).toXml(doc);
+            return OutgoingUpdate{updates, [this](){
+                    d->setState(State::Finished);
+                }
+            };
+        }
+        // else send <received>
+        ContentBase cb(d->pad->session()->role(), d->contentName);
+        return OutgoingUpdate{QList<QDomElement>() << cb.toXml(doc, "received"), [this](){
+                d->setState(State::Finished);
+            }
+        };
+    }
     return OutgoingUpdate(); // TODO
 }
 
@@ -558,9 +603,7 @@ bool Application::wantBetterTransport(const QSharedPointer<Transport> &t) const
 bool Application::selectNextTransport()
 {
     if (d->availableTransports.size()) {
-        QString ns = d->availableTransports.takeFirst();
-        d->transport = d->pad->session()->newOutgoingTransport(ns);
-        return true;
+        return setTransport(d->pad->session()->newOutgoingTransport(d->availableTransports.first()));
     }
     return false;
 }
@@ -582,13 +625,18 @@ void Application::start()
         d->state = State::Active;
         d->transport->start();
     }
-    // TODO we nedd QIODevice somewhere here
+    // TODO we need QIODevice somewhere here
 }
 
 bool Application::accept(const QDomElement &el)
 {
-    Q_UNUSED(el);
-    return true; // TODO!!!
+    File f(el.firstChildElement("file"));
+    if (!f.isValid()) {
+        return false;
+    }
+    // TODO validate if accept file matches to the offer
+    setState(State::Accepted);
+    return true;
 }
 
 bool Application::isValid() const
diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index e2c2171c..20f23098 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -21,6 +21,7 @@
 #define JINGLEFT_H
 
 #include "jingle.h"
+#include "xmpp_hash.h"
 
 namespace XMPP {
 
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 15b6295c..718d0b0d 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -22,7 +22,9 @@
 #include "xmpp/jid/jid.h"
 #include "xmpp_client.h"
 #include "xmpp_serverinfomanager.h"
+#include "socks.h"
 
+#include <QElapsedTimer>
 #include <QTimer>
 
 namespace XMPP {
@@ -31,15 +33,51 @@ namespace S5B {
 
 const QString NS(QStringLiteral("urn:xmpp:jingle:transports:s5b:1"));
 
+static QString makeKey(const QString &sid, const Jid &j1, const Jid &j2)
+{
+    return QString::fromLatin1(QCryptographicHash::hash((sid +
+                                                         j1.full() +
+                                                         j2.full()).toUtf8(),
+                                                        QCryptographicHash::Sha1));
+}
+
+class Connection : public XMPP::Jingle::Connection
+{
+    Q_OBJECT
+
+    QList<NetworkDatagram> datagrams;
+public:
+    bool hasPendingDatagrams() const
+    {
+        return datagrams.size() > 0;
+    }
+
+    NetworkDatagram receiveDatagram(qint64 maxSize = -1)
+    {
+        Q_UNUSED(maxSize); // TODO or not?
+        return datagrams.size()? datagrams.takeFirst(): NetworkDatagram();
+    }
+protected:
+    friend class Transport;
+    void enqueueIncomingUDP(const QByteArray &data)
+    {
+        datagrams.append(NetworkDatagram{data});
+        emit readyRead();
+    }
+};
+
 class Candidate::Private : public QSharedData {
 public:
     QString cid;
     QString host;
     Jid jid;
-    quint16 port;
-    quint32 priority;
+    quint16 port = 0;
+    quint32 priority = 0;
     Candidate::Type type = Candidate::Direct;
     Candidate::State state = Candidate::New;
+
+    quint16 localPort = 0; // where Psi actually listens. e.g. with NAT-assited candidats it may be different from just port
+    SocksClient *socksClient = nullptr;
 };
 
 Candidate::Candidate()
@@ -133,12 +171,15 @@ Candidate::Candidate(const QString &host, quint16 port, const QString &cid, Type
     } else {
         d->priority = 0;
     }
+    if (type == Direct) {
+        d->localPort = port;
+    }
     d->state = New;
 }
 
 Candidate::~Candidate()
 {
-
+    delete d->socksClient;
 }
 
 Candidate::Type Candidate::type() const
@@ -176,6 +217,16 @@ void Candidate::setPort(quint16 port)
     d->port = port;
 }
 
+quint16 Candidate::localPort() const
+{
+    return d->localPort;
+}
+
+void Candidate::setLocalPort(quint16 port)
+{
+    d->localPort = port;
+}
+
 Candidate::State Candidate::state() const
 {
     return d->state;
@@ -211,10 +262,30 @@ QDomElement Candidate::toXml(QDomDocument *doc) const
     return e;
 }
 
-void Candidate::connectToHost(std::function<void(bool)> callback)
+void Candidate::connectToHost(const QString &key, std::function<void(bool)> callback, bool isUdp)
 {
     // TODO negotiate socks5 connection to host and port
-    Q_UNUSED(callback)
+    d->socksClient = new SocksClient;
+
+    QObject::connect(d->socksClient, &SocksClient::connected, [this, callback](){
+        callback(true);
+    });
+    QObject::connect(d->socksClient, &SocksClient::error, [this, callback](int error){
+        Q_UNUSED(error);
+        callback(false);
+    });
+    //connect(&t, SIGNAL(timeout()), SLOT(trySendUDP()));
+
+    d->socksClient->connectToHost(d->host, d->port, key, 0, isUdp);
+}
+
+bool Candidate::incomingConnection(SocksClient *sc)
+{
+    if (d->socksClient) {
+        return false;
+    }
+    d->socksClient = sc;
+    return false;
 }
 
 class Transport::Private : public QSharedData {
@@ -244,9 +315,20 @@ class Transport::Private : public QSharedData {
     QMap<QString,Candidate> remoteCandidates;
     Candidate localUsedCandidate; // we received "candidate-used" for this candidate from localCandidates list
     Candidate remoteUsedCandidate; // we sent "candidate-used" for this candidate from remoteCandidates list
-    QString dstaddr;
+    QString dstaddr; // an address for xmpp proxy as it comes from remote. each side calculates it like sha1(sid + local jid + remote jid)
+    QString directAddr; // like dstaddr but for direct connection. Basically it's sha1(sid + initiator jid + responder jid)
     QString sid;
     Transport::Mode mode = Transport::Tcp;
+    QTimer probingTimer;
+    QElapsedTimer lastConnectionStart;
+
+    QSharedPointer<Connection> connection;
+
+    // udp stuff
+    bool udpInitialized;
+    quint16 udpPort;
+    QHostAddress udpAddress;
+
 
     inline Jid remoteJid() const
     {
@@ -277,18 +359,63 @@ class Transport::Private : public QSharedData {
         if (!connectionStarted) {
             return; // will come back later
         }
-        quint64 priority = 0;
-        Candidate candidate;
+        quint64 maxProbingPrio = 0;
+        quint64 maxNewPrio = 0;
+        Candidate maxProbing;
+        Candidate maxNew;
+
+        /*
+         We have to find highest-priority already connecting candidate and highest-priority new candidate.
+         If already-connecting is not found then start connecting to new if it's found.
+         If both already-connecting and new are found then
+            if new candidate has higher priority or the same priority then start connecting
+            else ensure the new candidate starts connecting in 200ms after previous connection attempt
+                 (if it's in future then reschedule this call for future)
+         In all the other cases just return and wait for events.
+        */
+
         for (auto &c: remoteCandidates) {
-            if ((c.state() == Candidate::New || c.state() == Candidate::Probing) && c.priority() > priority) {
-                candidate = c;
-                priority = c.priority();
+            if (c.state() == Candidate::New && c.priority() > maxNewPrio) {
+                maxNew = c;
+                maxNewPrio = c.priority();
+            }
+            if (c.state() == Candidate::Probing && c.priority() > maxProbingPrio) {
+                maxProbing = c;
+                maxProbingPrio = c.priority();
             }
         }
-        if (candidate && candidate.state() == Candidate::Probing) {
-            return; // already trying connection
+        if (!maxNew) {
+            return; // nowhere to connect
+        }
+
+        if (maxProbing) {
+            if (maxNew.priority() < maxProbing.priority()) {
+                if (probingTimer.isActive()) {
+                    return; // we will come back here soon
+                }
+                qint64 msToFuture = 200 - lastConnectionStart.elapsed();
+                if (msToFuture > 0) { // seems like we have to rescheduler for future
+                    probingTimer.start(int(msToFuture));
+                    return;
+                }
+            }
         }
-        // TODO start connecting to the candidate here
+
+        // now we have to connect to maxNew candidate
+        lastConnectionStart.start();
+        QString key = maxNew.type() == Candidate::Proxy? dstaddr : directAddr;
+        maxNew.connectToHost(key, [this, maxNew](bool success) {
+            // candidate's status had to be changed by connectToHost, so we don't set it again
+            // if our candidate has higher priority than any of local or remoteUsedCandidate then set it as "used"
+            if (success && (!remoteUsedCandidate || remoteUsedCandidate.priority() < maxNew.priority()) &&
+                    ((!localUsedCandidate || localUsedCandidate.priority() < maxNew.priority())))
+            {
+                remoteUsedCandidate = maxNew;
+                localUsedCandidate = Candidate();
+                updateMinimalPriority();
+            }
+            checkAndFinishNegotiation();
+        }, mode == Transport::Udp);
     }
 
     bool hasUnaknowledgedLocalCandidates() const
@@ -347,14 +474,15 @@ class Transport::Private : public QSharedData {
                             // If it's proxy, first it has to be activated
                             if (localUsedCandidate) {
                                 // it's our side who proposed proxy. so we have to connect to it and activate
-                                c.connectToHost([this](bool success){
+                                auto key = makeKey(sid, pad->session()->me(), pad->session()->peer());
+                                c.connectToHost(key, [this](bool success){
                                     if (success) {
                                         pendingActions |= Private::Activated;
                                     } else {
                                         pendingActions |= Private::ProxyError;
                                     }
                                     emit q->updated();
-                                });
+                                }, mode == Transport::Udp);
                             } // else so it's remote proxy. let's just wait for <activated> from remote
                         } else {
                             c.setState(Candidate::Active);
@@ -452,6 +580,8 @@ Transport::Transport(const TransportManagerPad::Ptr &pad) :
 {
     d->q = this;
     d->pad = pad.staticCast<Pad>();
+    d->probingTimer.setSingleShot(true);
+    d->probingTimer.callOnTimeout([this](){ d->tryConnectToRemoteCandidate(); });
     connect(pad->manager(), &TransportManager::abortAllRequested, this, [this](){
         d->aborted = true;
         emit failed();
@@ -472,7 +602,7 @@ Transport::Transport(const TransportManagerPad::Ptr &pad, const QDomElement &tra
 
 Transport::~Transport()
 {
-
+    static_cast<Manager*>(d->pad->manager())->removeKeyMapping(d->directAddr);
 }
 
 TransportManagerPad::Ptr Transport::pad() const
@@ -487,6 +617,9 @@ void Transport::prepare()
         d->sid = d->pad->generateSid();
     }
     d->pad->registerSid(d->sid);
+    d->directAddr = makeKey(d->sid, d->pad->session()->initiator(), d->pad->session()->responder());
+    m->addKeyMapping(d->directAddr, this);
+
 
     auto serv = m->socksServ();
     if (serv) {
@@ -728,10 +861,7 @@ OutgoingTransportInfoUpdate Transport::takeOutgoingUpdate()
             c.setState(Candidate::Unacked);
         }
         if (useProxy) {
-            QString dstaddr = QCryptographicHash::hash((d->sid +
-                                                        d->pad->session()->me().full() +
-                                                        d->pad->session()->peer().full()).toUtf8(),
-                                                       QCryptographicHash::Sha1);
+            QString dstaddr = makeKey(d->sid, d->pad->session()->me(), d->pad->session()->peer());
             tel.setAttribute(QStringLiteral("dstaddr"), dstaddr);
         }
         if (!candidatesToSend.isEmpty()) {
@@ -832,25 +962,60 @@ QString Transport::sid() const
     return d->sid;
 }
 
-bool Transport::incomingConnection(SocksClient *sc, const QString &key)
+bool Transport::incomingConnection(SocksClient *sc)
 {
-    // incoming direct connection
-#if 0
-    if(!d->allowIncoming) {
-        sc->requestDeny();
-        sc->deleteLater();
-        return;
+    if (!d->connection) {
+        for (auto &c: d->localCandidates) {
+            auto s = sc->abstractSocket();
+            if (s->localPort() == c.localPort() && c.state() == Candidate::Pending) {
+                if(d->mode == Transport::Udp)
+                    sc->grantUDPAssociate("", 0);
+                else
+                    sc->grantConnect();
+                // we can also remember the server it comes from. static_cast<S5BServer *>(sender())
+                return c.incomingConnection(sc);
+            }
+        }
     }
-    if(d->mode == Transport::Udp)
-        sc->grantUDPAssociate("", 0);
-    else
-        sc->grantConnect();
-    e->relatedServer = static_cast<S5BServer *>(sender());
-    e->i->setIncomingClient(sc);
-#endif
+
+    sc->requestDeny();
+    sc->deleteLater();
     return false;
 }
 
+bool Transport::incomingUDP(bool init, const QHostAddress &addr, int port, const QString &key, const QByteArray &data)
+{
+    if (d->mode != Transport::Mode::Udp) {
+        return false;
+    }
+
+    if(init) {
+        // TODO probably we could create a Connection here and put all the params inside
+        if(d->udpInitialized)
+            return false; // only init once
+
+        // lock on to this sender
+        d->udpAddress = addr;
+        d->udpPort = port;
+        d->udpInitialized = true;
+
+        // reply that initialization was successful
+        d->pad->session()->manager()->client()->s5bManager()->jtPush()->sendUDPSuccess(d->pad->session()->peer(), key); // TODO fix ->->->
+        return true;
+    }
+
+    // not initialized yet?  something went wrong
+    if(!d->udpInitialized)
+        return false;
+
+    // must come from same source as when initialized
+    if(addr != d->udpAddress || port != d->udpPort)
+        return false;
+
+    d->connection->enqueueIncomingUDP(data); // man_udpReady
+    return true;
+}
+
 //----------------------------------------------------------------
 // Manager
 //----------------------------------------------------------------
@@ -919,6 +1084,15 @@ void Manager::setServer(S5BServer *serv)
     if(d->serv) {
         d->serv->unlink(this);
         d->serv = nullptr;
+
+        auto jt = d->jingleManager->client()->s5bManager()->jtPush();
+        connect(jt, &JT_PushS5B::incomingUDPSuccess, this, [this](const Jid &from, const QString &dstaddr) {
+            Q_UNUSED(from);
+            auto t = d->key2transport.value(dstaddr);
+            if (t) {
+                // TODO return t->incomingUDPSuccess(from);
+            }
+        }, Qt::UniqueConnection);
     }
 
     if(serv) {
@@ -927,11 +1101,30 @@ void Manager::setServer(S5BServer *serv)
     }
 }
 
+void Manager::addKeyMapping(const QString &key, Transport *transport)
+{
+    d->key2transport.insert(key, transport);
+}
+
+void Manager::removeKeyMapping(const QString &key)
+{
+    d->key2transport.remove(key);
+}
+
 bool Manager::incomingConnection(SocksClient *client, const QString &key)
 {
     auto t = d->key2transport.value(key);
     if (t) {
-        return t->incomingConnection(client, key);
+        return t->incomingConnection(client);
+    }
+    return false;
+}
+
+bool Manager::incomingUDP(bool init, const QHostAddress &addr, int port, const QString &key, const QByteArray &data)
+{
+    auto t = d->key2transport.value(key);
+    if (t) {
+        return t->incomingUDP(init, addr, port, key, data);
     }
     return false;
 }
diff --git a/src/xmpp/xmpp-im/jingle-s5b.h b/src/xmpp/xmpp-im/jingle-s5b.h
index e4edb4c1..01cc7978 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.h
+++ b/src/xmpp/xmpp-im/jingle-s5b.h
@@ -31,6 +31,7 @@
 
 #include "jingle.h"
 
+class QHostAddress;
 class SocksClient;
 
 namespace XMPP {
@@ -104,13 +105,16 @@ class Candidate {
     void setHost(const QString &host);
     quint16 port() const;
     void setPort(quint16 port);
+    quint16 localPort() const;
+    void setLocalPort(quint16 port);
     State state() const;
     void setState(State s);
     quint32 priority() const;
 
     QDomElement toXml(QDomDocument *doc) const;
 
-    void connectToHost(std::function<void (bool)> callback);
+    void connectToHost(const QString &key, std::function<void (bool)> callback, bool isUdp = false);
+    bool incomingConnection(SocksClient *sc);
 private:
     class Private;
     QExplicitlySharedDataPointer<Private> d;
@@ -140,11 +144,12 @@ class Transport : public XMPP::Jingle::Transport
     bool isValid() const override;
     Features features() const override;
 
-    QString sid() const;
-
-    bool incomingConnection(SocksClient *sc, const QString &key);
-
+    QString sid() const;    
 private:
+    friend class S5BServer;
+    bool incomingConnection(SocksClient *sc);
+    bool incomingUDP(bool init, const QHostAddress &addr, int port, const QString &key, const QByteArray &data);
+
     friend class Manager;
     static QSharedPointer<XMPP::Jingle::Transport> createOutgoing(const TransportManagerPad::Ptr &pad);
     static QSharedPointer<XMPP::Jingle::Transport> createIncoming(const TransportManagerPad::Ptr &pad, const QDomElement &transportEl);
@@ -188,12 +193,15 @@ class Manager : public TransportManager {
 
     void setServer(S5BServer *serv);
     bool incomingConnection(SocksClient *client, const QString &key); // returns false if key is unknown
+    bool incomingUDP(bool init, const QHostAddress &addr, int port, const QString &key, const QByteArray &data);
 
     QString generateSid(const Jid &remote);
     void registerSid(const Jid &remote, const QString &sid);
 
     S5BServer* socksServ() const;
     Jid userProxy() const;
+    void addKeyMapping(const QString &key, Transport *transport);
+    void removeKeyMapping(const QString &key);
 private:
     class Private;
     QScopedPointer<Private> d;
diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index 8c0ef35d..107bac98 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -1588,6 +1588,16 @@ Origin negateOrigin(Origin o)
     return Origin::None;
 }
 
+bool Connection::hasPendingDatagrams() const
+{
+    return false;
+}
+
+NetworkDatagram Connection::receiveDatagram(qint64 maxSize)
+{
+    return NetworkDatagram();
+}
+
 
 } // namespace Jingle
 } // namespace XMPP
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index fb32c9b2..e2c06657 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -20,11 +20,16 @@
 #ifndef JINGLE_H
 #define JINGLE_H
 
-#include "xmpp_hash.h"
+#include "bytestream.h"
 
 #include <QSharedDataPointer>
 #include <QSharedPointer>
 #include <functional>
+#if QT_VERSION >= QT_VERSION_CHECK(5,8,0)
+# include <QNetworkDatagram>
+#endif
+
+#include "xmpp_stanza.h"
 
 class QDomElement;
 class QDomDocument;
@@ -249,6 +254,47 @@ class ApplicationManagerPad : public SessionManagerPad
     virtual QString generateContentName(Origin senders) = 0;
 };
 
+#if QT_VERSION < QT_VERSION_CHECK(5,8,0)
+// stub implementation
+class NetworkDatagram
+{
+public:
+    bool _valid = false;
+    QByteArray _data;
+    inline NetworkDatagram(const QByteArray &data, const QHostAddress &destinationAddress = QHostAddress(), quint16 port = 0) :
+        _valid(true),
+        _data(data)
+    {
+        Q_UNUSED(destinationAddress);
+        Q_UNUSED(port)
+    }
+    inline NetworkDatagram(){}
+
+    inline bool isValid() const { return _valid; }
+    inline QByteArray data() const { return _data; }
+}
+#else
+typedef QNetworkDatagram NetworkDatagram;
+#endif
+
+class Connection : public ByteStream
+{
+    Q_OBJECT
+
+    QList<NetworkDatagram> datagrams;
+public:
+    virtual bool hasPendingDatagrams() const;
+    virtual NetworkDatagram receiveDatagram(qint64 maxSize = -1);
+
+protected:
+    friend class Transport;
+    void enqueueIncomingUDP(const QByteArray &data)
+    {
+        datagrams.append(data);
+        emit readyRead();
+    }
+};
+
 class Application;
 class Transport : public QObject {
     Q_OBJECT
@@ -330,7 +376,7 @@ class Application : public QObject
 
     virtual ApplicationManagerPad::Ptr pad() const = 0;
     virtual State state() const = 0;
-    virtual void setState(State state) = 0; // likely just remember the state
+    virtual void setState(State state) = 0; // likely just remember the state and not generate any signals
 
     virtual Origin creator() const = 0;
     virtual Origin senders() const = 0;
@@ -358,7 +404,8 @@ class Application : public QObject
     virtual void start() = 0;
 
 signals:
-    void updated();
+    void updated(); // signal for session it has to send updates to remote. so it will follow with takeOutgoingUpdate() eventually
+    void stateChanged(State);
 };
 
 class Session : public QObject
diff --git a/src/xmpp/xmpp-im/s5b.cpp b/src/xmpp/xmpp-im/s5b.cpp
index 2839ac39..884445cd 100644
--- a/src/xmpp/xmpp-im/s5b.cpp
+++ b/src/xmpp/xmpp-im/s5b.cpp
@@ -632,6 +632,11 @@ void S5BManager::setServer(S5BServer *serv)
     }
 }
 
+JT_PushS5B* S5BManager::jtPush() const
+{
+    return d->ps;
+}
+
 BSConnection *S5BManager::createConnection()
 {
     return new S5BConnection(this);
@@ -2102,7 +2107,12 @@ void S5BServer::ss_incomingUDP(const QString &host, int port, const QHostAddress
     if(port != 0 && port != 1)
         return;
 
-    // TODO check jingle managers too
+    for (Jingle::S5B::Manager *m: d->jingleManagerList) {
+        if (m->incomingUDP(port == 1 ? true : false, addr, sourcePort, host, data)) {
+            return;
+        }
+    }
+
     foreach(S5BManager* m, d->manList) {
         if(m->srv_ownsHash(host)) {
             m->srv_incomingUDP(port == 1 ? true : false, addr, sourcePort, host, data);
diff --git a/src/xmpp/xmpp-im/s5b.h b/src/xmpp/xmpp-im/s5b.h
index 1cd62515..2fca6c6d 100644
--- a/src/xmpp/xmpp-im/s5b.h
+++ b/src/xmpp/xmpp-im/s5b.h
@@ -46,6 +46,7 @@ namespace XMPP
     class S5BConnection;
     class S5BManager;
     class S5BServer;
+    class JT_PushS5B;
     struct S5BRequest;
     typedef QList<StreamHost> StreamHostList;
     typedef QList<S5BConnection*> S5BConnectionList;
@@ -152,6 +153,7 @@ namespace XMPP
         Client *client() const;
         S5BServer *server() const;
         void setServer(S5BServer *s);
+        JT_PushS5B *jtPush() const;
 
         bool isAcceptableSID(const Jid &peer, const QString &sid) const;
 

From 1428cdd356f8b9de83a3e719433a8a2fd2444341 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 13 May 2019 00:25:32 +0300
Subject: [PATCH 009/383] jignle-ft/s5b: more connection handling stuff

---
 src/xmpp/xmpp-im/jingle-ft.cpp  |  7 ++-
 src/xmpp/xmpp-im/jingle-s5b.cpp | 86 ++++++++++++++++++++++++++++++---
 src/xmpp/xmpp-im/jingle-s5b.h   |  8 ++-
 src/xmpp/xmpp-im/jingle.h       | 12 +----
 4 files changed, 93 insertions(+), 20 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index ab4363ee..187d722d 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -388,6 +388,7 @@ class Application::Private
     Origin  creator;
     Origin  senders;
     QSharedPointer<Transport> transport;
+    Connection::Ptr connection;
     QStringList availableTransports;
     bool transportFailed = false;
 
@@ -477,7 +478,11 @@ bool Application::setTransport(const QSharedPointer<Transport> &transport)
         d->setState(State::Pending);
         connect(transport.data(), &Transport::updated, this, &Application::updated);
         connect(transport.data(), &Transport::connected, this, [this](){
-
+            d->connection = d->transport->connection();
+            connect(d->connection.data(), &Connection::readyRead, this, [this](){
+                // TODO read data
+            });
+            d->setState(State::Active);
         });
         connect(transport.data(), &Transport::failed, this, [this](){
             if (d->availableTransports.size()) { // we can do transport-replace here
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 718d0b0d..de9872ad 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -46,7 +46,21 @@ class Connection : public XMPP::Jingle::Connection
     Q_OBJECT
 
     QList<NetworkDatagram> datagrams;
+    SocksClient *client;
+    Transport::Mode mode;
 public:
+    Connection(SocksClient *client, Transport::Mode mode) :
+        client(client),
+        mode(mode)
+    {
+        connect(client, &SocksClient::readyRead, this, &Connection::readyRead);
+        if (client->isOpen()) {
+            setOpenMode(client->openMode());
+        } else {
+            qWarning("Creating S5B Transport connection on closed SockClient connection");
+        }
+    }
+
     bool hasPendingDatagrams() const
     {
         return datagrams.size() > 0;
@@ -57,7 +71,39 @@ class Connection : public XMPP::Jingle::Connection
         Q_UNUSED(maxSize); // TODO or not?
         return datagrams.size()? datagrams.takeFirst(): NetworkDatagram();
     }
+
+    qint64 bytesAvailable() const
+    {
+        if(client)
+            return client->bytesAvailable();
+        else
+            return 0;
+    }
+
+    qint64 bytesToWrite() const
+    {
+        return client->bytesToWrite();
+    }
+
 protected:
+    qint64 writeData(const char *data, qint64 maxSize)
+    {
+        if(mode == Transport::Tcp)
+            return client->write(data, maxSize);
+        return 0;
+    }
+
+    qint64 readData(char *data, qint64 maxSize)
+    {
+        if(client)
+            return client->read(data, maxSize);
+        else
+            return 0;
+    }
+
+
+
+private:
     friend class Transport;
     void enqueueIncomingUDP(const QByteArray &data)
     {
@@ -66,7 +112,8 @@ class Connection : public XMPP::Jingle::Connection
     }
 };
 
-class Candidate::Private : public QSharedData {
+class Candidate::Private : public QObject, public QSharedData {
+    Q_OBJECT
 public:
     QString cid;
     QString host;
@@ -262,16 +309,17 @@ QDomElement Candidate::toXml(QDomDocument *doc) const
     return e;
 }
 
-void Candidate::connectToHost(const QString &key, std::function<void(bool)> callback, bool isUdp)
+void Candidate::connectToHost(const QString &key, State successState, std::function<void(bool)> callback, bool isUdp)
 {
-    // TODO negotiate socks5 connection to host and port
     d->socksClient = new SocksClient;
 
-    QObject::connect(d->socksClient, &SocksClient::connected, [this, callback](){
+    QObject::connect(d->socksClient, &SocksClient::connected, [this, callback, successState](){
+        d->state = successState;
         callback(true);
     });
     QObject::connect(d->socksClient, &SocksClient::error, [this, callback](int error){
         Q_UNUSED(error);
+        d->state = Candidate::Discarded;
         callback(false);
     });
     //connect(&t, SIGNAL(timeout()), SLOT(trySendUDP()));
@@ -285,9 +333,24 @@ bool Candidate::incomingConnection(SocksClient *sc)
         return false;
     }
     d->socksClient = sc;
+    QObject::connect(d->socksClient, &SocksClient::error, [this](int error){
+        Q_UNUSED(error);
+        d->state = Candidate::Discarded;
+    });
     return false;
 }
 
+SocksClient *Candidate::takeSocksClient()
+{
+    if (!d->socksClient) {
+        return nullptr;
+    }
+    auto c = d->socksClient;
+    d->socksClient = nullptr;
+    d->disconnect(c);
+    return c;
+}
+
 class Transport::Private : public QSharedData {
 public:
     enum PendingActions {
@@ -404,7 +467,7 @@ class Transport::Private : public QSharedData {
         // now we have to connect to maxNew candidate
         lastConnectionStart.start();
         QString key = maxNew.type() == Candidate::Proxy? dstaddr : directAddr;
-        maxNew.connectToHost(key, [this, maxNew](bool success) {
+        maxNew.connectToHost(key, Candidate::Pending, [this, maxNew](bool success) {
             // candidate's status had to be changed by connectToHost, so we don't set it again
             // if our candidate has higher priority than any of local or remoteUsedCandidate then set it as "used"
             if (success && (!remoteUsedCandidate || remoteUsedCandidate.priority() < maxNew.priority()) &&
@@ -475,7 +538,7 @@ class Transport::Private : public QSharedData {
                             if (localUsedCandidate) {
                                 // it's our side who proposed proxy. so we have to connect to it and activate
                                 auto key = makeKey(sid, pad->session()->me(), pad->session()->peer());
-                                c.connectToHost(key, [this](bool success){
+                                c.connectToHost(key, Candidate::Active, [this](bool success){
                                     if (success) {
                                         pendingActions |= Private::Activated;
                                     } else {
@@ -489,6 +552,7 @@ class Transport::Private : public QSharedData {
                         }
                     }
                     if (c.state() == Candidate::Active) {
+                        connection.reset(new Connection(c.takeSocksClient(), mode));
                         emit q->connected();
                     }
                 } else { // both sides reported candidate error
@@ -581,7 +645,7 @@ Transport::Transport(const TransportManagerPad::Ptr &pad) :
     d->q = this;
     d->pad = pad.staticCast<Pad>();
     d->probingTimer.setSingleShot(true);
-    d->probingTimer.callOnTimeout([this](){ d->tryConnectToRemoteCandidate(); });
+    connect(&d->probingTimer, &QTimer::timeout, [this](){ d->tryConnectToRemoteCandidate(); });
     connect(pad->manager(), &TransportManager::abortAllRequested, this, [this](){
         d->aborted = true;
         emit failed();
@@ -789,6 +853,7 @@ bool Transport::update(const QDomElement &transportEl)
             return true;
         }
         c.setState(Candidate::Active);
+        d->connection.reset(new Connection(c.takeSocksClient(), d->mode));
         QTimer::singleShot(0, this, [this](){ emit connected(); });
         return true;
     }
@@ -962,6 +1027,11 @@ QString Transport::sid() const
     return d->sid;
 }
 
+Connection::Ptr Transport::connection() const
+{
+    return d->connection.staticCast<XMPP::Jingle::Connection>();
+}
+
 bool Transport::incomingConnection(SocksClient *sc)
 {
     if (!d->connection) {
@@ -1193,3 +1263,5 @@ void Pad::registerSid(const QString &sid)
 } // namespace S5B
 } // namespace Jingle
 } // namespace XMPP
+
+#include "jingle-s5b.moc"
diff --git a/src/xmpp/xmpp-im/jingle-s5b.h b/src/xmpp/xmpp-im/jingle-s5b.h
index 01cc7978..f403bf11 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.h
+++ b/src/xmpp/xmpp-im/jingle-s5b.h
@@ -44,6 +44,7 @@ namespace S5B {
 
 extern const QString NS;
 
+class Transport;
 class Candidate {
 public:
     enum Type {
@@ -113,10 +114,12 @@ class Candidate {
 
     QDomElement toXml(QDomDocument *doc) const;
 
-    void connectToHost(const QString &key, std::function<void (bool)> callback, bool isUdp = false);
+    void connectToHost(const QString &key, State successState, std::function<void (bool)> callback, bool isUdp = false);
     bool incomingConnection(SocksClient *sc);
+    SocksClient* takeSocksClient();
 private:
     class Private;
+    friend class Transport;
     QExplicitlySharedDataPointer<Private> d;
 };
 
@@ -144,7 +147,8 @@ class Transport : public XMPP::Jingle::Transport
     bool isValid() const override;
     Features features() const override;
 
-    QString sid() const;    
+    QString sid() const;
+    Connection::Ptr connection() const;
 private:
     friend class S5BServer;
     bool incomingConnection(SocksClient *sc);
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index e2c06657..4ea281e3 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -280,19 +280,10 @@ typedef QNetworkDatagram NetworkDatagram;
 class Connection : public ByteStream
 {
     Q_OBJECT
-
-    QList<NetworkDatagram> datagrams;
 public:
+    using Ptr = QSharedPointer<Connection>; // will be shared between transport and application
     virtual bool hasPendingDatagrams() const;
     virtual NetworkDatagram receiveDatagram(qint64 maxSize = -1);
-
-protected:
-    friend class Transport;
-    void enqueueIncomingUDP(const QByteArray &data)
-    {
-        datagrams.append(data);
-        emit readyRead();
-    }
 };
 
 class Application;
@@ -356,6 +347,7 @@ class Transport : public QObject {
     virtual bool isValid() const = 0;
     virtual Features features() const = 0;
     virtual TransportManagerPad::Ptr pad() const = 0;
+    virtual Connection::Ptr connection() const = 0; // returns established QIODevice-based connection
 signals:
     void updated(); // found some candidates and they have to be sent. takeUpdate has to be called from this signal handler.
                     // if it's just always ready then signal has to be sent at least once otherwise session-initiate won't be sent.

From f723c867e8b974eab2ff6d76e76fe8d7bc89c93b Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 13 May 2019 08:03:23 +0300
Subject: [PATCH 010/383] applied 0001-temporary-iris-fix.diff

---
 src/xmpp/CMakeLists.txt         | 4 ++--
 src/xmpp/xmpp-im/jingle-s5b.cpp | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/xmpp/CMakeLists.txt b/src/xmpp/CMakeLists.txt
index 593b5dc1..3d72b436 100644
--- a/src/xmpp/CMakeLists.txt
+++ b/src/xmpp/CMakeLists.txt
@@ -123,8 +123,9 @@ set(SOURCES
     xmpp-im/xmpp_vcard.cpp
     xmpp-im/xmpp_xdata.cpp
     xmpp-im/xmpp_xmlcommon.cpp
-    xmpp-im/jingle-s5b.cpp
+    xmpp-im/jingle.cpp
     xmpp-im/jingle-ft.cpp
+    xmpp-im/jingle-s5b.cpp
 
     base/randomnumbergenerator.cpp
     base/timezone.cpp
@@ -150,7 +151,6 @@ set(SOURCES
 
     xmpp-im/s5b.cpp
     xmpp-im/xmpp_features.cpp
-    xmpp-im/jingle.cpp
     )
 
 add_library(iris
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index de9872ad..e13ded99 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -16,7 +16,6 @@
  * along with this library.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-
 #include "jingle-s5b.h"
 #include "s5b.h"
 #include "xmpp/jid/jid.h"

From 0ef610398bdfb902a6e3a7550573df936e8deaaf Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 13 May 2019 10:20:40 +0300
Subject: [PATCH 011/383] Fixed crash on s5b destruction

---
 src/xmpp/xmpp-im/jingle-s5b.cpp | 25 ++++++++++++++++---------
 src/xmpp/xmpp-im/jingle.cpp     |  6 +++++-
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index e13ded99..46cccde7 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -1106,11 +1106,25 @@ Manager::Manager(QObject *parent) :
     TransportManager(parent),
     d(new Private)
 {
+    // ensure S5BManager is initialized
+    QTimer::singleShot(0, [this](){
+        auto jt = d->jingleManager->client()->s5bManager()->jtPush();
+        connect(jt, &JT_PushS5B::incomingUDPSuccess, this, [this](const Jid &from, const QString &dstaddr) {
+            Q_UNUSED(from);
+            auto t = d->key2transport.value(dstaddr);
+            if (t) {
+                // TODO return t->incomingUDPSuccess(from);
+            }
+        });
+    });
 }
 
 Manager::~Manager()
 {
     d->jingleManager->unregisterTransport(NS);
+    if (d->serv) {
+        d->serv->unlink(this);
+    }
 }
 
 Transport::Features Manager::features() const
@@ -1153,20 +1167,13 @@ void Manager::setServer(S5BServer *serv)
     if(d->serv) {
         d->serv->unlink(this);
         d->serv = nullptr;
-
-        auto jt = d->jingleManager->client()->s5bManager()->jtPush();
-        connect(jt, &JT_PushS5B::incomingUDPSuccess, this, [this](const Jid &from, const QString &dstaddr) {
-            Q_UNUSED(from);
-            auto t = d->key2transport.value(dstaddr);
-            if (t) {
-                // TODO return t->incomingUDPSuccess(from);
-            }
-        }, Qt::UniqueConnection);
     }
 
     if(serv) {
         d->serv = serv;
         d->serv->link(this);
+    } else {
+        d->serv = nullptr;
     }
 }
 
diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index 107bac98..b1d48a9d 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -1239,7 +1239,10 @@ QSharedPointer<Transport> Session::newOutgoingTransport(const QString &ns)
 QString Session::preferredApplication() const
 {
     // TODO some heuristics to detect preferred application
-    return d->applicationPads.keys().value(0);
+    if (d->applicationPads.size()) {
+        return d->applicationPads.constBegin().key();
+    }
+    return QString();
 }
 
 QStringList Session::allApplicationTypes() const
@@ -1595,6 +1598,7 @@ bool Connection::hasPendingDatagrams() const
 
 NetworkDatagram Connection::receiveDatagram(qint64 maxSize)
 {
+    Q_UNUSED(maxSize)
     return NetworkDatagram();
 }
 

From b07d12076885ca56117070e2ada6e8a1c956a595 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 13 May 2019 12:12:32 +0300
Subject: [PATCH 012/383] jingle: fixed a few bugs after Gajim interoperability
 tests

---
 src/xmpp/xmpp-im/jingle-s5b.cpp | 11 +++++++----
 src/xmpp/xmpp-im/jingle-s5b.h   | 12 ++++++++++++
 src/xmpp/xmpp-im/jingle.cpp     | 18 +++++++++++-------
 3 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 46cccde7..4cd95fb1 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -37,7 +37,8 @@ static QString makeKey(const QString &sid, const Jid &j1, const Jid &j2)
     return QString::fromLatin1(QCryptographicHash::hash((sid +
                                                          j1.full() +
                                                          j2.full()).toUtf8(),
-                                                        QCryptographicHash::Sha1));
+                                                        QCryptographicHash::Sha1)
+                               .toHex());
 }
 
 class Connection : public XMPP::Jingle::Connection
@@ -225,7 +226,9 @@ Candidate::Candidate(const QString &host, quint16 port, const QString &cid, Type
 
 Candidate::~Candidate()
 {
-    delete d->socksClient;
+    if (d) { // if it's valid candidate
+        delete d->socksClient;
+    }
 }
 
 Candidate::Type Candidate::type() const
@@ -360,7 +363,7 @@ class Transport::Private : public QSharedData {
         ProxyError      = 16
     };
 
-    Transport *q = NULL;
+    Transport *q = nullptr;
     Pad::Ptr pad;
     bool meCreator = true; // content.content is local side
     bool connectionStarted = false; // where start() was called
@@ -369,7 +372,7 @@ class Transport::Private : public QSharedData {
     bool remoteReportedCandidateError = false;
     bool localReportedCandidateError = false;
     bool proxyDiscoveryInProgress = false; // if we have valid proxy requests
-    quint16 pendingActions;
+    quint16 pendingActions = 0;
     int proxiesInDiscoCount = 0;
     quint32 minimalPriority = 0;
     Application *application = nullptr;
diff --git a/src/xmpp/xmpp-im/jingle-s5b.h b/src/xmpp/xmpp-im/jingle-s5b.h
index f403bf11..ccce07d3 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.h
+++ b/src/xmpp/xmpp-im/jingle-s5b.h
@@ -203,7 +203,19 @@ class Manager : public TransportManager {
     void registerSid(const Jid &remote, const QString &sid);
 
     S5BServer* socksServ() const;
+
+    /**
+     * @brief userProxy returns custom (set by user) SOCKS proxy JID
+     * @return
+     */
     Jid userProxy() const;
+
+    /**
+     * @brief addKeyMapping sets mapping between key/socks hostname used for direct connection and transport.
+     *        The key is sha1(sid, initiator full jid, responder full jid)
+     * @param key
+     * @param transport
+     */
     void addKeyMapping(const QString &key, Transport *transport);
     void removeKeyMapping(const QString &key);
 private:
diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index b1d48a9d..3770a9f7 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -488,8 +488,9 @@ class JTPush : public Task
             }
         } else {
             auto session = client()->jingleManager()->session(from, jingle.sid());
-            if (session) {
-                respondError(iq, Stanza::Error::Cancel, Stanza::Error::Conflict);
+            if (!session) {
+                auto el = client()->doc()->createElementNS(QString::fromLatin1("urn:xmpp:jingle:errors:1"), QStringLiteral("unknown-session"));
+                respondError(iq, Stanza::Error::Cancel, Stanza::Error::ItemNotFound, QString(), el);
                 return true;
             }
             if (!session->updateFromXml(jingle.action(), jingleEl)) {
@@ -503,11 +504,16 @@ class JTPush : public Task
         return true;
     }
 
-    void respondError(const QDomElement &iq, Stanza::Error::ErrorType errType, Stanza::Error::ErrorCond errCond, const QString &text = QString())
+    void respondError(const QDomElement &iq, Stanza::Error::ErrorType errType, Stanza::Error::ErrorCond errCond,
+                      const QString &text = QString(), const QDomElement &jingleErr = QDomElement())
     {
         auto resp = createIQ(client()->doc(), "error", iq.attribute(QStringLiteral("from")), iq.attribute(QStringLiteral("id")));
         Stanza::Error error(errType, errCond, text);
-        resp.appendChild(error.toXml(*client()->doc(), client()->stream().baseNS()));
+        auto errEl = error.toXml(*client()->doc(), client()->stream().baseNS());
+        if (!jingleErr.isNull()) {
+            errEl.appendChild(jingleErr);
+        }
+        resp.appendChild(errEl);
         client()->send(resp);
     }
 
@@ -819,9 +825,7 @@ class Session::Private
         }
         QObject::connect(content, &Application::updated, q, [this, content](){
             signalingContent.insert(content);
-            if (!waitingAck && !stepTimer.isActive()) {
-                stepTimer.start();
-            }
+            planStep();
         });
         QObject::connect(content, &Application::destroyed, q, [this, content](){
             signalingContent.remove(content);

From e01348f497c16877fe320b5a5ce6ce241082938b Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 13 May 2019 16:38:35 +0300
Subject: [PATCH 013/383] Fixed compilation error with qt<5.8.0

---
 src/xmpp/xmpp-im/jingle.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index 4ea281e3..58809481 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -27,6 +27,8 @@
 #include <functional>
 #if QT_VERSION >= QT_VERSION_CHECK(5,8,0)
 # include <QNetworkDatagram>
+#else
+# include <QHostAddress>
 #endif
 
 #include "xmpp_stanza.h"

From 47c39652d791b963d25df65aac0d2eb975011b26 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 13 May 2019 18:30:52 +0300
Subject: [PATCH 014/383] Added missed semicolon

---
 src/xmpp/xmpp-im/jingle.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index 58809481..ff45adc0 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -274,7 +274,7 @@ class NetworkDatagram
 
     inline bool isValid() const { return _valid; }
     inline QByteArray data() const { return _data; }
-}
+};
 #else
 typedef QNetworkDatagram NetworkDatagram;
 #endif

From 1bd45f7f4bb00979d3ed433e2f186760ac04fdaa Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 13 May 2019 21:08:37 +0300
Subject: [PATCH 015/383] jingle: fixed a few more bugs after tests with Gajim

---
 src/xmpp/xmpp-im/jingle-s5b.cpp | 59 ++++++++++++++++++++-------------
 src/xmpp/xmpp-im/jingle.cpp     | 50 +++++++++++++++++++++++++---
 src/xmpp/xmpp-im/jingle.h       |  4 ++-
 3 files changed, 84 insertions(+), 29 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 4cd95fb1..05213fad 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -115,6 +115,11 @@ class Connection : public XMPP::Jingle::Connection
 class Candidate::Private : public QObject, public QSharedData {
     Q_OBJECT
 public:
+    ~Private()
+    {
+        delete socksClient;
+    }
+
     QString cid;
     QString host;
     Jid jid;
@@ -125,6 +130,32 @@ class Candidate::Private : public QObject, public QSharedData {
 
     quint16 localPort = 0; // where Psi actually listens. e.g. with NAT-assited candidats it may be different from just port
     SocksClient *socksClient = nullptr;
+
+    void connectToHost(const QString &key, State successState, std::function<void(bool)> callback, bool isUdp)
+    {
+        socksClient = new SocksClient;
+
+        connect(socksClient, &SocksClient::connected, [this, callback, successState](){
+            state = successState;
+            callback(true);
+        });
+        connect(socksClient, &SocksClient::error, [this, callback](int error){
+            Q_UNUSED(error);
+            state = Candidate::Discarded;
+            callback(false);
+        });
+        //connect(&t, SIGNAL(timeout()), SLOT(trySendUDP()));
+
+        socksClient->connectToHost(host, port, key, 0, isUdp);
+    }
+
+    void setupIncomingSocksClient()
+    {
+        connect(socksClient, &SocksClient::error, [this](int error){
+            Q_UNUSED(error);
+            state = Candidate::Discarded;
+        });
+    }
 };
 
 Candidate::Candidate()
@@ -226,9 +257,6 @@ Candidate::Candidate(const QString &host, quint16 port, const QString &cid, Type
 
 Candidate::~Candidate()
 {
-    if (d) { // if it's valid candidate
-        delete d->socksClient;
-    }
 }
 
 Candidate::Type Candidate::type() const
@@ -313,20 +341,7 @@ QDomElement Candidate::toXml(QDomDocument *doc) const
 
 void Candidate::connectToHost(const QString &key, State successState, std::function<void(bool)> callback, bool isUdp)
 {
-    d->socksClient = new SocksClient;
-
-    QObject::connect(d->socksClient, &SocksClient::connected, [this, callback, successState](){
-        d->state = successState;
-        callback(true);
-    });
-    QObject::connect(d->socksClient, &SocksClient::error, [this, callback](int error){
-        Q_UNUSED(error);
-        d->state = Candidate::Discarded;
-        callback(false);
-    });
-    //connect(&t, SIGNAL(timeout()), SLOT(trySendUDP()));
-
-    d->socksClient->connectToHost(d->host, d->port, key, 0, isUdp);
+    d->connectToHost(key, successState, callback, isUdp);
 }
 
 bool Candidate::incomingConnection(SocksClient *sc)
@@ -335,11 +350,8 @@ bool Candidate::incomingConnection(SocksClient *sc)
         return false;
     }
     d->socksClient = sc;
-    QObject::connect(d->socksClient, &SocksClient::error, [this](int error){
-        Q_UNUSED(error);
-        d->state = Candidate::Discarded;
-    });
-    return false;
+    d->setupIncomingSocksClient();
+    return true;
 }
 
 SocksClient *Candidate::takeSocksClient()
@@ -353,7 +365,8 @@ SocksClient *Candidate::takeSocksClient()
     return c;
 }
 
-class Transport::Private : public QSharedData {
+class Transport::Private
+{
 public:
     enum PendingActions {
         NewCandidate    = 1,
diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index 3770a9f7..e5772785 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -716,7 +716,7 @@ class Session::Private
             State finalState = State::Active;
             // so all contents is ready for session-initiate. let's do it
             if (role == Origin::Initiator) {
-                sid = manager->generateSessionId(otherParty);
+                sid = manager->registerSession(q);
                 actionToSend = Action::SessionInitiate;
                 finalState = State::Pending;
             }
@@ -1138,6 +1138,34 @@ class Session::Private
 
         return true;
     }
+
+    bool handleIncomingTransportInfo(const QDomElement &jingleEl)
+    {
+        QString contentTag(QStringLiteral("content"));
+        QList<QPair<QSharedPointer<Transport>,QDomElement>> updates;
+        for(QDomElement ce = jingleEl.firstChildElement(contentTag);
+            !ce.isNull(); ce = ce.nextSiblingElement(contentTag))
+        {
+            Application *app;
+            ContentBase cb(ce);
+            if (!cb.isValid() || !(app = q->content(cb.name, role)) || app->state() >= State::Finishing || !app->transport()) {
+                return false;
+            }
+            auto tel = ce.firstChildElement(QStringLiteral("transport"));
+            if (tel.isNull() || tel.attribute(QStringLiteral("xmlns")) != app->transport()->pad()->ns()) {
+                return false;
+            }
+            updates.append(qMakePair(app->transport(), tel));
+        }
+
+        for (auto &u: updates) {
+            if (!u.first->update(u.second)) {
+                return false; // yes this may lead to half updated content, but what choice do we have?
+            }
+        }
+
+        return true;
+    }
 };
 
 Session::Session(Manager *manager, const Jid &peer) :
@@ -1187,6 +1215,11 @@ Jid Session::responder() const
     return d->role == Origin::Responder? d->manager->client()->jid() : d->otherParty;
 }
 
+QString Session::sid() const
+{
+    return d->sid;
+}
+
 Origin Session::role() const
 {
     return d->role;
@@ -1273,6 +1306,7 @@ void Session::accept()
 
 void Session::initiate()
 {
+    emit initiated();
     if (d->role == Origin::Initiator && d->state == State::Created) {
         d->state = State::PrepareLocalOffer;
         for (auto &c: d->contentList) {
@@ -1385,7 +1419,7 @@ bool Session::updateFromXml(Action action, const QDomElement &jingleEl)
     case Action::TransportAccept:
         break;
     case Action::TransportInfo:
-        break;
+        return d->handleIncomingTransportInfo(jingleEl);
     case Action::TransportReject:
         break;
     case Action::TransportReplace:
@@ -1572,15 +1606,21 @@ XMPP::Stanza::Error Manager::lastError() const
 
 Session *Manager::newSession(const Jid &j)
 {
-    return new Session(this, j);
+    auto s = new Session(this, j);
+    connect(s, &Session::terminated, this, [this, s](){
+        d->sessions.remove(qMakePair(s->peer(), s->sid()));
+    });
+    return s;
 }
 
-QString Manager::generateSessionId(const Jid &peer)
+QString Manager::registerSession(Session *session)
 {
     QString id;
+    auto peer = session->peer();
     do {
         id = QString("%1").arg(quint32(qrand()), 6, 32, QChar('0'));
-    } while (d->sessions.contains(QPair<Jid,QString>(peer,id)));
+    } while (d->sessions.contains(qMakePair(peer,id)));
+    d->sessions.insert(qMakePair(peer, id), session);
     return id;
 }
 
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index ff45adc0..be31c82e 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -419,6 +419,7 @@ class Session : public QObject
     Jid peer() const;
     Jid initiator() const;
     Jid responder() const;
+    QString sid() const;
 
     Origin role() const; // my role in session: initiator or responder
     XMPP::Stanza::Error lastError() const;
@@ -449,6 +450,7 @@ class Session : public QObject
     TransportManagerPad::Ptr transportPadFactory(const QString &ns);
 signals:
     void managerPadAdded(const QString &ns);
+    void initiated();
     void activated();
     void terminated();
     void newContentReceived();
@@ -533,7 +535,7 @@ class Manager : public QObject
 
     Session* session(const Jid &remoteJid, const QString &sid);
     Session* newSession(const Jid &j);
-    QString generateSessionId(const Jid &peer);
+    QString registerSession(Session *session);
     XMPP::Stanza::Error lastError() const;
 
 signals:

From 5e594d279746aa18f42a54f7eb368c391897a5ab Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 13 May 2019 21:31:45 +0300
Subject: [PATCH 016/383] jignle-s5b: incomplete changes to candidate selection
 algo

---
 src/xmpp/xmpp-im/jingle-s5b.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 05213fad..0cd24753 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -387,7 +387,6 @@ class Transport::Private
     bool proxyDiscoveryInProgress = false; // if we have valid proxy requests
     quint16 pendingActions = 0;
     int proxiesInDiscoCount = 0;
-    quint32 minimalPriority = 0;
     Application *application = nullptr;
     QMap<QString,Candidate> localCandidates; // cid to candidate mapping
     QMap<QString,Candidate> remoteCandidates;
@@ -611,14 +610,13 @@ class Transport::Private
     // take used-candidate with highest priority and discard all with lower. also update used candidates themselves
     void updateMinimalPriority() {
         quint32 prio = 0;
-        if (localUsedCandidate && minimalPriority < localUsedCandidate.priority() && localUsedCandidate.state() != Candidate::Discarded) {
+        if (localUsedCandidate && localUsedCandidate.state() != Candidate::Discarded) {
             prio = localUsedCandidate.priority();
-        } else if (remoteUsedCandidate && minimalPriority < remoteUsedCandidate.priority() && remoteUsedCandidate.state() != Candidate::Discarded) {
-            prio = remoteUsedCandidate.priority();
         }
-        if (prio < minimalPriority) {
-            return;
+        if (remoteUsedCandidate && prio < remoteUsedCandidate.priority() && remoteUsedCandidate.state() != Candidate::Discarded) {
+            prio = remoteUsedCandidate.priority();
         }
+
         for (auto &c: localCandidates) {
             if (c.priority() < prio && c.state() != Candidate::Discarded) {
                 c.setState(Candidate::Discarded);
@@ -646,9 +644,11 @@ class Transport::Private
                 // i'm initiator. see 2.4.4
                 localUsedCandidate.setState(Candidate::Discarded);
                 localUsedCandidate = Candidate();
+                remoteReportedCandidateError = true; // as a sign of completeness even if not true
             } else {
                 remoteUsedCandidate.setState(Candidate::Discarded);
                 remoteUsedCandidate = Candidate();
+                //localReportedCandidateError = true; // as a sign of completeness even if not true
             }
         }
     }
@@ -812,10 +812,10 @@ bool Transport::update(const QDomElement &transportEl)
 {
     // we can just on type of elements in transport-info
     // so return as soon as any type handled. Though it leaves a room for  remote to send invalid transport-info
-    QString contentTag(QStringLiteral("candidate"));
+    QString candidateTag(QStringLiteral("candidate"));
     int candidatesAdded = 0;
-    for(QDomElement ce = transportEl.firstChildElement(contentTag);
-        !ce.isNull(); ce = ce.nextSiblingElement(contentTag)) {
+    for(QDomElement ce = transportEl.firstChildElement(candidateTag);
+        !ce.isNull(); ce = ce.nextSiblingElement(candidateTag)) {
         Candidate c(ce);
         if (!c) {
             return false;

From 1e5d9abb4e53b56f1c81dcfb6d8a982b7bcea48a Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 13 May 2019 22:27:15 +0300
Subject: [PATCH 017/383] jingle-s5b: cleanup unused candidates

---
 src/xmpp/xmpp-im/jingle-s5b.cpp | 37 +++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 0cd24753..83f36358 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -233,7 +233,7 @@ Candidate::Candidate(const Jid &proxy, const QString &cid, quint16 localPreferen
     d->jid = proxy;
     d->priority = (ProxyPreference << 16) + localPreference;
     d->type = Proxy;
-    d->state = Probing;
+    d->state = Probing; // FIXME?
 }
 
 Candidate::Candidate(const QString &host, quint16 port, const QString &cid, Type type, quint16 localPreference) :
@@ -311,6 +311,7 @@ Candidate::State Candidate::state() const
 
 void Candidate::setState(Candidate::State s)
 {
+    // don't close sockets here since pending events may change state machine or remote side and closed socket may break it
     d->state = s;
 }
 
@@ -378,7 +379,7 @@ class Transport::Private
 
     Transport *q = nullptr;
     Pad::Ptr pad;
-    bool meCreator = true; // content.content is local side
+    bool meCreator = true; // content created on local side
     bool connectionStarted = false; // where start() was called
     bool waitingAck = true;
     bool aborted = false;
@@ -481,14 +482,17 @@ class Transport::Private
         // now we have to connect to maxNew candidate
         lastConnectionStart.start();
         QString key = maxNew.type() == Candidate::Proxy? dstaddr : directAddr;
+        maxNew.setState(Candidate::Probing);
         maxNew.connectToHost(key, Candidate::Pending, [this, maxNew](bool success) {
             // candidate's status had to be changed by connectToHost, so we don't set it again
-            // if our candidate has higher priority than any of local or remoteUsedCandidate then set it as "used"
-            if (success && (!remoteUsedCandidate || remoteUsedCandidate.priority() < maxNew.priority()) &&
-                    ((!localUsedCandidate || localUsedCandidate.priority() < maxNew.priority())))
-            {
-                remoteUsedCandidate = maxNew;
-                localUsedCandidate = Candidate();
+            if (success) {
+                // discard all current in-progress connections with <= priority
+                for (auto &c: remoteCandidates) {
+                    if (c != maxNew && c.state() == Candidate::Probing && c.priority() <= maxNew.priority()) {
+                        c.setState(Candidate::Discarded);
+                    }
+                }
+
                 updateMinimalPriority();
             }
             checkAndFinishNegotiation();
@@ -567,6 +571,8 @@ class Transport::Private
                     }
                     if (c.state() == Candidate::Active) {
                         connection.reset(new Connection(c.takeSocksClient(), mode));
+                        localCandidates.clear();
+                        remoteCandidates.clear();
                         emit q->connected();
                     }
                 } else { // both sides reported candidate error
@@ -640,7 +646,7 @@ class Transport::Private
             remoteUsedCandidate = Candidate();
         }
         if (localUsedCandidate && remoteUsedCandidate) {
-            if (meCreator) {
+            if (pad->session()->role() == Origin::Initiator) {
                 // i'm initiator. see 2.4.4
                 localUsedCandidate.setState(Candidate::Discarded);
                 localUsedCandidate = Candidate();
@@ -648,7 +654,7 @@ class Transport::Private
             } else {
                 remoteUsedCandidate.setState(Candidate::Discarded);
                 remoteUsedCandidate = Candidate();
-                //localReportedCandidateError = true; // as a sign of completeness even if not true
+                localReportedCandidateError = true; // as a sign of completeness even if not true
             }
         }
     }
@@ -869,7 +875,11 @@ bool Transport::update(const QDomElement &transportEl)
         }
         c.setState(Candidate::Active);
         d->connection.reset(new Connection(c.takeSocksClient(), d->mode));
-        QTimer::singleShot(0, this, [this](){ emit connected(); });
+        QTimer::singleShot(0, this, [this](){
+            d->localCandidates.clear();
+            d->remoteCandidates.clear();
+            emit connected();
+        });
         return true;
     }
 
@@ -957,8 +967,9 @@ OutgoingTransportInfoUpdate Transport::takeOutgoingUpdate()
             }};
         }
     } else if (d->pendingActions & Private::CandidateUsed) {
-        d->pendingActions &= ~Private::NewCandidate;
-        // we should have the only remote candidate in Pending state
+        d->pendingActions &= ~Private::CandidateUsed;
+        // we should have the only remote candidate in Pending state.
+        // all other has to be discarded by priority check
         for (auto &c: d->remoteCandidates) {
             if (c.state() != Candidate::Pending) {
                 continue;

From ce4c3613043aeeec9c999c84e4884eeb4b209790 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 14 May 2019 01:15:28 +0300
Subject: [PATCH 018/383] jingle-s5b: fixed crash on double negotiation finish

---
 src/xmpp/xmpp-im/jingle-s5b.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 83f36358..2ac39193 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -233,7 +233,7 @@ Candidate::Candidate(const Jid &proxy, const QString &cid, quint16 localPreferen
     d->jid = proxy;
     d->priority = (ProxyPreference << 16) + localPreference;
     d->type = Proxy;
-    d->state = Probing; // FIXME?
+    d->state = Probing; // it's probing because it's a local side proxy and host and port are unknown
 }
 
 Candidate::Candidate(const QString &host, quint16 port, const QString &cid, Type type, quint16 localPreference) :
@@ -342,11 +342,13 @@ QDomElement Candidate::toXml(QDomDocument *doc) const
 
 void Candidate::connectToHost(const QString &key, State successState, std::function<void(bool)> callback, bool isUdp)
 {
+    qDebug() << "connect to host with " << d->cid << "candidate";
     d->connectToHost(key, successState, callback, isUdp);
 }
 
 bool Candidate::incomingConnection(SocksClient *sc)
 {
+    qDebug() << "incoming connection on" << d->cid << "candidate";
     if (d->socksClient) {
         return false;
     }
@@ -357,6 +359,7 @@ bool Candidate::incomingConnection(SocksClient *sc)
 
 SocksClient *Candidate::takeSocksClient()
 {
+    qDebug() << "taking socket from " << d->cid << "candidate";
     if (!d->socksClient) {
         return nullptr;
     }
@@ -527,8 +530,8 @@ class Transport::Private
         // So for candidate-error two conditions have to be met 1) all remote failed 2) all local were sent no more
         // local candidates are expected to be discovered
 
-        if (!connectionStarted) {
-            return; // we can't finish anything in this state. Only Connecting is acceptable
+        if (!connectionStarted || connection) { // if not started or already finished
+            return;
         }
 
         // sort out already handled states or states which will bring us here a little later
@@ -712,6 +715,7 @@ void Transport::prepare()
             Candidate c(h, serv->port(), d->generateCid(), Candidate::Direct);
             if (!d->isDup(c)) {
                 d->localCandidates.insert(c.cid(), c);
+                d->pendingActions |= Private::NewCandidate;
             }
         }
     }
@@ -1061,8 +1065,8 @@ Connection::Ptr Transport::connection() const
 bool Transport::incomingConnection(SocksClient *sc)
 {
     if (!d->connection) {
+        auto s = sc->abstractSocket();
         for (auto &c: d->localCandidates) {
-            auto s = sc->abstractSocket();
             if (s->localPort() == c.localPort() && c.state() == Candidate::Pending) {
                 if(d->mode == Transport::Udp)
                     sc->grantUDPAssociate("", 0);

From 93c239ae92e2ef4b438fb927818d42acc7ecce6e Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 14 May 2019 11:53:10 +0300
Subject: [PATCH 019/383] jingle-s5b: reject lower-priority candidates if we
 have connected higher priority

---
 src/irisnet/noncore/cutestuff/socks.cpp |  1 +
 src/xmpp/xmpp-im/jingle-s5b.cpp         | 33 ++++++++++++++++---------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/irisnet/noncore/cutestuff/socks.cpp b/src/irisnet/noncore/cutestuff/socks.cpp
index 8162ca65..41f645d6 100644
--- a/src/irisnet/noncore/cutestuff/socks.cpp
+++ b/src/irisnet/noncore/cutestuff/socks.cpp
@@ -886,6 +886,7 @@ void SocksClient::continueIncoming()
                 else
                     d->rhost = s.addr.toString();
                 d->rport = s.port;
+                QIODevice::open(QIODevice::ReadWrite);
                 incomingConnectRequest(d->rhost, d->rport);
             }
             else if(s.cmd == REQ_UDPASSOCIATE) {
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 2ac39193..61485cc5 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -57,7 +57,7 @@ class Connection : public XMPP::Jingle::Connection
         if (client->isOpen()) {
             setOpenMode(client->openMode());
         } else {
-            qWarning("Creating S5B Transport connection on closed SockClient connection");
+            qWarning("Creating S5B Transport connection on closed SockClient connection %p", client);
         }
     }
 
@@ -134,14 +134,17 @@ class Candidate::Private : public QObject, public QSharedData {
     void connectToHost(const QString &key, State successState, std::function<void(bool)> callback, bool isUdp)
     {
         socksClient = new SocksClient;
+        qDebug() << "connect to host with " << cid << "candidate and socks client" << socksClient;
 
         connect(socksClient, &SocksClient::connected, [this, callback, successState](){
             state = successState;
+            qDebug() << "socks client"  << socksClient << "is connected";
             callback(true);
         });
         connect(socksClient, &SocksClient::error, [this, callback](int error){
             Q_UNUSED(error);
             state = Candidate::Discarded;
+            qDebug() << "socks client"  << socksClient << "failed to connect";
             callback(false);
         });
         //connect(&t, SIGNAL(timeout()), SLOT(trySendUDP()));
@@ -342,13 +345,12 @@ QDomElement Candidate::toXml(QDomDocument *doc) const
 
 void Candidate::connectToHost(const QString &key, State successState, std::function<void(bool)> callback, bool isUdp)
 {
-    qDebug() << "connect to host with " << d->cid << "candidate";
     d->connectToHost(key, successState, callback, isUdp);
 }
 
 bool Candidate::incomingConnection(SocksClient *sc)
 {
-    qDebug() << "incoming connection on" << d->cid << "candidate";
+    qDebug() << "incoming connection on" << d->cid << "candidate with socks client" << sc;
     if (d->socksClient) {
         return false;
     }
@@ -359,7 +361,7 @@ bool Candidate::incomingConnection(SocksClient *sc)
 
 SocksClient *Candidate::takeSocksClient()
 {
-    qDebug() << "taking socket from " << d->cid << "candidate";
+    qDebug() << "taking socks client" << d->socksClient << "from " << d->cid << "candidate";
     if (!d->socksClient) {
         return nullptr;
     }
@@ -489,13 +491,16 @@ class Transport::Private
         maxNew.connectToHost(key, Candidate::Pending, [this, maxNew](bool success) {
             // candidate's status had to be changed by connectToHost, so we don't set it again
             if (success) {
-                // discard all current in-progress connections with <= priority
+                // let's reject candidates which are meaningless to try
                 for (auto &c: remoteCandidates) {
-                    if (c != maxNew && c.state() == Candidate::Probing && c.priority() <= maxNew.priority()) {
+                    if (c.state() == Candidate::New && c.priority() <= maxNew.priority()) {
                         c.setState(Candidate::Discarded);
                     }
                 }
-
+                if (proxyDiscoveryInProgress && (maxNew.priority() >> 16) > Candidate::ProxyPreference) {
+                    proxyDiscoveryInProgress = false; // doesn't make sense anymore
+                }
+                // TODO do the same for upnp
                 updateMinimalPriority();
             }
             checkAndFinishNegotiation();
@@ -848,10 +853,16 @@ bool Transport::update(const QDomElement &transportEl)
         if (!cUsed) {
             return false;
         }
-        cUsed.setState(Candidate::Accepted);
-        d->localUsedCandidate = cUsed;
-        d->updateMinimalPriority();
-        QTimer::singleShot(0, this, [this](){ d->checkAndFinishNegotiation(); });
+        if (cUsed.state() == Candidate::Pending) {
+            cUsed.setState(Candidate::Accepted);
+            d->localUsedCandidate = cUsed;
+            d->updateMinimalPriority();
+            QTimer::singleShot(0, this, [this](){ d->checkAndFinishNegotiation(); });
+        } else {
+            //seems like we already rejected the candidate and either remote side already know about it or will soon
+            d->localUsedCandidate = Candidate();
+            d->remoteReportedCandidateError = true; // as a sign remote has finished
+        }
         return true;
     }
 

From 9bfd3a18db884d23db0e740ba0af76f598d3dcf0 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 15 May 2019 07:43:23 +0300
Subject: [PATCH 020/383] jingle-s5b: select proper candidate on finish

---
 src/xmpp/xmpp-im/jingle-s5b.cpp | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 61485cc5..9234e005 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -526,6 +526,24 @@ class Transport::Private
         return false;
     }
 
+    Candidate preferredCandidate() const
+    {
+        if (localUsedCandidate) {
+            if (remoteUsedCandidate) {
+                if (localUsedCandidate.priority() == remoteUsedCandidate.priority()) {
+                    if (pad->session()->role() == Origin::Initiator) {
+                        return remoteUsedCandidate;
+                    }
+                    return localUsedCandidate;
+                }
+                return localUsedCandidate.priority() > remoteUsedCandidate.priority()?
+                            localUsedCandidate : remoteUsedCandidate;
+            }
+            return localUsedCandidate;
+        }
+        return remoteUsedCandidate;
+    }
+
     void checkAndFinishNegotiation()
     {
         // Why we can't send candidate-used/error right when this happens:
@@ -556,10 +574,10 @@ class Transport::Private
             if (remoteReportedCandidateError || localUsedCandidate) {
                 // so remote seems to be finished too.
                 // tell application about it and it has to change its state immediatelly
-                if (localUsedCandidate || remoteUsedCandidate) {
-                    auto c = localUsedCandidate? localUsedCandidate : remoteUsedCandidate;
+                auto c = preferredCandidate();
+                if (c) {
                     if (c.state() != Candidate::Active) {
-                        if (c.type() == Candidate::Proxy) {
+                        if (c.type() == Candidate::Proxy && c == localUsedCandidate) { // local proxy
                             // If it's proxy, first it has to be activated
                             if (localUsedCandidate) {
                                 // it's our side who proposed proxy. so we have to connect to it and activate

From f3408e42711a4c7e8315101a0fc8a2185f4d8e4b Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 15 May 2019 08:17:37 +0300
Subject: [PATCH 021/383] jingle-ft: started work on actual transfer over open
 connection

---
 src/xmpp/xmpp-im/jingle-ft.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 187d722d..417853f2 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -482,8 +482,15 @@ bool Application::setTransport(const QSharedPointer<Transport> &transport)
             connect(d->connection.data(), &Connection::readyRead, this, [this](){
                 // TODO read data
             });
+            connect(d->connection.data(), &Connection::bytesWritten, this, [this](qint64 bytes){
+                if (d->pad->session()->role() == d->senders) {
+                    // write next port of data
+
+                }
+            });
             d->setState(State::Active);
         });
+
         connect(transport.data(), &Transport::failed, this, [this](){
             if (d->availableTransports.size()) { // we can do transport-replace here
                 // TODO

From 3df933f19d5e4b108bf663d1c88668b5fb2e7ab9 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 15 May 2019 11:57:34 +0300
Subject: [PATCH 022/383] jingle-ft: Make file sending working

---
 src/xmpp/xmpp-im/jingle-ft.cpp  | 64 ++++++++++++++++++++++++++++++---
 src/xmpp/xmpp-im/jingle-ft.h    |  4 +++
 src/xmpp/xmpp-im/jingle-s5b.cpp | 16 +++++++++
 src/xmpp/xmpp-im/jingle-s5b.h   |  1 +
 src/xmpp/xmpp-im/jingle.h       |  1 +
 5 files changed, 82 insertions(+), 4 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 417853f2..e660f310 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -385,18 +385,51 @@ class Application::Private
     QSharedPointer<Pad> pad;
     QString contentName;
     File    file;
+    File    acceptFile; // as it comes with "accept" response
     Origin  creator;
     Origin  senders;
     QSharedPointer<Transport> transport;
     Connection::Ptr connection;
     QStringList availableTransports;
     bool transportFailed = false;
+    QIODevice *device = nullptr;
+    quint64 bytesLeft = 0;
 
     void setState(State s)
     {
         state = s;
         emit q->stateChanged(s);
     }
+
+    void writeNextBlockToTransport()
+    {
+        if (!bytesLeft) {
+            return; // everything is written
+        }
+        auto sz = transport->blockSize();
+        sz = sz? sz : 8192;
+        if (sz > bytesLeft) {
+            sz = bytesLeft;
+        }
+        QByteArray data = device->read(sz);
+        if (data.isEmpty()) {
+            // TODO d->lastError = Condition::FailedApplication
+            connection.reset();
+            setState(State::Finished);
+            return;
+        }
+        if (connection->write(data) == -1) {
+            // TODO d->lastError = Condition::FailedApplication
+            connection.reset();
+            setState(State::Finished);
+            return;
+        }
+    }
+
+    void readNextBlockFromTransport()
+    {
+        // TODO
+    }
 };
 
 Application::Application(const QSharedPointer<Pad> &pad, const QString &contentName, Origin creator, Origin senders) :
@@ -479,13 +512,25 @@ bool Application::setTransport(const QSharedPointer<Transport> &transport)
         connect(transport.data(), &Transport::updated, this, &Application::updated);
         connect(transport.data(), &Transport::connected, this, [this](){
             d->connection = d->transport->connection();
+            if (d->acceptFile.range().isValid()) {
+                d->bytesLeft = d->acceptFile.range().length;
+                emit deviceRequested(d->acceptFile.range().offset, d->bytesLeft);
+            } else {
+                d->bytesLeft = d->file.size();
+                emit deviceRequested(0, d->bytesLeft);
+            }
             connect(d->connection.data(), &Connection::readyRead, this, [this](){
-                // TODO read data
+                if (!d->device) {
+                    return;
+                }
+                if (d->pad->session()->role() != d->senders) {
+                    d->readNextBlockFromTransport();
+                }
             });
             connect(d->connection.data(), &Connection::bytesWritten, this, [this](qint64 bytes){
-                if (d->pad->session()->role() == d->senders) {
-                    // write next port of data
-
+                Q_UNUSED(bytes)
+                if (d->pad->session()->role() == d->senders && !d->connection->bytesToWrite()) {
+                    d->writeNextBlockToTransport();
                 }
             });
             d->setState(State::Active);
@@ -646,6 +691,7 @@ bool Application::accept(const QDomElement &el)
     if (!f.isValid()) {
         return false;
     }
+    d->acceptFile = f;
     // TODO validate if accept file matches to the offer
     setState(State::Accepted);
     return true;
@@ -657,6 +703,16 @@ bool Application::isValid() const
             (d->senders == Origin::Initiator || d->senders == Origin::Responder);
 }
 
+void Application::setDevice(QIODevice *dev)
+{
+    d->device = dev;
+    if (d->senders == d->pad->session()->role()) {
+        d->writeNextBlockToTransport();
+    } else {
+        d->readNextBlockFromTransport();
+    }
+}
+
 Pad::Pad(Manager *manager, Session *session) :
     _manager(manager),
     _session(session)
diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index 20f23098..582542cf 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -140,6 +140,10 @@ class Application : public XMPP::Jingle::Application
 
     bool isValid() const;
 
+    void setDevice(QIODevice *dev);
+
+signals:
+    void deviceRequested(quint64 offset, quint64 size);
 
 private:
     class Private;
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 9234e005..661cef74 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -54,6 +54,8 @@ class Connection : public XMPP::Jingle::Connection
         mode(mode)
     {
         connect(client, &SocksClient::readyRead, this, &Connection::readyRead);
+        connect(client, &SocksClient::bytesWritten, this, &Connection::bytesWritten);
+        connect(client, &SocksClient::aboutToClose, this, &Connection::aboutToClose);
         if (client->isOpen()) {
             setOpenMode(client->openMode());
         } else {
@@ -404,6 +406,7 @@ class Transport::Private
     Transport::Mode mode = Transport::Tcp;
     QTimer probingTimer;
     QElapsedTimer lastConnectionStart;
+    size_t blockSize = 8129;
 
     QSharedPointer<Connection> connection;
 
@@ -845,6 +848,13 @@ bool Transport::update(const QDomElement &transportEl)
 {
     // we can just on type of elements in transport-info
     // so return as soon as any type handled. Though it leaves a room for  remote to send invalid transport-info
+    auto bs = transportEl.attribute(QString::fromLatin1("block-size"));
+    if (!bs.isEmpty()) {
+        size_t bsn = bs.toULongLong();
+        if (bsn && bsn <= d->blockSize) {
+            d->blockSize = bsn;
+        }
+    }
     QString candidateTag(QStringLiteral("candidate"));
     int candidatesAdded = 0;
     for(QDomElement ce = transportEl.firstChildElement(candidateTag);
@@ -967,6 +977,7 @@ OutgoingTransportInfoUpdate Transport::takeOutgoingUpdate()
     if (d->meCreator && d->mode != Tcp) {
         tel.setAttribute(QStringLiteral("mode"), "udp");
     }
+    tel.setAttribute(QString::fromLatin1("block-size"), qulonglong(d->blockSize));
 
     if (d->pendingActions & Private::NewCandidate) {
         d->pendingActions &= ~Private::NewCandidate;
@@ -1091,6 +1102,11 @@ Connection::Ptr Transport::connection() const
     return d->connection.staticCast<XMPP::Jingle::Connection>();
 }
 
+size_t Transport::blockSize() const
+{
+    return d->blockSize;
+}
+
 bool Transport::incomingConnection(SocksClient *sc)
 {
     if (!d->connection) {
diff --git a/src/xmpp/xmpp-im/jingle-s5b.h b/src/xmpp/xmpp-im/jingle-s5b.h
index ccce07d3..f25138a9 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.h
+++ b/src/xmpp/xmpp-im/jingle-s5b.h
@@ -149,6 +149,7 @@ class Transport : public XMPP::Jingle::Transport
 
     QString sid() const;
     Connection::Ptr connection() const;
+    size_t blockSize() const;
 private:
     friend class S5BServer;
     bool incomingConnection(SocksClient *sc);
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index be31c82e..ff6f4b80 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -350,6 +350,7 @@ class Transport : public QObject {
     virtual Features features() const = 0;
     virtual TransportManagerPad::Ptr pad() const = 0;
     virtual Connection::Ptr connection() const = 0; // returns established QIODevice-based connection
+    virtual size_t blockSize() const = 0;
 signals:
     void updated(); // found some candidates and they have to be sent. takeUpdate has to be called from this signal handler.
                     // if it's just always ready then signal has to be sent at least once otherwise session-initiate won't be sent.

From a2754d275750492ac5c6cb9910bee648190db88b Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 15 May 2019 15:30:35 +0300
Subject: [PATCH 023/383] jingle-ft: close file-like device on finish

---
 src/xmpp/xmpp-im/jingle-ft.cpp | 7 ++++++-
 src/xmpp/xmpp-im/jingle-ft.h   | 2 +-
 src/xmpp/xmpp-im/jingle.cpp    | 7 ++++---
 src/xmpp/xmpp-im/jingle.h      | 2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index e660f310..dbeb7508 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -392,12 +392,16 @@ class Application::Private
     Connection::Ptr connection;
     QStringList availableTransports;
     bool transportFailed = false;
+    bool closeDeviceOnFinish = true;
     QIODevice *device = nullptr;
     quint64 bytesLeft = 0;
 
     void setState(State s)
     {
         state = s;
+        if (s == State::Finished && device && closeDeviceOnFinish) {
+            device->close();
+        }
         emit q->stateChanged(s);
     }
 
@@ -703,9 +707,10 @@ bool Application::isValid() const
             (d->senders == Origin::Initiator || d->senders == Origin::Responder);
 }
 
-void Application::setDevice(QIODevice *dev)
+void Application::setDevice(QIODevice *dev, bool closeOnFinish)
 {
     d->device = dev;
+    d->closeDeviceOnFinish = closeOnFinish;
     if (d->senders == d->pad->session()->role()) {
         d->writeNextBlockToTransport();
     } else {
diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index 582542cf..72cd9598 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -140,7 +140,7 @@ class Application : public XMPP::Jingle::Application
 
     bool isValid() const;
 
-    void setDevice(QIODevice *dev);
+    void setDevice(QIODevice *dev, bool closeOnFinish = true);
 
 signals:
     void deviceRequested(quint64 offset, quint64 size);
diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index e5772785..c6766a11 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -928,10 +928,10 @@ class Session::Private
 
             rejectSet.remove(contentName);
             if (it == addSet.end() || (*it)->wantBetterTransport(app->transport())) { // probably not wantBetterTransport but wantBetterApplication
-                delete *it; // unpreferred app
                 if (it == addSet.end()) {
                     addSet.insert(contentName, app);
                 } else {
+                    delete *it; // unpreferred app
                     *it = app;
                 }
             }
@@ -1168,10 +1168,11 @@ class Session::Private
     }
 };
 
-Session::Session(Manager *manager, const Jid &peer) :
+Session::Session(Manager *manager, const Jid &peer, Origin role) :
     d(new Private)
 {
     d->q = this;
+    d->role = role;
     d->manager = manager;
     d->otherParty = peer;
     d->stepTimer.setSingleShot(true);
@@ -1586,7 +1587,7 @@ Session* Manager::incomingSessionInitiate(const Jid &from, const Jingle &jingle,
         return NULL;
     }
     auto key = qMakePair(from, jingle.sid());
-    auto s = new Session(this, from);
+    auto s = new Session(this, from, Origin::Responder);
     if (s->incomingInitiate(jingle, jingleEl)) { // if parsed well
         d->sessions.insert(key, s);
         // emit incomingSession makes sense when there are no unsolved conflicts in content descriptions / transports
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index ff6f4b80..3d3622b4 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -410,7 +410,7 @@ class Session : public QObject
     // Note incoming session are not registered in Jingle Manager until validated.
     // and then either rejected or registered in Pending state.
 
-    Session(Manager *manager, const Jid &peer);
+    Session(Manager *manager, const Jid &peer, Origin role = Origin::Initiator);
     ~Session();
 
     Manager* manager() const;

From a2326a596a2b77c801cd1f0a798026899e3f43b2 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 15 May 2019 20:48:53 +0300
Subject: [PATCH 024/383] jingle: properly accept incoming content

---
 src/xmpp/xmpp-im/jingle-ft.cpp  | 8 ++++----
 src/xmpp/xmpp-im/jingle-s5b.cpp | 2 +-
 src/xmpp/xmpp-im/jingle.cpp     | 6 ------
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index dbeb7508..8622be85 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -605,7 +605,7 @@ OutgoingUpdate Application::takeOutgoingUpdate()
             thumb.uri = QLatin1String("cid:") + data.cid();
             d->file.setThumbnail(thumb);
         }
-        ContentBase cb(d->pad->session()->role(), d->contentName);
+        ContentBase cb(d->creator, d->contentName);
         cb.senders = d->senders;
         auto cel = cb.toXml(doc, "content");
         cel.appendChild(doc->createElementNS(NS, "description")).appendChild(d->file.toXml(doc));
@@ -624,8 +624,8 @@ OutgoingUpdate Application::takeOutgoingUpdate()
     }
     if (d->state == State::Connecting || d->state == State::Active || d->state == State::Pending) {
         if (d->transport->hasUpdates()) { // failed to select next transport. can't continue
-            ContentBase cb(d->pad->session()->role(), d->contentName);
-            cb.senders = d->senders;
+            ContentBase cb(d->creator, d->contentName);
+            //cb.senders = d->senders;
             auto cel = cb.toXml(doc, "content");
             QDomElement tel;
             OutgoingUpdateCB trCallback;
@@ -636,7 +636,7 @@ OutgoingUpdate Application::takeOutgoingUpdate()
     }
     if (d->state == State::Finishing) {
         if (d->transportFailed) {
-            ContentBase cb(d->pad->session()->role(), d->contentName);
+            ContentBase cb(d->creator, d->contentName);
             QList<QDomElement> updates;
             updates << cb.toXml(doc, "content");
             updates << Reason(Reason::Condition::FailedTransport).toXml(doc);
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 661cef74..2a4f55ff 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -406,7 +406,7 @@ class Transport::Private
     Transport::Mode mode = Transport::Tcp;
     QTimer probingTimer;
     QElapsedTimer lastConnectionStart;
-    size_t blockSize = 8129;
+    size_t blockSize = 8192;
 
     QSharedPointer<Connection> connection;
 
diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index c6766a11..ed385f9d 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -699,9 +699,6 @@ class Session::Private
              */
             Action expectedContentAction = role == Origin::Initiator? Action::ContentAdd : Action::ContentAccept;
             for (const auto &c: contentList) {
-                if (c->creator() != role) {
-                    continue; // we care only about local content for now.
-                }
                 auto out = c->outgoingUpdateType();
                 if (out == Action::ContentReject) { // yeah we are rejecting local content. invalid?
                     lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
@@ -724,9 +721,6 @@ class Session::Private
             QList<QDomElement> contents;
             QList<AckHndl> acceptApps;
             for (const auto &p: contentList) {
-                if (p->creator() != role) {
-                    continue; // we care only about local content for now.
-                }
                 QList<QDomElement> xml;
                 OutgoingUpdateCB callback;
                 std::tie(xml, callback) = p->takeOutgoingUpdate();

From 863045f2c907765c11b61ae2ff737a4c5b343c0c Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 15 May 2019 21:37:59 +0300
Subject: [PATCH 025/383] jingle: don't forget to start transfers when our
 accept is acknowledged

---
 src/xmpp/xmpp-im/jingle-s5b.cpp | 2 ++
 src/xmpp/xmpp-im/jingle.cpp     | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 2a4f55ff..90282327 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -842,6 +842,8 @@ void Transport::start()
 {
     d->connectionStarted = true;
     d->tryConnectToRemoteCandidate();
+    // if there is no higher priority candidates than ours but they are already connected then
+    d->checkAndFinishNegotiation();
 }
 
 bool Transport::update(const QDomElement &transportEl)
diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index ed385f9d..426ed4bf 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -738,6 +738,9 @@ class Session::Private
                     auto callback = std::get<1>(h);
                     if (app) {
                         callback();
+                        if (role == Origin::Responder) {
+                            app->start();
+                        }
                     }
                 }
                 if (finalState == State::Active) {
@@ -1142,7 +1145,7 @@ class Session::Private
         {
             Application *app;
             ContentBase cb(ce);
-            if (!cb.isValid() || !(app = q->content(cb.name, role)) || app->state() >= State::Finishing || !app->transport()) {
+            if (!cb.isValid() || !(app = q->content(cb.name, cb.creator)) || app->state() >= State::Finishing || !app->transport()) {
                 return false;
             }
             auto tel = ce.firstChildElement(QStringLiteral("transport"));

From 3296abe95dc7868bfef08c072ecd579632f8667c Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Thu, 16 May 2019 00:43:20 +0300
Subject: [PATCH 026/383] jingle-ft: implemented transport read procedure

---
 src/xmpp/xmpp-im/jingle-ft.cpp | 42 ++++++++++++++++++++++++++++------
 src/xmpp/xmpp-im/jingle-ft.h   |  1 +
 2 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 8622be85..dae20772 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -405,6 +405,13 @@ class Application::Private
         emit q->stateChanged(s);
     }
 
+    void handleStreamFail()
+    {
+        // TODO d->lastError = Condition::FailedApplication
+        connection.reset();
+        setState(State::Finished);
+    }
+
     void writeNextBlockToTransport()
     {
         if (!bytesLeft) {
@@ -417,22 +424,40 @@ class Application::Private
         }
         QByteArray data = device->read(sz);
         if (data.isEmpty()) {
-            // TODO d->lastError = Condition::FailedApplication
-            connection.reset();
-            setState(State::Finished);
+            handleStreamFail();
             return;
         }
         if (connection->write(data) == -1) {
-            // TODO d->lastError = Condition::FailedApplication
-            connection.reset();
-            setState(State::Finished);
+            handleStreamFail();
             return;
         }
+        emit q->progress(device->pos());
     }
 
     void readNextBlockFromTransport()
     {
-        // TODO
+        quint64 bytesAvail = connection->bytesAvailable();
+        if (!bytesLeft || !bytesAvail) {
+            return; // nothing to read
+        }
+        quint64 sz = transport->blockSize();
+        sz = sz? sz : 8192;
+        if (sz > bytesLeft) {
+            sz = bytesLeft;
+        }
+        if (sz > bytesAvail) {
+            sz = bytesAvail;
+        }
+        QByteArray data = connection->read(sz);
+        if (data.isEmpty()) {
+            handleStreamFail();
+            return;
+        }
+        if (device->write(data) == -1) {
+            handleStreamFail();
+            return;
+        }
+        emit q->progress(device->pos());
     }
 };
 
@@ -538,6 +563,9 @@ bool Application::setTransport(const QSharedPointer<Transport> &transport)
                 }
             });
             d->setState(State::Active);
+            if (d->pad->session()->role() != d->senders && d->connection->bytesAvailable()) {
+                d->readNextBlockFromTransport();
+            }
         });
 
         connect(transport.data(), &Transport::failed, this, [this](){
diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index 72cd9598..b50ff33a 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -144,6 +144,7 @@ class Application : public XMPP::Jingle::Application
 
 signals:
     void deviceRequested(quint64 offset, quint64 size);
+    void progress(quint64 offset);
 
 private:
     class Private;

From 18be2101b759e54fedd99dcd0e12c92477b07f39 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Thu, 16 May 2019 11:28:02 +0300
Subject: [PATCH 027/383] jingle: make file receive working

---
 src/xmpp/xmpp-im/jingle-ft.cpp  |  52 +++++++------
 src/xmpp/xmpp-im/jingle-s5b.cpp | 126 +++++++++++++++++++++++---------
 src/xmpp/xmpp-im/jingle-s5b.h   |   4 +
 src/xmpp/xmpp-im/jingle.cpp     |   6 ++
 4 files changed, 128 insertions(+), 60 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index dae20772..1eba2dbf 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -436,28 +436,29 @@ class Application::Private
 
     void readNextBlockFromTransport()
     {
-        quint64 bytesAvail = connection->bytesAvailable();
-        if (!bytesLeft || !bytesAvail) {
-            return; // nothing to read
-        }
-        quint64 sz = transport->blockSize();
-        sz = sz? sz : 8192;
-        if (sz > bytesLeft) {
-            sz = bytesLeft;
-        }
-        if (sz > bytesAvail) {
-            sz = bytesAvail;
-        }
-        QByteArray data = connection->read(sz);
-        if (data.isEmpty()) {
-            handleStreamFail();
-            return;
-        }
-        if (device->write(data) == -1) {
-            handleStreamFail();
-            return;
+        while (quint64 bytesAvail = connection->bytesAvailable()) {
+            qDebug("bytes available %llu", bytesAvail);
+            if (!bytesLeft || !bytesAvail) {
+                return; // nothing to read
+            }
+            quint64 sz = 65536; // should be respect transport->blockSize() ?
+            if (sz > bytesLeft) {
+                sz = bytesLeft;
+            }
+            if (sz > bytesAvail) {
+                sz = bytesAvail;
+            }
+            QByteArray data = connection->read(sz);
+            if (data.isEmpty()) {
+                handleStreamFail();
+                return;
+            }
+            if (device->write(data) == -1) {
+                handleStreamFail();
+                return;
+            }
+            emit q->progress(device->pos());
         }
-        emit q->progress(device->pos());
     }
 };
 
@@ -652,12 +653,15 @@ OutgoingUpdate Application::takeOutgoingUpdate()
     }
     if (d->state == State::Connecting || d->state == State::Active || d->state == State::Pending) {
         if (d->transport->hasUpdates()) { // failed to select next transport. can't continue
-            ContentBase cb(d->creator, d->contentName);
-            //cb.senders = d->senders;
-            auto cel = cb.toXml(doc, "content");
             QDomElement tel;
             OutgoingUpdateCB trCallback;
             std::tie(tel, trCallback) = d->transport->takeOutgoingUpdate();
+            if (tel.isNull()) {
+                qWarning("transport for content=%s reported it had updates but got null update", qPrintable(d->contentName));
+                return OutgoingUpdate();
+            }
+            ContentBase cb(d->creator, d->contentName);
+            auto cel = cb.toXml(doc, "content");
             cel.appendChild(tel);
             return OutgoingUpdate{QList<QDomElement>()<<cel, trCallback};
         }
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 90282327..794e2d43 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -373,6 +373,18 @@ SocksClient *Candidate::takeSocksClient()
     return c;
 }
 
+void Candidate::deleteSocksClient()
+{
+    d->socksClient->disconnect();
+    delete d->socksClient;
+    d->socksClient = nullptr;
+}
+
+bool Candidate::operator==(const Candidate &other) const
+{
+    return d.data() == other.d.data();
+}
+
 class Transport::Private
 {
 public:
@@ -448,7 +460,7 @@ class Transport::Private
         quint64 maxProbingPrio = 0;
         quint64 maxNewPrio = 0;
         Candidate maxProbing;
-        Candidate maxNew;
+        QList<Candidate> maxNew;
 
         /*
          We have to find highest-priority already connecting candidate and highest-priority new candidate.
@@ -461,21 +473,26 @@ class Transport::Private
         */
 
         for (auto &c: remoteCandidates) {
-            if (c.state() == Candidate::New && c.priority() > maxNewPrio) {
-                maxNew = c;
-                maxNewPrio = c.priority();
+            if (c.state() == Candidate::New) {
+                if (c.priority() > maxNewPrio) {
+                    maxNew = QList<Candidate>();
+                    maxNew.append(c);
+                    maxNewPrio = c.priority();
+                } else if (c.priority() == maxNewPrio) {
+                    maxNew.append(c);
+                }
             }
             if (c.state() == Candidate::Probing && c.priority() > maxProbingPrio) {
                 maxProbing = c;
                 maxProbingPrio = c.priority();
             }
         }
-        if (!maxNew) {
+        if (maxNew.isEmpty()) {
             return; // nowhere to connect
         }
 
         if (maxProbing) {
-            if (maxNew.priority() < maxProbing.priority()) {
+            if (maxNewPrio < maxProbing.priority()) {
                 if (probingTimer.isActive()) {
                     return; // we will come back here soon
                 }
@@ -487,27 +504,37 @@ class Transport::Private
             }
         }
 
-        // now we have to connect to maxNew candidate
-        lastConnectionStart.start();
-        QString key = maxNew.type() == Candidate::Proxy? dstaddr : directAddr;
-        maxNew.setState(Candidate::Probing);
-        maxNew.connectToHost(key, Candidate::Pending, [this, maxNew](bool success) {
-            // candidate's status had to be changed by connectToHost, so we don't set it again
-            if (success) {
-                // let's reject candidates which are meaningless to try
-                for (auto &c: remoteCandidates) {
-                    if (c.state() == Candidate::New && c.priority() <= maxNew.priority()) {
-                        c.setState(Candidate::Discarded);
+        // now we have to connect to maxNew candidates
+        for (auto &mnc: maxNew) {
+            lastConnectionStart.start();
+            QString key = mnc.type() == Candidate::Proxy? dstaddr : directAddr;
+            mnc.setState(Candidate::Probing);
+            mnc.connectToHost(key, Candidate::Pending, [this, mnc](bool success) {
+                // candidate's status had to be changed by connectToHost, so we don't set it again
+                if (success) {
+                    // let's reject candidates which are meaningless to try
+                    bool hasUnckeckedNew = false;
+                    for (auto &c: remoteCandidates) {
+                        if (c.state() == Candidate::New) {
+                            if (c.priority() <= mnc.priority()) {
+                                c.setState(Candidate::Discarded);
+                            } else {
+                                hasUnckeckedNew = true;
+                            }
+                        }
                     }
+                    if (!hasUnckeckedNew) {
+                        pendingActions &= ~Private::NewCandidate; // just if we had it for example after proxy discovery
+                    }
+                    if (proxyDiscoveryInProgress && (mnc.priority() >> 16) > Candidate::ProxyPreference) {
+                        proxyDiscoveryInProgress = false; // doesn't make sense anymore
+                    }
+                    // TODO do the same for upnp
+                    updateMinimalPriority();
                 }
-                if (proxyDiscoveryInProgress && (maxNew.priority() >> 16) > Candidate::ProxyPreference) {
-                    proxyDiscoveryInProgress = false; // doesn't make sense anymore
-                }
-                // TODO do the same for upnp
-                updateMinimalPriority();
-            }
-            checkAndFinishNegotiation();
-        }, mode == Transport::Udp);
+                checkAndFinishNegotiation();
+            }, mode == Transport::Udp);
+        }
     }
 
     bool hasUnaknowledgedLocalCandidates() const
@@ -599,10 +626,7 @@ class Transport::Private
                         }
                     }
                     if (c.state() == Candidate::Active) {
-                        connection.reset(new Connection(c.takeSocksClient(), mode));
-                        localCandidates.clear();
-                        remoteCandidates.clear();
-                        emit q->connected();
+                        handleConnected(c);
                     }
                 } else { // both sides reported candidate error
                     emit q->failed();
@@ -686,6 +710,34 @@ class Transport::Private
                 localReportedCandidateError = true; // as a sign of completeness even if not true
             }
         }
+
+        // now check and reset NewCandidate pending action
+        bool haveNewCandidates = false;
+        for (auto &c: remoteCandidates) {
+            if (c.state() == Candidate::New) {
+                haveNewCandidates = true;
+                break;
+            }
+        }
+        if (!haveNewCandidates) {
+            pendingActions &= ~Private::NewCandidate;
+        }
+    }
+
+    void handleConnected(Candidate &connCand)
+    {
+        connection.reset(new Connection(connCand.takeSocksClient(), mode));
+        probingTimer.stop();
+        for (auto &rc: remoteCandidates) {
+            if (rc != connCand && rc.state() == Candidate::Probing) {
+                rc.deleteSocksClient();
+            }
+        }
+        QTimer::singleShot(0, q, [this](){
+            localCandidates.clear();
+            remoteCandidates.clear();
+            emit q->connected();
+        });
     }
 };
 
@@ -919,12 +971,7 @@ bool Transport::update(const QDomElement &transportEl)
             return true;
         }
         c.setState(Candidate::Active);
-        d->connection.reset(new Connection(c.takeSocksClient(), d->mode));
-        QTimer::singleShot(0, this, [this](){
-            d->localCandidates.clear();
-            d->remoteCandidates.clear();
-            emit connected();
-        });
+        d->handleConnected(c);
         return true;
     }
 
@@ -1011,6 +1058,8 @@ OutgoingTransportInfoUpdate Transport::takeOutgoingUpdate()
                 }
                 d->checkAndFinishNegotiation();
             }};
+        } else {
+            qWarning("Got NewCandidate pending action but no candidate to send");
         }
     } else if (d->pendingActions & Private::CandidateUsed) {
         d->pendingActions &= ~Private::CandidateUsed;
@@ -1036,6 +1085,9 @@ OutgoingTransportInfoUpdate Transport::takeOutgoingUpdate()
 
             break;
         }
+        if (std::get<0>(upd).isNull()) {
+            qWarning("Got CandidateUsed pending action but no pending candidates");
+        }
     } else if (d->pendingActions & Private::CandidateError) {
         d->pendingActions &= ~Private::CandidateError;
         // we are here because all remote are already in Discardd state
@@ -1078,6 +1130,8 @@ OutgoingTransportInfoUpdate Transport::takeOutgoingUpdate()
                 d->localUsedCandidate = Candidate();
                 emit failed();
             }};
+        } else {
+            qWarning("Got ProxyError pending action but no local used candidate is not set");
         }
     }
 
@@ -1114,7 +1168,7 @@ bool Transport::incomingConnection(SocksClient *sc)
     if (!d->connection) {
         auto s = sc->abstractSocket();
         for (auto &c: d->localCandidates) {
-            if (s->localPort() == c.localPort() && c.state() == Candidate::Pending) {
+            if (s->localPort() == c.localPort() && (c.state() == Candidate::Pending || c.state() == Candidate::Unacked)) {
                 if(d->mode == Transport::Udp)
                     sc->grantUDPAssociate("", 0);
                 else
diff --git a/src/xmpp/xmpp-im/jingle-s5b.h b/src/xmpp/xmpp-im/jingle-s5b.h
index f25138a9..88d754be 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.h
+++ b/src/xmpp/xmpp-im/jingle-s5b.h
@@ -117,6 +117,10 @@ class Candidate {
     void connectToHost(const QString &key, State successState, std::function<void (bool)> callback, bool isUdp = false);
     bool incomingConnection(SocksClient *sc);
     SocksClient* takeSocksClient();
+    void deleteSocksClient();
+
+    bool operator==(const Candidate &other) const;
+    inline bool operator!=(const Candidate &other) const { return !(*this == other); }
 private:
     class Private;
     friend class Transport;
diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index 426ed4bf..c1535233 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -1066,6 +1066,7 @@ class Session::Private
         switch (err) {
         case Private::AddContentError::Unparsed:
         case Private::AddContentError::Unexpected:
+            lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
             return false;
         case Private::AddContentError::Unsupported:
             rejects += Reason(cond).toXml(manager->client()->doc());
@@ -1101,6 +1102,7 @@ class Session::Private
 
         std::tie(parsed, apps) = parseContentAcceptList(jingleEl);
         if (!parsed) {
+            lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
             return false;
         }
 
@@ -1123,6 +1125,7 @@ class Session::Private
 
         std::tie(parsed, apps) = parseContentAcceptList(jingleEl); // marks valid apps as accepted
         if (!parsed) {
+            lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
             return false;
         }
 
@@ -1146,10 +1149,12 @@ class Session::Private
             Application *app;
             ContentBase cb(ce);
             if (!cb.isValid() || !(app = q->content(cb.name, cb.creator)) || app->state() >= State::Finishing || !app->transport()) {
+                lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
                 return false;
             }
             auto tel = ce.firstChildElement(QStringLiteral("transport"));
             if (tel.isNull() || tel.attribute(QStringLiteral("xmlns")) != app->transport()->pad()->ns()) {
+                lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
                 return false;
             }
             updates.append(qMakePair(app->transport(), tel));
@@ -1157,6 +1162,7 @@ class Session::Private
 
         for (auto &u: updates) {
             if (!u.first->update(u.second)) {
+                lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
                 return false; // yes this may lead to half updated content, but what choice do we have?
             }
         }

From 70d2c562c3ba206ba4b7b528f14d7b6f7a7bb9d5 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Thu, 16 May 2019 19:31:26 +0300
Subject: [PATCH 028/383] jingle: prepare content being added to an initiated
 session

---
 src/xmpp/xmpp-im/jingle.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index c1535233..a51c3e4e 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -1250,7 +1250,13 @@ Application *Session::content(const QString &contentName, Origin creator)
 
 void Session::addContent(Application *content)
 {
+    Q_ASSERT(d->state < State::Finishing);
     d->addAndInitContent(d->role, content);
+    if (d->state >= State::PrepareLocalOffer) {
+        // If we add content to already initiated session then we are gonna
+        // send it immediatelly. So start prepare
+        content->prepare();
+    }
 }
 
 const QMap<ContentKey, Application *> &Session::contentList() const

From e3f1200dadd89552658e54dee8c9c021f62823cc Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Thu, 16 May 2019 21:04:54 +0300
Subject: [PATCH 029/383] Fixed crash on destruction of invalid Jingle s5b
 transport

---
 src/xmpp/xmpp-im/jingle-s5b.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 794e2d43..da0f9c84 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -768,7 +768,9 @@ Transport::Transport(const TransportManagerPad::Ptr &pad, const QDomElement &tra
 
 Transport::~Transport()
 {
-    static_cast<Manager*>(d->pad->manager())->removeKeyMapping(d->directAddr);
+    if (d) {
+        static_cast<Manager*>(d->pad->manager())->removeKeyMapping(d->directAddr);
+    }
 }
 
 TransportManagerPad::Ptr Transport::pad() const

From 271fc3580cb66ff4dde0a272394a2783ed212cde Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Thu, 16 May 2019 21:16:33 +0300
Subject: [PATCH 030/383] Validate host/port as it comes from S5BServer

---
 src/xmpp/xmpp-im/jingle-s5b.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index da0f9c84..2ce50077 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -792,6 +792,9 @@ void Transport::prepare()
     auto serv = m->socksServ();
     if (serv) {
         for(auto const &h: serv->hostList()) {
+            if (!serv->port() || h.isEmpty()) {
+                continue;
+            }
             Candidate c(h, serv->port(), d->generateCid(), Candidate::Direct);
             if (!d->isDup(c)) {
                 d->localCandidates.insert(c.cid(), c);

From 70d1883f3ab3701535980bd450e579e991b49b74 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Thu, 16 May 2019 23:54:00 +0300
Subject: [PATCH 031/383] Fixed 0-length jingle downloads

---
 src/xmpp/xmpp-im/jingle-ft.cpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 1eba2dbf..7dc30b78 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -432,6 +432,13 @@ class Application::Private
             return;
         }
         emit q->progress(device->pos());
+        bytesLeft -= sz;
+        if (!bytesLeft) {
+            if (closeDeviceOnFinish) {
+                device->close();
+            }
+            setState(State::Finished);
+        }
     }
 
     void readNextBlockFromTransport()
@@ -458,6 +465,14 @@ class Application::Private
                 return;
             }
             emit q->progress(device->pos());
+            bytesLeft -= sz;
+        }
+        if (!bytesLeft) {
+            if (closeDeviceOnFinish) {
+                device->close();
+            }
+            // TODO send <received>
+            setState(State::Finished);
         }
     }
 };

From 784850281668211f109646ede6bc92a3d1e0afea Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Fri, 17 May 2019 00:17:38 +0300
Subject: [PATCH 032/383] jingle-ft reorder progress and stateChange events

---
 src/xmpp/xmpp-im/jingle-ft.cpp | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 7dc30b78..b658d3c0 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -443,11 +443,8 @@ class Application::Private
 
     void readNextBlockFromTransport()
     {
-        while (quint64 bytesAvail = connection->bytesAvailable()) {
-            qDebug("bytes available %llu", bytesAvail);
-            if (!bytesLeft || !bytesAvail) {
-                return; // nothing to read
-            }
+        quint64 bytesAvail;
+        while (bytesLeft && (bytesAvail = connection->bytesAvailable())) {
             quint64 sz = 65536; // should be respect transport->blockSize() ?
             if (sz > bytesLeft) {
                 sz = bytesLeft;
@@ -557,13 +554,6 @@ bool Application::setTransport(const QSharedPointer<Transport> &transport)
         connect(transport.data(), &Transport::updated, this, &Application::updated);
         connect(transport.data(), &Transport::connected, this, [this](){
             d->connection = d->transport->connection();
-            if (d->acceptFile.range().isValid()) {
-                d->bytesLeft = d->acceptFile.range().length;
-                emit deviceRequested(d->acceptFile.range().offset, d->bytesLeft);
-            } else {
-                d->bytesLeft = d->file.size();
-                emit deviceRequested(0, d->bytesLeft);
-            }
             connect(d->connection.data(), &Connection::readyRead, this, [this](){
                 if (!d->device) {
                     return;
@@ -579,8 +569,12 @@ bool Application::setTransport(const QSharedPointer<Transport> &transport)
                 }
             });
             d->setState(State::Active);
-            if (d->pad->session()->role() != d->senders && d->connection->bytesAvailable()) {
-                d->readNextBlockFromTransport();
+            if (d->acceptFile.range().isValid()) {
+                d->bytesLeft = d->acceptFile.range().length;
+                emit deviceRequested(d->acceptFile.range().offset, d->bytesLeft);
+            } else {
+                d->bytesLeft = d->file.size();
+                emit deviceRequested(0, d->bytesLeft);
             }
         });
 

From 457e1c4a1fbd01a7d385221ccc249f86255af931 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Fri, 17 May 2019 12:00:52 +0300
Subject: [PATCH 033/383] return accepted file so we can know accepted
 offset/length

---
 src/xmpp/xmpp-im/jingle-ft.cpp | 5 +++++
 src/xmpp/xmpp-im/jingle-ft.h   | 1 +
 2 files changed, 6 insertions(+)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index b658d3c0..bf6b2e66 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -537,6 +537,11 @@ File Application::file() const
     return d->file;
 }
 
+File Application::acceptFile() const
+{
+    return d->acceptFile;
+}
+
 // incoming one? or we have to check real direction
 bool Application::setTransport(const QSharedPointer<Transport> &transport)
 {
diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index b50ff33a..476d05e9 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -127,6 +127,7 @@ class Application : public XMPP::Jingle::Application
     SetDescError setDescription(const QDomElement &description) override;
     void setFile(const File &file);
     File file() const;
+    File acceptFile() const;
     bool setTransport(const QSharedPointer<Transport> &transport) override;
     QSharedPointer<Transport> transport() const override;
 

From a26f7d8dba2e8be2f05fc622a487c6619eadee65 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Fri, 17 May 2019 22:09:43 +0300
Subject: [PATCH 034/383] State Finishing when user calls session->terminate

---
 src/xmpp/xmpp-im/jingle.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index a51c3e4e..7d74f3a7 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -1328,6 +1328,7 @@ void Session::initiate()
 
 void Session::terminate(Reason::Condition cond, const QString &comment)
 {
+    d->state = State::Finishing;
     d->terminateReason = Reason(cond, comment);
 }
 

From a2d258622acdc59a47a04b5f05f277ad1296f84f Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sat, 18 May 2019 23:47:10 +0300
Subject: [PATCH 035/383] Fixed possible race condition in incoming socks
 connection initialization

---
 src/xmpp/xmpp-im/jingle-s5b.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 2ce50077..11face03 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -1173,13 +1173,17 @@ bool Transport::incomingConnection(SocksClient *sc)
     if (!d->connection) {
         auto s = sc->abstractSocket();
         for (auto &c: d->localCandidates) {
-            if (s->localPort() == c.localPort() && (c.state() == Candidate::Pending || c.state() == Candidate::Unacked)) {
+            if (s->localPort() == c.localPort() &&
+                    (c.state() == Candidate::Pending || c.state() == Candidate::Unacked) &&
+                    c.incomingConnection(sc))
+            {
+
                 if(d->mode == Transport::Udp)
                     sc->grantUDPAssociate("", 0);
                 else
                     sc->grantConnect();
                 // we can also remember the server it comes from. static_cast<S5BServer *>(sender())
-                return c.incomingConnection(sc);
+                return true;
             }
         }
     }

From c67e999f47fc8c4712d229ddd2a91c0cf97c50ea Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 19 May 2019 10:07:18 +0300
Subject: [PATCH 036/383] Always clsoe socks connection on Finished state

---
 src/xmpp/xmpp-im/jingle-ft.cpp  | 16 +++++++---------
 src/xmpp/xmpp-im/jingle-s5b.cpp | 10 ++++++++++
 src/xmpp/xmpp-im/jingle.cpp     |  5 +++++
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index bf6b2e66..994e1b21 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -399,8 +399,13 @@ class Application::Private
     void setState(State s)
     {
         state = s;
-        if (s == State::Finished && device && closeDeviceOnFinish) {
-            device->close();
+        if (s == State::Finished) {
+            if (device && closeDeviceOnFinish) {
+                device->close();
+            }
+            if (connection) {
+                connection->close();
+            }
         }
         emit q->stateChanged(s);
     }
@@ -408,7 +413,6 @@ class Application::Private
     void handleStreamFail()
     {
         // TODO d->lastError = Condition::FailedApplication
-        connection.reset();
         setState(State::Finished);
     }
 
@@ -434,9 +438,6 @@ class Application::Private
         emit q->progress(device->pos());
         bytesLeft -= sz;
         if (!bytesLeft) {
-            if (closeDeviceOnFinish) {
-                device->close();
-            }
             setState(State::Finished);
         }
     }
@@ -465,9 +466,6 @@ class Application::Private
             bytesLeft -= sz;
         }
         if (!bytesLeft) {
-            if (closeDeviceOnFinish) {
-                device->close();
-            }
             // TODO send <received>
             setState(State::Finished);
         }
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 11face03..187fdbe9 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -87,6 +87,16 @@ class Connection : public XMPP::Jingle::Connection
         return client->bytesToWrite();
     }
 
+    void close()
+    {
+        if (client) {
+            client->disconnect(this);
+        }
+        XMPP::Jingle::Connection::close();
+        client->deleteLater();
+        client = nullptr;
+    }
+
 protected:
     qint64 writeData(const char *data, qint64 maxSize)
     {
diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index 7d74f3a7..e57d3b37 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -602,6 +602,11 @@ class Session::Private
         state = State::Finished;
         emit q->terminated();
         signalingContent.clear();
+        for (auto &c: contentList) {
+            if (c->state() != State::Finished) {
+                c->setState(State::Finished);
+            }
+        }
         auto vals = contentList.values();
         contentList.clear();
         while (vals.size()) {

From e4047959965d49477e9fca7c4ae50b3c958e1765 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 19 May 2019 13:36:37 +0300
Subject: [PATCH 037/383] Close socks socket only when when all data realy
 written

---
 src/xmpp/xmpp-im/jingle-ft.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 994e1b21..9d82ad9a 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -419,6 +419,7 @@ class Application::Private
     void writeNextBlockToTransport()
     {
         if (!bytesLeft) {
+            setState(State::Finished);
             return; // everything is written
         }
         auto sz = transport->blockSize();
@@ -437,9 +438,6 @@ class Application::Private
         }
         emit q->progress(device->pos());
         bytesLeft -= sz;
-        if (!bytesLeft) {
-            setState(State::Finished);
-        }
     }
 
     void readNextBlockFromTransport()

From 913f7e7f4c94ed230f21d4490aa66db8add8e991 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 19 May 2019 15:10:04 +0300
Subject: [PATCH 038/383] Fixed crah in Jingle task callback + fixed
 Session::terminate

---
 src/xmpp/xmpp-im/jingle.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index e57d3b37..d1a20a09 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -633,7 +633,7 @@ class Session::Private
 
         auto jt = new JT(manager->client()->rootTask());
         jt->request(otherParty, xml);
-        QObject::connect(jt, &JT::finished, manager, [jt, jingle, successCB, this](){
+        QObject::connect(jt, &JT::finished, q, [jt, jingle, successCB, this](){
             waitingAck = false;
             if (jt->success()) {
                 if (successCB) {
@@ -1335,6 +1335,7 @@ void Session::terminate(Reason::Condition cond, const QString &comment)
 {
     d->state = State::Finishing;
     d->terminateReason = Reason(cond, comment);
+    d->planStep();
 }
 
 TransportManagerPad::Ptr Session::transportPadFactory(const QString &ns)

From a3c07caf6ee8d9dc34f31261bb8c23a7d1a5d1cd Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 19 May 2019 15:36:01 +0300
Subject: [PATCH 039/383] Remove session from internal sessions list on
 terminate for any type of session

---
 src/xmpp/xmpp-im/jingle.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index d1a20a09..ae0908a1 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -1479,6 +1479,13 @@ class Manager::Private
     XMPP::Stanza::Error lastError;
     QHash<QPair<Jid,QString>,Session*> sessions;
     int maxSessions = -1; // no limit
+
+    void setupSession(Session *s)
+    {
+        QObject::connect(s, &Session::terminated, manager, [this, s](){
+            sessions.remove(qMakePair(s->peer(), s->sid()));
+        });
+    }
 };
 
 Manager::Manager(Client *client) :
@@ -1606,6 +1613,7 @@ Session* Manager::incomingSessionInitiate(const Jid &from, const Jingle &jingle,
     auto s = new Session(this, from, Origin::Responder);
     if (s->incomingInitiate(jingle, jingleEl)) { // if parsed well
         d->sessions.insert(key, s);
+        d->setupSession(s);
         // emit incomingSession makes sense when there are no unsolved conflicts in content descriptions / transports
         //QTimer::singleShot(0,[s, this](){ emit incomingSession(s); });
         QMetaObject::invokeMethod(this, "incomingSession", Qt::QueuedConnection, Q_ARG(Session*, s));
@@ -1624,9 +1632,7 @@ XMPP::Stanza::Error Manager::lastError() const
 Session *Manager::newSession(const Jid &j)
 {
     auto s = new Session(this, j);
-    connect(s, &Session::terminated, this, [this, s](){
-        d->sessions.remove(qMakePair(s->peer(), s->sid()));
-    });
+    d->setupSession(s);
     return s;
 }
 

From b2873f138eb6827659b7264d971757c3866bda89 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Thu, 23 May 2019 08:13:37 +0300
Subject: [PATCH 040/383] Started implementation of tcp port reserver

---
 src/irisnet/noncore/noncore.pri         |  6 +-
 src/irisnet/noncore/tcpportreserver.cpp | 96 +++++++++++++++++++++++++
 src/irisnet/noncore/tcpportreserver.h   | 52 ++++++++++++++
 3 files changed, 152 insertions(+), 2 deletions(-)
 create mode 100644 src/irisnet/noncore/tcpportreserver.cpp
 create mode 100644 src/irisnet/noncore/tcpportreserver.h

diff --git a/src/irisnet/noncore/noncore.pri b/src/irisnet/noncore/noncore.pri
index 559ed568..c4b0e005 100644
--- a/src/irisnet/noncore/noncore.pri
+++ b/src/irisnet/noncore/noncore.pri
@@ -27,7 +27,8 @@ HEADERS += \
     $$PWD/icelocaltransport.h \
     $$PWD/iceturntransport.h \
     $$PWD/icecomponent.h \
-    $$PWD/ice176.h
+    $$PWD/ice176.h \
+    $$PWD/tcpportreserver.h
 
 SOURCES += \
     $$PWD/processquit.cpp \
@@ -43,7 +44,8 @@ SOURCES += \
     $$PWD/icelocaltransport.cpp \
     $$PWD/iceturntransport.cpp \
     $$PWD/icecomponent.cpp \
-    $$PWD/ice176.cpp
+    $$PWD/ice176.cpp \
+    $$PWD/tcpportreserver.cpp
 
 INCLUDEPATH += $$PWD/legacy
 include(legacy/legacy.pri)
diff --git a/src/irisnet/noncore/tcpportreserver.cpp b/src/irisnet/noncore/tcpportreserver.cpp
new file mode 100644
index 00000000..fd140504
--- /dev/null
+++ b/src/irisnet/noncore/tcpportreserver.cpp
@@ -0,0 +1,96 @@
+/*
+ * tcpportreserver.cpp - dialog for handling tabbed chats
+ * Copyright (C) 2019  Sergey Ilinykh
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <QNetworkInterface>
+
+#include "tcpportreserver.h"
+#include "ice176.h"
+
+namespace XMPP {
+
+struct StaticForwarding
+{
+    QString extHost;
+    quint16 extPort;
+    QHostAddress localIp;
+    quint16 localPort;
+};
+
+struct TcpPortReserver::Private
+{
+    QMap<QString,StaticForwarding> staticForwarding;
+};
+
+TcpPortReserver::TcpPortReserver(QObject *parent) : QObject(parent),
+  d(new Private)
+{
+
+}
+
+TcpPortReserver::~TcpPortReserver()
+{
+
+}
+
+QList<QTcpServer *> TcpPortReserver::borrow(const QString &scopeId, const QString &intanceId)
+{
+    QList<QHostAddress> listenAddrs;
+    foreach(const QNetworkInterface &ni, QNetworkInterface::allInterfaces())
+    {
+        if (!(ni.flags() & (QNetworkInterface::IsUp | QNetworkInterface::IsRunning))) {
+            continue;
+        }
+        if (ni.flags() & QNetworkInterface::IsLoopBack) {
+            continue;
+        }
+        QList<QNetworkAddressEntry> entries = ni.addressEntries();
+        foreach(const QNetworkAddressEntry &na, entries)
+        {
+            QHostAddress h = na.ip();
+            if (h.isLoopback()) {
+                continue;
+            }
+
+            // don't put the same address in twice.
+            //   this also means that if there are
+            //   two link-local ipv6 interfaces
+            //   with the exact same address, we
+            //   only use the first one
+            if(listenAddrs.contains(h))
+                continue;
+#if QT_VERSION >= QT_VERSION_CHECK(5,11,0)
+            if(h.protocol() == QAbstractSocket::IPv6Protocol && h.isLinkLocal())
+#else
+            if(h.protocol() == QAbstractSocket::IPv6Protocol && XMPP::Ice176::isIPv6LinkLocalAddress(h))
+#endif
+                h.setScopeId(ni.name());
+            listenAddrs += h;
+        }
+    }
+
+    return QList<QTcpServer *>(); // FIXME
+}
+
+
+void TcpPortReserver::setExternalHost(const QString &scopeId, const QString &extHost, quint16 extPort, const QHostAddress &localIp, quint16 localPort)
+{
+    d->staticForwarding.insert(scopeId, StaticForwarding{extHost, extPort, localIp, localPort});
+}
+
+} // namespace XMPP
diff --git a/src/irisnet/noncore/tcpportreserver.h b/src/irisnet/noncore/tcpportreserver.h
new file mode 100644
index 00000000..94a68b66
--- /dev/null
+++ b/src/irisnet/noncore/tcpportreserver.h
@@ -0,0 +1,52 @@
+/*
+ * tcpportreserver.cpp - dialog for handling tabbed chats
+ * Copyright (C) 2019  Sergey Ilinykh
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef TCPPORTRESERVER_H
+#define TCPPORTRESERVER_H
+
+#include <QObject>
+
+class QTcpServer;
+class QHostAddress;
+
+namespace XMPP {
+
+class TcpPortReserver : public QObject
+{
+    Q_OBJECT
+public:
+    explicit TcpPortReserver(QObject *parent = nullptr);
+    ~TcpPortReserver();
+
+    // port withing instanceId are uique but can be the same withing the same scopeId
+    // scopes never intersect
+    QList<QTcpServer*> borrow(const QString &scopeId, const QString &intanceId);
+    void setExternalHost(const QString &scopeId, const QString &extHost, quint16 extPort, const QHostAddress &localIp, quint16 localPort);
+
+signals:
+
+public slots:
+private:
+    class Private;
+    QScopedPointer<Private> d;
+};
+
+} // namespace XMPP
+
+#endif // TCPPORTRESERVER_H

From d95407de6cea2d09e6f7b2a072053102929c12eb Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sat, 1 Jun 2019 19:38:32 +0300
Subject: [PATCH 041/383] Tcp port reserver for file transfer (#60)

Implemented a util creating servers servers on all interfaces and deleting them when not used anymore.
---
 include/iris/tcpportreserver.h          |   1 +
 src/irisnet/CMakeLists.txt              |   2 +
 src/irisnet/noncore/cutestuff/socks.cpp |  42 +-
 src/irisnet/noncore/cutestuff/socks.h   |   2 +
 src/irisnet/noncore/tcpportreserver.cpp | 194 ++++++++-
 src/irisnet/noncore/tcpportreserver.h   | 136 +++++-
 src/xmpp/xmpp-im/client.cpp             |  12 +
 src/xmpp/xmpp-im/jingle-ft.h            |   1 +
 src/xmpp/xmpp-im/jingle-s5b.cpp         | 556 ++++++++++++++++--------
 src/xmpp/xmpp-im/jingle-s5b.h           |  22 +-
 src/xmpp/xmpp-im/jingle.cpp             |  43 +-
 src/xmpp/xmpp-im/jingle.h               |   1 +
 src/xmpp/xmpp-im/s5b.cpp                | 475 ++++++++------------
 src/xmpp/xmpp-im/s5b.h                  |  50 +--
 src/xmpp/xmpp-im/xmpp_client.h          |   3 +
 src/xmpp/xmpp-im/xmpp_liverosteritem.h  |   1 +
 src/xmpp/xmpp-im/xmpp_rosteritem.h      |   1 +
 17 files changed, 986 insertions(+), 556 deletions(-)
 create mode 100644 include/iris/tcpportreserver.h

diff --git a/include/iris/tcpportreserver.h b/include/iris/tcpportreserver.h
new file mode 100644
index 00000000..ed0f9a46
--- /dev/null
+++ b/include/iris/tcpportreserver.h
@@ -0,0 +1 @@
+#include "../../src/irisnet/noncore/tcpportreserver.h"
diff --git a/src/irisnet/CMakeLists.txt b/src/irisnet/CMakeLists.txt
index 662c8541..3141406e 100644
--- a/src/irisnet/CMakeLists.txt
+++ b/src/irisnet/CMakeLists.txt
@@ -48,6 +48,7 @@ set(SOURCES
     noncore/stuntransaction.cpp
     noncore/turnclient.cpp
     noncore/udpportreserver.cpp
+    noncore/tcpportreserver.cpp
 
     noncore/cutestuff/bsocket.cpp
 )
@@ -89,6 +90,7 @@ set(HEADERS
     noncore/stuntransaction.h
     noncore/turnclient.h
     noncore/udpportreserver.h
+    noncore/tcpportreserver.h
 
     noncore/cutestuff/bsocket.h
     noncore/cutestuff/bytestream.h
diff --git a/src/irisnet/noncore/cutestuff/socks.cpp b/src/irisnet/noncore/cutestuff/socks.cpp
index 41f645d6..2dbc8272 100644
--- a/src/irisnet/noncore/cutestuff/socks.cpp
+++ b/src/irisnet/noncore/cutestuff/socks.cpp
@@ -1019,22 +1019,15 @@ SocksUDP *SocksClient::createUDP(const QString &host, int port, const QHostAddre
 class SocksServer::Private
 {
 public:
-    Private(SocksServer *_q) :
-        serv(_q)
-    {
-    }
-
-    QTcpServer serv;
+    QTcpServer          *serv = nullptr;
     QList<SocksClient*> incomingConns;
-    QUdpSocket *sd;
+    QUdpSocket          *sd = nullptr;
 };
 
 SocksServer::SocksServer(QObject *parent)
 :QObject(parent)
 {
-    d = new Private(this);
-    d->sd = 0;
-    connect(&d->serv, SIGNAL(newConnection()), SLOT(newConnection()));
+    d = new Private;
 }
 
 SocksServer::~SocksServer()
@@ -1046,22 +1039,32 @@ SocksServer::~SocksServer()
     delete d;
 }
 
+void SocksServer::setServerSocket(QTcpServer *server)
+{
+    d->serv = server;
+    connect(d->serv, SIGNAL(newConnection()), SLOT(newConnection()));
+}
+
 bool SocksServer::isActive() const
 {
-    return d->serv.isListening();
+    return d->serv->isListening();
 }
 
 bool SocksServer::listen(quint16 port, bool udp)
 {
     stop();
-    if(!d->serv.listen(QHostAddress::Any, port))
+    if (!d->serv) {
+        setServerSocket(new QTcpServer(this));
+    }
+    if(!d->serv->listen(QHostAddress::Any, port))
         return false;
     if(udp) {
         d->sd = new QUdpSocket(this);
         if(!d->sd->bind(QHostAddress::LocalHost, port)) {
             delete d->sd;
-            d->sd = 0;
-            d->serv.close();
+            d->sd = nullptr;
+            delete d->serv;
+            d->serv = nullptr;
             return false;
         }
         connect(d->sd, SIGNAL(readyRead()), SLOT(sd_activated()));
@@ -1072,18 +1075,19 @@ bool SocksServer::listen(quint16 port, bool udp)
 void SocksServer::stop()
 {
     delete d->sd;
-    d->sd = 0;
-    d->serv.close();
+    d->sd = nullptr;
+    delete d->serv;
+    d->serv = nullptr;
 }
 
 int SocksServer::port() const
 {
-    return d->serv.serverPort();
+    return d->serv? d->serv->serverPort(): 0;
 }
 
 QHostAddress SocksServer::address() const
 {
-    return d->serv.serverAddress();
+    return d->serv? d->serv->serverAddress(): QHostAddress();
 }
 
 SocksClient *SocksServer::takeIncoming()
@@ -1111,7 +1115,7 @@ void SocksServer::writeUDP(const QHostAddress &addr, int port, const QByteArray
 
 void SocksServer::newConnection()
 {
-    SocksClient *c = new SocksClient(d->serv.nextPendingConnection(), this);
+    SocksClient *c = new SocksClient(d->serv->nextPendingConnection(), this);
     connect(c, SIGNAL(error(int)), this, SLOT(connectionError()));
     d->incomingConns.append(c);
     incomingReady();
diff --git a/src/irisnet/noncore/cutestuff/socks.h b/src/irisnet/noncore/cutestuff/socks.h
index 6ca5efd6..eb3811db 100644
--- a/src/irisnet/noncore/cutestuff/socks.h
+++ b/src/irisnet/noncore/cutestuff/socks.h
@@ -26,6 +26,7 @@
 
 class QHostAddress;
 class QTcpSocket;
+class QTcpServer;
 class SocksClient;
 class SocksServer;
 
@@ -135,6 +136,7 @@ class SocksServer : public QObject
     SocksServer(QObject *parent=0);
     ~SocksServer();
 
+    void setServerSocket(QTcpServer *server);
     bool isActive() const;
     bool listen(quint16 port, bool udp=false);
     void stop();
diff --git a/src/irisnet/noncore/tcpportreserver.cpp b/src/irisnet/noncore/tcpportreserver.cpp
index fd140504..e1ad089c 100644
--- a/src/irisnet/noncore/tcpportreserver.cpp
+++ b/src/irisnet/noncore/tcpportreserver.cpp
@@ -1,5 +1,5 @@
 /*
- * tcpportreserver.cpp - dialog for handling tabbed chats
+ * tcpportreserver.cpp - a utility to bind local tcp server sockets
  * Copyright (C) 2019  Sergey Ilinykh
  *
  * This program is free software; you can redistribute it and/or
@@ -18,37 +18,64 @@
  */
 
 #include <QNetworkInterface>
+#include <QTcpServer>
+#include <QTcpSocket>
 
 #include "tcpportreserver.h"
 #include "ice176.h"
 
 namespace XMPP {
 
-struct StaticForwarding
+TcpPortDiscoverer::TcpPortDiscoverer(TcpPortScope *scope) :
+    QObject(scope),
+    scope(scope)
 {
-    QString extHost;
-    quint16 extPort;
-    QHostAddress localIp;
-    quint16 localPort;
-};
 
-struct TcpPortReserver::Private
+}
+
+bool TcpPortDiscoverer::setExternalHost(const QString &extHost, quint16 extPort, const QHostAddress &localAddr, quint16 localPort)
 {
-    QMap<QString,StaticForwarding> staticForwarding;
-};
+    if (!(typeMask & TcpPortServer::NatAssited)) {
+        return false; // seems like we don't need nat-assited
+    }
+    auto server = scope->bind(localAddr, localPort);
+    if (!server) {
+        return false;
+    }
+    TcpPortServer::Port p;
+    p.portType = TcpPortServer::NatAssited;
+    p.publishHost = extHost;
+    p.publishPort = extPort;
+    server->setPortInfo(p);
+    servers.append(server);
+    emit portAvailable();
+    return true;
+}
 
-TcpPortReserver::TcpPortReserver(QObject *parent) : QObject(parent),
-  d(new Private)
+TcpPortServer::PortTypes TcpPortDiscoverer::inProgressPortTypes() const
 {
+    return 0; // same as for stop()
+}
 
+bool TcpPortDiscoverer::isDepleted() const
+{
+    return servers.size() == 0; // TODO and no active subdiscoveries
 }
 
-TcpPortReserver::~TcpPortReserver()
+TcpPortServer::PortTypes TcpPortDiscoverer::setTypeMask(TcpPortServer::PortTypes mask)
 {
+    this->typeMask = mask;
+    // drop ready ports if any
+    std::remove_if(servers.begin(), servers.end(), [mask](auto &s){ return !(s->portType() & mask); });
+
+    TcpPortServer::PortTypes pendingTypes;
+    for (auto &s: servers) pendingTypes |= s->portType();
 
+    // TODO drop pending subdiscoveries too and update pendingType when implemented
+    return pendingTypes;
 }
 
-QList<QTcpServer *> TcpPortReserver::borrow(const QString &scopeId, const QString &intanceId)
+void TcpPortDiscoverer::start()
 {
     QList<QHostAddress> listenAddrs;
     foreach(const QNetworkInterface &ni, QNetworkInterface::allInterfaces())
@@ -84,13 +111,146 @@ QList<QTcpServer *> TcpPortReserver::borrow(const QString &scopeId, const QStrin
         }
     }
 
-    return QList<QTcpServer *>(); // FIXME
+    for (auto &h: listenAddrs) {
+        auto server = scope->bind(h, 0);
+        if (!server) {
+            continue;
+        }
+        TcpPortServer::Port p;
+        p.portType = TcpPortServer::Direct;
+        QHostAddress addr = server->serverAddress();
+        addr.setScopeId(QString());
+        p.publishHost = addr.toString();
+        p.publishPort = server->serverPort();
+        server->setPortInfo(p);
+        servers.append(server);
+    }
+
+    if (listenAddrs.size()) {
+        emit portAvailable();
+    }
+}
+
+void TcpPortDiscoverer::stop()
+{
+    // nothing really to do here. but if we invent extension interface it can call stop on subdisco
+}
+
+QList<TcpPortServer::Ptr> TcpPortDiscoverer::takeServers()
+{
+    auto ret = servers;
+    servers.clear();
+    for (auto &p: ret) {
+        p->disconnect(this);
+    }
+    return ret;
+}
+
+// --------------------------------------------------------------------------
+// TcpPortScope
+// --------------------------------------------------------------------------
+struct TcpPortScope::Private
+{
+    QHash<QPair<QHostAddress,quint16>, QWeakPointer<TcpPortServer>> servers;
+};
+
+
+TcpPortScope::TcpPortScope() :
+    d(new Private)
+{
+}
+
+TcpPortScope::~TcpPortScope()
+{
+
+}
+
+TcpPortDiscoverer *TcpPortScope::disco()
+{
+    auto discoverer = new TcpPortDiscoverer(this);
+    QMetaObject::invokeMethod(parent(), "newDiscoverer", Q_ARG(TcpPortDiscoverer*, discoverer));
+    QMetaObject::invokeMethod(discoverer, "start");
+    return discoverer;
+}
+
+QList<TcpPortServer::Ptr> TcpPortScope::allServers() const
+{
+    QList<TcpPortServer::Ptr> ret;
+    for (auto &s: d->servers) {
+        auto sl = s.lock();
+        if (sl) {
+            ret.append(sl);
+        }
+    }
+    return ret;
+}
+
+void TcpPortScope::destroyServer(TcpPortServer *server)
+{
+    delete server;
 }
 
+TcpPortServer::Ptr TcpPortScope::bind(const QHostAddress &addr, quint16 port)
+{
+    if (port) {
+        auto srv = d->servers.value(qMakePair(addr,port)).toStrongRef();
+        if (srv) {
+            return srv;
+        }
+    }
+    auto socket = new QTcpServer(this);
+    if (!socket->listen(addr, port)) {
+        delete socket;
+        return TcpPortServer::Ptr();
+    }
+    auto server = makeServer(socket);
+
+    TcpPortServer::Ptr shared(server, [](TcpPortServer *s){
+        auto scope = qobject_cast<TcpPortScope*>(s->parent());
+        if (scope) {
+            scope->d->servers.remove(qMakePair(s->serverAddress(),s->serverPort()));
+            scope->destroyServer(s);
+        } else {
+            delete s;
+        }
+    });
+    d->servers.insert(qMakePair(socket->serverAddress(), socket->serverPort()), shared.toWeakRef());
+
+    return shared;
+}
 
-void TcpPortReserver::setExternalHost(const QString &scopeId, const QString &extHost, quint16 extPort, const QHostAddress &localIp, quint16 localPort)
+
+// --------------------------------------------------------------------------
+// TcpPortScope
+// --------------------------------------------------------------------------
+TcpPortReserver::TcpPortReserver(QObject *parent) : QObject(parent)
 {
-    d->staticForwarding.insert(scopeId, StaticForwarding{extHost, extPort, localIp, localPort});
+
+}
+
+TcpPortReserver::~TcpPortReserver()
+{
+
+}
+
+TcpPortScope *TcpPortReserver::scope(const QString &id)
+{
+    return findChild<TcpPortScope*>(id, Qt::FindDirectChildrenOnly);
+}
+
+void TcpPortReserver::registerScope(const QString &id, TcpPortScope *scope)
+{
+    scope->setObjectName(id);
+    scope->setParent(this);
+}
+
+TcpPortScope *TcpPortReserver::unregisterScope(const QString &id)
+{
+    auto s = scope(id);
+    if (s) {
+        s->setParent(nullptr);
+    }
+    return s;
 }
 
 } // namespace XMPP
diff --git a/src/irisnet/noncore/tcpportreserver.h b/src/irisnet/noncore/tcpportreserver.h
index 94a68b66..97017e27 100644
--- a/src/irisnet/noncore/tcpportreserver.h
+++ b/src/irisnet/noncore/tcpportreserver.h
@@ -1,5 +1,5 @@
 /*
- * tcpportreserver.cpp - dialog for handling tabbed chats
+ * tcpportreserver.cpp - a utility to bind local tcp server sockets
  * Copyright (C) 2019  Sergey Ilinykh
  *
  * This program is free software; you can redistribute it and/or
@@ -21,12 +21,121 @@
 #define TCPPORTRESERVER_H
 
 #include <QObject>
-
-class QTcpServer;
-class QHostAddress;
+#include <QSharedPointer>
+#include <QVariant>
+#include <QTcpServer>
 
 namespace XMPP {
 
+class TcpPortServer : public QObject
+{
+    Q_OBJECT
+public:
+    using Ptr = QSharedPointer<TcpPortServer>;
+
+    enum PortType {
+        NoType     = 0x0,
+        Direct     = 0x1,
+        NatAssited = 0x2,
+        Tunneled   = 0x4
+    };
+    Q_DECLARE_FLAGS(PortTypes, PortType)
+
+    struct Port
+    {
+        PortType portType = NoType;
+        QString  publishHost;
+        quint16  publishPort = 0;
+        QVariant meta;
+    };
+
+    inline TcpPortServer(QTcpServer *serverSocket) : serverSocket(serverSocket) {}
+    inline void            setPortInfo(const Port &port) { this->port = port; }
+    inline QHostAddress    serverAddress() const { return serverSocket->serverAddress(); }
+    inline quint16         serverPort() const { return serverSocket->serverPort(); }
+    inline const QString  &publishHost() const { return port.publishHost; }
+    inline quint16         publishPort() const { return port.publishPort; }
+    inline PortType        portType() const { return port.portType; }
+    inline const QVariant &meta() const { return port.meta; }
+
+protected:
+    QTcpServer *serverSocket = nullptr;
+    Port port;
+};
+
+class TcpPortScope;
+/**
+ * @brief The TcpPortDiscoverer class
+ *
+ * Discovers / starts listening on a set of unique tcp ports.
+ */
+class TcpPortDiscoverer : public QObject
+{
+    Q_OBJECT
+public:
+
+    TcpPortDiscoverer(TcpPortScope *scope);
+    bool setExternalHost(const QString &extHost, quint16 extPort, const QHostAddress &localIp, quint16 localPort);
+
+    TcpPortServer::PortTypes inProgressPortTypes() const;
+    bool isDepleted() const;
+
+    /**
+     * @brief setTypeMask sets expected port types mask and frees unnecessary resources
+     * @param mask
+     * @return remaining port types
+     */
+    XMPP::TcpPortServer::PortTypes setTypeMask(TcpPortServer::PortTypes mask);
+
+    /**
+     * @brief takeServers takes all discovered servers
+     * @return
+     */
+    QList<TcpPortServer::Ptr> takeServers();
+public slots:
+    void start(); // it's autocalled after outside world is notified about this new discoverer
+    void stop();
+signals:
+    void portAvailable();
+private:
+    TcpPortServer::PortTypes typeMask = TcpPortServer::PortTypes(TcpPortServer::Direct | TcpPortServer::NatAssited | TcpPortServer::Tunneled);
+    TcpPortScope *scope = nullptr;
+    QList<TcpPortServer::Ptr> servers;
+};
+
+class TcpPortReserver;
+/**
+ * @brief The TcpPortScope class
+ *
+ * Handles scopes of ports. For example just S5B dedicated ports.
+ * There only on scope instance per scope id
+ */
+class TcpPortScope: public QObject
+{
+    Q_OBJECT
+public:
+    TcpPortScope();
+    ~TcpPortScope();
+    TcpPortDiscoverer* disco();
+    QList<TcpPortServer::Ptr> allServers() const;
+protected:
+    virtual TcpPortServer* makeServer(QTcpServer *socket) = 0;
+    virtual void destroyServer(TcpPortServer *server);
+
+private:
+    friend class TcpPortDiscoverer;
+    TcpPortServer::Ptr bind(const QHostAddress &addr, quint16 port);
+
+private:
+    class Private;
+    QScopedPointer<Private> d;
+};
+
+
+/**
+ * @brief The TcpPortReserver class
+ * This class should have the only instance per application
+ */
 class TcpPortReserver : public QObject
 {
     Q_OBJECT
@@ -34,19 +143,24 @@ class TcpPortReserver : public QObject
     explicit TcpPortReserver(QObject *parent = nullptr);
     ~TcpPortReserver();
 
-    // port withing instanceId are uique but can be the same withing the same scopeId
-    // scopes never intersect
-    QList<QTcpServer*> borrow(const QString &scopeId, const QString &intanceId);
-    void setExternalHost(const QString &scopeId, const QString &extHost, quint16 extPort, const QHostAddress &localIp, quint16 localPort);
+    /**
+     * @brief scope returns a registered scope corresponding to scope id
+     * @param id
+     * @return scope
+     * @note Do not reparent the object
+     */
+    TcpPortScope *scope(const QString &id);
 
+    void registerScope(const QString &id, TcpPortScope *scope);
+    TcpPortScope *unregisterScope(const QString &id);
 signals:
+    void newDiscoverer(TcpPortDiscoverer *discoverer);
 
 public slots:
-private:
-    class Private;
-    QScopedPointer<Private> d;
 };
 
 } // namespace XMPP
 
+Q_DECLARE_OPERATORS_FOR_FLAGS(XMPP::TcpPortServer::PortTypes)
+
 #endif // TCPPORTRESERVER_H
diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
index d8573bfa..7396bac5 100644
--- a/src/xmpp/xmpp-im/client.cpp
+++ b/src/xmpp/xmpp-im/client.cpp
@@ -87,6 +87,7 @@
 #include "jingle.h"
 #include "jingle-ft.h"
 #include "jingle-s5b.h"
+#include "tcpportreserver.h"
 
 #ifdef Q_OS_WIN
 #define vsnprintf _vsnprintf
@@ -132,6 +133,7 @@ class Client::ClientPrivate
     LiveRoster roster;
     ResourceList resourceList;
     CapsManager *capsman = nullptr;
+    TcpPortReserver *tcpPortReserver = nullptr;
     S5BManager *s5bman = nullptr;
     Jingle::S5B::Manager *jingleS5BManager = nullptr;
     IBBManager *ibbman = nullptr;
@@ -237,6 +239,16 @@ void Client::start(const QString &host, const QString &user, const QString &pass
     d->active = true;
 }
 
+void Client::setTcpPortReserver(TcpPortReserver *portReserver)
+{
+    d->tcpPortReserver = portReserver;
+}
+
+TcpPortReserver * Client::tcpPortReserver() const
+{
+    return d->tcpPortReserver;
+}
+
 void Client::setFileTransferEnabled(bool b)
 {
     if(b) {
diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index 476d05e9..327dfbb3 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -50,6 +50,7 @@ class File
     File(const File &other);
     File(const QDomElement &file);
     ~File();
+    File& operator=(const File& other) = default;
     inline bool isValid() const { return d != nullptr; }
     QDomElement toXml(QDomDocument *doc) const;
 
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 187fdbe9..afbd4145 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -24,6 +24,7 @@
 #include "socks.h"
 
 #include <QElapsedTimer>
+#include <QNetworkInterface>
 #include <QTimer>
 
 namespace XMPP {
@@ -124,14 +125,95 @@ class Connection : public XMPP::Jingle::Connection
     }
 };
 
+class V6LinkLocalSocksConnector : public  QObject
+{
+    Q_OBJECT
+
+    QMap<QString,SocksClient*> clients;
+    SocksClient *client = nullptr;
+public:
+    using QObject::QObject;
+
+    void connectToHost(const QHostAddress &proxyHost, int proxyPort, const QString &host, bool udpMode)
+    {
+        foreach(const QNetworkInterface &ni, QNetworkInterface::allInterfaces())
+        {
+            if (!(ni.flags() & (QNetworkInterface::IsUp | QNetworkInterface::IsRunning))) {
+                continue;
+            }
+            if (ni.flags() & QNetworkInterface::IsLoopBack) {
+                continue;
+            }
+            QList<QNetworkAddressEntry> entries = ni.addressEntries();
+            foreach(const QNetworkAddressEntry &na, entries)
+            {
+                QHostAddress ha = na.ip();
+                if (ha.protocol() == QAbstractSocket::IPv6Protocol &&
+                #if QT_VERSION >= QT_VERSION_CHECK(5,11,0)
+                        ha.isLinkLocal()
+                #else
+                        XMPP::Ice176::isIPv6LinkLocalAddress(ha)
+                #endif
+                        ) // && proxyHost.isInSubnet(ha, na.prefixLength())
+                {
+                    auto client = new SocksClient(this);
+                    clients.insert(ni.name(), client);
+                    break;
+                }
+            }
+        }
+
+        if (!clients.size()) {
+            emit ready();
+            return;
+        }
+
+        QHostAddress ph(proxyHost);
+        for (auto it = clients.begin(); it != clients.end(); ++it) {
+            QString name = it.key();
+            SocksClient *client = it.value();
+            connect(client, &SocksClient::connected, this, [this, name, client](){
+                this->client = client;
+                clients.remove(name);
+                qDeleteAll(clients);
+                emit ready();
+            });
+            connect(client, &SocksClient::error, this, [this, name, client](int error){
+                Q_UNUSED(error);
+                clients.remove(name);
+                delete client;
+                if (clients.isEmpty()) {
+                    emit ready();
+                }
+            }, Qt::QueuedConnection);
+            ph.setScopeId(name);
+            client->connectToHost(ph.toString(), proxyPort, host, 0, udpMode);
+        }
+    }
+
+    SocksClient* takeClient()
+    {
+        auto c = client;
+        client = nullptr;
+        return c;
+    }
+
+signals:
+    void ready();
+};
+
 class Candidate::Private : public QObject, public QSharedData {
     Q_OBJECT
 public:
     ~Private()
     {
+        if (server) {
+            server->unregisterKey(transport->directAddr());
+        }
         delete socksClient;
     }
 
+    Transport *transport;
     QString cid;
     QString host;
     Jid jid;
@@ -140,28 +222,60 @@ class Candidate::Private : public QObject, public QSharedData {
     Candidate::Type type = Candidate::Direct;
     Candidate::State state = Candidate::New;
 
-    quint16 localPort = 0; // where Psi actually listens. e.g. with NAT-assited candidats it may be different from just port
+    QSharedPointer<S5BServer> server;
     SocksClient *socksClient = nullptr;
 
     void connectToHost(const QString &key, State successState, std::function<void(bool)> callback, bool isUdp)
     {
-        socksClient = new SocksClient;
-        qDebug() << "connect to host with " << cid << "candidate and socks client" << socksClient;
+        QHostAddress ha(host);
+        if (!ha.isNull() && ha.protocol() == QAbstractSocket::IPv6Protocol && ha.scopeId().isEmpty() &&
+        #if QT_VERSION >= QT_VERSION_CHECK(5,11,0)
+                ha.isLinkLocal()
+        #else
+                XMPP::Ice176::isIPv6LinkLocalAddress(ha)
+        #endif
+                )
+        {
+            qDebug() << "connect to host with " << cid << "candidate using V6LinkLocalSocksConnector";
+            // we have link local address without scope. We have to enumerate all possible scopes.
+            auto v6llConnector = new V6LinkLocalSocksConnector(this);
+            connect(v6llConnector, &V6LinkLocalSocksConnector::ready, this, [this, v6llConnector, callback, successState]() {
+                socksClient = v6llConnector->takeClient();
+                socksClient->setParent(nullptr);
+                delete v6llConnector;
+                if (state == Candidate::Discarded) {
+                    return;
+                }
 
-        connect(socksClient, &SocksClient::connected, [this, callback, successState](){
-            state = successState;
-            qDebug() << "socks client"  << socksClient << "is connected";
-            callback(true);
-        });
-        connect(socksClient, &SocksClient::error, [this, callback](int error){
-            Q_UNUSED(error);
-            state = Candidate::Discarded;
-            qDebug() << "socks client"  << socksClient << "failed to connect";
-            callback(false);
-        });
-        //connect(&t, SIGNAL(timeout()), SLOT(trySendUDP()));
+                if (socksClient) {
+                    state = successState;
+                    qDebug() << "socks client"  << socksClient << "is connected";
+                    callback(true);
+                    return;
+                }
+                state = Candidate::Discarded;
+                qDebug() << "socks client"  << socksClient << "failed to connect";
+                callback(false);
+            });
+            v6llConnector->connectToHost(ha, port, key, isUdp);
+        } else {
+            socksClient = new SocksClient;
+            qDebug() << "connect to host with " << cid << "candidate and socks client" << socksClient;
+            connect(socksClient, &SocksClient::connected, [this, callback, successState](){
+                state = successState;
+                qDebug() << "socks client"  << socksClient << "is connected";
+                callback(true);
+            });
+            connect(socksClient, &SocksClient::error, [this, callback](int error){
+                Q_UNUSED(error);
+                state = Candidate::Discarded;
+                qDebug() << "socks client"  << socksClient << "failed to connect";
+                callback(false);
+            });
+            //connect(&t, SIGNAL(timeout()), SLOT(trySendUDP()));
 
-        socksClient->connectToHost(host, port, key, 0, isUdp);
+            socksClient->connectToHost(host, port, key, 0, isUdp);
+        }
     }
 
     void setupIncomingSocksClient()
@@ -178,7 +292,7 @@ Candidate::Candidate()
 
 }
 
-Candidate::Candidate(const QDomElement &el)
+Candidate::Candidate(Transport *transport, const QDomElement &el)
 {
     bool ok;
     QString host(el.attribute(QStringLiteral("host")));
@@ -225,6 +339,7 @@ Candidate::Candidate(const QDomElement &el)
     }
 
     auto d = new Private;
+    d->transport = transport;
     d->cid = cid;
     d->host = host;
     d->jid = jid;
@@ -241,9 +356,10 @@ Candidate::Candidate(const Candidate &other) :
 
 }
 
-Candidate::Candidate(const Jid &proxy, const QString &cid, quint16 localPreference) :
+Candidate::Candidate(Transport *transport, const Jid &proxy, const QString &cid, quint16 localPreference) :
     d(new Private)
 {
+    d->transport = transport;
     d->cid = cid;
     d->jid = proxy;
     d->priority = (ProxyPreference << 16) + localPreference;
@@ -251,12 +367,35 @@ Candidate::Candidate(const Jid &proxy, const QString &cid, quint16 localPreferen
     d->state = Probing; // it's probing because it's a local side proxy and host and port are unknown
 }
 
-Candidate::Candidate(const QString &host, quint16 port, const QString &cid, Type type, quint16 localPreference) :
+Candidate::Candidate(Transport *transport, const TcpPortServer::Ptr &server, const QString &cid, quint16 localPreference) :
     d(new Private)
 {
+    Type type = None;
+    switch (server->portType()) {
+    case TcpPortServer::Direct:
+        type = Candidate::Direct;
+        break;
+    case TcpPortServer::NatAssited:
+        type = Candidate::Assisted;
+        break;
+    case TcpPortServer::Tunneled:
+        type = Candidate::Tunnel;
+        break;
+    case TcpPortServer::NoType:
+    default:
+        type = None;
+    }
+
+    if (type == None) {
+        d.reset();
+        return;
+    }
+
+    d->transport = transport;
+    d->server = server.staticCast<S5BServer>();
     d->cid = cid;
-    d->host = host;
-    d->port = port;
+    d->host = server->publishHost();
+    d->port = server->publishPort();
     d->type = type;
     static const int priorities[] = {0, ProxyPreference, TunnelPreference, AssistedPreference, DirectPreference};
     if (type >= Type(0) && type <= Direct) {
@@ -264,9 +403,7 @@ Candidate::Candidate(const QString &host, quint16 port, const QString &cid, Type
     } else {
         d->priority = 0;
     }
-    if (type == Direct) {
-        d->localPort = port;
-    }
+
     d->state = New;
 }
 
@@ -311,12 +448,12 @@ void Candidate::setPort(quint16 port)
 
 quint16 Candidate::localPort() const
 {
-    return d->localPort;
+    return d->server ? d->server->serverPort() : 0;
 }
 
-void Candidate::setLocalPort(quint16 port)
+QHostAddress Candidate::localAddress() const
 {
-    d->localPort = port;
+    return d->server ? d->server->serverAddress() : QHostAddress();
 }
 
 Candidate::State Candidate::state() const
@@ -330,6 +467,20 @@ void Candidate::setState(Candidate::State s)
     d->state = s;
 }
 
+const char *Candidate::stateText(Candidate::State s)
+{
+    switch (s) {
+    case New: return "New";
+    case Probing: return "Probing";
+    case Pending: return "Pending";
+    case Unacked: return "Unacked";
+    case Accepted: return "Accepted";
+    case Active: return "Active";
+    case Discarded: return "Discarded";
+    }
+    return nullptr;
+}
+
 quint32 Candidate::priority() const
 {
     return d->priority;
@@ -390,6 +541,11 @@ void Candidate::deleteSocksClient()
     d->socksClient = nullptr;
 }
 
+TcpPortServer::Ptr Candidate::server() const
+{
+    return d->server.staticCast<TcpPortServer>();
+}
+
 bool Candidate::operator==(const Candidate &other) const
 {
     return d.data() == other.d.data();
@@ -409,7 +565,7 @@ class Transport::Private
     Transport *q = nullptr;
     Pad::Ptr pad;
     bool meCreator = true; // content created on local side
-    bool connectionStarted = false; // where start() was called
+    bool transportStarted = false; // where start() was called
     bool waitingAck = true;
     bool aborted = false;
     bool remoteReportedCandidateError = false;
@@ -429,6 +585,7 @@ class Transport::Private
     QTimer probingTimer;
     QElapsedTimer lastConnectionStart;
     size_t blockSize = 8192;
+    TcpPortDiscoverer *disco = nullptr;
 
     QSharedPointer<Connection> connection;
 
@@ -462,15 +619,106 @@ class Transport::Private
         return false;
     }
 
+    void discoS5BProxy()
+    {
+        auto m = static_cast<Manager*>(pad->manager());
+        Jid proxy = m->userProxy();
+        if (proxy.isValid()) {
+            Candidate c(q, proxy, generateCid());
+            if (!isDup(c)) {
+                localCandidates.insert(c.cid(), c);
+            }
+        }
+
+        proxyDiscoveryInProgress = true;
+        QList<QSet<QString>> featureOptions = {{"http://jabber.org/protocol/bytestreams"}};
+        pad->session()->manager()->client()->serverInfoManager()->
+                queryServiceInfo(QStringLiteral("proxy"),
+                                 QStringLiteral("bytestreams"),
+                                 featureOptions,
+                                 QRegExp("proxy.*|socks.*|stream.*|s5b.*"),
+                                 ServerInfoManager::SQ_CheckAllOnNoMatch,
+                                 [this](const QList<DiscoItem> &items)
+        {
+            if (!proxyDiscoveryInProgress) { // check if new results are ever/still expected
+                // seems like we have successful connection via higher priority channel. so nobody cares about proxy
+                return;
+            }
+            auto m = static_cast<Manager*>(pad->manager());
+            Jid userProxy = m->userProxy();
+
+            // queries proxy's host/port and sends the candidate to remote
+            auto queryProxy = [this](const Jid &j, const QString &cid) {
+                proxiesInDiscoCount++;
+                auto query = new JT_S5B(pad->session()->manager()->client()->rootTask());
+                connect(query, &JT_S5B::finished, q, [this,query,cid](){
+                    if (!proxyDiscoveryInProgress) {
+                        return;
+                    }
+                    bool candidateUpdated = false;
+                    auto c = localCandidates.value(cid);
+                    if (c && c.state() == Candidate::Probing) {
+                        auto sh = query->proxyInfo();
+                        if (query->success() && !sh.host().isEmpty() && sh.port()) {
+                            // it can be discarded by this moment (e.g. got success on a higher priority candidate).
+                            // so we have to check.
+                            c.setHost(sh.host());
+                            c.setPort(sh.port());
+                            c.setState(Candidate::New);
+                            candidateUpdated = true;
+                            pendingActions |= Private::NewCandidate;
+                        } else {
+                            c.setState(Candidate::Discarded);
+                        }
+                    }
+                    proxiesInDiscoCount--;
+                    if (!proxiesInDiscoCount) {
+                        proxyDiscoveryInProgress = false;
+                    }
+                    if (candidateUpdated) {
+                        emit q->updated();
+                    } else if (!proxiesInDiscoCount) {
+                        // it's possible it was our last hope and probaby we have to send candidate-error now.
+                        checkAndFinishNegotiation();
+                    }
+                });
+                query->requestProxyInfo(j);
+                query->go(true);
+            };
+
+            bool userProxyFound = !userProxy.isValid();
+            for (const auto i: items) {
+                int localPref = 0;
+                if (!userProxyFound && i.jid() == userProxy) {
+                    localPref = 1;
+                    userProxyFound = true;
+                }
+                Candidate c(q, i.jid(), generateCid(), localPref);
+                localCandidates.insert(c.cid(), c);
+
+                queryProxy(i.jid(), c.cid());
+            }
+            if (!userProxyFound) {
+                Candidate c(q, userProxy, generateCid(), 1);
+                localCandidates.insert(c.cid(), c);
+                queryProxy(userProxy, c.cid());
+            } else if (items.count() == 0) {
+                // seems like we don't have any proxy
+                proxyDiscoveryInProgress = false;
+                checkAndFinishNegotiation();
+            }
+        });
+    }
+
     void tryConnectToRemoteCandidate()
     {
-        if (!connectionStarted) {
+        if (!transportStarted) {
             return; // will come back later
         }
         quint64 maxProbingPrio = 0;
         quint64 maxNewPrio = 0;
         Candidate maxProbing;
-        QList<Candidate> maxNew;
+        QList<Candidate> maxNew; // keeps highest (same) priority New candidates
 
         /*
          We have to find highest-priority already connecting candidate and highest-priority new candidate.
@@ -482,6 +730,7 @@ class Transport::Private
          In all the other cases just return and wait for events.
         */
 
+        qDebug("tryConnectToRemoteCandidate()");
         for (auto &c: remoteCandidates) {
             if (c.state() == Candidate::New) {
                 if (c.priority() > maxNewPrio) {
@@ -498,21 +747,26 @@ class Transport::Private
             }
         }
         if (maxNew.isEmpty()) {
+            qDebug("  tryConnectToRemoteCandidate() no maxNew candidates");
             return; // nowhere to connect
         }
 
+        // check if we have to hang on for a little if a higher priority candidate is Probing
         if (maxProbing) {
             if (maxNewPrio < maxProbing.priority()) {
                 if (probingTimer.isActive()) {
+                    qDebug("  tryConnectToRemoteCandidate() timer is already active. let's wait");
                     return; // we will come back here soon
                 }
                 qint64 msToFuture = 200 - lastConnectionStart.elapsed();
                 if (msToFuture > 0) { // seems like we have to rescheduler for future
                     probingTimer.start(int(msToFuture));
+                    qDebug("  tryConnectToRemoteCandidate() too early. timer started. let's wait");
                     return;
                 }
             }
         }
+        probingTimer.start(200); // for the next candidate if any
 
         // now we have to connect to maxNew candidates
         for (auto &mnc: maxNew) {
@@ -536,10 +790,7 @@ class Transport::Private
                     if (!hasUnckeckedNew) {
                         pendingActions &= ~Private::NewCandidate; // just if we had it for example after proxy discovery
                     }
-                    if (proxyDiscoveryInProgress && (mnc.priority() >> 16) > Candidate::ProxyPreference) {
-                        proxyDiscoveryInProgress = false; // doesn't make sense anymore
-                    }
-                    // TODO do the same for upnp
+                    setLocalProbingMinimalPreference(mnc.priority() >> 16);
                     updateMinimalPriority();
                 }
                 checkAndFinishNegotiation();
@@ -547,13 +798,40 @@ class Transport::Private
         }
     }
 
+    /**
+     * @brief limitTcpDiscoByMinimalPreference take upper part of candidate preference (type preference)
+     *        and drops lower priority pending local servers disco
+     * @param preference
+     */
+    void setLocalProbingMinimalPreference(quint32 preference)
+    {
+        if (proxyDiscoveryInProgress && preference > Candidate::ProxyPreference) {
+            proxyDiscoveryInProgress = false; // doesn't make sense anymore
+        }
+
+        // and now local ports discoverer..
+        if (!disco) {
+            return;
+        }
+        TcpPortServer::PortTypes types = TcpPortServer::Direct;
+        if (preference >= Candidate::AssistedPreference) {
+            types |= TcpPortServer::NatAssited;
+        }
+        if (preference >= Candidate::TunnelPreference) {
+            types |= TcpPortServer::Tunneled;
+        }
+        if (!disco->setTypeMask(types)) {
+            delete disco;
+            disco = nullptr;
+        }
+    }
+
     bool hasUnaknowledgedLocalCandidates() const
     {
         // now ensure all local were sent to remote and no hope left
-        if (proxyDiscoveryInProgress) {
+        if (proxyDiscoveryInProgress || (disco && !disco->isDepleted())) {
             return true;
         }
-        // Note: When upnp support is added we have one more check here
 
         // now local candidates
         for (const auto &c: localCandidates) {
@@ -566,7 +844,7 @@ class Transport::Private
         return false;
     }
 
-    Candidate preferredCandidate() const
+    Candidate preferredUsedCandidate() const
     {
         if (localUsedCandidate) {
             if (remoteUsedCandidate) {
@@ -593,7 +871,8 @@ class Transport::Private
         // So for candidate-error two conditions have to be met 1) all remote failed 2) all local were sent no more
         // local candidates are expected to be discovered
 
-        if (!connectionStarted || connection) { // if not started or already finished
+        if (!transportStarted || connection) { // if not started or already finished
+            qDebug("checkAndFinishNegotiation not finished: !connectionStarted || connection");
             return;
         }
 
@@ -605,6 +884,7 @@ class Transport::Private
             // but as soon as it's taken it will switch to waitingAck.
             // And with unacknowledged local candidates we can't send used/error as well as report connected()/failure()
             // until tried them all
+            qDebug("checkAndFinishNegotiation not finished: waitingAck || pendingActions || hasUnaknowledgedLocalCandidates()");
             return;
         }
 
@@ -614,7 +894,7 @@ class Transport::Private
             if (remoteReportedCandidateError || localUsedCandidate) {
                 // so remote seems to be finished too.
                 // tell application about it and it has to change its state immediatelly
-                auto c = preferredCandidate();
+                auto c = preferredUsedCandidate();
                 if (c) {
                     if (c.state() != Candidate::Active) {
                         if (c.type() == Candidate::Proxy && c == localUsedCandidate) { // local proxy
@@ -638,13 +918,16 @@ class Transport::Private
                     if (c.state() == Candidate::Active) {
                         handleConnected(c);
                     }
+                    else qDebug("checkAndFinishNegotiation not finished: preferred is not Active");
                 } else { // both sides reported candidate error
                     emit q->failed();
                 }
             } // else we have to wait till remote reports its status
+            else qDebug("checkAndFinishNegotiation not finished: remote didn't reported yet");
             return;
         }
 
+        qDebug("checkAndFinishNegotiation not finished: trying to send condidate-used/error if any");
         // if we are here then neither candidate-used nor candidate-error was sent to remote,
         // but we can send it now.
         // first let's check if we can send candidate-used
@@ -652,6 +935,7 @@ class Transport::Private
         bool hasConnectedRemoteCandidate = false;
         for (const auto &c: remoteCandidates) {
             auto s = c.state();
+            qDebug() << "  candidate " << c.cid() << " is " << Candidate::stateText(s);
             if (s != Candidate::Discarded) {
                 allRemoteDiscarded = false;
             }
@@ -663,16 +947,19 @@ class Transport::Private
         // if we have connection to remote candidate it's time to send it
         if (hasConnectedRemoteCandidate) {
             pendingActions |= Private::CandidateUsed;
+            qDebug("checkAndFinishNegotiation: used");
             emit q->updated();
             return;
         }
 
         if (allRemoteDiscarded) {
             pendingActions |= Private::CandidateError;
+            qDebug("checkAndFinishNegotiation: error");
             emit q->updated();
             return;
         }
 
+        qDebug("checkAndFinishNegotiation not finished: there are more remote candidates to try");
         // apparently we haven't connected anywhere but there are more remote candidates to try
     }
 
@@ -697,10 +984,7 @@ class Transport::Private
             }
         }
         prio >>= 16;
-        if (proxyDiscoveryInProgress && prio > Candidate::ProxyPreference) {
-            // all proxies do no make sense anymore. we have successful higher priority candidate
-            proxyDiscoveryInProgress = false;
-        }
+        setLocalProbingMinimalPreference(prio);
         // if we discarded "used" candidates then reset them to invalid
         if (localUsedCandidate && localUsedCandidate.state() == Candidate::Discarded) {
             localUsedCandidate = Candidate();
@@ -730,7 +1014,34 @@ class Transport::Private
             }
         }
         if (!haveNewCandidates) {
-            pendingActions &= ~Private::NewCandidate;
+            pendingActions &= ~NewCandidate;
+        }
+    }
+
+    void onLocalServerDiscovered()
+    {
+        for (auto serv: disco->takeServers()) {
+            auto s5bserv = serv.staticCast<S5BServer>();
+            s5bserv->registerKey(directAddr);
+            Candidate c(q, serv, generateCid());
+            if (c.isValid() && !isDup(c) && c.priority()) {
+                QObject::connect(s5bserv.data(), &S5BServer::incomingConnection, q, [this, c](SocksClient *sc, const QString &key) mutable {
+                    if (!connection && key == directAddr && (c.state() == Candidate::Pending || c.state() == Candidate::Unacked)) {
+                        c.incomingConnection(sc);
+                        c.server().data()->disconnect(q); // drop this connection.
+                        if(mode == Transport::Udp)
+                            sc->grantUDPAssociate("", 0);
+                        else
+                            sc->grantConnect();
+                        return;
+                    }
+
+                    sc->requestDeny();
+                    sc->deleteLater();
+                });
+                localCandidates.insert(c.cid(), c);
+                pendingActions |= NewCandidate;
+            }
         }
     }
 
@@ -798,116 +1109,22 @@ void Transport::prepare()
     d->directAddr = makeKey(d->sid, d->pad->session()->initiator(), d->pad->session()->responder());
     m->addKeyMapping(d->directAddr, this);
 
+    auto scope = d->pad->discoScope();
+    d->disco = scope->disco(); // FIXME store and handle signale. delete when not needed
 
-    auto serv = m->socksServ();
-    if (serv) {
-        for(auto const &h: serv->hostList()) {
-            if (!serv->port() || h.isEmpty()) {
-                continue;
-            }
-            Candidate c(h, serv->port(), d->generateCid(), Candidate::Direct);
-            if (!d->isDup(c)) {
-                d->localCandidates.insert(c.cid(), c);
-                d->pendingActions |= Private::NewCandidate;
-            }
-        }
-    }
-
-    Jid proxy = m->userProxy();
-    if (proxy.isValid()) {
-        Candidate c(proxy, d->generateCid());
-        if (!d->isDup(c)) {
-            d->localCandidates.insert(c.cid(), c);
-        }
-    }
-
-    d->proxyDiscoveryInProgress = true;
-    QList<QSet<QString>> featureOptions = {{"http://jabber.org/protocol/bytestreams"}};
-    d->pad->session()->manager()->client()->serverInfoManager()->
-            queryServiceInfo(QStringLiteral("proxy"),
-                             QStringLiteral("bytestreams"),
-                             featureOptions,
-                             QRegExp("proxy.*|socks.*|stream.*|s5b.*"),
-                             ServerInfoManager::SQ_CheckAllOnNoMatch,
-                             [this](const QList<DiscoItem> &items)
-    {
-        if (!d->proxyDiscoveryInProgress) { // check if new results are ever/still expected
-            // seems like we have successful connection via higher priority channel. so nobody cares about proxy
-            return;
-        }
-        auto m = static_cast<Manager*>(d->pad->manager());
-        Jid userProxy = m->userProxy();
-
-        // queries proxy's host/port and sends the candidate to remote
-        auto queryProxy = [this](const Jid &j, const QString &cid) {
-            d->proxiesInDiscoCount++;
-            auto query = new JT_S5B(d->pad->session()->manager()->client()->rootTask());
-            connect(query, &JT_S5B::finished, this, [this,query,cid](){
-                if (!d->proxyDiscoveryInProgress) {
-                    return;
-                }
-                bool candidateUpdated = false;
-                auto c = d->localCandidates.value(cid);
-                if (c && c.state() == Candidate::Probing) {
-                    auto sh = query->proxyInfo();
-                    if (query->success() && !sh.host().isEmpty() && sh.port()) {
-                        // it can be discarded by this moment (e.g. got success on a higher priority candidate).
-                        // so we have to check.
-                        c.setHost(sh.host());
-                        c.setPort(sh.port());
-                        c.setState(Candidate::New);
-                        candidateUpdated = true;
-                        d->pendingActions |= Private::NewCandidate;
-                    } else {
-                        c.setState(Candidate::Discarded);
-                    }
-                }
-                d->proxiesInDiscoCount--;
-                if (!d->proxiesInDiscoCount) {
-                    d->proxyDiscoveryInProgress = false;
-                }
-                if (candidateUpdated) {
-                    emit updated();
-                } else if (!d->proxiesInDiscoCount) {
-                    // it's possible it was our last hope and probaby we have to send candidate-error now.
-                    d->checkAndFinishNegotiation();
-                }
-            });
-            query->requestProxyInfo(j);
-            query->go(true);
-        };
-
-        bool userProxyFound = !userProxy.isValid();
-        for (const auto i: items) {
-            int localPref = 0;
-            if (!userProxyFound && i.jid() == userProxy) {
-                localPref = 1;
-                userProxyFound = true;
-            }
-            Candidate c(i.jid(), d->generateCid(), localPref);
-            d->localCandidates.insert(c.cid(), c);
-
-            queryProxy(i.jid(), c.cid());
-        }
-        if (!userProxyFound) {
-            Candidate c(userProxy, d->generateCid(), 1);
-            d->localCandidates.insert(c.cid(), c);
-            queryProxy(userProxy, c.cid());
-        } else if (items.count() == 0) {
-            // seems like we don't have any proxy
-            d->proxyDiscoveryInProgress = false;
-            d->checkAndFinishNegotiation();
-        }
+    connect(d->disco, &TcpPortDiscoverer::portAvailable, this, [this](){
+        d->onLocalServerDiscovered();
     });
+    d->onLocalServerDiscovered();
+    d->discoS5BProxy();
 
-    // TODO nat-assisted candidates..
     emit updated();
 }
 
 // we got content acceptance from any side and not can connect
 void Transport::start()
 {
-    d->connectionStarted = true;
+    d->transportStarted = true;
     d->tryConnectToRemoteCandidate();
     // if there is no higher priority candidates than ours but they are already connected then
     d->checkAndFinishNegotiation();
@@ -928,7 +1145,7 @@ bool Transport::update(const QDomElement &transportEl)
     int candidatesAdded = 0;
     for(QDomElement ce = transportEl.firstChildElement(candidateTag);
         !ce.isNull(); ce = ce.nextSiblingElement(candidateTag)) {
-        Candidate c(ce);
+        Candidate c(this, ce);
         if (!c) {
             return false;
         }
@@ -971,6 +1188,7 @@ bool Transport::update(const QDomElement &transportEl)
                 c.setState(Candidate::Discarded);
             }
         }
+        qDebug("recv candidate-error: all local pending candidates were discarded");
         QTimer::singleShot(0, this, [this](){ d->checkAndFinishNegotiation(); });
         return true;
     }
@@ -1013,7 +1231,7 @@ bool Transport::update(const QDomElement &transportEl)
             c.setState(Candidate::Discarded);
         }
         d->proxyDiscoveryInProgress = false;
-        // TODO do the same for upnp when implemented
+        delete d->disco;
 
         QTimer::singleShot(0, this, [this](){ emit failed(); });
         return true;
@@ -1168,6 +1386,11 @@ QString Transport::sid() const
     return d->sid;
 }
 
+QString Transport::directAddr() const
+{
+    return d->directAddr;
+}
+
 Connection::Ptr Transport::connection() const
 {
     return d->connection.staticCast<XMPP::Jingle::Connection>();
@@ -1244,7 +1467,6 @@ class Manager::Private
 {
 public:
     XMPP::Jingle::Manager *jingleManager = nullptr;
-    S5BServer *serv = nullptr;
 
     // FIMME it's reuiqred to split transports by direction otherwise we gonna hit conflicts.
     // jid,transport-sid -> transport mapping
@@ -1273,9 +1495,6 @@ Manager::Manager(QObject *parent) :
 Manager::~Manager()
 {
     d->jingleManager->unregisterTransport(NS);
-    if (d->serv) {
-        d->serv->unlink(this);
-    }
 }
 
 Transport::Features Manager::features() const
@@ -1313,21 +1532,6 @@ void Manager::closeAll()
     emit abortAllRequested();
 }
 
-void Manager::setServer(S5BServer *serv)
-{
-    if(d->serv) {
-        d->serv->unlink(this);
-        d->serv = nullptr;
-    }
-
-    if(serv) {
-        d->serv = serv;
-        d->serv->link(this);
-    } else {
-        d->serv = nullptr;
-    }
-}
-
 void Manager::addKeyMapping(const QString &key, Transport *transport)
 {
     d->key2transport.insert(key, transport);
@@ -1358,12 +1562,22 @@ bool Manager::incomingUDP(bool init, const QHostAddress &addr, int port, const Q
 
 QString Manager::generateSid(const Jid &remote)
 {
+    auto servers = d->jingleManager->client()->tcpPortReserver()->
+            scope(QString::fromLatin1("s5b"))->allServers();
     QString sid;
     QPair<Jid,QString> key;
+    QString key1;
+    QString key2;
+    auto servChecker = [&](const TcpPortServer::Ptr &s){
+        return s.staticCast<S5BServer>()->hasKey(key1) || s.staticCast<S5BServer>()->hasKey(key2);
+    };
+
     do {
         sid = QString("s5b_%1").arg(qrand() & 0xffff, 4, 16, QChar('0'));
         key = qMakePair(remote, sid);
-    } while (d->sids.contains(key));
+        key1 = makeKey(sid, remote, d->jingleManager->client()->jid());
+        key2 = makeKey(sid, d->jingleManager->client()->jid(), remote);
+    } while (d->sids.contains(key) || std::find_if(servers.begin(), servers.end(), servChecker) != servers.end());
     return sid;
 }
 
@@ -1372,11 +1586,6 @@ void Manager::registerSid(const Jid &remote, const QString &sid)
     d->sids.insert(qMakePair(remote, sid));
 }
 
-S5BServer *Manager::socksServ() const
-{
-    return d->serv;
-}
-
 Jid Manager::userProxy() const
 {
     return d->proxy;
@@ -1389,7 +1598,8 @@ Pad::Pad(Manager *manager, Session *session) :
     _manager(manager),
     _session(session)
 {
-
+    auto reserver = _session->manager()->client()->tcpPortReserver();
+    _discoScope = reserver->scope(QString::fromLatin1("s5b"));
 }
 
 QString Pad::ns() const
diff --git a/src/xmpp/xmpp-im/jingle-s5b.h b/src/xmpp/xmpp-im/jingle-s5b.h
index 88d754be..de08a26e 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.h
+++ b/src/xmpp/xmpp-im/jingle-s5b.h
@@ -30,6 +30,7 @@
 #define JINGLE_S5B_H
 
 #include "jingle.h"
+#include "tcpportreserver.h"
 
 class QHostAddress;
 class SocksClient;
@@ -37,7 +38,6 @@ class SocksClient;
 namespace XMPP {
 
 class Client;
-class S5BServer;
 
 namespace Jingle {
 namespace S5B {
@@ -92,11 +92,12 @@ class Candidate {
     };
 
     Candidate();
-    Candidate(const QDomElement &el);
+    Candidate(Transport *transport, const QDomElement &el);
     Candidate(const Candidate &other);
-    Candidate(const Jid &proxy, const QString &cid, quint16 localPreference = 0);
-    Candidate(const QString &host, quint16 port, const QString &cid, Type type, quint16 localPreference = 0);
+    Candidate(Transport *transport, const Jid &proxy, const QString &cid, quint16 localPreference = 0);
+    Candidate(Transport *transport, const TcpPortServer::Ptr &server, const QString &cid, quint16 localPreference = 0);
     ~Candidate();
+    Candidate& operator=(const Candidate& other) = default;
     inline bool isValid() const { return d != nullptr; }
     inline operator bool() const { return isValid(); }
     Type type() const;
@@ -107,9 +108,10 @@ class Candidate {
     quint16 port() const;
     void setPort(quint16 port);
     quint16 localPort() const;
-    void setLocalPort(quint16 port);
+    QHostAddress localAddress() const;
     State state() const;
     void setState(State s);
+    static const char *stateText(State s);
     quint32 priority() const;
 
     QDomElement toXml(QDomDocument *doc) const;
@@ -118,6 +120,7 @@ class Candidate {
     bool incomingConnection(SocksClient *sc);
     SocksClient* takeSocksClient();
     void deleteSocksClient();
+    TcpPortServer::Ptr server() const;
 
     bool operator==(const Candidate &other) const;
     inline bool operator!=(const Candidate &other) const { return !(*this == other); }
@@ -152,10 +155,11 @@ class Transport : public XMPP::Jingle::Transport
     Features features() const override;
 
     QString sid() const;
+    QString directAddr() const;
     Connection::Ptr connection() const;
     size_t blockSize() const;
 private:
-    friend class S5BServer;
+    friend class S5BServersManager;
     bool incomingConnection(SocksClient *sc);
     bool incomingUDP(bool init, const QHostAddress &addr, int port, const QString &key, const QByteArray &data);
 
@@ -181,9 +185,12 @@ class Pad : public TransportManagerPad
 
     QString generateSid() const;
     void registerSid(const QString &sid);
+
+    inline TcpPortScope *discoScope() const { return _discoScope; }
 private:
     Manager *_manager;
     Session *_session;
+    TcpPortScope *_discoScope;
 };
 
 class Manager : public TransportManager {
@@ -200,15 +207,12 @@ class Manager : public TransportManager {
 
     void closeAll() override;
 
-    void setServer(S5BServer *serv);
     bool incomingConnection(SocksClient *client, const QString &key); // returns false if key is unknown
     bool incomingUDP(bool init, const QHostAddress &addr, int port, const QString &key, const QByteArray &data);
 
     QString generateSid(const Jid &remote);
     void registerSid(const Jid &remote, const QString &sid);
 
-    S5BServer* socksServ() const;
-
     /**
      * @brief userProxy returns custom (set by user) SOCKS proxy JID
      * @return
diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index ae0908a1..e5ba24f1 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -489,8 +489,13 @@ class JTPush : public Task
         } else {
             auto session = client()->jingleManager()->session(from, jingle.sid());
             if (!session) {
-                auto el = client()->doc()->createElementNS(QString::fromLatin1("urn:xmpp:jingle:errors:1"), QStringLiteral("unknown-session"));
-                respondError(iq, Stanza::Error::Cancel, Stanza::Error::ItemNotFound, QString(), el);
+                if (jingle.action() == Action::SessionTerminate) {
+                    auto resp = createIQ(client()->doc(), "result", fromStr, iq.attribute(QStringLiteral("id")));
+                    client()->send(resp);
+                } else {
+                    auto el = client()->doc()->createElementNS(QString::fromLatin1("urn:xmpp:jingle:errors:1"), QStringLiteral("unknown-session"));
+                    respondError(iq, Stanza::Error::Cancel, Stanza::Error::ItemNotFound, QString(), el);
+                }
                 return true;
             }
             if (!session->updateFromXml(jingle.action(), jingleEl)) {
@@ -1093,6 +1098,38 @@ class Session::Private
         return true;
     }
 
+    bool handleIncomingContentRemove(const QDomElement &jingleEl)
+    {
+        QSet<Application*> toRemove;
+        QString contentTag(QStringLiteral("content"));
+        for(QDomElement ce = jingleEl.firstChildElement(contentTag);
+            !ce.isNull(); ce = ce.nextSiblingElement(contentTag))
+        {
+            ContentBase cb(ce);
+            if (!cb.isValid()) {
+                lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
+                return false;
+            }
+            Application *app = contentList.value(ContentKey{cb.name, cb.creator});
+            if (app) {
+                toRemove.insert(app);
+            }
+        }
+
+        for (auto app: toRemove) {
+            contentList.remove(ContentKey{app->contentName(), app->creator()});
+            delete app;
+        }
+
+        if (contentList.isEmpty()) {
+            auto reasonEl = jingleEl.firstChildElement(QString::fromLatin1("reason"));
+            terminateReason = reasonEl.isNull()? Reason(Reason::Success) : Reason(reasonEl);
+        }
+
+        planStep();
+        return true;
+    }
+
     bool handleIncomingSessionTerminate(const QDomElement &jingleEl)
     {
         terminateReason = Reason(jingleEl.firstChildElement(QString::fromLatin1("reason")));
@@ -1420,7 +1457,7 @@ bool Session::updateFromXml(Action action, const QDomElement &jingleEl)
     case Action::ContentReject:
         break;
     case Action::ContentRemove:
-        break;
+        return d->handleIncomingContentRemove(jingleEl);
     case Action::DescriptionInfo:
         break;
     case Action::SecurityInfo:
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index 3d3622b4..b9458f08 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -164,6 +164,7 @@ class Reason {
     Reason(Condition cond, const QString &text = QString());
     Reason(const QDomElement &el);
     Reason(const Reason &other);
+    Reason& operator=(const Reason &)=default;
     inline bool isValid() const { return d != nullptr; }
     Condition condition() const;
     void setCondition(Condition cond);
diff --git a/src/xmpp/xmpp-im/s5b.cpp b/src/xmpp/xmpp-im/s5b.cpp
index 884445cd..0f6fb71b 100644
--- a/src/xmpp/xmpp-im/s5b.cpp
+++ b/src/xmpp/xmpp-im/s5b.cpp
@@ -29,6 +29,7 @@
 #include "im.h"
 #include "jingle-s5b.h"
 #include "socks.h"
+#include "tcpportreserver.h"
 
 #ifdef Q_OS_WIN
 # include <windows.h>
@@ -62,6 +63,7 @@ static bool haveHost(const StreamHostList &list, const Jid &j)
     return false;
 }
 
+
 class S5BManager::Item : public QObject
 {
     Q_OBJECT
@@ -78,12 +80,14 @@ class S5BManager::Item : public QObject
     StreamHostList in_hosts;
     JT_S5B *task = nullptr;
     JT_S5B *proxy_task = nullptr;
+    QSharedPointer<S5BServer> relatedServer;
     SocksClient *client = nullptr;
     SocksClient *client_out = nullptr;
     SocksUDP *client_udp = nullptr;
     SocksUDP *client_out_udp = nullptr;
     S5BConnector *conn = nullptr;
     S5BConnector *proxy_conn = nullptr;
+    //S5BServersManager::S5BLocalServers *localServ = nullptr;
     bool wantFast = false;
     StreamHost proxy;
     int targetMode = 0; // requester sets this once it figures it out
@@ -560,7 +564,6 @@ class S5BManager::Entry
     QString sid;
     JT_S5B *query = nullptr;
     StreamHost proxyInfo;
-    QPointer<S5BServer> relatedServer;
 
     bool udp_init = false;
     QHostAddress udp_addr;
@@ -571,7 +574,6 @@ class S5BManager::Private
 {
 public:
     Client *client;
-    S5BServer *serv;
     QList<Entry*> activeList;
     S5BConnectionList incomingConns;
     JT_PushS5B *ps;
@@ -586,7 +588,6 @@ S5BManager::S5BManager(Client *parent)
 
     d = new Private;
     d->client = parent;
-    d->serv = 0;
 
     d->ps = new JT_PushS5B(d->client->rootTask());
     connect(d->ps, SIGNAL(incoming(S5BRequest)), SLOT(ps_incoming(S5BRequest)));
@@ -596,7 +597,6 @@ S5BManager::S5BManager(Client *parent)
 
 S5BManager::~S5BManager()
 {
-    setServer(0);
     while (!d->incomingConns.isEmpty()) {
         delete d->incomingConns.takeFirst();
     }
@@ -614,24 +614,6 @@ Client *S5BManager::client() const
     return d->client;
 }
 
-S5BServer *S5BManager::server() const
-{
-    return d->serv;
-}
-
-void S5BManager::setServer(S5BServer *serv)
-{
-    if(d->serv) {
-        d->serv->unlink(this);
-        d->serv = 0;
-    }
-
-    if(serv) {
-        d->serv = serv;
-        d->serv->link(this);
-    }
-}
-
 JT_PushS5B* S5BManager::jtPush() const
 {
     return d->ps;
@@ -747,15 +729,15 @@ bool S5BManager::isAcceptableSID(const Jid &peer, const QString &sid) const
     QString key = makeKey(sid, d->client->jid(), peer);
     QString key_out = makeKey(sid, peer, d->client->jid()); //not valid in muc via proxy
 
-    // if we have a server, then check through it
-    if(d->serv) {
-        if(findServerEntryByHash(key) || findServerEntryByHash(key_out))
-            return false;
-    }
-    else {
-        if(findEntryByHash(key) || findEntryByHash(key_out))
-            return false;
+    foreach(Entry *e, d->activeList) {
+        if(e->i) {
+            if (e->i->key == key || e->i->key == key_out)
+                return false;
+            else if (e->i->relatedServer && (e->i->relatedServer->hasKey(key) || e->i->relatedServer->hasKey(key_out)))
+                return false;
+        }
     }
+
     return true;
 }
 
@@ -809,17 +791,6 @@ S5BManager::Entry *S5BManager::findEntryBySID(const Jid &peer, const QString &si
     return 0;
 }
 
-S5BManager::Entry *S5BManager::findServerEntryByHash(const QString &key) const
-{
-    const QList<S5BManager*> &manList = d->serv->managerList();
-    foreach(S5BManager *m, manList) {
-        Entry *e = m->findEntryByHash(key);
-        if(e)
-            return e;
-    }
-    return 0;
-}
-
 bool S5BManager::srv_ownsHash(const QString &key) const
 {
     if(findEntryByHash(key))
@@ -832,14 +803,12 @@ void S5BManager::srv_incomingReady(SocksClient *sc, const QString &key)
     Entry *e = findEntryByHash(key);
     if(!e->i->allowIncoming) {
         sc->requestDeny();
-        sc->deleteLater();
         return;
     }
     if(e->c->d->mode == S5BConnection::Datagram)
         sc->grantUDPAssociate("", 0);
     else
         sc->grantConnect();
-    e->relatedServer = static_cast<S5BServer *>(sender());
     e->i->setIncomingClient(sc);
 }
 
@@ -874,11 +843,6 @@ void S5BManager::srv_incomingUDP(bool init, const QHostAddress &addr, int port,
     e->c->man_udpReady(data);
 }
 
-void S5BManager::srv_unlink()
-{
-    d->serv = 0;
-}
-
 void S5BManager::con_connect(S5BConnection *c)
 {
     if(findEntry(c))
@@ -939,8 +903,8 @@ void S5BManager::con_sendUDP(S5BConnection *c, const QByteArray &buf)
     if(!e->udp_init)
         return;
 
-    if(e->relatedServer)
-        e->relatedServer->writeUDP(e->udp_addr, e->udp_port, buf);
+    if(e->i->relatedServer)
+        e->i->relatedServer->writeUDP(e->udp_addr, e->udp_port, buf);
 }
 
 void S5BManager::item_accepted()
@@ -1109,6 +1073,11 @@ S5BManager::Item::~Item()
 
 void S5BManager::Item::resetConnection()
 {
+    if (relatedServer) {
+        relatedServer->unregisterKey(key);
+        relatedServer.reset();
+    }
+
     delete task;
     task = nullptr;
 
@@ -1210,17 +1179,29 @@ void S5BManager::Item::handleFast(const StreamHostList &hosts, const QString &iq
 void S5BManager::Item::doOutgoing()
 {
     StreamHostList hosts;
-    S5BServer *serv = m->server();
-    if(serv && serv->isActive() && !haveHost(in_hosts, self)) {
-        QStringList hostList = serv->hostList();
-        foreach (const QString & it, hostList) {
+    auto disco = m->client()->tcpPortReserver()->scope(QString::fromLatin1("s5b"))->disco();
+    if(!haveHost(in_hosts, self)) {
+        foreach (auto &c, disco->takeServers()) {
+            relatedServer = c.staticCast<S5BServer>();
+            relatedServer->registerKey(key);
+            connect(relatedServer.data(), &S5BServer::incomingConnection, this, [this](SocksClient *c, const QString &key) {
+                if (key == this->key) {
+                    m->srv_incomingReady(c, key);
+                }
+            });
+            connect(relatedServer.data(), &S5BServer::incomingUdp, this, [this](bool isInit, const QHostAddress &addr, int sourcePort, const QString &key, const QByteArray &data) {
+                if (key == this->key) {
+                    m->srv_incomingUDP(isInit, addr, sourcePort, key, data);
+                }
+            });
             StreamHost h;
             h.setJid(self);
-            h.setHost(it);
-            h.setPort(serv->port());
+            h.setHost(c->publishHost());
+            h.setPort(c->publishPort());
             hosts += h;
         }
     }
+    delete disco; // FIXME we could start listening for signals instead. it may send us upnp candidate
 
     // if the proxy is valid, then it's ok to add (the manager already ensured that it doesn't conflict)
     if(proxy.jid().isValid())
@@ -1967,244 +1948,6 @@ void S5BConnector::man_udpSuccess(const Jid &streamHost)
     }
 }
 
-//----------------------------------------------------------------------------
-// S5BServer
-//----------------------------------------------------------------------------
-class S5BServer::Item : public QObject
-{
-    Q_OBJECT
-public:
-    SocksClient *client;
-    QString host;
-    QTimer expire;
-
-    Item(SocksClient *c) : QObject(0)
-    {
-        client = c;
-        connect(client, SIGNAL(incomingMethods(int)), SLOT(sc_incomingMethods(int)));
-        connect(client, SIGNAL(incomingConnectRequest(QString,int)), SLOT(sc_incomingConnectRequest(QString,int)));
-        connect(client, SIGNAL(error(int)), SLOT(sc_error(int)));
-
-        connect(&expire, SIGNAL(timeout()), SLOT(doError()));
-        resetExpiration();
-    }
-
-    ~Item()
-    {
-        delete client;
-    }
-
-    void resetExpiration()
-    {
-        expire.start(30000);
-    }
-
-signals:
-    void result(bool);
-
-private slots:
-    void doError()
-    {
-        expire.stop();
-        delete client;
-        client = 0;
-        result(false);
-    }
-
-    void sc_incomingMethods(int m)
-    {
-        if(m & SocksClient::AuthNone)
-            client->chooseMethod(SocksClient::AuthNone);
-        else
-            doError();
-    }
-
-    void sc_incomingConnectRequest(const QString &_host, int port)
-    {
-        if(port == 0) {
-            host = _host;
-            client->disconnect(this);
-            emit result(true);
-        }
-        else
-            doError();
-    }
-
-    void sc_error(int)
-    {
-        doError();
-    }
-};
-
-class S5BServer::Private
-{
-public:
-    SocksServer serv;
-    QStringList hostList;
-    QList<S5BManager*> manList;
-    QList<Jingle::S5B::Manager*> jingleManagerList;
-    QList<Item*> itemList;
-};
-
-S5BServer::S5BServer(QObject *parent)
-:QObject(parent)
-{
-    d = new Private;
-    connect(&d->serv, SIGNAL(incomingReady()), SLOT(ss_incomingReady()));
-    connect(&d->serv, SIGNAL(incomingUDP(QString,int,QHostAddress,int,QByteArray)), SLOT(ss_incomingUDP(QString,int,QHostAddress,int,QByteArray)));
-}
-
-S5BServer::~S5BServer()
-{
-    unlinkAll();
-    delete d;
-}
-
-bool S5BServer::isActive() const
-{
-    return d->serv.isActive();
-}
-
-bool S5BServer::start(int port)
-{
-    d->serv.stop();
-    //return d->serv.listen(port, true);
-    return d->serv.listen(port);
-}
-
-void S5BServer::stop()
-{
-    d->serv.stop();
-}
-
-void S5BServer::setHostList(const QStringList &list)
-{
-    d->hostList = list;
-}
-
-QStringList S5BServer::hostList() const
-{
-    return d->hostList;
-}
-
-int S5BServer::port() const
-{
-    return d->serv.port();
-}
-
-void S5BServer::ss_incomingReady()
-{
-    Item *i = new Item(d->serv.takeIncoming());
-#ifdef S5B_DEBUG
-    qDebug("S5BServer: incoming connection from %s:%d\n", qPrintable(i->client->peerAddress().toString()), i->client->peerPort());
-#endif
-    connect(i, SIGNAL(result(bool)), SLOT(item_result(bool)));
-    d->itemList.append(i);
-}
-
-void S5BServer::ss_incomingUDP(const QString &host, int port, const QHostAddress &addr, int sourcePort, const QByteArray &data)
-{
-    if(port != 0 && port != 1)
-        return;
-
-    for (Jingle::S5B::Manager *m: d->jingleManagerList) {
-        if (m->incomingUDP(port == 1 ? true : false, addr, sourcePort, host, data)) {
-            return;
-        }
-    }
-
-    foreach(S5BManager* m, d->manList) {
-        if(m->srv_ownsHash(host)) {
-            m->srv_incomingUDP(port == 1 ? true : false, addr, sourcePort, host, data);
-            return;
-        }
-    }
-}
-
-void S5BServer::item_result(bool b)
-{
-    Item *i = static_cast<Item *>(sender());
-#ifdef S5B_DEBUG
-    qDebug("S5BServer item result: %d\n", b);
-#endif
-    if(!b) {
-        d->itemList.removeAll(i);
-        delete i;
-        return;
-    }
-
-    SocksClient *c = i->client;
-    i->client = 0;
-    QString key = i->host;
-    d->itemList.removeAll(i);
-    delete i;
-
-
-    for (Jingle::S5B::Manager *m: d->jingleManagerList) {
-        if (m->incomingConnection(c, key)) {
-            return;
-        }
-    }
-
-    // find the appropriate manager for this incoming connection
-    foreach(S5BManager *m, d->manList) {
-        if(m->srv_ownsHash(key)) {
-            m->srv_incomingReady(c, key);
-            return;
-        }
-    }
-
-#ifdef S5B_DEBUG
-    qDebug("S5BServer item result: unknown hash [%s]\n", qPrintable(key));
-#endif
-
-    // throw it away
-    delete c;
-}
-
-void S5BServer::link(S5BManager *m)
-{
-    d->manList.append(m);
-}
-
-void S5BServer::unlink(S5BManager *m)
-{
-    d->manList.removeAll(m);
-}
-
-void S5BServer::link(Jingle::S5B::Manager *m)
-{
-    d->jingleManagerList.append(m);
-}
-
-void S5BServer::unlink(Jingle::S5B::Manager *m)
-{
-    d->jingleManagerList.removeAll(m);
-}
-
-void S5BServer::unlinkAll()
-{
-    auto jl = d->jingleManagerList;
-    d->jingleManagerList.clear(); // clear early for setServer optimization
-    for(Jingle::S5B::Manager *m : jl) {
-        m->setServer(nullptr);
-    }
-
-    foreach(S5BManager *m, d->manList) {
-        m->srv_unlink();
-    }
-    d->manList.clear();
-}
-
-const QList<S5BManager*> & S5BServer::managerList() const
-{
-    return d->manList;
-}
-
-void S5BServer::writeUDP(const QHostAddress &addr, int port, const QByteArray &data)
-{
-    d->serv.writeUDP(addr, port, data);
-}
 
 //----------------------------------------------------------------------------
 // JT_S5B
@@ -2568,6 +2311,150 @@ void StreamHost::setIsProxy(bool b)
     proxy = b;
 }
 
+//----------------------------------------------------------------------------
+// S5BServersProducer
+//----------------------------------------------------------------------------
+TcpPortServer *S5BServersProducer::makeServer(QTcpServer *socket)
+{
+    return new S5BServer(socket);
+}
+
+//----------------------------------------------------------------------------
+// S5BIncomingConnection
+//----------------------------------------------------------------------------
+class S5BIncomingConnection : public QObject
+{
+    Q_OBJECT
+public:
+    SocksClient *client;
+    QString host;
+    QTimer expire;
+
+    S5BIncomingConnection(SocksClient *c) : QObject(0)
+    {
+        client = c;
+        connect(client, &SocksClient::incomingMethods, [this](int methods){
+            if(methods & SocksClient::AuthNone)
+                client->chooseMethod(SocksClient::AuthNone);
+            else
+                doError();
+        });
+        connect(client, &SocksClient::incomingConnectRequest, [this](const QString &_host, int port)
+        {
+            if(port == 0) {
+                host = _host;
+                client->disconnect(this);
+                expire.stop();
+                emit result(true);
+            }
+            else
+                doError();
+        });
+        connect(client, &SocksClient::error, [this](){ doError(); });
+        connect(&expire, SIGNAL(timeout()), SLOT(doError()));
+        resetExpiration();
+    }
+
+    ~S5BIncomingConnection()
+    {
+        delete client;
+    }
+
+    void resetExpiration()
+    {
+        expire.start(30000);
+    }
+
+signals:
+    void result(bool);
+
+private slots:
+    void doError()
+    {
+        expire.stop();
+        delete client;
+        client = 0;
+        result(false);
+    }
+};
+
+//----------------------------------------------------------------------------
+// S5BServer
+//----------------------------------------------------------------------------
+struct S5BServer::Private
+{
+    SocksServer serv;
+    QSet<QString> keys;
+};
+
+S5BServer::S5BServer(QTcpServer *serverSocket) :
+    TcpPortServer(serverSocket),
+    d(new Private)
+{
+    d->serv.setServerSocket(serverSocket);
+    connect(&d->serv, &SocksServer::incomingReady, this, [this]() {
+        S5BIncomingConnection *inConn = new S5BIncomingConnection(d->serv.takeIncoming());
+#ifdef S5B_DEBUG
+        qDebug("S5BServer: incoming connection from %s:%d\n", qPrintable(i->client->peerAddress().toString()), i->client->peerPort());
+#endif
+        connect(inConn, &S5BIncomingConnection::result, this, [this, inConn](bool success){
+#ifdef S5B_DEBUG
+            qDebug("S5BServer item result: %d\n", success);
+#endif
+            if(!success) {
+                delete inConn;
+                return;
+            }
+
+            SocksClient *c = inConn->client;
+            inConn->client = 0;
+            QString key = inConn->host;
+            delete inConn;
+
+            emit incomingConnection(c, key);
+            if (!c->isOpen()) {
+                delete c;
+            }
+        });
+    });
+    connect(&d->serv, &SocksServer::incomingUDP, this, [this](const QString &host, int port, const QHostAddress &addr, int sourcePort, const QByteArray &data){
+        if(port != 0 && port != 1)
+            return;
+        bool isInit = port == 1;
+        emit incomingUdp(isInit, addr, sourcePort, host, data);
+    });
+}
+
+S5BServer::~S5BServer()
+{
+    // basically to make QScopedPointer happy
+}
+
+void S5BServer::writeUDP(const QHostAddress &addr, int port, const QByteArray &data)
+{
+    d->serv.writeUDP(addr, port, data);
+}
+
+bool S5BServer::isActive() const
+{
+    return d->serv.isActive();
+}
+
+bool S5BServer::hasKey(const QString &key)
+{
+    return d->keys.contains(key);
+}
+
+void S5BServer::registerKey(const QString &key)
+{
+    d->keys.insert(key);
+}
+
+void S5BServer::unregisterKey(const QString &key)
+{
+    d->keys.remove(key);
+}
+
 }
 
 #include "s5b.moc"
diff --git a/src/xmpp/xmpp-im/s5b.h b/src/xmpp/xmpp-im/s5b.h
index 2fca6c6d..4f0d9863 100644
--- a/src/xmpp/xmpp-im/s5b.h
+++ b/src/xmpp/xmpp-im/s5b.h
@@ -23,6 +23,7 @@
 #include <QObject>
 #include <QList>
 #include <QHostAddress>
+#include <tcpportreserver.h>
 
 #include "bytestream.h"
 #include "xmpp_bytestream.h"
@@ -43,9 +44,9 @@ namespace XMPP
 
     class StreamHost;
     class Client;
+    class TcpPortReserver;
     class S5BConnection;
     class S5BManager;
-    class S5BServer;
     class JT_PushS5B;
     struct S5BRequest;
     typedef QList<StreamHost> StreamHostList;
@@ -151,8 +152,6 @@ namespace XMPP
 
         static const char* ns();
         Client *client() const;
-        S5BServer *server() const;
-        void setServer(S5BServer *s);
         JT_PushS5B *jtPush() const;
 
         bool isAcceptableSID(const Jid &peer, const QString &sid) const;
@@ -187,7 +186,6 @@ namespace XMPP
         Entry *findEntry(Item *) const;
         Entry *findEntryByHash(const QString &key) const;
         Entry *findEntryBySID(const Jid &peer, const QString &sid) const;
-        Entry *findServerEntryByHash(const QString &key) const;
 
         void entryContinue(Entry *e);
         void queryProxy(Entry *e);
@@ -204,7 +202,6 @@ namespace XMPP
         bool srv_ownsHash(const QString &key) const;
         void srv_incomingReady(SocksClient *sc, const QString &key);
         void srv_incomingUDP(bool init, const QHostAddress &addr, int port, const QString &key, const QByteArray &data);
-        void srv_unlink();
 
         friend class Item;
         void doSuccess(const Jid &peer, const QString &id, const Jid &streamHost);
@@ -242,41 +239,34 @@ namespace XMPP
         void man_udpSuccess(const Jid &streamHost);
     };
 
-    // listens on a port for serving
-    class S5BServer : public QObject
+
+    class S5BServersProducer : public TcpPortScope
+    {
+    protected:
+        TcpPortServer* makeServer(QTcpServer *socket); // in fact returns S5BServer
+    };
+
+    class S5BServer : public TcpPortServer
     {
         Q_OBJECT
+
     public:
-        S5BServer(QObject *par=0);
+        S5BServer(QTcpServer *serverSocket);
         ~S5BServer();
 
+        void writeUDP(const QHostAddress &addr, int port, const QByteArray &data);
         bool isActive() const;
-        bool start(int port);
-        void stop();
-        int port() const;
-        void setHostList(const QStringList &);
-        QStringList hostList() const;
+        bool hasKey(const QString &key);
+        void registerKey(const QString &key);
+        void unregisterKey(const QString &key);
 
-        class Item;
-
-    private slots:
-        void ss_incomingReady();
-        void ss_incomingUDP(const QString &host, int port, const QHostAddress &addr, int sourcePort, const QByteArray &data);
-        void item_result(bool);
+    signals:
+        void incomingConnection(SocksClient *c, const QString &key);
+        void incomingUdp(bool isInit, const QHostAddress &addr, int sourcePort, const QString &key, const QByteArray &data);
 
     private:
         class Private;
-        Private *d;
-
-        friend class S5BManager;
-        friend class Jingle::S5B::Manager;
-        void link(S5BManager *);
-        void unlink(S5BManager *);
-        void link(Jingle::S5B::Manager *m);
-        void unlink(Jingle::S5B::Manager *m);
-        void unlinkAll();
-        const QList<S5BManager*> & managerList() const;
-        void writeUDP(const QHostAddress &addr, int port, const QByteArray &data);
+        QScopedPointer<Private> d;
     };
 
     class JT_S5B : public Task
diff --git a/src/xmpp/xmpp-im/xmpp_client.h b/src/xmpp/xmpp-im/xmpp_client.h
index 897d31cf..695b6a96 100644
--- a/src/xmpp/xmpp-im/xmpp_client.h
+++ b/src/xmpp/xmpp-im/xmpp_client.h
@@ -53,6 +53,7 @@ namespace XMPP {
     class EncryptionHandler;
     class ServerInfoManager;
     class HttpFileUploadManager;
+    class TcpPortReserver;
 
     namespace Jingle {
         class Manager;
@@ -133,6 +134,8 @@ namespace XMPP
         const Features& features() const;
         DiscoItem makeDiscoResult(const QString &node = QString::null) const;
 
+        void setTcpPortReserver(TcpPortReserver *portReserver);
+        TcpPortReserver *tcpPortReserver() const;
         S5BManager *s5bManager() const;
         IBBManager *ibbManager() const;
         BoBManager *bobManager() const;
diff --git a/src/xmpp/xmpp-im/xmpp_liverosteritem.h b/src/xmpp/xmpp-im/xmpp_liverosteritem.h
index b46d0664..08bfbb44 100644
--- a/src/xmpp/xmpp-im/xmpp_liverosteritem.h
+++ b/src/xmpp/xmpp-im/xmpp_liverosteritem.h
@@ -31,6 +31,7 @@ namespace XMPP
         LiveRosterItem(const Jid &j="");
         LiveRosterItem(const RosterItem &);
         ~LiveRosterItem();
+        LiveRosterItem& operator=(const LiveRosterItem& other) = default;
 
         void setRosterItem(const RosterItem &);
 
diff --git a/src/xmpp/xmpp-im/xmpp_rosteritem.h b/src/xmpp/xmpp-im/xmpp_rosteritem.h
index 5ed23f6f..acb31e95 100644
--- a/src/xmpp/xmpp-im/xmpp_rosteritem.h
+++ b/src/xmpp/xmpp-im/xmpp_rosteritem.h
@@ -48,6 +48,7 @@ namespace XMPP
         RosterItem(const Jid &jid="");
         RosterItem(const RosterItem &item);
         virtual ~RosterItem();
+        RosterItem& operator=(const RosterItem& other) = default;
 
         const Jid & jid() const;
         const QString & name() const;

From 488bca08868282e8d338354c302e7cedb9cbde30 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sat, 1 Jun 2019 22:27:15 +0300
Subject: [PATCH 042/383] A few fixes to s5b mediated transfer

---
 src/xmpp/xmpp-im/jingle-s5b.cpp | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index afbd4145..0a6758a6 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -22,6 +22,7 @@
 #include "xmpp_client.h"
 #include "xmpp_serverinfomanager.h"
 #include "socks.h"
+#include "ice176.h"
 
 #include <QElapsedTimer>
 #include <QNetworkInterface>
@@ -897,9 +898,9 @@ class Transport::Private
                 auto c = preferredUsedCandidate();
                 if (c) {
                     if (c.state() != Candidate::Active) {
-                        if (c.type() == Candidate::Proxy && c == localUsedCandidate) { // local proxy
+                        if (c.type() == Candidate::Proxy) { // local proxy
                             // If it's proxy, first it has to be activated
-                            if (localUsedCandidate) {
+                            if (c == localUsedCandidate) {
                                 // it's our side who proposed proxy. so we have to connect to it and activate
                                 auto key = makeKey(sid, pad->session()->me(), pad->session()->peer());
                                 c.connectToHost(key, Candidate::Active, [this](bool success){
@@ -909,6 +910,7 @@ class Transport::Private
                                         pendingActions |= Private::ProxyError;
                                     }
                                     emit q->updated();
+                                    handleConnected(localUsedCandidate);
                                 }, mode == Transport::Udp);
                             } // else so it's remote proxy. let's just wait for <activated> from remote
                         } else {
@@ -1079,7 +1081,6 @@ Transport::Transport(const TransportManagerPad::Ptr &pad, const QDomElement &tra
     Transport::Transport(pad)
 {
     d->meCreator = false;
-    d->dstaddr = transportEl.attribute(QStringLiteral("dstaddr"));
     d->sid = transportEl.attribute(QStringLiteral("sid"));
     if (d->sid.isEmpty() || !update(transportEl)) {
         d.reset();
@@ -1141,6 +1142,10 @@ bool Transport::update(const QDomElement &transportEl)
             d->blockSize = bsn;
         }
     }
+    auto dstaddr = transportEl.attribute(QStringLiteral("dstaddr"));
+    if (!dstaddr.isEmpty()) {
+        d->dstaddr = dstaddr;
+    }
     QString candidateTag(QStringLiteral("candidate"));
     int candidatesAdded = 0;
     for(QDomElement ce = transportEl.firstChildElement(candidateTag);
@@ -1195,11 +1200,12 @@ bool Transport::update(const QDomElement &transportEl)
 
     el = transportEl.firstChildElement(QStringLiteral("activated"));
     if (!el.isNull()) {
-        auto c = d->localCandidates.value(el.attribute(QStringLiteral("cid")));
-        if (!c) {
+        QString cid = el.attribute(QStringLiteral("cid"));
+        if (cid.isEmpty()) {
             return false;
         }
-        if (!(c.type() == Candidate::Proxy && c.state() == Candidate::Accepted && c == d->localUsedCandidate)) {
+        auto c = d->remoteUsedCandidate;
+        if (!(c.cid() == cid && c.type() == Candidate::Proxy && c.state() == Candidate::Accepted)) {
             qDebug("Received <activated> on a candidate in an inappropriate state. Ignored.");
             return true;
         }
@@ -1340,11 +1346,6 @@ OutgoingTransportInfoUpdate Transport::takeOutgoingUpdate()
             d->waitingAck = true;
             upd = OutgoingTransportInfoUpdate{tel, [this, cand]() mutable {
                 d->waitingAck = false;
-                if (cand.state() != Candidate::Accepted || d->localUsedCandidate != cand) {
-                    return; // seems like state was changed while we was waiting for an ack
-                }
-                cand.setState(Candidate::Active);
-                d->checkAndFinishNegotiation();
             }};
         }
     } else if (d->pendingActions & Private::ProxyError) {

From 0955d007860a96aebf129ddc36eb1c7f8a564e55 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 2 Jun 2019 00:13:52 +0300
Subject: [PATCH 043/383] Added forgotten s5b proxy activation

---
 src/xmpp/xmpp-im/jingle-s5b.cpp | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 0a6758a6..c1af5b21 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -237,7 +237,7 @@ class Candidate::Private : public QObject, public QSharedData {
         #endif
                 )
         {
-            qDebug() << "connect to host with " << cid << "candidate using V6LinkLocalSocksConnector";
+            qDebug() << "connect to host with cid=" << cid << "and key=" << key << "candidate using V6LinkLocalSocksConnector";
             // we have link local address without scope. We have to enumerate all possible scopes.
             auto v6llConnector = new V6LinkLocalSocksConnector(this);
             connect(v6llConnector, &V6LinkLocalSocksConnector::ready, this, [this, v6llConnector, callback, successState]() {
@@ -261,7 +261,7 @@ class Candidate::Private : public QObject, public QSharedData {
             v6llConnector->connectToHost(ha, port, key, isUdp);
         } else {
             socksClient = new SocksClient;
-            qDebug() << "connect to host with " << cid << "candidate and socks client" << socksClient;
+            qDebug() << "connect to host with cid=" << cid << ", key=" << key << " and socks client" << socksClient;
             connect(socksClient, &SocksClient::connected, [this, callback, successState](){
                 state = successState;
                 qDebug() << "socks client"  << socksClient << "is connected";
@@ -903,14 +903,28 @@ class Transport::Private
                             if (c == localUsedCandidate) {
                                 // it's our side who proposed proxy. so we have to connect to it and activate
                                 auto key = makeKey(sid, pad->session()->me(), pad->session()->peer());
-                                c.connectToHost(key, Candidate::Active, [this](bool success){
-                                    if (success) {
-                                        pendingActions |= Private::Activated;
-                                    } else {
+                                c.connectToHost(key, Candidate::Accepted, [this](bool success){
+                                    if (!success) {
                                         pendingActions |= Private::ProxyError;
+                                        emit q->updated();
+                                        return;
                                     }
-                                    emit q->updated();
-                                    handleConnected(localUsedCandidate);
+
+                                    auto query = new JT_S5B(pad->session()->manager()->client()->rootTask());
+                                    connect(query, &JT_S5B::finished, q, [this,query]() {
+                                        Q_ASSERT(localUsedCandidate.state() == Candidate::Accepted);
+                                        if (!query->success()) {
+                                            pendingActions |= Private::ProxyError;
+                                            emit q->updated();
+                                            return;
+                                        }
+                                        pendingActions |= Private::Activated;
+                                        localUsedCandidate.setState(Candidate::Active);
+                                        emit q->updated();
+                                        handleConnected(localUsedCandidate);
+                                    });
+                                    query->requestActivation(localUsedCandidate.jid(), sid, pad->session()->peer());
+                                    query->go(true);
                                 }, mode == Transport::Udp);
                             } // else so it's remote proxy. let's just wait for <activated> from remote
                         } else {
@@ -1117,6 +1131,7 @@ void Transport::prepare()
         d->onLocalServerDiscovered();
     });
     d->onLocalServerDiscovered();
+
     d->discoS5BProxy();
 
     emit updated();

From 4b0aabf441a6fd6976659c87d74dafe6d34f50b6 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 2 Jun 2019 10:49:08 +0300
Subject: [PATCH 044/383] Fixed regression/crash in legacy s5b

---
 src/xmpp/xmpp-im/jingle-s5b.cpp |  2 +-
 src/xmpp/xmpp-im/s5b.cpp        | 31 +++++++++++++++++++------------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index c1af5b21..fc86e441 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -195,6 +195,7 @@ class V6LinkLocalSocksConnector : public  QObject
     SocksClient* takeClient()
     {
         auto c = client;
+        c->setParent(nullptr);
         client = nullptr;
         return c;
     }
@@ -242,7 +243,6 @@ class Candidate::Private : public QObject, public QSharedData {
             auto v6llConnector = new V6LinkLocalSocksConnector(this);
             connect(v6llConnector, &V6LinkLocalSocksConnector::ready, this, [this, v6llConnector, callback, successState]() {
                 socksClient = v6llConnector->takeClient();
-                socksClient->setParent(nullptr);
                 delete v6llConnector;
                 if (state == Candidate::Discarded) {
                     return;
diff --git a/src/xmpp/xmpp-im/s5b.cpp b/src/xmpp/xmpp-im/s5b.cpp
index 0f6fb71b..a9597d3c 100644
--- a/src/xmpp/xmpp-im/s5b.cpp
+++ b/src/xmpp/xmpp-im/s5b.cpp
@@ -80,7 +80,7 @@ class S5BManager::Item : public QObject
     StreamHostList in_hosts;
     JT_S5B *task = nullptr;
     JT_S5B *proxy_task = nullptr;
-    QSharedPointer<S5BServer> relatedServer;
+    QList<QSharedPointer<S5BServer>> relatedServers;
     SocksClient *client = nullptr;
     SocksClient *client_out = nullptr;
     SocksUDP *client_udp = nullptr;
@@ -733,8 +733,13 @@ bool S5BManager::isAcceptableSID(const Jid &peer, const QString &sid) const
         if(e->i) {
             if (e->i->key == key || e->i->key == key_out)
                 return false;
-            else if (e->i->relatedServer && (e->i->relatedServer->hasKey(key) || e->i->relatedServer->hasKey(key_out)))
-                return false;
+            else {
+                for (auto &s: e->i->relatedServers) {
+                    if (s->hasKey(key) || s->hasKey(key_out)) {
+                        return false;
+                    }
+                }
+            }
         }
     }
 
@@ -903,8 +908,8 @@ void S5BManager::con_sendUDP(S5BConnection *c, const QByteArray &buf)
     if(!e->udp_init)
         return;
 
-    if(e->i->relatedServer)
-        e->i->relatedServer->writeUDP(e->udp_addr, e->udp_port, buf);
+    if(e->i->relatedServers.size()) // FIXME in fact we shoule keep eact related server in Connection
+        e->i->relatedServers[0]->writeUDP(e->udp_addr, e->udp_port, buf);
 }
 
 void S5BManager::item_accepted()
@@ -1073,9 +1078,9 @@ S5BManager::Item::~Item()
 
 void S5BManager::Item::resetConnection()
 {
-    if (relatedServer) {
-        relatedServer->unregisterKey(key);
-        relatedServer.reset();
+    for (auto &s: relatedServers) {
+        s->unregisterKey(key);
+        s.reset();
     }
 
     delete task;
@@ -1182,14 +1187,15 @@ void S5BManager::Item::doOutgoing()
     auto disco = m->client()->tcpPortReserver()->scope(QString::fromLatin1("s5b"))->disco();
     if(!haveHost(in_hosts, self)) {
         foreach (auto &c, disco->takeServers()) {
-            relatedServer = c.staticCast<S5BServer>();
-            relatedServer->registerKey(key);
-            connect(relatedServer.data(), &S5BServer::incomingConnection, this, [this](SocksClient *c, const QString &key) {
+            auto server = c.staticCast<S5BServer>();
+            server->registerKey(key);
+            relatedServers.append(server);
+            connect(server.data(), &S5BServer::incomingConnection, this, [this](SocksClient *c, const QString &key) {
                 if (key == this->key) {
                     m->srv_incomingReady(c, key);
                 }
             });
-            connect(relatedServer.data(), &S5BServer::incomingUdp, this, [this](bool isInit, const QHostAddress &addr, int sourcePort, const QString &key, const QByteArray &data) {
+            connect(server.data(), &S5BServer::incomingUdp, this, [this](bool isInit, const QHostAddress &addr, int sourcePort, const QString &key, const QByteArray &data) {
                 if (key == this->key) {
                     m->srv_incomingUDP(isInit, addr, sourcePort, key, data);
                 }
@@ -1282,6 +1288,7 @@ void S5BManager::Item::setIncomingClient(SocksClient *sc)
     connect(sc, SIGNAL(bytesWritten(qint64)), SLOT(sc_bytesWritten(qint64)));
     connect(sc, SIGNAL(error(int)), SLOT(sc_error(int)));
 
+    sc->setParent(nullptr); // avoid deleting it by SocksServer destructor
     client = sc;
     allowIncoming = false;
 }

From 7c885d6a746792fd05cd3cc963a9b6e830786949 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 2 Jun 2019 11:55:59 +0300
Subject: [PATCH 045/383] Started implementation of Jingle IBB transport

---
 src/xmpp/xmpp-im/jingle-ibb.cpp | 143 ++++++++++++++++++++++++++++++++
 src/xmpp/xmpp-im/jingle-ibb.h   | 108 ++++++++++++++++++++++++
 src/xmpp/xmpp-im/jingle-s5b.cpp | 106 +++++++----------------
 src/xmpp/xmpp-im/jingle-s5b.h   |  14 ----
 src/xmpp/xmpp.pri               |   6 +-
 5 files changed, 286 insertions(+), 91 deletions(-)
 create mode 100644 src/xmpp/xmpp-im/jingle-ibb.cpp
 create mode 100644 src/xmpp/xmpp-im/jingle-ibb.h

diff --git a/src/xmpp/xmpp-im/jingle-ibb.cpp b/src/xmpp/xmpp-im/jingle-ibb.cpp
new file mode 100644
index 00000000..ba451ee5
--- /dev/null
+++ b/src/xmpp/xmpp-im/jingle-ibb.cpp
@@ -0,0 +1,143 @@
+/*
+ * jignle-ibb.cpp - Jingle In-Band Bytestream transport
+ * Copyright (C) 2019  Sergey Ilinykh
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "jingle-ibb.h"
+
+namespace XMPP {
+namespace Jingle {
+namespace IBB {
+
+struct Transport::Private
+{
+    TransportManagerPad::Ptr pad;
+};
+
+Transport::Transport(const TransportManagerPad::Ptr &pad)
+{
+
+}
+
+Transport::Transport(const TransportManagerPad::Ptr &pad, const QDomElement &transportEl)
+{
+
+}
+
+Transport::~Transport()
+{
+
+}
+
+TransportManagerPad::Ptr Transport::pad() const
+{
+    return d->pad;
+}
+
+void Transport::prepare()
+{
+
+}
+
+void Transport::start()
+{
+
+}
+
+bool Transport::update(const QDomElement &transportEl)
+{
+
+}
+
+bool Transport::hasUpdates() const
+{
+
+}
+
+OutgoingTransportInfoUpdate Transport::takeOutgoingUpdate()
+{
+
+}
+
+bool Transport::isValid() const
+{
+    return true;
+}
+
+Transport::Features Transport::features() const
+{
+
+}
+
+QString Transport::sid() const
+{
+
+}
+
+Connection::Ptr Transport::connection() const
+{
+
+}
+
+size_t Transport::blockSize() const
+{
+
+}
+
+QSharedPointer<XMPP::Jingle::Transport> Transport::createOutgoing(const TransportManagerPad::Ptr &pad)
+{
+    return QSharedPointer<XMPP::Jingle::Transport>();
+}
+
+QSharedPointer<XMPP::Jingle::Transport> Transport::createIncoming(const TransportManagerPad::Ptr &pad, const QDomElement &transportEl)
+{
+    return QSharedPointer<XMPP::Jingle::Transport>();
+}
+
+Pad::Pad(Manager *manager, Session *session)
+{
+
+}
+
+QString Pad::ns() const
+{
+    return NS;
+}
+
+Session *Pad::session() const
+{
+
+}
+
+TransportManager *Pad::manager() const
+{
+
+}
+
+QString Pad::generateSid() const
+{
+
+}
+
+void Pad::registerSid(const QString &sid)
+{
+
+}
+
+} // namespace IBB
+} // namespace Jingle
+} // namespace XMPP
diff --git a/src/xmpp/xmpp-im/jingle-ibb.h b/src/xmpp/xmpp-im/jingle-ibb.h
new file mode 100644
index 00000000..8bc81239
--- /dev/null
+++ b/src/xmpp/xmpp-im/jingle-ibb.h
@@ -0,0 +1,108 @@
+/*
+ * jignle-ibb.h - Jingle In-Band Bytestream transport
+ * Copyright (C) 2019  Sergey Ilinykh
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef JINGLEIBB_H
+#define JINGLEIBB_H
+
+#include "jingle.h"
+
+namespace XMPP {
+namespace Jingle {
+namespace IBB {
+
+extern const QString NS;
+
+class Transport : public XMPP::Jingle::Transport
+{
+    Q_OBJECT
+public:
+    Transport(const TransportManagerPad::Ptr &pad);
+    Transport(const TransportManagerPad::Ptr &pad, const QDomElement &transportEl);
+    ~Transport();
+
+    TransportManagerPad::Ptr pad() const override;
+
+    void prepare() override;
+    void start() override;
+    bool update(const QDomElement &transportEl) override;
+    bool hasUpdates() const override;
+    OutgoingTransportInfoUpdate takeOutgoingUpdate() override;
+    bool isValid() const override;
+    Features features() const override;
+
+    QString sid() const;
+    Connection::Ptr connection() const;
+    size_t blockSize() const;
+private:
+    friend class S5BServersManager;
+
+    friend class Manager;
+    static QSharedPointer<XMPP::Jingle::Transport> createOutgoing(const TransportManagerPad::Ptr &pad);
+    static QSharedPointer<XMPP::Jingle::Transport> createIncoming(const TransportManagerPad::Ptr &pad, const QDomElement &transportEl);
+
+    class Private;
+    QScopedPointer<Private> d;
+};
+
+class Manager;
+class Pad : public TransportManagerPad
+{
+    Q_OBJECT
+    // TODO
+public:
+    typedef QSharedPointer<Pad> Ptr;
+
+    Pad(Manager *manager, Session *session);
+    QString ns() const override;
+    Session *session() const override;
+    TransportManager *manager() const override;
+
+    QString generateSid() const;
+    void registerSid(const QString &sid);
+private:
+    Manager *_manager;
+    Session *_session;
+};
+
+class Manager : public TransportManager {
+    Q_OBJECT
+public:
+    Manager(QObject *parent = nullptr);
+    ~Manager();
+
+    XMPP::Jingle::Transport::Features features() const override;
+    void setJingleManager(XMPP::Jingle::Manager *jm) override;
+    QSharedPointer<XMPP::Jingle::Transport> newTransport(const TransportManagerPad::Ptr &pad) override; // outgoing. one have to call Transport::start to collect candidates
+    QSharedPointer<XMPP::Jingle::Transport> newTransport(const TransportManagerPad::Ptr &pad, const QDomElement &transportEl) override; // incoming
+    TransportManagerPad* pad(Session *session) override;
+
+    void closeAll() override;
+
+    QString generateSid(const Jid &remote);
+    void registerSid(const Jid &remote, const QString &sid);
+private:
+    class Private;
+    QScopedPointer<Private> d;
+};
+
+} // namespace IBB
+} // namespace Jingle
+} // namespace XMPP
+
+#endif // JINGLEIBB_H
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index fc86e441..1739423d 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -1055,6 +1055,37 @@ class Transport::Private
                     sc->requestDeny();
                     sc->deleteLater();
                 });
+                QObject::connect(s5bserv.data(), &S5BServer::incomingUdp, q, [this, c](bool isInit, const QHostAddress &addr, int sourcePort, const QString &key, const QByteArray &data){
+                    if (mode != Transport::Mode::Udp || !connection) {
+                        return false;
+                    }
+
+                    if(isInit) {
+                        // TODO probably we could create a Connection here and put all the params inside
+                        if(udpInitialized)
+                            return false; // only init once
+
+                        // lock on to this sender
+                        udpAddress = addr;
+                        udpPort = sourcePort;
+                        udpInitialized = true;
+
+                        // reply that initialization was successful
+                        pad->session()->manager()->client()->s5bManager()->jtPush()->sendUDPSuccess(pad->session()->peer(), key); // TODO fix ->->->
+                        return true;
+                    }
+
+                    // not initialized yet?  something went wrong
+                    if(!udpInitialized)
+                        return false;
+
+                    // must come from same source as when initialized
+                    if(addr != udpAddress || sourcePort != udpPort)
+                        return false;
+
+                    connection->enqueueIncomingUDP(data); // man_udpReady
+                    return true;
+                });
                 localCandidates.insert(c.cid(), c);
                 pendingActions |= NewCandidate;
             }
@@ -1417,63 +1448,6 @@ size_t Transport::blockSize() const
     return d->blockSize;
 }
 
-bool Transport::incomingConnection(SocksClient *sc)
-{
-    if (!d->connection) {
-        auto s = sc->abstractSocket();
-        for (auto &c: d->localCandidates) {
-            if (s->localPort() == c.localPort() &&
-                    (c.state() == Candidate::Pending || c.state() == Candidate::Unacked) &&
-                    c.incomingConnection(sc))
-            {
-
-                if(d->mode == Transport::Udp)
-                    sc->grantUDPAssociate("", 0);
-                else
-                    sc->grantConnect();
-                // we can also remember the server it comes from. static_cast<S5BServer *>(sender())
-                return true;
-            }
-        }
-    }
-
-    sc->requestDeny();
-    sc->deleteLater();
-    return false;
-}
-
-bool Transport::incomingUDP(bool init, const QHostAddress &addr, int port, const QString &key, const QByteArray &data)
-{
-    if (d->mode != Transport::Mode::Udp) {
-        return false;
-    }
-
-    if(init) {
-        // TODO probably we could create a Connection here and put all the params inside
-        if(d->udpInitialized)
-            return false; // only init once
-
-        // lock on to this sender
-        d->udpAddress = addr;
-        d->udpPort = port;
-        d->udpInitialized = true;
-
-        // reply that initialization was successful
-        d->pad->session()->manager()->client()->s5bManager()->jtPush()->sendUDPSuccess(d->pad->session()->peer(), key); // TODO fix ->->->
-        return true;
-    }
-
-    // not initialized yet?  something went wrong
-    if(!d->udpInitialized)
-        return false;
-
-    // must come from same source as when initialized
-    if(addr != d->udpAddress || port != d->udpPort)
-        return false;
-
-    d->connection->enqueueIncomingUDP(data); // man_udpReady
-    return true;
-}
 
 //----------------------------------------------------------------
 // Manager
@@ -1558,24 +1532,6 @@ void Manager::removeKeyMapping(const QString &key)
     d->key2transport.remove(key);
 }
 
-bool Manager::incomingConnection(SocksClient *client, const QString &key)
-{
-    auto t = d->key2transport.value(key);
-    if (t) {
-        return t->incomingConnection(client);
-    }
-    return false;
-}
-
-bool Manager::incomingUDP(bool init, const QHostAddress &addr, int port, const QString &key, const QByteArray &data)
-{
-    auto t = d->key2transport.value(key);
-    if (t) {
-        return t->incomingUDP(init, addr, port, key, data);
-    }
-    return false;
-}
-
 QString Manager::generateSid(const Jid &remote)
 {
     auto servers = d->jingleManager->client()->tcpPortReserver()->
diff --git a/src/xmpp/xmpp-im/jingle-s5b.h b/src/xmpp/xmpp-im/jingle-s5b.h
index de08a26e..71f6883f 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.h
+++ b/src/xmpp/xmpp-im/jingle-s5b.h
@@ -17,15 +17,6 @@
  *
  */
 
-/*
- * In s5b.cpp we have
- * S5BManager        -> Jingle::S5B::Manager
- * S5BManager::Item  -> Jingle::S5B::Transport
- * S5BManager::Entry -> ???
- *
- */
-
-
 #ifndef JINGLE_S5B_H
 #define JINGLE_S5B_H
 
@@ -160,8 +151,6 @@ class Transport : public XMPP::Jingle::Transport
     size_t blockSize() const;
 private:
     friend class S5BServersManager;
-    bool incomingConnection(SocksClient *sc);
-    bool incomingUDP(bool init, const QHostAddress &addr, int port, const QString &key, const QByteArray &data);
 
     friend class Manager;
     static QSharedPointer<XMPP::Jingle::Transport> createOutgoing(const TransportManagerPad::Ptr &pad);
@@ -207,9 +196,6 @@ class Manager : public TransportManager {
 
     void closeAll() override;
 
-    bool incomingConnection(SocksClient *client, const QString &key); // returns false if key is unknown
-    bool incomingUDP(bool init, const QHostAddress &addr, int port, const QString &key, const QByteArray &data);
-
     QString generateSid(const Jid &remote);
     void registerSid(const Jid &remote, const QString &sid);
 
diff --git a/src/xmpp/xmpp.pri b/src/xmpp/xmpp.pri
index 8dd342d8..8e9fd795 100644
--- a/src/xmpp/xmpp.pri
+++ b/src/xmpp/xmpp.pri
@@ -80,7 +80,8 @@ HEADERS += \
     $$PWD/xmpp-im/xmpp_serverinfomanager.h \
     $$PWD/xmpp-im/jingle.h \
     $$PWD/xmpp-im/jingle-ft.h \
-    $$PWD/xmpp-im/jingle-s5b.h
+    $$PWD/xmpp-im/jingle-s5b.h \
+    $$PWD/xmpp-im/jingle-ibb.h
 
 SOURCES += \
     $$PWD/xmpp-core/connector.cpp \
@@ -115,5 +116,6 @@ SOURCES += \
     $$PWD/xmpp-im/xmpp_serverinfomanager.cpp \
     $$PWD/xmpp-im/jingle.cpp \
     $$PWD/xmpp-im/jingle-ft.cpp \
-    $$PWD/xmpp-im/jingle-s5b.cpp
+    $$PWD/xmpp-im/jingle-s5b.cpp \
+    $$PWD/xmpp-im/jingle-ibb.cpp
 

From 3292b40388fd7c9cff289bfd04d02183a4284d19 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 3 Jun 2019 08:27:32 +0300
Subject: [PATCH 046/383] a little progress with jingle IBB

---
 src/xmpp/xmpp-im/jingle-ibb.cpp | 67 +++++++++++++++++++++------------
 src/xmpp/xmpp-im/jingle-ibb.h   |  4 --
 src/xmpp/xmpp-im/jingle-s5b.h   |  4 --
 3 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ibb.cpp b/src/xmpp/xmpp-im/jingle-ibb.cpp
index ba451ee5..dafa859c 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.cpp
+++ b/src/xmpp/xmpp-im/jingle-ibb.cpp
@@ -18,24 +18,47 @@
  */
 
 #include "jingle-ibb.h"
+#include "xmpp/jid/jid.h"
 
 namespace XMPP {
 namespace Jingle {
 namespace IBB {
 
+class Connection : public XMPP::Jingle::Connection
+{
+    Q_OBJECT
+
+    Jid peer;
+    QString sid;
+    size_t blockSize;
+public:
+    Connection(const Jid &jid, const QString &sid, size_t blockSize) :
+        peer(jid),
+        sid(sid),
+        blockSize(blockSize)
+    {
+
+    }
+};
+
 struct Transport::Private
 {
     TransportManagerPad::Ptr pad;
+    QString sid;
+    QSharedPointer<Connection> connection;
+    size_t blockSize = 4096;
 };
 
-Transport::Transport(const TransportManagerPad::Ptr &pad)
+Transport::Transport(const TransportManagerPad::Ptr &pad) :
+    d(new Private)
 {
-
+    d->pad = pad;
 }
 
-Transport::Transport(const TransportManagerPad::Ptr &pad, const QDomElement &transportEl)
+Transport::Transport(const TransportManagerPad::Ptr &pad, const QDomElement &transportEl) :
+    d(new Private)
 {
-
+    d->pad = pad;
 }
 
 Transport::~Transport()
@@ -50,17 +73,23 @@ TransportManagerPad::Ptr Transport::pad() const
 
 void Transport::prepare()
 {
-
+    emit updated();
 }
 
 void Transport::start()
 {
-
+    d->connection.reset(new Connection(d->pad->session()->peer(), d->sid, d->blockSize));
 }
 
 bool Transport::update(const QDomElement &transportEl)
 {
-
+    auto bs = transportEl.attribute(QString::fromLatin1("block-size"));
+    if (!bs.isEmpty()) {
+        size_t bsn = bs.toULongLong();
+        if (bsn && bsn <= d->blockSize) {
+            d->blockSize = bsn;
+        }
+    }
 }
 
 bool Transport::hasUpdates() const
@@ -80,32 +109,22 @@ bool Transport::isValid() const
 
 Transport::Features Transport::features() const
 {
-
+    return AlwaysConnect | Reliable | Slow;
 }
 
 QString Transport::sid() const
 {
-
+    return d->sid;
 }
 
 Connection::Ptr Transport::connection() const
 {
-
+    return d->connection.staticCast<XMPP::Jingle::Connection>();
 }
 
 size_t Transport::blockSize() const
 {
-
-}
-
-QSharedPointer<XMPP::Jingle::Transport> Transport::createOutgoing(const TransportManagerPad::Ptr &pad)
-{
-    return QSharedPointer<XMPP::Jingle::Transport>();
-}
-
-QSharedPointer<XMPP::Jingle::Transport> Transport::createIncoming(const TransportManagerPad::Ptr &pad, const QDomElement &transportEl)
-{
-    return QSharedPointer<XMPP::Jingle::Transport>();
+    return d->blockSize;
 }
 
 Pad::Pad(Manager *manager, Session *session)
@@ -120,17 +139,17 @@ QString Pad::ns() const
 
 Session *Pad::session() const
 {
-
+    return nullptr;
 }
 
 TransportManager *Pad::manager() const
 {
-
+    return nullptr;
 }
 
 QString Pad::generateSid() const
 {
-
+    return QString();
 }
 
 void Pad::registerSid(const QString &sid)
diff --git a/src/xmpp/xmpp-im/jingle-ibb.h b/src/xmpp/xmpp-im/jingle-ibb.h
index 8bc81239..5ede921d 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.h
+++ b/src/xmpp/xmpp-im/jingle-ibb.h
@@ -50,11 +50,7 @@ class Transport : public XMPP::Jingle::Transport
     Connection::Ptr connection() const;
     size_t blockSize() const;
 private:
-    friend class S5BServersManager;
-
     friend class Manager;
-    static QSharedPointer<XMPP::Jingle::Transport> createOutgoing(const TransportManagerPad::Ptr &pad);
-    static QSharedPointer<XMPP::Jingle::Transport> createIncoming(const TransportManagerPad::Ptr &pad, const QDomElement &transportEl);
 
     class Private;
     QScopedPointer<Private> d;
diff --git a/src/xmpp/xmpp-im/jingle-s5b.h b/src/xmpp/xmpp-im/jingle-s5b.h
index 71f6883f..fc80ccc4 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.h
+++ b/src/xmpp/xmpp-im/jingle-s5b.h
@@ -150,11 +150,7 @@ class Transport : public XMPP::Jingle::Transport
     Connection::Ptr connection() const;
     size_t blockSize() const;
 private:
-    friend class S5BServersManager;
-
     friend class Manager;
-    static QSharedPointer<XMPP::Jingle::Transport> createOutgoing(const TransportManagerPad::Ptr &pad);
-    static QSharedPointer<XMPP::Jingle::Transport> createIncoming(const TransportManagerPad::Ptr &pad, const QDomElement &transportEl);
 
     class Private;
     QScopedPointer<Private> d;

From de24d3dc19266e890c0d7ad03cf041a17a57ab88 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 3 Jun 2019 10:55:56 +0300
Subject: [PATCH 047/383] Fixed crash on socks connection failure in jingle

---
 src/xmpp/xmpp-im/jingle-ibb.cpp | 5 +++++
 src/xmpp/xmpp-im/jingle-s5b.cpp | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ibb.cpp b/src/xmpp/xmpp-im/jingle-ibb.cpp
index dafa859c..32558593 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.cpp
+++ b/src/xmpp/xmpp-im/jingle-ibb.cpp
@@ -59,6 +59,11 @@ Transport::Transport(const TransportManagerPad::Ptr &pad, const QDomElement &tra
     d(new Private)
 {
     d->pad = pad;
+    update(transportEl);
+    if (d->sid.isEmpty()) {
+        d.reset();
+        return;
+    }
 }
 
 Transport::~Transport()
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 1739423d..caf2c86f 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -195,8 +195,10 @@ class V6LinkLocalSocksConnector : public  QObject
     SocksClient* takeClient()
     {
         auto c = client;
-        c->setParent(nullptr);
-        client = nullptr;
+        if (c) {
+            c->setParent(nullptr);
+            client = nullptr;
+        }
         return c;
     }
 

From 6731058c533c17fc8b16f888ca7f9b67faba8276 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 3 Jun 2019 11:40:52 +0300
Subject: [PATCH 048/383] close any in progress s5b connections on transport
 destroy

---
 src/xmpp/xmpp-im/jingle-s5b.cpp | 17 ++++++++++++++---
 src/xmpp/xmpp-im/jingle-s5b.h   |  1 +
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index caf2c86f..7e4e6032 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -539,9 +539,11 @@ SocksClient *Candidate::takeSocksClient()
 
 void Candidate::deleteSocksClient()
 {
-    d->socksClient->disconnect();
-    delete d->socksClient;
-    d->socksClient = nullptr;
+    if (d->socksClient) {
+        d->socksClient->disconnect();
+        delete d->socksClient;
+        d->socksClient = nullptr;
+    }
 }
 
 TcpPortServer::Ptr Candidate::server() const
@@ -1138,7 +1140,11 @@ Transport::Transport(const TransportManagerPad::Ptr &pad, const QDomElement &tra
 Transport::~Transport()
 {
     if (d) {
+        // TODO unregister sid too
         static_cast<Manager*>(d->pad->manager())->removeKeyMapping(d->directAddr);
+        for (auto &c: d->remoteCandidates) {
+            c.deleteSocksClient();
+        }
     }
 }
 
@@ -1565,6 +1571,11 @@ Jid Manager::userProxy() const
     return d->proxy;
 }
 
+void Manager::setUserProxy(const Jid &jid)
+{
+    d->proxy = jid;
+}
+
 //----------------------------------------------------------------
 // Pad
 //----------------------------------------------------------------
diff --git a/src/xmpp/xmpp-im/jingle-s5b.h b/src/xmpp/xmpp-im/jingle-s5b.h
index fc80ccc4..b6aa13af 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.h
+++ b/src/xmpp/xmpp-im/jingle-s5b.h
@@ -200,6 +200,7 @@ class Manager : public TransportManager {
      * @return
      */
     Jid userProxy() const;
+    void setUserProxy(const Jid &jid);
 
     /**
      * @brief addKeyMapping sets mapping between key/socks hostname used for direct connection and transport.

From 0d4d838b84db1e02cdfe20a96890b4a91408338b Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 3 Jun 2019 15:17:16 +0300
Subject: [PATCH 049/383] Emit updated when new s5b local servers are
 discovered

---
 src/xmpp/xmpp-im/jingle-s5b.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 7e4e6032..8e9da075 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -889,7 +889,8 @@ class Transport::Private
             // but as soon as it's taken it will switch to waitingAck.
             // And with unacknowledged local candidates we can't send used/error as well as report connected()/failure()
             // until tried them all
-            qDebug("checkAndFinishNegotiation not finished: waitingAck || pendingActions || hasUnaknowledgedLocalCandidates()");
+            qDebug("checkAndFinishNegotiation not finished: waitingAck=%d || pendingActions=%x || hasUnaknowledgedLocalCandidates()=%d",
+                   int(waitingAck), int(pendingActions), int(hasUnaknowledgedLocalCandidates()));
             return;
         }
 
@@ -1040,6 +1041,7 @@ class Transport::Private
 
     void onLocalServerDiscovered()
     {
+        bool hasNewCandidates = false;
         for (auto serv: disco->takeServers()) {
             auto s5bserv = serv.staticCast<S5BServer>();
             s5bserv->registerKey(directAddr);
@@ -1092,8 +1094,12 @@ class Transport::Private
                 });
                 localCandidates.insert(c.cid(), c);
                 pendingActions |= NewCandidate;
+                hasNewCandidates = true;
             }
         }
+        if (hasNewCandidates) {
+            emit q->updated();
+        }
     }
 
     void handleConnected(Candidate &connCand)

From f4658de77e4116591aa16346bf03c726b52c351a Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 4 Jun 2019 10:15:40 +0300
Subject: [PATCH 050/383] External Jingle manager support

Not it's possible to have more thn one jingle manager where the first one will ignore
sessions dedicated for other managers
---
 src/xmpp/xmpp-im/jingle-ibb.cpp | 30 ++++++++++++++++++++++---
 src/xmpp/xmpp-im/jingle.cpp     | 39 ++++++++++++++++++++++++++++++++-
 src/xmpp/xmpp-im/jingle.h       |  5 +++++
 3 files changed, 70 insertions(+), 4 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ibb.cpp b/src/xmpp/xmpp-im/jingle-ibb.cpp
index 32558593..0045f3c8 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.cpp
+++ b/src/xmpp/xmpp-im/jingle-ibb.cpp
@@ -19,6 +19,7 @@
 
 #include "jingle-ibb.h"
 #include "xmpp/jid/jid.h"
+#include "xmpp_client.h"
 
 namespace XMPP {
 namespace Jingle {
@@ -39,6 +40,11 @@ class Connection : public XMPP::Jingle::Connection
     {
 
     }
+
+    void open()
+    {
+        // TODO
+    }
 };
 
 struct Transport::Private
@@ -47,6 +53,7 @@ struct Transport::Private
     QString sid;
     QSharedPointer<Connection> connection;
     size_t blockSize = 4096;
+    bool waitingAck = false;
 };
 
 Transport::Transport(const TransportManagerPad::Ptr &pad) :
@@ -95,16 +102,32 @@ bool Transport::update(const QDomElement &transportEl)
             d->blockSize = bsn;
         }
     }
+    return true;
 }
 
 bool Transport::hasUpdates() const
 {
-
+    return !d->connection;
 }
 
 OutgoingTransportInfoUpdate Transport::takeOutgoingUpdate()
 {
+    OutgoingTransportInfoUpdate upd;
+    if (!isValid()) {
+        return upd;
+    }
 
+    auto doc = d->pad->session()->manager()->client()->doc();
+
+    QDomElement tel = doc->createElementNS(NS, "transport");
+    tel.setAttribute(QStringLiteral("sid"), d->sid);
+    tel.setAttribute(QString::fromLatin1("block-size"), qulonglong(d->blockSize));
+
+    d->connection.reset(new Connection(d->pad->session()->peer(), d->sid, d->blockSize));
+    upd = OutgoingTransportInfoUpdate{tel, [this]() mutable {
+        d->connection->open();
+    }};
+    return upd;
 }
 
 bool Transport::isValid() const
@@ -134,7 +157,8 @@ size_t Transport::blockSize() const
 
 Pad::Pad(Manager *manager, Session *session)
 {
-
+    _manager = manager;
+    _session = session;
 }
 
 QString Pad::ns() const
@@ -159,7 +183,7 @@ QString Pad::generateSid() const
 
 void Pad::registerSid(const QString &sid)
 {
-
+    Q_UNUSED(sid);
 }
 
 } // namespace IBB
diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index e5ba24f1..56000fc9 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -431,11 +431,14 @@ TransportManager::TransportManager(QObject *parent) :
 }
 
 //----------------------------------------------------------------------------
-// JT - Jingle Task
+// JTPush - Jingle Task
 //----------------------------------------------------------------------------
 class JTPush : public Task
 {
     Q_OBJECT
+
+    QList<QString> externalManagers;
+    QList<QString> externalSessions;
 public:
     JTPush(Task *parent) :
         Task(parent)
@@ -445,6 +448,10 @@ class JTPush : public Task
 
     ~JTPush(){}
 
+    inline void addExternalManager(const QString &ns) { externalManagers.append(ns); }
+    inline void forgetExternalSession(const QString &sid) { externalSessions.removeOne(sid); }
+
+
     bool take(const QDomElement &iq)
     {
         if (iq.tagName() != QLatin1String("iq") || iq.attribute(QLatin1String("type")) != QLatin1String("set")) {
@@ -454,12 +461,32 @@ class JTPush : public Task
         if (jingleEl.isNull() || jingleEl.attribute(QStringLiteral("xmlns")) != ::XMPP::Jingle::NS) {
             return false;
         }
+
         Jingle jingle(jingleEl);
         if (!jingle.isValid()) {
             respondError(iq, Stanza::Error::Cancel, Stanza::Error::BadRequest);
             return true;
         }
 
+        if (externalManagers.size()) {
+            if (jingle.action() == Action::SessionInitiate) {
+                auto cname = QString::fromLatin1("content");
+                auto dname = QString::fromLatin1("description");
+                for (auto n = jingleEl.firstChildElement(cname); !n.isNull(); n = n.nextSiblingElement(cname)) {
+                    auto del = n.firstChildElement(dname);
+                    if (!del.isNull() && externalManagers.contains(del.attribute(QStringLiteral("xmlns")))) {
+                        externalSessions.append(jingle.sid());
+                        return false;
+                    }
+                }
+            } else if (externalSessions.contains(jingle.sid())) {
+                if (jingle.action() == Action::SessionTerminate) {
+                    externalSessions.removeOne(jingle.sid());
+                }
+                return false;
+            }
+        }
+
         QString fromStr(iq.attribute(QStringLiteral("from")));
         Jid from(fromStr);
         if (jingle.action() == Action::SessionInitiate) {
@@ -1542,6 +1569,16 @@ Client *Manager::client() const
     return d->client;
 }
 
+void Manager::addExternalManager(const QString &ns)
+{
+    d->pushTask->addExternalManager(ns);
+}
+
+void Manager::forgetExternalSession(const QString &sid)
+{
+    d->pushTask->forgetExternalSession(sid);
+}
+
 void Manager::setRedirection(const Jid &to)
 {
     d->redirectionJid = to;
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index b9458f08..cccfd145 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -513,6 +513,11 @@ class Manager : public QObject
 
     XMPP::Client* client() const;
 
+    // if we have another jingle manager we can add its contents' namespaces here.
+    void addExternalManager(const QString &ns);
+    // on outgoing session destroy an external manager should call this function.
+    void forgetExternalSession(const QString &sid);
+
     void setRedirection(const Jid &to);
     const Jid &redirectionJid() const;
 

From 5ba75fbaf4ed8503708982fa0cc900b0e067559b Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 4 Jun 2019 19:41:22 +0300
Subject: [PATCH 051/383] Jingle IBB in progress

---
 src/xmpp/xmpp-im/jingle-ibb.cpp | 167 ++++++++++++++++++++++++++------
 src/xmpp/xmpp-im/jingle-ibb.h   |   7 +-
 2 files changed, 139 insertions(+), 35 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ibb.cpp b/src/xmpp/xmpp-im/jingle-ibb.cpp
index 0045f3c8..73418726 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.cpp
+++ b/src/xmpp/xmpp-im/jingle-ibb.cpp
@@ -28,11 +28,14 @@ namespace IBB {
 class Connection : public XMPP::Jingle::Connection
 {
     Q_OBJECT
-
+public:
     Jid peer;
     QString sid;
     size_t blockSize;
-public:
+
+    bool offerSent = false;
+    bool offerReceived = false;
+
     Connection(const Jid &jid, const QString &sid, size_t blockSize) :
         peer(jid),
         sid(sid),
@@ -41,7 +44,7 @@ class Connection : public XMPP::Jingle::Connection
 
     }
 
-    void open()
+    void checkAndStartConnection()
     {
         // TODO
     }
@@ -49,25 +52,34 @@ class Connection : public XMPP::Jingle::Connection
 
 struct Transport::Private
 {
-    TransportManagerPad::Ptr pad;
-    QString sid;
-    QSharedPointer<Connection> connection;
-    size_t blockSize = 4096;
-    bool waitingAck = false;
+    Transport *q = nullptr;
+    Pad::Ptr pad;
+    QMap<QString,QSharedPointer<Connection>> connections;
+    QList<QSharedPointer<Connection>> readyConnections;
+    size_t defaultBlockSize = 4096;
+    bool started = false;
+
+    QSharedPointer<Connection> makeConnection(const Jid &jid, const QString &sid, size_t blockSize)
+    {
+        // TODO connect some signals
+        return QSharedPointer<Connection>::create(jid, sid, blockSize);
+    }
 };
 
 Transport::Transport(const TransportManagerPad::Ptr &pad) :
     d(new Private)
 {
-    d->pad = pad;
+    d->q = this;
+    d->pad = pad.staticCast<Pad>();
 }
 
 Transport::Transport(const TransportManagerPad::Ptr &pad, const QDomElement &transportEl) :
     d(new Private)
 {
-    d->pad = pad;
+    d->q = this;
+    d->pad = pad.staticCast<Pad>();
     update(transportEl);
-    if (d->sid.isEmpty()) {
+    if (d->connections.isEmpty()) {
         d.reset();
         return;
     }
@@ -85,29 +97,66 @@ TransportManagerPad::Ptr Transport::pad() const
 
 void Transport::prepare()
 {
+    if (d->connections.isEmpty()) { // seems like outgoing
+        QString sid = d->pad->generateSid();
+        auto conn = d->makeConnection(d->pad->session()->peer(), sid, d->defaultBlockSize);
+        d->connections.insert(sid, conn);
+    }
     emit updated();
 }
 
 void Transport::start()
 {
-    d->connection.reset(new Connection(d->pad->session()->peer(), d->sid, d->blockSize));
+    d->started = true;
+
+    for (auto &c: d->connections) {
+        c->checkAndStartConnection();
+    }
 }
 
 bool Transport::update(const QDomElement &transportEl)
 {
+    QString sid = transportEl.attribute(QString::fromLatin1("sid"));
+    if (sid.isEmpty()) {
+        return false;
+    }
+
+    size_t bs_final = d->defaultBlockSize;
     auto bs = transportEl.attribute(QString::fromLatin1("block-size"));
     if (!bs.isEmpty()) {
         size_t bsn = bs.toULongLong();
-        if (bsn && bsn <= d->blockSize) {
-            d->blockSize = bsn;
+        if (bsn && bsn <= bs_final) {
+            bs_final = bsn;
         }
     }
+
+    auto it = d->connections.find(sid);
+    if (it == d->connections.end()) {
+        if (!d->pad->registerSid(sid)) {
+            return false; // TODO we need last error somewhere
+        }
+        it = d->connections.insert(sid, d->makeConnection(d->pad->session()->peer(), sid, bs_final));
+    } else {
+        if (bs_final < (*it)->blockSize) {
+            (*it)->blockSize = bs_final;
+        }
+    }
+
+    (*it)->offerReceived = true;
+    if (d->started) {
+        (*it)->checkAndStartConnection();
+    }
     return true;
 }
 
 bool Transport::hasUpdates() const
 {
-    return !d->connection;
+    for (auto &c: d->connections) {
+        if (!c->offerSent) {
+            return true;
+        }
+    }
+    return false;
 }
 
 OutgoingTransportInfoUpdate Transport::takeOutgoingUpdate()
@@ -117,16 +166,29 @@ OutgoingTransportInfoUpdate Transport::takeOutgoingUpdate()
         return upd;
     }
 
+    QSharedPointer<Connection> connection;
+    for (auto &c: d->connections) {
+        if (!c->offerSent) {
+            connection = c;
+            break;
+        }
+    }
+    if (!connection) {
+        return upd;
+    }
+
     auto doc = d->pad->session()->manager()->client()->doc();
 
     QDomElement tel = doc->createElementNS(NS, "transport");
-    tel.setAttribute(QStringLiteral("sid"), d->sid);
-    tel.setAttribute(QString::fromLatin1("block-size"), qulonglong(d->blockSize));
+    tel.setAttribute(QStringLiteral("sid"), connection->sid);
+    tel.setAttribute(QString::fromLatin1("block-size"), qulonglong(connection->blockSize));
 
-    d->connection.reset(new Connection(d->pad->session()->peer(), d->sid, d->blockSize));
-    upd = OutgoingTransportInfoUpdate{tel, [this]() mutable {
-        d->connection->open();
+    upd = OutgoingTransportInfoUpdate{tel, [this, connection]() mutable {
+        if (d->started)
+            connection->checkAndStartConnection();
     }};
+
+    connection->offerSent = true;
     return upd;
 }
 
@@ -140,19 +202,14 @@ Transport::Features Transport::features() const
     return AlwaysConnect | Reliable | Slow;
 }
 
-QString Transport::sid() const
-{
-    return d->sid;
-}
-
 Connection::Ptr Transport::connection() const
 {
-    return d->connection.staticCast<XMPP::Jingle::Connection>();
+    return d->readyConnections.takeLast();
 }
 
 size_t Transport::blockSize() const
 {
-    return d->blockSize;
+    return d->defaultBlockSize;
 }
 
 Pad::Pad(Manager *manager, Session *session)
@@ -168,22 +225,68 @@ QString Pad::ns() const
 
 Session *Pad::session() const
 {
-    return nullptr;
+    return _session;
 }
 
 TransportManager *Pad::manager() const
 {
-    return nullptr;
+    return _manager;
 }
 
 QString Pad::generateSid() const
 {
-    return QString();
+    return _manager->generateSid(_session->peer());
+}
+
+bool Pad::registerSid(const QString &sid)
+{
+    return _manager->registerSid(_session->peer(), sid);
+}
+
+void Pad::forgetSid(const QString &sid)
+{
+    _manager->forgetSid(_session->peer(), sid);
+}
+
+struct Manager::Private
+{
+    QSet<QPair<Jid,QString>> sids;
+};
+
+Manager::Manager(QObject *parent) :
+    TransportManager(parent),
+    d(new Private)
+{
+
+}
+
+QString Manager::generateSid(const Jid &remote)
+{
+    QString sid;
+    QPair<Jid,QString> key;
+    do {
+        sid = QString("ibb_%1").arg(qrand() & 0xffff, 4, 16, QChar('0'));
+        key = qMakePair(remote, sid);
+    } while (d->sids.contains(key));
+
+    d->sids.insert(key);
+    return sid;
+}
+
+bool Manager::registerSid(const Jid &remote, const QString &sid)
+{
+    QPair<Jid,QString> key = qMakePair(remote, sid);
+    if (d->sids.contains(key)) {
+        return false;
+    }
+    d->sids.insert(key);
+    return true;
 }
 
-void Pad::registerSid(const QString &sid)
+void Manager::forgetSid(const Jid &remote, const QString &sid)
 {
-    Q_UNUSED(sid);
+    QPair<Jid,QString> key = qMakePair(remote, sid);
+    d->sids.remove(key);
 }
 
 } // namespace IBB
diff --git a/src/xmpp/xmpp-im/jingle-ibb.h b/src/xmpp/xmpp-im/jingle-ibb.h
index 5ede921d..5746ffff 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.h
+++ b/src/xmpp/xmpp-im/jingle-ibb.h
@@ -46,7 +46,6 @@ class Transport : public XMPP::Jingle::Transport
     bool isValid() const override;
     Features features() const override;
 
-    QString sid() const;
     Connection::Ptr connection() const;
     size_t blockSize() const;
 private:
@@ -70,7 +69,8 @@ class Pad : public TransportManagerPad
     TransportManager *manager() const override;
 
     QString generateSid() const;
-    void registerSid(const QString &sid);
+    bool registerSid(const QString &sid);
+    void forgetSid(const QString &sid);
 private:
     Manager *_manager;
     Session *_session;
@@ -91,7 +91,8 @@ class Manager : public TransportManager {
     void closeAll() override;
 
     QString generateSid(const Jid &remote);
-    void registerSid(const Jid &remote, const QString &sid);
+    bool registerSid(const Jid &remote, const QString &sid);
+    void forgetSid(const Jid &remote, const QString &sid);
 private:
     class Private;
     QScopedPointer<Private> d;

From b403d635ec06a00738facbfd99034e57ca767a60 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 5 Jun 2019 08:19:12 +0300
Subject: [PATCH 052/383] Jingle IBB in progress

---
 src/xmpp/xmpp-im/jingle-ibb.cpp | 13 ++++++++++---
 src/xmpp/xmpp-im/xmpp_ibb.cpp   | 16 ++++++++++------
 src/xmpp/xmpp-im/xmpp_ibb.h     |  5 ++++-
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ibb.cpp b/src/xmpp/xmpp-im/jingle-ibb.cpp
index 73418726..8e4753d4 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.cpp
+++ b/src/xmpp/xmpp-im/jingle-ibb.cpp
@@ -20,6 +20,7 @@
 #include "jingle-ibb.h"
 #include "xmpp/jid/jid.h"
 #include "xmpp_client.h"
+#include "xmpp_ibb.h"
 
 namespace XMPP {
 namespace Jingle {
@@ -29,14 +30,17 @@ class Connection : public XMPP::Jingle::Connection
 {
     Q_OBJECT
 public:
+    Client *client;
     Jid peer;
     QString sid;
     size_t blockSize;
+    BSConnection *connection = nullptr;
 
     bool offerSent = false;
     bool offerReceived = false;
 
-    Connection(const Jid &jid, const QString &sid, size_t blockSize) :
+    Connection(Client *client, const Jid &jid, const QString &sid, size_t blockSize) :
+        client(client),
         peer(jid),
         sid(sid),
         blockSize(blockSize)
@@ -46,7 +50,10 @@ class Connection : public XMPP::Jingle::Connection
 
     void checkAndStartConnection()
     {
-        // TODO
+        if (offerReceived && offerSent) {
+            connection = client->ibbManager()->createConnection();
+            //connection->setP
+        }
     }
 };
 
@@ -62,7 +69,7 @@ struct Transport::Private
     QSharedPointer<Connection> makeConnection(const Jid &jid, const QString &sid, size_t blockSize)
     {
         // TODO connect some signals
-        return QSharedPointer<Connection>::create(jid, sid, blockSize);
+        return QSharedPointer<Connection>::create(pad->session()->manager()->client(), jid, sid, blockSize);
     }
 };
 
diff --git a/src/xmpp/xmpp-im/xmpp_ibb.cpp b/src/xmpp/xmpp-im/xmpp_ibb.cpp
index cf37f7f2..482781d4 100644
--- a/src/xmpp/xmpp-im/xmpp_ibb.cpp
+++ b/src/xmpp/xmpp-im/xmpp_ibb.cpp
@@ -25,7 +25,6 @@
 
 #include <stdlib.h>
 
-#define IBB_PACKET_SIZE   4096
 #define IBB_PACKET_DELAY  0
 
 using namespace XMPP;
@@ -51,7 +50,7 @@ class IBBConnection::Private
     QString iq_id;
     QString stanza;
 
-    int blockSize = 0;
+    int blockSize = IBBConnection::PacketSize;
     //QByteArray recvBuf, sendBuf;
     bool closePending, closing;
 
@@ -64,7 +63,7 @@ IBBConnection::IBBConnection(IBBManager *m)
     d = new Private;
     d->m = m;
     d->j = 0;
-    d->blockSize = IBB_PACKET_SIZE;
+    d->blockSize = PacketSize;
     resetConnection();
 
     ++num_conn;
@@ -104,6 +103,11 @@ IBBConnection::~IBBConnection()
     delete d;
 }
 
+void IBBConnection::setPacketSize(int blockSize)
+{
+    d->blockSize = blockSize;
+}
+
 void IBBConnection::connectToJid(const Jid &peer, const QString &sid)
 {
     close();
@@ -119,7 +123,7 @@ void IBBConnection::connectToJid(const Jid &peer, const QString &sid)
 
     d->j = new JT_IBB(d->m->client()->rootTask());
     connect(d->j, SIGNAL(finished()), SLOT(ibb_finished()));
-    d->j->request(d->peer, d->sid);
+    d->j->request(d->peer, d->sid, d->blockSize);
     d->j->go(true);
 }
 
@@ -519,7 +523,7 @@ JT_IBB::~JT_IBB()
     delete d;
 }
 
-void JT_IBB::request(const Jid &to, const QString &sid)
+void JT_IBB::request(const Jid &to, const QString &sid, int blockSize)
 {
     d->mode = ModeRequest;
     QDomElement iq;
@@ -529,7 +533,7 @@ void JT_IBB::request(const Jid &to, const QString &sid)
     //genUniqueKey
     query.setAttribute("xmlns", IBB_NS);
     query.setAttribute("sid", sid);
-    query.setAttribute("block-size", IBB_PACKET_SIZE);
+    query.setAttribute("block-size", blockSize);
     query.setAttribute("stanza", "iq");
     iq.appendChild(query);
     d->iq = iq;
diff --git a/src/xmpp/xmpp-im/xmpp_ibb.h b/src/xmpp/xmpp-im/xmpp_ibb.h
index 0b70723d..8784a4f6 100644
--- a/src/xmpp/xmpp-im/xmpp_ibb.h
+++ b/src/xmpp/xmpp-im/xmpp_ibb.h
@@ -57,11 +57,14 @@ namespace XMPP
     {
         Q_OBJECT
     public:
+        static const int PacketSize = 4096;
+
         enum { ErrRequest, ErrData };
         enum { Idle, Requesting, WaitingForAccept, Active };
         IBBConnection(IBBManager *);
         ~IBBConnection();
 
+        void setPacketSize(int blockSize = IBBConnection::PacketSize);
         void connectToJid(const Jid &peer, const QString &sid);
         void accept();
         void close();
@@ -147,7 +150,7 @@ namespace XMPP
         JT_IBB(Task *, bool serve=false);
         ~JT_IBB();
 
-        void request(const Jid &, const QString &sid);
+        void request(const Jid &, const QString &sid, int blockSize = IBBConnection::PacketSize);
         void sendData(const Jid &, const IBBData &ibbData);
         void close(const Jid &, const QString &sid);
         void respondError(const Jid &, const QString &id,

From 7af0fdf477729cef9fbf8dd561e4d1de31eaaf97 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 9 Jun 2019 00:48:35 +0300
Subject: [PATCH 053/383] jingle-ibb almost finished

---
 src/xmpp/xmpp-im/client.cpp     |  17 ++-
 src/xmpp/xmpp-im/jingle-ibb.cpp | 247 +++++++++++++++++++++++++-------
 src/xmpp/xmpp-im/jingle-ibb.h   |  11 +-
 src/xmpp/xmpp-im/xmpp_client.h  |   4 +
 src/xmpp/xmpp-im/xmpp_ibb.cpp   |   2 +-
 5 files changed, 224 insertions(+), 57 deletions(-)

diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
index 7396bac5..a95164a2 100644
--- a/src/xmpp/xmpp-im/client.cpp
+++ b/src/xmpp/xmpp-im/client.cpp
@@ -88,6 +88,7 @@
 #include "jingle-ft.h"
 #include "jingle-s5b.h"
 #include "tcpportreserver.h"
+#include "jingle-ibb.h"
 
 #ifdef Q_OS_WIN
 #define vsnprintf _vsnprintf
@@ -136,6 +137,7 @@ class Client::ClientPrivate
     TcpPortReserver *tcpPortReserver = nullptr;
     S5BManager *s5bman = nullptr;
     Jingle::S5B::Manager *jingleS5BManager = nullptr;
+    Jingle::IBB::Manager *jingleIBBManager = nullptr;
     IBBManager *ibbman = nullptr;
     BoBManager *bobman = nullptr;
     FileTransferManager *ftman = nullptr;
@@ -177,7 +179,9 @@ Client::Client(QObject *par)
     auto ft = new Jingle::FileTransfer::Manager(this);
     d->jingleManager->registerApp(Jingle::FileTransfer::NS, ft);
     d->jingleS5BManager = new Jingle::S5B::Manager(d->jingleManager);
+    d->jingleIBBManager = new Jingle::IBB::Manager(d->jingleManager);
     d->jingleManager->registerTransport(Jingle::S5B::NS, d->jingleS5BManager);
+    d->jingleManager->registerTransport(Jingle::IBB::NS, d->jingleIBBManager);
 }
 
 Client::~Client()
@@ -278,6 +282,11 @@ Jingle::S5B::Manager *Client::jingleS5BManager() const
     return d->jingleS5BManager;
 }
 
+Jingle::IBB::Manager *Client::jingleIBBManager() const
+{
+    return d->jingleIBBManager;
+}
+
 IBBManager *Client::ibbManager() const
 {
     return d->ibbman;
@@ -1318,7 +1327,13 @@ void Client::s5b_incomingReady()
 
 void Client::ibb_incomingReady()
 {
-    handleIncoming(d->ibbman->takeIncoming());
+    auto c = d->ibbman->takeIncoming();
+    if (!c)
+        return;
+
+    if (d->jingleIBBManager && d->jingleIBBManager->handleIncoming(c))
+        return;
+    handleIncoming(c);
 }
 
 void Client::handleIncoming(BSConnection *c)
diff --git a/src/xmpp/xmpp-im/jingle-ibb.cpp b/src/xmpp/xmpp-im/jingle-ibb.cpp
index 8e4753d4..4579d157 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.cpp
+++ b/src/xmpp/xmpp-im/jingle-ibb.cpp
@@ -22,22 +22,28 @@
 #include "xmpp_client.h"
 #include "xmpp_ibb.h"
 
+#include <QTimer>
+
 namespace XMPP {
 namespace Jingle {
 namespace IBB {
 
+const QString NS(QStringLiteral("urn:xmpp:jingle:transports:ibb:1"));
+
 class Connection : public XMPP::Jingle::Connection
 {
     Q_OBJECT
+
 public:
     Client *client;
     Jid peer;
     QString sid;
     size_t blockSize;
-    BSConnection *connection = nullptr;
+    IBBConnection *connection = nullptr;
 
     bool offerSent = false;
     bool offerReceived = false;
+    bool closing = false;
 
     Connection(Client *client, const Jid &jid, const QString &sid, size_t blockSize) :
         client(client),
@@ -48,12 +54,74 @@ class Connection : public XMPP::Jingle::Connection
 
     }
 
-    void checkAndStartConnection()
+    void setConnection(IBBConnection *c)
+    {
+        connection = c;
+        connect(c, &IBBConnection::readyRead, this, &Connection::readyRead);
+        connect(c, &IBBConnection::bytesWritten, this, &Connection::bytesWritten);
+        connect(c, &IBBConnection::connectionClosed, this, &Connection::handleIBBClosed);
+        connect(c, &IBBConnection::delayedCloseFinished, this, &Connection::handleIBBClosed);
+        connect(c, &IBBConnection::aboutToClose, this, &Connection::aboutToClose);
+        connect(c, &IBBConnection::connected, this, [this](){ setOpenMode(connection->openMode()); emit connected(); });
+    }
+
+    qint64 bytesAvailable() const
+    {
+        return XMPP::Jingle::Connection::bytesAvailable() + (connection? connection->bytesAvailable() : 0);
+    }
+
+    qint64 bytesToWrite() const
+    {
+        return XMPP::Jingle::Connection::bytesToWrite() + (connection? connection->bytesToWrite() : 0);
+    }
+
+    void close()
+    {
+        if (connection) {
+            connection->close();
+            setOpenMode(connection->openMode());
+        } else {
+            XMPP::Jingle::Connection::close();
+            emit connectionClosed();
+        }
+    }
+
+signals:
+    void connected();
+
+protected:
+    qint64 writeData(const char *data, qint64 maxSize)
+    {
+        return connection->write(data, maxSize);
+    }
+
+    qint64 readData(char *data, qint64 maxSize)
     {
-        if (offerReceived && offerSent) {
-            connection = client->ibbManager()->createConnection();
-            //connection->setP
+        quint64 ret = connection->read(data, maxSize);
+        if (closing && !bytesAvailable()) {
+            postCloseAllDataRead();
         }
+        return ret;
+    }
+
+private:
+
+    void handleIBBClosed()
+    {
+        closing = true;
+        if (bytesAvailable())
+            setOpenMode(QIODevice::ReadOnly);
+        else
+            postCloseAllDataRead();
+        emit connectionClosed();
+    }
+
+    void postCloseAllDataRead()
+    {
+        closing = false;
+        connection->deleteLater();
+        connection = nullptr;
+        setOpenMode(QIODevice::NotOpen);
     }
 };
 
@@ -66,10 +134,23 @@ struct Transport::Private
     size_t defaultBlockSize = 4096;
     bool started = false;
 
-    QSharedPointer<Connection> makeConnection(const Jid &jid, const QString &sid, size_t blockSize)
+    void checkAndStartConnection(QSharedPointer<Connection> &c)
+    {
+        if (!c->connection && c->offerReceived && c->offerSent && pad->session()->role() == Origin::Initiator) {
+            auto con = pad->session()->manager()->client()->ibbManager()->createConnection();
+            auto ibbcon = static_cast<IBBConnection*>(con);
+            ibbcon->setPacketSize(defaultBlockSize);
+            c->setConnection(ibbcon);
+            ibbcon->connectToJid(pad->session()->peer(), c->sid);
+        }
+    }
+
+    void handleConnected(const QSharedPointer<Connection> &c)
     {
-        // TODO connect some signals
-        return QSharedPointer<Connection>::create(pad->session()->manager()->client(), jid, sid, blockSize);
+        if (c) {
+            readyConnections.append(c);
+            emit q->connected();
+        }
     }
 };
 
@@ -78,6 +159,13 @@ Transport::Transport(const TransportManagerPad::Ptr &pad) :
 {
     d->q = this;
     d->pad = pad.staticCast<Pad>();
+    connect(pad->manager(), &TransportManager::abortAllRequested, this, [this](){
+        for(auto &c: d->connections) {
+            c->close();
+        }
+        //d->aborted = true;
+        emit failed();
+    });
 }
 
 Transport::Transport(const TransportManagerPad::Ptr &pad, const QDomElement &transportEl) :
@@ -105,9 +193,26 @@ TransportManagerPad::Ptr Transport::pad() const
 void Transport::prepare()
 {
     if (d->connections.isEmpty()) { // seems like outgoing
-        QString sid = d->pad->generateSid();
-        auto conn = d->makeConnection(d->pad->session()->peer(), sid, d->defaultBlockSize);
-        d->connections.insert(sid, conn);
+        auto conn = d->pad->makeConnection(QString(), d->defaultBlockSize);
+        auto ibbConn = conn.staticCast<Connection>();
+        connect(ibbConn.data(), &Connection::connected, this, [this](){
+            auto c = static_cast<Connection*>(sender());
+            d->handleConnected(d->connections.value(c->sid));
+        });
+        d->connections.insert(ibbConn->sid, ibbConn);
+
+        connect(ibbConn.data(), &Connection::connectionClosed, this, [this](){
+            Connection *c = static_cast<Connection*>(sender());
+            d->connections.remove(c->sid);
+            QMutableListIterator<QSharedPointer<Connection>> it(d->readyConnections);
+            while (it.hasNext()) {
+                auto &p = it.next();
+                if (p.data() == c) {
+                    it.remove();
+                    break;
+                }
+            }
+        });
     }
     emit updated();
 }
@@ -117,7 +222,7 @@ void Transport::start()
     d->started = true;
 
     for (auto &c: d->connections) {
-        c->checkAndStartConnection();
+        d->checkAndStartConnection(c);
     }
 }
 
@@ -139,10 +244,15 @@ bool Transport::update(const QDomElement &transportEl)
 
     auto it = d->connections.find(sid);
     if (it == d->connections.end()) {
-        if (!d->pad->registerSid(sid)) {
-            return false; // TODO we need last error somewhere
+        auto c = d->pad->makeConnection(sid, bs_final);
+        if (c) {
+            auto ibbc = c.staticCast<Connection>();
+            it = d->connections.insert(ibbc->sid, ibbc);
+            connect(ibbc.data(), &Connection::connected, this, [this](){
+                auto c = static_cast<Connection*>(sender());
+                d->handleConnected(d->connections.value(c->sid));
+            });
         }
-        it = d->connections.insert(sid, d->makeConnection(d->pad->session()->peer(), sid, bs_final));
     } else {
         if (bs_final < (*it)->blockSize) {
             (*it)->blockSize = bs_final;
@@ -151,7 +261,7 @@ bool Transport::update(const QDomElement &transportEl)
 
     (*it)->offerReceived = true;
     if (d->started) {
-        (*it)->checkAndStartConnection();
+        d->checkAndStartConnection(it.value());
     }
     return true;
 }
@@ -192,7 +302,7 @@ OutgoingTransportInfoUpdate Transport::takeOutgoingUpdate()
 
     upd = OutgoingTransportInfoUpdate{tel, [this, connection]() mutable {
         if (d->started)
-            connection->checkAndStartConnection();
+            d->checkAndStartConnection(connection);
     }};
 
     connection->offerSent = true;
@@ -211,7 +321,7 @@ Transport::Features Transport::features() const
 
 Connection::Ptr Transport::connection() const
 {
-    return d->readyConnections.takeLast();
+    return d->readyConnections.isEmpty()? Connection::Ptr() : d->readyConnections.takeFirst().staticCast<XMPP::Jingle::Connection>();
 }
 
 size_t Transport::blockSize() const
@@ -240,62 +350,101 @@ TransportManager *Pad::manager() const
     return _manager;
 }
 
-QString Pad::generateSid() const
+Connection::Ptr Pad::makeConnection(const QString &sid, size_t blockSize)
 {
-    return _manager->generateSid(_session->peer());
+    return _manager->makeConnection(_session->peer(), sid, blockSize);
 }
 
-bool Pad::registerSid(const QString &sid)
+struct Manager::Private
+{
+    QHash<QPair<Jid,QString>,QSharedPointer<Connection>> connections;
+    XMPP::Jingle::Manager *jingleManager = nullptr;
+};
+
+Manager::Manager(QObject *parent) :
+    TransportManager(parent),
+    d(new Private)
 {
-    return _manager->registerSid(_session->peer(), sid);
+
 }
 
-void Pad::forgetSid(const QString &sid)
+Manager::~Manager()
 {
-    _manager->forgetSid(_session->peer(), sid);
+
 }
 
-struct Manager::Private
+Transport::Features Manager::features() const
 {
-    QSet<QPair<Jid,QString>> sids;
-};
+    return Transport::AlwaysConnect | Transport::Reliable | Transport::Slow;
+}
 
-Manager::Manager(QObject *parent) :
-    TransportManager(parent),
-    d(new Private)
+void Manager::setJingleManager(XMPP::Jingle::Manager *jm)
 {
+    d->jingleManager = jm;
+}
 
+QSharedPointer<XMPP::Jingle::Transport> Manager::newTransport(const TransportManagerPad::Ptr &pad)
+{
+    return QSharedPointer<XMPP::Jingle::Transport>(new Transport(pad));
 }
 
-QString Manager::generateSid(const Jid &remote)
+QSharedPointer<XMPP::Jingle::Transport> Manager::newTransport(const TransportManagerPad::Ptr &pad, const QDomElement &transportEl)
 {
-    QString sid;
-    QPair<Jid,QString> key;
-    do {
-        sid = QString("ibb_%1").arg(qrand() & 0xffff, 4, 16, QChar('0'));
-        key = qMakePair(remote, sid);
-    } while (d->sids.contains(key));
-
-    d->sids.insert(key);
-    return sid;
+    auto t = new Transport(pad, transportEl);
+    QSharedPointer<XMPP::Jingle::Transport> ret(t);
+    if (t->isValid()) {
+        return ret;
+    }
+    return QSharedPointer<XMPP::Jingle::Transport>();
 }
 
-bool Manager::registerSid(const Jid &remote, const QString &sid)
+TransportManagerPad* Manager::pad(Session *session)
 {
-    QPair<Jid,QString> key = qMakePair(remote, sid);
-    if (d->sids.contains(key)) {
-        return false;
+    return new Pad(this, session);
+}
+
+void Manager::closeAll()
+{
+    emit abortAllRequested();
+}
+
+XMPP::Jingle::Connection::Ptr Manager::makeConnection(const Jid &peer, const QString &sid, size_t blockSize)
+{
+    if (!sid.isEmpty() && d->connections.contains(qMakePair(peer, sid))) {
+        qWarning("sid %s was already registered for %s", qPrintable(sid), qPrintable(peer.full()));
+        return Connection::Ptr();
     }
-    d->sids.insert(key);
-    return true;
+    QString s(sid);
+    if (s.isEmpty()) {
+        QPair<Jid,QString> key;
+        do {
+            s = QString("ibb_%1").arg(qrand() & 0xffff, 4, 16, QChar('0'));
+            key = qMakePair(peer, s);
+        } while (d->connections.contains(key));
+    }
+    auto conn = QSharedPointer<Connection>::create(d->jingleManager->client(), peer, sid, blockSize);
+    d->connections.insert(qMakePair(peer, sid), conn);
+    connect(conn.data(), &Connection::connectionClosed, this, [this](){
+        Connection *c = static_cast<Connection*>(sender());
+        d->connections.remove(qMakePair(c->peer, c->sid));
+    });
+
+    return conn.staticCast<XMPP::Jingle::Connection>();
 }
 
-void Manager::forgetSid(const Jid &remote, const QString &sid)
+bool Manager::handleIncoming(IBBConnection *c)
 {
-    QPair<Jid,QString> key = qMakePair(remote, sid);
-    d->sids.remove(key);
+    auto conn = d->connections.value(qMakePair(c->peer(), c->sid()));
+    if (conn) {
+        conn->setConnection(c);
+        QTimer::singleShot(0, c, &IBBConnection::accept);
+        return true;
+    }
+    return false;
 }
 
 } // namespace IBB
 } // namespace Jingle
 } // namespace XMPP
+
+#include "jingle-ibb.moc"
diff --git a/src/xmpp/xmpp-im/jingle-ibb.h b/src/xmpp/xmpp-im/jingle-ibb.h
index 5746ffff..95ad5ef1 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.h
+++ b/src/xmpp/xmpp-im/jingle-ibb.h
@@ -23,6 +23,8 @@
 #include "jingle.h"
 
 namespace XMPP {
+    class IBBConnection;
+
 namespace Jingle {
 namespace IBB {
 
@@ -68,9 +70,7 @@ class Pad : public TransportManagerPad
     Session *session() const override;
     TransportManager *manager() const override;
 
-    QString generateSid() const;
-    bool registerSid(const QString &sid);
-    void forgetSid(const QString &sid);
+    Connection::Ptr makeConnection(const QString &sid, size_t blockSize);
 private:
     Manager *_manager;
     Session *_session;
@@ -90,9 +90,8 @@ class Manager : public TransportManager {
 
     void closeAll() override;
 
-    QString generateSid(const Jid &remote);
-    bool registerSid(const Jid &remote, const QString &sid);
-    void forgetSid(const Jid &remote, const QString &sid);
+    Connection::Ptr makeConnection(const Jid &peer, const QString &sid, size_t blockSize);
+    bool handleIncoming(IBBConnection *c);
 private:
     class Private;
     QScopedPointer<Private> d;
diff --git a/src/xmpp/xmpp-im/xmpp_client.h b/src/xmpp/xmpp-im/xmpp_client.h
index 695b6a96..b250bf59 100644
--- a/src/xmpp/xmpp-im/xmpp_client.h
+++ b/src/xmpp/xmpp-im/xmpp_client.h
@@ -60,6 +60,9 @@ namespace XMPP {
         namespace S5B {
             class Manager;
         }
+        namespace IBB {
+            class Manager;
+        }
     }
 }
 
@@ -145,6 +148,7 @@ namespace XMPP
         HttpFileUploadManager *httpFileUploadManager() const;
         Jingle::Manager* jingleManager() const;
         Jingle::S5B::Manager *jingleS5BManager() const;
+        Jingle::IBB::Manager *jingleIBBManager() const;
 
         void setFileTransferEnabled(bool b);
         FileTransferManager *fileTransferManager() const;
diff --git a/src/xmpp/xmpp-im/xmpp_ibb.cpp b/src/xmpp/xmpp-im/xmpp_ibb.cpp
index 482781d4..bb719b27 100644
--- a/src/xmpp/xmpp-im/xmpp_ibb.cpp
+++ b/src/xmpp/xmpp-im/xmpp_ibb.cpp
@@ -409,7 +409,7 @@ BSConnection *IBBManager::createConnection()
 
 IBBConnection *IBBManager::takeIncoming()
 {
-    return d->incomingConns.isEmpty()? 0 : d->incomingConns.takeFirst();
+    return d->incomingConns.isEmpty()? nullptr : d->incomingConns.takeFirst();
 }
 
 void IBBManager::ibb_incomingRequest(const Jid &from, const QString &id,

From c90f592999e0fcb87f02badfbd3311ec4a630403 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 9 Jun 2019 09:24:07 +0300
Subject: [PATCH 054/383] Make jingle-ibb working

---
 src/xmpp/xmpp-im/jingle-ibb.cpp | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ibb.cpp b/src/xmpp/xmpp-im/jingle-ibb.cpp
index 4579d157..7303d3e8 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.cpp
+++ b/src/xmpp/xmpp-im/jingle-ibb.cpp
@@ -44,6 +44,7 @@ class Connection : public XMPP::Jingle::Connection
     bool offerSent = false;
     bool offerReceived = false;
     bool closing = false;
+    bool finished = false;
 
     Connection(Client *client, const Jid &jid, const QString &sid, size_t blockSize) :
         client(client),
@@ -113,15 +114,16 @@ class Connection : public XMPP::Jingle::Connection
             setOpenMode(QIODevice::ReadOnly);
         else
             postCloseAllDataRead();
-        emit connectionClosed();
     }
 
     void postCloseAllDataRead()
     {
         closing = false;
+        finished = true;
         connection->deleteLater();
         connection = nullptr;
         setOpenMode(QIODevice::NotOpen);
+        emit connectionClosed();
     }
 };
 
@@ -136,7 +138,7 @@ struct Transport::Private
 
     void checkAndStartConnection(QSharedPointer<Connection> &c)
     {
-        if (!c->connection && c->offerReceived && c->offerSent && pad->session()->role() == Origin::Initiator) {
+        if (!c->connection && !c->finished && c->offerReceived && c->offerSent && pad->session()->role() == Origin::Initiator) {
             auto con = pad->session()->manager()->client()->ibbManager()->createConnection();
             auto ibbcon = static_cast<IBBConnection*>(con);
             ibbcon->setPacketSize(defaultBlockSize);
@@ -182,7 +184,10 @@ Transport::Transport(const TransportManagerPad::Ptr &pad, const QDomElement &tra
 
 Transport::~Transport()
 {
-
+    // we have to mark all of them as finished just in case they are captured somewhere else
+    for (auto &c: d->connections) {
+        c->finished = true;
+    }
 }
 
 TransportManagerPad::Ptr Transport::pad() const
@@ -261,7 +266,8 @@ bool Transport::update(const QDomElement &transportEl)
 
     (*it)->offerReceived = true;
     if (d->started) {
-        d->checkAndStartConnection(it.value());
+        auto c = it.value();
+        QTimer::singleShot(0, this, [this,c]() mutable { d->checkAndStartConnection(c); });
     }
     return true;
 }
@@ -311,7 +317,7 @@ OutgoingTransportInfoUpdate Transport::takeOutgoingUpdate()
 
 bool Transport::isValid() const
 {
-    return true;
+    return d;
 }
 
 Transport::Features Transport::features() const
@@ -422,8 +428,8 @@ XMPP::Jingle::Connection::Ptr Manager::makeConnection(const Jid &peer, const QSt
             key = qMakePair(peer, s);
         } while (d->connections.contains(key));
     }
-    auto conn = QSharedPointer<Connection>::create(d->jingleManager->client(), peer, sid, blockSize);
-    d->connections.insert(qMakePair(peer, sid), conn);
+    auto conn = QSharedPointer<Connection>::create(d->jingleManager->client(), peer, s, blockSize);
+    d->connections.insert(qMakePair(peer, s), conn);
     connect(conn.data(), &Connection::connectionClosed, this, [this](){
         Connection *c = static_cast<Connection*>(sender());
         d->connections.remove(qMakePair(c->peer, c->sid));

From 1bf2bc3c78e4e8bf41fa14af9f844511887791a7 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 9 Jun 2019 14:27:37 +0300
Subject: [PATCH 055/383] Wait with ibb connection reset till iq ack for close

---
 src/xmpp/xmpp-im/client.cpp     |  2 ++
 src/xmpp/xmpp-im/jingle-ft.cpp  |  4 ++--
 src/xmpp/xmpp-im/jingle-ibb.cpp | 20 ++++++++++----------
 src/xmpp/xmpp-im/jingle-ibb.h   |  2 +-
 src/xmpp/xmpp-im/jingle-s5b.cpp |  6 ------
 src/xmpp/xmpp-im/jingle-s5b.h   |  2 +-
 src/xmpp/xmpp-im/jingle.cpp     |  5 +++++
 src/xmpp/xmpp-im/jingle.h       |  2 +-
 src/xmpp/xmpp-im/xmpp_ibb.cpp   |  2 +-
 9 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
index a95164a2..d1d7d786 100644
--- a/src/xmpp/xmpp-im/client.cpp
+++ b/src/xmpp/xmpp-im/client.cpp
@@ -1267,7 +1267,9 @@ DiscoItem Client::makeDiscoResult(const QString &node) const
     features.addFeature("urn:xmpp:time");
     features.addFeature("urn:xmpp:message-correct:0");
     features.addFeature("urn:xmpp:jingle:1");
+    // TODO rather do foreach for all registered jingle apps and transports
     features.addFeature("urn:xmpp:jingle:transports:s5b:1");
+    features.addFeature("urn:xmpp:jingle:transports:ibb:1");
     features.addFeature("urn:xmpp:jingle:apps:file-transfer:5"); // TODO: since it depends on UI it needs a way to be disabled
     Hash::populateFeatures(features);
 
diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 9d82ad9a..fc38e42f 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -422,7 +422,7 @@ class Application::Private
             setState(State::Finished);
             return; // everything is written
         }
-        auto sz = transport->blockSize();
+        auto sz = connection->blockSize();
         sz = sz? sz : 8192;
         if (sz > bytesLeft) {
             sz = bytesLeft;
@@ -444,7 +444,7 @@ class Application::Private
     {
         quint64 bytesAvail;
         while (bytesLeft && (bytesAvail = connection->bytesAvailable())) {
-            quint64 sz = 65536; // should be respect transport->blockSize() ?
+            quint64 sz = 65536; // shall we respect transport->blockSize() ?
             if (sz > bytesLeft) {
                 sz = bytesLeft;
             }
diff --git a/src/xmpp/xmpp-im/jingle-ibb.cpp b/src/xmpp/xmpp-im/jingle-ibb.cpp
index 7303d3e8..fce8e769 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.cpp
+++ b/src/xmpp/xmpp-im/jingle-ibb.cpp
@@ -38,7 +38,7 @@ class Connection : public XMPP::Jingle::Connection
     Client *client;
     Jid peer;
     QString sid;
-    size_t blockSize;
+    size_t _blockSize;
     IBBConnection *connection = nullptr;
 
     bool offerSent = false;
@@ -50,7 +50,7 @@ class Connection : public XMPP::Jingle::Connection
         client(client),
         peer(jid),
         sid(sid),
-        blockSize(blockSize)
+        _blockSize(blockSize)
     {
 
     }
@@ -66,6 +66,11 @@ class Connection : public XMPP::Jingle::Connection
         connect(c, &IBBConnection::connected, this, [this](){ setOpenMode(connection->openMode()); emit connected(); });
     }
 
+    size_t blockSize() const
+    {
+        return _blockSize;
+    }
+
     qint64 bytesAvailable() const
     {
         return XMPP::Jingle::Connection::bytesAvailable() + (connection? connection->bytesAvailable() : 0);
@@ -259,8 +264,8 @@ bool Transport::update(const QDomElement &transportEl)
             });
         }
     } else {
-        if (bs_final < (*it)->blockSize) {
-            (*it)->blockSize = bs_final;
+        if (bs_final < (*it)->_blockSize) {
+            (*it)->_blockSize = bs_final;
         }
     }
 
@@ -304,7 +309,7 @@ OutgoingTransportInfoUpdate Transport::takeOutgoingUpdate()
 
     QDomElement tel = doc->createElementNS(NS, "transport");
     tel.setAttribute(QStringLiteral("sid"), connection->sid);
-    tel.setAttribute(QString::fromLatin1("block-size"), qulonglong(connection->blockSize));
+    tel.setAttribute(QString::fromLatin1("block-size"), qulonglong(connection->_blockSize));
 
     upd = OutgoingTransportInfoUpdate{tel, [this, connection]() mutable {
         if (d->started)
@@ -330,11 +335,6 @@ Connection::Ptr Transport::connection() const
     return d->readyConnections.isEmpty()? Connection::Ptr() : d->readyConnections.takeFirst().staticCast<XMPP::Jingle::Connection>();
 }
 
-size_t Transport::blockSize() const
-{
-    return d->defaultBlockSize;
-}
-
 Pad::Pad(Manager *manager, Session *session)
 {
     _manager = manager;
diff --git a/src/xmpp/xmpp-im/jingle-ibb.h b/src/xmpp/xmpp-im/jingle-ibb.h
index 95ad5ef1..7486f476 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.h
+++ b/src/xmpp/xmpp-im/jingle-ibb.h
@@ -49,7 +49,7 @@ class Transport : public XMPP::Jingle::Transport
     Features features() const override;
 
     Connection::Ptr connection() const;
-    size_t blockSize() const;
+
 private:
     friend class Manager;
 
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 8e9da075..5e303f7a 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -1457,12 +1457,6 @@ Connection::Ptr Transport::connection() const
     return d->connection.staticCast<XMPP::Jingle::Connection>();
 }
 
-size_t Transport::blockSize() const
-{
-    return d->blockSize;
-}
-
-
 //----------------------------------------------------------------
 // Manager
 //----------------------------------------------------------------
diff --git a/src/xmpp/xmpp-im/jingle-s5b.h b/src/xmpp/xmpp-im/jingle-s5b.h
index b6aa13af..8ecf0056 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.h
+++ b/src/xmpp/xmpp-im/jingle-s5b.h
@@ -148,7 +148,7 @@ class Transport : public XMPP::Jingle::Transport
     QString sid() const;
     QString directAddr() const;
     Connection::Ptr connection() const;
-    size_t blockSize() const;
+
 private:
     friend class Manager;
 
diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index 56000fc9..baf076b8 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -1743,6 +1743,11 @@ NetworkDatagram Connection::receiveDatagram(qint64 maxSize)
     return NetworkDatagram();
 }
 
+size_t Connection::blockSize() const
+{
+    return 0; // means "block" is not applicable for this kind of connection
+}
+
 
 } // namespace Jingle
 } // namespace XMPP
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index cccfd145..d423c47b 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -287,6 +287,7 @@ class Connection : public ByteStream
     using Ptr = QSharedPointer<Connection>; // will be shared between transport and application
     virtual bool hasPendingDatagrams() const;
     virtual NetworkDatagram receiveDatagram(qint64 maxSize = -1);
+    virtual size_t blockSize() const;
 };
 
 class Application;
@@ -351,7 +352,6 @@ class Transport : public QObject {
     virtual Features features() const = 0;
     virtual TransportManagerPad::Ptr pad() const = 0;
     virtual Connection::Ptr connection() const = 0; // returns established QIODevice-based connection
-    virtual size_t blockSize() const = 0;
 signals:
     void updated(); // found some candidates and they have to be sent. takeUpdate has to be called from this signal handler.
                     // if it's just always ready then signal has to be sent at least once otherwise session-initiate won't be sent.
diff --git a/src/xmpp/xmpp-im/xmpp_ibb.cpp b/src/xmpp/xmpp-im/xmpp_ibb.cpp
index bb719b27..475af303 100644
--- a/src/xmpp/xmpp-im/xmpp_ibb.cpp
+++ b/src/xmpp/xmpp-im/xmpp_ibb.cpp
@@ -165,7 +165,7 @@ void IBBConnection::close()
         trySend();
 
         // if there is data pending to be written, then pend the closing
-        if(bytesToWrite() > 0) {
+        if(bytesToWrite() > 0 || d->closing) {
             return;
         }
     }

From def42726e4ae12f264f22bfec9b9dec90f3964e6 Mon Sep 17 00:00:00 2001
From: Vitaly Tonkacheyev <Vitozz@users.noreply.github.com>
Date: Sun, 9 Jun 2019 16:48:23 +0300
Subject: [PATCH 056/383] Update CMakeLists.txt

Added lost xmpp-im/jingle-ibb files
---
 src/xmpp/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/xmpp/CMakeLists.txt b/src/xmpp/CMakeLists.txt
index 3d72b436..1fbbc606 100644
--- a/src/xmpp/CMakeLists.txt
+++ b/src/xmpp/CMakeLists.txt
@@ -90,6 +90,7 @@ set(HEADERS
     xmpp-im/jingle.h
     xmpp-im/jingle-ft.h
     xmpp-im/jingle-s5b.h
+    xmpp-im/jingle-ibb.h
 
     zlib/zlibcompressor.h
     zlib/zlibdecompressor.h
@@ -126,6 +127,7 @@ set(SOURCES
     xmpp-im/jingle.cpp
     xmpp-im/jingle-ft.cpp
     xmpp-im/jingle-s5b.cpp
+    xmpp-im/jingle-ibb.cpp
 
     base/randomnumbergenerator.cpp
     base/timezone.cpp

From b24d0d602a3b65a3e624eb7a49a8562e594c7913 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 10 Jun 2019 00:31:36 +0300
Subject: [PATCH 057/383] Jingle transport fallback in progress

---
 src/xmpp/xmpp-im/jingle-ft.cpp | 165 +++++++++++++++++++++++----------
 src/xmpp/xmpp-im/jingle-ft.h   |   1 +
 src/xmpp/xmpp-im/jingle.h      |   1 +
 3 files changed, 117 insertions(+), 50 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index fc38e42f..d8da40b4 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -393,6 +393,7 @@ class Application::Private
     QStringList availableTransports;
     bool transportFailed = false;
     bool closeDeviceOnFinish = true;
+    bool waitTransportAccept = false;
     QIODevice *device = nullptr;
     quint64 bytesLeft = 0;
 
@@ -498,7 +499,7 @@ State Application::state() const
 
 void Application::setState(State state)
 {
-    d->state = state;
+    d->setState(state);
 }
 
 QString Application::contentName() const
@@ -513,7 +514,7 @@ Origin Application::creator() const
 
 Origin Application::senders() const
 {
-   return d->senders;
+    return d->senders;
 }
 
 Application::SetDescError Application::setDescription(const QDomElement &description)
@@ -543,52 +544,64 @@ bool Application::setTransport(const QSharedPointer<Transport> &transport)
 {
     if (d->transport) {
         d->transport->disconnect(this);
+        d->transport.reset();
     }
-    if (transport->features() & Transport::Reliable) {
-        int nsIndex = d->availableTransports.indexOf(transport->pad()->ns());
-        if (nsIndex == -1) {
-            return false;
-        }
-        d->availableTransports.removeAt(nsIndex);
-        d->transport = transport;
-        d->setState(State::Pending);
-        connect(transport.data(), &Transport::updated, this, &Application::updated);
-        connect(transport.data(), &Transport::connected, this, [this](){
-            d->connection = d->transport->connection();
-            connect(d->connection.data(), &Connection::readyRead, this, [this](){
-                if (!d->device) {
-                    return;
-                }
-                if (d->pad->session()->role() != d->senders) {
-                    d->readNextBlockFromTransport();
-                }
-            });
-            connect(d->connection.data(), &Connection::bytesWritten, this, [this](qint64 bytes){
-                Q_UNUSED(bytes)
-                if (d->pad->session()->role() == d->senders && !d->connection->bytesToWrite()) {
-                    d->writeNextBlockToTransport();
-                }
-            });
-            d->setState(State::Active);
-            if (d->acceptFile.range().isValid()) {
-                d->bytesLeft = d->acceptFile.range().length;
-                emit deviceRequested(d->acceptFile.range().offset, d->bytesLeft);
-            } else {
-                d->bytesLeft = d->file.size();
-                emit deviceRequested(0, d->bytesLeft);
+    if (!(transport->features() & Transport::Reliable))
+        return false;
+
+    int nsIndex = d->availableTransports.indexOf(transport->pad()->ns());
+    if (nsIndex == -1) {
+        return false;
+    }
+
+    d->availableTransports.removeAt(nsIndex);
+    d->transport = transport;
+    connect(transport.data(), &Transport::updated, this, &Application::updated);
+    connect(transport.data(), &Transport::connected, this, [this](){
+        d->transportFailed = false;
+        d->connection = d->transport->connection();
+        connect(d->connection.data(), &Connection::readyRead, this, [this](){
+            if (!d->device) {
+                return;
+            }
+            if (d->pad->session()->role() != d->senders) {
+                d->readNextBlockFromTransport();
             }
         });
-
-        connect(transport.data(), &Transport::failed, this, [this](){
-            if (d->availableTransports.size()) { // we can do transport-replace here
-                // TODO
+        connect(d->connection.data(), &Connection::bytesWritten, this, [this](qint64 bytes){
+            Q_UNUSED(bytes)
+            if (d->pad->session()->role() == d->senders && !d->connection->bytesToWrite()) {
+                d->writeNextBlockToTransport();
             }
-            d->transportFailed = true;
-            d->setState(State::Finishing);
         });
-        return true;
+        d->setState(State::Active);
+        if (d->acceptFile.range().isValid()) {
+            d->bytesLeft = d->acceptFile.range().length;
+            emit deviceRequested(d->acceptFile.range().offset, d->bytesLeft);
+        } else {
+            d->bytesLeft = d->file.size();
+            emit deviceRequested(0, d->bytesLeft);
+        }
+    });
+
+    connect(transport.data(), &Transport::failed, this, [this](){
+        d->transportFailed = true;
+        d->waitTransportAccept = false;
+        if (!selectNextTransport()) { // we can do transport-replace here
+            if (d->state == State::PrepareLocalOffer && d->creator == d->pad->session()->role()) {
+                // we were unable to send even initial offer
+                d->setState(State::Finished);
+            } else {
+                d->setState(State::Finishing); // we have to notify our peer about problems
+            }
+        }
+    });
+
+    if (d->state >= State::Unacked) {
+        // seems like we are in transport failure recovery. d->transportFailed may confirm this
+        d->transport->prepare();
     }
-    return false;
+    return true;
 }
 
 QSharedPointer<Transport> Application::transport() const
@@ -598,18 +611,30 @@ QSharedPointer<Transport> Application::transport() const
 
 Action Application::outgoingUpdateType() const
 {
+    if (d->waitTransportAccept && d->state < State::Finishing)
+        return Action::NoAction; // let's first finish waiting. and after we will do content-accept
+
     switch (d->state) {
     case State::Created:
         break;
     case State::PrepareLocalOffer:
-        if (d->transport->hasUpdates()) {
-            return d->creator == d->pad->session()->role()? Action::ContentAdd : Action::ContentAccept;
-        }
+        if (d->transportFailed && !d->transport)
+            return Action::ContentReject; // case me=initiator was already handled by this momemnt
+
+        if (d->transport->hasUpdates())
+            return d->creator == d->pad->session()->role()? Action::ContentAdd :
+                                                            (d->transportFailed? Action::ContentAccept : Action::TransportReplace);
         break;
     case State::Connecting:
     case State::Active:
     case State::Pending:
+        if (d->transportFailed && (d->state == State::Active || !d->transport))
+            return Action::ContentRemove;
+
         if (d->transport->hasUpdates()) {
+            if (d->transportFailed) {
+                return Action::TransportReplace;
+            }
             return Action::TransportInfo;
         }
         break;
@@ -633,6 +658,17 @@ OutgoingUpdate Application::takeOutgoingUpdate()
     auto client = d->pad->session()->manager()->client();
     auto doc = client->doc();
     if (d->state == State::PrepareLocalOffer) { // basically when we come to this function Created is possible only for outgoing content
+        if (d->transportFailed && !d->transport) {
+            ContentBase cb(d->creator, d->contentName);
+            QList<QDomElement> updates;
+            updates << cb.toXml(doc, "content");
+            updates << Reason(Reason::Condition::FailedTransport).toXml(doc);
+
+            return OutgoingUpdate{updates, [this](){
+                    d->setState(State::Finished);
+                }};
+        }
+
         if (!d->transport->hasUpdates()) { // failed to select next transport. can't continue
             return OutgoingUpdate();
         }
@@ -653,15 +689,31 @@ OutgoingUpdate Application::takeOutgoingUpdate()
         std::tie(tel, trCallback) = d->transport->takeOutgoingUpdate();
         cel.appendChild(tel);
 
+        if (d->transportFailed) {
+            d->waitTransportAccept = true;
+            return OutgoingUpdate{QList<QDomElement>()<<cel, trCallback};
+        }
+
         d->setState(State::Unacked);
         return OutgoingUpdate{QList<QDomElement>()<<cel, [this, trCallback](){
                 if (trCallback) {
                     trCallback();
                 }
-                d->state = d->pad->session()->role() == Origin::Initiator? State::Pending : State::Active;
+                d->setState(d->pad->session()->role() == Origin::Initiator? State::Pending : State::Connecting);
             }};
     }
     if (d->state == State::Connecting || d->state == State::Active || d->state == State::Pending) {
+        if (d->transportFailed && (d->state == State::Active || !d->transport)) {
+            ContentBase cb(d->creator, d->contentName);
+            QList<QDomElement> updates;
+            updates << cb.toXml(doc, "content");
+            updates << Reason(Reason::Condition::FailedTransport).toXml(doc);
+            return OutgoingUpdate{updates, [this](){
+                    d->setState(State::Finished);
+                }
+            };
+        }
+
         if (d->transport->hasUpdates()) { // failed to select next transport. can't continue
             QDomElement tel;
             OutgoingUpdateCB trCallback;
@@ -673,6 +725,7 @@ OutgoingUpdate Application::takeOutgoingUpdate()
             ContentBase cb(d->creator, d->contentName);
             auto cel = cb.toXml(doc, "content");
             cel.appendChild(tel);
+            d->waitTransportAccept = true;
             return OutgoingUpdate{QList<QDomElement>()<<cel, trCallback};
         }
     }
@@ -705,8 +758,13 @@ bool Application::wantBetterTransport(const QSharedPointer<Transport> &t) const
 
 bool Application::selectNextTransport()
 {
-    if (d->availableTransports.size()) {
-        return setTransport(d->pad->session()->newOutgoingTransport(d->availableTransports.first()));
+    while (d->availableTransports.size()) {
+        auto t = d->pad->session()->newOutgoingTransport(d->availableTransports.first());
+        if (t && setTransport(t)) {
+            return true;
+        } else {
+            d->availableTransports.removeFirst();
+        }
     }
     return false;
 }
@@ -717,7 +775,7 @@ void Application::prepare()
         selectNextTransport();
     }
     if (d->transport) {
-        d->state = State::PrepareLocalOffer;
+        d->setState(State::PrepareLocalOffer);
         d->transport->prepare();
     }
 }
@@ -725,7 +783,7 @@ void Application::prepare()
 void Application::start()
 {
     if (d->transport) {
-        d->state = State::Active;
+        d->setState(State::Active);
         d->transport->start();
     }
     // TODO we need QIODevice somewhere here
@@ -743,6 +801,13 @@ bool Application::accept(const QDomElement &el)
     return true;
 }
 
+void Application::setTransportAccepted()
+{
+    d->waitTransportAccept = false;
+    d->transportFailed = false;
+    emit updated();
+}
+
 bool Application::isValid() const
 {
     return d->file.isValid() && d->transport &&  d->contentName.size() > 0 &&
diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index 327dfbb3..24fb5760 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -139,6 +139,7 @@ class Application : public XMPP::Jingle::Application
     void prepare() override;
     void start() override;
     bool accept(const QDomElement &el) override;
+    void setTransportAccepted() override;
 
     bool isValid() const;
 
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index d423c47b..3053a669 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -390,6 +390,7 @@ class Application : public QObject
     virtual OutgoingUpdate takeOutgoingUpdate() = 0; // this may return something only when outgoingUpdateType() != NoAction
     virtual bool wantBetterTransport(const QSharedPointer<Transport> &) const = 0;
     virtual bool selectNextTransport() = 0;
+    virtual void setTransportAccepted() = 0;
 
     /**
      * @brief prepare to send content-add/session-initiate

From 89b32927d7a46cabe71dfff6294a126797785072 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 10 Jun 2019 08:24:58 +0300
Subject: [PATCH 058/383] a little more progress with jingle transport fallback

---
 src/xmpp/xmpp-im/jingle-ft.cpp | 49 +++++++++++-----------------------
 1 file changed, 16 insertions(+), 33 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index d8da40b4..c89b2170 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -391,6 +391,7 @@ class Application::Private
     QSharedPointer<Transport> transport;
     Connection::Ptr connection;
     QStringList availableTransports;
+    bool transportReady = false; // when prepare local offer finished for the transport
     bool transportFailed = false;
     bool closeDeviceOnFinish = true;
     bool waitTransportAccept = false;
@@ -621,9 +622,11 @@ Action Application::outgoingUpdateType() const
         if (d->transportFailed && !d->transport)
             return Action::ContentReject; // case me=initiator was already handled by this momemnt
 
-        if (d->transport->hasUpdates())
+        if (d->transport->hasUpdates() || d->transportReady) {
+            d->transportReady = true;
             return d->creator == d->pad->session()->role()? Action::ContentAdd :
                                                             (d->transportFailed? Action::ContentAccept : Action::TransportReplace);
+        }
         break;
     case State::Connecting:
     case State::Active:
@@ -657,18 +660,20 @@ OutgoingUpdate Application::takeOutgoingUpdate()
 
     auto client = d->pad->session()->manager()->client();
     auto doc = client->doc();
-    if (d->state == State::PrepareLocalOffer) { // basically when we come to this function Created is possible only for outgoing content
-        if (d->transportFailed && !d->transport) {
-            ContentBase cb(d->creator, d->contentName);
-            QList<QDomElement> updates;
-            updates << cb.toXml(doc, "content");
-            updates << Reason(Reason::Condition::FailedTransport).toXml(doc);
 
-            return OutgoingUpdate{updates, [this](){
-                    d->setState(State::Finished);
-                }};
-        }
+    // content-remove or content-reject
+    if (d->transportFailed && (d->state >= State::Active || !d->transport)) {
+        ContentBase cb(d->creator, d->contentName);
+        QList<QDomElement> updates;
+        updates << cb.toXml(doc, "content");
+        updates << Reason(Reason::Condition::FailedTransport).toXml(doc);
+        return OutgoingUpdate{updates, [this](){
+                d->setState(State::Finished);
+            }
+        };
+    }
 
+    if (d->state == State::PrepareLocalOffer) { // basically when we come to this function Created is possible only for outgoing content
         if (!d->transport->hasUpdates()) { // failed to select next transport. can't continue
             return OutgoingUpdate();
         }
@@ -703,17 +708,6 @@ OutgoingUpdate Application::takeOutgoingUpdate()
             }};
     }
     if (d->state == State::Connecting || d->state == State::Active || d->state == State::Pending) {
-        if (d->transportFailed && (d->state == State::Active || !d->transport)) {
-            ContentBase cb(d->creator, d->contentName);
-            QList<QDomElement> updates;
-            updates << cb.toXml(doc, "content");
-            updates << Reason(Reason::Condition::FailedTransport).toXml(doc);
-            return OutgoingUpdate{updates, [this](){
-                    d->setState(State::Finished);
-                }
-            };
-        }
-
         if (d->transport->hasUpdates()) { // failed to select next transport. can't continue
             QDomElement tel;
             OutgoingUpdateCB trCallback;
@@ -730,17 +724,6 @@ OutgoingUpdate Application::takeOutgoingUpdate()
         }
     }
     if (d->state == State::Finishing) {
-        if (d->transportFailed) {
-            ContentBase cb(d->creator, d->contentName);
-            QList<QDomElement> updates;
-            updates << cb.toXml(doc, "content");
-            updates << Reason(Reason::Condition::FailedTransport).toXml(doc);
-            return OutgoingUpdate{updates, [this](){
-                    d->setState(State::Finished);
-                }
-            };
-        }
-        // else send <received>
         ContentBase cb(d->pad->session()->role(), d->contentName);
         return OutgoingUpdate{QList<QDomElement>() << cb.toXml(doc, "received"), [this](){
                 d->setState(State::Finished);

From 57885217329554a4d716d5df3ead0d5ac4b1183f Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 11 Jun 2019 00:39:54 +0300
Subject: [PATCH 059/383] transport replace generic handlers

---
 src/xmpp/xmpp-im/jingle.cpp | 73 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 71 insertions(+), 2 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index baf076b8..38c69197 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -1208,6 +1208,75 @@ class Session::Private
         return true;
     }
 
+    bool handleIncomingTransportReplace(const QDomElement &jingleEl)
+    {
+        QList<QPair<Application*,QSharedPointer<Transport>>> apps;
+        QList<QPair<Application*,QDomElement>> toReject;
+        QString contentTag(QStringLiteral("content"));
+        for(QDomElement ce = jingleEl.firstChildElement(contentTag);
+            !ce.isNull(); ce = ce.nextSiblingElement(contentTag))
+        {
+            ContentBase cb(ce);
+            auto transportEl = ce.firstChildElement(QString::fromLatin1("transport"));
+            QString transportNS = transportEl.attribute(QStringLiteral("xmlns"));
+            if (!cb.isValid() || transportEl.isNull() || transportNS.isEmpty()) {
+                lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
+                return false;
+            }
+            Application *app = contentList.value(ContentKey{cb.name, cb.creator});
+            if (!app) continue; //wtf?
+
+            auto trPad = q->transportPadFactory(transportNS);
+            if (!trPad) {
+                toReject.append(qMakePair(app, transportEl));
+                continue;
+            }
+
+            auto transport = trPad->manager()->newTransport(trPad, transportEl);
+            if (!transport) {
+                toReject.append(qMakePair(app, transportEl));
+                continue;
+            }
+
+            apps.append(qMakePair(app, transport));
+        }
+
+        for (auto &v: apps) {
+            if (!v.first->setTransport(v.second)) {
+                // TODO
+            }
+        }
+
+        planStep();
+        return true;
+    }
+
+    bool handleIncomingTransportAccept(const QDomElement &jingleEl)
+    {
+        QSet<Application*> apps;
+        QString contentTag(QStringLiteral("content"));
+        for(QDomElement ce = jingleEl.firstChildElement(contentTag);
+            !ce.isNull(); ce = ce.nextSiblingElement(contentTag))
+        {
+            ContentBase cb(ce);
+            if (!cb.isValid()) {
+                lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
+                return false;
+            }
+            Application *app = contentList.value(ContentKey{cb.name, cb.creator});
+            if (app) {
+                apps.insert(app);
+            }
+        }
+
+        for (auto app: apps) {
+            app->setTransportAccepted();
+        }
+
+        planStep();
+        return true;
+    }
+
     bool handleIncomingTransportInfo(const QDomElement &jingleEl)
     {
         QString contentTag(QStringLiteral("content"));
@@ -1498,13 +1567,13 @@ bool Session::updateFromXml(Action action, const QDomElement &jingleEl)
     case Action::SessionTerminate:
         return d->handleIncomingSessionTerminate(jingleEl);
     case Action::TransportAccept:
-        break;
+        return d->handleIncomingTransportAccept(jingleEl);
     case Action::TransportInfo:
         return d->handleIncomingTransportInfo(jingleEl);
     case Action::TransportReject:
         break;
     case Action::TransportReplace:
-        break;
+        return d->handleIncomingTransportReplace(jingleEl);
     case Action::NoAction:
     default:
         break;

From 33eb278ac8a975fbbcf6b485eba27c2352b4ed52 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 11 Jun 2019 19:53:57 +0300
Subject: [PATCH 060/383] jingle transport-replace in progress

---
 src/xmpp/xmpp-im/jingle-ft.cpp | 77 ++++++++++++++++++++++++----------
 src/xmpp/xmpp-im/jingle-ft.h   |  1 +
 src/xmpp/xmpp-im/jingle.cpp    | 29 +++++++++----
 src/xmpp/xmpp-im/jingle.h      |  3 ++
 4 files changed, 81 insertions(+), 29 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index c89b2170..3074146e 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -388,11 +388,11 @@ class Application::Private
     File    acceptFile; // as it comes with "accept" response
     Origin  creator;
     Origin  senders;
+    Origin  transportFailedOrigin = Origin::None;
     QSharedPointer<Transport> transport;
     Connection::Ptr connection;
     QStringList availableTransports;
     bool transportReady = false; // when prepare local offer finished for the transport
-    bool transportFailed = false;
     bool closeDeviceOnFinish = true;
     bool waitTransportAccept = false;
     QIODevice *device = nullptr;
@@ -543,10 +543,6 @@ File Application::acceptFile() const
 // incoming one? or we have to check real direction
 bool Application::setTransport(const QSharedPointer<Transport> &transport)
 {
-    if (d->transport) {
-        d->transport->disconnect(this);
-        d->transport.reset();
-    }
     if (!(transport->features() & Transport::Reliable))
         return false;
 
@@ -555,11 +551,17 @@ bool Application::setTransport(const QSharedPointer<Transport> &transport)
         return false;
     }
 
+    // in case we automatically select a new transport on our own we definitely will come up to this point
+    if (d->transport) {
+        d->transport->disconnect(this);
+        d->transport.reset();
+    }
+
     d->availableTransports.removeAt(nsIndex);
     d->transport = transport;
     connect(transport.data(), &Transport::updated, this, &Application::updated);
     connect(transport.data(), &Transport::connected, this, [this](){
-        d->transportFailed = false;
+        d->transportFailedOrigin = Origin::None;
         d->connection = d->transport->connection();
         connect(d->connection.data(), &Connection::readyRead, this, [this](){
             if (!d->device) {
@@ -586,16 +588,21 @@ bool Application::setTransport(const QSharedPointer<Transport> &transport)
     });
 
     connect(transport.data(), &Transport::failed, this, [this](){
-        d->transportFailed = true;
+        d->transportFailedOrigin = d->pad->session()->role();
         d->waitTransportAccept = false;
+        if (d->state >= State::Active) {
+            emit updated(); // late failure are unhandled. just notify the remote
+            return;
+        }
+        // we can try to replace the transport
         if (!selectNextTransport()) { // we can do transport-replace here
             if (d->state == State::PrepareLocalOffer && d->creator == d->pad->session()->role()) {
                 // we were unable to send even initial offer
                 d->setState(State::Finished);
             } else {
-                d->setState(State::Finishing); // we have to notify our peer about problems
+                emit updated(); // we have to notify our peer about failure
             }
-        }
+        } // else transport will notify when ready
     });
 
     if (d->state >= State::Unacked) {
@@ -605,6 +612,26 @@ bool Application::setTransport(const QSharedPointer<Transport> &transport)
     return true;
 }
 
+bool Application::replaceTransport(const QSharedPointer<Transport> &transport)
+{
+    // remote party called transport-replace
+    auto peerRole = d->pad->session()->peerRole();
+    // if transport recovery is in progress and I as an inititiator started it then forbid remote transport-replace
+    if (d->transportFailedOrigin != Origin::None && d->transportFailedOrigin != peerRole && d->pad->session()->role() == Origin::Initiator) {
+        // TODO tie-break
+        return false;
+    }
+    auto prev = d->transportFailedOrigin;
+    d->transportFailedOrigin = peerRole;
+    auto ret = setTransport(transport);
+    if (ret)
+        d->waitTransportAccept = false;
+    else
+        d->transportFailedOrigin = prev;
+
+    return ret;
+}
+
 QSharedPointer<Transport> Application::transport() const
 {
     return d->transport;
@@ -613,36 +640,39 @@ QSharedPointer<Transport> Application::transport() const
 Action Application::outgoingUpdateType() const
 {
     if (d->waitTransportAccept && d->state < State::Finishing)
-        return Action::NoAction; // let's first finish waiting. and after we will do content-accept
+        return Action::NoAction;
 
     switch (d->state) {
     case State::Created:
         break;
     case State::PrepareLocalOffer:
-        if (d->transportFailed && !d->transport)
-            return Action::ContentReject; // case me=initiator was already handled by this momemnt
+        if (d->transportFailedOrigin != Origin::None && !d->transport)
+            return Action::ContentReject; // case me=creator was already handled by this momemnt. see Transport::failed connectio above
 
         if (d->transport->hasUpdates() || d->transportReady) {
             d->transportReady = true;
-            return d->creator == d->pad->session()->role()? Action::ContentAdd :
-                                                            (d->transportFailed? Action::ContentAccept : Action::TransportReplace);
+            auto myRole = d->pad->session()->role();
+            if (d->creator == myRole) {
+                return Action::ContentAdd;
+            }
+            return d->transportFailedOrigin == myRole? Action::TransportReplace : Action::ContentAccept;
         }
         break;
     case State::Connecting:
     case State::Active:
     case State::Pending:
-        if (d->transportFailed && (d->state == State::Active || !d->transport))
+        if (d->transportFailedOrigin != Origin::None && (d->state == State::Active || !d->transport))
             return Action::ContentRemove;
 
         if (d->transport->hasUpdates()) {
-            if (d->transportFailed) {
+            if (d->transportFailedOrigin != Origin::None) {
                 return Action::TransportReplace;
             }
             return Action::TransportInfo;
         }
         break;
     case State::Finishing:
-        if (d->transportFailed) {
+        if (d->transportFailedOrigin != Origin::None) {
             return Action::ContentRemove;
         }
         return Action::SecurityInfo;
@@ -658,11 +688,14 @@ OutgoingUpdate Application::takeOutgoingUpdate()
         return OutgoingUpdate();
     }
 
+    if (d->waitTransportAccept && d->state < State::Finishing)
+        return OutgoingUpdate();
+
     auto client = d->pad->session()->manager()->client();
     auto doc = client->doc();
 
     // content-remove or content-reject
-    if (d->transportFailed && (d->state >= State::Active || !d->transport)) {
+    if (d->transportFailedOrigin != Origin::None && (d->state >= State::Active || !d->transport)) {
         ContentBase cb(d->creator, d->contentName);
         QList<QDomElement> updates;
         updates << cb.toXml(doc, "content");
@@ -694,7 +727,7 @@ OutgoingUpdate Application::takeOutgoingUpdate()
         std::tie(tel, trCallback) = d->transport->takeOutgoingUpdate();
         cel.appendChild(tel);
 
-        if (d->transportFailed) {
+        if (d->transportFailedOrigin == d->pad->session()->role()) {
             d->waitTransportAccept = true;
             return OutgoingUpdate{QList<QDomElement>()<<cel, trCallback};
         }
@@ -719,7 +752,9 @@ OutgoingUpdate Application::takeOutgoingUpdate()
             ContentBase cb(d->creator, d->contentName);
             auto cel = cb.toXml(doc, "content");
             cel.appendChild(tel);
-            d->waitTransportAccept = true;
+            if (d->transportFailedOrigin != Origin::None) {
+                d->waitTransportAccept = true;
+            }
             return OutgoingUpdate{QList<QDomElement>()<<cel, trCallback};
         }
     }
@@ -787,7 +822,7 @@ bool Application::accept(const QDomElement &el)
 void Application::setTransportAccepted()
 {
     d->waitTransportAccept = false;
-    d->transportFailed = false;
+    d->transportFailedOrigin = Origin::None;
     emit updated();
 }
 
diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index 24fb5760..7cd8fb04 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -139,6 +139,7 @@ class Application : public XMPP::Jingle::Application
     void prepare() override;
     void start() override;
     bool accept(const QDomElement &el) override;
+    bool replaceTransport(const QSharedPointer<Transport> &transport) override;
     void setTransportAccepted() override;
 
     bool isValid() const;
diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index 38c69197..9c61c812 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -1210,8 +1210,8 @@ class Session::Private
 
     bool handleIncomingTransportReplace(const QDomElement &jingleEl)
     {
-        QList<QPair<Application*,QSharedPointer<Transport>>> apps;
-        QList<QPair<Application*,QDomElement>> toReject;
+        QList<std::tuple<Application*,QSharedPointer<Transport>,QDomElement>> passed;
+        QList<QDomElement> toReject;
         QString contentTag(QStringLiteral("content"));
         for(QDomElement ce = jingleEl.firstChildElement(contentTag);
             !ce.isNull(); ce = ce.nextSiblingElement(contentTag))
@@ -1228,25 +1228,33 @@ class Session::Private
 
             auto trPad = q->transportPadFactory(transportNS);
             if (!trPad) {
-                toReject.append(qMakePair(app, transportEl));
+                toReject.append(ce);
                 continue;
             }
 
             auto transport = trPad->manager()->newTransport(trPad, transportEl);
             if (!transport) {
-                toReject.append(qMakePair(app, transportEl));
+                toReject.append(ce);
                 continue;
             }
 
-            apps.append(qMakePair(app, transport));
+            passed.append(std::make_tuple(app, transport, ce));
         }
 
-        for (auto &v: apps) {
-            if (!v.first->setTransport(v.second)) {
-                // TODO
+        for (auto &v: passed) {
+            Application *app;
+            QSharedPointer<Transport> transport;
+            QDomElement ce;
+            std::tie(app,transport,ce) = v;
+            if (!app->replaceTransport(transport)) { // app should generate transport accept eventually. content-accept will work too if the content wasn't accepted yet
+                toReject.append(ce);
             }
         }
 
+        if (toReject.size()) {
+            outgoingUpdates.insert(Action::TransportReject, OutgoingUpdate{toReject,OutgoingUpdateCB()});
+        }
+
         planStep();
         return true;
     }
@@ -1367,6 +1375,11 @@ Origin Session::role() const
     return d->role;
 }
 
+Origin Session::peerRole() const
+{
+    return negateOrigin(d->role);
+}
+
 XMPP::Stanza::Error Session::lastError() const
 {
     return d->lastError;
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index 3053a669..d9d6e90f 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -390,6 +390,7 @@ class Application : public QObject
     virtual OutgoingUpdate takeOutgoingUpdate() = 0; // this may return something only when outgoingUpdateType() != NoAction
     virtual bool wantBetterTransport(const QSharedPointer<Transport> &) const = 0;
     virtual bool selectNextTransport() = 0;
+    virtual bool replaceTransport(const QSharedPointer<Transport> &transport) = 0;
     virtual void setTransportAccepted() = 0;
 
     /**
@@ -425,6 +426,8 @@ class Session : public QObject
     QString sid() const;
 
     Origin role() const; // my role in session: initiator or responder
+    Origin peerRole() const;
+
     XMPP::Stanza::Error lastError() const;
 
     // make new local content but do not add it to session yet

From c4fe3cbeaaa366645b51075d42f464bb5fe6ed63 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 12 Jun 2019 09:30:45 +0300
Subject: [PATCH 061/383] Jingle errors handling

---
 src/xmpp/xmpp-im/jingle.cpp | 60 ++++++++++++++++++++++++++++++++++---
 src/xmpp/xmpp-im/jingle.h   | 20 +++++++++++++
 2 files changed, 76 insertions(+), 4 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index 9c61c812..6ee11381 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -39,6 +39,7 @@ namespace XMPP {
 namespace Jingle {
 
 const QString NS(QStringLiteral("urn:xmpp:jingle:1"));
+const QString ERROR_NS(QStringLiteral("urn:xmpp:jingle:errors:1"));
 
 
 //----------------------------------------------------------------------------
@@ -504,8 +505,12 @@ class JTPush : public Task
 
             auto session = client()->jingleManager()->session(from, jingle.sid());
             if (session) {
-                // FIXME what if not yet acknowledged. xep-0166 has a solution for that
-                respondError(iq, Stanza::Error::Cancel, Stanza::Error::Conflict);
+                if (session->role() == Origin::Initiator) { //
+                    respondTieBreak(iq);
+                } else {
+                    // second session from this peer with the same sid.
+                    respondError(iq, Stanza::Error::Cancel, Stanza::Error::BadRequest);
+                }
                 return true;
             }
             session = client()->jingleManager()->incomingSessionInitiate(from, jingle, jingleEl);
@@ -520,7 +525,7 @@ class JTPush : public Task
                     auto resp = createIQ(client()->doc(), "result", fromStr, iq.attribute(QStringLiteral("id")));
                     client()->send(resp);
                 } else {
-                    auto el = client()->doc()->createElementNS(QString::fromLatin1("urn:xmpp:jingle:errors:1"), QStringLiteral("unknown-session"));
+                    auto el = client()->doc()->createElementNS(ERROR_NS, QStringLiteral("unknown-session"));
                     respondError(iq, Stanza::Error::Cancel, Stanza::Error::ItemNotFound, QString(), el);
                 }
                 return true;
@@ -549,6 +554,13 @@ class JTPush : public Task
         client()->send(resp);
     }
 
+    void respondTieBreak(const QDomElement &iq)
+    {
+        Stanza::Error error(Stanza::Error::Cancel, Stanza::Error::Conflict);
+        ErrorUtil::fill(*client()->doc(), error, ErrorUtil::TieBreak);
+        respondError(iq, error);
+    }
+
     void respondError(const QDomElement &iq, const Stanza::Error &error)
     {
         auto resp = createIQ(client()->doc(), "error", iq.attribute(QStringLiteral("from")), iq.attribute(QStringLiteral("id")));
@@ -1040,6 +1052,9 @@ class Session::Private
                 }
                 lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, err == Private::AddContentError::Unexpected?
                                                     XMPP::Stanza::Error::UnexpectedRequest : XMPP::Stanza::Error::BadRequest);
+                if (err == Private::AddContentError::Unexpected) {
+                    ErrorUtil::fill(jingleEl.ownerDocument(), lastError, ErrorUtil::OutOfOrder);
+                }
                 return std::tuple<bool,QList<Application*>>(false, QList<Application*>());
             }
 
@@ -1104,6 +1119,9 @@ class Session::Private
         case Private::AddContentError::Unparsed:
         case Private::AddContentError::Unexpected:
             lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
+            if (err == Private::AddContentError::Unexpected) {
+                ErrorUtil::fill(jingleEl.ownerDocument(), lastError, ErrorUtil::OutOfOrder);
+            }
             return false;
         case Private::AddContentError::Unsupported:
             rejects += Reason(cond).toXml(manager->client()->doc());
@@ -1552,7 +1570,8 @@ bool Session::incomingInitiate(const Jingle &jingle, const QDomElement &jingleEl
 bool Session::updateFromXml(Action action, const QDomElement &jingleEl)
 {
     if (d->state == State::Finished) {
-        d->lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::UnexpectedRequest); // TODO OutOfOrder
+        d->lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::UnexpectedRequest);
+        ErrorUtil::fill(jingleEl.ownerDocument(), d->lastError, ErrorUtil::OutOfOrder);
         return false;
     }
 
@@ -1734,6 +1753,12 @@ Session *Manager::session(const Jid &remoteJid, const QString &sid)
     return d->sessions.value(qMakePair(remoteJid, sid));
 }
 
+void Manager::detachSession(Session *s)
+{
+    s->disconnect(this);
+    d->sessions.remove(qMakePair(s->peer(), s->sid()));
+}
+
 void Manager::setRemoteJidChecker(std::function<bool(const Jid &)> checker)
 {
     d->remoteJidCecker = checker;
@@ -1830,6 +1855,33 @@ size_t Connection::blockSize() const
     return 0; // means "block" is not applicable for this kind of connection
 }
 
+const char* ErrorUtil::names[ErrorUtil::Last] = {"out-of-order","tie-break", "unknown-session", "unsupported-info"};
+
+Stanza::Error ErrorUtil::make(QDomDocument &doc, int jingleCond, int type, int condition, const QString &text)
+{
+    auto el = doc.createElementNS(ERROR_NS, QString::fromLatin1(names[jingleCond]));
+    return Stanza::Error(type, condition, text, el);
+}
+
+void ErrorUtil::fill(QDomDocument doc, Stanza::Error &error, int jingleCond)
+{
+    error.appSpec = doc.createElementNS(ERROR_NS, QString::fromLatin1(names[jingleCond]));
+}
+
+int ErrorUtil::jingleCondition(const Stanza::Error &error)
+{
+    if (error.appSpec.attribute(QString::fromLatin1("xmlns")) != ERROR_NS) {
+        return UnknownError;
+    }
+    QString tagName = error.appSpec.tagName();
+    for (int i = 0; i < int(sizeof(names) / sizeof(names[0])); ++i) {
+        if (tagName == names[i]) {
+            return i;
+        }
+    }
+    return UnknownError;
+}
+
 
 } // namespace Jingle
 } // namespace XMPP
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index d9d6e90f..619189bc 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -111,6 +111,25 @@ typedef std::function<void ()> OutgoingUpdateCB;
 typedef std::tuple<QList<QDomElement>, OutgoingUpdateCB> OutgoingUpdate; // list of elements to b inserted to <jingle> and success callback
 typedef std::tuple<QDomElement, OutgoingUpdateCB> OutgoingTransportInfoUpdate; // transport element and success callback
 
+class ErrorUtil
+{
+public:
+    enum {
+        UnknownError, // unparsed/unknown error
+        OutOfOrder,
+        TieBreak,
+        UnknownSession,
+        UnsupportedInfo,
+        Last
+    };
+
+    static const char* names[Last];
+
+    static XMPP::Stanza::Error make(QDomDocument &doc, int jingleCond, int type=XMPP::Stanza::Error::Cancel, int condition=XMPP::Stanza::Error::UndefinedCondition, const QString &text=QString());
+    static void fill(QDomDocument doc, XMPP::Stanza::Error &error, int jingleCond);
+    static int jingleCondition(const XMPP::Stanza::Error &error);
+};
+
 class Jingle
 {
 public:
@@ -549,6 +568,7 @@ class Manager : public QObject
     QString registerSession(Session *session);
     XMPP::Stanza::Error lastError() const;
 
+    void detachSession(Session *s); // disconnect the session from manager
 signals:
     void incomingSession(Session *);
 

From de26fe25ca5d7f89150f3301bc98b41cf10ab75c Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 12 Jun 2019 15:55:34 +0300
Subject: [PATCH 062/383] handle tie-break case on jingle transport-replace

---
 src/xmpp/xmpp-core/xmpp_stanza.cpp | 10 ++++++++++
 src/xmpp/xmpp-core/xmpp_stanza.h   |  2 ++
 src/xmpp/xmpp-im/jingle-ft.cpp     | 24 +++++++++++++++---------
 src/xmpp/xmpp-im/jingle-ft.h       |  2 ++
 src/xmpp/xmpp-im/jingle.cpp        | 12 ++++++++++++
 src/xmpp/xmpp-im/jingle.h          |  3 +++
 6 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/src/xmpp/xmpp-core/xmpp_stanza.cpp b/src/xmpp/xmpp-core/xmpp_stanza.cpp
index fb6e74d6..fd74c0cc 100644
--- a/src/xmpp/xmpp-core/xmpp_stanza.cpp
+++ b/src/xmpp/xmpp-core/xmpp_stanza.cpp
@@ -81,6 +81,16 @@ Stanza::Error::Error(int _type, int _condition, const QString &_text, const QDom
     originalCode = 0;
 }
 
+void Stanza::Error::reset()
+{
+    type = 0;
+    condition = UndefinedCondition;
+    text.clear();
+    by.clear();
+    appSpec = QDomElement();
+    originalCode = 0;
+}
+
 
 class Stanza::Error::Private
 {
diff --git a/src/xmpp/xmpp-core/xmpp_stanza.h b/src/xmpp/xmpp-core/xmpp_stanza.h
index 34558ea0..f9be5d62 100644
--- a/src/xmpp/xmpp-core/xmpp_stanza.h
+++ b/src/xmpp/xmpp-core/xmpp_stanza.h
@@ -79,6 +79,8 @@ namespace XMPP
             QString by;
             QDomElement appSpec;
 
+            void reset();
+
             int code() const;
             bool fromCode(int code);
 
diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 3074146e..7d08fa2f 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -389,6 +389,7 @@ class Application::Private
     Origin  creator;
     Origin  senders;
     Origin  transportFailedOrigin = Origin::None;
+    XMPP::Stanza::Error lastError;
     QSharedPointer<Transport> transport;
     Connection::Ptr connection;
     QStringList availableTransports;
@@ -503,6 +504,11 @@ void Application::setState(State state)
     d->setState(state);
 }
 
+Stanza::Error Application::lastError() const
+{
+    return d->lastError;
+}
+
 QString Application::contentName() const
 {
     return d->contentName;
@@ -612,22 +618,22 @@ bool Application::setTransport(const QSharedPointer<Transport> &transport)
     return true;
 }
 
+Origin Application::transportReplaceOrigin() const
+{
+    return d->transportFailedOrigin;
+}
+
 bool Application::replaceTransport(const QSharedPointer<Transport> &transport)
 {
-    // remote party called transport-replace
-    auto peerRole = d->pad->session()->peerRole();
-    // if transport recovery is in progress and I as an inititiator started it then forbid remote transport-replace
-    if (d->transportFailedOrigin != Origin::None && d->transportFailedOrigin != peerRole && d->pad->session()->role() == Origin::Initiator) {
-        // TODO tie-break
-        return false;
-    }
     auto prev = d->transportFailedOrigin;
-    d->transportFailedOrigin = peerRole;
+    d->transportFailedOrigin = d->pad->session()->peerRole();
     auto ret = setTransport(transport);
     if (ret)
         d->waitTransportAccept = false;
-    else
+    else {
         d->transportFailedOrigin = prev;
+        d->lastError.reset();
+    }
 
     return ret;
 }
diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index 7cd8fb04..495efe88 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -121,10 +121,12 @@ class Application : public XMPP::Jingle::Application
     ApplicationManagerPad::Ptr pad() const override;
     State state() const override;
     void setState(State state) override;
+    XMPP::Stanza::Error lastError() const;
 
     QString contentName() const override;
     Origin creator() const override;
     Origin senders() const override;
+    Origin transportReplaceOrigin() const;
     SetDescError setDescription(const QDomElement &description) override;
     void setFile(const File &file);
     File file() const;
diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index 6ee11381..f3c1c58e 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -1256,6 +1256,13 @@ class Session::Private
                 continue;
             }
 
+            auto tfo = app->transportReplaceOrigin();
+            // if transport recovery is in progress and I as an inititiator started it then forbid remote transport-replace
+            if (tfo != Origin::None && tfo != q->peerRole() && role == Origin::Initiator) {
+                lastError = ErrorUtil::makeTieBreak(*manager->client()->doc());
+                return false;
+            }
+
             passed.append(std::make_tuple(app, transport, ce));
         }
 
@@ -1882,6 +1889,11 @@ int ErrorUtil::jingleCondition(const Stanza::Error &error)
     return UnknownError;
 }
 
+Stanza::Error ErrorUtil::makeTieBreak(QDomDocument &doc)
+{
+    return make(doc, TieBreak, XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::Conflict);
+}
+
 
 } // namespace Jingle
 } // namespace XMPP
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index 619189bc..c03175a0 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -126,6 +126,7 @@ class ErrorUtil
     static const char* names[Last];
 
     static XMPP::Stanza::Error make(QDomDocument &doc, int jingleCond, int type=XMPP::Stanza::Error::Cancel, int condition=XMPP::Stanza::Error::UndefinedCondition, const QString &text=QString());
+    static XMPP::Stanza::Error makeTieBreak(QDomDocument &doc);
     static void fill(QDomDocument doc, XMPP::Stanza::Error &error, int jingleCond);
     static int jingleCondition(const XMPP::Stanza::Error &error);
 };
@@ -392,10 +393,12 @@ class Application : public QObject
     virtual ApplicationManagerPad::Ptr pad() const = 0;
     virtual State state() const = 0;
     virtual void setState(State state) = 0; // likely just remember the state and not generate any signals
+    virtual XMPP::Stanza::Error lastError() const = 0;
 
     virtual Origin creator() const = 0;
     virtual Origin senders() const = 0;
     virtual QString contentName() const = 0;
+    virtual Origin transportReplaceOrigin() const = 0; // returns Origin::None if no transport-replace in progress or the side triggered the replace.
     virtual SetDescError setDescription(const QDomElement &description) = 0;
 
     /**

From 798897507305e6257e6aae4c9bdc5115ee00edb2 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Thu, 13 Jun 2019 01:22:17 +0300
Subject: [PATCH 063/383] transport fallback fixes

---
 src/xmpp/xmpp-im/jingle-ft.cpp | 8 ++++----
 src/xmpp/xmpp-im/jingle.cpp    | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 7d08fa2f..47ce1d99 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -713,7 +713,7 @@ OutgoingUpdate Application::takeOutgoingUpdate()
     }
 
     if (d->state == State::PrepareLocalOffer) { // basically when we come to this function Created is possible only for outgoing content
-        if (!d->transport->hasUpdates()) { // failed to select next transport. can't continue
+        if (!d->transport->hasUpdates() && !d->transportReady) { // failed to select next transport. can't continue
             return OutgoingUpdate();
         }
 
@@ -783,11 +783,11 @@ bool Application::wantBetterTransport(const QSharedPointer<Transport> &t) const
 bool Application::selectNextTransport()
 {
     while (d->availableTransports.size()) {
-        auto t = d->pad->session()->newOutgoingTransport(d->availableTransports.first());
+        auto t = d->pad->session()->newOutgoingTransport(d->availableTransports.last());
         if (t && setTransport(t)) {
             return true;
         } else {
-            d->availableTransports.removeFirst();
+            d->availableTransports.removeLast();
         }
     }
     return false;
@@ -807,7 +807,7 @@ void Application::prepare()
 void Application::start()
 {
     if (d->transport) {
-        d->setState(State::Active);
+        d->setState(State::Connecting);
         d->transport->start();
     }
     // TODO we need QIODevice somewhere here
diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index f3c1c58e..5f6a657a 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -1357,6 +1357,7 @@ Session::Session(Manager *manager, const Jid &peer, Origin role) :
 
 Session::~Session()
 {
+    qDeleteAll(d->contentList);
     qDebug("session %s destroyed", qPrintable(d->sid));
 }
 

From 95691650abfd4d80843cd78280663caa9c979689 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Thu, 13 Jun 2019 08:22:18 +0300
Subject: [PATCH 064/383] More jingle fallback fixes

---
 src/xmpp/xmpp-core/xmpp_stanza.cpp | 43 +++++++++---------------------
 src/xmpp/xmpp-im/jingle.cpp        | 10 ++++---
 2 files changed, 18 insertions(+), 35 deletions(-)

diff --git a/src/xmpp/xmpp-core/xmpp_stanza.cpp b/src/xmpp/xmpp-core/xmpp_stanza.cpp
index fd74c0cc..ca2f39c6 100644
--- a/src/xmpp/xmpp-core/xmpp_stanza.cpp
+++ b/src/xmpp/xmpp-core/xmpp_stanza.cpp
@@ -327,23 +327,22 @@ bool Stanza::Error::fromXml(const QDomElement &e, const QString &baseNS)
     // type
     type = Private::stringToErrorType(e.attribute("type"));
     by = e.attribute(QLatin1String("by"));
-
-    // condition
-    QDomNodeList nl = e.childNodes();
-    QDomElement t;
     condition = -1;
-    int n;
-    for(n = 0; n < nl.count(); ++n) {
-        QDomNode i = nl.item(n);
-        t = i.toElement();
-        if(!t.isNull()) {
-            // FIX-ME: this shouldn't be needed
-            if(t.namespaceURI() == NS_STANZAS || t.attribute("xmlns") == NS_STANZAS) {
+
+    QString textTag(QString::fromLatin1("text"));
+    for (auto t = e.firstChildElement(); !t.isNull(); t = t.nextSiblingElement()) {
+        if(t.namespaceURI() == NS_STANZAS || t.attribute(QString::fromLatin1("xmlns")) == NS_STANZAS) {
+            if (t.tagName() == textTag) {
+                text = t.text().trimmed();
+            } else {
                 condition = Private::stringToErrorCond(t.tagName());
-                if (condition != -1)
-                    break;
             }
+        } else {
+            appSpec = t;
         }
+
+        if (condition != -1 && !appSpec.isNull() && !text.isEmpty())
+            break;
     }
 
     // code
@@ -361,24 +360,6 @@ bool Stanza::Error::fromXml(const QDomElement &e, const QString &baseNS)
             condition = guess.second != -1 ? guess.second : UndefinedCondition;
     }
 
-    // text
-    t = e.elementsByTagNameNS(NS_STANZAS, "text").item(0).toElement();
-    if(!t.isNull())
-        text = t.text().trimmed();
-    else
-        text = e.text().trimmed();
-
-    // appspec: find first non-standard namespaced element
-    appSpec = QDomElement();
-    nl = e.childNodes();
-    for(n = 0; n < nl.count(); ++n) {
-        QDomNode i = nl.item(n);
-        if(i.isElement() && i.namespaceURI() != NS_STANZAS) {
-            appSpec = i.toElement();
-            break;
-        }
-    }
-
     return true;
 }
 
diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index 5f6a657a..0a5d82a5 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -687,7 +687,8 @@ class Session::Private
                 }
             } else {
                 lastError = jt->error();
-                setSessionFinished();
+                if (ErrorUtil::jingleCondition(lastError) != ErrorUtil::TieBreak)
+                    setSessionFinished();
             }
         });
         waitingAck = true;
@@ -1867,24 +1868,25 @@ const char* ErrorUtil::names[ErrorUtil::Last] = {"out-of-order","tie-break", "un
 
 Stanza::Error ErrorUtil::make(QDomDocument &doc, int jingleCond, int type, int condition, const QString &text)
 {
-    auto el = doc.createElementNS(ERROR_NS, QString::fromLatin1(names[jingleCond]));
+    auto el = doc.createElementNS(ERROR_NS, QString::fromLatin1(names[jingleCond - 1]));
     return Stanza::Error(type, condition, text, el);
 }
 
 void ErrorUtil::fill(QDomDocument doc, Stanza::Error &error, int jingleCond)
 {
-    error.appSpec = doc.createElementNS(ERROR_NS, QString::fromLatin1(names[jingleCond]));
+    error.appSpec = doc.createElementNS(ERROR_NS, QString::fromLatin1(names[jingleCond - 1]));
 }
 
 int ErrorUtil::jingleCondition(const Stanza::Error &error)
 {
+    //qDebug() << "tag" << error.appSpec.tagName() << "xmlns" << error.appSpec.attribute(QString::fromLatin1("xmlns")) << "ns" << error.appSpec.namespaceURI();
     if (error.appSpec.attribute(QString::fromLatin1("xmlns")) != ERROR_NS) {
         return UnknownError;
     }
     QString tagName = error.appSpec.tagName();
     for (int i = 0; i < int(sizeof(names) / sizeof(names[0])); ++i) {
         if (tagName == names[i]) {
-            return i;
+            return i + 1;
         }
     }
     return UnknownError;

From b60d36853743b9ef73f709f3d8f7beea04a7bb59 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Thu, 13 Jun 2019 19:02:07 +0300
Subject: [PATCH 065/383] Another jingle transport fallback fix

---
 src/xmpp/xmpp-im/jingle-ft.cpp  |  6 +++++-
 src/xmpp/xmpp-im/jingle-ibb.cpp |  9 +++++++--
 src/xmpp/xmpp-im/jingle-s5b.cpp | 10 ++++++++--
 src/xmpp/xmpp-im/jingle.cpp     |  2 ++
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 47ce1d99..342f74d6 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -626,6 +626,10 @@ Origin Application::transportReplaceOrigin() const
 bool Application::replaceTransport(const QSharedPointer<Transport> &transport)
 {
     auto prev = d->transportFailedOrigin;
+    if (d->pad->session()->role() == Origin::Responder && prev == Origin::Responder && d->transport) {
+        // if I'm a responder and tried to send transport-replace too, then push ns back
+        d->availableTransports.append(d->transport->pad()->ns());
+    }
     d->transportFailedOrigin = d->pad->session()->peerRole();
     auto ret = setTransport(transport);
     if (ret)
@@ -665,8 +669,8 @@ Action Application::outgoingUpdateType() const
         }
         break;
     case State::Connecting:
-    case State::Active:
     case State::Pending:
+    case State::Active:
         if (d->transportFailedOrigin != Origin::None && (d->state == State::Active || !d->transport))
             return Action::ContentRemove;
 
diff --git a/src/xmpp/xmpp-im/jingle-ibb.cpp b/src/xmpp/xmpp-im/jingle-ibb.cpp
index fce8e769..0ef725d4 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.cpp
+++ b/src/xmpp/xmpp-im/jingle-ibb.cpp
@@ -190,8 +190,10 @@ Transport::Transport(const TransportManagerPad::Ptr &pad, const QDomElement &tra
 Transport::~Transport()
 {
     // we have to mark all of them as finished just in case they are captured somewhere else
-    for (auto &c: d->connections) {
-        c->finished = true;
+    if (d) {
+        for (auto &c: d->connections) {
+            c->finished = true;
+        }
     }
 }
 
@@ -262,6 +264,9 @@ bool Transport::update(const QDomElement &transportEl)
                 auto c = static_cast<Connection*>(sender());
                 d->handleConnected(d->connections.value(c->sid));
             });
+        } else {
+            qWarning("failed to create IBB connection");
+            return false;
         }
     } else {
         if (bs_final < (*it)->_blockSize) {
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 5e303f7a..8cd76da8 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -211,13 +211,13 @@ class Candidate::Private : public QObject, public QSharedData {
 public:
     ~Private()
     {
-        if (server) {
+        if (server && transport) {
             server->unregisterKey(transport->directAddr());
         }
         delete socksClient;
     }
 
-    Transport *transport;
+    QPointer<Transport> transport;
     QString cid;
     QString host;
     Jid jid;
@@ -1151,6 +1151,12 @@ Transport::~Transport()
         for (auto &c: d->remoteCandidates) {
             c.deleteSocksClient();
         }
+        for (auto &c: d->remoteCandidates) {
+            auto srv = c.server();
+            if (srv) {
+                srv.staticCast<S5BServer>()->unregisterKey(d->directAddr);
+            }
+        }
     }
 }
 
diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index 0a5d82a5..1ce723d1 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -689,6 +689,8 @@ class Session::Private
                 lastError = jt->error();
                 if (ErrorUtil::jingleCondition(lastError) != ErrorUtil::TieBreak)
                     setSessionFinished();
+                else
+                    planStep();
             }
         });
         waitingAck = true;

From 5bfaa569f2903e3604c1925e6931f7e940ae14fc Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Thu, 13 Jun 2019 20:38:57 +0300
Subject: [PATCH 066/383] valgrind fixes

---
 src/xmpp/xmpp-im/httpfileupload.cpp |  5 +++++
 src/xmpp/xmpp-im/httpfileupload.h   |  1 +
 src/xmpp/xmpp-im/jingle-ibb.h       |  4 ++--
 src/xmpp/xmpp-im/jingle-s5b.cpp     | 14 +++++++-------
 src/xmpp/xmpp-im/jingle-s5b.h       |  2 +-
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/xmpp/xmpp-im/httpfileupload.cpp b/src/xmpp/xmpp-im/httpfileupload.cpp
index 67d93fc0..77a53620 100644
--- a/src/xmpp/xmpp-im/httpfileupload.cpp
+++ b/src/xmpp/xmpp-im/httpfileupload.cpp
@@ -427,6 +427,11 @@ HttpFileUploadManager::HttpFileUploadManager(Client *parent) :
     d->client = parent;
 }
 
+HttpFileUploadManager::~HttpFileUploadManager()
+{
+    delete d;
+}
+
 void HttpFileUploadManager::setNetworkAccessManager(QNetworkAccessManager *qnam)
 {
     d->externalQnam = true;
diff --git a/src/xmpp/xmpp-im/httpfileupload.h b/src/xmpp/xmpp-im/httpfileupload.h
index 43298393..935ed0c6 100644
--- a/src/xmpp/xmpp-im/httpfileupload.h
+++ b/src/xmpp/xmpp-im/httpfileupload.h
@@ -149,6 +149,7 @@ class HttpFileUploadManager : public QObject
     typedef std::function<void(bool,const QString &)> Callback; // params: success, detail. where detail could be a "get" url
 
     HttpFileUploadManager(Client *parent);
+    ~HttpFileUploadManager();
 
     /**
      * @brief setNetworkAccessManager sets network access manager to do http requests.
diff --git a/src/xmpp/xmpp-im/jingle-ibb.h b/src/xmpp/xmpp-im/jingle-ibb.h
index 7486f476..e1383ecb 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.h
+++ b/src/xmpp/xmpp-im/jingle-ibb.h
@@ -72,8 +72,8 @@ class Pad : public TransportManagerPad
 
     Connection::Ptr makeConnection(const QString &sid, size_t blockSize);
 private:
-    Manager *_manager;
-    Session *_session;
+    Manager *_manager = nullptr;
+    Session *_session = nullptr;
 };
 
 class Manager : public TransportManager {
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 8cd76da8..6d3b505c 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -229,7 +229,7 @@ class Candidate::Private : public QObject, public QSharedData {
     QSharedPointer<S5BServer> server;
     SocksClient *socksClient = nullptr;
 
-    void connectToHost(const QString &key, State successState, std::function<void(bool)> callback, bool isUdp)
+    void connectToHost(const QString &key, State successState, QObject *callbackContext, std::function<void(bool)> callback, bool isUdp)
     {
         QHostAddress ha(host);
         if (!ha.isNull() && ha.protocol() == QAbstractSocket::IPv6Protocol && ha.scopeId().isEmpty() &&
@@ -264,12 +264,12 @@ class Candidate::Private : public QObject, public QSharedData {
         } else {
             socksClient = new SocksClient;
             qDebug() << "connect to host with cid=" << cid << ", key=" << key << " and socks client" << socksClient;
-            connect(socksClient, &SocksClient::connected, [this, callback, successState](){
+            connect(socksClient, &SocksClient::connected, callbackContext, [this, callback, successState](){
                 state = successState;
                 qDebug() << "socks client"  << socksClient << "is connected";
                 callback(true);
             });
-            connect(socksClient, &SocksClient::error, [this, callback](int error){
+            connect(socksClient, &SocksClient::error, callbackContext, [this, callback](int error){
                 Q_UNUSED(error);
                 state = Candidate::Discarded;
                 qDebug() << "socks client"  << socksClient << "failed to connect";
@@ -509,9 +509,9 @@ QDomElement Candidate::toXml(QDomDocument *doc) const
     return e;
 }
 
-void Candidate::connectToHost(const QString &key, State successState, std::function<void(bool)> callback, bool isUdp)
+void Candidate::connectToHost(const QString &key, State successState, QObject *callbackContext, std::function<void(bool)> callback, bool isUdp)
 {
-    d->connectToHost(key, successState, callback, isUdp);
+    d->connectToHost(key, successState, callbackContext, callback, isUdp);
 }
 
 bool Candidate::incomingConnection(SocksClient *sc)
@@ -778,7 +778,7 @@ class Transport::Private
             lastConnectionStart.start();
             QString key = mnc.type() == Candidate::Proxy? dstaddr : directAddr;
             mnc.setState(Candidate::Probing);
-            mnc.connectToHost(key, Candidate::Pending, [this, mnc](bool success) {
+            mnc.connectToHost(key, Candidate::Pending, q, [this, mnc](bool success) {
                 // candidate's status had to be changed by connectToHost, so we don't set it again
                 if (success) {
                     // let's reject candidates which are meaningless to try
@@ -908,7 +908,7 @@ class Transport::Private
                             if (c == localUsedCandidate) {
                                 // it's our side who proposed proxy. so we have to connect to it and activate
                                 auto key = makeKey(sid, pad->session()->me(), pad->session()->peer());
-                                c.connectToHost(key, Candidate::Accepted, [this](bool success){
+                                c.connectToHost(key, Candidate::Accepted, q, [this](bool success){
                                     if (!success) {
                                         pendingActions |= Private::ProxyError;
                                         emit q->updated();
diff --git a/src/xmpp/xmpp-im/jingle-s5b.h b/src/xmpp/xmpp-im/jingle-s5b.h
index 8ecf0056..4c1b344c 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.h
+++ b/src/xmpp/xmpp-im/jingle-s5b.h
@@ -107,7 +107,7 @@ class Candidate {
 
     QDomElement toXml(QDomDocument *doc) const;
 
-    void connectToHost(const QString &key, State successState, std::function<void (bool)> callback, bool isUdp = false);
+    void connectToHost(const QString &key, State successState, QObject *callbackContext, std::function<void (bool)> callback, bool isUdp = false);
     bool incomingConnection(SocksClient *sc);
     SocksClient* takeSocksClient();
     void deleteSocksClient();

From e8125a6f601103fa56b472251c79e6f3d7665301 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Fri, 14 Jun 2019 08:25:14 +0300
Subject: [PATCH 067/383] Started refactoring jingle transport updates api

---
 src/xmpp/xmpp-im/jingle-ft.cpp  | 149 +++++++++++++++++++-------------
 src/xmpp/xmpp-im/jingle-ft.h    |   8 +-
 src/xmpp/xmpp-im/jingle-ibb.cpp |  58 +++++++++----
 src/xmpp/xmpp-im/jingle-ibb.h   |   2 +
 src/xmpp/xmpp-im/jingle-s5b.cpp |  29 +++++--
 src/xmpp/xmpp-im/jingle-s5b.h   |   2 +
 src/xmpp/xmpp-im/jingle.cpp     |  53 +++++++++---
 src/xmpp/xmpp-im/jingle.h       |  35 +++++++-
 8 files changed, 236 insertions(+), 100 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 342f74d6..faf817df 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -382,6 +382,7 @@ class Application::Private
 public:
     Application *q = nullptr;
     State   state = State::Created;
+    Action  updateToSend = Action::NoAction;
     QSharedPointer<Pad> pad;
     QString contentName;
     File    file;
@@ -623,7 +624,7 @@ Origin Application::transportReplaceOrigin() const
     return d->transportFailedOrigin;
 }
 
-bool Application::replaceTransport(const QSharedPointer<Transport> &transport)
+bool Application::incomingTransportReplace(const QSharedPointer<Transport> &transport)
 {
     auto prev = d->transportFailedOrigin;
     if (d->pad->session()->role() == Origin::Responder && prev == Origin::Responder && d->transport) {
@@ -647,80 +648,96 @@ QSharedPointer<Transport> Application::transport() const
     return d->transport;
 }
 
-Action Application::outgoingUpdateType() const
+Action Application::evaluateOutgoingUpdate()
 {
-    if (d->waitTransportAccept && d->state < State::Finishing)
-        return Action::NoAction;
+    d->updateToSend = Action::NoAction;
+    if (!isValid() || d->state == State::Created || d->state == State::Finished || (d->waitTransportAccept && d->state < State::Finishing)) {
+        return d->updateToSend;
+    }
 
     switch (d->state) {
     case State::Created:
         break;
     case State::PrepareLocalOffer:
         if (d->transportFailedOrigin != Origin::None && !d->transport)
-            return Action::ContentReject; // case me=creator was already handled by this momemnt. see Transport::failed connectio above
+            d->updateToSend = Action::ContentReject; // case me=creator was already handled by this momemnt. see Transport::failed connectio above
 
-        if (d->transport->hasUpdates() || d->transportReady) {
+        else if (d->transport->hasUpdates() || d->transportReady) {
             d->transportReady = true;
             auto myRole = d->pad->session()->role();
-            if (d->creator == myRole) {
-                return Action::ContentAdd;
-            }
-            return d->transportFailedOrigin == myRole? Action::TransportReplace : Action::ContentAccept;
+            if (d->creator == myRole)
+                d->updateToSend = Action::ContentAdd;
+            else
+                d->updateToSend = d->transportFailedOrigin == myRole? Action::TransportReplace : Action::ContentAccept;
         }
         break;
     case State::Connecting:
     case State::Pending:
     case State::Active:
         if (d->transportFailedOrigin != Origin::None && (d->state == State::Active || !d->transport))
-            return Action::ContentRemove;
+            d->updateToSend = Action::ContentRemove;
 
-        if (d->transport->hasUpdates()) {
-            if (d->transportFailedOrigin != Origin::None) {
-                return Action::TransportReplace;
-            }
-            return Action::TransportInfo;
+        else if (d->transport->hasUpdates()) {
+            if (d->transportFailedOrigin != Origin::None)
+                d->updateToSend = d->transportFailedOrigin == d->pad->session()->role()? Action::TransportReplace : Action::TransportAccept;
+            else
+                d->updateToSend = Action::TransportInfo;
         }
         break;
     case State::Finishing:
         if (d->transportFailedOrigin != Origin::None) {
-            return Action::ContentRemove;
+            d->updateToSend = Action::ContentRemove;
+        } else {
+            d->updateToSend = Action::SessionInfo;
         }
-        return Action::SecurityInfo;
+        break;
     default:
         break;
     }
-    return Action::NoAction; // TODO
+    return d->updateToSend; // TODO
 }
 
 OutgoingUpdate Application::takeOutgoingUpdate()
 {
-    if (!isValid() || d->state == State::Created) {
+    if (d->updateToSend == Action::NoAction) {
         return OutgoingUpdate();
     }
 
-    if (d->waitTransportAccept && d->state < State::Finishing)
-        return OutgoingUpdate();
-
     auto client = d->pad->session()->manager()->client();
     auto doc = client->doc();
 
-    // content-remove or content-reject
-    if (d->transportFailedOrigin != Origin::None && (d->state >= State::Active || !d->transport)) {
-        ContentBase cb(d->creator, d->contentName);
-        QList<QDomElement> updates;
-        updates << cb.toXml(doc, "content");
-        updates << Reason(Reason::Condition::FailedTransport).toXml(doc);
-        return OutgoingUpdate{updates, [this](){
+    if (d->updateToSend == Action::SessionInfo) {
+        if (d->state != State::Finishing) {
+            // TODO implement
+            return OutgoingUpdate();
+        }
+        ContentBase cb(d->pad->session()->role(), d->contentName);
+        return OutgoingUpdate{QList<QDomElement>() << cb.toXml(doc, "received"), [this](){
                 d->setState(State::Finished);
             }
         };
     }
 
-    if (d->state == State::PrepareLocalOffer) { // basically when we come to this function Created is possible only for outgoing content
-        if (!d->transport->hasUpdates() && !d->transportReady) { // failed to select next transport. can't continue
-            return OutgoingUpdate();
-        }
+    QDomElement transportEl;
+    OutgoingUpdateCB transportCB;
 
+    ContentBase cb(d->creator, d->contentName);
+    if (d->state == State::PrepareLocalOffer)
+        cb.senders = d->senders;
+    QList<QDomElement> updates;
+    auto contentEl = cb.toXml(doc, "content");
+    updates << contentEl;
+
+    switch (d->updateToSend) {
+    case Action::ContentReject:
+    case Action::ContentRemove:
+        updates << Reason(Reason::Condition::FailedTransport).toXml(doc); // do we have other reasons?
+        return OutgoingUpdate{updates, [this](){
+                d->setState(State::Finished);
+            }
+        };
+    case Action::ContentAdd:
+    case Action::ContentAccept:
         if (d->file.thumbnail().data.size()) {
             auto thumb = d->file.thumbnail();
             auto bm = client->bobManager();
@@ -728,27 +745,41 @@ OutgoingUpdate Application::takeOutgoingUpdate()
             thumb.uri = QLatin1String("cid:") + data.cid();
             d->file.setThumbnail(thumb);
         }
-        ContentBase cb(d->creator, d->contentName);
-        cb.senders = d->senders;
-        auto cel = cb.toXml(doc, "content");
-        cel.appendChild(doc->createElementNS(NS, "description")).appendChild(d->file.toXml(doc));
-        QDomElement tel;
-        OutgoingUpdateCB trCallback;
-        std::tie(tel, trCallback) = d->transport->takeOutgoingUpdate();
-        cel.appendChild(tel);
-
-        if (d->transportFailedOrigin == d->pad->session()->role()) {
-            d->waitTransportAccept = true;
-            return OutgoingUpdate{QList<QDomElement>()<<cel, trCallback};
+        contentEl.appendChild(doc->createElementNS(NS, QString::fromLatin1("description"))).appendChild(d->file.toXml(doc));
+        if (d->transport->hasUpdates()) {
+            std::tie(transportEl, transportCB) = d->transport->takeOutgoingUpdate();
+        } else {
+            transportEl = doc->createElementNS(d->transport->pad()->ns(), QString::fromLatin1("transport"));
         }
+        contentEl.appendChild(transportEl);
 
         d->setState(State::Unacked);
-        return OutgoingUpdate{QList<QDomElement>()<<cel, [this, trCallback](){
-                if (trCallback) {
-                    trCallback();
+        return OutgoingUpdate{updates, [this, transportCB](){
+                if (transportCB) {
+                    transportCB();
                 }
                 d->setState(d->pad->session()->role() == Origin::Initiator? State::Pending : State::Connecting);
             }};
+    case Action::TransportInfo:
+        Q_ASSERT(d->transport->hasUpdates());
+        std::tie(transportEl, transportCB) = d->transport->takeOutgoingUpdate();
+        contentEl.appendChild(transportEl);
+        return OutgoingUpdate{updates, transportCB};
+    case Action::TransportReplace:
+        Q_ASSERT(d->transport->hasUpdates());
+        std::tie(transportEl, transportCB) = d->transport->takeOutgoingUpdate();
+        contentEl.appendChild(transportEl);
+        return OutgoingUpdate{updates, transportCB};
+    }
+
+
+    if (d->state == State::PrepareLocalOffer) { // basically when we come to this function Created is possible only for outgoing content
+
+        if (d->transportFailedOrigin == d->pad->session()->role()) {
+            d->waitTransportAccept = true;
+            return OutgoingUpdate{QList<QDomElement>()<<contentEl, transportCB};
+        }
+
     }
     if (d->state == State::Connecting || d->state == State::Active || d->state == State::Pending) {
         if (d->transport->hasUpdates()) { // failed to select next transport. can't continue
@@ -769,11 +800,7 @@ OutgoingUpdate Application::takeOutgoingUpdate()
         }
     }
     if (d->state == State::Finishing) {
-        ContentBase cb(d->pad->session()->role(), d->contentName);
-        return OutgoingUpdate{QList<QDomElement>() << cb.toXml(doc, "received"), [this](){
-                d->setState(State::Finished);
-            }
-        };
+
     }
     return OutgoingUpdate(); // TODO
 }
@@ -829,16 +856,20 @@ bool Application::accept(const QDomElement &el)
     return true;
 }
 
-void Application::setTransportAccepted()
+bool Application::incomingTransportAccept(const QSharedPointer<Transport> &transport)
 {
-    d->waitTransportAccept = false;
-    d->transportFailedOrigin = Origin::None;
-    emit updated();
+    if (d->transport->update(transport)) {
+        d->waitTransportAccept = false;
+        d->transportFailedOrigin = Origin::None;
+        emit updated();
+        return true;
+    }
+    return false;
 }
 
 bool Application::isValid() const
 {
-    return d->file.isValid() && d->transport &&  d->contentName.size() > 0 &&
+    return d->file.isValid() &&  d->contentName.size() > 0 &&
             (d->senders == Origin::Initiator || d->senders == Origin::Responder);
 }
 
diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index 495efe88..e21c417e 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -134,20 +134,22 @@ class Application : public XMPP::Jingle::Application
     bool setTransport(const QSharedPointer<Transport> &transport) override;
     QSharedPointer<Transport> transport() const override;
 
-    Action outgoingUpdateType() const override;
+    Action evaluateOutgoingUpdate() override;
     OutgoingUpdate takeOutgoingUpdate() override;
     bool wantBetterTransport(const QSharedPointer<XMPP::Jingle::Transport> &) const override;
     bool selectNextTransport() override;
     void prepare() override;
     void start() override;
     bool accept(const QDomElement &el) override;
-    bool replaceTransport(const QSharedPointer<Transport> &transport) override;
-    void setTransportAccepted() override;
 
     bool isValid() const;
 
     void setDevice(QIODevice *dev, bool closeOnFinish = true);
 
+protected:
+    bool incomingTransportReplace(const QSharedPointer<Transport> &transport) override;
+    bool incomingTransportAccept(const QSharedPointer<Transport> &transport) override;
+
 signals:
     void deviceRequested(quint64 offset, quint64 size);
     void progress(quint64 offset);
diff --git a/src/xmpp/xmpp-im/jingle-ibb.cpp b/src/xmpp/xmpp-im/jingle-ibb.cpp
index 0ef725d4..012468ae 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.cpp
+++ b/src/xmpp/xmpp-im/jingle-ibb.cpp
@@ -138,8 +138,10 @@ struct Transport::Private
     Pad::Ptr pad;
     QMap<QString,QSharedPointer<Connection>> connections;
     QList<QSharedPointer<Connection>> readyConnections;
+    QSharedPointer<Connection> lastOfferedConnection;
     size_t defaultBlockSize = 4096;
     bool started = false;
+    bool initialOfferSent = false; // if we ever sent anything
 
     void checkAndStartConnection(QSharedPointer<Connection> &c)
     {
@@ -159,6 +161,29 @@ struct Transport::Private
             emit q->connected();
         }
     }
+
+    OutgoingTransportInfoUpdate makeOffer(const QSharedPointer<Connection> &connection)
+    {
+        OutgoingTransportInfoUpdate upd;
+        if (!connection) {
+            return upd;
+        }
+
+        auto doc = pad->session()->manager()->client()->doc();
+
+        QDomElement tel = doc->createElementNS(NS, "transport");
+        tel.setAttribute(QStringLiteral("sid"), connection->sid);
+        tel.setAttribute(QString::fromLatin1("block-size"), qulonglong(connection->_blockSize));
+
+        upd = OutgoingTransportInfoUpdate{tel, [this, connection]() mutable {
+            if (started)
+                checkAndStartConnection(connection);
+        }};
+
+        lastOfferedConnection = connection;
+        connection->offerSent = true;
+        return upd;
+    }
 };
 
 Transport::Transport(const TransportManagerPad::Ptr &pad) :
@@ -282,6 +307,21 @@ bool Transport::update(const QDomElement &transportEl)
     return true;
 }
 
+
+bool Transport::isInitialOfferReady() const
+{
+    return isValid() && (hasUpdates() || d->initialOfferSent);
+}
+
+OutgoingTransportInfoUpdate Transport::takeInitialOffer()
+{
+    auto upd = takeOutgoingUpdate();
+    if (std::get<0>(upd).isNull() && d->lastOfferedConnection) {
+        return d->makeOffer(d->lastOfferedConnection);
+    }
+    return upd;
+}
+
 bool Transport::hasUpdates() const
 {
     for (auto &c: d->connections) {
@@ -306,23 +346,7 @@ OutgoingTransportInfoUpdate Transport::takeOutgoingUpdate()
             break;
         }
     }
-    if (!connection) {
-        return upd;
-    }
-
-    auto doc = d->pad->session()->manager()->client()->doc();
-
-    QDomElement tel = doc->createElementNS(NS, "transport");
-    tel.setAttribute(QStringLiteral("sid"), connection->sid);
-    tel.setAttribute(QString::fromLatin1("block-size"), qulonglong(connection->_blockSize));
-
-    upd = OutgoingTransportInfoUpdate{tel, [this, connection]() mutable {
-        if (d->started)
-            d->checkAndStartConnection(connection);
-    }};
-
-    connection->offerSent = true;
-    return upd;
+    return d->makeOffer(connection);
 }
 
 bool Transport::isValid() const
diff --git a/src/xmpp/xmpp-im/jingle-ibb.h b/src/xmpp/xmpp-im/jingle-ibb.h
index e1383ecb..7b2011df 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.h
+++ b/src/xmpp/xmpp-im/jingle-ibb.h
@@ -42,6 +42,8 @@ class Transport : public XMPP::Jingle::Transport
 
     void prepare() override;
     void start() override;
+    bool isInitialOfferReady() const override;
+    OutgoingTransportInfoUpdate takeInitialOffer() override;
     bool update(const QDomElement &transportEl) override;
     bool hasUpdates() const override;
     OutgoingTransportInfoUpdate takeOutgoingUpdate() override;
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 6d3b505c..49cbe9a8 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -397,7 +397,7 @@ Candidate::Candidate(Transport *transport, const TcpPortServer::Ptr &server, con
     d->transport = transport;
     d->server = server.staticCast<S5BServer>();
     d->cid = cid;
-    d->host = server->publishHost();
+    d->host = "192.168.0.44";//server->publishHost();
     d->port = server->publishPort();
     d->type = type;
     static const int priorities[] = {0, ProxyPreference, TunnelPreference, AssistedPreference, DirectPreference};
@@ -571,6 +571,7 @@ class Transport::Private
     Pad::Ptr pad;
     bool meCreator = true; // content created on local side
     bool transportStarted = false; // where start() was called
+    bool offerSent = false;
     bool waitingAck = true;
     bool aborted = false;
     bool remoteReportedCandidateError = false;
@@ -1183,7 +1184,7 @@ void Transport::prepare()
     });
     d->onLocalServerDiscovered();
 
-    d->discoS5BProxy();
+    //d->discoS5BProxy();
 
     emit updated();
 }
@@ -1312,6 +1313,25 @@ bool Transport::update(const QDomElement &transportEl)
     return false;
 }
 
+
+bool Transport::isInitialOfferReady() const
+{
+    return isValid() && (d->pendingActions || d->offerSent);
+}
+
+OutgoingTransportInfoUpdate Transport::takeInitialOffer()
+{
+    d->offerSent = true;
+    auto upd = takeOutgoingUpdate();
+    auto tel = std::get<0>(upd);
+    if (d->meCreator && d->mode != Tcp) {
+        tel.setAttribute(QStringLiteral("mode"), "udp");
+    }
+    tel.setAttribute(QString::fromLatin1("block-size"), qulonglong(d->blockSize));
+
+    return upd;
+}
+
 bool Transport::hasUpdates() const
 {
     return isValid() && d->pendingActions;
@@ -1328,10 +1348,6 @@ OutgoingTransportInfoUpdate Transport::takeOutgoingUpdate()
 
     QDomElement tel = doc->createElementNS(NS, "transport");
     tel.setAttribute(QStringLiteral("sid"), d->sid);
-    if (d->meCreator && d->mode != Tcp) {
-        tel.setAttribute(QStringLiteral("mode"), "udp");
-    }
-    tel.setAttribute(QString::fromLatin1("block-size"), qulonglong(d->blockSize));
 
     if (d->pendingActions & Private::NewCandidate) {
         d->pendingActions &= ~Private::NewCandidate;
@@ -1623,3 +1639,4 @@ void Pad::registerSid(const QString &sid)
 } // namespace XMPP
 
 #include "jingle-s5b.moc"
+
diff --git a/src/xmpp/xmpp-im/jingle-s5b.h b/src/xmpp/xmpp-im/jingle-s5b.h
index 4c1b344c..80bfa28c 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.h
+++ b/src/xmpp/xmpp-im/jingle-s5b.h
@@ -140,6 +140,8 @@ class Transport : public XMPP::Jingle::Transport
     void prepare() override;
     void start() override;
     bool update(const QDomElement &transportEl) override;
+    bool isInitialOfferReady() const override;
+    OutgoingTransportInfoUpdate takeInitialOffer() override;
     bool hasUpdates() const override;
     OutgoingTransportInfoUpdate takeOutgoingUpdate() override;
     bool isValid() const override;
diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index 1ce723d1..f87a115e 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -751,7 +751,7 @@ class Session::Private
              */
             Action expectedContentAction = role == Origin::Initiator? Action::ContentAdd : Action::ContentAccept;
             for (const auto &c: contentList) {
-                auto out = c->outgoingUpdateType();
+                auto out = c->evaluateOutgoingUpdate();
                 if (out == Action::ContentReject) { // yeah we are rejecting local content. invalid?
                     lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
                     setSessionFinished();
@@ -821,7 +821,7 @@ class Session::Private
         QMultiMap<Action, Application*> updates;
 
         for (auto app : signalingContent) {
-            Action updateType = app->outgoingUpdateType();
+            Action updateType = app->evaluateOutgoingUpdate();
             if (updateType != Action::NoAction) {
                 updates.insert(updateType, app);
             }
@@ -869,7 +869,7 @@ class Session::Private
     void addAndInitContent(Origin creator, Application *content)
     {
         contentList.insert(ContentKey{content->contentName(), creator}, content);
-        if (state != State::Created && content->outgoingUpdateType() != Action::NoAction) {
+        if (state != State::Created && content->evaluateOutgoingUpdate() != Action::NoAction) {
             signalingContent.insert(content);
         }
         QObject::connect(content, &Application::updated, q, [this, content](){
@@ -1245,7 +1245,10 @@ class Session::Private
                 return false;
             }
             Application *app = contentList.value(ContentKey{cb.name, cb.creator});
-            if (!app) continue; //wtf?
+            if (!app) {
+                toReject.append(ce);
+                continue;
+            }
 
             auto trPad = q->transportPadFactory(transportNS);
             if (!trPad) {
@@ -1274,7 +1277,7 @@ class Session::Private
             QSharedPointer<Transport> transport;
             QDomElement ce;
             std::tie(app,transport,ce) = v;
-            if (!app->replaceTransport(transport)) { // app should generate transport accept eventually. content-accept will work too if the content wasn't accepted yet
+            if (!app->incomingTransportReplace(transport)) { // app should generate transport accept eventually. content-accept will work too if the content wasn't accepted yet
                 toReject.append(ce);
             }
         }
@@ -1289,24 +1292,52 @@ class Session::Private
 
     bool handleIncomingTransportAccept(const QDomElement &jingleEl)
     {
-        QSet<Application*> apps;
+        QList<std::tuple<Application*,QSharedPointer<Transport>,QDomElement>> passed;
+        QList<QDomElement> toReject;
         QString contentTag(QStringLiteral("content"));
         for(QDomElement ce = jingleEl.firstChildElement(contentTag);
             !ce.isNull(); ce = ce.nextSiblingElement(contentTag))
         {
             ContentBase cb(ce);
-            if (!cb.isValid()) {
+            auto transportEl = ce.firstChildElement(QString::fromLatin1("transport"));
+            QString transportNS = transportEl.attribute(QStringLiteral("xmlns"));
+            if (!cb.isValid() || transportEl.isNull() || transportNS.isEmpty()) {
                 lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
                 return false;
             }
             Application *app = contentList.value(ContentKey{cb.name, cb.creator});
-            if (app) {
-                apps.insert(app);
+            if (!app || !app->transport() || app->transport()->pad()->ns() != transportNS || !app->incomingTransportAccept(transportEl)) {
+                toReject.append(ce);
+                continue;
+            }
+
+            auto trPad = q->transportPadFactory(transportNS);
+            if (!trPad) {
+                toReject.append(ce);
+                continue;
+            }
+
+            auto transport = trPad->manager()->newTransport(trPad, transportEl);
+            if (!transport) {
+                toReject.append(ce);
+                continue;
             }
+
+            passed.append(std::make_tuple(app, transport, ce));
         }
 
-        for (auto app: apps) {
-            app->setTransportAccepted();
+        for (auto &v: passed) {
+            Application *app;
+            QSharedPointer<Transport> transport;
+            QDomElement ce;
+            std::tie(app,transport,ce) = v;
+            if (!app->incomingTransportAccept(transport)) { // app should generate transport accept eventually. content-accept will work too if the content wasn't accepted yet
+                toReject.append(ce);
+            }
+        }
+
+        if (toReject.size()) {
+            outgoingUpdates.insert(Action::TransportReject, OutgoingUpdate{toReject,OutgoingUpdateCB()});
         }
 
         planStep();
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index c03175a0..3b78048f 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -366,7 +366,9 @@ class Transport : public QObject {
                                 // for remote transport try to connect to all proposed hosts in order their priority.
                                 // in-band transport may just emit updated() here
     virtual bool update(const QDomElement &el) = 0; // accepts transport element on incoming transport-info
+    virtual bool isInitialOfferReady() const = 0;
     virtual bool hasUpdates() const = 0;
+    virtual OutgoingTransportInfoUpdate takeInitialOffer() = 0;
     virtual OutgoingTransportInfoUpdate takeOutgoingUpdate() = 0;
     virtual bool isValid() const = 0;
     virtual Features features() const = 0;
@@ -408,12 +410,28 @@ class Application : public QObject
      */
     virtual bool setTransport(const QSharedPointer<Transport> &transport) = 0;
     virtual QSharedPointer<Transport> transport() const = 0;
-    virtual Action outgoingUpdateType() const = 0;
-    virtual OutgoingUpdate takeOutgoingUpdate() = 0; // this may return something only when outgoingUpdateType() != NoAction
+
+    /**
+     * @brief evaluateOutgoingUpdate computes and prepares next update which will be taken with takeOutgoingUpdate
+     *   The updated will be taked immediately if considered to be most preferred among other updates types of
+     *   other applications.
+     * @return update type
+     */
+    virtual Action evaluateOutgoingUpdate() = 0;
+    virtual OutgoingUpdate takeOutgoingUpdate() = 0; // this may return something only when evaluateOutgoingUpdate() != NoAction
+
+    /**
+     * @brief wantBetterTransport checks if the transport is a better match for the application
+     * @return
+     */
     virtual bool wantBetterTransport(const QSharedPointer<Transport> &) const = 0;
+
+    /**
+     * @brief selectNextTransport selects next transport from compatible transports list.
+     *   The list is usually store in the application
+     * @return
+     */
     virtual bool selectNextTransport() = 0;
-    virtual bool replaceTransport(const QSharedPointer<Transport> &transport) = 0;
-    virtual void setTransportAccepted() = 0;
 
     /**
      * @brief prepare to send content-add/session-initiate
@@ -423,6 +441,15 @@ class Application : public QObject
     virtual bool accept(const QDomElement &el) = 0; // remote accepted our content
     virtual void start() = 0;
 
+protected:
+    /**
+     * @brief incomingTransportReplace it's jingle transport-replace
+     * @param transport
+     * @return
+     */
+    virtual bool incomingTransportReplace(const QSharedPointer<Transport> &transport) = 0;
+    virtual bool incomingTransportAccept(const QSharedPointer<Transport> &transport) = 0;
+
 signals:
     void updated(); // signal for session it has to send updates to remote. so it will follow with takeOutgoingUpdate() eventually
     void stateChanged(State);

From 31d5194559ba7281b3938da54226dff1b84dfd38 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Fri, 14 Jun 2019 20:50:39 +0300
Subject: [PATCH 068/383] Continue jingle updates refactoring

---
 src/xmpp/xmpp-im/jingle-ft.cpp  | 132 +++++++++++++++-----------------
 src/xmpp/xmpp-im/jingle-ft.h    |   2 +-
 src/xmpp/xmpp-im/jingle-ibb.cpp |   2 +-
 src/xmpp/xmpp-im/jingle-s5b.cpp |   4 +-
 src/xmpp/xmpp-im/jingle.cpp     |  38 ++-------
 src/xmpp/xmpp-im/jingle.h       |   3 +-
 6 files changed, 74 insertions(+), 107 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index faf817df..0a8ba1f6 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -382,6 +382,7 @@ class Application::Private
 public:
     Application *q = nullptr;
     State   state = State::Created;
+    State   transportReplaceState = State::Finished;
     Action  updateToSend = Action::NoAction;
     QSharedPointer<Pad> pad;
     QString contentName;
@@ -389,14 +390,12 @@ class Application::Private
     File    acceptFile; // as it comes with "accept" response
     Origin  creator;
     Origin  senders;
-    Origin  transportFailedOrigin = Origin::None;
+    Origin  transportReplaceOrigin = Origin::None;
     XMPP::Stanza::Error lastError;
     QSharedPointer<Transport> transport;
     Connection::Ptr connection;
     QStringList availableTransports;
-    bool transportReady = false; // when prepare local offer finished for the transport
     bool closeDeviceOnFinish = true;
-    bool waitTransportAccept = false;
     QIODevice *device = nullptr;
     quint64 bytesLeft = 0;
 
@@ -568,7 +567,8 @@ bool Application::setTransport(const QSharedPointer<Transport> &transport)
     d->transport = transport;
     connect(transport.data(), &Transport::updated, this, &Application::updated);
     connect(transport.data(), &Transport::connected, this, [this](){
-        d->transportFailedOrigin = Origin::None;
+        d->transportReplaceOrigin = Origin::None;
+        d->transportReplaceState = State::Finished; // not needed here probably
         d->connection = d->transport->connection();
         connect(d->connection.data(), &Connection::readyRead, this, [this](){
             if (!d->device) {
@@ -595,8 +595,7 @@ bool Application::setTransport(const QSharedPointer<Transport> &transport)
     });
 
     connect(transport.data(), &Transport::failed, this, [this](){
-        d->transportFailedOrigin = d->pad->session()->role();
-        d->waitTransportAccept = false;
+        d->transportReplaceOrigin = d->pad->session()->role();
         if (d->state >= State::Active) {
             emit updated(); // late failure are unhandled. just notify the remote
             return;
@@ -609,7 +608,9 @@ bool Application::setTransport(const QSharedPointer<Transport> &transport)
             } else {
                 emit updated(); // we have to notify our peer about failure
             }
-        } // else transport will notify when ready
+        } else {
+            d->transportReplaceState = State::PrepareLocalOffer;
+        }
     });
 
     if (d->state >= State::Unacked) {
@@ -621,23 +622,24 @@ bool Application::setTransport(const QSharedPointer<Transport> &transport)
 
 Origin Application::transportReplaceOrigin() const
 {
-    return d->transportFailedOrigin;
+    return d->transportReplaceOrigin;
 }
 
 bool Application::incomingTransportReplace(const QSharedPointer<Transport> &transport)
 {
-    auto prev = d->transportFailedOrigin;
+    auto prev = d->transportReplaceOrigin;
     if (d->pad->session()->role() == Origin::Responder && prev == Origin::Responder && d->transport) {
         // if I'm a responder and tried to send transport-replace too, then push ns back
         d->availableTransports.append(d->transport->pad()->ns());
     }
-    d->transportFailedOrigin = d->pad->session()->peerRole();
+    d->transportReplaceOrigin = d->pad->session()->peerRole();
     auto ret = setTransport(transport);
     if (ret)
-        d->waitTransportAccept = false;
+        d->transportReplaceState = State::PrepareLocalOffer;
     else {
-        d->transportFailedOrigin = prev;
+        d->transportReplaceOrigin = prev;
         d->lastError.reset();
+        // REVIEW We have to fail application here on tie-break or propose another transport
     }
 
     return ret;
@@ -651,41 +653,53 @@ QSharedPointer<Transport> Application::transport() const
 Action Application::evaluateOutgoingUpdate()
 {
     d->updateToSend = Action::NoAction;
-    if (!isValid() || d->state == State::Created || d->state == State::Finished || (d->waitTransportAccept && d->state < State::Finishing)) {
+    if (!isValid() || d->state == State::Created || d->state == State::Finished) {
         return d->updateToSend;
     }
 
+    auto evaluateTransportReplaceAction = [this]() {
+        if (d->transportReplaceState != State::PrepareLocalOffer || !d->transport->isInitialOfferReady())
+            return Action::NoAction;
+
+        return d->transportReplaceOrigin == d->pad->session()->role()? Action::TransportReplace : Action::TransportAccept;
+    };
+
     switch (d->state) {
     case State::Created:
         break;
     case State::PrepareLocalOffer:
-        if (d->transportFailedOrigin != Origin::None && !d->transport)
-            d->updateToSend = Action::ContentReject; // case me=creator was already handled by this momemnt. see Transport::failed connectio above
-
-        else if (d->transport->hasUpdates() || d->transportReady) {
-            d->transportReady = true;
-            auto myRole = d->pad->session()->role();
-            if (d->creator == myRole)
-                d->updateToSend = Action::ContentAdd;
-            else
-                d->updateToSend = d->transportFailedOrigin == myRole? Action::TransportReplace : Action::ContentAccept;
+        if (d->transportReplaceOrigin != Origin::None) {
+            if (!d->transport) {
+                d->updateToSend = Action::ContentReject; // case me=creator was already handled by this momemnt in case of app.PrepareLocalOffer. see Transport::failed above
+            }
+            d->updateToSend = evaluateTransportReplaceAction();
+            if (d->updateToSend == Action::TransportAccept) {
+                d->updateToSend = Action::ContentAccept;
+            }
+            return d->updateToSend;
         }
+
+        if (d->transport->isInitialOfferReady())
+            d->updateToSend = d->creator == d->pad->session()->role()? Action::ContentAdd : Action::ContentAccept;
+
         break;
     case State::Connecting:
     case State::Pending:
     case State::Active:
-        if (d->transportFailedOrigin != Origin::None && (d->state == State::Active || !d->transport))
-            d->updateToSend = Action::ContentRemove;
-
-        else if (d->transport->hasUpdates()) {
-            if (d->transportFailedOrigin != Origin::None)
-                d->updateToSend = d->transportFailedOrigin == d->pad->session()->role()? Action::TransportReplace : Action::TransportAccept;
+        if (d->transportReplaceOrigin != Origin::None) {
+            if (d->state == State::Active || !d->transport)
+                d->updateToSend = Action::ContentRemove;
             else
-                d->updateToSend = Action::TransportInfo;
+                d->updateToSend = evaluateTransportReplaceAction();
+            return d->updateToSend;
         }
+
+        if (d->transport->hasUpdates())
+            d->updateToSend = Action::TransportInfo;
+
         break;
     case State::Finishing:
-        if (d->transportFailedOrigin != Origin::None) {
+        if (d->transportReplaceOrigin != Origin::None) {
             d->updateToSend = Action::ContentRemove;
         } else {
             d->updateToSend = Action::SessionInfo;
@@ -731,13 +745,15 @@ OutgoingUpdate Application::takeOutgoingUpdate()
     switch (d->updateToSend) {
     case Action::ContentReject:
     case Action::ContentRemove:
-        updates << Reason(Reason::Condition::FailedTransport).toXml(doc); // do we have other reasons?
+        if (d->transportReplaceOrigin != Origin::None)
+            updates << Reason(Reason::Condition::FailedTransport).toXml(doc);
         return OutgoingUpdate{updates, [this](){
                 d->setState(State::Finished);
             }
         };
     case Action::ContentAdd:
     case Action::ContentAccept:
+        Q_ASSERT(d->transport->isInitialOfferReady());
         if (d->file.thumbnail().data.size()) {
             auto thumb = d->file.thumbnail();
             auto bm = client->bobManager();
@@ -766,42 +782,20 @@ OutgoingUpdate Application::takeOutgoingUpdate()
         contentEl.appendChild(transportEl);
         return OutgoingUpdate{updates, transportCB};
     case Action::TransportReplace:
-        Q_ASSERT(d->transport->hasUpdates());
-        std::tie(transportEl, transportCB) = d->transport->takeOutgoingUpdate();
+    case Action::TransportAccept:
+        Q_ASSERT(d->transport->isInitialOfferReady());
+        d->transportReplaceState = State::Unacked;
+        std::tie(transportEl, transportCB) = d->transport->takeInitialOffer();
         contentEl.appendChild(transportEl);
-        return OutgoingUpdate{updates, transportCB};
-    }
-
-
-    if (d->state == State::PrepareLocalOffer) { // basically when we come to this function Created is possible only for outgoing content
-
-        if (d->transportFailedOrigin == d->pad->session()->role()) {
-            d->waitTransportAccept = true;
-            return OutgoingUpdate{QList<QDomElement>()<<contentEl, transportCB};
-        }
-
-    }
-    if (d->state == State::Connecting || d->state == State::Active || d->state == State::Pending) {
-        if (d->transport->hasUpdates()) { // failed to select next transport. can't continue
-            QDomElement tel;
-            OutgoingUpdateCB trCallback;
-            std::tie(tel, trCallback) = d->transport->takeOutgoingUpdate();
-            if (tel.isNull()) {
-                qWarning("transport for content=%s reported it had updates but got null update", qPrintable(d->contentName));
-                return OutgoingUpdate();
-            }
-            ContentBase cb(d->creator, d->contentName);
-            auto cel = cb.toXml(doc, "content");
-            cel.appendChild(tel);
-            if (d->transportFailedOrigin != Origin::None) {
-                d->waitTransportAccept = true;
-            }
-            return OutgoingUpdate{QList<QDomElement>()<<cel, trCallback};
-        }
+        auto action = d->updateToSend;
+        return OutgoingUpdate{updates, [this,transportCB,action](){
+                if (transportCB) {
+                    transportCB();
+                }
+                d->transportReplaceState = action == Action::TransportReplace? State::Pending : State::Finished;
+            }};
     }
-    if (d->state == State::Finishing) {
 
-    }
     return OutgoingUpdate(); // TODO
 }
 
@@ -856,11 +850,11 @@ bool Application::accept(const QDomElement &el)
     return true;
 }
 
-bool Application::incomingTransportAccept(const QSharedPointer<Transport> &transport)
+bool Application::incomingTransportAccept(const QDomElement &transportEl)
 {
-    if (d->transport->update(transport)) {
-        d->waitTransportAccept = false;
-        d->transportFailedOrigin = Origin::None;
+    if (d->transport->update(transportEl)) {
+        d->transportReplaceOrigin = Origin::None;
+        d->transportReplaceState = State::Finished;
         emit updated();
         return true;
     }
diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index e21c417e..32aa629a 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -148,7 +148,7 @@ class Application : public XMPP::Jingle::Application
 
 protected:
     bool incomingTransportReplace(const QSharedPointer<Transport> &transport) override;
-    bool incomingTransportAccept(const QSharedPointer<Transport> &transport) override;
+    bool incomingTransportAccept(const QDomElement &transportEl) override;
 
 signals:
     void deviceRequested(quint64 offset, quint64 size);
diff --git a/src/xmpp/xmpp-im/jingle-ibb.cpp b/src/xmpp/xmpp-im/jingle-ibb.cpp
index 012468ae..3bf7d437 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.cpp
+++ b/src/xmpp/xmpp-im/jingle-ibb.cpp
@@ -143,7 +143,7 @@ struct Transport::Private
     bool started = false;
     bool initialOfferSent = false; // if we ever sent anything
 
-    void checkAndStartConnection(QSharedPointer<Connection> &c)
+    void checkAndStartConnection(const QSharedPointer<Connection> &c)
     {
         if (!c->connection && !c->finished && c->offerReceived && c->offerSent && pad->session()->role() == Origin::Initiator) {
             auto con = pad->session()->manager()->client()->ibbManager()->createConnection();
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 49cbe9a8..7c71aa16 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -397,7 +397,7 @@ Candidate::Candidate(Transport *transport, const TcpPortServer::Ptr &server, con
     d->transport = transport;
     d->server = server.staticCast<S5BServer>();
     d->cid = cid;
-    d->host = "192.168.0.44";//server->publishHost();
+    d->host = server->publishHost();
     d->port = server->publishPort();
     d->type = type;
     static const int priorities[] = {0, ProxyPreference, TunnelPreference, AssistedPreference, DirectPreference};
@@ -1184,7 +1184,7 @@ void Transport::prepare()
     });
     d->onLocalServerDiscovered();
 
-    //d->discoS5BProxy();
+    d->discoS5BProxy();
 
     emit updated();
 }
diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index f87a115e..6a0d2d25 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -1292,8 +1292,6 @@ class Session::Private
 
     bool handleIncomingTransportAccept(const QDomElement &jingleEl)
     {
-        QList<std::tuple<Application*,QSharedPointer<Transport>,QDomElement>> passed;
-        QList<QDomElement> toReject;
         QString contentTag(QStringLiteral("content"));
         for(QDomElement ce = jingleEl.firstChildElement(contentTag);
             !ce.isNull(); ce = ce.nextSiblingElement(contentTag))
@@ -1307,39 +1305,11 @@ class Session::Private
             }
             Application *app = contentList.value(ContentKey{cb.name, cb.creator});
             if (!app || !app->transport() || app->transport()->pad()->ns() != transportNS || !app->incomingTransportAccept(transportEl)) {
-                toReject.append(ce);
-                continue;
-            }
-
-            auto trPad = q->transportPadFactory(transportNS);
-            if (!trPad) {
-                toReject.append(ce);
-                continue;
-            }
-
-            auto transport = trPad->manager()->newTransport(trPad, transportEl);
-            if (!transport) {
-                toReject.append(ce);
-                continue;
-            }
-
-            passed.append(std::make_tuple(app, transport, ce));
-        }
-
-        for (auto &v: passed) {
-            Application *app;
-            QSharedPointer<Transport> transport;
-            QDomElement ce;
-            std::tie(app,transport,ce) = v;
-            if (!app->incomingTransportAccept(transport)) { // app should generate transport accept eventually. content-accept will work too if the content wasn't accepted yet
-                toReject.append(ce);
+                lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
+                return false;
             }
         }
 
-        if (toReject.size()) {
-            outgoingUpdates.insert(Action::TransportReject, OutgoingUpdate{toReject,OutgoingUpdateCB()});
-        }
-
         planStep();
         return true;
     }
@@ -1539,6 +1509,10 @@ void Session::initiate()
 
 void Session::terminate(Reason::Condition cond, const QString &comment)
 {
+    if (d->role == Origin::Initiator && d->state == State::PrepareLocalOffer) {
+        d->setSessionFinished();
+        return;
+    }
     d->state = State::Finishing;
     d->terminateReason = Reason(cond, comment);
     d->planStep();
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index 3b78048f..e8cbbd5f 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -441,14 +441,13 @@ class Application : public QObject
     virtual bool accept(const QDomElement &el) = 0; // remote accepted our content
     virtual void start() = 0;
 
-protected:
     /**
      * @brief incomingTransportReplace it's jingle transport-replace
      * @param transport
      * @return
      */
     virtual bool incomingTransportReplace(const QSharedPointer<Transport> &transport) = 0;
-    virtual bool incomingTransportAccept(const QSharedPointer<Transport> &transport) = 0;
+    virtual bool incomingTransportAccept(const QDomElement &transportEl) = 0;
 
 signals:
     void updated(); // signal for session it has to send updates to remote. so it will follow with takeOutgoingUpdate() eventually

From 0a2e88fca09b531044a52d787e9840d6cb45d956 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sat, 15 Jun 2019 11:36:01 +0300
Subject: [PATCH 069/383] Fixed jingle transport fallback

---
 src/xmpp/xmpp-im/client.cpp     |  1 +
 src/xmpp/xmpp-im/jingle-ft.cpp  | 23 ++++++++++++++----
 src/xmpp/xmpp-im/jingle-ft.h    |  1 +
 src/xmpp/xmpp-im/jingle-ibb.cpp |  3 ++-
 src/xmpp/xmpp-im/jingle-s5b.cpp | 41 ++++++++++++++++++++++-----------
 src/xmpp/xmpp-im/jingle.cpp     | 17 ++++++++++++++
 src/xmpp/xmpp-im/jingle.h       |  4 ++++
 src/xmpp/xmpp-im/xmpp_caps.cpp  |  1 +
 8 files changed, 71 insertions(+), 20 deletions(-)

diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
index d1d7d786..4c9dd8a5 100644
--- a/src/xmpp/xmpp-im/client.cpp
+++ b/src/xmpp/xmpp-im/client.cpp
@@ -194,6 +194,7 @@ Client::~Client()
     delete d->ftman;
     delete d->ibbman;
     delete d->s5bman;
+    delete d->jingleManager;
     delete d->root;
     delete d;
     //fprintf(stderr, "\tClient::~Client\n");
diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 0a8ba1f6..00b0be66 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -337,6 +337,12 @@ Manager::Manager(QObject *parent):
 
 }
 
+Manager::~Manager()
+{
+    if (jingleManager)
+        jingleManager->unregisterApp(NS);
+}
+
 void Manager::setJingleManager(XMPP::Jingle::Manager *jm)
 {
     jingleManager = jm;
@@ -762,11 +768,7 @@ OutgoingUpdate Application::takeOutgoingUpdate()
             d->file.setThumbnail(thumb);
         }
         contentEl.appendChild(doc->createElementNS(NS, QString::fromLatin1("description"))).appendChild(d->file.toXml(doc));
-        if (d->transport->hasUpdates()) {
-            std::tie(transportEl, transportCB) = d->transport->takeOutgoingUpdate();
-        } else {
-            transportEl = doc->createElementNS(d->transport->pad()->ns(), QString::fromLatin1("transport"));
-        }
+        std::tie(transportEl, transportCB) = d->transport->takeInitialOffer();
         contentEl.appendChild(transportEl);
 
         d->setState(State::Unacked);
@@ -783,6 +785,7 @@ OutgoingUpdate Application::takeOutgoingUpdate()
         return OutgoingUpdate{updates, transportCB};
     case Action::TransportReplace:
     case Action::TransportAccept:
+    {
         Q_ASSERT(d->transport->isInitialOfferReady());
         d->transportReplaceState = State::Unacked;
         std::tie(transportEl, transportCB) = d->transport->takeInitialOffer();
@@ -795,6 +798,9 @@ OutgoingUpdate Application::takeOutgoingUpdate()
                 d->transportReplaceState = action == Action::TransportReplace? State::Pending : State::Finished;
             }};
     }
+    default:
+        break;
+    }
 
     return OutgoingUpdate(); // TODO
 }
@@ -852,9 +858,16 @@ bool Application::accept(const QDomElement &el)
 
 bool Application::incomingTransportAccept(const QDomElement &transportEl)
 {
+    if (d->transportReplaceOrigin != d->pad->session()->role()) {
+        d->lastError = ErrorUtil::makeOutOfOrder(*d->pad->doc());
+        return false;
+    }
     if (d->transport->update(transportEl)) {
         d->transportReplaceOrigin = Origin::None;
         d->transportReplaceState = State::Finished;
+        if (d->state >= State::Connecting) {
+            d->transport->start();
+        }
         emit updated();
         return true;
     }
diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index 32aa629a..246f10d2 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -164,6 +164,7 @@ class Manager : public XMPP::Jingle::ApplicationManager
     Q_OBJECT
 public:
     Manager(QObject *parent = nullptr);
+    ~Manager();
     void setJingleManager(XMPP::Jingle::Manager *jm);
     Application *startApplication(const ApplicationManagerPad::Ptr &pad, const QString &contentName, Origin creator, Origin senders);
     ApplicationManagerPad *pad(Session *session); // pad factory
diff --git a/src/xmpp/xmpp-im/jingle-ibb.cpp b/src/xmpp/xmpp-im/jingle-ibb.cpp
index 3bf7d437..3383938d 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.cpp
+++ b/src/xmpp/xmpp-im/jingle-ibb.cpp
@@ -405,7 +405,8 @@ Manager::Manager(QObject *parent) :
 
 Manager::~Manager()
 {
-
+    if (d->jingleManager)
+        d->jingleManager->unregisterTransport(NS);
 }
 
 Transport::Features Manager::features() const
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 7c71aa16..897d8271 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -1310,13 +1310,18 @@ bool Transport::update(const QDomElement &transportEl)
         return true;
     }
 
-    return false;
+    // Seems like we got an empty transport. It's still valid though.
+    QTimer::singleShot(0, this, [this](){ d->checkAndFinishNegotiation(); });
+
+    return true;
 }
 
 
 bool Transport::isInitialOfferReady() const
 {
-    return isValid() && (d->pendingActions || d->offerSent);
+    return isValid() && (d->pendingActions || d->offerSent ||
+                         (d->localCandidates.isEmpty() && !d->proxyDiscoveryInProgress &&
+                          !(d->disco && d->disco->inProgressPortTypes())));
 }
 
 OutgoingTransportInfoUpdate Transport::takeInitialOffer()
@@ -1324,6 +1329,7 @@ OutgoingTransportInfoUpdate Transport::takeInitialOffer()
     d->offerSent = true;
     auto upd = takeOutgoingUpdate();
     auto tel = std::get<0>(upd);
+
     if (d->meCreator && d->mode != Tcp) {
         tel.setAttribute(QStringLiteral("mode"), "udp");
     }
@@ -1449,6 +1455,11 @@ OutgoingTransportInfoUpdate Transport::takeOutgoingUpdate()
         } else {
             qWarning("Got ProxyError pending action but no local used candidate is not set");
         }
+    } else {
+        d->waitingAck = true;
+        upd = OutgoingTransportInfoUpdate{tel, [this]() mutable {
+            d->waitingAck = false;
+        }};
     }
 
     return upd; // TODO
@@ -1499,22 +1510,13 @@ Manager::Manager(QObject *parent) :
     TransportManager(parent),
     d(new Private)
 {
-    // ensure S5BManager is initialized
-    QTimer::singleShot(0, [this](){
-        auto jt = d->jingleManager->client()->s5bManager()->jtPush();
-        connect(jt, &JT_PushS5B::incomingUDPSuccess, this, [this](const Jid &from, const QString &dstaddr) {
-            Q_UNUSED(from);
-            auto t = d->key2transport.value(dstaddr);
-            if (t) {
-                // TODO return t->incomingUDPSuccess(from);
-            }
-        });
-    });
+
 }
 
 Manager::~Manager()
 {
-    d->jingleManager->unregisterTransport(NS);
+    if (d->jingleManager)
+        d->jingleManager->unregisterTransport(NS);
 }
 
 Transport::Features Manager::features() const
@@ -1525,6 +1527,17 @@ Transport::Features Manager::features() const
 void Manager::setJingleManager(XMPP::Jingle::Manager *jm)
 {
     d->jingleManager = jm;
+    // ensure S5BManager is initialized
+    QTimer::singleShot(0, [this](){
+        auto jt = d->jingleManager->client()->s5bManager()->jtPush();
+        connect(jt, &JT_PushS5B::incomingUDPSuccess, this, [this](const Jid &from, const QString &dstaddr) {
+            Q_UNUSED(from);
+            auto t = d->key2transport.value(dstaddr);
+            if (t) {
+                // TODO return t->incomingUDPSuccess(from);
+            }
+        });
+    });
 }
 
 QSharedPointer<XMPP::Jingle::Transport> Manager::newTransport(const TransportManagerPad::Ptr &pad)
diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index 6a0d2d25..a9c6c5a8 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -1640,6 +1640,11 @@ QDomElement SessionManagerPad::takeOutgoingSessionInfoUpdate()
     return QDomElement();
 }
 
+QDomDocument *SessionManagerPad::doc() const
+{
+    return session()->manager()->client()->doc();
+}
+
 //----------------------------------------------------------------------------
 // Manager
 //----------------------------------------------------------------------------
@@ -1670,6 +1675,7 @@ class Manager::Private
 };
 
 Manager::Manager(Client *client) :
+    QObject(client),
     d(new Private())
 {
     d->client = client;
@@ -1679,6 +1685,12 @@ Manager::Manager(Client *client) :
 
 Manager::~Manager()
 {
+    for (auto &m: d->transportManagers) {
+        m->setJingleManager(nullptr);
+    }
+    for (auto &m: d->applicationManagers) {
+        m->setJingleManager(nullptr);
+    }
 }
 
 Client *Manager::client() const
@@ -1904,6 +1916,11 @@ Stanza::Error ErrorUtil::makeTieBreak(QDomDocument &doc)
     return make(doc, TieBreak, XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::Conflict);
 }
 
+Stanza::Error ErrorUtil::makeOutOfOrder(QDomDocument &doc)
+{
+    return make(doc, OutOfOrder, XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::UnexpectedRequest);
+}
+
 
 } // namespace Jingle
 } // namespace XMPP
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index e8cbbd5f..907cc426 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -126,7 +126,10 @@ class ErrorUtil
     static const char* names[Last];
 
     static XMPP::Stanza::Error make(QDomDocument &doc, int jingleCond, int type=XMPP::Stanza::Error::Cancel, int condition=XMPP::Stanza::Error::UndefinedCondition, const QString &text=QString());
+
     static XMPP::Stanza::Error makeTieBreak(QDomDocument &doc);
+    static XMPP::Stanza::Error makeOutOfOrder(QDomDocument &doc);
+
     static void fill(QDomDocument doc, XMPP::Stanza::Error &error, int jingleCond);
     static int jingleCondition(const XMPP::Stanza::Error &error);
 };
@@ -246,6 +249,7 @@ class SessionManagerPad : public QObject
     virtual QDomElement takeOutgoingSessionInfoUpdate();
     virtual QString ns() const = 0;
     virtual Session *session() const = 0;
+    QDomDocument* doc() const;
 };
 
 class TransportManager;
diff --git a/src/xmpp/xmpp-im/xmpp_caps.cpp b/src/xmpp/xmpp-im/xmpp_caps.cpp
index 000ce489..324aea3b 100644
--- a/src/xmpp/xmpp-im/xmpp_caps.cpp
+++ b/src/xmpp/xmpp-im/xmpp_caps.cpp
@@ -220,6 +220,7 @@ DiscoItem CapsRegistry::disco(const QString &spec) const
  * \brief Default constructor.
  */
 CapsManager::CapsManager(Client *client) :
+    QObject(client),
     client_(client),
     isEnabled_(true)
 {}

From 75139f786b3eb76eed1eb9d1b2371e8ff7501c17 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 17 Jun 2019 01:02:15 +0300
Subject: [PATCH 070/383] Return empty mime or unrecognized images

---
 src/xmpp/xmpp-im/xmpp_vcard.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/xmpp/xmpp-im/xmpp_vcard.cpp b/src/xmpp/xmpp-im/xmpp_vcard.cpp
index 19851e2c..07dcbadc 100644
--- a/src/xmpp/xmpp-im/xmpp_vcard.cpp
+++ b/src/xmpp/xmpp-im/xmpp_vcard.cpp
@@ -57,10 +57,7 @@ QString openedImage2type(QIODevice *dev)
     if ( format == QLatin1String("SVG") )
         return QLatin1String("image/svg+xml");
 
-
-    qWarning() << QString("WARNING! VCard::image2type: unknown format = '%1'").arg(format.isNull() ? QString("UNKNOWN") : format);
-
-    return QLatin1String("image/unknown");
+    return QString();
 }
 
 QString image2type(const QByteArray &ba)

From a139986124b0f4a5a5140aad9098a4618afb9969 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 17 Jun 2019 08:28:08 +0300
Subject: [PATCH 071/383] Added httpupload progress signal

---
 src/xmpp/xmpp-im/httpfileupload.cpp | 1 +
 src/xmpp/xmpp-im/httpfileupload.h   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/xmpp/xmpp-im/httpfileupload.cpp b/src/xmpp/xmpp-im/httpfileupload.cpp
index 77a53620..eec47938 100644
--- a/src/xmpp/xmpp-im/httpfileupload.cpp
+++ b/src/xmpp/xmpp-im/httpfileupload.cpp
@@ -210,6 +210,7 @@ void HttpFileUpload::tryNextServer()
             req.setRawHeader(h.name.toLatin1(), h.value.toLatin1());
         }
         auto reply = d->qnam->put(req, d->sourceDevice);
+        connect(reply, &QNetworkReply::downloadProgress, this, &HttpFileUpload::progress);
         connect(reply, &QNetworkReply::finished, this, [this, reply](){
             if (reply->error() == QNetworkReply::NoError) {
                 done(State::Success);
diff --git a/src/xmpp/xmpp-im/httpfileupload.h b/src/xmpp/xmpp-im/httpfileupload.h
index 935ed0c6..53f6feeb 100644
--- a/src/xmpp/xmpp-im/httpfileupload.h
+++ b/src/xmpp/xmpp-im/httpfileupload.h
@@ -103,6 +103,7 @@ public slots:
 signals:
     void stateChanged();
     void finished();
+    void progress(qint64 bytesReceived, qint64 bytesTotal);
 
 private:
     enum State { None, GettingSlot, HttpRequest, Success, Error };

From 9953da16bb99d7e00f1315d00734ec1b751c05d9 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 17 Jun 2019 16:02:21 +0300
Subject: [PATCH 072/383] Return empty mime early if image data is empty

---
 src/xmpp/xmpp-im/xmpp_vcard.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/xmpp/xmpp-im/xmpp_vcard.cpp b/src/xmpp/xmpp-im/xmpp_vcard.cpp
index 07dcbadc..e1aaef7b 100644
--- a/src/xmpp/xmpp-im/xmpp_vcard.cpp
+++ b/src/xmpp/xmpp-im/xmpp_vcard.cpp
@@ -62,6 +62,8 @@ QString openedImage2type(QIODevice *dev)
 
 QString image2type(const QByteArray &ba)
 {
+    if (ba.isEmpty())
+        return QString();
     QBuffer buf;
     buf.setData(ba);
     buf.open(QIODevice::ReadOnly);

From c79e360bed6de83bfa1f4d88f99f7fb1af6835bd Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 18 Jun 2019 12:56:46 +0300
Subject: [PATCH 073/383] drop timer on jingle manager removal

---
 src/xmpp/xmpp-im/jingle-s5b.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 897d8271..e8a72f02 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -1527,8 +1527,12 @@ Transport::Features Manager::features() const
 void Manager::setJingleManager(XMPP::Jingle::Manager *jm)
 {
     d->jingleManager = jm;
+    if (!jm)
+        return;
     // ensure S5BManager is initialized
-    QTimer::singleShot(0, [this](){
+    QTimer::singleShot(0, this, [this](){
+        if (!d->jingleManager) // unregistered that early?
+            return;
         auto jt = d->jingleManager->client()->s5bManager()->jtPush();
         connect(jt, &JT_PushS5B::incomingUDPSuccess, this, [this](const Jid &from, const QString &dstaddr) {
             Q_UNUSED(from);

From 092f318b7c650d848eea71c11ad1dcaa1c0e5cb7 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 19 Jun 2019 08:12:46 +0300
Subject: [PATCH 074/383] Added SIMS classes

---
 src/xmpp/CMakeLists.txt             |   2 +
 src/xmpp/xmpp-im/jingle-ft.cpp      |   6 +
 src/xmpp/xmpp-im/jingle-ft.h        |   2 +-
 src/xmpp/xmpp-im/types.cpp          |  12 ++
 src/xmpp/xmpp-im/xmpp_message.h     |   5 +
 src/xmpp/xmpp-im/xmpp_reference.cpp | 183 ++++++++++++++++++++++++++++
 src/xmpp/xmpp-im/xmpp_reference.h   |  78 ++++++++++++
 src/xmpp/xmpp.pri                   |   2 +
 8 files changed, 289 insertions(+), 1 deletion(-)
 create mode 100644 src/xmpp/xmpp-im/xmpp_reference.cpp
 create mode 100644 src/xmpp/xmpp-im/xmpp_reference.h

diff --git a/src/xmpp/CMakeLists.txt b/src/xmpp/CMakeLists.txt
index 1fbbc606..ef01da35 100644
--- a/src/xmpp/CMakeLists.txt
+++ b/src/xmpp/CMakeLists.txt
@@ -35,6 +35,7 @@ set(HEADERS
     xmpp-im/xmpp_liverosteritem.h
     xmpp-im/xmpp_message.h
     xmpp-im/xmpp_muc.h
+    xmpp-im/xmpp_reference.h
     xmpp-im/xmpp_pubsubitem.h
     xmpp-im/xmpp_pubsubretraction.h
     xmpp-im/xmpp_receipts.h
@@ -117,6 +118,7 @@ set(SOURCES
     xmpp-im/xmpp_discoinfotask.cpp
     xmpp-im/xmpp_discoitem.cpp
     xmpp-im/xmpp_ibb.cpp
+    xmpp-im/xmpp_reference.cpp
     xmpp-im/xmpp_serverinfomanager.cpp
     xmpp-im/xmpp_subsets.cpp
     xmpp-im/xmpp_task.cpp
diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 00b0be66..57f25880 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -74,6 +74,12 @@ File::~File()
 
 }
 
+File &File::operator=(const File &other)
+{
+    d = other.d;
+    return *this;
+}
+
 File::File(const File &other) :
     d(other.d)
 {
diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index 246f10d2..246a07f4 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -50,7 +50,7 @@ class File
     File(const File &other);
     File(const QDomElement &file);
     ~File();
-    File& operator=(const File& other) = default;
+    File& operator=(const File& other);
     inline bool isValid() const { return d != nullptr; }
     QDomElement toXml(QDomDocument *doc) const;
 
diff --git a/src/xmpp/xmpp-im/types.cpp b/src/xmpp/xmpp-im/types.cpp
index ff1a972f..cdb2d072 100644
--- a/src/xmpp/xmpp-im/types.cpp
+++ b/src/xmpp/xmpp-im/types.cpp
@@ -25,6 +25,7 @@
 #include "xmpp_xmlcommon.h"
 #include "xmpp_bitsofbinary.h"
 #include "xmpp_ibb.h"
+#include "xmpp_reference.h"
 #include "xmpp_captcha.h"
 #include "protocol.h"
 #include "xmpp/blake2/blake2qt.h"
@@ -1073,6 +1074,7 @@ class Message::Private : public QSharedData
     QString replaceId;
     QString originId; // XEP-0359
     Message::StanzaId stanzaId; // XEP-0359
+    Reference reference; // XEP-0732
 };
 
 #define MessageD() (d? d : (d = new Private))
@@ -1559,6 +1561,16 @@ void Message::setOriginId(const QString &id)
     MessageD()->originId = id;
 }
 
+Reference Message::reference() const
+{
+    return d? d->reference: Reference();
+}
+
+void Message::setReference(const Reference &r)
+{
+    MessageD()->reference = r;
+}
+
 QString Message::invite() const
 {
     return d? d->invite: QString();
diff --git a/src/xmpp/xmpp-im/xmpp_message.h b/src/xmpp/xmpp-im/xmpp_message.h
index 58fc7201..a933760b 100644
--- a/src/xmpp/xmpp-im/xmpp_message.h
+++ b/src/xmpp/xmpp-im/xmpp_message.h
@@ -26,6 +26,7 @@
 #include "xmpp_address.h"
 #include "xmpp_rosterx.h"
 #include "xmpp_muc.h"
+#include "xmpp_reference.h"
 
 #include <QExplicitlySharedDataPointer>
 
@@ -213,6 +214,10 @@ namespace XMPP {
         QString originId() const;
         void setOriginId(const QString &id);
 
+        // XEP-0732
+        Reference reference() const;
+        void setReference(const Reference &r);
+
         // Obsolete invitation
         QString invite() const;
         void setInvite(const QString &s);
diff --git a/src/xmpp/xmpp-im/xmpp_reference.cpp b/src/xmpp/xmpp-im/xmpp_reference.cpp
new file mode 100644
index 00000000..bcaf34d0
--- /dev/null
+++ b/src/xmpp/xmpp-im/xmpp_reference.cpp
@@ -0,0 +1,183 @@
+/*
+ * xmpp_reference.h - XMPP References / XEP-0372
+ * Copyright (C) 2019  Sergey Ilinykh
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "xmpp_reference.h"
+
+using namespace XMPP;
+
+#define D() (d? d:(d=new Private))
+
+const QString XMPP::MEDIASHARING_NS(QStringLiteral("urn:xmpp:sims:1"));
+const QString XMPP::REFERENCE_NS(QStringLiteral("urn:xmpp:reference:0"));
+
+class Reference::Private : public QSharedData
+{
+public:
+    Reference::Type type;
+    QString uri;
+    QString anchor;
+    int     begin = 0;
+    int     end   = 0;
+    MediaSharing mediaSharing;
+};
+
+Reference::Reference()
+{
+
+}
+
+Reference::Reference(Type type, const QString &uri) :
+    d(new Private)
+{
+    d->type = type;
+    d->uri = uri;
+}
+
+Reference::~Reference()
+{
+
+}
+
+Reference::Reference(const Reference &other) :
+    d(other.d)
+{
+
+}
+
+Reference &Reference::operator=(const Reference &other)
+{
+    d = other.d;
+    return *this;
+}
+
+Reference::Type Reference::type() const
+{
+    return d->type;
+}
+
+const QString &Reference::uri() const
+{
+    return d->uri;
+}
+
+void Reference::setRange(int begin, int end)
+{
+    D()->begin = begin;
+    d->end = end;
+}
+
+int Reference::start() const
+{
+    return d->begin;
+}
+
+int Reference::end() const
+{
+    return d->end;
+}
+
+const QString &Reference::anchor() const
+{
+    return d->anchor;
+}
+
+void Reference::setAnchor(const QString &anchor)
+{
+    D()->anchor = anchor;
+}
+
+void Reference::setMediaSharing(const MediaSharing &ms)
+{
+    D()->mediaSharing = ms;
+}
+
+const MediaSharing &Reference::mediaSharing() const
+{
+    return d->mediaSharing;
+}
+
+bool Reference::fromXml(const QDomElement &e)
+{
+    QString type = e.attribute(QString::fromLatin1("type"));
+    QString uri = e.attribute(QString::fromLatin1("uri"));
+    QString begin = e.attribute(QString::fromLatin1("begin"));
+    QString end = e.attribute(QString::fromLatin1("end"));
+    QString anchor = e.attribute(QString::fromLatin1("anchor"));
+
+    if (type.isEmpty() || uri.isEmpty()) {
+        return false;
+    }
+
+    Type t;
+    if (type == QString::fromLatin1("data"))
+        t = Data;
+    else if (type == QString::fromLatin1("mention"))
+        t = Mention;
+    else
+        return false;
+
+    int beginN, endN;
+    bool ok;
+    if (!begin.isEmpty() && !(beginN = begin.toInt(&ok),ok)) {
+        return false;
+    }
+    if (!end.isEmpty() && !(endN = end.toInt(&ok),ok)) {
+        return false;
+    }
+
+    auto msEl = e.firstChildElement("media-sharing");
+    MediaSharing ms;
+    if (msEl.attribute(QString::fromLatin1("xmlns")) == MEDIASHARING_NS) {
+        auto fileEl = msEl.firstChildElement("file");
+        auto sourcesEl = msEl.firstChildElement("file");
+        if (sourcesEl.isNull() || fileEl.isNull() || fileEl.attribute(QString::fromLatin1("xmlns")) != XMPP::Jingle::FileTransfer::NS)
+            return false;
+
+        ms.file = XMPP::Jingle::FileTransfer::File(fileEl);
+        if (!ms.file.isValid())
+            return false;
+
+
+        auto srcName = QString::fromLatin1("reference");
+        for (auto el = msEl.firstChildElement(srcName); !el.isNull(); el = el.nextSiblingElement(srcName)) {
+            if (el.attribute(QString::fromLatin1("xmlns")) == REFERENCE_NS) {
+                Reference ref;
+                if (!ref.fromXml(el)) {
+                    return false;
+                }
+                ms.sources.append(ref.uri());
+            }
+        }
+    }
+
+    D()->type = t;
+    d->uri = uri;
+    d->begin = beginN;
+    d->end = endN;
+    d->anchor = anchor;
+    d->mediaSharing = ms;
+
+    return true;
+}
+
+QDomElement Reference::toXml(QDomDocument *) const
+{
+    return QDomElement();
+}
+
diff --git a/src/xmpp/xmpp-im/xmpp_reference.h b/src/xmpp/xmpp-im/xmpp_reference.h
new file mode 100644
index 00000000..bb1681d6
--- /dev/null
+++ b/src/xmpp/xmpp-im/xmpp_reference.h
@@ -0,0 +1,78 @@
+/*
+ * xmpp_reference.h - XMPP References / XEP-0372
+ * Copyright (C) 2019  Sergey Ilinykh
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef XMPPREFERENCE_H
+#define XMPPREFERENCE_H
+
+#include <QDomElement>
+#include <QSharedPointer>
+
+#include "jingle-ft.h"
+
+namespace XMPP
+{
+    extern const QString MEDIASHARING_NS;
+    extern const QString REFERENCE_NS;
+
+    class MediaSharing
+    {
+    public:
+        Jingle::FileTransfer::File file;
+        QStringList sources;
+    };
+
+    class Reference
+    {
+    public:
+        enum Type : char {
+
+            Mention,
+            Data
+        };
+
+        Reference();
+        Reference(Type type, const QString &uri);
+        ~Reference();
+        Reference(const Reference &other);
+        Reference &operator=(const Reference &other);
+
+        bool isValid() const { return d != nullptr; }
+        Type type() const;
+        const QString &uri() const;
+
+        void setRange(int start, int end);
+        int start() const;
+        int end() const;
+
+        const QString &anchor() const;
+        void setAnchor(const QString &anchor);
+
+        void setMediaSharing(const MediaSharing &);
+        const MediaSharing &mediaSharing() const;
+
+        bool fromXml(const QDomElement &e);
+        QDomElement toXml(QDomDocument *) const;
+
+    private:
+        class Private;
+        QSharedDataPointer<Private> d;
+    };
+}
+
+#endif
diff --git a/src/xmpp/xmpp.pri b/src/xmpp/xmpp.pri
index 8e9fd795..0ce51bf1 100644
--- a/src/xmpp/xmpp.pri
+++ b/src/xmpp/xmpp.pri
@@ -56,6 +56,7 @@ HEADERS += \
     $$PWD/xmpp-im/xmpp_thumbs.h \
     $$PWD/xmpp-im/xmpp_htmlelement.h \
     $$PWD/xmpp-im/xmpp_muc.h \
+    $$PWD/xmpp-im/xmpp_reference.h \
     $$PWD/xmpp-im/xmpp_message.h \
     $$PWD/xmpp-im/xmpp_pubsubitem.h \
     $$PWD/xmpp-im/xmpp_resource.h \
@@ -109,6 +110,7 @@ SOURCES += \
     $$PWD/xmpp-im/xmpp_bytestream.cpp \
     $$PWD/xmpp-im/s5b.cpp \
     $$PWD/xmpp-im/xmpp_ibb.cpp \
+    $$PWD/xmpp-im/xmpp_reference.cpp \
     $$PWD/xmpp-im/filetransfer.cpp \
     $$PWD/xmpp-im/httpfileupload.cpp \
     $$PWD/xmpp-im/xmpp_bitsofbinary.cpp \

From 70ee78248b1e8b3e703a9fc1691cc562dcbf0cf2 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 19 Jun 2019 08:30:22 +0300
Subject: [PATCH 075/383] Implement Reference::toXml

---
 src/xmpp/xmpp-im/xmpp_reference.cpp | 31 ++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/xmpp/xmpp-im/xmpp_reference.cpp b/src/xmpp/xmpp-im/xmpp_reference.cpp
index bcaf34d0..cce8a09d 100644
--- a/src/xmpp/xmpp-im/xmpp_reference.cpp
+++ b/src/xmpp/xmpp-im/xmpp_reference.cpp
@@ -132,7 +132,7 @@ bool Reference::fromXml(const QDomElement &e)
     else
         return false;
 
-    int beginN, endN;
+    int beginN = -1, endN = -1;
     bool ok;
     if (!begin.isEmpty() && !(beginN = begin.toInt(&ok),ok)) {
         return false;
@@ -176,8 +176,33 @@ bool Reference::fromXml(const QDomElement &e)
     return true;
 }
 
-QDomElement Reference::toXml(QDomDocument *) const
+QDomElement Reference::toXml(QDomDocument *doc) const
 {
-    return QDomElement();
+    auto root = doc->createElementNS(REFERENCE_NS, QString::fromLatin1("reference"));
+    root.setAttribute(QString::fromLatin1("uri"), d->uri);
+    root.setAttribute(QString::fromLatin1("type"), QString(d->type == Reference::Mention? "mention": "data"));
+
+    if (d->mediaSharing.file.isValid() && d->mediaSharing.sources.count()) {
+        auto msEl = doc->createElementNS(MEDIASHARING_NS, QString::fromLatin1("media-sharing"));
+        root.appendChild(msEl);
+        msEl.appendChild(d->mediaSharing.file.toXml(doc));
+        auto sourcesEl = msEl.appendChild(doc->createElement(QString::fromLatin1("sources"))).toElement();
+        for (auto const &s: d->mediaSharing.sources) {
+            auto sEl = sourcesEl.appendChild(doc->createElementNS(REFERENCE_NS, QString::fromLatin1("reference"))).toElement();
+            sEl.setAttribute(QString::fromLatin1("uri"), s);
+            sEl.setAttribute(QString::fromLatin1("type"), QString::fromLatin1("data"));
+        }
+    }
+
+    if (d->begin != -1)
+        root.setAttribute(QString::fromLatin1("begin"), d->begin);
+
+    if (d->end != -1)
+        root.setAttribute(QString::fromLatin1("end"), d->end);
+
+    if (!d->anchor.isEmpty())
+        root.setAttribute(QString::fromLatin1("anchor"), d->anchor);
+
+    return root;
 }
 

From b73f4b5f2e4732425006b66c48fb477f414241df Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 19 Jun 2019 14:48:58 +0300
Subject: [PATCH 076/383] Send and parser references in message stanzas

---
 include/iris/xmpp_reference.h       |  1 +
 src/xmpp/xmpp-im/types.cpp          | 15 ++++++++++++++-
 src/xmpp/xmpp-im/xmpp_message.h     |  2 +-
 src/xmpp/xmpp-im/xmpp_reference.cpp |  7 +++++--
 4 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 include/iris/xmpp_reference.h

diff --git a/include/iris/xmpp_reference.h b/include/iris/xmpp_reference.h
new file mode 100644
index 00000000..0dee0eae
--- /dev/null
+++ b/include/iris/xmpp_reference.h
@@ -0,0 +1 @@
+#include "../../src/xmpp/xmpp-im/xmpp_reference.h"
diff --git a/src/xmpp/xmpp-im/types.cpp b/src/xmpp/xmpp-im/types.cpp
index cdb2d072..608be91d 100644
--- a/src/xmpp/xmpp-im/types.cpp
+++ b/src/xmpp/xmpp-im/types.cpp
@@ -29,6 +29,7 @@
 #include "xmpp_captcha.h"
 #include "protocol.h"
 #include "xmpp/blake2/blake2qt.h"
+#include "xmpp_reference.h"
 #define NS_XML     "http://www.w3.org/XML/1998/namespace"
 
 namespace XMPP
@@ -1074,7 +1075,7 @@ class Message::Private : public QSharedData
     QString replaceId;
     QString originId; // XEP-0359
     Message::StanzaId stanzaId; // XEP-0359
-    Reference reference; // XEP-0732
+    Reference reference; // XEP-0385 and XEP-0372
 };
 
 #define MessageD() (d? d : (d = new Private))
@@ -1974,6 +1975,11 @@ Stanza Message::toStanza(Stream *stream) const
         s.appendChild(e);
     }
 
+    // XEP-0372 and XEP-0385
+    if (d->reference.isValid()) {
+        s.appendChild(d->reference.toXml(&s.doc()));
+    }
+
     return s;
 }
 
@@ -2320,6 +2326,13 @@ bool Message::fromStanza(const Stanza &s, bool useTimeZoneOffset, int timeZoneOf
     if (!t.isNull()) {
         d->replaceId = t.attribute("id");
     }
+
+    // XEP-0385 SIMS and XEP-0372 Reference
+    t = childElementsByTagNameNS(root, REFERENCE_NS, QString::fromLatin1("reference")).item(0).toElement();
+    if (!t.isNull()) {
+        d->reference.fromXml(t);
+    }
+
     return true;
 }
 
diff --git a/src/xmpp/xmpp-im/xmpp_message.h b/src/xmpp/xmpp-im/xmpp_message.h
index a933760b..29b44b9f 100644
--- a/src/xmpp/xmpp-im/xmpp_message.h
+++ b/src/xmpp/xmpp-im/xmpp_message.h
@@ -214,7 +214,7 @@ namespace XMPP {
         QString originId() const;
         void setOriginId(const QString &id);
 
-        // XEP-0732
+        // XEP-0385 and XEP-0372
         Reference reference() const;
         void setReference(const Reference &r);
 
diff --git a/src/xmpp/xmpp-im/xmpp_reference.cpp b/src/xmpp/xmpp-im/xmpp_reference.cpp
index cce8a09d..e5e9a398 100644
--- a/src/xmpp/xmpp-im/xmpp_reference.cpp
+++ b/src/xmpp/xmpp-im/xmpp_reference.cpp
@@ -32,8 +32,8 @@ class Reference::Private : public QSharedData
     Reference::Type type;
     QString uri;
     QString anchor;
-    int     begin = 0;
-    int     end   = 0;
+    int     begin = -1;
+    int     end   = -1;
     MediaSharing mediaSharing;
 };
 
@@ -178,6 +178,9 @@ bool Reference::fromXml(const QDomElement &e)
 
 QDomElement Reference::toXml(QDomDocument *doc) const
 {
+    if (!d) {
+        return QDomElement();
+    }
     auto root = doc->createElementNS(REFERENCE_NS, QString::fromLatin1("reference"));
     root.setAttribute(QString::fromLatin1("uri"), d->uri);
     root.setAttribute(QString::fromLatin1("type"), QString(d->type == Reference::Mention? "mention": "data"));

From 9ace8411104f18b748b9f4deba50ed116937b7ec Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 19 Jun 2019 22:07:14 +0300
Subject: [PATCH 077/383] Create jingle file with namespace

---
 src/xmpp/xmpp-im/jingle-ft.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 57f25880..7535fe68 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -186,7 +186,7 @@ QDomElement File::toXml(QDomDocument *doc) const
     if (!isValid()) {
         return QDomElement();
     }
-    QDomElement el = doc->createElement(QStringLiteral("file"));
+    QDomElement el = doc->createElementNS(NS, QStringLiteral("file"));
     if (d->date.isValid()) {
         el.appendChild(XMLHelper::textTag(*doc, QStringLiteral("date"), d->date.toString(Qt::ISODate)));
     }

From 5b1e0ea9a445c11ab2abe35fdb31685425755d1c Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Thu, 20 Jun 2019 08:19:45 +0300
Subject: [PATCH 078/383] Allow multiple references in one message

---
 src/xmpp/xmpp-im/types.cpp      | 28 ++++++++++++++++++----------
 src/xmpp/xmpp-im/xmpp_message.h |  5 +++--
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/xmpp/xmpp-im/types.cpp b/src/xmpp/xmpp-im/types.cpp
index 608be91d..4e4f1bcc 100644
--- a/src/xmpp/xmpp-im/types.cpp
+++ b/src/xmpp/xmpp-im/types.cpp
@@ -1075,7 +1075,7 @@ class Message::Private : public QSharedData
     QString replaceId;
     QString originId; // XEP-0359
     Message::StanzaId stanzaId; // XEP-0359
-    Reference reference; // XEP-0385 and XEP-0372
+    QList<Reference> references; // XEP-0385 and XEP-0372
 };
 
 #define MessageD() (d? d : (d = new Private))
@@ -1562,14 +1562,19 @@ void Message::setOriginId(const QString &id)
     MessageD()->originId = id;
 }
 
-Reference Message::reference() const
+QList<Reference> Message::references() const
 {
-    return d? d->reference: Reference();
+    return d? d->references: QList<Reference>();
 }
 
-void Message::setReference(const Reference &r)
+void Message::addReference(const Reference &r)
 {
-    MessageD()->reference = r;
+    MessageD()->references.append(r);
+}
+
+void Message::setReferences(const QList<Reference> &r)
+{
+    MessageD()->references = r;
 }
 
 QString Message::invite() const
@@ -1976,8 +1981,8 @@ Stanza Message::toStanza(Stream *stream) const
     }
 
     // XEP-0372 and XEP-0385
-    if (d->reference.isValid()) {
-        s.appendChild(d->reference.toXml(&s.doc()));
+    for (auto const &r: d->references) {
+        s.appendChild(r.toXml(&s.doc()));
     }
 
     return s;
@@ -2328,9 +2333,12 @@ bool Message::fromStanza(const Stanza &s, bool useTimeZoneOffset, int timeZoneOf
     }
 
     // XEP-0385 SIMS and XEP-0372 Reference
-    t = childElementsByTagNameNS(root, REFERENCE_NS, QString::fromLatin1("reference")).item(0).toElement();
-    if (!t.isNull()) {
-        d->reference.fromXml(t);
+    auto references = childElementsByTagNameNS(root, REFERENCE_NS, QString::fromLatin1("reference"));
+    for (int i = 0; i < references.size(); i++) {
+        Reference r;
+        if (r.fromXml(references.at(i).toElement())) {
+            d->references.append(r);
+        }
     }
 
     return true;
diff --git a/src/xmpp/xmpp-im/xmpp_message.h b/src/xmpp/xmpp-im/xmpp_message.h
index 29b44b9f..1c40fa5a 100644
--- a/src/xmpp/xmpp-im/xmpp_message.h
+++ b/src/xmpp/xmpp-im/xmpp_message.h
@@ -215,8 +215,9 @@ namespace XMPP {
         void setOriginId(const QString &id);
 
         // XEP-0385 and XEP-0372
-        Reference reference() const;
-        void setReference(const Reference &r);
+        QList<Reference> references() const;
+        void addReference(const Reference &r);
+        void setReferences(const QList<Reference> &r);
 
         // Obsolete invitation
         QString invite() const;

From a81e5fa07673daf6e57d4fb5ec8a50ca33839db1 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 23 Jun 2019 23:21:39 +0300
Subject: [PATCH 079/383] Added audio spectrum element to jingle file

---
 src/xmpp/xmpp-im/jingle-ft.cpp      | 109 ++++++++++++++++++++++------
 src/xmpp/xmpp-im/jingle-ft.h        |  26 +++++--
 src/xmpp/xmpp-im/xmpp_reference.cpp |  15 ++--
 src/xmpp/xmpp-im/xmpp_reference.h   |   6 +-
 4 files changed, 120 insertions(+), 36 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 7535fe68..607dc350 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -29,7 +29,7 @@ namespace Jingle {
 namespace FileTransfer {
 
 const QString NS = QStringLiteral("urn:xmpp:jingle:apps:file-transfer:5");
-
+const QString SPECTRUM_NS = QStringLiteral("iris.psi-im.org/spectrum");
 
 QDomElement Range::toXml(QDomDocument *doc) const
 {
@@ -60,8 +60,9 @@ class File::Private : public QSharedData
     quint64   size = 0;
     Range     range;
     bool      rangeSupported = false;
-    Hash      hash;
+    QList<Hash> hashes;
     Thumbnail thumbnail;
+    File::Spectrum audioSpectrum;
 };
 
 File::File()
@@ -88,15 +89,16 @@ File::File(const File &other) :
 
 File::File(const QDomElement &file)
 {
-    QDateTime date;
-    QString   mediaType;
-    QString   name;
-    QString   desc;
-    size_t    size = 0;
-    bool      rangeSupported = false;
-    Range     range;
-    Hash      hash;
-    Thumbnail thumbnail;
+    QDateTime   date;
+    QString     mediaType;
+    QString     name;
+    QString     desc;
+    size_t      size = 0;
+    bool        rangeSupported = false;
+    Range       range;
+    QList<Hash> hashes;
+    Thumbnail   thumbnail;
+    Spectrum    spectrum;
 
     bool ok;
 
@@ -148,22 +150,43 @@ File::File(const QDomElement &file)
 
         } else if (ce.tagName() == QLatin1String("hash")) {
             if (ce.attribute(QStringLiteral("xmlns")) == QLatin1String(XMPP_HASH_NS)) {
-                hash = Hash(ce);
-                if (hash.type() == Hash::Type::Unknown) {
+                Hash h(ce);
+                if (h.type() == Hash::Type::Unknown) {
                     return;
                 }
+                hashes.append(h);
             }
 
         } else if (ce.tagName() == QLatin1String("hash-used")) {
             if (ce.attribute(QStringLiteral("xmlns")) == QLatin1String(XMPP_HASH_NS)) {
-                hash = Hash(ce);
-                if (hash.type() == Hash::Type::Unknown) {
+                Hash h(ce);
+                if (h.type() == Hash::Type::Unknown) {
                     return;
                 }
+                hashes.append(h);
             }
 
         } else if (ce.tagName() == QLatin1String("thumbnail")) {
             thumbnail = Thumbnail(ce);
+        } else if (ce.tagName() == QLatin1String("spectrum") && ce.attribute(QStringLiteral("xmlns")) == SPECTRUM_NS) {
+            QStringList spv = ce.text().split(',');
+            spectrum.bars.reserve(spv.count());
+            std::transform(spv.begin(), spv.end(), std::back_inserter(spectrum.bars), [](const QString &v){ return v.toUInt(); });
+            auto c = ce.attribute(QStringLiteral("coding")).toLatin1();
+            if (c == "u8")
+                spectrum.coding = File::Spectrum::Coding::U8;
+            else if (c == "s8")
+                spectrum.coding = File::Spectrum::Coding::S8;
+            else if (c == "u16")
+                spectrum.coding = File::Spectrum::Coding::U16;
+            else if (c == "s16")
+                spectrum.coding = File::Spectrum::Coding::S16;
+            else if (c == "u32")
+                spectrum.coding = File::Spectrum::Coding::U32;
+            else if (c == "s32")
+                spectrum.coding = File::Spectrum::Coding::S32;
+            else
+                spectrum.bars.clear(); // drop invalid spectrum
         }
     }
 
@@ -175,15 +198,16 @@ File::File(const QDomElement &file)
     p->size = size;
     p->rangeSupported = rangeSupported;
     p->range = range;
-    p->hash = hash;
+    p->hashes = hashes;
     p->thumbnail = thumbnail;
+    p->audioSpectrum = spectrum;
 
     d = p;
 }
 
 QDomElement File::toXml(QDomDocument *doc) const
 {
-    if (!isValid()) {
+    if (!isValid() || d->hashes.isEmpty()) {
         return QDomElement();
     }
     QDomElement el = doc->createElementNS(NS, QStringLiteral("file"));
@@ -193,8 +217,8 @@ QDomElement File::toXml(QDomDocument *doc) const
     if (d->desc.size()) {
         el.appendChild(XMLHelper::textTag(*doc, QStringLiteral("desc"), d->desc));
     }
-    if (d->hash.isValid()) {
-        el.appendChild(d->hash.toXml(doc));
+    for (const auto &h: d->hashes) {
+        el.appendChild(h.toXml(doc));
     }
     if (d->mediaType.size()) {
         el.appendChild(XMLHelper::textTag(*doc, QStringLiteral("media-type"), d->mediaType));
@@ -211,9 +235,34 @@ QDomElement File::toXml(QDomDocument *doc) const
     if (d->thumbnail.isValid()) {
         el.appendChild(d->thumbnail.toXml(doc));
     }
+    if (d->audioSpectrum.bars.count()) {
+        auto sel = el.appendChild(doc->createElementNS(SPECTRUM_NS, QString::fromLatin1("spectrum"))).toElement();
+        const char* s[] = {"u8","s8","u16","s16","u32","s32"};
+        sel.setAttribute(QString::fromLatin1("coding"), QString::fromLatin1(s[d->audioSpectrum.coding]));
+        QStringList sl;
+        std::transform(d->audioSpectrum.bars.begin(), d->audioSpectrum.bars.end(), std::back_inserter(sl),
+                       [](quint32 v){ return QString::number(v); });
+        sel.appendChild(doc->createTextNode(sl.join(',')));
+    }
     return el;
 }
 
+bool File::merge(const File &other)
+{
+    if (!d->thumbnail.isValid()) {
+        d->thumbnail = other.thumbnail();
+    }
+    for (auto const &h: other.d->hashes) {
+        auto it = std::find_if(d->hashes.constBegin(), d->hashes.constEnd(), [&h](auto const &v){ return h.type() == v.type(); });
+        if (it == d->hashes.constEnd()) {
+            d->hashes.append(h);
+        } else if (h.data() != it->data()) {
+            return false; // hashes are different
+        }
+    }
+    return true;
+}
+
 QDateTime File::date() const
 {
     return d? d->date : QDateTime();
@@ -224,9 +273,18 @@ QString File::description() const
     return d? d->desc : QString();
 }
 
-Hash File::hash() const
+Hash File::hash(Hash::Type t) const
 {
-    return d? d->hash : Hash();
+    if (d && d->hashes.count()) {
+        if (t == Hash::Unknown)
+            return d->hashes.at(0);
+        for (auto const &h: d->hashes) {
+            if (h.type() == t) {
+                return h;
+            }
+        }
+    }
+    return Hash();
 }
 
 QString File::mediaType() const
@@ -254,6 +312,11 @@ Thumbnail File::thumbnail() const
     return d? d->thumbnail: Thumbnail();
 }
 
+File::Spectrum File::audioSpectrum() const
+{
+    return d? d->audioSpectrum: Spectrum();
+}
+
 void File::setDate(const QDateTime &date)
 {
     ensureD()->date = date;
@@ -264,9 +327,9 @@ void File::setDescription(const QString &desc)
     ensureD()->desc = desc;
 }
 
-void File::setHash(const Hash &hash)
+void File::addHash(const Hash &hash)
 {
-    ensureD()->hash = hash;
+    ensureD()->hashes.append(hash);
 }
 
 void File::setMediaType(const QString &mediaType)
diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index 246a07f4..4f056320 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -46,6 +46,18 @@ struct Range {
 class File
 {
 public:
+    struct Spectrum
+    {
+        enum Coding {
+            U8,  S8,
+            U16, S16,
+            U32, S32
+        };
+
+        Coding coding;
+        QList<quint32> bars;
+    };
+
     File();
     File(const File &other);
     File(const QDomElement &file);
@@ -53,19 +65,21 @@ class File
     File& operator=(const File& other);
     inline bool isValid() const { return d != nullptr; }
     QDomElement toXml(QDomDocument *doc) const;
+    bool merge(const File &other);
 
     QDateTime date()  const;
-    QString description() const;
-    Hash    hash()  const;
-    QString mediaType() const;
-    QString name()  const;
-    quint64 size()   const;
+    QString   description() const;
+    Hash      hash(Hash::Type t = Hash::Unknown)  const;
+    QString   mediaType() const;
+    QString   name()  const;
+    quint64   size()  const;
     Range     range() const;
     Thumbnail thumbnail() const;
+    Spectrum  audioSpectrum() const;
 
     void setDate(const QDateTime &date);
     void setDescription(const QString &desc);
-    void setHash(const Hash &hash);
+    void addHash(const Hash &hash);
     void setMediaType(const QString &mediaType);
     void setName(const QString &name);
     void setSize(quint64 size);
diff --git a/src/xmpp/xmpp-im/xmpp_reference.cpp b/src/xmpp/xmpp-im/xmpp_reference.cpp
index e5e9a398..3194a4f2 100644
--- a/src/xmpp/xmpp-im/xmpp_reference.cpp
+++ b/src/xmpp/xmpp-im/xmpp_reference.cpp
@@ -82,7 +82,7 @@ void Reference::setRange(int begin, int end)
     d->end = end;
 }
 
-int Reference::start() const
+int Reference::begin() const
 {
     return d->begin;
 }
@@ -134,12 +134,17 @@ bool Reference::fromXml(const QDomElement &e)
 
     int beginN = -1, endN = -1;
     bool ok;
-    if (!begin.isEmpty() && !(beginN = begin.toInt(&ok),ok)) {
+    if (!begin.isEmpty() && !(beginN = begin.toInt(&ok),ok))
         return false;
-    }
-    if (!end.isEmpty() && !(endN = end.toInt(&ok),ok)) {
+
+    if (!end.isEmpty() && !(endN = end.toInt(&ok),ok))
+        return false;
+
+    if (beginN >= 0 && endN >= 0 && endN < beginN)
+        return false;
+
+    if ((endN >= 0 && beginN == -1) || (endN == -1 && beginN >= 0))
         return false;
-    }
 
     auto msEl = e.firstChildElement("media-sharing");
     MediaSharing ms;
diff --git a/src/xmpp/xmpp-im/xmpp_reference.h b/src/xmpp/xmpp-im/xmpp_reference.h
index bb1681d6..d19b5316 100644
--- a/src/xmpp/xmpp-im/xmpp_reference.h
+++ b/src/xmpp/xmpp-im/xmpp_reference.h
@@ -35,6 +35,8 @@ namespace XMPP
     public:
         Jingle::FileTransfer::File file;
         QStringList sources;
+
+        inline bool isValid() const { return file.isValid(); }
     };
 
     class Reference
@@ -56,8 +58,8 @@ namespace XMPP
         Type type() const;
         const QString &uri() const;
 
-        void setRange(int start, int end);
-        int start() const;
+        void setRange(int begin, int end);
+        int begin() const;
         int end() const;
 
         const QString &anchor() const;

From 6af64e550011f8d3f6a9fb5446de23f85d893b1e Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 25 Jun 2019 08:14:34 +0300
Subject: [PATCH 080/383] Consider coding while converting spectrum to xml

---
 src/xmpp/xmpp-im/jingle-ft.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 607dc350..c0b266e7 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -241,7 +241,17 @@ QDomElement File::toXml(QDomDocument *doc) const
         sel.setAttribute(QString::fromLatin1("coding"), QString::fromLatin1(s[d->audioSpectrum.coding]));
         QStringList sl;
         std::transform(d->audioSpectrum.bars.begin(), d->audioSpectrum.bars.end(), std::back_inserter(sl),
-                       [](quint32 v){ return QString::number(v); });
+                       [this](quint32 v){
+            switch (d->audioSpectrum.coding) {
+            case Spectrum::U8:  return QString::number(quint8(v));
+            case Spectrum::S8:  return QString::number(qint8(v));
+            case Spectrum::U16: return QString::number(quint16(v));
+            case Spectrum::S16: return QString::number(qint16(v));
+            case Spectrum::U32: return QString::number(quint32(v));
+            case Spectrum::S32: return QString::number(qint32(v));
+            }
+            return QString();
+        });
         sel.appendChild(doc->createTextNode(sl.join(',')));
     }
     return el;

From 48b10763a4eeb191e18bde397c25d8318bc92a3b Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Thu, 27 Jun 2019 11:39:43 +0300
Subject: [PATCH 081/383] SIMS related fixes

---
 src/xmpp/xmpp-im/jingle-ft.cpp      | 19 +++++++++++++++----
 src/xmpp/xmpp-im/jingle-ft.h        |  1 +
 src/xmpp/xmpp-im/types.cpp          |  6 ++++--
 src/xmpp/xmpp-im/xmpp_hash.h        |  3 ++-
 src/xmpp/xmpp-im/xmpp_reference.cpp | 15 ++++++++-------
 5 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index c0b266e7..5a41f13c 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -137,7 +137,7 @@ File::File(const QDomElement &file)
                 }
             }
             QDomElement hashEl = ce.firstChildElement(QLatin1String("hash"));
-            if (hashEl.attribute(QStringLiteral("xmlns")) == QLatin1String("urn:xmpp:hashes:2")) {
+            if (hashEl.attribute(QStringLiteral("xmlns")) == HASH_NS || hashEl.namespaceURI() == HASH_NS) {
                 range.hash = Hash(hashEl);
                 if (range.hash.type() == Hash::Type::Unknown) {
                     return;
@@ -149,7 +149,7 @@ File::File(const QDomElement &file)
             desc = ce.text();
 
         } else if (ce.tagName() == QLatin1String("hash")) {
-            if (ce.attribute(QStringLiteral("xmlns")) == QLatin1String(XMPP_HASH_NS)) {
+            if (ce.attribute(QStringLiteral("xmlns")) == HASH_NS || ce.namespaceURI() == HASH_NS) {
                 Hash h(ce);
                 if (h.type() == Hash::Type::Unknown) {
                     return;
@@ -158,7 +158,7 @@ File::File(const QDomElement &file)
             }
 
         } else if (ce.tagName() == QLatin1String("hash-used")) {
-            if (ce.attribute(QStringLiteral("xmlns")) == QLatin1String(XMPP_HASH_NS)) {
+            if (ce.attribute(QStringLiteral("xmlns")) == HASH_NS || ce.namespaceURI() == HASH_NS) {
                 Hash h(ce);
                 if (h.type() == Hash::Type::Unknown) {
                     return;
@@ -168,7 +168,7 @@ File::File(const QDomElement &file)
 
         } else if (ce.tagName() == QLatin1String("thumbnail")) {
             thumbnail = Thumbnail(ce);
-        } else if (ce.tagName() == QLatin1String("spectrum") && ce.attribute(QStringLiteral("xmlns")) == SPECTRUM_NS) {
+        } else if (ce.tagName() == QLatin1String("spectrum") && (ce.attribute(QStringLiteral("xmlns")) == SPECTRUM_NS || ce.namespaceURI() == SPECTRUM_NS)) {
             QStringList spv = ce.text().split(',');
             spectrum.bars.reserve(spv.count());
             std::transform(spv.begin(), spv.end(), std::back_inserter(spectrum.bars), [](const QString &v){ return v.toUInt(); });
@@ -273,6 +273,17 @@ bool File::merge(const File &other)
     return true;
 }
 
+bool File::hasComputedHashes() const
+{
+    if (!d)
+        return false;
+    for (auto const &h: d->hashes) {
+        if (h.data().size())
+            return true;
+    }
+    return false;
+}
+
 QDateTime File::date() const
 {
     return d? d->date : QDateTime();
diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index 4f056320..0619a594 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -66,6 +66,7 @@ class File
     inline bool isValid() const { return d != nullptr; }
     QDomElement toXml(QDomDocument *doc) const;
     bool merge(const File &other);
+    bool hasComputedHashes() const;
 
     QDateTime date()  const;
     QString   description() const;
diff --git a/src/xmpp/xmpp-im/types.cpp b/src/xmpp/xmpp-im/types.cpp
index 4e4f1bcc..1eb677f5 100644
--- a/src/xmpp/xmpp-im/types.cpp
+++ b/src/xmpp/xmpp-im/types.cpp
@@ -35,6 +35,7 @@
 namespace XMPP
 {
 
+QString HASH_NS = QStringLiteral("urn:xmpp:hashes:2");
 //----------------------------------------------------------------------------
 // Url
 //----------------------------------------------------------------------------
@@ -391,7 +392,7 @@ QDomElement Hash::toXml(QDomDocument *doc) const
     if (v_type != Type::Unknown) {
         for(size_t n = 0; n < sizeof(hashTypes) / sizeof(hashTypes[0]); ++n) {
             if(v_type == hashTypes[n].hashType) {
-                auto el = doc->createElementNS(XMPP_HASH_NS, QLatin1String(v_data.isEmpty()? "hash-used": "hash"));
+                auto el = doc->createElementNS(HASH_NS, QLatin1String(v_data.isEmpty()? "hash-used": "hash"));
                 el.setAttribute(QLatin1String("algo"), QLatin1String(hashTypes[n].text));
                 if (!v_data.isEmpty()) {
                     XMLHelper::setTagText(el, v_data.toBase64());
@@ -3740,7 +3741,8 @@ const Jid &CaptchaChallenge::arbiter() const
 
 Thumbnail::Thumbnail(const QDomElement &el)
 {
-    if(el.attribute("xmlns") == QLatin1String(XMPP_THUMBS_NS)) {
+    QString ns(QLatin1String(XMPP_THUMBS_NS));
+    if(el.attribute("xmlns") == ns || el.namespaceURI() == ns) {
         uri = QUrl(el.attribute("uri"), QUrl::StrictMode);
         mimeType = el.attribute("mime-type");
         width = el.attribute("width").toUInt();
diff --git a/src/xmpp/xmpp-im/xmpp_hash.h b/src/xmpp/xmpp-im/xmpp_hash.h
index df6ddfb4..e61d7ed2 100644
--- a/src/xmpp/xmpp-im/xmpp_hash.h
+++ b/src/xmpp/xmpp-im/xmpp_hash.h
@@ -23,17 +23,18 @@
 
 #include <QString>
 #include <QFuture>
-#define XMPP_HASH_NS "urn:xmpp:hashes:2" // TODO make nsdb.cpp/h with static declarations of all ns
 
 class QDomElement;
 
 namespace XMPP
 {
+    extern QString HASH_NS;
     class Features;
 
     class Hash
     {
     public:
+
         enum Type { // XEP-0300 Version 0.5.3 (2018-02-14)
             Unknown,    // not standard, just a default
             Sha1,       // SHOULD NOT
diff --git a/src/xmpp/xmpp-im/xmpp_reference.cpp b/src/xmpp/xmpp-im/xmpp_reference.cpp
index 3194a4f2..d610b8b3 100644
--- a/src/xmpp/xmpp-im/xmpp_reference.cpp
+++ b/src/xmpp/xmpp-im/xmpp_reference.cpp
@@ -148,20 +148,19 @@ bool Reference::fromXml(const QDomElement &e)
 
     auto msEl = e.firstChildElement("media-sharing");
     MediaSharing ms;
-    if (msEl.attribute(QString::fromLatin1("xmlns")) == MEDIASHARING_NS) {
+    if (msEl.namespaceURI() == MEDIASHARING_NS) {
         auto fileEl = msEl.firstChildElement("file");
-        auto sourcesEl = msEl.firstChildElement("file");
-        if (sourcesEl.isNull() || fileEl.isNull() || fileEl.attribute(QString::fromLatin1("xmlns")) != XMPP::Jingle::FileTransfer::NS)
+        auto sourcesEl = msEl.firstChildElement("sources");
+        if (sourcesEl.isNull() || fileEl.isNull() || fileEl.namespaceURI() != XMPP::Jingle::FileTransfer::NS)
             return false;
 
         ms.file = XMPP::Jingle::FileTransfer::File(fileEl);
-        if (!ms.file.isValid())
+        if (!ms.file.isValid() || !ms.file.hasComputedHashes())
             return false;
 
-
         auto srcName = QString::fromLatin1("reference");
-        for (auto el = msEl.firstChildElement(srcName); !el.isNull(); el = el.nextSiblingElement(srcName)) {
-            if (el.attribute(QString::fromLatin1("xmlns")) == REFERENCE_NS) {
+        for (auto el = sourcesEl.firstChildElement(srcName); !el.isNull(); el = el.nextSiblingElement(srcName)) {
+            if (el.namespaceURI() == REFERENCE_NS) {
                 Reference ref;
                 if (!ref.fromXml(el)) {
                     return false;
@@ -169,6 +168,8 @@ bool Reference::fromXml(const QDomElement &e)
                 ms.sources.append(ref.uri());
             }
         }
+        if (ms.sources.isEmpty())
+            return false;
     }
 
     D()->type = t;

From 6dd3c8906c17ec1a2e57137869d681a72897b718 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Fri, 28 Jun 2019 08:05:42 +0300
Subject: [PATCH 082/383] Drop xmlns attribute usage in favor of namespaceURI

---
 src/xmpp/xmpp-core/protocol.cpp         |  14 +--
 src/xmpp/xmpp-core/stream.cpp           |   3 +-
 src/xmpp/xmpp-core/xmpp_stanza.cpp      |   6 +-
 src/xmpp/xmpp-im/client.cpp             |   6 +-
 src/xmpp/xmpp-im/filetransfer.cpp       |  32 +++---
 src/xmpp/xmpp-im/httpfileupload.cpp     |  18 +++-
 src/xmpp/xmpp-im/jingle-ft.cpp          |   8 +-
 src/xmpp/xmpp-im/jingle.cpp             |  26 +++--
 src/xmpp/xmpp-im/s5b.cpp                |  32 +++---
 src/xmpp/xmpp-im/types.cpp              |   6 +-
 src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp  |   3 +-
 src/xmpp/xmpp-im/xmpp_discoinfotask.cpp |   3 +-
 src/xmpp/xmpp-im/xmpp_discoitem.cpp     |   2 +-
 src/xmpp/xmpp-im/xmpp_ibb.cpp           |  15 ++-
 src/xmpp/xmpp-im/xmpp_subsets.cpp       |   7 +-
 src/xmpp/xmpp-im/xmpp_tasks.cpp         | 132 +++++++++---------------
 src/xmpp/xmpp-im/xmpp_vcard.cpp         |   3 +-
 src/xmpp/xmpp-im/xmpp_xdata.cpp         |   5 +-
 src/xmpp/xmpp-im/xmpp_xmlcommon.cpp     |  20 +++-
 src/xmpp/xmpp-im/xmpp_xmlcommon.h       |   1 +
 20 files changed, 151 insertions(+), 191 deletions(-)

diff --git a/src/xmpp/xmpp-core/protocol.cpp b/src/xmpp/xmpp-core/protocol.cpp
index 42553ec1..c98b595e 100644
--- a/src/xmpp/xmpp-core/protocol.cpp
+++ b/src/xmpp/xmpp-core/protocol.cpp
@@ -426,24 +426,24 @@ QDomElement BasicProtocol::docElement()
 
     // HACK: using attributes seems to be the only way to get additional namespaces in here
     if(!defns.isEmpty())
-        e.setAttribute("xmlns", defns);
+        e.setAttribute(QString::fromLatin1("xmlns"), defns);
     for(QStringList::ConstIterator it = list.begin(); it != list.end();) {
         QString prefix = *(it++);
         QString uri = *(it++);
-        e.setAttribute(QString("xmlns:") + prefix, uri);
+        e.setAttribute(QString::fromLatin1("xmlns:") + prefix, uri);
     }
 
     // additional attributes
     if(!isIncoming() && !to.isEmpty())
-        e.setAttribute("to", to);
+        e.setAttribute(QString::fromLatin1("to"), to);
     if(isIncoming() && !from.isEmpty())
-        e.setAttribute("from", from);
+        e.setAttribute(QString::fromLatin1("from"), from);
     if(!id.isEmpty())
-        e.setAttribute("id", id);
+        e.setAttribute(QString::fromLatin1("id"), id);
     if(!lang.isEmpty())
-        e.setAttributeNS(NS_XML, "xml:lang", lang);
+        e.setAttributeNS(QString::fromLatin1(NS_XML), QString::fromLatin1("xml:lang"), lang);
     if(version.major > 0 || version.minor > 0)
-        e.setAttribute("version", QString::number(version.major) + '.' + QString::number(version.minor));
+        e.setAttribute(QString::fromLatin1("version"), QString::number(version.major) + '.' + QString::number(version.minor));
 
     return e;
 }
diff --git a/src/xmpp/xmpp-core/stream.cpp b/src/xmpp/xmpp-core/stream.cpp
index 8285055b..bec855e2 100644
--- a/src/xmpp/xmpp-core/stream.cpp
+++ b/src/xmpp/xmpp-core/stream.cpp
@@ -430,8 +430,7 @@ void ClientStream::continueAfterParams()
                 d->sasl->continueAfterParams();
         }
     } else if (d->state == AuthAbort) {
-        auto e = doc().createElement("abort"); // FIXME it's kind of wrong to forge xml here
-        e.setAttribute("xmlns", NS_SASL);
+        auto e = doc().createElementNS(NS_SASL, "abort");
         d->client.sendStanza(e);
         processNext();
     }
diff --git a/src/xmpp/xmpp-core/xmpp_stanza.cpp b/src/xmpp/xmpp-core/xmpp_stanza.cpp
index ca2f39c6..d283541c 100644
--- a/src/xmpp/xmpp-core/xmpp_stanza.cpp
+++ b/src/xmpp/xmpp-core/xmpp_stanza.cpp
@@ -331,7 +331,7 @@ bool Stanza::Error::fromXml(const QDomElement &e, const QString &baseNS)
 
     QString textTag(QString::fromLatin1("text"));
     for (auto t = e.firstChildElement(); !t.isNull(); t = t.nextSiblingElement()) {
-        if(t.namespaceURI() == NS_STANZAS || t.attribute(QString::fromLatin1("xmlns")) == NS_STANZAS) {
+        if(t.namespaceURI() == NS_STANZAS) {
             if (t.tagName() == textTag) {
                 text = t.text().trimmed();
             } else {
@@ -389,7 +389,7 @@ QDomElement Stanza::Error::toXml(QDomDocument &doc, const QString &baseNS) const
         errElem.setAttribute("by", by);
     }
     errElem.appendChild(t = doc.createElementNS(NS_STANZAS, scond));
-    t.setAttribute("xmlns", NS_STANZAS);    // FIX-ME: this shouldn't be needed
+    //t.setAttribute("xmlns", NS_STANZAS);    // FIX-ME: this shouldn't be needed
 
     // old code
     int scode = code();
@@ -399,7 +399,7 @@ QDomElement Stanza::Error::toXml(QDomDocument &doc, const QString &baseNS) const
     // text
     if(!text.isEmpty()) {
         t = doc.createElementNS(NS_STANZAS, "text");
-        t.setAttribute("xmlns", NS_STANZAS);    // FIX-ME: this shouldn't be needed
+        //t.setAttribute("xmlns", NS_STANZAS);    // FIX-ME: this shouldn't be needed
         t.appendChild(doc.createTextNode(text));
         errElem.appendChild(t);
     }
diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
index 4c9dd8a5..6033a505 100644
--- a/src/xmpp/xmpp-im/client.cpp
+++ b/src/xmpp/xmpp-im/client.cpp
@@ -580,7 +580,7 @@ void Client::streamReadyRead()
         debug(QString("Client: incoming: [\n%1]\n").arg(out));
         emit xmlIncoming(out);
 
-        QDomElement x = oldStyleNS(s.element());
+        QDomElement x = s.element();//oldStyleNS(s.element());
         distribute(x);
     }
 }
@@ -664,8 +664,8 @@ void Client::distribute(const QDomElement &x)
         error.setAttribute("type","cancel");
         reply.appendChild(error);
 
-        QDomElement error_type = doc()->createElement("feature-not-implemented");
-        error_type.setAttribute("xmlns","urn:ietf:params:xml:ns:xmpp-stanzas");
+        QDomElement error_type = doc()->createElementNS(QLatin1String("urn:ietf:params:xml:ns:xmpp-stanzas"),
+                                                        QLatin1String("feature-not-implemented"));
         error.appendChild(error_type);
 
         send(reply);
diff --git a/src/xmpp/xmpp-im/filetransfer.cpp b/src/xmpp/xmpp-im/filetransfer.cpp
index 78d0ae5e..493b4175 100644
--- a/src/xmpp/xmpp-im/filetransfer.cpp
+++ b/src/xmpp/xmpp-im/filetransfer.cpp
@@ -565,13 +565,11 @@ void JT_FT::request(const Jid &to, const QString &_id, const QString &fname,
     QDomElement iq;
     d->to = to;
     iq = createIQ(doc(), "set", to.full(), id());
-    QDomElement si = doc()->createElement("si");
-    si.setAttribute("xmlns", "http://jabber.org/protocol/si");
+    QDomElement si = doc()->createElementNS("http://jabber.org/protocol/si", "si");
     si.setAttribute("id", _id);
     si.setAttribute("profile", "http://jabber.org/protocol/si/profile/file-transfer");
 
-    QDomElement file = doc()->createElement("file");
-    file.setAttribute("xmlns", "http://jabber.org/protocol/si/profile/file-transfer");
+    QDomElement file = doc()->createElementNS("http://jabber.org/protocol/si/profile/file-transfer", "file");
     file.setAttribute("name", fname);
     file.setAttribute("size", QString::number(size));
     if(!desc.isEmpty()) {
@@ -590,10 +588,8 @@ void JT_FT::request(const Jid &to, const QString &_id, const QString &fname,
 
     si.appendChild(file);
 
-    QDomElement feature = doc()->createElement("feature");
-    feature.setAttribute("xmlns", "http://jabber.org/protocol/feature-neg");
-    QDomElement x = doc()->createElement("x");
-    x.setAttribute("xmlns", "jabber:x:data");
+    QDomElement feature = doc()->createElementNS("http://jabber.org/protocol/feature-neg", "feature");
+    QDomElement x = doc()->createElementNS("jabber:x:data", "x");
     x.setAttribute("type", "form");
 
     QDomElement field = doc()->createElement("field");
@@ -645,7 +641,7 @@ bool JT_FT::take(const QDomElement &x)
 
     if(x.attribute("type") == "result") {
         QDomElement si = firstChildElement(x);
-        if(si.attribute("xmlns") != "http://jabber.org/protocol/si" || si.tagName() != "si") {
+        if(si.namespaceURI() != "http://jabber.org/protocol/si" || si.tagName() != "si") {
             setError(900, "");
             return true;
         }
@@ -687,7 +683,7 @@ bool JT_FT::take(const QDomElement &x)
 
         QString streamtype;
         QDomElement feature = si.elementsByTagName("feature").item(0).toElement();
-        if(!feature.isNull() && feature.attribute("xmlns") == "http://jabber.org/protocol/feature-neg") {
+        if(!feature.isNull() && feature.namespaceURI() == "http://jabber.org/protocol/feature-neg") {
             QDomElement x = feature.elementsByTagName("x").item(0).toElement();
             if(!x.isNull() && x.attribute("type") == "submit") {
                 QDomElement field = x.elementsByTagName("field").item(0).toElement();
@@ -731,12 +727,10 @@ JT_PushFT::~JT_PushFT()
 void JT_PushFT::respondSuccess(const Jid &to, const QString &id, qlonglong rangeOffset, qlonglong rangeLength, const QString &streamType)
 {
     QDomElement iq = createIQ(doc(), "result", to.full(), id);
-    QDomElement si = doc()->createElement("si");
-    si.setAttribute("xmlns", "http://jabber.org/protocol/si");
+    QDomElement si = doc()->createElementNS("http://jabber.org/protocol/si", "si");
 
     if(rangeOffset != 0 || rangeLength != 0) {
-        QDomElement file = doc()->createElement("file");
-        file.setAttribute("xmlns", "http://jabber.org/protocol/si/profile/file-transfer");
+        QDomElement file = doc()->createElementNS("http://jabber.org/protocol/si/profile/file-transfer", "file");
         QDomElement range = doc()->createElement("range");
         if(rangeOffset > 0)
             range.setAttribute("offset", QString::number(rangeOffset));
@@ -746,10 +740,8 @@ void JT_PushFT::respondSuccess(const Jid &to, const QString &id, qlonglong range
         si.appendChild(file);
     }
 
-    QDomElement feature = doc()->createElement("feature");
-    feature.setAttribute("xmlns", "http://jabber.org/protocol/feature-neg");
-    QDomElement x = doc()->createElement("x");
-    x.setAttribute("xmlns", "jabber:x:data");
+    QDomElement feature = doc()->createElementNS("http://jabber.org/protocol/feature-neg", "feature");
+    QDomElement x = doc()->createElementNS("jabber:x:data", "x");
     x.setAttribute("type", "submit");
 
     QDomElement field = doc()->createElement("field");
@@ -784,7 +776,7 @@ bool JT_PushFT::take(const QDomElement &e)
         return false;
 
     QDomElement si = firstChildElement(e);
-    if(si.attribute("xmlns") != "http://jabber.org/protocol/si" || si.tagName() != "si")
+    if(si.namespaceURI() != "http://jabber.org/protocol/si" || si.tagName() != "si")
         return false;
     if(si.attribute("profile") != "http://jabber.org/protocol/si/profile/file-transfer")
         return false;
@@ -827,7 +819,7 @@ bool JT_PushFT::take(const QDomElement &e)
 
     QStringList streamTypes;
     QDomElement feature = si.elementsByTagName("feature").item(0).toElement();
-    if(!feature.isNull() && feature.attribute("xmlns") == "http://jabber.org/protocol/feature-neg") {
+    if(!feature.isNull() && feature.namespaceURI() == "http://jabber.org/protocol/feature-neg") {
         QDomElement x = feature.elementsByTagName("x").item(0).toElement();
         if(!x.isNull() /*&& x.attribute("type") == "form"*/) {
             QDomElement field = x.elementsByTagName("field").item(0).toElement();
diff --git a/src/xmpp/xmpp-im/httpfileupload.cpp b/src/xmpp/xmpp-im/httpfileupload.cpp
index eec47938..8e5efedf 100644
--- a/src/xmpp/xmpp-im/httpfileupload.cpp
+++ b/src/xmpp/xmpp-im/httpfileupload.cpp
@@ -302,14 +302,22 @@ JT_HTTPFileUpload::~JT_HTTPFileUpload()
 void JT_HTTPFileUpload::request(const Jid &to, const QString &fname,
                                 quint64 fsize, const QString &ftype, XEP0363::version ver)
 {
+    QString ns;
+    switch (ver)
+    {
+    case XEP0363::v0_2_5: ns = xmlns_v0_2_5; break;
+    case XEP0363::v0_3_1: ns = xmlns_v0_3_1; break;
+    default: return;
+    }
+
     d->to = to;
     d->ver = ver;
     d->iq = createIQ(doc(), "get", to.full(), id());
-    QDomElement req = doc()->createElement("request");
+    QDomElement req = doc()->createElementNS(ns, "request");
     switch (ver)
     {
     case XEP0363::v0_2_5:
-        req.setAttribute("xmlns", xmlns_v0_2_5);
+        ns = xmlns_v0_2_5;
         req.appendChild(textTag(doc(), "filename", fname));
         req.appendChild(textTag(doc(), "size", QString::number(fsize)));
         if (!ftype.isEmpty()) {
@@ -317,7 +325,7 @@ void JT_HTTPFileUpload::request(const Jid &to, const QString &fname,
         }
         break;
     case XEP0363::v0_3_1:
-        req.setAttribute("xmlns", xmlns_v0_3_1);
+        ns = xmlns_v0_3_1;
         req.setAttribute("filename", fname);
         req.setAttribute("size", fsize);
         if (!ftype.isEmpty())
@@ -366,12 +374,12 @@ bool JT_HTTPFileUpload::take(const QDomElement &e)
         switch (d->ver)
         {
         case XEP0363::v0_2_5:
-            correct_xmlns = slot.attribute("xmlns") == xmlns_v0_2_5;
+            correct_xmlns = slot.namespaceURI() == xmlns_v0_2_5;
             getUrl = tagContent(get);
             putUrl = tagContent(put);
             break;
         case XEP0363::v0_3_1:
-            correct_xmlns = slot.attribute("xmlns") == xmlns_v0_3_1;
+            correct_xmlns = slot.namespaceURI() == xmlns_v0_3_1;
             getUrl = get.attribute("url");
             if (!put.isNull()) {
                 putUrl = put.attribute("url");
diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 5a41f13c..d9507c1e 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -137,7 +137,7 @@ File::File(const QDomElement &file)
                 }
             }
             QDomElement hashEl = ce.firstChildElement(QLatin1String("hash"));
-            if (hashEl.attribute(QStringLiteral("xmlns")) == HASH_NS || hashEl.namespaceURI() == HASH_NS) {
+            if (hashEl.namespaceURI() == HASH_NS || hashEl.namespaceURI() == HASH_NS) {
                 range.hash = Hash(hashEl);
                 if (range.hash.type() == Hash::Type::Unknown) {
                     return;
@@ -149,7 +149,7 @@ File::File(const QDomElement &file)
             desc = ce.text();
 
         } else if (ce.tagName() == QLatin1String("hash")) {
-            if (ce.attribute(QStringLiteral("xmlns")) == HASH_NS || ce.namespaceURI() == HASH_NS) {
+            if (ce.namespaceURI() == HASH_NS || ce.namespaceURI() == HASH_NS) {
                 Hash h(ce);
                 if (h.type() == Hash::Type::Unknown) {
                     return;
@@ -158,7 +158,7 @@ File::File(const QDomElement &file)
             }
 
         } else if (ce.tagName() == QLatin1String("hash-used")) {
-            if (ce.attribute(QStringLiteral("xmlns")) == HASH_NS || ce.namespaceURI() == HASH_NS) {
+            if (ce.namespaceURI() == HASH_NS || ce.namespaceURI() == HASH_NS) {
                 Hash h(ce);
                 if (h.type() == Hash::Type::Unknown) {
                     return;
@@ -168,7 +168,7 @@ File::File(const QDomElement &file)
 
         } else if (ce.tagName() == QLatin1String("thumbnail")) {
             thumbnail = Thumbnail(ce);
-        } else if (ce.tagName() == QLatin1String("spectrum") && (ce.attribute(QStringLiteral("xmlns")) == SPECTRUM_NS || ce.namespaceURI() == SPECTRUM_NS)) {
+        } else if (ce.tagName() == QLatin1String("spectrum") && (ce.namespaceURI() == SPECTRUM_NS || ce.namespaceURI() == SPECTRUM_NS)) {
             QStringList spv = ce.text().split(',');
             spectrum.bars.reserve(spv.count());
             std::transform(spv.begin(), spv.end(), std::back_inserter(spectrum.bars), [](const QString &v){ return v.toUInt(); });
diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index a9c6c5a8..cea49046 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -155,7 +155,6 @@ QDomElement Jingle::toXml(QDomDocument *doc) const
     }
 
     QDomElement query = doc->createElementNS(NS, QLatin1String("jingle"));
-    //query.setAttribute("xmlns", JINGLE_NS);
     for (unsigned int i = 0; i < sizeof(jingleActions) / sizeof(jingleActions[0]); i++) {
         if (jingleActions[i].action == d->action) {
             query.setAttribute(QLatin1String("action"), QLatin1String(jingleActions[i].text));
@@ -256,13 +255,13 @@ Reason::Reason(const QDomElement &e)
 
     Condition condition = NoReason;
     QString text;
-    QString rns = e.attribute(QStringLiteral("xmlns"));
+    QString rns = e.namespaceURI();
 
     for (QDomElement c = e.firstChildElement(); !c.isNull(); c = c.nextSiblingElement()) {
         if (c.tagName() == QLatin1String("text")) {
             text = c.text();
         }
-        else if (c.attribute(QStringLiteral("xmlns")) != rns) {
+        else if (c.namespaceURI() != rns) {
             // TODO add here all the extensions to reason.
         }
         else {
@@ -459,7 +458,7 @@ class JTPush : public Task
             return false;
         }
         auto jingleEl = iq.firstChildElement(QStringLiteral("jingle"));
-        if (jingleEl.isNull() || jingleEl.attribute(QStringLiteral("xmlns")) != ::XMPP::Jingle::NS) {
+        if (jingleEl.isNull() || jingleEl.namespaceURI() != ::XMPP::Jingle::NS) {
             return false;
         }
 
@@ -475,7 +474,7 @@ class JTPush : public Task
                 auto dname = QString::fromLatin1("description");
                 for (auto n = jingleEl.firstChildElement(cname); !n.isNull(); n = n.nextSiblingElement(cname)) {
                     auto del = n.firstChildElement(dname);
-                    if (!del.isNull() && externalManagers.contains(del.attribute(QStringLiteral("xmlns")))) {
+                    if (!del.isNull() && externalManagers.contains(del.namespaceURI())) {
                         externalSessions.append(jingle.sid());
                         return false;
                     }
@@ -898,8 +897,8 @@ class Session::Private
     {
         QDomElement descriptionEl = ce.firstChildElement(QLatin1String("description"));
         QDomElement transportEl = ce.firstChildElement(QLatin1String("transport"));
-        QString descriptionNS = descriptionEl.attribute(QStringLiteral("xmlns"));
-        QString transportNS = transportEl.attribute(QStringLiteral("xmlns"));
+        QString descriptionNS = descriptionEl.namespaceURI();
+        QString transportNS = transportEl.namespaceURI();
         typedef std::tuple<AddContentError, Reason::Condition, Application*> result;
 
         ContentBase c(ce);
@@ -1001,8 +1000,8 @@ class Session::Private
     {
         QDomElement descriptionEl = ce.firstChildElement(QLatin1String("description"));
         QDomElement transportEl = ce.firstChildElement(QLatin1String("transport"));
-        QString descriptionNS = descriptionEl.attribute(QStringLiteral("xmlns"));
-        QString transportNS = transportEl.attribute(QStringLiteral("xmlns"));
+        QString descriptionNS = descriptionEl.namespaceURI();
+        QString transportNS = transportEl.namespaceURI();
         typedef std::tuple<AddContentError, Reason::Condition, Application*> result;
 
         ContentBase c(ce);
@@ -1239,7 +1238,7 @@ class Session::Private
         {
             ContentBase cb(ce);
             auto transportEl = ce.firstChildElement(QString::fromLatin1("transport"));
-            QString transportNS = transportEl.attribute(QStringLiteral("xmlns"));
+            QString transportNS = transportEl.namespaceURI();
             if (!cb.isValid() || transportEl.isNull() || transportNS.isEmpty()) {
                 lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
                 return false;
@@ -1298,7 +1297,7 @@ class Session::Private
         {
             ContentBase cb(ce);
             auto transportEl = ce.firstChildElement(QString::fromLatin1("transport"));
-            QString transportNS = transportEl.attribute(QStringLiteral("xmlns"));
+            QString transportNS = transportEl.namespaceURI();
             if (!cb.isValid() || transportEl.isNull() || transportNS.isEmpty()) {
                 lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
                 return false;
@@ -1328,7 +1327,7 @@ class Session::Private
                 return false;
             }
             auto tel = ce.firstChildElement(QStringLiteral("transport"));
-            if (tel.isNull() || tel.attribute(QStringLiteral("xmlns")) != app->transport()->pad()->ns()) {
+            if (tel.isNull() || tel.namespaceURI() != app->transport()->pad()->ns()) {
                 lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
                 return false;
             }
@@ -1898,8 +1897,7 @@ void ErrorUtil::fill(QDomDocument doc, Stanza::Error &error, int jingleCond)
 
 int ErrorUtil::jingleCondition(const Stanza::Error &error)
 {
-    //qDebug() << "tag" << error.appSpec.tagName() << "xmlns" << error.appSpec.attribute(QString::fromLatin1("xmlns")) << "ns" << error.appSpec.namespaceURI();
-    if (error.appSpec.attribute(QString::fromLatin1("xmlns")) != ERROR_NS) {
+    if (error.appSpec.namespaceURI() != ERROR_NS) {
         return UnknownError;
     }
     QString tagName = error.appSpec.tagName();
diff --git a/src/xmpp/xmpp-im/s5b.cpp b/src/xmpp/xmpp-im/s5b.cpp
index a9597d3c..5cdea38d 100644
--- a/src/xmpp/xmpp-im/s5b.cpp
+++ b/src/xmpp/xmpp-im/s5b.cpp
@@ -1991,8 +1991,7 @@ void JT_S5B::request(const Jid &to, const QString &sid, const QString &dstaddr,
     QDomElement iq;
     d->to = to;
     iq = createIQ(doc(), "set", to.full(), id());
-    QDomElement query = doc()->createElement("query");
-    query.setAttribute("xmlns", S5B_NS);
+    QDomElement query = doc()->createElementNS(S5B_NS, "query");
     query.setAttribute("sid", sid);
     if (!client()->groupChatNick(to.domain(), to.node()).isEmpty()) {
         query.setAttribute("dstaddr", dstaddr); // special case for muc as in xep-0065rc3
@@ -2005,15 +2004,13 @@ void JT_S5B::request(const Jid &to, const QString &sid, const QString &dstaddr,
         shost.setAttribute("host", (*it).host());
         shost.setAttribute("port", QString::number((*it).port()));
         if((*it).isProxy()) {
-            QDomElement p = doc()->createElement("proxy");
-            p.setAttribute("xmlns", "http://affinix.com/jabber/stream");
+            QDomElement p = doc()->createElementNS("http://affinix.com/jabber/stream", "proxy");
             shost.appendChild(p);
         }
         query.appendChild(shost);
     }
     if(fast) {
-        QDomElement e = doc()->createElement("fast");
-        e.setAttribute("xmlns", "http://affinix.com/jabber/stream");
+        QDomElement e = doc()->createElementNS("http://affinix.com/jabber/stream", "fast");
         query.appendChild(e);
     }
     d->iq = iq;
@@ -2026,8 +2023,7 @@ void JT_S5B::requestProxyInfo(const Jid &to)
     QDomElement iq;
     d->to = to;
     iq = createIQ(doc(), "get", to.full(), id());
-    QDomElement query = doc()->createElement("query");
-    query.setAttribute("xmlns", S5B_NS);
+    QDomElement query = doc()->createElementNS(S5B_NS, "query");
     iq.appendChild(query);
     d->iq = iq;
 }
@@ -2039,8 +2035,7 @@ void JT_S5B::requestActivation(const Jid &to, const QString &sid, const Jid &tar
     QDomElement iq;
     d->to = to;
     iq = createIQ(doc(), "set", to.full(), id());
-    QDomElement query = doc()->createElement("query");
-    query.setAttribute("xmlns", S5B_NS);
+    QDomElement query = doc()->createElementNS(S5B_NS, "query");
     query.setAttribute("sid", sid);
     iq.appendChild(query);
     QDomElement act = doc()->createElement("activate");
@@ -2156,12 +2151,12 @@ bool JT_PushS5B::take(const QDomElement &e)
     // look for udpsuccess
     if(e.tagName() == "message") {
         QDomElement x = e.elementsByTagName("udpsuccess").item(0).toElement();
-        if(!x.isNull() && x.attribute("xmlns") == S5B_NS) {
+        if(!x.isNull() && x.namespaceURI() == S5B_NS) {
             incomingUDPSuccess(Jid(x.attribute("from")), x.attribute("dstaddr"));
             return true;
         }
         x = e.elementsByTagName("activate").item(0).toElement();
-        if(!x.isNull() && x.attribute("xmlns") == "http://affinix.com/jabber/stream") {
+        if(!x.isNull() && x.namespaceURI() == "http://affinix.com/jabber/stream") {
             incomingActivate(Jid(x.attribute("from")), x.attribute("sid"), Jid(x.attribute("jid")));
             return true;
         }
@@ -2194,7 +2189,7 @@ bool JT_PushS5B::take(const QDomElement &e)
             int port = shost.attribute("port").toInt();
             QDomElement p = shost.elementsByTagName("proxy").item(0).toElement();
             bool isProxy = false;
-            if(!p.isNull() && p.attribute("xmlns") == "http://affinix.com/jabber/stream")
+            if(!p.isNull() && p.namespaceURI() == "http://affinix.com/jabber/stream")
                 isProxy = true;
 
             StreamHost h;
@@ -2209,7 +2204,7 @@ bool JT_PushS5B::take(const QDomElement &e)
     bool fast = false;
     QDomElement t;
     t = q.elementsByTagName("fast").item(0).toElement();
-    if(!t.isNull() && t.attribute("xmlns") == "http://affinix.com/jabber/stream")
+    if(!t.isNull() && t.namespaceURI() == "http://affinix.com/jabber/stream")
         fast = true;
 
     S5BRequest r;
@@ -2228,8 +2223,7 @@ bool JT_PushS5B::take(const QDomElement &e)
 void JT_PushS5B::respondSuccess(const Jid &to, const QString &id, const Jid &streamHost)
 {
     QDomElement iq = createIQ(doc(), "result", to.full(), id);
-    QDomElement query = doc()->createElement("query");
-    query.setAttribute("xmlns", S5B_NS);
+    QDomElement query = doc()->createElementNS(S5B_NS, "query");
     iq.appendChild(query);
     QDomElement shost = doc()->createElement("streamhost-used");
     shost.setAttribute("jid", streamHost.full());
@@ -2250,8 +2244,7 @@ void JT_PushS5B::sendUDPSuccess(const Jid &to, const QString &dstaddr)
 {
     QDomElement m = doc()->createElement("message");
     m.setAttribute("to", to.full());
-    QDomElement u = doc()->createElement("udpsuccess");
-    u.setAttribute("xmlns", S5B_NS);
+    QDomElement u = doc()->createElementNS(S5B_NS, "udpsuccess");
     u.setAttribute("dstaddr", dstaddr);
     m.appendChild(u);
     send(m);
@@ -2261,8 +2254,7 @@ void JT_PushS5B::sendActivate(const Jid &to, const QString &sid, const Jid &stre
 {
     QDomElement m = doc()->createElement("message");
     m.setAttribute("to", to.full());
-    QDomElement act = doc()->createElement("activate");
-    act.setAttribute("xmlns", "http://affinix.com/jabber/stream");
+    QDomElement act = doc()->createElementNS("http://affinix.com/jabber/stream", "activate");
     act.setAttribute("sid", sid);
     act.setAttribute("jid", streamHost.full());
     m.appendChild(act);
diff --git a/src/xmpp/xmpp-im/types.cpp b/src/xmpp/xmpp-im/types.cpp
index 1eb677f5..b13863ca 100644
--- a/src/xmpp/xmpp-im/types.cpp
+++ b/src/xmpp/xmpp-im/types.cpp
@@ -2449,7 +2449,6 @@ QDomElement HttpAuthRequest::toXml(QDomDocument &doc) const
         return e;
 
     e = doc.createElementNS("http://jabber.org/protocol/http-auth", "confirm");
-    e.setAttribute("xmlns", "http://jabber.org/protocol/http-auth");
 
     if(hasId_)
         e.setAttribute("id", id_);
@@ -2590,8 +2589,7 @@ QCryptographicHash::Algorithm CapsSpec::hashAlgorithm() const
 
 QDomElement CapsSpec::toXml(QDomDocument *doc) const
 {
-    QDomElement c = doc->createElement("c");
-    c.setAttribute("xmlns", NS_CAPS);
+    QDomElement c = doc->createElementNS(NS_CAPS, "c");
     QString algo = cryptoMap().key(hashAlgo_);
     c.setAttribute("hash",algo);
     c.setAttribute("node",node_);
@@ -3742,7 +3740,7 @@ const Jid &CaptchaChallenge::arbiter() const
 Thumbnail::Thumbnail(const QDomElement &el)
 {
     QString ns(QLatin1String(XMPP_THUMBS_NS));
-    if(el.attribute("xmlns") == ns || el.namespaceURI() == ns) {
+    if(el.namespaceURI() == ns) {
         uri = QUrl(el.attribute("uri"), QUrl::StrictMode);
         mimeType = el.attribute("mime-type");
         width = el.attribute("width").toUInt();
diff --git a/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp b/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp
index a431568c..de7ee799 100644
--- a/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp
+++ b/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp
@@ -121,8 +121,7 @@ void BoBData::fromXml(const QDomElement &data)
 
 QDomElement BoBData::toXml(QDomDocument *doc) const
 {
-    QDomElement data = doc->createElement("data");
-    data.setAttribute("xmlns", "urn:xmpp:bob");
+    QDomElement data = doc->createElementNS("urn:xmpp:bob", "data");
     data.setAttribute("cid", d->cid);
     data.setAttribute("max-age", d->maxAge);
     data.setAttribute("type", d->type);
diff --git a/src/xmpp/xmpp-im/xmpp_discoinfotask.cpp b/src/xmpp/xmpp-im/xmpp_discoinfotask.cpp
index 1bf0252c..24d7f17a 100644
--- a/src/xmpp/xmpp-im/xmpp_discoinfotask.cpp
+++ b/src/xmpp/xmpp-im/xmpp_discoinfotask.cpp
@@ -110,8 +110,7 @@ void DiscoInfoTask::onGo ()
     }
 
     QDomElement iq = createIQ(doc(), "get", d->jid.full(), id());
-    QDomElement query = doc()->createElement("query");
-    query.setAttribute("xmlns", "http://jabber.org/protocol/disco#info");
+    QDomElement query = doc()->createElementNS("http://jabber.org/protocol/disco#info", "query");
     if ( !d->node.isEmpty() )
         query.setAttribute("node", d->node);
 
diff --git a/src/xmpp/xmpp-im/xmpp_discoitem.cpp b/src/xmpp/xmpp-im/xmpp_discoitem.cpp
index 6a1f3243..75738ef1 100644
--- a/src/xmpp/xmpp-im/xmpp_discoitem.cpp
+++ b/src/xmpp/xmpp-im/xmpp_discoitem.cpp
@@ -189,7 +189,7 @@ DiscoItem DiscoItem::fromDiscoInfoResult(const QDomElement &q)
 
             identities.append( id );
         }
-        else if (e.tagName() == QLatin1String("x") && e.attribute("xmlns") == QLatin1String("jabber:x:data")) {
+        else if (e.tagName() == QLatin1String("x") && e.namespaceURI() == QLatin1String("jabber:x:data")) {
             XData form;
             form.fromXml(e);
             extList.append(form);
diff --git a/src/xmpp/xmpp-im/xmpp_ibb.cpp b/src/xmpp/xmpp-im/xmpp_ibb.cpp
index 475af303..9089ecce 100644
--- a/src/xmpp/xmpp-im/xmpp_ibb.cpp
+++ b/src/xmpp/xmpp-im/xmpp_ibb.cpp
@@ -345,8 +345,7 @@ IBBData& IBBData::fromXml(const QDomElement &e)
 
 QDomElement IBBData::toXml(QDomDocument *doc) const
 {
-    QDomElement query = textTag(doc, "data", QString::fromLatin1(data.toBase64())).toElement();
-    query.setAttribute("xmlns", IBB_NS);
+    QDomElement query = textTagNS(doc, IBB_NS, "data", QString::fromLatin1(data.toBase64())).toElement();
     query.setAttribute("seq", QString::number(seq));
     query.setAttribute("sid", sid);
     return query;
@@ -529,9 +528,8 @@ void JT_IBB::request(const Jid &to, const QString &sid, int blockSize)
     QDomElement iq;
     d->to = to;
     iq = createIQ(doc(), "set", to.full(), id());
-    QDomElement query = doc()->createElement("open");
+    QDomElement query = doc()->createElementNS(IBB_NS, "open");
     //genUniqueKey
-    query.setAttribute("xmlns", IBB_NS);
     query.setAttribute("sid", sid);
     query.setAttribute("block-size", blockSize);
     query.setAttribute("stanza", "iq");
@@ -556,8 +554,7 @@ void JT_IBB::close(const Jid &to, const QString &sid)
     QDomElement iq;
     d->to = to;
     iq = createIQ(doc(), "set", to.full(), id());
-    QDomElement query = iq.appendChild(doc()->createElement("close")).toElement();
-    query.setAttribute("xmlns", IBB_NS);
+    QDomElement query = iq.appendChild(doc()->createElementNS(IBB_NS, "close")).toElement();
     query.setAttribute("sid", sid);
 
     d->iq = iq;
@@ -592,7 +589,7 @@ bool JT_IBB::take(const QDomElement &e)
         QString id = e.attribute("id");
         QString from = e.attribute("from");
         QDomElement openEl = e.firstChildElement("open");
-        if (!openEl.isNull() && openEl.attribute("xmlns") == IBB_NS) {
+        if (!openEl.isNull() && openEl.namespaceURI() == IBB_NS) {
             emit incomingRequest(Jid(from), id,
                             openEl.attribute("sid"),
                             openEl.attribute("block-size").toInt(),
@@ -600,13 +597,13 @@ bool JT_IBB::take(const QDomElement &e)
             return true;
         }
         QDomElement dataEl = e.firstChildElement("data");
-        if (!dataEl.isNull() && dataEl.attribute("xmlns") == IBB_NS) {
+        if (!dataEl.isNull() && dataEl.namespaceURI() == IBB_NS) {
             IBBData data;
             emit incomingData(Jid(from), id, data.fromXml(dataEl), Stanza::IQ);
             return true;
         }
         QDomElement closeEl = e.firstChildElement("close");
-        if (!closeEl.isNull() && closeEl.attribute("xmlns") == IBB_NS) {
+        if (!closeEl.isNull() && closeEl.namespaceURI() == IBB_NS) {
             emit closeRequest(Jid(from), id, closeEl.attribute("sid"));
             return true;
         }
diff --git a/src/xmpp/xmpp-im/xmpp_subsets.cpp b/src/xmpp/xmpp-im/xmpp_subsets.cpp
index 014ddccc..ef306639 100644
--- a/src/xmpp/xmpp-im/xmpp_subsets.cpp
+++ b/src/xmpp/xmpp-im/xmpp_subsets.cpp
@@ -56,8 +56,7 @@ class SubsetsClientManager::Private
 
     QDomElement mainElement(QDomDocument *doc)
     {
-        QDomElement e = doc->createElement(QStringLiteral("set"));
-        e.setAttribute(QStringLiteral("xmlns"), xmlns_ns_rsm);
+        QDomElement e = doc->createElementNS(xmlns_ns_rsm, QStringLiteral("set"));
         return e;
     }
 
@@ -189,13 +188,13 @@ void SubsetsClientManager::setMax(int max)
 
 QDomElement SubsetsClientManager::findElement(const QDomElement &el, bool child)
 {
-    if (el.tagName() == QLatin1String("set") && el.attribute(QLatin1String("xmlns")) == xmlns_ns_rsm)
+    if (el.tagName() == QLatin1String("set") && el.namespaceURI() == xmlns_ns_rsm)
         return el;
 
     if (child) {
         QDomElement e = el.firstChildElement(QLatin1String("set"));
         while (!e.isNull()) {
-            if (e.attribute(QLatin1String("xmlns")) == xmlns_ns_rsm) {
+            if (e.namespaceURI() == xmlns_ns_rsm) {
                 return e;
             }
             e = e.nextSiblingElement(QLatin1String("set"));
diff --git a/src/xmpp/xmpp-im/xmpp_tasks.cpp b/src/xmpp/xmpp-im/xmpp_tasks.cpp
index aa569a6d..7a627a3c 100644
--- a/src/xmpp/xmpp-im/xmpp_tasks.cpp
+++ b/src/xmpp/xmpp-im/xmpp_tasks.cpp
@@ -101,8 +101,7 @@ JT_Session::JT_Session(Task *parent) : Task(parent)
 void JT_Session::onGo()
 {
     QDomElement iq = createIQ(doc(), "set", "", id());
-    QDomElement session = doc()->createElement("session");
-    session.setAttribute("xmlns",NS_SESSION);
+    QDomElement session = doc()->createElementNS(NS_SESSION, "session");
     iq.appendChild(session);
     send(iq);
 }
@@ -161,8 +160,7 @@ void JT_Register::reg(const QString &user, const QString &pass)
     d->type = 0;
     to = client()->host();
     iq = createIQ(doc(), "set", to.full(), id());
-    QDomElement query = doc()->createElement("query");
-    query.setAttribute("xmlns", "jabber:iq:register");
+    QDomElement query = doc()->createElementNS("jabber:iq:register", "query");
     iq.appendChild(query);
     query.appendChild(textTag(doc(), "username", user));
     query.appendChild(textTag(doc(), "password", pass));
@@ -173,8 +171,7 @@ void JT_Register::changepw(const QString &pass)
     d->type = 1;
     to = client()->host();
     iq = createIQ(doc(), "set", to.full(), id());
-    QDomElement query = doc()->createElement("query");
-    query.setAttribute("xmlns", "jabber:iq:register");
+    QDomElement query = doc()->createElementNS("jabber:iq:register", "query");
     iq.appendChild(query);
     query.appendChild(textTag(doc(), "username", client()->user()));
     query.appendChild(textTag(doc(), "password", pass));
@@ -185,8 +182,7 @@ void JT_Register::unreg(const Jid &j)
     d->type = 2;
     to = j.isEmpty() ? client()->host() : j.full();
     iq = createIQ(doc(), "set", to.full(), id());
-    QDomElement query = doc()->createElement("query");
-    query.setAttribute("xmlns", "jabber:iq:register");
+    QDomElement query = doc()->createElementNS("jabber:iq:register", "query");
     iq.appendChild(query);
 
     // this may be useful
@@ -201,8 +197,7 @@ void JT_Register::getForm(const Jid &j)
     d->type = 3;
     to = j;
     iq = createIQ(doc(), "get", to.full(), id());
-    QDomElement query = doc()->createElement("query");
-    query.setAttribute("xmlns", "jabber:iq:register");
+    QDomElement query = doc()->createElementNS("jabber:iq:register", "query");
     iq.appendChild(query);
 }
 
@@ -211,8 +206,7 @@ void JT_Register::setForm(const Form &form)
     d->type = 4;
     to = form.jid();
     iq = createIQ(doc(), "set", to.full(), id());
-    QDomElement query = doc()->createElement("query");
-    query.setAttribute("xmlns", "jabber:iq:register");
+    QDomElement query = doc()->createElementNS("jabber:iq:register", "query");
     iq.appendChild(query);
 
     // key?
@@ -230,8 +224,7 @@ void JT_Register::setForm(const Jid& to, const XData& xdata)
 {
     d->type = 4;
     iq = createIQ(doc(), "set", to.full(), id());
-    QDomElement query = doc()->createElement("query");
-    query.setAttribute("xmlns", "jabber:iq:register");
+    QDomElement query = doc()->createElementNS("jabber:iq:register", "query");
     iq.appendChild(query);
     query.appendChild(xdata.toXml(doc(), true));
 }
@@ -284,11 +277,11 @@ bool JT_Register::take(const QDomElement &x)
                     d->form.setKey(tagContent(i));
                 else if (i.tagName() == QLatin1String("registered"))
                     d->registered = true;
-                else if(i.tagName() == "x" && i.attribute("xmlns") == "jabber:x:data") {
+                else if(i.tagName() == "x" && i.namespaceURI() == "jabber:x:data") {
                     d->xdata.fromXml(i);
                     d->hasXData = true;
                 }
-                else if(i.tagName() == "data" && i.attribute("xmlns") == "urn:xmpp:bob") {
+                else if(i.tagName() == "data" && i.namespaceURI() == "urn:xmpp:bob") {
                     client()->bobManager()->append(BoBData(i)); // xep-0231
                 }
                 else {
@@ -401,8 +394,7 @@ void JT_Roster::get()
     type = 0;
     //to = client()->host();
     iq = createIQ(doc(), "get", to.full(), id());
-    QDomElement query = doc()->createElement("query");
-    query.setAttribute("xmlns", "jabber:iq:roster");
+    QDomElement query = doc()->createElementNS("jabber:iq:roster", "query");
     iq.appendChild(query);
 }
 
@@ -436,8 +428,7 @@ void JT_Roster::onGo()
     else if(type == 1) {
         //to = client()->host();
         iq = createIQ(doc(), "set", to.full(), id());
-        QDomElement query = doc()->createElement("query");
-        query.setAttribute("xmlns", "jabber:iq:roster");
+        QDomElement query = doc()->createElementNS("jabber:iq:roster", "query");
         iq.appendChild(query);
         foreach (const QDomElement& it, d->itemList)
             query.appendChild(it);
@@ -583,13 +574,11 @@ void JT_Presence::pres(const Status &s)
         tag.appendChild( textTag(doc(), "priority", QString("%1").arg(s.priority()) ) );
 
         if(!s.keyID().isEmpty()) {
-            QDomElement x = textTag(doc(), "x", s.keyID());
-            x.setAttribute("xmlns", "http://jabber.org/protocol/e2e");
+            QDomElement x = textTagNS(doc(), "http://jabber.org/protocol/e2e", "x", s.keyID());
             tag.appendChild(x);
         }
         if(!s.xsigned().isEmpty()) {
-            QDomElement x = textTag(doc(), "x", s.xsigned());
-            x.setAttribute("xmlns", "jabber:x:signed");
+            QDomElement x = textTagNS(doc(), "jabber:x:signed", "x", s.xsigned());
             tag.appendChild(x);
         }
 
@@ -601,8 +590,7 @@ void JT_Presence::pres(const Status &s)
         }
 
         if(s.isMUC()) {
-            QDomElement m = doc()->createElement("x");
-            m.setAttribute("xmlns","http://jabber.org/protocol/muc");
+            QDomElement m = doc()->createElementNS("http://jabber.org/protocol/muc", "x");
             if (!s.mucPassword().isEmpty()) {
                 m.appendChild(textTag(doc(),"password",s.mucPassword()));
             }
@@ -622,8 +610,7 @@ void JT_Presence::pres(const Status &s)
         }
 
         if(s.hasPhotoHash()) {
-            QDomElement m = doc()->createElement("x");
-            m.setAttribute("xmlns", "vcard-temp:x:update");
+            QDomElement m = doc()->createElementNS("vcard-temp:x:update","x");
             m.appendChild(textTag(doc(), "photo", s.photoHash()));
             tag.appendChild(m);
         }
@@ -651,8 +638,7 @@ void JT_Presence::sub(const Jid &to, const QString &subType, const QString& nick
     if (!nick.isEmpty() && (subType == QLatin1String("subscribe") || subType == QLatin1String("subscribed") ||
                             subType == QLatin1String("unsubscribe") || subType == QLatin1String("unsubscribed")))
     {
-        QDomElement nick_tag = textTag(doc(),"nick",nick);
-        nick_tag.setAttribute("xmlns","http://jabber.org/protocol/nick");
+        QDomElement nick_tag = textTagNS(doc(),"http://jabber.org/protocol/nick","nick",nick);
         tag.appendChild(nick_tag);
     }
 }
@@ -708,7 +694,7 @@ bool JT_PushPresence::take(const QDomElement &e)
                 type == QLatin1String("unsubscribe") || type == QLatin1String("unsubscribed")) {
             QString nick;
             QDomElement tag = e.firstChildElement("nick");
-            if (!tag.isNull() && tag.attribute("xmlns") == "http://jabber.org/protocol/nick") {
+            if (!tag.isNull() && tag.namespaceURI() == "http://jabber.org/protocol/nick") {
                 nick = tagContent(tag);
             }
             subscription(j, type, nick);
@@ -735,17 +721,17 @@ bool JT_PushPresence::take(const QDomElement &e)
         if(i.isNull())
             continue;
 
-        if(i.tagName() == "x" && i.attribute("xmlns") == "jabber:x:delay") {
+        if(i.tagName() == "x" && i.namespaceURI() == "jabber:x:delay") {
             if(i.hasAttribute("stamp") && !stamp.isValid()) {
                 stamp = stamp2TS(i.attribute("stamp"));
             }
         }
-        else if(i.tagName() == "delay" && i.attribute("xmlns") == "urn:xmpp:delay") {
+        else if(i.tagName() == "delay" && i.namespaceURI() == "urn:xmpp:delay") {
             if(i.hasAttribute("stamp") && !stamp.isValid()) {
                 stamp = QDateTime::fromString(i.attribute("stamp").left(19), Qt::ISODate);
             }
         }
-        else if(i.tagName() == "x" && i.attribute("xmlns") == "gabber:x:music:info") {
+        else if(i.tagName() == "x" && i.namespaceURI() == "gabber:x:music:info") {
             QDomElement t;
             QString title, state;
 
@@ -759,26 +745,26 @@ bool JT_PushPresence::take(const QDomElement &e)
             if(!title.isEmpty() && state == "playing")
                 p.setSongTitle(title);
         }
-        else if(i.tagName() == "x" && i.attribute("xmlns") == "jabber:x:signed") {
+        else if(i.tagName() == "x" && i.namespaceURI() == "jabber:x:signed") {
             p.setXSigned(tagContent(i));
         }
-        else if(i.tagName() == "x" && i.attribute("xmlns") == "http://jabber.org/protocol/e2e") {
+        else if(i.tagName() == "x" && i.namespaceURI() == "http://jabber.org/protocol/e2e") {
             p.setKeyID(tagContent(i));
         }
-         else if(i.tagName() == "c" && i.attribute("xmlns") == NS_CAPS) {
+         else if(i.tagName() == "c" && i.namespaceURI() == NS_CAPS) {
             p.setCaps(CapsSpec::fromXml(i));
             if(!e.hasAttribute("type") && p.caps().isValid()) {
                 client()->capsManager()->updateCaps(j, p.caps());
             }
           }
-        else if(i.tagName() == "x" && i.attribute("xmlns") == "vcard-temp:x:update") {
+        else if(i.tagName() == "x" && i.namespaceURI() == "vcard-temp:x:update") {
             QDomElement t;
             t = i.firstChildElement("photo");
             if (!t.isNull())
                 p.setPhotoHash(tagContent(t).toLower()); // if hash is empty this may mean photo removal
             // else vcard.hasPhotoHash() returns false and that's mean user is not yet ready to advertise his image
         }
-        else if(i.tagName() == "x" && i.attribute("xmlns") == "http://jabber.org/protocol/muc#user") {
+        else if(i.tagName() == "x" && i.namespaceURI() == "http://jabber.org/protocol/muc#user") {
             for(QDomNode muc_n = i.firstChild(); !muc_n.isNull(); muc_n = muc_n.nextSibling()) {
                 QDomElement muc_e = muc_n.toElement();
                 if(muc_e.isNull())
@@ -792,7 +778,7 @@ bool JT_PushPresence::take(const QDomElement &e)
                     p.setMUCDestroy(MUCDestroy(muc_e));
             }
         }
-        else if (i.tagName() == "data" && i.attribute("xmlns") == "urn:xmpp:bob") {
+        else if (i.tagName() == "data" && i.namespaceURI() == "urn:xmpp:bob") {
             BoBData bd(i);
             client()->bobManager()->append(bd);
             p.addBoBData(bd);
@@ -872,7 +858,7 @@ void JT_Message::onGo()
 {
 
     Stanza s = m.toStanza(&(client()->stream()));
-    QDomElement e = oldStyleNS(s.element());
+    QDomElement e = s.element();//oldStyleNS(s.element());
 
     auto encryptionHandler = client()->encryptionHandler();
     bool wasEncrypted = encryptionHandler && encryptionHandler->encryptMessageElement(e);
@@ -928,12 +914,12 @@ bool JT_PushMessage::take(const QDomElement &e)
     for (int i = 0; i < list.size(); ++i) {
         QDomElement el = list.at(i).toElement();
 
-        if (el.attribute("xmlns") == QLatin1String("urn:xmpp:carbons:2")
+        if (el.namespaceURI() == QLatin1String("urn:xmpp:carbons:2")
             && (el.tagName() == QLatin1String("received") || el.tagName() == QLatin1String("sent"))
             && fromJid.compare(Jid(e1.attribute(QLatin1String("to"))), false)) {
             QDomElement el1 = el.firstChildElement();
             if (el1.tagName() == QLatin1String("forwarded")
-                && el1.attribute(QLatin1String("xmlns")) == QLatin1String("urn:xmpp:forward:0")) {
+                && el1.namespaceURI() == QLatin1String("urn:xmpp:forward:0")) {
                 QDomElement el2 = el1.firstChildElement(QLatin1String("message"));
                 if (!el2.isNull()) {
                     forward = el2;
@@ -943,7 +929,7 @@ bool JT_PushMessage::take(const QDomElement &e)
             }
         }
         else if (el.tagName() == QLatin1String("forwarded")
-             && el.attribute(QLatin1String("xmlns")) == QLatin1String("urn:xmpp:forward:0")) {
+             && el.namespaceURI() == QLatin1String("urn:xmpp:forward:0")) {
             forward = el.firstChildElement(QLatin1String("message")); // currently only messages are supportted
             // TODO <delay> element support
             if (!forward.isNull()) {
@@ -1003,8 +989,7 @@ void JT_VCard::get(const Jid &_jid)
     type = 0;
     d->jid = _jid;
     d->iq = createIQ(doc(), "get", type == 1 ? Jid().full() : d->jid.full(), id());
-    QDomElement v = doc()->createElement("vCard");
-    v.setAttribute("xmlns", "vcard-temp");
+    QDomElement v = doc()->createElementNS("vcard-temp", "vCard");
     d->iq.appendChild(v);
 }
 
@@ -1116,8 +1101,7 @@ void JT_Search::get(const Jid &jid)
     d->hasXData = false;
     d->xdata = XData();
     iq = createIQ(doc(), "get", d->jid.full(), id());
-    QDomElement query = doc()->createElement("query");
-    query.setAttribute("xmlns", "jabber:iq:search");
+    QDomElement query = doc()->createElementNS("jabber:iq:search", "query");
     iq.appendChild(query);
 }
 
@@ -1128,8 +1112,7 @@ void JT_Search::set(const Form &form)
     d->hasXData = false;
     d->xdata = XData();
     iq = createIQ(doc(), "set", d->jid.full(), id());
-    QDomElement query = doc()->createElement("query");
-    query.setAttribute("xmlns", "jabber:iq:search");
+    QDomElement query = doc()->createElementNS("jabber:iq:search", "query");
     iq.appendChild(query);
 
     // key?
@@ -1150,8 +1133,7 @@ void JT_Search::set(const Jid &jid, const XData &form)
     d->hasXData = false;
     d->xdata = XData();
     iq = createIQ(doc(), "set", d->jid.full(), id());
-    QDomElement query = doc()->createElement("query");
-    query.setAttribute("xmlns", "jabber:iq:search");
+    QDomElement query = doc()->createElementNS("jabber:iq:search", "query");
     iq.appendChild(query);
     query.appendChild(form.toXml(doc(), true));
 }
@@ -1202,7 +1184,7 @@ bool JT_Search::take(const QDomElement &x)
                     d->form.setInstructions(tagContent(i));
                 else if(i.tagName() == "key")
                     d->form.setKey(tagContent(i));
-                else if(i.tagName() == "x" && i.attribute("xmlns") == "jabber:x:data") {
+                else if(i.tagName() == "x" && i.namespaceURI() == "jabber:x:data") {
                     d->xdata.fromXml(i);
                     d->hasXData = true;
                 }
@@ -1244,7 +1226,7 @@ bool JT_Search::take(const QDomElement &x)
 
                     d->resultList += r;
                 }
-                else if(i.tagName() == "x" && i.attribute("xmlns") == "jabber:x:data") {
+                else if(i.tagName() == "x" && i.namespaceURI() == "jabber:x:data") {
                     d->xdata.fromXml(i);
                     d->hasXData = true;
                 }
@@ -1272,8 +1254,7 @@ void JT_ClientVersion::get(const Jid &jid)
 {
     j = jid;
     iq = createIQ(doc(), "get", j.full(), id());
-    QDomElement query = doc()->createElement("query");
-    query.setAttribute("xmlns", "jabber:iq:version");
+    QDomElement query = doc()->createElementNS("jabber:iq:version", "query");
     iq.appendChild(query);
 }
 
@@ -1352,8 +1333,7 @@ void JT_EntityTime::get(const Jid &jid)
 {
     j = jid;
     iq = createIQ(doc(), "get", jid.full(), id());
-    QDomElement time = doc()->createElement("time");
-    time.setAttribute("xmlns", "urn:xmpp:time");
+    QDomElement time = doc()->createElementNS("urn:xmpp:time", "time");
     iq.appendChild(time);
 }
 
@@ -1428,8 +1408,7 @@ bool JT_ServInfo::take(const QDomElement &e)
     QString ns = queryNS(e);
     if(ns == "jabber:iq:version") {
         QDomElement iq = createIQ(doc(), "result", e.attribute("from"), e.attribute("id"));
-        QDomElement query = doc()->createElement("query");
-        query.setAttribute("xmlns", "jabber:iq:version");
+        QDomElement query = doc()->createElementNS("jabber:iq:version", "query");
         iq.appendChild(query);
         query.appendChild(textTag(doc(), "name", client()->clientName()));
         query.appendChild(textTag(doc(), "version", client()->clientVersion()));
@@ -1464,8 +1443,7 @@ bool JT_ServInfo::take(const QDomElement &e)
             QDomElement error = doc()->createElement("error");
             error.setAttribute("type","cancel");
             error_reply.appendChild(error);
-            QDomElement error_type = doc()->createElement("item-not-found");
-            error_type.setAttribute("xmlns","urn:ietf:params:xml:ns:xmpp-stanzas");
+            QDomElement error_type = doc()->createElementNS("urn:ietf:params:xml:ns:xmpp-stanzas", "item-not-found");
             error.appendChild(error_type);
             send(error_reply);
         }
@@ -1475,11 +1453,10 @@ bool JT_ServInfo::take(const QDomElement &e)
         return false;
     }
 
-    ns = e.firstChildElement("time").attribute("xmlns");
+    ns = e.firstChildElement("time").namespaceURI();
     if (ns == "urn:xmpp:time") {
         QDomElement iq = createIQ(doc(), "result", e.attribute("from"), e.attribute("id"));
-        QDomElement time = doc()->createElement("time");
-        time.setAttribute("xmlns", ns);
+        QDomElement time = doc()->createElementNS(ns, "time");
         iq.appendChild(time);
 
         QDateTime local = QDateTime::currentDateTime();
@@ -1515,8 +1492,7 @@ void JT_Gateway::get(const Jid &jid)
     type = 0;
     v_jid = jid;
     iq = createIQ(doc(), "get", v_jid.full(), id());
-    QDomElement query = doc()->createElement("query");
-    query.setAttribute("xmlns", "jabber:iq:gateway");
+    QDomElement query = doc()->createElementNS("jabber:iq:gateway", "query");
     iq.appendChild(query);
 }
 
@@ -1526,8 +1502,7 @@ void JT_Gateway::set(const Jid &jid, const QString &prompt)
     v_jid = jid;
     v_prompt = prompt;
     iq = createIQ(doc(), "set", v_jid.full(), id());
-    QDomElement query = doc()->createElement("query");
-    query.setAttribute("xmlns", "jabber:iq:gateway");
+    QDomElement query = doc()->createElementNS("jabber:iq:gateway", "query");
     iq.appendChild(query);
     query.appendChild(textTag(doc(), "prompt", v_prompt));
 }
@@ -1635,8 +1610,7 @@ void JT_DiscoItems::get (const Jid &j, const QString &node)
 
     d->jid = j;
     d->iq = createIQ(doc(), "get", d->jid.full(), id());
-    QDomElement query = doc()->createElement("query");
-    query.setAttribute("xmlns", "http://jabber.org/protocol/disco#items");
+    QDomElement query = doc()->createElementNS("http://jabber.org/protocol/disco#items", "query");
 
     if ( !node.isEmpty() )
         query.setAttribute("node", node);
@@ -1736,8 +1710,7 @@ void JT_DiscoPublish::set(const Jid &j, const DiscoList &list)
     d->jid = j;
 
     d->iq = createIQ(doc(), "set", d->jid.full(), id());
-    QDomElement query = doc()->createElement("query");
-    query.setAttribute("xmlns", "http://jabber.org/protocol/disco#items");
+    QDomElement query = doc()->createElementNS("http://jabber.org/protocol/disco#items", "query");
 
     // FIXME: unsure about this
     //if ( !node.isEmpty() )
@@ -1796,7 +1769,7 @@ bool JT_BoBServer::take(const QDomElement &e)
         return false;
 
     QDomElement data = e.firstChildElement("data");
-    if (data.attribute("xmlns") == "urn:xmpp:bob") {
+    if (data.namespaceURI() == "urn:xmpp:bob") {
         QDomElement iq;
         BoBData bd = client()->bobManager()->bobData(data.attribute("cid"));
         if (bd.isNull()) {
@@ -1850,8 +1823,7 @@ void JT_BitsOfBinary::get(const Jid &j, const QString &cid)
     d->data = client()->bobManager()->bobData(cid);
     if (d->data.isNull()) {
         d->iq = createIQ(doc(), "get", d->jid.full(), id());
-        QDomElement data = doc()->createElement("data");
-        data.setAttribute("xmlns", "urn:xmpp:bob");
+        QDomElement data = doc()->createElementNS("urn:xmpp:bob", "data");
         data.setAttribute("cid", cid);
         d->iq.appendChild(data);
     }
@@ -1915,7 +1887,7 @@ bool JT_PongServer::take(const QDomElement &e)
         return false;
 
     QDomElement ping = e.firstChildElement("ping");
-    if (!e.isNull() && ping.attribute("xmlns") == "urn:xmpp:ping") {
+    if (!e.isNull() && ping.namespaceURI() == "urn:xmpp:ping") {
         QDomElement iq = createIQ(doc(), "result", e.attribute("from"), e.attribute("id"));
         send(iq);
         return true;
@@ -2075,8 +2047,7 @@ void JT_MessageCarbons::enable()
 {
     _iq = createIQ(doc(), "set", "", id());
 
-    QDomElement enable = doc()->createElement("enable");
-    enable.setAttribute("xmlns", "urn:xmpp:carbons:2");
+    QDomElement enable = doc()->createElementNS("urn:xmpp:carbons:2", "enable");
 
     _iq.appendChild(enable);
 }
@@ -2085,8 +2056,7 @@ void JT_MessageCarbons::disable()
 {
     _iq = createIQ(doc(), "set", "", id());
 
-    QDomElement disable = doc()->createElement("disable");
-    disable.setAttribute("xmlns", "urn:xmpp:carbons:2");
+    QDomElement disable = doc()->createElementNS("urn:xmpp:carbons:2", "disable");
 
     _iq.appendChild(disable);
 }
diff --git a/src/xmpp/xmpp-im/xmpp_vcard.cpp b/src/xmpp/xmpp-im/xmpp_vcard.cpp
index e1aaef7b..fa74112b 100644
--- a/src/xmpp/xmpp-im/xmpp_vcard.cpp
+++ b/src/xmpp/xmpp-im/xmpp_vcard.cpp
@@ -210,8 +210,7 @@ VCard::~VCard()
 
 QDomElement VCard::toXml(QDomDocument *doc) const
 {
-    QDomElement v = doc->createElement("vCard");
-    v.setAttribute("xmlns", "vcard-temp");
+    QDomElement v = doc->createElementNS("vcard-temp", "vCard");
 
     if ( !d->version.isEmpty() )
         v.appendChild( textTag(doc, "VERSION",    d->version) );
diff --git a/src/xmpp/xmpp-im/xmpp_xdata.cpp b/src/xmpp/xmpp-im/xmpp_xdata.cpp
index 128557cb..a481db8d 100644
--- a/src/xmpp/xmpp-im/xmpp_xdata.cpp
+++ b/src/xmpp/xmpp-im/xmpp_xdata.cpp
@@ -220,7 +220,7 @@ void XData::Field::fromXml(const QDomElement &e)
             _value.append(i.text());
         }
         else if (tag == "media" && (i.namespaceURI() == "urn:xmpp:media-element"
-                 || i.attribute("xmlns") == "urn:xmpp:media-element")) { // allow only one media element
+                 || i.namespaceURI() == "urn:xmpp:media-element")) { // allow only one media element
             QSize s;
             if (i.hasAttribute("width")) {
                 s.setWidth(i.attribute("width").toInt());
@@ -457,7 +457,7 @@ void XData::setFields(const FieldList &fl)
 
 void XData::fromXml(const QDomElement &e)
 {
-    if ( (e.attribute("xmlns") != "jabber:x:data") && (e.namespaceURI() != "jabber:x:data") )
+    if (e.namespaceURI() != "jabber:x:data")
         return;
 
     QString type = e.attribute("type");
@@ -526,7 +526,6 @@ void XData::fromXml(const QDomElement &e)
 QDomElement XData::toXml(QDomDocument *doc, bool submitForm) const
 {
     QDomElement x = doc->createElementNS("jabber:x:data", "x");
-    x.setAttribute("xmlns", "jabber:x:data");
 
     QString type = "form";
     if ( d->type == Data_Result )
diff --git a/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp b/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
index 8440ff13..fd0c8653 100644
--- a/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
+++ b/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
@@ -143,6 +143,15 @@ QDomElement textTag(QDomDocument *doc, const QString &name, const QString &conte
     return tag;
 }
 
+QDomElement textTagNS(QDomDocument *doc, const QString &ns, const QString &name, const QString &content)
+{
+    QDomElement tag = doc->createElementNS(ns, name);
+    QDomText text = doc->createTextNode(content);
+    tag.appendChild(text);
+
+    return tag;
+}
+
 QString tagContent(const QDomElement &e)
 {
     // look for some tag content
@@ -211,7 +220,7 @@ QDomElement queryTag(const QDomElement &e)
 
 QString queryNS(const QDomElement &e)
 {
-    return e.firstChildElement("query").attribute("xmlns");
+    return e.firstChildElement("query").namespaceURI();
 }
 
 /**
@@ -262,17 +271,18 @@ QDomElement addCorrectNS(const QDomElement &e)
 
     // find from this to parent closest node with xmlns/namespaceURI
     QDomNode n = e;
-    while(!n.isNull() && !n.toElement().hasAttribute("xmlns") && n.toElement().namespaceURI().isEmpty())
+    static QString xmlns = QStringLiteral("xmlns");
+    while(!n.isNull() && !n.toElement().hasAttribute(xmlns) && n.toElement().namespaceURI().isEmpty())
         n = n.parentNode();
     QString ns;
-    if(n.isNull() || !n.toElement().hasAttribute("xmlns")) { // if not found or it's namespaceURI
+    if(n.isNull() || !n.toElement().hasAttribute(xmlns)) { // if not found or it's namespaceURI
         if (n.toElement().namespaceURI().isEmpty()) { // if nothing found, then use default jabber:client namespace
             ns = "jabber:client";
         } else {
             ns = n.toElement().namespaceURI();
         }
     } else { // if found node with xmlns
-        ns = n.toElement().attribute("xmlns");
+        ns = n.toElement().attribute(xmlns);
     }
     // at this point `ns` is either detected namespace of `e` or jabber:client
     // make a new node
@@ -282,7 +292,7 @@ QDomElement addCorrectNS(const QDomElement &e)
     QDomNamedNodeMap al = e.attributes();
     for(x = 0; x < al.count(); ++x) {
         QDomAttr a = al.item(x).toAttr();
-        if(a.name() != "xmlns")
+        if(a.name() != xmlns)
             i.setAttributeNodeNS(a.cloneNode().toAttr());
     }
 
diff --git a/src/xmpp/xmpp-im/xmpp_xmlcommon.h b/src/xmpp/xmpp-im/xmpp_xmlcommon.h
index 42eba997..e3df0a06 100644
--- a/src/xmpp/xmpp-im/xmpp_xmlcommon.h
+++ b/src/xmpp/xmpp-im/xmpp_xmlcommon.h
@@ -62,6 +62,7 @@ QDateTime stamp2TS(const QString &ts);
 bool stamp2TS(const QString &ts, QDateTime *d);
 QString TS2stamp(const QDateTime &d);
 QDomElement textTag(QDomDocument *doc, const QString &name, const QString &content);
+QDomElement textTagNS(QDomDocument *doc, const QString &ns, const QString &name, const QString &content);
 QString tagContent(const QDomElement &e);
 XDomNodeList childElementsByTagNameNS(const QDomElement &e, const QString &nsURI, const QString &localName);
 QDomElement createIQ(QDomDocument *doc, const QString &type, const QString &to, const QString &id);

From 64367bbdb6d93d59a1b43a0501c5960b2bfee5cd Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sat, 29 Jun 2019 15:59:22 +0300
Subject: [PATCH 083/383] Added Jingle application termination reasons

---
 src/xmpp/xmpp-im/jingle-ft.cpp         | 52 +++++++++++++++++---------
 src/xmpp/xmpp-im/jingle-ft.h           |  1 +
 src/xmpp/xmpp-im/jingle.cpp            |  6 +++
 src/xmpp/xmpp-im/jingle.h              |  3 +-
 src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp |  8 ++--
 5 files changed, 48 insertions(+), 22 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index d9507c1e..1096da2a 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -476,24 +476,25 @@ QStringList Manager::availableTransports() const
 class Application::Private
 {
 public:
-    Application *q = nullptr;
-    State   state = State::Created;
-    State   transportReplaceState = State::Finished;
-    Action  updateToSend = Action::NoAction;
+    Application     *q = nullptr;
+    State           state = State::Created;
+    State           transportReplaceState = State::Finished;
+    Action          updateToSend = Action::NoAction;
     QSharedPointer<Pad> pad;
-    QString contentName;
-    File    file;
-    File    acceptFile; // as it comes with "accept" response
-    Origin  creator;
-    Origin  senders;
-    Origin  transportReplaceOrigin = Origin::None;
+    QString         contentName;
+    File            file;
+    File            acceptFile; // as it comes with "accept" response
+    Origin          creator;
+    Origin          senders;
+    Origin          transportReplaceOrigin = Origin::None;
     XMPP::Stanza::Error lastError;
+    Reason          terminationReason;
     QSharedPointer<Transport> transport;
     Connection::Ptr connection;
-    QStringList availableTransports;
-    bool closeDeviceOnFinish = true;
-    QIODevice *device = nullptr;
-    quint64 bytesLeft = 0;
+    QStringList     availableTransports;
+    bool            closeDeviceOnFinish = true;
+    QIODevice       *device = nullptr;
+    quint64         bytesLeft = 0;
 
     void setState(State s)
     {
@@ -511,13 +512,14 @@ class Application::Private
 
     void handleStreamFail()
     {
-        // TODO d->lastError = Condition::FailedApplication
+        terminationReason = Reason(Reason::Condition::FailedApplication, QString::fromLatin1("stream failed"));
         setState(State::Finished);
     }
 
     void writeNextBlockToTransport()
     {
         if (!bytesLeft) {
+            terminationReason = Reason(Reason::Condition::Success);
             setState(State::Finished);
             return; // everything is written
         }
@@ -564,6 +566,7 @@ class Application::Private
         }
         if (!bytesLeft) {
             // TODO send <received>
+            terminationReason = Reason(Reason::Condition::Success);
             setState(State::Finished);
         }
     }
@@ -605,6 +608,11 @@ Stanza::Error Application::lastError() const
     return d->lastError;
 }
 
+Reason Application::terminationReason() const
+{
+    return d->terminationReason;
+}
+
 QString Application::contentName() const
 {
     return d->contentName;
@@ -790,7 +798,10 @@ Action Application::evaluateOutgoingUpdate()
             return d->updateToSend;
         }
 
-        if (d->transport->hasUpdates())
+        if (d->terminationReason.isValid() && d->terminationReason.condition() != Reason::Condition::Success) {
+            d->updateToSend = Action::ContentRemove;
+        }
+        else if (d->transport->hasUpdates())
             d->updateToSend = Action::TransportInfo;
 
         break;
@@ -842,7 +853,9 @@ OutgoingUpdate Application::takeOutgoingUpdate()
     case Action::ContentReject:
     case Action::ContentRemove:
         if (d->transportReplaceOrigin != Origin::None)
-            updates << Reason(Reason::Condition::FailedTransport).toXml(doc);
+            d->terminationReason = Reason(Reason::Condition::FailedTransport);
+        if (d->terminationReason.isValid())
+            updates << d->terminationReason.toXml(doc);
         return OutgoingUpdate{updates, [this](){
                 d->setState(State::Finished);
             }
@@ -972,6 +985,11 @@ bool Application::isValid() const
 
 void Application::setDevice(QIODevice *dev, bool closeOnFinish)
 {
+    if (!dev) { // failed to provide proper device
+        d->terminationReason = Reason(Reason::Condition::FailedApplication, QString::fromLatin1("No destination device"));
+        emit updated();
+        return;
+    }
     d->device = dev;
     d->closeDeviceOnFinish = closeOnFinish;
     if (d->senders == d->pad->session()->role()) {
diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index 0619a594..c08dd682 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -137,6 +137,7 @@ class Application : public XMPP::Jingle::Application
     State state() const override;
     void setState(State state) override;
     XMPP::Stanza::Error lastError() const;
+    Reason terminationReason() const;
 
     QString contentName() const override;
     Origin creator() const override;
diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index cea49046..0b486959 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -282,6 +282,12 @@ Reason::Reason(const Reason &other) :
 
 }
 
+Reason &Reason::operator=(const Reason &other)
+{
+    d = other.d;
+    return *this;
+}
+
 Reason::Condition Reason::condition() const
 {
     if (d) return d->cond;
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index 907cc426..9a13b26f 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -187,7 +187,7 @@ class Reason {
     Reason(Condition cond, const QString &text = QString());
     Reason(const QDomElement &el);
     Reason(const Reason &other);
-    Reason& operator=(const Reason &)=default;
+    Reason& operator=(const Reason &);
     inline bool isValid() const { return d != nullptr; }
     Condition condition() const;
     void setCondition(Condition cond);
@@ -400,6 +400,7 @@ class Application : public QObject
     virtual State state() const = 0;
     virtual void setState(State state) = 0; // likely just remember the state and not generate any signals
     virtual XMPP::Stanza::Error lastError() const = 0;
+    virtual Reason terminationReason() const = 0;
 
     virtual Origin creator() const = 0;
     virtual Origin senders() const = 0;
diff --git a/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp b/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp
index de7ee799..a988230a 100644
--- a/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp
+++ b/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp
@@ -29,10 +29,10 @@ using namespace XMPP;
 class BoBData::Private : public QSharedData
 {
 public:
-    QByteArray data;
-    QString type;
-    QString cid;
-    unsigned int maxAge;
+    QByteArray data;  // file data itself
+    QString type;     // mime type. e.g. image/png
+    QString cid;      // content identifier without "cid:"
+    unsigned int maxAge; // seconds to live
 };
 
 BoBData::BoBData()

From 0b635ccd8d171da5859c1dfe5744cfbe5d814ded Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sat, 29 Jun 2019 21:10:07 +0300
Subject: [PATCH 084/383] fixed compilation warnings

---
 src/xmpp/xmpp-im/jingle-ft.h  | 6 +++---
 src/xmpp/xmpp-im/jingle-ibb.h | 2 +-
 src/xmpp/xmpp-im/jingle-s5b.h | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index c08dd682..f92dca04 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -136,13 +136,13 @@ class Application : public XMPP::Jingle::Application
     ApplicationManagerPad::Ptr pad() const override;
     State state() const override;
     void setState(State state) override;
-    XMPP::Stanza::Error lastError() const;
-    Reason terminationReason() const;
+    XMPP::Stanza::Error lastError() const override;
+    Reason terminationReason() const override;
 
     QString contentName() const override;
     Origin creator() const override;
     Origin senders() const override;
-    Origin transportReplaceOrigin() const;
+    Origin transportReplaceOrigin() const override;
     SetDescError setDescription(const QDomElement &description) override;
     void setFile(const File &file);
     File file() const;
diff --git a/src/xmpp/xmpp-im/jingle-ibb.h b/src/xmpp/xmpp-im/jingle-ibb.h
index 7b2011df..9768edb7 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.h
+++ b/src/xmpp/xmpp-im/jingle-ibb.h
@@ -50,7 +50,7 @@ class Transport : public XMPP::Jingle::Transport
     bool isValid() const override;
     Features features() const override;
 
-    Connection::Ptr connection() const;
+    Connection::Ptr connection() const override;
 
 private:
     friend class Manager;
diff --git a/src/xmpp/xmpp-im/jingle-s5b.h b/src/xmpp/xmpp-im/jingle-s5b.h
index 80bfa28c..cd277c0d 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.h
+++ b/src/xmpp/xmpp-im/jingle-s5b.h
@@ -149,7 +149,7 @@ class Transport : public XMPP::Jingle::Transport
 
     QString sid() const;
     QString directAddr() const;
-    Connection::Ptr connection() const;
+    Connection::Ptr connection() const override;
 
 private:
     friend class Manager;

From 7981a8417f43f8596eed317421f18dc5bc43a59c Mon Sep 17 00:00:00 2001
From: Vitaly Tonkacheyev <Vitozz@users.noreply.github.com>
Date: Tue, 2 Jul 2019 07:59:21 +0300
Subject: [PATCH 085/383] Modernize iris code (#61)

---
 src/irisnet/corelib/addressresolver.cpp     |  2 +-
 src/irisnet/corelib/addressresolver.h       |  2 +-
 src/irisnet/corelib/irisnetglobal.cpp       | 14 ++--
 src/irisnet/corelib/irisnetplugin.cpp       | 12 +--
 src/irisnet/corelib/irisnetplugin.h         | 10 +--
 src/irisnet/corelib/netavailability.h       |  2 +-
 src/irisnet/corelib/netinterface.cpp        | 14 ++--
 src/irisnet/corelib/netinterface.h          |  2 +-
 src/irisnet/corelib/netinterface_qtname.cpp |  2 +-
 src/irisnet/corelib/netinterface_unix.cpp   |  4 +-
 src/irisnet/corelib/netnames.cpp            | 24 +++---
 src/irisnet/corelib/netnames.h              |  8 +-
 src/irisnet/corelib/objectsession.cpp       |  6 +-
 src/irisnet/corelib/objectsession.h         |  2 +-
 src/irisnet/noncore/cutestuff/bsocket.cpp   |  4 +-
 src/irisnet/noncore/cutestuff/bsocket.h     |  2 +-
 src/irisnet/noncore/cutestuff/httpconnect.h |  2 +-
 src/irisnet/noncore/cutestuff/httppoll.cpp  |  6 +-
 src/irisnet/noncore/cutestuff/httppoll.h    |  6 +-
 src/irisnet/noncore/cutestuff/socks.cpp     |  2 +-
 src/irisnet/noncore/cutestuff/socks.h       |  6 +-
 src/irisnet/noncore/ice176.cpp              | 12 +--
 src/irisnet/noncore/ice176.h                |  2 +-
 src/irisnet/noncore/icecomponent.cpp        | 22 +++---
 src/irisnet/noncore/icecomponent.h          |  4 +-
 src/irisnet/noncore/icelocaltransport.cpp   | 40 +++++-----
 src/irisnet/noncore/icelocaltransport.h     |  2 +-
 src/irisnet/noncore/icetransport.h          |  2 +-
 src/irisnet/noncore/iceturntransport.h      |  2 +-
 src/irisnet/noncore/legacy/ndns.h           |  2 +-
 src/irisnet/noncore/legacy/srvresolver.h    |  2 +-
 src/irisnet/noncore/processquit.cpp         | 16 ++--
 src/irisnet/noncore/stunallocate.cpp        | 24 +++---
 src/irisnet/noncore/stunallocate.h          |  4 +-
 src/irisnet/noncore/stunbinding.cpp         |  8 +-
 src/irisnet/noncore/stunmessage.cpp         |  4 +-
 src/irisnet/noncore/stunmessage.h           |  2 +-
 src/irisnet/noncore/stuntransaction.cpp     |  4 +-
 src/irisnet/noncore/stuntransaction.h       |  6 +-
 src/irisnet/noncore/stuntypes.cpp           |  4 +-
 src/irisnet/noncore/tcpportreserver.cpp     |  2 +-
 src/irisnet/noncore/turnclient.cpp          | 26 +++----
 src/irisnet/noncore/turnclient.h            |  2 +-
 src/irisnet/noncore/udpportreserver.cpp     |  2 +-
 src/irisnet/noncore/udpportreserver.h       |  4 +-
 src/xmpp/jid/jid.cpp                        |  2 +-
 src/xmpp/xmpp-core/connector.cpp            |  6 +-
 src/xmpp/xmpp-core/parser.cpp               | 28 +++----
 src/xmpp/xmpp-core/protocol.cpp             |  4 +-
 src/xmpp/xmpp-core/securestream.cpp         |  2 +-
 src/xmpp/xmpp-core/simplesasl.cpp           |  2 +-
 src/xmpp/xmpp-core/sm.h                     |  2 +-
 src/xmpp/xmpp-core/stream.cpp               | 18 ++---
 src/xmpp/xmpp-core/xmpp.h                   |  6 +-
 src/xmpp/xmpp-core/xmpp_clientstream.h      |  4 +-
 src/xmpp/xmpp-core/xmpp_stanza.cpp          | 12 +--
 src/xmpp/xmpp-core/xmpp_stream.h            |  2 +-
 src/xmpp/xmpp-im/client.cpp                 |  4 +-
 src/xmpp/xmpp-im/filetransfer.cpp           | 16 ++--
 src/xmpp/xmpp-im/filetransfer.h             |  2 +-
 src/xmpp/xmpp-im/jingle.cpp                 |  8 +-
 src/xmpp/xmpp-im/jingle.h                   |  2 +-
 src/xmpp/xmpp-im/s5b.cpp                    | 86 ++++++++++-----------
 src/xmpp/xmpp-im/s5b.h                      |  4 +-
 src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp      |  2 +-
 src/xmpp/xmpp-im/xmpp_bytestream.h          |  2 +-
 src/xmpp/xmpp-im/xmpp_client.h              |  2 +-
 src/xmpp/xmpp-im/xmpp_features.cpp          |  2 +-
 src/xmpp/xmpp-im/xmpp_ibb.cpp               | 10 +--
 src/xmpp/xmpp-im/xmpp_tasks.cpp             |  6 +-
 src/xmpp/zlib/common.h                      |  8 +-
 71 files changed, 286 insertions(+), 286 deletions(-)

diff --git a/src/irisnet/corelib/addressresolver.cpp b/src/irisnet/corelib/addressresolver.cpp
index 33a54578..cc2e1b1c 100644
--- a/src/irisnet/corelib/addressresolver.cpp
+++ b/src/irisnet/corelib/addressresolver.cpp
@@ -66,7 +66,7 @@ class AddressResolver::Private : public QObject
     ~Private()
     {
         opTimer->disconnect(this);
-        opTimer->setParent(0);
+        opTimer->setParent(nullptr);
         opTimer->deleteLater();
     }
 
diff --git a/src/irisnet/corelib/addressresolver.h b/src/irisnet/corelib/addressresolver.h
index c4186b79..8d419820 100644
--- a/src/irisnet/corelib/addressresolver.h
+++ b/src/irisnet/corelib/addressresolver.h
@@ -35,7 +35,7 @@ class AddressResolver : public QObject
         ErrorGeneric
     };
 
-    AddressResolver(QObject *parent = 0);
+    AddressResolver(QObject *parent = nullptr);
     ~AddressResolver();
 
     void start(const QByteArray &hostName);
diff --git a/src/irisnet/corelib/irisnetglobal.cpp b/src/irisnet/corelib/irisnetglobal.cpp
index baee4c95..bc10deb8 100644
--- a/src/irisnet/corelib/irisnetglobal.cpp
+++ b/src/irisnet/corelib/irisnetglobal.cpp
@@ -57,14 +57,14 @@ class PluginInstance
         if(!loader->load())
         {
             delete loader;
-            return 0;
+            return nullptr;
         }
         QObject *obj = loader->instance();
         if(!obj)
         {
             loader->unload();
             delete loader;
-            return 0;
+            return nullptr;
         }
         PluginInstance *i = new PluginInstance;
         i->_loader = loader;
@@ -76,7 +76,7 @@ class PluginInstance
     static PluginInstance *fromStatic(QObject *obj)
     {
         PluginInstance *i = new PluginInstance;
-        i->_loader = 0;
+        i->_loader = nullptr;
         i->_instance = obj;
         i->_ownInstance = false;
         return i;
@@ -85,7 +85,7 @@ class PluginInstance
     static PluginInstance *fromInstance(QObject *obj)
     {
         PluginInstance *i = new PluginInstance;
-        i->_loader = 0;
+        i->_loader = nullptr;
         i->_instance = obj;
         i->_ownInstance = true;
         return i;
@@ -108,7 +108,7 @@ class PluginInstance
         if(_loader)
             _loader->moveToThread(0);
         if(_ownInstance)
-            _instance->moveToThread(0);
+            _instance->moveToThread(nullptr);
     }
 
     QObject *instance()
@@ -244,7 +244,7 @@ class IrisNetGlobal
 };
 
 Q_GLOBAL_STATIC(QMutex, global_mutex)
-static IrisNetGlobal *global = 0;
+static IrisNetGlobal *global = nullptr;
 
 static void deinit();
 
@@ -267,7 +267,7 @@ void deinit()
         (global->cleanupList.takeFirst())();
 
     delete global;
-    global = 0;
+    global = nullptr;
 }
 
 //----------------------------------------------------------------------------
diff --git a/src/irisnet/corelib/irisnetplugin.cpp b/src/irisnet/corelib/irisnetplugin.cpp
index fb7b8754..ead49f5e 100644
--- a/src/irisnet/corelib/irisnetplugin.cpp
+++ b/src/irisnet/corelib/irisnetplugin.cpp
@@ -25,32 +25,32 @@ namespace XMPP {
 //----------------------------------------------------------------------------
 NetInterfaceProvider *IrisNetProvider::createNetInterfaceProvider()
 {
-    return 0;
+    return nullptr;
 }
 
 NetGatewayProvider *IrisNetProvider::createNetGatewayProvider()
 {
-    return 0;
+    return nullptr;
 }
 
 NetAvailabilityProvider *IrisNetProvider::createNetAvailabilityProvider()
 {
-    return 0;
+    return nullptr;
 }
 
 NameProvider *IrisNetProvider::createNameProviderInternet()
 {
-    return 0;
+    return nullptr;
 }
 
 NameProvider *IrisNetProvider::createNameProviderLocal()
 {
-    return 0;
+    return nullptr;
 }
 
 ServiceProvider *IrisNetProvider::createServiceProvider()
 {
-    return 0;
+    return nullptr;
 }
 
 //----------------------------------------------------------------------------
diff --git a/src/irisnet/corelib/irisnetplugin.h b/src/irisnet/corelib/irisnetplugin.h
index 88fad7f1..97274c21 100644
--- a/src/irisnet/corelib/irisnetplugin.h
+++ b/src/irisnet/corelib/irisnetplugin.h
@@ -58,7 +58,7 @@ class IRISNET_EXPORT NetInterfaceProvider : public QObject
         QList<QHostAddress> addresses;
     };
 
-    NetInterfaceProvider(QObject *parent = 0) :
+    NetInterfaceProvider(QObject *parent = nullptr) :
         QObject(parent)
     {
     }
@@ -84,7 +84,7 @@ class IRISNET_EXPORT NetGatewayProvider : public QObject
         QHostAddress gateway;
     };
 
-    NetGatewayProvider(QObject *parent = 0) :
+    NetGatewayProvider(QObject *parent = nullptr) :
         QObject(parent)
     {
     }
@@ -103,7 +103,7 @@ class IRISNET_EXPORT NetAvailabilityProvider : public QObject
     Q_OBJECT
 
 public:
-    NetAvailabilityProvider(QObject *parent = 0) :
+    NetAvailabilityProvider(QObject *parent = nullptr) :
         QObject(parent)
     {
     }
@@ -122,7 +122,7 @@ class IRISNET_EXPORT NameProvider : public QObject
     Q_OBJECT
 
 public:
-    NameProvider(QObject *parent = 0) :
+    NameProvider(QObject *parent = nullptr) :
         QObject(parent)
     {
     }
@@ -160,7 +160,7 @@ class IRISNET_EXPORT ServiceProvider : public QObject
         QByteArray hostName; // optional
     };
 
-    ServiceProvider(QObject *parent = 0) :
+    ServiceProvider(QObject *parent = nullptr) :
         QObject(parent)
     {
     }
diff --git a/src/irisnet/corelib/netavailability.h b/src/irisnet/corelib/netavailability.h
index a53c45bf..ad4e2b6e 100644
--- a/src/irisnet/corelib/netavailability.h
+++ b/src/irisnet/corelib/netavailability.h
@@ -28,7 +28,7 @@ class NetAvailability : public QObject
     Q_OBJECT
 
 public:
-    NetAvailability(QObject *parent = 0);
+    NetAvailability(QObject *parent = nullptr);
     ~NetAvailability();
 
     bool isAvailable() const;
diff --git a/src/irisnet/corelib/netinterface.cpp b/src/irisnet/corelib/netinterface.cpp
index a4459c50..79dc04f2 100644
--- a/src/irisnet/corelib/netinterface.cpp
+++ b/src/irisnet/corelib/netinterface.cpp
@@ -42,7 +42,7 @@ class NetTracker : public QObject {
     NetTracker() {
         QList<IrisNetProvider*> list = irisNetProviders();
 
-        c = 0;
+        c = nullptr;
         foreach(IrisNetProvider* p, list) {
             c = p->createNetInterfaceProvider();
             if(c) break;
@@ -123,7 +123,7 @@ class NetTrackerThread : public QThread {
             exit(0);
             wait();
             delete this;
-            self = 0;
+            self = nullptr;
         }
     }
 
@@ -151,7 +151,7 @@ class NetTrackerThread : public QThread {
             startCond.wait(startMutex); // wait for thread startup finished
         }
         delete startMutex;
-        startMutex = 0;
+        startMutex = nullptr;
     }
 
     void run() {
@@ -165,7 +165,7 @@ class NetTrackerThread : public QThread {
         }
         exec();
         delete nettracker;
-        nettracker = 0;
+        nettracker = nullptr;
     }
 
 private:
@@ -177,7 +177,7 @@ class NetTrackerThread : public QThread {
     NetTracker *nettracker;
 };
 
-NetTrackerThread *NetTrackerThread::self = 0;
+NetTrackerThread *NetTrackerThread::self = nullptr;
 
 
 //----------------------------------------------------------------------------
@@ -277,7 +277,7 @@ class NetInterfaceManagerPrivate : public QObject
 
     ~NetInterfaceManagerPrivate() {
         tracker->releaseRef();
-        tracker = 0;
+        tracker = nullptr;
     }
 
     static int lookup(const QList<NetInterfaceProvider::Info> &list, const QString &id)
@@ -401,7 +401,7 @@ void *NetInterfaceManager::reg(const QString &id, NetInterface *i)
             return new NetInterfaceProvider::Info(d->info[n]);
         }
     }
-    return 0;
+    return nullptr;
 }
 
 void NetInterfaceManager::unreg(NetInterface *i)
diff --git a/src/irisnet/corelib/netinterface.h b/src/irisnet/corelib/netinterface.h
index a384c2dc..05fa8eb1 100644
--- a/src/irisnet/corelib/netinterface.h
+++ b/src/irisnet/corelib/netinterface.h
@@ -148,7 +148,7 @@ class IRISNET_EXPORT NetInterfaceManager : public QObject
     /**
        \brief Constructs a new manager object with the given \a parent
     */
-    NetInterfaceManager(QObject *parent = 0);
+    NetInterfaceManager(QObject *parent = nullptr);
 
     /**
        \brief Destroys the manager object
diff --git a/src/irisnet/corelib/netinterface_qtname.cpp b/src/irisnet/corelib/netinterface_qtname.cpp
index e9a57a99..f217aef8 100644
--- a/src/irisnet/corelib/netinterface_qtname.cpp
+++ b/src/irisnet/corelib/netinterface_qtname.cpp
@@ -37,7 +37,7 @@ class IrisQtName : public NameProvider
     QHash<int,int> hostInfo; // we need all these tricks with double mapping because we still support Qt 5.5.1. (5.12 is way better)
 
 public:
-    IrisQtName(QObject *parent = 0) :
+    IrisQtName(QObject *parent = nullptr) :
         NameProvider(parent),
         currentId(0)
     {
diff --git a/src/irisnet/corelib/netinterface_unix.cpp b/src/irisnet/corelib/netinterface_unix.cpp
index 3459d152..706d6d30 100644
--- a/src/irisnet/corelib/netinterface_unix.cpp
+++ b/src/irisnet/corelib/netinterface_unix.cpp
@@ -119,7 +119,7 @@ static QList<XMPP::NetGatewayProvider::Info> get_linux_gateways()
         if(addr.isNull())
             continue;
 
-        int iflags = parts[3].toInt(0, 16);
+        int iflags = parts[3].toInt(nullptr, 16);
         if(!(iflags & RTF_UP))
             continue;
 
@@ -144,7 +144,7 @@ static QList<XMPP::NetGatewayProvider::Info> get_linux_gateways()
         if(addr.isNull())
             continue;
 
-        int iflags = parts[8].toInt(0, 16);
+        int iflags = parts[8].toInt(nullptr, 16);
         if(!(iflags & RTF_UP))
             continue;
 
diff --git a/src/irisnet/corelib/netnames.cpp b/src/irisnet/corelib/netnames.cpp
index 3e1e5a8b..97fbd20f 100644
--- a/src/irisnet/corelib/netnames.cpp
+++ b/src/irisnet/corelib/netnames.cpp
@@ -444,7 +444,7 @@ QByteArray ServiceInstance::name() const
 class NameManager;
 
 Q_GLOBAL_STATIC(QMutex, nman_mutex)
-static NameManager *g_nman = 0;
+static NameManager *g_nman = nullptr;
 
 class NameResolver::Private
 {
@@ -706,10 +706,10 @@ class NameManager : public QObject
     QHash<int,ServiceResolver::Private*> sres_instances;
     QHash<int,ServiceLocalPublisher::Private*> slp_instances;
 
-    NameManager(QObject *parent = 0) : QObject(parent)
+    NameManager(QObject *parent = nullptr) : QObject(parent)
     {
-        p_net = 0;
-        p_local = 0;
+        p_net = nullptr;
+        p_local = nullptr;
         p_serv = 0;
     }
 
@@ -734,7 +734,7 @@ class NameManager : public QObject
     static void cleanup()
     {
         delete g_nman;
-        g_nman = 0;
+        g_nman = nullptr;
     }
 
     void resolve_start(NameResolver::Private *np, const QByteArray &name, int qType, bool longLived)
@@ -802,7 +802,7 @@ class NameManager : public QObject
         res_instances.remove(np->id);
         NameResolver *q = np->q;
         delete q->d;
-        q->d = 0;
+        q->d = nullptr;
     }
 
     void browse_start(ServiceBrowser::Private *np, const QString &type, const QString &domain)
@@ -811,7 +811,7 @@ class NameManager : public QObject
 
         if(!p_serv)
         {
-            ServiceProvider *c = 0;
+            ServiceProvider *c = nullptr;
             QList<IrisNetProvider*> list = irisNetProviders();
             for(int n = 0; n < list.count(); ++n)
             {
@@ -845,7 +845,7 @@ class NameManager : public QObject
 
         if(!p_serv)
         {
-            ServiceProvider *c = 0;
+            ServiceProvider *c = nullptr;
             QList<IrisNetProvider*> list = irisNetProviders();
             for(int n = 0; n < list.count(); ++n)
             {
@@ -875,7 +875,7 @@ class NameManager : public QObject
 
         if(!p_serv)
         {
-            ServiceProvider *c = 0;
+            ServiceProvider *c = nullptr;
             QList<IrisNetProvider*> list = irisNetProviders();
             for(int n = 0; n < list.count(); ++n)
             {
@@ -944,7 +944,7 @@ private slots:
         // transfer to local
         if(!p_local)
         {
-            NameProvider *c = 0;
+            NameProvider *c = nullptr;
             QList<IrisNetProvider*> list = irisNetProviders();
             for(int n = 0; n < list.count(); ++n)
             {
@@ -1064,7 +1064,7 @@ static int recordType2Rtype(NameRecord::Type type)
 NameResolver::NameResolver(QObject *parent)
 :QObject(parent)
 {
-    d = 0;
+    d = nullptr;
 }
 
 NameResolver::~NameResolver()
@@ -1088,7 +1088,7 @@ void NameResolver::stop()
     {
         NameManager::instance()->resolve_stop(d);
         delete d;
-        d = 0;
+        d = nullptr;
     }
 }
 
diff --git a/src/irisnet/corelib/netnames.h b/src/irisnet/corelib/netnames.h
index ee5ee350..76f8bffd 100644
--- a/src/irisnet/corelib/netnames.h
+++ b/src/irisnet/corelib/netnames.h
@@ -421,7 +421,7 @@ class IRISNET_EXPORT NameResolver : public QObject
     /**
        \brief Constructs a new resolver object with the given \a parent
     */
-    NameResolver(QObject *parent = 0);
+    NameResolver(QObject *parent = nullptr);
 
     /**
        \brief Destroys the resolver object
@@ -523,7 +523,7 @@ class IRISNET_EXPORT ServiceBrowser : public QObject
         ErrorNoWide
     };
 
-    ServiceBrowser(QObject *parent = 0);
+    ServiceBrowser(QObject *parent = nullptr);
     ~ServiceBrowser();
 
     void start(const QString &type, const QString &domain = "local");
@@ -589,7 +589,7 @@ class IRISNET_EXPORT ServiceResolver : public QObject
      * Create a new ServiceResolver.
      * This resolver can be used for multiple lookups in a row, but not concurrently!
      */
-    ServiceResolver(QObject *parent = 0);
+    ServiceResolver(QObject *parent = nullptr);
     ~ServiceResolver();
 
     Protocol protocol() const; //!< IP protocol to use, defaults to IPv6_IPv4
@@ -675,7 +675,7 @@ class IRISNET_EXPORT ServiceLocalPublisher : public QObject
         ErrorNoLocal   // unable to setup multicast dns
     };
 
-    ServiceLocalPublisher(QObject *parent = 0);
+    ServiceLocalPublisher(QObject *parent = nullptr);
     ~ServiceLocalPublisher();
 
     void publish(const QString &instance, const QString &type, int port, const QMap<QString,QByteArray> &attributes);
diff --git a/src/irisnet/corelib/objectsession.cpp b/src/irisnet/corelib/objectsession.cpp
index e3218e4e..ab8030d1 100644
--- a/src/irisnet/corelib/objectsession.cpp
+++ b/src/irisnet/corelib/objectsession.cpp
@@ -102,7 +102,7 @@ class ObjectSessionPrivate : public QObject
 
             for(int n = 0; n < 10; ++n)
             {
-                if(arg_name[n] == 0)
+                if(arg_name[n] == nullptr)
                     break;
 
                 Argument arg;
@@ -141,7 +141,7 @@ class ObjectSessionPrivate : public QObject
         invalidateWatchers();
 
         callTrigger->disconnect(this);
-        callTrigger->setParent(0);
+        callTrigger->setParent(nullptr);
         callTrigger->deleteLater();
         qDeleteAll(pendingCalls);
         pendingCalls.clear();
@@ -167,7 +167,7 @@ class ObjectSessionPrivate : public QObject
     void invalidateWatchers()
     {
         for(int n = 0; n < watchers.count(); ++n)
-            watchers[n]->sess = 0;
+            watchers[n]->sess = nullptr;
         watchers.clear();
     }
 
diff --git a/src/irisnet/corelib/objectsession.h b/src/irisnet/corelib/objectsession.h
index bcae574b..04a13b2e 100644
--- a/src/irisnet/corelib/objectsession.h
+++ b/src/irisnet/corelib/objectsession.h
@@ -31,7 +31,7 @@ class ObjectSession : public QObject
     Q_OBJECT
 
 public:
-    ObjectSession(QObject *parent = 0);
+    ObjectSession(QObject *parent = nullptr);
     ~ObjectSession();
 
     // clear all deferred requests, invalidate watchers
diff --git a/src/irisnet/noncore/cutestuff/bsocket.cpp b/src/irisnet/noncore/cutestuff/bsocket.cpp
index d3a366ce..12254aa6 100644
--- a/src/irisnet/noncore/cutestuff/bsocket.cpp
+++ b/src/irisnet/noncore/cutestuff/bsocket.cpp
@@ -41,7 +41,7 @@ class QTcpSocketSignalRelay : public QObject
 {
     Q_OBJECT
 public:
-    QTcpSocketSignalRelay(QTcpSocket *sock, QObject *parent = 0)
+    QTcpSocketSignalRelay(QTcpSocket *sock, QObject *parent = nullptr)
     :QObject(parent)
     {
         qRegisterMetaType<QAbstractSocket::SocketError>("QAbstractSocket::SocketError");
@@ -143,7 +143,7 @@ class HappyEyeballsConnector : public QObject
         sd.sock->setProxy(QNetworkProxy::NoProxy);
         sd.sock->setReadBufferSize(READBUFSIZE);
         sd.relay = new QTcpSocketSignalRelay(sd.sock, this);
-        sd.resolver = 0;
+        sd.resolver = nullptr;
         connect(sd.relay, SIGNAL(connected()), SLOT(qs_connected()));
         connect(sd.relay, SIGNAL(error(QAbstractSocket::SocketError)), SLOT(qs_error(QAbstractSocket::SocketError)));
         sockets.append(sd);
diff --git a/src/irisnet/noncore/cutestuff/bsocket.h b/src/irisnet/noncore/cutestuff/bsocket.h
index 1a5d08ad..21b41895 100644
--- a/src/irisnet/noncore/cutestuff/bsocket.h
+++ b/src/irisnet/noncore/cutestuff/bsocket.h
@@ -43,7 +43,7 @@ class BSocket : public ByteStream
 public:
     enum Error { ErrConnectionRefused = ErrCustom, ErrHostNotFound };
     enum State { Idle, HostLookup, Connecting, Connected, Closing };
-    BSocket(QObject *parent=0);
+    BSocket(QObject *parent=nullptr);
     ~BSocket();
 
     /*! Connect to an already resolved host */
diff --git a/src/irisnet/noncore/cutestuff/httpconnect.h b/src/irisnet/noncore/cutestuff/httpconnect.h
index e3285322..297a58c7 100644
--- a/src/irisnet/noncore/cutestuff/httpconnect.h
+++ b/src/irisnet/noncore/cutestuff/httpconnect.h
@@ -29,7 +29,7 @@ class HttpConnect : public ByteStream
     Q_OBJECT
 public:
     enum Error { ErrConnectionRefused = ErrCustom, ErrHostNotFound, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth };
-    HttpConnect(QObject *parent=0);
+    HttpConnect(QObject *parent=nullptr);
     ~HttpConnect();
 
     void setAuth(const QString &user, const QString &pass="");
diff --git a/src/irisnet/noncore/cutestuff/httppoll.cpp b/src/irisnet/noncore/cutestuff/httppoll.cpp
index 133f40d4..6d88a97d 100644
--- a/src/irisnet/noncore/cutestuff/httppoll.cpp
+++ b/src/irisnet/noncore/cutestuff/httppoll.cpp
@@ -443,7 +443,7 @@ class HttpProxyPost::Private
 public:
     Private(HttpProxyPost *_q) :
         sock(_q),
-        tls(0)
+        tls(nullptr)
     {
     }
 
@@ -774,7 +774,7 @@ HttpProxyGetStream::HttpProxyGetStream(QObject *parent)
 :QObject(parent)
 {
     d = new Private(this);
-    d->tls = 0;
+    d->tls = nullptr;
     connect(&d->sock, SIGNAL(connected()), SLOT(sock_connected()));
     connect(&d->sock, SIGNAL(connectionClosed()), SLOT(sock_connectionClosed()));
     connect(&d->sock, SIGNAL(readyRead()), SLOT(sock_readyRead()));
@@ -792,7 +792,7 @@ void HttpProxyGetStream::resetConnection(bool /*clear*/)
 {
     if(d->tls) {
         delete d->tls;
-        d->tls = 0;
+        d->tls = nullptr;
     }
     if(d->sock.state() != BSocket::Idle)
         d->sock.close();
diff --git a/src/irisnet/noncore/cutestuff/httppoll.h b/src/irisnet/noncore/cutestuff/httppoll.h
index 82bf1f06..53c45d1a 100644
--- a/src/irisnet/noncore/cutestuff/httppoll.h
+++ b/src/irisnet/noncore/cutestuff/httppoll.h
@@ -31,7 +31,7 @@ class HttpPoll : public ByteStream
     Q_OBJECT
 public:
     enum Error { ErrConnectionRefused = ErrCustom, ErrHostNotFound, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth };
-    HttpPoll(QObject *parent=0);
+    HttpPoll(QObject *parent=nullptr);
     ~HttpPoll();
 
     virtual QAbstractSocket* abstractSocket() const;
@@ -75,7 +75,7 @@ class HttpProxyPost : public QObject
     Q_OBJECT
 public:
     enum Error { ErrConnectionRefused, ErrHostNotFound, ErrSocket, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth };
-    HttpProxyPost(QObject *parent=0);
+    HttpProxyPost(QObject *parent=nullptr);
     ~HttpProxyPost();
 
     QAbstractSocket* abstractSocket() const;
@@ -114,7 +114,7 @@ class HttpProxyGetStream : public QObject
     Q_OBJECT
 public:
     enum Error { ErrConnectionRefused, ErrHostNotFound, ErrSocket, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth };
-    HttpProxyGetStream(QObject *parent=0);
+    HttpProxyGetStream(QObject *parent=nullptr);
     ~HttpProxyGetStream();
 
     void setAuth(const QString &user, const QString &pass="");
diff --git a/src/irisnet/noncore/cutestuff/socks.cpp b/src/irisnet/noncore/cutestuff/socks.cpp
index 2dbc8272..faef4509 100644
--- a/src/irisnet/noncore/cutestuff/socks.cpp
+++ b/src/irisnet/noncore/cutestuff/socks.cpp
@@ -1093,7 +1093,7 @@ QHostAddress SocksServer::address() const
 SocksClient *SocksServer::takeIncoming()
 {
     if(d->incomingConns.isEmpty())
-        return 0;
+        return nullptr;
 
     SocksClient *c = d->incomingConns.takeFirst();
 
diff --git a/src/irisnet/noncore/cutestuff/socks.h b/src/irisnet/noncore/cutestuff/socks.h
index eb3811db..d07d6c4a 100644
--- a/src/irisnet/noncore/cutestuff/socks.h
+++ b/src/irisnet/noncore/cutestuff/socks.h
@@ -60,8 +60,8 @@ class SocksClient : public ByteStream
     enum Error { ErrConnectionRefused = ErrCustom, ErrHostNotFound, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth };
     enum Method { AuthNone=0x0001, AuthUsername=0x0002 };
     enum Request { ReqConnect, ReqUDPAssociate };
-    SocksClient(QObject *parent=0);
-    SocksClient(QTcpSocket *, QObject *parent=0);
+    SocksClient(QObject *parent=nullptr);
+    SocksClient(QTcpSocket *, QObject *parent=nullptr);
     ~SocksClient();
 
     virtual QAbstractSocket* abstractSocket() const;
@@ -133,7 +133,7 @@ class SocksServer : public QObject
 {
     Q_OBJECT
 public:
-    SocksServer(QObject *parent=0);
+    SocksServer(QObject *parent=nullptr);
     ~SocksServer();
 
     void setServerSocket(QTcpServer *server);
diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index fb417602..a4cbe59f 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -158,8 +158,8 @@ class Ice176::Private : public QObject
         StunTransactionPool *pool;
 
         CandidatePair() :
-            binding(0),
-            pool(0)
+            binding(nullptr),
+            pool(nullptr)
         {
         }
     };
@@ -224,14 +224,14 @@ class Ice176::Private : public QObject
         QObject(_q),
         q(_q),
         state(Stopped),
-        portReserver(0),
+        portReserver(nullptr),
         componentCount(0),
         useLocal(true),
         useStunBind(true),
         useStunRelayUdp(true),
         useStunRelayTcp(true),
         useTrickle(false),
-        collectTimer(0)
+        collectTimer(nullptr)
     {
     }
 
@@ -792,7 +792,7 @@ private slots:
                 if(pool)
                 {
                     pool->disconnect(this);
-                    pool->setParent(0);
+                    pool->setParent(nullptr);
                     pool->deleteLater();
                 }
 
@@ -910,7 +910,7 @@ private slots:
     {
         collectTimer->disconnect(this);
         collectTimer->deleteLater();
-        collectTimer = 0;
+        collectTimer = nullptr;
 
         QList<Ice176::Candidate> list;
         foreach(const IceComponent::Candidate &cc, localCandidates)
diff --git a/src/irisnet/noncore/ice176.h b/src/irisnet/noncore/ice176.h
index ac120af8..159f908e 100644
--- a/src/irisnet/noncore/ice176.h
+++ b/src/irisnet/noncore/ice176.h
@@ -105,7 +105,7 @@ class Ice176 : public QObject
         }
     };
 
-    Ice176(QObject *parent = 0);
+    Ice176(QObject *parent = nullptr);
     ~Ice176();
 
     void reset();
diff --git a/src/irisnet/noncore/icecomponent.cpp b/src/irisnet/noncore/icecomponent.cpp
index b27c7006..cbd873d4 100644
--- a/src/irisnet/noncore/icecomponent.cpp
+++ b/src/irisnet/noncore/icecomponent.cpp
@@ -81,9 +81,9 @@ class IceComponent::Private : public QObject
         bool ext_finished;
 
         LocalTransport() :
-            qsock(0),
+            qsock(nullptr),
             borrowedSocket(false),
-            sock(0),
+            sock(nullptr),
             network(-1),
             isVpn(false),
             started(false),
@@ -120,9 +120,9 @@ class IceComponent::Private : public QObject
         QObject(_q),
         q(_q),
         sess(this),
-        portReserver(0),
+        portReserver(nullptr),
         stopping(false),
-        tt(0),
+        tt(nullptr),
         useLocal(true),
         useStunBind(true),
         useStunRelayUdp(true),
@@ -180,7 +180,7 @@ class IceComponent::Private : public QObject
                     continue;
                 }
 
-                QUdpSocket *qsock = 0;
+                QUdpSocket *qsock = nullptr;
                 if(socketList)
                     qsock = takeFromSocketList(socketList, la.addr, this);
 
@@ -444,7 +444,7 @@ class IceComponent::Private : public QObject
         return calc_priority(typePref, localPref, componentId);
     }
 
-    static QUdpSocket *takeFromSocketList(QList<QUdpSocket*> *socketList, const QHostAddress &addr, QObject *parent = 0)
+    static QUdpSocket *takeFromSocketList(QList<QUdpSocket*> *socketList, const QHostAddress &addr, QObject *parent = nullptr)
     {
         for(int n = 0; n < socketList->count(); ++n)
         {
@@ -456,7 +456,7 @@ class IceComponent::Private : public QObject
             }
         }
 
-        return 0;
+        return nullptr;
     }
 
     int getId() const
@@ -727,7 +727,7 @@ private slots:
             return;
 
         delete lt->sock;
-        lt->sock = 0;
+        lt->sock = nullptr;
 
         if(isLocalLeap)
         {
@@ -857,7 +857,7 @@ private slots:
             return;
 
         delete lt->sock;
-        lt->sock = 0;
+        lt->sock = nullptr;
 
         if(isLocalLeap)
         {
@@ -915,7 +915,7 @@ private slots:
             return;
 
         delete tt;
-        tt = 0;
+        tt = nullptr;
 
         tryStopped();
     }
@@ -931,7 +931,7 @@ private slots:
             return;
 
         delete tt;
-        tt = 0;
+        tt = nullptr;
     }
 
     void tt_debugLine(const QString &line)
diff --git a/src/irisnet/noncore/icecomponent.h b/src/irisnet/noncore/icecomponent.h
index 94320ce1..215cc478 100644
--- a/src/irisnet/noncore/icecomponent.h
+++ b/src/irisnet/noncore/icecomponent.h
@@ -113,7 +113,7 @@ class IceComponent : public QObject
         DL_Packet
     };
 
-    IceComponent(int id, QObject *parent = 0);
+    IceComponent(int id, QObject *parent = nullptr);
     ~IceComponent();
 
     int id() const;
@@ -143,7 +143,7 @@ class IceComponent : public QObject
     void setUseStunRelayTcp(bool enabled);
 
     // if socketList is not null then port reserver must be set
-    void update(QList<QUdpSocket*> *socketList = 0);
+    void update(QList<QUdpSocket*> *socketList = nullptr);
     void stop();
 
     // prflx priority to use when replying from this transport/path
diff --git a/src/irisnet/noncore/icelocaltransport.cpp b/src/irisnet/noncore/icelocaltransport.cpp
index f9229f4e..28ff5e3f 100644
--- a/src/irisnet/noncore/icelocaltransport.cpp
+++ b/src/irisnet/noncore/icelocaltransport.cpp
@@ -53,7 +53,7 @@ class SafeUdpSocket : public QObject
     int writtenCount;
 
 public:
-    SafeUdpSocket(QUdpSocket *_sock, QObject *parent = 0) :
+    SafeUdpSocket(QUdpSocket *_sock, QObject *parent = nullptr) :
         QObject(parent),
         sess(this),
         sock(_sock)
@@ -77,9 +77,9 @@ class SafeUdpSocket : public QObject
     QUdpSocket *release()
     {
         sock->disconnect(this);
-        sock->setParent(0);
+        sock->setParent(nullptr);
         QUdpSocket *out = sock;
-        sock = 0;
+        sock = nullptr;
         return out;
     }
 
@@ -98,7 +98,7 @@ class SafeUdpSocket : public QObject
         return sock->hasPendingDatagrams();
     }
 
-    QByteArray readDatagram(QHostAddress *address = 0, quint16 *port = 0)
+    QByteArray readDatagram(QHostAddress *address = nullptr, quint16 *port = nullptr)
     {
         if(!sock->hasPendingDatagrams())
             return QByteArray();
@@ -212,11 +212,11 @@ class IceLocalTransport::Private : public QObject
         QObject(_q),
         q(_q),
         sess(this),
-        extSock(0),
-        sock(0),
-        pool(0),
-        stunBinding(0),
-        turn(0),
+        extSock(nullptr),
+        sock(nullptr),
+        pool(nullptr),
+        stunBinding(nullptr),
+        turn(nullptr),
         turnActivated(false),
         port(-1),
         refPort(-1),
@@ -237,10 +237,10 @@ class IceLocalTransport::Private : public QObject
         sess.reset();
 
         delete stunBinding;
-        stunBinding = 0;
+        stunBinding = nullptr;
 
         delete turn;
-        turn = 0;
+        turn = nullptr;
         turnActivated = false;
 
         if(sock)
@@ -248,11 +248,11 @@ class IceLocalTransport::Private : public QObject
             if(extSock)
             {
                 sock->release();
-                extSock = 0;
+                extSock = nullptr;
             }
 
             delete sock;
-            sock = 0;
+            sock = nullptr;
         }
 
         addr = QHostAddress();
@@ -350,7 +350,7 @@ class IceLocalTransport::Private : public QObject
         {
             delete qsock;
             emit q->error(IceLocalTransport::ErrorBind);
-            return 0;
+            return nullptr;
         }
 
         return qsock;
@@ -379,7 +379,7 @@ class IceLocalTransport::Private : public QObject
                 emit q->debugLine("retrying...");
 
             delete sock;
-            sock = 0;
+            sock = nullptr;
 
             // to receive this error, it is a Relay, so change
             //   the mode
@@ -619,7 +619,7 @@ private slots:
         refPort = stunBinding->reflexivePort();
 
         delete stunBinding;
-        stunBinding = 0;
+        stunBinding = nullptr;
 
         emit q->addressesChanged();
     }
@@ -629,7 +629,7 @@ private slots:
         Q_UNUSED(e);
 
         delete stunBinding;
-        stunBinding = 0;
+        stunBinding = nullptr;
 
         // don't report any error
         //if(stunType == IceLocalTransport::Basic || (stunType == IceLocalTransport::Auto && !turn))
@@ -654,7 +654,7 @@ private slots:
             emit q->debugLine("turn_closed");
 
         delete turn;
-        turn = 0;
+        turn = nullptr;
         turnActivated = false;
 
         postStop();
@@ -696,7 +696,7 @@ private slots:
             emit q->debugLine(QString("turn_error: ") + turn->errorString());
 
         delete turn;
-        turn = 0;
+        turn = nullptr;
         bool wasActivated = turnActivated;
         turnActivated = false;
 
@@ -833,7 +833,7 @@ bool IceLocalTransport::hasPendingDatagrams(int path) const
 
 QByteArray IceLocalTransport::readDatagram(int path, QHostAddress *addr, int *port)
 {
-    QList<Private::Datagram> *in = 0;
+    QList<Private::Datagram> *in = nullptr;
     if(path == Direct)
         in = &d->in;
     else if(path == Relayed)
diff --git a/src/irisnet/noncore/icelocaltransport.h b/src/irisnet/noncore/icelocaltransport.h
index e413c095..0e571bf9 100644
--- a/src/irisnet/noncore/icelocaltransport.h
+++ b/src/irisnet/noncore/icelocaltransport.h
@@ -46,7 +46,7 @@ class IceLocalTransport : public IceTransport
         ErrorBind = ErrorCustom
     };
 
-    IceLocalTransport(QObject *parent = 0);
+    IceLocalTransport(QObject *parent = nullptr);
     ~IceLocalTransport();
 
     void setClientSoftwareNameAndVersion(const QString &str);
diff --git a/src/irisnet/noncore/icetransport.h b/src/irisnet/noncore/icetransport.h
index 82776069..be673e95 100644
--- a/src/irisnet/noncore/icetransport.h
+++ b/src/irisnet/noncore/icetransport.h
@@ -44,7 +44,7 @@ class IceTransport : public QObject
         DL_Packet
     };
 
-    IceTransport(QObject *parent = 0);
+    IceTransport(QObject *parent = nullptr);
     ~IceTransport();
 
     virtual void stop() = 0;
diff --git a/src/irisnet/noncore/iceturntransport.h b/src/irisnet/noncore/iceturntransport.h
index 46677a08..32f344d8 100644
--- a/src/irisnet/noncore/iceturntransport.h
+++ b/src/irisnet/noncore/iceturntransport.h
@@ -39,7 +39,7 @@ class IceTurnTransport : public IceTransport
         ErrorTurn = ErrorCustom
     };
 
-    IceTurnTransport(QObject *parent = 0);
+    IceTurnTransport(QObject *parent = nullptr);
     ~IceTurnTransport();
 
     void setClientSoftwareNameAndVersion(const QString &str);
diff --git a/src/irisnet/noncore/legacy/ndns.h b/src/irisnet/noncore/legacy/ndns.h
index 8b74b8eb..46561faa 100644
--- a/src/irisnet/noncore/legacy/ndns.h
+++ b/src/irisnet/noncore/legacy/ndns.h
@@ -30,7 +30,7 @@ class NDns : public QObject
 {
     Q_OBJECT
 public:
-    NDns(QObject *parent=0);
+    NDns(QObject *parent=nullptr);
     ~NDns();
 
     void resolve(const QString &);
diff --git a/src/irisnet/noncore/legacy/srvresolver.h b/src/irisnet/noncore/legacy/srvresolver.h
index 07dca3df..f350677b 100644
--- a/src/irisnet/noncore/legacy/srvresolver.h
+++ b/src/irisnet/noncore/legacy/srvresolver.h
@@ -46,7 +46,7 @@ class SrvResolver : public QObject
 {
     Q_OBJECT
 public:
-    SrvResolver(QObject *parent=0);
+    SrvResolver(QObject *parent=nullptr);
     ~SrvResolver();
 
     void resolve(const QString &server, const QString &type, const QString &proto);
diff --git a/src/irisnet/noncore/processquit.cpp b/src/irisnet/noncore/processquit.cpp
index cc6935c8..8560b503 100644
--- a/src/irisnet/noncore/processquit.cpp
+++ b/src/irisnet/noncore/processquit.cpp
@@ -42,7 +42,7 @@ namespace {
 void releaseAndDeleteLater(QObject *owner, QObject *obj)
 {
     obj->disconnect(owner);
-    obj->setParent(0);
+    obj->setParent(nullptr);
     obj->deleteLater();
 }
 
@@ -51,7 +51,7 @@ class SafeSocketNotifier : public QObject
     Q_OBJECT
 public:
     SafeSocketNotifier(int socket, QSocketNotifier::Type type,
-        QObject *parent = 0) :
+        QObject *parent = nullptr) :
         QObject(parent)
     {
         sn = new QSocketNotifier(socket, type, this);
@@ -85,7 +85,7 @@ namespace XMPP {
 #endif
 
 Q_GLOBAL_STATIC(QMutex, pq_mutex)
-static ProcessQuit *g_pq = 0;
+static ProcessQuit *g_pq = nullptr;
 
 inline bool is_gui_app()
 {
@@ -174,7 +174,7 @@ class ProcessQuit::Private : public QObject
     void unixWatchAdd(int sig)
     {
         struct sigaction sa;
-        sigaction(sig, NULL, &sa);
+        sigaction(sig, nullptr, &sa);
         // if the signal is ignored, don't take it over.  this is
         //   recommended by the glibc manual
         if(sa.sa_handler == SIG_IGN)
@@ -182,13 +182,13 @@ class ProcessQuit::Private : public QObject
         sigemptyset(&(sa.sa_mask));
         sa.sa_flags = 0;
         sa.sa_handler = unixHandler;
-        sigaction(sig, &sa, 0);
+        sigaction(sig, &sa, nullptr);
     }
 
     void unixWatchRemove(int sig)
     {
         struct sigaction sa;
-        sigaction(sig, NULL, &sa);
+        sigaction(sig, nullptr, &sa);
         // ignored means we skipped it earlier, so we should
         //   skip it again
         if(sa.sa_handler == SIG_IGN)
@@ -196,7 +196,7 @@ class ProcessQuit::Private : public QObject
         sigemptyset(&(sa.sa_mask));
         sa.sa_flags = 0;
         sa.sa_handler = SIG_DFL;
-        sigaction(sig, &sa, 0);
+        sigaction(sig, &sa, nullptr);
     }
 #endif
 
@@ -269,7 +269,7 @@ void ProcessQuit::reset()
 void ProcessQuit::cleanup()
 {
     delete g_pq;
-    g_pq = 0;
+    g_pq = nullptr;
 }
 
 #ifndef NO_IRISNET
diff --git a/src/irisnet/noncore/stunallocate.cpp b/src/irisnet/noncore/stunallocate.cpp
index ef027a0f..91ff75c4 100644
--- a/src/irisnet/noncore/stunallocate.cpp
+++ b/src/irisnet/noncore/stunallocate.cpp
@@ -39,7 +39,7 @@ namespace XMPP {
 void releaseAndDeleteLater(QObject *owner, QObject *obj)
 {
     obj->disconnect(owner);
-    obj->setParent(0);
+    obj->setParent(nullptr);
     obj->deleteLater();
 }
 
@@ -96,7 +96,7 @@ class StunAllocatePermission : public QObject
     StunAllocatePermission(StunTransactionPool *_pool, const QHostAddress &_addr) :
         QObject(_pool),
         pool(_pool),
-        trans(0),
+        trans(nullptr),
         addr(_addr),
         active(false)
     {
@@ -149,7 +149,7 @@ class StunAllocatePermission : public QObject
     void cleanup()
     {
         delete trans;
-        trans = 0;
+        trans = nullptr;
 
         timer->stop();
 
@@ -200,7 +200,7 @@ private slots:
     void trans_finished(const XMPP::StunMessage &response)
     {
         delete trans;
-        trans = 0;
+        trans = nullptr;
 
         bool err = false;
         int code;
@@ -284,7 +284,7 @@ class StunAllocateChannel : public QObject
     StunAllocateChannel(StunTransactionPool *_pool, int _channelId, const QHostAddress &_addr, int _port) :
         QObject(_pool),
         pool(_pool),
-        trans(0),
+        trans(nullptr),
         channelId(_channelId),
         addr(_addr),
         port(_port),
@@ -339,7 +339,7 @@ class StunAllocateChannel : public QObject
     void cleanup()
     {
         delete trans;
-        trans = 0;
+        trans = nullptr;
 
         timer->stop();
 
@@ -394,7 +394,7 @@ private slots:
     void trans_finished(const XMPP::StunMessage &response)
     {
         delete trans;
-        trans = 0;
+        trans = nullptr;
 
         bool err = false;
         int code;
@@ -498,8 +498,8 @@ class StunAllocate::Private : public QObject
         QObject(_q),
         q(_q),
         sess(this),
-        pool(0),
-        trans(0),
+        pool(nullptr),
+        trans(nullptr),
         state(Stopped),
         dfState(DF_Unknown),
         erroringCode(-1)
@@ -797,7 +797,7 @@ class StunAllocate::Private : public QObject
     void cleanupTasks()
     {
         delete trans;
-        trans = 0;
+        trans = nullptr;
 
         allocateRefreshTimer->stop();
 
@@ -956,7 +956,7 @@ private slots:
     void trans_finished(const XMPP::StunMessage &response)
     {
         delete trans;
-        trans = 0;
+        trans = nullptr;
 
         bool error = false;
         int code;
@@ -1206,7 +1206,7 @@ private slots:
     void trans_error(XMPP::StunTransaction::Error e)
     {
         delete trans;
-        trans = 0;
+        trans = nullptr;
 
         cleanup();
 
diff --git a/src/irisnet/noncore/stunallocate.h b/src/irisnet/noncore/stunallocate.h
index 9653184b..2c18011d 100644
--- a/src/irisnet/noncore/stunallocate.h
+++ b/src/irisnet/noncore/stunallocate.h
@@ -98,8 +98,8 @@ class StunAllocate : public QObject
     int packetHeaderOverhead(const QHostAddress &addr, int port) const;
 
     QByteArray encode(const QByteArray &datagram, const QHostAddress &addr, int port);
-    QByteArray decode(const QByteArray &encoded, QHostAddress *addr = 0, int *port = 0);
-    QByteArray decode(const StunMessage &encoded, QHostAddress *addr = 0, int *port = 0);
+    QByteArray decode(const QByteArray &encoded, QHostAddress *addr = nullptr, int *port = nullptr);
+    QByteArray decode(const StunMessage &encoded, QHostAddress *addr = nullptr, int *port = nullptr);
 
     QString errorString() const;
 
diff --git a/src/irisnet/noncore/stunbinding.cpp b/src/irisnet/noncore/stunbinding.cpp
index dd1fcc8f..897e1e1d 100644
--- a/src/irisnet/noncore/stunbinding.cpp
+++ b/src/irisnet/noncore/stunbinding.cpp
@@ -48,8 +48,8 @@ class StunBinding::Private : public QObject
     Private(StunBinding *_q) :
         QObject(_q),
         q(_q),
-        pool(0),
-        trans(0),
+        pool(nullptr),
+        trans(nullptr),
         use_extPriority(false),
         use_extIceControlling(false),
         use_extIceControlled(false),
@@ -134,7 +134,7 @@ private slots:
     void trans_finished(const XMPP::StunMessage &response)
     {
         delete trans;
-        trans = 0;
+        trans = nullptr;
 
         bool error = false;
         int code;
@@ -203,7 +203,7 @@ private slots:
     void trans_error(XMPP::StunTransaction::Error e)
     {
         delete trans;
-        trans = 0;
+        trans = nullptr;
 
         if(e == StunTransaction::ErrorTimeout)
         {
diff --git a/src/irisnet/noncore/stunmessage.cpp b/src/irisnet/noncore/stunmessage.cpp
index c60f1ffc..a6a5feec 100644
--- a/src/irisnet/noncore/stunmessage.cpp
+++ b/src/irisnet/noncore/stunmessage.cpp
@@ -228,7 +228,7 @@ static int get_attribute_props(const QByteArray &buf, int offset, quint16 *type,
 // len    = take attribute value length (value is at offset + 4)
 // next   = take offset of next attribute
 // returns offset of found attribute, -1 if not found
-static int find_attribute(const QByteArray &buf, quint16 type, int *len, int *next = 0)
+static int find_attribute(const QByteArray &buf, quint16 type, int *len, int *next = nullptr)
 {
     int at = ATTRIBUTE_AREA_START;
     quint16 _type;
@@ -386,7 +386,7 @@ class StunMessage::Private : public QSharedData
 };
 
 StunMessage::StunMessage() :
-    d(0)
+    d(nullptr)
 {
 }
 
diff --git a/src/irisnet/noncore/stunmessage.h b/src/irisnet/noncore/stunmessage.h
index 5c2369bd..dbc15fa4 100644
--- a/src/irisnet/noncore/stunmessage.h
+++ b/src/irisnet/noncore/stunmessage.h
@@ -82,7 +82,7 @@ class StunMessage
     void setAttributes(const QList<Attribute> &attribs);
 
     QByteArray toBinary(int validationFlags = 0, const QByteArray &key = QByteArray()) const;
-    static StunMessage fromBinary(const QByteArray &a, ConvertResult *result = 0, int validationFlags = 0, const QByteArray &key = QByteArray());
+    static StunMessage fromBinary(const QByteArray &a, ConvertResult *result = nullptr, int validationFlags = 0, const QByteArray &key = QByteArray());
 
     // minimal 3-field check
     static bool isProbablyStun(const QByteArray &a);
diff --git a/src/irisnet/noncore/stuntransaction.cpp b/src/irisnet/noncore/stuntransaction.cpp
index 3927cf9e..3132fccf 100644
--- a/src/irisnet/noncore/stuntransaction.cpp
+++ b/src/irisnet/noncore/stuntransaction.cpp
@@ -156,7 +156,7 @@ class StunTransactionPrivate : public QObject
     StunTransactionPrivate(StunTransaction *_q) :
         QObject(_q),
         q(_q),
-        pool(0),
+        pool(nullptr),
         fpRequired(false)
     {
         qRegisterMetaType<StunTransaction::Error>();
@@ -180,7 +180,7 @@ class StunTransactionPrivate : public QObject
             pool->d->remove(q);
 
         t->disconnect(this);
-        t->setParent(0);
+        t->setParent(nullptr);
         t->deleteLater();
     }
 
diff --git a/src/irisnet/noncore/stuntransaction.h b/src/irisnet/noncore/stuntransaction.h
index badcd512..e07dd45c 100644
--- a/src/irisnet/noncore/stuntransaction.h
+++ b/src/irisnet/noncore/stuntransaction.h
@@ -76,7 +76,7 @@ class StunTransaction : public QObject
         ErrorTimeout
     };
 
-    StunTransaction(QObject *parent = 0);
+    StunTransaction(QObject *parent = nullptr);
     ~StunTransaction();
 
     // toAddress/toPort are optional, to associate this request to a
@@ -140,7 +140,7 @@ class StunTransactionPool : public QObject
         DL_Packet
     };
 
-    StunTransactionPool(StunTransaction::Mode mode, QObject *parent = 0);
+    StunTransactionPool(StunTransaction::Mode mode, QObject *parent = nullptr);
     ~StunTransactionPool();
 
     StunTransaction::Mode mode() const;
@@ -157,7 +157,7 @@ class StunTransactionPool : public QObject
     //   not be a STUN message.  *notStun will be set to true if the packet
     //   is surely not STUN, or set to false if it is unclear whether the
     //   packet is STUN or not.
-    bool writeIncomingMessage(const QByteArray &packet, bool *notStun = 0, const QHostAddress &addr = QHostAddress(), int port = -1);
+    bool writeIncomingMessage(const QByteArray &packet, bool *notStun = nullptr, const QHostAddress &addr = QHostAddress(), int port = -1);
 
     void setLongTermAuthEnabled(bool enabled);
 
diff --git a/src/irisnet/noncore/stuntypes.cpp b/src/irisnet/noncore/stuntypes.cpp
index 0e730d4c..48487f1c 100644
--- a/src/irisnet/noncore/stuntypes.cpp
+++ b/src/irisnet/noncore/stuntypes.cpp
@@ -430,7 +430,7 @@ struct MethodEntry
     METHOD_ENTRY(Data),
     METHOD_ENTRY(CreatePermission),
     METHOD_ENTRY(ChannelBind),
-    { (Method)-1, 0 }
+    { (Method)-1, nullptr }
 };
 
 QString methodToString(int method)
@@ -477,7 +477,7 @@ struct AttribEntry
     ATTRIB_ENTRY(FINGERPRINT),
     ATTRIB_ENTRY(ICE_CONTROLLED),
     ATTRIB_ENTRY(ICE_CONTROLLING),
-    { (Attribute)-1, 0 }
+    { (Attribute)-1, nullptr }
 };
 
 QString attributeTypeToString(int type)
diff --git a/src/irisnet/noncore/tcpportreserver.cpp b/src/irisnet/noncore/tcpportreserver.cpp
index e1ad089c..e69a9b18 100644
--- a/src/irisnet/noncore/tcpportreserver.cpp
+++ b/src/irisnet/noncore/tcpportreserver.cpp
@@ -54,7 +54,7 @@ bool TcpPortDiscoverer::setExternalHost(const QString &extHost, quint16 extPort,
 
 TcpPortServer::PortTypes TcpPortDiscoverer::inProgressPortTypes() const
 {
-    return 0; // same as for stop()
+    return nullptr; // same as for stop()
 }
 
 bool TcpPortDiscoverer::isDepleted() const
diff --git a/src/irisnet/noncore/turnclient.cpp b/src/irisnet/noncore/turnclient.cpp
index 61bf9769..31221eb7 100644
--- a/src/irisnet/noncore/turnclient.cpp
+++ b/src/irisnet/noncore/turnclient.cpp
@@ -187,11 +187,11 @@ class TurnClient::Private : public QObject
         QObject(_q),
         q(_q),
         sess(this),
-        bs(0),
+        bs(nullptr),
         tls(0),
         udp(false),
-        pool(0),
-        allocate(0),
+        pool(nullptr),
+        allocate(nullptr),
         retryCount(0),
         debugLevel(TurnClient::DL_None),
         writtenBytes(0),
@@ -208,15 +208,15 @@ class TurnClient::Private : public QObject
     void cleanup()
     {
         delete allocate;
-        allocate = 0;
+        allocate = nullptr;
 
         // in udp mode, we don't own the pool
         if(!udp)
             delete pool;
-        pool = 0;
+        pool = nullptr;
 
         delete tls;
-        tls = 0;
+        tls = nullptr;
 
         delete bs;
         bs = 0;
@@ -293,12 +293,12 @@ class TurnClient::Private : public QObject
         else
         {
             delete allocate;
-            allocate = 0;
+            allocate = nullptr;
 
             // in udp mode, we don't own the pool
             if(!udp)
                 delete pool;
-            pool = 0;
+            pool = nullptr;
 
             if(udp)
                 sess.defer(q, "closed");
@@ -316,7 +316,7 @@ class TurnClient::Private : public QObject
         else
         {
             delete tls;
-            tls = 0;
+            tls = nullptr;
 
             do_sock_close();
         }
@@ -697,7 +697,7 @@ class TurnClient::Private : public QObject
 
             int tmp_retryCount = retryCount;
             StunTransactionPool *tmp_pool = pool;
-            pool = 0;
+            pool = nullptr;
 
             cleanup();
 
@@ -887,7 +887,7 @@ private slots:
     void tls_closed()
     {
         delete tls;
-        tls = 0;
+        tls = nullptr;
 
         do_sock_close();
     }
@@ -935,12 +935,12 @@ private slots:
     void allocate_stopped()
     {
         delete allocate;
-        allocate = 0;
+        allocate = nullptr;
 
         // in udp mode, we don't own the pool
         if(!udp)
             delete pool;
-        pool = 0;
+        pool = nullptr;
 
         if(udp)
             emit q->closed();
diff --git a/src/irisnet/noncore/turnclient.h b/src/irisnet/noncore/turnclient.h
index 80a07e90..18af00cb 100644
--- a/src/irisnet/noncore/turnclient.h
+++ b/src/irisnet/noncore/turnclient.h
@@ -111,7 +111,7 @@ class TurnClient : public QObject
         QString v_user, v_pass;
     };
 
-    TurnClient(QObject *parent = 0);
+    TurnClient(QObject *parent = nullptr);
     ~TurnClient();
 
     void setProxy(const Proxy &proxy);
diff --git a/src/irisnet/noncore/udpportreserver.cpp b/src/irisnet/noncore/udpportreserver.cpp
index f7e48ba4..650e2132 100644
--- a/src/irisnet/noncore/udpportreserver.cpp
+++ b/src/irisnet/noncore/udpportreserver.cpp
@@ -255,7 +255,7 @@ private slots:
 
         // eat all packets
         while(sock->hasPendingDatagrams())
-            sock->readDatagram(0, 0);
+            sock->readDatagram(nullptr, 0);
     }
 
 private:
diff --git a/src/irisnet/noncore/udpportreserver.h b/src/irisnet/noncore/udpportreserver.h
index 57eed035..5650a489 100644
--- a/src/irisnet/noncore/udpportreserver.h
+++ b/src/irisnet/noncore/udpportreserver.h
@@ -37,7 +37,7 @@ class UdpPortReserver : public QObject
     Q_OBJECT
 
 public:
-    UdpPortReserver(QObject *parent = 0);
+    UdpPortReserver(QObject *parent = nullptr);
     ~UdpPortReserver();
 
     void setAddresses(const QList<QHostAddress> &addrs);
@@ -58,7 +58,7 @@ class UdpPortReserver : public QObject
     //   able to bind to a port for it to be considered reserved, this
     //   function always returns a list with a size that is a multiple of
     //   the number of addresses.
-    QList<QUdpSocket*> borrowSockets(int portCount, QObject *parent = 0);
+    QList<QUdpSocket*> borrowSockets(int portCount, QObject *parent = nullptr);
 
     void returnSockets(const QList<QUdpSocket*> &sockList);
 
diff --git a/src/xmpp/jid/jid.cpp b/src/xmpp/jid/jid.cpp
index 93c08e16..4aa7c967 100644
--- a/src/xmpp/jid/jid.cpp
+++ b/src/xmpp/jid/jid.cpp
@@ -161,7 +161,7 @@ using namespace XMPP;
 
     void StringPrepCache::cleanup()
     {
-        _instance.reset(0);
+        _instance.reset(nullptr);
     }
 
     StringPrepCache *StringPrepCache::instance()
diff --git a/src/xmpp/xmpp-core/connector.cpp b/src/xmpp/xmpp-core/connector.cpp
index 6bbce914..6aa01c2f 100644
--- a/src/xmpp/xmpp-core/connector.cpp
+++ b/src/xmpp/xmpp-core/connector.cpp
@@ -215,7 +215,7 @@ AdvancedConnector::AdvancedConnector(QObject *parent)
 :Connector(parent)
 {
     d = new Private;
-    d->bs = 0;
+    d->bs = nullptr;
     d->opt_ssl = Never;
     cleanup();
     d->errorCode = 0;
@@ -233,7 +233,7 @@ void AdvancedConnector::cleanup()
 
     // destroy the bytestream, if there is one
     delete d->bs;
-    d->bs = 0;
+    d->bs = nullptr;
 
     setUseSSL(false);
     setPeerAddressNone();
@@ -403,7 +403,7 @@ ByteStream *AdvancedConnector::stream() const
     if(d->mode == Connected)
         return d->bs;
     else
-        return 0;
+        return nullptr;
 }
 
 void AdvancedConnector::done()
diff --git a/src/xmpp/xmpp-core/parser.cpp b/src/xmpp/xmpp-core/parser.cpp
index 9706afa4..bb53d345 100644
--- a/src/xmpp/xmpp-core/parser.cpp
+++ b/src/xmpp/xmpp-core/parser.cpp
@@ -64,7 +64,7 @@ class StreamInput : public QXmlInputSource
 public:
     StreamInput()
     {
-        dec = 0;
+        dec = nullptr;
         reset();
     }
 
@@ -76,7 +76,7 @@ class StreamInput : public QXmlInputSource
     void reset()
     {
         delete dec;
-        dec = 0;
+        dec = nullptr;
         in.resize(0);
         out = "";
         at = 0;
@@ -197,7 +197,7 @@ class StreamInput : public QXmlInputSource
         printf("processing.  size=%d, at=%d\n", in.size(), at);
 #endif
         if(!dec) {
-            QTextCodec *codec = 0;
+            QTextCodec *codec = nullptr;
             uchar *p = (uchar *)in.data() + at;
             int size = in.size() - at;
 
@@ -239,7 +239,7 @@ class StreamInput : public QXmlInputSource
                         ++n2;
                         QString h = out.mid(n, n2-n);
                         QString enc = processXmlHeader(h);
-                        QTextCodec *codec = 0;
+                        QTextCodec *codec = nullptr;
                         if(!enc.isEmpty())
                             codec = QTextCodec::codecForName(enc.toLatin1());
 
@@ -528,9 +528,9 @@ namespace XMPP
         Parser::Event *takeEvent()
         {
             if(needMore)
-                return 0;
+                return nullptr;
             if(eventList.isEmpty())
-                return 0;
+                return nullptr;
 
             Parser::Event *e = eventList.takeFirst();
             in->pause(false);
@@ -564,12 +564,12 @@ class Parser::Event::Private
 
 Parser::Event::Event()
 {
-    d = 0;
+    d = nullptr;
 }
 
 Parser::Event::Event(const Event &from)
 {
-    d = 0;
+    d = nullptr;
     *this = from;
 }
 
@@ -579,7 +579,7 @@ Parser::Event & Parser::Event::operator=(const Event &from)
         return *this;
 
     delete d;
-    d = 0;
+    d = nullptr;
     if(from.d)
         d = new Private(*from.d);
     return *this;
@@ -695,9 +695,9 @@ class Parser::Private
 public:
     Private()
     {
-        doc = 0;
+        doc = nullptr;
         in = 0;
-        handler = 0;
+        handler = nullptr;
         reader = 0;
         reset();
     }
@@ -726,9 +726,9 @@ class Parser::Private
             reader->parse(in, true);
             in->pause(false);
         } else {
-            reader = 0;
-            handler = 0;
-            in = 0;
+            reader = nullptr;
+            handler = nullptr;
+            in = nullptr;
             doc = 0;
         }
     }
diff --git a/src/xmpp/xmpp-core/protocol.cpp b/src/xmpp/xmpp-core/protocol.cpp
index c98b595e..d6bdc297 100644
--- a/src/xmpp/xmpp-core/protocol.cpp
+++ b/src/xmpp/xmpp-core/protocol.cpp
@@ -107,7 +107,7 @@ BasicProtocol::SASLCondEntry BasicProtocol::saslCondTable[] =
     { "mechanism-too-weak",     MechTooWeak },
     { "not-authorized",         NotAuthorized },
     { "temporary-auth-failure", TemporaryAuthFailure },
-    { 0, 0 },
+    { nullptr, 0 },
 };
 
 BasicProtocol::StreamCondEntry BasicProtocol::streamCondTable[] =
@@ -136,7 +136,7 @@ BasicProtocol::StreamCondEntry BasicProtocol::streamCondTable[] =
     { "unsupported-encoding",     UnsupportedEncoding },
     { "unsupported-stanza-type",  UnsupportedStanzaType },
     { "unsupported-version",      UnsupportedVersion },
-    { 0, 0 },
+    { nullptr, 0 },
 };
 
 BasicProtocol::BasicProtocol()
diff --git a/src/xmpp/xmpp-core/securestream.cpp b/src/xmpp/xmpp-core/securestream.cpp
index ca192722..f1934d37 100644
--- a/src/xmpp/xmpp-core/securestream.cpp
+++ b/src/xmpp/xmpp-core/securestream.cpp
@@ -390,7 +390,7 @@ class SecureStream::Private
 };
 
 SecureStream::SecureStream(ByteStream *s)
-:ByteStream(0)
+:ByteStream(nullptr)
 {
     d = new Private;
 
diff --git a/src/xmpp/xmpp-core/simplesasl.cpp b/src/xmpp/xmpp-core/simplesasl.cpp
index db72cd04..4480a673 100644
--- a/src/xmpp/xmpp-core/simplesasl.cpp
+++ b/src/xmpp/xmpp-core/simplesasl.cpp
@@ -448,7 +448,7 @@ class QCASimpleSASL : public QCA::Provider
     {
         if(cap == "sasl")
             return new SimpleSASLContext(this);
-        return 0;
+        return nullptr;
     }
     int qcaVersion() const
     {
diff --git a/src/xmpp/xmpp-core/sm.h b/src/xmpp/xmpp-core/sm.h
index cbcd94c5..e16d3c14 100644
--- a/src/xmpp/xmpp-core/sm.h
+++ b/src/xmpp/xmpp-core/sm.h
@@ -57,7 +57,7 @@ namespace XMPP
     class StreamManagement : QObject
     {
     public:
-        StreamManagement(QObject *parent = 0);
+        StreamManagement(QObject *parent = nullptr);
         XMPP::SMState &state() { return state_; }
         const XMPP::SMState &state() const { return state_; }
         bool isActive() const { return sm_started || sm_resumed; }
diff --git a/src/xmpp/xmpp-core/stream.cpp b/src/xmpp/xmpp-core/stream.cpp
index bec855e2..b0c7e49c 100644
--- a/src/xmpp/xmpp-core/stream.cpp
+++ b/src/xmpp/xmpp-core/stream.cpp
@@ -71,7 +71,7 @@
 
 using namespace XMPP;
 
-static Debug *debug_ptr = 0;
+static Debug *debug_ptr = nullptr;
 void XMPP::setDebug(Debug *p)
 {
     debug_ptr = p;
@@ -98,7 +98,7 @@ static QString genId()
 //----------------------------------------------------------------------------
 // Stream
 //----------------------------------------------------------------------------
-static XmlProtocol *foo = 0;
+static XmlProtocol *foo = nullptr;
 Stream::Stream(QObject *parent)
 :QObject(parent)
 {
@@ -133,7 +133,7 @@ QString Stream::xmlToString(const QDomElement &e, bool clip)
 void Stream::cleanup()
 {
     delete foo;
-    foo = 0;
+    foo = nullptr;
 }
 
 //----------------------------------------------------------------------------
@@ -290,11 +290,11 @@ void ClientStream::reset(bool all)
 
     // delete securestream
     delete d->ss;
-    d->ss = 0;
+    d->ss = nullptr;
 
     // reset sasl
     delete d->sasl;
-    d->sasl = 0;
+    d->sasl = nullptr;
 
     if(all) {
         while (!d->in.isEmpty()) {
@@ -317,7 +317,7 @@ void ClientStream::reset(bool all)
         // reset connector
         if(d->bs) {
             d->bs->close();
-            d->bs = 0;
+            d->bs = nullptr;
         }
         d->conn->done();
 
@@ -331,7 +331,7 @@ void ClientStream::reset(bool all)
 
         if(d->bs) {
             d->bs->close();
-            d->bs = 0;
+            d->bs = nullptr;
         }
 
         d->srv.reset();
@@ -459,7 +459,7 @@ QCA::Provider::Context *ClientStream::currentSASLContext() const
     if (d->sasl) {
         return d->sasl->context();
     }
-    return 0;
+    return nullptr;
 }
 
 void ClientStream::setSCRAMStoredSaltedHash(const QString &s) {
@@ -1281,7 +1281,7 @@ bool ClientStream::handleNeed()
                 }
             }
 
-            d->sasl = new QCA::SASL(0, saslProvider);
+            d->sasl = new QCA::SASL(nullptr, saslProvider);
             connect(d->sasl, SIGNAL(clientStarted(bool,QByteArray)), SLOT(sasl_clientFirstStep(bool,QByteArray)));
             connect(d->sasl, SIGNAL(nextStep(QByteArray)), SLOT(sasl_nextStep(QByteArray)));
             connect(d->sasl, SIGNAL(needParams(QCA::SASL::Params)), SLOT(sasl_needParams(QCA::SASL::Params)));
diff --git a/src/xmpp/xmpp-core/xmpp.h b/src/xmpp/xmpp-core/xmpp.h
index 61617a02..76443b05 100644
--- a/src/xmpp/xmpp-core/xmpp.h
+++ b/src/xmpp/xmpp-core/xmpp.h
@@ -71,7 +71,7 @@ namespace XMPP
     {
         Q_OBJECT
     public:
-        Connector(QObject *parent=0);
+        Connector(QObject *parent=nullptr);
         virtual ~Connector();
 
         virtual void setOptHostPort(const QString &host, quint16 port)=0;
@@ -107,7 +107,7 @@ namespace XMPP
         Q_OBJECT
     public:
         enum Error { ErrConnectionRefused, ErrHostNotFound, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth, ErrStream };
-        AdvancedConnector(QObject *parent=0);
+        AdvancedConnector(QObject *parent=nullptr);
         virtual ~AdvancedConnector();
 
         class Proxy
@@ -180,7 +180,7 @@ namespace XMPP
     {
         Q_OBJECT
     public:
-        TLSHandler(QObject *parent=0);
+        TLSHandler(QObject *parent=nullptr);
         virtual ~TLSHandler();
 
         virtual void reset()=0;
diff --git a/src/xmpp/xmpp-core/xmpp_clientstream.h b/src/xmpp/xmpp-core/xmpp_clientstream.h
index 4bc5b6a4..d33bf834 100644
--- a/src/xmpp/xmpp-core/xmpp_clientstream.h
+++ b/src/xmpp/xmpp-core/xmpp_clientstream.h
@@ -99,8 +99,8 @@ namespace XMPP
             AllowPlainOverTLS
         };
 
-        ClientStream(Connector *conn, TLSHandler *tlsHandler=0, QObject *parent=0);
-        ClientStream(const QString &host, const QString &defRealm, ByteStream *bs, QCA::TLS *tls=0, QObject *parent=0); // server
+        ClientStream(Connector *conn, TLSHandler *tlsHandler=nullptr, QObject *parent=nullptr);
+        ClientStream(const QString &host, const QString &defRealm, ByteStream *bs, QCA::TLS *tls=nullptr, QObject *parent=nullptr); // server
         ~ClientStream();
 
         Jid jid() const;
diff --git a/src/xmpp/xmpp-core/xmpp_stanza.cpp b/src/xmpp/xmpp-core/xmpp_stanza.cpp
index d283541c..25fe145c 100644
--- a/src/xmpp/xmpp-core/xmpp_stanza.cpp
+++ b/src/xmpp/xmpp-core/xmpp_stanza.cpp
@@ -199,7 +199,7 @@ Stanza::Error::Private::ErrorTypeEntry Stanza::Error::Private::errorTypeTable[]
     { "modify",   Modify },
     { "auth",     Auth },
     { "wait",     Wait },
-    { 0, 0 },
+    { nullptr, 0 },
 };
 
 Stanza::Error::Private::ErrorCondEntry Stanza::Error::Private::errorCondTable[] =
@@ -225,7 +225,7 @@ Stanza::Error::Private::ErrorCondEntry Stanza::Error::Private::errorCondTable[]
     { "subscription-required",   SubscriptionRequired },
     { "undefined-condition",     UndefinedCondition },
     { "unexpected-request",      UnexpectedRequest },
-    { 0, 0 },
+    { nullptr, 0 },
 };
 
 Stanza::Error::Private::ErrorCodeEntry Stanza::Error::Private::errorCodeTable[] =
@@ -467,7 +467,7 @@ class Stanza::Private
 
 Stanza::Stanza()
 {
-    d = 0;
+    d = nullptr;
 }
 
 Stanza::Stanza(Stream *s, Kind k, const Jid &to, const QString &type, const QString &id)
@@ -495,7 +495,7 @@ Stanza::Stanza(Stream *s, Kind k, const Jid &to, const QString &type, const QStr
 Stanza::Stanza(Stream *s, const QDomElement &e)
 {
     Q_ASSERT(s);
-    d = 0;
+    d = nullptr;
     if(e.namespaceURI() != s->baseNS())
         return;
     int x = Private::stringToKind(e.tagName());
@@ -508,7 +508,7 @@ Stanza::Stanza(Stream *s, const QDomElement &e)
 
 Stanza::Stanza(const Stanza &from)
 {
-    d = 0;
+    d = nullptr;
     *this = from;
 }
 
@@ -518,7 +518,7 @@ Stanza & Stanza::operator=(const Stanza &from)
         return *this;
 
     delete d;
-    d = 0;
+    d = nullptr;
     if(from.d)
         d = new Private(*from.d);
     return *this;
diff --git a/src/xmpp/xmpp-core/xmpp_stream.h b/src/xmpp/xmpp-core/xmpp_stream.h
index 916a9807..06dd3ae3 100644
--- a/src/xmpp/xmpp-core/xmpp_stream.h
+++ b/src/xmpp/xmpp-core/xmpp_stream.h
@@ -48,7 +48,7 @@ namespace XMPP
             StreamReset
         };
 
-        Stream(QObject *parent=0);
+        Stream(QObject *parent=nullptr);
         virtual ~Stream();
 
         virtual QDomDocument & doc() const=0;
diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
index 6033a505..f4ecc8c4 100644
--- a/src/xmpp/xmpp-im/client.cpp
+++ b/src/xmpp/xmpp-im/client.cpp
@@ -263,7 +263,7 @@ void Client::setFileTransferEnabled(bool b)
     else {
         if(d->ftman) {
             delete d->ftman;
-            d->ftman = 0;
+            d->ftman = nullptr;
         }
     }
 }
@@ -482,7 +482,7 @@ void Client::close(bool)
     if(d->stream) {
         d->stream->disconnect(this);
         d->stream->close();
-        d->stream = 0;
+        d->stream = nullptr;
     }
     disconnected();
     cleanup();
diff --git a/src/xmpp/xmpp-im/filetransfer.cpp b/src/xmpp/xmpp-im/filetransfer.cpp
index 493b4175..1290b9d3 100644
--- a/src/xmpp/xmpp-im/filetransfer.cpp
+++ b/src/xmpp/xmpp-im/filetransfer.cpp
@@ -74,8 +74,8 @@ FileTransfer::FileTransfer(FileTransferManager *m, QObject *parent)
 {
     d = new Private;
     d->m = m;
-    d->ft = 0;
-    d->c = 0;
+    d->ft = nullptr;
+    d->c = nullptr;
     reset();
 }
 
@@ -85,7 +85,7 @@ FileTransfer::FileTransfer(const FileTransfer& other)
     d = new Private;
     *d = *other.d;
     d->m = other.d->m;
-    d->ft = 0;
+    d->ft = nullptr;
     d->c = 0;
     reset();
 
@@ -109,13 +109,13 @@ void FileTransfer::reset()
     d->m->unlink(this);
 
     delete d->ft;
-    d->ft = 0;
+    d->ft = nullptr;
 
     if (d->c) {
         d->c->disconnect(this);
         d->c->manager()->deleteConnection(d->c, d->state == Active && !d->sender ?
                                               3000 : 0);
-        d->c = 0;
+        d->c = nullptr;
     }
 
     d->state = Idle;
@@ -247,7 +247,7 @@ BSConnection *FileTransfer::bsConnection() const
 void FileTransfer::ft_finished()
 {
     JT_FT *ft = d->ft;
-    d->ft = 0;
+    d->ft = nullptr;
 
     if(ft->success()) {
         d->state = Connecting;
@@ -420,7 +420,7 @@ FileTransfer *FileTransferManager::createTransfer()
 FileTransfer *FileTransferManager::takeIncoming()
 {
     if(d->incoming.isEmpty())
-        return 0;
+        return nullptr;
 
     FileTransfer *ft = d->incoming.takeFirst();
 
@@ -472,7 +472,7 @@ void FileTransferManager::pft_incoming(const FTRequest &req)
 BytestreamManager* FileTransferManager::streamManager(const QString &ns) const
 {
     if (d->disabledStreamTypes.contains(ns)) {
-        return 0;
+        return nullptr;
     }
     return d->streamMap.value(ns);
 }
diff --git a/src/xmpp/xmpp-im/filetransfer.h b/src/xmpp/xmpp-im/filetransfer.h
index bdb24f8a..8d436089 100644
--- a/src/xmpp/xmpp-im/filetransfer.h
+++ b/src/xmpp/xmpp-im/filetransfer.h
@@ -95,7 +95,7 @@ namespace XMPP
         Private *d;
 
         friend class FileTransferManager;
-        FileTransfer(FileTransferManager *, QObject *parent=0);
+        FileTransfer(FileTransferManager *, QObject *parent=nullptr);
         FileTransfer(const FileTransfer& other);
         void man_waitForAccept(const FTRequest &req, const QString &streamType);
         void takeConnection(BSConnection *c);
diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index 0b486959..1066e592 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -1747,7 +1747,7 @@ ApplicationManagerPad *Manager::applicationPad(Session *session, const QString &
 {
     auto am = d->applicationManagers.value(ns);
     if (!am) {
-        return NULL;
+        return nullptr;
     }
     return am->pad(session);
 }
@@ -1801,7 +1801,7 @@ TransportManagerPad* Manager::transportPad(Session *session, const QString &ns)
 {
     auto transportManager = d->transportManagers.value(ns);
     if (!transportManager) {
-        return NULL;
+        return nullptr;
     }
     return transportManager->pad(session);
 }
@@ -1821,7 +1821,7 @@ Session* Manager::incomingSessionInitiate(const Jid &from, const Jingle &jingle,
 {
     if (d->maxSessions > 0 && d->sessions.size() == d->maxSessions) {
         d->lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Wait, XMPP::Stanza::Error::ResourceConstraint);
-        return NULL;
+        return nullptr;
     }
     auto key = qMakePair(from, jingle.sid());
     auto s = new Session(this, from, Origin::Responder);
@@ -1835,7 +1835,7 @@ Session* Manager::incomingSessionInitiate(const Jid &from, const Jingle &jingle,
     }
     d->lastError = s->lastError();
     delete s;
-    return NULL;
+    return nullptr;
 }
 
 XMPP::Stanza::Error Manager::lastError() const
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index 9a13b26f..cda4d5b1 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -565,7 +565,7 @@ class Manager : public QObject
     Q_OBJECT
 
 public:
-    explicit Manager(XMPP::Client *client = 0);
+    explicit Manager(XMPP::Client *client = nullptr);
     ~Manager();
 
     XMPP::Client* client() const;
diff --git a/src/xmpp/xmpp-im/s5b.cpp b/src/xmpp/xmpp-im/s5b.cpp
index 5cdea38d..596c7f8b 100644
--- a/src/xmpp/xmpp-im/s5b.cpp
+++ b/src/xmpp/xmpp-im/s5b.cpp
@@ -200,8 +200,8 @@ S5BConnection::S5BConnection(S5BManager *m, QObject *parent)
 {
     d = new Private;
     d->m = m;
-    d->sc = 0;
-    d->su = 0;
+    d->sc = nullptr;
+    d->su = nullptr;
 
     ++num_conn;
     d->id = id_conn++;
@@ -229,10 +229,10 @@ void S5BConnection::resetConnection(bool clear)
     d->m->con_unlink(this);
     if(clear && d->sc) {
         delete d->sc;
-        d->sc = 0;
+        d->sc = nullptr;
     }
     delete d->su;
-    d->su = 0;
+    d->su = nullptr;
     if(clear) {
         while (!d->dglist.isEmpty()) {
             delete d->dglist.takeFirst();
@@ -627,7 +627,7 @@ BSConnection *S5BManager::createConnection()
 S5BConnection *S5BManager::takeIncoming()
 {
     if(d->incomingConns.isEmpty())
-        return 0;
+        return nullptr;
 
     S5BConnection *c = d->incomingConns.takeFirst();
 
@@ -757,7 +757,7 @@ S5BConnection *S5BManager::findIncoming(const Jid &from, const QString &sid) con
         if(c->d->peer.compare(from) && c->d->sid == sid)
             return c;
     }
-    return 0;
+    return nullptr;
 }
 
 S5BManager::Entry *S5BManager::findEntry(S5BConnection *c) const
@@ -766,7 +766,7 @@ S5BManager::Entry *S5BManager::findEntry(S5BConnection *c) const
         if(e->c == c)
             return e;
     }
-    return 0;
+    return nullptr;
 }
 
 S5BManager::Entry *S5BManager::findEntry(Item *i) const
@@ -775,7 +775,7 @@ S5BManager::Entry *S5BManager::findEntry(Item *i) const
         if(e->i == i)
             return e;
     }
-    return 0;
+    return nullptr;
 }
 
 S5BManager::Entry *S5BManager::findEntryByHash(const QString &key) const
@@ -784,7 +784,7 @@ S5BManager::Entry *S5BManager::findEntryByHash(const QString &key) const
         if(e->i && e->i->key == key)
             return e;
     }
-    return 0;
+    return nullptr;
 }
 
 S5BManager::Entry *S5BManager::findEntryBySID(const Jid &peer, const QString &sid) const
@@ -793,7 +793,7 @@ S5BManager::Entry *S5BManager::findEntryBySID(const Jid &peer, const QString &si
         if(e->i && e->i->peer.compare(peer) && e->sid == sid)
             return e;
     }
-    return 0;
+    return nullptr;
 }
 
 bool S5BManager::srv_ownsHash(const QString &key) const
@@ -951,9 +951,9 @@ void S5BManager::item_connected()
 
     // grab the client
     SocksClient *client = i->client;
-    i->client = 0;
+    i->client = nullptr;
     SocksUDP *client_udp = i->client_udp;
-    i->client_udp = 0;
+    i->client_udp = nullptr;
 
     // give it to the connection
     e->c->man_clientReady(client, client_udp);
@@ -1008,7 +1008,7 @@ void S5BManager::queryProxy(Entry *e)
 void S5BManager::query_finished()
 {
     JT_S5B *query = static_cast<JT_S5B *>(sender());
-    Entry* e = 0;
+    Entry* e = nullptr;
     foreach(Entry* i, d->activeList) {
         if(i->query == query) {
             e = i;
@@ -1017,7 +1017,7 @@ void S5BManager::query_finished()
     }
     if(!e)
         return;
-    e->query = 0;
+    e->query = nullptr;
 
 #ifdef S5B_DEBUG
     qDebug("query finished: ");
@@ -1304,7 +1304,7 @@ void S5BManager::Item::incomingActivate(const Jid &streamHost)
 void S5BManager::Item::jt_finished()
 {
     JT_S5B *j = task;
-    task = 0;
+    task = nullptr;
 
 #ifdef S5B_DEBUG
     qDebug("jt_finished: state=%s, %s\n", state == Requester ? "requester" : "target", j->success() ? "ok" : "fail");
@@ -1330,7 +1330,7 @@ void S5BManager::Item::jt_finished()
         // stop connecting out
         if(conn || lateProxy) {
             delete conn;
-            conn = 0;
+            conn = nullptr;
             doConnectError();
         }
 
@@ -1357,7 +1357,7 @@ void S5BManager::Item::jt_finished()
         else if(streamHost.compare(proxy.jid())) {
             // toss out any direct incoming, since it won't be used
             delete client;
-            client = 0;
+            client = nullptr;
             allowIncoming = false;
 
 #ifdef S5B_DEBUG
@@ -1412,7 +1412,7 @@ void S5BManager::Item::conn_result(bool b)
         SocksUDP *sc_udp = conn->takeUDP();
         StreamHost h = conn->streamHostUsed();
         delete conn;
-        conn = 0;
+        conn = nullptr;
         connSuccess = true;
 
 #ifdef S5B_DEBUG
@@ -1448,7 +1448,7 @@ void S5BManager::Item::conn_result(bool b)
     }
     else {
         delete conn;
-        conn = 0;
+        conn = nullptr;
 
         // if we delayed the proxies for later, try now
         if(lateProxy) {
@@ -1469,7 +1469,7 @@ void S5BManager::Item::proxy_result(bool b)
         SocksClient *sc = proxy_conn->takeClient();
         SocksUDP *sc_udp = proxy_conn->takeUDP();
         delete proxy_conn;
-        proxy_conn = 0;
+        proxy_conn = nullptr;
 
         connect(sc, SIGNAL(readyRead()), SLOT(sc_readyRead()));
         connect(sc, SIGNAL(bytesWritten(qint64)), SLOT(sc_bytesWritten(qint64)));
@@ -1489,7 +1489,7 @@ void S5BManager::Item::proxy_result(bool b)
     }
     else {
         delete proxy_conn;
-        proxy_conn = 0;
+        proxy_conn = nullptr;
         resetConnection();
         error(ErrProxy);
     }
@@ -1498,7 +1498,7 @@ void S5BManager::Item::proxy_result(bool b)
 void S5BManager::Item::proxy_finished()
 {
     JT_S5B *j = proxy_task;
-    proxy_task = 0;
+    proxy_task = nullptr;
 
     if(j->success()) {
 #ifdef S5B_DEBUG
@@ -1575,7 +1575,7 @@ void S5BManager::Item::tryActivation()
     else if(targetMode == Fast) {
         // with fast mode, we don't wait for the iq reply, so delete the task (if any)
         delete task;
-        task = 0;
+        task = nullptr;
 
         activated = true;
 
@@ -1628,15 +1628,15 @@ void S5BManager::Item::checkForActivation()
             }
 
             if(ok) {
-                SocksUDP *sc_udp = 0;
+                SocksUDP *sc_udp = nullptr;
                 if(sc == client) {
                     delete client_out_udp;
-                    client_out_udp = 0;
+                    client_out_udp = nullptr;
                     sc_udp = client_udp;
                 }
                 else if(sc == client_out) {
                     delete client_udp;
-                    client_udp = 0;
+                    client_udp = nullptr;
                     sc_udp = client_out_udp;
                 }
 
@@ -1645,7 +1645,7 @@ void S5BManager::Item::checkForActivation()
                     delete clientList.takeFirst();
                 }
                 client = sc;
-                client_out = 0;
+                client_out = nullptr;
                 client_udp = sc_udp;
                 activated = true;
 #ifdef S5B_DEBUG
@@ -1664,7 +1664,7 @@ void S5BManager::Item::checkForActivation()
                 delete clientList.takeFirst();
             }
             client = sc;
-            client_out = 0;
+            client_out = nullptr;
             activated = true;
             break;
         }
@@ -1738,9 +1738,9 @@ class S5BConnector::Item : public QObject
     Jid jid;
 
     Item(const Jid &self, const StreamHost &_host, const QString &_key, bool _udp)
-        : QObject(0)
+        : QObject(nullptr)
         , client(new SocksClient)
-        , client_udp(0)
+        , client_udp(nullptr)
         , host(_host)
         , key(_key)
         , udp(_udp)
@@ -1816,9 +1816,9 @@ private slots:
     void cleanup()
     {
         delete client_udp;
-        client_udp = 0;
+        client_udp = nullptr;
         delete client;
-        client = 0;
+        client = nullptr;
     }
 
     void success()
@@ -1846,8 +1846,8 @@ S5BConnector::S5BConnector(QObject *parent)
 :QObject(parent)
 {
     d = new Private;
-    d->active = 0;
-    d->active_udp = 0;
+    d->active = nullptr;
+    d->active_udp = nullptr;
     connect(&d->t, SIGNAL(timeout()), SLOT(t_timeout()));
 }
 
@@ -1861,9 +1861,9 @@ void S5BConnector::resetConnection()
 {
     d->t.stop();
     delete d->active_udp;
-    d->active_udp = 0;
+    d->active_udp = nullptr;
     delete d->active;
-    d->active = 0;
+    d->active = nullptr;
     while (!d->itemList.empty()) {
         delete d->itemList.takeFirst();
     }
@@ -1888,14 +1888,14 @@ void S5BConnector::start(const Jid &self, const StreamHostList &hosts, const QSt
 SocksClient *S5BConnector::takeClient()
 {
     SocksClient *c = d->active;
-    d->active = 0;
+    d->active = nullptr;
     return c;
 }
 
 SocksUDP *S5BConnector::takeUDP()
 {
     SocksUDP *c = d->active_udp;
-    d->active_udp = 0;
+    d->active_udp = nullptr;
     return c;
 }
 
@@ -1909,9 +1909,9 @@ void S5BConnector::item_result(bool b)
     Item *i = static_cast<Item *>(sender());
     if(b) {
         d->active = i->client;
-        i->client = 0;
+        i->client = nullptr;
         d->active_udp = i->client_udp;
-        i->client_udp = 0;
+        i->client_udp = nullptr;
         d->activeHost = i->host;
         while (!d->itemList.isEmpty()) {
             delete d->itemList.takeFirst();
@@ -2329,7 +2329,7 @@ class S5BIncomingConnection : public QObject
     QString host;
     QTimer expire;
 
-    S5BIncomingConnection(SocksClient *c) : QObject(0)
+    S5BIncomingConnection(SocksClient *c) : QObject(nullptr)
     {
         client = c;
         connect(client, &SocksClient::incomingMethods, [this](int methods){
@@ -2372,7 +2372,7 @@ private slots:
     {
         expire.stop();
         delete client;
-        client = 0;
+        client = nullptr;
         result(false);
     }
 };
@@ -2406,7 +2406,7 @@ S5BServer::S5BServer(QTcpServer *serverSocket) :
             }
 
             SocksClient *c = inConn->client;
-            inConn->client = 0;
+            inConn->client = nullptr;
             QString key = inConn->host;
             delete inConn;
 
diff --git a/src/xmpp/xmpp-im/s5b.h b/src/xmpp/xmpp-im/s5b.h
index 4f0d9863..951076f8 100644
--- a/src/xmpp/xmpp-im/s5b.h
+++ b/src/xmpp/xmpp-im/s5b.h
@@ -140,7 +140,7 @@ namespace XMPP
         void man_clientReady(SocksClient *, SocksUDP *);
         void man_udpReady(const QByteArray &buf);
         void man_failed(int);
-        S5BConnection(S5BManager *, QObject *parent=0);
+        S5BConnection(S5BManager *, QObject *parent=nullptr);
     };
 
     class S5BManager : public BytestreamManager
@@ -213,7 +213,7 @@ namespace XMPP
     {
         Q_OBJECT
     public:
-        S5BConnector(QObject *parent=0);
+        S5BConnector(QObject *parent=nullptr);
         ~S5BConnector();
 
         void resetConnection();
diff --git a/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp b/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp
index a988230a..f3db19b7 100644
--- a/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp
+++ b/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp
@@ -146,7 +146,7 @@ BoBCache::BoBCache(QObject *parent)
 //------------------------------------------------------------------------------
 BoBManager::BoBManager(Client *client)
     : QObject(client)
-    , _cache(0)
+    , _cache(nullptr)
 {
     new JT_BoBServer(client->rootTask());
 }
diff --git a/src/xmpp/xmpp-im/xmpp_bytestream.h b/src/xmpp/xmpp-im/xmpp_bytestream.h
index 7da4d0c3..9f3a88b6 100644
--- a/src/xmpp/xmpp-im/xmpp_bytestream.h
+++ b/src/xmpp/xmpp-im/xmpp_bytestream.h
@@ -35,7 +35,7 @@ namespace XMPP
         enum Error { ErrRefused = ErrCustom, ErrConnect, ErrProxy, ErrSocket };
         enum State { Idle, Requesting, Connecting, WaitingForAccept, Active };
 
-        BSConnection(QObject *parent = 0) : ByteStream(parent) {}
+        BSConnection(QObject *parent = nullptr) : ByteStream(parent) {}
 
         virtual void connectToJid(const Jid &peer, const QString &sid) = 0;
         virtual void accept() = 0;
diff --git a/src/xmpp/xmpp-im/xmpp_client.h b/src/xmpp/xmpp-im/xmpp_client.h
index b250bf59..4cfb935f 100644
--- a/src/xmpp/xmpp-im/xmpp_client.h
+++ b/src/xmpp/xmpp-im/xmpp_client.h
@@ -73,7 +73,7 @@ namespace XMPP
         Q_OBJECT
 
     public:
-        Client(QObject *parent=0);
+        Client(QObject *parent=nullptr);
         ~Client();
 
         bool isActive() const;
diff --git a/src/xmpp/xmpp-im/xmpp_features.cpp b/src/xmpp/xmpp-im/xmpp_features.cpp
index 0190e67b..378f0556 100644
--- a/src/xmpp/xmpp-im/xmpp_features.cpp
+++ b/src/xmpp/xmpp-im/xmpp_features.cpp
@@ -253,7 +253,7 @@ class Features::FeatureName : public QObject
     QMap<long, QString> id2f;
 };
 
-static Features::FeatureName *featureName = 0;
+static Features::FeatureName *featureName = nullptr;
 
 long Features::id() const
 {
diff --git a/src/xmpp/xmpp-im/xmpp_ibb.cpp b/src/xmpp/xmpp-im/xmpp_ibb.cpp
index 9089ecce..0c716760 100644
--- a/src/xmpp/xmpp-im/xmpp_ibb.cpp
+++ b/src/xmpp/xmpp-im/xmpp_ibb.cpp
@@ -62,7 +62,7 @@ IBBConnection::IBBConnection(IBBManager *m)
 {
     d = new Private;
     d->m = m;
-    d->j = 0;
+    d->j = nullptr;
     d->blockSize = PacketSize;
     resetConnection();
 
@@ -82,7 +82,7 @@ void IBBConnection::resetConnection(bool clear)
     d->seq = 0;
 
     delete d->j;
-    d->j = 0;
+    d->j = nullptr;
 
     clearWriteBuffer();
     if(clear)
@@ -254,7 +254,7 @@ void IBBConnection::setRemoteClosed()
 void IBBConnection::ibb_finished()
 {
     JT_IBB *j = d->j;
-    d->j = 0;
+    d->j = nullptr;
 
     if(j->success()) {
         if(j->mode() == JT_IBB::ModeRequest) {
@@ -455,7 +455,7 @@ void IBBManager::ibb_closeRequest(const Jid &from, const QString &id,
 
 bool IBBManager::isAcceptableSID(const XMPP::Jid &jid, const QString&sid) const
 {
-    return findConnection(sid, jid) == NULL;
+    return findConnection(sid, jid) == nullptr;
 }
 
 const char* IBBManager::sidPrefix() const
@@ -479,7 +479,7 @@ IBBConnection *IBBManager::findConnection(const QString &sid, const Jid &peer) c
         if(c->sid() == sid && (peer.isEmpty() || c->peer().compare(peer)) )
             return c;
     }
-    return 0;
+    return nullptr;
 }
 
 void IBBManager::doAccept(IBBConnection *c, const QString &id)
diff --git a/src/xmpp/xmpp-im/xmpp_tasks.cpp b/src/xmpp/xmpp-im/xmpp_tasks.cpp
index 7a627a3c..cfa6bc3f 100644
--- a/src/xmpp/xmpp-im/xmpp_tasks.cpp
+++ b/src/xmpp/xmpp-im/xmpp_tasks.cpp
@@ -318,7 +318,7 @@ JT_UnRegister::JT_UnRegister(Task *parent)
 : Task(parent)
 {
     d = new Private;
-    d->jt_reg = 0;
+    d->jt_reg = nullptr;
 }
 
 JT_UnRegister::~JT_UnRegister()
@@ -344,7 +344,7 @@ void JT_UnRegister::onGo()
 
 void JT_UnRegister::getFormFinished()
 {
-    disconnect(d->jt_reg, 0, this, 0);
+    disconnect(d->jt_reg, nullptr, this, nullptr);
     if (d->jt_reg->isRegistered()) {
         d->jt_reg->unreg(d->j);
         connect(d->jt_reg, SIGNAL(finished()), SLOT(unregFinished()));
@@ -362,7 +362,7 @@ void JT_UnRegister::unregFinished()
         setError(d->jt_reg->statusCode(), d->jt_reg->statusString());
 
     delete d->jt_reg;
-    d->jt_reg = 0;
+    d->jt_reg = nullptr;
 }
 
 //----------------------------------------------------------------------------
diff --git a/src/xmpp/zlib/common.h b/src/xmpp/zlib/common.h
index da3fe842..bf243c0d 100644
--- a/src/xmpp/zlib/common.h
+++ b/src/xmpp/zlib/common.h
@@ -5,14 +5,14 @@
 
 static void initZStream(z_stream* z)
 {
-    z->next_in = NULL;
+    z->next_in = nullptr;
     z->avail_in = 0;
     z->total_in = 0;
-    z->next_out = NULL;
+    z->next_out = nullptr;
     z->avail_out = 0;
     z->total_out = 0;
-    z->msg = NULL;
-    z->state = NULL;
+    z->msg = nullptr;
+    z->state = nullptr;
     z->zalloc = Z_NULL;
     z->zfree = Z_NULL;
     z->opaque = Z_NULL;

From 28452af5bc8ab433cca0924640642f6849bbab51 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 2 Jul 2019 08:13:03 +0300
Subject: [PATCH 086/383] Fixed more compilation warnings

---
 src/irisnet/noncore/udpportreserver.cpp | 2 +-
 src/xmpp/jid/jid.cpp                    | 8 ++++----
 src/xmpp/xmpp-core/parser.cpp           | 2 +-
 src/xmpp/xmpp-core/parser.h             | 2 +-
 src/xmpp/xmpp-im/httpfileupload.h       | 8 ++++----
 src/xmpp/xmpp-im/xmpp_client.h          | 2 +-
 src/xmpp/xmpp-im/xmpp_discoinfotask.h   | 2 +-
 src/xmpp/xmpp-im/xmpp_discoitem.cpp     | 8 ++++----
 src/xmpp/xmpp-im/xmpp_discoitem.h       | 2 +-
 src/xmpp/xmpp-im/xmpp_message.h         | 2 +-
 src/xmpp/xmpp-im/xmpp_status.h          | 2 +-
 src/xmpp/xmpp-im/xmpp_subsets.cpp       | 6 +++---
 src/xmpp/xmpp-im/xmpp_tasks.h           | 2 +-
 src/xmpp/xmpp-im/xmpp_xdata.cpp         | 2 +-
 src/xmpp/xmpp-im/xmpp_xmlcommon.cpp     | 2 +-
 15 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/irisnet/noncore/udpportreserver.cpp b/src/irisnet/noncore/udpportreserver.cpp
index 650e2132..54adc0b4 100644
--- a/src/irisnet/noncore/udpportreserver.cpp
+++ b/src/irisnet/noncore/udpportreserver.cpp
@@ -125,7 +125,7 @@ class UdpPortReserver::Private : public QObject
         ports = newPorts;
 
         // keep ports in sorted order
-        qSort(ports);
+        std::sort(ports.begin(), ports.end());
 
         foreach(int x, added)
         {
diff --git a/src/xmpp/jid/jid.cpp b/src/xmpp/jid/jid.cpp
index 4aa7c967..e7e35bc5 100644
--- a/src/xmpp/jid/jid.cpp
+++ b/src/xmpp/jid/jid.cpp
@@ -56,7 +56,7 @@ using namespace XMPP;
         cs.resize(maxbytes);
         if(stringprep(cs.data(), maxbytes, (Stringprep_profile_flags)0, stringprep_nameprep) != 0)
         {
-            that->nameprep_table.insert(in, QString::null);
+            that->nameprep_table.insert(in, QString());
             return false;
         }
 
@@ -87,7 +87,7 @@ using namespace XMPP;
         QByteArray cs = in.toUtf8();
         cs.resize(maxbytes);
         if(stringprep(cs.data(), maxbytes, (Stringprep_profile_flags)0, stringprep_xmpp_nodeprep) != 0) {
-            that->nodeprep_table.insert(in, QString::null);
+            that->nodeprep_table.insert(in, QString());
             return false;
         }
 
@@ -118,7 +118,7 @@ using namespace XMPP;
         QByteArray cs = in.toUtf8();
         cs.resize(maxbytes);
         if(stringprep(cs.data(), maxbytes, (Stringprep_profile_flags)0, stringprep_xmpp_resourceprep) != 0) {
-            that->resourceprep_table.insert(in, QString::null);
+            that->resourceprep_table.insert(in, QString());
             return false;
         }
 
@@ -149,7 +149,7 @@ using namespace XMPP;
         QByteArray cs = in.toUtf8();
         cs.resize(maxbytes);
         if(stringprep(cs.data(), maxbytes, (Stringprep_profile_flags)0, stringprep_saslprep) != 0) {
-            that->saslprep_table.insert(in, QString::null);
+            that->saslprep_table.insert(in, QString());
             return false;
         }
 
diff --git a/src/xmpp/xmpp-core/parser.cpp b/src/xmpp/xmpp-core/parser.cpp
index bb53d345..4eb601d8 100644
--- a/src/xmpp/xmpp-core/parser.cpp
+++ b/src/xmpp/xmpp-core/parser.cpp
@@ -611,7 +611,7 @@ QString Parser::Event::nsprefix(const QString &s) const
             return (*it2);
         ++it2;
     }
-    return QString::null;
+    return QString();
 }
 
 QString Parser::Event::namespaceURI() const
diff --git a/src/xmpp/xmpp-core/parser.h b/src/xmpp/xmpp-core/parser.h
index b31841e7..72fa9b57 100644
--- a/src/xmpp/xmpp-core/parser.h
+++ b/src/xmpp/xmpp-core/parser.h
@@ -44,7 +44,7 @@ namespace XMPP
             int type() const;
 
             // for document open
-            QString nsprefix(const QString &s=QString::null) const;
+            QString nsprefix(const QString &s=QString()) const;
 
             // for document open / close
             QString namespaceURI() const;
diff --git a/src/xmpp/xmpp-im/httpfileupload.h b/src/xmpp/xmpp-im/httpfileupload.h
index 53f6feeb..e5666adf 100644
--- a/src/xmpp/xmpp-im/httpfileupload.h
+++ b/src/xmpp/xmpp-im/httpfileupload.h
@@ -78,7 +78,7 @@ class HttpFileUpload : public QObject
     };
 
     HttpFileUpload(Client *client, QIODevice *source, size_t fsize, const QString &dstFilename,
-                   const QString &mType = QString::null);
+                   const QString &mType = QString());
     HttpFileUpload(const HttpFileUpload &) = delete;
     ~HttpFileUpload();
 
@@ -172,8 +172,8 @@ class HttpFileUploadManager : public QObject
      * @param mType meta type. image/png for example
      * @return returns a handler object which will signal "finished" when ready
      */
-    HttpFileUpload* upload(const QString &srcFilename, const QString &dstFilename = QString::null,
-                           const QString &mType = QString::null);
+    HttpFileUpload* upload(const QString &srcFilename, const QString &dstFilename = QString(),
+                           const QString &mType = QString());
 
     /**
      * @brief uploads data of given size from the given to remote server
@@ -184,7 +184,7 @@ class HttpFileUploadManager : public QObject
      * @return returns a handler object which will signal "finished" when ready
      */
     HttpFileUpload* upload(QIODevice *source, size_t fsize, const QString &dstFilename,
-                           const QString &mType = QString::null);
+                           const QString &mType = QString());
 
 private:
     class Private;
diff --git a/src/xmpp/xmpp-im/xmpp_client.h b/src/xmpp/xmpp-im/xmpp_client.h
index 4cfb935f..aa995f62 100644
--- a/src/xmpp/xmpp-im/xmpp_client.h
+++ b/src/xmpp/xmpp-im/xmpp_client.h
@@ -135,7 +135,7 @@ namespace XMPP
 
         void setFeatures(const Features& f);
         const Features& features() const;
-        DiscoItem makeDiscoResult(const QString &node = QString::null) const;
+        DiscoItem makeDiscoResult(const QString &node = QString()) const;
 
         void setTcpPortReserver(TcpPortReserver *portReserver);
         TcpPortReserver *tcpPortReserver() const;
diff --git a/src/xmpp/xmpp-im/xmpp_discoinfotask.h b/src/xmpp/xmpp-im/xmpp_discoinfotask.h
index 47c561bc..77cafc0e 100644
--- a/src/xmpp/xmpp-im/xmpp_discoinfotask.h
+++ b/src/xmpp/xmpp-im/xmpp_discoinfotask.h
@@ -40,7 +40,7 @@ namespace XMPP
         // Allow retreive result from cache and update cache on finish with new data
         void setAllowCache(bool allow = true);
 
-        void get(const Jid &, const QString &node = QString::null, const DiscoItem::Identity = DiscoItem::Identity());
+        void get(const Jid &, const QString &node = QString(), const DiscoItem::Identity = DiscoItem::Identity());
         void get(const DiscoItem &);
 
         const DiscoItem &item() const;
diff --git a/src/xmpp/xmpp-im/xmpp_discoitem.cpp b/src/xmpp/xmpp-im/xmpp_discoitem.cpp
index 75738ef1..ddb9bdb1 100644
--- a/src/xmpp/xmpp-im/xmpp_discoitem.cpp
+++ b/src/xmpp/xmpp-im/xmpp_discoitem.cpp
@@ -111,14 +111,14 @@ QString DiscoItem::capsHash(QCryptographicHash::Algorithm algo) const
 {
     QStringList prep;
     DiscoItem::Identities idents = d->identities;
-    qSort(idents);
+    std::sort(idents.begin(), idents.end());
 
     foreach (const DiscoItem::Identity &id, idents) {
         prep << QString("%1/%2/%3/%4").arg(id.category, id.type, id.lang, id.name);
     }
 
     QStringList fl = d->features.list();
-    qSort(fl);
+    std::sort(fl.begin(), fl.end());
     prep += fl;
 
     QMap<QString,XData> forms;
@@ -145,7 +145,7 @@ QString DiscoItem::capsHash(QCryptographicHash::Algorithm algo) const
             if (v.isEmpty()) {
                 continue; // maybe it's media-element but xep-115 (1.5) and xep-232 (0.3) are not clear about that.
             }
-            qSort(v);
+            std::sort(v.begin(), v.end());
             values[f.var()] = v;
         }
         QMap <QString, QStringList>::ConstIterator it = values.constBegin();
@@ -338,7 +338,7 @@ QString DiscoItem::action2string(const Action a)
     else if ( a == Remove )
         s = "remove";
     else
-        s = QString::null;
+        s = QString();
 
     return s;
 }
diff --git a/src/xmpp/xmpp-im/xmpp_discoitem.h b/src/xmpp/xmpp-im/xmpp_discoitem.h
index a6b06145..b2f990ff 100644
--- a/src/xmpp/xmpp-im/xmpp_discoitem.h
+++ b/src/xmpp/xmpp-im/xmpp_discoitem.h
@@ -66,7 +66,7 @@ namespace XMPP {
 
             inline Identity() {}
             inline Identity(const QString &categoty, const QString &type,
-                            const QString &lang = QString::null, const QString &name = QString::null) :
+                            const QString &lang = QString(), const QString &name = QString()) :
                 category(categoty), type(type), lang(lang), name(name) {}
             bool operator==(const Identity &other) const;
         };
diff --git a/src/xmpp/xmpp-im/xmpp_message.h b/src/xmpp/xmpp-im/xmpp_message.h
index 1c40fa5a..f1378c4b 100644
--- a/src/xmpp/xmpp-im/xmpp_message.h
+++ b/src/xmpp/xmpp-im/xmpp_message.h
@@ -84,7 +84,7 @@ namespace XMPP {
         QString id() const;
         QString type() const;
         QString lang() const;
-        QString subject(const QString &lang=QString::null) const;
+        QString subject(const QString &lang=QString()) const;
         QString subject(const QLocale &lang) const;
         StringMap subjectMap() const;
         QString body(const QString &lang="") const;
diff --git a/src/xmpp/xmpp-im/xmpp_status.h b/src/xmpp/xmpp-im/xmpp_status.h
index e78af9ab..a43f9577 100644
--- a/src/xmpp/xmpp-im/xmpp_status.h
+++ b/src/xmpp/xmpp-im/xmpp_status.h
@@ -39,7 +39,7 @@ namespace XMPP
             static const QCryptographicHash::Algorithm invalidAlgo = (QCryptographicHash::Algorithm)255;
 
             CapsSpec();
-            CapsSpec(const QString& node, QCryptographicHash::Algorithm hashAlgo, const QString& ver = QString::null);
+            CapsSpec(const QString& node, QCryptographicHash::Algorithm hashAlgo, const QString& ver = QString());
             CapsSpec(const DiscoItem &disco, QCryptographicHash::Algorithm hashAlgo = QCryptographicHash::Sha1);
 
             bool isValid() const;
diff --git a/src/xmpp/xmpp-im/xmpp_subsets.cpp b/src/xmpp/xmpp-im/xmpp_subsets.cpp
index ef306639..f5835304 100644
--- a/src/xmpp/xmpp-im/xmpp_subsets.cpp
+++ b/src/xmpp/xmpp-im/xmpp_subsets.cpp
@@ -156,8 +156,8 @@ void SubsetsClientManager::reset()
     d->query.type     = Private::None;
     d->query.max      = 50;
     d->query.index    = -1;
-    d->result.firstId = QString::null;
-    d->result.lastId  = QString::null;
+    d->result.firstId = QString();
+    d->result.lastId  = QString();
     d->resetResult();
 }
 
@@ -259,7 +259,7 @@ QDomElement SubsetsClientManager::makeQueryElement(QDomDocument *doc) const
         d->insertMaxElement(doc, &e, 0);
         break;
     case Private::Last:
-        d->insertBeforeElement(doc, &e, QString::null);
+        d->insertBeforeElement(doc, &e, QString());
         break;
     case Private::Next:
         d->insertAfterElement(doc, &e, d->result.lastId);
diff --git a/src/xmpp/xmpp-im/xmpp_tasks.h b/src/xmpp/xmpp-im/xmpp_tasks.h
index 01e4e568..11c401f0 100644
--- a/src/xmpp/xmpp-im/xmpp_tasks.h
+++ b/src/xmpp/xmpp-im/xmpp_tasks.h
@@ -352,7 +352,7 @@ namespace XMPP
         JT_DiscoItems(Task *);
         ~JT_DiscoItems();
 
-        void get(const Jid &, const QString &node = QString::null);
+        void get(const Jid &, const QString &node = QString());
         void get(const DiscoItem &);
 
         const DiscoList &items() const;
diff --git a/src/xmpp/xmpp-im/xmpp_xdata.cpp b/src/xmpp/xmpp-im/xmpp_xdata.cpp
index a481db8d..e2bf37d4 100644
--- a/src/xmpp/xmpp-im/xmpp_xdata.cpp
+++ b/src/xmpp/xmpp-im/xmpp_xdata.cpp
@@ -195,7 +195,7 @@ void XData::Field::fromXml(const QDomElement &e)
         _type = Field_TextSingle;
 
     _required = false;
-    _desc     = QString::null;
+    _desc     = QString();
     _options.clear();
     _value.clear();
 
diff --git a/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp b/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
index fd0c8653..b4e86c93 100644
--- a/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
+++ b/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
@@ -333,7 +333,7 @@ QString subTagText(const QDomElement &e, const QString &name)
     QDomElement i = e.firstChildElement(name);
     if ( !i.isNull() )
         return i.text();
-    return QString::null;
+    return QString();
 }
 
 QDomElement textTag(QDomDocument &doc, const QString &name, const QString &content)

From 3e3597298b587f870b111efa499baea7771a48fe Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 3 Jul 2019 09:44:56 +0300
Subject: [PATCH 087/383] minor formatting fix

---
 src/xmpp/xmpp-im/xmpp_features.cpp | 34 +++++++++++++++---------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/xmpp/xmpp-im/xmpp_features.cpp b/src/xmpp/xmpp-im/xmpp_features.cpp
index 378f0556..11e3eef0 100644
--- a/src/xmpp/xmpp-im/xmpp_features.cpp
+++ b/src/xmpp/xmpp-im/xmpp_features.cpp
@@ -214,16 +214,16 @@ class Features::FeatureName : public QObject
     FeatureName()
     : QObject(QCoreApplication::instance())
     {
-        id2s[FID_Invalid]        = tr("ERROR: Incorrect usage of Features class");
-        id2s[FID_None]            = tr("None");
-        id2s[FID_Register]        = tr("Register");
+        id2s[FID_Invalid]       = tr("ERROR: Incorrect usage of Features class");
+        id2s[FID_None]          = tr("None");
+        id2s[FID_Register]      = tr("Register");
         id2s[FID_Search]        = tr("Search");
-        id2s[FID_Groupchat]        = tr("Groupchat");
-        id2s[FID_Gateway]        = tr("Gateway");
-        id2s[FID_Disco]            = tr("Service Discovery");
-        id2s[FID_VCard]            = tr("VCard");
-        id2s[FID_AHCommand]        = tr("Execute command");
-        id2s[FID_QueryVersion]    = tr("Query version");
+        id2s[FID_Groupchat]     = tr("Groupchat");
+        id2s[FID_Gateway]       = tr("Gateway");
+        id2s[FID_Disco]         = tr("Service Discovery");
+        id2s[FID_VCard]         = tr("VCard");
+        id2s[FID_AHCommand]     = tr("Execute command");
+        id2s[FID_QueryVersion]  = tr("Query version");
         id2s[FID_MessageCarbons]= tr("Message Carbons");
 
         // custom Psi actions
@@ -234,18 +234,18 @@ class Features::FeatureName : public QObject
         //for ( ; it != id2s.end(); ++it)
         //    s2id[it.data()] = it.key();
 
-        id2f[FID_Register]        = FID_REGISTER;
+        id2f[FID_Register]      = FID_REGISTER;
         id2f[FID_Search]        = FID_SEARCH;
-        id2f[FID_Groupchat]        = FID_GROUPCHAT;
-        id2f[FID_Gateway]        = FID_GATEWAY;
-        id2f[FID_Disco]            = FID_DISCO;
-        id2f[FID_VCard]            = FID_VCARD;
-        id2f[FID_AHCommand]        = FID_AHCOMMAND;
-        id2f[FID_QueryVersion]    = FID_QUERYVERSION;
+        id2f[FID_Groupchat]     = FID_GROUPCHAT;
+        id2f[FID_Gateway]       = FID_GATEWAY;
+        id2f[FID_Disco]         = FID_DISCO;
+        id2f[FID_VCard]         = FID_VCARD;
+        id2f[FID_AHCommand]     = FID_AHCOMMAND;
+        id2f[FID_QueryVersion]  = FID_QUERYVERSION;
         id2f[FID_MessageCarbons]= FID_MESSAGECARBONS;
 
         // custom Psi actions
-        id2f[FID_Add]            = FID_ADD;
+        id2f[FID_Add]           = FID_ADD;
     }
 
     //QMap<QString, long> s2id;

From 2784fb7c51d754fe389cab7abffc5deacd586430 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 9 Jul 2019 01:12:32 +0300
Subject: [PATCH 088/383] A couple of constructors for jingle-ft ranges

---
 src/xmpp/xmpp-im/jingle-ft.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index f92dca04..cd6e9754 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -39,6 +39,8 @@ struct Range {
     quint64 length = 0;
     Hash hash;
 
+    inline Range() {}
+    inline Range(quint64 offset, quint64 length) : offset(offset), length(length) {}
     inline bool isValid() const { return hash.isValid() || offset || length; }
     QDomElement toXml(QDomDocument *doc) const;
 };

From 764defd80103541a0b66915d040f96cac91ee4a9 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 10 Jul 2019 09:52:14 +0300
Subject: [PATCH 089/383] ranged file transfers fixes

---
 src/xmpp/xmpp-im/jingle-ft.cpp | 4 ++--
 src/xmpp/xmpp-im/jingle-ft.h   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 1096da2a..0525e54f 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -131,8 +131,8 @@ File::File(const QDomElement &file)
                 }
             }
             if (ce.hasAttribute(QLatin1String("length"))) {
-                range.offset = ce.attribute(QLatin1String("length")).toULongLong(&ok);
-                if (!ok) {
+                range.length = ce.attribute(QLatin1String("length")).toULongLong(&ok);
+                if (!ok || !range.length) { // length should absent if we need to read till end of file. 0-length is nonsense
                     return;
                 }
             }
diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index cd6e9754..8053bf5b 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -36,7 +36,7 @@ class Manager;
 
 struct Range {
     quint64 offset = 0;
-    quint64 length = 0;
+    quint64 length = 0; // 0 - from offset to the end of the file
     Hash hash;
 
     inline Range() {}
@@ -169,7 +169,7 @@ class Application : public XMPP::Jingle::Application
     bool incomingTransportAccept(const QDomElement &transportEl) override;
 
 signals:
-    void deviceRequested(quint64 offset, quint64 size);
+    void deviceRequested(quint64 offset, quint64 size); // if size = 0 then it's reamaining part of the file
     void progress(quint64 offset);
 
 private:

From 2e08a83dc5450f0505ac8acb49eb159762646025 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Thu, 11 Jul 2019 09:05:05 +0300
Subject: [PATCH 090/383] s/downloadProgress/uploadProgress/

---
 src/xmpp/xmpp-im/httpfileupload.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/xmpp/xmpp-im/httpfileupload.cpp b/src/xmpp/xmpp-im/httpfileupload.cpp
index 8e5efedf..9bc78ef6 100644
--- a/src/xmpp/xmpp-im/httpfileupload.cpp
+++ b/src/xmpp/xmpp-im/httpfileupload.cpp
@@ -210,7 +210,7 @@ void HttpFileUpload::tryNextServer()
             req.setRawHeader(h.name.toLatin1(), h.value.toLatin1());
         }
         auto reply = d->qnam->put(req, d->sourceDevice);
-        connect(reply, &QNetworkReply::downloadProgress, this, &HttpFileUpload::progress);
+        connect(reply, &QNetworkReply::uploadProgress, this, &HttpFileUpload::progress);
         connect(reply, &QNetworkReply::finished, this, [this, reply](){
             if (reply->error() == QNetworkReply::NoError) {
                 done(State::Success);

From fb63f3eb40e601791c0b8eae22fc8e9da061bf20 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Thu, 11 Jul 2019 11:54:54 +0300
Subject: [PATCH 091/383] Added jingle-ft:file:size presence flag

---
 src/xmpp/xmpp-im/jingle-ft.cpp | 10 ++++++++++
 src/xmpp/xmpp-im/jingle-ft.h   |  1 +
 2 files changed, 11 insertions(+)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 0525e54f..af63dac6 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -60,6 +60,7 @@ class File::Private : public QSharedData
     quint64   size = 0;
     Range     range;
     bool      rangeSupported = false;
+    bool      hasSize = false;
     QList<Hash> hashes;
     Thumbnail thumbnail;
     File::Spectrum audioSpectrum;
@@ -95,6 +96,7 @@ File::File(const QDomElement &file)
     QString     desc;
     size_t      size = 0;
     bool        rangeSupported = false;
+    bool        hasSize = false;
     Range       range;
     QList<Hash> hashes;
     Thumbnail   thumbnail;
@@ -122,6 +124,7 @@ File::File(const QDomElement &file)
             if (!ok) {
                 return;
             }
+            hasSize = true;
 
         } else if (ce.tagName() == QLatin1String("range")) {
             if (ce.hasAttribute(QLatin1String("offset"))) {
@@ -197,6 +200,7 @@ File::File(const QDomElement &file)
     p->desc = desc;
     p->size = size;
     p->rangeSupported = rangeSupported;
+    p->hasSize = hasSize;
     p->range = range;
     p->hashes = hashes;
     p->thumbnail = thumbnail;
@@ -284,6 +288,11 @@ bool File::hasComputedHashes() const
     return false;
 }
 
+bool File::hasSize() const
+{
+    return d->hasSize;
+}
+
 QDateTime File::date() const
 {
     return d? d->date : QDateTime();
@@ -366,6 +375,7 @@ void File::setName(const QString &name)
 void File::setSize(quint64 size)
 {
     ensureD()->size = size;
+    d->hasSize = true;
 }
 
 void File::setRange(const Range &range)
diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index 8053bf5b..f717de91 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -69,6 +69,7 @@ class File
     QDomElement toXml(QDomDocument *doc) const;
     bool merge(const File &other);
     bool hasComputedHashes() const;
+    bool hasSize() const;
 
     QDateTime date()  const;
     QString   description() const;

From bf63af4ec4b6feea0cbbf2a9db7b7b14e26e931e Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 15 Jul 2019 01:22:18 +0300
Subject: [PATCH 092/383] Added streamed mode for jingle-ft

---
 src/xmpp/xmpp-im/jingle-ft.cpp | 81 +++++++++++++++++++++++++---------
 src/xmpp/xmpp-im/jingle-ft.h   | 17 ++++++-
 src/xmpp/xmpp-im/jingle.h      |  1 +
 3 files changed, 77 insertions(+), 22 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index af63dac6..db15c8ce 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -503,6 +503,7 @@ class Application::Private
     Connection::Ptr connection;
     QStringList     availableTransports;
     bool            closeDeviceOnFinish = true;
+    bool            streamigMode = false;
     QIODevice       *device = nullptr;
     quint64         bytesLeft = 0;
 
@@ -684,27 +685,33 @@ bool Application::setTransport(const QSharedPointer<Transport> &transport)
         d->transportReplaceOrigin = Origin::None;
         d->transportReplaceState = State::Finished; // not needed here probably
         d->connection = d->transport->connection();
-        connect(d->connection.data(), &Connection::readyRead, this, [this](){
-            if (!d->device) {
-                return;
-            }
-            if (d->pad->session()->role() != d->senders) {
-                d->readNextBlockFromTransport();
-            }
-        });
-        connect(d->connection.data(), &Connection::bytesWritten, this, [this](qint64 bytes){
-            Q_UNUSED(bytes)
-            if (d->pad->session()->role() == d->senders && !d->connection->bytesToWrite()) {
-                d->writeNextBlockToTransport();
-            }
-        });
+        if (d->streamigMode) {
+            connect(d->connection.data(), &Connection::readyRead, this, [this](){
+                if (!d->device) {
+                    return;
+                }
+                if (d->pad->session()->role() != d->senders) {
+                    d->readNextBlockFromTransport();
+                }
+            });
+            connect(d->connection.data(), &Connection::bytesWritten, this, [this](qint64 bytes){
+                Q_UNUSED(bytes)
+                if (d->pad->session()->role() == d->senders && !d->connection->bytesToWrite()) {
+                    d->writeNextBlockToTransport();
+                }
+            });
+        }
         d->setState(State::Active);
-        if (d->acceptFile.range().isValid()) {
-            d->bytesLeft = d->acceptFile.range().length;
-            emit deviceRequested(d->acceptFile.range().offset, d->bytesLeft);
+        if (d->streamigMode) {
+            if (d->acceptFile.range().isValid()) {
+                d->bytesLeft = d->acceptFile.range().length;
+                emit deviceRequested(d->acceptFile.range().offset, d->bytesLeft);
+            } else {
+                d->bytesLeft = d->file.size();
+                emit deviceRequested(0, d->bytesLeft);
+            }
         } else {
-            d->bytesLeft = d->file.size();
-            emit deviceRequested(0, d->bytesLeft);
+            emit connectionReady();
         }
     });
 
@@ -764,6 +771,13 @@ QSharedPointer<Transport> Application::transport() const
     return d->transport;
 }
 
+void Application::setStreamingMode(bool mode)
+{
+    if (d->state <= State::Connecting) {
+        d->streamigMode = mode;
+    }
+}
+
 Action Application::evaluateOutgoingUpdate()
 {
     d->updateToSend = Action::NoAction;
@@ -816,10 +830,10 @@ Action Application::evaluateOutgoingUpdate()
 
         break;
     case State::Finishing:
-        if (d->transportReplaceOrigin != Origin::None) {
+        if (d->transportReplaceOrigin != Origin::None || d->terminationReason.isValid()) {
             d->updateToSend = Action::ContentRemove;
         } else {
-            d->updateToSend = Action::SessionInfo;
+            d->updateToSend = Action::SessionInfo; // to send checksum
         }
         break;
     default:
@@ -969,6 +983,26 @@ bool Application::accept(const QDomElement &el)
     return true;
 }
 
+void Application::remove(Reason::Condition cond, const QString &comment)
+{
+    if (d->state >= State::Finishing)
+        return;
+
+    d->terminationReason = Reason(cond, comment);
+    d->transportReplaceOrigin = Origin::None; // just in case
+    d->transport->disconnect(this);
+    d->transport.reset();
+
+    if (d->creator == d->pad->session()->role() && d->state <= State::PrepareLocalOffer) {
+        // local content, not yet sent to remote
+        setState(State::Finished);
+        return;
+    }
+
+    setState(State::Finishing);
+    emit updated();
+}
+
 bool Application::incomingTransportAccept(const QDomElement &transportEl)
 {
     if (d->transportReplaceOrigin != d->pad->session()->role()) {
@@ -1009,6 +1043,11 @@ void Application::setDevice(QIODevice *dev, bool closeOnFinish)
     }
 }
 
+Connection::Ptr Application::connection() const
+{
+    return d->connection.staticCast<XMPP::Jingle::Connection>();
+}
+
 Pad::Pad(Manager *manager, Session *session) :
     _manager(manager),
     _session(session)
diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index f717de91..7891227f 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -153,6 +153,18 @@ class Application : public XMPP::Jingle::Application
     bool setTransport(const QSharedPointer<Transport> &transport) override;
     QSharedPointer<Transport> transport() const override;
 
+    /**
+     * @brief setStreamingMode enables external download control.
+     *  So Jingle-FT won't request output device but instead underlying established
+     *  connection will be emitted (see connectionReady() signal).
+     *  The connection is an XMPP::Jingle::Connection::Ptr instance.
+     *  When the connection is not needed anymore, one can just destroy jingle
+     *  session or remove the Application from the session.
+     *  Make sure to set the mode before connection is established.
+     * @param mode
+     */
+    void setStreamingMode(bool mode = true);
+
     Action evaluateOutgoingUpdate() override;
     OutgoingUpdate takeOutgoingUpdate() override;
     bool wantBetterTransport(const QSharedPointer<XMPP::Jingle::Transport> &) const override;
@@ -160,17 +172,20 @@ class Application : public XMPP::Jingle::Application
     void prepare() override;
     void start() override;
     bool accept(const QDomElement &el) override;
+    void remove(Reason::Condition cond = Reason::Success, const QString &comment = QString()) override;
 
     bool isValid() const;
 
     void setDevice(QIODevice *dev, bool closeOnFinish = true);
+    Connection::Ptr connection() const;
 
 protected:
     bool incomingTransportReplace(const QSharedPointer<Transport> &transport) override;
     bool incomingTransportAccept(const QDomElement &transportEl) override;
 
 signals:
-    void deviceRequested(quint64 offset, quint64 size); // if size = 0 then it's reamaining part of the file
+    void connectionReady(); // streaming mode only
+    void deviceRequested(quint64 offset, quint64 size); // if size = 0 then it's reamaining part of the file (non-streaming mode only)
     void progress(quint64 offset);
 
 private:
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index cda4d5b1..c5ab81d1 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -445,6 +445,7 @@ class Application : public QObject
     virtual void prepare() = 0;
     virtual bool accept(const QDomElement &el) = 0; // remote accepted our content
     virtual void start() = 0;
+    virtual void remove(Reason::Condition cond = Reason::Success, const QString &comment = QString()) = 0;
 
     /**
      * @brief incomingTransportReplace it's jingle transport-replace

From 0badd8669c9b0b813b15a68f42790b272a8cef0e Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 16 Jul 2019 10:53:20 +0300
Subject: [PATCH 093/383] Cache http hosts

---
 src/xmpp/xmpp-im/httpfileupload.cpp | 33 +++++++++++++++++++++++++++++
 src/xmpp/xmpp-im/httpfileupload.h   | 12 +++++++++++
 2 files changed, 45 insertions(+)

diff --git a/src/xmpp/xmpp-im/httpfileupload.cpp b/src/xmpp/xmpp-im/httpfileupload.cpp
index 9bc78ef6..08d68a7b 100644
--- a/src/xmpp/xmpp-im/httpfileupload.cpp
+++ b/src/xmpp/xmpp-im/httpfileupload.cpp
@@ -88,6 +88,21 @@ void HttpFileUpload::start()
     setState(State::GettingSlot);
 
     d->result.statusCode = HttpFileUpload::ErrorCode::NoError;
+
+    auto mgr = d->client->httpFileUploadManager();
+    if (mgr->discoveryStatus() == HttpFileUploadManager::DiscoNotFound) {
+        d->result.statusCode   = HttpFileUpload::ErrorCode::NoUploadService;
+        d->result.statusString = "No suitable http upload services were found";
+        done(State::Error);
+        return;
+    }
+
+    if (mgr->discoveryStatus() == HttpFileUploadManager::DiscoFound) {
+        d->httpHosts = mgr->discoHosts();
+        tryNextServer();
+        return;
+    }
+
     static QList<QSet<QString>> featureOptions;
     if (featureOptions.isEmpty()) {
         featureOptions << (QSet<QString>() << xmlns_v0_2_5) << (QSet<QString>() << xmlns_v0_3_1);
@@ -145,6 +160,7 @@ void HttpFileUpload::start()
             }
         }
         //d->currentHost = d->httpHosts.begin();
+        d->client->httpFileUploadManager()->setDiscoHosts(d->httpHosts);
         if (d->httpHosts.isEmpty()) { // if empty as the last resort check all services
             d->result.statusCode   = HttpFileUpload::ErrorCode::NoUploadService;
             d->result.statusString = "No suitable http upload services were found";
@@ -423,6 +439,8 @@ class HttpFileUploadManager::Private {
 public:
     Client *client = nullptr;
     QPointer<QNetworkAccessManager> qnam;
+    int discoStatus = 0;
+    QList<HttpFileUpload::HttpHost> discoHosts;
     bool externalQnam = false;
     QLinkedList<HttpFileUpload::HttpHost> hosts;
 };
@@ -441,6 +459,11 @@ HttpFileUploadManager::~HttpFileUploadManager()
     delete d;
 }
 
+int HttpFileUploadManager::discoveryStatus() const
+{
+    return d->discoStatus;
+}
+
 void HttpFileUploadManager::setNetworkAccessManager(QNetworkAccessManager *qnam)
 {
     d->externalQnam = true;
@@ -464,3 +487,13 @@ HttpFileUpload* HttpFileUploadManager::upload(QIODevice *source, size_t fsize, c
     QMetaObject::invokeMethod(hfu, "start", Qt::QueuedConnection);
     return hfu;
 }
+
+const QList<HttpFileUpload::HttpHost> &HttpFileUploadManager::discoHosts() const
+{
+    return d->discoHosts;
+}
+
+void HttpFileUploadManager::setDiscoHosts(const QList<HttpFileUpload::HttpHost> &hosts)
+{
+    d->discoStatus = hosts.size()? DiscoFound : DiscoNotFound;
+}
diff --git a/src/xmpp/xmpp-im/httpfileupload.h b/src/xmpp/xmpp-im/httpfileupload.h
index e5666adf..5d3b78da 100644
--- a/src/xmpp/xmpp-im/httpfileupload.h
+++ b/src/xmpp/xmpp-im/httpfileupload.h
@@ -147,11 +147,19 @@ class HttpFileUploadManager : public QObject
 {
     Q_OBJECT
 public:
+    enum {
+        DiscoNone      = 0x0,
+        DiscoNotFound  = 0x1,
+        DiscoFound     = 0x2
+    };
+
     typedef std::function<void(bool,const QString &)> Callback; // params: success, detail. where detail could be a "get" url
 
     HttpFileUploadManager(Client *parent);
     ~HttpFileUploadManager();
 
+    int discoveryStatus() const;
+
     /**
      * @brief setNetworkAccessManager sets network access manager to do http requests.
      * @param qnam network access manager instance
@@ -187,6 +195,10 @@ class HttpFileUploadManager : public QObject
                            const QString &mType = QString());
 
 private:
+    friend class HttpFileUpload;
+    const QList<HttpFileUpload::HttpHost> &discoHosts() const;
+    void setDiscoHosts(const QList<HttpFileUpload::HttpHost> &hosts);
+
     class Private;
     Private *d;
 };

From 7b0e025ebd42830fdc5e2c5977c943e25b7a599c Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 17 Jul 2019 11:01:07 +0300
Subject: [PATCH 094/383] audio histogram improvements

---
 src/xmpp/xmpp-im/jingle-ft.cpp | 59 ++++++++++++++++++----------------
 src/xmpp/xmpp-im/jingle-ft.h   | 23 +++++++++++--
 2 files changed, 53 insertions(+), 29 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index db15c8ce..454e6f19 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -29,7 +29,7 @@ namespace Jingle {
 namespace FileTransfer {
 
 const QString NS = QStringLiteral("urn:xmpp:jingle:apps:file-transfer:5");
-const QString SPECTRUM_NS = QStringLiteral("iris.psi-im.org/spectrum");
+const QString HISTOGRAM_NS = QStringLiteral("urn:audio:histogram");
 
 QDomElement Range::toXml(QDomDocument *doc) const
 {
@@ -63,7 +63,7 @@ class File::Private : public QSharedData
     bool      hasSize = false;
     QList<Hash> hashes;
     Thumbnail thumbnail;
-    File::Spectrum audioSpectrum;
+    File::Histogram audioHistogram;
 };
 
 File::File()
@@ -100,7 +100,7 @@ File::File(const QDomElement &file)
     Range       range;
     QList<Hash> hashes;
     Thumbnail   thumbnail;
-    Spectrum    spectrum;
+    Histogram   histogram;
 
     bool ok;
 
@@ -171,25 +171,25 @@ File::File(const QDomElement &file)
 
         } else if (ce.tagName() == QLatin1String("thumbnail")) {
             thumbnail = Thumbnail(ce);
-        } else if (ce.tagName() == QLatin1String("spectrum") && (ce.namespaceURI() == SPECTRUM_NS || ce.namespaceURI() == SPECTRUM_NS)) {
+        } else if (ce.tagName() == QLatin1String("histogram") && (ce.namespaceURI() == HISTOGRAM_NS || ce.namespaceURI() == HISTOGRAM_NS)) {
             QStringList spv = ce.text().split(',');
-            spectrum.bars.reserve(spv.count());
-            std::transform(spv.begin(), spv.end(), std::back_inserter(spectrum.bars), [](const QString &v){ return v.toUInt(); });
+            histogram.bars.reserve(spv.count());
+            std::transform(spv.begin(), spv.end(), std::back_inserter(histogram.bars), [](const QString &v){ return v.toUInt(); });
             auto c = ce.attribute(QStringLiteral("coding")).toLatin1();
             if (c == "u8")
-                spectrum.coding = File::Spectrum::Coding::U8;
+                histogram.coding = File::Histogram::Coding::U8;
             else if (c == "s8")
-                spectrum.coding = File::Spectrum::Coding::S8;
+                histogram.coding = File::Histogram::Coding::S8;
             else if (c == "u16")
-                spectrum.coding = File::Spectrum::Coding::U16;
+                histogram.coding = File::Histogram::Coding::U16;
             else if (c == "s16")
-                spectrum.coding = File::Spectrum::Coding::S16;
+                histogram.coding = File::Histogram::Coding::S16;
             else if (c == "u32")
-                spectrum.coding = File::Spectrum::Coding::U32;
+                histogram.coding = File::Histogram::Coding::U32;
             else if (c == "s32")
-                spectrum.coding = File::Spectrum::Coding::S32;
+                histogram.coding = File::Histogram::Coding::S32;
             else
-                spectrum.bars.clear(); // drop invalid spectrum
+                histogram.bars.clear(); // drop invalid histogram
         }
     }
 
@@ -204,7 +204,7 @@ File::File(const QDomElement &file)
     p->range = range;
     p->hashes = hashes;
     p->thumbnail = thumbnail;
-    p->audioSpectrum = spectrum;
+    p->audioHistogram = histogram;
 
     d = p;
 }
@@ -239,20 +239,20 @@ QDomElement File::toXml(QDomDocument *doc) const
     if (d->thumbnail.isValid()) {
         el.appendChild(d->thumbnail.toXml(doc));
     }
-    if (d->audioSpectrum.bars.count()) {
-        auto sel = el.appendChild(doc->createElementNS(SPECTRUM_NS, QString::fromLatin1("spectrum"))).toElement();
+    if (d->audioHistogram.bars.count()) {
+        auto sel = el.appendChild(doc->createElementNS(HISTOGRAM_NS, QString::fromLatin1("histogram"))).toElement();
         const char* s[] = {"u8","s8","u16","s16","u32","s32"};
-        sel.setAttribute(QString::fromLatin1("coding"), QString::fromLatin1(s[d->audioSpectrum.coding]));
+        sel.setAttribute(QString::fromLatin1("coding"), QString::fromLatin1(s[d->audioHistogram.coding]));
         QStringList sl;
-        std::transform(d->audioSpectrum.bars.begin(), d->audioSpectrum.bars.end(), std::back_inserter(sl),
+        std::transform(d->audioHistogram.bars.begin(), d->audioHistogram.bars.end(), std::back_inserter(sl),
                        [this](quint32 v){
-            switch (d->audioSpectrum.coding) {
-            case Spectrum::U8:  return QString::number(quint8(v));
-            case Spectrum::S8:  return QString::number(qint8(v));
-            case Spectrum::U16: return QString::number(quint16(v));
-            case Spectrum::S16: return QString::number(qint16(v));
-            case Spectrum::U32: return QString::number(quint32(v));
-            case Spectrum::S32: return QString::number(qint32(v));
+            switch (d->audioHistogram.coding) {
+            case Histogram::U8:  return QString::number(quint8(v));
+            case Histogram::S8:  return QString::number(qint8(v));
+            case Histogram::U16: return QString::number(quint16(v));
+            case Histogram::S16: return QString::number(qint16(v));
+            case Histogram::U32: return QString::number(quint32(v));
+            case Histogram::S32: return QString::number(qint32(v));
             }
             return QString();
         });
@@ -342,9 +342,9 @@ Thumbnail File::thumbnail() const
     return d? d->thumbnail: Thumbnail();
 }
 
-File::Spectrum File::audioSpectrum() const
+File::Histogram File::audioHistogram() const
 {
-    return d? d->audioSpectrum: Spectrum();
+    return d? d->audioHistogram: Histogram();
 }
 
 void File::setDate(const QDateTime &date)
@@ -389,6 +389,11 @@ void File::setThumbnail(const Thumbnail &thumb)
     ensureD()->thumbnail = thumb;
 }
 
+void File::setAudioHistogram(const File::Histogram &histogram)
+{
+    d->audioHistogram = histogram;
+}
+
 File::Private *File::ensureD()
 {
     if (!d) {
diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index 7891227f..bafab2df 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -48,7 +48,7 @@ struct Range {
 class File
 {
 public:
-    struct Spectrum
+    struct Histogram
     {
         enum Coding {
             U8,  S8,
@@ -79,7 +79,25 @@ class File
     quint64   size()  const;
     Range     range() const;
     Thumbnail thumbnail() const;
-    Spectrum  audioSpectrum() const;
+    Histogram  audioHistogram() const;
+    template<typename T>
+    QList<T> audioHistogram() const
+    {
+        QList<T> ret;
+        auto hg = audioHistogram();
+        std::function<quint8(quint32)> normalizer;
+        switch (hg.coding) {
+        case Histogram::U8:  normalizer = [](quint32 v){ return v/T(255);             }; break;
+        case Histogram::S8:  normalizer = [](quint32 v){ return std::abs(v/T(128));   }; break;
+        case Histogram::U16: normalizer = [](quint32 v){ return v/T(2<<16);           }; break;
+        case Histogram::S16: normalizer = [](quint32 v){ return std::abs(v/T(2<<15)); }; break;
+        case Histogram::U32: normalizer = [](quint32 v){ return quint64(v)/T(2L<<32);          }; break;
+        case Histogram::S32: normalizer = [](quint32 v){ return std::abs(qint64(v)/T(2L<<31)); }; break;
+        }
+        if (normalizer)
+            std::transform(hg.bars.begin(), hg.bars.end(), std::back_inserter(ret), normalizer);
+        return ret;
+    }
 
     void setDate(const QDateTime &date);
     void setDescription(const QString &desc);
@@ -89,6 +107,7 @@ class File
     void setSize(quint64 size);
     void setRange(const Range &range = Range()); // default empty just to indicate it's supported
     void setThumbnail(const Thumbnail &thumb);
+    void setAudioHistogram(const Histogram &histogram);
 private:
     class Private;
     Private *ensureD();

From bb267f2c990b1d535868a55bf91408a8d2f585cd Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 17 Jul 2019 21:37:51 +0300
Subject: [PATCH 095/383] Remove buggy audioHistogram templated function

---
 src/xmpp/xmpp-im/jingle-ft.h | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index bafab2df..91504a8d 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -80,24 +80,6 @@ class File
     Range     range() const;
     Thumbnail thumbnail() const;
     Histogram  audioHistogram() const;
-    template<typename T>
-    QList<T> audioHistogram() const
-    {
-        QList<T> ret;
-        auto hg = audioHistogram();
-        std::function<quint8(quint32)> normalizer;
-        switch (hg.coding) {
-        case Histogram::U8:  normalizer = [](quint32 v){ return v/T(255);             }; break;
-        case Histogram::S8:  normalizer = [](quint32 v){ return std::abs(v/T(128));   }; break;
-        case Histogram::U16: normalizer = [](quint32 v){ return v/T(2<<16);           }; break;
-        case Histogram::S16: normalizer = [](quint32 v){ return std::abs(v/T(2<<15)); }; break;
-        case Histogram::U32: normalizer = [](quint32 v){ return quint64(v)/T(2L<<32);          }; break;
-        case Histogram::S32: normalizer = [](quint32 v){ return std::abs(qint64(v)/T(2L<<31)); }; break;
-        }
-        if (normalizer)
-            std::transform(hg.bars.begin(), hg.bars.end(), std::back_inserter(ret), normalizer);
-        return ret;
-    }
 
     void setDate(const QDateTime &date);
     void setDescription(const QString &desc);

From 42f5e399a1f4b24731d1bd0f7ed834398b963912 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 17 Jul 2019 22:31:18 +0300
Subject: [PATCH 096/383] Fixed http host queries optimization

---
 src/xmpp/xmpp-im/httpfileupload.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/xmpp/xmpp-im/httpfileupload.cpp b/src/xmpp/xmpp-im/httpfileupload.cpp
index 08d68a7b..89695f63 100644
--- a/src/xmpp/xmpp-im/httpfileupload.cpp
+++ b/src/xmpp/xmpp-im/httpfileupload.cpp
@@ -174,8 +174,10 @@ void HttpFileUpload::start()
 void HttpFileUpload::tryNextServer()
 {
     if (d->httpHosts.isEmpty()) { // if empty as the last resort check all services
-        d->result.statusCode   = HttpFileUpload::ErrorCode::NoUploadService;
-        d->result.statusString = "All http services are either non compliant or returned errors";
+        if (d->result.statusCode == HttpFileUpload::ErrorCode::NoError) {
+            d->result.statusCode   = HttpFileUpload::ErrorCode::NoUploadService;
+            d->result.statusString = "All http services are either non compliant or returned errors";
+        }
         done(State::Error);
         return;
     }
@@ -233,6 +235,7 @@ void HttpFileUpload::tryNextServer()
             } else {
                 d->result.statusCode   = ErrorCode::HttpFailed;
                 d->result.statusString = reply->errorString();
+                qDebug("http upload failed: %s", qPrintable(d->result.statusString));
                 if (d->httpHosts.isEmpty())
                     done(State::Error);
                 else
@@ -496,4 +499,5 @@ const QList<HttpFileUpload::HttpHost> &HttpFileUploadManager::discoHosts() const
 void HttpFileUploadManager::setDiscoHosts(const QList<HttpFileUpload::HttpHost> &hosts)
 {
     d->discoStatus = hosts.size()? DiscoFound : DiscoNotFound;
+    d->discoHosts = hosts;
 }

From c4ea8721cd94f7456a6b90508c078d15f2fd7489 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 30 Jul 2019 00:04:14 +0300
Subject: [PATCH 097/383] Allow register external jingle manager sessions in
 advance

---
 src/xmpp/xmpp-im/jingle.cpp | 6 ++++++
 src/xmpp/xmpp-im/jingle.h   | 1 +
 2 files changed, 7 insertions(+)

diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index 1066e592..128643f3 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -456,6 +456,7 @@ class JTPush : public Task
 
     inline void addExternalManager(const QString &ns) { externalManagers.append(ns); }
     inline void forgetExternalSession(const QString &sid) { externalSessions.removeOne(sid); }
+    inline void registerExternalSession(const QString &sid) { externalSessions.append(sid); }
 
 
     bool take(const QDomElement &iq)
@@ -1708,6 +1709,11 @@ void Manager::addExternalManager(const QString &ns)
     d->pushTask->addExternalManager(ns);
 }
 
+void Manager::registerExternalSession(const QString &sid)
+{
+    d->pushTask->registerExternalSession(sid);
+}
+
 void Manager::forgetExternalSession(const QString &sid)
 {
     d->pushTask->forgetExternalSession(sid);
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index c5ab81d1..8765cea1 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -574,6 +574,7 @@ class Manager : public QObject
     // if we have another jingle manager we can add its contents' namespaces here.
     void addExternalManager(const QString &ns);
     // on outgoing session destroy an external manager should call this function.
+    void registerExternalSession(const QString &sid);
     void forgetExternalSession(const QString &sid);
 
     void setRedirection(const Jid &to);

From 103086126c245782b056731d7c0ded1faa30a738 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 26 Aug 2019 01:31:48 +0300
Subject: [PATCH 098/383] Added method to return voice histogram in float
 format

---
 src/xmpp/xmpp-im/jingle-ft.cpp | 27 +++++++++++++++++++++++++++
 src/xmpp/xmpp-im/jingle-ft.h   |  1 +
 2 files changed, 28 insertions(+)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 454e6f19..54059868 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -23,6 +23,9 @@
 #include "xmpp_hash.h"
 #include "xmpp_xmlcommon.h"
 
+#include <cmath>
+#include <functional>
+
 namespace XMPP {
 namespace Jingle {
 
@@ -347,6 +350,30 @@ File::Histogram File::audioHistogram() const
     return d? d->audioHistogram: Histogram();
 }
 
+QList<float> File::audioFloatHistogram() const
+{
+    QList<float> ret;
+    if (!d->audioHistogram.bars.count())
+        return ret;
+
+    std::function<float(quint32)> normalizer;
+    switch (d->audioHistogram.coding) {
+    case Histogram::U8:  normalizer = [](quint32 v){ return quint8(v) / 255.0f;                      }; break;
+    case Histogram::S8:  normalizer = [](quint32 v){ return std::fabs(qint8(v) / 128.0f);            }; break;
+    case Histogram::U16: normalizer = [](quint32 v){ return quint16(v) / float(1 << 16);             }; break;
+    case Histogram::S16: normalizer = [](quint32 v){ return std::fabs(qint16(v) / float(1 << 15));   }; break;
+    case Histogram::U32: normalizer = [](quint32 v){ return quint32(v) / float(quint64(1) << 32);           }; break;
+    case Histogram::S32: normalizer = [](quint32 v){ return std::fabs(qint32(v) / float(quint64(1) << 31)); }; break;
+    }
+
+    if (normalizer) {
+        ret.reserve(d->audioHistogram.bars.count());
+        std::transform(d->audioHistogram.bars.begin(), d->audioHistogram.bars.end(), std::back_inserter(ret), normalizer);
+    }
+
+    return ret;
+}
+
 void File::setDate(const QDateTime &date)
 {
     ensureD()->date = date;
diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index 91504a8d..a905bc66 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -80,6 +80,7 @@ class File
     Range     range() const;
     Thumbnail thumbnail() const;
     Histogram  audioHistogram() const;
+    QList<float> audioFloatHistogram() const;
 
     void setDate(const QDateTime &date);
     void setDescription(const QString &desc);

From 51805e9f6eccbeddba7f5fd68f153e0dcb95ecdd Mon Sep 17 00:00:00 2001
From: Neustradamus <104737+Neustradamus@users.noreply.github.com>
Date: Sat, 31 Aug 2019 06:33:43 +0200
Subject: [PATCH 099/383] beautify some code parts (#62)

sort headers etc
---
 COPYING                                       |  2 -
 cmake/modules/FindIDN.cmake                   |  2 +-
 cmake/modules/FindQJDns.cmake                 |  2 +-
 cmake/modules/FindQca.cmake                   |  2 +-
 configure                                     |  5 +-
 src/irisnet/appledns/appledns.cpp             |  9 ++--
 src/irisnet/appledns/qdnssd.cpp               | 14 ++----
 src/irisnet/appledns/qdnssd.h                 |  4 +-
 src/irisnet/appledns/sdtest.cpp               |  7 ++-
 src/irisnet/corelib/addressresolver.cpp       |  5 +-
 src/irisnet/corelib/addressresolver.h         |  8 ++--
 src/irisnet/corelib/irisnetexport.h           |  2 +-
 src/irisnet/corelib/irisnetglobal.cpp         |  4 +-
 src/irisnet/corelib/irisnetglobal.h           | 10 ++--
 src/irisnet/corelib/irisnetglobal_p.h         |  6 +--
 src/irisnet/corelib/irisnetplugin.cpp         |  3 +-
 src/irisnet/corelib/irisnetplugin.h           | 16 +++----
 src/irisnet/corelib/netavailability.cpp       |  3 +-
 src/irisnet/corelib/netavailability.h         |  6 +--
 src/irisnet/corelib/netinterface.cpp          | 17 ++-----
 src/irisnet/corelib/netinterface.h            |  8 ++--
 src/irisnet/corelib/netinterface_qtname.cpp   |  4 +-
 src/irisnet/corelib/netinterface_qtnet.cpp    |  4 +-
 src/irisnet/corelib/netinterface_unix.cpp     | 20 ++++----
 src/irisnet/corelib/netnames.cpp              | 21 ++-------
 src/irisnet/corelib/netnames.h                | 18 ++------
 src/irisnet/corelib/netnames_jdns.cpp         |  7 +--
 src/irisnet/corelib/objectsession.cpp         |  9 ++--
 src/irisnet/corelib/objectsession.h           |  6 +--
 src/irisnet/noncore/cutestuff/bsocket.cpp     | 13 ++----
 src/irisnet/noncore/cutestuff/bsocket.h       | 18 +++-----
 src/irisnet/noncore/cutestuff/bytestream.cpp  |  1 +
 src/irisnet/noncore/cutestuff/bytestream.h    |  7 ++-
 src/irisnet/noncore/cutestuff/httpconnect.cpp |  8 ++--
 src/irisnet/noncore/cutestuff/httpconnect.h   |  3 +-
 src/irisnet/noncore/cutestuff/httppoll.cpp    | 16 +++----
 src/irisnet/noncore/cutestuff/httppoll.h      |  3 +-
 src/irisnet/noncore/cutestuff/socks.cpp       | 30 ++++++------
 src/irisnet/noncore/cutestuff/socks.h         |  5 +-
 src/irisnet/noncore/ice176.cpp                | 20 ++++----
 src/irisnet/noncore/ice176.h                  | 13 +++---
 src/irisnet/noncore/icecomponent.cpp          | 14 +++---
 src/irisnet/noncore/icecomponent.h            | 11 ++---
 src/irisnet/noncore/icelocaltransport.cpp     | 16 +++----
 src/irisnet/noncore/icelocaltransport.h       | 13 +++---
 src/irisnet/noncore/icetransport.cpp          |  3 +-
 src/irisnet/noncore/icetransport.h            |  8 ++--
 src/irisnet/noncore/iceturntransport.cpp      |  6 +--
 src/irisnet/noncore/iceturntransport.h        | 14 +++---
 src/irisnet/noncore/legacy/ndns.cpp           |  2 +-
 src/irisnet/noncore/legacy/ndns.h             |  8 ++--
 src/irisnet/noncore/legacy/srvresolver.cpp    |  1 -
 src/irisnet/noncore/legacy/srvresolver.h      |  6 +--
 src/irisnet/noncore/processquit.cpp           | 15 ++----
 src/irisnet/noncore/processquit.h             |  2 +-
 src/irisnet/noncore/stunallocate.cpp          | 17 ++++---
 src/irisnet/noncore/stunallocate.h            | 10 ++--
 src/irisnet/noncore/stunbinding.cpp           |  9 ++--
 src/irisnet/noncore/stunbinding.h             |  6 +--
 src/irisnet/noncore/stunmessage.cpp           |  7 ++-
 src/irisnet/noncore/stunmessage.h             |  6 +--
 src/irisnet/noncore/stuntransaction.cpp       | 12 ++---
 src/irisnet/noncore/stuntransaction.h         | 11 ++---
 src/irisnet/noncore/stuntypes.cpp             | 14 ++----
 src/irisnet/noncore/stuntypes.h               | 16 +++----
 src/irisnet/noncore/stunutil.cpp              |  8 +---
 src/irisnet/noncore/stunutil.h                |  9 ++--
 src/irisnet/noncore/tcpportreserver.cpp       | 11 ++---
 src/irisnet/noncore/tcpportreserver.h         |  5 +-
 src/irisnet/noncore/turnclient.cpp            | 19 ++++----
 src/irisnet/noncore/turnclient.h              | 12 ++---
 src/irisnet/noncore/udpportreserver.cpp       |  6 +--
 src/irisnet/noncore/udpportreserver.h         |  8 ++--
 src/jdns/CMakeLists.txt                       |  2 -
 src/jdns/include/jdns/jdns.h                  |  4 +-
 src/jdns/include/jdns/jdns_export.h           |  2 +-
 src/jdns/include/jdns/qjdns.h                 |  5 +-
 src/jdns/include/jdns/qjdnsshared.h           |  6 +--
 src/jdns/src/jdns/CMakeLists.txt              |  1 -
 src/jdns/src/jdns/jdns.c                      |  5 +-
 src/jdns/src/jdns/jdns_mdnsd.c                |  3 +-
 src/jdns/src/jdns/jdns_mdnsd.h                |  5 +-
 src/jdns/src/jdns/jdns_p.h                    | 20 ++++----
 src/jdns/src/jdns/jdns_packet.h               |  2 +-
 src/jdns/src/jdns/jdns_sys.c                  | 11 ++---
 src/jdns/src/jdns/jdns_util.c                 |  1 -
 src/jdns/src/qjdns/qjdns.cpp                  |  6 +--
 src/jdns/src/qjdns/qjdns_p.h                  |  9 ++--
 src/jdns/src/qjdns/qjdns_sock.cpp             | 24 +++++-----
 src/jdns/src/qjdns/qjdns_sock.h               |  4 +-
 src/jdns/src/qjdns/qjdnsshared.cpp            |  3 +-
 src/jdns/src/qjdns/qjdnsshared_p.h            | 15 +++---
 src/jdns/tools/jdns/main.cpp                  |  5 +-
 src/jdns/tools/jdns/main.h                    |  1 +
 src/xmpp/base/randomnumbergenerator.cpp       |  4 +-
 src/xmpp/base/randomnumbergenerator.h         |  4 +-
 src/xmpp/base/randrandomnumbergenerator.h     |  4 +-
 src/xmpp/base/timezone.cpp                    | 23 +++++-----
 .../incrementingrandomnumbergenerator.h       |  8 ++--
 .../unittest/randomnumbergeneratortest.cpp    |  6 +--
 .../randrandomnumbergeneratortest.cpp         |  6 +--
 src/xmpp/blake2/blake2-impl.h                 |  2 +-
 src/xmpp/blake2/blake2.h                      |  3 +-
 src/xmpp/blake2/blake2b-ref.c                 | 14 ++----
 src/xmpp/blake2/blake2qt.cpp                  |  3 +-
 src/xmpp/blake2/blake2qt.h                    |  5 +-
 src/xmpp/blake2/blake2s-ref.c                 | 11 ++---
 src/xmpp/jid/jid.cpp                          |  9 ++--
 src/xmpp/jid/jid.h                            | 11 ++---
 src/xmpp/jid/unittest/jidtest.cpp             |  6 +--
 .../qttestutil/example/myfirstclasstest.cpp   |  4 +-
 .../qttestutil/example/mysecondclasstest.cpp  |  4 +-
 src/xmpp/qa/qttestutil/qttestutil.h           |  2 +-
 src/xmpp/qa/qttestutil/simplechecker.cpp      |  4 +-
 src/xmpp/qa/qttestutil/testregistration.h     |  6 +--
 src/xmpp/qa/qttestutil/testregistry.cpp       |  4 +-
 src/xmpp/qa/qttestutil/testregistry.h         |  5 +-
 src/xmpp/qa/unittest.pri                      |  1 -
 src/xmpp/qa/unittest.template/myclasstest.cpp |  4 +-
 src/xmpp/sasl/digestmd5proplist.cpp           |  3 +-
 src/xmpp/sasl/digestmd5proplist.h             |  6 +--
 src/xmpp/sasl/digestmd5response.cpp           | 10 ++--
 src/xmpp/sasl/digestmd5response.h             |  4 +-
 src/xmpp/sasl/plainmessage.cpp                |  3 +-
 src/xmpp/sasl/plainmessage.h                  |  4 +-
 src/xmpp/sasl/scramsha1message.cpp            | 12 ++---
 src/xmpp/sasl/scramsha1message.h              |  8 ++--
 src/xmpp/sasl/scramsha1response.cpp           | 11 ++---
 src/xmpp/sasl/scramsha1response.h             |  4 +-
 src/xmpp/sasl/scramsha1signature.cpp          | 10 ++--
 src/xmpp/sasl/scramsha1signature.h            |  4 +-
 .../sasl/unittest/digestmd5responsetest.cpp   | 10 ++--
 src/xmpp/sasl/unittest/plainmessagetest.cpp   |  6 +--
 .../sasl/unittest/scramsha1messagetest.cpp    |  8 ++--
 .../sasl/unittest/scramsha1responsetest.cpp   | 10 ++--
 src/xmpp/xmpp-core/compressionhandler.cpp     |  6 +--
 src/xmpp/xmpp-core/compressionhandler.h       |  4 +-
 src/xmpp/xmpp-core/connector.cpp              | 17 +++----
 src/xmpp/xmpp-core/parser.cpp                 |  7 +--
 src/xmpp/xmpp-core/parser.h                   |  7 ++-
 src/xmpp/xmpp-core/protocol.cpp               | 10 ++--
 src/xmpp/xmpp-core/protocol.h                 | 17 ++++---
 src/xmpp/xmpp-core/securestream.cpp           | 10 ++--
 src/xmpp/xmpp-core/securestream.h             |  9 ++--
 src/xmpp/xmpp-core/simplesasl.cpp             | 27 ++++++-----
 src/xmpp/xmpp-core/simplesasl.h               |  5 +-
 src/xmpp/xmpp-core/sm.cpp                     |  6 +--
 src/xmpp/xmpp-core/sm.h                       | 11 ++---
 src/xmpp/xmpp-core/stream.cpp                 | 35 ++++++--------
 src/xmpp/xmpp-core/td.h                       |  3 +-
 src/xmpp/xmpp-core/tlshandler.cpp             |  7 +--
 src/xmpp/xmpp-core/xmlprotocol.cpp            | 11 ++---
 src/xmpp/xmpp-core/xmlprotocol.h              | 12 ++---
 src/xmpp/xmpp-core/xmpp.h                     | 34 ++++++--------
 src/xmpp/xmpp-core/xmpp_clientstream.h        | 19 ++++----
 src/xmpp/xmpp-core/xmpp_stanza.cpp            |  9 ++--
 src/xmpp/xmpp-core/xmpp_stanza.h              | 11 ++---
 src/xmpp/xmpp-core/xmpp_stream.h              | 13 +++---
 src/xmpp/xmpp-im/client.cpp                   | 42 ++++++++---------
 src/xmpp/xmpp-im/filetransfer.cpp             | 11 +++--
 src/xmpp/xmpp-im/filetransfer.h               |  8 ++--
 src/xmpp/xmpp-im/httpfileupload.cpp           | 14 +++---
 src/xmpp/xmpp-im/httpfileupload.h             | 25 +++++-----
 src/xmpp/xmpp-im/im.h                         | 46 +++++++++----------
 src/xmpp/xmpp-im/jingle-ft.cpp                |  8 +---
 src/xmpp/xmpp-im/jingle-ft.h                  |  2 -
 src/xmpp/xmpp-im/jingle-ibb.cpp               |  4 +-
 src/xmpp/xmpp-im/jingle-ibb.h                 |  2 -
 src/xmpp/xmpp-im/jingle-s5b.cpp               | 13 ++----
 src/xmpp/xmpp-im/jingle-s5b.h                 |  4 +-
 src/xmpp/xmpp-im/jingle.cpp                   | 22 ++-------
 src/xmpp/xmpp-im/jingle.h                     |  7 +--
 src/xmpp/xmpp-im/s5b.cpp                      | 19 +++-----
 src/xmpp/xmpp-im/s5b.h                        | 28 ++++++-----
 src/xmpp/xmpp-im/types.cpp                    | 46 +++++--------------
 src/xmpp/xmpp-im/xmpp_address.h               | 11 ++---
 src/xmpp/xmpp-im/xmpp_agentitem.h             |  9 ++--
 src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp        | 14 +++---
 src/xmpp/xmpp-im/xmpp_bitsofbinary.h          | 22 ++++-----
 src/xmpp/xmpp-im/xmpp_bytestream.cpp          | 12 ++---
 src/xmpp/xmpp-im/xmpp_bytestream.h            | 16 +++----
 src/xmpp/xmpp-im/xmpp_caps.cpp                | 26 ++++-------
 src/xmpp/xmpp-im/xmpp_caps.h                  | 13 ++----
 src/xmpp/xmpp-im/xmpp_captcha.h               | 15 +++---
 src/xmpp/xmpp-im/xmpp_chatstate.h             |  4 +-
 src/xmpp/xmpp-im/xmpp_client.h                | 35 +++++++-------
 src/xmpp/xmpp-im/xmpp_discoinfotask.cpp       | 20 ++++----
 src/xmpp/xmpp-im/xmpp_discoinfotask.h         | 18 ++++----
 src/xmpp/xmpp-im/xmpp_discoitem.cpp           |  6 +--
 src/xmpp/xmpp-im/xmpp_discoitem.h             | 12 ++---
 src/xmpp/xmpp-im/xmpp_encryptionhandler.h     |  5 +-
 src/xmpp/xmpp-im/xmpp_features.cpp            | 12 ++---
 src/xmpp/xmpp-im/xmpp_features.h              |  9 ++--
 src/xmpp/xmpp-im/xmpp_hash.h                  |  9 ++--
 src/xmpp/xmpp-im/xmpp_htmlelement.h           |  7 ++-
 src/xmpp/xmpp-im/xmpp_httpauthrequest.h       |  9 ++--
 src/xmpp/xmpp-im/xmpp_ibb.cpp                 | 10 ++--
 src/xmpp/xmpp-im/xmpp_ibb.h                   | 23 +++++-----
 src/xmpp/xmpp-im/xmpp_liveroster.h            | 11 ++---
 src/xmpp/xmpp-im/xmpp_liverosteritem.h        |  9 ++--
 src/xmpp/xmpp-im/xmpp_message.h               | 25 +++++-----
 src/xmpp/xmpp-im/xmpp_muc.h                   | 12 ++---
 src/xmpp/xmpp-im/xmpp_pubsubitem.h            |  9 ++--
 src/xmpp/xmpp-im/xmpp_pubsubretraction.h      | 10 ++--
 src/xmpp/xmpp-im/xmpp_receipts.h              |  4 +-
 src/xmpp/xmpp-im/xmpp_reference.h             | 11 ++---
 src/xmpp/xmpp-im/xmpp_resource.h              | 11 ++---
 src/xmpp/xmpp-im/xmpp_resourcelist.h          | 11 ++---
 src/xmpp/xmpp-im/xmpp_roster.h                | 12 ++---
 src/xmpp/xmpp-im/xmpp_rosteritem.h            | 11 ++---
 src/xmpp/xmpp-im/xmpp_rosterx.h               | 11 ++---
 src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp   |  7 ++-
 src/xmpp/xmpp-im/xmpp_serverinfomanager.h     |  8 +---
 src/xmpp/xmpp-im/xmpp_status.h                | 22 ++++-----
 src/xmpp/xmpp-im/xmpp_subsets.cpp             |  1 +
 src/xmpp/xmpp-im/xmpp_subsets.h               |  7 ++-
 src/xmpp/xmpp-im/xmpp_task.cpp                |  9 ++--
 src/xmpp/xmpp-im/xmpp_task.h                  |  4 +-
 src/xmpp/xmpp-im/xmpp_tasks.cpp               | 34 ++++----------
 src/xmpp/xmpp-im/xmpp_tasks.h                 | 29 ++++++------
 src/xmpp/xmpp-im/xmpp_thumbs.h                |  9 ++--
 src/xmpp/xmpp-im/xmpp_url.h                   |  7 ++-
 src/xmpp/xmpp-im/xmpp_vcard.cpp               | 10 ++--
 src/xmpp/xmpp-im/xmpp_vcard.h                 | 33 +++----------
 src/xmpp/xmpp-im/xmpp_xdata.cpp               | 11 ++---
 src/xmpp/xmpp-im/xmpp_xdata.h                 | 20 ++++----
 src/xmpp/xmpp-im/xmpp_xmlcommon.cpp           | 24 ++++------
 src/xmpp/xmpp-im/xmpp_xmlcommon.h             | 15 +++---
 src/xmpp/zlib/common.h                        |  2 +-
 src/xmpp/zlib/zlibcompressor.cpp              |  8 ++--
 src/xmpp/zlib/zlibcompressor.h                |  6 +--
 src/xmpp/zlib/zlibdecompressor.cpp            |  8 ++--
 src/xmpp/zlib/zlibdecompressor.h              |  6 +--
 tools/nettool/main.cpp                        | 14 +++---
 tools/xmpptest/xmpptest.cpp                   | 32 ++++++-------
 235 files changed, 1018 insertions(+), 1429 deletions(-)

diff --git a/COPYING b/COPYING
index 5ab7695a..732811e4 100644
--- a/COPYING
+++ b/COPYING
@@ -500,5 +500,3 @@ necessary.  Here is a sample; alter the names:
   Ty Coon, President of Vice
 
 That's all there is to it!
-
-
diff --git a/cmake/modules/FindIDN.cmake b/cmake/modules/FindIDN.cmake
index ea3a9133..5fbe937a 100644
--- a/cmake/modules/FindIDN.cmake
+++ b/cmake/modules/FindIDN.cmake
@@ -1,5 +1,5 @@
 #=============================================================================
-# Copyright 2016-2017 Psi+ Project, Vitaly Tonkacheyev
+# Copyright (C) 2016-2017  Psi+ Project, Vitaly Tonkacheyev
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/cmake/modules/FindQJDns.cmake b/cmake/modules/FindQJDns.cmake
index 1b2359fd..77568649 100644
--- a/cmake/modules/FindQJDns.cmake
+++ b/cmake/modules/FindQJDns.cmake
@@ -1,5 +1,5 @@
 #=============================================================================
-# Copyright 2016-2017 Psi+ Project
+# Copyright (C) 2016-2017  Psi+ Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/cmake/modules/FindQca.cmake b/cmake/modules/FindQca.cmake
index a82ada09..17e5a14a 100644
--- a/cmake/modules/FindQca.cmake
+++ b/cmake/modules/FindQca.cmake
@@ -1,5 +1,5 @@
 #=============================================================================
-# Copyright 2016-2017 Psi+ Project, Vitaly Tonkacheyev
+# Copyright (C) 2016-2017  Psi+ Project, Vitaly Tonkacheyev
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/configure b/configure
index af0fcd87..d76a9b55 100755
--- a/configure
+++ b/configure
@@ -257,7 +257,6 @@ while [ $# -gt 0 ]; do
 	esac
 done
 
-
 echo "Configuring Iris ..."
 
 if [ "$QC_VERBOSE" = "Y" ]; then
@@ -1384,9 +1383,9 @@ preserved.
 
 #include "conf4.h"
 
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <limits.h>
 #ifndef PATH_MAX
 # ifdef Q_OS_WIN
 #  define PATH_MAX 260
@@ -1658,7 +1657,6 @@ QString qc_escapeArg(const QString &str)
 	return out;
 }
 
-
 QString qc_trim_char(const QString &s, const QChar &ch)
 {
 	if (s.startsWith(ch) && s.endsWith(ch)) {
@@ -2495,7 +2493,6 @@ DESTDIR  = \$\$PWD
 HEADERS += conf4.h
 SOURCES += conf4.cpp
 
-
 DEFINES += HAVE_MODULES
 
 greaterThan(QT_MAJOR_VERSION, 4):CONFIG += c++11
diff --git a/src/irisnet/appledns/appledns.cpp b/src/irisnet/appledns/appledns.cpp
index f0f054ba..e08d8e66 100644
--- a/src/irisnet/appledns/appledns.cpp
+++ b/src/irisnet/appledns/appledns.cpp
@@ -17,13 +17,11 @@
  */
 
 #include "irisnetplugin.h"
+#include "qdnssd.h"
 
 #include <QtCore>
 #include <QtNetwork>
-#include "qdnssd.h"
-
-// for ntohl
-#ifdef Q_OS_WIN
+#ifdef Q_OS_WIN // for ntohl
 # include <windows.h>
 #else
 # include <netinet/in.h>
@@ -152,7 +150,6 @@ static XMPP::NameRecord importQDnsSdRecord(const QDnsSd::Record &in)
 }
 
 namespace {
-
 class QDnsSdDelegate
 {
 public:
@@ -227,7 +224,7 @@ class IdManager
     }
 };
 
-}
+} // namespace
 
 //----------------------------------------------------------------------------
 // AppleProvider
diff --git a/src/irisnet/appledns/qdnssd.cpp b/src/irisnet/appledns/qdnssd.cpp
index 9be138e2..75a0d39f 100644
--- a/src/irisnet/appledns/qdnssd.cpp
+++ b/src/irisnet/appledns/qdnssd.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007,2008  Justin Karneges
+ * Copyright (C) 2007-2008  Justin Karneges
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -18,22 +18,18 @@
 
 #include "qdnssd.h"
 
+#include "dns_sd.h"
+
 #include <QtCore>
 #include <stdio.h>
-
-// for ntohs
-#ifdef Q_OS_WIN
+#ifdef Q_OS_WIN // for ntohs
 # include <windows.h>
 #else
 # include <netinet/in.h>
 #endif
 
-#include "dns_sd.h"
-
 namespace {
-
 // safeobj stuff, from qca
-
 void releaseAndDeleteLater(QObject *owner, QObject *obj)
 {
     obj->disconnect(owner);
@@ -210,7 +206,7 @@ class IdManager
     }
 };
 
-}
+} // namespace
 
 //----------------------------------------------------------------------------
 // QDnsSd
diff --git a/src/irisnet/appledns/qdnssd.h b/src/irisnet/appledns/qdnssd.h
index 6edb3bd6..7996cd51 100644
--- a/src/irisnet/appledns/qdnssd.h
+++ b/src/irisnet/appledns/qdnssd.h
@@ -19,9 +19,9 @@
 #ifndef QDNSSD_H
 #define QDNSSD_H
 
-#include <QObject>
 #include <QByteArray>
 #include <QList>
+#include <QObject>
 
 // DOR-compliant
 class QDnsSd : public QObject
@@ -156,4 +156,4 @@ class QDnsSd : public QObject
     Private *d;
 };
 
-#endif
+#endif // QDNSSD_H
diff --git a/src/irisnet/appledns/sdtest.cpp b/src/irisnet/appledns/sdtest.cpp
index 5a69fe02..b60c6223 100644
--- a/src/irisnet/appledns/sdtest.cpp
+++ b/src/irisnet/appledns/sdtest.cpp
@@ -16,12 +16,11 @@
  *
  */
 
-#include <QtCore>
-#include <QHostAddress>
 #include "qdnssd.h"
 
-// for ntohl
-#ifdef Q_OS_WIN
+#include <QHostAddress>
+#include <QtCore>
+#ifdef Q_OS_WIN // for ntohl
 # include <windows.h>
 #else
 # include <netinet/in.h>
diff --git a/src/irisnet/corelib/addressresolver.cpp b/src/irisnet/corelib/addressresolver.cpp
index cc2e1b1c..d43f1dd4 100644
--- a/src/irisnet/corelib/addressresolver.cpp
+++ b/src/irisnet/corelib/addressresolver.cpp
@@ -18,11 +18,10 @@
 
 #include "addressresolver.h"
 
-#include "objectsession.h"
 #include "netnames.h"
+#include "objectsession.h"
 
 namespace XMPP {
-
 class AddressResolver::Private : public QObject
 {
     Q_OBJECT
@@ -207,6 +206,6 @@ void AddressResolver::stop()
     d->stop();
 }
 
-}
+} // namespace XMPP
 
 #include "addressresolver.moc"
diff --git a/src/irisnet/corelib/addressresolver.h b/src/irisnet/corelib/addressresolver.h
index 8d419820..39d1bee9 100644
--- a/src/irisnet/corelib/addressresolver.h
+++ b/src/irisnet/corelib/addressresolver.h
@@ -19,11 +19,10 @@
 #ifndef ADDRESSRESOLVER_H
 #define ADDRESSRESOLVER_H
 
-#include <QObject>
 #include <QHostAddress>
+#include <QObject>
 
 namespace XMPP {
-
 // resolve both AAAA and A for a hostname
 class AddressResolver : public QObject
 {
@@ -50,7 +49,6 @@ class AddressResolver : public QObject
     friend class Private;
     Private *d;
 };
+} // namespace XMPP
 
-}
-
-#endif
+#endif // ADDRESSRESOLVER_H
diff --git a/src/irisnet/corelib/irisnetexport.h b/src/irisnet/corelib/irisnetexport.h
index 55f2226b..3eaf4970 100644
--- a/src/irisnet/corelib/irisnetexport.h
+++ b/src/irisnet/corelib/irisnetexport.h
@@ -31,4 +31,4 @@
 # endif
 #endif
 
-#endif
+#endif // IRISNETEXPORT_H
diff --git a/src/irisnet/corelib/irisnetglobal.cpp b/src/irisnet/corelib/irisnetglobal.cpp
index bc10deb8..848b262d 100644
--- a/src/irisnet/corelib/irisnetglobal.cpp
+++ b/src/irisnet/corelib/irisnetglobal.cpp
@@ -17,11 +17,9 @@
  */
 
 #include "irisnetglobal_p.h"
-
 #include "irisnetplugin.h"
 
 namespace XMPP {
-
 // built-in providers
 extern IrisNetProvider *irisnet_createQtNetProvider();
 #ifdef Q_OS_UNIX
@@ -304,4 +302,4 @@ QList<IrisNetProvider*> irisNetProviders()
     return global->pluginManager.providers;
 }
 
-}
+} // namespace XMPP
diff --git a/src/irisnet/corelib/irisnetglobal.h b/src/irisnet/corelib/irisnetglobal.h
index 9aae0198..8d62337e 100644
--- a/src/irisnet/corelib/irisnetglobal.h
+++ b/src/irisnet/corelib/irisnetglobal.h
@@ -19,19 +19,17 @@
 #ifndef IRISNETGLOBAL_H
 #define IRISNETGLOBAL_H
 
+#include "irisnetexport.h"
+
 #include <QtCore>
 #include <QtNetwork>
-#include "irisnetexport.h"
 
 namespace XMPP {
-
 // set the directories for plugins.  call before doing anything else.
 IRISNET_EXPORT void irisNetSetPluginPaths(const QStringList &paths);
-
 // free any shared data and plugins.
 // note: this is automatically called when qapp shuts down.
 IRISNET_EXPORT void irisNetCleanup();
+} // namespace XMPP
 
-}
-
-#endif
+#endif // IRISNETGLOBAL_H
diff --git a/src/irisnet/corelib/irisnetglobal_p.h b/src/irisnet/corelib/irisnetglobal_p.h
index 4b9d070e..2864627e 100644
--- a/src/irisnet/corelib/irisnetglobal_p.h
+++ b/src/irisnet/corelib/irisnetglobal_p.h
@@ -23,12 +23,10 @@
 #include "irisnetplugin.h"
 
 namespace XMPP {
-
 typedef void (*IrisNetCleanUpFunction)();
 
 IRISNET_EXPORT void irisNetAddPostRoutine(IrisNetCleanUpFunction func);
 IRISNET_EXPORT QList<IrisNetProvider*> irisNetProviders();
+} // namespace XMPP
 
-}
-
-#endif
+#endif // IRISNETGLOBAL_P_H
diff --git a/src/irisnet/corelib/irisnetplugin.cpp b/src/irisnet/corelib/irisnetplugin.cpp
index ead49f5e..6e1faaae 100644
--- a/src/irisnet/corelib/irisnetplugin.cpp
+++ b/src/irisnet/corelib/irisnetplugin.cpp
@@ -19,7 +19,6 @@
 #include "irisnetplugin.h"
 
 namespace XMPP {
-
 //----------------------------------------------------------------------------
 // IrisNetProvider
 //----------------------------------------------------------------------------
@@ -84,4 +83,4 @@ void NameProvider::resolve_localError(int id, XMPP::NameResolver::Error e)
     Q_UNUSED(e);
 }
 
-}
+} // namespace XMPP
diff --git a/src/irisnet/corelib/irisnetplugin.h b/src/irisnet/corelib/irisnetplugin.h
index 97274c21..5005129c 100644
--- a/src/irisnet/corelib/irisnetplugin.h
+++ b/src/irisnet/corelib/irisnetplugin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006,2008  Justin Karneges
+ * Copyright (C) 2006-2008  Justin Karneges
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,16 +20,15 @@
 #define IRISNETPLUGIN_H
 
 #include "irisnetglobal.h"
-#include "netinterface.h"
 #include "netavailability.h"
+#include "netinterface.h"
 #include "netnames.h"
 
 namespace XMPP {
-
-class NetInterfaceProvider;
-class NetGatewayProvider;
-class NetAvailabilityProvider;
 class NameProvider;
+class NetAvailabilityProvider;
+class NetGatewayProvider;
+class NetInterfaceProvider;
 class ServiceProvider;
 
 class IRISNET_EXPORT IrisNetProvider : public QObject
@@ -191,8 +190,7 @@ class IRISNET_EXPORT ServiceProvider : public QObject
     void publish_extra_published(int id);
     void publish_extra_error(int id, XMPP::ServiceLocalPublisher::Error e);
 };
-
-}
+} // namespace XMPP
 
 Q_DECLARE_INTERFACE(XMPP::NetGatewayProvider,   "com.affinix.irisnet.IrisGatewayProvider/1.0")
 Q_DECLARE_INTERFACE(XMPP::IrisNetProvider,      "com.affinix.irisnet.IrisNetProvider/1.0")
@@ -200,4 +198,4 @@ Q_DECLARE_INTERFACE(XMPP::NetInterfaceProvider, "com.affinix.irisnet.NetInterfac
 Q_DECLARE_INTERFACE(XMPP::NameProvider,         "com.affinix.irisnet.NameProvider/1.0")
 Q_DECLARE_INTERFACE(XMPP::ServiceProvider,      "com.affinix.irisnet.ServiceProvider/1.0")
 
-#endif
+#endif // IRISNETPLUGIN_H
diff --git a/src/irisnet/corelib/netavailability.cpp b/src/irisnet/corelib/netavailability.cpp
index 7c5db6ed..782e3c68 100644
--- a/src/irisnet/corelib/netavailability.cpp
+++ b/src/irisnet/corelib/netavailability.cpp
@@ -19,7 +19,6 @@
 #include "netavailability.h"
 
 namespace XMPP {
-
 class NetAvailability::Private : public QObject
 {
     Q_OBJECT
@@ -51,6 +50,6 @@ bool NetAvailability::isAvailable() const
     return true;
 }
 
-}
+} // namespace XMPP
 
 #include "netavailability.moc"
diff --git a/src/irisnet/corelib/netavailability.h b/src/irisnet/corelib/netavailability.h
index ad4e2b6e..884957a6 100644
--- a/src/irisnet/corelib/netavailability.h
+++ b/src/irisnet/corelib/netavailability.h
@@ -22,7 +22,6 @@
 #include "irisnetglobal.h"
 
 namespace XMPP {
-
 class NetAvailability : public QObject
 {
     Q_OBJECT
@@ -41,7 +40,6 @@ class NetAvailability : public QObject
     friend class Private;
     Private *d;
 };
+} // namespace XMPP
 
-}
-
-#endif
+#endif // NETAVAILABILITY_H
diff --git a/src/irisnet/corelib/netinterface.cpp b/src/irisnet/corelib/netinterface.cpp
index 79dc04f2..17564818 100644
--- a/src/irisnet/corelib/netinterface.cpp
+++ b/src/irisnet/corelib/netinterface.cpp
@@ -18,15 +18,14 @@
 
 #include "netinterface.h"
 
-#include "irisnetplugin.h"
 #include "irisnetglobal_p.h"
+#include "irisnetplugin.h"
 
-#include <QWaitCondition>
-#include <QPointer>
 #include <QDebug>
+#include <QPointer>
+#include <QWaitCondition>
 
 namespace XMPP {
-
 //----------------------------------------------------------------------------
 // NetTracker
 //----------------------------------------------------------------------------
@@ -59,12 +58,10 @@ class NetTracker : public QObject {
         delete c;
     }
 
-
 signals:
     void updated();
 private:
 
-
     static QList<NetInterfaceProvider::Info> filterList(const QList<NetInterfaceProvider::Info> &in) {
         QList<NetInterfaceProvider::Info> out;
         for(int n = 0; n < in.count(); ++n)
@@ -83,7 +80,6 @@ private slots:
         emit updated();
     }
 
-
 private:
     // this are all protected by m
     NetInterfaceProvider *c;
@@ -92,7 +88,6 @@ private slots:
 
 };
 
-
 // Global because static getRef needs this too.
 Q_GLOBAL_STATIC(QMutex, nettracker_mutex)
 
@@ -131,12 +126,10 @@ class NetTrackerThread : public QThread {
         return nettracker->getInterfaces();
     }
 
-
     ~NetTrackerThread() {
         // locked from caller
     }
 
-
 signals:
     void updated();
 private:
@@ -179,7 +172,6 @@ class NetTrackerThread : public QThread {
 
 NetTrackerThread *NetTrackerThread::self = nullptr;
 
-
 //----------------------------------------------------------------------------
 // NetInterface
 //----------------------------------------------------------------------------
@@ -408,7 +400,6 @@ void NetInterfaceManager::unreg(NetInterface *i)
 {
     d->listeners.removeAll(i);
 }
-
-}
+} // namespace XMPP
 
 #include "netinterface.moc"
diff --git a/src/irisnet/corelib/netinterface.h b/src/irisnet/corelib/netinterface.h
index 05fa8eb1..1d1e7b4a 100644
--- a/src/irisnet/corelib/netinterface.h
+++ b/src/irisnet/corelib/netinterface.h
@@ -22,10 +22,9 @@
 #include "irisnetglobal.h"
 
 namespace XMPP {
-
 class NetInterfaceManager;
-class NetInterfacePrivate;
 class NetInterfaceManagerPrivate;
+class NetInterfacePrivate;
 
 /**
    \brief Provides information about a network interface
@@ -196,7 +195,6 @@ QString iface = NetInterfaceManager::interfaceForAddress(tcpSocket->localAddress
     void *reg(const QString &id, NetInterface *i);
     void unreg(NetInterface *i);
 };
+} // namespace XMPP
 
-}
-
-#endif
+#endif // NETINTERFACE_H
diff --git a/src/irisnet/corelib/netinterface_qtname.cpp b/src/irisnet/corelib/netinterface_qtname.cpp
index f217aef8..ddfcc931 100644
--- a/src/irisnet/corelib/netinterface_qtname.cpp
+++ b/src/irisnet/corelib/netinterface_qtname.cpp
@@ -21,7 +21,6 @@
 #include <QNetworkInterface>
 
 namespace XMPP {
-
 class IrisQtName : public NameProvider
 {
     Q_OBJECT
@@ -231,7 +230,6 @@ IrisNetProvider *irisnet_createQtNameProvider()
 {
     return new IrisQtNameProvider;
 }
-
-}
+} // namespace XMPP
 
 #include "netinterface_qtname.moc"
diff --git a/src/irisnet/corelib/netinterface_qtnet.cpp b/src/irisnet/corelib/netinterface_qtnet.cpp
index dc3730da..f33079a4 100644
--- a/src/irisnet/corelib/netinterface_qtnet.cpp
+++ b/src/irisnet/corelib/netinterface_qtnet.cpp
@@ -21,7 +21,6 @@
 #include <QNetworkInterface>
 
 namespace XMPP {
-
 class IrisQtNet : public NetInterfaceProvider
 {
     Q_OBJECT
@@ -88,7 +87,6 @@ IrisNetProvider *irisnet_createQtNetProvider()
 {
     return new IrisQtNetProvider;
 }
-
-}
+} // namespace XMPP
 
 #include "netinterface_qtnet.moc"
diff --git a/src/irisnet/corelib/netinterface_unix.cpp b/src/irisnet/corelib/netinterface_unix.cpp
index 706d6d30..8cb5765a 100644
--- a/src/irisnet/corelib/netinterface_unix.cpp
+++ b/src/irisnet/corelib/netinterface_unix.cpp
@@ -24,19 +24,17 @@
 
 #include "irisnetplugin.h"
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
+#include <errno.h>
 #include <net/if.h>
 #include <net/route.h>
 #include <netinet/in.h>
-#include <errno.h>
-#include <unistd.h>
-
-// for solaris
-#ifndef SIOCGIFCONF
-# include<sys/sockio.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#ifndef SIOCGIFCONF // for solaris
+# include <sys/sockio.h>
 #endif
+#include <sys/types.h>
+#include <unistd.h>
 
 #ifdef Q_OS_LINUX
 static QStringList read_proc_as_lines(const char *procfile)
@@ -172,7 +170,6 @@ static QList<XMPP::NetGatewayProvider::Info> get_unix_gateways()
 }
 
 namespace XMPP {
-
 class UnixGateway : public NetGatewayProvider
 {
     Q_OBJECT
@@ -226,7 +223,6 @@ IrisNetProvider *irisnet_createUnixNetProvider()
 {
     return new UnixNetProvider;
 }
-
-}
+} // namespace XMPP
 
 #include "netinterface_unix.moc"
diff --git a/src/irisnet/corelib/netnames.cpp b/src/irisnet/corelib/netnames.cpp
index 97fbd20f..c44da895 100644
--- a/src/irisnet/corelib/netnames.cpp
+++ b/src/irisnet/corelib/netnames.cpp
@@ -19,23 +19,19 @@
 
 #include "netnames.h"
 
-#include <limits>
-
-//#include <idna.h>
-#include "irisnetplugin.h"
-#include "irisnetglobal_p.h"
 #include "addressresolver.h"
+#include "irisnetglobal_p.h"
+#include "irisnetplugin.h"
 
+//#include <idna.h>
+#include <limits>
 
 //#define NETNAMES_DEBUG
-
 #ifdef NETNAMES_DEBUG
 # define NNDEBUG (qDebug() << this << "#" << __FUNCTION__ << ":")
 #endif
 
-
 namespace XMPP {
-
 //----------------------------------------------------------------------------
 // NameRecord
 //----------------------------------------------------------------------------
@@ -501,7 +497,6 @@ class ServiceResolver::Private : public QObject
 
 };
 
-
 WeightedNameRecordList::WeightedNameRecordList()
     : currentPriorityGroup(priorityGroups.end()) /* void current state */
 {}
@@ -661,7 +656,6 @@ XMPP::WeightedNameRecordList& WeightedNameRecordList::operator<<(const XMPP::Nam
     return *this;
 }
 
-
 QDebug operator<<(QDebug dbg, const XMPP::WeightedNameRecordList &list) {
     dbg.nospace() << "XMPP::WeightedNameRecordList(\n";
 
@@ -680,7 +674,6 @@ QDebug operator<<(QDebug dbg, const XMPP::WeightedNameRecordList &list) {
     return dbg;
 }
 
-
 class ServiceLocalPublisher::Private
 {
 public:
@@ -1118,7 +1111,6 @@ QDebug operator<<(QDebug dbg, XMPP::NameResolver::Error e)
     return dbg;
 }
 
-
 //----------------------------------------------------------------------------
 // ServiceBrowser
 //----------------------------------------------------------------------------
@@ -1142,7 +1134,6 @@ void ServiceBrowser::stop()
 {
 }
 
-
 //----------------------------------------------------------------------------
 // ServiceResolver
 //----------------------------------------------------------------------------
@@ -1457,7 +1448,6 @@ ServiceResolver::ProtoSplit ServiceResolver::happySplit()
     return s;
 }
 
-
 //----------------------------------------------------------------------------
 // ServiceLocalPublisher
 //----------------------------------------------------------------------------
@@ -1532,7 +1522,6 @@ QByteArray NetNames::unescapeDomain(const QByteArray &in)
     Q_UNUSED(in);
     return QByteArray();
 }
-
-}
+} // namespace XMPP
 
 #include "netnames.moc"
diff --git a/src/irisnet/corelib/netnames.h b/src/irisnet/corelib/netnames.h
index 76f8bffd..f5989875 100644
--- a/src/irisnet/corelib/netnames.h
+++ b/src/irisnet/corelib/netnames.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006,2008  Justin Karneges
+ * Copyright (C) 2006-2008  Justin Karneges
  * Copyright (C) 2009-2010  Dennis Schridde
  *
  * This library is free software; you can redistribute it and/or
@@ -20,20 +20,18 @@
 #ifndef NETNAMES_H
 #define NETNAMES_H
 
+#include "irisnetglobal.h"
+
 #include <QtCore>
 #include <QtNetwork>
-
 #include <limits>
 
-#include "irisnetglobal.h"
-
 // it seems visual studio defines it somewhere
 #ifdef max
 # undef max
 #endif
 
 namespace XMPP {
-
 class NameManager;
 
 class IRISNET_EXPORT NetNames
@@ -308,7 +306,6 @@ class IRISNET_EXPORT NameRecord
 IRISNET_EXPORT QDebug operator<<(QDebug, XMPP::NameRecord::Type);
 IRISNET_EXPORT QDebug operator<<(QDebug, const XMPP::NameRecord &);
 
-
 class IRISNET_EXPORT ServiceInstance
 {
 public:
@@ -477,7 +474,6 @@ class IRISNET_EXPORT NameResolver : public QObject
 
 IRISNET_EXPORT QDebug operator<<(QDebug, XMPP::NameResolver::Error);
 
-
 class IRISNET_EXPORT WeightedNameRecordList
 {
     friend QDebug operator<<(QDebug, const WeightedNameRecordList&);
@@ -511,7 +507,6 @@ class IRISNET_EXPORT WeightedNameRecordList
 
 QDebug operator<<(QDebug, const XMPP::WeightedNameRecordList&);
 
-
 class IRISNET_EXPORT ServiceBrowser : public QObject
 {
     Q_OBJECT
@@ -542,7 +537,6 @@ class IRISNET_EXPORT ServiceBrowser : public QObject
     friend class NameManager;
 };
 
-
 /*! DNS resolver with DNS-SD/mDNS and recursive lookup support */
 /*
 Flow:
@@ -695,10 +689,8 @@ class IRISNET_EXPORT ServiceLocalPublisher : public QObject
     friend class NameManager;
 };
 
-}
-
+} // namespace XMPP
 
 Q_DECLARE_METATYPE(XMPP::NameResolver::Error)
 
-
-#endif
+#endif // NETNAMES_H
diff --git a/src/irisnet/corelib/netnames_jdns.cpp b/src/irisnet/corelib/netnames_jdns.cpp
index e1ee1a68..008eddcc 100644
--- a/src/irisnet/corelib/netnames_jdns.cpp
+++ b/src/irisnet/corelib/netnames_jdns.cpp
@@ -17,10 +17,9 @@
  */
 
 #include "irisnetplugin.h"
-
+#include "netinterface.h"
 #include "objectsession.h"
 #include "qjdnsshared.h"
-#include "netinterface.h"
 
 //#define JDNS_DEBUG
 
@@ -31,7 +30,6 @@ Q_DECLARE_METATYPE(XMPP::ServiceResolver::Error)
 Q_DECLARE_METATYPE(XMPP::ServiceLocalPublisher::Error)
 
 namespace XMPP {
-
 static NameRecord importJDNSRecord(const QJDns::Record &in)
 {
     NameRecord out;
@@ -2716,7 +2714,6 @@ IrisNetProvider *irisnet_createJDnsProvider()
 {
         return new JDnsProvider;
 }
-
-}
+} // namespace XMPP
 
 #include "netnames_jdns.moc"
diff --git a/src/irisnet/corelib/objectsession.cpp b/src/irisnet/corelib/objectsession.cpp
index ab8030d1..ad12b7e7 100644
--- a/src/irisnet/corelib/objectsession.cpp
+++ b/src/irisnet/corelib/objectsession.cpp
@@ -18,15 +18,14 @@
 
 #include "objectsession.h"
 
-#include <stdlib.h>
-#include <QList>
 #include <QByteArray>
+#include <QList>
 #include <QMetaObject>
 #include <QMetaType>
 #include <QTimer>
+#include <stdlib.h>
 
 namespace XMPP {
-
 class ObjectSessionWatcherPrivate
 {
 public:
@@ -220,7 +219,6 @@ bool ObjectSessionWatcher::isValid() const
         return false;
 }
 
-
 ObjectSession::ObjectSession(QObject *parent) :
     QObject(parent)
 {
@@ -300,7 +298,6 @@ void ObjectSession::resume()
     if(!d->pendingCalls.isEmpty())
         d->callTrigger->start();
 }
-
-}
+} // namespace XMPP
 
 #include "objectsession.moc"
diff --git a/src/irisnet/corelib/objectsession.h b/src/irisnet/corelib/objectsession.h
index 04a13b2e..427d949e 100644
--- a/src/irisnet/corelib/objectsession.h
+++ b/src/irisnet/corelib/objectsession.h
@@ -22,7 +22,6 @@
 #include <QObject>
 
 namespace XMPP {
-
 class ObjectSessionPrivate;
 class ObjectSessionWatcherPrivate;
 
@@ -81,7 +80,6 @@ class ObjectSessionWatcher
     friend class ObjectSessionPrivate;
     ObjectSessionWatcherPrivate *d;
 };
+} // namespace XMPP
 
-}
-
-#endif
+#endif // OBJECTSESSION_H
diff --git a/src/irisnet/noncore/cutestuff/bsocket.cpp b/src/irisnet/noncore/cutestuff/bsocket.cpp
index 12254aa6..cc3a2d99 100644
--- a/src/irisnet/noncore/cutestuff/bsocket.cpp
+++ b/src/irisnet/noncore/cutestuff/bsocket.cpp
@@ -18,25 +18,21 @@
  *
  */
 
-#include <QTcpSocket>
+#include "bsocket.h"
+
 #include <QHostAddress>
 #include <QMetaType>
-
+#include <QTcpSocket>
 #include <limits>
 
-#include "bsocket.h"
-
 //#define BS_DEBUG
-
 #ifdef BS_DEBUG
 # define BSDEBUG (qDebug() << this << "#" << __FUNCTION__ << ":")
 #endif
 
-
 #define READBUFSIZE 65536
 
 // CS_NAMESPACE_BEGIN
-
 class QTcpSocketSignalRelay : public QObject
 {
     Q_OBJECT
@@ -93,7 +89,6 @@ public slots:
     }
 };
 
-
 class HappyEyeballsConnector : public QObject
 {
     Q_OBJECT
@@ -158,7 +153,6 @@ class HappyEyeballsConnector : public QObject
         fallbackTimer.stop();
     }
 
-
     void connectToHost(const QHostAddress &address, quint16 port)
     {
 #ifdef BS_DEBUG
@@ -429,7 +423,6 @@ BSocket::~BSocket()
     delete d;
 }
 
-
 void BSocket::resetConnection(bool clear)
 {
 #ifdef BS_DEBUG
diff --git a/src/irisnet/noncore/cutestuff/bsocket.h b/src/irisnet/noncore/cutestuff/bsocket.h
index 21b41895..e0f59416 100644
--- a/src/irisnet/noncore/cutestuff/bsocket.h
+++ b/src/irisnet/noncore/cutestuff/bsocket.h
@@ -21,19 +21,17 @@
 #ifndef CS_BSOCKET_H
 #define CS_BSOCKET_H
 
-#include <QAbstractSocket>
-#include <limits>
-
 #include "bytestream.h"
 #include "netnames.h"
 
-class QString;
-class QObject;
+#include <QAbstractSocket>
+#include <limits>
+
 class QByteArray;
+class QObject;
+class QString;
 
 // CS_NAMESPACE_BEGIN
-
-
 /*!
     Socket with automatic hostname lookups, using SRV, AAAA and A DNS queries.
 */
@@ -98,8 +96,6 @@ private slots:
     void dns_srv_try_next();
     bool connect_host_try_next();
     void qs_connected_step2(bool signalConnected = true);
-};
-
-// CS_NAMESPACE_END
+}; // CS_NAMESPACE_END
 
-#endif
+#endif // CS_BSOCKET_H
diff --git a/src/irisnet/noncore/cutestuff/bytestream.cpp b/src/irisnet/noncore/cutestuff/bytestream.cpp
index 8602214e..b352435f 100644
--- a/src/irisnet/noncore/cutestuff/bytestream.cpp
+++ b/src/irisnet/noncore/cutestuff/bytestream.cpp
@@ -18,6 +18,7 @@
  */
 
 #include "bytestream.h"
+
 #include <QByteArray>
 
 // CS_NAMESPACE_BEGIN
diff --git a/src/irisnet/noncore/cutestuff/bytestream.h b/src/irisnet/noncore/cutestuff/bytestream.h
index 382dfe6b..2b88b429 100644
--- a/src/irisnet/noncore/cutestuff/bytestream.h
+++ b/src/irisnet/noncore/cutestuff/bytestream.h
@@ -20,13 +20,13 @@
 #ifndef CS_BYTESTREAM_H
 #define CS_BYTESTREAM_H
 
-#include <QObject>
 #include <QByteArray>
 #include <QIODevice>
+#include <QObject>
 
 class QAbstractSocket;
-// CS_NAMESPACE_BEGIN
 
+// CS_NAMESPACE_BEGIN
 // CS_EXPORT_BEGIN
 class ByteStream : public QIODevice
 {
@@ -74,7 +74,6 @@ class ByteStream : public QIODevice
 //! \endif
 };
 // CS_EXPORT_END
-
 // CS_NAMESPACE_END
 
-#endif
+#endif // CS_BYTESTREAM_H
diff --git a/src/irisnet/noncore/cutestuff/httpconnect.cpp b/src/irisnet/noncore/cutestuff/httpconnect.cpp
index de8f02ea..0bd8a8cd 100644
--- a/src/irisnet/noncore/cutestuff/httpconnect.cpp
+++ b/src/irisnet/noncore/cutestuff/httpconnect.cpp
@@ -19,20 +19,18 @@
 
 #include "httpconnect.h"
 
-#include <QStringList>
+#include "bsocket.h"
+
 #include <QByteArray>
+#include <QStringList>
 #include <QtCrypto>
 
-#include "bsocket.h"
-
 //#define PROX_DEBUG
-
 #ifdef PROX_DEBUG
 #include <stdio.h>
 #endif
 
 // CS_NAMESPACE_BEGIN
-
 #ifdef PROX_DEBUG
 QString escapeOutput(const QByteArray &in)
 {
diff --git a/src/irisnet/noncore/cutestuff/httpconnect.h b/src/irisnet/noncore/cutestuff/httpconnect.h
index 297a58c7..4039b61f 100644
--- a/src/irisnet/noncore/cutestuff/httpconnect.h
+++ b/src/irisnet/noncore/cutestuff/httpconnect.h
@@ -23,7 +23,6 @@
 #include "bytestream.h"
 
 // CS_NAMESPACE_BEGIN
-
 class HttpConnect : public ByteStream
 {
     Q_OBJECT
@@ -61,4 +60,4 @@ private slots:
 
 // CS_NAMESPACE_END
 
-#endif
+#endif // CS_HTTPCONNECT_H
diff --git a/src/irisnet/noncore/cutestuff/httppoll.cpp b/src/irisnet/noncore/cutestuff/httppoll.cpp
index 6d88a97d..572e6bfa 100644
--- a/src/irisnet/noncore/cutestuff/httppoll.cpp
+++ b/src/irisnet/noncore/cutestuff/httppoll.cpp
@@ -19,23 +19,22 @@
 
 #include "httppoll.h"
 
+#include "bsocket.h"
+
+#include <QByteArray>
 #include <QUrl>
+#include <QtCrypto>
+#include <qpointer.h>
 #include <qstringlist.h>
 #include <qtimer.h>
-#include <qpointer.h>
-#include <QtCrypto>
-#include <QByteArray>
-#include <stdlib.h>
-#include "bsocket.h"
-
 #ifdef PROX_DEBUG
-#include <stdio.h>
+#    include <stdio.h>
 #endif
+#include <stdlib.h>
 
 #define POLL_KEYS 64
 
 // CS_NAMESPACE_BEGIN
-
 static QByteArray randomArray(int size)
 {
     QByteArray a;
@@ -389,7 +388,6 @@ const QString & HttpPoll::getKey(bool *last)
     return d->key[d->key_n];
 }
 
-
 //----------------------------------------------------------------------------
 // HttpProxyPost
 //----------------------------------------------------------------------------
diff --git a/src/irisnet/noncore/cutestuff/httppoll.h b/src/irisnet/noncore/cutestuff/httppoll.h
index 53c45d1a..db10005c 100644
--- a/src/irisnet/noncore/cutestuff/httppoll.h
+++ b/src/irisnet/noncore/cutestuff/httppoll.h
@@ -25,7 +25,6 @@
 class QUrl;
 
 // CS_NAMESPACE_BEGIN
-
 class HttpPoll : public ByteStream
 {
     Q_OBJECT
@@ -150,4 +149,4 @@ private slots:
 
 // CS_NAMESPACE_END
 
-#endif
+#endif // CS_HTTPPOLL_H
diff --git a/src/irisnet/noncore/cutestuff/socks.cpp b/src/irisnet/noncore/cutestuff/socks.cpp
index faef4509..41ad6b33 100644
--- a/src/irisnet/noncore/cutestuff/socks.cpp
+++ b/src/irisnet/noncore/cutestuff/socks.cpp
@@ -19,33 +19,29 @@
 
 #include "socks.h"
 
+#include "bsocket.h"
+
+#include <QByteArray>
 #include <QHostAddress>
-#include <QStringList>
-#include <QTimer>
 #include <QPointer>
 #include <QSocketNotifier>
-#include <QByteArray>
-
-#ifdef Q_OS_UNIX
-#include <sys/types.h>
-#include <netinet/in.h>
-#endif
+#include <QStringList>
+#include <QTimer>
 
-#ifdef Q_OS_WIN32
-#include <windows.h>
+//#define PROX_DEBUG
+#ifdef PROX_DEBUG
+#include <stdio.h>
 #endif
 
 #ifdef Q_OS_UNIX
-#include <unistd.h>
 #include <fcntl.h>
+#include <netinet/in.h>
+#include <sys/types.h>
+#include <unistd.h>
 #endif
 
-#include "bsocket.h"
-
-//#define PROX_DEBUG
-
-#ifdef PROX_DEBUG
-#include <stdio.h>
+#ifdef Q_OS_WIN32
+#include <windows.h>
 #endif
 
 // CS_NAMESPACE_BEGIN
diff --git a/src/irisnet/noncore/cutestuff/socks.h b/src/irisnet/noncore/cutestuff/socks.h
index d07d6c4a..8605e7fd 100644
--- a/src/irisnet/noncore/cutestuff/socks.h
+++ b/src/irisnet/noncore/cutestuff/socks.h
@@ -23,10 +23,9 @@
 #include "bytestream.h"
 
 // CS_NAMESPACE_BEGIN
-
 class QHostAddress;
-class QTcpSocket;
 class QTcpServer;
+class QTcpSocket;
 class SocksClient;
 class SocksServer;
 
@@ -162,4 +161,4 @@ private slots:
 
 // CS_NAMESPACE_END
 
-#endif
+#endif // CS_SOCKS_H
diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index a4cbe59f..079eb239 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009,2010  Barracuda Networks, Inc.
+ * Copyright (C) 2009-2010  Barracuda Networks, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -18,20 +18,20 @@
 
 #include "ice176.h"
 
+#include "icecomponent.h"
+#include "icelocaltransport.h"
+#include "iceturntransport.h"
+#include "stunbinding.h"
+#include "stunmessage.h"
+#include "stuntransaction.h"
+#include "udpportreserver.h"
+
 #include <QSet>
 #include <QTimer>
 #include <QUdpSocket>
 #include <QtCrypto>
-#include "stuntransaction.h"
-#include "stunbinding.h"
-#include "stunmessage.h"
-#include "udpportreserver.h"
-#include "icelocaltransport.h"
-#include "iceturntransport.h"
-#include "icecomponent.h"
 
 namespace XMPP {
-
 enum
 {
     Direct,
@@ -1339,6 +1339,6 @@ bool Ice176::isIPv6LinkLocalAddress(const QHostAddress &addr)
         return false;
 }
 
-}
+} // namespace XMPP
 
 #include "ice176.moc"
diff --git a/src/irisnet/noncore/ice176.h b/src/irisnet/noncore/ice176.h
index 159f908e..4a9c5ef7 100644
--- a/src/irisnet/noncore/ice176.h
+++ b/src/irisnet/noncore/ice176.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009,2010  Barracuda Networks, Inc.
+ * Copyright (C) 2009-2010  Barracuda Networks, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,17 +19,17 @@
 #ifndef ICE176_H
 #define ICE176_H
 
+#include "turnclient.h"
+
+#include <QHostAddress>
 #include <QObject>
 #include <QString>
-#include <QHostAddress>
-#include "turnclient.h"
 
 namespace QCA {
     class SecureArray;
 }
 
 namespace XMPP {
-
 class UdpPortReserver;
 
 class Ice176 : public QObject
@@ -181,7 +181,6 @@ class Ice176 : public QObject
     friend class Private;
     Private *d;
 };
+} // namespace XMPP
 
-}
-
-#endif
+#endif // ICE176_H
diff --git a/src/irisnet/noncore/icecomponent.cpp b/src/irisnet/noncore/icecomponent.cpp
index cbd873d4..b8aa609b 100644
--- a/src/irisnet/noncore/icecomponent.cpp
+++ b/src/irisnet/noncore/icecomponent.cpp
@@ -18,16 +18,16 @@
 
 #include "icecomponent.h"
 
-#include <stdlib.h>
-#include <QUdpSocket>
-#include <QtCrypto>
-#include "objectsession.h"
-#include "udpportreserver.h"
 #include "icelocaltransport.h"
 #include "iceturntransport.h"
+#include "objectsession.h"
+#include "udpportreserver.h"
 
-namespace XMPP {
+#include <QUdpSocket>
+#include <QtCrypto>
+#include <stdlib.h>
 
+namespace XMPP {
 static int calc_priority(int typePref, int localPref, int componentId)
 {
     Q_ASSERT(typePref >= 0 && typePref <= 126);
@@ -1055,6 +1055,6 @@ void IceComponent::setDebugLevel(DebugLevel level)
         d->tt->setDebugLevel((IceTransport::DebugLevel)level);
 }
 
-}
+} // namespace XMPP
 
 #include "icecomponent.moc"
diff --git a/src/irisnet/noncore/icecomponent.h b/src/irisnet/noncore/icecomponent.h
index 215cc478..b31b58b7 100644
--- a/src/irisnet/noncore/icecomponent.h
+++ b/src/irisnet/noncore/icecomponent.h
@@ -19,15 +19,15 @@
 #ifndef ICECOMPONENT_H
 #define ICECOMPONENT_H
 
-#include <QList>
-#include "turnclient.h"
-#include "icetransport.h"
 #include "ice176.h"
+#include "icetransport.h"
+#include "turnclient.h"
+
+#include <QList>
 
 class QUdpSocket;
 
 namespace XMPP {
-
 class UdpPortReserver;
 
 class IceComponent : public QObject
@@ -180,7 +180,6 @@ inline uint qHash(const XMPP::IceComponent::TransportAddress &key, uint seed = 0
 {
     return ::qHash(key.addr, seed) ^ ::qHash(key.port, seed);
 }
-
 } //namespace XMPP
 
-#endif
+#endif // ICECOMPONENT_H
diff --git a/src/irisnet/noncore/icelocaltransport.cpp b/src/irisnet/noncore/icelocaltransport.cpp
index 28ff5e3f..53e009c4 100644
--- a/src/irisnet/noncore/icelocaltransport.cpp
+++ b/src/irisnet/noncore/icelocaltransport.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009,2010  Barracuda Networks, Inc.
+ * Copyright (C) 2009-2010  Barracuda Networks, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -18,21 +18,21 @@
 
 #include "icelocaltransport.h"
 
-#include <QHostAddress>
-#include <QUdpSocket>
-#include <QtCrypto>
 #include "objectsession.h"
+#include "stunallocate.h"
+#include "stunbinding.h"
 #include "stunmessage.h"
 #include "stuntransaction.h"
-#include "stunbinding.h"
-#include "stunallocate.h"
 #include "turnclient.h"
 
+#include <QHostAddress>
+#include <QUdpSocket>
+#include <QtCrypto>
+
 // don't queue more incoming packets than this per transmit path
 #define MAX_PACKET_QUEUE 64
 
 namespace XMPP {
-
 enum
 {
     Direct,
@@ -881,6 +881,6 @@ void IceLocalTransport::setDebugLevel(DebugLevel level)
         d->turn->setDebugLevel((TurnClient::DebugLevel)level);
 }
 
-}
+} // namespace XMPP
 
 #include "icelocaltransport.moc"
diff --git a/src/irisnet/noncore/icelocaltransport.h b/src/irisnet/noncore/icelocaltransport.h
index 0e571bf9..05738c40 100644
--- a/src/irisnet/noncore/icelocaltransport.h
+++ b/src/irisnet/noncore/icelocaltransport.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009,2010  Barracuda Networks, Inc.
+ * Copyright (C) 2009-2010  Barracuda Networks, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,10 +19,11 @@
 #ifndef ICELOCALTRANSPORT_H
 #define ICELOCALTRANSPORT_H
 
-#include <QObject>
-#include <QByteArray>
 #include "icetransport.h"
 
+#include <QByteArray>
+#include <QObject>
+
 class QHostAddress;
 class QUdpSocket;
 
@@ -31,7 +32,6 @@ namespace QCA {
 }
 
 namespace XMPP {
-
 // this class manages a single port on a single interface, including the
 //   relationship with an associated STUN/TURN server.  if TURN is used, this
 //   class offers two paths (0=direct and 1=relayed), otherwise it offers
@@ -95,7 +95,6 @@ class IceLocalTransport : public IceTransport
     friend class Private;
     Private *d;
 };
+} // namespace XMPP
 
-}
-
-#endif
+#endif // ICELOCALTRANSPORT_H
diff --git a/src/irisnet/noncore/icetransport.cpp b/src/irisnet/noncore/icetransport.cpp
index 1a512d73..4c7825ee 100644
--- a/src/irisnet/noncore/icetransport.cpp
+++ b/src/irisnet/noncore/icetransport.cpp
@@ -19,7 +19,6 @@
 #include "icetransport.h"
 
 namespace XMPP {
-
 IceTransport::IceTransport(QObject *parent) :
     QObject(parent)
 {
@@ -29,4 +28,4 @@ IceTransport::~IceTransport()
 {
 }
 
-}
+} // namespace XMPP
diff --git a/src/irisnet/noncore/icetransport.h b/src/irisnet/noncore/icetransport.h
index be673e95..97dfe6de 100644
--- a/src/irisnet/noncore/icetransport.h
+++ b/src/irisnet/noncore/icetransport.h
@@ -19,13 +19,12 @@
 #ifndef ICETRANSPORT_H
 #define ICETRANSPORT_H
 
-#include <QObject>
 #include <QByteArray>
+#include <QObject>
 
 class QHostAddress;
 
 namespace XMPP {
-
 class IceTransport : public QObject
 {
     Q_OBJECT
@@ -67,7 +66,6 @@ class IceTransport : public QObject
     // not DOR-SS/DS safe
     void debugLine(const QString &str);
 };
+} // namespace XMPP
 
-}
-
-#endif
+#endif // ICETRANSPORT_H
diff --git a/src/irisnet/noncore/iceturntransport.cpp b/src/irisnet/noncore/iceturntransport.cpp
index 37c1027e..e46f5467 100644
--- a/src/irisnet/noncore/iceturntransport.cpp
+++ b/src/irisnet/noncore/iceturntransport.cpp
@@ -18,11 +18,11 @@
 
 #include "iceturntransport.h"
 
-#include <QtCrypto>
 #include "stunallocate.h"
 
-namespace XMPP {
+#include <QtCrypto>
 
+namespace XMPP {
 class IceTurnTransport::Private : public QObject
 {
     Q_OBJECT
@@ -244,6 +244,6 @@ void IceTurnTransport::setDebugLevel(DebugLevel level)
     d->turn.setDebugLevel((TurnClient::DebugLevel)level);
 }
 
-}
+} // namespace XMPP
 
 #include "iceturntransport.moc"
diff --git a/src/irisnet/noncore/iceturntransport.h b/src/irisnet/noncore/iceturntransport.h
index 32f344d8..98604cb1 100644
--- a/src/irisnet/noncore/iceturntransport.h
+++ b/src/irisnet/noncore/iceturntransport.h
@@ -19,16 +19,15 @@
 #ifndef ICETURNTRANSPORT_H
 #define ICETURNTRANSPORT_H
 
-#include <QObject>
+#include "icetransport.h"
+#include "turnclient.h"
+
 #include <QByteArray>
 #include <QHostAddress>
-#include "turnclient.h"
-#include "icetransport.h"
+#include <QObject>
 
 namespace XMPP {
-
 // for the turn transport, only path 0 is used
-
 class IceTurnTransport : public IceTransport
 {
     Q_OBJECT
@@ -70,7 +69,6 @@ class IceTurnTransport : public IceTransport
     friend class Private;
     Private *d;
 };
+} // namespace XMPP
 
-}
-
-#endif
+#endif // ICETURNTRANSPORT_H
diff --git a/src/irisnet/noncore/legacy/ndns.cpp b/src/irisnet/noncore/legacy/ndns.cpp
index 5a68a8c4..7ae585bc 100644
--- a/src/irisnet/noncore/legacy/ndns.cpp
+++ b/src/irisnet/noncore/legacy/ndns.cpp
@@ -1,6 +1,6 @@
 /*
  * ndns.cpp - native DNS resolution
- * Copyright (C) 2001, 2002  Justin Karneges
+ * Copyright (C) 2001-2002  Justin Karneges
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/irisnet/noncore/legacy/ndns.h b/src/irisnet/noncore/legacy/ndns.h
index 46561faa..2b8a3d86 100644
--- a/src/irisnet/noncore/legacy/ndns.h
+++ b/src/irisnet/noncore/legacy/ndns.h
@@ -1,6 +1,6 @@
 /*
  * ndns.h - native DNS resolution
- * Copyright (C) 2001, 2002  Justin Karneges
+ * Copyright (C) 2001-2002  Justin Karneges
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,12 +20,12 @@
 #ifndef CS_NDNS_H
 #define CS_NDNS_H
 
+#include "netnames.h"
+
 #include <QtCore>
 #include <QtNetwork>
-#include "netnames.h"
 
 // CS_NAMESPACE_BEGIN
-
 class NDns : public QObject
 {
     Q_OBJECT
@@ -55,4 +55,4 @@ private slots:
 
 // CS_NAMESPACE_END
 
-#endif
+#endif // CS_NDNS_H
diff --git a/src/irisnet/noncore/legacy/srvresolver.cpp b/src/irisnet/noncore/legacy/srvresolver.cpp
index f3d747df..16ae25bd 100644
--- a/src/irisnet/noncore/legacy/srvresolver.cpp
+++ b/src/irisnet/noncore/legacy/srvresolver.cpp
@@ -24,7 +24,6 @@
 #endif
 
 // CS_NAMESPACE_BEGIN
-
 static void sortSRVList(QList<Q3Dns::Server> &list)
 {
     QList<Q3Dns::Server> tmp = list;
diff --git a/src/irisnet/noncore/legacy/srvresolver.h b/src/irisnet/noncore/legacy/srvresolver.h
index f350677b..ecca77e5 100644
--- a/src/irisnet/noncore/legacy/srvresolver.h
+++ b/src/irisnet/noncore/legacy/srvresolver.h
@@ -20,12 +20,12 @@
 #ifndef CS_SRVRESOLVER_H
 #define CS_SRVRESOLVER_H
 
+#include "netnames.h"
+
 #include <QtCore>
 #include <QtNetwork>
-#include "netnames.h"
 
 // CS_NAMESPACE_BEGIN
-
 class Q3Dns
 {
 public:
@@ -79,4 +79,4 @@ private slots:
 
 // CS_NAMESPACE_END
 
-#endif
+#endif // CS_SRVRESOLVER_H
diff --git a/src/irisnet/noncore/processquit.cpp b/src/irisnet/noncore/processquit.cpp
index 8560b503..6c05f2ba 100644
--- a/src/irisnet/noncore/processquit.cpp
+++ b/src/irisnet/noncore/processquit.cpp
@@ -25,20 +25,16 @@
 #ifdef QT_GUI_LIB
 # include <QApplication>
 #endif
-
-#ifdef Q_OS_WIN
-# include <windows.h>
-#endif
-
 #ifdef Q_OS_UNIX
 # include <signal.h>
 # include <unistd.h>
 #endif
+#ifdef Q_OS_WIN
+# include <windows.h>
+#endif
 
 namespace {
-
 // safeobj stuff, from qca
-
 void releaseAndDeleteLater(QObject *owner, QObject *obj)
 {
     obj->disconnect(owner);
@@ -77,8 +73,7 @@ public slots:
 private:
     QSocketNotifier *sn;
 };
-
-}
+} // namespace
 
 #ifndef NO_IRISNET
 namespace XMPP {
@@ -274,6 +269,6 @@ void ProcessQuit::cleanup()
 
 #ifndef NO_IRISNET
 }
-#endif
+#endif // NO_IRISNET
 
 #include "processquit.moc"
diff --git a/src/irisnet/noncore/processquit.h b/src/irisnet/noncore/processquit.h
index d9e3b552..363088ca 100644
--- a/src/irisnet/noncore/processquit.h
+++ b/src/irisnet/noncore/processquit.h
@@ -113,4 +113,4 @@ class IRISNET_EXPORT ProcessQuit : public QObject
 }
 #endif
 
-#endif
+#endif // PROCESSQUIT_H
diff --git a/src/irisnet/noncore/stunallocate.cpp b/src/irisnet/noncore/stunallocate.cpp
index 91ff75c4..96ee4ea4 100644
--- a/src/irisnet/noncore/stunallocate.cpp
+++ b/src/irisnet/noncore/stunallocate.cpp
@@ -18,15 +18,16 @@
 
 #include "stunallocate.h"
 
-#include <QMetaType>
-#include <QHostAddress>
-#include <QTimer>
-#include <QtCrypto>
 #include "objectsession.h"
-#include "stunutil.h"
 #include "stunmessage.h"
-#include "stuntypes.h"
 #include "stuntransaction.h"
+#include "stuntypes.h"
+#include "stunutil.h"
+
+#include <QHostAddress>
+#include <QMetaType>
+#include <QTimer>
+#include <QtCrypto>
 
 // permissions last 5 minutes, update them every 4 minutes
 #define PERM_INTERVAL  (4 * 60 * 1000)
@@ -35,7 +36,6 @@
 #define CHAN_INTERVAL  (9 * 60 * 1000)
 
 namespace XMPP {
-
 void releaseAndDeleteLater(QObject *owner, QObject *obj)
 {
     obj->disconnect(owner);
@@ -1447,7 +1447,6 @@ QByteArray StunAllocate::readChannelData(const quint8 *data, int size)
     else
         return QByteArray();
 }
-
-}
+} // namespace XMPP
 
 #include "stunallocate.moc"
diff --git a/src/irisnet/noncore/stunallocate.h b/src/irisnet/noncore/stunallocate.h
index 2c18011d..e802ddef 100644
--- a/src/irisnet/noncore/stunallocate.h
+++ b/src/irisnet/noncore/stunallocate.h
@@ -19,14 +19,13 @@
 #ifndef STUNALLOCATE_H
 #define STUNALLOCATE_H
 
-#include <QObject>
-#include <QList>
 #include <QHostAddress>
+#include <QList>
+#include <QObject>
 
 class QByteArray;
 
 namespace XMPP {
-
 class StunMessage;
 class StunTransactionPool;
 
@@ -127,7 +126,6 @@ class StunAllocate : public QObject
     friend class Private;
     Private *d;
 };
+} // namespace XMPP
 
-}
-
-#endif
+#endif // STUNALLOCATE_H
diff --git a/src/irisnet/noncore/stunbinding.cpp b/src/irisnet/noncore/stunbinding.cpp
index 897e1e1d..524097b2 100644
--- a/src/irisnet/noncore/stunbinding.cpp
+++ b/src/irisnet/noncore/stunbinding.cpp
@@ -18,13 +18,13 @@
 
 #include "stunbinding.h"
 
-#include <QHostAddress>
 #include "stunmessage.h"
-#include "stuntypes.h"
 #include "stuntransaction.h"
+#include "stuntypes.h"
 
-namespace XMPP {
+#include <QHostAddress>
 
+namespace XMPP {
 class StunBinding::Private : public QObject
 {
     Q_OBJECT
@@ -292,7 +292,6 @@ QString StunBinding::errorString() const
 {
     return d->errorString;
 }
-
-}
+} // namespace XMPP
 
 #include "stunbinding.moc"
diff --git a/src/irisnet/noncore/stunbinding.h b/src/irisnet/noncore/stunbinding.h
index 9bec8ae2..963e5fd2 100644
--- a/src/irisnet/noncore/stunbinding.h
+++ b/src/irisnet/noncore/stunbinding.h
@@ -24,7 +24,6 @@
 class QHostAddress;
 
 namespace XMPP {
-
 class StunTransactionPool;
 
 class StunBinding : public QObject
@@ -75,7 +74,6 @@ class StunBinding : public QObject
     friend class Private;
     Private *d;
 };
+} // namespace XMPP
 
-}
-
-#endif
+#endif // STUNBINDING_H
diff --git a/src/irisnet/noncore/stunmessage.cpp b/src/irisnet/noncore/stunmessage.cpp
index a6a5feec..87e6a6ec 100644
--- a/src/irisnet/noncore/stunmessage.cpp
+++ b/src/irisnet/noncore/stunmessage.cpp
@@ -18,14 +18,14 @@
 
 #include "stunmessage.h"
 
+#include "stunutil.h"
+
 #include <QSharedData>
 #include <QtCrypto>
-#include "stunutil.h"
 
 #define ENSURE_D { if(!d) d = new Private; }
 
 namespace XMPP {
-
 using namespace StunUtil;
 
 // some attribute types we need to explicitly support
@@ -727,5 +727,4 @@ QByteArray StunMessage::readStun(const quint8 *data, int size)
     else
         return QByteArray();
 }
-
-}
+} // namespace XMPP
diff --git a/src/irisnet/noncore/stunmessage.h b/src/irisnet/noncore/stunmessage.h
index dbc15fa4..8563712e 100644
--- a/src/irisnet/noncore/stunmessage.h
+++ b/src/irisnet/noncore/stunmessage.h
@@ -24,7 +24,6 @@
 #include <QSharedDataPointer>
 
 namespace XMPP {
-
 class StunMessage
 {
 public:
@@ -103,7 +102,6 @@ class StunMessage
     class Private;
     QSharedDataPointer<Private> d;
 };
+} // namespace XMPP
 
-}
-
-#endif
+#endif // STUNMESSAGE_H
diff --git a/src/irisnet/noncore/stuntransaction.cpp b/src/irisnet/noncore/stuntransaction.cpp
index 3132fccf..70a13c75 100644
--- a/src/irisnet/noncore/stuntransaction.cpp
+++ b/src/irisnet/noncore/stuntransaction.cpp
@@ -18,20 +18,20 @@
 
 #include "stuntransaction.h"
 
+#include "stunbinding.h"
+#include "stunmessage.h"
+#include "stuntypes.h"
+#include "stunutil.h"
+
 #include <QHash>
 #include <QMetaType>
 #include <QTime>
 #include <QTimer>
 #include <QtCrypto>
-#include "stunutil.h"
-#include "stunmessage.h"
-#include "stuntypes.h"
-#include "stunbinding.h"
 
 Q_DECLARE_METATYPE(XMPP::StunTransaction::Error)
 
 namespace XMPP {
-
 // parse a stun message, optionally performing validity checks.  the
 //   StunMessage class itself provides parsing with validity or parsing
 //   without validity, but it does not provide a way to do both together,
@@ -740,6 +740,6 @@ void StunTransactionPool::setDebugLevel(DebugLevel level)
     d->debugLevel = level;
 }
 
-}
+} // namespace XMPP
 
 #include "stuntransaction.moc"
diff --git a/src/irisnet/noncore/stuntransaction.h b/src/irisnet/noncore/stuntransaction.h
index e07dd45c..6d924b3b 100644
--- a/src/irisnet/noncore/stuntransaction.h
+++ b/src/irisnet/noncore/stuntransaction.h
@@ -19,21 +19,19 @@
 #ifndef STUNTRANSACTION_H
 #define STUNTRANSACTION_H
 
-#include <QObject>
 #include <QByteArray>
 #include <QHostAddress>
+#include <QObject>
 
 namespace QCA {
     class SecureArray;
 }
 
 namespace XMPP {
-
 class StunMessage;
-
-class StunTransactionPrivate;
 class StunTransactionPool;
 class StunTransactionPoolPrivate;
+class StunTransactionPrivate;
 
 // Notes:
 //
@@ -199,7 +197,6 @@ class StunTransactionPool : public QObject
     friend class StunTransactionPoolPrivate;
     StunTransactionPoolPrivate *d;
 };
+} // namespace XMPP
 
-}
-
-#endif
+#endif // STUNTRANSACTION_H
diff --git a/src/irisnet/noncore/stuntypes.cpp b/src/irisnet/noncore/stuntypes.cpp
index 48487f1c..9cc72ff8 100644
--- a/src/irisnet/noncore/stuntypes.cpp
+++ b/src/irisnet/noncore/stuntypes.cpp
@@ -18,19 +18,17 @@
 
 #include "stuntypes.h"
 
-#include <stdio.h>
-#include <QtCrypto>
 #include "stunutil.h"
 
+#include <QtCrypto>
+#include <stdio.h>
+
 #define STRING_MAX_CHARS 127
 #define STRING_MAX_BYTES 763
 
 namespace XMPP {
-
 using namespace StunUtil;
-
 namespace StunTypes {
-
 static void xorIPv4(QByteArray *in, const quint8 *magic)
 {
     quint8 *p = (quint8 *)in->data();
@@ -730,7 +728,5 @@ void print_packet(const StunMessage &message)
 {
     printf("%s\n", qPrintable(print_packet_str(message)));
 }
-
-}
-
-}
+} // namespace StunTypes
+} // namespace XMPP
diff --git a/src/irisnet/noncore/stuntypes.h b/src/irisnet/noncore/stuntypes.h
index e0179910..c09da16b 100644
--- a/src/irisnet/noncore/stuntypes.h
+++ b/src/irisnet/noncore/stuntypes.h
@@ -19,16 +19,15 @@
 #ifndef STUNTYPES_H
 #define STUNTYPES_H
 
-#include <QString>
+#include "stunmessage.h"
+
 #include <QByteArray>
-#include <QList>
 #include <QHostAddress>
-#include "stunmessage.h"
+#include <QList>
+#include <QString>
 
 namespace XMPP {
-
 namespace StunTypes {
-
 enum Method
 {
     Binding           = 0x001,
@@ -137,8 +136,7 @@ QString attributeValueToString(int type, const QByteArray &val, const quint8 *ma
 QString print_packet_str(const StunMessage &message);
 void print_packet(const StunMessage &message);
 
-}
-
-}
+} // namespace StunTypes
+} // namespace XMPP
 
-#endif
+#endif // STUNTYPES_H
diff --git a/src/irisnet/noncore/stunutil.cpp b/src/irisnet/noncore/stunutil.cpp
index 0dac62ea..46afe447 100644
--- a/src/irisnet/noncore/stunutil.cpp
+++ b/src/irisnet/noncore/stunutil.cpp
@@ -19,9 +19,7 @@
 #include "stunutil.h"
 
 namespace XMPP {
-
 namespace StunUtil {
-
 quint16 read16(const quint8 *in)
 {
     quint16 out = in[0];
@@ -93,7 +91,5 @@ QCA::SecureArray saslPrep(const QCA::SecureArray &in)
     // TODO
     return in;
 }
-
-}
-
-}
+} // namespace StunUtil
+} // namespace XMPP
diff --git a/src/irisnet/noncore/stunutil.h b/src/irisnet/noncore/stunutil.h
index fac82f00..ca71f011 100644
--- a/src/irisnet/noncore/stunutil.h
+++ b/src/irisnet/noncore/stunutil.h
@@ -22,9 +22,7 @@
 #include <QtCrypto>
 
 namespace XMPP {
-
 namespace StunUtil {
-
 quint16 read16(const quint8 *in);
 quint32 read32(const quint8 *in);
 quint64 read64(const quint8 *in);
@@ -35,8 +33,7 @@ void write64(quint8 *out, quint64 i);
 
 QCA::SecureArray saslPrep(const QCA::SecureArray &in);
 
-}
-
-}
+} // namespace StunUtil
+} // namespace XMPP
 
-#endif
+#endif // STUNUTIL_H
diff --git a/src/irisnet/noncore/tcpportreserver.cpp b/src/irisnet/noncore/tcpportreserver.cpp
index e69a9b18..32039e91 100644
--- a/src/irisnet/noncore/tcpportreserver.cpp
+++ b/src/irisnet/noncore/tcpportreserver.cpp
@@ -17,15 +17,15 @@
  *
  */
 
+#include "tcpportreserver.h"
+
+#include "ice176.h"
+
 #include <QNetworkInterface>
 #include <QTcpServer>
 #include <QTcpSocket>
 
-#include "tcpportreserver.h"
-#include "ice176.h"
-
 namespace XMPP {
-
 TcpPortDiscoverer::TcpPortDiscoverer(TcpPortScope *scope) :
     QObject(scope),
     scope(scope)
@@ -154,7 +154,6 @@ struct TcpPortScope::Private
     QHash<QPair<QHostAddress,quint16>, QWeakPointer<TcpPortServer>> servers;
 };
 
-
 TcpPortScope::TcpPortScope() :
     d(new Private)
 {
@@ -219,7 +218,6 @@ TcpPortServer::Ptr TcpPortScope::bind(const QHostAddress &addr, quint16 port)
     return shared;
 }
 
-
 // --------------------------------------------------------------------------
 // TcpPortScope
 // --------------------------------------------------------------------------
@@ -252,5 +250,4 @@ TcpPortScope *TcpPortReserver::unregisterScope(const QString &id)
     }
     return s;
 }
-
 } // namespace XMPP
diff --git a/src/irisnet/noncore/tcpportreserver.h b/src/irisnet/noncore/tcpportreserver.h
index 97017e27..a4068bc4 100644
--- a/src/irisnet/noncore/tcpportreserver.h
+++ b/src/irisnet/noncore/tcpportreserver.h
@@ -22,11 +22,10 @@
 
 #include <QObject>
 #include <QSharedPointer>
-#include <QVariant>
 #include <QTcpServer>
+#include <QVariant>
 
 namespace XMPP {
-
 class TcpPortServer : public QObject
 {
     Q_OBJECT
@@ -131,7 +130,6 @@ class TcpPortScope: public QObject
     QScopedPointer<Private> d;
 };
 
-
 /**
  * @brief The TcpPortReserver class
  * This class should have the only instance per application
@@ -158,7 +156,6 @@ class TcpPortReserver : public QObject
 
 public slots:
 };
-
 } // namespace XMPP
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(XMPP::TcpPortServer::PortTypes)
diff --git a/src/irisnet/noncore/turnclient.cpp b/src/irisnet/noncore/turnclient.cpp
index 31221eb7..fd1ea2e9 100644
--- a/src/irisnet/noncore/turnclient.cpp
+++ b/src/irisnet/noncore/turnclient.cpp
@@ -18,19 +18,19 @@
 
 #include "turnclient.h"
 
-#include <QtCrypto>
-#include "stuntypes.h"
-#include "stunmessage.h"
-#include "stuntransaction.h"
-#include "stunallocate.h"
-#include "objectsession.h"
-#include "bytestream.h"
 #include "bsocket.h"
+#include "bytestream.h"
 #include "httpconnect.h"
+#include "objectsession.h"
 #include "socks.h"
+#include "stunallocate.h"
+#include "stunmessage.h"
+#include "stuntransaction.h"
+#include "stuntypes.h"
 
-namespace XMPP {
+#include <QtCrypto>
 
+namespace XMPP {
 //----------------------------------------------------------------------------
 // TurnClient::Proxy
 //----------------------------------------------------------------------------
@@ -1139,7 +1139,6 @@ void TurnClient::setDebugLevel(DebugLevel level)
     if(d->pool)
         d->pool->setDebugLevel((StunTransactionPool::DebugLevel)level);
 }
-
-}
+} // namespace XMPP
 
 #include "turnclient.moc"
diff --git a/src/irisnet/noncore/turnclient.h b/src/irisnet/noncore/turnclient.h
index 18af00cb..74e7b6a7 100644
--- a/src/irisnet/noncore/turnclient.h
+++ b/src/irisnet/noncore/turnclient.h
@@ -19,19 +19,18 @@
 #ifndef TURNCLIENT_H
 #define TURNCLIENT_H
 
-#include <QObject>
 #include <QByteArray>
-#include <QString>
 #include <QHostAddress>
+#include <QObject>
+#include <QString>
 
 namespace QCA {
     class SecureArray;
 }
 
 namespace XMPP {
-
-class StunTransactionPool;
 class StunAllocate;
+class StunTransactionPool;
 
 class TurnClient : public QObject
 {
@@ -186,7 +185,6 @@ class TurnClient : public QObject
     friend class Private;
     Private *d;
 };
+} // namespace XMPP
 
-}
-
-#endif
+#endif // TURNCLIENT_H
diff --git a/src/irisnet/noncore/udpportreserver.cpp b/src/irisnet/noncore/udpportreserver.cpp
index 54adc0b4..94ded097 100644
--- a/src/irisnet/noncore/udpportreserver.cpp
+++ b/src/irisnet/noncore/udpportreserver.cpp
@@ -18,11 +18,10 @@
 
 #include "udpportreserver.h"
 
-#include <stdlib.h>
 #include <QUdpSocket>
+#include <stdlib.h>
 
 namespace XMPP {
-
 class UdpPortReserver::Private : public QObject
 {
     Q_OBJECT
@@ -433,7 +432,6 @@ void UdpPortReserver::returnSockets(const QList<QUdpSocket*> &sockList)
 {
     d->returnSockets(sockList);
 }
-
-}
+} // namespace XMPP
 
 #include "udpportreserver.moc"
diff --git a/src/irisnet/noncore/udpportreserver.h b/src/irisnet/noncore/udpportreserver.h
index 5650a489..8604b38b 100644
--- a/src/irisnet/noncore/udpportreserver.h
+++ b/src/irisnet/noncore/udpportreserver.h
@@ -19,14 +19,13 @@
 #ifndef UDPPORTRESERVER_H
 #define UDPPORTRESERVER_H
 
-#include <QObject>
 #include <QList>
+#include <QObject>
 
 class QHostAddress;
 class QUdpSocket;
 
 namespace XMPP {
-
 // call both setAddresses() and setPorts() at least once for socket
 //   reservations to occur.  at any time you can update the list of addresses
 //   (interfaces) and ports to reserve.  note that the port must be available
@@ -66,7 +65,6 @@ class UdpPortReserver : public QObject
     class Private;
     Private *d;
 };
+} // namespace XMPP
 
-}
-
-#endif
+#endif // UDPPORTRESERVER_H
diff --git a/src/jdns/CMakeLists.txt b/src/jdns/CMakeLists.txt
index 43b99914..13789762 100644
--- a/src/jdns/CMakeLists.txt
+++ b/src/jdns/CMakeLists.txt
@@ -74,7 +74,6 @@ set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
 
 set(JDNS_INCLUDEDIR "${CMAKE_CURRENT_SOURCE_DIR}/include/jdns" )
 
-
 #add extra search paths for libraries and includes
 set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
 set(BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE STRING "Directory where binary will install")
@@ -104,7 +103,6 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" )
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" )
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" )
 
-
 # pkg-config
 if(NOT WIN32)
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/jdns.pc.in
diff --git a/src/jdns/include/jdns/jdns.h b/src/jdns/include/jdns/jdns.h
index defcbab8..f1bc5c86 100644
--- a/src/jdns/include/jdns/jdns.h
+++ b/src/jdns/include/jdns/jdns.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005,2006  Justin Karneges
+ * Copyright (C) 2005-2006  Justin Karneges
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the
@@ -505,4 +505,4 @@ JDNS_EXPORT void jdns_set_hold_ids_enabled(jdns_session_t *s, int enabled);
 }
 #endif
 
-#endif
+#endif // JDNS_H
diff --git a/src/jdns/include/jdns/jdns_export.h b/src/jdns/include/jdns/jdns_export.h
index 7a9ee396..c5d79a13 100644
--- a/src/jdns/include/jdns/jdns_export.h
+++ b/src/jdns/include/jdns/jdns_export.h
@@ -49,4 +49,4 @@
 # define JDNS_EXPORT
 #endif
 
-#endif
+#endif // JDNS_EXPORT_H
diff --git a/src/jdns/include/jdns/qjdns.h b/src/jdns/include/jdns/qjdns.h
index b8c3cf92..13a26261 100644
--- a/src/jdns/include/jdns/qjdns.h
+++ b/src/jdns/include/jdns/qjdns.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005,2006  Justin Karneges
+ * Copyright (C) 2005-2006  Justin Karneges
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the
@@ -27,6 +27,7 @@
 #define QJDNS_H
 
 #include "jdns_export.h"
+
 #include <QtCore>
 #include <QtNetwork>
 
@@ -156,4 +157,4 @@ class JDNS_EXPORT QJDns : public QObject
     Private *d;
 };
 
-#endif
+#endif // QJDNS_H
diff --git a/src/jdns/include/jdns/qjdnsshared.h b/src/jdns/include/jdns/qjdnsshared.h
index e1e67a7a..335d91bb 100644
--- a/src/jdns/include/jdns/qjdnsshared.h
+++ b/src/jdns/include/jdns/qjdnsshared.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006,2007  Justin Karneges
+ * Copyright (C) 2006-2007  Justin Karneges
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the
@@ -27,9 +27,9 @@
 #include "qjdns.h"
 
 class QJDnsShared;
+class QJDnsSharedDebugPrivate;
 class QJDnsSharedPrivate;
 class QJDnsSharedRequestPrivate;
-class QJDnsSharedDebugPrivate;
 
 /**
    \brief Collects debugging information from QJDnsShared
@@ -511,4 +511,4 @@ QStringList finalDebugLines = jdnsSharedDebug.readDebugLines();
     QJDnsSharedPrivate *d;
 };
 
-#endif
+#endif // QJDNSSHARED_H
diff --git a/src/jdns/src/jdns/CMakeLists.txt b/src/jdns/src/jdns/CMakeLists.txt
index 3a68f930..7bf91584 100644
--- a/src/jdns/src/jdns/CMakeLists.txt
+++ b/src/jdns/src/jdns/CMakeLists.txt
@@ -6,7 +6,6 @@ set(jdns_SRCS
     jdns_util.c
 )
 
-
 set(jdns_PUBLIC_HEADERS
     "${JDNS_INCLUDEDIR}/jdns.h"
     "${JDNS_INCLUDEDIR}/jdns_export.h"
diff --git a/src/jdns/src/jdns/jdns.c b/src/jdns/src/jdns/jdns.c
index 52f223a4..3da4c25c 100644
--- a/src/jdns/src/jdns/jdns.c
+++ b/src/jdns/src/jdns/jdns.c
@@ -21,13 +21,12 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#include "jdns_mdnsd.h"
 #include "jdns_p.h"
+#include "jdns_packet.h"
 
 #include <time.h>
 
-#include "jdns_packet.h"
-#include "jdns_mdnsd.h"
-
 #define JDNS_UDP_UNI_OUT_MAX  512
 #define JDNS_UDP_UNI_IN_MAX   16384
 #define JDNS_UDP_MUL_OUT_MAX  9000
diff --git a/src/jdns/src/jdns/jdns_mdnsd.c b/src/jdns/src/jdns/jdns_mdnsd.c
index 3dd581d0..e818d5dd 100644
--- a/src/jdns/src/jdns/jdns_mdnsd.c
+++ b/src/jdns/src/jdns/jdns_mdnsd.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2005       Jeremie Miller
- * Copyright (C) 2005,2006  Justin Karneges
+ * Copyright (C) 2005-2006  Justin Karneges
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the
@@ -638,7 +638,6 @@ int _r_out(mdnsd d, jdns_packet_t *m, mdnsdr *list)
     return ret;
 }
 
-
 mdnsd mdnsd_new(int class, int frame, int port, int (*time_now)(mdnsd d, void *arg), int (*rand_int)(mdnsd d, void *arg), void *arg)
 {
     //int i;
diff --git a/src/jdns/src/jdns/jdns_mdnsd.h b/src/jdns/src/jdns/jdns_mdnsd.h
index 2870dc70..d311c405 100644
--- a/src/jdns/src/jdns/jdns_mdnsd.h
+++ b/src/jdns/src/jdns/jdns_mdnsd.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2005       Jeremie Miller
- * Copyright (C) 2005,2006  Justin Karneges
+ * Copyright (C) 2005-2006  Justin Karneges
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the
@@ -116,5 +116,4 @@ void mdnsd_set_srv(mdnsd d, mdnsdr r, int priority, int weight, int port, char *
 //
 ///////////
 
-
-#endif
+#endif // JDNS_MDNSD_H
diff --git a/src/jdns/src/jdns/jdns_p.h b/src/jdns/src/jdns/jdns_p.h
index 0ae7e948..ef2ac093 100644
--- a/src/jdns/src/jdns/jdns_p.h
+++ b/src/jdns/src/jdns/jdns_p.h
@@ -24,11 +24,14 @@
 #ifndef JDNS_P_H
 #define JDNS_P_H
 
+#include "jdns.h"
+#include "jdns_packet.h"
+
+#include <ctype.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdarg.h>
-#include <ctype.h>
 
 #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
 # define JDNS_OS_WIN
@@ -50,17 +53,14 @@
 # define JDNS_OS_MAC
 #endif
 
-#ifdef JDNS_OS_WIN
-# include <windows.h>
-#endif
-
 #ifdef JDNS_OS_UNIX
-# include <unistd.h>
 # include <netinet/in.h>
+# include <unistd.h>
 #endif
 
-#include "jdns.h"
-#include "jdns_packet.h"
+#ifdef JDNS_OS_WIN
+# include <windows.h>
+#endif
 
 // jdns_util.c
 void *jdns_alloc(int size);
@@ -96,4 +96,4 @@ void jdns_response_remove_answer(jdns_response_t *r, int pos);
 #define _ustrlen(str) strlen((const char *)str)
 #define _ustrcmp(a, b) strcmp((const char *)a, (const char *)b)
 
-#endif
+#endif // JDNS_P_H
diff --git a/src/jdns/src/jdns/jdns_packet.h b/src/jdns/src/jdns/jdns_packet.h
index 113c55eb..23eb059a 100644
--- a/src/jdns/src/jdns/jdns_packet.h
+++ b/src/jdns/src/jdns/jdns_packet.h
@@ -113,4 +113,4 @@ void jdns_packet_delete(jdns_packet_t *a);
 int jdns_packet_import(jdns_packet_t **a, const unsigned char *data, int size); // 0 on fail
 int jdns_packet_export(jdns_packet_t *a, int maxsize); // 0 on fail
 
-#endif
+#endif // JDNS_PACKET_H
diff --git a/src/jdns/src/jdns/jdns_sys.c b/src/jdns/src/jdns/jdns_sys.c
index d755c1c4..bf345819 100644
--- a/src/jdns/src/jdns/jdns_sys.c
+++ b/src/jdns/src/jdns/jdns_sys.c
@@ -113,15 +113,14 @@ read /etc/hosts manually:
 
 #include "jdns_p.h"
 
-#ifdef JDNS_OS_WIN
-# include <windows.h>
-#endif
-
 #ifdef JDNS_OS_UNIX
-# include <netinet/in.h>
 # include <arpa/nameser.h>
-# include <resolv.h>
 # include <dlfcn.h>
+# include <netinet/in.h>
+# include <resolv.h>
+#endif
+#ifdef JDNS_OS_WIN
+# include <windows.h>
 #endif
 
 #define string_indexOf jdns_string_indexOf
diff --git a/src/jdns/src/jdns/jdns_util.c b/src/jdns/src/jdns/jdns_util.c
index af8cd09a..701cd126 100644
--- a/src/jdns/src/jdns/jdns_util.c
+++ b/src/jdns/src/jdns/jdns_util.c
@@ -22,7 +22,6 @@
  */
 
 #include "jdns_p.h"
-
 #include "jdns_packet.h"
 
 //----------------------------------------------------------------------------
diff --git a/src/jdns/src/qjdns/qjdns.cpp b/src/jdns/src/qjdns/qjdns.cpp
index a6e61d15..4f7572ef 100644
--- a/src/jdns/src/qjdns/qjdns.cpp
+++ b/src/jdns/src/qjdns/qjdns.cpp
@@ -22,12 +22,10 @@
  */
 
 #include "qjdns_p.h"
-
-#include <time.h>
 #include "qjdns_sock.h"
 
-// for fprintf
-#include <stdio.h>
+#include <stdio.h> // for fprintf
+#include <time.h>
 
 // safeobj stuff, from qca
 
diff --git a/src/jdns/src/qjdns/qjdns_p.h b/src/jdns/src/qjdns/qjdns_p.h
index 0cdaa73f..94669c85 100644
--- a/src/jdns/src/qjdns/qjdns_p.h
+++ b/src/jdns/src/qjdns/qjdns_p.h
@@ -26,13 +26,14 @@
 
 #include "jdns.h"
 #include "qjdns.h"
+
+#include <QHash>
 #include <QObject>
-#include <QTime>
 #include <QStringList>
-#include <QHash>
+#include <QTime>
 
-class QUdpSocket;
 class QTimer;
+class QUdpSocket;
 
 class SafeTimer : public QObject
 {
@@ -131,4 +132,4 @@ private slots:
     static int cb_udp_write(jdns_session_t *, void *app, int handle, const jdns_address_t *addr, int port, unsigned char *buf, int bufsize);
 };
 
-#endif
+#endif // QJDNS_P_H
diff --git a/src/jdns/src/qjdns/qjdns_sock.cpp b/src/jdns/src/qjdns/qjdns_sock.cpp
index 8c2991f3..09cd96a8 100644
--- a/src/jdns/src/qjdns/qjdns_sock.cpp
+++ b/src/jdns/src/qjdns/qjdns_sock.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005,2006  Justin Karneges
+ * Copyright (C) 2005-2006  Justin Karneges
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the
@@ -27,21 +27,19 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
-#ifdef Q_OS_WIN
-# include <winsock2.h>
-# include <ws2tcpip.h>
-#endif
-
 #ifdef Q_OS_UNIX
-# include <sys/time.h>
-# include <sys/types.h>
-# include <sys/socket.h>
-# include <netinet/in.h>
-# include <fcntl.h>
+# include <arpa/inet.h>
 # include <errno.h>
+# include <fcntl.h>
+# include <netinet/in.h>
 # include <signal.h>
-# include <arpa/inet.h>
+# include <sys/socket.h>
+# include <sys/time.h>
+# include <sys/types.h>
+#endif
+#ifdef Q_OS_WIN
+# include <winsock2.h>
+# include <ws2tcpip.h>
 #endif
 
 #ifdef Q_OS_HAIKU
diff --git a/src/jdns/src/qjdns/qjdns_sock.h b/src/jdns/src/qjdns/qjdns_sock.h
index 13d388d6..dcbf9b74 100644
--- a/src/jdns/src/qjdns/qjdns_sock.h
+++ b/src/jdns/src/qjdns/qjdns_sock.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005,2006  Justin Karneges
+ * Copyright (C) 2005-2006  Justin Karneges
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the
@@ -30,4 +30,4 @@ bool qjdns_sock_setTTL4(int s, int ttl);
 bool qjdns_sock_setTTL6(int s, int ttl);
 bool qjdns_sock_setIPv6Only(int s);
 
-#endif
+#endif // QJDNS_SOCK_H
diff --git a/src/jdns/src/qjdns/qjdnsshared.cpp b/src/jdns/src/qjdns/qjdnsshared.cpp
index 8c9ed3ca..6d8f35a1 100644
--- a/src/jdns/src/qjdns/qjdnsshared.cpp
+++ b/src/jdns/src/qjdns/qjdnsshared.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2008    Justin Karneges
+ * Copyright (C) 2006-2008  Justin Karneges
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the
@@ -159,7 +159,6 @@ static inline uint qHash(const Handle &key)
     return ((h1 << 16) | (h1 >> 16)) ^ h2;
 }
 
-
 //----------------------------------------------------------------------------
 // JDnsShutdown
 //----------------------------------------------------------------------------
diff --git a/src/jdns/src/qjdns/qjdnsshared_p.h b/src/jdns/src/qjdns/qjdnsshared_p.h
index 7cf2e729..98024460 100644
--- a/src/jdns/src/qjdns/qjdnsshared_p.h
+++ b/src/jdns/src/qjdns/qjdnsshared_p.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2008    Justin Karneges
+ * Copyright (C) 2006-2008  Justin Karneges
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the
@@ -27,13 +27,14 @@
 // SafeTimer
 #include "qjdns_p.h"
 #include "qjdnsshared.h"
-#include <QWaitCondition>
-#include <QThread>
-#include <QObject>
+
+#include <QHash>
 #include <QMutex>
-#include <QStringList>
+#include <QObject>
 #include <QSet>
-#include <QHash>
+#include <QStringList>
+#include <QThread>
+#include <QWaitCondition>
 
 class JDnsShutdownAgent : public QObject
 {
@@ -230,4 +231,4 @@ private slots:
     void lateTimer_timeout();
 };
 
-#endif
+#endif // QJDNSSHARED_P_H
diff --git a/src/jdns/tools/jdns/main.cpp b/src/jdns/tools/jdns/main.cpp
index 5259f5f0..5bd3bdb2 100644
--- a/src/jdns/tools/jdns/main.cpp
+++ b/src/jdns/tools/jdns/main.cpp
@@ -22,9 +22,11 @@
  */
 
 #include "main.h"
+
+#include "qjdns.h"
+
 #include <QtCore>
 #include <QtNetwork>
-#include "qjdns.h"
 
 QString dataToString(const QByteArray &buf)
 {
@@ -216,7 +218,6 @@ void  App::start()
         QTimer::singleShot(quit_time * 1000, this, SLOT(doShutdown()));
 }
 
-
 void App::jdns_resultsReady(int id, const QJDns::Response &results)
 {
     printf("[%d] Results\n", id);
diff --git a/src/jdns/tools/jdns/main.h b/src/jdns/tools/jdns/main.h
index 018965e9..e208fe94 100644
--- a/src/jdns/tools/jdns/main.h
+++ b/src/jdns/tools/jdns/main.h
@@ -25,6 +25,7 @@
 #define MAIN_H
 
 #include "qjdns.h"
+
 #include <QObject>
 #include <QStringList>
 
diff --git a/src/xmpp/base/randomnumbergenerator.cpp b/src/xmpp/base/randomnumbergenerator.cpp
index 4ac131b0..672c0611 100644
--- a/src/xmpp/base/randomnumbergenerator.cpp
+++ b/src/xmpp/base/randomnumbergenerator.cpp
@@ -21,7 +21,6 @@
 #include <cassert>
 
 namespace XMPP {
-
 RandomNumberGenerator::~RandomNumberGenerator()
 {
 }
@@ -31,5 +30,4 @@ double RandomNumberGenerator::generateNumberBetween(double a, double b) const
     assert(b > a);
     return a + (generateNumber()/getMaximumGeneratedNumber())*(b-a);
 }
-
-}
+} // namespace XMPP
diff --git a/src/xmpp/base/randomnumbergenerator.h b/src/xmpp/base/randomnumbergenerator.h
index 5d3fb337..abadb9a9 100644
--- a/src/xmpp/base/randomnumbergenerator.h
+++ b/src/xmpp/base/randomnumbergenerator.h
@@ -31,6 +31,6 @@ namespace XMPP {
             virtual double generateNumber() const = 0;
             virtual double getMaximumGeneratedNumber() const = 0;
     };
-}
+} // namespace XMPP
 
-#endif
+#endif // RANDOMNUMBERGENERATOR_H
diff --git a/src/xmpp/base/randrandomnumbergenerator.h b/src/xmpp/base/randrandomnumbergenerator.h
index 6306e1ae..1d1c45ee 100644
--- a/src/xmpp/base/randrandomnumbergenerator.h
+++ b/src/xmpp/base/randrandomnumbergenerator.h
@@ -35,6 +35,6 @@ namespace XMPP {
                 return RAND_MAX;
             }
     };
-}
+} // namespace XMPP
 
-#endif
+#endif // RANDRANDOMNUMBERGENERATOR_H
diff --git a/src/xmpp/base/timezone.cpp b/src/xmpp/base/timezone.cpp
index fb705254..4e7e5d20 100644
--- a/src/xmpp/base/timezone.cpp
+++ b/src/xmpp/base/timezone.cpp
@@ -16,22 +16,21 @@
  *
  */
 
-#include <QtGlobal>
+#include "timezone.h"
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 2, 0)
-#include <QByteArray>
-#include <QTime>
-#ifdef Q_OS_UNIX
-#include <time.h>
-#endif
-#ifdef Q_OS_WIN
-#include <windows.h>
-#endif
+# include <QByteArray>
+# include <QTime>
+# ifdef Q_OS_UNIX
+#  include <time.h>
+# endif
+# ifdef Q_OS_WIN
+#  include <windows.h>
+# endif
 #else
-#include <QTimeZone>
+# include <QTimeZone>
 #endif
-
-#include "timezone.h"
+#include <QtGlobal>
 
 #if QT_VERSION < QT_VERSION_CHECK(5,2,0)
 static bool inited = false;
diff --git a/src/xmpp/base/unittest/incrementingrandomnumbergenerator.h b/src/xmpp/base/unittest/incrementingrandomnumbergenerator.h
index 6141481f..132ea8b8 100644
--- a/src/xmpp/base/unittest/incrementingrandomnumbergenerator.h
+++ b/src/xmpp/base/unittest/incrementingrandomnumbergenerator.h
@@ -19,10 +19,10 @@
 #ifndef INCREMENTINGRANDOMNUMBERGENERATOR_H
 #define INCREMENTINGRANDOMNUMBERGENERATOR_H
 
-#include <QtDebug>
-
 #include "xmpp/base/randomnumbergenerator.h"
 
+#include <QtDebug>
+
 namespace XMPP {
     class IncrementingRandomNumberGenerator : public RandomNumberGenerator
     {
@@ -42,6 +42,6 @@ namespace XMPP {
             int maximumNumber_;
             mutable int currentNumber_;
     };
-}
+} // namespace XMPP
 
-#endif
+#endif // INCREMENTINGRANDOMNUMBERGENERATOR_H
diff --git a/src/xmpp/base/unittest/randomnumbergeneratortest.cpp b/src/xmpp/base/unittest/randomnumbergeneratortest.cpp
index d904e26e..d2b01c59 100644
--- a/src/xmpp/base/unittest/randomnumbergeneratortest.cpp
+++ b/src/xmpp/base/unittest/randomnumbergeneratortest.cpp
@@ -16,12 +16,12 @@
  *
  */
 
-#include <QObject>
-#include <QtTest/QtTest>
-
 #include "qttestutil/qttestutil.h"
 #include "xmpp/base/randomnumbergenerator.h"
 
+#include <QObject>
+#include <QtTest/QtTest>
+
 using namespace XMPP;
 
 class RandomNumberGeneratorTest : public QObject
diff --git a/src/xmpp/base/unittest/randrandomnumbergeneratortest.cpp b/src/xmpp/base/unittest/randrandomnumbergeneratortest.cpp
index 9a784683..a7255dd6 100644
--- a/src/xmpp/base/unittest/randrandomnumbergeneratortest.cpp
+++ b/src/xmpp/base/unittest/randrandomnumbergeneratortest.cpp
@@ -16,12 +16,12 @@
  *
  */
 
-#include <QObject>
-#include <QtTest/QtTest>
-
 #include "qttestutil/qttestutil.h"
 #include "xmpp/base/randrandomnumbergenerator.h"
 
+#include <QObject>
+#include <QtTest/QtTest>
+
 using namespace XMPP;
 
 class RandRandomNumberGeneratorTest : public QObject
diff --git a/src/xmpp/blake2/blake2-impl.h b/src/xmpp/blake2/blake2-impl.h
index c1df82e0..6369ac76 100644
--- a/src/xmpp/blake2/blake2-impl.h
+++ b/src/xmpp/blake2/blake2-impl.h
@@ -157,4 +157,4 @@ static BLAKE2_INLINE void secure_zero_memory(void *v, size_t n)
   memset_v(v, 0, n);
 }
 
-#endif
+#endif // BLAKE2_IMPL_H
diff --git a/src/xmpp/blake2/blake2.h b/src/xmpp/blake2/blake2.h
index ad62f260..e547afb9 100644
--- a/src/xmpp/blake2/blake2.h
+++ b/src/xmpp/blake2/blake2.h
@@ -86,7 +86,6 @@ extern "C" {
     size_t        outlen;
   } blake2bp_state;
 
-
   BLAKE2_PACKED(struct blake2s_param__
   {
     uint8_t  digest_length; /* 1 */
@@ -192,4 +191,4 @@ extern "C" {
 }
 #endif
 
-#endif
+#endif // BLAKE2_H
diff --git a/src/xmpp/blake2/blake2b-ref.c b/src/xmpp/blake2/blake2b-ref.c
index cd38b1ba..ab5fbde8 100644
--- a/src/xmpp/blake2/blake2b-ref.c
+++ b/src/xmpp/blake2/blake2b-ref.c
@@ -13,12 +13,12 @@
    https://blake2.net.
 */
 
+#include "blake2-impl.h"
+#include "blake2.h"
+
 #include <stdint.h>
-#include <string.h>
 #include <stdio.h>
-
-#include "blake2.h"
-#include "blake2-impl.h"
+#include <string.h>
 
 static const uint64_t blake2b_IV[8] =
 {
@@ -44,7 +44,6 @@ static const uint8_t blake2b_sigma[12][16] =
   { 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3 }
 };
 
-
 static void blake2b_set_lastnode( blake2b_state *S )
 {
   S->f[1] = (uint64_t)-1;
@@ -93,8 +92,6 @@ int blake2b_init_param( blake2b_state *S, const blake2b_param *P )
   return 0;
 }
 
-
-
 int blake2b_init( blake2b_state *S, size_t outlen )
 {
   blake2b_param P[1];
@@ -116,7 +113,6 @@ int blake2b_init( blake2b_state *S, size_t outlen )
   return blake2b_init_param( S, P );
 }
 
-
 int blake2b_init_key( blake2b_state *S, size_t outlen, const void *key, size_t keylen )
 {
   blake2b_param P[1];
@@ -311,8 +307,8 @@ int crypto_hash( unsigned char *out, unsigned char *in, unsigned long long inlen
 #endif
 
 #if defined(BLAKE2B_SELFTEST)
-#include <string.h>
 #include "blake2-kat.h"
+#include <string.h>
 int main( void )
 {
   uint8_t key[BLAKE2B_KEYBYTES];
diff --git a/src/xmpp/blake2/blake2qt.cpp b/src/xmpp/blake2/blake2qt.cpp
index b90c7f6d..381d5b58 100644
--- a/src/xmpp/blake2/blake2qt.cpp
+++ b/src/xmpp/blake2/blake2qt.cpp
@@ -1,10 +1,10 @@
 #include "blake2qt.h"
+
 #include "blake2.h"
 
 #include <QIODevice>
 
 namespace XMPP {
-
 QByteArray computeBlake2Hash(const QByteArray &ba, Blake2DigestSize digestSize)
 {
     QByteArray ret;
@@ -101,5 +101,4 @@ QByteArray computeBlake2Hash(QIODevice *dev, Blake2DigestSize digestSize)
         return computeBlake2Hash512(dev);
     }
 }
-
 } //namespace XMPP
diff --git a/src/xmpp/blake2/blake2qt.h b/src/xmpp/blake2/blake2qt.h
index 8240afbd..78f08481 100644
--- a/src/xmpp/blake2/blake2qt.h
+++ b/src/xmpp/blake2/blake2qt.h
@@ -6,7 +6,6 @@
 class QIODevice;
 
 namespace XMPP {
-
 enum Blake2DigestSize {
     Blake2Digest256,
     Blake2Digest512
@@ -14,6 +13,6 @@ enum Blake2DigestSize {
 
 QByteArray computeBlake2Hash(const QByteArray &ba, Blake2DigestSize digestSize);
 QByteArray computeBlake2Hash(QIODevice *dev, Blake2DigestSize digestSize);
+} // namespace XMPP
 
-}
-#endif
+#endif // BLAKE2QT_H
diff --git a/src/xmpp/blake2/blake2s-ref.c b/src/xmpp/blake2/blake2s-ref.c
index c8b035f6..f4e09dfc 100644
--- a/src/xmpp/blake2/blake2s-ref.c
+++ b/src/xmpp/blake2/blake2s-ref.c
@@ -13,12 +13,12 @@
    https://blake2.net.
 */
 
+#include "blake2-impl.h"
+#include "blake2.h"
+
 #include <stdint.h>
-#include <string.h>
 #include <stdio.h>
-
-#include "blake2.h"
-#include "blake2-impl.h"
+#include <string.h>
 
 static const uint32_t blake2s_IV[8] =
 {
@@ -88,7 +88,6 @@ int blake2s_init_param( blake2s_state *S, const blake2s_param *P )
   return 0;
 }
 
-
 /* Sequential blake2s initialization */
 int blake2s_init( blake2s_state *S, size_t outlen )
 {
@@ -299,8 +298,8 @@ int crypto_hash( unsigned char *out, unsigned char *in, unsigned long long inlen
 #endif
 
 #if defined(BLAKE2S_SELFTEST)
-#include <string.h>
 #include "blake2-kat.h"
+#include <string.h>
 int main( void )
 {
   uint8_t key[BLAKE2S_KEYBYTES];
diff --git a/src/xmpp/jid/jid.cpp b/src/xmpp/jid/jid.cpp
index e7e35bc5..e33b8682 100644
--- a/src/xmpp/jid/jid.cpp
+++ b/src/xmpp/jid/jid.cpp
@@ -19,15 +19,14 @@
 
 #include "xmpp/jid/jid.h"
 
-#include <QCoreApplication>
-#include <stringprep.h>
-
 #ifndef NO_IRISNET
-#include "irisnetglobal_p.h"
+#    include "irisnetglobal_p.h"
 #endif
 
-using namespace XMPP;
+#include <QCoreApplication>
+#include <stringprep.h>
 
+using namespace XMPP;
 
 //----------------------------------------------------------------------------
 // StringPrepCache
diff --git a/src/xmpp/jid/jid.h b/src/xmpp/jid/jid.h
index 92ee5d84..b334150b 100644
--- a/src/xmpp/jid/jid.h
+++ b/src/xmpp/jid/jid.h
@@ -20,13 +20,12 @@
 #ifndef XMPP_JID_H
 #define XMPP_JID_H
 
-#include <QString>
-#include <QScopedPointer>
 #include <QByteArray>
 #include <QHash>
+#include <QScopedPointer>
+#include <QString>
 
-namespace XMPP
-{
+namespace XMPP {
     class StringPrepCache
     {
     public:
@@ -98,6 +97,6 @@ namespace XMPP
     {
         return qHash(key.full(), seed);
     }
-}
+} // namespace XMPP
 
-#endif
+#endif // XMPP_JID_H
diff --git a/src/xmpp/jid/unittest/jidtest.cpp b/src/xmpp/jid/unittest/jidtest.cpp
index fa4dc602..b3c417e5 100644
--- a/src/xmpp/jid/unittest/jidtest.cpp
+++ b/src/xmpp/jid/unittest/jidtest.cpp
@@ -18,12 +18,12 @@
 
 // FIXME: Complete this
 
-#include <QtTest/QtTest>
-#include <QObject>
-
 #include "qttestutil/qttestutil.h"
 #include "xmpp/jid/jid.h"
 
+#include <QObject>
+#include <QtTest/QtTest>
+
 using namespace XMPP;
 
 class JidTest : public QObject
diff --git a/src/xmpp/qa/qttestutil/example/myfirstclasstest.cpp b/src/xmpp/qa/qttestutil/example/myfirstclasstest.cpp
index 122742a7..a62835b7 100644
--- a/src/xmpp/qa/qttestutil/example/myfirstclasstest.cpp
+++ b/src/xmpp/qa/qttestutil/example/myfirstclasstest.cpp
@@ -1,8 +1,8 @@
+#include "qttestutil/qttestutil.h"
+
 #include <QObject>
 #include <QtTest/QtTest>
 
-#include "qttestutil/qttestutil.h"
-
 class MyFirstClassTest : public QObject
 {
      Q_OBJECT
diff --git a/src/xmpp/qa/qttestutil/example/mysecondclasstest.cpp b/src/xmpp/qa/qttestutil/example/mysecondclasstest.cpp
index 80be96d5..c2b57159 100644
--- a/src/xmpp/qa/qttestutil/example/mysecondclasstest.cpp
+++ b/src/xmpp/qa/qttestutil/example/mysecondclasstest.cpp
@@ -1,8 +1,8 @@
+#include "qttestutil/qttestutil.h"
+
 #include <QObject>
 #include <QtTest/QtTest>
 
-#include "qttestutil/qttestutil.h"
-
 class MySecondClassTest : public QObject
 {
      Q_OBJECT
diff --git a/src/xmpp/qa/qttestutil/qttestutil.h b/src/xmpp/qa/qttestutil/qttestutil.h
index 69729aff..d53a8363 100644
--- a/src/xmpp/qa/qttestutil/qttestutil.h
+++ b/src/xmpp/qa/qttestutil/qttestutil.h
@@ -38,4 +38,4 @@
 #define QTTESTUTIL_REGISTER_TEST(TestClass) \
     static QtTestUtil::TestRegistration<TestClass> TestClass##Registration
 
-#endif
+#endif // QTTESTUTIL_H
diff --git a/src/xmpp/qa/qttestutil/simplechecker.cpp b/src/xmpp/qa/qttestutil/simplechecker.cpp
index 1ac56714..50a6f11e 100644
--- a/src/xmpp/qa/qttestutil/simplechecker.cpp
+++ b/src/xmpp/qa/qttestutil/simplechecker.cpp
@@ -16,10 +16,10 @@
  *
  */
 
-#include <QCoreApplication>
-
 #include "qttestutil/testregistry.h"
 
+#include <QCoreApplication>
+
 /**
  * Runs all tests registered with the QtTestUtil registry.
  */
diff --git a/src/xmpp/qa/qttestutil/testregistration.h b/src/xmpp/qa/qttestutil/testregistration.h
index 7754c735..0378ea05 100644
--- a/src/xmpp/qa/qttestutil/testregistration.h
+++ b/src/xmpp/qa/qttestutil/testregistration.h
@@ -22,7 +22,6 @@
 #include "qttestutil/testregistry.h"
 
 namespace QtTestUtil {
-
     /**
      * A wrapper class around a test to manage registration and static
      * creation of an instance of the test class.
@@ -45,7 +44,6 @@ namespace QtTestUtil {
         private:
             TestClass* test_;
     };
+} // namespace QtTestUtil
 
-}
-
-#endif
+#endif // QTTESTUTIL_TESTREGISTRATION_H
diff --git a/src/xmpp/qa/qttestutil/testregistry.cpp b/src/xmpp/qa/qttestutil/testregistry.cpp
index 9afaf083..29d58d8d 100644
--- a/src/xmpp/qa/qttestutil/testregistry.cpp
+++ b/src/xmpp/qa/qttestutil/testregistry.cpp
@@ -21,7 +21,6 @@
 #include <QtTest/QtTest>
 
 namespace QtTestUtil {
-
 TestRegistry* TestRegistry::getInstance()
 {
     static TestRegistry registry;
@@ -41,5 +40,4 @@ int TestRegistry::runTests(int argc, char* argv[])
     }
     return result;
 }
-
-}
+} // namespace QtTestUtil 
diff --git a/src/xmpp/qa/qttestutil/testregistry.h b/src/xmpp/qa/qttestutil/testregistry.h
index 332b8013..95d7502c 100644
--- a/src/xmpp/qa/qttestutil/testregistry.h
+++ b/src/xmpp/qa/qttestutil/testregistry.h
@@ -24,7 +24,6 @@
 class QObject;
 
 namespace QtTestUtil {
-
     /**
      * A registry of QtTest test classes.
      * All test classes registered with QTTESTUTIL_REGISTER_TEST add
@@ -57,6 +56,6 @@ namespace QtTestUtil {
         private:
             QList<QObject*> tests_;
     };
-}
+} // namespace QtTestUtil
 
-#endif
+#endif // QTTESTUTIL_TESTREGISTRY_H
diff --git a/src/xmpp/qa/unittest.pri b/src/xmpp/qa/unittest.pri
index 116b7096..85267535 100644
--- a/src/xmpp/qa/unittest.pri
+++ b/src/xmpp/qa/unittest.pri
@@ -5,7 +5,6 @@
 # standalone checker for the module.
 #
 
-
 CONFIG += crypto
 
 include($$PWD/qttestutil/qttestutil.pri)
diff --git a/src/xmpp/qa/unittest.template/myclasstest.cpp b/src/xmpp/qa/unittest.template/myclasstest.cpp
index d665feba..05218989 100644
--- a/src/xmpp/qa/unittest.template/myclasstest.cpp
+++ b/src/xmpp/qa/unittest.template/myclasstest.cpp
@@ -16,11 +16,11 @@
  *
  */
 
+#include "qttestutil/qttestutil.h"
+
 #include <QObject>
 #include <QtTest/QtTest>
 
-#include "qttestutil/qttestutil.h"
-
 class MyClassTest : public QObject
 {
      Q_OBJECT
diff --git a/src/xmpp/sasl/digestmd5proplist.cpp b/src/xmpp/sasl/digestmd5proplist.cpp
index f5e0bfe0..59c682e4 100644
--- a/src/xmpp/sasl/digestmd5proplist.cpp
+++ b/src/xmpp/sasl/digestmd5proplist.cpp
@@ -19,7 +19,6 @@
 #include "xmpp/sasl/digestmd5proplist.h"
 
 namespace XMPP {
-
 DIGESTMD5PropList::DIGESTMD5PropList() : QList<DIGESTMD5Prop>()
 {
 }
@@ -129,4 +128,4 @@ int DIGESTMD5PropList::varCount(const QByteArray &var) const
     return n;
 }
 
-}
+} // namespace XMPP
diff --git a/src/xmpp/sasl/digestmd5proplist.h b/src/xmpp/sasl/digestmd5proplist.h
index f6c9f4db..f94d36d4 100644
--- a/src/xmpp/sasl/digestmd5proplist.h
+++ b/src/xmpp/sasl/digestmd5proplist.h
@@ -19,8 +19,8 @@
 #ifndef DIGESTMD5PROPLIST_H
 #define DIGESTMD5PROPLIST_H
 
-#include <QList>
 #include <QByteArray>
+#include <QList>
 
 namespace XMPP {
     struct DIGESTMD5Prop
@@ -41,6 +41,6 @@ namespace XMPP {
         private:
             int varCount(const QByteArray &var) const;
     };
-}
+} // namespace XMPP
 
-#endif
+#endif // DIGESTMD5PROPLIST_H
diff --git a/src/xmpp/sasl/digestmd5response.cpp b/src/xmpp/sasl/digestmd5response.cpp
index 02f625a2..2cd4e9b9 100644
--- a/src/xmpp/sasl/digestmd5response.cpp
+++ b/src/xmpp/sasl/digestmd5response.cpp
@@ -18,15 +18,14 @@
 
 #include "xmpp/sasl/digestmd5response.h"
 
+#include "xmpp/base/randomnumbergenerator.h"
+#include "xmpp/sasl/digestmd5proplist.h"
+
 #include <QByteArray>
 #include <QtCrypto>
 #include <QtDebug>
 
-#include "xmpp/sasl/digestmd5proplist.h"
-#include "xmpp/base/randomnumbergenerator.h"
-
 namespace XMPP {
-
 DIGESTMD5Response::DIGESTMD5Response(const QByteArray& challenge, const QString& service, const QString& host, const QString& arealm, const QString& user, const QString& authz,  const QByteArray& password, const RandomNumberGenerator& rand) : isValid_(true)
 {
     QString realm = arealm;
@@ -93,5 +92,4 @@ DIGESTMD5Response::DIGESTMD5Response(const QByteArray& challenge, const QString&
         out.set("authzid", authz.toUtf8());
     value_  = out.toString();
 }
-
-}
+} // namespace XMPP
diff --git a/src/xmpp/sasl/digestmd5response.h b/src/xmpp/sasl/digestmd5response.h
index 403b3948..60969974 100644
--- a/src/xmpp/sasl/digestmd5response.h
+++ b/src/xmpp/sasl/digestmd5response.h
@@ -50,6 +50,6 @@ namespace XMPP {
             bool isValid_;
             QByteArray value_;
     };
-}
+} // namespace XMPP
 
-#endif
+#endif // DIGESTMD5RESPONSE_H
diff --git a/src/xmpp/sasl/plainmessage.cpp b/src/xmpp/sasl/plainmessage.cpp
index b067859a..3585065a 100644
--- a/src/xmpp/sasl/plainmessage.cpp
+++ b/src/xmpp/sasl/plainmessage.cpp
@@ -19,10 +19,9 @@
 #include "xmpp/sasl/plainmessage.h"
 
 namespace XMPP {
-
 PLAINMessage::PLAINMessage(const QString& authzid, const QString& authcid, const QByteArray& password)
 {
     value_ = authzid.toUtf8() + '\0' + authcid.toUtf8() + '\0' + password;
 }
 
-}
+} // namespace XMPP
diff --git a/src/xmpp/sasl/plainmessage.h b/src/xmpp/sasl/plainmessage.h
index 127613b9..a41c0b57 100644
--- a/src/xmpp/sasl/plainmessage.h
+++ b/src/xmpp/sasl/plainmessage.h
@@ -35,6 +35,6 @@ namespace XMPP {
         private:
             QByteArray value_;
     };
-}
+} // namespace XMPP
 
-#endif
+#endif // PLAINMESSAGE_H
diff --git a/src/xmpp/sasl/scramsha1message.cpp b/src/xmpp/sasl/scramsha1message.cpp
index 12559b73..eac93f5c 100644
--- a/src/xmpp/sasl/scramsha1message.cpp
+++ b/src/xmpp/sasl/scramsha1message.cpp
@@ -18,16 +18,15 @@
 
 #include "xmpp/sasl/scramsha1message.h"
 
+#include "xmpp/base/randomnumbergenerator.h"
+#include "xmpp/jid/jid.h"
+
+#include <QDebug>
 #include <QString>
 #include <QTextStream>
 #include <QtCrypto>
-#include <QDebug>
-
-#include "xmpp/base/randomnumbergenerator.h"
-#include "xmpp/jid/jid.h"
 
 namespace XMPP {
-
 bool Normalize(const QString &username_in, QString &username_out ) {
     // SASLprep
     if (StringPrepCache::saslprep(username_in, 1024, username_out)) {
@@ -68,5 +67,4 @@ SCRAMSHA1Message::SCRAMSHA1Message(const QString& authzid, const QString& authci
     QTextStream(&result) << ",n=" << username << ",r=" << clientnonce;
     value_ = result.toUtf8();
 }
-
-}
+} // namespace XMPP
diff --git a/src/xmpp/sasl/scramsha1message.h b/src/xmpp/sasl/scramsha1message.h
index cad4f790..24fae6fb 100644
--- a/src/xmpp/sasl/scramsha1message.h
+++ b/src/xmpp/sasl/scramsha1message.h
@@ -19,11 +19,11 @@
 #ifndef SCRAMSHA1MESSAGE_H
 #define SCRAMSHA1MESSAGE_H
 
+#include "xmpp/base/randomnumbergenerator.h"
+
 #include <QByteArray>
 #include <QString>
 
-#include "xmpp/base/randomnumbergenerator.h"
-
 namespace XMPP {
     class SCRAMSHA1Message
     {
@@ -42,6 +42,6 @@ namespace XMPP {
             QByteArray value_;
             bool isValid_;
     };
-}
+} // namespace XMPP
 
-#endif
+#endif // SCRAMSHA1MESSAGE_H
diff --git a/src/xmpp/sasl/scramsha1response.cpp b/src/xmpp/sasl/scramsha1response.cpp
index 210ae63b..960327e8 100644
--- a/src/xmpp/sasl/scramsha1response.cpp
+++ b/src/xmpp/sasl/scramsha1response.cpp
@@ -18,15 +18,15 @@
 
 #include "xmpp/sasl/scramsha1response.h"
 
+#include "xmpp/base/randomnumbergenerator.h"
+#include "xmpp/jid/jid.h"
+
 #include <QByteArray>
+#include <QRegExp>
 #include <QString>
 #include <QTextStream>
 #include <QtCrypto>
 #include <QtDebug>
-#include <QRegExp>
-
-#include "xmpp/base/randomnumbergenerator.h"
-#include "xmpp/jid/jid.h"
 
 namespace XMPP {
     QCA::SecureArray HMAC_SHA_1(const QCA::SecureArray &key, const QCA::SecureArray &str) {
@@ -130,5 +130,4 @@ namespace XMPP {
 const QString SCRAMSHA1Response::getSaltedPassword() {
     return QCA::Base64().arrayToString(salted_password_);
 }
-
-}
+} // namespace XMPP
diff --git a/src/xmpp/sasl/scramsha1response.h b/src/xmpp/sasl/scramsha1response.h
index 93a141cc..9d00dee8 100644
--- a/src/xmpp/sasl/scramsha1response.h
+++ b/src/xmpp/sasl/scramsha1response.h
@@ -56,6 +56,6 @@ namespace XMPP {
             QCA::SecureArray server_signature_;
             QCA::SymmetricKey salted_password_;
     };
-}
+} // namespace XMPP
 
-#endif
+#endif // SCRAMSHA1RESPONSE_H
diff --git a/src/xmpp/sasl/scramsha1signature.cpp b/src/xmpp/sasl/scramsha1signature.cpp
index 70240c23..60b101ba 100644
--- a/src/xmpp/sasl/scramsha1signature.cpp
+++ b/src/xmpp/sasl/scramsha1signature.cpp
@@ -18,17 +18,16 @@
 
 #include "xmpp/sasl/scramsha1signature.h"
 
+#include "xmpp/base/randomnumbergenerator.h"
+
 #include <QByteArray>
+#include <QRegExp>
 #include <QString>
 #include <QTextStream>
 #include <QtCrypto>
 #include <QtDebug>
-#include <QRegExp>
-
-#include "xmpp/base/randomnumbergenerator.h"
 
 namespace XMPP {
-
     SCRAMSHA1Signature::SCRAMSHA1Signature(const QByteArray &server_final_message, const QCA::SecureArray &server_signature_should)
 {
     QRegExp pattern("v=([^,]*)");
@@ -43,5 +42,4 @@ namespace XMPP {
         isValid_ = false;
     }
 }
-
-}
+} // namespace XMPP
diff --git a/src/xmpp/sasl/scramsha1signature.h b/src/xmpp/sasl/scramsha1signature.h
index 81969ca1..5b4125d1 100644
--- a/src/xmpp/sasl/scramsha1signature.h
+++ b/src/xmpp/sasl/scramsha1signature.h
@@ -36,6 +36,6 @@ namespace XMPP {
         private:
             bool isValid_;
     };
-}
+} // namespace XMPP
 
-#endif
+#endif // SCRAMSHA1SIGNATURE_H
diff --git a/src/xmpp/sasl/unittest/digestmd5responsetest.cpp b/src/xmpp/sasl/unittest/digestmd5responsetest.cpp
index 825b21d9..6cf2d790 100644
--- a/src/xmpp/sasl/unittest/digestmd5responsetest.cpp
+++ b/src/xmpp/sasl/unittest/digestmd5responsetest.cpp
@@ -16,13 +16,13 @@
  *
  */
 
-#include <QObject>
-#include <QtTest/QtTest>
-#include <QtCrypto>
-
 #include "qttestutil/qttestutil.h"
-#include "xmpp/sasl/digestmd5response.h"
 #include "xmpp/base/unittest/incrementingrandomnumbergenerator.h"
+#include "xmpp/sasl/digestmd5response.h"
+
+#include <QObject>
+#include <QtCrypto>
+#include <QtTest/QtTest>
 
 using namespace XMPP;
 
diff --git a/src/xmpp/sasl/unittest/plainmessagetest.cpp b/src/xmpp/sasl/unittest/plainmessagetest.cpp
index ec2a66c1..7bb1dc29 100644
--- a/src/xmpp/sasl/unittest/plainmessagetest.cpp
+++ b/src/xmpp/sasl/unittest/plainmessagetest.cpp
@@ -16,12 +16,12 @@
  *
  */
 
+#include "qttestutil/qttestutil.h"
+#include "xmpp/sasl/plainmessage.h"
+
 #include <QObject>
 #include <QtTest/QtTest>
 
-#include "xmpp/sasl/plainmessage.h"
-#include "qttestutil/qttestutil.h"
-
 using namespace XMPP;
 
 class PlainMessageTest : public QObject
diff --git a/src/xmpp/sasl/unittest/scramsha1messagetest.cpp b/src/xmpp/sasl/unittest/scramsha1messagetest.cpp
index 24d3a36a..0cf9121d 100644
--- a/src/xmpp/sasl/unittest/scramsha1messagetest.cpp
+++ b/src/xmpp/sasl/unittest/scramsha1messagetest.cpp
@@ -16,14 +16,14 @@
  *
  */
 
-#include <QObject>
-#include <QtTest/QtTest>
-#include <QtCrypto>
-
 #include "qttestutil/qttestutil.h"
 #include "xmpp/base/unittest/incrementingrandomnumbergenerator.h"
 #include "xmpp/sasl/scramsha1message.h"
 
+#include <QObject>
+#include <QtCrypto>
+#include <QtTest/QtTest>
+
 using namespace XMPP;
 
 class SCRAMSHA1MessageTest : public QObject
diff --git a/src/xmpp/sasl/unittest/scramsha1responsetest.cpp b/src/xmpp/sasl/unittest/scramsha1responsetest.cpp
index 132302aa..6e0260fb 100644
--- a/src/xmpp/sasl/unittest/scramsha1responsetest.cpp
+++ b/src/xmpp/sasl/unittest/scramsha1responsetest.cpp
@@ -16,14 +16,14 @@
  *
  */
 
-#include <QObject>
-#include <QtTest/QtTest>
-#include <QtCrypto>
-
 #include "qttestutil/qttestutil.h"
+#include "xmpp/base/unittest/incrementingrandomnumbergenerator.h"
 #include "xmpp/sasl/scramsha1response.h"
 #include "xmpp/sasl/scramsha1signature.h"
-#include "xmpp/base/unittest/incrementingrandomnumbergenerator.h"
+
+#include <QObject>
+#include <QtCrypto>
+#include <QtTest/QtTest>
 
 using namespace XMPP;
 
diff --git a/src/xmpp/xmpp-core/compressionhandler.cpp b/src/xmpp/xmpp-core/compressionhandler.cpp
index 89fd9f1d..6d051ca8 100644
--- a/src/xmpp/xmpp-core/compressionhandler.cpp
+++ b/src/xmpp/xmpp-core/compressionhandler.cpp
@@ -1,10 +1,10 @@
-#include <QTimer>
-#include <QDebug>
-
 #include "compressionhandler.h"
 #include "xmpp/zlib/zlibcompressor.h"
 #include "xmpp/zlib/zlibdecompressor.h"
 
+#include <QDebug>
+#include <QTimer>
+
 CompressionHandler::CompressionHandler()
     : errorCode_(0)
 {
diff --git a/src/xmpp/xmpp-core/compressionhandler.h b/src/xmpp/xmpp-core/compressionhandler.h
index d336af47..13b2808d 100644
--- a/src/xmpp/xmpp-core/compressionhandler.h
+++ b/src/xmpp/xmpp-core/compressionhandler.h
@@ -1,8 +1,8 @@
 #ifndef COMPRESSIONHANDLER_H
 #define COMPRESSIONHANDLER_H
 
-#include <QObject>
 #include <QBuffer>
+#include <QObject>
 
 class ZLibCompressor;
 class ZLibDecompressor;
@@ -32,4 +32,4 @@ class CompressionHandler : public QObject
     int errorCode_;
 };
 
-#endif
+#endif // COMPRESSIONHANDLER_H
diff --git a/src/xmpp/xmpp-core/connector.cpp b/src/xmpp/xmpp-core/connector.cpp
index 6aa01c2f..b8617787 100644
--- a/src/xmpp/xmpp-core/connector.cpp
+++ b/src/xmpp/xmpp-core/connector.cpp
@@ -28,21 +28,19 @@
   greatly simplify this class.  - Sep 3rd, 2003.
 */
 
+#include "bsocket.h"
+#include "httpconnect.h"
+#include "httppoll.h"
+#include "socks.h"
 #include "xmpp.h"
 
-#include <QPointer>
 #include <QList>
-#include <QUrl>
+#include <QPointer>
 #include <QTimer>
+#include <QUrl>
 #include <qca.h>
 
-#include "bsocket.h"
-#include "httpconnect.h"
-#include "httppoll.h"
-#include "socks.h"
-
 //#define XMPP_DEBUG
-
 #ifdef XMPP_DEBUG
 # define XDEBUG (qDebug() << this << "#" << __FUNCTION__ << ":")
 #endif
@@ -54,7 +52,6 @@ static const int XMPP_LEGACY_PORT = 5223;
 static const char* XMPP_CLIENT_SRV = "xmpp-client";
 static const char* XMPP_CLIENT_TRANSPORT = "tcp";
 
-
 //----------------------------------------------------------------------------
 // Connector
 //----------------------------------------------------------------------------
@@ -113,7 +110,6 @@ QString Connector::host() const
     return QString();
 }
 
-
 //----------------------------------------------------------------------------
 // AdvancedConnector::Proxy
 //----------------------------------------------------------------------------
@@ -186,7 +182,6 @@ void AdvancedConnector::Proxy::setPollInterval(int secs)
     v_poll = secs;
 }
 
-
 //----------------------------------------------------------------------------
 // AdvancedConnector
 //----------------------------------------------------------------------------
diff --git a/src/xmpp/xmpp-core/parser.cpp b/src/xmpp/xmpp-core/parser.cpp
index 4eb601d8..282839db 100644
--- a/src/xmpp/xmpp-core/parser.cpp
+++ b/src/xmpp/xmpp-core/parser.cpp
@@ -347,12 +347,10 @@ class StreamInput : public QXmlInputSource
     }
 };
 
-
 //----------------------------------------------------------------------------
 // ParserHandler
 //----------------------------------------------------------------------------
-namespace XMPP
-{
+namespace XMPP {
     class ParserHandler : public QXmlDefaultHandler
     {
     public:
@@ -545,8 +543,7 @@ namespace XMPP
         QList<Parser::Event*> eventList;
         bool needMore = false;
     };
-};
-
+}; // namespace XMPP
 
 //----------------------------------------------------------------------------
 // Event
diff --git a/src/xmpp/xmpp-core/parser.h b/src/xmpp/xmpp-core/parser.h
index 72fa9b57..3b7a9f63 100644
--- a/src/xmpp/xmpp-core/parser.h
+++ b/src/xmpp/xmpp-core/parser.h
@@ -23,8 +23,7 @@
 #include <qdom.h>
 #include <qxml.h>
 
-namespace XMPP
-{
+namespace XMPP {
     class Parser
     {
     public:
@@ -80,6 +79,6 @@ namespace XMPP
         class Private;
         Private *d;
     };
-}
+} // namespace XMPP
 
-#endif
+#endif // PARSER_H
diff --git a/src/xmpp/xmpp-core/protocol.cpp b/src/xmpp/xmpp-core/protocol.cpp
index d6bdc297..7ba0845a 100644
--- a/src/xmpp/xmpp-core/protocol.cpp
+++ b/src/xmpp/xmpp-core/protocol.cpp
@@ -23,15 +23,15 @@
 
 #include "protocol.h"
 
-#include <qca.h>
-#include <QList>
-#include <QByteArray>
-#include <QtCrypto>
-
 #ifdef XMPP_TEST
 #include "td.h"
 #endif
 
+#include <QByteArray>
+#include <QList>
+#include <QtCrypto>
+#include <qca.h>
+
 using namespace XMPP;
 
 // printArray
diff --git a/src/xmpp/xmpp-core/protocol.h b/src/xmpp/xmpp-core/protocol.h
index 764be73b..13cb6531 100644
--- a/src/xmpp/xmpp-core/protocol.h
+++ b/src/xmpp/xmpp-core/protocol.h
@@ -20,15 +20,15 @@
 #ifndef PROTOCOL_H
 #define PROTOCOL_H
 
-#include <QObject>
+#include "sm.h"
+#include "xmlprotocol.h"
+#include "xmpp.h"
+
 #include <QList>
+#include <QObject>
 #include <QPair>
 #include <QTimer>
 
-#include "xmlprotocol.h"
-#include "xmpp.h"
-#include "sm.h"
-
 #define NS_ETHERX   "http://etherx.jabber.org/streams"
 #define NS_CLIENT   "jabber:client"
 #define NS_SERVER   "jabber:server"
@@ -44,8 +44,7 @@
 #define NS_COMPRESS_PROTOCOL "http://jabber.org/protocol/compress"
 #define NS_HOSTS    "http://barracuda.com/xmppextensions/hosts"
 
-namespace XMPP
-{
+namespace XMPP {
     class Version
     {
     public:
@@ -383,6 +382,6 @@ namespace XMPP
         void elementSend(const QDomElement &e);
         void elementRecv(const QDomElement &e);
     };
-}
+} // namespace XMPP
 
-#endif
+#endif // PROTOCOL_H
diff --git a/src/xmpp/xmpp-core/securestream.cpp b/src/xmpp/xmpp-core/securestream.cpp
index f1934d37..74cf9238 100644
--- a/src/xmpp/xmpp-core/securestream.cpp
+++ b/src/xmpp/xmpp-core/securestream.cpp
@@ -27,14 +27,14 @@
 
 #include "securestream.h"
 
-#include <qpointer.h>
-#include <QList>
-#include <qtimer.h>
-
+#include "compressionhandler.h"
 #ifdef USE_TLSHANDLER
 #include "xmpp.h"
 #endif
-#include "compressionhandler.h"
+
+#include <QList>
+#include <qpointer.h>
+#include <qtimer.h>
 
 //----------------------------------------------------------------------------
 // LayerTracker
diff --git a/src/xmpp/xmpp-core/securestream.h b/src/xmpp/xmpp-core/securestream.h
index 5607c959..6abc2ca6 100644
--- a/src/xmpp/xmpp-core/securestream.h
+++ b/src/xmpp/xmpp-core/securestream.h
@@ -20,14 +20,13 @@
 #ifndef SECURESTREAM_H
 #define SECURESTREAM_H
 
-#include <qca.h>
 #include "bytestream.h"
 
-#define USE_TLSHANDLER
+#include <qca.h>
 
+#define USE_TLSHANDLER
 #ifdef USE_TLSHANDLER
-namespace XMPP
-{
+namespace XMPP {
     class TLSHandler;
 }
 #endif
@@ -83,4 +82,4 @@ private slots:
     Private *d;
 };
 
-#endif
+#endif // SECURESTREAM_H
diff --git a/src/xmpp/xmpp-core/simplesasl.cpp b/src/xmpp/xmpp-core/simplesasl.cpp
index 4480a673..c17930c8 100644
--- a/src/xmpp/xmpp-core/simplesasl.cpp
+++ b/src/xmpp/xmpp-core/simplesasl.cpp
@@ -19,22 +19,22 @@
 
 #include "simplesasl.h"
 
+#include "xmpp/base/randrandomnumbergenerator.h"
+#include "xmpp/sasl/digestmd5response.h"
+#include "xmpp/sasl/plainmessage.h"
+#include "xmpp/sasl/scramsha1message.h"
+#include "xmpp/sasl/scramsha1response.h"
+#include "xmpp/sasl/scramsha1signature.h"
+
+#include <QByteArray>
+#include <QDebug>
+#include <QList>
 #include <QObject>
+#include <QtCrypto>
+#include <qca.h>
 #include <qhostaddress.h>
 #include <qstringlist.h>
-#include <QList>
-#include <qca.h>
-#include <QByteArray>
 #include <stdlib.h>
-#include <QtCrypto>
-#include <QDebug>
-
-#include "xmpp/sasl/plainmessage.h"
-#include "xmpp/sasl/digestmd5response.h"
-#include "xmpp/sasl/scramsha1response.h"
-#include "xmpp/sasl/scramsha1message.h"
-#include "xmpp/sasl/scramsha1signature.h"
-#include "xmpp/base/randrandomnumbergenerator.h"
 
 namespace XMPP {
 class SimpleSASLContext : public QCA::SASLContext
@@ -460,7 +460,6 @@ QCA::Provider *createProviderSimpleSASL()
 {
     return (new QCASimpleSASL);
 }
-
-}
+} // namespace XMPP
 
 #include "simplesasl.moc"
diff --git a/src/xmpp/xmpp-core/simplesasl.h b/src/xmpp/xmpp-core/simplesasl.h
index c6d1769d..fb880cf0 100644
--- a/src/xmpp/xmpp-core/simplesasl.h
+++ b/src/xmpp/xmpp-core/simplesasl.h
@@ -24,9 +24,8 @@ namespace QCA {
     class Provider;
 }
 
-namespace XMPP
-{
+namespace XMPP {
     QCA::Provider* createProviderSimpleSASL();
 }
 
-#endif
+#endif // SIMPLESASL_H
diff --git a/src/xmpp/xmpp-core/sm.cpp b/src/xmpp/xmpp-core/sm.cpp
index 0c508b77..7ed53e3e 100644
--- a/src/xmpp/xmpp-core/sm.cpp
+++ b/src/xmpp/xmpp-core/sm.cpp
@@ -17,13 +17,12 @@
  *
  */
 
+#include "sm.h"
+
 #ifdef IRIS_SM_DEBUG
 #include <QDebug>
 #endif
 
-
-#include "sm.h"
-
 using namespace XMPP;
 
 SMState::SMState()
@@ -42,7 +41,6 @@ void SMState::resetCounters()
     send_queue.clear();
 }
 
-
 StreamManagement::StreamManagement(QObject *parent)
     : QObject(parent)
     , sm_started(false)
diff --git a/src/xmpp/xmpp-core/sm.h b/src/xmpp/xmpp-core/sm.h
index e16d3c14..0be89a4f 100644
--- a/src/xmpp/xmpp-core/sm.h
+++ b/src/xmpp/xmpp-core/sm.h
@@ -20,18 +20,17 @@
 #ifndef XMPP_SM_H
 #define XMPP_SM_H
 
-#include <QObject>
-#include <QQueue>
 #include <QDomElement>
 #include <QElapsedTimer>
+#include <QObject>
+#include <QQueue>
 
 #define NS_STREAM_MANAGEMENT   "urn:xmpp:sm:3"
 #define SM_TIMER_INTERVAL_SECS 40
 
 //#define IRIS_SM_DEBUG
 
-namespace XMPP
-{
+namespace XMPP {
     class SMState
     {
     public:
@@ -87,6 +86,6 @@ namespace XMPP
             bool waiting_answer = false;
         } sm_timeout_data;
     };
-}
+} // namespace XMPP
 
-#endif //XMPP_SM_H
+#endif // XMPP_SM_H
diff --git a/src/xmpp/xmpp-core/stream.cpp b/src/xmpp/xmpp-core/stream.cpp
index b0c7e49c..5e468d80 100644
--- a/src/xmpp/xmpp-core/stream.cpp
+++ b/src/xmpp/xmpp-core/stream.cpp
@@ -41,31 +41,26 @@
     - sasl anonymous
 */
 
-#include "xmpp.h"
-
-#include <QTextStream>
-#include <QPointer>
-#include <QTimer>
-#include <QList>
-#include <QByteArray>
-#include <QtCrypto>
-#include <QUrl>
-//#include <stdio.h>
-#include <stdlib.h>
-
 #include "bytestream.h"
-#include "simplesasl.h"
-#include "securestream.h"
-#include "protocol.h"
-
 #ifndef NO_IRISNET
-#include "irisnetglobal_p.h"
+#    include "irisnetglobal_p.h"
 #endif
-
+#include "protocol.h"
+#include "securestream.h"
+#include "simplesasl.h"
 #ifdef XMPP_TEST
-#include "td.h"
+#    include "td.h"
 #endif
 
+#include <QByteArray>
+#include <QList>
+#include <QPointer>
+#include <QTextStream>
+#include <QTimer>
+#include <QUrl>
+#include <QtCrypto>
+//#include <stdio.h>
+#include <stdlib.h>
 
 //#define XMPP_DEBUG
 
@@ -538,7 +533,6 @@ QString ClientStream::errorText() const
     return d->errText;
 }
 
-
 QHash<QString,QString> ClientStream::errorLangText() const
 {
     return d->errLangText;
@@ -1562,7 +1556,6 @@ QList<QDomElement> ClientStream::unhandledFeatures() const
     return d->client.unhandledFeatures;
 }
 
-
 //----------------------------------------------------------------------------
 // Debug
 //----------------------------------------------------------------------------
diff --git a/src/xmpp/xmpp-core/td.h b/src/xmpp/xmpp-core/td.h
index f20dbe6c..192dc01b 100644
--- a/src/xmpp/xmpp-core/td.h
+++ b/src/xmpp/xmpp-core/td.h
@@ -16,5 +16,4 @@ class TD
     static void incomingXml(const QDomElement &);
 };
 
-#endif
-
+#endif // TESTDEBUG_H
diff --git a/src/xmpp/xmpp-core/tlshandler.cpp b/src/xmpp/xmpp-core/tlshandler.cpp
index e129e1fa..2a5fe27c 100644
--- a/src/xmpp/xmpp-core/tlshandler.cpp
+++ b/src/xmpp/xmpp-core/tlshandler.cpp
@@ -17,16 +17,15 @@
  *
  */
 
+#include "qca.h"
 #include "xmpp.h"
 
 #include <qtimer.h>
-#include "qca.h"
+#include <qurl.h>
 
 using namespace XMPP;
-
 // FIXME: remove this code once qca cert host checking works ...
 using namespace QCA;
-#include <qurl.h>
 
 // ip address string to binary (msb), adapted from jdns (adapted from qt)
 // return: size 4 = ipv4, size 16 = ipv6, size 0 = error
@@ -312,7 +311,6 @@ TLSHandler::~TLSHandler()
 {
 }
 
-
 //----------------------------------------------------------------------------
 // QCATLSHandler
 //----------------------------------------------------------------------------
@@ -371,7 +369,6 @@ bool QCATLSHandler::certMatchesHostname()
     return false;
 }
 
-
 QCA::TLS *QCATLSHandler::tls() const
 {
     return d->tls;
diff --git a/src/xmpp/xmpp-core/xmlprotocol.cpp b/src/xmpp/xmpp-core/xmlprotocol.cpp
index e3774c23..32e6aa85 100644
--- a/src/xmpp/xmpp-core/xmlprotocol.cpp
+++ b/src/xmpp/xmpp-core/xmlprotocol.cpp
@@ -17,13 +17,14 @@
  *
  */
 
-#include <QList>
-#include <QTextStream>
-#include <QByteArray>
-
 #include "xmlprotocol.h"
+
 #include "bytestream.h"
 
+#include <QByteArray>
+#include <QList>
+#include <QTextStream>
+
 using namespace XMPP;
 
 // stripExtraNS
@@ -171,7 +172,6 @@ static inline bool highSurrogate(const quint32 ch)
     return  ch >= 0xD800 && ch <= 0xDBFF;
 }
 
-
 // force encoding of '>'.  this function is needed for XMPP-Core, which
 //  requires the '>' character to be encoded as "&gt;" even though this is
 //  not required by the XML spec.
@@ -243,7 +243,6 @@ static QString sanitizeForStream(const QString &in)
     return out;
 }
 
-
 //----------------------------------------------------------------------------
 // Protocol
 //----------------------------------------------------------------------------
diff --git a/src/xmpp/xmpp-core/xmlprotocol.h b/src/xmpp/xmpp-core/xmlprotocol.h
index cc63e707..2f02a75a 100644
--- a/src/xmpp/xmpp-core/xmlprotocol.h
+++ b/src/xmpp/xmpp-core/xmlprotocol.h
@@ -20,15 +20,15 @@
 #ifndef XMLPROTOCOL_H
 #define XMLPROTOCOL_H
 
-#include <qdom.h>
+#include "parser.h"
+
 #include <QList>
 #include <QObject>
-#include "parser.h"
+#include <qdom.h>
 
 #define NS_XML "http://www.w3.org/XML/1998/namespace"
 
-namespace XMPP
-{
+namespace XMPP {
     class XmlProtocol : public QObject
     {
     public:
@@ -147,6 +147,6 @@ namespace XMPP
         void sendTagClose();
         bool baseStep(const Parser::Event &pe);
     };
-}
+} // namespace XMPP
 
-#endif
+#endif // XMLPROTOCOL_H
diff --git a/src/xmpp/xmpp-core/xmpp.h b/src/xmpp/xmpp-core/xmpp.h
index 76443b05..2bb59c63 100644
--- a/src/xmpp/xmpp-core/xmpp.h
+++ b/src/xmpp/xmpp-core/xmpp.h
@@ -20,33 +20,29 @@
 #ifndef XMPP_H
 #define XMPP_H
 
-#include <QPair>
-#include <QUrl>
-#include <QObject>
-#include <QString>
-#include <QHostAddress>
-#include <QString>
-#include <QDomDocument>
-
 #include "addressresolver.h"
 #include "xmpp/jid/jid.h"
+#include "xmpp_clientstream.h"
 #include "xmpp_stanza.h"
 #include "xmpp_stream.h"
-#include "xmpp_clientstream.h"
 
-namespace QCA
-{
-    class TLS;
-};
+#include <QDomDocument>
+#include <QHostAddress>
+#include <QObject>
+#include <QPair>
+#include <QString>
+#include <QUrl>
+#include <QtCrypto> // For QCA::SASL::Params
 
 #ifndef CS_XMPP
-class ByteStream;
+    class ByteStream;
 #endif
 
-#include <QtCrypto> // For QCA::SASL::Params
+namespace QCA {
+    class TLS;
+};
 
-namespace XMPP
-{
+namespace XMPP {
     // CS_IMPORT_BEGIN cutestuff/bytestream.h
 #ifdef CS_XMPP
     class ByteStream;
@@ -232,6 +228,6 @@ namespace XMPP
         class Private;
         Private *d;
     };
-};
+}; // namespace XMPP
 
-#endif
+#endif // XMPP_H
diff --git a/src/xmpp/xmpp-core/xmpp_clientstream.h b/src/xmpp/xmpp-core/xmpp_clientstream.h
index d33bf834..f06d1e39 100644
--- a/src/xmpp/xmpp-core/xmpp_clientstream.h
+++ b/src/xmpp/xmpp-core/xmpp_clientstream.h
@@ -19,23 +19,22 @@
 #ifndef XMPP_CLIENTSTREAM_H
 #define XMPP_CLIENTSTREAM_H
 
-#include <QtCrypto>
-
 #include "xmpp_stream.h"
 
+#include <QtCrypto>
+
+class ByteStream;
 class QByteArray;
-class QString;
 class QDomDocument;
 class QDomElement;
-class QObject;
-class ByteStream;
 class QHostAddress;
+class QObject;
+class QString;
 
-namespace XMPP
-{
-    class TLSHandler;
+namespace XMPP {
     class Connector;
     class StreamFeatures;
+    class TLSHandler;
 
     class ClientStream : public Stream
     {
@@ -226,6 +225,6 @@ namespace XMPP
         void srvProcessNext();
         void setTimer(int secs);
     };
-}
+} // namespace XMPP
 
-#endif
+#endif // XMPP_CLIENTSTREAM_H
diff --git a/src/xmpp/xmpp-core/xmpp_stanza.cpp b/src/xmpp/xmpp-core/xmpp_stanza.cpp
index 25fe145c..6dfea235 100644
--- a/src/xmpp/xmpp-core/xmpp_stanza.cpp
+++ b/src/xmpp/xmpp-core/xmpp_stanza.cpp
@@ -18,16 +18,16 @@
 
 #include "xmpp_stanza.h"
 
-#include <QCoreApplication>
 #include "xmpp/jid/jid.h"
-#include "xmpp_stream.h"
 #include "xmpp_clientstream.h"
+#include "xmpp_stream.h"
 
+#include <QCoreApplication>
 #include <QDebug>
 
 using namespace XMPP;
 
-#define NS_STANZAS  "urn:ietf:params:xml:ns:xmpp-stanzas"
+#define NS_STANZAS "urn:ietf:params:xml:ns:xmpp-stanzas"
 #define NS_XML "http://www.w3.org/XML/1998/namespace"
 
 //----------------------------------------------------------------------------
@@ -91,7 +91,6 @@ void Stanza::Error::reset()
     originalCode = 0;
 }
 
-
 class Stanza::Error::Private
 {
 public:
@@ -125,7 +124,6 @@ class Stanza::Error::Private
     };
     static ErrorDescEntry errorDescriptions[];
 
-
     static int stringToErrorType(const QString &s)
     {
         for(int n = 0; errorTypeTable[n].str; ++n) {
@@ -676,4 +674,3 @@ QSharedPointer<QDomDocument> Stanza::unboundDocument(QSharedPointer<QDomDocument
     d->sharedDoc = sd;
     return d->sharedDoc;
 }
-
diff --git a/src/xmpp/xmpp-core/xmpp_stanza.h b/src/xmpp/xmpp-core/xmpp_stanza.h
index f9be5d62..c2fd7ae4 100644
--- a/src/xmpp/xmpp-core/xmpp_stanza.h
+++ b/src/xmpp/xmpp-core/xmpp_stanza.h
@@ -19,15 +19,14 @@
 #ifndef XMPP_STANZA_H
 #define XMPP_STANZA_H
 
-#include <QPair>
-#include <QString>
 #include <QDomElement>
+#include <QPair>
 #include <QSharedPointer>
+#include <QString>
 
 class QDomDocument;
 
-namespace XMPP
-{
+namespace XMPP {
     class Jid;
     class Stream;
 
@@ -139,6 +138,6 @@ namespace XMPP
         class Private;
         Private *d;
     };
-}
+} // namespace XMPP
 
-#endif
+#endif // XMPP_STANZA_H
diff --git a/src/xmpp/xmpp-core/xmpp_stream.h b/src/xmpp/xmpp-core/xmpp_stream.h
index 06dd3ae3..cb0d4cdb 100644
--- a/src/xmpp/xmpp-core/xmpp_stream.h
+++ b/src/xmpp/xmpp-core/xmpp_stream.h
@@ -20,16 +20,15 @@
 #ifndef XMPP_STREAM_H
 #define XMPP_STREAM_H
 
+#include "xmpp/jid/jid.h"
+#include "xmpp_stanza.h"
+
 #include <QDomElement>
 #include <QObject>
 
-#include "xmpp_stanza.h"
-#include "xmpp/jid/jid.h"
-
 class QDomDocument;
 
-namespace XMPP
-{
+namespace XMPP {
     class Stream : public QObject
     {
         Q_OBJECT
@@ -79,6 +78,6 @@ namespace XMPP
         void stanzaWritten();
         void error(int);
     };
-}
+} // namespace XMPP
 
-#endif
+#endif // XMPP_STREAM_H
diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
index f4ecc8c4..681645f8 100644
--- a/src/xmpp/xmpp-im/client.cpp
+++ b/src/xmpp/xmpp-im/client.cpp
@@ -65,38 +65,35 @@
 //!  }
 //!  \endcode
 
-#include <QObject>
-#include <QMap>
-#include <QTimer>
-#include <QPointer>
-#include <QList>
-
+#include "filetransfer.h"
+#include "httpfileupload.h"
 #include "im.h"
-#include "xmpp_tasks.h"
-#include "xmpp_xmlcommon.h"
+#include "jingle-ft.h"
+#include "jingle-ibb.h"
+#include "jingle-s5b.h"
+#include "jingle.h"
+#include "protocol.h"
 #include "s5b.h"
-#include "xmpp_ibb.h"
+#include "tcpportreserver.h"
 #include "xmpp_bitsofbinary.h"
-#include "filetransfer.h"
 #include "xmpp_caps.h"
 #include "xmpp_hash.h"
+#include "xmpp_ibb.h"
 #include "xmpp_serverinfomanager.h"
-#include "protocol.h"
-#include "xmpp_serverinfomanager.h"
-#include "httpfileupload.h"
-#include "jingle.h"
-#include "jingle-ft.h"
-#include "jingle-s5b.h"
-#include "tcpportreserver.h"
-#include "jingle-ibb.h"
+#include "xmpp_tasks.h"
+#include "xmpp_xmlcommon.h"
+
+#include <QList>
+#include <QMap>
+#include <QObject>
+#include <QPointer>
+#include <QTimer>
 
 #ifdef Q_OS_WIN
 #define vsnprintf _vsnprintf
 #endif
 
-namespace XMPP
-{
-
+namespace XMPP {
 //----------------------------------------------------------------------------
 // Client
 //----------------------------------------------------------------------------
@@ -148,7 +145,6 @@ class Client::ClientPrivate
     EncryptionHandler *encryptionHandler = nullptr;
 };
 
-
 Client::Client(QObject *par)
 :QObject(par)
 {
@@ -519,7 +515,7 @@ void Client::streamError(int)
         disconnected();
         cleanup();
     //}
-}
+} // namespace XMPP
 
 /*void Client::streamSSLCertificateReady(const QSSLCert &cert)
 {
diff --git a/src/xmpp/xmpp-im/filetransfer.cpp b/src/xmpp/xmpp-im/filetransfer.cpp
index 1290b9d3..2a66c8b1 100644
--- a/src/xmpp/xmpp-im/filetransfer.cpp
+++ b/src/xmpp/xmpp-im/filetransfer.cpp
@@ -19,14 +19,15 @@
 
 #include "filetransfer.h"
 
+#include "s5b.h"
+#include "xmpp_ibb.h"
+#include "xmpp_xmlcommon.h"
+
+#include <QFileInfo>
 #include <QList>
-#include <QTimer>
 #include <QPointer>
-#include <QFileInfo>
 #include <QSet>
-#include "xmpp_xmlcommon.h"
-#include "s5b.h"
-#include "xmpp_ibb.h"
+#include <QTimer>
 
 #define SENDBUFSIZE 65536
 
diff --git a/src/xmpp/xmpp-im/filetransfer.h b/src/xmpp/xmpp-im/filetransfer.h
index 8d436089..9f2de709 100644
--- a/src/xmpp/xmpp-im/filetransfer.h
+++ b/src/xmpp/xmpp-im/filetransfer.h
@@ -22,9 +22,7 @@
 
 #include "im.h"
 
-namespace XMPP
-{
-    //class BSConnection;
+namespace XMPP {
     class BSConnection;
     class BytestreamManager;
     struct FTRequest;
@@ -186,6 +184,6 @@ namespace XMPP
     signals:
         void incoming(const FTRequest &req);
     };
-}
+} // namespace XMPP
 
-#endif
+#endif // XMPP_FILETRANSFER_H
diff --git a/src/xmpp/xmpp-im/httpfileupload.cpp b/src/xmpp/xmpp-im/httpfileupload.cpp
index 89695f63..2bf96890 100644
--- a/src/xmpp/xmpp-im/httpfileupload.cpp
+++ b/src/xmpp/xmpp-im/httpfileupload.cpp
@@ -17,17 +17,18 @@
  *
  */
 
+#include "httpfileupload.h"
+
+#include "xmpp_serverinfomanager.h"
+#include "xmpp_tasks.h"
+#include "xmpp_xmlcommon.h"
+
 #include <QList>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QRegExp>
 
-#include "httpfileupload.h"
-#include "xmpp_tasks.h"
-#include "xmpp_xmlcommon.h"
-#include "xmpp_serverinfomanager.h"
-
 using namespace XMPP;
 
 static QLatin1String xmlns_v0_2_5("urn:xmpp:http:upload");
@@ -437,7 +438,6 @@ bool JT_HTTPFileUpload::take(const QDomElement &e)
     return true;
 }
 
-
 class HttpFileUploadManager::Private {
 public:
     Client *client = nullptr;
@@ -448,8 +448,6 @@ class HttpFileUploadManager::Private {
     QLinkedList<HttpFileUpload::HttpHost> hosts;
 };
 
-
-
 HttpFileUploadManager::HttpFileUploadManager(Client *parent) :
     QObject(parent),
     d(new Private)
diff --git a/src/xmpp/xmpp-im/httpfileupload.h b/src/xmpp/xmpp-im/httpfileupload.h
index 5d3b78da..3d923bba 100644
--- a/src/xmpp/xmpp-im/httpfileupload.h
+++ b/src/xmpp/xmpp-im/httpfileupload.h
@@ -20,21 +20,19 @@
 #ifndef XMPP_HTTPFILEUPLOAD_H
 #define XMPP_HTTPFILEUPLOAD_H
 
-#include <memory>
+#include "im.h"
+
 #include <functional>
+#include <memory>
 
 class QNetworkAccessManager;
 
-#include "im.h"
-
-namespace XMPP
-{
-
-namespace XEP0363 {
-enum version { vUnknown, v0_2_5, v0_3_1 };
-struct HttpHeader { QString name; QString value; };
-typedef QList<HttpHeader> HttpHeaders;
-}
+namespace XMPP {
+    namespace XEP0363 {
+        enum version { vUnknown, v0_2_5, v0_3_1 };
+        struct HttpHeader { QString name; QString value; };
+        typedef QList<HttpHeader> HttpHeaders;
+    }
 
 class HttpFileUpload : public QObject
 {
@@ -202,7 +200,6 @@ class HttpFileUploadManager : public QObject
     class Private;
     Private *d;
 };
+} // namespace XMPP
 
-}
-
-#endif
+#endif // XMPP_HTTPFILEUPLOAD_H
diff --git a/src/xmpp/xmpp-im/im.h b/src/xmpp/xmpp-im/im.h
index 78d336c8..2842e30a 100644
--- a/src/xmpp/xmpp-im/im.h
+++ b/src/xmpp/xmpp-im/im.h
@@ -20,40 +20,38 @@
 #ifndef XMPP_IM_H
 #define XMPP_IM_H
 
-#include <qdatetime.h>
-//Added by qt3to4:
-#include <QList>
-
 #include "xmpp.h"
 #include "xmpp/jid/jid.h"
-#include "xmpp_muc.h"
-#include "xmpp_message.h"
+#include "xmpp_address.h"
+#include "xmpp_agentitem.h"
 #include "xmpp_chatstate.h"
-#include "xmpp_status.h"
-#include "xmpp_htmlelement.h"
+#include "xmpp_client.h"
+#include "xmpp_discoitem.h"
 #include "xmpp_features.h"
+#include "xmpp_hash.h"
+#include "xmpp_htmlelement.h"
 #include "xmpp_httpauthrequest.h"
-#include "xmpp_url.h"
-#include "xmpp_task.h"
+#include "xmpp_liveroster.h"
+#include "xmpp_liverosteritem.h"
+#include "xmpp_message.h"
+#include "xmpp_muc.h"
+#include "xmpp_pubsubitem.h"
+#include "xmpp_pubsubretraction.h"
 #include "xmpp_resource.h"
 #include "xmpp_resourcelist.h"
 #include "xmpp_roster.h"
 #include "xmpp_rosteritem.h"
-#include "xmpp_liverosteritem.h"
-#include "xmpp_liveroster.h"
 #include "xmpp_rosterx.h"
-#include "xmpp_xdata.h"
-#include "xmpp_discoitem.h"
-#include "xmpp_agentitem.h"
-#include "xmpp_client.h"
-#include "xmpp_address.h"
-#include "xmpp_hash.h"
+#include "xmpp_status.h"
+#include "xmpp_task.h"
 #include "xmpp_thumbs.h"
-#include "xmpp_pubsubitem.h"
-#include "xmpp_pubsubretraction.h"
+#include "xmpp_url.h"
+#include "xmpp_xdata.h"
+
+#include <QList>
+#include <qdatetime.h>
 
-namespace XMPP
-{
+namespace XMPP {
     typedef QList<AgentItem> AgentList;
     typedef QList<DiscoItem> DiscoList;
 
@@ -127,6 +125,6 @@ namespace XMPP
         Jid v_jid;
         QString v_nick, v_first, v_last, v_email;
     };
-}
+} // namespace XMPP
 
-#endif
+#endif // XMPP_IM_H
diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 54059868..60c2ef2b 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -18,9 +18,10 @@
  */
 
 #include "jingle-ft.h"
+
 #include "xmpp_client.h"
-#include "xmpp_thumbs.h"
 #include "xmpp_hash.h"
+#include "xmpp_thumbs.h"
 #include "xmpp_xmlcommon.h"
 
 #include <cmath>
@@ -28,9 +29,7 @@
 
 namespace XMPP {
 namespace Jingle {
-
 namespace FileTransfer {
-
 const QString NS = QStringLiteral("urn:xmpp:jingle:apps:file-transfer:5");
 const QString HISTOGRAM_NS = QStringLiteral("urn:audio:histogram");
 
@@ -1123,9 +1122,6 @@ void Pad::addOutgoingOffer(const File &file)
     auto app = _manager->startApplication(selfp, "ft", _session->role(), _session->role());
     app->setFile(file);
 }
-
-
-
 } // namespace FileTransfer
 } // namespace Jingle
 } // namespace XMPP
diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index a905bc66..4e9ac92c 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -24,7 +24,6 @@
 #include "xmpp_hash.h"
 
 namespace XMPP {
-
 class Client;
 class Thumbnail;
 
@@ -211,7 +210,6 @@ class Manager : public XMPP::Jingle::ApplicationManager
 private:
     XMPP::Jingle::Manager *jingleManager = nullptr;
 };
-
 } // namespace FileTransfer
 } // namespace Jingle
 } // namespace XMPP
diff --git a/src/xmpp/xmpp-im/jingle-ibb.cpp b/src/xmpp/xmpp-im/jingle-ibb.cpp
index 3383938d..8721ad43 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.cpp
+++ b/src/xmpp/xmpp-im/jingle-ibb.cpp
@@ -18,6 +18,7 @@
  */
 
 #include "jingle-ibb.h"
+
 #include "xmpp/jid/jid.h"
 #include "xmpp_client.h"
 #include "xmpp_ibb.h"
@@ -27,7 +28,6 @@
 namespace XMPP {
 namespace Jingle {
 namespace IBB {
-
 const QString NS(QStringLiteral("urn:xmpp:jingle:transports:ibb:1"));
 
 class Connection : public XMPP::Jingle::Connection
@@ -307,7 +307,6 @@ bool Transport::update(const QDomElement &transportEl)
     return true;
 }
 
-
 bool Transport::isInitialOfferReady() const
 {
     return isValid() && (hasUpdates() || d->initialOfferSent);
@@ -478,7 +477,6 @@ bool Manager::handleIncoming(IBBConnection *c)
     }
     return false;
 }
-
 } // namespace IBB
 } // namespace Jingle
 } // namespace XMPP
diff --git a/src/xmpp/xmpp-im/jingle-ibb.h b/src/xmpp/xmpp-im/jingle-ibb.h
index 9768edb7..acfd516c 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.h
+++ b/src/xmpp/xmpp-im/jingle-ibb.h
@@ -27,7 +27,6 @@ namespace XMPP {
 
 namespace Jingle {
 namespace IBB {
-
 extern const QString NS;
 
 class Transport : public XMPP::Jingle::Transport
@@ -98,7 +97,6 @@ class Manager : public TransportManager {
     class Private;
     QScopedPointer<Private> d;
 };
-
 } // namespace IBB
 } // namespace Jingle
 } // namespace XMPP
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index e8a72f02..c0e394e6 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -16,13 +16,15 @@
  * along with this library.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+
 #include "jingle-s5b.h"
+
+#include "ice176.h"
 #include "s5b.h"
+#include "socks.h"
 #include "xmpp/jid/jid.h"
 #include "xmpp_client.h"
 #include "xmpp_serverinfomanager.h"
-#include "socks.h"
-#include "ice176.h"
 
 #include <QElapsedTimer>
 #include <QNetworkInterface>
@@ -31,7 +33,6 @@
 namespace XMPP {
 namespace Jingle {
 namespace S5B {
-
 const QString NS(QStringLiteral("urn:xmpp:jingle:transports:s5b:1"));
 
 static QString makeKey(const QString &sid, const Jid &j1, const Jid &j2)
@@ -115,8 +116,6 @@ class Connection : public XMPP::Jingle::Connection
             return 0;
     }
 
-
-
 private:
     friend class Transport;
     void enqueueIncomingUDP(const QByteArray &data)
@@ -600,7 +599,6 @@ class Transport::Private
     quint16 udpPort;
     QHostAddress udpAddress;
 
-
     inline Jid remoteJid() const
     {
         return pad->session()->peer();
@@ -1316,7 +1314,6 @@ bool Transport::update(const QDomElement &transportEl)
     return true;
 }
 
-
 bool Transport::isInitialOfferReady() const
 {
     return isValid() && (d->pendingActions || d->offerSent ||
@@ -1650,10 +1647,8 @@ void Pad::registerSid(const QString &sid)
 {
     return _manager->registerSid(_session->peer(), sid);
 }
-
 } // namespace S5B
 } // namespace Jingle
 } // namespace XMPP
 
 #include "jingle-s5b.moc"
-
diff --git a/src/xmpp/xmpp-im/jingle-s5b.h b/src/xmpp/xmpp-im/jingle-s5b.h
index cd277c0d..dffed154 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.h
+++ b/src/xmpp/xmpp-im/jingle-s5b.h
@@ -27,15 +27,14 @@ class QHostAddress;
 class SocksClient;
 
 namespace XMPP {
-
 class Client;
 
 namespace Jingle {
 namespace S5B {
-
 extern const QString NS;
 
 class Transport;
+
 class Candidate {
 public:
     enum Type {
@@ -216,7 +215,6 @@ class Manager : public TransportManager {
     class Private;
     QScopedPointer<Private> d;
 };
-
 } // namespace S5B
 } // namespace Jingle
 } // namespace XMPP
diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index 128643f3..e1b48aff 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -18,30 +18,27 @@
  */
 
 #include "jingle.h"
-#include "xmpp_xmlcommon.h"
-#include "xmpp/jid/jid.h"
+
 #include "xmpp-im/xmpp_hash.h"
+#include "xmpp/jid/jid.h"
 #include "xmpp_client.h"
-#include "xmpp_task.h"
 #include "xmpp_stream.h"
+#include "xmpp_task.h"
+#include "xmpp_xmlcommon.h"
 
 #include <QDateTime>
+#include <QDebug>
 #include <QDomElement>
 #include <QMap>
-#include <QMap>
 #include <QPointer>
 #include <QTimer>
 #include <functional>
-#include <QDebug>
-#include <QTimer>
 
 namespace XMPP {
 namespace Jingle {
-
 const QString NS(QStringLiteral("urn:xmpp:jingle:1"));
 const QString ERROR_NS(QStringLiteral("urn:xmpp:jingle:errors:1"));
 
-
 //----------------------------------------------------------------------------
 // Jingle
 //----------------------------------------------------------------------------
@@ -95,7 +92,6 @@ Jingle::Jingle(const QDomElement &e)
     Jid initiator;
     Jid responder;
 
-
     bool found = false;
     for (unsigned int i = 0; i < sizeof(jingleActions) / sizeof(jingleActions[0]); i++) {
         if (actionStr == jingleActions[i].text) {
@@ -201,7 +197,6 @@ void Jingle::setResponder(const Jid &jid)
     d->responder = jid;
 }
 
-
 //----------------------------------------------------------------------------
 // Reason
 //----------------------------------------------------------------------------
@@ -394,7 +389,6 @@ QDomElement ContentBase::toXml(QDomDocument *doc, const char *tagName) const
     return el;
 }
 
-
 Origin ContentBase::creatorAttr(const QDomElement &el)
 {
     auto creatorStr = el.attribute(QLatin1String("creator"));
@@ -458,7 +452,6 @@ class JTPush : public Task
     inline void forgetExternalSession(const QString &sid) { externalSessions.removeOne(sid); }
     inline void registerExternalSession(const QString &sid) { externalSessions.append(sid); }
 
-
     bool take(const QDomElement &iq)
     {
         if (iq.tagName() != QLatin1String("iq") || iq.attribute(QLatin1String("type")) != QLatin1String("set")) {
@@ -620,7 +613,6 @@ class JT : public Task
     }
 };
 
-
 //----------------------------------------------------------------------------
 // Session
 //----------------------------------------------------------------------------
@@ -943,7 +935,6 @@ class Session::Private
         return result{Unparsed, Reason::Success, nullptr};
     }
 
-
     typedef std::tuple<AddContentError, Reason::Condition, QList<Application*>, QList<QDomElement>> ParseContentListResult;
 
     ParseContentListResult parseContentAddList(const QDomElement &jingleEl)
@@ -1115,7 +1106,6 @@ class Session::Private
         return std::tuple<bool,QList<Application*>>(true, acceptSet.values());
     }
 
-
     bool handleIncomingContentAdd(const QDomElement &jingleEl)
     {
         Private::AddContentError err;
@@ -1637,7 +1627,6 @@ bool Session::updateFromXml(Action action, const QDomElement &jingleEl)
     return false;
 }
 
-
 //----------------------------------------------------------------------------
 // SessionManagerPad - handle event related to a type of app/transport but not specific instance
 //----------------------------------------------------------------------------
@@ -1931,7 +1920,6 @@ Stanza::Error ErrorUtil::makeOutOfOrder(QDomDocument &doc)
     return make(doc, OutOfOrder, XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::UnexpectedRequest);
 }
 
-
 } // namespace Jingle
 } // namespace XMPP
 
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index 8765cea1..6d166a81 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -21,6 +21,7 @@
 #define JINGLE_H
 
 #include "bytestream.h"
+#include "xmpp_stanza.h"
 
 #include <QSharedDataPointer>
 #include <QSharedPointer>
@@ -31,16 +32,13 @@
 # include <QHostAddress>
 #endif
 
-#include "xmpp_stanza.h"
-
-class QDomElement;
 class QDomDocument;
+class QDomElement;
 
 namespace XMPP {
 class Client;
 
 namespace Jingle {
-
 extern const QString NS;
 
 class Manager;
@@ -349,7 +347,6 @@ class Transport : public QObject {
     };
     Q_DECLARE_FLAGS(Features, Feature)
 
-
     using QObject::QObject;
 
     enum Direction { // incoming or outgoing file/data transfer.
diff --git a/src/xmpp/xmpp-im/s5b.cpp b/src/xmpp/xmpp-im/s5b.cpp
index 596c7f8b..d100d97c 100644
--- a/src/xmpp/xmpp-im/s5b.cpp
+++ b/src/xmpp/xmpp-im/s5b.cpp
@@ -19,18 +19,17 @@
 
 #include "s5b.h"
 
-#include <QTimer>
-#include <QPointer>
-#include <QByteArray>
-#include <stdlib.h>
-#include <qca.h>
-
-#include "xmpp_xmlcommon.h"
 #include "im.h"
 #include "jingle-s5b.h"
 #include "socks.h"
 #include "tcpportreserver.h"
+#include "xmpp_xmlcommon.h"
 
+#include <QByteArray>
+#include <QPointer>
+#include <QTimer>
+#include <qca.h>
+#include <stdlib.h>
 #ifdef Q_OS_WIN
 # include <windows.h>
 #else
@@ -42,7 +41,6 @@
 static const char *S5B_NS = "http://jabber.org/protocol/bytestreams";
 
 namespace XMPP {
-
 static QString makeKey(const QString &sid, const Jid &requester, const Jid &target)
 {
 #ifdef S5B_DEBUG
@@ -63,7 +61,6 @@ static bool haveHost(const StreamHostList &list, const Jid &j)
     return false;
 }
 
-
 class S5BManager::Item : public QObject
 {
     Q_OBJECT
@@ -1955,7 +1952,6 @@ void S5BConnector::man_udpSuccess(const Jid &streamHost)
     }
 }
 
-
 //----------------------------------------------------------------------------
 // JT_S5B
 //----------------------------------------------------------------------------
@@ -2453,7 +2449,6 @@ void S5BServer::unregisterKey(const QString &key)
 {
     d->keys.remove(key);
 }
-
-}
+} // namespace XMPP
 
 #include "s5b.moc"
diff --git a/src/xmpp/xmpp-im/s5b.h b/src/xmpp/xmpp-im/s5b.h
index 951076f8..86cd2d4a 100644
--- a/src/xmpp/xmpp-im/s5b.h
+++ b/src/xmpp/xmpp-im/s5b.h
@@ -20,34 +20,33 @@
 #ifndef XMPP_S5B_H
 #define XMPP_S5B_H
 
-#include <QObject>
-#include <QList>
-#include <QHostAddress>
-#include <tcpportreserver.h>
-
 #include "bytestream.h"
-#include "xmpp_bytestream.h"
 #include "xmpp/jid/jid.h"
-#include "xmpp_task.h"
+#include "xmpp_bytestream.h"
 #include "xmpp_stanza.h"
+#include "xmpp_task.h"
+
+#include <QHostAddress>
+#include <QList>
+#include <QObject>
+#include <tcpportreserver.h>
 
 class SocksClient;
 class SocksUDP;
 
-namespace XMPP
-{
+namespace XMPP {
     namespace Jingle {
         namespace S5B {
             class Manager;
         }
     }
 
-    class StreamHost;
     class Client;
-    class TcpPortReserver;
+    class JT_PushS5B;
     class S5BConnection;
     class S5BManager;
-    class JT_PushS5B;
+    class StreamHost;
+    class TcpPortReserver;
     struct S5BRequest;
     typedef QList<StreamHost> StreamHostList;
     typedef QList<S5BConnection*> S5BConnectionList;
@@ -239,7 +238,6 @@ namespace XMPP
         void man_udpSuccess(const Jid &streamHost);
     };
 
-
     class S5BServersProducer : public TcpPortScope
     {
     protected:
@@ -347,6 +345,6 @@ namespace XMPP
         int v_port;
         bool proxy;
     };
-}
+} // namespace XMPP
 
-#endif
+#endif // XMPP_S5B_H
diff --git a/src/xmpp/xmpp-im/types.cpp b/src/xmpp/xmpp-im/types.cpp
index b13863ca..d68a46cd 100644
--- a/src/xmpp/xmpp-im/types.cpp
+++ b/src/xmpp/xmpp-im/types.cpp
@@ -17,24 +17,22 @@
  *
  */
 
-#include <QMap>
-#include <QList>
-
 #include "im.h"
-#include "xmpp_features.h"
-#include "xmpp_xmlcommon.h"
-#include "xmpp_bitsofbinary.h"
-#include "xmpp_ibb.h"
-#include "xmpp_reference.h"
-#include "xmpp_captcha.h"
 #include "protocol.h"
 #include "xmpp/blake2/blake2qt.h"
+#include "xmpp_bitsofbinary.h"
+#include "xmpp_captcha.h"
+#include "xmpp_features.h"
+#include "xmpp_ibb.h"
 #include "xmpp_reference.h"
-#define NS_XML     "http://www.w3.org/XML/1998/namespace"
+#include "xmpp_xmlcommon.h"
 
-namespace XMPP
-{
+#include <QList>
+#include <QMap>
+
+#define NS_XML "http://www.w3.org/XML/1998/namespace"
 
+namespace XMPP {
 QString HASH_NS = QStringLiteral("urn:xmpp:hashes:2");
 //----------------------------------------------------------------------------
 // Url
@@ -312,7 +310,6 @@ void Address::setType(Type type)
     v_type = type;
 }
 
-
 //----------------------------------------------------------------------------
 // Hash
 //----------------------------------------------------------------------------
@@ -330,7 +327,6 @@ static const struct {
 { "blake2b-512", Hash::Type::Blake2b512 }
 };
 
-
 Hash::Hash(const QDomElement &el)
 {
     QString algo = el.attribute(QLatin1String("algo"));
@@ -515,7 +511,6 @@ void RosterExchangeItem::fromXml(const QDomElement& e)
     }
 }
 
-
 //----------------------------------------------------------------------------
 // MUCItem
 //----------------------------------------------------------------------------
@@ -1022,7 +1017,6 @@ void HTMLElement::filterOutUnwantedRecursive(QDomElement &el, bool strict)
     }
 }
 
-
 //----------------------------------------------------------------------------
 // Message
 //----------------------------------------------------------------------------
@@ -2524,7 +2518,6 @@ bool Subscription::fromString(const QString &s)
     return true;
 }
 
-
 //---------------------------------------------------------------------------
 // Status
 //---------------------------------------------------------------------------
@@ -2536,7 +2529,6 @@ CapsSpec::CapsSpec() :
 {
 }
 
-
 /**
  * \brief Basic constructor.
  * @param node the node
@@ -2564,7 +2556,6 @@ bool CapsSpec::isValid() const
     return !node_.isEmpty() && !ver_.isEmpty() && (hashAlgo_ != CapsSpec::invalidAlgo);
 }
 
-
 /**
  * \brief Returns the node of the capabilities specification.
  */
@@ -2573,7 +2564,6 @@ const QString& CapsSpec::node() const
     return node_;
 }
 
-
 /**
  * \brief Returns the version of the capabilities specification.
  */
@@ -2674,7 +2664,6 @@ bool CapsSpec::operator<(const CapsSpec& s) const
                                                              hashAlgorithm() < s.hashAlgorithm()));
 }
 
-
 class StatusPrivate : public QSharedData
 {
 public:
@@ -2711,7 +2700,6 @@ class StatusPrivate : public QSharedData
     QString estr;
 };
 
-
 Status::Status(const QString &show, const QString &status, int priority, bool available)
     : d(new StatusPrivate)
 {
@@ -2877,7 +2865,6 @@ void Status::setMUCHistory(int maxchars, int maxstanzas, int seconds, const QDat
     d->mucHistorySince = since;
 }
 
-
 const QString& Status::photoHash() const
 {
     return d->photoHash;
@@ -3077,7 +3064,6 @@ const QString & Status::errorString() const
     return d->estr;
 }
 
-
 //---------------------------------------------------------------------------
 // Resource
 //---------------------------------------------------------------------------
@@ -3112,7 +3098,6 @@ void Resource::setStatus(const Status & _status)
     v_status = _status;
 }
 
-
 //---------------------------------------------------------------------------
 // ResourceList
 //---------------------------------------------------------------------------
@@ -3169,7 +3154,6 @@ ResourceList::ConstIterator ResourceList::priority() const
     return highest;
 }
 
-
 //---------------------------------------------------------------------------
 // RosterItem
 //---------------------------------------------------------------------------
@@ -3331,7 +3315,6 @@ bool RosterItem::fromXml(const QDomElement &item)
     return true;
 }
 
-
 //---------------------------------------------------------------------------
 // Roster
 //---------------------------------------------------------------------------
@@ -3364,7 +3347,6 @@ Roster::ConstIterator Roster::find(const Jid &j) const
     return end();
 }
 
-
 //---------------------------------------------------------------------------
 // FormField
 //---------------------------------------------------------------------------
@@ -3488,7 +3470,6 @@ QString FormField::typeToTagName(int type) const
     };
 }
 
-
 //---------------------------------------------------------------------------
 // Form
 //---------------------------------------------------------------------------
@@ -3531,7 +3512,6 @@ void Form::setKey(const QString &s)
     v_key = s;
 }
 
-
 //---------------------------------------------------------------------------
 // SearchResult
 //---------------------------------------------------------------------------
@@ -3612,7 +3592,6 @@ const QDomElement& PubSubItem::payload() const
     return payload_;
 }
 
-
 PubSubRetraction::PubSubRetraction()
 {
 }
@@ -3626,8 +3605,6 @@ const QString& PubSubRetraction::id() const
     return id_;
 }
 
-
-
 // =========================================
 //            CaptchaChallenge
 // =========================================
@@ -3759,5 +3736,4 @@ QDomElement Thumbnail::toXml(QDomDocument *doc) const
     }
     return el;
 }
-
-}
+} // namespace XMPP
diff --git a/src/xmpp/xmpp-im/xmpp_address.h b/src/xmpp/xmpp-im/xmpp_address.h
index 8af4bab4..108c6614 100644
--- a/src/xmpp/xmpp-im/xmpp_address.h
+++ b/src/xmpp/xmpp-im/xmpp_address.h
@@ -19,14 +19,13 @@
 #ifndef XMPP_ADDRESS_H
 #define XMPP_ADDRESS_H
 
-#include <QString>
-
 #include "xmpp/jid/jid.h"
 
+#include <QString>
+
 class QDomElement;
 
-namespace XMPP
-{
+namespace XMPP {
     class Address
     {
     public:
@@ -60,6 +59,6 @@ namespace XMPP
     };
 
     typedef QList<Address> AddressList;
-}
+} // namespace XMPP
 
-#endif
+#endif // XMPP_ADDRESS_H
diff --git a/src/xmpp/xmpp-im/xmpp_agentitem.h b/src/xmpp/xmpp-im/xmpp_agentitem.h
index 85107c13..f9570424 100644
--- a/src/xmpp/xmpp-im/xmpp_agentitem.h
+++ b/src/xmpp/xmpp-im/xmpp_agentitem.h
@@ -20,11 +20,11 @@
 #ifndef XMPP_AGENTITEM
 #define XMPP_AGENTITEM
 
-#include <QString>
-
 #include "xmpp/jid/jid.h"
 #include "xmpp_features.h"
 
+#include <QString>
+
 namespace XMPP {
     class AgentItem
     {
@@ -48,7 +48,6 @@ namespace XMPP {
         QString v_name, v_category, v_type;
         Features v_features;
     };
-}
-
-#endif
+} // namespace XMPP
 
+#endif // XMPP_AGENTITEM
diff --git a/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp b/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp
index f3db19b7..688d2e94 100644
--- a/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp
+++ b/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Rion
+ * Copyright (C) 2010  Sergey Ilinykh
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public
@@ -16,13 +16,14 @@
  *
  */
 
-#include <QCryptographicHash>
-#include <QFile>
-
 #include "xmpp_bitsofbinary.h"
-#include "xmpp_xmlcommon.h"
+
 #include "xmpp_client.h"
 #include "xmpp_tasks.h"
+#include "xmpp_xmlcommon.h"
+
+#include <QCryptographicHash>
+#include <QFile>
 
 using namespace XMPP;
 
@@ -129,8 +130,6 @@ QDomElement BoBData::toXml(QDomDocument *doc) const
     return data;
 }
 
-
-
 // ---------------------------------------------------------
 // BoBCache
 // ---------------------------------------------------------
@@ -140,7 +139,6 @@ BoBCache::BoBCache(QObject *parent)
 
 }
 
-
 //------------------------------------------------------------------------------
 // BoBManager
 //------------------------------------------------------------------------------
diff --git a/src/xmpp/xmpp-im/xmpp_bitsofbinary.h b/src/xmpp/xmpp-im/xmpp_bitsofbinary.h
index 0399730e..7a856478 100644
--- a/src/xmpp/xmpp-im/xmpp_bitsofbinary.h
+++ b/src/xmpp/xmpp-im/xmpp_bitsofbinary.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Rion
+ * Copyright (C) 2010  Sergey Ilinykh
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public
@@ -19,18 +19,17 @@
 #ifndef XMPP_BITSOFBINARY_H
 #define XMPP_BITSOFBINARY_H
 
+#include "xmpp/jid/jid.h"
+
 #include <QDomElement>
-#include <QObject>
+#include <QFile>
 #include <QHash>
+#include <QObject>
 #include <QSharedDataPointer>
-#include <QFile>
-
-#include "xmpp/jid/jid.h"
 
-namespace XMPP
-{
-    class JT_BitsOfBinary;
+namespace XMPP {
     class Client;
+    class JT_BitsOfBinary;
 
     class BoBData
     {
@@ -63,8 +62,6 @@ namespace XMPP
         QSharedDataPointer<Private> d;
     };
 
-
-
     class BoBCache : public QObject
     {
         Q_OBJECT
@@ -75,8 +72,6 @@ namespace XMPP
         virtual BoBData get(const QString &) = 0;
     };
 
-
-
     class BoBManager : public QObject
     {
         Q_OBJECT
@@ -97,7 +92,6 @@ namespace XMPP
         BoBCache *_cache;
         QHash<QString, QPair<QString,QString> > _localFiles; //cid => (filename, mime)
     };
-
-}
+} // namespace XMPP
 
 #endif // XMPP_BITSOFBINARY_H
diff --git a/src/xmpp/xmpp-im/xmpp_bytestream.cpp b/src/xmpp/xmpp-im/xmpp_bytestream.cpp
index 92dac0d8..71863929 100644
--- a/src/xmpp/xmpp-im/xmpp_bytestream.cpp
+++ b/src/xmpp/xmpp-im/xmpp_bytestream.cpp
@@ -1,6 +1,6 @@
 /*
  * bytestream_manager.cpp - base class for bytestreams over xmpp
- * Copyright (C) 2003  Justin Karneges, Rion
+ * Copyright (C) 2003  Justin Karneges, Sergey Ilinykh
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -17,14 +17,13 @@
  *
  */
 
-#include <QTimer>
-
 #include "xmpp_bytestream.h"
+
 #include "xmpp_client.h"
 
-namespace XMPP
-{
+#include <QTimer>
 
+namespace XMPP {
 BytestreamManager::BytestreamManager(Client *parent)
     : QObject(parent)
 {
@@ -59,5 +58,4 @@ void BytestreamManager::deleteConnection(BSConnection *c, int msec)
         delete c;
     }
 }
-
-}
+} // namespace XMPP
diff --git a/src/xmpp/xmpp-im/xmpp_bytestream.h b/src/xmpp/xmpp-im/xmpp_bytestream.h
index 9f3a88b6..5933ff2e 100644
--- a/src/xmpp/xmpp-im/xmpp_bytestream.h
+++ b/src/xmpp/xmpp-im/xmpp_bytestream.h
@@ -1,6 +1,6 @@
 /*
  * bytestream_manager.h - base class for bytestreams over xmpp
- * Copyright (C) 2003  Justin Karneges, Rion
+ * Copyright (C) 2003  Justin Karneges, Sergey Ilinykh
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,14 +20,14 @@
 #ifndef BYTESTREAM_MANAGER_H
 #define BYTESTREAM_MANAGER_H
 
-#include <QObject>
-#include "xmpp/jid/jid.h"
 #include "bytestream.h"
+#include "xmpp/jid/jid.h"
 
-namespace XMPP
-{
-    class Client;
+#include <QObject>
+
+namespace XMPP {
     class BytestreamManager;
+    class Client;
 
     class BSConnection : public ByteStream
     {
@@ -64,6 +64,6 @@ namespace XMPP
     signals:
         void incomingReady();
     };
-}
+} // namespace XMPP
 
-#endif
+#endif // BYTESTREAM_MANAGER_H
diff --git a/src/xmpp/xmpp-im/xmpp_caps.cpp b/src/xmpp/xmpp-im/xmpp_caps.cpp
index 324aea3b..2637bd84 100644
--- a/src/xmpp/xmpp-im/xmpp_caps.cpp
+++ b/src/xmpp/xmpp-im/xmpp_caps.cpp
@@ -1,6 +1,6 @@
 /*
  * capsregistry.cpp
- * Copyright (C) 2006-2016  Remko Troncon, Rion
+ * Copyright (C) 2006-2016  Remko Troncon, Sergey Ilinykh
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,21 +24,20 @@
  * goes to CapsSpec.
  */
 
-#include <QCoreApplication>
-#include <QDebug>
-#include <QTextCodec>
-#include <QFile>
-#include <QDomElement>
-
-#include "xmpp_features.h"
 #include "xmpp_caps.h"
-#include "xmpp_discoinfotask.h"
+
 #include "xmpp_client.h"
+#include "xmpp_discoinfotask.h"
+#include "xmpp_features.h"
 #include "xmpp_xmlcommon.h"
 
-namespace XMPP {
-
+#include <QCoreApplication>
+#include <QDebug>
+#include <QDomElement>
+#include <QFile>
+#include <QTextCodec>
 
+namespace XMPP {
 QDomElement CapsInfo::toXml(QDomDocument *doc) const
 {
     QDomElement caps = doc->createElement("info");
@@ -57,7 +56,6 @@ CapsInfo CapsInfo::fromXml(const QDomElement &caps)
     return CapsInfo(item, lastSeen);
 }
 
-
 // -----------------------------------------------------------------------------
 
 /**
@@ -197,7 +195,6 @@ DiscoItem CapsRegistry::disco(const QString &spec) const
     return ci.disco();
 }
 
-
 /*--------------------------------------------------------------
   _____                __  __
  / ____|              |  \/  |
@@ -228,7 +225,6 @@ CapsManager::CapsManager(Client *client) :
 CapsManager::~CapsManager()
 {}
 
-
 /**
  * \brief Checks whether the caps manager is enabled (and does lookups).
  */
@@ -362,7 +358,6 @@ bool CapsManager::capsEnabled(const Jid& jid) const
     return capsSpecs_.contains(jid.full());
 }
 
-
 /**
  * \brief Requests the list of features of a given JID.
  */
@@ -480,5 +475,4 @@ CapsSpec CapsManager::capsSpec(const Jid &jid) const
 {
     return capsSpecs_.value(jid.full());
 }
-
 } // namespace XMPP
diff --git a/src/xmpp/xmpp-im/xmpp_caps.h b/src/xmpp/xmpp-im/xmpp_caps.h
index d11a3e7d..929c6f64 100644
--- a/src/xmpp/xmpp-im/xmpp_caps.h
+++ b/src/xmpp/xmpp-im/xmpp_caps.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  Remko Troncon, Rion
+ * Copyright (C) 2016  Remko Troncon, Sergey Ilinykh
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,15 +19,13 @@
 #ifndef XMPP_CAPS_H
 #define XMPP_CAPS_H
 
-#include <QPointer>
-
-#include "xmpp_features.h"
 #include "xmpp_discoitem.h"
+#include "xmpp_features.h"
 #include "xmpp_status.h"
 
+#include <QPointer>
 
 namespace XMPP {
-
 class CapsInfo
 {
 public:
@@ -46,7 +44,6 @@ class CapsInfo
     XMPP::DiscoItem _disco;
 };
 
-
 class CapsRegistry : public QObject
 {
     Q_OBJECT
@@ -77,7 +74,6 @@ public slots:
     QHash<QString,CapsInfo> capsInfo_;
 };
 
-
 class CapsManager : public QObject
 {
     Q_OBJECT
@@ -118,7 +114,6 @@ protected slots:
     QMap<QString,CapsSpec> capsSpecs_;
     QMap<QString,QList<QString> > capsJids_;
 };
-
 } // namespace XMPP
 
-#endif // CAPS_H
+#endif // XMPP_CAPS_H
diff --git a/src/xmpp/xmpp-im/xmpp_captcha.h b/src/xmpp/xmpp-im/xmpp_captcha.h
index d3d36930..27b76e85 100644
--- a/src/xmpp/xmpp-im/xmpp_captcha.h
+++ b/src/xmpp/xmpp-im/xmpp_captcha.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Rion
+ * Copyright (C) 2016  Sergey Ilinykh
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,17 +19,16 @@
 #ifndef XMPP_CAPTCHA_H
 #define XMPP_CAPTCHA_H
 
-#include <QDateTime>
-
 #include "xmpp/jid/jid.h"
 #include "xmpp_url.h"
 
-namespace XMPP
-{
+#include <QDateTime>
+
+namespace XMPP {
+    class CaptchaChallengePrivate;
     class Message;
     class XData;
 
-    class CaptchaChallengePrivate;
     class CaptchaChallenge
     {
     public:
@@ -68,6 +67,6 @@ namespace XMPP
         friend class CaptchaChallengePrivate;
         QSharedDataPointer<CaptchaChallengePrivate> d;
     };
-}
+} // namespace XMPP
 
-#endif
+#endif // XMPP_CAPTCHA_H
diff --git a/src/xmpp/xmpp-im/xmpp_chatstate.h b/src/xmpp/xmpp-im/xmpp_chatstate.h
index ef4faf94..5596147d 100644
--- a/src/xmpp/xmpp-im/xmpp_chatstate.h
+++ b/src/xmpp/xmpp-im/xmpp_chatstate.h
@@ -28,6 +28,6 @@ namespace XMPP {
         StateInactive,
         StateGone
     } ChatState;
-}
+} // namespace XMPP
 
-#endif
+#endif // XMPP_CHATSTATE
diff --git a/src/xmpp/xmpp-im/xmpp_client.h b/src/xmpp/xmpp-im/xmpp_client.h
index aa995f62..2bd4528e 100644
--- a/src/xmpp/xmpp-im/xmpp_client.h
+++ b/src/xmpp/xmpp-im/xmpp_client.h
@@ -19,23 +19,28 @@
 #ifndef XMPP_CLIENT_H
 #define XMPP_CLIENT_H
 
-#include <QObject>
-#include <QStringList>
-#include <QCryptographicHash>
-
 #include "xmpp/jid/jid.h"
-#include "xmpp_status.h"
 #include "xmpp_discoitem.h"
+#include "xmpp_status.h"
+
+#include <QCryptographicHash>
+#include <QObject>
+#include <QStringList>
 
-class QString;
-class QDomElement;
-class QDomDocument;
 class ByteStream;
+class QDomDocument;
+class QDomElement;
 class QNetworkAccessManager;
+class QString;
+
 namespace XMPP {
+    class BSConnection;
+    class CapsManager;
     class ClientStream;
+    class EncryptionHandler;
     class Features;
     class FileTransferManager;
+    class HttpFileUploadManager;
     class IBBManager;
     class JidLinkManager;
     class LiveRoster;
@@ -46,15 +51,10 @@ namespace XMPP {
     class Roster;
     class RosterItem;
     class S5BManager;
-    class BSConnection;
+    class ServerInfoManager;
     class Stream;
     class Task;
-    class CapsManager;
-    class EncryptionHandler;
-    class ServerInfoManager;
-    class HttpFileUploadManager;
     class TcpPortReserver;
-
     namespace Jingle {
         class Manager;
         namespace S5B {
@@ -66,8 +66,7 @@ namespace XMPP {
     }
 }
 
-namespace XMPP
-{
+namespace XMPP {
     class Client : public QObject
     {
         Q_OBJECT
@@ -230,6 +229,6 @@ namespace XMPP
         class ClientPrivate;
         ClientPrivate *d;
     };
-}
+} // namespace XMPP
 
-#endif
+#endif // XMPP_CLIENT_H
diff --git a/src/xmpp/xmpp-im/xmpp_discoinfotask.cpp b/src/xmpp/xmpp-im/xmpp_discoinfotask.cpp
index 24d7f17a..4694152c 100644
--- a/src/xmpp/xmpp-im/xmpp_discoinfotask.cpp
+++ b/src/xmpp/xmpp-im/xmpp_discoinfotask.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002  Justin Karneges
+ * Copyright (C) 2001-2002  Justin Karneges
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -16,17 +16,18 @@
  *
  */
 
-#include <QDomElement>
-#include <QString>
-#include <QTimer>
+#include "xmpp_discoinfotask.h"
 
-#include "xmpp_task.h"
 #include "xmpp/jid/jid.h"
+#include "xmpp_caps.h"
+#include "xmpp_client.h"
 #include "xmpp_discoitem.h"
-#include "xmpp_discoinfotask.h"
+#include "xmpp_task.h"
 #include "xmpp_xmlcommon.h"
-#include "xmpp_client.h"
-#include "xmpp_caps.h"
+
+#include <QDomElement>
+#include <QString>
+#include <QTimer>
 
 using namespace XMPP;
 
@@ -73,7 +74,6 @@ void DiscoInfoTask::get (const Jid &j, const QString &node, DiscoItem::Identity
     d->ident = ident;
 }
 
-
 /**
  * Original requested jid.
  * Is here because sometimes the responder does not include this information
@@ -157,5 +157,3 @@ bool DiscoInfoTask::take(const QDomElement &x)
 
     return true;
 }
-
-
diff --git a/src/xmpp/xmpp-im/xmpp_discoinfotask.h b/src/xmpp/xmpp-im/xmpp_discoinfotask.h
index 77cafc0e..03aa8885 100644
--- a/src/xmpp/xmpp-im/xmpp_discoinfotask.h
+++ b/src/xmpp/xmpp-im/xmpp_discoinfotask.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002  Justin Karneges
+ * Copyright (C) 2001-2002  Justin Karneges
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,17 +19,15 @@
 #ifndef XMPP_DISCOINFOTASK_H
 #define XMPP_DISCOINFOTASK_H
 
-#include "xmpp_task.h"
 #include "xmpp_discoitem.h"
+#include "xmpp_task.h"
+
+class QDomElement;
+class QString;
 
 namespace XMPP {
     class Jid;
-}
-class QString;
-class QDomElement;
 
-namespace XMPP
-{
     class DiscoInfoTask : public Task
     {
         Q_OBJECT
@@ -57,8 +55,8 @@ namespace XMPP
         class Private;
         Private *d;
     };
-
     // Deprecated name
     typedef DiscoInfoTask JT_DiscoInfo;
-}
-#endif
+} // namespace XMPP
+
+#endif // XMPP_DISCOINFOTASK_H
diff --git a/src/xmpp/xmpp-im/xmpp_discoitem.cpp b/src/xmpp/xmpp-im/xmpp_discoitem.cpp
index ddb9bdb1..3006c91f 100644
--- a/src/xmpp/xmpp-im/xmpp_discoitem.cpp
+++ b/src/xmpp/xmpp-im/xmpp_discoitem.cpp
@@ -17,10 +17,10 @@
  *
  */
 
-#include <QtXml>
-
 #include "xmpp_discoitem.h"
 
+#include <QtXml>
+
 using namespace XMPP;
 
 class XMPP::DiscoItemPrivate : public QSharedData
@@ -343,8 +343,6 @@ QString DiscoItem::action2string(const Action a)
     return s;
 }
 
-
-
 bool XMPP::operator<(const DiscoItem::Identity &a, const DiscoItem::Identity &b)
 {
     int r = a.category.compare(b.category);
diff --git a/src/xmpp/xmpp-im/xmpp_discoitem.h b/src/xmpp/xmpp-im/xmpp_discoitem.h
index b2f990ff..051f6833 100644
--- a/src/xmpp/xmpp-im/xmpp_discoitem.h
+++ b/src/xmpp/xmpp-im/xmpp_discoitem.h
@@ -20,13 +20,13 @@
 #ifndef XMPP_DISCOITEM
 #define XMPP_DISCOITEM
 
-#include <QString>
-#include <QCryptographicHash>
-
 #include "xmpp/jid/jid.h"
+#include "xmpp_agentitem.h"
 #include "xmpp_features.h"
 #include "xmpp_xdata.h"
-#include "xmpp_agentitem.h"
+
+#include <QCryptographicHash>
+#include <QString>
 
 namespace XMPP {
     class DiscoItemPrivate;
@@ -102,6 +102,6 @@ namespace XMPP {
     };
 
     bool operator<(const DiscoItem::Identity &a, const DiscoItem::Identity &b);
-}
+} // namespace XMPP
 
-#endif
+#endif // XMPP_DISCOITEM
diff --git a/src/xmpp/xmpp-im/xmpp_encryptionhandler.h b/src/xmpp/xmpp-im/xmpp_encryptionhandler.h
index 9e106287..89691f34 100644
--- a/src/xmpp/xmpp-im/xmpp_encryptionhandler.h
+++ b/src/xmpp/xmpp-im/xmpp_encryptionhandler.h
@@ -22,14 +22,13 @@
 
 class QDomElement;
 
-namespace XMPP
-{
+namespace XMPP {
     class EncryptionHandler
     {
     public:
         virtual bool decryptMessageElement(QDomElement &) = 0;
         virtual bool encryptMessageElement(QDomElement &) = 0;
     };
-}
+} // namespace XMPP
 
 #endif //PSI_XMPP_ENCRYPTIONHANDLER_H
diff --git a/src/xmpp/xmpp-im/xmpp_features.cpp b/src/xmpp/xmpp-im/xmpp_features.cpp
index 11e3eef0..81af7ed8 100644
--- a/src/xmpp/xmpp-im/xmpp_features.cpp
+++ b/src/xmpp/xmpp-im/xmpp_features.cpp
@@ -17,15 +17,15 @@
  *
  */
 
-#include <QCoreApplication>
-#include <QString>
-#include <QMap>
-#include <QStringList>
-
 #include "xmpp_features.h"
 
-#include "jingle.h"
 #include "jingle-ft.h"
+#include "jingle.h"
+
+#include <QCoreApplication>
+#include <QMap>
+#include <QString>
+#include <QStringList>
 
 using namespace XMPP;
 
diff --git a/src/xmpp/xmpp-im/xmpp_features.h b/src/xmpp/xmpp-im/xmpp_features.h
index d3117675..df628a14 100644
--- a/src/xmpp/xmpp-im/xmpp_features.h
+++ b/src/xmpp/xmpp-im/xmpp_features.h
@@ -20,13 +20,12 @@
 #ifndef XMPP_FEATURES_H
 #define XMPP_FEATURES_H
 
-#include <QStringList>
 #include <QSet>
+#include <QStringList>
 
 class QString;
 
-namespace XMPP
-{
+namespace XMPP {
     class Features
     {
     public:
@@ -108,6 +107,6 @@ namespace XMPP
     private:
         QSet<QString> _list;
     };
-}
+} // namespace XMPP
 
-#endif
+#endif // XMPP_FEATURES_H
diff --git a/src/xmpp/xmpp-im/xmpp_hash.h b/src/xmpp/xmpp-im/xmpp_hash.h
index e61d7ed2..5b2a0852 100644
--- a/src/xmpp/xmpp-im/xmpp_hash.h
+++ b/src/xmpp/xmpp-im/xmpp_hash.h
@@ -21,13 +21,12 @@
 
 #include "xmpp_stanza.h"
 
-#include <QString>
 #include <QFuture>
+#include <QString>
 
 class QDomElement;
 
-namespace XMPP
-{
+namespace XMPP {
     extern QString HASH_NS;
     class Features;
 
@@ -67,6 +66,6 @@ namespace XMPP
         Type v_type = Type::Unknown;
         QByteArray v_data;
     };
-}
+} // namespace XMPP
 
-#endif
+#endif // XMPP_HASH_H
diff --git a/src/xmpp/xmpp-im/xmpp_htmlelement.h b/src/xmpp/xmpp-im/xmpp_htmlelement.h
index 57ca1d66..4fc42dfb 100644
--- a/src/xmpp/xmpp-im/xmpp_htmlelement.h
+++ b/src/xmpp/xmpp-im/xmpp_htmlelement.h
@@ -23,8 +23,7 @@
 
 class QString;
 
-namespace XMPP
-{
+namespace XMPP {
     class HTMLElement
     {
     public:
@@ -43,6 +42,6 @@ namespace XMPP
         QDomDocument doc_;
         QDomElement body_;
     };
-}
+} // namespace XMPP
 
-#endif
+#endif // XMPP_HTMLELEMENT_H
diff --git a/src/xmpp/xmpp-im/xmpp_httpauthrequest.h b/src/xmpp/xmpp-im/xmpp_httpauthrequest.h
index 4702dee6..3c9d429a 100644
--- a/src/xmpp/xmpp-im/xmpp_httpauthrequest.h
+++ b/src/xmpp/xmpp-im/xmpp_httpauthrequest.h
@@ -21,11 +21,10 @@
 
 #include <QString>
 
-class QDomElement;
 class QDomDocument;
+class QDomElement;
 
-namespace XMPP
-{
+namespace XMPP {
     class HttpAuthRequest
     {
     public:
@@ -51,6 +50,6 @@ namespace XMPP
         QString method_, url_, id_;
         bool hasId_;
     };
-}
+} // namespace XMPP
 
-#endif
+#endif // XMPP_AUTHREQUEST_H
diff --git a/src/xmpp/xmpp-im/xmpp_ibb.cpp b/src/xmpp/xmpp-im/xmpp_ibb.cpp
index 0c716760..067da527 100644
--- a/src/xmpp/xmpp-im/xmpp_ibb.cpp
+++ b/src/xmpp/xmpp-im/xmpp_ibb.cpp
@@ -1,6 +1,6 @@
 /*
  * ibb.cpp - Inband bytestream
- * Copyright (C) 2001, 2002  Justin Karneges
+ * Copyright (C) 2001-2002  Justin Karneges
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,10 +19,10 @@
 
 #include "xmpp_ibb.h"
 
-#include <qtimer.h>
 #include "xmpp_xmlcommon.h"
-#include <QtCrypto>
 
+#include <QtCrypto>
+#include <qtimer.h>
 #include <stdlib.h>
 
 #define IBB_PACKET_DELAY  0
@@ -330,8 +330,6 @@ void IBBConnection::trySend()
     d->j->go(true);
 }
 
-
-
 //----------------------------------------------------------------------------
 // IBBData
 //----------------------------------------------------------------------------
@@ -493,7 +491,6 @@ void IBBManager::doReject(IBBConnection *c, const QString &id,
     d->ibb->respondError(c->peer(), id, cond, str);
 }
 
-
 //----------------------------------------------------------------------------
 // JT_IBB
 //----------------------------------------------------------------------------
@@ -639,4 +636,3 @@ int JT_IBB::bytesWritten() const
 {
     return d->bytesWritten;
 }
-
diff --git a/src/xmpp/xmpp-im/xmpp_ibb.h b/src/xmpp/xmpp-im/xmpp_ibb.h
index 8784a4f6..e12df7cc 100644
--- a/src/xmpp/xmpp-im/xmpp_ibb.h
+++ b/src/xmpp/xmpp-im/xmpp_ibb.h
@@ -1,6 +1,6 @@
 /*
  * ibb.h - Inband bytestream
- * Copyright (C) 2001, 2002  Justin Karneges
+ * Copyright (C) 2001-2002  Justin Karneges
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -17,20 +17,19 @@
  *
  */
 
-#ifndef JABBER_IBB_H
-#define JABBER_IBB_H
-
-#include <QList>
-#include <QObject>
-#include <QDomElement>
+#ifndef XMPP_IBB_H
+#define XMPP_IBB_H
 
 #include "bytestream.h"
-#include "xmpp_bytestream.h"
 #include "im.h"
+#include "xmpp_bytestream.h"
 #include "xmpp_task.h"
 
-namespace XMPP
-{
+#include <QDomElement>
+#include <QList>
+#include <QObject>
+
+namespace XMPP {
     class Client;
     class IBBManager;
 
@@ -176,6 +175,6 @@ namespace XMPP
         class Private;
         Private *d;
     };
-}
+} // namespace XMPP
 
-#endif
+#endif // XMPP_IBB_H
diff --git a/src/xmpp/xmpp-im/xmpp_liveroster.h b/src/xmpp/xmpp-im/xmpp_liveroster.h
index a4339b63..5cbfb1a8 100644
--- a/src/xmpp/xmpp-im/xmpp_liveroster.h
+++ b/src/xmpp/xmpp-im/xmpp_liveroster.h
@@ -19,12 +19,11 @@
 #ifndef XMPP_LIVEROSTER_H
 #define XMPP_LIVEROSTER_H
 
-#include <QList>
-
 #include "xmpp_liverosteritem.h"
 
-namespace XMPP
-{
+#include <QList>
+
+namespace XMPP {
     class Jid;
 
     class LiveRoster : public QList<LiveRosterItem>
@@ -37,6 +36,6 @@ namespace XMPP
         LiveRoster::Iterator find(const Jid &, bool compareRes=true);
         LiveRoster::ConstIterator find(const Jid &, bool compareRes=true) const;
     };
-}
+} // namespace XMPP
 
-#endif
+#endif // XMPP_LIVEROSTER_H
diff --git a/src/xmpp/xmpp-im/xmpp_liverosteritem.h b/src/xmpp/xmpp-im/xmpp_liverosteritem.h
index 08bfbb44..a9c71091 100644
--- a/src/xmpp/xmpp-im/xmpp_liverosteritem.h
+++ b/src/xmpp/xmpp-im/xmpp_liverosteritem.h
@@ -19,12 +19,11 @@
 #ifndef XMPP_LIVEROSTERITEM_H
 #define XMPP_LIVEROSTERITEM_H
 
-#include "xmpp_status.h"
 #include "xmpp_resourcelist.h"
 #include "xmpp_rosteritem.h"
+#include "xmpp_status.h"
 
-namespace XMPP
-{
+namespace XMPP {
     class LiveRosterItem : public RosterItem
     {
     public:
@@ -53,6 +52,6 @@ namespace XMPP
         Status v_lastUnavailableStatus;
         bool v_flagForDelete;
     };
-}
+} // namespace XMPP
 
-#endif
+#endif // XMPP_LIVEROSTERITEM_H
diff --git a/src/xmpp/xmpp-im/xmpp_message.h b/src/xmpp/xmpp-im/xmpp_message.h
index f1378c4b..bc0d407b 100644
--- a/src/xmpp/xmpp-im/xmpp_message.h
+++ b/src/xmpp/xmpp-im/xmpp_message.h
@@ -19,29 +19,29 @@
 #ifndef XMPP_MESSAGE_H
 #define XMPP_MESSAGE_H
 
-#include "xmpp_stanza.h"
-#include "xmpp_url.h"
-#include "xmpp_chatstate.h"
-#include "xmpp_receipts.h"
 #include "xmpp_address.h"
-#include "xmpp_rosterx.h"
+#include "xmpp_chatstate.h"
 #include "xmpp_muc.h"
+#include "xmpp_receipts.h"
 #include "xmpp_reference.h"
+#include "xmpp_rosterx.h"
+#include "xmpp_stanza.h"
+#include "xmpp_url.h"
 
 #include <QExplicitlySharedDataPointer>
 
-class QString;
 class QDateTime;
+class QString;
 
 namespace XMPP {
+    class BoBData;
+    class HTMLElement;
+    class HttpAuthRequest;
+    class IBBData;
     class Jid;
     class PubSubItem;
     class PubSubRetraction;
-    class HTMLElement;
-    class HttpAuthRequest;
     class XData;
-    class BoBData;
-    class IBBData;
 
     typedef QMap<QString, QString> StringMap;
 
@@ -238,9 +238,8 @@ namespace XMPP {
         class Private;
         QExplicitlySharedDataPointer<Private> d;
     };
-}
+} // namespace XMPP
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(XMPP::Message::ProcessingHints)
 
-
-#endif
+#endif // XMPP_MESSAGE_H
diff --git a/src/xmpp/xmpp-im/xmpp_muc.h b/src/xmpp/xmpp-im/xmpp_muc.h
index 17b3657e..7b4cfd54 100644
--- a/src/xmpp/xmpp-im/xmpp_muc.h
+++ b/src/xmpp/xmpp-im/xmpp_muc.h
@@ -20,13 +20,12 @@
 #ifndef XMPP_MUC_H
 #define XMPP_MUC_H
 
+#include "xmpp/jid/jid.h"
+
 #include <QDomElement>
 #include <QString>
 
-#include "xmpp/jid/jid.h"
-
-namespace XMPP
-{
+namespace XMPP {
     class MUCItem
     {
     public:
@@ -79,7 +78,6 @@ namespace XMPP
         bool cont() const;
         void setCont(bool);
 
-
         void fromXml(const QDomElement&);
         QDomElement toXml(QDomDocument&) const;
         bool isNull() const;
@@ -131,6 +129,6 @@ namespace XMPP
         Jid jid_;
         QString reason_;
     };
-}
+} // namespace XMPP
 
-#endif
+#endif // XMPP_MUC_H
diff --git a/src/xmpp/xmpp-im/xmpp_pubsubitem.h b/src/xmpp/xmpp-im/xmpp_pubsubitem.h
index 2820c36e..3d2a6853 100644
--- a/src/xmpp/xmpp-im/xmpp_pubsubitem.h
+++ b/src/xmpp/xmpp-im/xmpp_pubsubitem.h
@@ -19,11 +19,10 @@
 #ifndef XMPP_PUBSUBITEM_H
 #define XMPP_PUBSUBITEM_H
 
-#include <QString>
 #include <QDomElement>
+#include <QString>
 
-namespace XMPP
-{
+namespace XMPP {
     class PubSubItem
     {
     public:
@@ -36,6 +35,6 @@ namespace XMPP
         QString id_;
         QDomElement payload_;
     };
-}
+} // namespace XMPP
 
-#endif
+#endif // XMPP_PUBSUBITEM_H
diff --git a/src/xmpp/xmpp-im/xmpp_pubsubretraction.h b/src/xmpp/xmpp-im/xmpp_pubsubretraction.h
index 2ece653e..8a0c463e 100644
--- a/src/xmpp/xmpp-im/xmpp_pubsubretraction.h
+++ b/src/xmpp/xmpp-im/xmpp_pubsubretraction.h
@@ -19,12 +19,10 @@
 #ifndef XMPP_PUBSUBRETRACTION_H
 #define XMPP_PUBSUBRETRACTION_H
 
-#include <QString>
 #include <QDomElement>
+#include <QString>
 
-namespace XMPP
-{
-
+namespace XMPP {
     class PubSubRetraction
     {
     public:
@@ -35,6 +33,6 @@ namespace XMPP
     private:
         QString id_;
     };
-}
+} // namespace XMPP
 
-#endif
+#endif // XMPP_PUBSUBRETRACTION_H
diff --git a/src/xmpp/xmpp-im/xmpp_receipts.h b/src/xmpp/xmpp-im/xmpp_receipts.h
index 8468837b..1554eb72 100644
--- a/src/xmpp/xmpp-im/xmpp_receipts.h
+++ b/src/xmpp/xmpp-im/xmpp_receipts.h
@@ -26,6 +26,6 @@ namespace XMPP {
         ReceiptRequest,
         ReceiptReceived
     } MessageReceipt;
-}
+} // namespace XMPP
 
-#endif
+#endif // XMPP_RECEIPTS_H
diff --git a/src/xmpp/xmpp-im/xmpp_reference.h b/src/xmpp/xmpp-im/xmpp_reference.h
index d19b5316..9cf3e5ac 100644
--- a/src/xmpp/xmpp-im/xmpp_reference.h
+++ b/src/xmpp/xmpp-im/xmpp_reference.h
@@ -20,13 +20,12 @@
 #ifndef XMPPREFERENCE_H
 #define XMPPREFERENCE_H
 
+#include "jingle-ft.h"
+
 #include <QDomElement>
 #include <QSharedPointer>
 
-#include "jingle-ft.h"
-
-namespace XMPP
-{
+namespace XMPP {
     extern const QString MEDIASHARING_NS;
     extern const QString REFERENCE_NS;
 
@@ -75,6 +74,6 @@ namespace XMPP
         class Private;
         QSharedDataPointer<Private> d;
     };
-}
+} // namespace XMPP
 
-#endif
+#endif // XMPPREFERENCE_H
diff --git a/src/xmpp/xmpp-im/xmpp_resource.h b/src/xmpp/xmpp-im/xmpp_resource.h
index 1c9f0b6e..7fd1b6b1 100644
--- a/src/xmpp/xmpp-im/xmpp_resource.h
+++ b/src/xmpp/xmpp-im/xmpp_resource.h
@@ -19,12 +19,11 @@
 #ifndef XMPP_RESOURCE_H
 #define XMPP_RESOURCE_H
 
-#include <QString>
-
 #include "xmpp_status.h"
 
-namespace XMPP
-{
+#include <QString>
+
+namespace XMPP {
     class Resource
     {
     public:
@@ -41,6 +40,6 @@ namespace XMPP
         QString v_name;
         Status v_status;
     };
-}
+} // namespace XMPP
 
-#endif
+#endif // XMPP_RESOURCE_H
diff --git a/src/xmpp/xmpp-im/xmpp_resourcelist.h b/src/xmpp/xmpp-im/xmpp_resourcelist.h
index 75c4c4a3..ae41bad2 100644
--- a/src/xmpp/xmpp-im/xmpp_resourcelist.h
+++ b/src/xmpp/xmpp-im/xmpp_resourcelist.h
@@ -19,14 +19,13 @@
 #ifndef XMPP_RESOURCELIST_H
 #define XMPP_RESOURCELIST_H
 
-#include <QList>
-
 #include "xmpp_resource.h"
 
+#include <QList>
+
 class QString;
 
-namespace XMPP
-{
+namespace XMPP {
     class ResourceList : public QList<Resource>
     {
     public:
@@ -39,6 +38,6 @@ namespace XMPP
         ResourceList::ConstIterator find(const QString &) const;
         ResourceList::ConstIterator priority() const;
     };
-}
+} // namespace XMPP
 
-#endif
+#endif // XMPP_RESOURCELIST_H
diff --git a/src/xmpp/xmpp-im/xmpp_roster.h b/src/xmpp/xmpp-im/xmpp_roster.h
index 2e134686..9572e580 100644
--- a/src/xmpp/xmpp-im/xmpp_roster.h
+++ b/src/xmpp/xmpp-im/xmpp_roster.h
@@ -19,16 +19,16 @@
 #ifndef XMPP_ROSTER_H
 #define XMPP_ROSTER_H
 
-#include <QList>
-
 #include "xmpp_rosteritem.h"
 
+#include <QList>
+
 class QDomDocument;
 class QDomElement;
 
-namespace XMPP
-{
+namespace XMPP {
     class Jid;
+
     class Roster : public QList<RosterItem>
     {
     public:
@@ -42,6 +42,6 @@ namespace XMPP
         class RosterPrivate;
         RosterPrivate *d = nullptr;
     };
-}
+} // namespace XMPP
 
-#endif
+#endif // XMPP_ROSTER_H
diff --git a/src/xmpp/xmpp-im/xmpp_rosteritem.h b/src/xmpp/xmpp-im/xmpp_rosteritem.h
index acb31e95..3fe1e486 100644
--- a/src/xmpp/xmpp-im/xmpp_rosteritem.h
+++ b/src/xmpp/xmpp-im/xmpp_rosteritem.h
@@ -19,13 +19,12 @@
 #ifndef XMPP_ROSTERITEM_H
 #define XMPP_ROSTERITEM_H
 
+#include "xmpp/jid/jid.h"
+
 #include <QString>
 #include <QStringList>
 
-#include "xmpp/jid/jid.h"
-
-namespace XMPP
-{
+namespace XMPP {
     class Subscription
     {
     public:
@@ -78,6 +77,6 @@ namespace XMPP
         QString v_ask;
         bool v_push;
     };
-}
+} // namespace XMPP
 
-#endif
+#endif // XMPP_ROSTERITEM_H
diff --git a/src/xmpp/xmpp-im/xmpp_rosterx.h b/src/xmpp/xmpp-im/xmpp_rosterx.h
index b4d52d15..70a3f9de 100644
--- a/src/xmpp/xmpp-im/xmpp_rosterx.h
+++ b/src/xmpp/xmpp-im/xmpp_rosterx.h
@@ -20,15 +20,14 @@
 #ifndef XMPP_ROSTERX_H
 #define XMPP_ROSTERX_H
 
+#include "xmpp/jid/jid.h"
+
 #include <QString>
 #include <QStringList>
 
-#include "xmpp/jid/jid.h"
-
 class QDomElement;
 
-namespace XMPP
-{
+namespace XMPP {
     class Stanza;
 
     class RosterExchangeItem
@@ -60,6 +59,6 @@ namespace XMPP
         Action action_;
     };
     typedef QList<RosterExchangeItem> RosterExchangeItems;
-}
+} // namespace XMPP
 
-#endif
+#endif // XMPP_ROSTERX_H
diff --git a/src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp b/src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp
index f942beda..72e5ee83 100644
--- a/src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp
+++ b/src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp
@@ -1,6 +1,6 @@
 /*
  * xmpp_serverinfomanager.cpp
- * Copyright (C) 2006,2019  Remko Troncon, Sergey Ilinykh
+ * Copyright (C) 2006-2019  Remko Troncon, Sergey Ilinykh
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -18,11 +18,11 @@
  */
 
 #include "xmpp_serverinfomanager.h"
-#include "xmpp_tasks.h"
+
 #include "xmpp_caps.h"
+#include "xmpp_tasks.h"
 
 namespace XMPP {
-
 ServerInfoManager::ServerInfoManager(Client* client):
     QObject(client),
     _client(client),
@@ -293,5 +293,4 @@ void ServerInfoManager::disco_finished()
         emit featuresChanged();
     }
 }
-
 } // namespace XMPP
diff --git a/src/xmpp/xmpp-im/xmpp_serverinfomanager.h b/src/xmpp/xmpp-im/xmpp_serverinfomanager.h
index b5957c14..ebbaeeef 100644
--- a/src/xmpp/xmpp-im/xmpp_serverinfomanager.h
+++ b/src/xmpp/xmpp-im/xmpp_serverinfomanager.h
@@ -23,15 +23,13 @@
 #include "xmpp_caps.h"
 #include "xmpp_discoitem.h"
 
+#include <QLinkedList>
 #include <QObject>
 #include <QString>
-#include <QLinkedList>
 #include <QVariant>
-
 #include <functional>
 
 namespace XMPP {
-
 class Client;
 class Features;
 class Jid;
@@ -84,7 +82,6 @@ class ServerInfoManager : public QObject
         QMap<QString,QVariant> meta;
     };
 
-
 public:
 
     ServerInfoManager(XMPP::Client* client);
@@ -148,7 +145,6 @@ private slots:
     bool _hasPEP;
     bool _canMessageCarbons;
 };
-
 } // namespace XMPP
 
-#endif
+#endif // SERVERINFOMANAGER_H
diff --git a/src/xmpp/xmpp-im/xmpp_status.h b/src/xmpp/xmpp-im/xmpp_status.h
index a43f9577..a37f5988 100644
--- a/src/xmpp/xmpp-im/xmpp_status.h
+++ b/src/xmpp/xmpp-im/xmpp_status.h
@@ -20,18 +20,19 @@
 #ifndef XMPP_STATUS_H
 #define XMPP_STATUS_H
 
+#include "xmpp_bitsofbinary.h"
+#include "xmpp_muc.h"
+
+#include <QCryptographicHash>
+#include <QDateTime>
 #include <QList>
 #include <QString>
 #include <QStringList>
-#include <QDateTime>
-#include <QCryptographicHash>
 
-#include "xmpp_muc.h"
-#include "xmpp_bitsofbinary.h"
-
-namespace XMPP
-{
+namespace XMPP {
     class DiscoItem;
+    class StatusPrivate;
+
     class CapsSpec
     {
         public:
@@ -66,8 +67,6 @@ namespace XMPP
             QStringList ext_;
     };
 
-    class StatusPrivate;
-
     class Status
     {
     public:
@@ -146,9 +145,8 @@ namespace XMPP
     private:
         QSharedDataPointer<StatusPrivate> d;
     };
-
-}
+} // namespace XMPP
 
 Q_DECLARE_METATYPE(XMPP::Status)
 
-#endif
+#endif // XMPP_STATUS_H
diff --git a/src/xmpp/xmpp-im/xmpp_subsets.cpp b/src/xmpp/xmpp-im/xmpp_subsets.cpp
index f5835304..5bdf0831 100644
--- a/src/xmpp/xmpp-im/xmpp_subsets.cpp
+++ b/src/xmpp/xmpp-im/xmpp_subsets.cpp
@@ -18,6 +18,7 @@
  */
 
 #include "xmpp_subsets.h"
+
 #include "xmpp_xmlcommon.h"
 
 using namespace XMPP;
diff --git a/src/xmpp/xmpp-im/xmpp_subsets.h b/src/xmpp/xmpp-im/xmpp_subsets.h
index 51b75387..d1f9b8e5 100644
--- a/src/xmpp/xmpp-im/xmpp_subsets.h
+++ b/src/xmpp/xmpp-im/xmpp_subsets.h
@@ -22,8 +22,7 @@
 
 #include <QDomDocument>
 
-namespace XMPP
-{
+namespace XMPP {
     class SubsetsClientManager
     {
     public:
@@ -52,6 +51,6 @@ namespace XMPP
         class Private;
         Private *d;
     };
-}
+} // namespace XMPP
 
-#endif
+#endif // XMPP_SUBSETS_H
diff --git a/src/xmpp/xmpp-im/xmpp_task.cpp b/src/xmpp/xmpp-im/xmpp_task.cpp
index d72cc875..8b65987d 100644
--- a/src/xmpp/xmpp-im/xmpp_task.cpp
+++ b/src/xmpp/xmpp-im/xmpp_task.cpp
@@ -16,12 +16,13 @@
  *
  */
 
-#include <QTimer>
-
 #include "xmpp_task.h"
+
 #include "xmpp_client.h"
-#include "xmpp_xmlcommon.h"
 #include "xmpp_stanza.h"
+#include "xmpp_xmlcommon.h"
+
+#include <QTimer>
 
 #define DEFAULT_TIMEOUT 120
 
@@ -291,7 +292,6 @@ void Task::debug(const QString &str)
     client()->debug(QString("%1: ").arg(metaObject()->className()) + str);
 }
 
-
 /**
  * \brief verifiys a stanza is a IQ reply for this task
  *
@@ -345,4 +345,3 @@ bool Task::iqVerify(const QDomElement &x, const Jid &to, const QString &id, cons
 
     return true;
 }
-
diff --git a/src/xmpp/xmpp-im/xmpp_task.h b/src/xmpp/xmpp-im/xmpp_task.h
index 91daae14..fcdb9533 100644
--- a/src/xmpp/xmpp-im/xmpp_task.h
+++ b/src/xmpp/xmpp-im/xmpp_task.h
@@ -84,6 +84,6 @@ namespace XMPP {
         class TaskPrivate;
         TaskPrivate *d;
     };
-}
+} // namespace XMPP
 
-#endif
+#endif // XMPP_TASK_H
diff --git a/src/xmpp/xmpp-im/xmpp_tasks.cpp b/src/xmpp/xmpp-im/xmpp_tasks.cpp
index cfa6bc3f..c47e87c2 100644
--- a/src/xmpp/xmpp-im/xmpp_tasks.cpp
+++ b/src/xmpp/xmpp-im/xmpp_tasks.cpp
@@ -1,6 +1,6 @@
 /*
  * tasks.cpp - basic tasks
- * Copyright (C) 2001, 2002  Justin Karneges
+ * Copyright (C) 2001-2002  Justin Karneges
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -17,20 +17,20 @@
  *
  */
 
-#include <QRegExp>
-#include <QList>
-#include <QTimer>
-
 #include "xmpp_tasks.h"
-#include "xmpp_xmlcommon.h"
-#include "xmpp_vcard.h"
-#include "xmpp_bitsofbinary.h"
-#include "xmpp_captcha.h"
+
 #include "xmpp/base/timezone.h"
+#include "xmpp_bitsofbinary.h"
 #include "xmpp_caps.h"
+#include "xmpp_captcha.h"
+#include "xmpp_vcard.h"
+#include "xmpp_xmlcommon.h"
 
-using namespace XMPP;
+#include <QList>
+#include <QRegExp>
+#include <QTimer>
 
+using namespace XMPP;
 
 static QString lineEncode(QString str)
 {
@@ -513,7 +513,6 @@ bool JT_Roster::take(const QDomElement &x)
     return false;
 }
 
-
 //----------------------------------------------------------------------------
 // JT_PushRoster
 //----------------------------------------------------------------------------
@@ -540,7 +539,6 @@ bool JT_PushRoster::take(const QDomElement &e)
     return true;
 }
 
-
 //----------------------------------------------------------------------------
 // JT_Presence
 //----------------------------------------------------------------------------
@@ -658,7 +656,6 @@ void JT_Presence::onGo()
     setSuccess();
 }
 
-
 //----------------------------------------------------------------------------
 // JT_PushPresence
 //----------------------------------------------------------------------------
@@ -785,7 +782,6 @@ bool JT_PushPresence::take(const QDomElement &e)
         }
     }
 
-
     if (stamp.isValid()) {
         if (client()->manualTimeZoneOffset()) {
             stamp = stamp.addSecs(client()->timeZoneOffset() * 3600);
@@ -801,7 +797,6 @@ bool JT_PushPresence::take(const QDomElement &e)
     return true;
 }
 
-
 //----------------------------------------------------------------------------
 // JT_Message
 //----------------------------------------------------------------------------
@@ -871,7 +866,6 @@ void JT_Message::onGo()
     setSuccess();
 }
 
-
 //----------------------------------------------------------------------------
 // JT_PushMessage
 //----------------------------------------------------------------------------
@@ -1066,7 +1060,6 @@ bool JT_VCard::take(const QDomElement &x)
     return true;
 }
 
-
 //----------------------------------------------------------------------------
 // JT_Search
 //----------------------------------------------------------------------------
@@ -1241,7 +1234,6 @@ bool JT_Search::take(const QDomElement &x)
     return true;
 }
 
-
 //----------------------------------------------------------------------------
 // JT_ClientVersion
 //----------------------------------------------------------------------------
@@ -1310,7 +1302,6 @@ const QString & JT_ClientVersion::os() const
     return v_os;
 }
 
-
 //----------------------------------------------------------------------------
 // JT_EntityTime
 //----------------------------------------------------------------------------
@@ -1387,7 +1378,6 @@ int JT_EntityTime::timezoneOffset() const
     return tzo;
 }
 
-
 //----------------------------------------------------------------------------
 // JT_ServInfo
 //----------------------------------------------------------------------------
@@ -1477,7 +1467,6 @@ bool JT_ServInfo::take(const QDomElement &e)
     return false;
 }
 
-
 //----------------------------------------------------------------------------
 // JT_Gateway
 //----------------------------------------------------------------------------
@@ -1753,7 +1742,6 @@ bool JT_DiscoPublish::take(const QDomElement &x)
     return true;
 }
 
-
 // ---------------------------------------------------------
 // JT_BoBServer
 // ---------------------------------------------------------
@@ -1789,7 +1777,6 @@ bool JT_BoBServer::take(const QDomElement &e)
     return false;
 }
 
-
 //----------------------------------------------------------------------------
 // JT_BitsOfBinary
 //----------------------------------------------------------------------------
@@ -1996,7 +1983,6 @@ bool JT_CaptchaChallenger::take(const QDomElement &x)
     return true;
 }
 
-
 //---------------------------------------------------------------------------
 // JT_CaptchaSender
 //---------------------------------------------------------------------------
diff --git a/src/xmpp/xmpp-im/xmpp_tasks.h b/src/xmpp/xmpp-im/xmpp_tasks.h
index 11c401f0..d183ff42 100644
--- a/src/xmpp/xmpp-im/xmpp_tasks.h
+++ b/src/xmpp/xmpp-im/xmpp_tasks.h
@@ -1,6 +1,6 @@
 /*
  * tasks.h - basic tasks
- * Copyright (C) 2001, 2002  Justin Karneges
+ * Copyright (C) 2001-2002  Justin Karneges
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -17,25 +17,24 @@
  *
  */
 
-#ifndef JABBER_TASKS_H
-#define JABBER_TASKS_H
-
-#include <QString>
-#include <QtXml>
-#include <QList>
+#ifndef XMPP_TASKS_H
+#define XMPP_TASKS_H
 
 #include "im.h"
-#include "xmpp_vcard.h"
 #include "xmpp_discoinfotask.h"
-#include "xmpp_subsets.h"
 #include "xmpp_encryptionhandler.h"
+#include "xmpp_subsets.h"
+#include "xmpp_vcard.h"
 
-namespace XMPP
-{
-    class Roster;
-    class Status;
+#include <QList>
+#include <QString>
+#include <QtXml>
+
+namespace XMPP {
     class BoBData;
     class CaptchaChallenge;
+    class Roster;
+    class Status;
 
     class JT_Register : public Task
     {
@@ -470,6 +469,6 @@ namespace XMPP
         Jid to;
         QDomElement iq;
     };
-}
+} // namespace XMPP
 
-#endif
+#endif // XMPP_TASKS_H
diff --git a/src/xmpp/xmpp-im/xmpp_thumbs.h b/src/xmpp/xmpp-im/xmpp_thumbs.h
index 268c414d..bf913c01 100644
--- a/src/xmpp/xmpp-im/xmpp_thumbs.h
+++ b/src/xmpp/xmpp-im/xmpp_thumbs.h
@@ -19,14 +19,13 @@
 #ifndef XMPP_THUMBS_H
 #define XMPP_THUMBS_H
 
+#include <QDomElement>
 #include <QString>
 #include <QUrl>
-#include <QDomElement>
 
 #define XMPP_THUMBS_NS "urn:xmpp:thumbs:1" // TODO make nsdb.cpp/h with static declarations of all ns
 
-namespace XMPP
-{
+namespace XMPP {
     class Thumbnail
     {
     public:
@@ -48,6 +47,6 @@ namespace XMPP
         quint32    width;
         quint32    height;
     };
-}
+} // namespace XMPP
 
-#endif
+#endif // XMPP_THUMBS_H
diff --git a/src/xmpp/xmpp-im/xmpp_url.h b/src/xmpp/xmpp-im/xmpp_url.h
index 315e6d28..0f90b421 100644
--- a/src/xmpp/xmpp-im/xmpp_url.h
+++ b/src/xmpp/xmpp-im/xmpp_url.h
@@ -21,8 +21,7 @@
 
 class QString;
 
-namespace XMPP
-{
+namespace XMPP {
     class Url
     {
     public:
@@ -43,6 +42,6 @@ namespace XMPP
     };
 
     typedef QList<Url> UrlList;
-}
+} // namespace XMPP
 
-#endif
+#endif // XMPP_URL
diff --git a/src/xmpp/xmpp-im/xmpp_vcard.cpp b/src/xmpp/xmpp-im/xmpp_vcard.cpp
index fa74112b..d28a4c7a 100644
--- a/src/xmpp/xmpp-im/xmpp_vcard.cpp
+++ b/src/xmpp/xmpp-im/xmpp_vcard.cpp
@@ -19,16 +19,16 @@
 
 #include "xmpp_vcard.h"
 
-#include <qdom.h>
+#include "xmpp_xmlcommon.h"
+
+#include <QBuffer>
 #include <QDateTime>
 #include <QImage> // needed for image format recognition
-#include <QBuffer>
 #include <QImageReader>
 #include <QImageWriter>
 #include <QtCrypto>
 #include <QtDebug>
-
-#include "xmpp_xmlcommon.h"
+#include <qdom.h>
 
 using namespace XMLHelper;
 
@@ -71,7 +71,6 @@ QString image2type(const QByteArray &ba)
 }
 
 namespace XMPP {
-
 // Long lines of encoded binary data SHOULD BE folded to 75 characters using the folding method defined in [MIME-DIR].
 static QString foldString(const QString &s)
 {
@@ -1193,5 +1192,4 @@ void VCard::setKey(const QByteArray &k)
 {
     d->key = k;
 }
-
 } // namespace XMPP
diff --git a/src/xmpp/xmpp-im/xmpp_vcard.h b/src/xmpp/xmpp-im/xmpp_vcard.h
index 145c492f..8dda52d3 100644
--- a/src/xmpp/xmpp-im/xmpp_vcard.h
+++ b/src/xmpp/xmpp-im/xmpp_vcard.h
@@ -17,21 +17,20 @@
  *
  */
 
-#ifndef JABBER_VCARD_H
-#define JABBER_VCARD_H
+#ifndef XMPP_VCARD_H
+#define XMPP_VCARD_H
 
+#include <QList>
 #include <QSharedDataPointer>
 #include <QString>
 #include <QStringList>
-
-#include <QList>
 #include <qdom.h>
 
 class QDate;
 
-namespace XMPP
-{
+namespace XMPP {
     class VCardPrivate;
+
     class VCard
     {
     public:
@@ -54,7 +53,6 @@ namespace XMPP
         const QString &fullName() const;
         void setFullName(const QString &);
 
-
         const QString &familyName() const;
         void setFamilyName(const QString &);
 
@@ -70,25 +68,21 @@ namespace XMPP
         const QString &suffixName() const;
         void setSuffixName(const QString &);
 
-
         const QString &nickName() const;
         void setNickName(const QString &);
 
-
         const QByteArray &photo() const;
         void setPhoto(const QByteArray &);
 
         const QString &photoURI() const;
         void setPhotoURI(const QString &);
 
-
         const QDate bday() const;
         void setBday(const QDate &);
 
         const QString &bdayStr() const;
         void setBdayStr(const QString &);
 
-
         class Address {
         public:
             Address();
@@ -135,7 +129,6 @@ namespace XMPP
         const LabelList &labelList() const;
         void setLabelList(const LabelList &);
 
-
         class Phone {
         public:
             Phone();
@@ -160,7 +153,6 @@ namespace XMPP
         const PhoneList &phoneList() const;
         void setPhoneList(const PhoneList &);
 
-
         class Email {
         public:
             Email();
@@ -176,7 +168,6 @@ namespace XMPP
         const EmailList &emailList() const;
         void setEmailList(const EmailList &);
 
-
         const QString &jid() const;
         void setJid(const QString &);
 
@@ -186,7 +177,6 @@ namespace XMPP
         const QString &timezone() const;
         void setTimezone(const QString &);
 
-
         class Geo {
         public:
             Geo();
@@ -197,28 +187,24 @@ namespace XMPP
         const Geo &geo() const;
         void setGeo(const Geo &);
 
-
         const QString &title() const;
         void setTitle(const QString &);
 
         const QString &role() const;
         void setRole(const QString &);
 
-
         const QByteArray &logo() const;
         void setLogo(const QByteArray &);
 
         const QString &logoURI() const;
         void setLogoURI(const QString &);
 
-
         VCard agent() const;
         void setAgent(const VCard &);
 
         const QString agentURI() const;
         void setAgentURI(const QString &);
 
-
         class Org {
         public:
             Org();
@@ -229,7 +215,6 @@ namespace XMPP
         const Org &org() const;
         void setOrg(const Org &);
 
-
         const QStringList &categories() const;
         void setCategories(const QStringList &);
 
@@ -245,7 +230,6 @@ namespace XMPP
         const QString &sortString() const;
         void setSortString(const QString &);
 
-
         const QByteArray &sound() const;
         void setSound(const QByteArray &);
 
@@ -255,7 +239,6 @@ namespace XMPP
         const QString &soundPhonetic() const;
         void setSoundPhonetic(const QString &);
 
-
         const QString &uid() const;
         void setUid(const QString &);
 
@@ -265,7 +248,6 @@ namespace XMPP
         const QString &desc() const;
         void setDesc(const QString &);
 
-
         enum PrivacyClass {
             pcNone = 0,
             pcPublic = 1,
@@ -275,16 +257,15 @@ namespace XMPP
         const PrivacyClass &privacyClass() const;
         void setPrivacyClass(const PrivacyClass &);
 
-
         const QByteArray &key() const;
         void setKey(const QByteArray &);
 
     private:
         QSharedDataPointer<VCardPrivate> d;
     };
-}
+} // namespace XMPP
 
 QString openedImage2type(QIODevice *dev);
 QString image2type(const QByteArray &ba);
 
-#endif
+#endif // XMPP_VCARD_H
diff --git a/src/xmpp/xmpp-im/xmpp_xdata.cpp b/src/xmpp/xmpp-im/xmpp_xdata.cpp
index e2bf37d4..2d4264c6 100644
--- a/src/xmpp/xmpp-im/xmpp_xdata.cpp
+++ b/src/xmpp/xmpp-im/xmpp_xdata.cpp
@@ -18,14 +18,15 @@
  */
 
 #include "xmpp_xdata.h"
-#include "xmpp_xmlcommon.h"
+
 #include "xmpp/jid/jid.h"
+#include "xmpp_xmlcommon.h"
 
 #include <QList>
 #include <QSharedDataPointer>
 
-using namespace XMPP;
 using namespace XMLHelper;
+using namespace XMPP;
 
 // TODO: report, item
 
@@ -329,9 +330,6 @@ QDomElement XData::Field::toXml(QDomDocument *doc, bool submitForm) const
     return f;
 }
 
-
-
-
 //----------------------------------------------------------------------------
 // MediaElement
 //----------------------------------------------------------------------------
@@ -369,9 +367,6 @@ bool XData::Field::MediaElement::checkSupport(const QStringList &wildcards)
     return false;
 }
 
-
-
-
 //----------------------------------------------------------------------------
 // XData
 //----------------------------------------------------------------------------
diff --git a/src/xmpp/xmpp-im/xmpp_xdata.h b/src/xmpp/xmpp-im/xmpp_xdata.h
index 621890e3..de1f5e87 100644
--- a/src/xmpp/xmpp-im/xmpp_xdata.h
+++ b/src/xmpp/xmpp-im/xmpp_xdata.h
@@ -17,22 +17,21 @@
  *
  */
 
-#ifndef XMPPXDATA_H
-#define XMPPXDATA_H
+#ifndef XMPP_XDATA_H
+#define XMPP_XDATA_H
 
-#include <QString>
-#include <QMap>
+#include <QHash>
 #include <QList>
+#include <QMap>
 #include <QSharedDataPointer>
-#include <QStringList>
 #include <QSize>
-#include <QHash>
+#include <QString>
+#include <QStringList>
 
-class QDomElement;
 class QDomDocument;
+class QDomElement;
 
 namespace XMPP {
-
     class XData
     {
     public:
@@ -178,7 +177,6 @@ namespace XMPP {
         };
         QSharedDataPointer<Private> d;
     };
+}; // namespace XMPP
 
-};
-
-#endif
+#endif // XMPP_XDATA_H
diff --git a/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp b/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
index b4e86c93..927e3c01 100644
--- a/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
+++ b/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
@@ -1,6 +1,6 @@
 /*
  * xmlcommon.cpp - helper functions for dealing with XML
- * Copyright (C) 2001, 2002  Justin Karneges
+ * Copyright (C) 2001-2002  Justin Karneges
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -17,16 +17,17 @@
  *
  */
 
-#include <QString>
+#include "xmpp_xmlcommon.h"
+
+#include "xmpp_stanza.h"
+
+#include <QColor>
 #include <QDateTime>
-#include <QSize>
+#include <QLocale>
 #include <QRect>
+#include <QSize>
+#include <QString>
 #include <QStringList>
-#include <QColor>
-#include <QLocale>
-
-#include "xmpp_xmlcommon.h"
-#include "xmpp_stanza.h"
 
 //----------------------------------------------------------------------------
 // XDomNodeList
@@ -165,7 +166,6 @@ QString tagContent(const QDomElement &e)
     return "";
 }
 
-
 /**
  * \brief obtain direct child elements of a certain kind.  unlike
  *        elementsByTagNameNS, this function does not descend beyond the first
@@ -188,7 +188,6 @@ XDomNodeList childElementsByTagNameNS(const QDomElement &e, const QString &nsURI
     return out;
 }
 
-
 /**
  * \brief create a new IQ stanza
  * \param doc
@@ -313,9 +312,7 @@ QDomElement addCorrectNS(const QDomElement &e)
 //----------------------------------------------------------------------------
 // XMLHelper
 //----------------------------------------------------------------------------
-
 namespace XMLHelper {
-
 QDomElement emptyTag(QDomDocument *doc, const QString &name)
 {
     QDomElement tag = doc->createElement(name);
@@ -537,5 +534,4 @@ void setTagText(QDomElement &e, const QString &text)
 {
     e.appendChild(e.ownerDocument().createTextNode(text));
 }
-
-}
+} // namespace XMLHelper
diff --git a/src/xmpp/xmpp-im/xmpp_xmlcommon.h b/src/xmpp/xmpp-im/xmpp_xmlcommon.h
index e3df0a06..d3ac151d 100644
--- a/src/xmpp/xmpp-im/xmpp_xmlcommon.h
+++ b/src/xmpp/xmpp-im/xmpp_xmlcommon.h
@@ -1,6 +1,6 @@
 /*
  * xmlcommon.h - helper functions for dealing with XML
- * Copyright (C) 2001, 2002  Justin Karneges
+ * Copyright (C) 2001-2002  Justin Karneges
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -17,20 +17,19 @@
  *
  */
 
-#ifndef JABBER_XMLCOMMON_H
-#define JABBER_XMLCOMMON_H
+#ifndef XMPP_XMLCOMMON_H
+#define XMPP_XMLCOMMON_H
 
 #include <qdom.h>
 #include <qlist.h>
 
+class QColor;
 class QDateTime;
 class QRect;
 class QSize;
-class QColor;
 class QStringList;
 
-class XDomNodeList
-{
+class XDomNodeList {
 public:
     XDomNodeList();
     XDomNodeList(const XDomNodeList &from);
@@ -100,6 +99,6 @@ namespace XMLHelper {
 
     //QString tagContent(const QDomElement &e); // obsolete;
     QString sanitizedLang(const QString &lang);
-}
+} // namespace XMLHelper
 
-#endif
+#endif // XMPP_XMLCOMMON_H
diff --git a/src/xmpp/zlib/common.h b/src/xmpp/zlib/common.h
index bf243c0d..d738379e 100644
--- a/src/xmpp/zlib/common.h
+++ b/src/xmpp/zlib/common.h
@@ -21,4 +21,4 @@ static void initZStream(z_stream* z)
     z->reserved = 0;
 }
 
-#endif
+#endif // ZLIB_COMMON_H
diff --git a/src/xmpp/zlib/zlibcompressor.cpp b/src/xmpp/zlib/zlibcompressor.cpp
index e1d08f8f..bbf43256 100644
--- a/src/xmpp/zlib/zlibcompressor.cpp
+++ b/src/xmpp/zlib/zlibcompressor.cpp
@@ -1,11 +1,11 @@
 #include "xmpp/zlib/zlibcompressor.h"
 
-#include <QtDebug>
-#include <QObject>
-#include <QIODevice>
+#include "common.h"
 #include "zlib.h"
 
-#include "common.h"
+#include <QIODevice>
+#include <QObject>
+#include <QtDebug>
 
 ZLibCompressor::ZLibCompressor(QIODevice* device, int compression) : device_(device)
 {
diff --git a/src/xmpp/zlib/zlibcompressor.h b/src/xmpp/zlib/zlibcompressor.h
index 7e3783a5..92d1f113 100644
--- a/src/xmpp/zlib/zlibcompressor.h
+++ b/src/xmpp/zlib/zlibcompressor.h
@@ -1,10 +1,10 @@
 #ifndef ZLIBCOMPRESSOR_H
 #define ZLIBCOMPRESSOR_H
 
-#include <QObject>
-
 #include "zlib.h"
 
+#include <QObject>
+
 class QIODevice;
 
 class ZLibCompressor : public QObject
@@ -29,4 +29,4 @@ protected slots:
     bool flushed_;
 };
 
-#endif
+#endif // ZLIBCOMPRESSOR_H
diff --git a/src/xmpp/zlib/zlibdecompressor.cpp b/src/xmpp/zlib/zlibdecompressor.cpp
index 0f04eba6..0f0aafaf 100644
--- a/src/xmpp/zlib/zlibdecompressor.cpp
+++ b/src/xmpp/zlib/zlibdecompressor.cpp
@@ -1,11 +1,11 @@
 #include "xmpp/zlib/zlibdecompressor.h"
 
-#include <QtDebug>
-#include <QObject>
-#include <QIODevice>
+#include "xmpp/zlib/common.h"
 #include "zlib.h"
 
-#include "xmpp/zlib/common.h"
+#include <QIODevice>
+#include <QObject>
+#include <QtDebug>
 
 ZLibDecompressor::ZLibDecompressor(QIODevice* device) : device_(device)
 {
diff --git a/src/xmpp/zlib/zlibdecompressor.h b/src/xmpp/zlib/zlibdecompressor.h
index f0bac6e6..898d8c7d 100644
--- a/src/xmpp/zlib/zlibdecompressor.h
+++ b/src/xmpp/zlib/zlibdecompressor.h
@@ -1,10 +1,10 @@
 #ifndef ZLIBDECOMPRESSOR_H
 #define ZLIBDECOMPRESSOR_H
 
-#include <QObject>
-
 #include "zlib.h"
 
+#include <QObject>
+
 class QIODevice;
 
 class ZLibDecompressor : public QObject
@@ -29,4 +29,4 @@ protected slots:
     bool flushed_;
 };
 
-#endif
+#endif // ZLIBDECOMPRESSOR_H
diff --git a/tools/nettool/main.cpp b/tools/nettool/main.cpp
index 6e03d5e4..d52bd627 100644
--- a/tools/nettool/main.cpp
+++ b/tools/nettool/main.cpp
@@ -16,18 +16,18 @@
  *
  */
 
-#include <stdio.h>
-#include <iris/processquit.h>
-#include <iris/netinterface.h>
+#include <QtCrypto>
+#include <iris/addressresolver.h>
 #include <iris/netavailability.h>
+#include <iris/netinterface.h>
 #include <iris/netnames.h>
-#include <iris/addressresolver.h>
+#include <iris/processquit.h>
+#include <iris/stunallocate.h>
+#include <iris/stunbinding.h>
 #include <iris/stunmessage.h>
 #include <iris/stuntransaction.h>
-#include <iris/stunbinding.h>
-#include <iris/stunallocate.h>
 #include <iris/turnclient.h>
-#include <QtCrypto>
+#include <stdio.h>
 
 using namespace XMPP;
 
diff --git a/tools/xmpptest/xmpptest.cpp b/tools/xmpptest/xmpptest.cpp
index 497ab6a3..4753d760 100644
--- a/tools/xmpptest/xmpptest.cpp
+++ b/tools/xmpptest/xmpptest.cpp
@@ -16,33 +16,31 @@
  *
  */
 
+#include "im.h"
+#include "ui_test.h"
+#include "xmpp.h"
+
 #include <QApplication>
+#include <QTextBlock>
 #include <QTextEdit>
-#include <qgroupbox.h>
-#include <qlineedit.h>
-#include <qlabel.h>
+#include <qca.h>
 #include <qcheckbox.h>
 #include <qcombobox.h>
-#include <qpushbutton.h>
-#include <qmessagebox.h>
+#include <qgroupbox.h>
 #include <qinputdialog.h>
-#include <qspinbox.h>
-#include <qtimer.h>
-#include <qmenubar.h>
+#include <qlabel.h>
+#include <qlineedit.h>
 #include <qmenu.h>
+#include <qmenubar.h>
+#include <qmessagebox.h>
+#include <qpushbutton.h>
+#include <qspinbox.h>
 #include <qtabwidget.h>
-#include <QTextBlock>
-#include <qca.h>
-#include "xmpp.h"
-#include "im.h"
-
+#include <qtimer.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
 
-#include "ui_test.h"
-
-#include <stdio.h>
-
 #define AppName "xmpptest"
 
 static QString plain2rich(const QString &plain)

From 1144eb23c993825f9b9c25795af77ac2fd7933ad Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sat, 31 Aug 2019 08:22:04 +0300
Subject: [PATCH 100/383] fixed compilation

---
 src/xmpp/base/randrandomnumbergenerator.h | 2 ++
 src/xmpp/xmpp-im/xmpp_address.h           | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/xmpp/base/randrandomnumbergenerator.h b/src/xmpp/base/randrandomnumbergenerator.h
index 1d1c45ee..985786cf 100644
--- a/src/xmpp/base/randrandomnumbergenerator.h
+++ b/src/xmpp/base/randrandomnumbergenerator.h
@@ -21,6 +21,8 @@
 
 #include "xmpp/base/randomnumbergenerator.h"
 
+#include <cstdlib>
+
 namespace XMPP {
     class RandRandomNumberGenerator : public RandomNumberGenerator
     {
diff --git a/src/xmpp/xmpp-im/xmpp_address.h b/src/xmpp/xmpp-im/xmpp_address.h
index 108c6614..9343c888 100644
--- a/src/xmpp/xmpp-im/xmpp_address.h
+++ b/src/xmpp/xmpp-im/xmpp_address.h
@@ -20,6 +20,7 @@
 #define XMPP_ADDRESS_H
 
 #include "xmpp/jid/jid.h"
+#include "xmpp_stanza.h"
 
 #include <QString>
 

From 5999922802f5bac118f91486021dbf6e71886246 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Thu, 10 Oct 2019 10:16:34 +0300
Subject: [PATCH 101/383] improved xmpp::hash and jingle file

Al the remaining changes - automatic reformatting
---
 src/xmpp/xmpp-im/jingle-ft.cpp         |  390 +++----
 src/xmpp/xmpp-im/jingle-ft.h           |  145 ++-
 src/xmpp/xmpp-im/types.cpp             | 1453 +++++++++++++-----------
 src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp |  108 +-
 src/xmpp/xmpp-im/xmpp_bitsofbinary.h   |  132 +--
 src/xmpp/xmpp-im/xmpp_hash.h           |   97 +-
 src/xmpp/xmpp-im/xmpp_status.h         |  234 ++--
 src/xmpp/xmpp-im/xmpp_tasks.cpp        |  828 +++++++-------
 src/xmpp/xmpp-im/xmpp_xmlcommon.cpp    |  149 +--
 src/xmpp/xmpp-im/xmpp_xmlcommon.h      |   92 +-
 10 files changed, 1853 insertions(+), 1775 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 60c2ef2b..3d559e86 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -30,21 +30,34 @@
 namespace XMPP {
 namespace Jingle {
 namespace FileTransfer {
-const QString NS = QStringLiteral("urn:xmpp:jingle:apps:file-transfer:5");
-const QString HISTOGRAM_NS = QStringLiteral("urn:audio:histogram");
+const QString NS            = QStringLiteral("urn:xmpp:jingle:apps:file-transfer:5");
+const QString AMPLITUDES_NS = QStringLiteral("urn:audio:amplitudes");
+
+// tags
+static const QString AMPLITUDES_TAG = QStringLiteral("amplitudes");
+static const QString FILETAG        = QStringLiteral("file");
+static const QString DATE_TAG       = QStringLiteral("date");
+static const QString DESC_TAG       = QStringLiteral("desc");
+static const QString MEDIA_TYPE_TAG = QStringLiteral("media-type");
+static const QString NAME_TAG       = QStringLiteral("name");
+static const QString SIZE_TAG       = QStringLiteral("size");
+static const QString RANGE_TAG      = QStringLiteral("range");
+static const QString THUMBNAIL_TAG  = QStringLiteral("thumbnail");
 
 QDomElement Range::toXml(QDomDocument *doc) const
 {
-    auto r = doc->createElement(QStringLiteral("range"));
+    auto r = doc->createElement(RANGE_TAG);
     if (length) {
         r.setAttribute(QStringLiteral("length"), QString::number(length));
     }
     if (offset) {
-        r.setAttribute(QStringLiteral("length"), QString::number(length));
+        r.setAttribute(QStringLiteral("offset"), QString::number(offset));
     }
-    auto h = hash.toXml(doc);
-    if (!h.isNull()) {
-        r.appendChild(h);
+    for (auto const &h : hashes) {
+        auto hel = h.toXml(doc);
+        if (!hel.isNull()) {
+            r.appendChild(hel);
+        }
     }
     return r;
 }
@@ -52,30 +65,27 @@ QDomElement Range::toXml(QDomDocument *doc) const
 //----------------------------------------------------------------------------
 // File
 //----------------------------------------------------------------------------
-class File::Private : public QSharedData
-{
+class File::Private : public QSharedData {
 public:
-    QDateTime date;
-    QString   mediaType;
-    QString   name;
-    QString   desc;
-    quint64   size = 0;
-    Range     range;
-    bool      rangeSupported = false;
-    bool      hasSize = false;
+    QDateTime   date;
+    QString     mediaType;
+    QString     name;
+    QString     desc;
+    qint64      size = 0;
+    Range       range;
+    bool        rangeSupported = false;
+    bool        hasSize        = false;
     QList<Hash> hashes;
-    Thumbnail thumbnail;
-    File::Histogram audioHistogram;
+    Thumbnail   thumbnail;
+    QByteArray  amplitudes;
 };
 
 File::File()
 {
-
 }
 
 File::~File()
 {
-
 }
 
 File &File::operator=(const File &other)
@@ -87,7 +97,6 @@ File &File::operator=(const File &other)
 File::File(const File &other) :
     d(other.d)
 {
-
 }
 
 File::File(const QDomElement &file)
@@ -96,39 +105,39 @@ File::File(const QDomElement &file)
     QString     mediaType;
     QString     name;
     QString     desc;
-    size_t      size = 0;
+    size_t      size           = 0;
     bool        rangeSupported = false;
-    bool        hasSize = false;
+    bool        hasSize        = false;
     Range       range;
     QList<Hash> hashes;
     Thumbnail   thumbnail;
-    Histogram   histogram;
+    QByteArray  amplitudes;
 
     bool ok;
 
-    for(QDomElement ce = file.firstChildElement();
-        !ce.isNull(); ce = ce.nextSiblingElement()) {
+    for (QDomElement ce   = file.firstChildElement();
+         !ce.isNull(); ce = ce.nextSiblingElement()) {
 
-        if (ce.tagName() == QLatin1String("date")) {
+        if (ce.tagName() == DATE_TAG) {
             date = QDateTime::fromString(ce.text().left(19), Qt::ISODate);
             if (!date.isValid()) {
                 return;
             }
 
-        } else if (ce.tagName() == QLatin1String("media-type")) {
+        } else if (ce.tagName() == MEDIA_TYPE_TAG) {
             mediaType = ce.text();
 
-        } else if (ce.tagName() == QLatin1String("name")) {
+        } else if (ce.tagName() == NAME_TAG) {
             name = ce.text();
 
-        } else if (ce.tagName() == QLatin1String("size")) {
+        } else if (ce.tagName() == SIZE_TAG) {
             size = ce.text().toULongLong(&ok);
             if (!ok) {
                 return;
             }
             hasSize = true;
 
-        } else if (ce.tagName() == QLatin1String("range")) {
+        } else if (ce.tagName() == RANGE_TAG) {
             if (ce.hasAttribute(QLatin1String("offset"))) {
                 range.offset = ce.attribute(QLatin1String("offset")).toULongLong(&ok);
                 if (!ok) {
@@ -142,19 +151,22 @@ File::File(const QDomElement &file)
                 }
             }
             QDomElement hashEl = ce.firstChildElement(QLatin1String("hash"));
-            if (hashEl.namespaceURI() == HASH_NS || hashEl.namespaceURI() == HASH_NS) {
-                range.hash = Hash(hashEl);
-                if (range.hash.type() == Hash::Type::Unknown) {
-                    return;
+            for (; !hashEl.isNull(); hashEl = hashEl.nextSiblingElement(QLatin1String("hash"))) {
+                if (hashEl.namespaceURI() == HASH_NS) {
+                    auto hash = Hash(hashEl);
+                    if (hash.type() == Hash::Type::Unknown) {
+                        continue;
+                    }
+                    range.hashes.append(hash);
                 }
             }
             rangeSupported = true;
 
-        } else if (ce.tagName() == QLatin1String("desc")) {
+        } else if (ce.tagName() == DESC_TAG) {
             desc = ce.text();
 
         } else if (ce.tagName() == QLatin1String("hash")) {
-            if (ce.namespaceURI() == HASH_NS || ce.namespaceURI() == HASH_NS) {
+            if (ce.namespaceURI() == HASH_NS) {
                 Hash h(ce);
                 if (h.type() == Hash::Type::Unknown) {
                     return;
@@ -163,7 +175,7 @@ File::File(const QDomElement &file)
             }
 
         } else if (ce.tagName() == QLatin1String("hash-used")) {
-            if (ce.namespaceURI() == HASH_NS || ce.namespaceURI() == HASH_NS) {
+            if (ce.namespaceURI() == HASH_NS) {
                 Hash h(ce);
                 if (h.type() == Hash::Type::Unknown) {
                     return;
@@ -171,42 +183,25 @@ File::File(const QDomElement &file)
                 hashes.append(h);
             }
 
-        } else if (ce.tagName() == QLatin1String("thumbnail")) {
+        } else if (ce.tagName() == THUMBNAIL_TAG) {
             thumbnail = Thumbnail(ce);
-        } else if (ce.tagName() == QLatin1String("histogram") && (ce.namespaceURI() == HISTOGRAM_NS || ce.namespaceURI() == HISTOGRAM_NS)) {
-            QStringList spv = ce.text().split(',');
-            histogram.bars.reserve(spv.count());
-            std::transform(spv.begin(), spv.end(), std::back_inserter(histogram.bars), [](const QString &v){ return v.toUInt(); });
-            auto c = ce.attribute(QStringLiteral("coding")).toLatin1();
-            if (c == "u8")
-                histogram.coding = File::Histogram::Coding::U8;
-            else if (c == "s8")
-                histogram.coding = File::Histogram::Coding::S8;
-            else if (c == "u16")
-                histogram.coding = File::Histogram::Coding::U16;
-            else if (c == "s16")
-                histogram.coding = File::Histogram::Coding::S16;
-            else if (c == "u32")
-                histogram.coding = File::Histogram::Coding::U32;
-            else if (c == "s32")
-                histogram.coding = File::Histogram::Coding::S32;
-            else
-                histogram.bars.clear(); // drop invalid histogram
+        } else if (ce.tagName() == AMPLITUDES_TAG && ce.namespaceURI() == AMPLITUDES_NS) {
+            amplitudes = QByteArray::fromBase64(ce.text().toLatin1());
         }
     }
 
-    auto p = new Private;
-    p->date = date;
-    p->mediaType = mediaType;
-    p->name = name;
-    p->desc = desc;
-    p->size = size;
+    auto p            = new Private;
+    p->date           = date;
+    p->mediaType      = mediaType;
+    p->name           = name;
+    p->desc           = desc;
+    p->size           = size;
     p->rangeSupported = rangeSupported;
-    p->hasSize = hasSize;
-    p->range = range;
-    p->hashes = hashes;
-    p->thumbnail = thumbnail;
-    p->audioHistogram = histogram;
+    p->hasSize        = hasSize;
+    p->range          = range;
+    p->hashes         = hashes;
+    p->thumbnail      = thumbnail;
+    p->amplitudes     = amplitudes;
 
     d = p;
 }
@@ -218,22 +213,22 @@ QDomElement File::toXml(QDomDocument *doc) const
     }
     QDomElement el = doc->createElementNS(NS, QStringLiteral("file"));
     if (d->date.isValid()) {
-        el.appendChild(XMLHelper::textTag(*doc, QStringLiteral("date"), d->date.toString(Qt::ISODate)));
+        el.appendChild(XMLHelper::textTag(*doc, DATE_TAG, d->date.toString(Qt::ISODate)));
     }
     if (d->desc.size()) {
-        el.appendChild(XMLHelper::textTag(*doc, QStringLiteral("desc"), d->desc));
+        el.appendChild(XMLHelper::textTag(*doc, DESC_TAG, d->desc));
     }
-    for (const auto &h: d->hashes) {
+    for (const auto &h : d->hashes) {
         el.appendChild(h.toXml(doc));
     }
     if (d->mediaType.size()) {
-        el.appendChild(XMLHelper::textTag(*doc, QStringLiteral("media-type"), d->mediaType));
+        el.appendChild(XMLHelper::textTag(*doc, MEDIA_TYPE_TAG, d->mediaType));
     }
     if (d->name.size()) {
-        el.appendChild(XMLHelper::textTag(*doc, QStringLiteral("name"), d->name));
+        el.appendChild(XMLHelper::textTag(*doc, NAME_TAG, d->name));
     }
     if (d->size) {
-        el.appendChild(XMLHelper::textTag(*doc, QStringLiteral("size"), QString::number(d->size)));
+        el.appendChild(XMLHelper::textTag(*doc, SIZE_TAG, d->size));
     }
     if (d->rangeSupported || d->range.isValid()) {
         el.appendChild(d->range.toXml(doc));
@@ -241,24 +236,8 @@ QDomElement File::toXml(QDomDocument *doc) const
     if (d->thumbnail.isValid()) {
         el.appendChild(d->thumbnail.toXml(doc));
     }
-    if (d->audioHistogram.bars.count()) {
-        auto sel = el.appendChild(doc->createElementNS(HISTOGRAM_NS, QString::fromLatin1("histogram"))).toElement();
-        const char* s[] = {"u8","s8","u16","s16","u32","s32"};
-        sel.setAttribute(QString::fromLatin1("coding"), QString::fromLatin1(s[d->audioHistogram.coding]));
-        QStringList sl;
-        std::transform(d->audioHistogram.bars.begin(), d->audioHistogram.bars.end(), std::back_inserter(sl),
-                       [this](quint32 v){
-            switch (d->audioHistogram.coding) {
-            case Histogram::U8:  return QString::number(quint8(v));
-            case Histogram::S8:  return QString::number(qint8(v));
-            case Histogram::U16: return QString::number(quint16(v));
-            case Histogram::S16: return QString::number(qint16(v));
-            case Histogram::U32: return QString::number(quint32(v));
-            case Histogram::S32: return QString::number(qint32(v));
-            }
-            return QString();
-        });
-        sel.appendChild(doc->createTextNode(sl.join(',')));
+    if (d->amplitudes.size()) {
+        el.appendChild(XMLHelper::textTagNS(doc, AMPLITUDES_NS, AMPLITUDES_TAG, d->amplitudes));
     }
     return el;
 }
@@ -268,8 +247,8 @@ bool File::merge(const File &other)
     if (!d->thumbnail.isValid()) {
         d->thumbnail = other.thumbnail();
     }
-    for (auto const &h: other.d->hashes) {
-        auto it = std::find_if(d->hashes.constBegin(), d->hashes.constEnd(), [&h](auto const &v){ return h.type() == v.type(); });
+    for (auto const &h : other.d->hashes) {
+        auto it = std::find_if(d->hashes.constBegin(), d->hashes.constEnd(), [&h](auto const &v) { return h.type() == v.type(); });
         if (it == d->hashes.constEnd()) {
             d->hashes.append(h);
         } else if (h.data() != it->data()) {
@@ -283,7 +262,7 @@ bool File::hasComputedHashes() const
 {
     if (!d)
         return false;
-    for (auto const &h: d->hashes) {
+    for (auto const &h : d->hashes) {
         if (h.data().size())
             return true;
     }
@@ -297,12 +276,17 @@ bool File::hasSize() const
 
 QDateTime File::date() const
 {
-    return d? d->date : QDateTime();
+    return d ? d->date : QDateTime();
 }
 
 QString File::description() const
 {
-    return d? d->desc : QString();
+    return d ? d->desc : QString();
+}
+
+QList<Hash> File::hashes() const
+{
+    return d ? d->hashes : QList<Hash>();
 }
 
 Hash File::hash(Hash::Type t) const
@@ -310,7 +294,7 @@ Hash File::hash(Hash::Type t) const
     if (d && d->hashes.count()) {
         if (t == Hash::Unknown)
             return d->hashes.at(0);
-        for (auto const &h: d->hashes) {
+        for (auto const &h : d->hashes) {
             if (h.type() == t) {
                 return h;
             }
@@ -321,56 +305,32 @@ Hash File::hash(Hash::Type t) const
 
 QString File::mediaType() const
 {
-    return d? d->mediaType : QString();
+    return d ? d->mediaType : QString();
 }
 
 QString File::name() const
 {
-    return d? d->name : QString();
+    return d ? d->name : QString();
 }
 
 quint64 File::size() const
 {
-    return d? d->size : 0;
+    return d ? d->size : 0;
 }
 
 Range File::range() const
 {
-    return d? d->range : Range();
+    return d ? d->range : Range();
 }
 
 Thumbnail File::thumbnail() const
 {
-    return d? d->thumbnail: Thumbnail();
+    return d ? d->thumbnail : Thumbnail();
 }
 
-File::Histogram File::audioHistogram() const
+QByteArray File::amplitudes() const
 {
-    return d? d->audioHistogram: Histogram();
-}
-
-QList<float> File::audioFloatHistogram() const
-{
-    QList<float> ret;
-    if (!d->audioHistogram.bars.count())
-        return ret;
-
-    std::function<float(quint32)> normalizer;
-    switch (d->audioHistogram.coding) {
-    case Histogram::U8:  normalizer = [](quint32 v){ return quint8(v) / 255.0f;                      }; break;
-    case Histogram::S8:  normalizer = [](quint32 v){ return std::fabs(qint8(v) / 128.0f);            }; break;
-    case Histogram::U16: normalizer = [](quint32 v){ return quint16(v) / float(1 << 16);             }; break;
-    case Histogram::S16: normalizer = [](quint32 v){ return std::fabs(qint16(v) / float(1 << 15));   }; break;
-    case Histogram::U32: normalizer = [](quint32 v){ return quint32(v) / float(quint64(1) << 32);           }; break;
-    case Histogram::S32: normalizer = [](quint32 v){ return std::fabs(qint32(v) / float(quint64(1) << 31)); }; break;
-    }
-
-    if (normalizer) {
-        ret.reserve(d->audioHistogram.bars.count());
-        std::transform(d->audioHistogram.bars.begin(), d->audioHistogram.bars.end(), std::back_inserter(ret), normalizer);
-    }
-
-    return ret;
+    return d ? d->amplitudes : QByteArray();
 }
 
 void File::setDate(const QDateTime &date)
@@ -401,12 +361,12 @@ void File::setName(const QString &name)
 void File::setSize(quint64 size)
 {
     ensureD()->size = size;
-    d->hasSize = true;
+    d->hasSize      = true;
 }
 
 void File::setRange(const Range &range)
 {
-    ensureD()->range = range;
+    ensureD()->range  = range;
     d->rangeSupported = true;
 }
 
@@ -415,9 +375,9 @@ void File::setThumbnail(const Thumbnail &thumb)
     ensureD()->thumbnail = thumb;
 }
 
-void File::setAudioHistogram(const File::Histogram &histogram)
+void File::setAmplitudes(const QByteArray &amplitudes)
 {
-    d->audioHistogram = histogram;
+    d->amplitudes = amplitudes;
 }
 
 File::Private *File::ensureD()
@@ -462,10 +422,9 @@ QDomElement Received::toXml(QDomDocument *doc) const
 //----------------------------------------------------------------------------
 // ApplicationManager
 //----------------------------------------------------------------------------
-Manager::Manager(QObject *parent):
+Manager::Manager(QObject *parent) :
     XMPP::Jingle::ApplicationManager(parent)
 {
-
 }
 
 Manager::~Manager()
@@ -479,7 +438,7 @@ void Manager::setJingleManager(XMPP::Jingle::Manager *jm)
     jingleManager = jm;
 }
 
-Application* Manager::startApplication(const ApplicationManagerPad::Ptr &pad, const QString &contentName, Origin creator, Origin senders)
+Application *Manager::startApplication(const ApplicationManagerPad::Ptr &pad, const QString &contentName, Origin creator, Origin senders)
 {
     if (!(contentName.size() > 0 && (senders == Origin::Initiator || senders == Origin::Responder))) {
         qDebug("Invalid Jignle FT App start parameters");
@@ -488,14 +447,13 @@ Application* Manager::startApplication(const ApplicationManagerPad::Ptr &pad, co
     return new Application(pad.staticCast<Pad>(), contentName, creator, senders); // ContentOrigin::Remote
 }
 
-ApplicationManagerPad* Manager::pad(Session *session)
+ApplicationManagerPad *Manager::pad(Session *session)
 {
     return new Pad(this, session);
 }
 
 void Manager::closeAll()
 {
-
 }
 
 Client *Manager::client()
@@ -514,29 +472,28 @@ QStringList Manager::availableTransports() const
 //----------------------------------------------------------------------------
 // Application
 //----------------------------------------------------------------------------
-class Application::Private
-{
+class Application::Private {
 public:
-    Application     *q = nullptr;
-    State           state = State::Created;
-    State           transportReplaceState = State::Finished;
-    Action          updateToSend = Action::NoAction;
-    QSharedPointer<Pad> pad;
-    QString         contentName;
-    File            file;
-    File            acceptFile; // as it comes with "accept" response
-    Origin          creator;
-    Origin          senders;
-    Origin          transportReplaceOrigin = Origin::None;
-    XMPP::Stanza::Error lastError;
-    Reason          terminationReason;
+    Application *             q                     = nullptr;
+    State                     state                 = State::Created;
+    State                     transportReplaceState = State::Finished;
+    Action                    updateToSend          = Action::NoAction;
+    QSharedPointer<Pad>       pad;
+    QString                   contentName;
+    File                      file;
+    File                      acceptFile; // as it comes with "accept" response
+    Origin                    creator;
+    Origin                    senders;
+    Origin                    transportReplaceOrigin = Origin::None;
+    XMPP::Stanza::Error       lastError;
+    Reason                    terminationReason;
     QSharedPointer<Transport> transport;
-    Connection::Ptr connection;
-    QStringList     availableTransports;
-    bool            closeDeviceOnFinish = true;
-    bool            streamigMode = false;
-    QIODevice       *device = nullptr;
-    quint64         bytesLeft = 0;
+    Connection::Ptr           connection;
+    QStringList               availableTransports;
+    bool                      closeDeviceOnFinish = true;
+    bool                      streamigMode        = false;
+    QIODevice *               device              = nullptr;
+    quint64                   bytesLeft           = 0;
 
     void setState(State s)
     {
@@ -566,7 +523,7 @@ class Application::Private
             return; // everything is written
         }
         auto sz = connection->blockSize();
-        sz = sz? sz : 8192;
+        sz      = sz ? sz : 8192;
         if (sz > bytesLeft) {
             sz = bytesLeft;
         }
@@ -617,17 +574,16 @@ class Application::Private
 Application::Application(const QSharedPointer<Pad> &pad, const QString &contentName, Origin creator, Origin senders) :
     d(new Private)
 {
-    d->q       = this;
-    d->pad     = pad;
-    d->contentName = contentName;
-    d->creator = creator;
-    d->senders = senders;
-    d->availableTransports = static_cast<Manager*>(pad->manager())->availableTransports();
+    d->q                   = this;
+    d->pad                 = pad;
+    d->contentName         = contentName;
+    d->creator             = creator;
+    d->senders             = senders;
+    d->availableTransports = static_cast<Manager *>(pad->manager())->availableTransports();
 }
 
 Application::~Application()
 {
-
 }
 
 ApplicationManagerPad::Ptr Application::pad() const
@@ -674,7 +630,7 @@ Application::SetDescError Application::setDescription(const QDomElement &descrip
 {
     d->file = File(description.firstChildElement("file"));
     //d->state = State::Pending; // basically it's incomming  content. so if we parsed it it's pending. if not parsed if will rejected anyway.
-    return d->file.isValid()? Ok: Unparsed;
+    return d->file.isValid() ? Ok : Unparsed;
 }
 
 void Application::setFile(const File &file)
@@ -712,12 +668,12 @@ bool Application::setTransport(const QSharedPointer<Transport> &transport)
     d->availableTransports.removeAt(nsIndex);
     d->transport = transport;
     connect(transport.data(), &Transport::updated, this, &Application::updated);
-    connect(transport.data(), &Transport::connected, this, [this](){
+    connect(transport.data(), &Transport::connected, this, [this]() {
         d->transportReplaceOrigin = Origin::None;
-        d->transportReplaceState = State::Finished; // not needed here probably
-        d->connection = d->transport->connection();
+        d->transportReplaceState  = State::Finished; // not needed here probably
+        d->connection             = d->transport->connection();
         if (d->streamigMode) {
-            connect(d->connection.data(), &Connection::readyRead, this, [this](){
+            connect(d->connection.data(), &Connection::readyRead, this, [this]() {
                 if (!d->device) {
                     return;
                 }
@@ -725,7 +681,7 @@ bool Application::setTransport(const QSharedPointer<Transport> &transport)
                     d->readNextBlockFromTransport();
                 }
             });
-            connect(d->connection.data(), &Connection::bytesWritten, this, [this](qint64 bytes){
+            connect(d->connection.data(), &Connection::bytesWritten, this, [this](qint64 bytes) {
                 Q_UNUSED(bytes)
                 if (d->pad->session()->role() == d->senders && !d->connection->bytesToWrite()) {
                     d->writeNextBlockToTransport();
@@ -746,7 +702,7 @@ bool Application::setTransport(const QSharedPointer<Transport> &transport)
         }
     });
 
-    connect(transport.data(), &Transport::failed, this, [this](){
+    connect(transport.data(), &Transport::failed, this, [this]() {
         d->transportReplaceOrigin = d->pad->session()->role();
         if (d->state >= State::Active) {
             emit updated(); // late failure are unhandled. just notify the remote
@@ -785,7 +741,7 @@ bool Application::incomingTransportReplace(const QSharedPointer<Transport> &tran
         d->availableTransports.append(d->transport->pad()->ns());
     }
     d->transportReplaceOrigin = d->pad->session()->peerRole();
-    auto ret = setTransport(transport);
+    auto ret                  = setTransport(transport);
     if (ret)
         d->transportReplaceState = State::PrepareLocalOffer;
     else {
@@ -820,7 +776,7 @@ Action Application::evaluateOutgoingUpdate()
         if (d->transportReplaceState != State::PrepareLocalOffer || !d->transport->isInitialOfferReady())
             return Action::NoAction;
 
-        return d->transportReplaceOrigin == d->pad->session()->role()? Action::TransportReplace : Action::TransportAccept;
+        return d->transportReplaceOrigin == d->pad->session()->role() ? Action::TransportReplace : Action::TransportAccept;
     };
 
     switch (d->state) {
@@ -839,7 +795,7 @@ Action Application::evaluateOutgoingUpdate()
         }
 
         if (d->transport->isInitialOfferReady())
-            d->updateToSend = d->creator == d->pad->session()->role()? Action::ContentAdd : Action::ContentAccept;
+            d->updateToSend = d->creator == d->pad->session()->role() ? Action::ContentAdd : Action::ContentAccept;
 
         break;
     case State::Connecting:
@@ -855,8 +811,7 @@ Action Application::evaluateOutgoingUpdate()
 
         if (d->terminationReason.isValid() && d->terminationReason.condition() != Reason::Condition::Success) {
             d->updateToSend = Action::ContentRemove;
-        }
-        else if (d->transport->hasUpdates())
+        } else if (d->transport->hasUpdates())
             d->updateToSend = Action::TransportInfo;
 
         break;
@@ -880,7 +835,7 @@ OutgoingUpdate Application::takeOutgoingUpdate()
     }
 
     auto client = d->pad->session()->manager()->client();
-    auto doc = client->doc();
+    auto doc    = client->doc();
 
     if (d->updateToSend == Action::SessionInfo) {
         if (d->state != State::Finishing) {
@@ -888,20 +843,19 @@ OutgoingUpdate Application::takeOutgoingUpdate()
             return OutgoingUpdate();
         }
         ContentBase cb(d->pad->session()->role(), d->contentName);
-        return OutgoingUpdate{QList<QDomElement>() << cb.toXml(doc, "received"), [this](){
-                d->setState(State::Finished);
-            }
-        };
+        return OutgoingUpdate { QList<QDomElement>() << cb.toXml(doc, "received"), [this]() {
+                                   d->setState(State::Finished);
+                               } };
     }
 
-    QDomElement transportEl;
+    QDomElement      transportEl;
     OutgoingUpdateCB transportCB;
 
     ContentBase cb(d->creator, d->contentName);
     if (d->state == State::PrepareLocalOffer)
         cb.senders = d->senders;
     QList<QDomElement> updates;
-    auto contentEl = cb.toXml(doc, "content");
+    auto               contentEl = cb.toXml(doc, "content");
     updates << contentEl;
 
     switch (d->updateToSend) {
@@ -911,18 +865,17 @@ OutgoingUpdate Application::takeOutgoingUpdate()
             d->terminationReason = Reason(Reason::Condition::FailedTransport);
         if (d->terminationReason.isValid())
             updates << d->terminationReason.toXml(doc);
-        return OutgoingUpdate{updates, [this](){
-                d->setState(State::Finished);
-            }
-        };
+        return OutgoingUpdate { updates, [this]() {
+                                   d->setState(State::Finished);
+                               } };
     case Action::ContentAdd:
     case Action::ContentAccept:
         Q_ASSERT(d->transport->isInitialOfferReady());
         if (d->file.thumbnail().data.size()) {
-            auto thumb = d->file.thumbnail();
-            auto bm = client->bobManager();
-            BoBData data = bm->append(thumb.data, thumb.mimeType);
-            thumb.uri = QLatin1String("cid:") + data.cid();
+            auto    thumb = d->file.thumbnail();
+            auto    bm    = client->bobManager();
+            BoBData data  = bm->append(thumb.data, thumb.mimeType);
+            thumb.uri     = QLatin1String("cid:") + data.cid();
             d->file.setThumbnail(thumb);
         }
         contentEl.appendChild(doc->createElementNS(NS, QString::fromLatin1("description"))).appendChild(d->file.toXml(doc));
@@ -930,31 +883,30 @@ OutgoingUpdate Application::takeOutgoingUpdate()
         contentEl.appendChild(transportEl);
 
         d->setState(State::Unacked);
-        return OutgoingUpdate{updates, [this, transportCB](){
-                if (transportCB) {
-                    transportCB();
-                }
-                d->setState(d->pad->session()->role() == Origin::Initiator? State::Pending : State::Connecting);
-            }};
+        return OutgoingUpdate { updates, [this, transportCB]() {
+                                   if (transportCB) {
+                                       transportCB();
+                                   }
+                                   d->setState(d->pad->session()->role() == Origin::Initiator ? State::Pending : State::Connecting);
+                               } };
     case Action::TransportInfo:
         Q_ASSERT(d->transport->hasUpdates());
         std::tie(transportEl, transportCB) = d->transport->takeOutgoingUpdate();
         contentEl.appendChild(transportEl);
-        return OutgoingUpdate{updates, transportCB};
+        return OutgoingUpdate { updates, transportCB };
     case Action::TransportReplace:
-    case Action::TransportAccept:
-    {
+    case Action::TransportAccept: {
         Q_ASSERT(d->transport->isInitialOfferReady());
-        d->transportReplaceState = State::Unacked;
+        d->transportReplaceState           = State::Unacked;
         std::tie(transportEl, transportCB) = d->transport->takeInitialOffer();
         contentEl.appendChild(transportEl);
         auto action = d->updateToSend;
-        return OutgoingUpdate{updates, [this,transportCB,action](){
-                if (transportCB) {
-                    transportCB();
-                }
-                d->transportReplaceState = action == Action::TransportReplace? State::Pending : State::Finished;
-            }};
+        return OutgoingUpdate { updates, [this, transportCB, action]() {
+                                   if (transportCB) {
+                                       transportCB();
+                                   }
+                                   d->transportReplaceState = action == Action::TransportReplace ? State::Pending : State::Finished;
+                               } };
     }
     default:
         break;
@@ -1019,7 +971,7 @@ void Application::remove(Reason::Condition cond, const QString &comment)
     if (d->state >= State::Finishing)
         return;
 
-    d->terminationReason = Reason(cond, comment);
+    d->terminationReason      = Reason(cond, comment);
     d->transportReplaceOrigin = Origin::None; // just in case
     d->transport->disconnect(this);
     d->transport.reset();
@@ -1042,7 +994,7 @@ bool Application::incomingTransportAccept(const QDomElement &transportEl)
     }
     if (d->transport->update(transportEl)) {
         d->transportReplaceOrigin = Origin::None;
-        d->transportReplaceState = State::Finished;
+        d->transportReplaceState  = State::Finished;
         if (d->state >= State::Connecting) {
             d->transport->start();
         }
@@ -1054,8 +1006,7 @@ bool Application::incomingTransportAccept(const QDomElement &transportEl)
 
 bool Application::isValid() const
 {
-    return d->file.isValid() &&  d->contentName.size() > 0 &&
-            (d->senders == Origin::Initiator || d->senders == Origin::Responder);
+    return d->file.isValid() && d->contentName.size() > 0 && (d->senders == Origin::Initiator || d->senders == Origin::Responder);
 }
 
 void Application::setDevice(QIODevice *dev, bool closeOnFinish)
@@ -1065,7 +1016,7 @@ void Application::setDevice(QIODevice *dev, bool closeOnFinish)
         emit updated();
         return;
     }
-    d->device = dev;
+    d->device              = dev;
     d->closeDeviceOnFinish = closeOnFinish;
     if (d->senders == d->pad->session()->role()) {
         d->writeNextBlockToTransport();
@@ -1083,7 +1034,6 @@ Pad::Pad(Manager *manager, Session *session) :
     _manager(manager),
     _session(session)
 {
-
 }
 
 QDomElement Pad::takeOutgoingSessionInfoUpdate()
@@ -1108,7 +1058,7 @@ ApplicationManager *Pad::manager() const
 
 QString Pad::generateContentName(Origin senders)
 {
-    QString prefix = senders == _session->role()? "fileoffer" : "filereq";
+    QString prefix = senders == _session->role() ? "fileoffer" : "filereq";
     QString name;
     do {
         name = prefix + QString("_%1").arg(qrand() & 0xffff, 4, 16, QChar('0'));
@@ -1119,7 +1069,7 @@ QString Pad::generateContentName(Origin senders)
 void Pad::addOutgoingOffer(const File &file)
 {
     auto selfp = _session->applicationPad(NS);
-    auto app = _manager->startApplication(selfp, "ft", _session->role(), _session->role());
+    auto app   = _manager->startApplication(selfp, "ft", _session->role(), _session->role());
     app->setFile(file);
 }
 } // namespace FileTransfer
diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index 4e9ac92c..3b62d085 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -34,52 +34,40 @@ extern const QString NS;
 class Manager;
 
 struct Range {
-    quint64 offset = 0;
-    quint64 length = 0; // 0 - from offset to the end of the file
-    Hash hash;
+    quint64     offset = 0;
+    quint64     length = 0; // 0 - from offset to the end of the file
+    QList<Hash> hashes;
 
     inline Range() {}
-    inline Range(quint64 offset, quint64 length) : offset(offset), length(length) {}
-    inline bool isValid() const { return hash.isValid() || offset || length; }
+    inline Range(quint64 offset, quint64 length) :
+        offset(offset), length(length) {}
+    inline bool isValid() const { return hashes.size() || offset || length; }
     QDomElement toXml(QDomDocument *doc) const;
 };
 
-class File
-{
+class File {
 public:
-    struct Histogram
-    {
-        enum Coding {
-            U8,  S8,
-            U16, S16,
-            U32, S32
-        };
-
-        Coding coding;
-        QList<quint32> bars;
-    };
-
     File();
     File(const File &other);
     File(const QDomElement &file);
     ~File();
-    File& operator=(const File& other);
+    File &      operator=(const File &other);
     inline bool isValid() const { return d != nullptr; }
     QDomElement toXml(QDomDocument *doc) const;
-    bool merge(const File &other);
-    bool hasComputedHashes() const;
-    bool hasSize() const;
-
-    QDateTime date()  const;
-    QString   description() const;
-    Hash      hash(Hash::Type t = Hash::Unknown)  const;
-    QString   mediaType() const;
-    QString   name()  const;
-    quint64   size()  const;
-    Range     range() const;
-    Thumbnail thumbnail() const;
-    Histogram  audioHistogram() const;
-    QList<float> audioFloatHistogram() const;
+    bool        merge(const File &other);
+    bool        hasComputedHashes() const;
+    bool        hasSize() const;
+
+    QDateTime   date() const;
+    QString     description() const;
+    QList<Hash> hashes() const;
+    Hash        hash(Hash::Type t = Hash::Unknown) const;
+    QString     mediaType() const;
+    QString     name() const;
+    quint64     size() const;
+    Range       range() const;
+    Thumbnail   thumbnail() const;
+    QByteArray  amplitudes() const;
 
     void setDate(const QDateTime &date);
     void setDescription(const QString &desc);
@@ -89,69 +77,68 @@ class File
     void setSize(quint64 size);
     void setRange(const Range &range = Range()); // default empty just to indicate it's supported
     void setThumbnail(const Thumbnail &thumb);
-    void setAudioHistogram(const Histogram &histogram);
+    void setAmplitudes(const QByteArray &amplitudes);
+
 private:
     class Private;
-    Private *ensureD();
+    Private *                   ensureD();
     QSharedDataPointer<Private> d;
 };
 
-class Checksum : public ContentBase
-{
-    inline Checksum(){}
+class Checksum : public ContentBase {
+    inline Checksum() {}
     Checksum(const QDomElement &file);
-    bool isValid() const;
+    bool        isValid() const;
     QDomElement toXml(QDomDocument *doc) const;
+
 private:
     File file;
 };
 
-class Received : public ContentBase
-{
+class Received : public ContentBase {
     using ContentBase::ContentBase;
     QDomElement toXml(QDomDocument *doc) const;
 };
 
-class Pad : public ApplicationManagerPad
-{
+class Pad : public ApplicationManagerPad {
     Q_OBJECT
     // TODO
 public:
     Pad(Manager *manager, Session *session);
-    QDomElement takeOutgoingSessionInfoUpdate() override;
-    QString ns() const override;
-    Session *session() const override;
+    QDomElement         takeOutgoingSessionInfoUpdate() override;
+    QString             ns() const override;
+    Session *           session() const override;
     ApplicationManager *manager() const override;
-    QString generateContentName(Origin senders) override;
+    QString             generateContentName(Origin senders) override;
 
     void addOutgoingOffer(const File &file);
+
 private:
     Manager *_manager;
     Session *_session;
 };
 
-class Application : public XMPP::Jingle::Application
-{
+class Application : public XMPP::Jingle::Application {
     Q_OBJECT
 public:
     Application(const QSharedPointer<Pad> &pad, const QString &contentName, Origin creator, Origin senders);
     ~Application();
 
     ApplicationManagerPad::Ptr pad() const override;
-    State state() const override;
-    void setState(State state) override;
-    XMPP::Stanza::Error lastError() const override;
-    Reason terminationReason() const override;
-
-    QString contentName() const override;
-    Origin creator() const override;
-    Origin senders() const override;
-    Origin transportReplaceOrigin() const override;
-    SetDescError setDescription(const QDomElement &description) override;
-    void setFile(const File &file);
-    File file() const;
-    File acceptFile() const;
-    bool setTransport(const QSharedPointer<Transport> &transport) override;
+    State                      state() const override;
+    void                       setState(State state) override;
+    XMPP::Stanza::Error        lastError() const override;
+    Reason                     terminationReason() const override;
+
+    QString                   contentName() const override;
+    Origin                    creator() const override;
+    Origin                    senders() const override;
+    Origin                    transportReplaceOrigin() const override;
+    SetDescError              setDescription(const QDomElement &description) override;
+    void                      setFile(const File &file);
+    File                      file() const;
+    File                      acceptFile() const;
+    bool                      setTransport(const QSharedPointer<Transport> &transport) override;
     QSharedPointer<Transport> transport() const override;
 
     /**
@@ -166,18 +153,18 @@ class Application : public XMPP::Jingle::Application
      */
     void setStreamingMode(bool mode = true);
 
-    Action evaluateOutgoingUpdate() override;
+    Action         evaluateOutgoingUpdate() override;
     OutgoingUpdate takeOutgoingUpdate() override;
-    bool wantBetterTransport(const QSharedPointer<XMPP::Jingle::Transport> &) const override;
-    bool selectNextTransport() override;
-    void prepare() override;
-    void start() override;
-    bool accept(const QDomElement &el) override;
-    void remove(Reason::Condition cond = Reason::Success, const QString &comment = QString()) override;
+    bool           wantBetterTransport(const QSharedPointer<XMPP::Jingle::Transport> &) const override;
+    bool           selectNextTransport() override;
+    void           prepare() override;
+    void           start() override;
+    bool           accept(const QDomElement &el) override;
+    void           remove(Reason::Condition cond = Reason::Success, const QString &comment = QString()) override;
 
     bool isValid() const;
 
-    void setDevice(QIODevice *dev, bool closeOnFinish = true);
+    void            setDevice(QIODevice *dev, bool closeOnFinish = true);
     Connection::Ptr connection() const;
 
 protected:
@@ -185,7 +172,7 @@ class Application : public XMPP::Jingle::Application
     bool incomingTransportAccept(const QDomElement &transportEl) override;
 
 signals:
-    void connectionReady(); // streaming mode only
+    void connectionReady();                             // streaming mode only
     void deviceRequested(quint64 offset, quint64 size); // if size = 0 then it's reamaining part of the file (non-streaming mode only)
     void progress(quint64 offset);
 
@@ -194,19 +181,19 @@ class Application : public XMPP::Jingle::Application
     QScopedPointer<Private> d;
 };
 
-class Manager : public XMPP::Jingle::ApplicationManager
-{
+class Manager : public XMPP::Jingle::ApplicationManager {
     Q_OBJECT
 public:
     Manager(QObject *parent = nullptr);
     ~Manager();
-    void setJingleManager(XMPP::Jingle::Manager *jm);
-    Application *startApplication(const ApplicationManagerPad::Ptr &pad, const QString &contentName, Origin creator, Origin senders);
+    void                   setJingleManager(XMPP::Jingle::Manager *jm);
+    Application *          startApplication(const ApplicationManagerPad::Ptr &pad, const QString &contentName, Origin creator, Origin senders);
     ApplicationManagerPad *pad(Session *session); // pad factory
-    void closeAll();
-    Client* client();
+    void                   closeAll();
+    Client *               client();
 
     QStringList availableTransports() const;
+
 private:
     XMPP::Jingle::Manager *jingleManager = nullptr;
 };
diff --git a/src/xmpp/xmpp-im/types.cpp b/src/xmpp/xmpp-im/types.cpp
index d68a46cd..6082b215 100644
--- a/src/xmpp/xmpp-im/types.cpp
+++ b/src/xmpp/xmpp-im/types.cpp
@@ -29,6 +29,7 @@
 
 #include <QList>
 #include <QMap>
+#include <type_traits>
 
 #define NS_XML "http://www.w3.org/XML/1998/namespace"
 
@@ -37,8 +38,7 @@ QString HASH_NS = QStringLiteral("urn:xmpp:hashes:2");
 //----------------------------------------------------------------------------
 // Url
 //----------------------------------------------------------------------------
-class Url::Private
-{
+class Url::Private {
 public:
     QString url;
     QString desc;
@@ -52,8 +52,8 @@ class Url::Private
 //! \sa setUrl() setDesc()
 Url::Url(const QString &url, const QString &desc)
 {
-    d = new Private;
-    d->url = url;
+    d       = new Private;
+    d->url  = url;
     d->desc = desc;
 }
 
@@ -63,12 +63,12 @@ Url::Url(const QString &url, const QString &desc)
 //! \param Url - Url Object
 Url::Url(const Url &from)
 {
-    d = new Private;
+    d     = new Private;
     *this = from;
 }
 
 //! \brief operator overloader needed for d pointer (Internel).
-Url & Url::operator=(const Url &from)
+Url &Url::operator=(const Url &from)
 {
     *d = *from.d;
     return *this;
@@ -124,20 +124,18 @@ void Url::setDesc(const QString &desc)
 //! \param Type - type (default: Unknown)
 //! \param Jid - specify address (default: empty string)
 //! \sa setType() setJid()
-Address::Address(Type type, const Jid & jid)
-    : v_jid(jid)
-    , v_delivered(false)
-    , v_type(type)
+Address::Address(Type type, const Jid &jid) :
+    v_jid(jid), v_delivered(false), v_type(type)
 {
 }
 
-Address::Address(const QDomElement& e)
-    : v_delivered(false)
+Address::Address(const QDomElement &e) :
+    v_delivered(false)
 {
     fromXml(e);
 }
 
-void Address::fromXml(const QDomElement& t)
+void Address::fromXml(const QDomElement &t)
 {
     setJid(t.attribute("jid"));
     setUri(t.attribute("uri"));
@@ -163,18 +161,18 @@ void Address::fromXml(const QDomElement& t)
         setType(OriginalTo);
 }
 
-QDomElement Address::toXml(Stanza& s) const
+QDomElement Address::toXml(Stanza &s) const
 {
     QDomElement e = s.createElement("http://jabber.org/protocol/address", "address");
-    if(!jid().isEmpty())
+    if (!jid().isEmpty())
         e.setAttribute("jid", jid().full());
-    if(!uri().isEmpty())
+    if (!uri().isEmpty())
         e.setAttribute("uri", uri());
-    if(!node().isEmpty())
+    if (!node().isEmpty())
         e.setAttribute("node", node());
-    if(!desc().isEmpty())
+    if (!desc().isEmpty())
         e.setAttribute("desc", desc());
-    if(delivered())
+    if (delivered())
         e.setAttribute("delivered", "true");
     switch (type()) {
     case To:
@@ -211,7 +209,7 @@ QDomElement Address::toXml(Stanza& s) const
 //! \brief Get Jid information.
 //!
 //! Returns jid information.
-const Jid& Address::jid() const
+const Jid &Address::jid() const
 {
     return v_jid;
 }
@@ -219,7 +217,7 @@ const Jid& Address::jid() const
 //! \brief Get Uri information.
 //!
 //! Returns desction of the Address.
-const QString& Address::uri() const
+const QString &Address::uri() const
 {
     return v_uri;
 }
@@ -227,7 +225,7 @@ const QString& Address::uri() const
 //! \brief Get Node information.
 //!
 //! Returns node of the Address.
-const QString& Address::node() const
+const QString &Address::node() const
 {
     return v_node;
 }
@@ -235,7 +233,7 @@ const QString& Address::node() const
 //! \brief Get Description information.
 //!
 //! Returns desction of the Address.
-const QString& Address::desc() const
+const QString &Address::desc() const
 {
     return v_desc;
 }
@@ -313,50 +311,77 @@ void Address::setType(Type type)
 //----------------------------------------------------------------------------
 // Hash
 //----------------------------------------------------------------------------
+// NOTE: keep this in sync with enum. same order!
 static const struct {
     const char *text;
-    Hash::Type hashType;
-} hashTypes[] =
-{
-{ "sha-1",       Hash::Type::Sha1 },
-{ "sha-256",     Hash::Type::Sha256 },
-{ "sha-512",     Hash::Type::Sha512 },
-{ "sha3-256",    Hash::Type::Sha3_256 },
-{ "sha3-512",    Hash::Type::Sha3_512 },
-{ "blake2b-256", Hash::Type::Blake2b256 },
-{ "blake2b-512", Hash::Type::Blake2b512 }
+    Hash::Type  hashType;
+} hashTypes[] = {
+    { "sha-1", Hash::Type::Sha1 },
+    { "sha-256", Hash::Type::Sha256 },
+    { "sha-512", Hash::Type::Sha512 },
+    { "sha3-256", Hash::Type::Sha3_256 },
+    { "sha3-512", Hash::Type::Sha3_512 },
+    { "blake2b-256", Hash::Type::Blake2b256 },
+    { "blake2b-512", Hash::Type::Blake2b512 }
 };
 
 Hash::Hash(const QDomElement &el)
 {
     QString algo = el.attribute(QLatin1String("algo"));
+    v_type       = parseType(QStringRef(&algo));
+    if (v_type != Unknown && el.tagName() == QLatin1String("hash")) {
+        v_data = QByteArray::fromBase64(el.text().toLatin1());
+        if (v_data.isEmpty()) {
+            v_type = Type::Unknown;
+        }
+    }
+}
+
+QString Hash::stringType() const
+{
+    if (!v_type)
+        return QString();
+    static_assert(LastType == (sizeof(hashTypes) / sizeof(hashTypes[0])), "hashType and enum are not in sync");
+    return QLatin1String(hashTypes[int(v_type) - 1].text);
+}
+
+Hash::Type Hash::parseType(const QStringRef &algo)
+{
     if (!algo.isEmpty()) {
-        for(size_t n = 0; n < sizeof(hashTypes) / sizeof(hashTypes[0]); ++n) {
-            if(algo == QLatin1String(hashTypes[n].text)) {
-                v_type = hashTypes[n].hashType;
-                if (el.tagName() == QLatin1String("hash")) {
-                    v_data = QByteArray::fromBase64(el.text().toLatin1());
-                    if (v_data.isEmpty()) {
-                        v_type = Type::Unknown;
-                    }
-                } // else hash-used
-                break;
+        for (size_t n = 0; n < sizeof(hashTypes) / sizeof(hashTypes[0]); ++n) {
+            if (algo == QLatin1String(hashTypes[n].text)) {
+                return hashTypes[n].hashType;
             }
         }
     }
+    return Unknown;
 }
 
-bool Hash::computeFromData(const QByteArray &ba)
+bool Hash::compute(const QByteArray &ba)
 {
     v_data.clear();
     switch (v_type) {
-    case Type::Sha1:     v_data = QCryptographicHash::hash(ba, QCryptographicHash::Sha1); break;
-    case Type::Sha256:   v_data = QCryptographicHash::hash(ba, QCryptographicHash::Sha256); break;
-    case Type::Sha512:   v_data = QCryptographicHash::hash(ba, QCryptographicHash::Sha512); break;
-    case Type::Sha3_256: v_data = QCryptographicHash::hash(ba, QCryptographicHash::Sha3_256); break;
-    case Type::Sha3_512: v_data = QCryptographicHash::hash(ba, QCryptographicHash::Sha3_512); break;
-    case Type::Blake2b256: v_data = computeBlake2Hash(ba, Blake2Digest256); break;
-    case Type::Blake2b512: v_data = computeBlake2Hash(ba, Blake2Digest512); break;
+    case Type::Sha1:
+        v_data = QCryptographicHash::hash(ba, QCryptographicHash::Sha1);
+        break;
+    case Type::Sha256:
+        v_data = QCryptographicHash::hash(ba, QCryptographicHash::Sha256);
+        break;
+    case Type::Sha512:
+        v_data = QCryptographicHash::hash(ba, QCryptographicHash::Sha512);
+        break;
+    case Type::Sha3_256:
+        v_data = QCryptographicHash::hash(ba, QCryptographicHash::Sha3_256);
+        break;
+    case Type::Sha3_512:
+        v_data = QCryptographicHash::hash(ba, QCryptographicHash::Sha3_512);
+        break;
+    case Type::Blake2b256:
+        v_data = computeBlake2Hash(ba, Blake2Digest256);
+        break;
+    case Type::Blake2b512:
+        v_data = computeBlake2Hash(ba, Blake2Digest512);
+        break;
     case Type::Unknown:
     default:
         qDebug("invalid hash type");
@@ -365,16 +390,45 @@ bool Hash::computeFromData(const QByteArray &ba)
     return !v_data.isEmpty();
 }
 
-bool Hash::computeFromDevice(QIODevice *dev)
+bool Hash::compute(QIODevice *dev)
 {
     switch (v_type) {
-    case Type::Sha1:     { QCryptographicHash h(QCryptographicHash::Sha1); h.addData(dev); v_data = h.result(); break; }
-    case Type::Sha256:   { QCryptographicHash h(QCryptographicHash::Sha256); h.addData(dev); v_data = h.result(); break; }
-    case Type::Sha512:   { QCryptographicHash h(QCryptographicHash::Sha512); h.addData(dev); v_data = h.result(); break; }
-    case Type::Sha3_256: { QCryptographicHash h(QCryptographicHash::Sha3_256); h.addData(dev); v_data = h.result(); break; }
-    case Type::Sha3_512: { QCryptographicHash h(QCryptographicHash::Sha3_512); h.addData(dev); v_data = h.result(); break; }
-    case Type::Blake2b256: v_data = computeBlake2Hash(dev, Blake2Digest256); break;
-    case Type::Blake2b512: v_data = computeBlake2Hash(dev, Blake2Digest512); break;
+    case Type::Sha1: {
+        QCryptographicHash h(QCryptographicHash::Sha1);
+        h.addData(dev);
+        v_data = h.result();
+        break;
+    }
+    case Type::Sha256: {
+        QCryptographicHash h(QCryptographicHash::Sha256);
+        h.addData(dev);
+        v_data = h.result();
+        break;
+    }
+    case Type::Sha512: {
+        QCryptographicHash h(QCryptographicHash::Sha512);
+        h.addData(dev);
+        v_data = h.result();
+        break;
+    }
+    case Type::Sha3_256: {
+        QCryptographicHash h(QCryptographicHash::Sha3_256);
+        h.addData(dev);
+        v_data = h.result();
+        break;
+    }
+    case Type::Sha3_512: {
+        QCryptographicHash h(QCryptographicHash::Sha3_512);
+        h.addData(dev);
+        v_data = h.result();
+        break;
+    }
+    case Type::Blake2b256:
+        v_data = computeBlake2Hash(dev, Blake2Digest256);
+        break;
+    case Type::Blake2b512:
+        v_data = computeBlake2Hash(dev, Blake2Digest512);
+        break;
     case Type::Unknown:
     default:
         qDebug("invalid hash type");
@@ -386,9 +440,9 @@ bool Hash::computeFromDevice(QIODevice *dev)
 QDomElement Hash::toXml(QDomDocument *doc) const
 {
     if (v_type != Type::Unknown) {
-        for(size_t n = 0; n < sizeof(hashTypes) / sizeof(hashTypes[0]); ++n) {
-            if(v_type == hashTypes[n].hashType) {
-                auto el = doc->createElementNS(HASH_NS, QLatin1String(v_data.isEmpty()? "hash-used": "hash"));
+        for (size_t n = 0; n < sizeof(hashTypes) / sizeof(hashTypes[0]); ++n) {
+            if (v_type == hashTypes[n].hashType) {
+                auto el = doc->createElementNS(HASH_NS, QLatin1String(v_data.isEmpty() ? "hash-used" : "hash"));
                 el.setAttribute(QLatin1String("algo"), QLatin1String(hashTypes[n].text));
                 if (!v_data.isEmpty()) {
                     XMLHelper::setTagText(el, v_data.toBase64());
@@ -402,26 +456,59 @@ QDomElement Hash::toXml(QDomDocument *doc) const
 
 void Hash::populateFeatures(Features &features)
 {
-    for(size_t n = 0; n < sizeof(hashTypes) / sizeof(hashTypes[0]); ++n) {
-        features.addFeature(QLatin1String("urn:xmpp:hash-function-text-names:") +
-                            QLatin1String(hashTypes[n].text));
+    for (size_t n = 0; n < sizeof(hashTypes) / sizeof(hashTypes[0]); ++n) {
+        features.addFeature(QLatin1String("urn:xmpp:hash-function-text-names:") + QLatin1String(hashTypes[n].text));
+    }
+}
+
+Hash Hash::from(XMPP::Hash::Type t, const QByteArray &fileData)
+{
+    Hash h(t);
+    if (!h.compute(fileData))
+        h.setType(Unknown);
+    return h;
+}
+
+Hash Hash::from(XMPP::Hash::Type t, QIODevice *dev)
+{
+    Hash h(t);
+    if (!h.compute(dev))
+        h.setType(Unknown);
+    return h;
+}
+
+Hash Hash::from(const QStringRef &str)
+{
+    auto ind = str.indexOf('+');
+    if (ind <= 0)
+        return Hash();
+    Hash hash(str.left(ind));
+    if (hash.isValid()) {
+        auto data = QByteArray::fromHex(str.mid(ind + 1).toLatin1());
+        if (data.size())
+            hash.setData(data);
+        else
+            hash = Hash();
     }
+    return hash;
 }
 
 //----------------------------------------------------------------------------
 // RosterExchangeItem
 //----------------------------------------------------------------------------
 
-RosterExchangeItem::RosterExchangeItem(const Jid& jid, const QString& name, const QStringList& groups, Action action) : jid_(jid), name_(name), groups_(groups), action_(action)
+RosterExchangeItem::RosterExchangeItem(const Jid &jid, const QString &name, const QStringList &groups, Action action) :
+    jid_(jid), name_(name), groups_(groups), action_(action)
 {
 }
 
-RosterExchangeItem::RosterExchangeItem(const QDomElement& el) : action_(Add)
+RosterExchangeItem::RosterExchangeItem(const QDomElement &el) :
+    action_(Add)
 {
     fromXml(el);
 }
 
-const Jid& RosterExchangeItem::jid() const
+const Jid &RosterExchangeItem::jid() const
 {
     return jid_;
 }
@@ -431,12 +518,12 @@ RosterExchangeItem::Action RosterExchangeItem::action() const
     return action_;
 }
 
-const QString& RosterExchangeItem::name() const
+const QString &RosterExchangeItem::name() const
 {
     return name_;
 }
 
-const QStringList& RosterExchangeItem::groups() const
+const QStringList &RosterExchangeItem::groups() const
 {
     return groups_;
 }
@@ -446,7 +533,7 @@ bool RosterExchangeItem::isNull() const
     return jid_.isEmpty();
 }
 
-void RosterExchangeItem::setJid(const Jid& jid)
+void RosterExchangeItem::setJid(const Jid &jid)
 {
     jid_ = jid;
 }
@@ -456,54 +543,52 @@ void RosterExchangeItem::setAction(Action action)
     action_ = action;
 }
 
-void RosterExchangeItem::setName(const QString& name)
+void RosterExchangeItem::setName(const QString &name)
 {
     name_ = name;
 }
 
-void RosterExchangeItem::setGroups(const QStringList& groups)
+void RosterExchangeItem::setGroups(const QStringList &groups)
 {
     groups_ = groups;
 }
 
-QDomElement RosterExchangeItem::toXml(Stanza& s) const
+QDomElement RosterExchangeItem::toXml(Stanza &s) const
 {
     QDomElement e = s.createElement("http://jabber.org/protocol/rosterx", "item");
     e.setAttribute("jid", jid().full());
     if (!name().isEmpty())
         e.setAttribute("name", name());
-    switch(action()) {
+    switch (action()) {
     case Add:
-        e.setAttribute("action","add");
+        e.setAttribute("action", "add");
         break;
     case Delete:
-        e.setAttribute("action","delete");
+        e.setAttribute("action", "delete");
         break;
     case Modify:
-        e.setAttribute("action","modify");
+        e.setAttribute("action", "modify");
         break;
     }
-    foreach(QString group, groups_) {
-        e.appendChild(s.createTextElement("http://jabber.org/protocol/rosterx", "group",group));
+    foreach (QString group, groups_) {
+        e.appendChild(s.createTextElement("http://jabber.org/protocol/rosterx", "group", group));
     }
     return e;
 }
 
-void RosterExchangeItem::fromXml(const QDomElement& e)
+void RosterExchangeItem::fromXml(const QDomElement &e)
 {
     setJid(e.attribute("jid"));
     setName(e.attribute("name"));
     if (e.attribute("action") == "delete") {
         setAction(Delete);
-    }
-    else if (e.attribute("action") == "modify") {
+    } else if (e.attribute("action") == "modify") {
         setAction(Modify);
-    }
-    else {
+    } else {
         setAction(Add);
     }
     QDomNodeList nl = e.childNodes();
-    for(int n = 0; n < nl.count(); ++n) {
+    for (int n = 0; n < nl.count(); ++n) {
         QDomElement g = nl.item(n).toElement();
         if (!g.isNull() && g.tagName() == "group") {
             groups_ += g.text();
@@ -514,21 +599,23 @@ void RosterExchangeItem::fromXml(const QDomElement& e)
 //----------------------------------------------------------------------------
 // MUCItem
 //----------------------------------------------------------------------------
-MUCItem::MUCItem(Role r, Affiliation a) : affiliation_(a), role_(r)
+MUCItem::MUCItem(Role r, Affiliation a) :
+    affiliation_(a), role_(r)
 {
 }
 
-MUCItem::MUCItem(const QDomElement& el) : affiliation_(UnknownAffiliation), role_(UnknownRole)
+MUCItem::MUCItem(const QDomElement &el) :
+    affiliation_(UnknownAffiliation), role_(UnknownRole)
 {
     fromXml(el);
 }
 
-void MUCItem::setNick(const QString& n)
+void MUCItem::setNick(const QString &n)
 {
     nick_ = n;
 }
 
-void MUCItem::setJid(const Jid& j)
+void MUCItem::setJid(const Jid &j)
 {
     jid_ = j;
 }
@@ -543,22 +630,22 @@ void MUCItem::setRole(Role r)
     role_ = r;
 }
 
-void MUCItem::setActor(const Jid& a)
+void MUCItem::setActor(const Jid &a)
 {
     actor_ = a;
 }
 
-void MUCItem::setReason(const QString& r)
+void MUCItem::setReason(const QString &r)
 {
     reason_ = r;
 }
 
-const QString& MUCItem::nick() const
+const QString &MUCItem::nick() const
 {
     return nick_;
 }
 
-const Jid& MUCItem::jid() const
+const Jid &MUCItem::jid() const
 {
     return jid_;
 }
@@ -573,58 +660,51 @@ MUCItem::Role MUCItem::role() const
     return role_;
 }
 
-const Jid& MUCItem::actor() const
+const Jid &MUCItem::actor() const
 {
     return actor_;
 }
 
-const QString& MUCItem::reason() const
+const QString &MUCItem::reason() const
 {
     return reason_;
 }
 
-void MUCItem::fromXml(const QDomElement& e)
+void MUCItem::fromXml(const QDomElement &e)
 {
     if (e.tagName() != QLatin1String("item"))
         return;
 
-    jid_ = Jid(e.attribute("jid"));
+    jid_  = Jid(e.attribute("jid"));
     nick_ = e.attribute(QLatin1String("nick"));
 
     // Affiliation
     if (e.attribute(QLatin1String("affiliation")) == QLatin1String("owner")) {
         affiliation_ = Owner;
-    }
-    else if (e.attribute(QLatin1String("affiliation")) == QLatin1String("admin")) {
+    } else if (e.attribute(QLatin1String("affiliation")) == QLatin1String("admin")) {
         affiliation_ = Admin;
-    }
-    else if (e.attribute(QLatin1String("affiliation")) == QLatin1String("member")) {
+    } else if (e.attribute(QLatin1String("affiliation")) == QLatin1String("member")) {
         affiliation_ = Member;
-    }
-    else if (e.attribute(QLatin1String("affiliation")) == QLatin1String("outcast")) {
+    } else if (e.attribute(QLatin1String("affiliation")) == QLatin1String("outcast")) {
         affiliation_ = Outcast;
-    }
-    else if (e.attribute(QLatin1String("affiliation")) == QLatin1String("none")) {
+    } else if (e.attribute(QLatin1String("affiliation")) == QLatin1String("none")) {
         affiliation_ = NoAffiliation;
     }
 
     // Role
     if (e.attribute(QLatin1String("role")) == QLatin1String("moderator")) {
         role_ = Moderator;
-    }
-    else if (e.attribute(QLatin1String("role")) == QLatin1String("participant")) {
+    } else if (e.attribute(QLatin1String("role")) == QLatin1String("participant")) {
         role_ = Participant;
-    }
-    else if (e.attribute(QLatin1String("role")) == QLatin1String("visitor")) {
+    } else if (e.attribute(QLatin1String("role")) == QLatin1String("visitor")) {
         role_ = Visitor;
-    }
-    else if (e.attribute(QLatin1String("role")) == QLatin1String("none")) {
+    } else if (e.attribute(QLatin1String("role")) == QLatin1String("none")) {
         role_ = NoRole;
     }
 
-    for(QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling()) {
+    for (QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling()) {
         QDomElement i = n.toElement();
-        if(i.isNull())
+        if (i.isNull())
             continue;
 
         if (i.tagName() == QLatin1String("actor"))
@@ -634,50 +714,50 @@ void MUCItem::fromXml(const QDomElement& e)
     }
 }
 
-QDomElement MUCItem::toXml(QDomDocument& d)
+QDomElement MUCItem::toXml(QDomDocument &d)
 {
     QDomElement e = d.createElement("item");
 
     if (!nick_.isEmpty())
-        e.setAttribute("nick",nick_);
+        e.setAttribute("nick", nick_);
 
     if (!jid_.isEmpty())
-        e.setAttribute("jid",jid_.full());
+        e.setAttribute("jid", jid_.full());
 
     if (!reason_.isEmpty())
-        e.appendChild(textTag(&d,"reason",reason_));
+        e.appendChild(textTag(&d, "reason", reason_));
 
     switch (affiliation_) {
     case NoAffiliation:
-        e.setAttribute("affiliation","none");
+        e.setAttribute("affiliation", "none");
         break;
     case Owner:
-        e.setAttribute("affiliation","owner");
+        e.setAttribute("affiliation", "owner");
         break;
     case Admin:
-        e.setAttribute("affiliation","admin");
+        e.setAttribute("affiliation", "admin");
         break;
     case Member:
-        e.setAttribute("affiliation","member");
+        e.setAttribute("affiliation", "member");
         break;
     case Outcast:
-        e.setAttribute("affiliation","outcast");
+        e.setAttribute("affiliation", "outcast");
         break;
     default:
         break;
     }
     switch (role_) {
     case NoRole:
-        e.setAttribute("role","none");
+        e.setAttribute("role", "none");
         break;
     case Moderator:
-        e.setAttribute("role","moderator");
+        e.setAttribute("role", "moderator");
         break;
     case Participant:
-        e.setAttribute("role","participant");
+        e.setAttribute("role", "participant");
         break;
     case Visitor:
-        e.setAttribute("role","visitor");
+        e.setAttribute("role", "visitor");
         break;
     default:
         break;
@@ -686,54 +766,57 @@ QDomElement MUCItem::toXml(QDomDocument& d)
     return e;
 }
 
-bool MUCItem::operator==(const MUCItem& o)
+bool MUCItem::operator==(const MUCItem &o)
 {
-    return !nick_.compare(o.nick_) && ((!jid_.isValid() && !o.jid_.isValid()) || jid_.compare(o.jid_,true)) && ((!actor_.isValid() && !o.actor_.isValid()) || actor_.compare(o.actor_,true)) && affiliation_ == o.affiliation_ && role_ == o.role_ && !reason_.compare(o.reason_);
+    return !nick_.compare(o.nick_) && ((!jid_.isValid() && !o.jid_.isValid()) || jid_.compare(o.jid_, true)) && ((!actor_.isValid() && !o.actor_.isValid()) || actor_.compare(o.actor_, true)) && affiliation_ == o.affiliation_ && role_ == o.role_ && !reason_.compare(o.reason_);
 }
 
 //----------------------------------------------------------------------------
 // MUCInvite
 //----------------------------------------------------------------------------
 
-MUCInvite::MUCInvite() : cont_(false)
+MUCInvite::MUCInvite() :
+    cont_(false)
 {
 }
 
-MUCInvite::MUCInvite(const Jid& to, const QString& reason) : to_(to), reason_(reason), cont_(false)
+MUCInvite::MUCInvite(const Jid &to, const QString &reason) :
+    to_(to), reason_(reason), cont_(false)
 {
 }
 
-MUCInvite::MUCInvite(const QDomElement& e) : cont_(false)
+MUCInvite::MUCInvite(const QDomElement &e) :
+    cont_(false)
 {
     fromXml(e);
 }
 
-const Jid& MUCInvite::from() const
+const Jid &MUCInvite::from() const
 {
     return from_;
 }
 
-void MUCInvite::setFrom(const Jid& j)
+void MUCInvite::setFrom(const Jid &j)
 {
     from_ = j;
 }
 
-const Jid& MUCInvite::to() const
+const Jid &MUCInvite::to() const
 {
     return to_;
 }
 
-void MUCInvite::setTo(const Jid& j)
+void MUCInvite::setTo(const Jid &j)
 {
     to_ = j;
 }
 
-const QString& MUCInvite::reason() const
+const QString &MUCInvite::reason() const
 {
     return reason_;
 }
 
-void MUCInvite::setReason(const QString& r)
+void MUCInvite::setReason(const QString &r)
 {
     reason_ = r;
 }
@@ -748,16 +831,16 @@ void MUCInvite::setCont(bool b)
     cont_ = b;
 }
 
-void MUCInvite::fromXml(const QDomElement& e)
+void MUCInvite::fromXml(const QDomElement &e)
 {
     if (e.tagName() != "invite")
         return;
 
     from_ = e.attribute("from");
-    to_ = e.attribute("to");
-    for(QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling()) {
+    to_   = e.attribute("to");
+    for (QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling()) {
         QDomElement i = n.toElement();
-        if(i.isNull())
+        if (i.isNull())
             continue;
 
         if (i.tagName() == "continue")
@@ -767,14 +850,14 @@ void MUCInvite::fromXml(const QDomElement& e)
     }
 }
 
-QDomElement MUCInvite::toXml(QDomDocument& d) const
+QDomElement MUCInvite::toXml(QDomDocument &d) const
 {
     QDomElement invite = d.createElement("invite");
     if (!to_.isEmpty()) {
-        invite.setAttribute("to",to_.full());
+        invite.setAttribute("to", to_.full());
     }
     if (!from_.isEmpty()) {
-        invite.setAttribute("from",from_.full());
+        invite.setAttribute("from", from_.full());
     }
     if (!reason_.isEmpty()) {
         invite.appendChild(textTag(&d, "reason", reason_));
@@ -798,51 +881,51 @@ MUCDecline::MUCDecline()
 {
 }
 
-MUCDecline::MUCDecline(const QDomElement& e)
+MUCDecline::MUCDecline(const QDomElement &e)
 {
     fromXml(e);
 }
 
-const Jid& MUCDecline::from() const
+const Jid &MUCDecline::from() const
 {
     return from_;
 }
 
-void MUCDecline::setFrom(const Jid& j)
+void MUCDecline::setFrom(const Jid &j)
 {
     from_ = j;
 }
 
-const Jid& MUCDecline::to() const
+const Jid &MUCDecline::to() const
 {
     return to_;
 }
 
-void MUCDecline::setTo(const Jid& j)
+void MUCDecline::setTo(const Jid &j)
 {
     to_ = j;
 }
 
-const QString& MUCDecline::reason() const
+const QString &MUCDecline::reason() const
 {
     return reason_;
 }
 
-void MUCDecline::setReason(const QString& r)
+void MUCDecline::setReason(const QString &r)
 {
     reason_ = r;
 }
 
-void MUCDecline::fromXml(const QDomElement& e)
+void MUCDecline::fromXml(const QDomElement &e)
 {
     if (e.tagName() != "decline")
         return;
 
     from_ = e.attribute("from");
-    to_ = e.attribute("to");
-    for(QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling()) {
+    to_   = e.attribute("to");
+    for (QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling()) {
         QDomElement i = n.toElement();
-        if(i.isNull())
+        if (i.isNull())
             continue;
 
         if (i.tagName() == "reason")
@@ -850,14 +933,14 @@ void MUCDecline::fromXml(const QDomElement& e)
     }
 }
 
-QDomElement MUCDecline::toXml(QDomDocument& d) const
+QDomElement MUCDecline::toXml(QDomDocument &d) const
 {
     QDomElement decline = d.createElement("decline");
     if (!to_.isEmpty()) {
-        decline.setAttribute("to",to_.full());
+        decline.setAttribute("to", to_.full());
     }
     if (!from_.isEmpty()) {
-        decline.setAttribute("from",from_.full());
+        decline.setAttribute("from", from_.full());
     }
     if (!reason_.isEmpty()) {
         decline.appendChild(textTag(&d, "reason", reason_));
@@ -878,40 +961,40 @@ MUCDestroy::MUCDestroy()
 {
 }
 
-MUCDestroy::MUCDestroy(const QDomElement& e)
+MUCDestroy::MUCDestroy(const QDomElement &e)
 {
     fromXml(e);
 }
 
-const Jid& MUCDestroy::jid() const
+const Jid &MUCDestroy::jid() const
 {
     return jid_;
 }
 
-void MUCDestroy::setJid(const Jid& j)
+void MUCDestroy::setJid(const Jid &j)
 {
     jid_ = j;
 }
 
-const QString& MUCDestroy::reason() const
+const QString &MUCDestroy::reason() const
 {
     return reason_;
 }
 
-void MUCDestroy::setReason(const QString& r)
+void MUCDestroy::setReason(const QString &r)
 {
     reason_ = r;
 }
 
-void MUCDestroy::fromXml(const QDomElement& e)
+void MUCDestroy::fromXml(const QDomElement &e)
 {
     if (e.tagName() != "destroy")
         return;
 
     jid_ = e.attribute("jid");
-    for(QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling()) {
+    for (QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling()) {
         QDomElement i = n.toElement();
-        if(i.isNull())
+        if (i.isNull())
             continue;
 
         if (i.tagName() == "reason")
@@ -919,11 +1002,11 @@ void MUCDestroy::fromXml(const QDomElement& e)
     }
 }
 
-QDomElement MUCDestroy::toXml(QDomDocument& d) const
+QDomElement MUCDestroy::toXml(QDomDocument &d) const
 {
     QDomElement destroy = d.createElement("destroy");
     if (!jid_.isEmpty()) {
-        destroy.setAttribute("jid",jid_.full());
+        destroy.setAttribute("jid", jid_.full());
     }
     if (!reason_.isEmpty()) {
         destroy.appendChild(textTag(&d, "reason", reason_));
@@ -945,7 +1028,7 @@ void HTMLElement::setBody(const QDomElement &body)
     body_ = doc_.importNode(body, true).toElement();
 }
 
-const QDomElement& HTMLElement::body() const
+const QDomElement &HTMLElement::body() const
 {
     return body_;
 }
@@ -970,7 +1053,7 @@ QString HTMLElement::toString(const QString &rootTagName) const
     //    msg.appendChild(e);
     //    return msg.toString();
     // call Stream::xmlToString, to remove unwanted namespace attributes
-    return(Stream::xmlToString(e));
+    return (Stream::xmlToString(e));
 }
 
 QString HTMLElement::text() const
@@ -988,7 +1071,8 @@ void HTMLElement::filterOutUnwantedRecursive(QDomElement &el, bool strict)
 {
     Q_UNUSED(strict) //TODO filter out not xhtml-im elements
 
-    static QSet<QString> unwanted = QSet<QString>()<<"script"<<"iframe";
+    static QSet<QString> unwanted = QSet<QString>() << "script"
+                                                    << "iframe";
     QDomNode child = el.firstChild();
     while (!child.isNull()) {
         QDomNode sibling = child.nextSibling();
@@ -996,18 +1080,17 @@ void HTMLElement::filterOutUnwantedRecursive(QDomElement &el, bool strict)
             QDomElement childEl = child.toElement();
             if (unwanted.contains(childEl.tagName())) {
                 child.parentNode().removeChild(child);
-            }
-            else {
+            } else {
                 QDomNamedNodeMap domAttrs = childEl.attributes();
-                int acnt = domAttrs.count();
-                QStringList attrs; //attributes for removing
-                for (int i=0; i<acnt; i++) {
+                int              acnt     = domAttrs.count();
+                QStringList      attrs; //attributes for removing
+                for (int i = 0; i < acnt; i++) {
                     QString name = domAttrs.item(i).toAttr().name();
                     if (name.startsWith("on")) {
                         attrs.append(name);
                     }
                 }
-                foreach(const QString &name, attrs) {
+                foreach (const QString &name, attrs) {
                     domAttrs.removeNamedItem(name);
                 }
                 filterOutUnwantedRecursive(childEl, strict);
@@ -1020,71 +1103,69 @@ void HTMLElement::filterOutUnwantedRecursive(QDomElement &el, bool strict)
 //----------------------------------------------------------------------------
 // Message
 //----------------------------------------------------------------------------
-class Message::Private : public QSharedData
-{
+class Message::Private : public QSharedData {
 public:
-    Jid to, from;
+    Jid     to, from;
     QString id, type, lang;
 
-    StringMap subject, body;
-    QString thread;
-    bool threadSend = false;
+    StringMap     subject, body;
+    QString       thread;
+    bool          threadSend = false;
     Stanza::Error error;
 
     // extensions
-    QDateTime timeStamp; // local time
-    bool timeStampSend = false;
-    UrlList urlList;
-    AddressList addressList;
-    RosterExchangeItems rosterExchangeItems;
-    QString messageReceiptId;
-    QString nick;
-    QString eventId;
-    QString xsigned, xencrypted, invite;
-    QString pubsubNode;
-    QList<PubSubItem> pubsubItems;
-    QList<PubSubRetraction> pubsubRetractions;
-    QList<MsgEvent> eventList;
-    ChatState chatState = StateNone;
-    MessageReceipt messageReceipt = ReceiptNone;
-    HttpAuthRequest httpAuthRequest;
-    XData xdata;
-    IBBData ibbData;
-    QMap<QString,HTMLElement> htmlElements;
-    QDomElement sxe;
-    QList<BoBData> bobDataList;
-    Jid forwardedFrom;
-
-    QList<int> mucStatuses;
+    QDateTime                  timeStamp; // local time
+    bool                       timeStampSend = false;
+    UrlList                    urlList;
+    AddressList                addressList;
+    RosterExchangeItems        rosterExchangeItems;
+    QString                    messageReceiptId;
+    QString                    nick;
+    QString                    eventId;
+    QString                    xsigned, xencrypted, invite;
+    QString                    pubsubNode;
+    QList<PubSubItem>          pubsubItems;
+    QList<PubSubRetraction>    pubsubRetractions;
+    QList<MsgEvent>            eventList;
+    ChatState                  chatState      = StateNone;
+    MessageReceipt             messageReceipt = ReceiptNone;
+    HttpAuthRequest            httpAuthRequest;
+    XData                      xdata;
+    IBBData                    ibbData;
+    QMap<QString, HTMLElement> htmlElements;
+    QDomElement                sxe;
+    QList<BoBData>             bobDataList;
+    Jid                        forwardedFrom;
+
+    QList<int>       mucStatuses;
     QList<MUCInvite> mucInvites;
-    MUCDecline mucDecline;
-    QString mucPassword;
-    bool hasMUCUser = false;
+    MUCDecline       mucDecline;
+    QString          mucPassword;
+    bool             hasMUCUser = false;
 
     bool spooled = false, wasEncrypted = false;
 
     //XEP-0280 Message Carbons
-    bool isDisabledCarbons = false;
-    Message::CarbonDir carbonDir = Message::NoCarbon; // it's a forwarded message
+    bool                     isDisabledCarbons = false;
+    Message::CarbonDir       carbonDir         = Message::NoCarbon; // it's a forwarded message
     Message::ProcessingHints processingHints;
-    QString replaceId;
-    QString originId; // XEP-0359
-    Message::StanzaId stanzaId; // XEP-0359
-    QList<Reference> references; // XEP-0385 and XEP-0372
+    QString                  replaceId;
+    QString                  originId;   // XEP-0359
+    Message::StanzaId        stanzaId;   // XEP-0359
+    QList<Reference>         references; // XEP-0385 and XEP-0372
 };
 
-#define MessageD() (d? d : (d = new Private))
+#define MessageD() (d ? d : (d = new Private))
 //! \brief Constructs Message with given Jid information.
 //!
 //! This function will construct a Message container.
 //! \param to - specify receiver (default: empty string)
 Message::Message()
 {
-
 }
 
-Message::Message(const Jid &to)
-    : d(new Private)
+Message::Message(const Jid &to) :
+    d(new Private)
 {
     d->to = to;
 }
@@ -1100,7 +1181,7 @@ Message::Message(const Message &from) :
 }
 
 //! \brief Required for internel use.
-Message & Message::operator=(const Message &from)
+Message &Message::operator=(const Message &from)
 {
     d = from.d;
     return *this;
@@ -1120,46 +1201,46 @@ bool Message::operator==(const Message &from) const
 //! \brief Return receiver's Jid information.
 Jid Message::to() const
 {
-    return d? d->to: Jid();
+    return d ? d->to : Jid();
 }
 
 //! \brief Return sender's Jid information.
 Jid Message::from() const
 {
-    return d? d->from: Jid();
+    return d ? d->from : Jid();
 }
 
 QString Message::id() const
 {
-    return d? d->id: QString();
+    return d ? d->id : QString();
 }
 
 //! \brief Return type information
 QString Message::type() const
 {
-    return d? d->type: QString();
+    return d ? d->type : QString();
 }
 
 QString Message::lang() const
 {
-    return d? d->lang: QString();
+    return d ? d->lang : QString();
 }
 
 //! \brief Return subject information.
 QString Message::subject(const QString &lang) const
 {
-    return d? d->subject.value(lang): QString();
+    return d ? d->subject.value(lang) : QString();
 }
 
 //! \brief Return subject information.
 QString Message::subject(const QLocale &lang) const
 {
-    return d? d->subject.value(lang.bcp47Name()): QString();
+    return d ? d->subject.value(lang.bcp47Name()) : QString();
 }
 
 StringMap Message::subjectMap() const
 {
-    return d? d->subject: StringMap();
+    return d ? d->subject : StringMap();
 }
 
 //! \brief Return body information.
@@ -1200,13 +1281,12 @@ QString Message::body(const QLocale &lang) const
 //! \note The return string is in xhtml
 HTMLElement Message::html(const QString &lang) const
 {
-    if(containsHTML()) {
+    if (containsHTML()) {
         if (d->htmlElements.contains(lang))
             return d->htmlElements[lang];
         else
             return d->htmlElements.begin().value();
-    }
-    else
+    } else
         return HTMLElement();
 }
 
@@ -1221,12 +1301,12 @@ bool Message::containsHTML() const
 
 QString Message::thread() const
 {
-    return d? d->thread: QString();
+    return d ? d->thread : QString();
 }
 
 Stanza::Error Message::error() const
 {
-    return d? d->error: Stanza::Error();
+    return d ? d->error : Stanza::Error();
 }
 
 //! \brief Set receivers information
@@ -1296,7 +1376,7 @@ void Message::setHTML(const HTMLElement &e, const QString &lang)
 void Message::setThread(const QString &s, bool send)
 {
     MessageD()->threadSend = send;
-    d->thread = s;
+    d->thread              = s;
 }
 
 void Message::setError(const Stanza::Error &err)
@@ -1306,34 +1386,34 @@ void Message::setError(const Stanza::Error &err)
 
 QString Message::pubsubNode() const
 {
-    return d? d->pubsubNode: QString();
+    return d ? d->pubsubNode : QString();
 }
 
 QList<PubSubItem> Message::pubsubItems() const
 {
-    return d? d->pubsubItems: QList<PubSubItem>();
+    return d ? d->pubsubItems : QList<PubSubItem>();
 }
 
 QList<PubSubRetraction> Message::pubsubRetractions() const
 {
-    return d? d->pubsubRetractions: QList<PubSubRetraction>();
+    return d ? d->pubsubRetractions : QList<PubSubRetraction>();
 }
 
 QDateTime Message::timeStamp() const
 {
-    return d? d->timeStamp: QDateTime();
+    return d ? d->timeStamp : QDateTime();
 }
 
 void Message::setTimeStamp(const QDateTime &ts, bool send)
 {
     MessageD()->timeStampSend = send;
-    d->timeStamp = ts;
+    d->timeStamp              = ts;
 }
 
 //! \brief Return list of urls attached to message.
 UrlList Message::urlList() const
 {
-    return d? d->urlList: UrlList();
+    return d ? d->urlList : UrlList();
 }
 
 //! \brief Add Url to the url list.
@@ -1363,7 +1443,7 @@ void Message::setUrlList(const UrlList &list)
 //! \brief Return list of addresses attached to message.
 AddressList Message::addresses() const
 {
-    return d? d->addressList : AddressList();
+    return d ? d->addressList : AddressList();
 }
 
 //! \brief Add Address to the address list.
@@ -1388,7 +1468,7 @@ AddressList Message::findAddresses(Address::Type t) const
         return AddressList();
     }
     AddressList matches;
-    foreach(Address a, d->addressList) {
+    foreach (Address a, d->addressList) {
         if (a.type() == t)
             matches.append(a);
     }
@@ -1405,20 +1485,20 @@ void Message::setAddresses(const AddressList &list)
 
 RosterExchangeItems Message::rosterExchangeItems() const
 {
-    return d? d->rosterExchangeItems : RosterExchangeItems();
+    return d ? d->rosterExchangeItems : RosterExchangeItems();
 }
 
-void Message::setRosterExchangeItems(const RosterExchangeItems& items)
+void Message::setRosterExchangeItems(const RosterExchangeItems &items)
 {
     MessageD()->rosterExchangeItems = items;
 }
 
 QString Message::eventId() const
 {
-    return d? d->eventId: QString();
+    return d ? d->eventId : QString();
 }
 
-void Message::setEventId(const QString& id)
+void Message::setEventId(const QString &id)
 {
     MessageD()->eventId = id;
 }
@@ -1444,7 +1524,7 @@ void Message::addEvent(MsgEvent e)
 
 ChatState Message::chatState() const
 {
-    return d? d->chatState : StateNone;
+    return d ? d->chatState : StateNone;
 }
 
 void Message::setChatState(ChatState state)
@@ -1454,7 +1534,7 @@ void Message::setChatState(ChatState state)
 
 MessageReceipt Message::messageReceipt() const
 {
-    return d? d->messageReceipt: ReceiptNone;
+    return d ? d->messageReceipt : ReceiptNone;
 }
 
 void Message::setMessageReceipt(MessageReceipt messageReceipt)
@@ -1464,7 +1544,7 @@ void Message::setMessageReceipt(MessageReceipt messageReceipt)
 
 QString Message::messageReceiptId() const
 {
-    return d? d->messageReceiptId: QString();
+    return d ? d->messageReceiptId : QString();
 }
 
 void Message::setMessageReceiptId(const QString &s)
@@ -1474,7 +1554,7 @@ void Message::setMessageReceiptId(const QString &s)
 
 QString Message::xsigned() const
 {
-    return d? d->xsigned: QString();
+    return d ? d->xsigned : QString();
 }
 
 void Message::setXSigned(const QString &s)
@@ -1484,7 +1564,7 @@ void Message::setXSigned(const QString &s)
 
 QString Message::xencrypted() const
 {
-    return d? d->xencrypted: QString();
+    return d ? d->xencrypted : QString();
 }
 
 void Message::setXEncrypted(const QString &s)
@@ -1494,7 +1574,7 @@ void Message::setXEncrypted(const QString &s)
 
 QList<int> Message::getMUCStatuses() const
 {
-    return d? d->mucStatuses: QList<int>();
+    return d ? d->mucStatuses : QList<int>();
 }
 
 void Message::addMUCStatus(int i)
@@ -1502,32 +1582,32 @@ void Message::addMUCStatus(int i)
     MessageD()->mucStatuses += i;
 }
 
-void Message::addMUCInvite(const MUCInvite& i)
+void Message::addMUCInvite(const MUCInvite &i)
 {
     MessageD()->mucInvites += i;
 }
 
 QList<MUCInvite> Message::mucInvites() const
 {
-    return d? d->mucInvites: QList<MUCInvite>();
+    return d ? d->mucInvites : QList<MUCInvite>();
 }
 
-void Message::setMUCDecline(const MUCDecline& de)
+void Message::setMUCDecline(const MUCDecline &de)
 {
     MessageD()->mucDecline = de;
 }
 
 MUCDecline Message::mucDecline() const
 {
-    return d? d->mucDecline: MUCDecline();
+    return d ? d->mucDecline : MUCDecline();
 }
 
 QString Message::mucPassword() const
 {
-    return d? d->mucPassword: QString();
+    return d ? d->mucPassword : QString();
 }
 
-void Message::setMUCPassword(const QString& p)
+void Message::setMUCPassword(const QString &p)
 {
     MessageD()->mucPassword = p;
 }
@@ -1539,7 +1619,7 @@ bool Message::hasMUCUser() const
 
 Message::StanzaId Message::stanzaId() const
 {
-    return d? d->stanzaId: StanzaId();
+    return d ? d->stanzaId : StanzaId();
 }
 
 void Message::setStanzaId(const Message::StanzaId &id)
@@ -1549,7 +1629,7 @@ void Message::setStanzaId(const Message::StanzaId &id)
 
 QString Message::originId() const
 {
-    return d? d->originId: QString();
+    return d ? d->originId : QString();
 }
 
 void Message::setOriginId(const QString &id)
@@ -1559,7 +1639,7 @@ void Message::setOriginId(const QString &id)
 
 QList<Reference> Message::references() const
 {
-    return d? d->references: QList<Reference>();
+    return d ? d->references : QList<Reference>();
 }
 
 void Message::addReference(const Reference &r)
@@ -1574,7 +1654,7 @@ void Message::setReferences(const QList<Reference> &r)
 
 QString Message::invite() const
 {
-    return d? d->invite: QString();
+    return d ? d->invite : QString();
 }
 
 void Message::setInvite(const QString &s)
@@ -1584,10 +1664,10 @@ void Message::setInvite(const QString &s)
 
 QString Message::nick() const
 {
-    return d? d->nick: QString();
+    return d ? d->nick : QString();
 }
 
-void Message::setNick(const QString& n)
+void Message::setNick(const QString &n)
 {
     MessageD()->nick = n;
 }
@@ -1599,7 +1679,7 @@ void Message::setHttpAuthRequest(const HttpAuthRequest &req)
 
 HttpAuthRequest Message::httpAuthRequest() const
 {
-    return d? d->httpAuthRequest: HttpAuthRequest();
+    return d ? d->httpAuthRequest : HttpAuthRequest();
 }
 
 void Message::setForm(const XData &form)
@@ -1609,15 +1689,15 @@ void Message::setForm(const XData &form)
 
 XData Message::getForm() const
 {
-    return d? d->xdata: XData();
+    return d ? d->xdata : XData();
 }
 
 QDomElement Message::sxe() const
 {
-    return d? d->sxe: QDomElement();
+    return d ? d->sxe : QDomElement();
 }
 
-void Message::setSxe(const QDomElement& e)
+void Message::setSxe(const QDomElement &e)
 {
     MessageD()->sxe = e;
 }
@@ -1629,12 +1709,12 @@ void Message::addBoBData(const BoBData &bob)
 
 QList<BoBData> Message::bobDataList() const
 {
-    return d? d->bobDataList: QList<BoBData>();
+    return d ? d->bobDataList : QList<BoBData>();
 }
 
 IBBData Message::ibbData() const
 {
-    return d? d->ibbData: IBBData();
+    return d ? d->ibbData : IBBData();
 }
 
 void Message::setDisabledCarbons(bool disabled)
@@ -1654,7 +1734,7 @@ void Message::setCarbonDirection(Message::CarbonDir cd)
 
 Message::CarbonDir Message::carbonDirection() const
 {
-    return d? d->carbonDir: NoCarbon;
+    return d ? d->carbonDir : NoCarbon;
 }
 
 void Message::setForwardedFrom(const Jid &jid)
@@ -1664,7 +1744,7 @@ void Message::setForwardedFrom(const Jid &jid)
 
 Jid Message::forwardedFrom() const
 {
-    return d? d->forwardedFrom: Jid();
+    return d ? d->forwardedFrom : Jid();
 }
 
 bool Message::spooled() const
@@ -1687,11 +1767,12 @@ void Message::setWasEncrypted(bool b)
     MessageD()->wasEncrypted = b;
 }
 
-QString Message::replaceId() const {
-    return d? d->replaceId: QString();
+QString Message::replaceId() const
+{
+    return d ? d->replaceId : QString();
 }
 
-void Message::setReplaceId(const QString& id)
+void Message::setReplaceId(const QString &id)
 {
     MessageD()->replaceId = id;
 }
@@ -1703,7 +1784,7 @@ void Message::setProcessingHints(const ProcessingHints &hints)
 
 Message::ProcessingHints Message::processingHints() const
 {
-    return d? d->processingHints: ProcessingHints();
+    return d ? d->processingHints : ProcessingHints();
 }
 
 Stanza Message::toStanza(Stream *stream) const
@@ -1712,28 +1793,28 @@ Stanza Message::toStanza(Stream *stream) const
         return Stanza();
     }
     Stanza s = stream->createStanza(Stanza::Message, d->to, d->type);
-    if(!d->from.isEmpty())
+    if (!d->from.isEmpty())
         s.setFrom(d->from);
-    if(!d->id.isEmpty())
+    if (!d->id.isEmpty())
         s.setId(d->id);
-    if(!d->lang.isEmpty())
+    if (!d->lang.isEmpty())
         s.setLang(d->lang);
 
     StringMap::ConstIterator it;
     for (it = d->subject.constBegin(); it != d->subject.constEnd(); ++it) {
         const QString &str = (*it);
-        if(!str.isNull()) {
+        if (!str.isNull()) {
             QDomElement e = s.createTextElement(s.baseNS(), "subject", str);
-            if(!it.key().isEmpty())
+            if (!it.key().isEmpty())
                 e.setAttributeNS(NS_XML, "xml:lang", it.key());
             s.appendChild(e);
         }
     }
     for (it = d->body.constBegin(); it != d->body.constEnd(); ++it) {
         const QString &str = (*it);
-        if(!str.isEmpty()) {
+        if (!str.isEmpty()) {
             QDomElement e = s.createTextElement(s.baseNS(), "body", str);
-            if(!it.key().isEmpty())
+            if (!it.key().isEmpty())
                 e.setAttributeNS(NS_XML, "xml:lang", it.key());
             s.appendChild(e);
         }
@@ -1747,17 +1828,17 @@ Stanza Message::toStanza(Stream *stream) const
         }
     }
 
-    if(d->type == "error")
+    if (d->type == "error")
         s.setError(d->error);
 
     // thread
-    if(d->threadSend && !d->thread.isEmpty()) {
+    if (d->threadSend && !d->thread.isEmpty()) {
         QDomElement e = s.createTextElement(s.baseNS(), "thread", d->thread);
         s.appendChild(e);
     }
 
     // timestamp
-    if(d->timeStampSend && !d->timeStamp.isNull()) {
+    if (d->timeStampSend && !d->timeStamp.isNull()) {
         QDomElement e = s.createElement("urn:xmpp:delay", "delay");
         e.setAttribute("stamp", d->timeStamp.toUTC().toString(Qt::ISODate) + "Z");
         s.appendChild(e);
@@ -1768,7 +1849,7 @@ Stanza Message::toStanza(Stream *stream) const
     }
 
     // urls
-    foreach (const Url& uit, d->urlList) {
+    foreach (const Url &uit, d->urlList) {
         QDomElement x = s.createElement("jabber:x:oob", "x");
         x.appendChild(s.createTextElement("jabber:x:oob", "url", uit.url()));
         if (!uit.desc().isEmpty())
@@ -1782,12 +1863,12 @@ Stanza Message::toStanza(Stream *stream) const
 
         if (d->body.isEmpty()) {
             if (d->eventId.isEmpty())
-                x.appendChild(s.createElement("jabber:x:event","id"));
+                x.appendChild(s.createElement("jabber:x:event", "id"));
             else
-                x.appendChild(s.createTextElement("jabber:x:event","id",d->eventId));
+                x.appendChild(s.createTextElement("jabber:x:event", "id", d->eventId));
         }
 
-        foreach (const MsgEvent& ev, d->eventList) {
+        foreach (const MsgEvent &ev, d->eventList) {
             switch (ev) {
             case OfflineEvent:
                 x.appendChild(s.createElement("jabber:x:event", "offline"));
@@ -1812,7 +1893,7 @@ Stanza Message::toStanza(Stream *stream) const
     // chat state
     QString chatStateNS = "http://jabber.org/protocol/chatstates";
     if (d->chatState != StateNone) {
-        switch(d->chatState) {
+        switch (d->chatState) {
         case StateActive:
             s.appendChild(s.createElement(chatStateNS, "active"));
             break;
@@ -1836,36 +1917,34 @@ Stanza Message::toStanza(Stream *stream) const
     // message receipt
     QString messageReceiptNS = "urn:xmpp:receipts";
     if (d->messageReceipt != ReceiptNone) {
-        switch(d->messageReceipt) {
+        switch (d->messageReceipt) {
         case ReceiptRequest:
             s.appendChild(s.createElement(messageReceiptNS, "request"));
             break;
-        case ReceiptReceived:
-        {
+        case ReceiptReceived: {
             QDomElement elem = s.createElement(messageReceiptNS, "received");
             if (!d->messageReceiptId.isEmpty()) {
                 elem.setAttribute("id", d->messageReceiptId);
             }
             s.appendChild(elem);
-        }
-            break;
+        } break;
         default:
             break;
         }
     }
 
     // xsigned
-    if(!d->xsigned.isEmpty())
+    if (!d->xsigned.isEmpty())
         s.appendChild(s.createTextElement("jabber:x:signed", "x", d->xsigned));
 
     // xencrypted
-    if(!d->xencrypted.isEmpty())
+    if (!d->xencrypted.isEmpty())
         s.appendChild(s.createTextElement("jabber:x:encrypted", "x", d->xencrypted));
 
     // addresses
     if (!d->addressList.isEmpty()) {
-        QDomElement as = s.createElement("http://jabber.org/protocol/address","addresses");
-        foreach(Address a, d->addressList) {
+        QDomElement as = s.createElement("http://jabber.org/protocol/address", "addresses");
+        foreach (Address a, d->addressList) {
             as.appendChild(a.toXml(s));
         }
         s.appendChild(as);
@@ -1873,56 +1952,55 @@ Stanza Message::toStanza(Stream *stream) const
 
     // roster item exchange
     if (!d->rosterExchangeItems.isEmpty()) {
-        QDomElement rx = s.createElement("http://jabber.org/protocol/rosterx","x");
-        foreach(RosterExchangeItem r, d->rosterExchangeItems) {
+        QDomElement rx = s.createElement("http://jabber.org/protocol/rosterx", "x");
+        foreach (RosterExchangeItem r, d->rosterExchangeItems) {
             rx.appendChild(r.toXml(s));
         }
         s.appendChild(rx);
     }
 
     // invite
-    if(!d->invite.isEmpty()) {
+    if (!d->invite.isEmpty()) {
         QDomElement e = s.createElement("jabber:x:conference", "x");
         e.setAttribute("jid", d->invite);
         s.appendChild(e);
     }
 
     // nick
-    if(!d->nick.isEmpty()) {
+    if (!d->nick.isEmpty()) {
         s.appendChild(s.createTextElement("http://jabber.org/protocol/nick", "nick", d->nick));
     }
 
     // sxe
-    if(!d->sxe.isNull()) {
+    if (!d->sxe.isNull()) {
         s.appendChild(d->sxe);
     }
 
     // muc
-    if(!d->mucInvites.isEmpty()) {
-        QDomElement e = s.createElement("http://jabber.org/protocol/muc#user","x");
-        foreach(MUCInvite i, d->mucInvites) {
+    if (!d->mucInvites.isEmpty()) {
+        QDomElement e = s.createElement("http://jabber.org/protocol/muc#user", "x");
+        foreach (MUCInvite i, d->mucInvites) {
             e.appendChild(i.toXml(s.doc()));
         }
         if (!d->mucPassword.isEmpty()) {
-            e.appendChild(s.createTextElement("http://jabber.org/protocol/muc#user","password",d->mucPassword));
+            e.appendChild(s.createTextElement("http://jabber.org/protocol/muc#user", "password", d->mucPassword));
         }
         s.appendChild(e);
-    }
-    else if(!d->mucDecline.isNull()) {
-        QDomElement e = s.createElement("http://jabber.org/protocol/muc#user","x");
+    } else if (!d->mucDecline.isNull()) {
+        QDomElement e = s.createElement("http://jabber.org/protocol/muc#user", "x");
         e.appendChild(d->mucDecline.toXml(s.doc()));
         s.appendChild(e);
     }
 
     // http auth
-    if(!d->httpAuthRequest.isEmpty()) {
+    if (!d->httpAuthRequest.isEmpty()) {
         s.appendChild(d->httpAuthRequest.toXml(s.doc()));
     }
 
     // data form
-    if(!d->xdata.fields().empty() || (d->xdata.type() == XData::Data_Cancel)) {
-        bool submit = (d->xdata.type() == XData::Data_Submit) || (d->xdata.type() == XData::Data_Cancel);
-        QDomElement dr = s.element();
+    if (!d->xdata.fields().empty() || (d->xdata.type() == XData::Data_Cancel)) {
+        bool        submit = (d->xdata.type() == XData::Data_Submit) || (d->xdata.type() == XData::Data_Cancel);
+        QDomElement dr     = s.element();
         if (d->xdata.registrarType() == "urn:xmpp:captcha") {
             dr = dr.appendChild(s.createElement("urn:xmpp:captcha", "captcha")).toElement();
         }
@@ -1930,13 +2008,13 @@ Stanza Message::toStanza(Stream *stream) const
     }
 
     // bits of binary
-    foreach(const BoBData &bd, d->bobDataList) {
+    foreach (const BoBData &bd, d->bobDataList) {
         s.appendChild(bd.toXml(&s.doc()));
     }
 
     // Avoiding Carbons
     if (isDisabledCarbons() || wasEncrypted()) {
-        QDomElement e = s.createElement("urn:xmpp:carbons:2","private");
+        QDomElement e = s.createElement("urn:xmpp:carbons:2", "private");
         s.appendChild(e);
     }
     if (!d->replaceId.isEmpty()) {
@@ -1976,7 +2054,7 @@ Stanza Message::toStanza(Stream *stream) const
     }
 
     // XEP-0372 and XEP-0385
-    for (auto const &r: d->references) {
+    for (auto const &r : d->references) {
         s.appendChild(r.toXml(&s.doc()));
     }
 
@@ -2009,7 +2087,7 @@ bool Message::fromStanza(const Stanza &s)
   */
 bool Message::fromStanza(const Stanza &s, bool useTimeZoneOffset, int timeZoneOffset)
 {
-    if(s.kind() != Stanza::Message)
+    if (s.kind() != Stanza::Message)
         return false;
 
     d = new Private;
@@ -2027,39 +2105,36 @@ bool Message::fromStanza(const Stanza &s, bool useTimeZoneOffset, int timeZoneOf
     QDomElement root = s.element();
 
     XDomNodeList nl = root.childNodes();
-    int n;
-    for(n = 0; n < nl.count(); ++n) {
+    int          n;
+    for (n = 0; n < nl.count(); ++n) {
         QDomNode i = nl.item(n);
-        if(i.isElement()) {
+        if (i.isElement()) {
             QDomElement e = i.toElement();
-            if(e.namespaceURI() == s.baseNS()) {
-                if(e.tagName() == QLatin1String("subject")) {
+            if (e.namespaceURI() == s.baseNS()) {
+                if (e.tagName() == QLatin1String("subject")) {
                     QString lang = e.attributeNS(NS_XML, "lang", "");
                     if (lang.isEmpty() || !(lang = XMLHelper::sanitizedLang(lang)).isEmpty()) {
                         d->subject[lang] = e.text();
                     }
-                }
-                else if(e.tagName() == QLatin1String("body")) {
+                } else if (e.tagName() == QLatin1String("body")) {
                     QString lang = e.attributeNS(NS_XML, "lang", "");
                     if (lang.isEmpty() || !(lang = XMLHelper::sanitizedLang(lang)).isEmpty()) {
                         d->body[lang] = e.text();
                     }
-                }
-                else if(e.tagName() == QLatin1String("thread"))
+                } else if (e.tagName() == QLatin1String("thread"))
                     d->thread = e.text();
-            }
-            else if(e.tagName() == QLatin1String("event") && e.namespaceURI() == QLatin1String("http://jabber.org/protocol/pubsub#event")) {
-                for(QDomNode enode = e.firstChild(); !enode.isNull(); enode = enode.nextSibling()) {
+            } else if (e.tagName() == QLatin1String("event") && e.namespaceURI() == QLatin1String("http://jabber.org/protocol/pubsub#event")) {
+                for (QDomNode enode = e.firstChild(); !enode.isNull(); enode = enode.nextSibling()) {
                     QDomElement eel = enode.toElement();
                     if (eel.tagName() == QLatin1String("items")) {
                         d->pubsubNode = eel.attribute("node");
-                        for(QDomNode inode = eel.firstChild(); !inode.isNull(); inode = inode.nextSibling()) {
+                        for (QDomNode inode = eel.firstChild(); !inode.isNull(); inode = inode.nextSibling()) {
                             QDomElement o = inode.toElement();
                             if (o.tagName() == QLatin1String("item")) {
-                                for(QDomNode j = o.firstChild(); !j.isNull(); j = j.nextSibling()) {
+                                for (QDomNode j = o.firstChild(); !j.isNull(); j = j.nextSibling()) {
                                     QDomElement item = j.toElement();
                                     if (!item.isNull()) {
-                                        d->pubsubItems += PubSubItem(o.attribute("id"),item);
+                                        d->pubsubItems += PubSubItem(o.attribute("id"), item);
                                     }
                                 }
                             }
@@ -2069,23 +2144,17 @@ bool Message::fromStanza(const Stanza &s, bool useTimeZoneOffset, int timeZoneOf
                         }
                     }
                 }
-            }
-            else if (e.tagName() == QLatin1String("no-permanent-store") && e.namespaceURI() == QLatin1String("urn:xmpp:hints")) {
+            } else if (e.tagName() == QLatin1String("no-permanent-store") && e.namespaceURI() == QLatin1String("urn:xmpp:hints")) {
                 d->processingHints |= NoPermanentStore;
-            }
-            else if (e.tagName() == QLatin1String("no-store") && e.namespaceURI() == QLatin1String("urn:xmpp:hints")) {
+            } else if (e.tagName() == QLatin1String("no-store") && e.namespaceURI() == QLatin1String("urn:xmpp:hints")) {
                 d->processingHints |= NoStore;
-            }
-            else if (e.tagName() == QLatin1String("no-copy") && e.namespaceURI() == QLatin1String("urn:xmpp:hints")) {
+            } else if (e.tagName() == QLatin1String("no-copy") && e.namespaceURI() == QLatin1String("urn:xmpp:hints")) {
                 d->processingHints |= NoCopy;
-            }
-            else if (e.tagName() == QLatin1String("store") && e.namespaceURI() == QLatin1String("urn:xmpp:hints")) {
+            } else if (e.tagName() == QLatin1String("store") && e.namespaceURI() == QLatin1String("urn:xmpp:hints")) {
                 d->processingHints |= Store;
-            }
-            else if (e.tagName() == QLatin1String("origin-id") && e.namespaceURI() == QLatin1String("urn:xmpp:sid:0")) {
+            } else if (e.tagName() == QLatin1String("origin-id") && e.namespaceURI() == QLatin1String("urn:xmpp:sid:0")) {
                 d->originId = e.attribute(QStringLiteral("id"));
-            }
-            else if (e.tagName() == QLatin1String("stanza-id") && e.namespaceURI() == QLatin1String("urn:xmpp:sid:0")) {
+            } else if (e.tagName() == QLatin1String("stanza-id") && e.namespaceURI() == QLatin1String("urn:xmpp:sid:0")) {
                 d->stanzaId.id = e.attribute(QStringLiteral("id"));
                 d->stanzaId.by = Jid(e.attribute(QStringLiteral("by")));
             }
@@ -2096,12 +2165,12 @@ bool Message::fromStanza(const Stanza &s, bool useTimeZoneOffset, int timeZoneOf
         }
     }
 
-    if(s.type() == "error")
+    if (s.type() == "error")
         d->error = s.error();
 
     // Bits of Binary XEP-0231
     nl = childElementsByTagNameNS(root, "urn:xmpp:bob", "data");
-    for(n = 0; n < nl.count(); ++n) {
+    for (n = 0; n < nl.count(); ++n) {
         addBoBData(BoBData(nl.item(n).toElement()));
     }
 
@@ -2109,7 +2178,7 @@ bool Message::fromStanza(const Stanza &s, bool useTimeZoneOffset, int timeZoneOf
     nl = childElementsByTagNameNS(root, "http://jabber.org/protocol/xhtml-im", "html");
     if (nl.count()) {
         nl = nl.item(0).childNodes();
-        for(n = 0; n < nl.count(); ++n) {
+        for (n = 0; n < nl.count(); ++n) {
             QDomElement e = nl.item(n).toElement();
             if (e.tagName() == "body" && e.namespaceURI() == "http://www.w3.org/1999/xhtml") {
                 QString lang = e.attributeNS(NS_XML, "lang", "");
@@ -2123,7 +2192,7 @@ bool Message::fromStanza(const Stanza &s, bool useTimeZoneOffset, int timeZoneOf
 
     // timestamp
     QDomElement t = childElementsByTagNameNS(root, "urn:xmpp:delay", "delay").item(0).toElement();
-    QDateTime stamp;
+    QDateTime   stamp;
     if (!t.isNull()) {
         stamp = QDateTime::fromString(t.attribute("stamp").left(19), Qt::ISODate);
     } else {
@@ -2140,20 +2209,19 @@ bool Message::fromStanza(const Stanza &s, bool useTimeZoneOffset, int timeZoneOf
             d->timeStamp = stamp.toLocalTime();
         }
         d->timeStampSend = true;
-        d->spooled = true;
-    }
-    else {
-        d->timeStamp = QDateTime::currentDateTime();
+        d->spooled       = true;
+    } else {
+        d->timeStamp     = QDateTime::currentDateTime();
         d->timeStampSend = false;
-        d->spooled = false;
+        d->spooled       = false;
     }
 
     // urls
     d->urlList.clear();
     nl = childElementsByTagNameNS(root, "jabber:x:oob", "x");
-    for(n = 0; n < nl.count(); ++n) {
+    for (n = 0; n < nl.count(); ++n) {
         QDomElement t = nl.item(n).toElement();
-        Url u;
+        Url         u;
         u.setUrl(t.elementsByTagName("url").item(0).toElement().text());
         u.setDesc(t.elementsByTagName("desc").item(0).toElement().text());
         d->urlList += u;
@@ -2164,12 +2232,11 @@ bool Message::fromStanza(const Stanza &s, bool useTimeZoneOffset, int timeZoneOf
     nl = childElementsByTagNameNS(root, "jabber:x:event", "x");
     if (nl.count()) {
         nl = nl.item(0).childNodes();
-        for(n = 0; n < nl.count(); ++n) {
+        for (n = 0; n < nl.count(); ++n) {
             QString evtag = nl.item(n).toElement().tagName();
             if (evtag == "id") {
-                d->eventId =  nl.item(n).toElement().text();
-            }
-            else if (evtag == "displayed")
+                d->eventId = nl.item(n).toElement().text();
+            } else if (evtag == "displayed")
                 d->eventList += DisplayedEvent;
             else if (evtag == "composing")
                 d->eventList += ComposingEvent;
@@ -2182,32 +2249,32 @@ bool Message::fromStanza(const Stanza &s, bool useTimeZoneOffset, int timeZoneOf
 
     // Chat states
     QString chatStateNS = "http://jabber.org/protocol/chatstates";
-    t = childElementsByTagNameNS(root, chatStateNS, "active").item(0).toElement();
-    if(!t.isNull())
+    t                   = childElementsByTagNameNS(root, chatStateNS, "active").item(0).toElement();
+    if (!t.isNull())
         d->chatState = StateActive;
     t = childElementsByTagNameNS(root, chatStateNS, "composing").item(0).toElement();
-    if(!t.isNull())
+    if (!t.isNull())
         d->chatState = StateComposing;
     t = childElementsByTagNameNS(root, chatStateNS, "paused").item(0).toElement();
-    if(!t.isNull())
+    if (!t.isNull())
         d->chatState = StatePaused;
     t = childElementsByTagNameNS(root, chatStateNS, "inactive").item(0).toElement();
-    if(!t.isNull())
+    if (!t.isNull())
         d->chatState = StateInactive;
     t = childElementsByTagNameNS(root, chatStateNS, "gone").item(0).toElement();
-    if(!t.isNull())
+    if (!t.isNull())
         d->chatState = StateGone;
 
     // message receipts
     QString messageReceiptNS = "urn:xmpp:receipts";
-    t = childElementsByTagNameNS(root, messageReceiptNS, "request").item(0).toElement();
-    if(!t.isNull()) {
+    t                        = childElementsByTagNameNS(root, messageReceiptNS, "request").item(0).toElement();
+    if (!t.isNull()) {
         d->messageReceipt = ReceiptRequest;
         d->messageReceiptId.clear();
     }
     t = childElementsByTagNameNS(root, messageReceiptNS, "received").item(0).toElement();
-    if(!t.isNull()) {
-        d->messageReceipt = ReceiptReceived;
+    if (!t.isNull()) {
+        d->messageReceipt   = ReceiptReceived;
         d->messageReceiptId = t.attribute("id");
         if (d->messageReceiptId.isEmpty())
             d->messageReceiptId = id();
@@ -2215,14 +2282,14 @@ bool Message::fromStanza(const Stanza &s, bool useTimeZoneOffset, int timeZoneOf
 
     // xsigned
     t = childElementsByTagNameNS(root, "jabber:x:signed", "x").item(0).toElement();
-    if(!t.isNull())
+    if (!t.isNull())
         d->xsigned = t.text();
     else
         d->xsigned = QString();
 
     // xencrypted
     t = childElementsByTagNameNS(root, "jabber:x:encrypted", "x").item(0).toElement();
-    if(!t.isNull())
+    if (!t.isNull())
         d->xencrypted = t.text();
     else
         d->xencrypted = QString();
@@ -2232,8 +2299,8 @@ bool Message::fromStanza(const Stanza &s, bool useTimeZoneOffset, int timeZoneOf
     nl = childElementsByTagNameNS(root, "http://jabber.org/protocol/address", "addresses");
     if (nl.count()) {
         QDomElement t = nl.item(0).toElement();
-        nl = t.elementsByTagName("address");
-        for(n = 0; n < nl.count(); ++n) {
+        nl            = t.elementsByTagName("address");
+        for (n = 0; n < nl.count(); ++n) {
             d->addressList += Address(nl.item(n).toElement());
         }
     }
@@ -2243,8 +2310,8 @@ bool Message::fromStanza(const Stanza &s, bool useTimeZoneOffset, int timeZoneOf
     nl = childElementsByTagNameNS(root, "http://jabber.org/protocol/rosterx", "x");
     if (nl.count()) {
         QDomElement t = nl.item(0).toElement();
-        nl = t.elementsByTagName("item");
-        for(n = 0; n < nl.count(); ++n) {
+        nl            = t.elementsByTagName("item");
+        for (n = 0; n < nl.count(); ++n) {
             RosterExchangeItem it = RosterExchangeItem(nl.item(n).toElement());
             if (!it.isNull())
                 d->rosterExchangeItems += it;
@@ -2253,44 +2320,41 @@ bool Message::fromStanza(const Stanza &s, bool useTimeZoneOffset, int timeZoneOf
 
     // invite
     t = childElementsByTagNameNS(root, "jabber:x:conference", "x").item(0).toElement();
-    if(!t.isNull())
+    if (!t.isNull())
         d->invite = t.attribute("jid");
     else
         d->invite = QString();
 
     // nick
     t = childElementsByTagNameNS(root, "http://jabber.org/protocol/nick", "nick").item(0).toElement();
-    if(!t.isNull())
+    if (!t.isNull())
         d->nick = t.text();
     else
         d->nick = QString();
 
     // sxe
     t = childElementsByTagNameNS(root, "http://jabber.org/protocol/sxe", "sxe").item(0).toElement();
-    if(!t.isNull())
+    if (!t.isNull())
         d->sxe = t;
     else
         d->sxe = QDomElement();
 
     t = childElementsByTagNameNS(root, "http://jabber.org/protocol/muc#user", "x").item(0).toElement();
-    if(!t.isNull()) {
+    if (!t.isNull()) {
         d->hasMUCUser = true;
-        for(QDomNode muc_n = t.firstChild(); !muc_n.isNull(); muc_n = muc_n.nextSibling()) {
+        for (QDomNode muc_n = t.firstChild(); !muc_n.isNull(); muc_n = muc_n.nextSibling()) {
             QDomElement muc_e = muc_n.toElement();
-            if(muc_e.isNull())
+            if (muc_e.isNull())
                 continue;
             if (muc_e.tagName() == "status") {
                 addMUCStatus(muc_e.attribute("code").toInt());
-            }
-            else if (muc_e.tagName() == "invite") {
+            } else if (muc_e.tagName() == "invite") {
                 MUCInvite inv(muc_e);
                 if (!inv.isNull())
                     addMUCInvite(inv);
-            }
-            else if (muc_e.tagName() == "decline") {
+            } else if (muc_e.tagName() == "decline") {
                 setMUCDecline(MUCDecline(muc_e));
-            }
-            else if (muc_e.tagName() == "password") {
+            } else if (muc_e.tagName() == "password") {
                 setMUCPassword(muc_e.text());
             }
         }
@@ -2298,15 +2362,16 @@ bool Message::fromStanza(const Stanza &s, bool useTimeZoneOffset, int timeZoneOf
 
     // http auth
     t = childElementsByTagNameNS(root, "http://jabber.org/protocol/http-auth", "confirm").item(0).toElement();
-    if(!t.isNull()){
+    if (!t.isNull()) {
         d->httpAuthRequest = HttpAuthRequest(t);
-    }
-    else {
+    } else {
         d->httpAuthRequest = HttpAuthRequest();
     }
 
     QDomElement captcha = childElementsByTagNameNS(root, "urn:xmpp:captcha",
-                                                   "captcha").item(0).toElement();
+                                                   "captcha")
+                              .item(0)
+                              .toElement();
     QDomElement xdataRoot = root;
     if (!captcha.isNull()) {
         xdataRoot = captcha;
@@ -2347,14 +2412,16 @@ Stanza::Error HttpAuthRequest::denyError(Stanza::Error::Auth, Stanza::Error::Not
 /*!
     Constructs request of resource URL \a u, made by method \a m, with transaction id \a i.
 */
-HttpAuthRequest::HttpAuthRequest(const QString &m, const QString &u, const QString &i) : method_(m), url_(u), id_(i), hasId_(true)
+HttpAuthRequest::HttpAuthRequest(const QString &m, const QString &u, const QString &i) :
+    method_(m), url_(u), id_(i), hasId_(true)
 {
 }
 
 /*!
         Constructs request of resource URL \a u, made by method \a m, without transaction id.
 */
-HttpAuthRequest::HttpAuthRequest(const QString &m, const QString &u) : method_(m), url_(u), hasId_(false)
+HttpAuthRequest::HttpAuthRequest(const QString &m, const QString &u) :
+    method_(m), url_(u), hasId_(false)
 {
 }
 
@@ -2377,7 +2444,7 @@ bool HttpAuthRequest::isEmpty() const
 /*!
     Sets request method.
 */
-void HttpAuthRequest::setMethod(const QString& m)
+void HttpAuthRequest::setMethod(const QString &m)
 {
     method_ = m;
 }
@@ -2385,7 +2452,7 @@ void HttpAuthRequest::setMethod(const QString& m)
 /*!
     Sets requested URL.
 */
-void HttpAuthRequest::setUrl(const QString& u)
+void HttpAuthRequest::setUrl(const QString &u)
 {
     url_ = u;
 }
@@ -2393,9 +2460,9 @@ void HttpAuthRequest::setUrl(const QString& u)
 /*!
     Sets transaction identifier.
 */
-void HttpAuthRequest::setId(const QString& i)
+void HttpAuthRequest::setId(const QString &i)
 {
-    id_ = i;
+    id_    = i;
     hasId_ = true;
 }
 
@@ -2439,12 +2506,12 @@ bool HttpAuthRequest::hasId() const
 QDomElement HttpAuthRequest::toXml(QDomDocument &doc) const
 {
     QDomElement e;
-    if(isEmpty())
+    if (isEmpty())
         return e;
 
     e = doc.createElementNS("http://jabber.org/protocol/http-auth", "confirm");
 
-    if(hasId_)
+    if (hasId_)
         e.setAttribute("id", id_);
     e.setAttribute("method", method_);
     e.setAttribute("url", url_);
@@ -2457,15 +2524,15 @@ QDomElement HttpAuthRequest::toXml(QDomDocument &doc) const
 */
 bool HttpAuthRequest::fromXml(const QDomElement &e)
 {
-    if(e.tagName() != "confirm")
+    if (e.tagName() != "confirm")
         return false;
 
     hasId_ = e.hasAttribute("id");
-    if(hasId_)
+    if (hasId_)
         id_ = e.attribute("id");
 
     method_ = e.attribute("method");
-    url_ = e.attribute("url");
+    url_    = e.attribute("url");
 
     return true;
 }
@@ -2485,7 +2552,7 @@ int Subscription::type() const
 
 QString Subscription::toString() const
 {
-    switch(value) {
+    switch (value) {
     case Remove:
         return "remove";
     case Both:
@@ -2502,15 +2569,15 @@ QString Subscription::toString() const
 
 bool Subscription::fromString(const QString &s)
 {
-    if(s == QLatin1String("remove"))
+    if (s == QLatin1String("remove"))
         value = Remove;
-    else if(s == QLatin1String("both"))
+    else if (s == QLatin1String("both"))
         value = Both;
-    else if(s == QLatin1String("from"))
+    else if (s == QLatin1String("from"))
         value = From;
-    else if(s == QLatin1String("to"))
+    else if (s == QLatin1String("to"))
         value = To;
-    else if(s.isEmpty() || s == QLatin1String("none"))
+    else if (s.isEmpty() || s == QLatin1String("none"))
         value = None;
     else
         return false;
@@ -2535,17 +2602,17 @@ CapsSpec::CapsSpec() :
  * @param ven the version
  * @param ext the list of extensions (separated by spaces)
  */
-CapsSpec::CapsSpec(const QString& node, QCryptographicHash::Algorithm hashAlgo, const QString& ver)
-    : node_(node)
-    , ver_(ver)
-    , hashAlgo_(hashAlgo)
-{}
+CapsSpec::CapsSpec(const QString &node, QCryptographicHash::Algorithm hashAlgo, const QString &ver) :
+    node_(node), ver_(ver), hashAlgo_(hashAlgo)
+{
+}
 
 CapsSpec::CapsSpec(const DiscoItem &disco, QCryptographicHash::Algorithm hashAlgo) :
     node_(disco.node().section('#', 0, 0)),
     ver_(disco.capsHash(hashAlgo)),
     hashAlgo_(hashAlgo)
-{}
+{
+}
 
 /**
  * @brief Checks for validity
@@ -2559,7 +2626,7 @@ bool CapsSpec::isValid() const
 /**
  * \brief Returns the node of the capabilities specification.
  */
-const QString& CapsSpec::node() const
+const QString &CapsSpec::node() const
 {
     return node_;
 }
@@ -2567,7 +2634,7 @@ const QString& CapsSpec::node() const
 /**
  * \brief Returns the version of the capabilities specification.
  */
-const QString& CapsSpec::version() const
+const QString &CapsSpec::version() const
 {
     return ver_;
 }
@@ -2579,25 +2646,25 @@ QCryptographicHash::Algorithm CapsSpec::hashAlgorithm() const
 
 QDomElement CapsSpec::toXml(QDomDocument *doc) const
 {
-    QDomElement c = doc->createElementNS(NS_CAPS, "c");
-    QString algo = cryptoMap().key(hashAlgo_);
-    c.setAttribute("hash",algo);
-    c.setAttribute("node",node_);
-    c.setAttribute("ver",ver_);
+    QDomElement c    = doc->createElementNS(NS_CAPS, "c");
+    QString     algo = cryptoMap().key(hashAlgo_);
+    c.setAttribute("hash", algo);
+    c.setAttribute("node", node_);
+    c.setAttribute("ver", ver_);
     return c;
 }
 
 CapsSpec CapsSpec::fromXml(const QDomElement &e)
 {
-    QString node = e.attribute("node");
-    QString ver = e.attribute("ver");
-    QString hashAlgo = e.attribute("hash");
-    QString ext = e.attribute("ext"); // deprecated. let it be here till 2018
-    CryptoMap &cm = cryptoMap();
-    CapsSpec cs;
+    QString    node     = e.attribute("node");
+    QString    ver      = e.attribute("ver");
+    QString    hashAlgo = e.attribute("hash");
+    QString    ext      = e.attribute("ext"); // deprecated. let it be here till 2018
+    CryptoMap &cm       = cryptoMap();
+    CapsSpec   cs;
     if (!node.isEmpty() && !ver.isEmpty()) {
         QCryptographicHash::Algorithm algo = CapsSpec::invalidAlgo;
-        CryptoMap::ConstIterator it;
+        CryptoMap::ConstIterator      it;
         if (!hashAlgo.isEmpty() && (it = cm.constFind(hashAlgo)) != cm.constEnd()) {
             algo = it.value();
         }
@@ -2613,8 +2680,8 @@ CapsSpec::CryptoMap &CapsSpec::cryptoMap()
 {
     static CryptoMap cm;
     if (cm.isEmpty()) {
-        cm.insert("md5",     QCryptographicHash::Md5);
-        cm.insert("sha-1",   QCryptographicHash::Sha1);
+        cm.insert("md5", QCryptographicHash::Md5);
+        cm.insert("sha-1", QCryptographicHash::Sha1);
         cm.insert("sha-224", QCryptographicHash::Sha224);
         cm.insert("sha-256", QCryptographicHash::Sha256);
         cm.insert("sha-384", QCryptographicHash::Sha384);
@@ -2647,75 +2714,72 @@ void CapsSpec::resetVersion()
     ver_.clear();
 }
 
-bool CapsSpec::operator==(const CapsSpec& s) const
+bool CapsSpec::operator==(const CapsSpec &s) const
 {
     return (node() == s.node() && version() == s.version() && hashAlgorithm() == s.hashAlgorithm());
 }
 
-bool CapsSpec::operator!=(const CapsSpec& s) const
+bool CapsSpec::operator!=(const CapsSpec &s) const
 {
     return !((*this) == s);
 }
 
-bool CapsSpec::operator<(const CapsSpec& s) const
+bool CapsSpec::operator<(const CapsSpec &s) const
 {
-    return (node() != s.node() ? node() < s.node() :
-                                 (version() != s.version() ? version() < s.version() :
-                                                             hashAlgorithm() < s.hashAlgorithm()));
+    return (node() != s.node() ? node() < s.node() : (version() != s.version() ? version() < s.version() : hashAlgorithm() < s.hashAlgorithm()));
 }
 
-class StatusPrivate : public QSharedData
-{
+class StatusPrivate : public QSharedData {
 public:
     StatusPrivate() = default;
 
-    int priority = 0;
-    QString show, status, key;
-    QDateTime timeStamp;
-    bool isAvailable = false;
-    bool isInvisible = false;
-    QString photoHash;
-    bool hasPhotoHash = false;
+    int        priority = 0;
+    QString    show, status, key;
+    QDateTime  timeStamp;
+    bool       isAvailable = false;
+    bool       isInvisible = false;
+    QByteArray photoHash;
+    bool       hasPhotoHash = false;
 
     QString xsigned;
     // gabber song extension
-    QString songTitle;
-    CapsSpec caps;
+    QString        songTitle;
+    CapsSpec       caps;
     QList<BoBData> bobDataList;
 
     // MUC
-    bool isMUC = false;
-    bool hasMUCItem = false;
-    bool hasMUCDestroy = false;
-    MUCItem mucItem;
+    bool       isMUC         = false;
+    bool       hasMUCItem    = false;
+    bool       hasMUCDestroy = false;
+    MUCItem    mucItem;
     MUCDestroy mucDestroy;
     QList<int> mucStatuses;
-    QString mucPassword;
-    int mucHistoryMaxChars = -1;
-    int mucHistoryMaxStanzas = -1;
-    int mucHistorySeconds = -1;
-    QDateTime mucHistorySince;
+    QString    mucPassword;
+    int        mucHistoryMaxChars   = -1;
+    int        mucHistoryMaxStanzas = -1;
+    int        mucHistorySeconds    = -1;
+    QDateTime  mucHistorySince;
 
-    int ecode = -1;
+    int     ecode = -1;
     QString estr;
 };
 
-Status::Status(const QString &show, const QString &status, int priority, bool available)
-    : d(new StatusPrivate)
+Status::Status(const QString &show, const QString &status, int priority, bool available) :
+    d(new StatusPrivate)
 {
     d->isAvailable = available;
-    d->show = show;
-    d->status = status;
-    d->priority = priority;
-    d->timeStamp = QDateTime::currentDateTime();
+    d->show        = show;
+    d->status      = status;
+    d->priority    = priority;
+    d->timeStamp   = QDateTime::currentDateTime();
     d->isInvisible = false;
 }
 
-Status::Status(Type type, const QString& status, int priority)
-    : d(new StatusPrivate)
+Status::Status(Type type, const QString &status, int priority) :
+    d(new StatusPrivate)
 {
-    d->status = status;
-    d->priority = priority;
+    d->status    = status;
+    d->priority  = priority;
     d->timeStamp = QDateTime::currentDateTime();
     setType(type);
 }
@@ -2743,7 +2807,7 @@ bool Status::hasError() const
 void Status::setError(int code, const QString &str)
 {
     d->ecode = code;
-    d->estr = str;
+    d->estr  = str;
 }
 
 void Status::setIsAvailable(bool available)
@@ -2763,24 +2827,37 @@ void Status::setPriority(int x)
 
 void Status::setType(Status::Type _type)
 {
-    bool available = true;
-    bool invisible = false;
+    bool    available = true;
+    bool    invisible = false;
     QString show;
-    switch(_type) {
-    case Away:    show = "away"; break;
-    case FFC:     show = "chat"; break;
-    case XA:      show = "xa"; break;
-    case DND:     show = "dnd"; break;
-    case Offline: available = false; break;
-    case Invisible: invisible = true; break;
-    default: break;
+    switch (_type) {
+    case Away:
+        show = "away";
+        break;
+    case FFC:
+        show = "chat";
+        break;
+    case XA:
+        show = "xa";
+        break;
+    case DND:
+        show = "dnd";
+        break;
+    case Offline:
+        available = false;
+        break;
+    case Invisible:
+        invisible = true;
+        break;
+    default:
+        break;
     }
     setShow(show);
     setIsAvailable(available);
     setIsInvisible(invisible);
 }
 
-Status::Type Status::txt2type(const QString& stat)
+Status::Type Status::txt2type(const QString &stat)
 {
     if (stat == "offline")
         return XMPP::Status::Offline;
@@ -2805,17 +2882,17 @@ void Status::setType(const QString &stat)
     setType(txt2type(stat));
 }
 
-void Status::setShow(const QString & _show)
+void Status::setShow(const QString &_show)
 {
     d->show = _show;
 }
 
-void Status::setStatus(const QString & _status)
+void Status::setStatus(const QString &_status)
 {
     d->status = _status;
 }
 
-void Status::setTimeStamp(const QDateTime & _timestamp)
+void Status::setTimeStamp(const QDateTime &_timestamp)
 {
     d->timeStamp = _timestamp;
 }
@@ -2830,12 +2907,12 @@ void Status::setXSigned(const QString &s)
     d->xsigned = s;
 }
 
-void Status::setSongTitle(const QString & _songtitle)
+void Status::setSongTitle(const QString &_songtitle)
 {
     d->songTitle = _songtitle;
 }
 
-void Status::setCaps(const CapsSpec & caps)
+void Status::setCaps(const CapsSpec &caps)
 {
     d->caps = caps;
 }
@@ -2845,34 +2922,34 @@ void Status::setMUC()
     d->isMUC = true;
 }
 
-void Status::setMUCItem(const MUCItem& i)
+void Status::setMUCItem(const MUCItem &i)
 {
     d->hasMUCItem = true;
-    d->mucItem = i;
+    d->mucItem    = i;
 }
 
-void Status::setMUCDestroy(const MUCDestroy& i)
+void Status::setMUCDestroy(const MUCDestroy &i)
 {
     d->hasMUCDestroy = true;
-    d->mucDestroy = i;
+    d->mucDestroy    = i;
 }
 
 void Status::setMUCHistory(int maxchars, int maxstanzas, int seconds, const QDateTime &since)
 {
-    d->mucHistoryMaxChars = maxchars;
+    d->mucHistoryMaxChars   = maxchars;
     d->mucHistoryMaxStanzas = maxstanzas;
-    d->mucHistorySeconds = seconds;
-    d->mucHistorySince = since;
+    d->mucHistorySeconds    = seconds;
+    d->mucHistorySince      = since;
 }
 
-const QString& Status::photoHash() const
+const QByteArray &Status::photoHash() const
 {
     return d->photoHash;
 }
 
-void Status::setPhotoHash(const QString& h)
+void Status::setPhotoHash(const QByteArray &h)
 {
-    d->photoHash = h;
+    d->photoHash    = h;
     d->hasPhotoHash = true;
 }
 
@@ -2916,11 +2993,9 @@ Status::Type Status::type() const
     Status::Type type = Status::Online;
     if (!isAvailable()) {
         type = Status::Offline;
-    }
-    else if (isInvisible()) {
+    } else if (isInvisible()) {
         type = Status::Invisible;
-    }
-    else {
+    } else {
         QString s = show();
         if (s == "away")
             type = Status::Away;
@@ -2937,24 +3012,39 @@ Status::Type Status::type() const
 QString Status::typeString() const
 {
     QString stat;
-    switch(type()) {
-    case XMPP::Status::Offline: stat = "offline"; break;
-    case XMPP::Status::Online: stat = "online"; break;
-    case XMPP::Status::Away: stat = "away"; break;
-    case XMPP::Status::XA: stat = "xa"; break;
-    case XMPP::Status::DND: stat = "dnd"; break;
-    case XMPP::Status::Invisible: stat = "invisible"; break;
-    case XMPP::Status::FFC: stat = "chat"; break;
-    default: stat = "away";
+    switch (type()) {
+    case XMPP::Status::Offline:
+        stat = "offline";
+        break;
+    case XMPP::Status::Online:
+        stat = "online";
+        break;
+    case XMPP::Status::Away:
+        stat = "away";
+        break;
+    case XMPP::Status::XA:
+        stat = "xa";
+        break;
+    case XMPP::Status::DND:
+        stat = "dnd";
+        break;
+    case XMPP::Status::Invisible:
+        stat = "invisible";
+        break;
+    case XMPP::Status::FFC:
+        stat = "chat";
+        break;
+    default:
+        stat = "away";
     }
     return stat;
 }
 
-const QString & Status::show() const
+const QString &Status::show() const
 {
     return d->show;
 }
-const QString & Status::status() const
+const QString &Status::status() const
 {
     return d->status;
 }
@@ -2964,22 +3054,22 @@ QDateTime Status::timeStamp() const
     return d->timeStamp;
 }
 
-const QString & Status::keyID() const
+const QString &Status::keyID() const
 {
     return d->key;
 }
 
-const QString & Status::xsigned() const
+const QString &Status::xsigned() const
 {
     return d->xsigned;
 }
 
-const QString & Status::songTitle() const
+const QString &Status::songTitle() const
 {
     return d->songTitle;
 }
 
-const CapsSpec & Status::caps() const
+const CapsSpec &Status::caps() const
 {
     return d->caps;
 }
@@ -2994,7 +3084,7 @@ bool Status::hasMUCItem() const
     return d->hasMUCItem;
 }
 
-const MUCItem& Status::mucItem() const
+const MUCItem &Status::mucItem() const
 {
     return d->mucItem;
 }
@@ -3004,12 +3094,12 @@ bool Status::hasMUCDestroy() const
     return d->hasMUCDestroy;
 }
 
-const MUCDestroy& Status::mucDestroy() const
+const MUCDestroy &Status::mucDestroy() const
 {
     return d->mucDestroy;
 }
 
-const QList<int>& Status::getMUCStatuses() const
+const QList<int> &Status::getMUCStatuses() const
 {
     return d->mucStatuses;
 }
@@ -3019,7 +3109,7 @@ void Status::addMUCStatus(int i)
     d->mucStatuses += i;
 }
 
-const QString& Status::mucPassword() const
+const QString &Status::mucPassword() const
 {
     return d->mucPassword;
 }
@@ -3044,12 +3134,12 @@ int Status::mucHistorySeconds() const
     return d->mucHistorySeconds;
 }
 
-const QDateTime & Status::mucHistorySince() const
+const QDateTime &Status::mucHistorySince() const
 {
     return d->mucHistorySince;
 }
 
-void Status::setMUCPassword(const QString& i)
+void Status::setMUCPassword(const QString &i)
 {
     d->mucPassword = i;
 }
@@ -3059,7 +3149,7 @@ int Status::errorCode() const
     return d->ecode;
 }
 
-const QString & Status::errorString() const
+const QString &Status::errorString() const
 {
     return d->estr;
 }
@@ -3067,13 +3157,12 @@ const QString & Status::errorString() const
 //---------------------------------------------------------------------------
 // Resource
 //---------------------------------------------------------------------------
-Resource::Resource(const QString &name, const Status &stat)
-    : v_name(name)
-    , v_status(stat)
+Resource::Resource(const QString &name, const Status &stat) :
+    v_name(name), v_status(stat)
 {
 }
 
-const QString & Resource::name() const
+const QString &Resource::name() const
 {
     return v_name;
 }
@@ -3083,17 +3172,17 @@ int Resource::priority() const
     return v_status.priority();
 }
 
-const Status & Resource::status() const
+const Status &Resource::status() const
 {
     return v_status;
 }
 
-void Resource::setName(const QString & _name)
+void Resource::setName(const QString &_name)
 {
     v_name = _name;
 }
 
-void Resource::setStatus(const Status & _status)
+void Resource::setStatus(const Status &_status)
 {
     v_status = _status;
 }
@@ -3101,8 +3190,8 @@ void Resource::setStatus(const Status & _status)
 //---------------------------------------------------------------------------
 // ResourceList
 //---------------------------------------------------------------------------
-ResourceList::ResourceList()
-    :QList<Resource>()
+ResourceList::ResourceList() :
+    QList<Resource>()
 {
 }
 
@@ -3110,10 +3199,10 @@ ResourceList::~ResourceList()
 {
 }
 
-ResourceList::Iterator ResourceList::find(const QString & _find)
+ResourceList::Iterator ResourceList::find(const QString &_find)
 {
-    for(ResourceList::Iterator it = begin(); it != end(); ++it) {
-        if((*it).name() == _find)
+    for (ResourceList::Iterator it = begin(); it != end(); ++it) {
+        if ((*it).name() == _find)
             return it;
     }
 
@@ -3124,18 +3213,18 @@ ResourceList::Iterator ResourceList::priority()
 {
     ResourceList::Iterator highest = end();
 
-    for(ResourceList::Iterator it = begin(); it != end(); ++it) {
-        if(highest == end() || (*it).priority() > (*highest).priority())
+    for (ResourceList::Iterator it = begin(); it != end(); ++it) {
+        if (highest == end() || (*it).priority() > (*highest).priority())
             highest = it;
     }
 
     return highest;
 }
 
-ResourceList::ConstIterator ResourceList::find(const QString & _find) const
+ResourceList::ConstIterator ResourceList::find(const QString &_find) const
 {
-    for(ResourceList::ConstIterator it = begin(); it != end(); ++it) {
-        if((*it).name() == _find)
+    for (ResourceList::ConstIterator it = begin(); it != end(); ++it) {
+        if ((*it).name() == _find)
             return it;
     }
 
@@ -3146,8 +3235,8 @@ ResourceList::ConstIterator ResourceList::priority() const
 {
     ResourceList::ConstIterator highest = end();
 
-    for(ResourceList::ConstIterator it = begin(); it != end(); ++it) {
-        if(highest == end() || (*it).priority() > (*highest).priority())
+    for (ResourceList::ConstIterator it = begin(); it != end(); ++it) {
+        if (highest == end() || (*it).priority() > (*highest).priority())
             highest = it;
     }
 
@@ -3177,27 +3266,27 @@ RosterItem::~RosterItem()
 {
 }
 
-const Jid & RosterItem::jid() const
+const Jid &RosterItem::jid() const
 {
     return v_jid;
 }
 
-const QString & RosterItem::name() const
+const QString &RosterItem::name() const
 {
     return v_name;
 }
 
-const QStringList & RosterItem::groups() const
+const QStringList &RosterItem::groups() const
 {
     return v_groups;
 }
 
-const Subscription & RosterItem::subscription() const
+const Subscription &RosterItem::subscription() const
 {
     return v_subscription;
 }
 
-const QString & RosterItem::ask() const
+const QString &RosterItem::ask() const
 {
     return v_ask;
 }
@@ -3209,8 +3298,8 @@ bool RosterItem::isPush() const
 
 bool RosterItem::inGroup(const QString &g) const
 {
-    for(QStringList::ConstIterator it = v_groups.begin(); it != v_groups.end(); ++it) {
-        if(*it == g)
+    for (QStringList::ConstIterator it = v_groups.begin(); it != v_groups.end(); ++it) {
+        if (*it == g)
             return true;
     }
     return false;
@@ -3248,7 +3337,7 @@ void RosterItem::setIsPush(bool b)
 
 bool RosterItem::addGroup(const QString &g)
 {
-    if(inGroup(g))
+    if (inGroup(g))
         return false;
 
     v_groups += g;
@@ -3257,8 +3346,8 @@ bool RosterItem::addGroup(const QString &g)
 
 bool RosterItem::removeGroup(const QString &g)
 {
-    for(QStringList::Iterator it = v_groups.begin(); it != v_groups.end(); ++it) {
-        if(*it == g) {
+    for (QStringList::Iterator it = v_groups.begin(); it != v_groups.end(); ++it) {
+        if (*it == g) {
             v_groups.erase(it);
             return true;
         }
@@ -3273,9 +3362,9 @@ QDomElement RosterItem::toXml(QDomDocument *doc) const
     item.setAttribute("jid", v_jid.full());
     item.setAttribute("name", v_name);
     item.setAttribute("subscription", v_subscription.toString());
-    if(!v_ask.isEmpty())
+    if (!v_ask.isEmpty())
         item.setAttribute("ask", v_ask);
-    for(QStringList::ConstIterator it = v_groups.begin(); it != v_groups.end(); ++it)
+    for (QStringList::ConstIterator it = v_groups.begin(); it != v_groups.end(); ++it)
         item.appendChild(textTag(doc, "group", *it));
 
     return item;
@@ -3283,34 +3372,34 @@ QDomElement RosterItem::toXml(QDomDocument *doc) const
 
 bool RosterItem::fromXml(const QDomElement &item)
 {
-    if(item.tagName() != "item")
+    if (item.tagName() != "item")
         return false;
 
     Jid j(item.attribute("jid"));
-    if(!j.isValid())
+    if (!j.isValid())
         return false;
 
     QString na = item.attribute("name");
 
     Subscription s;
-    if(!s.fromString(item.attribute("subscription")) )
+    if (!s.fromString(item.attribute("subscription")))
         return false;
 
     QStringList g;
-    for(QDomNode n = item.firstChild(); !n.isNull(); n = n.nextSibling()) {
+    for (QDomNode n = item.firstChild(); !n.isNull(); n = n.nextSibling()) {
         QDomElement i = n.toElement();
-        if(i.isNull())
+        if (i.isNull())
             continue;
-        if(i.tagName() == "group")
+        if (i.tagName() == "group")
             g += tagContent(i);
     }
     QString a = item.attribute("ask");
 
-    v_jid = j;
-    v_name = na;
+    v_jid          = j;
+    v_name         = na;
     v_subscription = s;
-    v_groups = g;
-    v_ask = a;
+    v_groups       = g;
+    v_ask          = a;
 
     return true;
 }
@@ -3318,8 +3407,8 @@ bool RosterItem::fromXml(const QDomElement &item)
 //---------------------------------------------------------------------------
 // Roster
 //---------------------------------------------------------------------------
-Roster::Roster()
-    : QList<RosterItem>()
+Roster::Roster() :
+    QList<RosterItem>()
 {
 }
 
@@ -3329,8 +3418,8 @@ Roster::~Roster()
 
 Roster::Iterator Roster::find(const Jid &j)
 {
-    for(Roster::Iterator it = begin(); it != end(); ++it) {
-        if((*it).jid().compare(j))
+    for (Roster::Iterator it = begin(); it != end(); ++it) {
+        if ((*it).jid().compare(j))
             return it;
     }
 
@@ -3339,8 +3428,8 @@ Roster::Iterator Roster::find(const Jid &j)
 
 Roster::ConstIterator Roster::find(const Jid &j) const
 {
-    for(Roster::ConstIterator it = begin(); it != end(); ++it) {
-        if((*it).jid().compare(j))
+    for (Roster::ConstIterator it = begin(); it != end(); ++it) {
+        if ((*it).jid().compare(j))
             return it;
     }
 
@@ -3353,9 +3442,9 @@ Roster::ConstIterator Roster::find(const Jid &j) const
 FormField::FormField(const QString &type, const QString &value)
 {
     v_type = misc;
-    if(!type.isEmpty()) {
+    if (!type.isEmpty()) {
         int x = tagNameToType(type);
-        if(x != -1)
+        if (x != -1)
             v_type = x;
     }
     v_value = value;
@@ -3377,23 +3466,39 @@ QString FormField::realName() const
 
 QString FormField::fieldName() const
 {
-    switch(v_type) {
-    case username:  return QObject::tr("Username");
-    case nick:      return QObject::tr("Nickname");
-    case password:  return QObject::tr("Password");
-    case name:      return QObject::tr("Name");
-    case first:     return QObject::tr("First Name");
-    case last:      return QObject::tr("Last Name");
-    case email:     return QObject::tr("E-mail");
-    case address:   return QObject::tr("Address");
-    case city:      return QObject::tr("City");
-    case state:     return QObject::tr("State");
-    case zip:       return QObject::tr("Zipcode");
-    case phone:     return QObject::tr("Phone");
-    case url:       return QObject::tr("URL");
-    case date:      return QObject::tr("Date");
-    case misc:      return QObject::tr("Misc");
-    default:        return "";
+    switch (v_type) {
+    case username:
+        return QObject::tr("Username");
+    case nick:
+        return QObject::tr("Nickname");
+    case password:
+        return QObject::tr("Password");
+    case name:
+        return QObject::tr("Name");
+    case first:
+        return QObject::tr("First Name");
+    case last:
+        return QObject::tr("Last Name");
+    case email:
+        return QObject::tr("E-mail");
+    case address:
+        return QObject::tr("Address");
+    case city:
+        return QObject::tr("City");
+    case state:
+        return QObject::tr("State");
+    case zip:
+        return QObject::tr("Zipcode");
+    case phone:
+        return QObject::tr("Phone");
+    case url:
+        return QObject::tr("URL");
+    case date:
+        return QObject::tr("Date");
+    case misc:
+        return QObject::tr("Misc");
+    default:
+        return "";
     };
 }
 
@@ -3402,7 +3507,7 @@ bool FormField::isSecret() const
     return (type() == password);
 }
 
-const QString & FormField::value() const
+const QString &FormField::value() const
 {
     return v_value;
 }
@@ -3415,7 +3520,7 @@ void FormField::setType(int x)
 bool FormField::setType(const QString &in)
 {
     int x = tagNameToType(in);
-    if(x == -1)
+    if (x == -1)
         return false;
 
     v_type = x;
@@ -3429,51 +3534,83 @@ void FormField::setValue(const QString &in)
 
 int FormField::tagNameToType(const QString &in) const
 {
-    if(!in.compare("username")) return username;
-    if(!in.compare("nick"))     return nick;
-    if(!in.compare("password")) return password;
-    if(!in.compare("name"))     return name;
-    if(!in.compare("first"))    return first;
-    if(!in.compare("last"))     return last;
-    if(!in.compare("email"))    return email;
-    if(!in.compare("address"))  return address;
-    if(!in.compare("city"))     return city;
-    if(!in.compare("state"))    return state;
-    if(!in.compare("zip"))      return zip;
-    if(!in.compare("phone"))    return phone;
-    if(!in.compare("url"))      return url;
-    if(!in.compare("date"))     return date;
-    if(!in.compare("misc"))     return misc;
+    if (!in.compare("username"))
+        return username;
+    if (!in.compare("nick"))
+        return nick;
+    if (!in.compare("password"))
+        return password;
+    if (!in.compare("name"))
+        return name;
+    if (!in.compare("first"))
+        return first;
+    if (!in.compare("last"))
+        return last;
+    if (!in.compare("email"))
+        return email;
+    if (!in.compare("address"))
+        return address;
+    if (!in.compare("city"))
+        return city;
+    if (!in.compare("state"))
+        return state;
+    if (!in.compare("zip"))
+        return zip;
+    if (!in.compare("phone"))
+        return phone;
+    if (!in.compare("url"))
+        return url;
+    if (!in.compare("date"))
+        return date;
+    if (!in.compare("misc"))
+        return misc;
 
     return -1;
 }
 
 QString FormField::typeToTagName(int type) const
 {
-    switch(type) {
-    case username:  return "username";
-    case nick:      return "nick";
-    case password:  return "password";
-    case name:      return "name";
-    case first:     return "first";
-    case last:      return "last";
-    case email:     return "email";
-    case address:   return "address";
-    case city:      return "city";
-    case state:     return "state";
-    case zip:       return "zipcode";
-    case phone:     return "phone";
-    case url:       return "url";
-    case date:      return "date";
-    case misc:      return "misc";
-    default:        return "";
+    switch (type) {
+    case username:
+        return "username";
+    case nick:
+        return "nick";
+    case password:
+        return "password";
+    case name:
+        return "name";
+    case first:
+        return "first";
+    case last:
+        return "last";
+    case email:
+        return "email";
+    case address:
+        return "address";
+    case city:
+        return "city";
+    case state:
+        return "state";
+    case zip:
+        return "zipcode";
+    case phone:
+        return "phone";
+    case url:
+        return "url";
+    case date:
+        return "date";
+    case misc:
+        return "misc";
+    default:
+        return "";
     };
 }
 
 //---------------------------------------------------------------------------
 // Form
 //---------------------------------------------------------------------------
-Form::Form(const Jid &j) : QList<FormField>()
+Form::Form(const Jid &j) :
+    QList<FormField>()
 {
     setJid(j);
 }
@@ -3524,27 +3661,27 @@ SearchResult::~SearchResult()
 {
 }
 
-const Jid & SearchResult::jid() const
+const Jid &SearchResult::jid() const
 {
     return v_jid;
 }
 
-const QString & SearchResult::nick() const
+const QString &SearchResult::nick() const
 {
     return v_nick;
 }
 
-const QString & SearchResult::first() const
+const QString &SearchResult::first() const
 {
     return v_first;
 }
 
-const QString & SearchResult::last() const
+const QString &SearchResult::last() const
 {
     return v_last;
 }
 
-const QString & SearchResult::email() const
+const QString &SearchResult::email() const
 {
     return v_email;
 }
@@ -3578,16 +3715,17 @@ PubSubItem::PubSubItem()
 {
 }
 
-PubSubItem::PubSubItem(const QString& id, const QDomElement& payload) : id_(id), payload_(payload)
+PubSubItem::PubSubItem(const QString &id, const QDomElement &payload) :
+    id_(id), payload_(payload)
 {
 }
 
-const QString& PubSubItem::id() const
+const QString &PubSubItem::id() const
 {
     return id_;
 }
 
-const QDomElement& PubSubItem::payload() const
+const QDomElement &PubSubItem::payload() const
 {
     return payload_;
 }
@@ -3596,11 +3734,12 @@ PubSubRetraction::PubSubRetraction()
 {
 }
 
-PubSubRetraction::PubSubRetraction(const QString& id) : id_(id)
+PubSubRetraction::PubSubRetraction(const QString &id) :
+    id_(id)
 {
 }
 
-const QString& PubSubRetraction::id() const
+const QString &PubSubRetraction::id() const
 {
     return id_;
 }
@@ -3608,28 +3747,29 @@ const QString& PubSubRetraction::id() const
 // =========================================
 //            CaptchaChallenge
 // =========================================
-class CaptchaChallengePrivate : public QSharedData
-{
+class CaptchaChallengePrivate : public QSharedData {
 public:
     CaptchaChallengePrivate() :
         state(CaptchaChallenge::New) {}
 
     CaptchaChallenge::State state;
-    Jid arbiter;
-    Jid offendedJid;
-    XData form;
-    QDateTime dt;
-    QString explanation;
-    UrlList urls;
+    Jid                     arbiter;
+    Jid                     offendedJid;
+    XData                   form;
+    QDateTime               dt;
+    QString                 explanation;
+    UrlList                 urls;
 };
 
 CaptchaChallenge::CaptchaChallenge() :
     d(new CaptchaChallengePrivate)
-{}
+{
+}
 
 CaptchaChallenge::CaptchaChallenge(const CaptchaChallenge &other) :
     d(other.d)
-{}
+{
+}
 
 CaptchaChallenge::CaptchaChallenge(const Message &m) :
     d(new CaptchaChallengePrivate)
@@ -3646,22 +3786,21 @@ CaptchaChallenge::CaptchaChallenge(const Message &m) :
     if (m.getForm().registrarType() != "urn:xmpp:captcha" || m.getForm().type() != XData::Data_Form)
         return;
 
-    if (m.id().isEmpty() || m.getForm().getField("challenge").value().value(0) !=m.id())
+    if (m.id().isEmpty() || m.getForm().getField("challenge").value().value(0) != m.id())
         return;
 
     if (m.getForm().getField("from").value().value(0).isEmpty())
         return;
 
-    d->form = m.getForm();
+    d->form        = m.getForm();
     d->explanation = m.body();
-    d->urls = m.urlList();
-    d->arbiter = m.from();
+    d->urls        = m.urlList();
+    d->arbiter     = m.from();
     d->offendedJid = Jid(m.getForm().getField("from").value().value(0));
 }
 
 CaptchaChallenge::~CaptchaChallenge()
 {
-
 }
 
 CaptchaChallenge &CaptchaChallenge::operator=(const CaptchaChallenge &from)
@@ -3699,9 +3838,7 @@ CaptchaChallenge::Result CaptchaChallenge::validateResponse(const XData &xd)
 
 bool CaptchaChallenge::isValid() const
 {
-    return d->dt.isValid() &&
-            d->dt.secsTo(QDateTime::currentDateTime()) < Timeout &&
-            d->form.fields().count() > 0;
+    return d->dt.isValid() && d->dt.secsTo(QDateTime::currentDateTime()) < Timeout && d->form.fields().count() > 0;
 }
 
 const Jid &CaptchaChallenge::offendedJid() const
@@ -3717,11 +3854,11 @@ const Jid &CaptchaChallenge::arbiter() const
 Thumbnail::Thumbnail(const QDomElement &el)
 {
     QString ns(QLatin1String(XMPP_THUMBS_NS));
-    if(el.namespaceURI() == ns) {
-        uri = QUrl(el.attribute("uri"), QUrl::StrictMode);
+    if (el.namespaceURI() == ns) {
+        uri      = QUrl(el.attribute("uri"), QUrl::StrictMode);
         mimeType = el.attribute("mime-type");
-        width = el.attribute("width").toUInt();
-        height = el.attribute("height").toUInt();
+        width    = el.attribute("width").toUInt();
+        height   = el.attribute("height").toUInt();
     }
 }
 
diff --git a/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp b/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp
index 688d2e94..9b6ee453 100644
--- a/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp
+++ b/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp
@@ -19,6 +19,7 @@
 #include "xmpp_bitsofbinary.h"
 
 #include "xmpp_client.h"
+#include "xmpp_hash.h"
 #include "xmpp_tasks.h"
 #include "xmpp_xmlcommon.h"
 
@@ -27,58 +28,75 @@
 
 using namespace XMPP;
 
-class BoBData::Private : public QSharedData
-{
+class BoBData::Private : public QSharedData {
 public:
-    QByteArray data;  // file data itself
-    QString type;     // mime type. e.g. image/png
-    QString cid;      // content identifier without "cid:"
+    QByteArray data; // file data itself
+    QString    type; // mime type. e.g. image/png
+    //QString cid;      // content identifier without "cid:"
+    Hash         hash;
     unsigned int maxAge; // seconds to live
 };
 
-BoBData::BoBData()
-    : d(new Private)
+BoBData::BoBData() :
+    d(new Private)
 {
-
 }
 
-BoBData::BoBData(const BoBData &other)
-    : d(other.d)
+BoBData::BoBData(const BoBData &other) :
+    d(other.d)
 {
-
 }
 
-BoBData::BoBData(const QDomElement &e)
-    : d(new Private)
+BoBData::BoBData(const QDomElement &e) :
+    d(new Private)
 {
     fromXml(e);
 }
 
 BoBData::~BoBData()
 {
-
 }
 
-BoBData & BoBData::operator=(const BoBData &other)
+BoBData &BoBData::operator=(const BoBData &other)
 {
-    if (this==&other) return *this; //Protect against self-assignment
+    if (this == &other)
+        return *this; //Protect against self-assignment
     d = other.d;
     return *this;
 }
 
 bool BoBData::isNull() const
 {
-    return d->cid.isEmpty() || d->data.isNull();
+    return !d->hash.isValid() || d->data.isNull();
+}
+
+Hash BoBData::cidToHash(const QString &cid)
+{
+    if (!cid.endsWith(QLatin1String("@bob.xmpp.org")))
+        return Hash();
+    return Hash::from(cid.leftRef(cid.size() - sizeof("@bob.xmpp.org") + 1));
 }
 
 QString BoBData::cid() const
 {
-    return d->cid;
+    if (!isNull())
+        return QString();
+    return QString("%1+%2@bob.xmpp.org").arg(d->hash.stringType(), QString::fromLatin1(d->hash.data().toHex()));
 }
 
 void BoBData::setCid(const QString &cid)
 {
-    d->cid = cid;
+    d->hash = cidToHash(cid);
+}
+
+const Hash &BoBData::hash() const
+{
+    return d->hash;
+}
+
+void BoBData::setHash(const Hash &hash)
+{
+    d->hash = hash;
 }
 
 QByteArray BoBData::data() const
@@ -113,17 +131,16 @@ void BoBData::setMaxAge(unsigned int maxAge)
 
 void BoBData::fromXml(const QDomElement &data)
 {
-    d->cid = data.attribute("cid");
+    setCid(data.attribute("cid"));
     d->maxAge = data.attribute("max-age").toInt();
-    d->type = data.attribute("type");
-    d->data = QCA::Base64().stringToArray(data.text().replace("\n",""))
-            .toByteArray();
+    d->type   = data.attribute("type");
+    d->data   = QCA::Base64().stringToArray(data.text().replace("\n", "")).toByteArray();
 }
 
 QDomElement BoBData::toXml(QDomDocument *doc) const
 {
     QDomElement data = doc->createElementNS("urn:xmpp:bob", "data");
-    data.setAttribute("cid", d->cid);
+    data.setAttribute("cid", cid());
     data.setAttribute("max-age", d->maxAge);
     data.setAttribute("type", d->type);
     data.appendChild(doc->createTextNode(QCA::Base64().arrayToString(d->data)));
@@ -133,18 +150,16 @@ QDomElement BoBData::toXml(QDomDocument *doc) const
 // ---------------------------------------------------------
 // BoBCache
 // ---------------------------------------------------------
-BoBCache::BoBCache(QObject *parent)
-    : QObject(parent)
+BoBCache::BoBCache(QObject *parent) :
+    QObject(parent)
 {
-
 }
 
 //------------------------------------------------------------------------------
 // BoBManager
 //------------------------------------------------------------------------------
-BoBManager::BoBManager(Client *client)
-    : QObject(client)
-    , _cache(nullptr)
+BoBManager::BoBManager(Client *client) :
+    QObject(client), _cache(nullptr)
 {
     new JT_BoBServer(client->rootTask());
 }
@@ -157,14 +172,18 @@ void BoBManager::setCache(BoBCache *cache)
 BoBData BoBManager::bobData(const QString &cid)
 {
     BoBData bd;
+    Hash    h = BoBData::cidToHash(cid);
     if (_cache) {
-        bd = _cache->get(cid);
+        bd = _cache->get(h);
     }
-    if (bd.isNull() && _localFiles.contains(cid)) {
-        QPair<QString, QString> fileData = _localFiles.value(cid);
-        QFile file(fileData.first);
+    if (!bd.isNull())
+        return bd;
+    auto it = _localFiles.find(h);
+    if (it != _localFiles.end()) {
+        QPair<QString, QString> fileData = it.value();
+        QFile                   file(fileData.first);
         if (file.open(QIODevice::ReadOnly)) {
-            bd.setCid(cid);
+            bd.setHash(h);
             bd.setData(file.readAll());
             bd.setMaxAge(0);
             bd.setType(fileData.second);
@@ -174,11 +193,10 @@ BoBData BoBManager::bobData(const QString &cid)
 }
 
 BoBData BoBManager::append(const QByteArray &data, const QString &type,
-                                unsigned int maxAge)
+                           unsigned int maxAge)
 {
     BoBData b;
-    b.setCid(QString("sha1+%1@bob.xmpp.org").arg(QString(
-        QCryptographicHash::hash(data, QCryptographicHash::Sha1).toHex())));
+    b.setHash(Hash::from(Hash::Sha1, data));
     b.setData(data);
     b.setMaxAge(maxAge);
     b.setType(type);
@@ -188,20 +206,20 @@ BoBData BoBManager::append(const QByteArray &data, const QString &type,
     return b;
 }
 
-QString BoBManager::append(QFile &file, const QString &type)
+XMPP::Hash BoBManager::append(QFile &file, const QString &type)
 {
     bool isOpen = file.isOpen();
     if (isOpen || file.open(QIODevice::ReadOnly)) {
-        QString cid = QString("sha1+%1@bob.xmpp.org").arg(
-            QString(QCryptographicHash::hash(file.readAll(),
-                                            QCryptographicHash::Sha1).toHex()));
-        _localFiles[cid] = QPair<QString,QString>(file.fileName(), type);
+        Hash h = Hash::from(Hash::Sha1, &file);
+        if (h.isValid()) {
+            _localFiles[h] = QPair<QString, QString>(file.fileName(), type);
+        }
         if (!isOpen) {
             file.close();
         }
-        return cid;
+        return h;
     }
-    return QString();
+    return XMPP::Hash();
 }
 
 void BoBManager::append(const BoBData &data)
diff --git a/src/xmpp/xmpp-im/xmpp_bitsofbinary.h b/src/xmpp/xmpp-im/xmpp_bitsofbinary.h
index 7a856478..c8f2de3a 100644
--- a/src/xmpp/xmpp-im/xmpp_bitsofbinary.h
+++ b/src/xmpp/xmpp-im/xmpp_bitsofbinary.h
@@ -20,6 +20,7 @@
 #define XMPP_BITSOFBINARY_H
 
 #include "xmpp/jid/jid.h"
+#include "xmpp_hash.h"
 
 #include <QDomElement>
 #include <QFile>
@@ -28,70 +29,73 @@
 #include <QSharedDataPointer>
 
 namespace XMPP {
-    class Client;
-    class JT_BitsOfBinary;
-
-    class BoBData
-    {
-        class Private;
-    public:
-        BoBData();
-        BoBData(const BoBData &other);
-        BoBData(const QDomElement &);
-        ~BoBData();
-        BoBData &operator=(const BoBData &other);
-
-        bool isNull() const;
-
-        QString cid() const;
-        void setCid(const QString &);
-
-        QByteArray data() const;
-        void setData(const QByteArray &);
-
-        QString type() const;
-        void setType(const QString &);
-
-        unsigned int maxAge() const;
-        void setMaxAge(unsigned int);
-
-        void fromXml(const QDomElement &);
-        QDomElement toXml(QDomDocument *doc) const;
-
-    private:
-        QSharedDataPointer<Private> d;
-    };
-
-    class BoBCache : public QObject
-    {
-        Q_OBJECT
-
-    public:
-        BoBCache(QObject *parent);
-        virtual void put(const BoBData &) = 0;
-        virtual BoBData get(const QString &) = 0;
-    };
-
-    class BoBManager : public QObject
-    {
-        Q_OBJECT
-
-    public:
-        BoBManager(Client *);
-        void setCache(BoBCache*);
-
-        BoBData bobData(const QString &);
-        // file data, mime type, max age in seconds
-        BoBData append(const QByteArray &data, const QString &type,
-                            unsigned int maxAge = 0);
-        QString append(QFile &file,
-                             const QString &type = "application/octet-stream");
-        void append(const BoBData &);
-
-    private:
-        BoBCache *_cache;
-        QHash<QString, QPair<QString,QString> > _localFiles; //cid => (filename, mime)
-    };
+class Client;
+class JT_BitsOfBinary;
+
+class BoBData {
+    class Private;
+
+public:
+    BoBData();
+    BoBData(const BoBData &other);
+    BoBData(const QDomElement &);
+    ~BoBData();
+    BoBData &operator=(const BoBData &other);
+
+    bool isNull() const;
+
+    static Hash cidToHash(const QString &cid);
+
+    QString cid() const;
+    void    setCid(const QString &);
+
+    const Hash &hash() const;
+    void        setHash(const Hash &hash);
+
+    QByteArray data() const;
+    void       setData(const QByteArray &);
+
+    QString type() const;
+    void    setType(const QString &);
+
+    unsigned int maxAge() const;
+    void         setMaxAge(unsigned int);
+
+    void        fromXml(const QDomElement &);
+    QDomElement toXml(QDomDocument *doc) const;
+
+private:
+    QSharedDataPointer<Private> d;
+};
+
+class BoBCache : public QObject {
+    Q_OBJECT
+
+public:
+    BoBCache(QObject *parent);
+    virtual void    put(const BoBData &) = 0;
+    virtual BoBData get(const Hash &)    = 0;
+};
+
+class BoBManager : public QObject {
+    Q_OBJECT
+
+public:
+    BoBManager(Client *);
+    void setCache(BoBCache *);
+
+    BoBData bobData(const QString &);
+    // file data, mime type, max age in seconds
+    BoBData append(const QByteArray &data, const QString &type,
+                   unsigned int maxAge = 0);
+    Hash    append(QFile &        file,
+                   const QString &type = "application/octet-stream"); // this method adds just to runtime cache
+    void    append(const BoBData &);
+
+private:
+    BoBCache *                                 _cache;
+    QHash<XMPP::Hash, QPair<QString, QString>> _localFiles; //cid => (filename, mime)
+};
 } // namespace XMPP
 
 #endif // XMPP_BITSOFBINARY_H
diff --git a/src/xmpp/xmpp-im/xmpp_hash.h b/src/xmpp/xmpp-im/xmpp_hash.h
index 5b2a0852..72b17a36 100644
--- a/src/xmpp/xmpp-im/xmpp_hash.h
+++ b/src/xmpp/xmpp-im/xmpp_hash.h
@@ -21,51 +21,70 @@
 
 #include "xmpp_stanza.h"
 
-#include <QFuture>
 #include <QString>
 
 class QDomElement;
 
 namespace XMPP {
-    extern QString HASH_NS;
-    class Features;
-
-    class Hash
-    {
-    public:
-
-        enum Type { // XEP-0300 Version 0.5.3 (2018-02-14)
-            Unknown,    // not standard, just a default
-            Sha1,       // SHOULD NOT
-            Sha256,     // MUST
-            Sha512,     // SHOULD
-            Sha3_256,   // MUST
-            Sha3_512,   // SHOULD
-            Blake2b256, // MUST
-            Blake2b512, // SHOULD
-            LastType = Blake2b512
-        };
-
-        inline Hash(Type type = Type::Unknown) : v_type(type) {}
-        Hash(const QDomElement&);
-
-        inline bool isValid() const { return v_type > Unknown && v_type <= LastType; }
-
-        inline Type type() const { return v_type; }
-        inline void setType(Type t) { v_type = t; }
-
-        inline QByteArray data() const { return v_data; }
-        inline void setData(const QByteArray &d) { v_data = d; } // sets already computed hash
-        bool computeFromData(const QByteArray &); // computes hash from passed data
-        bool computeFromDevice(QIODevice *dev);
-
-        QDomElement toXml(QDomDocument *doc) const;
-        static void populateFeatures(XMPP::Features &);
-
-    private:
-        Type v_type = Type::Unknown;
-        QByteArray v_data;
+
+extern QString HASH_NS;
+class Features;
+
+class Hash {
+public:
+    enum Type {     // XEP-0300 Version 0.5.3 (2018-02-14)
+        Unknown,    // not standard, just a default
+        Sha1,       // SHOULD NOT
+        Sha256,     // MUST
+        Sha512,     // SHOULD
+        Sha3_256,   // MUST
+        Sha3_512,   // SHOULD
+        Blake2b256, // MUST
+        Blake2b512, // SHOULD
+        LastType = Blake2b512
     };
+
+    inline Hash(Type type = Type::Unknown) :
+        v_type(type) {}
+    inline Hash(Type type, const QByteArray &data) :
+        v_type(type), v_data(data) {}
+    inline Hash(const QStringRef &algo) :
+        v_type(parseType(algo)) {}
+    Hash(const QDomElement &);
+
+    inline bool operator==(const Hash &other) const { return v_type == other.v_type && v_data == other.v_data; }
+
+    inline bool isValid() const { return v_type > Unknown && v_type <= LastType; }
+
+    inline Type type() const { return v_type; }
+    inline void setType(Type t) { v_type = t; }
+    QString     stringType() const;
+    static Type parseType(const QStringRef &algo);
+
+    inline QByteArray data() const { return v_data; }
+    inline void       setData(const QByteArray &d) { v_data = d; } // sets already computed hash
+    inline QByteArray toHex() const { return v_data.toHex(); }
+    inline QByteArray toBase64() const { return v_data.toBase64(); }
+    inline QString    toString() const { return QString("%1+%2").arg(stringType(), QString::fromLatin1(v_data.toHex())); }
+    bool              compute(const QByteArray &); // computes hash from passed data
+    bool              compute(QIODevice *dev);
+
+    QDomElement toXml(QDomDocument *doc) const;
+    static void populateFeatures(XMPP::Features &);
+    static Hash from(Type t, const QByteArray &fileData);
+    static Hash from(XMPP::Hash::Type t, QIODevice *dev);
+    static Hash from(const QStringRef &str); // e.g. sha1+aabccddeeffaabbcc232387539465923645
+
+private:
+    Type       v_type = Type::Unknown;
+    QByteArray v_data;
+};
+
+Q_DECL_PURE_FUNCTION inline uint qHash(const Hash &hash, uint seed = 0) Q_DECL_NOTHROW
+{
+    return qHash(hash.data(), seed);
+}
+
 } // namespace XMPP
 
 #endif // XMPP_HASH_H
diff --git a/src/xmpp/xmpp-im/xmpp_status.h b/src/xmpp/xmpp-im/xmpp_status.h
index a37f5988..f3caa4a8 100644
--- a/src/xmpp/xmpp-im/xmpp_status.h
+++ b/src/xmpp/xmpp-im/xmpp_status.h
@@ -30,121 +30,125 @@
 #include <QStringList>
 
 namespace XMPP {
-    class DiscoItem;
-    class StatusPrivate;
-
-    class CapsSpec
-    {
-        public:
-            typedef QMap<QString,QCryptographicHash::Algorithm> CryptoMap;
-            static const QCryptographicHash::Algorithm invalidAlgo = (QCryptographicHash::Algorithm)255;
-
-            CapsSpec();
-            CapsSpec(const QString& node, QCryptographicHash::Algorithm hashAlgo, const QString& ver = QString());
-            CapsSpec(const DiscoItem &disco, QCryptographicHash::Algorithm hashAlgo = QCryptographicHash::Sha1);
-
-            bool isValid() const;
-            const QString& node() const;
-            const QString& version() const;
-            QCryptographicHash::Algorithm hashAlgorithm() const;
-            inline const QStringList &ext() const { return ext_; }
-            QString flatten() const;
-
-            void resetVersion();
-
-            bool operator==(const CapsSpec&) const;
-            bool operator!=(const CapsSpec&) const;
-            bool operator<(const CapsSpec&) const;
-
-            QDomElement toXml(QDomDocument *doc) const;
-            static CapsSpec fromXml(const QDomElement &e);
-
-            static CryptoMap &cryptoMap();
-
-        private:
-            QString node_, ver_;
-            QCryptographicHash::Algorithm hashAlgo_;
-            QStringList ext_;
-    };
-
-    class Status
-    {
-    public:
-        enum Type { Offline, Online, Away, XA, DND, Invisible, FFC };
-
-        Status(const QString &show=QString(), const QString &status=QString(), int priority=0, bool available=true);
-        Status(Type type, const QString& status=QString(), int priority=0);
-        Status(const Status &);
-        Status &operator=(const Status &);
-        ~Status();
-
-        int priority() const;
-        Type type() const;
-        QString typeString() const;
-        const QString & show() const;
-        const QString & status() const;
-        QDateTime timeStamp() const;
-        const QString & keyID() const;
-        bool isAvailable() const;
-        bool isAway() const;
-        bool isInvisible() const;
-        bool hasError() const;
-        int errorCode() const;
-        const QString & errorString() const;
-
-        const QString & xsigned() const;
-        const QString & songTitle() const;
-        const CapsSpec & caps() const;
-
-        bool isMUC() const;
-        bool hasMUCItem() const;
-        const MUCItem & mucItem() const;
-        bool hasMUCDestroy() const;
-        const MUCDestroy & mucDestroy() const;
-        const QList<int>& getMUCStatuses() const;
-        const QString& mucPassword() const;
-        bool hasMUCHistory() const;
-        int mucHistoryMaxChars() const;
-        int mucHistoryMaxStanzas() const;
-        int mucHistorySeconds() const;
-        const QDateTime & mucHistorySince() const;
-
-        static Type txt2type(const QString& stat);
-
-        void setPriority(int);
-        void setType(Type);
-        void setType(const QString &);
-        void setShow(const QString &);
-        void setStatus(const QString &);
-        void setTimeStamp(const QDateTime &);
-        void setKeyID(const QString &);
-        void setIsAvailable(bool);
-        void setIsInvisible(bool);
-        void setError(int, const QString &);
-        void setCaps(const CapsSpec&);
-
-        void setMUC();
-        void setMUCItem(const MUCItem&);
-        void setMUCDestroy(const MUCDestroy&);
-        void addMUCStatus(int);
-        void setMUCPassword(const QString&);
-        void setMUCHistory(int maxchars, int maxstanzas, int seconds, const QDateTime &since);
-
-        void setXSigned(const QString &);
-        void setSongTitle(const QString &);
-
-        // XEP-153: VCard-based Avatars
-        const QString& photoHash() const;
-        void setPhotoHash(const QString&);
-        bool hasPhotoHash() const;
-
-        // XEP-0231 bits of binary
-        void addBoBData(const BoBData &);
-        QList<BoBData> bobDataList() const;
-
-    private:
-        QSharedDataPointer<StatusPrivate> d;
-    };
+class DiscoItem;
+class StatusPrivate;
+
+class CapsSpec {
+public:
+    typedef QMap<QString, QCryptographicHash::Algorithm> CryptoMap;
+    static const QCryptographicHash::Algorithm           invalidAlgo = (QCryptographicHash::Algorithm)255;
+
+    CapsSpec();
+    CapsSpec(const QString &node, QCryptographicHash::Algorithm hashAlgo, const QString &ver = QString());
+    CapsSpec(const DiscoItem &disco, QCryptographicHash::Algorithm hashAlgo = QCryptographicHash::Sha1);
+
+    bool                          isValid() const;
+    const QString &               node() const;
+    const QString &               version() const;
+    QCryptographicHash::Algorithm hashAlgorithm() const;
+    inline const QStringList &    ext() const { return ext_; }
+    QString                       flatten() const;
+
+    void resetVersion();
+
+    bool operator==(const CapsSpec &) const;
+    bool operator!=(const CapsSpec &) const;
+    bool operator<(const CapsSpec &) const;
+
+    QDomElement     toXml(QDomDocument *doc) const;
+    static CapsSpec fromXml(const QDomElement &e);
+
+    static CryptoMap &cryptoMap();
+
+private:
+    QString                       node_, ver_;
+    QCryptographicHash::Algorithm hashAlgo_;
+    QStringList                   ext_;
+};
+
+class Status {
+public:
+    enum Type { Offline,
+                Online,
+                Away,
+                XA,
+                DND,
+                Invisible,
+                FFC };
+
+    Status(const QString &show = QString(), const QString &status = QString(), int priority = 0, bool available = true);
+    Status(Type type, const QString &status = QString(), int priority = 0);
+    Status(const Status &);
+    Status &operator=(const Status &);
+    ~Status();
+
+    int            priority() const;
+    Type           type() const;
+    QString        typeString() const;
+    const QString &show() const;
+    const QString &status() const;
+    QDateTime      timeStamp() const;
+    const QString &keyID() const;
+    bool           isAvailable() const;
+    bool           isAway() const;
+    bool           isInvisible() const;
+    bool           hasError() const;
+    int            errorCode() const;
+    const QString &errorString() const;
+
+    const QString & xsigned() const;
+    const QString & songTitle() const;
+    const CapsSpec &caps() const;
+
+    bool              isMUC() const;
+    bool              hasMUCItem() const;
+    const MUCItem &   mucItem() const;
+    bool              hasMUCDestroy() const;
+    const MUCDestroy &mucDestroy() const;
+    const QList<int> &getMUCStatuses() const;
+    const QString &   mucPassword() const;
+    bool              hasMUCHistory() const;
+    int               mucHistoryMaxChars() const;
+    int               mucHistoryMaxStanzas() const;
+    int               mucHistorySeconds() const;
+    const QDateTime & mucHistorySince() const;
+
+    static Type txt2type(const QString &stat);
+
+    void setPriority(int);
+    void setType(Type);
+    void setType(const QString &);
+    void setShow(const QString &);
+    void setStatus(const QString &);
+    void setTimeStamp(const QDateTime &);
+    void setKeyID(const QString &);
+    void setIsAvailable(bool);
+    void setIsInvisible(bool);
+    void setError(int, const QString &);
+    void setCaps(const CapsSpec &);
+
+    void setMUC();
+    void setMUCItem(const MUCItem &);
+    void setMUCDestroy(const MUCDestroy &);
+    void addMUCStatus(int);
+    void setMUCPassword(const QString &);
+    void setMUCHistory(int maxchars, int maxstanzas, int seconds, const QDateTime &since);
+
+    void setXSigned(const QString &);
+    void setSongTitle(const QString &);
+
+    // XEP-153: VCard-based Avatars
+    const QByteArray &photoHash() const;
+    void              setPhotoHash(const QByteArray &);
+    bool              hasPhotoHash() const;
+
+    // XEP-0231 bits of binary
+    void           addBoBData(const BoBData &);
+    QList<BoBData> bobDataList() const;
+
+private:
+    QSharedDataPointer<StatusPrivate> d;
+};
 } // namespace XMPP
 
 Q_DECLARE_METATYPE(XMPP::Status)
diff --git a/src/xmpp/xmpp-im/xmpp_tasks.cpp b/src/xmpp/xmpp-im/xmpp_tasks.cpp
index c47e87c2..104a0de5 100644
--- a/src/xmpp/xmpp-im/xmpp_tasks.cpp
+++ b/src/xmpp/xmpp-im/xmpp_tasks.cpp
@@ -34,9 +34,9 @@ using namespace XMPP;
 
 static QString lineEncode(QString str)
 {
-    str.replace(QRegExp("\\\\"), "\\\\");   // backslash to double-backslash
-    str.replace(QRegExp("\\|"), "\\p");     // pipe to \p
-    str.replace(QRegExp("\n"), "\\n");      // newline to \n
+    str.replace(QRegExp("\\\\"), "\\\\"); // backslash to double-backslash
+    str.replace(QRegExp("\\|"), "\\p");   // pipe to \p
+    str.replace(QRegExp("\n"), "\\n");    // newline to \n
     return str;
 }
 
@@ -44,20 +44,19 @@ static QString lineDecode(const QString &str)
 {
     QString ret;
 
-    for(int n = 0; n < str.length(); ++n) {
-        if(str.at(n) == '\\') {
+    for (int n = 0; n < str.length(); ++n) {
+        if (str.at(n) == '\\') {
             ++n;
-            if(n >= str.length())
+            if (n >= str.length())
                 break;
 
-            if(str.at(n) == 'n')
+            if (str.at(n) == 'n')
                 ret.append('\n');
-            if(str.at(n) == 'p')
+            if (str.at(n) == 'p')
                 ret.append('|');
-            if(str.at(n) == '\\')
+            if (str.at(n) == '\\')
                 ret.append('\\');
-        }
-        else {
+        } else {
             ret.append(str.at(n));
         }
     }
@@ -69,16 +68,16 @@ static Roster xmlReadRoster(const QDomElement &q, bool push)
 {
     Roster r;
 
-    for(QDomNode n = q.firstChild(); !n.isNull(); n = n.nextSibling()) {
+    for (QDomNode n = q.firstChild(); !n.isNull(); n = n.nextSibling()) {
         QDomElement i = n.toElement();
-        if(i.isNull())
+        if (i.isNull())
             continue;
 
-        if(i.tagName() == "item") {
+        if (i.tagName() == "item") {
             RosterItem item;
             item.fromXml(i);
 
-            if(push)
+            if (push)
                 item.setIsPush(true);
 
             r += item;
@@ -94,32 +93,32 @@ static Roster xmlReadRoster(const QDomElement &q, bool push)
 //
 #include "protocol.h"
 
-JT_Session::JT_Session(Task *parent) : Task(parent)
+JT_Session::JT_Session(Task *parent) :
+    Task(parent)
 {
 }
 
 void JT_Session::onGo()
 {
-    QDomElement iq = createIQ(doc(), "set", "", id());
+    QDomElement iq      = createIQ(doc(), "set", "", id());
     QDomElement session = doc()->createElementNS(NS_SESSION, "session");
     iq.appendChild(session);
     send(iq);
 }
 
-bool JT_Session::take(const QDomElement& x)
+bool JT_Session::take(const QDomElement &x)
 {
     QString from = x.attribute("from");
     if (!from.endsWith("chat.facebook.com")) {
         // remove this code when chat.facebook.com is disabled completely
         from.clear();
     }
-    if(!iqVerify(x, from, id()))
+    if (!iqVerify(x, from, id()))
         return false;
 
-    if(x.attribute("type") == "result") {
+    if (x.attribute("type") == "result") {
         setSuccess();
-    }
-    else {
+    } else {
         setError(x);
     }
     return true;
@@ -128,25 +127,24 @@ bool JT_Session::take(const QDomElement& x)
 //----------------------------------------------------------------------------
 // JT_Register
 //----------------------------------------------------------------------------
-class JT_Register::Private
-{
+class JT_Register::Private {
 public:
     Private() = default;
 
-    Form form;
+    Form  form;
     XData xdata;
-    bool hasXData;
-    bool registered;
-    Jid jid;
-    int type;
+    bool  hasXData;
+    bool  registered;
+    Jid   jid;
+    int   type;
 };
 
-JT_Register::JT_Register(Task *parent)
-:Task(parent)
+JT_Register::JT_Register(Task *parent) :
+    Task(parent)
 {
-    d = new Private;
-    d->type = -1;
-    d->hasXData = false;
+    d             = new Private;
+    d->type       = -1;
+    d->hasXData   = false;
     d->registered = false;
 }
 
@@ -157,9 +155,9 @@ JT_Register::~JT_Register()
 
 void JT_Register::reg(const QString &user, const QString &pass)
 {
-    d->type = 0;
-    to = client()->host();
-    iq = createIQ(doc(), "set", to.full(), id());
+    d->type           = 0;
+    to                = client()->host();
+    iq                = createIQ(doc(), "set", to.full(), id());
     QDomElement query = doc()->createElementNS("jabber:iq:register", "query");
     iq.appendChild(query);
     query.appendChild(textTag(doc(), "username", user));
@@ -168,9 +166,9 @@ void JT_Register::reg(const QString &user, const QString &pass)
 
 void JT_Register::changepw(const QString &pass)
 {
-    d->type = 1;
-    to = client()->host();
-    iq = createIQ(doc(), "set", to.full(), id());
+    d->type           = 1;
+    to                = client()->host();
+    iq                = createIQ(doc(), "set", to.full(), id());
     QDomElement query = doc()->createElementNS("jabber:iq:register", "query");
     iq.appendChild(query);
     query.appendChild(textTag(doc(), "username", client()->user()));
@@ -179,14 +177,14 @@ void JT_Register::changepw(const QString &pass)
 
 void JT_Register::unreg(const Jid &j)
 {
-    d->type = 2;
-    to = j.isEmpty() ? client()->host() : j.full();
-    iq = createIQ(doc(), "set", to.full(), id());
+    d->type           = 2;
+    to                = j.isEmpty() ? client()->host() : j.full();
+    iq                = createIQ(doc(), "set", to.full(), id());
     QDomElement query = doc()->createElementNS("jabber:iq:register", "query");
     iq.appendChild(query);
 
     // this may be useful
-    if(!d->form.key().isEmpty())
+    if (!d->form.key().isEmpty())
         query.appendChild(textTag(doc(), "key", d->form.key()));
 
     query.appendChild(doc()->createElement("remove"));
@@ -194,42 +192,42 @@ void JT_Register::unreg(const Jid &j)
 
 void JT_Register::getForm(const Jid &j)
 {
-    d->type = 3;
-    to = j;
-    iq = createIQ(doc(), "get", to.full(), id());
+    d->type           = 3;
+    to                = j;
+    iq                = createIQ(doc(), "get", to.full(), id());
     QDomElement query = doc()->createElementNS("jabber:iq:register", "query");
     iq.appendChild(query);
 }
 
 void JT_Register::setForm(const Form &form)
 {
-    d->type = 4;
-    to = form.jid();
-    iq = createIQ(doc(), "set", to.full(), id());
+    d->type           = 4;
+    to                = form.jid();
+    iq                = createIQ(doc(), "set", to.full(), id());
     QDomElement query = doc()->createElementNS("jabber:iq:register", "query");
     iq.appendChild(query);
 
     // key?
-    if(!form.key().isEmpty())
+    if (!form.key().isEmpty())
         query.appendChild(textTag(doc(), "key", form.key()));
 
     // fields
-    for(Form::ConstIterator it = form.begin(); it != form.end(); ++it) {
+    for (Form::ConstIterator it = form.begin(); it != form.end(); ++it) {
         const FormField &f = *it;
         query.appendChild(textTag(doc(), f.realName(), f.value()));
     }
 }
 
-void JT_Register::setForm(const Jid& to, const XData& xdata)
+void JT_Register::setForm(const Jid &to, const XData &xdata)
 {
-    d->type = 4;
-    iq = createIQ(doc(), "set", to.full(), id());
+    d->type           = 4;
+    iq                = createIQ(doc(), "set", to.full(), id());
     QDomElement query = doc()->createElementNS("jabber:iq:register", "query");
     iq.appendChild(query);
     query.appendChild(xdata.toXml(doc(), true));
 }
 
-const Form & JT_Register::form() const
+const Form &JT_Register::form() const
 {
     return d->form;
 }
@@ -239,7 +237,7 @@ bool JT_Register::hasXData() const
     return d->hasXData;
 }
 
-const XData& JT_Register::xdata() const
+const XData &JT_Register::xdata() const
 {
     return d->xdata;
 }
@@ -256,37 +254,35 @@ void JT_Register::onGo()
 
 bool JT_Register::take(const QDomElement &x)
 {
-    if(!iqVerify(x, to, id()))
+    if (!iqVerify(x, to, id()))
         return false;
 
     Jid from(x.attribute("from"));
-    if(x.attribute("type") == "result") {
-        if(d->type == 3) {
+    if (x.attribute("type") == "result") {
+        if (d->type == 3) {
             d->form.clear();
             d->form.setJid(from);
 
             QDomElement q = queryTag(x);
-            for(QDomNode n = q.firstChild(); !n.isNull(); n = n.nextSibling()) {
+            for (QDomNode n = q.firstChild(); !n.isNull(); n = n.nextSibling()) {
                 QDomElement i = n.toElement();
-                if(i.isNull())
+                if (i.isNull())
                     continue;
 
-                if(i.tagName() == "instructions")
+                if (i.tagName() == "instructions")
                     d->form.setInstructions(tagContent(i));
-                else if(i.tagName() == "key")
+                else if (i.tagName() == "key")
                     d->form.setKey(tagContent(i));
                 else if (i.tagName() == QLatin1String("registered"))
                     d->registered = true;
-                else if(i.tagName() == "x" && i.namespaceURI() == "jabber:x:data") {
+                else if (i.tagName() == "x" && i.namespaceURI() == "jabber:x:data") {
                     d->xdata.fromXml(i);
                     d->hasXData = true;
-                }
-                else if(i.tagName() == "data" && i.namespaceURI() == "urn:xmpp:bob") {
+                } else if (i.tagName() == "data" && i.namespaceURI() == "urn:xmpp:bob") {
                     client()->bobManager()->append(BoBData(i)); // xep-0231
-                }
-                else {
+                } else {
                     FormField f;
-                    if(f.setType(i.tagName())) {
+                    if (f.setType(i.tagName())) {
                         f.setValue(tagContent(i));
                         d->form += f;
                     }
@@ -295,8 +291,7 @@ bool JT_Register::take(const QDomElement &x)
         }
 
         setSuccess();
-    }
-    else
+    } else
         setError(x);
 
     return true;
@@ -305,19 +300,18 @@ bool JT_Register::take(const QDomElement &x)
 //----------------------------------------------------------------------------
 // JT_UnRegister
 //----------------------------------------------------------------------------
-class JT_UnRegister::Private
-{
+class JT_UnRegister::Private {
 public:
     Private() = default;
 
-    Jid j;
+    Jid          j;
     JT_Register *jt_reg = nullptr;
 };
 
-JT_UnRegister::JT_UnRegister(Task *parent)
-: Task(parent)
+JT_UnRegister::JT_UnRegister(Task *parent) :
+    Task(parent)
 {
-    d = new Private;
+    d         = new Private;
     d->jt_reg = nullptr;
 }
 
@@ -356,7 +350,7 @@ void JT_UnRegister::getFormFinished()
 
 void JT_UnRegister::unregFinished()
 {
-    if ( d->jt_reg->success() )
+    if (d->jt_reg->success())
         setSuccess();
     else
         setError(d->jt_reg->statusCode(), d->jt_reg->statusString());
@@ -368,20 +362,19 @@ void JT_UnRegister::unregFinished()
 //----------------------------------------------------------------------------
 // JT_Roster
 //----------------------------------------------------------------------------
-class JT_Roster::Private
-{
+class JT_Roster::Private {
 public:
     Private() = default;
 
-    Roster roster;
+    Roster             roster;
     QList<QDomElement> itemList;
 };
 
-JT_Roster::JT_Roster(Task *parent)
-:Task(parent)
+JT_Roster::JT_Roster(Task *parent) :
+    Task(parent)
 {
     type = -1;
-    d = new Private;
+    d    = new Private;
 }
 
 JT_Roster::~JT_Roster()
@@ -393,7 +386,7 @@ void JT_Roster::get()
 {
     type = 0;
     //to = client()->host();
-    iq = createIQ(doc(), "get", to.full(), id());
+    iq                = createIQ(doc(), "get", to.full(), id());
     QDomElement query = doc()->createElementNS("jabber:iq:roster", "query");
     iq.appendChild(query);
 }
@@ -404,9 +397,9 @@ void JT_Roster::set(const Jid &jid, const QString &name, const QStringList &grou
     //to = client()->host();
     QDomElement item = doc()->createElement("item");
     item.setAttribute("jid", jid.full());
-    if(!name.isEmpty())
+    if (!name.isEmpty())
         item.setAttribute("name", name);
-    for(QStringList::ConstIterator it = groups.begin(); it != groups.end(); ++it)
+    for (QStringList::ConstIterator it = groups.begin(); it != groups.end(); ++it)
         item.appendChild(textTag(doc(), "group", *it));
     d->itemList += item;
 }
@@ -423,32 +416,32 @@ void JT_Roster::remove(const Jid &jid)
 
 void JT_Roster::onGo()
 {
-    if(type == 0)
+    if (type == 0)
         send(iq);
-    else if(type == 1) {
+    else if (type == 1) {
         //to = client()->host();
-        iq = createIQ(doc(), "set", to.full(), id());
+        iq                = createIQ(doc(), "set", to.full(), id());
         QDomElement query = doc()->createElementNS("jabber:iq:roster", "query");
         iq.appendChild(query);
-        foreach (const QDomElement& it, d->itemList)
+        foreach (const QDomElement &it, d->itemList)
             query.appendChild(it);
         send(iq);
     }
 }
 
-const Roster & JT_Roster::roster() const
+const Roster &JT_Roster::roster() const
 {
     return d->roster;
 }
 
 QString JT_Roster::toString() const
 {
-    if(type != 1)
+    if (type != 1)
         return "";
 
     QDomElement i = doc()->createElement("request");
     i.setAttribute("type", "JT_Roster");
-    foreach (const QDomElement& it, d->itemList)
+    foreach (const QDomElement &it, d->itemList)
         i.appendChild(it);
     return lineEncode(Stream::xmlToString(i));
     return "";
@@ -457,19 +450,19 @@ QString JT_Roster::toString() const
 bool JT_Roster::fromString(const QString &str)
 {
     QDomDocument *dd = new QDomDocument;
-    if(!dd->setContent(lineDecode(str).toUtf8()))
+    if (!dd->setContent(lineDecode(str).toUtf8()))
         return false;
     QDomElement e = doc()->importNode(dd->documentElement(), true).toElement();
     delete dd;
 
-    if(e.tagName() != "request" || e.attribute("type") != "JT_Roster")
+    if (e.tagName() != "request" || e.attribute("type") != "JT_Roster")
         return false;
 
     type = 1;
     d->itemList.clear();
-    for(QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling()) {
+    for (QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling()) {
         QDomElement i = n.toElement();
-        if(i.isNull())
+        if (i.isNull())
             continue;
         d->itemList += i;
     }
@@ -479,25 +472,24 @@ bool JT_Roster::fromString(const QString &str)
 
 bool JT_Roster::take(const QDomElement &x)
 {
-    if(!iqVerify(x, client()->host(), id()))
+    if (!iqVerify(x, client()->host(), id()))
         return false;
 
     // get
-    if(type == 0) {
-        if(x.attribute("type") == "result") {
+    if (type == 0) {
+        if (x.attribute("type") == "result") {
             QDomElement q = queryTag(x);
-            d->roster = xmlReadRoster(q, false);
+            d->roster     = xmlReadRoster(q, false);
             setSuccess();
-        }
-        else {
+        } else {
             setError(x);
         }
 
         return true;
     }
     // set
-    else if(type == 1) {
-        if(x.attribute("type") == "result")
+    else if (type == 1) {
+        if (x.attribute("type") == "result")
             setSuccess();
         else
             setError(x);
@@ -505,7 +497,7 @@ bool JT_Roster::take(const QDomElement &x)
         return true;
     }
     // remove
-    else if(type == 2) {
+    else if (type == 2) {
         setSuccess();
         return true;
     }
@@ -516,7 +508,8 @@ bool JT_Roster::take(const QDomElement &x)
 //----------------------------------------------------------------------------
 // JT_PushRoster
 //----------------------------------------------------------------------------
-JT_PushRoster::JT_PushRoster(Task *parent) : Task(parent)
+JT_PushRoster::JT_PushRoster(Task *parent) :
+    Task(parent)
 {
 }
 
@@ -527,10 +520,10 @@ JT_PushRoster::~JT_PushRoster()
 bool JT_PushRoster::take(const QDomElement &e)
 {
     // must be an iq-set tag
-    if(e.tagName() != "iq" || e.attribute("type") != "set")
+    if (e.tagName() != "iq" || e.attribute("type") != "set")
         return false;
 
-    if(!iqVerify(e, client()->host(), "", "jabber:iq:roster"))
+    if (!iqVerify(e, client()->host(), "", "jabber:iq:roster"))
         return false;
 
     roster(xmlReadRoster(queryTag(e), true));
@@ -542,7 +535,8 @@ bool JT_PushRoster::take(const QDomElement &e)
 //----------------------------------------------------------------------------
 // JT_Presence
 //----------------------------------------------------------------------------
-JT_Presence::JT_Presence(Task *parent) : Task(parent)
+JT_Presence::JT_Presence(Task *parent) :
+    Task(parent)
 {
 }
 
@@ -555,27 +549,26 @@ void JT_Presence::pres(const Status &s)
     type = 0;
 
     tag = doc()->createElement("presence");
-    if(!s.isAvailable()) {
+    if (!s.isAvailable()) {
         tag.setAttribute("type", "unavailable");
-        if(!s.status().isEmpty())
+        if (!s.status().isEmpty())
             tag.appendChild(textTag(doc(), "status", s.status()));
-    }
-    else {
-        if(s.isInvisible())
+    } else {
+        if (s.isInvisible())
             tag.setAttribute("type", "invisible");
 
-        if(!s.show().isEmpty())
+        if (!s.show().isEmpty())
             tag.appendChild(textTag(doc(), "show", s.show()));
-        if(!s.status().isEmpty())
+        if (!s.status().isEmpty())
             tag.appendChild(textTag(doc(), "status", s.status()));
 
-        tag.appendChild( textTag(doc(), "priority", QString("%1").arg(s.priority()) ) );
+        tag.appendChild(textTag(doc(), "priority", QString("%1").arg(s.priority())));
 
-        if(!s.keyID().isEmpty()) {
+        if (!s.keyID().isEmpty()) {
             QDomElement x = textTagNS(doc(), "http://jabber.org/protocol/e2e", "x", s.keyID());
             tag.appendChild(x);
         }
-        if(!s.xsigned().isEmpty()) {
+        if (!s.xsigned().isEmpty()) {
             QDomElement x = textTagNS(doc(), "jabber:x:signed", "x", s.xsigned());
             tag.appendChild(x);
         }
@@ -587,19 +580,19 @@ void JT_Presence::pres(const Status &s)
             }
         }
 
-        if(s.isMUC()) {
+        if (s.isMUC()) {
             QDomElement m = doc()->createElementNS("http://jabber.org/protocol/muc", "x");
             if (!s.mucPassword().isEmpty()) {
-                m.appendChild(textTag(doc(),"password",s.mucPassword()));
+                m.appendChild(textTag(doc(), "password", s.mucPassword()));
             }
             if (s.hasMUCHistory()) {
                 QDomElement h = doc()->createElement("history");
                 if (s.mucHistoryMaxChars() >= 0)
-                    h.setAttribute("maxchars",s.mucHistoryMaxChars());
+                    h.setAttribute("maxchars", s.mucHistoryMaxChars());
                 if (s.mucHistoryMaxStanzas() >= 0)
-                    h.setAttribute("maxstanzas",s.mucHistoryMaxStanzas());
+                    h.setAttribute("maxstanzas", s.mucHistoryMaxStanzas());
                 if (s.mucHistorySeconds() >= 0)
-                    h.setAttribute("seconds",s.mucHistorySeconds());
+                    h.setAttribute("seconds", s.mucHistorySeconds());
                 if (!s.mucHistorySince().isNull())
                     h.setAttribute("since", s.mucHistorySince().toUTC().addSecs(1).toString(Qt::ISODate));
                 m.appendChild(h);
@@ -607,14 +600,14 @@ void JT_Presence::pres(const Status &s)
             tag.appendChild(m);
         }
 
-        if(s.hasPhotoHash()) {
-            QDomElement m = doc()->createElementNS("vcard-temp:x:update","x");
-            m.appendChild(textTag(doc(), "photo", s.photoHash()));
+        if (s.hasPhotoHash()) {
+            QDomElement m = doc()->createElementNS("vcard-temp:x:update", "x");
+            m.appendChild(textTag(doc(), "photo", QString::fromLatin1(s.photoHash().toHex())));
             tag.appendChild(m);
         }
 
         // bits of binary
-        foreach(const BoBData &bd, s.bobDataList()) {
+        foreach (const BoBData &bd, s.bobDataList()) {
             tag.appendChild(bd.toXml(doc()));
         }
     }
@@ -626,17 +619,15 @@ void JT_Presence::pres(const Jid &to, const Status &s)
     tag.setAttribute("to", to.full());
 }
 
-void JT_Presence::sub(const Jid &to, const QString &subType, const QString& nick)
+void JT_Presence::sub(const Jid &to, const QString &subType, const QString &nick)
 {
     type = 1;
 
     tag = doc()->createElement("presence");
     tag.setAttribute("to", to.full());
     tag.setAttribute("type", subType);
-    if (!nick.isEmpty() && (subType == QLatin1String("subscribe") || subType == QLatin1String("subscribed") ||
-                            subType == QLatin1String("unsubscribe") || subType == QLatin1String("unsubscribed")))
-    {
-        QDomElement nick_tag = textTagNS(doc(),"http://jabber.org/protocol/nick","nick",nick);
+    if (!nick.isEmpty() && (subType == QLatin1String("subscribe") || subType == QLatin1String("subscribed") || subType == QLatin1String("unsubscribe") || subType == QLatin1String("unsubscribed"))) {
+        QDomElement nick_tag = textTagNS(doc(), "http://jabber.org/protocol/nick", "nick", nick);
         tag.appendChild(nick_tag);
     }
 }
@@ -659,8 +650,8 @@ void JT_Presence::onGo()
 //----------------------------------------------------------------------------
 // JT_PushPresence
 //----------------------------------------------------------------------------
-JT_PushPresence::JT_PushPresence(Task *parent)
-    : Task(parent)
+JT_PushPresence::JT_PushPresence(Task *parent) :
+    Task(parent)
 {
 }
 
@@ -670,26 +661,23 @@ JT_PushPresence::~JT_PushPresence()
 
 bool JT_PushPresence::take(const QDomElement &e)
 {
-    if(e.tagName() != "presence")
+    if (e.tagName() != "presence")
         return false;
 
-    Jid j(e.attribute("from"));
+    Jid    j(e.attribute("from"));
     Status p;
 
-    if(e.hasAttribute("type")) {
+    if (e.hasAttribute("type")) {
         QString type = e.attribute("type");
-        if(type == "unavailable") {
+        if (type == "unavailable") {
             p.setIsAvailable(false);
-        }
-        else if(type == "error") {
-            QString str = "";
-            int code = 0;
+        } else if (type == "error") {
+            QString str  = "";
+            int     code = 0;
             getErrorFromElement(e, client()->stream().baseNS(), &code, &str);
             p.setError(code, str);
-        }
-        else if(type == QLatin1String("subscribe") || type == QLatin1String("subscribed") ||
-                type == QLatin1String("unsubscribe") || type == QLatin1String("unsubscribed")) {
-            QString nick;
+        } else if (type == QLatin1String("subscribe") || type == QLatin1String("subscribed") || type == QLatin1String("unsubscribe") || type == QLatin1String("unsubscribed")) {
+            QString     nick;
             QDomElement tag = e.firstChildElement("nick");
             if (!tag.isNull() && tag.namespaceURI() == "http://jabber.org/protocol/nick") {
                 nick = tagContent(tag);
@@ -702,69 +690,62 @@ bool JT_PushPresence::take(const QDomElement &e)
     QDomElement tag;
 
     tag = e.firstChildElement("status");
-    if(!tag.isNull())
+    if (!tag.isNull())
         p.setStatus(tagContent(tag));
     tag = e.firstChildElement("show");
-    if(!tag.isNull())
+    if (!tag.isNull())
         p.setShow(tagContent(tag));
     tag = e.firstChildElement("priority");
-    if(!tag.isNull())
+    if (!tag.isNull())
         p.setPriority(tagContent(tag).toInt());
 
     QDateTime stamp;
 
-    for(QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling()) {
+    for (QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling()) {
         QDomElement i = n.toElement();
-        if(i.isNull())
+        if (i.isNull())
             continue;
 
-        if(i.tagName() == "x" && i.namespaceURI() == "jabber:x:delay") {
-            if(i.hasAttribute("stamp") && !stamp.isValid()) {
+        if (i.tagName() == "x" && i.namespaceURI() == "jabber:x:delay") {
+            if (i.hasAttribute("stamp") && !stamp.isValid()) {
                 stamp = stamp2TS(i.attribute("stamp"));
             }
-        }
-        else if(i.tagName() == "delay" && i.namespaceURI() == "urn:xmpp:delay") {
-            if(i.hasAttribute("stamp") && !stamp.isValid()) {
+        } else if (i.tagName() == "delay" && i.namespaceURI() == "urn:xmpp:delay") {
+            if (i.hasAttribute("stamp") && !stamp.isValid()) {
                 stamp = QDateTime::fromString(i.attribute("stamp").left(19), Qt::ISODate);
             }
-        }
-        else if(i.tagName() == "x" && i.namespaceURI() == "gabber:x:music:info") {
+        } else if (i.tagName() == "x" && i.namespaceURI() == "gabber:x:music:info") {
             QDomElement t;
-            QString title, state;
+            QString     title, state;
 
             t = i.firstChildElement("title");
-            if(!t.isNull())
+            if (!t.isNull())
                 title = tagContent(t);
             t = i.firstChildElement("state");
-            if(!t.isNull())
+            if (!t.isNull())
                 state = tagContent(t);
 
-            if(!title.isEmpty() && state == "playing")
+            if (!title.isEmpty() && state == "playing")
                 p.setSongTitle(title);
-        }
-        else if(i.tagName() == "x" && i.namespaceURI() == "jabber:x:signed") {
+        } else if (i.tagName() == "x" && i.namespaceURI() == "jabber:x:signed") {
             p.setXSigned(tagContent(i));
-        }
-        else if(i.tagName() == "x" && i.namespaceURI() == "http://jabber.org/protocol/e2e") {
+        } else if (i.tagName() == "x" && i.namespaceURI() == "http://jabber.org/protocol/e2e") {
             p.setKeyID(tagContent(i));
-        }
-         else if(i.tagName() == "c" && i.namespaceURI() == NS_CAPS) {
+        } else if (i.tagName() == "c" && i.namespaceURI() == NS_CAPS) {
             p.setCaps(CapsSpec::fromXml(i));
-            if(!e.hasAttribute("type") && p.caps().isValid()) {
+            if (!e.hasAttribute("type") && p.caps().isValid()) {
                 client()->capsManager()->updateCaps(j, p.caps());
             }
-          }
-        else if(i.tagName() == "x" && i.namespaceURI() == "vcard-temp:x:update") {
+        } else if (i.tagName() == "x" && i.namespaceURI() == "vcard-temp:x:update") {
             QDomElement t;
             t = i.firstChildElement("photo");
             if (!t.isNull())
-                p.setPhotoHash(tagContent(t).toLower()); // if hash is empty this may mean photo removal
+                p.setPhotoHash(QByteArray::fromHex(tagContent(t).toLatin1())); // if hash is empty this may mean photo removal
             // else vcard.hasPhotoHash() returns false and that's mean user is not yet ready to advertise his image
-        }
-        else if(i.tagName() == "x" && i.namespaceURI() == "http://jabber.org/protocol/muc#user") {
-            for(QDomNode muc_n = i.firstChild(); !muc_n.isNull(); muc_n = muc_n.nextSibling()) {
+        } else if (i.tagName() == "x" && i.namespaceURI() == "http://jabber.org/protocol/muc#user") {
+            for (QDomNode muc_n = i.firstChild(); !muc_n.isNull(); muc_n = muc_n.nextSibling()) {
                 QDomElement muc_e = muc_n.toElement();
-                if(muc_e.isNull())
+                if (muc_e.isNull())
                     continue;
 
                 if (muc_e.tagName() == "item")
@@ -774,8 +755,7 @@ bool JT_PushPresence::take(const QDomElement &e)
                 else if (muc_e.tagName() == "destroy")
                     p.setMUCDestroy(MUCDestroy(muc_e));
             }
-        }
-        else if (i.tagName() == "data" && i.namespaceURI() == "urn:xmpp:bob") {
+        } else if (i.tagName() == "data" && i.namespaceURI() == "urn:xmpp:bob") {
             BoBData bd(i);
             client()->bobManager()->append(bd);
             p.addBoBData(bd);
@@ -804,32 +784,32 @@ static QDomElement oldStyleNS(const QDomElement &e)
 {
     // find closest parent with a namespace
     QDomNode par = e.parentNode();
-    while(!par.isNull() && par.namespaceURI().isNull())
+    while (!par.isNull() && par.namespaceURI().isNull())
         par = par.parentNode();
     bool noShowNS = false;
-    if(!par.isNull() && par.namespaceURI() == e.namespaceURI())
+    if (!par.isNull() && par.namespaceURI() == e.namespaceURI())
         noShowNS = true;
 
     QDomElement i;
-    int x;
+    int         x;
     //if(noShowNS)
-        i = e.ownerDocument().createElement(e.tagName());
+    i = e.ownerDocument().createElement(e.tagName());
     //else
     //    i = e.ownerDocument().createElementNS(e.namespaceURI(), e.tagName());
 
     // copy attributes
     QDomNamedNodeMap al = e.attributes();
-    for(x = 0; x < al.count(); ++x)
+    for (x = 0; x < al.count(); ++x)
         i.setAttributeNode(al.item(x).cloneNode().toAttr());
 
-    if(!noShowNS)
+    if (!noShowNS)
         i.setAttribute("xmlns", e.namespaceURI());
 
     // copy children
     QDomNodeList nl = e.childNodes();
-    for(x = 0; x < nl.count(); ++x) {
+    for (x = 0; x < nl.count(); ++x) {
         QDomNode n = nl.item(x);
-        if(n.isElement())
+        if (n.isElement())
             i.appendChild(oldStyleNS(n.toElement()));
         else
             i.appendChild(n.cloneNode());
@@ -837,9 +817,8 @@ static QDomElement oldStyleNS(const QDomElement &e)
     return i;
 }
 
-JT_Message::JT_Message(Task *parent, Message &msg)
-    : Task(parent)
-    , m(msg)
+JT_Message::JT_Message(Task *parent, Message &msg) :
+    Task(parent), m(msg)
 {
     if (msg.id().isEmpty())
         msg.setId(id());
@@ -852,11 +831,11 @@ JT_Message::~JT_Message()
 void JT_Message::onGo()
 {
 
-    Stanza s = m.toStanza(&(client()->stream()));
-    QDomElement e = s.element();//oldStyleNS(s.element());
+    Stanza      s = m.toStanza(&(client()->stream()));
+    QDomElement e = s.element(); //oldStyleNS(s.element());
 
     auto encryptionHandler = client()->encryptionHandler();
-    bool wasEncrypted = encryptionHandler && encryptionHandler->encryptMessageElement(e);
+    bool wasEncrypted      = encryptionHandler && encryptionHandler->encryptMessageElement(e);
     m.setWasEncrypted(wasEncrypted);
 
     // if the element is null, then the encryption is happening asynchronously
@@ -874,10 +853,10 @@ class JT_PushMessage::Private {
     EncryptionHandler *m_encryptionHandler;
 };
 
-JT_PushMessage::JT_PushMessage(Task *parent, EncryptionHandler *encryptionHandler)
-:Task(parent)
+JT_PushMessage::JT_PushMessage(Task *parent, EncryptionHandler *encryptionHandler) :
+    Task(parent)
 {
-    d = new Private;
+    d                      = new Private;
     d->m_encryptionHandler = encryptionHandler;
 }
 
@@ -888,7 +867,7 @@ JT_PushMessage::~JT_PushMessage()
 
 bool JT_PushMessage::take(const QDomElement &e)
 {
-    if(e.tagName() != "message")
+    if (e.tagName() != "message")
         return false;
 
     QDomElement e1 = e;
@@ -899,7 +878,7 @@ bool JT_PushMessage::take(const QDomElement &e)
         return true;
     }
 
-    QDomElement forward;
+    QDomElement        forward;
     Message::CarbonDir cd = Message::NoCarbon;
 
     Jid fromJid = Jid(e1.attribute(QLatin1String("from")));
@@ -917,13 +896,12 @@ bool JT_PushMessage::take(const QDomElement &e)
                 QDomElement el2 = el1.firstChildElement(QLatin1String("message"));
                 if (!el2.isNull()) {
                     forward = el2;
-                    cd = el.tagName() == QLatin1String("received")? Message::Received : Message::Sent;
+                    cd      = el.tagName() == QLatin1String("received") ? Message::Received : Message::Sent;
                     break;
                 }
             }
-        }
-        else if (el.tagName() == QLatin1String("forwarded")
-             && el.namespaceURI() == QLatin1String("urn:xmpp:forward:0")) {
+        } else if (el.tagName() == QLatin1String("forwarded")
+                   && el.namespaceURI() == QLatin1String("urn:xmpp:forward:0")) {
             forward = el.firstChildElement(QLatin1String("message")); // currently only messages are supportted
             // TODO <delay> element support
             if (!forward.isNull()) {
@@ -932,14 +910,14 @@ bool JT_PushMessage::take(const QDomElement &e)
         }
     }
 
-    Stanza s = client()->stream().createStanza(addCorrectNS(forward.isNull()? e1 : forward));
-    if(s.isNull()) {
+    Stanza s = client()->stream().createStanza(addCorrectNS(forward.isNull() ? e1 : forward));
+    if (s.isNull()) {
         //printf("take: bad stanza??\n");
         return false;
     }
 
     Message m;
-    if(!m.fromStanza(s, client()->manualTimeZoneOffset(), client()->timeZoneOffset())) {
+    if (!m.fromStanza(s, client()->manualTimeZoneOffset(), client()->timeZoneOffset())) {
         //printf("bad message\n");
         return false;
     }
@@ -956,21 +934,20 @@ bool JT_PushMessage::take(const QDomElement &e)
 //----------------------------------------------------------------------------
 // JT_VCard
 //----------------------------------------------------------------------------
-class JT_VCard::Private
-{
+class JT_VCard::Private {
 public:
     Private() = default;
 
     QDomElement iq;
-    Jid jid;
-    VCard vcard;
+    Jid         jid;
+    VCard       vcard;
 };
 
-JT_VCard::JT_VCard(Task *parent)
-:Task(parent)
+JT_VCard::JT_VCard(Task *parent) :
+    Task(parent)
 {
     type = -1;
-    d = new Private;
+    d    = new Private;
 }
 
 JT_VCard::~JT_VCard()
@@ -980,40 +957,40 @@ JT_VCard::~JT_VCard()
 
 void JT_VCard::get(const Jid &_jid)
 {
-    type = 0;
-    d->jid = _jid;
-    d->iq = createIQ(doc(), "get", type == 1 ? Jid().full() : d->jid.full(), id());
+    type          = 0;
+    d->jid        = _jid;
+    d->iq         = createIQ(doc(), "get", type == 1 ? Jid().full() : d->jid.full(), id());
     QDomElement v = doc()->createElementNS("vcard-temp", "vCard");
     d->iq.appendChild(v);
 }
 
-const Jid & JT_VCard::jid() const
+const Jid &JT_VCard::jid() const
 {
     return d->jid;
 }
 
-const VCard & JT_VCard::vcard() const
+const VCard &JT_VCard::vcard() const
 {
     return d->vcard;
 }
 
 void JT_VCard::set(const VCard &card)
 {
-    type = 1;
+    type     = 1;
     d->vcard = card;
-    d->jid = "";
-    d->iq = createIQ(doc(), "set", d->jid.full(), id());
-    d->iq.appendChild(card.toXml(doc()) );
+    d->jid   = "";
+    d->iq    = createIQ(doc(), "set", d->jid.full(), id());
+    d->iq.appendChild(card.toXml(doc()));
 }
 
 // isTarget is when we setting target's vcard. for example in case of muc own vcard
 void JT_VCard::set(const Jid &j, const VCard &card, bool isTarget)
 {
-    type = 1;
+    type     = 1;
     d->vcard = card;
-    d->jid = j;
-    d->iq = createIQ(doc(), "set", isTarget? j.full() : "", id());
-    d->iq.appendChild(card.toXml(doc()) );
+    d->jid   = j;
+    d->iq    = createIQ(doc(), "set", isTarget ? j.full() : "", id());
+    d->iq.appendChild(card.toXml(doc()));
 }
 
 void JT_VCard::onGo()
@@ -1026,19 +1003,19 @@ bool JT_VCard::take(const QDomElement &x)
     Jid to = d->jid;
     if (to.bare() == client()->jid().bare())
         to = client()->host();
-    if(!iqVerify(x, to, id()))
+    if (!iqVerify(x, to, id()))
         return false;
 
-    if(x.attribute("type") == "result") {
-        if(type == 0) {
-            for(QDomNode n = x.firstChild(); !n.isNull(); n = n.nextSibling()) {
+    if (x.attribute("type") == "result") {
+        if (type == 0) {
+            for (QDomNode n = x.firstChild(); !n.isNull(); n = n.nextSibling()) {
                 QDomElement q = n.toElement();
-                if(q.isNull())
+                if (q.isNull())
                     continue;
 
-                if(q.tagName().toUpper() == "VCARD") {
+                if (q.tagName().toUpper() == "VCARD") {
                     d->vcard = VCard::fromXml(q);
-                    if(d->vcard) {
+                    if (d->vcard) {
                         setSuccess();
                         return true;
                     }
@@ -1047,13 +1024,11 @@ bool JT_VCard::take(const QDomElement &x)
 
             setError(ErrDisc + 1, tr("No VCard available"));
             return true;
-        }
-        else {
+        } else {
             setSuccess();
             return true;
         }
-    }
-    else {
+    } else {
         setError(x);
     }
 
@@ -1063,22 +1038,21 @@ bool JT_VCard::take(const QDomElement &x)
 //----------------------------------------------------------------------------
 // JT_Search
 //----------------------------------------------------------------------------
-class JT_Search::Private
-{
+class JT_Search::Private {
 public:
     Private() = default;
 
-    Jid jid;
-    Form form;
-    bool hasXData = false;
-    XData xdata;
+    Jid                 jid;
+    Form                form;
+    bool                hasXData = false;
+    XData               xdata;
     QList<SearchResult> resultList;
 };
 
-JT_Search::JT_Search(Task *parent)
-:Task(parent)
+JT_Search::JT_Search(Task *parent) :
+    Task(parent)
 {
-    d = new Private;
+    d    = new Private;
     type = -1;
 }
 
@@ -1089,31 +1063,31 @@ JT_Search::~JT_Search()
 
 void JT_Search::get(const Jid &jid)
 {
-    type = 0;
-    d->jid = jid;
-    d->hasXData = false;
-    d->xdata = XData();
-    iq = createIQ(doc(), "get", d->jid.full(), id());
+    type              = 0;
+    d->jid            = jid;
+    d->hasXData       = false;
+    d->xdata          = XData();
+    iq                = createIQ(doc(), "get", d->jid.full(), id());
     QDomElement query = doc()->createElementNS("jabber:iq:search", "query");
     iq.appendChild(query);
 }
 
 void JT_Search::set(const Form &form)
 {
-    type = 1;
-    d->jid = form.jid();
-    d->hasXData = false;
-    d->xdata = XData();
-    iq = createIQ(doc(), "set", d->jid.full(), id());
+    type              = 1;
+    d->jid            = form.jid();
+    d->hasXData       = false;
+    d->xdata          = XData();
+    iq                = createIQ(doc(), "set", d->jid.full(), id());
     QDomElement query = doc()->createElementNS("jabber:iq:search", "query");
     iq.appendChild(query);
 
     // key?
-    if(!form.key().isEmpty())
+    if (!form.key().isEmpty())
         query.appendChild(textTag(doc(), "key", form.key()));
 
     // fields
-    for(Form::ConstIterator it = form.begin(); it != form.end(); ++it) {
+    for (Form::ConstIterator it = form.begin(); it != form.end(); ++it) {
         const FormField &f = *it;
         query.appendChild(textTag(doc(), f.realName(), f.value()));
     }
@@ -1121,22 +1095,22 @@ void JT_Search::set(const Form &form)
 
 void JT_Search::set(const Jid &jid, const XData &form)
 {
-    type = 1;
-    d->jid = jid;
-    d->hasXData = false;
-    d->xdata = XData();
-    iq = createIQ(doc(), "set", d->jid.full(), id());
+    type              = 1;
+    d->jid            = jid;
+    d->hasXData       = false;
+    d->xdata          = XData();
+    iq                = createIQ(doc(), "set", d->jid.full(), id());
     QDomElement query = doc()->createElementNS("jabber:iq:search", "query");
     iq.appendChild(query);
     query.appendChild(form.toXml(doc(), true));
 }
 
-const Form & JT_Search::form() const
+const Form &JT_Search::form() const
 {
     return d->form;
 }
 
-const QList<SearchResult> & JT_Search::results() const
+const QList<SearchResult> &JT_Search::results() const
 {
     return d->resultList;
 }
@@ -1146,7 +1120,7 @@ bool JT_Search::hasXData() const
     return d->hasXData;
 }
 
-const XData & JT_Search::xdata() const
+const XData &JT_Search::xdata() const
 {
     return d->xdata;
 }
@@ -1158,76 +1132,72 @@ void JT_Search::onGo()
 
 bool JT_Search::take(const QDomElement &x)
 {
-    if(!iqVerify(x, d->jid, id()))
+    if (!iqVerify(x, d->jid, id()))
         return false;
 
     Jid from(x.attribute("from"));
-    if(x.attribute("type") == "result") {
-        if(type == 0) {
+    if (x.attribute("type") == "result") {
+        if (type == 0) {
             d->form.clear();
             d->form.setJid(from);
 
             QDomElement q = queryTag(x);
-            for(QDomNode n = q.firstChild(); !n.isNull(); n = n.nextSibling()) {
+            for (QDomNode n = q.firstChild(); !n.isNull(); n = n.nextSibling()) {
                 QDomElement i = n.toElement();
-                if(i.isNull())
+                if (i.isNull())
                     continue;
 
-                if(i.tagName() == "instructions")
+                if (i.tagName() == "instructions")
                     d->form.setInstructions(tagContent(i));
-                else if(i.tagName() == "key")
+                else if (i.tagName() == "key")
                     d->form.setKey(tagContent(i));
-                else if(i.tagName() == "x" && i.namespaceURI() == "jabber:x:data") {
+                else if (i.tagName() == "x" && i.namespaceURI() == "jabber:x:data") {
                     d->xdata.fromXml(i);
                     d->hasXData = true;
-                }
-                else {
+                } else {
                     FormField f;
-                    if(f.setType(i.tagName())) {
+                    if (f.setType(i.tagName())) {
                         f.setValue(tagContent(i));
                         d->form += f;
                     }
                 }
             }
-        }
-        else {
+        } else {
             d->resultList.clear();
 
             QDomElement q = queryTag(x);
-            for(QDomNode n = q.firstChild(); !n.isNull(); n = n.nextSibling()) {
+            for (QDomNode n = q.firstChild(); !n.isNull(); n = n.nextSibling()) {
                 QDomElement i = n.toElement();
-                if(i.isNull())
+                if (i.isNull())
                     continue;
 
-                if(i.tagName() == "item") {
+                if (i.tagName() == "item") {
                     SearchResult r(Jid(i.attribute("jid")));
 
                     QDomElement tag;
 
                     tag = i.firstChildElement("nick");
-                    if(!tag.isNull())
+                    if (!tag.isNull())
                         r.setNick(tagContent(tag));
                     tag = i.firstChildElement("first");
-                    if(!tag.isNull())
+                    if (!tag.isNull())
                         r.setFirst(tagContent(tag));
                     tag = i.firstChildElement("last");
-                    if(!tag.isNull())
+                    if (!tag.isNull())
                         r.setLast(tagContent(tag));
                     tag = i.firstChildElement("email");
-                    if(!tag.isNull())
+                    if (!tag.isNull())
                         r.setEmail(tagContent(tag));
 
                     d->resultList += r;
-                }
-                else if(i.tagName() == "x" && i.namespaceURI() == "jabber:x:data") {
+                } else if (i.tagName() == "x" && i.namespaceURI() == "jabber:x:data") {
                     d->xdata.fromXml(i);
                     d->hasXData = true;
                 }
             }
         }
         setSuccess();
-    }
-    else {
+    } else {
         setError(x);
     }
 
@@ -1237,15 +1207,15 @@ bool JT_Search::take(const QDomElement &x)
 //----------------------------------------------------------------------------
 // JT_ClientVersion
 //----------------------------------------------------------------------------
-JT_ClientVersion::JT_ClientVersion(Task *parent)
-:Task(parent)
+JT_ClientVersion::JT_ClientVersion(Task *parent) :
+    Task(parent)
 {
 }
 
 void JT_ClientVersion::get(const Jid &jid)
 {
-    j = jid;
-    iq = createIQ(doc(), "get", j.full(), id());
+    j                 = jid;
+    iq                = createIQ(doc(), "get", j.full(), id());
     QDomElement query = doc()->createElementNS("jabber:iq:version", "query");
     iq.appendChild(query);
 }
@@ -1257,47 +1227,46 @@ void JT_ClientVersion::onGo()
 
 bool JT_ClientVersion::take(const QDomElement &x)
 {
-    if(!iqVerify(x, j, id()))
+    if (!iqVerify(x, j, id()))
         return false;
 
-    if(x.attribute("type") == "result") {
+    if (x.attribute("type") == "result") {
         QDomElement q = queryTag(x);
         QDomElement tag;
         tag = q.firstChildElement("name");
-        if(!tag.isNull())
+        if (!tag.isNull())
             v_name = tagContent(tag);
         tag = q.firstChildElement("version");
-        if(!tag.isNull())
+        if (!tag.isNull())
             v_ver = tagContent(tag);
         tag = q.firstChildElement("os");
-        if(!tag.isNull())
+        if (!tag.isNull())
             v_os = tagContent(tag);
 
         setSuccess();
-    }
-    else {
+    } else {
         setError(x);
     }
 
     return true;
 }
 
-const Jid & JT_ClientVersion::jid() const
+const Jid &JT_ClientVersion::jid() const
 {
     return j;
 }
 
-const QString & JT_ClientVersion::name() const
+const QString &JT_ClientVersion::name() const
 {
     return v_name;
 }
 
-const QString & JT_ClientVersion::version() const
+const QString &JT_ClientVersion::version() const
 {
     return v_ver;
 }
 
-const QString & JT_ClientVersion::os() const
+const QString &JT_ClientVersion::os() const
 {
     return v_os;
 }
@@ -1305,14 +1274,15 @@ const QString & JT_ClientVersion::os() const
 //----------------------------------------------------------------------------
 // JT_EntityTime
 //----------------------------------------------------------------------------
-JT_EntityTime::JT_EntityTime(Task* parent) : Task(parent)
+JT_EntityTime::JT_EntityTime(Task *parent) :
+    Task(parent)
 {
 }
 
 /**
  * \brief Queried entity's JID.
  */
-const Jid & JT_EntityTime::jid() const
+const Jid &JT_EntityTime::jid() const
 {
     return j;
 }
@@ -1322,8 +1292,8 @@ const Jid & JT_EntityTime::jid() const
  */
 void JT_EntityTime::get(const Jid &jid)
 {
-    j = jid;
-    iq = createIQ(doc(), "get", jid.full(), id());
+    j                = jid;
+    iq               = createIQ(doc(), "get", jid.full(), id());
     QDomElement time = doc()->createElementNS("urn:xmpp:time", "time");
     iq.appendChild(time);
 }
@@ -1357,18 +1327,16 @@ bool JT_EntityTime::take(const QDomElement &x)
             }
             setSuccess();
             return true;
-        }
-        while (false);
+        } while (false);
         setError(406);
-    }
-    else {
+    } else {
         setError(x);
     }
 
     return true;
 }
 
-const QDateTime & JT_EntityTime::dateTime() const
+const QDateTime &JT_EntityTime::dateTime() const
 {
     return utc;
 }
@@ -1381,8 +1349,8 @@ int JT_EntityTime::timezoneOffset() const
 //----------------------------------------------------------------------------
 // JT_ServInfo
 //----------------------------------------------------------------------------
-JT_ServInfo::JT_ServInfo(Task *parent)
-:Task(parent)
+JT_ServInfo::JT_ServInfo(Task *parent) :
+    Task(parent)
 {
 }
 
@@ -1392,12 +1360,12 @@ JT_ServInfo::~JT_ServInfo()
 
 bool JT_ServInfo::take(const QDomElement &e)
 {
-    if(e.tagName() != "iq" || e.attribute("type") != "get")
+    if (e.tagName() != "iq" || e.attribute("type") != "get")
         return false;
 
     QString ns = queryNS(e);
-    if(ns == "jabber:iq:version") {
-        QDomElement iq = createIQ(doc(), "result", e.attribute("from"), e.attribute("id"));
+    if (ns == "jabber:iq:version") {
+        QDomElement iq    = createIQ(doc(), "result", e.attribute("from"), e.attribute("id"));
         QDomElement query = doc()->createElementNS("jabber:iq:version", "query");
         iq.appendChild(query);
         query.appendChild(textTag(doc(), "name", client()->clientName()));
@@ -1405,22 +1373,20 @@ bool JT_ServInfo::take(const QDomElement &e)
         query.appendChild(textTag(doc(), "os", client()->OSName() + ' ' + client()->OSVersion()));
         send(iq);
         return true;
-    }
-    else if(ns == "http://jabber.org/protocol/disco#info") {
+    } else if (ns == "http://jabber.org/protocol/disco#info") {
         // Find out the node
-        QString node;
+        QString     node;
         QDomElement q = e.firstChildElement("query");
-        if(!q.isNull()) // NOTE: Should always be true, since a NS was found above
+        if (!q.isNull()) // NOTE: Should always be true, since a NS was found above
             node = q.attribute("node");
 
         if (node.isEmpty() || node == client()->caps().flatten()) {
 
-            QDomElement iq = createIQ(doc(), "result", e.attribute("from"), e.attribute("id"));
-            DiscoItem item = client()->makeDiscoResult(node);
+            QDomElement iq   = createIQ(doc(), "result", e.attribute("from"), e.attribute("id"));
+            DiscoItem   item = client()->makeDiscoResult(node);
             iq.appendChild(item.toDiscoInfoResult(doc()));
             send(iq);
-        }
-        else {
+        } else {
             // Create error reply
             QDomElement error_reply = createIQ(doc(), "result", e.attribute("from"), e.attribute("id"));
 
@@ -1431,7 +1397,7 @@ bool JT_ServInfo::take(const QDomElement &e)
 
             // Add error
             QDomElement error = doc()->createElement("error");
-            error.setAttribute("type","cancel");
+            error.setAttribute("type", "cancel");
             error_reply.appendChild(error);
             QDomElement error_type = doc()->createElementNS("urn:ietf:params:xml:ns:xmpp-stanzas", "item-not-found");
             error.appendChild(error_type);
@@ -1445,14 +1411,14 @@ bool JT_ServInfo::take(const QDomElement &e)
 
     ns = e.firstChildElement("time").namespaceURI();
     if (ns == "urn:xmpp:time") {
-        QDomElement iq = createIQ(doc(), "result", e.attribute("from"), e.attribute("id"));
+        QDomElement iq   = createIQ(doc(), "result", e.attribute("from"), e.attribute("id"));
         QDomElement time = doc()->createElementNS(ns, "time");
         iq.appendChild(time);
 
         QDateTime local = QDateTime::currentDateTime();
 
-        int off = TimeZone::offsetFromUtc();
-        QTime t = QTime(0, 0).addSecs(qAbs(off)*60);
+        int     off = TimeZone::offsetFromUtc();
+        QTime   t   = QTime(0, 0).addSecs(qAbs(off) * 60);
         QString tzo = (off < 0 ? "-" : "+") + t.toString("HH:mm");
         time.appendChild(textTag(doc(), "tzo", tzo));
         QString localTimeStr = local.toUTC().toString(Qt::ISODate);
@@ -1470,27 +1436,27 @@ bool JT_ServInfo::take(const QDomElement &e)
 //----------------------------------------------------------------------------
 // JT_Gateway
 //----------------------------------------------------------------------------
-JT_Gateway::JT_Gateway(Task *parent)
-:Task(parent)
+JT_Gateway::JT_Gateway(Task *parent) :
+    Task(parent)
 {
     type = -1;
 }
 
 void JT_Gateway::get(const Jid &jid)
 {
-    type = 0;
-    v_jid = jid;
-    iq = createIQ(doc(), "get", v_jid.full(), id());
+    type              = 0;
+    v_jid             = jid;
+    iq                = createIQ(doc(), "get", v_jid.full(), id());
     QDomElement query = doc()->createElementNS("jabber:iq:gateway", "query");
     iq.appendChild(query);
 }
 
 void JT_Gateway::set(const Jid &jid, const QString &prompt)
 {
-    type = 1;
-    v_jid = jid;
-    v_prompt = prompt;
-    iq = createIQ(doc(), "set", v_jid.full(), id());
+    type              = 1;
+    v_jid             = jid;
+    v_prompt          = prompt;
+    iq                = createIQ(doc(), "set", v_jid.full(), id());
     QDomElement query = doc()->createElementNS("jabber:iq:gateway", "query");
     iq.appendChild(query);
     query.appendChild(textTag(doc(), "prompt", v_prompt));
@@ -1523,11 +1489,11 @@ Jid JT_Gateway::translatedJid() const
 
 bool JT_Gateway::take(const QDomElement &x)
 {
-    if(!iqVerify(x, v_jid, id()))
+    if (!iqVerify(x, v_jid, id()))
         return false;
 
-    if(x.attribute("type") == "result") {
-        if(type == 0) {
+    if (x.attribute("type") == "result") {
+        if (type == 0) {
             QDomElement query = queryTag(x);
             QDomElement tag;
             tag = query.firstChildElement("desc");
@@ -1538,8 +1504,7 @@ bool JT_Gateway::take(const QDomElement &x)
             if (!tag.isNull()) {
                 v_prompt = tagContent(tag);
             }
-        }
-        else {
+        } else {
             QDomElement query = queryTag(x);
             QDomElement tag;
             tag = query.firstChildElement("jid");
@@ -1555,8 +1520,7 @@ bool JT_Gateway::take(const QDomElement &x)
         }
 
         setSuccess();
-    }
-    else {
+    } else {
         setError(x);
     }
 
@@ -1566,19 +1530,18 @@ bool JT_Gateway::take(const QDomElement &x)
 //----------------------------------------------------------------------------
 // JT_DiscoItems
 //----------------------------------------------------------------------------
-class JT_DiscoItems::Private
-{
+class JT_DiscoItems::Private {
 public:
-    Private() { }
+    Private() {}
 
     QDomElement iq;
-    Jid jid;
-    DiscoList items;
+    Jid         jid;
+    DiscoList   items;
     QDomElement subsetsEl;
 };
 
-JT_DiscoItems::JT_DiscoItems(Task *parent)
-: Task(parent)
+JT_DiscoItems::JT_DiscoItems(Task *parent) :
+    Task(parent)
 {
     d = new Private;
 }
@@ -1593,15 +1556,15 @@ void JT_DiscoItems::get(const DiscoItem &item)
     get(item.jid(), item.node());
 }
 
-void JT_DiscoItems::get (const Jid &j, const QString &node)
+void JT_DiscoItems::get(const Jid &j, const QString &node)
 {
     d->items.clear();
 
-    d->jid = j;
-    d->iq = createIQ(doc(), "get", d->jid.full(), id());
+    d->jid            = j;
+    d->iq             = createIQ(doc(), "get", d->jid.full(), id());
     QDomElement query = doc()->createElementNS("http://jabber.org/protocol/disco#items", "query");
 
-    if ( !node.isEmpty() )
+    if (!node.isEmpty())
         query.setAttribute("node", node);
 
     if (!d->subsetsEl.isNull()) {
@@ -1619,7 +1582,7 @@ const DiscoList &JT_DiscoItems::items() const
 
 void JT_DiscoItems::includeSubsetQuery(const SubsetsClientManager &subsets)
 {
-        d->subsetsEl = subsets.makeQueryElement(doc());
+    d->subsetsEl = subsets.makeQueryElement(doc());
 }
 
 bool JT_DiscoItems::extractSubsetInfo(SubsetsClientManager &subsets)
@@ -1627,42 +1590,40 @@ bool JT_DiscoItems::extractSubsetInfo(SubsetsClientManager &subsets)
     return d->subsetsEl.isNull() ? false : subsets.updateFromElement(d->subsetsEl, d->items.count());
 }
 
-void JT_DiscoItems::onGo ()
+void JT_DiscoItems::onGo()
 {
     send(d->iq);
 }
 
 bool JT_DiscoItems::take(const QDomElement &x)
 {
-    if(!iqVerify(x, d->jid, id()))
+    if (!iqVerify(x, d->jid, id()))
         return false;
 
-    if(x.attribute("type") == "result") {
+    if (x.attribute("type") == "result") {
         QDomElement q = queryTag(x);
 
-        for(QDomNode n = q.firstChild(); !n.isNull(); n = n.nextSibling()) {
+        for (QDomNode n = q.firstChild(); !n.isNull(); n = n.nextSibling()) {
             QDomElement e = n.toElement();
-            if( e.isNull() )
+            if (e.isNull())
                 continue;
 
-            if ( e.tagName() == "item" ) {
+            if (e.tagName() == "item") {
                 DiscoItem item;
 
-                item.setJid ( e.attribute("jid")  );
-                item.setName( e.attribute("name") );
-                item.setNode( e.attribute("node") );
-                item.setAction( DiscoItem::string2action(e.attribute("action")) );
+                item.setJid(e.attribute("jid"));
+                item.setName(e.attribute("name"));
+                item.setNode(e.attribute("node"));
+                item.setAction(DiscoItem::string2action(e.attribute("action")));
 
-                d->items.append( item );
-            }
-            else if (d->subsetsEl.isNull()) {
+                d->items.append(item);
+            } else if (d->subsetsEl.isNull()) {
                 d->subsetsEl = SubsetsClientManager::findElement(e, false);
             }
         }
 
         setSuccess();
-    }
-    else {
+    } else {
         setError(x);
     }
 
@@ -1672,18 +1633,17 @@ bool JT_DiscoItems::take(const QDomElement &x)
 //----------------------------------------------------------------------------
 // JT_DiscoPublish
 //----------------------------------------------------------------------------
-class JT_DiscoPublish::Private
-{
+class JT_DiscoPublish::Private {
 public:
-    Private() { }
+    Private() {}
 
     QDomElement iq;
-    Jid jid;
-    DiscoList list;
+    Jid         jid;
+    DiscoList   list;
 };
 
-JT_DiscoPublish::JT_DiscoPublish(Task *parent)
-: Task(parent)
+JT_DiscoPublish::JT_DiscoPublish(Task *parent) :
+    Task(parent)
 {
     d = new Private;
 }
@@ -1696,9 +1656,9 @@ JT_DiscoPublish::~JT_DiscoPublish()
 void JT_DiscoPublish::set(const Jid &j, const DiscoList &list)
 {
     d->list = list;
-    d->jid = j;
+    d->jid  = j;
 
-    d->iq = createIQ(doc(), "set", d->jid.full(), id());
+    d->iq             = createIQ(doc(), "set", d->jid.full(), id());
     QDomElement query = doc()->createElementNS("http://jabber.org/protocol/disco#items", "query");
 
     // FIXME: unsure about this
@@ -1706,36 +1666,35 @@ void JT_DiscoPublish::set(const Jid &j, const DiscoList &list)
     //    query.setAttribute("node", node);
 
     DiscoList::ConstIterator it = list.begin();
-    for ( ; it != list.end(); ++it) {
+    for (; it != list.end(); ++it) {
         QDomElement w = doc()->createElement("item");
 
         w.setAttribute("jid", (*it).jid().full());
-        if ( !(*it).name().isEmpty() )
+        if (!(*it).name().isEmpty())
             w.setAttribute("name", (*it).name());
-        if ( !(*it).node().isEmpty() )
-        w.setAttribute("node", (*it).node());
+        if (!(*it).node().isEmpty())
+            w.setAttribute("node", (*it).node());
         w.setAttribute("action", DiscoItem::action2string((*it).action()));
 
-        query.appendChild( w );
+        query.appendChild(w);
     }
 
     d->iq.appendChild(query);
 }
 
-void JT_DiscoPublish::onGo ()
+void JT_DiscoPublish::onGo()
 {
     send(d->iq);
 }
 
 bool JT_DiscoPublish::take(const QDomElement &x)
 {
-    if(!iqVerify(x, d->jid, id()))
+    if (!iqVerify(x, d->jid, id()))
         return false;
 
-    if(x.attribute("type") == "result") {
+    if (x.attribute("type") == "result") {
         setSuccess();
-    }
-    else {
+    } else {
         setError(x);
     }
 
@@ -1745,10 +1704,9 @@ bool JT_DiscoPublish::take(const QDomElement &x)
 // ---------------------------------------------------------
 // JT_BoBServer
 // ---------------------------------------------------------
-JT_BoBServer::JT_BoBServer(Task *parent)
-    : Task(parent)
+JT_BoBServer::JT_BoBServer(Task *parent) :
+    Task(parent)
 {
-
 }
 
 bool JT_BoBServer::take(const QDomElement &e)
@@ -1759,15 +1717,14 @@ bool JT_BoBServer::take(const QDomElement &e)
     QDomElement data = e.firstChildElement("data");
     if (data.namespaceURI() == "urn:xmpp:bob") {
         QDomElement iq;
-        BoBData bd = client()->bobManager()->bobData(data.attribute("cid"));
+        BoBData     bd = client()->bobManager()->bobData(data.attribute("cid"));
         if (bd.isNull()) {
             iq = createIQ(client()->doc(), "error",
                           e.attribute("from"), e.attribute("id"));
             Stanza::Error error(Stanza::Error::Cancel,
                                 Stanza::Error::ItemNotFound);
             iq.appendChild(error.toXml(*doc(), client()->stream().baseNS()));
-        }
-        else {
+        } else {
             iq = createIQ(doc(), "result", e.attribute("from"), e.attribute("id"));
             iq.appendChild(bd.toXml(doc()));
         }
@@ -1780,19 +1737,18 @@ bool JT_BoBServer::take(const QDomElement &e)
 //----------------------------------------------------------------------------
 // JT_BitsOfBinary
 //----------------------------------------------------------------------------
-class JT_BitsOfBinary::Private
-{
+class JT_BitsOfBinary::Private {
 public:
-    Private() { }
+    Private() {}
 
     QDomElement iq;
-    Jid jid;
-    QString cid;
-    BoBData data;
+    Jid         jid;
+    QString     cid;
+    BoBData     data;
 };
 
-JT_BitsOfBinary::JT_BitsOfBinary(Task *parent)
-: Task(parent)
+JT_BitsOfBinary::JT_BitsOfBinary(Task *parent) :
+    Task(parent)
 {
     d = new Private;
 }
@@ -1809,7 +1765,7 @@ void JT_BitsOfBinary::get(const Jid &j, const QString &cid)
 
     d->data = client()->bobManager()->bobData(cid);
     if (d->data.isNull()) {
-        d->iq = createIQ(doc(), "get", d->jid.full(), id());
+        d->iq            = createIQ(doc(), "get", d->jid.full(), id());
         QDomElement data = doc()->createElementNS("urn:xmpp:bob", "data");
         data.setAttribute("cid", cid);
         d->iq.appendChild(data);
@@ -1820,8 +1776,7 @@ void JT_BitsOfBinary::onGo()
 {
     if (d->data.isNull()) {
         send(d->iq);
-    }
-    else {
+    } else {
         setSuccess();
     }
 }
@@ -1841,8 +1796,7 @@ bool JT_BitsOfBinary::take(const QDomElement &x)
         }
 
         setSuccess();
-    }
-    else {
+    } else {
         setError(x);
     }
 
@@ -1862,10 +1816,9 @@ BoBData &JT_BitsOfBinary::data()
  * \brief Answers XMPP Pings
  */
 
-JT_PongServer::JT_PongServer(Task *parent)
-:Task(parent)
+JT_PongServer::JT_PongServer(Task *parent) :
+    Task(parent)
 {
-
 }
 
 bool JT_PongServer::take(const QDomElement &e)
@@ -1885,10 +1838,9 @@ bool JT_PongServer::take(const QDomElement &e)
 //---------------------------------------------------------------------------
 // JT_CaptchaChallenger
 //---------------------------------------------------------------------------
-class JT_CaptchaChallenger::Private
-{
+class JT_CaptchaChallenger::Private {
 public:
-    Jid j;
+    Jid              j;
     CaptchaChallenge challenge;
 };
 
@@ -1905,7 +1857,7 @@ JT_CaptchaChallenger::~JT_CaptchaChallenger()
 
 void JT_CaptchaChallenger::set(const Jid &j, const CaptchaChallenge &c)
 {
-    d->j = j;
+    d->j         = j;
     d->challenge = c;
 }
 
@@ -1918,8 +1870,8 @@ void JT_CaptchaChallenger::onGo()
     m.setBody(d->challenge.explanation());
     m.setUrlList(d->challenge.urls());
 
-    XData form = d->challenge.form();
-    XData::FieldList fl = form.fields();
+    XData                      form = d->challenge.form();
+    XData::FieldList           fl   = form.fields();
     XData::FieldList::Iterator it;
     for (it = fl.begin(); it < fl.end(); ++it) {
         if (it->var() == "challenge" && it->type() == XData::Field::Field_Hidden) {
@@ -1942,27 +1894,20 @@ void JT_CaptchaChallenger::onGo()
 
 bool JT_CaptchaChallenger::take(const QDomElement &x)
 {
-    if(x.tagName() == "message" && x.attribute("id") == id() &&
-            Jid(x.attribute("from")) == d->j && !x.firstChildElement("error").isNull())
-    {
+    if (x.tagName() == "message" && x.attribute("id") == id() && Jid(x.attribute("from")) == d->j && !x.firstChildElement("error").isNull()) {
         setError(x);
         return true;
     }
 
     XDomNodeList nl;
-    XData xd;
-    QString rid = x.attribute("id");
-    if (rid.isEmpty() || x.tagName() != "iq" ||
-            Jid(x.attribute("from")) != d->j || x.attribute("type") != "set" ||
-            (nl = childElementsByTagNameNS(x, "urn:xmpp:captcha", "captcha")).isEmpty() ||
-            (nl = childElementsByTagNameNS(nl.item(0).toElement(), "jabber:x:data", "x")).isEmpty() ||
-            (xd.fromXml(nl.item(0).toElement()), xd.getField("challenge").value().value(0) != id()))
-    {
+    XData        xd;
+    QString      rid = x.attribute("id");
+    if (rid.isEmpty() || x.tagName() != "iq" || Jid(x.attribute("from")) != d->j || x.attribute("type") != "set" || (nl = childElementsByTagNameNS(x, "urn:xmpp:captcha", "captcha")).isEmpty() || (nl = childElementsByTagNameNS(nl.item(0).toElement(), "jabber:x:data", "x")).isEmpty() || (xd.fromXml(nl.item(0).toElement()), xd.getField("challenge").value().value(0) != id())) {
         return false;
     }
 
     CaptchaChallenge::Result r = d->challenge.validateResponse(xd);
-    QDomElement iq;
+    QDomElement              iq;
     if (r == CaptchaChallenge::Passed) {
         iq = createIQ(doc(), "result", d->j.full(), rid);
     } else {
@@ -1988,7 +1933,8 @@ bool JT_CaptchaChallenger::take(const QDomElement &x)
 //---------------------------------------------------------------------------
 JT_CaptchaSender::JT_CaptchaSender(Task *parent) :
     Task(parent)
-{}
+{
+}
 
 void JT_CaptchaSender::set(const Jid &j, const XData &xd)
 {
@@ -1996,7 +1942,7 @@ void JT_CaptchaSender::set(const Jid &j, const XData &xd)
 
     iq = createIQ(doc(), "set", to.full(), id());
     iq.appendChild(doc()->createElementNS("urn:xmpp:captcha", "captcha"))
-            .appendChild(xd.toXml(doc(), true));
+        .appendChild(xd.toXml(doc(), true));
 }
 
 void JT_CaptchaSender::onGo()
@@ -2012,8 +1958,7 @@ bool JT_CaptchaSender::take(const QDomElement &x)
 
     if (x.attribute("type") == "result") {
         setSuccess();
-    }
-    else {
+    } else {
         setError(x);
     }
 
@@ -2023,10 +1968,9 @@ bool JT_CaptchaSender::take(const QDomElement &x)
 //----------------------------------------------------------------------------
 // JT_MessageCarbons
 //----------------------------------------------------------------------------
-JT_MessageCarbons::JT_MessageCarbons(Task *parent)
-    : Task(parent)
+JT_MessageCarbons::JT_MessageCarbons(Task *parent) :
+    Task(parent)
 {
-
 }
 
 void JT_MessageCarbons::enable()
diff --git a/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp b/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
index 927e3c01..bba61fe5 100644
--- a/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
+++ b/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
@@ -43,7 +43,7 @@ XDomNodeList::XDomNodeList(const XDomNodeList &from) :
 
 XDomNodeList::XDomNodeList(const QDomNodeList &from)
 {
-    for(int n = 0; n < from.count(); ++n)
+    for (int n = 0; n < from.count(); ++n)
         list += from.item(n);
 }
 
@@ -51,7 +51,7 @@ XDomNodeList::~XDomNodeList()
 {
 }
 
-XDomNodeList & XDomNodeList::operator=(const XDomNodeList &from)
+XDomNodeList &XDomNodeList::operator=(const XDomNodeList &from)
 {
     list = from.list;
     return *this;
@@ -85,25 +85,25 @@ void XDomNodeList::append(const QDomNode &i)
 // YYYYMMDDThh:mm:ss
 QDateTime stamp2TS(const QString &ts)
 {
-    if(ts.length() != 17)
+    if (ts.length() != 17)
         return QDateTime();
 
-    int year  = ts.mid(0,4).toInt();
-    int month = ts.mid(4,2).toInt();
-    int day   = ts.mid(6,2).toInt();
+    int year  = ts.mid(0, 4).toInt();
+    int month = ts.mid(4, 2).toInt();
+    int day   = ts.mid(6, 2).toInt();
 
-    int hour  = ts.mid(9,2).toInt();
-    int min   = ts.mid(12,2).toInt();
-    int sec   = ts.mid(15,2).toInt();
+    int hour = ts.mid(9, 2).toInt();
+    int min  = ts.mid(12, 2).toInt();
+    int sec  = ts.mid(15, 2).toInt();
 
     QDate xd;
     xd.setDate(year, month, day);
-    if(!xd.isValid())
+    if (!xd.isValid())
         return QDateTime();
 
     QTime xt;
     xt.setHMS(hour, min, sec);
-    if(!xt.isValid())
+    if (!xt.isValid())
         return QDateTime();
 
     return QDateTime(xd, xt);
@@ -125,20 +125,20 @@ QString TS2stamp(const QDateTime &d)
     QString str;
 
     str.sprintf("%04d%02d%02dT%02d:%02d:%02d",
-        d.date().year(),
-        d.date().month(),
-        d.date().day(),
-        d.time().hour(),
-        d.time().minute(),
-        d.time().second());
+                d.date().year(),
+                d.date().month(),
+                d.date().day(),
+                d.time().hour(),
+                d.time().minute(),
+                d.time().second());
 
     return str;
 }
 
 QDomElement textTag(QDomDocument *doc, const QString &name, const QString &content)
 {
-    QDomElement tag = doc->createElement(name);
-    QDomText text = doc->createTextNode(content);
+    QDomElement tag  = doc->createElement(name);
+    QDomText    text = doc->createTextNode(content);
     tag.appendChild(text);
 
     return tag;
@@ -146,8 +146,8 @@ QDomElement textTag(QDomDocument *doc, const QString &name, const QString &conte
 
 QDomElement textTagNS(QDomDocument *doc, const QString &ns, const QString &name, const QString &content)
 {
-    QDomElement tag = doc->createElementNS(ns, name);
-    QDomText text = doc->createTextNode(content);
+    QDomElement tag  = doc->createElementNS(ns, name);
+    QDomText    text = doc->createTextNode(content);
     tag.appendChild(text);
 
     return tag;
@@ -156,9 +156,9 @@ QDomElement textTagNS(QDomDocument *doc, const QString &ns, const QString &name,
 QString tagContent(const QDomElement &e)
 {
     // look for some tag content
-    for(QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling()) {
+    for (QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling()) {
         QDomText i = n.toText();
-        if(i.isNull())
+        if (i.isNull())
             continue;
         return i.data();
     }
@@ -178,11 +178,11 @@ QString tagContent(const QDomElement &e)
 XDomNodeList childElementsByTagNameNS(const QDomElement &e, const QString &nsURI, const QString &localName)
 {
     XDomNodeList out;
-    for(QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling()) {
-        if(!n.isElement())
+    for (QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling()) {
+        if (!n.isElement())
             continue;
         QDomElement i = n.toElement();
-        if(i.namespaceURI() == nsURI && i.localName() == localName)
+        if (i.namespaceURI() == nsURI && i.localName() == localName)
             out.append(i);
     }
     return out;
@@ -199,11 +199,11 @@ XDomNodeList childElementsByTagNameNS(const QDomElement &e, const QString &nsURI
 QDomElement createIQ(QDomDocument *doc, const QString &type, const QString &to, const QString &id)
 {
     QDomElement iq = doc->createElement("iq");
-    if(!type.isEmpty())
+    if (!type.isEmpty())
         iq.setAttribute("type", type);
-    if(!to.isEmpty())
+    if (!to.isEmpty())
         iq.setAttribute("to", to);
-    if(!id.isEmpty())
+    if (!id.isEmpty())
         iq.setAttribute("id", id);
 
     return iq;
@@ -246,15 +246,15 @@ QString queryNS(const QDomElement &e)
 void getErrorFromElement(const QDomElement &e, const QString &baseNS, int *code, QString *str)
 {
     QDomElement tag = e.firstChildElement("error");
-    if(tag.isNull())
+    if (tag.isNull())
         return;
 
     XMPP::Stanza::Error err;
     err.fromXml(tag, baseNS);
 
-    if(code)
+    if (code)
         *code = err.code();
-    if(str)
+    if (str)
         *str = err.toString();
 }
 
@@ -269,13 +269,13 @@ QDomElement addCorrectNS(const QDomElement &e)
         frag.appendChild(nl.item(x).cloneNode());*/
 
     // find from this to parent closest node with xmlns/namespaceURI
-    QDomNode n = e;
+    QDomNode       n     = e;
     static QString xmlns = QStringLiteral("xmlns");
-    while(!n.isNull() && !n.toElement().hasAttribute(xmlns) && n.toElement().namespaceURI().isEmpty())
+    while (!n.isNull() && !n.toElement().hasAttribute(xmlns) && n.toElement().namespaceURI().isEmpty())
         n = n.parentNode();
     QString ns;
-    if(n.isNull() || !n.toElement().hasAttribute(xmlns)) { // if not found or it's namespaceURI
-        if (n.toElement().namespaceURI().isEmpty()) { // if nothing found, then use default jabber:client namespace
+    if (n.isNull() || !n.toElement().hasAttribute(xmlns)) { // if not found or it's namespaceURI
+        if (n.toElement().namespaceURI().isEmpty()) {       // if nothing found, then use default jabber:client namespace
             ns = "jabber:client";
         } else {
             ns = n.toElement().namespaceURI();
@@ -289,17 +289,17 @@ QDomElement addCorrectNS(const QDomElement &e)
 
     // copy attributes
     QDomNamedNodeMap al = e.attributes();
-    for(x = 0; x < al.count(); ++x) {
+    for (x = 0; x < al.count(); ++x) {
         QDomAttr a = al.item(x).toAttr();
-        if(a.name() != xmlns)
+        if (a.name() != xmlns)
             i.setAttributeNodeNS(a.cloneNode().toAttr());
     }
 
     // copy children
     QDomNodeList nl = e.childNodes();
-    for(x = 0; x < nl.count(); ++x) {
+    for (x = 0; x < nl.count(); ++x) {
         QDomNode n = nl.item(x);
-        if(n.isElement())
+        if (n.isElement())
             i.appendChild(addCorrectNS(n.toElement()));
         else
             i.appendChild(n.cloneNode());
@@ -328,24 +328,24 @@ bool hasSubTag(const QDomElement &e, const QString &name)
 QString subTagText(const QDomElement &e, const QString &name)
 {
     QDomElement i = e.firstChildElement(name);
-    if ( !i.isNull() )
+    if (!i.isNull())
         return i.text();
     return QString();
 }
 
 QDomElement textTag(QDomDocument &doc, const QString &name, const QString &content)
 {
-    QDomElement tag = doc.createElement(name);
-    QDomText text = doc.createTextNode(content);
+    QDomElement tag  = doc.createElement(name);
+    QDomText    text = doc.createTextNode(content);
     tag.appendChild(text);
 
     return tag;
 }
 
-QDomElement textTag(QDomDocument &doc, const QString &name, int content)
+QDomElement textTag(QDomDocument &doc, const QString &name, qint64 content)
 {
-    QDomElement tag = doc.createElement(name);
-    QDomText text = doc.createTextNode(QString::number(content));
+    QDomElement tag  = doc.createElement(name);
+    QDomText    text = doc.createTextNode(QString::number(content));
     tag.appendChild(text);
 
     return tag;
@@ -353,8 +353,8 @@ QDomElement textTag(QDomDocument &doc, const QString &name, int content)
 
 QDomElement textTag(QDomDocument &doc, const QString &name, bool content)
 {
-    QDomElement tag = doc.createElement(name);
-    QDomText text = doc.createTextNode(content ? "true" : "false");
+    QDomElement tag  = doc.createElement(name);
+    QDomText    text = doc.createTextNode(content ? "true" : "false");
     tag.appendChild(text);
 
     return tag;
@@ -365,8 +365,8 @@ QDomElement textTag(QDomDocument &doc, const QString &name, QSize &s)
     QString str;
     str.sprintf("%d,%d", s.width(), s.height());
 
-    QDomElement tag = doc.createElement(name);
-    QDomText text = doc.createTextNode(str);
+    QDomElement tag  = doc.createElement(name);
+    QDomText    text = doc.createTextNode(str);
     tag.appendChild(text);
 
     return tag;
@@ -377,8 +377,8 @@ QDomElement textTag(QDomDocument &doc, const QString &name, QRect &r)
     QString str;
     str.sprintf("%d,%d,%d,%d", r.x(), r.y(), r.width(), r.height());
 
-    QDomElement tag = doc.createElement(name);
-    QDomText text = doc.createTextNode(str);
+    QDomElement tag  = doc.createElement(name);
+    QDomText    text = doc.createTextNode(str);
     tag.appendChild(text);
 
     return tag;
@@ -387,7 +387,7 @@ QDomElement textTag(QDomDocument &doc, const QString &name, QRect &r)
 QDomElement stringListToXml(QDomDocument &doc, const QString &name, const QStringList &l)
 {
     QDomElement tag = doc.createElement(name);
-    for(QStringList::ConstIterator it = l.begin(); it != l.end(); ++it)
+    for (QStringList::ConstIterator it = l.begin(); it != l.end(); ++it)
         tag.appendChild(textTag(doc, "item", *it));
 
     return tag;
@@ -429,7 +429,7 @@ QDomElement stringListToXml(QDomDocument &doc, const QString &name, const QStrin
 void readEntry(const QDomElement &e, const QString &name, QString *v)
 {
     QDomElement tag = e.firstChildElement(name);
-    if(tag.isNull())
+    if (tag.isNull())
         return;
     *v = tagContent(tag);
 }
@@ -437,7 +437,7 @@ void readEntry(const QDomElement &e, const QString &name, QString *v)
 void readNumEntry(const QDomElement &e, const QString &name, int *v)
 {
     QDomElement tag = e.firstChildElement(name);
-    if(tag.isNull())
+    if (tag.isNull())
         return;
     *v = tagContent(tag).toInt();
 }
@@ -445,18 +445,18 @@ void readNumEntry(const QDomElement &e, const QString &name, int *v)
 void readBoolEntry(const QDomElement &e, const QString &name, bool *v)
 {
     QDomElement tag = e.firstChildElement(name);
-    if(tag.isNull())
+    if (tag.isNull())
         return;
-    *v = (tagContent(tag) == "true") ? true: false;
+    *v = (tagContent(tag) == "true") ? true : false;
 }
 
 void readSizeEntry(const QDomElement &e, const QString &name, QSize *v)
 {
     QDomElement tag = e.firstChildElement(name);
-    if(tag.isNull())
+    if (tag.isNull())
         return;
     QStringList list = tagContent(tag).split(',');
-    if(list.count() != 2)
+    if (list.count() != 2)
         return;
     QSize s;
     s.setWidth(list[0].toInt());
@@ -467,10 +467,10 @@ void readSizeEntry(const QDomElement &e, const QString &name, QSize *v)
 void readRectEntry(const QDomElement &e, const QString &name, QRect *v)
 {
     QDomElement tag = e.firstChildElement(name);
-    if(tag.isNull())
+    if (tag.isNull())
         return;
     QStringList list = tagContent(tag).split(',');
-    if(list.count() != 4)
+    if (list.count() != 4)
         return;
     QRect r;
     r.setX(list[0].toInt());
@@ -483,25 +483,25 @@ void readRectEntry(const QDomElement &e, const QString &name, QRect *v)
 void readColorEntry(const QDomElement &e, const QString &name, QColor *v)
 {
     QDomElement tag = e.firstChildElement(name);
-    if(tag.isNull())
+    if (tag.isNull())
         return;
     QColor c;
     c.setNamedColor(tagContent(tag));
-    if(c.isValid())
+    if (c.isValid())
         *v = c;
 }
 
 void xmlToStringList(const QDomElement &e, const QString &name, QStringList *v)
 {
     QDomElement tag = e.firstChildElement(name);
-    if(tag.isNull())
+    if (tag.isNull())
         return;
     QStringList list;
-    for(QDomNode n = tag.firstChild(); !n.isNull(); n = n.nextSibling()) {
+    for (QDomNode n = tag.firstChild(); !n.isNull(); n = n.nextSibling()) {
         QDomElement i = n.toElement();
-        if(i.isNull())
+        if (i.isNull())
             continue;
-        if(i.tagName() == "item")
+        if (i.tagName() == "item")
             list += tagContent(i);
     }
     *v = list;
@@ -514,9 +514,9 @@ void setBoolAttribute(QDomElement e, const QString &name, bool b)
 
 void readBoolAttribute(QDomElement e, const QString &name, bool *v)
 {
-    if(e.hasAttribute(name)) {
+    if (e.hasAttribute(name)) {
         QString s = e.attribute(name);
-        *v = (s == "true") ? true: false;
+        *v        = (s == "true") ? true : false;
     }
 }
 
@@ -534,4 +534,15 @@ void setTagText(QDomElement &e, const QString &text)
 {
     e.appendChild(e.ownerDocument().createTextNode(text));
 }
+
+QDomElement textTagNS(QDomDocument *doc, const QString &ns, const QString &name, const QString &content)
+{
+    return ::textTagNS(doc, ns, name, content);
+}
+
+QDomElement textTagNS(QDomDocument *doc, const QString &ns, const QString &name, const QByteArray &content)
+{
+    return ::textTagNS(doc, ns, name, QString::fromLatin1(content.toBase64()));
+}
+
 } // namespace XMLHelper
diff --git a/src/xmpp/xmpp-im/xmpp_xmlcommon.h b/src/xmpp/xmpp-im/xmpp_xmlcommon.h
index d3ac151d..027ac610 100644
--- a/src/xmpp/xmpp-im/xmpp_xmlcommon.h
+++ b/src/xmpp/xmpp-im/xmpp_xmlcommon.h
@@ -35,14 +35,14 @@ class XDomNodeList {
     XDomNodeList(const XDomNodeList &from);
     XDomNodeList(const QDomNodeList &from);
     ~XDomNodeList();
-    XDomNodeList & operator=(const XDomNodeList &from);
+    XDomNodeList &operator=(const XDomNodeList &from);
 
     QDomNode at(int index) const { return item(index); }
-    int count() const { return (int)length(); }
-    bool isEmpty() const;
+    int      count() const { return (int)length(); }
+    bool     isEmpty() const;
     QDomNode item(int index) const;
-    uint length() const;
-    int size() const { return (int)length(); }
+    uint     length() const;
+    int      size() const { return (int)length(); }
 
     void append(const QDomNode &i);
 
@@ -57,48 +57,52 @@ class XDomNodeList {
     QList<QDomNode> list;
 };
 
-QDateTime stamp2TS(const QString &ts);
-bool stamp2TS(const QString &ts, QDateTime *d);
-QString TS2stamp(const QDateTime &d);
-QDomElement textTag(QDomDocument *doc, const QString &name, const QString &content);
-QDomElement textTagNS(QDomDocument *doc, const QString &ns, const QString &name, const QString &content);
-QString tagContent(const QDomElement &e);
+QDateTime    stamp2TS(const QString &ts);
+bool         stamp2TS(const QString &ts, QDateTime *d);
+QString      TS2stamp(const QDateTime &d);
+QDomElement  textTag(QDomDocument *doc, const QString &name, const QString &content);
+QDomElement  textTagNS(QDomDocument *doc, const QString &ns, const QString &name, const QString &content);
+QString      tagContent(const QDomElement &e);
 XDomNodeList childElementsByTagNameNS(const QDomElement &e, const QString &nsURI, const QString &localName);
-QDomElement createIQ(QDomDocument *doc, const QString &type, const QString &to, const QString &id);
-QDomElement queryTag(const QDomElement &e);
-QString queryNS(const QDomElement &e);
-void getErrorFromElement(const QDomElement &e, const QString &baseNS, int *code, QString *str);
-QDomElement addCorrectNS(const QDomElement &e);
+QDomElement  createIQ(QDomDocument *doc, const QString &type, const QString &to, const QString &id);
+QDomElement  queryTag(const QDomElement &e);
+QString      queryNS(const QDomElement &e);
+void         getErrorFromElement(const QDomElement &e, const QString &baseNS, int *code, QString *str);
+QDomElement  addCorrectNS(const QDomElement &e);
 
 namespace XMLHelper {
-    //QDomElement findSubTag(const QDomElement &e, const QString &name, bool *found);
-    bool hasSubTag(const QDomElement &e, const QString &name);
-
-    QDomElement emptyTag(QDomDocument *doc, const QString &name);
-    QString subTagText(const QDomElement &e, const QString &name);
-
-    QDomElement textTag(QDomDocument &doc, const QString &name, const QString &content);
-    QDomElement textTag(QDomDocument &doc, const QString &name, int content);
-    QDomElement textTag(QDomDocument &doc, const QString &name, bool content);
-    QDomElement textTag(QDomDocument &doc, const QString &name, QSize &s);
-    QDomElement textTag(QDomDocument &doc, const QString &name, QRect &r);
-    void setTagText(QDomElement &e, const QString &text);
-    QDomElement stringListToXml(QDomDocument &doc, const QString &name, const QStringList &l);
-
-    void readEntry(const QDomElement &e, const QString &name, QString *v);
-    void readNumEntry(const QDomElement &e, const QString &name, int *v);
-    void readBoolEntry(const QDomElement &e, const QString &name, bool *v);
-    void readSizeEntry(const QDomElement &e, const QString &name, QSize *v);
-    void readRectEntry(const QDomElement &e, const QString &name, QRect *v);
-    void readColorEntry(const QDomElement &e, const QString &name, QColor *v);
-
-    void xmlToStringList(const QDomElement &e, const QString &name, QStringList *v);
-
-    void setBoolAttribute(QDomElement e, const QString &name, bool b);
-    void readBoolAttribute(QDomElement e, const QString &name, bool *v);
-
-    //QString tagContent(const QDomElement &e); // obsolete;
-    QString sanitizedLang(const QString &lang);
+
+//QDomElement findSubTag(const QDomElement &e, const QString &name, bool *found);
+bool hasSubTag(const QDomElement &e, const QString &name);
+
+QDomElement emptyTag(QDomDocument *doc, const QString &name);
+QString     subTagText(const QDomElement &e, const QString &name);
+
+QDomElement textTag(QDomDocument &doc, const QString &name, const QString &content);
+QDomElement textTag(QDomDocument &doc, const QString &name, qint64 content);
+QDomElement textTag(QDomDocument &doc, const QString &name, bool content);
+QDomElement textTag(QDomDocument &doc, const QString &name, QSize &s);
+QDomElement textTag(QDomDocument &doc, const QString &name, QRect &r);
+QDomElement textTagNS(QDomDocument *doc, const QString &ns, const QString &name, const QString &content);
+QDomElement textTagNS(QDomDocument *doc, const QString &ns, const QString &name, const QByteArray &content);
+void        setTagText(QDomElement &e, const QString &text);
+QDomElement stringListToXml(QDomDocument &doc, const QString &name, const QStringList &l);
+
+void readEntry(const QDomElement &e, const QString &name, QString *v);
+void readNumEntry(const QDomElement &e, const QString &name, int *v);
+void readBoolEntry(const QDomElement &e, const QString &name, bool *v);
+void readSizeEntry(const QDomElement &e, const QString &name, QSize *v);
+void readRectEntry(const QDomElement &e, const QString &name, QRect *v);
+void readColorEntry(const QDomElement &e, const QString &name, QColor *v);
+
+void xmlToStringList(const QDomElement &e, const QString &name, QStringList *v);
+
+void setBoolAttribute(QDomElement e, const QString &name, bool b);
+void readBoolAttribute(QDomElement e, const QString &name, bool *v);
+
+//QString tagContent(const QDomElement &e); // obsolete;
+QString sanitizedLang(const QString &lang);
+
 } // namespace XMLHelper
 
 #endif // XMPP_XMLCOMMON_H

From cd6c90a052377e3bfbe91b495d4421ba02f5300d Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Fri, 11 Oct 2019 12:02:09 +0300
Subject: [PATCH 102/383] Only set jingle file size when we have it

---
 src/xmpp/xmpp-im/jingle-ft.cpp | 2008 ++++++++++++++++----------------
 1 file changed, 1004 insertions(+), 1004 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 3d559e86..3c6690d8 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -29,1049 +29,1049 @@
 
 namespace XMPP {
 namespace Jingle {
-namespace FileTransfer {
-const QString NS            = QStringLiteral("urn:xmpp:jingle:apps:file-transfer:5");
-const QString AMPLITUDES_NS = QStringLiteral("urn:audio:amplitudes");
-
-// tags
-static const QString AMPLITUDES_TAG = QStringLiteral("amplitudes");
-static const QString FILETAG        = QStringLiteral("file");
-static const QString DATE_TAG       = QStringLiteral("date");
-static const QString DESC_TAG       = QStringLiteral("desc");
-static const QString MEDIA_TYPE_TAG = QStringLiteral("media-type");
-static const QString NAME_TAG       = QStringLiteral("name");
-static const QString SIZE_TAG       = QStringLiteral("size");
-static const QString RANGE_TAG      = QStringLiteral("range");
-static const QString THUMBNAIL_TAG  = QStringLiteral("thumbnail");
-
-QDomElement Range::toXml(QDomDocument *doc) const
-{
-    auto r = doc->createElement(RANGE_TAG);
-    if (length) {
-        r.setAttribute(QStringLiteral("length"), QString::number(length));
-    }
-    if (offset) {
-        r.setAttribute(QStringLiteral("offset"), QString::number(offset));
-    }
-    for (auto const &h : hashes) {
-        auto hel = h.toXml(doc);
-        if (!hel.isNull()) {
-            r.appendChild(hel);
-        }
-    }
-    return r;
-}
-
-//----------------------------------------------------------------------------
-// File
-//----------------------------------------------------------------------------
-class File::Private : public QSharedData {
-public:
-    QDateTime   date;
-    QString     mediaType;
-    QString     name;
-    QString     desc;
-    qint64      size = 0;
-    Range       range;
-    bool        rangeSupported = false;
-    bool        hasSize        = false;
-    QList<Hash> hashes;
-    Thumbnail   thumbnail;
-    QByteArray  amplitudes;
-};
-
-File::File()
-{
-}
-
-File::~File()
-{
-}
-
-File &File::operator=(const File &other)
-{
-    d = other.d;
-    return *this;
-}
-
-File::File(const File &other) :
-    d(other.d)
-{
-}
-
-File::File(const QDomElement &file)
-{
-    QDateTime   date;
-    QString     mediaType;
-    QString     name;
-    QString     desc;
-    size_t      size           = 0;
-    bool        rangeSupported = false;
-    bool        hasSize        = false;
-    Range       range;
-    QList<Hash> hashes;
-    Thumbnail   thumbnail;
-    QByteArray  amplitudes;
-
-    bool ok;
-
-    for (QDomElement ce   = file.firstChildElement();
-         !ce.isNull(); ce = ce.nextSiblingElement()) {
-
-        if (ce.tagName() == DATE_TAG) {
-            date = QDateTime::fromString(ce.text().left(19), Qt::ISODate);
-            if (!date.isValid()) {
-                return;
+    namespace FileTransfer {
+        const QString NS            = QStringLiteral("urn:xmpp:jingle:apps:file-transfer:5");
+        const QString AMPLITUDES_NS = QStringLiteral("urn:audio:amplitudes");
+
+        // tags
+        static const QString AMPLITUDES_TAG = QStringLiteral("amplitudes");
+        static const QString FILETAG        = QStringLiteral("file");
+        static const QString DATE_TAG       = QStringLiteral("date");
+        static const QString DESC_TAG       = QStringLiteral("desc");
+        static const QString MEDIA_TYPE_TAG = QStringLiteral("media-type");
+        static const QString NAME_TAG       = QStringLiteral("name");
+        static const QString SIZE_TAG       = QStringLiteral("size");
+        static const QString RANGE_TAG      = QStringLiteral("range");
+        static const QString THUMBNAIL_TAG  = QStringLiteral("thumbnail");
+
+        QDomElement Range::toXml(QDomDocument *doc) const
+        {
+            auto r = doc->createElement(RANGE_TAG);
+            if (length) {
+                r.setAttribute(QStringLiteral("length"), QString::number(length));
+            }
+            if (offset) {
+                r.setAttribute(QStringLiteral("offset"), QString::number(offset));
             }
+            for (auto const &h : hashes) {
+                auto hel = h.toXml(doc);
+                if (!hel.isNull()) {
+                    r.appendChild(hel);
+                }
+            }
+            return r;
+        }
 
-        } else if (ce.tagName() == MEDIA_TYPE_TAG) {
-            mediaType = ce.text();
+        //----------------------------------------------------------------------------
+        // File
+        //----------------------------------------------------------------------------
+        class File::Private : public QSharedData {
+        public:
+            QDateTime   date;
+            QString     mediaType;
+            QString     name;
+            QString     desc;
+            qint64      size = 0;
+            Range       range;
+            bool        rangeSupported = false;
+            bool        hasSize        = false;
+            QList<Hash> hashes;
+            Thumbnail   thumbnail;
+            QByteArray  amplitudes;
+        };
+
+        File::File()
+        {
+        }
 
-        } else if (ce.tagName() == NAME_TAG) {
-            name = ce.text();
+        File::~File()
+        {
+        }
 
-        } else if (ce.tagName() == SIZE_TAG) {
-            size = ce.text().toULongLong(&ok);
-            if (!ok) {
-                return;
-            }
-            hasSize = true;
+        File &File::operator=(const File &other)
+        {
+            d = other.d;
+            return *this;
+        }
 
-        } else if (ce.tagName() == RANGE_TAG) {
-            if (ce.hasAttribute(QLatin1String("offset"))) {
-                range.offset = ce.attribute(QLatin1String("offset")).toULongLong(&ok);
-                if (!ok) {
-                    return;
+        File::File(const File &other) :
+            d(other.d)
+        {
+        }
+
+        File::File(const QDomElement &file)
+        {
+            QDateTime   date;
+            QString     mediaType;
+            QString     name;
+            QString     desc;
+            size_t      size           = 0;
+            bool        rangeSupported = false;
+            bool        hasSize        = false;
+            Range       range;
+            QList<Hash> hashes;
+            Thumbnail   thumbnail;
+            QByteArray  amplitudes;
+
+            bool ok;
+
+            for (QDomElement ce   = file.firstChildElement();
+                 !ce.isNull(); ce = ce.nextSiblingElement()) {
+
+                if (ce.tagName() == DATE_TAG) {
+                    date = QDateTime::fromString(ce.text().left(19), Qt::ISODate);
+                    if (!date.isValid()) {
+                        return;
+                    }
+
+                } else if (ce.tagName() == MEDIA_TYPE_TAG) {
+                    mediaType = ce.text();
+
+                } else if (ce.tagName() == NAME_TAG) {
+                    name = ce.text();
+
+                } else if (ce.tagName() == SIZE_TAG) {
+                    size = ce.text().toULongLong(&ok);
+                    if (!ok) {
+                        return;
+                    }
+                    hasSize = true;
+
+                } else if (ce.tagName() == RANGE_TAG) {
+                    if (ce.hasAttribute(QLatin1String("offset"))) {
+                        range.offset = ce.attribute(QLatin1String("offset")).toULongLong(&ok);
+                        if (!ok) {
+                            return;
+                        }
+                    }
+                    if (ce.hasAttribute(QLatin1String("length"))) {
+                        range.length = ce.attribute(QLatin1String("length")).toULongLong(&ok);
+                        if (!ok || !range.length) { // length should absent if we need to read till end of file. 0-length is nonsense
+                            return;
+                        }
+                    }
+                    QDomElement hashEl = ce.firstChildElement(QLatin1String("hash"));
+                    for (; !hashEl.isNull(); hashEl = hashEl.nextSiblingElement(QLatin1String("hash"))) {
+                        if (hashEl.namespaceURI() == HASH_NS) {
+                            auto hash = Hash(hashEl);
+                            if (hash.type() == Hash::Type::Unknown) {
+                                continue;
+                            }
+                            range.hashes.append(hash);
+                        }
+                    }
+                    rangeSupported = true;
+
+                } else if (ce.tagName() == DESC_TAG) {
+                    desc = ce.text();
+
+                } else if (ce.tagName() == QLatin1String("hash")) {
+                    if (ce.namespaceURI() == HASH_NS) {
+                        Hash h(ce);
+                        if (h.type() == Hash::Type::Unknown) {
+                            return;
+                        }
+                        hashes.append(h);
+                    }
+
+                } else if (ce.tagName() == QLatin1String("hash-used")) {
+                    if (ce.namespaceURI() == HASH_NS) {
+                        Hash h(ce);
+                        if (h.type() == Hash::Type::Unknown) {
+                            return;
+                        }
+                        hashes.append(h);
+                    }
+
+                } else if (ce.tagName() == THUMBNAIL_TAG) {
+                    thumbnail = Thumbnail(ce);
+                } else if (ce.tagName() == AMPLITUDES_TAG && ce.namespaceURI() == AMPLITUDES_NS) {
+                    amplitudes = QByteArray::fromBase64(ce.text().toLatin1());
                 }
             }
-            if (ce.hasAttribute(QLatin1String("length"))) {
-                range.length = ce.attribute(QLatin1String("length")).toULongLong(&ok);
-                if (!ok || !range.length) { // length should absent if we need to read till end of file. 0-length is nonsense
-                    return;
+
+            auto p            = new Private;
+            p->date           = date;
+            p->mediaType      = mediaType;
+            p->name           = name;
+            p->desc           = desc;
+            p->size           = size;
+            p->rangeSupported = rangeSupported;
+            p->hasSize        = hasSize;
+            p->range          = range;
+            p->hashes         = hashes;
+            p->thumbnail      = thumbnail;
+            p->amplitudes     = amplitudes;
+
+            d = p;
+        }
+
+        QDomElement File::toXml(QDomDocument *doc) const
+        {
+            if (!isValid() || d->hashes.isEmpty()) {
+                return QDomElement();
+            }
+            QDomElement el = doc->createElementNS(NS, QStringLiteral("file"));
+            if (d->date.isValid()) {
+                el.appendChild(XMLHelper::textTag(*doc, DATE_TAG, d->date.toString(Qt::ISODate)));
+            }
+            if (d->desc.size()) {
+                el.appendChild(XMLHelper::textTag(*doc, DESC_TAG, d->desc));
+            }
+            for (const auto &h : d->hashes) {
+                el.appendChild(h.toXml(doc));
+            }
+            if (d->mediaType.size()) {
+                el.appendChild(XMLHelper::textTag(*doc, MEDIA_TYPE_TAG, d->mediaType));
+            }
+            if (d->name.size()) {
+                el.appendChild(XMLHelper::textTag(*doc, NAME_TAG, d->name));
+            }
+            if (d->hasSize) {
+                el.appendChild(XMLHelper::textTag(*doc, SIZE_TAG, d->size));
+            }
+            if (d->rangeSupported || d->range.isValid()) {
+                el.appendChild(d->range.toXml(doc));
+            }
+            if (d->thumbnail.isValid()) {
+                el.appendChild(d->thumbnail.toXml(doc));
+            }
+            if (d->amplitudes.size()) {
+                el.appendChild(XMLHelper::textTagNS(doc, AMPLITUDES_NS, AMPLITUDES_TAG, d->amplitudes));
+            }
+            return el;
+        }
+
+        bool File::merge(const File &other)
+        {
+            if (!d->thumbnail.isValid()) {
+                d->thumbnail = other.thumbnail();
+            }
+            for (auto const &h : other.d->hashes) {
+                auto it = std::find_if(d->hashes.constBegin(), d->hashes.constEnd(), [&h](auto const &v) { return h.type() == v.type(); });
+                if (it == d->hashes.constEnd()) {
+                    d->hashes.append(h);
+                } else if (h.data() != it->data()) {
+                    return false; // hashes are different
                 }
             }
-            QDomElement hashEl = ce.firstChildElement(QLatin1String("hash"));
-            for (; !hashEl.isNull(); hashEl = hashEl.nextSiblingElement(QLatin1String("hash"))) {
-                if (hashEl.namespaceURI() == HASH_NS) {
-                    auto hash = Hash(hashEl);
-                    if (hash.type() == Hash::Type::Unknown) {
-                        continue;
+            return true;
+        }
+
+        bool File::hasComputedHashes() const
+        {
+            if (!d)
+                return false;
+            for (auto const &h : d->hashes) {
+                if (h.data().size())
+                    return true;
+            }
+            return false;
+        }
+
+        bool File::hasSize() const
+        {
+            return d->hasSize;
+        }
+
+        QDateTime File::date() const
+        {
+            return d ? d->date : QDateTime();
+        }
+
+        QString File::description() const
+        {
+            return d ? d->desc : QString();
+        }
+
+        QList<Hash> File::hashes() const
+        {
+            return d ? d->hashes : QList<Hash>();
+        }
+
+        Hash File::hash(Hash::Type t) const
+        {
+            if (d && d->hashes.count()) {
+                if (t == Hash::Unknown)
+                    return d->hashes.at(0);
+                for (auto const &h : d->hashes) {
+                    if (h.type() == t) {
+                        return h;
                     }
-                    range.hashes.append(hash);
                 }
             }
-            rangeSupported = true;
+            return Hash();
+        }
+
+        QString File::mediaType() const
+        {
+            return d ? d->mediaType : QString();
+        }
 
-        } else if (ce.tagName() == DESC_TAG) {
-            desc = ce.text();
+        QString File::name() const
+        {
+            return d ? d->name : QString();
+        }
 
-        } else if (ce.tagName() == QLatin1String("hash")) {
-            if (ce.namespaceURI() == HASH_NS) {
-                Hash h(ce);
-                if (h.type() == Hash::Type::Unknown) {
-                    return;
+        quint64 File::size() const
+        {
+            return d ? d->size : 0;
+        }
+
+        Range File::range() const
+        {
+            return d ? d->range : Range();
+        }
+
+        Thumbnail File::thumbnail() const
+        {
+            return d ? d->thumbnail : Thumbnail();
+        }
+
+        QByteArray File::amplitudes() const
+        {
+            return d ? d->amplitudes : QByteArray();
+        }
+
+        void File::setDate(const QDateTime &date)
+        {
+            ensureD()->date = date;
+        }
+
+        void File::setDescription(const QString &desc)
+        {
+            ensureD()->desc = desc;
+        }
+
+        void File::addHash(const Hash &hash)
+        {
+            ensureD()->hashes.append(hash);
+        }
+
+        void File::setMediaType(const QString &mediaType)
+        {
+            ensureD()->mediaType = mediaType;
+        }
+
+        void File::setName(const QString &name)
+        {
+            ensureD()->name = name;
+        }
+
+        void File::setSize(quint64 size)
+        {
+            ensureD()->size = size;
+            d->hasSize      = true;
+        }
+
+        void File::setRange(const Range &range)
+        {
+            ensureD()->range  = range;
+            d->rangeSupported = true;
+        }
+
+        void File::setThumbnail(const Thumbnail &thumb)
+        {
+            ensureD()->thumbnail = thumb;
+        }
+
+        void File::setAmplitudes(const QByteArray &amplitudes)
+        {
+            d->amplitudes = amplitudes;
+        }
+
+        File::Private *File::ensureD()
+        {
+            if (!d) {
+                d = new Private;
+            }
+            return d.data();
+        }
+
+        //----------------------------------------------------------------------------
+        // Checksum
+        //----------------------------------------------------------------------------
+        Checksum::Checksum(const QDomElement &cs) :
+            ContentBase(cs)
+        {
+            file = File(cs.firstChildElement(QLatin1String("file")));
+        }
+
+        bool Checksum::isValid() const
+        {
+            return ContentBase::isValid() && file.isValid();
+        }
+
+        QDomElement Checksum::toXml(QDomDocument *doc) const
+        {
+            auto el = ContentBase::toXml(doc, "checksum");
+            if (!el.isNull()) {
+                el.appendChild(file.toXml(doc));
+            }
+            return el;
+        }
+
+        //----------------------------------------------------------------------------
+        // Received
+        //----------------------------------------------------------------------------
+        QDomElement Received::toXml(QDomDocument *doc) const
+        {
+            return ContentBase::toXml(doc, "received");
+        }
+
+        //----------------------------------------------------------------------------
+        // ApplicationManager
+        //----------------------------------------------------------------------------
+        Manager::Manager(QObject *parent) :
+            XMPP::Jingle::ApplicationManager(parent)
+        {
+        }
+
+        Manager::~Manager()
+        {
+            if (jingleManager)
+                jingleManager->unregisterApp(NS);
+        }
+
+        void Manager::setJingleManager(XMPP::Jingle::Manager *jm)
+        {
+            jingleManager = jm;
+        }
+
+        Application *Manager::startApplication(const ApplicationManagerPad::Ptr &pad, const QString &contentName, Origin creator, Origin senders)
+        {
+            if (!(contentName.size() > 0 && (senders == Origin::Initiator || senders == Origin::Responder))) {
+                qDebug("Invalid Jignle FT App start parameters");
+                return nullptr;
+            }
+            return new Application(pad.staticCast<Pad>(), contentName, creator, senders); // ContentOrigin::Remote
+        }
+
+        ApplicationManagerPad *Manager::pad(Session *session)
+        {
+            return new Pad(this, session);
+        }
+
+        void Manager::closeAll()
+        {
+        }
+
+        Client *Manager::client()
+        {
+            if (jingleManager) {
+                return jingleManager->client();
+            }
+            return nullptr;
+        }
+
+        QStringList Manager::availableTransports() const
+        {
+            return jingleManager->availableTransports(Transport::Reliable);
+        }
+
+        //----------------------------------------------------------------------------
+        // Application
+        //----------------------------------------------------------------------------
+        class Application::Private {
+        public:
+            Application *             q                     = nullptr;
+            State                     state                 = State::Created;
+            State                     transportReplaceState = State::Finished;
+            Action                    updateToSend          = Action::NoAction;
+            QSharedPointer<Pad>       pad;
+            QString                   contentName;
+            File                      file;
+            File                      acceptFile; // as it comes with "accept" response
+            Origin                    creator;
+            Origin                    senders;
+            Origin                    transportReplaceOrigin = Origin::None;
+            XMPP::Stanza::Error       lastError;
+            Reason                    terminationReason;
+            QSharedPointer<Transport> transport;
+            Connection::Ptr           connection;
+            QStringList               availableTransports;
+            bool                      closeDeviceOnFinish = true;
+            bool                      streamigMode        = false;
+            QIODevice *               device              = nullptr;
+            quint64                   bytesLeft           = 0;
+
+            void setState(State s)
+            {
+                state = s;
+                if (s == State::Finished) {
+                    if (device && closeDeviceOnFinish) {
+                        device->close();
+                    }
+                    if (connection) {
+                        connection->close();
+                    }
                 }
-                hashes.append(h);
+                emit q->stateChanged(s);
             }
 
-        } else if (ce.tagName() == QLatin1String("hash-used")) {
-            if (ce.namespaceURI() == HASH_NS) {
-                Hash h(ce);
-                if (h.type() == Hash::Type::Unknown) {
+            void handleStreamFail()
+            {
+                terminationReason = Reason(Reason::Condition::FailedApplication, QString::fromLatin1("stream failed"));
+                setState(State::Finished);
+            }
+
+            void writeNextBlockToTransport()
+            {
+                if (!bytesLeft) {
+                    terminationReason = Reason(Reason::Condition::Success);
+                    setState(State::Finished);
+                    return; // everything is written
+                }
+                auto sz = connection->blockSize();
+                sz      = sz ? sz : 8192;
+                if (sz > bytesLeft) {
+                    sz = bytesLeft;
+                }
+                QByteArray data = device->read(sz);
+                if (data.isEmpty()) {
+                    handleStreamFail();
                     return;
                 }
-                hashes.append(h);
+                if (connection->write(data) == -1) {
+                    handleStreamFail();
+                    return;
+                }
+                emit q->progress(device->pos());
+                bytesLeft -= sz;
             }
 
-        } else if (ce.tagName() == THUMBNAIL_TAG) {
-            thumbnail = Thumbnail(ce);
-        } else if (ce.tagName() == AMPLITUDES_TAG && ce.namespaceURI() == AMPLITUDES_NS) {
-            amplitudes = QByteArray::fromBase64(ce.text().toLatin1());
-        }
-    }
-
-    auto p            = new Private;
-    p->date           = date;
-    p->mediaType      = mediaType;
-    p->name           = name;
-    p->desc           = desc;
-    p->size           = size;
-    p->rangeSupported = rangeSupported;
-    p->hasSize        = hasSize;
-    p->range          = range;
-    p->hashes         = hashes;
-    p->thumbnail      = thumbnail;
-    p->amplitudes     = amplitudes;
-
-    d = p;
-}
-
-QDomElement File::toXml(QDomDocument *doc) const
-{
-    if (!isValid() || d->hashes.isEmpty()) {
-        return QDomElement();
-    }
-    QDomElement el = doc->createElementNS(NS, QStringLiteral("file"));
-    if (d->date.isValid()) {
-        el.appendChild(XMLHelper::textTag(*doc, DATE_TAG, d->date.toString(Qt::ISODate)));
-    }
-    if (d->desc.size()) {
-        el.appendChild(XMLHelper::textTag(*doc, DESC_TAG, d->desc));
-    }
-    for (const auto &h : d->hashes) {
-        el.appendChild(h.toXml(doc));
-    }
-    if (d->mediaType.size()) {
-        el.appendChild(XMLHelper::textTag(*doc, MEDIA_TYPE_TAG, d->mediaType));
-    }
-    if (d->name.size()) {
-        el.appendChild(XMLHelper::textTag(*doc, NAME_TAG, d->name));
-    }
-    if (d->size) {
-        el.appendChild(XMLHelper::textTag(*doc, SIZE_TAG, d->size));
-    }
-    if (d->rangeSupported || d->range.isValid()) {
-        el.appendChild(d->range.toXml(doc));
-    }
-    if (d->thumbnail.isValid()) {
-        el.appendChild(d->thumbnail.toXml(doc));
-    }
-    if (d->amplitudes.size()) {
-        el.appendChild(XMLHelper::textTagNS(doc, AMPLITUDES_NS, AMPLITUDES_TAG, d->amplitudes));
-    }
-    return el;
-}
-
-bool File::merge(const File &other)
-{
-    if (!d->thumbnail.isValid()) {
-        d->thumbnail = other.thumbnail();
-    }
-    for (auto const &h : other.d->hashes) {
-        auto it = std::find_if(d->hashes.constBegin(), d->hashes.constEnd(), [&h](auto const &v) { return h.type() == v.type(); });
-        if (it == d->hashes.constEnd()) {
-            d->hashes.append(h);
-        } else if (h.data() != it->data()) {
-            return false; // hashes are different
-        }
-    }
-    return true;
-}
-
-bool File::hasComputedHashes() const
-{
-    if (!d)
-        return false;
-    for (auto const &h : d->hashes) {
-        if (h.data().size())
-            return true;
-    }
-    return false;
-}
-
-bool File::hasSize() const
-{
-    return d->hasSize;
-}
-
-QDateTime File::date() const
-{
-    return d ? d->date : QDateTime();
-}
-
-QString File::description() const
-{
-    return d ? d->desc : QString();
-}
-
-QList<Hash> File::hashes() const
-{
-    return d ? d->hashes : QList<Hash>();
-}
-
-Hash File::hash(Hash::Type t) const
-{
-    if (d && d->hashes.count()) {
-        if (t == Hash::Unknown)
-            return d->hashes.at(0);
-        for (auto const &h : d->hashes) {
-            if (h.type() == t) {
-                return h;
+            void readNextBlockFromTransport()
+            {
+                quint64 bytesAvail;
+                while (bytesLeft && (bytesAvail = connection->bytesAvailable())) {
+                    quint64 sz = 65536; // shall we respect transport->blockSize() ?
+                    if (sz > bytesLeft) {
+                        sz = bytesLeft;
+                    }
+                    if (sz > bytesAvail) {
+                        sz = bytesAvail;
+                    }
+                    QByteArray data = connection->read(sz);
+                    if (data.isEmpty()) {
+                        handleStreamFail();
+                        return;
+                    }
+                    if (device->write(data) == -1) {
+                        handleStreamFail();
+                        return;
+                    }
+                    emit q->progress(device->pos());
+                    bytesLeft -= sz;
+                }
+                if (!bytesLeft) {
+                    // TODO send <received>
+                    terminationReason = Reason(Reason::Condition::Success);
+                    setState(State::Finished);
+                }
             }
+        };
+
+        Application::Application(const QSharedPointer<Pad> &pad, const QString &contentName, Origin creator, Origin senders) :
+            d(new Private)
+        {
+            d->q                   = this;
+            d->pad                 = pad;
+            d->contentName         = contentName;
+            d->creator             = creator;
+            d->senders             = senders;
+            d->availableTransports = static_cast<Manager *>(pad->manager())->availableTransports();
+        }
+
+        Application::~Application()
+        {
+        }
+
+        ApplicationManagerPad::Ptr Application::pad() const
+        {
+            return d->pad.staticCast<ApplicationManagerPad>();
+        }
+
+        State Application::state() const
+        {
+            return d->state;
+        }
+
+        void Application::setState(State state)
+        {
+            d->setState(state);
+        }
+
+        Stanza::Error Application::lastError() const
+        {
+            return d->lastError;
+        }
+
+        Reason Application::terminationReason() const
+        {
+            return d->terminationReason;
+        }
+
+        QString Application::contentName() const
+        {
+            return d->contentName;
+        }
+
+        Origin Application::creator() const
+        {
+            return d->creator;
         }
-    }
-    return Hash();
-}
-
-QString File::mediaType() const
-{
-    return d ? d->mediaType : QString();
-}
-
-QString File::name() const
-{
-    return d ? d->name : QString();
-}
-
-quint64 File::size() const
-{
-    return d ? d->size : 0;
-}
-
-Range File::range() const
-{
-    return d ? d->range : Range();
-}
-
-Thumbnail File::thumbnail() const
-{
-    return d ? d->thumbnail : Thumbnail();
-}
-
-QByteArray File::amplitudes() const
-{
-    return d ? d->amplitudes : QByteArray();
-}
-
-void File::setDate(const QDateTime &date)
-{
-    ensureD()->date = date;
-}
-
-void File::setDescription(const QString &desc)
-{
-    ensureD()->desc = desc;
-}
-
-void File::addHash(const Hash &hash)
-{
-    ensureD()->hashes.append(hash);
-}
-
-void File::setMediaType(const QString &mediaType)
-{
-    ensureD()->mediaType = mediaType;
-}
-
-void File::setName(const QString &name)
-{
-    ensureD()->name = name;
-}
-
-void File::setSize(quint64 size)
-{
-    ensureD()->size = size;
-    d->hasSize      = true;
-}
-
-void File::setRange(const Range &range)
-{
-    ensureD()->range  = range;
-    d->rangeSupported = true;
-}
-
-void File::setThumbnail(const Thumbnail &thumb)
-{
-    ensureD()->thumbnail = thumb;
-}
-
-void File::setAmplitudes(const QByteArray &amplitudes)
-{
-    d->amplitudes = amplitudes;
-}
-
-File::Private *File::ensureD()
-{
-    if (!d) {
-        d = new Private;
-    }
-    return d.data();
-}
-
-//----------------------------------------------------------------------------
-// Checksum
-//----------------------------------------------------------------------------
-Checksum::Checksum(const QDomElement &cs) :
-    ContentBase(cs)
-{
-    file = File(cs.firstChildElement(QLatin1String("file")));
-}
-
-bool Checksum::isValid() const
-{
-    return ContentBase::isValid() && file.isValid();
-}
-
-QDomElement Checksum::toXml(QDomDocument *doc) const
-{
-    auto el = ContentBase::toXml(doc, "checksum");
-    if (!el.isNull()) {
-        el.appendChild(file.toXml(doc));
-    }
-    return el;
-}
-
-//----------------------------------------------------------------------------
-// Received
-//----------------------------------------------------------------------------
-QDomElement Received::toXml(QDomDocument *doc) const
-{
-    return ContentBase::toXml(doc, "received");
-}
-
-//----------------------------------------------------------------------------
-// ApplicationManager
-//----------------------------------------------------------------------------
-Manager::Manager(QObject *parent) :
-    XMPP::Jingle::ApplicationManager(parent)
-{
-}
-
-Manager::~Manager()
-{
-    if (jingleManager)
-        jingleManager->unregisterApp(NS);
-}
-
-void Manager::setJingleManager(XMPP::Jingle::Manager *jm)
-{
-    jingleManager = jm;
-}
-
-Application *Manager::startApplication(const ApplicationManagerPad::Ptr &pad, const QString &contentName, Origin creator, Origin senders)
-{
-    if (!(contentName.size() > 0 && (senders == Origin::Initiator || senders == Origin::Responder))) {
-        qDebug("Invalid Jignle FT App start parameters");
-        return nullptr;
-    }
-    return new Application(pad.staticCast<Pad>(), contentName, creator, senders); // ContentOrigin::Remote
-}
-
-ApplicationManagerPad *Manager::pad(Session *session)
-{
-    return new Pad(this, session);
-}
-
-void Manager::closeAll()
-{
-}
-
-Client *Manager::client()
-{
-    if (jingleManager) {
-        return jingleManager->client();
-    }
-    return nullptr;
-}
-
-QStringList Manager::availableTransports() const
-{
-    return jingleManager->availableTransports(Transport::Reliable);
-}
-
-//----------------------------------------------------------------------------
-// Application
-//----------------------------------------------------------------------------
-class Application::Private {
-public:
-    Application *             q                     = nullptr;
-    State                     state                 = State::Created;
-    State                     transportReplaceState = State::Finished;
-    Action                    updateToSend          = Action::NoAction;
-    QSharedPointer<Pad>       pad;
-    QString                   contentName;
-    File                      file;
-    File                      acceptFile; // as it comes with "accept" response
-    Origin                    creator;
-    Origin                    senders;
-    Origin                    transportReplaceOrigin = Origin::None;
-    XMPP::Stanza::Error       lastError;
-    Reason                    terminationReason;
-    QSharedPointer<Transport> transport;
-    Connection::Ptr           connection;
-    QStringList               availableTransports;
-    bool                      closeDeviceOnFinish = true;
-    bool                      streamigMode        = false;
-    QIODevice *               device              = nullptr;
-    quint64                   bytesLeft           = 0;
-
-    void setState(State s)
-    {
-        state = s;
-        if (s == State::Finished) {
-            if (device && closeDeviceOnFinish) {
-                device->close();
+
+        Origin Application::senders() const
+        {
+            return d->senders;
+        }
+
+        Application::SetDescError Application::setDescription(const QDomElement &description)
+        {
+            d->file = File(description.firstChildElement("file"));
+            //d->state = State::Pending; // basically it's incomming  content. so if we parsed it it's pending. if not parsed if will rejected anyway.
+            return d->file.isValid() ? Ok : Unparsed;
+        }
+
+        void Application::setFile(const File &file)
+        {
+            d->file = file;
+        }
+
+        File Application::file() const
+        {
+            return d->file;
+        }
+
+        File Application::acceptFile() const
+        {
+            return d->acceptFile;
+        }
+
+        // incoming one? or we have to check real direction
+        bool Application::setTransport(const QSharedPointer<Transport> &transport)
+        {
+            if (!(transport->features() & Transport::Reliable))
+                return false;
+
+            int nsIndex = d->availableTransports.indexOf(transport->pad()->ns());
+            if (nsIndex == -1) {
+                return false;
             }
-            if (connection) {
-                connection->close();
+
+            // in case we automatically select a new transport on our own we definitely will come up to this point
+            if (d->transport) {
+                d->transport->disconnect(this);
+                d->transport.reset();
             }
+
+            d->availableTransports.removeAt(nsIndex);
+            d->transport = transport;
+            connect(transport.data(), &Transport::updated, this, &Application::updated);
+            connect(transport.data(), &Transport::connected, this, [this]() {
+                d->transportReplaceOrigin = Origin::None;
+                d->transportReplaceState  = State::Finished; // not needed here probably
+                d->connection             = d->transport->connection();
+                if (d->streamigMode) {
+                    connect(d->connection.data(), &Connection::readyRead, this, [this]() {
+                        if (!d->device) {
+                            return;
+                        }
+                        if (d->pad->session()->role() != d->senders) {
+                            d->readNextBlockFromTransport();
+                        }
+                    });
+                    connect(d->connection.data(), &Connection::bytesWritten, this, [this](qint64 bytes) {
+                        Q_UNUSED(bytes)
+                        if (d->pad->session()->role() == d->senders && !d->connection->bytesToWrite()) {
+                            d->writeNextBlockToTransport();
+                        }
+                    });
+                }
+                d->setState(State::Active);
+                if (d->streamigMode) {
+                    if (d->acceptFile.range().isValid()) {
+                        d->bytesLeft = d->acceptFile.range().length;
+                        emit deviceRequested(d->acceptFile.range().offset, d->bytesLeft);
+                    } else {
+                        d->bytesLeft = d->file.size();
+                        emit deviceRequested(0, d->bytesLeft);
+                    }
+                } else {
+                    emit connectionReady();
+                }
+            });
+
+            connect(transport.data(), &Transport::failed, this, [this]() {
+                d->transportReplaceOrigin = d->pad->session()->role();
+                if (d->state >= State::Active) {
+                    emit updated(); // late failure are unhandled. just notify the remote
+                    return;
+                }
+                // we can try to replace the transport
+                if (!selectNextTransport()) { // we can do transport-replace here
+                    if (d->state == State::PrepareLocalOffer && d->creator == d->pad->session()->role()) {
+                        // we were unable to send even initial offer
+                        d->setState(State::Finished);
+                    } else {
+                        emit updated(); // we have to notify our peer about failure
+                    }
+                } else {
+                    d->transportReplaceState = State::PrepareLocalOffer;
+                }
+            });
+
+            if (d->state >= State::Unacked) {
+                // seems like we are in transport failure recovery. d->transportFailed may confirm this
+                d->transport->prepare();
+            }
+            return true;
+        }
+
+        Origin Application::transportReplaceOrigin() const
+        {
+            return d->transportReplaceOrigin;
         }
-        emit q->stateChanged(s);
-    }
-
-    void handleStreamFail()
-    {
-        terminationReason = Reason(Reason::Condition::FailedApplication, QString::fromLatin1("stream failed"));
-        setState(State::Finished);
-    }
-
-    void writeNextBlockToTransport()
-    {
-        if (!bytesLeft) {
-            terminationReason = Reason(Reason::Condition::Success);
-            setState(State::Finished);
-            return; // everything is written
-        }
-        auto sz = connection->blockSize();
-        sz      = sz ? sz : 8192;
-        if (sz > bytesLeft) {
-            sz = bytesLeft;
-        }
-        QByteArray data = device->read(sz);
-        if (data.isEmpty()) {
-            handleStreamFail();
-            return;
-        }
-        if (connection->write(data) == -1) {
-            handleStreamFail();
-            return;
-        }
-        emit q->progress(device->pos());
-        bytesLeft -= sz;
-    }
-
-    void readNextBlockFromTransport()
-    {
-        quint64 bytesAvail;
-        while (bytesLeft && (bytesAvail = connection->bytesAvailable())) {
-            quint64 sz = 65536; // shall we respect transport->blockSize() ?
-            if (sz > bytesLeft) {
-                sz = bytesLeft;
+
+        bool Application::incomingTransportReplace(const QSharedPointer<Transport> &transport)
+        {
+            auto prev = d->transportReplaceOrigin;
+            if (d->pad->session()->role() == Origin::Responder && prev == Origin::Responder && d->transport) {
+                // if I'm a responder and tried to send transport-replace too, then push ns back
+                d->availableTransports.append(d->transport->pad()->ns());
             }
-            if (sz > bytesAvail) {
-                sz = bytesAvail;
+            d->transportReplaceOrigin = d->pad->session()->peerRole();
+            auto ret                  = setTransport(transport);
+            if (ret)
+                d->transportReplaceState = State::PrepareLocalOffer;
+            else {
+                d->transportReplaceOrigin = prev;
+                d->lastError.reset();
+                // REVIEW We have to fail application here on tie-break or propose another transport
             }
-            QByteArray data = connection->read(sz);
-            if (data.isEmpty()) {
-                handleStreamFail();
-                return;
+
+            return ret;
+        }
+
+        QSharedPointer<Transport> Application::transport() const
+        {
+            return d->transport;
+        }
+
+        void Application::setStreamingMode(bool mode)
+        {
+            if (d->state <= State::Connecting) {
+                d->streamigMode = mode;
             }
-            if (device->write(data) == -1) {
-                handleStreamFail();
-                return;
+        }
+
+        Action Application::evaluateOutgoingUpdate()
+        {
+            d->updateToSend = Action::NoAction;
+            if (!isValid() || d->state == State::Created || d->state == State::Finished) {
+                return d->updateToSend;
             }
-            emit q->progress(device->pos());
-            bytesLeft -= sz;
-        }
-        if (!bytesLeft) {
-            // TODO send <received>
-            terminationReason = Reason(Reason::Condition::Success);
-            setState(State::Finished);
-        }
-    }
-};
-
-Application::Application(const QSharedPointer<Pad> &pad, const QString &contentName, Origin creator, Origin senders) :
-    d(new Private)
-{
-    d->q                   = this;
-    d->pad                 = pad;
-    d->contentName         = contentName;
-    d->creator             = creator;
-    d->senders             = senders;
-    d->availableTransports = static_cast<Manager *>(pad->manager())->availableTransports();
-}
-
-Application::~Application()
-{
-}
-
-ApplicationManagerPad::Ptr Application::pad() const
-{
-    return d->pad.staticCast<ApplicationManagerPad>();
-}
-
-State Application::state() const
-{
-    return d->state;
-}
-
-void Application::setState(State state)
-{
-    d->setState(state);
-}
-
-Stanza::Error Application::lastError() const
-{
-    return d->lastError;
-}
-
-Reason Application::terminationReason() const
-{
-    return d->terminationReason;
-}
-
-QString Application::contentName() const
-{
-    return d->contentName;
-}
-
-Origin Application::creator() const
-{
-    return d->creator;
-}
-
-Origin Application::senders() const
-{
-    return d->senders;
-}
-
-Application::SetDescError Application::setDescription(const QDomElement &description)
-{
-    d->file = File(description.firstChildElement("file"));
-    //d->state = State::Pending; // basically it's incomming  content. so if we parsed it it's pending. if not parsed if will rejected anyway.
-    return d->file.isValid() ? Ok : Unparsed;
-}
-
-void Application::setFile(const File &file)
-{
-    d->file = file;
-}
-
-File Application::file() const
-{
-    return d->file;
-}
-
-File Application::acceptFile() const
-{
-    return d->acceptFile;
-}
-
-// incoming one? or we have to check real direction
-bool Application::setTransport(const QSharedPointer<Transport> &transport)
-{
-    if (!(transport->features() & Transport::Reliable))
-        return false;
-
-    int nsIndex = d->availableTransports.indexOf(transport->pad()->ns());
-    if (nsIndex == -1) {
-        return false;
-    }
-
-    // in case we automatically select a new transport on our own we definitely will come up to this point
-    if (d->transport) {
-        d->transport->disconnect(this);
-        d->transport.reset();
-    }
-
-    d->availableTransports.removeAt(nsIndex);
-    d->transport = transport;
-    connect(transport.data(), &Transport::updated, this, &Application::updated);
-    connect(transport.data(), &Transport::connected, this, [this]() {
-        d->transportReplaceOrigin = Origin::None;
-        d->transportReplaceState  = State::Finished; // not needed here probably
-        d->connection             = d->transport->connection();
-        if (d->streamigMode) {
-            connect(d->connection.data(), &Connection::readyRead, this, [this]() {
-                if (!d->device) {
-                    return;
+
+            auto evaluateTransportReplaceAction = [this]() {
+                if (d->transportReplaceState != State::PrepareLocalOffer || !d->transport->isInitialOfferReady())
+                    return Action::NoAction;
+
+                return d->transportReplaceOrigin == d->pad->session()->role() ? Action::TransportReplace : Action::TransportAccept;
+            };
+
+            switch (d->state) {
+            case State::Created:
+                break;
+            case State::PrepareLocalOffer:
+                if (d->transportReplaceOrigin != Origin::None) {
+                    if (!d->transport) {
+                        d->updateToSend = Action::ContentReject; // case me=creator was already handled by this momemnt in case of app.PrepareLocalOffer. see Transport::failed above
+                    }
+                    d->updateToSend = evaluateTransportReplaceAction();
+                    if (d->updateToSend == Action::TransportAccept) {
+                        d->updateToSend = Action::ContentAccept;
+                    }
+                    return d->updateToSend;
                 }
-                if (d->pad->session()->role() != d->senders) {
-                    d->readNextBlockFromTransport();
+
+                if (d->transport->isInitialOfferReady())
+                    d->updateToSend = d->creator == d->pad->session()->role() ? Action::ContentAdd : Action::ContentAccept;
+
+                break;
+            case State::Connecting:
+            case State::Pending:
+            case State::Active:
+                if (d->transportReplaceOrigin != Origin::None) {
+                    if (d->state == State::Active || !d->transport)
+                        d->updateToSend = Action::ContentRemove;
+                    else
+                        d->updateToSend = evaluateTransportReplaceAction();
+                    return d->updateToSend;
                 }
-            });
-            connect(d->connection.data(), &Connection::bytesWritten, this, [this](qint64 bytes) {
-                Q_UNUSED(bytes)
-                if (d->pad->session()->role() == d->senders && !d->connection->bytesToWrite()) {
-                    d->writeNextBlockToTransport();
+
+                if (d->terminationReason.isValid() && d->terminationReason.condition() != Reason::Condition::Success) {
+                    d->updateToSend = Action::ContentRemove;
+                } else if (d->transport->hasUpdates())
+                    d->updateToSend = Action::TransportInfo;
+
+                break;
+            case State::Finishing:
+                if (d->transportReplaceOrigin != Origin::None || d->terminationReason.isValid()) {
+                    d->updateToSend = Action::ContentRemove;
+                } else {
+                    d->updateToSend = Action::SessionInfo; // to send checksum
                 }
-            });
+                break;
+            default:
+                break;
+            }
+            return d->updateToSend; // TODO
         }
-        d->setState(State::Active);
-        if (d->streamigMode) {
-            if (d->acceptFile.range().isValid()) {
-                d->bytesLeft = d->acceptFile.range().length;
-                emit deviceRequested(d->acceptFile.range().offset, d->bytesLeft);
-            } else {
-                d->bytesLeft = d->file.size();
-                emit deviceRequested(0, d->bytesLeft);
+
+        OutgoingUpdate Application::takeOutgoingUpdate()
+        {
+            if (d->updateToSend == Action::NoAction) {
+                return OutgoingUpdate();
             }
-        } else {
-            emit connectionReady();
-        }
-    });
-
-    connect(transport.data(), &Transport::failed, this, [this]() {
-        d->transportReplaceOrigin = d->pad->session()->role();
-        if (d->state >= State::Active) {
-            emit updated(); // late failure are unhandled. just notify the remote
-            return;
-        }
-        // we can try to replace the transport
-        if (!selectNextTransport()) { // we can do transport-replace here
-            if (d->state == State::PrepareLocalOffer && d->creator == d->pad->session()->role()) {
-                // we were unable to send even initial offer
-                d->setState(State::Finished);
-            } else {
-                emit updated(); // we have to notify our peer about failure
+
+            auto client = d->pad->session()->manager()->client();
+            auto doc    = client->doc();
+
+            if (d->updateToSend == Action::SessionInfo) {
+                if (d->state != State::Finishing) {
+                    // TODO implement
+                    return OutgoingUpdate();
+                }
+                ContentBase cb(d->pad->session()->role(), d->contentName);
+                return OutgoingUpdate { QList<QDomElement>() << cb.toXml(doc, "received"), [this]() {
+                                           d->setState(State::Finished);
+                                       } };
             }
-        } else {
-            d->transportReplaceState = State::PrepareLocalOffer;
-        }
-    });
-
-    if (d->state >= State::Unacked) {
-        // seems like we are in transport failure recovery. d->transportFailed may confirm this
-        d->transport->prepare();
-    }
-    return true;
-}
-
-Origin Application::transportReplaceOrigin() const
-{
-    return d->transportReplaceOrigin;
-}
-
-bool Application::incomingTransportReplace(const QSharedPointer<Transport> &transport)
-{
-    auto prev = d->transportReplaceOrigin;
-    if (d->pad->session()->role() == Origin::Responder && prev == Origin::Responder && d->transport) {
-        // if I'm a responder and tried to send transport-replace too, then push ns back
-        d->availableTransports.append(d->transport->pad()->ns());
-    }
-    d->transportReplaceOrigin = d->pad->session()->peerRole();
-    auto ret                  = setTransport(transport);
-    if (ret)
-        d->transportReplaceState = State::PrepareLocalOffer;
-    else {
-        d->transportReplaceOrigin = prev;
-        d->lastError.reset();
-        // REVIEW We have to fail application here on tie-break or propose another transport
-    }
-
-    return ret;
-}
-
-QSharedPointer<Transport> Application::transport() const
-{
-    return d->transport;
-}
-
-void Application::setStreamingMode(bool mode)
-{
-    if (d->state <= State::Connecting) {
-        d->streamigMode = mode;
-    }
-}
-
-Action Application::evaluateOutgoingUpdate()
-{
-    d->updateToSend = Action::NoAction;
-    if (!isValid() || d->state == State::Created || d->state == State::Finished) {
-        return d->updateToSend;
-    }
-
-    auto evaluateTransportReplaceAction = [this]() {
-        if (d->transportReplaceState != State::PrepareLocalOffer || !d->transport->isInitialOfferReady())
-            return Action::NoAction;
-
-        return d->transportReplaceOrigin == d->pad->session()->role() ? Action::TransportReplace : Action::TransportAccept;
-    };
-
-    switch (d->state) {
-    case State::Created:
-        break;
-    case State::PrepareLocalOffer:
-        if (d->transportReplaceOrigin != Origin::None) {
+
+            QDomElement      transportEl;
+            OutgoingUpdateCB transportCB;
+
+            ContentBase cb(d->creator, d->contentName);
+            if (d->state == State::PrepareLocalOffer)
+                cb.senders = d->senders;
+            QList<QDomElement> updates;
+            auto               contentEl = cb.toXml(doc, "content");
+            updates << contentEl;
+
+            switch (d->updateToSend) {
+            case Action::ContentReject:
+            case Action::ContentRemove:
+                if (d->transportReplaceOrigin != Origin::None)
+                    d->terminationReason = Reason(Reason::Condition::FailedTransport);
+                if (d->terminationReason.isValid())
+                    updates << d->terminationReason.toXml(doc);
+                return OutgoingUpdate { updates, [this]() {
+                                           d->setState(State::Finished);
+                                       } };
+            case Action::ContentAdd:
+            case Action::ContentAccept:
+                Q_ASSERT(d->transport->isInitialOfferReady());
+                if (d->file.thumbnail().data.size()) {
+                    auto    thumb = d->file.thumbnail();
+                    auto    bm    = client->bobManager();
+                    BoBData data  = bm->append(thumb.data, thumb.mimeType);
+                    thumb.uri     = QLatin1String("cid:") + data.cid();
+                    d->file.setThumbnail(thumb);
+                }
+                contentEl.appendChild(doc->createElementNS(NS, QString::fromLatin1("description"))).appendChild(d->file.toXml(doc));
+                std::tie(transportEl, transportCB) = d->transport->takeInitialOffer();
+                contentEl.appendChild(transportEl);
+
+                d->setState(State::Unacked);
+                return OutgoingUpdate { updates, [this, transportCB]() {
+                                           if (transportCB) {
+                                               transportCB();
+                                           }
+                                           d->setState(d->pad->session()->role() == Origin::Initiator ? State::Pending : State::Connecting);
+                                       } };
+            case Action::TransportInfo:
+                Q_ASSERT(d->transport->hasUpdates());
+                std::tie(transportEl, transportCB) = d->transport->takeOutgoingUpdate();
+                contentEl.appendChild(transportEl);
+                return OutgoingUpdate { updates, transportCB };
+            case Action::TransportReplace:
+            case Action::TransportAccept: {
+                Q_ASSERT(d->transport->isInitialOfferReady());
+                d->transportReplaceState           = State::Unacked;
+                std::tie(transportEl, transportCB) = d->transport->takeInitialOffer();
+                contentEl.appendChild(transportEl);
+                auto action = d->updateToSend;
+                return OutgoingUpdate { updates, [this, transportCB, action]() {
+                                           if (transportCB) {
+                                               transportCB();
+                                           }
+                                           d->transportReplaceState = action == Action::TransportReplace ? State::Pending : State::Finished;
+                                       } };
+            }
+            default:
+                break;
+            }
+
+            return OutgoingUpdate(); // TODO
+        }
+
+        bool Application::wantBetterTransport(const QSharedPointer<Transport> &t) const
+        {
+            Q_UNUSED(t)
+            return true; // TODO check
+        }
+
+        bool Application::selectNextTransport()
+        {
+            while (d->availableTransports.size()) {
+                auto t = d->pad->session()->newOutgoingTransport(d->availableTransports.last());
+                if (t && setTransport(t)) {
+                    return true;
+                } else {
+                    d->availableTransports.removeLast();
+                }
+            }
+            return false;
+        }
+
+        void Application::prepare()
+        {
             if (!d->transport) {
-                d->updateToSend = Action::ContentReject; // case me=creator was already handled by this momemnt in case of app.PrepareLocalOffer. see Transport::failed above
+                selectNextTransport();
+            }
+            if (d->transport) {
+                d->setState(State::PrepareLocalOffer);
+                d->transport->prepare();
+            }
+        }
+
+        void Application::start()
+        {
+            if (d->transport) {
+                d->setState(State::Connecting);
+                d->transport->start();
             }
-            d->updateToSend = evaluateTransportReplaceAction();
-            if (d->updateToSend == Action::TransportAccept) {
-                d->updateToSend = Action::ContentAccept;
+            // TODO we need QIODevice somewhere here
+        }
+
+        bool Application::accept(const QDomElement &el)
+        {
+            File f(el.firstChildElement("file"));
+            if (!f.isValid()) {
+                return false;
             }
-            return d->updateToSend;
-        }
-
-        if (d->transport->isInitialOfferReady())
-            d->updateToSend = d->creator == d->pad->session()->role() ? Action::ContentAdd : Action::ContentAccept;
-
-        break;
-    case State::Connecting:
-    case State::Pending:
-    case State::Active:
-        if (d->transportReplaceOrigin != Origin::None) {
-            if (d->state == State::Active || !d->transport)
-                d->updateToSend = Action::ContentRemove;
-            else
-                d->updateToSend = evaluateTransportReplaceAction();
-            return d->updateToSend;
-        }
-
-        if (d->terminationReason.isValid() && d->terminationReason.condition() != Reason::Condition::Success) {
-            d->updateToSend = Action::ContentRemove;
-        } else if (d->transport->hasUpdates())
-            d->updateToSend = Action::TransportInfo;
-
-        break;
-    case State::Finishing:
-        if (d->transportReplaceOrigin != Origin::None || d->terminationReason.isValid()) {
-            d->updateToSend = Action::ContentRemove;
-        } else {
-            d->updateToSend = Action::SessionInfo; // to send checksum
-        }
-        break;
-    default:
-        break;
-    }
-    return d->updateToSend; // TODO
-}
-
-OutgoingUpdate Application::takeOutgoingUpdate()
-{
-    if (d->updateToSend == Action::NoAction) {
-        return OutgoingUpdate();
-    }
-
-    auto client = d->pad->session()->manager()->client();
-    auto doc    = client->doc();
-
-    if (d->updateToSend == Action::SessionInfo) {
-        if (d->state != State::Finishing) {
-            // TODO implement
-            return OutgoingUpdate();
-        }
-        ContentBase cb(d->pad->session()->role(), d->contentName);
-        return OutgoingUpdate { QList<QDomElement>() << cb.toXml(doc, "received"), [this]() {
-                                   d->setState(State::Finished);
-                               } };
-    }
-
-    QDomElement      transportEl;
-    OutgoingUpdateCB transportCB;
-
-    ContentBase cb(d->creator, d->contentName);
-    if (d->state == State::PrepareLocalOffer)
-        cb.senders = d->senders;
-    QList<QDomElement> updates;
-    auto               contentEl = cb.toXml(doc, "content");
-    updates << contentEl;
-
-    switch (d->updateToSend) {
-    case Action::ContentReject:
-    case Action::ContentRemove:
-        if (d->transportReplaceOrigin != Origin::None)
-            d->terminationReason = Reason(Reason::Condition::FailedTransport);
-        if (d->terminationReason.isValid())
-            updates << d->terminationReason.toXml(doc);
-        return OutgoingUpdate { updates, [this]() {
-                                   d->setState(State::Finished);
-                               } };
-    case Action::ContentAdd:
-    case Action::ContentAccept:
-        Q_ASSERT(d->transport->isInitialOfferReady());
-        if (d->file.thumbnail().data.size()) {
-            auto    thumb = d->file.thumbnail();
-            auto    bm    = client->bobManager();
-            BoBData data  = bm->append(thumb.data, thumb.mimeType);
-            thumb.uri     = QLatin1String("cid:") + data.cid();
-            d->file.setThumbnail(thumb);
-        }
-        contentEl.appendChild(doc->createElementNS(NS, QString::fromLatin1("description"))).appendChild(d->file.toXml(doc));
-        std::tie(transportEl, transportCB) = d->transport->takeInitialOffer();
-        contentEl.appendChild(transportEl);
-
-        d->setState(State::Unacked);
-        return OutgoingUpdate { updates, [this, transportCB]() {
-                                   if (transportCB) {
-                                       transportCB();
-                                   }
-                                   d->setState(d->pad->session()->role() == Origin::Initiator ? State::Pending : State::Connecting);
-                               } };
-    case Action::TransportInfo:
-        Q_ASSERT(d->transport->hasUpdates());
-        std::tie(transportEl, transportCB) = d->transport->takeOutgoingUpdate();
-        contentEl.appendChild(transportEl);
-        return OutgoingUpdate { updates, transportCB };
-    case Action::TransportReplace:
-    case Action::TransportAccept: {
-        Q_ASSERT(d->transport->isInitialOfferReady());
-        d->transportReplaceState           = State::Unacked;
-        std::tie(transportEl, transportCB) = d->transport->takeInitialOffer();
-        contentEl.appendChild(transportEl);
-        auto action = d->updateToSend;
-        return OutgoingUpdate { updates, [this, transportCB, action]() {
-                                   if (transportCB) {
-                                       transportCB();
-                                   }
-                                   d->transportReplaceState = action == Action::TransportReplace ? State::Pending : State::Finished;
-                               } };
-    }
-    default:
-        break;
-    }
-
-    return OutgoingUpdate(); // TODO
-}
-
-bool Application::wantBetterTransport(const QSharedPointer<Transport> &t) const
-{
-    Q_UNUSED(t)
-    return true; // TODO check
-}
-
-bool Application::selectNextTransport()
-{
-    while (d->availableTransports.size()) {
-        auto t = d->pad->session()->newOutgoingTransport(d->availableTransports.last());
-        if (t && setTransport(t)) {
+            d->acceptFile = f;
+            // TODO validate if accept file matches to the offer
+            setState(State::Accepted);
             return true;
-        } else {
-            d->availableTransports.removeLast();
-        }
-    }
-    return false;
-}
-
-void Application::prepare()
-{
-    if (!d->transport) {
-        selectNextTransport();
-    }
-    if (d->transport) {
-        d->setState(State::PrepareLocalOffer);
-        d->transport->prepare();
-    }
-}
-
-void Application::start()
-{
-    if (d->transport) {
-        d->setState(State::Connecting);
-        d->transport->start();
-    }
-    // TODO we need QIODevice somewhere here
-}
-
-bool Application::accept(const QDomElement &el)
-{
-    File f(el.firstChildElement("file"));
-    if (!f.isValid()) {
-        return false;
-    }
-    d->acceptFile = f;
-    // TODO validate if accept file matches to the offer
-    setState(State::Accepted);
-    return true;
-}
-
-void Application::remove(Reason::Condition cond, const QString &comment)
-{
-    if (d->state >= State::Finishing)
-        return;
-
-    d->terminationReason      = Reason(cond, comment);
-    d->transportReplaceOrigin = Origin::None; // just in case
-    d->transport->disconnect(this);
-    d->transport.reset();
-
-    if (d->creator == d->pad->session()->role() && d->state <= State::PrepareLocalOffer) {
-        // local content, not yet sent to remote
-        setState(State::Finished);
-        return;
-    }
-
-    setState(State::Finishing);
-    emit updated();
-}
-
-bool Application::incomingTransportAccept(const QDomElement &transportEl)
-{
-    if (d->transportReplaceOrigin != d->pad->session()->role()) {
-        d->lastError = ErrorUtil::makeOutOfOrder(*d->pad->doc());
-        return false;
-    }
-    if (d->transport->update(transportEl)) {
-        d->transportReplaceOrigin = Origin::None;
-        d->transportReplaceState  = State::Finished;
-        if (d->state >= State::Connecting) {
-            d->transport->start();
-        }
-        emit updated();
-        return true;
-    }
-    return false;
-}
-
-bool Application::isValid() const
-{
-    return d->file.isValid() && d->contentName.size() > 0 && (d->senders == Origin::Initiator || d->senders == Origin::Responder);
-}
-
-void Application::setDevice(QIODevice *dev, bool closeOnFinish)
-{
-    if (!dev) { // failed to provide proper device
-        d->terminationReason = Reason(Reason::Condition::FailedApplication, QString::fromLatin1("No destination device"));
-        emit updated();
-        return;
-    }
-    d->device              = dev;
-    d->closeDeviceOnFinish = closeOnFinish;
-    if (d->senders == d->pad->session()->role()) {
-        d->writeNextBlockToTransport();
-    } else {
-        d->readNextBlockFromTransport();
-    }
-}
-
-Connection::Ptr Application::connection() const
-{
-    return d->connection.staticCast<XMPP::Jingle::Connection>();
-}
-
-Pad::Pad(Manager *manager, Session *session) :
-    _manager(manager),
-    _session(session)
-{
-}
-
-QDomElement Pad::takeOutgoingSessionInfoUpdate()
-{
-    return QDomElement(); // TODO
-}
-
-QString Pad::ns() const
-{
-    return NS;
-}
-
-Session *Pad::session() const
-{
-    return _session;
-}
-
-ApplicationManager *Pad::manager() const
-{
-    return _manager;
-}
-
-QString Pad::generateContentName(Origin senders)
-{
-    QString prefix = senders == _session->role() ? "fileoffer" : "filereq";
-    QString name;
-    do {
-        name = prefix + QString("_%1").arg(qrand() & 0xffff, 4, 16, QChar('0'));
-    } while (_session->content(name, _session->role()));
-    return name;
-}
-
-void Pad::addOutgoingOffer(const File &file)
-{
-    auto selfp = _session->applicationPad(NS);
-    auto app   = _manager->startApplication(selfp, "ft", _session->role(), _session->role());
-    app->setFile(file);
-}
-} // namespace FileTransfer
+        }
+
+        void Application::remove(Reason::Condition cond, const QString &comment)
+        {
+            if (d->state >= State::Finishing)
+                return;
+
+            d->terminationReason      = Reason(cond, comment);
+            d->transportReplaceOrigin = Origin::None; // just in case
+            d->transport->disconnect(this);
+            d->transport.reset();
+
+            if (d->creator == d->pad->session()->role() && d->state <= State::PrepareLocalOffer) {
+                // local content, not yet sent to remote
+                setState(State::Finished);
+                return;
+            }
+
+            setState(State::Finishing);
+            emit updated();
+        }
+
+        bool Application::incomingTransportAccept(const QDomElement &transportEl)
+        {
+            if (d->transportReplaceOrigin != d->pad->session()->role()) {
+                d->lastError = ErrorUtil::makeOutOfOrder(*d->pad->doc());
+                return false;
+            }
+            if (d->transport->update(transportEl)) {
+                d->transportReplaceOrigin = Origin::None;
+                d->transportReplaceState  = State::Finished;
+                if (d->state >= State::Connecting) {
+                    d->transport->start();
+                }
+                emit updated();
+                return true;
+            }
+            return false;
+        }
+
+        bool Application::isValid() const
+        {
+            return d->file.isValid() && d->contentName.size() > 0 && (d->senders == Origin::Initiator || d->senders == Origin::Responder);
+        }
+
+        void Application::setDevice(QIODevice *dev, bool closeOnFinish)
+        {
+            if (!dev) { // failed to provide proper device
+                d->terminationReason = Reason(Reason::Condition::FailedApplication, QString::fromLatin1("No destination device"));
+                emit updated();
+                return;
+            }
+            d->device              = dev;
+            d->closeDeviceOnFinish = closeOnFinish;
+            if (d->senders == d->pad->session()->role()) {
+                d->writeNextBlockToTransport();
+            } else {
+                d->readNextBlockFromTransport();
+            }
+        }
+
+        Connection::Ptr Application::connection() const
+        {
+            return d->connection.staticCast<XMPP::Jingle::Connection>();
+        }
+
+        Pad::Pad(Manager *manager, Session *session) :
+            _manager(manager),
+            _session(session)
+        {
+        }
+
+        QDomElement Pad::takeOutgoingSessionInfoUpdate()
+        {
+            return QDomElement(); // TODO
+        }
+
+        QString Pad::ns() const
+        {
+            return NS;
+        }
+
+        Session *Pad::session() const
+        {
+            return _session;
+        }
+
+        ApplicationManager *Pad::manager() const
+        {
+            return _manager;
+        }
+
+        QString Pad::generateContentName(Origin senders)
+        {
+            QString prefix = senders == _session->role() ? "fileoffer" : "filereq";
+            QString name;
+            do {
+                name = prefix + QString("_%1").arg(qrand() & 0xffff, 4, 16, QChar('0'));
+            } while (_session->content(name, _session->role()));
+            return name;
+        }
+
+        void Pad::addOutgoingOffer(const File &file)
+        {
+            auto selfp = _session->applicationPad(NS);
+            auto app   = _manager->startApplication(selfp, "ft", _session->role(), _session->role());
+            app->setFile(file);
+        }
+    } // namespace FileTransfer
 } // namespace Jingle
 } // namespace XMPP

From f1c08fa8e0f684d5b440eb0ce1c18d8a59d5ec11 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 13 Oct 2019 11:17:57 +0300
Subject: [PATCH 103/383] reformat with compact namespaces

---
 src/xmpp/xmpp-im/jingle-ft.h | 343 ++++++++++++++++++-----------------
 1 file changed, 173 insertions(+), 170 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index 3b62d085..536a4727 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -26,177 +26,180 @@
 namespace XMPP {
 class Client;
 class Thumbnail;
+}
+
+namespace XMPP { namespace Jingle { namespace FileTransfer {
+
+    extern const QString NS;
+    class Manager;
+
+    struct Range {
+        qint64      offset = 0;
+        qint64      length = 0; // 0 - from offset to the end of the file
+        QList<Hash> hashes;
+
+        inline Range() {}
+        inline Range(qint64 offset, qint64 length) : offset(offset), length(length) {}
+        inline bool isValid() const { return hashes.size() || offset || length; }
+        QDomElement toXml(QDomDocument *doc) const;
+    };
+
+    class File {
+    public:
+        File();
+        File(const File &other);
+        File(const QDomElement &file);
+        ~File();
+        File &      operator=(const File &other);
+        inline bool isValid() const { return d != nullptr; }
+        QDomElement toXml(QDomDocument *doc) const;
+        bool        merge(const File &other);
+        bool        hasComputedHashes() const;
+        bool        hasSize() const;
+
+        QDateTime   date() const;
+        QString     description() const;
+        QList<Hash> hashes() const;
+        Hash        hash(Hash::Type t = Hash::Unknown) const;
+        QString     mediaType() const;
+        QString     name() const;
+        quint64     size() const;
+        Range       range() const;
+        Thumbnail   thumbnail() const;
+        QByteArray  amplitudes() const;
+
+        void setDate(const QDateTime &date);
+        void setDescription(const QString &desc);
+        void addHash(const Hash &hash);
+        void setMediaType(const QString &mediaType);
+        void setName(const QString &name);
+        void setSize(quint64 size);
+        void setRange(const Range &range = Range()); // default empty just to indicate it's supported
+        void setThumbnail(const Thumbnail &thumb);
+        void setAmplitudes(const QByteArray &amplitudes);
+
+    private:
+        class Private;
+        Private *                   ensureD();
+        QSharedDataPointer<Private> d;
+    };
+
+    class Checksum : public ContentBase {
+        inline Checksum() {}
+        Checksum(const QDomElement &file);
+        bool        isValid() const;
+        QDomElement toXml(QDomDocument *doc) const;
+
+    private:
+        File file;
+    };
+
+    class Received : public ContentBase {
+        using ContentBase::ContentBase;
+        QDomElement toXml(QDomDocument *doc) const;
+    };
+
+    class Pad : public ApplicationManagerPad {
+        Q_OBJECT
+        // TODO
+    public:
+        Pad(Manager *manager, Session *session);
+        QDomElement         takeOutgoingSessionInfoUpdate() override;
+        QString             ns() const override;
+        Session *           session() const override;
+        ApplicationManager *manager() const override;
+        QString             generateContentName(Origin senders) override;
+
+        void addOutgoingOffer(const File &file);
+
+    private:
+        Manager *_manager;
+        Session *_session;
+    };
+
+    class Application : public XMPP::Jingle::Application {
+        Q_OBJECT
+    public:
+        Application(const QSharedPointer<Pad> &pad, const QString &contentName, Origin creator, Origin senders);
+        ~Application();
+
+        ApplicationManagerPad::Ptr pad() const override;
+        State                      state() const override;
+        void                       setState(State state) override;
+        XMPP::Stanza::Error        lastError() const override;
+        Reason                     terminationReason() const override;
+
+        QString                   contentName() const override;
+        Origin                    creator() const override;
+        Origin                    senders() const override;
+        Origin                    transportReplaceOrigin() const override;
+        SetDescError              setDescription(const QDomElement &description) override;
+        void                      setFile(const File &file);
+        File                      file() const;
+        File                      acceptFile() const;
+        bool                      setTransport(const QSharedPointer<Transport> &transport) override;
+        QSharedPointer<Transport> transport() const override;
+
+        /**
+         * @brief setStreamingMode enables external download control.
+         *  So Jingle-FT won't request output device but instead underlying established
+         *  connection will be emitted (see connectionReady() signal).
+         *  The connection is an XMPP::Jingle::Connection::Ptr instance.
+         *  When the connection is not needed anymore, one can just destroy jingle
+         *  session or remove the Application from the session.
+         *  Make sure to set the mode before connection is established.
+         * @param mode
+         */
+        void setStreamingMode(bool mode = true);
+
+        Action         evaluateOutgoingUpdate() override;
+        OutgoingUpdate takeOutgoingUpdate() override;
+        bool           wantBetterTransport(const QSharedPointer<XMPP::Jingle::Transport> &) const override;
+        bool           selectNextTransport() override;
+        void           prepare() override;
+        void           start() override;
+        bool           accept(const QDomElement &el) override;
+        void           remove(Reason::Condition cond = Reason::Success, const QString &comment = QString()) override;
+
+        bool isValid() const;
+
+        void            setDevice(QIODevice *dev, bool closeOnFinish = true);
+        Connection::Ptr connection() const;
+
+    protected:
+        bool incomingTransportReplace(const QSharedPointer<Transport> &transport) override;
+        bool incomingTransportAccept(const QDomElement &transportEl) override;
+
+    signals:
+        void connectionReady(); // streaming mode only
+        void
+             deviceRequested(quint64 offset,
+                             quint64 size); // if size = 0 then it's reamaining part of the file (non-streaming mode only)
+        void progress(quint64 offset);
+
+    private:
+        class Private;
+        QScopedPointer<Private> d;
+    };
+
+    class Manager : public XMPP::Jingle::ApplicationManager {
+        Q_OBJECT
+    public:
+        Manager(QObject *parent = nullptr);
+        ~Manager();
+        void         setJingleManager(XMPP::Jingle::Manager *jm);
+        Application *startApplication(const ApplicationManagerPad::Ptr &pad, const QString &contentName, Origin creator,
+                                      Origin senders);
+        ApplicationManagerPad *pad(Session *session); // pad factory
+        void                   closeAll();
+        Client *               client();
+
+        QStringList availableTransports() const;
+
+    private:
+        XMPP::Jingle::Manager *jingleManager = nullptr;
+    };
 
-namespace Jingle {
-namespace FileTransfer {
-
-extern const QString NS;
-class Manager;
-
-struct Range {
-    quint64     offset = 0;
-    quint64     length = 0; // 0 - from offset to the end of the file
-    QList<Hash> hashes;
-
-    inline Range() {}
-    inline Range(quint64 offset, quint64 length) :
-        offset(offset), length(length) {}
-    inline bool isValid() const { return hashes.size() || offset || length; }
-    QDomElement toXml(QDomDocument *doc) const;
-};
-
-class File {
-public:
-    File();
-    File(const File &other);
-    File(const QDomElement &file);
-    ~File();
-    File &      operator=(const File &other);
-    inline bool isValid() const { return d != nullptr; }
-    QDomElement toXml(QDomDocument *doc) const;
-    bool        merge(const File &other);
-    bool        hasComputedHashes() const;
-    bool        hasSize() const;
-
-    QDateTime   date() const;
-    QString     description() const;
-    QList<Hash> hashes() const;
-    Hash        hash(Hash::Type t = Hash::Unknown) const;
-    QString     mediaType() const;
-    QString     name() const;
-    quint64     size() const;
-    Range       range() const;
-    Thumbnail   thumbnail() const;
-    QByteArray  amplitudes() const;
-
-    void setDate(const QDateTime &date);
-    void setDescription(const QString &desc);
-    void addHash(const Hash &hash);
-    void setMediaType(const QString &mediaType);
-    void setName(const QString &name);
-    void setSize(quint64 size);
-    void setRange(const Range &range = Range()); // default empty just to indicate it's supported
-    void setThumbnail(const Thumbnail &thumb);
-    void setAmplitudes(const QByteArray &amplitudes);
-
-private:
-    class Private;
-    Private *                   ensureD();
-    QSharedDataPointer<Private> d;
-};
-
-class Checksum : public ContentBase {
-    inline Checksum() {}
-    Checksum(const QDomElement &file);
-    bool        isValid() const;
-    QDomElement toXml(QDomDocument *doc) const;
-
-private:
-    File file;
-};
-
-class Received : public ContentBase {
-    using ContentBase::ContentBase;
-    QDomElement toXml(QDomDocument *doc) const;
-};
-
-class Pad : public ApplicationManagerPad {
-    Q_OBJECT
-    // TODO
-public:
-    Pad(Manager *manager, Session *session);
-    QDomElement         takeOutgoingSessionInfoUpdate() override;
-    QString             ns() const override;
-    Session *           session() const override;
-    ApplicationManager *manager() const override;
-    QString             generateContentName(Origin senders) override;
-
-    void addOutgoingOffer(const File &file);
-
-private:
-    Manager *_manager;
-    Session *_session;
-};
-
-class Application : public XMPP::Jingle::Application {
-    Q_OBJECT
-public:
-    Application(const QSharedPointer<Pad> &pad, const QString &contentName, Origin creator, Origin senders);
-    ~Application();
-
-    ApplicationManagerPad::Ptr pad() const override;
-    State                      state() const override;
-    void                       setState(State state) override;
-    XMPP::Stanza::Error        lastError() const override;
-    Reason                     terminationReason() const override;
-
-    QString                   contentName() const override;
-    Origin                    creator() const override;
-    Origin                    senders() const override;
-    Origin                    transportReplaceOrigin() const override;
-    SetDescError              setDescription(const QDomElement &description) override;
-    void                      setFile(const File &file);
-    File                      file() const;
-    File                      acceptFile() const;
-    bool                      setTransport(const QSharedPointer<Transport> &transport) override;
-    QSharedPointer<Transport> transport() const override;
-
-    /**
-     * @brief setStreamingMode enables external download control.
-     *  So Jingle-FT won't request output device but instead underlying established
-     *  connection will be emitted (see connectionReady() signal).
-     *  The connection is an XMPP::Jingle::Connection::Ptr instance.
-     *  When the connection is not needed anymore, one can just destroy jingle
-     *  session or remove the Application from the session.
-     *  Make sure to set the mode before connection is established.
-     * @param mode
-     */
-    void setStreamingMode(bool mode = true);
-
-    Action         evaluateOutgoingUpdate() override;
-    OutgoingUpdate takeOutgoingUpdate() override;
-    bool           wantBetterTransport(const QSharedPointer<XMPP::Jingle::Transport> &) const override;
-    bool           selectNextTransport() override;
-    void           prepare() override;
-    void           start() override;
-    bool           accept(const QDomElement &el) override;
-    void           remove(Reason::Condition cond = Reason::Success, const QString &comment = QString()) override;
-
-    bool isValid() const;
-
-    void            setDevice(QIODevice *dev, bool closeOnFinish = true);
-    Connection::Ptr connection() const;
-
-protected:
-    bool incomingTransportReplace(const QSharedPointer<Transport> &transport) override;
-    bool incomingTransportAccept(const QDomElement &transportEl) override;
-
-signals:
-    void connectionReady();                             // streaming mode only
-    void deviceRequested(quint64 offset, quint64 size); // if size = 0 then it's reamaining part of the file (non-streaming mode only)
-    void progress(quint64 offset);
-
-private:
-    class Private;
-    QScopedPointer<Private> d;
-};
-
-class Manager : public XMPP::Jingle::ApplicationManager {
-    Q_OBJECT
-public:
-    Manager(QObject *parent = nullptr);
-    ~Manager();
-    void                   setJingleManager(XMPP::Jingle::Manager *jm);
-    Application *          startApplication(const ApplicationManagerPad::Ptr &pad, const QString &contentName, Origin creator, Origin senders);
-    ApplicationManagerPad *pad(Session *session); // pad factory
-    void                   closeAll();
-    Client *               client();
-
-    QStringList availableTransports() const;
-
-private:
-    XMPP::Jingle::Manager *jingleManager = nullptr;
-};
 } // namespace FileTransfer
 } // namespace Jingle
 } // namespace XMPP

From d1af87befa75cad006103ba1fb4aeed36f525a72 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 13 Oct 2019 12:32:41 +0300
Subject: [PATCH 104/383] fixed senders attr parser

---
 src/xmpp/xmpp-im/jingle.cpp | 3148 +++++++++++++++++------------------
 1 file changed, 1506 insertions(+), 1642 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index e1b48aff..efcf2531 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -34,1891 +34,1755 @@
 #include <QTimer>
 #include <functional>
 
-namespace XMPP {
-namespace Jingle {
-const QString NS(QStringLiteral("urn:xmpp:jingle:1"));
-const QString ERROR_NS(QStringLiteral("urn:xmpp:jingle:errors:1"));
-
-//----------------------------------------------------------------------------
-// Jingle
-//----------------------------------------------------------------------------
-static const struct {
-    const char *text;
-    Action action;
-} jingleActions[] = {
-{ "content-accept",     Action::ContentAccept },
-{ "content-add",        Action::ContentAdd },
-{ "content-modify",     Action::ContentModify },
-{ "content-reject",     Action::ContentReject },
-{ "content-remove",     Action::ContentRemove },
-{ "description-info",   Action::DescriptionInfo },
-{ "security-info",      Action::SecurityInfo },
-{ "session-accept",     Action::SessionAccept },
-{ "session-info",       Action::SessionInfo },
-{ "session-initiate",   Action::SessionInitiate },
-{ "session-terminate",  Action::SessionTerminate },
-{ "transport-accept",   Action::TransportAccept },
-{ "transport-info",     Action::TransportInfo },
-{ "transport-reject",   Action::TransportReject },
-{ "transport-replace",  Action::TransportReplace }
-};
-
-class Jingle::Private : public QSharedData
-{
-public:
-    Action action;
-    QString sid;
-    Jid initiator;
-    Jid responder;
-};
-
-Jingle::Jingle()
-{
-
-}
-
-Jingle::Jingle(Action action, const QString &sid) :
-    d(new Private)
-{
-    d->action = action;
-    d->sid = sid;
-}
-
-Jingle::Jingle(const QDomElement &e)
-{
-    QString actionStr = e.attribute(QLatin1String("action"));
-    Action action;
-    QString sid = e.attribute(QLatin1String("sid"));
-    Jid initiator;
-    Jid responder;
-
-    bool found = false;
-    for (unsigned int i = 0; i < sizeof(jingleActions) / sizeof(jingleActions[0]); i++) {
-        if (actionStr == jingleActions[i].text) {
-            found = true;
-            action = jingleActions[i].action;
-            break;
-        }
-    }
-    if (!found || sid.isEmpty()) {
-        return;
+namespace XMPP { namespace Jingle {
+    const QString NS(QStringLiteral("urn:xmpp:jingle:1"));
+    const QString ERROR_NS(QStringLiteral("urn:xmpp:jingle:errors:1"));
+
+    //----------------------------------------------------------------------------
+    // Jingle
+    //----------------------------------------------------------------------------
+    static const struct {
+        const char *text;
+        Action      action;
+    } jingleActions[]
+        = { { "content-accept", Action::ContentAccept },       { "content-add", Action::ContentAdd },
+            { "content-modify", Action::ContentModify },       { "content-reject", Action::ContentReject },
+            { "content-remove", Action::ContentRemove },       { "description-info", Action::DescriptionInfo },
+            { "security-info", Action::SecurityInfo },         { "session-accept", Action::SessionAccept },
+            { "session-info", Action::SessionInfo },           { "session-initiate", Action::SessionInitiate },
+            { "session-terminate", Action::SessionTerminate }, { "transport-accept", Action::TransportAccept },
+            { "transport-info", Action::TransportInfo },       { "transport-reject", Action::TransportReject },
+            { "transport-replace", Action::TransportReplace } };
+
+    class Jingle::Private : public QSharedData {
+    public:
+        Action  action;
+        QString sid;
+        Jid     initiator;
+        Jid     responder;
+    };
+
+    Jingle::Jingle() {}
+
+    Jingle::Jingle(Action action, const QString &sid) : d(new Private)
+    {
+        d->action = action;
+        d->sid    = sid;
     }
 
-    if (!e.attribute(QLatin1String("initiator")).isEmpty()) {
-        initiator = Jid(e.attribute(QLatin1String("initiator")));
-        if (initiator.isNull()) {
-            qDebug("malformed initiator jid");
-            return;
+    Jingle::Jingle(const QDomElement &e)
+    {
+        QString actionStr = e.attribute(QLatin1String("action"));
+        Action  action;
+        QString sid = e.attribute(QLatin1String("sid"));
+        Jid     initiator;
+        Jid     responder;
+
+        bool found = false;
+        for (unsigned int i = 0; i < sizeof(jingleActions) / sizeof(jingleActions[0]); i++) {
+            if (actionStr == jingleActions[i].text) {
+                found  = true;
+                action = jingleActions[i].action;
+                break;
+            }
         }
-    }
-    if (!e.attribute(QLatin1String("responder")).isEmpty()) {
-        responder = Jid(e.attribute(QLatin1String("responder")));
-        if (responder.isNull()) {
-            qDebug("malformed responder jid");
+        if (!found || sid.isEmpty()) {
             return;
         }
-    }
-
-    d = new Private;
-    d->action = action;
-    d->sid = sid;
-    d->responder = responder;
-}
 
-Jingle::Jingle(const Jingle &other) :
-    d(other.d)
-{
-
-}
+        if (!e.attribute(QLatin1String("initiator")).isEmpty()) {
+            initiator = Jid(e.attribute(QLatin1String("initiator")));
+            if (initiator.isNull()) {
+                qDebug("malformed initiator jid");
+                return;
+            }
+        }
+        if (!e.attribute(QLatin1String("responder")).isEmpty()) {
+            responder = Jid(e.attribute(QLatin1String("responder")));
+            if (responder.isNull()) {
+                qDebug("malformed responder jid");
+                return;
+            }
+        }
 
-Jingle::~Jingle()
-{
+        d            = new Private;
+        d->action    = action;
+        d->sid       = sid;
+        d->responder = responder;
+    }
 
-}
+    Jingle::Jingle(const Jingle &other) : d(other.d) {}
 
-Jingle::Private* Jingle::ensureD()
-{
-    if (!d) {
-        d = new Private;
-    }
-    return d.data();
-}
+    Jingle::~Jingle() {}
 
-QDomElement Jingle::toXml(QDomDocument *doc) const
-{
-    if (!d || d->sid.isEmpty() || d->action == Action::NoAction) {
-        return QDomElement();
+    Jingle::Private *Jingle::ensureD()
+    {
+        if (!d) {
+            d = new Private;
+        }
+        return d.data();
     }
 
-    QDomElement query = doc->createElementNS(NS, QLatin1String("jingle"));
-    for (unsigned int i = 0; i < sizeof(jingleActions) / sizeof(jingleActions[0]); i++) {
-        if (jingleActions[i].action == d->action) {
-            query.setAttribute(QLatin1String("action"), QLatin1String(jingleActions[i].text));
-            break;
+    QDomElement Jingle::toXml(QDomDocument *doc) const
+    {
+        if (!d || d->sid.isEmpty() || d->action == Action::NoAction) {
+            return QDomElement();
         }
-    }
 
-    if(!d->initiator.isNull())
-        query.setAttribute(QLatin1String("initiator"), d->initiator.full());
-    if(!d->responder.isNull())
-        query.setAttribute(QLatin1String("responder"), d->responder.full());
-    query.setAttribute(QLatin1String("sid"), d->sid);
-
-    return query;
-}
-
-Action Jingle::action() const
-{
-    return d->action;
-}
-
-const QString &Jingle::sid() const
-{
-    return d->sid;
-}
-
-const Jid &Jingle::initiator() const
-{
-    return d->initiator;
-}
-
-void Jingle::setInitiator(const Jid &jid)
-{
-    d->initiator = jid;
-}
-
-const Jid &Jingle::responder() const
-{
-    return d->responder;
-}
-
-void Jingle::setResponder(const Jid &jid)
-{
-    d->responder = jid;
-}
-
-//----------------------------------------------------------------------------
-// Reason
-//----------------------------------------------------------------------------
-static const QMap<QString,Reason::Condition> reasonConditions = {
-    { QStringLiteral("alternative-session"),      Reason::AlternativeSession },
-    { QStringLiteral("busy"),                     Reason::Busy },
-    { QStringLiteral("cancel"),                   Reason::Cancel },
-    { QStringLiteral("connectivity-error"),       Reason::ConnectivityError },
-    { QStringLiteral("decline"),                  Reason::Decline },
-    { QStringLiteral("expired"),                  Reason::Expired },
-    { QStringLiteral("failed-application"),       Reason::FailedApplication },
-    { QStringLiteral("failed-transport"),         Reason::FailedTransport },
-    { QStringLiteral("general-error"),            Reason::GeneralError },
-    { QStringLiteral("gone"),                     Reason::Gone },
-    { QStringLiteral("incompatible-parameters"),  Reason::IncompatibleParameters },
-    { QStringLiteral("media-error"),              Reason::MediaError },
-    { QStringLiteral("security-error"),           Reason::SecurityError },
-    { QStringLiteral("success"),                  Reason::Success },
-    { QStringLiteral("timeout"),                  Reason::Timeout },
-    { QStringLiteral("unsupported-applications"), Reason::UnsupportedApplications },
-    { QStringLiteral("unsupported-transports"),   Reason::UnsupportedTransports },
-};
-
-class Reason::Private :public QSharedData {
-public:
-    Reason::Condition cond;
-    QString text;
-};
-
-Reason::Reason()
-{
-
-}
-
-Reason::~Reason()
-{
-
-}
-
-Reason::Reason(Reason::Condition cond, const QString &text) :
-    d(new Private)
-{
-    d->cond = cond;
-    d->text = text;
-}
-
-Reason::Reason(const QDomElement &e)
-{
-    if(e.tagName() != QLatin1String("reason"))
-        return;
-
-    Condition condition = NoReason;
-    QString text;
-    QString rns = e.namespaceURI();
-
-    for (QDomElement c = e.firstChildElement(); !c.isNull(); c = c.nextSiblingElement()) {
-        if (c.tagName() == QLatin1String("text")) {
-            text = c.text();
-        }
-        else if (c.namespaceURI() != rns) {
-            // TODO add here all the extensions to reason.
-        }
-        else {
-            condition = reasonConditions.value(c.tagName());
+        QDomElement query = doc->createElementNS(NS, QLatin1String("jingle"));
+        for (unsigned int i = 0; i < sizeof(jingleActions) / sizeof(jingleActions[0]); i++) {
+            if (jingleActions[i].action == d->action) {
+                query.setAttribute(QLatin1String("action"), QLatin1String(jingleActions[i].text));
+                break;
+            }
         }
+
+        if (!d->initiator.isNull())
+            query.setAttribute(QLatin1String("initiator"), d->initiator.full());
+        if (!d->responder.isNull())
+            query.setAttribute(QLatin1String("responder"), d->responder.full());
+        query.setAttribute(QLatin1String("sid"), d->sid);
+
+        return query;
     }
 
-    if (condition != NoReason) {
-        d = new Private;
-        d->cond = condition;
+    Action Jingle::action() const { return d->action; }
+
+    const QString &Jingle::sid() const { return d->sid; }
+
+    const Jid &Jingle::initiator() const { return d->initiator; }
+
+    void Jingle::setInitiator(const Jid &jid) { d->initiator = jid; }
+
+    const Jid &Jingle::responder() const { return d->responder; }
+
+    void Jingle::setResponder(const Jid &jid) { d->responder = jid; }
+
+    //----------------------------------------------------------------------------
+    // Reason
+    //----------------------------------------------------------------------------
+    static const QMap<QString, Reason::Condition> reasonConditions = {
+        { QStringLiteral("alternative-session"), Reason::AlternativeSession },
+        { QStringLiteral("busy"), Reason::Busy },
+        { QStringLiteral("cancel"), Reason::Cancel },
+        { QStringLiteral("connectivity-error"), Reason::ConnectivityError },
+        { QStringLiteral("decline"), Reason::Decline },
+        { QStringLiteral("expired"), Reason::Expired },
+        { QStringLiteral("failed-application"), Reason::FailedApplication },
+        { QStringLiteral("failed-transport"), Reason::FailedTransport },
+        { QStringLiteral("general-error"), Reason::GeneralError },
+        { QStringLiteral("gone"), Reason::Gone },
+        { QStringLiteral("incompatible-parameters"), Reason::IncompatibleParameters },
+        { QStringLiteral("media-error"), Reason::MediaError },
+        { QStringLiteral("security-error"), Reason::SecurityError },
+        { QStringLiteral("success"), Reason::Success },
+        { QStringLiteral("timeout"), Reason::Timeout },
+        { QStringLiteral("unsupported-applications"), Reason::UnsupportedApplications },
+        { QStringLiteral("unsupported-transports"), Reason::UnsupportedTransports },
+    };
+
+    class Reason::Private : public QSharedData {
+    public:
+        Reason::Condition cond;
+        QString           text;
+    };
+
+    Reason::Reason() {}
+
+    Reason::~Reason() {}
+
+    Reason::Reason(Reason::Condition cond, const QString &text) : d(new Private)
+    {
+        d->cond = cond;
         d->text = text;
     }
-}
-
-Reason::Reason(const Reason &other) :
-    d(other.d)
-{
-
-}
-
-Reason &Reason::operator=(const Reason &other)
-{
-    d = other.d;
-    return *this;
-}
-
-Reason::Condition Reason::condition() const
-{
-    if (d) return d->cond;
-    return NoReason;
-}
-
-void Reason::setCondition(Condition cond)
-{
-    ensureD()->cond = cond;
-}
-
-QString Reason::text() const
-{
-    if (d) return d->text;
-    return QString();
-}
-
-void Reason::setText(const QString &text)
-{
-    ensureD()->text = text;
-}
-
-QDomElement Reason::toXml(QDomDocument *doc) const
-{
-    if (d && d->cond != NoReason) {
-        for (auto r = reasonConditions.cbegin(); r != reasonConditions.cend(); ++r) {
-            if (r.value() == d->cond) {
-                QDomElement e = doc->createElement(QLatin1String("reason"));
-                e.appendChild(doc->createElement(r.key()));
-                if (!d->text.isEmpty()) {
-                    e.appendChild(textTag(doc, QLatin1String("text"), d->text));
-                }
-                return e;
+
+    Reason::Reason(const QDomElement &e)
+    {
+        if (e.tagName() != QLatin1String("reason"))
+            return;
+
+        Condition condition = NoReason;
+        QString   text;
+        QString   rns = e.namespaceURI();
+
+        for (QDomElement c = e.firstChildElement(); !c.isNull(); c = c.nextSiblingElement()) {
+            if (c.tagName() == QLatin1String("text")) {
+                text = c.text();
+            } else if (c.namespaceURI() != rns) {
+                // TODO add here all the extensions to reason.
+            } else {
+                condition = reasonConditions.value(c.tagName());
             }
         }
-    }
-    return QDomElement();
-}
 
-Reason::Private* Reason::ensureD()
-{
-    if (!d) {
-        d = new Private;
-    }
-    return d.data();
-}
-
-//----------------------------------------------------------------------------
-// ContentBase
-//----------------------------------------------------------------------------
-ContentBase::ContentBase(Origin creator, const QString &name) :
-    creator(creator), name(name)
-{
-}
-
-ContentBase::ContentBase(const QDomElement &el)
-{
-    static QMap<QString,Origin> sendersMap({
-                                                {QStringLiteral("initiator"), Origin::Initiator},
-                                                {QStringLiteral("none"), Origin::Initiator},
-                                                {QStringLiteral("responder"), Origin::Initiator}
-                                            });
-    creator = creatorAttr(el);
-    name = el.attribute(QLatin1String("name"));
-    senders = sendersMap.value(el.attribute(QLatin1String("senders")));
-    disposition = el.attribute(QLatin1String("disposition")); // if empty, it's "session"
-}
-
-QDomElement ContentBase::toXml(QDomDocument *doc, const char *tagName) const
-{
-    if (!isValid()) {
-        return QDomElement();
+        if (condition != NoReason) {
+            d       = new Private;
+            d->cond = condition;
+            d->text = text;
+        }
     }
-    auto el = doc->createElement(QLatin1String(tagName));
-    setCreatorAttr(el, creator);
-    el.setAttribute(QLatin1String("name"), name);
-
-    QString sendersStr;
-    switch (senders) {
-    case Origin::None:
-        sendersStr = QLatin1String("none");
-        break;
-
-    case Origin::Initiator:
-        sendersStr = QLatin1String("initiator");
-        break;
-
-    case Origin::Responder:
-        sendersStr = QLatin1String("responder");
-        break;
-
-    case Origin::Both:
-    default:
-        break;
+
+    Reason::Reason(const Reason &other) : d(other.d) {}
+
+    Reason &Reason::operator=(const Reason &other)
+    {
+        d = other.d;
+        return *this;
     }
 
-    if (!disposition.isEmpty() && disposition != QLatin1String("session")) {
-        el.setAttribute(QLatin1String("disposition"), disposition); // NOTE review how we can parse it some generic way
+    Reason::Condition Reason::condition() const
+    {
+        if (d)
+            return d->cond;
+        return NoReason;
     }
-    if (!sendersStr.isEmpty()) {
-        el.setAttribute(QLatin1String("senders"), sendersStr);
+
+    void Reason::setCondition(Condition cond) { ensureD()->cond = cond; }
+
+    QString Reason::text() const
+    {
+        if (d)
+            return d->text;
+        return QString();
     }
 
-    return el;
-}
+    void Reason::setText(const QString &text) { ensureD()->text = text; }
 
-Origin ContentBase::creatorAttr(const QDomElement &el)
-{
-    auto creatorStr = el.attribute(QLatin1String("creator"));
-    if (creatorStr == QLatin1String("initiator")) {
-        return Origin::Initiator;
+    QDomElement Reason::toXml(QDomDocument *doc) const
+    {
+        if (d && d->cond != NoReason) {
+            for (auto r = reasonConditions.cbegin(); r != reasonConditions.cend(); ++r) {
+                if (r.value() == d->cond) {
+                    QDomElement e = doc->createElement(QLatin1String("reason"));
+                    e.appendChild(doc->createElement(r.key()));
+                    if (!d->text.isEmpty()) {
+                        e.appendChild(textTag(doc, QLatin1String("text"), d->text));
+                    }
+                    return e;
+                }
+            }
+        }
+        return QDomElement();
     }
-    if (creatorStr == QLatin1String("responder")) {
-        return Origin::Responder;
+
+    Reason::Private *Reason::ensureD()
+    {
+        if (!d) {
+            d = new Private;
+        }
+        return d.data();
     }
-    return Origin::None;
-}
-
-bool ContentBase::setCreatorAttr(QDomElement &el, Origin creator)
-{
-    if (creator == Origin::Initiator) {
-        el.setAttribute(QLatin1String("creator"), QLatin1String("initiator"));
-    } else if (creator == Origin::Responder) {
-        el.setAttribute(QLatin1String("creator"), QLatin1String("responder"));
-    } else {
-        return false;
+
+    //----------------------------------------------------------------------------
+    // ContentBase
+    //----------------------------------------------------------------------------
+    ContentBase::ContentBase(Origin creator, const QString &name) : creator(creator), name(name) {}
+
+    ContentBase::ContentBase(const QDomElement &el)
+    {
+        static QMap<QString, Origin> sendersMap({ { QStringLiteral("initiator"), Origin::Initiator },
+                                                  { QStringLiteral("none"), Origin::Both },
+                                                  { QStringLiteral("responder"), Origin::Responder } });
+        creator     = creatorAttr(el);
+        name        = el.attribute(QLatin1String("name"));
+        senders     = sendersMap.value(el.attribute(QLatin1String("senders")));
+        disposition = el.attribute(QLatin1String("disposition")); // if empty, it's "session"
     }
-    return true;
-}
-
-//----------------------------------------------------------------------------
-// Application
-//----------------------------------------------------------------------------
-ApplicationManager::ApplicationManager(QObject *parent) :
-    QObject(parent)
-{
-}
-
-//----------------------------------------------------------------------------
-// TransportManager
-//----------------------------------------------------------------------------
-TransportManager::TransportManager(QObject *parent) :
-    QObject(parent)
-{
-
-}
-
-//----------------------------------------------------------------------------
-// JTPush - Jingle Task
-//----------------------------------------------------------------------------
-class JTPush : public Task
-{
-    Q_OBJECT
-
-    QList<QString> externalManagers;
-    QList<QString> externalSessions;
-public:
-    JTPush(Task *parent) :
-        Task(parent)
+
+    QDomElement ContentBase::toXml(QDomDocument *doc, const char *tagName) const
     {
+        if (!isValid()) {
+            return QDomElement();
+        }
+        auto el = doc->createElement(QLatin1String(tagName));
+        setCreatorAttr(el, creator);
+        el.setAttribute(QLatin1String("name"), name);
 
-    }
+        QString sendersStr;
+        switch (senders) {
+        case Origin::None:
+            sendersStr = QLatin1String("none");
+            break;
+
+        case Origin::Initiator:
+            sendersStr = QLatin1String("initiator");
+            break;
+
+        case Origin::Responder:
+            sendersStr = QLatin1String("responder");
+            break;
+
+        case Origin::Both:
+        default:
+            break;
+        }
 
-    ~JTPush(){}
+        if (!disposition.isEmpty() && disposition != QLatin1String("session")) {
+            el.setAttribute(QLatin1String("disposition"),
+                            disposition); // NOTE review how we can parse it some generic way
+        }
+        if (!sendersStr.isEmpty()) {
+            el.setAttribute(QLatin1String("senders"), sendersStr);
+        }
 
-    inline void addExternalManager(const QString &ns) { externalManagers.append(ns); }
-    inline void forgetExternalSession(const QString &sid) { externalSessions.removeOne(sid); }
-    inline void registerExternalSession(const QString &sid) { externalSessions.append(sid); }
+        return el;
+    }
 
-    bool take(const QDomElement &iq)
+    Origin ContentBase::creatorAttr(const QDomElement &el)
     {
-        if (iq.tagName() != QLatin1String("iq") || iq.attribute(QLatin1String("type")) != QLatin1String("set")) {
-            return false;
+        auto creatorStr = el.attribute(QLatin1String("creator"));
+        if (creatorStr == QLatin1String("initiator")) {
+            return Origin::Initiator;
         }
-        auto jingleEl = iq.firstChildElement(QStringLiteral("jingle"));
-        if (jingleEl.isNull() || jingleEl.namespaceURI() != ::XMPP::Jingle::NS) {
-            return false;
+        if (creatorStr == QLatin1String("responder")) {
+            return Origin::Responder;
         }
+        return Origin::None;
+    }
 
-        Jingle jingle(jingleEl);
-        if (!jingle.isValid()) {
-            respondError(iq, Stanza::Error::Cancel, Stanza::Error::BadRequest);
-            return true;
+    bool ContentBase::setCreatorAttr(QDomElement &el, Origin creator)
+    {
+        if (creator == Origin::Initiator) {
+            el.setAttribute(QLatin1String("creator"), QLatin1String("initiator"));
+        } else if (creator == Origin::Responder) {
+            el.setAttribute(QLatin1String("creator"), QLatin1String("responder"));
+        } else {
+            return false;
         }
+        return true;
+    }
+
+    //----------------------------------------------------------------------------
+    // Application
+    //----------------------------------------------------------------------------
+    ApplicationManager::ApplicationManager(QObject *parent) : QObject(parent) {}
+
+    //----------------------------------------------------------------------------
+    // TransportManager
+    //----------------------------------------------------------------------------
+    TransportManager::TransportManager(QObject *parent) : QObject(parent) {}
+
+    //----------------------------------------------------------------------------
+    // JTPush - Jingle Task
+    //----------------------------------------------------------------------------
+    class JTPush : public Task {
+        Q_OBJECT
+
+        QList<QString> externalManagers;
+        QList<QString> externalSessions;
+
+    public:
+        JTPush(Task *parent) : Task(parent) {}
+
+        ~JTPush() {}
+
+        inline void addExternalManager(const QString &ns) { externalManagers.append(ns); }
+        inline void forgetExternalSession(const QString &sid) { externalSessions.removeOne(sid); }
+        inline void registerExternalSession(const QString &sid) { externalSessions.append(sid); }
+
+        bool take(const QDomElement &iq)
+        {
+            if (iq.tagName() != QLatin1String("iq") || iq.attribute(QLatin1String("type")) != QLatin1String("set")) {
+                return false;
+            }
+            auto jingleEl = iq.firstChildElement(QStringLiteral("jingle"));
+            if (jingleEl.isNull() || jingleEl.namespaceURI() != ::XMPP::Jingle::NS) {
+                return false;
+            }
+
+            Jingle jingle(jingleEl);
+            if (!jingle.isValid()) {
+                respondError(iq, Stanza::Error::Cancel, Stanza::Error::BadRequest);
+                return true;
+            }
+
+            if (externalManagers.size()) {
+                if (jingle.action() == Action::SessionInitiate) {
+                    auto cname = QString::fromLatin1("content");
+                    auto dname = QString::fromLatin1("description");
+                    for (auto n = jingleEl.firstChildElement(cname); !n.isNull(); n = n.nextSiblingElement(cname)) {
+                        auto del = n.firstChildElement(dname);
+                        if (!del.isNull() && externalManagers.contains(del.namespaceURI())) {
+                            externalSessions.append(jingle.sid());
+                            return false;
+                        }
+                    }
+                } else if (externalSessions.contains(jingle.sid())) {
+                    if (jingle.action() == Action::SessionTerminate) {
+                        externalSessions.removeOne(jingle.sid());
+                    }
+                    return false;
+                }
+            }
 
-        if (externalManagers.size()) {
+            QString fromStr(iq.attribute(QStringLiteral("from")));
+            Jid     from(fromStr);
             if (jingle.action() == Action::SessionInitiate) {
-                auto cname = QString::fromLatin1("content");
-                auto dname = QString::fromLatin1("description");
-                for (auto n = jingleEl.firstChildElement(cname); !n.isNull(); n = n.nextSiblingElement(cname)) {
-                    auto del = n.firstChildElement(dname);
-                    if (!del.isNull() && externalManagers.contains(del.namespaceURI())) {
-                        externalSessions.append(jingle.sid());
-                        return false;
+                if (!client()->jingleManager()->isAllowedParty(from)
+                    || (!jingle.initiator().isEmpty()
+                        && !client()->jingleManager()->isAllowedParty(jingle.initiator()))) {
+                    respondError(iq, Stanza::Error::Cancel, Stanza::Error::ServiceUnavailable);
+                    return true;
+                }
+
+                Jid redirection(client()->jingleManager()->redirectionJid());
+                if (redirection.isValid()) {
+                    respondError(iq, Stanza::Error::Modify, Stanza::Error::Redirect,
+                                 QStringLiteral("xmpp:") + redirection.full());
+                    return true;
+                }
+
+                auto session = client()->jingleManager()->session(from, jingle.sid());
+                if (session) {
+                    if (session->role() == Origin::Initiator) { //
+                        respondTieBreak(iq);
+                    } else {
+                        // second session from this peer with the same sid.
+                        respondError(iq, Stanza::Error::Cancel, Stanza::Error::BadRequest);
                     }
+                    return true;
                 }
-            } else if (externalSessions.contains(jingle.sid())) {
-                if (jingle.action() == Action::SessionTerminate) {
-                    externalSessions.removeOne(jingle.sid());
+                session = client()->jingleManager()->incomingSessionInitiate(from, jingle, jingleEl);
+                if (!session) {
+                    respondError(iq, client()->jingleManager()->lastError());
+                    return true;
+                }
+            } else {
+                auto session = client()->jingleManager()->session(from, jingle.sid());
+                if (!session) {
+                    if (jingle.action() == Action::SessionTerminate) {
+                        auto resp = createIQ(client()->doc(), "result", fromStr, iq.attribute(QStringLiteral("id")));
+                        client()->send(resp);
+                    } else {
+                        auto el = client()->doc()->createElementNS(ERROR_NS, QStringLiteral("unknown-session"));
+                        respondError(iq, Stanza::Error::Cancel, Stanza::Error::ItemNotFound, QString(), el);
+                    }
+                    return true;
+                }
+                if (!session->updateFromXml(jingle.action(), jingleEl)) {
+                    respondError(iq, session->lastError());
+                    return true;
                 }
-                return false;
             }
+
+            auto resp = createIQ(client()->doc(), "result", fromStr, iq.attribute(QStringLiteral("id")));
+            client()->send(resp);
+            return true;
         }
 
-        QString fromStr(iq.attribute(QStringLiteral("from")));
-        Jid from(fromStr);
-        if (jingle.action() == Action::SessionInitiate) {
-            if (!client()->jingleManager()->isAllowedParty(from) ||
-                    (!jingle.initiator().isEmpty() && !client()->jingleManager()->isAllowedParty(jingle.initiator()))) {
-                respondError(iq, Stanza::Error::Cancel, Stanza::Error::ServiceUnavailable);
-                return true;
+        void respondError(const QDomElement &iq, Stanza::Error::ErrorType errType, Stanza::Error::ErrorCond errCond,
+                          const QString &text = QString(), const QDomElement &jingleErr = QDomElement())
+        {
+            auto          resp = createIQ(client()->doc(), "error", iq.attribute(QStringLiteral("from")),
+                                 iq.attribute(QStringLiteral("id")));
+            Stanza::Error error(errType, errCond, text);
+            auto          errEl = error.toXml(*client()->doc(), client()->stream().baseNS());
+            if (!jingleErr.isNull()) {
+                errEl.appendChild(jingleErr);
             }
+            resp.appendChild(errEl);
+            client()->send(resp);
+        }
 
-            Jid redirection(client()->jingleManager()->redirectionJid());
-            if (redirection.isValid()) {
-                respondError(iq, Stanza::Error::Modify, Stanza::Error::Redirect, QStringLiteral("xmpp:")+redirection.full());
-                return true;
+        void respondTieBreak(const QDomElement &iq)
+        {
+            Stanza::Error error(Stanza::Error::Cancel, Stanza::Error::Conflict);
+            ErrorUtil::fill(*client()->doc(), error, ErrorUtil::TieBreak);
+            respondError(iq, error);
+        }
+
+        void respondError(const QDomElement &iq, const Stanza::Error &error)
+        {
+            auto resp = createIQ(client()->doc(), "error", iq.attribute(QStringLiteral("from")),
+                                 iq.attribute(QStringLiteral("id")));
+            resp.appendChild(error.toXml(*client()->doc(), client()->stream().baseNS()));
+            client()->send(resp);
+        }
+    };
+
+    //----------------------------------------------------------------------------
+    // JT - Jingle Task
+    //----------------------------------------------------------------------------
+    class JT : public Task {
+        Q_OBJECT
+
+        QDomElement iq_;
+        Jid         to_;
+
+    public:
+        JT(Task *parent) : Task(parent) {}
+
+        ~JT() {}
+
+        void request(const Jid &to, const QDomElement &jingleEl)
+        {
+            to_ = to;
+            iq_ = createIQ(doc(), "set", to.full(), id());
+            iq_.appendChild(jingleEl);
+        }
+
+        void onGo() { send(iq_); }
+
+        bool take(const QDomElement &x)
+        {
+            if (!iqVerify(x, to_, id()))
+                return false;
+
+            if (x.attribute("type") == "error") {
+                setError(x);
+            } else {
+                setSuccess();
             }
+            return true;
+        }
+    };
 
-            auto session = client()->jingleManager()->session(from, jingle.sid());
-            if (session) {
-                if (session->role() == Origin::Initiator) { //
-                    respondTieBreak(iq);
-                } else {
-                    // second session from this peer with the same sid.
-                    respondError(iq, Stanza::Error::Cancel, Stanza::Error::BadRequest);
+    //----------------------------------------------------------------------------
+    // Session
+    //----------------------------------------------------------------------------
+    class Session::Private {
+    public:
+        Session *q;
+        Manager *manager;
+        QTimer   stepTimer;
+        State    state = State::Created; // state of session on our side. if it's incoming we start from Created anyaway
+                                         // but Pending state is skipped
+        Origin                                             role = Origin::Initiator; // my role in the session
+        XMPP::Stanza::Error                                lastError;
+        Reason                                             terminateReason;
+        QMap<QString, QWeakPointer<ApplicationManagerPad>> applicationPads;
+        QMap<QString, QWeakPointer<TransportManagerPad>>   transportPads;
+        // QMap<QString,Application*> myContent;     // content::creator=(role ==
+        // Session::Role::Initiator?initiator:responder) QMap<QString,Application*> remoteContent; //
+        // content::creator=(role == Session::Role::Responder?initiator:responder)
+        QMap<ContentKey, Application *> contentList;
+        QSet<Application *>             signalingContent;
+        QHash<Action, OutgoingUpdate>
+                outgoingUpdates; // session level updates. session-info for example or some rejected apps
+        QString sid;
+        Jid     origFrom;   // "from" attr of IQ.
+        Jid     otherParty; // either "from" or initiator/responder. it's where to send all requests.
+        Jid     localParty; // that one will be set as initiator/responder if provided
+        bool    waitingAck = false;
+
+        void setSessionFinished()
+        {
+            state = State::Finished;
+            emit q->terminated();
+            signalingContent.clear();
+            for (auto &c : contentList) {
+                if (c->state() != State::Finished) {
+                    c->setState(State::Finished);
                 }
-                return true;
             }
-            session = client()->jingleManager()->incomingSessionInitiate(from, jingle, jingleEl);
-            if (!session) {
-                respondError(iq, client()->jingleManager()->lastError());
-                return true;
+            auto vals = contentList.values();
+            contentList.clear();
+            while (vals.size()) {
+                vals.takeLast()->deleteLater();
             }
-        } else {
-            auto session = client()->jingleManager()->session(from, jingle.sid());
-            if (!session) {
-                if (jingle.action() == Action::SessionTerminate) {
-                    auto resp = createIQ(client()->doc(), "result", fromStr, iq.attribute(QStringLiteral("id")));
-                    client()->send(resp);
+            q->deleteLater();
+        }
+
+        void sendJingle(Action action, QList<QDomElement> update,
+                        std::function<void()> successCB = std::function<void()>())
+        {
+            QDomDocument &doc = *manager->client()->doc();
+            Jingle        jingle(action, sid);
+            if (action == Action::SessionInitiate) {
+                jingle.setInitiator(manager->client()->jid());
+            }
+            if (action == Action::SessionAccept) {
+                jingle.setResponder(manager->client()->jid());
+            }
+            auto xml = jingle.toXml(&doc);
+
+            for (const QDomElement &e : update) {
+                xml.appendChild(e);
+            }
+
+            auto jt = new JT(manager->client()->rootTask());
+            jt->request(otherParty, xml);
+            QObject::connect(jt, &JT::finished, q, [jt, jingle, successCB, this]() {
+                waitingAck = false;
+                if (jt->success()) {
+                    if (successCB) {
+                        successCB();
+                    } else {
+                        planStep();
+                    }
                 } else {
-                    auto el = client()->doc()->createElementNS(ERROR_NS, QStringLiteral("unknown-session"));
-                    respondError(iq, Stanza::Error::Cancel, Stanza::Error::ItemNotFound, QString(), el);
+                    lastError = jt->error();
+                    if (ErrorUtil::jingleCondition(lastError) != ErrorUtil::TieBreak)
+                        setSessionFinished();
+                    else
+                        planStep();
                 }
-                return true;
+            });
+            waitingAck = true;
+            jt->go(true);
+        }
+
+        void planStep()
+        {
+            if (waitingAck) {
+                return;
             }
-            if (!session->updateFromXml(jingle.action(), jingleEl)) {
-                respondError(iq, session->lastError());
-                return true;
+            lastError = Stanza::Error(0, 0);
+            if (!stepTimer.isActive()) {
+                stepTimer.start();
             }
         }
 
-        auto resp = createIQ(client()->doc(), "result", fromStr, iq.attribute(QStringLiteral("id")));
-        client()->send(resp);
-        return true;
-    }
+        void doStep()
+        {
+            if (waitingAck) { // we will return here when ack is received. Session::Unacked is possible also only with
+                              // waitingAck
+                return;
+            }
+            if (terminateReason.condition() && state != State::Finished) {
+                if (state != State::Created || role == Origin::Responder) {
+                    sendJingle(Action::SessionTerminate,
+                               QList<QDomElement>() << terminateReason.toXml(manager->client()->doc()));
+                }
+                setSessionFinished();
+                return;
+            }
+            if (state == State::Created || state == State::Finished) {
+                return; // we will start doing something when initiate() is called
+            }
 
-    void respondError(const QDomElement &iq, Stanza::Error::ErrorType errType, Stanza::Error::ErrorCond errCond,
-                      const QString &text = QString(), const QDomElement &jingleErr = QDomElement())
-    {
-        auto resp = createIQ(client()->doc(), "error", iq.attribute(QStringLiteral("from")), iq.attribute(QStringLiteral("id")));
-        Stanza::Error error(errType, errCond, text);
-        auto errEl = error.toXml(*client()->doc(), client()->stream().baseNS());
-        if (!jingleErr.isNull()) {
-            errEl.appendChild(jingleErr);
-        }
-        resp.appendChild(errEl);
-        client()->send(resp);
-    }
+            if (outgoingUpdates.size()) {
+                auto it       = outgoingUpdates.begin();
+                auto action   = it.key();
+                auto updates  = it.value();
+                auto elements = std::get<0>(updates);
+                auto cb       = std::get<1>(updates);
+                outgoingUpdates.erase(it);
+                sendJingle(action, elements, [this, cb]() {
+                    if (cb) {
+                        cb();
+                    }
+                    planStep();
+                });
+                return;
+            }
 
-    void respondTieBreak(const QDomElement &iq)
-    {
-        Stanza::Error error(Stanza::Error::Cancel, Stanza::Error::Conflict);
-        ErrorUtil::fill(*client()->doc(), error, ErrorUtil::TieBreak);
-        respondError(iq, error);
-    }
+            typedef std::tuple<QPointer<Application>, OutgoingUpdateCB> AckHndl; // will be used from callback on iq ack
+            if (state == State::PrepareLocalOffer) { // we are going to send session-initiate/accept (already accepted
+                                                     // by the user but not sent yet)
+                /*
+                 * For session-initiate everything is prety much straightforward, just any content with
+                 * Action::ContentAdd update type has to be added. But with session-accept things are more complicated
+                 *   1. Local client could add its content. So we have to check content origin too.
+                 *   2. Remote client could add more content before local session-accept. Then we have two options
+                 *         a) send content-accept and skip this content in session-accept later
+                 *         b) don't send content-accept and accept everything with session-accept
+                 *      We prefer option (b) in our implementation.
+                 */
+                Action expectedContentAction = role == Origin::Initiator ? Action::ContentAdd : Action::ContentAccept;
+                for (const auto &c : contentList) {
+                    auto out = c->evaluateOutgoingUpdate();
+                    if (out == Action::ContentReject) { // yeah we are rejecting local content. invalid?
+                        lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
+                        setSessionFinished();
+                        return;
+                    }
+                    if (out != expectedContentAction) {
+                        return; // keep waiting.
+                    }
+                }
+                Action actionToSend = Action::SessionAccept;
+                State  finalState   = State::Active;
+                // so all contents is ready for session-initiate. let's do it
+                if (role == Origin::Initiator) {
+                    sid          = manager->registerSession(q);
+                    actionToSend = Action::SessionInitiate;
+                    finalState   = State::Pending;
+                }
 
-    void respondError(const QDomElement &iq, const Stanza::Error &error)
-    {
-        auto resp = createIQ(client()->doc(), "error", iq.attribute(QStringLiteral("from")), iq.attribute(QStringLiteral("id")));
-        resp.appendChild(error.toXml(*client()->doc(), client()->stream().baseNS()));
-        client()->send(resp);
-    }
-};
+                QList<QDomElement> contents;
+                QList<AckHndl>     acceptApps;
+                for (const auto &p : contentList) {
+                    QList<QDomElement> xml;
+                    OutgoingUpdateCB   callback;
+                    std::tie(xml, callback) = p->takeOutgoingUpdate();
+                    contents += xml;
+                    // p->setState(State::Unacked);
+                    if (callback) {
+                        acceptApps.append(AckHndl { p, callback });
+                    }
+                }
+                state = State::Unacked;
+                sendJingle(actionToSend, contents, [this, acceptApps, finalState]() {
+                    state = finalState;
+                    for (const auto &h : acceptApps) {
+                        auto app      = std::get<0>(h);
+                        auto callback = std::get<1>(h);
+                        if (app) {
+                            callback();
+                            if (role == Origin::Responder) {
+                                app->start();
+                            }
+                        }
+                    }
+                    if (finalState == State::Active) {
+                        emit q->activated();
+                    }
+                    planStep();
+                });
 
-//----------------------------------------------------------------------------
-// JT - Jingle Task
-//----------------------------------------------------------------------------
-class JT : public Task
-{
-    Q_OBJECT
+                return;
+            }
 
-    QDomElement iq_;
-    Jid to_;
+            // So session is either in State::Pending or State::Active here.
+            // State::Connecting status is skipped for session.
+            QList<QDomElement> updateXml;
+            for (auto mp : applicationPads) {
+                auto        p  = mp.toStrongRef();
+                QDomElement el = p->takeOutgoingSessionInfoUpdate();
+                if (!el.isNull()) {
+                    updateXml.append(el);
+                    // we can send session-info for just one application. so stop processing
+                    sendJingle(Action::SessionInfo, updateXml, [this]() { planStep(); });
+                    return;
+                }
+            }
 
-public:
-    JT(Task *parent) :
-        Task(parent)
-    {
+            QMultiMap<Action, Application *> updates;
 
-    }
+            for (auto app : signalingContent) {
+                Action updateType = app->evaluateOutgoingUpdate();
+                if (updateType != Action::NoAction) {
+                    updates.insert(updateType, app);
+                }
+            }
 
-    ~JT(){}
+            QList<AckHndl> acceptApps;
+            if (updates.size()) {
+                Action action = updates.begin().key(); // NOTE maybe some actions have more priority than another
+                auto   apps   = updates.values(action);
+                for (auto app : apps) {
+                    QList<QDomElement> xml;
+                    OutgoingUpdateCB   callback;
+                    std::tie(xml, callback) = app->takeOutgoingUpdate();
+                    updateXml += xml;
+                    if (callback) {
+                        acceptApps.append(AckHndl { app, callback });
+                    }
+                }
+                sendJingle(action, updateXml, [this, acceptApps]() {
+                    for (const auto &h : acceptApps) {
+                        auto app      = std::get<0>(h);
+                        auto callback = std::get<1>(h);
+                        if (app) {
+                            callback();
+                        }
+                    }
+                    planStep();
+                });
+            }
+        }
 
-    void request(const Jid &to, const QDomElement &jingleEl)
-    {
-        to_ = to;
-        iq_ = createIQ(doc(), "set", to.full(), id());
-        iq_.appendChild(jingleEl);
-    }
+        Reason reason(const QDomElement &jingleEl)
+        {
+            QDomElement re = jingleEl.firstChildElement(QLatin1String("reason"));
+            Reason      reason;
+            if (!re.isNull()) {
+                reason = Reason(re);
+                if (!reason.isValid()) {
+                    qDebug("invalid reason");
+                }
+            }
+            return reason;
+        }
 
-    void onGo()
-    {
-        send(iq_);
-    }
+        void addAndInitContent(Origin creator, Application *content)
+        {
+            contentList.insert(ContentKey { content->contentName(), creator }, content);
+            if (state != State::Created && content->evaluateOutgoingUpdate() != Action::NoAction) {
+                signalingContent.insert(content);
+            }
+            QObject::connect(content, &Application::updated, q, [this, content]() {
+                signalingContent.insert(content);
+                planStep();
+            });
+            QObject::connect(content, &Application::destroyed, q, [this, content]() {
+                signalingContent.remove(content);
+                for (auto it = contentList.begin(); it != contentList.end(); ++it) { // optimize for large lists?
+                    if (it.value() == content) {
+                        contentList.erase(it);
+                        break;
+                    }
+                }
+            });
+        }
 
-    bool take(const QDomElement &x)
-    {
-        if(!iqVerify(x, to_, id()))
-            return false;
+        enum AddContentError { Ok, Unparsed, Unexpected, Unsupported };
 
-        if(x.attribute("type") == "error") {
-            setError(x);
-        } else {
-            setSuccess();
-        }
-        return true;
-    }
-};
-
-//----------------------------------------------------------------------------
-// Session
-//----------------------------------------------------------------------------
-class Session::Private
-{
-public:
-    Session *q;
-    Manager *manager;
-    QTimer stepTimer;
-    State state = State::Created; // state of session on our side. if it's incoming we start from Created anyaway but Pending state is skipped
-    Origin  role  = Origin::Initiator; // my role in the session
-    XMPP::Stanza::Error lastError;
-    Reason terminateReason;
-    QMap<QString,QWeakPointer<ApplicationManagerPad>> applicationPads;
-    QMap<QString,QWeakPointer<TransportManagerPad>> transportPads;
-    //QMap<QString,Application*> myContent;     // content::creator=(role == Session::Role::Initiator?initiator:responder)
-    //QMap<QString,Application*> remoteContent; // content::creator=(role == Session::Role::Responder?initiator:responder)
-    QMap<ContentKey,Application*> contentList;
-    QSet<Application*> signalingContent;
-    QHash<Action,OutgoingUpdate> outgoingUpdates; // session level updates. session-info for example or some rejected apps
-    QString sid;
-    Jid origFrom; // "from" attr of IQ.
-    Jid otherParty; // either "from" or initiator/responder. it's where to send all requests.
-    Jid localParty; // that one will be set as initiator/responder if provided
-    bool waitingAck = false;
-
-    void setSessionFinished()
-    {
-        state = State::Finished;
-        emit q->terminated();
-        signalingContent.clear();
-        for (auto &c: contentList) {
-            if (c->state() != State::Finished) {
-                c->setState(State::Finished);
+        std::tuple<AddContentError, Reason::Condition, Application *> parseContentAdd(const QDomElement &ce)
+        {
+            QDomElement descriptionEl = ce.firstChildElement(QLatin1String("description"));
+            QDomElement transportEl   = ce.firstChildElement(QLatin1String("transport"));
+            QString     descriptionNS = descriptionEl.namespaceURI();
+            QString     transportNS   = transportEl.namespaceURI();
+            typedef std::tuple<AddContentError, Reason::Condition, Application *> result;
+
+            ContentBase c(ce);
+            if (!c.isValid() || descriptionEl.isNull() || transportEl.isNull() || descriptionNS.isEmpty()
+                || transportNS.isEmpty()) {
+                return result { Unparsed, Reason::Success, nullptr };
             }
-        }
-        auto vals = contentList.values();
-        contentList.clear();
-        while (vals.size()) {
-            vals.takeLast()->deleteLater();
-        }
-        q->deleteLater();
-    }
 
-    void sendJingle(Action action, QList<QDomElement> update, std::function<void()> successCB = std::function<void()>())
-    {
-        QDomDocument &doc = *manager->client()->doc();
-        Jingle jingle(action, sid);
-        if (action == Action::SessionInitiate) {
-            jingle.setInitiator(manager->client()->jid());
-        }
-        if (action == Action::SessionAccept) {
-            jingle.setResponder(manager->client()->jid());
-        }
-        auto xml = jingle.toXml(&doc);
+            auto appPad = q->applicationPadFactory(descriptionNS);
+            if (!appPad) {
+                return result { Unsupported, Reason::UnsupportedApplications,
+                                nullptr }; // <unsupported-applications/> condition
+            }
+            QScopedPointer<Application> app(appPad->manager()->startApplication(appPad, c.name, c.creator, c.senders));
+            auto                        descErr = app->setDescription(descriptionEl);
+            if (descErr == Application::IncompatibleParameters) {
+                return result { Unsupported, Reason::IncompatibleParameters, nullptr };
+            } else if (descErr == Application::Unparsed) {
+                return result { Unparsed, Reason::Success, nullptr };
+            } else {
+                // same for transport
+                auto trPad = q->transportPadFactory(transportNS);
+                if (!trPad) {
+                    return result {
+                        Unsupported, Reason::UnsupportedTransports, app.take()
+                    }; // <unsupported-transports/> condition or we can try fallback and fail with <failed-transport/>
+                }
+                auto transport = trPad->manager()->newTransport(trPad, transportEl);
+                if (transport) {
+                    if (app->setTransport(transport)) {
+                        return result { Ok, Reason::Success, app.take() };
+                    }
+                    return result { Unsupported, Reason::UnsupportedTransports, app.take() };
+                }
+            }
 
-        for (const QDomElement &e: update) {
-            xml.appendChild(e);
+            return result { Unparsed, Reason::Success, nullptr };
         }
 
-        auto jt = new JT(manager->client()->rootTask());
-        jt->request(otherParty, xml);
-        QObject::connect(jt, &JT::finished, q, [jt, jingle, successCB, this](){
-            waitingAck = false;
-            if (jt->success()) {
-                if (successCB) {
-                    successCB();
-                } else {
-                    planStep();
+        typedef std::tuple<AddContentError, Reason::Condition, QList<Application *>, QList<QDomElement>>
+            ParseContentListResult;
+
+        ParseContentListResult parseContentAddList(const QDomElement &jingleEl)
+        {
+            QMap<QString, Application *>                             addSet;
+            QMap<QString, std::pair<QDomElement, Reason::Condition>> rejectSet;
+
+            QString contentTag(QStringLiteral("content"));
+            for (QDomElement ce = jingleEl.firstChildElement(contentTag); !ce.isNull();
+                 ce             = ce.nextSiblingElement(contentTag)) {
+
+                Private::AddContentError err;
+                Reason::Condition        cond;
+                Application *            app;
+
+                std::tie(err, cond, app) = parseContentAdd(ce);
+                if (err == Private::AddContentError::Unparsed) {
+                    lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
+                    qDeleteAll(addSet);
+                    return ParseContentListResult(Unparsed, cond, QList<Application *>(), QList<QDomElement>());
+                }
+
+                auto contentName = app->contentName();
+                auto it          = addSet.find(contentName);
+                if (err != Private::AddContentError::Ok) {
+                    // can't continue as well
+                    if (app) { // we are going to reject it completely so delete
+                        delete app;
+                    }
+
+                    if (it == addSet.end()) {
+                        rejectSet.insert(contentName, std::make_pair(ce, cond));
+                    }
+                    continue;
+                }
+
+                rejectSet.remove(contentName);
+                if (it == addSet.end()
+                    || (*it)->wantBetterTransport(
+                        app->transport())) { // probably not wantBetterTransport but wantBetterApplication
+                    if (it == addSet.end()) {
+                        addSet.insert(contentName, app);
+                    } else {
+                        delete *it; // unpreferred app
+                        *it = app;
+                    }
                 }
-            } else {
-                lastError = jt->error();
-                if (ErrorUtil::jingleCondition(lastError) != ErrorUtil::TieBreak)
-                    setSessionFinished();
-                else
-                    planStep();
             }
-        });
-        waitingAck = true;
-        jt->go(true);
-    }
 
-    void planStep() {
-        if (waitingAck) {
-            return;
-        }
-        lastError = Stanza::Error(0, 0);
-        if (!stepTimer.isActive()) {
-            stepTimer.start();
-        }
-    }
+            if (rejectSet.size()) {
+                QList<QDomElement> rejectList;
+                for (auto const &i : rejectSet) {
+                    rejectList.append(i.first);
+                }
+                return ParseContentListResult(Unsupported, rejectSet.first().second, addSet.values(), rejectList);
+            }
 
-    void doStep() {
-        if (waitingAck) { // we will return here when ack is received. Session::Unacked is possible also only with waitingAck
-            return;
+            return ParseContentListResult(Ok, Reason::Success, addSet.values(), QList<QDomElement>());
         }
-        if (terminateReason.condition() && state != State::Finished) {
-            if (state != State::Created || role == Origin::Responder) {
-                sendJingle(Action::SessionTerminate, QList<QDomElement>() << terminateReason.toXml(manager->client()->doc()));
+
+        std::tuple<AddContentError, Reason::Condition, Application *> parseContentAccept(const QDomElement &ce)
+        {
+            QDomElement descriptionEl = ce.firstChildElement(QLatin1String("description"));
+            QDomElement transportEl   = ce.firstChildElement(QLatin1String("transport"));
+            QString     descriptionNS = descriptionEl.namespaceURI();
+            QString     transportNS   = transportEl.namespaceURI();
+            typedef std::tuple<AddContentError, Reason::Condition, Application *> result;
+
+            ContentBase c(ce);
+            if (!c.isValid() || role != c.creator || descriptionEl.isNull() || transportEl.isNull()
+                || descriptionNS.isEmpty() || transportNS.isEmpty()) {
+                return result { Unparsed, Reason::NoReason, nullptr };
             }
-            setSessionFinished();
-            return;
+
+            auto app = q->content(c.name, role);
+            if (!(app && app->state() == State::Pending)) { // reaccept is possible
+                return result { AddContentError::Unexpected, Reason::NoReason, app };
+            }
+
+            if (app->pad()->ns() != descriptionNS || app->transport()->pad()->ns() != transportNS) {
+                // well it's more than unexpected. let's send unparsed
+                return result { AddContentError::Unparsed, Reason::NoReason, app };
+            }
+
+            if (!app->transport()->update(transportEl) || !app->accept(descriptionEl)) {
+                // clearly unparsed. otherwise the app will generate failure event with a Reason.
+                return result { AddContentError::Unparsed, Reason::NoReason, app };
+            }
+
+            if (app->state() != State::Accepted) { // parsed but was not accepted. so it's somehow incompatible
+                return result { AddContentError::Unsupported, Reason::IncompatibleParameters, app };
+            }
+
+            return result { AddContentError::Ok, Reason::Success, app };
         }
-        if (state == State::Created || state == State::Finished) {
-            return; // we will start doing something when initiate() is called
+
+        std::tuple<bool, QList<Application *>> parseContentAcceptList(const QDomElement &jingleEl)
+        {
+            QMap<QString, Application *>                             acceptSet;
+            QMap<QString, std::pair<QDomElement, Reason::Condition>> rejectSet;
+
+            QString contentTag(QStringLiteral("content"));
+            for (QDomElement ce = jingleEl.firstChildElement(contentTag); !ce.isNull();
+                 ce             = ce.nextSiblingElement(contentTag)) {
+
+                Private::AddContentError err;
+                Reason::Condition        cond;
+                Application *            app;
+
+                std::tie(err, cond, app) = parseContentAccept(ce);
+                if (err == Private::AddContentError::Unparsed || err == Private::AddContentError::Unexpected) {
+                    for (auto &a : acceptSet) {
+                        a->setState(State::Pending); // reset state to pending for already passed validation before
+                                                     // passing error back
+                    }
+                    lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel,
+                                                    err == Private::AddContentError::Unexpected
+                                                        ? XMPP::Stanza::Error::UnexpectedRequest
+                                                        : XMPP::Stanza::Error::BadRequest);
+                    if (err == Private::AddContentError::Unexpected) {
+                        ErrorUtil::fill(jingleEl.ownerDocument(), lastError, ErrorUtil::OutOfOrder);
+                    }
+                    return std::tuple<bool, QList<Application *>>(false, QList<Application *>());
+                }
+
+                auto contentName = app->contentName();
+                auto it          = acceptSet.find(contentName);
+                auto rit         = rejectSet.find(contentName);
+                if (it != acceptSet.end() || rit != rejectSet.end()) {
+                    // duplicates are not allowed in accept request
+                    for (auto &a : acceptSet) {
+                        a->setState(State::Pending); // reset state to pending for already passed validation before
+                                                     // passing error back
+                    }
+                    lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
+                    return std::tuple<bool, QList<Application *>>(false, QList<Application *>());
+                }
+
+                if (err != Private::AddContentError::Ok) {
+                    app->setState(State::Finished); // we can't keep working with this content for whatever reason. if
+                                                    // "accept" failed there is no fallback
+                    rejectSet.insert(
+                        contentName,
+                        std::make_pair(ce,
+                                       cond)); // NOTE, probably instead of ce we have to generate original description
+                    continue;
+                }
+                acceptSet.insert(contentName, app);
+            }
+
+            if (rejectSet.size()) {
+                QTimer::singleShot(0, q, [this, rejectSet]() mutable {
+                    auto               cond = rejectSet.first().second;
+                    QList<QDomElement> rejects;
+                    for (auto const &i : rejectSet) {
+                        rejects.append(i.first);
+                    }
+                    rejects += Reason(cond).toXml(manager->client()->doc());
+                    outgoingUpdates.insert(Action::ContentRemove,
+                                           OutgoingUpdate { rejects, [this, rejects]() {
+                                                               for (auto &r : rejects) {
+                                                                   ContentBase c(r);
+                                                                   delete contentList.take(ContentKey { c.name, role });
+                                                               }
+                                                               if (contentList.isEmpty()) {
+                                                                   // the other party has to generate session-terminate
+                                                                   // but we do not care already
+                                                                   setSessionFinished();
+                                                               }
+                                                           } });
+                });
+            }
+            return std::tuple<bool, QList<Application *>>(true, acceptSet.values());
         }
 
-        if (outgoingUpdates.size()) {
-            auto it = outgoingUpdates.begin();
-            auto action = it.key();
-            auto updates = it.value();
-            auto elements = std::get<0>(updates);
-            auto cb = std::get<1>(updates);
-            outgoingUpdates.erase(it);
-            sendJingle(action, elements, [this, cb](){
-                if (cb) {
-                    cb();
+        bool handleIncomingContentAdd(const QDomElement &jingleEl)
+        {
+            Private::AddContentError err;
+            Reason::Condition        cond;
+            QList<Application *>     apps;
+            QList<QDomElement>       rejects;
+
+            std::tie(err, cond, apps, rejects) = parseContentAddList(jingleEl);
+            switch (err) {
+            case Private::AddContentError::Unparsed:
+            case Private::AddContentError::Unexpected:
+                lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
+                if (err == Private::AddContentError::Unexpected) {
+                    ErrorUtil::fill(jingleEl.ownerDocument(), lastError, ErrorUtil::OutOfOrder);
                 }
-                planStep();
-            });
-            return;
+                return false;
+            case Private::AddContentError::Unsupported:
+                rejects += Reason(cond).toXml(manager->client()->doc());
+                outgoingUpdates.insert(Action::ContentReject, OutgoingUpdate { rejects, OutgoingUpdateCB() });
+                break;
+            case Private::AddContentError::Ok:
+                break;
+            }
+
+            if (apps.size()) {
+                Origin remoteRole = negateOrigin(role);
+                for (auto app : apps) {
+                    addAndInitContent(remoteRole, app); // TODO check conflicts
+                }
+                QTimer::singleShot(0, q, [this]() { emit q->newContentReceived(); });
+            }
+            planStep();
+
+            return true;
         }
 
-        typedef std::tuple<QPointer<Application>,OutgoingUpdateCB> AckHndl; // will be used from callback on iq ack
-        if (state == State::PrepareLocalOffer) { // we are going to send session-initiate/accept (already accepted by the user but not sent yet)
-            /*
-             * For session-initiate everything is prety much straightforward, just any content with Action::ContentAdd
-             * update type has to be added. But with session-accept things are more complicated
-             *   1. Local client could add its content. So we have to check content origin too.
-             *   2. Remote client could add more content before local session-accept. Then we have two options
-             *         a) send content-accept and skip this content in session-accept later
-             *         b) don't send content-accept and accept everything with session-accept
-             *      We prefer option (b) in our implementation.
-             */
-            Action expectedContentAction = role == Origin::Initiator? Action::ContentAdd : Action::ContentAccept;
-            for (const auto &c: contentList) {
-                auto out = c->evaluateOutgoingUpdate();
-                if (out == Action::ContentReject) { // yeah we are rejecting local content. invalid?
+        bool handleIncomingContentRemove(const QDomElement &jingleEl)
+        {
+            QSet<Application *> toRemove;
+            QString             contentTag(QStringLiteral("content"));
+            for (QDomElement ce = jingleEl.firstChildElement(contentTag); !ce.isNull();
+                 ce             = ce.nextSiblingElement(contentTag)) {
+                ContentBase cb(ce);
+                if (!cb.isValid()) {
                     lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
-                    setSessionFinished();
-                    return;
+                    return false;
                 }
-                if (out != expectedContentAction) {
-                    return; // keep waiting.
+                Application *app = contentList.value(ContentKey { cb.name, cb.creator });
+                if (app) {
+                    toRemove.insert(app);
                 }
             }
-            Action actionToSend = Action::SessionAccept;
-            State finalState = State::Active;
-            // so all contents is ready for session-initiate. let's do it
-            if (role == Origin::Initiator) {
-                sid = manager->registerSession(q);
-                actionToSend = Action::SessionInitiate;
-                finalState = State::Pending;
+
+            for (auto app : toRemove) {
+                contentList.remove(ContentKey { app->contentName(), app->creator() });
+                delete app;
             }
 
-            QList<QDomElement> contents;
-            QList<AckHndl> acceptApps;
-            for (const auto &p: contentList) {
-                QList<QDomElement> xml;
-                OutgoingUpdateCB callback;
-                std::tie(xml, callback) = p->takeOutgoingUpdate();
-                contents += xml;
-                //p->setState(State::Unacked);
-                if (callback) {
-                    acceptApps.append(AckHndl{p, callback});
-                }
+            if (contentList.isEmpty()) {
+                auto reasonEl   = jingleEl.firstChildElement(QString::fromLatin1("reason"));
+                terminateReason = reasonEl.isNull() ? Reason(Reason::Success) : Reason(reasonEl);
             }
-            state = State::Unacked;
-            sendJingle(actionToSend, contents, [this, acceptApps, finalState](){
-                state = finalState;
-                for (const auto &h: acceptApps) {
-                    auto app = std::get<0>(h);
-                    auto callback = std::get<1>(h);
-                    if (app) {
-                        callback();
-                        if (role == Origin::Responder) {
-                            app->start();
-                        }
-                    }
+
+            planStep();
+            return true;
+        }
+
+        bool handleIncomingSessionTerminate(const QDomElement &jingleEl)
+        {
+            terminateReason = Reason(jingleEl.firstChildElement(QString::fromLatin1("reason")));
+            setSessionFinished();
+            return true;
+        }
+
+        bool handleIncomingSessionAccept(const QDomElement &jingleEl)
+        {
+            bool                 parsed;
+            QList<Application *> apps;
+
+            std::tie(parsed, apps) = parseContentAcceptList(jingleEl);
+            if (!parsed) {
+                lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
+                return false;
+            }
+
+            state = State::Connecting;
+            if (apps.size()) {
+                for (auto app : apps) {
+                    app->start();
                 }
-                if (finalState == State::Active) {
-                    emit q->activated();
+            }
+            QTimer::singleShot(0, q, [this]() { emit q->activated(); });
+            planStep();
+
+            return true;
+        }
+
+        bool handleIncomingContentAccept(const QDomElement &jingleEl)
+        {
+            bool                 parsed;
+            QList<Application *> apps;
+
+            std::tie(parsed, apps) = parseContentAcceptList(jingleEl); // marks valid apps as accepted
+            if (!parsed) {
+                lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
+                return false;
+            }
+
+            if (apps.size() && state >= State::Active) {
+                for (auto app : apps) {
+                    app->start(); // start accepted app. connection establishing and data transfer are inside
                 }
-                planStep();
-            });
+            }
+            planStep();
 
-            return;
+            return true;
         }
 
-        // So session is either in State::Pending or State::Active here.
-        // State::Connecting status is skipped for session.
-        QList<QDomElement> updateXml;
-        for (auto mp : applicationPads) {
-            auto p = mp.toStrongRef();
-            QDomElement el = p->takeOutgoingSessionInfoUpdate();
-            if (!el.isNull()) {
-                updateXml.append(el);
-                // we can send session-info for just one application. so stop processing
-                sendJingle(Action::SessionInfo, updateXml, [this](){planStep();});
-                return;
+        bool handleIncomingTransportReplace(const QDomElement &jingleEl)
+        {
+            QList<std::tuple<Application *, QSharedPointer<Transport>, QDomElement>> passed;
+            QList<QDomElement>                                                       toReject;
+            QString contentTag(QStringLiteral("content"));
+            for (QDomElement ce = jingleEl.firstChildElement(contentTag); !ce.isNull();
+                 ce             = ce.nextSiblingElement(contentTag)) {
+                ContentBase cb(ce);
+                auto        transportEl = ce.firstChildElement(QString::fromLatin1("transport"));
+                QString     transportNS = transportEl.namespaceURI();
+                if (!cb.isValid() || transportEl.isNull() || transportNS.isEmpty()) {
+                    lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
+                    return false;
+                }
+                Application *app = contentList.value(ContentKey { cb.name, cb.creator });
+                if (!app) {
+                    toReject.append(ce);
+                    continue;
+                }
+
+                auto trPad = q->transportPadFactory(transportNS);
+                if (!trPad) {
+                    toReject.append(ce);
+                    continue;
+                }
+
+                auto transport = trPad->manager()->newTransport(trPad, transportEl);
+                if (!transport) {
+                    toReject.append(ce);
+                    continue;
+                }
+
+                auto tfo = app->transportReplaceOrigin();
+                // if transport recovery is in progress and I as an inititiator started it then forbid remote
+                // transport-replace
+                if (tfo != Origin::None && tfo != q->peerRole() && role == Origin::Initiator) {
+                    lastError = ErrorUtil::makeTieBreak(*manager->client()->doc());
+                    return false;
+                }
+
+                passed.append(std::make_tuple(app, transport, ce));
             }
-        }
 
-        QMultiMap<Action, Application*> updates;
+            for (auto &v : passed) {
+                Application *             app;
+                QSharedPointer<Transport> transport;
+                QDomElement               ce;
+                std::tie(app, transport, ce) = v;
+                if (!app->incomingTransportReplace(
+                        transport)) { // app should generate transport accept eventually. content-accept will work too
+                                      // if the content wasn't accepted yet
+                    toReject.append(ce);
+                }
+            }
 
-        for (auto app : signalingContent) {
-            Action updateType = app->evaluateOutgoingUpdate();
-            if (updateType != Action::NoAction) {
-                updates.insert(updateType, app);
+            if (toReject.size()) {
+                outgoingUpdates.insert(Action::TransportReject, OutgoingUpdate { toReject, OutgoingUpdateCB() });
             }
+
+            planStep();
+            return true;
         }
 
-        QList<AckHndl> acceptApps;
-        if (updates.size()) {
-            Action action = updates.begin().key(); // NOTE maybe some actions have more priority than another
-            auto apps = updates.values(action);
-            for (auto app: apps) {
-                QList<QDomElement> xml;
-                OutgoingUpdateCB callback;
-                std::tie(xml, callback) = app->takeOutgoingUpdate();
-                updateXml += xml;
-                if (callback) {
-                    acceptApps.append(AckHndl{app, callback});
+        bool handleIncomingTransportAccept(const QDomElement &jingleEl)
+        {
+            QString contentTag(QStringLiteral("content"));
+            for (QDomElement ce = jingleEl.firstChildElement(contentTag); !ce.isNull();
+                 ce             = ce.nextSiblingElement(contentTag)) {
+                ContentBase cb(ce);
+                auto        transportEl = ce.firstChildElement(QString::fromLatin1("transport"));
+                QString     transportNS = transportEl.namespaceURI();
+                if (!cb.isValid() || transportEl.isNull() || transportNS.isEmpty()) {
+                    lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
+                    return false;
                 }
-            }
-            sendJingle(action, updateXml, [this, acceptApps](){
-                for (const auto &h: acceptApps) {
-                    auto app = std::get<0>(h);
-                    auto callback = std::get<1>(h);
-                    if (app) {
-                        callback();
-                    }
+                Application *app = contentList.value(ContentKey { cb.name, cb.creator });
+                if (!app || !app->transport() || app->transport()->pad()->ns() != transportNS
+                    || !app->incomingTransportAccept(transportEl)) {
+                    lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
+                    return false;
                 }
-                planStep();
-            });
+            }
+
+            planStep();
+            return true;
         }
-    }
 
-    Reason reason(const QDomElement &jingleEl)
-    {
-        QDomElement re = jingleEl.firstChildElement(QLatin1String("reason"));
-        Reason reason;
-        if(!re.isNull()) {
-            reason = Reason(re);
-            if (!reason.isValid()) {
-                qDebug("invalid reason");
+        bool handleIncomingTransportInfo(const QDomElement &jingleEl)
+        {
+            QString                                              contentTag(QStringLiteral("content"));
+            QList<QPair<QSharedPointer<Transport>, QDomElement>> updates;
+            for (QDomElement ce = jingleEl.firstChildElement(contentTag); !ce.isNull();
+                 ce             = ce.nextSiblingElement(contentTag)) {
+                Application *app;
+                ContentBase  cb(ce);
+                if (!cb.isValid() || !(app = q->content(cb.name, cb.creator)) || app->state() >= State::Finishing
+                    || !app->transport()) {
+                    lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
+                    return false;
+                }
+                auto tel = ce.firstChildElement(QStringLiteral("transport"));
+                if (tel.isNull() || tel.namespaceURI() != app->transport()->pad()->ns()) {
+                    lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
+                    return false;
+                }
+                updates.append(qMakePair(app->transport(), tel));
             }
-        }
-        return reason;
-    }
 
-    void addAndInitContent(Origin creator, Application *content)
-    {
-        contentList.insert(ContentKey{content->contentName(), creator}, content);
-        if (state != State::Created && content->evaluateOutgoingUpdate() != Action::NoAction) {
-            signalingContent.insert(content);
-        }
-        QObject::connect(content, &Application::updated, q, [this, content](){
-            signalingContent.insert(content);
-            planStep();
-        });
-        QObject::connect(content, &Application::destroyed, q, [this, content](){
-            signalingContent.remove(content);
-            for (auto it = contentList.begin(); it != contentList.end(); ++it) { // optimize for large lists?
-                if (it.value() == content) {
-                    contentList.erase(it);
-                    break;
+            for (auto &u : updates) {
+                if (!u.first->update(u.second)) {
+                    lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
+                    return false; // yes this may lead to half updated content, but what choice do we have?
                 }
             }
-        });
-    }
 
-    enum AddContentError {
-        Ok,
-        Unparsed,
-        Unexpected,
-        Unsupported
+            return true;
+        }
     };
 
-    std::tuple<AddContentError, Reason::Condition, Application*> parseContentAdd(const QDomElement &ce)
+    Session::Session(Manager *manager, const Jid &peer, Origin role) : d(new Private)
     {
-        QDomElement descriptionEl = ce.firstChildElement(QLatin1String("description"));
-        QDomElement transportEl = ce.firstChildElement(QLatin1String("transport"));
-        QString descriptionNS = descriptionEl.namespaceURI();
-        QString transportNS = transportEl.namespaceURI();
-        typedef std::tuple<AddContentError, Reason::Condition, Application*> result;
-
-        ContentBase c(ce);
-        if (!c.isValid() || descriptionEl.isNull() || transportEl.isNull() || descriptionNS.isEmpty() || transportNS.isEmpty()) {
-            return result{Unparsed, Reason::Success, nullptr};
-        }
-
-        auto appPad = q->applicationPadFactory(descriptionNS);
-        if (!appPad) {
-            return result{Unsupported, Reason::UnsupportedApplications, nullptr}; // <unsupported-applications/> condition
-        }
-        QScopedPointer<Application> app(appPad->manager()->startApplication(appPad, c.name, c.creator, c.senders));
-        auto descErr = app->setDescription(descriptionEl);
-        if (descErr == Application::IncompatibleParameters) {
-            return result{Unsupported, Reason::IncompatibleParameters, nullptr};
-        } else
-        if (descErr == Application::Unparsed) {
-            return result{Unparsed, Reason::Success, nullptr};
-        } else
-        {
-            // same for transport
-            auto trPad = q->transportPadFactory(transportNS);
-            if (!trPad) {
-                return result{Unsupported, Reason::UnsupportedTransports, app.take()}; // <unsupported-transports/> condition or we can try fallback and fail with <failed-transport/>
-            }
-            auto transport = trPad->manager()->newTransport(trPad, transportEl);
-            if (transport) {
-                if (app->setTransport(transport)) {
-                    return result{Ok, Reason::Success, app.take()};
-                }
-                return result{Unsupported, Reason::UnsupportedTransports, app.take()};
-            }
-        }
+        d->q          = this;
+        d->role       = role;
+        d->manager    = manager;
+        d->otherParty = peer;
+        d->stepTimer.setSingleShot(true);
+        d->stepTimer.setInterval(0);
+        connect(&d->stepTimer, &QTimer::timeout, this, [this]() { d->doStep(); });
+    }
 
-        return result{Unparsed, Reason::Success, nullptr};
+    Session::~Session()
+    {
+        qDeleteAll(d->contentList);
+        qDebug("session %s destroyed", qPrintable(d->sid));
     }
 
-    typedef std::tuple<AddContentError, Reason::Condition, QList<Application*>, QList<QDomElement>> ParseContentListResult;
+    Manager *Session::manager() const { return d->manager; }
 
-    ParseContentListResult parseContentAddList(const QDomElement &jingleEl)
-    {
-        QMap<QString,Application *> addSet;
-        QMap<QString,std::pair<QDomElement,Reason::Condition>> rejectSet;
+    State Session::state() const { return d->state; }
 
-        QString contentTag(QStringLiteral("content"));
-        for(QDomElement ce = jingleEl.firstChildElement(contentTag);
-            !ce.isNull(); ce = ce.nextSiblingElement(contentTag))
-        {
+    Jid Session::me() const { return d->manager->client()->jid(); }
 
-            Private::AddContentError err;
-            Reason::Condition cond;
-            Application *app;
+    Jid Session::peer() const { return d->otherParty; }
 
-            std::tie(err, cond, app) = parseContentAdd(ce);
-            if (err == Private::AddContentError::Unparsed) {
-                lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
-                qDeleteAll(addSet);
-                return ParseContentListResult(Unparsed, cond, QList<Application*>(), QList<QDomElement>());
-            }
+    Jid Session::initiator() const
+    {
+        return d->role == Origin::Initiator ? d->manager->client()->jid() : d->otherParty;
+    }
 
-            auto contentName = app->contentName();
-            auto it = addSet.find(contentName);
-            if (err != Private::AddContentError::Ok) {
-                // can't continue as well
-                if (app) { // we are going to reject it completely so delete
-                    delete app;
-                }
+    Jid Session::responder() const
+    {
+        return d->role == Origin::Responder ? d->manager->client()->jid() : d->otherParty;
+    }
 
-                if (it == addSet.end()) {
-                    rejectSet.insert(contentName, std::make_pair(ce, cond));
-                }
-                continue;
-            }
+    QString Session::sid() const { return d->sid; }
 
-            rejectSet.remove(contentName);
-            if (it == addSet.end() || (*it)->wantBetterTransport(app->transport())) { // probably not wantBetterTransport but wantBetterApplication
-                if (it == addSet.end()) {
-                    addSet.insert(contentName, app);
-                } else {
-                    delete *it; // unpreferred app
-                    *it = app;
-                }
-            }
-        }
+    Origin Session::role() const { return d->role; }
 
-        if (rejectSet.size()) {
-            QList<QDomElement> rejectList;
-            for (auto const &i: rejectSet) {
-                rejectList.append(i.first);
-            }
-            return ParseContentListResult(Unsupported, rejectSet.first().second, addSet.values(), rejectList);
+    Origin Session::peerRole() const { return negateOrigin(d->role); }
+
+    XMPP::Stanza::Error Session::lastError() const { return d->lastError; }
+
+    Application *Session::newContent(const QString &ns, Origin senders)
+    {
+        auto pad = applicationPadFactory(ns);
+        if (pad) {
+            return pad->manager()->startApplication(pad, pad->generateContentName(senders), d->role, senders);
         }
+        return nullptr;
+    }
 
-        return ParseContentListResult(Ok, Reason::Success, addSet.values(), QList<QDomElement>());
+    Application *Session::content(const QString &contentName, Origin creator)
+    {
+        return d->contentList.value(ContentKey { contentName, creator });
     }
 
-    std::tuple<AddContentError, Reason::Condition, Application*> parseContentAccept(const QDomElement &ce)
+    void Session::addContent(Application *content)
     {
-        QDomElement descriptionEl = ce.firstChildElement(QLatin1String("description"));
-        QDomElement transportEl = ce.firstChildElement(QLatin1String("transport"));
-        QString descriptionNS = descriptionEl.namespaceURI();
-        QString transportNS = transportEl.namespaceURI();
-        typedef std::tuple<AddContentError, Reason::Condition, Application*> result;
-
-        ContentBase c(ce);
-        if (!c.isValid() || role != c.creator || descriptionEl.isNull() || transportEl.isNull() ||
-                descriptionNS.isEmpty() || transportNS.isEmpty())
-        {
-            return result{Unparsed, Reason::NoReason, nullptr};
+        Q_ASSERT(d->state < State::Finishing);
+        d->addAndInitContent(d->role, content);
+        if (d->state >= State::PrepareLocalOffer) {
+            // If we add content to already initiated session then we are gonna
+            // send it immediatelly. So start prepare
+            content->prepare();
         }
+    }
 
-        auto app = q->content(c.name, role);
-        if (!(app && app->state() == State::Pending)) { // reaccept is possible
-            return result{AddContentError::Unexpected, Reason::NoReason, app};
-        }
+    const QMap<ContentKey, Application *> &Session::contentList() const { return d->contentList; }
 
-        if (app->pad()->ns() != descriptionNS || app->transport()->pad()->ns() != transportNS) {
-            // well it's more than unexpected. let's send unparsed
-            return result{AddContentError::Unparsed, Reason::NoReason, app};
-        }
+    ApplicationManagerPad::Ptr Session::applicationPad(const QString &ns)
+    {
+        return d->applicationPads.value(ns).toStrongRef();
+    }
 
-        if (!app->transport()->update(transportEl) || !app->accept(descriptionEl)) {
-            // clearly unparsed. otherwise the app will generate failure event with a Reason.
-            return result{AddContentError::Unparsed, Reason::NoReason, app};
-        }
+    TransportManagerPad::Ptr Session::transportPad(const QString &ns)
+    {
+        return d->transportPads.value(ns).toStrongRef();
+    }
 
-        if (app->state() != State::Accepted) { // parsed but was not accepted. so it's somehow incompatible
-            return result{AddContentError::Unsupported, Reason::IncompatibleParameters, app};
+    QSharedPointer<Transport> Session::newOutgoingTransport(const QString &ns)
+    {
+        auto pad = transportPadFactory(ns);
+        if (pad) {
+            return pad->manager()->newTransport(pad); // pad on both side becaue we need shared pointer
         }
-
-        return result{AddContentError::Ok, Reason::Success, app};
+        return QSharedPointer<Transport>();
     }
 
-    std::tuple<bool,QList<Application*>> parseContentAcceptList(const QDomElement &jingleEl)
+    QString Session::preferredApplication() const
     {
-        QMap<QString,Application *> acceptSet;
-        QMap<QString,std::pair<QDomElement,Reason::Condition>> rejectSet;
+        // TODO some heuristics to detect preferred application
+        if (d->applicationPads.size()) {
+            return d->applicationPads.constBegin().key();
+        }
+        return QString();
+    }
 
-        QString contentTag(QStringLiteral("content"));
-        for(QDomElement ce = jingleEl.firstChildElement(contentTag);
-            !ce.isNull(); ce = ce.nextSiblingElement(contentTag))
-        {
+    QStringList Session::allApplicationTypes() const { return d->applicationPads.keys(); }
 
-            Private::AddContentError err;
-            Reason::Condition cond;
-            Application *app;
+    void Session::setLocalJid(const Jid &jid) { d->localParty = jid; }
 
-            std::tie(err, cond, app) = parseContentAccept(ce);
-            if (err == Private::AddContentError::Unparsed || err == Private::AddContentError::Unexpected) {
-                for (auto &a: acceptSet) {
-                    a->setState(State::Pending); // reset state to pending for already passed validation before passing error back
-                }
-                lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, err == Private::AddContentError::Unexpected?
-                                                    XMPP::Stanza::Error::UnexpectedRequest : XMPP::Stanza::Error::BadRequest);
-                if (err == Private::AddContentError::Unexpected) {
-                    ErrorUtil::fill(jingleEl.ownerDocument(), lastError, ErrorUtil::OutOfOrder);
-                }
-                return std::tuple<bool,QList<Application*>>(false, QList<Application*>());
+    void Session::accept()
+    {
+        // So we presented a user incoming session in UI, the user modified it somehow and finally accepted.
+        if (d->role == Origin::Responder && d->state == State::Created) {
+            d->state = State::PrepareLocalOffer;
+            for (auto &c : d->contentList) {
+                c->prepare();
             }
+            d->planStep();
+        }
+    }
 
-            auto contentName = app->contentName();
-            auto it = acceptSet.find(contentName);
-            auto rit = rejectSet.find(contentName);
-            if (it != acceptSet.end() || rit != rejectSet.end()) {
-                // duplicates are not allowed in accept request
-                for (auto &a: acceptSet) {
-                    a->setState(State::Pending); // reset state to pending for already passed validation before passing error back
-                }
-                lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
-                return std::tuple<bool,QList<Application*>>(false, QList<Application*>());
+    void Session::initiate()
+    {
+        emit initiated();
+        if (d->role == Origin::Initiator && d->state == State::Created) {
+            d->state = State::PrepareLocalOffer;
+            for (auto &c : d->contentList) {
+                c->prepare();
             }
+            d->planStep();
+        }
+    }
+
+    void Session::terminate(Reason::Condition cond, const QString &comment)
+    {
+        if (d->role == Origin::Initiator && d->state == State::PrepareLocalOffer) {
+            d->setSessionFinished();
+            return;
+        }
+        d->state           = State::Finishing;
+        d->terminateReason = Reason(cond, comment);
+        d->planStep();
+    }
 
-            if (err != Private::AddContentError::Ok) {
-                app->setState(State::Finished); // we can't keep working with this content for whatever reason. if "accept" failed there is no fallback
-                rejectSet.insert(contentName, std::make_pair(ce, cond)); // NOTE, probably instead of ce we have to generate original description
-                continue;
+    TransportManagerPad::Ptr Session::transportPadFactory(const QString &ns)
+    {
+        auto pad = d->transportPads.value(ns).toStrongRef();
+        if (!pad) {
+            auto deleter = [ns, this](TransportManagerPad *pad) {
+                d->transportPads.remove(ns);
+                delete pad;
+            };
+            pad = TransportManagerPad::Ptr(d->manager->transportPad(this, ns), deleter);
+            if (pad) {
+                d->transportPads.insert(ns, pad);
             }
-            acceptSet.insert(contentName, app);
         }
+        return pad;
+    }
 
-        if (rejectSet.size()) {
-            QTimer::singleShot(0, q, [this, rejectSet]() mutable {
-                auto cond = rejectSet.first().second;
-                QList<QDomElement> rejects;
-                for (auto const &i: rejectSet) {
-                    rejects.append(i.first);
-                }
-                rejects += Reason(cond).toXml(manager->client()->doc());
-                outgoingUpdates.insert(
-                            Action::ContentRemove,
-                            OutgoingUpdate{
-                                rejects,
-                                [this, rejects]() {
-                                    for (auto &r: rejects) {
-                                        ContentBase c(r);
-                                        delete contentList.take(ContentKey{c.name, role});
-                                    }
-                                    if (contentList.isEmpty()) {
-                                        // the other party has to generate session-terminate but we do not care already
-                                        setSessionFinished();
-                                    }
-                                }
-                            });
-            });
+    ApplicationManagerPad::Ptr Session::applicationPadFactory(const QString &ns)
+    {
+        auto pad = d->applicationPads.value(ns).toStrongRef();
+        if (!pad) {
+            auto deleter = [ns, this](ApplicationManagerPad *pad) {
+                d->applicationPads.remove(ns);
+                delete pad;
+            };
+            pad = ApplicationManagerPad::Ptr(d->manager->applicationPad(this, ns), deleter);
+            if (pad) {
+                d->applicationPads.insert(ns, pad);
+            }
         }
-        return std::tuple<bool,QList<Application*>>(true, acceptSet.values());
+        return pad;
     }
 
-    bool handleIncomingContentAdd(const QDomElement &jingleEl)
+    bool Session::incomingInitiate(const Jingle &jingle, const QDomElement &jingleEl)
     {
+        d->sid      = jingle.sid();
+        d->origFrom = d->otherParty;
+        if (jingle.initiator().isValid() && !jingle.initiator().compare(d->origFrom)) {
+            d->otherParty = jingle.initiator();
+        }
+
         Private::AddContentError err;
-        Reason::Condition cond;
-        QList<Application *> apps;
-        QList<QDomElement> rejects;
+        Reason::Condition        cond;
+        QList<Application *>     apps;
+        QList<QDomElement>       rejects;
 
-        std::tie(err, cond, apps, rejects) = parseContentAddList(jingleEl);
+        std::tie(err, cond, apps, rejects) = d->parseContentAddList(jingleEl);
         switch (err) {
         case Private::AddContentError::Unparsed:
         case Private::AddContentError::Unexpected:
-            lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
-            if (err == Private::AddContentError::Unexpected) {
-                ErrorUtil::fill(jingleEl.ownerDocument(), lastError, ErrorUtil::OutOfOrder);
-            }
             return false;
         case Private::AddContentError::Unsupported:
-            rejects += Reason(cond).toXml(manager->client()->doc());
-            outgoingUpdates.insert(Action::ContentReject, OutgoingUpdate{rejects, OutgoingUpdateCB()});
-            break;
+            d->terminateReason = Reason(cond);
+            d->planStep();
+            return true;
         case Private::AddContentError::Ok:
-            break;
-        }
-
-        if (apps.size()) {
-            Origin remoteRole = negateOrigin(role);
-            for (auto app: apps) {
-                addAndInitContent(remoteRole, app); // TODO check conflicts
+            for (auto app : apps) {
+                d->addAndInitContent(Origin::Initiator, app);
             }
-            QTimer::singleShot(0, q, [this](){ emit q->newContentReceived(); });
+            d->planStep();
+            return true;
         }
-        planStep();
 
-        return true;
+        return false;
     }
 
-    bool handleIncomingContentRemove(const QDomElement &jingleEl)
+    bool Session::updateFromXml(Action action, const QDomElement &jingleEl)
     {
-        QSet<Application*> toRemove;
-        QString contentTag(QStringLiteral("content"));
-        for(QDomElement ce = jingleEl.firstChildElement(contentTag);
-            !ce.isNull(); ce = ce.nextSiblingElement(contentTag))
-        {
-            ContentBase cb(ce);
-            if (!cb.isValid()) {
-                lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
-                return false;
-            }
-            Application *app = contentList.value(ContentKey{cb.name, cb.creator});
-            if (app) {
-                toRemove.insert(app);
-            }
-        }
-
-        for (auto app: toRemove) {
-            contentList.remove(ContentKey{app->contentName(), app->creator()});
-            delete app;
+        if (d->state == State::Finished) {
+            d->lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::UnexpectedRequest);
+            ErrorUtil::fill(jingleEl.ownerDocument(), d->lastError, ErrorUtil::OutOfOrder);
+            return false;
         }
 
-        if (contentList.isEmpty()) {
-            auto reasonEl = jingleEl.firstChildElement(QString::fromLatin1("reason"));
-            terminateReason = reasonEl.isNull()? Reason(Reason::Success) : Reason(reasonEl);
+        switch (action) {
+        case Action::ContentAccept:
+            return d->handleIncomingContentAccept(jingleEl);
+        case Action::ContentAdd:
+            return d->handleIncomingContentAdd(jingleEl);
+        case Action::ContentModify:
+            break;
+        case Action::ContentReject:
+            break;
+        case Action::ContentRemove:
+            return d->handleIncomingContentRemove(jingleEl);
+        case Action::DescriptionInfo:
+            break;
+        case Action::SecurityInfo:
+            break;
+        case Action::SessionAccept:
+            return d->handleIncomingSessionAccept(jingleEl);
+        case Action::SessionInfo:
+            break;
+        case Action::SessionInitiate: // impossible case. but let compiler be happy
+            break;
+        case Action::SessionTerminate:
+            return d->handleIncomingSessionTerminate(jingleEl);
+        case Action::TransportAccept:
+            return d->handleIncomingTransportAccept(jingleEl);
+        case Action::TransportInfo:
+            return d->handleIncomingTransportInfo(jingleEl);
+        case Action::TransportReject:
+            break;
+        case Action::TransportReplace:
+            return d->handleIncomingTransportReplace(jingleEl);
+        case Action::NoAction:
+        default:
+            break;
         }
 
-        planStep();
-        return true;
+        d->lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::FeatureNotImplemented);
+        return false;
     }
 
-    bool handleIncomingSessionTerminate(const QDomElement &jingleEl)
+    //----------------------------------------------------------------------------
+    // SessionManagerPad - handle event related to a type of app/transport but not specific instance
+    //----------------------------------------------------------------------------
+    QDomElement SessionManagerPad::takeOutgoingSessionInfoUpdate() { return QDomElement(); }
+
+    QDomDocument *SessionManagerPad::doc() const { return session()->manager()->client()->doc(); }
+
+    //----------------------------------------------------------------------------
+    // Manager
+    //----------------------------------------------------------------------------
+    class Manager::Private {
+    public:
+        XMPP::Client *         client;
+        Manager *              manager;
+        QScopedPointer<JTPush> pushTask;
+        // ns -> application
+        QMap<QString, QPointer<ApplicationManager>> applicationManagers;
+        // ns -> parser function
+        QMap<QString, QPointer<TransportManager>> transportManagers;
+        std::function<bool(const Jid &)>          remoteJidCecker;
+
+        // when set/valid any incoming session initiate will be replied with redirection error
+        Jid                                   redirectionJid;
+        XMPP::Stanza::Error                   lastError;
+        QHash<QPair<Jid, QString>, Session *> sessions;
+        int                                   maxSessions = -1; // no limit
+
+        void setupSession(Session *s)
+        {
+            QObject::connect(s, &Session::terminated, manager,
+                             [this, s]() { sessions.remove(qMakePair(s->peer(), s->sid())); });
+        }
+    };
+
+    Manager::Manager(Client *client) : QObject(client), d(new Private())
     {
-        terminateReason = Reason(jingleEl.firstChildElement(QString::fromLatin1("reason")));
-        setSessionFinished();
-        return true;
+        d->client  = client;
+        d->manager = this;
+        d->pushTask.reset(new JTPush(client->rootTask()));
     }
 
-    bool handleIncomingSessionAccept(const QDomElement &jingleEl)
+    Manager::~Manager()
     {
-        bool parsed;
-        QList<Application *> apps;
-
-        std::tie(parsed, apps) = parseContentAcceptList(jingleEl);
-        if (!parsed) {
-            lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
-            return false;
+        for (auto &m : d->transportManagers) {
+            m->setJingleManager(nullptr);
         }
-
-        state = State::Connecting;
-        if (apps.size()) {
-            for (auto app: apps) {
-                app->start();
-            }
+        for (auto &m : d->applicationManagers) {
+            m->setJingleManager(nullptr);
         }
-        QTimer::singleShot(0, q, [this](){ emit q->activated(); });
-        planStep();
-
-        return true;
     }
 
-    bool handleIncomingContentAccept(const QDomElement &jingleEl)
-    {
-        bool parsed;
-        QList<Application *> apps;
-
-        std::tie(parsed, apps) = parseContentAcceptList(jingleEl); // marks valid apps as accepted
-        if (!parsed) {
-            lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
-            return false;
-        }
+    Client *Manager::client() const { return d->client; }
 
-        if (apps.size() && state >= State::Active) {
-            for (auto app: apps) {
-                app->start(); // start accepted app. connection establishing and data transfer are inside
-            }
-        }
-        planStep();
+    void Manager::addExternalManager(const QString &ns) { d->pushTask->addExternalManager(ns); }
 
-        return true;
-    }
+    void Manager::registerExternalSession(const QString &sid) { d->pushTask->registerExternalSession(sid); }
 
-    bool handleIncomingTransportReplace(const QDomElement &jingleEl)
-    {
-        QList<std::tuple<Application*,QSharedPointer<Transport>,QDomElement>> passed;
-        QList<QDomElement> toReject;
-        QString contentTag(QStringLiteral("content"));
-        for(QDomElement ce = jingleEl.firstChildElement(contentTag);
-            !ce.isNull(); ce = ce.nextSiblingElement(contentTag))
-        {
-            ContentBase cb(ce);
-            auto transportEl = ce.firstChildElement(QString::fromLatin1("transport"));
-            QString transportNS = transportEl.namespaceURI();
-            if (!cb.isValid() || transportEl.isNull() || transportNS.isEmpty()) {
-                lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
-                return false;
-            }
-            Application *app = contentList.value(ContentKey{cb.name, cb.creator});
-            if (!app) {
-                toReject.append(ce);
-                continue;
-            }
+    void Manager::forgetExternalSession(const QString &sid) { d->pushTask->forgetExternalSession(sid); }
 
-            auto trPad = q->transportPadFactory(transportNS);
-            if (!trPad) {
-                toReject.append(ce);
-                continue;
-            }
+    void Manager::setRedirection(const Jid &to) { d->redirectionJid = to; }
 
-            auto transport = trPad->manager()->newTransport(trPad, transportEl);
-            if (!transport) {
-                toReject.append(ce);
-                continue;
-            }
+    const Jid &Manager::redirectionJid() const { return d->redirectionJid; }
 
-            auto tfo = app->transportReplaceOrigin();
-            // if transport recovery is in progress and I as an inititiator started it then forbid remote transport-replace
-            if (tfo != Origin::None && tfo != q->peerRole() && role == Origin::Initiator) {
-                lastError = ErrorUtil::makeTieBreak(*manager->client()->doc());
-                return false;
-            }
+    void Manager::registerApp(const QString &ns, ApplicationManager *app)
+    {
+        d->applicationManagers.insert(ns, app);
+        app->setJingleManager(this);
+    }
 
-            passed.append(std::make_tuple(app, transport, ce));
+    void Manager::unregisterApp(const QString &ns)
+    {
+        auto appManager = d->applicationManagers.value(ns);
+        if (appManager) {
+            appManager->closeAll();
+            d->applicationManagers.remove(ns);
         }
+    }
 
-        for (auto &v: passed) {
-            Application *app;
-            QSharedPointer<Transport> transport;
-            QDomElement ce;
-            std::tie(app,transport,ce) = v;
-            if (!app->incomingTransportReplace(transport)) { // app should generate transport accept eventually. content-accept will work too if the content wasn't accepted yet
-                toReject.append(ce);
-            }
-        }
+    bool Manager::isRegisteredApplication(const QString &ns) { return d->applicationManagers.contains(ns); }
 
-        if (toReject.size()) {
-            outgoingUpdates.insert(Action::TransportReject, OutgoingUpdate{toReject,OutgoingUpdateCB()});
+    ApplicationManagerPad *Manager::applicationPad(Session *session, const QString &ns)
+    {
+        auto am = d->applicationManagers.value(ns);
+        if (!am) {
+            return nullptr;
         }
-
-        planStep();
-        return true;
+        return am->pad(session);
     }
 
-    bool handleIncomingTransportAccept(const QDomElement &jingleEl)
+    void Manager::registerTransport(const QString &ns, TransportManager *transport)
     {
-        QString contentTag(QStringLiteral("content"));
-        for(QDomElement ce = jingleEl.firstChildElement(contentTag);
-            !ce.isNull(); ce = ce.nextSiblingElement(contentTag))
-        {
-            ContentBase cb(ce);
-            auto transportEl = ce.firstChildElement(QString::fromLatin1("transport"));
-            QString transportNS = transportEl.namespaceURI();
-            if (!cb.isValid() || transportEl.isNull() || transportNS.isEmpty()) {
-                lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
-                return false;
-            }
-            Application *app = contentList.value(ContentKey{cb.name, cb.creator});
-            if (!app || !app->transport() || app->transport()->pad()->ns() != transportNS || !app->incomingTransportAccept(transportEl)) {
-                lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
-                return false;
-            }
-        }
-
-        planStep();
-        return true;
+        d->transportManagers.insert(ns, transport);
+        transport->setJingleManager(this);
     }
 
-    bool handleIncomingTransportInfo(const QDomElement &jingleEl)
+    void Manager::unregisterTransport(const QString &ns)
     {
-        QString contentTag(QStringLiteral("content"));
-        QList<QPair<QSharedPointer<Transport>,QDomElement>> updates;
-        for(QDomElement ce = jingleEl.firstChildElement(contentTag);
-            !ce.isNull(); ce = ce.nextSiblingElement(contentTag))
-        {
-            Application *app;
-            ContentBase cb(ce);
-            if (!cb.isValid() || !(app = q->content(cb.name, cb.creator)) || app->state() >= State::Finishing || !app->transport()) {
-                lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
-                return false;
-            }
-            auto tel = ce.firstChildElement(QStringLiteral("transport"));
-            if (tel.isNull() || tel.namespaceURI() != app->transport()->pad()->ns()) {
-                lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
-                return false;
-            }
-            updates.append(qMakePair(app->transport(), tel));
+        auto trManager = d->transportManagers.value(ns);
+        if (trManager) {
+            trManager->closeAll();
+            d->transportManagers.remove(ns);
         }
+    }
 
-        for (auto &u: updates) {
-            if (!u.first->update(u.second)) {
-                lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
-                return false; // yes this may lead to half updated content, but what choice do we have?
-            }
-        }
+    bool Manager::isRegisteredTransport(const QString &ns) { return d->transportManagers.contains(ns); }
 
-        return true;
-    }
-};
-
-Session::Session(Manager *manager, const Jid &peer, Origin role) :
-    d(new Private)
-{
-    d->q = this;
-    d->role = role;
-    d->manager = manager;
-    d->otherParty = peer;
-    d->stepTimer.setSingleShot(true);
-    d->stepTimer.setInterval(0);
-    connect(&d->stepTimer, &QTimer::timeout, this, [this](){ d->doStep();});
-
-}
-
-Session::~Session()
-{
-    qDeleteAll(d->contentList);
-    qDebug("session %s destroyed", qPrintable(d->sid));
-}
-
-Manager *Session::manager() const
-{
-    return d->manager;
-}
-
-State Session::state() const
-{
-    return d->state;
-}
-
-Jid Session::me() const
-{
-    return d->manager->client()->jid();
-}
-
-Jid Session::peer() const
-{
-    return d->otherParty;
-}
-
-Jid Session::initiator() const
-{
-    return d->role == Origin::Initiator? d->manager->client()->jid() : d->otherParty;
-}
-
-Jid Session::responder() const
-{
-    return d->role == Origin::Responder? d->manager->client()->jid() : d->otherParty;
-}
-
-QString Session::sid() const
-{
-    return d->sid;
-}
-
-Origin Session::role() const
-{
-    return d->role;
-}
-
-Origin Session::peerRole() const
-{
-    return negateOrigin(d->role);
-}
-
-XMPP::Stanza::Error Session::lastError() const
-{
-    return d->lastError;
-}
-
-Application *Session::newContent(const QString &ns, Origin senders)
-{
-    auto pad = applicationPadFactory(ns);
-    if (pad) {
-        return pad->manager()->startApplication(pad, pad->generateContentName(senders), d->role, senders);
-    }
-    return nullptr;
-}
-
-Application *Session::content(const QString &contentName, Origin creator)
-{
-    return d->contentList.value(ContentKey{contentName, creator});
-}
-
-void Session::addContent(Application *content)
-{
-    Q_ASSERT(d->state < State::Finishing);
-    d->addAndInitContent(d->role, content);
-    if (d->state >= State::PrepareLocalOffer) {
-        // If we add content to already initiated session then we are gonna
-        // send it immediatelly. So start prepare
-        content->prepare();
-    }
-}
-
-const QMap<ContentKey, Application *> &Session::contentList() const
-{
-    return d->contentList;
-}
-
-ApplicationManagerPad::Ptr Session::applicationPad(const QString &ns)
-{
-    return d->applicationPads.value(ns).toStrongRef();
-}
-
-TransportManagerPad::Ptr Session::transportPad(const QString &ns)
-{
-    return d->transportPads.value(ns).toStrongRef();
-}
-
-QSharedPointer<Transport> Session::newOutgoingTransport(const QString &ns)
-{
-    auto pad = transportPadFactory(ns);
-    if (pad) {
-        return pad->manager()->newTransport(pad); // pad on both side becaue we need shared pointer
-    }
-    return QSharedPointer<Transport>();
-}
-
-QString Session::preferredApplication() const
-{
-    // TODO some heuristics to detect preferred application
-    if (d->applicationPads.size()) {
-        return d->applicationPads.constBegin().key();
-    }
-    return QString();
-}
-
-QStringList Session::allApplicationTypes() const
-{
-    return d->applicationPads.keys();
-}
-
-void Session::setLocalJid(const Jid &jid)
-{
-    d->localParty = jid;
-}
-
-void Session::accept()
-{
-    // So we presented a user incoming session in UI, the user modified it somehow and finally accepted.
-    if (d->role == Origin::Responder && d->state == State::Created) {
-        d->state = State::PrepareLocalOffer;
-        for (auto &c: d->contentList) {
-            c->prepare();
+    bool Manager::isAllowedParty(const Jid &jid) const
+    {
+        if (d->remoteJidCecker) {
+            return d->remoteJidCecker(jid);
         }
-        d->planStep();
+        // REVIEW probably we can check Client's internal roster when checker is not set.
+        return true;
     }
-}
 
-void Session::initiate()
-{
-    emit initiated();
-    if (d->role == Origin::Initiator && d->state == State::Created) {
-        d->state = State::PrepareLocalOffer;
-        for (auto &c: d->contentList) {
-            c->prepare();
-        }
-        d->planStep();
+    Session *Manager::session(const Jid &remoteJid, const QString &sid)
+    {
+        return d->sessions.value(qMakePair(remoteJid, sid));
     }
-}
 
-void Session::terminate(Reason::Condition cond, const QString &comment)
-{
-    if (d->role == Origin::Initiator && d->state == State::PrepareLocalOffer) {
-        d->setSessionFinished();
-        return;
+    void Manager::detachSession(Session *s)
+    {
+        s->disconnect(this);
+        d->sessions.remove(qMakePair(s->peer(), s->sid()));
     }
-    d->state = State::Finishing;
-    d->terminateReason = Reason(cond, comment);
-    d->planStep();
-}
-
-TransportManagerPad::Ptr Session::transportPadFactory(const QString &ns)
-{
-    auto pad = d->transportPads.value(ns).toStrongRef();
-    if (!pad) {
-        auto deleter = [ns, this](TransportManagerPad *pad){
-            d->transportPads.remove(ns);
-            delete pad;
-        };
-        pad = TransportManagerPad::Ptr(d->manager->transportPad(this, ns), deleter);
-        if (pad) {
-            d->transportPads.insert(ns, pad);
+
+    void Manager::setRemoteJidChecker(std::function<bool(const Jid &)> checker) { d->remoteJidCecker = checker; }
+
+    TransportManagerPad *Manager::transportPad(Session *session, const QString &ns)
+    {
+        auto transportManager = d->transportManagers.value(ns);
+        if (!transportManager) {
+            return nullptr;
         }
+        return transportManager->pad(session);
     }
-    return pad;
-}
-
-ApplicationManagerPad::Ptr Session::applicationPadFactory(const QString &ns)
-{
-    auto pad = d->applicationPads.value(ns).toStrongRef();
-    if (!pad) {
-        auto deleter = [ns, this](ApplicationManagerPad *pad){
-            d->applicationPads.remove(ns);
-            delete pad;
-        };
-        pad = ApplicationManagerPad::Ptr(d->manager->applicationPad(this, ns), deleter);
-        if (pad) {
-            d->applicationPads.insert(ns, pad);
+
+    QStringList Manager::availableTransports(const Transport::Features &features) const
+    {
+        QStringList ret;
+        for (auto it = d->transportManagers.cbegin(); it != d->transportManagers.cend(); ++it) {
+            if (((*it)->features() & features) == features) {
+                ret.append(it.key());
+            }
         }
+        return ret;
     }
-    return pad;
-}
-
-bool Session::incomingInitiate(const Jingle &jingle, const QDomElement &jingleEl)
-{
-    d->sid = jingle.sid();
-    d->origFrom = d->otherParty;
-    if (jingle.initiator().isValid() && !jingle.initiator().compare(d->origFrom)) {
-        d->otherParty = jingle.initiator();
-    }
-
-    Private::AddContentError err;
-    Reason::Condition cond;
-    QList<Application *> apps;
-    QList<QDomElement> rejects;
 
-    std::tie(err, cond, apps, rejects) = d->parseContentAddList(jingleEl);
-    switch (err) {
-    case Private::AddContentError::Unparsed:
-    case Private::AddContentError::Unexpected:
-        return false;
-    case Private::AddContentError::Unsupported:
-        d->terminateReason = Reason(cond);
-        d->planStep();
-        return true;
-    case Private::AddContentError::Ok:
-        for (auto app: apps) {
-            d->addAndInitContent(Origin::Initiator, app);
-        }
-        d->planStep();
-        return true;
+    Session *Manager::incomingSessionInitiate(const Jid &from, const Jingle &jingle, const QDomElement &jingleEl)
+    {
+        if (d->maxSessions > 0 && d->sessions.size() == d->maxSessions) {
+            d->lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Wait, XMPP::Stanza::Error::ResourceConstraint);
+            return nullptr;
+        }
+        auto key = qMakePair(from, jingle.sid());
+        auto s   = new Session(this, from, Origin::Responder);
+        if (s->incomingInitiate(jingle, jingleEl)) { // if parsed well
+            d->sessions.insert(key, s);
+            d->setupSession(s);
+            // emit incomingSession makes sense when there are no unsolved conflicts in content descriptions /
+            // transports
+            // QTimer::singleShot(0,[s, this](){ emit incomingSession(s); });
+            QMetaObject::invokeMethod(this, "incomingSession", Qt::QueuedConnection, Q_ARG(Session *, s));
+            return s;
+        }
+        d->lastError = s->lastError();
+        delete s;
+        return nullptr;
     }
 
-    return false;
-}
+    XMPP::Stanza::Error Manager::lastError() const { return d->lastError; }
 
-bool Session::updateFromXml(Action action, const QDomElement &jingleEl)
-{
-    if (d->state == State::Finished) {
-        d->lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::UnexpectedRequest);
-        ErrorUtil::fill(jingleEl.ownerDocument(), d->lastError, ErrorUtil::OutOfOrder);
-        return false;
+    Session *Manager::newSession(const Jid &j)
+    {
+        auto s = new Session(this, j);
+        d->setupSession(s);
+        return s;
     }
 
-    switch (action) {
-    case Action::ContentAccept:
-        return d->handleIncomingContentAccept(jingleEl);
-    case Action::ContentAdd:
-        return d->handleIncomingContentAdd(jingleEl);
-    case Action::ContentModify:
-        break;
-    case Action::ContentReject:
-        break;
-    case Action::ContentRemove:
-        return d->handleIncomingContentRemove(jingleEl);
-    case Action::DescriptionInfo:
-        break;
-    case Action::SecurityInfo:
-        break;
-    case Action::SessionAccept:
-        return d->handleIncomingSessionAccept(jingleEl);
-    case Action::SessionInfo:
-        break;
-    case Action::SessionInitiate: // impossible case. but let compiler be happy
-        break;
-    case Action::SessionTerminate:
-        return d->handleIncomingSessionTerminate(jingleEl);
-    case Action::TransportAccept:
-        return d->handleIncomingTransportAccept(jingleEl);
-    case Action::TransportInfo:
-        return d->handleIncomingTransportInfo(jingleEl);
-    case Action::TransportReject:
-        break;
-    case Action::TransportReplace:
-        return d->handleIncomingTransportReplace(jingleEl);
-    case Action::NoAction:
-    default:
-        break;
+    QString Manager::registerSession(Session *session)
+    {
+        QString id;
+        auto    peer = session->peer();
+        do {
+            id = QString("%1").arg(quint32(qrand()), 6, 32, QChar('0'));
+        } while (d->sessions.contains(qMakePair(peer, id)));
+        d->sessions.insert(qMakePair(peer, id), session);
+        return id;
     }
 
-    d->lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::FeatureNotImplemented);
-    return false;
-}
-
-//----------------------------------------------------------------------------
-// SessionManagerPad - handle event related to a type of app/transport but not specific instance
-//----------------------------------------------------------------------------
-QDomElement SessionManagerPad::takeOutgoingSessionInfoUpdate()
-{
-    return QDomElement();
-}
-
-QDomDocument *SessionManagerPad::doc() const
-{
-    return session()->manager()->client()->doc();
-}
-
-//----------------------------------------------------------------------------
-// Manager
-//----------------------------------------------------------------------------
-class Manager::Private
-{
-public:
-    XMPP::Client *client;
-    Manager *manager;
-    QScopedPointer<JTPush> pushTask;
-    // ns -> application
-    QMap<QString,QPointer<ApplicationManager>> applicationManagers;
-    // ns -> parser function
-    QMap<QString,QPointer<TransportManager>> transportManagers;
-    std::function<bool(const Jid &)> remoteJidCecker;
-
-    // when set/valid any incoming session initiate will be replied with redirection error
-    Jid redirectionJid;
-    XMPP::Stanza::Error lastError;
-    QHash<QPair<Jid,QString>,Session*> sessions;
-    int maxSessions = -1; // no limit
-
-    void setupSession(Session *s)
+    Origin negateOrigin(Origin o)
     {
-        QObject::connect(s, &Session::terminated, manager, [this, s](){
-            sessions.remove(qMakePair(s->peer(), s->sid()));
-        });
-    }
-};
-
-Manager::Manager(Client *client) :
-    QObject(client),
-    d(new Private())
-{
-    d->client = client;
-    d->manager = this;
-    d->pushTask.reset(new JTPush(client->rootTask()));
-}
-
-Manager::~Manager()
-{
-    for (auto &m: d->transportManagers) {
-        m->setJingleManager(nullptr);
-    }
-    for (auto &m: d->applicationManagers) {
-        m->setJingleManager(nullptr);
-    }
-}
-
-Client *Manager::client() const
-{
-    return d->client;
-}
-
-void Manager::addExternalManager(const QString &ns)
-{
-    d->pushTask->addExternalManager(ns);
-}
-
-void Manager::registerExternalSession(const QString &sid)
-{
-    d->pushTask->registerExternalSession(sid);
-}
-
-void Manager::forgetExternalSession(const QString &sid)
-{
-    d->pushTask->forgetExternalSession(sid);
-}
-
-void Manager::setRedirection(const Jid &to)
-{
-    d->redirectionJid = to;
-}
-
-const Jid &Manager::redirectionJid() const
-{
-    return d->redirectionJid;
-}
-
-void Manager::registerApp(const QString &ns, ApplicationManager *app)
-{
-    d->applicationManagers.insert(ns, app);
-    app->setJingleManager(this);
-}
-
-void Manager::unregisterApp(const QString &ns)
-{
-    auto appManager = d->applicationManagers.value(ns);
-    if (appManager) {
-        appManager->closeAll();
-        d->applicationManagers.remove(ns);
+        switch (o) {
+        case Origin::None:
+            return Origin::Both;
+        case Origin::Both:
+            return Origin::None;
+        case Origin::Initiator:
+            return Origin::Responder;
+        case Origin::Responder:
+            return Origin::Initiator;
+        }
+        return Origin::None;
     }
-}
 
-bool Manager::isRegisteredApplication(const QString &ns)
-{
-    return d->applicationManagers.contains(ns);
-}
+    bool Connection::hasPendingDatagrams() const { return false; }
 
-ApplicationManagerPad *Manager::applicationPad(Session *session, const QString &ns)
-{
-    auto am = d->applicationManagers.value(ns);
-    if (!am) {
-        return nullptr;
+    NetworkDatagram Connection::receiveDatagram(qint64 maxSize)
+    {
+        Q_UNUSED(maxSize)
+        return NetworkDatagram();
     }
-    return am->pad(session);
-}
-
-void Manager::registerTransport(const QString &ns, TransportManager *transport)
-{
-    d->transportManagers.insert(ns, transport);
-    transport->setJingleManager(this);
-}
-
-void Manager::unregisterTransport(const QString &ns)
-{
-    auto trManager = d->transportManagers.value(ns);
-    if (trManager) {
-        trManager->closeAll();
-        d->transportManagers.remove(ns);
+
+    size_t Connection::blockSize() const
+    {
+        return 0; // means "block" is not applicable for this kind of connection
     }
-}
 
-bool Manager::isRegisteredTransport(const QString &ns)
-{
-    return d->transportManagers.contains(ns);
-}
+    const char *ErrorUtil::names[ErrorUtil::Last]
+        = { "out-of-order", "tie-break", "unknown-session", "unsupported-info" };
 
-bool Manager::isAllowedParty(const Jid &jid) const
-{
-    if (d->remoteJidCecker) {
-        return d->remoteJidCecker(jid);
+    Stanza::Error ErrorUtil::make(QDomDocument &doc, int jingleCond, int type, int condition, const QString &text)
+    {
+        auto el = doc.createElementNS(ERROR_NS, QString::fromLatin1(names[jingleCond - 1]));
+        return Stanza::Error(type, condition, text, el);
     }
-    // REVIEW probably we can check Client's internal roster when checker is not set.
-    return true;
-}
-
-Session *Manager::session(const Jid &remoteJid, const QString &sid)
-{
-    return d->sessions.value(qMakePair(remoteJid, sid));
-}
-
-void Manager::detachSession(Session *s)
-{
-    s->disconnect(this);
-    d->sessions.remove(qMakePair(s->peer(), s->sid()));
-}
-
-void Manager::setRemoteJidChecker(std::function<bool(const Jid &)> checker)
-{
-    d->remoteJidCecker = checker;
-}
-
-TransportManagerPad* Manager::transportPad(Session *session, const QString &ns)
-{
-    auto transportManager = d->transportManagers.value(ns);
-    if (!transportManager) {
-        return nullptr;
+
+    void ErrorUtil::fill(QDomDocument doc, Stanza::Error &error, int jingleCond)
+    {
+        error.appSpec = doc.createElementNS(ERROR_NS, QString::fromLatin1(names[jingleCond - 1]));
     }
-    return transportManager->pad(session);
-}
 
-QStringList Manager::availableTransports(const Transport::Features &features) const
-{
-    QStringList ret;
-    for (auto it = d->transportManagers.cbegin(); it != d->transportManagers.cend(); ++it) {
-        if (((*it)->features() & features) == features) {
-            ret.append(it.key());
+    int ErrorUtil::jingleCondition(const Stanza::Error &error)
+    {
+        if (error.appSpec.namespaceURI() != ERROR_NS) {
+            return UnknownError;
+        }
+        QString tagName = error.appSpec.tagName();
+        for (int i = 0; i < int(sizeof(names) / sizeof(names[0])); ++i) {
+            if (tagName == names[i]) {
+                return i + 1;
+            }
         }
+        return UnknownError;
     }
-    return ret;
-}
 
-Session* Manager::incomingSessionInitiate(const Jid &from, const Jingle &jingle, const QDomElement &jingleEl)
-{
-    if (d->maxSessions > 0 && d->sessions.size() == d->maxSessions) {
-        d->lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Wait, XMPP::Stanza::Error::ResourceConstraint);
-        return nullptr;
-    }
-    auto key = qMakePair(from, jingle.sid());
-    auto s = new Session(this, from, Origin::Responder);
-    if (s->incomingInitiate(jingle, jingleEl)) { // if parsed well
-        d->sessions.insert(key, s);
-        d->setupSession(s);
-        // emit incomingSession makes sense when there are no unsolved conflicts in content descriptions / transports
-        //QTimer::singleShot(0,[s, this](){ emit incomingSession(s); });
-        QMetaObject::invokeMethod(this, "incomingSession", Qt::QueuedConnection, Q_ARG(Session*, s));
-        return s;
-    }
-    d->lastError = s->lastError();
-    delete s;
-    return nullptr;
-}
-
-XMPP::Stanza::Error Manager::lastError() const
-{
-    return d->lastError;
-}
-
-Session *Manager::newSession(const Jid &j)
-{
-    auto s = new Session(this, j);
-    d->setupSession(s);
-    return s;
-}
-
-QString Manager::registerSession(Session *session)
-{
-    QString id;
-    auto peer = session->peer();
-    do {
-        id = QString("%1").arg(quint32(qrand()), 6, 32, QChar('0'));
-    } while (d->sessions.contains(qMakePair(peer,id)));
-    d->sessions.insert(qMakePair(peer, id), session);
-    return id;
-}
-
-Origin negateOrigin(Origin o)
-{
-    switch (o) {
-    case Origin::None:      return Origin::Both;
-    case Origin::Both:      return Origin::None;
-    case Origin::Initiator: return Origin::Responder;
-    case Origin::Responder: return Origin::Initiator;
-    }
-    return Origin::None;
-}
-
-bool Connection::hasPendingDatagrams() const
-{
-    return false;
-}
-
-NetworkDatagram Connection::receiveDatagram(qint64 maxSize)
-{
-    Q_UNUSED(maxSize)
-    return NetworkDatagram();
-}
-
-size_t Connection::blockSize() const
-{
-    return 0; // means "block" is not applicable for this kind of connection
-}
-
-const char* ErrorUtil::names[ErrorUtil::Last] = {"out-of-order","tie-break", "unknown-session", "unsupported-info"};
-
-Stanza::Error ErrorUtil::make(QDomDocument &doc, int jingleCond, int type, int condition, const QString &text)
-{
-    auto el = doc.createElementNS(ERROR_NS, QString::fromLatin1(names[jingleCond - 1]));
-    return Stanza::Error(type, condition, text, el);
-}
-
-void ErrorUtil::fill(QDomDocument doc, Stanza::Error &error, int jingleCond)
-{
-    error.appSpec = doc.createElementNS(ERROR_NS, QString::fromLatin1(names[jingleCond - 1]));
-}
-
-int ErrorUtil::jingleCondition(const Stanza::Error &error)
-{
-    if (error.appSpec.namespaceURI() != ERROR_NS) {
-        return UnknownError;
+    Stanza::Error ErrorUtil::makeTieBreak(QDomDocument &doc)
+    {
+        return make(doc, TieBreak, XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::Conflict);
     }
-    QString tagName = error.appSpec.tagName();
-    for (int i = 0; i < int(sizeof(names) / sizeof(names[0])); ++i) {
-        if (tagName == names[i]) {
-            return i + 1;
-        }
+
+    Stanza::Error ErrorUtil::makeOutOfOrder(QDomDocument &doc)
+    {
+        return make(doc, OutOfOrder, XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::UnexpectedRequest);
     }
-    return UnknownError;
-}
-
-Stanza::Error ErrorUtil::makeTieBreak(QDomDocument &doc)
-{
-    return make(doc, TieBreak, XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::Conflict);
-}
-
-Stanza::Error ErrorUtil::makeOutOfOrder(QDomDocument &doc)
-{
-    return make(doc, OutOfOrder, XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::UnexpectedRequest);
-}
 
 } // namespace Jingle
 } // namespace XMPP

From 7805139e58d34368883f40b2dae3be69c4fc4a20 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 13 Oct 2019 14:27:03 +0300
Subject: [PATCH 105/383] reformat iris with clang-format

---
 src/irisnet/appledns/appledns.cpp             |  495 ++-
 src/irisnet/appledns/qdnssd.cpp               |  682 ++---
 src/irisnet/appledns/qdnssd.h                 |   70 +-
 src/irisnet/appledns/sdtest.cpp               |  282 +-
 src/irisnet/corelib/addressresolver.cpp       |   89 +-
 src/irisnet/corelib/addressresolver.h         |    8 +-
 src/irisnet/corelib/irisnetexport.h           |   12 +-
 src/irisnet/corelib/irisnetglobal.cpp         |  132 +-
 src/irisnet/corelib/irisnetglobal_p.h         |    2 +-
 src/irisnet/corelib/irisnetplugin.cpp         |   40 +-
 src/irisnet/corelib/irisnetplugin.h           |  118 +-
 src/irisnet/corelib/netavailability.cpp       |   20 +-
 src/irisnet/corelib/netavailability.h         |    3 +-
 src/irisnet/corelib/netinterface.cpp          |  177 +-
 src/irisnet/corelib/netinterface.h            |   37 +-
 src/irisnet/corelib/netinterface_qtname.cpp   |  112 +-
 src/irisnet/corelib/netinterface_qtnet.cpp    |   36 +-
 src/irisnet/corelib/netinterface_unix.cpp     |   97 +-
 src/irisnet/corelib/netnames.cpp              |  859 +++---
 src/irisnet/corelib/netnames.h                |  208 +-
 src/irisnet/corelib/netnames_jdns.cpp         | 1368 ++++-----
 src/irisnet/corelib/objectsession.cpp         |  169 +-
 src/irisnet/corelib/objectsession.h           |   40 +-
 src/irisnet/noncore/cutestuff/bsocket.cpp     |  259 +-
 src/irisnet/noncore/cutestuff/bsocket.h       |   25 +-
 src/irisnet/noncore/cutestuff/bytestream.cpp  |  110 +-
 src/irisnet/noncore/cutestuff/bytestream.h    |   37 +-
 src/irisnet/noncore/cutestuff/httpconnect.cpp |  152 +-
 src/irisnet/noncore/cutestuff/httpconnect.h   |   12 +-
 src/irisnet/noncore/cutestuff/httppoll.cpp    |  527 ++--
 src/irisnet/noncore/cutestuff/httppoll.h      |   51 +-
 src/irisnet/noncore/cutestuff/socks.cpp       |  509 ++-
 src/irisnet/noncore/cutestuff/socks.h         |   43 +-
 src/irisnet/noncore/ice176.cpp                |  804 ++---
 src/irisnet/noncore/ice176.h                  |   83 +-
 src/irisnet/noncore/icecomponent.cpp          |  638 ++--
 src/irisnet/noncore/icecomponent.h            |   65 +-
 src/irisnet/noncore/icelocaltransport.cpp     |  446 +--
 src/irisnet/noncore/icelocaltransport.h       |   26 +-
 src/irisnet/noncore/icetransport.cpp          |    9 +-
 src/irisnet/noncore/icetransport.h            |   24 +-
 src/irisnet/noncore/iceturntransport.cpp      |  118 +-
 src/irisnet/noncore/iceturntransport.h        |   20 +-
 src/irisnet/noncore/legacy/ndns.cpp           |   24 +-
 src/irisnet/noncore/legacy/ndns.h             |   11 +-
 src/irisnet/noncore/legacy/srvresolver.cpp    |  137 +-
 src/irisnet/noncore/legacy/srvresolver.h      |   21 +-
 src/irisnet/noncore/processquit.cpp           |   68 +-
 src/irisnet/noncore/processquit.h             |   24 +-
 src/irisnet/noncore/stunallocate.cpp          |  702 ++---
 src/irisnet/noncore/stunallocate.h            |   42 +-
 src/irisnet/noncore/stunbinding.cpp           |  171 +-
 src/irisnet/noncore/stunbinding.h             |   14 +-
 src/irisnet/noncore/stunmessage.cpp           |  340 +-
 src/irisnet/noncore/stunmessage.h             |   49 +-
 src/irisnet/noncore/stuntransaction.cpp       |  393 +--
 src/irisnet/noncore/stuntransaction.h         |   35 +-
 src/irisnet/noncore/stuntypes.cpp             | 1027 +++----
 src/irisnet/noncore/stuntypes.h               |  217 +-
 src/irisnet/noncore/stunutil.cpp              |  133 +-
 src/irisnet/noncore/stunutil.h                |   17 +-
 src/irisnet/noncore/tcpportreserver.cpp       |   81 +-
 src/irisnet/noncore/tcpportreserver.h         |   44 +-
 src/irisnet/noncore/turnclient.cpp            |  638 ++--
 src/irisnet/noncore/turnclient.h              |   45 +-
 src/irisnet/noncore/udpportreserver.cpp       |  208 +-
 src/irisnet/noncore/udpportreserver.h         |    7 +-
 src/xmpp/base/randomnumbergenerator.cpp       |    6 +-
 src/xmpp/base/randomnumbergenerator.h         |   17 +-
 src/xmpp/base/randrandomnumbergenerator.h     |   17 +-
 src/xmpp/base/timezone.cpp                    |   53 +-
 src/xmpp/base/timezone.h                      |    7 +-
 .../incrementingrandomnumbergenerator.h       |   35 +-
 .../unittest/randomnumbergeneratortest.cpp    |   65 +-
 .../randrandomnumbergeneratortest.cpp         |   24 +-
 src/xmpp/blake2/blake2-impl.h                 |  153 +-
 src/xmpp/blake2/blake2.h                      |  216 +-
 src/xmpp/blake2/blake2qt.cpp                  |    8 +-
 src/xmpp/blake2/blake2qt.h                    |    5 +-
 src/xmpp/jid/jid.cpp                          |  345 +--
 src/xmpp/jid/jid.h                            |  140 +-
 src/xmpp/jid/unittest/jidtest.cpp             |   22 +-
 .../qttestutil/example/myfirstclasstest.cpp   |   20 +-
 .../qttestutil/example/mysecondclasstest.cpp  |   20 +-
 src/xmpp/qa/qttestutil/qttestutil.h           |    3 +-
 src/xmpp/qa/qttestutil/simplechecker.cpp      |    2 +-
 src/xmpp/qa/qttestutil/testregistration.h     |   35 +-
 src/xmpp/qa/qttestutil/testregistry.cpp       |   13 +-
 src/xmpp/qa/qttestutil/testregistry.h         |   59 +-
 src/xmpp/qa/unittest.template/myclasstest.cpp |   22 +-
 src/xmpp/sasl/digestmd5proplist.cpp           |   66 +-
 src/xmpp/sasl/digestmd5proplist.h             |   28 +-
 src/xmpp/sasl/digestmd5response.cpp           |   43 +-
 src/xmpp/sasl/digestmd5response.h             |   43 +-
 src/xmpp/sasl/plainmessage.cpp                |    2 +-
 src/xmpp/sasl/plainmessage.h                  |   17 +-
 src/xmpp/sasl/scramsha1message.cpp            |   18 +-
 src/xmpp/sasl/scramsha1message.h              |   30 +-
 src/xmpp/sasl/scramsha1response.cpp           |   39 +-
 src/xmpp/sasl/scramsha1response.h             |   54 +-
 src/xmpp/sasl/scramsha1signature.cpp          |   12 +-
 src/xmpp/sasl/scramsha1signature.h            |   17 +-
 .../sasl/unittest/digestmd5responsetest.cpp   |   83 +-
 src/xmpp/sasl/unittest/plainmessagetest.cpp   |   43 +-
 .../sasl/unittest/scramsha1messagetest.cpp    |   37 +-
 .../sasl/unittest/scramsha1responsetest.cpp   |   48 +-
 src/xmpp/xmpp-core/compressionhandler.cpp     |   26 +-
 src/xmpp/xmpp-core/compressionhandler.h       |   19 +-
 src/xmpp/xmpp-core/connector.cpp              |  273 +-
 src/xmpp/xmpp-core/parser.cpp                 |  660 ++--
 src/xmpp/xmpp-core/parser.h                   |   85 +-
 src/xmpp/xmpp-core/protocol.cpp               | 1075 +++----
 src/xmpp/xmpp-core/protocol.h                 |  667 ++--
 src/xmpp/xmpp-core/securestream.cpp           |  270 +-
 src/xmpp/xmpp-core/securestream.h             |   23 +-
 src/xmpp/xmpp-core/simplesasl.cpp             |  318 +-
 src/xmpp/xmpp-core/simplesasl.h               |    4 +-
 src/xmpp/xmpp-core/sm.cpp                     |   31 +-
 src/xmpp/xmpp-core/sm.h                       |  104 +-
 src/xmpp/xmpp-core/stream.cpp                 | 1344 ++++----
 src/xmpp/xmpp-core/td.h                       |    3 +-
 src/xmpp/xmpp-core/tlshandler.cpp             |  239 +-
 src/xmpp/xmpp-core/xmlprotocol.cpp            |  334 +-
 src/xmpp/xmpp-core/xmlprotocol.h              |  227 +-
 src/xmpp/xmpp-core/xmpp.h                     |  316 +-
 src/xmpp/xmpp-core/xmpp_clientstream.h        |  377 ++-
 src/xmpp/xmpp-core/xmpp_stanza.cpp            |  447 ++-
 src/xmpp/xmpp-core/xmpp_stanza.h              |  192 +-
 src/xmpp/xmpp-core/xmpp_stream.h              |   81 +-
 src/xmpp/xmpp-im/client.cpp                   |  782 ++---
 src/xmpp/xmpp-im/filetransfer.cpp             |  476 ++-
 src/xmpp/xmpp-im/filetransfer.h               |  313 +-
 src/xmpp/xmpp-im/httpfileupload.cpp           |  438 ++-
 src/xmpp/xmpp-im/httpfileupload.h             |   64 +-
 src/xmpp/xmpp-im/im.h                         |  143 +-
 src/xmpp/xmpp-im/jingle-ft.cpp                | 1635 +++++-----
 src/xmpp/xmpp-im/jingle-ibb.cpp               |  733 +++--
 src/xmpp/xmpp-im/jingle-ibb.h                 |  149 +-
 src/xmpp/xmpp-im/jingle-s5b.cpp               | 2723 ++++++++---------
 src/xmpp/xmpp-im/jingle-s5b.h                 |  354 ++-
 src/xmpp/xmpp-im/jingle.h                     | 1063 ++++---
 src/xmpp/xmpp-im/s5b.cpp                      | 1245 ++++----
 src/xmpp/xmpp-im/s5b.h                        |  605 ++--
 src/xmpp/xmpp-im/types.cpp                    | 1558 ++--------
 src/xmpp/xmpp-im/xmpp_address.h               |   53 +-
 src/xmpp/xmpp-im/xmpp_agentitem.h             |   43 +-
 src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp        |   93 +-
 src/xmpp/xmpp-im/xmpp_bitsofbinary.h          |    5 +-
 src/xmpp/xmpp-im/xmpp_bytestream.cpp          |   19 +-
 src/xmpp/xmpp-im/xmpp_bytestream.h            |   56 +-
 src/xmpp/xmpp-im/xmpp_caps.cpp                |  148 +-
 src/xmpp/xmpp-im/xmpp_caps.h                  |   74 +-
 src/xmpp/xmpp-im/xmpp_captcha.h               |   59 +-
 src/xmpp/xmpp-im/xmpp_chatstate.h             |    9 +-
 src/xmpp/xmpp-im/xmpp_client.h                |  381 +--
 src/xmpp/xmpp-im/xmpp_discoinfotask.cpp       |   67 +-
 src/xmpp/xmpp-im/xmpp_discoinfotask.h         |   47 +-
 src/xmpp/xmpp-im/xmpp_discoitem.cpp           |  191 +-
 src/xmpp/xmpp-im/xmpp_discoitem.h             |  107 +-
 src/xmpp/xmpp-im/xmpp_encryptionhandler.h     |   13 +-
 src/xmpp/xmpp-im/xmpp_features.cpp            |  133 +-
 src/xmpp/xmpp-im/xmpp_features.h              |  158 +-
 src/xmpp/xmpp-im/xmpp_hash.h                  |   15 +-
 src/xmpp/xmpp-im/xmpp_htmlelement.h           |   35 +-
 src/xmpp/xmpp-im/xmpp_httpauthrequest.h       |   50 +-
 src/xmpp/xmpp-im/xmpp_ibb.cpp                 |  335 +-
 src/xmpp/xmpp-im/xmpp_ibb.h                   |  270 +-
 src/xmpp/xmpp-im/xmpp_liveroster.h            |   19 +-
 src/xmpp/xmpp-im/xmpp_liverosteritem.h        |   55 +-
 src/xmpp/xmpp-im/xmpp_message.h               |  399 ++-
 src/xmpp/xmpp-im/xmpp_muc.h                   |  202 +-
 src/xmpp/xmpp-im/xmpp_pubsubitem.h            |   21 +-
 src/xmpp/xmpp-im/xmpp_pubsubretraction.h      |   17 +-
 src/xmpp/xmpp-im/xmpp_receipts.h              |    6 +-
 src/xmpp/xmpp-im/xmpp_reference.cpp           |  114 +-
 src/xmpp/xmpp-im/xmpp_reference.h             |   72 +-
 src/xmpp/xmpp-im/xmpp_resource.h              |   31 +-
 src/xmpp/xmpp-im/xmpp_resourcelist.h          |   23 +-
 src/xmpp/xmpp-im/xmpp_roster.h                |   23 +-
 src/xmpp/xmpp-im/xmpp_rosteritem.h            |   84 +-
 src/xmpp/xmpp-im/xmpp_rosterx.h               |   50 +-
 src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp   |  109 +-
 src/xmpp/xmpp-im/xmpp_serverinfomanager.h     |   86 +-
 src/xmpp/xmpp-im/xmpp_status.h                |    8 +-
 src/xmpp/xmpp-im/xmpp_subsets.cpp             |   81 +-
 src/xmpp/xmpp-im/xmpp_subsets.h               |   55 +-
 src/xmpp/xmpp-im/xmpp_task.cpp                |  194 +-
 src/xmpp/xmpp-im/xmpp_task.h                  |  109 +-
 src/xmpp/xmpp-im/xmpp_tasks.cpp               |  396 +--
 src/xmpp/xmpp-im/xmpp_tasks.h                 |  853 +++---
 src/xmpp/xmpp-im/xmpp_thumbs.h                |   36 +-
 src/xmpp/xmpp-im/xmpp_url.h                   |   39 +-
 src/xmpp/xmpp-im/xmpp_vcard.cpp               | 1090 +++----
 src/xmpp/xmpp-im/xmpp_vcard.h                 |  422 ++-
 src/xmpp/xmpp-im/xmpp_xdata.cpp               |  361 +--
 src/xmpp/xmpp-im/xmpp_xdata.h                 |  246 +-
 src/xmpp/xmpp-im/xmpp_xmlcommon.cpp           |   80 +-
 src/xmpp/xmpp-im/xmpp_xmlcommon.h             |    9 +-
 src/xmpp/zlib/common.h                        |   24 +-
 src/xmpp/zlib/zlibcompressor.cpp              |   29 +-
 src/xmpp/zlib/zlibcompressor.h                |   15 +-
 src/xmpp/zlib/zlibdecompressor.cpp            |   34 +-
 src/xmpp/zlib/zlibdecompressor.h              |   15 +-
 tools/icetunnel/main.cpp                      |  477 ++-
 tools/nettool/main.cpp                        |  668 ++--
 tools/xmpptest/xmpptest.cpp                   |  556 ++--
 206 files changed, 18888 insertions(+), 25306 deletions(-)

diff --git a/src/irisnet/appledns/appledns.cpp b/src/irisnet/appledns/appledns.cpp
index e08d8e66..33fdd5e6 100644
--- a/src/irisnet/appledns/appledns.cpp
+++ b/src/irisnet/appledns/appledns.cpp
@@ -22,19 +22,18 @@
 #include <QtCore>
 #include <QtNetwork>
 #ifdef Q_OS_WIN // for ntohl
-# include <windows.h>
+#include <windows.h>
 #else
-# include <netinet/in.h>
+#include <netinet/in.h>
 #endif
 
 static QByteArray nameToDottedString(const QByteArray &in)
 {
     QByteArray out;
-    int at = 0;
-    while(at < in.size())
-    {
+    int        at = 0;
+    while (at < in.size()) {
         int len = in[at++];
-        if(len > 0)
+        if (len > 0)
             out += in.mid(at, len);
         out += '.';
         at += len;
@@ -42,21 +41,17 @@ static QByteArray nameToDottedString(const QByteArray &in)
     return out;
 }
 
-static QMap<QString,QByteArray> textsToAttribs(const QList<QByteArray> &texts)
+static QMap<QString, QByteArray> textsToAttribs(const QList<QByteArray> &texts)
 {
-    QMap<QString,QByteArray> out;
-    foreach(const QByteArray &a, texts)
-    {
-        QString key;
+    QMap<QString, QByteArray> out;
+    foreach (const QByteArray &a, texts) {
+        QString    key;
         QByteArray value;
-        int x = a.indexOf('=');
-        if(x != -1)
-        {
-            key = QString::fromLatin1(a.mid(0, x));
+        int        x = a.indexOf('=');
+        if (x != -1) {
+            key   = QString::fromLatin1(a.mid(0, x));
             value = a.mid(x + 1);
-        }
-        else
-        {
+        } else {
             key = QString::fromLatin1(a);
         }
 
@@ -65,12 +60,11 @@ static QMap<QString,QByteArray> textsToAttribs(const QList<QByteArray> &texts)
     return out;
 }
 
-static QByteArray attribsToTxtRecord(const QMap<QString,QByteArray> &attribs)
+static QByteArray attribsToTxtRecord(const QMap<QString, QByteArray> &attribs)
 {
-    QList<QByteArray> texts;
-    QMapIterator<QString,QByteArray> it(attribs);
-    while(it.hasNext())
-    {
+    QList<QByteArray>                 texts;
+    QMapIterator<QString, QByteArray> it(attribs);
+    while (it.hasNext()) {
         it.next();
         QByteArray line = it.key().toLatin1() + '=' + it.value();
         texts += line;
@@ -82,14 +76,14 @@ static QByteArray attribsToTxtRecord(const QMap<QString,QByteArray> &attribs)
 static QList<QByteArray> nameToInstanceParts(const QByteArray &name)
 {
     // FIXME: improve this parsing...  (what about escaping??)
-    int at = name.indexOf('.');
+    int        at    = name.indexOf('.');
     QByteArray sname = name.mid(0, at);
     ++at;
     int next = name.indexOf('.', at);
     ++next;
-    next = name.indexOf('.', next);
-    QByteArray stype = name.mid(at, next - at);
-    at = next + 1;
+    next               = name.indexOf('.', next);
+    QByteArray stype   = name.mid(at, next - at);
+    at                 = next + 1;
     QByteArray sdomain = name.mid(at);
 
     QList<QByteArray> out;
@@ -102,46 +96,40 @@ static QList<QByteArray> nameToInstanceParts(const QByteArray &name)
 static XMPP::NameRecord importQDnsSdRecord(const QDnsSd::Record &in)
 {
     XMPP::NameRecord out;
-    switch(in.rrtype)
+    switch (in.rrtype) {
+    case 1: // A
     {
-        case 1: // A
-        {
-            quint32 *p = (quint32 *)in.rdata.data();
-            out.setAddress(QHostAddress(ntohl(*p)));
-        }
-        break;
-
-        case 28: // AAAA
-        {
-            out.setAddress(QHostAddress((quint8 *)in.rdata.data()));
-        }
-        break;
+        quint32 *p = (quint32 *)in.rdata.data();
+        out.setAddress(QHostAddress(ntohl(*p)));
+    } break;
 
-        case 12: // PTR
-        {
-            out.setPtr(nameToDottedString(in.rdata));
-        }
-        break;
+    case 28: // AAAA
+    {
+        out.setAddress(QHostAddress((quint8 *)in.rdata.data()));
+    } break;
 
-        case 10: // NULL
-        {
-            out.setNull(in.rdata);
-        }
-        break;
+    case 12: // PTR
+    {
+        out.setPtr(nameToDottedString(in.rdata));
+    } break;
 
-        case 16: // TXT
-        {
-            QList<QByteArray> txtEntries = QDnsSd::parseTxtRecord(in.rdata);
-            if(txtEntries.isEmpty())
-                return out;
-            out.setTxt(txtEntries);
-        }
-        break;
+    case 10: // NULL
+    {
+        out.setNull(in.rdata);
+    } break;
 
-        default: // unsupported
-        {
+    case 16: // TXT
+    {
+        QList<QByteArray> txtEntries = QDnsSd::parseTxtRecord(in.rdata);
+        if (txtEntries.isEmpty())
             return out;
-        }
+        out.setTxt(txtEntries);
+    } break;
+
+    default: // unsupported
+    {
+        return out;
+    }
     }
 
     out.setOwner(in.name);
@@ -150,12 +138,9 @@ static XMPP::NameRecord importQDnsSdRecord(const QDnsSd::Record &in)
 }
 
 namespace {
-class QDnsSdDelegate
-{
+class QDnsSdDelegate {
 public:
-    virtual ~QDnsSdDelegate()
-    {
-    }
+    virtual ~QDnsSdDelegate() {}
 
     virtual void dns_queryResult(int id, const QDnsSd::QueryResult &result)
     {
@@ -182,32 +167,26 @@ class QDnsSdDelegate
     }
 };
 
-class IdManager
-{
+class IdManager {
 private:
     QSet<int> set;
-    int at;
+    int       at;
 
     inline void bump_at()
     {
-        if(at == 0x7fffffff)
+        if (at == 0x7fffffff)
             at = 0;
         else
             ++at;
     }
 
 public:
-    IdManager() :
-        at(0)
-    {
-    }
+    IdManager() : at(0) {}
 
     int reserveId()
     {
-        while(1)
-        {
-            if(!set.contains(at))
-            {
+        while (1) {
+            if (!set.contains(at)) {
                 int id = at;
                 set.insert(id);
                 bump_at();
@@ -218,10 +197,7 @@ class IdManager
         }
     }
 
-    void releaseId(int id)
-    {
-        set.remove(id);
-    }
+    void releaseId(int id) { set.remove(id); }
 };
 
 } // namespace
@@ -229,51 +205,54 @@ class IdManager
 //----------------------------------------------------------------------------
 // AppleProvider
 //----------------------------------------------------------------------------
-class AppleProvider : public XMPP::IrisNetProvider
-{
+class AppleProvider : public XMPP::IrisNetProvider {
     Q_OBJECT
     Q_INTERFACES(XMPP::IrisNetProvider);
+
 public:
-    QDnsSd dns;
-    QHash<int,QDnsSdDelegate*> delegateById;
+    QDnsSd                       dns;
+    QHash<int, QDnsSdDelegate *> delegateById;
 
-    AppleProvider() :
-        dns(this)
+    AppleProvider() : dns(this)
     {
-        connect(&dns, SIGNAL(queryResult(int,QDnsSd::QueryResult)), SLOT(dns_queryResult(int,QDnsSd::QueryResult)));
-        connect(&dns, SIGNAL(browseResult(int,QDnsSd::BrowseResult)), SLOT(dns_browseResult(int,QDnsSd::BrowseResult)));
-        connect(&dns, SIGNAL(resolveResult(int,QDnsSd::ResolveResult)), SLOT(dns_resolveResult(int,QDnsSd::ResolveResult)));
-        connect(&dns, SIGNAL(regResult(int,QDnsSd::RegResult)), SLOT(dns_regResult(int,QDnsSd::RegResult)));
+        connect(&dns, SIGNAL(queryResult(int, QDnsSd::QueryResult)), SLOT(dns_queryResult(int, QDnsSd::QueryResult)));
+        connect(&dns, SIGNAL(browseResult(int, QDnsSd::BrowseResult)),
+                SLOT(dns_browseResult(int, QDnsSd::BrowseResult)));
+        connect(&dns, SIGNAL(resolveResult(int, QDnsSd::ResolveResult)),
+                SLOT(dns_resolveResult(int, QDnsSd::ResolveResult)));
+        connect(&dns, SIGNAL(regResult(int, QDnsSd::RegResult)), SLOT(dns_regResult(int, QDnsSd::RegResult)));
     }
 
-    virtual XMPP::NameProvider *createNameProviderInternet();
-    virtual XMPP::NameProvider *createNameProviderLocal();
+    virtual XMPP::NameProvider *   createNameProviderInternet();
+    virtual XMPP::NameProvider *   createNameProviderLocal();
     virtual XMPP::ServiceProvider *createServiceProvider();
 
     int query(QDnsSdDelegate *p, const QByteArray &name, int qType)
     {
-        int id = dns.query(name, qType);
+        int id           = dns.query(name, qType);
         delegateById[id] = p;
         return id;
     }
 
     int browse(QDnsSdDelegate *p, const QByteArray &serviceType, const QByteArray &domain)
     {
-        int id = dns.browse(serviceType, domain);
+        int id           = dns.browse(serviceType, domain);
         delegateById[id] = p;
         return id;
     }
 
-    int resolve(QDnsSdDelegate *p, const QByteArray &serviceName, const QByteArray &serviceType, const QByteArray &domain)
+    int resolve(QDnsSdDelegate *p, const QByteArray &serviceName, const QByteArray &serviceType,
+                const QByteArray &domain)
     {
-        int id = dns.resolve(serviceName, serviceType, domain);
+        int id           = dns.resolve(serviceName, serviceType, domain);
         delegateById[id] = p;
         return id;
     }
 
-    int reg(QDnsSdDelegate *p, const QByteArray &serviceName, const QByteArray &serviceType, const QByteArray &domain, int port, const QByteArray &txtRecord)
+    int reg(QDnsSdDelegate *p, const QByteArray &serviceName, const QByteArray &serviceType, const QByteArray &domain,
+            int port, const QByteArray &txtRecord)
     {
-        int id = dns.reg(serviceName, serviceType, domain, port, txtRecord);
+        int id           = dns.reg(serviceName, serviceType, domain, port, txtRecord);
         delegateById[id] = p;
         return id;
     }
@@ -286,23 +265,19 @@ class AppleProvider : public XMPP::IrisNetProvider
 
     void stop_all(QDnsSdDelegate *p)
     {
-        QList<int> ids;
-        QHashIterator<int,QDnsSdDelegate*> it(delegateById);
-        while(it.hasNext())
-        {
+        QList<int>                           ids;
+        QHashIterator<int, QDnsSdDelegate *> it(delegateById);
+        while (it.hasNext()) {
             it.next();
-            if(it.value() == p)
+            if (it.value() == p)
                 ids += it.key();
         }
-        foreach(int id, ids)
+        foreach (int id, ids)
             stop(id);
     }
 
 private slots:
-    void dns_queryResult(int id, const QDnsSd::QueryResult &result)
-    {
-        delegateById[id]->dns_queryResult(id, result);
-    }
+    void dns_queryResult(int id, const QDnsSd::QueryResult &result) { delegateById[id]->dns_queryResult(id, result); }
 
     void dns_browseResult(int id, const QDnsSd::BrowseResult &result)
     {
@@ -314,10 +289,7 @@ private slots:
         delegateById[id]->dns_resolveResult(id, result);
     }
 
-    void dns_regResult(int id, const QDnsSd::RegResult &result)
-    {
-        delegateById[id]->dns_regResult(id, result);
-    }
+    void dns_regResult(int id, const QDnsSd::RegResult &result) { delegateById[id]->dns_regResult(id, result); }
 };
 
 //----------------------------------------------------------------------------
@@ -325,27 +297,20 @@ private slots:
 //----------------------------------------------------------------------------
 // only use this class for a single browse.  if you want to browse again,
 //   create a new object.
-class AppleBrowse : public QObject, public QDnsSdDelegate
-{
+class AppleBrowse : public QObject, public QDnsSdDelegate {
     Q_OBJECT
 public:
-    AppleProvider *global;
-    int browse_id;
+    AppleProvider *              global;
+    int                          browse_id;
     QList<XMPP::ServiceInstance> instances;
-    QHash<int,QByteArray> pendingByQueryId; // waiting for TXT
+    QHash<int, QByteArray>       pendingByQueryId; // waiting for TXT
 
-    AppleBrowse(AppleProvider *_global, QObject *parent = 0) :
-        QObject(parent),
-        global(_global),
-        browse_id(-1)
+    AppleBrowse(AppleProvider *_global, QObject *parent = 0) : QObject(parent), global(_global), browse_id(-1)
     {
         connect(this, SIGNAL(unavailable_p(XMPP::ServiceInstance)), SIGNAL(unavailable(XMPP::ServiceInstance)));
     }
 
-    ~AppleBrowse()
-    {
-        global->stop_all(this);
-    }
+    ~AppleBrowse() { global->stop_all(this); }
 
     void browse(const QString &type, const QString &domain)
     {
@@ -365,30 +330,24 @@ class AppleBrowse : public QObject, public QDnsSdDelegate
     {
         Q_UNUSED(id);
 
-        if(!result.success)
-        {
+        if (!result.success) {
             emit error();
             return;
         }
 
-        foreach(const QDnsSd::BrowseEntry &e, result.entries)
-        {
-            XMPP::ServiceInstance si(e.serviceName, e.serviceType, e.replyDomain, QMap<QString,QByteArray>());
+        foreach (const QDnsSd::BrowseEntry &e, result.entries) {
+            XMPP::ServiceInstance si(e.serviceName, e.serviceType, e.replyDomain, QMap<QString, QByteArray>());
 
-            if(e.added)
-            {
-                int query_id = global->query(this, si.name(), 16); // 16 == TXT
+            if (e.added) {
+                int query_id               = global->query(this, si.name(), 16); // 16 == TXT
                 pendingByQueryId[query_id] = si.name();
-            }
-            else // removed
+            } else // removed
             {
                 // emit these queued for SS.  no worry of SR since
                 //   the browse operation is not cancellable.
-                for(int n = 0; n < instances.count(); ++n)
-                {
+                for (int n = 0; n < instances.count(); ++n) {
                     const XMPP::ServiceInstance &i = instances[n];
-                    if(i.name() == si.name())
-                    {
+                    if (i.name() == si.name()) {
                         emit unavailable_p(i);
                         instances.removeAt(n);
                         --n; // adjust position
@@ -400,8 +359,7 @@ class AppleBrowse : public QObject, public QDnsSdDelegate
 
     virtual void dns_queryResult(int id, const QDnsSd::QueryResult &result)
     {
-        if(!result.success)
-        {
+        if (!result.success) {
             // if we get here, then it means we received a browse
             //   entry, but could not fetch its TXT record.  if
             //   that happens, cancel the query and drop the
@@ -415,14 +373,13 @@ class AppleBrowse : public QObject, public QDnsSdDelegate
         Q_ASSERT(!result.records.isEmpty());
 
         // only the first entry matters, and it must be an added TXT
-        if(!result.records[0].added || result.records[0].rrtype != 16)
+        if (!result.records[0].added || result.records[0].rrtype != 16)
             return;
 
         // we only care about one answer
-        QByteArray name = pendingByQueryId[id];
+        QByteArray        name  = pendingByQueryId[id];
         QList<QByteArray> parts = nameToInstanceParts(name);
-        if(parts.isEmpty())
-        {
+        if (parts.isEmpty()) {
             // TODO: error
             Q_ASSERT(0);
         }
@@ -433,19 +390,18 @@ class AppleBrowse : public QObject, public QDnsSdDelegate
         XMPP::NameRecord rec = importQDnsSdRecord(result.records[0]);
 
         // bad answer?
-        if(rec.isNull())
+        if (rec.isNull())
             return;
 
-        QMap<QString,QByteArray> attribs = textsToAttribs(rec.texts());
+        QMap<QString, QByteArray> attribs = textsToAttribs(rec.texts());
         // FIXME: conversion/escaping?
-        XMPP::ServiceInstance si(QString::fromUtf8(parts[0]), QString::fromUtf8(parts[1]), QString::fromUtf8(parts[2]), attribs);
+        XMPP::ServiceInstance si(QString::fromUtf8(parts[0]), QString::fromUtf8(parts[1]), QString::fromUtf8(parts[2]),
+                                 attribs);
 
         // does qdnssd guarantee we won't receive dups?
         bool found = false;
-        foreach(const XMPP::ServiceInstance &i, instances)
-        {
-            if(i.name() == si.name())
-            {
+        foreach (const XMPP::ServiceInstance &i, instances) {
+            if (i.name() == si.name()) {
                 found = true;
                 break;
             }
@@ -462,50 +418,39 @@ class AppleBrowse : public QObject, public QDnsSdDelegate
 //----------------------------------------------------------------------------
 // only use this class for a single lookup.  if you want to lookup again,
 //   create a new object.
-class AppleBrowseLookup : public QObject, public QDnsSdDelegate
-{
+class AppleBrowseLookup : public QObject, public QDnsSdDelegate {
     Q_OBJECT
 public:
-    AppleProvider *global;
-    int resolve_id;
+    AppleProvider *    global;
+    int                resolve_id;
     XMPP::NameResolver nameResolverAaaa;
     XMPP::NameResolver nameResolverA;
-    bool activeAaaa;
-    bool activeA;
-    QTimer waitTimer;
-    QByteArray host;
-    QHostAddress addr4;
-    QHostAddress addr6;
-    int port;
+    bool               activeAaaa;
+    bool               activeA;
+    QTimer             waitTimer;
+    QByteArray         host;
+    QHostAddress       addr4;
+    QHostAddress       addr6;
+    int                port;
 
     AppleBrowseLookup(AppleProvider *_global, QObject *parent = 0) :
-        QObject(parent),
-        global(_global),
-        resolve_id(-1),
-        nameResolverAaaa(this),
-        nameResolverA(this),
-        activeAaaa(false),
-        activeA(false),
-        waitTimer(this)
+        QObject(parent), global(_global), resolve_id(-1), nameResolverAaaa(this), nameResolverA(this),
+        activeAaaa(false), activeA(false), waitTimer(this)
     {
         connect(&nameResolverAaaa, SIGNAL(resultsReady(QList<XMPP::NameRecord>)),
-            SLOT(nameAaaa_resultsReady(QList<XMPP::NameRecord>)));
+                SLOT(nameAaaa_resultsReady(QList<XMPP::NameRecord>)));
         connect(&nameResolverAaaa, SIGNAL(error(XMPP::NameResolver::Error)),
-            SLOT(nameAaaa_error(XMPP::NameResolver::Error)));
+                SLOT(nameAaaa_error(XMPP::NameResolver::Error)));
 
         connect(&nameResolverA, SIGNAL(resultsReady(QList<XMPP::NameRecord>)),
-            SLOT(nameA_resultsReady(QList<XMPP::NameRecord>)));
-        connect(&nameResolverA, SIGNAL(error(XMPP::NameResolver::Error)),
-            SLOT(nameA_error(XMPP::NameResolver::Error)));
+                SLOT(nameA_resultsReady(QList<XMPP::NameRecord>)));
+        connect(&nameResolverA, SIGNAL(error(XMPP::NameResolver::Error)), SLOT(nameA_error(XMPP::NameResolver::Error)));
 
         connect(&waitTimer, SIGNAL(timeout()), SLOT(waitTimer_timeout()));
         waitTimer.setSingleShot(true);
     }
 
-    ~AppleBrowseLookup()
-    {
-        global->stop_all(this);
-    }
+    ~AppleBrowseLookup() { global->stop_all(this); }
 
     void resolve(const QByteArray &instance, const QByteArray &type, const QByteArray &domain)
     {
@@ -523,8 +468,7 @@ class AppleBrowseLookup : public QObject, public QDnsSdDelegate
         // there is only one response, so deregister
         global->stop(id);
 
-        if(!result.success)
-        {
+        if (!result.success) {
             emit error();
             return;
         }
@@ -533,7 +477,7 @@ class AppleBrowseLookup : public QObject, public QDnsSdDelegate
         port = result.port;
 
         activeAaaa = true;
-        activeA = true;
+        activeA    = true;
         nameResolverAaaa.start(host, XMPP::NameRecord::Aaaa);
         nameResolverA.start(host, XMPP::NameRecord::A);
         waitTimer.start(500); // 500ms cut-off time, take what we have and run
@@ -544,7 +488,7 @@ private slots:
     {
         // nameresolver guarantees at least one result, and we only
         //   care about the first
-        addr6 = results[0].address();
+        addr6      = results[0].address();
         activeAaaa = false;
         tryDone();
     }
@@ -560,7 +504,7 @@ private slots:
     {
         // nameresolver guarantees at least one result, and we only
         //   care about the first
-        addr4 = results[0].address();
+        addr4   = results[0].address();
         activeA = false;
         tryDone();
     }
@@ -572,10 +516,7 @@ private slots:
         tryDone();
     }
 
-    void waitTimer_timeout()
-    {
-        tryDone();
-    }
+    void waitTimer_timeout() { tryDone(); }
 
 private:
     void tryDone()
@@ -584,8 +525,7 @@ private slots:
         //   results, or if the wait timer ends and we have at least
         //   one result
 
-        if(!activeAaaa && !activeA && addr6.isNull() && addr4.isNull())
-        {
+        if (!activeAaaa && !activeA && addr6.isNull() && addr4.isNull()) {
             nameResolverAaaa.stop();
             nameResolverA.stop();
             waitTimer.stop();
@@ -594,15 +534,14 @@ private slots:
             return;
         }
 
-        if(!waitTimer.isActive() && (!addr6.isNull() || !addr4.isNull()))
-        {
+        if (!waitTimer.isActive() && (!addr6.isNull() || !addr4.isNull())) {
             nameResolverAaaa.stop();
             nameResolverA.stop();
 
             QList<QHostAddress> out;
-            if(!addr4.isNull())
+            if (!addr4.isNull())
                 out += addr4;
-            if(!addr6.isNull())
+            if (!addr6.isNull())
                 out += addr6;
             emit finished(out, port);
         }
@@ -612,27 +551,16 @@ private slots:
 //----------------------------------------------------------------------------
 // AppleNameProvider
 //----------------------------------------------------------------------------
-class AppleNameProvider : public XMPP::NameProvider, public QDnsSdDelegate
-{
+class AppleNameProvider : public XMPP::NameProvider, public QDnsSdDelegate {
     Q_OBJECT
 public:
     AppleProvider *global;
 
-    AppleNameProvider(AppleProvider *parent) :
-        NameProvider(parent),
-        global(parent)
-    {
-    }
+    AppleNameProvider(AppleProvider *parent) : NameProvider(parent), global(parent) {}
 
-    ~AppleNameProvider()
-    {
-        global->stop_all(this);
-    }
+    ~AppleNameProvider() { global->stop_all(this); }
 
-    virtual bool supportsLongLived() const
-    {
-        return true;
-    }
+    virtual bool supportsLongLived() const { return true; }
 
     virtual bool supportsRecordType(int type) const
     {
@@ -647,31 +575,26 @@ class AppleNameProvider : public XMPP::NameProvider, public QDnsSdDelegate
         return global->query(this, name, qType);
     }
 
-    virtual void resolve_stop(int id)
-    {
-        global->stop(id);
-    }
+    virtual void resolve_stop(int id) { global->stop(id); }
 
 protected:
     virtual void dns_queryResult(int id, const QDnsSd::QueryResult &result)
     {
-        if(!result.success)
-        {
+        if (!result.success) {
             emit resolve_error(id, XMPP::NameResolver::ErrorGeneric);
             return;
         }
 
         QList<XMPP::NameRecord> results;
-        foreach(const QDnsSd::Record &rec, result.records)
-        {
+        foreach (const QDnsSd::Record &rec, result.records) {
             XMPP::NameRecord nr = importQDnsSdRecord(rec);
 
             // unsupported type
-            if(nr.isNull())
+            if (nr.isNull())
                 continue;
 
             // if removed, ensure ttl is 0
-            if(!rec.added)
+            if (!rec.added)
                 nr.setTtl(0);
 
             results += nr;
@@ -684,23 +607,16 @@ class AppleNameProvider : public XMPP::NameProvider, public QDnsSdDelegate
 //----------------------------------------------------------------------------
 // AppleServiceProvider
 //----------------------------------------------------------------------------
-class AppleServiceProvider : public XMPP::ServiceProvider, public QDnsSdDelegate
-{
+class AppleServiceProvider : public XMPP::ServiceProvider, public QDnsSdDelegate {
     Q_OBJECT
 public:
-    class Browse
-    {
+    class Browse {
     public:
         AppleServiceProvider *parent;
-        int id;
-        AppleBrowse *browse;
+        int                   id;
+        AppleBrowse *         browse;
 
-        Browse(AppleServiceProvider *_parent) :
-            parent(_parent),
-            id(-1),
-            browse(0)
-        {
-        }
+        Browse(AppleServiceProvider *_parent) : parent(_parent), id(-1), browse(0) {}
 
         ~Browse()
         {
@@ -709,19 +625,13 @@ class AppleServiceProvider : public XMPP::ServiceProvider, public QDnsSdDelegate
         }
     };
 
-    class Resolve
-    {
+    class Resolve {
     public:
         AppleServiceProvider *parent;
-        int id;
-        AppleBrowseLookup *resolve;
+        int                   id;
+        AppleBrowseLookup *   resolve;
 
-        Resolve(AppleServiceProvider *_parent) :
-            parent(_parent),
-            id(-1),
-            resolve(0)
-        {
-        }
+        Resolve(AppleServiceProvider *_parent) : parent(_parent), id(-1), resolve(0) {}
 
         ~Resolve()
         {
@@ -730,16 +640,12 @@ class AppleServiceProvider : public XMPP::ServiceProvider, public QDnsSdDelegate
         }
     };
 
-    AppleProvider *global;
-    QList<Browse*> browseList;
-    QList<Resolve*> resolveList;
-    IdManager idManager;
+    AppleProvider *  global;
+    QList<Browse *>  browseList;
+    QList<Resolve *> resolveList;
+    IdManager        idManager;
 
-    AppleServiceProvider(AppleProvider *parent) :
-        ServiceProvider(parent),
-        global(parent)
-    {
-    }
+    AppleServiceProvider(AppleProvider *parent) : ServiceProvider(parent), global(parent) {}
 
     ~AppleServiceProvider()
     {
@@ -750,9 +656,8 @@ class AppleServiceProvider : public XMPP::ServiceProvider, public QDnsSdDelegate
 
     int indexOfBrowseByBrowse(AppleBrowse *browse) const
     {
-        for(int n = 0; n < browseList.count(); ++n)
-        {
-            if(browseList[n]->browse == browse)
+        for (int n = 0; n < browseList.count(); ++n) {
+            if (browseList[n]->browse == browse)
                 return n;
         }
         return -1;
@@ -760,9 +665,8 @@ class AppleServiceProvider : public XMPP::ServiceProvider, public QDnsSdDelegate
 
     int indexOfBrowseById(int id) const
     {
-        for(int n = 0; n < browseList.count(); ++n)
-        {
-            if(browseList[n]->id == id)
+        for (int n = 0; n < browseList.count(); ++n) {
+            if (browseList[n]->id == id)
                 return n;
         }
         return -1;
@@ -770,9 +674,8 @@ class AppleServiceProvider : public XMPP::ServiceProvider, public QDnsSdDelegate
 
     int indexOfResolveByResolve(AppleBrowseLookup *resolve) const
     {
-        for(int n = 0; n < resolveList.count(); ++n)
-        {
-            if(resolveList[n]->resolve == resolve)
+        for (int n = 0; n < resolveList.count(); ++n) {
+            if (resolveList[n]->resolve == resolve)
                 return n;
         }
         return -1;
@@ -780,9 +683,8 @@ class AppleServiceProvider : public XMPP::ServiceProvider, public QDnsSdDelegate
 
     int indexOfResolveById(int id) const
     {
-        for(int n = 0; n < resolveList.count(); ++n)
-        {
-            if(resolveList[n]->id == id)
+        for (int n = 0; n < resolveList.count(); ++n) {
+            if (resolveList[n]->id == id)
                 return n;
         }
         return -1;
@@ -791,7 +693,7 @@ class AppleServiceProvider : public XMPP::ServiceProvider, public QDnsSdDelegate
     virtual int browse_start(const QString &type, const QString &domain)
     {
         Browse *b = new Browse(this);
-        b->id = idManager.reserveId();
+        b->id     = idManager.reserveId();
         b->browse = new AppleBrowse(global, this);
         connect(b->browse, SIGNAL(available(XMPP::ServiceInstance)), SLOT(browse_available(XMPP::ServiceInstance)));
         connect(b->browse, SIGNAL(unavailable(XMPP::ServiceInstance)), SLOT(browse_unavailable(XMPP::ServiceInstance)));
@@ -804,7 +706,7 @@ class AppleServiceProvider : public XMPP::ServiceProvider, public QDnsSdDelegate
     virtual void browse_stop(int id)
     {
         int at = indexOfBrowseById(id);
-        if(at == -1)
+        if (at == -1)
             return;
 
         Browse *b = browseList[at];
@@ -815,14 +717,13 @@ class AppleServiceProvider : public XMPP::ServiceProvider, public QDnsSdDelegate
     virtual int resolve_start(const QByteArray &name)
     {
         QList<QByteArray> parts = nameToInstanceParts(name);
-        if(parts.isEmpty())
-        {
+        if (parts.isEmpty()) {
             // TODO: signal error rather than die
             Q_ASSERT(0);
         }
 
         Resolve *r = new Resolve(this);
-        r->id = idManager.reserveId();
+        r->id      = idManager.reserveId();
         r->resolve = new AppleBrowseLookup(global, this);
         connect(r->resolve, SIGNAL(finished(QList<QHostAddress>)), SLOT(resolve_finished(QList<QHostAddress>)));
         connect(r->resolve, SIGNAL(error()), SLOT(resolve_error()));
@@ -834,7 +735,7 @@ class AppleServiceProvider : public XMPP::ServiceProvider, public QDnsSdDelegate
     virtual void resolve_stop(int id)
     {
         int at = indexOfResolveById(id);
-        if(at == -1)
+        if (at == -1)
             return;
 
         Resolve *r = resolveList[at];
@@ -842,11 +743,11 @@ class AppleServiceProvider : public XMPP::ServiceProvider, public QDnsSdDelegate
         delete r;
     }
 
-    virtual int publish_start(const QString &instance, const QString &type, int port, const QMap<QString,QByteArray> &attributes)
+    virtual int publish_start(const QString &instance, const QString &type, int port,
+                              const QMap<QString, QByteArray> &attributes)
     {
         QByteArray txtRecord = attribsToTxtRecord(attributes);
-        if(txtRecord.isEmpty())
-        {
+        if (txtRecord.isEmpty()) {
             // TODO: signal error rather than die
             Q_ASSERT(0);
         }
@@ -857,37 +758,30 @@ class AppleServiceProvider : public XMPP::ServiceProvider, public QDnsSdDelegate
         return global->reg(this, instance.toUtf8(), type.toUtf8(), domain.toUtf8(), port, txtRecord);
     }
 
-    virtual void publish_update(int id, const QMap<QString,QByteArray> &attributes)
+    virtual void publish_update(int id, const QMap<QString, QByteArray> &attributes)
     {
         // TODO: verify 'id' is valid.  if not valid, then assert/return (don't do anything or signal error)
 
         QByteArray txtRecord = attribsToTxtRecord(attributes);
-        if(txtRecord.isEmpty())
-        {
+        if (txtRecord.isEmpty()) {
             // TODO: signal error rather than die
             Q_ASSERT(0);
         }
 
-        if(global->dns.recordUpdateTxt(id, txtRecord, 4500))
-        {
+        if (global->dns.recordUpdateTxt(id, txtRecord, 4500)) {
             // FIXME: SR
             QMetaObject::invokeMethod(this, "publish_published", Qt::QueuedConnection, Q_ARG(int, id));
-        }
-        else
-        {
+        } else {
             // TODO: unpublish
 
             // FIXME: register meta type, SR
-            QMetaObject::invokeMethod(this, "publish_error", Qt::QueuedConnection,
-                Q_ARG(int, id),
+            QMetaObject::invokeMethod(
+                this, "publish_error", Qt::QueuedConnection, Q_ARG(int, id),
                 Q_ARG(XMPP::ServiceLocalPublisher::Error, XMPP::ServiceLocalPublisher::ErrorGeneric));
         }
     }
 
-    virtual void publish_stop(int id)
-    {
-        global->stop(id);
-    }
+    virtual void publish_stop(int id) { global->stop(id); }
 
     virtual int publish_extra_start(int pub_id, const XMPP::NameRecord &name)
     {
@@ -962,11 +856,10 @@ private slots:
         delete r;
 
         QList<ResolveResult> results;
-        foreach(const QHostAddress &addr, addrs)
-        {
+        foreach (const QHostAddress &addr, addrs) {
             ResolveResult r;
             r.address = addr;
-            r.port = port;
+            r.port    = port;
             results += r;
         }
 
@@ -990,26 +883,14 @@ private slots:
 };
 
 // AppleProvider
-XMPP::NameProvider *AppleProvider::createNameProviderInternet()
-{
-    return new AppleNameProvider(this);
-}
+XMPP::NameProvider *AppleProvider::createNameProviderInternet() { return new AppleNameProvider(this); }
 
-XMPP::NameProvider *AppleProvider::createNameProviderLocal()
-{
-    return new AppleNameProvider(this);
-}
+XMPP::NameProvider *AppleProvider::createNameProviderLocal() { return new AppleNameProvider(this); }
 
-XMPP::ServiceProvider *AppleProvider::createServiceProvider()
-{
-    return new AppleServiceProvider(this);
-}
+XMPP::ServiceProvider *AppleProvider::createServiceProvider() { return new AppleServiceProvider(this); }
 
 #ifdef APPLEDNS_STATIC
-XMPP::IrisNetProvider *irisnet_createAppleProvider()
-{
-        return new AppleProvider;
-}
+XMPP::IrisNetProvider *irisnet_createAppleProvider() { return new AppleProvider; }
 #else
 Q_EXPORT_PLUGIN2(appledns, AppleProvider)
 #endif
diff --git a/src/irisnet/appledns/qdnssd.cpp b/src/irisnet/appledns/qdnssd.cpp
index 75a0d39f..dda1189c 100644
--- a/src/irisnet/appledns/qdnssd.cpp
+++ b/src/irisnet/appledns/qdnssd.cpp
@@ -23,9 +23,9 @@
 #include <QtCore>
 #include <stdio.h>
 #ifdef Q_OS_WIN // for ntohs
-# include <windows.h>
+#include <windows.h>
 #else
-# include <netinet/in.h>
+#include <netinet/in.h>
 #endif
 
 namespace {
@@ -37,33 +37,28 @@ void releaseAndDeleteLater(QObject *owner, QObject *obj)
     obj->deleteLater();
 }
 
-class SafeTimer : public QObject
-{
+class SafeTimer : public QObject {
     Q_OBJECT
 public:
-    SafeTimer(QObject *parent = 0) :
-        QObject(parent)
+    SafeTimer(QObject *parent = 0) : QObject(parent)
     {
         t = new QTimer(this);
         connect(t, SIGNAL(timeout()), SIGNAL(timeout()));
     }
 
-    ~SafeTimer()
-    {
-        releaseAndDeleteLater(this, t);
-    }
+    ~SafeTimer() { releaseAndDeleteLater(this, t); }
 
-    int interval() const                { return t->interval(); }
-    bool isActive() const               { return t->isActive(); }
-    bool isSingleShot() const           { return t->isSingleShot(); }
-    void setInterval(int msec)          { t->setInterval(msec); }
+    int  interval() const { return t->interval(); }
+    bool isActive() const { return t->isActive(); }
+    bool isSingleShot() const { return t->isSingleShot(); }
+    void setInterval(int msec) { t->setInterval(msec); }
     void setSingleShot(bool singleShot) { t->setSingleShot(singleShot); }
-    int timerId() const                 { return t->timerId(); }
+    int  timerId() const { return t->timerId(); }
 
 public slots:
-    void start(int msec)                { t->start(msec); }
-    void start()                        { t->start(); }
-    void stop()                         { t->stop(); }
+    void start(int msec) { t->start(msec); }
+    void start() { t->start(); }
+    void stop() { t->stop(); }
 
 signals:
     void timeout();
@@ -72,13 +67,10 @@ public slots:
     QTimer *t;
 };
 
-class SafeSocketNotifier : public QObject
-{
+class SafeSocketNotifier : public QObject {
     Q_OBJECT
 public:
-    SafeSocketNotifier(int socket, QSocketNotifier::Type type,
-        QObject *parent = 0) :
-        QObject(parent)
+    SafeSocketNotifier(int socket, QSocketNotifier::Type type, QObject *parent = 0) : QObject(parent)
     {
         sn = new QSocketNotifier(socket, type, this);
         connect(sn, SIGNAL(activated(int)), SIGNAL(activated(int)));
@@ -90,12 +82,12 @@ class SafeSocketNotifier : public QObject
         releaseAndDeleteLater(this, sn);
     }
 
-    bool isEnabled() const             { return sn->isEnabled(); }
-    int socket() const                 { return sn->socket(); }
+    bool                  isEnabled() const { return sn->isEnabled(); }
+    int                   socket() const { return sn->socket(); }
     QSocketNotifier::Type type() const { return sn->type(); }
 
 public slots:
-    void setEnabled(bool enable)       { sn->setEnabled(enable); }
+    void setEnabled(bool enable) { sn->setEnabled(enable); }
 
 signals:
     void activated(int socket);
@@ -111,85 +103,58 @@ public slots:
 //   to maintain a pointer which /can/ be copied.  Also, we'll keep
 //   a flag to indicate whether the allocated DNSServiceRef has been
 //   initialized yet.
-class ServiceRef
-{
+class ServiceRef {
 private:
     DNSServiceRef *_p;
-    bool _initialized;
+    bool           _initialized;
 
 public:
-    ServiceRef() :
-        _initialized(false)
-    {
-        _p = (DNSServiceRef *)malloc(sizeof(DNSServiceRef));
-    }
+    ServiceRef() : _initialized(false) { _p = (DNSServiceRef *)malloc(sizeof(DNSServiceRef)); }
 
     ~ServiceRef()
     {
-        if(_initialized)
+        if (_initialized)
             DNSServiceRefDeallocate(*_p);
         free(_p);
     }
 
-    DNSServiceRef *data()
-    {
-        return _p;
-    }
+    DNSServiceRef *data() { return _p; }
 
-    void setInitialized()
-    {
-        _initialized = true;
-    }
+    void setInitialized() { _initialized = true; }
 };
 
-class RecordRef
-{
+class RecordRef {
 private:
     DNSRecordRef *_p;
 
 public:
-    RecordRef()
-    {
-        _p = (DNSRecordRef *)malloc(sizeof(DNSRecordRef));
-    }
+    RecordRef() { _p = (DNSRecordRef *)malloc(sizeof(DNSRecordRef)); }
 
-    ~RecordRef()
-    {
-        free(_p);
-    }
+    ~RecordRef() { free(_p); }
 
-    DNSRecordRef *data()
-    {
-        return _p;
-    }
+    DNSRecordRef *data() { return _p; }
 };
 
-class IdManager
-{
+class IdManager {
 private:
     QSet<int> set;
-    int at;
+    int       at;
 
     inline void bump_at()
     {
-        if(at == 0x7fffffff)
+        if (at == 0x7fffffff)
             at = 0;
         else
             ++at;
     }
 
 public:
-    IdManager() :
-        at(0)
-    {
-    }
+    IdManager() : at(0) {}
 
     int reserveId()
     {
-        while(1)
-        {
-            if(!set.contains(at))
-            {
+        while (1) {
+            if (!set.contains(at)) {
                 int id = at;
                 set.insert(id);
                 bump_at();
@@ -200,10 +165,7 @@ class IdManager
         }
     }
 
-    void releaseId(int id)
-    {
-        set.remove(id);
-    }
+    void releaseId(int id) { set.remove(id); }
 };
 
 } // namespace
@@ -211,26 +173,19 @@ class IdManager
 //----------------------------------------------------------------------------
 // QDnsSd
 //----------------------------------------------------------------------------
-class QDnsSd::Private : public QObject
-{
+class QDnsSd::Private : public QObject {
     Q_OBJECT
 public:
-    QDnsSd *q;
+    QDnsSd *  q;
     IdManager idManager;
 
-    class SubRecord
-    {
+    class SubRecord {
     public:
-        Private *_self;
-        int _id;
+        Private *  _self;
+        int        _id;
         RecordRef *_sdref;
 
-        SubRecord(Private *self) :
-            _self(self),
-            _id(-1),
-            _sdref(0)
-        {
-        }
+        SubRecord(Private *self) : _self(self), _id(-1), _sdref(0) {}
 
         ~SubRecord()
         {
@@ -239,46 +194,33 @@ class QDnsSd::Private : public QObject
         }
     };
 
-    class Request
-    {
+    class Request {
     public:
-        enum Type
-        {
-            Query,
-            Browse,
-            Resolve,
-            Reg
-        };
-
-        Private *_self;
-        int _type;
-        int _id;
-        ServiceRef *_sdref;
-        int _sockfd;
+        enum Type { Query, Browse, Resolve, Reg };
+
+        Private *           _self;
+        int                 _type;
+        int                 _id;
+        ServiceRef *        _sdref;
+        int                 _sockfd;
         SafeSocketNotifier *_sn_read;
-        SafeTimer *_errorTrigger;
+        SafeTimer *         _errorTrigger;
 
-        bool _doSignal;
-        LowLevelError _lowLevelError;
-        QList<QDnsSd::Record> _queryRecords;
+        bool                       _doSignal;
+        LowLevelError              _lowLevelError;
+        QList<QDnsSd::Record>      _queryRecords;
         QList<QDnsSd::BrowseEntry> _browseEntries;
-        QByteArray _resolveFullName;
-        QByteArray _resolveHost;
-        int _resolvePort;
-        QByteArray _resolveTxtRecord;
-        QByteArray _regDomain;
-        bool _regConflict;
+        QByteArray                 _resolveFullName;
+        QByteArray                 _resolveHost;
+        int                        _resolvePort;
+        QByteArray                 _resolveTxtRecord;
+        QByteArray                 _regDomain;
+        bool                       _regConflict;
 
-        QList<SubRecord*> _subRecords;
+        QList<SubRecord *> _subRecords;
 
         Request(Private *self) :
-            _self(self),
-            _id(-1),
-            _sdref(0),
-            _sockfd(-1),
-            _sn_read(0),
-            _errorTrigger(0),
-            _doSignal(false)
+            _self(self), _id(-1), _sdref(0), _sockfd(-1), _sn_read(0), _errorTrigger(0), _doSignal(false)
         {
         }
 
@@ -294,30 +236,22 @@ class QDnsSd::Private : public QObject
 
         int subRecordIndexById(int rec_id) const
         {
-            for(int n = 0; n < _subRecords.count(); ++n)
-            {
-                if(_subRecords[n]->_id == rec_id)
+            for (int n = 0; n < _subRecords.count(); ++n) {
+                if (_subRecords[n]->_id == rec_id)
                     return n;
             }
             return -1;
         }
     };
 
-    QHash<int,Request*> _requestsById;
-    QHash<SafeSocketNotifier*,Request*> _requestsBySocket;
-    QHash<SafeTimer*,Request*> _requestsByTimer;
-    QHash<int,Request*> _requestsByRecId;
+    QHash<int, Request *>                  _requestsById;
+    QHash<SafeSocketNotifier *, Request *> _requestsBySocket;
+    QHash<SafeTimer *, Request *>          _requestsByTimer;
+    QHash<int, Request *>                  _requestsByRecId;
 
-    Private(QDnsSd *_q) :
-        QObject(_q),
-        q(_q)
-    {
-    }
+    Private(QDnsSd *_q) : QObject(_q), q(_q) {}
 
-    ~Private()
-    {
-        qDeleteAll(_requestsById);
-    }
+    ~Private() { qDeleteAll(_requestsById); }
 
     void setDelayedError(Request *req, const LowLevelError &lowLevelError)
     {
@@ -337,11 +271,11 @@ class QDnsSd::Private : public QObject
 
     void removeRequest(Request *req)
     {
-        foreach(const SubRecord *srec, req->_subRecords)
+        foreach (const SubRecord *srec, req->_subRecords)
             _requestsByRecId.remove(srec->_id);
-        if(req->_errorTrigger)
+        if (req->_errorTrigger)
             _requestsByTimer.remove(req->_errorTrigger);
-        if(req->_sn_read)
+        if (req->_sn_read)
             _requestsBySocket.remove(req->_sn_read);
         _requestsById.remove(req->_id);
         delete req;
@@ -350,7 +284,7 @@ class QDnsSd::Private : public QObject
     int regIdForRecId(int rec_id) const
     {
         Request *req = _requestsByRecId.value(rec_id);
-        if(req)
+        if (req)
             return req->_id;
         return -1;
     }
@@ -360,32 +294,27 @@ class QDnsSd::Private : public QObject
         int id = idManager.reserveId();
 
         Request *req = new Request(this);
-        req->_type = Request::Query;
-        req->_id = id;
-        req->_sdref = new ServiceRef;
-
-        DNSServiceErrorType err = DNSServiceQueryRecord(
-            req->_sdref->data(), kDNSServiceFlagsLongLivedQuery,
-            0, name.constData(), qType, kDNSServiceClass_IN,
-            cb_queryRecordReply, req);
-        if(err != kDNSServiceErr_NoError)
-        {
-            setDelayedError(req, LowLevelError(
-                "DNSServiceQueryRecord", err));
+        req->_type   = Request::Query;
+        req->_id     = id;
+        req->_sdref  = new ServiceRef;
+
+        DNSServiceErrorType err
+            = DNSServiceQueryRecord(req->_sdref->data(), kDNSServiceFlagsLongLivedQuery, 0, name.constData(), qType,
+                                    kDNSServiceClass_IN, cb_queryRecordReply, req);
+        if (err != kDNSServiceErr_NoError) {
+            setDelayedError(req, LowLevelError("DNSServiceQueryRecord", err));
             return id;
         }
 
         req->_sdref->setInitialized();
 
         int sockfd = DNSServiceRefSockFD(*(req->_sdref->data()));
-        if(sockfd == -1)
-        {
-            setDelayedError(req, LowLevelError(
-                "DNSServiceRefSockFD", -1));
+        if (sockfd == -1) {
+            setDelayedError(req, LowLevelError("DNSServiceRefSockFD", -1));
             return id;
         }
 
-        req->_sockfd = sockfd;
+        req->_sockfd  = sockfd;
         req->_sn_read = new SafeSocketNotifier(sockfd, QSocketNotifier::Read, this);
         connect(req->_sn_read, SIGNAL(activated(int)), SLOT(sn_activated()));
         _requestsById.insert(id, req);
@@ -399,32 +328,26 @@ class QDnsSd::Private : public QObject
         int id = idManager.reserveId();
 
         Request *req = new Request(this);
-        req->_type = Request::Browse;
-        req->_id = id;
-        req->_sdref = new ServiceRef;
-
-        DNSServiceErrorType err = DNSServiceBrowse(
-            req->_sdref->data(), 0, 0, serviceType.constData(),
-            !domain.isEmpty() ? domain.constData() : NULL,
-            cb_browseReply, req);
-        if(err != kDNSServiceErr_NoError)
-        {
-            setDelayedError(req, LowLevelError(
-                "DNSServiceBrowse", err));
+        req->_type   = Request::Browse;
+        req->_id     = id;
+        req->_sdref  = new ServiceRef;
+
+        DNSServiceErrorType err = DNSServiceBrowse(req->_sdref->data(), 0, 0, serviceType.constData(),
+                                                   !domain.isEmpty() ? domain.constData() : NULL, cb_browseReply, req);
+        if (err != kDNSServiceErr_NoError) {
+            setDelayedError(req, LowLevelError("DNSServiceBrowse", err));
             return id;
         }
 
         req->_sdref->setInitialized();
 
         int sockfd = DNSServiceRefSockFD(*(req->_sdref->data()));
-        if(sockfd == -1)
-        {
-            setDelayedError(req, LowLevelError(
-                "DNSServiceRefSockFD", -1));
+        if (sockfd == -1) {
+            setDelayedError(req, LowLevelError("DNSServiceRefSockFD", -1));
             return id;
         }
 
-        req->_sockfd = sockfd;
+        req->_sockfd  = sockfd;
         req->_sn_read = new SafeSocketNotifier(sockfd, QSocketNotifier::Read, this);
         connect(req->_sn_read, SIGNAL(activated(int)), SLOT(sn_activated()));
         _requestsById.insert(id, req);
@@ -438,32 +361,27 @@ class QDnsSd::Private : public QObject
         int id = idManager.reserveId();
 
         Request *req = new Request(this);
-        req->_type = Request::Resolve;
-        req->_id = id;
-        req->_sdref = new ServiceRef;
-
-        DNSServiceErrorType err = DNSServiceResolve(
-            req->_sdref->data(), 0, 0, serviceName.constData(),
-            serviceType.constData(), domain.constData(),
-            (DNSServiceResolveReply)cb_resolveReply, req);
-        if(err != kDNSServiceErr_NoError)
-        {
-            setDelayedError(req, LowLevelError(
-                "DNSServiceResolve", err));
+        req->_type   = Request::Resolve;
+        req->_id     = id;
+        req->_sdref  = new ServiceRef;
+
+        DNSServiceErrorType err
+            = DNSServiceResolve(req->_sdref->data(), 0, 0, serviceName.constData(), serviceType.constData(),
+                                domain.constData(), (DNSServiceResolveReply)cb_resolveReply, req);
+        if (err != kDNSServiceErr_NoError) {
+            setDelayedError(req, LowLevelError("DNSServiceResolve", err));
             return id;
         }
 
         req->_sdref->setInitialized();
 
         int sockfd = DNSServiceRefSockFD(*(req->_sdref->data()));
-        if(sockfd == -1)
-        {
-            setDelayedError(req, LowLevelError(
-                "DNSServiceRefSockFD", -1));
+        if (sockfd == -1) {
+            setDelayedError(req, LowLevelError("DNSServiceRefSockFD", -1));
             return id;
         }
 
-        req->_sockfd = sockfd;
+        req->_sockfd  = sockfd;
         req->_sn_read = new SafeSocketNotifier(sockfd, QSocketNotifier::Read, this);
         connect(req->_sn_read, SIGNAL(activated(int)), SLOT(sn_activated()));
         _requestsById.insert(id, req);
@@ -472,48 +390,42 @@ class QDnsSd::Private : public QObject
         return id;
     }
 
-    int reg(const QByteArray &serviceName, const QByteArray &serviceType, const QByteArray &domain, int port, const QByteArray &txtRecord)
+    int reg(const QByteArray &serviceName, const QByteArray &serviceType, const QByteArray &domain, int port,
+            const QByteArray &txtRecord)
     {
         int id = idManager.reserveId();
 
         Request *req = new Request(this);
-        req->_type = Request::Reg;
-        req->_id = id;
+        req->_type   = Request::Reg;
+        req->_id     = id;
 
-        if(port < 1 || port > 0xffff)
-        {
+        if (port < 1 || port > 0xffff) {
             setDelayedError(req, LowLevelError());
             return id;
         }
 
         uint16_t sport = port;
-        sport = htons(sport);
+        sport          = htons(sport);
 
         req->_sdref = new ServiceRef;
 
         DNSServiceErrorType err = DNSServiceRegister(
-            req->_sdref->data(), kDNSServiceFlagsNoAutoRename, 0,
-            serviceName.constData(), serviceType.constData(),
-            domain.constData(), NULL, sport, txtRecord.size(),
-            txtRecord.data(), cb_regReply, req);
-        if(err != kDNSServiceErr_NoError)
-        {
-            setDelayedError(req, LowLevelError(
-                "DNSServiceRegister", err));
+            req->_sdref->data(), kDNSServiceFlagsNoAutoRename, 0, serviceName.constData(), serviceType.constData(),
+            domain.constData(), NULL, sport, txtRecord.size(), txtRecord.data(), cb_regReply, req);
+        if (err != kDNSServiceErr_NoError) {
+            setDelayedError(req, LowLevelError("DNSServiceRegister", err));
             return id;
         }
 
         req->_sdref->setInitialized();
 
         int sockfd = DNSServiceRefSockFD(*(req->_sdref->data()));
-        if(sockfd == -1)
-        {
-            setDelayedError(req, LowLevelError(
-                "DNSServiceRefSockFD", -1));
+        if (sockfd == -1) {
+            setDelayedError(req, LowLevelError("DNSServiceRefSockFD", -1));
             return id;
         }
 
-        req->_sockfd = sockfd;
+        req->_sockfd  = sockfd;
         req->_sn_read = new SafeSocketNotifier(sockfd, QSocketNotifier::Read, this);
         connect(req->_sn_read, SIGNAL(activated(int)), SLOT(sn_activated()));
         _requestsById.insert(id, req);
@@ -525,31 +437,27 @@ class QDnsSd::Private : public QObject
     int recordAdd(int reg_id, const Record &rec, LowLevelError *lowLevelError)
     {
         Request *req = _requestsById.value(reg_id);
-        if(!req)
-        {
-            if(lowLevelError)
+        if (!req) {
+            if (lowLevelError)
                 *lowLevelError = LowLevelError();
             return -1;
         }
 
         RecordRef *recordRef = new RecordRef;
 
-        DNSServiceErrorType err = DNSServiceAddRecord(
-            *(req->_sdref->data()), recordRef->data(), 0,
-            rec.rrtype, rec.rdata.size(), rec.rdata.data(),
-            rec.ttl);
-        if(err != kDNSServiceErr_NoError)
-        {
-            if(lowLevelError)
+        DNSServiceErrorType err = DNSServiceAddRecord(*(req->_sdref->data()), recordRef->data(), 0, rec.rrtype,
+                                                      rec.rdata.size(), rec.rdata.data(), rec.ttl);
+        if (err != kDNSServiceErr_NoError) {
+            if (lowLevelError)
                 *lowLevelError = LowLevelError("DNSServiceAddRecord", err);
             delete recordRef;
             return -1;
         }
 
-        int id = idManager.reserveId();
+        int        id   = idManager.reserveId();
         SubRecord *srec = new SubRecord(this);
-        srec->_id = id;
-        srec->_sdref = recordRef;
+        srec->_id       = id;
+        srec->_sdref    = recordRef;
         req->_subRecords += srec;
         _requestsByRecId.insert(id, req);
 
@@ -559,33 +467,27 @@ class QDnsSd::Private : public QObject
     bool recordUpdate(int reg_id, int rec_id, const Record &rec, LowLevelError *lowLevelError)
     {
         Request *req = _requestsById.value(reg_id);
-        if(!req)
-        {
-            if(lowLevelError)
+        if (!req) {
+            if (lowLevelError)
                 *lowLevelError = LowLevelError();
             return false;
         }
 
         SubRecord *srec = 0;
-        if(rec_id != -1)
-        {
+        if (rec_id != -1) {
             int at = req->subRecordIndexById(rec_id);
-            if(at == -1)
-            {
-                if(lowLevelError)
+            if (at == -1) {
+                if (lowLevelError)
                     *lowLevelError = LowLevelError();
                 return false;
             }
             srec = req->_subRecords[at];
         }
 
-        DNSServiceErrorType err = DNSServiceUpdateRecord(
-            *(req->_sdref->data()),
-            srec ? *(srec->_sdref->data()) : NULL, 0,
-            rec.rdata.size(), rec.rdata.data(), rec.ttl);
-        if(err != kDNSServiceErr_NoError)
-        {
-            if(lowLevelError)
+        DNSServiceErrorType err = DNSServiceUpdateRecord(*(req->_sdref->data()), srec ? *(srec->_sdref->data()) : NULL,
+                                                         0, rec.rdata.size(), rec.rdata.data(), rec.ttl);
+        if (err != kDNSServiceErr_NoError) {
+            if (lowLevelError)
                 *lowLevelError = LowLevelError("DNSServiceUpdateRecord", err);
             return false;
         }
@@ -596,7 +498,7 @@ class QDnsSd::Private : public QObject
     void recordRemove(int rec_id)
     {
         Request *req = _requestsByRecId.value(rec_id);
-        if(!req)
+        if (!req)
             return;
 
         // this can't fail
@@ -612,7 +514,7 @@ class QDnsSd::Private : public QObject
     void stop(int id)
     {
         Request *req = _requestsById.value(id);
-        if(req)
+        if (req)
             removeRequest(req);
     }
 
@@ -620,8 +522,8 @@ private slots:
     void sn_activated()
     {
         SafeSocketNotifier *sn_read = static_cast<SafeSocketNotifier *>(sender());
-        Request *req = _requestsBySocket.value(sn_read);
-        if(!req)
+        Request *           req     = _requestsBySocket.value(sn_read);
+        if (!req)
             return;
 
         int id = req->_id;
@@ -630,47 +532,40 @@ private slots:
 
         // do error if the above function returns an error, or if we
         //   collected an error during a callback
-        if(err != kDNSServiceErr_NoError || !req->_lowLevelError.func.isEmpty())
-        {
+        if (err != kDNSServiceErr_NoError || !req->_lowLevelError.func.isEmpty()) {
             LowLevelError lowLevelError;
-            if(err != kDNSServiceErr_NoError)
+            if (err != kDNSServiceErr_NoError)
                 lowLevelError = LowLevelError("DNSServiceProcessResult", err);
             else
                 lowLevelError = req->_lowLevelError;
 
             // reg conflict indicated via callback
             bool regConflict = false;
-            if(req->_type == Request::Reg && !req->_lowLevelError.func.isEmpty())
+            if (req->_type == Request::Reg && !req->_lowLevelError.func.isEmpty())
                 regConflict = req->_regConflict;
 
             removeRequest(req);
 
-            if(req->_type == Request::Query)
-            {
+            if (req->_type == Request::Query) {
                 QDnsSd::QueryResult r;
-                r.success = false;
+                r.success       = false;
                 r.lowLevelError = lowLevelError;
                 emit q->queryResult(id, r);
-            }
-            else if(req->_type == Request::Browse)
-            {
+            } else if (req->_type == Request::Browse) {
                 QDnsSd::BrowseResult r;
-                r.success = false;
+                r.success       = false;
                 r.lowLevelError = lowLevelError;
                 emit q->browseResult(id, r);
-            }
-            else if(req->_type == Request::Resolve)
-            {
+            } else if (req->_type == Request::Resolve) {
                 QDnsSd::ResolveResult r;
-                r.success = false;
+                r.success       = false;
                 r.lowLevelError = lowLevelError;
                 emit q->resolveResult(id, r);
-            }
-            else // Reg
+            } else // Reg
             {
                 QDnsSd::RegResult r;
                 r.success = false;
-                if(regConflict)
+                if (regConflict)
                     r.errorCode = QDnsSd::RegResult::ErrorConflict;
                 else
                     r.errorCode = QDnsSd::RegResult::ErrorGeneric;
@@ -683,10 +578,8 @@ private slots:
 
         // handle success
 
-        if(req->_type == Request::Query)
-        {
-            if(req->_doSignal)
-            {
+        if (req->_type == Request::Query) {
+            if (req->_doSignal) {
                 QDnsSd::QueryResult r;
                 r.success = true;
                 r.records = req->_queryRecords;
@@ -694,11 +587,8 @@ private slots:
                 req->_doSignal = false;
                 emit q->queryResult(id, r);
             }
-        }
-        else if(req->_type == Request::Browse)
-        {
-            if(req->_doSignal)
-            {
+        } else if (req->_type == Request::Browse) {
+            if (req->_doSignal) {
                 QDnsSd::BrowseResult r;
                 r.success = true;
                 r.entries = req->_browseEntries;
@@ -706,17 +596,14 @@ private slots:
                 req->_doSignal = false;
                 emit q->browseResult(id, r);
             }
-        }
-        else if(req->_type == Request::Resolve)
-        {
-            if(req->_doSignal)
-            {
+        } else if (req->_type == Request::Resolve) {
+            if (req->_doSignal) {
                 QDnsSd::ResolveResult r;
-                r.success = true;
-                r.fullName = req->_resolveFullName;
-                r.hostTarget = req->_resolveHost;
-                r.port = req->_resolvePort;
-                r.txtRecord = req->_resolveTxtRecord;
+                r.success      = true;
+                r.fullName     = req->_resolveFullName;
+                r.hostTarget   = req->_resolveHost;
+                r.port         = req->_resolvePort;
+                r.txtRecord    = req->_resolveTxtRecord;
                 req->_doSignal = false;
 
                 // there is only one response
@@ -724,14 +611,12 @@ private slots:
 
                 emit q->resolveResult(id, r);
             }
-        }
-        else // Reg
+        } else // Reg
         {
-            if(req->_doSignal)
-            {
+            if (req->_doSignal) {
                 QDnsSd::RegResult r;
-                r.success = true;
-                r.domain = req->_regDomain;
+                r.success      = true;
+                r.domain       = req->_regDomain;
                 req->_doSignal = false;
 
                 emit q->regResult(id, r);
@@ -741,180 +626,155 @@ private slots:
 
     void doError()
     {
-        SafeTimer *t = static_cast<SafeTimer *>(sender());
-        Request *req = _requestsByTimer.value(t);
-        if(!req)
+        SafeTimer *t   = static_cast<SafeTimer *>(sender());
+        Request *  req = _requestsByTimer.value(t);
+        if (!req)
             return;
 
-        int id = req->_id;
+        int id   = req->_id;
         int type = req->_type;
         removeRequest(req);
 
-        if(type == Request::Query)
-        {
+        if (type == Request::Query) {
             QDnsSd::QueryResult r;
-            r.success = false;
+            r.success       = false;
             r.lowLevelError = req->_lowLevelError;
             emit q->queryResult(id, r);
-        }
-        else if(type == Request::Browse)
-        {
+        } else if (type == Request::Browse) {
             QDnsSd::BrowseResult r;
-            r.success = false;
+            r.success       = false;
             r.lowLevelError = req->_lowLevelError;
             emit q->browseResult(id, r);
-        }
-        else if(type == Request::Resolve)
-        {
+        } else if (type == Request::Resolve) {
             QDnsSd::ResolveResult r;
-            r.success = false;
+            r.success       = false;
             r.lowLevelError = req->_lowLevelError;
             emit q->resolveResult(id, r);
-        }
-        else // Reg
+        } else // Reg
         {
             QDnsSd::RegResult r;
-            r.success = false;
-            r.errorCode = QDnsSd::RegResult::ErrorGeneric;
+            r.success       = false;
+            r.errorCode     = QDnsSd::RegResult::ErrorGeneric;
             r.lowLevelError = req->_lowLevelError;
             emit q->regResult(id, r);
         }
     }
 
 private:
-    static void cb_queryRecordReply(DNSServiceRef ref,
-        DNSServiceFlags flags, uint32_t interfaceIndex,
-        DNSServiceErrorType errorCode, const char *fullname,
-        uint16_t rrtype, uint16_t rrclass, uint16_t rdlen,
-        const void *rdata, uint32_t ttl, void *context)
+    static void cb_queryRecordReply(DNSServiceRef ref, DNSServiceFlags flags, uint32_t interfaceIndex,
+                                    DNSServiceErrorType errorCode, const char *fullname, uint16_t rrtype,
+                                    uint16_t rrclass, uint16_t rdlen, const void *rdata, uint32_t ttl, void *context)
     {
         Q_UNUSED(ref);
         Q_UNUSED(interfaceIndex);
         Q_UNUSED(rrclass);
 
         Request *req = static_cast<Request *>(context);
-        req->_self->handle_queryRecordReply(req, flags, errorCode,
-            fullname, rrtype, rdlen, (const char *)rdata, ttl);
+        req->_self->handle_queryRecordReply(req, flags, errorCode, fullname, rrtype, rdlen, (const char *)rdata, ttl);
     }
 
-    static void cb_browseReply(DNSServiceRef ref,
-        DNSServiceFlags flags, uint32_t interfaceIndex,
-        DNSServiceErrorType errorCode, const char *serviceName,
-        const char *regtype, const char *replyDomain, void *context)
+    static void cb_browseReply(DNSServiceRef ref, DNSServiceFlags flags, uint32_t interfaceIndex,
+                               DNSServiceErrorType errorCode, const char *serviceName, const char *regtype,
+                               const char *replyDomain, void *context)
     {
         Q_UNUSED(ref);
         Q_UNUSED(interfaceIndex);
 
         Request *req = static_cast<Request *>(context);
-        req->_self->handle_browseReply(req, flags, errorCode,
-            serviceName, regtype, replyDomain);
+        req->_self->handle_browseReply(req, flags, errorCode, serviceName, regtype, replyDomain);
     }
 
-    static void cb_resolveReply(DNSServiceRef ref,
-        DNSServiceFlags flags, uint32_t interfaceIndex,
-        DNSServiceErrorType errorCode, const char *fullname,
-        const char *hosttarget, uint16_t port, uint16_t txtLen,
-        const unsigned char *txtRecord, void *context)
+    static void cb_resolveReply(DNSServiceRef ref, DNSServiceFlags flags, uint32_t interfaceIndex,
+                                DNSServiceErrorType errorCode, const char *fullname, const char *hosttarget,
+                                uint16_t port, uint16_t txtLen, const unsigned char *txtRecord, void *context)
     {
         Q_UNUSED(ref);
         Q_UNUSED(flags);
         Q_UNUSED(interfaceIndex);
 
         Request *req = static_cast<Request *>(context);
-        req->_self->handle_resolveReply(req, errorCode, fullname,
-            hosttarget, port, txtLen, txtRecord);
+        req->_self->handle_resolveReply(req, errorCode, fullname, hosttarget, port, txtLen, txtRecord);
     }
 
-    static void cb_regReply(DNSServiceRef ref,
-        DNSServiceFlags flags, DNSServiceErrorType errorCode,
-        const char *name, const char *regtype, const char *domain,
-        void *context)
+    static void cb_regReply(DNSServiceRef ref, DNSServiceFlags flags, DNSServiceErrorType errorCode, const char *name,
+                            const char *regtype, const char *domain, void *context)
     {
         Q_UNUSED(ref);
         Q_UNUSED(flags);
 
         Request *req = static_cast<Request *>(context);
-        req->_self->handle_regReply(req, errorCode, name, regtype,
-            domain);
+        req->_self->handle_regReply(req, errorCode, name, regtype, domain);
     }
 
-    void handle_queryRecordReply(Request *req, DNSServiceFlags flags,
-        DNSServiceErrorType errorCode, const char *fullname,
-        uint16_t rrtype, uint16_t rdlen, const char *rdata,
-        uint16_t ttl)
+    void handle_queryRecordReply(Request *req, DNSServiceFlags flags, DNSServiceErrorType errorCode,
+                                 const char *fullname, uint16_t rrtype, uint16_t rdlen, const char *rdata, uint16_t ttl)
     {
-        if(errorCode != kDNSServiceErr_NoError)
-        {
-            req->_doSignal = true;
+        if (errorCode != kDNSServiceErr_NoError) {
+            req->_doSignal      = true;
             req->_lowLevelError = LowLevelError("DNSServiceQueryRecordReply", errorCode);
             return;
         }
 
         QDnsSd::Record rec;
-        rec.added = (flags & kDNSServiceFlagsAdd) ? true: false;
-        rec.name = QByteArray(fullname);
+        rec.added  = (flags & kDNSServiceFlagsAdd) ? true : false;
+        rec.name   = QByteArray(fullname);
         rec.rrtype = rrtype;
-        rec.rdata = QByteArray(rdata, rdlen);
-        rec.ttl = ttl;
+        rec.rdata  = QByteArray(rdata, rdlen);
+        rec.ttl    = ttl;
         req->_queryRecords += rec;
 
-        if(!(flags & kDNSServiceFlagsMoreComing))
+        if (!(flags & kDNSServiceFlagsMoreComing))
             req->_doSignal = true;
     }
 
-    void handle_browseReply(Request *req, DNSServiceFlags flags,
-        DNSServiceErrorType errorCode, const char *serviceName,
-        const char *regtype, const char *replyDomain)
+    void handle_browseReply(Request *req, DNSServiceFlags flags, DNSServiceErrorType errorCode, const char *serviceName,
+                            const char *regtype, const char *replyDomain)
     {
-        if(errorCode != kDNSServiceErr_NoError)
-        {
-            req->_doSignal = true;
+        if (errorCode != kDNSServiceErr_NoError) {
+            req->_doSignal      = true;
             req->_lowLevelError = LowLevelError("DNSServiceBrowseReply", errorCode);
             return;
         }
 
         QDnsSd::BrowseEntry e;
-        e.added = (flags & kDNSServiceFlagsAdd) ? true: false;
+        e.added       = (flags & kDNSServiceFlagsAdd) ? true : false;
         e.serviceName = QByteArray(serviceName);
         e.serviceType = QByteArray(regtype);
         e.replyDomain = QByteArray(replyDomain);
         req->_browseEntries += e;
 
-        if(!(flags & kDNSServiceFlagsMoreComing))
+        if (!(flags & kDNSServiceFlagsMoreComing))
             req->_doSignal = true;
     }
 
-    void handle_resolveReply(Request *req, DNSServiceErrorType errorCode,
-        const char *fullname, const char *hosttarget, uint16_t port,
-        uint16_t txtLen, const unsigned char *txtRecord)
+    void handle_resolveReply(Request *req, DNSServiceErrorType errorCode, const char *fullname, const char *hosttarget,
+                             uint16_t port, uint16_t txtLen, const unsigned char *txtRecord)
     {
-        if(errorCode != kDNSServiceErr_NoError)
-        {
-            req->_doSignal = true;
+        if (errorCode != kDNSServiceErr_NoError) {
+            req->_doSignal      = true;
             req->_lowLevelError = LowLevelError("DNSServiceResolveReply", errorCode);
             return;
         }
 
-        req->_resolveFullName = QByteArray(fullname);
-        req->_resolveHost = QByteArray(hosttarget);
-        req->_resolvePort = ntohs(port);
+        req->_resolveFullName  = QByteArray(fullname);
+        req->_resolveHost      = QByteArray(hosttarget);
+        req->_resolvePort      = ntohs(port);
         req->_resolveTxtRecord = QByteArray((const char *)txtRecord, txtLen);
 
         req->_doSignal = true;
     }
 
-    void handle_regReply(Request *req, DNSServiceErrorType errorCode,
-        const char *name, const char *regtype, const char *domain)
+    void handle_regReply(Request *req, DNSServiceErrorType errorCode, const char *name, const char *regtype,
+                         const char *domain)
     {
         Q_UNUSED(name);
         Q_UNUSED(regtype);
 
-        if(errorCode != kDNSServiceErr_NoError)
-        {
-            req->_doSignal = true;
+        if (errorCode != kDNSServiceErr_NoError) {
+            req->_doSignal      = true;
             req->_lowLevelError = LowLevelError("DNSServiceRegisterReply", errorCode);
 
-            if(errorCode == kDNSServiceErr_NameConflict)
+            if (errorCode == kDNSServiceErr_NameConflict)
                 req->_regConflict = true;
             else
                 req->_regConflict = false;
@@ -922,37 +782,25 @@ private slots:
         }
 
         req->_regDomain = QByteArray(domain);
-        req->_doSignal = true;
+        req->_doSignal  = true;
     }
 };
 
-QDnsSd::QDnsSd(QObject *parent) :
-    QObject(parent)
-{
-    d = new Private(this);
-}
+QDnsSd::QDnsSd(QObject *parent) : QObject(parent) { d = new Private(this); }
 
-QDnsSd::~QDnsSd()
-{
-    delete d;
-}
+QDnsSd::~QDnsSd() { delete d; }
 
-int QDnsSd::query(const QByteArray &name, int qType)
-{
-    return d->query(name, qType);
-}
+int QDnsSd::query(const QByteArray &name, int qType) { return d->query(name, qType); }
 
-int QDnsSd::browse(const QByteArray &serviceType, const QByteArray &domain)
-{
-    return d->browse(serviceType, domain);
-}
+int QDnsSd::browse(const QByteArray &serviceType, const QByteArray &domain) { return d->browse(serviceType, domain); }
 
 int QDnsSd::resolve(const QByteArray &serviceName, const QByteArray &serviceType, const QByteArray &domain)
 {
     return d->resolve(serviceName, serviceType, domain);
 }
 
-int QDnsSd::reg(const QByteArray &serviceName, const QByteArray &serviceType, const QByteArray &domain, int port, const QByteArray &txtRecord)
+int QDnsSd::reg(const QByteArray &serviceName, const QByteArray &serviceType, const QByteArray &domain, int port,
+                const QByteArray &txtRecord)
 {
     return d->reg(serviceName, serviceType, domain, port, txtRecord);
 }
@@ -965,7 +813,7 @@ int QDnsSd::recordAdd(int reg_id, const Record &rec, LowLevelError *lowLevelErro
 bool QDnsSd::recordUpdate(int rec_id, const Record &rec, LowLevelError *lowLevelError)
 {
     int reg_id = d->regIdForRecId(rec_id);
-    if(reg_id == -1)
+    if (reg_id == -1)
         return false;
 
     return d->recordUpdate(reg_id, rec_id, rec, lowLevelError);
@@ -975,43 +823,33 @@ bool QDnsSd::recordUpdateTxt(int reg_id, const QByteArray &txtRecord, quint32 tt
 {
     Record rec;
     rec.rrtype = kDNSServiceType_TXT;
-    rec.rdata = txtRecord;
-    rec.ttl = ttl;
+    rec.rdata  = txtRecord;
+    rec.ttl    = ttl;
     return d->recordUpdate(reg_id, -1, rec, lowLevelError);
 }
 
-void QDnsSd::recordRemove(int rec_id)
-{
-    d->recordRemove(rec_id);
-}
+void QDnsSd::recordRemove(int rec_id) { d->recordRemove(rec_id); }
 
-void QDnsSd::stop(int id)
-{
-    d->stop(id);
-}
+void QDnsSd::stop(int id) { d->stop(id); }
 
 QByteArray QDnsSd::createTxtRecord(const QList<QByteArray> &strings)
 {
     // split into var/val and validate
     QList<QByteArray> vars;
     QList<QByteArray> vals; // null = no value, empty = empty value
-    foreach(const QByteArray &i, strings)
-    {
+    foreach (const QByteArray &i, strings) {
         QByteArray var;
         QByteArray val;
-        int n = i.indexOf('=');
-        if(n != -1)
-        {
+        int        n = i.indexOf('=');
+        if (n != -1) {
             var = i.mid(0, n);
             val = i.mid(n + 1);
-        }
-        else
+        } else
             var = i;
 
-        for(int n = 0; n < var.size(); ++n)
-        {
+        for (int n = 0; n < var.size(); ++n) {
             unsigned char c = var[n];
-            if(c < 0x20 || c > 0x7e)
+            if (c < 0x20 || c > 0x7e)
                 return QByteArray();
         }
 
@@ -1020,21 +858,18 @@ QByteArray QDnsSd::createTxtRecord(const QList<QByteArray> &strings)
     }
 
     TXTRecordRef ref;
-    QByteArray buf(256, 0);
+    QByteArray   buf(256, 0);
     TXTRecordCreate(&ref, buf.size(), buf.data());
-    for(int n = 0; n < vars.count(); ++n)
-    {
-        int valueSize = vals[n].size();
+    for (int n = 0; n < vars.count(); ++n) {
+        int   valueSize = vals[n].size();
         char *value;
-        if(!vals[n].isNull())
+        if (!vals[n].isNull())
             value = vals[n].data();
         else
             value = 0;
 
-        DNSServiceErrorType err = TXTRecordSetValue(&ref,
-            vars[n].data(), valueSize, value);
-        if(err != kDNSServiceErr_NoError)
-        {
+        DNSServiceErrorType err = TXTRecordSetValue(&ref, vars[n].data(), valueSize, value);
+        if (err != kDNSServiceErr_NoError) {
             TXTRecordDeallocate(&ref);
             return QByteArray();
         }
@@ -1047,23 +882,20 @@ QByteArray QDnsSd::createTxtRecord(const QList<QByteArray> &strings)
 QList<QByteArray> QDnsSd::parseTxtRecord(const QByteArray &txtRecord)
 {
     QList<QByteArray> out;
-    int count = TXTRecordGetCount(txtRecord.size(), txtRecord.data());
-    for(int n = 0; n < count; ++n)
-    {
-        QByteArray keyBuf(256, 0);
-        uint8_t valueLen;
-        const void *value;
-        DNSServiceErrorType err = TXTRecordGetItemAtIndex(
-            txtRecord.size(), txtRecord.data(), n, keyBuf.size(),
-            keyBuf.data(), &valueLen, &value);
-        if(err != kDNSServiceErr_NoError)
+    int               count = TXTRecordGetCount(txtRecord.size(), txtRecord.data());
+    for (int n = 0; n < count; ++n) {
+        QByteArray          keyBuf(256, 0);
+        uint8_t             valueLen;
+        const void *        value;
+        DNSServiceErrorType err = TXTRecordGetItemAtIndex(txtRecord.size(), txtRecord.data(), n, keyBuf.size(),
+                                                          keyBuf.data(), &valueLen, &value);
+        if (err != kDNSServiceErr_NoError)
             return QList<QByteArray>();
 
         keyBuf.resize(qstrlen(keyBuf.data()));
 
         QByteArray entry = keyBuf;
-        if(value)
-        {
+        if (value) {
             entry += '=';
             entry += QByteArray((const char *)value, valueLen);
         }
diff --git a/src/irisnet/appledns/qdnssd.h b/src/irisnet/appledns/qdnssd.h
index 7996cd51..635ef489 100644
--- a/src/irisnet/appledns/qdnssd.h
+++ b/src/irisnet/appledns/qdnssd.h
@@ -24,43 +24,32 @@
 #include <QObject>
 
 // DOR-compliant
-class QDnsSd : public QObject
-{
+class QDnsSd : public QObject {
     Q_OBJECT
 public:
-    class LowLevelError
-    {
+    class LowLevelError {
     public:
         QString func;
-        int code;
-
-        LowLevelError() :
-            code(0)
-        {
-        }
-
-        LowLevelError(const QString &_func, int _code) :
-            func(_func),
-            code(_code)
-        {
-        }
+        int     code;
+
+        LowLevelError() : code(0) {}
+
+        LowLevelError(const QString &_func, int _code) : func(_func), code(_code) {}
     };
 
-    class Record
-    {
+    class Record {
     public:
         bool added; // only used by QueryResult
 
         QByteArray name;
-        int rrtype;
+        int        rrtype;
         QByteArray rdata;
-        quint32 ttl;
+        quint32    ttl;
     };
 
-    class BrowseEntry
-    {
+    class BrowseEntry {
     public:
-        bool added;
+        bool       added;
         QByteArray serviceName;
 
         // these may be different from request, see dns_sd docs
@@ -68,47 +57,39 @@ class QDnsSd : public QObject
         QByteArray replyDomain;
     };
 
-    class QueryResult
-    {
+    class QueryResult {
     public:
-        bool success;
+        bool          success;
         LowLevelError lowLevelError;
 
         QList<Record> records;
     };
 
-    class BrowseResult
-    {
+    class BrowseResult {
     public:
-        bool success;
+        bool          success;
         LowLevelError lowLevelError;
 
         QList<BrowseEntry> entries;
     };
 
-    class ResolveResult
-    {
+    class ResolveResult {
     public:
-        bool success;
+        bool          success;
         LowLevelError lowLevelError;
 
         QByteArray fullName;
         QByteArray hostTarget;
-        int port; // host byte-order
+        int        port; // host byte-order
         QByteArray txtRecord;
     };
 
-    class RegResult
-    {
+    class RegResult {
     public:
-        enum Error
-        {
-            ErrorGeneric,
-            ErrorConflict
-        };
-
-        bool success;
-        Error errorCode;
+        enum Error { ErrorGeneric, ErrorConflict };
+
+        bool          success;
+        Error         errorCode;
         LowLevelError lowLevelError;
 
         QByteArray domain;
@@ -125,7 +106,8 @@ class QDnsSd : public QObject
     int resolve(const QByteArray &serviceName, const QByteArray &serviceType, const QByteArray &domain);
 
     // domain may be empty
-    int reg(const QByteArray &serviceName, const QByteArray &serviceType, const QByteArray &domain, int port, const QByteArray &txtRecord);
+    int reg(const QByteArray &serviceName, const QByteArray &serviceType, const QByteArray &domain, int port,
+            const QByteArray &txtRecord);
 
     // return -1 on error, else a record id
     int recordAdd(int reg_id, const Record &rec, LowLevelError *lowLevelError = 0);
diff --git a/src/irisnet/appledns/sdtest.cpp b/src/irisnet/appledns/sdtest.cpp
index b60c6223..038e74b2 100644
--- a/src/irisnet/appledns/sdtest.cpp
+++ b/src/irisnet/appledns/sdtest.cpp
@@ -21,49 +21,37 @@
 #include <QHostAddress>
 #include <QtCore>
 #ifdef Q_OS_WIN // for ntohl
-# include <windows.h>
+#include <windows.h>
 #else
-# include <netinet/in.h>
+#include <netinet/in.h>
 #endif
 
-class Command
-{
+class Command {
 public:
-    enum Type
-    {
-        Query,
-        Browse,
-        Resolve,
-        Reg
-    };
+    enum Type { Query, Browse, Resolve, Reg };
 
     Type type;
 
-    QString name; // query, resolve, reg
-    int rtype; // query
-    QString stype; // browse, resolve, reg
-    QString domain; // browse, resolve, reg
-    int port; // reg
+    QString    name;      // query, resolve, reg
+    int        rtype;     // query
+    QString    stype;     // browse, resolve, reg
+    QString    domain;    // browse, resolve, reg
+    int        port;      // reg
     QByteArray txtRecord; // reg
 
-    int id;
-    int dnsId;
+    int  id;
+    int  dnsId;
     bool error;
     bool done; // for resolve
 
-    Command() :
-        error(false),
-        done(false)
-    {
-    }
+    Command() : error(false), done(false) {}
 };
 
 static QString nameToString(const QByteArray &in)
 {
     QStringList parts;
-    int at = 0;
-    while(at < in.size())
-    {
+    int         at = 0;
+    while (at < in.size()) {
         int len = in[at++];
         parts += QString::fromUtf8(in.mid(at, len));
         at += len;
@@ -75,20 +63,17 @@ static QString recordToDesc(const QDnsSd::Record &rec)
 {
     QString desc;
 
-    if(rec.rrtype == 1) // A
+    if (rec.rrtype == 1) // A
     {
         quint32 *p = (quint32 *)rec.rdata.data();
-        desc = QHostAddress(ntohl(*p)).toString();
-    }
-    else if(rec.rrtype == 28) // AAAA
+        desc       = QHostAddress(ntohl(*p)).toString();
+    } else if (rec.rrtype == 28) // AAAA
     {
         desc = QHostAddress((quint8 *)rec.rdata.data()).toString();
-    }
-    else if(rec.rrtype == 12) // PTR
+    } else if (rec.rrtype == 12) // PTR
     {
         desc = QString("[%1]").arg(nameToString(rec.rdata));
-    }
-    else
+    } else
         desc = QString("%1 bytes").arg(rec.rdata.size());
 
     return desc;
@@ -97,11 +82,11 @@ static QString recordToDesc(const QDnsSd::Record &rec)
 static QStringList txtRecordToStringList(const QByteArray &rdata)
 {
     QList<QByteArray> txtEntries = QDnsSd::parseTxtRecord(rdata);
-    if(txtEntries.isEmpty())
+    if (txtEntries.isEmpty())
         return QStringList();
 
     QStringList out;
-    foreach(const QByteArray &entry, txtEntries)
+    foreach (const QByteArray &entry, txtEntries)
         out += QString::fromUtf8(entry);
     return out;
 }
@@ -109,64 +94,56 @@ static QStringList txtRecordToStringList(const QByteArray &rdata)
 static void printIndentedTxt(const QByteArray &txtRecord)
 {
     QStringList list = txtRecordToStringList(txtRecord);
-    if(!list.isEmpty())
-    {
-        foreach(const QString &s, list)
+    if (!list.isEmpty()) {
+        foreach (const QString &s, list)
             printf("   %s\n", qPrintable(s));
-    }
-    else
+    } else
         printf("   (TXT parsing error)\n");
 }
 
-class App : public QObject
-{
+class App : public QObject {
     Q_OBJECT
 public:
     QList<Command> commands;
-    QDnsSd *dns;
+    QDnsSd *       dns;
 
     App()
     {
         dns = new QDnsSd(this);
-        connect(dns, SIGNAL(queryResult(int,QDnsSd::QueryResult)), SLOT(dns_queryResult(int,QDnsSd::QueryResult)));
-        connect(dns, SIGNAL(browseResult(int,QDnsSd::BrowseResult)), SLOT(dns_browseResult(int,QDnsSd::BrowseResult)));
-        connect(dns, SIGNAL(resolveResult(int,QDnsSd::ResolveResult)), SLOT(dns_resolveResult(int,QDnsSd::ResolveResult)));
-        connect(dns, SIGNAL(regResult(int,QDnsSd::RegResult)), SLOT(dns_regResult(int,QDnsSd::RegResult)));
+        connect(dns, SIGNAL(queryResult(int, QDnsSd::QueryResult)), SLOT(dns_queryResult(int, QDnsSd::QueryResult)));
+        connect(dns, SIGNAL(browseResult(int, QDnsSd::BrowseResult)),
+                SLOT(dns_browseResult(int, QDnsSd::BrowseResult)));
+        connect(dns, SIGNAL(resolveResult(int, QDnsSd::ResolveResult)),
+                SLOT(dns_resolveResult(int, QDnsSd::ResolveResult)));
+        connect(dns, SIGNAL(regResult(int, QDnsSd::RegResult)), SLOT(dns_regResult(int, QDnsSd::RegResult)));
     }
 
 public slots:
     void start()
     {
-        for(int n = 0; n < commands.count(); ++n)
-        {
+        for (int n = 0; n < commands.count(); ++n) {
             Command &c = commands[n];
 
             c.id = n;
-            if(c.type == Command::Query)
-            {
+            if (c.type == Command::Query) {
                 printf("%2d: Query name=[%s], type=%d ...\n", c.id, qPrintable(c.name), c.rtype);
                 c.dnsId = dns->query(c.name.toUtf8(), c.rtype);
-            }
-            else if(c.type == Command::Browse)
-            {
+            } else if (c.type == Command::Browse) {
                 printf("%2d: Browse type=[%s]", c.id, qPrintable(c.stype));
-                if(!c.domain.isEmpty())
+                if (!c.domain.isEmpty())
                     printf(", domain=[%s]", qPrintable(c.domain));
                 printf(" ...\n");
                 c.dnsId = dns->browse(c.stype.toUtf8(), c.domain.toUtf8());
-            }
-            else if(c.type == Command::Resolve)
-            {
-                printf("%2d: Resolve name=[%s], type=[%s], domain=[%s] ...\n", c.id, qPrintable(c.name), qPrintable(c.stype), qPrintable(c.domain));
+            } else if (c.type == Command::Resolve) {
+                printf("%2d: Resolve name=[%s], type=[%s], domain=[%s] ...\n", c.id, qPrintable(c.name),
+                       qPrintable(c.stype), qPrintable(c.domain));
                 c.dnsId = dns->resolve(c.name.toUtf8(), c.stype.toUtf8(), c.domain.toUtf8());
-            }
-            else if(c.type == Command::Reg)
-            {
+            } else if (c.type == Command::Reg) {
                 printf("%2d: Register name=[%s], type=[%s]", c.id, qPrintable(c.name), qPrintable(c.stype));
-                if(!c.domain.isEmpty())
+                if (!c.domain.isEmpty())
                     printf(", domain=[%s]", qPrintable(c.domain));
                 printf(", port=%d ...\n", c.port);
-                if(!c.txtRecord.isEmpty())
+                if (!c.txtRecord.isEmpty())
                     printIndentedTxt(c.txtRecord);
 
                 c.dnsId = dns->reg(c.name.toUtf8(), c.stype.toUtf8(), c.domain.toUtf8(), c.port, c.txtRecord);
@@ -180,10 +157,9 @@ public slots:
 private:
     int cmdIdToCmdIndex(int cmdId)
     {
-        for(int n = 0; n < commands.count(); ++n)
-        {
+        for (int n = 0; n < commands.count(); ++n) {
             const Command &c = commands[n];
-            if(c.id == cmdId)
+            if (c.id == cmdId)
                 return n;
         }
         return -1;
@@ -191,10 +167,9 @@ public slots:
 
     int dnsIdToCmdIndex(int dnsId)
     {
-        for(int n = 0; n < commands.count(); ++n)
-        {
+        for (int n = 0; n < commands.count(); ++n) {
             const Command &c = commands[n];
-            if(c.dnsId == dnsId)
+            if (c.dnsId == dnsId)
                 return n;
         }
         return -1;
@@ -204,29 +179,27 @@ public slots:
     {
         // quit if there are nothing but errors or completed resolves
         bool doQuit = true;
-        foreach(const Command &c, commands)
-        {
-            if(c.error || (c.type == Command::Resolve && c.done))
+        foreach (const Command &c, commands) {
+            if (c.error || (c.type == Command::Resolve && c.done))
                 continue;
 
             doQuit = false;
             break;
         }
 
-        if(doQuit)
+        if (doQuit)
             emit quit();
     }
 
 private slots:
     void dns_queryResult(int id, const QDnsSd::QueryResult &result)
     {
-        int at = dnsIdToCmdIndex(id);
-        Command &c = commands[at];
+        int      at = dnsIdToCmdIndex(id);
+        Command &c  = commands[at];
 
-        if(!result.success)
-        {
+        if (!result.success) {
             printf("%2d: Error.", c.id);
-            if(!result.lowLevelError.func.isEmpty())
+            if (!result.lowLevelError.func.isEmpty())
                 printf(" (%s, %d)", qPrintable(result.lowLevelError.func), result.lowLevelError.code);
             printf("\n");
             c.error = true;
@@ -234,28 +207,24 @@ private slots:
             return;
         }
 
-        foreach(const QDnsSd::Record &rec, result.records)
-        {
-            if(rec.added)
-            {
+        foreach (const QDnsSd::Record &rec, result.records) {
+            if (rec.added) {
                 printf("%2d: Added:   %s, ttl=%u\n", c.id, qPrintable(recordToDesc(rec)), rec.ttl);
-                if(rec.rrtype == 16)
+                if (rec.rrtype == 16)
                     printIndentedTxt(rec.rdata);
-            }
-            else
+            } else
                 printf("%2d: Removed: %s, ttl=%u\n", c.id, qPrintable(recordToDesc(rec)), rec.ttl);
         }
     }
 
     void dns_browseResult(int id, const QDnsSd::BrowseResult &result)
     {
-        int at = dnsIdToCmdIndex(id);
-        Command &c = commands[at];
+        int      at = dnsIdToCmdIndex(id);
+        Command &c  = commands[at];
 
-        if(!result.success)
-        {
+        if (!result.success) {
             printf("%2d: Error.", c.id);
-            if(!result.lowLevelError.func.isEmpty())
+            if (!result.lowLevelError.func.isEmpty())
                 printf(" (%s, %d)", qPrintable(result.lowLevelError.func), result.lowLevelError.code);
             printf("\n");
             c.error = true;
@@ -263,10 +232,10 @@ private slots:
             return;
         }
 
-        foreach(const QDnsSd::BrowseEntry &e, result.entries)
-        {
-            if(e.added)
-                printf("%2d: Added:   [%s] [%s] [%s]\n", c.id, qPrintable(QString::fromUtf8(e.serviceName)), qPrintable(QString::fromUtf8(e.serviceType)), qPrintable(QString::fromUtf8(e.replyDomain)));
+        foreach (const QDnsSd::BrowseEntry &e, result.entries) {
+            if (e.added)
+                printf("%2d: Added:   [%s] [%s] [%s]\n", c.id, qPrintable(QString::fromUtf8(e.serviceName)),
+                       qPrintable(QString::fromUtf8(e.serviceType)), qPrintable(QString::fromUtf8(e.replyDomain)));
             else
                 printf("%2d: Removed: [%s]\n", c.id, qPrintable(QString::fromUtf8(e.serviceName)));
         }
@@ -274,13 +243,12 @@ private slots:
 
     void dns_resolveResult(int id, const QDnsSd::ResolveResult &result)
     {
-        int at = dnsIdToCmdIndex(id);
-        Command &c = commands[at];
+        int      at = dnsIdToCmdIndex(id);
+        Command &c  = commands[at];
 
-        if(!result.success)
-        {
+        if (!result.success) {
             printf("%2d: Error.", c.id);
-            if(!result.lowLevelError.func.isEmpty())
+            if (!result.lowLevelError.func.isEmpty())
                 printf(" (%s, %d)", qPrintable(result.lowLevelError.func), result.lowLevelError.code);
             printf("\n");
             c.error = true;
@@ -289,7 +257,7 @@ private slots:
         }
 
         printf("%2d: Result: host=[%s] port=%d\n", c.id, qPrintable(QString::fromUtf8(result.hostTarget)), result.port);
-        if(!result.txtRecord.isEmpty())
+        if (!result.txtRecord.isEmpty())
             printIndentedTxt(result.txtRecord);
 
         c.done = true;
@@ -298,18 +266,17 @@ private slots:
 
     void dns_regResult(int id, const QDnsSd::RegResult &result)
     {
-        int at = dnsIdToCmdIndex(id);
-        Command &c = commands[at];
+        int      at = dnsIdToCmdIndex(id);
+        Command &c  = commands[at];
 
-        if(!result.success)
-        {
+        if (!result.success) {
             QString errstr;
-            if(result.errorCode == QDnsSd::RegResult::ErrorConflict)
+            if (result.errorCode == QDnsSd::RegResult::ErrorConflict)
                 errstr = "Conflict";
             else
                 errstr = "Generic";
             printf("%2d: Error (%s).", c.id, qPrintable(errstr));
-            if(!result.lowLevelError.func.isEmpty())
+            if (!result.lowLevelError.func.isEmpty())
                 printf(" (%s, %d)", qPrintable(result.lowLevelError.func), result.lowLevelError.code);
             printf("\n");
             c.error = true;
@@ -342,8 +309,7 @@ int main(int argc, char **argv)
     QStringList args = qapp.arguments();
     args.removeFirst();
 
-    if(args.count() < 1)
-    {
+    if (args.count() < 1) {
         usage();
         return 1;
     }
@@ -351,35 +317,28 @@ int main(int argc, char **argv)
     // options
     QStringList txt;
 
-    for(int n = 0; n < args.count(); ++n)
-    {
+    for (int n = 0; n < args.count(); ++n) {
         QString s = args[n];
-        if(!s.startsWith("--"))
+        if (!s.startsWith("--"))
             continue;
         QString var;
         QString val;
-        int x = s.indexOf('=');
-        if(x != -1)
-        {
+        int     x = s.indexOf('=');
+        if (x != -1) {
             var = s.mid(2, x - 2);
             val = s.mid(x + 1);
-        }
-        else
-        {
+        } else {
             var = s.mid(2);
         }
 
         bool known = true;
 
-        if(var == "txt")
-        {
+        if (var == "txt") {
             txt = val.split(',');
-        }
-        else
+        } else
             known = false;
 
-        if(known)
-        {
+        if (known) {
             args.removeAt(n);
             --n; // adjust position
         }
@@ -388,89 +347,74 @@ int main(int argc, char **argv)
     // commands
     QList<Command> commands;
 
-    for(int n = 0; n < args.count(); ++n)
-    {
+    for (int n = 0; n < args.count(); ++n) {
         QString str = args[n];
-        int n = str.indexOf('=');
-        if(n == -1)
-        {
+        int     n   = str.indexOf('=');
+        if (n == -1) {
             printf("Error: bad format of command.\n");
             return 1;
         }
 
-        QString type = str.mid(0, n);
-        QString rest = str.mid(n + 1);
+        QString     type  = str.mid(0, n);
+        QString     rest  = str.mid(n + 1);
         QStringList parts = rest.split(',');
 
-        if(type == "q")
-        {
-            if(parts.count() < 2)
-            {
+        if (type == "q") {
+            if (parts.count() < 2) {
                 usage();
                 return 1;
             }
 
             Command c;
-            c.type = Command::Query;
-            c.name = parts[0];
+            c.type  = Command::Query;
+            c.name  = parts[0];
             c.rtype = parts[1].toInt();
             commands += c;
-        }
-        else if(type == "b")
-        {
-            if(parts.count() < 1)
-            {
+        } else if (type == "b") {
+            if (parts.count() < 1) {
                 usage();
                 return 1;
             }
 
             Command c;
-            c.type = Command::Browse;
+            c.type  = Command::Browse;
             c.stype = parts[0];
-            if(parts.count() >= 2)
+            if (parts.count() >= 2)
                 c.domain = parts[1];
             commands += c;
-        }
-        else if(type == "r")
-        {
-            if(parts.count() < 3)
-            {
+        } else if (type == "r") {
+            if (parts.count() < 3) {
                 usage();
                 return 1;
             }
 
             Command c;
-            c.type = Command::Resolve;
-            c.name = parts[0];
-            c.stype = parts[1];
+            c.type   = Command::Resolve;
+            c.name   = parts[0];
+            c.stype  = parts[1];
             c.domain = parts[2];
             commands += c;
-        }
-        else if(type == "e")
-        {
-            if(parts.count() < 3)
-            {
+        } else if (type == "e") {
+            if (parts.count() < 3) {
                 usage();
                 return 1;
             }
 
             Command c;
-            c.type = Command::Reg;
-            c.name = parts[0];
+            c.type  = Command::Reg;
+            c.name  = parts[0];
             c.stype = parts[1];
-            c.port = parts[2].toInt();
-            if(parts.count() >= 4)
+            c.port  = parts[2].toInt();
+            if (parts.count() >= 4)
                 c.domain = parts[3];
 
-            if(!txt.isEmpty())
-            {
+            if (!txt.isEmpty()) {
                 QList<QByteArray> strings;
-                foreach(const QString &str, txt)
+                foreach (const QString &str, txt)
                     strings += str.toUtf8();
 
                 QByteArray txtRecord = QDnsSd::createTxtRecord(strings);
-                if(txtRecord.isEmpty())
-                {
+                if (txtRecord.isEmpty()) {
                     printf("Error: failed to create TXT record, input too large or invalid\n");
                     return 1;
                 }
@@ -479,9 +423,7 @@ int main(int argc, char **argv)
             }
 
             commands += c;
-        }
-        else
-        {
+        } else {
             printf("Error: unknown command type '%s'.\n", qPrintable(type));
             return 1;
         }
diff --git a/src/irisnet/corelib/addressresolver.cpp b/src/irisnet/corelib/addressresolver.cpp
index d43f1dd4..9985797d 100644
--- a/src/irisnet/corelib/addressresolver.cpp
+++ b/src/irisnet/corelib/addressresolver.cpp
@@ -22,34 +22,24 @@
 #include "objectsession.h"
 
 namespace XMPP {
-class AddressResolver::Private : public QObject
-{
+class AddressResolver::Private : public QObject {
     Q_OBJECT
 
 public:
-    enum State
-    {
-        AddressWait,
-        AddressFirstCome
-    };
-
-    AddressResolver *q;
-    ObjectSession sess;
-    State state;
-    NameResolver req6;
-    NameResolver req4;
-    bool done6;
-    bool done4;
+    enum State { AddressWait, AddressFirstCome };
+
+    AddressResolver *   q;
+    ObjectSession       sess;
+    State               state;
+    NameResolver        req6;
+    NameResolver        req4;
+    bool                done6;
+    bool                done4;
     QList<QHostAddress> addrs6;
     QList<QHostAddress> addrs4;
-    QTimer *opTimer;
-
-    Private(AddressResolver *_q) :
-        QObject(_q),
-        q(_q),
-        sess(this),
-        req6(this),
-        req4(this)
+    QTimer *            opTimer;
+
+    Private(AddressResolver *_q) : QObject(_q), q(_q), sess(this), req6(this), req4(this)
     {
         connect(&req6, SIGNAL(resultsReady(QList<XMPP::NameRecord>)), SLOT(req6_resultsReady(QList<XMPP::NameRecord>)));
         connect(&req6, SIGNAL(error(XMPP::NameResolver::Error)), SLOT(req6_error(XMPP::NameResolver::Error)));
@@ -75,12 +65,11 @@ class AddressResolver::Private : public QObject
 
         // was an IP address used as input?
         QHostAddress addr;
-        if(addr.setAddress(QString::fromLatin1(hostName)))
-        {
+        if (addr.setAddress(QString::fromLatin1(hostName))) {
             // use this as the result, no need to perform dns query
             done6 = true;
             done4 = true;
-            if(addr.protocol() == QAbstractSocket::IPv6Protocol)
+            if (addr.protocol() == QAbstractSocket::IPv6Protocol)
                 addrs6 += addr;
             else
                 addrs4 += addr;
@@ -100,10 +89,7 @@ class AddressResolver::Private : public QObject
         req4.start(hostName, NameRecord::A);
     }
 
-    void stop()
-    {
-        cleanup();
-    }
+    void stop() { cleanup(); }
 
 private:
     void cleanup()
@@ -120,12 +106,11 @@ class AddressResolver::Private : public QObject
 
     bool tryDone()
     {
-        if((done6 && done4) || (state == AddressFirstCome && (done6 || done4)))
-        {
+        if ((done6 && done4) || (state == AddressFirstCome && (done6 || done4))) {
             QList<QHostAddress> results = addrs6 + addrs4;
             cleanup();
 
-            if(!results.isEmpty())
+            if (!results.isEmpty())
                 emit q->resultsReady(results);
             else
                 emit q->error(ErrorGeneric);
@@ -139,7 +124,7 @@ class AddressResolver::Private : public QObject
 private slots:
     void req6_resultsReady(const QList<XMPP::NameRecord> &results)
     {
-        foreach(const NameRecord &rec, results)
+        foreach (const NameRecord &rec, results)
             addrs6 += rec.address();
 
         done6 = true;
@@ -156,7 +141,7 @@ private slots:
 
     void req4_resultsReady(const QList<XMPP::NameRecord> &results)
     {
-        foreach(const NameRecord &rec, results)
+        foreach (const NameRecord &rec, results)
             addrs4 += rec.address();
 
         done4 = true;
@@ -175,36 +160,20 @@ private slots:
     {
         state = AddressFirstCome;
 
-        if(done6 || done4)
+        if (done6 || done4)
             tryDone();
     }
 
-    void ipAddress_input()
-    {
-        tryDone();
-    }
+    void ipAddress_input() { tryDone(); }
 };
 
-AddressResolver::AddressResolver(QObject *parent) :
-    QObject(parent)
-{
-    d = new Private(this);
-}
-
-AddressResolver::~AddressResolver()
-{
-    delete d;
-}
-
-void AddressResolver::start(const QByteArray &hostName)
-{
-    d->start(hostName);
-}
-
-void AddressResolver::stop()
-{
-    d->stop();
-}
+AddressResolver::AddressResolver(QObject *parent) : QObject(parent) { d = new Private(this); }
+
+AddressResolver::~AddressResolver() { delete d; }
+
+void AddressResolver::start(const QByteArray &hostName) { d->start(hostName); }
+
+void AddressResolver::stop() { d->stop(); }
 
 } // namespace XMPP
 
diff --git a/src/irisnet/corelib/addressresolver.h b/src/irisnet/corelib/addressresolver.h
index 39d1bee9..417574af 100644
--- a/src/irisnet/corelib/addressresolver.h
+++ b/src/irisnet/corelib/addressresolver.h
@@ -24,15 +24,11 @@
 
 namespace XMPP {
 // resolve both AAAA and A for a hostname
-class AddressResolver : public QObject
-{
+class AddressResolver : public QObject {
     Q_OBJECT
 
 public:
-    enum Error
-    {
-        ErrorGeneric
-    };
+    enum Error { ErrorGeneric };
 
     AddressResolver(QObject *parent = nullptr);
     ~AddressResolver();
diff --git a/src/irisnet/corelib/irisnetexport.h b/src/irisnet/corelib/irisnetexport.h
index 3eaf4970..0e07278b 100644
--- a/src/irisnet/corelib/irisnetexport.h
+++ b/src/irisnet/corelib/irisnetexport.h
@@ -22,13 +22,13 @@
 #include <QtGlobal>
 
 #ifdef IRISNET_STATIC
-# define IRISNET_EXPORT
+#define IRISNET_EXPORT
 #else
-# ifdef IRISNET_MAKEDLL
-#  define IRISNET_EXPORT Q_DECL_EXPORT
-# else
-#  define IRISNET_EXPORT Q_DECL_IMPORT
-# endif
+#ifdef IRISNET_MAKEDLL
+#define IRISNET_EXPORT Q_DECL_EXPORT
+#else
+#define IRISNET_EXPORT Q_DECL_IMPORT
+#endif
 #endif
 
 #endif // IRISNETEXPORT_H
diff --git a/src/irisnet/corelib/irisnetglobal.cpp b/src/irisnet/corelib/irisnetglobal.cpp
index 848b262d..4bd0dd23 100644
--- a/src/irisnet/corelib/irisnetglobal.cpp
+++ b/src/irisnet/corelib/irisnetglobal.cpp
@@ -37,65 +37,59 @@ extern IrisNetProvider *irisnet_createAppleProvider();
 //----------------------------------------------------------------------------
 // internal
 //----------------------------------------------------------------------------
-class PluginInstance
-{
+class PluginInstance {
 private:
     QPluginLoader *_loader;
-    QObject *_instance;
-    bool _ownInstance;
+    QObject *      _instance;
+    bool           _ownInstance;
 
-    PluginInstance()
-    {
-    }
+    PluginInstance() {}
 
 public:
     static PluginInstance *fromFile(const QString &fname)
     {
         QPluginLoader *loader = new QPluginLoader(fname);
-        if(!loader->load())
-        {
+        if (!loader->load()) {
             delete loader;
             return nullptr;
         }
         QObject *obj = loader->instance();
-        if(!obj)
-        {
+        if (!obj) {
             loader->unload();
             delete loader;
             return nullptr;
         }
         PluginInstance *i = new PluginInstance;
-        i->_loader = loader;
-        i->_instance = obj;
-        i->_ownInstance = true;
+        i->_loader        = loader;
+        i->_instance      = obj;
+        i->_ownInstance   = true;
         return i;
     }
 
     static PluginInstance *fromStatic(QObject *obj)
     {
         PluginInstance *i = new PluginInstance;
-        i->_loader = nullptr;
-        i->_instance = obj;
-        i->_ownInstance = false;
+        i->_loader        = nullptr;
+        i->_instance      = obj;
+        i->_ownInstance   = false;
         return i;
     }
 
     static PluginInstance *fromInstance(QObject *obj)
     {
         PluginInstance *i = new PluginInstance;
-        i->_loader = nullptr;
-        i->_instance = obj;
-        i->_ownInstance = true;
+        i->_loader        = nullptr;
+        i->_instance      = obj;
+        i->_ownInstance   = true;
         return i;
     }
 
     ~PluginInstance()
     {
-        if(_ownInstance)
+        if (_ownInstance)
             delete _instance;
 
-        if(_loader)
-        {
+        if (_loader) {
             _loader->unload();
             delete _loader;
         }
@@ -103,64 +97,53 @@ class PluginInstance
 
     void claim()
     {
-        if(_loader)
+        if (_loader)
             _loader->moveToThread(0);
-        if(_ownInstance)
+        if (_ownInstance)
             _instance->moveToThread(nullptr);
     }
 
-    QObject *instance()
-    {
-        return _instance;
-    }
+    QObject *instance() { return _instance; }
 
     bool sameType(const PluginInstance *other)
     {
-        if(!_instance || !other->_instance)
+        if (!_instance || !other->_instance)
             return false;
 
-        if(qstrcmp(_instance->metaObject()->className(), other->_instance->metaObject()->className()) != 0)
+        if (qstrcmp(_instance->metaObject()->className(), other->_instance->metaObject()->className()) != 0)
             return false;
 
         return true;
     }
 };
 
-class PluginManager
-{
+class PluginManager {
 public:
-    bool builtin_done;
-    QStringList paths;
-    QList<PluginInstance*> plugins;
-    QList<IrisNetProvider*> providers;
+    bool                     builtin_done;
+    QStringList              paths;
+    QList<PluginInstance *>  plugins;
+    QList<IrisNetProvider *> providers;
 
-    PluginManager()
-    {
-        builtin_done = false;
-    }
+    PluginManager() { builtin_done = false; }
 
-    ~PluginManager()
-    {
-        unload();
-    }
+    ~PluginManager() { unload(); }
 
     bool tryAdd(PluginInstance *i, bool lowPriority = false)
     {
         // is it the right kind of plugin?
-        IrisNetProvider *p = qobject_cast<IrisNetProvider*>(i->instance());
-        if(!p)
+        IrisNetProvider *p = qobject_cast<IrisNetProvider *>(i->instance());
+        if (!p)
             return false;
 
         // make sure we don't have it already
-        for(int n = 0; n < plugins.count(); ++n)
-        {
-            if(i->sameType(plugins[n]))
+        for (int n = 0; n < plugins.count(); ++n) {
+            if (i->sameType(plugins[n]))
                 return false;
         }
 
         i->claim();
         plugins += i;
-        if(lowPriority)
+        if (lowPriority)
             providers.append(p);
         else
             providers.prepend(p);
@@ -170,14 +153,13 @@ class PluginManager
     void addBuiltIn(IrisNetProvider *p)
     {
         PluginInstance *i = PluginInstance::fromInstance(p);
-        if(!tryAdd(i, true))
+        if (!tryAdd(i, true))
             delete i;
     }
 
     void scan()
     {
-        if(!builtin_done)
-        {
+        if (!builtin_done) {
             addBuiltIn(irisnet_createQtNetProvider()); // interfaces. crossplatform. no need to reimplement
 #ifdef Q_OS_UNIX
             addBuiltIn(irisnet_createUnixNetProvider()); // gateways
@@ -191,30 +173,27 @@ class PluginManager
         }
 
         QObjectList list = QPluginLoader::staticInstances();
-        for(int n = 0; n < list.count(); ++n)
-        {
+        for (int n = 0; n < list.count(); ++n) {
             PluginInstance *i = PluginInstance::fromStatic(list[n]);
-            if(!tryAdd(i))
+            if (!tryAdd(i))
                 delete i;
         }
-        for(int n = 0; n < paths.count(); ++n)
-        {
+        for (int n = 0; n < paths.count(); ++n) {
             QDir dir(paths[n]);
-            if(!dir.exists())
+            if (!dir.exists())
                 continue;
 
             QStringList entries = dir.entryList();
-            for(int k = 0; k < entries.count(); ++k)
-            {
+            for (int k = 0; k < entries.count(); ++k) {
                 QFileInfo fi(dir.filePath(entries[k]));
-                if(!fi.exists())
+                if (!fi.exists())
                     continue;
-                QString fname = fi.filePath();
-                PluginInstance *i = PluginInstance::fromFile(fname);
-                if(!i)
+                QString         fname = fi.filePath();
+                PluginInstance *i     = PluginInstance::fromFile(fname);
+                if (!i)
                     continue;
 
-                if(!tryAdd(i))
+                if (!tryAdd(i))
                     delete i;
             }
         }
@@ -223,8 +202,8 @@ class PluginManager
     void unload()
     {
         // unload in reverse order
-        QList<PluginInstance*> revlist;
-        for(int n = 0; n < plugins.count(); ++n)
+        QList<PluginInstance *> revlist;
+        for (int n = 0; n < plugins.count(); ++n)
             revlist.prepend(plugins[n]);
         qDeleteAll(revlist);
 
@@ -233,11 +212,10 @@ class PluginManager
     }
 };
 
-class IrisNetGlobal
-{
+class IrisNetGlobal {
 public:
-    QMutex m;
-    PluginManager pluginManager;
+    QMutex                        m;
+    PluginManager                 pluginManager;
     QList<IrisNetCleanUpFunction> cleanupList;
 };
 
@@ -249,7 +227,7 @@ static void deinit();
 static void init()
 {
     QMutexLocker locker(global_mutex());
-    if(global)
+    if (global)
         return;
 
     global = new IrisNetGlobal;
@@ -258,10 +236,10 @@ static void init()
 
 void deinit()
 {
-    if(!global)
+    if (!global)
         return;
 
-    while(!global->cleanupList.isEmpty())
+    while (!global->cleanupList.isEmpty())
         (global->cleanupList.takeFirst())();
 
     delete global;
@@ -293,7 +271,7 @@ void irisNetAddPostRoutine(IrisNetCleanUpFunction func)
     global->cleanupList.prepend(func);
 }
 
-QList<IrisNetProvider*> irisNetProviders()
+QList<IrisNetProvider *> irisNetProviders()
 {
     init();
 
diff --git a/src/irisnet/corelib/irisnetglobal_p.h b/src/irisnet/corelib/irisnetglobal_p.h
index 2864627e..0ff31856 100644
--- a/src/irisnet/corelib/irisnetglobal_p.h
+++ b/src/irisnet/corelib/irisnetglobal_p.h
@@ -26,7 +26,7 @@ namespace XMPP {
 typedef void (*IrisNetCleanUpFunction)();
 
 IRISNET_EXPORT void irisNetAddPostRoutine(IrisNetCleanUpFunction func);
-IRISNET_EXPORT QList<IrisNetProvider*> irisNetProviders();
+IRISNET_EXPORT QList<IrisNetProvider *> irisNetProviders();
 } // namespace XMPP
 
 #endif // IRISNETGLOBAL_P_H
diff --git a/src/irisnet/corelib/irisnetplugin.cpp b/src/irisnet/corelib/irisnetplugin.cpp
index 6e1faaae..a2d24fe7 100644
--- a/src/irisnet/corelib/irisnetplugin.cpp
+++ b/src/irisnet/corelib/irisnetplugin.cpp
@@ -22,48 +22,24 @@ namespace XMPP {
 //----------------------------------------------------------------------------
 // IrisNetProvider
 //----------------------------------------------------------------------------
-NetInterfaceProvider *IrisNetProvider::createNetInterfaceProvider()
-{
-    return nullptr;
-}
+NetInterfaceProvider *IrisNetProvider::createNetInterfaceProvider() { return nullptr; }
 
-NetGatewayProvider *IrisNetProvider::createNetGatewayProvider()
-{
-    return nullptr;
-}
+NetGatewayProvider *IrisNetProvider::createNetGatewayProvider() { return nullptr; }
 
-NetAvailabilityProvider *IrisNetProvider::createNetAvailabilityProvider()
-{
-    return nullptr;
-}
+NetAvailabilityProvider *IrisNetProvider::createNetAvailabilityProvider() { return nullptr; }
 
-NameProvider *IrisNetProvider::createNameProviderInternet()
-{
-    return nullptr;
-}
+NameProvider *IrisNetProvider::createNameProviderInternet() { return nullptr; }
 
-NameProvider *IrisNetProvider::createNameProviderLocal()
-{
-    return nullptr;
-}
+NameProvider *IrisNetProvider::createNameProviderLocal() { return nullptr; }
 
-ServiceProvider *IrisNetProvider::createServiceProvider()
-{
-    return nullptr;
-}
+ServiceProvider *IrisNetProvider::createServiceProvider() { return nullptr; }
 
 //----------------------------------------------------------------------------
 // NameProvider
 //----------------------------------------------------------------------------
-bool NameProvider::supportsSingle() const
-{
-    return false;
-}
+bool NameProvider::supportsSingle() const { return false; }
 
-bool NameProvider::supportsLongLived() const
-{
-    return false;
-}
+bool NameProvider::supportsLongLived() const { return false; }
 
 bool NameProvider::supportsRecordType(int type) const
 {
diff --git a/src/irisnet/corelib/irisnetplugin.h b/src/irisnet/corelib/irisnetplugin.h
index 5005129c..a3844de4 100644
--- a/src/irisnet/corelib/irisnetplugin.h
+++ b/src/irisnet/corelib/irisnetplugin.h
@@ -31,107 +31,88 @@ class NetGatewayProvider;
 class NetInterfaceProvider;
 class ServiceProvider;
 
-class IRISNET_EXPORT IrisNetProvider : public QObject
-{
+class IRISNET_EXPORT IrisNetProvider : public QObject {
     Q_OBJECT
 
 public:
-    virtual NetInterfaceProvider *createNetInterfaceProvider();
-    virtual NetGatewayProvider *createNetGatewayProvider();
+    virtual NetInterfaceProvider *   createNetInterfaceProvider();
+    virtual NetGatewayProvider *     createNetGatewayProvider();
     virtual NetAvailabilityProvider *createNetAvailabilityProvider();
-    virtual NameProvider *createNameProviderInternet();
-    virtual NameProvider *createNameProviderLocal();
-    virtual ServiceProvider *createServiceProvider();
+    virtual NameProvider *           createNameProviderInternet();
+    virtual NameProvider *           createNameProviderLocal();
+    virtual ServiceProvider *        createServiceProvider();
 };
 
-class IRISNET_EXPORT NetInterfaceProvider : public QObject
-{
+class IRISNET_EXPORT NetInterfaceProvider : public QObject {
     Q_OBJECT
 
 public:
-    class Info
-    {
+    class Info {
     public:
-        QString id, name;
-        bool isLoopback;
+        QString             id, name;
+        bool                isLoopback;
         QList<QHostAddress> addresses;
     };
 
-    NetInterfaceProvider(QObject *parent = nullptr) :
-        QObject(parent)
-    {
-    }
+    NetInterfaceProvider(QObject *parent = nullptr) : QObject(parent) {}
 
     // calling start should populate an initial list that can be
     //   immediately fetched.  do not signal updated() for this.
-    virtual void start() = 0;
+    virtual void        start()            = 0;
     virtual QList<Info> interfaces() const = 0;
 
 signals:
     void updated();
 };
 
-class IRISNET_EXPORT NetGatewayProvider : public QObject
-{
+class IRISNET_EXPORT NetGatewayProvider : public QObject {
     Q_OBJECT
 
 public:
-    class Info
-    {
+    class Info {
     public:
-        QString ifaceId;
+        QString      ifaceId;
         QHostAddress gateway;
     };
 
-    NetGatewayProvider(QObject *parent = nullptr) :
-        QObject(parent)
-    {
-    }
+    NetGatewayProvider(QObject *parent = nullptr) : QObject(parent) {}
 
     // calling start should populate an initial list that can be
     //   immediately fetched.  do not signal updated() for this.
-    virtual void start() = 0;
+    virtual void        start()          = 0;
     virtual QList<Info> gateways() const = 0;
 
 signals:
     void updated();
 };
 
-class IRISNET_EXPORT NetAvailabilityProvider : public QObject
-{
+class IRISNET_EXPORT NetAvailabilityProvider : public QObject {
     Q_OBJECT
 
 public:
-    NetAvailabilityProvider(QObject *parent = nullptr) :
-        QObject(parent)
-    {
-    }
+    NetAvailabilityProvider(QObject *parent = nullptr) : QObject(parent) {}
 
     // calling start should populate an initial value that can be
     //   immediately fetched.  do not signal updated() for this.
-    virtual void start() = 0;
+    virtual void start()             = 0;
     virtual bool isAvailable() const = 0;
 
 signals:
     void updated();
 };
 
-class IRISNET_EXPORT NameProvider : public QObject
-{
+class IRISNET_EXPORT NameProvider : public QObject {
     Q_OBJECT
 
 public:
-    NameProvider(QObject *parent = nullptr) :
-        QObject(parent)
-    {
-    }
+    NameProvider(QObject *parent = nullptr) : QObject(parent) {}
 
     virtual bool supportsSingle() const;
     virtual bool supportsLongLived() const;
     virtual bool supportsRecordType(int type) const;
 
-    virtual int resolve_start(const QByteArray &name, int qType, bool longLived) = 0;
-    virtual void resolve_stop(int id) = 0;
+    virtual int  resolve_start(const QByteArray &name, int qType, bool longLived) = 0;
+    virtual void resolve_stop(int id)                                             = 0;
 
     // transfer from local back to internet
     virtual void resolve_localResultsReady(int id, const QList<XMPP::NameRecord> &results);
@@ -145,35 +126,32 @@ class IRISNET_EXPORT NameProvider : public QObject
     void resolve_useLocal(int id, const QByteArray &name);
 };
 
-class IRISNET_EXPORT ServiceProvider : public QObject
-{
+class IRISNET_EXPORT ServiceProvider : public QObject {
     Q_OBJECT
 
 public:
-    class ResolveResult
-    {
+    class ResolveResult {
     public:
-        QMap<QString,QByteArray> attributes;
-        QHostAddress address;
-        int port;
-        QByteArray hostName; // optional
+        QMap<QString, QByteArray> attributes;
+        QHostAddress              address;
+        int                       port;
+        QByteArray                hostName; // optional
     };
 
-    ServiceProvider(QObject *parent = nullptr) :
-        QObject(parent)
-    {
-    }
-
-    virtual int browse_start(const QString &type, const QString &domain) = 0;
-    virtual void browse_stop(int id) = 0;
-    virtual int resolve_start(const QByteArray &name) = 0;
-    virtual void resolve_stop(int id) = 0;
-    virtual int publish_start(const QString &instance, const QString &type, int port, const QMap<QString,QByteArray> &attributes) = 0;
-    virtual void publish_update(int id, const QMap<QString,QByteArray> &attributes) = 0;
-    virtual void publish_stop(int id) = 0;
-    virtual int publish_extra_start(int pub_id, const NameRecord &name) = 0;
-    virtual void publish_extra_update(int id, const NameRecord &name) = 0;
-    virtual void publish_extra_stop(int id) = 0;
+    ServiceProvider(QObject *parent = nullptr) : QObject(parent) {}
+
+    virtual int  browse_start(const QString &type, const QString &domain) = 0;
+    virtual void browse_stop(int id)                                      = 0;
+    virtual int  resolve_start(const QByteArray &name)                    = 0;
+    virtual void resolve_stop(int id)                                     = 0;
+    virtual int  publish_start(const QString &instance, const QString &type, int port,
+                               const QMap<QString, QByteArray> &attributes)
+        = 0;
+    virtual void publish_update(int id, const QMap<QString, QByteArray> &attributes) = 0;
+    virtual void publish_stop(int id)                                                = 0;
+    virtual int  publish_extra_start(int pub_id, const NameRecord &name)             = 0;
+    virtual void publish_extra_update(int id, const NameRecord &name)                = 0;
+    virtual void publish_extra_stop(int id)                                          = 0;
 
 signals:
     void browse_instanceAvailable(int id, const XMPP::ServiceInstance &instance);
@@ -192,10 +170,10 @@ class IRISNET_EXPORT ServiceProvider : public QObject
 };
 } // namespace XMPP
 
-Q_DECLARE_INTERFACE(XMPP::NetGatewayProvider,   "com.affinix.irisnet.IrisGatewayProvider/1.0")
-Q_DECLARE_INTERFACE(XMPP::IrisNetProvider,      "com.affinix.irisnet.IrisNetProvider/1.0")
+Q_DECLARE_INTERFACE(XMPP::NetGatewayProvider, "com.affinix.irisnet.IrisGatewayProvider/1.0")
+Q_DECLARE_INTERFACE(XMPP::IrisNetProvider, "com.affinix.irisnet.IrisNetProvider/1.0")
 Q_DECLARE_INTERFACE(XMPP::NetInterfaceProvider, "com.affinix.irisnet.NetInterfaceProvider/2.0")
-Q_DECLARE_INTERFACE(XMPP::NameProvider,         "com.affinix.irisnet.NameProvider/1.0")
-Q_DECLARE_INTERFACE(XMPP::ServiceProvider,      "com.affinix.irisnet.ServiceProvider/1.0")
+Q_DECLARE_INTERFACE(XMPP::NameProvider, "com.affinix.irisnet.NameProvider/1.0")
+Q_DECLARE_INTERFACE(XMPP::ServiceProvider, "com.affinix.irisnet.ServiceProvider/1.0")
 
 #endif // IRISNETPLUGIN_H
diff --git a/src/irisnet/corelib/netavailability.cpp b/src/irisnet/corelib/netavailability.cpp
index 782e3c68..1172dcae 100644
--- a/src/irisnet/corelib/netavailability.cpp
+++ b/src/irisnet/corelib/netavailability.cpp
@@ -19,30 +19,18 @@
 #include "netavailability.h"
 
 namespace XMPP {
-class NetAvailability::Private : public QObject
-{
+class NetAvailability::Private : public QObject {
     Q_OBJECT
 
 public:
     NetAvailability *q;
 
-    Private(NetAvailability *_q) :
-        QObject(_q),
-        q(_q)
-    {
-    }
+    Private(NetAvailability *_q) : QObject(_q), q(_q) {}
 };
 
-NetAvailability::NetAvailability(QObject *parent) :
-    QObject(parent)
-{
-    d = new Private(this);
-}
+NetAvailability::NetAvailability(QObject *parent) : QObject(parent) { d = new Private(this); }
 
-NetAvailability::~NetAvailability()
-{
-    delete d;
-}
+NetAvailability::~NetAvailability() { delete d; }
 
 bool NetAvailability::isAvailable() const
 {
diff --git a/src/irisnet/corelib/netavailability.h b/src/irisnet/corelib/netavailability.h
index 884957a6..aa9da916 100644
--- a/src/irisnet/corelib/netavailability.h
+++ b/src/irisnet/corelib/netavailability.h
@@ -22,8 +22,7 @@
 #include "irisnetglobal.h"
 
 namespace XMPP {
-class NetAvailability : public QObject
-{
+class NetAvailability : public QObject {
     Q_OBJECT
 
 public:
diff --git a/src/irisnet/corelib/netinterface.cpp b/src/irisnet/corelib/netinterface.cpp
index 17564818..4824541d 100644
--- a/src/irisnet/corelib/netinterface.cpp
+++ b/src/irisnet/corelib/netinterface.cpp
@@ -32,19 +32,22 @@ namespace XMPP {
 class NetTracker : public QObject {
     Q_OBJECT
 public:
-    QList<NetInterfaceProvider::Info> getInterfaces() {
+    QList<NetInterfaceProvider::Info> getInterfaces()
+    {
         QMutexLocker locker(&m);
 
         return info;
     }
 
-    NetTracker() {
-        QList<IrisNetProvider*> list = irisNetProviders();
+    NetTracker()
+    {
+        QList<IrisNetProvider *> list = irisNetProviders();
 
         c = nullptr;
-        foreach(IrisNetProvider* p, list) {
+        foreach (IrisNetProvider *p, list) {
             c = p->createNetInterfaceProvider();
-            if(c) break;
+            if (c)
+                break;
         }
         Q_ASSERT(c); // we have built-in support, so this should never fail
         connect(c, SIGNAL(updated()), SLOT(c_updated()));
@@ -53,26 +56,29 @@ class NetTracker : public QObject {
         info = filterList(c->interfaces());
     }
 
-    ~NetTracker() {
+    ~NetTracker()
+    {
         QMutexLocker locker(&m);
         delete c;
     }
 
 signals:
     void updated();
-private:
 
-    static QList<NetInterfaceProvider::Info> filterList(const QList<NetInterfaceProvider::Info> &in) {
+private:
+    static QList<NetInterfaceProvider::Info> filterList(const QList<NetInterfaceProvider::Info> &in)
+    {
         QList<NetInterfaceProvider::Info> out;
-        for(int n = 0; n < in.count(); ++n)
-        {
-            if(!in[n].isLoopback) out += in[n];
+        for (int n = 0; n < in.count(); ++n) {
+            if (!in[n].isLoopback)
+                out += in[n];
         }
         return out;
     }
 
 private slots:
-    void c_updated() {
+    void c_updated()
+    {
         {
             QMutexLocker locker(&m);
             info = filterList(c->interfaces());
@@ -82,10 +88,9 @@ private slots:
 
 private:
     // this are all protected by m
-    NetInterfaceProvider *c;
-    QMutex m;
+    NetInterfaceProvider *            c;
+    QMutex                            m;
     QList<NetInterfaceProvider::Info> info;
-
 };
 
 // Global because static getRef needs this too.
@@ -97,7 +102,8 @@ class NetTrackerThread : public QThread {
     /** Get a reference to the NetTracker singleton.
         Calls to getInterfaces will immediately give valid results
      */
-    static NetTrackerThread* getRef() {
+    static NetTrackerThread *getRef()
+    {
         QMutexLocker locker(nettracker_mutex());
 
         if (!self) {
@@ -109,7 +115,8 @@ class NetTrackerThread : public QThread {
 
     /** Release reference.
      */
-    void releaseRef() {
+    void releaseRef()
+    {
         QMutexLocker locker(nettracker_mutex());
 
         Q_ASSERT(refs > 0);
@@ -122,18 +129,19 @@ class NetTrackerThread : public QThread {
         }
     }
 
-    QList<NetInterfaceProvider::Info> getInterfaces() {
-        return nettracker->getInterfaces();
-    }
+    QList<NetInterfaceProvider::Info> getInterfaces() { return nettracker->getInterfaces(); }
 
-    ~NetTrackerThread() {
+    ~NetTrackerThread()
+    {
         // locked from caller
     }
 
 signals:
     void updated();
+
 private:
-    NetTrackerThread() {
+    NetTrackerThread()
+    {
         // locked from caller
         refs = 0;
         moveToThread(QCoreApplication::instance()->thread());
@@ -147,7 +155,8 @@ class NetTrackerThread : public QThread {
         startMutex = nullptr;
     }
 
-    void run() {
+    void run()
+    {
         {
             QMutexLocker locker(startMutex);
 
@@ -163,11 +172,11 @@ class NetTrackerThread : public QThread {
 
 private:
     QWaitCondition startCond;
-    QMutex *startMutex;
+    QMutex *       startMutex;
     // these are all protected by global nettracker_mutex.
-    int refs;
+    int                      refs;
     static NetTrackerThread *self;
-    NetTracker *nettracker;
+    NetTracker *             nettracker;
 };
 
 NetTrackerThread *NetTrackerThread::self = nullptr;
@@ -175,8 +184,7 @@ NetTrackerThread *NetTrackerThread::self = nullptr;
 //----------------------------------------------------------------------------
 // NetInterface
 //----------------------------------------------------------------------------
-class NetInterfacePrivate : public QObject
-{
+class NetInterfacePrivate : public QObject {
     Q_OBJECT
 public:
     friend class NetInterfaceManagerPrivate;
@@ -184,36 +192,34 @@ class NetInterfacePrivate : public QObject
     NetInterface *q;
 
     QPointer<NetInterfaceManager> man;
-    bool valid;
-    QString id, name;
-    QList<QHostAddress> addrs;
+    bool                          valid;
+    QString                       id, name;
+    QList<QHostAddress>           addrs;
 
-    NetInterfacePrivate(NetInterface *_q) : QObject(_q), q(_q)
-    {
-        valid = false;
-    }
+    NetInterfacePrivate(NetInterface *_q) : QObject(_q), q(_q) { valid = false; }
 
     void doUnavailable()
     {
-        if (!valid) return;
+        if (!valid)
+            return;
         valid = false;
-        if (man.isNull()) return;
+        if (man.isNull())
+            return;
         man->unreg(q);
         emit q->unavailable();
     }
 };
 
-NetInterface::NetInterface(const QString &id, NetInterfaceManager *manager)
-                : QObject(manager)
+NetInterface::NetInterface(const QString &id, NetInterfaceManager *manager) : QObject(manager)
 {
-    d = new NetInterfacePrivate(this);
+    d      = new NetInterfacePrivate(this);
     d->man = manager;
 
     NetInterfaceProvider::Info *info = (NetInterfaceProvider::Info *)d->man->reg(id, this);
     if (info) {
         d->valid = true;
-        d->id = info->id;
-        d->name = info->name;
+        d->id    = info->id;
+        d->name  = info->name;
         d->addrs = info->addresses;
         delete info;
     }
@@ -221,42 +227,30 @@ NetInterface::NetInterface(const QString &id, NetInterfaceManager *manager)
 
 NetInterface::~NetInterface()
 {
-    if (d->valid && !d->man.isNull()) d->man->unreg(this);
+    if (d->valid && !d->man.isNull())
+        d->man->unreg(this);
     delete d;
 }
 
-bool NetInterface::isValid() const
-{
-    return d->valid && !d->man.isNull();
-}
+bool NetInterface::isValid() const { return d->valid && !d->man.isNull(); }
 
-QString NetInterface::id() const
-{
-    return d->id;
-}
+QString NetInterface::id() const { return d->id; }
 
-QString NetInterface::name() const
-{
-    return d->name;
-}
+QString NetInterface::name() const { return d->name; }
 
-QList<QHostAddress> NetInterface::addresses() const
-{
-    return d->addrs;
-}
+QList<QHostAddress> NetInterface::addresses() const { return d->addrs; }
 
 //----------------------------------------------------------------------------
 // NetInterfaceManager
 //----------------------------------------------------------------------------
-class NetInterfaceManagerPrivate : public QObject
-{
+class NetInterfaceManagerPrivate : public QObject {
     Q_OBJECT
 public:
     NetInterfaceManager *q;
 
     QList<NetInterfaceProvider::Info> info;
-    QList<NetInterface*> listeners;
-    NetTrackerThread *tracker;
+    QList<NetInterface *>             listeners;
+    NetTrackerThread *                tracker;
 
     bool pending;
 
@@ -267,15 +261,17 @@ class NetInterfaceManagerPrivate : public QObject
         connect(tracker, SIGNAL(updated()), SLOT(tracker_updated()));
     }
 
-    ~NetInterfaceManagerPrivate() {
+    ~NetInterfaceManagerPrivate()
+    {
         tracker->releaseRef();
         tracker = nullptr;
     }
 
     static int lookup(const QList<NetInterfaceProvider::Info> &list, const QString &id)
     {
-        for(int n = 0; n < list.count(); ++n) {
-            if(list[n].id == id) return n;
+        for (int n = 0; n < list.count(); ++n) {
+            if (list[n].id == id)
+                return n;
         }
         return -1;
     }
@@ -294,13 +290,12 @@ class NetInterfaceManagerPrivate : public QObject
         QStringList here_ids, gone_ids;
 
         // removed / changed
-        for(int n = 0; n < info.count(); ++n)
-        {
+        for (int n = 0; n < info.count(); ++n) {
             int i = lookup(newinfo, info[n].id);
             // id is still here
-            if(i != -1) {
+            if (i != -1) {
                 // content changed?
-                if(!sameContent(info[n], newinfo[i])) {
+                if (!sameContent(info[n], newinfo[i])) {
                     gone_ids += info[n].id;
                     here_ids += info[n].id;
                 }
@@ -310,29 +305,29 @@ class NetInterfaceManagerPrivate : public QObject
         }
 
         // added
-        for(int n = 0; n < newinfo.count(); ++n) {
+        for (int n = 0; n < newinfo.count(); ++n) {
             int i = lookup(info, newinfo[n].id);
-            if(i == -1)
+            if (i == -1)
                 here_ids += newinfo[n].id;
         }
         info = newinfo;
 
         // announce gone
-        for(int n = 0; n < gone_ids.count(); ++n) {
+        for (int n = 0; n < gone_ids.count(); ++n) {
             // work on a copy, just in case the list changes.
             //   it is important to make the copy here, and not
             //   outside the outer loop, in case the items
             //   get deleted
-            QList<NetInterface*> list = listeners;
-            for(int i = 0; i < list.count(); ++i) {
-                if(list[i]->d->id == gone_ids[n]) {
+            QList<NetInterface *> list = listeners;
+            for (int i = 0; i < list.count(); ++i) {
+                if (list[i]->d->id == gone_ids[n]) {
                     list[i]->d->doUnavailable();
                 }
             }
         }
 
         // announce here
-        for(int n = 0; n < here_ids.count(); ++n)
+        for (int n = 0; n < here_ids.count(); ++n)
             emit q->interfaceAvailable(here_ids[n]);
     }
 
@@ -340,7 +335,7 @@ public slots:
     void tracker_updated()
     {
         // collapse multiple updates by queuing up an update if there isn't any queued yet.
-        if(!pending) {
+        if (!pending) {
             QMetaObject::invokeMethod(this, "update", Qt::QueuedConnection);
             pending = true;
         }
@@ -353,22 +348,18 @@ public slots:
     }
 };
 
-NetInterfaceManager::NetInterfaceManager(QObject *parent)
-                :QObject(parent)
+NetInterfaceManager::NetInterfaceManager(QObject *parent) : QObject(parent)
 {
     d = new NetInterfaceManagerPrivate(this);
 }
 
-NetInterfaceManager::~NetInterfaceManager()
-{
-    delete d;
-}
+NetInterfaceManager::~NetInterfaceManager() { delete d; }
 
 QStringList NetInterfaceManager::interfaces() const
 {
     d->info = d->tracker->getInterfaces();
     QStringList out;
-    for(int n = 0; n < d->info.count(); ++n) {
+    for (int n = 0; n < d->info.count(); ++n) {
         out += d->info[n].id;
     }
     return out;
@@ -377,18 +368,19 @@ QStringList NetInterfaceManager::interfaces() const
 QString NetInterfaceManager::interfaceForAddress(const QHostAddress &a)
 {
     NetInterfaceManager netman;
-    QStringList list = netman.interfaces();
-    for(int n = 0; n < list.count(); ++n) {
+    QStringList         list = netman.interfaces();
+    for (int n = 0; n < list.count(); ++n) {
         NetInterface iface(list[n], &netman);
-        if(iface.addresses().contains(a)) return list[n];
+        if (iface.addresses().contains(a))
+            return list[n];
     }
     return QString();
 }
 
 void *NetInterfaceManager::reg(const QString &id, NetInterface *i)
 {
-    for(int n = 0; n < d->info.count(); ++n) {
-        if(d->info[n].id == id) {
+    for (int n = 0; n < d->info.count(); ++n) {
+        if (d->info[n].id == id) {
             d->listeners += i;
             return new NetInterfaceProvider::Info(d->info[n]);
         }
@@ -396,10 +388,7 @@ void *NetInterfaceManager::reg(const QString &id, NetInterface *i)
     return nullptr;
 }
 
-void NetInterfaceManager::unreg(NetInterface *i)
-{
-    d->listeners.removeAll(i);
-}
+void NetInterfaceManager::unreg(NetInterface *i) { d->listeners.removeAll(i); }
 } // namespace XMPP
 
 #include "netinterface.moc"
diff --git a/src/irisnet/corelib/netinterface.h b/src/irisnet/corelib/netinterface.h
index 1d1e7b4a..9bdd939f 100644
--- a/src/irisnet/corelib/netinterface.h
+++ b/src/irisnet/corelib/netinterface.h
@@ -29,9 +29,11 @@ class NetInterfacePrivate;
 /**
    \brief Provides information about a network interface
 
-   NetInterface provides information about a particular network interface.  Construct it by passing the interface id of interest (e.g. "eth0") and a NetInterfaceManager parent object.  Interface ids can be obtained from NetInterfaceManager.
+   NetInterface provides information about a particular network interface.  Construct it by passing the interface id of
+interest (e.g. "eth0") and a NetInterfaceManager parent object.  Interface ids can be obtained from NetInterfaceManager.
 
-   To test if a NetInterface is valid, call isValid().  Use name() to return a display-friendly name of the interface.  The addresses() function returns a list of IP addresses for this interface.
+   To test if a NetInterface is valid, call isValid().  Use name() to return a display-friendly name of the interface.
+The addresses() function returns a list of IP addresses for this interface.
 
    Here's an example of how to print the IP addresses of eth0:
    \code
@@ -48,14 +50,15 @@ if(iface.isValid())
 
    \sa NetInterfaceManager
 */
-class IRISNET_EXPORT NetInterface : public QObject
-{
+class IRISNET_EXPORT NetInterface : public QObject {
     Q_OBJECT
 public:
     /**
        \brief Constructs a new interface object with the given \a id and \a manager
 
-       If \a id is not a valid interface id, then the object will not be valid (isValid() will return false).  Normally it is not necessary to check for validity, since interface ids obtained from NetInterfaceManager are guaranteed to be valid until the event loop resumes.
+       If \a id is not a valid interface id, then the object will not be valid (isValid() will return false).  Normally
+       it is not necessary to check for validity, since interface ids obtained from NetInterfaceManager are guaranteed
+       to be valid until the event loop resumes.
 
        \sa isValid
     */
@@ -92,7 +95,8 @@ class IRISNET_EXPORT NetInterface : public QObject
     /**
        \brief Returns the addresses of this interface
 
-       There will always be at least one address.  In some cases there might be multiple, such as on Unix where it is possible for the same interface to have both an IPv4 and an IPv6 address.
+       There will always be at least one address.  In some cases there might be multiple, such as on Unix where it is
+       possible for the same interface to have both an IPv4 and an IPv6 address.
     */
     QList<QHostAddress> addresses() const;
 
@@ -100,7 +104,8 @@ class IRISNET_EXPORT NetInterface : public QObject
     /**
        \brief Notifies when the interface becomes unavailable
 
-       Once this signal is emitted, the NetInterface object becomes invalid and is no longer very useful.  A new NetInterface object must be created if a valid object with current information is desired.
+       Once this signal is emitted, the NetInterface object becomes invalid and is no longer very useful.  A new
+       NetInterface object must be created if a valid object with current information is desired.
 
        \note If the interface information changes, the interface is considered to have become unavailable.
 
@@ -122,7 +127,8 @@ class IRISNET_EXPORT NetInterface : public QObject
 
    An interface is considered available if it exists, is "Up", has at least one IP address, and is non-Loopback.
 
-   The interfaces() function returns a list of available interface ids.  These ids can be used with NetInterface to get information about the interfaces.  For example, here is how you could print the names of the available interfaces:
+   The interfaces() function returns a list of available interface ids.  These ids can be used with NetInterface to get
+information about the interfaces.  For example, here is how you could print the names of the available interfaces:
 
    \code
 NetInterfaceManager netman;
@@ -134,14 +140,16 @@ for(int n = 0; n < id_list.count(); ++n)
 }
    \endcode
 
-   When a new network interface is available, the interfaceAvailable() signal will be emitted.  Note that interface unavailability is not notified by NetInterfaceManager.  Instead, use NetInterface to monitor a specific network interface for unavailability.
+   When a new network interface is available, the interfaceAvailable() signal will be emitted.  Note that interface
+unavailability is not notified by NetInterfaceManager.  Instead, use NetInterface to monitor a specific network
+interface for unavailability.
 
-   Interface ids obtained through NetInterfaceManager are guaranteed to be valid until the event loop resumes, or until the next call to interfaces() or interfaceForAddress().
+   Interface ids obtained through NetInterfaceManager are guaranteed to be valid until the event loop resumes, or until
+the next call to interfaces() or interfaceForAddress().
 
    \sa NetInterface
 */
-class IRISNET_EXPORT NetInterfaceManager : public QObject
-{
+class IRISNET_EXPORT NetInterfaceManager : public QObject {
     Q_OBJECT
 public:
     /**
@@ -165,7 +173,8 @@ class IRISNET_EXPORT NetInterfaceManager : public QObject
     /**
        \brief Looks up an interface id by IP address
 
-       This function looks for an interface that has the address \a a.  If there is no such interface, a null string is returned.
+       This function looks for an interface that has the address \a a.  If there is no such interface, a null string is
+returned.
 
        This is useful for determing the network interface associated with an outgoing QTcpSocket:
 
@@ -193,7 +202,7 @@ QString iface = NetInterfaceManager::interfaceForAddress(tcpSocket->localAddress
     friend class NetInterfacePrivate;
 
     void *reg(const QString &id, NetInterface *i);
-    void unreg(NetInterface *i);
+    void  unreg(NetInterface *i);
 };
 } // namespace XMPP
 
diff --git a/src/irisnet/corelib/netinterface_qtname.cpp b/src/irisnet/corelib/netinterface_qtname.cpp
index ddfcc931..3c96a4e1 100644
--- a/src/irisnet/corelib/netinterface_qtname.cpp
+++ b/src/irisnet/corelib/netinterface_qtname.cpp
@@ -21,49 +21,40 @@
 #include <QNetworkInterface>
 
 namespace XMPP {
-class IrisQtName : public NameProvider
-{
+class IrisQtName : public NameProvider {
     Q_OBJECT
     Q_INTERFACES(XMPP::NameProvider)
 
     struct Query {
-        bool isHostInfo;
+        bool     isHostInfo;
         quintptr handle;
     };
 
-    int currentId;
-    QHash<int,Query> lookups;
-    QHash<int,int> hostInfo; // we need all these tricks with double mapping because we still support Qt 5.5.1. (5.12 is way better)
+    int               currentId;
+    QHash<int, Query> lookups;
+    QHash<int, int>   hostInfo; // we need all these tricks with double mapping because we still support Qt 5.5.1. (5.12
+                                // is way better)
 
 public:
-    IrisQtName(QObject *parent = nullptr) :
-        NameProvider(parent),
-        currentId(0)
-    {
-
-    }
+    IrisQtName(QObject *parent = nullptr) : NameProvider(parent), currentId(0) {}
 
     ~IrisQtName()
     {
-        for (auto const &l: lookups) {
+        for (auto const &l : lookups) {
             if (!l.isHostInfo) {
-                delete reinterpret_cast<QDnsLookup*>(l.handle);
+                delete reinterpret_cast<QDnsLookup *>(l.handle);
             }
         }
     }
 
-    bool supportsSingle() const
-    {
-        return true;
-    }
+    bool supportsSingle() const { return true; }
 
     bool supportsRecordType(int type) const
     {
         // yes the types matched to ones from jdns, so it's fine.
-        static QVector<int> types = {
-            QDnsLookup::A, QDnsLookup::AAAA, QDnsLookup::ANY,
-            QDnsLookup::CNAME, QDnsLookup::MX, QDnsLookup::NS,
-            QDnsLookup::PTR, QDnsLookup::SRV, QDnsLookup::TXT};
+        static QVector<int> types
+            = { QDnsLookup::A,  QDnsLookup::AAAA, QDnsLookup::ANY, QDnsLookup::CNAME, QDnsLookup::MX,
+                QDnsLookup::NS, QDnsLookup::PTR,  QDnsLookup::SRV, QDnsLookup::TXT };
         return types.contains(type);
     }
 
@@ -76,22 +67,22 @@ class IrisQtName : public NameProvider
         QHostAddress addr(QString::fromLatin1(name));
         if (!addr.isNull()) {
             QList<XMPP::NameRecord> results;
-            XMPP::NameRecord r;
+            XMPP::NameRecord        r;
             r.setAddress(addr);
             results.append(r);
-            QMetaObject::invokeMethod(this, "resolve_resultsReady", Qt::QueuedConnection,
-                                      Q_ARG(int, id), Q_ARG(QList<XMPP::NameRecord>, results));
+            QMetaObject::invokeMethod(this, "resolve_resultsReady", Qt::QueuedConnection, Q_ARG(int, id),
+                                      Q_ARG(QList<XMPP::NameRecord>, results));
         } else {
             if (qType == QDnsLookup::A || qType == QDnsLookup::AAAA) {
                 // QDnsLookup doesn't support A and AAAA according to docs (see corresponding note)
                 int hiid = QHostInfo::lookupHost(QString::fromLatin1(name), this, SLOT(hostInfoFinished(QHostInfo)));
                 hostInfo.insert(hiid, id);
-                lookups.insert(id, Query{true, quintptr(hiid)});
+                lookups.insert(id, Query { true, quintptr(hiid) });
             } else {
                 QDnsLookup *lookup = new QDnsLookup((QDnsLookup::Type)qType, QString::fromLatin1(name), this);
                 connect(lookup, SIGNAL(finished()), this, SLOT(handleLookup()));
                 lookup->setProperty("iid", id);
-                lookups.insert(id, Query{false, quintptr(lookup)});
+                lookups.insert(id, Query { false, quintptr(lookup) });
                 QMetaObject::invokeMethod(lookup, "lookup", Qt::QueuedConnection);
             }
         }
@@ -109,14 +100,15 @@ class IrisQtName : public NameProvider
                 hostInfo.remove(hiid);
                 lookups.erase(it);
             } else {
-                auto lookup = reinterpret_cast<QDnsLookup*>(q.handle);
+                auto lookup = reinterpret_cast<QDnsLookup *>(q.handle);
                 lookup->abort(); // handleLookup will catch it and delete
             }
         }
     }
 
 private slots:
-    void hostInfoFinished(const QHostInfo &info) {
+    void hostInfoFinished(const QHostInfo &info)
+    {
         auto hiid = info.lookupId();
         auto idIt = hostInfo.find(hiid);
         if (idIt == hostInfo.end()) { // removed already?
@@ -135,7 +127,7 @@ private slots:
             return;
         }
         QList<XMPP::NameRecord> results;
-        for (const auto &a: info.addresses()) {
+        for (const auto &a : info.addresses()) {
             XMPP::NameRecord ir(info.hostName().toLatin1(), 5 * 60); // ttl = 5 mins
             ir.setAddress(a);
             results += ir;
@@ -146,25 +138,25 @@ private slots:
     void handleLookup()
     {
         QDnsLookup *lookup = static_cast<QDnsLookup *>(sender());
-        int id = lookup->property("iid").toInt();
+        int         id     = lookup->property("iid").toInt();
         lookups.remove(id);
         if (lookup->error() != QDnsLookup::NoError) {
             XMPP::NameResolver::Error e;
             switch (lookup->error()) {
-                case QDnsLookup::InvalidReplyError:
-                    e = XMPP::NameResolver::ErrorTimeout;
-                    break;
-                case QDnsLookup::NotFoundError:
-                    e = XMPP::NameResolver::ErrorNoName;
-                    break;
-                case QDnsLookup::ResolverError:
-                case QDnsLookup::OperationCancelledError:
-                case QDnsLookup::InvalidRequestError:
-                case QDnsLookup::ServerFailureError:
-                case QDnsLookup::ServerRefusedError:
-                default:
-                    e = XMPP::NameResolver::ErrorGeneric;
-                    break;
+            case QDnsLookup::InvalidReplyError:
+                e = XMPP::NameResolver::ErrorTimeout;
+                break;
+            case QDnsLookup::NotFoundError:
+                e = XMPP::NameResolver::ErrorNoName;
+                break;
+            case QDnsLookup::ResolverError:
+            case QDnsLookup::OperationCancelledError:
+            case QDnsLookup::InvalidRequestError:
+            case QDnsLookup::ServerFailureError:
+            case QDnsLookup::ServerRefusedError:
+            default:
+                e = XMPP::NameResolver::ErrorGeneric;
+                break;
             }
             if (lookup->error() != QDnsLookup::OperationCancelledError) { // don't report after resolve_stop()
                 emit resolve_error(id, e);
@@ -174,37 +166,37 @@ private slots:
         }
 
         QList<XMPP::NameRecord> results;
-        for (auto &qtr: lookup->hostAddressRecords()) {
+        for (auto &qtr : lookup->hostAddressRecords()) {
             XMPP::NameRecord ir(qtr.name().toLatin1(), qtr.timeToLive());
             ir.setAddress(qtr.value());
             results += ir;
         }
-        for (auto &qtr: lookup->mailExchangeRecords()) {
+        for (auto &qtr : lookup->mailExchangeRecords()) {
             XMPP::NameRecord ir(qtr.name().toLatin1(), qtr.timeToLive());
             ir.setMx(qtr.exchange().toLatin1(), qtr.preference());
             results += ir;
         }
-        for (auto &qtr: lookup->nameServerRecords()) {
+        for (auto &qtr : lookup->nameServerRecords()) {
             XMPP::NameRecord ir(qtr.name().toLatin1(), qtr.timeToLive());
             ir.setNs(qtr.value().toLatin1());
             results += ir;
         }
-        for (auto &qtr: lookup->pointerRecords()) {
+        for (auto &qtr : lookup->pointerRecords()) {
             XMPP::NameRecord ir(qtr.name().toLatin1(), qtr.timeToLive());
             ir.setPtr(qtr.value().toLatin1());
             results += ir;
         }
-        for (auto &qtr: lookup->canonicalNameRecords()) {
+        for (auto &qtr : lookup->canonicalNameRecords()) {
             XMPP::NameRecord ir(qtr.name().toLatin1(), qtr.timeToLive());
             ir.setCname(qtr.value().toLatin1());
             results += ir;
         }
-        for (auto &qtr: lookup->serviceRecords()) {
+        for (auto &qtr : lookup->serviceRecords()) {
             XMPP::NameRecord ir(qtr.name().toLatin1(), qtr.timeToLive());
-            ir.setSrv(qtr.target().toLatin1(),qtr.port(),qtr.priority(),qtr.weight());
+            ir.setSrv(qtr.target().toLatin1(), qtr.port(), qtr.priority(), qtr.weight());
             results += ir;
         }
-        for (auto &qtr: lookup->textRecords()) {
+        for (auto &qtr : lookup->textRecords()) {
             XMPP::NameRecord ir(qtr.name().toLatin1(), qtr.timeToLive());
             ir.setTxt(qtr.values());
             results += ir;
@@ -214,22 +206,14 @@ private slots:
     }
 };
 
-class IrisQtNameProvider : public IrisNetProvider
-{
+class IrisQtNameProvider : public IrisNetProvider {
     Q_OBJECT
     Q_INTERFACES(XMPP::IrisNetProvider)
 public:
-
-    NameProvider *createNameProviderInternet()
-    {
-        return new IrisQtName;
-    }
+    NameProvider *createNameProviderInternet() { return new IrisQtName; }
 };
 
-IrisNetProvider *irisnet_createQtNameProvider()
-{
-    return new IrisQtNameProvider;
-}
+IrisNetProvider *irisnet_createQtNameProvider() { return new IrisQtNameProvider; }
 } // namespace XMPP
 
 #include "netinterface_qtname.moc"
diff --git a/src/irisnet/corelib/netinterface_qtnet.cpp b/src/irisnet/corelib/netinterface_qtnet.cpp
index f33079a4..64539f18 100644
--- a/src/irisnet/corelib/netinterface_qtnet.cpp
+++ b/src/irisnet/corelib/netinterface_qtnet.cpp
@@ -21,12 +21,11 @@
 #include <QNetworkInterface>
 
 namespace XMPP {
-class IrisQtNet : public NetInterfaceProvider
-{
+class IrisQtNet : public NetInterfaceProvider {
     Q_OBJECT
     Q_INTERFACES(XMPP::NetInterfaceProvider)
 public:
-    QList<Info> info;
+    QList<Info>                  info;
     QNetworkConfigurationManager ncm;
 
     IrisQtNet()
@@ -36,26 +35,20 @@ class IrisQtNet : public NetInterfaceProvider
         connect(&ncm, SIGNAL(configurationRemoved(QNetworkConfiguration)), SLOT(check()));
     }
 
-    void start()
-    {
-        poll();
-    }
+    void start() { poll(); }
 
-    QList<Info> interfaces() const
-    {
-        return info;
-    }
+    QList<Info> interfaces() const { return info; }
 
     void poll()
     {
         QList<Info> ifaces;
 
-        for (auto &iface: QNetworkInterface::allInterfaces()) {
+        for (auto &iface : QNetworkInterface::allInterfaces()) {
             Info i;
-            i.id = iface.name();
-            i.name = iface.humanReadableName();
+            i.id         = iface.name();
+            i.name       = iface.humanReadableName();
             i.isLoopback = (iface.flags() & QNetworkInterface::IsLoopBack);
-            for (auto &ae: iface.addressEntries()) {
+            for (auto &ae : iface.addressEntries()) {
                 i.addresses.append(ae.ip());
             }
             ifaces << i;
@@ -72,21 +65,14 @@ public slots:
     }
 };
 
-class IrisQtNetProvider : public IrisNetProvider
-{
+class IrisQtNetProvider : public IrisNetProvider {
     Q_OBJECT
     Q_INTERFACES(XMPP::IrisNetProvider)
 public:
-    NetInterfaceProvider *createNetInterfaceProvider()
-    {
-        return new IrisQtNet;
-    }
+    NetInterfaceProvider *createNetInterfaceProvider() { return new IrisQtNet; }
 };
 
-IrisNetProvider *irisnet_createQtNetProvider()
-{
-    return new IrisQtNetProvider;
-}
+IrisNetProvider *irisnet_createQtNetProvider() { return new IrisQtNetProvider; }
 } // namespace XMPP
 
 #include "netinterface_qtnet.moc"
diff --git a/src/irisnet/corelib/netinterface_unix.cpp b/src/irisnet/corelib/netinterface_unix.cpp
index 8cb5765a..47e6c109 100644
--- a/src/irisnet/corelib/netinterface_unix.cpp
+++ b/src/irisnet/corelib/netinterface_unix.cpp
@@ -31,7 +31,7 @@
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #ifndef SIOCGIFCONF // for solaris
-# include <sys/sockio.h>
+#include <sys/sockio.h>
 #endif
 #include <sys/types.h>
 #include <unistd.h>
@@ -42,16 +42,15 @@ static QStringList read_proc_as_lines(const char *procfile)
     QStringList out;
 
     FILE *f = fopen(procfile, "r");
-    if(!f)
+    if (!f)
         return out;
 
     QByteArray buf;
-    while(!feof(f))
-    {
+    while (!feof(f)) {
         // max read on a proc is 4K
         QByteArray block(4096, 0);
-        int ret = fread(block.data(), 1, block.size(), f);
-        if(ret <= 0)
+        int        ret = fread(block.data(), 1, block.size(), f);
+        if (ret <= 0)
             break;
         block.resize(ret);
         buf += block;
@@ -59,21 +58,20 @@ static QStringList read_proc_as_lines(const char *procfile)
     fclose(f);
 
     QString str = QString::fromLocal8Bit(buf);
-    out = str.split('\n', QString::SkipEmptyParts);
+    out         = str.split('\n', QString::SkipEmptyParts);
     return out;
 }
 
 static QHostAddress linux_ipv6_to_qaddr(const QString &in)
 {
     QHostAddress out;
-    if(in.length() != 32)
+    if (in.length() != 32)
         return out;
     quint8 raw[16];
-    for(int n = 0; n < 16; ++n)
-    {
+    for (int n = 0; n < 16; ++n) {
         bool ok;
-        int x = in.mid(n * 2, 2).toInt(&ok, 16);
-        if(!ok)
+        int  x = in.mid(n * 2, 2).toInt(&ok, 16);
+        if (!ok)
             return out;
         raw[n] = (quint8)x;
     }
@@ -84,17 +82,16 @@ static QHostAddress linux_ipv6_to_qaddr(const QString &in)
 static QHostAddress linux_ipv4_to_qaddr(const QString &in)
 {
     QHostAddress out;
-    if(in.length() != 8)
+    if (in.length() != 8)
         return out;
-    quint32 raw;
+    quint32        raw;
     unsigned char *rawp = (unsigned char *)&raw;
-    for(int n = 0; n < 4; ++n)
-    {
+    for (int n = 0; n < 4; ++n) {
         bool ok;
-        int x = in.mid(n * 2, 2).toInt(&ok, 16);
-        if(!ok)
+        int  x = in.mid(n * 2, 2).toInt(&ok, 16);
+        if (!ok)
             return out;
-        rawp[n] = (unsigned char )x;
+        rawp[n] = (unsigned char)x;
     }
     out.setAddress(raw);
     return out;
@@ -106,22 +103,21 @@ static QList<XMPP::NetGatewayProvider::Info> get_linux_gateways()
 
     QStringList lines = read_proc_as_lines("/proc/net/route");
     // skip the first line, so we start at 1
-    for(int n = 1; n < lines.count(); ++n)
-    {
-        const QString &line = lines[n];
-        QStringList parts = line.simplified().split(' ', QString::SkipEmptyParts);
-        if(parts.count() < 10) // net-tools does 10, but why not 11?
+    for (int n = 1; n < lines.count(); ++n) {
+        const QString &line  = lines[n];
+        QStringList    parts = line.simplified().split(' ', QString::SkipEmptyParts);
+        if (parts.count() < 10) // net-tools does 10, but why not 11?
             continue;
 
         QHostAddress addr = linux_ipv4_to_qaddr(parts[2]);
-        if(addr.isNull())
+        if (addr.isNull())
             continue;
 
         int iflags = parts[3].toInt(nullptr, 16);
-        if(!(iflags & RTF_UP))
+        if (!(iflags & RTF_UP))
             continue;
 
-        if(!(iflags & RTF_GATEWAY))
+        if (!(iflags & RTF_GATEWAY))
             continue;
 
         XMPP::NetGatewayProvider::Info g;
@@ -131,22 +127,21 @@ static QList<XMPP::NetGatewayProvider::Info> get_linux_gateways()
     }
 
     lines = read_proc_as_lines("/proc/net/ipv6_route");
-    for(int n = 0; n < lines.count(); ++n)
-    {
-        const QString &line = lines[n];
-        QStringList parts = line.simplified().split(' ', QString::SkipEmptyParts);
-        if(parts.count() < 10)
+    for (int n = 0; n < lines.count(); ++n) {
+        const QString &line  = lines[n];
+        QStringList    parts = line.simplified().split(' ', QString::SkipEmptyParts);
+        if (parts.count() < 10)
             continue;
 
         QHostAddress addr = linux_ipv6_to_qaddr(parts[4]);
-        if(addr.isNull())
+        if (addr.isNull())
             continue;
 
         int iflags = parts[8].toInt(nullptr, 16);
-        if(!(iflags & RTF_UP))
+        if (!(iflags & RTF_UP))
             continue;
 
-        if(!(iflags & RTF_GATEWAY))
+        if (!(iflags & RTF_GATEWAY))
             continue;
 
         XMPP::NetGatewayProvider::Info g;
@@ -170,35 +165,28 @@ static QList<XMPP::NetGatewayProvider::Info> get_unix_gateways()
 }
 
 namespace XMPP {
-class UnixGateway : public NetGatewayProvider
-{
+class UnixGateway : public NetGatewayProvider {
     Q_OBJECT
     Q_INTERFACES(XMPP::NetGatewayProvider)
 public:
     QList<Info> info;
-    //QTimer t;
+    // QTimer t;
 
     UnixGateway() //: t(this)
     {
-        //connect(&t, SIGNAL(timeout()), SLOT(check()));
+        // connect(&t, SIGNAL(timeout()), SLOT(check()));
         // TODO track changes without timers
     }
 
     void start()
     {
-        //t.start(5000);
+        // t.start(5000);
         poll();
     }
 
-    QList<Info> gateways() const
-    {
-        return info;
-    }
+    QList<Info> gateways() const { return info; }
 
-    void poll()
-    {
-        info = get_unix_gateways();
-    }
+    void poll() { info = get_unix_gateways(); }
 
 public slots:
     void check()
@@ -208,21 +196,14 @@ public slots:
     }
 };
 
-class UnixNetProvider : public IrisNetProvider
-{
+class UnixNetProvider : public IrisNetProvider {
     Q_OBJECT
     Q_INTERFACES(XMPP::IrisNetProvider)
 public:
-    virtual NetGatewayProvider *createNetGatewayProvider()
-    {
-        return new UnixGateway;
-    }
+    virtual NetGatewayProvider *createNetGatewayProvider() { return new UnixGateway; }
 };
 
-IrisNetProvider *irisnet_createUnixNetProvider()
-{
-    return new UnixNetProvider;
-}
+IrisNetProvider *irisnet_createUnixNetProvider() { return new UnixNetProvider; }
 } // namespace XMPP
 
 #include "netinterface_unix.moc"
diff --git a/src/irisnet/corelib/netnames.cpp b/src/irisnet/corelib/netnames.cpp
index c44da895..ae5099fc 100644
--- a/src/irisnet/corelib/netnames.cpp
+++ b/src/irisnet/corelib/netnames.cpp
@@ -28,92 +28,83 @@
 
 //#define NETNAMES_DEBUG
 #ifdef NETNAMES_DEBUG
-# define NNDEBUG (qDebug() << this << "#" << __FUNCTION__ << ":")
+#define NNDEBUG (qDebug() << this << "#" << __FUNCTION__ << ":")
 #endif
 
 namespace XMPP {
 //----------------------------------------------------------------------------
 // NameRecord
 //----------------------------------------------------------------------------
-class NameRecord::Private : public QSharedData
-{
+class NameRecord::Private : public QSharedData {
 public:
-    QByteArray owner;
+    QByteArray       owner;
     NameRecord::Type type;
-    int ttl;
+    int              ttl;
 
-    QHostAddress address;
-    QByteArray name;
-    int priority, weight, port;
+    QHostAddress      address;
+    QByteArray        name;
+    int               priority, weight, port;
     QList<QByteArray> texts;
-    QByteArray cpu, os;
-    QByteArray rawData;
+    QByteArray        cpu, os;
+    QByteArray        rawData;
 };
 
-#define ENSURE_D { if(!d) d = new Private; }
+#define ENSURE_D                                                                                                       \
+    {                                                                                                                  \
+        if (!d)                                                                                                        \
+            d = new Private;                                                                                           \
+    }
 
-NameRecord::NameRecord() :
-    d(nullptr)
-{
-}
+NameRecord::NameRecord() : d(nullptr) {}
 
-NameRecord::NameRecord(const QByteArray &owner, int ttl) :
-    d(nullptr)
+NameRecord::NameRecord(const QByteArray &owner, int ttl) : d(nullptr)
 {
     setOwner(owner);
     setTtl(ttl);
 }
 
-NameRecord::NameRecord(const NameRecord &from) :
-    d(nullptr)
-{
-    *this = from;
-}
+NameRecord::NameRecord(const NameRecord &from) : d(nullptr) { *this = from; }
 
-NameRecord::~NameRecord()
-{
-}
+NameRecord::~NameRecord() {}
 
-NameRecord & NameRecord::operator=(const NameRecord &from)
+NameRecord &NameRecord::operator=(const NameRecord &from)
 {
     d = from.d;
     return *this;
 }
 
-bool NameRecord::operator==(const NameRecord &o) {
+bool NameRecord::operator==(const NameRecord &o)
+{
     if (isNull() != o.isNull() || owner() != o.owner() || ttl() != o.ttl() || type() != o.type()) {
         return false;
     }
 
     switch (type()) {
-        case XMPP::NameRecord::A:
-        case XMPP::NameRecord::Aaaa:
-            return address() == o.address();
-        case XMPP::NameRecord::Mx:
-            return name() == o.name() && priority() == o.priority();
-        case XMPP::NameRecord::Srv:
-            return name() == o.name() && port() == o.port() && priority() == o.priority() && weight() == o.weight();
-        case XMPP::NameRecord::Cname:
-        case XMPP::NameRecord::Ptr:
-        case XMPP::NameRecord::Ns:
-            return name() == o.name();
-        case XMPP::NameRecord::Txt:
-            return texts() == o.texts();
-        case XMPP::NameRecord::Hinfo:
-            return cpu() == o.cpu() && os() == o.os();
-        case XMPP::NameRecord::Null:
-            return rawData() == o.rawData();
-        case XMPP::NameRecord::Any:
-            return false;
+    case XMPP::NameRecord::A:
+    case XMPP::NameRecord::Aaaa:
+        return address() == o.address();
+    case XMPP::NameRecord::Mx:
+        return name() == o.name() && priority() == o.priority();
+    case XMPP::NameRecord::Srv:
+        return name() == o.name() && port() == o.port() && priority() == o.priority() && weight() == o.weight();
+    case XMPP::NameRecord::Cname:
+    case XMPP::NameRecord::Ptr:
+    case XMPP::NameRecord::Ns:
+        return name() == o.name();
+    case XMPP::NameRecord::Txt:
+        return texts() == o.texts();
+    case XMPP::NameRecord::Hinfo:
+        return cpu() == o.cpu() && os() == o.os();
+    case XMPP::NameRecord::Null:
+        return rawData() == o.rawData();
+    case XMPP::NameRecord::Any:
+        return false;
     }
 
     return false;
 }
 
-bool NameRecord::isNull() const
-{
-    return (d ? false : true);
-}
+bool NameRecord::isNull() const { return (d ? false : true); }
 
 QByteArray NameRecord::owner() const
 {
@@ -202,7 +193,7 @@ void NameRecord::setTtl(int seconds)
 void NameRecord::setAddress(const QHostAddress &a)
 {
     ENSURE_D
-    if(a.protocol() == QAbstractSocket::IPv6Protocol)
+    if (a.protocol() == QAbstractSocket::IPv6Protocol)
         d->type = NameRecord::Aaaa;
     else
         d->type = NameRecord::A;
@@ -212,19 +203,19 @@ void NameRecord::setAddress(const QHostAddress &a)
 void NameRecord::setMx(const QByteArray &name, int priority)
 {
     ENSURE_D
-    d->type = NameRecord::Mx;
-    d->name = name;
+    d->type     = NameRecord::Mx;
+    d->name     = name;
     d->priority = priority;
 }
 
 void NameRecord::setSrv(const QByteArray &name, int port, int priority, int weight)
 {
     ENSURE_D
-    d->type = NameRecord::Srv;
-    d->name = name;
-    d->port = port;
+    d->type     = NameRecord::Srv;
+    d->name     = name;
+    d->port     = port;
     d->priority = priority;
-    d->weight = weight;
+    d->weight   = weight;
 }
 
 void NameRecord::setCname(const QByteArray &name)
@@ -244,7 +235,7 @@ void NameRecord::setPtr(const QByteArray &name)
 void NameRecord::setTxt(const QList<QByteArray> &texts)
 {
     ENSURE_D
-    d->type = NameRecord::Txt;
+    d->type  = NameRecord::Txt;
     d->texts = texts;
 }
 
@@ -252,8 +243,8 @@ void NameRecord::setHinfo(const QByteArray &cpu, const QByteArray &os)
 {
     ENSURE_D
     d->type = NameRecord::Hinfo;
-    d->cpu = cpu;
-    d->os = os;
+    d->cpu  = cpu;
+    d->os   = os;
 }
 
 void NameRecord::setNs(const QByteArray &name)
@@ -266,7 +257,7 @@ void NameRecord::setNs(const QByteArray &name)
 void NameRecord::setNull(const QByteArray &rawData)
 {
     ENSURE_D
-    d->type = NameRecord::Null;
+    d->type    = NameRecord::Null;
     d->rawData = rawData;
 }
 
@@ -274,41 +265,40 @@ QDebug operator<<(QDebug dbg, XMPP::NameRecord::Type type)
 {
     dbg.nospace() << "XMPP::NameRecord::";
 
-    switch(type)
-    {
-        case XMPP::NameRecord::A:
-            dbg.nospace() << "A";
-            break;
-        case XMPP::NameRecord::Aaaa:
-            dbg.nospace() << "Aaaa";
-            break;
-        case XMPP::NameRecord::Mx:
-            dbg.nospace() << "Mx";
-            break;
-        case XMPP::NameRecord::Srv:
-            dbg.nospace() << "Srv";
-            break;
-        case XMPP::NameRecord::Cname:
-            dbg.nospace() << "Cname";
-            break;
-        case XMPP::NameRecord::Ptr:
-            dbg.nospace() << "Ptr";
-            break;
-        case XMPP::NameRecord::Txt:
-            dbg.nospace() << "Txt";
-            break;
-        case XMPP::NameRecord::Hinfo:
-            dbg.nospace() << "Hinfo";
-            break;
-        case XMPP::NameRecord::Ns:
-            dbg.nospace() << "Ns";
-            break;
-        case XMPP::NameRecord::Null:
-            dbg.nospace() << "Null";
-            break;
-        case XMPP::NameRecord::Any:
-            dbg.nospace() << "Any";
-            break;
+    switch (type) {
+    case XMPP::NameRecord::A:
+        dbg.nospace() << "A";
+        break;
+    case XMPP::NameRecord::Aaaa:
+        dbg.nospace() << "Aaaa";
+        break;
+    case XMPP::NameRecord::Mx:
+        dbg.nospace() << "Mx";
+        break;
+    case XMPP::NameRecord::Srv:
+        dbg.nospace() << "Srv";
+        break;
+    case XMPP::NameRecord::Cname:
+        dbg.nospace() << "Cname";
+        break;
+    case XMPP::NameRecord::Ptr:
+        dbg.nospace() << "Ptr";
+        break;
+    case XMPP::NameRecord::Txt:
+        dbg.nospace() << "Txt";
+        break;
+    case XMPP::NameRecord::Hinfo:
+        dbg.nospace() << "Hinfo";
+        break;
+    case XMPP::NameRecord::Ns:
+        dbg.nospace() << "Ns";
+        break;
+    case XMPP::NameRecord::Null:
+        dbg.nospace() << "Null";
+        break;
+    case XMPP::NameRecord::Any:
+        dbg.nospace() << "Any";
+        break;
     }
 
     return dbg;
@@ -317,47 +307,39 @@ QDebug operator<<(QDebug dbg, XMPP::NameRecord::Type type)
 QDebug operator<<(QDebug dbg, const XMPP::NameRecord &record)
 {
     dbg.nospace() << "XMPP::NameRecord("
-        << "owner=" << record.owner()
-        << ", ttl=" << record.ttl()
-        << ", type=" << record.type();
-
-    switch(record.type())
-    {
-        case XMPP::NameRecord::A:
-        case XMPP::NameRecord::Aaaa:
-            dbg.nospace() << ", address=" << record.address();
-            break;
-        case XMPP::NameRecord::Mx:
-            dbg.nospace()
-                << ", name=" << record.name()
-                << ", priority=" << record.priority();
-            break;
-        case XMPP::NameRecord::Srv:
-            dbg.nospace()
-                << ", name=" << record.name()
-                << ", port=" << record.port()
-                << ", priority=" << record.priority()
-                << ", weight=" << record.weight();
-            break;
-        case XMPP::NameRecord::Cname:
-        case XMPP::NameRecord::Ptr:
-        case XMPP::NameRecord::Ns:
-            dbg.nospace() << ", name=" << record.name();
-            break;
-        case XMPP::NameRecord::Txt:
-            dbg.nospace() << ", texts={" << record.texts() << "}";
-            break;
-        case XMPP::NameRecord::Hinfo:
-            dbg.nospace() << ", cpu=" << record.cpu() << ", os=" << record.os();
-            break;
-        case XMPP::NameRecord::Null:
-            dbg.nospace() << ", size=" << record.rawData().size();
-            break;
-        case XMPP::NameRecord::Any:
-            dbg.nospace() << ", <unknown>";
-            // should not happen
-            Q_ASSERT(false);
-            break;
+                  << "owner=" << record.owner() << ", ttl=" << record.ttl() << ", type=" << record.type();
+
+    switch (record.type()) {
+    case XMPP::NameRecord::A:
+    case XMPP::NameRecord::Aaaa:
+        dbg.nospace() << ", address=" << record.address();
+        break;
+    case XMPP::NameRecord::Mx:
+        dbg.nospace() << ", name=" << record.name() << ", priority=" << record.priority();
+        break;
+    case XMPP::NameRecord::Srv:
+        dbg.nospace() << ", name=" << record.name() << ", port=" << record.port() << ", priority=" << record.priority()
+                      << ", weight=" << record.weight();
+        break;
+    case XMPP::NameRecord::Cname:
+    case XMPP::NameRecord::Ptr:
+    case XMPP::NameRecord::Ns:
+        dbg.nospace() << ", name=" << record.name();
+        break;
+    case XMPP::NameRecord::Txt:
+        dbg.nospace() << ", texts={" << record.texts() << "}";
+        break;
+    case XMPP::NameRecord::Hinfo:
+        dbg.nospace() << ", cpu=" << record.cpu() << ", os=" << record.os();
+        break;
+    case XMPP::NameRecord::Null:
+        dbg.nospace() << ", size=" << record.rawData().size();
+        break;
+    case XMPP::NameRecord::Any:
+        dbg.nospace() << ", <unknown>";
+        // should not happen
+        Q_ASSERT(false);
+        break;
     }
 
     dbg.nospace() << ")";
@@ -368,71 +350,47 @@ QDebug operator<<(QDebug dbg, const XMPP::NameRecord &record)
 //----------------------------------------------------------------------------
 // ServiceInstance
 //----------------------------------------------------------------------------
-class ServiceInstance::Private : public QSharedData
-{
+class ServiceInstance::Private : public QSharedData {
 public:
-    QString instance, type, domain;
-    QMap<QString,QByteArray> attribs;
-    QByteArray name;
+    QString                   instance, type, domain;
+    QMap<QString, QByteArray> attribs;
+    QByteArray                name;
 };
 
-ServiceInstance::ServiceInstance() :
-    d(new Private)
-{
-}
+ServiceInstance::ServiceInstance() : d(new Private) {}
 
-ServiceInstance::ServiceInstance(const QString &instance, const QString &type, const QString &domain, const QMap<QString,QByteArray> &attribs) :
+ServiceInstance::ServiceInstance(const QString &instance, const QString &type, const QString &domain,
+                                 const QMap<QString, QByteArray> &attribs) :
     d(new Private)
 {
     d->instance = instance;
-    d->type = type;
-    d->domain = domain;
-    d->attribs = attribs;
+    d->type     = type;
+    d->domain   = domain;
+    d->attribs  = attribs;
 
     // FIXME: escape the items
     d->name = instance.toLatin1() + '.' + type.toLatin1() + '.' + domain.toLatin1();
 }
 
-ServiceInstance::ServiceInstance(const ServiceInstance &from) :
-    d(nullptr)
-{
-    *this = from;
-}
+ServiceInstance::ServiceInstance(const ServiceInstance &from) : d(nullptr) { *this = from; }
 
-ServiceInstance::~ServiceInstance()
-{
-}
+ServiceInstance::~ServiceInstance() {}
 
-ServiceInstance & ServiceInstance::operator=(const ServiceInstance &from)
+ServiceInstance &ServiceInstance::operator=(const ServiceInstance &from)
 {
     d = from.d;
     return *this;
 }
 
-QString ServiceInstance::instance() const
-{
-    return d->instance;
-}
+QString ServiceInstance::instance() const { return d->instance; }
 
-QString ServiceInstance::type() const
-{
-    return d->type;
-}
+QString ServiceInstance::type() const { return d->type; }
 
-QString ServiceInstance::domain() const
-{
-    return d->domain;
-}
+QString ServiceInstance::domain() const { return d->domain; }
 
-QMap<QString,QByteArray> ServiceInstance::attributes() const
-{
-    return d->attribs;
-}
+QMap<QString, QByteArray> ServiceInstance::attributes() const { return d->attribs; }
 
-QByteArray ServiceInstance::name() const
-{
-    return d->name;
-}
+QByteArray ServiceInstance::name() const { return d->name; }
 
 //----------------------------------------------------------------------------
 // NameManager
@@ -442,74 +400,60 @@ class NameManager;
 Q_GLOBAL_STATIC(QMutex, nman_mutex)
 static NameManager *g_nman = nullptr;
 
-class NameResolver::Private
-{
+class NameResolver::Private {
 public:
     NameResolver *q;
 
-    int type;
+    int  type;
     bool longLived;
-    int id;
+    int  id;
 
-    Private(NameResolver *_q) : q(_q)
-    {
-    }
+    Private(NameResolver *_q) : q(_q) {}
 };
 
-class ServiceBrowser::Private
-{
+class ServiceBrowser::Private {
 public:
     ServiceBrowser *q;
 
     int id;
 
-    Private(ServiceBrowser *_q) : q(_q)
-    {
-    }
+    Private(ServiceBrowser *_q) : q(_q) {}
 };
 
-class ServiceResolver::Private : public QObject
-{
+class ServiceResolver::Private : public QObject {
     Q_OBJECT
 public:
-    Private(ServiceResolver *parent)
-     : q(parent), dns_sd_resolve_id(0), requestedProtocol(IPv6_IPv4), port(0), protocol(QAbstractSocket::IPv6Protocol)
+    Private(ServiceResolver *parent) :
+        q(parent), dns_sd_resolve_id(0), requestedProtocol(IPv6_IPv4), port(0), protocol(QAbstractSocket::IPv6Protocol)
     {
     }
 
     /* DNS-SD interaction with NameManager */
-    ServiceResolver *q; //!< Pointing upwards, so NameManager can call its signals
-    int dns_sd_resolve_id; //!< DNS-SD lookup id, set by NameManager
+    ServiceResolver *q;                 //!< Pointing upwards, so NameManager can call its signals
+    int              dns_sd_resolve_id; //!< DNS-SD lookup id, set by NameManager
 
     /* configuration */
     Protocol requestedProtocol; //!< IP protocol requested by user
 
     /* state trackers */
-    QString domain; //!< Domain we are currently looking up
-    QString host; //!< Hostname we are currently looking up
-    QHostAddress address; //!< IP address we are currently looking up
-    quint16 port; //!< Port we are currently looking up
+    QString                               domain;   //!< Domain we are currently looking up
+    QString                               host;     //!< Hostname we are currently looking up
+    QHostAddress                          address;  //!< IP address we are currently looking up
+    quint16                               port;     //!< Port we are currently looking up
     QAbstractSocket::NetworkLayerProtocol protocol; //!< IP protocol we are currently looking up
 
-    XMPP::WeightedNameRecordList srvList; //!< List of resolved SRV names
-    QList<XMPP::NameRecord> hostList; //!< List or resolved hostnames for current SRV name
-    QList<XMPP::NameResolver*> resolverList; //!< NameResolvers currently in use, needed for cleanup
-
+    XMPP::WeightedNameRecordList srvList;      //!< List of resolved SRV names
+    QList<XMPP::NameRecord>      hostList;     //!< List or resolved hostnames for current SRV name
+    QList<XMPP::NameResolver *>  resolverList; //!< NameResolvers currently in use, needed for cleanup
 };
 
-WeightedNameRecordList::WeightedNameRecordList()
-    : currentPriorityGroup(priorityGroups.end()) /* void current state */
-{}
-
-WeightedNameRecordList::WeightedNameRecordList(const QList<XMPP::NameRecord> &list)
+WeightedNameRecordList::WeightedNameRecordList() : currentPriorityGroup(priorityGroups.end()) /* void current state */
 {
-    append(list);
 }
 
-WeightedNameRecordList::WeightedNameRecordList(const WeightedNameRecordList &other)
-{
-    *this = other;
-}
+WeightedNameRecordList::WeightedNameRecordList(const QList<XMPP::NameRecord> &list) { append(list); }
+
+WeightedNameRecordList::WeightedNameRecordList(const WeightedNameRecordList &other) { *this = other; }
 
 WeightedNameRecordList &WeightedNameRecordList::operator=(const WeightedNameRecordList &other)
 {
@@ -522,14 +466,15 @@ WeightedNameRecordList &WeightedNameRecordList::operator=(const WeightedNameReco
     return *this;
 }
 
-WeightedNameRecordList::~WeightedNameRecordList() {
-}
+WeightedNameRecordList::~WeightedNameRecordList() {}
 
-bool WeightedNameRecordList::isEmpty() const {
+bool WeightedNameRecordList::isEmpty() const
+{
     return currentPriorityGroup == const_cast<WeightedNameRecordList *>(this)->priorityGroups.end();
 }
 
-XMPP::NameRecord WeightedNameRecordList::takeNext() {
+XMPP::NameRecord WeightedNameRecordList::takeNext()
+{
     /* Find the next useful priority group */
     while (currentPriorityGroup != priorityGroups.end() && currentPriorityGroup->empty()) {
         ++currentPriorityGroup;
@@ -553,7 +498,7 @@ XMPP::NameRecord WeightedNameRecordList::takeNext() {
 #endif
 
     /* Pick a random entry */
-    int randomWeight = qrand()/static_cast<float>(RAND_MAX)*totalWeight;
+    int randomWeight = qrand() / static_cast<float>(RAND_MAX) * totalWeight;
 
 #ifdef NETNAMES_DEBUG
     NNDEBUG << "Picked weight:" << randomWeight;
@@ -561,7 +506,8 @@ XMPP::NameRecord WeightedNameRecordList::takeNext() {
 
     /* Iterate through the priority group until we found the randomly selected entry */
     WeightedNameRecordPriorityGroup::iterator it(currentPriorityGroup->begin());
-    for (int currentWeight = it->weight(); currentWeight < randomWeight; currentWeight += (++it)->weight()) {}
+    for (int currentWeight = it->weight(); currentWeight < randomWeight; currentWeight += (++it)->weight()) {
+    }
     Q_ASSERT(it != currentPriorityGroup->end());
 
     /* We are going to delete the entry in the list, so save it */
@@ -580,17 +526,19 @@ XMPP::NameRecord WeightedNameRecordList::takeNext() {
     return result;
 }
 
-void WeightedNameRecordList::clear() {
+void WeightedNameRecordList::clear()
+{
     priorityGroups.clear();
 
     /* void current state */
     currentPriorityGroup = priorityGroups.end();
 }
 
-void WeightedNameRecordList::append(const XMPP::WeightedNameRecordList &list) {
+void WeightedNameRecordList::append(const XMPP::WeightedNameRecordList &list)
+{
     /* Copy over all records from all groups */
     foreach (const WeightedNameRecordPriorityGroup &group, list.priorityGroups) {
-        foreach(const NameRecord& record, group) {
+        foreach (const NameRecord &record, group) {
             append(record);
         }
     }
@@ -599,7 +547,8 @@ void WeightedNameRecordList::append(const XMPP::WeightedNameRecordList &list) {
     currentPriorityGroup = priorityGroups.begin();
 }
 
-void WeightedNameRecordList::append(const QList<XMPP::NameRecord> &list) {
+void WeightedNameRecordList::append(const QList<XMPP::NameRecord> &list)
+{
     foreach (const XMPP::NameRecord &record, list) {
         if (record.type() != XMPP::NameRecord::Srv) {
             continue;
@@ -617,7 +566,8 @@ void WeightedNameRecordList::append(const QList<XMPP::NameRecord> &list) {
     currentPriorityGroup = priorityGroups.begin();
 }
 
-void WeightedNameRecordList::append(const XMPP::NameRecord &record) {
+void WeightedNameRecordList::append(const XMPP::NameRecord &record)
+{
     WeightedNameRecordPriorityGroup group(priorityGroups.value(record.priority()));
 
     Q_ASSERT(record.type() == XMPP::NameRecord::Srv);
@@ -631,7 +581,8 @@ void WeightedNameRecordList::append(const XMPP::NameRecord &record) {
     currentPriorityGroup = priorityGroups.begin();
 }
 
-void WeightedNameRecordList::append(const QString &hostname, quint16 port) {
+void WeightedNameRecordList::append(const QString &hostname, quint16 port)
+{
     NameRecord record(hostname.toLocal8Bit(), std::numeric_limits<int>::max());
     record.setSrv(hostname.toLocal8Bit(), port, std::numeric_limits<int>::max(), 0);
 
@@ -641,32 +592,37 @@ void WeightedNameRecordList::append(const QString &hostname, quint16 port) {
     currentPriorityGroup = priorityGroups.begin();
 }
 
-XMPP::WeightedNameRecordList& WeightedNameRecordList::operator<<(const XMPP::WeightedNameRecordList &list) {
+XMPP::WeightedNameRecordList &WeightedNameRecordList::operator<<(const XMPP::WeightedNameRecordList &list)
+{
     append(list);
     return *this;
 }
 
-WeightedNameRecordList& WeightedNameRecordList::operator<<(const QList<NameRecord> &list) {
+WeightedNameRecordList &WeightedNameRecordList::operator<<(const QList<NameRecord> &list)
+{
     append(list);
     return *this;
 }
 
-XMPP::WeightedNameRecordList& WeightedNameRecordList::operator<<(const XMPP::NameRecord &record) {
+XMPP::WeightedNameRecordList &WeightedNameRecordList::operator<<(const XMPP::NameRecord &record)
+{
     append(record);
     return *this;
 }
 
-QDebug operator<<(QDebug dbg, const XMPP::WeightedNameRecordList &list) {
+QDebug operator<<(QDebug dbg, const XMPP::WeightedNameRecordList &list)
+{
     dbg.nospace() << "XMPP::WeightedNameRecordList(\n";
 
-    /* operator(QDebug, QMap const&) has a bug which makes it crash when trying to print the dereferenced end() iterator */
+    /* operator(QDebug, QMap const&) has a bug which makes it crash when trying to print the dereferenced end() iterator
+     */
     if (!list.isEmpty()) {
         dbg.nospace() << "current=" << *list.currentPriorityGroup << endl;
     }
 
     dbg.nospace() << "{";
 
-    foreach(int priority, list.priorityGroups.keys()) {
+    foreach (int priority, list.priorityGroups.keys()) {
         dbg.nospace() << "\t" << priority << "->" << list.priorityGroups.value(priority) << endl;
     }
 
@@ -674,36 +630,32 @@ QDebug operator<<(QDebug dbg, const XMPP::WeightedNameRecordList &list) {
     return dbg;
 }
 
-class ServiceLocalPublisher::Private
-{
+class ServiceLocalPublisher::Private {
 public:
     ServiceLocalPublisher *q;
 
     int id;
 
-    Private(ServiceLocalPublisher *_q) : q(_q)
-    {
-    }
+    Private(ServiceLocalPublisher *_q) : q(_q) {}
 };
 
-class NameManager : public QObject
-{
+class NameManager : public QObject {
     Q_OBJECT
 public:
-    NameProvider *p_net, *p_local;
-    ServiceProvider *p_serv;
-    QHash<int,NameResolver::Private*> res_instances;
-    QHash<int,int> res_sub_instances;
+    NameProvider *                      p_net, *p_local;
+    ServiceProvider *                   p_serv;
+    QHash<int, NameResolver::Private *> res_instances;
+    QHash<int, int>                     res_sub_instances;
 
-    QHash<int,ServiceBrowser::Private*> br_instances;
-    QHash<int,ServiceResolver::Private*> sres_instances;
-    QHash<int,ServiceLocalPublisher::Private*> slp_instances;
+    QHash<int, ServiceBrowser::Private *>        br_instances;
+    QHash<int, ServiceResolver::Private *>       sres_instances;
+    QHash<int, ServiceLocalPublisher::Private *> slp_instances;
 
     NameManager(QObject *parent = nullptr) : QObject(parent)
     {
-        p_net = nullptr;
+        p_net   = nullptr;
         p_local = nullptr;
-        p_serv = 0;
+        p_serv  = 0;
     }
 
     ~NameManager()
@@ -716,8 +668,7 @@ class NameManager : public QObject
     static NameManager *instance()
     {
         QMutexLocker locker(nman_mutex());
-        if(!g_nman)
-        {
+        if (!g_nman) {
             g_nman = new NameManager;
             irisNetAddPostRoutine(NetNames::cleanup);
         }
@@ -734,33 +685,33 @@ class NameManager : public QObject
     {
         QMutexLocker locker(nman_mutex());
 
-        np->type = qType;
+        np->type      = qType;
         np->longLived = longLived;
-        if(!p_net)
-        {
-            NameProvider *c = 0;
-            QList<IrisNetProvider*> list = irisNetProviders();
-            for(int n = 0; n < list.count(); ++n)
-            {
+        if (!p_net) {
+            NameProvider *           c    = 0;
+            QList<IrisNetProvider *> list = irisNetProviders();
+            for (int n = 0; n < list.count(); ++n) {
                 IrisNetProvider *p = list[n];
-                c = p->createNameProviderInternet();
-                if(c)
+                c                  = p->createNameProviderInternet();
+                if (c)
                     break;
             }
             Q_ASSERT(c); // we have built-in support, so this should never fail
             p_net = c;
 
             // use queued connections
-            qRegisterMetaType< QList<XMPP::NameRecord> >("QList<XMPP::NameRecord>");
+            qRegisterMetaType<QList<XMPP::NameRecord>>("QList<XMPP::NameRecord>");
             qRegisterMetaType<XMPP::NameResolver::Error>("XMPP::NameResolver::Error");
-            connect(p_net, SIGNAL(resolve_resultsReady(int,QList<XMPP::NameRecord>)), SLOT(provider_resolve_resultsReady(int,QList<XMPP::NameRecord>)));
-            connect(p_net, SIGNAL(resolve_error(int,XMPP::NameResolver::Error)), SLOT(provider_resolve_error(int,XMPP::NameResolver::Error)));
-            connect(p_net, SIGNAL(resolve_useLocal(int,QByteArray)), SLOT(provider_resolve_useLocal(int,QByteArray)));
+            connect(p_net, SIGNAL(resolve_resultsReady(int, QList<XMPP::NameRecord>)),
+                    SLOT(provider_resolve_resultsReady(int, QList<XMPP::NameRecord>)));
+            connect(p_net, SIGNAL(resolve_error(int, XMPP::NameResolver::Error)),
+                    SLOT(provider_resolve_error(int, XMPP::NameResolver::Error)));
+            connect(p_net, SIGNAL(resolve_useLocal(int, QByteArray)), SLOT(provider_resolve_useLocal(int, QByteArray)));
         }
 
         np->id = p_net->resolve_start(name, qType, longLived);
 
-        //printf("assigning %d to %p\n", req_id, np);
+        // printf("assigning %d to %p\n", req_id, np);
         res_instances.insert(np->id, np);
     }
 
@@ -775,17 +726,15 @@ class NameManager : public QObject
     {
         // clean up any sub instances
 
-        QList<int> sub_instances_to_remove;
+        QList<int>              sub_instances_to_remove;
         QHashIterator<int, int> it(res_sub_instances);
-        while(it.hasNext())
-        {
+        while (it.hasNext()) {
             it.next();
-            if(it.value() == np->id)
+            if (it.value() == np->id)
                 sub_instances_to_remove += it.key();
         }
 
-        foreach(int res_sub_id, sub_instances_to_remove)
-        {
+        foreach (int res_sub_id, sub_instances_to_remove) {
             res_sub_instances.remove(res_sub_id);
             p_local->resolve_stop(res_sub_id);
         }
@@ -802,15 +751,13 @@ class NameManager : public QObject
     {
         QMutexLocker locker(nman_mutex());
 
-        if(!p_serv)
-        {
-            ServiceProvider *c = nullptr;
-            QList<IrisNetProvider*> list = irisNetProviders();
-            for(int n = 0; n < list.count(); ++n)
-            {
+        if (!p_serv) {
+            ServiceProvider *        c    = nullptr;
+            QList<IrisNetProvider *> list = irisNetProviders();
+            for (int n = 0; n < list.count(); ++n) {
                 IrisNetProvider *p = list[n];
-                c = p->createServiceProvider();
-                if(c)
+                c                  = p->createServiceProvider();
+                if (c)
                     break;
             }
             Q_ASSERT(c); // we have built-in support, so this should never fail
@@ -820,9 +767,12 @@ class NameManager : public QObject
             qRegisterMetaType<XMPP::ServiceInstance>("XMPP::ServiceInstance");
             qRegisterMetaType<XMPP::ServiceBrowser::Error>("XMPP::ServiceBrowser::Error");
 
-            connect(p_serv, SIGNAL(browse_instanceAvailable(int,XMPP::ServiceInstance)), SLOT(provider_browse_instanceAvailable(int,XMPP::ServiceInstance)), Qt::QueuedConnection);
-            connect(p_serv, SIGNAL(browse_instanceUnavailable(int,XMPP::ServiceInstance)), SLOT(provider_browse_instanceUnavailable(int,XMPP::ServiceInstance)), Qt::QueuedConnection);
-            connect(p_serv, SIGNAL(browse_error(int,XMPP::ServiceBrowser::Error)), SLOT(provider_browse_error(int,XMPP::ServiceBrowser::Error)), Qt::QueuedConnection);
+            connect(p_serv, SIGNAL(browse_instanceAvailable(int, XMPP::ServiceInstance)),
+                    SLOT(provider_browse_instanceAvailable(int, XMPP::ServiceInstance)), Qt::QueuedConnection);
+            connect(p_serv, SIGNAL(browse_instanceUnavailable(int, XMPP::ServiceInstance)),
+                    SLOT(provider_browse_instanceUnavailable(int, XMPP::ServiceInstance)), Qt::QueuedConnection);
+            connect(p_serv, SIGNAL(browse_error(int, XMPP::ServiceBrowser::Error)),
+                    SLOT(provider_browse_error(int, XMPP::ServiceBrowser::Error)), Qt::QueuedConnection);
         }
 
         /*np->id = */
@@ -836,15 +786,13 @@ class NameManager : public QObject
     {
         QMutexLocker locker(nman_mutex());
 
-        if(!p_serv)
-        {
-            ServiceProvider *c = nullptr;
-            QList<IrisNetProvider*> list = irisNetProviders();
-            for(int n = 0; n < list.count(); ++n)
-            {
+        if (!p_serv) {
+            ServiceProvider *        c    = nullptr;
+            QList<IrisNetProvider *> list = irisNetProviders();
+            for (int n = 0; n < list.count(); ++n) {
                 IrisNetProvider *p = list[n];
-                c = p->createServiceProvider();
-                if(c)
+                c                  = p->createServiceProvider();
+                if (c)
                     break;
             }
             Q_ASSERT(c); // we have built-in support, so this should never fail
@@ -852,8 +800,11 @@ class NameManager : public QObject
 
             // use queued connections
             qRegisterMetaType<QHostAddress>("QHostAddress");
-            qRegisterMetaType< QList<XMPP::ServiceProvider::ResolveResult> >("QList<XMPP::ServiceProvider::ResolveResult>");
-            connect(p_serv, SIGNAL(resolve_resultsReady(int,QList<XMPP::ServiceProvider::ResolveResult>)), SLOT(provider_resolve_resultsReady(int,QList<XMPP::ServiceProvider::ResolveResult>)), Qt::QueuedConnection);
+            qRegisterMetaType<QList<XMPP::ServiceProvider::ResolveResult>>(
+                "QList<XMPP::ServiceProvider::ResolveResult>");
+            connect(p_serv, SIGNAL(resolve_resultsReady(int, QList<XMPP::ServiceProvider::ResolveResult>)),
+                    SLOT(provider_resolve_resultsReady(int, QList<XMPP::ServiceProvider::ResolveResult>)),
+                    Qt::QueuedConnection);
         }
 
         /* store the id so we can stop it later */
@@ -862,19 +813,18 @@ class NameManager : public QObject
         sres_instances.insert(np->dns_sd_resolve_id, np);
     }
 
-    void publish_start(ServiceLocalPublisher::Private *np, const QString &instance, const QString &type, int port, const QMap<QString,QByteArray> &attribs)
+    void publish_start(ServiceLocalPublisher::Private *np, const QString &instance, const QString &type, int port,
+                       const QMap<QString, QByteArray> &attribs)
     {
         QMutexLocker locker(nman_mutex());
 
-        if(!p_serv)
-        {
-            ServiceProvider *c = nullptr;
-            QList<IrisNetProvider*> list = irisNetProviders();
-            for(int n = 0; n < list.count(); ++n)
-            {
+        if (!p_serv) {
+            ServiceProvider *        c    = nullptr;
+            QList<IrisNetProvider *> list = irisNetProviders();
+            for (int n = 0; n < list.count(); ++n) {
                 IrisNetProvider *p = list[n];
-                c = p->createServiceProvider();
-                if(c)
+                c                  = p->createServiceProvider();
+                if (c)
                     break;
             }
             Q_ASSERT(c); // we have built-in support, so this should never fail
@@ -882,8 +832,10 @@ class NameManager : public QObject
 
             // use queued connections
             qRegisterMetaType<XMPP::ServiceLocalPublisher::Error>("XMPP::ServiceLocalPublisher::Error");
-            connect(p_serv, SIGNAL(publish_published(int)), SLOT(provider_publish_published(int)), Qt::QueuedConnection);
-            connect(p_serv, SIGNAL(publish_extra_published(int)), SLOT(provider_publish_extra_published(int)), Qt::QueuedConnection);
+            connect(p_serv, SIGNAL(publish_published(int)), SLOT(provider_publish_published(int)),
+                    Qt::QueuedConnection);
+            connect(p_serv, SIGNAL(publish_extra_published(int)), SLOT(provider_publish_extra_published(int)),
+                    Qt::QueuedConnection);
         }
 
         /*np->id = */
@@ -902,8 +854,8 @@ private slots:
     void provider_resolve_resultsReady(int id, const QList<XMPP::NameRecord> &results)
     {
         NameResolver::Private *np = res_instances.value(id);
-        NameResolver *q = np->q; // resolve_cleanup deletes np
-        if(!np->longLived)
+        NameResolver *         q  = np->q; // resolve_cleanup deletes np
+        if (!np->longLived)
             resolve_cleanup(np);
         emit q->resultsReady(results);
     }
@@ -911,16 +863,16 @@ private slots:
     void provider_resolve_error(int id, XMPP::NameResolver::Error e)
     {
         NameResolver::Private *np = res_instances.value(id);
-        NameResolver *q = np->q; // resolve_cleanup deletes np
+        NameResolver *         q  = np->q; // resolve_cleanup deletes np
         resolve_cleanup(np);
         emit q->error(e);
     }
 
     void provider_local_resolve_resultsReady(int id, const QList<XMPP::NameRecord> &results)
     {
-        int par_id = res_sub_instances.value(id);
-        NameResolver::Private *np = res_instances.value(par_id);
-        if(!np->longLived)
+        int                    par_id = res_sub_instances.value(id);
+        NameResolver::Private *np     = res_instances.value(par_id);
+        if (!np->longLived)
             res_sub_instances.remove(id);
         p_net->resolve_localResultsReady(par_id, results);
     }
@@ -935,15 +887,13 @@ private slots:
     void provider_resolve_useLocal(int id, const QByteArray &name)
     {
         // transfer to local
-        if(!p_local)
-        {
-            NameProvider *c = nullptr;
-            QList<IrisNetProvider*> list = irisNetProviders();
-            for(int n = 0; n < list.count(); ++n)
-            {
+        if (!p_local) {
+            NameProvider *           c    = nullptr;
+            QList<IrisNetProvider *> list = irisNetProviders();
+            for (int n = 0; n < list.count(); ++n) {
                 IrisNetProvider *p = list[n];
-                c = p->createNameProviderLocal();
-                if(c)
+                c                  = p->createNameProviderLocal();
+                if (c)
                     break;
             }
             Q_ASSERT(c); // we have built-in support, so this should never fail
@@ -951,10 +901,12 @@ private slots:
             p_local = c;
 
             // use queued connections
-            qRegisterMetaType< QList<XMPP::NameRecord> >("QList<XMPP::NameRecord>");
+            qRegisterMetaType<QList<XMPP::NameRecord>>("QList<XMPP::NameRecord>");
             qRegisterMetaType<XMPP::NameResolver::Error>("XMPP::NameResolver::Error");
-            connect(p_local, SIGNAL(resolve_resultsReady(int,QList<XMPP::NameRecord>)), SLOT(provider_local_resolve_resultsReady(int,QList<XMPP::NameRecord>)), Qt::QueuedConnection);
-            connect(p_local, SIGNAL(resolve_error(int,XMPP::NameResolver::Error)), SLOT(provider_local_resolve_error(int,XMPP::NameResolver::Error)), Qt::QueuedConnection);
+            connect(p_local, SIGNAL(resolve_resultsReady(int, QList<XMPP::NameRecord>)),
+                    SLOT(provider_local_resolve_resultsReady(int, QList<XMPP::NameRecord>)), Qt::QueuedConnection);
+            connect(p_local, SIGNAL(resolve_error(int, XMPP::NameResolver::Error)),
+                    SLOT(provider_local_resolve_error(int, XMPP::NameResolver::Error)), Qt::QueuedConnection);
         }
 
         NameResolver::Private *np = res_instances.value(id);
@@ -982,13 +934,13 @@ private slots:
     void provider_browse_instanceAvailable(int id, const XMPP::ServiceInstance &i)
     {
         ServiceBrowser::Private *np = br_instances.value(id);
-        emit np->q->instanceAvailable(i);
+        emit                     np->q->instanceAvailable(i);
     }
 
     void provider_browse_instanceUnavailable(int id, const XMPP::ServiceInstance &i)
     {
         ServiceBrowser::Private *np = br_instances.value(id);
-        emit np->q->instanceUnavailable(i);
+        emit                     np->q->instanceUnavailable(i);
     }
 
     void provider_browse_error(int id, XMPP::ServiceBrowser::Error e)
@@ -1002,20 +954,20 @@ private slots:
     void provider_resolve_resultsReady(int id, const QList<XMPP::ServiceProvider::ResolveResult> &results)
     {
         ServiceResolver::Private *np = sres_instances.value(id);
-        emit np->q->resultReady(results[0].address, results[0].port);
+        emit                      np->q->resultReady(results[0].address, results[0].port);
     }
 
     void provider_publish_published(int id)
     {
         ServiceLocalPublisher::Private *np = slp_instances.value(id);
-        emit np->q->published();
+        emit                            np->q->published();
     }
 
     void provider_publish_extra_published(int id)
     {
         Q_UNUSED(id);
-        //ServiceLocalPublisher::Private *np = slp_instances.value(id);
-        //emit np->q->published();
+        // ServiceLocalPublisher::Private *np = slp_instances.value(id);
+        // emit np->q->published();
     }
 };
 
@@ -1024,61 +976,63 @@ private slots:
 //----------------------------------------------------------------------------
 
 // copied from JDNS
-#define JDNS_RTYPE_A         1
-#define JDNS_RTYPE_AAAA     28
-#define JDNS_RTYPE_MX       15
-#define JDNS_RTYPE_SRV      33
-#define JDNS_RTYPE_CNAME     5
-#define JDNS_RTYPE_PTR      12
-#define JDNS_RTYPE_TXT      16
-#define JDNS_RTYPE_HINFO    13
-#define JDNS_RTYPE_NS        2
-#define JDNS_RTYPE_ANY     255
+#define JDNS_RTYPE_A 1
+#define JDNS_RTYPE_AAAA 28
+#define JDNS_RTYPE_MX 15
+#define JDNS_RTYPE_SRV 33
+#define JDNS_RTYPE_CNAME 5
+#define JDNS_RTYPE_PTR 12
+#define JDNS_RTYPE_TXT 16
+#define JDNS_RTYPE_HINFO 13
+#define JDNS_RTYPE_NS 2
+#define JDNS_RTYPE_ANY 255
 
 static int recordType2Rtype(NameRecord::Type type)
 {
-    switch(type)
-    {
-        case NameRecord::A:     return JDNS_RTYPE_A;
-        case NameRecord::Aaaa:  return JDNS_RTYPE_AAAA;
-        case NameRecord::Mx:    return JDNS_RTYPE_MX;
-        case NameRecord::Srv:   return JDNS_RTYPE_SRV;
-        case NameRecord::Cname: return JDNS_RTYPE_CNAME;
-        case NameRecord::Ptr:   return JDNS_RTYPE_PTR;
-        case NameRecord::Txt:   return JDNS_RTYPE_TXT;
-        case NameRecord::Hinfo: return JDNS_RTYPE_HINFO;
-        case NameRecord::Ns:    return JDNS_RTYPE_NS;
-        case NameRecord::Null:  return 10;
-        case NameRecord::Any:   return JDNS_RTYPE_ANY;
+    switch (type) {
+    case NameRecord::A:
+        return JDNS_RTYPE_A;
+    case NameRecord::Aaaa:
+        return JDNS_RTYPE_AAAA;
+    case NameRecord::Mx:
+        return JDNS_RTYPE_MX;
+    case NameRecord::Srv:
+        return JDNS_RTYPE_SRV;
+    case NameRecord::Cname:
+        return JDNS_RTYPE_CNAME;
+    case NameRecord::Ptr:
+        return JDNS_RTYPE_PTR;
+    case NameRecord::Txt:
+        return JDNS_RTYPE_TXT;
+    case NameRecord::Hinfo:
+        return JDNS_RTYPE_HINFO;
+    case NameRecord::Ns:
+        return JDNS_RTYPE_NS;
+    case NameRecord::Null:
+        return 10;
+    case NameRecord::Any:
+        return JDNS_RTYPE_ANY;
     }
     return -1;
 }
 
-NameResolver::NameResolver(QObject *parent)
-:QObject(parent)
-{
-    d = nullptr;
-}
+NameResolver::NameResolver(QObject *parent) : QObject(parent) { d = nullptr; }
 
-NameResolver::~NameResolver()
-{
-    stop();
-}
+NameResolver::~NameResolver() { stop(); }
 
 void NameResolver::start(const QByteArray &name, NameRecord::Type type, Mode mode)
 {
     stop();
-    d = new Private(this);
+    d         = new Private(this);
     int qType = recordType2Rtype(type);
-    if(qType == -1)
+    if (qType == -1)
         qType = JDNS_RTYPE_A;
     NameManager::instance()->resolve_start(d, name, qType, mode == NameResolver::LongLived ? true : false);
 }
 
 void NameResolver::stop()
 {
-    if(d)
-    {
+    if (d) {
         NameManager::instance()->resolve_stop(d);
         delete d;
         d = nullptr;
@@ -1089,23 +1043,22 @@ QDebug operator<<(QDebug dbg, XMPP::NameResolver::Error e)
 {
     dbg.nospace() << "XMPP::NameResolver::";
 
-    switch(e)
-    {
-        case XMPP::NameResolver::ErrorGeneric:
-            dbg.nospace() << "ErrorGeneric";
-            break;
-        case XMPP::NameResolver::ErrorNoName:
-            dbg.nospace() << "ErrorNoName";
-            break;
-        case XMPP::NameResolver::ErrorTimeout:
-            dbg.nospace() << "ErrorTimeout";
-            break;
-        case XMPP::NameResolver::ErrorNoLocal:
-            dbg.nospace() << "ErrorNoLocal";
-            break;
-        case XMPP::NameResolver::ErrorNoLongLived:
-            dbg.nospace() << "ErrorNoLongLived";
-            break;
+    switch (e) {
+    case XMPP::NameResolver::ErrorGeneric:
+        dbg.nospace() << "ErrorGeneric";
+        break;
+    case XMPP::NameResolver::ErrorNoName:
+        dbg.nospace() << "ErrorNoName";
+        break;
+    case XMPP::NameResolver::ErrorTimeout:
+        dbg.nospace() << "ErrorTimeout";
+        break;
+    case XMPP::NameResolver::ErrorNoLocal:
+        dbg.nospace() << "ErrorNoLocal";
+        break;
+    case XMPP::NameResolver::ErrorNoLongLived:
+        dbg.nospace() << "ErrorNoLongLived";
+        break;
     }
 
     return dbg;
@@ -1114,31 +1067,21 @@ QDebug operator<<(QDebug dbg, XMPP::NameResolver::Error e)
 //----------------------------------------------------------------------------
 // ServiceBrowser
 //----------------------------------------------------------------------------
-ServiceBrowser::ServiceBrowser(QObject *parent)
-:QObject(parent)
-{
-    d = new Private(this);
-}
+ServiceBrowser::ServiceBrowser(QObject *parent) : QObject(parent) { d = new Private(this); }
 
-ServiceBrowser::~ServiceBrowser()
-{
-    delete d;
-}
+ServiceBrowser::~ServiceBrowser() { delete d; }
 
 void ServiceBrowser::start(const QString &type, const QString &domain)
 {
     NameManager::instance()->browse_start(d, type, domain);
 }
 
-void ServiceBrowser::stop()
-{
-}
+void ServiceBrowser::stop() {}
 
 //----------------------------------------------------------------------------
 // ServiceResolver
 //----------------------------------------------------------------------------
-ServiceResolver::ServiceResolver(QObject *parent)
-    : QObject(parent)
+ServiceResolver::ServiceResolver(QObject *parent) : QObject(parent)
 {
 #ifdef NETNAMES_DEBUG
     NNDEBUG;
@@ -1147,10 +1090,7 @@ ServiceResolver::ServiceResolver(QObject *parent)
     d = new Private(this);
 }
 
-ServiceResolver::~ServiceResolver()
-{
-    delete d;
-}
+ServiceResolver::~ServiceResolver() { delete d; }
 
 void ServiceResolver::clear_resolvers()
 {
@@ -1184,18 +1124,12 @@ void ServiceResolver::cleanup_resolver(XMPP::NameResolver *resolver)
     }
 }
 
-ServiceResolver::Protocol ServiceResolver::protocol() const {
-    return d->requestedProtocol;
-}
+ServiceResolver::Protocol ServiceResolver::protocol() const { return d->requestedProtocol; }
 
-void ServiceResolver::setProtocol(ServiceResolver::Protocol p) {
-    d->requestedProtocol = p;
-}
+void ServiceResolver::setProtocol(ServiceResolver::Protocol p) { d->requestedProtocol = p; }
 
 /* DNS-SD lookup */
-void ServiceResolver::start(const QByteArray &name) {
-    NameManager::instance()->resolve_instance_start(d, name);
-}
+void ServiceResolver::start(const QByteArray &name) { NameManager::instance()->resolve_instance_start(d, name); }
 
 /* normal host lookup */
 void ServiceResolver::start(const QString &host, quint16 port)
@@ -1207,19 +1141,23 @@ void ServiceResolver::start(const QString &host, quint16 port)
     /* clear host list */
     d->hostList.clear();
 
-    d->protocol = (d->requestedProtocol == IPv6_IPv4 || d->requestedProtocol == IPv6 ? QAbstractSocket::IPv6Protocol : QAbstractSocket::IPv4Protocol);
-    d->host = host;
-    d->port = port;
+    d->protocol = (d->requestedProtocol == IPv6_IPv4 || d->requestedProtocol == IPv6 ? QAbstractSocket::IPv6Protocol
+                                                                                     : QAbstractSocket::IPv4Protocol);
+    d->host     = host;
+    d->port     = port;
 
 #ifdef NETNAMES_DEBUG
     NNDEBUG << "d->p:" << d->protocol;
 #endif
 
     /* initiate the host lookup */
-    XMPP::NameRecord::Type querytype = (d->protocol == QAbstractSocket::IPv6Protocol ? XMPP::NameRecord::Aaaa : XMPP::NameRecord::A);
+    XMPP::NameRecord::Type querytype
+        = (d->protocol == QAbstractSocket::IPv6Protocol ? XMPP::NameRecord::Aaaa : XMPP::NameRecord::A);
     XMPP::NameResolver *resolver = new XMPP::NameResolver;
-    connect(resolver, SIGNAL(resultsReady(QList<XMPP::NameRecord>)), this, SLOT(handle_host_ready(QList<XMPP::NameRecord>)));
-    connect(resolver, SIGNAL(error(XMPP::NameResolver::Error)), this, SLOT(handle_host_error(XMPP::NameResolver::Error)));
+    connect(resolver, SIGNAL(resultsReady(QList<XMPP::NameRecord>)), this,
+            SLOT(handle_host_ready(QList<XMPP::NameRecord>)));
+    connect(resolver, SIGNAL(error(XMPP::NameResolver::Error)), this,
+            SLOT(handle_host_error(XMPP::NameResolver::Error)));
     resolver->start(host.toLocal8Bit(), querytype);
     d->resolverList << resolver;
 }
@@ -1241,16 +1179,17 @@ void ServiceResolver::start(const QString &service, const QString &transport, co
     /* after we tried all SRV hosts, we shall connect directly (if requested) */
     if (port < std::numeric_limits<quint16>::max()) {
         d->srvList.append(domain.toLocal8Bit(), port);
-    }
-    else {
+    } else {
         /* The only "valid" port above the valid port range is our specification of an invalid port */
         Q_ASSERT(port == std::numeric_limits<int>::max());
     }
 
     /* initiate the SRV lookup */
     XMPP::NameResolver *resolver = new XMPP::NameResolver;
-    connect(resolver, SIGNAL(resultsReady(QList<XMPP::NameRecord>)), this, SLOT(handle_srv_ready(QList<XMPP::NameRecord>)));
-    connect(resolver, SIGNAL(error(XMPP::NameResolver::Error)), this, SLOT(handle_srv_error(XMPP::NameResolver::Error)));
+    connect(resolver, SIGNAL(resultsReady(QList<XMPP::NameRecord>)), this,
+            SLOT(handle_srv_ready(QList<XMPP::NameRecord>)));
+    connect(resolver, SIGNAL(error(XMPP::NameResolver::Error)), this,
+            SLOT(handle_srv_error(XMPP::NameResolver::Error)));
     resolver->start(srv_request.toLocal8Bit(), XMPP::NameRecord::Srv);
     d->resolverList << resolver;
 }
@@ -1263,7 +1202,7 @@ void ServiceResolver::handle_srv_ready(const QList<XMPP::NameRecord> &r)
 #endif
 
     /* cleanup resolver */
-    cleanup_resolver(static_cast<XMPP::NameResolver*>(sender()));
+    cleanup_resolver(static_cast<XMPP::NameResolver *>(sender()));
 
     /* lookup srv pointers */
     d->srvList << r;
@@ -1283,7 +1222,7 @@ void ServiceResolver::handle_srv_error(XMPP::NameResolver::Error e)
 #endif
 
     /* cleanup resolver */
-    cleanup_resolver(static_cast<XMPP::NameResolver*>(sender()));
+    cleanup_resolver(static_cast<XMPP::NameResolver *>(sender()));
 
     /* srvList already contains a failsafe host, try that */
     emit srvFailed();
@@ -1300,7 +1239,7 @@ void ServiceResolver::handle_host_ready(const QList<XMPP::NameRecord> &r)
 #endif
 
     /* cleanup resolver */
-    cleanup_resolver(static_cast<XMPP::NameResolver*>(sender()));
+    cleanup_resolver(static_cast<XMPP::NameResolver *>(sender()));
 
     /* connect to host */
     d->hostList << r;
@@ -1315,7 +1254,7 @@ void ServiceResolver::handle_host_error(XMPP::NameResolver::Error e)
 #endif
 
     /* cleanup resolver */
-    cleanup_resolver(static_cast<XMPP::NameResolver*>(sender()));
+    cleanup_resolver(static_cast<XMPP::NameResolver *>(sender()));
 
     /* try a fallback lookup if requested*/
     if (!lookup_host_fallback()) {
@@ -1334,7 +1273,7 @@ void ServiceResolver::handle_host_fallback_error(XMPP::NameResolver::Error e)
 #endif
 
     /* cleanup resolver */
-    cleanup_resolver(static_cast<XMPP::NameResolver*>(sender()));
+    cleanup_resolver(static_cast<XMPP::NameResolver *>(sender()));
 
     /* lookup next SRV */
     try_next_srv();
@@ -1348,7 +1287,8 @@ bool ServiceResolver::check_protocol_fallback()
 }
 
 /* lookup the fallback host */
-bool ServiceResolver::lookup_host_fallback() {
+bool ServiceResolver::lookup_host_fallback()
+{
 #ifdef NETNAMES_DEBUG
     NNDEBUG;
 #endif
@@ -1358,17 +1298,21 @@ bool ServiceResolver::lookup_host_fallback() {
         return false;
     }
 
-    d->protocol = (d->protocol == QAbstractSocket::IPv6Protocol ? QAbstractSocket::IPv4Protocol : QAbstractSocket::IPv6Protocol);
+    d->protocol = (d->protocol == QAbstractSocket::IPv6Protocol ? QAbstractSocket::IPv4Protocol
+                                                                : QAbstractSocket::IPv6Protocol);
 
 #ifdef NETNAMES_DEBUG
     NNDEBUG << "d->p:" << d->protocol;
 #endif
 
     /* initiate the fallback host lookup */
-    XMPP::NameRecord::Type querytype = (d->protocol == QAbstractSocket::IPv6Protocol ? XMPP::NameRecord::Aaaa : XMPP::NameRecord::A);
+    XMPP::NameRecord::Type querytype
+        = (d->protocol == QAbstractSocket::IPv6Protocol ? XMPP::NameRecord::Aaaa : XMPP::NameRecord::A);
     XMPP::NameResolver *resolver = new XMPP::NameResolver;
-    connect(resolver, SIGNAL(resultsReady(QList<XMPP::NameRecord>)), this, SLOT(handle_host_ready(QList<XMPP::NameRecord>)));
-    connect(resolver, SIGNAL(error(XMPP::NameResolver::Error)), this, SLOT(handle_host_fallback_error(XMPP::NameResolver::Error)));
+    connect(resolver, SIGNAL(resultsReady(QList<XMPP::NameRecord>)), this,
+            SLOT(handle_host_ready(QList<XMPP::NameRecord>)));
+    connect(resolver, SIGNAL(error(XMPP::NameResolver::Error)), this,
+            SLOT(handle_host_fallback_error(XMPP::NameResolver::Error)));
     resolver->start(d->host.toLocal8Bit(), querytype);
     d->resolverList << resolver;
 
@@ -1376,7 +1320,8 @@ bool ServiceResolver::lookup_host_fallback() {
 }
 
 /* notify user about next host */
-bool ServiceResolver::try_next_host() {
+bool ServiceResolver::try_next_host()
+{
 #ifdef NETNAMES_DEBUG
     NNDEBUG << "hl:" << d->hostList;
 #endif
@@ -1405,8 +1350,7 @@ void ServiceResolver::try_next_srv()
         XMPP::NameRecord record(d->srvList.takeNext());
         /* lookup host by name and specify port for later use */
         start(record.name(), record.port());
-    }
-    else {
+    } else {
 #ifdef NETNAMES_DEBUG
         NNDEBUG << "SRV list empty, failing";
 #endif
@@ -1415,21 +1359,17 @@ void ServiceResolver::try_next_srv()
     }
 }
 
-void ServiceResolver::tryNext() {
+void ServiceResolver::tryNext()
+{
     /* if the host list cannot help, try the SRV list */
     if (!try_next_host()) {
-         try_next_srv();
+        try_next_srv();
     }
 }
 
-void ServiceResolver::stop() {
-    clear_resolvers();
-}
+void ServiceResolver::stop() { clear_resolvers(); }
 
-bool ServiceResolver::hasPendingSrv() const
-{
-    return !d->srvList.isEmpty();
-}
+bool ServiceResolver::hasPendingSrv() const { return !d->srvList.isEmpty(); }
 
 ServiceResolver::ProtoSplit ServiceResolver::happySplit()
 {
@@ -1437,57 +1377,40 @@ ServiceResolver::ProtoSplit ServiceResolver::happySplit()
     ProtoSplit s;
     s.ipv4 = new ServiceResolver(this);
     s.ipv4->setProtocol(IPv4);
-    s.ipv4->d->srvList = d->srvList;
+    s.ipv4->d->srvList  = d->srvList;
     s.ipv4->d->hostList = d->hostList;
-    s.ipv4->d->domain = d->domain;
-    s.ipv6 = new ServiceResolver(this);
+    s.ipv4->d->domain   = d->domain;
+    s.ipv6              = new ServiceResolver(this);
     s.ipv6->setProtocol(IPv6);
-    s.ipv6->d->srvList = d->srvList;
+    s.ipv6->d->srvList  = d->srvList;
     s.ipv6->d->hostList = d->hostList;
-    s.ipv6->d->domain = d->domain;
+    s.ipv6->d->domain   = d->domain;
     return s;
 }
 
 //----------------------------------------------------------------------------
 // ServiceLocalPublisher
 //----------------------------------------------------------------------------
-ServiceLocalPublisher::ServiceLocalPublisher(QObject *parent)
-:QObject(parent)
-{
-    d = new Private(this);
-}
+ServiceLocalPublisher::ServiceLocalPublisher(QObject *parent) : QObject(parent) { d = new Private(this); }
 
-ServiceLocalPublisher::~ServiceLocalPublisher()
-{
-    delete d;
-}
+ServiceLocalPublisher::~ServiceLocalPublisher() { delete d; }
 
-void ServiceLocalPublisher::publish(const QString &instance, const QString &type, int port, const QMap<QString,QByteArray> &attributes)
+void ServiceLocalPublisher::publish(const QString &instance, const QString &type, int port,
+                                    const QMap<QString, QByteArray> &attributes)
 {
     NameManager::instance()->publish_start(d, instance, type, port, attributes);
 }
 
-void ServiceLocalPublisher::updateAttributes(const QMap<QString,QByteArray> &attributes)
-{
-    Q_UNUSED(attributes);
-}
+void ServiceLocalPublisher::updateAttributes(const QMap<QString, QByteArray> &attributes) { Q_UNUSED(attributes); }
 
-void ServiceLocalPublisher::addRecord(const NameRecord &rec)
-{
-    NameManager::instance()->publish_extra_start(d, rec);
-}
+void ServiceLocalPublisher::addRecord(const NameRecord &rec) { NameManager::instance()->publish_extra_start(d, rec); }
 
-void ServiceLocalPublisher::cancel()
-{
-}
+void ServiceLocalPublisher::cancel() {}
 
 //----------------------------------------------------------------------------
 // NetNames
 //----------------------------------------------------------------------------
-void NetNames::cleanup()
-{
-    NameManager::cleanup();
-}
+void NetNames::cleanup() { NameManager::cleanup(); }
 
 QString NetNames::diagnosticText()
 {
diff --git a/src/irisnet/corelib/netnames.h b/src/irisnet/corelib/netnames.h
index f5989875..87a9e093 100644
--- a/src/irisnet/corelib/netnames.h
+++ b/src/irisnet/corelib/netnames.h
@@ -28,14 +28,13 @@
 
 // it seems visual studio defines it somewhere
 #ifdef max
-# undef max
+#undef max
 #endif
 
 namespace XMPP {
 class NameManager;
 
-class IRISNET_EXPORT NetNames
-{
+class IRISNET_EXPORT NetNames {
 public:
     // free any shared data, shutdown internal dns sessions if necessary.
     static void cleanup();
@@ -45,7 +44,7 @@ class IRISNET_EXPORT NetNames
 
     // convert idn names
     static QByteArray idnaFromString(const QString &in);
-    static QString idnaToString(const QByteArray &in);
+    static QString    idnaToString(const QByteArray &in);
 
     // dns escaping
     static QByteArray escapeDomain(const QByteArray &in);
@@ -58,9 +57,13 @@ class IRISNET_EXPORT NetNames
 /**
    \brief Provides a DNS record
 
-   NameRecord provides a DNS (Domain Name System) record, which is information assicated with a domain name.  For most purposes, the information is an IP address.  However, DNS records are capable of holding a variety of data types, such as named pointers to other domain names and even arbitrary text strings.  The results of a NameResolver operation are a list of NameRecords.
+   NameRecord provides a DNS (Domain Name System) record, which is information assicated with a domain name.  For most
+purposes, the information is an IP address.  However, DNS records are capable of holding a variety of data types, such
+as named pointers to other domain names and even arbitrary text strings.  The results of a NameResolver operation are a
+list of NameRecords.
 
-   The most common type is the address record, "A", which contains an IPv4 address.  Here is an example of how to get the IP address out of an address record:
+   The most common type is the address record, "A", which contains an IPv4 address.  Here is an example of how to get
+the IP address out of an address record:
 
 \code
 NameRecord record = ... // obtain a record from somewhere
@@ -71,9 +74,13 @@ if(record.type() == NameRecord::A)
 }
 \endcode
 
-   Getting the data out of a NameRecord involves calling the right retrieval functions, depending on the type.  Many types share retrieval functions.  For example, the "AAAA" type holds an IPv6 address, which is accessed the same way as the "A" type, by calling address().  See the NameRecord::Type enum for further information about which retrieval functions should be called for each type.
+   Getting the data out of a NameRecord involves calling the right retrieval functions, depending on the type.  Many
+types share retrieval functions.  For example, the "AAAA" type holds an IPv6 address, which is accessed the same way as
+the "A" type, by calling address().  See the NameRecord::Type enum for further information about which retrieval
+functions should be called for each type.
 
-   To create a NameRecord, use setOwner() and setTtl() as necessary, and then call one of the set<em>X</em> functions (where <em>X</em> is the desired type).  For example, to set an A or AAAA record, use setAddress() like this:
+   To create a NameRecord, use setOwner() and setTtl() as necessary, and then call one of the set<em>X</em> functions
+(where <em>X</em> is the desired type).  For example, to set an A or AAAA record, use setAddress() like this:
 
 \code
 // make example.com the owner, with 1 hour TTL
@@ -81,20 +88,19 @@ NameRecord record("example.com", 3600);
 record.setAddress(QHostAddress("1.2.3.4"));
 \endcode
 
-   Note that in the case of setAddress(), the record type need not be specified.  NameRecord will determine the type to use based on the given QHostAddress.
+   Note that in the case of setAddress(), the record type need not be specified.  NameRecord will determine the type to
+use based on the given QHostAddress.
 
    \sa NameResolver
 */
-class IRISNET_EXPORT NameRecord
-{
+class IRISNET_EXPORT NameRecord {
 public:
     /**
         \brief The type of DNS record
 
         The retrieval functions are shown for each type.
     */
-    enum Type
-    {
+    enum Type {
         A,     ///< IPv4 address.  Use address().
         Aaaa,  ///< IPv6 address.  Use address().
         Mx,    ///< Mail server.  Use name() and priority().
@@ -105,7 +111,7 @@ class IRISNET_EXPORT NameRecord
         Hinfo, ///< Host information.  Use cpu() and os().
         Ns,    ///< Name server.  Use name().
         Null,  ///< Null type.  Use rawData().
-        Any    ///< "Any record", for use with NameResolver::start() only.  A NameRecord object will never be of this type.
+        Any ///< "Any record", for use with NameResolver::start() only.  A NameRecord object will never be of this type.
     };
 
     /**
@@ -118,7 +124,8 @@ class IRISNET_EXPORT NameRecord
     /**
        \brief Constructs a partially initialized record object, with the given \a owner and \a ttl
 
-       For the record to be usable, call an appropriate set<em>X</em> function (where <em>X</em> is the desired type) afterwards.
+       For the record to be usable, call an appropriate set<em>X</em> function (where <em>X</em> is the desired type)
+       afterwards.
     */
     NameRecord(const QByteArray &owner, int ttl);
 
@@ -135,7 +142,7 @@ class IRISNET_EXPORT NameRecord
     /**
        \brief Assigns \a from to this object and returns a reference to this object
     */
-    NameRecord & operator=(const NameRecord &from);
+    NameRecord &operator=(const NameRecord &from);
 
     /**
        \brief Compares \a other with this object
@@ -145,14 +152,17 @@ class IRISNET_EXPORT NameRecord
     /**
        \brief Returns true if this record object is null, otherwise returns false
 
-       Be sure not to confuse a null object with the NULL type (NameRecord::Null).  Don't ask why DNS has a type called NULL that contains valid data.
+       Be sure not to confuse a null object with the NULL type (NameRecord::Null).  Don't ask why DNS has a type called
+       NULL that contains valid data.
     */
     bool isNull() const; // don't confuse with Null type
 
     /**
        \brief Returns the owner of this record
 
-       The owner is usually not a useful attribute, since it will be the same as the name searched for with NameResolver.  For example, if the A record of "example.com" is looked up, then the resulting records will all have "example.com" as the owner.
+       The owner is usually not a useful attribute, since it will be the same as the name searched for with
+       NameResolver.  For example, if the A record of "example.com" is looked up, then the resulting records will all
+       have "example.com" as the owner.
 
        \sa setOwner
     */
@@ -161,9 +171,11 @@ class IRISNET_EXPORT NameRecord
     /**
        \brief Returns the TTL (time-to-live) of this record
 
-       This is the number of seconds the record should be considered valid, which is useful information when performing caching.
+       This is the number of seconds the record should be considered valid, which is useful information when performing
+       caching.
 
-       As a special exception, a TTL of 0 when performing a long-lived lookup indicates that a record is no longer available.
+       As a special exception, a TTL of 0 when performing a long-lived lookup indicates that a record is no longer
+       available.
 
        \sa setTtl
     */
@@ -306,20 +318,20 @@ class IRISNET_EXPORT NameRecord
 IRISNET_EXPORT QDebug operator<<(QDebug, XMPP::NameRecord::Type);
 IRISNET_EXPORT QDebug operator<<(QDebug, const XMPP::NameRecord &);
 
-class IRISNET_EXPORT ServiceInstance
-{
+class IRISNET_EXPORT ServiceInstance {
 public:
     ServiceInstance();
-    ServiceInstance(const QString &instance, const QString &type, const QString &domain, const QMap<QString,QByteArray> &attributes);
+    ServiceInstance(const QString &instance, const QString &type, const QString &domain,
+                    const QMap<QString, QByteArray> &attributes);
     ServiceInstance(const ServiceInstance &from);
     ~ServiceInstance();
-    ServiceInstance & operator=(const ServiceInstance &from);
+    ServiceInstance &operator=(const ServiceInstance &from);
 
-    QString instance() const;
-    QString type() const;
-    QString domain() const;
-    QMap<QString,QByteArray> attributes() const;
-    QByteArray name() const; // full dns label
+    QString                   instance() const;
+    QString                   type() const;
+    QString                   domain() const;
+    QMap<QString, QByteArray> attributes() const;
+    QByteArray                name() const; // full dns label
 
 private:
     class Private;
@@ -331,9 +343,11 @@ class IRISNET_EXPORT ServiceInstance
 /**
    \brief Represents a DNS query/lookup
 
-   NameResolver performs an asynchronous DNS lookup for a given domain name and record type.  Call start() to begin.  The resultsReady() signal is emitted on success, otherwise error() is emitted.  To cancel a lookup, call stop().
+   NameResolver performs an asynchronous DNS lookup for a given domain name and record type.  Call start() to begin. The
+resultsReady() signal is emitted on success, otherwise error() is emitted.  To cancel a lookup, call stop().
 
-   Each NameResolver object can only perform one DNS lookup at a time.  If start() is called while a lookup is already in progress, then the existing lookup is stopped before starting the new lookup.
+   Each NameResolver object can only perform one DNS lookup at a time.  If start() is called while a lookup is already
+in progress, then the existing lookup is stopped before starting the new lookup.
 
    Each NameResolver object should be used for just one DNS query and then be deleted.
    Otherwise ambiguity might arise when receiving multiple answers to future queries.
@@ -368,51 +382,56 @@ void dns_error(XMPP::NameResolver::Error error)
 }
 \endcode
 
-   Yes, a domain name can have multiple IP addresses.  Many applications ignore this fact, and use only one of the answers.  A proper network application should try connecting to each IP address until one succeeds.
+   Yes, a domain name can have multiple IP addresses.  Many applications ignore this fact, and use only one of the
+answers.  A proper network application should try connecting to each IP address until one succeeds.
 
-   To lookup other types, pass the desired type to start().  For example, suppose you want to look up the MX record of a domain name:
+   To lookup other types, pass the desired type to start().  For example, suppose you want to look up the MX record of a
+domain name:
 
 \code
 // look up the MX record for affinix.com
 resolver->start("affinix.com", NameRecord::Mx);
 \endcode
 
-   It is also possible to perform long-lived queries.  This is generally useful for DNS Service Discovery.  Long-lived queries are continuous, and resultsReady() may be emitted multiple times.  Unlike a normal lookup, which stops once the results are returned, a long-lived query will keep going until stop() is called.
+   It is also possible to perform long-lived queries.  This is generally useful for DNS Service Discovery.  Long-lived
+queries are continuous, and resultsReady() may be emitted multiple times.  Unlike a normal lookup, which stops once the
+results are returned, a long-lived query will keep going until stop() is called.
 
-   For example, suppose you want to scan the local network for SSH services.  According to the DNS-SD protocol, this is done by querying for the name "_ssh._tcp.local." of type PTR.
+   For example, suppose you want to scan the local network for SSH services.  According to the DNS-SD protocol, this is
+done by querying for the name "_ssh._tcp.local." of type PTR.
 
 \code
 // monitor for SSH services on the local network
 resolver->start("_ssh._tcp.local.", NameRecord::Ptr, NameResolver::LongLived);
 \endcode
 
-   Don't be alarmed by the trailing dot (".") character in this last example.  It is not well known, but all valid DNS domain names end with a dot.  However, NameResolver, like most DNS programming interfaces, allows the dot to be left out.  What this means is that if a trailing dot is missing in the input to start(), NameResolver will internally append one before performing the query.
+   Don't be alarmed by the trailing dot (".") character in this last example.  It is not well known, but all valid DNS
+domain names end with a dot.  However, NameResolver, like most DNS programming interfaces, allows the dot to be left
+out.  What this means is that if a trailing dot is missing in the input to start(), NameResolver will internally append
+one before performing the query.
 
    \sa NameRecord
 */
-class IRISNET_EXPORT NameResolver : public QObject
-{
+class IRISNET_EXPORT NameResolver : public QObject {
     Q_OBJECT
 public:
     /**
        \brief Resolve mode
     */
-    enum Mode
-    {
-        Single,       ///< A normal DNS query with a single result set.
-        LongLived     ///< An endless query, with multiple result sets allowed.
+    enum Mode {
+        Single,   ///< A normal DNS query with a single result set.
+        LongLived ///< An endless query, with multiple result sets allowed.
     };
 
     /**
        \brief Resolve error
     */
-    enum Error
-    {
-        ErrorGeneric,     ///< General failure during lookup, no further details.
-        ErrorNoName,      ///< Name does not exist.
-        ErrorTimeout,     ///< The operation timed out.
-        ErrorNoLocal,     ///< The query is to the local network, but no mechanism for Multicast DNS is available.
-        ErrorNoLongLived  ///< The query requires long-lived capability, but no mechanism for doing so is available.
+    enum Error {
+        ErrorGeneric,    ///< General failure during lookup, no further details.
+        ErrorNoName,     ///< Name does not exist.
+        ErrorTimeout,    ///< The operation timed out.
+        ErrorNoLocal,    ///< The query is to the local network, but no mechanism for Multicast DNS is available.
+        ErrorNoLongLived ///< The query requires long-lived capability, but no mechanism for doing so is available.
     };
 
     /**
@@ -430,7 +449,8 @@ class IRISNET_EXPORT NameResolver : public QObject
     /**
        \brief Starts a lookup
 
-       A lookup for \a name of \a type is started.  For normal queries, \a mode should be NameResolver::Single (this is the default).  For long-lived queries, use NameResolver::LongLived.
+       A lookup for \a name of \a type is started.  For normal queries, \a mode should be NameResolver::Single (this is
+       the default).  For long-lived queries, use NameResolver::LongLived.
 
        If a lookup is already in progress, it is stopped before starting the new lookup.
 
@@ -441,7 +461,8 @@ class IRISNET_EXPORT NameResolver : public QObject
     /**
        \brief Stops a lookup
 
-       Use this function if you want to stop the current lookup, such that the resolver object may be reused again later.  If you don't plan to reuse the object, then destroying the object is enough.
+       Use this function if you want to stop the current lookup, such that the resolver object may be reused again
+       later.  If you don't plan to reuse the object, then destroying the object is enough.
 
        \sa start
     */
@@ -451,16 +472,21 @@ class IRISNET_EXPORT NameResolver : public QObject
     /**
        \brief Notification of result records
 
-       This signal is emitted when results of the lookup operation have arrived.  The \a results parameter is a list of NameRecords.  All records will be of the type queried for with start(), unless the NameRecord::Any type was specified, in which case the records may be of any type
+       This signal is emitted when results of the lookup operation have arrived.  The \a results parameter is a list of
+       NameRecords.  All records will be of the type queried for with start(), unless the NameRecord::Any type was
+       specified, in which case the records may be of any type
 
-       When using the NameResolver::Single mode, the lookup is stopped once results are ready.  However, with the NameResolver::LongLived mode, the lookup stays active, and in that case this signal may be emitted multiple times.
+       When using the NameResolver::Single mode, the lookup is stopped once results are ready.  However, with the
+       NameResolver::LongLived mode, the lookup stays active, and in that case this signal may be emitted multiple
+       times.
     */
     void resultsReady(const QList<XMPP::NameRecord> &results);
 
     /**
        \brief Notification of error
 
-       This signal is emitted if an error has occurred while performing a lookup.  The reason for error can be found in \a e.  Regardless of the mode used, the lookup is stopped when an error occurs.
+       This signal is emitted if an error has occurred while performing a lookup.  The reason for error can be found in
+       \a e.  Regardless of the mode used, the lookup is stopped when an error occurs.
     */
     void error(XMPP::NameResolver::Error e);
 
@@ -474,49 +500,42 @@ class IRISNET_EXPORT NameResolver : public QObject
 
 IRISNET_EXPORT QDebug operator<<(QDebug, XMPP::NameResolver::Error);
 
-class IRISNET_EXPORT WeightedNameRecordList
-{
-    friend QDebug operator<<(QDebug, const WeightedNameRecordList&);
+class IRISNET_EXPORT WeightedNameRecordList {
+    friend QDebug operator<<(QDebug, const WeightedNameRecordList &);
 
 public:
     WeightedNameRecordList();
     WeightedNameRecordList(const QList<NameRecord> &list);
     WeightedNameRecordList(const WeightedNameRecordList &other);
-    WeightedNameRecordList& operator=(const WeightedNameRecordList &other);
+    WeightedNameRecordList &operator=(const WeightedNameRecordList &other);
     ~WeightedNameRecordList();
-    bool isEmpty() const; //!< Returns true if the list contains no items; otherwise returns false.
-    NameRecord takeNext(); //!< Removes the next host to try from the list and returns it.
+    bool       isEmpty() const; //!< Returns true if the list contains no items; otherwise returns false.
+    NameRecord takeNext();      //!< Removes the next host to try from the list and returns it.
 
     void clear(); //!< Removes all items from the list.
-    void append(const WeightedNameRecordList&);
-    void append(const QList<NameRecord>&);
-    void append(const NameRecord&);
+    void append(const WeightedNameRecordList &);
+    void append(const QList<NameRecord> &);
+    void append(const NameRecord &);
     void append(const QString &hostname, quint16 port);
 
-    WeightedNameRecordList& operator<<(const WeightedNameRecordList&);
-    WeightedNameRecordList& operator<<(const QList<NameRecord>&);
-    WeightedNameRecordList& operator<<(const NameRecord&);
+    WeightedNameRecordList &operator<<(const WeightedNameRecordList &);
+    WeightedNameRecordList &operator<<(const QList<NameRecord> &);
+    WeightedNameRecordList &operator<<(const NameRecord &);
 
 private:
-    typedef QMultiMap<int /* weight */, NameRecord> WeightedNameRecordPriorityGroup;
+    typedef QMultiMap<int /* weight */, NameRecord>                   WeightedNameRecordPriorityGroup;
     typedef QMap<int /* priority */, WeightedNameRecordPriorityGroup> WNRL;
 
-    WNRL priorityGroups;
+    WNRL           priorityGroups;
     WNRL::iterator currentPriorityGroup;
 };
 
-QDebug operator<<(QDebug, const XMPP::WeightedNameRecordList&);
+QDebug operator<<(QDebug, const XMPP::WeightedNameRecordList &);
 
-class IRISNET_EXPORT ServiceBrowser : public QObject
-{
+class IRISNET_EXPORT ServiceBrowser : public QObject {
     Q_OBJECT
 public:
-    enum Error
-    {
-        ErrorGeneric,
-        ErrorNoLocal,
-        ErrorNoWide
-    };
+    enum Error { ErrorGeneric, ErrorNoLocal, ErrorNoWide };
 
     ServiceBrowser(QObject *parent = nullptr);
     ~ServiceBrowser();
@@ -560,12 +579,10 @@ class IRISNET_EXPORT ServiceBrowser : public QObject
     8) host[] empty -> (9)
 9) Try servername directly
 */
-class IRISNET_EXPORT ServiceResolver : public QObject
-{
+class IRISNET_EXPORT ServiceResolver : public QObject {
     Q_OBJECT
 public:
-    struct ProtoSplit
-    {
+    struct ProtoSplit {
         ServiceResolver *ipv4;
         ServiceResolver *ipv6;
     };
@@ -573,8 +590,10 @@ class IRISNET_EXPORT ServiceResolver : public QObject
     /*! Error codes for (SRV) lookups */
     enum Error {
         ServiceNotFound, //!< There is no service with the specified parameters
-        NoHostLeft, //!< we did all we could, none of the found host seemed to suffice the users needs
-        ErrorGeneric, ErrorTimeout, ErrorNoLocal // Stuff that netnames_jdns.cpp needs ...
+        NoHostLeft,      //!< we did all we could, none of the found host seemed to suffice the users needs
+        ErrorGeneric,
+        ErrorTimeout,
+        ErrorNoLocal // Stuff that netnames_jdns.cpp needs ...
     };
     /*! Order of lookup / IP protocols to try */
     enum Protocol { IPv6_IPv4, IPv4_IPv6, HappyEyeballs, IPv6, IPv4 };
@@ -586,8 +605,8 @@ class IRISNET_EXPORT ServiceResolver : public QObject
     ServiceResolver(QObject *parent = nullptr);
     ~ServiceResolver();
 
-    Protocol protocol() const; //!< IP protocol to use, defaults to IPv6_IPv4
-    void setProtocol(Protocol); //!< Set IP protocol to use, \sa protocol
+    Protocol protocol() const;      //!< IP protocol to use, defaults to IPv6_IPv4
+    void     setProtocol(Protocol); //!< Set IP protocol to use, \sa protocol
 
     /*!
      * Start a DNS-SD lookup
@@ -608,7 +627,8 @@ class IRISNET_EXPORT ServiceResolver : public QObject
      * \param domain Domainname to lookup
      * \param port Specify a valid port number to make ServiceResolver fallback to domain:port
      */
-    void start(const QString &service, const QString &transport, const QString &domain, int port = std::numeric_limits<int>::max());
+    void start(const QString &service, const QString &transport, const QString &domain,
+               int port = std::numeric_limits<int>::max());
 
     /*! Announce the next resolved host, \sa resultReady */
     void tryNext();
@@ -637,15 +657,15 @@ class IRISNET_EXPORT ServiceResolver : public QObject
     void srvFailed();
 
 private slots:
-    void handle_srv_ready(const QList<XMPP::NameRecord>&);
+    void handle_srv_ready(const QList<XMPP::NameRecord> &);
     void handle_srv_error(XMPP::NameResolver::Error);
-    void handle_host_ready(const QList<XMPP::NameRecord>&);
+    void handle_host_ready(const QList<XMPP::NameRecord> &);
     void handle_host_error(XMPP::NameResolver::Error);
     void handle_host_fallback_error(XMPP::NameResolver::Error);
 
 private:
     void clear_resolvers();
-    void cleanup_resolver(XMPP::NameResolver*);
+    void cleanup_resolver(XMPP::NameResolver *);
     bool check_protocol_fallback();
     bool lookup_host_fallback();
     bool try_next_host();
@@ -658,12 +678,10 @@ private slots:
     friend class NameManager;
 };
 
-class IRISNET_EXPORT ServiceLocalPublisher : public QObject
-{
+class IRISNET_EXPORT ServiceLocalPublisher : public QObject {
     Q_OBJECT
 public:
-    enum Error
-    {
+    enum Error {
         ErrorGeneric,  // generic error
         ErrorConflict, // name in use
         ErrorNoLocal   // unable to setup multicast dns
@@ -672,8 +690,8 @@ class IRISNET_EXPORT ServiceLocalPublisher : public QObject
     ServiceLocalPublisher(QObject *parent = nullptr);
     ~ServiceLocalPublisher();
 
-    void publish(const QString &instance, const QString &type, int port, const QMap<QString,QByteArray> &attributes);
-    void updateAttributes(const QMap<QString,QByteArray> &attributes);
+    void publish(const QString &instance, const QString &type, int port, const QMap<QString, QByteArray> &attributes);
+    void updateAttributes(const QMap<QString, QByteArray> &attributes);
     void addRecord(const NameRecord &rec);
     void cancel();
 
diff --git a/src/irisnet/corelib/netnames_jdns.cpp b/src/irisnet/corelib/netnames_jdns.cpp
index 008eddcc..311d986a 100644
--- a/src/irisnet/corelib/netnames_jdns.cpp
+++ b/src/irisnet/corelib/netnames_jdns.cpp
@@ -24,7 +24,7 @@
 //#define JDNS_DEBUG
 
 Q_DECLARE_METATYPE(XMPP::NameRecord)
-//Q_DECLARE_METATYPE(XMPP::NameResolver::Error)
+// Q_DECLARE_METATYPE(XMPP::NameResolver::Error)
 Q_DECLARE_METATYPE(XMPP::ServiceBrowser::Error)
 Q_DECLARE_METATYPE(XMPP::ServiceResolver::Error)
 Q_DECLARE_METATYPE(XMPP::ServiceLocalPublisher::Error)
@@ -33,20 +33,39 @@ namespace XMPP {
 static NameRecord importJDNSRecord(const QJDns::Record &in)
 {
     NameRecord out;
-    switch(in.type)
-    {
-        case QJDns::A:     out.setAddress(in.address); break;
-        case QJDns::Aaaa:  out.setAddress(in.address); break;
-        case QJDns::Mx:    out.setMx(in.name, in.priority); break;
-        case QJDns::Srv:   out.setSrv(in.name, in.port, in.priority, in.weight); break;
-        case QJDns::Cname: out.setCname(in.name); break;
-        case QJDns::Ptr:   out.setPtr(in.name); break;
-        case QJDns::Txt:   out.setTxt(in.texts); break;
-        case QJDns::Hinfo: out.setHinfo(in.cpu, in.os); break;
-        case QJDns::Ns:    out.setNs(in.name); break;
-        case 10:           out.setNull(in.rdata); break;
-        default:
-            return out;
+    switch (in.type) {
+    case QJDns::A:
+        out.setAddress(in.address);
+        break;
+    case QJDns::Aaaa:
+        out.setAddress(in.address);
+        break;
+    case QJDns::Mx:
+        out.setMx(in.name, in.priority);
+        break;
+    case QJDns::Srv:
+        out.setSrv(in.name, in.port, in.priority, in.weight);
+        break;
+    case QJDns::Cname:
+        out.setCname(in.name);
+        break;
+    case QJDns::Ptr:
+        out.setPtr(in.name);
+        break;
+    case QJDns::Txt:
+        out.setTxt(in.texts);
+        break;
+    case QJDns::Hinfo:
+        out.setHinfo(in.cpu, in.os);
+        break;
+    case QJDns::Ns:
+        out.setNs(in.name);
+        break;
+    case 10:
+        out.setNull(in.rdata);
+        break;
+    default:
+        return out;
     }
     out.setOwner(in.owner);
     out.setTtl(in.ttl);
@@ -56,90 +75,87 @@ static NameRecord importJDNSRecord(const QJDns::Record &in)
 static QJDns::Record exportJDNSRecord(const NameRecord &in)
 {
     QJDns::Record out;
-    switch(in.type())
-    {
-        case NameRecord::A:
-            out.type = QJDns::A;
-            out.haveKnown = true;
-            out.address = in.address();
-            break;
-        case NameRecord::Aaaa:
-            out.type = QJDns::Aaaa;
-            out.haveKnown = true;
-            out.address = in.address();
-            break;
-        case NameRecord::Mx:
-            out.type = QJDns::Mx;
-            out.haveKnown = true;
-            out.name = in.name();
-            out.priority = in.priority();
-            break;
-        case NameRecord::Srv:
-            out.type = QJDns::Srv;
-            out.haveKnown = true;
-            out.name = in.name();
-            out.port = in.port();
-            out.priority = in.priority();
-            out.weight = in.weight();
-            break;
-        case NameRecord::Cname:
-            out.type = QJDns::Cname;
-            out.haveKnown = true;
-            out.name = in.name();
-            break;
-        case NameRecord::Ptr:
-            out.type = QJDns::Ptr;
-            out.haveKnown = true;
-            out.name = in.name();
-            break;
-        case NameRecord::Txt:
-            out.type = QJDns::Txt;
-            out.haveKnown = true;
-            out.texts = in.texts();
-            break;
-        case NameRecord::Hinfo:
-            out.type = QJDns::Hinfo;
-            out.haveKnown = true;
-            out.cpu = in.cpu();
-            out.os = in.os();
-            break;
-        case NameRecord::Ns:
-            out.type = QJDns::Ns;
-            out.haveKnown = true;
-            out.name = in.name();
-            break;
-        case NameRecord::Null:
-            out.type = 10;
-            out.rdata = in.rawData();
-            break;
-        default:
-            return out;
+    switch (in.type()) {
+    case NameRecord::A:
+        out.type      = QJDns::A;
+        out.haveKnown = true;
+        out.address   = in.address();
+        break;
+    case NameRecord::Aaaa:
+        out.type      = QJDns::Aaaa;
+        out.haveKnown = true;
+        out.address   = in.address();
+        break;
+    case NameRecord::Mx:
+        out.type      = QJDns::Mx;
+        out.haveKnown = true;
+        out.name      = in.name();
+        out.priority  = in.priority();
+        break;
+    case NameRecord::Srv:
+        out.type      = QJDns::Srv;
+        out.haveKnown = true;
+        out.name      = in.name();
+        out.port      = in.port();
+        out.priority  = in.priority();
+        out.weight    = in.weight();
+        break;
+    case NameRecord::Cname:
+        out.type      = QJDns::Cname;
+        out.haveKnown = true;
+        out.name      = in.name();
+        break;
+    case NameRecord::Ptr:
+        out.type      = QJDns::Ptr;
+        out.haveKnown = true;
+        out.name      = in.name();
+        break;
+    case NameRecord::Txt:
+        out.type      = QJDns::Txt;
+        out.haveKnown = true;
+        out.texts     = in.texts();
+        break;
+    case NameRecord::Hinfo:
+        out.type      = QJDns::Hinfo;
+        out.haveKnown = true;
+        out.cpu       = in.cpu();
+        out.os        = in.os();
+        break;
+    case NameRecord::Ns:
+        out.type      = QJDns::Ns;
+        out.haveKnown = true;
+        out.name      = in.name();
+        break;
+    case NameRecord::Null:
+        out.type  = 10;
+        out.rdata = in.rawData();
+        break;
+    default:
+        return out;
     }
     out.owner = in.owner();
-    out.ttl = in.ttl();
+    out.ttl   = in.ttl();
     return out;
 }
 
 static bool validServiceType(const QByteArray &in)
 {
     // can't be empty, or start/end with a dot
-    if(in.isEmpty() || in[0] == '.' || in[in.length() - 1] == '.')
+    if (in.isEmpty() || in[0] == '.' || in[in.length() - 1] == '.')
         return false;
 
     // must contain exactly one dot
     int dotcount = 0;
-    for(int n = 0; n < in.length(); ++n)
-    {
-        if(in[n] == '.')
-        {
+    for (int n = 0; n < in.length(); ++n) {
+        if (in[n] == '.') {
             ++dotcount;
 
             // no need to count more than 2
-            if(dotcount >= 2)
+            if (dotcount >= 2)
                 break;
         }
     }
-    if(dotcount != 1)
+    if (dotcount != 1)
         return false;
 
     return true;
@@ -148,11 +164,10 @@ static bool validServiceType(const QByteArray &in)
 static QByteArray escapeDomainPart(const QByteArray &in)
 {
     QByteArray out;
-    for(int n = 0; n < in.length(); ++n)
-    {
-        if(in[n] == '\\')
+    for (int n = 0; n < in.length(); ++n) {
+        if (in[n] == '\\')
             out += "\\\\";
-        else if(in[n] == '.')
+        else if (in[n] == '.')
             out += "\\.";
         else
             out += in[n];
@@ -163,47 +178,38 @@ static QByteArray escapeDomainPart(const QByteArray &in)
 static QByteArray unescapeDomainPart(const QByteArray &in)
 {
     QByteArray out;
-    for(int n = 0; n < in.length(); ++n)
-    {
-        if(in[n] == '\\')
-        {
-            if(n + 1 >= in.length())
+    for (int n = 0; n < in.length(); ++n) {
+        if (in[n] == '\\') {
+            if (n + 1 >= in.length())
                 return QByteArray();
 
             out += in[n + 1];
-        }
-        else
+        } else
             out += in[n];
     }
     return out;
 }
 
-class IdManager
-{
+class IdManager {
 private:
     QSet<int> set;
-    int at;
+    int       at;
 
     inline void bump_at()
     {
-        if(at == 0x7fffffff)
+        if (at == 0x7fffffff)
             at = 0;
         else
             ++at;
     }
 
 public:
-    IdManager() :
-        at(0)
-    {
-    }
+    IdManager() : at(0) {}
 
     int reserveId()
     {
-        while(1)
-        {
-            if(!set.contains(at))
-            {
+        while (1) {
+            if (!set.contains(at)) {
                 int id = at;
                 set.insert(id);
                 bump_at();
@@ -214,10 +220,7 @@ class IdManager
         }
     }
 
-    void releaseId(int id)
-    {
-        set.remove(id);
-    }
+    void releaseId(int id) { set.remove(id); }
 
     void clear()
     {
@@ -229,23 +232,22 @@ class IdManager
 //----------------------------------------------------------------------------
 // JDnsGlobal
 //----------------------------------------------------------------------------
-class JDnsGlobal : public QObject
-{
+class JDnsGlobal : public QObject {
     Q_OBJECT
 
 public:
-    QJDnsSharedDebug db;
-    QJDnsShared *uni_net, *uni_local, *mul;
-    QHostAddress mul_addr4, mul_addr6;
-    NetInterfaceManager netman;
-    QList<NetInterface*> ifaces;
-    QTimer *updateTimer;
+    QJDnsSharedDebug      db;
+    QJDnsShared *         uni_net, *uni_local, *mul;
+    QHostAddress          mul_addr4, mul_addr6;
+    NetInterfaceManager   netman;
+    QList<NetInterface *> ifaces;
+    QTimer *              updateTimer;
 
     JDnsGlobal()
     {
-        uni_net = 0;
+        uni_net   = 0;
         uni_local = 0;
-        mul = 0;
+        mul       = 0;
 
         qRegisterMetaType<NameRecord>();
         qRegisterMetaType<NameResolver::Error>();
@@ -268,12 +270,12 @@ class JDnsGlobal : public QObject
 
         qDeleteAll(ifaces);
 
-        QList<QJDnsShared*> list;
-        if(uni_net)
+        QList<QJDnsShared *> list;
+        if (uni_net)
             list += uni_net;
-        if(uni_local)
+        if (uni_local)
             list += uni_local;
-        if(mul)
+        if (mul)
             list += mul;
 
         // calls shutdown on the list, waits for shutdownFinished, deletes
@@ -285,14 +287,12 @@ class JDnsGlobal : public QObject
 
     QJDnsShared *ensure_uni_net()
     {
-        if(!uni_net)
-        {
+        if (!uni_net) {
             uni_net = new QJDnsShared(QJDnsShared::UnicastInternet, this);
             uni_net->setDebug(&db, "U");
             bool ok4 = uni_net->addInterface(QHostAddress::Any);
             bool ok6 = uni_net->addInterface(QHostAddress::AnyIPv6);
-            if(!ok4 && !ok6)
-            {
+            if (!ok4 && !ok6) {
                 delete uni_net;
                 uni_net = 0;
             }
@@ -302,14 +302,12 @@ class JDnsGlobal : public QObject
 
     QJDnsShared *ensure_uni_local()
     {
-        if(!uni_local)
-        {
+        if (!uni_local) {
             uni_local = new QJDnsShared(QJDnsShared::UnicastLocal, this);
             uni_local->setDebug(&db, "L");
             bool ok4 = uni_local->addInterface(QHostAddress::Any);
             bool ok6 = uni_local->addInterface(QHostAddress::AnyIPv6);
-            if(!ok4 && !ok6)
-            {
+            if (!ok4 && !ok6) {
                 delete uni_local;
                 uni_local = 0;
             }
@@ -319,8 +317,7 @@ class JDnsGlobal : public QObject
 
     QJDnsShared *ensure_mul()
     {
-        if(!mul)
-        {
+        if (!mul) {
             mul = new QJDnsShared(QJDnsShared::Multicast, this);
             mul->setDebug(&db, "M");
 
@@ -330,8 +327,7 @@ class JDnsGlobal : public QObject
             //   fetching should not trigger any calls to
             //   updateMulticastInterfaces().  only future
             //   activity should do that.
-            foreach(const QString &id, netman.interfaces())
-            {
+            foreach (const QString &id, netman.interfaces()) {
                 NetInterface *iface = new NetInterface(id, &netman);
                 connect(iface, SIGNAL(unavailable()), SLOT(iface_unavailable()));
                 ifaces += iface;
@@ -342,15 +338,9 @@ class JDnsGlobal : public QObject
         return mul;
     }
 
-    bool haveMulticast4() const
-    {
-        return !mul_addr4.isNull();
-    }
+    bool haveMulticast4() const { return !mul_addr4.isNull(); }
 
-    bool haveMulticast6() const
-    {
-        return !mul_addr6.isNull();
-    }
+    bool haveMulticast6() const { return !mul_addr6.isNull(); }
 
 signals:
     void interfacesChanged();
@@ -360,7 +350,7 @@ private slots:
     {
         QStringList lines = db.readDebugLines();
 #ifdef JDNS_DEBUG
-        for(int n = 0; n < lines.count(); ++n)
+        for (int n = 0; n < lines.count(); ++n)
             qDebug("jdns: %s\n", qPrintable(lines[n]));
 #else
         Q_UNUSED(lines);
@@ -385,10 +375,7 @@ private slots:
         updateTimer->start(100);
     }
 
-    void doUpdateMulticastInterfaces()
-    {
-        updateMulticastInterfaces(true);
-    }
+    void doUpdateMulticastInterfaces() { updateMulticastInterfaces(true); }
 
 private:
     void updateMulticastInterfaces(bool useSignals)
@@ -406,23 +393,21 @@ private slots:
         bool have6 = !mul_addr6.isNull();
 
         // did we gain/lose something?
-        if(had4 != have4 || had6 != have6)
-        {
-            if(useSignals)
+        if (had4 != have4 || had6 != have6) {
+            if (useSignals)
                 emit interfacesChanged();
         }
     }
 
     void updateMulticastInterface(QHostAddress *curaddr, const QHostAddress &newaddr)
     {
-        if(!(newaddr == *curaddr)) // QHostAddress doesn't have operator!=
+        if (!(newaddr == *curaddr)) // QHostAddress doesn't have operator!=
         {
-            if(!curaddr->isNull())
+            if (!curaddr->isNull())
                 mul->removeInterface(*curaddr);
             *curaddr = newaddr;
-            if(!curaddr->isNull())
-            {
-                if(!mul->addInterface(*curaddr))
+            if (!curaddr->isNull()) {
+                if (!mul->addInterface(*curaddr))
                     *curaddr = QHostAddress();
             }
         }
@@ -432,81 +417,61 @@ private slots:
 //----------------------------------------------------------------------------
 // JDnsNameProvider
 //----------------------------------------------------------------------------
-class JDnsNameProvider : public NameProvider
-{
+class JDnsNameProvider : public NameProvider {
     Q_OBJECT
     Q_INTERFACES(XMPP::NameProvider)
 
 public:
     enum Mode { Internet, Local };
 
-    JDnsGlobal *global;
-    Mode mode;
-    IdManager idman;
+    JDnsGlobal *  global;
+    Mode          mode;
+    IdManager     idman;
     ObjectSession sess;
 
-    class Item
-    {
+    class Item {
     public:
-        int id;
+        int                 id;
         QJDnsSharedRequest *req;
-        int type;
-        bool longLived;
-        ObjectSession sess;
-        bool useLocal;
-        bool localResult;
+        int                 type;
+        bool                longLived;
+        ObjectSession       sess;
+        bool                useLocal;
+        bool                localResult;
         NameResolver::Error error;
         NameResolver::Error localError;
 
-        Item(QObject *parent = 0) :
-            id(-1),
-            req(0),
-            sess(parent),
-            useLocal(false),
-            localResult(false)
-        {
-        }
+        Item(QObject *parent = 0) : id(-1), req(0), sess(parent), useLocal(false), localResult(false) {}
 
-        ~Item()
-        {
-            delete req;
-        }
+        ~Item() { delete req; }
     };
-    QList<Item*> items;
+    QList<Item *> items;
 
     static JDnsNameProvider *create(JDnsGlobal *global, Mode mode, QObject *parent = 0)
     {
-        if(mode == Internet)
-        {
-            if(!global->ensure_uni_net())
+        if (mode == Internet) {
+            if (!global->ensure_uni_net())
                 return 0;
-        }
-        else
-        {
-            if(!global->ensure_uni_local())
+        } else {
+            if (!global->ensure_uni_local())
                 return 0;
         }
 
         return new JDnsNameProvider(global, mode, parent);
     }
 
-    JDnsNameProvider(JDnsGlobal *_global, Mode _mode, QObject *parent = 0) :
-        NameProvider(parent)
+    JDnsNameProvider(JDnsGlobal *_global, Mode _mode, QObject *parent = 0) : NameProvider(parent)
     {
         global = _global;
-        mode = _mode;
+        mode   = _mode;
     }
 
-    ~JDnsNameProvider()
-    {
-        qDeleteAll(items);
-    }
+    ~JDnsNameProvider() { qDeleteAll(items); }
 
     Item *getItemById(int id)
     {
-        for(int n = 0; n < items.count(); ++n)
-        {
-            if(items[n]->id == id)
+        for (int n = 0; n < items.count(); ++n) {
+            if (items[n]->id == id)
                 return items[n];
         }
 
@@ -515,9 +480,8 @@ class JDnsNameProvider : public NameProvider
 
     Item *getItemByReq(QJDnsSharedRequest *req)
     {
-        for(int n = 0; n < items.count(); ++n)
-        {
-            if(items[n]->req == req)
+        for (int n = 0; n < items.count(); ++n) {
+            if (items[n]->req == req)
                 return items[n];
         }
 
@@ -534,24 +498,21 @@ class JDnsNameProvider : public NameProvider
     void tryError(Item *i)
     {
         // if we are doing dual resolves, make sure both are done
-        if(!i->longLived && (i->req || (i->useLocal && !i->localResult)))
+        if (!i->longLived && (i->req || (i->useLocal && !i->localResult)))
             return;
 
-        int id = i->id;
+        int                 id    = i->id;
         NameResolver::Error error = i->error;
         releaseItem(i);
         emit resolve_error(id, error);
     }
 
-    virtual bool supportsSingle() const
-    {
-        return true;
-    }
+    virtual bool supportsSingle() const { return true; }
 
     virtual bool supportsLongLived() const
     {
-        if(mode == Local)
-            return true;  // we support long-lived local queries
+        if (mode == Local)
+            return true; // we support long-lived local queries
         else
             return false; // we do NOT support long-lived internet queries
     }
@@ -565,10 +526,9 @@ class JDnsNameProvider : public NameProvider
 
     virtual int resolve_start(const QByteArray &name, int qType, bool longLived)
     {
-        if(mode == Internet)
-        {
+        if (mode == Internet) {
             bool isLocalName = false;
-            if(name.right(6) == ".local" || name.right(7) == ".local.")
+            if (name.right(6) == ".local" || name.right(7) == ".local.")
                 isLocalName = true;
 
             // if query ends in .local, switch to local resolver
@@ -583,65 +543,57 @@ class JDnsNameProvider : public NameProvider
             }*/
 
             // we don't support long-lived internet queries
-            if(longLived)
-            {
+            if (longLived) {
                 // but we do support long-lived local queries
-                if(isLocalName)
-                {
-                    Item *i = new Item(this);
-                    i->id = idman.reserveId();
+                if (isLocalName) {
+                    Item *i      = new Item(this);
+                    i->id        = idman.reserveId();
                     i->longLived = longLived;
-                    i->useLocal = true;
+                    i->useLocal  = true;
                     items += i;
                     i->sess.defer(this, "do_local", Q_ARG(int, i->id), Q_ARG(QByteArray, name));
                     return i->id;
                 }
 
                 Item *i = new Item(this);
-                i->id = idman.reserveId();
+                i->id   = idman.reserveId();
                 items += i;
                 i->sess.defer(this, "do_error", Q_ARG(int, i->id),
-                    Q_ARG(XMPP::NameResolver::Error, NameResolver::ErrorNoLongLived));
+                              Q_ARG(XMPP::NameResolver::Error, NameResolver::ErrorNoLongLived));
                 return i->id;
             }
 
             // perform the query
             Item *i = new Item(this);
-            i->id = idman.reserveId();
-            i->req = new QJDnsSharedRequest(global->uni_net);
+            i->id   = idman.reserveId();
+            i->req  = new QJDnsSharedRequest(global->uni_net);
             connect(i->req, SIGNAL(resultsReady()), SLOT(req_resultsReady()));
-            i->type = qType;
+            i->type      = qType;
             i->longLived = false;
-            if(isLocalName)
+            if (isLocalName)
                 i->useLocal = true;
             items += i;
             i->req->query(name, qType);
             // if query ends in .local, simultaneously do local resolve
-            if(isLocalName)
+            if (isLocalName)
                 i->sess.defer(this, "do_local", Q_ARG(int, i->id), Q_ARG(QByteArray, name));
             return i->id;
-        }
-        else
-        {
+        } else {
             Item *i = new Item(this);
-            i->id = idman.reserveId();
+            i->id   = idman.reserveId();
             i->type = qType;
-            if(longLived)
-            {
-                if(!global->ensure_mul())
-                {
+            if (longLived) {
+                if (!global->ensure_mul()) {
                     items += i;
                     i->sess.defer(this, "do_error", Q_ARG(int, i->id),
-                        Q_ARG(XMPP::NameResolver::Error, NameResolver::ErrorNoLocal));
+                                  Q_ARG(XMPP::NameResolver::Error, NameResolver::ErrorNoLocal));
                     return i->id;
                 }
 
-                i->req = new QJDnsSharedRequest(global->mul);
+                i->req       = new QJDnsSharedRequest(global->mul);
                 i->longLived = true;
-            }
-            else
-            {
-                i->req = new QJDnsSharedRequest(global->uni_local);
+            } else {
+                i->req       = new QJDnsSharedRequest(global->uni_local);
                 i->longLived = false;
             }
             connect(i->req, SIGNAL(resultsReady()), SLOT(req_resultsReady()));
@@ -656,7 +608,7 @@ class JDnsNameProvider : public NameProvider
         Item *i = getItemById(id);
         Q_ASSERT(i);
 
-        if(i->req)
+        if (i->req)
             i->req->cancel();
         releaseItem(i);
     }
@@ -668,8 +620,7 @@ class JDnsNameProvider : public NameProvider
         Q_ASSERT(!i->localResult);
 
         i->localResult = true;
-        i->sess.defer(this, "do_local_ready", Q_ARG(int, id),
-            Q_ARG(QList<XMPP::NameRecord>, results));
+        i->sess.defer(this, "do_local_ready", Q_ARG(int, id), Q_ARG(QList<XMPP::NameRecord>, results));
     }
 
     virtual void resolve_localError(int id, XMPP::NameResolver::Error e)
@@ -679,71 +630,62 @@ class JDnsNameProvider : public NameProvider
         Q_ASSERT(!i->localResult);
 
         i->localResult = true;
-        i->sess.defer(this, "do_local_error", Q_ARG(int, id),
-            Q_ARG(XMPP::NameResolver::Error, e));
+        i->sess.defer(this, "do_local_error", Q_ARG(int, id), Q_ARG(XMPP::NameResolver::Error, e));
     }
 
 private slots:
     void req_resultsReady()
     {
         QJDnsSharedRequest *req = static_cast<QJDnsSharedRequest *>(sender());
-        Item *i = getItemByReq(req);
+        Item *              i   = getItemByReq(req);
         Q_ASSERT(i);
 
         int id = i->id;
 
         NameResolver::Error error;
 
-        if(req->success())
-        {
+        if (req->success()) {
             QList<NameRecord> out;
-            foreach(const QJDns::Record &r, req->results())
-            {
+            foreach (const QJDns::Record &r, req->results()) {
                 // unless we are asking for all types, only
                 //   accept the type we asked for
-                if(i->type == QJDns::Any || r.type == i->type)
-                {
+                if (i->type == QJDns::Any || r.type == i->type) {
                     NameRecord rec = importJDNSRecord(r);
-                    if(!rec.isNull())
+                    if (!rec.isNull())
                         out += rec;
                 }
             }
 
             // don't report anything if long-lived gives no results
-            if(i->longLived && out.isEmpty())
+            if (i->longLived && out.isEmpty())
                 return;
 
             // only emit success if we have at least 1 result
-            if(!out.isEmpty())
-            {
+            if (!out.isEmpty()) {
                 // FIXME: need a way to cancel related local
                 //   query if still active
 
-                if(!i->longLived)
+                if (!i->longLived)
                     releaseItem(i);
                 emit resolve_resultsReady(id, out);
                 return;
-            }
-            else
-            {
+            } else {
                 error = NameResolver::ErrorGeneric;
             }
-        }
-        else
-        {
+        } else {
             QJDnsSharedRequest::Error e = req->error();
 
             error = NameResolver::ErrorGeneric;
-            if(e == QJDnsSharedRequest::ErrorNXDomain)
+            if (e == QJDnsSharedRequest::ErrorNXDomain)
                 error = NameResolver::ErrorNoName;
-            else if(e == QJDnsSharedRequest::ErrorTimeout)
+            else if (e == QJDnsSharedRequest::ErrorTimeout)
                 error = NameResolver::ErrorTimeout;
             else // ErrorGeneric or ErrorNoNet
                 error = NameResolver::ErrorGeneric;
         }
 
         delete i->req;
-        i->req = 0;
+        i->req   = 0;
         i->error = error;
         tryError(i);
     }
@@ -762,8 +704,8 @@ private slots:
 
     void do_local(int id, const QByteArray &name)
     {
-        //Item *i = getItemById(id);
-        //Q_ASSERT(i);
+        // Item *i = getItemById(id);
+        // Q_ASSERT(i);
 
         /*// resolve_useLocal has two behaviors:
         // - if longlived, then it indicates a hand-off
@@ -779,10 +721,9 @@ private slots:
         Item *i = getItemById(id);
         Q_ASSERT(i);
 
-        if(!i->longLived)
-        {
+        if (!i->longLived) {
             // stop any simultaneous internet resolve
-            if(i->req)
+            if (i->req)
                 i->req->cancel();
 
             // for non-longlived, we're done
@@ -805,17 +746,14 @@ private slots:
 //----------------------------------------------------------------------------
 // JDnsBrowse
 //----------------------------------------------------------------------------
-class JDnsBrowse : public QObject
-{
+class JDnsBrowse : public QObject {
     Q_OBJECT
 
 public:
-    QByteArray type, typeAndDomain;
+    QByteArray         type, typeAndDomain;
     QJDnsSharedRequest req;
 
-    JDnsBrowse(QJDnsShared *_jdns, QObject *parent = 0) :
-        QObject(parent),
-        req(_jdns, this)
+    JDnsBrowse(QJDnsShared *_jdns, QObject *parent = 0) : QObject(parent), req(_jdns, this)
     {
         connect(&req, SIGNAL(resultsReady()), SLOT(jdns_resultsReady()));
     }
@@ -836,19 +774,19 @@ class JDnsBrowse : public QObject
     QByteArray parseInstanceName(const QByteArray &name)
     {
         // needs to be at least X + '.' + typeAndDomain
-        if(name.length() < typeAndDomain.length() + 2)
+        if (name.length() < typeAndDomain.length() + 2)
             return QByteArray();
 
         // index of the '.' character
         int at = name.length() - typeAndDomain.length() - 1;
 
-        if(name[at] != '.')
+        if (name[at] != '.')
             return QByteArray();
-        if(name.mid(at + 1) != typeAndDomain)
+        if (name.mid(at + 1) != typeAndDomain)
             return QByteArray();
 
         QByteArray friendlyName = unescapeDomainPart(name.mid(0, at));
-        if(friendlyName.isEmpty())
+        if (friendlyName.isEmpty())
             return QByteArray();
 
         return friendlyName;
@@ -858,20 +796,19 @@ private slots:
     void jdns_resultsReady()
     {
         // ignore errors
-        if(!req.success())
+        if (!req.success())
             return;
 
         QJDns::Record rec = req.results().first();
 
         Q_ASSERT(rec.type == QJDns::Ptr);
 
-        QByteArray name = rec.name;
+        QByteArray name     = rec.name;
         QByteArray instance = parseInstanceName(name);
-        if(instance.isEmpty())
+        if (instance.isEmpty())
             return;
 
-        if(rec.ttl == 0)
-        {
+        if (rec.ttl == 0) {
             emit unavailable(instance);
             return;
         }
@@ -886,37 +823,28 @@ private slots:
 
 // 5 second timeout waiting for both A and AAAA
 // 8 second timeout waiting for at least one record
-class JDnsServiceResolve : public QObject
-{
+class JDnsServiceResolve : public QObject {
     Q_OBJECT
 
 public:
-    enum SrvState
-    {
-        Srv               = 0,
-        AddressWait       = 1,
-        AddressFirstCome  = 2
-    };
+    enum SrvState { Srv = 0, AddressWait = 1, AddressFirstCome = 2 };
 
     QJDnsSharedRequest reqtxt; // for TXT
     QJDnsSharedRequest req;    // for SRV/A
     QJDnsSharedRequest req6;   // for AAAA
-    bool haveTxt;
-    SrvState srvState;
-    QTimer *opTimer;
+    bool               haveTxt;
+    SrvState           srvState;
+    QTimer *           opTimer;
 
     // out
     QList<QByteArray> attribs;
-    QByteArray host;
-    int port;
-    bool have4, have6;
-    QHostAddress addr4, addr6;
+    QByteArray        host;
+    int               port;
+    bool              have4, have6;
+    QHostAddress      addr4, addr6;
 
     JDnsServiceResolve(QJDnsShared *_jdns, QObject *parent = 0) :
-        QObject(parent),
-        reqtxt(_jdns, this),
-        req(_jdns, this),
-        req6(_jdns, this)
+        QObject(parent), reqtxt(_jdns, this), req(_jdns, this), req6(_jdns, this)
     {
         connect(&reqtxt, SIGNAL(resultsReady()), SLOT(reqtxt_ready()));
         connect(&req, SIGNAL(resultsReady()), SLOT(req_ready()));
@@ -936,10 +864,10 @@ class JDnsServiceResolve : public QObject
 
     void start(const QByteArray name)
     {
-        haveTxt = false;
+        haveTxt  = false;
         srvState = Srv;
-        have4 = false;
-        have6 = false;
+        have4    = false;
+        have6    = false;
 
         opTimer->start(8000);
 
@@ -954,21 +882,20 @@ class JDnsServiceResolve : public QObject
 private:
     void cleanup()
     {
-        if(opTimer->isActive())
+        if (opTimer->isActive())
             opTimer->stop();
-        if(!haveTxt)
+        if (!haveTxt)
             reqtxt.cancel();
-        if(srvState == Srv || !have4)
+        if (srvState == Srv || !have4)
             req.cancel();
-        if(srvState >= AddressWait && !have6)
+        if (srvState >= AddressWait && !have6)
             req6.cancel();
     }
 
     bool tryDone()
     {
         // we're done when we have txt and addresses
-        if(haveTxt && ( (have4 && have6) || (srvState == AddressFirstCome && (have4 || have6)) ))
-        {
+        if (haveTxt && ((have4 && have6) || (srvState == AddressFirstCome && (have4 || have6)))) {
             cleanup();
             emit finished();
             return true;
@@ -980,8 +907,7 @@ class JDnsServiceResolve : public QObject
 private slots:
     void reqtxt_ready()
     {
-        if(!reqtxt.success())
-        {
+        if (!reqtxt.success()) {
             cleanup();
             emit error(reqtxt.error());
             return;
@@ -993,11 +919,10 @@ private slots:
         Q_ASSERT(rec.type == QJDns::Txt);
 
         attribs.clear();
-        if(!rec.texts.isEmpty())
-        {
+        if (!rec.texts.isEmpty()) {
             // if there is only 1 text, it needs to be
             //   non-empty for us to care
-            if(rec.texts.count() != 1 || !rec.texts[0].isEmpty())
+            if (rec.texts.count() != 1 || !rec.texts[0].isEmpty())
                 attribs = rec.texts;
         }
 
@@ -1008,8 +933,7 @@ private slots:
 
     void req_ready()
     {
-        if(!req.success())
-        {
+        if (!req.success()) {
             cleanup();
             emit error(req.error());
             return;
@@ -1018,8 +942,7 @@ private slots:
         QJDns::Record rec = req.results().first();
         req.cancel();
 
-        if(srvState == Srv)
-        {
+        if (srvState == Srv) {
             // in Srv state, req is used for SRV records
 
             Q_ASSERT(rec.type == QJDns::Srv);
@@ -1032,9 +955,7 @@ private slots:
 
             req.query(host, QJDns::A);
             req6.query(host, QJDns::Aaaa);
-        }
-        else
-        {
+        } else {
             // in the other states, req is used for A records
 
             Q_ASSERT(rec.type == QJDns::A);
@@ -1048,8 +969,7 @@ private slots:
 
     void req6_ready()
     {
-        if(!req6.success())
-        {
+        if (!req6.success()) {
             cleanup();
             emit error(req6.error());
             return;
@@ -1068,17 +988,14 @@ private slots:
 
     void op_timeout()
     {
-        if(srvState == Srv)
-        {
+        if (srvState == Srv) {
             // timeout getting SRV.  it is possible that we could
             //   have obtained the TXT record, but if SRV times
             //   out then we consider the whole job to have
             //   failed.
             cleanup();
             emit error(QJDnsSharedRequest::ErrorTimeout);
-        }
-        else if(srvState == AddressWait)
-        {
+        } else if (srvState == AddressWait) {
             // timeout while waiting for both A and AAAA.  we now
             //   switch to the AddressFirstCome state, where an
             //   answer for either will do
@@ -1086,11 +1003,10 @@ private slots:
             srvState = AddressFirstCome;
 
             // if we have at least one of these, we're done
-            if(have4 || have6)
-            {
+            if (have4 || have6) {
                 // well, almost.  we might still be waiting
                 //   for the TXT record
-                if(tryDone())
+                if (tryDone())
                     return;
             }
 
@@ -1099,12 +1015,10 @@ private slots:
 
             // wait 3 more seconds
             opTimer->start(3000);
-        }
-        else // AddressFirstCome
+        } else // AddressFirstCome
         {
             // last chance!
-            if(!tryDone())
-            {
+            if (!tryDone()) {
                 cleanup();
                 emit error(QJDnsSharedRequest::ErrorTimeout);
             }
@@ -1117,27 +1031,20 @@ private slots:
 //----------------------------------------------------------------------------
 
 // helper class for JDnsPublishAddresses.  publishes A+PTR or AAAA+PTR pair.
-class JDnsPublishAddress : public QObject
-{
+class JDnsPublishAddress : public QObject {
     Q_OBJECT
 
 public:
-    enum Type
-    {
-        IPv4,
-        IPv6
-    };
+    enum Type { IPv4, IPv6 };
 
-    Type type;
-    QByteArray host;
+    Type               type;
+    QByteArray         host;
     QJDnsSharedRequest pub_addr;
     QJDnsSharedRequest pub_ptr;
-    bool success_;
+    bool               success_;
 
     JDnsPublishAddress(QJDnsShared *_jdns, QObject *parent = 0) :
-        QObject(parent),
-        pub_addr(_jdns, this),
-        pub_ptr(_jdns, this)
+        QObject(parent), pub_addr(_jdns, this), pub_ptr(_jdns, this)
     {
         connect(&pub_addr, SIGNAL(resultsReady()), SLOT(pub_addr_ready()));
         connect(&pub_ptr, SIGNAL(resultsReady()), SLOT(pub_ptr_ready()));
@@ -1145,19 +1052,19 @@ class JDnsPublishAddress : public QObject
 
     void start(Type _type, const QByteArray &_host)
     {
-        type = _type;
-        host = _host;
+        type     = _type;
+        host     = _host;
         success_ = false;
 
         QJDns::Record rec;
-        if(type == IPv6)
+        if (type == IPv6)
             rec.type = QJDns::Aaaa;
         else
             rec.type = QJDns::A;
-        rec.owner = host;
-        rec.ttl = 120;
+        rec.owner     = host;
+        rec.ttl       = 120;
         rec.haveKnown = true;
-        rec.address = QHostAddress(); // null address, will be filled in
+        rec.address   = QHostAddress(); // null address, will be filled in
         pub_addr.publish(QJDns::Unique, rec);
     }
 
@@ -1167,10 +1074,7 @@ class JDnsPublishAddress : public QObject
         pub_ptr.cancel();
     }
 
-    bool success() const
-    {
-        return success_;
-    }
+    bool success() const { return success_; }
 
 signals:
     void resultsReady();
@@ -1178,21 +1082,18 @@ class JDnsPublishAddress : public QObject
 private slots:
     void pub_addr_ready()
     {
-        if(pub_addr.success())
-        {
+        if (pub_addr.success()) {
             QJDns::Record rec;
             rec.type = QJDns::Ptr;
-            if(type == IPv6)
+            if (type == IPv6)
                 rec.owner = ".ip6.arpa.";
             else
                 rec.owner = ".in-addr.arpa.";
-            rec.ttl = 120;
+            rec.ttl       = 120;
             rec.haveKnown = true;
-            rec.name = host;
+            rec.name      = host;
             pub_ptr.publish(QJDns::Shared, rec);
-        }
-        else
-        {
+        } else {
             pub_ptr.cancel(); // needed if addr fails during or after ptr
             success_ = false;
             emit resultsReady();
@@ -1201,12 +1102,9 @@ private slots:
 
     void pub_ptr_ready()
     {
-        if(pub_ptr.success())
-        {
+        if (pub_ptr.success()) {
             success_ = true;
-        }
-        else
-        {
+        } else {
             pub_addr.cancel();
             success_ = false;
         }
@@ -1226,29 +1124,22 @@ private slots:
 //   once the conflict is resolved.  A missing hostname is considered a
 //   temporary problem, and so other publish operations that depend on a
 //   hostname (SRV, etc) should block until a hostname is available.
-class JDnsPublishAddresses : public QObject
-{
+class JDnsPublishAddresses : public QObject {
     Q_OBJECT
 
 public:
-    bool started;
-    bool use6, use4;
+    bool               started;
+    bool               use6, use4;
     JDnsPublishAddress pub6;
     JDnsPublishAddress pub4;
-    int counter;
-    QByteArray host;
-    bool success;
-    bool have6, have4;
-    ObjectSession sess;
+    int                counter;
+    QByteArray         host;
+    bool               success;
+    bool               have6, have4;
+    ObjectSession      sess;
 
     JDnsPublishAddresses(QJDnsShared *_jdns, QObject *parent = 0) :
-        QObject(parent),
-        started(false),
-        use6(false),
-        use4(false),
-        pub6(_jdns, this),
-        pub4(_jdns, this),
-        sess(this)
+        QObject(parent), started(false), use6(false), use4(false), pub6(_jdns, this), pub4(_jdns, this), sess(this)
     {
         connect(&pub6, SIGNAL(resultsReady()), SLOT(pub6_ready()));
         connect(&pub4, SIGNAL(resultsReady()), SLOT(pub4_ready()));
@@ -1258,25 +1149,22 @@ class JDnsPublishAddresses : public QObject
     {
         counter = 1;
         success = false;
-        have6 = false;
-        have4 = false;
+        have6   = false;
+        have4   = false;
         started = true;
         tryPublish();
     }
 
-    bool isStarted() const
-    {
-        return started;
-    }
+    bool isStarted() const { return started; }
 
     // comments in this method apply to setUseIPv4 as well.
     void setUseIPv6(bool b)
     {
-        if(b == use6)
+        if (b == use6)
             return;
 
         use6 = b;
-        if(!started)
+        if (!started)
             return;
 
         // a "deferred call to doDisable" and "publish operations"
@@ -1285,58 +1173,46 @@ class JDnsPublishAddresses : public QObject
         //   deferred call is canceled if any of the publishes are
         //   reinstantiated.
 
-        if(use6)
-        {
-            if(use4)
-            {
+        if (use6) {
+            if (use4) {
                 // if the other is already active, then
                 //   just activate this one without
                 //   recomputing the hostname
                 tryPublish6();
-            }
-            else
-            {
+            } else {
                 sess.reset();
 
                 // otherwise, recompute the hostname
                 tryPublish();
             }
-        }
-        else
-        {
+        } else {
             pub6.cancel();
             have6 = false;
-            if(!use4)
+            if (!use4)
                 sess.defer(this, "doDisable");
         }
     }
 
     void setUseIPv4(bool b)
     {
-        if(b == use4)
+        if (b == use4)
             return;
 
         use4 = b;
-        if(!started)
+        if (!started)
             return;
 
-        if(use4)
-        {
-            if(use6)
-            {
+        if (use4) {
+            if (use6) {
                 tryPublish4();
-            }
-            else
-            {
+            } else {
                 sess.reset();
                 tryPublish();
             }
-        }
-        else
-        {
+        } else {
             pub4.cancel();
             have4 = false;
-            if(!use6)
+            if (!use6)
                 sess.defer(this, "doDisable");
         }
     }
@@ -1350,44 +1226,37 @@ class JDnsPublishAddresses : public QObject
         QString me = QHostInfo::localHostName();
 
         // some hosts may already have ".local" in their name
-        if(me.endsWith(".local"))
+        if (me.endsWith(".local"))
             me.truncate(me.length() - 6);
 
         // prefix our hostname so we don't conflict with a system
         //   mdns daemon
         me.prepend("jdns-");
 
-        if(counter > 1)
+        if (counter > 1)
             me += QString("-%1").arg(counter);
 
         host = escapeDomainPart(me.toUtf8()) + ".local.";
 
-        if(use6)
+        if (use6)
             tryPublish6();
-        if(use4)
+        if (use4)
             tryPublish4();
     }
 
-    void tryPublish6()
-    {
-        pub6.start(JDnsPublishAddress::IPv6, host);
-    }
+    void tryPublish6() { pub6.start(JDnsPublishAddress::IPv6, host); }
 
-    void tryPublish4()
-    {
-        pub4.start(JDnsPublishAddress::IPv4, host);
-    }
+    void tryPublish4() { pub4.start(JDnsPublishAddress::IPv4, host); }
 
     void tryDone()
     {
         bool done = true;
-        if(use6 && !have6)
+        if (use6 && !have6)
             done = false;
-        if(use4 && !have4)
+        if (use4 && !have4)
             done = false;
 
-        if(done)
-        {
+        if (done) {
             success = true;
             emit hostName(host);
         }
@@ -1400,11 +1269,11 @@ class JDnsPublishAddresses : public QObject
         //   latter case it means we "lost" our host records.
 
         bool lostHost = success; // as in earlier publish success
-        success = false;
+        success       = false;
 
         // if we lost a hostname with a suffix, or counter is
         //   at 99, then start counter over at 1 (no suffix).
-        if((lostHost && counter > 1) || counter >= 99)
+        if ((lostHost && counter > 1) || counter >= 99)
             counter = 1;
         else
             ++counter;
@@ -1412,7 +1281,7 @@ class JDnsPublishAddresses : public QObject
         tryPublish();
 
         // only emit lost host signal once
-        if(lostHost)
+        if (lostHost)
             emit hostName(QByteArray());
     }
 
@@ -1420,21 +1289,18 @@ private slots:
     void doDisable()
     {
         bool lostHost = success;
-        success = false;
+        success       = false;
 
-        if(lostHost)
+        if (lostHost)
             emit hostName(QByteArray());
     }
 
     void pub6_ready()
     {
-        if(pub6.success())
-        {
+        if (pub6.success()) {
             have6 = true;
             tryDone();
-        }
-        else
-        {
+        } else {
             have6 = false;
             have4 = false;
             pub4.cancel();
@@ -1444,13 +1310,10 @@ private slots:
 
     void pub4_ready()
     {
-        if(pub4.success())
-        {
+        if (pub4.success()) {
             have4 = true;
             tryDone();
-        }
-        else
-        {
+        } else {
             have4 = false;
             have6 = false;
             pub6.cancel();
@@ -1464,8 +1327,7 @@ private slots:
 //----------------------------------------------------------------------------
 class JDnsPublish;
 
-class JDnsPublishExtra : public QObject
-{
+class JDnsPublishExtra : public QObject {
     Q_OBJECT
 
 public:
@@ -1482,12 +1344,12 @@ class JDnsPublishExtra : public QObject
 private:
     friend class JDnsPublish;
 
-    JDnsPublish *jdnsPub;
-    bool started;
+    JDnsPublish *      jdnsPub;
+    bool               started;
     QJDnsSharedRequest pub;
-    QJDns::Record rec;
-    bool have;
-    bool need_update;
+    QJDns::Record      rec;
+    bool               have;
+    bool               need_update;
 };
 
 // This class publishes SRV/TXT/PTR for a service.  if a hostName is not
@@ -1503,12 +1365,11 @@ class JDnsPublishExtra : public QObject
 // It's important to note that published() is only emitted once ever, even
 //   if a hostName change causes a republishing.  this way, hostName changes
 //   are completely transparent.
-class JDnsPublish : public QObject
-{
+class JDnsPublish : public QObject {
     Q_OBJECT
 
 public:
-    QJDnsShared *jdns;
+    QJDnsShared *      jdns;
     QJDnsSharedRequest pub_srv;
     QJDnsSharedRequest pub_txt;
     QJDnsSharedRequest pub_ptr;
@@ -1516,62 +1377,55 @@ class JDnsPublish : public QObject
     bool have_srv, have_txt, have_ptr;
     bool need_update_txt;
 
-    QByteArray fullname;
-    QByteArray instance;
-    QByteArray type;
-    QByteArray host;
-    int port;
+    QByteArray        fullname;
+    QByteArray        instance;
+    QByteArray        type;
+    QByteArray        host;
+    int               port;
     QList<QByteArray> attribs;
 
-    QSet<JDnsPublishExtra*> extraList;
+    QSet<JDnsPublishExtra *> extraList;
 
     JDnsPublish(QJDnsShared *_jdns, QObject *parent = 0) :
-        QObject(parent),
-        jdns(_jdns),
-        pub_srv(_jdns, this),
-        pub_txt(_jdns, this),
-        pub_ptr(_jdns, this)
+        QObject(parent), jdns(_jdns), pub_srv(_jdns, this), pub_txt(_jdns, this), pub_ptr(_jdns, this)
     {
         connect(&pub_srv, SIGNAL(resultsReady()), SLOT(pub_srv_ready()));
         connect(&pub_txt, SIGNAL(resultsReady()), SLOT(pub_txt_ready()));
         connect(&pub_ptr, SIGNAL(resultsReady()), SLOT(pub_ptr_ready()));
     }
 
-    ~JDnsPublish()
-    {
-        qDeleteAll(extraList);
-    }
+    ~JDnsPublish() { qDeleteAll(extraList); }
 
-    void start(const QString &_instance, const QByteArray &_type, const QByteArray &localHost, int _port, const QMap<QString,QByteArray> &attributes)
+    void start(const QString &_instance, const QByteArray &_type, const QByteArray &localHost, int _port,
+               const QMap<QString, QByteArray> &attributes)
     {
         type = _type;
         Q_ASSERT(validServiceType(type));
 
         instance = escapeDomainPart(_instance.toUtf8());
         fullname = instance + '.' + type + ".local.";
-        host = localHost;
-        port = _port;
-        attribs = makeTxtList(attributes);
+        host     = localHost;
+        port     = _port;
+        attribs  = makeTxtList(attributes);
 
-        have_srv = false;
-        have_txt = false;
-        have_ptr = false;
+        have_srv        = false;
+        have_txt        = false;
+        have_ptr        = false;
         need_update_txt = false;
 
         // no host?  defer publishing till we have one
-        if(host.isEmpty())
+        if (host.isEmpty())
             return;
 
         doPublish();
     }
 
-    void update(const QMap<QString,QByteArray> &attributes)
+    void update(const QMap<QString, QByteArray> &attributes)
     {
         attribs = makeTxtList(attributes);
 
         // still publishing the initial txt?
-        if(!have_txt)
-        {
+        if (!have_txt) {
             // flag that we want to update once the publish
             //   succeeds.
             need_update_txt = true;
@@ -1580,8 +1434,7 @@ class JDnsPublish : public QObject
 
         // no SRV, but have TXT?  this means we lost SRV due to
         //   a hostname change.
-        if(!have_srv)
-        {
+        if (!have_srv) {
             // in that case, revoke the TXT.  it'll get
             //   republished after SRV then.
             have_txt = false;
@@ -1598,18 +1451,14 @@ public slots:
     {
         bool changed = (host != _host);
 
-        if(changed)
-        {
+        if (changed) {
             host = _host;
 
-            if(host.isEmpty())
-            {
+            if (host.isEmpty()) {
                 // cancel srv record momentarily
                 have_srv = false;
                 pub_srv.cancel();
-            }
-            else
-            {
+            } else {
                 // we now have a host, publish
                 doPublish();
             }
@@ -1623,17 +1472,16 @@ public slots:
 private:
     friend class JDnsPublishExtra;
 
-    static QList<QByteArray> makeTxtList(const QMap<QString,QByteArray> &attributes)
+    static QList<QByteArray> makeTxtList(const QMap<QString, QByteArray> &attributes)
     {
         QList<QByteArray> out;
 
-        QMapIterator<QString,QByteArray> it(attributes);
-        while(it.hasNext())
-        {
+        QMapIterator<QString, QByteArray> it(attributes);
+        while (it.hasNext()) {
             it.next();
             out += it.key().toLatin1() + '=' + it.value();
         }
-        if(out.isEmpty())
+        if (out.isEmpty())
             out += QByteArray();
 
         return out;
@@ -1643,25 +1491,24 @@ public slots:
     {
         // SRV
         QJDns::Record rec;
-        rec.type = QJDns::Srv;
-        rec.owner = fullname;
-        rec.ttl = 120;
+        rec.type      = QJDns::Srv;
+        rec.owner     = fullname;
+        rec.ttl       = 120;
         rec.haveKnown = true;
-        rec.name = host;
-        rec.port = port;
-        rec.priority = 0;
-        rec.weight = 0;
+        rec.name      = host;
+        rec.port      = port;
+        rec.priority  = 0;
+        rec.weight    = 0;
         pub_srv.publish(QJDns::Unique, rec);
 
         // if we're just republishing SRV after losing/regaining
         //   our hostname, then TXT is already published
-        if(!have_txt)
+        if (!have_txt)
             doPublishTxt();
 
         // publish extra records as needed
-        foreach(JDnsPublishExtra *extra, extraList)
-        {
-            if(!extra->have)
+        foreach (JDnsPublishExtra *extra, extraList) {
+            if (!extra->have)
                 doPublishExtra(extra);
         }
     }
@@ -1670,13 +1517,13 @@ public slots:
     {
         // TXT
         QJDns::Record rec;
-        rec.type = QJDns::Txt;
-        rec.owner = fullname;
-        rec.ttl = 4500;
+        rec.type      = QJDns::Txt;
+        rec.owner     = fullname;
+        rec.ttl       = 4500;
         rec.haveKnown = true;
-        rec.texts = attribs;
+        rec.texts     = attribs;
 
-        if(!have_txt)
+        if (!have_txt)
             pub_txt.publish(QJDns::Unique, rec);
         else
             pub_txt.publishUpdate(rec);
@@ -1684,22 +1531,21 @@ public slots:
 
     void tryDone()
     {
-        if(have_srv && have_txt)
-        {
+        if (have_srv && have_txt) {
             // PTR
             QJDns::Record rec;
-            rec.type = QJDns::Ptr;
-            rec.owner = type + ".local.";
-            rec.ttl = 4500;
+            rec.type      = QJDns::Ptr;
+            rec.owner     = type + ".local.";
+            rec.ttl       = 4500;
             rec.haveKnown = true;
-            rec.name = fullname;
+            rec.name      = fullname;
             pub_ptr.publish(QJDns::Shared, rec);
         }
     }
 
     void cleanup()
     {
-        foreach(JDnsPublishExtra *extra, extraList)
+        foreach (JDnsPublishExtra *extra, extraList)
             cleanupExtra(extra);
         qDeleteAll(extraList);
         extraList.clear();
@@ -1720,7 +1566,7 @@ public slots:
         extraList += extra;
 
         // defer publishing until SRV is ready
-        if(!have_srv)
+        if (!have_srv)
             return;
 
         doPublishExtra(extra);
@@ -1728,14 +1574,12 @@ public slots:
 
     void publishExtraUpdate(JDnsPublishExtra *extra)
     {
-        if(!extra->have)
-        {
+        if (!extra->have) {
             extra->need_update = true;
             return;
         }
 
-        if(!have_srv)
-        {
+        if (!have_srv) {
             extra->have = false;
             extra->pub.cancel();
             return;
@@ -1744,14 +1588,11 @@ public slots:
         doPublishExtra(extra);
     }
 
-    void unpublishExtra(JDnsPublishExtra *extra)
-    {
-        extraList.remove(extra);
-    }
+    void unpublishExtra(JDnsPublishExtra *extra) { extraList.remove(extra); }
 
     void doPublishExtra(JDnsPublishExtra *extra)
     {
-        if(!extra->have)
+        if (!extra->have)
             extra->pub.publish(QJDns::Unique, extra->rec);
         else
             extra->pub.publishUpdate(extra->rec);
@@ -1762,19 +1603,16 @@ public slots:
         extra->pub.cancel();
         extra->disconnect(this);
         extra->started = false;
-        extra->have = false;
+        extra->have    = false;
     }
 
 private slots:
     void pub_srv_ready()
     {
-        if(pub_srv.success())
-        {
+        if (pub_srv.success()) {
             have_srv = true;
             tryDone();
-        }
-        else
-        {
+        } else {
             QJDnsSharedRequest::Error e = pub_srv.error();
             cleanup();
             emit error(e);
@@ -1783,20 +1621,16 @@ private slots:
 
     void pub_txt_ready()
     {
-        if(pub_txt.success())
-        {
+        if (pub_txt.success()) {
             have_txt = true;
 
-            if(need_update_txt)
-            {
+            if (need_update_txt) {
                 need_update_txt = false;
                 doPublishTxt();
             }
 
             tryDone();
-        }
-        else
-        {
+        } else {
             QJDnsSharedRequest::Error e = pub_txt.error();
             cleanup();
             emit error(e);
@@ -1805,13 +1639,10 @@ private slots:
 
     void pub_ptr_ready()
     {
-        if(pub_ptr.success())
-        {
+        if (pub_ptr.success()) {
             have_ptr = true;
             emit published();
-        }
-        else
-        {
+        } else {
             QJDnsSharedRequest::Error e = pub_ptr.error();
             cleanup();
             emit error(e);
@@ -1820,32 +1651,26 @@ private slots:
 
     void pub_extra_ready()
     {
-        QJDnsSharedRequest *req = static_cast<QJDnsSharedRequest *>(sender());
-        JDnsPublishExtra *extra = 0;
-        foreach(JDnsPublishExtra *e, extraList)
-        {
-            if(&e->pub == req)
-            {
+        QJDnsSharedRequest *req   = static_cast<QJDnsSharedRequest *>(sender());
+        JDnsPublishExtra *  extra = 0;
+        foreach (JDnsPublishExtra *e, extraList) {
+            if (&e->pub == req) {
                 extra = e;
                 break;
             }
         }
         Q_ASSERT(extra);
 
-        if(extra->pub.success())
-        {
+        if (extra->pub.success()) {
             extra->have = true;
 
-            if(extra->need_update)
-            {
+            if (extra->need_update) {
                 extra->need_update = false;
                 doPublishExtra(extra);
             }
 
             emit extra->published();
-        }
-        else
-        {
+        } else {
             QJDnsSharedRequest::Error e = extra->pub.error();
             cleanupExtra(extra);
             emit extra->error(e);
@@ -1854,24 +1679,21 @@ private slots:
 };
 
 JDnsPublishExtra::JDnsPublishExtra(JDnsPublish *_jdnsPub) :
-    QObject(_jdnsPub),
-    jdnsPub(_jdnsPub),
-    started(false),
-    pub(_jdnsPub->jdns, this)
+    QObject(_jdnsPub), jdnsPub(_jdnsPub), started(false), pub(_jdnsPub->jdns, this)
 {
 }
 
 JDnsPublishExtra::~JDnsPublishExtra()
 {
-    if(started)
+    if (started)
         jdnsPub->unpublishExtra(this);
 }
 
 void JDnsPublishExtra::start(const QJDns::Record &_rec)
 {
-    rec = _rec;
-    started = true;
-    have = false;
+    rec         = _rec;
+    started     = true;
+    have        = false;
     need_update = false;
     jdnsPub->publishExtra(this);
 }
@@ -1885,19 +1707,13 @@ void JDnsPublishExtra::update(const QJDns::Record &_rec)
 //----------------------------------------------------------------------------
 // JDnsServiceProvider
 //----------------------------------------------------------------------------
-class BrowseItem
-{
+class BrowseItem {
 public:
-    const int id;
-    JDnsBrowse * const browse;
-    ObjectSession *sess;
+    const int         id;
+    JDnsBrowse *const browse;
+    ObjectSession *   sess;
 
-    BrowseItem(int _id, JDnsBrowse *_browse) :
-        id(_id),
-        browse(_browse),
-        sess(0)
-    {
-    }
+    BrowseItem(int _id, JDnsBrowse *_browse) : id(_id), browse(_browse), sess(0) {}
 
     ~BrowseItem()
     {
@@ -1906,24 +1722,17 @@ class BrowseItem
     }
 };
 
-class BrowseItemList
-{
+class BrowseItemList {
 private:
-    QSet<BrowseItem*> items;
-    QHash<int,BrowseItem*> indexById;
-    QHash<JDnsBrowse*,BrowseItem*> indexByBrowse;
-    IdManager idman;
+    QSet<BrowseItem *>                items;
+    QHash<int, BrowseItem *>          indexById;
+    QHash<JDnsBrowse *, BrowseItem *> indexByBrowse;
+    IdManager                         idman;
 
 public:
-    ~BrowseItemList()
-    {
-        qDeleteAll(items);
-    }
+    ~BrowseItemList() { qDeleteAll(items); }
 
-    int reserveId()
-    {
-        return idman.reserveId();
-    }
+    int reserveId() { return idman.reserveId(); }
 
     void insert(BrowseItem *item)
     {
@@ -1937,35 +1746,23 @@ class BrowseItemList
         indexById.remove(item->id);
         indexByBrowse.remove(item->browse);
         items.remove(item);
-        if(item->id != -1)
+        if (item->id != -1)
             idman.releaseId(item->id);
         delete item;
     }
 
-    BrowseItem *itemById(int id) const
-    {
-        return indexById.value(id);
-    }
+    BrowseItem *itemById(int id) const { return indexById.value(id); }
 
-    BrowseItem *itemByBrowse(JDnsBrowse *browse) const
-    {
-        return indexByBrowse.value(browse);
-    }
+    BrowseItem *itemByBrowse(JDnsBrowse *browse) const { return indexByBrowse.value(browse); }
 };
 
-class ResolveItem
-{
+class ResolveItem {
 public:
-    const int id;
-    JDnsServiceResolve * const resolve;
-    ObjectSession *sess;
+    const int                 id;
+    JDnsServiceResolve *const resolve;
+    ObjectSession *           sess;
 
-    ResolveItem(int _id, JDnsServiceResolve *_resolve) :
-        id(_id),
-        resolve(_resolve),
-        sess(0)
-    {
-    }
+    ResolveItem(int _id, JDnsServiceResolve *_resolve) : id(_id), resolve(_resolve), sess(0) {}
 
     ~ResolveItem()
     {
@@ -1974,24 +1771,17 @@ class ResolveItem
     }
 };
 
-class ResolveItemList
-{
+class ResolveItemList {
 private:
-    QSet<ResolveItem*> items;
-    QHash<int,ResolveItem*> indexById;
-    QHash<JDnsServiceResolve*,ResolveItem*> indexByResolve;
-    IdManager idman;
+    QSet<ResolveItem *>                        items;
+    QHash<int, ResolveItem *>                  indexById;
+    QHash<JDnsServiceResolve *, ResolveItem *> indexByResolve;
+    IdManager                                  idman;
 
 public:
-    ~ResolveItemList()
-    {
-        qDeleteAll(items);
-    }
+    ~ResolveItemList() { qDeleteAll(items); }
 
-    int reserveId()
-    {
-        return idman.reserveId();
-    }
+    int reserveId() { return idman.reserveId(); }
 
     void insert(ResolveItem *item)
     {
@@ -2005,35 +1795,23 @@ class ResolveItemList
         indexById.remove(item->id);
         indexByResolve.remove(item->resolve);
         items.remove(item);
-        if(item->id != -1)
+        if (item->id != -1)
             idman.releaseId(item->id);
         delete item;
     }
 
-    ResolveItem *itemById(int id) const
-    {
-        return indexById.value(id);
-    }
+    ResolveItem *itemById(int id) const { return indexById.value(id); }
 
-    ResolveItem *itemByResolve(JDnsServiceResolve *resolve) const
-    {
-        return indexByResolve.value(resolve);
-    }
+    ResolveItem *itemByResolve(JDnsServiceResolve *resolve) const { return indexByResolve.value(resolve); }
 };
 
-class PublishItem
-{
+class PublishItem {
 public:
-    const int id;
-    JDnsPublish * const publish;
-    ObjectSession *sess;
+    const int          id;
+    JDnsPublish *const publish;
+    ObjectSession *    sess;
 
-    PublishItem(int _id, JDnsPublish *_publish) :
-        id(_id),
-        publish(_publish),
-        sess(0)
-    {
-    }
+    PublishItem(int _id, JDnsPublish *_publish) : id(_id), publish(_publish), sess(0) {}
 
     ~PublishItem()
     {
@@ -2042,26 +1820,19 @@ class PublishItem
     }
 };
 
-class PublishItemList
-{
+class PublishItemList {
 public:
-    QSet<PublishItem*> items;
+    QSet<PublishItem *> items;
 
 private:
-    QHash<int,PublishItem*> indexById;
-    QHash<JDnsPublish*,PublishItem*> indexByPublish;
-    IdManager idman;
+    QHash<int, PublishItem *>           indexById;
+    QHash<JDnsPublish *, PublishItem *> indexByPublish;
+    IdManager                           idman;
 
 public:
-    ~PublishItemList()
-    {
-        qDeleteAll(items);
-    }
+    ~PublishItemList() { qDeleteAll(items); }
 
-    int reserveId()
-    {
-        return idman.reserveId();
-    }
+    int reserveId() { return idman.reserveId(); }
 
     void insert(PublishItem *item)
     {
@@ -2075,35 +1846,23 @@ class PublishItemList
         indexById.remove(item->id);
         indexByPublish.remove(item->publish);
         items.remove(item);
-        if(item->id != -1)
+        if (item->id != -1)
             idman.releaseId(item->id);
         delete item;
     }
 
-    PublishItem *itemById(int id) const
-    {
-        return indexById.value(id);
-    }
+    PublishItem *itemById(int id) const { return indexById.value(id); }
 
-    PublishItem *itemByPublish(JDnsPublish *publish) const
-    {
-        return indexByPublish.value(publish);
-    }
+    PublishItem *itemByPublish(JDnsPublish *publish) const { return indexByPublish.value(publish); }
 };
 
-class PublishExtraItem
-{
+class PublishExtraItem {
 public:
-    const int id;
-    JDnsPublishExtra * const publish;
-    ObjectSession *sess;
+    const int               id;
+    JDnsPublishExtra *const publish;
+    ObjectSession *         sess;
 
-    PublishExtraItem(int _id, JDnsPublishExtra *_publish) :
-        id(_id),
-        publish(_publish),
-        sess(0)
-    {
-    }
+    PublishExtraItem(int _id, JDnsPublishExtra *_publish) : id(_id), publish(_publish), sess(0) {}
 
     ~PublishExtraItem()
     {
@@ -2112,21 +1871,17 @@ class PublishExtraItem
     }
 };
 
-class PublishExtraItemList
-{
+class PublishExtraItemList {
 public:
-    QSet<PublishExtraItem*> items;
+    QSet<PublishExtraItem *> items;
 
 private:
-    QHash<int,PublishExtraItem*> indexById;
-    QHash<JDnsPublishExtra*,PublishExtraItem*> indexByPublish;
-    IdManager idman;
+    QHash<int, PublishExtraItem *>                indexById;
+    QHash<JDnsPublishExtra *, PublishExtraItem *> indexByPublish;
+    IdManager                                     idman;
 
 public:
-    ~PublishExtraItemList()
-    {
-        qDeleteAll(items);
-    }
+    ~PublishExtraItemList() { qDeleteAll(items); }
 
     void clear()
     {
@@ -2137,10 +1892,7 @@ class PublishExtraItemList
         idman.clear();
     }
 
-    int reserveId()
-    {
-        return idman.reserveId();
-    }
+    int reserveId() { return idman.reserveId(); }
 
     void insert(PublishExtraItem *item)
     {
@@ -2154,50 +1906,41 @@ class PublishExtraItemList
         indexById.remove(item->id);
         indexByPublish.remove(item->publish);
         items.remove(item);
-        if(item->id != -1)
+        if (item->id != -1)
             idman.releaseId(item->id);
         delete item;
     }
 
-    PublishExtraItem *itemById(int id) const
-    {
-        return indexById.value(id);
-    }
+    PublishExtraItem *itemById(int id) const { return indexById.value(id); }
 
-    PublishExtraItem *itemByPublish(JDnsPublishExtra *publish) const
-    {
-        return indexByPublish.value(publish);
-    }
+    PublishExtraItem *itemByPublish(JDnsPublishExtra *publish) const { return indexByPublish.value(publish); }
 };
 
-class JDnsServiceProvider : public ServiceProvider
-{
+class JDnsServiceProvider : public ServiceProvider {
     Q_OBJECT
 
 public:
     JDnsGlobal *global;
 
     // browse
-    BrowseItemList browseItemList;
-    QHash<QByteArray,ServiceInstance> items;
+    BrowseItemList                     browseItemList;
+    QHash<QByteArray, ServiceInstance> items;
 
     // resolve
     ResolveItemList resolveItemList;
 
     // publish
     JDnsPublishAddresses *pub_addresses;
-    QByteArray localHost;
-    PublishItemList publishItemList;
-    PublishExtraItemList publishExtraItemList;
+    QByteArray            localHost;
+    PublishItemList       publishItemList;
+    PublishExtraItemList  publishExtraItemList;
 
     static JDnsServiceProvider *create(JDnsGlobal *global, QObject *parent = 0)
     {
         return new JDnsServiceProvider(global, parent);
     }
 
-    JDnsServiceProvider(JDnsGlobal *_global, QObject *parent = 0) :
-        ServiceProvider(parent),
-        pub_addresses(0)
+    JDnsServiceProvider(JDnsGlobal *_global, QObject *parent = 0) : ServiceProvider(parent), pub_addresses(0)
     {
         global = _global;
         connect(global, SIGNAL(interfacesChanged()), SLOT(interfacesChanged()));
@@ -2212,12 +1955,12 @@ class JDnsServiceProvider : public ServiceProvider
     virtual int browse_start(const QString &_type, const QString &_domain)
     {
         QString domain;
-        if(_domain.isEmpty() || _domain == ".")
+        if (_domain.isEmpty() || _domain == ".")
             domain = "local.";
         else
             domain = _domain;
 
-        if(domain[domain.length() - 1] != '.')
+        if (domain[domain.length() - 1] != '.')
             domain += '.';
 
         Q_ASSERT(domain.length() >= 2 && domain[domain.length() - 1] == '.');
@@ -2225,34 +1968,31 @@ class JDnsServiceProvider : public ServiceProvider
         int id = browseItemList.reserveId();
 
         // no support for non-local domains
-        if(domain != "local.")
-        {
+        if (domain != "local.") {
             BrowseItem *i = new BrowseItem(id, 0);
-            i->sess = new ObjectSession(this);
+            i->sess       = new ObjectSession(this);
             browseItemList.insert(i);
             i->sess->defer(this, "do_browse_error", Q_ARG(int, i->id),
-                Q_ARG(XMPP::ServiceBrowser::Error, ServiceBrowser::ErrorNoWide));
+                           Q_ARG(XMPP::ServiceBrowser::Error, ServiceBrowser::ErrorNoWide));
             return i->id;
         }
 
-        if(!global->ensure_mul())
-        {
+        if (!global->ensure_mul()) {
             BrowseItem *i = new BrowseItem(id, 0);
-            i->sess = new ObjectSession(this);
+            i->sess       = new ObjectSession(this);
             browseItemList.insert(i);
             i->sess->defer(this, "do_browse_error", Q_ARG(int, i->id),
-                Q_ARG(XMPP::ServiceBrowser::Error, ServiceBrowser::ErrorNoLocal));
+                           Q_ARG(XMPP::ServiceBrowser::Error, ServiceBrowser::ErrorNoLocal));
             return i->id;
         }
 
         QByteArray type = _type.toUtf8();
-        if(!validServiceType(type))
-        {
+        if (!validServiceType(type)) {
             BrowseItem *i = new BrowseItem(id, 0);
-            i->sess = new ObjectSession(this);
+            i->sess       = new ObjectSession(this);
             browseItemList.insert(i);
             i->sess->defer(this, "do_browse_error", Q_ARG(int, i->id),
-                Q_ARG(XMPP::ServiceBrowser::Error, ServiceBrowser::ErrorGeneric));
+                           Q_ARG(XMPP::ServiceBrowser::Error, ServiceBrowser::ErrorGeneric));
             return i->id;
         }
 
@@ -2276,13 +2016,12 @@ class JDnsServiceProvider : public ServiceProvider
     {
         int id = resolveItemList.reserveId();
 
-        if(!global->ensure_mul())
-        {
+        if (!global->ensure_mul()) {
             ResolveItem *i = new ResolveItem(id, 0);
-            i->sess = new ObjectSession(this);
+            i->sess        = new ObjectSession(this);
             resolveItemList.insert(i);
             i->sess->defer(this, "do_resolve_error", Q_ARG(int, i->id),
-                Q_ARG(XMPP::ServiceResolver::Error, ServiceResolver::ErrorNoLocal));
+                           Q_ARG(XMPP::ServiceResolver::Error, ServiceResolver::ErrorNoLocal));
             return i->id;
         }
 
@@ -2302,34 +2041,32 @@ class JDnsServiceProvider : public ServiceProvider
         resolveItemList.remove(i);
     }
 
-    virtual int publish_start(const QString &instance, const QString &_type, int port, const QMap<QString,QByteArray> &attributes)
+    virtual int publish_start(const QString &instance, const QString &_type, int port,
+                              const QMap<QString, QByteArray> &attributes)
     {
         int id = publishItemList.reserveId();
 
-        if(!global->ensure_mul())
-        {
+        if (!global->ensure_mul()) {
             PublishItem *i = new PublishItem(id, 0);
-            i->sess = new ObjectSession(this);
+            i->sess        = new ObjectSession(this);
             publishItemList.insert(i);
             i->sess->defer(this, "do_publish_error", Q_ARG(int, i->id),
-                Q_ARG(XMPP::ServiceLocalPublisher::Error, ServiceLocalPublisher::ErrorNoLocal));
+                           Q_ARG(XMPP::ServiceLocalPublisher::Error, ServiceLocalPublisher::ErrorNoLocal));
             return i->id;
         }
 
         QByteArray type = _type.toUtf8();
-        if(!validServiceType(type))
-        {
+        if (!validServiceType(type)) {
             PublishItem *i = new PublishItem(id, 0);
-            i->sess = new ObjectSession(this);
+            i->sess        = new ObjectSession(this);
             publishItemList.insert(i);
             i->sess->defer(this, "do_publish_error", Q_ARG(int, i->id),
-                Q_ARG(XMPP::ServiceLocalPublisher::Error, ServiceLocalPublisher::ErrorGeneric));
+                           Q_ARG(XMPP::ServiceLocalPublisher::Error, ServiceLocalPublisher::ErrorGeneric));
             return i->id;
         }
 
         // make sure A/AAAA records are published
-        if(!pub_addresses)
-        {
+        if (!pub_addresses) {
             pub_addresses = new JDnsPublishAddresses(global->mul, this);
             connect(pub_addresses, SIGNAL(hostName(QByteArray)), SLOT(pub_addresses_hostName(QByteArray)));
             pub_addresses->setUseIPv6(global->haveMulticast6());
@@ -2348,13 +2085,13 @@ class JDnsServiceProvider : public ServiceProvider
         return i->id;
     }
 
-    virtual void publish_update(int id, const QMap<QString,QByteArray> &attributes)
+    virtual void publish_update(int id, const QMap<QString, QByteArray> &attributes)
     {
         PublishItem *i = publishItemList.itemById(id);
         Q_ASSERT(i);
 
         // if we already have an error queued, do nothing
-        if(i->sess->isDeferred(this, "do_publish_error"))
+        if (i->sess->isDeferred(this, "do_publish_error"))
             return;
 
         i->publish->update(attributes);
@@ -2377,22 +2114,21 @@ class JDnsServiceProvider : public ServiceProvider
         int id = publishItemList.reserveId();
 
         QJDns::Record rec = exportJDNSRecord(name);
-        if(rec.type == -1)
-        {
+        if (rec.type == -1) {
             PublishExtraItem *i = new PublishExtraItem(id, 0);
-            i->sess = new ObjectSession(this);
+            i->sess             = new ObjectSession(this);
             publishExtraItemList.insert(i);
             i->sess->defer(this, "do_publish_extra_error", Q_ARG(int, i->id),
-                Q_ARG(XMPP::ServiceLocalPublisher::Error, ServiceLocalPublisher::ErrorGeneric));
+                           Q_ARG(XMPP::ServiceLocalPublisher::Error, ServiceLocalPublisher::ErrorGeneric));
             return i->id;
         }
 
         // fill in owner if necessary
-        if(rec.owner.isEmpty())
+        if (rec.owner.isEmpty())
             rec.owner = pi->publish->fullname;
 
         // fill in the ttl if necessary
-        if(rec.ttl == 0)
+        if (rec.ttl == 0)
             rec.ttl = 4500;
 
         PublishExtraItem *i = new PublishExtraItem(id, new JDnsPublishExtra(pi->publish));
@@ -2409,24 +2145,23 @@ class JDnsServiceProvider : public ServiceProvider
         Q_ASSERT(i);
 
         // if we already have an error queued, do nothing
-        if(i->sess->isDeferred(this, "do_publish_extra_error"))
+        if (i->sess->isDeferred(this, "do_publish_extra_error"))
             return;
 
         QJDns::Record rec = exportJDNSRecord(name);
-        if(rec.type == -1)
-        {
+        if (rec.type == -1) {
             i->sess = new ObjectSession(this);
             i->sess->defer(this, "do_publish_extra_error", Q_ARG(int, i->id),
-                Q_ARG(XMPP::ServiceLocalPublisher::Error, ServiceLocalPublisher::ErrorGeneric));
+                           Q_ARG(XMPP::ServiceLocalPublisher::Error, ServiceLocalPublisher::ErrorGeneric));
             return;
         }
 
         // fill in owner if necessary
-        if(rec.owner.isEmpty())
-            rec.owner = static_cast<JDnsPublish*>(i->publish->parent())->fullname;
+        if (rec.owner.isEmpty())
+            rec.owner = static_cast<JDnsPublish *>(i->publish->parent())->fullname;
 
         // fill in the ttl if necessary
-        if(rec.ttl == 0)
+        if (rec.ttl == 0)
             rec.ttl = 4500;
 
         i->publish->update(rec);
@@ -2445,22 +2180,20 @@ class JDnsServiceProvider : public ServiceProvider
     {
         // remove all extra publishes associated with this publish.
         //   the association can be checked via QObject parenting.
-        QSet<PublishExtraItem*> remove;
-        foreach(PublishExtraItem *i, publishExtraItemList.items)
-        {
-            if(static_cast<JDnsPublish*>(i->publish->parent()) == pi->publish)
+        QSet<PublishExtraItem *> remove;
+        foreach (PublishExtraItem *i, publishExtraItemList.items) {
+            if (static_cast<JDnsPublish *>(i->publish->parent()) == pi->publish)
                 remove += i;
         }
 
-        foreach(PublishExtraItem *i, remove)
+        foreach (PublishExtraItem *i, remove)
             publishExtraItemList.remove(i);
     }
 
 private slots:
     void interfacesChanged()
     {
-        if(pub_addresses)
-        {
+        if (pub_addresses) {
             pub_addresses->setUseIPv6(global->haveMulticast6());
             pub_addresses->setUseIPv4(global->haveMulticast4());
         }
@@ -2469,11 +2202,12 @@ private slots:
     void jb_available(const QByteArray &instance)
     {
         JDnsBrowse *jb = static_cast<JDnsBrowse *>(sender());
-        BrowseItem *i = browseItemList.itemByBrowse(jb);
+        BrowseItem *i  = browseItemList.itemByBrowse(jb);
         Q_ASSERT(i);
 
-        QByteArray name = instance + '.' + jb->typeAndDomain;
-        ServiceInstance si(QString::fromLatin1(instance), QString::fromLatin1(jb->type), "local.", QMap<QString,QByteArray>());
+        QByteArray      name = instance + '.' + jb->typeAndDomain;
+        ServiceInstance si(QString::fromLatin1(instance), QString::fromLatin1(jb->type), "local.",
+                           QMap<QString, QByteArray>());
         items.insert(name, si);
 
         emit browse_instanceAvailable(i->id, si);
@@ -2482,7 +2216,7 @@ private slots:
     void jb_unavailable(const QByteArray &instance)
     {
         JDnsBrowse *jb = static_cast<JDnsBrowse *>(sender());
-        BrowseItem *i = browseItemList.itemByBrowse(jb);
+        BrowseItem *i  = browseItemList.itemByBrowse(jb);
         Q_ASSERT(i);
 
         QByteArray name = instance + '.' + jb->typeAndDomain;
@@ -2506,24 +2240,20 @@ private slots:
     void jr_finished()
     {
         JDnsServiceResolve *jr = static_cast<JDnsServiceResolve *>(sender());
-        ResolveItem *i = resolveItemList.itemByResolve(jr);
+        ResolveItem *       i  = resolveItemList.itemByResolve(jr);
         Q_ASSERT(i);
 
         // parse TXT list into attribute map
-        QMap<QString,QByteArray> attribs;
-        for(int n = 0; n < jr->attribs.count(); ++n)
-        {
+        QMap<QString, QByteArray> attribs;
+        for (int n = 0; n < jr->attribs.count(); ++n) {
             const QByteArray &a = jr->attribs[n];
-            QString key;
-            QByteArray value;
-            int x = a.indexOf('=');
-            if(x != -1)
-            {
-                key = QString::fromLatin1(a.mid(0, x));
+            QString           key;
+            QByteArray        value;
+            int               x = a.indexOf('=');
+            if (x != -1) {
+                key   = QString::fromLatin1(a.mid(0, x));
                 value = a.mid(x + 1);
-            }
-            else
-            {
+            } else {
                 key = QString::fromLatin1(a);
             }
 
@@ -2534,22 +2264,20 @@ private slots:
         Q_ASSERT(jr->have4 || jr->have6);
 
         QList<ResolveResult> results;
-        if(jr->have6)
-        {
+        if (jr->have6) {
             ResolveResult r;
             r.attributes = attribs;
-            r.address = jr->addr6;
-            r.port = jr->port;
-            r.hostName = jr->host;
+            r.address    = jr->addr6;
+            r.port       = jr->port;
+            r.hostName   = jr->host;
             results += r;
         }
-        if(jr->have4)
-        {
+        if (jr->have4) {
             ResolveResult r;
             r.attributes = attribs;
-            r.address = jr->addr4;
-            r.port = jr->port;
-            r.hostName = jr->host;
+            r.address    = jr->addr4;
+            r.port       = jr->port;
+            r.hostName   = jr->host;
             results += r;
         }
 
@@ -2561,11 +2289,11 @@ private slots:
     void jr_error(QJDnsSharedRequest::Error e)
     {
         JDnsServiceResolve *jr = static_cast<JDnsServiceResolve *>(sender());
-        ResolveItem *i = resolveItemList.itemByResolve(jr);
+        ResolveItem *       i  = resolveItemList.itemByResolve(jr);
         Q_ASSERT(i);
 
         ServiceResolver::Error err;
-        if(e == QJDnsSharedRequest::ErrorTimeout)
+        if (e == QJDnsSharedRequest::ErrorTimeout)
             err = ServiceResolver::ErrorTimeout;
         else
             err = ServiceResolver::ErrorGeneric;
@@ -2587,14 +2315,14 @@ private slots:
     void pub_addresses_hostName(const QByteArray &name)
     {
         // tell all active publishes about the change
-        foreach(PublishItem *item, publishItemList.items)
+        foreach (PublishItem *item, publishItemList.items)
             item->publish->hostChanged(name);
     }
 
     void jp_published()
     {
         JDnsPublish *jp = static_cast<JDnsPublish *>(sender());
-        PublishItem *i = publishItemList.itemByPublish(jp);
+        PublishItem *i  = publishItemList.itemByPublish(jp);
         Q_ASSERT(i);
 
         emit publish_published(i->id);
@@ -2603,11 +2331,11 @@ private slots:
     void jp_error(QJDnsSharedRequest::Error e)
     {
         JDnsPublish *jp = static_cast<JDnsPublish *>(sender());
-        PublishItem *i = publishItemList.itemByPublish(jp);
+        PublishItem *i  = publishItemList.itemByPublish(jp);
         Q_ASSERT(i);
 
         ServiceLocalPublisher::Error err;
-        if(e == QJDnsSharedRequest::ErrorConflict)
+        if (e == QJDnsSharedRequest::ErrorConflict)
             err = ServiceLocalPublisher::ErrorConflict;
         else
             err = ServiceLocalPublisher::ErrorGeneric;
@@ -2631,7 +2359,7 @@ private slots:
     void jpe_published()
     {
         JDnsPublishExtra *jp = static_cast<JDnsPublishExtra *>(sender());
-        PublishExtraItem *i = publishExtraItemList.itemByPublish(jp);
+        PublishExtraItem *i  = publishExtraItemList.itemByPublish(jp);
         Q_ASSERT(i);
 
         emit publish_extra_published(i->id);
@@ -2640,11 +2368,11 @@ private slots:
     void jpe_error(QJDnsSharedRequest::Error e)
     {
         JDnsPublishExtra *jp = static_cast<JDnsPublishExtra *>(sender());
-        PublishExtraItem *i = publishExtraItemList.itemByPublish(jp);
+        PublishExtraItem *i  = publishExtraItemList.itemByPublish(jp);
         Q_ASSERT(i);
 
         ServiceLocalPublisher::Error err;
-        if(e == QJDnsSharedRequest::ErrorConflict)
+        if (e == QJDnsSharedRequest::ErrorConflict)
             err = ServiceLocalPublisher::ErrorConflict;
         else
             err = ServiceLocalPublisher::ErrorGeneric;
@@ -2667,27 +2395,20 @@ private slots:
 //----------------------------------------------------------------------------
 // JDnsProvider
 //----------------------------------------------------------------------------
-class JDnsProvider : public IrisNetProvider
-{
+class JDnsProvider : public IrisNetProvider {
     Q_OBJECT
     Q_INTERFACES(XMPP::IrisNetProvider)
 
 public:
     JDnsGlobal *global;
 
-    JDnsProvider()
-    {
-        global = 0;
-    }
+    JDnsProvider() { global = 0; }
 
-    ~JDnsProvider()
-    {
-        delete global;
-    }
+    ~JDnsProvider() { delete global; }
 
     void ensure_global()
     {
-        if(!global)
+        if (!global)
             global = new JDnsGlobal;
     }
 
@@ -2710,10 +2431,7 @@ class JDnsProvider : public IrisNetProvider
     }
 };
 
-IrisNetProvider *irisnet_createJDnsProvider()
-{
-        return new JDnsProvider;
-}
+IrisNetProvider *irisnet_createJDnsProvider() { return new JDnsProvider; }
 } // namespace XMPP
 
 #include "netnames_jdns.moc"
diff --git a/src/irisnet/corelib/objectsession.cpp b/src/irisnet/corelib/objectsession.cpp
index ad12b7e7..d4f40a14 100644
--- a/src/irisnet/corelib/objectsession.cpp
+++ b/src/irisnet/corelib/objectsession.cpp
@@ -26,88 +26,60 @@
 #include <stdlib.h>
 
 namespace XMPP {
-class ObjectSessionWatcherPrivate
-{
+class ObjectSessionWatcherPrivate {
 public:
     ObjectSession *sess;
 };
 
-class ObjectSessionPrivate : public QObject
-{
+class ObjectSessionPrivate : public QObject {
     Q_OBJECT
 
 public:
     ObjectSession *q;
 
-    class MethodCall
-    {
+    class MethodCall {
     public:
-        QObject *obj;
+        QObject *  obj;
         QByteArray method;
-        class Argument
-        {
+        class Argument {
         public:
-            int type;
+            int   type;
             void *data;
         };
         QList<Argument> args;
 
-        MethodCall(QObject *_obj, const char *_method) :
-            obj(_obj),
-            method(_method)
-        {
-        }
+        MethodCall(QObject *_obj, const char *_method) : obj(_obj), method(_method) {}
 
-        ~MethodCall()
-        {
-            clearArgs();
-        }
+        ~MethodCall() { clearArgs(); }
 
         void clearArgs()
         {
-            for(int n = 0; n < args.count(); ++n)
+            for (int n = 0; n < args.count(); ++n)
                 QMetaType::destroy(args[n].type, args[n].data);
             args.clear();
         }
 
-        bool setArgs(QGenericArgument val0 = QGenericArgument(),
-            QGenericArgument val1 = QGenericArgument(),
-            QGenericArgument val2 = QGenericArgument(),
-            QGenericArgument val3 = QGenericArgument(),
-            QGenericArgument val4 = QGenericArgument(),
-            QGenericArgument val5 = QGenericArgument(),
-            QGenericArgument val6 = QGenericArgument(),
-            QGenericArgument val7 = QGenericArgument(),
-            QGenericArgument val8 = QGenericArgument(),
-            QGenericArgument val9 = QGenericArgument())
+        bool setArgs(QGenericArgument val0 = QGenericArgument(), QGenericArgument val1 = QGenericArgument(),
+                     QGenericArgument val2 = QGenericArgument(), QGenericArgument val3 = QGenericArgument(),
+                     QGenericArgument val4 = QGenericArgument(), QGenericArgument val5 = QGenericArgument(),
+                     QGenericArgument val6 = QGenericArgument(), QGenericArgument val7 = QGenericArgument(),
+                     QGenericArgument val8 = QGenericArgument(), QGenericArgument val9 = QGenericArgument())
         {
-            const char *arg_name[] =
-            {
-                val0.name(), val1.name(), val2.name(),
-                val3.name(), val4.name(), val5.name(),
-                val6.name(), val7.name(), val8.name(),
-                val9.name()
-            };
-
-            void *arg_data[] =
-            {
-                val0.data(), val1.data(), val2.data(),
-                val3.data(), val4.data(), val5.data(),
-                val6.data(), val7.data(), val8.data(),
-                val9.data()
-            };
+            const char *arg_name[] = { val0.name(), val1.name(), val2.name(), val3.name(), val4.name(),
+                                       val5.name(), val6.name(), val7.name(), val8.name(), val9.name() };
+
+            void *arg_data[] = { val0.data(), val1.data(), val2.data(), val3.data(), val4.data(),
+                                 val5.data(), val6.data(), val7.data(), val8.data(), val9.data() };
 
             clearArgs();
 
-            for(int n = 0; n < 10; ++n)
-            {
-                if(arg_name[n] == nullptr)
+            for (int n = 0; n < 10; ++n) {
+                if (arg_name[n] == nullptr)
                     break;
 
                 Argument arg;
                 arg.type = QMetaType::type(arg_name[n]);
-                if(!arg.type)
-                {
+                if (!arg.type) {
                     clearArgs();
                     return false;
                 }
@@ -120,15 +92,12 @@ class ObjectSessionPrivate : public QObject
         }
     };
 
-    QList<MethodCall*> pendingCalls;
-    QTimer *callTrigger;
-    bool paused;
-    QList<ObjectSessionWatcherPrivate*> watchers;
+    QList<MethodCall *>                  pendingCalls;
+    QTimer *                             callTrigger;
+    bool                                 paused;
+    QList<ObjectSessionWatcherPrivate *> watchers;
 
-    ObjectSessionPrivate(ObjectSession *_q) :
-        QObject(_q),
-        q(_q),
-        paused(false)
+    ObjectSessionPrivate(ObjectSession *_q) : QObject(_q), q(_q), paused(false)
     {
         callTrigger = new QTimer(this);
         connect(callTrigger, SIGNAL(timeout()), SLOT(doCall()));
@@ -149,15 +118,14 @@ class ObjectSessionPrivate : public QObject
     void addPendingCall(MethodCall *call)
     {
         pendingCalls += call;
-        if(!paused && !callTrigger->isActive())
+        if (!paused && !callTrigger->isActive())
             callTrigger->start();
     }
 
     bool havePendingCall(QObject *obj, const char *method) const
     {
-        foreach(const MethodCall *call, pendingCalls)
-        {
-            if(call->obj == obj && qstrcmp(call->method.data(), method) == 0)
+        foreach (const MethodCall *call, pendingCalls) {
+            if (call->obj == obj && qstrcmp(call->method.data(), method) == 0)
                 return true;
         }
         return false;
@@ -165,7 +133,7 @@ class ObjectSessionPrivate : public QObject
 
     void invalidateWatchers()
     {
-        for(int n = 0; n < watchers.count(); ++n)
+        for (int n = 0; n < watchers.count(); ++n)
             watchers[n]->sess = nullptr;
         watchers.clear();
     }
@@ -174,22 +142,20 @@ private slots:
     void doCall()
     {
         MethodCall *call = pendingCalls.takeFirst();
-        if(!pendingCalls.isEmpty())
+        if (!pendingCalls.isEmpty())
             callTrigger->start();
 
         Q_ASSERT(call->args.count() <= 10);
 
         QGenericArgument arg[10];
-        for(int n = 0; n < call->args.count(); ++n)
-                    arg[n] = QGenericArgument(QMetaType::typeName(call->args[n].type), call->args[n].data);
+        for (int n = 0; n < call->args.count(); ++n)
+            arg[n] = QGenericArgument(QMetaType::typeName(call->args[n].type), call->args[n].data);
 
         bool ok;
-        ok = QMetaObject::invokeMethod(call->obj, call->method.data(),
-            Qt::DirectConnection,
-            arg[0], arg[1], arg[2], arg[3], arg[4],
-            arg[5], arg[6], arg[7], arg[8], arg[9]);
+        ok = QMetaObject::invokeMethod(call->obj, call->method.data(), Qt::DirectConnection, arg[0], arg[1], arg[2],
+                                       arg[3], arg[4], arg[5], arg[6], arg[7], arg[8], arg[9]);
         Q_ASSERT(ok);
-        if(!ok)
+        if (!ok)
             abort();
 
         delete call;
@@ -198,82 +164,57 @@ private slots:
 
 ObjectSessionWatcher::ObjectSessionWatcher(ObjectSession *sess)
 {
-    d = new ObjectSessionWatcherPrivate;
+    d       = new ObjectSessionWatcherPrivate;
     d->sess = sess;
-    if(d->sess)
+    if (d->sess)
         d->sess->d->watchers += d;
 }
 
 ObjectSessionWatcher::~ObjectSessionWatcher()
 {
-    if(d->sess)
+    if (d->sess)
         d->sess->d->watchers.removeAll(d);
     delete d;
 }
 
 bool ObjectSessionWatcher::isValid() const
 {
-    if(d->sess)
+    if (d->sess)
         return true;
     else
         return false;
 }
 
-ObjectSession::ObjectSession(QObject *parent) :
-    QObject(parent)
-{
-    d = new ObjectSessionPrivate(this);
-}
+ObjectSession::ObjectSession(QObject *parent) : QObject(parent) { d = new ObjectSessionPrivate(this); }
 
-ObjectSession::~ObjectSession()
-{
-    delete d;
-}
+ObjectSession::~ObjectSession() { delete d; }
 
 void ObjectSession::reset()
 {
     d->invalidateWatchers();
-    if(d->callTrigger->isActive())
+    if (d->callTrigger->isActive())
         d->callTrigger->stop();
     qDeleteAll(d->pendingCalls);
     d->pendingCalls.clear();
 }
 
-bool ObjectSession::isDeferred(QObject *obj, const char *method)
-{
-    return d->havePendingCall(obj, method);
-}
+bool ObjectSession::isDeferred(QObject *obj, const char *method) { return d->havePendingCall(obj, method); }
 
-void ObjectSession::defer(QObject *obj, const char *method,
-    QGenericArgument val0,
-    QGenericArgument val1,
-    QGenericArgument val2,
-    QGenericArgument val3,
-    QGenericArgument val4,
-    QGenericArgument val5,
-    QGenericArgument val6,
-    QGenericArgument val7,
-    QGenericArgument val8,
-    QGenericArgument val9)
+void ObjectSession::defer(QObject *obj, const char *method, QGenericArgument val0, QGenericArgument val1,
+                          QGenericArgument val2, QGenericArgument val3, QGenericArgument val4, QGenericArgument val5,
+                          QGenericArgument val6, QGenericArgument val7, QGenericArgument val8, QGenericArgument val9)
 {
     ObjectSessionPrivate::MethodCall *call = new ObjectSessionPrivate::MethodCall(obj, method);
     call->setArgs(val0, val1, val2, val3, val4, val5, val6, val7, val8, val9);
     d->addPendingCall(call);
 }
 
-void ObjectSession::deferExclusive(QObject *obj, const char *method,
-    QGenericArgument val0,
-    QGenericArgument val1,
-    QGenericArgument val2,
-    QGenericArgument val3,
-    QGenericArgument val4,
-    QGenericArgument val5,
-    QGenericArgument val6,
-    QGenericArgument val7,
-    QGenericArgument val8,
-    QGenericArgument val9)
+void ObjectSession::deferExclusive(QObject *obj, const char *method, QGenericArgument val0, QGenericArgument val1,
+                                   QGenericArgument val2, QGenericArgument val3, QGenericArgument val4,
+                                   QGenericArgument val5, QGenericArgument val6, QGenericArgument val7,
+                                   QGenericArgument val8, QGenericArgument val9)
 {
-    if(d->havePendingCall(obj, method))
+    if (d->havePendingCall(obj, method))
         return;
 
     ObjectSessionPrivate::MethodCall *call = new ObjectSessionPrivate::MethodCall(obj, method);
@@ -285,7 +226,7 @@ void ObjectSession::pause()
 {
     Q_ASSERT(!d->paused);
 
-    if(d->callTrigger->isActive())
+    if (d->callTrigger->isActive())
         d->callTrigger->stop();
     d->paused = true;
 }
@@ -295,7 +236,7 @@ void ObjectSession::resume()
     Q_ASSERT(d->paused);
 
     d->paused = false;
-    if(!d->pendingCalls.isEmpty())
+    if (!d->pendingCalls.isEmpty())
         d->callTrigger->start();
 }
 } // namespace XMPP
diff --git a/src/irisnet/corelib/objectsession.h b/src/irisnet/corelib/objectsession.h
index 427d949e..b68d06d6 100644
--- a/src/irisnet/corelib/objectsession.h
+++ b/src/irisnet/corelib/objectsession.h
@@ -25,8 +25,7 @@ namespace XMPP {
 class ObjectSessionPrivate;
 class ObjectSessionWatcherPrivate;
 
-class ObjectSession : public QObject
-{
+class ObjectSession : public QObject {
     Q_OBJECT
 
 public:
@@ -37,28 +36,18 @@ class ObjectSession : public QObject
     void reset();
 
     bool isDeferred(QObject *obj, const char *method);
-    void defer(QObject *obj, const char *method,
-        QGenericArgument val0 = QGenericArgument(),
-        QGenericArgument val1 = QGenericArgument(),
-        QGenericArgument val2 = QGenericArgument(),
-        QGenericArgument val3 = QGenericArgument(),
-        QGenericArgument val4 = QGenericArgument(),
-        QGenericArgument val5 = QGenericArgument(),
-        QGenericArgument val6 = QGenericArgument(),
-        QGenericArgument val7 = QGenericArgument(),
-        QGenericArgument val8 = QGenericArgument(),
-        QGenericArgument val9 = QGenericArgument());
-    void deferExclusive(QObject *obj, const char *method,
-        QGenericArgument val0 = QGenericArgument(),
-        QGenericArgument val1 = QGenericArgument(),
-        QGenericArgument val2 = QGenericArgument(),
-        QGenericArgument val3 = QGenericArgument(),
-        QGenericArgument val4 = QGenericArgument(),
-        QGenericArgument val5 = QGenericArgument(),
-        QGenericArgument val6 = QGenericArgument(),
-        QGenericArgument val7 = QGenericArgument(),
-        QGenericArgument val8 = QGenericArgument(),
-        QGenericArgument val9 = QGenericArgument());
+    void defer(QObject *obj, const char *method, QGenericArgument val0 = QGenericArgument(),
+               QGenericArgument val1 = QGenericArgument(), QGenericArgument val2 = QGenericArgument(),
+               QGenericArgument val3 = QGenericArgument(), QGenericArgument val4 = QGenericArgument(),
+               QGenericArgument val5 = QGenericArgument(), QGenericArgument val6 = QGenericArgument(),
+               QGenericArgument val7 = QGenericArgument(), QGenericArgument val8 = QGenericArgument(),
+               QGenericArgument val9 = QGenericArgument());
+    void deferExclusive(QObject *obj, const char *method, QGenericArgument val0 = QGenericArgument(),
+                        QGenericArgument val1 = QGenericArgument(), QGenericArgument val2 = QGenericArgument(),
+                        QGenericArgument val3 = QGenericArgument(), QGenericArgument val4 = QGenericArgument(),
+                        QGenericArgument val5 = QGenericArgument(), QGenericArgument val6 = QGenericArgument(),
+                        QGenericArgument val7 = QGenericArgument(), QGenericArgument val8 = QGenericArgument(),
+                        QGenericArgument val9 = QGenericArgument());
 
     void pause();
     void resume();
@@ -68,8 +57,7 @@ class ObjectSession : public QObject
     ObjectSessionPrivate *d;
 };
 
-class ObjectSessionWatcher
-{
+class ObjectSessionWatcher {
 public:
     ObjectSessionWatcher(ObjectSession *sess);
     ~ObjectSessionWatcher();
diff --git a/src/irisnet/noncore/cutestuff/bsocket.cpp b/src/irisnet/noncore/cutestuff/bsocket.cpp
index cc3a2d99..869aa7aa 100644
--- a/src/irisnet/noncore/cutestuff/bsocket.cpp
+++ b/src/irisnet/noncore/cutestuff/bsocket.cpp
@@ -27,18 +27,16 @@
 
 //#define BS_DEBUG
 #ifdef BS_DEBUG
-# define BSDEBUG (qDebug() << this << "#" << __FUNCTION__ << ":")
+#define BSDEBUG (qDebug() << this << "#" << __FUNCTION__ << ":")
 #endif
 
 #define READBUFSIZE 65536
 
 // CS_NAMESPACE_BEGIN
-class QTcpSocketSignalRelay : public QObject
-{
+class QTcpSocketSignalRelay : public QObject {
     Q_OBJECT
 public:
-    QTcpSocketSignalRelay(QTcpSocket *sock, QObject *parent = nullptr)
-    :QObject(parent)
+    QTcpSocketSignalRelay(QTcpSocket *sock, QObject *parent = nullptr) : QObject(parent)
     {
         qRegisterMetaType<QAbstractSocket::SocketError>("QAbstractSocket::SocketError");
         connect(sock, SIGNAL(hostFound()), SLOT(sock_hostFound()), Qt::QueuedConnection);
@@ -46,7 +44,8 @@ class QTcpSocketSignalRelay : public QObject
         connect(sock, SIGNAL(disconnected()), SLOT(sock_disconnected()), Qt::QueuedConnection);
         connect(sock, SIGNAL(readyRead()), SLOT(sock_readyRead()), Qt::QueuedConnection);
         connect(sock, SIGNAL(bytesWritten(qint64)), SLOT(sock_bytesWritten(qint64)), Qt::QueuedConnection);
-        connect(sock, SIGNAL(error(QAbstractSocket::SocketError)), SLOT(sock_error(QAbstractSocket::SocketError)), Qt::QueuedConnection);
+        connect(sock, SIGNAL(error(QAbstractSocket::SocketError)), SLOT(sock_error(QAbstractSocket::SocketError)),
+                Qt::QueuedConnection);
     }
 
 signals:
@@ -58,86 +57,60 @@ class QTcpSocketSignalRelay : public QObject
     void error(QAbstractSocket::SocketError);
 
 public slots:
-    void sock_hostFound()
-    {
-        emit hostFound();
-    }
+    void sock_hostFound() { emit hostFound(); }
 
-    void sock_connected()
-    {
-        emit connected();
-    }
+    void sock_connected() { emit connected(); }
 
-    void sock_disconnected()
-    {
-        emit disconnected();
-    }
+    void sock_disconnected() { emit disconnected(); }
 
-    void sock_readyRead()
-    {
-        emit readyRead();
-    }
+    void sock_readyRead() { emit readyRead(); }
 
-    void sock_bytesWritten(qint64 x)
-    {
-        emit bytesWritten(x);
-    }
+    void sock_bytesWritten(qint64 x) { emit bytesWritten(x); }
 
-    void sock_error(QAbstractSocket::SocketError x)
-    {
-        emit error(x);
-    }
+    void sock_error(QAbstractSocket::SocketError x) { emit error(x); }
 };
 
-class HappyEyeballsConnector : public QObject
-{
+class HappyEyeballsConnector : public QObject {
     Q_OBJECT
 public:
-    enum State {
-        Failure,
-        Created,
-        Resolve,
-        Connecting,
-        Connected
-    };
+    enum State { Failure, Created, Resolve, Connecting, Connected };
 
     struct SockData {
-        QTcpSocket *sock;
+        QTcpSocket *           sock;
         QTcpSocketSignalRelay *relay;
-        State state;
+        State                  state;
         XMPP::ServiceResolver *resolver;
     };
 
     /*! source data */
-    QString service;
-    QString transport;
-    QString domain;
-    quint16 port = 0;
-    QHostAddress address;
+    QString                               service;
+    QString                               transport;
+    QString                               domain;
+    quint16                               port = 0;
+    QHostAddress                          address;
     QAbstractSocket::NetworkLayerProtocol fallbackProtocol = QAbstractSocket::IPv4Protocol;
 
     /*! runtime data */
-    QString lastError;
-    int lastIndex;
+    QString         lastError;
+    int             lastIndex;
     QList<SockData> sockets;
-    QTimer fallbackTimer;
+    QTimer          fallbackTimer;
 
-    HappyEyeballsConnector(QObject *parent) :
-        QObject(parent)
+    HappyEyeballsConnector(QObject *parent) : QObject(parent)
     {
         fallbackTimer.setSingleShot(true);
         fallbackTimer.setInterval(250); /* rfc recommends 150-250ms */
         connect(&fallbackTimer, SIGNAL(timeout()), SLOT(startFallback()));
     }
 
-    SockData& addSocket()
+    SockData &addSocket()
     {
         SockData sd;
         sd.state = Created;
-        sd.sock = new QTcpSocket(this);
+        sd.sock  = new QTcpSocket(this);
         sd.sock->setProxy(QNetworkProxy::NoProxy);
         sd.sock->setReadBufferSize(READBUFSIZE);
-        sd.relay = new QTcpSocketSignalRelay(sd.sock, this);
+        sd.relay    = new QTcpSocketSignalRelay(sd.sock, this);
         sd.resolver = nullptr;
         connect(sd.relay, SIGNAL(connected()), SLOT(qs_connected()));
         connect(sd.relay, SIGNAL(error(QAbstractSocket::SocketError)), SLOT(qs_error(QAbstractSocket::SocketError)));
@@ -159,8 +132,8 @@ class HappyEyeballsConnector : public QObject
         BSDEBUG << "a:" << address << "p:" << port;
 #endif
         this->address = address;
-        SockData &sd = addSocket();
-        sd.state = Connecting;
+        SockData &sd  = addSocket();
+        sd.state      = Connecting;
         sd.sock->connectToHost(address, port);
     }
 
@@ -171,16 +144,19 @@ class HappyEyeballsConnector : public QObject
         BSDEBUG << "h:" << host << "p:" << port << "pr:" << protocol;
 #endif
         this->domain = host;
-        this->port = port;
+        this->port   = port;
         SockData &sd = addSocket();
 
         QHostAddress addr(host);
         if (addr.isNull()) {
             sd.resolver = new XMPP::ServiceResolver;
             initResolver(sd.resolver);
-            sd.resolver->setProtocol(protocol == QAbstractSocket::UnknownNetworkLayerProtocol?
-                (fallbackProtocol == QAbstractSocket::IPv4Protocol? XMPP::ServiceResolver::IPv6 : XMPP::ServiceResolver::IPv4) :
-                (protocol== QAbstractSocket::IPv4Protocol? XMPP::ServiceResolver::IPv4 : XMPP::ServiceResolver::IPv6));
+            sd.resolver->setProtocol(protocol == QAbstractSocket::UnknownNetworkLayerProtocol
+                                         ? (fallbackProtocol == QAbstractSocket::IPv4Protocol
+                                                ? XMPP::ServiceResolver::IPv6
+                                                : XMPP::ServiceResolver::IPv4)
+                                         : (protocol == QAbstractSocket::IPv4Protocol ? XMPP::ServiceResolver::IPv4
+                                                                                      : XMPP::ServiceResolver::IPv6));
             if (protocol == QAbstractSocket::UnknownNetworkLayerProtocol) {
                 addSocket();
                 fallbackTimer.start();
@@ -190,7 +166,7 @@ class HappyEyeballsConnector : public QObject
         } else {
             // connecting by IP.
             lastIndex = sockets.count() - 1;
-            sd.state = Connecting;
+            sd.state  = Connecting;
             sd.sock->connectToHost(addr, port);
         }
     }
@@ -200,12 +176,12 @@ class HappyEyeballsConnector : public QObject
 #ifdef BS_DEBUG
         BSDEBUG << "s:" << service << "t:" << transport << "d:" << domain;
 #endif
-        this->service = service;
+        this->service   = service;
         this->transport = transport;
-        this->domain = domain;
-        this->port = port;
-        SockData &sd = addSocket();
-        sd.resolver = new XMPP::ServiceResolver(this);
+        this->domain    = domain;
+        this->port      = port;
+        SockData &sd    = addSocket();
+        sd.resolver     = new XMPP::ServiceResolver(this);
         sd.resolver->setProtocol(XMPP::ServiceResolver::HappyEyeballs);
         connect(sd.resolver, SIGNAL(srvReady()), SLOT(splitSrvResolvers()));
         // we don't care about special handling of fail. we have fallback host there anyway
@@ -217,11 +193,12 @@ class HappyEyeballsConnector : public QObject
     SockData takeCurrent(QObject *parent)
     {
         SockData csd = sockets.takeAt(lastIndex);
-        lastIndex = -1;
+        lastIndex    = -1;
         disconnect(csd.relay);
         csd.relay->setParent(parent);
         csd.sock->setParent(parent);
-        delete csd.resolver; // FIME ensure it's accessible only from connected signal. we don't delete resolver from its slot
+        delete csd
+            .resolver; // FIME ensure it's accessible only from connected signal. we don't delete resolver from its slot
         csd.resolver = nullptr;
         return csd;
     }
@@ -245,8 +222,10 @@ class HappyEyeballsConnector : public QObject
     void initResolver(XMPP::ServiceResolver *resolver)
     {
         resolver->setParent(this);
-        connect(resolver, SIGNAL(resultReady(QHostAddress,quint16)), this, SLOT(handleDnsReady(QHostAddress,quint16)));
-        connect(resolver, SIGNAL(error(XMPP::ServiceResolver::Error)), this, SLOT(handleDnsError(XMPP::ServiceResolver::Error)));
+        connect(resolver, SIGNAL(resultReady(QHostAddress, quint16)), this,
+                SLOT(handleDnsReady(QHostAddress, quint16)));
+        connect(resolver, SIGNAL(error(XMPP::ServiceResolver::Error)), this,
+                SLOT(handleDnsError(XMPP::ServiceResolver::Error)));
     }
 
     void setCurrentByResolver(XMPP::ServiceResolver *resolver)
@@ -280,7 +259,7 @@ private slots:
 #ifdef BS_DEBUG
         BSDEBUG;
 #endif
-        setCurrentByRelay(static_cast<QTcpSocketSignalRelay*>(sender()));
+        setCurrentByRelay(static_cast<QTcpSocketSignalRelay *>(sender()));
         for (int i = 0; i < sockets.count(); i++) {
             if (i != lastIndex) {
                 abortSocket(sockets[i]);
@@ -294,7 +273,7 @@ private slots:
 
     void qs_error(QAbstractSocket::SocketError errorCode)
     {
-        setCurrentByRelay(static_cast<QTcpSocketSignalRelay*>(sender()));
+        setCurrentByRelay(static_cast<QTcpSocketSignalRelay *>(sender()));
         // TODO remember error code
         lastError = sockets[lastIndex].sock->errorString();
 #ifdef BS_DEBUG
@@ -315,10 +294,10 @@ private slots:
 #ifdef BS_DEBUG
         BSDEBUG << "splitting resolvers";
 #endif
-        setCurrentByResolver(static_cast<XMPP::ServiceResolver*>(sender()));
-        SockData &sdv4 = sockets[lastIndex];
-        SockData &sdv6 = addSocket();
-        XMPP::ServiceResolver::ProtoSplit ps = sdv4.resolver->happySplit();
+        setCurrentByResolver(static_cast<XMPP::ServiceResolver *>(sender()));
+        SockData &                        sdv4 = sockets[lastIndex];
+        SockData &                        sdv6 = addSocket();
+        XMPP::ServiceResolver::ProtoSplit ps   = sdv4.resolver->happySplit();
         initResolver(ps.ipv4);
         initResolver(ps.ipv6);
 
@@ -326,7 +305,7 @@ private slots:
         sdv4.resolver->deleteLater();
 
         sdv4.resolver = ps.ipv4;
-        sdv4.state = Created;
+        sdv4.state    = Created;
         sdv6.resolver = ps.ipv6;
 
         if (fallbackProtocol == QAbstractSocket::IPv4Protocol) {
@@ -345,13 +324,14 @@ private slots:
 #ifdef BS_DEBUG
         BSDEBUG << "a:" << address << "p:" << port;
 #endif
-        setCurrentByResolver(static_cast<XMPP::ServiceResolver*>(sender()));
+        setCurrentByResolver(static_cast<XMPP::ServiceResolver *>(sender()));
         sockets[lastIndex].state = Connecting;
         sockets[lastIndex].sock->connectToHost(address, port);
     }
 
     /* resolver failed the dns lookup */
-    void handleDnsError(XMPP::ServiceResolver::Error e) {
+    void handleDnsError(XMPP::ServiceResolver::Error e)
+    {
 #ifdef BS_DEBUG
         BSDEBUG << "e:" << e;
 #else
@@ -367,7 +347,7 @@ private slots:
 #ifdef BS_DEBUG
         BSDEBUG;
 #endif
-        for(int i = 0; i < sockets.count(); i++) {
+        for (int i = 0; i < sockets.count(); i++) {
             SockData &sd = sockets[i];
             if (sd.state == Created) {
                 sd.state = Resolve;
@@ -376,8 +356,9 @@ private slots:
                 } else {
                     sd.resolver = new XMPP::ServiceResolver;
                     initResolver(sd.resolver);
-                    sd.resolver->setProtocol(fallbackProtocol == QAbstractSocket::IPv4Protocol?
-                                                 XMPP::ServiceResolver::IPv4 : XMPP::ServiceResolver::IPv6);
+                    sd.resolver->setProtocol(fallbackProtocol == QAbstractSocket::IPv4Protocol
+                                                 ? XMPP::ServiceResolver::IPv4
+                                                 : XMPP::ServiceResolver::IPv6);
                     sd.resolver->start(domain, port);
                 }
             }
@@ -389,29 +370,27 @@ private slots:
     void error(QAbstractSocket::SocketError);
 };
 
-class BSocket::Private
-{
+class BSocket::Private {
 public:
     Private()
     {
-        qsock = nullptr;
+        qsock       = nullptr;
         qsock_relay = nullptr;
     }
 
-    QTcpSocket *qsock;
+    QTcpSocket *           qsock;
     QTcpSocketSignalRelay *qsock_relay;
-    int state;
+    int                    state;
 
-    QString domain; //!< Domain we are currently connected to
-    QString host; //!< Hostname we are currently connected to
+    QString      domain;  //!< Domain we are currently connected to
+    QString      host;    //!< Hostname we are currently connected to
     QHostAddress address; //!< IP address we are currently connected to
-    quint16 port; //!< Port we are currently connected to
+    quint16      port;    //!< Port we are currently connected to
 
     QPointer<HappyEyeballsConnector> connector;
 };
 
-BSocket::BSocket(QObject *parent)
-:ByteStream(parent)
+BSocket::BSocket(QObject *parent) : ByteStream(parent)
 {
     d = new Private;
     resetConnection();
@@ -432,13 +411,14 @@ void BSocket::resetConnection(bool clear)
         delete d->connector; // fixme: deleteLater?
     }
 
-    if(d->qsock) {
+    if (d->qsock) {
         delete d->qsock_relay;
         d->qsock_relay = nullptr;
 
         // move remaining into the local queue
         if (d->qsock->isOpen()) {
-            QByteArray block(int(d->qsock->bytesAvailable()), 0); // memory won't never be cheap enough to have gigabytes for socket buffer
+            QByteArray block(int(d->qsock->bytesAvailable()),
+                             0); // memory won't never be cheap enough to have gigabytes for socket buffer
             if (block.size()) {
                 d->qsock->read(block.data(), block.size());
                 appendRead(block);
@@ -446,29 +426,29 @@ void BSocket::resetConnection(bool clear)
             d->qsock->close();
         }
 
-        //d->sd.deleteLater(d->qsock);
+        // d->sd.deleteLater(d->qsock);
         d->qsock->deleteLater();
         d->qsock = nullptr;
-    }
-    else {
-        if(clear)
+    } else {
+        if (clear)
             clearReadBuffer();
     }
 
-    d->state = Idle;
-    d->domain = "";
-    d->host = "";
+    d->state   = Idle;
+    d->domain  = "";
+    d->host    = "";
     d->address = QHostAddress();
-    d->port = 0;
+    d->port    = 0;
     setOpenMode(QIODevice::NotOpen);
 }
 
 void BSocket::ensureConnector()
 {
-    if(!d->connector) {
+    if (!d->connector) {
         d->connector = new HappyEyeballsConnector(this);
         connect(d->connector, SIGNAL(connected()), SLOT(qs_connected()));
-        connect(d->connector, SIGNAL(error(QAbstractSocket::SocketError)), SLOT(qs_error(QAbstractSocket::SocketError)));
+        connect(d->connector, SIGNAL(error(QAbstractSocket::SocketError)),
+                SLOT(qs_error(QAbstractSocket::SocketError)));
     }
 }
 
@@ -477,8 +457,8 @@ void BSocket::connectToHost(const QHostAddress &address, quint16 port)
 {
     resetConnection(true);
     d->address = address;
-    d->port = port;
-    d->state = Connecting;
+    d->port    = port;
+    d->state   = Connecting;
 
     ensureConnector();
     d->connector->connectToHost(address, port);
@@ -488,8 +468,8 @@ void BSocket::connectToHost(const QHostAddress &address, quint16 port)
 void BSocket::connectToHost(const QString &host, quint16 port, QAbstractSocket::NetworkLayerProtocol protocol)
 {
     resetConnection(true);
-    d->host = host;
-    d->port = port;
+    d->host  = host;
+    d->port  = port;
     d->state = Connecting;
 
     ensureConnector();
@@ -501,20 +481,17 @@ void BSocket::connectToHost(const QString &service, const QString &transport, co
 {
     resetConnection(true);
     d->domain = domain;
-    d->state = Connecting;
+    d->state  = Connecting;
 
     ensureConnector();
     d->connector->connectToHost(service, transport, domain, port);
 }
 
-QAbstractSocket* BSocket::abstractSocket() const
-{
-    return d->qsock;
-}
+QAbstractSocket *BSocket::abstractSocket() const { return d->qsock; }
 
 qintptr BSocket::socket() const
 {
-    if(d->qsock)
+    if (d->qsock)
         return d->qsock->socketDescriptor();
     else
         return -1;
@@ -524,19 +501,16 @@ void BSocket::setSocket(QTcpSocket *s)
 {
     resetConnection(true);
     s->setParent(this);
-    d->qsock = s;
+    d->qsock       = s;
     d->qsock_relay = new QTcpSocketSignalRelay(d->qsock, this);
     qs_connected_step2(false); // we have desriptor already. so it's already known to be connected
 }
 
-int BSocket::state() const
-{
-    return d->state;
-}
+int BSocket::state() const { return d->state; }
 
 bool BSocket::isOpen() const
 {
-    if(d->state == Connected)
+    if (d->state == Connected)
         return true;
     else
         return false;
@@ -544,10 +518,10 @@ bool BSocket::isOpen() const
 
 void BSocket::close()
 {
-    if(d->state == Idle)
+    if (d->state == Idle)
         return;
 
-    if(d->qsock) {
+    if (d->qsock) {
         d->state = Closing;
         d->qsock->close();
         if (d->qsock->state() == QAbstractSocket::ClosingState) {
@@ -555,15 +529,14 @@ void BSocket::close()
         } else {
             resetConnection();
         }
-    }
-    else {
+    } else {
         resetConnection();
     }
 }
 
 qint64 BSocket::writeData(const char *data, qint64 maxSize)
 {
-    if(d->state != Connected)
+    if (d->state != Connected)
         return 0;
 #ifdef BS_DEBUG_EXTRA
     BSDEBUG << "- [" << maxSize << "]: {" << QByteArray::fromRawData(data, maxSize) << "}";
@@ -573,13 +546,13 @@ qint64 BSocket::writeData(const char *data, qint64 maxSize)
 
 qint64 BSocket::readData(char *data, qint64 maxSize)
 {
-    if(!maxSize) {
+    if (!maxSize) {
         return 0;
     }
     qint64 readSize;
-    if(d->qsock) {
+    if (d->qsock) {
         qint64 max = bytesAvailable();
-        if(maxSize <= 0 || maxSize > max) {
+        if (maxSize <= 0 || maxSize > max) {
             maxSize = max;
         }
         readSize = d->qsock->read(data, maxSize);
@@ -595,7 +568,7 @@ qint64 BSocket::readData(char *data, qint64 maxSize)
 
 qint64 BSocket::bytesAvailable() const
 {
-    if(d->qsock)
+    if (d->qsock)
         return d->qsock->bytesAvailable();
     else
         return ByteStream::bytesAvailable();
@@ -603,14 +576,14 @@ qint64 BSocket::bytesAvailable() const
 
 qint64 BSocket::bytesToWrite() const
 {
-    if(!d->qsock)
+    if (!d->qsock)
         return 0;
     return d->qsock->bytesToWrite();
 }
 
 QHostAddress BSocket::address() const
 {
-    if(d->qsock)
+    if (d->qsock)
         return d->qsock->localAddress();
     else
         return QHostAddress();
@@ -618,7 +591,7 @@ QHostAddress BSocket::address() const
 
 quint16 BSocket::port() const
 {
-    if(d->qsock)
+    if (d->qsock)
         return d->qsock->localPort();
     else
         return 0;
@@ -626,7 +599,7 @@ quint16 BSocket::port() const
 
 QHostAddress BSocket::peerAddress() const
 {
-    if(d->qsock)
+    if (d->qsock)
         return d->qsock->peerAddress();
     else
         return QHostAddress();
@@ -634,7 +607,7 @@ QHostAddress BSocket::peerAddress() const
 
 quint16 BSocket::peerPort() const
 {
-    if(d->qsock)
+    if (d->qsock)
         return d->qsock->peerPort();
     else
         return 0;
@@ -643,8 +616,8 @@ quint16 BSocket::peerPort() const
 void BSocket::qs_connected()
 {
     HappyEyeballsConnector::SockData sd = d->connector->takeCurrent(this);
-    d->qsock = sd.sock;
-    d->qsock_relay = sd.relay;
+    d->qsock                            = sd.sock;
+    d->qsock_relay                      = sd.relay;
     d->connector->deleteLater();
     qs_connected_step2(true);
 }
@@ -672,8 +645,7 @@ void BSocket::qs_connected_step2(bool signalConnected)
 
 void BSocket::qs_closed()
 {
-    if(d->state == Closing)
-    {
+    if (d->state == Closing) {
 #ifdef BS_DEBUG
         BSDEBUG << "Delayed Close Finished";
 #endif
@@ -682,10 +654,7 @@ void BSocket::qs_closed()
     }
 }
 
-void BSocket::qs_readyRead()
-{
-    emit readyRead();
-}
+void BSocket::qs_readyRead() { emit readyRead(); }
 
 void BSocket::qs_bytesWritten(qint64 x64)
 {
@@ -698,7 +667,7 @@ void BSocket::qs_bytesWritten(qint64 x64)
 
 void BSocket::qs_error(QAbstractSocket::SocketError x)
 {
-    if(x == QTcpSocket::RemoteHostClosedError) {
+    if (x == QTcpSocket::RemoteHostClosedError) {
 #ifdef BS_DEBUG
         BSDEBUG << "Connection Closed";
 #endif
@@ -711,9 +680,9 @@ void BSocket::qs_error(QAbstractSocket::SocketError x)
     BSDEBUG << "Error";
 #endif
     resetConnection();
-    if(x == QTcpSocket::ConnectionRefusedError)
+    if (x == QTcpSocket::ConnectionRefusedError)
         emit error(ErrConnectionRefused);
-    else if(x == QTcpSocket::HostNotFoundError)
+    else if (x == QTcpSocket::HostNotFoundError)
         emit error(ErrHostNotFound);
     else
         emit error(ErrRead);
diff --git a/src/irisnet/noncore/cutestuff/bsocket.h b/src/irisnet/noncore/cutestuff/bsocket.h
index e0f59416..66fc476e 100644
--- a/src/irisnet/noncore/cutestuff/bsocket.h
+++ b/src/irisnet/noncore/cutestuff/bsocket.h
@@ -35,25 +35,26 @@ class QString;
 /*!
     Socket with automatic hostname lookups, using SRV, AAAA and A DNS queries.
 */
-class BSocket : public ByteStream
-{
+class BSocket : public ByteStream {
     Q_OBJECT
 public:
     enum Error { ErrConnectionRefused = ErrCustom, ErrHostNotFound };
     enum State { Idle, HostLookup, Connecting, Connected, Closing };
-    BSocket(QObject *parent=nullptr);
+    BSocket(QObject *parent = nullptr);
     ~BSocket();
 
     /*! Connect to an already resolved host */
     void connectToHost(const QHostAddress &address, quint16 port);
     /*! Connect to a host via the specified protocol, or the default protocols if not specified */
-    void connectToHost(const QString &host, quint16 port, QAbstractSocket::NetworkLayerProtocol protocol = QAbstractSocket::UnknownNetworkLayerProtocol);
+    void connectToHost(const QString &host, quint16 port,
+                       QAbstractSocket::NetworkLayerProtocol protocol = QAbstractSocket::UnknownNetworkLayerProtocol);
     /*! Connect to the hosts for the specified service */
-    void connectToHost(const QString &service, const QString &transport, const QString &domain, quint16 port = std::numeric_limits<quint16>::max());
-    virtual QAbstractSocket* abstractSocket() const;
-    qintptr socket() const;
-    void setSocket(QTcpSocket *);
-    int state() const;
+    void                     connectToHost(const QString &service, const QString &transport, const QString &domain,
+                                           quint16 port = std::numeric_limits<quint16>::max());
+    virtual QAbstractSocket *abstractSocket() const;
+    qintptr                  socket() const;
+    void                     setSocket(QTcpSocket *);
+    int                      state() const;
 
     // from ByteStream
     bool isOpen() const;
@@ -64,11 +65,11 @@ class BSocket : public ByteStream
 
     // local
     QHostAddress address() const;
-    quint16 port() const;
+    quint16      port() const;
 
     // remote
     QHostAddress peerAddress() const;
-    quint16 peerPort() const;
+    quint16      peerPort() const;
 
 protected:
     qint64 writeData(const char *data, qint64 maxSize);
@@ -89,7 +90,7 @@ private slots:
     class Private;
     Private *d;
 
-    void resetConnection(bool clear=false);
+    void resetConnection(bool clear = false);
     void ensureConnector();
     void recreate_resolver();
     bool check_protocol_fallback();
diff --git a/src/irisnet/noncore/cutestuff/bytestream.cpp b/src/irisnet/noncore/cutestuff/bytestream.cpp
index b352435f..053a737d 100644
--- a/src/irisnet/noncore/cutestuff/bytestream.cpp
+++ b/src/irisnet/noncore/cutestuff/bytestream.cpp
@@ -55,41 +55,33 @@
 //! Also available are the static convenience functions ByteStream::appendArray()
 //! and ByteStream::takeArray(), which make dealing with byte queues very easy.
 
-class ByteStream::Private
-{
+class ByteStream::Private {
 public:
     Private() {}
 
     QByteArray readBuf, writeBuf;
-    int errorCode;
-    QString errorText;
+    int        errorCode;
+    QString    errorText;
 };
 
 //!
 //! Constructs a ByteStream object with parent \a parent.
-ByteStream::ByteStream(QObject *parent)
-:QIODevice(parent)
-{
-    d = new Private;
-}
+ByteStream::ByteStream(QObject *parent) : QIODevice(parent) { d = new Private; }
 
 //!
 //! Destroys the object and frees allocated resources.
-ByteStream::~ByteStream()
-{
-    delete d;
-}
+ByteStream::~ByteStream() { delete d; }
 
 //!
 //! Writes array \a a to the stream.
 qint64 ByteStream::writeData(const char *data, qint64 maxSize)
 {
-    if(!isOpen())
-        return - 1;
+    if (!isOpen())
+        return -1;
 
-    bool doWrite = bytesToWrite() == 0 ? true: false;
+    bool doWrite = bytesToWrite() == 0 ? true : false;
     d->writeBuf.append(data, maxSize);
-    if(doWrite)
+    if (doWrite)
         tryWrite();
     return maxSize;
 }
@@ -99,7 +91,7 @@ qint64 ByteStream::writeData(const char *data, qint64 maxSize)
 //! \a read will return all available data.
 qint64 ByteStream::readData(char *data, qint64 maxSize)
 {
-    maxSize = maxSize > d->readBuf.size()? d->readBuf.size() : maxSize;
+    maxSize = maxSize > d->readBuf.size() ? d->readBuf.size() : maxSize;
     memcpy(data, d->readBuf.constData(), maxSize);
     d->readBuf.remove(0, maxSize);
     return maxSize;
@@ -107,85 +99,52 @@ qint64 ByteStream::readData(char *data, qint64 maxSize)
 
 //!
 //! Returns the number of bytes available for reading.
-qint64 ByteStream::bytesAvailable() const
-{
-    return QIODevice::bytesAvailable() + d->readBuf.size();
-}
+qint64 ByteStream::bytesAvailable() const { return QIODevice::bytesAvailable() + d->readBuf.size(); }
 
 //!
 //! Returns the number of bytes that are waiting to be written.
-qint64 ByteStream::bytesToWrite() const
-{
-    return d->writeBuf.size();
-}
+qint64 ByteStream::bytesToWrite() const { return d->writeBuf.size(); }
 
 //!
 //! Clears the read buffer.
-void ByteStream::clearReadBuffer()
-{
-    d->readBuf.resize(0);
-}
+void ByteStream::clearReadBuffer() { d->readBuf.resize(0); }
 
 //!
 //! Clears the write buffer.
-void ByteStream::clearWriteBuffer()
-{
-    d->writeBuf.resize(0);
-}
+void ByteStream::clearWriteBuffer() { d->writeBuf.resize(0); }
 
 //!
 //! Appends \a block to the end of the read buffer.
-void ByteStream::appendRead(const QByteArray &block)
-{
-    d->readBuf += block;
-}
+void ByteStream::appendRead(const QByteArray &block) { d->readBuf += block; }
 
 //!
 //! Appends \a block to the end of the write buffer.
-void ByteStream::appendWrite(const QByteArray &block)
-{
-    d->writeBuf += block;
-}
+void ByteStream::appendWrite(const QByteArray &block) { d->writeBuf += block; }
 
 //!
 //! Returns \a size bytes from the start of the read buffer.
 //! If \a size is 0, then all available data will be returned.
 //! If \a del is TRUE, then the bytes are also removed.
-QByteArray ByteStream::takeRead(int size, bool del)
-{
-    return takeArray(d->readBuf, size, del);
-}
+QByteArray ByteStream::takeRead(int size, bool del) { return takeArray(d->readBuf, size, del); }
 
 //!
 //! Returns \a size bytes from the start of the write buffer.
 //! If \a size is 0, then all available data will be returned.
 //! If \a del is TRUE, then the bytes are also removed.
-QByteArray ByteStream::takeWrite(int size, bool del)
-{
-    return takeArray(d->writeBuf, size, del);
-}
+QByteArray ByteStream::takeWrite(int size, bool del) { return takeArray(d->writeBuf, size, del); }
 
 //!
 //! Returns a reference to the read buffer.
-QByteArray & ByteStream::readBuf()
-{
-    return d->readBuf;
-}
+QByteArray &ByteStream::readBuf() { return d->readBuf; }
 
 //!
 //! Returns a reference to the write buffer.
-QByteArray & ByteStream::writeBuf()
-{
-    return d->writeBuf;
-}
+QByteArray &ByteStream::writeBuf() { return d->writeBuf; }
 
 //!
 //! Attempts to try and write some bytes from the write buffer, and returns the number
 //! successfully written or -1 on error.  The default implementation returns -1.
-int ByteStream::tryWrite()
-{
-    return -1;
-}
+int ByteStream::tryWrite() { return -1; }
 
 //!
 //! Returns \a size bytes from the start of the array pointed to by \a from.
@@ -194,12 +153,11 @@ int ByteStream::tryWrite()
 QByteArray ByteStream::takeArray(QByteArray &from, int size, bool del)
 {
     QByteArray result;
-    if(size == 0) {
+    if (size == 0) {
         result = from;
-        if(del)
+        if (del)
             from.resize(0);
-    }
-    else {
+    } else {
         result = from.left(size);
         if (del) {
             from.remove(0, size);
@@ -210,17 +168,11 @@ QByteArray ByteStream::takeArray(QByteArray &from, int size, bool del)
 
 //!
 //! Returns last error code.
-int ByteStream::errorCode() const
-{
-    return d->errorCode;
-}
+int ByteStream::errorCode() const { return d->errorCode; }
 
 //!
 //! Returns last error string corresponding to last error code.
-QString &ByteStream::errorText() const
-{
-    return d->errorText;
-}
+QString &ByteStream::errorText() const { return d->errorText; }
 
 //!
 //! Sets last error with \a code and \a text and emit it
@@ -233,11 +185,11 @@ void ByteStream::setError(int code, const QString &text)
     }
 }
 
-    void connectionClosed();
-    void delayedCloseFinished();
-    void readyRead();
-    void bytesWritten(qint64);
-    void error(int);
+void connectionClosed();
+void delayedCloseFinished();
+void readyRead();
+void bytesWritten(qint64);
+void error(int);
 
 //! \fn void ByteStream::connectionClosed()
 //! This signal is emitted when the remote end of the stream closes.
diff --git a/src/irisnet/noncore/cutestuff/bytestream.h b/src/irisnet/noncore/cutestuff/bytestream.h
index 2b88b429..c11335cc 100644
--- a/src/irisnet/noncore/cutestuff/bytestream.h
+++ b/src/irisnet/noncore/cutestuff/bytestream.h
@@ -28,24 +28,23 @@ class QAbstractSocket;
 
 // CS_NAMESPACE_BEGIN
 // CS_EXPORT_BEGIN
-class ByteStream : public QIODevice
-{
+class ByteStream : public QIODevice {
     Q_OBJECT
 public:
     enum Error { ErrOk, ErrRead, ErrWrite, ErrCustom = 10 };
-    ByteStream(QObject *parent=nullptr);
-    ~ByteStream()=0;
+    ByteStream(QObject *parent = nullptr);
+    ~ByteStream() = 0;
 
-    bool isSequential() const { return true; }
+    bool   isSequential() const { return true; }
     qint64 bytesAvailable() const;
     qint64 bytesToWrite() const;
 
-    static QByteArray takeArray(QByteArray &from, int size=0, bool del=true);
+    static QByteArray takeArray(QByteArray &from, int size = 0, bool del = true);
 
-    int errorCode() const;
+    int      errorCode() const;
     QString &errorText() const;
 
-    virtual QAbstractSocket* abstractSocket() const { return nullptr; }
+    virtual QAbstractSocket *abstractSocket() const { return nullptr; }
 
 signals:
     void connectionClosed();
@@ -56,22 +55,22 @@ class ByteStream : public QIODevice
     qint64 writeData(const char *data, qint64 maxSize);
     qint64 readData(char *data, qint64 maxSize);
 
-    void setError(int code = ErrOk, const QString &text = QString());
-    void clearReadBuffer();
-    void clearWriteBuffer();
-    void appendRead(const QByteArray &);
-    void appendWrite(const QByteArray &);
-    QByteArray takeRead(int size=0, bool del=true);
-    QByteArray takeWrite(int size=0, bool del=true);
-    QByteArray & readBuf();
-    QByteArray & writeBuf();
+    void        setError(int code = ErrOk, const QString &text = QString());
+    void        clearReadBuffer();
+    void        clearWriteBuffer();
+    void        appendRead(const QByteArray &);
+    void        appendWrite(const QByteArray &);
+    QByteArray  takeRead(int size = 0, bool del = true);
+    QByteArray  takeWrite(int size = 0, bool del = true);
+    QByteArray &readBuf();
+    QByteArray &writeBuf();
     virtual int tryWrite();
 
 private:
-//! \if _hide_doc_
+    //! \if _hide_doc_
     class Private;
     Private *d;
-//! \endif
+    //! \endif
 };
 // CS_EXPORT_END
 // CS_NAMESPACE_END
diff --git a/src/irisnet/noncore/cutestuff/httpconnect.cpp b/src/irisnet/noncore/cutestuff/httpconnect.cpp
index 0bd8a8cd..9c2c88f5 100644
--- a/src/irisnet/noncore/cutestuff/httpconnect.cpp
+++ b/src/irisnet/noncore/cutestuff/httpconnect.cpp
@@ -35,14 +35,12 @@
 QString escapeOutput(const QByteArray &in)
 {
     QString out;
-    for(int n = 0; n < in.size(); ++n) {
-        if(in[n] == '\\') {
+    for (int n = 0; n < in.size(); ++n) {
+        if (in[n] == '\\') {
             out += QString("\\\\");
-        }
-        else if(in[n] >= 32 && in[n] < 127) {
+        } else if (in[n] >= 32 && in[n] < 127) {
             out += QChar::fromLatin1(in[n]);
-        }
-        else {
+        } else {
             out += QString().sprintf("\\x%02x", (unsigned char)in[n]);
         }
     }
@@ -53,14 +51,13 @@ QString escapeOutput(const QByteArray &in)
 static QString extractLine(QByteArray *buf, bool *found)
 {
     // Scan for newline
-    int index = buf->indexOf ("\r\n");
+    int index = buf->indexOf("\r\n");
     if (index == -1) {
         // Newline not found
         if (found)
             *found = false;
         return "";
-    }
-    else {
+    } else {
         // Found newline
         QString s = QString::fromLatin1(buf->left(index));
         buf->remove(0, index + 2);
@@ -74,48 +71,43 @@ static QString extractLine(QByteArray *buf, bool *found)
 static bool extractMainHeader(const QString &line, QString *proto, int *code, QString *msg)
 {
     int n = line.indexOf(' ');
-    if(n == -1)
+    if (n == -1)
         return false;
-    if(proto)
+    if (proto)
         *proto = line.mid(0, n);
     ++n;
     int n2 = line.indexOf(' ', n);
-    if(n2 == -1)
+    if (n2 == -1)
         return false;
-    if(code)
-        *code = line.mid(n, n2-n).toInt();
-    n = n2+1;
-    if(msg)
+    if (code)
+        *code = line.mid(n, n2 - n).toInt();
+    n = n2 + 1;
+    if (msg)
         *msg = line.mid(n);
     return true;
 }
 
-class HttpConnect::Private
-{
+class HttpConnect::Private {
 public:
-    Private(HttpConnect *_q) :
-        sock(_q)
-    {
-    }
+    Private(HttpConnect *_q) : sock(_q) {}
 
     BSocket sock;
     QString host;
-    int port;
+    int     port;
     QString user, pass;
     QString real_host;
-    int real_port;
+    int     real_port;
 
     QByteArray recvBuf;
 
-    bool inHeader;
+    bool        inHeader;
     QStringList headerLines;
 
-    int toWrite;
+    int  toWrite;
     bool active;
 };
 
-HttpConnect::HttpConnect(QObject *parent)
-:ByteStream(parent)
+HttpConnect::HttpConnect(QObject *parent) : ByteStream(parent)
 {
     d = new Private(this);
     connect(&d->sock, SIGNAL(connected()), SLOT(sock_connected()));
@@ -136,9 +128,9 @@ HttpConnect::~HttpConnect()
 
 void HttpConnect::resetConnection(bool clear)
 {
-    if(d->sock.state() != BSocket::Idle)
+    if (d->sock.state() != BSocket::Idle)
         d->sock.close();
-    if(clear) {
+    if (clear) {
         clearReadBuffer();
         d->recvBuf.resize(0);
     }
@@ -156,14 +148,14 @@ void HttpConnect::connectToHost(const QString &proxyHost, int proxyPort, const Q
 {
     resetConnection(true);
 
-    d->host = proxyHost;
-    d->port = proxyPort;
+    d->host      = proxyHost;
+    d->port      = proxyPort;
     d->real_host = host;
     d->real_port = port;
 
 #ifdef PROX_DEBUG
     fprintf(stderr, "HttpConnect: Connecting to %s:%d", qPrintable(proxyHost), proxyPort);
-    if(d->user.isEmpty())
+    if (d->user.isEmpty())
         fprintf(stderr, "\n");
     else
         fprintf(stderr, ", auth {%s,%s}\n", qPrintable(d->user), qPrintable(d->pass));
@@ -174,20 +166,20 @@ void HttpConnect::connectToHost(const QString &proxyHost, int proxyPort, const Q
 void HttpConnect::close()
 {
     d->sock.close();
-    if(d->sock.bytesToWrite() == 0)
+    if (d->sock.bytesToWrite() == 0)
         resetConnection();
 }
 
 qint64 HttpConnect::writeData(const char *data, qint64 maxSize)
 {
-    if(d->active)
+    if (d->active)
         return d->sock.write(data, maxSize);
     return 0;
 }
 
 qint64 HttpConnect::bytesToWrite() const
 {
-    if(d->active)
+    if (d->active)
         return d->sock.bytesToWrite();
     else
         return 0;
@@ -204,7 +196,7 @@ void HttpConnect::sock_connected()
     // connected, now send the request
     QString s;
     s += QString("CONNECT ") + d->real_host + ':' + QString::number(d->real_port) + " HTTP/1.0\r\n";
-    if(!d->user.isEmpty()) {
+    if (!d->user.isEmpty()) {
         QString str = d->user + ':' + d->pass;
         s += QString("Proxy-Authorization: Basic ") + QCA::Base64().encodeString(str) + "\r\n";
     }
@@ -221,18 +213,17 @@ void HttpConnect::sock_connected()
 
 void HttpConnect::sock_connectionClosed()
 {
-    if(d->active) {
+    if (d->active) {
         resetConnection();
         connectionClosed();
-    }
-    else {
+    } else {
         setError(ErrProxyNeg);
     }
 }
 
 void HttpConnect::sock_delayedCloseFinished()
 {
-    if(d->active) {
+    if (d->active) {
         resetConnection();
         delayedCloseFinished();
     }
@@ -242,17 +233,17 @@ void HttpConnect::sock_readyRead()
 {
     QByteArray block = d->sock.readAll();
 
-    if(!d->active) {
+    if (!d->active) {
         d->recvBuf += block;
 
-        if(d->inHeader) {
+        if (d->inHeader) {
             // grab available lines
-            while(1) {
-                bool found;
+            while (1) {
+                bool    found;
                 QString line = extractLine(&d->recvBuf, &found);
-                if(!found)
+                if (!found)
                     break;
-                if(line.isEmpty()) {
+                if (line.isEmpty()) {
                     d->inHeader = false;
                     break;
                 }
@@ -260,30 +251,30 @@ void HttpConnect::sock_readyRead()
             }
 
             // done with grabbing the header?
-            if(!d->inHeader) {
+            if (!d->inHeader) {
                 QString str = d->headerLines.first();
                 d->headerLines.takeFirst();
 
                 QString proto;
-                int code;
+                int     code;
                 QString msg;
-                if(!extractMainHeader(str, &proto, &code, &msg)) {
+                if (!extractMainHeader(str, &proto, &code, &msg)) {
 #ifdef PROX_DEBUG
                     fprintf(stderr, "HttpConnect: invalid header!\n");
 #endif
                     resetConnection(true);
                     setError(ErrProxyNeg);
                     return;
-                }
-                else {
+                } else {
 #ifdef PROX_DEBUG
-                    fprintf(stderr, "HttpConnect: header proto=[%s] code=[%d] msg=[%s]\n", qPrintable(proto), code, qPrintable(msg));
-                    for(QStringList::ConstIterator it = d->headerLines.begin(); it != d->headerLines.end(); ++it)
+                    fprintf(stderr, "HttpConnect: header proto=[%s] code=[%d] msg=[%s]\n", qPrintable(proto), code,
+                            qPrintable(msg));
+                    for (QStringList::ConstIterator it = d->headerLines.begin(); it != d->headerLines.end(); ++it)
                         fprintf(stderr, "HttpConnect: * [%s]\n", qPrintable(*it));
 #endif
                 }
 
-                if(code == 200) { // OK
+                if (code == 200) { // OK
 #ifdef PROX_DEBUG
                     fprintf(stderr, "HttpConnect: << Success >>\n");
 #endif
@@ -291,34 +282,29 @@ void HttpConnect::sock_readyRead()
                     setOpenMode(QIODevice::ReadWrite);
                     connected();
 
-                    if(!d->recvBuf.isEmpty()) {
+                    if (!d->recvBuf.isEmpty()) {
                         appendRead(d->recvBuf);
                         d->recvBuf.resize(0);
                         readyRead();
                         return;
                     }
-                }
-                else {
-                    int err;
+                } else {
+                    int     err;
                     QString errStr;
-                    if(code == 407) { // Authentication failed
-                        err = ErrProxyAuth;
+                    if (code == 407) { // Authentication failed
+                        err    = ErrProxyAuth;
                         errStr = tr("Authentication failed");
-                    }
-                    else if(code == 404) { // Host not found
-                        err = ErrHostNotFound;
+                    } else if (code == 404) { // Host not found
+                        err    = ErrHostNotFound;
                         errStr = tr("Host not found");
-                    }
-                    else if(code == 403) { // Access denied
-                        err = ErrProxyNeg;
+                    } else if (code == 403) { // Access denied
+                        err    = ErrProxyNeg;
                         errStr = tr("Access denied");
-                    }
-                    else if(code == 503) { // Connection refused
-                        err = ErrConnectionRefused;
+                    } else if (code == 503) { // Connection refused
+                        err    = ErrConnectionRefused;
                         errStr = tr("Connection refused");
-                    }
-                    else { // invalid reply
-                        err = ErrProxyNeg;
+                    } else { // invalid reply
+                        err    = ErrProxyNeg;
                         errStr = tr("Invalid reply");
                     }
 
@@ -331,8 +317,7 @@ void HttpConnect::sock_readyRead()
                 }
             }
         }
-    }
-    else {
+    } else {
         appendRead(block);
         readyRead();
         return;
@@ -341,31 +326,30 @@ void HttpConnect::sock_readyRead()
 
 void HttpConnect::sock_bytesWritten(qint64 x)
 {
-    if(d->toWrite > 0) {
+    if (d->toWrite > 0) {
         int size = x;
-        if(d->toWrite < x)
+        if (d->toWrite < x)
             size = d->toWrite;
         d->toWrite -= size;
         x -= size;
     }
 
-    if(d->active && x > 0)
+    if (d->active && x > 0)
         bytesWritten(x);
 }
 
 void HttpConnect::sock_error(int x)
 {
-    if(d->active) {
+    if (d->active) {
         resetConnection();
         setError(ErrRead);
-    }
-    else {
+    } else {
         resetConnection(true);
-        if(x == BSocket::ErrHostNotFound)
+        if (x == BSocket::ErrHostNotFound)
             setError(ErrProxyConnect);
-        else if(x == BSocket::ErrConnectionRefused)
+        else if (x == BSocket::ErrConnectionRefused)
             setError(ErrProxyConnect);
-        else if(x == BSocket::ErrRead)
+        else if (x == BSocket::ErrRead)
             setError(ErrProxyNeg);
     }
 }
diff --git a/src/irisnet/noncore/cutestuff/httpconnect.h b/src/irisnet/noncore/cutestuff/httpconnect.h
index 4039b61f..61ef8ed0 100644
--- a/src/irisnet/noncore/cutestuff/httpconnect.h
+++ b/src/irisnet/noncore/cutestuff/httpconnect.h
@@ -23,20 +23,20 @@
 #include "bytestream.h"
 
 // CS_NAMESPACE_BEGIN
-class HttpConnect : public ByteStream
-{
+class HttpConnect : public ByteStream {
     Q_OBJECT
 public:
     enum Error { ErrConnectionRefused = ErrCustom, ErrHostNotFound, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth };
-    HttpConnect(QObject *parent=nullptr);
+    HttpConnect(QObject *parent = nullptr);
     ~HttpConnect();
 
-    void setAuth(const QString &user, const QString &pass="");
+    void setAuth(const QString &user, const QString &pass = "");
     void connectToHost(const QString &proxyHost, int proxyPort, const QString &host, int port);
 
     // from ByteStream
-    void close();
+    void   close();
     qint64 bytesToWrite() const;
+
 protected:
     qint64 writeData(const char *data, qint64 maxSize);
 
@@ -55,7 +55,7 @@ private slots:
     class Private;
     Private *d;
 
-    void resetConnection(bool clear=false);
+    void resetConnection(bool clear = false);
 };
 
 // CS_NAMESPACE_END
diff --git a/src/irisnet/noncore/cutestuff/httppoll.cpp b/src/irisnet/noncore/cutestuff/httppoll.cpp
index 572e6bfa..54db6d04 100644
--- a/src/irisnet/noncore/cutestuff/httppoll.cpp
+++ b/src/irisnet/noncore/cutestuff/httppoll.cpp
@@ -28,7 +28,7 @@
 #include <qstringlist.h>
 #include <qtimer.h>
 #ifdef PROX_DEBUG
-#    include <stdio.h>
+#include <stdio.h>
 #endif
 #include <stdlib.h>
 
@@ -38,9 +38,9 @@
 static QByteArray randomArray(int size)
 {
     QByteArray a;
-  a.resize(size);
-    for(int n = 0; n < size; ++n)
-        a[n] = (char)(256.0*rand()/(RAND_MAX+1.0));
+    a.resize(size);
+    for (int n = 0; n < size; ++n)
+        a[n] = (char)(256.0 * rand() / (RAND_MAX + 1.0));
     return a;
 }
 
@@ -49,48 +49,43 @@ static QByteArray randomArray(int size)
 //----------------------------------------------------------------------------
 static QString hpk(int n, const QString &s)
 {
-    if(n == 0)
+    if (n == 0)
         return s;
     else
-        return QCA::Base64().arrayToString( QCA::Hash("sha1").hash( hpk(n - 1, s).toLatin1() ).toByteArray() );
+        return QCA::Base64().arrayToString(QCA::Hash("sha1").hash(hpk(n - 1, s).toLatin1()).toByteArray());
 }
 
-class HttpPoll::Private
-{
+class HttpPoll::Private {
 public:
-    Private(HttpPoll *_q) :
-        http(_q)
-    {
-    }
+    Private(HttpPoll *_q) : http(_q) {}
 
     HttpProxyPost http;
-    QString host;
-    int port;
-    QString user, pass;
-    QUrl url;
-    bool use_proxy;
+    QString       host;
+    int           port;
+    QString       user, pass;
+    QUrl          url;
+    bool          use_proxy;
 
     QByteArray out;
 
-    int state;
-    bool closing;
+    int     state;
+    bool    closing;
     QString ident;
 
     QTimer *t;
 
     QString key[POLL_KEYS];
-    int key_n;
+    int     key_n;
 
     int polltime;
 };
 
-HttpPoll::HttpPoll(QObject *parent)
-:ByteStream(parent)
+HttpPoll::HttpPoll(QObject *parent) : ByteStream(parent)
 {
     d = new Private(this);
 
     d->polltime = 30;
-    d->t = new QTimer(this);
+    d->t        = new QTimer(this);
     d->t->setSingleShot(true);
     connect(d->t, SIGNAL(timeout()), SLOT(do_sync()));
 
@@ -107,20 +102,17 @@ HttpPoll::~HttpPoll()
     delete d;
 }
 
-QAbstractSocket* HttpPoll::abstractSocket() const
-{
-    return d->http.abstractSocket();
-}
+QAbstractSocket *HttpPoll::abstractSocket() const { return d->http.abstractSocket(); }
 
 void HttpPoll::resetConnection(bool clear)
 {
-    if(d->http.isActive())
+    if (d->http.isActive())
         d->http.stop();
-    if(clear)
+    if (clear)
         clearReadBuffer();
     clearWriteBuffer();
     d->out.resize(0);
-    d->state = 0;
+    d->state   = 0;
     d->closing = false;
     d->t->stop();
 }
@@ -131,50 +123,46 @@ void HttpPoll::setAuth(const QString &user, const QString &pass)
     d->pass = pass;
 }
 
-void HttpPoll::connectToUrl(const QUrl &url)
-{
-    connectToHost("", 0, url);
-}
+void HttpPoll::connectToUrl(const QUrl &url) { connectToHost("", 0, url); }
 
 void HttpPoll::connectToHost(const QString &proxyHost, int proxyPort, const QUrl &url)
 {
     resetConnection(true);
 
     bool useSsl = false;
-    d->port = 80;
+    d->port     = 80;
     // using proxy?
-    if(!proxyHost.isEmpty()) {
-        d->host = proxyHost;
-        d->port = proxyPort;
-        d->url = url;
+    if (!proxyHost.isEmpty()) {
+        d->host      = proxyHost;
+        d->port      = proxyPort;
+        d->url       = url;
         d->use_proxy = true;
-    }
-    else {
+    } else {
         d->host = url.host();
-        if(url.port() != -1)
+        if (url.port() != -1)
             d->port = url.port();
         else if (url.scheme() == "https") {
             d->port = 443;
-            useSsl = true;
+            useSsl  = true;
         }
         d->url.setUrl(url.path() + "?" + url.query(QUrl::FullyEncoded), QUrl::StrictMode);
         d->use_proxy = false;
     }
 
     resetKey();
-    bool last;
+    bool    last;
     QString key = getKey(&last);
 
 #ifdef PROX_DEBUG
     fprintf(stderr, "HttpPoll: Connecting to %s:%d [%s]", d->host.latin1(), d->port, d->url.latin1());
-    if(d->user.isEmpty())
+    if (d->user.isEmpty())
         fprintf(stderr, "\n");
     else
         fprintf(stderr, ", auth {%s,%s}\n", d->user.latin1(), d->pass.latin1());
 #endif
     QPointer<QObject> self = this;
     syncStarted();
-    if(!self)
+    if (!self)
         return;
 
     d->state = 1;
@@ -183,49 +171,41 @@ void HttpPoll::connectToHost(const QString &proxyHost, int proxyPort, const QUrl
     d->http.post(d->host, d->port, d->url, makePacket("0", key, "", QByteArray()), d->use_proxy);
 }
 
-QByteArray HttpPoll::makePacket(const QString &ident, const QString &key, const QString &newkey, const QByteArray &block)
+QByteArray HttpPoll::makePacket(const QString &ident, const QString &key, const QString &newkey,
+                                const QByteArray &block)
 {
     QString str = ident;
-    if(!key.isEmpty()) {
+    if (!key.isEmpty()) {
         str += ';';
         str += key;
     }
-    if(!newkey.isEmpty()) {
+    if (!newkey.isEmpty()) {
         str += ';';
         str += newkey;
     }
     str += ',';
-    QByteArray cs = str.toLatin1();
-    int len = cs.length();
+    QByteArray cs  = str.toLatin1();
+    int        len = cs.length();
 
     QByteArray a;
-  a.resize(len + block.size());
+    a.resize(len + block.size());
     memcpy(a.data(), cs.data(), len);
     memcpy(a.data() + len, block.data(), block.size());
     return a;
 }
 
-int HttpPoll::pollInterval() const
-{
-    return d->polltime;
-}
+int HttpPoll::pollInterval() const { return d->polltime; }
 
-void HttpPoll::setPollInterval(int seconds)
-{
-    d->polltime = seconds;
-}
+void HttpPoll::setPollInterval(int seconds) { d->polltime = seconds; }
 
-bool HttpPoll::isOpen() const
-{
-    return (d->state == 2 ? true: false);
-}
+bool HttpPoll::isOpen() const { return (d->state == 2 ? true : false); }
 
 void HttpPoll::close()
 {
-    if(d->state == 0 || d->closing)
+    if (d->state == 0 || d->closing)
         return;
 
-    if(bytesToWrite() == 0)
+    if (bytesToWrite() == 0)
         resetConnection();
     else
         d->closing = true;
@@ -236,58 +216,56 @@ void HttpPoll::http_result()
     // check for death :)
     QPointer<QObject> self = this;
     syncFinished();
-    if(!self)
+    if (!self)
         return;
 
     // get id and packet
     QString id;
     QString cookie = d->http.getHeader("Set-Cookie");
-    int n = cookie.indexOf("ID=");
-    if(n == -1) {
+    int     n      = cookie.indexOf("ID=");
+    if (n == -1) {
         resetConnection();
         setError(ErrRead);
         return;
     }
     n += 3;
     int n2 = cookie.indexOf(';', n);
-    if(n2 != -1)
-        id = cookie.mid(n, n2-n);
+    if (n2 != -1)
+        id = cookie.mid(n, n2 - n);
     else
         id = cookie.mid(n);
     QByteArray block = d->http.body();
 
     // session error?
-    if(id.right(2) == ":0") {
-        if(id == "0:0" && d->state == 2) {
+    if (id.right(2) == ":0") {
+        if (id == "0:0" && d->state == 2) {
             resetConnection();
             connectionClosed();
             return;
-        }
-        else {
+        } else {
             resetConnection();
             setError(ErrRead);
             return;
         }
     }
 
-    d->ident = id;
+    d->ident              = id;
     bool justNowConnected = false;
-    if(d->state == 1) {
-        d->state = 2;
+    if (d->state == 1) {
+        d->state         = 2;
         justNowConnected = true;
     }
 
     // sync up again soon
-    if(bytesToWrite() > 0 || !d->closing) {
+    if (bytesToWrite() > 0 || !d->closing) {
         d->t->start(d->polltime * 1000);
-  }
+    }
 
     // connecting
-    if(justNowConnected) {
+    if (justNowConnected) {
         connected();
-    }
-    else {
-        if(!d->out.isEmpty()) {
+    } else {
+        if (!d->out.isEmpty()) {
             int x = d->out.size();
             d->out.resize(0);
             takeWrite(x);
@@ -295,22 +273,21 @@ void HttpPoll::http_result()
         }
     }
 
-    if(!self)
+    if (!self)
         return;
 
-    if(!block.isEmpty()) {
+    if (!block.isEmpty()) {
         appendRead(block);
         readyRead();
     }
 
-    if(!self)
+    if (!self)
         return;
 
-    if(bytesToWrite() > 0) {
+    if (bytesToWrite() > 0) {
         do_sync();
-    }
-    else {
-        if(d->closing) {
+    } else {
+        if (d->closing) {
             resetConnection();
             delayedCloseFinished();
             return;
@@ -321,46 +298,46 @@ void HttpPoll::http_result()
 void HttpPoll::http_error(int x)
 {
     resetConnection();
-    if(x == HttpProxyPost::ErrConnectionRefused)
+    if (x == HttpProxyPost::ErrConnectionRefused)
         setError(ErrConnectionRefused);
-    else if(x == HttpProxyPost::ErrHostNotFound)
+    else if (x == HttpProxyPost::ErrHostNotFound)
         setError(ErrHostNotFound);
-    else if(x == HttpProxyPost::ErrSocket)
+    else if (x == HttpProxyPost::ErrSocket)
         setError(ErrRead);
-    else if(x == HttpProxyPost::ErrProxyConnect)
+    else if (x == HttpProxyPost::ErrProxyConnect)
         setError(ErrProxyConnect);
-    else if(x == HttpProxyPost::ErrProxyNeg)
+    else if (x == HttpProxyPost::ErrProxyNeg)
         setError(ErrProxyNeg);
-    else if(x == HttpProxyPost::ErrProxyAuth)
+    else if (x == HttpProxyPost::ErrProxyAuth)
         setError(ErrProxyAuth);
 }
 
 int HttpPoll::tryWrite()
 {
-    if(!d->http.isActive())
+    if (!d->http.isActive())
         do_sync();
     return 0;
 }
 
 void HttpPoll::do_sync()
 {
-    if(d->http.isActive())
+    if (d->http.isActive())
         return;
 
     d->t->stop();
     d->out = takeWrite(0, false);
 
-    bool last;
+    bool    last;
     QString key = getKey(&last);
     QString newkey;
-    if(last) {
+    if (last) {
         resetKey();
         newkey = getKey(&last);
     }
 
     QPointer<QObject> self = this;
     syncStarted();
-    if(!self)
+    if (!self)
         return;
 
     d->http.post(d->host, d->port, d->url, makePacket(d->ident, key, newkey, d->out), d->use_proxy);
@@ -371,19 +348,19 @@ void HttpPoll::resetKey()
 #ifdef PROX_DEBUG
     fprintf(stderr, "HttpPoll: reset key!\n");
 #endif
-    QByteArray a = randomArray(64);
-    QString str = QString::fromLatin1(a.data(), a.size());
+    QByteArray a   = randomArray(64);
+    QString    str = QString::fromLatin1(a.data(), a.size());
 
     d->key_n = POLL_KEYS;
-    for(int n = 0; n < POLL_KEYS; ++n)
-        d->key[n] = hpk(n+1, str);
+    for (int n = 0; n < POLL_KEYS; ++n)
+        d->key[n] = hpk(n + 1, str);
 }
 
-const QString & HttpPoll::getKey(bool *last)
+const QString &HttpPoll::getKey(bool *last)
 {
     *last = false;
     --(d->key_n);
-    if(d->key_n == 0)
+    if (d->key_n == 0)
         *last = true;
     return d->key[d->key_n];
 }
@@ -395,8 +372,8 @@ static QString extractLine(QByteArray *buf, bool *found)
 {
     // scan for newline
     int n;
-    for(n = 0; n < (int)buf->size()-1; ++n) {
-        if(buf->at(n) == '\r' && buf->at(n+1) == '\n') {
+    for (n = 0; n < (int)buf->size() - 1; ++n) {
+        if (buf->at(n) == '\r' && buf->at(n + 1) == '\n') {
             QByteArray cstr;
             cstr.resize(n);
             memcpy(cstr.data(), buf->data(), n);
@@ -406,13 +383,13 @@ static QString extractLine(QByteArray *buf, bool *found)
             buf->resize(buf->size() - n);
             QString s = QString::fromUtf8(cstr);
 
-            if(found)
+            if (found)
                 *found = true;
             return s;
         }
     }
 
-    if(found)
+    if (found)
         *found = false;
     return "";
 }
@@ -420,51 +397,42 @@ static QString extractLine(QByteArray *buf, bool *found)
 static bool extractMainHeader(const QString &line, QString *proto, int *code, QString *msg)
 {
     int n = line.indexOf(' ');
-    if(n == -1)
+    if (n == -1)
         return false;
-    if(proto)
+    if (proto)
         *proto = line.mid(0, n);
     ++n;
     int n2 = line.indexOf(' ', n);
-    if(n2 == -1)
+    if (n2 == -1)
         return false;
-    if(code)
-        *code = line.mid(n, n2-n).toInt();
-    n = n2+1;
-    if(msg)
+    if (code)
+        *code = line.mid(n, n2 - n).toInt();
+    n = n2 + 1;
+    if (msg)
         *msg = line.mid(n);
     return true;
 }
 
-class HttpProxyPost::Private
-{
+class HttpProxyPost::Private {
 public:
-    Private(HttpProxyPost *_q) :
-        sock(_q),
-        tls(nullptr)
-    {
-    }
+    Private(HttpProxyPost *_q) : sock(_q), tls(nullptr) {}
 
-    ~Private()
-    {
-        delete tls;
-    }
+    ~Private() { delete tls; }
 
-    BSocket sock;
+    BSocket      sock;
     QHostAddress lastAddress;
-    QByteArray postdata, recvBuf, body;
-    QUrl url;
-    QString user, pass;
-    bool inHeader;
-    QStringList headerLines;
-    bool asProxy;
-    bool useSsl;
-    QString host;
-    QCA::TLS *tls;
+    QByteArray   postdata, recvBuf, body;
+    QUrl         url;
+    QString      user, pass;
+    bool         inHeader;
+    QStringList  headerLines;
+    bool         asProxy;
+    bool         useSsl;
+    QString      host;
+    QCA::TLS *   tls;
 };
 
-HttpProxyPost::HttpProxyPost(QObject *parent)
-:QObject(parent)
+HttpProxyPost::HttpProxyPost(QObject *parent) : QObject(parent)
 {
     d = new Private(this);
     connect(&d->sock, SIGNAL(connected()), SLOT(sock_connected()));
@@ -480,22 +448,16 @@ HttpProxyPost::~HttpProxyPost()
     delete d;
 }
 
-void HttpProxyPost::setUseSsl(bool state)
-{
-    d->useSsl = state;
-}
+void HttpProxyPost::setUseSsl(bool state) { d->useSsl = state; }
 
-QAbstractSocket* HttpProxyPost::abstractSocket() const
-{
-    return d->sock.abstractSocket();
-}
+QAbstractSocket *HttpProxyPost::abstractSocket() const { return d->sock.abstractSocket(); }
 
 void HttpProxyPost::resetConnection(bool clear)
 {
-    if(d->sock.state() != BSocket::Idle)
+    if (d->sock.state() != BSocket::Idle)
         d->sock.close();
     d->recvBuf.resize(0);
-    if(clear)
+    if (clear)
         d->body.resize(0);
 }
 
@@ -505,23 +467,20 @@ void HttpProxyPost::setAuth(const QString &user, const QString &pass)
     d->pass = pass;
 }
 
-bool HttpProxyPost::isActive() const
-{
-    return (d->sock.state() == BSocket::Idle ? false: true);
-}
+bool HttpProxyPost::isActive() const { return (d->sock.state() == BSocket::Idle ? false : true); }
 
 void HttpProxyPost::post(const QString &proxyHost, int proxyPort, const QUrl &url, const QByteArray &data, bool asProxy)
 {
     resetConnection(true);
 
-    d->host = proxyHost;
-    d->url = url;
+    d->host     = proxyHost;
+    d->url      = url;
     d->postdata = data;
-    d->asProxy = asProxy;
+    d->asProxy  = asProxy;
 
 #ifdef PROX_DEBUG
     fprintf(stderr, "HttpProxyPost: Connecting to %s:%d", proxyHost.latin1(), proxyPort);
-    if(d->user.isEmpty())
+    if (d->user.isEmpty())
         fprintf(stderr, "\n");
     else
         fprintf(stderr, ", auth {%s,%s}\n", d->user.latin1(), d->pass.latin1());
@@ -535,25 +494,19 @@ void HttpProxyPost::post(const QString &proxyHost, int proxyPort, const QUrl &ur
     }
 }
 
-void HttpProxyPost::stop()
-{
-    resetConnection();
-}
+void HttpProxyPost::stop() { resetConnection(); }
 
-QByteArray HttpProxyPost::body() const
-{
-    return d->body;
-}
+QByteArray HttpProxyPost::body() const { return d->body; }
 
 QString HttpProxyPost::getHeader(const QString &var) const
 {
     foreach (const QString &s, d->headerLines) {
         int n = s.indexOf(": ");
-        if(n == -1)
+        if (n == -1)
             continue;
         QString v = s.mid(0, n);
-        if(v.toLower() == var.toLower())
-            return s.mid(n+2);
+        if (v.toLower() == var.toLower())
+            return s.mid(n + 2);
     }
     return "";
 }
@@ -563,7 +516,7 @@ void HttpProxyPost::sock_connected()
 #ifdef PROX_DEBUG
     fprintf(stderr, "HttpProxyPost: Connected\n");
 #endif
-    if(d->useSsl) {
+    if (d->useSsl) {
         d->tls = new QCA::TLS(this);
         connect(d->tls, SIGNAL(readyRead()), SLOT(tls_readyRead()));
         connect(d->tls, SIGNAL(readyReadOutgoing()), SLOT(tls_readyReadOutgoing()));
@@ -572,7 +525,7 @@ void HttpProxyPost::sock_connected()
     }
 
     d->lastAddress = d->sock.peerAddress();
-    d->inHeader = true;
+    d->inHeader    = true;
     d->headerLines.clear();
 
     QUrl u = d->url;
@@ -580,22 +533,21 @@ void HttpProxyPost::sock_connected()
     // connected, now send the request
     QByteArray s;
     s += QByteArray("POST ") + d->url.toEncoded() + " HTTP/1.1\r\n";
-    if(d->asProxy) {
-        if(!d->user.isEmpty()) {
+    if (d->asProxy) {
+        if (!d->user.isEmpty()) {
             QByteArray str = d->user.toUtf8() + ':' + d->pass.toUtf8();
             s += QByteArray("Proxy-Authorization: Basic ") + str.toBase64() + "\r\n";
         }
         s += "Pragma: no-cache\r\n";
         s += QByteArray("Host: ") + u.host().toUtf8() + "\r\n";
-    }
-    else {
+    } else {
         s += QByteArray("Host: ") + d->host.toUtf8() + "\r\n";
     }
     s += "Content-Type: application/x-www-form-urlencoded\r\n";
     s += QByteArray("Content-Length: ") + QByteArray::number(d->postdata.size()) + "\r\n";
     s += "\r\n";
 
-    if(d->useSsl) {
+    if (d->useSsl) {
         // write request
         d->tls->write(s);
 
@@ -619,13 +571,13 @@ void HttpProxyPost::sock_connectionClosed()
 
 void HttpProxyPost::tls_readyRead()
 {
-    //printf("tls_readyRead\n");
+    // printf("tls_readyRead\n");
     processData(d->tls->read());
 }
 
 void HttpProxyPost::tls_readyReadOutgoing()
 {
-    //printf("tls_readyReadOutgoing\n");
+    // printf("tls_readyReadOutgoing\n");
     d->sock.write(d->tls->readOutgoing());
 }
 
@@ -641,7 +593,7 @@ void HttpProxyPost::tls_error()
 void HttpProxyPost::sock_readyRead()
 {
     QByteArray block = d->sock.readAll();
-    if(d->useSsl)
+    if (d->useSsl)
         d->tls->writeIncoming(block);
     else
         processData(block);
@@ -651,14 +603,14 @@ void HttpProxyPost::processData(const QByteArray &block)
 {
     d->recvBuf += block;
 
-    if(d->inHeader) {
+    if (d->inHeader) {
         // grab available lines
-        while(1) {
-            bool found;
+        while (1) {
+            bool    found;
             QString line = extractLine(&d->recvBuf, &found);
-            if(!found)
+            if (!found)
                 break;
-            if(line.isEmpty()) {
+            if (line.isEmpty()) {
                 d->inHeader = false;
                 break;
             }
@@ -666,55 +618,50 @@ void HttpProxyPost::processData(const QByteArray &block)
         }
 
         // done with grabbing the header?
-        if(!d->inHeader) {
+        if (!d->inHeader) {
             QString str = d->headerLines.first();
             d->headerLines.takeFirst();
 
             QString proto;
-            int code;
+            int     code;
             QString msg;
-            if(!extractMainHeader(str, &proto, &code, &msg)) {
+            if (!extractMainHeader(str, &proto, &code, &msg)) {
 #ifdef PROX_DEBUG
                 fprintf(stderr, "HttpProxyPost: invalid header!\n");
 #endif
                 resetConnection(true);
                 error(ErrProxyNeg);
                 return;
-            }
-            else {
+            } else {
 #ifdef PROX_DEBUG
-                fprintf(stderr, "HttpProxyPost: header proto=[%s] code=[%d] msg=[%s]\n", proto.latin1(), code, msg.latin1());
+                fprintf(stderr, "HttpProxyPost: header proto=[%s] code=[%d] msg=[%s]\n", proto.latin1(), code,
+                        msg.latin1());
                 foreach (const QString &s, d->headerLines)
                     fprintf(stderr, "HttpProxyPost: * [%s]\n", qPrintable(s));
 #endif
             }
 
-            if(code == 200) { // OK
+            if (code == 200) { // OK
 #ifdef PROX_DEBUG
                 fprintf(stderr, "HttpProxyPost: << Success >>\n");
 #endif
-            }
-            else {
-                int err;
+            } else {
+                int     err;
                 QString errStr;
-                if(code == 407) { // Authentication failed
-                    err = ErrProxyAuth;
+                if (code == 407) { // Authentication failed
+                    err    = ErrProxyAuth;
                     errStr = tr("Authentication failed");
-                }
-                else if(code == 404) { // Host not found
-                    err = ErrHostNotFound;
+                } else if (code == 404) { // Host not found
+                    err    = ErrHostNotFound;
                     errStr = tr("Host not found");
-                }
-                else if(code == 403) { // Access denied
-                    err = ErrProxyNeg;
+                } else if (code == 403) { // Access denied
+                    err    = ErrProxyNeg;
                     errStr = tr("Access denied");
-                }
-                else if(code == 503) { // Connection refused
-                    err = ErrConnectionRefused;
+                } else if (code == 503) { // Connection refused
+                    err    = ErrConnectionRefused;
                     errStr = tr("Connection refused");
-                }
-                else { // invalid reply
-                    err = ErrProxyNeg;
+                } else { // invalid reply
+                    err    = ErrProxyNeg;
                     errStr = tr("Invalid reply");
                 }
 
@@ -735,43 +682,38 @@ void HttpProxyPost::sock_error(int x)
     fprintf(stderr, "HttpProxyPost: socket error: %d\n", x);
 #endif
     resetConnection(true);
-    if(x == BSocket::ErrHostNotFound)
+    if (x == BSocket::ErrHostNotFound)
         error(ErrProxyConnect);
-    else if(x == BSocket::ErrConnectionRefused)
+    else if (x == BSocket::ErrConnectionRefused)
         error(ErrProxyConnect);
-    else if(x == BSocket::ErrRead)
+    else if (x == BSocket::ErrRead)
         error(ErrProxyNeg);
 }
 
 //----------------------------------------------------------------------------
 // HttpProxyGetStream
 //----------------------------------------------------------------------------
-class HttpProxyGetStream::Private
-{
+class HttpProxyGetStream::Private {
 public:
-    Private(HttpProxyGetStream *_q) :
-        sock(_q)
-    {
-    }
+    Private(HttpProxyGetStream *_q) : sock(_q) {}
 
-    BSocket sock;
-    QByteArray recvBuf;
-    QString url;
-    QString user, pass;
-    bool inHeader;
+    BSocket     sock;
+    QByteArray  recvBuf;
+    QString     url;
+    QString     user, pass;
+    bool        inHeader;
     QStringList headerLines;
-    bool use_ssl;
-    bool asProxy;
-    QString host;
-    int length;
+    bool        use_ssl;
+    bool        asProxy;
+    QString     host;
+    int         length;
 
     QCA::TLS *tls;
 };
 
-HttpProxyGetStream::HttpProxyGetStream(QObject *parent)
-:QObject(parent)
+HttpProxyGetStream::HttpProxyGetStream(QObject *parent) : QObject(parent)
 {
-    d = new Private(this);
+    d      = new Private(this);
     d->tls = nullptr;
     connect(&d->sock, SIGNAL(connected()), SLOT(sock_connected()));
     connect(&d->sock, SIGNAL(connectionClosed()), SLOT(sock_connectionClosed()));
@@ -788,14 +730,14 @@ HttpProxyGetStream::~HttpProxyGetStream()
 
 void HttpProxyGetStream::resetConnection(bool /*clear*/)
 {
-    if(d->tls) {
+    if (d->tls) {
         delete d->tls;
         d->tls = nullptr;
     }
-    if(d->sock.state() != BSocket::Idle)
+    if (d->sock.state() != BSocket::Idle)
         d->sock.close();
     d->recvBuf.resize(0);
-    //if(clear)
+    // if(clear)
     //    d->body.resize(0);
     d->length = -1;
 }
@@ -806,23 +748,20 @@ void HttpProxyGetStream::setAuth(const QString &user, const QString &pass)
     d->pass = pass;
 }
 
-bool HttpProxyGetStream::isActive() const
-{
-    return (d->sock.state() == BSocket::Idle ? false: true);
-}
+bool HttpProxyGetStream::isActive() const { return (d->sock.state() == BSocket::Idle ? false : true); }
 
 void HttpProxyGetStream::get(const QString &proxyHost, int proxyPort, const QString &url, bool ssl, bool asProxy)
 {
     resetConnection(true);
 
-    d->host = proxyHost;
-    d->url = url;
+    d->host    = proxyHost;
+    d->url     = url;
     d->use_ssl = ssl;
     d->asProxy = asProxy;
 
 #ifdef PROX_DEBUG
     fprintf(stderr, "HttpProxyGetStream: Connecting to %s:%d", proxyHost.latin1(), proxyPort);
-    if(d->user.isEmpty())
+    if (d->user.isEmpty())
         fprintf(stderr, "\n");
     else
         fprintf(stderr, ", auth {%s,%s}\n", d->user.latin1(), d->pass.latin1());
@@ -830,35 +769,29 @@ void HttpProxyGetStream::get(const QString &proxyHost, int proxyPort, const QStr
     d->sock.connectToHost(proxyHost, proxyPort);
 }
 
-void HttpProxyGetStream::stop()
-{
-    resetConnection();
-}
+void HttpProxyGetStream::stop() { resetConnection(); }
 
 QString HttpProxyGetStream::getHeader(const QString &var) const
 {
     foreach (const QString &s, d->headerLines) {
         int n = s.indexOf(": ");
-        if(n == -1)
+        if (n == -1)
             continue;
         QString v = s.mid(0, n);
-        if(v.toLower() == var.toLower())
-            return s.mid(n+2);
+        if (v.toLower() == var.toLower())
+            return s.mid(n + 2);
     }
     return "";
 }
 
-int HttpProxyGetStream::length() const
-{
-    return d->length;
-}
+int HttpProxyGetStream::length() const { return d->length; }
 
 void HttpProxyGetStream::sock_connected()
 {
 #ifdef PROX_DEBUG
     fprintf(stderr, "HttpProxyGetStream: Connected\n");
 #endif
-    if(d->use_ssl) {
+    if (d->use_ssl) {
         d->tls = new QCA::TLS(this);
         connect(d->tls, SIGNAL(readyRead()), SLOT(tls_readyRead()));
         connect(d->tls, SIGNAL(readyReadOutgoing()), SLOT(tls_readyReadOutgoing()));
@@ -874,21 +807,20 @@ void HttpProxyGetStream::sock_connected()
     // connected, now send the request
     QString s;
     s += QString("GET ") + d->url + " HTTP/1.0\r\n";
-    if(d->asProxy) {
-        if(!d->user.isEmpty()) {
+    if (d->asProxy) {
+        if (!d->user.isEmpty()) {
             QString str = d->user + ':' + d->pass;
             s += QString("Proxy-Authorization: Basic ") + QCA::Base64().encodeString(str) + "\r\n";
         }
         s += "Pragma: no-cache\r\n";
         s += QString("Host: ") + u.host() + "\r\n";
-    }
-    else {
+    } else {
         s += QString("Host: ") + d->host + "\r\n";
     }
     s += "\r\n";
 
     // write request
-    if(d->use_ssl)
+    if (d->use_ssl)
         d->tls->write(s.toUtf8());
     else
         d->sock.write(s.toUtf8());
@@ -896,7 +828,7 @@ void HttpProxyGetStream::sock_connected()
 
 void HttpProxyGetStream::sock_connectionClosed()
 {
-    //d->body = d->recvBuf;
+    // d->body = d->recvBuf;
     resetConnection();
     emit finished();
 }
@@ -905,7 +837,7 @@ void HttpProxyGetStream::sock_readyRead()
 {
     QByteArray block = d->sock.readAll();
 
-    if(d->use_ssl)
+    if (d->use_ssl)
         d->tls->writeIncoming(block);
     else
         processData(block);
@@ -914,21 +846,21 @@ void HttpProxyGetStream::sock_readyRead()
 void HttpProxyGetStream::processData(const QByteArray &block)
 {
     printf("processData: %d bytes\n", block.size());
-    if(!d->inHeader) {
+    if (!d->inHeader) {
         emit dataReady(block);
         return;
     }
 
     d->recvBuf += block;
 
-    if(d->inHeader) {
+    if (d->inHeader) {
         // grab available lines
-        while(1) {
-            bool found;
+        while (1) {
+            bool    found;
             QString line = extractLine(&d->recvBuf, &found);
-            if(!found)
+            if (!found)
                 break;
-            if(line.isEmpty()) {
+            if (line.isEmpty()) {
                 printf("empty line\n");
                 d->inHeader = false;
                 break;
@@ -938,65 +870,60 @@ void HttpProxyGetStream::processData(const QByteArray &block)
         }
 
         // done with grabbing the header?
-        if(!d->inHeader) {
+        if (!d->inHeader) {
             QString str = d->headerLines.first();
             d->headerLines.takeFirst();
 
             QString proto;
-            int code;
+            int     code;
             QString msg;
-            if(!extractMainHeader(str, &proto, &code, &msg)) {
+            if (!extractMainHeader(str, &proto, &code, &msg)) {
 #ifdef PROX_DEBUG
                 fprintf(stderr, "HttpProxyGetStream: invalid header!\n");
 #endif
                 resetConnection(true);
                 error(ErrProxyNeg);
                 return;
-            }
-            else {
+            } else {
 #ifdef PROX_DEBUG
-                fprintf(stderr, "HttpProxyGetStream: header proto=[%s] code=[%d] msg=[%s]\n", proto.latin1(), code, msg.latin1());
+                fprintf(stderr, "HttpProxyGetStream: header proto=[%s] code=[%d] msg=[%s]\n", proto.latin1(), code,
+                        msg.latin1());
                 foreach (const QString &s, d->headerLines)
                     fprintf(stderr, "HttpProxyGetStream: * [%s]\n", qPrintable(s));
 #endif
             }
 
-            if(code == 200) { // OK
+            if (code == 200) { // OK
 #ifdef PROX_DEBUG
                 fprintf(stderr, "HttpProxyGetStream: << Success >>\n");
 #endif
 
                 bool ok;
-                int x = getHeader("Content-Length").toInt(&ok);
-                if(ok)
+                int  x = getHeader("Content-Length").toInt(&ok);
+                if (ok)
                     d->length = x;
 
                 QPointer<QObject> self = this;
-                emit handshaken();
-                if(!self)
+                emit              handshaken();
+                if (!self)
                     return;
-            }
-            else {
-                int err;
+            } else {
+                int     err;
                 QString errStr;
-                if(code == 407) { // Authentication failed
-                    err = ErrProxyAuth;
+                if (code == 407) { // Authentication failed
+                    err    = ErrProxyAuth;
                     errStr = tr("Authentication failed");
-                }
-                else if(code == 404) { // Host not found
-                    err = ErrHostNotFound;
+                } else if (code == 404) { // Host not found
+                    err    = ErrHostNotFound;
                     errStr = tr("Host not found");
-                }
-                else if(code == 403) { // Access denied
-                    err = ErrProxyNeg;
+                } else if (code == 403) { // Access denied
+                    err    = ErrProxyNeg;
                     errStr = tr("Access denied");
-                }
-                else if(code == 503) { // Connection refused
-                    err = ErrConnectionRefused;
+                } else if (code == 503) { // Connection refused
+                    err    = ErrConnectionRefused;
                     errStr = tr("Connection refused");
-                }
-                else { // invalid reply
-                    err = ErrProxyNeg;
+                } else { // invalid reply
+                    err    = ErrProxyNeg;
                     errStr = tr("Invalid reply");
                 }
 
@@ -1008,7 +935,7 @@ void HttpProxyGetStream::processData(const QByteArray &block)
                 return;
             }
 
-            if(!d->recvBuf.isEmpty()) {
+            if (!d->recvBuf.isEmpty()) {
                 QByteArray a = d->recvBuf;
                 d->recvBuf.clear();
                 emit dataReady(a);
@@ -1023,23 +950,23 @@ void HttpProxyGetStream::sock_error(int x)
     fprintf(stderr, "HttpProxyGetStream: socket error: %d\n", x);
 #endif
     resetConnection(true);
-    if(x == BSocket::ErrHostNotFound)
+    if (x == BSocket::ErrHostNotFound)
         error(ErrProxyConnect);
-    else if(x == BSocket::ErrConnectionRefused)
+    else if (x == BSocket::ErrConnectionRefused)
         error(ErrProxyConnect);
-    else if(x == BSocket::ErrRead)
+    else if (x == BSocket::ErrRead)
         error(ErrProxyNeg);
 }
 
 void HttpProxyGetStream::tls_readyRead()
 {
-    //printf("tls_readyRead\n");
+    // printf("tls_readyRead\n");
     processData(d->tls->read());
 }
 
 void HttpProxyGetStream::tls_readyReadOutgoing()
 {
-    //printf("tls_readyReadOutgoing\n");
+    // printf("tls_readyReadOutgoing\n");
     d->sock.write(d->tls->readOutgoing());
 }
 
diff --git a/src/irisnet/noncore/cutestuff/httppoll.h b/src/irisnet/noncore/cutestuff/httppoll.h
index db10005c..36ba95fc 100644
--- a/src/irisnet/noncore/cutestuff/httppoll.h
+++ b/src/irisnet/noncore/cutestuff/httppoll.h
@@ -25,21 +25,20 @@
 class QUrl;
 
 // CS_NAMESPACE_BEGIN
-class HttpPoll : public ByteStream
-{
+class HttpPoll : public ByteStream {
     Q_OBJECT
 public:
     enum Error { ErrConnectionRefused = ErrCustom, ErrHostNotFound, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth };
-    HttpPoll(QObject *parent=nullptr);
+    HttpPoll(QObject *parent = nullptr);
     ~HttpPoll();
 
-    virtual QAbstractSocket* abstractSocket() const;
+    virtual QAbstractSocket *abstractSocket() const;
 
-    void setAuth(const QString &user, const QString &pass="");
+    void setAuth(const QString &user, const QString &pass = "");
     void connectToUrl(const QUrl &url);
     void connectToHost(const QString &proxyHost, int proxyPort, const QUrl &url);
 
-    int pollInterval() const;
+    int  pollInterval() const;
     void setPollInterval(int seconds);
 
     // from ByteStream
@@ -63,29 +62,28 @@ private slots:
     class Private;
     Private *d;
 
-    void resetConnection(bool clear=false);
-    QByteArray makePacket(const QString &ident, const QString &key, const QString &newkey, const QByteArray &block);
-    void resetKey();
-    const QString & getKey(bool *);
+    void           resetConnection(bool clear = false);
+    QByteArray     makePacket(const QString &ident, const QString &key, const QString &newkey, const QByteArray &block);
+    void           resetKey();
+    const QString &getKey(bool *);
 };
 
-class HttpProxyPost : public QObject
-{
+class HttpProxyPost : public QObject {
     Q_OBJECT
 public:
     enum Error { ErrConnectionRefused, ErrHostNotFound, ErrSocket, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth };
-    HttpProxyPost(QObject *parent=nullptr);
+    HttpProxyPost(QObject *parent = nullptr);
     ~HttpProxyPost();
 
-    QAbstractSocket* abstractSocket() const;
+    QAbstractSocket *abstractSocket() const;
 
     void setUseSsl(bool state);
-    void setAuth(const QString &user, const QString &pass="");
+    void setAuth(const QString &user, const QString &pass = "");
     bool isActive() const;
-    void post(const QString &proxyHost, int proxyPort, const QUrl &url, const QByteArray &data, bool asProxy=true);
+    void post(const QString &proxyHost, int proxyPort, const QUrl &url, const QByteArray &data, bool asProxy = true);
     void stop();
     QByteArray body() const;
-    QString getHeader(const QString &) const;
+    QString    getHeader(const QString &) const;
 
 signals:
     void result();
@@ -104,24 +102,23 @@ private slots:
     class Private;
     Private *d;
 
-    void resetConnection(bool clear=false);
+    void resetConnection(bool clear = false);
     void processData(const QByteArray &block);
 };
 
-class HttpProxyGetStream : public QObject
-{
+class HttpProxyGetStream : public QObject {
     Q_OBJECT
 public:
     enum Error { ErrConnectionRefused, ErrHostNotFound, ErrSocket, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth };
-    HttpProxyGetStream(QObject *parent=nullptr);
+    HttpProxyGetStream(QObject *parent = nullptr);
     ~HttpProxyGetStream();
 
-    void setAuth(const QString &user, const QString &pass="");
-    bool isActive() const;
-    void get(const QString &proxyHost, int proxyPort, const QString &url, bool ssl=false, bool asProxy=false);
-    void stop();
+    void    setAuth(const QString &user, const QString &pass = "");
+    bool    isActive() const;
+    void    get(const QString &proxyHost, int proxyPort, const QString &url, bool ssl = false, bool asProxy = false);
+    void    stop();
     QString getHeader(const QString &) const;
-    int length() const; // -1 for unknown
+    int     length() const; // -1 for unknown
 
 signals:
     void handshaken();
@@ -143,7 +140,7 @@ private slots:
     class Private;
     Private *d;
 
-    void resetConnection(bool clear=false);
+    void resetConnection(bool clear = false);
     void processData(const QByteArray &block);
 };
 
diff --git a/src/irisnet/noncore/cutestuff/socks.cpp b/src/irisnet/noncore/cutestuff/socks.cpp
index 41ad6b33..0f754e41 100644
--- a/src/irisnet/noncore/cutestuff/socks.cpp
+++ b/src/irisnet/noncore/cutestuff/socks.cpp
@@ -50,26 +50,25 @@
 // SocksUDP
 //----------------------------------------------------------------------------
 
-class SocksUDP::Private
-{
+class SocksUDP::Private {
 public:
-    QUdpSocket *sd;
+    QUdpSocket * sd;
     SocksClient *sc;
     QHostAddress routeAddr;
-    int routePort;
-    QString host;
-    int port;
+    int          routePort;
+    QString      host;
+    int          port;
 };
 
-SocksUDP::SocksUDP(SocksClient *sc, const QString &host, int port, const QHostAddress &routeAddr, int routePort)
-:QObject(sc)
+SocksUDP::SocksUDP(SocksClient *sc, const QString &host, int port, const QHostAddress &routeAddr, int routePort) :
+    QObject(sc)
 {
-    d = new Private;
+    d     = new Private;
     d->sc = sc;
     d->sd = new QUdpSocket(this);
     connect(d->sd, SIGNAL(readyRead()), SLOT(sd_readyRead()));
-    d->host = host;
-    d->port = port;
+    d->host      = host;
+    d->port      = port;
     d->routeAddr = routeAddr;
     d->routePort = routePort;
 }
@@ -86,10 +85,7 @@ void SocksUDP::change(const QString &host, int port)
     d->port = port;
 }
 
-void SocksUDP::write(const QByteArray &data)
-{
-    d->sd->writeDatagram(data, d->routeAddr, d->routePort);
-}
+void SocksUDP::write(const QByteArray &data) { d->sd->writeDatagram(data, d->routeAddr, d->routePort); }
 
 void SocksUDP::sd_activated()
 {
@@ -104,13 +100,13 @@ void SocksUDP::sd_activated()
 //----------------------------------------------------------------------------
 // SocksClient
 //----------------------------------------------------------------------------
-#define REQ_CONNECT      0x01
-#define REQ_BIND         0x02
+#define REQ_CONNECT 0x01
+#define REQ_BIND 0x02
 #define REQ_UDPASSOCIATE 0x03
 
-#define RET_SUCCESS      0x00
-#define RET_UNREACHABLE  0x04
-#define RET_CONNREFUSED  0x05
+#define RET_SUCCESS 0x00
+#define RET_UNREACHABLE 0x04
+#define RET_CONNREFUSED 0x05
 
 // spc = socks packet client
 // sps = socks packet server
@@ -121,7 +117,7 @@ void SocksUDP::sd_activated()
 static QByteArray spc_set_version(bool hasCreds)
 {
     QByteArray ver;
-    ver.resize(hasCreds? 4 : 3);
+    ver.resize(hasCreds ? 4 : 3);
     ver[0] = 0x05; // socks version 5
     ver[2] = 0x00; // no-auth
     if (hasCreds) {
@@ -142,46 +138,44 @@ static QByteArray sps_set_version(int method)
     return ver;
 }
 
-struct SPCS_VERSION
-{
+struct SPCS_VERSION {
     unsigned char version;
-    QByteArray methodList;
+    QByteArray    methodList;
 };
 
 static int spc_get_version(QByteArray &from, SPCS_VERSION *s)
 {
-    if(from.size() < 1)
+    if (from.size() < 1)
         return 0;
-    if(from.at(0) != 0x05) // only SOCKS5 supported
+    if (from.at(0) != 0x05) // only SOCKS5 supported
         return -1;
-    if(from.size() < 2)
+    if (from.size() < 2)
         return 0;
     unsigned char mlen = from.at(1);
-    int num = mlen;
-    if(num > 16) // who the heck has over 16 auth methods??
+    int           num  = mlen;
+    if (num > 16) // who the heck has over 16 auth methods??
         return -1;
-    if(from.size() < 2 + num)
+    if (from.size() < 2 + num)
         return 0;
-    QByteArray a = ByteStream::takeArray(from, 2+num);
-    s->version = a[0];
+    QByteArray a = ByteStream::takeArray(from, 2 + num);
+    s->version   = a[0];
     s->methodList.resize(num);
     memcpy(s->methodList.data(), a.data() + 2, num);
     return 1;
 }
 
-struct SPSS_VERSION
-{
+struct SPSS_VERSION {
     unsigned char version;
     unsigned char method;
 };
 
 static int sps_get_version(QByteArray &from, SPSS_VERSION *s)
 {
-    if(from.size() < 2)
+    if (from.size() < 2)
         return 0;
     QByteArray a = ByteStream::takeArray(from, 2);
-    s->version = a[0];
-    s->method = a[1];
+    s->version   = a[0];
+    s->method    = a[1];
     return 1;
 }
 
@@ -190,16 +184,16 @@ static QByteArray spc_set_authUsername(const QByteArray &user, const QByteArray
 {
     int len1 = user.length();
     int len2 = pass.length();
-    if(len1 > 255)
+    if (len1 > 255)
         len1 = 255;
-    if(len2 > 255)
+    if (len2 > 255)
         len2 = 255;
     QByteArray a;
-    a.resize(1+1+len1+1+len2);
+    a.resize(1 + 1 + len1 + 1 + len2);
     a[0] = 0x01; // username auth version 1
     a[1] = len1;
     memcpy(a.data() + 2, user.data(), len1);
-    a[2+len1] = len2;
+    a[2 + len1] = len2;
     memcpy(a.data() + 3 + len1, pass.data(), len2);
     return a;
 }
@@ -213,80 +207,78 @@ static QByteArray sps_set_authUsername(bool success)
     return a;
 }
 
-struct SPCS_AUTHUSERNAME
-{
+struct SPCS_AUTHUSERNAME {
     QString user, pass;
 };
 
 static int spc_get_authUsername(QByteArray &from, SPCS_AUTHUSERNAME *s)
 {
-    if(from.size() < 1)
+    if (from.size() < 1)
         return 0;
     unsigned char ver = from.at(0);
-    if(ver != 0x01)
+    if (ver != 0x01)
         return -1;
-    if(from.size() < 2)
+    if (from.size() < 2)
         return 0;
     unsigned char ulen = from.at(1);
-    if((int)from.size() < ulen + 3)
+    if ((int)from.size() < ulen + 3)
         return 0;
-    unsigned char plen = from.at(ulen+2);
-    if((int)from.size() < ulen + plen + 3)
+    unsigned char plen = from.at(ulen + 2);
+    if ((int)from.size() < ulen + plen + 3)
         return 0;
     QByteArray a = ByteStream::takeArray(from, ulen + plen + 3);
 
     QByteArray user, pass;
     user.resize(ulen);
     pass.resize(plen);
-    memcpy(user.data(), a.data()+2, ulen);
-    memcpy(pass.data(), a.data()+ulen+3, plen);
+    memcpy(user.data(), a.data() + 2, ulen);
+    memcpy(pass.data(), a.data() + ulen + 3, plen);
     s->user = QString::fromUtf8(user);
     s->pass = QString::fromUtf8(pass);
     return 1;
 }
 
-struct SPSS_AUTHUSERNAME
-{
+struct SPSS_AUTHUSERNAME {
     unsigned char version;
-    bool success;
+    bool          success;
 };
 
 static int sps_get_authUsername(QByteArray &from, SPSS_AUTHUSERNAME *s)
 {
-    if(from.size() < 2)
+    if (from.size() < 2)
         return 0;
     QByteArray a = ByteStream::takeArray(from, 2);
-    s->version = a[0];
-    s->success = ((char) a[1] == 0 ? true: false);
+    s->version   = a[0];
+    s->success   = ((char)a[1] == 0 ? true : false);
     return 1;
 }
 
 // connectRequest
 static QByteArray sp_set_request(const QHostAddress &addr, unsigned short port, unsigned char cmd1)
 {
-    int at = 0;
+    int        at = 0;
     QByteArray a;
     a.resize(4);
     a[at++] = 0x05; // socks version 5
     a[at++] = cmd1;
     a[at++] = 0x00; // reserved
-    if(addr.protocol() == QAbstractSocket::IPv4Protocol || addr.protocol() == QAbstractSocket::UnknownNetworkLayerProtocol) {
-        a[at++] = 0x01; // address type = ipv4
+    if (addr.protocol() == QAbstractSocket::IPv4Protocol
+        || addr.protocol() == QAbstractSocket::UnknownNetworkLayerProtocol) {
+        a[at++]     = 0x01; // address type = ipv4
         quint32 ip4 = htonl(addr.toIPv4Address());
-        a.resize(at+4);
+        a.resize(at + 4);
         memcpy(a.data() + at, &ip4, 4);
         at += 4;
-    }
-    else {
-        a[at++] = 0x04;
+    } else {
+        a[at++]        = 0x04;
         Q_IPV6ADDR ip6 = addr.toIPv6Address();
-        a.resize(at+16);
-        for(int i = 0; i < 16; ++i)
+        a.resize(at + 16);
+        for (int i = 0; i < 16; ++i)
             a[at++] = ip6[i];
     }
 
     // port
-    a.resize(at+2);
+    a.resize(at + 2);
     quint16 p = htons(port);
     memcpy(a.data() + at, &p, 2);
 
@@ -297,15 +289,15 @@ static QByteArray sp_set_request(const QString &host, quint16 port, unsigned cha
 {
     // detect for IP addresses
     QHostAddress addr;
-    if(addr.setAddress(host))
+    if (addr.setAddress(host))
         return sp_set_request(addr, port, cmd1);
 
     QByteArray h = host.toUtf8();
     h.truncate(255);
-    h = QString::fromUtf8(h).toUtf8(); // delete any partial characters?
+    h        = QString::fromUtf8(h).toUtf8(); // delete any partial characters?
     int hlen = h.length();
 
-    int at = 0;
+    int        at = 0;
     QByteArray a;
     a.resize(4);
     a[at++] = 0x05; // socks version 5
@@ -314,63 +306,60 @@ static QByteArray sp_set_request(const QString &host, quint16 port, unsigned cha
     a[at++] = 0x03; // address type = domain
 
     // host
-    a.resize(at+hlen+1);
+    a.resize(at + hlen + 1);
     a[at++] = hlen;
     memcpy(a.data() + at, h.data(), hlen);
     at += hlen;
 
     // port
-    a.resize(at+2);
+    a.resize(at + 2);
     unsigned short p = htons(port);
     memcpy(a.data() + at, &p, 2);
 
     return a;
 }
 
-struct SPS_CONNREQ
-{
+struct SPS_CONNREQ {
     unsigned char version;
     unsigned char cmd;
-    int address_type;
-    QString host;
-    QHostAddress addr;
-    quint16 port;
+    int           address_type;
+    QString       host;
+    QHostAddress  addr;
+    quint16       port;
 };
 
 static int sp_get_request(QByteArray &from, SPS_CONNREQ *s)
 {
     int full_len = 4;
-    if((int)from.size() < full_len)
+    if ((int)from.size() < full_len)
         return 0;
 
-    QString host;
-    QHostAddress addr;
+    QString       host;
+    QHostAddress  addr;
     unsigned char atype = from.at(3);
 
-    if(atype == 0x01) {
+    if (atype == 0x01) {
         full_len += 4;
-        if((int)from.size() < full_len)
+        if ((int)from.size() < full_len)
             return 0;
         quint32 ip4;
         memcpy(&ip4, from.data() + 4, 4);
         addr.setAddress(ntohl(ip4));
-    }
-    else if(atype == 0x03) {
+    } else if (atype == 0x03) {
         ++full_len;
-        if((int)from.size() < full_len)
+        if ((int)from.size() < full_len)
             return 0;
         unsigned char host_len = from.at(4);
         full_len += host_len;
-        if((int)from.size() < full_len)
+        if ((int)from.size() < full_len)
             return 0;
         QByteArray cs;
         cs.resize(host_len);
         memcpy(cs.data(), from.data() + 5, host_len);
         host = QString::fromLatin1(cs);
-    }
-    else if(atype == 0x04) {
+    } else if (atype == 0x04) {
         full_len += 16;
-        if((int)from.size() < full_len)
+        if ((int)from.size() < full_len)
             return 0;
         quint8 a6[16];
         memcpy(a6, from.data() + 4, 16);
@@ -378,7 +367,7 @@ static int sp_get_request(QByteArray &from, SPS_CONNREQ *s)
     }
 
     full_len += 2;
-    if((int)from.size() < full_len)
+    if ((int)from.size() < full_len)
         return 0;
 
     QByteArray a = ByteStream::takeArray(from, full_len);
@@ -386,63 +375,57 @@ static int sp_get_request(QByteArray &from, SPS_CONNREQ *s)
     quint16 p;
     memcpy(&p, a.data() + full_len - 2, 2);
 
-    s->version = a[0];
-    s->cmd = a[1];
+    s->version      = a[0];
+    s->cmd          = a[1];
     s->address_type = atype;
-    s->host = host;
-    s->addr = addr;
-    s->port = ntohs(p);
+    s->host         = host;
+    s->addr         = addr;
+    s->port         = ntohs(p);
 
     return 1;
 }
 
 enum { StepVersion, StepAuth, StepRequest };
 
-class SocksClient::Private
-{
+class SocksClient::Private {
 public:
-    Private(SocksClient *_q) :
-        sock(_q)
-    {
-    }
+    Private(SocksClient *_q) : sock(_q) {}
 
     BSocket sock;
     QString host;
-    int port;
+    int     port;
     QString user, pass;
     QString real_host;
-    int real_port;
+    int     real_port;
 
     QByteArray recvBuf;
-    int step;
-    int authMethod;
-    bool incoming, waiting;
+    int        step;
+    int        authMethod;
+    bool       incoming, waiting;
 
     QString rhost;
-    int rport;
+    int     rport;
 
     int pending;
 
-    bool udp;
+    bool    udp;
     QString udpAddr;
-    int udpPort;
+    int     udpPort;
 };
 
-SocksClient::SocksClient(QObject *parent)
-:ByteStream(parent)
+SocksClient::SocksClient(QObject *parent) : ByteStream(parent)
 {
     init();
 
     d->incoming = false;
 }
 
-SocksClient::SocksClient(QTcpSocket *s, QObject *parent)
-:ByteStream(parent)
+SocksClient::SocksClient(QTcpSocket *s, QObject *parent) : ByteStream(parent)
 {
     init();
 
     d->incoming = true;
-    d->waiting = true;
+    d->waiting  = true;
     d->sock.setSocket(s);
 }
 
@@ -465,20 +448,17 @@ SocksClient::~SocksClient()
     delete d;
 }
 
-QAbstractSocket* SocksClient::abstractSocket() const
-{
-    return d->sock.abstractSocket();
-}
+QAbstractSocket *SocksClient::abstractSocket() const { return d->sock.abstractSocket(); }
 
 void SocksClient::resetConnection(bool clear)
 {
-    if(d->sock.state() != BSocket::Idle)
+    if (d->sock.state() != BSocket::Idle)
         d->sock.close();
-    if(clear)
+    if (clear)
         clearReadBuffer();
     d->recvBuf.resize(0);
     d->waiting = false;
-    d->udp = false;
+    d->udp     = false;
     d->pending = 0;
     if (bytesAvailable()) {
         setOpenMode(QIODevice::ReadOnly);
@@ -487,10 +467,7 @@ void SocksClient::resetConnection(bool clear)
     }
 }
 
-bool SocksClient::isIncoming() const
-{
-    return d->incoming;
-}
+bool SocksClient::isIncoming() const { return d->incoming; }
 
 void SocksClient::setAuth(const QString &user, const QString &pass)
 {
@@ -502,15 +479,15 @@ void SocksClient::connectToHost(const QString &proxyHost, int proxyPort, const Q
 {
     resetConnection(true);
 
-    d->host = proxyHost;
-    d->port = proxyPort;
+    d->host      = proxyHost;
+    d->port      = proxyPort;
     d->real_host = host;
     d->real_port = port;
-    d->udp = udpMode;
+    d->udp       = udpMode;
 
 #ifdef PROX_DEBUG
     fprintf(stderr, "SocksClient: Connecting to %s:%d", qPrintable(proxyHost), proxyPort);
-    if(d->user.isEmpty())
+    if (d->user.isEmpty())
         fprintf(stderr, "\n");
     else
         fprintf(stderr, ", auth {%s,%s}\n", qPrintable(d->user), qPrintable(d->pass));
@@ -521,7 +498,7 @@ void SocksClient::connectToHost(const QString &proxyHost, int proxyPort, const Q
 void SocksClient::close()
 {
     d->sock.close();
-    if(d->sock.bytesToWrite() == 0)
+    if (d->sock.bytesToWrite() == 0)
         resetConnection();
 }
 
@@ -530,7 +507,7 @@ void SocksClient::writeData(const QByteArray &buf)
 #ifdef PROX_DEBUG
     // show hex
     fprintf(stderr, "SocksClient: client write { ");
-    for(int n = 0; n < (int)buf.size(); ++n)
+    for (int n = 0; n < (int)buf.size(); ++n)
         fprintf(stderr, "%02X ", (unsigned char)buf[n]);
     fprintf(stderr, " } \n");
 #endif
@@ -540,7 +517,7 @@ void SocksClient::writeData(const QByteArray &buf)
 
 qint64 SocksClient::writeData(const char *data, qint64 maxSize)
 {
-    if(isOpen() && !d->udp)
+    if (isOpen() && !d->udp)
         return d->sock.write(data, maxSize);
     return 0;
 }
@@ -554,14 +531,11 @@ qint64 SocksClient::readData(char *data, qint64 maxSize)
     return ret;
 }
 
-qint64 SocksClient::bytesAvailable() const
-{
-    return ByteStream::bytesAvailable();
-}
+qint64 SocksClient::bytesAvailable() const { return ByteStream::bytesAvailable(); }
 
 qint64 SocksClient::bytesToWrite() const
 {
-    if(isOpen())
+    if (isOpen())
         return d->sock.bytesToWrite();
     else
         return 0;
@@ -579,18 +553,17 @@ void SocksClient::sock_connected()
 
 void SocksClient::sock_connectionClosed()
 {
-    if(isOpen()) {
+    if (isOpen()) {
         resetConnection();
         emit connectionClosed();
-    }
-    else {
+    } else {
         setError(ErrProxyNeg);
     }
 }
 
 void SocksClient::sock_delayedCloseFinished()
 {
-    if(isOpen()) {
+    if (isOpen()) {
         resetConnection();
         delayedCloseFinished();
     }
@@ -600,16 +573,15 @@ void SocksClient::sock_readyRead()
 {
     QByteArray block = d->sock.readAll();
 
-    //qDebug() << this << "::sock_readyRead " << block.size() << " bytes." <<
+    // qDebug() << this << "::sock_readyRead " << block.size() << " bytes." <<
     //            "udp=" << d->udp << openMode();
-    if(!isOpen()) {
-        if(d->incoming)
+    if (!isOpen()) {
+        if (d->incoming)
             processIncoming(block);
         else
             processOutgoing(block);
-    }
-    else {
-        if(!d->udp) {
+    } else {
+        if (!d->udp) {
             appendRead(block);
             emit readyRead();
         }
@@ -621,22 +593,21 @@ void SocksClient::processOutgoing(const QByteArray &block)
 #ifdef PROX_DEBUG
     // show hex
     fprintf(stderr, "SocksClient: client recv { ");
-    for(int n = 0; n < (int)block.size(); ++n)
+    for (int n = 0; n < (int)block.size(); ++n)
         fprintf(stderr, "%02X ", (unsigned char)block[n]);
     fprintf(stderr, " } \n");
 #endif
     d->recvBuf += block;
 
-    if(d->step == StepVersion) {
+    if (d->step == StepVersion) {
         SPSS_VERSION s;
-        int r = sps_get_version(d->recvBuf, &s);
-        if(r == -1) {
+        int          r = sps_get_version(d->recvBuf, &s);
+        if (r == -1) {
             resetConnection(true);
             setError(ErrProxyNeg);
             return;
-        }
-        else if(r == 1) {
-            if(s.version != 0x05 || s.method == 0xff) {
+        } else if (r == 1) {
+            if (s.version != 0x05 || s.method == 0xff) {
 #ifdef PROX_DEBUG
                 fprintf(stderr, "SocksClient: Method selection failed\n");
 #endif
@@ -646,15 +617,13 @@ void SocksClient::processOutgoing(const QByteArray &block)
             }
 
             QString str;
-            if(s.method == 0x00) {
-                str = "None";
+            if (s.method == 0x00) {
+                str           = "None";
                 d->authMethod = AuthNone;
-            }
-            else if(s.method == 0x02) {
-                str = "Username/Password";
+            } else if (s.method == 0x02) {
+                str           = "Username/Password";
                 d->authMethod = AuthUsername;
-            }
-            else {
+            } else {
 #ifdef PROX_DEBUG
                 fprintf(stderr, "SocksClient: Server wants to use unknown method '%02x'\n", s.method);
 #endif
@@ -663,11 +632,10 @@ void SocksClient::processOutgoing(const QByteArray &block)
                 return;
             }
 
-            if(d->authMethod == AuthNone) {
+            if (d->authMethod == AuthNone) {
                 // no auth, go straight to the request
                 do_request();
-            }
-            else if(d->authMethod == AuthUsername) {
+            } else if (d->authMethod == AuthUsername) {
                 d->step = StepAuth;
 #ifdef PROX_DEBUG
                 fprintf(stderr, "SocksClient: Authenticating [Username] ...\n");
@@ -676,22 +644,21 @@ void SocksClient::processOutgoing(const QByteArray &block)
             }
         }
     }
-    if(d->step == StepAuth) {
-        if(d->authMethod == AuthUsername) {
+    if (d->step == StepAuth) {
+        if (d->authMethod == AuthUsername) {
             SPSS_AUTHUSERNAME s;
-            int r = sps_get_authUsername(d->recvBuf, &s);
-            if(r == -1) {
+            int               r = sps_get_authUsername(d->recvBuf, &s);
+            if (r == -1) {
                 resetConnection(true);
                 setError(ErrProxyNeg);
                 return;
-            }
-            else if(r == 1) {
-                if(s.version != 0x01) {
+            } else if (r == 1) {
+                if (s.version != 0x01) {
                     resetConnection(true);
                     setError(ErrProxyNeg);
                     return;
                 }
-                if(!s.success) {
+                if (!s.success) {
                     resetConnection(true);
                     setError(ErrProxyAuth);
                     return;
@@ -700,24 +667,22 @@ void SocksClient::processOutgoing(const QByteArray &block)
                 do_request();
             }
         }
-    }
-    else if(d->step == StepRequest) {
+    } else if (d->step == StepRequest) {
         SPS_CONNREQ s;
-        int r = sp_get_request(d->recvBuf, &s);
-        if(r == -1) {
+        int         r = sp_get_request(d->recvBuf, &s);
+        if (r == -1) {
             resetConnection(true);
             setError(ErrProxyNeg);
             return;
-        }
-        else if(r == 1) {
-            if(s.cmd != RET_SUCCESS) {
+        } else if (r == 1) {
+            if (s.cmd != RET_SUCCESS) {
 #ifdef PROX_DEBUG
                 fprintf(stderr, "SocksClient: client << Error >> [%02x]\n", s.cmd);
 #endif
                 resetConnection(true);
-                if(s.cmd == RET_UNREACHABLE)
+                if (s.cmd == RET_UNREACHABLE)
                     setError(ErrHostNotFound);
-                else if(s.cmd == RET_CONNREFUSED)
+                else if (s.cmd == RET_CONNREFUSED)
                     setError(ErrConnectionRefused);
                 else
                     setError(ErrProxyNeg);
@@ -727,8 +692,8 @@ void SocksClient::processOutgoing(const QByteArray &block)
 #ifdef PROX_DEBUG
             fprintf(stderr, "SocksClient: client << Success >>\n");
 #endif
-            if(d->udp) {
-                if(s.address_type == 0x03)
+            if (d->udp) {
+                if (s.address_type == 0x03)
                     d->udpAddr = s.host;
                 else
                     d->udpAddr = s.addr.toString();
@@ -740,10 +705,10 @@ void SocksClient::processOutgoing(const QByteArray &block)
             QPointer<QObject> self = this;
             setOpenMode(QIODevice::ReadWrite);
             emit connected();
-            if(!self)
+            if (!self)
                 return;
 
-            if(!d->recvBuf.isEmpty()) {
+            if (!d->recvBuf.isEmpty()) {
                 appendRead(d->recvBuf);
                 d->recvBuf.resize(0);
                 readyRead();
@@ -757,10 +722,10 @@ void SocksClient::do_request()
 #ifdef PROX_DEBUG
     fprintf(stderr, "SocksClient: Requesting ...\n");
 #endif
-    d->step = StepRequest;
-    int cmd = d->udp ? REQ_UDPASSOCIATE : REQ_CONNECT;
+    d->step        = StepRequest;
+    int        cmd = d->udp ? REQ_UDPASSOCIATE : REQ_CONNECT;
     QByteArray buf;
-    if(!d->real_host.isEmpty())
+    if (!d->real_host.isEmpty())
         buf = sp_set_request(d->real_host, d->real_port, cmd);
     else
         buf = sp_set_request(QHostAddress(), 0, cmd);
@@ -770,31 +735,29 @@ void SocksClient::do_request()
 void SocksClient::sock_bytesWritten(qint64 x)
 {
     int bytes = x;
-    if(d->pending >= bytes) {
+    if (d->pending >= bytes) {
         d->pending -= bytes;
         bytes = 0;
-    }
-    else {
+    } else {
         bytes -= d->pending;
         d->pending = 0;
     }
-    if(bytes > 0)
+    if (bytes > 0)
         bytesWritten(bytes);
 }
 
 void SocksClient::sock_error(int x)
 {
-    if(isOpen()) {
+    if (isOpen()) {
         resetConnection();
         setError(ErrRead);
-    }
-    else {
+    } else {
         resetConnection(true);
-        if(x == BSocket::ErrHostNotFound)
+        if (x == BSocket::ErrHostNotFound)
             setError(ErrProxyConnect);
-        else if(x == BSocket::ErrConnectionRefused)
+        else if (x == BSocket::ErrConnectionRefused)
             setError(ErrProxyConnect);
-        else if(x == BSocket::ErrRead)
+        else if (x == BSocket::ErrRead)
             setError(ErrProxyNeg);
     }
 }
@@ -802,7 +765,7 @@ void SocksClient::sock_error(int x)
 void SocksClient::serve()
 {
     d->waiting = false;
-    d->step = StepVersion;
+    d->step    = StepVersion;
     continueIncoming();
 }
 
@@ -811,84 +774,77 @@ void SocksClient::processIncoming(const QByteArray &block)
 #ifdef PROX_DEBUG
     // show hex
     fprintf(stderr, "SocksClient: server recv { ");
-    for(int n = 0; n < (int)block.size(); ++n)
+    for (int n = 0; n < (int)block.size(); ++n)
         fprintf(stderr, "%02X ", (unsigned char)block[n]);
     fprintf(stderr, " } \n");
 #endif
     d->recvBuf += block;
 
-    if(!d->waiting)
+    if (!d->waiting)
         continueIncoming();
 }
 
 void SocksClient::continueIncoming()
 {
-    if(d->recvBuf.isEmpty())
+    if (d->recvBuf.isEmpty())
         return;
 
-    if(d->step == StepVersion) {
+    if (d->step == StepVersion) {
         SPCS_VERSION s;
-        int r = spc_get_version(d->recvBuf, &s);
-        if(r == -1) {
+        int          r = spc_get_version(d->recvBuf, &s);
+        if (r == -1) {
             resetConnection(true);
             setError(ErrProxyNeg);
             return;
-        }
-        else if(r == 1) {
-            if(s.version != 0x05) {
+        } else if (r == 1) {
+            if (s.version != 0x05) {
                 resetConnection(true);
                 setError(ErrProxyNeg);
                 return;
             }
 
             int methods = 0;
-            for(int n = 0; n < (int)s.methodList.size(); ++n) {
+            for (int n = 0; n < (int)s.methodList.size(); ++n) {
                 unsigned char c = s.methodList[n];
-                if(c == 0x00)
+                if (c == 0x00)
                     methods |= AuthNone;
-                else if(c == 0x02)
+                else if (c == 0x02)
                     methods |= AuthUsername;
             }
             d->waiting = true;
             emit incomingMethods(methods);
         }
-    }
-    else if(d->step == StepAuth) {
+    } else if (d->step == StepAuth) {
         SPCS_AUTHUSERNAME s;
-        int r = spc_get_authUsername(d->recvBuf, &s);
-        if(r == -1) {
+        int               r = spc_get_authUsername(d->recvBuf, &s);
+        if (r == -1) {
             resetConnection(true);
             setError(ErrProxyNeg);
             return;
-        }
-        else if(r == 1) {
+        } else if (r == 1) {
             d->waiting = true;
             incomingAuth(s.user, s.pass);
         }
-    }
-    else if(d->step == StepRequest) {
+    } else if (d->step == StepRequest) {
         SPS_CONNREQ s;
-        int r = sp_get_request(d->recvBuf, &s);
-        if(r == -1) {
+        int         r = sp_get_request(d->recvBuf, &s);
+        if (r == -1) {
             resetConnection(true);
             setError(ErrProxyNeg);
             return;
-        }
-        else if(r == 1) {
+        } else if (r == 1) {
             d->waiting = true;
-            if(s.cmd == REQ_CONNECT) {
-                if(!s.host.isEmpty())
+            if (s.cmd == REQ_CONNECT) {
+                if (!s.host.isEmpty())
                     d->rhost = s.host;
                 else
                     d->rhost = s.addr.toString();
                 d->rport = s.port;
                 QIODevice::open(QIODevice::ReadWrite);
                 incomingConnectRequest(d->rhost, d->rport);
-            }
-            else if(s.cmd == REQ_UDPASSOCIATE) {
+            } else if (s.cmd == REQ_UDPASSOCIATE) {
                 incomingUDPAssociateRequest();
-            }
-            else {
+            } else {
                 requestDeny();
                 return;
             }
@@ -898,17 +854,16 @@ void SocksClient::continueIncoming()
 
 void SocksClient::chooseMethod(int method)
 {
-    if(d->step != StepVersion || !d->waiting)
+    if (d->step != StepVersion || !d->waiting)
         return;
 
     unsigned char c;
-    if(method == AuthNone) {
+    if (method == AuthNone) {
         d->step = StepRequest;
-        c = 0x00;
-    }
-    else {
+        c       = 0x00;
+    } else {
         d->step = StepAuth;
-        c = 0x02;
+        c       = 0x02;
     }
 
     // version response
@@ -919,16 +874,16 @@ void SocksClient::chooseMethod(int method)
 
 void SocksClient::authGrant(bool b)
 {
-    if(d->step != StepAuth || !d->waiting)
+    if (d->step != StepAuth || !d->waiting)
         return;
 
-    if(b)
+    if (b)
         d->step = StepRequest;
 
     // auth response
     d->waiting = false;
     writeData(sps_set_authUsername(b));
-    if(!b) {
+    if (!b) {
         resetConnection(true);
         return;
     }
@@ -937,7 +892,7 @@ void SocksClient::authGrant(bool b)
 
 void SocksClient::requestDeny()
 {
-    if(d->step != StepRequest || !d->waiting)
+    if (d->step != StepRequest || !d->waiting)
         return;
 
     // response
@@ -948,7 +903,7 @@ void SocksClient::requestDeny()
 
 void SocksClient::grantConnect()
 {
-    if(d->step != StepRequest || !d->waiting)
+    if (d->step != StepRequest || !d->waiting)
         return;
 
     // response
@@ -959,7 +914,7 @@ void SocksClient::grantConnect()
     fprintf(stderr, "SocksClient: server << Success >>\n");
 #endif
 
-    if(!d->recvBuf.isEmpty()) {
+    if (!d->recvBuf.isEmpty()) {
         appendRead(d->recvBuf);
         d->recvBuf.resize(0);
         readyRead();
@@ -968,7 +923,7 @@ void SocksClient::grantConnect()
 
 void SocksClient::grantUDPAssociate(const QString &relayHost, int relayPort)
 {
-    if(d->step != StepRequest || !d->waiting)
+    if (d->step != StepRequest || !d->waiting)
         return;
 
     // response
@@ -980,29 +935,17 @@ void SocksClient::grantUDPAssociate(const QString &relayHost, int relayPort)
     fprintf(stderr, "SocksClient: server << Success >>\n");
 #endif
 
-    if(!d->recvBuf.isEmpty())
+    if (!d->recvBuf.isEmpty())
         d->recvBuf.resize(0);
 }
 
-QHostAddress SocksClient::peerAddress() const
-{
-    return d->sock.peerAddress();
-}
+QHostAddress SocksClient::peerAddress() const { return d->sock.peerAddress(); }
 
-quint16 SocksClient::peerPort() const
-{
-    return d->sock.peerPort();
-}
+quint16 SocksClient::peerPort() const { return d->sock.peerPort(); }
 
-QString SocksClient::udpAddress() const
-{
-    return d->udpAddr;
-}
+QString SocksClient::udpAddress() const { return d->udpAddr; }
 
-quint16 SocksClient::udpPort() const
-{
-    return d->udpPort;
-}
+quint16 SocksClient::udpPort() const { return d->udpPort; }
 
 SocksUDP *SocksClient::createUDP(const QString &host, int port, const QHostAddress &routeAddr, int routePort)
 {
@@ -1012,19 +955,14 @@ SocksUDP *SocksClient::createUDP(const QString &host, int port, const QHostAddre
 //----------------------------------------------------------------------------
 // SocksServer
 //----------------------------------------------------------------------------
-class SocksServer::Private
-{
+class SocksServer::Private {
 public:
-    QTcpServer          *serv = nullptr;
-    QList<SocksClient*> incomingConns;
-    QUdpSocket          *sd = nullptr;
+    QTcpServer *         serv = nullptr;
+    QList<SocksClient *> incomingConns;
+    QUdpSocket *         sd = nullptr;
 };
 
-SocksServer::SocksServer(QObject *parent)
-:QObject(parent)
-{
-    d = new Private;
-}
+SocksServer::SocksServer(QObject *parent) : QObject(parent) { d = new Private; }
 
 SocksServer::~SocksServer()
 {
@@ -1041,10 +979,7 @@ void SocksServer::setServerSocket(QTcpServer *server)
     connect(d->serv, SIGNAL(newConnection()), SLOT(newConnection()));
 }
 
-bool SocksServer::isActive() const
-{
-    return d->serv->isListening();
-}
+bool SocksServer::isActive() const { return d->serv->isListening(); }
 
 bool SocksServer::listen(quint16 port, bool udp)
 {
@@ -1052,11 +987,11 @@ bool SocksServer::listen(quint16 port, bool udp)
     if (!d->serv) {
         setServerSocket(new QTcpServer(this));
     }
-    if(!d->serv->listen(QHostAddress::Any, port))
+    if (!d->serv->listen(QHostAddress::Any, port))
         return false;
-    if(udp) {
+    if (udp) {
         d->sd = new QUdpSocket(this);
-        if(!d->sd->bind(QHostAddress::LocalHost, port)) {
+        if (!d->sd->bind(QHostAddress::LocalHost, port)) {
             delete d->sd;
             d->sd = nullptr;
             delete d->serv;
@@ -1076,19 +1011,13 @@ void SocksServer::stop()
     d->serv = nullptr;
 }
 
-int SocksServer::port() const
-{
-    return d->serv? d->serv->serverPort(): 0;
-}
+int SocksServer::port() const { return d->serv ? d->serv->serverPort() : 0; }
 
-QHostAddress SocksServer::address() const
-{
-    return d->serv? d->serv->serverAddress(): QHostAddress();
-}
+QHostAddress SocksServer::address() const { return d->serv ? d->serv->serverAddress() : QHostAddress(); }
 
 SocksClient *SocksServer::takeIncoming()
 {
-    if(d->incomingConns.isEmpty())
+    if (d->incomingConns.isEmpty())
         return nullptr;
 
     SocksClient *c = d->incomingConns.takeFirst();
@@ -1104,7 +1033,7 @@ SocksClient *SocksServer::takeIncoming()
 
 void SocksServer::writeUDP(const QHostAddress &addr, int port, const QByteArray &data)
 {
-    if(d->sd) {
+    if (d->sd) {
         d->sd->writeDatagram(data.data(), data.size(), addr, port);
     }
 }
@@ -1127,10 +1056,10 @@ void SocksServer::connectionError()
 void SocksServer::sd_activated()
 {
     while (d->sd->hasPendingDatagrams()) {
-        QByteArray datagram(d->sd->pendingDatagramSize(), Qt::Uninitialized);
+        QByteArray   datagram(d->sd->pendingDatagramSize(), Qt::Uninitialized);
         QHostAddress sender;
-        quint16 senderPort;
-        auto sz = d->sd->readDatagram(datagram.data(), datagram.size(), &sender, &senderPort);
+        quint16      senderPort;
+        auto         sz = d->sd->readDatagram(datagram.data(), datagram.size(), &sender, &senderPort);
         if (sz >= 0) {
             datagram.truncate(sz);
             incomingUDP(sender.toString(), senderPort, d->sd->peerAddress(), d->sd->peerPort(), datagram);
diff --git a/src/irisnet/noncore/cutestuff/socks.h b/src/irisnet/noncore/cutestuff/socks.h
index 8605e7fd..039b9a13 100644
--- a/src/irisnet/noncore/cutestuff/socks.h
+++ b/src/irisnet/noncore/cutestuff/socks.h
@@ -29,8 +29,7 @@ class QTcpSocket;
 class SocksClient;
 class SocksServer;
 
-class SocksUDP : public QObject
-{
+class SocksUDP : public QObject {
     Q_OBJECT
 public:
     ~SocksUDP();
@@ -52,24 +51,23 @@ private slots:
     SocksUDP(SocksClient *sc, const QString &host, int port, const QHostAddress &routeAddr, int routePort);
 };
 
-class SocksClient : public ByteStream
-{
+class SocksClient : public ByteStream {
     Q_OBJECT
 public:
     enum Error { ErrConnectionRefused = ErrCustom, ErrHostNotFound, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth };
-    enum Method { AuthNone=0x0001, AuthUsername=0x0002 };
+    enum Method { AuthNone = 0x0001, AuthUsername = 0x0002 };
     enum Request { ReqConnect, ReqUDPAssociate };
-    SocksClient(QObject *parent=nullptr);
-    SocksClient(QTcpSocket *, QObject *parent=nullptr);
+    SocksClient(QObject *parent = nullptr);
+    SocksClient(QTcpSocket *, QObject *parent = nullptr);
     ~SocksClient();
 
-    virtual QAbstractSocket* abstractSocket() const;
+    virtual QAbstractSocket *abstractSocket() const;
 
     bool isIncoming() const;
 
     // outgoing
-    void setAuth(const QString &user, const QString &pass="");
-    void connectToHost(const QString &proxyHost, int proxyPort, const QString &host, int port, bool udpMode=false);
+    void setAuth(const QString &user, const QString &pass = "");
+    void connectToHost(const QString &proxyHost, int proxyPort, const QString &host, int port, bool udpMode = false);
 
     // incoming
     void chooseMethod(int);
@@ -79,17 +77,17 @@ class SocksClient : public ByteStream
     void grantUDPAssociate(const QString &relayHost, int relayPort);
 
     // from ByteStream
-    void close();
+    void   close();
     qint64 bytesAvailable() const;
     qint64 bytesToWrite() const;
 
     // remote address
     QHostAddress peerAddress() const;
-    quint16 peerPort() const;
+    quint16      peerPort() const;
 
     // udp
-    QString udpAddress() const;
-    quint16 udpPort() const;
+    QString   udpAddress() const;
+    quint16   udpPort() const;
     SocksUDP *createUDP(const QString &host, int port, const QHostAddress &routeAddr, int routePort);
 
 protected:
@@ -120,7 +118,7 @@ private slots:
     Private *d;
 
     void init();
-    void resetConnection(bool clear=false);
+    void resetConnection(bool clear = false);
     void do_request();
     void processOutgoing(const QByteArray &);
     void processIncoming(const QByteArray &);
@@ -128,18 +126,17 @@ private slots:
     void writeData(const QByteArray &a);
 };
 
-class SocksServer : public QObject
-{
+class SocksServer : public QObject {
     Q_OBJECT
 public:
-    SocksServer(QObject *parent=nullptr);
+    SocksServer(QObject *parent = nullptr);
     ~SocksServer();
 
-    void setServerSocket(QTcpServer *server);
-    bool isActive() const;
-    bool listen(quint16 port, bool udp=false);
-    void stop();
-    int port() const;
+    void         setServerSocket(QTcpServer *server);
+    bool         isActive() const;
+    bool         listen(quint16 port, bool udp = false);
+    void         stop();
+    int          port() const;
     QHostAddress address() const;
     SocksClient *takeIncoming();
 
diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index 079eb239..54a4a765 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -32,11 +32,7 @@
 #include <QtCrypto>
 
 namespace XMPP {
-enum
-{
-    Direct,
-    Relayed
-};
+enum { Direct, Relayed };
 
 static QChar randomPrintableChar()
 {
@@ -45,9 +41,9 @@ static QChar randomPrintableChar()
     // 52-61 = 0-9
 
     uchar c = QCA::Random::randomChar() % 62;
-    if(c <= 25)
+    if (c <= 25)
         return 'a' + c;
-    else if(c <= 51)
+    else if (c <= 51)
         return 'A' + (c - 26);
     else
         return '0' + (c - 52);
@@ -56,7 +52,7 @@ static QChar randomPrintableChar()
 static QString randomCredential(int len)
 {
     QString out;
-    for(int n = 0; n < len; ++n)
+    for (int n = 0; n < len; ++n)
         out += randomPrintableChar();
     return out;
 }
@@ -65,7 +61,7 @@ static qint64 calc_pair_priority(int a, int b)
 {
     qint64 priority = ((qint64)1 << 32) * qMin(a, b);
     priority += (qint64)2 * qMax(a, b);
-    if(a > b)
+    if (a > b)
         ++priority;
     return priority;
 }
@@ -73,7 +69,7 @@ static qint64 calc_pair_priority(int a, int b)
 // see if candidates are considered the same for pruning purposes
 static bool compare_candidates(const IceComponent::CandidateInfo &a, const IceComponent::CandidateInfo &b)
 {
-    if(a.addr == b.addr && a.componentId == b.componentId)
+    if (a.addr == b.addr && a.componentId == b.componentId)
         return true;
     else
         return false;
@@ -83,72 +79,49 @@ static bool compare_candidates(const IceComponent::CandidateInfo &a, const IceCo
 // FIXME: dry (this is in psi avcall also)
 static int getAddressScope(const QHostAddress &a)
 {
-    if(a.protocol() == QAbstractSocket::IPv6Protocol)
-    {
-        if(a == QHostAddress(QHostAddress::LocalHostIPv6))
+    if (a.protocol() == QAbstractSocket::IPv6Protocol) {
+        if (a == QHostAddress(QHostAddress::LocalHostIPv6))
             return 0;
-        else if(XMPP::Ice176::isIPv6LinkLocalAddress(a))
+        else if (XMPP::Ice176::isIPv6LinkLocalAddress(a))
             return 1;
-    }
-    else if(a.protocol() == QAbstractSocket::IPv4Protocol)
-    {
+    } else if (a.protocol() == QAbstractSocket::IPv4Protocol) {
         quint32 v4 = a.toIPv4Address();
-        quint8 a0 = v4 >> 24;
-        quint8 a1 = (v4 >> 16) & 0xff;
-        if(a0 == 127)
+        quint8  a0 = v4 >> 24;
+        quint8  a1 = (v4 >> 16) & 0xff;
+        if (a0 == 127)
             return 0;
-        else if(a0 == 169 && a1 == 254)
+        else if (a0 == 169 && a1 == 254)
             return 1;
-        else if(a0 == 10)
+        else if (a0 == 10)
             return 2;
-        else if(a0 == 172 && a1 >= 16 && a1 <= 31)
+        else if (a0 == 172 && a1 >= 16 && a1 <= 31)
             return 2;
-        else if(a0 == 192 && a1 == 168)
+        else if (a0 == 192 && a1 == 168)
             return 2;
     }
 
     return 3;
 }
 
-class Ice176::Private : public QObject
-{
+class Ice176::Private : public QObject {
     Q_OBJECT
 
 public:
-    enum State
-    {
-        Stopped,
-        Starting,
-        Started,
-        Stopping
-    };
+    enum State { Stopped, Starting, Started, Stopping };
 
-    enum CandidatePairState
-    {
-        PWaiting,
-        PInProgress,
-        PSucceeded,
-        PFailed,
-        PFrozen
-    };
+    enum CandidatePairState { PWaiting, PInProgress, PSucceeded, PFailed, PFrozen };
 
-    enum CheckListState
-    {
-        LRunning,
-        LCompleted,
-        LFailed
-    };
+    enum CheckListState { LRunning, LCompleted, LFailed };
 
-    class CandidatePair
-    {
+    class CandidatePair {
     public:
         IceComponent::CandidateInfo local, remote;
-        bool isDefault;
-        bool isValid;
-        bool isNominated;
-        CandidatePairState state;
+        bool                        isDefault;
+        bool                        isValid;
+        bool                        isNominated;
+        CandidatePairState          state;
 
-        qint64 priority;
+        qint64  priority;
         QString foundation;
 
         StunBinding *binding;
@@ -157,93 +130,72 @@ class Ice176::Private : public QObject
         //   or such, to multiplex ids
         StunTransactionPool *pool;
 
-        CandidatePair() :
-            binding(nullptr),
-            pool(nullptr)
-        {
-        }
+        CandidatePair() : binding(nullptr), pool(nullptr) {}
     };
 
-    class CheckList
-    {
+    class CheckList {
     public:
         QList<CandidatePair> pairs;
-        CheckListState state;
+        CheckListState       state;
     };
 
-    class Component
-    {
+    class Component {
     public:
-        int id;
+        int           id;
         IceComponent *ic;
-        bool localFinished;
-        bool stopped;
-        bool lowOverhead;
-
-        Component() :
-            localFinished(false),
-            stopped(false),
-            lowOverhead(false)
-        {
-        }
+        bool          localFinished;
+        bool          stopped;
+        bool          lowOverhead;
+
+        Component() : localFinished(false), stopped(false), lowOverhead(false) {}
     };
 
-    Ice176 *q;
-    Ice176::Mode mode;
-    State state;
-    TurnClient::Proxy proxy;
-    UdpPortReserver *portReserver;
-    int componentCount;
-    QList<Ice176::LocalAddress> localAddrs;
+    Ice176 *                       q;
+    Ice176::Mode                   mode;
+    State                          state;
+    TurnClient::Proxy              proxy;
+    UdpPortReserver *              portReserver;
+    int                            componentCount;
+    QList<Ice176::LocalAddress>    localAddrs;
     QList<Ice176::ExternalAddress> extAddrs;
-    QHostAddress stunBindAddr;
-    int stunBindPort;
-    QHostAddress stunRelayUdpAddr;
-    int stunRelayUdpPort;
-    QString stunRelayUdpUser;
-    QCA::SecureArray stunRelayUdpPass;
-    QHostAddress stunRelayTcpAddr;
-    int stunRelayTcpPort;
-    QString stunRelayTcpUser;
-    QCA::SecureArray stunRelayTcpPass;
-    QString localUser, localPass;
-    QString peerUser, peerPass;
-    QList<Component> components;
+    QHostAddress                   stunBindAddr;
+    int                            stunBindPort;
+    QHostAddress                   stunRelayUdpAddr;
+    int                            stunRelayUdpPort;
+    QString                        stunRelayUdpUser;
+    QCA::SecureArray               stunRelayUdpPass;
+    QHostAddress                   stunRelayTcpAddr;
+    int                            stunRelayTcpPort;
+    QString                        stunRelayTcpUser;
+    QCA::SecureArray               stunRelayTcpPass;
+    QString                        localUser, localPass;
+    QString                        peerUser, peerPass;
+    QList<Component>               components;
     QList<IceComponent::Candidate> localCandidates;
-    QSet<IceTransport*> iceTransports;
-    CheckList checkList;
-    QList< QList<QByteArray> > in;
-    bool useLocal;
-    bool useStunBind;
-    bool useStunRelayUdp;
-    bool useStunRelayTcp;
-    bool useTrickle;
-    QTimer *collectTimer;
+    QSet<IceTransport *>           iceTransports;
+    CheckList                      checkList;
+    QList<QList<QByteArray>>       in;
+    bool                           useLocal;
+    bool                           useStunBind;
+    bool                           useStunRelayUdp;
+    bool                           useStunRelayTcp;
+    bool                           useTrickle;
+    QTimer *                       collectTimer;
 
     Private(Ice176 *_q) :
-        QObject(_q),
-        q(_q),
-        state(Stopped),
-        portReserver(nullptr),
-        componentCount(0),
-        useLocal(true),
-        useStunBind(true),
-        useStunRelayUdp(true),
-        useStunRelayTcp(true),
-        useTrickle(false),
-        collectTimer(nullptr)
+        QObject(_q), q(_q), state(Stopped), portReserver(nullptr), componentCount(0), useLocal(true), useStunBind(true),
+        useStunRelayUdp(true), useStunRelayTcp(true), useTrickle(false), collectTimer(nullptr)
     {
     }
 
     ~Private()
     {
-        if(collectTimer)
-        {
+        if (collectTimer) {
             collectTimer->disconnect(this);
             collectTimer->deleteLater();
         }
 
-        foreach(const Component &c, components)
+        foreach (const Component &c, components)
             delete c.ic;
 
         // no need to delete pools and bindings since pools already deleted here
@@ -273,9 +225,8 @@ class Ice176::Private : public QObject
 
     int findLocalAddress(const QHostAddress &addr)
     {
-        for(int n = 0; n < localAddrs.count(); ++n)
-        {
-            if(localAddrs[n].addr == addr)
+        for (int n = 0; n < localAddrs.count(); ++n) {
+            if (localAddrs[n].addr == addr)
                 return n;
         }
 
@@ -285,14 +236,13 @@ class Ice176::Private : public QObject
     void updateLocalAddresses(const QList<LocalAddress> &addrs)
     {
         // for now, ignore address changes during operation
-        if(state != Stopped)
+        if (state != Stopped)
             return;
 
         localAddrs.clear();
-        foreach(const LocalAddress &la, addrs)
-        {
+        foreach (const LocalAddress &la, addrs) {
             int at = findLocalAddress(la.addr);
-            if(at == -1)
+            if (at == -1)
                 localAddrs += la;
         }
     }
@@ -300,14 +250,13 @@ class Ice176::Private : public QObject
     void updateExternalAddresses(const QList<ExternalAddress> &addrs)
     {
         // for now, ignore address changes during operation
-        if(state != Stopped)
+        if (state != Stopped)
             return;
 
         extAddrs.clear();
-        foreach(const ExternalAddress &ea, addrs)
-        {
+        foreach (const ExternalAddress &ea, addrs) {
             int at = findLocalAddress(ea.base.addr);
-            if(at != -1)
+            if (at != -1)
                 extAddrs += ea;
         }
     }
@@ -321,33 +270,34 @@ class Ice176::Private : public QObject
         localUser = randomCredential(4);
         localPass = randomCredential(22);
 
-        QList<QUdpSocket*> socketList;
-        if(portReserver)
+        QList<QUdpSocket *> socketList;
+        if (portReserver)
             socketList = portReserver->borrowSockets(componentCount, this);
 
-        for(int n = 0; n < componentCount; ++n)
-        {
+        for (int n = 0; n < componentCount; ++n) {
             Component c;
             c.id = n + 1;
             c.ic = new IceComponent(c.id, this);
             c.ic->setDebugLevel(IceComponent::DL_Info);
-            connect(c.ic, SIGNAL(candidateAdded(XMPP::IceComponent::Candidate)), SLOT(ic_candidateAdded(XMPP::IceComponent::Candidate)));
-            connect(c.ic, SIGNAL(candidateRemoved(XMPP::IceComponent::Candidate)), SLOT(ic_candidateRemoved(XMPP::IceComponent::Candidate)));
+            connect(c.ic, SIGNAL(candidateAdded(XMPP::IceComponent::Candidate)),
+                    SLOT(ic_candidateAdded(XMPP::IceComponent::Candidate)));
+            connect(c.ic, SIGNAL(candidateRemoved(XMPP::IceComponent::Candidate)),
+                    SLOT(ic_candidateRemoved(XMPP::IceComponent::Candidate)));
             connect(c.ic, SIGNAL(localFinished()), SLOT(ic_localFinished()));
             connect(c.ic, SIGNAL(stopped()), SLOT(ic_stopped()));
             connect(c.ic, SIGNAL(debugLine(QString)), SLOT(ic_debugLine(QString)));
 
             c.ic->setClientSoftwareNameAndVersion("Iris");
             c.ic->setProxy(proxy);
-            if(portReserver)
+            if (portReserver)
                 c.ic->setPortReserver(portReserver);
             c.ic->setLocalAddresses(localAddrs);
             c.ic->setExternalAddresses(extAddrs);
-            if(!stunBindAddr.isNull())
+            if (!stunBindAddr.isNull())
                 c.ic->setStunBindService(stunBindAddr, stunBindPort);
-            if(!stunRelayUdpAddr.isNull())
+            if (!stunRelayUdpAddr.isNull())
                 c.ic->setStunRelayUdpService(stunRelayUdpAddr, stunRelayUdpPort, stunRelayUdpUser, stunRelayUdpPass);
-            if(!stunRelayTcpAddr.isNull())
+            if (!stunRelayTcpAddr.isNull())
                 c.ic->setStunRelayTcpService(stunRelayTcpAddr, stunRelayTcpPort, stunRelayTcpUser, stunRelayTcpPass);
 
             c.ic->setUseLocal(useLocal);
@@ -367,7 +317,7 @@ class Ice176::Private : public QObject
         //   the app provided a different address list to
         //   UdpPortReserver and Ice176.  and that would really be
         //   a dumb thing to do but I'm not going to Q_ASSERT it
-        if(!socketList.isEmpty())
+        if (!socketList.isEmpty())
             portReserver->returnSockets(socketList);
     }
 
@@ -377,13 +327,10 @@ class Ice176::Private : public QObject
 
         state = Stopping;
 
-        if(!components.isEmpty())
-        {
-            for(int n = 0; n < components.count(); ++n)
+        if (!components.isEmpty()) {
+            for (int n = 0; n < components.count(); ++n)
                 components[n].ic->stop();
-        }
-        else
-        {
+        } else {
             // TODO: hmm, is it possible to have no components?
             QMetaObject::invokeMethod(this, "postStop", Qt::QueuedConnection);
         }
@@ -392,41 +339,37 @@ class Ice176::Private : public QObject
     void addRemoteCandidates(const QList<Candidate> &list)
     {
         QList<IceComponent::CandidateInfo> remoteCandidates;
-        foreach(const Candidate &c, list)
-        {
+        foreach (const Candidate &c, list) {
             IceComponent::CandidateInfo ci;
             ci.addr.addr = c.ip;
             ci.addr.addr.setScopeId(QString());
-            ci.addr.port = c.port;
-            ci.type = (IceComponent::CandidateType)string_to_candidateType(c.type); // TODO: handle error
+            ci.addr.port   = c.port;
+            ci.type        = (IceComponent::CandidateType)string_to_candidateType(c.type); // TODO: handle error
             ci.componentId = c.component;
-            ci.priority = c.priority;
-            ci.foundation = c.foundation;
-            if(!c.rel_addr.isNull())
-            {
+            ci.priority    = c.priority;
+            ci.foundation  = c.foundation;
+            if (!c.rel_addr.isNull()) {
                 ci.base.addr = c.rel_addr;
                 ci.base.addr.setScopeId(QString());
                 ci.base.port = c.rel_port;
             }
             ci.network = c.network;
-            ci.id = c.id;
+            ci.id      = c.id;
             remoteCandidates += ci;
         }
 
         printf("adding %d remote candidates\n", remoteCandidates.count());
 
         QList<CandidatePair> pairs;
-        foreach(const IceComponent::Candidate &cc, localCandidates)
-        {
+        foreach (const IceComponent::Candidate &cc, localCandidates) {
             const IceComponent::CandidateInfo &lc = cc.info;
 
-            foreach(const IceComponent::CandidateInfo &rc, remoteCandidates)
-            {
-                if(lc.componentId != rc.componentId)
+            foreach (const IceComponent::CandidateInfo &rc, remoteCandidates) {
+                if (lc.componentId != rc.componentId)
                     continue;
 
                 // don't pair ipv4 with ipv6.  FIXME: is this right?
-                if(lc.addr.addr.protocol() != rc.addr.addr.protocol())
+                if (lc.addr.addr.protocol() != rc.addr.addr.protocol())
                     continue;
 
                 // don't relay to localhost.  turnserver
@@ -434,19 +377,20 @@ class Ice176::Private : public QObject
                 //   should qualify as a HACK or not.
                 //   trying to relay to localhost is pretty
                 //   stupid anyway
-                if(lc.type == IceComponent::RelayedType && getAddressScope(rc.addr.addr) == 0)
+                if (lc.type == IceComponent::RelayedType && getAddressScope(rc.addr.addr) == 0)
                     continue;
 
                 CandidatePair pair;
-                pair.state = PFrozen; // FIXME: setting state here may be wrong
-                pair.local = lc;
+                pair.state  = PFrozen; // FIXME: setting state here may be wrong
+                pair.local  = lc;
                 pair.remote = rc;
-                if(pair.local.addr.addr.protocol() == QAbstractSocket::IPv6Protocol && isIPv6LinkLocalAddress(pair.local.addr.addr))
+                if (pair.local.addr.addr.protocol() == QAbstractSocket::IPv6Protocol
+                    && isIPv6LinkLocalAddress(pair.local.addr.addr))
                     pair.remote.addr.addr.setScopeId(pair.local.addr.addr.scopeId());
-                pair.isDefault = false;
-                pair.isValid = false;
+                pair.isDefault   = false;
+                pair.isValid     = false;
                 pair.isNominated = false;
-                if(mode == Ice176::Initiator)
+                if (mode == Ice176::Initiator)
                     pair.priority = calc_pair_priority(lc.priority, rc.priority);
                 else
                     pair.priority = calc_pair_priority(rc.priority, lc.priority);
@@ -459,12 +403,10 @@ class Ice176::Private : public QObject
         // combine pairs with existing, and sort
         pairs = checkList.pairs + pairs;
         checkList.pairs.clear();
-        foreach(const CandidatePair &pair, pairs)
-        {
+        foreach (const CandidatePair &pair, pairs) {
             int at;
-            for(at = 0; at < checkList.pairs.count(); ++at)
-            {
-                if(compare_pair(pair, checkList.pairs[at]) < 0)
+            for (at = 0; at < checkList.pairs.count(); ++at) {
+                if (compare_pair(pair, checkList.pairs[at]) < 0)
                     break;
             }
 
@@ -473,30 +415,27 @@ class Ice176::Private : public QObject
 
         // pruning
 
-        for(int n = 0; n < checkList.pairs.count(); ++n)
-        {
+        for (int n = 0; n < checkList.pairs.count(); ++n) {
             CandidatePair &pair = checkList.pairs[n];
-            if(pair.local.type == IceComponent::ServerReflexiveType)
+            if (pair.local.type == IceComponent::ServerReflexiveType)
                 pair.local.addr = pair.local.base;
         }
 
-        for(int n = 0; n < checkList.pairs.count(); ++n)
-        {
+        for (int n = 0; n < checkList.pairs.count(); ++n) {
             CandidatePair &pair = checkList.pairs[n];
-            printf("%d, %s:%d -> %s:%d\n", pair.local.componentId, qPrintable(pair.local.addr.addr.toString()), pair.local.addr.port, qPrintable(pair.remote.addr.addr.toString()), pair.remote.addr.port);
+            printf("%d, %s:%d -> %s:%d\n", pair.local.componentId, qPrintable(pair.local.addr.addr.toString()),
+                   pair.local.addr.port, qPrintable(pair.remote.addr.addr.toString()), pair.remote.addr.port);
 
             bool found = false;
-            for(int i = n - 1; i >= 0; --i)
-            {
-                if(compare_candidates(pair.local, checkList.pairs[i].local) && compare_candidates(pair.remote, checkList.pairs[i].remote))
-                {
+            for (int i = n - 1; i >= 0; --i) {
+                if (compare_candidates(pair.local, checkList.pairs[i].local)
+                    && compare_candidates(pair.remote, checkList.pairs[i].remote)) {
                     found = true;
                     break;
                 }
             }
 
-            if(found )
-            {
+            if (found) {
                 checkList.pairs.removeAt(n);
                 --n; // adjust position
             }
@@ -504,18 +443,17 @@ class Ice176::Private : public QObject
 
         // max pairs is 100 * number of components
         int max_pairs = 100 * components.count();
-        while(checkList.pairs.count() > max_pairs)
+        while (checkList.pairs.count() > max_pairs)
             checkList.pairs.removeLast();
 
         printf("%d after pruning\n", checkList.pairs.count());
 
         // set state
-        for(int n = 0; n < checkList.pairs.count(); ++n)
-        {
+        for (int n = 0; n < checkList.pairs.count(); ++n) {
             CandidatePair &pair = checkList.pairs[n];
 
             // only initialize the new pairs
-            if(pair.state != PFrozen)
+            if (pair.state != PFrozen)
                 continue;
 
             pair.foundation = pair.local.foundation + pair.remote.foundation;
@@ -531,9 +469,10 @@ class Ice176::Private : public QObject
             Component &c = components[findComponent(lc.info.componentId)];
 
             pair.pool = new StunTransactionPool(StunTransaction::Udp, this);
-            connect(pair.pool, SIGNAL(outgoingMessage(QByteArray,QHostAddress,int)), SLOT(pool_outgoingMessage(QByteArray,QHostAddress,int)));
-            //pair.pool->setUsername(peerUser + ':' + localUser);
-            //pair.pool->setPassword(peerPass.toUtf8());
+            connect(pair.pool, SIGNAL(outgoingMessage(QByteArray, QHostAddress, int)),
+                    SLOT(pool_outgoingMessage(QByteArray, QHostAddress, int)));
+            // pair.pool->setUsername(peerUser + ':' + localUser);
+            // pair.pool->setPassword(peerPass.toUtf8());
 
             pair.binding = new StunBinding(pair.pool);
             connect(pair.binding, SIGNAL(success()), SLOT(binding_success()));
@@ -541,12 +480,10 @@ class Ice176::Private : public QObject
             int prflx_priority = c.ic->peerReflexivePriority(lc.iceTransport, lc.path);
             pair.binding->setPriority(prflx_priority);
 
-            if(mode == Ice176::Initiator)
-            {
+            if (mode == Ice176::Initiator) {
                 pair.binding->setIceControlling(0);
                 pair.binding->setUseCandidate(true);
-            }
-            else
+            } else
                 pair.binding->setIceControlled(0);
 
             pair.binding->setShortTermUsername(peerUser + ':' + localUser);
@@ -559,38 +496,37 @@ class Ice176::Private : public QObject
     void write(int componentIndex, const QByteArray &datagram)
     {
         int at = -1;
-        for(int n = 0; n < checkList.pairs.count(); ++n)
-        {
-            if(checkList.pairs[n].local.componentId - 1 == componentIndex && checkList.pairs[n].isValid)
-            {
+        for (int n = 0; n < checkList.pairs.count(); ++n) {
+            if (checkList.pairs[n].local.componentId - 1 == componentIndex && checkList.pairs[n].isValid) {
                 at = n;
                 break;
             }
         }
-        if(at == -1)
+        if (at == -1)
             return;
 
         CandidatePair &pair = checkList.pairs[at];
 
         at = findLocalCandidate(pair.local.addr.addr, pair.local.addr.port);
-        if(at == -1) // FIXME: assert?
+        if (at == -1) // FIXME: assert?
             return;
 
         IceComponent::Candidate &lc = localCandidates[at];
 
         IceTransport *sock = lc.iceTransport;
-        int path = lc.path;
+        int           path = lc.path;
 
         sock->writeDatagram(path, datagram, pair.remote.addr.addr, pair.remote.addr.port);
 
         // DOR-SR?
-        QMetaObject::invokeMethod(q, "datagramsWritten", Qt::QueuedConnection, Q_ARG(int, componentIndex), Q_ARG(int, 1));
+        QMetaObject::invokeMethod(q, "datagramsWritten", Qt::QueuedConnection, Q_ARG(int, componentIndex),
+                                  Q_ARG(int, 1));
     }
 
     void flagComponentAsLowOverhead(int componentIndex)
     {
         // FIXME: ok to assume in order?
-        Component &c = components[componentIndex];
+        Component &c  = components[componentIndex];
         c.lowOverhead = true;
 
         // FIXME: actually do something
@@ -599,9 +535,8 @@ class Ice176::Private : public QObject
 private:
     int findComponent(const IceComponent *ic) const
     {
-        for(int n = 0; n < components.count(); ++n)
-        {
-            if(components[n].ic == ic)
+        for (int n = 0; n < components.count(); ++n) {
+            if (components[n].ic == ic)
                 return n;
         }
 
@@ -610,9 +545,8 @@ class Ice176::Private : public QObject
 
     int findComponent(int id) const
     {
-        for(int n = 0; n < components.count(); ++n)
-        {
-            if(components[n].id == id)
+        for (int n = 0; n < components.count(); ++n) {
+            if (components[n].id == id)
                 return n;
         }
 
@@ -621,10 +555,9 @@ class Ice176::Private : public QObject
 
     int findLocalCandidate(const IceTransport *iceTransport, int path) const
     {
-        for(int n = 0; n < localCandidates.count(); ++n)
-        {
+        for (int n = 0; n < localCandidates.count(); ++n) {
             const IceComponent::Candidate &cc = localCandidates[n];
-            if(cc.iceTransport == iceTransport && cc.path == path)
+            if (cc.iceTransport == iceTransport && cc.path == path)
                 return n;
         }
 
@@ -633,10 +566,9 @@ class Ice176::Private : public QObject
 
     int findLocalCandidate(const QHostAddress &fromAddr, int fromPort)
     {
-        for(int n = 0; n < localCandidates.count(); ++n)
-        {
+        for (int n = 0; n < localCandidates.count(); ++n) {
             const IceComponent::Candidate &cc = localCandidates[n];
-            if(cc.info.addr.addr == fromAddr && cc.info.addr.port == fromPort)
+            if (cc.info.addr.addr == fromAddr && cc.info.addr.port == fromPort)
                 return n;
         }
 
@@ -646,26 +578,34 @@ class Ice176::Private : public QObject
     static QString candidateType_to_string(IceComponent::CandidateType type)
     {
         QString out;
-        switch(type)
-        {
-            case IceComponent::HostType: out = "host"; break;
-            case IceComponent::PeerReflexiveType: out = "prflx"; break;
-            case IceComponent::ServerReflexiveType: out = "srflx"; break;
-            case IceComponent::RelayedType: out = "relay"; break;
-            default: Q_ASSERT(0);
+        switch (type) {
+        case IceComponent::HostType:
+            out = "host";
+            break;
+        case IceComponent::PeerReflexiveType:
+            out = "prflx";
+            break;
+        case IceComponent::ServerReflexiveType:
+            out = "srflx";
+            break;
+        case IceComponent::RelayedType:
+            out = "relay";
+            break;
+        default:
+            Q_ASSERT(0);
         }
         return out;
     }
 
     static int string_to_candidateType(const QString &in)
     {
-        if(in == "host")
+        if (in == "host")
             return IceComponent::HostType;
-        else if(in == "prflx")
+        else if (in == "prflx")
             return IceComponent::PeerReflexiveType;
-        else if(in == "srflx")
+        else if (in == "srflx")
             return IceComponent::ServerReflexiveType;
-        else if(in == "relay")
+        else if (in == "relay")
             return IceComponent::RelayedType;
         else
             return -1;
@@ -674,14 +614,17 @@ class Ice176::Private : public QObject
     static int compare_pair(const CandidatePair &a, const CandidatePair &b)
     {
         // prefer remote srflx, for leap
-        if(a.remote.type == IceComponent::ServerReflexiveType && b.remote.type != IceComponent::ServerReflexiveType && b.remote.addr.addr.protocol() != QAbstractSocket::IPv6Protocol)
+        if (a.remote.type == IceComponent::ServerReflexiveType && b.remote.type != IceComponent::ServerReflexiveType
+            && b.remote.addr.addr.protocol() != QAbstractSocket::IPv6Protocol)
             return -1;
-        else if(b.remote.type == IceComponent::ServerReflexiveType && a.remote.type != IceComponent::ServerReflexiveType && a.remote.addr.addr.protocol() != QAbstractSocket::IPv6Protocol)
+        else if (b.remote.type == IceComponent::ServerReflexiveType
+                 && a.remote.type != IceComponent::ServerReflexiveType
+                 && a.remote.addr.addr.protocol() != QAbstractSocket::IPv6Protocol)
             return 1;
 
-        if(a.priority > b.priority)
+        if (a.priority > b.priority)
             return -1;
-        else if(b.priority > a.priority)
+        else if (b.priority > a.priority)
             return 1;
 
         return 0;
@@ -697,50 +640,47 @@ private slots:
     void ic_candidateAdded(const XMPP::IceComponent::Candidate &_cc)
     {
         IceComponent::Candidate cc = _cc;
-        cc.info.id = randomCredential(10); // FIXME: ensure unique
-        cc.info.foundation = "0"; // FIXME
+        cc.info.id                 = randomCredential(10); // FIXME: ensure unique
+        cc.info.foundation         = "0";                  // FIXME
         // TODO
         localCandidates += cc;
 
-        printf("C%d: candidate added: %s;%d\n", cc.info.componentId, qPrintable(cc.info.addr.addr.toString()), cc.info.addr.port);
+        printf("C%d: candidate added: %s;%d\n", cc.info.componentId, qPrintable(cc.info.addr.addr.toString()),
+               cc.info.addr.port);
 
-        if(!iceTransports.contains(cc.iceTransport))
-        {
+        if (!iceTransports.contains(cc.iceTransport)) {
             connect(cc.iceTransport, SIGNAL(readyRead(int)), SLOT(it_readyRead(int)));
-            connect(cc.iceTransport, SIGNAL(datagramsWritten(int,int,QHostAddress,int)), SLOT(it_datagramsWritten(int,int,QHostAddress,int)));
+            connect(cc.iceTransport, SIGNAL(datagramsWritten(int, int, QHostAddress, int)),
+                    SLOT(it_datagramsWritten(int, int, QHostAddress, int)));
 
             iceTransports += cc.iceTransport;
         }
 
-        if(state == Started && useTrickle)
-        {
+        if (state == Started && useTrickle) {
             QList<Ice176::Candidate> list;
 
             Ice176::Candidate c;
-            c.component = cc.info.componentId;
+            c.component  = cc.info.componentId;
             c.foundation = cc.info.foundation;
             c.generation = 0; // TODO
-            c.id = cc.info.id;
-            c.ip = cc.info.addr.addr;
+            c.id         = cc.info.id;
+            c.ip         = cc.info.addr.addr;
             c.ip.setScopeId(QString());
-            c.network = cc.info.network;
-            c.port = cc.info.addr.port;
+            c.network  = cc.info.network;
+            c.port     = cc.info.addr.port;
             c.priority = cc.info.priority;
             c.protocol = "udp";
-            if(cc.info.type != IceComponent::HostType)
-            {
+            if (cc.info.type != IceComponent::HostType) {
                 c.rel_addr = cc.info.base.addr;
                 c.rel_addr.setScopeId(QString());
                 c.rel_port = cc.info.base.port;
-            }
-            else
-            {
+            } else {
                 c.rel_addr = QHostAddress();
                 c.rel_port = -1;
             }
             c.rem_addr = QHostAddress();
             c.rem_port = -1;
-            c.type = candidateType_to_string(cc.info.type);
+            c.type     = candidateType_to_string(cc.info.type);
             list += c;
 
             emit q->localCandidatesReady(list);
@@ -750,13 +690,12 @@ private slots:
     void ic_candidateRemoved(const XMPP::IceComponent::Candidate &cc)
     {
         // TODO
-        printf("C%d: candidate removed: %s;%d\n", cc.info.componentId, qPrintable(cc.info.addr.addr.toString()), cc.info.addr.port);
+        printf("C%d: candidate removed: %s;%d\n", cc.info.componentId, qPrintable(cc.info.addr.addr.toString()),
+               cc.info.addr.port);
 
         QStringList idList;
-        for(int n = 0; n < localCandidates.count(); ++n)
-        {
-            if(localCandidates[n].id == cc.id && localCandidates[n].info.componentId == cc.info.componentId)
-            {
+        for (int n = 0; n < localCandidates.count(); ++n) {
+            if (localCandidates[n].id == cc.id && localCandidates[n].info.componentId == cc.info.componentId) {
                 // FIXME: this is rather ridiculous I think
                 idList += localCandidates[n].info.id;
 
@@ -766,31 +705,25 @@ private slots:
         }
 
         bool iceTransportInUse = false;
-        foreach(const IceComponent::Candidate &lc, localCandidates)
-        {
-            if(lc.iceTransport == cc.iceTransport)
-            {
+        foreach (const IceComponent::Candidate &lc, localCandidates) {
+            if (lc.iceTransport == cc.iceTransport) {
                 iceTransportInUse = true;
                 break;
             }
         }
-        if(!iceTransportInUse)
-        {
+        if (!iceTransportInUse) {
             cc.iceTransport->disconnect(this);
             iceTransports.remove(cc.iceTransport);
         }
 
-        for(int n = 0; n < checkList.pairs.count(); ++n)
-        {
-            if(idList.contains(checkList.pairs[n].local.id))
-            {
-                StunBinding *binding = checkList.pairs[n].binding;
-                StunTransactionPool *pool = checkList.pairs[n].pool;
+        for (int n = 0; n < checkList.pairs.count(); ++n) {
+            if (idList.contains(checkList.pairs[n].local.id)) {
+                StunBinding *        binding = checkList.pairs[n].binding;
+                StunTransactionPool *pool    = checkList.pairs[n].pool;
 
                 delete binding;
 
-                if(pool)
-                {
+                if (pool) {
                     pool->disconnect(this);
                     pool->setParent(nullptr);
                     pool->deleteLater();
@@ -805,29 +738,25 @@ private slots:
     void ic_localFinished()
     {
         IceComponent *ic = static_cast<IceComponent *>(sender());
-        int at = findComponent(ic);
+        int           at = findComponent(ic);
         Q_ASSERT(at != -1);
 
         components[at].localFinished = true;
 
         bool allFinished = true;
-        foreach(const Component &c, components)
-        {
-            if(!c.localFinished)
-            {
+        foreach (const Component &c, components) {
+            if (!c.localFinished) {
                 allFinished = false;
                 break;
             }
         }
 
-        if(allFinished)
-        {
+        if (allFinished) {
             state = Started;
 
             emit q->started();
 
-            if(!useTrickle)
-            {
+            if (!useTrickle) {
                 // FIXME: there should be a way to not wait if
                 //   we know for sure there is nothing else
                 //   possibly coming
@@ -840,36 +769,32 @@ private slots:
 
             // FIXME: DOR-SS
             QList<Ice176::Candidate> list;
-            foreach(const IceComponent::Candidate &cc, localCandidates)
-            {
+            foreach (const IceComponent::Candidate &cc, localCandidates) {
                 Ice176::Candidate c;
-                c.component = cc.info.componentId;
+                c.component  = cc.info.componentId;
                 c.foundation = cc.info.foundation;
                 c.generation = 0; // TODO
-                c.id = cc.info.id;
-                c.ip = cc.info.addr.addr;
+                c.id         = cc.info.id;
+                c.ip         = cc.info.addr.addr;
                 c.ip.setScopeId(QString());
-                c.network = cc.info.network;
-                c.port = cc.info.addr.port;
+                c.network  = cc.info.network;
+                c.port     = cc.info.addr.port;
                 c.priority = cc.info.priority;
                 c.protocol = "udp";
-                if(cc.info.type != IceComponent::HostType)
-                {
+                if (cc.info.type != IceComponent::HostType) {
                     c.rel_addr = cc.info.base.addr;
                     c.rel_addr.setScopeId(QString());
                     c.rel_port = cc.info.base.port;
-                }
-                else
-                {
+                } else {
                     c.rel_addr = QHostAddress();
                     c.rel_port = -1;
                 }
                 c.rem_addr = QHostAddress();
                 c.rem_port = -1;
-                c.type = candidateType_to_string(cc.info.type);
+                c.type     = candidateType_to_string(cc.info.type);
                 list += c;
             }
-            if(!list.isEmpty())
+            if (!list.isEmpty())
                 emit q->localCandidatesReady(list);
         }
     }
@@ -877,29 +802,27 @@ private slots:
     void ic_stopped()
     {
         IceComponent *ic = static_cast<IceComponent *>(sender());
-        int at = findComponent(ic);
+        int           at = findComponent(ic);
         Q_ASSERT(at != -1);
 
         components[at].stopped = true;
 
         bool allStopped = true;
-        foreach(const Component &c, components)
-        {
-            if(!c.stopped)
-            {
+        foreach (const Component &c, components) {
+            if (!c.stopped) {
                 allStopped = false;
                 break;
             }
         }
 
-        if(allStopped)
+        if (allStopped)
             postStop();
     }
 
     void ic_debugLine(const QString &line)
     {
         IceComponent *ic = static_cast<IceComponent *>(sender());
-        int at = findComponent(ic);
+        int           at = findComponent(ic);
         Q_ASSERT(at != -1);
 
         // FIXME: components are always sorted?
@@ -913,74 +836,69 @@ private slots:
         collectTimer = nullptr;
 
         QList<Ice176::Candidate> list;
-        foreach(const IceComponent::Candidate &cc, localCandidates)
-        {
+        foreach (const IceComponent::Candidate &cc, localCandidates) {
             Ice176::Candidate c;
-            c.component = cc.info.componentId;
+            c.component  = cc.info.componentId;
             c.foundation = cc.info.foundation;
             c.generation = 0; // TODO
-            c.id = cc.info.id;
-            c.ip = cc.info.addr.addr;
+            c.id         = cc.info.id;
+            c.ip         = cc.info.addr.addr;
             c.ip.setScopeId(QString());
-            c.network = cc.info.network;
-            c.port = cc.info.addr.port;
+            c.network  = cc.info.network;
+            c.port     = cc.info.addr.port;
             c.priority = cc.info.priority;
             c.protocol = "udp";
-            if(cc.info.type != IceComponent::HostType)
-            {
+            if (cc.info.type != IceComponent::HostType) {
                 c.rel_addr = cc.info.base.addr;
                 c.rel_addr.setScopeId(QString());
                 c.rel_port = cc.info.base.port;
-            }
-            else
-            {
+            } else {
                 c.rel_addr = QHostAddress();
                 c.rel_port = -1;
             }
             c.rem_addr = QHostAddress();
             c.rem_port = -1;
-            c.type = candidateType_to_string(cc.info.type);
+            c.type     = candidateType_to_string(cc.info.type);
             list += c;
         }
-        if(!list.isEmpty())
+        if (!list.isEmpty())
             emit q->localCandidatesReady(list);
     }
 
     void it_readyRead(int path)
     {
         IceTransport *it = static_cast<IceTransport *>(sender());
-        int at = findLocalCandidate(it, path);
+        int           at = findLocalCandidate(it, path);
         Q_ASSERT(at != -1);
 
         IceComponent::Candidate &cc = localCandidates[at];
 
         IceTransport *sock = it;
 
-        while(sock->hasPendingDatagrams(path))
-        {
+        while (sock->hasPendingDatagrams(path)) {
             QHostAddress fromAddr;
-            int fromPort;
-            QByteArray buf = sock->readDatagram(path, &fromAddr, &fromPort);
+            int          fromPort;
+            QByteArray   buf = sock->readDatagram(path, &fromAddr, &fromPort);
 
-            //printf("port %d: received packet (%d bytes)\n", lt->sock->localPort(), buf.size());
+            // printf("port %d: received packet (%d bytes)\n", lt->sock->localPort(), buf.size());
 
-            QString requser = localUser + ':' + peerUser;
-            QByteArray reqkey = localPass.toUtf8();
+            QString    requser = localUser + ':' + peerUser;
+            QByteArray reqkey  = localPass.toUtf8();
 
             StunMessage::ConvertResult result;
-            StunMessage msg = StunMessage::fromBinary(buf, &result, StunMessage::MessageIntegrity | StunMessage::Fingerprint, reqkey);
-            if(!msg.isNull() && (msg.mclass() == StunMessage::Request || msg.mclass() == StunMessage::Indication))
-            {
-                printf("received validated request or indication from %s:%d\n", qPrintable(fromAddr.toString()), fromPort);
+            StunMessage                msg = StunMessage::fromBinary(buf, &result,
+                                                      StunMessage::MessageIntegrity | StunMessage::Fingerprint, reqkey);
+            if (!msg.isNull() && (msg.mclass() == StunMessage::Request || msg.mclass() == StunMessage::Indication)) {
+                printf("received validated request or indication from %s:%d\n", qPrintable(fromAddr.toString()),
+                       fromPort);
                 QString user = QString::fromUtf8(msg.attribute(0x0006)); // USERNAME
-                if(requser != user)
-                {
-                    printf("user [%s] is wrong.  it should be [%s].  skipping\n", qPrintable(user), qPrintable(requser));
+                if (requser != user) {
+                    printf("user [%s] is wrong.  it should be [%s].  skipping\n", qPrintable(user),
+                           qPrintable(requser));
                     continue;
                 }
 
-                if(msg.method() != 0x001)
-                {
+                if (msg.method() != 0x001) {
                     printf("not a binding request.  skipping\n");
                     continue;
                 }
@@ -990,14 +908,14 @@ private slots:
                 response.setMethod(0x001);
                 response.setId(msg.id());
 
-                quint16 port16 = fromPort;
-                quint32 addr4 = fromAddr.toIPv4Address();
-                QByteArray val(8, 0);
-                quint8 *p = (quint8 *)val.data();
+                quint16       port16 = fromPort;
+                quint32       addr4  = fromAddr.toIPv4Address();
+                QByteArray    val(8, 0);
+                quint8 *      p     = (quint8 *)val.data();
                 const quint8 *magic = response.magic();
-                p[0] = 0;
-                p[1] = 0x01;
-                p[2] = (port16 >> 8) & 0xff;
+                p[0]                = 0;
+                p[1]                = 0x01;
+                p[2]                = (port16 >> 8) & 0xff;
                 p[2] ^= magic[0];
                 p[3] = port16 & 0xff;
                 p[3] ^= magic[1];
@@ -1011,8 +929,8 @@ private slots:
                 p[7] ^= magic[3];
 
                 QList<StunMessage::Attribute> list;
-                StunMessage::Attribute attr;
-                attr.type = 0x0020;
+                StunMessage::Attribute        attr;
+                attr.type  = 0x0020;
                 attr.value = val;
                 list += attr;
 
@@ -1020,52 +938,44 @@ private slots:
 
                 QByteArray packet = response.toBinary(StunMessage::MessageIntegrity | StunMessage::Fingerprint, reqkey);
                 sock->writeDatagram(path, packet, fromAddr, fromPort);
-            }
-            else
-            {
-                QByteArray reskey = peerPass.toUtf8();
-                StunMessage msg = StunMessage::fromBinary(buf, &result, StunMessage::MessageIntegrity | StunMessage::Fingerprint, reskey);
-                if(!msg.isNull() && (msg.mclass() == StunMessage::SuccessResponse || msg.mclass() == StunMessage::ErrorResponse))
-                {
+            } else {
+                QByteArray  reskey = peerPass.toUtf8();
+                StunMessage msg    = StunMessage::fromBinary(
+                    buf, &result, StunMessage::MessageIntegrity | StunMessage::Fingerprint, reskey);
+                if (!msg.isNull()
+                    && (msg.mclass() == StunMessage::SuccessResponse || msg.mclass() == StunMessage::ErrorResponse)) {
                     printf("received validated response\n");
 
                     // FIXME: this is so gross and completely defeats the point of having pools
-                    for(int n = 0; n < checkList.pairs.count(); ++n)
-                    {
+                    for (int n = 0; n < checkList.pairs.count(); ++n) {
                         CandidatePair &pair = checkList.pairs[n];
-                        if(pair.local.addr.addr == cc.info.addr.addr && pair.local.addr.port == cc.info.addr.port)
+                        if (pair.local.addr.addr == cc.info.addr.addr && pair.local.addr.port == cc.info.addr.port)
                             pair.pool->writeIncomingMessage(msg);
                     }
-                }
-                else
-                {
-                    //printf("received some non-stun or invalid stun packet\n");
+                } else {
+                    // printf("received some non-stun or invalid stun packet\n");
 
                     // FIXME: i don't know if this is good enough
-                    if(StunMessage::isProbablyStun(buf))
-                    {
+                    if (StunMessage::isProbablyStun(buf)) {
                         printf("unexpected stun packet (loopback?), skipping.\n");
                         continue;
                     }
 
                     int at = -1;
-                    for(int n = 0; n < checkList.pairs.count(); ++n)
-                    {
+                    for (int n = 0; n < checkList.pairs.count(); ++n) {
                         CandidatePair &pair = checkList.pairs[n];
-                        if(pair.local.addr.addr == cc.info.addr.addr && pair.local.addr.port == cc.info.addr.port)
-                        {
+                        if (pair.local.addr.addr == cc.info.addr.addr && pair.local.addr.port == cc.info.addr.port) {
                             at = n;
                             break;
                         }
                     }
-                    if(at == -1)
-                    {
+                    if (at == -1) {
                         printf("the local transport does not seem to be associated with a candidate?!\n");
                         continue;
                     }
 
                     int componentIndex = checkList.pairs[at].local.componentId - 1;
-                    //printf("packet is considered to be application data for component index %d\n", componentIndex);
+                    // printf("packet is considered to be application data for component index %d\n", componentIndex);
 
                     // FIXME: this assumes components are ordered by id in our local arrays
                     in[componentIndex] += buf;
@@ -1090,46 +1000,43 @@ private slots:
         Q_UNUSED(port);
 
         StunTransactionPool *pool = static_cast<StunTransactionPool *>(sender());
-        int at = -1;
-        for(int n = 0; n < checkList.pairs.count(); ++n)
-        {
-            if(checkList.pairs[n].pool == pool)
-            {
+        int                  at   = -1;
+        for (int n = 0; n < checkList.pairs.count(); ++n) {
+            if (checkList.pairs[n].pool == pool) {
                 at = n;
                 break;
             }
         }
-        if(at == -1) // FIXME: assert?
+        if (at == -1) // FIXME: assert?
             return;
 
         CandidatePair &pair = checkList.pairs[at];
 
         at = findLocalCandidate(pair.local.addr.addr, pair.local.addr.port);
-        if(at == -1) // FIXME: assert?
+        if (at == -1) // FIXME: assert?
             return;
 
         IceComponent::Candidate &lc = localCandidates[at];
 
         IceTransport *sock = lc.iceTransport;
-        int path = lc.path;
+        int           path = lc.path;
 
-        printf("connectivity check from %s:%d to %s:%d\n", qPrintable(pair.local.addr.addr.toString()), pair.local.addr.port, qPrintable(pair.remote.addr.addr.toString()), pair.remote.addr.port);
+        printf("connectivity check from %s:%d to %s:%d\n", qPrintable(pair.local.addr.addr.toString()),
+               pair.local.addr.port, qPrintable(pair.remote.addr.addr.toString()), pair.remote.addr.port);
         sock->writeDatagram(path, packet, pair.remote.addr.addr, pair.remote.addr.port);
     }
 
     void binding_success()
     {
         StunBinding *binding = static_cast<StunBinding *>(sender());
-        int at = -1;
-        for(int n = 0; n < checkList.pairs.count(); ++n)
-        {
-            if(checkList.pairs[n].binding == binding)
-            {
+        int          at      = -1;
+        for (int n = 0; n < checkList.pairs.count(); ++n) {
+            if (checkList.pairs[n].binding == binding) {
                 at = n;
                 break;
             }
         }
-        if(at == -1)
+        if (at == -1)
             return;
 
         printf("check success\n");
@@ -1145,10 +1052,8 @@ private slots:
 
         // check if there's a candidate already valid
         at = -1;
-        for(int n = 0; n < checkList.pairs.count(); ++n)
-        {
-            if(checkList.pairs[n].local.componentId == pair.local.componentId && checkList.pairs[n].isValid)
-            {
+        for (int n = 0; n < checkList.pairs.count(); ++n) {
+            if (checkList.pairs[n].local.componentId == pair.local.componentId && checkList.pairs[n].isValid) {
                 at = n;
                 break;
             }
@@ -1156,48 +1061,32 @@ private slots:
 
         pair.isValid = true;
 
-        if(at == -1)
-        {
-            int at = findComponent(pair.local.componentId);
-            Component &c = components[at];
-            if(c.lowOverhead)
-            {
+        if (at == -1) {
+            int        at = findComponent(pair.local.componentId);
+            Component &c  = components[at];
+            if (c.lowOverhead) {
                 printf("component is flagged for low overhead.  setting up for %s;%d -> %s;%d\n",
-                    qPrintable(pair.local.addr.addr.toString()), pair.local.addr.port, qPrintable(pair.remote.addr.addr.toString()), pair.remote.addr.port);
-                at = findLocalCandidate(pair.local.addr.addr, pair.local.addr.port);
+                       qPrintable(pair.local.addr.addr.toString()), pair.local.addr.port,
+                       qPrintable(pair.remote.addr.addr.toString()), pair.remote.addr.port);
+                at                          = findLocalCandidate(pair.local.addr.addr, pair.local.addr.port);
                 IceComponent::Candidate &cc = localCandidates[at];
                 c.ic->flagPathAsLowOverhead(cc.id, pair.remote.addr.addr, pair.remote.addr.port);
             }
 
             emit q->componentReady(pair.local.componentId - 1);
-        }
-        else
-        {
+        } else {
             printf("component %d already active, not signalling\n", pair.local.componentId);
         }
     }
 };
 
-Ice176::Ice176(QObject *parent) :
-    QObject(parent)
-{
-    d = new Private(this);
-}
+Ice176::Ice176(QObject *parent) : QObject(parent) { d = new Private(this); }
 
-Ice176::~Ice176()
-{
-    delete d;
-}
+Ice176::~Ice176() { delete d; }
 
-void Ice176::reset()
-{
-    d->reset();
-}
+void Ice176::reset() { d->reset(); }
 
-void Ice176::setProxy(const TurnClient::Proxy &proxy)
-{
-    d->proxy = proxy;
-}
+void Ice176::setProxy(const TurnClient::Proxy &proxy) { d->proxy = proxy; }
 
 void Ice176::setPortReserver(UdpPortReserver *portReserver)
 {
@@ -1206,15 +1095,9 @@ void Ice176::setPortReserver(UdpPortReserver *portReserver)
     d->portReserver = portReserver;
 }
 
-void Ice176::setLocalAddresses(const QList<LocalAddress> &addrs)
-{
-    d->updateLocalAddresses(addrs);
-}
+void Ice176::setLocalAddresses(const QList<LocalAddress> &addrs) { d->updateLocalAddresses(addrs); }
 
-void Ice176::setExternalAddresses(const QList<ExternalAddress> &addrs)
-{
-    d->updateExternalAddresses(addrs);
-}
+void Ice176::setExternalAddresses(const QList<ExternalAddress> &addrs) { d->updateExternalAddresses(addrs); }
 
 void Ice176::setStunBindService(const QHostAddress &addr, int port)
 {
@@ -1222,7 +1105,8 @@ void Ice176::setStunBindService(const QHostAddress &addr, int port)
     d->stunBindPort = port;
 }
 
-void Ice176::setStunRelayUdpService(const QHostAddress &addr, int port, const QString &user, const QCA::SecureArray &pass)
+void Ice176::setStunRelayUdpService(const QHostAddress &addr, int port, const QString &user,
+                                    const QCA::SecureArray &pass)
 {
     d->stunRelayUdpAddr = addr;
     d->stunRelayUdpPort = port;
@@ -1230,7 +1114,8 @@ void Ice176::setStunRelayUdpService(const QHostAddress &addr, int port, const QS
     d->stunRelayUdpPass = pass;
 }
 
-void Ice176::setStunRelayTcpService(const QHostAddress &addr, int port, const QString &user, const QCA::SecureArray &pass)
+void Ice176::setStunRelayTcpService(const QHostAddress &addr, int port, const QString &user,
+                                    const QCA::SecureArray &pass)
 {
     d->stunRelayTcpAddr = addr;
     d->stunRelayTcpPort = port;
@@ -1238,25 +1123,13 @@ void Ice176::setStunRelayTcpService(const QHostAddress &addr, int port, const QS
     d->stunRelayTcpPass = pass;
 }
 
-void Ice176::setUseLocal(bool enabled)
-{
-    d->useLocal = enabled;
-}
+void Ice176::setUseLocal(bool enabled) { d->useLocal = enabled; }
 
-void Ice176::setUseStunBind(bool enabled)
-{
-    d->useStunBind = enabled;
-}
+void Ice176::setUseStunBind(bool enabled) { d->useStunBind = enabled; }
 
-void Ice176::setUseStunRelayUdp(bool enabled)
-{
-    d->useStunRelayUdp = enabled;
-}
+void Ice176::setUseStunRelayUdp(bool enabled) { d->useStunRelayUdp = enabled; }
 
-void Ice176::setUseStunRelayTcp(bool enabled)
-{
-    d->useStunRelayTcp = enabled;
-}
+void Ice176::setUseStunRelayTcp(bool enabled) { d->useStunRelayTcp = enabled; }
 
 void Ice176::setComponentCount(int count)
 {
@@ -1265,10 +1138,7 @@ void Ice176::setComponentCount(int count)
     d->componentCount = count;
 }
 
-void Ice176::setLocalCandidateTrickle(bool enabled)
-{
-    d->useTrickle = enabled;
-}
+void Ice176::setLocalCandidateTrickle(bool enabled) { d->useTrickle = enabled; }
 
 void Ice176::start(Mode mode)
 {
@@ -1276,64 +1146,34 @@ void Ice176::start(Mode mode)
     d->start();
 }
 
-void Ice176::stop()
-{
-    d->stop();
-}
+void Ice176::stop() { d->stop(); }
 
-QString Ice176::localUfrag() const
-{
-    return d->localUser;
-}
+QString Ice176::localUfrag() const { return d->localUser; }
 
-QString Ice176::localPassword() const
-{
-    return d->localPass;
-}
+QString Ice176::localPassword() const { return d->localPass; }
 
-void Ice176::setPeerUfrag(const QString &ufrag)
-{
-    d->peerUser = ufrag;
-}
+void Ice176::setPeerUfrag(const QString &ufrag) { d->peerUser = ufrag; }
 
-void Ice176::setPeerPassword(const QString &pass)
-{
-    d->peerPass = pass;
-}
+void Ice176::setPeerPassword(const QString &pass) { d->peerPass = pass; }
 
-void Ice176::addRemoteCandidates(const QList<Candidate> &list)
-{
-    d->addRemoteCandidates(list);
-}
+void Ice176::addRemoteCandidates(const QList<Candidate> &list) { d->addRemoteCandidates(list); }
 
-bool Ice176::hasPendingDatagrams(int componentIndex) const
-{
-    return !d->in[componentIndex].isEmpty();
-}
+bool Ice176::hasPendingDatagrams(int componentIndex) const { return !d->in[componentIndex].isEmpty(); }
 
-QByteArray Ice176::readDatagram(int componentIndex)
-{
-    return d->in[componentIndex].takeFirst();
-}
+QByteArray Ice176::readDatagram(int componentIndex) { return d->in[componentIndex].takeFirst(); }
 
-void Ice176::writeDatagram(int componentIndex, const QByteArray &datagram)
-{
-    d->write(componentIndex, datagram);
-}
+void Ice176::writeDatagram(int componentIndex, const QByteArray &datagram) { d->write(componentIndex, datagram); }
 
-void Ice176::flagComponentAsLowOverhead(int componentIndex)
-{
-    d->flagComponentAsLowOverhead(componentIndex);
-}
+void Ice176::flagComponentAsLowOverhead(int componentIndex) { d->flagComponentAsLowOverhead(componentIndex); }
 
 bool Ice176::isIPv6LinkLocalAddress(const QHostAddress &addr)
 {
     Q_ASSERT(addr.protocol() == QAbstractSocket::IPv6Protocol);
     Q_IPV6ADDR addr6 = addr.toIPv6Address();
-    quint16 hi = addr6[0];
+    quint16    hi    = addr6[0];
     hi <<= 8;
     hi += addr6[1];
-    if((hi & 0xffc0) == 0xfe80)
+    if ((hi & 0xffc0) == 0xfe80)
         return true;
     else
         return false;
diff --git a/src/irisnet/noncore/ice176.h b/src/irisnet/noncore/ice176.h
index 4a9c5ef7..690b7efe 100644
--- a/src/irisnet/noncore/ice176.h
+++ b/src/irisnet/noncore/ice176.h
@@ -26,83 +26,56 @@
 #include <QString>
 
 namespace QCA {
-    class SecureArray;
+class SecureArray;
 }
 
 namespace XMPP {
 class UdpPortReserver;
 
-class Ice176 : public QObject
-{
+class Ice176 : public QObject {
     Q_OBJECT
 
 public:
-    enum Error
-    {
-        ErrorGeneric
-    };
+    enum Error { ErrorGeneric };
 
-    enum Mode
-    {
-        Initiator,
-        Responder
-    };
+    enum Mode { Initiator, Responder };
 
-    class LocalAddress
-    {
+    class LocalAddress {
     public:
         QHostAddress addr;
-        int network; // -1 = unknown
-        bool isVpn;
-
-        LocalAddress() :
-            network(-1),
-            isVpn(false)
-        {
-        }
+        int          network; // -1 = unknown
+        bool         isVpn;
+
+        LocalAddress() : network(-1), isVpn(false) {}
     };
 
-    class ExternalAddress
-    {
+    class ExternalAddress {
     public:
         LocalAddress base;
         QHostAddress addr;
-        int portBase; // -1 = same as base
+        int          portBase; // -1 = same as base
 
-        ExternalAddress() :
-            portBase(-1)
-        {
-        }
+        ExternalAddress() : portBase(-1) {}
     };
 
-    class Candidate
-    {
+    class Candidate {
     public:
-        int component;
-        QString foundation;
-        int generation;
-        QString id;
+        int          component;
+        QString      foundation;
+        int          generation;
+        QString      id;
         QHostAddress ip;
-        int network; // -1 = unknown
-        int port;
-        int priority;
-        QString protocol;
+        int          network; // -1 = unknown
+        int          port;
+        int          priority;
+        QString      protocol;
         QHostAddress rel_addr;
-        int rel_port;
+        int          rel_port;
         QHostAddress rem_addr;
-        int rem_port;
-        QString type;
-
-        Candidate() :
-            component(-1),
-            generation(-1),
-            network(-1),
-            port(-1),
-            priority(-1),
-            rel_port(-1),
-            rem_port(-1)
-        {
-        }
+        int          rem_port;
+        QString      type;
+
+        Candidate() : component(-1), generation(-1), network(-1), port(-1), priority(-1), rel_port(-1), rem_port(-1) {}
     };
 
     Ice176(QObject *parent = nullptr);
@@ -147,9 +120,9 @@ class Ice176 : public QObject
 
     void addRemoteCandidates(const QList<Candidate> &list);
 
-    bool hasPendingDatagrams(int componentIndex) const;
+    bool       hasPendingDatagrams(int componentIndex) const;
     QByteArray readDatagram(int componentIndex);
-    void writeDatagram(int componentIndex, const QByteArray &datagram);
+    void       writeDatagram(int componentIndex, const QByteArray &datagram);
 
     // this call will ensure that TURN headers are minimized on this
     //   component, with the drawback that packets might not be able to
diff --git a/src/irisnet/noncore/icecomponent.cpp b/src/irisnet/noncore/icecomponent.cpp
index b8aa609b..45282dba 100644
--- a/src/irisnet/noncore/icecomponent.cpp
+++ b/src/irisnet/noncore/icecomponent.cpp
@@ -40,118 +40,96 @@ static int calc_priority(int typePref, int localPref, int componentId)
     return priority;
 }
 
-class IceComponent::Private : public QObject
-{
+class IceComponent::Private : public QObject {
     Q_OBJECT
 
 public:
-    class Config
-    {
+    class Config {
     public:
-        QList<Ice176::LocalAddress> localAddrs;
+        QList<Ice176::LocalAddress>    localAddrs;
         QList<Ice176::ExternalAddress> extAddrs;
 
         QHostAddress stunBindAddr;
-        int stunBindPort;
+        int          stunBindPort;
 
-        QHostAddress stunRelayUdpAddr;
-        int stunRelayUdpPort;
-        QString stunRelayUdpUser;
+        QHostAddress     stunRelayUdpAddr;
+        int              stunRelayUdpPort;
+        QString          stunRelayUdpUser;
         QCA::SecureArray stunRelayUdpPass;
 
-        QHostAddress stunRelayTcpAddr;
-        int stunRelayTcpPort;
-        QString stunRelayTcpUser;
+        QHostAddress     stunRelayTcpAddr;
+        int              stunRelayTcpPort;
+        QString          stunRelayTcpUser;
         QCA::SecureArray stunRelayTcpPass;
     };
 
-    class LocalTransport
-    {
+    class LocalTransport {
     public:
-        QUdpSocket *qsock;
-        bool borrowedSocket;
-        QHostAddress addr;
+        QUdpSocket *       qsock;
+        bool               borrowedSocket;
+        QHostAddress       addr;
         IceLocalTransport *sock;
-        int network;
-        bool isVpn;
-        bool started;
-        bool stun_started;
-        bool stun_finished, turn_finished;
-        QHostAddress extAddr;
-        bool ext_finished;
+        int                network;
+        bool               isVpn;
+        bool               started;
+        bool               stun_started;
+        bool               stun_finished, turn_finished;
+        QHostAddress       extAddr;
+        bool               ext_finished;
 
         LocalTransport() :
-            qsock(nullptr),
-            borrowedSocket(false),
-            sock(nullptr),
-            network(-1),
-            isVpn(false),
-            started(false),
-            stun_started(false),
-            stun_finished(false),
-            turn_finished(false),
-            ext_finished(false)
+            qsock(nullptr), borrowedSocket(false), sock(nullptr), network(-1), isVpn(false), started(false),
+            stun_started(false), stun_finished(false), turn_finished(false), ext_finished(false)
         {
         }
     };
 
-    IceComponent *q;
-    ObjectSession sess;
-    int id;
-    QString clientSoftware;
-    TurnClient::Proxy proxy;
-    UdpPortReserver *portReserver;
-    Config pending;
-    Config config;
-    bool stopping;
-    QList<LocalTransport*> localLeap;
-    QList<LocalTransport*> localStun;
-    IceTurnTransport *tt;
-    QList<Candidate> localCandidates;
-    QHash<int, QSet<TransportAddress> > channelPeers;
-    bool useLocal;
-    bool useStunBind;
-    bool useStunRelayUdp;
-    bool useStunRelayTcp;
-    bool local_finished;
-    int debugLevel;
+    IceComponent *                     q;
+    ObjectSession                      sess;
+    int                                id;
+    QString                            clientSoftware;
+    TurnClient::Proxy                  proxy;
+    UdpPortReserver *                  portReserver;
+    Config                             pending;
+    Config                             config;
+    bool                               stopping;
+    QList<LocalTransport *>            localLeap;
+    QList<LocalTransport *>            localStun;
+    IceTurnTransport *                 tt;
+    QList<Candidate>                   localCandidates;
+    QHash<int, QSet<TransportAddress>> channelPeers;
+    bool                               useLocal;
+    bool                               useStunBind;
+    bool                               useStunRelayUdp;
+    bool                               useStunRelayTcp;
+    bool                               local_finished;
+    int                                debugLevel;
 
     Private(IceComponent *_q) :
-        QObject(_q),
-        q(_q),
-        sess(this),
-        portReserver(nullptr),
-        stopping(false),
-        tt(nullptr),
-        useLocal(true),
-        useStunBind(true),
-        useStunRelayUdp(true),
-        useStunRelayTcp(true),
-        local_finished(false),
-        debugLevel(DL_None)
+        QObject(_q), q(_q), sess(this), portReserver(nullptr), stopping(false), tt(nullptr), useLocal(true),
+        useStunBind(true), useStunRelayUdp(true), useStunRelayTcp(true), local_finished(false), debugLevel(DL_None)
     {
     }
 
     ~Private()
     {
-        QList<QUdpSocket*> socketsToReturn;
+        QList<QUdpSocket *> socketsToReturn;
 
-        for(int n = 0; n < localLeap.count(); ++n)
-        {
+        for (int n = 0; n < localLeap.count(); ++n) {
             delete localLeap[n]->sock;
 
-            if(localLeap[n]->borrowedSocket)
+            if (localLeap[n]->borrowedSocket)
                 socketsToReturn += localLeap[n]->qsock;
             else
                 localLeap[n]->qsock->deleteLater();
         }
 
-        if(!socketsToReturn.isEmpty())
+        if (!socketsToReturn.isEmpty())
             portReserver->returnSockets(socketsToReturn);
 
         qDeleteAll(localLeap);
 
-        for(int n = 0; n < localStun.count(); ++n)
+        for (int n = 0; n < localStun.count(); ++n)
             delete localStun[n]->sock;
 
         qDeleteAll(localStun);
@@ -159,21 +137,18 @@ class IceComponent::Private : public QObject
         delete tt;
     }
 
-    void update(QList<QUdpSocket*> *socketList)
+    void update(QList<QUdpSocket *> *socketList)
     {
         Q_ASSERT(!stopping);
 
         // for now, only allow setting localAddrs once
-        if(!pending.localAddrs.isEmpty() && config.localAddrs.isEmpty())
-        {
-            foreach(const Ice176::LocalAddress &la, pending.localAddrs)
-            {
+        if (!pending.localAddrs.isEmpty() && config.localAddrs.isEmpty()) {
+            foreach (const Ice176::LocalAddress &la, pending.localAddrs) {
                 // skip duplicate addrs
-                if(findLocalAddr(la.addr) != -1)
+                if (findLocalAddr(la.addr) != -1)
                     continue;
 
-                if(!useLocal)
-                {
+                if (!useLocal) {
                     // skip out, but log the address in
                     //   case we need it for stun
                     config.localAddrs += la;
@@ -181,20 +156,16 @@ class IceComponent::Private : public QObject
                 }
 
                 QUdpSocket *qsock = nullptr;
-                if(socketList)
+                if (socketList)
                     qsock = takeFromSocketList(socketList, la.addr, this);
 
                 bool borrowedSocket;
-                if(qsock)
-                {
+                if (qsock) {
                     borrowedSocket = true;
-                }
-                else
-                {
+                } else {
                     // otherwise, bind to random
                     qsock = new QUdpSocket(this);
-                    if(!qsock->bind(la.addr, 0))
-                    {
+                    if (!qsock->bind(la.addr, 0)) {
                         delete qsock;
                         emit q->debugLine("Warning: unable to bind to random port.");
                         continue;
@@ -208,13 +179,13 @@ class IceComponent::Private : public QObject
                 config.localAddrs += la;
 
                 LocalTransport *lt = new LocalTransport;
-                lt->addr = la.addr;
-                lt->qsock = qsock;
+                lt->addr           = la.addr;
+                lt->qsock          = qsock;
                 lt->borrowedSocket = borrowedSocket;
-                lt->sock = new IceLocalTransport(this);
+                lt->sock           = new IceLocalTransport(this);
                 lt->sock->setDebugLevel((IceTransport::DebugLevel)debugLevel);
                 lt->network = la.network;
-                lt->isVpn = la.isVpn;
+                lt->isVpn   = la.isVpn;
                 connect(lt->sock, SIGNAL(started()), SLOT(lt_started()));
                 connect(lt->sock, SIGNAL(stopped()), SLOT(lt_stopped()));
                 connect(lt->sock, SIGNAL(addressesChanged()), SLOT(lt_addressesChanged()));
@@ -223,54 +194,50 @@ class IceComponent::Private : public QObject
                 localLeap += lt;
 
                 lt->sock->start(qsock);
-                emit q->debugLine(QString("starting transport ") + la.addr.toString() + ';' + QString::number(port) + " for component " + QString::number(id));
+                emit q->debugLine(QString("starting transport ") + la.addr.toString() + ';' + QString::number(port)
+                                  + " for component " + QString::number(id));
             }
         }
 
         // extAddrs created on demand if present, but only once
-        if(!pending.extAddrs.isEmpty() && config.extAddrs.isEmpty())
-        {
+        if (!pending.extAddrs.isEmpty() && config.extAddrs.isEmpty()) {
             config.extAddrs = pending.extAddrs;
 
             bool need_doExt = false;
 
-            foreach(LocalTransport *lt, localLeap)
-            {
+            foreach (LocalTransport *lt, localLeap) {
                 // already assigned an ext address?  skip
-                if(!lt->extAddr.isNull())
+                if (!lt->extAddr.isNull())
                     continue;
 
                 QHostAddress laddr = lt->sock->localAddress();
-                int lport = lt->sock->localPort();
+                int          lport = lt->sock->localPort();
 
                 int at = -1;
-                for(int n = 0; n < config.extAddrs.count(); ++n)
-                {
+                for (int n = 0; n < config.extAddrs.count(); ++n) {
                     const Ice176::ExternalAddress &ea = config.extAddrs[n];
-                    if(laddr.protocol() != QAbstractSocket::IPv6Protocol && ea.base.addr == laddr && (ea.portBase == -1 || ea.portBase == lport))
-                    {
+                    if (laddr.protocol() != QAbstractSocket::IPv6Protocol && ea.base.addr == laddr
+                        && (ea.portBase == -1 || ea.portBase == lport)) {
                         at = n;
                         break;
                     }
                 }
 
-                if(at != -1)
-                {
+                if (at != -1) {
                     lt->extAddr = config.extAddrs[at].addr;
-                    if(lt->started)
+                    if (lt->started)
                         need_doExt = true;
                 }
             }
 
-            if(need_doExt)
+            if (need_doExt)
                 sess.defer(this, "doExt");
         }
 
         // only allow setting stun stuff once
-        if(!pending.stunBindAddr.isNull() && config.stunBindAddr.isNull())
-        {
-            config.stunBindAddr = pending.stunBindAddr;
-            config.stunBindPort = pending.stunBindPort;
+        if (!pending.stunBindAddr.isNull() && config.stunBindAddr.isNull()) {
+            config.stunBindAddr     = pending.stunBindAddr;
+            config.stunBindPort     = pending.stunBindPort;
             config.stunRelayUdpAddr = pending.stunRelayUdpAddr;
             config.stunRelayUdpPort = pending.stunRelayUdpPort;
             config.stunRelayUdpUser = pending.stunRelayUdpUser;
@@ -283,20 +250,20 @@ class IceComponent::Private : public QObject
 
         // localStun sockets created on demand if stun settings are
         //   present, but only once (cannot be changed, for now)
-        if(((useStunBind && !config.stunBindAddr.isNull()) || (useStunRelayUdp && !config.stunRelayUdpAddr.isNull() && !config.stunRelayUdpUser.isEmpty())) && !config.localAddrs.isEmpty() && localStun.isEmpty())
-        {
-            foreach(const Ice176::LocalAddress &la, config.localAddrs)
-            {
+        if (((useStunBind && !config.stunBindAddr.isNull())
+             || (useStunRelayUdp && !config.stunRelayUdpAddr.isNull() && !config.stunRelayUdpUser.isEmpty()))
+            && !config.localAddrs.isEmpty() && localStun.isEmpty()) {
+            foreach (const Ice176::LocalAddress &la, config.localAddrs) {
                 // don't setup stun ports for ipv6
-                if(la.addr.protocol() == QAbstractSocket::IPv6Protocol)
+                if (la.addr.protocol() == QAbstractSocket::IPv6Protocol)
                     continue;
 
                 LocalTransport *lt = new LocalTransport;
-                lt->addr = la.addr;
-                lt->sock = new IceLocalTransport(this);
+                lt->addr           = la.addr;
+                lt->sock           = new IceLocalTransport(this);
                 lt->sock->setDebugLevel((IceTransport::DebugLevel)debugLevel);
                 lt->network = la.network;
-                lt->isVpn = la.isVpn;
+                lt->isVpn   = la.isVpn;
                 connect(lt->sock, SIGNAL(started()), SLOT(lt_started()));
                 connect(lt->sock, SIGNAL(stopped()), SLOT(lt_stopped()));
                 connect(lt->sock, SIGNAL(addressesChanged()), SLOT(lt_addressesChanged()));
@@ -306,21 +273,19 @@ class IceComponent::Private : public QObject
 
                 lt->sock->setClientSoftwareNameAndVersion(clientSoftware);
                 lt->sock->start(la.addr);
-                emit q->debugLine(QString("starting transport ") + la.addr.toString() + ";(dyn)" + " for component " + QString::number(id));
+                emit q->debugLine(QString("starting transport ") + la.addr.toString() + ";(dyn)" + " for component "
+                                  + QString::number(id));
             }
         }
 
-        if((!config.stunBindAddr.isNull() || !config.stunRelayUdpAddr.isNull()) && !localStun.isEmpty())
-        {
-            for(int n = 0; n < localStun.count(); ++n)
-            {
-                if(localStun[n]->started && !localStun[n]->stun_started)
+        if ((!config.stunBindAddr.isNull() || !config.stunRelayUdpAddr.isNull()) && !localStun.isEmpty()) {
+            for (int n = 0; n < localStun.count(); ++n) {
+                if (localStun[n]->started && !localStun[n]->stun_started)
                     tryStun(n);
             }
         }
 
-        if(useStunRelayTcp && !config.stunRelayTcpAddr.isNull() && !config.stunRelayTcpUser.isEmpty() && !tt)
-        {
+        if (useStunRelayTcp && !config.stunRelayTcpAddr.isNull() && !config.stunRelayTcpUser.isEmpty() && !tt) {
             tt = new IceTurnTransport(this);
             tt->setDebugLevel((IceTransport::DebugLevel)debugLevel);
             connect(tt, SIGNAL(started()), SLOT(tt_started()));
@@ -333,11 +298,11 @@ class IceComponent::Private : public QObject
             tt->setPassword(config.stunRelayTcpPass);
             tt->start(config.stunRelayTcpAddr, config.stunRelayTcpPort);
 
-            emit q->debugLine(QString("starting TURN transport with server ") + config.stunRelayTcpAddr.toString() + ';' + QString::number(config.stunRelayTcpPort) + " for component " + QString::number(id));
+            emit q->debugLine(QString("starting TURN transport with server ") + config.stunRelayTcpAddr.toString() + ';'
+                              + QString::number(config.stunRelayTcpPort) + " for component " + QString::number(id));
         }
 
-        if(localLeap.isEmpty() && localStun.isEmpty() && !local_finished)
-        {
+        if (localLeap.isEmpty() && localStun.isEmpty() && !local_finished) {
             local_finished = true;
             sess.defer(q, "localFinished");
         }
@@ -350,38 +315,33 @@ class IceComponent::Private : public QObject
         stopping = true;
 
         // nothing to stop?
-        if(allStopped())
-        {
+        if (allStopped()) {
             sess.defer(this, "postStop");
             return;
         }
 
-        foreach(LocalTransport *lt, localLeap)
+        foreach (LocalTransport *lt, localLeap)
             lt->sock->stop();
 
-        foreach(LocalTransport *lt, localStun)
+        foreach (LocalTransport *lt, localStun)
             lt->sock->stop();
 
-        if(tt)
+        if (tt)
             tt->stop();
     }
 
     int peerReflexivePriority(const IceTransport *iceTransport, int path) const
     {
-        int addrAt = -1;
-        const IceLocalTransport *lt = qobject_cast<const IceLocalTransport*>(iceTransport);
-        if(lt)
-        {
+        int                      addrAt = -1;
+        const IceLocalTransport *lt     = qobject_cast<const IceLocalTransport *>(iceTransport);
+        if (lt) {
             bool isLocalLeap = false;
-            addrAt = findLocalTransport(lt, &isLocalLeap);
-            if(addrAt != -1 && path == 1)
-            {
+            addrAt           = findLocalTransport(lt, &isLocalLeap);
+            if (addrAt != -1 && path == 1) {
                 // lower priority, but not as far as IceTurnTransport
                 addrAt += 512;
             }
-        }
-        else if(qobject_cast<const IceTurnTransport*>(iceTransport) == tt)
-        {
+        } else if (qobject_cast<const IceTurnTransport *>(iceTransport) == tt) {
             // lower priority by making it seem like the last nic
             addrAt = 1024;
         }
@@ -394,10 +354,8 @@ class IceComponent::Private : public QObject
     void flagPathAsLowOverhead(int id, const QHostAddress &addr, int port)
     {
         int at = -1;
-        for(int n = 0; n < localCandidates.count(); ++n)
-        {
-            if(localCandidates[n].id == id)
-            {
+        for (int n = 0; n < localCandidates.count(); ++n) {
+            if (localCandidates[n].id == id) {
                 at = n;
                 break;
             }
@@ -410,10 +368,9 @@ class IceComponent::Private : public QObject
 
         Candidate &c = localCandidates[at];
 
-        TransportAddress ta(addr, port);
+        TransportAddress        ta(addr, port);
         QSet<TransportAddress> &addrs = channelPeers[c.id];
-        if(!addrs.contains(ta))
-        {
+        if (!addrs.contains(ta)) {
             addrs += ta;
             c.iceTransport->addChannelPeer(ta.addr, ta.port);
         }
@@ -427,16 +384,14 @@ class IceComponent::Private : public QObject
     static int choose_default_priority(CandidateType type, int localPref, bool isVpn, int componentId)
     {
         int typePref;
-        if(type == HostType)
-        {
-            if(isVpn)
+        if (type == HostType) {
+            if (isVpn)
                 typePref = 0;
             else
                 typePref = 126;
-        }
-        else if(type == PeerReflexiveType)
+        } else if (type == PeerReflexiveType)
             typePref = 110;
-        else if(type == ServerReflexiveType)
+        else if (type == ServerReflexiveType)
             typePref = 100;
         else // RelayedType
             typePref = 0;
@@ -444,12 +399,11 @@ class IceComponent::Private : public QObject
         return calc_priority(typePref, localPref, componentId);
     }
 
-    static QUdpSocket *takeFromSocketList(QList<QUdpSocket*> *socketList, const QHostAddress &addr, QObject *parent = nullptr)
+    static QUdpSocket *takeFromSocketList(QList<QUdpSocket *> *socketList, const QHostAddress &addr,
+                                          QObject *parent = nullptr)
     {
-        for(int n = 0; n < socketList->count(); ++n)
-        {
-            if((*socketList)[n]->localAddress() == addr)
-            {
+        for (int n = 0; n < socketList->count(); ++n) {
+            if ((*socketList)[n]->localAddress() == addr) {
                 QUdpSocket *sock = socketList->takeAt(n);
                 sock->setParent(parent);
                 return sock;
@@ -461,28 +415,24 @@ class IceComponent::Private : public QObject
 
     int getId() const
     {
-        for(int n = 0;; ++n)
-        {
+        for (int n = 0;; ++n) {
             bool found = false;
-            foreach(const Candidate &c, localCandidates)
-            {
-                if(c.id == n)
-                {
+            foreach (const Candidate &c, localCandidates) {
+                if (c.id == n) {
                     found = true;
                     break;
                 }
             }
 
-            if(!found)
+            if (!found)
                 return n;
         }
     }
 
     int findLocalAddr(const QHostAddress &addr)
     {
-        for(int n = 0; n < config.localAddrs.count(); ++n)
-        {
-            if(config.localAddrs[n].addr == addr)
+        for (int n = 0; n < config.localAddrs.count(); ++n) {
+            if (config.localAddrs[n].addr == addr)
                 return n;
         }
 
@@ -491,19 +441,15 @@ class IceComponent::Private : public QObject
 
     int findLocalTransport(const IceLocalTransport *sock, bool *isLocalLeap) const
     {
-        for(int n = 0; n < localLeap.count(); ++n)
-        {
-            if(localLeap[n]->sock == sock)
-            {
+        for (int n = 0; n < localLeap.count(); ++n) {
+            if (localLeap[n]->sock == sock) {
                 *isLocalLeap = true;
                 return n;
             }
         }
 
-        for(int n = 0; n < localStun.count(); ++n)
-        {
-            if(localStun[n]->sock == sock)
-            {
+        for (int n = 0; n < localStun.count(); ++n) {
+            if (localStun[n]->sock == sock) {
                 *isLocalLeap = false;
                 return n;
             }
@@ -517,19 +463,18 @@ class IceComponent::Private : public QObject
         LocalTransport *lt = localStun[at];
 
         bool atLeastOne = false;
-        if(useStunBind && !config.stunBindAddr.isNull())
-        {
+        if (useStunBind && !config.stunBindAddr.isNull()) {
             atLeastOne = true;
             lt->sock->setStunBindService(config.stunBindAddr, config.stunBindPort);
         }
-        if(useStunRelayUdp && !config.stunRelayUdpAddr.isNull() && !config.stunRelayUdpUser.isEmpty())
-        {
+        if (useStunRelayUdp && !config.stunRelayUdpAddr.isNull() && !config.stunRelayUdpUser.isEmpty()) {
             atLeastOne = true;
-            lt->sock->setStunRelayService(config.stunRelayUdpAddr, config.stunRelayUdpPort, config.stunRelayUdpUser, config.stunRelayUdpPass);
+            lt->sock->setStunRelayService(config.stunRelayUdpAddr, config.stunRelayUdpPort, config.stunRelayUdpUser,
+                                          config.stunRelayUdpPass);
         }
 
         Q_ASSERT(atLeastOne);
-        if(!atLeastOne)
+        if (!atLeastOne)
             abort();
 
         lt->stun_started = true;
@@ -538,23 +483,22 @@ class IceComponent::Private : public QObject
 
     void ensureExt(LocalTransport *lt, int addrAt)
     {
-        if(!lt->extAddr.isNull() && !lt->ext_finished)
-        {
+        if (!lt->extAddr.isNull() && !lt->ext_finished) {
             CandidateInfo ci;
-            ci.addr.addr = lt->extAddr;
-            ci.addr.port = lt->sock->localPort();
-            ci.type = ServerReflexiveType;
+            ci.addr.addr   = lt->extAddr;
+            ci.addr.port   = lt->sock->localPort();
+            ci.type        = ServerReflexiveType;
             ci.componentId = id;
-            ci.priority = choose_default_priority(ci.type, 65535 - addrAt, lt->isVpn, ci.componentId);
-            ci.base.addr = lt->sock->localAddress();
-            ci.base.port = lt->sock->localPort();
-            ci.network = lt->network;
+            ci.priority    = choose_default_priority(ci.type, 65535 - addrAt, lt->isVpn, ci.componentId);
+            ci.base.addr   = lt->sock->localAddress();
+            ci.base.port   = lt->sock->localPort();
+            ci.network     = lt->network;
 
             Candidate c;
-            c.id = getId();
-            c.info = ci;
+            c.id           = getId();
+            c.info         = ci;
             c.iceTransport = lt->sock;
-            c.path = 0;
+            c.path         = 0;
 
             localCandidates += c;
             lt->ext_finished = true;
@@ -567,19 +511,17 @@ class IceComponent::Private : public QObject
     {
         ObjectSessionWatcher watch(&sess);
 
-        for(int n = 0; n < localCandidates.count(); ++n)
-        {
+        for (int n = 0; n < localCandidates.count(); ++n) {
             Candidate &c = localCandidates[n];
 
-            if(c.iceTransport == sock)
-            {
+            if (c.iceTransport == sock) {
                 Candidate tmp = localCandidates.takeAt(n);
                 --n; // adjust position
 
                 channelPeers.remove(tmp.id);
 
                 emit q->candidateRemoved(tmp);
-                if(!watch.isValid())
+                if (!watch.isValid())
                     return;
             }
         }
@@ -587,7 +529,7 @@ class IceComponent::Private : public QObject
 
     bool allStopped() const
     {
-        if(localLeap.isEmpty() && localStun.isEmpty() && !tt)
+        if (localLeap.isEmpty() && localStun.isEmpty() && !tt)
             return true;
         else
             return false;
@@ -595,27 +537,25 @@ class IceComponent::Private : public QObject
 
     void tryStopped()
     {
-        if(allStopped())
+        if (allStopped())
             postStop();
     }
 
 private slots:
     void doExt()
     {
-        if(stopping)
+        if (stopping)
             return;
 
         ObjectSessionWatcher watch(&sess);
 
-        foreach(LocalTransport *lt, localLeap)
-        {
-            if(lt->started)
-            {
+        foreach (LocalTransport *lt, localLeap) {
+            if (lt->started) {
                 int addrAt = findLocalAddr(lt->addr);
                 Q_ASSERT(addrAt != -1);
 
                 ensureExt(lt, addrAt);
-                if(!watch.isValid())
+                if (!watch.isValid())
                     return;
             }
         }
@@ -630,13 +570,13 @@ private slots:
 
     void lt_started()
     {
-        IceLocalTransport *sock = static_cast<IceLocalTransport *>(sender());
-        bool isLocalLeap = false;
-        int at = findLocalTransport(sock, &isLocalLeap);
+        IceLocalTransport *sock        = static_cast<IceLocalTransport *>(sender());
+        bool               isLocalLeap = false;
+        int                at          = findLocalTransport(sock, &isLocalLeap);
         Q_ASSERT(at != -1);
 
         LocalTransport *lt;
-        if(isLocalLeap)
+        if (isLocalLeap)
             lt = localLeap[at];
         else
             lt = localStun[at];
@@ -648,60 +588,53 @@ private slots:
 
         ObjectSessionWatcher watch(&sess);
 
-        if(useLocal && isLocalLeap)
-        {
+        if (useLocal && isLocalLeap) {
             CandidateInfo ci;
-            ci.addr.addr = lt->sock->localAddress();
-            ci.addr.port = lt->sock->localPort();
-            ci.type = HostType;
+            ci.addr.addr   = lt->sock->localAddress();
+            ci.addr.port   = lt->sock->localPort();
+            ci.type        = HostType;
             ci.componentId = id;
-            ci.priority = choose_default_priority(ci.type, 65535 - addrAt, lt->isVpn, ci.componentId);
-            ci.base = ci.addr;
-            ci.network = lt->network;
+            ci.priority    = choose_default_priority(ci.type, 65535 - addrAt, lt->isVpn, ci.componentId);
+            ci.base        = ci.addr;
+            ci.network     = lt->network;
 
             Candidate c;
-            c.id = getId();
-            c.info = ci;
+            c.id           = getId();
+            c.info         = ci;
             c.iceTransport = sock;
-            c.path = 0;
+            c.path         = 0;
 
             localCandidates += c;
 
             emit q->candidateAdded(c);
-            if(!watch.isValid())
+            if (!watch.isValid())
                 return;
 
             ensureExt(lt, addrAt);
-            if(!watch.isValid())
+            if (!watch.isValid())
                 return;
         }
 
-        if(!isLocalLeap && !lt->stun_started)
+        if (!isLocalLeap && !lt->stun_started)
             tryStun(at);
 
         bool allFinished = true;
-        foreach(const LocalTransport *lt, localLeap)
-        {
-            if(!lt->started)
-            {
+        foreach (const LocalTransport *lt, localLeap) {
+            if (!lt->started) {
                 allFinished = false;
                 break;
             }
         }
-        if(allFinished)
-        {
-            foreach(const LocalTransport *lt, localStun)
-            {
-                if(!lt->started)
-                {
+        if (allFinished) {
+            foreach (const LocalTransport *lt, localStun) {
+                if (!lt->started) {
                     allFinished = false;
                     break;
                 }
             }
         }
 
-        if(allFinished && !local_finished)
-        {
+        if (allFinished && !local_finished) {
             local_finished = true;
             emit q->localFinished();
         }
@@ -709,13 +642,13 @@ private slots:
 
     void lt_stopped()
     {
-        IceLocalTransport *sock = static_cast<IceLocalTransport *>(sender());
-        bool isLocalLeap = false;
-        int at = findLocalTransport(sock, &isLocalLeap);
+        IceLocalTransport *sock        = static_cast<IceLocalTransport *>(sender());
+        bool               isLocalLeap = false;
+        int                at          = findLocalTransport(sock, &isLocalLeap);
         Q_ASSERT(at != -1);
 
         LocalTransport *lt;
-        if(isLocalLeap)
+        if (isLocalLeap)
             lt = localLeap[at];
         else
             lt = localStun[at];
@@ -723,24 +656,21 @@ private slots:
         ObjectSessionWatcher watch(&sess);
 
         removeLocalCandidates(lt->sock);
-        if(!watch.isValid())
+        if (!watch.isValid())
             return;
 
         delete lt->sock;
         lt->sock = nullptr;
 
-        if(isLocalLeap)
-        {
-            if(lt->borrowedSocket)
-                portReserver->returnSockets(QList<QUdpSocket*>() << lt->qsock);
+        if (isLocalLeap) {
+            if (lt->borrowedSocket)
+                portReserver->returnSockets(QList<QUdpSocket *>() << lt->qsock);
             else
                 lt->qsock->deleteLater();
 
             delete lt;
             localLeap.removeAt(at);
-        }
-        else
-        {
+        } else {
             delete lt;
             localStun.removeAt(at);
         }
@@ -750,9 +680,9 @@ private slots:
 
     void lt_addressesChanged()
     {
-        IceLocalTransport *sock = static_cast<IceLocalTransport *>(sender());
-        bool isLocalLeap = false;
-        int at = findLocalTransport(sock, &isLocalLeap);
+        IceLocalTransport *sock        = static_cast<IceLocalTransport *>(sender());
+        bool               isLocalLeap = false;
+        int                at          = findLocalTransport(sock, &isLocalLeap);
         Q_ASSERT(at != -1);
 
         // leap does not use stun, so we should not get this signal
@@ -765,68 +695,63 @@ private slots:
 
         ObjectSessionWatcher watch(&sess);
 
-        if(useStunBind && !lt->sock->serverReflexiveAddress().isNull() && !lt->stun_finished)
-        {
+        if (useStunBind && !lt->sock->serverReflexiveAddress().isNull() && !lt->stun_finished) {
             // automatically assign ext to related leaps, if possible
-            foreach(LocalTransport *i, localLeap)
-            {
-                if(i->extAddr.isNull() && i->sock->localAddress() == lt->sock->localAddress())
-                {
+            foreach (LocalTransport *i, localLeap) {
+                if (i->extAddr.isNull() && i->sock->localAddress() == lt->sock->localAddress()) {
                     i->extAddr = lt->sock->serverReflexiveAddress();
-                    if(i->started)
-                    {
+                    if (i->started) {
                         ensureExt(i, addrAt);
-                        if(!watch.isValid())
+                        if (!watch.isValid())
                             return;
                     }
                 }
             }
 
             CandidateInfo ci;
-            ci.addr.addr = lt->sock->serverReflexiveAddress();
-            ci.addr.port = lt->sock->serverReflexivePort();
-            ci.type = ServerReflexiveType;
+            ci.addr.addr   = lt->sock->serverReflexiveAddress();
+            ci.addr.port   = lt->sock->serverReflexivePort();
+            ci.type        = ServerReflexiveType;
             ci.componentId = id;
-            ci.priority = choose_default_priority(ci.type, 65535 - addrAt, lt->isVpn, ci.componentId);
+            ci.priority    = choose_default_priority(ci.type, 65535 - addrAt, lt->isVpn, ci.componentId);
             // stun is only used on non-leap sockets, but we don't
             //   announce non-leap local candidates, so make the
             //   base the same as the srflx
-            //ci.base.addr = lt->sock->localAddress();
-            //ci.base.port = lt->sock->localPort();
-            ci.base = ci.addr;
+            // ci.base.addr = lt->sock->localAddress();
+            // ci.base.port = lt->sock->localPort();
+            ci.base    = ci.addr;
             ci.network = lt->network;
 
             Candidate c;
-            c.id = getId();
-            c.info = ci;
+            c.id           = getId();
+            c.info         = ci;
             c.iceTransport = sock;
-            c.path = 0;
+            c.path         = 0;
 
             localCandidates += c;
             lt->stun_finished = true;
 
             emit q->candidateAdded(c);
-            if(!watch.isValid())
+            if (!watch.isValid())
                 return;
         }
 
-        if(!lt->sock->relayedAddress().isNull() && !lt->turn_finished)
-        {
+        if (!lt->sock->relayedAddress().isNull() && !lt->turn_finished) {
             CandidateInfo ci;
-            ci.addr.addr = lt->sock->relayedAddress();
-            ci.addr.port = lt->sock->relayedPort();
-            ci.type = RelayedType;
+            ci.addr.addr   = lt->sock->relayedAddress();
+            ci.addr.port   = lt->sock->relayedPort();
+            ci.type        = RelayedType;
             ci.componentId = id;
-            ci.priority = choose_default_priority(ci.type, 65535 - addrAt, lt->isVpn, ci.componentId);
-            ci.base.addr = lt->sock->serverReflexiveAddress();
-            ci.base.port = lt->sock->serverReflexivePort();
-            ci.network = lt->network;
+            ci.priority    = choose_default_priority(ci.type, 65535 - addrAt, lt->isVpn, ci.componentId);
+            ci.base.addr   = lt->sock->serverReflexiveAddress();
+            ci.base.port   = lt->sock->serverReflexivePort();
+            ci.network     = lt->network;
 
             Candidate c;
-            c.id = getId();
-            c.info = ci;
+            c.id           = getId();
+            c.info         = ci;
             c.iceTransport = sock;
-            c.path = 1;
+            c.path         = 1;
 
             localCandidates += c;
             lt->turn_finished = true;
@@ -839,13 +764,13 @@ private slots:
     {
         Q_UNUSED(e);
 
-        IceLocalTransport *sock = static_cast<IceLocalTransport *>(sender());
-        bool isLocalLeap = false;
-        int at = findLocalTransport(sock, &isLocalLeap);
+        IceLocalTransport *sock        = static_cast<IceLocalTransport *>(sender());
+        bool               isLocalLeap = false;
+        int                at          = findLocalTransport(sock, &isLocalLeap);
         Q_ASSERT(at != -1);
 
         LocalTransport *lt;
-        if(isLocalLeap)
+        if (isLocalLeap)
             lt = localLeap[at];
         else
             lt = localStun[at];
@@ -853,33 +778,27 @@ private slots:
         ObjectSessionWatcher watch(&sess);
 
         removeLocalCandidates(lt->sock);
-        if(!watch.isValid())
+        if (!watch.isValid())
             return;
 
         delete lt->sock;
         lt->sock = nullptr;
 
-        if(isLocalLeap)
-        {
-            if(lt->borrowedSocket)
-                portReserver->returnSockets(QList<QUdpSocket*>() << lt->qsock);
+        if (isLocalLeap) {
+            if (lt->borrowedSocket)
+                portReserver->returnSockets(QList<QUdpSocket *>() << lt->qsock);
             else
                 lt->qsock->deleteLater();
 
             delete lt;
             localLeap.removeAt(at);
-        }
-        else
-        {
+        } else {
             delete lt;
             localStun.removeAt(at);
         }
     }
 
-    void lt_debugLine(const QString &line)
-    {
-        emit q->debugLine(line);
-    }
+    void lt_debugLine(const QString &line) { emit q->debugLine(line); }
 
     void tt_started()
     {
@@ -887,19 +806,19 @@ private slots:
         int addrAt = 1024;
 
         CandidateInfo ci;
-        ci.addr.addr = tt->relayedAddress();
-        ci.addr.port = tt->relayedPort();
-        ci.type = RelayedType;
+        ci.addr.addr   = tt->relayedAddress();
+        ci.addr.port   = tt->relayedPort();
+        ci.type        = RelayedType;
         ci.componentId = id;
-        ci.priority = choose_default_priority(ci.type, 65535 - addrAt, false, ci.componentId);
-        ci.base = ci.addr;
-        ci.network = 0; // not relevant
+        ci.priority    = choose_default_priority(ci.type, 65535 - addrAt, false, ci.componentId);
+        ci.base        = ci.addr;
+        ci.network     = 0; // not relevant
 
         Candidate c;
-        c.id = getId();
-        c.info = ci;
+        c.id           = getId();
+        c.info         = ci;
         c.iceTransport = tt;
-        c.path = 0;
+        c.path         = 0;
 
         localCandidates += c;
 
@@ -911,7 +830,7 @@ private slots:
         ObjectSessionWatcher watch(&sess);
 
         removeLocalCandidates(tt);
-        if(!watch.isValid())
+        if (!watch.isValid())
             return;
 
         delete tt;
@@ -927,60 +846,35 @@ private slots:
         ObjectSessionWatcher watch(&sess);
 
         removeLocalCandidates(tt);
-        if(!watch.isValid())
+        if (!watch.isValid())
             return;
 
         delete tt;
         tt = nullptr;
     }
 
-    void tt_debugLine(const QString &line)
-    {
-        emit q->debugLine(line);
-    }
+    void tt_debugLine(const QString &line) { emit q->debugLine(line); }
 };
 
-IceComponent::IceComponent(int id, QObject *parent) :
-    QObject(parent)
+IceComponent::IceComponent(int id, QObject *parent) : QObject(parent)
 {
-    d = new Private(this);
+    d     = new Private(this);
     d->id = id;
 }
 
-IceComponent::~IceComponent()
-{
-    delete d;
-}
+IceComponent::~IceComponent() { delete d; }
 
-int IceComponent::id() const
-{
-    return d->id;
-}
+int IceComponent::id() const { return d->id; }
 
-void IceComponent::setClientSoftwareNameAndVersion(const QString &str)
-{
-    d->clientSoftware = str;
-}
+void IceComponent::setClientSoftwareNameAndVersion(const QString &str) { d->clientSoftware = str; }
 
-void IceComponent::setProxy(const TurnClient::Proxy &proxy)
-{
-    d->proxy = proxy;
-}
+void IceComponent::setProxy(const TurnClient::Proxy &proxy) { d->proxy = proxy; }
 
-void IceComponent::setPortReserver(UdpPortReserver *portReserver)
-{
-    d->portReserver = portReserver;
-}
+void IceComponent::setPortReserver(UdpPortReserver *portReserver) { d->portReserver = portReserver; }
 
-void IceComponent::setLocalAddresses(const QList<Ice176::LocalAddress> &addrs)
-{
-    d->pending.localAddrs = addrs;
-}
+void IceComponent::setLocalAddresses(const QList<Ice176::LocalAddress> &addrs) { d->pending.localAddrs = addrs; }
 
-void IceComponent::setExternalAddresses(const QList<Ice176::ExternalAddress> &addrs)
-{
-    d->pending.extAddrs = addrs;
-}
+void IceComponent::setExternalAddresses(const QList<Ice176::ExternalAddress> &addrs) { d->pending.extAddrs = addrs; }
 
 void IceComponent::setStunBindService(const QHostAddress &addr, int port)
 {
@@ -988,7 +882,8 @@ void IceComponent::setStunBindService(const QHostAddress &addr, int port)
     d->pending.stunBindPort = port;
 }
 
-void IceComponent::setStunRelayUdpService(const QHostAddress &addr, int port, const QString &user, const QCA::SecureArray &pass)
+void IceComponent::setStunRelayUdpService(const QHostAddress &addr, int port, const QString &user,
+                                          const QCA::SecureArray &pass)
 {
     d->pending.stunRelayUdpAddr = addr;
     d->pending.stunRelayUdpPort = port;
@@ -996,7 +891,8 @@ void IceComponent::setStunRelayUdpService(const QHostAddress &addr, int port, co
     d->pending.stunRelayUdpPass = pass;
 }
 
-void IceComponent::setStunRelayTcpService(const QHostAddress &addr, int port, const QString &user, const QCA::SecureArray &pass)
+void IceComponent::setStunRelayTcpService(const QHostAddress &addr, int port, const QString &user,
+                                          const QCA::SecureArray &pass)
 {
     d->pending.stunRelayTcpAddr = addr;
     d->pending.stunRelayTcpPort = port;
@@ -1004,35 +900,17 @@ void IceComponent::setStunRelayTcpService(const QHostAddress &addr, int port, co
     d->pending.stunRelayTcpPass = pass;
 }
 
-void IceComponent::setUseLocal(bool enabled)
-{
-    d->useLocal = enabled;
-}
+void IceComponent::setUseLocal(bool enabled) { d->useLocal = enabled; }
 
-void IceComponent::setUseStunBind(bool enabled)
-{
-    d->useStunBind = enabled;
-}
+void IceComponent::setUseStunBind(bool enabled) { d->useStunBind = enabled; }
 
-void IceComponent::setUseStunRelayUdp(bool enabled)
-{
-    d->useStunRelayUdp = enabled;
-}
+void IceComponent::setUseStunRelayUdp(bool enabled) { d->useStunRelayUdp = enabled; }
 
-void IceComponent::setUseStunRelayTcp(bool enabled)
-{
-    d->useStunRelayTcp = enabled;
-}
+void IceComponent::setUseStunRelayTcp(bool enabled) { d->useStunRelayTcp = enabled; }
 
-void IceComponent::update(QList<QUdpSocket*> *socketList)
-{
-    d->update(socketList);
-}
+void IceComponent::update(QList<QUdpSocket *> *socketList) { d->update(socketList); }
 
-void IceComponent::stop()
-{
-    d->stop();
-}
+void IceComponent::stop() { d->stop(); }
 
 int IceComponent::peerReflexivePriority(const IceTransport *iceTransport, int path) const
 {
@@ -1047,11 +925,11 @@ void IceComponent::flagPathAsLowOverhead(int id, const QHostAddress &addr, int p
 void IceComponent::setDebugLevel(DebugLevel level)
 {
     d->debugLevel = level;
-    foreach(const Private::LocalTransport *lt, d->localLeap)
+    foreach (const Private::LocalTransport *lt, d->localLeap)
         lt->sock->setDebugLevel((IceTransport::DebugLevel)level);
-    foreach(const Private::LocalTransport *lt, d->localStun)
+    foreach (const Private::LocalTransport *lt, d->localStun)
         lt->sock->setDebugLevel((IceTransport::DebugLevel)level);
-    if(d->tt)
+    if (d->tt)
         d->tt->setDebugLevel((IceTransport::DebugLevel)level);
 }
 
diff --git a/src/irisnet/noncore/icecomponent.h b/src/irisnet/noncore/icecomponent.h
index b31b58b7..74055b0c 100644
--- a/src/irisnet/noncore/icecomponent.h
+++ b/src/irisnet/noncore/icecomponent.h
@@ -30,66 +30,46 @@ class QUdpSocket;
 namespace XMPP {
 class UdpPortReserver;
 
-class IceComponent : public QObject
-{
+class IceComponent : public QObject {
     Q_OBJECT
 
 public:
-    enum CandidateType
-    {
-        HostType,
-        PeerReflexiveType,
-        ServerReflexiveType,
-        RelayedType
-    };
+    enum CandidateType { HostType, PeerReflexiveType, ServerReflexiveType, RelayedType };
 
-    class TransportAddress
-    {
+    class TransportAddress {
     public:
         QHostAddress addr;
-        int port;
+        int          port;
 
-        TransportAddress() :
-            port(-1)
-        {
-        }
+        TransportAddress() : port(-1) {}
 
-        TransportAddress(const QHostAddress &_addr, int _port) :
-            addr(_addr),
-            port(_port)
-        {
-        }
+        TransportAddress(const QHostAddress &_addr, int _port) : addr(_addr), port(_port) {}
 
         bool operator==(const TransportAddress &other) const
         {
-            if(addr == other.addr && port == other.port)
+            if (addr == other.addr && port == other.port)
                 return true;
             else
                 return false;
         }
 
-        inline bool operator!=(const TransportAddress &other) const
-        {
-            return !operator==(other);
-        }
+        inline bool operator!=(const TransportAddress &other) const { return !operator==(other); }
     };
 
-    class CandidateInfo
-    {
+    class CandidateInfo {
     public:
         TransportAddress addr;
-        CandidateType type;
-        int priority;
-        QString foundation;
-        int componentId;
+        CandidateType    type;
+        int              priority;
+        QString          foundation;
+        int              componentId;
         TransportAddress base;
         TransportAddress related;
-        QString id;
-        int network;
+        QString          id;
+        int              network;
     };
 
-    class Candidate
-    {
+    class Candidate {
     public:
         // unique across all candidates within this component
         int id;
@@ -103,15 +83,10 @@ class IceComponent : public QObject
 
         // note that these may be the same for multiple candidates
         IceTransport *iceTransport;
-        int path;
+        int           path;
     };
 
-    enum DebugLevel
-    {
-        DL_None,
-        DL_Info,
-        DL_Packet
-    };
+    enum DebugLevel { DL_None, DL_Info, DL_Packet };
 
     IceComponent(int id, QObject *parent = nullptr);
     ~IceComponent();
@@ -143,7 +118,7 @@ class IceComponent : public QObject
     void setUseStunRelayTcp(bool enabled);
 
     // if socketList is not null then port reserver must be set
-    void update(QList<QUdpSocket*> *socketList = nullptr);
+    void update(QList<QUdpSocket *> *socketList = nullptr);
     void stop();
 
     // prflx priority to use when replying from this transport/path
@@ -180,6 +155,6 @@ inline uint qHash(const XMPP::IceComponent::TransportAddress &key, uint seed = 0
 {
     return ::qHash(key.addr, seed) ^ ::qHash(key.port, seed);
 }
-} //namespace XMPP
+} // namespace XMPP
 
 #endif // ICECOMPONENT_H
diff --git a/src/irisnet/noncore/icelocaltransport.cpp b/src/irisnet/noncore/icelocaltransport.cpp
index 53e009c4..d0a799fe 100644
--- a/src/irisnet/noncore/icelocaltransport.cpp
+++ b/src/irisnet/noncore/icelocaltransport.cpp
@@ -33,30 +33,22 @@
 #define MAX_PACKET_QUEUE 64
 
 namespace XMPP {
-enum
-{
-    Direct,
-    Relayed
-};
+enum { Direct, Relayed };
 
 //----------------------------------------------------------------------------
 // SafeUdpSocket
 //----------------------------------------------------------------------------
 // DOR-safe wrapper for QUdpSocket
-class SafeUdpSocket : public QObject
-{
+class SafeUdpSocket : public QObject {
     Q_OBJECT
 
 private:
     ObjectSession sess;
-    QUdpSocket *sock;
-    int writtenCount;
+    QUdpSocket *  sock;
+    int           writtenCount;
 
 public:
-    SafeUdpSocket(QUdpSocket *_sock, QObject *parent = nullptr) :
-        QObject(parent),
-        sess(this),
-        sock(_sock)
+    SafeUdpSocket(QUdpSocket *_sock, QObject *parent = nullptr) : QObject(parent), sess(this), sock(_sock)
     {
         sock->setParent(this);
         connect(sock, SIGNAL(readyRead()), SLOT(sock_readyRead()));
@@ -67,8 +59,7 @@ class SafeUdpSocket : public QObject
 
     ~SafeUdpSocket()
     {
-        if(sock)
-        {
+        if (sock) {
             QUdpSocket *out = release();
             out->deleteLater();
         }
@@ -79,28 +70,19 @@ class SafeUdpSocket : public QObject
         sock->disconnect(this);
         sock->setParent(nullptr);
         QUdpSocket *out = sock;
-        sock = nullptr;
+        sock            = nullptr;
         return out;
     }
 
-    QHostAddress localAddress() const
-    {
-        return sock->localAddress();
-    }
+    QHostAddress localAddress() const { return sock->localAddress(); }
 
-    quint16 localPort() const
-    {
-        return sock->localPort();
-    }
+    quint16 localPort() const { return sock->localPort(); }
 
-    bool hasPendingDatagrams() const
-    {
-        return sock->hasPendingDatagrams();
-    }
+    bool hasPendingDatagrams() const { return sock->hasPendingDatagrams(); }
 
     QByteArray readDatagram(QHostAddress *address = nullptr, quint16 *port = nullptr)
     {
-        if(!sock->hasPendingDatagrams())
+        if (!sock->hasPendingDatagrams())
             return QByteArray();
 
         QByteArray buf;
@@ -119,10 +101,7 @@ class SafeUdpSocket : public QObject
     void datagramsWritten(int count);
 
 private slots:
-    void sock_readyRead()
-    {
-        emit readyRead();
-    }
+    void sock_readyRead() { emit readyRead(); }
 
     void sock_bytesWritten(qint64 bytes)
     {
@@ -134,7 +113,7 @@ private slots:
 
     void processWritten()
     {
-        int count = writtenCount;
+        int count    = writtenCount;
         writtenCount = 0;
 
         emit datagramsWritten(count);
@@ -144,93 +123,69 @@ private slots:
 //----------------------------------------------------------------------------
 // IceLocalTransport
 //----------------------------------------------------------------------------
-class IceLocalTransport::Private : public QObject
-{
+class IceLocalTransport::Private : public QObject {
     Q_OBJECT
 
 public:
-    class WriteItem
-    {
+    class WriteItem {
     public:
-        enum Type
-        {
-            Direct,
-            Pool,
-            Turn
-        };
-
-        Type type;
+        enum Type { Direct, Pool, Turn };
+
+        Type         type;
         QHostAddress addr;
-        int port;
+        int          port;
     };
 
-    class Written
-    {
+    class Written {
     public:
         QHostAddress addr;
-        int port;
-        int count;
+        int          port;
+        int          count;
     };
 
-    class Datagram
-    {
+    class Datagram {
     public:
         QHostAddress addr;
-        int port;
-        QByteArray buf;
+        int          port;
+        QByteArray   buf;
     };
 
-    IceLocalTransport *q;
-    ObjectSession sess;
-    QUdpSocket *extSock;
-    SafeUdpSocket *sock;
+    IceLocalTransport *  q;
+    ObjectSession        sess;
+    QUdpSocket *         extSock;
+    SafeUdpSocket *      sock;
     StunTransactionPool *pool;
-    StunBinding *stunBinding;
-    TurnClient *turn;
-    bool turnActivated;
-    QHostAddress addr;
-    int port;
-    QHostAddress refAddr;
-    int refPort;
-    QHostAddress relAddr;
-    int relPort;
-    QHostAddress stunBindAddr;
-    int stunBindPort;
-    QHostAddress stunRelayAddr;
-    int stunRelayPort;
-    QString stunUser;
-    QCA::SecureArray stunPass;
-    QString clientSoftware;
-    QList<Datagram> in;
-    QList<Datagram> inRelayed;
-    QList<WriteItem> pendingWrites;
-    int retryCount;
-    bool stopping;
-    int debugLevel;
+    StunBinding *        stunBinding;
+    TurnClient *         turn;
+    bool                 turnActivated;
+    QHostAddress         addr;
+    int                  port;
+    QHostAddress         refAddr;
+    int                  refPort;
+    QHostAddress         relAddr;
+    int                  relPort;
+    QHostAddress         stunBindAddr;
+    int                  stunBindPort;
+    QHostAddress         stunRelayAddr;
+    int                  stunRelayPort;
+    QString              stunUser;
+    QCA::SecureArray     stunPass;
+    QString              clientSoftware;
+    QList<Datagram>      in;
+    QList<Datagram>      inRelayed;
+    QList<WriteItem>     pendingWrites;
+    int                  retryCount;
+    bool                 stopping;
+    int                  debugLevel;
 
     Private(IceLocalTransport *_q) :
-        QObject(_q),
-        q(_q),
-        sess(this),
-        extSock(nullptr),
-        sock(nullptr),
-        pool(nullptr),
-        stunBinding(nullptr),
-        turn(nullptr),
-        turnActivated(false),
-        port(-1),
-        refPort(-1),
-        relPort(-1),
-        retryCount(0),
-        stopping(false),
+        QObject(_q), q(_q), sess(this), extSock(nullptr), sock(nullptr), pool(nullptr), stunBinding(nullptr),
+        turn(nullptr), turnActivated(false), port(-1), refPort(-1), relPort(-1), retryCount(0), stopping(false),
         debugLevel(IceTransport::DL_None)
     {
     }
 
-    ~Private()
-    {
-        reset();
-    }
+    ~Private() { reset(); }
 
     void reset()
     {
@@ -240,13 +195,11 @@ class IceLocalTransport::Private : public QObject
         stunBinding = nullptr;
 
         delete turn;
-        turn = nullptr;
+        turn          = nullptr;
         turnActivated = false;
 
-        if(sock)
-        {
-            if(extSock)
-            {
+        if (sock) {
+            if (extSock) {
                 sock->release();
                 extSock = nullptr;
             }
@@ -269,7 +222,7 @@ class IceLocalTransport::Private : public QObject
         pendingWrites.clear();
 
         retryCount = 0;
-        stopping = false;
+        stopping   = false;
     }
 
     void start()
@@ -286,7 +239,7 @@ class IceLocalTransport::Private : public QObject
 
         stopping = true;
 
-        if(turn)
+        if (turn)
             turn->close();
         else
             sess.defer(this, "postStop");
@@ -298,27 +251,26 @@ class IceLocalTransport::Private : public QObject
 
         pool = new StunTransactionPool(StunTransaction::Udp, this);
         pool->setDebugLevel((StunTransactionPool::DebugLevel)debugLevel);
-        connect(pool, SIGNAL(outgoingMessage(QByteArray,QHostAddress,int)), SLOT(pool_outgoingMessage(QByteArray,QHostAddress,int)));
+        connect(pool, SIGNAL(outgoingMessage(QByteArray, QHostAddress, int)),
+                SLOT(pool_outgoingMessage(QByteArray, QHostAddress, int)));
         connect(pool, SIGNAL(needAuthParams()), SLOT(pool_needAuthParams()));
         connect(pool, SIGNAL(debugLine(QString)), SLOT(pool_debugLine(QString)));
 
         pool->setLongTermAuthEnabled(true);
-        if(!stunUser.isEmpty())
-        {
+        if (!stunUser.isEmpty()) {
             pool->setUsername(stunUser);
             pool->setPassword(stunPass);
         }
 
-        if(!stunBindAddr.isNull())
-        {
+        if (!stunBindAddr.isNull()) {
             stunBinding = new StunBinding(pool);
             connect(stunBinding, SIGNAL(success()), SLOT(binding_success()));
-            connect(stunBinding, SIGNAL(error(XMPP::StunBinding::Error)), SLOT(binding_error(XMPP::StunBinding::Error)));
+            connect(stunBinding, SIGNAL(error(XMPP::StunBinding::Error)),
+                    SLOT(binding_error(XMPP::StunBinding::Error)));
             stunBinding->start(stunBindAddr, stunBindPort);
         }
 
-        if(!stunRelayAddr.isNull())
-        {
+        if (!stunRelayAddr.isNull()) {
             do_turn();
         }
     }
@@ -331,7 +283,8 @@ class IceLocalTransport::Private : public QObject
         connect(turn, SIGNAL(tlsHandshaken()), SLOT(turn_tlsHandshaken()));
         connect(turn, SIGNAL(closed()), SLOT(turn_closed()));
         connect(turn, SIGNAL(activated()), SLOT(turn_activated()));
-        connect(turn, SIGNAL(packetsWritten(int,QHostAddress,int)), SLOT(turn_packetsWritten(int,QHostAddress,int)));
+        connect(turn, SIGNAL(packetsWritten(int, QHostAddress, int)),
+                SLOT(turn_packetsWritten(int, QHostAddress, int)));
         connect(turn, SIGNAL(error(XMPP::TurnClient::Error)), SLOT(turn_error(XMPP::TurnClient::Error)));
         connect(turn, SIGNAL(outgoingDatagram(QByteArray)), SLOT(turn_outgoingDatagram(QByteArray)));
         connect(turn, SIGNAL(debugLine(QString)), SLOT(turn_debugLine(QString)));
@@ -346,8 +299,7 @@ class IceLocalTransport::Private : public QObject
     QUdpSocket *createSocket()
     {
         QUdpSocket *qsock = new QUdpSocket(this);
-        if(!qsock->bind(addr, 0))
-        {
+        if (!qsock->bind(addr, 0)) {
             delete qsock;
             emit q->error(IceLocalTransport::ErrorBind);
             return nullptr;
@@ -369,13 +321,12 @@ class IceLocalTransport::Private : public QObject
     bool handleRetry()
     {
         // don't allow retrying if activated or stopping)
-        if(turnActivated || stopping)
+        if (turnActivated || stopping)
             return false;
 
         ++retryCount;
-        if(retryCount < 3)
-        {
-            if(debugLevel >= IceTransport::DL_Info)
+        if (retryCount < 3) {
+            if (debugLevel >= IceTransport::DL_Info)
                 emit q->debugLine("retrying...");
 
             delete sock;
@@ -383,11 +334,10 @@ class IceLocalTransport::Private : public QObject
 
             // to receive this error, it is a Relay, so change
             //   the mode
-            //stunType = IceLocalTransport::Relay;
+            // stunType = IceLocalTransport::Relay;
 
             QUdpSocket *qsock = createSocket();
-            if(!qsock)
-            {
+            if (!qsock) {
                 // signal emitted in this case.  bail.
                 //   (return true so caller takes no action)
                 return true;
@@ -417,25 +367,22 @@ class IceLocalTransport::Private : public QObject
     // return true if data packet, false if pool or nothing
     bool processIncomingStun(const QByteArray &buf, const QHostAddress &fromAddr, int fromPort, Datagram *dg)
     {
-        QByteArray data;
+        QByteArray   data;
         QHostAddress dataAddr;
-        int dataPort;
+        int          dataPort;
 
         bool notStun;
-        if(!pool->writeIncomingMessage(buf, &notStun, fromAddr, fromPort) && turn)
-        {
+        if (!pool->writeIncomingMessage(buf, &notStun, fromAddr, fromPort) && turn) {
             data = turn->processIncomingDatagram(buf, notStun, &dataAddr, &dataPort);
-            if(!data.isNull())
-            {
+            if (!data.isNull()) {
                 dg->addr = dataAddr;
                 dg->port = dataPort;
-                dg->buf = data;
+                dg->buf  = data;
                 return true;
-            }
-            else
-            {
-                if(debugLevel >= IceTransport::DL_Packet)
-                    emit q->debugLine("Warning: server responded with what doesn't seem to be a STUN or data packet, skipping.");
+            } else {
+                if (debugLevel >= IceTransport::DL_Packet)
+                    emit q->debugLine(
+                        "Warning: server responded with what doesn't seem to be a STUN or data packet, skipping.");
             }
         }
 
@@ -445,18 +392,14 @@ class IceLocalTransport::Private : public QObject
 private slots:
     void postStart()
     {
-        if(stopping)
+        if (stopping)
             return;
 
-        if(extSock)
-        {
+        if (extSock) {
             sock = new SafeUdpSocket(extSock, this);
-        }
-        else
-        {
+        } else {
             QUdpSocket *qsock = createSocket();
-            if(!qsock)
-            {
+            if (!qsock) {
                 // signal emitted in this case.  bail
                 return;
             }
@@ -482,45 +425,40 @@ private slots:
         QList<Datagram> dreads;
         QList<Datagram> rreads;
 
-        while(sock->hasPendingDatagrams())
-        {
+        while (sock->hasPendingDatagrams()) {
             QHostAddress from;
-            quint16 fromPort;
+            quint16      fromPort;
 
             Datagram dg;
 
             QByteArray buf = sock->readDatagram(&from, &fromPort);
-            if((from == stunBindAddr && fromPort == stunBindPort) || (from == stunRelayAddr && fromPort == stunRelayPort))
-            {
+            if ((from == stunBindAddr && fromPort == stunBindPort)
+                || (from == stunRelayAddr && fromPort == stunRelayPort)) {
                 bool haveData = processIncomingStun(buf, from, fromPort, &dg);
 
                 // processIncomingStun could cause signals to
                 //   emit.  for example, stopped()
-                if(!watch.isValid())
+                if (!watch.isValid())
                     return;
 
-                if(haveData)
+                if (haveData)
                     rreads += dg;
-            }
-            else
-            {
+            } else {
                 dg.addr = from;
                 dg.port = fromPort;
-                dg.buf = buf;
+                dg.buf  = buf;
                 dreads += dg;
             }
         }
 
-        if(dreads.count() > 0)
-        {
+        if (dreads.count() > 0) {
             in += dreads;
             emit q->readyRead(Direct);
-            if(!watch.isValid())
+            if (!watch.isValid())
                 return;
         }
 
-        if(rreads.count() > 0)
-        {
+        if (rreads.count() > 0) {
             inRelayed += rreads;
             emit q->readyRead(Relayed);
         }
@@ -529,60 +467,49 @@ private slots:
     void sock_datagramsWritten(int count)
     {
         QList<Written> dwrites;
-        int twrites = 0;
+        int            twrites = 0;
 
-        while(count > 0)
-        {
+        while (count > 0) {
             Q_ASSERT(!pendingWrites.isEmpty());
             WriteItem wi = pendingWrites.takeFirst();
             --count;
 
-            if(wi.type == WriteItem::Direct)
-            {
+            if (wi.type == WriteItem::Direct) {
                 int at = -1;
-                for(int n = 0; n < dwrites.count(); ++n)
-                {
-                    if(dwrites[n].addr == wi.addr && dwrites[n].port == wi.port)
-                    {
+                for (int n = 0; n < dwrites.count(); ++n) {
+                    if (dwrites[n].addr == wi.addr && dwrites[n].port == wi.port) {
                         at = n;
                         break;
                     }
                 }
 
-                if(at != -1)
-                {
+                if (at != -1) {
                     ++dwrites[at].count;
-                }
-                else
-                {
+                } else {
                     Written wr;
-                    wr.addr = wi.addr;
-                    wr.port = wi.port;
+                    wr.addr  = wi.addr;
+                    wr.port  = wi.port;
                     wr.count = 1;
                     dwrites += wr;
                 }
-            }
-            else if(wi.type == WriteItem::Turn)
+            } else if (wi.type == WriteItem::Turn)
                 ++twrites;
         }
 
-        if(dwrites.isEmpty() && twrites == 0)
+        if (dwrites.isEmpty() && twrites == 0)
             return;
 
         ObjectSessionWatcher watch(&sess);
 
-        if(!dwrites.isEmpty())
-        {
-            foreach(const Written &wr, dwrites)
-            {
+        if (!dwrites.isEmpty()) {
+            foreach (const Written &wr, dwrites) {
                 emit q->datagramsWritten(Direct, wr.count, wr.addr, wr.port);
-                if(!watch.isValid())
+                if (!watch.isValid())
                     return;
             }
         }
 
-        if(twrites > 0)
-        {
+        if (twrites > 0) {
             // note: this will invoke turn_packetsWritten()
             turn->outgoingDatagramsWritten(twrites);
         }
@@ -608,10 +535,7 @@ private slots:
         pool->continueAfterParams();
     }
 
-    void pool_debugLine(const QString &line)
-    {
-        emit q->debugLine(line);
-    }
+    void pool_debugLine(const QString &line) { emit q->debugLine(line); }
 
     void binding_success()
     {
@@ -632,29 +556,29 @@ private slots:
         stunBinding = nullptr;
 
         // don't report any error
-        //if(stunType == IceLocalTransport::Basic || (stunType == IceLocalTransport::Auto && !turn))
+        // if(stunType == IceLocalTransport::Basic || (stunType == IceLocalTransport::Auto && !turn))
         //    emit q->addressesChanged();
     }
 
     void turn_connected()
     {
-        if(debugLevel >= IceTransport::DL_Info)
+        if (debugLevel >= IceTransport::DL_Info)
             emit q->debugLine("turn_connected");
     }
 
     void turn_tlsHandshaken()
     {
-        if(debugLevel >= IceTransport::DL_Info)
+        if (debugLevel >= IceTransport::DL_Info)
             emit q->debugLine("turn_tlsHandshaken");
     }
 
     void turn_closed()
     {
-        if(debugLevel >= IceTransport::DL_Info)
+        if (debugLevel >= IceTransport::DL_Info)
             emit q->debugLine("turn_closed");
 
         delete turn;
-        turn = nullptr;
+        turn          = nullptr;
         turnActivated = false;
 
         postStop();
@@ -666,18 +590,18 @@ private slots:
 
         // take reflexive address from TURN only if we are not using a
         //   separate STUN server
-        if(stunBindAddr.isNull() || stunBindAddr == stunRelayAddr)
-        {
+        if (stunBindAddr.isNull() || stunBindAddr == stunRelayAddr) {
             refAddr = allocate->reflexiveAddress();
             refPort = allocate->reflexivePort();
         }
 
-        if(debugLevel >= IceTransport::DL_Info)
-            emit q->debugLine(QString("Server says we are ") + allocate->reflexiveAddress().toString() + ';' + QString::number(allocate->reflexivePort()));
+        if (debugLevel >= IceTransport::DL_Info)
+            emit q->debugLine(QString("Server says we are ") + allocate->reflexiveAddress().toString() + ';'
+                              + QString::number(allocate->reflexivePort()));
 
         relAddr = allocate->relayedAddress();
         relPort = allocate->relayedPort();
-        if(debugLevel >= IceTransport::DL_Info)
+        if (debugLevel >= IceTransport::DL_Info)
             emit q->debugLine(QString("Server relays via ") + relAddr.toString() + ';' + QString::number(relPort));
 
         turnActivated = true;
@@ -692,27 +616,26 @@ private slots:
 
     void turn_error(XMPP::TurnClient::Error e)
     {
-        if(debugLevel >= IceTransport::DL_Info)
+        if (debugLevel >= IceTransport::DL_Info)
             emit q->debugLine(QString("turn_error: ") + turn->errorString());
 
         delete turn;
-        turn = nullptr;
+        turn              = nullptr;
         bool wasActivated = turnActivated;
-        turnActivated = false;
+        turnActivated     = false;
 
-        if(e == TurnClient::ErrorMismatch)
-        {
-            if(!extSock && handleRetry())
+        if (e == TurnClient::ErrorMismatch) {
+            if (!extSock && handleRetry())
                 return;
         }
 
         // this means our relay died on us.  in the future we might
         //   consider reporting this
-        if(wasActivated)
+        if (wasActivated)
             return;
 
         // don't report any error
-        //if(stunType == IceLocalTransport::Relay || (stunType == IceLocalTransport::Auto && !stunBinding))
+        // if(stunType == IceLocalTransport::Relay || (stunType == IceLocalTransport::Auto && !stunBinding))
         //    emit q->addressesChanged();
     }
 
@@ -724,27 +647,14 @@ private slots:
         sock->writeDatagram(buf, stunRelayAddr, stunRelayPort);
     }
 
-    void turn_debugLine(const QString &line)
-    {
-        emit q->debugLine(line);
-    }
+    void turn_debugLine(const QString &line) { emit q->debugLine(line); }
 };
 
-IceLocalTransport::IceLocalTransport(QObject *parent) :
-    IceTransport(parent)
-{
-    d = new Private(this);
-}
+IceLocalTransport::IceLocalTransport(QObject *parent) : IceTransport(parent) { d = new Private(this); }
 
-IceLocalTransport::~IceLocalTransport()
-{
-    delete d;
-}
+IceLocalTransport::~IceLocalTransport() { delete d; }
 
-void IceLocalTransport::setClientSoftwareNameAndVersion(const QString &str)
-{
-    d->clientSoftware = str;
-}
+void IceLocalTransport::setClientSoftwareNameAndVersion(const QString &str) { d->clientSoftware = str; }
 
 void IceLocalTransport::start(QUdpSocket *sock)
 {
@@ -758,10 +668,7 @@ void IceLocalTransport::start(const QHostAddress &addr)
     d->start();
 }
 
-void IceLocalTransport::stop()
-{
-    d->stop();
-}
+void IceLocalTransport::stop() { d->stop(); }
 
 void IceLocalTransport::setStunBindService(const QHostAddress &addr, int port)
 {
@@ -769,63 +676,42 @@ void IceLocalTransport::setStunBindService(const QHostAddress &addr, int port)
     d->stunBindPort = port;
 }
 
-void IceLocalTransport::setStunRelayService(const QHostAddress &addr, int port, const QString &user, const QCA::SecureArray &pass)
+void IceLocalTransport::setStunRelayService(const QHostAddress &addr, int port, const QString &user,
+                                            const QCA::SecureArray &pass)
 {
     d->stunRelayAddr = addr;
     d->stunRelayPort = port;
-    d->stunUser = user;
-    d->stunPass = pass;
+    d->stunUser      = user;
+    d->stunPass      = pass;
 }
 
-void IceLocalTransport::stunStart()
-{
-    d->stunStart();
-}
+void IceLocalTransport::stunStart() { d->stunStart(); }
 
-QHostAddress IceLocalTransport::localAddress() const
-{
-    return d->addr;
-}
+QHostAddress IceLocalTransport::localAddress() const { return d->addr; }
 
-int IceLocalTransport::localPort() const
-{
-    return d->port;
-}
+int IceLocalTransport::localPort() const { return d->port; }
 
-QHostAddress IceLocalTransport::serverReflexiveAddress() const
-{
-    return d->refAddr;
-}
+QHostAddress IceLocalTransport::serverReflexiveAddress() const { return d->refAddr; }
 
-int IceLocalTransport::serverReflexivePort() const
-{
-    return d->refPort;
-}
+int IceLocalTransport::serverReflexivePort() const { return d->refPort; }
 
-QHostAddress IceLocalTransport::relayedAddress() const
-{
-    return d->relAddr;
-}
+QHostAddress IceLocalTransport::relayedAddress() const { return d->relAddr; }
 
-int IceLocalTransport::relayedPort() const
-{
-    return d->relPort;
-}
+int IceLocalTransport::relayedPort() const { return d->relPort; }
 
 void IceLocalTransport::addChannelPeer(const QHostAddress &addr, int port)
 {
-    if(d->turn)
+    if (d->turn)
         d->turn->addChannelPeer(addr, port);
 }
 
 bool IceLocalTransport::hasPendingDatagrams(int path) const
 {
-    if(path == Direct)
+    if (path == Direct)
         return !d->in.isEmpty();
-    else if(path == Relayed)
+    else if (path == Relayed)
         return !d->inRelayed.isEmpty();
-    else
-    {
+    else {
         Q_ASSERT(0);
         return false;
     }
@@ -834,50 +720,44 @@ bool IceLocalTransport::hasPendingDatagrams(int path) const
 QByteArray IceLocalTransport::readDatagram(int path, QHostAddress *addr, int *port)
 {
     QList<Private::Datagram> *in = nullptr;
-    if(path == Direct)
+    if (path == Direct)
         in = &d->in;
-    else if(path == Relayed)
+    else if (path == Relayed)
         in = &d->inRelayed;
     else
         Q_ASSERT(0);
 
-    if(!in->isEmpty())
-    {
+    if (!in->isEmpty()) {
         Private::Datagram datagram = in->takeFirst();
-        *addr = datagram.addr;
-        *port = datagram.port;
+        *addr                      = datagram.addr;
+        *port                      = datagram.port;
         return datagram.buf;
-    }
-    else
+    } else
         return QByteArray();
 }
 
 void IceLocalTransport::writeDatagram(int path, const QByteArray &buf, const QHostAddress &addr, int port)
 {
-    if(path == Direct)
-    {
+    if (path == Direct) {
         Private::WriteItem wi;
         wi.type = Private::WriteItem::Direct;
         wi.addr = addr;
         wi.port = port;
         d->pendingWrites += wi;
         d->sock->writeDatagram(buf, addr, port);
-    }
-    else if(path == Relayed)
-    {
-        if(d->turn && d->turnActivated)
+    } else if (path == Relayed) {
+        if (d->turn && d->turnActivated)
             d->turn->write(buf, addr, port);
-    }
-    else
+    } else
         Q_ASSERT(0);
 }
 
 void IceLocalTransport::setDebugLevel(DebugLevel level)
 {
     d->debugLevel = level;
-    if(d->pool)
+    if (d->pool)
         d->pool->setDebugLevel((StunTransactionPool::DebugLevel)level);
-    if(d->turn)
+    if (d->turn)
         d->turn->setDebugLevel((TurnClient::DebugLevel)level);
 }
 
diff --git a/src/irisnet/noncore/icelocaltransport.h b/src/irisnet/noncore/icelocaltransport.h
index 05738c40..aa43f178 100644
--- a/src/irisnet/noncore/icelocaltransport.h
+++ b/src/irisnet/noncore/icelocaltransport.h
@@ -28,7 +28,7 @@ class QHostAddress;
 class QUdpSocket;
 
 namespace QCA {
-    class SecureArray;
+class SecureArray;
 }
 
 namespace XMPP {
@@ -36,15 +36,11 @@ namespace XMPP {
 //   relationship with an associated STUN/TURN server.  if TURN is used, this
 //   class offers two paths (0=direct and 1=relayed), otherwise it offers
 //   just one path (0=direct)
-class IceLocalTransport : public IceTransport
-{
+class IceLocalTransport : public IceTransport {
     Q_OBJECT
 
 public:
-    enum Error
-    {
-        ErrorBind = ErrorCustom
-    };
+    enum Error { ErrorBind = ErrorCustom };
 
     IceLocalTransport(QObject *parent = nullptr);
     ~IceLocalTransport();
@@ -66,21 +62,21 @@ class IceLocalTransport : public IceTransport
     void stunStart();
 
     QHostAddress localAddress() const;
-    int localPort() const;
+    int          localPort() const;
 
     QHostAddress serverReflexiveAddress() const;
-    int serverReflexivePort() const;
+    int          serverReflexivePort() const;
 
     QHostAddress relayedAddress() const;
-    int relayedPort() const;
+    int          relayedPort() const;
 
     // reimplemented
-    virtual void stop();
-    virtual bool hasPendingDatagrams(int path) const;
+    virtual void       stop();
+    virtual bool       hasPendingDatagrams(int path) const;
     virtual QByteArray readDatagram(int path, QHostAddress *addr, int *port);
-    virtual void writeDatagram(int path, const QByteArray &buf, const QHostAddress &addr, int port);
-    virtual void addChannelPeer(const QHostAddress &addr, int port);
-    virtual void setDebugLevel(DebugLevel level);
+    virtual void       writeDatagram(int path, const QByteArray &buf, const QHostAddress &addr, int port);
+    virtual void       addChannelPeer(const QHostAddress &addr, int port);
+    virtual void       setDebugLevel(DebugLevel level);
 
 signals:
     // may be emitted multiple times.
diff --git a/src/irisnet/noncore/icetransport.cpp b/src/irisnet/noncore/icetransport.cpp
index 4c7825ee..dfeb3057 100644
--- a/src/irisnet/noncore/icetransport.cpp
+++ b/src/irisnet/noncore/icetransport.cpp
@@ -19,13 +19,8 @@
 #include "icetransport.h"
 
 namespace XMPP {
-IceTransport::IceTransport(QObject *parent) :
-    QObject(parent)
-{
-}
+IceTransport::IceTransport(QObject *parent) : QObject(parent) {}
 
-IceTransport::~IceTransport()
-{
-}
+IceTransport::~IceTransport() {}
 
 } // namespace XMPP
diff --git a/src/irisnet/noncore/icetransport.h b/src/irisnet/noncore/icetransport.h
index 97dfe6de..e3789378 100644
--- a/src/irisnet/noncore/icetransport.h
+++ b/src/irisnet/noncore/icetransport.h
@@ -25,33 +25,23 @@
 class QHostAddress;
 
 namespace XMPP {
-class IceTransport : public QObject
-{
+class IceTransport : public QObject {
     Q_OBJECT
 
 public:
-    enum Error
-    {
-        ErrorGeneric,
-        ErrorCustom
-    };
+    enum Error { ErrorGeneric, ErrorCustom };
 
-    enum DebugLevel
-    {
-        DL_None,
-        DL_Info,
-        DL_Packet
-    };
+    enum DebugLevel { DL_None, DL_Info, DL_Packet };
 
     IceTransport(QObject *parent = nullptr);
     ~IceTransport();
 
     virtual void stop() = 0;
 
-    virtual bool hasPendingDatagrams(int path) const = 0;
-    virtual QByteArray readDatagram(int path, QHostAddress *addr, int *port) = 0;
-    virtual void writeDatagram(int path, const QByteArray &buf, const QHostAddress &addr, int port) = 0;
-    virtual void addChannelPeer(const QHostAddress &addr, int port) = 0;
+    virtual bool       hasPendingDatagrams(int path) const                                                = 0;
+    virtual QByteArray readDatagram(int path, QHostAddress *addr, int *port)                              = 0;
+    virtual void       writeDatagram(int path, const QByteArray &buf, const QHostAddress &addr, int port) = 0;
+    virtual void       addChannelPeer(const QHostAddress &addr, int port)                                 = 0;
 
     virtual void setDebugLevel(DebugLevel level) = 0;
 
diff --git a/src/irisnet/noncore/iceturntransport.cpp b/src/irisnet/noncore/iceturntransport.cpp
index e46f5467..62145739 100644
--- a/src/irisnet/noncore/iceturntransport.cpp
+++ b/src/irisnet/noncore/iceturntransport.cpp
@@ -23,28 +23,23 @@
 #include <QtCrypto>
 
 namespace XMPP {
-class IceTurnTransport::Private : public QObject
-{
+class IceTurnTransport::Private : public QObject {
     Q_OBJECT
 
 public:
     IceTurnTransport *q;
-    int mode;
-    QHostAddress serverAddr;
-    int serverPort;
-    QString relayUser;
-    QCA::SecureArray relayPass;
-    QHostAddress relayAddr;
-    int relayPort;
-    TurnClient turn;
-    int turnErrorCode;
-    int debugLevel;
-
-    Private(IceTurnTransport *_q) :
-        QObject(_q),
-        q(_q),
-        turn(this),
-        debugLevel(IceTransport::DL_None)
+    int               mode;
+    QHostAddress      serverAddr;
+    int               serverPort;
+    QString           relayUser;
+    QCA::SecureArray  relayPass;
+    QHostAddress      relayAddr;
+    int               relayPort;
+    TurnClient        turn;
+    int               turnErrorCode;
+    int               debugLevel;
+
+    Private(IceTurnTransport *_q) : QObject(_q), q(_q), turn(this), debugLevel(IceTransport::DL_None)
     {
         connect(&turn, SIGNAL(connected()), SLOT(turn_connected()));
         connect(&turn, SIGNAL(tlsHandshaken()), SLOT(turn_tlsHandshaken()));
@@ -53,7 +48,8 @@ class IceTurnTransport::Private : public QObject
         connect(&turn, SIGNAL(retrying()), SLOT(turn_retrying()));
         connect(&turn, SIGNAL(activated()), SLOT(turn_activated()));
         connect(&turn, SIGNAL(readyRead()), SLOT(turn_readyRead()));
-        connect(&turn, SIGNAL(packetsWritten(int,QHostAddress,int)), SLOT(turn_packetsWritten(int,QHostAddress,int)));
+        connect(&turn, SIGNAL(packetsWritten(int, QHostAddress, int)),
+                SLOT(turn_packetsWritten(int, QHostAddress, int)));
         connect(&turn, SIGNAL(error(XMPP::TurnClient::Error)), SLOT(turn_error(XMPP::TurnClient::Error)));
         connect(&turn, SIGNAL(debugLine(QString)), SLOT(turn_debugLine(QString)));
     }
@@ -65,27 +61,24 @@ class IceTurnTransport::Private : public QObject
         turn.connectToHost(serverAddr, serverPort, (TurnClient::Mode)mode);
     }
 
-    void stop()
-    {
-        turn.close();
-    }
+    void stop() { turn.close(); }
 
 private slots:
     void turn_connected()
     {
-        if(debugLevel >= IceTransport::DL_Info)
+        if (debugLevel >= IceTransport::DL_Info)
             emit q->debugLine("turn_connected");
     }
 
     void turn_tlsHandshaken()
     {
-        if(debugLevel >= IceTransport::DL_Info)
+        if (debugLevel >= IceTransport::DL_Info)
             emit q->debugLine("turn_tlsHandshaken");
     }
 
     void turn_closed()
     {
-        if(debugLevel >= IceTransport::DL_Info)
+        if (debugLevel >= IceTransport::DL_Info)
             emit q->debugLine("turn_closed");
 
         emit q->stopped();
@@ -102,7 +95,7 @@ private slots:
 
     void turn_retrying()
     {
-        if(debugLevel >= IceTransport::DL_Info)
+        if (debugLevel >= IceTransport::DL_Info)
             emit q->debugLine("turn_retrying");
     }
 
@@ -111,12 +104,12 @@ private slots:
         StunAllocate *allocate = turn.stunAllocate();
 
         QHostAddress saddr = allocate->reflexiveAddress();
-        quint16 sport = allocate->reflexivePort();
-        if(debugLevel >= IceTransport::DL_Info)
+        quint16      sport = allocate->reflexivePort();
+        if (debugLevel >= IceTransport::DL_Info)
             emit q->debugLine(QString("Server says we are ") + saddr.toString() + ';' + QString::number(sport));
         saddr = allocate->relayedAddress();
         sport = allocate->relayedPort();
-        if(debugLevel >= IceTransport::DL_Info)
+        if (debugLevel >= IceTransport::DL_Info)
             emit q->debugLine(QString("Server relays via ") + saddr.toString() + ';' + QString::number(sport));
 
         relayAddr = saddr;
@@ -125,10 +118,7 @@ private slots:
         emit q->started();
     }
 
-    void turn_readyRead()
-    {
-        emit q->readyRead(0);
-    }
+    void turn_readyRead() { emit q->readyRead(0); }
 
     void turn_packetsWritten(int count, const QHostAddress &addr, int port)
     {
@@ -137,82 +127,48 @@ private slots:
 
     void turn_error(XMPP::TurnClient::Error e)
     {
-        if(debugLevel >= IceTransport::DL_Info)
+        if (debugLevel >= IceTransport::DL_Info)
             emit q->debugLine(QString("turn_error: ") + turn.errorString());
 
         turnErrorCode = e;
         emit q->error(IceTurnTransport::ErrorTurn);
     }
 
-    void turn_debugLine(const QString &line)
-    {
-        emit q->debugLine(line);
-    }
+    void turn_debugLine(const QString &line) { emit q->debugLine(line); }
 };
 
-IceTurnTransport::IceTurnTransport(QObject *parent) :
-    IceTransport(parent)
-{
-    d = new Private(this);
-}
+IceTurnTransport::IceTurnTransport(QObject *parent) : IceTransport(parent) { d = new Private(this); }
 
-IceTurnTransport::~IceTurnTransport()
-{
-    delete d;
-}
+IceTurnTransport::~IceTurnTransport() { delete d; }
 
 void IceTurnTransport::setClientSoftwareNameAndVersion(const QString &str)
 {
     d->turn.setClientSoftwareNameAndVersion(str);
 }
 
-void IceTurnTransport::setUsername(const QString &user)
-{
-    d->relayUser = user;
-}
+void IceTurnTransport::setUsername(const QString &user) { d->relayUser = user; }
 
-void IceTurnTransport::setPassword(const QCA::SecureArray &pass)
-{
-    d->relayPass = pass;
-}
+void IceTurnTransport::setPassword(const QCA::SecureArray &pass) { d->relayPass = pass; }
 
-void IceTurnTransport::setProxy(const TurnClient::Proxy &proxy)
-{
-    d->turn.setProxy(proxy);
-}
+void IceTurnTransport::setProxy(const TurnClient::Proxy &proxy) { d->turn.setProxy(proxy); }
 
 void IceTurnTransport::start(const QHostAddress &addr, int port, TurnClient::Mode mode)
 {
     d->serverAddr = addr;
     d->serverPort = port;
-    d->mode = mode;
+    d->mode       = mode;
     d->start();
 }
 
-QHostAddress IceTurnTransport::relayedAddress() const
-{
-    return d->relayAddr;
-}
+QHostAddress IceTurnTransport::relayedAddress() const { return d->relayAddr; }
 
-int IceTurnTransport::relayedPort() const
-{
-    return d->relayPort;
-}
+int IceTurnTransport::relayedPort() const { return d->relayPort; }
 
-void IceTurnTransport::addChannelPeer(const QHostAddress &addr, int port)
-{
-    d->turn.addChannelPeer(addr, port);
-}
+void IceTurnTransport::addChannelPeer(const QHostAddress &addr, int port) { d->turn.addChannelPeer(addr, port); }
 
-TurnClient::Error IceTurnTransport::turnErrorCode() const
-{
-    return (TurnClient::Error)d->turnErrorCode;
-}
+TurnClient::Error IceTurnTransport::turnErrorCode() const { return (TurnClient::Error)d->turnErrorCode; }
 
-void IceTurnTransport::stop()
-{
-    d->stop();
-}
+void IceTurnTransport::stop() { d->stop(); }
 
 bool IceTurnTransport::hasPendingDatagrams(int path) const
 {
diff --git a/src/irisnet/noncore/iceturntransport.h b/src/irisnet/noncore/iceturntransport.h
index 98604cb1..8d9ecd89 100644
--- a/src/irisnet/noncore/iceturntransport.h
+++ b/src/irisnet/noncore/iceturntransport.h
@@ -28,15 +28,11 @@
 
 namespace XMPP {
 // for the turn transport, only path 0 is used
-class IceTurnTransport : public IceTransport
-{
+class IceTurnTransport : public IceTransport {
     Q_OBJECT
 
 public:
-    enum Error
-    {
-        ErrorTurn = ErrorCustom
-    };
+    enum Error { ErrorTurn = ErrorCustom };
 
     IceTurnTransport(QObject *parent = nullptr);
     ~IceTurnTransport();
@@ -52,17 +48,17 @@ class IceTurnTransport : public IceTransport
     void start(const QHostAddress &addr, int port, TurnClient::Mode mode = TurnClient::PlainMode);
 
     QHostAddress relayedAddress() const;
-    int relayedPort() const;
+    int          relayedPort() const;
 
     TurnClient::Error turnErrorCode() const;
 
     // reimplemented
-    virtual void stop();
-    virtual bool hasPendingDatagrams(int path) const;
+    virtual void       stop();
+    virtual bool       hasPendingDatagrams(int path) const;
     virtual QByteArray readDatagram(int path, QHostAddress *addr, int *port);
-    virtual void writeDatagram(int path, const QByteArray &buf, const QHostAddress &addr, int port);
-    virtual void addChannelPeer(const QHostAddress &addr, int port);
-    virtual void setDebugLevel(DebugLevel level);
+    virtual void       writeDatagram(int path, const QByteArray &buf, const QHostAddress &addr, int port);
+    virtual void       addChannelPeer(const QHostAddress &addr, int port);
+    virtual void       setDebugLevel(DebugLevel level);
 
 private:
     class Private;
diff --git a/src/irisnet/noncore/legacy/ndns.cpp b/src/irisnet/noncore/legacy/ndns.cpp
index 7ae585bc..753e2359 100644
--- a/src/irisnet/noncore/legacy/ndns.cpp
+++ b/src/irisnet/noncore/legacy/ndns.cpp
@@ -61,8 +61,7 @@
 
 //!
 //! Constructs an NDns object with parent \a parent.
-NDns::NDns(QObject *parent)
-:QObject(parent),dns(this)
+NDns::NDns(QObject *parent) : QObject(parent), dns(this)
 {
     busy = false;
 
@@ -72,10 +71,7 @@ NDns::NDns(QObject *parent)
 
 //!
 //! Destroys the object and frees allocated resources.
-NDns::~NDns()
-{
-    stop();
-}
+NDns::~NDns() { stop(); }
 
 //!
 //! Resolves hostname \a host (eg. psi.affinix.com)
@@ -98,25 +94,16 @@ void NDns::stop()
 //!
 //! Returns the IP address as a 32-bit integer in host-byte-order.  This will be 0 if the lookup failed.
 //! \sa resultsReady()
-QHostAddress NDns::result() const
-{
-    return addr;
-}
+QHostAddress NDns::result() const { return addr; }
 
 //!
 //! Returns the IP address as a string.  This will be an empty string if the lookup failed.
 //! \sa resultsReady()
-QString NDns::resultString() const
-{
-    return addr.toString();
-}
+QString NDns::resultString() const { return addr.toString(); }
 
 //!
 //! Returns TRUE if busy resolving a hostname.
-bool NDns::isBusy() const
-{
-    return busy;
-}
+bool NDns::isBusy() const { return busy; }
 
 void NDns::dns_resultsReady(const QList<XMPP::NameRecord> &results)
 {
@@ -133,4 +120,3 @@ void NDns::dns_error(XMPP::NameResolver::Error)
 }
 
 // CS_NAMESPACE_END
-
diff --git a/src/irisnet/noncore/legacy/ndns.h b/src/irisnet/noncore/legacy/ndns.h
index 2b8a3d86..fedf4ddb 100644
--- a/src/irisnet/noncore/legacy/ndns.h
+++ b/src/irisnet/noncore/legacy/ndns.h
@@ -26,11 +26,10 @@
 #include <QtNetwork>
 
 // CS_NAMESPACE_BEGIN
-class NDns : public QObject
-{
+class NDns : public QObject {
     Q_OBJECT
 public:
-    NDns(QObject *parent=nullptr);
+    NDns(QObject *parent = nullptr);
     ~NDns();
 
     void resolve(const QString &);
@@ -38,7 +37,7 @@ class NDns : public QObject
     bool isBusy() const;
 
     QHostAddress result() const;
-    QString resultString() const;
+    QString      resultString() const;
 
 signals:
     void resultsReady();
@@ -49,8 +48,8 @@ private slots:
 
 private:
     XMPP::NameResolver dns;
-    bool busy;
-    QHostAddress addr;
+    bool               busy;
+    QHostAddress       addr;
 };
 
 // CS_NAMESPACE_END
diff --git a/src/irisnet/noncore/legacy/srvresolver.cpp b/src/irisnet/noncore/legacy/srvresolver.cpp
index 16ae25bd..8c1b43b9 100644
--- a/src/irisnet/noncore/legacy/srvresolver.cpp
+++ b/src/irisnet/noncore/legacy/srvresolver.cpp
@@ -20,7 +20,7 @@
 #include "srvresolver.h"
 
 #ifndef NO_NDNS
-# include "ndns.h"
+#include "ndns.h"
 #endif
 
 // CS_NAMESPACE_BEGIN
@@ -29,17 +29,17 @@ static void sortSRVList(QList<Q3Dns::Server> &list)
     QList<Q3Dns::Server> tmp = list;
     list.clear();
 
-    while(!tmp.isEmpty()) {
+    while (!tmp.isEmpty()) {
         QList<Q3Dns::Server>::Iterator p = tmp.end();
-        for(QList<Q3Dns::Server>::Iterator it = tmp.begin(); it != tmp.end(); ++it) {
-            if(p == tmp.end())
+        for (QList<Q3Dns::Server>::Iterator it = tmp.begin(); it != tmp.end(); ++it) {
+            if (p == tmp.end())
                 p = it;
             else {
                 int a = (*it).priority;
                 int b = (*p).priority;
                 int j = (*it).weight;
                 int k = (*p).weight;
-                if(a < b || (a == b && j < k))
+                if (a < b || (a == b && j < k))
                     p = it;
             }
         }
@@ -48,8 +48,7 @@ static void sortSRVList(QList<Q3Dns::Server> &list)
     }
 }
 
-class SrvResolver::Private
-{
+class SrvResolver::Private {
 public:
     Private(SrvResolver *_q) :
         nndns(_q),
@@ -60,33 +59,33 @@ class SrvResolver::Private
     {
     }
 
-    XMPP::NameResolver nndns;
+    XMPP::NameResolver     nndns;
     XMPP::NameRecord::Type nntype;
-    bool nndns_busy;
+    bool                   nndns_busy;
 
 #ifndef NO_NDNS
     NDns ndns;
 #endif
 
-    bool failed;
+    bool         failed;
     QHostAddress resultAddress;
-    quint16 resultPort;
+    quint16      resultPort;
 
-    bool srvonly;
-    QString srv;
+    bool                 srvonly;
+    QString              srv;
     QList<Q3Dns::Server> servers;
-    bool aaaa;
+    bool                 aaaa;
 
     QTimer t;
 };
 
-SrvResolver::SrvResolver(QObject *parent)
-:QObject(parent)
+SrvResolver::SrvResolver(QObject *parent) : QObject(parent)
 {
-    d = new Private(this);
+    d             = new Private(this);
     d->nndns_busy = false;
 
-    connect(&d->nndns, SIGNAL(resultsReady(QList<XMPP::NameRecord>)), SLOT(nndns_resultsReady(QList<XMPP::NameRecord>)));
+    connect(&d->nndns, SIGNAL(resultsReady(QList<XMPP::NameRecord>)),
+            SLOT(nndns_resultsReady(QList<XMPP::NameRecord>)));
     connect(&d->nndns, SIGNAL(error(XMPP::NameResolver::Error)), SLOT(nndns_error(XMPP::NameResolver::Error)));
 
 #ifndef NO_NDNS
@@ -106,13 +105,13 @@ void SrvResolver::resolve(const QString &server, const QString &type, const QStr
 {
     stop();
 
-    d->failed = false;
+    d->failed  = false;
     d->srvonly = false;
-    d->srv = QString("_") + type + "._" + proto + '.' + server;
+    d->srv     = QString("_") + type + "._" + proto + '.' + server;
     d->t.setSingleShot(true);
     d->t.start(15000);
     d->nndns_busy = true;
-    d->nntype = XMPP::NameRecord::Srv;
+    d->nntype     = XMPP::NameRecord::Srv;
     d->nndns.start(d->srv.toLatin1(), d->nntype);
 }
 
@@ -120,19 +119,19 @@ void SrvResolver::resolveSrvOnly(const QString &server, const QString &type, con
 {
     stop();
 
-    d->failed = false;
+    d->failed  = false;
     d->srvonly = true;
-    d->srv = QString("_") + type + "._" + proto + '.' + server;
+    d->srv     = QString("_") + type + "._" + proto + '.' + server;
     d->t.setSingleShot(true);
     d->t.start(15000);
     d->nndns_busy = true;
-    d->nntype = XMPP::NameRecord::Srv;
+    d->nntype     = XMPP::NameRecord::Srv;
     d->nndns.start(d->srv.toLatin1(), d->nntype);
 }
 
 void SrvResolver::next()
 {
-    if(d->servers.isEmpty())
+    if (d->servers.isEmpty())
         return;
 
     tryNext();
@@ -140,54 +139,42 @@ void SrvResolver::next()
 
 void SrvResolver::stop()
 {
-    if(d->t.isActive())
+    if (d->t.isActive())
         d->t.stop();
-    if(d->nndns_busy) {
+    if (d->nndns_busy) {
         d->nndns.stop();
         d->nndns_busy = false;
     }
 #ifndef NO_NDNS
-    if(d->ndns.isBusy())
+    if (d->ndns.isBusy())
         d->ndns.stop();
 #endif
     d->resultAddress = QHostAddress();
-    d->resultPort = 0;
+    d->resultPort    = 0;
     d->servers.clear();
-    d->srv = "";
+    d->srv    = "";
     d->failed = true;
 }
 
 bool SrvResolver::isBusy() const
 {
 #ifndef NO_NDNS
-    if(d->nndns_busy || d->ndns.isBusy())
+    if (d->nndns_busy || d->ndns.isBusy())
 #else
-    if(d->nndns_busy)
+    if (d->nndns_busy)
 #endif
         return true;
     else
         return false;
 }
 
-QList<Q3Dns::Server> SrvResolver::servers() const
-{
-    return d->servers;
-}
+QList<Q3Dns::Server> SrvResolver::servers() const { return d->servers; }
 
-bool SrvResolver::failed() const
-{
-    return d->failed;
-}
+bool SrvResolver::failed() const { return d->failed; }
 
-QHostAddress SrvResolver::resultAddress() const
-{
-    return d->resultAddress;
-}
+QHostAddress SrvResolver::resultAddress() const { return d->resultAddress; }
 
-quint16 SrvResolver::resultPort() const
-{
-    return d->resultPort;
-}
+quint16 SrvResolver::resultPort() const { return d->resultPort; }
 
 void SrvResolver::tryNext()
 {
@@ -195,30 +182,30 @@ void SrvResolver::tryNext()
     d->ndns.resolve(d->servers.first().name);
 #else
     d->nndns_busy = true;
-    d->nntype = d->aaaa ? XMPP::NameRecord::Aaaa : XMPP::NameRecord::A;
+    d->nntype     = d->aaaa ? XMPP::NameRecord::Aaaa : XMPP::NameRecord::A;
     d->nndns.start(d->servers.first().name.toLatin1(), d->nntype);
 #endif
 }
 
 void SrvResolver::nndns_resultsReady(const QList<XMPP::NameRecord> &results)
 {
-    if(!d->nndns_busy)
+    if (!d->nndns_busy)
         return;
 
     d->t.stop();
 
-    if(d->nntype == XMPP::NameRecord::Srv) {
+    if (d->nntype == XMPP::NameRecord::Srv) {
         // grab the server list and destroy the qdns object
         QList<Q3Dns::Server> list;
-        for(int n = 0; n < results.count(); ++n)
-        {
-            list += Q3Dns::Server(QString::fromLatin1(results[n].name()), results[n].priority(), results[n].weight(), results[n].port());
+        for (int n = 0; n < results.count(); ++n) {
+            list += Q3Dns::Server(QString::fromLatin1(results[n].name()), results[n].priority(), results[n].weight(),
+                                  results[n].port());
         }
 
         d->nndns_busy = false;
         d->nndns.stop();
 
-        if(list.isEmpty()) {
+        if (list.isEmpty()) {
             stop();
             resultsReady();
             return;
@@ -226,43 +213,39 @@ void SrvResolver::nndns_resultsReady(const QList<XMPP::NameRecord> &results)
         sortSRVList(list);
         d->servers = list;
 
-        if(d->srvonly)
+        if (d->srvonly)
             resultsReady();
         else {
             // kick it off
             d->aaaa = true;
             tryNext();
         }
-    }
-    else {
+    } else {
         // grab the address list and destroy the qdns object
         QList<QHostAddress> list;
-        if(d->nntype == XMPP::NameRecord::A || d->nntype == XMPP::NameRecord::Aaaa)
-        {
-            for(int n = 0; n < results.count(); ++n)
-            {
+        if (d->nntype == XMPP::NameRecord::A || d->nntype == XMPP::NameRecord::Aaaa) {
+            for (int n = 0; n < results.count(); ++n) {
                 list += results[n].address();
             }
         }
         d->nndns_busy = false;
         d->nndns.stop();
 
-        if(!list.isEmpty()) {
+        if (!list.isEmpty()) {
             int port = d->servers.first().port;
             d->servers.removeFirst();
             d->aaaa = true;
 
             d->resultAddress = list.first();
-            d->resultPort = port;
+            d->resultPort    = port;
             resultsReady();
-        }
-        else {
-            if(!d->aaaa)
+        } else {
+            if (!d->aaaa)
                 d->servers.removeFirst();
             d->aaaa = !d->aaaa;
 
             // failed?  bail if last one
-            if(d->servers.isEmpty()) {
+            if (d->servers.isEmpty()) {
                 stop();
                 resultsReady();
                 return;
@@ -274,26 +257,22 @@ void SrvResolver::nndns_resultsReady(const QList<XMPP::NameRecord> &results)
     }
 }
 
-void SrvResolver::nndns_error(XMPP::NameResolver::Error)
-{
-    nndns_resultsReady(QList<XMPP::NameRecord>());
-}
+void SrvResolver::nndns_error(XMPP::NameResolver::Error) { nndns_resultsReady(QList<XMPP::NameRecord>()); }
 
 void SrvResolver::ndns_done()
 {
 #ifndef NO_NDNS
-    QHostAddress r = d->ndns.result();
-    int port = d->servers.first().port;
+    QHostAddress r    = d->ndns.result();
+    int          port = d->servers.first().port;
     d->servers.removeFirst();
 
-    if(!r.isNull()) {
+    if (!r.isNull()) {
         d->resultAddress = d->ndns.result();
-        d->resultPort = port;
+        d->resultPort    = port;
         resultsReady();
-    }
-    else {
+    } else {
         // failed?  bail if last one
-        if(d->servers.isEmpty()) {
+        if (d->servers.isEmpty()) {
             stop();
             resultsReady();
             return;
diff --git a/src/irisnet/noncore/legacy/srvresolver.h b/src/irisnet/noncore/legacy/srvresolver.h
index ecca77e5..ded8502a 100644
--- a/src/irisnet/noncore/legacy/srvresolver.h
+++ b/src/irisnet/noncore/legacy/srvresolver.h
@@ -26,14 +26,14 @@
 #include <QtNetwork>
 
 // CS_NAMESPACE_BEGIN
-class Q3Dns
-{
+class Q3Dns {
 public:
-    class Server
-    {
+    class Server {
     public:
-        Server(const QString &n = QString(), quint16 p = 0, quint16 w = 0, quint16 po = 0)
-        :name(n), priority(p), weight(w), port(po) {}
+        Server(const QString &n = QString(), quint16 p = 0, quint16 w = 0, quint16 po = 0) :
+            name(n), priority(p), weight(w), port(po)
+        {
+        }
 
         QString name;
         quint16 priority;
@@ -42,11 +42,10 @@ class Q3Dns
     };
 };
 
-class SrvResolver : public QObject
-{
+class SrvResolver : public QObject {
     Q_OBJECT
 public:
-    SrvResolver(QObject *parent=nullptr);
+    SrvResolver(QObject *parent = nullptr);
     ~SrvResolver();
 
     void resolve(const QString &server, const QString &type, const QString &proto);
@@ -57,9 +56,9 @@ class SrvResolver : public QObject
 
     QList<Q3Dns::Server> servers() const;
 
-    bool failed() const;
+    bool         failed() const;
     QHostAddress resultAddress() const;
-    quint16 resultPort() const;
+    quint16      resultPort() const;
 
 signals:
     void resultsReady();
diff --git a/src/irisnet/noncore/processquit.cpp b/src/irisnet/noncore/processquit.cpp
index 6c05f2ba..049cefdf 100644
--- a/src/irisnet/noncore/processquit.cpp
+++ b/src/irisnet/noncore/processquit.cpp
@@ -19,18 +19,18 @@
 #include "processquit.h"
 
 #ifndef NO_IRISNET
-# include "irisnetglobal_p.h"
+#include "irisnetglobal_p.h"
 #endif
 
 #ifdef QT_GUI_LIB
-# include <QApplication>
+#include <QApplication>
 #endif
 #ifdef Q_OS_UNIX
-# include <signal.h>
-# include <unistd.h>
+#include <signal.h>
+#include <unistd.h>
 #endif
 #ifdef Q_OS_WIN
-# include <windows.h>
+#include <windows.h>
 #endif
 
 namespace {
@@ -42,13 +42,10 @@ void releaseAndDeleteLater(QObject *owner, QObject *obj)
     obj->deleteLater();
 }
 
-class SafeSocketNotifier : public QObject
-{
+class SafeSocketNotifier : public QObject {
     Q_OBJECT
 public:
-    SafeSocketNotifier(int socket, QSocketNotifier::Type type,
-        QObject *parent = nullptr) :
-        QObject(parent)
+    SafeSocketNotifier(int socket, QSocketNotifier::Type type, QObject *parent = nullptr) : QObject(parent)
     {
         sn = new QSocketNotifier(socket, type, this);
         connect(sn, SIGNAL(activated(int)), SIGNAL(activated(int)));
@@ -60,12 +57,12 @@ class SafeSocketNotifier : public QObject
         releaseAndDeleteLater(this, sn);
     }
 
-    bool isEnabled() const             { return sn->isEnabled(); }
-    int socket() const                 { return sn->socket(); }
+    bool                  isEnabled() const { return sn->isEnabled(); }
+    int                   socket() const { return sn->socket(); }
     QSocketNotifier::Type type() const { return sn->type(); }
 
 public slots:
-    void setEnabled(bool enable)       { sn->setEnabled(enable); }
+    void setEnabled(bool enable) { sn->setEnabled(enable); }
 
 signals:
     void activated(int socket);
@@ -91,8 +88,7 @@ inline bool is_gui_app()
 #endif
 }
 
-class ProcessQuit::Private : public QObject
-{
+class ProcessQuit::Private : public QObject {
     Q_OBJECT
 public:
     ProcessQuit *q;
@@ -102,7 +98,7 @@ class ProcessQuit::Private : public QObject
     bool use_handler;
 #endif
 #ifdef Q_OS_UNIX
-    int sig_pipe[2];
+    int                 sig_pipe[2];
     SafeSocketNotifier *sig_notifier;
 #endif
 
@@ -111,12 +107,11 @@ class ProcessQuit::Private : public QObject
         done = false;
 #ifdef Q_OS_WIN
         use_handler = !is_gui_app();
-        if(use_handler)
+        if (use_handler)
             SetConsoleCtrlHandler((PHANDLER_ROUTINE)winHandler, TRUE);
 #endif
 #ifdef Q_OS_UNIX
-        if(pipe(sig_pipe) == -1)
-        {
+        if (pipe(sig_pipe) == -1) {
             // no support then
             return;
         }
@@ -132,7 +127,7 @@ class ProcessQuit::Private : public QObject
     ~Private()
     {
 #ifdef Q_OS_WIN
-        if(use_handler)
+        if (use_handler)
             SetConsoleCtrlHandler((PHANDLER_ROUTINE)winHandler, FALSE);
 #endif
 #ifdef Q_OS_UNIX
@@ -159,8 +154,7 @@ class ProcessQuit::Private : public QObject
     {
         Q_UNUSED(sig);
         unsigned char c = 0;
-        if(::write(g_pq->d->sig_pipe[1], &c, 1) == -1)
-        {
+        if (::write(g_pq->d->sig_pipe[1], &c, 1) == -1) {
             // TODO: error handling?
             return;
         }
@@ -172,10 +166,10 @@ class ProcessQuit::Private : public QObject
         sigaction(sig, nullptr, &sa);
         // if the signal is ignored, don't take it over.  this is
         //   recommended by the glibc manual
-        if(sa.sa_handler == SIG_IGN)
+        if (sa.sa_handler == SIG_IGN)
             return;
         sigemptyset(&(sa.sa_mask));
-        sa.sa_flags = 0;
+        sa.sa_flags   = 0;
         sa.sa_handler = unixHandler;
         sigaction(sig, &sa, nullptr);
     }
@@ -186,10 +180,10 @@ class ProcessQuit::Private : public QObject
         sigaction(sig, nullptr, &sa);
         // ignored means we skipped it earlier, so we should
         //   skip it again
-        if(sa.sa_handler == SIG_IGN)
+        if (sa.sa_handler == SIG_IGN)
             return;
         sigemptyset(&(sa.sa_mask));
-        sa.sa_flags = 0;
+        sa.sa_flags   = 0;
         sa.sa_handler = SIG_DFL;
         sigaction(sig, &sa, nullptr);
     }
@@ -207,8 +201,7 @@ public slots:
     {
 #ifdef Q_OS_UNIX
         unsigned char c;
-        if(::read(sig_pipe[0], &c, 1) == -1)
-        {
+        if (::read(sig_pipe[0], &c, 1) == -1) {
             // TODO: error handling?
             return;
         }
@@ -221,30 +214,21 @@ public slots:
     void do_emit()
     {
         // only signal once
-        if(!done)
-        {
+        if (!done) {
             done = true;
             emit q->quit();
         }
     }
 };
 
-ProcessQuit::ProcessQuit(QObject *parent)
-:QObject(parent)
-{
-    d = new Private(this);
-}
+ProcessQuit::ProcessQuit(QObject *parent) : QObject(parent) { d = new Private(this); }
 
-ProcessQuit::~ProcessQuit()
-{
-    delete d;
-}
+ProcessQuit::~ProcessQuit() { delete d; }
 
 ProcessQuit *ProcessQuit::instance()
 {
     QMutexLocker locker(pq_mutex());
-    if(!g_pq)
-    {
+    if (!g_pq) {
         g_pq = new ProcessQuit;
         g_pq->moveToThread(QCoreApplication::instance()->thread());
 #ifndef NO_IRISNET
@@ -257,7 +241,7 @@ ProcessQuit *ProcessQuit::instance()
 void ProcessQuit::reset()
 {
     QMutexLocker locker(pq_mutex());
-    if(g_pq)
+    if (g_pq)
         g_pq->d->done = false;
 }
 
diff --git a/src/irisnet/noncore/processquit.h b/src/irisnet/noncore/processquit.h
index 363088ca..26cc3958 100644
--- a/src/irisnet/noncore/processquit.h
+++ b/src/irisnet/noncore/processquit.h
@@ -20,10 +20,10 @@
 #define PROCESSQUIT_H
 
 #ifdef NO_IRISNET
-# include <QtCore>
-# define IRISNET_EXPORT
+#include <QtCore>
+#define IRISNET_EXPORT
 #else
-# include "irisnetglobal.h"
+#include "irisnetglobal.h"
 #endif
 
 #ifndef NO_IRISNET
@@ -55,8 +55,7 @@ myapp.connect(ProcessQuit::instance(), SIGNAL(quit()), SLOT(do_quit()));
    The quit() signal is emitted when a request to terminate is received. The quit() signal is only emitted once,
    future termination requests are ignored.  Call reset() to allow the quit() signal to be emitted again.
 */
-class IRISNET_EXPORT ProcessQuit : public QObject
-{
+class IRISNET_EXPORT ProcessQuit : public QObject {
     Q_OBJECT
 public:
     /**
@@ -71,7 +70,10 @@ class IRISNET_EXPORT ProcessQuit : public QObject
     /**
        \brief Allows the quit() signal to be emitted again
 
-       ProcessQuit only emits the quit() signal once, so that if a user repeatedly presses Ctrl-C or sends SIGTERM, your shutdown slot will not be called multiple times.  This is normally the desired behavior, but if you are ignoring the termination request then you may want to allow future notifications.  Calling this function will allow the quit() signal to be emitted again, if a new termination request arrives.
+       ProcessQuit only emits the quit() signal once, so that if a user repeatedly presses Ctrl-C or sends SIGTERM, your
+       shutdown slot will not be called multiple times.  This is normally the desired behavior, but if you are ignoring
+       the termination request then you may want to allow future notifications.  Calling this function will allow the
+       quit() signal to be emitted again, if a new termination request arrives.
 
        \sa quit
     */
@@ -80,7 +82,9 @@ class IRISNET_EXPORT ProcessQuit : public QObject
     /**
        \brief Frees all resources used by ProcessQuit
 
-       This function will free any resources used by ProcessQuit, including the global instance, and the termination handlers will be uninstalled (reverted to default).  Future termination requests will cause the application to exit abruptly.
+       This function will free any resources used by ProcessQuit, including the global instance, and the termination
+       handlers will be uninstalled (reverted to default).  Future termination requests will cause the application to
+       exit abruptly.
 
        \note You normally do not need to call this function directly.  When IrisNet cleans up, it will be called.
 
@@ -92,9 +96,11 @@ class IRISNET_EXPORT ProcessQuit : public QObject
     /**
        \brief Notification of termination request
 
-       This signal is emitted when a termination request is received.  It is only emitted once, unless reset() is called.
+       This signal is emitted when a termination request is received.  It is only emitted once, unless reset() is
+       called.
 
-       Upon receiving this signal, the application should proceed to exit gracefully, and generally without user interaction.
+       Upon receiving this signal, the application should proceed to exit gracefully, and generally without user
+       interaction.
 
        \sa reset
     */
diff --git a/src/irisnet/noncore/stunallocate.cpp b/src/irisnet/noncore/stunallocate.cpp
index 96ee4ea4..2ae8f479 100644
--- a/src/irisnet/noncore/stunallocate.cpp
+++ b/src/irisnet/noncore/stunallocate.cpp
@@ -30,10 +30,10 @@
 #include <QtCrypto>
 
 // permissions last 5 minutes, update them every 4 minutes
-#define PERM_INTERVAL  (4 * 60 * 1000)
+#define PERM_INTERVAL (4 * 60 * 1000)
 
 // channels last 10 minutes, update them every 9 minutes
-#define CHAN_INTERVAL  (9 * 60 * 1000)
+#define CHAN_INTERVAL (9 * 60 * 1000)
 
 namespace XMPP {
 void releaseAndDeleteLater(QObject *owner, QObject *obj)
@@ -47,58 +47,45 @@ void releaseAndDeleteLater(QObject *owner, QObject *obj)
 static int check_channelData(const quint8 *data, int size)
 {
     // top two bits are never zero for ChannelData
-    if((data[0] & 0xc0) == 0)
+    if ((data[0] & 0xc0) == 0)
         return -1;
 
-    if(size < 4)
+    if (size < 4)
         return -1;
 
     quint16 len = StunUtil::read16(data + 2);
-    if(size - 4 < (int)len)
+    if (size - 4 < (int)len)
         return -1;
 
     // data from a stream must be 4 byte aligned
-    int plen = len;
+    int plen      = len;
     int remainder = plen % 4;
-    if(remainder != 0)
+    if (remainder != 0)
         plen += (4 - remainder);
 
     int need = plen + 4;
-    if(size < need)
+    if (size < need)
         return -1;
 
     return need;
 }
 
-class StunAllocatePermission : public QObject
-{
+class StunAllocatePermission : public QObject {
     Q_OBJECT
 
 public:
-    QTimer *timer;
+    QTimer *             timer;
     StunTransactionPool *pool;
-    StunTransaction *trans;
-    QHostAddress stunAddr;
-    int stunPort;
-    QHostAddress addr;
-    bool active;
+    StunTransaction *    trans;
+    QHostAddress         stunAddr;
+    int                  stunPort;
+    QHostAddress         addr;
+    bool                 active;
 
-    enum Error
-    {
-        ErrorGeneric,
-        ErrorProtocol,
-        ErrorCapacity,
-        ErrorForbidden,
-        ErrorRejected,
-        ErrorTimeout
-    };
+    enum Error { ErrorGeneric, ErrorProtocol, ErrorCapacity, ErrorForbidden, ErrorRejected, ErrorTimeout };
 
     StunAllocatePermission(StunTransactionPool *_pool, const QHostAddress &_addr) :
-        QObject(_pool),
-        pool(_pool),
-        trans(nullptr),
-        addr(_addr),
-        active(false)
+        QObject(_pool), pool(_pool), trans(nullptr), addr(_addr), active(false)
     {
         timer = new QTimer(this);
         connect(timer, SIGNAL(timeout()), SLOT(timer_timeout()));
@@ -125,19 +112,18 @@ class StunAllocatePermission : public QObject
 
     static StunAllocate::Error errorToStunAllocateError(Error e)
     {
-        switch(e)
-        {
-            case ErrorProtocol:
-                return StunAllocate::ErrorProtocol;
-            case ErrorCapacity:
-                return StunAllocate::ErrorCapacity;
-            case ErrorForbidden:
-            case ErrorRejected:
-                return StunAllocate::ErrorRejected;
-            case ErrorTimeout:
-                return StunAllocate::ErrorTimeout;
-            default:
-                return StunAllocate::ErrorGeneric;
+        switch (e) {
+        case ErrorProtocol:
+            return StunAllocate::ErrorProtocol;
+        case ErrorCapacity:
+            return StunAllocate::ErrorCapacity;
+        case ErrorForbidden:
+        case ErrorRejected:
+            return StunAllocate::ErrorRejected;
+        case ErrorTimeout:
+            return StunAllocate::ErrorTimeout;
+        default:
+            return StunAllocate::ErrorGeneric;
         }
     }
 
@@ -166,10 +152,7 @@ class StunAllocatePermission : public QObject
         trans->start(pool, stunAddr, stunPort);
     }
 
-    void restartTimer()
-    {
-        timer->start();
-    }
+    void restartTimer() { timer->start(); }
 
 private slots:
     void trans_createMessage(const QByteArray &transactionId)
@@ -187,7 +170,7 @@ private slots:
 
         {
             StunMessage::Attribute a;
-            a.type = StunTypes::XOR_PEER_ADDRESS;
+            a.type  = StunTypes::XOR_PEER_ADDRESS;
             a.value = StunTypes::createXorPeerAddress(addr, 0, message.magic(), message.id());
             list += a;
         }
@@ -202,13 +185,11 @@ private slots:
         delete trans;
         trans = nullptr;
 
-        bool err = false;
-        int code;
+        bool    err = false;
+        int     code;
         QString reason;
-        if(response.mclass() == StunMessage::ErrorResponse)
-        {
-            if(!StunTypes::parseErrorCode(response.attribute(StunTypes::ERROR_CODE), &code, &reason))
-            {
+        if (response.mclass() == StunMessage::ErrorResponse) {
+            if (!StunTypes::parseErrorCode(response.attribute(StunTypes::ERROR_CODE), &code, &reason)) {
                 cleanup();
                 emit error(ErrorProtocol, "Unable to parse ERROR-CODE in error response.");
                 return;
@@ -217,13 +198,12 @@ private slots:
             err = true;
         }
 
-        if(err)
-        {
+        if (err) {
             cleanup();
 
-            if(code == StunTypes::InsufficientCapacity)
+            if (code == StunTypes::InsufficientCapacity)
                 emit error(ErrorCapacity, reason);
-            else if(code == StunTypes::Forbidden)
+            else if (code == StunTypes::Forbidden)
                 emit error(ErrorForbidden, reason);
             else
                 emit error(ErrorRejected, reason);
@@ -233,8 +213,7 @@ private slots:
 
         restartTimer();
 
-        if(!active)
-        {
+        if (!active) {
             active = true;
             emit ready();
         }
@@ -244,51 +223,33 @@ private slots:
     {
         cleanup();
 
-        if(e == XMPP::StunTransaction::ErrorTimeout)
+        if (e == XMPP::StunTransaction::ErrorTimeout)
             emit error(ErrorTimeout, "Request timed out.");
         else
             emit error(ErrorGeneric, "Generic transaction error.");
     }
 
-    void timer_timeout()
-    {
-        doTransaction();
-    }
+    void timer_timeout() { doTransaction(); }
 };
 
-class StunAllocateChannel : public QObject
-{
+class StunAllocateChannel : public QObject {
     Q_OBJECT
 
 public:
-    QTimer *timer;
+    QTimer *             timer;
     StunTransactionPool *pool;
-    StunTransaction *trans;
-    QHostAddress stunAddr;
-    int stunPort;
-    int channelId;
-    QHostAddress addr;
-    int port;
-    bool active;
-
-    enum Error
-    {
-        ErrorGeneric,
-        ErrorProtocol,
-        ErrorCapacity,
-        ErrorForbidden,
-        ErrorRejected,
-        ErrorTimeout
-    };
+    StunTransaction *    trans;
+    QHostAddress         stunAddr;
+    int                  stunPort;
+    int                  channelId;
+    QHostAddress         addr;
+    int                  port;
+    bool                 active;
+
+    enum Error { ErrorGeneric, ErrorProtocol, ErrorCapacity, ErrorForbidden, ErrorRejected, ErrorTimeout };
 
     StunAllocateChannel(StunTransactionPool *_pool, int _channelId, const QHostAddress &_addr, int _port) :
-        QObject(_pool),
-        pool(_pool),
-        trans(nullptr),
-        channelId(_channelId),
-        addr(_addr),
-        port(_port),
-        active(false)
+        QObject(_pool), pool(_pool), trans(nullptr), channelId(_channelId), addr(_addr), port(_port), active(false)
     {
         timer = new QTimer(this);
         connect(timer, SIGNAL(timeout()), SLOT(timer_timeout()));
@@ -315,19 +276,18 @@ class StunAllocateChannel : public QObject
 
     static StunAllocate::Error errorToStunAllocateError(Error e)
     {
-        switch(e)
-        {
-            case ErrorProtocol:
-                return StunAllocate::ErrorProtocol;
-            case ErrorCapacity:
-                return StunAllocate::ErrorCapacity;
-            case ErrorForbidden:
-            case ErrorRejected:
-                return StunAllocate::ErrorRejected;
-            case ErrorTimeout:
-                return StunAllocate::ErrorTimeout;
-            default:
-                return StunAllocate::ErrorGeneric;
+        switch (e) {
+        case ErrorProtocol:
+            return StunAllocate::ErrorProtocol;
+        case ErrorCapacity:
+            return StunAllocate::ErrorCapacity;
+        case ErrorForbidden:
+        case ErrorRejected:
+            return StunAllocate::ErrorRejected;
+        case ErrorTimeout:
+            return StunAllocate::ErrorTimeout;
+        default:
+            return StunAllocate::ErrorGeneric;
         }
     }
 
@@ -344,7 +304,7 @@ class StunAllocateChannel : public QObject
         timer->stop();
 
         channelId = -1;
-        active = false;
+        active    = false;
     }
 
     void doTransaction()
@@ -357,10 +317,7 @@ class StunAllocateChannel : public QObject
         trans->start(pool, stunAddr, stunPort);
     }
 
-    void restartTimer()
-    {
-        timer->start();
-    }
+    void restartTimer() { timer->start(); }
 
 private slots:
     void trans_createMessage(const QByteArray &transactionId)
@@ -374,14 +331,14 @@ private slots:
 
         {
             StunMessage::Attribute a;
-            a.type = StunTypes::CHANNEL_NUMBER;
+            a.type  = StunTypes::CHANNEL_NUMBER;
             a.value = StunTypes::createChannelNumber(channelId);
             list += a;
         }
 
         {
             StunMessage::Attribute a;
-            a.type = StunTypes::XOR_PEER_ADDRESS;
+            a.type  = StunTypes::XOR_PEER_ADDRESS;
             a.value = StunTypes::createXorPeerAddress(addr, port, message.magic(), message.id());
             list += a;
         }
@@ -396,13 +353,11 @@ private slots:
         delete trans;
         trans = nullptr;
 
-        bool err = false;
-        int code;
+        bool    err = false;
+        int     code;
         QString reason;
-        if(response.mclass() == StunMessage::ErrorResponse)
-        {
-            if(!StunTypes::parseErrorCode(response.attribute(StunTypes::ERROR_CODE), &code, &reason))
-            {
+        if (response.mclass() == StunMessage::ErrorResponse) {
+            if (!StunTypes::parseErrorCode(response.attribute(StunTypes::ERROR_CODE), &code, &reason)) {
                 cleanup();
                 emit error(ErrorProtocol, "Unable to parse ERROR-CODE in error response.");
                 return;
@@ -411,13 +366,12 @@ private slots:
             err = true;
         }
 
-        if(err)
-        {
+        if (err) {
             cleanup();
 
-            if(code == StunTypes::InsufficientCapacity)
+            if (code == StunTypes::InsufficientCapacity)
                 emit error(ErrorCapacity, reason);
-            else if(code == StunTypes::Forbidden)
+            else if (code == StunTypes::Forbidden)
                 emit error(ErrorForbidden, reason);
             else
                 emit error(ErrorRejected, reason);
@@ -427,8 +381,7 @@ private slots:
 
         restartTimer();
 
-        if(!active)
-        {
+        if (!active) {
             active = true;
             emit ready();
         }
@@ -438,32 +391,22 @@ private slots:
     {
         cleanup();
 
-        if(e == XMPP::StunTransaction::ErrorTimeout)
+        if (e == XMPP::StunTransaction::ErrorTimeout)
             emit error(ErrorTimeout, "Request timed out.");
         else
             emit error(ErrorGeneric, "Generic transaction error.");
     }
 
-    void timer_timeout()
-    {
-        doTransaction();
-    }
+    void timer_timeout() { doTransaction(); }
 };
 
-class StunAllocate::Private : public QObject
-{
+class StunAllocate::Private : public QObject {
     Q_OBJECT
 
 public:
-    enum DontFragmentState
-    {
-        DF_Unknown,
-        DF_Supported,
-        DF_Unsupported
-    };
+    enum DontFragmentState { DF_Unknown, DF_Supported, DF_Unsupported };
 
-    enum State
-    {
+    enum State {
         Stopped,
         Starting,
         Started,
@@ -472,36 +415,30 @@ class StunAllocate::Private : public QObject
         Erroring // like stopping, but emits error when finished
     };
 
-    StunAllocate *q;
-    ObjectSession sess;
-    StunTransactionPool *pool;
-    StunTransaction *trans;
-    QHostAddress stunAddr;
-    int stunPort;
-    State state;
-    QString errorString;
-    DontFragmentState dfState;
-    QString clientSoftware, serverSoftware;
-    QHostAddress reflexiveAddress, relayedAddress;
-    int reflexivePort, relayedPort;
-    StunMessage msg;
-    int allocateLifetime;
-    QTimer *allocateRefreshTimer;
-    QList<StunAllocatePermission*> perms;
-    QList<StunAllocateChannel*> channels;
-    QList<QHostAddress> permsOut;
-    QList<StunAllocate::Channel> channelsOut;
-    int erroringCode;
-    QString erroringString;
+    StunAllocate *                  q;
+    ObjectSession                   sess;
+    StunTransactionPool *           pool;
+    StunTransaction *               trans;
+    QHostAddress                    stunAddr;
+    int                             stunPort;
+    State                           state;
+    QString                         errorString;
+    DontFragmentState               dfState;
+    QString                         clientSoftware, serverSoftware;
+    QHostAddress                    reflexiveAddress, relayedAddress;
+    int                             reflexivePort, relayedPort;
+    StunMessage                     msg;
+    int                             allocateLifetime;
+    QTimer *                        allocateRefreshTimer;
+    QList<StunAllocatePermission *> perms;
+    QList<StunAllocateChannel *>    channels;
+    QList<QHostAddress>             permsOut;
+    QList<StunAllocate::Channel>    channelsOut;
+    int                             erroringCode;
+    QString                         erroringString;
 
     Private(StunAllocate *_q) :
-        QObject(_q),
-        q(_q),
-        sess(this),
-        pool(nullptr),
-        trans(nullptr),
-        state(Stopped),
-        dfState(DF_Unknown),
+        QObject(_q), q(_q), sess(this), pool(nullptr), trans(nullptr), state(Stopped), dfState(DF_Unknown),
         erroringCode(-1)
     {
         allocateRefreshTimer = new QTimer(this);
@@ -530,7 +467,7 @@ class StunAllocate::Private : public QObject
     void stop()
     {
         // erroring already?  no need to do anything
-        if(state == Erroring)
+        if (state == Erroring)
             return;
 
         Q_ASSERT(state == Started);
@@ -545,16 +482,16 @@ class StunAllocate::Private : public QObject
         Q_ASSERT(state == Started);
 
         cleanupTasks();
-        erroringCode = code;
+        erroringCode   = code;
         erroringString = str;
-        state = Erroring;
+        state          = Erroring;
         doTransaction();
     }
 
     void setPermissions(const QList<QHostAddress> &newPerms)
     {
         // if currently erroring out, skip
-        if(state == Erroring)
+        if (state == Erroring)
             return;
 
         Q_ASSERT(state == Started);
@@ -562,25 +499,19 @@ class StunAllocate::Private : public QObject
         int freeCount = 0;
 
         // removed?
-        for(int n = 0; n < perms.count(); ++n)
-        {
+        for (int n = 0; n < perms.count(); ++n) {
             bool found = false;
-            for(int k = 0; k < newPerms.count(); ++k)
-            {
-                if(newPerms[k] == perms[n]->addr)
-                {
+            for (int k = 0; k < newPerms.count(); ++k) {
+                if (newPerms[k] == perms[n]->addr) {
                     found = true;
                     break;
                 }
             }
 
-            if(!found)
-            {
+            if (!found) {
                 // delete related channels
-                for(int j = 0; j < channels.count(); ++j)
-                {
-                    if(channels[j]->addr == perms[n]->addr)
-                    {
+                for (int j = 0; j < channels.count(); ++j) {
+                    if (channels[j]->addr == perms[n]->addr) {
                         delete channels[j];
                         channels.removeAt(j);
                         --j; // adjust position
@@ -595,37 +526,32 @@ class StunAllocate::Private : public QObject
             }
         }
 
-        if(freeCount > 0)
-        {
+        if (freeCount > 0) {
             // removals count as a change, so emit the signal
             sess.deferExclusive(q, "permissionsChanged");
 
             // wake up inactive perms now that we've freed space
-            for(int n = 0; n < perms.count(); ++n)
-            {
-                if(!perms[n]->active)
+            for (int n = 0; n < perms.count(); ++n) {
+                if (!perms[n]->active)
                     perms[n]->start(stunAddr, stunPort);
             }
         }
 
         // added?
-        for(int n = 0; n < newPerms.count(); ++n)
-        {
+        for (int n = 0; n < newPerms.count(); ++n) {
             bool found = false;
-            for(int k = 0; k < perms.count(); ++k)
-            {
-                if(perms[k]->addr == newPerms[n])
-                {
+            for (int k = 0; k < perms.count(); ++k) {
+                if (perms[k]->addr == newPerms[n]) {
                     found = true;
                     break;
                 }
             }
 
-            if(!found)
-            {
+            if (!found) {
                 StunAllocatePermission *perm = new StunAllocatePermission(pool, newPerms[n]);
                 connect(perm, SIGNAL(ready()), SLOT(perm_ready()));
-                connect(perm, SIGNAL(error(XMPP::StunAllocatePermission::Error,QString)), SLOT(perm_error(XMPP::StunAllocatePermission::Error,QString)));
+                connect(perm, SIGNAL(error(XMPP::StunAllocatePermission::Error, QString)),
+                        SLOT(perm_error(XMPP::StunAllocatePermission::Error, QString)));
                 perms += perm;
                 perm->start(stunAddr, stunPort);
             }
@@ -635,7 +561,7 @@ class StunAllocate::Private : public QObject
     void setChannels(const QList<StunAllocate::Channel> &newChannels)
     {
         // if currently erroring out, skip
-        if(state == Erroring)
+        if (state == Erroring)
             return;
 
         Q_ASSERT(state == Started);
@@ -643,20 +569,16 @@ class StunAllocate::Private : public QObject
         int freeCount = 0;
 
         // removed?
-        for(int n = 0; n < channels.count(); ++n)
-        {
+        for (int n = 0; n < channels.count(); ++n) {
             bool found = false;
-            for(int k = 0; k < newChannels.count(); ++k)
-            {
-                if(newChannels[k].address == channels[n]->addr && newChannels[k].port == channels[n]->port)
-                {
+            for (int k = 0; k < newChannels.count(); ++k) {
+                if (newChannels[k].address == channels[n]->addr && newChannels[k].port == channels[n]->port) {
                     found = true;
                     break;
                 }
             }
 
-            if(!found)
-            {
+            if (!found) {
                 ++freeCount;
 
                 delete channels[n];
@@ -665,20 +587,17 @@ class StunAllocate::Private : public QObject
             }
         }
 
-        if(freeCount > 0)
-        {
+        if (freeCount > 0) {
             // removals count as a change, so emit the signal
             sess.deferExclusive(q, "channelsChanged");
 
             // wake up inactive channels now that we've freed space
-            for(int n = 0; n < channels.count(); ++n)
-            {
-                if(!channels[n]->active)
-                {
+            for (int n = 0; n < channels.count(); ++n) {
+                if (!channels[n]->active) {
                     int channelId = getFreeChannelNumber();
 
                     // out of channels?  give up
-                    if(channelId == -1)
+                    if (channelId == -1)
                         break;
 
                     channels[n]->channelId = channelId;
@@ -688,42 +607,37 @@ class StunAllocate::Private : public QObject
         }
 
         // added?
-        for(int n = 0; n < newChannels.count(); ++n)
-        {
+        for (int n = 0; n < newChannels.count(); ++n) {
             bool found = false;
-            for(int k = 0; k < channels.count(); ++k)
-            {
-                if(channels[k]->addr == newChannels[n].address && channels[k]->port == newChannels[n].port)
-                {
+            for (int k = 0; k < channels.count(); ++k) {
+                if (channels[k]->addr == newChannels[n].address && channels[k]->port == newChannels[n].port) {
                     found = true;
                     break;
                 }
             }
 
-            if(!found)
-            {
+            if (!found) {
                 // look up the permission for this channel
                 int at = -1;
-                for(int k = 0; k < perms.count(); ++k)
-                {
-                    if(perms[k]->addr == newChannels[n].address)
-                    {
+                for (int k = 0; k < perms.count(); ++k) {
+                    if (perms[k]->addr == newChannels[n].address) {
                         at = k;
                         break;
                     }
                 }
 
                 // only install a channel if we have a permission
-                if(at != -1)
-                {
+                if (at != -1) {
                     int channelId = getFreeChannelNumber();
 
-                    StunAllocateChannel *channel = new StunAllocateChannel(pool, channelId, newChannels[n].address, newChannels[n].port);
+                    StunAllocateChannel *channel
+                        = new StunAllocateChannel(pool, channelId, newChannels[n].address, newChannels[n].port);
                     connect(channel, SIGNAL(ready()), SLOT(channel_ready()));
-                    connect(channel, SIGNAL(error(XMPP::StunAllocateChannel::Error,QString)), SLOT(channel_error(XMPP::StunAllocateChannel::Error,QString)));
+                    connect(channel, SIGNAL(error(XMPP::StunAllocateChannel::Error, QString)),
+                            SLOT(channel_error(XMPP::StunAllocateChannel::Error, QString)));
                     channels += channel;
 
-                    if(channelId != -1)
+                    if (channelId != -1)
                         channel->start(stunAddr, stunPort);
                 }
             }
@@ -732,19 +646,16 @@ class StunAllocate::Private : public QObject
 
     int getFreeChannelNumber()
     {
-        for(int tryId = 0x4000; tryId <= 0x7fff; ++tryId)
-        {
+        for (int tryId = 0x4000; tryId <= 0x7fff; ++tryId) {
             bool found = false;
-            for(int n = 0; n < channels.count(); ++n)
-            {
-                if(channels[n]->channelId == tryId)
-                {
+            for (int n = 0; n < channels.count(); ++n) {
+                if (channels[n]->channelId == tryId) {
                     found = true;
                     break;
                 }
             }
 
-            if(!found)
+            if (!found)
                 return tryId;
         }
 
@@ -753,9 +664,8 @@ class StunAllocate::Private : public QObject
 
     int getChannel(const QHostAddress &addr, int port)
     {
-        for(int n = 0; n < channels.count(); ++n)
-        {
-            if(channels[n]->active && channels[n]->addr == addr && channels[n]->port == port)
+        for (int n = 0; n < channels.count(); ++n) {
+            if (channels[n]->active && channels[n]->addr == addr && channels[n]->port == port)
                 return channels[n]->channelId;
         }
 
@@ -767,10 +677,8 @@ class StunAllocate::Private : public QObject
     //   ChannelBind success response is still processable
     bool getAddressPort(int channelId, QHostAddress *addr, int *port)
     {
-        for(int n = 0; n < channels.count(); ++n)
-        {
-            if(channels[n]->channelId == channelId)
-            {
+        for (int n = 0; n < channels.count(); ++n) {
+            if (channels[n]->channelId == channelId) {
                 *addr = channels[n]->addr;
                 *port = channels[n]->port;
                 return true;
@@ -830,13 +738,12 @@ class StunAllocate::Private : public QObject
     {
         QList<QHostAddress> newList;
 
-        for(int n = 0; n < perms.count(); ++n)
-        {
-            if(perms[n]->active)
+        for (int n = 0; n < perms.count(); ++n) {
+            if (perms[n]->active)
                 newList += perms[n]->addr;
         }
 
-        if(newList == permsOut)
+        if (newList == permsOut)
             return false;
 
         permsOut = newList;
@@ -847,13 +754,12 @@ class StunAllocate::Private : public QObject
     {
         QList<StunAllocate::Channel> newList;
 
-        for(int n = 0; n < channels.count(); ++n)
-        {
-            if(channels[n]->active)
+        for (int n = 0; n < channels.count(); ++n) {
+            if (channels[n]->active)
                 newList += StunAllocate::Channel(channels[n]->addr, channels[n]->port);
         }
 
-        if(newList == channelsOut)
+        if (newList == channelsOut)
             return false;
 
         channelsOut = newList;
@@ -871,8 +777,7 @@ private slots:
 
     void trans_createMessage(const QByteArray &transactionId)
     {
-        if(state == Starting)
-        {
+        if (state == Starting) {
             // send Allocate request
             StunMessage message;
             message.setMethod(StunTypes::Allocate);
@@ -880,30 +785,28 @@ private slots:
 
             QList<StunMessage::Attribute> list;
 
-            if(!clientSoftware.isEmpty())
-            {
+            if (!clientSoftware.isEmpty()) {
                 StunMessage::Attribute a;
-                a.type = StunTypes::SOFTWARE;
+                a.type  = StunTypes::SOFTWARE;
                 a.value = StunTypes::createSoftware(clientSoftware);
                 list += a;
             }
 
             {
                 StunMessage::Attribute a;
-                a.type = StunTypes::LIFETIME;
+                a.type  = StunTypes::LIFETIME;
                 a.value = StunTypes::createLifetime(3600);
                 list += a;
             }
 
             {
                 StunMessage::Attribute a;
-                a.type = StunTypes::REQUESTED_TRANSPORT;
+                a.type  = StunTypes::REQUESTED_TRANSPORT;
                 a.value = StunTypes::createRequestedTransport(17); // 17=UDP
                 list += a;
             }
 
-            if(dfState == DF_Unknown)
-            {
+            if (dfState == DF_Unknown) {
                 StunMessage::Attribute a;
                 a.type = StunTypes::DONT_FRAGMENT;
                 list += a;
@@ -912,9 +815,7 @@ private slots:
             message.setAttributes(list);
 
             trans->setMessage(message);
-        }
-        else if(state == Stopping || state == Erroring)
-        {
+        } else if (state == Stopping || state == Erroring) {
             StunMessage message;
             message.setMethod(StunTypes::Refresh);
             message.setId((const quint8 *)transactionId.data());
@@ -923,7 +824,7 @@ private slots:
 
             {
                 StunMessage::Attribute a;
-                a.type = StunTypes::LIFETIME;
+                a.type  = StunTypes::LIFETIME;
                 a.value = StunTypes::createLifetime(0);
                 list += a;
             }
@@ -931,9 +832,7 @@ private slots:
             message.setAttributes(list);
 
             trans->setMessage(message);
-        }
-        else if(state == Refreshing)
-        {
+        } else if (state == Refreshing) {
             StunMessage message;
             message.setMethod(StunTypes::Refresh);
             message.setId((const quint8 *)transactionId.data());
@@ -942,7 +841,7 @@ private slots:
 
             {
                 StunMessage::Attribute a;
-                a.type = StunTypes::LIFETIME;
+                a.type  = StunTypes::LIFETIME;
                 a.value = StunTypes::createLifetime(3600);
                 list += a;
             }
@@ -958,13 +857,11 @@ private slots:
         delete trans;
         trans = nullptr;
 
-        bool error = false;
-        int code;
+        bool    error = false;
+        int     code;
         QString reason;
-        if(response.mclass() == StunMessage::ErrorResponse)
-        {
-            if(!StunTypes::parseErrorCode(response.attribute(StunTypes::ERROR_CODE), &code, &reason))
-            {
+        if (response.mclass() == StunMessage::ErrorResponse) {
+            if (!StunTypes::parseErrorCode(response.attribute(StunTypes::ERROR_CODE), &code, &reason)) {
                 cleanup();
                 errorString = "Unable to parse ERROR-CODE in error response.";
                 emit q->error(StunAllocate::ErrorProtocol);
@@ -974,60 +871,46 @@ private slots:
             error = true;
         }
 
-        if(state == Starting)
-        {
-            if(error)
-            {
-                if(code == StunTypes::UnknownAttribute)
-                {
+        if (state == Starting) {
+            if (error) {
+                if (code == StunTypes::UnknownAttribute) {
                     QList<quint16> typeList;
-                    if(!StunTypes::parseUnknownAttributes(response.attribute(StunTypes::UNKNOWN_ATTRIBUTES), &typeList))
-                    {
+                    if (!StunTypes::parseUnknownAttributes(response.attribute(StunTypes::UNKNOWN_ATTRIBUTES),
+                                                           &typeList)) {
                         cleanup();
                         errorString = "Unable to parse UNKNOWN-ATTRIBUTES in 420 (Unknown Attribute) error response.";
                         emit q->error(StunAllocate::ErrorProtocol);
                         return;
                     }
 
-                    if(typeList.contains(StunTypes::DONT_FRAGMENT))
-                    {
+                    if (typeList.contains(StunTypes::DONT_FRAGMENT)) {
                         dfState = DF_Unsupported;
 
                         // stay in same state, try again
                         doTransaction();
-                    }
-                    else
-                    {
+                    } else {
                         cleanup();
                         errorString = reason;
                         emit q->error(StunAllocate::ErrorGeneric);
                     }
 
                     return;
-                }
-                else if(code == StunTypes::AllocationMismatch)
-                {
+                } else if (code == StunTypes::AllocationMismatch) {
                     cleanup();
                     errorString = "437 (Allocation Mismatch).";
                     emit q->error(StunAllocate::ErrorMismatch);
                     return;
-                }
-                else if(code == StunTypes::InsufficientCapacity)
-                {
+                } else if (code == StunTypes::InsufficientCapacity) {
                     cleanup();
                     errorString = reason;
                     emit q->error(StunAllocate::ErrorCapacity);
                     return;
-                }
-                else if(code == StunTypes::Unauthorized)
-                {
+                } else if (code == StunTypes::Unauthorized) {
                     cleanup();
                     errorString = "Unauthorized";
                     emit q->error(StunAllocate::ErrorAuth);
                     return;
-                }
-                else
-                {
+                } else {
                     cleanup();
                     errorString = reason;
                     emit q->error(StunAllocate::ErrorGeneric);
@@ -1036,8 +919,7 @@ private slots:
             }
 
             quint32 lifetime;
-            if(!StunTypes::parseLifetime(response.attribute(StunTypes::LIFETIME), &lifetime))
-            {
+            if (!StunTypes::parseLifetime(response.attribute(StunTypes::LIFETIME), &lifetime)) {
                 cleanup();
                 errorString = "Unable to parse LIFETIME.";
                 emit q->error(StunAllocate::ErrorProtocol);
@@ -1045,9 +927,9 @@ private slots:
             }
 
             QHostAddress raddr;
-            quint16 rport;
-            if(!StunTypes::parseXorRelayedAddress(response.attribute(StunTypes::XOR_RELAYED_ADDRESS), response.magic(), response.id(), &raddr, &rport))
-            {
+            quint16      rport;
+            if (!StunTypes::parseXorRelayedAddress(response.attribute(StunTypes::XOR_RELAYED_ADDRESS), response.magic(),
+                                                   response.id(), &raddr, &rport)) {
                 cleanup();
                 errorString = "Unable to parse XOR-RELAYED-ADDRESS.";
                 emit q->error(StunAllocate::ErrorProtocol);
@@ -1055,50 +937,43 @@ private slots:
             }
 
             QHostAddress saddr;
-            quint16 sport;
-            if(!StunTypes::parseXorMappedAddress(response.attribute(StunTypes::XOR_MAPPED_ADDRESS), response.magic(), response.id(), &saddr, &sport))
-            {
+            quint16      sport;
+            if (!StunTypes::parseXorMappedAddress(response.attribute(StunTypes::XOR_MAPPED_ADDRESS), response.magic(),
+                                                  response.id(), &saddr, &sport)) {
                 cleanup();
                 errorString = "Unable to parse XOR-MAPPED-ADDRESS.";
                 emit q->error(StunAllocate::ErrorProtocol);
                 return;
             }
 
-            if(lifetime < 120)
-            {
+            if (lifetime < 120) {
                 state = Started; // stopWithError requires this
-                stopWithError(StunAllocate::ErrorProtocol,
-                    "LIFETIME is less than two minutes.  That is ridiculous.");
+                stopWithError(StunAllocate::ErrorProtocol, "LIFETIME is less than two minutes.  That is ridiculous.");
                 return;
             }
 
             QString str;
-            if(StunTypes::parseSoftware(response.attribute(StunTypes::SOFTWARE), &str))
-            {
+            if (StunTypes::parseSoftware(response.attribute(StunTypes::SOFTWARE), &str)) {
                 serverSoftware = str;
             }
 
             allocateLifetime = lifetime;
-            relayedAddress = raddr;
-            relayedPort = rport;
+            relayedAddress   = raddr;
+            relayedPort      = rport;
             reflexiveAddress = saddr;
-            reflexivePort = sport;
+            reflexivePort    = sport;
 
-            if(dfState == DF_Unknown)
+            if (dfState == DF_Unknown)
                 dfState = DF_Supported;
 
             state = Started;
             restartRefreshTimer();
 
             emit q->started();
-        }
-        else if(state == Stopping || state == Erroring)
-        {
-            if(error)
-            {
+        } else if (state == Stopping || state == Erroring) {
+            if (error) {
                 // AllocationMismatch on session cancel doesn't count as an error
-                if(code != StunTypes::AllocationMismatch)
-                {
+                if (code != StunTypes::AllocationMismatch) {
                     cleanup();
                     errorString = reason;
                     emit q->error(StunAllocate::ErrorGeneric);
@@ -1106,27 +981,22 @@ private slots:
                 }
             }
 
-            if(state == Stopping)
-            {
+            if (state == Stopping) {
                 // cleanup will set the state to Stopped
                 cleanup();
                 emit q->stopped();
-            }
-            else // Erroring
+            } else // Erroring
             {
-                int code = erroringCode;
-                QString str = erroringString;
+                int     code = erroringCode;
+                QString str  = erroringString;
 
                 // cleanup will set the state to Stopped
                 cleanup();
                 errorString = str;
                 emit q->error((StunAllocate::Error)code);
             }
-        }
-        else if(state == Refreshing)
-        {
-            if(error)
-            {
+        } else if (state == Refreshing) {
+            if (error) {
                 cleanup();
                 errorString = reason;
                 emit q->error(StunAllocate::ErrorRejected);
@@ -1134,8 +1004,7 @@ private slots:
             }
 
             quint32 lifetime;
-            if(!StunTypes::parseLifetime(response.attribute(StunTypes::LIFETIME), &lifetime))
-            {
+            if (!StunTypes::parseLifetime(response.attribute(StunTypes::LIFETIME), &lifetime)) {
                 cleanup();
                 errorString = "Unable to parse LIFETIME.";
                 emit q->error(StunAllocate::ErrorProtocol);
@@ -1151,25 +1020,22 @@ private slots:
 
     void perm_ready()
     {
-        if(updatePermsOut())
+        if (updatePermsOut())
             emit q->permissionsChanged();
     }
 
     void perm_error(XMPP::StunAllocatePermission::Error e, const QString &reason)
     {
-        if(e == StunAllocatePermission::ErrorCapacity)
-        {
+        if (e == StunAllocatePermission::ErrorCapacity) {
             // if we aren't allowed to make anymore permissions,
             //   don't consider this an error.  the perm stays
             //   in the list inactive.  we'll try it again if
             //   any perms get removed.
             return;
-        }
-        else if(e == StunAllocatePermission::ErrorForbidden)
-        {
+        } else if (e == StunAllocatePermission::ErrorForbidden) {
             // silently discard the permission request
             StunAllocatePermission *perm = static_cast<StunAllocatePermission *>(sender());
-            QHostAddress addr = perm->addr;
+            QHostAddress            addr = perm->addr;
             delete perm;
             perms.removeAll(perm);
             emit q->debugLine(QString("Warning: permission forbidden to %1").arg(addr.toString()));
@@ -1183,14 +1049,13 @@ private slots:
 
     void channel_ready()
     {
-        if(updateChannelsOut())
+        if (updateChannelsOut())
             emit q->channelsChanged();
     }
 
     void channel_error(XMPP::StunAllocateChannel::Error e, const QString &reason)
     {
-        if(e == StunAllocateChannel::ErrorCapacity)
-        {
+        if (e == StunAllocateChannel::ErrorCapacity) {
             // if we aren't allowed to make anymore channels,
             //   don't consider this an error.  the channel stays
             //   in the list inactive.  we'll try it again if
@@ -1210,118 +1075,66 @@ private slots:
 
         cleanup();
 
-        if(e == StunTransaction::ErrorTimeout)
-        {
+        if (e == StunTransaction::ErrorTimeout) {
             errorString = "Request timed out.";
             emit q->error(StunAllocate::ErrorTimeout);
-        }
-        else
-        {
+        } else {
             errorString = "Generic transaction error.";
             emit q->error(StunAllocate::ErrorGeneric);
         }
     }
 };
 
-StunAllocate::StunAllocate(StunTransactionPool *pool) :
-    QObject(pool)
+StunAllocate::StunAllocate(StunTransactionPool *pool) : QObject(pool)
 {
-    d = new Private(this);
+    d       = new Private(this);
     d->pool = pool;
 }
 
-StunAllocate::~StunAllocate()
-{
-    delete d;
-}
+StunAllocate::~StunAllocate() { delete d; }
 
-void StunAllocate::setClientSoftwareNameAndVersion(const QString &str)
-{
-    d->clientSoftware = str;
-}
+void StunAllocate::setClientSoftwareNameAndVersion(const QString &str) { d->clientSoftware = str; }
 
-void StunAllocate::start()
-{
-    d->start();
-}
+void StunAllocate::start() { d->start(); }
 
-void StunAllocate::start(const QHostAddress &addr, int port)
-{
-    d->start(addr, port);
-}
+void StunAllocate::start(const QHostAddress &addr, int port) { d->start(addr, port); }
 
-void StunAllocate::stop()
-{
-    d->stop();
-}
+void StunAllocate::stop() { d->stop(); }
 
-QString StunAllocate::serverSoftwareNameAndVersion() const
-{
-    return d->serverSoftware;
-}
+QString StunAllocate::serverSoftwareNameAndVersion() const { return d->serverSoftware; }
 
-QHostAddress StunAllocate::reflexiveAddress() const
-{
-    return d->reflexiveAddress;
-}
+QHostAddress StunAllocate::reflexiveAddress() const { return d->reflexiveAddress; }
 
-int StunAllocate::reflexivePort() const
-{
-    return d->reflexivePort;
-}
+int StunAllocate::reflexivePort() const { return d->reflexivePort; }
 
-QHostAddress StunAllocate::relayedAddress() const
-{
-    return d->relayedAddress;
-}
+QHostAddress StunAllocate::relayedAddress() const { return d->relayedAddress; }
 
-int StunAllocate::relayedPort() const
-{
-    return d->relayedPort;
-}
+int StunAllocate::relayedPort() const { return d->relayedPort; }
 
-QList<QHostAddress> StunAllocate::permissions() const
-{
-    return d->permsOut;
-}
+QList<QHostAddress> StunAllocate::permissions() const { return d->permsOut; }
 
-void StunAllocate::setPermissions(const QList<QHostAddress> &perms)
-{
-    d->setPermissions(perms);
-}
+void StunAllocate::setPermissions(const QList<QHostAddress> &perms) { d->setPermissions(perms); }
 
-QList<StunAllocate::Channel> StunAllocate::channels() const
-{
-    return d->channelsOut;
-}
+QList<StunAllocate::Channel> StunAllocate::channels() const { return d->channelsOut; }
 
-void StunAllocate::setChannels(const QList<Channel> &channels)
-{
-    d->setChannels(channels);
-}
+void StunAllocate::setChannels(const QList<Channel> &channels) { d->setChannels(channels); }
 
 int StunAllocate::packetHeaderOverhead(const QHostAddress &addr, int port) const
 {
     int channelId = d->getChannel(addr, port);
 
-    if(channelId != -1)
-    {
+    if (channelId != -1) {
         // overhead of ChannelData
-        if(d->pool->mode() == StunTransaction::Udp)
+        if (d->pool->mode() == StunTransaction::Udp)
             return 4;
-        else // Tcp
+        else              // Tcp
             return 4 + 3; // add 3 for potential padding
-    }
-    else
-    {
+    } else {
         // we add 3 for potential padding
-        if(d->dfState == StunAllocate::Private::DF_Supported)
-        {
+        if (d->dfState == StunAllocate::Private::DF_Supported) {
             // overhead of STUN-based data, with DONT_FRAGMENT
             return 40 + 3;
-        }
-        else
-        {
+        } else {
             // overhead of STUN-based data, without DONT-FRAGMENT
             return 36 + 3;
         }
@@ -1334,9 +1147,8 @@ QByteArray StunAllocate::encode(const QByteArray &datagram, const QHostAddress &
 {
     int channelId = d->getChannel(addr, port);
 
-    if(channelId != -1)
-    {
-        if(datagram.size() > 65535)
+    if (channelId != -1) {
+        if (datagram.size() > 65535)
             return QByteArray();
 
         quint16 num = channelId;
@@ -1345,10 +1157,9 @@ QByteArray StunAllocate::encode(const QByteArray &datagram, const QHostAddress &
         int plen = len;
 
         // in tcp mode, round to up to nearest 4 bytes
-        if(d->pool->mode() == StunTransaction::Tcp)
-        {
+        if (d->pool->mode() == StunTransaction::Tcp) {
             int remainder = plen % 4;
-            if(remainder != 0)
+            if (remainder != 0)
                 plen += (4 - remainder);
         }
 
@@ -1358,9 +1169,7 @@ QByteArray StunAllocate::encode(const QByteArray &datagram, const QHostAddress &
         memcpy(out.data() + 4, datagram.data(), datagram.size());
 
         return out;
-    }
-    else
-    {
+    } else {
         StunMessage message;
         message.setClass(StunMessage::Indication);
         message.setMethod(StunTypes::Send);
@@ -1371,13 +1180,12 @@ QByteArray StunAllocate::encode(const QByteArray &datagram, const QHostAddress &
 
         {
             StunMessage::Attribute a;
-            a.type = StunTypes::XOR_PEER_ADDRESS;
+            a.type  = StunTypes::XOR_PEER_ADDRESS;
             a.value = StunTypes::createXorPeerAddress(addr, port, message.magic(), message.id());
             list += a;
         }
 
-        if(d->dfState == StunAllocate::Private::DF_Supported)
-        {
+        if (d->dfState == StunAllocate::Private::DF_Supported) {
             StunMessage::Attribute a;
             a.type = StunTypes::DONT_FRAGMENT;
             list += a;
@@ -1385,7 +1193,7 @@ QByteArray StunAllocate::encode(const QByteArray &datagram, const QHostAddress &
 
         {
             StunMessage::Attribute a;
-            a.type = StunTypes::DATA;
+            a.type  = StunTypes::DATA;
             a.value = datagram;
             list += a;
         }
@@ -1398,15 +1206,15 @@ QByteArray StunAllocate::encode(const QByteArray &datagram, const QHostAddress &
 
 QByteArray StunAllocate::decode(const QByteArray &encoded, QHostAddress *addr, int *port)
 {
-    if(encoded.size() < 4)
+    if (encoded.size() < 4)
         return QByteArray();
 
     quint16 num = StunUtil::read16((const quint8 *)encoded.data());
     quint16 len = StunUtil::read16((const quint8 *)encoded.data() + 2);
-    if(encoded.size() - 4 < (int)len)
+    if (encoded.size() - 4 < (int)len)
         return QByteArray();
 
-    if(!d->getAddressPort(num, addr, port))
+    if (!d->getAddressPort(num, addr, port))
         return QByteArray();
 
     return encoded.mid(4, len);
@@ -1415,13 +1223,14 @@ QByteArray StunAllocate::decode(const QByteArray &encoded, QHostAddress *addr, i
 QByteArray StunAllocate::decode(const StunMessage &encoded, QHostAddress *addr, int *port)
 {
     QHostAddress paddr;
-    quint16 pport;
+    quint16      pport;
 
-    if(!StunTypes::parseXorPeerAddress(encoded.attribute(StunTypes::XOR_PEER_ADDRESS), encoded.magic(), encoded.id(), &paddr, &pport))
+    if (!StunTypes::parseXorPeerAddress(encoded.attribute(StunTypes::XOR_PEER_ADDRESS), encoded.magic(), encoded.id(),
+                                        &paddr, &pport))
         return QByteArray();
 
     QByteArray data = encoded.attribute(StunTypes::DATA);
-    if(data.isNull())
+    if (data.isNull())
         return QByteArray();
 
     *addr = paddr;
@@ -1429,10 +1238,7 @@ QByteArray StunAllocate::decode(const StunMessage &encoded, QHostAddress *addr,
     return data;
 }
 
-QString StunAllocate::errorString() const
-{
-    return d->errorString;
-}
+QString StunAllocate::errorString() const { return d->errorString; }
 
 bool StunAllocate::containsChannelData(const quint8 *data, int size)
 {
@@ -1442,7 +1248,7 @@ bool StunAllocate::containsChannelData(const quint8 *data, int size)
 QByteArray StunAllocate::readChannelData(const quint8 *data, int size)
 {
     int len = check_channelData(data, size);
-    if(len != -1)
+    if (len != -1)
         return QByteArray((const char *)data, len);
     else
         return QByteArray();
diff --git a/src/irisnet/noncore/stunallocate.h b/src/irisnet/noncore/stunallocate.h
index e802ddef..6dc7b88c 100644
--- a/src/irisnet/noncore/stunallocate.h
+++ b/src/irisnet/noncore/stunallocate.h
@@ -29,46 +29,28 @@ namespace XMPP {
 class StunMessage;
 class StunTransactionPool;
 
-class StunAllocate : public QObject
-{
+class StunAllocate : public QObject {
     Q_OBJECT
 
 public:
-    enum Error
-    {
-        ErrorGeneric,
-        ErrorTimeout,
-        ErrorAuth,
-        ErrorRejected,
-        ErrorProtocol,
-        ErrorCapacity,
-        ErrorMismatch
-    };
+    enum Error { ErrorGeneric, ErrorTimeout, ErrorAuth, ErrorRejected, ErrorProtocol, ErrorCapacity, ErrorMismatch };
 
-    class Channel
-    {
+    class Channel {
     public:
         QHostAddress address;
-        int port;
+        int          port;
 
-        Channel(const QHostAddress &_address, int _port) :
-            address(_address),
-            port(_port)
-        {
-        }
+        Channel(const QHostAddress &_address, int _port) : address(_address), port(_port) {}
 
         inline bool operator==(const Channel &other)
         {
-            if(address == other.address && port == other.port)
+            if (address == other.address && port == other.port)
                 return true;
             else
                 return false;
         }
 
-        inline bool operator!=(const Channel &other)
-        {
-            return !operator==(other);
-        }
+        inline bool operator!=(const Channel &other) { return !operator==(other); }
     };
 
     StunAllocate(StunTransactionPool *pool);
@@ -83,16 +65,16 @@ class StunAllocate : public QObject
     QString serverSoftwareNameAndVersion() const;
 
     QHostAddress reflexiveAddress() const;
-    int reflexivePort() const;
+    int          reflexivePort() const;
 
     QHostAddress relayedAddress() const;
-    int relayedPort() const;
+    int          relayedPort() const;
 
     QList<QHostAddress> permissions() const;
-    void setPermissions(const QList<QHostAddress> &perms);
+    void                setPermissions(const QList<QHostAddress> &perms);
 
     QList<Channel> channels() const;
-    void setChannels(const QList<Channel> &channels);
+    void           setChannels(const QList<Channel> &channels);
 
     int packetHeaderOverhead(const QHostAddress &addr, int port) const;
 
@@ -102,7 +84,7 @@ class StunAllocate : public QObject
 
     QString errorString() const;
 
-    static bool containsChannelData(const quint8 *data, int size);
+    static bool       containsChannelData(const quint8 *data, int size);
     static QByteArray readChannelData(const quint8 *data, int size);
 
 signals:
diff --git a/src/irisnet/noncore/stunbinding.cpp b/src/irisnet/noncore/stunbinding.cpp
index 524097b2..86ca1a3a 100644
--- a/src/irisnet/noncore/stunbinding.cpp
+++ b/src/irisnet/noncore/stunbinding.cpp
@@ -25,43 +25,32 @@
 #include <QHostAddress>
 
 namespace XMPP {
-class StunBinding::Private : public QObject
-{
+class StunBinding::Private : public QObject {
     Q_OBJECT
 
 public:
-    StunBinding *q;
+    StunBinding *        q;
     StunTransactionPool *pool;
-    StunTransaction *trans;
-    QHostAddress stunAddr;
-    int stunPort;
-    QHostAddress addr;
-    int port;
-    QString errorString;
-    bool use_extPriority, use_extIceControlling, use_extIceControlled;
-    quint32 extPriority;
-    bool extUseCandidate;
-    quint64 extIceControlling, extIceControlled;
-    QString stuser, stpass;
-    bool fpRequired;
+    StunTransaction *    trans;
+    QHostAddress         stunAddr;
+    int                  stunPort;
+    QHostAddress         addr;
+    int                  port;
+    QString              errorString;
+    bool                 use_extPriority, use_extIceControlling, use_extIceControlled;
+    quint32              extPriority;
+    bool                 extUseCandidate;
+    quint64              extIceControlling, extIceControlled;
+    QString              stuser, stpass;
+    bool                 fpRequired;
 
     Private(StunBinding *_q) :
-        QObject(_q),
-        q(_q),
-        pool(nullptr),
-        trans(nullptr),
-        use_extPriority(false),
-        use_extIceControlling(false),
-        use_extIceControlled(false),
-        extUseCandidate(false),
-        fpRequired(false)
+        QObject(_q), q(_q), pool(nullptr), trans(nullptr), use_extPriority(false), use_extIceControlling(false),
+        use_extIceControlled(false), extUseCandidate(false), fpRequired(false)
     {
     }
 
-    ~Private()
-    {
-        delete trans;
-    }
+    ~Private() { delete trans; }
 
     void start(const QHostAddress &_addr = QHostAddress(), int _port = -1)
     {
@@ -75,8 +64,7 @@ class StunBinding::Private : public QObject
         connect(trans, SIGNAL(finished(XMPP::StunMessage)), SLOT(trans_finished(XMPP::StunMessage)));
         connect(trans, SIGNAL(error(XMPP::StunTransaction::Error)), SLOT(trans_error(XMPP::StunTransaction::Error)));
 
-        if(!stuser.isEmpty())
-        {
+        if (!stuser.isEmpty()) {
             trans->setShortTermUsername(stuser);
             trans->setShortTermPassword(stpass);
         }
@@ -95,33 +83,29 @@ private slots:
 
         QList<StunMessage::Attribute> list;
 
-        if(use_extPriority)
-        {
+        if (use_extPriority) {
             StunMessage::Attribute a;
-            a.type = StunTypes::PRIORITY;
+            a.type  = StunTypes::PRIORITY;
             a.value = StunTypes::createPriority(extPriority);
             list += a;
         }
 
-        if(extUseCandidate)
-        {
+        if (extUseCandidate) {
             StunMessage::Attribute a;
             a.type = StunTypes::USE_CANDIDATE;
             list += a;
         }
 
-        if(use_extIceControlling)
-        {
+        if (use_extIceControlling) {
             StunMessage::Attribute a;
-            a.type = StunTypes::ICE_CONTROLLING;
+            a.type  = StunTypes::ICE_CONTROLLING;
             a.value = StunTypes::createIceControlling(extIceControlling);
             list += a;
         }
 
-        if(use_extIceControlled)
-        {
+        if (use_extIceControlled) {
             StunMessage::Attribute a;
-            a.type = StunTypes::ICE_CONTROLLED;
+            a.type  = StunTypes::ICE_CONTROLLED;
             a.value = StunTypes::createIceControlled(extIceControlled);
             list += a;
         }
@@ -136,13 +120,11 @@ private slots:
         delete trans;
         trans = nullptr;
 
-        bool error = false;
-        int code;
+        bool    error = false;
+        int     code;
         QString reason;
-        if(response.mclass() == StunMessage::ErrorResponse)
-        {
-            if(!StunTypes::parseErrorCode(response.attribute(StunTypes::ERROR_CODE), &code, &reason))
-            {
+        if (response.mclass() == StunMessage::ErrorResponse) {
+            if (!StunTypes::parseErrorCode(response.attribute(StunTypes::ERROR_CODE), &code, &reason)) {
                 errorString = "Unable to parse ERROR-CODE in error response.";
                 emit q->error(StunBinding::ErrorProtocol);
                 return;
@@ -151,10 +133,9 @@ private slots:
             error = true;
         }
 
-        if(error)
-        {
+        if (error) {
             errorString = reason;
-            if(code == StunTypes::RoleConflict)
+            if (code == StunTypes::RoleConflict)
                 emit q->error(StunBinding::ErrorConflict);
             else
                 emit q->error(StunBinding::ErrorRejected);
@@ -162,33 +143,25 @@ private slots:
         }
 
         QHostAddress saddr;
-        quint16 sport = 0;
+        quint16      sport = 0;
 
         QByteArray val;
         val = response.attribute(StunTypes::XOR_MAPPED_ADDRESS);
-        if(!val.isNull())
-        {
-            if(!StunTypes::parseXorMappedAddress(val, response.magic(), response.id(), &saddr, &sport))
-            {
+        if (!val.isNull()) {
+            if (!StunTypes::parseXorMappedAddress(val, response.magic(), response.id(), &saddr, &sport)) {
                 errorString = "Unable to parse XOR-MAPPED-ADDRESS response.";
                 emit q->error(StunBinding::ErrorProtocol);
                 return;
             }
-        }
-        else
-        {
+        } else {
             val = response.attribute(StunTypes::MAPPED_ADDRESS);
-            if(!val.isNull())
-            {
-                if(!StunTypes::parseMappedAddress(val, &saddr, &sport))
-                {
+            if (!val.isNull()) {
+                if (!StunTypes::parseMappedAddress(val, &saddr, &sport)) {
                     errorString = "Unable to parse MAPPED-ADDRESS response.";
                     emit q->error(StunBinding::ErrorProtocol);
                     return;
                 }
-            }
-            else
-            {
+            } else {
                 errorString = "Response does not contain XOR-MAPPED-ADDRESS or MAPPED-ADDRESS.";
                 emit q->error(StunBinding::ErrorProtocol);
                 return;
@@ -205,93 +178,59 @@ private slots:
         delete trans;
         trans = nullptr;
 
-        if(e == StunTransaction::ErrorTimeout)
-        {
+        if (e == StunTransaction::ErrorTimeout) {
             errorString = "Request timed out.";
             emit q->error(StunBinding::ErrorTimeout);
-        }
-        else
-        {
+        } else {
             errorString = "Generic transaction error.";
             emit q->error(StunBinding::ErrorGeneric);
         }
     }
 };
 
-StunBinding::StunBinding(StunTransactionPool *pool) :
-    QObject(pool)
+StunBinding::StunBinding(StunTransactionPool *pool) : QObject(pool)
 {
-    d = new Private(this);
+    d       = new Private(this);
     d->pool = pool;
 }
 
-StunBinding::~StunBinding()
-{
-    delete d;
-}
+StunBinding::~StunBinding() { delete d; }
 
 void StunBinding::setPriority(quint32 i)
 {
     d->use_extPriority = true;
-    d->extPriority = i;
+    d->extPriority     = i;
 }
 
-void StunBinding::setUseCandidate(bool enabled)
-{
-    d->extUseCandidate = enabled;
-}
+void StunBinding::setUseCandidate(bool enabled) { d->extUseCandidate = enabled; }
 
 void StunBinding::setIceControlling(quint64 i)
 {
     d->use_extIceControlling = true;
-    d->extIceControlling = i;
+    d->extIceControlling     = i;
 }
 
 void StunBinding::setIceControlled(quint64 i)
 {
     d->use_extIceControlled = true;
-    d->extIceControlled = i;
+    d->extIceControlled     = i;
 }
 
-void StunBinding::setShortTermUsername(const QString &username)
-{
-    d->stuser = username;
-}
+void StunBinding::setShortTermUsername(const QString &username) { d->stuser = username; }
 
-void StunBinding::setShortTermPassword(const QString &password)
-{
-    d->stpass = password;
-}
+void StunBinding::setShortTermPassword(const QString &password) { d->stpass = password; }
 
-void StunBinding::setFingerprintRequired(bool enabled)
-{
-    d->fpRequired = enabled;
-}
+void StunBinding::setFingerprintRequired(bool enabled) { d->fpRequired = enabled; }
 
-void StunBinding::start()
-{
-    d->start();
-}
+void StunBinding::start() { d->start(); }
 
-void StunBinding::start(const QHostAddress &addr, int port)
-{
-    d->start(addr, port);
-}
+void StunBinding::start(const QHostAddress &addr, int port) { d->start(addr, port); }
 
-QHostAddress StunBinding::reflexiveAddress() const
-{
-    return d->addr;
-}
+QHostAddress StunBinding::reflexiveAddress() const { return d->addr; }
 
-int StunBinding::reflexivePort() const
-{
-    return d->port;
-}
+int StunBinding::reflexivePort() const { return d->port; }
 
-QString StunBinding::errorString() const
-{
-    return d->errorString;
-}
+QString StunBinding::errorString() const { return d->errorString; }
 } // namespace XMPP
 
 #include "stunbinding.moc"
diff --git a/src/irisnet/noncore/stunbinding.h b/src/irisnet/noncore/stunbinding.h
index 963e5fd2..3fcc490e 100644
--- a/src/irisnet/noncore/stunbinding.h
+++ b/src/irisnet/noncore/stunbinding.h
@@ -26,19 +26,11 @@ class QHostAddress;
 namespace XMPP {
 class StunTransactionPool;
 
-class StunBinding : public QObject
-{
+class StunBinding : public QObject {
     Q_OBJECT
 
 public:
-    enum Error
-    {
-        ErrorGeneric,
-        ErrorTimeout,
-        ErrorRejected,
-        ErrorProtocol,
-        ErrorConflict
-    };
+    enum Error { ErrorGeneric, ErrorTimeout, ErrorRejected, ErrorProtocol, ErrorConflict };
 
     StunBinding(StunTransactionPool *pool);
     ~StunBinding();
@@ -58,7 +50,7 @@ class StunBinding : public QObject
     void start(const QHostAddress &addr, int port); // use addr association
 
     QHostAddress reflexiveAddress() const;
-    int reflexivePort() const;
+    int          reflexivePort() const;
 
     // non-translatable diagnostic string for convenience
     QString errorString() const;
diff --git a/src/irisnet/noncore/stunmessage.cpp b/src/irisnet/noncore/stunmessage.cpp
index 87e6a6ec..ca8b75e9 100644
--- a/src/irisnet/noncore/stunmessage.cpp
+++ b/src/irisnet/noncore/stunmessage.cpp
@@ -23,113 +23,67 @@
 #include <QSharedData>
 #include <QtCrypto>
 
-#define ENSURE_D { if(!d) d = new Private; }
+#define ENSURE_D                                                                                                       \
+    {                                                                                                                  \
+        if (!d)                                                                                                        \
+            d = new Private;                                                                                           \
+    }
 
 namespace XMPP {
 using namespace StunUtil;
 
 // some attribute types we need to explicitly support
-enum
-{
-    AttribMessageIntegrity = 0x0008,
-    AttribFingerprint      = 0x8028
-};
+enum { AttribMessageIntegrity = 0x0008, AttribFingerprint = 0x8028 };
 
 // adapted from public domain source by Ross Williams and Eric Durbin
-unsigned long crctable[256] =
-{
-    0x00000000L, 0x77073096L, 0xEE0E612CL, 0x990951BAL,
-    0x076DC419L, 0x706AF48FL, 0xE963A535L, 0x9E6495A3L,
-    0x0EDB8832L, 0x79DCB8A4L, 0xE0D5E91EL, 0x97D2D988L,
-    0x09B64C2BL, 0x7EB17CBDL, 0xE7B82D07L, 0x90BF1D91L,
-    0x1DB71064L, 0x6AB020F2L, 0xF3B97148L, 0x84BE41DEL,
-    0x1ADAD47DL, 0x6DDDE4EBL, 0xF4D4B551L, 0x83D385C7L,
-    0x136C9856L, 0x646BA8C0L, 0xFD62F97AL, 0x8A65C9ECL,
-    0x14015C4FL, 0x63066CD9L, 0xFA0F3D63L, 0x8D080DF5L,
-    0x3B6E20C8L, 0x4C69105EL, 0xD56041E4L, 0xA2677172L,
-    0x3C03E4D1L, 0x4B04D447L, 0xD20D85FDL, 0xA50AB56BL,
-    0x35B5A8FAL, 0x42B2986CL, 0xDBBBC9D6L, 0xACBCF940L,
-    0x32D86CE3L, 0x45DF5C75L, 0xDCD60DCFL, 0xABD13D59L,
-    0x26D930ACL, 0x51DE003AL, 0xC8D75180L, 0xBFD06116L,
-    0x21B4F4B5L, 0x56B3C423L, 0xCFBA9599L, 0xB8BDA50FL,
-    0x2802B89EL, 0x5F058808L, 0xC60CD9B2L, 0xB10BE924L,
-    0x2F6F7C87L, 0x58684C11L, 0xC1611DABL, 0xB6662D3DL,
-    0x76DC4190L, 0x01DB7106L, 0x98D220BCL, 0xEFD5102AL,
-    0x71B18589L, 0x06B6B51FL, 0x9FBFE4A5L, 0xE8B8D433L,
-    0x7807C9A2L, 0x0F00F934L, 0x9609A88EL, 0xE10E9818L,
-    0x7F6A0DBBL, 0x086D3D2DL, 0x91646C97L, 0xE6635C01L,
-    0x6B6B51F4L, 0x1C6C6162L, 0x856530D8L, 0xF262004EL,
-    0x6C0695EDL, 0x1B01A57BL, 0x8208F4C1L, 0xF50FC457L,
-    0x65B0D9C6L, 0x12B7E950L, 0x8BBEB8EAL, 0xFCB9887CL,
-    0x62DD1DDFL, 0x15DA2D49L, 0x8CD37CF3L, 0xFBD44C65L,
-    0x4DB26158L, 0x3AB551CEL, 0xA3BC0074L, 0xD4BB30E2L,
-    0x4ADFA541L, 0x3DD895D7L, 0xA4D1C46DL, 0xD3D6F4FBL,
-    0x4369E96AL, 0x346ED9FCL, 0xAD678846L, 0xDA60B8D0L,
-    0x44042D73L, 0x33031DE5L, 0xAA0A4C5FL, 0xDD0D7CC9L,
-    0x5005713CL, 0x270241AAL, 0xBE0B1010L, 0xC90C2086L,
-    0x5768B525L, 0x206F85B3L, 0xB966D409L, 0xCE61E49FL,
-    0x5EDEF90EL, 0x29D9C998L, 0xB0D09822L, 0xC7D7A8B4L,
-    0x59B33D17L, 0x2EB40D81L, 0xB7BD5C3BL, 0xC0BA6CADL,
-    0xEDB88320L, 0x9ABFB3B6L, 0x03B6E20CL, 0x74B1D29AL,
-    0xEAD54739L, 0x9DD277AFL, 0x04DB2615L, 0x73DC1683L,
-    0xE3630B12L, 0x94643B84L, 0x0D6D6A3EL, 0x7A6A5AA8L,
-    0xE40ECF0BL, 0x9309FF9DL, 0x0A00AE27L, 0x7D079EB1L,
-    0xF00F9344L, 0x8708A3D2L, 0x1E01F268L, 0x6906C2FEL,
-    0xF762575DL, 0x806567CBL, 0x196C3671L, 0x6E6B06E7L,
-    0xFED41B76L, 0x89D32BE0L, 0x10DA7A5AL, 0x67DD4ACCL,
-    0xF9B9DF6FL, 0x8EBEEFF9L, 0x17B7BE43L, 0x60B08ED5L,
-    0xD6D6A3E8L, 0xA1D1937EL, 0x38D8C2C4L, 0x4FDFF252L,
-    0xD1BB67F1L, 0xA6BC5767L, 0x3FB506DDL, 0x48B2364BL,
-    0xD80D2BDAL, 0xAF0A1B4CL, 0x36034AF6L, 0x41047A60L,
-    0xDF60EFC3L, 0xA867DF55L, 0x316E8EEFL, 0x4669BE79L,
-    0xCB61B38CL, 0xBC66831AL, 0x256FD2A0L, 0x5268E236L,
-    0xCC0C7795L, 0xBB0B4703L, 0x220216B9L, 0x5505262FL,
-    0xC5BA3BBEL, 0xB2BD0B28L, 0x2BB45A92L, 0x5CB36A04L,
-    0xC2D7FFA7L, 0xB5D0CF31L, 0x2CD99E8BL, 0x5BDEAE1DL,
-    0x9B64C2B0L, 0xEC63F226L, 0x756AA39CL, 0x026D930AL,
-    0x9C0906A9L, 0xEB0E363FL, 0x72076785L, 0x05005713L,
-    0x95BF4A82L, 0xE2B87A14L, 0x7BB12BAEL, 0x0CB61B38L,
-    0x92D28E9BL, 0xE5D5BE0DL, 0x7CDCEFB7L, 0x0BDBDF21L,
-    0x86D3D2D4L, 0xF1D4E242L, 0x68DDB3F8L, 0x1FDA836EL,
-    0x81BE16CDL, 0xF6B9265BL, 0x6FB077E1L, 0x18B74777L,
-    0x88085AE6L, 0xFF0F6A70L, 0x66063BCAL, 0x11010B5CL,
-    0x8F659EFFL, 0xF862AE69L, 0x616BFFD3L, 0x166CCF45L,
-    0xA00AE278L, 0xD70DD2EEL, 0x4E048354L, 0x3903B3C2L,
-    0xA7672661L, 0xD06016F7L, 0x4969474DL, 0x3E6E77DBL,
-    0xAED16A4AL, 0xD9D65ADCL, 0x40DF0B66L, 0x37D83BF0L,
-    0xA9BCAE53L, 0xDEBB9EC5L, 0x47B2CF7FL, 0x30B5FFE9L,
-    0xBDBDF21CL, 0xCABAC28AL, 0x53B39330L, 0x24B4A3A6L,
-    0xBAD03605L, 0xCDD70693L, 0x54DE5729L, 0x23D967BFL,
-    0xB3667A2EL, 0xC4614AB8L, 0x5D681B02L, 0x2A6F2B94L,
+unsigned long crctable[256] = {
+    0x00000000L, 0x77073096L, 0xEE0E612CL, 0x990951BAL, 0x076DC419L, 0x706AF48FL, 0xE963A535L, 0x9E6495A3L, 0x0EDB8832L,
+    0x79DCB8A4L, 0xE0D5E91EL, 0x97D2D988L, 0x09B64C2BL, 0x7EB17CBDL, 0xE7B82D07L, 0x90BF1D91L, 0x1DB71064L, 0x6AB020F2L,
+    0xF3B97148L, 0x84BE41DEL, 0x1ADAD47DL, 0x6DDDE4EBL, 0xF4D4B551L, 0x83D385C7L, 0x136C9856L, 0x646BA8C0L, 0xFD62F97AL,
+    0x8A65C9ECL, 0x14015C4FL, 0x63066CD9L, 0xFA0F3D63L, 0x8D080DF5L, 0x3B6E20C8L, 0x4C69105EL, 0xD56041E4L, 0xA2677172L,
+    0x3C03E4D1L, 0x4B04D447L, 0xD20D85FDL, 0xA50AB56BL, 0x35B5A8FAL, 0x42B2986CL, 0xDBBBC9D6L, 0xACBCF940L, 0x32D86CE3L,
+    0x45DF5C75L, 0xDCD60DCFL, 0xABD13D59L, 0x26D930ACL, 0x51DE003AL, 0xC8D75180L, 0xBFD06116L, 0x21B4F4B5L, 0x56B3C423L,
+    0xCFBA9599L, 0xB8BDA50FL, 0x2802B89EL, 0x5F058808L, 0xC60CD9B2L, 0xB10BE924L, 0x2F6F7C87L, 0x58684C11L, 0xC1611DABL,
+    0xB6662D3DL, 0x76DC4190L, 0x01DB7106L, 0x98D220BCL, 0xEFD5102AL, 0x71B18589L, 0x06B6B51FL, 0x9FBFE4A5L, 0xE8B8D433L,
+    0x7807C9A2L, 0x0F00F934L, 0x9609A88EL, 0xE10E9818L, 0x7F6A0DBBL, 0x086D3D2DL, 0x91646C97L, 0xE6635C01L, 0x6B6B51F4L,
+    0x1C6C6162L, 0x856530D8L, 0xF262004EL, 0x6C0695EDL, 0x1B01A57BL, 0x8208F4C1L, 0xF50FC457L, 0x65B0D9C6L, 0x12B7E950L,
+    0x8BBEB8EAL, 0xFCB9887CL, 0x62DD1DDFL, 0x15DA2D49L, 0x8CD37CF3L, 0xFBD44C65L, 0x4DB26158L, 0x3AB551CEL, 0xA3BC0074L,
+    0xD4BB30E2L, 0x4ADFA541L, 0x3DD895D7L, 0xA4D1C46DL, 0xD3D6F4FBL, 0x4369E96AL, 0x346ED9FCL, 0xAD678846L, 0xDA60B8D0L,
+    0x44042D73L, 0x33031DE5L, 0xAA0A4C5FL, 0xDD0D7CC9L, 0x5005713CL, 0x270241AAL, 0xBE0B1010L, 0xC90C2086L, 0x5768B525L,
+    0x206F85B3L, 0xB966D409L, 0xCE61E49FL, 0x5EDEF90EL, 0x29D9C998L, 0xB0D09822L, 0xC7D7A8B4L, 0x59B33D17L, 0x2EB40D81L,
+    0xB7BD5C3BL, 0xC0BA6CADL, 0xEDB88320L, 0x9ABFB3B6L, 0x03B6E20CL, 0x74B1D29AL, 0xEAD54739L, 0x9DD277AFL, 0x04DB2615L,
+    0x73DC1683L, 0xE3630B12L, 0x94643B84L, 0x0D6D6A3EL, 0x7A6A5AA8L, 0xE40ECF0BL, 0x9309FF9DL, 0x0A00AE27L, 0x7D079EB1L,
+    0xF00F9344L, 0x8708A3D2L, 0x1E01F268L, 0x6906C2FEL, 0xF762575DL, 0x806567CBL, 0x196C3671L, 0x6E6B06E7L, 0xFED41B76L,
+    0x89D32BE0L, 0x10DA7A5AL, 0x67DD4ACCL, 0xF9B9DF6FL, 0x8EBEEFF9L, 0x17B7BE43L, 0x60B08ED5L, 0xD6D6A3E8L, 0xA1D1937EL,
+    0x38D8C2C4L, 0x4FDFF252L, 0xD1BB67F1L, 0xA6BC5767L, 0x3FB506DDL, 0x48B2364BL, 0xD80D2BDAL, 0xAF0A1B4CL, 0x36034AF6L,
+    0x41047A60L, 0xDF60EFC3L, 0xA867DF55L, 0x316E8EEFL, 0x4669BE79L, 0xCB61B38CL, 0xBC66831AL, 0x256FD2A0L, 0x5268E236L,
+    0xCC0C7795L, 0xBB0B4703L, 0x220216B9L, 0x5505262FL, 0xC5BA3BBEL, 0xB2BD0B28L, 0x2BB45A92L, 0x5CB36A04L, 0xC2D7FFA7L,
+    0xB5D0CF31L, 0x2CD99E8BL, 0x5BDEAE1DL, 0x9B64C2B0L, 0xEC63F226L, 0x756AA39CL, 0x026D930AL, 0x9C0906A9L, 0xEB0E363FL,
+    0x72076785L, 0x05005713L, 0x95BF4A82L, 0xE2B87A14L, 0x7BB12BAEL, 0x0CB61B38L, 0x92D28E9BL, 0xE5D5BE0DL, 0x7CDCEFB7L,
+    0x0BDBDF21L, 0x86D3D2D4L, 0xF1D4E242L, 0x68DDB3F8L, 0x1FDA836EL, 0x81BE16CDL, 0xF6B9265BL, 0x6FB077E1L, 0x18B74777L,
+    0x88085AE6L, 0xFF0F6A70L, 0x66063BCAL, 0x11010B5CL, 0x8F659EFFL, 0xF862AE69L, 0x616BFFD3L, 0x166CCF45L, 0xA00AE278L,
+    0xD70DD2EEL, 0x4E048354L, 0x3903B3C2L, 0xA7672661L, 0xD06016F7L, 0x4969474DL, 0x3E6E77DBL, 0xAED16A4AL, 0xD9D65ADCL,
+    0x40DF0B66L, 0x37D83BF0L, 0xA9BCAE53L, 0xDEBB9EC5L, 0x47B2CF7FL, 0x30B5FFE9L, 0xBDBDF21CL, 0xCABAC28AL, 0x53B39330L,
+    0x24B4A3A6L, 0xBAD03605L, 0xCDD70693L, 0x54DE5729L, 0x23D967BFL, 0xB3667A2EL, 0xC4614AB8L, 0x5D681B02L, 0x2A6F2B94L,
     0xB40BBE37L, 0xC30C8EA1L, 0x5A05DF1BL, 0x2D02EF8DL
 };
 
-class Crc32
-{
+class Crc32 {
 private:
     quint32 result;
 
 public:
-    Crc32()
-    {
-        clear();
-    }
+    Crc32() { clear(); }
 
-    void clear()
-    {
-        result = 0xffffffff;
-    }
+    void clear() { result = 0xffffffff; }
 
     void update(const QByteArray &in)
     {
-        for(int n = 0; n < in.size(); ++n)
+        for (int n = 0; n < in.size(); ++n)
             result = (result >> 8) ^ (crctable[(result & 0xff) ^ (quint8)in[n]]);
     }
 
-    quint32 final()
-    {
-        return result ^= 0xffffffff;
-    }
+    quint32 final() { return result ^= 0xffffffff; }
 
     static quint32 process(const QByteArray &in)
     {
@@ -146,36 +100,36 @@ static quint8 magic_cookie[4] = { 0x21, 0x12, 0xA4, 0x42 };
 static int check_and_get_length(const QByteArray &buf)
 {
     // stun packets are at least 20 bytes
-    if(buf.size() < 20)
+    if (buf.size() < 20)
         return -1;
 
     // minimal 3-field check
 
     // top 2 bits of packet must be 0
-    if(buf[0] & 0xC0)
+    if (buf[0] & 0xC0)
         return -1;
 
-    const quint8 *p = (const quint8 *)buf.data();
-    quint16 mlen = read16(p + 2);
+    const quint8 *p    = (const quint8 *)buf.data();
+    quint16       mlen = read16(p + 2);
 
     // bottom 2 bits of message length field must be 0
-    if(mlen & 0x03)
+    if (mlen & 0x03)
         return -1;
 
     // (also, the message length should be a reasonable size)
-    if(mlen + 20 > buf.size())
+    if (mlen + 20 > buf.size())
         return -1;
 
     // magic cookie must be set
-    if(memcmp(p + 4, magic_cookie, 4) != 0)
+    if (memcmp(p + 4, magic_cookie, 4) != 0)
         return -1;
 
     return mlen;
 }
 
-#define ATTRIBUTE_AREA_START  20
-#define ATTRIBUTE_AREA_MAX    65535
-#define ATTRIBUTE_VALUE_MAX   65531
+#define ATTRIBUTE_AREA_START 20
+#define ATTRIBUTE_AREA_MAX 65535
+#define ATTRIBUTE_VALUE_MAX 65531
 
 // note: because the attribute area of the packet has a maximum size of
 //   2^16-1, and each attribute itself has a 4 byte header, it follows that
@@ -185,9 +139,9 @@ static int check_and_get_length(const QByteArray &buf)
 static quint16 round_up_length(quint16 in)
 {
     Q_ASSERT(in <= ATTRIBUTE_VALUE_MAX);
-    quint16 out = in;
+    quint16 out       = in;
     quint16 remainder = out % 4;
-    if(remainder != 0)
+    if (remainder != 0)
         out += (4 - remainder);
     return out;
 }
@@ -204,7 +158,7 @@ static int get_attribute_props(const QByteArray &buf, int offset, quint16 *type,
     const quint8 *p = (const quint8 *)buf.data();
 
     // need at least 4 bytes for an attribute
-    if(offset + 4 > buf.size())
+    if (offset + 4 > buf.size())
         return -1;
 
     quint16 _type = read16(p + offset);
@@ -215,11 +169,11 @@ static int get_attribute_props(const QByteArray &buf, int offset, quint16 *type,
     // get physical length.  stun attributes are 4-byte aligned, and may
     //   contain 0-3 bytes of padding.
     quint16 plen = round_up_length(_alen);
-    if(offset + plen > buf.size())
+    if (offset + plen > buf.size())
         return -1;
 
     *type = _type;
-    *len = _alen;
+    *len  = _alen;
     return offset + plen;
 }
 
@@ -230,20 +184,18 @@ static int get_attribute_props(const QByteArray &buf, int offset, quint16 *type,
 // returns offset of found attribute, -1 if not found
 static int find_attribute(const QByteArray &buf, quint16 type, int *len, int *next = nullptr)
 {
-    int at = ATTRIBUTE_AREA_START;
+    int     at = ATTRIBUTE_AREA_START;
     quint16 _type;
-    int _len;
-    int _next;
+    int     _len;
+    int     _next;
 
-    while(1)
-    {
+    while (1) {
         _next = get_attribute_props(buf, at, &_type, &_len);
-        if(_next == -1)
+        if (_next == -1)
             break;
-        if(_type == type)
-        {
+        if (_type == type) {
             *len = _len;
-            if(next)
+            if (next)
                 *next = _next;
             return at;
         }
@@ -261,13 +213,13 @@ static int find_attribute(const QByteArray &buf, quint16 type, int *len, int *ne
 // note: padding following attribute is zeroed out
 static int append_attribute_uninitialized(QByteArray *buf, quint16 type, int len)
 {
-    if(len > ATTRIBUTE_VALUE_MAX)
+    if (len > ATTRIBUTE_VALUE_MAX)
         return -1;
 
     quint16 alen = (quint16)len;
     quint16 plen = round_up_length(alen);
 
-    if((buf->size() - ATTRIBUTE_AREA_START) + 4 + plen > ATTRIBUTE_AREA_MAX)
+    if ((buf->size() - ATTRIBUTE_AREA_START) + 4 + plen > ATTRIBUTE_AREA_MAX)
         return -1;
 
     int at = buf->size();
@@ -278,7 +230,7 @@ static int append_attribute_uninitialized(QByteArray *buf, quint16 type, int len
     write16(p + at + 2, alen);
 
     // padding
-    for(int n = 0; n < plen - alen; ++n)
+    for (int n = 0; n < plen - alen; ++n)
         p[at + alen + n] = 0;
 
     return at;
@@ -293,8 +245,8 @@ static quint32 fingerprint_calc(const quint8 *buf, int size)
 static QByteArray message_integrity_calc(const quint8 *buf, int size, const QByteArray &key)
 {
     QCA::MessageAuthenticationCode hmac("hmac(sha1)", key);
-    QByteArray region = QByteArray::fromRawData((const char *)buf, size);
-    QByteArray result = hmac.process(region).toByteArray();
+    QByteArray                     region = QByteArray::fromRawData((const char *)buf, size);
+    QByteArray                     result = hmac.process(region).toByteArray();
     Q_ASSERT(result.size() == 20);
     return result;
 }
@@ -306,13 +258,13 @@ static bool fingerprint_check(const QByteArray &buf)
 {
     int at, len;
     at = find_attribute(buf, AttribFingerprint, &len);
-    if(at == -1 || len != 4) // value must be 4 bytes
+    if (at == -1 || len != 4) // value must be 4 bytes
         return false;
 
-    const quint8 *p = (const quint8 *)buf.data();
-    quint32 fpval = read32(p + at + 4);
-    quint32 fpcalc = fingerprint_calc(p, at);
-    if(fpval == fpcalc)
+    const quint8 *p      = (const quint8 *)buf.data();
+    quint32       fpval  = read32(p + at + 4);
+    quint32       fpcalc = fingerprint_calc(p, at);
+    if (fpval == fpcalc)
         return true;
     else
         return false;
@@ -331,14 +283,14 @@ static bool message_integrity_prep(const QByteArray &buf, QByteArray *out, int *
 {
     int at, len, next;
     at = find_attribute(buf, AttribMessageIntegrity, &len, &next);
-    if(at == -1 || len != 20) // value must be 20 bytes
+    if (at == -1 || len != 20) // value must be 20 bytes
         return false;
 
     // prepare new attribute area size
     int i = next - ATTRIBUTE_AREA_START;
 
     // new value must be divisible by 4
-    if(i % 4 != 0)
+    if (i % 4 != 0)
         return false;
 
     // copy truncated packet
@@ -359,22 +311,21 @@ static bool message_integrity_prep(const QByteArray &buf, QByteArray *out, int *
 // returns true if correct
 static bool message_integrity_check(const QByteArray &buf, int offset, const QByteArray &key)
 {
-    QByteArray mival = QByteArray::fromRawData(buf.data() + offset + 4, 20);
+    QByteArray mival  = QByteArray::fromRawData(buf.data() + offset + 4, 20);
     QByteArray micalc = message_integrity_calc((const quint8 *)buf.data(), offset, key);
-    if(mival == micalc)
+    if (mival == micalc)
         return true;
     else
         return false;
 }
 
-class StunMessage::Private : public QSharedData
-{
+class StunMessage::Private : public QSharedData {
 public:
     StunMessage::Class mclass;
-    quint16 method;
-    quint8 magic[4];
-    quint8 id[12];
-    QList<Attribute> attribs;
+    quint16            method;
+    quint8             magic[4];
+    quint8             id[12];
+    QList<Attribute>   attribs;
 
     Private()
     {
@@ -385,30 +336,19 @@ class StunMessage::Private : public QSharedData
     }
 };
 
-StunMessage::StunMessage() :
-    d(nullptr)
-{
-}
+StunMessage::StunMessage() : d(nullptr) {}
 
-StunMessage::StunMessage(const StunMessage &from) :
-    d(from.d)
-{
-}
+StunMessage::StunMessage(const StunMessage &from) : d(from.d) {}
 
-StunMessage::~StunMessage()
-{
-}
+StunMessage::~StunMessage() {}
 
-StunMessage & StunMessage::operator=(const StunMessage &from)
+StunMessage &StunMessage::operator=(const StunMessage &from)
 {
     d = from.d;
     return *this;
 }
 
-bool StunMessage::isNull() const
-{
-    return (d ? false : true);
-}
+bool StunMessage::isNull() const { return (d ? false : true); }
 
 StunMessage::Class StunMessage::mclass() const
 {
@@ -444,9 +384,8 @@ QByteArray StunMessage::attribute(quint16 type) const
 {
     Q_ASSERT(d);
 
-    foreach(const Attribute &i, d->attribs)
-    {
-        if(i.type == type)
+    foreach (const Attribute &i, d->attribs) {
+        if (i.type == type)
             return i.value;
     }
     return QByteArray();
@@ -488,16 +427,16 @@ QByteArray StunMessage::toBinary(int validationFlags, const QByteArray &key) con
 
     // header
     QByteArray buf(20, 0);
-    quint8 *p = (quint8 *)buf.data();
+    quint8 *   p = (quint8 *)buf.data();
 
     quint8 classbits = 0;
-    if(d->mclass == Request)
+    if (d->mclass == Request)
         classbits = 0; // 00
-    else if(d->mclass == Indication)
+    else if (d->mclass == Indication)
         classbits = 1; // 01
-    else if(d->mclass == SuccessResponse)
+    else if (d->mclass == SuccessResponse)
         classbits = 2; // 10
-    else if(d->mclass == ErrorResponse)
+    else if (d->mclass == ErrorResponse)
         classbits = 3; // 11
     else
         Q_ASSERT(0);
@@ -523,10 +462,9 @@ QByteArray StunMessage::toBinary(int validationFlags, const QByteArray &key) con
     memcpy(p + 4, d->magic, 4);
     memcpy(p + 8, d->id, 12);
 
-    foreach(const Attribute &i, d->attribs)
-    {
+    foreach (const Attribute &i, d->attribs) {
         int at = append_attribute_uninitialized(&buf, i.type, i.value.size());
-        if(at == -1)
+        if (at == -1)
             return QByteArray();
 
         p = (quint8 *)buf.data(); // follow the resize
@@ -537,11 +475,10 @@ QByteArray StunMessage::toBinary(int validationFlags, const QByteArray &key) con
     // set attribute area size
     write16(p + 2, buf.size() - ATTRIBUTE_AREA_START);
 
-    if(validationFlags & MessageIntegrity)
-    {
+    if (validationFlags & MessageIntegrity) {
         quint16 alen = 20; // size of hmac(sha1)
-        int at = append_attribute_uninitialized(&buf, AttribMessageIntegrity, alen);
-        if(at == -1)
+        int     at   = append_attribute_uninitialized(&buf, AttribMessageIntegrity, alen);
+        if (at == -1)
             return QByteArray();
 
         p = (quint8 *)buf.data(); // follow the resize
@@ -555,11 +492,10 @@ QByteArray StunMessage::toBinary(int validationFlags, const QByteArray &key) con
         memcpy(p + at + 4, result.data(), alen);
     }
 
-    if(validationFlags & Fingerprint)
-    {
+    if (validationFlags & Fingerprint) {
         quint16 alen = 4; // size of crc32
-        int at = append_attribute_uninitialized(&buf, AttribFingerprint, alen);
-        if(at == -1)
+        int     at   = append_attribute_uninitialized(&buf, AttribFingerprint, alen);
+        if (at == -1)
             return QByteArray();
 
         p = (quint8 *)buf.data(); // follow the resize
@@ -575,21 +511,19 @@ QByteArray StunMessage::toBinary(int validationFlags, const QByteArray &key) con
     return buf;
 }
 
-StunMessage StunMessage::fromBinary(const QByteArray &a, ConvertResult *result, int validationFlags, const QByteArray &key)
+StunMessage StunMessage::fromBinary(const QByteArray &a, ConvertResult *result, int validationFlags,
+                                    const QByteArray &key)
 {
     int mlen = check_and_get_length(a);
-    if(mlen == -1)
-    {
-        if(result)
+    if (mlen == -1) {
+        if (result)
             *result = ErrorFormat;
         return StunMessage();
     }
 
-    if(validationFlags & Fingerprint)
-    {
-        if(!fingerprint_check(a))
-        {
-            if(result)
+    if (validationFlags & Fingerprint) {
+        if (!fingerprint_check(a)) {
+            if (result)
                 *result = ErrorFingerprint;
             return StunMessage();
         }
@@ -597,24 +531,20 @@ StunMessage StunMessage::fromBinary(const QByteArray &a, ConvertResult *result,
 
     QByteArray in;
 
-    if(validationFlags & MessageIntegrity)
-    {
+    if (validationFlags & MessageIntegrity) {
         int offset;
-        if(!message_integrity_prep(a, &in, &offset))
-        {
-            if(result)
+        if (!message_integrity_prep(a, &in, &offset)) {
+            if (result)
                 *result = ErrorMessageIntegrity;
             return StunMessage();
         }
 
-        if(!message_integrity_check(in, offset, key))
-        {
-            if(result)
+        if (!message_integrity_check(in, offset, key)) {
+            if (result)
                 *result = ErrorMessageIntegrity;
             return StunMessage();
         }
-    }
-    else
+    } else
         in = a;
 
     // all validating complete, now just parse the packet
@@ -636,15 +566,15 @@ StunMessage StunMessage::fromBinary(const QByteArray &a, ConvertResult *result,
     c2 = p[1] & 0x10; // C0
     c2 >>= 4;
 
-    quint16 method = m1 | m2 | m3;
-    quint8 classbits = c1 | c2;
+    quint16 method    = m1 | m2 | m3;
+    quint8  classbits = c1 | c2;
 
     Class mclass;
-    if(classbits == 0) // 00
+    if (classbits == 0) // 00
         mclass = Request;
-    else if(classbits == 1) // 01
+    else if (classbits == 1) // 01
         mclass = Indication;
-    else if(classbits == 2) // 10
+    else if (classbits == 2) // 10
         mclass = SuccessResponse;
     else // 11
         mclass = ErrorResponse;
@@ -656,19 +586,18 @@ StunMessage StunMessage::fromBinary(const QByteArray &a, ConvertResult *result,
     out.setId(p + 8);
 
     QList<Attribute> list;
-    int at = ATTRIBUTE_AREA_START;
-    while(1)
-    {
+    int              at = ATTRIBUTE_AREA_START;
+    while (1) {
         quint16 type;
-        int len;
-        int next;
+        int     len;
+        int     next;
 
         next = get_attribute_props(in, at, &type, &len);
-        if(next == -1)
+        if (next == -1)
             break;
 
         Attribute attrib;
-        attrib.type = type;
+        attrib.type  = type;
         attrib.value = in.mid(at + 4, len);
         list += attrib;
 
@@ -676,15 +605,12 @@ StunMessage StunMessage::fromBinary(const QByteArray &a, ConvertResult *result,
     }
     out.setAttributes(list);
 
-    if(result)
+    if (result)
         *result = ConvertGood;
     return out;
 }
 
-bool StunMessage::isProbablyStun(const QByteArray &a)
-{
-    return (check_and_get_length(a) != -1 ? true : false);
-}
+bool StunMessage::isProbablyStun(const QByteArray &a) { return (check_and_get_length(a) != -1 ? true : false); }
 
 StunMessage::Class StunMessage::extractClass(const QByteArray &in)
 {
@@ -700,11 +626,11 @@ StunMessage::Class StunMessage::extractClass(const QByteArray &in)
     quint8 classbits = c1 | c2;
 
     Class mclass;
-    if(classbits == 0) // 00
+    if (classbits == 0) // 00
         mclass = Request;
-    else if(classbits == 1) // 01
+    else if (classbits == 1) // 01
         mclass = Indication;
-    else if(classbits == 2) // 10
+    else if (classbits == 2) // 10
         mclass = SuccessResponse;
     else // 11
         mclass = ErrorResponse;
@@ -720,9 +646,9 @@ bool StunMessage::containsStun(const quint8 *data, int size)
 
 QByteArray StunMessage::readStun(const quint8 *data, int size)
 {
-    QByteArray in = QByteArray::fromRawData((const char *)data, size);
-    int mlen = check_and_get_length(in);
-    if(mlen != -1)
+    QByteArray in   = QByteArray::fromRawData((const char *)data, size);
+    int        mlen = check_and_get_length(in);
+    if (mlen != -1)
         return QByteArray((const char *)data, mlen + 20);
     else
         return QByteArray();
diff --git a/src/irisnet/noncore/stunmessage.h b/src/irisnet/noncore/stunmessage.h
index 8563712e..e9bb3d6c 100644
--- a/src/irisnet/noncore/stunmessage.h
+++ b/src/irisnet/noncore/stunmessage.h
@@ -24,51 +24,35 @@
 #include <QSharedDataPointer>
 
 namespace XMPP {
-class StunMessage
-{
+class StunMessage {
 public:
-    enum Class
-    {
-        Request,
-        SuccessResponse,
-        ErrorResponse,
-        Indication
-    };
+    enum Class { Request, SuccessResponse, ErrorResponse, Indication };
 
-    enum ValidationFlags
-    {
-        Fingerprint      = 0x01,
+    enum ValidationFlags {
+        Fingerprint = 0x01,
 
         // you must have the hmac(sha1) algorithm in QCA to use
         MessageIntegrity = 0x02
     };
 
-    enum ConvertResult
-    {
-        ConvertGood,
-        ErrorFormat,
-        ErrorFingerprint,
-        ErrorMessageIntegrity,
-        ErrorConvertUnknown = 64
-    };
+    enum ConvertResult { ConvertGood, ErrorFormat, ErrorFingerprint, ErrorMessageIntegrity, ErrorConvertUnknown = 64 };
 
-    class Attribute
-    {
+    class Attribute {
     public:
-        quint16 type;
+        quint16    type;
         QByteArray value;
     };
 
     StunMessage();
     StunMessage(const StunMessage &from);
     ~StunMessage();
-    StunMessage & operator=(const StunMessage &from);
+    StunMessage &operator=(const StunMessage &from);
 
-    bool isNull() const;
-    Class mclass() const;
-    quint16 method() const;
-    const quint8 *magic() const; // 4 bytes
-    const quint8 *id() const; // 12 bytes
+    bool             isNull() const;
+    Class            mclass() const;
+    quint16          method() const;
+    const quint8 *   magic() const; // 4 bytes
+    const quint8 *   id() const;    // 12 bytes
     QList<Attribute> attributes() const;
 
     // returns the first instance or null
@@ -77,11 +61,12 @@ class StunMessage
     void setClass(Class mclass);
     void setMethod(quint16 method);
     void setMagic(const quint8 *magic); // 4 bytes
-    void setId(const quint8 *id); // 12 bytes
+    void setId(const quint8 *id);       // 12 bytes
     void setAttributes(const QList<Attribute> &attribs);
 
-    QByteArray toBinary(int validationFlags = 0, const QByteArray &key = QByteArray()) const;
-    static StunMessage fromBinary(const QByteArray &a, ConvertResult *result = nullptr, int validationFlags = 0, const QByteArray &key = QByteArray());
+    QByteArray         toBinary(int validationFlags = 0, const QByteArray &key = QByteArray()) const;
+    static StunMessage fromBinary(const QByteArray &a, ConvertResult *result = nullptr, int validationFlags = 0,
+                                  const QByteArray &key = QByteArray());
 
     // minimal 3-field check
     static bool isProbablyStun(const QByteArray &a);
diff --git a/src/irisnet/noncore/stuntransaction.cpp b/src/irisnet/noncore/stuntransaction.cpp
index 70a13c75..3c12f512 100644
--- a/src/irisnet/noncore/stuntransaction.cpp
+++ b/src/irisnet/noncore/stuntransaction.cpp
@@ -44,42 +44,37 @@ static StunMessage parse_stun_message(const QByteArray &packet, int *validationF
     //   parsing the packet, so we should be able to avoid most redundant
     //   processing.  fromBinary checks the fingerprint first, and we
     //   can use that knowledge to avoid duplicating integrity checks.
-    int flags = 0;
+    int                        flags = 0;
     StunMessage::ConvertResult result;
-    StunMessage msg = StunMessage::fromBinary(packet, &result, StunMessage::MessageIntegrity | StunMessage::Fingerprint, key);
-    if(result == StunMessage::ErrorFingerprint)
-    {
+    StunMessage                msg
+        = StunMessage::fromBinary(packet, &result, StunMessage::MessageIntegrity | StunMessage::Fingerprint, key);
+    if (result == StunMessage::ErrorFingerprint) {
         // if fingerprint fails, then it is the only thing that was
         //   performed and we can skip it now.
         msg = StunMessage::fromBinary(packet, &result, StunMessage::MessageIntegrity, key);
-        if(result == StunMessage::ErrorMessageIntegrity)
-        {
+        if (result == StunMessage::ErrorMessageIntegrity) {
             // if message-integrity fails, then it is the only
             //   thing that was performed and we can skip it now
             msg = StunMessage::fromBinary(packet, &result);
-            if(result == StunMessage::ConvertGood)
+            if (result == StunMessage::ConvertGood)
                 flags = 0;
             else
                 return msg; // null
-        }
-        else if(result == StunMessage::ConvertGood)
+        } else if (result == StunMessage::ConvertGood)
             flags = StunMessage::MessageIntegrity;
         else
             return msg; // null
-    }
-    else if(result == StunMessage::ErrorMessageIntegrity)
-    {
+    } else if (result == StunMessage::ErrorMessageIntegrity) {
         // fingerprint succeeded, but message-integrity failed.  parse
         //   without validation now (to skip redundant
         //   fingerprint/message-integrity checks), and assume correct
         //   fingerprint
         msg = StunMessage::fromBinary(packet, &result);
-        if(result == StunMessage::ConvertGood)
+        if (result == StunMessage::ConvertGood)
             flags = StunMessage::Fingerprint;
         else
             return msg; // null
-    }
-    else if(result == StunMessage::ConvertGood)
+    } else if (result == StunMessage::ConvertGood)
         flags = StunMessage::MessageIntegrity | StunMessage::Fingerprint;
     else
         return msg; // null
@@ -88,76 +83,66 @@ static StunMessage parse_stun_message(const QByteArray &packet, int *validationF
     return msg;
 }
 
-class StunTransactionPoolPrivate : public QObject
-{
+class StunTransactionPoolPrivate : public QObject {
     Q_OBJECT
 
 public:
-    StunTransactionPool *q;
-    StunTransaction::Mode mode;
-    QSet<StunTransaction*> transactions;
-    QHash<StunTransaction*,QByteArray> transToId;
-    QHash<QByteArray,StunTransaction*> idToTrans;
-    bool useLongTermAuth;
-    bool needLongTermAuth;
-    bool triedLongTermAuth;
-    QString user;
-    QCA::SecureArray pass;
-    QString realm;
-    QString nonce;
-    int debugLevel;
+    StunTransactionPool *                q;
+    StunTransaction::Mode                mode;
+    QSet<StunTransaction *>              transactions;
+    QHash<StunTransaction *, QByteArray> transToId;
+    QHash<QByteArray, StunTransaction *> idToTrans;
+    bool                                 useLongTermAuth;
+    bool                                 needLongTermAuth;
+    bool                                 triedLongTermAuth;
+    QString                              user;
+    QCA::SecureArray                     pass;
+    QString                              realm;
+    QString                              nonce;
+    int                                  debugLevel;
 
     StunTransactionPoolPrivate(StunTransactionPool *_q) :
-        QObject(_q),
-        q(_q),
-        useLongTermAuth(false),
-        needLongTermAuth(false),
-        triedLongTermAuth(false),
+        QObject(_q), q(_q), useLongTermAuth(false), needLongTermAuth(false), triedLongTermAuth(false),
         debugLevel(StunTransactionPool::DL_None)
     {
     }
 
     QByteArray generateId() const;
-    void insert(StunTransaction *trans);
-    void remove(StunTransaction *trans);
-    void transmit(StunTransaction *trans);
+    void       insert(StunTransaction *trans);
+    void       remove(StunTransaction *trans);
+    void       transmit(StunTransaction *trans);
 };
 
 //----------------------------------------------------------------------------
 // StunTransaction
 //----------------------------------------------------------------------------
-class StunTransactionPrivate : public QObject
-{
+class StunTransactionPrivate : public QObject {
     Q_OBJECT
 
 public:
     StunTransaction *q;
 
-    StunTransactionPool *pool;
-    bool active;
+    StunTransactionPool * pool;
+    bool                  active;
     StunTransaction::Mode mode;
-    StunMessage origMessage;
-    QByteArray id;
-    QByteArray packet;
-    QHostAddress to_addr;
-    int to_port;
-
-    int rto, rc, rm, ti;
-    int tries;
-    int last_interval;
+    StunMessage           origMessage;
+    QByteArray            id;
+    QByteArray            packet;
+    QHostAddress          to_addr;
+    int                   to_port;
+
+    int     rto, rc, rm, ti;
+    int     tries;
+    int     last_interval;
     QTimer *t;
 
-    QString stuser;
-    QString stpass;
-    bool fpRequired;
+    QString    stuser;
+    QString    stpass;
+    bool       fpRequired;
     QByteArray key;
-    QTime time;
+    QTime      time;
 
-    StunTransactionPrivate(StunTransaction *_q) :
-        QObject(_q),
-        q(_q),
-        pool(nullptr),
-        fpRequired(false)
+    StunTransactionPrivate(StunTransaction *_q) : QObject(_q), q(_q), pool(nullptr), fpRequired(false)
     {
         qRegisterMetaType<StunTransaction::Error>();
 
@@ -169,14 +154,14 @@ class StunTransactionPrivate : public QObject
 
         // defaults from RFC 5389
         rto = 500;
-        rc = 7;
-        rm = 16;
-        ti = 39500;
+        rc  = 7;
+        rm  = 16;
+        ti  = 39500;
     }
 
     ~StunTransactionPrivate()
     {
-        if(pool)
+        if (pool)
             pool->d->remove(q);
 
         t->disconnect(this);
@@ -186,18 +171,15 @@ class StunTransactionPrivate : public QObject
 
     void start(StunTransactionPool *_pool, const QHostAddress &toAddress, int toPort)
     {
-        pool = _pool;
-        mode = pool->d->mode;
+        pool    = _pool;
+        mode    = pool->d->mode;
         to_addr = toAddress;
         to_port = toPort;
 
         tryRequest();
     }
 
-    void setMessage(const StunMessage &request)
-    {
-        origMessage = request;
-    }
+    void setMessage(const StunMessage &request) { origMessage = request; }
 
     void retry()
     {
@@ -211,12 +193,11 @@ class StunTransactionPrivate : public QObject
     {
         emit q->createMessage(pool->d->generateId());
 
-        if(origMessage.isNull())
-        {
+        if (origMessage.isNull()) {
             // since a transaction is not cancelable nor reusable,
             //   there's no DOR-SR issue here
             QMetaObject::invokeMethod(q, "error", Qt::QueuedConnection,
-                Q_ARG(XMPP::StunTransaction::Error, StunTransaction::ErrorGeneric));
+                                      Q_ARG(XMPP::StunTransaction::Error, StunTransaction::ErrorGeneric));
             return;
         }
 
@@ -225,35 +206,34 @@ class StunTransactionPrivate : public QObject
         out.setClass(StunMessage::Request);
         id = QByteArray((const char *)out.id(), 12);
 
-        if(!stuser.isEmpty())
-        {
+        if (!stuser.isEmpty()) {
             QList<StunMessage::Attribute> list = out.attributes();
-            StunMessage::Attribute attr;
+            StunMessage::Attribute        attr;
             attr.type = StunTypes::USERNAME;
-            attr.value = StunTypes::createUsername(QString::fromUtf8(StunUtil::saslPrep(stuser.toUtf8()).toByteArray()));
+            attr.value
+                = StunTypes::createUsername(QString::fromUtf8(StunUtil::saslPrep(stuser.toUtf8()).toByteArray()));
             list += attr;
             out.setAttributes(list);
 
             key = StunUtil::saslPrep(stpass.toUtf8()).toByteArray();
-        }
-        else if(!pool->d->nonce.isEmpty())
-        {
+        } else if (!pool->d->nonce.isEmpty()) {
             QList<StunMessage::Attribute> list = out.attributes();
             {
                 StunMessage::Attribute attr;
-                attr.type = StunTypes::USERNAME;
-                attr.value = StunTypes::createUsername(QString::fromUtf8(StunUtil::saslPrep(pool->d->user.toUtf8()).toByteArray()));
+                attr.type  = StunTypes::USERNAME;
+                attr.value = StunTypes::createUsername(
+                    QString::fromUtf8(StunUtil::saslPrep(pool->d->user.toUtf8()).toByteArray()));
                 list += attr;
             }
             {
                 StunMessage::Attribute attr;
-                attr.type = StunTypes::REALM;
+                attr.type  = StunTypes::REALM;
                 attr.value = StunTypes::createRealm(pool->d->realm);
                 list += attr;
             }
             {
                 StunMessage::Attribute attr;
-                attr.type = StunTypes::NONCE;
+                attr.type  = StunTypes::NONCE;
                 attr.value = StunTypes::createNonce(pool->d->nonce);
                 list += attr;
             }
@@ -269,34 +249,29 @@ class StunTransactionPrivate : public QObject
             key = QCA::Hash("md5").process(buf).toByteArray();
         }
 
-        if(!key.isEmpty())
+        if (!key.isEmpty())
             packet = out.toBinary(StunMessage::MessageIntegrity | StunMessage::Fingerprint, key);
         else
             packet = out.toBinary(StunMessage::Fingerprint);
 
-        if(packet.isEmpty())
-        {
+        if (packet.isEmpty()) {
             // since a transaction is not cancelable nor reusable,
             //   there's no DOR-SR issue here
             QMetaObject::invokeMethod(q, "error", Qt::QueuedConnection,
-                Q_ARG(XMPP::StunTransaction::Error, StunTransaction::ErrorGeneric));
+                                      Q_ARG(XMPP::StunTransaction::Error, StunTransaction::ErrorGeneric));
             return;
         }
 
         active = true;
-        tries = 1; // we transmit immediately here, so count it
+        tries  = 1; // we transmit immediately here, so count it
 
-        if(mode == StunTransaction::Udp)
-        {
+        if (mode == StunTransaction::Udp) {
             last_interval = rm * rto;
             t->start(rto);
             rto *= 2;
-        }
-        else if(mode == StunTransaction::Tcp)
-        {
+        } else if (mode == StunTransaction::Tcp) {
             t->start(ti);
-        }
-        else
+        } else
             Q_ASSERT(0);
 
         time.start();
@@ -307,20 +282,16 @@ class StunTransactionPrivate : public QObject
 private slots:
     void t_timeout()
     {
-        if(mode == StunTransaction::Tcp || tries == rc)
-        {
+        if (mode == StunTransaction::Tcp || tries == rc) {
             pool->d->remove(q);
             emit q->error(StunTransaction::ErrorTimeout);
             return;
         }
 
         ++tries;
-        if(tries == rc)
-        {
+        if (tries == rc) {
             t->start(last_interval);
-        }
-        else
-        {
+        } else {
             t->start(rto);
             rto *= 2;
         }
@@ -331,15 +302,14 @@ private slots:
 private:
     void transmit()
     {
-        if(pool->d->debugLevel >= StunTransactionPool::DL_Packet)
-        {
+        if (pool->d->debugLevel >= StunTransactionPool::DL_Packet) {
             QString str = QString("STUN SEND: elapsed=") + QString::number(time.elapsed());
-            if(!to_addr.isNull())
+            if (!to_addr.isNull())
                 str += QString(" to=(") + to_addr.toString() + ';' + QString::number(to_port) + ')';
             emit pool->debugLine(str);
 
             StunMessage msg = StunMessage::fromBinary(packet);
-            emit pool->debugLine(StunTypes::print_packet_str(msg));
+            emit        pool->debugLine(StunTypes::print_packet_str(msg));
         }
 
         pool->d->transmit(q);
@@ -347,10 +317,10 @@ private slots:
 
     bool checkActiveAndFrom(const QHostAddress &from_addr, int from_port)
     {
-        if(!active)
+        if (!active)
             return false;
 
-        if(!to_addr.isNull() && (to_addr != from_addr || to_port != from_port))
+        if (!to_addr.isNull() && (to_addr != from_addr || to_port != from_port))
             return false;
 
         return true;
@@ -361,46 +331,39 @@ private slots:
         active = false;
         t->stop();
 
-        if(pool->d->debugLevel >= StunTransactionPool::DL_Packet)
-            emit pool->debugLine(QString("matched incoming response to existing request.  elapsed=") + QString::number(time.elapsed()));
+        if (pool->d->debugLevel >= StunTransactionPool::DL_Packet)
+            emit pool->debugLine(QString("matched incoming response to existing request.  elapsed=")
+                                 + QString::number(time.elapsed()));
 
         // will be set to true when receiving an Unauthorized error
         bool unauthError = false;
 
-        if(msg.mclass() == StunMessage::ErrorResponse && pool->d->useLongTermAuth)
-        {
+        if (msg.mclass() == StunMessage::ErrorResponse && pool->d->useLongTermAuth) {
             // we'll handle certain error codes at this layer
-            int code;
+            int     code;
             QString reason;
-            if(StunTypes::parseErrorCode(msg.attribute(StunTypes::ERROR_CODE), &code, &reason))
-            {
-                if(code == StunTypes::Unauthorized)
+            if (StunTypes::parseErrorCode(msg.attribute(StunTypes::ERROR_CODE), &code, &reason)) {
+                if (code == StunTypes::Unauthorized)
                     unauthError = true;
 
-                if(unauthError && !pool->d->triedLongTermAuth)
-                {
+                if (unauthError && !pool->d->triedLongTermAuth) {
                     QString realm;
                     QString nonce;
-                    if(StunTypes::parseRealm(msg.attribute(StunTypes::REALM), &realm) &&
-                        StunTypes::parseRealm(msg.attribute(StunTypes::NONCE), &nonce))
-                    {
+                    if (StunTypes::parseRealm(msg.attribute(StunTypes::REALM), &realm)
+                        && StunTypes::parseRealm(msg.attribute(StunTypes::NONCE), &nonce)) {
                         // always set these to the latest received values,
                         //   which will be used for all transactions
                         //   once creds are provided.
-                        if(pool->d->realm.isEmpty())
+                        if (pool->d->realm.isEmpty())
                             pool->d->realm = realm;
                         pool->d->nonce = nonce;
 
-                        if(!pool->d->needLongTermAuth)
-                        {
-                            if(!pool->d->user.isEmpty())
-                            {
+                        if (!pool->d->needLongTermAuth) {
+                            if (!pool->d->user.isEmpty()) {
                                 // creds already set?  use them
                                 pool->d->triedLongTermAuth = true;
                                 retry();
-                            }
-                            else
-                            {
+                            } else {
                                 // else ask the user
                                 pool->d->needLongTermAuth = true;
                                 emit pool->needAuthParams();
@@ -408,12 +371,9 @@ private slots:
                         }
                         return;
                     }
-                }
-                else if(code == StunTypes::StaleNonce && pool->d->triedLongTermAuth)
-                {
+                } else if (code == StunTypes::StaleNonce && pool->d->triedLongTermAuth) {
                     QString nonce;
-                    if(StunTypes::parseNonce(msg.attribute(StunTypes::NONCE), &nonce) && nonce != pool->d->nonce)
-                    {
+                    if (StunTypes::parseNonce(msg.attribute(StunTypes::NONCE), &nonce) && nonce != pool->d->nonce) {
                         pool->d->nonce = nonce;
                         retry();
                         return;
@@ -423,7 +383,7 @@ private slots:
         }
 
         // require message integrity when auth is used
-        if(!unauthError && (!stuser.isEmpty() || pool->d->triedLongTermAuth) && !authed)
+        if (!unauthError && (!stuser.isEmpty() || pool->d->triedLongTermAuth) && !authed)
             return;
 
         pool->d->remove(q);
@@ -433,7 +393,7 @@ private slots:
 public:
     bool writeIncomingMessage(const StunMessage &msg, const QHostAddress &from_addr, int from_port)
     {
-        if(!checkActiveAndFrom(from_addr, from_port))
+        if (!checkActiveAndFrom(from_addr, from_port))
             return false;
 
         // if a StunMessage is passed directly to us then we assume
@@ -444,24 +404,21 @@ private slots:
 
     bool writeIncomingMessage(const QByteArray &packet, bool *notStun, const QHostAddress &from_addr, int from_port)
     {
-        if(!checkActiveAndFrom(from_addr, from_port))
-        {
+        if (!checkActiveAndFrom(from_addr, from_port)) {
             // could be STUN, don't really know for sure
             *notStun = false;
             return false;
         }
 
-        int validationFlags = 0;
-        StunMessage msg = parse_stun_message(packet, &validationFlags, key);
-        if(msg.isNull())
-        {
+        int         validationFlags = 0;
+        StunMessage msg             = parse_stun_message(packet, &validationFlags, key);
+        if (msg.isNull()) {
             // packet doesn't parse at all, surely not STUN
             *notStun = true;
             return false;
         }
 
-        if(fpRequired && !(validationFlags & StunMessage::Fingerprint))
-        {
+        if (fpRequired && !(validationFlags & StunMessage::Fingerprint)) {
             // fingerprint failed when required.  consider the
             //   packet to be surely not STUN
             *notStun = true;
@@ -473,22 +430,12 @@ private slots:
     }
 
 public slots:
-    void continueAfterParams()
-    {
-        retry();
-    }
+    void continueAfterParams() { retry(); }
 };
 
-StunTransaction::StunTransaction(QObject *parent) :
-    QObject(parent)
-{
-    d = new StunTransactionPrivate(this);
-}
+StunTransaction::StunTransaction(QObject *parent) : QObject(parent) { d = new StunTransactionPrivate(this); }
 
-StunTransaction::~StunTransaction()
-{
-    delete d;
-}
+StunTransaction::~StunTransaction() { delete d; }
 
 void StunTransaction::start(StunTransactionPool *pool, const QHostAddress &toAddress, int toPort)
 {
@@ -496,10 +443,7 @@ void StunTransaction::start(StunTransactionPool *pool, const QHostAddress &toAdd
     d->start(pool, toAddress, toPort);
 }
 
-void StunTransaction::setMessage(const StunMessage &request)
-{
-    d->setMessage(request);
-}
+void StunTransaction::setMessage(const StunMessage &request) { d->setMessage(request); }
 
 void StunTransaction::setRTO(int i)
 {
@@ -525,20 +469,11 @@ void StunTransaction::setTi(int i)
     d->ti = i;
 }
 
-void StunTransaction::setShortTermUsername(const QString &username)
-{
-    d->stuser = username;
-}
+void StunTransaction::setShortTermUsername(const QString &username) { d->stuser = username; }
 
-void StunTransaction::setShortTermPassword(const QString &password)
-{
-    d->stpass = password;
-}
+void StunTransaction::setShortTermPassword(const QString &password) { d->stpass = password; }
 
-void StunTransaction::setFingerprintRequired(bool enabled)
-{
-    d->fpRequired = enabled;
-}
+void StunTransaction::setFingerprintRequired(bool enabled) { d->fpRequired = enabled; }
 
 //----------------------------------------------------------------------------
 // StunTransactionPool
@@ -547,10 +482,9 @@ QByteArray StunTransactionPoolPrivate::generateId() const
 {
     QByteArray id;
 
-    do
-    {
+    do {
         id = QCA::Random::randomArray(12).toByteArray();
-    } while(idToTrans.contains(id));
+    } while (idToTrans.contains(id));
 
     return id;
 }
@@ -567,8 +501,7 @@ void StunTransactionPoolPrivate::insert(StunTransaction *trans)
 
 void StunTransactionPoolPrivate::remove(StunTransaction *trans)
 {
-    if(transactions.contains(trans))
-    {
+    if (transactions.contains(trans)) {
         transactions.remove(trans);
         QByteArray id = transToId.value(trans);
         transToId.remove(trans);
@@ -581,63 +514,58 @@ void StunTransactionPoolPrivate::transmit(StunTransaction *trans)
     emit q->outgoingMessage(trans->d->packet, trans->d->to_addr, trans->d->to_port);
 }
 
-StunTransactionPool::StunTransactionPool(StunTransaction::Mode mode, QObject *parent) :
-    QObject(parent)
+StunTransactionPool::StunTransactionPool(StunTransaction::Mode mode, QObject *parent) : QObject(parent)
 {
-    d = new StunTransactionPoolPrivate(this);
+    d       = new StunTransactionPoolPrivate(this);
     d->mode = mode;
 }
 
 StunTransactionPool::~StunTransactionPool()
 {
-    qDeleteAll(findChildren<StunBinding*>()); // early remove of binding since they require alive pool (should fix one crash)
+    qDeleteAll(
+        findChildren<StunBinding *>()); // early remove of binding since they require alive pool (should fix one crash)
     delete d;
 }
 
-StunTransaction::Mode StunTransactionPool::mode() const
-{
-    return d->mode;
-}
+StunTransaction::Mode StunTransactionPool::mode() const { return d->mode; }
 
 bool StunTransactionPool::writeIncomingMessage(const StunMessage &msg, const QHostAddress &addr, int port)
 {
-    if(d->debugLevel >= DL_Packet)
-    {
+    if (d->debugLevel >= DL_Packet) {
         QString str = "STUN RECV";
-        if(!addr.isNull())
+        if (!addr.isNull())
             str += QString(" from=(") + addr.toString() + ';' + QString::number(port) + ')';
         emit debugLine(str);
         emit debugLine(StunTypes::print_packet_str(msg));
     }
 
-    QByteArray id = QByteArray::fromRawData((const char *)msg.id(), 12);
+    QByteArray         id     = QByteArray::fromRawData((const char *)msg.id(), 12);
     StunMessage::Class mclass = msg.mclass();
 
-    if(mclass != StunMessage::SuccessResponse && mclass != StunMessage::ErrorResponse)
+    if (mclass != StunMessage::SuccessResponse && mclass != StunMessage::ErrorResponse)
         return false;
 
     StunTransaction *trans = d->idToTrans.value(id);
-    if(!trans)
+    if (!trans)
         return false;
 
     return trans->d->writeIncomingMessage(msg, addr, port);
 }
 
-bool StunTransactionPool::writeIncomingMessage(const QByteArray &packet, bool *notStun, const QHostAddress &addr, int port)
+bool StunTransactionPool::writeIncomingMessage(const QByteArray &packet, bool *notStun, const QHostAddress &addr,
+                                               int port)
 {
-    if(!StunMessage::isProbablyStun(packet))
-    {
+    if (!StunMessage::isProbablyStun(packet)) {
         // basic stun check failed?  surely not STUN
-        if(notStun)
+        if (notStun)
             *notStun = true;
         return false;
     }
 
-    if(d->debugLevel >= DL_Packet)
-    {
+    if (d->debugLevel >= DL_Packet) {
         StunMessage msg = StunMessage::fromBinary(packet);
-        QString str = "STUN RECV";
-        if(!addr.isNull())
+        QString     str = "STUN RECV";
+        if (!addr.isNull())
             str += QString(" from=(") + addr.toString() + ';' + QString::number(port) + ')';
         emit debugLine(str);
         emit debugLine(StunTypes::print_packet_str(msg));
@@ -649,59 +577,41 @@ bool StunTransactionPool::writeIncomingMessage(const QByteArray &packet, bool *n
 
     StunMessage::Class mclass = StunMessage::extractClass(packet);
 
-    if(mclass != StunMessage::SuccessResponse && mclass != StunMessage::ErrorResponse)
-    {
+    if (mclass != StunMessage::SuccessResponse && mclass != StunMessage::ErrorResponse) {
         // could be STUN, don't really know for sure
-        if(notStun)
+        if (notStun)
             *notStun = false;
         return false;
     }
 
     StunTransaction *trans = d->idToTrans.value(id);
-    if(!trans)
-    {
+    if (!trans) {
         // could be STUN, don't really know for sure
-        if(notStun)
+        if (notStun)
             *notStun = false;
         return false;
     }
 
     bool _notStun = false;
-    bool ret = trans->d->writeIncomingMessage(packet, &_notStun, addr, port);
-    if(!ret && notStun)
+    bool ret      = trans->d->writeIncomingMessage(packet, &_notStun, addr, port);
+    if (!ret && notStun)
         *notStun = _notStun;
     return ret;
 }
 
-void StunTransactionPool::setLongTermAuthEnabled(bool enabled)
-{
-    d->useLongTermAuth = enabled;
-}
+void StunTransactionPool::setLongTermAuthEnabled(bool enabled) { d->useLongTermAuth = enabled; }
 
-QString StunTransactionPool::realm() const
-{
-    return d->realm;
-}
+QString StunTransactionPool::realm() const { return d->realm; }
 
-void StunTransactionPool::setUsername(const QString &username)
-{
-    d->user = username;
-}
+void StunTransactionPool::setUsername(const QString &username) { d->user = username; }
 
-void StunTransactionPool::setPassword(const QCA::SecureArray &password)
-{
-    d->pass = password;
-}
+void StunTransactionPool::setPassword(const QCA::SecureArray &password) { d->pass = password; }
 
-void StunTransactionPool::setRealm(const QString &realm)
-{
-    d->realm = realm;
-}
+void StunTransactionPool::setRealm(const QString &realm) { d->realm = realm; }
 
 void StunTransactionPool::continueAfterParams()
 {
-    if(d->debugLevel >= DL_Info)
-    {
+    if (d->debugLevel >= DL_Info) {
         emit debugLine("continue after params:");
         emit debugLine(QString("  U=[%1]").arg(d->user));
         emit debugLine(QString("  P=[%1]").arg(d->pass.data()));
@@ -713,32 +623,23 @@ void StunTransactionPool::continueAfterParams()
     Q_ASSERT(d->needLongTermAuth);
     Q_ASSERT(!d->triedLongTermAuth);
 
-    d->needLongTermAuth = false;
+    d->needLongTermAuth  = false;
     d->triedLongTermAuth = true;
 
-    foreach(StunTransaction *trans, d->transactions)
-    {
+    foreach (StunTransaction *trans, d->transactions) {
         // the only reason an inactive transaction would be in the
         //   list is if it is waiting for an auth retry
-        if(!trans->d->active)
-        {
+        if (!trans->d->active) {
             // use queued call to prevent all sorts of DOR-SS
             //   nastiness
-            QMetaObject::invokeMethod(trans->d, "continueAfterParams",
-                Qt::QueuedConnection);
+            QMetaObject::invokeMethod(trans->d, "continueAfterParams", Qt::QueuedConnection);
         }
     }
 }
 
-QByteArray StunTransactionPool::generateId() const
-{
-    return d->generateId();
-}
+QByteArray StunTransactionPool::generateId() const { return d->generateId(); }
 
-void StunTransactionPool::setDebugLevel(DebugLevel level)
-{
-    d->debugLevel = level;
-}
+void StunTransactionPool::setDebugLevel(DebugLevel level) { d->debugLevel = level; }
 
 } // namespace XMPP
 
diff --git a/src/irisnet/noncore/stuntransaction.h b/src/irisnet/noncore/stuntransaction.h
index 6d924b3b..43b8b44d 100644
--- a/src/irisnet/noncore/stuntransaction.h
+++ b/src/irisnet/noncore/stuntransaction.h
@@ -24,7 +24,7 @@
 #include <QObject>
 
 namespace QCA {
-    class SecureArray;
+class SecureArray;
 }
 
 namespace XMPP {
@@ -57,22 +57,16 @@ class StunTransactionPrivate;
 // - if short term or long term auth is used, then the request is authenticated
 //   and the response is required to be authenticated.
 
-class StunTransaction : public QObject
-{
+class StunTransaction : public QObject {
     Q_OBJECT
 
 public:
-    enum Mode
-    {
+    enum Mode {
         Udp, // handle retransmissions
         Tcp  // send once
     };
 
-    enum Error
-    {
-        ErrorGeneric,
-        ErrorTimeout
-    };
+    enum Error { ErrorGeneric, ErrorTimeout };
 
     StunTransaction(QObject *parent = nullptr);
     ~StunTransaction();
@@ -126,17 +120,11 @@ class StunTransaction : public QObject
 //   emitted as a direct result of calling certain member functions of this
 //   class as well as any other class that might use it (such as StunBinding).
 //   so, be careful with what you do in your retransmit slot.
-class StunTransactionPool : public QObject
-{
+class StunTransactionPool : public QObject {
     Q_OBJECT
 
 public:
-    enum DebugLevel
-    {
-        DL_None,
-        DL_Info,
-        DL_Packet
-    };
+    enum DebugLevel { DL_None, DL_Info, DL_Packet };
 
     StunTransactionPool(StunTransaction::Mode mode, QObject *parent = nullptr);
     ~StunTransactionPool();
@@ -155,15 +143,16 @@ class StunTransactionPool : public QObject
     //   not be a STUN message.  *notStun will be set to true if the packet
     //   is surely not STUN, or set to false if it is unclear whether the
     //   packet is STUN or not.
-    bool writeIncomingMessage(const QByteArray &packet, bool *notStun = nullptr, const QHostAddress &addr = QHostAddress(), int port = -1);
+    bool writeIncomingMessage(const QByteArray &packet, bool *notStun = nullptr,
+                              const QHostAddress &addr = QHostAddress(), int port = -1);
 
     void setLongTermAuthEnabled(bool enabled);
 
     QString realm() const;
-    void setUsername(const QString &username);
-    void setPassword(const QCA::SecureArray &password);
-    void setRealm(const QString &realm);
-    void continueAfterParams();
+    void    setUsername(const QString &username);
+    void    setPassword(const QCA::SecureArray &password);
+    void    setRealm(const QString &realm);
+    void    continueAfterParams();
 
     // for use with stun indications
     QByteArray generateId() const;
diff --git a/src/irisnet/noncore/stuntypes.cpp b/src/irisnet/noncore/stuntypes.cpp
index 9cc72ff8..99fa0bcb 100644
--- a/src/irisnet/noncore/stuntypes.cpp
+++ b/src/irisnet/noncore/stuntypes.cpp
@@ -29,590 +29,522 @@
 namespace XMPP {
 using namespace StunUtil;
 namespace StunTypes {
-static void xorIPv4(QByteArray *in, const quint8 *magic)
-{
-    quint8 *p = (quint8 *)in->data();
-    p[2] ^= magic[0];
-    p[3] ^= magic[1];
-    for(int n = 0; n < 4; ++n)
-        p[n + 4] ^= magic[n];
-}
-
-static void xorIPv6(QByteArray *in, const quint8 *magic, const quint8 *id)
-{
-    quint8 *p = (quint8 *)in->data();
-    p[2] ^= magic[0];
-    p[3] ^= magic[1];
-    for(int n = 0; n < 4; ++n)
-        p[n + 4] ^= magic[n];
-    for(int n = 0; n < 12; ++n)
-        p[n + 8] ^= id[n];
-}
-
-static bool validateString(const QByteArray &in, QString *out)
-{
-    if(in.size() <= STRING_MAX_BYTES)
-    {
-        QString s = QString::fromUtf8(in);
-        if(s.length() <= STRING_MAX_CHARS)
-        {
-            *out = s;
-            return true;
-        }
+    static void xorIPv4(QByteArray *in, const quint8 *magic)
+    {
+        quint8 *p = (quint8 *)in->data();
+        p[2] ^= magic[0];
+        p[3] ^= magic[1];
+        for (int n = 0; n < 4; ++n)
+            p[n + 4] ^= magic[n];
     }
 
-    return false;
-}
-
-QByteArray createMappedAddress(const QHostAddress &addr, quint16 port)
-{
-    QByteArray out;
-
-    if(addr.protocol() == QAbstractSocket::IPv6Protocol)
-    {
-        out = QByteArray(20, 0);
-        out[1] = 0x02; // IPv6
-        Q_IPV6ADDR addr6 = addr.toIPv6Address();
-        memcpy(out.data() + 4, addr6.c, 16);
-    }
-    else if(addr.protocol() == QAbstractSocket::IPv4Protocol)
-    {
-        out = QByteArray(8, 0);
-        out[1] = 0x01; // IPv4
-        write32((quint8 *)out.data() + 4, addr.toIPv4Address());
-    }
-    else
-        Q_ASSERT(0);
-
-    write16((quint8 *)out.data() + 2, port);
-    return out;
-}
-
-QByteArray createUsername(const QString &username)
-{
-    return username.left(STRING_MAX_CHARS).toUtf8();
-}
-
-QByteArray createErrorCode(int code, const QString &reason)
-{
-    QByteArray out(4, 0);
-
-    int ih = code / 100;
-    int il = code % 100;
-    ih &= 0x07; // keep only lower 3 bits
-
-    unsigned char ch = (unsigned char)ih;
-    unsigned char cl = (unsigned char)il;
-    out[2] = ch;
-    out[3] = cl;
-    out += reason.left(STRING_MAX_CHARS).toUtf8();
-    return out;
-}
-
-QByteArray createUnknownAttributes(const QList<quint16> &typeList)
-{
-    if(typeList.isEmpty())
-        return QByteArray();
-
-    QByteArray out(typeList.count() * 2, 0);
-    for(int n = 0; n < typeList.count(); ++n)
-        write16((quint8 *)out.data() + (n * 2), typeList[n]);
-    return out;
-}
-
-QByteArray createRealm(const QString &realm)
-{
-    return realm.left(STRING_MAX_CHARS).toUtf8();
-}
-
-QByteArray createNonce(const QString &nonce)
-{
-    return nonce.left(STRING_MAX_CHARS).toUtf8();
-}
-
-QByteArray createXorMappedAddress(const QHostAddress &addr, quint16 port, const quint8 *magic, const quint8 *id)
-{
-    QByteArray out = createMappedAddress(addr, port);
-    if(addr.protocol() == QAbstractSocket::IPv6Protocol)
-        xorIPv6(&out, magic, id);
-    else // IPv4
-        xorIPv4(&out, magic);
-    return out;
-}
-
-QByteArray createChannelNumber(quint16 i)
-{
-    QByteArray val(4, 0);
-    write16((quint8 *)val.data(), i);
-    // bytes 2-3 are zeroed out
-    return val;
-}
-
-QByteArray createLifetime(quint32 i)
-{
-    QByteArray val(4, 0);
-    write32((quint8 *)val.data(), i);
-    return val;
-}
-
-QByteArray createXorPeerAddress(const QHostAddress &addr, quint16 port, const quint8 *magic, const quint8 *id)
-{
-    return createXorMappedAddress(addr, port, magic, id);
-}
-
-QByteArray createXorRelayedAddress(const QHostAddress &addr, quint16 port, const quint8 *magic, const quint8 *id)
-{
-    return createXorMappedAddress(addr, port, magic, id);
-}
-
-QByteArray createEvenPort(bool reserve)
-{
-    QByteArray val(1, 0);
-    unsigned char c = 0;
-    if(reserve)
-        c |= 0x80; // set high bit
-    val[0] = c;
-    return val;
-}
-
-QByteArray createRequestedTransport(quint8 proto)
-{
-    QByteArray val(4, 0);
-    val[0] = proto;
-    // bytes 1-3 are zeroed out
-    return val;
-}
-
-QByteArray createReservationToken(const QByteArray &token)
-{
-    Q_ASSERT(token.size() == 8);
-    return token;
-}
-
-QByteArray createPriority(quint32 i)
-{
-    QByteArray val(4, 0);
-    write32((quint8 *)val.data(), i);
-    return val;
-}
-
-QByteArray createSoftware(const QString &str)
-{
-    return str.left(STRING_MAX_CHARS).toUtf8();
-}
-
-QByteArray createAlternateServer(const QHostAddress &addr, quint16 port)
-{
-    return createMappedAddress(addr, port);
-}
-
-QByteArray createIceControlled(quint64 i)
-{
-    QByteArray val(8, 0);
-    write64((quint8 *)val.data(), i);
-    return val;
-}
-
-QByteArray createIceControlling(quint64 i)
-{
-    QByteArray val(8, 0);
-    write64((quint8 *)val.data(), i);
-    return val;
-}
-
-bool parseMappedAddress(const QByteArray &val, QHostAddress *addr, quint16 *port)
-{
-    if(val[1] == 0x02 && val.size() == 20) // IPv6
-    {
-        *port = read16((const quint8 *)val.data() + 2);
-        QByteArray buf = val.mid(4);
-        *addr = QHostAddress((quint8 *)buf.data());
-        return true;
-    }
-    else if(val[1] == 0x01 && val.size() == 8) // IPv4
+    static void xorIPv6(QByteArray *in, const quint8 *magic, const quint8 *id)
     {
-        *port = read16((const quint8 *)val.data() + 2);
-        *addr = QHostAddress(read32((const quint8 *)val.data() + 4));
-        return true;
+        quint8 *p = (quint8 *)in->data();
+        p[2] ^= magic[0];
+        p[3] ^= magic[1];
+        for (int n = 0; n < 4; ++n)
+            p[n + 4] ^= magic[n];
+        for (int n = 0; n < 12; ++n)
+            p[n + 8] ^= id[n];
     }
-    else
-        return false;
-}
 
-bool parseUsername(const QByteArray &val, QString *username)
-{
-    return validateString(val, username);
-}
+    static bool validateString(const QByteArray &in, QString *out)
+    {
+        if (in.size() <= STRING_MAX_BYTES) {
+            QString s = QString::fromUtf8(in);
+            if (s.length() <= STRING_MAX_CHARS) {
+                *out = s;
+                return true;
+            }
+        }
 
-bool parseErrorCode(const QByteArray &val, int *code, QString *reason)
-{
-    if(val.size() < 4)
         return false;
+    }
 
-    unsigned char ch = (unsigned char)val[2];
-    unsigned char cl = (unsigned char)val[3];
-    int ih = ch & 0x07; // lower 3 bits
-    int x = ih * 100 + (int)cl;
+    QByteArray createMappedAddress(const QHostAddress &addr, quint16 port)
+    {
+        QByteArray out;
+
+        if (addr.protocol() == QAbstractSocket::IPv6Protocol) {
+            out              = QByteArray(20, 0);
+            out[1]           = 0x02; // IPv6
+            Q_IPV6ADDR addr6 = addr.toIPv6Address();
+            memcpy(out.data() + 4, addr6.c, 16);
+        } else if (addr.protocol() == QAbstractSocket::IPv4Protocol) {
+            out    = QByteArray(8, 0);
+            out[1] = 0x01; // IPv4
+            write32((quint8 *)out.data() + 4, addr.toIPv4Address());
+        } else
+            Q_ASSERT(0);
+
+        write16((quint8 *)out.data() + 2, port);
+        return out;
+    }
 
-    QString str;
-    if(validateString(val.mid(4), &str))
+    QByteArray createUsername(const QString &username) { return username.left(STRING_MAX_CHARS).toUtf8(); }
+
+    QByteArray createErrorCode(int code, const QString &reason)
     {
-        *code = x;
-        *reason = str;
-        return true;
+        QByteArray out(4, 0);
+
+        int ih = code / 100;
+        int il = code % 100;
+        ih &= 0x07; // keep only lower 3 bits
+
+        unsigned char ch = (unsigned char)ih;
+        unsigned char cl = (unsigned char)il;
+        out[2]           = ch;
+        out[3]           = cl;
+        out += reason.left(STRING_MAX_CHARS).toUtf8();
+        return out;
     }
 
-    return false;
-}
+    QByteArray createUnknownAttributes(const QList<quint16> &typeList)
+    {
+        if (typeList.isEmpty())
+            return QByteArray();
 
-bool parseUnknownAttributes(const QByteArray &val, QList<quint16> *typeList)
-{
-    if(val.size() % 2 != 0)
-        return false;
+        QByteArray out(typeList.count() * 2, 0);
+        for (int n = 0; n < typeList.count(); ++n)
+            write16((quint8 *)out.data() + (n * 2), typeList[n]);
+        return out;
+    }
 
-    typeList->clear();
-    int count = val.size() / 2;
-    for(int n = 0; n < count; ++n)
-        typeList->append(read16((const quint8 *)val.data() + (n * 2)));
-    return true;
-}
-
-bool parseRealm(const QByteArray &val, QString *realm)
-{
-    return validateString(val, realm);
-}
-
-bool parseNonce(const QByteArray &val, QString *nonce)
-{
-    return validateString(val, nonce);
-}
-
-bool parseXorMappedAddress(const QByteArray &val, const quint8 *magic, const quint8 *id, QHostAddress *addr, quint16 *port)
-{
-    if(val.size() < 4)
-        return false;
+    QByteArray createRealm(const QString &realm) { return realm.left(STRING_MAX_CHARS).toUtf8(); }
+
+    QByteArray createNonce(const QString &nonce) { return nonce.left(STRING_MAX_CHARS).toUtf8(); }
 
-    QByteArray buf;
-    if(val[1] == 0x02 && val.size() == 20) // IPv6
+    QByteArray createXorMappedAddress(const QHostAddress &addr, quint16 port, const quint8 *magic, const quint8 *id)
     {
-        buf = val;
-        xorIPv6(&buf, magic, id);
+        QByteArray out = createMappedAddress(addr, port);
+        if (addr.protocol() == QAbstractSocket::IPv6Protocol)
+            xorIPv6(&out, magic, id);
+        else // IPv4
+            xorIPv4(&out, magic);
+        return out;
     }
-    else if(val[1] == 0x01 && val.size() == 8) // IPv4
+
+    QByteArray createChannelNumber(quint16 i)
     {
-        buf = val;
-        xorIPv4(&buf, magic);
+        QByteArray val(4, 0);
+        write16((quint8 *)val.data(), i);
+        // bytes 2-3 are zeroed out
+        return val;
     }
-    else
-        return false;
 
-    return parseMappedAddress(buf, addr, port);
-}
+    QByteArray createLifetime(quint32 i)
+    {
+        QByteArray val(4, 0);
+        write32((quint8 *)val.data(), i);
+        return val;
+    }
 
-bool parseChannelNumber(const QByteArray &val, quint16 *i)
-{
-    if(val.size() != 4)
-        return false;
+    QByteArray createXorPeerAddress(const QHostAddress &addr, quint16 port, const quint8 *magic, const quint8 *id)
+    {
+        return createXorMappedAddress(addr, port, magic, id);
+    }
 
-    const quint8 *p = (const quint8 *)val.data();
-    *i = read16(p);
-    return true;
-}
+    QByteArray createXorRelayedAddress(const QHostAddress &addr, quint16 port, const quint8 *magic, const quint8 *id)
+    {
+        return createXorMappedAddress(addr, port, magic, id);
+    }
 
-bool parseLifetime(const QByteArray &val, quint32 *i)
-{
-    if(val.size() != 4)
-        return false;
+    QByteArray createEvenPort(bool reserve)
+    {
+        QByteArray    val(1, 0);
+        unsigned char c = 0;
+        if (reserve)
+            c |= 0x80; // set high bit
+        val[0] = c;
+        return val;
+    }
 
-    const quint8 *p = (const quint8 *)val.data();
-    *i = read32(p);
-    return true;
-}
+    QByteArray createRequestedTransport(quint8 proto)
+    {
+        QByteArray val(4, 0);
+        val[0] = proto;
+        // bytes 1-3 are zeroed out
+        return val;
+    }
 
-bool parseXorPeerAddress(const QByteArray &val, const quint8 *magic, const quint8 *id, QHostAddress *addr, quint16 *port)
-{
-    return parseXorMappedAddress(val, magic, id, addr, port);
-}
+    QByteArray createReservationToken(const QByteArray &token)
+    {
+        Q_ASSERT(token.size() == 8);
+        return token;
+    }
 
-bool parseXorRelayedAddress(const QByteArray &val, const quint8 *magic, const quint8 *id, QHostAddress *addr, quint16 *port)
-{
-    return parseXorMappedAddress(val, magic, id, addr, port);
-}
+    QByteArray createPriority(quint32 i)
+    {
+        QByteArray val(4, 0);
+        write32((quint8 *)val.data(), i);
+        return val;
+    }
 
-bool parseEvenPort(const QByteArray &val, bool *reserve)
-{
-    if(val.size() != 1)
-        return false;
+    QByteArray createSoftware(const QString &str) { return str.left(STRING_MAX_CHARS).toUtf8(); }
 
-    unsigned char c = val[0];
-    if(c & 0x80)
-        *reserve = true;
-    else
-        *reserve = false;
+    QByteArray createAlternateServer(const QHostAddress &addr, quint16 port) { return createMappedAddress(addr, port); }
 
-    return true;
-}
+    QByteArray createIceControlled(quint64 i)
+    {
+        QByteArray val(8, 0);
+        write64((quint8 *)val.data(), i);
+        return val;
+    }
 
-bool parseRequestedTransport(const QByteArray &val, quint8 *proto)
-{
-    if(val.size() != 4)
-        return false;
+    QByteArray createIceControlling(quint64 i)
+    {
+        QByteArray val(8, 0);
+        write64((quint8 *)val.data(), i);
+        return val;
+    }
 
-    *proto = val[0];
-    return true;
-}
+    bool parseMappedAddress(const QByteArray &val, QHostAddress *addr, quint16 *port)
+    {
+        if (val[1] == 0x02 && val.size() == 20) // IPv6
+        {
+            *port          = read16((const quint8 *)val.data() + 2);
+            QByteArray buf = val.mid(4);
+            *addr          = QHostAddress((quint8 *)buf.data());
+            return true;
+        } else if (val[1] == 0x01 && val.size() == 8) // IPv4
+        {
+            *port = read16((const quint8 *)val.data() + 2);
+            *addr = QHostAddress(read32((const quint8 *)val.data() + 4));
+            return true;
+        } else
+            return false;
+    }
 
-bool parseReservationToken(const QByteArray &val, QByteArray *token)
-{
-    if(val.size() != 8)
-        return false;
+    bool parseUsername(const QByteArray &val, QString *username) { return validateString(val, username); }
 
-    *token = val;
-    return true;
-}
+    bool parseErrorCode(const QByteArray &val, int *code, QString *reason)
+    {
+        if (val.size() < 4)
+            return false;
+
+        unsigned char ch = (unsigned char)val[2];
+        unsigned char cl = (unsigned char)val[3];
+        int           ih = ch & 0x07; // lower 3 bits
+        int           x  = ih * 100 + (int)cl;
+
+        QString str;
+        if (validateString(val.mid(4), &str)) {
+            *code   = x;
+            *reason = str;
+            return true;
+        }
 
-bool parsePriority(const QByteArray &val, quint32 *i)
-{
-    if(val.size() != 4)
         return false;
+    }
 
-    const quint8 *p = (const quint8 *)val.data();
-    *i = read32(p);
-    return true;
-}
-
-bool parseSoftware(const QByteArray &val, QString *str)
-{
-    *str = QString::fromUtf8(val);
-    return true;
-}
-
-bool parseAlternateServer(const QByteArray &val, QHostAddress *addr, quint16 *port)
-{
-    return parseMappedAddress(val, addr, port);
-}
-
-bool parseIceControlled(const QByteArray &val, quint64 *i)
-{
-    if(val.size() != 8)
-        return false;
+    bool parseUnknownAttributes(const QByteArray &val, QList<quint16> *typeList)
+    {
+        if (val.size() % 2 != 0)
+            return false;
 
-    const quint8 *p = (const quint8 *)val.data();
-    *i = read64(p);
-    return true;
-}
+        typeList->clear();
+        int count = val.size() / 2;
+        for (int n = 0; n < count; ++n)
+            typeList->append(read16((const quint8 *)val.data() + (n * 2)));
+        return true;
+    }
 
-bool parseIceControlling(const QByteArray &val, quint64 *i)
-{
-    if(val.size() != 8)
-        return false;
+    bool parseRealm(const QByteArray &val, QString *realm) { return validateString(val, realm); }
 
-    const quint8 *p = (const quint8 *)val.data();
-    *i = read64(p);
-    return true;
-}
-
-#define METHOD_ENTRY(x) \
-    { x, #x }
-
-struct MethodEntry
-{
-    Method method;
-    const char *str;
-} method_table[] =
-{
-    METHOD_ENTRY(Binding),
-    METHOD_ENTRY(Allocate),
-    METHOD_ENTRY(Refresh),
-    METHOD_ENTRY(Send),
-    METHOD_ENTRY(Data),
-    METHOD_ENTRY(CreatePermission),
-    METHOD_ENTRY(ChannelBind),
-    { (Method)-1, nullptr }
-};
-
-QString methodToString(int method)
-{
-    for(int n = 0; method_table[n].str; ++n)
-    {
-        if(method_table[n].method == (Method)method)
-            return QString::fromLatin1(method_table[n].str);
-    }
-
-    return QString();
-}
-
-#define ATTRIB_ENTRY(x) \
-    { x, #x }
-
-struct AttribEntry
-{
-    Attribute type;
-    const char *str;
-} attrib_table[] =
-{
-    ATTRIB_ENTRY(MAPPED_ADDRESS),
-    ATTRIB_ENTRY(USERNAME),
-    ATTRIB_ENTRY(MESSAGE_INTEGRITY),
-    ATTRIB_ENTRY(ERROR_CODE),
-    ATTRIB_ENTRY(UNKNOWN_ATTRIBUTES),
-    ATTRIB_ENTRY(REALM),
-    ATTRIB_ENTRY(NONCE),
-    ATTRIB_ENTRY(XOR_MAPPED_ADDRESS),
-    ATTRIB_ENTRY(CHANNEL_NUMBER),
-    ATTRIB_ENTRY(LIFETIME),
-    ATTRIB_ENTRY(XOR_PEER_ADDRESS),
-    ATTRIB_ENTRY(DATA),
-    ATTRIB_ENTRY(XOR_RELAYED_ADDRESS),
-    ATTRIB_ENTRY(EVEN_PORT),
-    ATTRIB_ENTRY(REQUESTED_TRANSPORT),
-    ATTRIB_ENTRY(DONT_FRAGMENT),
-    ATTRIB_ENTRY(RESERVATION_TOKEN),
-    ATTRIB_ENTRY(PRIORITY),
-    ATTRIB_ENTRY(USE_CANDIDATE),
-    ATTRIB_ENTRY(SOFTWARE),
-    ATTRIB_ENTRY(ALTERNATE_SERVER),
-    ATTRIB_ENTRY(FINGERPRINT),
-    ATTRIB_ENTRY(ICE_CONTROLLED),
-    ATTRIB_ENTRY(ICE_CONTROLLING),
-    { (Attribute)-1, nullptr }
-};
-
-QString attributeTypeToString(int type)
-{
-    for(int n = 0; attrib_table[n].str; ++n)
-    {
-        if(attrib_table[n].type == (Attribute)type)
+    bool parseNonce(const QByteArray &val, QString *nonce) { return validateString(val, nonce); }
+
+    bool parseXorMappedAddress(const QByteArray &val, const quint8 *magic, const quint8 *id, QHostAddress *addr,
+                               quint16 *port)
+    {
+        if (val.size() < 4)
+            return false;
+
+        QByteArray buf;
+        if (val[1] == 0x02 && val.size() == 20) // IPv6
+        {
+            buf = val;
+            xorIPv6(&buf, magic, id);
+        } else if (val[1] == 0x01 && val.size() == 8) // IPv4
         {
-            QString name = QString::fromLatin1(attrib_table[n].str);
-            name.replace('_', '-');
-            return name;
+            buf = val;
+            xorIPv4(&buf, magic);
+        } else
+            return false;
+
+        return parseMappedAddress(buf, addr, port);
+    }
+
+    bool parseChannelNumber(const QByteArray &val, quint16 *i)
+    {
+        if (val.size() != 4)
+            return false;
+
+        const quint8 *p = (const quint8 *)val.data();
+        *i              = read16(p);
+        return true;
+    }
+
+    bool parseLifetime(const QByteArray &val, quint32 *i)
+    {
+        if (val.size() != 4)
+            return false;
+
+        const quint8 *p = (const quint8 *)val.data();
+        *i              = read32(p);
+        return true;
+    }
+
+    bool parseXorPeerAddress(const QByteArray &val, const quint8 *magic, const quint8 *id, QHostAddress *addr,
+                             quint16 *port)
+    {
+        return parseXorMappedAddress(val, magic, id, addr, port);
+    }
+
+    bool parseXorRelayedAddress(const QByteArray &val, const quint8 *magic, const quint8 *id, QHostAddress *addr,
+                                quint16 *port)
+    {
+        return parseXorMappedAddress(val, magic, id, addr, port);
+    }
+
+    bool parseEvenPort(const QByteArray &val, bool *reserve)
+    {
+        if (val.size() != 1)
+            return false;
+
+        unsigned char c = val[0];
+        if (c & 0x80)
+            *reserve = true;
+        else
+            *reserve = false;
+
+        return true;
+    }
+
+    bool parseRequestedTransport(const QByteArray &val, quint8 *proto)
+    {
+        if (val.size() != 4)
+            return false;
+
+        *proto = val[0];
+        return true;
+    }
+
+    bool parseReservationToken(const QByteArray &val, QByteArray *token)
+    {
+        if (val.size() != 8)
+            return false;
+
+        *token = val;
+        return true;
+    }
+
+    bool parsePriority(const QByteArray &val, quint32 *i)
+    {
+        if (val.size() != 4)
+            return false;
+
+        const quint8 *p = (const quint8 *)val.data();
+        *i              = read32(p);
+        return true;
+    }
+
+    bool parseSoftware(const QByteArray &val, QString *str)
+    {
+        *str = QString::fromUtf8(val);
+        return true;
+    }
+
+    bool parseAlternateServer(const QByteArray &val, QHostAddress *addr, quint16 *port)
+    {
+        return parseMappedAddress(val, addr, port);
+    }
+
+    bool parseIceControlled(const QByteArray &val, quint64 *i)
+    {
+        if (val.size() != 8)
+            return false;
+
+        const quint8 *p = (const quint8 *)val.data();
+        *i              = read64(p);
+        return true;
+    }
+
+    bool parseIceControlling(const QByteArray &val, quint64 *i)
+    {
+        if (val.size() != 8)
+            return false;
+
+        const quint8 *p = (const quint8 *)val.data();
+        *i              = read64(p);
+        return true;
+    }
+
+#define METHOD_ENTRY(x)                                                                                                \
+    {                                                                                                                  \
+        x, #x                                                                                                          \
+    }
+
+    struct MethodEntry {
+        Method      method;
+        const char *str;
+    } method_table[]
+        = { METHOD_ENTRY(Binding), METHOD_ENTRY(Allocate),         METHOD_ENTRY(Refresh),     METHOD_ENTRY(Send),
+            METHOD_ENTRY(Data),    METHOD_ENTRY(CreatePermission), METHOD_ENTRY(ChannelBind), { (Method)-1, nullptr } };
+
+    QString methodToString(int method)
+    {
+        for (int n = 0; method_table[n].str; ++n) {
+            if (method_table[n].method == (Method)method)
+                return QString::fromLatin1(method_table[n].str);
         }
+
+        return QString();
     }
 
-    return QString();
-}
+#define ATTRIB_ENTRY(x)                                                                                                \
+    {                                                                                                                  \
+        x, #x                                                                                                          \
+    }
 
-static QString quoted(const QString &in)
-{
-    return QString("\"") + in + '\"';
-}
+    struct AttribEntry {
+        Attribute   type;
+        const char *str;
+    } attrib_table[] = { ATTRIB_ENTRY(MAPPED_ADDRESS),
+                         ATTRIB_ENTRY(USERNAME),
+                         ATTRIB_ENTRY(MESSAGE_INTEGRITY),
+                         ATTRIB_ENTRY(ERROR_CODE),
+                         ATTRIB_ENTRY(UNKNOWN_ATTRIBUTES),
+                         ATTRIB_ENTRY(REALM),
+                         ATTRIB_ENTRY(NONCE),
+                         ATTRIB_ENTRY(XOR_MAPPED_ADDRESS),
+                         ATTRIB_ENTRY(CHANNEL_NUMBER),
+                         ATTRIB_ENTRY(LIFETIME),
+                         ATTRIB_ENTRY(XOR_PEER_ADDRESS),
+                         ATTRIB_ENTRY(DATA),
+                         ATTRIB_ENTRY(XOR_RELAYED_ADDRESS),
+                         ATTRIB_ENTRY(EVEN_PORT),
+                         ATTRIB_ENTRY(REQUESTED_TRANSPORT),
+                         ATTRIB_ENTRY(DONT_FRAGMENT),
+                         ATTRIB_ENTRY(RESERVATION_TOKEN),
+                         ATTRIB_ENTRY(PRIORITY),
+                         ATTRIB_ENTRY(USE_CANDIDATE),
+                         ATTRIB_ENTRY(SOFTWARE),
+                         ATTRIB_ENTRY(ALTERNATE_SERVER),
+                         ATTRIB_ENTRY(FINGERPRINT),
+                         ATTRIB_ENTRY(ICE_CONTROLLED),
+                         ATTRIB_ENTRY(ICE_CONTROLLING),
+                         { (Attribute)-1, nullptr } };
+
+    QString attributeTypeToString(int type)
+    {
+        for (int n = 0; attrib_table[n].str; ++n) {
+            if (attrib_table[n].type == (Attribute)type) {
+                QString name = QString::fromLatin1(attrib_table[n].str);
+                name.replace('_', '-');
+                return name;
+            }
+        }
 
-QString attributeValueToString(int type, const QByteArray &val, const quint8 *magic, const quint8 *id)
-{
-    switch((Attribute)type)
+        return QString();
+    }
+
+    static QString quoted(const QString &in) { return QString("\"") + in + '\"'; }
+
+    QString attributeValueToString(int type, const QByteArray &val, const quint8 *magic, const quint8 *id)
     {
-        case MAPPED_ADDRESS:
-        {
+        switch ((Attribute)type) {
+        case MAPPED_ADDRESS: {
             QHostAddress addr;
-            quint16 port;
-            if(parseMappedAddress(val, &addr, &port))
+            quint16      port;
+            if (parseMappedAddress(val, &addr, &port))
                 return addr.toString() + ';' + QString::number(port);
             break;
         }
-        case USERNAME:
-        {
+        case USERNAME: {
             QString str;
-            if(parseUsername(val, &str))
+            if (parseUsername(val, &str))
                 return quoted(str);
             break;
         }
-        case MESSAGE_INTEGRITY:
-        {
+        case MESSAGE_INTEGRITY: {
             return QCA::arrayToHex(val);
         }
-        case ERROR_CODE:
-        {
-            int code;
+        case ERROR_CODE: {
+            int     code;
             QString reason;
-            if(parseErrorCode(val, &code, &reason))
-            {
+            if (parseErrorCode(val, &code, &reason)) {
                 QString out = QString::number(code);
-                if(!reason.isEmpty())
+                if (!reason.isEmpty())
                     out += QString(", ") + quoted(reason);
                 return out;
             }
             break;
         }
-        case UNKNOWN_ATTRIBUTES:
-        {
+        case UNKNOWN_ATTRIBUTES: {
             QList<quint16> typeList;
-            if(parseUnknownAttributes(val, &typeList))
-            {
-                if(!typeList.isEmpty())
-                {
+            if (parseUnknownAttributes(val, &typeList)) {
+                if (!typeList.isEmpty()) {
                     QStringList strList;
-                    foreach(quint16 i, typeList)
+                    foreach (quint16 i, typeList)
                         strList += QString().sprintf("0x%04x", i);
                     return strList.join(", ");
-                }
-                else
+                } else
                     return "(None)";
             }
             break;
         }
-        case REALM:
-        {
+        case REALM: {
             QString str;
-            if(parseRealm(val, &str))
+            if (parseRealm(val, &str))
                 return quoted(str);
             break;
         }
-        case NONCE:
-        {
+        case NONCE: {
             QString str;
-            if(parseNonce(val, &str))
+            if (parseNonce(val, &str))
                 return quoted(str);
             break;
         }
-        case XOR_MAPPED_ADDRESS:
-        {
+        case XOR_MAPPED_ADDRESS: {
             QHostAddress addr;
-            quint16 port;
-            if(parseXorMappedAddress(val, magic, id, &addr, &port))
+            quint16      port;
+            if (parseXorMappedAddress(val, magic, id, &addr, &port))
                 return addr.toString() + ';' + QString::number(port);
             break;
         }
-        case CHANNEL_NUMBER:
-        {
+        case CHANNEL_NUMBER: {
             quint16 i;
-            if(parseChannelNumber(val, &i))
+            if (parseChannelNumber(val, &i))
                 return QString().sprintf("0x%04x", (int)i);
             break;
         }
-        case LIFETIME:
-        {
+        case LIFETIME: {
             quint32 i;
-            if(parseLifetime(val, &i))
+            if (parseLifetime(val, &i))
                 return QString::number(i);
             break;
         }
-        case XOR_PEER_ADDRESS:
-        {
+        case XOR_PEER_ADDRESS: {
             return attributeValueToString(XOR_MAPPED_ADDRESS, val, magic, id);
         }
-        case DATA:
-        {
+        case DATA: {
             return QString("len=%1, ").arg(val.size()) + QCA::arrayToHex(val);
         }
-        case XOR_RELAYED_ADDRESS:
-        {
+        case XOR_RELAYED_ADDRESS: {
             return attributeValueToString(XOR_MAPPED_ADDRESS, val, magic, id);
         }
-        case EVEN_PORT:
-        {
+        case EVEN_PORT: {
             bool reserve;
-            if(parseEvenPort(val, &reserve))
+            if (parseEvenPort(val, &reserve))
                 return QString("reserve=") + (reserve ? "true" : "false");
             break;
         }
-        case REQUESTED_TRANSPORT:
-        {
+        case REQUESTED_TRANSPORT: {
             quint8 proto;
-            if(parseRequestedTransport(val, &proto))
-            {
+            if (parseRequestedTransport(val, &proto)) {
                 QString str = QString::number((int)proto);
-                if(proto == 17) // UDP
+                if (proto == 17) // UDP
                     str += " (UDP)";
                 else
                     str += " (Unknown)";
@@ -620,113 +552,96 @@ QString attributeValueToString(int type, const QByteArray &val, const quint8 *ma
             }
             break;
         }
-        case DONT_FRAGMENT:
-        {
+        case DONT_FRAGMENT: {
             return QString("");
         }
-        case RESERVATION_TOKEN:
-        {
+        case RESERVATION_TOKEN: {
             QByteArray token;
-            if(parseReservationToken(val, &token))
+            if (parseReservationToken(val, &token))
                 return QCA::arrayToHex(token);
             break;
         }
-        case PRIORITY:
-        {
+        case PRIORITY: {
             quint32 i;
-            if(parsePriority(val, &i))
+            if (parsePriority(val, &i))
                 return QString::number(i);
             break;
         }
-        case USE_CANDIDATE:
-        {
+        case USE_CANDIDATE: {
             return QString("");
         }
-        case SOFTWARE:
-        {
+        case SOFTWARE: {
             QString out;
-            if(parseSoftware(val, &out))
+            if (parseSoftware(val, &out))
                 return quoted(out);
             break;
         }
-        case ALTERNATE_SERVER:
-        {
+        case ALTERNATE_SERVER: {
             return attributeValueToString(MAPPED_ADDRESS, val, magic, id);
         }
-        case FINGERPRINT:
-        {
+        case FINGERPRINT: {
             return QCA::arrayToHex(val);
         }
-        case ICE_CONTROLLED:
-        {
+        case ICE_CONTROLLED: {
             quint64 i;
-            if(parseIceControlled(val, &i))
+            if (parseIceControlled(val, &i))
                 return QString::number(i);
             break;
         }
-        case ICE_CONTROLLING:
-        {
+        case ICE_CONTROLLING: {
             quint64 i;
-            if(parseIceControlling(val, &i))
+            if (parseIceControlling(val, &i))
                 return QString::number(i);
             break;
         }
+        }
+
+        return QString();
     }
 
-    return QString();
-}
-
-QString print_packet_str(const StunMessage &message)
-{
-    QString out;
-
-    QString mclass;
-    if(message.mclass() == StunMessage::Request)
-        mclass = "Request";
-    else if(message.mclass() == StunMessage::SuccessResponse)
-        mclass = "Response (Success)";
-    else if(message.mclass() == StunMessage::ErrorResponse)
-        mclass = "Response (Error)";
-    else if(message.mclass() == StunMessage::Indication)
-        mclass = "Indication";
-    else
-        Q_ASSERT(0);
-
-    out += QString("Class: %1\n").arg(mclass);
-    out += QString("Method: %1\n").arg(methodToString(message.method()));
-    out += QString("Transaction id: %1\n").arg(QCA::arrayToHex(QByteArray((const char *)message.id(), 12)));
-    out += "Attributes:";
-    QList<StunMessage::Attribute> attribs = message.attributes();
-    if(!attribs.isEmpty())
-    {
-        foreach(const StunMessage::Attribute &a, attribs)
-        {
-            out += '\n';
-
-            QString name = attributeTypeToString(a.type);
-            if(!name.isNull())
-            {
-                QString val = attributeValueToString(a.type, a.value, message.magic(), message.id());
-                if(val.isNull())
-                    val = QString("Unable to parse %1 bytes").arg(a.value.size());
-
-                out += QString("  %1").arg(name);
-                if(!val.isEmpty())
-                    out += QString(" = %1").arg(val);
+    QString print_packet_str(const StunMessage &message)
+    {
+        QString out;
+
+        QString mclass;
+        if (message.mclass() == StunMessage::Request)
+            mclass = "Request";
+        else if (message.mclass() == StunMessage::SuccessResponse)
+            mclass = "Response (Success)";
+        else if (message.mclass() == StunMessage::ErrorResponse)
+            mclass = "Response (Error)";
+        else if (message.mclass() == StunMessage::Indication)
+            mclass = "Indication";
+        else
+            Q_ASSERT(0);
+
+        out += QString("Class: %1\n").arg(mclass);
+        out += QString("Method: %1\n").arg(methodToString(message.method()));
+        out += QString("Transaction id: %1\n").arg(QCA::arrayToHex(QByteArray((const char *)message.id(), 12)));
+        out += "Attributes:";
+        QList<StunMessage::Attribute> attribs = message.attributes();
+        if (!attribs.isEmpty()) {
+            foreach (const StunMessage::Attribute &a, attribs) {
+                out += '\n';
+
+                QString name = attributeTypeToString(a.type);
+                if (!name.isNull()) {
+                    QString val = attributeValueToString(a.type, a.value, message.magic(), message.id());
+                    if (val.isNull())
+                        val = QString("Unable to parse %1 bytes").arg(a.value.size());
+
+                    out += QString("  %1").arg(name);
+                    if (!val.isEmpty())
+                        out += QString(" = %1").arg(val);
+                } else
+                    out += QString().sprintf("  Unknown attribute (0x%04x) of %d bytes", a.type, a.value.size());
             }
-            else
-                out += QString().sprintf("  Unknown attribute (0x%04x) of %d bytes", a.type, a.value.size());
-        }
-    }
-    else
-        out += "\n  (None)";
+        } else
+            out += "\n  (None)";
 
-    return out;
-}
+        return out;
+    }
 
-void print_packet(const StunMessage &message)
-{
-    printf("%s\n", qPrintable(print_packet_str(message)));
-}
+    void print_packet(const StunMessage &message) { printf("%s\n", qPrintable(print_packet_str(message))); }
 } // namespace StunTypes
 } // namespace XMPP
diff --git a/src/irisnet/noncore/stuntypes.h b/src/irisnet/noncore/stuntypes.h
index c09da16b..636a527d 100644
--- a/src/irisnet/noncore/stuntypes.h
+++ b/src/irisnet/noncore/stuntypes.h
@@ -26,115 +26,114 @@
 #include <QList>
 #include <QString>
 
-namespace XMPP {
-namespace StunTypes {
-enum Method
-{
-    Binding           = 0x001,
-    Allocate          = 0x003,
-    Refresh           = 0x004,
-    Send              = 0x006,
-    Data              = 0x007,
-    CreatePermission  = 0x008,
-    ChannelBind       = 0x009
-};
-
-enum Attribute
-{
-    MAPPED_ADDRESS       = 0x0001,
-    USERNAME             = 0x0006,
-    MESSAGE_INTEGRITY    = 0x0008,
-    ERROR_CODE           = 0x0009,
-    UNKNOWN_ATTRIBUTES   = 0x000a,
-    REALM                = 0x0014,
-    NONCE                = 0x0015,
-    XOR_MAPPED_ADDRESS   = 0x0020,
-    CHANNEL_NUMBER       = 0x000c,
-    LIFETIME             = 0x000d,
-    XOR_PEER_ADDRESS     = 0x0012,
-    DATA                 = 0x0013,
-    XOR_RELAYED_ADDRESS  = 0x0016,
-    EVEN_PORT            = 0x0018,
-    REQUESTED_TRANSPORT  = 0x0019,
-    DONT_FRAGMENT        = 0x001a,
-    RESERVATION_TOKEN    = 0x0022,
-
-    PRIORITY             = 0x0024,
-    USE_CANDIDATE        = 0x0025,
-
-    SOFTWARE             = 0x8022,
-    ALTERNATE_SERVER     = 0x8023,
-    FINGERPRINT          = 0x8028,
-
-    ICE_CONTROLLED       = 0x8029,
-    ICE_CONTROLLING      = 0x802a
-};
-
-enum Error
-{
-    TryAlternate                  = 300,
-    BadRequest                    = 400,
-    Unauthorized                  = 401,
-    UnknownAttribute              = 420,
-    StaleNonce                    = 438,
-    ServerError                   = 500,
-
-    Forbidden                     = 403,
-    AllocationMismatch            = 437,
-    WrongCredentials              = 441,
-    UnsupportedTransportProtocol  = 442,
-    AllocationQuotaReached        = 486,
-    InsufficientCapacity          = 508,
-
-    RoleConflict                  = 487
-};
-
-QByteArray createMappedAddress(const QHostAddress &addr, quint16 port);
-QByteArray createUsername(const QString &username);
-QByteArray createErrorCode(int code, const QString &reason);
-QByteArray createUnknownAttributes(const QList<quint16> &typeList);
-QByteArray createRealm(const QString &realm);
-QByteArray createNonce(const QString &nonce);
-QByteArray createXorMappedAddress(const QHostAddress &addr, quint16 port, const quint8 *magic, const quint8 *id);
-QByteArray createChannelNumber(quint16 i);
-QByteArray createLifetime(quint32 i);
-QByteArray createXorPeerAddress(const QHostAddress &addr, quint16 port, const quint8 *magic, const quint8 *id);
-QByteArray createXorRelayedAddress(const QHostAddress &addr, quint16 port, const quint8 *magic, const quint8 *id);
-QByteArray createEvenPort(bool reserve);
-QByteArray createRequestedTransport(quint8 proto);
-QByteArray createReservationToken(const QByteArray &token);
-QByteArray createPriority(quint32 i);
-QByteArray createSoftware(const QString &str);
-QByteArray createAlternateServer(const QHostAddress &addr, quint16 port);
-QByteArray createIceControlled(quint64 i);
-QByteArray createIceControlling(quint64 i);
-
-bool parseMappedAddress(const QByteArray &val, QHostAddress *addr, quint16 *port);
-bool parseUsername(const QByteArray &val, QString *username);
-bool parseErrorCode(const QByteArray &val, int *code, QString *reason);
-bool parseUnknownAttributes(const QByteArray &val, QList<quint16> *typeList);
-bool parseRealm(const QByteArray &val, QString *realm);
-bool parseNonce(const QByteArray &val, QString *nonce);
-bool parseXorMappedAddress(const QByteArray &val, const quint8 *magic, const quint8 *id, QHostAddress *addr, quint16 *port);
-bool parseChannelNumber(const QByteArray &val, quint16 *i);
-bool parseLifetime(const QByteArray &val, quint32 *i);
-bool parseXorPeerAddress(const QByteArray &val, const quint8 *magic, const quint8 *id, QHostAddress *addr, quint16 *port);
-bool parseXorRelayedAddress(const QByteArray &val, const quint8 *magic, const quint8 *id, QHostAddress *addr, quint16 *port);
-bool parseEvenPort(const QByteArray &val, bool *reserve);
-bool parseRequestedTransport(const QByteArray &val, quint8 *proto);
-bool parseReservationToken(const QByteArray &val, QByteArray *token);
-bool parsePriority(const QByteArray &val, quint32 *i);
-bool parseSoftware(const QByteArray &val, QString *str);
-bool parseAlternateServer(const QByteArray &val, QHostAddress *addr, quint16 *port);
-bool parseIceControlled(const QByteArray &val, quint64 *i);
-bool parseIceControlling(const QByteArray &val, quint64 *i);
-
-QString methodToString(int method);
-QString attributeTypeToString(int type);
-QString attributeValueToString(int type, const QByteArray &val, const quint8 *magic, const quint8 *id);
-
-QString print_packet_str(const StunMessage &message);
-void print_packet(const StunMessage &message);
+namespace XMPP { namespace StunTypes {
+    enum Method {
+        Binding          = 0x001,
+        Allocate         = 0x003,
+        Refresh          = 0x004,
+        Send             = 0x006,
+        Data             = 0x007,
+        CreatePermission = 0x008,
+        ChannelBind      = 0x009
+    };
+
+    enum Attribute {
+        MAPPED_ADDRESS      = 0x0001,
+        USERNAME            = 0x0006,
+        MESSAGE_INTEGRITY   = 0x0008,
+        ERROR_CODE          = 0x0009,
+        UNKNOWN_ATTRIBUTES  = 0x000a,
+        REALM               = 0x0014,
+        NONCE               = 0x0015,
+        XOR_MAPPED_ADDRESS  = 0x0020,
+        CHANNEL_NUMBER      = 0x000c,
+        LIFETIME            = 0x000d,
+        XOR_PEER_ADDRESS    = 0x0012,
+        DATA                = 0x0013,
+        XOR_RELAYED_ADDRESS = 0x0016,
+        EVEN_PORT           = 0x0018,
+        REQUESTED_TRANSPORT = 0x0019,
+        DONT_FRAGMENT       = 0x001a,
+        RESERVATION_TOKEN   = 0x0022,
+
+        PRIORITY      = 0x0024,
+        USE_CANDIDATE = 0x0025,
+
+        SOFTWARE         = 0x8022,
+        ALTERNATE_SERVER = 0x8023,
+        FINGERPRINT      = 0x8028,
+
+        ICE_CONTROLLED  = 0x8029,
+        ICE_CONTROLLING = 0x802a
+    };
+
+    enum Error {
+        TryAlternate     = 300,
+        BadRequest       = 400,
+        Unauthorized     = 401,
+        UnknownAttribute = 420,
+        StaleNonce       = 438,
+        ServerError      = 500,
+
+        Forbidden                    = 403,
+        AllocationMismatch           = 437,
+        WrongCredentials             = 441,
+        UnsupportedTransportProtocol = 442,
+        AllocationQuotaReached       = 486,
+        InsufficientCapacity         = 508,
+
+        RoleConflict = 487
+    };
+
+    QByteArray createMappedAddress(const QHostAddress &addr, quint16 port);
+    QByteArray createUsername(const QString &username);
+    QByteArray createErrorCode(int code, const QString &reason);
+    QByteArray createUnknownAttributes(const QList<quint16> &typeList);
+    QByteArray createRealm(const QString &realm);
+    QByteArray createNonce(const QString &nonce);
+    QByteArray createXorMappedAddress(const QHostAddress &addr, quint16 port, const quint8 *magic, const quint8 *id);
+    QByteArray createChannelNumber(quint16 i);
+    QByteArray createLifetime(quint32 i);
+    QByteArray createXorPeerAddress(const QHostAddress &addr, quint16 port, const quint8 *magic, const quint8 *id);
+    QByteArray createXorRelayedAddress(const QHostAddress &addr, quint16 port, const quint8 *magic, const quint8 *id);
+    QByteArray createEvenPort(bool reserve);
+    QByteArray createRequestedTransport(quint8 proto);
+    QByteArray createReservationToken(const QByteArray &token);
+    QByteArray createPriority(quint32 i);
+    QByteArray createSoftware(const QString &str);
+    QByteArray createAlternateServer(const QHostAddress &addr, quint16 port);
+    QByteArray createIceControlled(quint64 i);
+    QByteArray createIceControlling(quint64 i);
+
+    bool parseMappedAddress(const QByteArray &val, QHostAddress *addr, quint16 *port);
+    bool parseUsername(const QByteArray &val, QString *username);
+    bool parseErrorCode(const QByteArray &val, int *code, QString *reason);
+    bool parseUnknownAttributes(const QByteArray &val, QList<quint16> *typeList);
+    bool parseRealm(const QByteArray &val, QString *realm);
+    bool parseNonce(const QByteArray &val, QString *nonce);
+    bool parseXorMappedAddress(const QByteArray &val, const quint8 *magic, const quint8 *id, QHostAddress *addr,
+                               quint16 *port);
+    bool parseChannelNumber(const QByteArray &val, quint16 *i);
+    bool parseLifetime(const QByteArray &val, quint32 *i);
+    bool parseXorPeerAddress(const QByteArray &val, const quint8 *magic, const quint8 *id, QHostAddress *addr,
+                             quint16 *port);
+    bool parseXorRelayedAddress(const QByteArray &val, const quint8 *magic, const quint8 *id, QHostAddress *addr,
+                                quint16 *port);
+    bool parseEvenPort(const QByteArray &val, bool *reserve);
+    bool parseRequestedTransport(const QByteArray &val, quint8 *proto);
+    bool parseReservationToken(const QByteArray &val, QByteArray *token);
+    bool parsePriority(const QByteArray &val, quint32 *i);
+    bool parseSoftware(const QByteArray &val, QString *str);
+    bool parseAlternateServer(const QByteArray &val, QHostAddress *addr, quint16 *port);
+    bool parseIceControlled(const QByteArray &val, quint64 *i);
+    bool parseIceControlling(const QByteArray &val, quint64 *i);
+
+    QString methodToString(int method);
+    QString attributeTypeToString(int type);
+    QString attributeValueToString(int type, const QByteArray &val, const quint8 *magic, const quint8 *id);
+
+    QString print_packet_str(const StunMessage &message);
+    void    print_packet(const StunMessage &message);
 
 } // namespace StunTypes
 } // namespace XMPP
diff --git a/src/irisnet/noncore/stunutil.cpp b/src/irisnet/noncore/stunutil.cpp
index 46afe447..4331fe41 100644
--- a/src/irisnet/noncore/stunutil.cpp
+++ b/src/irisnet/noncore/stunutil.cpp
@@ -18,78 +18,77 @@
 
 #include "stunutil.h"
 
-namespace XMPP {
-namespace StunUtil {
-quint16 read16(const quint8 *in)
-{
-    quint16 out = in[0];
-    out <<= 8;
-    out += in[1];
-    return out;
-}
+namespace XMPP { namespace StunUtil {
+    quint16 read16(const quint8 *in)
+    {
+        quint16 out = in[0];
+        out <<= 8;
+        out += in[1];
+        return out;
+    }
 
-quint32 read32(const quint8 *in)
-{
-    quint32 out = in[0];
-    out <<= 8;
-    out += in[1];
-    out <<= 8;
-    out += in[2];
-    out <<= 8;
-    out += in[3];
-    return out;
-}
+    quint32 read32(const quint8 *in)
+    {
+        quint32 out = in[0];
+        out <<= 8;
+        out += in[1];
+        out <<= 8;
+        out += in[2];
+        out <<= 8;
+        out += in[3];
+        return out;
+    }
 
-quint64 read64(const quint8 *in)
-{
-    quint64 out = in[0];
-    out <<= 8;
-    out += in[1];
-    out <<= 8;
-    out += in[2];
-    out <<= 8;
-    out += in[3];
-    out <<= 8;
-    out += in[4];
-    out <<= 8;
-    out += in[5];
-    out <<= 8;
-    out += in[6];
-    out <<= 8;
-    out += in[7];
-    return out;
-}
+    quint64 read64(const quint8 *in)
+    {
+        quint64 out = in[0];
+        out <<= 8;
+        out += in[1];
+        out <<= 8;
+        out += in[2];
+        out <<= 8;
+        out += in[3];
+        out <<= 8;
+        out += in[4];
+        out <<= 8;
+        out += in[5];
+        out <<= 8;
+        out += in[6];
+        out <<= 8;
+        out += in[7];
+        return out;
+    }
 
-void write16(quint8 *out, quint16 i)
-{
-    out[0] = (i >> 8) & 0xff;
-    out[1] = i & 0xff;
-}
+    void write16(quint8 *out, quint16 i)
+    {
+        out[0] = (i >> 8) & 0xff;
+        out[1] = i & 0xff;
+    }
 
-void write32(quint8 *out, quint32 i)
-{
-    out[0] = (i >> 24) & 0xff;
-    out[1] = (i >> 16) & 0xff;
-    out[2] = (i >> 8) & 0xff;
-    out[3] = i & 0xff;
-}
+    void write32(quint8 *out, quint32 i)
+    {
+        out[0] = (i >> 24) & 0xff;
+        out[1] = (i >> 16) & 0xff;
+        out[2] = (i >> 8) & 0xff;
+        out[3] = i & 0xff;
+    }
 
-void write64(quint8 *out, quint64 i)
-{
-    out[0] = (i >> 56) & 0xff;
-    out[1] = (i >> 48) & 0xff;
-    out[2] = (i >> 40) & 0xff;
-    out[3] = (i >> 32) & 0xff;
-    out[4] = (i >> 24) & 0xff;
-    out[5] = (i >> 16) & 0xff;
-    out[6] = (i >> 8) & 0xff;
-    out[7] = i & 0xff;
-}
+    void write64(quint8 *out, quint64 i)
+    {
+        out[0] = (i >> 56) & 0xff;
+        out[1] = (i >> 48) & 0xff;
+        out[2] = (i >> 40) & 0xff;
+        out[3] = (i >> 32) & 0xff;
+        out[4] = (i >> 24) & 0xff;
+        out[5] = (i >> 16) & 0xff;
+        out[6] = (i >> 8) & 0xff;
+        out[7] = i & 0xff;
+    }
 
-QCA::SecureArray saslPrep(const QCA::SecureArray &in)
-{
-    // TODO
-    return in;
-}
+    QCA::SecureArray saslPrep(const QCA::SecureArray &in)
+    {
+        // TODO
+        return in;
+    }
 } // namespace StunUtil
 } // namespace XMPP
diff --git a/src/irisnet/noncore/stunutil.h b/src/irisnet/noncore/stunutil.h
index ca71f011..7ec74cf2 100644
--- a/src/irisnet/noncore/stunutil.h
+++ b/src/irisnet/noncore/stunutil.h
@@ -21,17 +21,16 @@
 
 #include <QtCrypto>
 
-namespace XMPP {
-namespace StunUtil {
-quint16 read16(const quint8 *in);
-quint32 read32(const quint8 *in);
-quint64 read64(const quint8 *in);
+namespace XMPP { namespace StunUtil {
+    quint16 read16(const quint8 *in);
+    quint32 read32(const quint8 *in);
+    quint64 read64(const quint8 *in);
 
-void write16(quint8 *out, quint16 i);
-void write32(quint8 *out, quint32 i);
-void write64(quint8 *out, quint64 i);
+    void write16(quint8 *out, quint16 i);
+    void write32(quint8 *out, quint32 i);
+    void write64(quint8 *out, quint64 i);
 
-QCA::SecureArray saslPrep(const QCA::SecureArray &in);
+    QCA::SecureArray saslPrep(const QCA::SecureArray &in);
 
 } // namespace StunUtil
 } // namespace XMPP
diff --git a/src/irisnet/noncore/tcpportreserver.cpp b/src/irisnet/noncore/tcpportreserver.cpp
index 32039e91..ba4fe14d 100644
--- a/src/irisnet/noncore/tcpportreserver.cpp
+++ b/src/irisnet/noncore/tcpportreserver.cpp
@@ -26,14 +26,10 @@
 #include <QTcpSocket>
 
 namespace XMPP {
-TcpPortDiscoverer::TcpPortDiscoverer(TcpPortScope *scope) :
-    QObject(scope),
-    scope(scope)
-{
-
-}
+TcpPortDiscoverer::TcpPortDiscoverer(TcpPortScope *scope) : QObject(scope), scope(scope) {}
 
-bool TcpPortDiscoverer::setExternalHost(const QString &extHost, quint16 extPort, const QHostAddress &localAddr, quint16 localPort)
+bool TcpPortDiscoverer::setExternalHost(const QString &extHost, quint16 extPort, const QHostAddress &localAddr,
+                                        quint16 localPort)
 {
     if (!(typeMask & TcpPortServer::NatAssited)) {
         return false; // seems like we don't need nat-assited
@@ -43,7 +39,7 @@ bool TcpPortDiscoverer::setExternalHost(const QString &extHost, quint16 extPort,
         return false;
     }
     TcpPortServer::Port p;
-    p.portType = TcpPortServer::NatAssited;
+    p.portType    = TcpPortServer::NatAssited;
     p.publishHost = extHost;
     p.publishPort = extPort;
     server->setPortInfo(p);
@@ -66,10 +62,11 @@ TcpPortServer::PortTypes TcpPortDiscoverer::setTypeMask(TcpPortServer::PortTypes
 {
     this->typeMask = mask;
     // drop ready ports if any
-    std::remove_if(servers.begin(), servers.end(), [mask](auto &s){ return !(s->portType() & mask); });
+    std::remove_if(servers.begin(), servers.end(), [mask](auto &s) { return !(s->portType() & mask); });
 
     TcpPortServer::PortTypes pendingTypes;
-    for (auto &s: servers) pendingTypes |= s->portType();
+    for (auto &s : servers)
+        pendingTypes |= s->portType();
 
     // TODO drop pending subdiscoveries too and update pendingType when implemented
     return pendingTypes;
@@ -78,8 +75,7 @@ TcpPortServer::PortTypes TcpPortDiscoverer::setTypeMask(TcpPortServer::PortTypes
 void TcpPortDiscoverer::start()
 {
     QList<QHostAddress> listenAddrs;
-    foreach(const QNetworkInterface &ni, QNetworkInterface::allInterfaces())
-    {
+    foreach (const QNetworkInterface &ni, QNetworkInterface::allInterfaces()) {
         if (!(ni.flags() & (QNetworkInterface::IsUp | QNetworkInterface::IsRunning))) {
             continue;
         }
@@ -87,8 +83,7 @@ void TcpPortDiscoverer::start()
             continue;
         }
         QList<QNetworkAddressEntry> entries = ni.addressEntries();
-        foreach(const QNetworkAddressEntry &na, entries)
-        {
+        foreach (const QNetworkAddressEntry &na, entries) {
             QHostAddress h = na.ip();
             if (h.isLoopback()) {
                 continue;
@@ -99,25 +94,25 @@ void TcpPortDiscoverer::start()
             //   two link-local ipv6 interfaces
             //   with the exact same address, we
             //   only use the first one
-            if(listenAddrs.contains(h))
+            if (listenAddrs.contains(h))
                 continue;
-#if QT_VERSION >= QT_VERSION_CHECK(5,11,0)
-            if(h.protocol() == QAbstractSocket::IPv6Protocol && h.isLinkLocal())
+#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
+            if (h.protocol() == QAbstractSocket::IPv6Protocol && h.isLinkLocal())
 #else
-            if(h.protocol() == QAbstractSocket::IPv6Protocol && XMPP::Ice176::isIPv6LinkLocalAddress(h))
+            if (h.protocol() == QAbstractSocket::IPv6Protocol && XMPP::Ice176::isIPv6LinkLocalAddress(h))
 #endif
                 h.setScopeId(ni.name());
             listenAddrs += h;
         }
     }
 
-    for (auto &h: listenAddrs) {
+    for (auto &h : listenAddrs) {
         auto server = scope->bind(h, 0);
         if (!server) {
             continue;
         }
         TcpPortServer::Port p;
-        p.portType = TcpPortServer::Direct;
+        p.portType        = TcpPortServer::Direct;
         QHostAddress addr = server->serverAddress();
         addr.setScopeId(QString());
         p.publishHost = addr.toString();
@@ -140,7 +135,7 @@ QList<TcpPortServer::Ptr> TcpPortDiscoverer::takeServers()
 {
     auto ret = servers;
     servers.clear();
-    for (auto &p: ret) {
+    for (auto &p : ret) {
         p->disconnect(this);
     }
     return ret;
@@ -149,25 +144,18 @@ QList<TcpPortServer::Ptr> TcpPortDiscoverer::takeServers()
 // --------------------------------------------------------------------------
 // TcpPortScope
 // --------------------------------------------------------------------------
-struct TcpPortScope::Private
-{
-    QHash<QPair<QHostAddress,quint16>, QWeakPointer<TcpPortServer>> servers;
+struct TcpPortScope::Private {
+    QHash<QPair<QHostAddress, quint16>, QWeakPointer<TcpPortServer>> servers;
 };
 
-TcpPortScope::TcpPortScope() :
-    d(new Private)
-{
-}
-
-TcpPortScope::~TcpPortScope()
-{
+TcpPortScope::TcpPortScope() : d(new Private) {}
 
-}
+TcpPortScope::~TcpPortScope() {}
 
 TcpPortDiscoverer *TcpPortScope::disco()
 {
     auto discoverer = new TcpPortDiscoverer(this);
-    QMetaObject::invokeMethod(parent(), "newDiscoverer", Q_ARG(TcpPortDiscoverer*, discoverer));
+    QMetaObject::invokeMethod(parent(), "newDiscoverer", Q_ARG(TcpPortDiscoverer *, discoverer));
     QMetaObject::invokeMethod(discoverer, "start");
     return discoverer;
 }
@@ -175,7 +163,7 @@ TcpPortDiscoverer *TcpPortScope::disco()
 QList<TcpPortServer::Ptr> TcpPortScope::allServers() const
 {
     QList<TcpPortServer::Ptr> ret;
-    for (auto &s: d->servers) {
+    for (auto &s : d->servers) {
         auto sl = s.lock();
         if (sl) {
             ret.append(sl);
@@ -184,15 +172,12 @@ QList<TcpPortServer::Ptr> TcpPortScope::allServers() const
     return ret;
 }
 
-void TcpPortScope::destroyServer(TcpPortServer *server)
-{
-    delete server;
-}
+void TcpPortScope::destroyServer(TcpPortServer *server) { delete server; }
 
 TcpPortServer::Ptr TcpPortScope::bind(const QHostAddress &addr, quint16 port)
 {
     if (port) {
-        auto srv = d->servers.value(qMakePair(addr,port)).toStrongRef();
+        auto srv = d->servers.value(qMakePair(addr, port)).toStrongRef();
         if (srv) {
             return srv;
         }
@@ -204,10 +189,10 @@ TcpPortServer::Ptr TcpPortScope::bind(const QHostAddress &addr, quint16 port)
     }
     auto server = makeServer(socket);
 
-    TcpPortServer::Ptr shared(server, [](TcpPortServer *s){
-        auto scope = qobject_cast<TcpPortScope*>(s->parent());
+    TcpPortServer::Ptr shared(server, [](TcpPortServer *s) {
+        auto scope = qobject_cast<TcpPortScope *>(s->parent());
         if (scope) {
-            scope->d->servers.remove(qMakePair(s->serverAddress(),s->serverPort()));
+            scope->d->servers.remove(qMakePair(s->serverAddress(), s->serverPort()));
             scope->destroyServer(s);
         } else {
             delete s;
@@ -221,19 +206,13 @@ TcpPortServer::Ptr TcpPortScope::bind(const QHostAddress &addr, quint16 port)
 // --------------------------------------------------------------------------
 // TcpPortScope
 // --------------------------------------------------------------------------
-TcpPortReserver::TcpPortReserver(QObject *parent) : QObject(parent)
-{
-
-}
-
-TcpPortReserver::~TcpPortReserver()
-{
+TcpPortReserver::TcpPortReserver(QObject *parent) : QObject(parent) {}
 
-}
+TcpPortReserver::~TcpPortReserver() {}
 
 TcpPortScope *TcpPortReserver::scope(const QString &id)
 {
-    return findChild<TcpPortScope*>(id, Qt::FindDirectChildrenOnly);
+    return findChild<TcpPortScope *>(id, Qt::FindDirectChildrenOnly);
 }
 
 void TcpPortReserver::registerScope(const QString &id, TcpPortScope *scope)
diff --git a/src/irisnet/noncore/tcpportreserver.h b/src/irisnet/noncore/tcpportreserver.h
index a4068bc4..12151b74 100644
--- a/src/irisnet/noncore/tcpportreserver.h
+++ b/src/irisnet/noncore/tcpportreserver.h
@@ -26,22 +26,15 @@
 #include <QVariant>
 
 namespace XMPP {
-class TcpPortServer : public QObject
-{
+class TcpPortServer : public QObject {
     Q_OBJECT
 public:
     using Ptr = QSharedPointer<TcpPortServer>;
 
-    enum PortType {
-        NoType     = 0x0,
-        Direct     = 0x1,
-        NatAssited = 0x2,
-        Tunneled   = 0x4
-    };
+    enum PortType { NoType = 0x0, Direct = 0x1, NatAssited = 0x2, Tunneled = 0x4 };
     Q_DECLARE_FLAGS(PortTypes, PortType)
 
-    struct Port
-    {
+    struct Port {
         PortType portType = NoType;
         QString  publishHost;
         quint16  publishPort = 0;
@@ -52,14 +45,14 @@ class TcpPortServer : public QObject
     inline void            setPortInfo(const Port &port) { this->port = port; }
     inline QHostAddress    serverAddress() const { return serverSocket->serverAddress(); }
     inline quint16         serverPort() const { return serverSocket->serverPort(); }
-    inline const QString  &publishHost() const { return port.publishHost; }
+    inline const QString & publishHost() const { return port.publishHost; }
     inline quint16         publishPort() const { return port.publishPort; }
     inline PortType        portType() const { return port.portType; }
     inline const QVariant &meta() const { return port.meta; }
 
 protected:
     QTcpServer *serverSocket = nullptr;
-    Port port;
+    Port        port;
 };
 
 class TcpPortScope;
@@ -68,16 +61,14 @@ class TcpPortScope;
  *
  * Discovers / starts listening on a set of unique tcp ports.
  */
-class TcpPortDiscoverer : public QObject
-{
+class TcpPortDiscoverer : public QObject {
     Q_OBJECT
 public:
-
     TcpPortDiscoverer(TcpPortScope *scope);
     bool setExternalHost(const QString &extHost, quint16 extPort, const QHostAddress &localIp, quint16 localPort);
 
     TcpPortServer::PortTypes inProgressPortTypes() const;
-    bool isDepleted() const;
+    bool                     isDepleted() const;
 
     /**
      * @brief setTypeMask sets expected port types mask and frees unnecessary resources
@@ -96,9 +87,11 @@ public slots:
     void stop();
 signals:
     void portAvailable();
+
 private:
-    TcpPortServer::PortTypes typeMask = TcpPortServer::PortTypes(TcpPortServer::Direct | TcpPortServer::NatAssited | TcpPortServer::Tunneled);
-    TcpPortScope *scope = nullptr;
+    TcpPortServer::PortTypes typeMask
+        = TcpPortServer::PortTypes(TcpPortServer::Direct | TcpPortServer::NatAssited | TcpPortServer::Tunneled);
+    TcpPortScope *            scope = nullptr;
     QList<TcpPortServer::Ptr> servers;
 };
 
@@ -109,17 +102,17 @@ class TcpPortReserver;
  * Handles scopes of ports. For example just S5B dedicated ports.
  * There only on scope instance per scope id
  */
-class TcpPortScope: public QObject
-{
+class TcpPortScope : public QObject {
     Q_OBJECT
 public:
     TcpPortScope();
     ~TcpPortScope();
-    TcpPortDiscoverer* disco();
+    TcpPortDiscoverer *       disco();
     QList<TcpPortServer::Ptr> allServers() const;
+
 protected:
-    virtual TcpPortServer* makeServer(QTcpServer *socket) = 0;
-    virtual void destroyServer(TcpPortServer *server);
+    virtual TcpPortServer *makeServer(QTcpServer *socket) = 0;
+    virtual void           destroyServer(TcpPortServer *server);
 
 private:
     friend class TcpPortDiscoverer;
@@ -134,8 +127,7 @@ class TcpPortScope: public QObject
  * @brief The TcpPortReserver class
  * This class should have the only instance per application
  */
-class TcpPortReserver : public QObject
-{
+class TcpPortReserver : public QObject {
     Q_OBJECT
 public:
     explicit TcpPortReserver(QObject *parent = nullptr);
@@ -149,7 +141,7 @@ class TcpPortReserver : public QObject
      */
     TcpPortScope *scope(const QString &id);
 
-    void registerScope(const QString &id, TcpPortScope *scope);
+    void          registerScope(const QString &id, TcpPortScope *scope);
     TcpPortScope *unregisterScope(const QString &id);
 signals:
     void newDiscoverer(TcpPortDiscoverer *discoverer);
diff --git a/src/irisnet/noncore/turnclient.cpp b/src/irisnet/noncore/turnclient.cpp
index fd1ea2e9..87515903 100644
--- a/src/irisnet/noncore/turnclient.cpp
+++ b/src/irisnet/noncore/turnclient.cpp
@@ -34,50 +34,30 @@ namespace XMPP {
 //----------------------------------------------------------------------------
 // TurnClient::Proxy
 //----------------------------------------------------------------------------
-TurnClient::Proxy::Proxy()
-{
-    t = None;
-}
+TurnClient::Proxy::Proxy() { t = None; }
 
-TurnClient::Proxy::~Proxy()
-{
-}
+TurnClient::Proxy::~Proxy() {}
 
-int TurnClient::Proxy::type() const
-{
-    return t;
-}
+int TurnClient::Proxy::type() const { return t; }
 
-QString TurnClient::Proxy::host() const
-{
-    return v_host;
-}
+QString TurnClient::Proxy::host() const { return v_host; }
 
-quint16 TurnClient::Proxy::port() const
-{
-    return v_port;
-}
+quint16 TurnClient::Proxy::port() const { return v_port; }
 
-QString TurnClient::Proxy::user() const
-{
-    return v_user;
-}
+QString TurnClient::Proxy::user() const { return v_user; }
 
-QString TurnClient::Proxy::pass() const
-{
-    return v_pass;
-}
+QString TurnClient::Proxy::pass() const { return v_pass; }
 
 void TurnClient::Proxy::setHttpConnect(const QString &host, quint16 port)
 {
-    t = HttpConnect;
+    t      = HttpConnect;
     v_host = host;
     v_port = port;
 }
 
 void TurnClient::Proxy::setSocks(const QString &host, quint16 port)
 {
-    t = Socks;
+    t      = Socks;
     v_host = host;
     v_port = port;
 }
@@ -91,119 +71,84 @@ void TurnClient::Proxy::setUserPass(const QString &user, const QString &pass)
 //----------------------------------------------------------------------------
 // TurnClient
 //----------------------------------------------------------------------------
-class TurnClient::Private : public QObject
-{
+class TurnClient::Private : public QObject {
     Q_OBJECT
 
 public:
-    TurnClient *q;
-    Proxy proxy;
-    QString clientSoftware;
-    TurnClient::Mode mode;
-    QHostAddress serverAddr;
-    int serverPort;
-    ObjectSession sess;
-    ByteStream *bs;
-    QCA::TLS *tls;
-    bool tlsHandshaken;
-    QByteArray inStream;
-    bool udp;
+    TurnClient *         q;
+    Proxy                proxy;
+    QString              clientSoftware;
+    TurnClient::Mode     mode;
+    QHostAddress         serverAddr;
+    int                  serverPort;
+    ObjectSession        sess;
+    ByteStream *         bs;
+    QCA::TLS *           tls;
+    bool                 tlsHandshaken;
+    QByteArray           inStream;
+    bool                 udp;
     StunTransactionPool *pool;
-    StunAllocate *allocate;
-    bool allocateStarted;
-    QString user;
-    QCA::SecureArray pass;
-    QString realm;
-    int retryCount;
-    QString errorString;
-    int debugLevel;
-
-    class WriteItem
-    {
+    StunAllocate *       allocate;
+    bool                 allocateStarted;
+    QString              user;
+    QCA::SecureArray     pass;
+    QString              realm;
+    int                  retryCount;
+    QString              errorString;
+    int                  debugLevel;
+
+    class WriteItem {
     public:
-        enum Type
-        {
-            Data,
-            Other
-        };
+        enum Type { Data, Other };
 
-        Type type;
-        int size;
+        Type         type;
+        int          size;
         QHostAddress addr;
-        int port;
+        int          port;
 
-        WriteItem(int _size) :
-            type(Other),
-            size(_size),
-            port(-1)
-        {
-        }
+        WriteItem(int _size) : type(Other), size(_size), port(-1) {}
 
-        WriteItem(int _size, const QHostAddress &_addr, int _port) :
-            type(Data),
-            size(_size),
-            addr(_addr),
-            port(_port)
+        WriteItem(int _size, const QHostAddress &_addr, int _port) : type(Data), size(_size), addr(_addr), port(_port)
         {
         }
     };
 
     QList<WriteItem> writeItems;
-    int writtenBytes;
-    bool stopping;
+    int              writtenBytes;
+    bool             stopping;
 
-    class Packet
-    {
+    class Packet {
     public:
         QHostAddress addr;
-        int port;
-        QByteArray data;
+        int          port;
+        QByteArray   data;
 
         // for outbound
         bool requireChannel;
 
-        Packet() :
-            port(-1),
-            requireChannel(false)
-        {
-        }
+        Packet() : port(-1), requireChannel(false) {}
     };
 
-    QList<Packet> in;
-    QList<Packet> outPending;
-    int outPendingWrite;
-    QList<QHostAddress> desiredPerms;
+    QList<Packet>                in;
+    QList<Packet>                outPending;
+    int                          outPendingWrite;
+    QList<QHostAddress>          desiredPerms;
     QList<StunAllocate::Channel> pendingChannels, desiredChannels;
 
-    class Written
-    {
+    class Written {
     public:
         QHostAddress addr;
-        int port;
-        int count;
+        int          port;
+        int          count;
     };
 
     Private(TurnClient *_q) :
-        QObject(_q),
-        q(_q),
-        sess(this),
-        bs(nullptr),
-        tls(0),
-        udp(false),
-        pool(nullptr),
-        allocate(nullptr),
-        retryCount(0),
-        debugLevel(TurnClient::DL_None),
-        writtenBytes(0),
-        stopping(false),
-        outPendingWrite(0)
+        QObject(_q), q(_q), sess(this), bs(nullptr), tls(0), udp(false), pool(nullptr), allocate(nullptr),
+        retryCount(0), debugLevel(TurnClient::DL_None), writtenBytes(0), stopping(false), outPendingWrite(0)
     {
     }
 
-    ~Private()
-    {
-        cleanup();
-    }
+    ~Private() { cleanup(); }
 
     void cleanup()
     {
@@ -211,7 +156,7 @@ class TurnClient::Private : public QObject
         allocate = nullptr;
 
         // in udp mode, we don't own the pool
-        if(!udp)
+        if (!udp)
             delete pool;
         pool = nullptr;
 
@@ -229,7 +174,7 @@ class TurnClient::Private : public QObject
         retryCount = 0;
         writeItems.clear();
         writtenBytes = 0;
-        stopping = false;
+        stopping     = false;
         outPending.clear();
         outPendingWrite = 0;
         desiredPerms.clear();
@@ -239,36 +184,30 @@ class TurnClient::Private : public QObject
 
     void do_connect()
     {
-        if(udp)
-        {
+        if (udp) {
             after_connected();
             return;
         }
 
-        if(proxy.type() == Proxy::HttpConnect)
-        {
+        if (proxy.type() == Proxy::HttpConnect) {
             HttpConnect *s = new HttpConnect(this);
-            bs = s;
+            bs             = s;
             connect(s, SIGNAL(connected()), SLOT(bs_connected()));
             connect(s, SIGNAL(error(int)), SLOT(bs_error(int)));
-            if(!proxy.user().isEmpty())
+            if (!proxy.user().isEmpty())
                 s->setAuth(proxy.user(), proxy.pass());
             s->connectToHost(proxy.host(), proxy.port(), serverAddr.toString(), serverPort);
-        }
-        else if(proxy.type() == Proxy::Socks)
-        {
+        } else if (proxy.type() == Proxy::Socks) {
             SocksClient *s = new SocksClient(this);
-            bs = s;
+            bs             = s;
             connect(s, SIGNAL(connected()), SLOT(bs_connected()));
             connect(s, SIGNAL(error(int)), SLOT(bs_error(int)));
-            if(!proxy.user().isEmpty())
+            if (!proxy.user().isEmpty())
                 s->setAuth(proxy.user(), proxy.pass());
             s->connectToHost(proxy.host(), proxy.port(), serverAddr.toString(), serverPort);
-        }
-        else
-        {
+        } else {
             BSocket *s = new BSocket(this);
-            bs = s;
+            bs         = s;
             connect(s, SIGNAL(connected()), SLOT(bs_connected()));
             connect(s, SIGNAL(error(int)), SLOT(bs_error(int)));
             s->connectToHost(serverAddr.toString(), serverPort);
@@ -284,23 +223,20 @@ class TurnClient::Private : public QObject
     {
         stopping = true;
 
-        if(allocate && allocateStarted)
-        {
-            if(debugLevel >= TurnClient::DL_Info)
+        if (allocate && allocateStarted) {
+            if (debugLevel >= TurnClient::DL_Info)
                 emit q->debugLine("Deallocating...");
             allocate->stop();
-        }
-        else
-        {
+        } else {
             delete allocate;
             allocate = nullptr;
 
             // in udp mode, we don't own the pool
-            if(!udp)
+            if (!udp)
                 delete pool;
             pool = nullptr;
 
-            if(udp)
+            if (udp)
                 sess.defer(q, "closed");
             else
                 do_transport_close();
@@ -309,12 +245,9 @@ class TurnClient::Private : public QObject
 
     void do_transport_close()
     {
-        if(tls && tlsHandshaken)
-        {
+        if (tls && tlsHandshaken) {
             tls->close();
-        }
-        else
-        {
+        } else {
             delete tls;
             tls = nullptr;
 
@@ -325,12 +258,11 @@ class TurnClient::Private : public QObject
     void do_sock_close()
     {
         bool waitForSignal = false;
-        if(bs->bytesToWrite() > 0)
+        if (bs->bytesToWrite() > 0)
             waitForSignal = true;
 
         bs->close();
-        if(!waitForSignal)
-        {
+        if (!waitForSignal) {
             cleanup();
             sess.defer(q, "closed");
         }
@@ -339,20 +271,19 @@ class TurnClient::Private : public QObject
     void after_connected()
     {
         // when retrying, pool will be non-null because we reuse it
-        if(!udp && !pool)
-        {
+        if (!udp && !pool) {
             pool = new StunTransactionPool(StunTransaction::Tcp, this);
             pool->setDebugLevel((StunTransactionPool::DebugLevel)debugLevel);
-            connect(pool, SIGNAL(outgoingMessage(QByteArray,QHostAddress,int)), SLOT(pool_outgoingMessage(QByteArray,QHostAddress,int)));
+            connect(pool, SIGNAL(outgoingMessage(QByteArray, QHostAddress, int)),
+                    SLOT(pool_outgoingMessage(QByteArray, QHostAddress, int)));
             connect(pool, SIGNAL(needAuthParams()), SLOT(pool_needAuthParams()));
             connect(pool, SIGNAL(debugLine(QString)), SLOT(pool_debugLine(QString)));
 
             pool->setLongTermAuthEnabled(true);
-            if(!user.isEmpty())
-            {
+            if (!user.isEmpty()) {
                 pool->setUsername(user);
                 pool->setPassword(pass);
-                if(!realm.isEmpty())
+                if (!realm.isEmpty())
                     pool->setRealm(realm);
             }
         }
@@ -368,10 +299,10 @@ class TurnClient::Private : public QObject
         allocate->setClientSoftwareNameAndVersion(clientSoftware);
 
         allocateStarted = false;
-        if(debugLevel >= TurnClient::DL_Info)
+        if (debugLevel >= TurnClient::DL_Info)
             emit q->debugLine("Allocating...");
         // only use addr association in udp mode
-        if(udp)
+        if (udp)
             allocate->start(serverAddr, serverPort);
         else
             allocate->start();
@@ -382,17 +313,15 @@ class TurnClient::Private : public QObject
         inStream += in;
 
         ObjectSessionWatcher watch(&sess);
-        while(1)
-        {
+        while (1) {
             QByteArray packet;
 
             // try to extract ChannelData or a STUN message from
             //   the stream
             packet = StunAllocate::readChannelData((const quint8 *)inStream.data(), inStream.size());
-            if(packet.isNull())
-            {
+            if (packet.isNull()) {
                 packet = StunMessage::readStun((const quint8 *)inStream.data(), inStream.size());
-                if(packet.isNull())
+                if (packet.isNull())
                     break;
             }
 
@@ -401,7 +330,7 @@ class TurnClient::Private : public QObject
             // processDatagram may cause the session to be reset
             //   or the object to be deleted
             processDatagram(packet);
-            if(!watch.isValid())
+            if (!watch.isValid())
                 break;
         }
     }
@@ -409,49 +338,40 @@ class TurnClient::Private : public QObject
     void processDatagram(const QByteArray &buf)
     {
         bool notStun;
-        if(!pool->writeIncomingMessage(buf, &notStun))
-        {
-            QByteArray data;
+        if (!pool->writeIncomingMessage(buf, &notStun)) {
+            QByteArray   data;
             QHostAddress fromAddr;
-            int fromPort;
+            int          fromPort;
 
             data = processNonPoolPacket(buf, notStun, &fromAddr, &fromPort);
-            if(!data.isNull())
+            if (!data.isNull())
                 processDataPacket(data, fromAddr, fromPort);
         }
     }
 
     QByteArray processNonPoolPacket(const QByteArray &buf, bool notStun, QHostAddress *addr, int *port)
     {
-        if(notStun)
-        {
+        if (notStun) {
             // not stun?  maybe it is a data packet
             QByteArray data = allocate->decode(buf, addr, port);
-            if(!data.isNull())
-            {
-                if(debugLevel >= TurnClient::DL_Packet)
+            if (!data.isNull()) {
+                if (debugLevel >= TurnClient::DL_Packet)
                     emit q->debugLine("Received ChannelData-based data packet");
                 return data;
             }
-        }
-        else
-        {
+        } else {
             // packet might be stun not owned by pool.
             //   let's see
             StunMessage message = StunMessage::fromBinary(buf);
-            if(!message.isNull())
-            {
+            if (!message.isNull()) {
                 QByteArray data = allocate->decode(message, addr, port);
 
-                if(!data.isNull())
-                {
-                    if(debugLevel >= TurnClient::DL_Packet)
+                if (!data.isNull()) {
+                    if (debugLevel >= TurnClient::DL_Packet)
                         emit q->debugLine("Received STUN-based data packet");
                     return data;
-                }
-                else
-                {
-                    if(debugLevel >= TurnClient::DL_Packet)
+                } else {
+                    if (debugLevel >= TurnClient::DL_Packet)
                         emit q->debugLine("Warning: server responded with an unexpected STUN packet, skipping.");
                 }
 
@@ -459,8 +379,9 @@ class TurnClient::Private : public QObject
             }
         }
 
-        if(debugLevel >= TurnClient::DL_Packet)
-            emit q->debugLine("Warning: server responded with what doesn't seem to be a STUN or data packet, skipping.");
+        if (debugLevel >= TurnClient::DL_Packet)
+            emit q->debugLine(
+                "Warning: server responded with what doesn't seem to be a STUN or data packet, skipping.");
         return QByteArray();
     }
 
@@ -480,32 +401,26 @@ class TurnClient::Private : public QObject
         Q_ASSERT(allocateStarted);
 
         StunAllocate::Channel c(addr, port);
-        bool writeImmediately = false;
-        bool requireChannel = pendingChannels.contains(c) || desiredChannels.contains(c);
+        bool                  writeImmediately = false;
+        bool                  requireChannel   = pendingChannels.contains(c) || desiredChannels.contains(c);
 
         QList<QHostAddress> actualPerms = allocate->permissions();
-        if(actualPerms.contains(addr))
-        {
-            if(requireChannel)
-            {
+        if (actualPerms.contains(addr)) {
+            if (requireChannel) {
                 QList<StunAllocate::Channel> actualChannels = allocate->channels();
-                if(actualChannels.contains(c))
+                if (actualChannels.contains(c))
                     writeImmediately = true;
-            }
-            else
+            } else
                 writeImmediately = true;
         }
 
-        if(writeImmediately)
-        {
+        if (writeImmediately) {
             write(buf, addr, port);
-        }
-        else
-        {
+        } else {
             Packet p;
-            p.addr = addr;
-            p.port = port;
-            p.data = buf;
+            p.addr           = addr;
+            p.port           = port;
+            p.data           = buf;
             p.requireChannel = requireChannel;
             outPending += p;
 
@@ -515,16 +430,13 @@ class TurnClient::Private : public QObject
 
     void tryWriteQueued()
     {
-        QList<QHostAddress> actualPerms = allocate->permissions();
+        QList<QHostAddress>          actualPerms    = allocate->permissions();
         QList<StunAllocate::Channel> actualChannels = allocate->channels();
-        for(int n = 0; n < outPending.count(); ++n)
-        {
+        for (int n = 0; n < outPending.count(); ++n) {
             const Packet &p = outPending[n];
-            if(actualPerms.contains(p.addr))
-            {
+            if (actualPerms.contains(p.addr)) {
                 StunAllocate::Channel c(p.addr, p.port);
-                if(!p.requireChannel || actualChannels.contains(c))
-                {
+                if (!p.requireChannel || actualChannels.contains(c)) {
                     Packet po = outPending[n];
                     outPending.removeAt(n);
                     --n; // adjust position
@@ -537,21 +449,18 @@ class TurnClient::Private : public QObject
 
     void tryChannelQueued()
     {
-        if(!pendingChannels.isEmpty())
-        {
-            QList<QHostAddress> actualPerms = allocate->permissions();
+        if (!pendingChannels.isEmpty()) {
+            QList<QHostAddress>          actualPerms = allocate->permissions();
             QList<StunAllocate::Channel> list;
-            for(int n = 0; n < pendingChannels.count(); ++n)
-            {
-                if(actualPerms.contains(pendingChannels[n].address))
-                {
+            for (int n = 0; n < pendingChannels.count(); ++n) {
+                if (actualPerms.contains(pendingChannels[n].address)) {
                     list += pendingChannels[n];
                     pendingChannels.removeAt(n);
                     --n; // adjust position
                 }
             }
 
-            if(!list.isEmpty())
+            if (!list.isEmpty())
                 ensureChannels(list);
         }
     }
@@ -560,27 +469,21 @@ class TurnClient::Private : public QObject
     {
         QByteArray packet = allocate->encode(buf, addr, port);
 
-        if(debugLevel >= TurnClient::DL_Packet)
-        {
+        if (debugLevel >= TurnClient::DL_Packet) {
             StunMessage msg = StunMessage::fromBinary(packet);
-            if(!msg.isNull())
-            {
+            if (!msg.isNull()) {
                 emit q->debugLine("STUN SEND");
                 emit q->debugLine(StunTypes::print_packet_str(msg));
-            }
-            else
+            } else
                 emit q->debugLine("Sending ChannelData-based data packet");
         }
 
         writeItems += WriteItem(packet.size(), addr, port);
         ++outPendingWrite;
-        if(udp)
-        {
+        if (udp) {
             emit q->outgoingDatagram(packet);
-        }
-        else
-        {
-            if(tls)
+        } else {
+            if (tls)
                 tls->write(packet);
             else
                 bs->write(packet);
@@ -589,9 +492,8 @@ class TurnClient::Private : public QObject
 
     void ensurePermission(const QHostAddress &addr)
     {
-        if(!desiredPerms.contains(addr))
-        {
-            if(debugLevel >= TurnClient::DL_Info)
+        if (!desiredPerms.contains(addr)) {
+            if (debugLevel >= TurnClient::DL_Info)
                 emit q->debugLine(QString("Setting permission for peer address %1").arg(addr.toString()));
 
             desiredPerms += addr;
@@ -603,19 +505,18 @@ class TurnClient::Private : public QObject
     void ensureChannels(const QList<StunAllocate::Channel> &channels)
     {
         bool changed = false;
-        foreach(const StunAllocate::Channel &c, channels)
-        {
-            if(!desiredChannels.contains(c))
-            {
-                if(debugLevel >= TurnClient::DL_Info)
-                    emit q->debugLine(QString("Setting channel for peer address/port %1;%2").arg(c.address.toString()).arg(c.port));
+        foreach (const StunAllocate::Channel &c, channels) {
+            if (!desiredChannels.contains(c)) {
+                if (debugLevel >= TurnClient::DL_Info)
+                    emit q->debugLine(
+                        QString("Setting channel for peer address/port %1;%2").arg(c.address.toString()).arg(c.port));
 
                 desiredChannels += c;
                 changed = true;
             }
         }
 
-        if(changed)
+        if (changed)
             allocate->setChannels(desiredChannels);
     }
 
@@ -624,8 +525,7 @@ class TurnClient::Private : public QObject
         ensurePermission(addr);
 
         StunAllocate::Channel c(addr, port);
-        if(!pendingChannels.contains(c) && !desiredChannels.contains(c))
-        {
+        if (!pendingChannels.contains(c) && !desiredChannels.contains(c)) {
             pendingChannels += c;
 
             tryChannelQueued();
@@ -636,33 +536,26 @@ class TurnClient::Private : public QObject
     {
         QList<Written> writtenDests;
 
-        while(count > 0)
-        {
+        while (count > 0) {
             Q_ASSERT(!writeItems.isEmpty());
             WriteItem wi = writeItems.takeFirst();
             --count;
 
-            if(wi.type == WriteItem::Data)
-            {
+            if (wi.type == WriteItem::Data) {
                 int at = -1;
-                for(int n = 0; n < writtenDests.count(); ++n)
-                {
-                    if(writtenDests[n].addr == wi.addr && writtenDests[n].port == wi.port)
-                    {
+                for (int n = 0; n < writtenDests.count(); ++n) {
+                    if (writtenDests[n].addr == wi.addr && writtenDests[n].port == wi.port) {
                         at = n;
                         break;
                     }
                 }
 
-                if(at != -1)
-                {
+                if (at != -1) {
                     ++writtenDests[at].count;
-                }
-                else
-                {
+                } else {
                     Written wr;
-                    wr.addr = wi.addr;
-                    wr.port = wi.port;
+                    wr.addr  = wi.addr;
+                    wr.port  = wi.port;
                     wr.count = 1;
                     writtenDests += wr;
                 }
@@ -675,10 +568,9 @@ class TurnClient::Private : public QObject
     void emitPacketsWritten(const QList<Written> &writtenDests)
     {
         ObjectSessionWatcher watch(&sess);
-        foreach(const Written &wr, writtenDests)
-        {
+        foreach (const Written &wr, writtenDests) {
             emit q->packetsWritten(wr.count, wr.addr, wr.port);
-            if(!watch.isValid())
+            if (!watch.isValid())
                 return;
         }
     }
@@ -687,22 +579,21 @@ class TurnClient::Private : public QObject
     bool handleRetry()
     {
         ++retryCount;
-        if(retryCount < 3 && !stopping)
-        {
-            if(debugLevel >= TurnClient::DL_Info)
+        if (retryCount < 3 && !stopping) {
+            if (debugLevel >= TurnClient::DL_Info)
                 emit q->debugLine("retrying...");
 
             // start completely over, but retain the same pool
             //   so the user isn't asked to auth again
 
-            int tmp_retryCount = retryCount;
-            StunTransactionPool *tmp_pool = pool;
-            pool = nullptr;
+            int                  tmp_retryCount = retryCount;
+            StunTransactionPool *tmp_pool       = pool;
+            pool                                = nullptr;
 
             cleanup();
 
             retryCount = tmp_retryCount;
-            pool = tmp_pool;
+            pool       = tmp_pool;
 
             do_connect();
             return true;
@@ -715,23 +606,21 @@ private slots:
     void bs_connected()
     {
         ObjectSessionWatcher watch(&sess);
-        emit q->connected();
-        if(!watch.isValid())
+        emit                 q->connected();
+        if (!watch.isValid())
             return;
 
-        if(mode == TurnClient::TlsMode)
-        {
+        if (mode == TurnClient::TlsMode) {
             tls = new QCA::TLS(this);
             connect(tls, SIGNAL(handshaken()), SLOT(tls_handshaken()));
             connect(tls, SIGNAL(readyRead()), SLOT(tls_readyRead()));
             connect(tls, SIGNAL(readyReadOutgoing()), SLOT(tls_readyReadOutgoing()));
             connect(tls, SIGNAL(error()), SLOT(tls_error()));
             tlsHandshaken = false;
-            if(debugLevel >= TurnClient::DL_Info)
+            if (debugLevel >= TurnClient::DL_Info)
                 emit q->debugLine("TLS handshaking...");
             tls->startClient();
-        }
-        else
+        } else
             after_connected();
     }
 
@@ -752,7 +641,7 @@ private slots:
     {
         QByteArray buf = bs->readAll();
 
-        if(tls)
+        if (tls)
             tls->writeIncoming(buf);
         else
             processStream(buf);
@@ -760,11 +649,10 @@ private slots:
 
     void bs_bytesWritten(qint64 written)
     {
-        if(tls)
-        {
+        if (tls) {
             // convertBytesWritten() is unsafe to call unless
             //   the TLS handshake is completed
-            if(!tlsHandshaken)
+            if (!tlsHandshaken)
                 return;
 
             written = tls->convertBytesWritten(written);
@@ -774,36 +662,29 @@ private slots:
 
         QList<Written> writtenDests;
 
-        while(writtenBytes > 0)
-        {
+        while (writtenBytes > 0) {
             Q_ASSERT(!writeItems.isEmpty());
-            if(writtenBytes < writeItems.first().size)
+            if (writtenBytes < writeItems.first().size)
                 break;
 
             WriteItem wi = writeItems.takeFirst();
             writtenBytes -= wi.size;
 
-            if(wi.type == WriteItem::Data)
-            {
+            if (wi.type == WriteItem::Data) {
                 int at = -1;
-                for(int n = 0; n < writtenDests.count(); ++n)
-                {
-                    if(writtenDests[n].addr == wi.addr && writtenDests[n].port == wi.port)
-                    {
+                for (int n = 0; n < writtenDests.count(); ++n) {
+                    if (writtenDests[n].addr == wi.addr && writtenDests[n].port == wi.port) {
                         at = n;
                         break;
                     }
                 }
 
-                if(at != -1)
-                {
+                if (at != -1) {
                     ++writtenDests[at].count;
-                }
-                else
-                {
+                } else {
                     Written wr;
-                    wr.addr = wi.addr;
-                    wr.port = wi.port;
+                    wr.addr  = wi.addr;
+                    wr.port  = wi.port;
                     wr.count = 1;
                     writtenDests += wr;
                 }
@@ -816,41 +697,36 @@ private slots:
     void bs_error(int e)
     {
         TurnClient::Error te;
-        if(qobject_cast<HttpConnect*>(bs))
-        {
-            if(e == HttpConnect::ErrConnectionRefused)
+        if (qobject_cast<HttpConnect *>(bs)) {
+            if (e == HttpConnect::ErrConnectionRefused)
                 te = TurnClient::ErrorConnect;
-            else if(e == HttpConnect::ErrHostNotFound)
+            else if (e == HttpConnect::ErrHostNotFound)
                 te = TurnClient::ErrorHostNotFound;
-            else if(e == HttpConnect::ErrProxyConnect)
+            else if (e == HttpConnect::ErrProxyConnect)
                 te = TurnClient::ErrorProxyConnect;
-            else if(e == HttpConnect::ErrProxyNeg)
+            else if (e == HttpConnect::ErrProxyNeg)
                 te = TurnClient::ErrorProxyNeg;
-            else if(e == HttpConnect::ErrProxyAuth)
+            else if (e == HttpConnect::ErrProxyAuth)
                 te = TurnClient::ErrorProxyAuth;
             else
                 te = TurnClient::ErrorStream;
-        }
-        else if(qobject_cast<SocksClient*>(bs))
-        {
-            if(e == SocksClient::ErrConnectionRefused)
+        } else if (qobject_cast<SocksClient *>(bs)) {
+            if (e == SocksClient::ErrConnectionRefused)
                 te = TurnClient::ErrorConnect;
-            else if(e == SocksClient::ErrHostNotFound)
+            else if (e == SocksClient::ErrHostNotFound)
                 te = TurnClient::ErrorHostNotFound;
-            else if(e == SocksClient::ErrProxyConnect)
+            else if (e == SocksClient::ErrProxyConnect)
                 te = TurnClient::ErrorProxyConnect;
-            else if(e == SocksClient::ErrProxyNeg)
+            else if (e == SocksClient::ErrProxyNeg)
                 te = TurnClient::ErrorProxyNeg;
-            else if(e == SocksClient::ErrProxyAuth)
+            else if (e == SocksClient::ErrProxyAuth)
                 te = TurnClient::ErrorProxyAuth;
             else
                 te = TurnClient::ErrorStream;
-        }
-        else
-        {
-            if(e == BSocket::ErrConnectionRefused)
+        } else {
+            if (e == BSocket::ErrConnectionRefused)
                 te = TurnClient::ErrorConnect;
-            else if(e == BSocket::ErrHostNotFound)
+            else if (e == BSocket::ErrHostNotFound)
                 te = TurnClient::ErrorHostNotFound;
             else
                 te = TurnClient::ErrorStream;
@@ -866,23 +742,17 @@ private slots:
         tlsHandshaken = true;
 
         ObjectSessionWatcher watch(&sess);
-        emit q->tlsHandshaken();
-        if(!watch.isValid())
+        emit                 q->tlsHandshaken();
+        if (!watch.isValid())
             return;
 
         tls->continueAfterStep();
         after_connected();
     }
 
-    void tls_readyRead()
-    {
-        processStream(tls->read());
-    }
+    void tls_readyRead() { processStream(tls->read()); }
 
-    void tls_readyReadOutgoing()
-    {
-        bs->write(tls->readOutgoing());
-    }
+    void tls_readyReadOutgoing() { bs->write(tls->readOutgoing()); }
 
     void tls_closed()
     {
@@ -907,26 +777,20 @@ private slots:
 
         writeItems += WriteItem(packet.size());
 
-        if(tls)
+        if (tls)
             tls->write(packet);
         else
             bs->write(packet);
     }
 
-    void pool_needAuthParams()
-    {
-        emit q->needAuthParams();
-    }
+    void pool_needAuthParams() { emit q->needAuthParams(); }
 
-    void pool_debugLine(const QString &line)
-    {
-        emit q->debugLine(line);
-    }
+    void pool_debugLine(const QString &line) { emit q->debugLine(line); }
 
     void allocate_started()
     {
         allocateStarted = true;
-        if(debugLevel >= TurnClient::DL_Info)
+        if (debugLevel >= TurnClient::DL_Info)
             emit q->debugLine("Allocate started");
 
         emit q->activated();
@@ -938,11 +802,11 @@ private slots:
         allocate = nullptr;
 
         // in udp mode, we don't own the pool
-        if(!udp)
+        if (!udp)
             delete pool;
         pool = nullptr;
 
-        if(udp)
+        if (udp)
             emit q->closed();
         else
             do_transport_close();
@@ -953,22 +817,20 @@ private slots:
         QString str = allocate->errorString();
 
         TurnClient::Error te;
-        if(e == StunAllocate::ErrorAuth)
+        if (e == StunAllocate::ErrorAuth)
             te = TurnClient::ErrorAuth;
-        else if(e == StunAllocate::ErrorRejected)
+        else if (e == StunAllocate::ErrorRejected)
             te = TurnClient::ErrorRejected;
-        else if(e == StunAllocate::ErrorProtocol)
+        else if (e == StunAllocate::ErrorProtocol)
             te = TurnClient::ErrorProtocol;
-        else if(e == StunAllocate::ErrorCapacity)
+        else if (e == StunAllocate::ErrorCapacity)
             te = TurnClient::ErrorCapacity;
-        else if(e == StunAllocate::ErrorMismatch)
-        {
-            if(!udp && handleRetry())
+        else if (e == StunAllocate::ErrorMismatch) {
+            if (!udp && handleRetry())
                 return;
 
             te = TurnClient::ErrorMismatch;
-        }
-        else
+        } else
             te = TurnClient::ErrorGeneric;
 
         cleanup();
@@ -978,7 +840,7 @@ private slots:
 
     void allocate_permissionsChanged()
     {
-        if(debugLevel >= TurnClient::DL_Info)
+        if (debugLevel >= TurnClient::DL_Info)
             emit q->debugLine("PermissionsChanged");
 
         tryChannelQueued();
@@ -987,45 +849,29 @@ private slots:
 
     void allocate_channelsChanged()
     {
-        if(debugLevel >= TurnClient::DL_Info)
+        if (debugLevel >= TurnClient::DL_Info)
             emit q->debugLine("ChannelsChanged");
 
         tryWriteQueued();
     }
 
-    void allocate_debugLine(const QString &line)
-    {
-        emit q->debugLine(line);
-    }
+    void allocate_debugLine(const QString &line) { emit q->debugLine(line); }
 };
 
-TurnClient::TurnClient(QObject *parent) :
-    QObject(parent)
-{
-    d = new Private(this);
-}
+TurnClient::TurnClient(QObject *parent) : QObject(parent) { d = new Private(this); }
 
-TurnClient::~TurnClient()
-{
-    delete d;
-}
+TurnClient::~TurnClient() { delete d; }
 
-void TurnClient::setProxy(const Proxy &proxy)
-{
-    d->proxy = proxy;
-}
+void TurnClient::setProxy(const Proxy &proxy) { d->proxy = proxy; }
 
-void TurnClient::setClientSoftwareNameAndVersion(const QString &str)
-{
-    d->clientSoftware = str;
-}
+void TurnClient::setClientSoftwareNameAndVersion(const QString &str) { d->clientSoftware = str; }
 
 void TurnClient::connectToHost(StunTransactionPool *pool, const QHostAddress &addr, int port)
 {
     d->serverAddr = addr;
     d->serverPort = port;
-    d->udp = true;
-    d->pool = pool;
+    d->udp        = true;
+    d->pool       = pool;
     d->in.clear();
     d->do_connect();
 }
@@ -1034,8 +880,8 @@ void TurnClient::connectToHost(const QHostAddress &addr, int port, Mode mode)
 {
     d->serverAddr = addr;
     d->serverPort = port;
-    d->udp = false;
-    d->mode = mode;
+    d->udp        = false;
+    d->mode       = mode;
     d->in.clear();
     d->do_connect();
 }
@@ -1045,14 +891,11 @@ QByteArray TurnClient::processIncomingDatagram(const QByteArray &buf, bool notSt
     return d->processNonPoolPacket(buf, notStun, addr, port);
 }
 
-void TurnClient::outgoingDatagramsWritten(int count)
-{
-    d->udp_datagramsWritten(count);
-}
+void TurnClient::outgoingDatagramsWritten(int count) { d->udp_datagramsWritten(count); }
 
 QString TurnClient::realm() const
 {
-    if(d->pool)
+    if (d->pool)
         return d->pool->realm();
     else
         return d->realm;
@@ -1061,21 +904,21 @@ QString TurnClient::realm() const
 void TurnClient::setUsername(const QString &username)
 {
     d->user = username;
-    if(d->pool)
+    if (d->pool)
         d->pool->setUsername(d->user);
 }
 
 void TurnClient::setPassword(const QCA::SecureArray &password)
 {
     d->pass = password;
-    if(d->pool)
+    if (d->pool)
         d->pool->setPassword(d->pass);
 }
 
 void TurnClient::setRealm(const QString &realm)
 {
     d->realm = realm;
-    if(d->pool)
+    if (d->pool)
         d->pool->setRealm(d->realm);
 }
 
@@ -1085,58 +928,35 @@ void TurnClient::continueAfterParams()
     d->pool->continueAfterParams();
 }
 
-void TurnClient::close()
-{
-    d->do_close();
-}
+void TurnClient::close() { d->do_close(); }
 
-StunAllocate *TurnClient::stunAllocate()
-{
-    return d->allocate;
-}
+StunAllocate *TurnClient::stunAllocate() { return d->allocate; }
 
-void TurnClient::addChannelPeer(const QHostAddress &addr, int port)
-{
-    d->addChannelPeer(addr, port);
-}
+void TurnClient::addChannelPeer(const QHostAddress &addr, int port) { d->addChannelPeer(addr, port); }
 
-int TurnClient::packetsToRead() const
-{
-    return d->in.count();
-}
+int TurnClient::packetsToRead() const { return d->in.count(); }
 
-int TurnClient::packetsToWrite() const
-{
-    return d->outPending.count() + d->outPendingWrite;
-}
+int TurnClient::packetsToWrite() const { return d->outPending.count() + d->outPendingWrite; }
 
 QByteArray TurnClient::read(QHostAddress *addr, int *port)
 {
-    if(!d->in.isEmpty())
-    {
+    if (!d->in.isEmpty()) {
         Private::Packet p = d->in.takeFirst();
-        *addr = p.addr;
-        *port = p.port;
+        *addr             = p.addr;
+        *port             = p.port;
         return p.data;
-    }
-    else
+    } else
         return QByteArray();
 }
 
-void TurnClient::write(const QByteArray &buf, const QHostAddress &addr, int port)
-{
-    d->writeOrQueue(buf, addr, port);
-}
+void TurnClient::write(const QByteArray &buf, const QHostAddress &addr, int port) { d->writeOrQueue(buf, addr, port); }
 
-QString TurnClient::errorString() const
-{
-    return d->errorString;
-}
+QString TurnClient::errorString() const { return d->errorString; }
 
 void TurnClient::setDebugLevel(DebugLevel level)
 {
     d->debugLevel = level;
-    if(d->pool)
+    if (d->pool)
         d->pool->setDebugLevel((StunTransactionPool::DebugLevel)level);
 }
 } // namespace XMPP
diff --git a/src/irisnet/noncore/turnclient.h b/src/irisnet/noncore/turnclient.h
index 74e7b6a7..69ccd7f8 100644
--- a/src/irisnet/noncore/turnclient.h
+++ b/src/irisnet/noncore/turnclient.h
@@ -25,20 +25,18 @@
 #include <QString>
 
 namespace QCA {
-    class SecureArray;
+class SecureArray;
 }
 
 namespace XMPP {
 class StunAllocate;
 class StunTransactionPool;
 
-class TurnClient : public QObject
-{
+class TurnClient : public QObject {
     Q_OBJECT
 
 public:
-    enum Error
-    {
+    enum Error {
         ErrorGeneric,
         ErrorHostNotFound,
         ErrorConnect,
@@ -66,34 +64,19 @@ class TurnClient : public QObject
         ErrorMismatch
     };
 
-    enum Mode
-    {
-        PlainMode,
-        TlsMode
-    };
+    enum Mode { PlainMode, TlsMode };
 
-    enum DebugLevel
-    {
-        DL_None,
-        DL_Info,
-        DL_Packet
-    };
+    enum DebugLevel { DL_None, DL_Info, DL_Packet };
 
     // adapted from XMPP::AdvancedConnector
-    class Proxy
-    {
+    class Proxy {
     public:
-        enum
-        {
-            None,
-            HttpConnect,
-            Socks
-        };
+        enum { None, HttpConnect, Socks };
 
         Proxy();
         ~Proxy();
 
-        int type() const;
+        int     type() const;
         QString host() const;
         quint16 port() const;
         QString user() const;
@@ -104,7 +87,7 @@ class TurnClient : public QObject
         void setUserPass(const QString &user, const QString &pass);
 
     private:
-        int t;
+        int     t;
         QString v_host;
         quint16 v_port;
         QString v_user, v_pass;
@@ -135,10 +118,10 @@ class TurnClient : public QObject
     void outgoingDatagramsWritten(int count);
 
     QString realm() const;
-    void setUsername(const QString &username);
-    void setPassword(const QCA::SecureArray &password);
-    void setRealm(const QString &realm);
-    void continueAfterParams();
+    void    setUsername(const QString &username);
+    void    setPassword(const QCA::SecureArray &password);
+    void    setRealm(const QString &realm);
+    void    continueAfterParams();
 
     void close();
 
@@ -165,7 +148,7 @@ class TurnClient : public QObject
     void tlsHandshaken();
     void closed();
     void needAuthParams();
-    void retrying(); // mismatch error received, starting all over
+    void retrying();  // mismatch error received, starting all over
     void activated(); // ready for read/write
 
     // TCP mode only
diff --git a/src/irisnet/noncore/udpportreserver.cpp b/src/irisnet/noncore/udpportreserver.cpp
index 94ded097..96ba77cc 100644
--- a/src/irisnet/noncore/udpportreserver.cpp
+++ b/src/irisnet/noncore/udpportreserver.cpp
@@ -22,37 +22,30 @@
 #include <stdlib.h>
 
 namespace XMPP {
-class UdpPortReserver::Private : public QObject
-{
+class UdpPortReserver::Private : public QObject {
     Q_OBJECT
 
 public:
-    class Item
-    {
+    class Item {
     public:
-        int port; // port to reserve
+        int  port; // port to reserve
         bool lent;
 
         // list of sockets for this port, one socket per address.
         //   note that we may have sockets bound for addresses
         //   we no longer care about, if we are currently lending
         //   them out
-        QList<QUdpSocket*> sockList;
+        QList<QUdpSocket *> sockList;
 
         // keep track of which addresses we lent out
         QList<QHostAddress> lentAddrs;
 
-        Item() :
-            port(-1),
-            lent(false)
-        {
-        }
+        Item() : port(-1), lent(false) {}
 
         bool haveAddress(const QHostAddress &addr) const
         {
-            foreach(const QUdpSocket *sock, sockList)
-            {
-                if(sock->localAddress() == addr)
+            foreach (const QUdpSocket *sock, sockList) {
+                if (sock->localAddress() == addr)
                     return true;
             }
 
@@ -60,36 +53,29 @@ class UdpPortReserver::Private : public QObject
         }
     };
 
-    UdpPortReserver *q;
+    UdpPortReserver *   q;
     QList<QHostAddress> addrs;
-    QList<int> ports; // sorted
-    QList<Item> items; // in order sorted by port
+    QList<int>          ports; // sorted
+    QList<Item>         items; // in order sorted by port
 
-    Private(UdpPortReserver *_q) :
-        QObject(_q),
-        q(_q)
-    {
-    }
+    Private(UdpPortReserver *_q) : QObject(_q), q(_q) {}
 
     ~Private()
     {
         bool lendingAny = false;
-        foreach(const Item &i, items)
-        {
-            if(i.lent)
-            {
+        foreach (const Item &i, items) {
+            if (i.lent) {
                 lendingAny = true;
                 break;
             }
         }
 
         Q_ASSERT(!lendingAny);
-        if(lendingAny)
+        if (lendingAny)
             abort();
 
-        foreach(const Item &i, items)
-        {
-            foreach(QUdpSocket *sock, i.sockList)
+        foreach (const Item &i, items) {
+            foreach (QUdpSocket *sock, i.sockList)
                 sock->deleteLater();
         }
     }
@@ -105,19 +91,16 @@ class UdpPortReserver::Private : public QObject
     void updatePorts(const QList<int> &newPorts)
     {
         QList<int> added;
-        foreach(int x, newPorts)
-        {
+        foreach (int x, newPorts) {
             bool found = false;
-            foreach(const Item &i, items)
-            {
-                if(i.port == x)
-                {
+            foreach (const Item &i, items) {
+                if (i.port == x) {
                     found = true;
                     break;
                 }
             }
 
-            if(!found)
+            if (!found)
                 added += x;
         }
 
@@ -126,13 +109,10 @@ class UdpPortReserver::Private : public QObject
         // keep ports in sorted order
         std::sort(ports.begin(), ports.end());
 
-        foreach(int x, added)
-        {
+        foreach (int x, added) {
             int insert_before = items.count();
-            for(int n = 0; n < items.count(); ++n)
-            {
-                if(x < items[n].port)
-                {
+            for (int n = 0; n < items.count(); ++n) {
+                if (x < items[n].port) {
                     insert_before = n;
                     break;
                 }
@@ -150,14 +130,12 @@ class UdpPortReserver::Private : public QObject
     bool reservedAll() const
     {
         bool ok = true;
-        foreach(const Item &i, items)
-        {
+        foreach (const Item &i, items) {
             // skip ports we don't care about
-            if(!ports.contains(i.port))
+            if (!ports.contains(i.port))
                 continue;
 
-            if(!isReserved(i))
-            {
+            if (!isReserved(i)) {
                 ok = false;
                 break;
             }
@@ -166,59 +144,50 @@ class UdpPortReserver::Private : public QObject
         return ok;
     }
 
-    QList<QUdpSocket*> borrowSockets(int portCount, QObject *parent)
+    QList<QUdpSocket *> borrowSockets(int portCount, QObject *parent)
     {
         Q_ASSERT(portCount > 0);
 
-        QList<QUdpSocket*> out;
+        QList<QUdpSocket *> out;
 
-        if(portCount > 1)
-        {
+        if (portCount > 1) {
             // first try to see if we can find something all in a
             //   row, starting with best alignment to worst
-            for(int align = portCount; align >= 2; align /= 2)
-            {
+            for (int align = portCount; align >= 2; align /= 2) {
                 int at = findConsecutive(portCount, align);
-                if(at != -1)
-                {
-                    for(int n = 0; n < portCount; ++n)
+                if (at != -1) {
+                    for (int n = 0; n < portCount; ++n)
                         out += lendItem(&items[at + n], parent);
 
                     break;
                 }
             }
 
-            if(out.isEmpty())
-            {
+            if (out.isEmpty()) {
                 // otherwise, try splitting them up into
                 //   smaller consecutive chunks
                 int chunks[2];
                 chunks[0] = portCount / 2 + (portCount % 2);
                 chunks[1] = portCount / 2;
-                for(int n = 0; n < 2; ++n)
+                for (int n = 0; n < 2; ++n)
                     out += borrowSockets(chunks[n], parent);
             }
-        }
-        else
-        {
+        } else {
             // take the next available port
             int at = findConsecutive(1, 1);
-            if(at != -1)
+            if (at != -1)
                 out += lendItem(&items[at], parent);
         }
 
         return out;
     }
 
-    void returnSockets(const QList<QUdpSocket*> &sockList)
+    void returnSockets(const QList<QUdpSocket *> &sockList)
     {
-        foreach(QUdpSocket *sock, sockList)
-        {
+        foreach (QUdpSocket *sock, sockList) {
             int at = -1;
-            for(int n = 0; n < items.count(); ++n)
-            {
-                if(items[n].sockList.contains(sock))
-                {
+            for (int n = 0; n < items.count(); ++n) {
+                if (items[n].sockList.contains(sock)) {
                     at = n;
                     break;
                 }
@@ -240,7 +209,7 @@ class UdpPortReserver::Private : public QObject
             connect(sock, SIGNAL(readyRead()), SLOT(sock_readyRead()));
 
             i.lentAddrs.removeAll(a);
-            if(i.lentAddrs.isEmpty())
+            if (i.lentAddrs.isEmpty())
                 i.lent = false;
         }
 
@@ -253,34 +222,30 @@ private slots:
         QUdpSocket *sock = static_cast<QUdpSocket *>(sender());
 
         // eat all packets
-        while(sock->hasPendingDatagrams())
+        while (sock->hasPendingDatagrams())
             sock->readDatagram(nullptr, 0);
     }
 
 private:
     void tryBind()
     {
-        for(int n = 0; n < items.count(); ++n)
-        {
+        for (int n = 0; n < items.count(); ++n) {
             Item &i = items[n];
 
             // skip ports we don't care about
-            if(!ports.contains(i.port))
+            if (!ports.contains(i.port))
                 continue;
 
             QList<QHostAddress> neededAddrs;
-            foreach(const QHostAddress &a, addrs)
-            {
-                if(!i.haveAddress(a))
+            foreach (const QHostAddress &a, addrs) {
+                if (!i.haveAddress(a))
                     neededAddrs += a;
             }
 
-            foreach(const QHostAddress &a, neededAddrs)
-            {
+            foreach (const QHostAddress &a, neededAddrs) {
                 QUdpSocket *sock = new QUdpSocket(q);
 
-                if(!sock->bind(a, i.port))
-                {
+                if (!sock->bind(a, i.port)) {
                     delete sock;
                     continue;
                 }
@@ -294,14 +259,12 @@ private slots:
 
     void tryCleanup()
     {
-        for(int n = 0; n < items.count(); ++n)
-        {
+        for (int n = 0; n < items.count(); ++n) {
             Item &i = items[n];
 
             // don't care about this port anymore?
-            if(!i.lent && !ports.contains(i.port))
-            {
-                foreach(QUdpSocket *sock, i.sockList)
+            if (!i.lent && !ports.contains(i.port)) {
+                foreach (QUdpSocket *sock, i.sockList)
                     sock->deleteLater();
 
                 items.removeAt(n);
@@ -310,14 +273,12 @@ private slots:
             }
 
             // any addresses we don't care about?
-            for(int k = 0; k < i.sockList.count(); ++k)
-            {
+            for (int k = 0; k < i.sockList.count(); ++k) {
                 QUdpSocket *sock = i.sockList[k];
 
                 QHostAddress a = sock->localAddress();
 
-                if(!addrs.contains(a) && !i.lentAddrs.contains(a))
-                {
+                if (!addrs.contains(a) && !i.lentAddrs.contains(a)) {
                     sock->deleteLater();
                     i.sockList.removeAt(k);
                     --k; // adjust position
@@ -330,12 +291,11 @@ private slots:
     bool isReserved(const Item &i) const
     {
         // must have desired addrs to consider a port reserved
-        if(addrs.isEmpty())
+        if (addrs.isEmpty())
             return false;
 
-        foreach(const QHostAddress &a, addrs)
-        {
-            if(!i.haveAddress(a))
+        foreach (const QHostAddress &a, addrs) {
+            if (!i.haveAddress(a))
                 return false;
         }
 
@@ -344,17 +304,16 @@ private slots:
 
     bool isConsecutive(int at, int count) const
     {
-        if(at + count > items.count())
+        if (at + count > items.count())
             return false;
 
-        for(int n = 0; n < count; ++n)
-        {
+        for (int n = 0; n < count; ++n) {
             const Item &i = items[at + n];
 
-            if(i.lent || !isReserved(i))
+            if (i.lent || !isReserved(i))
                 return false;
 
-            if(n > 0 && (i.port != items[at + n - 1].port + 1))
+            if (n > 0 && (i.port != items[at + n - 1].port + 1))
                 return false;
         }
 
@@ -363,22 +322,20 @@ private slots:
 
     int findConsecutive(int count, int align) const
     {
-        for(int n = 0; n < items.count(); n += align)
-        {
-            if(isConsecutive(n, count))
+        for (int n = 0; n < items.count(); n += align) {
+            if (isConsecutive(n, count))
                 return n;
         }
 
         return -1;
     }
 
-    QList<QUdpSocket*> lendItem(Item *i, QObject *parent)
+    QList<QUdpSocket *> lendItem(Item *i, QObject *parent)
     {
-        QList<QUdpSocket*> out;
+        QList<QUdpSocket *> out;
 
         i->lent = true;
-        foreach(QUdpSocket *sock, i->sockList)
-        {
+        foreach (QUdpSocket *sock, i->sockList) {
             i->lentAddrs += sock->localAddress();
             sock->disconnect(this);
             sock->setParent(parent);
@@ -389,49 +346,30 @@ private slots:
     }
 };
 
-UdpPortReserver::UdpPortReserver(QObject *parent) :
-    QObject(parent)
-{
-    d = new Private(this);
-}
+UdpPortReserver::UdpPortReserver(QObject *parent) : QObject(parent) { d = new Private(this); }
 
-UdpPortReserver::~UdpPortReserver()
-{
-    delete d;
-}
+UdpPortReserver::~UdpPortReserver() { delete d; }
 
-void UdpPortReserver::setAddresses(const QList<QHostAddress> &addrs)
-{
-    d->updateAddresses(addrs);
-}
+void UdpPortReserver::setAddresses(const QList<QHostAddress> &addrs) { d->updateAddresses(addrs); }
 
 void UdpPortReserver::setPorts(int start, int len)
 {
     QList<int> ports;
-    for(int n = 0; n < len; ++n)
+    for (int n = 0; n < len; ++n)
         ports += start + n;
     setPorts(ports);
 }
 
-void UdpPortReserver::setPorts(const QList<int> &ports)
-{
-    d->updatePorts(ports);
-}
+void UdpPortReserver::setPorts(const QList<int> &ports) { d->updatePorts(ports); }
 
-bool UdpPortReserver::reservedAll() const
-{
-    return d->reservedAll();
-}
+bool UdpPortReserver::reservedAll() const { return d->reservedAll(); }
 
-QList<QUdpSocket*> UdpPortReserver::borrowSockets(int portCount, QObject *parent)
+QList<QUdpSocket *> UdpPortReserver::borrowSockets(int portCount, QObject *parent)
 {
     return d->borrowSockets(portCount, parent);
 }
 
-void UdpPortReserver::returnSockets(const QList<QUdpSocket*> &sockList)
-{
-    d->returnSockets(sockList);
-}
+void UdpPortReserver::returnSockets(const QList<QUdpSocket *> &sockList) { d->returnSockets(sockList); }
 } // namespace XMPP
 
 #include "udpportreserver.moc"
diff --git a/src/irisnet/noncore/udpportreserver.h b/src/irisnet/noncore/udpportreserver.h
index 8604b38b..9043b9cd 100644
--- a/src/irisnet/noncore/udpportreserver.h
+++ b/src/irisnet/noncore/udpportreserver.h
@@ -31,8 +31,7 @@ namespace XMPP {
 //   (interfaces) and ports to reserve.  note that the port must be available
 //   on all addresses in order for it to get reserved.
 // note: you must return all sockets back to this class before destructing
-class UdpPortReserver : public QObject
-{
+class UdpPortReserver : public QObject {
     Q_OBJECT
 
 public:
@@ -57,9 +56,9 @@ class UdpPortReserver : public QObject
     //   able to bind to a port for it to be considered reserved, this
     //   function always returns a list with a size that is a multiple of
     //   the number of addresses.
-    QList<QUdpSocket*> borrowSockets(int portCount, QObject *parent = nullptr);
+    QList<QUdpSocket *> borrowSockets(int portCount, QObject *parent = nullptr);
 
-    void returnSockets(const QList<QUdpSocket*> &sockList);
+    void returnSockets(const QList<QUdpSocket *> &sockList);
 
 private:
     class Private;
diff --git a/src/xmpp/base/randomnumbergenerator.cpp b/src/xmpp/base/randomnumbergenerator.cpp
index 672c0611..f4521451 100644
--- a/src/xmpp/base/randomnumbergenerator.cpp
+++ b/src/xmpp/base/randomnumbergenerator.cpp
@@ -21,13 +21,11 @@
 #include <cassert>
 
 namespace XMPP {
-RandomNumberGenerator::~RandomNumberGenerator()
-{
-}
+RandomNumberGenerator::~RandomNumberGenerator() {}
 
 double RandomNumberGenerator::generateNumberBetween(double a, double b) const
 {
     assert(b > a);
-    return a + (generateNumber()/getMaximumGeneratedNumber())*(b-a);
+    return a + (generateNumber() / getMaximumGeneratedNumber()) * (b - a);
 }
 } // namespace XMPP
diff --git a/src/xmpp/base/randomnumbergenerator.h b/src/xmpp/base/randomnumbergenerator.h
index abadb9a9..458fc138 100644
--- a/src/xmpp/base/randomnumbergenerator.h
+++ b/src/xmpp/base/randomnumbergenerator.h
@@ -20,17 +20,16 @@
 #define RANDOMNUMBERGENERATOR_H
 
 namespace XMPP {
-    class RandomNumberGenerator
-    {
-        public:
-            virtual ~RandomNumberGenerator();
+class RandomNumberGenerator {
+public:
+    virtual ~RandomNumberGenerator();
 
-            double generateNumberBetween(double a, double b) const;
+    double generateNumberBetween(double a, double b) const;
 
-        protected:
-            virtual double generateNumber() const = 0;
-            virtual double getMaximumGeneratedNumber() const = 0;
-    };
+protected:
+    virtual double generateNumber() const            = 0;
+    virtual double getMaximumGeneratedNumber() const = 0;
+};
 } // namespace XMPP
 
 #endif // RANDOMNUMBERGENERATOR_H
diff --git a/src/xmpp/base/randrandomnumbergenerator.h b/src/xmpp/base/randrandomnumbergenerator.h
index 985786cf..9d03cfd5 100644
--- a/src/xmpp/base/randrandomnumbergenerator.h
+++ b/src/xmpp/base/randrandomnumbergenerator.h
@@ -24,19 +24,14 @@
 #include <cstdlib>
 
 namespace XMPP {
-    class RandRandomNumberGenerator : public RandomNumberGenerator
-    {
-        public:
-            RandRandomNumberGenerator() {}
+class RandRandomNumberGenerator : public RandomNumberGenerator {
+public:
+    RandRandomNumberGenerator() {}
 
-            virtual double generateNumber() const {
-                return rand();
-            }
+    virtual double generateNumber() const { return rand(); }
 
-            virtual double getMaximumGeneratedNumber() const {
-                return RAND_MAX;
-            }
-    };
+    virtual double getMaximumGeneratedNumber() const { return RAND_MAX; }
+};
 } // namespace XMPP
 
 #endif // RANDRANDOMNUMBERGENERATOR_H
diff --git a/src/xmpp/base/timezone.cpp b/src/xmpp/base/timezone.cpp
index 4e7e5d20..e31aef61 100644
--- a/src/xmpp/base/timezone.cpp
+++ b/src/xmpp/base/timezone.cpp
@@ -19,22 +19,22 @@
 #include "timezone.h"
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 2, 0)
-# include <QByteArray>
-# include <QTime>
-# ifdef Q_OS_UNIX
-#  include <time.h>
-# endif
-# ifdef Q_OS_WIN
-#  include <windows.h>
-# endif
+#include <QByteArray>
+#include <QTime>
+#ifdef Q_OS_UNIX
+#include <time.h>
+#endif
+#ifdef Q_OS_WIN
+#include <windows.h>
+#endif
 #else
-# include <QTimeZone>
+#include <QTimeZone>
 #endif
 #include <QtGlobal>
 
-#if QT_VERSION < QT_VERSION_CHECK(5,2,0)
-static bool inited = false;
-static int timezone_offset_;
+#if QT_VERSION < QT_VERSION_CHECK(5, 2, 0)
+static bool    inited = false;
+static int     timezone_offset_;
 static QString timezone_str_;
 
 static void init()
@@ -44,47 +44,48 @@ static void init()
     time(&x);
     char str[256];
     char fmt[32];
-    int size;
+    int  size;
     strcpy(fmt, "%z");
     size = strftime(str, 256, fmt, localtime(&x));
-    if(size && strncmp(fmt, str, size)) {
-        timezone_offset_ = QByteArray::fromRawData(str + 1, 2).toInt() * 60 + QByteArray::fromRawData(str + 3, 2).toInt();
-        if(str[0] == '-')
+    if (size && strncmp(fmt, str, size)) {
+        timezone_offset_
+            = QByteArray::fromRawData(str + 1, 2).toInt() * 60 + QByteArray::fromRawData(str + 3, 2).toInt();
+        if (str[0] == '-')
             timezone_offset_ = -timezone_offset_;
     }
     strcpy(fmt, "%Z");
     strftime(str, 256, fmt, localtime(&x));
-    if(strcmp(fmt, str))
+    if (strcmp(fmt, str))
         timezone_str_ = str;
 
 #elif defined(Q_OS_WIN)
     TIME_ZONE_INFORMATION i;
     memset(&i, 0, sizeof(i));
     bool inDST = (GetTimeZoneInformation(&i) == TIME_ZONE_ID_DAYLIGHT);
-    int bias = i.Bias;
-    if(inDST)
+    int  bias  = i.Bias;
+    if (inDST)
         bias += i.DaylightBias;
     timezone_offset_ = -bias;
-    timezone_str_ = "";
-    for(int n = 0; n < 32; ++n) {
+    timezone_str_    = "";
+    for (int n = 0; n < 32; ++n) {
         int w = inDST ? i.DaylightName[n] : i.StandardName[n];
-        if(w == 0)
+        if (w == 0)
             break;
         timezone_str_ += QChar(w);
     }
 
 #else
     qWarning("Failed to properly init timezone data. Use UTC offset instead");
-    inited = true;
+    inited           = true;
     timezone_offset_ = 0;
-    timezone_str_ = QLatin1String("N/A");
+    timezone_str_    = QLatin1String("N/A");
 #endif
 }
 #endif
 
 int TimeZone::offsetFromUtc()
 {
-#if QT_VERSION < QT_VERSION_CHECK(5,2,0)
+#if QT_VERSION < QT_VERSION_CHECK(5, 2, 0)
     if (!inited) {
         init();
     }
@@ -96,7 +97,7 @@ int TimeZone::offsetFromUtc()
 
 QString TimeZone::abbreviation()
 {
-#if QT_VERSION < QT_VERSION_CHECK(5,2,0)
+#if QT_VERSION < QT_VERSION_CHECK(5, 2, 0)
     return timezone_str_;
 #else
     return QTimeZone::systemTimeZone().abbreviation(QDateTime::currentDateTime());
diff --git a/src/xmpp/base/timezone.h b/src/xmpp/base/timezone.h
index d49cdc10..2a091c5a 100644
--- a/src/xmpp/base/timezone.h
+++ b/src/xmpp/base/timezone.h
@@ -21,12 +21,11 @@
 
 #include <QObject>
 
-class TimeZone
-{
+class TimeZone {
 public:
-    static int offsetFromUtc(); // in minutes
+    static int     offsetFromUtc(); // in minutes
     static QString abbreviation();
-    static int tzdToInt(const QString &tzd);
+    static int     tzdToInt(const QString &tzd);
 };
 
 #endif // IRIS_TIMEZONE_H
diff --git a/src/xmpp/base/unittest/incrementingrandomnumbergenerator.h b/src/xmpp/base/unittest/incrementingrandomnumbergenerator.h
index 132ea8b8..cde964f2 100644
--- a/src/xmpp/base/unittest/incrementingrandomnumbergenerator.h
+++ b/src/xmpp/base/unittest/incrementingrandomnumbergenerator.h
@@ -24,24 +24,25 @@
 #include <QtDebug>
 
 namespace XMPP {
-    class IncrementingRandomNumberGenerator : public RandomNumberGenerator
+class IncrementingRandomNumberGenerator : public RandomNumberGenerator {
+public:
+    IncrementingRandomNumberGenerator(int maximumNumber = 10) :
+        maximumNumber_(maximumNumber), currentNumber_(maximumNumber_)
     {
-        public:
-            IncrementingRandomNumberGenerator(int maximumNumber = 10) : maximumNumber_(maximumNumber), currentNumber_(maximumNumber_) {}
-
-            virtual double generateNumber() const {
-                currentNumber_ = (currentNumber_ + 1) % (maximumNumber_ + 1);
-                return currentNumber_;
-            }
-
-            virtual double getMaximumGeneratedNumber() const {
-                return maximumNumber_;
-            }
-
-        private:
-            int maximumNumber_;
-            mutable int currentNumber_;
-    };
+    }
+
+    virtual double generateNumber() const
+    {
+        currentNumber_ = (currentNumber_ + 1) % (maximumNumber_ + 1);
+        return currentNumber_;
+    }
+
+    virtual double getMaximumGeneratedNumber() const { return maximumNumber_; }
+
+private:
+    int         maximumNumber_;
+    mutable int currentNumber_;
+};
 } // namespace XMPP
 
 #endif // INCREMENTINGRANDOMNUMBERGENERATOR_H
diff --git a/src/xmpp/base/unittest/randomnumbergeneratortest.cpp b/src/xmpp/base/unittest/randomnumbergeneratortest.cpp
index d2b01c59..cba6b0aa 100644
--- a/src/xmpp/base/unittest/randomnumbergeneratortest.cpp
+++ b/src/xmpp/base/unittest/randomnumbergeneratortest.cpp
@@ -16,47 +16,48 @@
  *
  */
 
-#include "qttestutil/qttestutil.h"
 #include "xmpp/base/randomnumbergenerator.h"
+#include "qttestutil/qttestutil.h"
 
 #include <QObject>
 #include <QtTest/QtTest>
 
 using namespace XMPP;
 
-class RandomNumberGeneratorTest : public QObject
-{
-     Q_OBJECT
+class RandomNumberGeneratorTest : public QObject {
+    Q_OBJECT
+
+private:
+    class DummyRandomNumberGenerator : public RandomNumberGenerator {
+    public:
+        DummyRandomNumberGenerator(double value, double maximum) : value_(value), maximum_(maximum) {}
+
+        double generateNumber() const { return value_; }
+        double getMaximumGeneratedNumber() const { return maximum_; }
 
     private:
-        class DummyRandomNumberGenerator : public RandomNumberGenerator
-        {
-            public:
-                DummyRandomNumberGenerator(double value, double maximum) : value_(value), maximum_(maximum) {}
-
-                double generateNumber() const { return value_; }
-                double getMaximumGeneratedNumber() const { return maximum_; }
-
-            private:
-                double value_;
-                double maximum_;
-        };
-
-    private slots:
-        void testGenerateNumberBetween() {
-            DummyRandomNumberGenerator testling(5,10);
-            QCOMPARE(75.0, testling.generateNumberBetween(50.0, 100.0));
-        }
-
-        void testGenerateNumberBetween_Minimum() {
-            DummyRandomNumberGenerator testling(0,10);
-            QCOMPARE(0.0, testling.generateNumberBetween(0.0, 100.0));
-        }
-
-        void testGenerateNumberBetween_Maximum() {
-            DummyRandomNumberGenerator testling(10,10);
-            QCOMPARE(100.0, testling.generateNumberBetween(0.0, 100.0));
-        }
+        double value_;
+        double maximum_;
+    };
+
+private slots:
+    void testGenerateNumberBetween()
+    {
+        DummyRandomNumberGenerator testling(5, 10);
+        QCOMPARE(75.0, testling.generateNumberBetween(50.0, 100.0));
+    }
+
+    void testGenerateNumberBetween_Minimum()
+    {
+        DummyRandomNumberGenerator testling(0, 10);
+        QCOMPARE(0.0, testling.generateNumberBetween(0.0, 100.0));
+    }
+
+    void testGenerateNumberBetween_Maximum()
+    {
+        DummyRandomNumberGenerator testling(10, 10);
+        QCOMPARE(100.0, testling.generateNumberBetween(0.0, 100.0));
+    }
 };
 
 QTTESTUTIL_REGISTER_TEST(RandomNumberGeneratorTest);
diff --git a/src/xmpp/base/unittest/randrandomnumbergeneratortest.cpp b/src/xmpp/base/unittest/randrandomnumbergeneratortest.cpp
index a7255dd6..58ef5dbc 100644
--- a/src/xmpp/base/unittest/randrandomnumbergeneratortest.cpp
+++ b/src/xmpp/base/unittest/randrandomnumbergeneratortest.cpp
@@ -16,28 +16,28 @@
  *
  */
 
-#include "qttestutil/qttestutil.h"
 #include "xmpp/base/randrandomnumbergenerator.h"
+#include "qttestutil/qttestutil.h"
 
 #include <QObject>
 #include <QtTest/QtTest>
 
 using namespace XMPP;
 
-class RandRandomNumberGeneratorTest : public QObject
-{
-        Q_OBJECT
+class RandRandomNumberGeneratorTest : public QObject {
+    Q_OBJECT
 
-    private slots:
-        void testGenerateNumber() {
-            RandRandomNumberGenerator testling;
+private slots:
+    void testGenerateNumber()
+    {
+        RandRandomNumberGenerator testling;
 
-            double a = testling.generateNumberBetween(0.0,100.0);
-            double b = testling.generateNumberBetween(0.0,100.0);
+        double a = testling.generateNumberBetween(0.0, 100.0);
+        double b = testling.generateNumberBetween(0.0, 100.0);
 
-            QVERIFY(a != b);
-        }
- };
+        QVERIFY(a != b);
+    }
+};
 
 QTTESTUTIL_REGISTER_TEST(RandRandomNumberGeneratorTest);
 #include "randrandomnumbergeneratortest.moc"
diff --git a/src/xmpp/blake2/blake2-impl.h b/src/xmpp/blake2/blake2-impl.h
index 6369ac76..1197c651 100644
--- a/src/xmpp/blake2/blake2-impl.h
+++ b/src/xmpp/blake2/blake2-impl.h
@@ -19,142 +19,123 @@
 #include <string.h>
 
 #if !defined(__cplusplus) && (!defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L)
-  #if   defined(_MSC_VER)
-    #define BLAKE2_INLINE __inline
-  #elif defined(__GNUC__)
-    #define BLAKE2_INLINE __inline__
-  #else
-    #define BLAKE2_INLINE
-  #endif
+#if defined(_MSC_VER)
+#define BLAKE2_INLINE __inline
+#elif defined(__GNUC__)
+#define BLAKE2_INLINE __inline__
 #else
-  #define BLAKE2_INLINE inline
+#define BLAKE2_INLINE
+#endif
+#else
+#define BLAKE2_INLINE inline
 #endif
 
-static BLAKE2_INLINE uint32_t load32( const void *src )
+static BLAKE2_INLINE uint32_t load32(const void *src)
 {
 #if defined(NATIVE_LITTLE_ENDIAN)
-  uint32_t w;
-  memcpy(&w, src, sizeof w);
-  return w;
+    uint32_t w;
+    memcpy(&w, src, sizeof w);
+    return w;
 #else
-  const uint8_t *p = ( const uint8_t * )src;
-  return (( uint32_t )( p[0] ) <<  0) |
-         (( uint32_t )( p[1] ) <<  8) |
-         (( uint32_t )( p[2] ) << 16) |
-         (( uint32_t )( p[3] ) << 24) ;
+    const uint8_t *p = (const uint8_t *)src;
+    return ((uint32_t)(p[0]) << 0) | ((uint32_t)(p[1]) << 8) | ((uint32_t)(p[2]) << 16) | ((uint32_t)(p[3]) << 24);
 #endif
 }
 
-static BLAKE2_INLINE uint64_t load64( const void *src )
+static BLAKE2_INLINE uint64_t load64(const void *src)
 {
 #if defined(NATIVE_LITTLE_ENDIAN)
-  uint64_t w;
-  memcpy(&w, src, sizeof w);
-  return w;
+    uint64_t w;
+    memcpy(&w, src, sizeof w);
+    return w;
 #else
-  const uint8_t *p = ( const uint8_t * )src;
-  return (( uint64_t )( p[0] ) <<  0) |
-         (( uint64_t )( p[1] ) <<  8) |
-         (( uint64_t )( p[2] ) << 16) |
-         (( uint64_t )( p[3] ) << 24) |
-         (( uint64_t )( p[4] ) << 32) |
-         (( uint64_t )( p[5] ) << 40) |
-         (( uint64_t )( p[6] ) << 48) |
-         (( uint64_t )( p[7] ) << 56) ;
+    const uint8_t *p = (const uint8_t *)src;
+    return ((uint64_t)(p[0]) << 0) | ((uint64_t)(p[1]) << 8) | ((uint64_t)(p[2]) << 16) | ((uint64_t)(p[3]) << 24)
+        | ((uint64_t)(p[4]) << 32) | ((uint64_t)(p[5]) << 40) | ((uint64_t)(p[6]) << 48) | ((uint64_t)(p[7]) << 56);
 #endif
 }
 
-static BLAKE2_INLINE uint16_t load16( const void *src )
+static BLAKE2_INLINE uint16_t load16(const void *src)
 {
 #if defined(NATIVE_LITTLE_ENDIAN)
-  uint16_t w;
-  memcpy(&w, src, sizeof w);
-  return w;
+    uint16_t w;
+    memcpy(&w, src, sizeof w);
+    return w;
 #else
-  const uint8_t *p = ( const uint8_t * )src;
-  return ( uint16_t )((( uint32_t )( p[0] ) <<  0) |
-                      (( uint32_t )( p[1] ) <<  8));
+    const uint8_t *p = (const uint8_t *)src;
+    return (uint16_t)(((uint32_t)(p[0]) << 0) | ((uint32_t)(p[1]) << 8));
 #endif
 }
 
-static BLAKE2_INLINE void store16( void *dst, uint16_t w )
+static BLAKE2_INLINE void store16(void *dst, uint16_t w)
 {
 #if defined(NATIVE_LITTLE_ENDIAN)
-  memcpy(dst, &w, sizeof w);
+    memcpy(dst, &w, sizeof w);
 #else
-  uint8_t *p = ( uint8_t * )dst;
-  *p++ = ( uint8_t )w; w >>= 8;
-  *p++ = ( uint8_t )w;
+    uint8_t *p = (uint8_t *)dst;
+    *p++       = (uint8_t)w;
+    w >>= 8;
+    *p++       = (uint8_t)w;
 #endif
 }
 
-static BLAKE2_INLINE void store32( void *dst, uint32_t w )
+static BLAKE2_INLINE void store32(void *dst, uint32_t w)
 {
 #if defined(NATIVE_LITTLE_ENDIAN)
-  memcpy(dst, &w, sizeof w);
+    memcpy(dst, &w, sizeof w);
 #else
-  uint8_t *p = ( uint8_t * )dst;
-  p[0] = (uint8_t)(w >>  0);
-  p[1] = (uint8_t)(w >>  8);
-  p[2] = (uint8_t)(w >> 16);
-  p[3] = (uint8_t)(w >> 24);
+    uint8_t *p = (uint8_t *)dst;
+    p[0]       = (uint8_t)(w >> 0);
+    p[1]       = (uint8_t)(w >> 8);
+    p[2]       = (uint8_t)(w >> 16);
+    p[3]       = (uint8_t)(w >> 24);
 #endif
 }
 
-static BLAKE2_INLINE void store64( void *dst, uint64_t w )
+static BLAKE2_INLINE void store64(void *dst, uint64_t w)
 {
 #if defined(NATIVE_LITTLE_ENDIAN)
-  memcpy(dst, &w, sizeof w);
+    memcpy(dst, &w, sizeof w);
 #else
-  uint8_t *p = ( uint8_t * )dst;
-  p[0] = (uint8_t)(w >>  0);
-  p[1] = (uint8_t)(w >>  8);
-  p[2] = (uint8_t)(w >> 16);
-  p[3] = (uint8_t)(w >> 24);
-  p[4] = (uint8_t)(w >> 32);
-  p[5] = (uint8_t)(w >> 40);
-  p[6] = (uint8_t)(w >> 48);
-  p[7] = (uint8_t)(w >> 56);
+    uint8_t *p = (uint8_t *)dst;
+    p[0]       = (uint8_t)(w >> 0);
+    p[1]       = (uint8_t)(w >> 8);
+    p[2]       = (uint8_t)(w >> 16);
+    p[3]       = (uint8_t)(w >> 24);
+    p[4]       = (uint8_t)(w >> 32);
+    p[5]       = (uint8_t)(w >> 40);
+    p[6]       = (uint8_t)(w >> 48);
+    p[7]       = (uint8_t)(w >> 56);
 #endif
 }
 
-static BLAKE2_INLINE uint64_t load48( const void *src )
+static BLAKE2_INLINE uint64_t load48(const void *src)
 {
-  const uint8_t *p = ( const uint8_t * )src;
-  return (( uint64_t )( p[0] ) <<  0) |
-         (( uint64_t )( p[1] ) <<  8) |
-         (( uint64_t )( p[2] ) << 16) |
-         (( uint64_t )( p[3] ) << 24) |
-         (( uint64_t )( p[4] ) << 32) |
-         (( uint64_t )( p[5] ) << 40) ;
+    const uint8_t *p = (const uint8_t *)src;
+    return ((uint64_t)(p[0]) << 0) | ((uint64_t)(p[1]) << 8) | ((uint64_t)(p[2]) << 16) | ((uint64_t)(p[3]) << 24)
+        | ((uint64_t)(p[4]) << 32) | ((uint64_t)(p[5]) << 40);
 }
 
-static BLAKE2_INLINE void store48( void *dst, uint64_t w )
+static BLAKE2_INLINE void store48(void *dst, uint64_t w)
 {
-  uint8_t *p = ( uint8_t * )dst;
-  p[0] = (uint8_t)(w >>  0);
-  p[1] = (uint8_t)(w >>  8);
-  p[2] = (uint8_t)(w >> 16);
-  p[3] = (uint8_t)(w >> 24);
-  p[4] = (uint8_t)(w >> 32);
-  p[5] = (uint8_t)(w >> 40);
+    uint8_t *p = (uint8_t *)dst;
+    p[0]       = (uint8_t)(w >> 0);
+    p[1]       = (uint8_t)(w >> 8);
+    p[2]       = (uint8_t)(w >> 16);
+    p[3]       = (uint8_t)(w >> 24);
+    p[4]       = (uint8_t)(w >> 32);
+    p[5]       = (uint8_t)(w >> 40);
 }
 
-static BLAKE2_INLINE uint32_t rotr32( const uint32_t w, const unsigned c )
-{
-  return ( w >> c ) | ( w << ( 32 - c ) );
-}
+static BLAKE2_INLINE uint32_t rotr32(const uint32_t w, const unsigned c) { return (w >> c) | (w << (32 - c)); }
 
-static BLAKE2_INLINE uint64_t rotr64( const uint64_t w, const unsigned c )
-{
-  return ( w >> c ) | ( w << ( 64 - c ) );
-}
+static BLAKE2_INLINE uint64_t rotr64(const uint64_t w, const unsigned c) { return (w >> c) | (w << (64 - c)); }
 
 /* prevents compiler optimizing out memset() */
 static BLAKE2_INLINE void secure_zero_memory(void *v, size_t n)
 {
-  static void *(*const volatile memset_v)(void *, int, size_t) = &memset;
-  memset_v(v, 0, n);
+    static void *(*const volatile memset_v)(void *, int, size_t) = &memset;
+    memset_v(v, 0, n);
 }
 
 #endif // BLAKE2_IMPL_H
diff --git a/src/xmpp/blake2/blake2.h b/src/xmpp/blake2/blake2.h
index e547afb9..87bfeb40 100644
--- a/src/xmpp/blake2/blake2.h
+++ b/src/xmpp/blake2/blake2.h
@@ -28,26 +28,23 @@
 extern "C" {
 #endif
 
-  enum blake2s_constant
-  {
-    BLAKE2S_BLOCKBYTES = 64,
-    BLAKE2S_OUTBYTES   = 32,
-    BLAKE2S_KEYBYTES   = 32,
-    BLAKE2S_SALTBYTES  = 8,
+enum blake2s_constant {
+    BLAKE2S_BLOCKBYTES    = 64,
+    BLAKE2S_OUTBYTES      = 32,
+    BLAKE2S_KEYBYTES      = 32,
+    BLAKE2S_SALTBYTES     = 8,
     BLAKE2S_PERSONALBYTES = 8
-  };
-
-  enum blake2b_constant
-  {
-    BLAKE2B_BLOCKBYTES = 128,
-    BLAKE2B_OUTBYTES   = 64,
-    BLAKE2B_KEYBYTES   = 64,
-    BLAKE2B_SALTBYTES  = 16,
+};
+
+enum blake2b_constant {
+    BLAKE2B_BLOCKBYTES    = 128,
+    BLAKE2B_OUTBYTES      = 64,
+    BLAKE2B_KEYBYTES      = 64,
+    BLAKE2B_SALTBYTES     = 16,
     BLAKE2B_PERSONALBYTES = 16
-  };
+};
 
-  typedef struct blake2s_state__
-  {
+typedef struct blake2s_state__ {
     uint32_t h[8];
     uint32_t t[2];
     uint32_t f[2];
@@ -55,10 +52,9 @@ extern "C" {
     size_t   buflen;
     size_t   outlen;
     uint8_t  last_node;
-  } blake2s_state;
+} blake2s_state;
 
-  typedef struct blake2b_state__
-  {
+typedef struct blake2b_state__ {
     uint64_t h[8];
     uint64_t t[2];
     uint64_t f[2];
@@ -66,126 +62,120 @@ extern "C" {
     size_t   buflen;
     size_t   outlen;
     uint8_t  last_node;
-  } blake2b_state;
+} blake2b_state;
 
-  typedef struct blake2sp_state__
-  {
+typedef struct blake2sp_state__ {
     blake2s_state S[8][1];
     blake2s_state R[1];
     uint8_t       buf[8 * BLAKE2S_BLOCKBYTES];
     size_t        buflen;
     size_t        outlen;
-  } blake2sp_state;
+} blake2sp_state;
 
-  typedef struct blake2bp_state__
-  {
+typedef struct blake2bp_state__ {
     blake2b_state S[4][1];
     blake2b_state R[1];
     uint8_t       buf[4 * BLAKE2B_BLOCKBYTES];
     size_t        buflen;
     size_t        outlen;
-  } blake2bp_state;
+} blake2bp_state;
 
-  BLAKE2_PACKED(struct blake2s_param__
-  {
+BLAKE2_PACKED(struct blake2s_param__ {
     uint8_t  digest_length; /* 1 */
     uint8_t  key_length;    /* 2 */
     uint8_t  fanout;        /* 3 */
     uint8_t  depth;         /* 4 */
     uint32_t leaf_length;   /* 8 */
-    uint32_t node_offset;  /* 12 */
+    uint32_t node_offset;   /* 12 */
     uint16_t xof_length;    /* 14 */
     uint8_t  node_depth;    /* 15 */
     uint8_t  inner_length;  /* 16 */
     /* uint8_t  reserved[0]; */
-    uint8_t  salt[BLAKE2S_SALTBYTES]; /* 24 */
-    uint8_t  personal[BLAKE2S_PERSONALBYTES];  /* 32 */
-  });
-
-  typedef struct blake2s_param__ blake2s_param;
-
-  BLAKE2_PACKED(struct blake2b_param__
-  {
-    uint8_t  digest_length; /* 1 */
-    uint8_t  key_length;    /* 2 */
-    uint8_t  fanout;        /* 3 */
-    uint8_t  depth;         /* 4 */
-    uint32_t leaf_length;   /* 8 */
-    uint32_t node_offset;   /* 12 */
-    uint32_t xof_length;    /* 16 */
-    uint8_t  node_depth;    /* 17 */
-    uint8_t  inner_length;  /* 18 */
-    uint8_t  reserved[14];  /* 32 */
-    uint8_t  salt[BLAKE2B_SALTBYTES]; /* 48 */
-    uint8_t  personal[BLAKE2B_PERSONALBYTES];  /* 64 */
-  });
-
-  typedef struct blake2b_param__ blake2b_param;
-
-  typedef struct blake2xs_state__
-  {
+    uint8_t salt[BLAKE2S_SALTBYTES];         /* 24 */
+    uint8_t personal[BLAKE2S_PERSONALBYTES]; /* 32 */
+});
+
+typedef struct blake2s_param__ blake2s_param;
+
+BLAKE2_PACKED(struct blake2b_param__ {
+    uint8_t  digest_length;                   /* 1 */
+    uint8_t  key_length;                      /* 2 */
+    uint8_t  fanout;                          /* 3 */
+    uint8_t  depth;                           /* 4 */
+    uint32_t leaf_length;                     /* 8 */
+    uint32_t node_offset;                     /* 12 */
+    uint32_t xof_length;                      /* 16 */
+    uint8_t  node_depth;                      /* 17 */
+    uint8_t  inner_length;                    /* 18 */
+    uint8_t  reserved[14];                    /* 32 */
+    uint8_t  salt[BLAKE2B_SALTBYTES];         /* 48 */
+    uint8_t  personal[BLAKE2B_PERSONALBYTES]; /* 64 */
+});
+
+typedef struct blake2b_param__ blake2b_param;
+
+typedef struct blake2xs_state__ {
     blake2s_state S[1];
     blake2s_param P[1];
-  } blake2xs_state;
+} blake2xs_state;
 
-  typedef struct blake2xb_state__
-  {
+typedef struct blake2xb_state__ {
     blake2b_state S[1];
     blake2b_param P[1];
-  } blake2xb_state;
-
-  /* Padded structs result in a compile-time error */
-  enum {
-    BLAKE2_DUMMY_1 = 1/(sizeof(blake2s_param) == BLAKE2S_OUTBYTES),
-    BLAKE2_DUMMY_2 = 1/(sizeof(blake2b_param) == BLAKE2B_OUTBYTES)
-  };
-
-  /* Streaming API */
-  int blake2s_init( blake2s_state *S, size_t outlen );
-  int blake2s_init_key( blake2s_state *S, size_t outlen, const void *key, size_t keylen );
-  int blake2s_init_param( blake2s_state *S, const blake2s_param *P );
-  int blake2s_update( blake2s_state *S, const void *in, size_t inlen );
-  int blake2s_final( blake2s_state *S, void *out, size_t outlen );
-
-  int blake2b_init( blake2b_state *S, size_t outlen );
-  int blake2b_init_key( blake2b_state *S, size_t outlen, const void *key, size_t keylen );
-  int blake2b_init_param( blake2b_state *S, const blake2b_param *P );
-  int blake2b_update( blake2b_state *S, const void *in, size_t inlen );
-  int blake2b_final( blake2b_state *S, void *out, size_t outlen );
-
-  int blake2sp_init( blake2sp_state *S, size_t outlen );
-  int blake2sp_init_key( blake2sp_state *S, size_t outlen, const void *key, size_t keylen );
-  int blake2sp_update( blake2sp_state *S, const void *in, size_t inlen );
-  int blake2sp_final( blake2sp_state *S, void *out, size_t outlen );
-
-  int blake2bp_init( blake2bp_state *S, size_t outlen );
-  int blake2bp_init_key( blake2bp_state *S, size_t outlen, const void *key, size_t keylen );
-  int blake2bp_update( blake2bp_state *S, const void *in, size_t inlen );
-  int blake2bp_final( blake2bp_state *S, void *out, size_t outlen );
-
-  /* Variable output length API */
-  int blake2xs_init( blake2xs_state *S, const size_t outlen );
-  int blake2xs_init_key( blake2xs_state *S, const size_t outlen, const void *key, size_t keylen );
-  int blake2xs_update( blake2xs_state *S, const void *in, size_t inlen );
-  int blake2xs_final(blake2xs_state *S, void *out, size_t outlen);
-
-  int blake2xb_init( blake2xb_state *S, const size_t outlen );
-  int blake2xb_init_key( blake2xb_state *S, const size_t outlen, const void *key, size_t keylen );
-  int blake2xb_update( blake2xb_state *S, const void *in, size_t inlen );
-  int blake2xb_final(blake2xb_state *S, void *out, size_t outlen);
-
-  /* Simple API */
-  int blake2s( void *out, size_t outlen, const void *in, size_t inlen, const void *key, size_t keylen );
-  int blake2b( void *out, size_t outlen, const void *in, size_t inlen, const void *key, size_t keylen );
-
-  int blake2sp( void *out, size_t outlen, const void *in, size_t inlen, const void *key, size_t keylen );
-  int blake2bp( void *out, size_t outlen, const void *in, size_t inlen, const void *key, size_t keylen );
-
-  int blake2xs( void *out, size_t outlen, const void *in, size_t inlen, const void *key, size_t keylen );
-  int blake2xb( void *out, size_t outlen, const void *in, size_t inlen, const void *key, size_t keylen );
-
-  /* This is simply an alias for blake2b */
-  int blake2( void *out, size_t outlen, const void *in, size_t inlen, const void *key, size_t keylen );
+} blake2xb_state;
+
+/* Padded structs result in a compile-time error */
+enum {
+    BLAKE2_DUMMY_1 = 1 / (sizeof(blake2s_param) == BLAKE2S_OUTBYTES),
+    BLAKE2_DUMMY_2 = 1 / (sizeof(blake2b_param) == BLAKE2B_OUTBYTES)
+};
+
+/* Streaming API */
+int blake2s_init(blake2s_state *S, size_t outlen);
+int blake2s_init_key(blake2s_state *S, size_t outlen, const void *key, size_t keylen);
+int blake2s_init_param(blake2s_state *S, const blake2s_param *P);
+int blake2s_update(blake2s_state *S, const void *in, size_t inlen);
+int blake2s_final(blake2s_state *S, void *out, size_t outlen);
+
+int blake2b_init(blake2b_state *S, size_t outlen);
+int blake2b_init_key(blake2b_state *S, size_t outlen, const void *key, size_t keylen);
+int blake2b_init_param(blake2b_state *S, const blake2b_param *P);
+int blake2b_update(blake2b_state *S, const void *in, size_t inlen);
+int blake2b_final(blake2b_state *S, void *out, size_t outlen);
+
+int blake2sp_init(blake2sp_state *S, size_t outlen);
+int blake2sp_init_key(blake2sp_state *S, size_t outlen, const void *key, size_t keylen);
+int blake2sp_update(blake2sp_state *S, const void *in, size_t inlen);
+int blake2sp_final(blake2sp_state *S, void *out, size_t outlen);
+
+int blake2bp_init(blake2bp_state *S, size_t outlen);
+int blake2bp_init_key(blake2bp_state *S, size_t outlen, const void *key, size_t keylen);
+int blake2bp_update(blake2bp_state *S, const void *in, size_t inlen);
+int blake2bp_final(blake2bp_state *S, void *out, size_t outlen);
+
+/* Variable output length API */
+int blake2xs_init(blake2xs_state *S, const size_t outlen);
+int blake2xs_init_key(blake2xs_state *S, const size_t outlen, const void *key, size_t keylen);
+int blake2xs_update(blake2xs_state *S, const void *in, size_t inlen);
+int blake2xs_final(blake2xs_state *S, void *out, size_t outlen);
+
+int blake2xb_init(blake2xb_state *S, const size_t outlen);
+int blake2xb_init_key(blake2xb_state *S, const size_t outlen, const void *key, size_t keylen);
+int blake2xb_update(blake2xb_state *S, const void *in, size_t inlen);
+int blake2xb_final(blake2xb_state *S, void *out, size_t outlen);
+
+/* Simple API */
+int blake2s(void *out, size_t outlen, const void *in, size_t inlen, const void *key, size_t keylen);
+int blake2b(void *out, size_t outlen, const void *in, size_t inlen, const void *key, size_t keylen);
+
+int blake2sp(void *out, size_t outlen, const void *in, size_t inlen, const void *key, size_t keylen);
+int blake2bp(void *out, size_t outlen, const void *in, size_t inlen, const void *key, size_t keylen);
+
+int blake2xs(void *out, size_t outlen, const void *in, size_t inlen, const void *key, size_t keylen);
+int blake2xb(void *out, size_t outlen, const void *in, size_t inlen, const void *key, size_t keylen);
+
+/* This is simply an alias for blake2b */
+int blake2(void *out, size_t outlen, const void *in, size_t inlen, const void *key, size_t keylen);
 
 #if defined(__cplusplus)
 }
diff --git a/src/xmpp/blake2/blake2qt.cpp b/src/xmpp/blake2/blake2qt.cpp
index 381d5b58..ea9bfec6 100644
--- a/src/xmpp/blake2/blake2qt.cpp
+++ b/src/xmpp/blake2/blake2qt.cpp
@@ -8,7 +8,7 @@ namespace XMPP {
 QByteArray computeBlake2Hash(const QByteArray &ba, Blake2DigestSize digestSize)
 {
     QByteArray ret;
-    int retCode;
+    int        retCode;
     if (digestSize == Blake2Digest256) {
         ret.reserve(BLAKE2S_OUTBYTES);
         retCode = blake2s(ret.data(), BLAKE2S_OUTBYTES, ba.data(), ba.size(), nullptr, 0);
@@ -26,7 +26,7 @@ QByteArray computeBlake2Hash(const QByteArray &ba, Blake2DigestSize digestSize)
 
 static QByteArray computeBlake2Hash256(QIODevice *dev)
 {
-    int retCode;
+    int           retCode;
     blake2s_state state;
 
     if (!dev->isOpen()) {
@@ -60,7 +60,7 @@ static QByteArray computeBlake2Hash256(QIODevice *dev)
 
 static QByteArray computeBlake2Hash512(QIODevice *dev)
 {
-    int retCode;
+    int           retCode;
     blake2b_state state;
 
     if (!dev->isOpen()) {
@@ -101,4 +101,4 @@ QByteArray computeBlake2Hash(QIODevice *dev, Blake2DigestSize digestSize)
         return computeBlake2Hash512(dev);
     }
 }
-} //namespace XMPP
+} // namespace XMPP
diff --git a/src/xmpp/blake2/blake2qt.h b/src/xmpp/blake2/blake2qt.h
index 78f08481..e9f9f65f 100644
--- a/src/xmpp/blake2/blake2qt.h
+++ b/src/xmpp/blake2/blake2qt.h
@@ -6,10 +6,7 @@
 class QIODevice;
 
 namespace XMPP {
-enum Blake2DigestSize {
-    Blake2Digest256,
-    Blake2Digest512
-};
+enum Blake2DigestSize { Blake2Digest256, Blake2Digest512 };
 
 QByteArray computeBlake2Hash(const QByteArray &ba, Blake2DigestSize digestSize);
 QByteArray computeBlake2Hash(QIODevice *dev, Blake2DigestSize digestSize);
diff --git a/src/xmpp/jid/jid.cpp b/src/xmpp/jid/jid.cpp
index e33b8682..e1149d07 100644
--- a/src/xmpp/jid/jid.cpp
+++ b/src/xmpp/jid/jid.cpp
@@ -20,7 +20,7 @@
 #include "xmpp/jid/jid.h"
 
 #ifndef NO_IRISNET
-#    include "irisnetglobal_p.h"
+#include "irisnetglobal_p.h"
 #endif
 
 #include <QCoreApplication>
@@ -31,169 +31,156 @@ using namespace XMPP;
 //----------------------------------------------------------------------------
 // StringPrepCache
 //----------------------------------------------------------------------------
-    QScopedPointer<StringPrepCache> StringPrepCache::_instance;
+QScopedPointer<StringPrepCache> StringPrepCache::_instance;
 
-    bool StringPrepCache::nameprep(const QString &in, int maxbytes, QString& out)
-    {
-        if (in.trimmed().isEmpty()) {
-            out = QString();
-            return false; // empty names or just spaces are disallowed (rfc5892+rfc6122)
-        }
-
-        StringPrepCache *that = instance();
+bool StringPrepCache::nameprep(const QString &in, int maxbytes, QString &out)
+{
+    if (in.trimmed().isEmpty()) {
+        out = QString();
+        return false; // empty names or just spaces are disallowed (rfc5892+rfc6122)
+    }
 
-        auto it = that->nameprep_table.constFind(in);\
-        if (it != that->nameprep_table.constEnd()) {
-            if (it.value().isNull()) {
-                return false;
-            }
-            out = it.value();
-            return true;
-        }
+    StringPrepCache *that = instance();
 
-        QByteArray cs = in.toUtf8();
-        cs.resize(maxbytes);
-        if(stringprep(cs.data(), maxbytes, (Stringprep_profile_flags)0, stringprep_nameprep) != 0)
-        {
-            that->nameprep_table.insert(in, QString());
+    auto it = that->nameprep_table.constFind(in);
+    if (it != that->nameprep_table.constEnd()) {
+        if (it.value().isNull()) {
             return false;
         }
-
-        QString norm = QString::fromUtf8(cs);
-        that->nameprep_table.insert(in, norm);
-        out = norm;
+        out = it.value();
         return true;
     }
 
-    bool StringPrepCache::nodeprep(const QString &in, int maxbytes, QString& out)
-    {
-        if(in.isEmpty()) {
-            out = QString();
-            return true;
-        }
+    QByteArray cs = in.toUtf8();
+    cs.resize(maxbytes);
+    if (stringprep(cs.data(), maxbytes, (Stringprep_profile_flags)0, stringprep_nameprep) != 0) {
+        that->nameprep_table.insert(in, QString());
+        return false;
+    }
 
-        StringPrepCache *that = instance();
+    QString norm = QString::fromUtf8(cs);
+    that->nameprep_table.insert(in, norm);
+    out = norm;
+    return true;
+}
 
-        auto it = that->nodeprep_table.constFind(in);\
-        if (it != that->nodeprep_table.constEnd()) {
-            if (it.value().isNull()) {
-                return false;
-            }
-            out = it.value();
-            return true;
-        }
+bool StringPrepCache::nodeprep(const QString &in, int maxbytes, QString &out)
+{
+    if (in.isEmpty()) {
+        out = QString();
+        return true;
+    }
 
-        QByteArray cs = in.toUtf8();
-        cs.resize(maxbytes);
-        if(stringprep(cs.data(), maxbytes, (Stringprep_profile_flags)0, stringprep_xmpp_nodeprep) != 0) {
-            that->nodeprep_table.insert(in, QString());
+    StringPrepCache *that = instance();
+
+    auto it = that->nodeprep_table.constFind(in);
+    if (it != that->nodeprep_table.constEnd()) {
+        if (it.value().isNull()) {
             return false;
         }
-
-        QString norm = QString::fromUtf8(cs);
-        that->nodeprep_table.insert(in, norm);
-        out = norm;
+        out = it.value();
         return true;
     }
 
-    bool StringPrepCache::resourceprep(const QString &in, int maxbytes, QString& out)
-    {
-        if(in.isEmpty()) {
-            out = QString();
-            return true;
-        }
+    QByteArray cs = in.toUtf8();
+    cs.resize(maxbytes);
+    if (stringprep(cs.data(), maxbytes, (Stringprep_profile_flags)0, stringprep_xmpp_nodeprep) != 0) {
+        that->nodeprep_table.insert(in, QString());
+        return false;
+    }
 
-        StringPrepCache *that = instance();
+    QString norm = QString::fromUtf8(cs);
+    that->nodeprep_table.insert(in, norm);
+    out = norm;
+    return true;
+}
 
-        auto it = that->resourceprep_table.constFind(in);\
-        if (it != that->resourceprep_table.constEnd()) {
-            if (it.value().isNull()) {
-                return false;
-            }
-            out = it.value();
-            return true;
-        }
+bool StringPrepCache::resourceprep(const QString &in, int maxbytes, QString &out)
+{
+    if (in.isEmpty()) {
+        out = QString();
+        return true;
+    }
 
-        QByteArray cs = in.toUtf8();
-        cs.resize(maxbytes);
-        if(stringprep(cs.data(), maxbytes, (Stringprep_profile_flags)0, stringprep_xmpp_resourceprep) != 0) {
-            that->resourceprep_table.insert(in, QString());
+    StringPrepCache *that = instance();
+
+    auto it = that->resourceprep_table.constFind(in);
+    if (it != that->resourceprep_table.constEnd()) {
+        if (it.value().isNull()) {
             return false;
         }
-
-        QString norm = QString::fromUtf8(cs);
-        that->resourceprep_table.insert(in, norm);
-        out = norm;
+        out = it.value();
         return true;
     }
 
-    bool StringPrepCache::saslprep(const QString &in, int maxbytes, QString& out)
-    {
-        if(in.isEmpty()) {
-            out = QString();
-            return true;
-        }
+    QByteArray cs = in.toUtf8();
+    cs.resize(maxbytes);
+    if (stringprep(cs.data(), maxbytes, (Stringprep_profile_flags)0, stringprep_xmpp_resourceprep) != 0) {
+        that->resourceprep_table.insert(in, QString());
+        return false;
+    }
 
-        StringPrepCache *that = instance();
+    QString norm = QString::fromUtf8(cs);
+    that->resourceprep_table.insert(in, norm);
+    out = norm;
+    return true;
+}
 
-        auto it = that->saslprep_table.constFind(in);\
-        if (it != that->saslprep_table.constEnd()) {
-            if (it.value().isNull()) {
-                return false;
-            }
-            out = it.value();
-            return true;
-        }
+bool StringPrepCache::saslprep(const QString &in, int maxbytes, QString &out)
+{
+    if (in.isEmpty()) {
+        out = QString();
+        return true;
+    }
 
-        QByteArray cs = in.toUtf8();
-        cs.resize(maxbytes);
-        if(stringprep(cs.data(), maxbytes, (Stringprep_profile_flags)0, stringprep_saslprep) != 0) {
-            that->saslprep_table.insert(in, QString());
+    StringPrepCache *that = instance();
+
+    auto it = that->saslprep_table.constFind(in);
+    if (it != that->saslprep_table.constEnd()) {
+        if (it.value().isNull()) {
             return false;
         }
-
-        QString norm = QString::fromUtf8(cs);
-        that->saslprep_table.insert(in, norm);
-        out = norm;
+        out = it.value();
         return true;
     }
 
-    void StringPrepCache::cleanup()
-    {
-        _instance.reset(nullptr);
+    QByteArray cs = in.toUtf8();
+    cs.resize(maxbytes);
+    if (stringprep(cs.data(), maxbytes, (Stringprep_profile_flags)0, stringprep_saslprep) != 0) {
+        that->saslprep_table.insert(in, QString());
+        return false;
     }
 
-    StringPrepCache *StringPrepCache::instance()
-    {
-        if(!_instance)
-        {
-            _instance.reset(new StringPrepCache);
+    QString norm = QString::fromUtf8(cs);
+    that->saslprep_table.insert(in, norm);
+    out = norm;
+    return true;
+}
+
+void StringPrepCache::cleanup() { _instance.reset(nullptr); }
+
+StringPrepCache *StringPrepCache::instance()
+{
+    if (!_instance) {
+        _instance.reset(new StringPrepCache);
 #ifndef NO_IRISNET
-            irisNetAddPostRoutine(cleanup); // REVIEW probably not necessary since heap will be deallocated with destructors
+        irisNetAddPostRoutine(cleanup); // REVIEW probably not necessary since heap will be deallocated with destructors
 #endif
-        }
-        return _instance.data();
     }
+    return _instance.data();
+}
 
-    StringPrepCache::StringPrepCache()
-    {
-    }
+StringPrepCache::StringPrepCache() {}
 
 //----------------------------------------------------------------------------
 // Jid
 //----------------------------------------------------------------------------
 //
-static inline bool validDomain(const QString &s, QString& norm)
-{
-    return StringPrepCache::nameprep(s, 1024, norm);
-}
+static inline bool validDomain(const QString &s, QString &norm) { return StringPrepCache::nameprep(s, 1024, norm); }
 
-static inline bool validNode(const QString &s, QString& norm)
-{
-    return StringPrepCache::nodeprep(s, 1024, norm);
-}
+static inline bool validNode(const QString &s, QString &norm) { return StringPrepCache::nodeprep(s, 1024, norm); }
 
-static inline bool validResource(const QString &s, QString& norm)
+static inline bool validResource(const QString &s, QString &norm)
 {
     return StringPrepCache::resourceprep(s, 1024, norm);
 }
@@ -201,35 +188,24 @@ static inline bool validResource(const QString &s, QString& norm)
 Jid::Jid()
 {
     valid = false;
-    null = true;
+    null  = true;
 }
 
-Jid::~Jid()
-{
-}
+Jid::~Jid() {}
 
-Jid::Jid(const QString &s)
-{
-    set(s);
-}
+Jid::Jid(const QString &s) { set(s); }
 
-Jid::Jid(const QString &node, const QString& domain, const QString& resource)
-{
-    set(domain, node, resource);
-}
+Jid::Jid(const QString &node, const QString &domain, const QString &resource) { set(domain, node, resource); }
 
-Jid::Jid(const char *s)
-{
-    set(QString(s));
-}
+Jid::Jid(const char *s) { set(QString(s)); }
 
-Jid & Jid::operator=(const QString &s)
+Jid &Jid::operator=(const QString &s)
 {
     set(s);
     return *this;
 }
 
-Jid & Jid::operator=(const char *s)
+Jid &Jid::operator=(const char *s)
 {
     set(QString(s));
     return *this;
@@ -237,27 +213,27 @@ Jid & Jid::operator=(const char *s)
 
 void Jid::reset()
 {
-    f = QString();
-    b = QString();
-    d = QString();
-    n = QString();
-    r = QString();
+    f     = QString();
+    b     = QString();
+    d     = QString();
+    n     = QString();
+    r     = QString();
     valid = false;
-    null = true;
+    null  = true;
 }
 
 void Jid::update()
 {
     // build 'bare' and 'full' jids
-    if(n.isEmpty())
+    if (n.isEmpty())
         b = d;
     else
         b = n + '@' + d;
-    if(r.isEmpty())
+    if (r.isEmpty())
         f = b;
     else
         f = b + '/' + r;
-    if(f.isEmpty())
+    if (f.isEmpty())
         valid = false;
     null = f.isEmpty() && r.isEmpty();
 }
@@ -266,66 +242,61 @@ void Jid::set(const QString &s)
 {
     QString rest, domain, node, resource;
     QString norm_domain, norm_node, norm_resource;
-    int x = s.indexOf('/');
-    if(x != -1) {
-        rest = s.mid(0, x);
-        resource = s.mid(x+1);
-    }
-    else {
-        rest = s;
+    int     x = s.indexOf('/');
+    if (x != -1) {
+        rest     = s.mid(0, x);
+        resource = s.mid(x + 1);
+    } else {
+        rest     = s;
         resource = QString();
     }
-    if(!validResource(resource, norm_resource)) {
+    if (!validResource(resource, norm_resource)) {
         reset();
         return;
     }
 
     x = rest.indexOf('@');
-    if(x != -1) {
-        node = rest.mid(0, x);
-        domain = rest.mid(x+1);
-    }
-    else {
-        node = QString();
+    if (x != -1) {
+        node   = rest.mid(0, x);
+        domain = rest.mid(x + 1);
+    } else {
+        node   = QString();
         domain = rest;
     }
-    if(!validDomain(domain, norm_domain) || !validNode(node, norm_node)) {
+    if (!validDomain(domain, norm_domain) || !validNode(node, norm_node)) {
         reset();
         return;
     }
 
     valid = true;
-    null = false;
-    d = norm_domain;
-    n = norm_node;
-    r = norm_resource;
+    null  = false;
+    d     = norm_domain;
+    n     = norm_node;
+    r     = norm_resource;
     update();
 }
 
 void Jid::set(const QString &domain, const QString &node, const QString &resource)
 {
     QString norm_domain, norm_node, norm_resource;
-    if(!validDomain(domain, norm_domain) ||
-            !validNode(node, norm_node) ||
-            !validResource(resource, norm_resource))
-    {
+    if (!validDomain(domain, norm_domain) || !validNode(node, norm_node) || !validResource(resource, norm_resource)) {
         reset();
         return;
     }
     valid = true;
-    null = false;
-    d = norm_domain;
-    n = norm_node;
-    r = norm_resource;
+    null  = false;
+    d     = norm_domain;
+    n     = norm_node;
+    r     = norm_resource;
     update();
 }
 
 void Jid::setDomain(const QString &s)
 {
-    if(!valid)
+    if (!valid)
         return;
     QString norm;
-    if(!validDomain(s, norm)) {
+    if (!validDomain(s, norm)) {
         reset();
         return;
     }
@@ -335,10 +306,10 @@ void Jid::setDomain(const QString &s)
 
 void Jid::setNode(const QString &s)
 {
-    if(!valid)
+    if (!valid)
         return;
     QString norm;
-    if(!validNode(s, norm)) {
+    if (!validNode(s, norm)) {
         reset();
         return;
     }
@@ -348,10 +319,10 @@ void Jid::setNode(const QString &s)
 
 void Jid::setResource(const QString &s)
 {
-    if(!valid)
+    if (!valid)
         return;
     QString norm;
-    if(!validResource(s, norm)) {
+    if (!validResource(s, norm)) {
         reset();
         return;
     }
@@ -380,26 +351,20 @@ Jid Jid::withResource(const QString &s) const
     return j;
 }
 
-bool Jid::isValid() const
-{
-    return valid;
-}
+bool Jid::isValid() const { return valid; }
 
-bool Jid::isEmpty() const
-{
-    return f.isEmpty();
-}
+bool Jid::isEmpty() const { return f.isEmpty(); }
 
 bool Jid::compare(const Jid &a, bool compareRes) const
 {
-    if(null && a.null)
+    if (null && a.null)
         return true;
 
     // only compare valid jids
-    if(!valid || !a.valid)
+    if (!valid || !a.valid)
         return false;
 
-    if(compareRes ? (f != a.f) : (b != a.b))
+    if (compareRes ? (f != a.f) : (b != a.b))
         return false;
 
     return true;
diff --git a/src/xmpp/jid/jid.h b/src/xmpp/jid/jid.h
index b334150b..85a36ad6 100644
--- a/src/xmpp/jid/jid.h
+++ b/src/xmpp/jid/jid.h
@@ -26,77 +26,75 @@
 #include <QString>
 
 namespace XMPP {
-    class StringPrepCache
-    {
-    public:
-        static bool nameprep(const QString &in, int maxbytes, QString& out);
-        static bool nodeprep(const QString &in, int maxbytes, QString& out);
-        static bool resourceprep(const QString &in, int maxbytes, QString& out);
-        static bool saslprep(const QString &in, int maxbytes, QString& out);
-
-        static void cleanup();
-    private:
-
-        QHash<QString,QString> nameprep_table;
-        QHash<QString,QString> nodeprep_table;
-        QHash<QString,QString> resourceprep_table;
-        QHash<QString,QString> saslprep_table;
-
-        static QScopedPointer<StringPrepCache> _instance;
-        static StringPrepCache *instance();
-
-        StringPrepCache();
-    };
-
-    class Jid
-    {
-    public:
-        Jid();
-        ~Jid();
-
-        Jid(const QString &s);
-        Jid(const QString &node, const QString& domain, const QString& resource = "");
-        Jid(const char *s);
-        Jid & operator=(const QString &s);
-        Jid & operator=(const char *s);
-
-        bool isNull() const { return null; }
-        const QString & domain() const { return d; }
-        const QString & node() const { return n; }
-        const QString & resource() const { return r; }
-        const QString & bare() const { return b; }
-        const QString & full() const { return f; }
-
-        Jid withNode(const QString &s) const;
-        Jid withDomain(const QString &s) const;
-        Jid withResource(const QString &s) const;
-
-        bool isValid() const;
-        bool isEmpty() const;
-        bool compare(const Jid &a, bool compareRes=true) const;
-        inline bool operator==(const Jid &other) const { return compare(other, true); }
-        inline bool operator!=(const Jid &other) const { return !(*this == other); }
-
-    private:
-        void set(const QString &s);
-        void set(const QString &domain, const QString &node, const QString &resource="");
-
-        void setDomain(const QString &s);
-        void setNode(const QString &s);
-        void setResource(const QString &s);
-
-    private:
-        void reset();
-        void update();
-
-        QString f, b, d, n, r;
-        bool valid, null;
-    };
-
-    Q_DECL_PURE_FUNCTION inline uint qHash(const XMPP::Jid &key, uint seed = 0) Q_DECL_NOTHROW
-    {
-        return qHash(key.full(), seed);
-    }
+class StringPrepCache {
+public:
+    static bool nameprep(const QString &in, int maxbytes, QString &out);
+    static bool nodeprep(const QString &in, int maxbytes, QString &out);
+    static bool resourceprep(const QString &in, int maxbytes, QString &out);
+    static bool saslprep(const QString &in, int maxbytes, QString &out);
+
+    static void cleanup();
+
+private:
+    QHash<QString, QString> nameprep_table;
+    QHash<QString, QString> nodeprep_table;
+    QHash<QString, QString> resourceprep_table;
+    QHash<QString, QString> saslprep_table;
+
+    static QScopedPointer<StringPrepCache> _instance;
+    static StringPrepCache *               instance();
+
+    StringPrepCache();
+};
+
+class Jid {
+public:
+    Jid();
+    ~Jid();
+
+    Jid(const QString &s);
+    Jid(const QString &node, const QString &domain, const QString &resource = "");
+    Jid(const char *s);
+    Jid &operator=(const QString &s);
+    Jid &operator=(const char *s);
+
+    bool           isNull() const { return null; }
+    const QString &domain() const { return d; }
+    const QString &node() const { return n; }
+    const QString &resource() const { return r; }
+    const QString &bare() const { return b; }
+    const QString &full() const { return f; }
+
+    Jid withNode(const QString &s) const;
+    Jid withDomain(const QString &s) const;
+    Jid withResource(const QString &s) const;
+
+    bool        isValid() const;
+    bool        isEmpty() const;
+    bool        compare(const Jid &a, bool compareRes = true) const;
+    inline bool operator==(const Jid &other) const { return compare(other, true); }
+    inline bool operator!=(const Jid &other) const { return !(*this == other); }
+
+private:
+    void set(const QString &s);
+    void set(const QString &domain, const QString &node, const QString &resource = "");
+
+    void setDomain(const QString &s);
+    void setNode(const QString &s);
+    void setResource(const QString &s);
+
+private:
+    void reset();
+    void update();
+
+    QString f, b, d, n, r;
+    bool    valid, null;
+};
+
+Q_DECL_PURE_FUNCTION inline uint qHash(const XMPP::Jid &key, uint seed = 0) Q_DECL_NOTHROW
+{
+    return qHash(key.full(), seed);
+}
 } // namespace XMPP
 
 #endif // XMPP_JID_H
diff --git a/src/xmpp/jid/unittest/jidtest.cpp b/src/xmpp/jid/unittest/jidtest.cpp
index b3c417e5..1acbe9e3 100644
--- a/src/xmpp/jid/unittest/jidtest.cpp
+++ b/src/xmpp/jid/unittest/jidtest.cpp
@@ -18,26 +18,26 @@
 
 // FIXME: Complete this
 
-#include "qttestutil/qttestutil.h"
 #include "xmpp/jid/jid.h"
+#include "qttestutil/qttestutil.h"
 
 #include <QObject>
 #include <QtTest/QtTest>
 
 using namespace XMPP;
 
-class JidTest : public QObject
-{
-        Q_OBJECT
+class JidTest : public QObject {
+    Q_OBJECT
 
-    private slots:
-        void testConstructorWithString() {
-            Jid testling("foo@bar/baz");
+private slots:
+    void testConstructorWithString()
+    {
+        Jid testling("foo@bar/baz");
 
-            QCOMPARE(testling.node(), QString("foo"));
-            QCOMPARE(testling.domain(), QString("bar"));
-            QCOMPARE(testling.resource(), QString("baz"));
-        }
+        QCOMPARE(testling.node(), QString("foo"));
+        QCOMPARE(testling.domain(), QString("bar"));
+        QCOMPARE(testling.resource(), QString("baz"));
+    }
 };
 
 QTTESTUTIL_REGISTER_TEST(JidTest);
diff --git a/src/xmpp/qa/qttestutil/example/myfirstclasstest.cpp b/src/xmpp/qa/qttestutil/example/myfirstclasstest.cpp
index a62835b7..243768ff 100644
--- a/src/xmpp/qa/qttestutil/example/myfirstclasstest.cpp
+++ b/src/xmpp/qa/qttestutil/example/myfirstclasstest.cpp
@@ -3,20 +3,18 @@
 #include <QObject>
 #include <QtTest/QtTest>
 
-class MyFirstClassTest : public QObject
-{
-     Q_OBJECT
+class MyFirstClassTest : public QObject {
+    Q_OBJECT
 
-    private slots:
-        void initTestCase() {
-        }
+private slots:
+    void initTestCase() {}
 
-        void cleanupTestCase() {
-        }
+    void cleanupTestCase() {}
 
-        void testMyMethod() {
-            QCOMPARE(1, 1); // Dummy test
-        }
+    void testMyMethod()
+    {
+        QCOMPARE(1, 1); // Dummy test
+    }
 };
 
 QTTESTUTIL_REGISTER_TEST(MyFirstClassTest);
diff --git a/src/xmpp/qa/qttestutil/example/mysecondclasstest.cpp b/src/xmpp/qa/qttestutil/example/mysecondclasstest.cpp
index c2b57159..15b762c6 100644
--- a/src/xmpp/qa/qttestutil/example/mysecondclasstest.cpp
+++ b/src/xmpp/qa/qttestutil/example/mysecondclasstest.cpp
@@ -3,20 +3,18 @@
 #include <QObject>
 #include <QtTest/QtTest>
 
-class MySecondClassTest : public QObject
-{
-     Q_OBJECT
+class MySecondClassTest : public QObject {
+    Q_OBJECT
 
-    private slots:
-        void initTestCase() {
-        }
+private slots:
+    void initTestCase() {}
 
-        void cleanupTestCase() {
-        }
+    void cleanupTestCase() {}
 
-        void testMyMethod() {
-            QCOMPARE(1, 0); // Dummy test
-        }
+    void testMyMethod()
+    {
+        QCOMPARE(1, 0); // Dummy test
+    }
 };
 
 QTTESTUTIL_REGISTER_TEST(MySecondClassTest);
diff --git a/src/xmpp/qa/qttestutil/qttestutil.h b/src/xmpp/qa/qttestutil/qttestutil.h
index d53a8363..91f19baf 100644
--- a/src/xmpp/qa/qttestutil/qttestutil.h
+++ b/src/xmpp/qa/qttestutil/qttestutil.h
@@ -35,7 +35,6 @@
  *
  *        QTTESTUTIL_REGISTER_TEST(MyTest)
  */
-#define QTTESTUTIL_REGISTER_TEST(TestClass) \
-    static QtTestUtil::TestRegistration<TestClass> TestClass##Registration
+#define QTTESTUTIL_REGISTER_TEST(TestClass) static QtTestUtil::TestRegistration<TestClass> TestClass##Registration
 
 #endif // QTTESTUTIL_H
diff --git a/src/xmpp/qa/qttestutil/simplechecker.cpp b/src/xmpp/qa/qttestutil/simplechecker.cpp
index 50a6f11e..17710777 100644
--- a/src/xmpp/qa/qttestutil/simplechecker.cpp
+++ b/src/xmpp/qa/qttestutil/simplechecker.cpp
@@ -23,7 +23,7 @@
 /**
  * Runs all tests registered with the QtTestUtil registry.
  */
-int main(int argc, char* argv[])
+int main(int argc, char *argv[])
 {
     QCoreApplication application(argc, argv);
     return QtTestUtil::TestRegistry::getInstance()->runTests(argc, argv);
diff --git a/src/xmpp/qa/qttestutil/testregistration.h b/src/xmpp/qa/qttestutil/testregistration.h
index 0378ea05..741d6464 100644
--- a/src/xmpp/qa/qttestutil/testregistration.h
+++ b/src/xmpp/qa/qttestutil/testregistration.h
@@ -22,28 +22,25 @@
 #include "qttestutil/testregistry.h"
 
 namespace QtTestUtil {
-    /**
-     * A wrapper class around a test to manage registration and static
-     * creation of an instance of the test class.
-     * This class is used by QTTESTUTIL_REGISTER_TEST(), and you should not
-     * use this class directly.
-     */
-    template<typename TestClass>
-    class TestRegistration
+/**
+ * A wrapper class around a test to manage registration and static
+ * creation of an instance of the test class.
+ * This class is used by QTTESTUTIL_REGISTER_TEST(), and you should not
+ * use this class directly.
+ */
+template <typename TestClass> class TestRegistration {
+public:
+    TestRegistration()
     {
-        public:
-            TestRegistration() {
-                test_ = new TestClass();
-                TestRegistry::getInstance()->registerTest(test_);
-            }
+        test_ = new TestClass();
+        TestRegistry::getInstance()->registerTest(test_);
+    }
 
-            ~TestRegistration() {
-                delete test_;
-            }
+    ~TestRegistration() { delete test_; }
 
-        private:
-            TestClass* test_;
-    };
+private:
+    TestClass *test_;
+};
 } // namespace QtTestUtil
 
 #endif // QTTESTUTIL_TESTREGISTRATION_H
diff --git a/src/xmpp/qa/qttestutil/testregistry.cpp b/src/xmpp/qa/qttestutil/testregistry.cpp
index 29d58d8d..ca5d91e8 100644
--- a/src/xmpp/qa/qttestutil/testregistry.cpp
+++ b/src/xmpp/qa/qttestutil/testregistry.cpp
@@ -21,23 +21,20 @@
 #include <QtTest/QtTest>
 
 namespace QtTestUtil {
-TestRegistry* TestRegistry::getInstance()
+TestRegistry *TestRegistry::getInstance()
 {
     static TestRegistry registry;
     return &registry;
 }
 
-void TestRegistry::registerTest(QObject* test)
-{
-    tests_ += test;
-}
+void TestRegistry::registerTest(QObject *test) { tests_ += test; }
 
-int TestRegistry::runTests(int argc, char* argv[])
+int TestRegistry::runTests(int argc, char *argv[])
 {
     int result = 0;
-    foreach(QObject* test, tests_) {
+    foreach (QObject *test, tests_) {
         result |= QTest::qExec(test, argc, argv);
     }
     return result;
 }
-} // namespace QtTestUtil 
+} // namespace QtTestUtil
diff --git a/src/xmpp/qa/qttestutil/testregistry.h b/src/xmpp/qa/qttestutil/testregistry.h
index 95d7502c..de3f3339 100644
--- a/src/xmpp/qa/qttestutil/testregistry.h
+++ b/src/xmpp/qa/qttestutil/testregistry.h
@@ -24,38 +24,37 @@
 class QObject;
 
 namespace QtTestUtil {
+/**
+ * A registry of QtTest test classes.
+ * All test classes registered with QTTESTUTIL_REGISTER_TEST add
+ * themselves to this registry. All registered tests can then be run at
+ * once using runTests().
+ */
+class TestRegistry {
+public:
     /**
-     * A registry of QtTest test classes.
-     * All test classes registered with QTTESTUTIL_REGISTER_TEST add
-     * themselves to this registry. All registered tests can then be run at
-     * once using runTests().
+     * Retrieve the single instance of the registry.
      */
-    class TestRegistry
-    {
-        public:
-            /**
-             * Retrieve the single instance of the registry.
-             */
-            static TestRegistry* getInstance();
-
-            /**
-             * Register a QtTest test.
-             * This method is called  by QTTESTUTIL_REGISTER_TEST, and you should
-             * not use this method directly.
-             */
-            void registerTest(QObject*);
-
-            /**
-             * Run all registered tests using QTest::qExec()
-             */
-            int runTests(int argc, char* argv[]);
-
-        private:
-            TestRegistry() {}
-
-        private:
-            QList<QObject*> tests_;
-    };
+    static TestRegistry *getInstance();
+
+    /**
+     * Register a QtTest test.
+     * This method is called  by QTTESTUTIL_REGISTER_TEST, and you should
+     * not use this method directly.
+     */
+    void registerTest(QObject *);
+
+    /**
+     * Run all registered tests using QTest::qExec()
+     */
+    int runTests(int argc, char *argv[]);
+
+private:
+    TestRegistry() {}
+
+private:
+    QList<QObject *> tests_;
+};
 } // namespace QtTestUtil
 
 #endif // QTTESTUTIL_TESTREGISTRY_H
diff --git a/src/xmpp/qa/unittest.template/myclasstest.cpp b/src/xmpp/qa/unittest.template/myclasstest.cpp
index 05218989..d1555cb2 100644
--- a/src/xmpp/qa/unittest.template/myclasstest.cpp
+++ b/src/xmpp/qa/unittest.template/myclasstest.cpp
@@ -21,21 +21,19 @@
 #include <QObject>
 #include <QtTest/QtTest>
 
-class MyClassTest : public QObject
-{
-     Q_OBJECT
+class MyClassTest : public QObject {
+    Q_OBJECT
 
-    private slots:
-        void initTestCase() {
-        }
+private slots:
+    void initTestCase() {}
 
-        void cleanupTestCase() {
-        }
+    void cleanupTestCase() {}
 
-        void testMyMethod() {
-            //QCOMPARE(foo, bar);
-            //QVERIFY(baz);
-        }
+    void testMyMethod()
+    {
+        // QCOMPARE(foo, bar);
+        // QVERIFY(baz);
+    }
 };
 
 QTTESTUTIL_REGISTER_TEST(MyClassTest);
diff --git a/src/xmpp/sasl/digestmd5proplist.cpp b/src/xmpp/sasl/digestmd5proplist.cpp
index 59c682e4..01bff42f 100644
--- a/src/xmpp/sasl/digestmd5proplist.cpp
+++ b/src/xmpp/sasl/digestmd5proplist.cpp
@@ -19,11 +19,10 @@
 #include "xmpp/sasl/digestmd5proplist.h"
 
 namespace XMPP {
-DIGESTMD5PropList::DIGESTMD5PropList() : QList<DIGESTMD5Prop>()
-{
-}
+DIGESTMD5PropList::DIGESTMD5PropList() : QList<DIGESTMD5Prop>() {}
 
-void DIGESTMD5PropList::set(const QByteArray &var, const QByteArray &val) {
+void DIGESTMD5PropList::set(const QByteArray &var, const QByteArray &val)
+{
     DIGESTMD5Prop p;
     p.var = var;
     p.val = val;
@@ -32,8 +31,8 @@ void DIGESTMD5PropList::set(const QByteArray &var, const QByteArray &val) {
 
 QByteArray DIGESTMD5PropList::get(const QByteArray &var) const
 {
-    for(ConstIterator it = begin(); it != end(); ++it) {
-        if((*it).var == var)
+    for (ConstIterator it = begin(); it != end(); ++it) {
+        if ((*it).var == var)
             return (*it).val;
     }
     return QByteArray();
@@ -42,11 +41,12 @@ QByteArray DIGESTMD5PropList::get(const QByteArray &var) const
 QByteArray DIGESTMD5PropList::toString() const
 {
     QByteArray str;
-    bool first = true;
-    for(ConstIterator it = begin(); it != end(); ++it) {
-        if(!first)
+    bool       first = true;
+    for (ConstIterator it = begin(); it != end(); ++it) {
+        if (!first)
             str += ',';
-        if ((*it).var == "realm" || (*it).var == "nonce" || (*it).var == "username" || (*it).var == "cnonce" || (*it).var == "digest-uri" || (*it).var == "authzid")
+        if ((*it).var == "realm" || (*it).var == "nonce" || (*it).var == "username" || (*it).var == "cnonce"
+            || (*it).var == "digest-uri" || (*it).var == "authzid")
             str += (*it).var + "=\"" + (*it).val + '\"';
         else
             str += (*it).var + "=" + (*it).val;
@@ -58,30 +58,29 @@ QByteArray DIGESTMD5PropList::toString() const
 bool DIGESTMD5PropList::fromString(const QByteArray &str)
 {
     DIGESTMD5PropList list;
-    int at = 0;
-    while(1) {
+    int               at = 0;
+    while (1) {
         while (at < str.length() && (str[at] == ',' || str[at] == ' ' || str[at] == '\t'))
-                ++at;
+            ++at;
         int n = str.indexOf('=', at);
-        if(n == -1)
+        if (n == -1)
             break;
         QByteArray var, val;
-        var = str.mid(at, n-at);
-        at = n + 1;
-        if(str[at] == '\"') {
+        var = str.mid(at, n - at);
+        at  = n + 1;
+        if (str[at] == '\"') {
             ++at;
             n = str.indexOf('\"', at);
-            if(n == -1)
+            if (n == -1)
                 break;
-            val = str.mid(at, n-at);
-            at = n + 1;
-        }
-        else {
+            val = str.mid(at, n - at);
+            at  = n + 1;
+        } else {
             n = at;
             while (n < str.length() && str[n] != ',' && str[n] != ' ' && str[n] != '\t')
                 ++n;
-            val = str.mid(at, n-at);
-            at = n;
+            val = str.mid(at, n - at);
+            at  = n;
         }
         DIGESTMD5Prop prop;
         prop.var = var;
@@ -92,27 +91,26 @@ bool DIGESTMD5PropList::fromString(const QByteArray &str)
                     ++a;
                 if (a == val.length())
                     break;
-                n = a+1;
+                n = a + 1;
                 while (n < val.length() && val[n] != ',' && val[n] != ' ' && val[n] != '\t')
                     ++n;
-                prop.val = val.mid(a, n-a);
+                prop.val = val.mid(a, n - a);
                 list.append(prop);
-                a = n+1;
+                a = n + 1;
             }
-        }
-        else {
+        } else {
             prop.val = val;
             list.append(prop);
         }
 
-        if(at >= str.size() - 1 || (str[at] != ',' && str[at] != ' ' && str[at] != '\t'))
+        if (at >= str.size() - 1 || (str[at] != ',' && str[at] != ' ' && str[at] != '\t'))
             break;
     }
 
     // integrity check
-    if(list.varCount("nonce") != 1)
+    if (list.varCount("nonce") != 1)
         return false;
-    if(list.varCount("algorithm") != 1)
+    if (list.varCount("algorithm") != 1)
         return false;
     *this = list;
     return true;
@@ -121,8 +119,8 @@ bool DIGESTMD5PropList::fromString(const QByteArray &str)
 int DIGESTMD5PropList::varCount(const QByteArray &var) const
 {
     int n = 0;
-    for(ConstIterator it = begin(); it != end(); ++it) {
-        if((*it).var == var)
+    for (ConstIterator it = begin(); it != end(); ++it) {
+        if ((*it).var == var)
             ++n;
     }
     return n;
diff --git a/src/xmpp/sasl/digestmd5proplist.h b/src/xmpp/sasl/digestmd5proplist.h
index f94d36d4..a7f1ae99 100644
--- a/src/xmpp/sasl/digestmd5proplist.h
+++ b/src/xmpp/sasl/digestmd5proplist.h
@@ -23,24 +23,22 @@
 #include <QList>
 
 namespace XMPP {
-    struct DIGESTMD5Prop
-    {
-        QByteArray var, val;
-    };
+struct DIGESTMD5Prop {
+    QByteArray var, val;
+};
 
-    class DIGESTMD5PropList : public QList<DIGESTMD5Prop>
-    {
-        public:
-            DIGESTMD5PropList();
+class DIGESTMD5PropList : public QList<DIGESTMD5Prop> {
+public:
+    DIGESTMD5PropList();
 
-            void set(const QByteArray &var, const QByteArray &val);
-            QByteArray get(const QByteArray &var) const;
-            QByteArray toString() const;
-            bool fromString(const QByteArray &str);
+    void       set(const QByteArray &var, const QByteArray &val);
+    QByteArray get(const QByteArray &var) const;
+    QByteArray toString() const;
+    bool       fromString(const QByteArray &str);
 
-        private:
-            int varCount(const QByteArray &var) const;
-    };
+private:
+    int varCount(const QByteArray &var) const;
+};
 } // namespace XMPP
 
 #endif // DIGESTMD5PROPLIST_H
diff --git a/src/xmpp/sasl/digestmd5response.cpp b/src/xmpp/sasl/digestmd5response.cpp
index 2cd4e9b9..4f0094b5 100644
--- a/src/xmpp/sasl/digestmd5response.cpp
+++ b/src/xmpp/sasl/digestmd5response.cpp
@@ -26,23 +26,26 @@
 #include <QtDebug>
 
 namespace XMPP {
-DIGESTMD5Response::DIGESTMD5Response(const QByteArray& challenge, const QString& service, const QString& host, const QString& arealm, const QString& user, const QString& authz,  const QByteArray& password, const RandomNumberGenerator& rand) : isValid_(true)
+DIGESTMD5Response::DIGESTMD5Response(const QByteArray &challenge, const QString &service, const QString &host,
+                                     const QString &arealm, const QString &user, const QString &authz,
+                                     const QByteArray &password, const RandomNumberGenerator &rand) :
+    isValid_(true)
 {
     QString realm = arealm;
 
     // get props
     DIGESTMD5PropList in;
-    if(!in.fromString(challenge)) {
+    if (!in.fromString(challenge)) {
         isValid_ = false;
         return;
     }
-    //qDebug() << (QString("simplesasl.cpp: IN: %1").arg(QString(in.toString())));
+    // qDebug() << (QString("simplesasl.cpp: IN: %1").arg(QString(in.toString())));
 
     // make a cnonce
     QByteArray a;
     a.resize(32);
-    for(int n = 0; n < (int)a.size(); ++n) {
-        a[n] = (char) rand.generateNumberBetween(0, 255);
+    for (int n = 0; n < (int)a.size(); ++n) {
+        a[n] = (char)rand.generateNumberBetween(0, 255);
     }
     QByteArray cnonce = a.toBase64();
 
@@ -51,28 +54,28 @@ DIGESTMD5Response::DIGESTMD5Response(const QByteArray& challenge, const QString&
         realm = QString::fromUtf8(in.get("realm"));
     }
     QByteArray nonce = in.get("nonce");
-    QByteArray nc = "00000001";
-    QByteArray uri = service.toUtf8() + '/' + host.toUtf8();
-    QByteArray qop = "auth";
+    QByteArray nc    = "00000001";
+    QByteArray uri   = service.toUtf8() + '/' + host.toUtf8();
+    QByteArray qop   = "auth";
 
     // build 'response'
-    QByteArray X = user.toUtf8() + ':' + realm.toUtf8() + ':' + password;
-    QByteArray Y = QCA::Hash("md5").hash(X).toByteArray();
+    QByteArray X   = user.toUtf8() + ':' + realm.toUtf8() + ':' + password;
+    QByteArray Y   = QCA::Hash("md5").hash(X).toByteArray();
     QByteArray tmp = ':' + nonce + ':' + cnonce;
     if (!authz.isEmpty())
         tmp += ':' + authz.toUtf8();
-    //qDebug() << (QString(tmp));
+    // qDebug() << (QString(tmp));
 
     QByteArray A1(Y + tmp);
-    QByteArray A2 = QByteArray("AUTHENTICATE:") + uri;
+    QByteArray A2  = QByteArray("AUTHENTICATE:") + uri;
     QByteArray HA1 = QCA::Hash("md5").hashToString(A1).toLatin1();
     QByteArray HA2 = QCA::Hash("md5").hashToString(A2).toLatin1();
-    QByteArray KD = HA1 + ':' + nonce + ':' + nc + ':' + cnonce + ':' + qop + ':' + HA2;
-    QByteArray Z = QCA::Hash("md5").hashToString(KD).toLatin1();
+    QByteArray KD  = HA1 + ':' + nonce + ':' + nc + ':' + cnonce + ':' + qop + ':' + HA2;
+    QByteArray Z   = QCA::Hash("md5").hashToString(KD).toLatin1();
 
-    //qDebug() << QString("simplesasl.cpp: A1 = %1").arg(QString(A1));
-    //qDebug() << QString("simplesasl.cpp: A2 = %1").arg(QString(A2));
-    //qDebug() << QString("simplesasl.cpp: KD = %1").arg(QString(KD));
+    // qDebug() << QString("simplesasl.cpp: A1 = %1").arg(QString(A1));
+    // qDebug() << QString("simplesasl.cpp: A2 = %1").arg(QString(A2));
+    // qDebug() << QString("simplesasl.cpp: KD = %1").arg(QString(KD));
 
     // build output
     DIGESTMD5PropList out;
@@ -82,14 +85,14 @@ DIGESTMD5Response::DIGESTMD5Response(const QByteArray& challenge, const QString&
     out.set("nonce", nonce);
     out.set("cnonce", cnonce);
     out.set("nc", nc);
-    //out.set("serv-type", service.toUtf8());
-    //out.set("host", host.toUtf8());
+    // out.set("serv-type", service.toUtf8());
+    // out.set("host", host.toUtf8());
     out.set("digest-uri", uri);
     out.set("qop", qop);
     out.set("response", Z);
     out.set("charset", "utf-8");
     if (!authz.isEmpty())
         out.set("authzid", authz.toUtf8());
-    value_  = out.toString();
+    value_ = out.toString();
 }
 } // namespace XMPP
diff --git a/src/xmpp/sasl/digestmd5response.h b/src/xmpp/sasl/digestmd5response.h
index 60969974..26ca8e20 100644
--- a/src/xmpp/sasl/digestmd5response.h
+++ b/src/xmpp/sasl/digestmd5response.h
@@ -23,33 +23,22 @@
 #include <QString>
 
 namespace XMPP {
-    class RandomNumberGenerator;
-
-    class DIGESTMD5Response
-    {
-        public:
-            DIGESTMD5Response(
-                    const QByteArray& challenge,
-                    const QString& service,
-                    const QString& host,
-                    const QString& realm,
-                    const QString& user,
-                    const QString& authz,
-                    const QByteArray& password,
-                    const RandomNumberGenerator& rand);
-
-            const QByteArray& getValue() const {
-                return value_;
-            }
-
-            bool isValid() const {
-                return isValid_;
-            }
-
-        private:
-            bool isValid_;
-            QByteArray value_;
-    };
+class RandomNumberGenerator;
+
+class DIGESTMD5Response {
+public:
+    DIGESTMD5Response(const QByteArray &challenge, const QString &service, const QString &host, const QString &realm,
+                      const QString &user, const QString &authz, const QByteArray &password,
+                      const RandomNumberGenerator &rand);
+
+    const QByteArray &getValue() const { return value_; }
+
+    bool isValid() const { return isValid_; }
+
+private:
+    bool       isValid_;
+    QByteArray value_;
+};
 } // namespace XMPP
 
 #endif // DIGESTMD5RESPONSE_H
diff --git a/src/xmpp/sasl/plainmessage.cpp b/src/xmpp/sasl/plainmessage.cpp
index 3585065a..46ac34cd 100644
--- a/src/xmpp/sasl/plainmessage.cpp
+++ b/src/xmpp/sasl/plainmessage.cpp
@@ -19,7 +19,7 @@
 #include "xmpp/sasl/plainmessage.h"
 
 namespace XMPP {
-PLAINMessage::PLAINMessage(const QString& authzid, const QString& authcid, const QByteArray& password)
+PLAINMessage::PLAINMessage(const QString &authzid, const QString &authcid, const QByteArray &password)
 {
     value_ = authzid.toUtf8() + '\0' + authcid.toUtf8() + '\0' + password;
 }
diff --git a/src/xmpp/sasl/plainmessage.h b/src/xmpp/sasl/plainmessage.h
index a41c0b57..949a8749 100644
--- a/src/xmpp/sasl/plainmessage.h
+++ b/src/xmpp/sasl/plainmessage.h
@@ -23,18 +23,15 @@
 #include <QString>
 
 namespace XMPP {
-    class PLAINMessage
-    {
-        public:
-            PLAINMessage(const QString& authzid, const QString& authcid, const QByteArray& password);
+class PLAINMessage {
+public:
+    PLAINMessage(const QString &authzid, const QString &authcid, const QByteArray &password);
 
-            const QByteArray& getValue() {
-                return value_;
-            }
+    const QByteArray &getValue() { return value_; }
 
-        private:
-            QByteArray value_;
-    };
+private:
+    QByteArray value_;
+};
 } // namespace XMPP
 
 #endif // PLAINMESSAGE_H
diff --git a/src/xmpp/sasl/scramsha1message.cpp b/src/xmpp/sasl/scramsha1message.cpp
index eac93f5c..74e3543a 100644
--- a/src/xmpp/sasl/scramsha1message.cpp
+++ b/src/xmpp/sasl/scramsha1message.cpp
@@ -27,7 +27,8 @@
 #include <QtCrypto>
 
 namespace XMPP {
-bool Normalize(const QString &username_in, QString &username_out ) {
+bool Normalize(const QString &username_in, QString &username_out)
+{
     // SASLprep
     if (StringPrepCache::saslprep(username_in, 1024, username_out)) {
         // '=' -> '=3D'     and ',' -> '=2C'
@@ -39,11 +40,13 @@ bool Normalize(const QString &username_in, QString &username_out ) {
     }
 }
 
-SCRAMSHA1Message::SCRAMSHA1Message(const QString& authzid, const QString& authcid, const QByteArray& cnonce, const RandomNumberGenerator& rand) : isValid_(true)
+SCRAMSHA1Message::SCRAMSHA1Message(const QString &authzid, const QString &authcid, const QByteArray &cnonce,
+                                   const RandomNumberGenerator &rand) :
+    isValid_(true)
 {
-    QString result;
+    QString    result;
     QByteArray clientnonce;
-    QString username;
+    QString    username;
 
     if (!Normalize(authcid, username)) {
         isValid_ = false;
@@ -54,11 +57,12 @@ SCRAMSHA1Message::SCRAMSHA1Message(const QString& authzid, const QString& authci
         // make a cnonce
         QByteArray a;
         a.resize(32);
-        for(int n = 0; n < (int)a.size(); ++n) {
-            a[n] = (char) rand.generateNumberBetween(0, 255);
+        for (int n = 0; n < (int)a.size(); ++n) {
+            a[n] = (char)rand.generateNumberBetween(0, 255);
         }
         clientnonce = a.toBase64();
-    } else clientnonce = cnonce;
+    } else
+        clientnonce = cnonce;
 
     QTextStream(&result) << "n,";
     if (authzid.size() > 0) {
diff --git a/src/xmpp/sasl/scramsha1message.h b/src/xmpp/sasl/scramsha1message.h
index 24fae6fb..98d7bbf6 100644
--- a/src/xmpp/sasl/scramsha1message.h
+++ b/src/xmpp/sasl/scramsha1message.h
@@ -25,23 +25,19 @@
 #include <QString>
 
 namespace XMPP {
-    class SCRAMSHA1Message
-    {
-        public:
-            SCRAMSHA1Message(const QString& authzid, const QString& authcid, const QByteArray& cnonce, const RandomNumberGenerator& rand);
-
-            const QByteArray& getValue() {
-                return value_;
-            }
-
-            bool isValid() const {
-                return isValid_;
-            }
-
-        private:
-            QByteArray value_;
-            bool isValid_;
-    };
+class SCRAMSHA1Message {
+public:
+    SCRAMSHA1Message(const QString &authzid, const QString &authcid, const QByteArray &cnonce,
+                     const RandomNumberGenerator &rand);
+
+    const QByteArray &getValue() { return value_; }
+
+    bool isValid() const { return isValid_; }
+
+private:
+    QByteArray value_;
+    bool       isValid_;
+};
 } // namespace XMPP
 
 #endif // SCRAMSHA1MESSAGE_H
diff --git a/src/xmpp/sasl/scramsha1response.cpp b/src/xmpp/sasl/scramsha1response.cpp
index 960327e8..09d034b7 100644
--- a/src/xmpp/sasl/scramsha1response.cpp
+++ b/src/xmpp/sasl/scramsha1response.cpp
@@ -29,24 +29,27 @@
 #include <QtDebug>
 
 namespace XMPP {
-    QCA::SecureArray HMAC_SHA_1(const QCA::SecureArray &key, const QCA::SecureArray &str) {
-        QCA::SecureArray result = QCA::MessageAuthenticationCode("hmac(sha1)", key).process(str);
-        return result;
-    }
+QCA::SecureArray HMAC_SHA_1(const QCA::SecureArray &key, const QCA::SecureArray &str)
+{
+    QCA::SecureArray result = QCA::MessageAuthenticationCode("hmac(sha1)", key).process(str);
+    return result;
+}
 
-    SCRAMSHA1Response::SCRAMSHA1Response(const QByteArray& server_first_message, const QByteArray& password_in, const QByteArray& client_first_message, const QString &salted_password_base64, const RandomNumberGenerator& rand)
+SCRAMSHA1Response::SCRAMSHA1Response(const QByteArray &server_first_message, const QByteArray &password_in,
+                                     const QByteArray &client_first_message, const QString &salted_password_base64,
+                                     const RandomNumberGenerator &rand)
 {
     Q_UNUSED(rand);
     QString pass_in = QString::fromUtf8(password_in);
     QString pass_out;
 
     QRegExp pattern("r=(.*),s=(.+),i=(\\d+)");
-    int pos = pattern.indexIn(QString(server_first_message));
-    isValid_ = true;
+    int     pos = pattern.indexIn(QString(server_first_message));
+    isValid_    = true;
     if (pos > -1) {
         QString clientservernonce = pattern.cap(1);
-        QString salt = pattern.cap(2);
-        QString icount = pattern.cap(3);
+        QString salt              = pattern.cap(2);
+        QString icount            = pattern.cap(3);
 
         unsigned int dkLen;
 
@@ -60,7 +63,8 @@ namespace XMPP {
 
         // SaltedPassword  := Hi(Normalize(password), salt, i)
         if (salted_password_base64.size() > 0)
-            salted_password_ = QCA::SymmetricKey(QCA::SecureArray(QCA::Base64().stringToArray(salted_password_base64.toUtf8())));
+            salted_password_
+                = QCA::SymmetricKey(QCA::SecureArray(QCA::Base64().stringToArray(salted_password_base64.toUtf8())));
         if (salted_password_.size() == 0) {
             if (!StringPrepCache::saslprep(pass_in, 1023, pass_out)) {
                 isValid_ = false;
@@ -68,7 +72,9 @@ namespace XMPP {
             }
 
             password = pass_out.toUtf8();
-            salted_password_ = hi.makeKey(QCA::SecureArray(password), QCA::InitializationVector(QCA::Base64().stringToArray(salt)), dkLen, icount.toULong());
+            salted_password_
+                = hi.makeKey(QCA::SecureArray(password), QCA::InitializationVector(QCA::Base64().stringToArray(salt)),
+                             dkLen, icount.toULong());
         }
 
         // ClientKey       := HMAC(SaltedPassword, "Client Key")
@@ -86,12 +92,13 @@ namespace XMPP {
             gs2_header = pattern.cap(1);
         }
 
-        QString client_final_message;
+        QString     client_final_message;
         QTextStream final_message_stream(&client_final_message);
         final_message_stream << "c=" << QCA::Base64().arrayToString((gs2_header.toUtf8()));
         final_message_stream << ",r=" << clientservernonce;
 
-        // AuthMessage     := client-first-message-bare + "," + server-first-message + "," + client-final-message-without-proof
+        // AuthMessage     := client-first-message-bare + "," + server-first-message + "," +
+        // client-final-message-without-proof
         QRegExp extract_cfmb_pattern("(n=.+)");
         if (extract_cfmb_pattern.indexIn(QString(client_first_message)) < 0) {
             isValid_ = false;
@@ -109,7 +116,7 @@ namespace XMPP {
 
         // ClientProof     := ClientKey XOR ClientSignature
         QCA::SecureArray client_proof(client_key.size());
-        for(int i = 0; i < client_proof.size(); ++i) {
+        for (int i = 0; i < client_proof.size(); ++i) {
             client_proof[i] = client_key[i] ^ client_signature[i];
         }
 
@@ -127,7 +134,5 @@ namespace XMPP {
     }
 }
 
-const QString SCRAMSHA1Response::getSaltedPassword() {
-    return QCA::Base64().arrayToString(salted_password_);
-}
+const QString SCRAMSHA1Response::getSaltedPassword() { return QCA::Base64().arrayToString(salted_password_); }
 } // namespace XMPP
diff --git a/src/xmpp/sasl/scramsha1response.h b/src/xmpp/sasl/scramsha1response.h
index 9d00dee8..e4cb723f 100644
--- a/src/xmpp/sasl/scramsha1response.h
+++ b/src/xmpp/sasl/scramsha1response.h
@@ -24,38 +24,28 @@
 #include <QtCrypto>
 
 namespace XMPP {
-    class RandomNumberGenerator;
-
-    class SCRAMSHA1Response
-    {
-        public:
-            SCRAMSHA1Response(
-                    const QByteArray& server_first_message,
-                    const QByteArray& password,
-                    const QByteArray& client_first_message,
-                    const QString &salted_password_base64,
-                    const RandomNumberGenerator& rand);
-
-            const QByteArray& getValue() const {
-                return value_;
-            }
-
-            const QCA::SecureArray getServerSignature() const {
-                return server_signature_;
-            }
-
-            const QString getSaltedPassword();
-
-            bool isValid() const {
-                return isValid_;
-            }
-
-        private:
-            bool isValid_;
-            QByteArray value_;
-            QCA::SecureArray server_signature_;
-            QCA::SymmetricKey salted_password_;
-    };
+class RandomNumberGenerator;
+
+class SCRAMSHA1Response {
+public:
+    SCRAMSHA1Response(const QByteArray &server_first_message, const QByteArray &password,
+                      const QByteArray &client_first_message, const QString &salted_password_base64,
+                      const RandomNumberGenerator &rand);
+
+    const QByteArray &getValue() const { return value_; }
+
+    const QCA::SecureArray getServerSignature() const { return server_signature_; }
+
+    const QString getSaltedPassword();
+
+    bool isValid() const { return isValid_; }
+
+private:
+    bool              isValid_;
+    QByteArray        value_;
+    QCA::SecureArray  server_signature_;
+    QCA::SymmetricKey salted_password_;
+};
 } // namespace XMPP
 
 #endif // SCRAMSHA1RESPONSE_H
diff --git a/src/xmpp/sasl/scramsha1signature.cpp b/src/xmpp/sasl/scramsha1signature.cpp
index 60b101ba..4051fe06 100644
--- a/src/xmpp/sasl/scramsha1signature.cpp
+++ b/src/xmpp/sasl/scramsha1signature.cpp
@@ -28,15 +28,17 @@
 #include <QtDebug>
 
 namespace XMPP {
-    SCRAMSHA1Signature::SCRAMSHA1Signature(const QByteArray &server_final_message, const QCA::SecureArray &server_signature_should)
+SCRAMSHA1Signature::SCRAMSHA1Signature(const QByteArray &      server_final_message,
+                                       const QCA::SecureArray &server_signature_should)
 {
     QRegExp pattern("v=([^,]*)");
-    int pos = pattern.indexIn(QString(server_final_message));
-    isValid_ = true;
+    int     pos = pattern.indexIn(QString(server_final_message));
+    isValid_    = true;
     if (pos > -1) {
-        QString server_signature = pattern.cap(1);
+        QString          server_signature = pattern.cap(1);
         QCA::SecureArray server_sig(QCA::Base64().stringToArray(server_signature));
-        if (server_sig != server_signature_should) isValid_ = false;
+        if (server_sig != server_signature_should)
+            isValid_ = false;
     } else {
         qWarning("SASL/SCRAM-SHA-1: Failed to match pattern for server-final-message.");
         isValid_ = false;
diff --git a/src/xmpp/sasl/scramsha1signature.h b/src/xmpp/sasl/scramsha1signature.h
index 5b4125d1..27990e34 100644
--- a/src/xmpp/sasl/scramsha1signature.h
+++ b/src/xmpp/sasl/scramsha1signature.h
@@ -24,18 +24,15 @@
 #include <QtCrypto>
 
 namespace XMPP {
-    class SCRAMSHA1Signature
-    {
-        public:
-            SCRAMSHA1Signature(const QByteArray &server_final_message, const QCA::SecureArray &server_signature_should);
+class SCRAMSHA1Signature {
+public:
+    SCRAMSHA1Signature(const QByteArray &server_final_message, const QCA::SecureArray &server_signature_should);
 
-            bool isValid() const {
-                return isValid_;
-            }
+    bool isValid() const { return isValid_; }
 
-        private:
-            bool isValid_;
-    };
+private:
+    bool isValid_;
+};
 } // namespace XMPP
 
 #endif // SCRAMSHA1SIGNATURE_H
diff --git a/src/xmpp/sasl/unittest/digestmd5responsetest.cpp b/src/xmpp/sasl/unittest/digestmd5responsetest.cpp
index 6cf2d790..25c948bc 100644
--- a/src/xmpp/sasl/unittest/digestmd5responsetest.cpp
+++ b/src/xmpp/sasl/unittest/digestmd5responsetest.cpp
@@ -16,9 +16,9 @@
  *
  */
 
+#include "xmpp/sasl/digestmd5response.h"
 #include "qttestutil/qttestutil.h"
 #include "xmpp/base/unittest/incrementingrandomnumbergenerator.h"
-#include "xmpp/sasl/digestmd5response.h"
 
 #include <QObject>
 #include <QtCrypto>
@@ -26,54 +26,49 @@
 
 using namespace XMPP;
 
-class DIGESTMD5ResponseTest : public QObject
-{
-        Q_OBJECT
+class DIGESTMD5ResponseTest : public QObject {
+    Q_OBJECT
 
-    private slots:
-        void testConstructor_WithAuthzid() {
-            DIGESTMD5Response response(
-                "realm=\"example.com\","
-                "nonce=\"O6skKPuaCZEny3hteI19qXMBXSadoWs840MchORo\","
-                "qop=\"auth\",charset=\"utf-8\",algorithm=\"md5-sess\"",
-                "xmpp", "jabber.example.com", "example.com", "myuser", "myuser_authz",
-                "mypass",
-                IncrementingRandomNumberGenerator(255));
-            QByteArray expectedValue(
-                "username=\"myuser\",realm=\"example.com\","
-                "nonce=\"O6skKPuaCZEny3hteI19qXMBXSadoWs840MchORo\","
-                "cnonce=\"AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8=\","
-                "nc=00000001,"
-                "digest-uri=\"xmpp/jabber.example.com\","
-                "qop=auth,response=8fe15bc2aa31956b62d9de831b21a5d4,"
-                "charset=utf-8,authzid=\"myuser_authz\"");
+private slots:
+    void testConstructor_WithAuthzid()
+    {
+        DIGESTMD5Response response("realm=\"example.com\","
+                                   "nonce=\"O6skKPuaCZEny3hteI19qXMBXSadoWs840MchORo\","
+                                   "qop=\"auth\",charset=\"utf-8\",algorithm=\"md5-sess\"",
+                                   "xmpp", "jabber.example.com", "example.com", "myuser", "myuser_authz", "mypass",
+                                   IncrementingRandomNumberGenerator(255));
+        QByteArray        expectedValue("username=\"myuser\",realm=\"example.com\","
+                                 "nonce=\"O6skKPuaCZEny3hteI19qXMBXSadoWs840MchORo\","
+                                 "cnonce=\"AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8=\","
+                                 "nc=00000001,"
+                                 "digest-uri=\"xmpp/jabber.example.com\","
+                                 "qop=auth,response=8fe15bc2aa31956b62d9de831b21a5d4,"
+                                 "charset=utf-8,authzid=\"myuser_authz\"");
 
-            QVERIFY(response.isValid());
-            QCOMPARE(response.getValue(), expectedValue);
-        }
+        QVERIFY(response.isValid());
+        QCOMPARE(response.getValue(), expectedValue);
+    }
 
-        void testConstructor_WithoutAuthzid() {
-            DIGESTMD5Response response(
-                "realm=\"example.com\","
-                "nonce=\"O6skKPuaCZEny3hteI19qXMBXSadoWs840MchORo\","
-                "qop=\"auth\",charset=\"utf-8\",algorithm=\"md5-sess\"",
-                "xmpp", "jabber.example.com", "example.com", "myuser", "",
-                "mypass",
-                IncrementingRandomNumberGenerator(255));
-            QByteArray expectedValue(
-                "username=\"myuser\",realm=\"example.com\","
-                "nonce=\"O6skKPuaCZEny3hteI19qXMBXSadoWs840MchORo\","
-                "cnonce=\"AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8=\","
-                "nc=00000001,"
-                "digest-uri=\"xmpp/jabber.example.com\","
-                "qop=auth,response=564b1c1cc16d97b019f18b14c979964b,charset=utf-8");
+    void testConstructor_WithoutAuthzid()
+    {
+        DIGESTMD5Response response("realm=\"example.com\","
+                                   "nonce=\"O6skKPuaCZEny3hteI19qXMBXSadoWs840MchORo\","
+                                   "qop=\"auth\",charset=\"utf-8\",algorithm=\"md5-sess\"",
+                                   "xmpp", "jabber.example.com", "example.com", "myuser", "", "mypass",
+                                   IncrementingRandomNumberGenerator(255));
+        QByteArray        expectedValue("username=\"myuser\",realm=\"example.com\","
+                                 "nonce=\"O6skKPuaCZEny3hteI19qXMBXSadoWs840MchORo\","
+                                 "cnonce=\"AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8=\","
+                                 "nc=00000001,"
+                                 "digest-uri=\"xmpp/jabber.example.com\","
+                                 "qop=auth,response=564b1c1cc16d97b019f18b14c979964b,charset=utf-8");
 
-            QVERIFY(response.isValid());
-            QCOMPARE(response.getValue(), expectedValue);
-        }
+        QVERIFY(response.isValid());
+        QCOMPARE(response.getValue(), expectedValue);
+    }
 
-    private:
-        QCA::Initializer initializer;
+private:
+    QCA::Initializer initializer;
 };
 
 QTTESTUTIL_REGISTER_TEST(DIGESTMD5ResponseTest);
diff --git a/src/xmpp/sasl/unittest/plainmessagetest.cpp b/src/xmpp/sasl/unittest/plainmessagetest.cpp
index 7bb1dc29..4ee25e3b 100644
--- a/src/xmpp/sasl/unittest/plainmessagetest.cpp
+++ b/src/xmpp/sasl/unittest/plainmessagetest.cpp
@@ -16,33 +16,36 @@
  *
  */
 
-#include "qttestutil/qttestutil.h"
 #include "xmpp/sasl/plainmessage.h"
+#include "qttestutil/qttestutil.h"
 
 #include <QObject>
 #include <QtTest/QtTest>
 
 using namespace XMPP;
 
-class PlainMessageTest : public QObject
-{
-        Q_OBJECT
-
-    private slots:
-        void testConstructor_WithoutAuthzID() {
-            PLAINMessage message("", QString("user"), "pass");
-            QCOMPARE(message.getValue(), QByteArray("\0user\0pass", 10));
-        }
-
-        void testConstructor_WithAuthzID() {
-            PLAINMessage message(QString("authz"), QString("user"), "pass");
-            QCOMPARE(message.getValue(), QByteArray("authz\0user\0pass", 15));
-        }
-
-        void testConstructor_WithNonASCIICharacters() {
-            PLAINMessage message(QString("authz") + QChar(0x03A8) /* psi */, QString("user") + QChar(0x03A8) /* psi */, "pass");
-            QCOMPARE(message.getValue(), QByteArray("authz\xCE\xA8\0user\xCE\xA8\0pass", 19));
-        }
+class PlainMessageTest : public QObject {
+    Q_OBJECT
+
+private slots:
+    void testConstructor_WithoutAuthzID()
+    {
+        PLAINMessage message("", QString("user"), "pass");
+        QCOMPARE(message.getValue(), QByteArray("\0user\0pass", 10));
+    }
+
+    void testConstructor_WithAuthzID()
+    {
+        PLAINMessage message(QString("authz"), QString("user"), "pass");
+        QCOMPARE(message.getValue(), QByteArray("authz\0user\0pass", 15));
+    }
+
+    void testConstructor_WithNonASCIICharacters()
+    {
+        PLAINMessage message(QString("authz") + QChar(0x03A8) /* psi */, QString("user") + QChar(0x03A8) /* psi */,
+                             "pass");
+        QCOMPARE(message.getValue(), QByteArray("authz\xCE\xA8\0user\xCE\xA8\0pass", 19));
+    }
 };
 
 QTTESTUTIL_REGISTER_TEST(PlainMessageTest);
diff --git a/src/xmpp/sasl/unittest/scramsha1messagetest.cpp b/src/xmpp/sasl/unittest/scramsha1messagetest.cpp
index 0cf9121d..8310742c 100644
--- a/src/xmpp/sasl/unittest/scramsha1messagetest.cpp
+++ b/src/xmpp/sasl/unittest/scramsha1messagetest.cpp
@@ -16,9 +16,9 @@
  *
  */
 
+#include "xmpp/sasl/scramsha1message.h"
 #include "qttestutil/qttestutil.h"
 #include "xmpp/base/unittest/incrementingrandomnumbergenerator.h"
-#include "xmpp/sasl/scramsha1message.h"
 
 #include <QObject>
 #include <QtCrypto>
@@ -26,28 +26,27 @@
 
 using namespace XMPP;
 
-class SCRAMSHA1MessageTest : public QObject
-{
-        Q_OBJECT
+class SCRAMSHA1MessageTest : public QObject {
+    Q_OBJECT
 
-    private slots:
-        void testConstructor_WithAuthzid() {
-        }
+private slots:
+    void testConstructor_WithAuthzid() {}
 
-        void testConstructor_WithoutAuthzid() {
-            SCRAMSHA1Message msg1("", "testuser", QByteArray(0, ' '), IncrementingRandomNumberGenerator(255));
-            QByteArray msg1_good("n,,n=testuser,r=AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8=");
-            QVERIFY(msg1.isValid());
-            QCOMPARE(msg1.getValue(), msg1_good);
+    void testConstructor_WithoutAuthzid()
+    {
+        SCRAMSHA1Message msg1("", "testuser", QByteArray(0, ' '), IncrementingRandomNumberGenerator(255));
+        QByteArray       msg1_good("n,,n=testuser,r=AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8=");
+        QVERIFY(msg1.isValid());
+        QCOMPARE(msg1.getValue(), msg1_good);
 
-            SCRAMSHA1Message msg2("", "username=test,man", QByteArray(0, ' '), IncrementingRandomNumberGenerator(255));
-            QByteArray msg2_good("n,,n=username=3Dtest=2Cman,r=AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8=");
-            QVERIFY(msg2.isValid());
-            QCOMPARE(msg2.getValue(), msg2_good);
-        }
+        SCRAMSHA1Message msg2("", "username=test,man", QByteArray(0, ' '), IncrementingRandomNumberGenerator(255));
+        QByteArray       msg2_good("n,,n=username=3Dtest=2Cman,r=AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8=");
+        QVERIFY(msg2.isValid());
+        QCOMPARE(msg2.getValue(), msg2_good);
+    }
 
-    private:
-        QCA::Initializer initializer;
+private:
+    QCA::Initializer initializer;
 };
 
 QTTESTUTIL_REGISTER_TEST(SCRAMSHA1MessageTest);
diff --git a/src/xmpp/sasl/unittest/scramsha1responsetest.cpp b/src/xmpp/sasl/unittest/scramsha1responsetest.cpp
index 6e0260fb..4d09222b 100644
--- a/src/xmpp/sasl/unittest/scramsha1responsetest.cpp
+++ b/src/xmpp/sasl/unittest/scramsha1responsetest.cpp
@@ -16,9 +16,9 @@
  *
  */
 
+#include "xmpp/sasl/scramsha1response.h"
 #include "qttestutil/qttestutil.h"
 #include "xmpp/base/unittest/incrementingrandomnumbergenerator.h"
-#include "xmpp/sasl/scramsha1response.h"
 #include "xmpp/sasl/scramsha1signature.h"
 
 #include <QObject>
@@ -27,32 +27,30 @@
 
 using namespace XMPP;
 
-class SCRAMSHA1ResponseTest : public QObject
-{
-        Q_OBJECT
-
-    private slots:
-        void testConstructor_WithAuthzid() {
-
-        }
-
-        void testConstructor_WithoutAuthzid() {
-            if (QCA::isSupported("hmac(sha1)")) {
-                SCRAMSHA1Response resp1("r=fyko+d2lbbFgONRv9qkxdawL3rfcNHYJY1ZVvWVs7j,s=QSXCR+Q6sek8bf92,i=4096",
-                                    "pencil", "n,,n=user,r=fyko+d2lbbFgONRv9qkxdawL", "", IncrementingRandomNumberGenerator(255));
-                const QCA::SecureArray sig = resp1.getServerSignature();
-                QByteArray resp_sig("v=rmF9pqV8S7suAoZWja4dJRkFsKQ=");
-                SCRAMSHA1Signature sig1(resp_sig, sig);
-                QByteArray resp1_ok("c=biws,r=fyko+d2lbbFgONRv9qkxdawL3rfcNHYJY1ZVvWVs7j,p=v0X8v3Bz2T0CJGbJQyF0X+HI4Ts=");
-                QCOMPARE(resp1.getValue(), resp1_ok);
-                QVERIFY(sig1.isValid());
-            } else {
-                QFAIL("hmac(sha1) not supported in QCA.");
-            }
+class SCRAMSHA1ResponseTest : public QObject {
+    Q_OBJECT
+
+private slots:
+    void testConstructor_WithAuthzid() {}
+
+    void testConstructor_WithoutAuthzid()
+    {
+        if (QCA::isSupported("hmac(sha1)")) {
+            SCRAMSHA1Response resp1("r=fyko+d2lbbFgONRv9qkxdawL3rfcNHYJY1ZVvWVs7j,s=QSXCR+Q6sek8bf92,i=4096", "pencil",
+                                    "n,,n=user,r=fyko+d2lbbFgONRv9qkxdawL", "", IncrementingRandomNumberGenerator(255));
+            const QCA::SecureArray sig = resp1.getServerSignature();
+            QByteArray             resp_sig("v=rmF9pqV8S7suAoZWja4dJRkFsKQ=");
+            SCRAMSHA1Signature     sig1(resp_sig, sig);
+            QByteArray resp1_ok("c=biws,r=fyko+d2lbbFgONRv9qkxdawL3rfcNHYJY1ZVvWVs7j,p=v0X8v3Bz2T0CJGbJQyF0X+HI4Ts=");
+            QCOMPARE(resp1.getValue(), resp1_ok);
+            QVERIFY(sig1.isValid());
+        } else {
+            QFAIL("hmac(sha1) not supported in QCA.");
         }
+    }
 
-    private:
-        QCA::Initializer initializer;
+private:
+    QCA::Initializer initializer;
 };
 
 QTTESTUTIL_REGISTER_TEST(SCRAMSHA1ResponseTest);
diff --git a/src/xmpp/xmpp-core/compressionhandler.cpp b/src/xmpp/xmpp-core/compressionhandler.cpp
index 6d051ca8..500fd8ab 100644
--- a/src/xmpp/xmpp-core/compressionhandler.cpp
+++ b/src/xmpp/xmpp-core/compressionhandler.cpp
@@ -5,8 +5,7 @@
 #include <QDebug>
 #include <QTimer>
 
-CompressionHandler::CompressionHandler()
-    : errorCode_(0)
+CompressionHandler::CompressionHandler() : errorCode_(0)
 {
     outgoing_buffer_.open(QIODevice::ReadWrite);
     compressor_ = new ZLibCompressor(&outgoing_buffer_);
@@ -21,10 +20,10 @@ CompressionHandler::~CompressionHandler()
     delete decompressor_;
 }
 
-void CompressionHandler::writeIncoming(const QByteArray& a)
+void CompressionHandler::writeIncoming(const QByteArray &a)
 {
-    //qDebug("CompressionHandler::writeIncoming");
-    //qDebug() << QString("Incoming %1 bytes").arg(a.size());
+    // qDebug("CompressionHandler::writeIncoming");
+    // qDebug() << QString("Incoming %1 bytes").arg(a.size());
     errorCode_ = decompressor_->write(a);
     if (!errorCode_)
         QTimer::singleShot(0, this, SIGNAL(readyRead()));
@@ -32,9 +31,9 @@ void CompressionHandler::writeIncoming(const QByteArray& a)
         QTimer::singleShot(0, this, SIGNAL(error()));
 }
 
-void CompressionHandler::write(const QByteArray& a)
+void CompressionHandler::write(const QByteArray &a)
 {
-    //qDebug() << QString("CompressionHandler::write(%1)").arg(a.size());
+    // qDebug() << QString("CompressionHandler::write(%1)").arg(a.size());
     errorCode_ = compressor_->write(a);
     if (!errorCode_)
         QTimer::singleShot(0, this, SIGNAL(readyReadOutgoing()));
@@ -44,17 +43,17 @@ void CompressionHandler::write(const QByteArray& a)
 
 QByteArray CompressionHandler::read()
 {
-    //qDebug("CompressionHandler::read");
+    // qDebug("CompressionHandler::read");
     QByteArray b = incoming_buffer_.buffer();
     incoming_buffer_.buffer().clear();
     incoming_buffer_.reset();
     return b;
 }
 
-QByteArray CompressionHandler::readOutgoing(int* i)
+QByteArray CompressionHandler::readOutgoing(int *i)
 {
-    //qDebug("CompressionHandler::readOutgoing");
-    //qDebug() << QString("Outgoing %1 bytes").arg(outgoing_buffer_.size());
+    // qDebug("CompressionHandler::readOutgoing");
+    // qDebug() << QString("Outgoing %1 bytes").arg(outgoing_buffer_.size());
     QByteArray b = outgoing_buffer_.buffer();
     outgoing_buffer_.buffer().clear();
     outgoing_buffer_.reset();
@@ -62,7 +61,4 @@ QByteArray CompressionHandler::readOutgoing(int* i)
     return b;
 }
 
-int CompressionHandler::errorCode()
-{
-    return errorCode_;
-}
+int CompressionHandler::errorCode() { return errorCode_; }
diff --git a/src/xmpp/xmpp-core/compressionhandler.h b/src/xmpp/xmpp-core/compressionhandler.h
index 13b2808d..740f32ca 100644
--- a/src/xmpp/xmpp-core/compressionhandler.h
+++ b/src/xmpp/xmpp-core/compressionhandler.h
@@ -7,18 +7,17 @@
 class ZLibCompressor;
 class ZLibDecompressor;
 
-class CompressionHandler : public QObject
-{
+class CompressionHandler : public QObject {
     Q_OBJECT
 
 public:
     CompressionHandler();
     ~CompressionHandler();
-    void writeIncoming(const QByteArray& a);
-    void write(const QByteArray& a);
+    void       writeIncoming(const QByteArray &a);
+    void       write(const QByteArray &a);
     QByteArray read();
-    QByteArray readOutgoing(int*);
-    int errorCode();
+    QByteArray readOutgoing(int *);
+    int        errorCode();
 
 signals:
     void readyRead();
@@ -26,10 +25,10 @@ class CompressionHandler : public QObject
     void error();
 
 private:
-    ZLibCompressor* compressor_;
-    ZLibDecompressor* decompressor_;
-    QBuffer outgoing_buffer_, incoming_buffer_;
-    int errorCode_;
+    ZLibCompressor *  compressor_;
+    ZLibDecompressor *decompressor_;
+    QBuffer           outgoing_buffer_, incoming_buffer_;
+    int               errorCode_;
 };
 
 #endif // COMPRESSIONHANDLER_H
diff --git a/src/xmpp/xmpp-core/connector.cpp b/src/xmpp/xmpp-core/connector.cpp
index b8617787..f10f75c7 100644
--- a/src/xmpp/xmpp-core/connector.cpp
+++ b/src/xmpp/xmpp-core/connector.cpp
@@ -42,131 +42,89 @@
 
 //#define XMPP_DEBUG
 #ifdef XMPP_DEBUG
-# define XDEBUG (qDebug() << this << "#" << __FUNCTION__ << ":")
+#define XDEBUG (qDebug() << this << "#" << __FUNCTION__ << ":")
 #endif
 
 using namespace XMPP;
 
-static const int XMPP_DEFAULT_PORT = 5222;
-static const int XMPP_LEGACY_PORT = 5223;
-static const char* XMPP_CLIENT_SRV = "xmpp-client";
-static const char* XMPP_CLIENT_TRANSPORT = "tcp";
+static const int   XMPP_DEFAULT_PORT     = 5222;
+static const int   XMPP_LEGACY_PORT      = 5223;
+static const char *XMPP_CLIENT_SRV       = "xmpp-client";
+static const char *XMPP_CLIENT_TRANSPORT = "tcp";
 
 //----------------------------------------------------------------------------
 // Connector
 //----------------------------------------------------------------------------
-Connector::Connector(QObject *parent)
-:QObject(parent)
+Connector::Connector(QObject *parent) : QObject(parent)
 {
     setUseSSL(false);
     setPeerAddressNone();
 }
 
-Connector::~Connector()
-{
-}
+Connector::~Connector() {}
 
-bool Connector::useSSL() const
-{
-    return ssl;
-}
+bool Connector::useSSL() const { return ssl; }
 
-bool Connector::havePeerAddress() const
-{
-    return haveaddr;
-}
+bool Connector::havePeerAddress() const { return haveaddr; }
 
-QHostAddress Connector::peerAddress() const
-{
-    return addr;
-}
+QHostAddress Connector::peerAddress() const { return addr; }
 
-quint16 Connector::peerPort() const
-{
-    return port;
-}
+quint16 Connector::peerPort() const { return port; }
 
-void Connector::setUseSSL(bool b)
-{
-    ssl = b;
-}
+void Connector::setUseSSL(bool b) { ssl = b; }
 
 void Connector::setPeerAddressNone()
 {
     haveaddr = false;
-    addr = QHostAddress();
-    port = 0;
+    addr     = QHostAddress();
+    port     = 0;
 }
 
 void Connector::setPeerAddress(const QHostAddress &_addr, quint16 _port)
 {
     haveaddr = true;
-    addr = _addr;
-    port = _port;
+    addr     = _addr;
+    port     = _port;
 }
 
-QString Connector::host() const
-{
-    return QString();
-}
+QString Connector::host() const { return QString(); }
 
 //----------------------------------------------------------------------------
 // AdvancedConnector::Proxy
 //----------------------------------------------------------------------------
 
-int AdvancedConnector::Proxy::type() const
-{
-    return t;
-}
+int AdvancedConnector::Proxy::type() const { return t; }
 
-QString AdvancedConnector::Proxy::host() const
-{
-    return v_host;
-}
+QString AdvancedConnector::Proxy::host() const { return v_host; }
 
-quint16 AdvancedConnector::Proxy::port() const
-{
-    return v_port;
-}
+quint16 AdvancedConnector::Proxy::port() const { return v_port; }
 
-QUrl AdvancedConnector::Proxy::url() const
-{
-    return v_url;
-}
+QUrl AdvancedConnector::Proxy::url() const { return v_url; }
 
-QString AdvancedConnector::Proxy::user() const
-{
-    return v_user;
-}
+QString AdvancedConnector::Proxy::user() const { return v_user; }
 
-QString AdvancedConnector::Proxy::pass() const
-{
-    return v_pass;
-}
+QString AdvancedConnector::Proxy::pass() const { return v_pass; }
 
-int AdvancedConnector::Proxy::pollInterval() const
-{
-    return v_poll;
-}
+int AdvancedConnector::Proxy::pollInterval() const { return v_poll; }
 
 void AdvancedConnector::Proxy::setHttpConnect(const QString &host, quint16 port)
 {
-    t = HttpConnect;
+    t      = HttpConnect;
     v_host = host;
     v_port = port;
 }
 
 void AdvancedConnector::Proxy::setHttpPoll(const QString &host, quint16 port, const QUrl &url)
 {
-    t = HttpPoll;
+    t      = HttpPoll;
     v_host = host;
     v_port = port;
-    v_url = url;
+    v_url  = url;
 }
 
 void AdvancedConnector::Proxy::setSocks(const QString &host, quint16 port)
 {
-    t = Socks;
+    t      = Socks;
     v_host = host;
     v_port = port;
 }
@@ -177,10 +135,7 @@ void AdvancedConnector::Proxy::setUserPass(const QString &user, const QString &p
     v_pass = pass;
 }
 
-void AdvancedConnector::Proxy::setPollInterval(int secs)
-{
-    v_poll = secs;
-}
+void AdvancedConnector::Proxy::setPollInterval(int secs) { v_poll = secs; }
 
 //----------------------------------------------------------------------------
 // AdvancedConnector
@@ -188,29 +143,27 @@ void AdvancedConnector::Proxy::setPollInterval(int secs)
 typedef enum { Idle, Connecting, Connected } Mode;
 typedef enum { Force, Probe, Never } LegacySSL;
 
-class AdvancedConnector::Private
-{
+class AdvancedConnector::Private {
 public:
     ByteStream *bs; //!< Socket to use
 
     /* configuration values / "options" */
-    QString opt_host; //!< explicit host from config
-    quint16 opt_port; //!< explicit port from config
-    LegacySSL opt_ssl; //!< Whether to use legacy SSL support
-    Proxy proxy; //!< Proxy configuration
+    QString   opt_host; //!< explicit host from config
+    quint16   opt_port; //!< explicit port from config
+    LegacySSL opt_ssl;  //!< Whether to use legacy SSL support
+    Proxy     proxy;    //!< Proxy configuration
 
     /* State tracking values */
-    Mode mode; //!< Idle, Connecting, Connected
-    QString host; //!< Host we currently try to connect to, set from connectToServer()
-    int port; //!< Port we currently try to connect to, set from connectToServer() and bs_error()
-    int errorCode; //!< Current error, if any
+    Mode    mode;      //!< Idle, Connecting, Connected
+    QString host;      //!< Host we currently try to connect to, set from connectToServer()
+    int     port;      //!< Port we currently try to connect to, set from connectToServer() and bs_error()
+    int     errorCode; //!< Current error, if any
 };
 
-AdvancedConnector::AdvancedConnector(QObject *parent)
-:Connector(parent)
+AdvancedConnector::AdvancedConnector(QObject *parent) : Connector(parent)
 {
-    d = new Private;
-    d->bs = nullptr;
+    d          = new Private;
+    d->bs      = nullptr;
     d->opt_ssl = Never;
     cleanup();
     d->errorCode = 0;
@@ -236,7 +189,7 @@ void AdvancedConnector::cleanup()
 
 void AdvancedConnector::setProxy(const Proxy &proxy)
 {
-    if(d->mode != Idle)
+    if (d->mode != Idle)
         return;
     d->proxy = proxy;
 }
@@ -247,11 +200,11 @@ void AdvancedConnector::setOptHostPort(const QString &_host, quint16 _port)
     XDEBUG << "h:" << _host << "p:" << _port;
 #endif
 
-    if(d->mode != Idle)
+    if (d->mode != Idle)
         return;
 
     // empty host means disable explicit host support
-    if(_host.isEmpty()) {
+    if (_host.isEmpty()) {
         d->opt_host.clear();
         return;
     }
@@ -265,7 +218,7 @@ void AdvancedConnector::setOptProbe(bool b)
     XDEBUG << "b:" << b;
 #endif
 
-    if(d->mode != Idle)
+    if (d->mode != Idle)
         return;
     d->opt_ssl = (b ? Probe : Never);
 }
@@ -276,7 +229,7 @@ void AdvancedConnector::setOptSSL(bool b)
     XDEBUG << "b:" << b;
 #endif
 
-    if(d->mode != Idle)
+    if (d->mode != Idle)
         return;
     d->opt_ssl = (b ? Force : Never);
 }
@@ -287,13 +240,13 @@ void AdvancedConnector::connectToServer(const QString &server)
     XDEBUG << "s:" << server;
 #endif
 
-    if(d->mode != Idle)
+    if (d->mode != Idle)
         return;
-    if(server.isEmpty())
+    if (server.isEmpty())
         return;
 
     d->errorCode = 0;
-    d->mode = Connecting;
+    d->mode      = Connecting;
 
     // Encode the servername
     d->host = QUrl::toAce(server);
@@ -310,61 +263,58 @@ void AdvancedConnector::connectToServer(const QString &server)
         d->opt_ssl = Never; // probe is possible only with direct connect
     }
 
-    if(d->proxy.type() == Proxy::HttpPoll) {
+    if (d->proxy.type() == Proxy::HttpPoll) {
         HttpPoll *s = new HttpPoll;
-        d->bs = s;
+        d->bs       = s;
 
         connect(s, SIGNAL(connected()), SLOT(bs_connected()));
         connect(s, SIGNAL(syncStarted()), SLOT(http_syncStarted()));
         connect(s, SIGNAL(syncFinished()), SLOT(http_syncFinished()));
         connect(s, SIGNAL(error(int)), SLOT(bs_error(int)));
 
-        if(!d->proxy.user().isEmpty())
+        if (!d->proxy.user().isEmpty())
             s->setAuth(d->proxy.user(), d->proxy.pass());
         s->setPollInterval(d->proxy.pollInterval());
 
-        if(d->proxy.host().isEmpty())
+        if (d->proxy.host().isEmpty())
             s->connectToUrl(d->proxy.url());
         else
             s->connectToHost(d->proxy.host(), d->proxy.port(), d->proxy.url());
-    }
-    else if (d->proxy.type() == Proxy::HttpConnect) {
+    } else if (d->proxy.type() == Proxy::HttpConnect) {
         HttpConnect *s = new HttpConnect;
-        d->bs = s;
+        d->bs          = s;
 
         connect(s, SIGNAL(connected()), SLOT(bs_connected()));
         connect(s, SIGNAL(error(int)), SLOT(bs_error(int)));
 
-        if(!d->opt_host.isEmpty()) {
+        if (!d->opt_host.isEmpty()) {
             d->host = d->opt_host;
             d->port = d->opt_port;
         }
 
-        if(!d->proxy.user().isEmpty())
+        if (!d->proxy.user().isEmpty())
             s->setAuth(d->proxy.user(), d->proxy.pass());
 
         s->connectToHost(d->proxy.host(), d->proxy.port(), d->host, d->port);
-    }
-    else if (d->proxy.type() == Proxy::Socks) {
+    } else if (d->proxy.type() == Proxy::Socks) {
         SocksClient *s = new SocksClient;
-        d->bs = s;
+        d->bs          = s;
 
         connect(s, SIGNAL(connected()), SLOT(bs_connected()));
         connect(s, SIGNAL(error(int)), SLOT(bs_error(int)));
 
-        if(!d->opt_host.isEmpty()) {
+        if (!d->opt_host.isEmpty()) {
             d->host = d->opt_host;
             d->port = d->opt_port;
         }
 
-        if(!d->proxy.user().isEmpty())
+        if (!d->proxy.user().isEmpty())
             s->setAuth(d->proxy.user(), d->proxy.pass());
 
         s->connectToHost(d->proxy.host(), d->proxy.port(), d->host, d->port);
-    }
-    else {
+    } else {
         BSocket *s = new BSocket;
-        d->bs = s;
+        d->bs      = s;
 #ifdef XMPP_DEBUG
         XDEBUG << "Adding socket:" << s;
 #endif
@@ -372,7 +322,7 @@ void AdvancedConnector::connectToServer(const QString &server)
         connect(s, SIGNAL(connected()), SLOT(bs_connected()));
         connect(s, SIGNAL(error(int)), SLOT(bs_error(int)));
 
-        if(!d->opt_host.isEmpty()) { /* if custom host:port */
+        if (!d->opt_host.isEmpty()) { /* if custom host:port */
             d->host = d->opt_host;
             d->port = d->opt_port;
             s->connectToHost(d->host, d->port);
@@ -387,46 +337,39 @@ void AdvancedConnector::connectToServer(const QString &server)
 
 void AdvancedConnector::changePollInterval(int secs)
 {
-    if(d->bs && (d->bs->inherits("XMPP::HttpPoll") || d->bs->inherits("HttpPoll"))) {
-        HttpPoll *s = static_cast<HttpPoll*>(d->bs);
+    if (d->bs && (d->bs->inherits("XMPP::HttpPoll") || d->bs->inherits("HttpPoll"))) {
+        HttpPoll *s = static_cast<HttpPoll *>(d->bs);
         s->setPollInterval(secs);
     }
 }
 
 ByteStream *AdvancedConnector::stream() const
 {
-    if(d->mode == Connected)
+    if (d->mode == Connected)
         return d->bs;
     else
         return nullptr;
 }
 
-void AdvancedConnector::done()
-{
-    cleanup();
-}
+void AdvancedConnector::done() { cleanup(); }
 
-int AdvancedConnector::errorCode() const
-{
-    return d->errorCode;
-}
+int AdvancedConnector::errorCode() const { return d->errorCode; }
 
 void AdvancedConnector::bs_connected()
 {
 #ifdef XMPP_DEBUG
     XDEBUG;
 #endif
-    if(d->proxy.type() == Proxy::None) {
-        QHostAddress h = (static_cast<BSocket*>(d->bs))->peerAddress();
-        int p = (static_cast<BSocket*>(d->bs))->peerPort();
+    if (d->proxy.type() == Proxy::None) {
+        QHostAddress h = (static_cast<BSocket *>(d->bs))->peerAddress();
+        int          p = (static_cast<BSocket *>(d->bs))->peerPort();
         setPeerAddress(h, p);
     }
 
     // We won't use ssl with HttpPoll since it has ow tls handler enabled for https.
     // The only variant for ssl is legacy port in probing or forced mde.
-    if(d->proxy.type() != Proxy::HttpPoll  && (d->opt_ssl == Force || (
-        d->opt_ssl == Probe && peerPort() == XMPP_LEGACY_PORT)))
-    {
+    if (d->proxy.type() != Proxy::HttpPoll
+        && (d->opt_ssl == Force || (d->opt_ssl == Probe && peerPort() == XMPP_LEGACY_PORT))) {
         // in case of Probe it's ok to check actual peer "port" since we are sure Proxy=None
         setUseSSL(true);
     }
@@ -441,67 +384,64 @@ void AdvancedConnector::bs_error(int x)
     XDEBUG << "e:" << x;
 #endif
 
-    if(d->mode == Connected) {
+    if (d->mode == Connected) {
         d->errorCode = ErrStream;
         emit error();
         return;
     }
 
     bool proxyError = false;
-    int err = ErrConnectionRefused;
-    int t = d->proxy.type();
+    int  err        = ErrConnectionRefused;
+    int  t          = d->proxy.type();
 
 #ifdef XMPP_DEBUG
     qDebug("bse1");
 #endif
 
     // figure out the error
-    if(t == Proxy::None) {
-        if(x == BSocket::ErrHostNotFound)
+    if (t == Proxy::None) {
+        if (x == BSocket::ErrHostNotFound)
             err = ErrHostNotFound;
         else
             err = ErrConnectionRefused;
-    }
-    else if(t == Proxy::HttpConnect) {
-        if(x == HttpConnect::ErrConnectionRefused)
+    } else if (t == Proxy::HttpConnect) {
+        if (x == HttpConnect::ErrConnectionRefused)
             err = ErrConnectionRefused;
-        else if(x == HttpConnect::ErrHostNotFound)
+        else if (x == HttpConnect::ErrHostNotFound)
             err = ErrHostNotFound;
         else {
             proxyError = true;
-            if(x == HttpConnect::ErrProxyAuth)
+            if (x == HttpConnect::ErrProxyAuth)
                 err = ErrProxyAuth;
-            else if(x == HttpConnect::ErrProxyNeg)
+            else if (x == HttpConnect::ErrProxyNeg)
                 err = ErrProxyNeg;
             else
                 err = ErrProxyConnect;
         }
-    }
-    else if(t == Proxy::HttpPoll) {
-        if(x == HttpPoll::ErrConnectionRefused)
+    } else if (t == Proxy::HttpPoll) {
+        if (x == HttpPoll::ErrConnectionRefused)
             err = ErrConnectionRefused;
-        else if(x == HttpPoll::ErrHostNotFound)
+        else if (x == HttpPoll::ErrHostNotFound)
             err = ErrHostNotFound;
         else {
             proxyError = true;
-            if(x == HttpPoll::ErrProxyAuth)
+            if (x == HttpPoll::ErrProxyAuth)
                 err = ErrProxyAuth;
-            else if(x == HttpPoll::ErrProxyNeg)
+            else if (x == HttpPoll::ErrProxyNeg)
                 err = ErrProxyNeg;
             else
                 err = ErrProxyConnect;
         }
-    }
-    else if(t == Proxy::Socks) {
-        if(x == SocksClient::ErrConnectionRefused)
+    } else if (t == Proxy::Socks) {
+        if (x == SocksClient::ErrConnectionRefused)
             err = ErrConnectionRefused;
-        else if(x == SocksClient::ErrHostNotFound)
+        else if (x == SocksClient::ErrHostNotFound)
             err = ErrHostNotFound;
         else {
             proxyError = true;
-            if(x == SocksClient::ErrProxyAuth)
+            if (x == SocksClient::ErrProxyAuth)
                 err = ErrProxyAuth;
-            else if(x == SocksClient::ErrProxyNeg)
+            else if (x == SocksClient::ErrProxyNeg)
                 err = ErrProxyNeg;
             else
                 err = ErrProxyConnect;
@@ -509,7 +449,7 @@ void AdvancedConnector::bs_error(int x)
     }
 
     // no-multi or proxy error means we quit
-    if(proxyError) {
+    if (proxyError) {
         cleanup();
         d->errorCode = err;
         emit error();
@@ -520,12 +460,12 @@ void AdvancedConnector::bs_error(int x)
         if we shall probe the ssl legacy port, and we just did that (port=legacy),
         then try to connect to the normal port instead
     */
-    if(d->opt_ssl == Probe && d->port == XMPP_LEGACY_PORT) {
+    if (d->opt_ssl == Probe && d->port == XMPP_LEGACY_PORT) {
 #ifdef XMPP_DEBUG
         qDebug("bse1.2");
 #endif
-        BSocket *s = static_cast<BSocket*>(d->bs);
-        d->port = XMPP_DEFAULT_PORT;
+        BSocket *s = static_cast<BSocket *>(d->bs);
+        d->port    = XMPP_DEFAULT_PORT;
         // at this moment we already tried everything from srv. so just try the host itself
         s->connectToHost(d->host, d->port);
     }
@@ -540,22 +480,13 @@ void AdvancedConnector::bs_error(int x)
     }
 }
 
-void AdvancedConnector::http_syncStarted()
-{
-    httpSyncStarted();
-}
+void AdvancedConnector::http_syncStarted() { httpSyncStarted(); }
 
-void AdvancedConnector::http_syncFinished()
-{
-    httpSyncFinished();
-}
+void AdvancedConnector::http_syncFinished() { httpSyncFinished(); }
 
 void AdvancedConnector::t_timeout()
 {
-    //bs_error(-1);
+    // bs_error(-1);
 }
 
-QString AdvancedConnector::host() const
-{
-    return d->host;
-}
+QString AdvancedConnector::host() const { return d->host; }
diff --git a/src/xmpp/xmpp-core/parser.cpp b/src/xmpp/xmpp-core/parser.cpp
index 282839db..37bd9fdc 100644
--- a/src/xmpp/xmpp-core/parser.cpp
+++ b/src/xmpp/xmpp-core/parser.cpp
@@ -59,8 +59,7 @@ static bool qt_bug_have;
 //----------------------------------------------------------------------------
 // StreamInput
 //----------------------------------------------------------------------------
-class StreamInput : public QXmlInputSource
-{
+class StreamInput : public QXmlInputSource {
 public:
     StreamInput()
     {
@@ -68,35 +67,26 @@ class StreamInput : public QXmlInputSource
         reset();
     }
 
-    ~StreamInput()
-    {
-        delete dec;
-    }
+    ~StreamInput() { delete dec; }
 
     void reset()
     {
         delete dec;
         dec = nullptr;
         in.resize(0);
-        out = "";
-        at = 0;
-        paused = false;
+        out                 = "";
+        at                  = 0;
+        paused              = false;
         mightChangeEncoding = true;
-        checkBad = true;
-        last = QChar();
-        v_encoding = "";
+        checkBad            = true;
+        last                = QChar();
+        v_encoding          = "";
         resetLastData();
     }
 
-    void resetLastData()
-    {
-        last_string = "";
-    }
+    void resetLastData() { last_string = ""; }
 
-    QString lastString() const
-    {
-        return last_string;
-    }
+    QString lastString() const { return last_string; }
 
     void appendData(const QByteArray &a)
     {
@@ -106,14 +96,11 @@ class StreamInput : public QXmlInputSource
         processBuf();
     }
 
-    QChar lastRead()
-    {
-        return last;
-    }
+    QChar lastRead() { return last; }
 
     QChar next()
     {
-        if(paused)
+        if (paused)
             return EndOfData;
         else
             return readNext();
@@ -121,32 +108,30 @@ class StreamInput : public QXmlInputSource
 
     // NOTE: setting 'peek' to true allows the same char to be read again,
     //       however this still advances the internal byte processing.
-    QChar readNext(bool peek=false)
+    QChar readNext(bool peek = false)
     {
         QChar c;
-        if(mightChangeEncoding)
+        if (mightChangeEncoding)
             c = EndOfData;
         else {
-            if(out.isEmpty()) {
+            if (out.isEmpty()) {
                 QString s;
-                if(!tryExtractPart(&s))
+                if (!tryExtractPart(&s))
                     c = EndOfData;
                 else {
                     out = s;
-                    c = out[0];
+                    c   = out[0];
                 }
-            }
-            else
+            } else
                 c = out[0];
-            if(!peek)
+            if (!peek)
                 out.remove(0, 1);
         }
-        if(c == EndOfData) {
+        if (c == EndOfData) {
 #ifdef XMPP_PARSER_DEBUG
             printf("next() = EOD\n");
 #endif
-        }
-        else {
+        } else {
 #ifdef XMPP_PARSER_DEBUG
             printf("next() = [%c]\n", c.latin1());
 #endif
@@ -164,87 +149,78 @@ class StreamInput : public QXmlInputSource
         return a;
     }
 
-    void pause(bool b)
-    {
-        paused = b;
-    }
+    void pause(bool b) { paused = b; }
 
-    bool isPaused()
-    {
-        return paused;
-    }
+    bool isPaused() { return paused; }
 
-    QString encoding() const
-    {
-        return v_encoding;
-    }
+    QString encoding() const { return v_encoding; }
 
 private:
     QTextDecoder *dec;
-    QByteArray in;
-    QString out;
-    int at;
-    bool paused;
-    bool mightChangeEncoding;
-    QChar last;
-    QString v_encoding;
-    QString last_string;
-    bool checkBad;
+    QByteArray    in;
+    QString       out;
+    int           at;
+    bool          paused;
+    bool          mightChangeEncoding;
+    QChar         last;
+    QString       v_encoding;
+    QString       last_string;
+    bool          checkBad;
 
     void processBuf()
     {
 #ifdef XMPP_PARSER_DEBUG
         printf("processing.  size=%d, at=%d\n", in.size(), at);
 #endif
-        if(!dec) {
+        if (!dec) {
             QTextCodec *codec = nullptr;
-            uchar *p = (uchar *)in.data() + at;
-            int size = in.size() - at;
+            uchar *     p     = (uchar *)in.data() + at;
+            int         size  = in.size() - at;
 
             // do we have enough information to determine the encoding?
-            if(size == 0)
+            if (size == 0)
                 return;
             bool utf16 = false;
-            if(p[0] == 0xfe || p[0] == 0xff) {
+            if (p[0] == 0xfe || p[0] == 0xff) {
                 // probably going to be a UTF-16 byte order mark
-                if(size < 2)
+                if (size < 2)
                     return;
-                if((p[0] == 0xfe && p[1] == 0xff) || (p[0] == 0xff && p[1] == 0xfe)) {
+                if ((p[0] == 0xfe && p[1] == 0xff) || (p[0] == 0xff && p[1] == 0xfe)) {
                     // ok it is UTF-16
                     utf16 = true;
                 }
             }
-            if(utf16)
+            if (utf16)
                 codec = QTextCodec::codecForMib(1000); // UTF-16
             else
                 codec = QTextCodec::codecForMib(106); // UTF-8
 
             v_encoding = codec->name();
-            dec = codec->makeDecoder();
+            dec        = codec->makeDecoder();
 
             // for utf16, put in the byte order mark
-            if(utf16) {
+            if (utf16) {
                 out += dec->toUnicode((const char *)p, 2);
                 at += 2;
             }
         }
 
-        if(mightChangeEncoding) {
-            while(1) {
+        if (mightChangeEncoding) {
+            while (1) {
                 int n = out.indexOf('<');
-                if(n != -1) {
+                if (n != -1) {
                     // we need a closing bracket
                     int n2 = out.indexOf('>', n);
-                    if(n2 != -1) {
+                    if (n2 != -1) {
                         ++n2;
-                        QString h = out.mid(n, n2-n);
-                        QString enc = processXmlHeader(h);
+                        QString     h     = out.mid(n, n2 - n);
+                        QString     enc   = processXmlHeader(h);
                         QTextCodec *codec = nullptr;
-                        if(!enc.isEmpty())
+                        if (!enc.isEmpty())
                             codec = QTextCodec::codecForName(enc.toLatin1());
 
                         // changing codecs
-                        if(codec) {
+                        if (codec) {
                             v_encoding = codec->name();
                             delete dec;
                             dec = codec->makeDecoder();
@@ -257,9 +233,9 @@ class StreamInput : public QXmlInputSource
                     }
                 }
                 QString s;
-                if(!tryExtractPart(&s))
+                if (!tryExtractPart(&s))
                     break;
-                if(checkBad && checkForBadChars(s)) {
+                if (checkBad && checkForBadChars(s)) {
                     // go to the parser
                     mightChangeEncoding = false;
                     out.truncate(0);
@@ -274,56 +250,55 @@ class StreamInput : public QXmlInputSource
 
     QString processXmlHeader(const QString &h)
     {
-        if(h.left(5) != "<?xml")
+        if (h.left(5) != "<?xml")
             return "";
 
-        int endPos = h.indexOf(">");
+        int endPos   = h.indexOf(">");
         int startPos = h.indexOf("encoding");
-        if(startPos < endPos && startPos != -1) {
+        if (startPos < endPos && startPos != -1) {
             QString encoding;
             do {
                 startPos++;
-                if(startPos > endPos) {
+                if (startPos > endPos) {
                     return "";
                 }
-            } while(h[startPos] != '"' && h[startPos] != '\'');
+            } while (h[startPos] != '"' && h[startPos] != '\'');
             startPos++;
-            while(h[startPos] != '"' && h[startPos] != '\'') {
+            while (h[startPos] != '"' && h[startPos] != '\'') {
                 encoding += h[startPos];
                 startPos++;
-                if(startPos > endPos) {
+                if (startPos > endPos) {
                     return "";
                 }
             }
             return encoding;
-        }
-        else
+        } else
             return "";
     }
 
     bool tryExtractPart(QString *s)
     {
         int size = in.size() - at;
-        if(size == 0)
+        if (size == 0)
             return false;
-        uchar *p = (uchar *)in.data() + at;
+        uchar * p = (uchar *)in.data() + at;
         QString nextChars;
-        while(1) {
+        while (1) {
             nextChars = dec->toUnicode((const char *)p, 1);
             ++p;
             ++at;
-            if(!nextChars.isEmpty())
+            if (!nextChars.isEmpty())
                 break;
-            if(at == (int)in.size())
+            if (at == (int)in.size())
                 return false;
         }
         last_string += nextChars;
         *s = nextChars;
 
         // free processed data?
-        if(at >= 1024) {
-            char *p = in.data();
-            int size = in.size() - at;
+        if (at >= 1024) {
+            char *p    = in.data();
+            int   size = in.size() - at;
             memmove(p, p + at, size);
             in.resize(size);
             at = 0;
@@ -335,12 +310,12 @@ class StreamInput : public QXmlInputSource
     bool checkForBadChars(const QString &s)
     {
         int len = s.indexOf('<');
-        if(len == -1)
+        if (len == -1)
             len = s.length();
         else
             checkBad = false;
-        for(int n = 0; n < len; ++n) {
-            if(!s.at(n).isSpace())
+        for (int n = 0; n < len; ++n) {
+            if (!s.at(n).isSpace())
                 return true;
         }
         return false;
@@ -351,371 +326,324 @@ class StreamInput : public QXmlInputSource
 // ParserHandler
 //----------------------------------------------------------------------------
 namespace XMPP {
-    class ParserHandler : public QXmlDefaultHandler
+class ParserHandler : public QXmlDefaultHandler {
+public:
+    explicit ParserHandler(StreamInput *_in, QDomDocument *_doc) : in(_in), doc(_doc) {}
+
+    ~ParserHandler()
     {
-    public:
-        explicit ParserHandler(StreamInput *_in, QDomDocument *_doc)
-            : in(_in)
-            , doc(_doc)
-        {
+        while (!eventList.isEmpty()) {
+            delete eventList.takeFirst();
         }
+    }
 
-        ~ParserHandler()
-        {
-            while (!eventList.isEmpty()) {
-                delete eventList.takeFirst();
-            }
-        }
+    bool startDocument()
+    {
+        depth = 0;
+        return true;
+    }
 
-        bool startDocument()
-        {
-            depth = 0;
-            return true;
-        }
+    bool endDocument() { return true; }
 
-        bool endDocument()
-        {
-            return true;
+    bool startPrefixMapping(const QString &prefix, const QString &uri)
+    {
+        if (depth == 0) {
+            nsnames += prefix;
+            nsvalues += uri;
         }
+        return true;
+    }
 
-        bool startPrefixMapping(const QString &prefix, const QString &uri)
-        {
-            if(depth == 0) {
-                nsnames += prefix;
-                nsvalues += uri;
+    bool startElement(const QString &namespaceURI, const QString &localName, const QString &qName,
+                      const QXmlAttributes &atts)
+    {
+        if (depth == 0) {
+            Parser::Event *e = new Parser::Event;
+            QXmlAttributes a;
+            for (int n = 0; n < atts.length(); ++n) {
+                QString uri = atts.uri(n);
+                QString ln  = atts.localName(n);
+                if (a.index(uri, ln) == -1)
+                    a.append(atts.qName(n), uri, ln, atts.value(n));
             }
-            return true;
-        }
-
-        bool startElement(const QString &namespaceURI, const QString &localName, const QString &qName, const QXmlAttributes &atts)
-        {
-            if(depth == 0) {
-                Parser::Event *e = new Parser::Event;
-                QXmlAttributes a;
-                for(int n = 0; n < atts.length(); ++n) {
-                    QString uri = atts.uri(n);
-                    QString ln = atts.localName(n);
-                    if(a.index(uri, ln) == -1)
-                        a.append(atts.qName(n), uri, ln, atts.value(n));
-                }
-                e->setDocumentOpen(namespaceURI, localName, qName, a, nsnames, nsvalues);
-                nsnames.clear();
-                nsvalues.clear();
-                e->setActualString(in->lastString());
+            e->setDocumentOpen(namespaceURI, localName, qName, a, nsnames, nsvalues);
+            nsnames.clear();
+            nsvalues.clear();
+            e->setActualString(in->lastString());
 
-                in->resetLastData();
-                eventList.append(e);
-                in->pause(true);
+            in->resetLastData();
+            eventList.append(e);
+            in->pause(true);
+        } else {
+            QDomElement e = doc->createElementNS(namespaceURI, qName);
+            for (int n = 0; n < atts.length(); ++n) {
+                QString uri = atts.uri(n);
+                QString ln  = atts.localName(n);
+                bool    have;
+                if (!uri.isEmpty()) {
+                    have = e.hasAttributeNS(uri, ln);
+                    if (qt_bug_have)
+                        have = !have;
+                } else
+                    have = e.hasAttribute(ln);
+                if (!have)
+                    e.setAttributeNS(uri, atts.qName(n), atts.value(n));
             }
-            else {
-                QDomElement e = doc->createElementNS(namespaceURI, qName);
-                for(int n = 0; n < atts.length(); ++n) {
-                    QString uri = atts.uri(n);
-                    QString ln = atts.localName(n);
-                    bool have;
-                    if(!uri.isEmpty()) {
-                        have = e.hasAttributeNS(uri, ln);
-                        if(qt_bug_have)
-                            have = !have;
-                    }
-                    else
-                        have = e.hasAttribute(ln);
-                    if(!have)
-                        e.setAttributeNS(uri, atts.qName(n), atts.value(n));
-                }
 
-                if(depth == 1) {
-                    elem = e;
-                    current = e;
-                }
-                else {
-                    current.appendChild(e);
-                    current = e;
-                }
+            if (depth == 1) {
+                elem    = e;
+                current = e;
+            } else {
+                current.appendChild(e);
+                current = e;
             }
-            ++depth;
-            return true;
         }
+        ++depth;
+        return true;
+    }
 
-        bool endElement(const QString &namespaceURI, const QString &localName, const QString &qName)
-        {
-            --depth;
-            if(depth == 0) {
+    bool endElement(const QString &namespaceURI, const QString &localName, const QString &qName)
+    {
+        --depth;
+        if (depth == 0) {
+            Parser::Event *e = new Parser::Event;
+            e->setDocumentClose(namespaceURI, localName, qName);
+            e->setActualString(in->lastString());
+            in->resetLastData();
+            eventList.append(e);
+            in->pause(true);
+        } else {
+            // done with a depth 1 element?
+            if (depth == 1) {
                 Parser::Event *e = new Parser::Event;
-                e->setDocumentClose(namespaceURI, localName, qName);
+                e->setElement(elem);
                 e->setActualString(in->lastString());
                 in->resetLastData();
                 eventList.append(e);
                 in->pause(true);
-            }
-            else {
-                // done with a depth 1 element?
-                if(depth == 1) {
-                    Parser::Event *e = new Parser::Event;
-                    e->setElement(elem);
-                    e->setActualString(in->lastString());
-                    in->resetLastData();
-                    eventList.append(e);
-                    in->pause(true);
-
-                    elem = QDomElement();
-                    current = QDomElement();
-                }
-                else
-                    current = current.parentNode().toElement();
-            }
-
-            if(in->lastRead() == '/')
-                checkNeedMore();
 
-            return true;
+                elem    = QDomElement();
+                current = QDomElement();
+            } else
+                current = current.parentNode().toElement();
         }
 
-        bool characters(const QString &str)
-        {
-            if(depth >= 1) {
-                QString content = str;
-                if(content.isEmpty())
-                    return true;
+        if (in->lastRead() == '/')
+            checkNeedMore();
 
-                if(!current.isNull()) {
-                    QDomText text = doc->createTextNode(content);
-                    current.appendChild(text);
-                }
+        return true;
+    }
+
+    bool characters(const QString &str)
+    {
+        if (depth >= 1) {
+            QString content = str;
+            if (content.isEmpty())
+                return true;
+
+            if (!current.isNull()) {
+                QDomText text = doc->createTextNode(content);
+                current.appendChild(text);
             }
-            return true;
         }
+        return true;
+    }
 
-        /*bool processingInstruction(const QString &target, const QString &data)
-        {
-            printf("Processing: [%s], [%s]\n", target.latin1(), data.latin1());
-            in->resetLastData();
-            return true;
-        }*/
-
-        void checkNeedMore()
-        {
-            // Here we will work around QXmlSimpleReader strangeness and self-closing tags.
-            // The problem is that endElement() is called when the '/' is read, not when
-            // the final '>' is read.  This is a potential problem when obtaining unprocessed
-            // bytes from StreamInput after this event, as the '>' character will end up
-            // in the unprocessed chunk.  To work around this, we need to advance StreamInput's
-            // internal byte processing, but not the xml character data.  This way, the '>'
-            // will get processed and will no longer be in the unprocessed return, but
-            // QXmlSimpleReader can still read it.  To do this, we call StreamInput::readNext
-            // with 'peek' mode.
-            QChar c = in->readNext(true); // peek
-            if(c == QXmlInputSource::EndOfData) {
-                needMore = true;
-            }
-            else {
-                // We'll assume the next char is a '>'.  If it isn't, then
-                // QXmlSimpleReader will deal with that problem on the next
-                // parse.  We don't need to take any action here.
-                needMore = false;
-
-                // there should have been a pending event
-                if (!eventList.isEmpty()) {
-                    Parser::Event *e = eventList.first();
-                    e->setActualString(e->actualString() + '>');
-                    in->resetLastData();
-                }
+    /*bool processingInstruction(const QString &target, const QString &data)
+    {
+        printf("Processing: [%s], [%s]\n", target.latin1(), data.latin1());
+        in->resetLastData();
+        return true;
+    }*/
+
+    void checkNeedMore()
+    {
+        // Here we will work around QXmlSimpleReader strangeness and self-closing tags.
+        // The problem is that endElement() is called when the '/' is read, not when
+        // the final '>' is read.  This is a potential problem when obtaining unprocessed
+        // bytes from StreamInput after this event, as the '>' character will end up
+        // in the unprocessed chunk.  To work around this, we need to advance StreamInput's
+        // internal byte processing, but not the xml character data.  This way, the '>'
+        // will get processed and will no longer be in the unprocessed return, but
+        // QXmlSimpleReader can still read it.  To do this, we call StreamInput::readNext
+        // with 'peek' mode.
+        QChar c = in->readNext(true); // peek
+        if (c == QXmlInputSource::EndOfData) {
+            needMore = true;
+        } else {
+            // We'll assume the next char is a '>'.  If it isn't, then
+            // QXmlSimpleReader will deal with that problem on the next
+            // parse.  We don't need to take any action here.
+            needMore = false;
+
+            // there should have been a pending event
+            if (!eventList.isEmpty()) {
+                Parser::Event *e = eventList.first();
+                e->setActualString(e->actualString() + '>');
+                in->resetLastData();
             }
         }
+    }
 
-        Parser::Event *takeEvent()
-        {
-            if(needMore)
-                return nullptr;
-            if(eventList.isEmpty())
-                return nullptr;
+    Parser::Event *takeEvent()
+    {
+        if (needMore)
+            return nullptr;
+        if (eventList.isEmpty())
+            return nullptr;
 
-            Parser::Event *e = eventList.takeFirst();
-            in->pause(false);
-            return e;
-        }
+        Parser::Event *e = eventList.takeFirst();
+        in->pause(false);
+        return e;
+    }
 
-        StreamInput *in;
-        QDomDocument *doc;
-        int depth = 1;
-        QStringList nsnames, nsvalues;
-        QDomElement elem, current;
-        QList<Parser::Event*> eventList;
-        bool needMore = false;
-    };
+    StreamInput *          in;
+    QDomDocument *         doc;
+    int                    depth = 1;
+    QStringList            nsnames, nsvalues;
+    QDomElement            elem, current;
+    QList<Parser::Event *> eventList;
+    bool                   needMore = false;
+};
 }; // namespace XMPP
 
 //----------------------------------------------------------------------------
 // Event
 //----------------------------------------------------------------------------
-class Parser::Event::Private
-{
+class Parser::Event::Private {
 public:
-    int type;
-    QString ns, ln, qn;
+    int            type;
+    QString        ns, ln, qn;
     QXmlAttributes a;
-    QDomElement e;
-    QString str;
-    QStringList nsnames, nsvalues;
+    QDomElement    e;
+    QString        str;
+    QStringList    nsnames, nsvalues;
 };
 
-Parser::Event::Event()
-{
-    d = nullptr;
-}
+Parser::Event::Event() { d = nullptr; }
 
 Parser::Event::Event(const Event &from)
 {
-    d = nullptr;
+    d     = nullptr;
     *this = from;
 }
 
-Parser::Event & Parser::Event::operator=(const Event &from)
+Parser::Event &Parser::Event::operator=(const Event &from)
 {
-    if(&from == this)
+    if (&from == this)
         return *this;
 
     delete d;
     d = nullptr;
-    if(from.d)
+    if (from.d)
         d = new Private(*from.d);
     return *this;
 }
 
-Parser::Event::~Event()
-{
-    delete d;
-}
+Parser::Event::~Event() { delete d; }
 
-bool Parser::Event::isNull() const
-{
-    return (d ? false: true);
-}
+bool Parser::Event::isNull() const { return (d ? false : true); }
 
 int Parser::Event::type() const
 {
-    if(isNull())
+    if (isNull())
         return -1;
     return d->type;
 }
 
 QString Parser::Event::nsprefix(const QString &s) const
 {
-    QStringList::ConstIterator it = d->nsnames.constBegin();
+    QStringList::ConstIterator it  = d->nsnames.constBegin();
     QStringList::ConstIterator it2 = d->nsvalues.constBegin();
-    for(; it != d->nsnames.constEnd(); ++it) {
-        if((*it) == s)
+    for (; it != d->nsnames.constEnd(); ++it) {
+        if ((*it) == s)
             return (*it2);
         ++it2;
     }
     return QString();
 }
 
-QString Parser::Event::namespaceURI() const
-{
-    return d->ns;
-}
+QString Parser::Event::namespaceURI() const { return d->ns; }
 
-QString Parser::Event::localName() const
-{
-    return d->ln;
-}
+QString Parser::Event::localName() const { return d->ln; }
 
-QString Parser::Event::qName() const
-{
-    return d->qn;
-}
+QString Parser::Event::qName() const { return d->qn; }
 
-QXmlAttributes Parser::Event::atts() const
-{
-    return d->a;
-}
+QXmlAttributes Parser::Event::atts() const { return d->a; }
 
-QString Parser::Event::actualString() const
-{
-    return d->str;
-}
+QString Parser::Event::actualString() const { return d->str; }
 
-QDomElement Parser::Event::element() const
-{
-    return d->e;
-}
+QDomElement Parser::Event::element() const { return d->e; }
 
-void Parser::Event::setDocumentOpen(const QString &namespaceURI, const QString &localName, const QString &qName, const QXmlAttributes &atts, const QStringList &nsnames, const QStringList &nsvalues)
+void Parser::Event::setDocumentOpen(const QString &namespaceURI, const QString &localName, const QString &qName,
+                                    const QXmlAttributes &atts, const QStringList &nsnames, const QStringList &nsvalues)
 {
-    if(!d)
+    if (!d)
         d = new Private;
-    d->type = DocumentOpen;
-    d->ns = namespaceURI;
-    d->ln = localName;
-    d->qn = qName;
-    d->a = atts;
-    d->nsnames = nsnames;
+    d->type     = DocumentOpen;
+    d->ns       = namespaceURI;
+    d->ln       = localName;
+    d->qn       = qName;
+    d->a        = atts;
+    d->nsnames  = nsnames;
     d->nsvalues = nsvalues;
 }
 
 void Parser::Event::setDocumentClose(const QString &namespaceURI, const QString &localName, const QString &qName)
 {
-    if(!d)
+    if (!d)
         d = new Private;
     d->type = DocumentClose;
-    d->ns = namespaceURI;
-    d->ln = localName;
-    d->qn = qName;
+    d->ns   = namespaceURI;
+    d->ln   = localName;
+    d->qn   = qName;
 }
 
 void Parser::Event::setElement(const QDomElement &elem)
 {
-    if(!d)
+    if (!d)
         d = new Private;
     d->type = Element;
-    d->e = elem;
+    d->e    = elem;
 }
 
 void Parser::Event::setError()
 {
-    if(!d)
+    if (!d)
         d = new Private;
     d->type = Error;
 }
 
-void Parser::Event::setActualString(const QString &str)
-{
-    d->str = str;
-}
+void Parser::Event::setActualString(const QString &str) { d->str = str; }
 
 //----------------------------------------------------------------------------
 // Parser
 //----------------------------------------------------------------------------
-class Parser::Private
-{
+class Parser::Private {
 public:
     Private()
     {
-        doc = nullptr;
-        in = 0;
+        doc     = nullptr;
+        in      = 0;
         handler = nullptr;
-        reader = 0;
+        reader  = 0;
         reset();
     }
 
-    ~Private()
-    {
-        reset(false);
-    }
+    ~Private() { reset(false); }
 
-    void reset(bool create=true)
+    void reset(bool create = true)
     {
         delete reader;
         delete handler;
         delete in;
         delete doc;
 
-        if(create) {
-            doc = new QDomDocument;
-            in = new StreamInput;
+        if (create) {
+            doc     = new QDomDocument;
+            in      = new StreamInput;
             handler = new ParserHandler(in, doc);
-            reader = new QXmlSimpleReader;
+            reader  = new QXmlSimpleReader;
             reader->setContentHandler(handler);
 
             // initialize the reader
@@ -723,16 +651,16 @@ class Parser::Private
             reader->parse(in, true);
             in->pause(false);
         } else {
-            reader = nullptr;
+            reader  = nullptr;
             handler = nullptr;
-            in = nullptr;
-            doc = 0;
+            in      = nullptr;
+            doc     = 0;
         }
     }
 
-    QDomDocument *doc;
-    StreamInput *in;
-    ParserHandler *handler;
+    QDomDocument *    doc;
+    StreamInput *     in;
+    ParserHandler *   handler;
     QXmlSimpleReader *reader;
 };
 
@@ -741,48 +669,42 @@ Parser::Parser()
     d = new Private;
 
     // check for evil bug in Qt <= 3.2.1
-    if(!qt_bug_check) {
-        qt_bug_check = true;
+    if (!qt_bug_check) {
+        qt_bug_check  = true;
         QDomElement e = d->doc->createElementNS("someuri", "somename");
-        if(e.hasAttributeNS("someuri", "somename"))
+        if (e.hasAttributeNS("someuri", "somename"))
             qt_bug_have = true;
         else
             qt_bug_have = false;
     }
 }
 
-Parser::~Parser()
-{
-    delete d;
-}
+Parser::~Parser() { delete d; }
 
-void Parser::reset()
-{
-    d->reset();
-}
+void Parser::reset() { d->reset(); }
 
 void Parser::appendData(const QByteArray &a)
 {
     d->in->appendData(a);
 
     // if handler was waiting for more, give it a kick
-    if(d->handler->needMore)
+    if (d->handler->needMore)
         d->handler->checkNeedMore();
 }
 
 Parser::Event Parser::readNext()
 {
     Event e;
-    if(d->handler->needMore)
+    if (d->handler->needMore)
         return e;
     Event *ep = d->handler->takeEvent();
-    if(!ep) {
-        if(!d->reader->parseContinue()) {
+    if (!ep) {
+        if (!d->reader->parseContinue()) {
             e.setError();
             return e;
         }
         ep = d->handler->takeEvent();
-        if(!ep)
+        if (!ep)
             return e;
     }
     e = *ep;
@@ -790,12 +712,6 @@ Parser::Event Parser::readNext()
     return e;
 }
 
-QByteArray Parser::unprocessed() const
-{
-    return d->in->unprocessed();
-}
+QByteArray Parser::unprocessed() const { return d->in->unprocessed(); }
 
-QString Parser::encoding() const
-{
-    return d->in->encoding();
-}
+QString Parser::encoding() const { return d->in->encoding(); }
diff --git a/src/xmpp/xmpp-core/parser.h b/src/xmpp/xmpp-core/parser.h
index 3b7a9f63..8b153186 100644
--- a/src/xmpp/xmpp-core/parser.h
+++ b/src/xmpp/xmpp-core/parser.h
@@ -24,61 +24,60 @@
 #include <qxml.h>
 
 namespace XMPP {
-    class Parser
-    {
-    public:
-        Parser();
-        ~Parser();
-
-        class Event
-        {
-        public:
-            enum Type { DocumentOpen, DocumentClose, Element, Error };
-            Event();
-            Event(const Event &);
-            Event & operator=(const Event &);
-            ~Event();
-
-            bool isNull() const;
-            int type() const;
+class Parser {
+public:
+    Parser();
+    ~Parser();
 
-            // for document open
-            QString nsprefix(const QString &s=QString()) const;
+    class Event {
+    public:
+        enum Type { DocumentOpen, DocumentClose, Element, Error };
+        Event();
+        Event(const Event &);
+        Event &operator=(const Event &);
+        ~Event();
 
-            // for document open / close
-            QString namespaceURI() const;
-            QString localName() const;
-            QString qName() const;
-            QXmlAttributes atts() const;
+        bool isNull() const;
+        int  type() const;
 
-            // for element
-            QDomElement element() const;
+        // for document open
+        QString nsprefix(const QString &s = QString()) const;
 
-            // for any
-            QString actualString() const;
+        // for document open / close
+        QString        namespaceURI() const;
+        QString        localName() const;
+        QString        qName() const;
+        QXmlAttributes atts() const;
 
-            // setup
-            void setDocumentOpen(const QString &namespaceURI, const QString &localName, const QString &qName, const QXmlAttributes &atts, const QStringList &nsnames, const QStringList &nsvalues);
-            void setDocumentClose(const QString &namespaceURI, const QString &localName, const QString &qName);
-            void setElement(const QDomElement &elem);
-            void setError();
-            void setActualString(const QString &);
+        // for element
+        QDomElement element() const;
 
-        private:
-            class Private;
-            Private *d;
-        };
+        // for any
+        QString actualString() const;
 
-        void reset();
-        void appendData(const QByteArray &a);
-        Event readNext();
-        QByteArray unprocessed() const;
-        QString encoding() const;
+        // setup
+        void setDocumentOpen(const QString &namespaceURI, const QString &localName, const QString &qName,
+                             const QXmlAttributes &atts, const QStringList &nsnames, const QStringList &nsvalues);
+        void setDocumentClose(const QString &namespaceURI, const QString &localName, const QString &qName);
+        void setElement(const QDomElement &elem);
+        void setError();
+        void setActualString(const QString &);
 
     private:
         class Private;
         Private *d;
     };
+
+    void       reset();
+    void       appendData(const QByteArray &a);
+    Event      readNext();
+    QByteArray unprocessed() const;
+    QString    encoding() const;
+
+private:
+    class Private;
+    Private *d;
+};
 } // namespace XMPP
 
 #endif // PARSER_H
diff --git a/src/xmpp/xmpp-core/protocol.cpp b/src/xmpp/xmpp-core/protocol.cpp
index 7ba0845a..a7cc706d 100644
--- a/src/xmpp/xmpp-core/protocol.cpp
+++ b/src/xmpp/xmpp-core/protocol.cpp
@@ -1,4 +1,4 @@
-            /*
+/*
  * protocol.cpp - XMPP-Core protocol state machine
  * Copyright (C) 2004  Justin Karneges
  *
@@ -42,14 +42,13 @@ using namespace XMPP;
 static QString printArray(const QByteArray &a)
 {
     QString s;
-    for(int n = 0; n < a.size(); ++n) {
+    for (int n = 0; n < a.size(); ++n) {
         unsigned char c = (unsigned char)a[(int)n];
-        if(c < 32 || c >= 127) {
+        if (c < 32 || c >= 127) {
             QString str;
             str.sprintf("[%02x]", c);
             s += str;
-        }
-        else
+        } else
             s += c;
     }
     return s;
@@ -60,8 +59,8 @@ static QString printArray(const QByteArray &a)
 // Get an element's first child element
 static QDomElement firstChildElement(const QDomElement &e)
 {
-    for(QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling()) {
-        if(n.isElement())
+    for (QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling()) {
+        if (n.isElement())
             return n.toElement();
     }
     return QDomElement();
@@ -81,82 +80,74 @@ Version::Version(int maj, int min)
 //----------------------------------------------------------------------------
 StreamFeatures::StreamFeatures()
 {
-    tls_supported = false;
-    sasl_supported = false;
-    bind_supported = false;
-    tls_required = false;
+    tls_supported      = false;
+    sasl_supported     = false;
+    bind_supported     = false;
+    tls_required       = false;
     compress_supported = false;
-    sm_supported = false;
-    session_supported = false;
-    session_required = false;
+    sm_supported       = false;
+    session_supported  = false;
+    session_required   = false;
 }
 
 //----------------------------------------------------------------------------
 // BasicProtocol
 //----------------------------------------------------------------------------
-BasicProtocol::SASLCondEntry BasicProtocol::saslCondTable[] =
-{
-    { "aborted",                Aborted },
-    { "account-disabled",       AccountDisabled },
-    { "credentials-expired",    CredentialsExpired },
-    { "encryption-required",    EncryptionRequired },
-    { "incorrect-encoding",     IncorrectEncoding },
-    { "invalid-authzid",        InvalidAuthzid },
-    { "invalid-mechanism",      InvalidMech },
-    { "malformed-request",      MalformedRequest },
-    { "mechanism-too-weak",     MechTooWeak },
-    { "not-authorized",         NotAuthorized },
+BasicProtocol::SASLCondEntry BasicProtocol::saslCondTable[] = {
+    { "aborted", Aborted },
+    { "account-disabled", AccountDisabled },
+    { "credentials-expired", CredentialsExpired },
+    { "encryption-required", EncryptionRequired },
+    { "incorrect-encoding", IncorrectEncoding },
+    { "invalid-authzid", InvalidAuthzid },
+    { "invalid-mechanism", InvalidMech },
+    { "malformed-request", MalformedRequest },
+    { "mechanism-too-weak", MechTooWeak },
+    { "not-authorized", NotAuthorized },
     { "temporary-auth-failure", TemporaryAuthFailure },
     { nullptr, 0 },
 };
 
-BasicProtocol::StreamCondEntry BasicProtocol::streamCondTable[] =
-{
-    { "bad-format",               BadFormat },
-    { "bad-namespace-prefix",     BadNamespacePrefix },
-    { "conflict",                 Conflict },
-    { "connection-timeout",       ConnectionTimeout },
-    { "host-gone",                HostGone },
-    { "host-unknown",             HostUnknown },
-    { "improper-addressing",      ImproperAddressing },
-    { "internal-server-error",    InternalServerError },
-    { "invalid-from",             InvalidFrom },
-    { "invalid-namespace",        InvalidNamespace },
-    { "invalid-xml",              InvalidXml },
-    { "not-authorized",           StreamNotAuthorized },
-    { "not-well-formed",          NotWellFormed },
-    { "policy-violation",         PolicyViolation },
+BasicProtocol::StreamCondEntry BasicProtocol::streamCondTable[] = {
+    { "bad-format", BadFormat },
+    { "bad-namespace-prefix", BadNamespacePrefix },
+    { "conflict", Conflict },
+    { "connection-timeout", ConnectionTimeout },
+    { "host-gone", HostGone },
+    { "host-unknown", HostUnknown },
+    { "improper-addressing", ImproperAddressing },
+    { "internal-server-error", InternalServerError },
+    { "invalid-from", InvalidFrom },
+    { "invalid-namespace", InvalidNamespace },
+    { "invalid-xml", InvalidXml },
+    { "not-authorized", StreamNotAuthorized },
+    { "not-well-formed", NotWellFormed },
+    { "policy-violation", PolicyViolation },
     { "remote-connection-failed", RemoteConnectionFailed },
-    { "reset",                    StreamReset },
-    { "resource-constraint",      ResourceConstraint },
-    { "restricted-xml",           RestrictedXml },
-    { "see-other-host",           SeeOtherHost },
-    { "system-shutdown",          SystemShutdown },
-    { "undefined-condition",      UndefinedCondition },
-    { "unsupported-encoding",     UnsupportedEncoding },
-    { "unsupported-stanza-type",  UnsupportedStanzaType },
-    { "unsupported-version",      UnsupportedVersion },
+    { "reset", StreamReset },
+    { "resource-constraint", ResourceConstraint },
+    { "restricted-xml", RestrictedXml },
+    { "see-other-host", SeeOtherHost },
+    { "system-shutdown", SystemShutdown },
+    { "undefined-condition", UndefinedCondition },
+    { "unsupported-encoding", UnsupportedEncoding },
+    { "unsupported-stanza-type", UnsupportedStanzaType },
+    { "unsupported-version", UnsupportedVersion },
     { nullptr, 0 },
 };
 
-BasicProtocol::BasicProtocol()
-:XmlProtocol()
-{
-    init();
-}
+BasicProtocol::BasicProtocol() : XmlProtocol() { init(); }
 
-BasicProtocol::~BasicProtocol()
-{
-}
+BasicProtocol::~BasicProtocol() {}
 
 void BasicProtocol::init()
 {
-    errCond = -1;
-    sasl_authed = false;
-    doShutdown = false;
-    delayedError = false;
-    closeError = false;
-    ready = false;
+    errCond        = -1;
+    sasl_authed    = false;
+    doShutdown     = false;
+    delayedError   = false;
+    closeError     = false;
+    ready          = false;
     stanzasPending = 0;
     stanzasWritten = 0;
 }
@@ -166,14 +157,14 @@ void BasicProtocol::reset()
     XmlProtocol::reset();
     init();
 
-    to = QString();
-    from = QString();
-    id = QString();
-    lang = QString();
-    version = Version(1,0);
-    errText = QString();
+    to         = QString();
+    from       = QString();
+    id         = QString();
+    lang       = QString();
+    version    = Version(1, 0);
+    errText    = QString();
     errAppSpec = QDomElement();
-    otherHost = QString();
+    otherHost  = QString();
     spare.resize(0);
     sasl_mech = QString();
     sasl_mechlist.clear();
@@ -203,22 +194,16 @@ void BasicProtocol::sendWhitespace()
     sendList += i;
 }
 
-void BasicProtocol::clearSendQueue()
-{
-    sendList.clear();
-}
+void BasicProtocol::clearSendQueue() { sendList.clear(); }
 
 QDomElement BasicProtocol::recvStanza()
 {
     QDomElement e = stanzaToRecv;
-    stanzaToRecv = QDomElement();
+    stanzaToRecv  = QDomElement();
     return e;
 }
 
-void BasicProtocol::shutdown()
-{
-    doShutdown = true;
-}
+void BasicProtocol::shutdown() { doShutdown = true; }
 
 void BasicProtocol::shutdownWithError(int cond, const QString &str)
 {
@@ -226,30 +211,15 @@ void BasicProtocol::shutdownWithError(int cond, const QString &str)
     delayErrorAndClose(cond);
 }
 
-bool BasicProtocol::isReady() const
-{
-    return ready;
-}
+bool BasicProtocol::isReady() const { return ready; }
 
-void BasicProtocol::setReady(bool b)
-{
-    ready = b;
-}
+void BasicProtocol::setReady(bool b) { ready = b; }
 
-QString BasicProtocol::saslMech() const
-{
-    return sasl_mech;
-}
+QString BasicProtocol::saslMech() const { return sasl_mech; }
 
-QByteArray BasicProtocol::saslStep() const
-{
-    return sasl_step;
-}
+QByteArray BasicProtocol::saslStep() const { return sasl_step; }
 
-void BasicProtocol::setSASLMechList(const QStringList &list)
-{
-    sasl_mechlist = list;
-}
+void BasicProtocol::setSASLMechList(const QStringList &list) { sasl_mechlist = list; }
 
 void BasicProtocol::setSASLFirst(const QString &mech, const QByteArray &step)
 {
@@ -257,20 +227,14 @@ void BasicProtocol::setSASLFirst(const QString &mech, const QByteArray &step)
     sasl_step = step;
 }
 
-void BasicProtocol::setSASLNext(const QByteArray &step)
-{
-    sasl_step = step;
-}
+void BasicProtocol::setSASLNext(const QByteArray &step) { sasl_step = step; }
 
-void BasicProtocol::setSASLAuthed()
-{
-    sasl_authed = true;
-}
+void BasicProtocol::setSASLAuthed() { sasl_authed = true; }
 
 int BasicProtocol::stringToSASLCond(const QString &s)
 {
-    for(int n = 0; saslCondTable[n].str; ++n) {
-        if(s == saslCondTable[n].str)
+    for (int n = 0; saslCondTable[n].str; ++n) {
+        if (s == saslCondTable[n].str)
             return saslCondTable[n].cond;
     }
     return -1;
@@ -278,8 +242,8 @@ int BasicProtocol::stringToSASLCond(const QString &s)
 
 int BasicProtocol::stringToStreamCond(const QString &s)
 {
-    for(int n = 0; streamCondTable[n].str; ++n) {
-        if(s == streamCondTable[n].str)
+    for (int n = 0; streamCondTable[n].str; ++n) {
+        if (s == streamCondTable[n].str)
             return streamCondTable[n].cond;
     }
     return -1;
@@ -287,8 +251,8 @@ int BasicProtocol::stringToStreamCond(const QString &s)
 
 QString BasicProtocol::saslCondToString(int x)
 {
-    for(int n = 0; saslCondTable[n].str; ++n) {
-        if(x == saslCondTable[n].cond)
+    for (int n = 0; saslCondTable[n].str; ++n) {
+        if (x == saslCondTable[n].cond)
             return saslCondTable[n].str;
     }
     return QString();
@@ -296,8 +260,8 @@ QString BasicProtocol::saslCondToString(int x)
 
 QString BasicProtocol::streamCondToString(int x)
 {
-    for(int n = 0; streamCondTable[n].str; ++n) {
-        if(x == streamCondTable[n].cond)
+    for (int n = 0; streamCondTable[n].str; ++n) {
+        if (x == streamCondTable[n].cond)
             return streamCondTable[n].str;
     }
     return QString();
@@ -305,27 +269,26 @@ QString BasicProtocol::streamCondToString(int x)
 
 void BasicProtocol::extractStreamError(const QDomElement &e)
 {
-    QString text;
-    QHash<QString,QString> langText;
-    QDomElement appSpec;
+    QString                 text;
+    QHash<QString, QString> langText;
+    QDomElement             appSpec;
 
     QDomElement t = firstChildElement(e);
-    if(t.isNull() || t.namespaceURI() != NS_STREAMS) {
+    if (t.isNull() || t.namespaceURI() != NS_STREAMS) {
         // probably old-style error
         errCond = -1;
         errText = e.text();
-    }
-    else
+    } else
         errCond = stringToStreamCond(t.tagName());
 
-    if(errCond != -1) {
-        if(errCond == SeeOtherHost)
+    if (errCond != -1) {
+        if (errCond == SeeOtherHost)
             otherHost = t.text();
 
         auto nodes = e.elementsByTagNameNS(NS_STREAMS, "text");
         if (nodes.count()) {
             for (int i = 0; i < nodes.count(); i++) {
-                auto e = nodes.item(i).toElement();
+                auto    e    = nodes.item(i).toElement();
                 QString lang = e.attributeNS(NS_STREAMS, "lang", "");
                 langText.insert(lang, e.text());
             }
@@ -334,38 +297,32 @@ void BasicProtocol::extractStreamError(const QDomElement &e)
 
         // find first non-standard namespaced element
         QDomNodeList nl = e.childNodes();
-        for(int n = 0; n < nl.count(); ++n) {
+        for (int n = 0; n < nl.count(); ++n) {
             QDomNode i = nl.item(n);
-            if(i.isElement() && i.namespaceURI() != NS_STREAMS) {
+            if (i.isElement() && i.namespaceURI() != NS_STREAMS) {
                 appSpec = i.toElement();
                 break;
             }
         }
 
-        errText = text;
+        errText     = text;
         errLangText = langText;
-        errAppSpec = appSpec;
+        errAppSpec  = appSpec;
     }
 }
 
-void BasicProtocol::send(const QDomElement &e, bool clip)
-{
-    writeElement(e, TypeElement, false, clip, false);
-}
+void BasicProtocol::send(const QDomElement &e, bool clip) { writeElement(e, TypeElement, false, clip, false); }
 
-void BasicProtocol::sendUrgent(const QDomElement &e, bool clip)
-{
-    writeElement(e, TypeElement, false, clip, true);
-}
+void BasicProtocol::sendUrgent(const QDomElement &e, bool clip) { writeElement(e, TypeElement, false, clip, true); }
 
 void BasicProtocol::sendStreamError(int cond, const QString &text, const QDomElement &appSpec)
 {
-    QDomElement se = doc.createElementNS(NS_ETHERX, "stream:error");
+    QDomElement se  = doc.createElementNS(NS_ETHERX, "stream:error");
     QDomElement err = doc.createElementNS(NS_STREAMS, streamCondToString(cond));
-    if(!otherHost.isEmpty())
+    if (!otherHost.isEmpty())
         err.appendChild(doc.createTextNode(otherHost));
     se.appendChild(err);
-    if(!text.isEmpty()) {
+    if (!text.isEmpty()) {
         QDomElement te = doc.createElementNS(NS_STREAMS, "text");
         te.setAttributeNS(NS_XML, "xml:lang", "en");
         te.appendChild(doc.createTextNode(text));
@@ -387,8 +344,8 @@ void BasicProtocol::sendStreamError(const QString &text)
 bool BasicProtocol::errorAndClose(int cond, const QString &text, const QDomElement &appSpec)
 {
     closeError = true;
-    errCond = cond;
-    errText = text;
+    errCond    = cond;
+    errText    = text;
     errAppSpec = appSpec;
     sendStreamError(cond, text, appSpec);
     return close();
@@ -396,23 +353,23 @@ bool BasicProtocol::errorAndClose(int cond, const QString &text, const QDomEleme
 
 bool BasicProtocol::error(int code)
 {
-    event = EError;
+    event     = EError;
     errorCode = code;
     return true;
 }
 
 void BasicProtocol::delayErrorAndClose(int cond, const QString &text, const QDomElement &appSpec)
 {
-    errorCode = ErrStream;
-    errCond = cond;
-    errText = text;
-    errAppSpec = appSpec;
+    errorCode    = ErrStream;
+    errCond      = cond;
+    errText      = text;
+    errAppSpec   = appSpec;
     delayedError = true;
 }
 
 void BasicProtocol::delayError(int code)
 {
-    errorCode = code;
+    errorCode    = code;
     delayedError = true;
 }
 
@@ -421,79 +378,78 @@ QDomElement BasicProtocol::docElement()
     // create the root element
     QDomElement e = doc.createElementNS(NS_ETHERX, "stream:stream");
 
-    QString defns = defaultNamespace();
-    const QStringList list = extraNamespaces();
+    QString           defns = defaultNamespace();
+    const QStringList list  = extraNamespaces();
 
     // HACK: using attributes seems to be the only way to get additional namespaces in here
-    if(!defns.isEmpty())
+    if (!defns.isEmpty())
         e.setAttribute(QString::fromLatin1("xmlns"), defns);
-    for(QStringList::ConstIterator it = list.begin(); it != list.end();) {
+    for (QStringList::ConstIterator it = list.begin(); it != list.end();) {
         QString prefix = *(it++);
-        QString uri = *(it++);
+        QString uri    = *(it++);
         e.setAttribute(QString::fromLatin1("xmlns:") + prefix, uri);
     }
 
     // additional attributes
-    if(!isIncoming() && !to.isEmpty())
+    if (!isIncoming() && !to.isEmpty())
         e.setAttribute(QString::fromLatin1("to"), to);
-    if(isIncoming() && !from.isEmpty())
+    if (isIncoming() && !from.isEmpty())
         e.setAttribute(QString::fromLatin1("from"), from);
-    if(!id.isEmpty())
+    if (!id.isEmpty())
         e.setAttribute(QString::fromLatin1("id"), id);
-    if(!lang.isEmpty())
+    if (!lang.isEmpty())
         e.setAttributeNS(QString::fromLatin1(NS_XML), QString::fromLatin1("xml:lang"), lang);
-    if(version.major > 0 || version.minor > 0)
-        e.setAttribute(QString::fromLatin1("version"), QString::number(version.major) + '.' + QString::number(version.minor));
+    if (version.major > 0 || version.minor > 0)
+        e.setAttribute(QString::fromLatin1("version"),
+                       QString::number(version.major) + '.' + QString::number(version.minor));
 
     return e;
 }
 
 void BasicProtocol::handleDocOpen(const Parser::Event &pe)
 {
-    if(isIncoming()) {
-        if(xmlEncoding() != "UTF-8") {
+    if (isIncoming()) {
+        if (xmlEncoding() != "UTF-8") {
             delayErrorAndClose(UnsupportedEncoding);
             return;
         }
     }
 
-    if(pe.namespaceURI() == NS_ETHERX && pe.localName() == "stream") {
+    if (pe.namespaceURI() == NS_ETHERX && pe.localName() == "stream") {
         QXmlAttributes atts = pe.atts();
 
         // grab the version
-        int major = 0;
-        int minor = 0;
+        int     major  = 0;
+        int     minor  = 0;
         QString verstr = atts.value("version");
-        if(!verstr.isEmpty()) {
+        if (!verstr.isEmpty()) {
             int n = verstr.indexOf('.');
-            if(n != -1) {
+            if (n != -1) {
                 major = verstr.mid(0, n).toInt();
-                minor = verstr.mid(n+1).toInt();
-            }
-            else {
+                minor = verstr.mid(n + 1).toInt();
+            } else {
                 major = verstr.toInt();
                 minor = 0;
             }
         }
         version = Version(major, minor);
 
-        if(isIncoming()) {
-            to = atts.value("to");
+        if (isIncoming()) {
+            to               = atts.value("to");
             QString peerLang = atts.value(NS_XML, "lang");
-            if(!peerLang.isEmpty())
+            if (!peerLang.isEmpty())
                 lang = peerLang;
         }
         // outgoing
         else {
             from = atts.value("from");
             lang = atts.value(NS_XML, "lang");
-            id = atts.value("id");
+            id   = atts.value("id");
         }
 
         handleStreamOpen(pe);
-    }
-    else {
-        if(isIncoming())
+    } else {
+        if (isIncoming())
             delayErrorAndClose(BadFormat);
         else
             delayError(ErrProtocol);
@@ -502,7 +458,7 @@ void BasicProtocol::handleDocOpen(const Parser::Event &pe)
 
 bool BasicProtocol::handleError()
 {
-    if(isIncoming())
+    if (isIncoming())
         return errorAndClose(NotWellFormed);
     else
         return error(ErrParse);
@@ -510,12 +466,11 @@ bool BasicProtocol::handleError()
 
 bool BasicProtocol::handleCloseFinished()
 {
-    if(closeError) {
-        event = EError;
+    if (closeError) {
+        event     = EError;
         errorCode = ErrStream;
         // note: errCond and friends are already set at this point
-    }
-    else
+    } else
         event = EClosed;
     return true;
 }
@@ -523,64 +478,63 @@ bool BasicProtocol::handleCloseFinished()
 bool BasicProtocol::doStep(const QDomElement &e)
 {
     // handle pending error
-    if(delayedError) {
-        if(isIncoming())
+    if (delayedError) {
+        if (isIncoming())
             return errorAndClose(errCond, errText, errAppSpec);
         else
             return error(errorCode);
     }
 
     // shutdown?
-    if(doShutdown) {
+    if (doShutdown) {
         doShutdown = false;
         return close();
     }
 
-    if(!e.isNull()) {
+    if (!e.isNull()) {
         // check for error
-        if(e.namespaceURI() == NS_ETHERX && e.tagName() == "error") {
+        if (e.namespaceURI() == NS_ETHERX && e.tagName() == "error") {
             extractStreamError(e);
             return error(ErrStream);
         }
     }
 
-    if(ready) {
+    if (ready) {
         // stanzas written?
-        if(stanzasWritten > 0) {
+        if (stanzasWritten > 0) {
             --stanzasWritten;
             event = EStanzaSent;
             return true;
         }
         // send items?
-        if(!sendList.isEmpty()) {
+        if (!sendList.isEmpty()) {
             SendItem i;
             {
                 QList<SendItem>::Iterator it = sendList.begin();
-                i = (*it);
+                i                            = (*it);
                 sendList.erase(it);
             }
 
             // outgoing stanza?
-            if(!i.stanzaToSend.isNull()) {
+            if (!i.stanzaToSend.isNull()) {
                 ++stanzasPending;
                 writeElement(i.stanzaToSend, TypeStanza, true);
                 event = ESend;
             }
             // direct send?
-            else if(!i.stringToSend.isEmpty()) {
+            else if (!i.stringToSend.isEmpty()) {
                 writeString(i.stringToSend, TypeDirect, true);
                 event = ESend;
             }
             // whitespace keepalive?
-            else if(i.doWhitespace) {
+            else if (i.doWhitespace) {
                 writeString("\n", TypePing, false);
                 event = ESend;
             }
             return true;
-        }
-        else {
+        } else {
             // if we have pending outgoing stanzas, ask for write notification
-            if(stanzasPending)
+            if (stanzasPending)
                 notify |= NSend;
         }
     }
@@ -590,7 +544,7 @@ bool BasicProtocol::doStep(const QDomElement &e)
 
 void BasicProtocol::itemWritten(int id, int)
 {
-    if(id == TypeStanza) {
+    if (id == TypeStanza) {
         --stanzasPending;
         ++stanzasWritten;
     }
@@ -616,15 +570,11 @@ void BasicProtocol::handleStreamOpen(const Parser::Event &)
 //----------------------------------------------------------------------------
 // CoreProtocol
 //----------------------------------------------------------------------------
-CoreProtocol::CoreProtocol()
-:BasicProtocol()
-{
-    init();
-}
+CoreProtocol::CoreProtocol() : BasicProtocol() { init(); }
 
 CoreProtocol::~CoreProtocol()
 {
-    //fprintf(stderr, "\tCoreProtocol::~CoreProtocol()\n");
+    // fprintf(stderr, "\tCoreProtocol::~CoreProtocol()\n");
 }
 
 void CoreProtocol::init()
@@ -632,29 +582,29 @@ void CoreProtocol::init()
     step = Start;
 
     // ??
-    server = false;
-    dialback = false;
+    server          = false;
+    dialback        = false;
     dialback_verify = false;
 
     // settings
-    jid_ = Jid();
-    password = QString();
-    oldOnly = false;
+    jid_       = Jid();
+    password   = QString();
+    oldOnly    = false;
     allowPlain = false;
-    doTLS = true;
-    doAuth = true;
+    doTLS      = true;
+    doAuth     = true;
     doCompress = true;
-    doBinding = true;
+    doBinding  = true;
 
     // input
     user = QString();
     host = QString();
 
     // status
-    old = false;
-    digest = false;
-    tls_started = false;
-    sasl_started = false;
+    old              = false;
+    digest           = false;
+    tls_started      = false;
+    sasl_started     = false;
     compress_started = false;
 
     sm.reset();
@@ -666,13 +616,15 @@ void CoreProtocol::reset()
     init();
 }
 
-void CoreProtocol::needTimer(int seconds) {
+void CoreProtocol::needTimer(int seconds)
+{
     notify |= NTimeout;
-    need = NNotify;
+    need        = NNotify;
     timeout_sec = seconds;
 }
 
-void CoreProtocol::sendStanza(const QDomElement &e) {
+void CoreProtocol::sendStanza(const QDomElement &e)
+{
     if (sm.isActive()) {
         int len = sm.addUnacknowledgedStanza(e);
         if (len > 5 && len % 4 == 0)
@@ -684,43 +636,44 @@ void CoreProtocol::sendStanza(const QDomElement &e) {
 
 void CoreProtocol::startClientOut(const Jid &_jid, bool _oldOnly, bool tlsActive, bool _doAuth, bool _doCompress)
 {
-    jid_ = _jid;
-    to = _jid.domain();
-    oldOnly = _oldOnly;
-    doAuth = _doAuth;
-    doCompress = _doCompress;
+    jid_        = _jid;
+    to          = _jid.domain();
+    oldOnly     = _oldOnly;
+    doAuth      = _doAuth;
+    doCompress  = _doCompress;
     tls_started = tlsActive;
 
-    if(oldOnly)
-        version = Version(0,0);
+    if (oldOnly)
+        version = Version(0, 0);
     startConnect();
 }
 
 void CoreProtocol::startServerOut(const QString &_to)
 {
     server = true;
-    to = _to;
+    to     = _to;
     startConnect();
 }
 
 void CoreProtocol::startDialbackOut(const QString &_to, const QString &_from)
 {
-    server = true;
-    dialback = true;
-    to = _to;
+    server    = true;
+    dialback  = true;
+    to        = _to;
     self_from = _from;
     startConnect();
 }
 
-void CoreProtocol::startDialbackVerifyOut(const QString &_to, const QString &_from, const QString &id, const QString &key)
+void CoreProtocol::startDialbackVerifyOut(const QString &_to, const QString &_from, const QString &id,
+                                          const QString &key)
 {
-    server = true;
-    dialback = true;
+    server          = true;
+    dialback        = true;
     dialback_verify = true;
-    to = _to;
-    self_from = _from;
-    dialback_id = id;
-    dialback_key = key;
+    to              = _to;
+    self_from       = _from;
+    dialback_id     = id;
+    dialback_key    = key;
     startConnect();
 }
 
@@ -733,49 +686,25 @@ void CoreProtocol::startClientIn(const QString &_id)
 void CoreProtocol::startServerIn(const QString &_id)
 {
     server = true;
-    id = _id;
+    id     = _id;
     startAccept();
 }
 
-void CoreProtocol::setLang(const QString &s)
-{
-    lang = s;
-}
+void CoreProtocol::setLang(const QString &s) { lang = s; }
 
-void CoreProtocol::setAllowTLS(bool b)
-{
-    doTLS = b;
-}
+void CoreProtocol::setAllowTLS(bool b) { doTLS = b; }
 
-void CoreProtocol::setAllowBind(bool b)
-{
-    doBinding = b;
-}
+void CoreProtocol::setAllowBind(bool b) { doBinding = b; }
 
-void CoreProtocol::setAllowPlain(bool b)
-{
-    allowPlain = b;
-}
+void CoreProtocol::setAllowPlain(bool b) { allowPlain = b; }
 
-const Jid& CoreProtocol::jid() const
-{
-    return jid_;
-}
+const Jid &CoreProtocol::jid() const { return jid_; }
 
-void CoreProtocol::setPassword(const QString &s)
-{
-    password = s;
-}
+void CoreProtocol::setPassword(const QString &s) { password = s; }
 
-void CoreProtocol::setFrom(const QString &s)
-{
-    from = s;
-}
+void CoreProtocol::setFrom(const QString &s) { from = s; }
 
-void CoreProtocol::setDialbackKey(const QString &s)
-{
-    dialback_key = s;
-}
+void CoreProtocol::setDialbackKey(const QString &s) { dialback_key = s; }
 
 bool CoreProtocol::loginComplete()
 {
@@ -794,10 +723,10 @@ bool CoreProtocol::loginComplete()
             send(e);
         }
         event = ESend;
-        step = GetSMResponse;
+        step  = GetSMResponse;
     } else {
         event = EReady;
-        step = Done;
+        step  = Done;
     }
     return true;
 }
@@ -805,7 +734,7 @@ bool CoreProtocol::loginComplete()
 int CoreProtocol::getOldErrorCode(const QDomElement &e)
 {
     QDomElement err = e.elementsByTagNameNS(NS_CLIENT, "error").item(0).toElement();
-    if(err.isNull() || !err.hasAttribute("code"))
+    if (err.isNull() || !err.hasAttribute("code"))
         return -1;
     return err.attribute("code").toInt();
 }
@@ -825,9 +754,9 @@ int CoreProtocol::getOldErrorCode(const QDomElement &e)
 
 bool CoreProtocol::stepAdvancesParser() const
 {
-    if(stepRequiresElement())
+    if (stepRequiresElement())
         return true;
-    else if(isReady())
+    else if (isReady())
         return true;
     return false;
 }
@@ -835,18 +764,18 @@ bool CoreProtocol::stepAdvancesParser() const
 // all element-needing steps need to be registered here
 bool CoreProtocol::stepRequiresElement() const
 {
-    switch(step) {
-        case GetFeatures:
-        case GetTLSProceed:
-        case GetCompressProceed:
-        case GetSASLChallenge:
-        case GetBindResponse:
-        case GetAuthGetResponse:
-        case GetAuthSetResponse:
-        case GetRequest:
-        case GetSASLResponse:
-        case GetSMResponse:
-            return true;
+    switch (step) {
+    case GetFeatures:
+    case GetTLSProceed:
+    case GetCompressProceed:
+    case GetSASLChallenge:
+    case GetBindResponse:
+    case GetAuthGetResponse:
+    case GetAuthSetResponse:
+    case GetRequest:
+    case GetSASLResponse:
+    case GetSMResponse:
+        return true;
     }
     return false;
 }
@@ -867,7 +796,7 @@ void CoreProtocol::stringRecv(const QString &s)
 
 QString CoreProtocol::defaultNamespace()
 {
-    if(server)
+    if (server)
         return NS_SERVER;
     else
         return NS_CLIENT;
@@ -876,7 +805,7 @@ QString CoreProtocol::defaultNamespace()
 QStringList CoreProtocol::extraNamespaces()
 {
     QStringList list;
-    if(dialback) {
+    if (dialback) {
         list += "db";
         list += NS_DIALBACK;
     }
@@ -885,30 +814,29 @@ QStringList CoreProtocol::extraNamespaces()
 
 void CoreProtocol::handleStreamOpen(const Parser::Event &pe)
 {
-    if(isIncoming()) {
+    if (isIncoming()) {
         QString ns = pe.nsprefix();
         QString db;
-        if(server) {
+        if (server) {
             db = pe.nsprefix("db");
-            if(!db.isEmpty())
+            if (!db.isEmpty())
                 dialback = true;
         }
 
         // verify namespace
-        if((!server && ns != NS_CLIENT) || (server && ns != NS_SERVER) || (dialback && db != NS_DIALBACK)) {
+        if ((!server && ns != NS_CLIENT) || (server && ns != NS_SERVER) || (dialback && db != NS_DIALBACK)) {
             delayErrorAndClose(InvalidNamespace);
             return;
         }
 
         // verify version
-        if(version.major < 1 && !dialback) {
+        if (version.major < 1 && !dialback) {
             delayErrorAndClose(UnsupportedVersion);
             return;
         }
-    }
-    else {
-        if(!dialback) {
-            if(version.major >= 1 && !oldOnly)
+    } else {
+        if (!dialback) {
+            if (version.major >= 1 && !oldOnly)
                 old = false;
             else
                 old = true;
@@ -932,7 +860,7 @@ void CoreProtocol::elementRecv(const QDomElement &e)
 
 bool CoreProtocol::doStep2(const QDomElement &e)
 {
-    if(dialback)
+    if (dialback)
         return dialbackStep(e);
     else
         return normalStep(e);
@@ -940,9 +868,10 @@ bool CoreProtocol::doStep2(const QDomElement &e)
 
 bool CoreProtocol::isValidStanza(const QDomElement &e) const
 {
-    QString s = e.tagName();
+    QString      s    = e.tagName();
     Stanza::Kind kind = Stanza::kind(s);
-    if(e.namespaceURI() == (server ? NS_SERVER : NS_CLIENT) && (kind == Stanza::Message || kind == Stanza::Presence || kind == Stanza::IQ))
+    if (e.namespaceURI() == (server ? NS_SERVER : NS_CLIENT)
+        && (kind == Stanza::Message || kind == Stanza::Presence || kind == Stanza::IQ))
         return true;
     else
         return false;
@@ -951,7 +880,7 @@ bool CoreProtocol::isValidStanza(const QDomElement &e) const
 bool CoreProtocol::streamManagementHandleStanza(const QDomElement &e)
 {
     QString s = e.tagName();
-    if(s == "r") {
+    if (s == "r") {
 #ifdef IRIS_SM_DEBUG
         qDebug() << "Stream Management: [<-?] Received request from server";
 #endif
@@ -987,11 +916,11 @@ bool CoreProtocol::needSMRequest()
 
 bool CoreProtocol::grabPendingItem(const Jid &to, const Jid &from, int type, DBItem *item)
 {
-    for(QList<DBItem>::Iterator it = dbpending.begin(); it != dbpending.end(); ++it) {
+    for (QList<DBItem>::Iterator it = dbpending.begin(); it != dbpending.end(); ++it) {
         const DBItem &i = *it;
-        if(i.type == type && i.to.compare(to) && i.from.compare(from)) {
+        if (i.type == type && i.to.compare(to) && i.from.compare(from)) {
             const DBItem &i = (*it);
-            *item = i;
+            *item           = i;
             dbpending.erase(it);
             return true;
         }
@@ -1001,44 +930,41 @@ bool CoreProtocol::grabPendingItem(const Jid &to, const Jid &from, int type, DBI
 
 bool CoreProtocol::dialbackStep(const QDomElement &e)
 {
-    if(step == Start) {
+    if (step == Start) {
         setReady(true);
-        step = Done;
+        step  = Done;
         event = EReady;
         return true;
     }
 
-    if(!dbrequests.isEmpty()) {
+    if (!dbrequests.isEmpty()) {
         // process a request
         DBItem i;
         {
             QList<DBItem>::Iterator it = dbrequests.begin();
-            i = (*it);
+            i                          = (*it);
             dbrequests.erase(it);
         }
 
         QDomElement r;
-        if(i.type == DBItem::ResultRequest) {
+        if (i.type == DBItem::ResultRequest) {
             r = doc.createElementNS(NS_DIALBACK, "db:result");
             r.setAttribute("to", i.to.full());
             r.setAttribute("from", i.from.full());
             r.appendChild(doc.createTextNode(i.key));
             dbpending += i;
-        }
-        else if(i.type == DBItem::ResultGrant) {
+        } else if (i.type == DBItem::ResultGrant) {
             r = doc.createElementNS(NS_DIALBACK, "db:result");
             r.setAttribute("to", i.to.full());
             r.setAttribute("from", i.from.full());
             r.setAttribute("type", i.ok ? "valid" : "invalid");
-            if(i.ok) {
+            if (i.ok) {
                 i.type = DBItem::Validated;
                 dbvalidated += i;
-            }
-            else {
+            } else {
                 // TODO: disconnect after writing element
             }
-        }
-        else if(i.type == DBItem::VerifyRequest) {
+        } else if (i.type == DBItem::VerifyRequest) {
             r = doc.createElementNS(NS_DIALBACK, "db:verify");
             r.setAttribute("to", i.to.full());
             r.setAttribute("from", i.from.full());
@@ -1060,60 +986,54 @@ bool CoreProtocol::dialbackStep(const QDomElement &e)
         return true;
     }
 
-    if(!e.isNull()) {
-        if(e.namespaceURI() == NS_DIALBACK) {
-            if(e.tagName() == "result") {
+    if (!e.isNull()) {
+        if (e.namespaceURI() == NS_DIALBACK) {
+            if (e.tagName() == "result") {
                 Jid to(Jid(e.attribute("to")).domain());
                 Jid from(Jid(e.attribute("from")).domain());
-                if(isIncoming()) {
+                if (isIncoming()) {
                     QString key = e.text();
                     // TODO: report event
-                }
-                else {
-                    bool ok = (e.attribute("type") == "valid") ? true: false;
+                } else {
+                    bool   ok = (e.attribute("type") == "valid") ? true : false;
                     DBItem i;
-                    if(grabPendingItem(from, to, DBItem::ResultRequest, &i)) {
-                        if(ok) {
+                    if (grabPendingItem(from, to, DBItem::ResultRequest, &i)) {
+                        if (ok) {
                             i.type = DBItem::Validated;
-                            i.ok = true;
+                            i.ok   = true;
                             dbvalidated += i;
                             // TODO: report event
-                        }
-                        else {
+                        } else {
                             // TODO: report event
                         }
                     }
                 }
-            }
-            else if(e.tagName() == "verify") {
-                Jid to(Jid(e.attribute("to")).domain());
-                Jid from(Jid(e.attribute("from")).domain());
+            } else if (e.tagName() == "verify") {
+                Jid     to(Jid(e.attribute("to")).domain());
+                Jid     from(Jid(e.attribute("from")).domain());
                 QString id = e.attribute("id");
-                if(isIncoming()) {
+                if (isIncoming()) {
                     QString key = e.text();
                     // TODO: report event
-                }
-                else {
-                    bool ok = (e.attribute("type") == "valid") ? true: false;
+                } else {
+                    bool   ok = (e.attribute("type") == "valid") ? true : false;
                     DBItem i;
-                    if(grabPendingItem(from, to, DBItem::VerifyRequest, &i)) {
-                        if(ok) {
+                    if (grabPendingItem(from, to, DBItem::VerifyRequest, &i)) {
+                        if (ok) {
                             // TODO: report event
-                        }
-                        else {
+                        } else {
                             // TODO: report event
                         }
                     }
                 }
             }
-        }
-        else {
-            if(isReady()) {
-                if(isValidStanza(e)) {
+        } else {
+            if (isReady()) {
+                if (isValidStanza(e)) {
                     // TODO: disconnect if stanza is from unverified sender
                     // TODO: ignore packets from receiving servers
                     stanzaToRecv = e;
-                    event = EStanzaReady;
+                    event        = EStanzaReady;
                     return true;
                 }
             }
@@ -1127,33 +1047,30 @@ bool CoreProtocol::dialbackStep(const QDomElement &e)
 
 bool CoreProtocol::normalStep(const QDomElement &e)
 {
-    if(step == Start) {
-        if(isIncoming()) {
+    if (step == Start) {
+        if (isIncoming()) {
             need = NSASLMechs;
             step = SendFeatures;
             return false;
-        }
-        else {
-            if(old) {
-                if(doAuth)
+        } else {
+            if (old) {
+                if (doAuth)
                     step = HandleAuthGet;
                 else
                     return loginComplete();
-            }
-            else
+            } else
                 step = GetFeatures;
 
             return processStep();
         }
-    }
-    else if(step == HandleFeatures) {
+    } else if (step == HandleFeatures) {
         // deal with TLS?
-        if(doTLS && !tls_started && !sasl_authed && features.tls_supported) {
+        if (doTLS && !tls_started && !sasl_authed && features.tls_supported) {
             QDomElement e = doc.createElementNS(NS_TLS, "starttls");
 
             send(e, true);
             event = ESend;
-            step = GetTLSProceed;
+            step  = GetTLSProceed;
             return true;
         }
 
@@ -1162,28 +1079,29 @@ bool CoreProtocol::normalStep(const QDomElement &e)
             return loginComplete();
 
         // Deal with compression
-        if (doCompress && !compress_started && features.compress_supported && features.compression_mechs.contains("zlib")) {
+        if (doCompress && !compress_started && features.compress_supported
+            && features.compression_mechs.contains("zlib")) {
             QDomElement e = doc.createElementNS(NS_COMPRESS_PROTOCOL, "compress");
             QDomElement m = doc.createElementNS(NS_COMPRESS_PROTOCOL, "method");
             m.appendChild(doc.createTextNode("zlib"));
             e.appendChild(m);
-            send(e,true);
+            send(e, true);
             event = ESend;
-            step = GetCompressProceed;
+            step  = GetCompressProceed;
             return true;
         }
 
         // deal with SASL?
-        if(!sasl_authed) {
-            if(!features.sasl_supported) {
+        if (!sasl_authed) {
+            if (!features.sasl_supported) {
                 // SASL MUST be supported
-                //event = EError;
-                //errorCode = ErrProtocol;
-                //return true;
+                // event = EError;
+                // errorCode = ErrProtocol;
+                // return true;
 
                 // Fall back on auth for non-compliant servers
                 step = HandleAuthGet;
-                old = true;
+                old  = true;
                 return true;
             }
 
@@ -1195,18 +1113,17 @@ bool CoreProtocol::normalStep(const QDomElement &e)
             return false;
         }
 
-        if(server) {
+        if (server) {
             return loginComplete();
-        }
-        else {
-            if(!doBinding)
+        } else {
+            if (!doBinding)
                 return loginComplete();
         }
 
         // deal with bind
-        if(!features.bind_supported) {
+        if (!features.bind_supported) {
             // bind MUST be supported
-            event = EError;
+            event     = EError;
             errorCode = ErrProtocol;
             return true;
         }
@@ -1222,7 +1139,7 @@ bool CoreProtocol::normalStep(const QDomElement &e)
 
             // request specific resource?
             QString resource = jid_.resource();
-            if(!resource.isEmpty()) {
+            if (!resource.isEmpty()) {
                 QDomElement r = doc.createElement("resource");
                 r.appendChild(doc.createTextNode(jid_.resource()));
                 b.appendChild(r);
@@ -1232,14 +1149,13 @@ bool CoreProtocol::normalStep(const QDomElement &e)
 
             send(e);
             event = ESend;
-            step = GetBindResponse;
+            step  = GetBindResponse;
             return true;
         }
-    }
-    else if(step == GetSASLFirst) {
+    } else if (step == GetSASLFirst) {
         QDomElement e = doc.createElementNS(NS_SASL, "auth");
         e.setAttribute("mechanism", sasl_mech);
-        if(!sasl_step.isEmpty()) {
+        if (!sasl_step.isEmpty()) {
 #ifdef XMPP_TEST
             TD::msg(QString("SASL OUT: [%1]").arg(printArray(sasl_step)));
 #endif
@@ -1248,38 +1164,34 @@ bool CoreProtocol::normalStep(const QDomElement &e)
 
         send(e, true);
         event = ESend;
-        step = GetSASLChallenge;
+        step  = GetSASLChallenge;
         return true;
-    }
-    else if(step == GetSASLNext) {
-        if(isIncoming()) {
-            if(sasl_authed) {
+    } else if (step == GetSASLNext) {
+        if (isIncoming()) {
+            if (sasl_authed) {
                 QDomElement e = doc.createElementNS(NS_SASL, "success");
                 send(e, true);
                 event = ESend;
-                step = IncHandleSASLSuccess;
+                step  = IncHandleSASLSuccess;
                 return true;
-            }
-            else {
-                QByteArray stepData = sasl_step;
-                QDomElement e = doc.createElementNS(NS_SASL, "challenge");
-                if(!stepData.isEmpty())
+            } else {
+                QByteArray  stepData = sasl_step;
+                QDomElement e        = doc.createElementNS(NS_SASL, "challenge");
+                if (!stepData.isEmpty())
                     e.appendChild(doc.createTextNode(QCA::Base64().arrayToString(stepData)));
 
                 send(e, true);
                 event = ESend;
-                step = GetSASLResponse;
+                step  = GetSASLResponse;
                 return true;
             }
-        }
-        else {
+        } else {
             // already authed?  then ignore last client step
             //   (this happens if "additional data with success"
             //   is used)
-            if(sasl_authed)
-            {
+            if (sasl_authed) {
                 event = ESASLSuccess;
-                step = HandleSASLSuccess;
+                step  = HandleSASLSuccess;
                 return true;
             }
 
@@ -1288,22 +1200,20 @@ bool CoreProtocol::normalStep(const QDomElement &e)
             TD::msg(QString("SASL OUT: [%1]").arg(printArray(sasl_step)));
 #endif
             QDomElement e = doc.createElementNS(NS_SASL, "response");
-            if(!stepData.isEmpty())
+            if (!stepData.isEmpty())
                 e.appendChild(doc.createTextNode(QCA::Base64().arrayToString(stepData)));
 
             send(e, true);
             event = ESend;
-            step = GetSASLChallenge;
+            step  = GetSASLChallenge;
             return true;
         }
-    }
-    else if(step == HandleSASLSuccess) {
-        need = NSASLLayer;
+    } else if (step == HandleSASLSuccess) {
+        need  = NSASLLayer;
         spare = resetStream();
-        step = Start;
+        step  = Start;
         return false;
-    }
-    else if(step == HandleAuthGet) {
+    } else if (step == HandleAuthGet) {
         QDomElement e = doc.createElement("iq");
         e.setAttribute("to", to);
         e.setAttribute("type", "get");
@@ -1316,10 +1226,9 @@ bool CoreProtocol::normalStep(const QDomElement &e)
 
         send(e);
         event = ESend;
-        step = GetAuthGetResponse;
+        step  = GetAuthGetResponse;
         return true;
-    }
-    else if(step == HandleAuthSet) {
+    } else if (step == HandleAuthSet) {
         QDomElement e = doc.createElement("iq");
         e.setAttribute("to", to);
         e.setAttribute("type", "set");
@@ -1329,16 +1238,15 @@ bool CoreProtocol::normalStep(const QDomElement &e)
         u.appendChild(doc.createTextNode(jid_.node()));
         q.appendChild(u);
         QDomElement p;
-        if(digest) {
+        if (digest) {
             // need SHA1 here
-            //if(!QCA::isSupported(QCA::CAP_SHA1))
+            // if(!QCA::isSupported(QCA::CAP_SHA1))
             //    QCA::insertProvider(createProviderHash());
 
-            p = doc.createElement("digest");
+            p             = doc.createElement("digest");
             QByteArray cs = id.toUtf8() + password.toUtf8();
             p.appendChild(doc.createTextNode(QCA::Hash("sha1").hashToString(cs)));
-        }
-        else {
+        } else {
             p = doc.createElement("password");
             p.appendChild(doc.createTextNode(password));
         }
@@ -1350,26 +1258,25 @@ bool CoreProtocol::normalStep(const QDomElement &e)
 
         send(e, true);
         event = ESend;
-        step = GetAuthSetResponse;
+        step  = GetAuthSetResponse;
         return true;
     }
     // server
-    else if(step == SendFeatures) {
+    else if (step == SendFeatures) {
         QDomElement f = doc.createElementNS(NS_ETHERX, "stream:features");
-        if(!tls_started && !sasl_authed) { // don't offer tls if we are already sasl'd
+        if (!tls_started && !sasl_authed) { // don't offer tls if we are already sasl'd
             QDomElement tls = doc.createElementNS(NS_TLS, "starttls");
             f.appendChild(tls);
         }
 
-        if(sasl_authed) {
-            if(!server) {
+        if (sasl_authed) {
+            if (!server) {
                 QDomElement bind = doc.createElementNS(NS_BIND, "bind");
                 f.appendChild(bind);
             }
-        }
-        else {
+        } else {
             QDomElement mechs = doc.createElementNS(NS_SASL, "mechanisms");
-            foreach (const QString & it, sasl_mechlist) {
+            foreach (const QString &it, sasl_mechlist) {
                 QDomElement m = doc.createElement("mechanism");
                 m.appendChild(doc.createTextNode(it));
                 mechs.appendChild(m);
@@ -1379,31 +1286,30 @@ bool CoreProtocol::normalStep(const QDomElement &e)
 
         send(f);
         event = ESend;
-        step = GetRequest;
+        step  = GetRequest;
         return true;
     }
     // server
-    else if(step == HandleTLS) {
+    else if (step == HandleTLS) {
         tls_started = true;
-        need = NStartTLS;
-        spare = resetStream();
-        step = Start;
+        need        = NStartTLS;
+        spare       = resetStream();
+        step        = Start;
         return false;
     }
     // server
-    else if(step == IncHandleSASLSuccess) {
+    else if (step == IncHandleSASLSuccess) {
         event = ESASLSuccess;
         spare = resetStream();
-        step = Start;
+        step  = Start;
         printf("sasl success\n");
         return true;
-    }
-    else if(step == GetFeatures) {
+    } else if (step == GetFeatures) {
         // we are waiting for stream features
-        if(e.namespaceURI() == NS_ETHERX && e.tagName() == QLatin1String("features")) {
+        if (e.namespaceURI() == NS_ETHERX && e.tagName() == QLatin1String("features")) {
             // extract features
-            StreamFeatures f;
-            QDomNodeList nl = e.childNodes();
+            StreamFeatures     f;
+            QDomNodeList       nl = e.childNodes();
             QList<QDomElement> unhandled;
             for (int i = 0; i < nl.size(); i++) {
                 QDomElement c = nl.item(i).toElement();
@@ -1412,18 +1318,18 @@ bool CoreProtocol::normalStep(const QDomElement &e)
                 }
                 if (c.localName() == QLatin1String("starttls") && c.namespaceURI() == NS_TLS) {
                     f.tls_supported = true;
-                    f.tls_required = c.elementsByTagNameNS(NS_TLS, QLatin1String("required")).count() > 0;
+                    f.tls_required  = c.elementsByTagNameNS(NS_TLS, QLatin1String("required")).count() > 0;
 
                 } else if (c.localName() == QLatin1String("mechanisms") && c.namespaceURI() == NS_SASL) {
                     f.sasl_supported = true;
-                    QDomNodeList l = c.elementsByTagNameNS(NS_SASL, QLatin1String("mechanism"));
-                    for(int n = 0; n < l.count(); ++n)
+                    QDomNodeList l   = c.elementsByTagNameNS(NS_SASL, QLatin1String("mechanism"));
+                    for (int n = 0; n < l.count(); ++n)
                         f.sasl_mechs += l.item(n).toElement().text();
 
                 } else if (c.localName() == QLatin1String("compression") && c.namespaceURI() == NS_COMPRESS_FEATURE) {
                     f.compress_supported = true;
-                    QDomNodeList l = c.elementsByTagNameNS(NS_COMPRESS_FEATURE, QLatin1String("method"));
-                    for(int n = 0; n < l.count(); ++n)
+                    QDomNodeList l       = c.elementsByTagNameNS(NS_COMPRESS_FEATURE, QLatin1String("method"));
+                    for (int n = 0; n < l.count(); ++n)
                         f.compression_mechs += l.item(n).toElement().text();
 
                 } else if (c.localName() == QLatin1String("bind") && c.namespaceURI() == NS_BIND) {
@@ -1431,7 +1337,7 @@ bool CoreProtocol::normalStep(const QDomElement &e)
 
                 } else if (c.localName() == QLatin1String("hosts") && c.namespaceURI() == NS_HOSTS) {
                     QDomNodeList l = c.elementsByTagNameNS(NS_HOSTS, QLatin1String("host"));
-                    for(int n = 0; n < l.count(); ++n)
+                    for (int n = 0; n < l.count(); ++n)
                         f.hosts += l.item(n).toElement().text();
                     hosts += f.hosts;
 
@@ -1441,7 +1347,7 @@ bool CoreProtocol::normalStep(const QDomElement &e)
 
                 } else if (c.localName() == QLatin1String("session") && c.namespaceURI() == NS_SESSION) {
                     f.session_supported = true;
-                    f.session_required = c.elementsByTagName(QLatin1String("optional")).count() == 0;
+                    f.session_required  = c.elementsByTagName(QLatin1String("optional")).count() == 0;
                     // more details https://tools.ietf.org/html/draft-cridland-xmpp-session-01
 
                 } else {
@@ -1449,341 +1355,315 @@ bool CoreProtocol::normalStep(const QDomElement &e)
                 }
             }
 
-            if(f.tls_supported) {
+            if (f.tls_supported) {
 #ifdef XMPP_TEST
                 QString s = "STARTTLS is available";
-                if(f.tls_required)
+                if (f.tls_required)
                     s += " (required)";
                 TD::msg(s);
 #endif
             }
-            if(f.sasl_supported) {
+            if (f.sasl_supported) {
 #ifdef XMPP_TEST
                 QString s = "SASL mechs:";
-                for(QStringList::ConstIterator it = f.sasl_mechs.begin(); it != f.sasl_mechs.end(); ++it)
+                for (QStringList::ConstIterator it = f.sasl_mechs.begin(); it != f.sasl_mechs.end(); ++it)
                     s += QString(" [%1]").arg((*it));
                 TD::msg(s);
 #endif
             }
-            if(f.compress_supported) {
+            if (f.compress_supported) {
 #ifdef XMPP_TEST
                 QString s = "Compression mechs:";
-                for(QStringList::ConstIterator it = f.compression_mechs.begin(); it != f.compression_mechs.end(); ++it)
+                for (QStringList::ConstIterator it = f.compression_mechs.begin(); it != f.compression_mechs.end(); ++it)
                     s += QString(" [%1]").arg((*it));
                 TD::msg(s);
 #endif
             }
 
-            event = EFeatures;
-            features = f;
+            event             = EFeatures;
+            features          = f;
             unhandledFeatures = unhandled;
-            step = HandleFeatures;
+            step              = HandleFeatures;
             return true;
-        }
-        else {
+        } else {
             // ignore
         }
-    }
-    else if(step == GetTLSProceed) {
+    } else if (step == GetTLSProceed) {
         // waiting for proceed to starttls
-        if(e.namespaceURI() == NS_TLS) {
-            if(e.tagName() == "proceed") {
+        if (e.namespaceURI() == NS_TLS) {
+            if (e.tagName() == "proceed") {
 #ifdef XMPP_TEST
                 TD::msg("Server wants us to proceed with ssl handshake");
 #endif
                 tls_started = true;
-                need = NStartTLS;
-                spare = resetStream();
-                step = Start;
+                need        = NStartTLS;
+                spare       = resetStream();
+                step        = Start;
                 return false;
-            }
-            else if(e.tagName() == "failure") {
-                event = EError;
+            } else if (e.tagName() == "failure") {
+                event     = EError;
                 errorCode = ErrStartTLS;
                 return true;
-            }
-            else {
-                event = EError;
+            } else {
+                event     = EError;
                 errorCode = ErrProtocol;
                 return true;
             }
-        }
-        else {
+        } else {
             // ignore
         }
-    }
-    else if(step == GetCompressProceed) {
+    } else if (step == GetCompressProceed) {
         // waiting for proceed to compression
-        if(e.namespaceURI() == NS_COMPRESS_PROTOCOL) {
-            if(e.tagName() == "compressed") {
+        if (e.namespaceURI() == NS_COMPRESS_PROTOCOL) {
+            if (e.tagName() == "compressed") {
 #ifdef XMPP_TEST
                 TD::msg("Server wants us to proceed with compression");
 #endif
                 compress_started = true;
-                need = NCompress;
-                spare = resetStream();
-                step = Start;
+                need             = NCompress;
+                spare            = resetStream();
+                step             = Start;
                 return false;
-            }
-            else if(e.tagName() == "failure") {
-                event = EError;
+            } else if (e.tagName() == "failure") {
+                event     = EError;
                 errorCode = ErrCompress;
                 return true;
-            }
-            else {
-                event = EError;
+            } else {
+                event     = EError;
                 errorCode = ErrProtocol;
                 return true;
             }
-        }
-        else {
+        } else {
             // ignore
         }
-    }
-    else if(step == GetSASLChallenge) {
+    } else if (step == GetSASLChallenge) {
         // waiting for sasl challenge/success/fail
-        if(e.namespaceURI() == NS_SASL) {
-            if(e.tagName() == "challenge") {
+        if (e.namespaceURI() == NS_SASL) {
+            if (e.tagName() == "challenge") {
                 QByteArray a = QCA::Base64().stringToArray(e.text()).toByteArray();
 #ifdef XMPP_TEST
                 TD::msg(QString("SASL IN: [%1]").arg(printArray(a)));
 #endif
                 sasl_step = a;
-                need = NSASLNext;
-                step = GetSASLNext;
+                need      = NSASLNext;
+                step      = GetSASLNext;
                 return false;
-            }
-            else if(e.tagName() == "success") {
+            } else if (e.tagName() == "success") {
                 QString str = e.text();
                 // "additional data with success" ?
-                if(!str.isEmpty())
-                {
+                if (!str.isEmpty()) {
                     QByteArray a = QCA::Base64().stringToArray(str).toByteArray();
-                    sasl_step = a;
-                    sasl_authed = true;
-                    need = NSASLNext;
-                    step = GetSASLNext;
+                    sasl_step    = a;
+                    sasl_authed  = true;
+                    need         = NSASLNext;
+                    step         = GetSASLNext;
                     return false;
                 }
 
                 sasl_authed = true;
-                event = ESASLSuccess;
-                step = HandleSASLSuccess;
+                event       = ESASLSuccess;
+                step        = HandleSASLSuccess;
                 return true;
-            }
-            else if(e.tagName() == "failure") {
+            } else if (e.tagName() == "failure") {
                 QDomElement t = firstChildElement(e);
-                if(t.isNull() || t.namespaceURI() != NS_SASL)
+                if (t.isNull() || t.namespaceURI() != NS_SASL)
                     errCond = -1;
                 else
                     errCond = stringToSASLCond(t.tagName());
 
                 // handle text elements
-                auto nodes = e.elementsByTagNameNS(NS_SASL, QLatin1String("text"));
+                auto                  nodes = e.elementsByTagNameNS(NS_SASL, QLatin1String("text"));
                 decltype(errLangText) lt;
                 for (int i = 0; i < nodes.count(); i++) {
-                    auto e = nodes.item(i).toElement();
+                    auto    e    = nodes.item(i).toElement();
                     QString lang = e.attributeNS(NS_SASL, "lang", "");
                     lt.insert(lang, e.text());
                 }
 
                 errLangText = lt;
-                event = EError;
-                errorCode = ErrAuth;
+                event       = EError;
+                errorCode   = ErrAuth;
                 return true;
-            }
-            else {
-                event = EError;
+            } else {
+                event     = EError;
                 errorCode = ErrProtocol;
                 return true;
             }
         }
-    }
-    else if(step == GetBindResponse) {
-        if(e.namespaceURI() == NS_CLIENT && e.tagName() == "iq") {
+    } else if (step == GetBindResponse) {
+        if (e.namespaceURI() == NS_CLIENT && e.tagName() == "iq") {
             QString type(e.attribute("type"));
             QString id(e.attribute("id"));
 
-            if(id == "bind_1" && (type == "result" || type == "error")) {
-                if(type == "result") {
+            if (id == "bind_1" && (type == "result" || type == "error")) {
+                if (type == "result") {
                     QDomElement b = e.elementsByTagNameNS(NS_BIND, "bind").item(0).toElement();
-                    Jid j;
-                    if(!b.isNull()) {
+                    Jid         j;
+                    if (!b.isNull()) {
                         QDomElement je = e.elementsByTagName("jid").item(0).toElement();
-                        j = je.text();
+                        j              = je.text();
                     }
-                    if(!j.isValid()) {
-                        event = EError;
+                    if (!j.isValid()) {
+                        event     = EError;
                         errorCode = ErrProtocol;
                         return true;
                     }
                     jid_ = j;
                     return loginComplete();
-                }
-                else {
+                } else {
                     errCond = -1;
 
                     QDomElement err = e.elementsByTagNameNS(NS_CLIENT, "error").item(0).toElement();
-                    if(!err.isNull()) {
+                    if (!err.isNull()) {
                         // get error condition
                         QDomNodeList nl = err.childNodes();
-                        QDomElement t;
-                        for(int n = 0; n < nl.count(); ++n) {
+                        QDomElement  t;
+                        for (int n = 0; n < nl.count(); ++n) {
                             QDomNode i = nl.item(n);
-                            if(i.isElement()) {
+                            if (i.isElement()) {
                                 t = i.toElement();
                                 break;
                             }
                         }
-                        if(!t.isNull() && t.namespaceURI() == NS_STANZAS) {
+                        if (!t.isNull() && t.namespaceURI() == NS_STANZAS) {
                             QString cond = t.tagName();
-                            if(cond == "not-allowed")
+                            if (cond == "not-allowed")
                                 errCond = BindNotAllowed;
-                            else if(cond == "conflict")
+                            else if (cond == "conflict")
                                 errCond = BindConflict;
                         }
                     }
 
-                    event = EError;
+                    event     = EError;
                     errorCode = ErrBind;
                     return true;
                 }
-            }
-            else {
+            } else {
                 // ignore
             }
-        }
-        else {
+        } else {
             // ignore
         }
-    }
-    else if(step == GetAuthGetResponse) {
+    } else if (step == GetAuthGetResponse) {
         // waiting for an iq
-        if(e.namespaceURI() == NS_CLIENT && e.tagName() == "iq") {
-            Jid from(e.attribute("from"));
+        if (e.namespaceURI() == NS_CLIENT && e.tagName() == "iq") {
+            Jid     from(e.attribute("from"));
             QString type(e.attribute("type"));
             QString id(e.attribute("id"));
 
             bool okfrom = (from.isEmpty() || from.compare(Jid(to)));
-            if(okfrom && id == "auth_1" && (type == "result" || type == "error")) {
-                if(type == "result") {
+            if (okfrom && id == "auth_1" && (type == "result" || type == "error")) {
+                if (type == "result") {
                     QDomElement q = e.elementsByTagNameNS("jabber:iq:auth", "query").item(0).toElement();
-                    if(q.isNull() || q.elementsByTagName("username").item(0).isNull() || q.elementsByTagName("resource").item(0).isNull()) {
-                        event = EError;
+                    if (q.isNull() || q.elementsByTagName("username").item(0).isNull()
+                        || q.elementsByTagName("resource").item(0).isNull()) {
+                        event     = EError;
                         errorCode = ErrProtocol;
                         return true;
                     }
-                    bool plain_supported = !q.elementsByTagName("password").item(0).isNull();
+                    bool plain_supported  = !q.elementsByTagName("password").item(0).isNull();
                     bool digest_supported = !q.elementsByTagName("digest").item(0).isNull();
 
-                    if(!digest_supported && !plain_supported) {
-                        event = EError;
+                    if (!digest_supported && !plain_supported) {
+                        event     = EError;
                         errorCode = ErrProtocol;
                         return true;
                     }
 
                     // plain text not allowed?
-                    if(!digest_supported && !allowPlain) {
-                        event = EError;
+                    if (!digest_supported && !allowPlain) {
+                        event     = EError;
                         errorCode = ErrPlain;
                         return true;
                     }
 
                     digest = digest_supported;
-                    need = NPassword;
-                    step = HandleAuthSet;
+                    need   = NPassword;
+                    step   = HandleAuthSet;
                     return false;
-                }
-                else {
+                } else {
                     errCond = getOldErrorCode(e);
 
-                    event = EError;
+                    event     = EError;
                     errorCode = ErrAuth;
                     return true;
                 }
-            }
-            else {
+            } else {
                 // ignore
             }
-        }
-        else {
+        } else {
             // ignore
         }
-    }
-    else if(step == GetAuthSetResponse) {
+    } else if (step == GetAuthSetResponse) {
         // waiting for an iq
-        if(e.namespaceURI() == NS_CLIENT && e.tagName() == "iq") {
-            Jid from(e.attribute("from"));
+        if (e.namespaceURI() == NS_CLIENT && e.tagName() == "iq") {
+            Jid     from(e.attribute("from"));
             QString type(e.attribute("type"));
             QString id(e.attribute("id"));
 
             bool okfrom = (from.isEmpty() || from.compare(Jid(to)));
-            if(okfrom && id == "auth_2" && (type == "result" || type == "error")) {
-                if(type == "result") {
+            if (okfrom && id == "auth_2" && (type == "result" || type == "error")) {
+                if (type == "result") {
                     return loginComplete();
-                }
-                else {
+                } else {
                     errCond = getOldErrorCode(e);
 
-                    event = EError;
+                    event     = EError;
                     errorCode = ErrAuth;
                     return true;
                 }
-            }
-            else {
+            } else {
                 // ignore
             }
-        }
-        else {
+        } else {
             // ignore
         }
     }
     // server
-    else if(step == GetRequest) {
+    else if (step == GetRequest) {
         printf("get request: [%s], %s\n", e.namespaceURI().toLatin1().data(), e.tagName().toLatin1().data());
-        if(e.namespaceURI() == NS_TLS && e.localName() == "starttls") {
+        if (e.namespaceURI() == NS_TLS && e.localName() == "starttls") {
             // TODO: don't let this be done twice
 
             QDomElement e = doc.createElementNS(NS_TLS, "proceed");
             send(e, true);
             event = ESend;
-            step = HandleTLS;
+            step  = HandleTLS;
             return true;
         }
-        if(e.namespaceURI() == NS_SASL) {
-            if(e.localName() == "auth") {
-                if(sasl_started) {
+        if (e.namespaceURI() == NS_SASL) {
+            if (e.localName() == "auth") {
+                if (sasl_started) {
                     // TODO
                     printf("error\n");
                     return false;
                 }
 
                 sasl_started = true;
-                sasl_mech = e.attribute("mechanism");
+                sasl_mech    = e.attribute("mechanism");
                 // TODO: if child text missing, don't pass it
                 sasl_step = QCA::Base64().stringToArray(e.text()).toByteArray();
-                need = NSASLFirst;
-                step = GetSASLNext;
+                need      = NSASLFirst;
+                step      = GetSASLNext;
                 return false;
-            }
-            else {
+            } else {
                 // TODO
                 printf("unknown sasl tag\n");
                 return false;
             }
         }
-        if(e.namespaceURI() == NS_CLIENT && e.tagName() == "iq") {
+        if (e.namespaceURI() == NS_CLIENT && e.tagName() == "iq") {
             QDomElement b = e.elementsByTagNameNS(NS_BIND, "bind").item(0).toElement();
-            if(!b.isNull()) {
-                QDomElement res = b.elementsByTagName("resource").item(0).toElement();
-                QString resource = res.text();
+            if (!b.isNull()) {
+                QDomElement res      = b.elementsByTagName("resource").item(0).toElement();
+                QString     resource = res.text();
 
                 QDomElement r = doc.createElement("iq");
                 r.setAttribute("type", "result");
                 r.setAttribute("id", e.attribute("id"));
                 QDomElement bind = doc.createElementNS(NS_BIND, "bind");
-                QDomElement jid = doc.createElement("jid");
-                Jid j = QString(user + '@' + host + '/' + resource);
+                QDomElement jid  = doc.createElement("jid");
+                Jid         j    = QString(user + '@' + host + '/' + resource);
                 jid.appendChild(doc.createTextNode(j.full()));
                 bind.appendChild(jid);
                 r.appendChild(bind);
@@ -1792,21 +1672,18 @@ bool CoreProtocol::normalStep(const QDomElement &e)
                 event = ESend;
                 // TODO
                 return true;
-            }
-            else {
+            } else {
                 // TODO
             }
         }
-    }
-    else if(step == GetSASLResponse) {
-        if(e.namespaceURI() == NS_SASL && e.localName() == "response") {
+    } else if (step == GetSASLResponse) {
+        if (e.namespaceURI() == NS_SASL && e.localName() == "response") {
             sasl_step = QCA::Base64().stringToArray(e.text()).toByteArray();
-            need = NSASLNext;
-            step = GetSASLNext;
+            need      = NSASLNext;
+            step      = GetSASLNext;
             return false;
         }
-    }
-    else if(step == GetSMResponse) {
+    } else if (step == GetSMResponse) {
 #ifdef IRIS_SM_DEBUG
         qWarning() << "HandleSM: step";
 #endif
@@ -1824,9 +1701,9 @@ bool CoreProtocol::normalStep(const QDomElement &e)
 #endif
                     QString location = e.attribute("location").trimmed();
                     if (!location.isEmpty()) {
-                        int port_off = 0;
+                        int        port_off = 0;
                         QStringRef sm_host;
-                        int sm_port = 0;
+                        int        sm_port = 0;
                         if (location.startsWith('[')) { // ipv6
                             port_off = location.indexOf(']');
                             if (port_off != -1) { // looks valid
@@ -1849,11 +1726,11 @@ bool CoreProtocol::normalStep(const QDomElement &e)
                 } // else resumption is not supported on this server
                 needTimer(SM_TIMER_INTERVAL_SECS);
                 event = EReady;
-                step = Done;
+                step  = Done;
                 return true;
             } else if (e.localName() == "resumed") {
                 sm.resume(e.attribute("h").toULong());
-                while(true) {
+                while (true) {
                     QDomElement st = sm.getUnacknowledgedStanza();
                     if (st.isNull())
                         break;
@@ -1861,12 +1738,12 @@ bool CoreProtocol::normalStep(const QDomElement &e)
                 }
                 needTimer(SM_TIMER_INTERVAL_SECS);
                 event = EReady;
-                step = Done;
+                step  = Done;
                 return true;
             } else if (e.localName() == "failed") {
                 if (sm.state().isResumption()) { // tried to resume? ok, then try to just enable
                     sm.state().resumption_id.clear();
-                    //step = HandleFeatures;
+                    // step = HandleFeatures;
                     event = ESMResumeFailed;
                     return true;
                 }
@@ -1874,11 +1751,11 @@ bool CoreProtocol::normalStep(const QDomElement &e)
         }
     }
 
-    if(isReady()) {
+    if (isReady()) {
         if (!e.isNull()) {
-            if(isValidStanza(e)) {
+            if (isValidStanza(e)) {
                 stanzaToRecv = e;
-                event = EStanzaReady;
+                event        = EStanzaReady;
                 setIncomingAsExternal();
                 return true;
             } else if (sm.isActive()) {
diff --git a/src/xmpp/xmpp-core/protocol.h b/src/xmpp/xmpp-core/protocol.h
index 13cb6531..50608c6b 100644
--- a/src/xmpp/xmpp-core/protocol.h
+++ b/src/xmpp/xmpp-core/protocol.h
@@ -29,359 +29,348 @@
 #include <QPair>
 #include <QTimer>
 
-#define NS_ETHERX   "http://etherx.jabber.org/streams"
-#define NS_CLIENT   "jabber:client"
-#define NS_SERVER   "jabber:server"
+#define NS_ETHERX "http://etherx.jabber.org/streams"
+#define NS_CLIENT "jabber:client"
+#define NS_SERVER "jabber:server"
 #define NS_DIALBACK "jabber:server:dialback"
-#define NS_STREAMS  "urn:ietf:params:xml:ns:xmpp-streams"
-#define NS_TLS      "urn:ietf:params:xml:ns:xmpp-tls"
-#define NS_SASL     "urn:ietf:params:xml:ns:xmpp-sasl"
-#define NS_SESSION  "urn:ietf:params:xml:ns:xmpp-session"
-#define NS_STANZAS  "urn:ietf:params:xml:ns:xmpp-stanzas"
-#define NS_BIND     "urn:ietf:params:xml:ns:xmpp-bind"
-#define NS_CAPS     "http://jabber.org/protocol/caps"
+#define NS_STREAMS "urn:ietf:params:xml:ns:xmpp-streams"
+#define NS_TLS "urn:ietf:params:xml:ns:xmpp-tls"
+#define NS_SASL "urn:ietf:params:xml:ns:xmpp-sasl"
+#define NS_SESSION "urn:ietf:params:xml:ns:xmpp-session"
+#define NS_STANZAS "urn:ietf:params:xml:ns:xmpp-stanzas"
+#define NS_BIND "urn:ietf:params:xml:ns:xmpp-bind"
+#define NS_CAPS "http://jabber.org/protocol/caps"
 #define NS_COMPRESS_FEATURE "http://jabber.org/features/compress"
 #define NS_COMPRESS_PROTOCOL "http://jabber.org/protocol/compress"
-#define NS_HOSTS    "http://barracuda.com/xmppextensions/hosts"
+#define NS_HOSTS "http://barracuda.com/xmppextensions/hosts"
 
 namespace XMPP {
-    class Version
-    {
-    public:
-        Version(int maj=0, int min=0);
+class Version {
+public:
+    Version(int maj = 0, int min = 0);
+
+    int major, minor;
+};
+
+class StreamFeatures {
+public:
+    StreamFeatures();
+
+    bool        tls_supported, sasl_supported, bind_supported, compress_supported;
+    bool        tls_required;
+    bool        sm_supported;
+    bool        session_supported;
+    bool        session_required;
+    QStringList sasl_mechs;
+    QStringList compression_mechs;
+    QStringList hosts;
+};
+
+class BasicProtocol : public XmlProtocol {
+public:
+    // xmpp 1.0 error conditions // rfc6120
+    enum SASLCond {
+        Aborted,              // server confirms auth abort
+        AccountDisabled,      // account temporrily disabled
+        CredentialsExpired,   // credential expired
+        EncryptionRequired,   // can't use mech without TLS
+        IncorrectEncoding,    // Incorrect encoding. should not happen
+        InvalidAuthzid,       // bad input JID
+        InvalidMech,          // bad mechanism
+        MalformedRequest,     // malformded request
+        MechTooWeak,          // can't use mech with this authzid
+        NotAuthorized,        // bad user, bad password, bad creditials
+        TemporaryAuthFailure, // please try again later!
+    };
+    enum StreamCond {
+        BadFormat,
+        BadNamespacePrefix,
+        Conflict,
+        ConnectionTimeout,
+        HostGone,
+        HostUnknown,
+        ImproperAddressing,
+        InternalServerError,
+        InvalidFrom,
+        InvalidNamespace,
+        InvalidXml,
+        StreamNotAuthorized,
+        PolicyViolation,
+        RemoteConnectionFailed,
+        StreamReset,
+        ResourceConstraint,
+        RestrictedXml,
+        SeeOtherHost,
+        SystemShutdown,
+        UndefinedCondition,
+        UnsupportedEncoding,
+        UnsupportedStanzaType,
+        UnsupportedVersion,
+        NotWellFormed
+    };
+    enum BindCond { BindBadRequest, BindNotAllowed, BindConflict };
+
+    // extend the XmlProtocol enums
+    enum Need {
+        NSASLMechs = XmlProtocol::NCustom, // need SASL mechlist
+        NStartTLS,                         // need to switch on TLS layer
+        NCompress,                         // need to switch on compression layer
+        NSASLFirst,                        // need SASL first step
+        NSASLNext,                         // need SASL next step
+        NSASLLayer,                        // need to switch on SASL layer
+        NCustom = XmlProtocol::NCustom + 10
+    };
+    enum Event {
+        EFeatures = XmlProtocol::ECustom, // breakpoint after features packet is received
+        ESASLSuccess,                     // breakpoint after successful sasl auth
+        EStanzaReady,                     // a stanza was received
+        EStanzaSent,                      // a stanza was sent
+        EReady,                           // stream is ready for stanza use
+        EAck,                             // received SM ack response from server
+        ECustom = XmlProtocol::ECustom + 10
+    };
+    enum Error {
+        ErrProtocol = XmlProtocol::ErrCustom, // there was an error in the xmpp-core protocol exchange
+        ErrStream,                            // <stream:error>, see errCond, errText, and errAppSpec for details
+        ErrStartTLS,                          // server refused starttls
+        ErrCompress,                          // server refused compression
+        ErrAuth, // authorization error.  errCond holds sasl condition (or numeric code for old-protocol)
+        ErrBind, // server refused resource bind
+        ErrCustom = XmlProtocol::ErrCustom + 10
+    };
 
-        int major, minor;
+    BasicProtocol();
+    ~BasicProtocol();
+
+    void reset();
+
+    // for outgoing xml
+    QDomDocument doc;
+
+    // sasl-related
+    QString    saslMech() const;
+    QByteArray saslStep() const;
+    void       setSASLMechList(const QStringList &list);
+    void       setSASLFirst(const QString &mech, const QByteArray &step);
+    void       setSASLNext(const QByteArray &step);
+    void       setSASLAuthed();
+
+    // send / recv
+    void        sendStanza(const QDomElement &e);
+    void        sendDirect(const QString &s);
+    void        sendWhitespace();
+    void        clearSendQueue();
+    QDomElement recvStanza();
+
+    // shutdown
+    void shutdown();
+    void shutdownWithError(int cond, const QString &otherHost = "");
+
+    // <stream> information
+    QString to, from, id, lang;
+    Version version;
+
+    // error output
+    int                     errCond;
+    QString                 errText;
+    QHash<QString, QString> errLangText;
+    QDomElement             errAppSpec;
+    QString                 otherHost;
+
+    QByteArray spare; // filled with unprocessed data on NStartTLS and NSASLLayer
+
+    bool isReady() const;
+
+    enum { TypeElement, TypeStanza, TypeDirect, TypePing };
+
+protected:
+    static int     stringToSASLCond(const QString &s);
+    static int     stringToStreamCond(const QString &s);
+    static QString saslCondToString(int);
+    static QString streamCondToString(int);
+
+    void send(const QDomElement &e, bool clip = false);
+    void sendUrgent(const QDomElement &e, bool clip = false);
+    void sendStreamError(int cond, const QString &text = "", const QDomElement &appSpec = QDomElement());
+    void sendStreamError(const QString &text); // old-style
+
+    bool errorAndClose(int cond, const QString &text = "", const QDomElement &appSpec = QDomElement());
+    bool error(int code);
+    void delayErrorAndClose(int cond, const QString &text = "", const QDomElement &appSpec = QDomElement());
+    void delayError(int code);
+
+    // reimplemented
+    QDomElement docElement();
+    void        handleDocOpen(const Parser::Event &pe);
+    bool        handleError();
+    bool        handleCloseFinished();
+    bool        doStep(const QDomElement &e);
+    void        itemWritten(int id, int size);
+
+    virtual QString     defaultNamespace();
+    virtual QStringList extraNamespaces(); // stringlist: prefix,uri,prefix,uri, [...]
+    virtual void        handleStreamOpen(const Parser::Event &pe);
+    virtual bool        doStep2(const QDomElement &e) = 0;
+
+    void setReady(bool b);
+
+    QString     sasl_mech;
+    QStringList sasl_mechlist;
+    QByteArray  sasl_step;
+    bool        sasl_authed;
+
+    QDomElement stanzaToRecv;
+
+private:
+    struct SASLCondEntry {
+        const char *str;
+        int         cond;
     };
+    static SASLCondEntry saslCondTable[];
 
-    class StreamFeatures
-    {
-    public:
-        StreamFeatures();
-
-        bool tls_supported, sasl_supported, bind_supported, compress_supported;
-        bool tls_required;
-        bool sm_supported;
-        bool session_supported;
-        bool session_required;
-        QStringList sasl_mechs;
-        QStringList compression_mechs;
-        QStringList hosts;
+    struct StreamCondEntry {
+        const char *str;
+        int         cond;
     };
+    static StreamCondEntry streamCondTable[];
 
-    class BasicProtocol : public XmlProtocol
-    {
-    public:
-        // xmpp 1.0 error conditions // rfc6120
-        enum SASLCond {
-            Aborted,                    // server confirms auth abort
-            AccountDisabled,            // account temporrily disabled
-            CredentialsExpired,         // credential expired
-            EncryptionRequired,         // can't use mech without TLS
-            IncorrectEncoding,          // Incorrect encoding. should not happen
-            InvalidAuthzid,             // bad input JID
-            InvalidMech,                // bad mechanism
-            MalformedRequest,           // malformded request
-            MechTooWeak,                // can't use mech with this authzid
-            NotAuthorized,              // bad user, bad password, bad creditials
-            TemporaryAuthFailure,       // please try again later!
-        };
-        enum StreamCond {
-            BadFormat,
-            BadNamespacePrefix,
-            Conflict,
-            ConnectionTimeout,
-            HostGone,
-            HostUnknown,
-            ImproperAddressing,
-            InternalServerError,
-            InvalidFrom,
-            InvalidNamespace,
-            InvalidXml,
-            StreamNotAuthorized,
-            PolicyViolation,
-            RemoteConnectionFailed,
-            StreamReset,
-            ResourceConstraint,
-            RestrictedXml,
-            SeeOtherHost,
-            SystemShutdown,
-            UndefinedCondition,
-            UnsupportedEncoding,
-            UnsupportedStanzaType,
-            UnsupportedVersion,
-            NotWellFormed
-        };
-        enum BindCond {
-            BindBadRequest,
-            BindNotAllowed,
-            BindConflict
-        };
-
-        // extend the XmlProtocol enums
-        enum Need {
-            NSASLMechs = XmlProtocol::NCustom, // need SASL mechlist
-            NStartTLS,  // need to switch on TLS layer
-            NCompress,  // need to switch on compression layer
-            NSASLFirst, // need SASL first step
-            NSASLNext,  // need SASL next step
-            NSASLLayer, // need to switch on SASL layer
-            NCustom = XmlProtocol::NCustom+10
-        };
-        enum Event {
-            EFeatures = XmlProtocol::ECustom, // breakpoint after features packet is received
-            ESASLSuccess, // breakpoint after successful sasl auth
-            EStanzaReady, // a stanza was received
-            EStanzaSent,  // a stanza was sent
-            EReady,       // stream is ready for stanza use
-            EAck,          // received SM ack response from server
-            ECustom = XmlProtocol::ECustom+10
-        };
-        enum Error {
-            ErrProtocol = XmlProtocol::ErrCustom, // there was an error in the xmpp-core protocol exchange
-            ErrStream,   // <stream:error>, see errCond, errText, and errAppSpec for details
-            ErrStartTLS, // server refused starttls
-            ErrCompress, // server refused compression
-            ErrAuth,     // authorization error.  errCond holds sasl condition (or numeric code for old-protocol)
-            ErrBind,     // server refused resource bind
-            ErrCustom = XmlProtocol::ErrCustom+10
-        };
-
-        BasicProtocol();
-        ~BasicProtocol();
-
-        void reset();
-
-        // for outgoing xml
-        QDomDocument doc;
-
-        // sasl-related
-        QString saslMech() const;
-        QByteArray saslStep() const;
-        void setSASLMechList(const QStringList &list);
-        void setSASLFirst(const QString &mech, const QByteArray &step);
-        void setSASLNext(const QByteArray &step);
-        void setSASLAuthed();
-
-        // send / recv
-        void sendStanza(const QDomElement &e);
-        void sendDirect(const QString &s);
-        void sendWhitespace();
-        void clearSendQueue();
-        QDomElement recvStanza();
-
-        // shutdown
-        void shutdown();
-        void shutdownWithError(int cond, const QString &otherHost="");
-
-        // <stream> information
-        QString to, from, id, lang;
-        Version version;
-
-        // error output
-        int errCond;
-        QString errText;
-        QHash<QString,QString> errLangText;
-        QDomElement errAppSpec;
-        QString otherHost;
-
-        QByteArray spare; // filled with unprocessed data on NStartTLS and NSASLLayer
-
-        bool isReady() const;
-
-        enum { TypeElement, TypeStanza, TypeDirect, TypePing };
-
-    protected:
-        static int stringToSASLCond(const QString &s);
-        static int stringToStreamCond(const QString &s);
-        static QString saslCondToString(int);
-        static QString streamCondToString(int);
-
-        void send(const QDomElement &e, bool clip=false);
-        void sendUrgent(const QDomElement &e, bool clip=false);
-        void sendStreamError(int cond, const QString &text="", const QDomElement &appSpec=QDomElement());
-        void sendStreamError(const QString &text); // old-style
-
-        bool errorAndClose(int cond, const QString &text="", const QDomElement &appSpec=QDomElement());
-        bool error(int code);
-        void delayErrorAndClose(int cond, const QString &text="", const QDomElement &appSpec=QDomElement());
-        void delayError(int code);
-
-        // reimplemented
-        QDomElement docElement();
-        void handleDocOpen(const Parser::Event &pe);
-        bool handleError();
-        bool handleCloseFinished();
-        bool doStep(const QDomElement &e);
-        void itemWritten(int id, int size);
-
-        virtual QString defaultNamespace();
-        virtual QStringList extraNamespaces(); // stringlist: prefix,uri,prefix,uri, [...]
-        virtual void handleStreamOpen(const Parser::Event &pe);
-        virtual bool doStep2(const QDomElement &e)=0;
-
-        void setReady(bool b);
-
-        QString sasl_mech;
-        QStringList sasl_mechlist;
-        QByteArray sasl_step;
-        bool sasl_authed;
-
-        QDomElement stanzaToRecv;
-
-    private:
-        struct SASLCondEntry
-        {
-            const char *str;
-            int cond;
-        };
-        static SASLCondEntry saslCondTable[];
-
-        struct StreamCondEntry
-        {
-            const char *str;
-            int cond;
-        };
-        static StreamCondEntry streamCondTable[];
-
-        struct SendItem
-        {
-            QDomElement stanzaToSend;
-            QString stringToSend;
-            bool doWhitespace;
-        };
-        QList<SendItem> sendList;
-
-        bool doShutdown, delayedError, closeError, ready;
-        int stanzasPending, stanzasWritten;
-
-        void init();
-        void extractStreamError(const QDomElement &e);
+    struct SendItem {
+        QDomElement stanzaToSend;
+        QString     stringToSend;
+        bool        doWhitespace;
+    };
+    QList<SendItem> sendList;
+
+    bool doShutdown, delayedError, closeError, ready;
+    int  stanzasPending, stanzasWritten;
+
+    void init();
+    void extractStreamError(const QDomElement &e);
+};
+
+class CoreProtocol : public BasicProtocol {
+public:
+    enum {
+        NPassword = NCustom,  // need password for old-mode
+        EDBVerify = ECustom,  // breakpoint after db:verify request
+        ErrPlain  = ErrCustom // server only supports plain, but allowPlain is false locally
     };
 
-    class CoreProtocol : public BasicProtocol
-    {
+    CoreProtocol();
+    ~CoreProtocol();
+
+    void reset();
+    void needTimer(int seconds);
+
+    // reimplemented to do SM
+    void sendStanza(const QDomElement &e);
+
+    void startClientOut(const Jid &jid, bool oldOnly, bool tlsActive, bool doAuth, bool doCompression);
+    void startServerOut(const QString &to);
+    void startDialbackOut(const QString &to, const QString &from);
+    void startDialbackVerifyOut(const QString &to, const QString &from, const QString &id, const QString &key);
+    void startClientIn(const QString &id);
+    void startServerIn(const QString &id);
+
+    void       setLang(const QString &s);
+    void       setAllowTLS(bool b);
+    void       setAllowBind(bool b);
+    void       setAllowPlain(bool b); // old-mode
+    const Jid &jid() const;
+
+    void setPassword(const QString &s);
+    void setFrom(const QString &s);
+    void setDialbackKey(const QString &s);
+
+    // input
+    QString user, host;
+
+    // status
+    bool old;
+
+    StreamFeatures     features;
+    QList<QDomElement> unhandledFeatures;
+    QStringList        hosts;
+
+    // static QString xmlToString(const QDomElement &e, bool clip=false);
+
+    StreamManagement sm;
+
+    class DBItem {
     public:
-        enum {
-            NPassword = NCustom,  // need password for old-mode
-            EDBVerify = ECustom,  // breakpoint after db:verify request
-            ErrPlain = ErrCustom  // server only supports plain, but allowPlain is false locally
-        };
-
-        CoreProtocol();
-        ~CoreProtocol();
-
-        void reset();
-        void needTimer(int seconds);
-
-        // reimplemented to do SM
-        void sendStanza(const QDomElement &e);
-
-        void startClientOut(const Jid &jid, bool oldOnly, bool tlsActive, bool doAuth, bool doCompression);
-        void startServerOut(const QString &to);
-        void startDialbackOut(const QString &to, const QString &from);
-        void startDialbackVerifyOut(const QString &to, const QString &from, const QString &id, const QString &key);
-        void startClientIn(const QString &id);
-        void startServerIn(const QString &id);
-
-        void setLang(const QString &s);
-        void setAllowTLS(bool b);
-        void setAllowBind(bool b);
-        void setAllowPlain(bool b); // old-mode
-        const Jid& jid() const;
-
-        void setPassword(const QString &s);
-        void setFrom(const QString &s);
-        void setDialbackKey(const QString &s);
-
-        // input
-        QString user, host;
-
-        // status
-        bool old;
-
-        StreamFeatures features;
-        QList<QDomElement> unhandledFeatures;
-        QStringList hosts;
-
-        //static QString xmlToString(const QDomElement &e, bool clip=false);
-
-        StreamManagement sm;
-
-        class DBItem
-        {
-        public:
-            enum { ResultRequest, ResultGrant, VerifyRequest, VerifyGrant, Validated };
-            int type;
-            Jid to, from;
-            QString key, id;
-            bool ok;
-        };
-    private:
-        enum Step {
-            Start,
-            Done,
-            SendFeatures,
-            GetRequest,
-            HandleTLS,
-            GetSASLResponse,
-            IncHandleSASLSuccess,
-            GetFeatures,        // read features packet
-            HandleFeatures,     // act on features, by initiating tls, sasl, or bind
-            GetTLSProceed,      // read <proceed/> tls response
-            GetCompressProceed, // read <compressed/> compression response
-            GetSASLFirst,       // perform sasl first step using provided data
-            GetSASLChallenge,   // read server sasl challenge
-            GetSASLNext,        // perform sasl next step using provided data
-            HandleSASLSuccess,  // handle what must be done after reporting sasl success
-            GetBindResponse,    // read bind response
-            HandleAuthGet,      // send old-protocol auth-get
-            GetAuthGetResponse, // read auth-get response
-            HandleAuthSet,      // send old-protocol auth-set
-            GetAuthSetResponse, // read auth-set response
-            GetSMResponse       // read SM init response
-        };
-
-        QList<DBItem> dbrequests, dbpending, dbvalidated;
-
-        bool server, dialback, dialback_verify;
-        int step;
-
-        bool digest;
-        bool tls_started, sasl_started, compress_started;
-
-        Jid jid_;
-        bool oldOnly;
-        bool allowPlain;
-        bool doTLS, doAuth, doBinding, doCompress;
-        QString password;
-
-        QString dialback_id, dialback_key;
-        QString self_from;
-
-        void init();
-        static int getOldErrorCode(const QDomElement &e);
-        bool loginComplete();
-
-        bool isValidStanza(const QDomElement &e) const;
-        bool streamManagementHandleStanza(const QDomElement &e);
-        bool grabPendingItem(const Jid &to, const Jid &from, int type, DBItem *item);
-        bool normalStep(const QDomElement &e);
-        bool dialbackStep(const QDomElement &e);
-
-        bool needSMRequest();
-
-        // reimplemented
-        bool stepAdvancesParser() const;
-        bool stepRequiresElement() const;
-        void stringSend(const QString &s);
-        void stringRecv(const QString &s);
-        QString defaultNamespace();
-        QStringList extraNamespaces();
-        void handleStreamOpen(const Parser::Event &pe);
-        bool doStep2(const QDomElement &e);
-        void elementSend(const QDomElement &e);
-        void elementRecv(const QDomElement &e);
+        enum { ResultRequest, ResultGrant, VerifyRequest, VerifyGrant, Validated };
+        int     type;
+        Jid     to, from;
+        QString key, id;
+        bool    ok;
     };
+
+private:
+    enum Step {
+        Start,
+        Done,
+        SendFeatures,
+        GetRequest,
+        HandleTLS,
+        GetSASLResponse,
+        IncHandleSASLSuccess,
+        GetFeatures,        // read features packet
+        HandleFeatures,     // act on features, by initiating tls, sasl, or bind
+        GetTLSProceed,      // read <proceed/> tls response
+        GetCompressProceed, // read <compressed/> compression response
+        GetSASLFirst,       // perform sasl first step using provided data
+        GetSASLChallenge,   // read server sasl challenge
+        GetSASLNext,        // perform sasl next step using provided data
+        HandleSASLSuccess,  // handle what must be done after reporting sasl success
+        GetBindResponse,    // read bind response
+        HandleAuthGet,      // send old-protocol auth-get
+        GetAuthGetResponse, // read auth-get response
+        HandleAuthSet,      // send old-protocol auth-set
+        GetAuthSetResponse, // read auth-set response
+        GetSMResponse       // read SM init response
+    };
+
+    QList<DBItem> dbrequests, dbpending, dbvalidated;
+
+    bool server, dialback, dialback_verify;
+    int  step;
+
+    bool digest;
+    bool tls_started, sasl_started, compress_started;
+
+    Jid     jid_;
+    bool    oldOnly;
+    bool    allowPlain;
+    bool    doTLS, doAuth, doBinding, doCompress;
+    QString password;
+
+    QString dialback_id, dialback_key;
+    QString self_from;
+
+    void       init();
+    static int getOldErrorCode(const QDomElement &e);
+    bool       loginComplete();
+
+    bool isValidStanza(const QDomElement &e) const;
+    bool streamManagementHandleStanza(const QDomElement &e);
+    bool grabPendingItem(const Jid &to, const Jid &from, int type, DBItem *item);
+    bool normalStep(const QDomElement &e);
+    bool dialbackStep(const QDomElement &e);
+
+    bool needSMRequest();
+
+    // reimplemented
+    bool        stepAdvancesParser() const;
+    bool        stepRequiresElement() const;
+    void        stringSend(const QString &s);
+    void        stringRecv(const QString &s);
+    QString     defaultNamespace();
+    QStringList extraNamespaces();
+    void        handleStreamOpen(const Parser::Event &pe);
+    bool        doStep2(const QDomElement &e);
+    void        elementSend(const QDomElement &e);
+    void        elementRecv(const QDomElement &e);
+};
 } // namespace XMPP
 
 #endif // PROTOCOL_H
diff --git a/src/xmpp/xmpp-core/securestream.cpp b/src/xmpp/xmpp-core/securestream.cpp
index 74cf9238..0f648e3f 100644
--- a/src/xmpp/xmpp-core/securestream.cpp
+++ b/src/xmpp/xmpp-core/securestream.cpp
@@ -39,11 +39,9 @@
 //----------------------------------------------------------------------------
 // LayerTracker
 //----------------------------------------------------------------------------
-class LayerTracker
-{
+class LayerTracker {
 public:
-    struct Item
-    {
+    struct Item {
         int plain;
         int encoded;
     };
@@ -53,16 +51,13 @@ class LayerTracker
     void reset();
     void addPlain(int plain);
     void specifyEncoded(int encoded, int plain);
-    int finished(int encoded);
+    int  finished(int encoded);
 
-    int p;
+    int         p;
     QList<Item> list;
 };
 
-LayerTracker::LayerTracker()
-{
-    p = 0;
-}
+LayerTracker::LayerTracker() { p = 0; }
 
 void LayerTracker::reset()
 {
@@ -70,19 +65,16 @@ void LayerTracker::reset()
     list.clear();
 }
 
-void LayerTracker::addPlain(int plain)
-{
-    p += plain;
-}
+void LayerTracker::addPlain(int plain) { p += plain; }
 
 void LayerTracker::specifyEncoded(int encoded, int plain)
 {
     // can't specify more bytes than we have
-    if(plain > p)
+    if (plain > p)
         plain = p;
     p -= plain;
     Item i;
-    i.plain = plain;
+    i.plain   = plain;
     i.encoded = encoded;
     list += i;
 }
@@ -90,11 +82,11 @@ void LayerTracker::specifyEncoded(int encoded, int plain)
 int LayerTracker::finished(int encoded)
 {
     int plain = 0;
-    for(QList<Item>::Iterator it = list.begin(); it != list.end();) {
+    for (QList<Item>::Iterator it = list.begin(); it != list.end();) {
         Item &i = *it;
 
         // not enough?
-        if(encoded < i.encoded) {
+        if (encoded < i.encoded) {
             i.encoded -= encoded;
             break;
         }
@@ -109,14 +101,13 @@ int LayerTracker::finished(int encoded)
 //----------------------------------------------------------------------------
 // SecureStream
 //----------------------------------------------------------------------------
-class SecureLayer : public QObject
-{
+class SecureLayer : public QObject {
     Q_OBJECT
 public:
     enum { TLS, SASL, TLSH, Compression };
     int type;
     union {
-        QCA::TLS *tls;
+        QCA::TLS * tls;
         QCA::SASL *sasl;
 #ifdef USE_TLSHANDLER
         XMPP::TLSHandler *tlsHandler;
@@ -124,12 +115,12 @@ class SecureLayer : public QObject
         CompressionHandler *compressionHandler;
     } p;
     LayerTracker layer;
-    bool tls_done;
-    int prebytes;
+    bool         tls_done;
+    int          prebytes;
 
     SecureLayer(QCA::TLS *t)
     {
-        type = TLS;
+        type  = TLS;
         p.tls = t;
         init();
         connect(p.tls, SIGNAL(handshaken()), SLOT(tls_handshaken()));
@@ -141,7 +132,7 @@ class SecureLayer : public QObject
 
     SecureLayer(QCA::SASL *s)
     {
-        type = SASL;
+        type   = SASL;
         p.sasl = s;
         init();
         connect(p.sasl, SIGNAL(readyRead()), SLOT(sasl_readyRead()));
@@ -152,7 +143,7 @@ class SecureLayer : public QObject
     SecureLayer(CompressionHandler *t)
     {
         t->setParent(this); // automatically clean up CompressionHandler when SecureLayer is destroyed
-        type = Compression;
+        type                 = Compression;
         p.compressionHandler = t;
         init();
         connect(p.compressionHandler, SIGNAL(readyRead()), SLOT(compressionHandler_readyRead()));
@@ -163,14 +154,15 @@ class SecureLayer : public QObject
 #ifdef USE_TLSHANDLER
     SecureLayer(XMPP::TLSHandler *t)
     {
-        type = TLSH;
+        type         = TLSH;
         p.tlsHandler = t;
         init();
         connect(p.tlsHandler, SIGNAL(success()), SLOT(tlsHandler_success()));
         connect(p.tlsHandler, SIGNAL(fail()), SLOT(tlsHandler_fail()));
         connect(p.tlsHandler, SIGNAL(closed()), SLOT(tlsHandler_closed()));
         connect(p.tlsHandler, SIGNAL(readyRead(QByteArray)), SLOT(tlsHandler_readyRead(QByteArray)));
-        connect(p.tlsHandler, SIGNAL(readyReadOutgoing(QByteArray,int)), SLOT(tlsHandler_readyReadOutgoing(QByteArray,int)));
+        connect(p.tlsHandler, SIGNAL(readyReadOutgoing(QByteArray, int)),
+                SLOT(tlsHandler_readyReadOutgoing(QByteArray, int)));
     }
 #endif
 
@@ -183,25 +175,49 @@ class SecureLayer : public QObject
     void write(const QByteArray &a)
     {
         layer.addPlain(a.size());
-        switch(type) {
-            case TLS:  { p.tls->write(a); break; }
-            case SASL: { p.sasl->write(a); break; }
+        switch (type) {
+        case TLS: {
+            p.tls->write(a);
+            break;
+        }
+        case SASL: {
+            p.sasl->write(a);
+            break;
+        }
 #ifdef USE_TLSHANDLER
-            case TLSH: { p.tlsHandler->write(a); break; }
+        case TLSH: {
+            p.tlsHandler->write(a);
+            break;
+        }
 #endif
-            case Compression: { p.compressionHandler->write(a); break; }
+        case Compression: {
+            p.compressionHandler->write(a);
+            break;
+        }
         }
     }
 
     void writeIncoming(const QByteArray &a)
     {
-        switch(type) {
-            case TLS:  { p.tls->writeIncoming(a); break; }
-            case SASL: { p.sasl->writeIncoming(a); break; }
+        switch (type) {
+        case TLS: {
+            p.tls->writeIncoming(a);
+            break;
+        }
+        case SASL: {
+            p.sasl->writeIncoming(a);
+            break;
+        }
 #ifdef USE_TLSHANDLER
-            case TLSH: { p.tlsHandler->writeIncoming(a); break; }
+        case TLSH: {
+            p.tlsHandler->writeIncoming(a);
+            break;
+        }
 #endif
-            case Compression: { p.compressionHandler->writeIncoming(a); break; }
+        case Compression: {
+            p.compressionHandler->writeIncoming(a);
+            break;
+        }
         }
     }
 
@@ -210,13 +226,12 @@ class SecureLayer : public QObject
         int written = 0;
 
         // deal with prebytes (bytes sent prior to this security layer)
-        if(prebytes > 0) {
-            if(prebytes >= plain) {
+        if (prebytes > 0) {
+            if (prebytes >= plain) {
                 written += plain;
                 prebytes -= plain;
                 plain = 0;
-            }
-            else {
+            } else {
                 written += prebytes;
                 plain -= prebytes;
                 prebytes = 0;
@@ -224,7 +239,7 @@ class SecureLayer : public QObject
         }
 
         // put remainder into the layer tracker
-        if(type == SASL || tls_done)
+        if (type == SASL || tls_done)
             written += layer.finished(plain);
 
         return written;
@@ -253,7 +268,7 @@ private slots:
     void tls_readyReadOutgoing(int plainBytes)
     {
         QByteArray a = p.tls->readOutgoing();
-        if(tls_done)
+        if (tls_done)
             layer.specifyEncoded(a.size(), plainBytes);
         needWrite(a);
     }
@@ -264,10 +279,7 @@ private slots:
         tlsClosed(a);
     }
 
-    void tls_error(int x)
-    {
-        error(x);
-    }
+    void tls_error(int x) { error(x); }
 
     void sasl_readyRead()
     {
@@ -277,16 +289,13 @@ private slots:
 
     void sasl_readyReadOutgoing()
     {
-        int plainBytes;
+        int        plainBytes;
         QByteArray a = p.sasl->readOutgoing(&plainBytes);
         layer.specifyEncoded(a.size(), plainBytes);
         needWrite(a);
     }
 
-    void sasl_error()
-    {
-        error(p.sasl->errorCode());
-    }
+    void sasl_error() { error(p.sasl->errorCode()); }
 
     void compressionHandler_readyRead()
     {
@@ -296,16 +305,13 @@ private slots:
 
     void compressionHandler_readyReadOutgoing()
     {
-        int plainBytes;
+        int        plainBytes;
         QByteArray a = p.compressionHandler->readOutgoing(&plainBytes);
         layer.specifyEncoded(a.size(), plainBytes);
         needWrite(a);
     }
 
-    void compressionHandler_error()
-    {
-        error(p.compressionHandler->errorCode());
-    }
+    void compressionHandler_error() { error(p.compressionHandler->errorCode()); }
 
 #ifdef USE_TLSHANDLER
     void tlsHandler_success()
@@ -314,24 +320,15 @@ private slots:
         tlsHandshaken();
     }
 
-    void tlsHandler_fail()
-    {
-        error(0);
-    }
+    void tlsHandler_fail() { error(0); }
 
-    void tlsHandler_closed()
-    {
-        tlsClosed(QByteArray());
-    }
+    void tlsHandler_closed() { tlsClosed(QByteArray()); }
 
-    void tlsHandler_readyRead(const QByteArray &a)
-    {
-        readyRead(a);
-    }
+    void tlsHandler_readyRead(const QByteArray &a) { readyRead(a); }
 
     void tlsHandler_readyReadOutgoing(const QByteArray &a, int plainBytes)
     {
-        if(tls_done)
+        if (tls_done)
             layer.specifyEncoded(a.size(), plainBytes);
         needWrite(a);
     }
@@ -340,22 +337,21 @@ private slots:
 
 #include "securestream.moc"
 
-class SecureStream::Private
-{
+class SecureStream::Private {
 public:
-    ByteStream *bs;
-    QList<SecureLayer*> layers;
-    int pending;
-    int errorCode;
-    bool active;
-    bool topInProgress;
+    ByteStream *         bs;
+    QList<SecureLayer *> layers;
+    int                  pending;
+    int                  errorCode;
+    bool                 active;
+    bool                 topInProgress;
 
     bool haveTLS() const
     {
-        foreach(SecureLayer *s, layers) {
-            if(s->type == SecureLayer::TLS
+        foreach (SecureLayer *s, layers) {
+            if (s->type == SecureLayer::TLS
 #ifdef USE_TLSHANDLER
-            || s->type == SecureLayer::TLSH
+                || s->type == SecureLayer::TLSH
 #endif
             ) {
                 return true;
@@ -366,8 +362,8 @@ class SecureStream::Private
 
     bool haveSASL() const
     {
-        foreach(SecureLayer *s, layers) {
-            if(s->type == SecureLayer::SASL)
+        foreach (SecureLayer *s, layers) {
+            if (s->type == SecureLayer::SASL)
                 return true;
         }
         return false;
@@ -375,8 +371,8 @@ class SecureStream::Private
 
     bool haveCompress() const
     {
-        foreach(SecureLayer *s, layers) {
-            if(s->type == SecureLayer::Compression)
+        foreach (SecureLayer *s, layers) {
+            if (s->type == SecureLayer::Compression)
                 return true;
         }
         return false;
@@ -389,8 +385,7 @@ class SecureStream::Private
     }
 };
 
-SecureStream::SecureStream(ByteStream *s)
-:ByteStream(nullptr)
+SecureStream::SecureStream(ByteStream *s) : ByteStream(nullptr)
 {
     d = new Private;
 
@@ -398,8 +393,8 @@ SecureStream::SecureStream(ByteStream *s)
     connect(d->bs, SIGNAL(readyRead()), SLOT(bs_readyRead()));
     connect(d->bs, SIGNAL(bytesWritten(qint64)), SLOT(bs_bytesWritten(qint64)));
 
-    d->pending = 0;
-    d->active = true;
+    d->pending       = 0;
+    d->active        = true;
     d->topInProgress = false;
     setOpenMode(QIODevice::ReadWrite);
 }
@@ -422,7 +417,7 @@ void SecureStream::linkLayer(QObject *s)
 int SecureStream::calcPrebytes() const
 {
     int x = 0;
-    foreach(SecureLayer *s, d->layers) {
+    foreach (SecureLayer *s, d->layers) {
         x += s->prebytes;
     }
     return (d->pending - x);
@@ -430,11 +425,11 @@ int SecureStream::calcPrebytes() const
 
 void SecureStream::startTLSClient(QCA::TLS *t, const QByteArray &spare)
 {
-    if(!d->active || d->topInProgress || d->haveTLS())
+    if (!d->active || d->topInProgress || d->haveTLS())
         return;
 
     SecureLayer *s = new SecureLayer(t);
-    s->prebytes = calcPrebytes();
+    s->prebytes    = calcPrebytes();
     linkLayer(s);
     d->layers.append(s);
     d->topInProgress = true;
@@ -444,11 +439,11 @@ void SecureStream::startTLSClient(QCA::TLS *t, const QByteArray &spare)
 
 void SecureStream::startTLSServer(QCA::TLS *t, const QByteArray &spare)
 {
-    if(!d->active || d->topInProgress || d->haveTLS())
+    if (!d->active || d->topInProgress || d->haveTLS())
         return;
 
     SecureLayer *s = new SecureLayer(t);
-    s->prebytes = calcPrebytes();
+    s->prebytes    = calcPrebytes();
     linkLayer(s);
     d->layers.append(s);
     d->topInProgress = true;
@@ -456,13 +451,13 @@ void SecureStream::startTLSServer(QCA::TLS *t, const QByteArray &spare)
     insertData(spare);
 }
 
-void SecureStream::setLayerCompress(const QByteArray& spare)
+void SecureStream::setLayerCompress(const QByteArray &spare)
 {
-    if(!d->active || d->topInProgress || d->haveCompress())
+    if (!d->active || d->topInProgress || d->haveCompress())
         return;
 
     SecureLayer *s = new SecureLayer(new CompressionHandler());
-    s->prebytes = calcPrebytes();
+    s->prebytes    = calcPrebytes();
     linkLayer(s);
     d->layers.append(s);
 
@@ -471,11 +466,11 @@ void SecureStream::setLayerCompress(const QByteArray& spare)
 
 void SecureStream::setLayerSASL(QCA::SASL *sasl, const QByteArray &spare)
 {
-    if(!d->active || d->topInProgress || d->haveSASL())
+    if (!d->active || d->topInProgress || d->haveSASL())
         return;
 
     SecureLayer *s = new SecureLayer(sasl);
-    s->prebytes = calcPrebytes();
+    s->prebytes    = calcPrebytes();
     linkLayer(s);
     d->layers.append(s);
 
@@ -485,11 +480,11 @@ void SecureStream::setLayerSASL(QCA::SASL *sasl, const QByteArray &spare)
 #ifdef USE_TLSHANDLER
 void SecureStream::startTLSClient(XMPP::TLSHandler *t, const QString &server, const QByteArray &spare)
 {
-    if(!d->active || d->topInProgress || d->haveTLS())
+    if (!d->active || d->topInProgress || d->haveTLS())
         return;
 
     SecureLayer *s = new SecureLayer(t);
-    s->prebytes = calcPrebytes();
+    s->prebytes    = calcPrebytes();
     linkLayer(s);
     d->layers.append(s);
     d->topInProgress = true;
@@ -505,25 +500,19 @@ void SecureStream::closeTLS()
 {
     if (!d->layers.isEmpty()) {
         SecureLayer *s = d->layers.last();
-        if(s->type == SecureLayer::TLS) {
+        if (s->type == SecureLayer::TLS) {
             s->p.tls->close();
         }
     }
 }
 
-int SecureStream::errorCode() const
-{
-    return d->errorCode;
-}
+int SecureStream::errorCode() const { return d->errorCode; }
 
-bool SecureStream::isOpen() const
-{
-    return d->active;
-}
+bool SecureStream::isOpen() const { return d->active; }
 
 void SecureStream::write(const QByteArray &a)
 {
-    if(!isOpen()) {
+    if (!isOpen()) {
         qDebug("Writing to closed stream!");
         return;
     }
@@ -534,16 +523,12 @@ void SecureStream::write(const QByteArray &a)
     if (!d->layers.isEmpty()) {
         SecureLayer *s = d->layers.last();
         s->write(a);
-    }
-    else {
+    } else {
         writeRawData(a);
     }
 }
 
-qint64 SecureStream::bytesToWrite() const
-{
-    return d->pending;
-}
+qint64 SecureStream::bytesToWrite() const { return d->pending; }
 
 void SecureStream::bs_readyRead()
 {
@@ -553,19 +538,18 @@ void SecureStream::bs_readyRead()
     if (!d->layers.isEmpty()) {
         SecureLayer *s = d->layers.first();
         s->writeIncoming(a);
-    }
-    else {
+    } else {
         incomingData(a);
     }
 }
 
 void SecureStream::bs_bytesWritten(qint64 bytes)
 {
-    foreach(SecureLayer *s, d->layers) {
+    foreach (SecureLayer *s, d->layers) {
         bytes = s->finished(bytes);
     }
 
-    if(bytes > 0) {
+    if (bytes > 0) {
         d->pending -= bytes;
         bytesWritten(bytes);
     }
@@ -587,9 +571,9 @@ void SecureStream::layer_tlsClosed(const QByteArray &)
 
 void SecureStream::layer_readyRead(const QByteArray &a)
 {
-    SecureLayer *s = static_cast<SecureLayer *>(sender());
-    QList<SecureLayer*>::Iterator it(d->layers.begin());
-    while((*it) != s) {
+    SecureLayer *                  s = static_cast<SecureLayer *>(sender());
+    QList<SecureLayer *>::Iterator it(d->layers.begin());
+    while ((*it) != s) {
         Q_ASSERT(it != d->layers.end());
         ++it;
     }
@@ -600,17 +584,16 @@ void SecureStream::layer_readyRead(const QByteArray &a)
     if (it != d->layers.end()) {
         s = (*it);
         s->writeIncoming(a);
-    }
-    else {
+    } else {
         incomingData(a);
     }
 }
 
 void SecureStream::layer_needWrite(const QByteArray &a)
 {
-    SecureLayer *s = static_cast<SecureLayer *>(sender());
-    QList<SecureLayer*>::Iterator it(d->layers.begin());
-    while((*it) != s) {
+    SecureLayer *                  s = static_cast<SecureLayer *>(sender());
+    QList<SecureLayer *>::Iterator it(d->layers.begin());
+    while ((*it) != s) {
         Q_ASSERT(it != d->layers.end());
         ++it;
     }
@@ -621,51 +604,46 @@ void SecureStream::layer_needWrite(const QByteArray &a)
         --it;
         s = (*it);
         s->write(a);
-    }
-    else {
+    } else {
         writeRawData(a);
     }
 }
 
 void SecureStream::layer_error(int x)
 {
-    SecureLayer *s = static_cast<SecureLayer *>(sender());
-    int type = s->type;
-    d->errorCode = x;
+    SecureLayer *s    = static_cast<SecureLayer *>(sender());
+    int          type = s->type;
+    d->errorCode      = x;
     setOpenMode(QIODevice::NotOpen);
     d->active = false;
     d->deleteLayers();
-    if(type == SecureLayer::TLS)
+    if (type == SecureLayer::TLS)
         setError(ErrTLS);
-    else if(type == SecureLayer::SASL)
+    else if (type == SecureLayer::SASL)
         setError(ErrSASL);
 #ifdef USE_TLSHANDLER
-    else if(type == SecureLayer::TLSH)
+    else if (type == SecureLayer::TLSH)
         setError(ErrTLS);
 #endif
 }
 
 void SecureStream::insertData(const QByteArray &a)
 {
-    if(!a.isEmpty()) {
+    if (!a.isEmpty()) {
         if (!d->layers.isEmpty()) {
             SecureLayer *s = d->layers.last();
             s->writeIncoming(a);
-        }
-        else {
+        } else {
             incomingData(a);
         }
     }
 }
 
-void SecureStream::writeRawData(const QByteArray &a)
-{
-    d->bs->write(a);
-}
+void SecureStream::writeRawData(const QByteArray &a) { d->bs->write(a); }
 
 void SecureStream::incomingData(const QByteArray &a)
 {
     appendRead(a);
-    if(bytesAvailable())
+    if (bytesAvailable())
         emit readyRead();
 }
diff --git a/src/xmpp/xmpp-core/securestream.h b/src/xmpp/xmpp-core/securestream.h
index 6abc2ca6..15f16401 100644
--- a/src/xmpp/xmpp-core/securestream.h
+++ b/src/xmpp/xmpp-core/securestream.h
@@ -27,34 +27,33 @@
 #define USE_TLSHANDLER
 #ifdef USE_TLSHANDLER
 namespace XMPP {
-    class TLSHandler;
+class TLSHandler;
 }
 #endif
 
 class CompressionHandler;
 
-class SecureStream : public ByteStream
-{
+class SecureStream : public ByteStream {
     Q_OBJECT
 public:
     enum Error { ErrTLS = ErrCustom, ErrSASL };
     SecureStream(ByteStream *s);
     ~SecureStream();
 
-    void startTLSClient(QCA::TLS *t, const QByteArray &spare=QByteArray());
-    void startTLSServer(QCA::TLS *t, const QByteArray &spare=QByteArray());
-    void setLayerCompress(const QByteArray &spare=QByteArray());
-    void setLayerSASL(QCA::SASL *s, const QByteArray &spare=QByteArray());
+    void startTLSClient(QCA::TLS *t, const QByteArray &spare = QByteArray());
+    void startTLSServer(QCA::TLS *t, const QByteArray &spare = QByteArray());
+    void setLayerCompress(const QByteArray &spare = QByteArray());
+    void setLayerSASL(QCA::SASL *s, const QByteArray &spare = QByteArray());
 #ifdef USE_TLSHANDLER
-    void startTLSClient(XMPP::TLSHandler *t, const QString &server, const QByteArray &spare=QByteArray());
+    void startTLSClient(XMPP::TLSHandler *t, const QString &server, const QByteArray &spare = QByteArray());
 #endif
 
     void closeTLS();
-    int errorCode() const;
+    int  errorCode() const;
 
     // reimplemented
-    bool isOpen() const;
-    void write(const QByteArray &);
+    bool   isOpen() const;
+    void   write(const QByteArray &);
     qint64 bytesToWrite() const;
 
 signals:
@@ -73,7 +72,7 @@ private slots:
 
 private:
     void linkLayer(QObject *);
-    int calcPrebytes() const;
+    int  calcPrebytes() const;
     void insertData(const QByteArray &a);
     void writeRawData(const QByteArray &a);
     void incomingData(const QByteArray &a);
diff --git a/src/xmpp/xmpp-core/simplesasl.cpp b/src/xmpp/xmpp-core/simplesasl.cpp
index c17930c8..4194a9aa 100644
--- a/src/xmpp/xmpp-core/simplesasl.cpp
+++ b/src/xmpp/xmpp-core/simplesasl.cpp
@@ -37,85 +37,77 @@
 #include <stdlib.h>
 
 namespace XMPP {
-class SimpleSASLContext : public QCA::SASLContext
-{
+class SimpleSASLContext : public QCA::SASLContext {
     Q_OBJECT
 public:
-        class ParamsMutable
-        {
-        public:
-            /**
-               User is held
-            */
-            bool user;
-
-            /**
-               Authorization ID is held
-            */
-            bool authzid;
-
-            /**
-               Password is held
-            */
-            bool pass;
-
-            /**
-               Realm is held
-            */
-            bool realm;
-        };
+    class ParamsMutable {
+    public:
+        /**
+           User is held
+        */
+        bool user;
+
+        /**
+           Authorization ID is held
+        */
+        bool authzid;
+
+        /**
+           Password is held
+        */
+        bool pass;
+
+        /**
+           Realm is held
+        */
+        bool realm;
+    };
     // core props
     QString service, host;
 
     // state
-    int step;
-    bool capable;
-    bool allow_plain;
+    int        step;
+    bool       capable;
+    bool       allow_plain;
     QByteArray out_buf, in_buf;
-    QString mechanism_;
-    QString out_mech;
-
-    ParamsMutable need;
-    ParamsMutable have;
-    QString user, authz, realm;
-    QCA::SecureArray pass;
-    Result result_;
+    QString    mechanism_;
+    QString    out_mech;
+
+    ParamsMutable            need;
+    ParamsMutable            have;
+    QString                  user, authz, realm;
+    QCA::SecureArray         pass;
+    Result                   result_;
     QCA::SASL::AuthCondition authCondition_;
-    QByteArray result_to_net_, result_to_app_;
-    int encoded_;
+    QByteArray               result_to_net_, result_to_app_;
+    int                      encoded_;
 
     // scram specific stuff
-    QByteArray client_first_message;
+    QByteArray       client_first_message;
     QCA::SecureArray server_signature;
 
-    SimpleSASLContext(QCA::Provider* p) : QCA::SASLContext(p)
-    {
-        reset();
-    }
+    SimpleSASLContext(QCA::Provider *p) : QCA::SASLContext(p) { reset(); }
 
-    ~SimpleSASLContext()
-    {
-        reset();
-    }
+    ~SimpleSASLContext() { reset(); }
 
     void reset()
     {
         resetState();
 
-        capable = true;
-        allow_plain = false;
-        need.user = false;
+        capable      = true;
+        allow_plain  = false;
+        need.user    = false;
         need.authzid = false;
-        need.pass = false;
-        need.realm = false;
-        have.user = false;
+        need.pass    = false;
+        need.realm   = false;
+        have.user    = false;
         have.authzid = false;
-        have.pass = false;
-        have.realm = false;
-        user = QString();
-        authz = QString();
-        pass = QCA::SecureArray();
-        realm = QString();
+        have.pass    = false;
+        have.realm   = false;
+        user         = QString();
+        authz        = QString();
+        pass         = QCA::SecureArray();
+        realm        = QString();
     }
 
     void resetState()
@@ -125,24 +117,30 @@ class SimpleSASLContext : public QCA::SASLContext
         authCondition_ = QCA::SASL::AuthFail;
     }
 
-    virtual void setConstraints(QCA::SASL::AuthFlags flags, int ssfMin, int) {
-        if(flags & (QCA::SASL::RequireForwardSecrecy | QCA::SASL::RequirePassCredentials | QCA::SASL::RequireMutualAuth) || ssfMin > 0)
+    virtual void setConstraints(QCA::SASL::AuthFlags flags, int ssfMin, int)
+    {
+        if (flags
+                & (QCA::SASL::RequireForwardSecrecy | QCA::SASL::RequirePassCredentials | QCA::SASL::RequireMutualAuth)
+            || ssfMin > 0)
             capable = false;
         else
             capable = true;
         allow_plain = flags & QCA::SASL::AllowPlain;
     }
 
-    virtual void setup(const QString& _service, const QString& _host, const QCA::SASLContext::HostPort*, const QCA::SASLContext::HostPort*, const QString&, int) {
+    virtual void setup(const QString &_service, const QString &_host, const QCA::SASLContext::HostPort *,
+                       const QCA::SASLContext::HostPort *, const QString &, int)
+    {
         service = _service;
-        host = _host;
+        host    = _host;
     }
 
-    virtual void startClient(const QStringList &mechlist, bool allowClientSendFirst) {
+    virtual void startClient(const QStringList &mechlist, bool allowClientSendFirst)
+    {
         Q_UNUSED(allowClientSendFirst);
 
         mechanism_ = QString();
-        foreach(QString mech, mechlist) {
+        foreach (QString mech, mechlist) {
             if (mech == "SCRAM-SHA-1") {
                 mechanism_ = "SCRAM-SHA-1";
                 break;
@@ -155,8 +153,8 @@ class SimpleSASLContext : public QCA::SASLContext
                 mechanism_ = "PLAIN";
         }
 
-        if(!capable || mechanism_.isEmpty()) {
-            result_ = Error;
+        if (!capable || mechanism_.isEmpty()) {
+            result_        = Error;
             authCondition_ = QCA::SASL::NoMechanism;
             if (!capable)
                 qWarning("simplesasl.cpp: Not enough capabilities");
@@ -168,34 +166,36 @@ class SimpleSASLContext : public QCA::SASLContext
 
         resetState();
         result_ = Continue;
-        step = 0;
+        step    = 0;
         tryAgain();
     }
 
-    virtual void nextStep(const QByteArray &from_net) {
+    virtual void nextStep(const QByteArray &from_net)
+    {
         in_buf = from_net;
         tryAgain();
     }
 
-    virtual void tryAgain() {
+    virtual void tryAgain()
+    {
         // All exits of the method must emit the ready signal
         // so all exits go through a goto ready;
-        if(step == 0) {
+        if (step == 0) {
             out_mech = mechanism_;
 
             // PLAIN
             if (out_mech == "PLAIN" || out_mech == "SCRAM-SHA-1") {
                 // First, check if we have everything
-                if(need.user || need.pass) {
+                if (need.user || need.pass) {
                     qWarning("simplesasl.cpp: Did not receive necessary auth parameters");
                     result_ = Error;
                     goto ready;
                 }
-                if(!have.user)
+                if (!have.user)
                     need.user = true;
-                if(!have.pass)
+                if (!have.pass)
                     need.pass = true;
-                if(need.user || need.pass) {
+                if (need.user || need.pass) {
                     result_ = Params;
                     goto ready;
                 }
@@ -206,7 +206,7 @@ class SimpleSASLContext : public QCA::SASLContext
                 // send client-first-message
                 SCRAMSHA1Message msg(authz, user, QByteArray(0, ' '), RandRandomNumberGenerator());
                 if (msg.isValid()) {
-                    out_buf = msg.getValue();
+                    out_buf              = msg.getValue();
                     client_first_message = out_buf;
                 } else {
                     qWarning("simplesasl.cpp: SASLprep failed.");
@@ -219,32 +219,33 @@ class SimpleSASLContext : public QCA::SASLContext
                 result_ = Success;
             else
                 result_ = Continue;
-        } else if(step == 1) {
+        } else if (step == 1) {
             Q_ASSERT(out_mech != "PLAIN");
             if (out_mech == "DIGEST-MD5") {
                 // if we still need params, then the app has failed us!
-                if(need.user || need.authzid || need.pass || need.realm) {
+                if (need.user || need.authzid || need.pass || need.realm) {
                     qWarning("simplesasl.cpp: Did not receive necessary auth parameters");
                     result_ = Error;
                     goto ready;
                 }
 
                 // see if some params are needed
-                if(!have.user)
+                if (!have.user)
                     need.user = true;
-                //if(!have.authzid)
+                // if(!have.authzid)
                 //    need.authzid = true;
-                if(!have.pass)
+                if (!have.pass)
                     need.pass = true;
-                if(need.user || need.authzid || need.pass) {
+                if (need.user || need.authzid || need.pass) {
                     result_ = Params;
                     goto ready;
                 }
 
-                DIGESTMD5Response response(in_buf, service, host, realm, user, authz, pass.toByteArray(), RandRandomNumberGenerator());
+                DIGESTMD5Response response(in_buf, service, host, realm, user, authz, pass.toByteArray(),
+                                           RandRandomNumberGenerator());
                 if (!response.isValid()) {
                     authCondition_ = QCA::SASL::BadProtocol;
-                    result_ = Error;
+                    result_        = Error;
                     goto ready;
                 }
                 out_buf = response.getValue();
@@ -252,38 +253,39 @@ class SimpleSASLContext : public QCA::SASLContext
                 result_ = Continue;
             } else if (out_mech == "SCRAM-SHA-1") {
                 // if we still need params, then the app has failed us!
-                if(need.user || need.pass) {
+                if (need.user || need.pass) {
                     qWarning("simplesasl.cpp: Did not receive necessary auth parameters");
                     result_ = Error;
                     goto ready;
                 }
 
                 // see if some params are needed
-                if(!have.user)
+                if (!have.user)
                     need.user = true;
-                //if(!have.authzid)
+                // if(!have.authzid)
                 //    need.authzid = true;
-                if(!have.pass)
+                if (!have.pass)
                     need.pass = true;
-                if(need.user || need.pass) {
+                if (need.user || need.pass) {
                     result_ = Params;
                     goto ready;
                 }
                 // parse server-first-message, send client-final-message
                 QVariant prop = property("scram-salted-password-base64");
-                QString salted_password_base64;
+                QString  salted_password_base64;
                 if (prop.isValid()) {
                     salted_password_base64 = prop.toString();
                 }
-                SCRAMSHA1Response response(in_buf, pass.toByteArray(), client_first_message, salted_password_base64, RandRandomNumberGenerator());
+                SCRAMSHA1Response response(in_buf, pass.toByteArray(), client_first_message, salted_password_base64,
+                                           RandRandomNumberGenerator());
                 if (!response.isValid()) {
                     authCondition_ = QCA::SASL::BadProtocol;
-                    result_ = Error;
+                    result_        = Error;
                     goto ready;
                 }
                 setProperty("scram-salted-password-base64", QVariant(response.getSaltedPassword()));
                 server_signature = response.getServerSignature();
-                out_buf = response.getValue();
+                out_buf          = response.getValue();
                 ++step;
                 result_ = Continue;
             }
@@ -295,7 +297,7 @@ class SimpleSASLContext : public QCA::SASLContext
             } else {
                 qWarning() << "ServerSignature doesn't match the one we've calculated.";
                 authCondition_ = QCA::SASL::AuthFail;
-                result_ = Error;
+                result_        = Error;
                 goto ready;
             }
         }
@@ -309,87 +311,72 @@ class SimpleSASLContext : public QCA::SASLContext
             out_buf.resize(0);
             result_ = Success;
         }
-ready:
+    ready:
         QMetaObject::invokeMethod(this, "resultsReady", Qt::QueuedConnection);
     }
 
-    virtual void update(const QByteArray &from_net, const QByteArray &from_app) {
+    virtual void update(const QByteArray &from_net, const QByteArray &from_app)
+    {
         result_to_app_ = from_net;
         result_to_net_ = from_app;
-        encoded_ = from_app.size();
-        result_ = Success;
+        encoded_       = from_app.size();
+        result_        = Success;
         QMetaObject::invokeMethod(this, "resultsReady", Qt::QueuedConnection);
     }
 
-    virtual bool waitForResultsReady(int msecs) {
+    virtual bool waitForResultsReady(int msecs)
+    {
 
         // TODO: for now, all operations block anyway
         Q_UNUSED(msecs);
         return true;
     }
 
-    virtual Result result() const {
-        return result_;
-    }
+    virtual Result result() const { return result_; }
 
-    virtual QStringList mechlist() const {
-        return QStringList();
-    }
+    virtual QStringList mechlist() const { return QStringList(); }
 
-    virtual QString mech() const {
-        return out_mech;
-    }
+    virtual QString mech() const { return out_mech; }
 
-    virtual bool haveClientInit() const {
-        return out_mech == "PLAIN";
-    }
+    virtual bool haveClientInit() const { return out_mech == "PLAIN"; }
 
-    virtual QByteArray stepData() const {
-        return out_buf;
-    }
+    virtual QByteArray stepData() const { return out_buf; }
 
-    virtual QByteArray to_net() {
-        return result_to_net_;
-    }
+    virtual QByteArray to_net() { return result_to_net_; }
 
-    virtual int encoded() const {
-        return encoded_;
-    }
+    virtual int encoded() const { return encoded_; }
 
-    virtual QByteArray to_app() {
-        return result_to_app_;
-    }
+    virtual QByteArray to_app() { return result_to_app_; }
 
-    virtual int ssf() const {
-        return 0;
-    }
+    virtual int ssf() const { return 0; }
 
-    virtual QCA::SASL::AuthCondition authCondition() const {
-        return authCondition_;
-    }
+    virtual QCA::SASL::AuthCondition authCondition() const { return authCondition_; }
 
-    virtual QCA::SASL::Params clientParams() const {
+    virtual QCA::SASL::Params clientParams() const
+    {
         return QCA::SASL::Params(need.user, need.authzid, need.pass, need.realm);
     }
 
-    virtual void setClientParams(const QString *_user, const QString *_authzid, const QCA::SecureArray *_pass, const QString *_realm) {
-        if(_user) {
-            user = *_user;
+    virtual void setClientParams(const QString *_user, const QString *_authzid, const QCA::SecureArray *_pass,
+                                 const QString *_realm)
+    {
+        if (_user) {
+            user      = *_user;
             need.user = false;
             have.user = true;
         }
-        if(_authzid) {
-            authz = *_authzid;
+        if (_authzid) {
+            authz        = *_authzid;
             need.authzid = false;
             have.authzid = true;
         }
-        if(_pass) {
-            pass = *_pass;
+        if (_pass) {
+            pass      = *_pass;
             need.pass = false;
             have.pass = true;
         }
-        if(_realm) {
-            realm = *_realm;
+        if (_realm) {
+            realm      = *_realm;
             need.realm = false;
             have.realm = true;
         }
@@ -401,65 +388,50 @@ class SimpleSASLContext : public QCA::SASLContext
         return QStringList();
     }
 
-    virtual QString username() const {
-        return QString();
-    }
+    virtual QString username() const { return QString(); }
 
-    virtual QString authzid() const {
-        return QString();
-    }
+    virtual QString authzid() const { return QString(); }
 
-    virtual QCA::Provider::Context* clone() const {
-        SimpleSASLContext* s = new SimpleSASLContext(provider());
+    virtual QCA::Provider::Context *clone() const
+    {
+        SimpleSASLContext *s = new SimpleSASLContext(provider());
         // TODO: Copy all the members
         return s;
     }
 
-    virtual void startServer(const QString &, bool) {
-        result_ =  QCA::SASLContext::Error;
+    virtual void startServer(const QString &, bool)
+    {
+        result_ = QCA::SASLContext::Error;
         QMetaObject::invokeMethod(this, "resultsReady", Qt::QueuedConnection);
     }
-    virtual void serverFirstStep(const QString &, const QByteArray *) {
-        result_ =  QCA::SASLContext::Error;
+    virtual void serverFirstStep(const QString &, const QByteArray *)
+    {
+        result_ = QCA::SASLContext::Error;
         QMetaObject::invokeMethod(this, "resultsReady", Qt::QueuedConnection);
     }
-
 };
 
-class QCASimpleSASL : public QCA::Provider
-{
+class QCASimpleSASL : public QCA::Provider {
 public:
     QCASimpleSASL() {}
     ~QCASimpleSASL() {}
 
-    void init()
-    {
-    }
+    void init() {}
 
-    QString name() const {
-        return "simplesasl";
-    }
+    QString name() const { return "simplesasl"; }
 
-    QStringList features() const {
-        return QStringList("sasl");
-    }
+    QStringList features() const { return QStringList("sasl"); }
 
-    QCA::Provider::Context* createContext(const QString& cap)
+    QCA::Provider::Context *createContext(const QString &cap)
     {
-        if(cap == "sasl")
+        if (cap == "sasl")
             return new SimpleSASLContext(this);
         return nullptr;
     }
-    int qcaVersion() const
-    {
-        return QCA_VERSION;
-    }
+    int qcaVersion() const { return QCA_VERSION; }
 };
 
-QCA::Provider *createProviderSimpleSASL()
-{
-    return (new QCASimpleSASL);
-}
+QCA::Provider *createProviderSimpleSASL() { return (new QCASimpleSASL); }
 } // namespace XMPP
 
 #include "simplesasl.moc"
diff --git a/src/xmpp/xmpp-core/simplesasl.h b/src/xmpp/xmpp-core/simplesasl.h
index fb880cf0..62acf1dd 100644
--- a/src/xmpp/xmpp-core/simplesasl.h
+++ b/src/xmpp/xmpp-core/simplesasl.h
@@ -21,11 +21,11 @@
 #define SIMPLESASL_H
 
 namespace QCA {
-    class Provider;
+class Provider;
 }
 
 namespace XMPP {
-    QCA::Provider* createProviderSimpleSASL();
+QCA::Provider *createProviderSimpleSASL();
 }
 
 #endif // SIMPLESASL_H
diff --git a/src/xmpp/xmpp-core/sm.cpp b/src/xmpp/xmpp-core/sm.cpp
index 7ed53e3e..2f42c539 100644
--- a/src/xmpp/xmpp-core/sm.cpp
+++ b/src/xmpp/xmpp-core/sm.cpp
@@ -36,27 +36,23 @@ SMState::SMState()
 
 void SMState::resetCounters()
 {
-    received_count = 0;
+    received_count      = 0;
     server_last_handled = 0;
     send_queue.clear();
 }
 
-StreamManagement::StreamManagement(QObject *parent)
-    : QObject(parent)
-    , sm_started(false)
-    , sm_resumed(false)
-    , sm_stanzas_notify(0)
-    , sm_resend_pos(0)
+StreamManagement::StreamManagement(QObject *parent) :
+    QObject(parent), sm_started(false), sm_resumed(false), sm_stanzas_notify(0), sm_resend_pos(0)
 {
 }
 
 void StreamManagement::reset()
 {
-    sm_started = false;
-    sm_resumed = false;
-    sm_stanzas_notify = 0;
-    sm_resend_pos = 0;
-    sm_timeout_data.elapsed_timer = QElapsedTimer();
+    sm_started                     = false;
+    sm_resumed                     = false;
+    sm_stanzas_notify              = 0;
+    sm_resend_pos                  = 0;
+    sm_timeout_data.elapsed_timer  = QElapsedTimer();
     sm_timeout_data.waiting_answer = false;
 }
 
@@ -65,13 +61,13 @@ void StreamManagement::start(const QString &resumption_id)
     reset();
     state_.resetCounters();
     state_.resumption_id = resumption_id;
-    sm_started = true;
+    sm_started           = true;
     sm_timeout_data.elapsed_timer.start();
 }
 
 void StreamManagement::resume(quint32 last_handled)
 {
-    sm_resumed = true;
+    sm_resumed    = true;
     sm_resend_pos = 0;
     processAcknowledgement(last_handled);
     sm_timeout_data.waiting_answer = false;
@@ -90,7 +86,7 @@ int StreamManagement::lastAckElapsed() const
         return 0;
 
     int msecs = sm_timeout_data.elapsed_timer.elapsed();
-    int secs = msecs / 1000;
+    int secs  = msecs / 1000;
     if (msecs % 1000 != 0)
         ++secs;
     return secs;
@@ -98,7 +94,7 @@ int StreamManagement::lastAckElapsed() const
 
 int StreamManagement::takeAckedCount()
 {
-    int cnt = sm_stanzas_notify;
+    int cnt           = sm_stanzas_notify;
     sm_stanzas_notify = 0;
     return cnt;
 }
@@ -147,7 +143,8 @@ void StreamManagement::processAcknowledgement(quint32 last_handled)
     if (f) {
         qDebug() << "Stream Management: [INF] Send queue length is changed: " << state_.send_queue.length();
         if (state_.send_queue.isEmpty() && last_handled != state_.server_last_handled)
-            qDebug() << "Stream Management: [ERR] Send queue is empty but last_handled != server_last_handled " << last_handled << state_.server_last_handled;
+            qDebug() << "Stream Management: [ERR] Send queue is empty but last_handled != server_last_handled "
+                     << last_handled << state_.server_last_handled;
     }
 #endif
 }
diff --git a/src/xmpp/xmpp-core/sm.h b/src/xmpp/xmpp-core/sm.h
index 0be89a4f..26fb5ac3 100644
--- a/src/xmpp/xmpp-core/sm.h
+++ b/src/xmpp/xmpp-core/sm.h
@@ -25,67 +25,65 @@
 #include <QObject>
 #include <QQueue>
 
-#define NS_STREAM_MANAGEMENT   "urn:xmpp:sm:3"
+#define NS_STREAM_MANAGEMENT "urn:xmpp:sm:3"
 #define SM_TIMER_INTERVAL_SECS 40
 
 //#define IRIS_SM_DEBUG
 
 namespace XMPP {
-    class SMState
-    {
-    public:
-        SMState();
-        void resetCounters();
-        bool isResumption() const { return !resumption_id.isEmpty(); }
-        bool isEnabled() const { return enabled; }
-        bool isLocationValid() { return !resumption_location.host.isEmpty() && resumption_location.port != 0; }
-        void setEnabled(bool e) { enabled = e; }
+class SMState {
+public:
+    SMState();
+    void resetCounters();
+    bool isResumption() const { return !resumption_id.isEmpty(); }
+    bool isEnabled() const { return enabled; }
+    bool isLocationValid() { return !resumption_location.host.isEmpty() && resumption_location.port != 0; }
+    void setEnabled(bool e) { enabled = e; }
 
-    public:
-        bool enabled;
-        quint32 received_count;
-        quint32 server_last_handled;
-        QQueue<QDomElement> send_queue;
-        QString resumption_id;
-        struct {
-            QString host;
-            quint16 port;
-        } resumption_location;
-    };
+public:
+    bool                enabled;
+    quint32             received_count;
+    quint32             server_last_handled;
+    QQueue<QDomElement> send_queue;
+    QString             resumption_id;
+    struct {
+        QString host;
+        quint16 port;
+    } resumption_location;
+};
 
-    class StreamManagement : QObject
-    {
-    public:
-        StreamManagement(QObject *parent = nullptr);
-        XMPP::SMState &state() { return state_; }
-        const XMPP::SMState &state() const { return state_; }
-        bool isActive() const { return sm_started || sm_resumed; }
-        bool isResumed() const { return sm_resumed; }
-        void reset();
-        void start(const QString &resumption_id);
-        void resume(quint32 last_handled);
-        void setLocation(const QString &host, int port);
-        int  lastAckElapsed() const;
-        int  takeAckedCount();
-        void countInputRawData(int bytes);
-        QDomElement getUnacknowledgedStanza();
-        int  addUnacknowledgedStanza(const QDomElement &e);
-        void processAcknowledgement(quint32 last_handled);
-        void markStanzaHandled();
-        QDomElement generateRequestStanza(QDomDocument &doc);
-        QDomElement makeResponseStanza(QDomDocument &doc);
+class StreamManagement : QObject {
+public:
+    StreamManagement(QObject *parent = nullptr);
+    XMPP::SMState &      state() { return state_; }
+    const XMPP::SMState &state() const { return state_; }
+    bool                 isActive() const { return sm_started || sm_resumed; }
+    bool                 isResumed() const { return sm_resumed; }
+    void                 reset();
+    void                 start(const QString &resumption_id);
+    void                 resume(quint32 last_handled);
+    void                 setLocation(const QString &host, int port);
+    int                  lastAckElapsed() const;
+    int                  takeAckedCount();
+    void                 countInputRawData(int bytes);
+    QDomElement          getUnacknowledgedStanza();
+    int                  addUnacknowledgedStanza(const QDomElement &e);
+    void                 processAcknowledgement(quint32 last_handled);
+    void                 markStanzaHandled();
+    QDomElement          generateRequestStanza(QDomDocument &doc);
+    QDomElement          makeResponseStanza(QDomDocument &doc);
 
-    private:
-        SMState state_;
-        bool sm_started;
-        bool sm_resumed;
-        int  sm_stanzas_notify;
-        int  sm_resend_pos;
-        struct {
-            QElapsedTimer elapsed_timer;
-            bool waiting_answer = false;
-        } sm_timeout_data;
-    };
+private:
+    SMState state_;
+    bool    sm_started;
+    bool    sm_resumed;
+    int     sm_stanzas_notify;
+    int     sm_resend_pos;
+    struct {
+        QElapsedTimer elapsed_timer;
+        bool          waiting_answer = false;
+    } sm_timeout_data;
+};
 } // namespace XMPP
 
 #endif // XMPP_SM_H
diff --git a/src/xmpp/xmpp-core/stream.cpp b/src/xmpp/xmpp-core/stream.cpp
index 5e468d80..68dac8b8 100644
--- a/src/xmpp/xmpp-core/stream.cpp
+++ b/src/xmpp/xmpp-core/stream.cpp
@@ -43,13 +43,13 @@
 
 #include "bytestream.h"
 #ifndef NO_IRISNET
-#    include "irisnetglobal_p.h"
+#include "irisnetglobal_p.h"
 #endif
 #include "protocol.h"
 #include "securestream.h"
 #include "simplesasl.h"
 #ifdef XMPP_TEST
-#    include "td.h"
+#include "td.h"
 #endif
 
 #include <QByteArray>
@@ -67,24 +67,21 @@
 using namespace XMPP;
 
 static Debug *debug_ptr = nullptr;
-void XMPP::setDebug(Debug *p)
-{
-    debug_ptr = p;
-}
+void          XMPP::setDebug(Debug *p) { debug_ptr = p; }
 
 static QByteArray randomArray(int size)
 {
     QByteArray a;
     a.resize(size);
-    for(int n = 0; n < size; ++n)
-        a[n] = (char)(256.0*rand()/(RAND_MAX+1.0));
+    for (int n = 0; n < size; ++n)
+        a[n] = (char)(256.0 * rand() / (RAND_MAX + 1.0));
     return a;
 }
 
 static QString genId()
 {
     // need SHA1 here
-    //if(!QCA::isSupported(QCA::CAP_SHA1))
+    // if(!QCA::isSupported(QCA::CAP_SHA1))
     //    QCA::insertProvider(createProviderHash());
 
     return QCA::Hash("sha1").hashToString(randomArray(128));
@@ -94,29 +91,20 @@ static QString genId()
 // Stream
 //----------------------------------------------------------------------------
 static XmlProtocol *foo = nullptr;
-Stream::Stream(QObject *parent)
-:QObject(parent)
-{
-}
+Stream::Stream(QObject *parent) : QObject(parent) {}
 
-Stream::~Stream()
-{
-}
+Stream::~Stream() {}
 
 Stanza Stream::createStanza(Stanza::Kind k, const Jid &to, const QString &type, const QString &id)
 {
     return Stanza(this, k, to, type, id);
 }
 
-Stanza Stream::createStanza(const QDomElement &e)
-{
-    return Stanza(this, e);
-}
+Stanza Stream::createStanza(const QDomElement &e) { return Stanza(this, e); }
 
 QString Stream::xmlToString(const QDomElement &e, bool clip)
 {
-    if(!foo)
-    {
+    if (!foo) {
         foo = new CoreProtocol;
 #ifndef NO_IRISNET
         irisNetAddPostRoutine(cleanup);
@@ -134,71 +122,58 @@ void Stream::cleanup()
 //----------------------------------------------------------------------------
 // ClientStream
 //----------------------------------------------------------------------------
-enum {
-    Idle,
-    Connecting,
-    WaitVersion,
-    WaitTLS,
-    NeedParams,
-    AuthAbort,
-    Active,
-    Closing
-};
+enum { Idle, Connecting, WaitVersion, WaitTLS, NeedParams, AuthAbort, Active, Closing };
 
-enum {
-    Client,
-    Server
-};
+enum { Client, Server };
 
-class ClientStream::Private
-{
+class ClientStream::Private {
 public:
     Private() = default;
 
     void reset()
     {
-        state = Idle;
-        notify = 0;
+        state      = Idle;
+        notify     = 0;
         newStanzas = false;
-        sasl_ssf = 0;
+        sasl_ssf   = 0;
         tls_warned = false;
-        using_tls = false;
+        using_tls  = false;
     }
 
-    Jid jid;
-    QString server;
-    bool oldOnly = false;
-    bool mutualAuth = false;
-    AllowPlainType allowPlain = NoAllowPlain;
-    bool haveLocalAddr = false;
-    QHostAddress localAddr;
-    quint16 localPort;
-    QString connectHost;
-    int minimumSSF = 0;
-    int maximumSSF = 0;
-    QString sasl_mech;
-    QMap<QString,QString> mechProviders; // mech to provider map
-    bool doBinding = true;
+    Jid                    jid;
+    QString                server;
+    bool                   oldOnly       = false;
+    bool                   mutualAuth    = false;
+    AllowPlainType         allowPlain    = NoAllowPlain;
+    bool                   haveLocalAddr = false;
+    QHostAddress           localAddr;
+    quint16                localPort;
+    QString                connectHost;
+    int                    minimumSSF = 0;
+    int                    maximumSSF = 0;
+    QString                sasl_mech;
+    QMap<QString, QString> mechProviders; // mech to provider map
+    bool                   doBinding = true;
 
     bool in_rrsig = false;
 
-    Connector *conn = nullptr;
-    ByteStream *bs = nullptr;
-    TLSHandler *tlsHandler = nullptr;
-    QCA::TLS *tls = nullptr;
-    QCA::SASL *sasl = nullptr;
-    SecureStream *ss = nullptr;
-    CoreProtocol client;
-    CoreProtocol srv;
-    QString lang;
+    Connector *   conn       = nullptr;
+    ByteStream *  bs         = nullptr;
+    TLSHandler *  tlsHandler = nullptr;
+    QCA::TLS *    tls        = nullptr;
+    QCA::SASL *   sasl       = nullptr;
+    SecureStream *ss         = nullptr;
+    CoreProtocol  client;
+    CoreProtocol  srv;
+    QString       lang;
 
     QString defRealm;
 
-    int mode;
-    int state = Idle;
-    int notify = 0;
+    int  mode;
+    int  state      = Idle;
+    int  notify     = 0;
     bool newStanzas = false;
-    int sasl_ssf = 0;
+    int  sasl_ssf   = 0;
     bool tls_warned = false;
     bool using_tls;
     bool doAuth;
@@ -206,23 +181,22 @@ class ClientStream::Private
 
     QStringList sasl_mechlist;
 
-    int errCond;
-    QString errText;
-    QHash<QString,QString> errLangText; // xml:lang => error text
-    QDomElement errAppSpec;
+    int                     errCond;
+    QString                 errText;
+    QHash<QString, QString> errLangText; // xml:lang => error text
+    QDomElement             errAppSpec;
 
-    QList<Stanza*> in;
+    QList<Stanza *> in;
 
     QTimer timeout_timer;
     QTimer noopTimer;
-    int noop_time;
-    bool quiet_reconnection = false;
+    int    noop_time;
+    bool   quiet_reconnection = false;
 };
 
-ClientStream::ClientStream(Connector *conn, TLSHandler *tlsHandler, QObject *parent)
-:Stream(parent)
+ClientStream::ClientStream(Connector *conn, TLSHandler *tlsHandler, QObject *parent) : Stream(parent)
 {
-    d = new Private;
+    d       = new Private;
     d->mode = Client;
     d->conn = conn;
     connect(d->conn, SIGNAL(connected()), SLOT(cr_connected()));
@@ -234,12 +208,13 @@ ClientStream::ClientStream(Connector *conn, TLSHandler *tlsHandler, QObject *par
     d->tlsHandler = tlsHandler;
 }
 
-ClientStream::ClientStream(const QString &host, const QString &defRealm, ByteStream *bs, QCA::TLS *tls, QObject *parent)
-:Stream(parent)
+ClientStream::ClientStream(const QString &host, const QString &defRealm, ByteStream *bs, QCA::TLS *tls,
+                           QObject *parent) :
+    Stream(parent)
 {
-    d = new Private;
+    d       = new Private;
     d->mode = Server;
-    d->bs = bs;
+    d->bs   = bs;
     connect(d->bs, SIGNAL(connectionClosed()), SLOT(bs_connectionClosed()));
     connect(d->bs, SIGNAL(delayedCloseFinished()), SLOT(bs_delayedCloseFinished()));
     connect(d->bs, SIGNAL(error(int)), SLOT(bs_error(int)));
@@ -253,32 +228,32 @@ ClientStream::ClientStream(const QString &host, const QString &defRealm, ByteStr
     connect(d->ss, SIGNAL(tlsClosed()), SLOT(ss_tlsClosed()));
     connect(d->ss, SIGNAL(error(int)), SLOT(ss_error(int)));
 
-    d->server = host;
+    d->server   = host;
     d->defRealm = defRealm;
 
     d->tls = tls;
 
     d->srv.startClientIn(genId());
-    //d->srv.startServerIn(genId());
-    //d->state = Connecting;
-    //d->jid = Jid();
-    //d->server = QString();
+    // d->srv.startServerIn(genId());
+    // d->state = Connecting;
+    // d->jid = Jid();
+    // d->server = QString();
 
     connect(&(d->timeout_timer), SIGNAL(timeout()), SLOT(sm_timeout()));
 }
 
 ClientStream::~ClientStream()
 {
-    //fprintf(stderr, "\tClientStream::~ClientStream\n");
-    //fflush(stderr);
+    // fprintf(stderr, "\tClientStream::~ClientStream\n");
+    // fflush(stderr);
     reset();
     delete d;
 }
 
 void ClientStream::reset(bool all)
 {
-    //fprintf(stderr, "\tClientStream::reset\n");
-    //fflush(stderr);
+    // fprintf(stderr, "\tClientStream::reset\n");
+    // fflush(stderr);
 
     d->reset();
     d->noopTimer.stop();
@@ -291,7 +266,7 @@ void ClientStream::reset(bool all)
     delete d->sasl;
     d->sasl = nullptr;
 
-    if(all) {
+    if (all) {
         while (!d->in.isEmpty()) {
             delete d->in.takeFirst();
         }
@@ -303,14 +278,14 @@ void ClientStream::reset(bool all)
     }
 
     // client
-    if(d->mode == Client) {
+    if (d->mode == Client) {
         // reset tls
         // FIXME: Temporarily disabled
-        //if(d->tlsHandler)
+        // if(d->tlsHandler)
         //    d->tlsHandler->reset();
 
         // reset connector
-        if(d->bs) {
+        if (d->bs) {
             d->bs->close();
             d->bs = nullptr;
         }
@@ -321,10 +296,10 @@ void ClientStream::reset(bool all)
     }
     // server
     else {
-        if(d->tls)
+        if (d->tls)
             d->tls->reset();
 
-        if(d->bs) {
+        if (d->bs) {
             d->bs->close();
             d->bs = nullptr;
         }
@@ -333,16 +308,13 @@ void ClientStream::reset(bool all)
     }
 }
 
-Jid ClientStream::jid() const
-{
-    return d->jid;
-}
+Jid ClientStream::jid() const { return d->jid; }
 
 void ClientStream::connectToServer(const Jid &jid, bool auth)
 {
     reset(true);
-    d->state = Connecting;
-    d->jid = jid;
+    d->state  = Connecting;
+    d->jid    = jid;
     d->doAuth = auth;
     d->server = d->jid.domain();
 
@@ -351,18 +323,17 @@ void ClientStream::connectToServer(const Jid &jid, bool auth)
 
 void ClientStream::continueAfterWarning()
 {
-    if(d->state == WaitVersion) {
+    if (d->state == WaitVersion) {
         // if we don't have TLS yet, then we're never going to get it
-        if(!d->tls_warned && !d->using_tls) {
+        if (!d->tls_warned && !d->using_tls) {
             d->tls_warned = true;
-            d->state = WaitTLS;
+            d->state      = WaitTLS;
             warning(WarnNoTLS);
             return;
         }
         d->state = Connecting;
         processNext();
-    }
-    else if(d->state == WaitTLS) {
+    } else if (d->state == WaitTLS) {
         d->state = Connecting;
         processNext();
     }
@@ -374,54 +345,46 @@ void ClientStream::accept()
     processNext();
 }
 
-bool ClientStream::isActive() const
-{
-    return (d->state != Idle) ? true: false;
-}
+bool ClientStream::isActive() const { return (d->state != Idle) ? true : false; }
 
-bool ClientStream::isAuthenticated() const
-{
-    return (d->state == Active) ? true: false;
-}
+bool ClientStream::isAuthenticated() const { return (d->state == Active) ? true : false; }
 
 void ClientStream::setUsername(const QString &s)
 {
-    if(d->sasl)
+    if (d->sasl)
         d->sasl->setUsername(s);
 }
 
 void ClientStream::setPassword(const QString &s)
 {
-    if(d->client.old) {
+    if (d->client.old) {
         d->client.setPassword(s);
-    }
-    else {
-        if(d->sasl)
+    } else {
+        if (d->sasl)
             d->sasl->setPassword(QCA::SecureArray(s.toUtf8()));
     }
 }
 
 void ClientStream::setRealm(const QString &s)
 {
-    if(d->sasl)
+    if (d->sasl)
         d->sasl->setRealm(s);
 }
 
 void ClientStream::setAuthzid(const QString &s)
 {
-    if(d->sasl)
+    if (d->sasl)
         d->sasl->setAuthzid(s);
 }
 
 void ClientStream::continueAfterParams()
 {
-    if(d->state == NeedParams) {
+    if (d->state == NeedParams) {
         d->state = Connecting;
-        if(d->client.old) {
+        if (d->client.old) {
             processNext();
-        }
-        else {
-            if(d->sasl)
+        } else {
+            if (d->sasl)
                 d->sasl->continueAfterParams();
         }
     } else if (d->state == AuthAbort) {
@@ -439,15 +402,9 @@ void ClientStream::abortAuth()
     d->state = AuthAbort;
 }
 
-void ClientStream::setSaslMechanismProvider(const QString &m, const QString &p)
-{
-    d->mechProviders.insert(m, p);
-}
+void ClientStream::setSaslMechanismProvider(const QString &m, const QString &p) { d->mechProviders.insert(m, p); }
 
-QString ClientStream::saslMechanismProvider(const QString &m) const
-{
-    return d->mechProviders.value(m);
-}
+QString ClientStream::saslMechanismProvider(const QString &m) const { return d->mechProviders.value(m); }
 
 QCA::Provider::Context *ClientStream::currentSASLContext() const
 {
@@ -457,14 +414,16 @@ QCA::Provider::Context *ClientStream::currentSASLContext() const
     return nullptr;
 }
 
-void ClientStream::setSCRAMStoredSaltedHash(const QString &s) {
+void ClientStream::setSCRAMStoredSaltedHash(const QString &s)
+{
     QCA::SASLContext *context = (QCA::SASLContext *)(d->sasl->context());
     if (context) {
         context->setProperty("scram-salted-password-base64", s);
     }
 }
 
-const QString ClientStream::getSCRAMStoredSaltedHash() {
+const QString ClientStream::getSCRAMStoredSaltedHash()
+{
     QCA::SASLContext *context = (QCA::SASLContext *)(d->sasl->context());
     if (context) {
         return context->property("scram-salted-password-base64").toString();
@@ -472,113 +431,67 @@ const QString ClientStream::getSCRAMStoredSaltedHash() {
     return QString();
 }
 
-void ClientStream::setResourceBinding(bool b)
-{
-    d->doBinding = b;
-}
+void ClientStream::setResourceBinding(bool b) { d->doBinding = b; }
 
-void ClientStream::setLang(const QString& lang)
-{
-    d->lang = lang;
-}
+void ClientStream::setLang(const QString &lang) { d->lang = lang; }
 
 void ClientStream::setNoopTime(int mills)
 {
     d->noop_time = mills;
 
-    if(d->state != Active)
+    if (d->state != Active)
         return;
 
-    if(d->noop_time == 0) {
+    if (d->noop_time == 0) {
         d->noopTimer.stop();
         return;
     }
     d->noopTimer.start(d->noop_time);
 }
 
-QString ClientStream::saslMechanism() const
-{
-    return d->client.saslMech();
-}
+QString ClientStream::saslMechanism() const { return d->client.saslMech(); }
 
-int ClientStream::saslSSF() const
-{
-    return d->sasl_ssf;
-}
+int ClientStream::saslSSF() const { return d->sasl_ssf; }
 
-void ClientStream::setSASLMechanism(const QString &s)
-{
-    d->sasl_mech = s;
-}
+void ClientStream::setSASLMechanism(const QString &s) { d->sasl_mech = s; }
 
 void ClientStream::setLocalAddr(const QHostAddress &addr, quint16 port)
 {
     d->haveLocalAddr = true;
-    d->localAddr = addr;
-    d->localPort = port;
+    d->localAddr     = addr;
+    d->localPort     = port;
 }
 
-void ClientStream::setCompress(bool compress)
-{
-    d->doCompress = compress;
-}
+void ClientStream::setCompress(bool compress) { d->doCompress = compress; }
 
-int ClientStream::errorCondition() const
-{
-    return d->errCond;
-}
+int ClientStream::errorCondition() const { return d->errCond; }
 
-QString ClientStream::errorText() const
-{
-    return d->errText;
-}
+QString ClientStream::errorText() const { return d->errText; }
 
-QHash<QString,QString> ClientStream::errorLangText() const
-{
-    return d->errLangText;
-}
+QHash<QString, QString> ClientStream::errorLangText() const { return d->errLangText; }
 
-QDomElement ClientStream::errorAppSpec() const
-{
-    return d->errAppSpec;
-}
+QDomElement ClientStream::errorAppSpec() const { return d->errAppSpec; }
 
-bool ClientStream::old() const
-{
-    return d->client.old;
-}
+bool ClientStream::old() const { return d->client.old; }
 
 void ClientStream::close()
 {
-    if(d->state == Active) {
+    if (d->state == Active) {
         d->state = Closing;
         d->client.shutdown();
         processNext();
-    }
-    else if(d->state != Idle && d->state != Closing) {
+    } else if (d->state != Idle && d->state != Closing) {
         reset();
     }
 }
 
-QDomDocument & ClientStream::doc() const
-{
-    return d->client.doc;
-}
+QDomDocument &ClientStream::doc() const { return d->client.doc; }
 
-QString ClientStream::baseNS() const
-{
-    return NS_CLIENT;
-}
+QString ClientStream::baseNS() const { return NS_CLIENT; }
 
-void ClientStream::setAllowPlain(AllowPlainType a)
-{
-    d->allowPlain = a;
-}
+void ClientStream::setAllowPlain(AllowPlainType a) { d->allowPlain = a; }
 
-void ClientStream::setRequireMutualAuth(bool b)
-{
-    d->mutualAuth = b;
-}
+void ClientStream::setRequireMutualAuth(bool b) { d->mutualAuth = b; }
 
 void ClientStream::setSSFRange(int low, int high)
 {
@@ -586,23 +499,17 @@ void ClientStream::setSSFRange(int low, int high)
     d->maximumSSF = high;
 }
 
-void ClientStream::setOldOnly(bool b)
-{
-    d->oldOnly = b;
-}
+void ClientStream::setOldOnly(bool b) { d->oldOnly = b; }
 
-bool ClientStream::stanzaAvailable() const
-{
-    return (!d->in.isEmpty());
-}
+bool ClientStream::stanzaAvailable() const { return (!d->in.isEmpty()); }
 
 Stanza ClientStream::read()
 {
-    if(d->in.isEmpty())
+    if (d->in.isEmpty())
         return Stanza();
     else {
         Stanza *sp = d->in.takeFirst();
-        Stanza s = *sp;
+        Stanza  s  = *sp;
         delete sp;
         return s;
     }
@@ -610,21 +517,18 @@ Stanza ClientStream::read()
 
 void ClientStream::write(const Stanza &s)
 {
-    if(d->state == Active) {
+    if (d->state == Active) {
         d->client.sendStanza(s.element());
         processNext();
     }
 }
 
-void ClientStream::clearSendQueue()
-{
-    d->client.clearSendQueue();
-}
+void ClientStream::clearSendQueue() { d->client.clearSendQueue(); }
 
 void ClientStream::cr_connected()
 {
     d->connectHost = d->conn->host();
-    d->bs = d->conn->stream();
+    d->bs          = d->conn->stream();
     connect(d->bs, SIGNAL(connectionClosed()), SLOT(bs_connectionClosed()));
     connect(d->bs, SIGNAL(delayedCloseFinished()), SLOT(bs_delayedCloseFinished()));
 
@@ -637,11 +541,11 @@ void ClientStream::cr_connected()
     connect(d->ss, SIGNAL(tlsClosed()), SLOT(ss_tlsClosed()));
     connect(d->ss, SIGNAL(error(int)), SLOT(ss_error(int)));
 
-    //d->client.startDialbackOut("andbit.net", "im.pyxa.org");
-    //d->client.startServerOut(d->server);
+    // d->client.startDialbackOut("andbit.net", "im.pyxa.org");
+    // d->client.startServerOut(d->server);
 
     d->client.startClientOut(d->jid, d->oldOnly, d->conn->useSSL(), d->doAuth, d->doCompress);
-    d->client.setAllowTLS(d->tlsHandler ? true: false);
+    d->client.setAllowTLS(d->tlsHandler ? true : false);
     d->client.setAllowBind(d->doBinding);
     d->client.setAllowPlain(d->allowPlain == AllowPlain || (d->allowPlain == AllowPlainOverTLS && d->conn->useSSL()));
     d->client.setLang(d->lang);
@@ -657,15 +561,14 @@ void ClientStream::cr_connected()
     QPointer<QObject> self = this;
     if (!d->quiet_reconnection)
         emit connected();
-    if(!self)
+    if (!self)
         return;
 
     // immediate SSL?
-    if(d->conn->useSSL()) {
+    if (d->conn->useSSL()) {
         d->using_tls = true;
         d->ss->startTLSClient(d->tlsHandler, d->server, spare);
-    }
-    else {
+    } else {
         d->client.addIncomingData(spare);
         processNext();
     }
@@ -701,15 +604,14 @@ void ClientStream::ss_readyRead()
     qDebug("ClientStream: recv: %d [%s]\n", a.size(), a.data());
 #endif
 
-    if(d->mode == Client) {
+    if (d->mode == Client) {
         d->client.addIncomingData(a);
         d->client.sm.countInputRawData(a.size());
-    }
-    else {
+    } else {
         d->srv.addIncomingData(a);
         d->srv.sm.countInputRawData(a.size());
     }
-    if(d->notify & CoreProtocol::NRecv) {
+    if (d->notify & CoreProtocol::NRecv) {
 #ifdef XMPP_DEBUG
         qDebug("We needed data, so let's process it\n");
 #endif
@@ -719,12 +621,12 @@ void ClientStream::ss_readyRead()
 
 void ClientStream::ss_bytesWritten(qint64 bytes)
 {
-    if(d->mode == Client)
+    if (d->mode == Client)
         d->client.outgoingDataWritten(bytes);
     else
         d->srv.outgoingDataWritten(bytes);
 
-    if(d->notify & CoreProtocol::NSend) {
+    if (d->notify & CoreProtocol::NSend) {
 #ifdef XMPP_DEBUG
         qDebug("We were waiting for data to be written, so let's process\n");
 #endif
@@ -737,7 +639,7 @@ void ClientStream::ss_tlsHandshaken()
     QPointer<QObject> self = this;
     if (!d->quiet_reconnection)
         securityLayerActivated(LayerTLS);
-    if(!self)
+    if (!self)
         return;
     d->client.setAllowPlain(d->allowPlain == AllowPlain || d->allowPlain == AllowPlainOverTLS);
     processNext();
@@ -751,65 +653,63 @@ void ClientStream::ss_tlsClosed()
 
 void ClientStream::ss_error(int x)
 {
-    if(x == SecureStream::ErrTLS) {
+    if (x == SecureStream::ErrTLS) {
         reset();
         d->errCond = TLSFail;
         error(ErrTLS);
-    }
-    else {
+    } else {
         reset();
         error(ErrSecurityLayer);
     }
 }
 
-void ClientStream::sasl_clientFirstStep(bool, const QByteArray& ba)
+void ClientStream::sasl_clientFirstStep(bool, const QByteArray &ba)
 {
     d->client.setSASLFirst(d->sasl->mechanism(), ba);
-    //d->client.sasl_mech = mech;
-    //d->client.sasl_firstStep = stepData ? true : false;
-    //d->client.sasl_step = stepData ? *stepData : QByteArray();
+    // d->client.sasl_mech = mech;
+    // d->client.sasl_firstStep = stepData ? true : false;
+    // d->client.sasl_step = stepData ? *stepData : QByteArray();
 
     processNext();
 }
 
 void ClientStream::sasl_nextStep(const QByteArray &stepData)
 {
-    if(d->mode == Client)
+    if (d->mode == Client)
         d->client.setSASLNext(stepData);
-        //d->client.sasl_step = stepData;
+    // d->client.sasl_step = stepData;
     else
         d->srv.setSASLNext(stepData);
-        //d->srv.sasl_step = stepData;
+    // d->srv.sasl_step = stepData;
 
     processNext();
 }
 
-void ClientStream::sasl_needParams(const QCA::SASL::Params& p)
+void ClientStream::sasl_needParams(const QCA::SASL::Params &p)
 {
 #ifdef XMPP_DEBUG
     qDebug("need params: needUsername: %d, canSendAuthzid: %d, needPassword: %d, canSendRealm: %d\n",
-           p.needUsername()?1:0, p.canSendAuthzid()? 1:0, p.needPassword()? 1:0, p.canSendRealm()? 1:0);
+           p.needUsername() ? 1 : 0, p.canSendAuthzid() ? 1 : 0, p.needPassword() ? 1 : 0, p.canSendRealm() ? 1 : 0);
 #endif
     /*if(p.authzid && !p.user) {
         d->sasl->setAuthzid(d->jid.bare());
         //d->sasl->setAuthzid("infiniti.homelesshackers.org");
     }*/
-    if(p.needUsername() || p.needPassword() || p.canSendRealm()) {
+    if (p.needUsername() || p.needPassword() || p.canSendRealm()) {
         d->state = NeedParams;
         needAuthParams(p.needUsername(), p.needPassword(), p.canSendRealm());
-    }
-    else
+    } else
         d->sasl->continueAfterParams();
 }
 
 void ClientStream::sasl_authCheck(const QString &user, const QString &)
 {
-//#ifdef XMPP_DEBUG
-//    qDebug("authcheck: [%s], [%s]\n", user.latin1(), authzid.latin1());
-//#endif
+    //#ifdef XMPP_DEBUG
+    //    qDebug("authcheck: [%s], [%s]\n", user.latin1(), authzid.latin1());
+    //#endif
     QString u = user;
-    int n = u.indexOf('@');
-    if(n != -1)
+    int     n = u.indexOf('@');
+    if (n != -1)
         u.truncate(n);
     d->srv.user = u;
     d->sasl->continueAfterAuthCheck();
@@ -822,7 +722,7 @@ void ClientStream::sasl_authenticated()
 #endif
     d->sasl_ssf = d->sasl->ssf();
 
-    if(d->mode == Server) {
+    if (d->mode == Server) {
         d->srv.setSASLAuthed();
         processNext();
     }
@@ -834,7 +734,7 @@ void ClientStream::sasl_error()
     qDebug("sasl error: %d\n", d->sasl->authCondition());
 #endif
     // has to be auth error
-    int x = convertedSASLCond();
+    int x      = convertedSASLCond();
     d->errText = tr("Offered mechanisms: ") + d->client.features.sasl_mechs.join(", ");
     reset();
     d->errCond = x;
@@ -843,30 +743,29 @@ void ClientStream::sasl_error()
 
 void ClientStream::srvProcessNext()
 {
-    while(1) {
+    while (1) {
         qDebug("Processing step...\n");
-        if(!d->srv.processStep()) {
+        if (!d->srv.processStep()) {
             int need = d->srv.need;
-            if(need == CoreProtocol::NNotify) {
+            if (need == CoreProtocol::NNotify) {
                 d->notify = d->srv.notify;
-                if(d->notify & CoreProtocol::NSend)
+                if (d->notify & CoreProtocol::NSend)
                     qDebug("More data needs to be written to process next step\n");
-                if(d->notify & CoreProtocol::NRecv)
+                if (d->notify & CoreProtocol::NRecv)
                     qDebug("More data is needed to process next step\n");
-            }
-            else if(need == CoreProtocol::NSASLMechs) {
-                if(!d->sasl) {
+            } else if (need == CoreProtocol::NSASLMechs) {
+                if (!d->sasl) {
                     d->sasl = new QCA::SASL;
-                    connect(d->sasl, SIGNAL(authCheck(QString,QString)), SLOT(sasl_authCheck(QString,QString)));
+                    connect(d->sasl, SIGNAL(authCheck(QString, QString)), SLOT(sasl_authCheck(QString, QString)));
                     connect(d->sasl, SIGNAL(nextStep(QByteArray)), SLOT(sasl_nextStep(QByteArray)));
                     connect(d->sasl, SIGNAL(authenticated()), SLOT(sasl_authenticated()));
                     connect(d->sasl, SIGNAL(error()), SLOT(sasl_error()));
 
-                    //d->sasl->setAllowAnonymous(false);
-                    //d->sasl->setRequirePassCredentials(true);
-                    //d->sasl->setExternalAuthID("localhost");
-                    QCA::SASL::AuthFlags auth_flags = (QCA::SASL::AuthFlags) 0;
-                    d->sasl->setConstraints(auth_flags,0,256);
+                    // d->sasl->setAllowAnonymous(false);
+                    // d->sasl->setRequirePassCredentials(true);
+                    // d->sasl->setExternalAuthID("localhost");
+                    QCA::SASL::AuthFlags auth_flags = (QCA::SASL::AuthFlags)0;
+                    d->sasl->setConstraints(auth_flags, 0, 256);
 
                     QStringList list;
                     // TODO: d->server is probably wrong here
@@ -875,30 +774,26 @@ void ClientStream::srvProcessNext()
                 }
                 d->srv.setSASLMechList(d->sasl_mechlist);
                 continue;
-            }
-            else if(need == CoreProtocol::NStartTLS) {
+            } else if (need == CoreProtocol::NStartTLS) {
                 qDebug("Need StartTLS\n");
-                //if(!d->tls->startServer()) {
+                // if(!d->tls->startServer()) {
                 d->tls->startServer();
                 QByteArray a = d->srv.spare;
                 d->ss->startTLSServer(d->tls, a);
-            }
-            else if(need == CoreProtocol::NSASLFirst) {
+            } else if (need == CoreProtocol::NSASLFirst) {
                 qDebug("Need SASL First Step\n");
                 QByteArray a = d->srv.saslStep();
                 d->sasl->putServerFirstStep(d->srv.saslMech(), a);
-            }
-            else if(need == CoreProtocol::NSASLNext) {
+            } else if (need == CoreProtocol::NSASLNext) {
                 qDebug("Need SASL Next Step\n");
                 QByteArray a = d->srv.saslStep();
                 qDebug("[%s]\n", a.data());
                 d->sasl->putStep(a);
-            }
-            else if(need == CoreProtocol::NSASLLayer) {
+            } else if (need == CoreProtocol::NSASLLayer) {
             }
 
             // now we can announce stanzas
-            //if(!d->in.isEmpty())
+            // if(!d->in.isEmpty())
             //    readyRead();
             return;
         }
@@ -907,101 +802,99 @@ void ClientStream::srvProcessNext()
 
         int event = d->srv.event;
         qDebug("event: %d\n", event);
-        switch(event) {
-            case CoreProtocol::EError: {
-                qDebug("Error! Code=%d\n", d->srv.errorCode);
-                reset();
-                error(ErrProtocol);
-                //handleError();
-                return;
-            }
-            case CoreProtocol::ESend: {
-                while (true) {
-                    QByteArray a = d->srv.takeOutgoingData();
-                    if (a.isEmpty())
-                        break;
+        switch (event) {
+        case CoreProtocol::EError: {
+            qDebug("Error! Code=%d\n", d->srv.errorCode);
+            reset();
+            error(ErrProtocol);
+            // handleError();
+            return;
+        }
+        case CoreProtocol::ESend: {
+            while (true) {
+                QByteArray a = d->srv.takeOutgoingData();
+                if (a.isEmpty())
+                    break;
 #ifdef XMPP_DEBUG
-                    qDebug("Need Send: {%s}\n", a.data());
+                qDebug("Need Send: {%s}\n", a.data());
 #endif
-                    d->ss->write(a);
-                }
-                break;
-            }
-            case CoreProtocol::ERecvOpen: {
-                qDebug("Break (RecvOpen)\n");
-
-                // calculate key
-                QByteArray str = QCA::Hash("sha1").hashToString("secret").toUtf8();
-                str = QCA::Hash("sha1").hashToString(QByteArray(str + "im.pyxa.org")).toUtf8();
-                str = QCA::Hash("sha1").hashToString(QByteArray(str + d->srv.id.toUtf8())).toUtf8();
-                d->srv.setDialbackKey(str);
-
-                //d->srv.setDialbackKey("3c5d721ea2fcc45b163a11420e4e358f87e3142a");
-
-                if(d->srv.to != d->server) {
-                    // host-gone, host-unknown, see-other-host
-                    d->srv.shutdownWithError(CoreProtocol::HostUnknown);
-                }
-                else
-                    d->srv.setFrom(d->server);
-                break;
-            }
-            case CoreProtocol::ESASLSuccess: {
-                qDebug("Break SASL Success\n");
-                disconnect(d->sasl, SIGNAL(error()), this, SLOT(sasl_error()));
-                QByteArray a = d->srv.spare;
-                d->ss->setLayerSASL(d->sasl, a);
-                break;
-            }
-            case CoreProtocol::EPeerClosed: {
-                // TODO: this isn' an error
-                qDebug("peer closed\n");
-                reset();
-                error(ErrProtocol);
-                return;
+                d->ss->write(a);
             }
+            break;
+        }
+        case CoreProtocol::ERecvOpen: {
+            qDebug("Break (RecvOpen)\n");
+
+            // calculate key
+            QByteArray str = QCA::Hash("sha1").hashToString("secret").toUtf8();
+            str            = QCA::Hash("sha1").hashToString(QByteArray(str + "im.pyxa.org")).toUtf8();
+            str            = QCA::Hash("sha1").hashToString(QByteArray(str + d->srv.id.toUtf8())).toUtf8();
+            d->srv.setDialbackKey(str);
+
+            // d->srv.setDialbackKey("3c5d721ea2fcc45b163a11420e4e358f87e3142a");
+
+            if (d->srv.to != d->server) {
+                // host-gone, host-unknown, see-other-host
+                d->srv.shutdownWithError(CoreProtocol::HostUnknown);
+            } else
+                d->srv.setFrom(d->server);
+            break;
+        }
+        case CoreProtocol::ESASLSuccess: {
+            qDebug("Break SASL Success\n");
+            disconnect(d->sasl, SIGNAL(error()), this, SLOT(sasl_error()));
+            QByteArray a = d->srv.spare;
+            d->ss->setLayerSASL(d->sasl, a);
+            break;
+        }
+        case CoreProtocol::EPeerClosed: {
+            // TODO: this isn' an error
+            qDebug("peer closed\n");
+            reset();
+            error(ErrProtocol);
+            return;
+        }
         }
     }
 }
 
 void ClientStream::doReadyRead()
 {
-    //QGuardedPtr<QObject> self = this;
+    // QGuardedPtr<QObject> self = this;
     if (isActive())
         emit readyRead();
-    //if(!self)
+    // if(!self)
     //    return;
-    //d->in_rrsig = false;
+    // d->in_rrsig = false;
 }
 
 void ClientStream::processNext()
 {
-    if(d->mode == Server) {
+    if (d->mode == Server) {
         srvProcessNext();
         return;
     }
 
     QPointer<QObject> self = this;
 
-    while(1) {
+    while (1) {
 #ifdef XMPP_DEBUG
         qDebug("Processing step...\n");
 #endif
         bool ok = d->client.processStep();
         // deal with send/received items
         foreach (const XmlProtocol::TransferItem &i, d->client.transferItemList) {
-            if(i.isExternal)
+            if (i.isExternal)
                 continue;
             QString str;
-            if(i.isString) {
+            if (i.isString) {
                 // skip whitespace pings
-                if(i.str.trimmed().isEmpty())
+                if (i.str.trimmed().isEmpty())
                     continue;
                 str = i.str;
-            }
-            else
+            } else
                 str = d->client.elementToString(i.elem);
-            if(i.isSent)
+            if (i.isSent)
                 emit outgoingXml(str);
             else
                 emit incomingXml(str);
@@ -1010,9 +903,9 @@ void ClientStream::processNext()
 #ifdef XMPP_DEBUG
         qDebug("\tNOTIFY: %d\n", d->client.notify);
 #endif
-        if (d->client.notify & CoreProtocol::NTimeout ) {
+        if (d->client.notify & CoreProtocol::NTimeout) {
 #ifdef XMPP_DEBUG
-            qDebug() << "Time = "<< d->client.timeout_sec;
+            qDebug() << "Time = " << d->client.timeout_sec;
 #endif
             setTimer(d->client.timeout_sec);
 #ifdef XMPP_DEBUG
@@ -1020,175 +913,176 @@ void ClientStream::processNext()
 #endif
         }
 
-        if(!ok) {
+        if (!ok) {
             bool cont = handleNeed();
 
             // now we can announce stanzas
-            //if(!d->in_rrsig && !d->in.isEmpty()) {
-            if(!d->in.isEmpty()) {
-                //d->in_rrsig = true;
-                //fprintf(stderr, "\tClientStream::processNext() QTimer::singleShot\n");
-                //fflush(stderr);
+            // if(!d->in_rrsig && !d->in.isEmpty()) {
+            if (!d->in.isEmpty()) {
+                // d->in_rrsig = true;
+                // fprintf(stderr, "\tClientStream::processNext() QTimer::singleShot\n");
+                // fflush(stderr);
 
                 QTimer::singleShot(0, this, SLOT(doReadyRead()));
             }
 
-            if(cont)
+            if (cont)
                 continue;
             return;
         }
 
         int event = d->client.event;
         d->notify = 0;
-        switch(event) {
-            case CoreProtocol::EError: {
+        switch (event) {
+        case CoreProtocol::EError: {
 #ifdef XMPP_DEBUG
-                qDebug("Error! Code=%d\n", d->client.errorCode);
+            qDebug("Error! Code=%d\n", d->client.errorCode);
 #endif
-                handleError();
-                return;
-            }
-            case CoreProtocol::ESend: {
-                while (true) {
-                    QByteArray a = d->client.takeOutgoingData();
-                    if (a.isEmpty())
-                        break;
+            handleError();
+            return;
+        }
+        case CoreProtocol::ESend: {
+            while (true) {
+                QByteArray a = d->client.takeOutgoingData();
+                if (a.isEmpty())
+                    break;
 #ifdef XMPP_DEBUG
-                    qDebug("Need Send: {%s}\n", a.data());
+                qDebug("Need Send: {%s}\n", a.data());
 #endif
-                    d->ss->write(a);
-                }
-                break;
+                d->ss->write(a);
             }
-            case CoreProtocol::ERecvOpen: {
+            break;
+        }
+        case CoreProtocol::ERecvOpen: {
 #ifdef XMPP_DEBUG
-                qDebug("Break (RecvOpen)\n");
+            qDebug("Break (RecvOpen)\n");
 #endif
 
 #ifdef XMPP_TEST
-                QString s = QString("handshake success (lang=[%1]").arg(d->client.lang);
-                if(!d->client.from.isEmpty())
-                    s += QString(", from=[%1]").arg(d->client.from);
-                s += ')';
-                TD::msg(s);
+            QString s = QString("handshake success (lang=[%1]").arg(d->client.lang);
+            if (!d->client.from.isEmpty())
+                s += QString(", from=[%1]").arg(d->client.from);
+            s += ')';
+            TD::msg(s);
 #endif
 
-                if(d->client.old) {
-                    d->state = WaitVersion;
-                    warning(WarnOldVersion);
-                    return;
-                }
-                break;
+            if (d->client.old) {
+                d->state = WaitVersion;
+                warning(WarnOldVersion);
+                return;
             }
-            case CoreProtocol::EFeatures: {
+            break;
+        }
+        case CoreProtocol::EFeatures: {
 #ifdef XMPP_DEBUG
-                qDebug("Break (Features)\n");
+            qDebug("Break (Features)\n");
 #endif
-                if (d->client.unhandledFeatures.count()) {
-                    emit haveUnhandledFeatures();
-                }
-                if(!d->tls_warned && !d->using_tls && !d->client.features.tls_supported) {
-                    d->tls_warned = true;
-                    d->state = WaitTLS;
-                    warning(WarnNoTLS);
-                    return;
-                }
-                break;
+            if (d->client.unhandledFeatures.count()) {
+                emit haveUnhandledFeatures();
             }
-            case CoreProtocol::ESASLSuccess: {
-#ifdef XMPP_DEBUG
-                qDebug("Break SASL Success\n");
-#endif
-                break;
+            if (!d->tls_warned && !d->using_tls && !d->client.features.tls_supported) {
+                d->tls_warned = true;
+                d->state      = WaitTLS;
+                warning(WarnNoTLS);
+                return;
             }
-            case CoreProtocol::EReady: {
+            break;
+        }
+        case CoreProtocol::ESASLSuccess: {
 #ifdef XMPP_DEBUG
-                qDebug("Done!\n");
+            qDebug("Break SASL Success\n");
 #endif
-                // grab the JID, in case it changed
-                d->jid = d->client.jid();
-                d->state = Active;
-                setNoopTime(d->noop_time);
-                if (!d->quiet_reconnection)
-                    authenticated();
-                if(!self)
-                    return;
-                break;
-            }
-            case CoreProtocol::EPeerClosed: {
+            break;
+        }
+        case CoreProtocol::EReady: {
 #ifdef XMPP_DEBUG
-                qDebug("DocumentClosed\n");
+            qDebug("Done!\n");
 #endif
-                reset();
-                connectionClosed();
+            // grab the JID, in case it changed
+            d->jid   = d->client.jid();
+            d->state = Active;
+            setNoopTime(d->noop_time);
+            if (!d->quiet_reconnection)
+                authenticated();
+            if (!self)
                 return;
-            }
-            case CoreProtocol::EStanzaReady: {
+            break;
+        }
+        case CoreProtocol::EPeerClosed: {
 #ifdef XMPP_DEBUG
-                qDebug("StanzaReady\n");
+            qDebug("DocumentClosed\n");
 #endif
-                // store the stanza for now, announce after processing all events
-                // TODO: add a method to the stanza to mark them handled.
-                Stanza s = createStanza(d->client.recvStanza());
-                if(s.isNull())
-                    break;
-                if (d->client.sm.isActive())
-                    d->client.sm.markStanzaHandled();
-                d->in.append(new Stanza(s));
-                break;
-            }
-            case CoreProtocol::EStanzaSent: {
+            reset();
+            connectionClosed();
+            return;
+        }
+        case CoreProtocol::EStanzaReady: {
 #ifdef XMPP_DEBUG
-                qDebug("StanzasSent\n");
+            qDebug("StanzaReady\n");
 #endif
-                stanzaWritten();
-                if(!self)
-                    return;
+            // store the stanza for now, announce after processing all events
+            // TODO: add a method to the stanza to mark them handled.
+            Stanza s = createStanza(d->client.recvStanza());
+            if (s.isNull())
                 break;
-            }
-            case CoreProtocol::EClosed: {
+            if (d->client.sm.isActive())
+                d->client.sm.markStanzaHandled();
+            d->in.append(new Stanza(s));
+            break;
+        }
+        case CoreProtocol::EStanzaSent: {
 #ifdef XMPP_DEBUG
-                qDebug("Closed\n");
+            qDebug("StanzasSent\n");
 #endif
-                reset();
-                delayedCloseFinished();
+            stanzaWritten();
+            if (!self)
                 return;
-            }
-            case CoreProtocol::EAck: {
-                int ack_cnt = d->client.sm.takeAckedCount();
+            break;
+        }
+        case CoreProtocol::EClosed: {
 #ifdef XMPP_DEBUG
-                qDebug() << "Stream Management: [INF] Received ack amount: " << ack_cnt;
+            qDebug("Closed\n");
 #endif
-                emit stanzasAcked(ack_cnt);
-                break;
-            }
-            case CoreProtocol::ESMConnTimeout: {
+            reset();
+            delayedCloseFinished();
+            return;
+        }
+        case CoreProtocol::EAck: {
+            int ack_cnt = d->client.sm.takeAckedCount();
 #ifdef XMPP_DEBUG
-                qDebug() << "Stream Management: [INF] Connection timeout";
+            qDebug() << "Stream Management: [INF] Received ack amount: " << ack_cnt;
 #endif
-                reset();
-                if (d->client.sm.state().isResumption()) {
-                    d->state = Connecting;
-                    emit warning(WarnSMReconnection);
-                    d->quiet_reconnection = true;
-                    if (d->client.sm.state().isLocationValid())
-                        d->conn->setOptHostPort(d->client.sm.state().resumption_location.host , d->client.sm.state().resumption_location.port);
-                    d->conn->connectToServer(d->server);
-                } else {
-                    d->quiet_reconnection = false;
-                    emit connectionClosed();
-                }
-                return;
-            }
-            case CoreProtocol::ESMResumeFailed: {
+            emit stanzasAcked(ack_cnt);
+            break;
+        }
+        case CoreProtocol::ESMConnTimeout: {
 #ifdef XMPP_DEBUG
-                qDebug() << "Stream Management: [INF] Resuming session failed";
+            qDebug() << "Stream Management: [INF] Connection timeout";
 #endif
-                reset();
+            reset();
+            if (d->client.sm.state().isResumption()) {
+                d->state = Connecting;
+                emit warning(WarnSMReconnection);
+                d->quiet_reconnection = true;
+                if (d->client.sm.state().isLocationValid())
+                    d->conn->setOptHostPort(d->client.sm.state().resumption_location.host,
+                                            d->client.sm.state().resumption_location.port);
+                d->conn->connectToServer(d->server);
+            } else {
                 d->quiet_reconnection = false;
-                emit error(ErrSmResume);
-                return;
+                emit connectionClosed();
             }
+            return;
+        }
+        case CoreProtocol::ESMResumeFailed: {
+#ifdef XMPP_DEBUG
+            qDebug() << "Stream Management: [INF] Resuming session failed";
+#endif
+            reset();
+            d->quiet_reconnection = false;
+            emit error(ErrSmResume);
+            return;
+        }
         }
     }
 }
@@ -1196,146 +1090,144 @@ void ClientStream::processNext()
 bool ClientStream::handleNeed()
 {
     int need = d->client.need;
-    if(need == CoreProtocol::NNotify) {
+    if (need == CoreProtocol::NNotify) {
         d->notify = d->client.notify;
 #ifdef XMPP_DEBUG
-        if(d->notify & CoreProtocol::NSend)
+        if (d->notify & CoreProtocol::NSend)
             qDebug("More data needs to be written to process next step\n");
-        if(d->notify & CoreProtocol::NRecv)
+        if (d->notify & CoreProtocol::NRecv)
             qDebug("More data is needed to process next step\n");
 #endif
         return false;
     }
 
     d->notify = 0;
-    switch(need) {
-        case CoreProtocol::NStartTLS: {
+    switch (need) {
+    case CoreProtocol::NStartTLS: {
 #ifdef XMPP_DEBUG
-            qDebug("Need StartTLS\n");
+        qDebug("Need StartTLS\n");
 #endif
-            d->using_tls = true;
-            d->ss->startTLSClient(d->tlsHandler, d->server, d->client.spare);
-            return false;
-        }
-        case CoreProtocol::NCompress: {
+        d->using_tls = true;
+        d->ss->startTLSClient(d->tlsHandler, d->server, d->client.spare);
+        return false;
+    }
+    case CoreProtocol::NCompress: {
 #ifdef XMPP_DEBUG
-            qDebug("Need compress\n");
+        qDebug("Need compress\n");
 #endif
-            d->ss->setLayerCompress(d->client.spare);
-            return true;
-        }
-        case CoreProtocol::NSASLFirst: {
+        d->ss->setLayerCompress(d->client.spare);
+        return true;
+    }
+    case CoreProtocol::NSASLFirst: {
 #ifdef XMPP_DEBUG
-            qDebug("Need SASL First Step\n");
+        qDebug("Need SASL First Step\n");
 #endif
 
-            // ensure simplesasl provider is installed
-            bool found = false;
-            foreach(QCA::Provider *p, QCA::providers()) {
-                if(p->name() == "simplesasl") {
-                    found = true;
-                    break;
-                }
-            }
-            if(!found) {
-                // install with low-priority
-                QCA::insertProvider(createProviderSimpleSASL());
-                QCA::setProviderPriority("simplesasl", 10);
+        // ensure simplesasl provider is installed
+        bool found = false;
+        foreach (QCA::Provider *p, QCA::providers()) {
+            if (p->name() == "simplesasl") {
+                found = true;
+                break;
             }
+        }
+        if (!found) {
+            // install with low-priority
+            QCA::insertProvider(createProviderSimpleSASL());
+            QCA::setProviderPriority("simplesasl", 10);
+        }
 
-            static QStringList preference{ "GSSAPI", "SCRAM-SHA-512-PLUS", "SCRAM-SHA-512",
-                                           "SCRAM-SHA-384-PLUS", "SCRAM-SHA-384",
-                                           "SCRAM-SHA-256-PLUS", "SCRAM-SHA-256",
-                                           "SCRAM-SHA-1-PLUS", "SCRAM-SHA-1",
-                                           "DIGEST-MD5", "PLAIN" };
-            // TODO qca should maintain the list of preferred
-
-            QStringList ml;
-            if(!d->sasl_mech.isEmpty())
-                ml += d->sasl_mech;
-            else {
-                QMap<int, QString> prefOrdered;
-                QStringList unpreferred;
-                for (auto const &m : d->client.features.sasl_mechs) {
-                    int i = preference.indexOf(m);
-                    if (i != -1) {
-                        prefOrdered.insert(i, m);
-                    } else {
-                        unpreferred.append(m);
-                    }
+        static QStringList preference { "GSSAPI",        "SCRAM-SHA-512-PLUS", "SCRAM-SHA-512", "SCRAM-SHA-384-PLUS",
+                                        "SCRAM-SHA-384", "SCRAM-SHA-256-PLUS", "SCRAM-SHA-256", "SCRAM-SHA-1-PLUS",
+                                        "SCRAM-SHA-1",   "DIGEST-MD5",         "PLAIN" };
+        // TODO qca should maintain the list of preferred
+
+        QStringList ml;
+        if (!d->sasl_mech.isEmpty())
+            ml += d->sasl_mech;
+        else {
+            QMap<int, QString> prefOrdered;
+            QStringList        unpreferred;
+            for (auto const &m : d->client.features.sasl_mechs) {
+                int i = preference.indexOf(m);
+                if (i != -1) {
+                    prefOrdered.insert(i, m);
+                } else {
+                    unpreferred.append(m);
                 }
-                ml = prefOrdered.values() + unpreferred;
             }
+            ml = prefOrdered.values() + unpreferred;
+        }
 
-            QString saslProvider;
-            foreach (const QString &mech, d->mechProviders.keys()) {
-                if (ml.contains(mech)) {
-                    saslProvider = d->mechProviders[mech];
-                    break;
-                }
+        QString saslProvider;
+        foreach (const QString &mech, d->mechProviders.keys()) {
+            if (ml.contains(mech)) {
+                saslProvider = d->mechProviders[mech];
+                break;
             }
+        }
 
-            d->sasl = new QCA::SASL(nullptr, saslProvider);
-            connect(d->sasl, SIGNAL(clientStarted(bool,QByteArray)), SLOT(sasl_clientFirstStep(bool,QByteArray)));
-            connect(d->sasl, SIGNAL(nextStep(QByteArray)), SLOT(sasl_nextStep(QByteArray)));
-            connect(d->sasl, SIGNAL(needParams(QCA::SASL::Params)), SLOT(sasl_needParams(QCA::SASL::Params)));
-            connect(d->sasl, SIGNAL(authenticated()), SLOT(sasl_authenticated()));
-            connect(d->sasl, SIGNAL(error()), SLOT(sasl_error()));
-
-            if(d->haveLocalAddr)
-                d->sasl->setLocalAddress(d->localAddr.toString(), d->localPort);
-            if(d->conn->havePeerAddress())
-                d->sasl->setRemoteAddress(d->conn->peerAddress().toString(), d->conn->peerPort());
-
-            //d->sasl_mech = "ANONYMOUS";
-            //d->sasl->setRequirePassCredentials(true);
-            //d->sasl->setExternalAuthID("localhost");
-            //d->sasl->setExternalSSF(64);
-            //d->sasl_mech = "EXTERNAL";
-
-            QCA::SASL::AuthFlags auth_flags = (QCA::SASL::AuthFlags) 0;
-            if (d->allowPlain == AllowPlain || (d->allowPlain == AllowPlainOverTLS && d->using_tls))
-                auth_flags = (QCA::SASL::AuthFlags) (auth_flags | QCA::SASL::AllowPlain);
-            if (d->mutualAuth)
-                auth_flags = (QCA::SASL::AuthFlags) (auth_flags | QCA::SASL::RequireMutualAuth);
-            d->sasl->setConstraints(auth_flags,d->minimumSSF,d->maximumSSF);
+        d->sasl = new QCA::SASL(nullptr, saslProvider);
+        connect(d->sasl, SIGNAL(clientStarted(bool, QByteArray)), SLOT(sasl_clientFirstStep(bool, QByteArray)));
+        connect(d->sasl, SIGNAL(nextStep(QByteArray)), SLOT(sasl_nextStep(QByteArray)));
+        connect(d->sasl, SIGNAL(needParams(QCA::SASL::Params)), SLOT(sasl_needParams(QCA::SASL::Params)));
+        connect(d->sasl, SIGNAL(authenticated()), SLOT(sasl_authenticated()));
+        connect(d->sasl, SIGNAL(error()), SLOT(sasl_error()));
+
+        if (d->haveLocalAddr)
+            d->sasl->setLocalAddress(d->localAddr.toString(), d->localPort);
+        if (d->conn->havePeerAddress())
+            d->sasl->setRemoteAddress(d->conn->peerAddress().toString(), d->conn->peerPort());
+
+        // d->sasl_mech = "ANONYMOUS";
+        // d->sasl->setRequirePassCredentials(true);
+        // d->sasl->setExternalAuthID("localhost");
+        // d->sasl->setExternalSSF(64);
+        // d->sasl_mech = "EXTERNAL";
+
+        QCA::SASL::AuthFlags auth_flags = (QCA::SASL::AuthFlags)0;
+        if (d->allowPlain == AllowPlain || (d->allowPlain == AllowPlainOverTLS && d->using_tls))
+            auth_flags = (QCA::SASL::AuthFlags)(auth_flags | QCA::SASL::AllowPlain);
+        if (d->mutualAuth)
+            auth_flags = (QCA::SASL::AuthFlags)(auth_flags | QCA::SASL::RequireMutualAuth);
+        d->sasl->setConstraints(auth_flags, d->minimumSSF, d->maximumSSF);
 
 #ifdef IRIS_SASLCONNECTHOST
-            d->sasl->startClient("xmpp", QUrl::toAce(d->connectHost), ml, QCA::SASL::AllowClientSendFirst);
+        d->sasl->startClient("xmpp", QUrl::toAce(d->connectHost), ml, QCA::SASL::AllowClientSendFirst);
 #else
-            d->sasl->startClient("xmpp", QUrl::toAce(d->server), ml, QCA::SASL::AllowClientSendFirst);
+        d->sasl->startClient("xmpp", QUrl::toAce(d->server), ml, QCA::SASL::AllowClientSendFirst);
 #endif
-            return false;
-        }
-        case CoreProtocol::NSASLNext: {
+        return false;
+    }
+    case CoreProtocol::NSASLNext: {
 #ifdef XMPP_DEBUG
-            qDebug("Need SASL Next Step\n");
+        qDebug("Need SASL Next Step\n");
 #endif
-            QByteArray a = d->client.saslStep();
-            d->sasl->putStep(a);
-            return false;
-        }
-        case CoreProtocol::NSASLLayer: {
-            // SecureStream will handle the errors from this point
-            disconnect(d->sasl, SIGNAL(error()), this, SLOT(sasl_error()));
-            d->ss->setLayerSASL(d->sasl, d->client.spare);
-            if(d->sasl_ssf > 0) {
-                QPointer<QObject> self = this;
-                if (!d->quiet_reconnection)
-                    securityLayerActivated(LayerSASL);
-                if(!self)
-                    return false;
-            }
-            break;
+        QByteArray a = d->client.saslStep();
+        d->sasl->putStep(a);
+        return false;
+    }
+    case CoreProtocol::NSASLLayer: {
+        // SecureStream will handle the errors from this point
+        disconnect(d->sasl, SIGNAL(error()), this, SLOT(sasl_error()));
+        d->ss->setLayerSASL(d->sasl, d->client.spare);
+        if (d->sasl_ssf > 0) {
+            QPointer<QObject> self = this;
+            if (!d->quiet_reconnection)
+                securityLayerActivated(LayerSASL);
+            if (!self)
+                return false;
         }
-        case CoreProtocol::NPassword: {
+        break;
+    }
+    case CoreProtocol::NPassword: {
 #ifdef XMPP_DEBUG
-            qDebug("Need Password\n");
+        qDebug("Need Password\n");
 #endif
-            d->state = NeedParams;
-            needAuthParams(false, true, false);
-            return false;
-        }
+        d->state = NeedParams;
+        needAuthParams(false, true, false);
+        return false;
+    }
     }
 
     return true;
@@ -1344,13 +1236,13 @@ bool ClientStream::handleNeed()
 int ClientStream::convertedSASLCond() const
 {
     int x = d->sasl->authCondition();
-    if(x == QCA::SASL::NoMechanism)
+    if (x == QCA::SASL::NoMechanism)
         return NoMech;
-    else if(x == QCA::SASL::BadProtocol)
+    else if (x == QCA::SASL::BadProtocol)
         return MalformedRequest;
-    else if(x == QCA::SASL::BadServer)
+    else if (x == QCA::SASL::BadServer)
         return BadServ;
-    else if(x == QCA::SASL::TooWeak)
+    else if (x == QCA::SASL::TooWeak)
         return MechTooWeak;
     else
         return GenericAuthError;
@@ -1365,8 +1257,7 @@ void ClientStream::sm_timeout()
     int elapsed = d->client.sm.lastAckElapsed();
     if (elapsed < d->client.timeout_sec) {
         setTimer(d->client.timeout_sec - elapsed);
-    }
-    else {
+    } else {
         d->client.timeout_sec = 0;
         processNext();
     }
@@ -1374,7 +1265,7 @@ void ClientStream::sm_timeout()
 
 void ClientStream::doNoop()
 {
-    if(d->state == Active) {
+    if (d->state == Active) {
 #ifdef XMPP_DEBUG
         qDebug("doPing\n");
 #endif
@@ -1385,7 +1276,7 @@ void ClientStream::doNoop()
 
 void ClientStream::writeDirect(const QString &s)
 {
-    if(d->state == Active) {
+    if (d->state == Active) {
 #ifdef XMPP_DEBUG
         qDebug("writeDirect\n");
 #endif
@@ -1397,208 +1288,275 @@ void ClientStream::writeDirect(const QString &s)
 void ClientStream::handleError()
 {
     int c = d->client.errorCode;
-    if(c == CoreProtocol::ErrParse) {
+    if (c == CoreProtocol::ErrParse) {
         reset();
         error(ErrParse);
-    }
-    else if(c == CoreProtocol::ErrProtocol) {
+    } else if (c == CoreProtocol::ErrProtocol) {
         reset();
         error(ErrProtocol);
-    }
-    else if(c == CoreProtocol::ErrStream) {
-        int x = d->client.errCond;
-        QString text = d->client.errText;
-        auto langText = d->client.errLangText;
-        QDomElement appSpec = d->client.errAppSpec;
+    } else if (c == CoreProtocol::ErrStream) {
+        int         x        = d->client.errCond;
+        QString     text     = d->client.errText;
+        auto        langText = d->client.errLangText;
+        QDomElement appSpec  = d->client.errAppSpec;
 
         int connErr = -1;
-        int strErr = -1;
-
-        switch(x) {
-            case CoreProtocol::BadFormat: { break; } // should NOT happen (we send the right format)
-            case CoreProtocol::BadNamespacePrefix: { break; } // should NOT happen (we send prefixes)
-            case CoreProtocol::Conflict: { strErr = Conflict; break; }
-            case CoreProtocol::ConnectionTimeout: { strErr = ConnectionTimeout; break; }
-            case CoreProtocol::HostGone: { connErr = HostGone; break; }
-            case CoreProtocol::HostUnknown: { connErr = HostUnknown; break; }
-            case CoreProtocol::ImproperAddressing: { break; } // should NOT happen (we aren't a server)
-            case CoreProtocol::InternalServerError: { strErr = InternalServerError;  break; }
-            case CoreProtocol::InvalidFrom: { strErr = InvalidFrom; break; }
-            case CoreProtocol::InvalidNamespace: { break; } // should NOT happen (we set the right ns)
-            case CoreProtocol::InvalidXml: { strErr = InvalidXml; break; } // shouldn't happen either, but just in case ...
-            case CoreProtocol::StreamNotAuthorized: { break; } // should NOT happen (we're not stupid)
-            case CoreProtocol::PolicyViolation: { strErr = PolicyViolation; break; }
-            case CoreProtocol::RemoteConnectionFailed: { connErr = RemoteConnectionFailed; break; }
-            case CoreProtocol::StreamReset: { strErr = StreamReset; break; }
-            case CoreProtocol::ResourceConstraint: { strErr = ResourceConstraint; break; }
-            case CoreProtocol::RestrictedXml: { strErr = InvalidXml; break; } // group with this one
-            case CoreProtocol::SeeOtherHost: { connErr = SeeOtherHost; break; }
-            case CoreProtocol::SystemShutdown: { strErr = SystemShutdown; break; }
-            case CoreProtocol::UndefinedCondition: { break; } // leave as null error
-            case CoreProtocol::UnsupportedEncoding: { break; } // should NOT happen (we send good encoding)
-            case CoreProtocol::UnsupportedStanzaType: { break; } // should NOT happen (we're not stupid)
-            case CoreProtocol::UnsupportedVersion: { connErr = UnsupportedVersion; break; }
-            case CoreProtocol::NotWellFormed: { strErr = InvalidXml; break; } // group with this one
-            default: { break; }
+        int strErr  = -1;
+
+        switch (x) {
+        case CoreProtocol::BadFormat: {
+            break;
+        } // should NOT happen (we send the right format)
+        case CoreProtocol::BadNamespacePrefix: {
+            break;
+        } // should NOT happen (we send prefixes)
+        case CoreProtocol::Conflict: {
+            strErr = Conflict;
+            break;
+        }
+        case CoreProtocol::ConnectionTimeout: {
+            strErr = ConnectionTimeout;
+            break;
+        }
+        case CoreProtocol::HostGone: {
+            connErr = HostGone;
+            break;
+        }
+        case CoreProtocol::HostUnknown: {
+            connErr = HostUnknown;
+            break;
+        }
+        case CoreProtocol::ImproperAddressing: {
+            break;
+        } // should NOT happen (we aren't a server)
+        case CoreProtocol::InternalServerError: {
+            strErr = InternalServerError;
+            break;
+        }
+        case CoreProtocol::InvalidFrom: {
+            strErr = InvalidFrom;
+            break;
+        }
+        case CoreProtocol::InvalidNamespace: {
+            break;
+        } // should NOT happen (we set the right ns)
+        case CoreProtocol::InvalidXml: {
+            strErr = InvalidXml;
+            break;
+        } // shouldn't happen either, but just in case ...
+        case CoreProtocol::StreamNotAuthorized: {
+            break;
+        } // should NOT happen (we're not stupid)
+        case CoreProtocol::PolicyViolation: {
+            strErr = PolicyViolation;
+            break;
+        }
+        case CoreProtocol::RemoteConnectionFailed: {
+            connErr = RemoteConnectionFailed;
+            break;
+        }
+        case CoreProtocol::StreamReset: {
+            strErr = StreamReset;
+            break;
+        }
+        case CoreProtocol::ResourceConstraint: {
+            strErr = ResourceConstraint;
+            break;
+        }
+        case CoreProtocol::RestrictedXml: {
+            strErr = InvalidXml;
+            break;
+        } // group with this one
+        case CoreProtocol::SeeOtherHost: {
+            connErr = SeeOtherHost;
+            break;
+        }
+        case CoreProtocol::SystemShutdown: {
+            strErr = SystemShutdown;
+            break;
+        }
+        case CoreProtocol::UndefinedCondition: {
+            break;
+        } // leave as null error
+        case CoreProtocol::UnsupportedEncoding: {
+            break;
+        } // should NOT happen (we send good encoding)
+        case CoreProtocol::UnsupportedStanzaType: {
+            break;
+        } // should NOT happen (we're not stupid)
+        case CoreProtocol::UnsupportedVersion: {
+            connErr = UnsupportedVersion;
+            break;
+        }
+        case CoreProtocol::NotWellFormed: {
+            strErr = InvalidXml;
+            break;
+        } // group with this one
+        default: {
+            break;
+        }
         }
 
         reset();
 
-        d->errText = text;
+        d->errText     = text;
         d->errLangText = langText;
-        d->errAppSpec = appSpec;
-        if(connErr != -1) {
+        d->errAppSpec  = appSpec;
+        if (connErr != -1) {
             d->errCond = connErr;
             error(ErrNeg);
-        }
-        else {
-            if(strErr != -1)
+        } else {
+            if (strErr != -1)
                 d->errCond = strErr;
             else
                 d->errCond = GenericStreamError;
             error(ErrStream);
         }
-    }
-    else if(c == CoreProtocol::ErrStartTLS) {
+    } else if (c == CoreProtocol::ErrStartTLS) {
         reset();
         d->errCond = TLSStart;
         error(ErrTLS);
-    }
-    else if(c == CoreProtocol::ErrAuth) {
+    } else if (c == CoreProtocol::ErrAuth) {
         int x = d->client.errCond;
         int r = GenericAuthError;
-        if(d->client.old) {
-            if(x == 401) // not authorized
+        if (d->client.old) {
+            if (x == 401) // not authorized
                 r = NotAuthorized;
-            else if(x == 409) // conflict
+            else if (x == 409) // conflict
                 r = GenericAuthError;
-            else if(x == 406) // not acceptable (this should NOT happen)
+            else if (x == 406) // not acceptable (this should NOT happen)
                 r = GenericAuthError;
-        }
-        else {
-            switch(x) {
-                case CoreProtocol::Aborted: { r = GenericAuthError; break; } // should NOT happen (we never send <abort/>)
-                case CoreProtocol::AccountDisabled: { r = AccountDisabled; break; }            // account temporrily disabled
-                case CoreProtocol::CredentialsExpired: { r = CredentialsExpired; break; }         // credential expired
-                case CoreProtocol::EncryptionRequired: { r = EncryptionRequired; break; }         // can't use mech without TLS
-                case CoreProtocol::IncorrectEncoding: { r = GenericAuthError; break; } // should NOT happen
-                case CoreProtocol::InvalidAuthzid: { r = InvalidAuthzid; break; }
-                case CoreProtocol::InvalidMech: { r = InvalidMech; break; }
-                case CoreProtocol::MalformedRequest: { r = MalformedRequest; break; }
-                case CoreProtocol::MechTooWeak: { r = MechTooWeak; break; }
-                case CoreProtocol::NotAuthorized: { r = NotAuthorized; break; }
-                case CoreProtocol::TemporaryAuthFailure: { r = TemporaryAuthFailure; break; }
+        } else {
+            switch (x) {
+            case CoreProtocol::Aborted: {
+                r = GenericAuthError;
+                break;
+            } // should NOT happen (we never send <abort/>)
+            case CoreProtocol::AccountDisabled: {
+                r = AccountDisabled;
+                break;
+            } // account temporrily disabled
+            case CoreProtocol::CredentialsExpired: {
+                r = CredentialsExpired;
+                break;
+            } // credential expired
+            case CoreProtocol::EncryptionRequired: {
+                r = EncryptionRequired;
+                break;
+            } // can't use mech without TLS
+            case CoreProtocol::IncorrectEncoding: {
+                r = GenericAuthError;
+                break;
+            } // should NOT happen
+            case CoreProtocol::InvalidAuthzid: {
+                r = InvalidAuthzid;
+                break;
+            }
+            case CoreProtocol::InvalidMech: {
+                r = InvalidMech;
+                break;
+            }
+            case CoreProtocol::MalformedRequest: {
+                r = MalformedRequest;
+                break;
+            }
+            case CoreProtocol::MechTooWeak: {
+                r = MechTooWeak;
+                break;
+            }
+            case CoreProtocol::NotAuthorized: {
+                r = NotAuthorized;
+                break;
+            }
+            case CoreProtocol::TemporaryAuthFailure: {
+                r = TemporaryAuthFailure;
+                break;
+            }
             }
         }
         reset();
-        d->errCond = r;
+        d->errCond     = r;
         d->errLangText = d->client.errLangText;
         error(ErrAuth);
-    }
-    else if(c == CoreProtocol::ErrPlain) {
+    } else if (c == CoreProtocol::ErrPlain) {
         reset();
         d->errCond = NoMech;
         error(ErrAuth);
-    }
-    else if(c == CoreProtocol::ErrBind) {
+    } else if (c == CoreProtocol::ErrBind) {
         int r = -1;
-        if(d->client.errCond == CoreProtocol::BindBadRequest) {
+        if (d->client.errCond == CoreProtocol::BindBadRequest) {
             // should NOT happen
-        }
-        else if(d->client.errCond == CoreProtocol::BindNotAllowed) {
+        } else if (d->client.errCond == CoreProtocol::BindNotAllowed) {
             r = BindNotAllowed;
-        }
-        else if(d->client.errCond == CoreProtocol::BindConflict) {
+        } else if (d->client.errCond == CoreProtocol::BindConflict) {
             r = BindConflict;
         }
 
-        if(r != -1) {
+        if (r != -1) {
             reset();
             d->errCond = r;
             error(ErrBind);
-        }
-        else {
+        } else {
             reset();
             error(ErrProtocol);
         }
     }
 }
 
-bool ClientStream::isResumed() const
-{
-    return d->client.sm.isResumed();
-}
+bool ClientStream::isResumed() const { return d->client.sm.isResumed(); }
 
-void ClientStream::setSMEnabled(bool e)
-{
-    d->client.sm.state().setEnabled(e);
-}
+void ClientStream::setSMEnabled(bool e) { d->client.sm.state().setEnabled(e); }
 
 void ClientStream::setTimer(int secs)
 {
     d->timeout_timer.setSingleShot(true);
     d->timeout_timer.start(secs * 1000);
-    d->client.notify &= ~ CoreProtocol::NTimeout;
+    d->client.notify &= ~CoreProtocol::NTimeout;
 }
 
-QStringList ClientStream::hosts() const
-{
-    return d->client.hosts;
-}
+QStringList ClientStream::hosts() const { return d->client.hosts; }
 
-const StreamFeatures &ClientStream::streamFeatures() const
-{
-    return d->client.features;
-}
+const StreamFeatures &ClientStream::streamFeatures() const { return d->client.features; }
 
-QList<QDomElement> ClientStream::unhandledFeatures() const
-{
-    return d->client.unhandledFeatures;
-}
+QList<QDomElement> ClientStream::unhandledFeatures() const { return d->client.unhandledFeatures; }
 
 //----------------------------------------------------------------------------
 // Debug
 //----------------------------------------------------------------------------
-Debug::~Debug()
-{
-}
+Debug::~Debug() {}
 
 #ifdef XMPP_TEST
-TD::TD()
-{
-}
+TD::TD() {}
 
-TD::~TD()
-{
-}
+TD::~TD() {}
 
 void TD::msg(const QString &s)
 {
-    if(debug_ptr)
+    if (debug_ptr)
         debug_ptr->msg(s);
 }
 
 void TD::outgoingTag(const QString &s)
 {
-    if(debug_ptr)
+    if (debug_ptr)
         debug_ptr->outgoingTag(s);
 }
 
 void TD::incomingTag(const QString &s)
 {
-    if(debug_ptr)
+    if (debug_ptr)
         debug_ptr->incomingTag(s);
 }
 
 void TD::outgoingXml(const QDomElement &e)
 {
-    if(debug_ptr)
+    if (debug_ptr)
         debug_ptr->outgoingXml(e);
 }
 
 void TD::incomingXml(const QDomElement &e)
 {
-    if(debug_ptr)
+    if (debug_ptr)
         debug_ptr->incomingXml(e);
 }
 #endif
diff --git a/src/xmpp/xmpp-core/td.h b/src/xmpp/xmpp-core/td.h
index 192dc01b..be3c54e0 100644
--- a/src/xmpp/xmpp-core/td.h
+++ b/src/xmpp/xmpp-core/td.h
@@ -3,8 +3,7 @@
 
 #include <qdom.h>
 
-class TD
-{
+class TD {
 public:
     TD();
     ~TD();
diff --git a/src/xmpp/xmpp-core/tlshandler.cpp b/src/xmpp/xmpp-core/tlshandler.cpp
index 2a5fe27c..7bc311ec 100644
--- a/src/xmpp/xmpp-core/tlshandler.cpp
+++ b/src/xmpp/xmpp-core/tlshandler.cpp
@@ -32,65 +32,51 @@ using namespace QCA;
 static QByteArray ipaddr_str2bin(const QString &str)
 {
     // ipv6
-    if(str.contains(':'))
-    {
+    if (str.contains(':')) {
         QStringList parts = str.split(':', QString::KeepEmptyParts);
-        if(parts.count() < 3 || parts.count() > 8)
+        if (parts.count() < 3 || parts.count() > 8)
             return QByteArray();
 
         QByteArray ipv6(16, 0);
-        int at = 16;
-        int fill = 9 - parts.count();
-        for(int n = parts.count() - 1; n >= 0; --n)
-        {
-            if(at <= 0)
+        int        at   = 16;
+        int        fill = 9 - parts.count();
+        for (int n = parts.count() - 1; n >= 0; --n) {
+            if (at <= 0)
                 return QByteArray();
 
-            if(parts[n].isEmpty())
-            {
-                if(n == parts.count() - 1)
-                {
-                    if(!parts[n - 1].isEmpty())
+            if (parts[n].isEmpty()) {
+                if (n == parts.count() - 1) {
+                    if (!parts[n - 1].isEmpty())
                         return QByteArray();
                     ipv6[--at] = 0;
                     ipv6[--at] = 0;
-                }
-                else if(n == 0)
-                {
-                    if(!parts[n + 1].isEmpty())
+                } else if (n == 0) {
+                    if (!parts[n + 1].isEmpty())
                         return QByteArray();
                     ipv6[--at] = 0;
                     ipv6[--at] = 0;
-                }
-                else
-                {
-                    for(int i = 0; i < fill; ++i)
-                    {
-                        if(at <= 0)
+                } else {
+                    for (int i = 0; i < fill; ++i) {
+                        if (at <= 0)
                             return QByteArray();
                         ipv6[--at] = 0;
                         ipv6[--at] = 0;
                     }
                 }
-            }
-            else
-            {
-                if(parts[n].indexOf('.') == -1)
-                {
+            } else {
+                if (parts[n].indexOf('.') == -1) {
                     bool ok;
-                    int x = parts[n].toInt(&ok, 16);
-                    if(!ok || x < 0 || x > 0xffff)
+                    int  x = parts[n].toInt(&ok, 16);
+                    if (!ok || x < 0 || x > 0xffff)
                         return QByteArray();
                     ipv6[--at] = x & 0xff;
                     ipv6[--at] = (x >> 8) & 0xff;
-                }
-                else
-                {
-                    if(n != parts.count() - 1)
+                } else {
+                    if (n != parts.count() - 1)
                         return QByteArray();
 
                     QByteArray buf = ipaddr_str2bin(parts[n]);
-                    if(buf.isEmpty())
+                    if (buf.isEmpty())
                         return QByteArray();
 
                     ipv6[--at] = buf[3];
@@ -103,25 +89,21 @@ static QByteArray ipaddr_str2bin(const QString &str)
         }
 
         return ipv6;
-    }
-    else if(str.contains('.'))
-    {
+    } else if (str.contains('.')) {
         QStringList parts = str.split('.', QString::KeepEmptyParts);
-        if(parts.count() != 4)
+        if (parts.count() != 4)
             return QByteArray();
 
         QByteArray out(4, 0);
-        for(int n = 0; n < 4; ++n)
-        {
+        for (int n = 0; n < 4; ++n) {
             bool ok;
-            int x = parts[n].toInt(&ok);
-            if(!ok || x < 0 || x > 0xff)
+            int  x = parts[n].toInt(&ok);
+            if (!ok || x < 0 || x > 0xff)
                 return QByteArray();
             out[n] = (unsigned char)x;
         }
         return out;
-    }
-    else
+    } else
         return QByteArray();
 }
 
@@ -134,47 +116,45 @@ static bool cert_match_domain(const QString &certname, const QString &acedomain)
 
     // KSSL strips trailing dot, even though the dot is probably not
     //   legal anyway. (compat)
-    if(name.length() > 0 && name[name.length()-1] == '.')
-        name.truncate(name.length()-1);
+    if (name.length() > 0 && name[name.length() - 1] == '.')
+        name.truncate(name.length() - 1);
 
     // after our compatibility modifications, make sure the name isn't
     //   empty.
-    if(name.isEmpty())
+    if (name.isEmpty())
         return false;
 
     // lowercase, for later performing case insensitive matching
     name = name.toLower();
 
     // ensure the cert field contains valid characters only
-    if(QRegExp("[^a-z0-9\\.\\*\\-]").indexIn(name) >= 0)
+    if (QRegExp("[^a-z0-9\\.\\*\\-]").indexIn(name) >= 0)
         return false;
 
     // hack into parts, and require at least 1 part
     QStringList parts_name = name.split('.', QString::KeepEmptyParts);
-    if(parts_name.isEmpty())
+    if (parts_name.isEmpty())
         return false;
 
     // KSSL checks to make sure the last two parts don't contain
     //   wildcards.  I don't know where it is written that this
     //   should be done, but for compat sake we'll do it.
-    if(parts_name[parts_name.count()-1].contains('*'))
+    if (parts_name[parts_name.count() - 1].contains('*'))
         return false;
-    if(parts_name.count() >= 2 && parts_name[parts_name.count()-2].contains('*'))
+    if (parts_name.count() >= 2 && parts_name[parts_name.count() - 2].contains('*'))
         return false;
 
     QStringList parts_compare = acedomain.split('.', QString::KeepEmptyParts);
-    if(parts_compare.isEmpty())
+    if (parts_compare.isEmpty())
         return false;
 
     // don't allow empty parts
-    foreach(const QString &s, parts_name)
-    {
-        if(s.isEmpty())
+    foreach (const QString &s, parts_name) {
+        if (s.isEmpty())
             return false;
     }
-    foreach(const QString &s, parts_compare)
-    {
-        if(s.isEmpty())
+    foreach (const QString &s, parts_compare) {
+        if (s.isEmpty())
             return false;
     }
 
@@ -189,16 +169,15 @@ static bool cert_match_domain(const QString &certname, const QString &acedomain)
     //   they reside in.
     //
     // First, make sure the number of parts is equal.
-    if(parts_name.count() != parts_compare.count())
+    if (parts_name.count() != parts_compare.count())
         return false;
 
     // Now compare each part
-    for(int n = 0; n < parts_name.count(); ++n)
-    {
+    for (int n = 0; n < parts_name.count(); ++n) {
         const QString &p1 = parts_name[n];
         const QString &p2 = parts_compare[n];
 
-        if(!QRegExp(p1, Qt::CaseSensitive, QRegExp::Wildcard).exactMatch(p2))
+        if (!QRegExp(p1, Qt::CaseSensitive, QRegExp::Wildcard).exactMatch(p2))
             return false;
     }
 
@@ -215,21 +194,21 @@ static bool cert_match_ipaddress(const QString &certname, const QByteArray &ipad
     // KSSL accepts IPv6 in brackets, which is usually done for URIs, but
     //   IMO sounds very strange for a certificate.  We'll follow this
     //   behavior anyway. (compat)
-    if(name.length() >= 2 && name[0] == '[' && name[name.length()-1] == ']')
+    if (name.length() >= 2 && name[0] == '[' && name[name.length() - 1] == ']')
         name = name.mid(1, name.length() - 2); // chop off brackets
 
     // after our compatibility modifications, make sure the name isn't
     //   empty.
-    if(name.isEmpty())
+    if (name.isEmpty())
         return false;
 
     // convert to binary form
     QByteArray addr = ipaddr_str2bin(name);
-    if(addr.isEmpty())
+    if (addr.isEmpty())
         return false;
 
     // not the same?
-    if(addr != ipaddress)
+    if (addr != ipaddress)
         return false;
 
     return true;
@@ -238,30 +217,26 @@ static bool cert_match_ipaddress(const QString &certname, const QByteArray &ipad
 static bool matchesHostName(const QCA::Certificate &cert, const QString &host)
 {
     QByteArray ipaddr = ipaddr_str2bin(host);
-    if(!ipaddr.isEmpty()) // ip address
+    if (!ipaddr.isEmpty()) // ip address
     {
         // check iPAddress
-        foreach(const QString &s, cert.subjectInfo().values(IPAddress))
-        {
-            if(cert_match_ipaddress(s, ipaddr))
+        foreach (const QString &s, cert.subjectInfo().values(IPAddress)) {
+            if (cert_match_ipaddress(s, ipaddr))
                 return true;
         }
 
         // check dNSName
-        foreach(const QString &s, cert.subjectInfo().values(DNS))
-        {
-            if(cert_match_ipaddress(s, ipaddr))
+        foreach (const QString &s, cert.subjectInfo().values(DNS)) {
+            if (cert_match_ipaddress(s, ipaddr))
                 return true;
         }
 
         // check commonName
-        foreach(const QString &s, cert.subjectInfo().values(CommonName))
-        {
-            if(cert_match_ipaddress(s, ipaddr))
+        foreach (const QString &s, cert.subjectInfo().values(CommonName)) {
+            if (cert_match_ipaddress(s, ipaddr))
                 return true;
         }
-    }
-    else // domain
+    } else // domain
     {
         // lowercase
         QString name = host.toLower();
@@ -270,28 +245,26 @@ static bool matchesHostName(const QCA::Certificate &cert, const QString &host)
         name = QString::fromLatin1(QUrl::toAce(name));
 
         // don't allow wildcards in the comparison host
-        if(name.contains('*'))
+        if (name.contains('*'))
             return false;
 
         // strip out trailing dot
-        if(name.length() > 0 && name[name.length()-1] == '.')
-            name.truncate(name.length()-1);
+        if (name.length() > 0 && name[name.length() - 1] == '.')
+            name.truncate(name.length() - 1);
 
         // make sure the name is not empty after our modifications
-        if(name.isEmpty())
+        if (name.isEmpty())
             return false;
 
         // check dNSName
-        foreach(const QString &s, cert.subjectInfo().values(DNS))
-        {
-            if(cert_match_domain(s, name))
+        foreach (const QString &s, cert.subjectInfo().values(DNS)) {
+            if (cert_match_domain(s, name))
                 return true;
         }
 
         // check commonName
-        foreach(const QString &s, cert.subjectInfo().values(CommonName))
-        {
-            if(cert_match_domain(s, name))
+        foreach (const QString &s, cert.subjectInfo().values(CommonName)) {
+            if (cert_match_domain(s, name))
                 return true;
         }
     }
@@ -302,58 +275,43 @@ static bool matchesHostName(const QCA::Certificate &cert, const QString &host)
 //----------------------------------------------------------------------------
 // TLSHandler
 //----------------------------------------------------------------------------
-TLSHandler::TLSHandler(QObject *parent)
-:QObject(parent)
-{
-}
+TLSHandler::TLSHandler(QObject *parent) : QObject(parent) {}
 
-TLSHandler::~TLSHandler()
-{
-}
+TLSHandler::~TLSHandler() {}
 
 //----------------------------------------------------------------------------
 // QCATLSHandler
 //----------------------------------------------------------------------------
-class QCATLSHandler::Private
-{
+class QCATLSHandler::Private {
 public:
     QCA::TLS *tls;
-    int state, err;
-    QString host;
-    bool internalHostMatch;
+    int       state, err;
+    QString   host;
+    bool      internalHostMatch;
 };
 
-QCATLSHandler::QCATLSHandler(QCA::TLS *parent)
-:TLSHandler(parent)
+QCATLSHandler::QCATLSHandler(QCA::TLS *parent) : TLSHandler(parent)
 {
-    d = new Private;
+    d      = new Private;
     d->tls = parent;
     connect(d->tls, SIGNAL(handshaken()), SLOT(tls_handshaken()));
     connect(d->tls, SIGNAL(readyRead()), SLOT(tls_readyRead()));
     connect(d->tls, SIGNAL(readyReadOutgoing()), SLOT(tls_readyReadOutgoing()));
     connect(d->tls, SIGNAL(closed()), SLOT(tls_closed()));
     connect(d->tls, SIGNAL(error()), SLOT(tls_error()));
-    d->state = 0;
-    d->err = -1;
+    d->state             = 0;
+    d->err               = -1;
     d->internalHostMatch = false;
 }
 
-QCATLSHandler::~QCATLSHandler()
-{
-    delete d;
-}
+QCATLSHandler::~QCATLSHandler() { delete d; }
 
-void QCATLSHandler::setXMPPCertCheck(bool enable)
-{
-    d->internalHostMatch = enable;
-}
-bool QCATLSHandler::XMPPCertCheck()
-{
-    return d->internalHostMatch;
-}
+void QCATLSHandler::setXMPPCertCheck(bool enable) { d->internalHostMatch = enable; }
+bool QCATLSHandler::XMPPCertCheck() { return d->internalHostMatch; }
 bool QCATLSHandler::certMatchesHostname()
 {
-    if (!d->internalHostMatch) return false;
+    if (!d->internalHostMatch)
+        return false;
     QCA::CertificateChain peerCert = d->tls->peerCertificateChain();
 
     if (matchesHostName(peerCert.primary(), d->host))
@@ -361,7 +319,7 @@ bool QCATLSHandler::certMatchesHostname()
 
     Jid host(d->host);
 
-    foreach( const QString &idOnXmppAddr, peerCert.primary().subjectInfo().values(QCA::XMPP) ) {
+    foreach (const QString &idOnXmppAddr, peerCert.primary().subjectInfo().values(QCA::XMPP)) {
         if (host.compare(Jid(idOnXmppAddr)))
             return true;
     }
@@ -369,15 +327,9 @@ bool QCATLSHandler::certMatchesHostname()
     return false;
 }
 
-QCA::TLS *QCATLSHandler::tls() const
-{
-    return d->tls;
-}
+QCA::TLS *QCATLSHandler::tls() const { return d->tls; }
 
-int QCATLSHandler::tlsError() const
-{
-    return d->err;
-}
+int QCATLSHandler::tlsError() const { return d->err; }
 
 void QCATLSHandler::reset()
 {
@@ -388,24 +340,19 @@ void QCATLSHandler::reset()
 void QCATLSHandler::startClient(const QString &host)
 {
     d->state = 0;
-    d->err = -1;
-    if (d->internalHostMatch) d->host = host;
+    d->err   = -1;
+    if (d->internalHostMatch)
+        d->host = host;
     d->tls->startClient(d->internalHostMatch ? QString() : host);
 }
 
-void QCATLSHandler::write(const QByteArray &a)
-{
-    d->tls->write(a);
-}
+void QCATLSHandler::write(const QByteArray &a) { d->tls->write(a); }
 
-void QCATLSHandler::writeIncoming(const QByteArray &a)
-{
-    d->tls->writeIncoming(a);
-}
+void QCATLSHandler::writeIncoming(const QByteArray &a) { d->tls->writeIncoming(a); }
 
 void QCATLSHandler::continueAfterHandshake()
 {
-    if(d->state == 2) {
+    if (d->state == 2) {
         d->tls->continueAfterStep();
         success();
         d->state = 3;
@@ -418,26 +365,20 @@ void QCATLSHandler::tls_handshaken()
     tlsHandshaken();
 }
 
-void QCATLSHandler::tls_readyRead()
-{
-    readyRead(d->tls->read());
-}
+void QCATLSHandler::tls_readyRead() { readyRead(d->tls->read()); }
 
 void QCATLSHandler::tls_readyReadOutgoing()
 {
-    int plainBytes;
+    int        plainBytes;
     QByteArray buf = d->tls->readOutgoing(&plainBytes);
     readyReadOutgoing(buf, plainBytes);
 }
 
-void QCATLSHandler::tls_closed()
-{
-    closed();
-}
+void QCATLSHandler::tls_closed() { closed(); }
 
 void QCATLSHandler::tls_error()
 {
-    d->err = d->tls->errorCode();
+    d->err   = d->tls->errorCode();
     d->state = 0;
     fail();
 }
diff --git a/src/xmpp/xmpp-core/xmlprotocol.cpp b/src/xmpp/xmpp-core/xmlprotocol.cpp
index 32e6aa85..43761085 100644
--- a/src/xmpp/xmpp-core/xmlprotocol.cpp
+++ b/src/xmpp/xmpp-core/xmlprotocol.cpp
@@ -37,33 +37,33 @@ static QDomElement stripExtraNS(const QDomElement &e)
 {
     // find closest parent with a namespace
     QDomNode par = e.parentNode();
-    while(!par.isNull() && par.namespaceURI().isNull())
+    while (!par.isNull() && par.namespaceURI().isNull())
         par = par.parentNode();
     bool noShowNS = false;
-    if(!par.isNull() && par.namespaceURI() == e.namespaceURI())
+    if (!par.isNull() && par.namespaceURI() == e.namespaceURI())
         noShowNS = true;
 
     // build qName (prefix:localName)
     QString qName;
-    if(!e.prefix().isEmpty())
+    if (!e.prefix().isEmpty())
         qName = e.prefix() + ':' + e.localName();
     else
         qName = e.tagName();
 
     QDomElement i;
-    int x;
-    if(noShowNS)
+    int         x;
+    if (noShowNS)
         i = e.ownerDocument().createElement(qName);
     else
         i = e.ownerDocument().createElementNS(e.namespaceURI(), qName);
 
     // copy attributes
     QDomNamedNodeMap al = e.attributes();
-    for(x = 0; x < al.count(); ++x) {
+    for (x = 0; x < al.count(); ++x) {
         QDomAttr a = al.item(x).cloneNode().toAttr();
 
         // don't show xml namespace
-        if(a.namespaceURI() == NS_XML)
+        if (a.namespaceURI() == NS_XML)
             i.setAttribute(QString("xml:") + a.name(), a.value());
         else
             i.setAttributeNodeNS(a);
@@ -71,9 +71,9 @@ static QDomElement stripExtraNS(const QDomElement &e)
 
     // copy children
     QDomNodeList nl = e.childNodes();
-    for(x = 0; x < nl.count(); ++x) {
+    for (x = 0; x < nl.count(); ++x) {
         QDomNode n = nl.item(x);
-        if(n.isElement())
+        if (n.isElement())
             i.appendChild(stripExtraNS(n.toElement()));
         else
             i.appendChild(n.cloneNode());
@@ -108,9 +108,9 @@ static QString xmlToString(const QDomElement &e, const QString &fakeNS, const QS
         fake.firstChild().save(ts, 0);
     }
     // 'clip' means to remove any unwanted (and unneeded) characters, such as a trailing newline
-    if(clip) {
+    if (clip) {
         int n = out.lastIndexOf('>');
-        out.truncate(n+1);
+        out.truncate(n + 1);
     }
     return out;
 }
@@ -139,14 +139,14 @@ static void createRootXmlTags(const QDomElement &root, QString *xmlHeader, QStri
     }
 
     // parse the tags out
-    int n = str.indexOf('<');
+    int n  = str.indexOf('<');
     int n2 = str.indexOf('>', n);
     ++n2;
-    *tagOpen = str.mid(n, n2-n);
-    n2 = str.lastIndexOf('>');
-    n = str.lastIndexOf('<');
+    *tagOpen = str.mid(n, n2 - n);
+    n2       = str.lastIndexOf('>');
+    n        = str.lastIndexOf('<');
     ++n2;
-    *tagClose = str.mid(n, n2-n);
+    *tagClose = str.mid(n, n2 - n);
 
     // generate a nice xml processing header
     *xmlHeader = "<?xml version=\"1.0\"?>";
@@ -156,21 +156,13 @@ static void createRootXmlTags(const QDomElement &root, QString *xmlHeader, QStri
 // [2] Char ::= #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] | [#x10000-#x10FFFF]
 static inline bool validChar(const quint32 ch)
 {
-    return ch == 0x9 || ch == 0xA || ch == 0xD
-            || (ch >= 0x20 && ch <= 0xD7FF)
-            || (ch >= 0xE000 && ch <= 0xFFFD)
-            || (ch >= 0x10000 && ch <= 0x10FFFF);
+    return ch == 0x9 || ch == 0xA || ch == 0xD || (ch >= 0x20 && ch <= 0xD7FF) || (ch >= 0xE000 && ch <= 0xFFFD)
+        || (ch >= 0x10000 && ch <= 0x10FFFF);
 }
 
-static inline bool lowSurrogate(const quint32 ch)
-{
-    return  ch >= 0xDC00 && ch <= 0xDFFF;
-}
+static inline bool lowSurrogate(const quint32 ch) { return ch >= 0xDC00 && ch <= 0xDFFF; }
 
-static inline bool highSurrogate(const quint32 ch)
-{
-    return  ch >= 0xD800 && ch <= 0xDBFF;
-}
+static inline bool highSurrogate(const quint32 ch) { return ch >= 0xD800 && ch <= 0xDBFF; }
 
 // force encoding of '>'.  this function is needed for XMPP-Core, which
 //  requires the '>' character to be encoded as "&gt;" even though this is
@@ -180,63 +172,53 @@ static inline bool highSurrogate(const quint32 ch)
 static QString sanitizeForStream(const QString &in)
 {
     QString out;
-    bool intag = false;
-    bool inquote = false;
-    QChar quotechar;
-    int inlength = in.length();
-    for(int n = 0; n < inlength; ++n)
-    {
-        QChar c = in[n];
-        bool escape = false;
-        if(c == '<')
-        {
+    bool    intag   = false;
+    bool    inquote = false;
+    QChar   quotechar;
+    int     inlength = in.length();
+    for (int n = 0; n < inlength; ++n) {
+        QChar c      = in[n];
+        bool  escape = false;
+        if (c == '<') {
             intag = true;
-        }
-        else if(c == '>')
-        {
-            if(inquote) {
+        } else if (c == '>') {
+            if (inquote) {
                 escape = true;
-            } else if(!intag) {
+            } else if (!intag) {
                 escape = true;
             } else {
                 intag = false;
             }
-        }
-        else if(c == '\'' || c == '\"')
-        {
-            if(intag)
-            {
-                if(!inquote)
-                {
-                    inquote = true;
+        } else if (c == '\'' || c == '\"') {
+            if (intag) {
+                if (!inquote) {
+                    inquote   = true;
                     quotechar = c;
-                }
-                else
-                {
-                    if(quotechar == c) {
+                } else {
+                    if (quotechar == c) {
                         inquote = false;
                     }
                 }
             }
         }
 
-        if(escape) {
+        if (escape) {
             out += "&gt;";
-         } else {
+        } else {
             // don't silently drop invalid chars in element or attribute names,
             // because that's something that should not happen.
             if (intag && (!inquote)) {
                 out += c;
-            } else if (validChar(c.unicode()))  {
+            } else if (validChar(c.unicode())) {
                 out += c;
-            } else if (highSurrogate(c.unicode()) && (n+1 < inlength) && lowSurrogate(in[n+1].unicode())) {
-                //uint unicode = (c.unicode() & 0x3FF) << 10 | in[n+1].unicode() & 0x3FF + 0x10000;
+            } else if (highSurrogate(c.unicode()) && (n + 1 < inlength) && lowSurrogate(in[n + 1].unicode())) {
+                // uint unicode = (c.unicode() & 0x3FF) << 10 | in[n+1].unicode() & 0x3FF + 0x10000;
                 // we don't need to recheck this, because 0x10000 <= unicode <= 0x100000 is always true
                 out += c;
-                out += in[n+1];
+                out += in[n + 1];
                 ++n;
             } else {
-                qDebug("Dropping invalid XML char U+%04x",c.unicode());
+                qDebug("Dropping invalid XML char U+%04x", c.unicode());
             }
         }
     }
@@ -246,39 +228,26 @@ static QString sanitizeForStream(const QString &in)
 //----------------------------------------------------------------------------
 // Protocol
 //----------------------------------------------------------------------------
-XmlProtocol::TransferItem::TransferItem()
-{
-}
+XmlProtocol::TransferItem::TransferItem() {}
 
-XmlProtocol::TransferItem::TransferItem(const QString &_str, bool sent, bool external)
-    : isSent(sent)
-    , isString(true)
-    , isExternal(external)
-    , str(_str)
+XmlProtocol::TransferItem::TransferItem(const QString &_str, bool sent, bool external) :
+    isSent(sent), isString(true), isExternal(external), str(_str)
 {
 }
 
-XmlProtocol::TransferItem::TransferItem(const QDomElement &_elem, bool sent, bool external)
-    : isSent(sent)
-    , isString(false)
-    , isExternal(external)
-    , elem(_elem)
+XmlProtocol::TransferItem::TransferItem(const QDomElement &_elem, bool sent, bool external) :
+    isSent(sent), isString(false), isExternal(external), elem(_elem)
 {
 }
 
-XmlProtocol::XmlProtocol()
-{
-    init();
-}
+XmlProtocol::XmlProtocol() { init(); }
 
-XmlProtocol::~XmlProtocol()
-{
-}
+XmlProtocol::~XmlProtocol() {}
 
 void XmlProtocol::init()
 {
-    incoming = false;
-    peerClosed = false;
+    incoming     = false;
+    peerClosed   = false;
     closeWritten = false;
 }
 
@@ -286,9 +255,9 @@ void XmlProtocol::reset()
 {
     init();
 
-    elem = QDomElement();
-    elemDoc = QDomDocument();
-    tagOpen = QString();
+    elem     = QDomElement();
+    elemDoc  = QDomDocument();
+    tagOpen  = QString();
     tagClose = QString();
     xml.reset();
     outDataNormal.resize(0);
@@ -298,10 +267,7 @@ void XmlProtocol::reset()
     transferItemList.clear();
 }
 
-void XmlProtocol::addIncomingData(const QByteArray &a)
-{
-    xml.appendData(a);
-}
+void XmlProtocol::addIncomingData(const QByteArray &a) { xml.appendData(a); }
 
 QByteArray XmlProtocol::takeOutgoingData()
 {
@@ -328,60 +294,57 @@ bool XmlProtocol::processStep()
     notify = 0;
     transferItemList.clear();
 
-    if(state != Closing && (state == RecvOpen || stepAdvancesParser())) {
+    if (state != Closing && (state == RecvOpen || stepAdvancesParser())) {
         // if we get here, then it's because we're in some step that advances the parser
         pe = xml.readNext();
-        if(!pe.isNull()) {
+        if (!pe.isNull()) {
             // note: error/close events should be handled for ALL steps, so do them here
-            switch(pe.type()) {
-                case Parser::Event::DocumentOpen: {
-                    transferItemList += TransferItem(pe.actualString(), false);
+            switch (pe.type()) {
+            case Parser::Event::DocumentOpen: {
+                transferItemList += TransferItem(pe.actualString(), false);
 
-                    //stringRecv(pe.actualString());
-                    break;
-                }
-                case Parser::Event::DocumentClose: {
-                    transferItemList += TransferItem(pe.actualString(), false);
-
-                    //stringRecv(pe.actualString());
-                    if(incoming) {
-                        sendTagClose();
-                        event = ESend;
-                        peerClosed = true;
-                        state = Closing;
-                    }
-                    else {
-                        event = EPeerClosed;
-                    }
-                    return true;
+                // stringRecv(pe.actualString());
+                break;
+            }
+            case Parser::Event::DocumentClose: {
+                transferItemList += TransferItem(pe.actualString(), false);
+
+                // stringRecv(pe.actualString());
+                if (incoming) {
+                    sendTagClose();
+                    event      = ESend;
+                    peerClosed = true;
+                    state      = Closing;
+                } else {
+                    event = EPeerClosed;
                 }
-                case Parser::Event::Element: {
-                    QDomElement e = elemDoc.importNode(pe.element(),true).toElement();
-                    transferItemList += TransferItem(e, false);
+                return true;
+            }
+            case Parser::Event::Element: {
+                QDomElement e = elemDoc.importNode(pe.element(), true).toElement();
+                transferItemList += TransferItem(e, false);
 
-                    //elementRecv(pe.element());
-                    break;
-                }
-                case Parser::Event::Error: {
-                    if(incoming) {
-                        // If we get a parse error during the initial element exchange,
-                        // flip immediately into 'open' mode so that we can report an error.
-                        if(state == RecvOpen) {
-                            sendTagOpen();
-                            state = Open;
-                        }
-                        return handleError();
-                    }
-                    else {
-                        event = EError;
-                        errorCode = ErrParse;
-                        return true;
+                // elementRecv(pe.element());
+                break;
+            }
+            case Parser::Event::Error: {
+                if (incoming) {
+                    // If we get a parse error during the initial element exchange,
+                    // flip immediately into 'open' mode so that we can report an error.
+                    if (state == RecvOpen) {
+                        sendTagOpen();
+                        state = Open;
                     }
+                    return handleError();
+                } else {
+                    event     = EError;
+                    errorCode = ErrParse;
+                    return true;
                 }
             }
-        }
-        else {
-            if(state == RecvOpen || stepRequiresElement()) {
+            }
+        } else {
+            if (state == RecvOpen || stepRequiresElement()) {
                 need = NNotify;
                 notify |= NRecv;
                 return false;
@@ -392,14 +355,11 @@ bool XmlProtocol::processStep()
     return baseStep(pe);
 }
 
-QString XmlProtocol::xmlEncoding() const
-{
-    return xml.encoding();
-}
+QString XmlProtocol::xmlEncoding() const { return xml.encoding(); }
 
 QString XmlProtocol::elementToString(const QDomElement &e, bool clip)
 {
-    if(elem.isNull())
+    if (elem.isNull())
         elem = elemDoc.importNode(docElement(), true).toElement();
 
     // Determine the appropriate 'fakeNS' to use
@@ -407,29 +367,28 @@ QString XmlProtocol::elementToString(const QDomElement &e, bool clip)
 
     // first, check root namespace
     QString pre = e.prefix();
-    if(pre.isNull())
+    if (pre.isNull())
         pre = "";
-    if(pre == elem.prefix()) {
+    if (pre == elem.prefix()) {
         ns = elem.namespaceURI();
-    }
-    else {
+    } else {
         // scan the root attributes for 'xmlns' (oh joyous hacks)
         QDomNamedNodeMap al = elem.attributes();
-        int n;
-        for(n = 0; n < al.count(); ++n) {
+        int              n;
+        for (n = 0; n < al.count(); ++n) {
             QDomAttr a = al.item(n).toAttr();
-            QString s = a.name();
-            int x = s.indexOf(':');
-            if(x != -1)
-                s = s.mid(x+1);
+            QString  s = a.name();
+            int      x = s.indexOf(':');
+            if (x != -1)
+                s = s.mid(x + 1);
             else
                 s = "";
-            if(pre == s) {
+            if (pre == s) {
                 ns = a.value();
                 break;
             }
         }
-        if(n >= al.count()) {
+        if (n >= al.count()) {
             // if we get here, then no appropriate ns was found.  use root then..
             ns = elem.namespaceURI();
         }
@@ -437,7 +396,7 @@ QString XmlProtocol::elementToString(const QDomElement &e, bool clip)
 
     // build qName
     QString qn;
-    if(!elem.prefix().isEmpty())
+    if (!elem.prefix().isEmpty())
         qn = elem.prefix() + ':';
     qn += elem.localName();
 
@@ -479,13 +438,13 @@ void XmlProtocol::elementRecv(const QDomElement &)
 void XmlProtocol::startConnect()
 {
     incoming = false;
-    state = SendOpen;
+    state    = SendOpen;
 }
 
 void XmlProtocol::startAccept()
 {
     incoming = true;
-    state = RecvOpen;
+    state    = RecvOpen;
 }
 
 bool XmlProtocol::close()
@@ -504,11 +463,11 @@ int XmlProtocol::writeString(const QString &s, int id, bool external)
 
 int XmlProtocol::writeElement(const QDomElement &e, int id, bool external, bool clip, bool urgent)
 {
-    if(e.isNull())
+    if (e.isNull())
         return 0;
     transferItemList += TransferItem(e, true, external);
 
-    //elementSend(e);
+    // elementSend(e);
     QString out = sanitizeForStream(elementToString(e, clip));
     return internalWriteString(out, TrackItem::Custom, id, urgent);
 }
@@ -516,7 +475,7 @@ int XmlProtocol::writeElement(const QDomElement &e, int id, bool external, bool
 QByteArray XmlProtocol::resetStream()
 {
     // reset the state
-    if(incoming)
+    if (incoming)
         state = RecvOpen;
     else
         state = SendOpen;
@@ -531,14 +490,13 @@ int XmlProtocol::internalWriteData(const QByteArray &a, TrackItem::Type t, int i
 {
     TrackItem i;
     i.type = t;
-    i.id = id;
+    i.id   = id;
     i.size = a.size();
 
     if (urgent) {
         trackQueueUrgent += i;
         outDataUrgent += a;
-    }
-    else {
+    } else {
         trackQueueNormal += i;
         outDataNormal += a;
     }
@@ -547,34 +505,32 @@ int XmlProtocol::internalWriteData(const QByteArray &a, TrackItem::Type t, int i
 
 int XmlProtocol::internalWriteString(const QString &s, TrackItem::Type t, int id, bool urgent)
 {
-    QString out=sanitizeForStream(s);
+    QString out = sanitizeForStream(s);
     return internalWriteData(s.toUtf8(), t, id, urgent);
 }
 
 int XmlProtocol::processTrackQueue(QList<TrackItem> &queue, int bytes)
 {
-    for(QList<TrackItem>::Iterator it = queue.begin(); it != queue.end();) {
+    for (QList<TrackItem>::Iterator it = queue.begin(); it != queue.end();) {
         TrackItem &i = *it;
 
         // enough bytes?
-        if(bytes < i.size) {
+        if (bytes < i.size) {
             i.size -= bytes;
             bytes = 0;
             break;
         }
         int type = i.type;
-        int id = i.id;
+        int id   = i.id;
         int size = i.size;
         bytes -= i.size;
         it = queue.erase(it);
 
-        if(type == TrackItem::Raw) {
+        if (type == TrackItem::Raw) {
             // do nothing
-        }
-        else if(type == TrackItem::Close) {
+        } else if (type == TrackItem::Close) {
             closeWritten = true;
-        }
-        else if(type == TrackItem::Custom) {
+        } else if (type == TrackItem::Custom) {
             itemWritten(id, size);
         }
         if (bytes == 0)
@@ -585,7 +541,7 @@ int XmlProtocol::processTrackQueue(QList<TrackItem> &queue, int bytes)
 
 void XmlProtocol::sendTagOpen()
 {
-    if(elem.isNull())
+    if (elem.isNull())
         elem = elemDoc.importNode(docElement(), true).toElement();
 
     QString xmlHeader;
@@ -598,8 +554,8 @@ void XmlProtocol::sendTagOpen()
     transferItemList += TransferItem(xmlHeader, true);
     transferItemList += TransferItem(tagOpen, true);
 
-    //stringSend(xmlHeader);
-    //stringSend(tagOpen);
+    // stringSend(xmlHeader);
+    // stringSend(tagOpen);
     internalWriteString(s, TrackItem::Raw);
 }
 
@@ -607,24 +563,23 @@ void XmlProtocol::sendTagClose()
 {
     transferItemList += TransferItem(tagClose, true);
 
-    //stringSend(tagClose);
+    // stringSend(tagClose);
     internalWriteString(tagClose, TrackItem::Close);
 }
 
 bool XmlProtocol::baseStep(const Parser::Event &pe)
 {
     // Basic
-    if(state == SendOpen) {
+    if (state == SendOpen) {
         sendTagOpen();
         event = ESend;
-        if(incoming)
+        if (incoming)
             state = Open;
         else
             state = RecvOpen;
         return true;
-    }
-    else if(state == RecvOpen) {
-        if(incoming)
+    } else if (state == RecvOpen) {
+        if (incoming)
             state = SendOpen;
         else
             state = Open;
@@ -633,25 +588,23 @@ bool XmlProtocol::baseStep(const Parser::Event &pe)
         handleDocOpen(pe);
         event = ERecvOpen;
         return true;
-    }
-    else if(state == Open) {
+    } else if (state == Open) {
         QDomElement e;
-        if(pe.type() == Parser::Event::Element)
+        if (pe.type() == Parser::Event::Element)
             e = pe.element();
         return doStep(e);
     }
     // Closing
     else {
-        if(closeWritten) {
-            if(peerClosed) {
+        if (closeWritten) {
+            if (peerClosed) {
                 event = EPeerClosed;
                 return true;
-            }
-            else
+            } else
                 return handleCloseFinished();
         }
 
-        need = NNotify;
+        need   = NNotify;
         notify = NSend;
         return false;
     }
@@ -659,11 +612,10 @@ bool XmlProtocol::baseStep(const Parser::Event &pe)
 
 void XmlProtocol::setIncomingAsExternal()
 {
-    for(QList<TransferItem>::Iterator it = transferItemList.begin(); it != transferItemList.end(); ++it) {
+    for (QList<TransferItem>::Iterator it = transferItemList.begin(); it != transferItemList.end(); ++it) {
         TransferItem &i = *it;
         // look for elements received
-        if(!i.isString && !i.isSent)
+        if (!i.isString && !i.isSent)
             i.isExternal = true;
     }
 }
-
diff --git a/src/xmpp/xmpp-core/xmlprotocol.h b/src/xmpp/xmpp-core/xmlprotocol.h
index 2f02a75a..4e061eb7 100644
--- a/src/xmpp/xmpp-core/xmlprotocol.h
+++ b/src/xmpp/xmpp-core/xmlprotocol.h
@@ -29,124 +29,121 @@
 #define NS_XML "http://www.w3.org/XML/1998/namespace"
 
 namespace XMPP {
-    class XmlProtocol : public QObject
-    {
+class XmlProtocol : public QObject {
+public:
+    enum Need {
+        NNotify, // need a data send and/or recv update
+        NCustom = 10
+    };
+    enum Event {
+        EError,          // unrecoverable error, see errorCode for details
+        ESend,           // data needs to be sent, use takeOutgoingData()
+        ERecvOpen,       // breakpoint after root element open tag is received
+        EPeerClosed,     // root element close tag received
+        EClosed,         // finished closing
+        ESMConnTimeout,  // absence of responses to <r/> query
+        ESMResumeFailed, // failed to resume sm session
+        ECustom = 10
+    };
+    enum Error {
+        ErrParse, // there was an error parsing the xml
+        ErrCustom = 10
+    };
+    enum Notify {
+        NSend    = 0x01, // need to know if data has been written
+        NRecv    = 0x02, // need incoming data
+        NTimeout = 0x04  // need to know when time passed
+    };
+
+    XmlProtocol();
+    virtual ~XmlProtocol();
+
+    virtual void reset();
+
+    // byte I/O for the stream
+    void       addIncomingData(const QByteArray &);
+    QByteArray takeOutgoingData();
+    void       outgoingDataWritten(int);
+
+    // advance the state machine
+    bool processStep();
+
+    // set these before returning from a step
+    int need = 0, event = 0, errorCode = 0, notify = 0, timeout_sec = 0;
+
+    inline bool isIncoming() const { return incoming; }
+    QString     xmlEncoding() const;
+    QString     elementToString(const QDomElement &e, bool clip = false);
+
+    class TransferItem {
     public:
-        enum Need {
-            NNotify,      // need a data send and/or recv update
-            NCustom = 10
-        };
-        enum Event {
-            EError,       // unrecoverable error, see errorCode for details
-            ESend,        // data needs to be sent, use takeOutgoingData()
-            ERecvOpen,    // breakpoint after root element open tag is received
-            EPeerClosed,  // root element close tag received
-            EClosed,      // finished closing
-            ESMConnTimeout,  // absence of responses to <r/> query
-            ESMResumeFailed, // failed to resume sm session
-            ECustom = 10
-        };
-        enum Error {
-            ErrParse,     // there was an error parsing the xml
-            ErrCustom = 10
-        };
-        enum Notify {
-            NSend = 0x01, // need to know if data has been written
-            NRecv = 0x02,  // need incoming data
-            NTimeout = 0x04 // need to know when time passed
-        };
-
-        XmlProtocol();
-        virtual ~XmlProtocol();
-
-        virtual void reset();
-
-        // byte I/O for the stream
-        void addIncomingData(const QByteArray &);
-        QByteArray takeOutgoingData();
-        void outgoingDataWritten(int);
-
-        // advance the state machine
-        bool processStep();
-
-        // set these before returning from a step
-        int need = 0, event = 0, errorCode = 0, notify = 0, timeout_sec = 0;
-
-        inline bool isIncoming() const { return incoming; }
-        QString xmlEncoding() const;
-        QString elementToString(const QDomElement &e, bool clip=false);
-
-        class TransferItem
-        {
-        public:
-            TransferItem();
-            TransferItem(const QString &str, bool sent, bool external=false);
-            TransferItem(const QDomElement &elem, bool sent, bool external=false);
-
-            bool isSent; // else, received
-            bool isString; // else, is element
-            bool isExternal; // not owned by protocol
-            QString str;
-            QDomElement elem;
-        };
-        QList<TransferItem> transferItemList;
-        void setIncomingAsExternal();
-
-    protected:
-        virtual QDomElement docElement()=0;
-        virtual void handleDocOpen(const Parser::Event &pe)=0;
-        virtual bool handleError()=0;
-        virtual bool handleCloseFinished()=0;
-        virtual bool stepAdvancesParser() const=0;
-        virtual bool stepRequiresElement() const;
-        virtual bool doStep(const QDomElement &e)=0;
-        virtual void itemWritten(int id, int size);
-
-        // 'debug'
-        virtual void stringSend(const QString &s);
-        virtual void stringRecv(const QString &s);
-        virtual void elementSend(const QDomElement &e);
-        virtual void elementRecv(const QDomElement &e);
-
-        void startConnect();
-        void startAccept();
-        bool close();
-        int writeString(const QString &s, int id, bool external);
-        int writeElement(const QDomElement &e, int id, bool external, bool clip=false, bool urgent = false);
-        QByteArray resetStream();
-
-    private:
-        enum { SendOpen, RecvOpen, Open, Closing };
-        class TrackItem
-        {
-        public:
-            enum Type { Raw, Close, Custom };
-            int type, id, size;
-        };
-
-        bool incoming;
-        QDomDocument elemDoc;
+        TransferItem();
+        TransferItem(const QString &str, bool sent, bool external = false);
+        TransferItem(const QDomElement &elem, bool sent, bool external = false);
+
+        bool        isSent;     // else, received
+        bool        isString;   // else, is element
+        bool        isExternal; // not owned by protocol
+        QString     str;
         QDomElement elem;
-        QString tagOpen;
-        QString tagClose;
-        int state = 0;
-        bool peerClosed;
-        bool closeWritten;
-
-        Parser xml;
-        QByteArray outDataNormal;
-        QByteArray outDataUrgent;
-        QList<TrackItem> trackQueueNormal;
-        QList<TrackItem> trackQueueUrgent;
-
-        void init();
-        int internalWriteData(const QByteArray &a, TrackItem::Type t, int id=-1, bool urgent = false);
-        int internalWriteString(const QString &s, TrackItem::Type t, int id=-1, bool urgent = false);
-        int processTrackQueue(QList<TrackItem> &queue, int bytes);
-        void sendTagOpen();
-        void sendTagClose();
-        bool baseStep(const Parser::Event &pe);
     };
+    QList<TransferItem> transferItemList;
+    void                setIncomingAsExternal();
+
+protected:
+    virtual QDomElement docElement()                           = 0;
+    virtual void        handleDocOpen(const Parser::Event &pe) = 0;
+    virtual bool        handleError()                          = 0;
+    virtual bool        handleCloseFinished()                  = 0;
+    virtual bool        stepAdvancesParser() const             = 0;
+    virtual bool        stepRequiresElement() const;
+    virtual bool        doStep(const QDomElement &e) = 0;
+    virtual void        itemWritten(int id, int size);
+
+    // 'debug'
+    virtual void stringSend(const QString &s);
+    virtual void stringRecv(const QString &s);
+    virtual void elementSend(const QDomElement &e);
+    virtual void elementRecv(const QDomElement &e);
+
+    void       startConnect();
+    void       startAccept();
+    bool       close();
+    int        writeString(const QString &s, int id, bool external);
+    int        writeElement(const QDomElement &e, int id, bool external, bool clip = false, bool urgent = false);
+    QByteArray resetStream();
+
+private:
+    enum { SendOpen, RecvOpen, Open, Closing };
+    class TrackItem {
+    public:
+        enum Type { Raw, Close, Custom };
+        int type, id, size;
+    };
+
+    bool         incoming;
+    QDomDocument elemDoc;
+    QDomElement  elem;
+    QString      tagOpen;
+    QString      tagClose;
+    int          state = 0;
+    bool         peerClosed;
+    bool         closeWritten;
+
+    Parser           xml;
+    QByteArray       outDataNormal;
+    QByteArray       outDataUrgent;
+    QList<TrackItem> trackQueueNormal;
+    QList<TrackItem> trackQueueUrgent;
+
+    void init();
+    int  internalWriteData(const QByteArray &a, TrackItem::Type t, int id = -1, bool urgent = false);
+    int  internalWriteString(const QString &s, TrackItem::Type t, int id = -1, bool urgent = false);
+    int  processTrackQueue(QList<TrackItem> &queue, int bytes);
+    void sendTagOpen();
+    void sendTagClose();
+    bool baseStep(const Parser::Event &pe);
+};
 } // namespace XMPP
 
 #endif // XMLPROTOCOL_H
diff --git a/src/xmpp/xmpp-core/xmpp.h b/src/xmpp/xmpp-core/xmpp.h
index 2bb59c63..834a40ae 100644
--- a/src/xmpp/xmpp-core/xmpp.h
+++ b/src/xmpp/xmpp-core/xmpp.h
@@ -35,199 +35,193 @@
 #include <QtCrypto> // For QCA::SASL::Params
 
 #ifndef CS_XMPP
-    class ByteStream;
+class ByteStream;
 #endif
 
 namespace QCA {
-    class TLS;
+class TLS;
 };
 
 namespace XMPP {
-    // CS_IMPORT_BEGIN cutestuff/bytestream.h
+// CS_IMPORT_BEGIN cutestuff/bytestream.h
 #ifdef CS_XMPP
-    class ByteStream;
+class ByteStream;
 #endif
-    // CS_IMPORT_END
+// CS_IMPORT_END
 
-    class Debug
-    {
-    public:
-        virtual ~Debug();
+class Debug {
+public:
+    virtual ~Debug();
 
-        virtual void msg(const QString &)=0;
-        virtual void outgoingTag(const QString &)=0;
-        virtual void incomingTag(const QString &)=0;
-        virtual void outgoingXml(const QDomElement &)=0;
-        virtual void incomingXml(const QDomElement &)=0;
-    };
+    virtual void msg(const QString &)             = 0;
+    virtual void outgoingTag(const QString &)     = 0;
+    virtual void incomingTag(const QString &)     = 0;
+    virtual void outgoingXml(const QDomElement &) = 0;
+    virtual void incomingXml(const QDomElement &) = 0;
+};
 
-    void setDebug(Debug *);
+void setDebug(Debug *);
 
-    class Connector : public QObject
-    {
-        Q_OBJECT
-    public:
-        Connector(QObject *parent=nullptr);
-        virtual ~Connector();
+class Connector : public QObject {
+    Q_OBJECT
+public:
+    Connector(QObject *parent = nullptr);
+    virtual ~Connector();
 
-        virtual void setOptHostPort(const QString &host, quint16 port)=0;
-        virtual void connectToServer(const QString &server)=0;
-        virtual ByteStream *stream() const=0;
-        virtual void done()=0;
+    virtual void        setOptHostPort(const QString &host, quint16 port) = 0;
+    virtual void        connectToServer(const QString &server)            = 0;
+    virtual ByteStream *stream() const                                    = 0;
+    virtual void        done()                                            = 0;
 
-        bool useSSL() const;
-        bool havePeerAddress() const;
-        QHostAddress peerAddress() const;
-        quint16 peerPort() const;
+    bool         useSSL() const;
+    bool         havePeerAddress() const;
+    QHostAddress peerAddress() const;
+    quint16      peerPort() const;
 
-        virtual QString host() const;
+    virtual QString host() const;
 
-    signals:
-        void connected();
-        void error();
+signals:
+    void connected();
+    void error();
 
-    protected:
-        void setUseSSL(bool b);
-        void setPeerAddressNone();
-        void setPeerAddress(const QHostAddress &addr, quint16 port);
+protected:
+    void setUseSSL(bool b);
+    void setPeerAddressNone();
+    void setPeerAddress(const QHostAddress &addr, quint16 port);
 
-    private:
-        bool ssl; // a flag to start ssl handshake immediately
-        bool haveaddr;
-        QHostAddress addr;
-        quint16 port;
-    };
+private:
+    bool         ssl; // a flag to start ssl handshake immediately
+    bool         haveaddr;
+    QHostAddress addr;
+    quint16      port;
+};
 
-    class AdvancedConnector : public Connector
-    {
-        Q_OBJECT
+class AdvancedConnector : public Connector {
+    Q_OBJECT
+public:
+    enum Error { ErrConnectionRefused, ErrHostNotFound, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth, ErrStream };
+    AdvancedConnector(QObject *parent = nullptr);
+    virtual ~AdvancedConnector();
+
+    class Proxy {
     public:
-        enum Error { ErrConnectionRefused, ErrHostNotFound, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth, ErrStream };
-        AdvancedConnector(QObject *parent=nullptr);
-        virtual ~AdvancedConnector();
-
-        class Proxy
-        {
-        public:
-            enum { None, HttpConnect, HttpPoll, Socks };
-            Proxy() = default;
-            ~Proxy() {}
-
-            int type() const;
-            QString host() const;
-            quint16 port() const;
-            QUrl url() const;
-            QString user() const;
-            QString pass() const;
-            int pollInterval() const;
-
-            void setHttpConnect(const QString &host, quint16 port);
-            void setHttpPoll(const QString &host, quint16 port, const QUrl &url);
-            void setSocks(const QString &host, quint16 port);
-            void setUserPass(const QString &user, const QString &pass);
-            void setPollInterval(int secs);
-
-        private:
-            int t = None;
-            QUrl v_url;
-            QString v_host;
-            quint16 v_port = 0;
-            QString v_user;
-            QString v_pass;
-            int v_poll = 30;
-        };
-
-        void setProxy(const Proxy &proxy);
-        void setOptProbe(bool);
-        void setOptSSL(bool);
-
-        void changePollInterval(int secs);
-
-        void setOptHostPort(const QString &host, quint16 port);
-        void connectToServer(const QString &server);
-        ByteStream *stream() const;
-        void done();
-
-        int errorCode() const;
-
-        virtual QString host() const;
-
-    signals:
-        void srvLookup(const QString &server);
-        void srvResult(bool success);
-        void httpSyncStarted();
-        void httpSyncFinished();
-
-    private slots:
-        void bs_connected();
-        void bs_error(int);
-        void http_syncStarted();
-        void http_syncFinished();
-        void t_timeout();
+        enum { None, HttpConnect, HttpPoll, Socks };
+        Proxy() = default;
+        ~Proxy() {}
+
+        int     type() const;
+        QString host() const;
+        quint16 port() const;
+        QUrl    url() const;
+        QString user() const;
+        QString pass() const;
+        int     pollInterval() const;
+
+        void setHttpConnect(const QString &host, quint16 port);
+        void setHttpPoll(const QString &host, quint16 port, const QUrl &url);
+        void setSocks(const QString &host, quint16 port);
+        void setUserPass(const QString &user, const QString &pass);
+        void setPollInterval(int secs);
 
     private:
-        class Private;
-        Private *d;
-
-        void cleanup();
+        int     t = None;
+        QUrl    v_url;
+        QString v_host;
+        quint16 v_port = 0;
+        QString v_user;
+        QString v_pass;
+        int     v_poll = 30;
     };
 
-    class TLSHandler : public QObject
-    {
-        Q_OBJECT
-    public:
-        TLSHandler(QObject *parent=nullptr);
-        virtual ~TLSHandler();
-
-        virtual void reset()=0;
-        virtual void startClient(const QString &host)=0;
-        virtual void write(const QByteArray &a)=0;
-        virtual void writeIncoming(const QByteArray &a)=0;
-
-    signals:
-        void success();
-        void fail();
-        void closed();
-        void readyRead(const QByteArray &a);
-        void readyReadOutgoing(const QByteArray &a, int plainBytes);
-    };
+    void setProxy(const Proxy &proxy);
+    void setOptProbe(bool);
+    void setOptSSL(bool);
 
-    class QCATLSHandler : public TLSHandler
-    {
-        Q_OBJECT
-    public:
-        QCATLSHandler(QCA::TLS *parent);
-        ~QCATLSHandler();
+    void changePollInterval(int secs);
 
-        QCA::TLS *tls() const;
-        int tlsError() const;
+    void        setOptHostPort(const QString &host, quint16 port);
+    void        connectToServer(const QString &server);
+    ByteStream *stream() const;
+    void        done();
 
-        void setXMPPCertCheck(bool enable);
-        bool XMPPCertCheck();
-        bool certMatchesHostname();
+    int errorCode() const;
 
-        void reset();
-        void startClient(const QString &host);
-        void write(const QByteArray &a);
-        void writeIncoming(const QByteArray &a);
+    virtual QString host() const;
 
-    signals:
-        void tlsHandshaken();
+signals:
+    void srvLookup(const QString &server);
+    void srvResult(bool success);
+    void httpSyncStarted();
+    void httpSyncFinished();
 
-    public slots:
-        void continueAfterHandshake();
+private slots:
+    void bs_connected();
+    void bs_error(int);
+    void http_syncStarted();
+    void http_syncFinished();
+    void t_timeout();
 
-    private slots:
-        void tls_handshaken();
-        void tls_readyRead();
-        void tls_readyReadOutgoing();
-        void tls_closed();
-        void tls_error();
+private:
+    class Private;
+    Private *d;
 
-    private:
-        class Private;
-        Private *d;
-    };
+    void cleanup();
+};
+
+class TLSHandler : public QObject {
+    Q_OBJECT
+public:
+    TLSHandler(QObject *parent = nullptr);
+    virtual ~TLSHandler();
+
+    virtual void reset()                            = 0;
+    virtual void startClient(const QString &host)   = 0;
+    virtual void write(const QByteArray &a)         = 0;
+    virtual void writeIncoming(const QByteArray &a) = 0;
+
+signals:
+    void success();
+    void fail();
+    void closed();
+    void readyRead(const QByteArray &a);
+    void readyReadOutgoing(const QByteArray &a, int plainBytes);
+};
+
+class QCATLSHandler : public TLSHandler {
+    Q_OBJECT
+public:
+    QCATLSHandler(QCA::TLS *parent);
+    ~QCATLSHandler();
+
+    QCA::TLS *tls() const;
+    int       tlsError() const;
+
+    void setXMPPCertCheck(bool enable);
+    bool XMPPCertCheck();
+    bool certMatchesHostname();
+
+    void reset();
+    void startClient(const QString &host);
+    void write(const QByteArray &a);
+    void writeIncoming(const QByteArray &a);
+
+signals:
+    void tlsHandshaken();
+
+public slots:
+    void continueAfterHandshake();
+
+private slots:
+    void tls_handshaken();
+    void tls_readyRead();
+    void tls_readyReadOutgoing();
+    void tls_closed();
+    void tls_error();
+
+private:
+    class Private;
+    Private *d;
+};
 }; // namespace XMPP
 
 #endif // XMPP_H
diff --git a/src/xmpp/xmpp-core/xmpp_clientstream.h b/src/xmpp/xmpp-core/xmpp_clientstream.h
index f06d1e39..20551943 100644
--- a/src/xmpp/xmpp-core/xmpp_clientstream.h
+++ b/src/xmpp/xmpp-core/xmpp_clientstream.h
@@ -32,199 +32,192 @@ class QObject;
 class QString;
 
 namespace XMPP {
-    class Connector;
-    class StreamFeatures;
-    class TLSHandler;
-
-    class ClientStream : public Stream
-    {
-        Q_OBJECT
-    public:
-        enum Error {
-            ErrConnection = ErrCustom,  // Connection error, ask Connector-subclass what's up
-            ErrNeg,                     // Negotiation error, see condition
-            ErrTLS,                     // TLS error, see condition
-            ErrAuth,                    // Auth error, see condition
-            ErrSecurityLayer,           // broken SASL security layer
-            ErrSmResume,                // SM resume error
-            ErrBind                     // Resource binding error
-        };
-        enum Warning {
-            WarnOldVersion,             // server uses older XMPP/Jabber "0.9" protocol
-            WarnNoTLS,                  // there is no chance for TLS at this point
-            WarnSMReconnection          // SM started a quiet stream reconnection
-        };
-        enum NegCond {
-            HostGone,                   // host no longer hosted
-            HostUnknown,                // unknown host
-            RemoteConnectionFailed,     // unable to connect to a required remote resource
-            SeeOtherHost,               // a 'redirect', see errorText() for other host
-            UnsupportedVersion          // unsupported XMPP version
-        };
-        enum TLSCond {
-            TLSStart,                   // server rejected STARTTLS
-            TLSFail                     // TLS failed, ask TLSHandler-subclass what's up
-        };
-        enum SecurityLayer {
-            LayerTLS,
-            LayerSASL
-        };
-        enum AuthCond {
-            GenericAuthError,           // all-purpose "can't login" error (includes: IncorrectEncoding, )
-
-            // standard xmpp auth errors (not all. some of the converted to GenericAuthError):
-            Aborted,                    // server confirms auth abort
-            AccountDisabled,            // account temporrily disabled
-            CredentialsExpired,         // credential expired
-            EncryptionRequired,         // can't use mech without TLS
-            InvalidAuthzid,             // bad input JID
-            InvalidMech,                // bad mechanism
-            MalformedRequest,           // malformded request
-            MechTooWeak,                // can't use mech with this authzid
-            NotAuthorized,              // bad user, bad password, bad creditials
-            TemporaryAuthFailure,       // please try again later!
-
-            // non-xmpp
-            NoMech,                     // No appropriate auth mech available
-            BadServ,                    // Server failed mutual auth
-        };
-        enum BindCond {
-            BindNotAllowed,             // not allowed to bind a resource
-            BindConflict                // resource in-use
-        };
-        enum AllowPlainType {
-            NoAllowPlain,
-            AllowPlain,
-            AllowPlainOverTLS
-        };
-
-        ClientStream(Connector *conn, TLSHandler *tlsHandler=nullptr, QObject *parent=nullptr);
-        ClientStream(const QString &host, const QString &defRealm, ByteStream *bs, QCA::TLS *tls=nullptr, QObject *parent=nullptr); // server
-        ~ClientStream();
-
-        Jid jid() const;
-        void connectToServer(const Jid &jid, bool auth=true);
-        void accept(); // server
-        bool isActive() const;
-        bool isAuthenticated() const;
-
-        // login params
-        void setUsername(const QString &s);
-        void setPassword(const QString &s);
-        void setRealm(const QString &s);
-        void setAuthzid(const QString &s);
-        void continueAfterParams();
-        void abortAuth();
-        void setSaslMechanismProvider(const QString &m, const QString &p);
-        QString saslMechanismProvider(const QString &m) const;
-        QCA::Provider::Context *currentSASLContext() const;
-
-        void setSCRAMStoredSaltedHash(const QString &s);
-        const QString getSCRAMStoredSaltedHash();
-
-        // SASL information
-        QString saslMechanism() const;
-        int saslSSF() const;
-
-        // binding
-        void setResourceBinding(bool);
-
-        // Language
-        void setLang(const QString&);
-
-        // security options (old protocol only uses the first !)
-        void setAllowPlain(AllowPlainType);
-        void setRequireMutualAuth(bool);
-        void setSSFRange(int low, int high);
-        void setOldOnly(bool);
-        void setSASLMechanism(const QString &s);
-        void setLocalAddr(const QHostAddress &addr, quint16 port);
-
-        // Compression
-        void setCompress(bool);
-
-        // reimplemented
-        QDomDocument & doc() const;
-        QString baseNS() const;
-        bool old() const;
-
-        void close();
-        bool stanzaAvailable() const;
-        Stanza read();
-        void write(const Stanza &s);
-        void clearSendQueue();
-
-        int errorCondition() const;
-        QString errorText() const;
-        QHash<QString,QString> errorLangText() const;
-        QDomElement errorAppSpec() const;
-
-        // extra
-        void writeDirect(const QString &s);
-        void setNoopTime(int mills);
-
-        // Stream management
-        bool isResumed() const;
-        void setSMEnabled(bool enable);
-
-        // barracuda extension
-        QStringList hosts() const;
-
-        const StreamFeatures &streamFeatures() const;    
-        QList<QDomElement> unhandledFeatures() const;
-
-    signals:
-        void connected();
-        void securityLayerActivated(int);
-        void needAuthParams(bool user, bool pass, bool realm);
-        void authenticated();
-        void warning(int);
-        void haveUnhandledFeatures();
-        void incomingXml(const QString &s);
-        void outgoingXml(const QString &s);
-        void stanzasAcked(int);
-
-    public slots:
-        void continueAfterWarning();
-
-    private slots:
-        void cr_connected();
-        void cr_error();
-
-        void bs_connectionClosed();
-        void bs_delayedCloseFinished();
-        void bs_error(int); // server only
-
-        void ss_readyRead();
-        void ss_bytesWritten(qint64);
-        void ss_tlsHandshaken();
-        void ss_tlsClosed();
-        void ss_error(int);
-
-        void sasl_clientFirstStep(bool, const QByteArray&);
-        void sasl_nextStep(const QByteArray &stepData);
-        void sasl_needParams(const QCA::SASL::Params&);
-        void sasl_authCheck(const QString &user, const QString &authzid);
-        void sasl_authenticated();
-        void sasl_error();
-
-        void sm_timeout();
-
-        void doNoop();
-        void doReadyRead();
-
-    private:
-        class Private;
-        Private *d;
-
-        void reset(bool all=false);
-        void processNext();
-        int convertedSASLCond() const;
-        bool handleNeed();
-        void handleError();
-        void srvProcessNext();
-        void setTimer(int secs);
+class Connector;
+class StreamFeatures;
+class TLSHandler;
+
+class ClientStream : public Stream {
+    Q_OBJECT
+public:
+    enum Error {
+        ErrConnection = ErrCustom, // Connection error, ask Connector-subclass what's up
+        ErrNeg,                    // Negotiation error, see condition
+        ErrTLS,                    // TLS error, see condition
+        ErrAuth,                   // Auth error, see condition
+        ErrSecurityLayer,          // broken SASL security layer
+        ErrSmResume,               // SM resume error
+        ErrBind                    // Resource binding error
     };
+    enum Warning {
+        WarnOldVersion,    // server uses older XMPP/Jabber "0.9" protocol
+        WarnNoTLS,         // there is no chance for TLS at this point
+        WarnSMReconnection // SM started a quiet stream reconnection
+    };
+    enum NegCond {
+        HostGone,               // host no longer hosted
+        HostUnknown,            // unknown host
+        RemoteConnectionFailed, // unable to connect to a required remote resource
+        SeeOtherHost,           // a 'redirect', see errorText() for other host
+        UnsupportedVersion      // unsupported XMPP version
+    };
+    enum TLSCond {
+        TLSStart, // server rejected STARTTLS
+        TLSFail   // TLS failed, ask TLSHandler-subclass what's up
+    };
+    enum SecurityLayer { LayerTLS, LayerSASL };
+    enum AuthCond {
+        GenericAuthError, // all-purpose "can't login" error (includes: IncorrectEncoding, )
+
+        // standard xmpp auth errors (not all. some of the converted to GenericAuthError):
+        Aborted,              // server confirms auth abort
+        AccountDisabled,      // account temporrily disabled
+        CredentialsExpired,   // credential expired
+        EncryptionRequired,   // can't use mech without TLS
+        InvalidAuthzid,       // bad input JID
+        InvalidMech,          // bad mechanism
+        MalformedRequest,     // malformded request
+        MechTooWeak,          // can't use mech with this authzid
+        NotAuthorized,        // bad user, bad password, bad creditials
+        TemporaryAuthFailure, // please try again later!
+
+        // non-xmpp
+        NoMech,  // No appropriate auth mech available
+        BadServ, // Server failed mutual auth
+    };
+    enum BindCond {
+        BindNotAllowed, // not allowed to bind a resource
+        BindConflict    // resource in-use
+    };
+    enum AllowPlainType { NoAllowPlain, AllowPlain, AllowPlainOverTLS };
+
+    ClientStream(Connector *conn, TLSHandler *tlsHandler = nullptr, QObject *parent = nullptr);
+    ClientStream(const QString &host, const QString &defRealm, ByteStream *bs, QCA::TLS *tls = nullptr,
+                 QObject *parent = nullptr); // server
+    ~ClientStream();
+
+    Jid  jid() const;
+    void connectToServer(const Jid &jid, bool auth = true);
+    void accept(); // server
+    bool isActive() const;
+    bool isAuthenticated() const;
+
+    // login params
+    void                    setUsername(const QString &s);
+    void                    setPassword(const QString &s);
+    void                    setRealm(const QString &s);
+    void                    setAuthzid(const QString &s);
+    void                    continueAfterParams();
+    void                    abortAuth();
+    void                    setSaslMechanismProvider(const QString &m, const QString &p);
+    QString                 saslMechanismProvider(const QString &m) const;
+    QCA::Provider::Context *currentSASLContext() const;
+
+    void          setSCRAMStoredSaltedHash(const QString &s);
+    const QString getSCRAMStoredSaltedHash();
+
+    // SASL information
+    QString saslMechanism() const;
+    int     saslSSF() const;
+
+    // binding
+    void setResourceBinding(bool);
+
+    // Language
+    void setLang(const QString &);
+
+    // security options (old protocol only uses the first !)
+    void setAllowPlain(AllowPlainType);
+    void setRequireMutualAuth(bool);
+    void setSSFRange(int low, int high);
+    void setOldOnly(bool);
+    void setSASLMechanism(const QString &s);
+    void setLocalAddr(const QHostAddress &addr, quint16 port);
+
+    // Compression
+    void setCompress(bool);
+
+    // reimplemented
+    QDomDocument &doc() const;
+    QString       baseNS() const;
+    bool          old() const;
+
+    void   close();
+    bool   stanzaAvailable() const;
+    Stanza read();
+    void   write(const Stanza &s);
+    void   clearSendQueue();
+
+    int                     errorCondition() const;
+    QString                 errorText() const;
+    QHash<QString, QString> errorLangText() const;
+    QDomElement             errorAppSpec() const;
+
+    // extra
+    void writeDirect(const QString &s);
+    void setNoopTime(int mills);
+
+    // Stream management
+    bool isResumed() const;
+    void setSMEnabled(bool enable);
+
+    // barracuda extension
+    QStringList hosts() const;
+
+    const StreamFeatures &streamFeatures() const;
+    QList<QDomElement>    unhandledFeatures() const;
+
+signals:
+    void connected();
+    void securityLayerActivated(int);
+    void needAuthParams(bool user, bool pass, bool realm);
+    void authenticated();
+    void warning(int);
+    void haveUnhandledFeatures();
+    void incomingXml(const QString &s);
+    void outgoingXml(const QString &s);
+    void stanzasAcked(int);
+
+public slots:
+    void continueAfterWarning();
+
+private slots:
+    void cr_connected();
+    void cr_error();
+
+    void bs_connectionClosed();
+    void bs_delayedCloseFinished();
+    void bs_error(int); // server only
+
+    void ss_readyRead();
+    void ss_bytesWritten(qint64);
+    void ss_tlsHandshaken();
+    void ss_tlsClosed();
+    void ss_error(int);
+
+    void sasl_clientFirstStep(bool, const QByteArray &);
+    void sasl_nextStep(const QByteArray &stepData);
+    void sasl_needParams(const QCA::SASL::Params &);
+    void sasl_authCheck(const QString &user, const QString &authzid);
+    void sasl_authenticated();
+    void sasl_error();
+
+    void sm_timeout();
+
+    void doNoop();
+    void doReadyRead();
+
+private:
+    class Private;
+    Private *d;
+
+    void reset(bool all = false);
+    void processNext();
+    int  convertedSASLCond() const;
+    bool handleNeed();
+    void handleError();
+    void srvProcessNext();
+    void setTimer(int secs);
+};
 } // namespace XMPP
 
 #endif // XMPP_CLIENTSTREAM_H
diff --git a/src/xmpp/xmpp-core/xmpp_stanza.cpp b/src/xmpp/xmpp-core/xmpp_stanza.cpp
index 6dfea235..a3e89b78 100644
--- a/src/xmpp/xmpp-core/xmpp_stanza.cpp
+++ b/src/xmpp/xmpp-core/xmpp_stanza.cpp
@@ -74,51 +74,46 @@ using namespace XMPP;
 */
 Stanza::Error::Error(int _type, int _condition, const QString &_text, const QDomElement &_appSpec)
 {
-    type = _type;
-    condition = _condition;
-    text = _text;
-    appSpec = _appSpec;
+    type         = _type;
+    condition    = _condition;
+    text         = _text;
+    appSpec      = _appSpec;
     originalCode = 0;
 }
 
 void Stanza::Error::reset()
 {
-    type = 0;
+    type      = 0;
     condition = UndefinedCondition;
     text.clear();
     by.clear();
-    appSpec = QDomElement();
+    appSpec      = QDomElement();
     originalCode = 0;
 }
 
-class Stanza::Error::Private
-{
+class Stanza::Error::Private {
 public:
-    struct ErrorTypeEntry
-    {
+    struct ErrorTypeEntry {
         const char *str;
-        int type;
+        int         type;
     };
     static ErrorTypeEntry errorTypeTable[];
 
-    struct ErrorCondEntry
-    {
+    struct ErrorCondEntry {
         const char *str;
-        int cond;
+        int         cond;
     };
     static ErrorCondEntry errorCondTable[];
 
-    struct ErrorCodeEntry
-    {
+    struct ErrorCodeEntry {
         int cond;
         int type;
         int code;
     };
     static ErrorCodeEntry errorCodeTable[];
 
-    struct ErrorDescEntry
-    {
-        int cond;
+    struct ErrorDescEntry {
+        int         cond;
         const char *name;
         const char *str;
     };
@@ -126,8 +121,8 @@ class Stanza::Error::Private
 
     static int stringToErrorType(const QString &s)
     {
-        for(int n = 0; errorTypeTable[n].str; ++n) {
-            if(s == errorTypeTable[n].str)
+        for (int n = 0; errorTypeTable[n].str; ++n) {
+            if (s == errorTypeTable[n].str)
                 return errorTypeTable[n].type;
         }
         return -1;
@@ -135,8 +130,8 @@ class Stanza::Error::Private
 
     static QString errorTypeToString(int x)
     {
-        for(int n = 0; errorTypeTable[n].str; ++n) {
-            if(x == errorTypeTable[n].type)
+        for (int n = 0; errorTypeTable[n].str; ++n) {
+            if (x == errorTypeTable[n].type)
                 return errorTypeTable[n].str;
         }
         return QString();
@@ -144,8 +139,8 @@ class Stanza::Error::Private
 
     static int stringToErrorCond(const QString &s)
     {
-        for(int n = 0; errorCondTable[n].str; ++n) {
-            if(s == errorCondTable[n].str)
+        for (int n = 0; errorCondTable[n].str; ++n) {
+            if (s == errorCondTable[n].str)
                 return errorCondTable[n].cond;
         }
         return -1;
@@ -153,8 +148,8 @@ class Stanza::Error::Private
 
     static QString errorCondToString(int x)
     {
-        for(int n = 0; errorCondTable[n].str; ++n) {
-            if(x == errorCondTable[n].cond)
+        for (int n = 0; errorCondTable[n].str; ++n) {
+            if (x == errorCondTable[n].cond)
                 return errorCondTable[n].str;
         }
         return QString();
@@ -163,8 +158,8 @@ class Stanza::Error::Private
     static int errorTypeCondToCode(int t, int c)
     {
         Q_UNUSED(t);
-        for(int n = 0; errorCodeTable[n].cond; ++n) {
-            if(c == errorCodeTable[n].cond)
+        for (int n = 0; errorCodeTable[n].cond; ++n) {
+            if (c == errorCodeTable[n].cond)
                 return errorCodeTable[n].code;
         }
         return 0;
@@ -172,109 +167,135 @@ class Stanza::Error::Private
 
     static QPair<int, int> errorCodeToTypeCond(int x)
     {
-        for(int n = 0; errorCodeTable[n].cond; ++n) {
-            if(x == errorCodeTable[n].code)
+        for (int n = 0; errorCodeTable[n].cond; ++n) {
+            if (x == errorCodeTable[n].code)
                 return QPair<int, int>(errorCodeTable[n].type, errorCodeTable[n].cond);
         }
         return QPair<int, int>(-1, -1);
     }
 
-    static QPair<QString,QString> errorCondToDesc(int x)
+    static QPair<QString, QString> errorCondToDesc(int x)
     {
-        for(int n = 0; errorDescriptions[n].str; ++n) {
-            if(x == errorDescriptions[n].cond)
-                return QPair<QString, QString>(QCoreApplication::translate("Stanza::Error::Private", errorDescriptions[n].name),
-                                               QCoreApplication::translate("Stanza::Error::Private", errorDescriptions[n].str));
+        for (int n = 0; errorDescriptions[n].str; ++n) {
+            if (x == errorDescriptions[n].cond)
+                return QPair<QString, QString>(
+                    QCoreApplication::translate("Stanza::Error::Private", errorDescriptions[n].name),
+                    QCoreApplication::translate("Stanza::Error::Private", errorDescriptions[n].str));
         }
-        return QPair<QString,QString>();
+        return QPair<QString, QString>();
     }
 };
 
-Stanza::Error::Private::ErrorTypeEntry Stanza::Error::Private::errorTypeTable[] =
-{
-    { "cancel",   Cancel },
-    { "continue", Continue },
-    { "modify",   Modify },
-    { "auth",     Auth },
-    { "wait",     Wait },
-    { nullptr, 0 },
+Stanza::Error::Private::ErrorTypeEntry Stanza::Error::Private::errorTypeTable[] = {
+    { "cancel", Cancel }, { "continue", Continue }, { "modify", Modify },
+    { "auth", Auth },     { "wait", Wait },         { nullptr, 0 },
 };
 
-Stanza::Error::Private::ErrorCondEntry Stanza::Error::Private::errorCondTable[] =
-{
-    { "bad-request",             BadRequest },
-    { "conflict",                Conflict },
+Stanza::Error::Private::ErrorCondEntry Stanza::Error::Private::errorCondTable[] = {
+    { "bad-request", BadRequest },
+    { "conflict", Conflict },
     { "feature-not-implemented", FeatureNotImplemented },
-    { "forbidden",               Forbidden },
-    { "gone",                    Gone },
-    { "internal-server-error",   InternalServerError },
-    { "item-not-found",          ItemNotFound },
-    { "jid-malformed",           JidMalformed },
-    { "not-acceptable",          NotAcceptable },
-    { "not-allowed",             NotAllowed },
-    { "not-authorized",          NotAuthorized },
-    { "recipient-unavailable",   RecipientUnavailable },
-    { "redirect",                Redirect },
-    { "registration-required",   RegistrationRequired },
+    { "forbidden", Forbidden },
+    { "gone", Gone },
+    { "internal-server-error", InternalServerError },
+    { "item-not-found", ItemNotFound },
+    { "jid-malformed", JidMalformed },
+    { "not-acceptable", NotAcceptable },
+    { "not-allowed", NotAllowed },
+    { "not-authorized", NotAuthorized },
+    { "recipient-unavailable", RecipientUnavailable },
+    { "redirect", Redirect },
+    { "registration-required", RegistrationRequired },
     { "remote-server-not-found", RemoteServerNotFound },
-    { "remote-server-timeout",   RemoteServerTimeout },
-    { "resource-constraint",     ResourceConstraint },
-    { "service-unavailable",     ServiceUnavailable },
-    { "subscription-required",   SubscriptionRequired },
-    { "undefined-condition",     UndefinedCondition },
-    { "unexpected-request",      UnexpectedRequest },
+    { "remote-server-timeout", RemoteServerTimeout },
+    { "resource-constraint", ResourceConstraint },
+    { "service-unavailable", ServiceUnavailable },
+    { "subscription-required", SubscriptionRequired },
+    { "undefined-condition", UndefinedCondition },
+    { "unexpected-request", UnexpectedRequest },
     { nullptr, 0 },
 };
 
-Stanza::Error::Private::ErrorCodeEntry Stanza::Error::Private::errorCodeTable[] =
-{
-    { BadRequest,            Modify, 400 },
-    { Conflict,              Cancel, 409 },
+Stanza::Error::Private::ErrorCodeEntry Stanza::Error::Private::errorCodeTable[] = {
+    { BadRequest, Modify, 400 },
+    { Conflict, Cancel, 409 },
     { FeatureNotImplemented, Cancel, 501 },
-    { Forbidden,             Auth,   403 },
-    { Gone,                  Modify, 302 },    // permanent
-    { InternalServerError,   Wait,   500 },
-    { ItemNotFound,          Cancel, 404 },
-    { JidMalformed,          Modify, 400 },
-    { NotAcceptable,         Modify, 406 },
-    { NotAllowed,            Cancel, 405 },
-    { NotAuthorized,         Auth,   401 },
-    { RecipientUnavailable,  Wait,   404 },
-    { Redirect,              Modify, 302 },    // temporary
-    { RegistrationRequired,  Auth,   407 },
-    { RemoteServerNotFound,  Cancel, 404 },
-    { RemoteServerTimeout,   Wait,   504 },
-    { ResourceConstraint,    Wait,   500 },
-    { ServiceUnavailable,    Cancel, 503 },
-    { SubscriptionRequired,  Auth,   407 },
-    { UndefinedCondition,    Wait,   500 },    // Note: any type matches really
-    { UnexpectedRequest,     Wait,   400 },
+    { Forbidden, Auth, 403 },
+    { Gone, Modify, 302 }, // permanent
+    { InternalServerError, Wait, 500 },
+    { ItemNotFound, Cancel, 404 },
+    { JidMalformed, Modify, 400 },
+    { NotAcceptable, Modify, 406 },
+    { NotAllowed, Cancel, 405 },
+    { NotAuthorized, Auth, 401 },
+    { RecipientUnavailable, Wait, 404 },
+    { Redirect, Modify, 302 }, // temporary
+    { RegistrationRequired, Auth, 407 },
+    { RemoteServerNotFound, Cancel, 404 },
+    { RemoteServerTimeout, Wait, 504 },
+    { ResourceConstraint, Wait, 500 },
+    { ServiceUnavailable, Cancel, 503 },
+    { SubscriptionRequired, Auth, 407 },
+    { UndefinedCondition, Wait, 500 }, // Note: any type matches really
+    { UnexpectedRequest, Wait, 400 },
     { 0, 0, 0 },
 };
 
-Stanza::Error::Private::ErrorDescEntry Stanza::Error::Private::errorDescriptions[] =
-{
-    { BadRequest,            QT_TR_NOOP("Bad request"),             QT_TR_NOOP("The sender has sent XML that is malformed or that cannot be processed.") },
-    { Conflict,              QT_TR_NOOP("Conflict"),                QT_TR_NOOP("Access cannot be granted because an existing resource or session exists with the same name or address.") },
-    { FeatureNotImplemented, QT_TR_NOOP("Feature not implemented"), QT_TR_NOOP("The feature requested is not implemented by the recipient or server and therefore cannot be processed.") },
-    { Forbidden,             QT_TR_NOOP("Forbidden"),               QT_TR_NOOP("The requesting entity does not possess the required permissions to perform the action.") },
-    { Gone,                  QT_TR_NOOP("Gone"),                    QT_TR_NOOP("The recipient or server can no longer be contacted at this address.") },
-    { InternalServerError,   QT_TR_NOOP("Internal server error"),   QT_TR_NOOP("The server could not process the stanza because of a misconfiguration or an otherwise-undefined internal server error.") },
-    { ItemNotFound,          QT_TR_NOOP("Item not found"),          QT_TR_NOOP("The addressed JID or item requested cannot be found.") },
-    { JidMalformed,          QT_TR_NOOP("JID malformed"),           QT_TR_NOOP("The sending entity has provided or communicated an XMPP address (e.g., a value of the 'to' attribute) or aspect thereof (e.g., a resource identifier) that does not adhere to the syntax defined in Addressing Scheme.") },
-    { NotAcceptable,         QT_TR_NOOP("Not acceptable"),          QT_TR_NOOP("The recipient or server understands the request but is refusing to process it because it does not meet criteria defined by the recipient or server (e.g., a local policy regarding acceptable words in messages).") },
-    { NotAllowed,            QT_TR_NOOP("Not allowed"),             QT_TR_NOOP("The recipient or server does not allow any entity to perform the action.") },
-    { NotAuthorized,         QT_TR_NOOP("Not authorized"),          QT_TR_NOOP("The sender must provide proper credentials before being allowed to perform the action, or has provided improper credentials.") },
-    { RecipientUnavailable,  QT_TR_NOOP("Recipient unavailable"),   QT_TR_NOOP("The intended recipient is temporarily unavailable.") },
-    { Redirect,              QT_TR_NOOP("Redirect"),                QT_TR_NOOP("The recipient or server is redirecting requests for this information to another entity, usually temporarily.") },
-    { RegistrationRequired,  QT_TR_NOOP("Registration required"),   QT_TR_NOOP("The requesting entity is not authorized to access the requested service because registration is required.") },
-    { RemoteServerNotFound,  QT_TR_NOOP("Remote server not found"), QT_TR_NOOP("A remote server or service specified as part or all of the JID of the intended recipient does not exist.") },
-    { RemoteServerTimeout,   QT_TR_NOOP("Remote server timeout"),   QT_TR_NOOP("A remote server or service specified as part or all of the JID of the intended recipient (or required to fulfill a request) could not be contacted within a reasonable amount of time.") },
-    { ResourceConstraint,    QT_TR_NOOP("Resource constraint"),     QT_TR_NOOP("The server or recipient lacks the system resources necessary to service the request.") },
-    { ServiceUnavailable,    QT_TR_NOOP("Service unavailable"),     QT_TR_NOOP("The server or recipient does not currently provide the requested service.") },
-    { SubscriptionRequired,  QT_TR_NOOP("Subscription required"),   QT_TR_NOOP("The requesting entity is not authorized to access the requested service because a subscription is required.") },
-    { UndefinedCondition,    QT_TR_NOOP("Undefined condition"),     QT_TR_NOOP("The error condition is not one of those defined by the other conditions in this list.") },
-    { UnexpectedRequest,     QT_TR_NOOP("Unexpected request"),      QT_TR_NOOP("The recipient or server understood the request but was not expecting it at this time (e.g., the request was out of order).") },
+Stanza::Error::Private::ErrorDescEntry Stanza::Error::Private::errorDescriptions[] = {
+    { BadRequest, QT_TR_NOOP("Bad request"),
+      QT_TR_NOOP("The sender has sent XML that is malformed or that cannot be processed.") },
+    { Conflict, QT_TR_NOOP("Conflict"),
+      QT_TR_NOOP(
+          "Access cannot be granted because an existing resource or session exists with the same name or address.") },
+    { FeatureNotImplemented, QT_TR_NOOP("Feature not implemented"),
+      QT_TR_NOOP(
+          "The feature requested is not implemented by the recipient or server and therefore cannot be processed.") },
+    { Forbidden, QT_TR_NOOP("Forbidden"),
+      QT_TR_NOOP("The requesting entity does not possess the required permissions to perform the action.") },
+    { Gone, QT_TR_NOOP("Gone"), QT_TR_NOOP("The recipient or server can no longer be contacted at this address.") },
+    { InternalServerError, QT_TR_NOOP("Internal server error"),
+      QT_TR_NOOP("The server could not process the stanza because of a misconfiguration or an otherwise-undefined "
+                 "internal server error.") },
+    { ItemNotFound, QT_TR_NOOP("Item not found"), QT_TR_NOOP("The addressed JID or item requested cannot be found.") },
+    { JidMalformed, QT_TR_NOOP("JID malformed"),
+      QT_TR_NOOP("The sending entity has provided or communicated an XMPP address (e.g., a value of the 'to' "
+                 "attribute) or aspect thereof (e.g., a resource identifier) that does not adhere to the syntax "
+                 "defined in Addressing Scheme.") },
+    { NotAcceptable, QT_TR_NOOP("Not acceptable"),
+      QT_TR_NOOP("The recipient or server understands the request but is refusing to process it because it does not "
+                 "meet criteria defined by the recipient or server (e.g., a local policy regarding acceptable words in "
+                 "messages).") },
+    { NotAllowed, QT_TR_NOOP("Not allowed"),
+      QT_TR_NOOP("The recipient or server does not allow any entity to perform the action.") },
+    { NotAuthorized, QT_TR_NOOP("Not authorized"),
+      QT_TR_NOOP("The sender must provide proper credentials before being allowed to perform the action, or has "
+                 "provided improper credentials.") },
+    { RecipientUnavailable, QT_TR_NOOP("Recipient unavailable"),
+      QT_TR_NOOP("The intended recipient is temporarily unavailable.") },
+    { Redirect, QT_TR_NOOP("Redirect"),
+      QT_TR_NOOP("The recipient or server is redirecting requests for this information to another entity, usually "
+                 "temporarily.") },
+    { RegistrationRequired, QT_TR_NOOP("Registration required"),
+      QT_TR_NOOP("The requesting entity is not authorized to access the requested service because registration is "
+                 "required.") },
+    { RemoteServerNotFound, QT_TR_NOOP("Remote server not found"),
+      QT_TR_NOOP(
+          "A remote server or service specified as part or all of the JID of the intended recipient does not exist.") },
+    { RemoteServerTimeout, QT_TR_NOOP("Remote server timeout"),
+      QT_TR_NOOP("A remote server or service specified as part or all of the JID of the intended recipient (or "
+                 "required to fulfill a request) could not be contacted within a reasonable amount of time.") },
+    { ResourceConstraint, QT_TR_NOOP("Resource constraint"),
+      QT_TR_NOOP("The server or recipient lacks the system resources necessary to service the request.") },
+    { ServiceUnavailable, QT_TR_NOOP("Service unavailable"),
+      QT_TR_NOOP("The server or recipient does not currently provide the requested service.") },
+    { SubscriptionRequired, QT_TR_NOOP("Subscription required"),
+      QT_TR_NOOP("The requesting entity is not authorized to access the requested service because a subscription is "
+                 "required.") },
+    { UndefinedCondition, QT_TR_NOOP("Undefined condition"),
+      QT_TR_NOOP("The error condition is not one of those defined by the other conditions in this list.") },
+    { UnexpectedRequest, QT_TR_NOOP("Unexpected request"),
+      QT_TR_NOOP("The recipient or server understood the request but was not expecting it at this time (e.g., the "
+                 "request was out of order).") },
 };
 
 /**
@@ -285,10 +306,7 @@ Stanza::Error::Private::ErrorDescEntry Stanza::Error::Private::errorDescriptions
 
     0 means unknown code.
 */
-int Stanza::Error::code() const
-{
-    return originalCode ? originalCode : Private::errorTypeCondToCode(type, condition);
-}
+int Stanza::Error::code() const { return originalCode ? originalCode : Private::errorTypeCondToCode(type, condition); }
 
 /**
     \brief Creates a StanzaError from \a code.
@@ -299,11 +317,11 @@ int Stanza::Error::code() const
 bool Stanza::Error::fromCode(int code)
 {
     QPair<int, int> guess = Private::errorCodeToTypeCond(code);
-    if(guess.first == -1 || guess.second == -1)
+    if (guess.first == -1 || guess.second == -1)
         return false;
 
-    type = guess.first;
-    condition = guess.second;
+    type         = guess.first;
+    condition    = guess.second;
     originalCode = code;
 
     return true;
@@ -319,17 +337,17 @@ bool Stanza::Error::fromCode(int code)
 */
 bool Stanza::Error::fromXml(const QDomElement &e, const QString &baseNS)
 {
-    if(e.tagName() != "error" && e.namespaceURI() != baseNS)
+    if (e.tagName() != "error" && e.namespaceURI() != baseNS)
         return false;
 
     // type
-    type = Private::stringToErrorType(e.attribute("type"));
-    by = e.attribute(QLatin1String("by"));
+    type      = Private::stringToErrorType(e.attribute("type"));
+    by        = e.attribute(QLatin1String("by"));
     condition = -1;
 
     QString textTag(QString::fromLatin1("text"));
     for (auto t = e.firstChildElement(); !t.isNull(); t = t.nextSiblingElement()) {
-        if(t.namespaceURI() == NS_STANZAS) {
+        if (t.namespaceURI() == NS_STANZAS) {
             if (t.tagName() == textTag) {
                 text = t.text().trimmed();
             } else {
@@ -344,10 +362,11 @@ bool Stanza::Error::fromXml(const QDomElement &e, const QString &baseNS)
     }
 
     // code
-    originalCode = e.attribute("code").toInt(); // deprecated. rfc6120 has just a little note about it. also see XEP-0086
+    originalCode
+        = e.attribute("code").toInt(); // deprecated. rfc6120 has just a little note about it. also see XEP-0086
 
     // try to guess type/condition
-    if(type == -1 || condition == -1) {
+    if (type == -1 || condition == -1) {
         QPair<int, int> guess(-1, -1);
         if (originalCode)
             guess = Private::errorCodeToTypeCond(originalCode);
@@ -376,10 +395,10 @@ QDomElement Stanza::Error::toXml(QDomDocument &doc, const QString &baseNS) const
 
     // XMPP error
     QString stype = Private::errorTypeToString(type);
-    if(stype.isEmpty())
+    if (stype.isEmpty())
         return errElem;
     QString scond = Private::errorCondToString(condition);
-    if(scond.isEmpty())
+    if (scond.isEmpty())
         return errElem;
 
     errElem.setAttribute("type", stype);
@@ -387,17 +406,17 @@ QDomElement Stanza::Error::toXml(QDomDocument &doc, const QString &baseNS) const
         errElem.setAttribute("by", by);
     }
     errElem.appendChild(t = doc.createElementNS(NS_STANZAS, scond));
-    //t.setAttribute("xmlns", NS_STANZAS);    // FIX-ME: this shouldn't be needed
+    // t.setAttribute("xmlns", NS_STANZAS);    // FIX-ME: this shouldn't be needed
 
     // old code
     int scode = code();
-    if(scode)
+    if (scode)
         errElem.setAttribute("code", scode);
 
     // text
-    if(!text.isEmpty()) {
+    if (!text.isEmpty()) {
         t = doc.createElementNS(NS_STANZAS, "text");
-        //t.setAttribute("xmlns", NS_STANZAS);    // FIX-ME: this shouldn't be needed
+        // t.setAttribute("xmlns", NS_STANZAS);    // FIX-ME: this shouldn't be needed
         t.appendChild(doc.createTextNode(text));
         errElem.appendChild(t);
     }
@@ -413,10 +432,7 @@ QDomElement Stanza::Error::toXml(QDomDocument &doc, const QString &baseNS) const
 
     Returns the error name (e.g. "Not Allowed") and generic description.
 */
-QPair<QString,QString> Stanza::Error::description() const
-{
-    return Private::errorCondToDesc(condition);
-}
+QPair<QString, QString> Stanza::Error::description() const { return Private::errorCondToDesc(condition); }
 
 /**
  * \brief Returns string human-reabable representation of the error
@@ -433,16 +449,15 @@ QString Stanza::Error::toString() const
 //----------------------------------------------------------------------------
 // Stanza
 //----------------------------------------------------------------------------
-class Stanza::Private
-{
+class Stanza::Private {
 public:
     static int stringToKind(const QString &s)
     {
-        if(s == QLatin1String("message"))
+        if (s == QLatin1String("message"))
             return Message;
-        else if(s == QLatin1String("presence"))
+        else if (s == QLatin1String("presence"))
             return Presence;
-        else if(s == QLatin1String("iq"))
+        else if (s == QLatin1String("iq"))
             return IQ;
         else
             return -1;
@@ -450,23 +465,20 @@ class Stanza::Private
 
     static QString kindToString(Kind k)
     {
-        if(k == Message)
+        if (k == Message)
             return QLatin1String("message");
-        else if(k == Presence)
+        else if (k == Presence)
             return QLatin1String("presence");
         else
             return QLatin1String("iq");
     }
 
-    Stream *s;
-    QDomElement e;
+    Stream *                     s;
+    QDomElement                  e;
     QSharedPointer<QDomDocument> sharedDoc;
 };
 
-Stanza::Stanza()
-{
-    d = nullptr;
-}
+Stanza::Stanza() { d = nullptr; }
 
 Stanza::Stanza(Stream *s, Kind k, const Jid &to, const QString &type, const QString &id)
 {
@@ -474,19 +486,19 @@ Stanza::Stanza(Stream *s, Kind k, const Jid &to, const QString &type, const QStr
     d = new Private;
 
     Kind kind;
-    if(k == Message || k == Presence || k == IQ)
+    if (k == Message || k == Presence || k == IQ)
         kind = k;
     else
         kind = Message;
 
     d->s = s;
-    if(d->s)
+    if (d->s)
         d->e = d->s->doc().createElementNS(s->baseNS(), Private::kindToString(kind));
-    if(to.isValid())
+    if (to.isValid())
         setTo(to);
-    if(!type.isEmpty())
+    if (!type.isEmpty())
         setType(type);
-    if(!id.isEmpty())
+    if (!id.isEmpty())
         setId(id);
 }
 
@@ -494,63 +506,45 @@ Stanza::Stanza(Stream *s, const QDomElement &e)
 {
     Q_ASSERT(s);
     d = nullptr;
-    if(e.namespaceURI() != s->baseNS())
+    if (e.namespaceURI() != s->baseNS())
         return;
     int x = Private::stringToKind(e.tagName());
-    if(x == -1)
+    if (x == -1)
         return;
-    d = new Private;
+    d    = new Private;
     d->s = s;
     d->e = e;
 }
 
 Stanza::Stanza(const Stanza &from)
 {
-    d = nullptr;
+    d     = nullptr;
     *this = from;
 }
 
-Stanza & Stanza::operator=(const Stanza &from)
+Stanza &Stanza::operator=(const Stanza &from)
 {
-    if(&from == this)
+    if (&from == this)
         return *this;
 
     delete d;
     d = nullptr;
-    if(from.d)
+    if (from.d)
         d = new Private(*from.d);
     return *this;
 }
 
-Stanza::~Stanza()
-{
-    delete d;
-}
+Stanza::~Stanza() { delete d; }
 
-bool Stanza::isNull() const
-{
-    return (d ? false: true);
-}
+bool Stanza::isNull() const { return (d ? false : true); }
 
-QDomElement Stanza::element() const
-{
-    return d->e;
-}
+QDomElement Stanza::element() const { return d->e; }
 
-QString Stanza::toString() const
-{
-    return Stream::xmlToString(d->e);
-}
+QString Stanza::toString() const { return Stream::xmlToString(d->e); }
 
-QDomDocument & Stanza::doc() const
-{
-    return d->s->doc();
-}
+QDomDocument &Stanza::doc() const { return d->s->doc(); }
 
-QString Stanza::baseNS() const
-{
-    return d->s->baseNS();
-}
+QString Stanza::baseNS() const { return d->s->baseNS(); }
 
 QDomElement Stanza::createElement(const QString &ns, const QString &tagName)
 {
@@ -564,81 +558,39 @@ QDomElement Stanza::createTextElement(const QString &ns, const QString &tagName,
     return e;
 }
 
-void Stanza::appendChild(const QDomElement &e)
-{
-    d->e.appendChild(e);
-}
+void Stanza::appendChild(const QDomElement &e) { d->e.appendChild(e); }
 
-Stanza::Kind Stanza::kind() const
-{
-    return (Kind)Private::stringToKind(d->e.tagName());
-}
+Stanza::Kind Stanza::kind() const { return (Kind)Private::stringToKind(d->e.tagName()); }
 
-Stanza::Kind Stanza::kind(const QString &tagName)
-{
-    return (Kind)Private::stringToKind(tagName);
-}
+Stanza::Kind Stanza::kind(const QString &tagName) { return (Kind)Private::stringToKind(tagName); }
 
-void Stanza::setKind(Kind k)
-{
-    d->e.setTagName(Private::kindToString(k));
-}
+void Stanza::setKind(Kind k) { d->e.setTagName(Private::kindToString(k)); }
 
-Jid Stanza::to() const
-{
-    return Jid(d->e.attribute("to"));
-}
+Jid Stanza::to() const { return Jid(d->e.attribute("to")); }
 
-Jid Stanza::from() const
-{
-    return Jid(d->e.attribute("from"));
-}
+Jid Stanza::from() const { return Jid(d->e.attribute("from")); }
 
-QString Stanza::id() const
-{
-    return d->e.attribute("id");
-}
+QString Stanza::id() const { return d->e.attribute("id"); }
 
-QString Stanza::type() const
-{
-    return d->e.attribute("type");
-}
+QString Stanza::type() const { return d->e.attribute("type"); }
 
-QString Stanza::lang() const
-{
-    return d->e.attributeNS(NS_XML, "lang", QString());
-}
+QString Stanza::lang() const { return d->e.attributeNS(NS_XML, "lang", QString()); }
 
-void Stanza::setTo(const Jid &j)
-{
-    d->e.setAttribute("to", j.full());
-}
+void Stanza::setTo(const Jid &j) { d->e.setAttribute("to", j.full()); }
 
-void Stanza::setFrom(const Jid &j)
-{
-    d->e.setAttribute("from", j.full());
-}
+void Stanza::setFrom(const Jid &j) { d->e.setAttribute("from", j.full()); }
 
-void Stanza::setId(const QString &id)
-{
-    d->e.setAttribute("id", id);
-}
+void Stanza::setId(const QString &id) { d->e.setAttribute("id", id); }
 
-void Stanza::setType(const QString &type)
-{
-    d->e.setAttribute("type", type);
-}
+void Stanza::setType(const QString &type) { d->e.setAttribute("type", type); }
 
-void Stanza::setLang(const QString &lang)
-{
-    d->e.setAttribute("xml:lang", lang);
-}
+void Stanza::setLang(const QString &lang) { d->e.setAttribute("xml:lang", lang); }
 
 Stanza::Error Stanza::error() const
 {
-    Error err;
+    Error       err;
     QDomElement e = d->e.elementsByTagNameNS(d->s->baseNS(), "error").item(0).toElement();
-    if(!e.isNull())
+    if (!e.isNull())
         err.fromXml(e, d->s->baseNS());
 
     return err;
@@ -646,14 +598,13 @@ Stanza::Error Stanza::error() const
 
 void Stanza::setError(const Error &err)
 {
-    QDomDocument doc = d->e.ownerDocument();
-    QDomElement errElem = err.toXml(doc, d->s->baseNS());
+    QDomDocument doc     = d->e.ownerDocument();
+    QDomElement  errElem = err.toXml(doc, d->s->baseNS());
 
     QDomElement oldElem = d->e.elementsByTagNameNS(d->s->baseNS(), "error").item(0).toElement();
-    if(oldElem.isNull()) {
+    if (oldElem.isNull()) {
         d->e.appendChild(errElem);
-    }
-    else {
+    } else {
         d->e.replaceChild(errElem, oldElem);
     }
 }
@@ -661,7 +612,7 @@ void Stanza::setError(const Error &err)
 void Stanza::clearError()
 {
     QDomElement errElem = d->e.elementsByTagNameNS(d->s->baseNS(), "error").item(0).toElement();
-    if(!errElem.isNull())
+    if (!errElem.isNull())
         d->e.removeChild(errElem);
 }
 
@@ -670,7 +621,7 @@ QSharedPointer<QDomDocument> Stanza::unboundDocument(QSharedPointer<QDomDocument
     if (!sd) {
         sd = QSharedPointer<QDomDocument>(new QDomDocument);
     }
-    d->e = sd->importNode(d->e, true).toElement();
+    d->e         = sd->importNode(d->e, true).toElement();
     d->sharedDoc = sd;
     return d->sharedDoc;
 }
diff --git a/src/xmpp/xmpp-core/xmpp_stanza.h b/src/xmpp/xmpp-core/xmpp_stanza.h
index c2fd7ae4..c562f58c 100644
--- a/src/xmpp/xmpp-core/xmpp_stanza.h
+++ b/src/xmpp/xmpp-core/xmpp_stanza.h
@@ -27,117 +27,115 @@
 class QDomDocument;
 
 namespace XMPP {
-    class Jid;
-    class Stream;
+class Jid;
+class Stream;
 
-    class Stanza
-    {
-    public:
-        enum Kind { Message, Presence, IQ };
-
-        Stanza();
-        Stanza(const Stanza &from);
-        Stanza & operator=(const Stanza &from);
-        virtual ~Stanza();
-
-        class Error
-        {
-        public:
-            enum ErrorType { Cancel = 1, Continue, Modify, Auth, Wait };
-            enum ErrorCond
-            {
-                BadRequest = 1,
-                Conflict,
-                FeatureNotImplemented,
-                Forbidden,
-                Gone,
-                InternalServerError,
-                ItemNotFound,
-                JidMalformed,
-                NotAcceptable,
-                NotAllowed,
-                NotAuthorized,
-                PaymentRequired,
-                RecipientUnavailable,
-                Redirect,
-                RegistrationRequired,
-                RemoteServerNotFound,
-                RemoteServerTimeout,
-                ResourceConstraint,
-                ServiceUnavailable,
-                SubscriptionRequired,
-                UndefinedCondition,
-                UnexpectedRequest
-            };
-
-            Error(int type=Cancel, int condition=UndefinedCondition, const QString &text=QString(), const QDomElement &appSpec=QDomElement());
-
-            int type;
-            int condition;
-            QString text;
-            QString by;
-            QDomElement appSpec;
-
-            void reset();
-
-            int code() const;
-            bool fromCode(int code);
-
-            QPair<QString, QString> description() const;
-            QString toString() const;
-
-            QDomElement toXml(QDomDocument &doc, const QString &baseNS) const;
-            bool fromXml(const QDomElement &e, const QString &baseNS);
-        private:
-            class Private;
-            int originalCode;
+class Stanza {
+public:
+    enum Kind { Message, Presence, IQ };
+
+    Stanza();
+    Stanza(const Stanza &from);
+    Stanza &operator=(const Stanza &from);
+    virtual ~Stanza();
 
+    class Error {
+    public:
+        enum ErrorType { Cancel = 1, Continue, Modify, Auth, Wait };
+        enum ErrorCond {
+            BadRequest = 1,
+            Conflict,
+            FeatureNotImplemented,
+            Forbidden,
+            Gone,
+            InternalServerError,
+            ItemNotFound,
+            JidMalformed,
+            NotAcceptable,
+            NotAllowed,
+            NotAuthorized,
+            PaymentRequired,
+            RecipientUnavailable,
+            Redirect,
+            RegistrationRequired,
+            RemoteServerNotFound,
+            RemoteServerTimeout,
+            ResourceConstraint,
+            ServiceUnavailable,
+            SubscriptionRequired,
+            UndefinedCondition,
+            UnexpectedRequest
         };
 
-        bool isNull() const;
+        Error(int type = Cancel, int condition = UndefinedCondition, const QString &text = QString(),
+              const QDomElement &appSpec = QDomElement());
 
-        QDomElement element() const;
-        QString toString() const;
+        int         type;
+        int         condition;
+        QString     text;
+        QString     by;
+        QDomElement appSpec;
 
-        QDomDocument & doc() const;
-        QString baseNS() const;
-        QDomElement createElement(const QString &ns, const QString &tagName);
-        QDomElement createTextElement(const QString &ns, const QString &tagName, const QString &text);
-        void appendChild(const QDomElement &e);
+        void reset();
 
-        Kind kind() const;
-        static Kind kind(const QString &tagName);
-        void setKind(Kind k);
+        int  code() const;
+        bool fromCode(int code);
 
-        Jid to() const;
-        Jid from() const;
-        QString id() const;
-        QString type() const;
-        QString lang() const;
+        QPair<QString, QString> description() const;
+        QString                 toString() const;
 
-        void setTo(const Jid &j);
-        void setFrom(const Jid &j);
-        void setId(const QString &id);
-        void setType(const QString &type);
-        void setLang(const QString &lang);
+        QDomElement toXml(QDomDocument &doc, const QString &baseNS) const;
+        bool        fromXml(const QDomElement &e, const QString &baseNS);
 
-        Error error() const;
-        void setError(const Error &err);
-        void clearError();
+    private:
+        class Private;
+        int originalCode;
+    };
 
-        void markHandled();
-        void setSMId(unsigned long id);
+    bool isNull() const;
 
-        QSharedPointer<QDomDocument> unboundDocument(QSharedPointer<QDomDocument>);
+    QDomElement element() const;
+    QString     toString() const;
 
-    private:
-        friend class Stream;
-        Stanza(Stream *s, Kind k, const Jid &to, const QString &type, const QString &id);
-        Stanza(Stream *s, const QDomElement &e);
+    QDomDocument &doc() const;
+    QString       baseNS() const;
+    QDomElement   createElement(const QString &ns, const QString &tagName);
+    QDomElement   createTextElement(const QString &ns, const QString &tagName, const QString &text);
+    void          appendChild(const QDomElement &e);
 
-        class Private;
-        Private *d;
-    };
+    Kind        kind() const;
+    static Kind kind(const QString &tagName);
+    void        setKind(Kind k);
+
+    Jid     to() const;
+    Jid     from() const;
+    QString id() const;
+    QString type() const;
+    QString lang() const;
+
+    void setTo(const Jid &j);
+    void setFrom(const Jid &j);
+    void setId(const QString &id);
+    void setType(const QString &type);
+    void setLang(const QString &lang);
+
+    Error error() const;
+    void  setError(const Error &err);
+    void  clearError();
+
+    void markHandled();
+    void setSMId(unsigned long id);
+
+    QSharedPointer<QDomDocument> unboundDocument(QSharedPointer<QDomDocument>);
+
+private:
+    friend class Stream;
+    Stanza(Stream *s, Kind k, const Jid &to, const QString &type, const QString &id);
+    Stanza(Stream *s, const QDomElement &e);
+
+    class Private;
+    Private *d;
+};
 } // namespace XMPP
 
 #endif // XMPP_STANZA_H
diff --git a/src/xmpp/xmpp-core/xmpp_stream.h b/src/xmpp/xmpp-core/xmpp_stream.h
index cb0d4cdb..bf1a3fee 100644
--- a/src/xmpp/xmpp-core/xmpp_stream.h
+++ b/src/xmpp/xmpp-core/xmpp_stream.h
@@ -29,55 +29,54 @@
 class QDomDocument;
 
 namespace XMPP {
-    class Stream : public QObject
-    {
-        Q_OBJECT
-    public:
-        enum Error { ErrParse, ErrProtocol, ErrStream, ErrCustom = 10 };
-        enum StreamCond {
-            GenericStreamError,
-            Conflict,
-            ConnectionTimeout,
-            InternalServerError,
-            InvalidFrom,
-            InvalidXml,
-            PolicyViolation,
-            ResourceConstraint,
-            SystemShutdown,
-            StreamReset
-        };
+class Stream : public QObject {
+    Q_OBJECT
+public:
+    enum Error { ErrParse, ErrProtocol, ErrStream, ErrCustom = 10 };
+    enum StreamCond {
+        GenericStreamError,
+        Conflict,
+        ConnectionTimeout,
+        InternalServerError,
+        InvalidFrom,
+        InvalidXml,
+        PolicyViolation,
+        ResourceConstraint,
+        SystemShutdown,
+        StreamReset
+    };
 
-        Stream(QObject *parent=nullptr);
-        virtual ~Stream();
+    Stream(QObject *parent = nullptr);
+    virtual ~Stream();
 
-        virtual QDomDocument & doc() const=0;
-        virtual QString baseNS() const=0;
-        virtual bool old() const=0;
+    virtual QDomDocument &doc() const    = 0;
+    virtual QString       baseNS() const = 0;
+    virtual bool          old() const    = 0;
 
-        virtual void close()=0;
-        virtual bool stanzaAvailable() const=0;
-        virtual Stanza read()=0;
-        virtual void write(const Stanza &s)=0;
+    virtual void   close()                 = 0;
+    virtual bool   stanzaAvailable() const = 0;
+    virtual Stanza read()                  = 0;
+    virtual void   write(const Stanza &s)  = 0;
 
-        virtual int errorCondition() const=0;
-        virtual QString errorText() const=0;
-        virtual QHash<QString,QString> errorLangText() const=0; // localized error descriptions
-        virtual QDomElement errorAppSpec() const=0;
+    virtual int                     errorCondition() const = 0;
+    virtual QString                 errorText() const      = 0;
+    virtual QHash<QString, QString> errorLangText() const  = 0; // localized error descriptions
+    virtual QDomElement             errorAppSpec() const   = 0;
 
-        Stanza createStanza(Stanza::Kind k, const Jid &to="", const QString &type="", const QString &id="");
-        Stanza createStanza(const QDomElement &e);
+    Stanza createStanza(Stanza::Kind k, const Jid &to = "", const QString &type = "", const QString &id = "");
+    Stanza createStanza(const QDomElement &e);
 
-        static QString xmlToString(const QDomElement &e, bool clip=false);
+    static QString xmlToString(const QDomElement &e, bool clip = false);
 
-        static void cleanup();
+    static void cleanup();
 
-    signals:
-        void connectionClosed();
-        void delayedCloseFinished();
-        void readyRead();
-        void stanzaWritten();
-        void error(int);
-    };
+signals:
+    void connectionClosed();
+    void delayedCloseFinished();
+    void readyRead();
+    void stanzaWritten();
+    void error(int);
+};
 } // namespace XMPP
 
 #endif // XMPP_STREAM_H
diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
index 681645f8..2531e2c3 100644
--- a/src/xmpp/xmpp-im/client.cpp
+++ b/src/xmpp/xmpp-im/client.cpp
@@ -97,61 +97,58 @@ namespace XMPP {
 //----------------------------------------------------------------------------
 // Client
 //----------------------------------------------------------------------------
-class Client::GroupChat
-{
+class Client::GroupChat {
 public:
     enum { Connecting, Connected, Closing };
-    GroupChat()  = default;
+    GroupChat() = default;
 
-    Jid j;
-    int status = 0;
+    Jid     j;
+    int     status = 0;
     QString password;
 };
 
-class Client::ClientPrivate
-{
+class Client::ClientPrivate {
 public:
     ClientPrivate() {}
 
-    QPointer<ClientStream> stream;
-    QDomDocument doc;
-    int id_seed = 0xaaaa;
-    Task *root = nullptr;
-    QNetworkAccessManager *qnam = nullptr;
-    QString host, user, pass, resource;
-    QString osName, osVersion, tzname, clientName, clientVersion;
-    CapsSpec caps, serverCaps;
-    DiscoItem::Identity identity;
-    Features features;
-    QMap<QString,Features> extension_features;
-    int tzoffset = 0;
-    bool useTzoffset = false;    // manual tzoffset is old way of doing utc<->local translations
-    bool active = false;
-
-    LiveRoster roster;
-    ResourceList resourceList;
-    CapsManager *capsman = nullptr;
-    TcpPortReserver *tcpPortReserver = nullptr;
-    S5BManager *s5bman = nullptr;
-    Jingle::S5B::Manager *jingleS5BManager = nullptr;
-    Jingle::IBB::Manager *jingleIBBManager = nullptr;
-    IBBManager *ibbman = nullptr;
-    BoBManager *bobman = nullptr;
-    FileTransferManager *ftman = nullptr;
-    ServerInfoManager *serverInfoManager = nullptr;
+    QPointer<ClientStream>  stream;
+    QDomDocument            doc;
+    int                     id_seed = 0xaaaa;
+    Task *                  root    = nullptr;
+    QNetworkAccessManager * qnam    = nullptr;
+    QString                 host, user, pass, resource;
+    QString                 osName, osVersion, tzname, clientName, clientVersion;
+    CapsSpec                caps, serverCaps;
+    DiscoItem::Identity     identity;
+    Features                features;
+    QMap<QString, Features> extension_features;
+    int                     tzoffset    = 0;
+    bool                    useTzoffset = false; // manual tzoffset is old way of doing utc<->local translations
+    bool                    active      = false;
+
+    LiveRoster             roster;
+    ResourceList           resourceList;
+    CapsManager *          capsman               = nullptr;
+    TcpPortReserver *      tcpPortReserver       = nullptr;
+    S5BManager *           s5bman                = nullptr;
+    Jingle::S5B::Manager * jingleS5BManager      = nullptr;
+    Jingle::IBB::Manager * jingleIBBManager      = nullptr;
+    IBBManager *           ibbman                = nullptr;
+    BoBManager *           bobman                = nullptr;
+    FileTransferManager *  ftman                 = nullptr;
+    ServerInfoManager *    serverInfoManager     = nullptr;
     HttpFileUploadManager *httpFileUploadManager = nullptr;
-    Jingle::Manager *jingleManager = nullptr;
-    QList<GroupChat> groupChatList;
-    EncryptionHandler *encryptionHandler = nullptr;
+    Jingle::Manager *      jingleManager         = nullptr;
+    QList<GroupChat>       groupChatList;
+    EncryptionHandler *    encryptionHandler = nullptr;
 };
 
-Client::Client(QObject *par)
-:QObject(par)
+Client::Client(QObject *par) : QObject(par)
 {
-    d = new ClientPrivate;
-    d->active = false;
-    d->osName = "N/A";
-    d->clientName = "N/A";
+    d                = new ClientPrivate;
+    d->active        = false;
+    d->osName        = "N/A";
+    d->clientName    = "N/A";
     d->clientVersion = "0.0";
 
     d->root = new Task(this, true);
@@ -168,11 +165,11 @@ Client::Client(QObject *par)
 
     d->capsman = new CapsManager(this);
 
-    d->serverInfoManager = new ServerInfoManager(this);
+    d->serverInfoManager     = new ServerInfoManager(this);
     d->httpFileUploadManager = new HttpFileUploadManager(this);
 
     d->jingleManager = new Jingle::Manager(this);
-    auto ft = new Jingle::FileTransfer::Manager(this);
+    auto ft          = new Jingle::FileTransfer::Manager(this);
     d->jingleManager->registerApp(Jingle::FileTransfer::NS, ft);
     d->jingleS5BManager = new Jingle::S5B::Manager(d->jingleManager);
     d->jingleIBBManager = new Jingle::IBB::Manager(d->jingleManager);
@@ -182,8 +179,8 @@ Client::Client(QObject *par)
 
 Client::~Client()
 {
-    //fprintf(stderr, "\tClient::~Client\n");
-    //fflush(stderr);
+    // fprintf(stderr, "\tClient::~Client\n");
+    // fflush(stderr);
 
     close(true);
 
@@ -193,18 +190,18 @@ Client::~Client()
     delete d->jingleManager;
     delete d->root;
     delete d;
-    //fprintf(stderr, "\tClient::~Client\n");
+    // fprintf(stderr, "\tClient::~Client\n");
 }
 
 void Client::connectToServer(ClientStream *s, const Jid &j, bool auth)
 {
     d->stream = s;
-    //connect(d->stream, SIGNAL(connected()), SLOT(streamConnected()));
-    //connect(d->stream, SIGNAL(handshaken()), SLOT(streamHandshaken()));
+    // connect(d->stream, SIGNAL(connected()), SLOT(streamConnected()));
+    // connect(d->stream, SIGNAL(handshaken()), SLOT(streamHandshaken()));
     connect(d->stream, SIGNAL(error(int)), SLOT(streamError(int)));
-    //connect(d->stream, SIGNAL(sslCertificateReady(QSSLCert)), SLOT(streamSSLCertificateReady(QSSLCert)));
+    // connect(d->stream, SIGNAL(sslCertificateReady(QSSLCert)), SLOT(streamSSLCertificateReady(QSSLCert)));
     connect(d->stream, SIGNAL(readyRead()), SLOT(streamReadyRead()));
-    //connect(d->stream, SIGNAL(closeFinished()), SLOT(streamCloseFinished()));
+    // connect(d->stream, SIGNAL(closeFinished()), SLOT(streamCloseFinished()));
     connect(d->stream, SIGNAL(incomingXml(QString)), SLOT(streamIncomingXml(QString)));
     connect(d->stream, SIGNAL(outgoingXml(QString)), SLOT(streamOutgoingXml(QString)));
     connect(d->stream, SIGNAL(haveUnhandledFeatures()), SLOT(parseUnhandledStreamFeatures()));
@@ -215,9 +212,9 @@ void Client::connectToServer(ClientStream *s, const Jid &j, bool auth)
 void Client::start(const QString &host, const QString &user, const QString &pass, const QString &_resource)
 {
     // TODO
-    d->host = host;
-    d->user = user;
-    d->pass = pass;
+    d->host     = host;
+    d->user     = user;
+    d->pass     = pass;
     d->resource = _resource;
 
     Status stat;
@@ -225,8 +222,8 @@ void Client::start(const QString &host, const QString &user, const QString &pass
     d->resourceList += Resource(resource(), stat);
 
     JT_PushPresence *pp = new JT_PushPresence(rootTask());
-    connect(pp, SIGNAL(subscription(Jid,QString,QString)), SLOT(ppSubscription(Jid,QString,QString)));
-    connect(pp, SIGNAL(presence(Jid,Status)), SLOT(ppPresence(Jid,Status)));
+    connect(pp, SIGNAL(subscription(Jid, QString, QString)), SLOT(ppSubscription(Jid, QString, QString)));
+    connect(pp, SIGNAL(presence(Jid, Status)), SLOT(ppPresence(Jid, Status)));
 
     JT_PushMessage *pm = new JT_PushMessage(rootTask(), d->encryptionHandler);
     connect(pm, SIGNAL(message(Message)), SLOT(pmMessage(Message)));
@@ -240,90 +237,50 @@ void Client::start(const QString &host, const QString &user, const QString &pass
     d->active = true;
 }
 
-void Client::setTcpPortReserver(TcpPortReserver *portReserver)
-{
-    d->tcpPortReserver = portReserver;
-}
+void Client::setTcpPortReserver(TcpPortReserver *portReserver) { d->tcpPortReserver = portReserver; }
 
-TcpPortReserver * Client::tcpPortReserver() const
-{
-    return d->tcpPortReserver;
-}
+TcpPortReserver *Client::tcpPortReserver() const { return d->tcpPortReserver; }
 
 void Client::setFileTransferEnabled(bool b)
 {
-    if(b) {
-        if(!d->ftman)
+    if (b) {
+        if (!d->ftman)
             d->ftman = new FileTransferManager(this);
-    }
-    else {
-        if(d->ftman) {
+    } else {
+        if (d->ftman) {
             delete d->ftman;
             d->ftman = nullptr;
         }
     }
 }
 
-FileTransferManager *Client::fileTransferManager() const
-{
-    return d->ftman;
-}
+FileTransferManager *Client::fileTransferManager() const { return d->ftman; }
 
-S5BManager *Client::s5bManager() const
-{
-    return d->s5bman;
-}
+S5BManager *Client::s5bManager() const { return d->s5bman; }
 
-Jingle::S5B::Manager *Client::jingleS5BManager() const
-{
-    return d->jingleS5BManager;
-}
+Jingle::S5B::Manager *Client::jingleS5BManager() const { return d->jingleS5BManager; }
 
-Jingle::IBB::Manager *Client::jingleIBBManager() const
-{
-    return d->jingleIBBManager;
-}
+Jingle::IBB::Manager *Client::jingleIBBManager() const { return d->jingleIBBManager; }
 
-IBBManager *Client::ibbManager() const
-{
-    return d->ibbman;
-}
+IBBManager *Client::ibbManager() const { return d->ibbman; }
 
-BoBManager *Client::bobManager() const
-{
-    return d->bobman;
-}
+BoBManager *Client::bobManager() const { return d->bobman; }
 
-CapsManager *Client::capsManager() const
-{
-    return d->capsman;
-}
+CapsManager *Client::capsManager() const { return d->capsman; }
 
-ServerInfoManager *Client::serverInfoManager() const
-{
-    return d->serverInfoManager;
-}
+ServerInfoManager *Client::serverInfoManager() const { return d->serverInfoManager; }
 
-HttpFileUploadManager *Client::httpFileUploadManager() const
-{
-    return d->httpFileUploadManager;
-}
+HttpFileUploadManager *Client::httpFileUploadManager() const { return d->httpFileUploadManager; }
 
-Jingle::Manager *Client::jingleManager() const
-{
-    return d->jingleManager;
-}
+Jingle::Manager *Client::jingleManager() const { return d->jingleManager; }
 
-bool Client::isActive() const
-{
-    return d->active;
-}
+bool Client::isActive() const { return d->active; }
 
-QString Client::groupChatPassword(const QString& host, const QString& room) const
+QString Client::groupChatPassword(const QString &host, const QString &room) const
 {
     Jid jid(room + "@" + host);
-    foreach(const GroupChat &i, d->groupChatList) {
-        if(i.j.compare(jid, false)) {
+    foreach (const GroupChat &i, d->groupChatList) {
+        if (i.j.compare(jid, false)) {
             return i.password;
         }
     }
@@ -333,9 +290,9 @@ QString Client::groupChatPassword(const QString& host, const QString& room) cons
 void Client::groupChatChangeNick(const QString &host, const QString &room, const QString &nick, const Status &_s)
 {
     Jid jid(room + "@" + host + "/" + nick);
-    for(QList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) {
+    for (QList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) {
         GroupChat &i = *it;
-        if(i.j.compare(jid, false)) {
+        if (i.j.compare(jid, false)) {
             i.j = jid;
 
             Status s = _s;
@@ -350,37 +307,37 @@ void Client::groupChatChangeNick(const QString &host, const QString &room, const
     }
 }
 
-bool Client::groupChatJoin(const QString &host, const QString &room, const QString &nick, const QString& password, int maxchars, int maxstanzas, int seconds, const QDateTime &since, const Status& _s)
+bool Client::groupChatJoin(const QString &host, const QString &room, const QString &nick, const QString &password,
+                           int maxchars, int maxstanzas, int seconds, const QDateTime &since, const Status &_s)
 {
     Jid jid(room + "@" + host + "/" + nick);
-    for(QList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end();) {
+    for (QList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end();) {
         GroupChat &i = *it;
-        if(i.j.compare(jid, false)) {
+        if (i.j.compare(jid, false)) {
             // if this room is shutting down, then free it up
-            if(i.status == GroupChat::Closing)
+            if (i.status == GroupChat::Closing)
                 it = d->groupChatList.erase(it);
             else
                 return false;
-        }
-        else
+        } else
             ++it;
     }
 
     debug(QString("Client: Joined: [%1]\n").arg(jid.full()));
     GroupChat i;
-    i.j = jid;
-    i.status = GroupChat::Connecting;
+    i.j        = jid;
+    i.status   = GroupChat::Connecting;
     i.password = password;
     d->groupChatList += i;
 
     JT_Presence *j = new JT_Presence(rootTask());
-    Status s = _s;
+    Status       s = _s;
     s.setMUC();
     s.setMUCHistory(maxchars, maxstanzas, seconds, since);
     if (!password.isEmpty()) {
         s.setMUCPassword(password);
     }
-    j->pres(jid,s);
+    j->pres(jid, s);
     j->go(true);
 
     return true;
@@ -388,16 +345,16 @@ bool Client::groupChatJoin(const QString &host, const QString &room, const QStri
 
 void Client::groupChatSetStatus(const QString &host, const QString &room, const Status &_s)
 {
-    Jid jid(room + "@" + host);
+    Jid  jid(room + "@" + host);
     bool found = false;
     foreach (const GroupChat &i, d->groupChatList) {
-        if(i.j.compare(jid, false)) {
+        if (i.j.compare(jid, false)) {
             found = true;
-            jid = i.j;
+            jid   = i.j;
             break;
         }
     }
-    if(!found)
+    if (!found)
         return;
 
     Status s = _s;
@@ -411,17 +368,17 @@ void Client::groupChatSetStatus(const QString &host, const QString &room, const
 void Client::groupChatLeave(const QString &host, const QString &room, const QString &statusStr)
 {
     Jid jid(room + "@" + host);
-    for(QList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) {
+    for (QList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) {
         GroupChat &i = *it;
 
-        if(!i.j.compare(jid, false))
+        if (!i.j.compare(jid, false))
             continue;
 
         i.status = GroupChat::Closing;
         debug(QString("Client: Leaving: [%1]\n").arg(i.j.full()));
 
         JT_Presence *j = new JT_Presence(rootTask());
-        Status s;
+        Status       s;
         s.setIsAvailable(false);
         s.setStatus(statusStr);
         j->pres(i.j, s);
@@ -432,12 +389,12 @@ void Client::groupChatLeave(const QString &host, const QString &room, const QStr
 void Client::groupChatLeaveAll(const QString &statusStr)
 {
     if (d->stream && d->active) {
-        for(QList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) {
+        for (QList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) {
             GroupChat &i = *it;
-            i.status = GroupChat::Closing;
+            i.status     = GroupChat::Closing;
 
             JT_Presence *j = new JT_Presence(rootTask());
-            Status s;
+            Status       s;
             s.setIsAvailable(false);
             s.setStatus(statusStr);
             j->pres(i.j, s);
@@ -472,10 +429,10 @@ QString Client::groupChatNick(const QString &host, const QString &room) const
 // TODO: fast close
 void Client::close(bool)
 {
-    //fprintf(stderr, "\tClient::close\n");
-    //fflush(stderr);
+    // fprintf(stderr, "\tClient::close\n");
+    // fflush(stderr);
 
-    if(d->stream) {
+    if (d->stream) {
         d->stream->disconnect(this);
         d->stream->close();
         d->stream = nullptr;
@@ -487,7 +444,7 @@ void Client::close(bool)
 void Client::cleanup()
 {
     d->active = false;
-    //d->authed = false;
+    // d->authed = false;
     d->groupChatList.clear();
 }
 
@@ -508,12 +465,12 @@ void Client::streamHandshaken()
 
 void Client::streamError(int)
 {
-    //StreamError e = err;
-    //error(e);
+    // StreamError e = err;
+    // error(e);
 
-    //if(!e.isWarning()) {
-        disconnected();
-        cleanup();
+    // if(!e.isWarning()) {
+    disconnected();
+    cleanup();
     //}
 } // namespace XMPP
 
@@ -531,32 +488,32 @@ static QDomElement oldStyleNS(const QDomElement &e)
 {
     // find closest parent with a namespace
     QDomNode par = e.parentNode();
-    while(!par.isNull() && par.namespaceURI().isNull())
+    while (!par.isNull() && par.namespaceURI().isNull())
         par = par.parentNode();
     bool noShowNS = false;
-    if(!par.isNull() && par.namespaceURI() == e.namespaceURI())
+    if (!par.isNull() && par.namespaceURI() == e.namespaceURI())
         noShowNS = true;
 
     QDomElement i;
-    int x;
-    //if(noShowNS)
-        i = e.ownerDocument().createElement(e.tagName());
-    //else
+    int         x;
+    // if(noShowNS)
+    i = e.ownerDocument().createElement(e.tagName());
+    // else
     //    i = e.ownerDocument().createElementNS(e.namespaceURI(), e.tagName());
 
     // copy attributes
     QDomNamedNodeMap al = e.attributes();
-    for(x = 0; x < al.count(); ++x)
+    for (x = 0; x < al.count(); ++x)
         i.setAttributeNode(al.item(x).cloneNode().toAttr());
 
-    if(!noShowNS)
+    if (!noShowNS)
         i.setAttribute("xmlns", e.namespaceURI());
 
     // copy children
     QDomNodeList nl = e.childNodes();
-    for(x = 0; x < nl.count(); ++x) {
+    for (x = 0; x < nl.count(); ++x) {
         QDomNode n = nl.item(x);
-        if(n.isElement())
+        if (n.isElement())
             i.appendChild(oldStyleNS(n.toElement()));
         else
             i.appendChild(n.cloneNode());
@@ -566,17 +523,17 @@ static QDomElement oldStyleNS(const QDomElement &e)
 
 void Client::streamReadyRead()
 {
-    //fprintf(stderr, "\tClientStream::streamReadyRead\n");
-    //fflush(stderr);
+    // fprintf(stderr, "\tClientStream::streamReadyRead\n");
+    // fflush(stderr);
 
-    while(d->stream && d->stream->stanzaAvailable()) {
+    while (d->stream && d->stream->stanzaAvailable()) {
         Stanza s = d->stream->read();
 
         QString out = s.toString();
         debug(QString("Client: incoming: [\n%1]\n").arg(out));
         emit xmlIncoming(out);
 
-        QDomElement x = s.element();//oldStyleNS(s.element());
+        QDomElement x = s.element(); // oldStyleNS(s.element());
         distribute(x);
     }
 }
@@ -584,7 +541,7 @@ void Client::streamReadyRead()
 void Client::streamIncomingXml(const QString &s)
 {
     QString str = s;
-    if(str.at(str.length()-1) != '\n')
+    if (str.at(str.length() - 1) != '\n')
         str += '\n';
     emit xmlIncoming(str);
 }
@@ -592,7 +549,7 @@ void Client::streamIncomingXml(const QString &s)
 void Client::streamOutgoingXml(const QString &s)
 {
     QString str = s;
-    if(str.at(str.length()-1) != '\n')
+    if (str.at(str.length() - 1) != '\n')
         str += '\n';
     emit xmlOutgoing(str);
 }
@@ -610,10 +567,7 @@ void Client::parseUnhandledStreamFeatures()
     }
 }
 
-void Client::debug(const QString &str)
-{
-    emit debugText(str);
-}
+void Client::debug(const QString &str) { emit debugText(str); }
 
 QString Client::genUniqueId()
 {
@@ -623,28 +577,22 @@ QString Client::genUniqueId()
     return s;
 }
 
-Task *Client::rootTask()
-{
-    return d->root;
-}
+Task *Client::rootTask() { return d->root; }
 
-QDomDocument *Client::doc() const
-{
-    return &d->doc;
-}
+QDomDocument *Client::doc() const { return &d->doc; }
 
 void Client::distribute(const QDomElement &x)
 {
     static QString fromAttr(QStringLiteral("from"));
-    if(x.hasAttribute(fromAttr)) {
+    if (x.hasAttribute(fromAttr)) {
         Jid j(x.attribute(fromAttr));
-        if(!j.isValid()) {
+        if (!j.isValid()) {
             debug("Client: bad 'from' JID\n");
             return;
         }
     }
 
-    if(!rootTask()->take(x) && (x.attribute("type") == "get" || x.attribute("type") == "set") ) {
+    if (!rootTask()->take(x) && (x.attribute("type") == "get" || x.attribute("type") == "set")) {
         debug("Client: Unrecognized IQ.\n");
 
         // Create reply element
@@ -657,7 +605,7 @@ void Client::distribute(const QDomElement &x)
 
         // Add error
         QDomElement error = doc()->createElement("error");
-        error.setAttribute("type","cancel");
+        error.setAttribute("type", "cancel");
         reply.appendChild(error);
 
         QDomElement error_type = doc()->createElementNS(QLatin1String("urn:ietf:params:xml:ns:xmpp-stanzas"),
@@ -670,109 +618,80 @@ void Client::distribute(const QDomElement &x)
 
 void Client::send(const QDomElement &x)
 {
-    if(!d->stream)
+    if (!d->stream)
         return;
 
-    //QString out;
-    //QTextStream ts(&out, IO_WriteOnly);
-    //x.save(ts, 0);
+    // QString out;
+    // QTextStream ts(&out, IO_WriteOnly);
+    // x.save(ts, 0);
 
-    //QString out = Stream::xmlToString(x);
-    //debug(QString("Client: outgoing: [\n%1]\n").arg(out));
-    //xmlOutgoing(out);
+    // QString out = Stream::xmlToString(x);
+    // debug(QString("Client: outgoing: [\n%1]\n").arg(out));
+    // xmlOutgoing(out);
 
     QDomElement e = addCorrectNS(x);
-    Stanza s = d->stream->createStanza(e);
-    if(s.isNull()) { // e's namespace is not "jabber:client" or e.tagName is not in (message,presence,iq)
-        //printf("bad stanza??\n");
+    Stanza      s = d->stream->createStanza(e);
+    if (s.isNull()) { // e's namespace is not "jabber:client" or e.tagName is not in (message,presence,iq)
+        // printf("bad stanza??\n");
         return;
     }
     emit stanzaElementOutgoing(e); // signal handler may change the node (TODO weird design?)
-    if (e.isNull()) { // so it was changed by signal above
+    if (e.isNull()) {              // so it was changed by signal above
         return;
     }
     QString out = s.toString();
-    //qWarning() << "Out: " << out;
+    // qWarning() << "Out: " << out;
     debug(QString("Client: outgoing: [\n%1]\n").arg(out));
     emit xmlOutgoing(out);
 
-    //printf("x[%s] x2[%s] s[%s]\n", Stream::xmlToString(x).toLatin1(), Stream::xmlToString(e).toLatin1(), s.toString().toLatin1());
+    // printf("x[%s] x2[%s] s[%s]\n", Stream::xmlToString(x).toLatin1(), Stream::xmlToString(e).toLatin1(),
+    // s.toString().toLatin1());
     d->stream->write(s);
 }
 
 void Client::send(const QString &str)
 {
-    if(!d->stream)
+    if (!d->stream)
         return;
 
     debug(QString("Client: outgoing: [\n%1]\n").arg(str));
     emit xmlOutgoing(str);
-    static_cast<ClientStream*>(d->stream)->writeDirect(str);
+    static_cast<ClientStream *>(d->stream)->writeDirect(str);
 }
 
 /* drops any pending outgoing xml elements */
-void Client::clearSendQueue()
-{
-    d->stream->clearSendQueue();
-}
+void Client::clearSendQueue() { d->stream->clearSendQueue(); }
 
-bool Client::hasStream() const
-{
-    return !!d->stream;
-}
+bool Client::hasStream() const { return !!d->stream; }
 
-Stream & Client::stream()
-{
-    return *(d->stream.data());
-}
+Stream &Client::stream() { return *(d->stream.data()); }
 
-QString Client::streamBaseNS() const
-{
-    return d->stream->baseNS();
-}
+QString Client::streamBaseNS() const { return d->stream->baseNS(); }
 
-const LiveRoster & Client::roster() const
-{
-    return d->roster;
-}
+const LiveRoster &Client::roster() const { return d->roster; }
 
-const ResourceList & Client::resourceList() const
-{
-    return d->resourceList;
-}
+const ResourceList &Client::resourceList() const { return d->resourceList; }
 
 bool Client::isSessionRequired() const
 {
     return d->stream && !d->stream->old() && d->stream->streamFeatures().session_required;
 }
 
-QString Client::host() const
-{
-    return d->host;
-}
+QString Client::host() const { return d->host; }
 
-QString Client::user() const
-{
-    return d->user;
-}
+QString Client::user() const { return d->user; }
 
-QString Client::pass() const
-{
-    return d->pass;
-}
+QString Client::pass() const { return d->pass; }
 
-QString Client::resource() const
-{
-    return d->resource;
-}
+QString Client::resource() const { return d->resource; }
 
 Jid Client::jid() const
 {
     QString s;
-    if(!d->user.isEmpty())
+    if (!d->user.isEmpty())
         s += d->user + '@';
     s += d->host;
-    if(!d->resource.isEmpty()) {
+    if (!d->resource.isEmpty()) {
         s += '/';
         s += d->resource;
     }
@@ -780,89 +699,78 @@ Jid Client::jid() const
     return Jid(s);
 }
 
-void Client::setNetworkAccessManager(QNetworkAccessManager *qnam)
-{
-    d->qnam = qnam;
-}
+void Client::setNetworkAccessManager(QNetworkAccessManager *qnam) { d->qnam = qnam; }
 
-QNetworkAccessManager *Client::networkAccessManager() const
-{
-    return d->qnam;
-}
+QNetworkAccessManager *Client::networkAccessManager() const { return d->qnam; }
 
-void Client::ppSubscription(const Jid &j, const QString &s, const QString& n)
-{
-    emit subscription(j, s, n);
-}
+void Client::ppSubscription(const Jid &j, const QString &s, const QString &n) { emit subscription(j, s, n); }
 
 void Client::ppPresence(const Jid &j, const Status &s)
 {
-    if(s.isAvailable())
+    if (s.isAvailable())
         debug(QString("Client: %1 is available.\n").arg(j.full()));
     else
         debug(QString("Client: %1 is unavailable.\n").arg(j.full()));
 
-    for(QList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) {
+    for (QList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) {
         GroupChat &i = *it;
 
-        if(i.j.compare(j, false)) {
-            bool us = (i.j.resource() == j.resource() || j.resource().isEmpty()) ? true: false;
+        if (i.j.compare(j, false)) {
+            bool us = (i.j.resource() == j.resource() || j.resource().isEmpty()) ? true : false;
 
             debug(QString("for groupchat i=[%1] pres=[%2], [us=%3].\n").arg(i.j.full()).arg(j.full()).arg(us));
-            switch(i.status) {
-                case GroupChat::Connecting:
-                    if(us && s.hasError()) {
-                        Jid j = i.j;
-                        d->groupChatList.erase(it);
-                        emit groupChatError(j, s.errorCode(), s.errorString());
+            switch (i.status) {
+            case GroupChat::Connecting:
+                if (us && s.hasError()) {
+                    Jid j = i.j;
+                    d->groupChatList.erase(it);
+                    emit groupChatError(j, s.errorCode(), s.errorString());
+                } else {
+                    // don't signal success unless it is a non-error presence
+                    if (!s.hasError()) {
+                        i.status = GroupChat::Connected;
+                        emit groupChatJoined(i.j);
                     }
-                    else {
-                        // don't signal success unless it is a non-error presence
-                        if(!s.hasError()) {
-                            i.status = GroupChat::Connected;
-                            emit groupChatJoined(i.j);
-                        }
-                        emit groupChatPresence(j, s);
-                    }
-                    break;
-                case GroupChat::Connected:
                     emit groupChatPresence(j, s);
-                    break;
-                case GroupChat::Closing:
-                    if(us && !s.isAvailable()) {
-                        Jid j = i.j;
-                        d->groupChatList.erase(it);
-                        emit groupChatLeft(j);
-                    }
-                    break;
-                default:
-                    break;
+                }
+                break;
+            case GroupChat::Connected:
+                emit groupChatPresence(j, s);
+                break;
+            case GroupChat::Closing:
+                if (us && !s.isAvailable()) {
+                    Jid j = i.j;
+                    d->groupChatList.erase(it);
+                    emit groupChatLeft(j);
+                }
+                break;
+            default:
+                break;
             }
 
             return;
         }
     }
 
-    if(s.hasError()) {
+    if (s.hasError()) {
         emit presenceError(j, s.errorCode(), s.errorString());
         return;
     }
 
     // is it me?
-    if(j.compare(jid(), false)) {
+    if (j.compare(jid(), false)) {
         updateSelfPresence(j, s);
-    }
-    else {
+    } else {
         // update all relavent roster entries
-        for(LiveRoster::Iterator it = d->roster.begin(); it != d->roster.end(); ++it) {
+        for (LiveRoster::Iterator it = d->roster.begin(); it != d->roster.end(); ++it) {
             LiveRosterItem &i = *it;
 
-            if(!i.jid().compare(j, false))
+            if (!i.jid().compare(j, false))
                 continue;
 
             // roster item has its own resource?
-            if(!i.jid().resource().isEmpty()) {
-                if(i.jid().resource() != j.resource())
+            if (!i.jid().resource().isEmpty()) {
+                if (i.jid().resource() != j.resource())
                     continue;
             }
 
@@ -873,12 +781,12 @@ void Client::ppPresence(const Jid &j, const Status &s)
 
 void Client::updateSelfPresence(const Jid &j, const Status &s)
 {
-    ResourceList::Iterator rit = d->resourceList.find(j.resource());
-    bool found = (rit == d->resourceList.end()) ? false: true;
+    ResourceList::Iterator rit   = d->resourceList.find(j.resource());
+    bool                   found = (rit == d->resourceList.end()) ? false : true;
 
     // unavailable?  remove the resource
-    if(!s.isAvailable()) {
-        if(found) {
+    if (!s.isAvailable()) {
+        if (found) {
             debug(QString("Client: Removing self resource: name=[%1]\n").arg(j.resource()));
             (*rit).setStatus(s);
             emit resourceUnavailable(j, *rit);
@@ -888,12 +796,11 @@ void Client::updateSelfPresence(const Jid &j, const Status &s)
     // available?  add/update the resource
     else {
         Resource r;
-        if(!found) {
+        if (!found) {
             r = Resource(j.resource(), s);
             d->resourceList += r;
             debug(QString("Client: Adding self resource: name=[%1]\n").arg(j.resource()));
-        }
-        else {
+        } else {
             (*rit).setStatus(s);
             r = *rit;
             debug(QString("Client: Updating self resource: name=[%1]\n").arg(j.resource()));
@@ -905,19 +812,18 @@ void Client::updateSelfPresence(const Jid &j, const Status &s)
 
 void Client::updatePresence(LiveRosterItem *i, const Jid &j, const Status &s)
 {
-    ResourceList::Iterator rit = i->resourceList().find(j.resource());
-    bool found = (rit == i->resourceList().end()) ? false: true;
+    ResourceList::Iterator rit   = i->resourceList().find(j.resource());
+    bool                   found = (rit == i->resourceList().end()) ? false : true;
 
     // unavailable?  remove the resource
-    if(!s.isAvailable()) {
-        if(found) {
+    if (!s.isAvailable()) {
+        if (found) {
             (*rit).setStatus(s);
             debug(QString("Client: Removing resource from [%1]: name=[%2]\n").arg(i->jid().full()).arg(j.resource()));
             emit resourceUnavailable(j, *rit);
             i->resourceList().erase(rit);
             i->setLastUnavailableStatus(s);
-        }
-        else {
+        } else {
             // create the resource just for the purpose of emit
             Resource r = Resource(j.resource(), s);
             i->resourceList() += r;
@@ -930,12 +836,11 @@ void Client::updatePresence(LiveRosterItem *i, const Jid &j, const Status &s)
     // available?  add/update the resource
     else {
         Resource r;
-        if(!found) {
+        if (!found) {
             r = Resource(j.resource(), s);
             i->resourceList() += r;
             debug(QString("Client: Adding resource to [%1]: name=[%2]\n").arg(i->jid().full()).arg(j.resource()));
-        }
-        else {
+        } else {
             (*rit).setStatus(s);
             r = *rit;
             debug(QString("Client: Updating resource to [%1]: name=[%2]\n").arg(i->jid().full()).arg(j.resource()));
@@ -958,29 +863,25 @@ void Client::pmMessage(const Message &m)
         d->ibbman->takeIncomingData(m.from(), m.id(), m.ibbData(), Stanza::Message);
     }
 
-    if(m.type() == "groupchat") {
-        for(QList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) {
+    if (m.type() == "groupchat") {
+        for (QList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) {
             const GroupChat &i = *it;
 
-            if(!i.j.compare(m.from(), false))
+            if (!i.j.compare(m.from(), false))
                 continue;
 
-            if(i.status == GroupChat::Connected)
+            if (i.status == GroupChat::Connected)
                 messageReceived(m);
         }
-    }
-    else
+    } else
         messageReceived(m);
 }
 
-void Client::prRoster(const Roster &r)
-{
-    importRoster(r);
-}
+void Client::prRoster(const Roster &r) { importRoster(r); }
 
 void Client::rosterRequest()
 {
-    if(!d->active)
+    if (!d->active)
         return;
 
     JT_Roster *r = new JT_Roster(rootTask());
@@ -994,24 +895,22 @@ void Client::slotRosterRequestFinished()
 {
     JT_Roster *r = static_cast<JT_Roster *>(sender());
     // on success, let's take it
-    if(r->success()) {
-        //d->roster.flagAllForDelete(); // mod_groups patch
+    if (r->success()) {
+        // d->roster.flagAllForDelete(); // mod_groups patch
 
         importRoster(r->roster());
 
-        for(LiveRoster::Iterator it = d->roster.begin(); it != d->roster.end();) {
+        for (LiveRoster::Iterator it = d->roster.begin(); it != d->roster.end();) {
             LiveRosterItem &i = *it;
-            if(i.flagForDelete()) {
+            if (i.flagForDelete()) {
                 emit rosterItemRemoved(i);
                 it = d->roster.erase(it);
-            }
-            else
+            } else
                 ++it;
         }
-    }
-    else {
+    } else {
         // don't report a disconnect.  Client::error() will do that.
-        if(r->statusCode() == Task::ErrDisc)
+        if (r->statusCode() == Task::ErrDisc)
             return;
     }
 
@@ -1022,7 +921,7 @@ void Client::slotRosterRequestFinished()
 void Client::importRoster(const Roster &r)
 {
     emit beginImportRoster();
-    for(Roster::ConstIterator it = r.begin(); it != r.end(); ++it) {
+    for (Roster::ConstIterator it = r.begin(); it != r.end(); ++it) {
         importRosterItem(*it);
     }
     emit endImportRoster();
@@ -1031,30 +930,35 @@ void Client::importRoster(const Roster &r)
 void Client::importRosterItem(const RosterItem &item)
 {
     QString substr;
-    switch(item.subscription().type()) {
-        case Subscription::Both:
-            substr = "<-->";  break;
-        case Subscription::From:
-            substr = "  ->";  break;
-        case Subscription::To:
-            substr = "<-  ";  break;
-        case Subscription::Remove:
-            substr = "xxxx";  break;
-        case Subscription::None:
-        default:
-            substr = "----";  break;
+    switch (item.subscription().type()) {
+    case Subscription::Both:
+        substr = "<-->";
+        break;
+    case Subscription::From:
+        substr = "  ->";
+        break;
+    case Subscription::To:
+        substr = "<-  ";
+        break;
+    case Subscription::Remove:
+        substr = "xxxx";
+        break;
+    case Subscription::None:
+    default:
+        substr = "----";
+        break;
     }
 
     QString dstr, str;
     str.sprintf("  %s %-32s", qPrintable(substr), qPrintable(item.jid().full()));
-    if(!item.name().isEmpty())
+    if (!item.name().isEmpty())
         str += QString(" [") + item.name() + "]";
     str += '\n';
 
     // Remove
-    if(item.subscription().type() == Subscription::Remove) {
+    if (item.subscription().type() == Subscription::Remove) {
         LiveRoster::Iterator it = d->roster.find(item.jid());
-        if(it != d->roster.end()) {
+        if (it != d->roster.end()) {
             emit rosterItemRemoved(*it);
             d->roster.erase(it);
         }
@@ -1063,14 +967,13 @@ void Client::importRosterItem(const RosterItem &item)
     // Add/Update
     else {
         LiveRoster::Iterator it = d->roster.find(item.jid());
-        if(it != d->roster.end()) {
+        if (it != d->roster.end()) {
             LiveRosterItem &i = *it;
             i.setFlagForDelete(false);
             i.setRosterItem(item);
             emit rosterItemUpdated(i);
             dstr = "Client: (Updated) ";
-                }
-        else {
+        } else {
             LiveRosterItem i(item);
             d->roster += i;
 
@@ -1089,7 +992,7 @@ void Client::sendMessage(Message &m)
     j->go(true);
 }
 
-void Client::sendSubscription(const Jid &jid, const QString &type, const QString& nick)
+void Client::sendSubscription(const Jid &jid, const QString &type, const QString &nick)
 {
     JT_Presence *j = new JT_Presence(rootTask());
     j->sub(jid, type, nick);
@@ -1110,30 +1013,18 @@ void Client::setPresence(const Status &s)
 
     // update our resourceList
     ppPresence(jid(), s);
-    //ResourceList::Iterator rit = d->resourceList.find(resource());
-    //Resource &r = *rit;
-    //r.setStatus(s);
+    // ResourceList::Iterator rit = d->resourceList.find(resource());
+    // Resource &r = *rit;
+    // r.setStatus(s);
 }
 
-QString Client::OSName() const
-{
-    return d->osName;
-}
+QString Client::OSName() const { return d->osName; }
 
-QString Client::OSVersion() const
-{
-    return d->osVersion;
-}
+QString Client::OSVersion() const { return d->osVersion; }
 
-QString Client::timeZone() const
-{
-    return d->tzname;
-}
+QString Client::timeZone() const { return d->tzname; }
 
-int Client::timeZoneOffset() const
-{
-    return d->tzoffset;
-}
+int Client::timeZoneOffset() const { return d->tzoffset; }
 
 /**
   \brief Returns true if Client is using old, manual time zone conversions.
@@ -1145,77 +1036,38 @@ int Client::timeZoneOffset() const
   However, if you call setTimeZone(), Client instance switches to old mode
   and uses given time zone offset for all calculations.
   */
-bool Client::manualTimeZoneOffset() const
-{
-    return d->useTzoffset;
-}
+bool Client::manualTimeZoneOffset() const { return d->useTzoffset; }
 
-QString Client::clientName() const
-{
-    return d->clientName;
-}
+QString Client::clientName() const { return d->clientName; }
 
-QString Client::clientVersion() const
-{
-    return d->clientVersion;
-}
+QString Client::clientVersion() const { return d->clientVersion; }
 
-CapsSpec Client::caps() const
-{
-    return d->caps;
-}
+CapsSpec Client::caps() const { return d->caps; }
 
-CapsSpec Client::serverCaps() const
-{
-    return d->serverCaps;
-}
+CapsSpec Client::serverCaps() const { return d->serverCaps; }
 
-void Client::setOSName(const QString &name)
-{
-    d->osName = name;
-}
+void Client::setOSName(const QString &name) { d->osName = name; }
 
-void Client::setOSVersion(const QString &version)
-{
-    d->osVersion = version;
-}
+void Client::setOSVersion(const QString &version) { d->osVersion = version; }
 
 void Client::setTimeZone(const QString &name, int offset)
 {
-    d->tzname = name;
-    d->tzoffset = offset;
+    d->tzname      = name;
+    d->tzoffset    = offset;
     d->useTzoffset = true;
 }
 
-void Client::setClientName(const QString &s)
-{
-    d->clientName = s;
-}
+void Client::setClientName(const QString &s) { d->clientName = s; }
 
-void Client::setClientVersion(const QString &s)
-{
-    d->clientVersion = s;
-}
+void Client::setClientVersion(const QString &s) { d->clientVersion = s; }
 
-void Client::setCaps(const CapsSpec &s)
-{
-    d->caps = s;
-}
+void Client::setCaps(const CapsSpec &s) { d->caps = s; }
 
-void Client::setEncryptionHandler(EncryptionHandler *encryptionHandler)
-{
-    d->encryptionHandler = encryptionHandler;
-}
+void Client::setEncryptionHandler(EncryptionHandler *encryptionHandler) { d->encryptionHandler = encryptionHandler; }
 
-EncryptionHandler *Client::encryptionHandler() const
-{
-    return d->encryptionHandler;
-}
+EncryptionHandler *Client::encryptionHandler() const { return d->encryptionHandler; }
 
-DiscoItem::Identity Client::identity() const
-{
-    return d->identity;
-}
+DiscoItem::Identity Client::identity() const { return d->identity; }
 
 void Client::setIdentity(const DiscoItem::Identity &identity)
 {
@@ -1225,7 +1077,7 @@ void Client::setIdentity(const DiscoItem::Identity &identity)
     d->identity = identity;
 }
 
-void Client::setFeatures(const Features& f)
+void Client::setFeatures(const Features &f)
 {
     if (!(d->features == f)) {
         d->caps.resetVersion();
@@ -1233,10 +1085,7 @@ void Client::setFeatures(const Features& f)
     d->features = f;
 }
 
-const Features& Client::features() const
-{
-    return d->features;
-}
+const Features &Client::features() const { return d->features; }
 
 DiscoItem Client::makeDiscoResult(const QString &node) const
 {
@@ -1245,7 +1094,7 @@ DiscoItem Client::makeDiscoResult(const QString &node) const
     DiscoItem::Identity id = identity();
     if (id.category.isEmpty() || id.type.isEmpty()) {
         id.category = "client";
-        id.type = "pc";
+        id.type     = "pc";
     }
     item.setIdentities(id);
 
@@ -1267,18 +1116,19 @@ DiscoItem Client::makeDiscoResult(const QString &node) const
     // TODO rather do foreach for all registered jingle apps and transports
     features.addFeature("urn:xmpp:jingle:transports:s5b:1");
     features.addFeature("urn:xmpp:jingle:transports:ibb:1");
-    features.addFeature("urn:xmpp:jingle:apps:file-transfer:5"); // TODO: since it depends on UI it needs a way to be disabled
+    features.addFeature(
+        "urn:xmpp:jingle:apps:file-transfer:5"); // TODO: since it depends on UI it needs a way to be disabled
     Hash::populateFeatures(features);
 
     // Client-specific features
-    foreach (const QString & i, d->features.list()) {
+    foreach (const QString &i, d->features.list()) {
         features.addFeature(i);
     }
 
     item.setFeatures(features);
 
     // xep-0232 Software Information
-    XData si;
+    XData            si;
     XData::FieldList si_fields;
 
     XData::Field si_type_field;
@@ -1319,10 +1169,7 @@ DiscoItem Client::makeDiscoResult(const QString &node) const
     return item;
 }
 
-void Client::s5b_incomingReady()
-{
-    handleIncoming(d->s5bman->takeIncoming());
-}
+void Client::s5b_incomingReady() { handleIncoming(d->s5bman->takeIncoming()); }
 
 void Client::ibb_incomingReady()
 {
@@ -1337,9 +1184,9 @@ void Client::ibb_incomingReady()
 
 void Client::handleIncoming(BSConnection *c)
 {
-    if(!c)
+    if (!c)
         return;
-    if(!d->ftman) {
+    if (!d->ftman) {
         c->close();
         c->deleteLater();
         return;
@@ -1347,18 +1194,12 @@ void Client::handleIncoming(BSConnection *c)
     d->ftman->stream_incomingReady(c);
 }
 
-void Client::handleSMAckResponse(int h) {
-    qDebug() << "handleSMAckResponse: h = " << h;
-}
+void Client::handleSMAckResponse(int h) { qDebug() << "handleSMAckResponse: h = " << h; }
 
 //---------------------------------------------------------------------------
 // LiveRosterItem
 //---------------------------------------------------------------------------
-LiveRosterItem::LiveRosterItem(const Jid &jid)
-:RosterItem(jid)
-{
-    setFlagForDelete(false);
-}
+LiveRosterItem::LiveRosterItem(const Jid &jid) : RosterItem(jid) { setFlagForDelete(false); }
 
 LiveRosterItem::LiveRosterItem(const RosterItem &i)
 {
@@ -1366,9 +1207,7 @@ LiveRosterItem::LiveRosterItem(const RosterItem &i)
     setFlagForDelete(false);
 }
 
-LiveRosterItem::~LiveRosterItem()
-{
-}
+LiveRosterItem::~LiveRosterItem() {}
 
 void LiveRosterItem::setRosterItem(const RosterItem &i)
 {
@@ -1380,76 +1219,47 @@ void LiveRosterItem::setRosterItem(const RosterItem &i)
     setIsPush(i.isPush());
 }
 
-ResourceList & LiveRosterItem::resourceList()
-{
-    return v_resourceList;
-}
+ResourceList &LiveRosterItem::resourceList() { return v_resourceList; }
 
-ResourceList::Iterator LiveRosterItem::priority()
-{
-    return v_resourceList.priority();
-}
+ResourceList::Iterator LiveRosterItem::priority() { return v_resourceList.priority(); }
 
-const ResourceList & LiveRosterItem::resourceList() const
-{
-    return v_resourceList;
-}
+const ResourceList &LiveRosterItem::resourceList() const { return v_resourceList; }
 
-ResourceList::ConstIterator LiveRosterItem::priority() const
-{
-    return v_resourceList.priority();
-}
+ResourceList::ConstIterator LiveRosterItem::priority() const { return v_resourceList.priority(); }
 
 bool LiveRosterItem::isAvailable() const
 {
-    if(v_resourceList.count() > 0)
+    if (v_resourceList.count() > 0)
         return true;
     return false;
 }
 
-const Status & LiveRosterItem::lastUnavailableStatus() const
-{
-    return v_lastUnavailableStatus;
-}
+const Status &LiveRosterItem::lastUnavailableStatus() const { return v_lastUnavailableStatus; }
 
-bool LiveRosterItem::flagForDelete() const
-{
-    return v_flagForDelete;
-}
+bool LiveRosterItem::flagForDelete() const { return v_flagForDelete; }
 
-void LiveRosterItem::setLastUnavailableStatus(const Status &s)
-{
-    v_lastUnavailableStatus = s;
-}
+void LiveRosterItem::setLastUnavailableStatus(const Status &s) { v_lastUnavailableStatus = s; }
 
-void LiveRosterItem::setFlagForDelete(bool b)
-{
-    v_flagForDelete = b;
-}
+void LiveRosterItem::setFlagForDelete(bool b) { v_flagForDelete = b; }
 
 //---------------------------------------------------------------------------
 // LiveRoster
 //---------------------------------------------------------------------------
-LiveRoster::LiveRoster()
-:QList<LiveRosterItem>()
-{
-}
+LiveRoster::LiveRoster() : QList<LiveRosterItem>() {}
 
-LiveRoster::~LiveRoster()
-{
-}
+LiveRoster::~LiveRoster() {}
 
 void LiveRoster::flagAllForDelete()
 {
-    for(Iterator it = begin(); it != end(); ++it)
+    for (Iterator it = begin(); it != end(); ++it)
         (*it).setFlagForDelete(true);
 }
 
 LiveRoster::Iterator LiveRoster::find(const Jid &j, bool compareRes)
 {
     Iterator it;
-    for(it = begin(); it != end(); ++it) {
-        if((*it).jid().compare(j, compareRes))
+    for (it = begin(); it != end(); ++it) {
+        if ((*it).jid().compare(j, compareRes))
             break;
     }
     return it;
@@ -1458,8 +1268,8 @@ LiveRoster::Iterator LiveRoster::find(const Jid &j, bool compareRes)
 LiveRoster::ConstIterator LiveRoster::find(const Jid &j, bool compareRes) const
 {
     ConstIterator it;
-    for(it = begin(); it != end(); ++it) {
-        if((*it).jid().compare(j, compareRes))
+    for (it = begin(); it != end(); ++it) {
+        if ((*it).jid().compare(j, compareRes))
             break;
     }
     return it;
diff --git a/src/xmpp/xmpp-im/filetransfer.cpp b/src/xmpp/xmpp-im/filetransfer.cpp
index 2a66c8b1..3f110003 100644
--- a/src/xmpp/xmpp-im/filetransfer.cpp
+++ b/src/xmpp/xmpp-im/filetransfer.cpp
@@ -38,8 +38,8 @@ using namespace XMPP;
 // Get an element's first child element
 static QDomElement firstChildElement(const QDomElement &e)
 {
-    for(QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling()) {
-        if(n.isElement())
+    for (QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling()) {
+        if (n.isElement())
             return n.toElement();
     }
     return QDomElement();
@@ -48,46 +48,43 @@ static QDomElement firstChildElement(const QDomElement &e)
 //----------------------------------------------------------------------------
 // FileTransfer
 //----------------------------------------------------------------------------
-class FileTransfer::Private
-{
+class FileTransfer::Private {
 public:
     FileTransferManager *m;
-    JT_FT *ft;
-    Jid peer;
-    QString fname;
-    qlonglong size;
-    qlonglong sent;
-    QString desc;
-    bool rangeSupported;
-    qlonglong rangeOffset, rangeLength, length;
-    QString streamType;
-    Thumbnail thumbnail;
-    bool needStream;
-    QString id, iq_id;
-    BSConnection *c;
-    Jid proxy;
-    int state;
-    bool sender;
+    JT_FT *              ft;
+    Jid                  peer;
+    QString              fname;
+    qlonglong            size;
+    qlonglong            sent;
+    QString              desc;
+    bool                 rangeSupported;
+    qlonglong            rangeOffset, rangeLength, length;
+    QString              streamType;
+    Thumbnail            thumbnail;
+    bool                 needStream;
+    QString              id, iq_id;
+    BSConnection *       c;
+    Jid                  proxy;
+    int                  state;
+    bool                 sender;
 };
 
-FileTransfer::FileTransfer(FileTransferManager *m, QObject *parent)
-:QObject(parent)
+FileTransfer::FileTransfer(FileTransferManager *m, QObject *parent) : QObject(parent)
 {
-    d = new Private;
-    d->m = m;
+    d     = new Private;
+    d->m  = m;
     d->ft = nullptr;
-    d->c = nullptr;
+    d->c  = nullptr;
     reset();
 }
 
-FileTransfer::FileTransfer(const FileTransfer& other)
-    : QObject(other.parent())
+FileTransfer::FileTransfer(const FileTransfer &other) : QObject(other.parent())
 {
-    d = new Private;
-    *d = *other.d;
-    d->m = other.d->m;
+    d     = new Private;
+    *d    = *other.d;
+    d->m  = other.d->m;
     d->ft = nullptr;
-    d->c = 0;
+    d->c  = 0;
     reset();
 
     if (d->m->isActive(&other))
@@ -100,10 +97,7 @@ FileTransfer::~FileTransfer()
     delete d;
 }
 
-FileTransfer *FileTransfer::copy() const
-{
-    return new FileTransfer(*this);
-}
+FileTransfer *FileTransfer::copy() const { return new FileTransfer(*this); }
 
 void FileTransfer::reset()
 {
@@ -114,32 +108,27 @@ void FileTransfer::reset()
 
     if (d->c) {
         d->c->disconnect(this);
-        d->c->manager()->deleteConnection(d->c, d->state == Active && !d->sender ?
-                                              3000 : 0);
+        d->c->manager()->deleteConnection(d->c, d->state == Active && !d->sender ? 3000 : 0);
         d->c = nullptr;
     }
 
-    d->state = Idle;
+    d->state      = Idle;
     d->needStream = false;
-    d->sent = 0;
-    d->sender = false;
+    d->sent       = 0;
+    d->sender     = false;
 }
 
-void FileTransfer::setProxy(const Jid &proxy)
-{
-    d->proxy = proxy;
-}
+void FileTransfer::setProxy(const Jid &proxy) { d->proxy = proxy; }
 
-void FileTransfer::sendFile(const Jid &to, const QString &fname, qlonglong size,
-                            const QString &desc, Thumbnail &thumb)
+void FileTransfer::sendFile(const Jid &to, const QString &fname, qlonglong size, const QString &desc, Thumbnail &thumb)
 {
-    d->state = Requesting;
-    d->peer = to;
-    d->fname = fname;
-    d->size = size;
-    d->desc = desc;
+    d->state  = Requesting;
+    d->peer   = to;
+    d->fname  = fname;
+    d->size   = size;
+    d->desc   = desc;
     d->sender = true;
-    d->id = d->m->link(this);
+    d->id     = d->m->link(this);
 
     d->ft = new JT_FT(d->m->client()->rootTask());
     connect(d->ft, SIGNAL(finished()), SLOT(ft_finished()));
@@ -150,78 +139,53 @@ void FileTransfer::sendFile(const Jid &to, const QString &fname, qlonglong size,
 int FileTransfer::dataSizeNeeded() const
 {
     int pending = d->c->bytesToWrite();
-    if(pending >= SENDBUFSIZE)
+    if (pending >= SENDBUFSIZE)
         return 0;
     qlonglong left = d->length - (d->sent + pending);
-    int size = SENDBUFSIZE - pending;
-    if((qlonglong)size > left)
+    int       size = SENDBUFSIZE - pending;
+    if ((qlonglong)size > left)
         size = (int)left;
     return size;
 }
 
 void FileTransfer::writeFileData(const QByteArray &a)
 {
-    int pending = d->c->bytesToWrite();
-    qlonglong left = d->length - (d->sent + pending);
-    if(left == 0)
+    int       pending = d->c->bytesToWrite();
+    qlonglong left    = d->length - (d->sent + pending);
+    if (left == 0)
         return;
 
     QByteArray block;
-    if((qlonglong)a.size() > left) {
+    if ((qlonglong)a.size() > left) {
         block = a;
         block.resize((uint)left);
-    }
-    else
+    } else
         block = a;
     d->c->write(block);
 }
 
-const Thumbnail &FileTransfer::thumbnail() const
-{
-    return d->thumbnail;
-}
+const Thumbnail &FileTransfer::thumbnail() const { return d->thumbnail; }
 
-Jid FileTransfer::peer() const
-{
-    return d->peer;
-}
+Jid FileTransfer::peer() const { return d->peer; }
 
-QString FileTransfer::fileName() const
-{
-    return d->fname;
-}
+QString FileTransfer::fileName() const { return d->fname; }
 
-qlonglong FileTransfer::fileSize() const
-{
-    return d->size;
-}
+qlonglong FileTransfer::fileSize() const { return d->size; }
 
-QString FileTransfer::description() const
-{
-    return d->desc;
-}
+QString FileTransfer::description() const { return d->desc; }
 
-bool FileTransfer::rangeSupported() const
-{
-    return d->rangeSupported;
-}
+bool FileTransfer::rangeSupported() const { return d->rangeSupported; }
 
-qlonglong FileTransfer::offset() const
-{
-    return d->rangeOffset;
-}
+qlonglong FileTransfer::offset() const { return d->rangeOffset; }
 
-qlonglong FileTransfer::length() const
-{
-    return d->length;
-}
+qlonglong FileTransfer::length() const { return d->length; }
 
 void FileTransfer::accept(qlonglong offset, qlonglong length)
 {
-    d->state = Connecting;
+    d->state       = Connecting;
     d->rangeOffset = offset;
     d->rangeLength = length;
-    if(length > 0)
+    if (length > 0)
         d->length = length;
     else
         d->length = d->size;
@@ -230,38 +194,35 @@ void FileTransfer::accept(qlonglong offset, qlonglong length)
 
 void FileTransfer::close()
 {
-    if(d->state == Idle)
+    if (d->state == Idle)
         return;
-    if(d->state == WaitingForAccept)
+    if (d->state == WaitingForAccept)
         d->m->con_reject(this);
-    else if(d->state == Active)
+    else if (d->state == Active)
         d->c->close();
     reset();
 }
 
-BSConnection *FileTransfer::bsConnection() const
-{
-    return d->c;
-}
+BSConnection *FileTransfer::bsConnection() const { return d->c; }
 
 // file transfer request accepted or error happened
 void FileTransfer::ft_finished()
 {
     JT_FT *ft = d->ft;
-    d->ft = nullptr;
+    d->ft     = nullptr;
 
-    if(ft->success()) {
-        d->state = Connecting;
+    if (ft->success()) {
+        d->state       = Connecting;
         d->rangeOffset = ft->rangeOffset();
-        d->length = ft->rangeLength();
-        if(d->length == 0)
+        d->length      = ft->rangeLength();
+        if (d->length == 0)
             d->length = d->size - d->rangeOffset;
-        d->streamType = ft->streamType();
+        d->streamType                    = ft->streamType();
         BytestreamManager *streamManager = d->m->streamManager(d->streamType);
         if (streamManager) {
             d->c = streamManager->createConnection();
-            if (dynamic_cast<S5BManager*>(streamManager) && d->proxy.isValid()) {
-                ((S5BConnection*)(d->c))->setProxy(d->proxy);
+            if (dynamic_cast<S5BManager *>(streamManager) && d->proxy.isValid()) {
+                ((S5BConnection *)(d->c))->setProxy(d->proxy);
             }
             connect(d->c, SIGNAL(connected()), SLOT(stream_connected()));
             connect(d->c, SIGNAL(connectionClosed()), SLOT(stream_connectionClosed()));
@@ -270,16 +231,14 @@ void FileTransfer::ft_finished()
 
             d->c->connectToJid(d->peer, d->id);
             accepted();
-        }
-        else {
+        } else {
             emit error(Err400);
             reset();
         }
-    }
-    else {
-        if(ft->statusCode() == 403)
+    } else {
+        if (ft->statusCode() == 403)
             emit error(ErrReject);
-        else if(ft->statusCode() == 400)
+        else if (ft->statusCode() == 400)
             emit error(Err400);
         else
             emit error(ErrNeg);
@@ -295,8 +254,8 @@ void FileTransfer::takeConnection(BSConnection *c)
     connect(d->c, SIGNAL(readyRead()), SLOT(stream_readyRead()));
     connect(d->c, SIGNAL(error(int)), SLOT(stream_error(int)));
 
-    S5BConnection *s5b = dynamic_cast<S5BConnection*>(c);
-    if(s5b && d->proxy.isValid())
+    S5BConnection *s5b = dynamic_cast<S5BConnection *>(c);
+    if (s5b && d->proxy.isValid())
         s5b->setProxy(d->proxy);
     accepted();
     QTimer::singleShot(0, this, SLOT(doAccept()));
@@ -318,20 +277,20 @@ void FileTransfer::stream_connectionClosed()
 
 void FileTransfer::stream_readyRead()
 {
-    QByteArray a = d->c->readAll();
-    qlonglong need = d->length - d->sent;
-    if((qlonglong)a.size() > need)
+    QByteArray a    = d->c->readAll();
+    qlonglong  need = d->length - d->sent;
+    if ((qlonglong)a.size() > need)
         a.resize((uint)need);
     d->sent += a.size();
-//    if(d->sent == d->length) // we close it in stream_connectionClosed. at least for ibb
-//        reset();             // in other words we wait for another party to close the connection
+    //    if(d->sent == d->length) // we close it in stream_connectionClosed. at least for ibb
+    //        reset();             // in other words we wait for another party to close the connection
     readyRead(a);
 }
 
 void FileTransfer::stream_bytesWritten(qint64 x)
 {
     d->sent += x;
-    if(d->sent == d->length)
+    if (d->sent == d->length)
         reset();
     emit bytesWritten(x);
 }
@@ -339,9 +298,9 @@ void FileTransfer::stream_bytesWritten(qint64 x)
 void FileTransfer::stream_error(int x)
 {
     reset();
-    if(x == BSConnection::ErrRefused || x == BSConnection::ErrConnect)
+    if (x == BSConnection::ErrRefused || x == BSConnection::ErrConnect)
         error(ErrConnect);
-    else if(x == BSConnection::ErrProxy)
+    else if (x == BSConnection::ErrProxy)
         error(ErrProxy);
     else
         error(ErrStream);
@@ -349,41 +308,36 @@ void FileTransfer::stream_error(int x)
 
 void FileTransfer::man_waitForAccept(const FTRequest &req, const QString &streamType)
 {
-    d->state = WaitingForAccept;
-    d->peer = req.from;
-    d->id = req.id;
-    d->iq_id = req.iq_id;
-    d->fname = req.fname;
-    d->size = req.size;
-    d->desc = req.desc;
+    d->state          = WaitingForAccept;
+    d->peer           = req.from;
+    d->id             = req.id;
+    d->iq_id          = req.iq_id;
+    d->fname          = req.fname;
+    d->size           = req.size;
+    d->desc           = req.desc;
     d->rangeSupported = req.rangeSupported;
-    d->streamType = streamType;
-    d->thumbnail = req.thumbnail;
+    d->streamType     = streamType;
+    d->thumbnail      = req.thumbnail;
 }
 
-void FileTransfer::doAccept()
-{
-    d->c->accept();
-}
+void FileTransfer::doAccept() { d->c->accept(); }
 
 //----------------------------------------------------------------------------
 // FileTransferManager
 //----------------------------------------------------------------------------
-class FileTransferManager::Private
-{
+class FileTransferManager::Private {
 public:
-    Client *client;
-    QList<FileTransfer*> list, incoming;
-    QStringList streamPriority;
-    QHash<QString, BytestreamManager*> streamMap;
-    QSet<QString> disabledStreamTypes;
-    JT_PushFT *pft;
+    Client *                            client;
+    QList<FileTransfer *>               list, incoming;
+    QStringList                         streamPriority;
+    QHash<QString, BytestreamManager *> streamMap;
+    QSet<QString>                       disabledStreamTypes;
+    JT_PushFT *                         pft;
 };
 
-FileTransferManager::FileTransferManager(Client *client)
-:QObject(client)
+FileTransferManager::FileTransferManager(Client *client) : QObject(client)
 {
-    d = new Private;
+    d         = new Private;
     d->client = client;
     if (client->s5bManager()) {
         d->streamPriority.append(S5BManager::ns());
@@ -407,10 +361,7 @@ FileTransferManager::~FileTransferManager()
     delete d;
 }
 
-Client *FileTransferManager::client() const
-{
-    return d->client;
-}
+Client *FileTransferManager::client() const { return d->client; }
 
 FileTransfer *FileTransferManager::createTransfer()
 {
@@ -420,7 +371,7 @@ FileTransfer *FileTransferManager::createTransfer()
 
 FileTransfer *FileTransferManager::takeIncoming()
 {
-    if(d->incoming.isEmpty())
+    if (d->incoming.isEmpty())
         return nullptr;
 
     FileTransfer *ft = d->incoming.takeFirst();
@@ -432,15 +383,14 @@ FileTransfer *FileTransferManager::takeIncoming()
 
 bool FileTransferManager::isActive(const FileTransfer *ft) const
 {
-    return d->list.contains(const_cast<FileTransfer*>(ft));
+    return d->list.contains(const_cast<FileTransfer *>(ft));
 }
 
 void FileTransferManager::setDisabled(const QString &ns, bool state)
 {
     if (state) {
         d->disabledStreamTypes.insert(ns);
-    }
-    else {
+    } else {
         d->disabledStreamTypes.remove(ns);
     }
 }
@@ -448,8 +398,8 @@ void FileTransferManager::setDisabled(const QString &ns, bool state)
 void FileTransferManager::pft_incoming(const FTRequest &req)
 {
     QString streamType;
-    foreach(const QString& ns, d->streamPriority) {
-        if(req.streamTypes.contains(ns)) {
+    foreach (const QString &ns, d->streamPriority) {
+        if (req.streamTypes.contains(ns)) {
             BytestreamManager *manager = streamManager(ns);
             if (manager && manager->isAcceptableSID(req.from, req.id)) {
                 streamType = ns;
@@ -458,9 +408,8 @@ void FileTransferManager::pft_incoming(const FTRequest &req)
         }
     }
 
-    if(streamType.isEmpty()) {
-        d->pft->respondError(req.from, req.iq_id, Stanza::Error::NotAcceptable,
-                             "No valid stream types");
+    if (streamType.isEmpty()) {
+        d->pft->respondError(req.from, req.iq_id, Stanza::Error::NotAcceptable, "No valid stream types");
         return;
     }
 
@@ -470,7 +419,7 @@ void FileTransferManager::pft_incoming(const FTRequest &req)
     incomingReady();
 }
 
-BytestreamManager* FileTransferManager::streamManager(const QString &ns) const
+BytestreamManager *FileTransferManager::streamManager(const QString &ns) const
 {
     if (d->disabledStreamTypes.contains(ns)) {
         return nullptr;
@@ -491,8 +440,8 @@ QStringList FileTransferManager::streamPriority() const
 
 void FileTransferManager::stream_incomingReady(BSConnection *c)
 {
-    foreach(FileTransfer* ft, d->list) {
-        if(ft->d->needStream && ft->d->peer.compare(c->peer()) && ft->d->id == c->sid()) {
+    foreach (FileTransfer *ft, d->list) {
+        if (ft->d->needStream && ft->d->peer.compare(c->peer()) && ft->d->id == c->sid()) {
             ft->takeConnection(c);
             return;
         }
@@ -504,17 +453,17 @@ void FileTransferManager::stream_incomingReady(BSConnection *c)
 QString FileTransferManager::link(FileTransfer *ft)
 {
     QString id;
-    bool found;
+    bool    found;
     do {
         found = false;
-        id = QString("ft_%1").arg(qrand() & 0xffff, 4, 16, QChar('0'));
-        foreach (FileTransfer* ft, d->list) {
+        id    = QString("ft_%1").arg(qrand() & 0xffff, 4, 16, QChar('0'));
+        foreach (FileTransfer *ft, d->list) {
             if (ft->d->peer.compare(ft->d->peer) && ft->d->id == id) {
                 found = true;
                 break;
             }
         }
-    } while(found);
+    } while (found);
     d->list.append(ft);
     return id;
 }
@@ -530,42 +479,30 @@ void FileTransferManager::con_reject(FileTransfer *ft)
     d->pft->respondError(ft->d->peer, ft->d->iq_id, Stanza::Error::Forbidden, "Declined");
 }
 
-void FileTransferManager::unlink(FileTransfer *ft)
-{
-    d->list.removeAll(ft);
-}
+void FileTransferManager::unlink(FileTransfer *ft) { d->list.removeAll(ft); }
 
 //----------------------------------------------------------------------------
 // JT_FT
 //----------------------------------------------------------------------------
-class JT_FT::Private
-{
+class JT_FT::Private {
 public:
     QDomElement iq;
-    Jid to;
-    qlonglong size, rangeOffset, rangeLength;
-    QString streamType;
+    Jid         to;
+    qlonglong   size, rangeOffset, rangeLength;
+    QString     streamType;
     QStringList streamTypes;
 };
 
-JT_FT::JT_FT(Task *parent)
-:Task(parent)
-{
-    d = new Private;
-}
+JT_FT::JT_FT(Task *parent) : Task(parent) { d = new Private; }
 
-JT_FT::~JT_FT()
-{
-    delete d;
-}
+JT_FT::~JT_FT() { delete d; }
 
-void JT_FT::request(const Jid &to, const QString &_id, const QString &fname,
-                    qlonglong size, const QString &desc,
+void JT_FT::request(const Jid &to, const QString &_id, const QString &fname, qlonglong size, const QString &desc,
                     const QStringList &streamTypes, Thumbnail &thumb)
 {
     QDomElement iq;
-    d->to = to;
-    iq = createIQ(doc(), "set", to.full(), id());
+    d->to          = to;
+    iq             = createIQ(doc(), "set", to.full(), id());
     QDomElement si = doc()->createElementNS("http://jabber.org/protocol/si", "si");
     si.setAttribute("id", _id);
     si.setAttribute("profile", "http://jabber.org/protocol/si/profile/file-transfer");
@@ -573,7 +510,7 @@ void JT_FT::request(const Jid &to, const QString &_id, const QString &fname,
     QDomElement file = doc()->createElementNS("http://jabber.org/protocol/si/profile/file-transfer", "file");
     file.setAttribute("name", fname);
     file.setAttribute("size", QString::number(size));
-    if(!desc.isEmpty()) {
+    if (!desc.isEmpty()) {
         QDomElement de = doc()->createElement("desc");
         de.appendChild(doc()->createTextNode(desc));
         file.appendChild(de);
@@ -583,22 +520,22 @@ void JT_FT::request(const Jid &to, const QString &_id, const QString &fname,
 
     if (!thumb.data.isEmpty()) {
         BoBData data = client()->bobManager()->append(thumb.data, thumb.mimeType);
-        thumb.uri = QLatin1String("cid:") + data.cid();
+        thumb.uri    = QLatin1String("cid:") + data.cid();
         file.appendChild(thumb.toXml(doc()));
     }
 
     si.appendChild(file);
 
     QDomElement feature = doc()->createElementNS("http://jabber.org/protocol/feature-neg", "feature");
-    QDomElement x = doc()->createElementNS("jabber:x:data", "x");
+    QDomElement x       = doc()->createElementNS("jabber:x:data", "x");
     x.setAttribute("type", "form");
 
     QDomElement field = doc()->createElement("field");
     field.setAttribute("var", "stream-method");
     field.setAttribute("type", "list-single");
-    for(QStringList::ConstIterator it = streamTypes.begin(); it != streamTypes.end(); ++it) {
+    for (QStringList::ConstIterator it = streamTypes.begin(); it != streamTypes.end(); ++it) {
         QDomElement option = doc()->createElement("option");
-        QDomElement value = doc()->createElement("value");
+        QDomElement value  = doc()->createElement("value");
         value.appendChild(doc()->createTextNode(*it));
         option.appendChild(value);
         field.appendChild(option);
@@ -611,38 +548,26 @@ void JT_FT::request(const Jid &to, const QString &_id, const QString &fname,
     iq.appendChild(si);
 
     d->streamTypes = streamTypes;
-    d->size = size;
-    d->iq = iq;
+    d->size        = size;
+    d->iq          = iq;
 }
 
-qlonglong JT_FT::rangeOffset() const
-{
-    return d->rangeOffset;
-}
+qlonglong JT_FT::rangeOffset() const { return d->rangeOffset; }
 
-qlonglong JT_FT::rangeLength() const
-{
-    return d->rangeLength;
-}
+qlonglong JT_FT::rangeLength() const { return d->rangeLength; }
 
-QString JT_FT::streamType() const
-{
-    return d->streamType;
-}
+QString JT_FT::streamType() const { return d->streamType; }
 
-void JT_FT::onGo()
-{
-    send(d->iq);
-}
+void JT_FT::onGo() { send(d->iq); }
 
 bool JT_FT::take(const QDomElement &x)
 {
-    if(!iqVerify(x, d->to, id()))
+    if (!iqVerify(x, d->to, id()))
         return false;
 
-    if(x.attribute("type") == "result") {
+    if (x.attribute("type") == "result") {
         QDomElement si = firstChildElement(x);
-        if(si.namespaceURI() != "http://jabber.org/protocol/si" || si.tagName() != "si") {
+        if (si.namespaceURI() != "http://jabber.org/protocol/si" || si.tagName() != "si") {
             setError(900, "");
             return true;
         }
@@ -653,22 +578,22 @@ bool JT_FT::take(const QDomElement &x)
         qlonglong range_length = 0;
 
         QDomElement file = si.elementsByTagName("file").item(0).toElement();
-        if(!file.isNull()) {
+        if (!file.isNull()) {
             QDomElement range = file.elementsByTagName("range").item(0).toElement();
-            if(!range.isNull()) {
+            if (!range.isNull()) {
                 qlonglong x;
-                bool ok;
-                if(range.hasAttribute("offset")) {
+                bool      ok;
+                if (range.hasAttribute("offset")) {
                     x = range.attribute("offset").toLongLong(&ok);
-                    if(!ok || x < 0) {
+                    if (!ok || x < 0) {
                         setError(900, "");
                         return true;
                     }
                     range_offset = x;
                 }
-                if(range.hasAttribute("length")) {
+                if (range.hasAttribute("length")) {
                     x = range.attribute("length").toLongLong(&ok);
-                    if(!ok || x < 0) {
+                    if (!ok || x < 0) {
                         setError(900, "");
                         return true;
                     }
@@ -677,20 +602,20 @@ bool JT_FT::take(const QDomElement &x)
             }
         }
 
-        if(range_offset > d->size || (range_length > (d->size - range_offset))) {
+        if (range_offset > d->size || (range_length > (d->size - range_offset))) {
             setError(900, "");
             return true;
         }
 
-        QString streamtype;
+        QString     streamtype;
         QDomElement feature = si.elementsByTagName("feature").item(0).toElement();
-        if(!feature.isNull() && feature.namespaceURI() == "http://jabber.org/protocol/feature-neg") {
+        if (!feature.isNull() && feature.namespaceURI() == "http://jabber.org/protocol/feature-neg") {
             QDomElement x = feature.elementsByTagName("x").item(0).toElement();
-            if(!x.isNull() && x.attribute("type") == "submit") {
+            if (!x.isNull() && x.attribute("type") == "submit") {
                 QDomElement field = x.elementsByTagName("field").item(0).toElement();
-                if(!field.isNull() && field.attribute("var") == "stream-method") {
+                if (!field.isNull() && field.attribute("var") == "stream-method") {
                     QDomElement value = field.elementsByTagName("value").item(0).toElement();
-                    if(!value.isNull())
+                    if (!value.isNull())
                         streamtype = value.text();
                 }
             }
@@ -703,10 +628,9 @@ bool JT_FT::take(const QDomElement &x)
 
         d->rangeOffset = range_offset;
         d->rangeLength = range_length;
-        d->streamType = streamtype;
+        d->streamType  = streamtype;
         setSuccess();
-    }
-    else {
+    } else {
         setError(x);
     }
 
@@ -716,33 +640,29 @@ bool JT_FT::take(const QDomElement &x)
 //----------------------------------------------------------------------------
 // JT_PushFT
 //----------------------------------------------------------------------------
-JT_PushFT::JT_PushFT(Task *parent)
-:Task(parent)
-{
-}
+JT_PushFT::JT_PushFT(Task *parent) : Task(parent) {}
 
-JT_PushFT::~JT_PushFT()
-{
-}
+JT_PushFT::~JT_PushFT() {}
 
-void JT_PushFT::respondSuccess(const Jid &to, const QString &id, qlonglong rangeOffset, qlonglong rangeLength, const QString &streamType)
+void JT_PushFT::respondSuccess(const Jid &to, const QString &id, qlonglong rangeOffset, qlonglong rangeLength,
+                               const QString &streamType)
 {
     QDomElement iq = createIQ(doc(), "result", to.full(), id);
     QDomElement si = doc()->createElementNS("http://jabber.org/protocol/si", "si");
 
-    if(rangeOffset != 0 || rangeLength != 0) {
-        QDomElement file = doc()->createElementNS("http://jabber.org/protocol/si/profile/file-transfer", "file");
+    if (rangeOffset != 0 || rangeLength != 0) {
+        QDomElement file  = doc()->createElementNS("http://jabber.org/protocol/si/profile/file-transfer", "file");
         QDomElement range = doc()->createElement("range");
-        if(rangeOffset > 0)
+        if (rangeOffset > 0)
             range.setAttribute("offset", QString::number(rangeOffset));
-        if(rangeLength > 0)
+        if (rangeLength > 0)
             range.setAttribute("length", QString::number(rangeLength));
         file.appendChild(range);
         si.appendChild(file);
     }
 
     QDomElement feature = doc()->createElementNS("http://jabber.org/protocol/feature-neg", "feature");
-    QDomElement x = doc()->createElementNS("jabber:x:data", "x");
+    QDomElement x       = doc()->createElementNS("jabber:x:data", "x");
     x.setAttribute("type", "submit");
 
     QDomElement field = doc()->createElement("field");
@@ -759,10 +679,9 @@ void JT_PushFT::respondSuccess(const Jid &to, const QString &id, qlonglong range
     send(iq);
 }
 
-void JT_PushFT::respondError(const Jid &to, const QString &id,
-                             Stanza::Error::ErrorCond cond, const QString &str)
+void JT_PushFT::respondError(const Jid &to, const QString &id, Stanza::Error::ErrorCond cond, const QString &str)
 {
-    QDomElement iq = createIQ(doc(), "error", to.full(), id);
+    QDomElement   iq = createIQ(doc(), "error", to.full(), id);
     Stanza::Error error(Stanza::Error::Cancel, cond, str);
     iq.appendChild(error.toXml(*client()->doc(), client()->stream().baseNS()));
     send(iq);
@@ -771,26 +690,26 @@ void JT_PushFT::respondError(const Jid &to, const QString &id,
 bool JT_PushFT::take(const QDomElement &e)
 {
     // must be an iq-set tag
-    if(e.tagName() != "iq")
+    if (e.tagName() != "iq")
         return false;
-    if(e.attribute("type") != "set")
+    if (e.attribute("type") != "set")
         return false;
 
     QDomElement si = firstChildElement(e);
-    if(si.namespaceURI() != "http://jabber.org/protocol/si" || si.tagName() != "si")
+    if (si.namespaceURI() != "http://jabber.org/protocol/si" || si.tagName() != "si")
         return false;
-    if(si.attribute("profile") != "http://jabber.org/protocol/si/profile/file-transfer")
+    if (si.attribute("profile") != "http://jabber.org/protocol/si/profile/file-transfer")
         return false;
 
-    Jid from(e.attribute("from"));
+    Jid     from(e.attribute("from"));
     QString id = si.attribute("id");
 
     QDomElement file = si.elementsByTagName("file").item(0).toElement();
-    if(file.isNull())
+    if (file.isNull())
         return true;
 
     QString fname = file.attribute("name");
-    if(fname.isEmpty()) {
+    if (fname.isEmpty()) {
         respondError(from, id, Stanza::Error::BadRequest, "Bad file name");
         return true;
     }
@@ -801,35 +720,36 @@ bool JT_PushFT::take(const QDomElement &e)
         fname = fi.fileName();
     }
 
-    bool ok;
+    bool      ok;
     qlonglong size = file.attribute("size").toLongLong(&ok);
-    if(!ok || size < 0) {
+    if (!ok || size < 0) {
         respondError(from, id, Stanza::Error::BadRequest, "Bad file size");
         return true;
     }
 
-    QString desc;
+    QString     desc;
     QDomElement de = file.elementsByTagName("desc").item(0).toElement();
-    if(!de.isNull())
+    if (!de.isNull())
         desc = de.text();
 
-    bool rangeSupported = false;
-    QDomElement range = file.elementsByTagName("range").item(0).toElement();
-    if(!range.isNull())
+    bool        rangeSupported = false;
+    QDomElement range          = file.elementsByTagName("range").item(0).toElement();
+    if (!range.isNull())
         rangeSupported = true;
 
     QStringList streamTypes;
     QDomElement feature = si.elementsByTagName("feature").item(0).toElement();
-    if(!feature.isNull() && feature.namespaceURI() == "http://jabber.org/protocol/feature-neg") {
+    if (!feature.isNull() && feature.namespaceURI() == "http://jabber.org/protocol/feature-neg") {
         QDomElement x = feature.elementsByTagName("x").item(0).toElement();
-        if(!x.isNull() /*&& x.attribute("type") == "form"*/) {
+        if (!x.isNull() /*&& x.attribute("type") == "form"*/) {
             QDomElement field = x.elementsByTagName("field").item(0).toElement();
-            if(!field.isNull() && field.attribute("var") == "stream-method" && field.attribute("type") == "list-single") {
+            if (!field.isNull() && field.attribute("var") == "stream-method"
+                && field.attribute("type") == "list-single") {
                 QDomNodeList nl = field.elementsByTagName("option");
-                for(int n = 0; n < nl.count(); ++n) {
-                    QDomElement e = nl.item(n).toElement();
+                for (int n = 0; n < nl.count(); ++n) {
+                    QDomElement e     = nl.item(n).toElement();
                     QDomElement value = e.elementsByTagName("value").item(0).toElement();
-                    if(!value.isNull())
+                    if (!value.isNull())
                         streamTypes += value.text();
                 }
             }
@@ -837,15 +757,15 @@ bool JT_PushFT::take(const QDomElement &e)
     }
 
     FTRequest r;
-    r.from = from;
-    r.iq_id = e.attribute("id");
-    r.id = id;
-    r.fname = fname;
-    r.size = size;
-    r.desc = desc;
+    r.from           = from;
+    r.iq_id          = e.attribute("id");
+    r.id             = id;
+    r.fname          = fname;
+    r.size           = size;
+    r.desc           = desc;
     r.rangeSupported = rangeSupported;
-    r.streamTypes = streamTypes;
-    r.thumbnail = Thumbnail(file.firstChildElement(QLatin1String("thumbnail")));
+    r.streamTypes    = streamTypes;
+    r.thumbnail      = Thumbnail(file.firstChildElement(QLatin1String("thumbnail")));
 
     emit incoming(r);
     return true;
diff --git a/src/xmpp/xmpp-im/filetransfer.h b/src/xmpp/xmpp-im/filetransfer.h
index 9f2de709..8e903090 100644
--- a/src/xmpp/xmpp-im/filetransfer.h
+++ b/src/xmpp/xmpp-im/filetransfer.h
@@ -23,167 +23,162 @@
 #include "im.h"
 
 namespace XMPP {
-    class BSConnection;
-    class BytestreamManager;
-    struct FTRequest;
-
-    /*class AbstractFileTransfer
-    {
-        public:
-            // Receive
-            virtual Jid peer() const = 0;
-            virtual QString fileName() const = 0;
-            virtual qlonglong fileSize() const = 0;
-            virtual QString description() const { return ""; }
-            virtual bool rangeSupported() const { return false; }
-            virtual void accept(qlonglong offset=0, qlonglong length=0) = 0;
-    };*/
-
-    class FileTransfer : public QObject /*, public AbstractFileTransfer */
-    {
-        Q_OBJECT
-    public:
-        enum { ErrReject, ErrNeg, ErrConnect, ErrProxy, ErrStream, Err400 };
-        enum { Idle, Requesting, Connecting, WaitingForAccept, Active };
-        ~FileTransfer();
-
-        FileTransfer *copy() const;
-
-        void setProxy(const Jid &proxy);
-
-        // send
-        void sendFile(const Jid &to, const QString &fname, qlonglong size, const QString &desc, Thumbnail &thumb);
-        qlonglong offset() const;
-        qlonglong length() const;
-        int dataSizeNeeded() const;
-        void writeFileData(const QByteArray &a);
-        const Thumbnail &thumbnail() const;
-
-        // receive
-        Jid peer() const;
-        QString fileName() const;
-        qlonglong fileSize() const;
-        QString description() const;
-        bool rangeSupported() const;
-        void accept(qlonglong offset=0, qlonglong length=0);
-
-        // both
-        void close(); // reject, or stop sending/receiving
-        BSConnection *bsConnection() const; // active link
-
-    signals:
-        void accepted(); // indicates BSConnection has started
-        void connected();
-        void readyRead(const QByteArray &a);
-        void bytesWritten(qint64);
-        void error(int);
-
-    private slots:
-        void ft_finished();
-        void stream_connected();
-        void stream_connectionClosed();
-        void stream_readyRead();
-        void stream_bytesWritten(qint64);
-        void stream_error(int);
-        void doAccept();
-        void reset();
-
-    private:
-        class Private;
-        Private *d;
-
-        friend class FileTransferManager;
-        FileTransfer(FileTransferManager *, QObject *parent=nullptr);
-        FileTransfer(const FileTransfer& other);
-        void man_waitForAccept(const FTRequest &req, const QString &streamType);
-        void takeConnection(BSConnection *c);
-    };
-
-    class FileTransferManager : public QObject
-    {
-        Q_OBJECT
-    public:
-        FileTransferManager(Client *);
-        ~FileTransferManager();
-
-        bool isActive(const FileTransfer *ft) const;
-        void setDisabled(const QString &ns, bool state = true);
-
-        Client *client() const;
-        FileTransfer *createTransfer();
-        FileTransfer *takeIncoming();
-
-    signals:
-        void incomingReady();
-
-    private slots:
-        void pft_incoming(const FTRequest &req);
-
-    private:
-        class Private;
-        Private *d;
+class BSConnection;
+class BytestreamManager;
+struct FTRequest;
 
-        friend class Client;
-        void stream_incomingReady(BSConnection *);
-
-        friend class FileTransfer;
-        BytestreamManager* streamManager(const QString &ns) const;
-        QStringList streamPriority() const;
-        QString link(FileTransfer *);
-        void con_accept(FileTransfer *);
-        void con_reject(FileTransfer *);
-        void unlink(FileTransfer *);
-    };
-
-    class JT_FT : public Task
-    {
-        Q_OBJECT
-    public:
-        JT_FT(Task *parent);
-        ~JT_FT();
-
-        void request(const Jid &to, const QString &id, const QString &fname,
-                     qlonglong size, const QString &desc,
-                     const QStringList &streamTypes, Thumbnail &thumb);
-        qlonglong rangeOffset() const;
-        qlonglong rangeLength() const;
-        QString streamType() const;
-
-        void onGo();
-        bool take(const QDomElement &);
-
-    private:
-        class Private;
-        Private *d;
-    };
-
-    struct FTRequest
-    {
-        Jid from;
-        QString iq_id, id;
-        QString fname;
-        qlonglong size;
-        QString desc;
-        bool rangeSupported;
-        QStringList streamTypes;
-        Thumbnail thumbnail;
-    };
-    class JT_PushFT : public Task
-    {
-        Q_OBJECT
+/*class AbstractFileTransfer
+{
     public:
-        JT_PushFT(Task *parent);
-        ~JT_PushFT();
-
-        void respondSuccess(const Jid &to, const QString &id, qlonglong rangeOffset, qlonglong rangeLength, const QString &streamType);
-        void respondError(const Jid &to, const QString &id,
-                          Stanza::Error::ErrorCond cond, const QString &str);
-
-        bool take(const QDomElement &);
-
-    signals:
-        void incoming(const FTRequest &req);
-    };
+        // Receive
+        virtual Jid peer() const = 0;
+        virtual QString fileName() const = 0;
+        virtual qlonglong fileSize() const = 0;
+        virtual QString description() const { return ""; }
+        virtual bool rangeSupported() const { return false; }
+        virtual void accept(qlonglong offset=0, qlonglong length=0) = 0;
+};*/
+
+class FileTransfer : public QObject /*, public AbstractFileTransfer */
+{
+    Q_OBJECT
+public:
+    enum { ErrReject, ErrNeg, ErrConnect, ErrProxy, ErrStream, Err400 };
+    enum { Idle, Requesting, Connecting, WaitingForAccept, Active };
+    ~FileTransfer();
+
+    FileTransfer *copy() const;
+
+    void setProxy(const Jid &proxy);
+
+    // send
+    void      sendFile(const Jid &to, const QString &fname, qlonglong size, const QString &desc, Thumbnail &thumb);
+    qlonglong offset() const;
+    qlonglong length() const;
+    int       dataSizeNeeded() const;
+    void      writeFileData(const QByteArray &a);
+    const Thumbnail &thumbnail() const;
+
+    // receive
+    Jid       peer() const;
+    QString   fileName() const;
+    qlonglong fileSize() const;
+    QString   description() const;
+    bool      rangeSupported() const;
+    void      accept(qlonglong offset = 0, qlonglong length = 0);
+
+    // both
+    void          close();              // reject, or stop sending/receiving
+    BSConnection *bsConnection() const; // active link
+
+signals:
+    void accepted(); // indicates BSConnection has started
+    void connected();
+    void readyRead(const QByteArray &a);
+    void bytesWritten(qint64);
+    void error(int);
+
+private slots:
+    void ft_finished();
+    void stream_connected();
+    void stream_connectionClosed();
+    void stream_readyRead();
+    void stream_bytesWritten(qint64);
+    void stream_error(int);
+    void doAccept();
+    void reset();
+
+private:
+    class Private;
+    Private *d;
+
+    friend class FileTransferManager;
+    FileTransfer(FileTransferManager *, QObject *parent = nullptr);
+    FileTransfer(const FileTransfer &other);
+    void man_waitForAccept(const FTRequest &req, const QString &streamType);
+    void takeConnection(BSConnection *c);
+};
+
+class FileTransferManager : public QObject {
+    Q_OBJECT
+public:
+    FileTransferManager(Client *);
+    ~FileTransferManager();
+
+    bool isActive(const FileTransfer *ft) const;
+    void setDisabled(const QString &ns, bool state = true);
+
+    Client *      client() const;
+    FileTransfer *createTransfer();
+    FileTransfer *takeIncoming();
+
+signals:
+    void incomingReady();
+
+private slots:
+    void pft_incoming(const FTRequest &req);
+
+private:
+    class Private;
+    Private *d;
+
+    friend class Client;
+    void stream_incomingReady(BSConnection *);
+
+    friend class FileTransfer;
+    BytestreamManager *streamManager(const QString &ns) const;
+    QStringList        streamPriority() const;
+    QString            link(FileTransfer *);
+    void               con_accept(FileTransfer *);
+    void               con_reject(FileTransfer *);
+    void               unlink(FileTransfer *);
+};
+
+class JT_FT : public Task {
+    Q_OBJECT
+public:
+    JT_FT(Task *parent);
+    ~JT_FT();
+
+    void      request(const Jid &to, const QString &id, const QString &fname, qlonglong size, const QString &desc,
+                      const QStringList &streamTypes, Thumbnail &thumb);
+    qlonglong rangeOffset() const;
+    qlonglong rangeLength() const;
+    QString   streamType() const;
+
+    void onGo();
+    bool take(const QDomElement &);
+
+private:
+    class Private;
+    Private *d;
+};
+
+struct FTRequest {
+    Jid         from;
+    QString     iq_id, id;
+    QString     fname;
+    qlonglong   size;
+    QString     desc;
+    bool        rangeSupported;
+    QStringList streamTypes;
+    Thumbnail   thumbnail;
+};
+class JT_PushFT : public Task {
+    Q_OBJECT
+public:
+    JT_PushFT(Task *parent);
+    ~JT_PushFT();
+
+    void respondSuccess(const Jid &to, const QString &id, qlonglong rangeOffset, qlonglong rangeLength,
+                        const QString &streamType);
+    void respondError(const Jid &to, const QString &id, Stanza::Error::ErrorCond cond, const QString &str);
+
+    bool take(const QDomElement &);
+
+signals:
+    void incoming(const FTRequest &req);
+};
 } // namespace XMPP
 
 #endif // XMPP_FILETRANSFER_H
diff --git a/src/xmpp/xmpp-im/httpfileupload.cpp b/src/xmpp/xmpp-im/httpfileupload.cpp
index 2bf96890..1be7ee0c 100644
--- a/src/xmpp/xmpp-im/httpfileupload.cpp
+++ b/src/xmpp/xmpp-im/httpfileupload.cpp
@@ -37,25 +37,24 @@ static QLatin1String xmlns_v0_3_1("urn:xmpp:http:upload:0");
 //----------------------------------------------------------------------------
 // HttpFileUpload
 //----------------------------------------------------------------------------
-class HttpFileUpload::Private
-{
+class HttpFileUpload::Private {
 public:
-    HttpFileUpload::State state = State::None;
-    XMPP::Client *client = nullptr;
-    QIODevice *sourceDevice = nullptr;
-    QPointer<QNetworkAccessManager> qnam = nullptr;
-    quint64 fileSize = 0;
-    QString fileName;
-    QString mediaType;
-    QList<HttpHost> httpHosts;
+    HttpFileUpload::State           state        = State::None;
+    XMPP::Client *                  client       = nullptr;
+    QIODevice *                     sourceDevice = nullptr;
+    QPointer<QNetworkAccessManager> qnam         = nullptr;
+    quint64                         fileSize     = 0;
+    QString                         fileName;
+    QString                         mediaType;
+    QList<HttpHost>                 httpHosts;
 
     struct {
         HttpFileUpload::ErrorCode statusCode = HttpFileUpload::ErrorCode::NoError;
-        QString statusString;
-        QString getUrl;
-        QString putUrl;
-        XEP0363::HttpHeaders putHeaders;
-        quint64 sizeLimit = 0;
+        QString                   statusString;
+        QString                   getUrl;
+        QString                   putUrl;
+        XEP0363::HttpHeaders      putHeaders;
+        quint64                   sizeLimit = 0;
     } result;
 };
 
@@ -64,22 +63,16 @@ HttpFileUpload::HttpFileUpload(XMPP::Client *client, QIODevice *source, size_t f
     QObject(client),
     d(new Private)
 {
-    d->client = client;
+    d->client       = client;
     d->sourceDevice = source;
-    d->fileName = dstFilename;
-    d->fileSize = fsize;
-    d->mediaType = mType;
+    d->fileName     = dstFilename;
+    d->fileSize     = fsize;
+    d->mediaType    = mType;
 }
 
-HttpFileUpload::~HttpFileUpload()
-{
-    qDebug("destroying");
-}
+HttpFileUpload::~HttpFileUpload() { qDebug("destroying"); }
 
-void HttpFileUpload::setNetworkAccessManager(QNetworkAccessManager *qnam)
-{
-    d->qnam = qnam;
-}
+void HttpFileUpload::setNetworkAccessManager(QNetworkAccessManager *qnam) { d->qnam = qnam; }
 
 void HttpFileUpload::start()
 {
@@ -109,67 +102,68 @@ void HttpFileUpload::start()
         featureOptions << (QSet<QString>() << xmlns_v0_2_5) << (QSet<QString>() << xmlns_v0_3_1);
     }
     d->client->serverInfoManager()->queryServiceInfo(
-                QLatin1String("store"), QLatin1String("file"),
-                featureOptions, QRegExp("^(upload|http|stor|file|dis|drive).*"), ServerInfoManager::SQ_CheckAllOnNoMatch,
-                [this](const QList<DiscoItem> &items)
-    {
-        d->httpHosts.clear();
-        for (const auto &item: items) {
-            const QStringList &l = item.features().list();
-            XEP0363::version ver = XEP0363::vUnknown;
-            QString xmlns;
-            quint64 sizeLimit = 0;
-            if (l.contains(xmlns_v0_3_1)) {
-                ver = XEP0363::v0_3_1;
-                xmlns = xmlns_v0_3_1;
-            } else if (l.contains(xmlns_v0_2_5)) {
-                ver = XEP0363::v0_2_5;
-                xmlns = xmlns_v0_2_5;
-            }
-            if (ver != XEP0363::vUnknown) {
-                QList<std::pair<HttpHost,int>> hosts;
-                const XData::Field field = item.registeredExtension(xmlns).getField(QLatin1String("max-file-size"));
-                if (field.isValid() && field.type() == XData::Field::Field_TextSingle)
-                    sizeLimit = field.value().at(0).toULongLong();
-                HttpHost host;
-                host.ver = ver;
-                host.jid = item.jid();
-                host.sizeLimit = sizeLimit;
-                QVariant metaProps(d->client->serverInfoManager()->serviceMeta(host.jid, "httpprops"));
-                if (metaProps.isValid()) {
-                    host.props = HostProps(metaProps.value<int>());
-                } else {
-                    host.props = SecureGet | SecurePut;
-                    if (ver == XEP0363::v0_3_1)
-                        host.props |= NewestVer;
+        QLatin1String("store"), QLatin1String("file"), featureOptions, QRegExp("^(upload|http|stor|file|dis|drive).*"),
+        ServerInfoManager::SQ_CheckAllOnNoMatch, [this](const QList<DiscoItem> &items) {
+            d->httpHosts.clear();
+            for (const auto &item : items) {
+                const QStringList &l   = item.features().list();
+                XEP0363::version   ver = XEP0363::vUnknown;
+                QString            xmlns;
+                quint64            sizeLimit = 0;
+                if (l.contains(xmlns_v0_3_1)) {
+                    ver   = XEP0363::v0_3_1;
+                    xmlns = xmlns_v0_3_1;
+                } else if (l.contains(xmlns_v0_2_5)) {
+                    ver   = XEP0363::v0_2_5;
+                    xmlns = xmlns_v0_2_5;
                 }
-                int value = 0;
-                if (host.props & SecureGet) value += 5;
-                if (host.props & SecurePut) value += 5;
-                if (host.props & NewestVer) value += 3;
-                if (host.props & Failure) value -= 15;
-                if (!sizeLimit || d->fileSize < sizeLimit)
-                    hosts.append({host,value});
-
-                // no sorting in preference order. most preferred go first
-                std::sort(hosts.begin(), hosts.end(), [](const auto &a, const auto &b){
-                    return a.second > b.second;
-                });
-                for (auto &hp: hosts) {
-                    d->httpHosts.append(hp.first);
+                if (ver != XEP0363::vUnknown) {
+                    QList<std::pair<HttpHost, int>> hosts;
+                    const XData::Field field = item.registeredExtension(xmlns).getField(QLatin1String("max-file-size"));
+                    if (field.isValid() && field.type() == XData::Field::Field_TextSingle)
+                        sizeLimit = field.value().at(0).toULongLong();
+                    HttpHost host;
+                    host.ver       = ver;
+                    host.jid       = item.jid();
+                    host.sizeLimit = sizeLimit;
+                    QVariant metaProps(d->client->serverInfoManager()->serviceMeta(host.jid, "httpprops"));
+                    if (metaProps.isValid()) {
+                        host.props = HostProps(metaProps.value<int>());
+                    } else {
+                        host.props = SecureGet | SecurePut;
+                        if (ver == XEP0363::v0_3_1)
+                            host.props |= NewestVer;
+                    }
+                    int value = 0;
+                    if (host.props & SecureGet)
+                        value += 5;
+                    if (host.props & SecurePut)
+                        value += 5;
+                    if (host.props & NewestVer)
+                        value += 3;
+                    if (host.props & Failure)
+                        value -= 15;
+                    if (!sizeLimit || d->fileSize < sizeLimit)
+                        hosts.append({ host, value });
+
+                    // no sorting in preference order. most preferred go first
+                    std::sort(hosts.begin(), hosts.end(),
+                              [](const auto &a, const auto &b) { return a.second > b.second; });
+                    for (auto &hp : hosts) {
+                        d->httpHosts.append(hp.first);
+                    }
                 }
             }
-        }
-        //d->currentHost = d->httpHosts.begin();
-        d->client->httpFileUploadManager()->setDiscoHosts(d->httpHosts);
-        if (d->httpHosts.isEmpty()) { // if empty as the last resort check all services
-            d->result.statusCode   = HttpFileUpload::ErrorCode::NoUploadService;
-            d->result.statusString = "No suitable http upload services were found";
-            done(State::Error);
-        } else {
-            tryNextServer();
-        }
-    });
+            // d->currentHost = d->httpHosts.begin();
+            d->client->httpFileUploadManager()->setDiscoHosts(d->httpHosts);
+            if (d->httpHosts.isEmpty()) { // if empty as the last resort check all services
+                d->result.statusCode   = HttpFileUpload::ErrorCode::NoUploadService;
+                d->result.statusString = "No suitable http upload services were found";
+                done(State::Error);
+            } else {
+                tryNextServer();
+            }
+        });
 }
 
 void HttpFileUpload::tryNextServer()
@@ -182,96 +176,89 @@ void HttpFileUpload::tryNextServer()
         done(State::Error);
         return;
     }
-    HttpHost host = d->httpHosts.takeFirst();
+    HttpHost host       = d->httpHosts.takeFirst();
     d->result.sizeLimit = host.sizeLimit;
-    auto jt = new JT_HTTPFileUpload(d->client->rootTask());
-    connect(jt, &JT_HTTPFileUpload::finished, this, [this, jt, host]() mutable {
-        if (!jt->success()) {
-            host.props |= Failure;
-            int code = jt->statusCode();
-            if (code < 300) {
-                code++; // ErrDisc and ErrTimeout. but 0 code is already occupated
+    auto jt             = new JT_HTTPFileUpload(d->client->rootTask());
+    connect(
+        jt, &JT_HTTPFileUpload::finished, this,
+        [this, jt, host]() mutable {
+            if (!jt->success()) {
+                host.props |= Failure;
+                int code = jt->statusCode();
+                if (code < 300) {
+                    code++; // ErrDisc and ErrTimeout. but 0 code is already occupated
+                }
+                d->result.statusCode   = static_cast<ErrorCode>(jt->statusCode());
+                d->result.statusString = jt->statusString();
+                d->client->serverInfoManager()->setServiceMeta(host.jid, QLatin1String("httpprops"), int(host.props));
+                if (d->httpHosts.isEmpty())
+                    done(State::Error);
+                else
+                    tryNextServer();
+                return;
             }
-            d->result.statusCode   = static_cast<ErrorCode>(jt->statusCode());
-            d->result.statusString = jt->statusString();
-            d->client->serverInfoManager()->setServiceMeta(host.jid, QLatin1String("httpprops"), int(host.props));
-            if (d->httpHosts.isEmpty())
-                done(State::Error);
+
+            d->result.getUrl     = jt->url(JT_HTTPFileUpload::GetUrl);
+            d->result.putUrl     = jt->url(JT_HTTPFileUpload::PutUrl);
+            d->result.putHeaders = jt->headers();
+            if (d->result.getUrl.startsWith("https://"))
+                host.props |= SecureGet;
             else
-                tryNextServer();
-            return;
-        }
+                host.props &= ~SecureGet;
+            if (d->result.putUrl.startsWith("https://"))
+                host.props |= SecurePut;
+            else
+                host.props &= ~SecurePut;
+            host.props &= ~Failure;
 
-        d->result.getUrl = jt->url(JT_HTTPFileUpload::GetUrl);
-        d->result.putUrl = jt->url(JT_HTTPFileUpload::PutUrl);
-        d->result.putHeaders = jt->headers();
-        if (d->result.getUrl.startsWith("https://"))
-            host.props |= SecureGet;
-        else
-            host.props &= ~SecureGet;
-        if (d->result.putUrl.startsWith("https://"))
-            host.props |= SecurePut;
-        else
-            host.props &= ~SecurePut;
-        host.props &= ~Failure;
-
-        d->client->serverInfoManager()->setServiceMeta(host.jid, QLatin1String("httpprops"), int(host.props));
-
-        if (!d->qnam) { // w/o network access manager, it's not more than getting slots
-            done(State::Success);
-            return;
-        }
+            d->client->serverInfoManager()->setServiceMeta(host.jid, QLatin1String("httpprops"), int(host.props));
 
-        setState(State::HttpRequest);
-        // time for a http request
-        QNetworkRequest req(d->result.putUrl);
-        for (auto &h: d->result.putHeaders) {
-            req.setRawHeader(h.name.toLatin1(), h.value.toLatin1());
-        }
-        auto reply = d->qnam->put(req, d->sourceDevice);
-        connect(reply, &QNetworkReply::uploadProgress, this, &HttpFileUpload::progress);
-        connect(reply, &QNetworkReply::finished, this, [this, reply](){
-            if (reply->error() == QNetworkReply::NoError) {
+            if (!d->qnam) { // w/o network access manager, it's not more than getting slots
                 done(State::Success);
-            } else {
-                d->result.statusCode   = ErrorCode::HttpFailed;
-                d->result.statusString = reply->errorString();
-                qDebug("http upload failed: %s", qPrintable(d->result.statusString));
-                if (d->httpHosts.isEmpty())
-                    done(State::Error);
-                else
-                    tryNextServer();
+                return;
             }
-            reply->deleteLater();
-        });
 
-    }, Qt::QueuedConnection);
+            setState(State::HttpRequest);
+            // time for a http request
+            QNetworkRequest req(d->result.putUrl);
+            for (auto &h : d->result.putHeaders) {
+                req.setRawHeader(h.name.toLatin1(), h.value.toLatin1());
+            }
+            auto reply = d->qnam->put(req, d->sourceDevice);
+            connect(reply, &QNetworkReply::uploadProgress, this, &HttpFileUpload::progress);
+            connect(reply, &QNetworkReply::finished, this, [this, reply]() {
+                if (reply->error() == QNetworkReply::NoError) {
+                    done(State::Success);
+                } else {
+                    d->result.statusCode   = ErrorCode::HttpFailed;
+                    d->result.statusString = reply->errorString();
+                    qDebug("http upload failed: %s", qPrintable(d->result.statusString));
+                    if (d->httpHosts.isEmpty())
+                        done(State::Error);
+                    else
+                        tryNextServer();
+                }
+                reply->deleteLater();
+            });
+        },
+        Qt::QueuedConnection);
     jt->request(host.jid, d->fileName, d->fileSize, d->mediaType, host.ver);
     jt->go(true);
 }
 
-bool HttpFileUpload::success() const
-{
-    return d->state == State::Success;
-}
+bool HttpFileUpload::success() const { return d->state == State::Success; }
 
-HttpFileUpload::ErrorCode HttpFileUpload::statusCode() const
-{
-    return d->result.statusCode;
-}
+HttpFileUpload::ErrorCode HttpFileUpload::statusCode() const { return d->result.statusCode; }
 
-const QString & HttpFileUpload::statusString() const
-{
-    return d->result.statusString;
-}
+const QString &HttpFileUpload::statusString() const { return d->result.statusString; }
 
 HttpFileUpload::HttpSlot HttpFileUpload::getHttpSlot()
 {
     HttpSlot slot;
     if (d->state == State::Success) {
-        slot.get.url = d->result.getUrl;
-        slot.put.url = d->result.putUrl;
-        slot.put.headers = d->result.putHeaders;
+        slot.get.url         = d->result.getUrl;
+        slot.put.url         = d->result.putUrl;
+        slot.put.headers     = d->result.putHeaders;
         slot.limits.fileSize = d->result.sizeLimit;
     }
     return slot;
@@ -296,46 +283,44 @@ void HttpFileUpload::done(State state)
 //----------------------------------------------------------------------------
 // JT_HTTPFileUpload
 //----------------------------------------------------------------------------
-class JT_HTTPFileUpload::Private
-{
+class JT_HTTPFileUpload::Private {
 public:
-    Jid to;
-    QDomElement iq;
-    QStringList urls;
-    XEP0363::version ver;
+    Jid                  to;
+    QDomElement          iq;
+    QStringList          urls;
+    XEP0363::version     ver;
     XEP0363::HttpHeaders headers;
 };
 
-JT_HTTPFileUpload::JT_HTTPFileUpload(Task *parent)
-    : Task(parent)
+JT_HTTPFileUpload::JT_HTTPFileUpload(Task *parent) : Task(parent)
 {
-    d = new Private;
+    d      = new Private;
     d->ver = XEP0363::vUnknown;
     d->urls << QString() << QString();
 }
 
-JT_HTTPFileUpload::~JT_HTTPFileUpload()
-{
-    delete d;
-}
+JT_HTTPFileUpload::~JT_HTTPFileUpload() { delete d; }
 
-void JT_HTTPFileUpload::request(const Jid &to, const QString &fname,
-                                quint64 fsize, const QString &ftype, XEP0363::version ver)
+void JT_HTTPFileUpload::request(const Jid &to, const QString &fname, quint64 fsize, const QString &ftype,
+                                XEP0363::version ver)
 {
     QString ns;
-    switch (ver)
-    {
-    case XEP0363::v0_2_5: ns = xmlns_v0_2_5; break;
-    case XEP0363::v0_3_1: ns = xmlns_v0_3_1; break;
-    default: return;
+    switch (ver) {
+    case XEP0363::v0_2_5:
+        ns = xmlns_v0_2_5;
+        break;
+    case XEP0363::v0_3_1:
+        ns = xmlns_v0_3_1;
+        break;
+    default:
+        return;
     }
 
-    d->to = to;
-    d->ver = ver;
-    d->iq = createIQ(doc(), "get", to.full(), id());
+    d->to           = to;
+    d->ver          = ver;
+    d->iq           = createIQ(doc(), "get", to.full(), id());
     QDomElement req = doc()->createElementNS(ns, "request");
-    switch (ver)
-    {
+    switch (ver) {
     case XEP0363::v0_2_5:
         ns = xmlns_v0_2_5;
         req.appendChild(textTag(doc(), "filename", fname));
@@ -358,15 +343,9 @@ void JT_HTTPFileUpload::request(const Jid &to, const QString &fname,
     d->iq.appendChild(req);
 }
 
-QString JT_HTTPFileUpload::url(UrlType t) const
-{
-    return d->urls.value(t);
-}
+QString JT_HTTPFileUpload::url(UrlType t) const { return d->urls.value(t); }
 
-XEP0363::HttpHeaders JT_HTTPFileUpload::headers() const
-{
-    return d->headers;
-}
+XEP0363::HttpHeaders JT_HTTPFileUpload::headers() const { return d->headers; }
 
 void JT_HTTPFileUpload::onGo()
 {
@@ -384,36 +363,34 @@ bool JT_HTTPFileUpload::take(const QDomElement &e)
         return true;
     }
 
-    bool correct_xmlns = false;
-    QString getUrl, putUrl;
+    bool                 correct_xmlns = false;
+    QString              getUrl, putUrl;
     XEP0363::HttpHeaders headers;
-    const QDomElement &slot = e.firstChildElement("slot");
+    const QDomElement &  slot = e.firstChildElement("slot");
     if (!slot.isNull()) {
         const QDomElement &get = slot.firstChildElement("get");
         const QDomElement &put = slot.firstChildElement("put");
-        switch (d->ver)
-        {
+        switch (d->ver) {
         case XEP0363::v0_2_5:
             correct_xmlns = slot.namespaceURI() == xmlns_v0_2_5;
-            getUrl = tagContent(get);
-            putUrl = tagContent(put);
+            getUrl        = tagContent(get);
+            putUrl        = tagContent(put);
             break;
         case XEP0363::v0_3_1:
             correct_xmlns = slot.namespaceURI() == xmlns_v0_3_1;
-            getUrl = get.attribute("url");
+            getUrl        = get.attribute("url");
             if (!put.isNull()) {
-                putUrl = put.attribute("url");
+                putUrl         = put.attribute("url");
                 QDomElement he = put.firstChildElement("header");
                 while (!he.isNull()) {
                     // only next are allowed: Authorization, Cookie, Expires
                     QString header = he.attribute("name").trimmed().remove(QLatin1Char('\n'));
-                    QString value = he.text().trimmed().remove(QLatin1Char('\n'));
-                    if (!value.isEmpty() &&
-                            (header.compare(QLatin1String("Authorization"), Qt::CaseInsensitive) == 0 ||
-                            header.compare(QLatin1String("Cookie"), Qt::CaseInsensitive) == 0 ||
-                            header.compare(QLatin1String("Expires"), Qt::CaseInsensitive) == 0))
-                    {
-                        headers.append(XEP0363::HttpHeader{header, value});
+                    QString value  = he.text().trimmed().remove(QLatin1Char('\n'));
+                    if (!value.isEmpty()
+                        && (header.compare(QLatin1String("Authorization"), Qt::CaseInsensitive) == 0
+                            || header.compare(QLatin1String("Cookie"), Qt::CaseInsensitive) == 0
+                            || header.compare(QLatin1String("Expires"), Qt::CaseInsensitive) == 0)) {
+                        headers.append(XEP0363::HttpHeader { header, value });
                     }
                     he = he.nextSiblingElement("header");
                 }
@@ -432,46 +409,35 @@ bool JT_HTTPFileUpload::take(const QDomElement &e)
         d->urls[PutUrl] = putUrl;
         d->headers      = headers;
         setSuccess();
-    }
-    else
+    } else
         setError(ErrInvalidResponse, "Either `put` or `get` URL is missing in the server's reply.");
     return true;
 }
 
 class HttpFileUploadManager::Private {
 public:
-    Client *client = nullptr;
-    QPointer<QNetworkAccessManager> qnam;
-    int discoStatus = 0;
-    QList<HttpFileUpload::HttpHost> discoHosts;
-    bool externalQnam = false;
+    Client *                              client = nullptr;
+    QPointer<QNetworkAccessManager>       qnam;
+    int                                   discoStatus = 0;
+    QList<HttpFileUpload::HttpHost>       discoHosts;
+    bool                                  externalQnam = false;
     QLinkedList<HttpFileUpload::HttpHost> hosts;
 };
 
-HttpFileUploadManager::HttpFileUploadManager(Client *parent) :
-    QObject(parent),
-    d(new Private)
-{
-    d->client = parent;
-}
+HttpFileUploadManager::HttpFileUploadManager(Client *parent) : QObject(parent), d(new Private) { d->client = parent; }
 
-HttpFileUploadManager::~HttpFileUploadManager()
-{
-    delete d;
-}
+HttpFileUploadManager::~HttpFileUploadManager() { delete d; }
 
-int HttpFileUploadManager::discoveryStatus() const
-{
-    return d->discoStatus;
-}
+int HttpFileUploadManager::discoveryStatus() const { return d->discoStatus; }
 
 void HttpFileUploadManager::setNetworkAccessManager(QNetworkAccessManager *qnam)
 {
     d->externalQnam = true;
-    d->qnam = qnam;
+    d->qnam         = qnam;
 }
 
-HttpFileUpload* HttpFileUploadManager::upload(const QString &srcFilename, const QString &dstFilename, const QString &mType)
+HttpFileUpload *HttpFileUploadManager::upload(const QString &srcFilename, const QString &dstFilename,
+                                              const QString &mType)
 {
     auto f = new QFile(srcFilename);
     f->open(QIODevice::ReadOnly);
@@ -480,22 +446,20 @@ HttpFileUpload* HttpFileUploadManager::upload(const QString &srcFilename, const
     return hfu;
 }
 
-HttpFileUpload* HttpFileUploadManager::upload(QIODevice *source, size_t fsize, const QString &dstFilename, const QString &mType)
+HttpFileUpload *HttpFileUploadManager::upload(QIODevice *source, size_t fsize, const QString &dstFilename,
+                                              const QString &mType)
 {
-    auto hfu = new HttpFileUpload(d->client, source, fsize, dstFilename, mType);
-    QNetworkAccessManager *qnam = d->externalQnam? d->qnam.data() : d->client->networkAccessManager();
+    auto                   hfu  = new HttpFileUpload(d->client, source, fsize, dstFilename, mType);
+    QNetworkAccessManager *qnam = d->externalQnam ? d->qnam.data() : d->client->networkAccessManager();
     hfu->setNetworkAccessManager(qnam);
     QMetaObject::invokeMethod(hfu, "start", Qt::QueuedConnection);
     return hfu;
 }
 
-const QList<HttpFileUpload::HttpHost> &HttpFileUploadManager::discoHosts() const
-{
-    return d->discoHosts;
-}
+const QList<HttpFileUpload::HttpHost> &HttpFileUploadManager::discoHosts() const { return d->discoHosts; }
 
 void HttpFileUploadManager::setDiscoHosts(const QList<HttpFileUpload::HttpHost> &hosts)
 {
-    d->discoStatus = hosts.size()? DiscoFound : DiscoNotFound;
-    d->discoHosts = hosts;
+    d->discoStatus = hosts.size() ? DiscoFound : DiscoNotFound;
+    d->discoHosts  = hosts;
 }
diff --git a/src/xmpp/xmpp-im/httpfileupload.h b/src/xmpp/xmpp-im/httpfileupload.h
index 3d923bba..1d2f2705 100644
--- a/src/xmpp/xmpp-im/httpfileupload.h
+++ b/src/xmpp/xmpp-im/httpfileupload.h
@@ -28,21 +28,23 @@
 class QNetworkAccessManager;
 
 namespace XMPP {
-    namespace XEP0363 {
-        enum version { vUnknown, v0_2_5, v0_3_1 };
-        struct HttpHeader { QString name; QString value; };
-        typedef QList<HttpHeader> HttpHeaders;
-    }
-
-class HttpFileUpload : public QObject
-{
+namespace XEP0363 {
+    enum version { vUnknown, v0_2_5, v0_3_1 };
+    struct HttpHeader {
+        QString name;
+        QString value;
+    };
+    typedef QList<HttpHeader> HttpHeaders;
+}
+
+class HttpFileUpload : public QObject {
     Q_OBJECT
 public:
     enum HostPropFlag {
         SecureGet = 1, // 0.2.5 of the xep didn't require that
         SecurePut = 2, // 0.2.5 of the xep didn't require that
         NewestVer = 4,
-        Failure   = 8  // had some failure (no/unexpected response to slot request, early http errors)
+        Failure   = 8 // had some failure (no/unexpected response to slot request, early http errors)
     };
     Q_DECLARE_FLAGS(HostProps, HostPropFlag)
 
@@ -60,7 +62,7 @@ class HttpFileUpload : public QObject
             QString url;
         } get;
         struct {
-            QString url;
+            QString                    url;
             QList<XEP0363::HttpHeader> headers;
         } put;
         struct {
@@ -70,9 +72,9 @@ class HttpFileUpload : public QObject
 
     struct HttpHost {
         XEP0363::version ver;
-        Jid jid;
-        quint64 sizeLimit;
-        HostProps props;
+        Jid              jid;
+        quint64          sizeLimit;
+        HostProps        props;
     };
 
     HttpFileUpload(Client *client, QIODevice *source, size_t fsize, const QString &dstFilename,
@@ -90,10 +92,10 @@ class HttpFileUpload : public QObject
      */
     void setNetworkAccessManager(QNetworkAccessManager *qnam);
 
-    bool success() const;
-    ErrorCode statusCode() const;
-    const QString & statusString() const;
-    HttpSlot getHttpSlot();
+    bool           success() const;
+    ErrorCode      statusCode() const;
+    const QString &statusString() const;
+    HttpSlot       getHttpSlot();
 
 public slots:
     void start();
@@ -118,18 +120,18 @@ public slots:
 };
 Q_DECLARE_OPERATORS_FOR_FLAGS(HttpFileUpload::HostProps)
 
-class JT_HTTPFileUpload : public Task
-{
+class JT_HTTPFileUpload : public Task {
     Q_OBJECT
 public:
     enum UrlType { GetUrl = 0, PutUrl = 1 };
-    enum { ErrInvalidResponse = int(HttpFileUpload::ErrorCode::SlotReceiveFailed) - 1 }; // -1 to be mapped to ErrDisc, ErrTimeout, ...
+    enum {
+        ErrInvalidResponse = int(HttpFileUpload::ErrorCode::SlotReceiveFailed) - 1
+    }; // -1 to be mapped to ErrDisc, ErrTimeout, ...
 
     JT_HTTPFileUpload(Task *parent);
     ~JT_HTTPFileUpload();
 
-    void request(const Jid &to, const QString &fname,
-                 quint64 fsize, const QString &ftype, XEP0363::version ver);
+    void    request(const Jid &to, const QString &fname, quint64 fsize, const QString &ftype, XEP0363::version ver);
     QString url(UrlType t) const;
     XEP0363::HttpHeaders headers() const;
 
@@ -141,17 +143,13 @@ class JT_HTTPFileUpload : public Task
     Private *d;
 };
 
-class HttpFileUploadManager : public QObject
-{
+class HttpFileUploadManager : public QObject {
     Q_OBJECT
 public:
-    enum {
-        DiscoNone      = 0x0,
-        DiscoNotFound  = 0x1,
-        DiscoFound     = 0x2
-    };
+    enum { DiscoNone = 0x0, DiscoNotFound = 0x1, DiscoFound = 0x2 };
 
-    typedef std::function<void(bool,const QString &)> Callback; // params: success, detail. where detail could be a "get" url
+    typedef std::function<void(bool, const QString &)>
+        Callback; // params: success, detail. where detail could be a "get" url
 
     HttpFileUploadManager(Client *parent);
     ~HttpFileUploadManager();
@@ -178,7 +176,7 @@ class HttpFileUploadManager : public QObject
      * @param mType meta type. image/png for example
      * @return returns a handler object which will signal "finished" when ready
      */
-    HttpFileUpload* upload(const QString &srcFilename, const QString &dstFilename = QString(),
+    HttpFileUpload *upload(const QString &srcFilename, const QString &dstFilename = QString(),
                            const QString &mType = QString());
 
     /**
@@ -189,13 +187,13 @@ class HttpFileUploadManager : public QObject
      * @param mType - meta type
      * @return returns a handler object which will signal "finished" when ready
      */
-    HttpFileUpload* upload(QIODevice *source, size_t fsize, const QString &dstFilename,
+    HttpFileUpload *upload(QIODevice *source, size_t fsize, const QString &dstFilename,
                            const QString &mType = QString());
 
 private:
     friend class HttpFileUpload;
     const QList<HttpFileUpload::HttpHost> &discoHosts() const;
-    void setDiscoHosts(const QList<HttpFileUpload::HttpHost> &hosts);
+    void                                   setDiscoHosts(const QList<HttpFileUpload::HttpHost> &hosts);
 
     class Private;
     Private *d;
diff --git a/src/xmpp/xmpp-im/im.h b/src/xmpp/xmpp-im/im.h
index 2842e30a..c2cc2814 100644
--- a/src/xmpp/xmpp-im/im.h
+++ b/src/xmpp/xmpp-im/im.h
@@ -52,79 +52,76 @@
 #include <qdatetime.h>
 
 namespace XMPP {
-    typedef QList<AgentItem> AgentList;
-    typedef QList<DiscoItem> DiscoList;
-
-    class FormField
-    {
-    public:
-        enum { username, nick, password, name, first, last, email, address, city, state, zip, phone, url, date, misc };
-        FormField(const QString &type="", const QString &value="");
-        ~FormField();
-
-        int type() const;
-        QString fieldName() const;
-        QString realName() const;
-        bool isSecret() const;
-        const QString & value() const;
-        void setType(int);
-        bool setType(const QString &);
-        void setValue(const QString &);
-
-    private:
-        int tagNameToType(const QString &) const;
-        QString typeToTagName(int) const;
-
-        int v_type;
-        QString v_value;
-
-        class Private;
-        Private *d = nullptr;
-    };
-
-    class Form : public QList<FormField>
-    {
-    public:
-        Form(const Jid &j="");
-        ~Form();
-
-        Jid jid() const;
-        QString instructions() const;
-        QString key() const;
-        void setJid(const Jid &);
-        void setInstructions(const QString &);
-        void setKey(const QString &);
-
-    private:
-        Jid v_jid;
-        QString v_instructions, v_key;
-
-        class Private;
-        Private *d = nullptr;
-    };
-
-    class SearchResult
-    {
-    public:
-        SearchResult(const Jid &jid="");
-        ~SearchResult();
-
-        const Jid & jid() const;
-        const QString & nick() const;
-        const QString & first() const;
-        const QString & last() const;
-        const QString & email() const;
-
-        void setJid(const Jid &);
-        void setNick(const QString &);
-        void setFirst(const QString &);
-        void setLast(const QString &);
-        void setEmail(const QString &);
-
-    private:
-        Jid v_jid;
-        QString v_nick, v_first, v_last, v_email;
-    };
+typedef QList<AgentItem> AgentList;
+typedef QList<DiscoItem> DiscoList;
+
+class FormField {
+public:
+    enum { username, nick, password, name, first, last, email, address, city, state, zip, phone, url, date, misc };
+    FormField(const QString &type = "", const QString &value = "");
+    ~FormField();
+
+    int            type() const;
+    QString        fieldName() const;
+    QString        realName() const;
+    bool           isSecret() const;
+    const QString &value() const;
+    void           setType(int);
+    bool           setType(const QString &);
+    void           setValue(const QString &);
+
+private:
+    int     tagNameToType(const QString &) const;
+    QString typeToTagName(int) const;
+
+    int     v_type;
+    QString v_value;
+
+    class Private;
+    Private *d = nullptr;
+};
+
+class Form : public QList<FormField> {
+public:
+    Form(const Jid &j = "");
+    ~Form();
+
+    Jid     jid() const;
+    QString instructions() const;
+    QString key() const;
+    void    setJid(const Jid &);
+    void    setInstructions(const QString &);
+    void    setKey(const QString &);
+
+private:
+    Jid     v_jid;
+    QString v_instructions, v_key;
+
+    class Private;
+    Private *d = nullptr;
+};
+
+class SearchResult {
+public:
+    SearchResult(const Jid &jid = "");
+    ~SearchResult();
+
+    const Jid &    jid() const;
+    const QString &nick() const;
+    const QString &first() const;
+    const QString &last() const;
+    const QString &email() const;
+
+    void setJid(const Jid &);
+    void setNick(const QString &);
+    void setFirst(const QString &);
+    void setLast(const QString &);
+    void setEmail(const QString &);
+
+private:
+    Jid     v_jid;
+    QString v_nick, v_first, v_last, v_email;
+};
 } // namespace XMPP
 
 #endif // XMPP_IM_H
diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 3c6690d8..0411fabd 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -27,1051 +27,922 @@
 #include <cmath>
 #include <functional>
 
-namespace XMPP {
-namespace Jingle {
-    namespace FileTransfer {
-        const QString NS            = QStringLiteral("urn:xmpp:jingle:apps:file-transfer:5");
-        const QString AMPLITUDES_NS = QStringLiteral("urn:audio:amplitudes");
-
-        // tags
-        static const QString AMPLITUDES_TAG = QStringLiteral("amplitudes");
-        static const QString FILETAG        = QStringLiteral("file");
-        static const QString DATE_TAG       = QStringLiteral("date");
-        static const QString DESC_TAG       = QStringLiteral("desc");
-        static const QString MEDIA_TYPE_TAG = QStringLiteral("media-type");
-        static const QString NAME_TAG       = QStringLiteral("name");
-        static const QString SIZE_TAG       = QStringLiteral("size");
-        static const QString RANGE_TAG      = QStringLiteral("range");
-        static const QString THUMBNAIL_TAG  = QStringLiteral("thumbnail");
-
-        QDomElement Range::toXml(QDomDocument *doc) const
-        {
-            auto r = doc->createElement(RANGE_TAG);
-            if (length) {
-                r.setAttribute(QStringLiteral("length"), QString::number(length));
-            }
-            if (offset) {
-                r.setAttribute(QStringLiteral("offset"), QString::number(offset));
-            }
-            for (auto const &h : hashes) {
-                auto hel = h.toXml(doc);
-                if (!hel.isNull()) {
-                    r.appendChild(hel);
+namespace XMPP { namespace Jingle { namespace FileTransfer {
+    const QString NS            = QStringLiteral("urn:xmpp:jingle:apps:file-transfer:5");
+    const QString AMPLITUDES_NS = QStringLiteral("urn:audio:amplitudes");
+
+    // tags
+    static const QString AMPLITUDES_TAG = QStringLiteral("amplitudes");
+    static const QString FILETAG        = QStringLiteral("file");
+    static const QString DATE_TAG       = QStringLiteral("date");
+    static const QString DESC_TAG       = QStringLiteral("desc");
+    static const QString MEDIA_TYPE_TAG = QStringLiteral("media-type");
+    static const QString NAME_TAG       = QStringLiteral("name");
+    static const QString SIZE_TAG       = QStringLiteral("size");
+    static const QString RANGE_TAG      = QStringLiteral("range");
+    static const QString THUMBNAIL_TAG  = QStringLiteral("thumbnail");
+
+    QDomElement Range::toXml(QDomDocument *doc) const
+    {
+        auto r = doc->createElement(RANGE_TAG);
+        if (length) {
+            r.setAttribute(QStringLiteral("length"), QString::number(length));
+        }
+        if (offset) {
+            r.setAttribute(QStringLiteral("offset"), QString::number(offset));
+        }
+        for (auto const &h : hashes) {
+            auto hel = h.toXml(doc);
+            if (!hel.isNull()) {
+                r.appendChild(hel);
+            }
+        }
+        return r;
+    }
+
+    //----------------------------------------------------------------------------
+    // File
+    //----------------------------------------------------------------------------
+    class File::Private : public QSharedData {
+    public:
+        QDateTime   date;
+        QString     mediaType;
+        QString     name;
+        QString     desc;
+        qint64      size = 0;
+        Range       range;
+        bool        rangeSupported = false;
+        bool        hasSize        = false;
+        QList<Hash> hashes;
+        Thumbnail   thumbnail;
+        QByteArray  amplitudes;
+    };
+
+    File::File() {}
+
+    File::~File() {}
+
+    File &File::operator=(const File &other)
+    {
+        d = other.d;
+        return *this;
+    }
+
+    File::File(const File &other) : d(other.d) {}
+
+    File::File(const QDomElement &file)
+    {
+        QDateTime   date;
+        QString     mediaType;
+        QString     name;
+        QString     desc;
+        size_t      size           = 0;
+        bool        rangeSupported = false;
+        bool        hasSize        = false;
+        Range       range;
+        QList<Hash> hashes;
+        Thumbnail   thumbnail;
+        QByteArray  amplitudes;
+
+        bool ok;
+
+        for (QDomElement ce = file.firstChildElement(); !ce.isNull(); ce = ce.nextSiblingElement()) {
+
+            if (ce.tagName() == DATE_TAG) {
+                date = QDateTime::fromString(ce.text().left(19), Qt::ISODate);
+                if (!date.isValid()) {
+                    return;
                 }
-            }
-            return r;
-        }
 
-        //----------------------------------------------------------------------------
-        // File
-        //----------------------------------------------------------------------------
-        class File::Private : public QSharedData {
-        public:
-            QDateTime   date;
-            QString     mediaType;
-            QString     name;
-            QString     desc;
-            qint64      size = 0;
-            Range       range;
-            bool        rangeSupported = false;
-            bool        hasSize        = false;
-            QList<Hash> hashes;
-            Thumbnail   thumbnail;
-            QByteArray  amplitudes;
-        };
+            } else if (ce.tagName() == MEDIA_TYPE_TAG) {
+                mediaType = ce.text();
 
-        File::File()
-        {
-        }
+            } else if (ce.tagName() == NAME_TAG) {
+                name = ce.text();
 
-        File::~File()
-        {
-        }
-
-        File &File::operator=(const File &other)
-        {
-            d = other.d;
-            return *this;
-        }
-
-        File::File(const File &other) :
-            d(other.d)
-        {
-        }
-
-        File::File(const QDomElement &file)
-        {
-            QDateTime   date;
-            QString     mediaType;
-            QString     name;
-            QString     desc;
-            size_t      size           = 0;
-            bool        rangeSupported = false;
-            bool        hasSize        = false;
-            Range       range;
-            QList<Hash> hashes;
-            Thumbnail   thumbnail;
-            QByteArray  amplitudes;
-
-            bool ok;
-
-            for (QDomElement ce   = file.firstChildElement();
-                 !ce.isNull(); ce = ce.nextSiblingElement()) {
-
-                if (ce.tagName() == DATE_TAG) {
-                    date = QDateTime::fromString(ce.text().left(19), Qt::ISODate);
-                    if (!date.isValid()) {
-                        return;
-                    }
-
-                } else if (ce.tagName() == MEDIA_TYPE_TAG) {
-                    mediaType = ce.text();
-
-                } else if (ce.tagName() == NAME_TAG) {
-                    name = ce.text();
+            } else if (ce.tagName() == SIZE_TAG) {
+                size = ce.text().toULongLong(&ok);
+                if (!ok) {
+                    return;
+                }
+                hasSize = true;
 
-                } else if (ce.tagName() == SIZE_TAG) {
-                    size = ce.text().toULongLong(&ok);
+            } else if (ce.tagName() == RANGE_TAG) {
+                if (ce.hasAttribute(QLatin1String("offset"))) {
+                    range.offset = ce.attribute(QLatin1String("offset")).toULongLong(&ok);
                     if (!ok) {
                         return;
                     }
-                    hasSize = true;
-
-                } else if (ce.tagName() == RANGE_TAG) {
-                    if (ce.hasAttribute(QLatin1String("offset"))) {
-                        range.offset = ce.attribute(QLatin1String("offset")).toULongLong(&ok);
-                        if (!ok) {
-                            return;
-                        }
-                    }
-                    if (ce.hasAttribute(QLatin1String("length"))) {
-                        range.length = ce.attribute(QLatin1String("length")).toULongLong(&ok);
-                        if (!ok || !range.length) { // length should absent if we need to read till end of file. 0-length is nonsense
-                            return;
-                        }
+                }
+                if (ce.hasAttribute(QLatin1String("length"))) {
+                    range.length = ce.attribute(QLatin1String("length")).toULongLong(&ok);
+                    if (!ok || !range.length) { // length should absent if we need to read till end of file. 0-length is
+                                                // nonsense
+                        return;
                     }
-                    QDomElement hashEl = ce.firstChildElement(QLatin1String("hash"));
-                    for (; !hashEl.isNull(); hashEl = hashEl.nextSiblingElement(QLatin1String("hash"))) {
-                        if (hashEl.namespaceURI() == HASH_NS) {
-                            auto hash = Hash(hashEl);
-                            if (hash.type() == Hash::Type::Unknown) {
-                                continue;
-                            }
-                            range.hashes.append(hash);
+                }
+                QDomElement hashEl = ce.firstChildElement(QLatin1String("hash"));
+                for (; !hashEl.isNull(); hashEl = hashEl.nextSiblingElement(QLatin1String("hash"))) {
+                    if (hashEl.namespaceURI() == HASH_NS) {
+                        auto hash = Hash(hashEl);
+                        if (hash.type() == Hash::Type::Unknown) {
+                            continue;
                         }
+                        range.hashes.append(hash);
                     }
-                    rangeSupported = true;
+                }
+                rangeSupported = true;
 
-                } else if (ce.tagName() == DESC_TAG) {
-                    desc = ce.text();
+            } else if (ce.tagName() == DESC_TAG) {
+                desc = ce.text();
 
-                } else if (ce.tagName() == QLatin1String("hash")) {
-                    if (ce.namespaceURI() == HASH_NS) {
-                        Hash h(ce);
-                        if (h.type() == Hash::Type::Unknown) {
-                            return;
-                        }
-                        hashes.append(h);
+            } else if (ce.tagName() == QLatin1String("hash")) {
+                if (ce.namespaceURI() == HASH_NS) {
+                    Hash h(ce);
+                    if (h.type() == Hash::Type::Unknown) {
+                        return;
                     }
+                    hashes.append(h);
+                }
 
-                } else if (ce.tagName() == QLatin1String("hash-used")) {
-                    if (ce.namespaceURI() == HASH_NS) {
-                        Hash h(ce);
-                        if (h.type() == Hash::Type::Unknown) {
-                            return;
-                        }
-                        hashes.append(h);
+            } else if (ce.tagName() == QLatin1String("hash-used")) {
+                if (ce.namespaceURI() == HASH_NS) {
+                    Hash h(ce);
+                    if (h.type() == Hash::Type::Unknown) {
+                        return;
                     }
-
-                } else if (ce.tagName() == THUMBNAIL_TAG) {
-                    thumbnail = Thumbnail(ce);
-                } else if (ce.tagName() == AMPLITUDES_TAG && ce.namespaceURI() == AMPLITUDES_NS) {
-                    amplitudes = QByteArray::fromBase64(ce.text().toLatin1());
+                    hashes.append(h);
                 }
-            }
 
-            auto p            = new Private;
-            p->date           = date;
-            p->mediaType      = mediaType;
-            p->name           = name;
-            p->desc           = desc;
-            p->size           = size;
-            p->rangeSupported = rangeSupported;
-            p->hasSize        = hasSize;
-            p->range          = range;
-            p->hashes         = hashes;
-            p->thumbnail      = thumbnail;
-            p->amplitudes     = amplitudes;
-
-            d = p;
+            } else if (ce.tagName() == THUMBNAIL_TAG) {
+                thumbnail = Thumbnail(ce);
+            } else if (ce.tagName() == AMPLITUDES_TAG && ce.namespaceURI() == AMPLITUDES_NS) {
+                amplitudes = QByteArray::fromBase64(ce.text().toLatin1());
+            }
         }
 
-        QDomElement File::toXml(QDomDocument *doc) const
-        {
-            if (!isValid() || d->hashes.isEmpty()) {
-                return QDomElement();
-            }
-            QDomElement el = doc->createElementNS(NS, QStringLiteral("file"));
-            if (d->date.isValid()) {
-                el.appendChild(XMLHelper::textTag(*doc, DATE_TAG, d->date.toString(Qt::ISODate)));
-            }
-            if (d->desc.size()) {
-                el.appendChild(XMLHelper::textTag(*doc, DESC_TAG, d->desc));
-            }
-            for (const auto &h : d->hashes) {
-                el.appendChild(h.toXml(doc));
-            }
-            if (d->mediaType.size()) {
-                el.appendChild(XMLHelper::textTag(*doc, MEDIA_TYPE_TAG, d->mediaType));
-            }
-            if (d->name.size()) {
-                el.appendChild(XMLHelper::textTag(*doc, NAME_TAG, d->name));
-            }
-            if (d->hasSize) {
-                el.appendChild(XMLHelper::textTag(*doc, SIZE_TAG, d->size));
-            }
-            if (d->rangeSupported || d->range.isValid()) {
-                el.appendChild(d->range.toXml(doc));
-            }
-            if (d->thumbnail.isValid()) {
-                el.appendChild(d->thumbnail.toXml(doc));
-            }
-            if (d->amplitudes.size()) {
-                el.appendChild(XMLHelper::textTagNS(doc, AMPLITUDES_NS, AMPLITUDES_TAG, d->amplitudes));
-            }
-            return el;
+        auto p            = new Private;
+        p->date           = date;
+        p->mediaType      = mediaType;
+        p->name           = name;
+        p->desc           = desc;
+        p->size           = size;
+        p->rangeSupported = rangeSupported;
+        p->hasSize        = hasSize;
+        p->range          = range;
+        p->hashes         = hashes;
+        p->thumbnail      = thumbnail;
+        p->amplitudes     = amplitudes;
+
+        d = p;
+    }
+
+    QDomElement File::toXml(QDomDocument *doc) const
+    {
+        if (!isValid() || d->hashes.isEmpty()) {
+            return QDomElement();
+        }
+        QDomElement el = doc->createElementNS(NS, QStringLiteral("file"));
+        if (d->date.isValid()) {
+            el.appendChild(XMLHelper::textTag(*doc, DATE_TAG, d->date.toString(Qt::ISODate)));
+        }
+        if (d->desc.size()) {
+            el.appendChild(XMLHelper::textTag(*doc, DESC_TAG, d->desc));
+        }
+        for (const auto &h : d->hashes) {
+            el.appendChild(h.toXml(doc));
+        }
+        if (d->mediaType.size()) {
+            el.appendChild(XMLHelper::textTag(*doc, MEDIA_TYPE_TAG, d->mediaType));
+        }
+        if (d->name.size()) {
+            el.appendChild(XMLHelper::textTag(*doc, NAME_TAG, d->name));
+        }
+        if (d->hasSize) {
+            el.appendChild(XMLHelper::textTag(*doc, SIZE_TAG, d->size));
+        }
+        if (d->rangeSupported || d->range.isValid()) {
+            el.appendChild(d->range.toXml(doc));
+        }
+        if (d->thumbnail.isValid()) {
+            el.appendChild(d->thumbnail.toXml(doc));
         }
+        if (d->amplitudes.size()) {
+            el.appendChild(XMLHelper::textTagNS(doc, AMPLITUDES_NS, AMPLITUDES_TAG, d->amplitudes));
+        }
+        return el;
+    }
 
-        bool File::merge(const File &other)
-        {
-            if (!d->thumbnail.isValid()) {
-                d->thumbnail = other.thumbnail();
-            }
-            for (auto const &h : other.d->hashes) {
-                auto it = std::find_if(d->hashes.constBegin(), d->hashes.constEnd(), [&h](auto const &v) { return h.type() == v.type(); });
-                if (it == d->hashes.constEnd()) {
-                    d->hashes.append(h);
-                } else if (h.data() != it->data()) {
-                    return false; // hashes are different
-                }
+    bool File::merge(const File &other)
+    {
+        if (!d->thumbnail.isValid()) {
+            d->thumbnail = other.thumbnail();
+        }
+        for (auto const &h : other.d->hashes) {
+            auto it = std::find_if(d->hashes.constBegin(), d->hashes.constEnd(),
+                                   [&h](auto const &v) { return h.type() == v.type(); });
+            if (it == d->hashes.constEnd()) {
+                d->hashes.append(h);
+            } else if (h.data() != it->data()) {
+                return false; // hashes are different
             }
-            return true;
         }
+        return true;
+    }
 
-        bool File::hasComputedHashes() const
-        {
-            if (!d)
-                return false;
-            for (auto const &h : d->hashes) {
-                if (h.data().size())
-                    return true;
-            }
+    bool File::hasComputedHashes() const
+    {
+        if (!d)
             return false;
+        for (auto const &h : d->hashes) {
+            if (h.data().size())
+                return true;
         }
+        return false;
+    }
 
-        bool File::hasSize() const
-        {
-            return d->hasSize;
-        }
+    bool File::hasSize() const { return d->hasSize; }
 
-        QDateTime File::date() const
-        {
-            return d ? d->date : QDateTime();
-        }
+    QDateTime File::date() const { return d ? d->date : QDateTime(); }
 
-        QString File::description() const
-        {
-            return d ? d->desc : QString();
-        }
+    QString File::description() const { return d ? d->desc : QString(); }
 
-        QList<Hash> File::hashes() const
-        {
-            return d ? d->hashes : QList<Hash>();
-        }
+    QList<Hash> File::hashes() const { return d ? d->hashes : QList<Hash>(); }
 
-        Hash File::hash(Hash::Type t) const
-        {
-            if (d && d->hashes.count()) {
-                if (t == Hash::Unknown)
-                    return d->hashes.at(0);
-                for (auto const &h : d->hashes) {
-                    if (h.type() == t) {
-                        return h;
-                    }
+    Hash File::hash(Hash::Type t) const
+    {
+        if (d && d->hashes.count()) {
+            if (t == Hash::Unknown)
+                return d->hashes.at(0);
+            for (auto const &h : d->hashes) {
+                if (h.type() == t) {
+                    return h;
                 }
             }
-            return Hash();
         }
+        return Hash();
+    }
 
-        QString File::mediaType() const
-        {
-            return d ? d->mediaType : QString();
-        }
+    QString File::mediaType() const { return d ? d->mediaType : QString(); }
 
-        QString File::name() const
-        {
-            return d ? d->name : QString();
-        }
+    QString File::name() const { return d ? d->name : QString(); }
 
-        quint64 File::size() const
-        {
-            return d ? d->size : 0;
-        }
+    quint64 File::size() const { return d ? d->size : 0; }
 
-        Range File::range() const
-        {
-            return d ? d->range : Range();
-        }
+    Range File::range() const { return d ? d->range : Range(); }
 
-        Thumbnail File::thumbnail() const
-        {
-            return d ? d->thumbnail : Thumbnail();
-        }
+    Thumbnail File::thumbnail() const { return d ? d->thumbnail : Thumbnail(); }
 
-        QByteArray File::amplitudes() const
-        {
-            return d ? d->amplitudes : QByteArray();
-        }
+    QByteArray File::amplitudes() const { return d ? d->amplitudes : QByteArray(); }
 
-        void File::setDate(const QDateTime &date)
-        {
-            ensureD()->date = date;
-        }
+    void File::setDate(const QDateTime &date) { ensureD()->date = date; }
 
-        void File::setDescription(const QString &desc)
-        {
-            ensureD()->desc = desc;
-        }
+    void File::setDescription(const QString &desc) { ensureD()->desc = desc; }
 
-        void File::addHash(const Hash &hash)
-        {
-            ensureD()->hashes.append(hash);
-        }
+    void File::addHash(const Hash &hash) { ensureD()->hashes.append(hash); }
 
-        void File::setMediaType(const QString &mediaType)
-        {
-            ensureD()->mediaType = mediaType;
-        }
+    void File::setMediaType(const QString &mediaType) { ensureD()->mediaType = mediaType; }
 
-        void File::setName(const QString &name)
-        {
-            ensureD()->name = name;
-        }
+    void File::setName(const QString &name) { ensureD()->name = name; }
 
-        void File::setSize(quint64 size)
-        {
-            ensureD()->size = size;
-            d->hasSize      = true;
-        }
+    void File::setSize(quint64 size)
+    {
+        ensureD()->size = size;
+        d->hasSize      = true;
+    }
 
-        void File::setRange(const Range &range)
-        {
-            ensureD()->range  = range;
-            d->rangeSupported = true;
-        }
+    void File::setRange(const Range &range)
+    {
+        ensureD()->range  = range;
+        d->rangeSupported = true;
+    }
 
-        void File::setThumbnail(const Thumbnail &thumb)
-        {
-            ensureD()->thumbnail = thumb;
-        }
+    void File::setThumbnail(const Thumbnail &thumb) { ensureD()->thumbnail = thumb; }
 
-        void File::setAmplitudes(const QByteArray &amplitudes)
-        {
-            d->amplitudes = amplitudes;
-        }
+    void File::setAmplitudes(const QByteArray &amplitudes) { d->amplitudes = amplitudes; }
 
-        File::Private *File::ensureD()
-        {
-            if (!d) {
-                d = new Private;
-            }
-            return d.data();
+    File::Private *File::ensureD()
+    {
+        if (!d) {
+            d = new Private;
         }
+        return d.data();
+    }
 
-        //----------------------------------------------------------------------------
-        // Checksum
-        //----------------------------------------------------------------------------
-        Checksum::Checksum(const QDomElement &cs) :
-            ContentBase(cs)
-        {
-            file = File(cs.firstChildElement(QLatin1String("file")));
-        }
+    //----------------------------------------------------------------------------
+    // Checksum
+    //----------------------------------------------------------------------------
+    Checksum::Checksum(const QDomElement &cs) : ContentBase(cs)
+    {
+        file = File(cs.firstChildElement(QLatin1String("file")));
+    }
 
-        bool Checksum::isValid() const
-        {
-            return ContentBase::isValid() && file.isValid();
-        }
+    bool Checksum::isValid() const { return ContentBase::isValid() && file.isValid(); }
 
-        QDomElement Checksum::toXml(QDomDocument *doc) const
-        {
-            auto el = ContentBase::toXml(doc, "checksum");
-            if (!el.isNull()) {
-                el.appendChild(file.toXml(doc));
-            }
-            return el;
+    QDomElement Checksum::toXml(QDomDocument *doc) const
+    {
+        auto el = ContentBase::toXml(doc, "checksum");
+        if (!el.isNull()) {
+            el.appendChild(file.toXml(doc));
         }
+        return el;
+    }
 
-        //----------------------------------------------------------------------------
-        // Received
-        //----------------------------------------------------------------------------
-        QDomElement Received::toXml(QDomDocument *doc) const
-        {
-            return ContentBase::toXml(doc, "received");
-        }
+    //----------------------------------------------------------------------------
+    // Received
+    //----------------------------------------------------------------------------
+    QDomElement Received::toXml(QDomDocument *doc) const { return ContentBase::toXml(doc, "received"); }
 
-        //----------------------------------------------------------------------------
-        // ApplicationManager
-        //----------------------------------------------------------------------------
-        Manager::Manager(QObject *parent) :
-            XMPP::Jingle::ApplicationManager(parent)
-        {
-        }
+    //----------------------------------------------------------------------------
+    // ApplicationManager
+    //----------------------------------------------------------------------------
+    Manager::Manager(QObject *parent) : XMPP::Jingle::ApplicationManager(parent) {}
 
-        Manager::~Manager()
-        {
-            if (jingleManager)
-                jingleManager->unregisterApp(NS);
-        }
+    Manager::~Manager()
+    {
+        if (jingleManager)
+            jingleManager->unregisterApp(NS);
+    }
 
-        void Manager::setJingleManager(XMPP::Jingle::Manager *jm)
-        {
-            jingleManager = jm;
-        }
+    void Manager::setJingleManager(XMPP::Jingle::Manager *jm) { jingleManager = jm; }
 
-        Application *Manager::startApplication(const ApplicationManagerPad::Ptr &pad, const QString &contentName, Origin creator, Origin senders)
-        {
-            if (!(contentName.size() > 0 && (senders == Origin::Initiator || senders == Origin::Responder))) {
-                qDebug("Invalid Jignle FT App start parameters");
-                return nullptr;
-            }
-            return new Application(pad.staticCast<Pad>(), contentName, creator, senders); // ContentOrigin::Remote
+    Application *Manager::startApplication(const ApplicationManagerPad::Ptr &pad, const QString &contentName,
+                                           Origin creator, Origin senders)
+    {
+        if (!(contentName.size() > 0 && (senders == Origin::Initiator || senders == Origin::Responder))) {
+            qDebug("Invalid Jignle FT App start parameters");
+            return nullptr;
         }
-
-        ApplicationManagerPad *Manager::pad(Session *session)
-        {
-            return new Pad(this, session);
+        return new Application(pad.staticCast<Pad>(), contentName, creator, senders); // ContentOrigin::Remote
+    }
+
+    ApplicationManagerPad *Manager::pad(Session *session) { return new Pad(this, session); }
+
+    void Manager::closeAll() {}
+
+    Client *Manager::client()
+    {
+        if (jingleManager) {
+            return jingleManager->client();
+        }
+        return nullptr;
+    }
+
+    QStringList Manager::availableTransports() const { return jingleManager->availableTransports(Transport::Reliable); }
+
+    //----------------------------------------------------------------------------
+    // Application
+    //----------------------------------------------------------------------------
+    class Application::Private {
+    public:
+        Application *             q                     = nullptr;
+        State                     state                 = State::Created;
+        State                     transportReplaceState = State::Finished;
+        Action                    updateToSend          = Action::NoAction;
+        QSharedPointer<Pad>       pad;
+        QString                   contentName;
+        File                      file;
+        File                      acceptFile; // as it comes with "accept" response
+        Origin                    creator;
+        Origin                    senders;
+        Origin                    transportReplaceOrigin = Origin::None;
+        XMPP::Stanza::Error       lastError;
+        Reason                    terminationReason;
+        QSharedPointer<Transport> transport;
+        Connection::Ptr           connection;
+        QStringList               availableTransports;
+        bool                      closeDeviceOnFinish = true;
+        bool                      streamigMode        = false;
+        QIODevice *               device              = nullptr;
+        quint64                   bytesLeft           = 0;
+
+        void setState(State s)
+        {
+            state = s;
+            if (s == State::Finished) {
+                if (device && closeDeviceOnFinish) {
+                    device->close();
+                }
+                if (connection) {
+                    connection->close();
+                }
+            }
+            emit q->stateChanged(s);
         }
 
-        void Manager::closeAll()
+        void handleStreamFail()
         {
+            terminationReason = Reason(Reason::Condition::FailedApplication, QString::fromLatin1("stream failed"));
+            setState(State::Finished);
         }
 
-        Client *Manager::client()
+        void writeNextBlockToTransport()
         {
-            if (jingleManager) {
-                return jingleManager->client();
+            if (!bytesLeft) {
+                terminationReason = Reason(Reason::Condition::Success);
+                setState(State::Finished);
+                return; // everything is written
             }
-            return nullptr;
-        }
-
-        QStringList Manager::availableTransports() const
-        {
-            return jingleManager->availableTransports(Transport::Reliable);
-        }
-
-        //----------------------------------------------------------------------------
-        // Application
-        //----------------------------------------------------------------------------
-        class Application::Private {
-        public:
-            Application *             q                     = nullptr;
-            State                     state                 = State::Created;
-            State                     transportReplaceState = State::Finished;
-            Action                    updateToSend          = Action::NoAction;
-            QSharedPointer<Pad>       pad;
-            QString                   contentName;
-            File                      file;
-            File                      acceptFile; // as it comes with "accept" response
-            Origin                    creator;
-            Origin                    senders;
-            Origin                    transportReplaceOrigin = Origin::None;
-            XMPP::Stanza::Error       lastError;
-            Reason                    terminationReason;
-            QSharedPointer<Transport> transport;
-            Connection::Ptr           connection;
-            QStringList               availableTransports;
-            bool                      closeDeviceOnFinish = true;
-            bool                      streamigMode        = false;
-            QIODevice *               device              = nullptr;
-            quint64                   bytesLeft           = 0;
-
-            void setState(State s)
-            {
-                state = s;
-                if (s == State::Finished) {
-                    if (device && closeDeviceOnFinish) {
-                        device->close();
-                    }
-                    if (connection) {
-                        connection->close();
-                    }
-                }
-                emit q->stateChanged(s);
+            auto sz = connection->blockSize();
+            sz      = sz ? sz : 8192;
+            if (sz > bytesLeft) {
+                sz = bytesLeft;
             }
-
-            void handleStreamFail()
-            {
-                terminationReason = Reason(Reason::Condition::FailedApplication, QString::fromLatin1("stream failed"));
-                setState(State::Finished);
+            QByteArray data = device->read(sz);
+            if (data.isEmpty()) {
+                handleStreamFail();
+                return;
             }
+            if (connection->write(data) == -1) {
+                handleStreamFail();
+                return;
+            }
+            emit q->progress(device->pos());
+            bytesLeft -= sz;
+        }
 
-            void writeNextBlockToTransport()
-            {
-                if (!bytesLeft) {
-                    terminationReason = Reason(Reason::Condition::Success);
-                    setState(State::Finished);
-                    return; // everything is written
-                }
-                auto sz = connection->blockSize();
-                sz      = sz ? sz : 8192;
+        void readNextBlockFromTransport()
+        {
+            quint64 bytesAvail;
+            while (bytesLeft && (bytesAvail = connection->bytesAvailable())) {
+                quint64 sz = 65536; // shall we respect transport->blockSize() ?
                 if (sz > bytesLeft) {
                     sz = bytesLeft;
                 }
-                QByteArray data = device->read(sz);
+                if (sz > bytesAvail) {
+                    sz = bytesAvail;
+                }
+                QByteArray data = connection->read(sz);
                 if (data.isEmpty()) {
                     handleStreamFail();
                     return;
                 }
-                if (connection->write(data) == -1) {
+                if (device->write(data) == -1) {
                     handleStreamFail();
                     return;
                 }
                 emit q->progress(device->pos());
                 bytesLeft -= sz;
             }
-
-            void readNextBlockFromTransport()
-            {
-                quint64 bytesAvail;
-                while (bytesLeft && (bytesAvail = connection->bytesAvailable())) {
-                    quint64 sz = 65536; // shall we respect transport->blockSize() ?
-                    if (sz > bytesLeft) {
-                        sz = bytesLeft;
-                    }
-                    if (sz > bytesAvail) {
-                        sz = bytesAvail;
-                    }
-                    QByteArray data = connection->read(sz);
-                    if (data.isEmpty()) {
-                        handleStreamFail();
-                        return;
-                    }
-                    if (device->write(data) == -1) {
-                        handleStreamFail();
-                        return;
-                    }
-                    emit q->progress(device->pos());
-                    bytesLeft -= sz;
-                }
-                if (!bytesLeft) {
-                    // TODO send <received>
-                    terminationReason = Reason(Reason::Condition::Success);
-                    setState(State::Finished);
-                }
+            if (!bytesLeft) {
+                // TODO send <received>
+                terminationReason = Reason(Reason::Condition::Success);
+                setState(State::Finished);
             }
-        };
-
-        Application::Application(const QSharedPointer<Pad> &pad, const QString &contentName, Origin creator, Origin senders) :
-            d(new Private)
-        {
-            d->q                   = this;
-            d->pad                 = pad;
-            d->contentName         = contentName;
-            d->creator             = creator;
-            d->senders             = senders;
-            d->availableTransports = static_cast<Manager *>(pad->manager())->availableTransports();
         }
+    };
 
-        Application::~Application()
-        {
-        }
+    Application::Application(const QSharedPointer<Pad> &pad, const QString &contentName, Origin creator,
+                             Origin senders) :
+        d(new Private)
+    {
+        d->q                   = this;
+        d->pad                 = pad;
+        d->contentName         = contentName;
+        d->creator             = creator;
+        d->senders             = senders;
+        d->availableTransports = static_cast<Manager *>(pad->manager())->availableTransports();
+    }
 
-        ApplicationManagerPad::Ptr Application::pad() const
-        {
-            return d->pad.staticCast<ApplicationManagerPad>();
-        }
+    Application::~Application() {}
 
-        State Application::state() const
-        {
-            return d->state;
-        }
+    ApplicationManagerPad::Ptr Application::pad() const { return d->pad.staticCast<ApplicationManagerPad>(); }
 
-        void Application::setState(State state)
-        {
-            d->setState(state);
-        }
+    State Application::state() const { return d->state; }
 
-        Stanza::Error Application::lastError() const
-        {
-            return d->lastError;
-        }
+    void Application::setState(State state) { d->setState(state); }
 
-        Reason Application::terminationReason() const
-        {
-            return d->terminationReason;
-        }
+    Stanza::Error Application::lastError() const { return d->lastError; }
 
-        QString Application::contentName() const
-        {
-            return d->contentName;
-        }
+    Reason Application::terminationReason() const { return d->terminationReason; }
 
-        Origin Application::creator() const
-        {
-            return d->creator;
-        }
+    QString Application::contentName() const { return d->contentName; }
 
-        Origin Application::senders() const
-        {
-            return d->senders;
-        }
+    Origin Application::creator() const { return d->creator; }
 
-        Application::SetDescError Application::setDescription(const QDomElement &description)
-        {
-            d->file = File(description.firstChildElement("file"));
-            //d->state = State::Pending; // basically it's incomming  content. so if we parsed it it's pending. if not parsed if will rejected anyway.
-            return d->file.isValid() ? Ok : Unparsed;
-        }
+    Origin Application::senders() const { return d->senders; }
 
-        void Application::setFile(const File &file)
-        {
-            d->file = file;
-        }
+    Application::SetDescError Application::setDescription(const QDomElement &description)
+    {
+        d->file = File(description.firstChildElement("file"));
+        // d->state = State::Pending; // basically it's incomming  content. so if we parsed it it's pending. if not
+        // parsed if will rejected anyway.
+        return d->file.isValid() ? Ok : Unparsed;
+    }
 
-        File Application::file() const
-        {
-            return d->file;
-        }
+    void Application::setFile(const File &file) { d->file = file; }
 
-        File Application::acceptFile() const
-        {
-            return d->acceptFile;
-        }
+    File Application::file() const { return d->file; }
 
-        // incoming one? or we have to check real direction
-        bool Application::setTransport(const QSharedPointer<Transport> &transport)
-        {
-            if (!(transport->features() & Transport::Reliable))
-                return false;
+    File Application::acceptFile() const { return d->acceptFile; }
 
-            int nsIndex = d->availableTransports.indexOf(transport->pad()->ns());
-            if (nsIndex == -1) {
-                return false;
-            }
+    // incoming one? or we have to check real direction
+    bool Application::setTransport(const QSharedPointer<Transport> &transport)
+    {
+        if (!(transport->features() & Transport::Reliable))
+            return false;
 
-            // in case we automatically select a new transport on our own we definitely will come up to this point
-            if (d->transport) {
-                d->transport->disconnect(this);
-                d->transport.reset();
-            }
+        int nsIndex = d->availableTransports.indexOf(transport->pad()->ns());
+        if (nsIndex == -1) {
+            return false;
+        }
 
-            d->availableTransports.removeAt(nsIndex);
-            d->transport = transport;
-            connect(transport.data(), &Transport::updated, this, &Application::updated);
-            connect(transport.data(), &Transport::connected, this, [this]() {
-                d->transportReplaceOrigin = Origin::None;
-                d->transportReplaceState  = State::Finished; // not needed here probably
-                d->connection             = d->transport->connection();
-                if (d->streamigMode) {
-                    connect(d->connection.data(), &Connection::readyRead, this, [this]() {
-                        if (!d->device) {
-                            return;
-                        }
-                        if (d->pad->session()->role() != d->senders) {
-                            d->readNextBlockFromTransport();
-                        }
-                    });
-                    connect(d->connection.data(), &Connection::bytesWritten, this, [this](qint64 bytes) {
-                        Q_UNUSED(bytes)
-                        if (d->pad->session()->role() == d->senders && !d->connection->bytesToWrite()) {
-                            d->writeNextBlockToTransport();
-                        }
-                    });
-                }
-                d->setState(State::Active);
-                if (d->streamigMode) {
-                    if (d->acceptFile.range().isValid()) {
-                        d->bytesLeft = d->acceptFile.range().length;
-                        emit deviceRequested(d->acceptFile.range().offset, d->bytesLeft);
-                    } else {
-                        d->bytesLeft = d->file.size();
-                        emit deviceRequested(0, d->bytesLeft);
-                    }
-                } else {
-                    emit connectionReady();
-                }
-            });
+        // in case we automatically select a new transport on our own we definitely will come up to this point
+        if (d->transport) {
+            d->transport->disconnect(this);
+            d->transport.reset();
+        }
 
-            connect(transport.data(), &Transport::failed, this, [this]() {
-                d->transportReplaceOrigin = d->pad->session()->role();
-                if (d->state >= State::Active) {
-                    emit updated(); // late failure are unhandled. just notify the remote
-                    return;
-                }
-                // we can try to replace the transport
-                if (!selectNextTransport()) { // we can do transport-replace here
-                    if (d->state == State::PrepareLocalOffer && d->creator == d->pad->session()->role()) {
-                        // we were unable to send even initial offer
-                        d->setState(State::Finished);
-                    } else {
-                        emit updated(); // we have to notify our peer about failure
+        d->availableTransports.removeAt(nsIndex);
+        d->transport = transport;
+        connect(transport.data(), &Transport::updated, this, &Application::updated);
+        connect(transport.data(), &Transport::connected, this, [this]() {
+            d->transportReplaceOrigin = Origin::None;
+            d->transportReplaceState  = State::Finished; // not needed here probably
+            d->connection             = d->transport->connection();
+            if (d->streamigMode) {
+                connect(d->connection.data(), &Connection::readyRead, this, [this]() {
+                    if (!d->device) {
+                        return;
+                    }
+                    if (d->pad->session()->role() != d->senders) {
+                        d->readNextBlockFromTransport();
                     }
+                });
+                connect(d->connection.data(), &Connection::bytesWritten, this, [this](qint64 bytes) {
+                    Q_UNUSED(bytes)
+                    if (d->pad->session()->role() == d->senders && !d->connection->bytesToWrite()) {
+                        d->writeNextBlockToTransport();
+                    }
+                });
+            }
+            d->setState(State::Active);
+            if (d->streamigMode) {
+                if (d->acceptFile.range().isValid()) {
+                    d->bytesLeft = d->acceptFile.range().length;
+                    emit deviceRequested(d->acceptFile.range().offset, d->bytesLeft);
                 } else {
-                    d->transportReplaceState = State::PrepareLocalOffer;
+                    d->bytesLeft = d->file.size();
+                    emit deviceRequested(0, d->bytesLeft);
                 }
-            });
-
-            if (d->state >= State::Unacked) {
-                // seems like we are in transport failure recovery. d->transportFailed may confirm this
-                d->transport->prepare();
+            } else {
+                emit connectionReady();
             }
-            return true;
-        }
+        });
 
-        Origin Application::transportReplaceOrigin() const
-        {
-            return d->transportReplaceOrigin;
-        }
-
-        bool Application::incomingTransportReplace(const QSharedPointer<Transport> &transport)
-        {
-            auto prev = d->transportReplaceOrigin;
-            if (d->pad->session()->role() == Origin::Responder && prev == Origin::Responder && d->transport) {
-                // if I'm a responder and tried to send transport-replace too, then push ns back
-                d->availableTransports.append(d->transport->pad()->ns());
+        connect(transport.data(), &Transport::failed, this, [this]() {
+            d->transportReplaceOrigin = d->pad->session()->role();
+            if (d->state >= State::Active) {
+                emit updated(); // late failure are unhandled. just notify the remote
+                return;
             }
-            d->transportReplaceOrigin = d->pad->session()->peerRole();
-            auto ret                  = setTransport(transport);
-            if (ret)
+            // we can try to replace the transport
+            if (!selectNextTransport()) { // we can do transport-replace here
+                if (d->state == State::PrepareLocalOffer && d->creator == d->pad->session()->role()) {
+                    // we were unable to send even initial offer
+                    d->setState(State::Finished);
+                } else {
+                    emit updated(); // we have to notify our peer about failure
+                }
+            } else {
                 d->transportReplaceState = State::PrepareLocalOffer;
-            else {
-                d->transportReplaceOrigin = prev;
-                d->lastError.reset();
-                // REVIEW We have to fail application here on tie-break or propose another transport
             }
+        });
 
-            return ret;
+        if (d->state >= State::Unacked) {
+            // seems like we are in transport failure recovery. d->transportFailed may confirm this
+            d->transport->prepare();
         }
+        return true;
+    }
 
-        QSharedPointer<Transport> Application::transport() const
-        {
-            return d->transport;
+    Origin Application::transportReplaceOrigin() const { return d->transportReplaceOrigin; }
+
+    bool Application::incomingTransportReplace(const QSharedPointer<Transport> &transport)
+    {
+        auto prev = d->transportReplaceOrigin;
+        if (d->pad->session()->role() == Origin::Responder && prev == Origin::Responder && d->transport) {
+            // if I'm a responder and tried to send transport-replace too, then push ns back
+            d->availableTransports.append(d->transport->pad()->ns());
+        }
+        d->transportReplaceOrigin = d->pad->session()->peerRole();
+        auto ret                  = setTransport(transport);
+        if (ret)
+            d->transportReplaceState = State::PrepareLocalOffer;
+        else {
+            d->transportReplaceOrigin = prev;
+            d->lastError.reset();
+            // REVIEW We have to fail application here on tie-break or propose another transport
         }
 
-        void Application::setStreamingMode(bool mode)
-        {
-            if (d->state <= State::Connecting) {
-                d->streamigMode = mode;
-            }
+        return ret;
+    }
+
+    QSharedPointer<Transport> Application::transport() const { return d->transport; }
+
+    void Application::setStreamingMode(bool mode)
+    {
+        if (d->state <= State::Connecting) {
+            d->streamigMode = mode;
         }
+    }
 
-        Action Application::evaluateOutgoingUpdate()
-        {
-            d->updateToSend = Action::NoAction;
-            if (!isValid() || d->state == State::Created || d->state == State::Finished) {
-                return d->updateToSend;
-            }
+    Action Application::evaluateOutgoingUpdate()
+    {
+        d->updateToSend = Action::NoAction;
+        if (!isValid() || d->state == State::Created || d->state == State::Finished) {
+            return d->updateToSend;
+        }
 
-            auto evaluateTransportReplaceAction = [this]() {
-                if (d->transportReplaceState != State::PrepareLocalOffer || !d->transport->isInitialOfferReady())
-                    return Action::NoAction;
+        auto evaluateTransportReplaceAction = [this]() {
+            if (d->transportReplaceState != State::PrepareLocalOffer || !d->transport->isInitialOfferReady())
+                return Action::NoAction;
 
-                return d->transportReplaceOrigin == d->pad->session()->role() ? Action::TransportReplace : Action::TransportAccept;
-            };
+            return d->transportReplaceOrigin == d->pad->session()->role() ? Action::TransportReplace
+                                                                          : Action::TransportAccept;
+        };
 
-            switch (d->state) {
-            case State::Created:
-                break;
-            case State::PrepareLocalOffer:
-                if (d->transportReplaceOrigin != Origin::None) {
-                    if (!d->transport) {
-                        d->updateToSend = Action::ContentReject; // case me=creator was already handled by this momemnt in case of app.PrepareLocalOffer. see Transport::failed above
-                    }
-                    d->updateToSend = evaluateTransportReplaceAction();
-                    if (d->updateToSend == Action::TransportAccept) {
-                        d->updateToSend = Action::ContentAccept;
-                    }
-                    return d->updateToSend;
+        switch (d->state) {
+        case State::Created:
+            break;
+        case State::PrepareLocalOffer:
+            if (d->transportReplaceOrigin != Origin::None) {
+                if (!d->transport) {
+                    d->updateToSend
+                        = Action::ContentReject; // case me=creator was already handled by this momemnt in case of
+                                                 // app.PrepareLocalOffer. see Transport::failed above
                 }
-
-                if (d->transport->isInitialOfferReady())
-                    d->updateToSend = d->creator == d->pad->session()->role() ? Action::ContentAdd : Action::ContentAccept;
-
-                break;
-            case State::Connecting:
-            case State::Pending:
-            case State::Active:
-                if (d->transportReplaceOrigin != Origin::None) {
-                    if (d->state == State::Active || !d->transport)
-                        d->updateToSend = Action::ContentRemove;
-                    else
-                        d->updateToSend = evaluateTransportReplaceAction();
-                    return d->updateToSend;
+                d->updateToSend = evaluateTransportReplaceAction();
+                if (d->updateToSend == Action::TransportAccept) {
+                    d->updateToSend = Action::ContentAccept;
                 }
+                return d->updateToSend;
+            }
 
-                if (d->terminationReason.isValid() && d->terminationReason.condition() != Reason::Condition::Success) {
-                    d->updateToSend = Action::ContentRemove;
-                } else if (d->transport->hasUpdates())
-                    d->updateToSend = Action::TransportInfo;
+            if (d->transport->isInitialOfferReady())
+                d->updateToSend = d->creator == d->pad->session()->role() ? Action::ContentAdd : Action::ContentAccept;
 
-                break;
-            case State::Finishing:
-                if (d->transportReplaceOrigin != Origin::None || d->terminationReason.isValid()) {
+            break;
+        case State::Connecting:
+        case State::Pending:
+        case State::Active:
+            if (d->transportReplaceOrigin != Origin::None) {
+                if (d->state == State::Active || !d->transport)
                     d->updateToSend = Action::ContentRemove;
-                } else {
-                    d->updateToSend = Action::SessionInfo; // to send checksum
-                }
-                break;
-            default:
-                break;
+                else
+                    d->updateToSend = evaluateTransportReplaceAction();
+                return d->updateToSend;
             }
-            return d->updateToSend; // TODO
-        }
 
-        OutgoingUpdate Application::takeOutgoingUpdate()
-        {
-            if (d->updateToSend == Action::NoAction) {
-                return OutgoingUpdate();
+            if (d->terminationReason.isValid() && d->terminationReason.condition() != Reason::Condition::Success) {
+                d->updateToSend = Action::ContentRemove;
+            } else if (d->transport->hasUpdates())
+                d->updateToSend = Action::TransportInfo;
+
+            break;
+        case State::Finishing:
+            if (d->transportReplaceOrigin != Origin::None || d->terminationReason.isValid()) {
+                d->updateToSend = Action::ContentRemove;
+            } else {
+                d->updateToSend = Action::SessionInfo; // to send checksum
             }
+            break;
+        default:
+            break;
+        }
+        return d->updateToSend; // TODO
+    }
 
-            auto client = d->pad->session()->manager()->client();
-            auto doc    = client->doc();
+    OutgoingUpdate Application::takeOutgoingUpdate()
+    {
+        if (d->updateToSend == Action::NoAction) {
+            return OutgoingUpdate();
+        }
 
-            if (d->updateToSend == Action::SessionInfo) {
-                if (d->state != State::Finishing) {
-                    // TODO implement
-                    return OutgoingUpdate();
-                }
-                ContentBase cb(d->pad->session()->role(), d->contentName);
-                return OutgoingUpdate { QList<QDomElement>() << cb.toXml(doc, "received"), [this]() {
-                                           d->setState(State::Finished);
-                                       } };
-            }
+        auto client = d->pad->session()->manager()->client();
+        auto doc    = client->doc();
 
-            QDomElement      transportEl;
-            OutgoingUpdateCB transportCB;
-
-            ContentBase cb(d->creator, d->contentName);
-            if (d->state == State::PrepareLocalOffer)
-                cb.senders = d->senders;
-            QList<QDomElement> updates;
-            auto               contentEl = cb.toXml(doc, "content");
-            updates << contentEl;
-
-            switch (d->updateToSend) {
-            case Action::ContentReject:
-            case Action::ContentRemove:
-                if (d->transportReplaceOrigin != Origin::None)
-                    d->terminationReason = Reason(Reason::Condition::FailedTransport);
-                if (d->terminationReason.isValid())
-                    updates << d->terminationReason.toXml(doc);
-                return OutgoingUpdate { updates, [this]() {
-                                           d->setState(State::Finished);
-                                       } };
-            case Action::ContentAdd:
-            case Action::ContentAccept:
-                Q_ASSERT(d->transport->isInitialOfferReady());
-                if (d->file.thumbnail().data.size()) {
-                    auto    thumb = d->file.thumbnail();
-                    auto    bm    = client->bobManager();
-                    BoBData data  = bm->append(thumb.data, thumb.mimeType);
-                    thumb.uri     = QLatin1String("cid:") + data.cid();
-                    d->file.setThumbnail(thumb);
-                }
-                contentEl.appendChild(doc->createElementNS(NS, QString::fromLatin1("description"))).appendChild(d->file.toXml(doc));
-                std::tie(transportEl, transportCB) = d->transport->takeInitialOffer();
-                contentEl.appendChild(transportEl);
-
-                d->setState(State::Unacked);
-                return OutgoingUpdate { updates, [this, transportCB]() {
-                                           if (transportCB) {
-                                               transportCB();
-                                           }
-                                           d->setState(d->pad->session()->role() == Origin::Initiator ? State::Pending : State::Connecting);
-                                       } };
-            case Action::TransportInfo:
-                Q_ASSERT(d->transport->hasUpdates());
-                std::tie(transportEl, transportCB) = d->transport->takeOutgoingUpdate();
-                contentEl.appendChild(transportEl);
-                return OutgoingUpdate { updates, transportCB };
-            case Action::TransportReplace:
-            case Action::TransportAccept: {
-                Q_ASSERT(d->transport->isInitialOfferReady());
-                d->transportReplaceState           = State::Unacked;
-                std::tie(transportEl, transportCB) = d->transport->takeInitialOffer();
-                contentEl.appendChild(transportEl);
-                auto action = d->updateToSend;
-                return OutgoingUpdate { updates, [this, transportCB, action]() {
-                                           if (transportCB) {
-                                               transportCB();
-                                           }
-                                           d->transportReplaceState = action == Action::TransportReplace ? State::Pending : State::Finished;
-                                       } };
+        if (d->updateToSend == Action::SessionInfo) {
+            if (d->state != State::Finishing) {
+                // TODO implement
+                return OutgoingUpdate();
             }
-            default:
-                break;
+            ContentBase cb(d->pad->session()->role(), d->contentName);
+            return OutgoingUpdate { QList<QDomElement>() << cb.toXml(doc, "received"),
+                                    [this]() { d->setState(State::Finished); } };
+        }
+
+        QDomElement      transportEl;
+        OutgoingUpdateCB transportCB;
+
+        ContentBase cb(d->creator, d->contentName);
+        if (d->state == State::PrepareLocalOffer)
+            cb.senders = d->senders;
+        QList<QDomElement> updates;
+        auto               contentEl = cb.toXml(doc, "content");
+        updates << contentEl;
+
+        switch (d->updateToSend) {
+        case Action::ContentReject:
+        case Action::ContentRemove:
+            if (d->transportReplaceOrigin != Origin::None)
+                d->terminationReason = Reason(Reason::Condition::FailedTransport);
+            if (d->terminationReason.isValid())
+                updates << d->terminationReason.toXml(doc);
+            return OutgoingUpdate { updates, [this]() { d->setState(State::Finished); } };
+        case Action::ContentAdd:
+        case Action::ContentAccept:
+            Q_ASSERT(d->transport->isInitialOfferReady());
+            if (d->file.thumbnail().data.size()) {
+                auto    thumb = d->file.thumbnail();
+                auto    bm    = client->bobManager();
+                BoBData data  = bm->append(thumb.data, thumb.mimeType);
+                thumb.uri     = QLatin1String("cid:") + data.cid();
+                d->file.setThumbnail(thumb);
+            }
+            contentEl.appendChild(doc->createElementNS(NS, QString::fromLatin1("description")))
+                .appendChild(d->file.toXml(doc));
+            std::tie(transportEl, transportCB) = d->transport->takeInitialOffer();
+            contentEl.appendChild(transportEl);
+
+            d->setState(State::Unacked);
+            return OutgoingUpdate { updates, [this, transportCB]() {
+                                       if (transportCB) {
+                                           transportCB();
+                                       }
+                                       d->setState(d->pad->session()->role() == Origin::Initiator ? State::Pending
+                                                                                                  : State::Connecting);
+                                   } };
+        case Action::TransportInfo:
+            Q_ASSERT(d->transport->hasUpdates());
+            std::tie(transportEl, transportCB) = d->transport->takeOutgoingUpdate();
+            contentEl.appendChild(transportEl);
+            return OutgoingUpdate { updates, transportCB };
+        case Action::TransportReplace:
+        case Action::TransportAccept: {
+            Q_ASSERT(d->transport->isInitialOfferReady());
+            d->transportReplaceState           = State::Unacked;
+            std::tie(transportEl, transportCB) = d->transport->takeInitialOffer();
+            contentEl.appendChild(transportEl);
+            auto action = d->updateToSend;
+            return OutgoingUpdate { updates, [this, transportCB, action]() {
+                                       if (transportCB) {
+                                           transportCB();
+                                       }
+                                       d->transportReplaceState
+                                           = action == Action::TransportReplace ? State::Pending : State::Finished;
+                                   } };
+        }
+        default:
+            break;
+        }
+
+        return OutgoingUpdate(); // TODO
+    }
+
+    bool Application::wantBetterTransport(const QSharedPointer<Transport> &t) const
+    {
+        Q_UNUSED(t)
+        return true; // TODO check
+    }
+
+    bool Application::selectNextTransport()
+    {
+        while (d->availableTransports.size()) {
+            auto t = d->pad->session()->newOutgoingTransport(d->availableTransports.last());
+            if (t && setTransport(t)) {
+                return true;
+            } else {
+                d->availableTransports.removeLast();
             }
+        }
+        return false;
+    }
 
-            return OutgoingUpdate(); // TODO
+    void Application::prepare()
+    {
+        if (!d->transport) {
+            selectNextTransport();
         }
+        if (d->transport) {
+            d->setState(State::PrepareLocalOffer);
+            d->transport->prepare();
+        }
+    }
 
-        bool Application::wantBetterTransport(const QSharedPointer<Transport> &t) const
-        {
-            Q_UNUSED(t)
-            return true; // TODO check
+    void Application::start()
+    {
+        if (d->transport) {
+            d->setState(State::Connecting);
+            d->transport->start();
         }
+        // TODO we need QIODevice somewhere here
+    }
 
-        bool Application::selectNextTransport()
-        {
-            while (d->availableTransports.size()) {
-                auto t = d->pad->session()->newOutgoingTransport(d->availableTransports.last());
-                if (t && setTransport(t)) {
-                    return true;
-                } else {
-                    d->availableTransports.removeLast();
-                }
-            }
+    bool Application::accept(const QDomElement &el)
+    {
+        File f(el.firstChildElement("file"));
+        if (!f.isValid()) {
             return false;
         }
+        d->acceptFile = f;
+        // TODO validate if accept file matches to the offer
+        setState(State::Accepted);
+        return true;
+    }
 
-        void Application::prepare()
-        {
-            if (!d->transport) {
-                selectNextTransport();
-            }
-            if (d->transport) {
-                d->setState(State::PrepareLocalOffer);
-                d->transport->prepare();
-            }
-        }
+    void Application::remove(Reason::Condition cond, const QString &comment)
+    {
+        if (d->state >= State::Finishing)
+            return;
 
-        void Application::start()
-        {
-            if (d->transport) {
-                d->setState(State::Connecting);
-                d->transport->start();
-            }
-            // TODO we need QIODevice somewhere here
-        }
+        d->terminationReason      = Reason(cond, comment);
+        d->transportReplaceOrigin = Origin::None; // just in case
+        d->transport->disconnect(this);
+        d->transport.reset();
 
-        bool Application::accept(const QDomElement &el)
-        {
-            File f(el.firstChildElement("file"));
-            if (!f.isValid()) {
-                return false;
-            }
-            d->acceptFile = f;
-            // TODO validate if accept file matches to the offer
-            setState(State::Accepted);
-            return true;
+        if (d->creator == d->pad->session()->role() && d->state <= State::PrepareLocalOffer) {
+            // local content, not yet sent to remote
+            setState(State::Finished);
+            return;
         }
 
-        void Application::remove(Reason::Condition cond, const QString &comment)
-        {
-            if (d->state >= State::Finishing)
-                return;
+        setState(State::Finishing);
+        emit updated();
+    }
 
-            d->terminationReason      = Reason(cond, comment);
-            d->transportReplaceOrigin = Origin::None; // just in case
-            d->transport->disconnect(this);
-            d->transport.reset();
-
-            if (d->creator == d->pad->session()->role() && d->state <= State::PrepareLocalOffer) {
-                // local content, not yet sent to remote
-                setState(State::Finished);
-                return;
+    bool Application::incomingTransportAccept(const QDomElement &transportEl)
+    {
+        if (d->transportReplaceOrigin != d->pad->session()->role()) {
+            d->lastError = ErrorUtil::makeOutOfOrder(*d->pad->doc());
+            return false;
+        }
+        if (d->transport->update(transportEl)) {
+            d->transportReplaceOrigin = Origin::None;
+            d->transportReplaceState  = State::Finished;
+            if (d->state >= State::Connecting) {
+                d->transport->start();
             }
-
-            setState(State::Finishing);
             emit updated();
+            return true;
         }
+        return false;
+    }
 
-        bool Application::incomingTransportAccept(const QDomElement &transportEl)
-        {
-            if (d->transportReplaceOrigin != d->pad->session()->role()) {
-                d->lastError = ErrorUtil::makeOutOfOrder(*d->pad->doc());
-                return false;
-            }
-            if (d->transport->update(transportEl)) {
-                d->transportReplaceOrigin = Origin::None;
-                d->transportReplaceState  = State::Finished;
-                if (d->state >= State::Connecting) {
-                    d->transport->start();
-                }
-                emit updated();
-                return true;
-            }
-            return false;
-        }
+    bool Application::isValid() const
+    {
+        return d->file.isValid() && d->contentName.size() > 0
+            && (d->senders == Origin::Initiator || d->senders == Origin::Responder);
+    }
 
-        bool Application::isValid() const
-        {
-            return d->file.isValid() && d->contentName.size() > 0 && (d->senders == Origin::Initiator || d->senders == Origin::Responder);
+    void Application::setDevice(QIODevice *dev, bool closeOnFinish)
+    {
+        if (!dev) { // failed to provide proper device
+            d->terminationReason
+                = Reason(Reason::Condition::FailedApplication, QString::fromLatin1("No destination device"));
+            emit updated();
+            return;
         }
-
-        void Application::setDevice(QIODevice *dev, bool closeOnFinish)
-        {
-            if (!dev) { // failed to provide proper device
-                d->terminationReason = Reason(Reason::Condition::FailedApplication, QString::fromLatin1("No destination device"));
-                emit updated();
-                return;
-            }
-            d->device              = dev;
-            d->closeDeviceOnFinish = closeOnFinish;
-            if (d->senders == d->pad->session()->role()) {
-                d->writeNextBlockToTransport();
-            } else {
-                d->readNextBlockFromTransport();
-            }
+        d->device              = dev;
+        d->closeDeviceOnFinish = closeOnFinish;
+        if (d->senders == d->pad->session()->role()) {
+            d->writeNextBlockToTransport();
+        } else {
+            d->readNextBlockFromTransport();
         }
+    }
 
-        Connection::Ptr Application::connection() const
-        {
-            return d->connection.staticCast<XMPP::Jingle::Connection>();
-        }
+    Connection::Ptr Application::connection() const { return d->connection.staticCast<XMPP::Jingle::Connection>(); }
 
-        Pad::Pad(Manager *manager, Session *session) :
-            _manager(manager),
-            _session(session)
-        {
-        }
+    Pad::Pad(Manager *manager, Session *session) : _manager(manager), _session(session) {}
 
-        QDomElement Pad::takeOutgoingSessionInfoUpdate()
-        {
-            return QDomElement(); // TODO
-        }
+    QDomElement Pad::takeOutgoingSessionInfoUpdate()
+    {
+        return QDomElement(); // TODO
+    }
 
-        QString Pad::ns() const
-        {
-            return NS;
-        }
+    QString Pad::ns() const { return NS; }
 
-        Session *Pad::session() const
-        {
-            return _session;
-        }
+    Session *Pad::session() const { return _session; }
 
-        ApplicationManager *Pad::manager() const
-        {
-            return _manager;
-        }
+    ApplicationManager *Pad::manager() const { return _manager; }
 
-        QString Pad::generateContentName(Origin senders)
-        {
-            QString prefix = senders == _session->role() ? "fileoffer" : "filereq";
-            QString name;
-            do {
-                name = prefix + QString("_%1").arg(qrand() & 0xffff, 4, 16, QChar('0'));
-            } while (_session->content(name, _session->role()));
-            return name;
-        }
+    QString Pad::generateContentName(Origin senders)
+    {
+        QString prefix = senders == _session->role() ? "fileoffer" : "filereq";
+        QString name;
+        do {
+            name = prefix + QString("_%1").arg(qrand() & 0xffff, 4, 16, QChar('0'));
+        } while (_session->content(name, _session->role()));
+        return name;
+    }
 
-        void Pad::addOutgoingOffer(const File &file)
-        {
-            auto selfp = _session->applicationPad(NS);
-            auto app   = _manager->startApplication(selfp, "ft", _session->role(), _session->role());
-            app->setFile(file);
-        }
-    } // namespace FileTransfer
+    void Pad::addOutgoingOffer(const File &file)
+    {
+        auto selfp = _session->applicationPad(NS);
+        auto app   = _manager->startApplication(selfp, "ft", _session->role(), _session->role());
+        app->setFile(file);
+    }
+} // namespace FileTransfer
 } // namespace Jingle
 } // namespace XMPP
diff --git a/src/xmpp/xmpp-im/jingle-ibb.cpp b/src/xmpp/xmpp-im/jingle-ibb.cpp
index 8721ad43..a1ce2c9a 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.cpp
+++ b/src/xmpp/xmpp-im/jingle-ibb.cpp
@@ -25,458 +25,411 @@
 
 #include <QTimer>
 
-namespace XMPP {
-namespace Jingle {
-namespace IBB {
-const QString NS(QStringLiteral("urn:xmpp:jingle:transports:ibb:1"));
-
-class Connection : public XMPP::Jingle::Connection
-{
-    Q_OBJECT
-
-public:
-    Client *client;
-    Jid peer;
-    QString sid;
-    size_t _blockSize;
-    IBBConnection *connection = nullptr;
-
-    bool offerSent = false;
-    bool offerReceived = false;
-    bool closing = false;
-    bool finished = false;
-
-    Connection(Client *client, const Jid &jid, const QString &sid, size_t blockSize) :
-        client(client),
-        peer(jid),
-        sid(sid),
-        _blockSize(blockSize)
-    {
+namespace XMPP { namespace Jingle { namespace IBB {
+    const QString NS(QStringLiteral("urn:xmpp:jingle:transports:ibb:1"));
+
+    class Connection : public XMPP::Jingle::Connection {
+        Q_OBJECT
+
+    public:
+        Client *       client;
+        Jid            peer;
+        QString        sid;
+        size_t         _blockSize;
+        IBBConnection *connection = nullptr;
+
+        bool offerSent     = false;
+        bool offerReceived = false;
+        bool closing       = false;
+        bool finished      = false;
+
+        Connection(Client *client, const Jid &jid, const QString &sid, size_t blockSize) :
+            client(client), peer(jid), sid(sid), _blockSize(blockSize)
+        {
+        }
 
-    }
+        void setConnection(IBBConnection *c)
+        {
+            connection = c;
+            connect(c, &IBBConnection::readyRead, this, &Connection::readyRead);
+            connect(c, &IBBConnection::bytesWritten, this, &Connection::bytesWritten);
+            connect(c, &IBBConnection::connectionClosed, this, &Connection::handleIBBClosed);
+            connect(c, &IBBConnection::delayedCloseFinished, this, &Connection::handleIBBClosed);
+            connect(c, &IBBConnection::aboutToClose, this, &Connection::aboutToClose);
+            connect(c, &IBBConnection::connected, this, [this]() {
+                setOpenMode(connection->openMode());
+                emit connected();
+            });
+        }
 
-    void setConnection(IBBConnection *c)
-    {
-        connection = c;
-        connect(c, &IBBConnection::readyRead, this, &Connection::readyRead);
-        connect(c, &IBBConnection::bytesWritten, this, &Connection::bytesWritten);
-        connect(c, &IBBConnection::connectionClosed, this, &Connection::handleIBBClosed);
-        connect(c, &IBBConnection::delayedCloseFinished, this, &Connection::handleIBBClosed);
-        connect(c, &IBBConnection::aboutToClose, this, &Connection::aboutToClose);
-        connect(c, &IBBConnection::connected, this, [this](){ setOpenMode(connection->openMode()); emit connected(); });
-    }
+        size_t blockSize() const { return _blockSize; }
 
-    size_t blockSize() const
-    {
-        return _blockSize;
-    }
+        qint64 bytesAvailable() const
+        {
+            return XMPP::Jingle::Connection::bytesAvailable() + (connection ? connection->bytesAvailable() : 0);
+        }
+
+        qint64 bytesToWrite() const
+        {
+            return XMPP::Jingle::Connection::bytesToWrite() + (connection ? connection->bytesToWrite() : 0);
+        }
+
+        void close()
+        {
+            if (connection) {
+                connection->close();
+                setOpenMode(connection->openMode());
+            } else {
+                XMPP::Jingle::Connection::close();
+                emit connectionClosed();
+            }
+        }
+
+    signals:
+        void connected();
+
+    protected:
+        qint64 writeData(const char *data, qint64 maxSize) { return connection->write(data, maxSize); }
+
+        qint64 readData(char *data, qint64 maxSize)
+        {
+            quint64 ret = connection->read(data, maxSize);
+            if (closing && !bytesAvailable()) {
+                postCloseAllDataRead();
+            }
+            return ret;
+        }
+
+    private:
+        void handleIBBClosed()
+        {
+            closing = true;
+            if (bytesAvailable())
+                setOpenMode(QIODevice::ReadOnly);
+            else
+                postCloseAllDataRead();
+        }
+
+        void postCloseAllDataRead()
+        {
+            closing  = false;
+            finished = true;
+            connection->deleteLater();
+            connection = nullptr;
+            setOpenMode(QIODevice::NotOpen);
+            emit connectionClosed();
+        }
+    };
+
+    struct Transport::Private {
+        Transport *                               q = nullptr;
+        Pad::Ptr                                  pad;
+        QMap<QString, QSharedPointer<Connection>> connections;
+        QList<QSharedPointer<Connection>>         readyConnections;
+        QSharedPointer<Connection>                lastOfferedConnection;
+        size_t                                    defaultBlockSize = 4096;
+        bool                                      started          = false;
+        bool                                      initialOfferSent = false; // if we ever sent anything
+
+        void checkAndStartConnection(const QSharedPointer<Connection> &c)
+        {
+            if (!c->connection && !c->finished && c->offerReceived && c->offerSent
+                && pad->session()->role() == Origin::Initiator) {
+                auto con    = pad->session()->manager()->client()->ibbManager()->createConnection();
+                auto ibbcon = static_cast<IBBConnection *>(con);
+                ibbcon->setPacketSize(defaultBlockSize);
+                c->setConnection(ibbcon);
+                ibbcon->connectToJid(pad->session()->peer(), c->sid);
+            }
+        }
+
+        void handleConnected(const QSharedPointer<Connection> &c)
+        {
+            if (c) {
+                readyConnections.append(c);
+                emit q->connected();
+            }
+        }
 
-    qint64 bytesAvailable() const
+        OutgoingTransportInfoUpdate makeOffer(const QSharedPointer<Connection> &connection)
+        {
+            OutgoingTransportInfoUpdate upd;
+            if (!connection) {
+                return upd;
+            }
+
+            auto doc = pad->session()->manager()->client()->doc();
+
+            QDomElement tel = doc->createElementNS(NS, "transport");
+            tel.setAttribute(QStringLiteral("sid"), connection->sid);
+            tel.setAttribute(QString::fromLatin1("block-size"), qulonglong(connection->_blockSize));
+
+            upd = OutgoingTransportInfoUpdate { tel, [this, connection]() mutable {
+                                                   if (started)
+                                                       checkAndStartConnection(connection);
+                                               } };
+
+            lastOfferedConnection = connection;
+            connection->offerSent = true;
+            return upd;
+        }
+    };
+
+    Transport::Transport(const TransportManagerPad::Ptr &pad) : d(new Private)
     {
-        return XMPP::Jingle::Connection::bytesAvailable() + (connection? connection->bytesAvailable() : 0);
+        d->q   = this;
+        d->pad = pad.staticCast<Pad>();
+        connect(pad->manager(), &TransportManager::abortAllRequested, this, [this]() {
+            for (auto &c : d->connections) {
+                c->close();
+            }
+            // d->aborted = true;
+            emit failed();
+        });
     }
 
-    qint64 bytesToWrite() const
+    Transport::Transport(const TransportManagerPad::Ptr &pad, const QDomElement &transportEl) : d(new Private)
     {
-        return XMPP::Jingle::Connection::bytesToWrite() + (connection? connection->bytesToWrite() : 0);
+        d->q   = this;
+        d->pad = pad.staticCast<Pad>();
+        update(transportEl);
+        if (d->connections.isEmpty()) {
+            d.reset();
+            return;
+        }
     }
 
-    void close()
+    Transport::~Transport()
     {
-        if (connection) {
-            connection->close();
-            setOpenMode(connection->openMode());
-        } else {
-            XMPP::Jingle::Connection::close();
-            emit connectionClosed();
+        // we have to mark all of them as finished just in case they are captured somewhere else
+        if (d) {
+            for (auto &c : d->connections) {
+                c->finished = true;
+            }
         }
     }
 
-signals:
-    void connected();
+    TransportManagerPad::Ptr Transport::pad() const { return d->pad; }
 
-protected:
-    qint64 writeData(const char *data, qint64 maxSize)
+    void Transport::prepare()
     {
-        return connection->write(data, maxSize);
+        if (d->connections.isEmpty()) { // seems like outgoing
+            auto conn    = d->pad->makeConnection(QString(), d->defaultBlockSize);
+            auto ibbConn = conn.staticCast<Connection>();
+            connect(ibbConn.data(), &Connection::connected, this, [this]() {
+                auto c = static_cast<Connection *>(sender());
+                d->handleConnected(d->connections.value(c->sid));
+            });
+            d->connections.insert(ibbConn->sid, ibbConn);
+
+            connect(ibbConn.data(), &Connection::connectionClosed, this, [this]() {
+                Connection *c = static_cast<Connection *>(sender());
+                d->connections.remove(c->sid);
+                QMutableListIterator<QSharedPointer<Connection>> it(d->readyConnections);
+                while (it.hasNext()) {
+                    auto &p = it.next();
+                    if (p.data() == c) {
+                        it.remove();
+                        break;
+                    }
+                }
+            });
+        }
+        emit updated();
     }
 
-    qint64 readData(char *data, qint64 maxSize)
+    void Transport::start()
     {
-        quint64 ret = connection->read(data, maxSize);
-        if (closing && !bytesAvailable()) {
-            postCloseAllDataRead();
+        d->started = true;
+
+        for (auto &c : d->connections) {
+            d->checkAndStartConnection(c);
         }
-        return ret;
     }
 
-private:
-
-    void handleIBBClosed()
+    bool Transport::update(const QDomElement &transportEl)
     {
-        closing = true;
-        if (bytesAvailable())
-            setOpenMode(QIODevice::ReadOnly);
-        else
-            postCloseAllDataRead();
-    }
+        QString sid = transportEl.attribute(QString::fromLatin1("sid"));
+        if (sid.isEmpty()) {
+            return false;
+        }
 
-    void postCloseAllDataRead()
-    {
-        closing = false;
-        finished = true;
-        connection->deleteLater();
-        connection = nullptr;
-        setOpenMode(QIODevice::NotOpen);
-        emit connectionClosed();
+        size_t bs_final = d->defaultBlockSize;
+        auto   bs       = transportEl.attribute(QString::fromLatin1("block-size"));
+        if (!bs.isEmpty()) {
+            size_t bsn = bs.toULongLong();
+            if (bsn && bsn <= bs_final) {
+                bs_final = bsn;
+            }
+        }
+
+        auto it = d->connections.find(sid);
+        if (it == d->connections.end()) {
+            auto c = d->pad->makeConnection(sid, bs_final);
+            if (c) {
+                auto ibbc = c.staticCast<Connection>();
+                it        = d->connections.insert(ibbc->sid, ibbc);
+                connect(ibbc.data(), &Connection::connected, this, [this]() {
+                    auto c = static_cast<Connection *>(sender());
+                    d->handleConnected(d->connections.value(c->sid));
+                });
+            } else {
+                qWarning("failed to create IBB connection");
+                return false;
+            }
+        } else {
+            if (bs_final < (*it)->_blockSize) {
+                (*it)->_blockSize = bs_final;
+            }
+        }
+
+        (*it)->offerReceived = true;
+        if (d->started) {
+            auto c = it.value();
+            QTimer::singleShot(0, this, [this, c]() mutable { d->checkAndStartConnection(c); });
+        }
+        return true;
     }
-};
-
-struct Transport::Private
-{
-    Transport *q = nullptr;
-    Pad::Ptr pad;
-    QMap<QString,QSharedPointer<Connection>> connections;
-    QList<QSharedPointer<Connection>> readyConnections;
-    QSharedPointer<Connection> lastOfferedConnection;
-    size_t defaultBlockSize = 4096;
-    bool started = false;
-    bool initialOfferSent = false; // if we ever sent anything
-
-    void checkAndStartConnection(const QSharedPointer<Connection> &c)
+
+    bool Transport::isInitialOfferReady() const { return isValid() && (hasUpdates() || d->initialOfferSent); }
+
+    OutgoingTransportInfoUpdate Transport::takeInitialOffer()
     {
-        if (!c->connection && !c->finished && c->offerReceived && c->offerSent && pad->session()->role() == Origin::Initiator) {
-            auto con = pad->session()->manager()->client()->ibbManager()->createConnection();
-            auto ibbcon = static_cast<IBBConnection*>(con);
-            ibbcon->setPacketSize(defaultBlockSize);
-            c->setConnection(ibbcon);
-            ibbcon->connectToJid(pad->session()->peer(), c->sid);
+        auto upd = takeOutgoingUpdate();
+        if (std::get<0>(upd).isNull() && d->lastOfferedConnection) {
+            return d->makeOffer(d->lastOfferedConnection);
         }
+        return upd;
     }
 
-    void handleConnected(const QSharedPointer<Connection> &c)
+    bool Transport::hasUpdates() const
     {
-        if (c) {
-            readyConnections.append(c);
-            emit q->connected();
+        for (auto &c : d->connections) {
+            if (!c->offerSent) {
+                return true;
+            }
         }
+        return false;
     }
 
-    OutgoingTransportInfoUpdate makeOffer(const QSharedPointer<Connection> &connection)
+    OutgoingTransportInfoUpdate Transport::takeOutgoingUpdate()
     {
         OutgoingTransportInfoUpdate upd;
-        if (!connection) {
+        if (!isValid()) {
             return upd;
         }
 
-        auto doc = pad->session()->manager()->client()->doc();
+        QSharedPointer<Connection> connection;
+        for (auto &c : d->connections) {
+            if (!c->offerSent) {
+                connection = c;
+                break;
+            }
+        }
+        return d->makeOffer(connection);
+    }
 
-        QDomElement tel = doc->createElementNS(NS, "transport");
-        tel.setAttribute(QStringLiteral("sid"), connection->sid);
-        tel.setAttribute(QString::fromLatin1("block-size"), qulonglong(connection->_blockSize));
+    bool Transport::isValid() const { return d; }
 
-        upd = OutgoingTransportInfoUpdate{tel, [this, connection]() mutable {
-            if (started)
-                checkAndStartConnection(connection);
-        }};
+    Transport::Features Transport::features() const { return AlwaysConnect | Reliable | Slow; }
 
-        lastOfferedConnection = connection;
-        connection->offerSent = true;
-        return upd;
-    }
-};
-
-Transport::Transport(const TransportManagerPad::Ptr &pad) :
-    d(new Private)
-{
-    d->q = this;
-    d->pad = pad.staticCast<Pad>();
-    connect(pad->manager(), &TransportManager::abortAllRequested, this, [this](){
-        for(auto &c: d->connections) {
-            c->close();
-        }
-        //d->aborted = true;
-        emit failed();
-    });
-}
-
-Transport::Transport(const TransportManagerPad::Ptr &pad, const QDomElement &transportEl) :
-    d(new Private)
-{
-    d->q = this;
-    d->pad = pad.staticCast<Pad>();
-    update(transportEl);
-    if (d->connections.isEmpty()) {
-        d.reset();
-        return;
+    Connection::Ptr Transport::connection() const
+    {
+        return d->readyConnections.isEmpty() ? Connection::Ptr()
+                                             : d->readyConnections.takeFirst().staticCast<XMPP::Jingle::Connection>();
     }
-}
-
-Transport::~Transport()
-{
-    // we have to mark all of them as finished just in case they are captured somewhere else
-    if (d) {
-        for (auto &c: d->connections) {
-            c->finished = true;
-        }
+
+    Pad::Pad(Manager *manager, Session *session)
+    {
+        _manager = manager;
+        _session = session;
     }
-}
-
-TransportManagerPad::Ptr Transport::pad() const
-{
-    return d->pad;
-}
-
-void Transport::prepare()
-{
-    if (d->connections.isEmpty()) { // seems like outgoing
-        auto conn = d->pad->makeConnection(QString(), d->defaultBlockSize);
-        auto ibbConn = conn.staticCast<Connection>();
-        connect(ibbConn.data(), &Connection::connected, this, [this](){
-            auto c = static_cast<Connection*>(sender());
-            d->handleConnected(d->connections.value(c->sid));
-        });
-        d->connections.insert(ibbConn->sid, ibbConn);
-
-        connect(ibbConn.data(), &Connection::connectionClosed, this, [this](){
-            Connection *c = static_cast<Connection*>(sender());
-            d->connections.remove(c->sid);
-            QMutableListIterator<QSharedPointer<Connection>> it(d->readyConnections);
-            while (it.hasNext()) {
-                auto &p = it.next();
-                if (p.data() == c) {
-                    it.remove();
-                    break;
-                }
-            }
-        });
+
+    QString Pad::ns() const { return NS; }
+
+    Session *Pad::session() const { return _session; }
+
+    TransportManager *Pad::manager() const { return _manager; }
+
+    Connection::Ptr Pad::makeConnection(const QString &sid, size_t blockSize)
+    {
+        return _manager->makeConnection(_session->peer(), sid, blockSize);
     }
-    emit updated();
-}
 
-void Transport::start()
-{
-    d->started = true;
+    struct Manager::Private {
+        QHash<QPair<Jid, QString>, QSharedPointer<Connection>> connections;
+        XMPP::Jingle::Manager *                                jingleManager = nullptr;
+    };
+
+    Manager::Manager(QObject *parent) : TransportManager(parent), d(new Private) {}
 
-    for (auto &c: d->connections) {
-        d->checkAndStartConnection(c);
+    Manager::~Manager()
+    {
+        if (d->jingleManager)
+            d->jingleManager->unregisterTransport(NS);
     }
-}
 
-bool Transport::update(const QDomElement &transportEl)
-{
-    QString sid = transportEl.attribute(QString::fromLatin1("sid"));
-    if (sid.isEmpty()) {
-        return false;
+    Transport::Features Manager::features() const
+    {
+        return Transport::AlwaysConnect | Transport::Reliable | Transport::Slow;
     }
 
-    size_t bs_final = d->defaultBlockSize;
-    auto bs = transportEl.attribute(QString::fromLatin1("block-size"));
-    if (!bs.isEmpty()) {
-        size_t bsn = bs.toULongLong();
-        if (bsn && bsn <= bs_final) {
-            bs_final = bsn;
-        }
+    void Manager::setJingleManager(XMPP::Jingle::Manager *jm) { d->jingleManager = jm; }
+
+    QSharedPointer<XMPP::Jingle::Transport> Manager::newTransport(const TransportManagerPad::Ptr &pad)
+    {
+        return QSharedPointer<XMPP::Jingle::Transport>(new Transport(pad));
     }
 
-    auto it = d->connections.find(sid);
-    if (it == d->connections.end()) {
-        auto c = d->pad->makeConnection(sid, bs_final);
-        if (c) {
-            auto ibbc = c.staticCast<Connection>();
-            it = d->connections.insert(ibbc->sid, ibbc);
-            connect(ibbc.data(), &Connection::connected, this, [this](){
-                auto c = static_cast<Connection*>(sender());
-                d->handleConnected(d->connections.value(c->sid));
-            });
-        } else {
-            qWarning("failed to create IBB connection");
-            return false;
-        }
-    } else {
-        if (bs_final < (*it)->_blockSize) {
-            (*it)->_blockSize = bs_final;
+    QSharedPointer<XMPP::Jingle::Transport> Manager::newTransport(const TransportManagerPad::Ptr &pad,
+                                                                  const QDomElement &             transportEl)
+    {
+        auto                                    t = new Transport(pad, transportEl);
+        QSharedPointer<XMPP::Jingle::Transport> ret(t);
+        if (t->isValid()) {
+            return ret;
         }
+        return QSharedPointer<XMPP::Jingle::Transport>();
     }
 
-    (*it)->offerReceived = true;
-    if (d->started) {
-        auto c = it.value();
-        QTimer::singleShot(0, this, [this,c]() mutable { d->checkAndStartConnection(c); });
-    }
-    return true;
-}
-
-bool Transport::isInitialOfferReady() const
-{
-    return isValid() && (hasUpdates() || d->initialOfferSent);
-}
-
-OutgoingTransportInfoUpdate Transport::takeInitialOffer()
-{
-    auto upd = takeOutgoingUpdate();
-    if (std::get<0>(upd).isNull() && d->lastOfferedConnection) {
-        return d->makeOffer(d->lastOfferedConnection);
-    }
-    return upd;
-}
+    TransportManagerPad *Manager::pad(Session *session) { return new Pad(this, session); }
 
-bool Transport::hasUpdates() const
-{
-    for (auto &c: d->connections) {
-        if (!c->offerSent) {
-            return true;
+    void Manager::closeAll() { emit abortAllRequested(); }
+
+    XMPP::Jingle::Connection::Ptr Manager::makeConnection(const Jid &peer, const QString &sid, size_t blockSize)
+    {
+        if (!sid.isEmpty() && d->connections.contains(qMakePair(peer, sid))) {
+            qWarning("sid %s was already registered for %s", qPrintable(sid), qPrintable(peer.full()));
+            return Connection::Ptr();
         }
-    }
-    return false;
-}
+        QString s(sid);
+        if (s.isEmpty()) {
+            QPair<Jid, QString> key;
+            do {
+                s   = QString("ibb_%1").arg(qrand() & 0xffff, 4, 16, QChar('0'));
+                key = qMakePair(peer, s);
+            } while (d->connections.contains(key));
+        }
+        auto conn = QSharedPointer<Connection>::create(d->jingleManager->client(), peer, s, blockSize);
+        d->connections.insert(qMakePair(peer, s), conn);
+        connect(conn.data(), &Connection::connectionClosed, this, [this]() {
+            Connection *c = static_cast<Connection *>(sender());
+            d->connections.remove(qMakePair(c->peer, c->sid));
+        });
 
-OutgoingTransportInfoUpdate Transport::takeOutgoingUpdate()
-{
-    OutgoingTransportInfoUpdate upd;
-    if (!isValid()) {
-        return upd;
+        return conn.staticCast<XMPP::Jingle::Connection>();
     }
 
-    QSharedPointer<Connection> connection;
-    for (auto &c: d->connections) {
-        if (!c->offerSent) {
-            connection = c;
-            break;
+    bool Manager::handleIncoming(IBBConnection *c)
+    {
+        auto conn = d->connections.value(qMakePair(c->peer(), c->sid()));
+        if (conn) {
+            conn->setConnection(c);
+            QTimer::singleShot(0, c, &IBBConnection::accept);
+            return true;
         }
+        return false;
     }
-    return d->makeOffer(connection);
-}
-
-bool Transport::isValid() const
-{
-    return d;
-}
-
-Transport::Features Transport::features() const
-{
-    return AlwaysConnect | Reliable | Slow;
-}
-
-Connection::Ptr Transport::connection() const
-{
-    return d->readyConnections.isEmpty()? Connection::Ptr() : d->readyConnections.takeFirst().staticCast<XMPP::Jingle::Connection>();
-}
-
-Pad::Pad(Manager *manager, Session *session)
-{
-    _manager = manager;
-    _session = session;
-}
-
-QString Pad::ns() const
-{
-    return NS;
-}
-
-Session *Pad::session() const
-{
-    return _session;
-}
-
-TransportManager *Pad::manager() const
-{
-    return _manager;
-}
-
-Connection::Ptr Pad::makeConnection(const QString &sid, size_t blockSize)
-{
-    return _manager->makeConnection(_session->peer(), sid, blockSize);
-}
-
-struct Manager::Private
-{
-    QHash<QPair<Jid,QString>,QSharedPointer<Connection>> connections;
-    XMPP::Jingle::Manager *jingleManager = nullptr;
-};
-
-Manager::Manager(QObject *parent) :
-    TransportManager(parent),
-    d(new Private)
-{
-
-}
-
-Manager::~Manager()
-{
-    if (d->jingleManager)
-        d->jingleManager->unregisterTransport(NS);
-}
-
-Transport::Features Manager::features() const
-{
-    return Transport::AlwaysConnect | Transport::Reliable | Transport::Slow;
-}
-
-void Manager::setJingleManager(XMPP::Jingle::Manager *jm)
-{
-    d->jingleManager = jm;
-}
-
-QSharedPointer<XMPP::Jingle::Transport> Manager::newTransport(const TransportManagerPad::Ptr &pad)
-{
-    return QSharedPointer<XMPP::Jingle::Transport>(new Transport(pad));
-}
-
-QSharedPointer<XMPP::Jingle::Transport> Manager::newTransport(const TransportManagerPad::Ptr &pad, const QDomElement &transportEl)
-{
-    auto t = new Transport(pad, transportEl);
-    QSharedPointer<XMPP::Jingle::Transport> ret(t);
-    if (t->isValid()) {
-        return ret;
-    }
-    return QSharedPointer<XMPP::Jingle::Transport>();
-}
-
-TransportManagerPad* Manager::pad(Session *session)
-{
-    return new Pad(this, session);
-}
-
-void Manager::closeAll()
-{
-    emit abortAllRequested();
-}
-
-XMPP::Jingle::Connection::Ptr Manager::makeConnection(const Jid &peer, const QString &sid, size_t blockSize)
-{
-    if (!sid.isEmpty() && d->connections.contains(qMakePair(peer, sid))) {
-        qWarning("sid %s was already registered for %s", qPrintable(sid), qPrintable(peer.full()));
-        return Connection::Ptr();
-    }
-    QString s(sid);
-    if (s.isEmpty()) {
-        QPair<Jid,QString> key;
-        do {
-            s = QString("ibb_%1").arg(qrand() & 0xffff, 4, 16, QChar('0'));
-            key = qMakePair(peer, s);
-        } while (d->connections.contains(key));
-    }
-    auto conn = QSharedPointer<Connection>::create(d->jingleManager->client(), peer, s, blockSize);
-    d->connections.insert(qMakePair(peer, s), conn);
-    connect(conn.data(), &Connection::connectionClosed, this, [this](){
-        Connection *c = static_cast<Connection*>(sender());
-        d->connections.remove(qMakePair(c->peer, c->sid));
-    });
-
-    return conn.staticCast<XMPP::Jingle::Connection>();
-}
-
-bool Manager::handleIncoming(IBBConnection *c)
-{
-    auto conn = d->connections.value(qMakePair(c->peer(), c->sid()));
-    if (conn) {
-        conn->setConnection(c);
-        QTimer::singleShot(0, c, &IBBConnection::accept);
-        return true;
-    }
-    return false;
-}
 } // namespace IBB
 } // namespace Jingle
 } // namespace XMPP
diff --git a/src/xmpp/xmpp-im/jingle-ibb.h b/src/xmpp/xmpp-im/jingle-ibb.h
index acfd516c..8669f3ec 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.h
+++ b/src/xmpp/xmpp-im/jingle-ibb.h
@@ -23,80 +23,81 @@
 #include "jingle.h"
 
 namespace XMPP {
-    class IBBConnection;
-
-namespace Jingle {
-namespace IBB {
-extern const QString NS;
-
-class Transport : public XMPP::Jingle::Transport
-{
-    Q_OBJECT
-public:
-    Transport(const TransportManagerPad::Ptr &pad);
-    Transport(const TransportManagerPad::Ptr &pad, const QDomElement &transportEl);
-    ~Transport();
-
-    TransportManagerPad::Ptr pad() const override;
-
-    void prepare() override;
-    void start() override;
-    bool isInitialOfferReady() const override;
-    OutgoingTransportInfoUpdate takeInitialOffer() override;
-    bool update(const QDomElement &transportEl) override;
-    bool hasUpdates() const override;
-    OutgoingTransportInfoUpdate takeOutgoingUpdate() override;
-    bool isValid() const override;
-    Features features() const override;
-
-    Connection::Ptr connection() const override;
-
-private:
-    friend class Manager;
-
-    class Private;
-    QScopedPointer<Private> d;
-};
-
-class Manager;
-class Pad : public TransportManagerPad
-{
-    Q_OBJECT
-    // TODO
-public:
-    typedef QSharedPointer<Pad> Ptr;
-
-    Pad(Manager *manager, Session *session);
-    QString ns() const override;
-    Session *session() const override;
-    TransportManager *manager() const override;
-
-    Connection::Ptr makeConnection(const QString &sid, size_t blockSize);
-private:
-    Manager *_manager = nullptr;
-    Session *_session = nullptr;
-};
-
-class Manager : public TransportManager {
-    Q_OBJECT
-public:
-    Manager(QObject *parent = nullptr);
-    ~Manager();
-
-    XMPP::Jingle::Transport::Features features() const override;
-    void setJingleManager(XMPP::Jingle::Manager *jm) override;
-    QSharedPointer<XMPP::Jingle::Transport> newTransport(const TransportManagerPad::Ptr &pad) override; // outgoing. one have to call Transport::start to collect candidates
-    QSharedPointer<XMPP::Jingle::Transport> newTransport(const TransportManagerPad::Ptr &pad, const QDomElement &transportEl) override; // incoming
-    TransportManagerPad* pad(Session *session) override;
-
-    void closeAll() override;
-
-    Connection::Ptr makeConnection(const Jid &peer, const QString &sid, size_t blockSize);
-    bool handleIncoming(IBBConnection *c);
-private:
-    class Private;
-    QScopedPointer<Private> d;
-};
+class IBBConnection;
+
+namespace Jingle { namespace IBB {
+    extern const QString NS;
+
+    class Transport : public XMPP::Jingle::Transport {
+        Q_OBJECT
+    public:
+        Transport(const TransportManagerPad::Ptr &pad);
+        Transport(const TransportManagerPad::Ptr &pad, const QDomElement &transportEl);
+        ~Transport();
+
+        TransportManagerPad::Ptr pad() const override;
+
+        void                        prepare() override;
+        void                        start() override;
+        bool                        isInitialOfferReady() const override;
+        OutgoingTransportInfoUpdate takeInitialOffer() override;
+        bool                        update(const QDomElement &transportEl) override;
+        bool                        hasUpdates() const override;
+        OutgoingTransportInfoUpdate takeOutgoingUpdate() override;
+        bool                        isValid() const override;
+        Features                    features() const override;
+
+        Connection::Ptr connection() const override;
+
+    private:
+        friend class Manager;
+
+        class Private;
+        QScopedPointer<Private> d;
+    };
+
+    class Manager;
+    class Pad : public TransportManagerPad {
+        Q_OBJECT
+        // TODO
+    public:
+        typedef QSharedPointer<Pad> Ptr;
+
+        Pad(Manager *manager, Session *session);
+        QString           ns() const override;
+        Session *         session() const override;
+        TransportManager *manager() const override;
+
+        Connection::Ptr makeConnection(const QString &sid, size_t blockSize);
+
+    private:
+        Manager *_manager = nullptr;
+        Session *_session = nullptr;
+    };
+
+    class Manager : public TransportManager {
+        Q_OBJECT
+    public:
+        Manager(QObject *parent = nullptr);
+        ~Manager();
+
+        XMPP::Jingle::Transport::Features       features() const override;
+        void                                    setJingleManager(XMPP::Jingle::Manager *jm) override;
+        QSharedPointer<XMPP::Jingle::Transport> newTransport(const TransportManagerPad::Ptr &pad)
+            override; // outgoing. one have to call Transport::start to collect candidates
+        QSharedPointer<XMPP::Jingle::Transport> newTransport(const TransportManagerPad::Ptr &pad,
+                                                             const QDomElement &transportEl) override; // incoming
+        TransportManagerPad *                   pad(Session *session) override;
+
+        void closeAll() override;
+
+        Connection::Ptr makeConnection(const Jid &peer, const QString &sid, size_t blockSize);
+        bool            handleIncoming(IBBConnection *c);
+
+    private:
+        class Private;
+        QScopedPointer<Private> d;
+    };
 } // namespace IBB
 } // namespace Jingle
 } // namespace XMPP
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index c0e394e6..ff155e2b 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -30,1623 +30,1506 @@
 #include <QNetworkInterface>
 #include <QTimer>
 
-namespace XMPP {
-namespace Jingle {
-namespace S5B {
-const QString NS(QStringLiteral("urn:xmpp:jingle:transports:s5b:1"));
-
-static QString makeKey(const QString &sid, const Jid &j1, const Jid &j2)
-{
-    return QString::fromLatin1(QCryptographicHash::hash((sid +
-                                                         j1.full() +
-                                                         j2.full()).toUtf8(),
-                                                        QCryptographicHash::Sha1)
-                               .toHex());
-}
-
-class Connection : public XMPP::Jingle::Connection
-{
-    Q_OBJECT
-
-    QList<NetworkDatagram> datagrams;
-    SocksClient *client;
-    Transport::Mode mode;
-public:
-    Connection(SocksClient *client, Transport::Mode mode) :
-        client(client),
-        mode(mode)
-    {
-        connect(client, &SocksClient::readyRead, this, &Connection::readyRead);
-        connect(client, &SocksClient::bytesWritten, this, &Connection::bytesWritten);
-        connect(client, &SocksClient::aboutToClose, this, &Connection::aboutToClose);
-        if (client->isOpen()) {
-            setOpenMode(client->openMode());
-        } else {
-            qWarning("Creating S5B Transport connection on closed SockClient connection %p", client);
-        }
-    }
+namespace XMPP { namespace Jingle { namespace S5B {
+    const QString NS(QStringLiteral("urn:xmpp:jingle:transports:s5b:1"));
 
-    bool hasPendingDatagrams() const
+    static QString makeKey(const QString &sid, const Jid &j1, const Jid &j2)
     {
-        return datagrams.size() > 0;
+        return QString::fromLatin1(
+            QCryptographicHash::hash((sid + j1.full() + j2.full()).toUtf8(), QCryptographicHash::Sha1).toHex());
     }
 
-    NetworkDatagram receiveDatagram(qint64 maxSize = -1)
-    {
-        Q_UNUSED(maxSize); // TODO or not?
-        return datagrams.size()? datagrams.takeFirst(): NetworkDatagram();
-    }
+    class Connection : public XMPP::Jingle::Connection {
+        Q_OBJECT
 
-    qint64 bytesAvailable() const
-    {
-        if(client)
-            return client->bytesAvailable();
-        else
-            return 0;
-    }
+        QList<NetworkDatagram> datagrams;
+        SocksClient *          client;
+        Transport::Mode        mode;
 
-    qint64 bytesToWrite() const
-    {
-        return client->bytesToWrite();
-    }
+    public:
+        Connection(SocksClient *client, Transport::Mode mode) : client(client), mode(mode)
+        {
+            connect(client, &SocksClient::readyRead, this, &Connection::readyRead);
+            connect(client, &SocksClient::bytesWritten, this, &Connection::bytesWritten);
+            connect(client, &SocksClient::aboutToClose, this, &Connection::aboutToClose);
+            if (client->isOpen()) {
+                setOpenMode(client->openMode());
+            } else {
+                qWarning("Creating S5B Transport connection on closed SockClient connection %p", client);
+            }
+        }
 
-    void close()
-    {
-        if (client) {
-            client->disconnect(this);
+        bool hasPendingDatagrams() const { return datagrams.size() > 0; }
+
+        NetworkDatagram receiveDatagram(qint64 maxSize = -1)
+        {
+            Q_UNUSED(maxSize); // TODO or not?
+            return datagrams.size() ? datagrams.takeFirst() : NetworkDatagram();
         }
-        XMPP::Jingle::Connection::close();
-        client->deleteLater();
-        client = nullptr;
-    }
 
-protected:
-    qint64 writeData(const char *data, qint64 maxSize)
-    {
-        if(mode == Transport::Tcp)
-            return client->write(data, maxSize);
-        return 0;
-    }
+        qint64 bytesAvailable() const
+        {
+            if (client)
+                return client->bytesAvailable();
+            else
+                return 0;
+        }
 
-    qint64 readData(char *data, qint64 maxSize)
-    {
-        if(client)
-            return client->read(data, maxSize);
-        else
+        qint64 bytesToWrite() const { return client->bytesToWrite(); }
+
+        void close()
+        {
+            if (client) {
+                client->disconnect(this);
+            }
+            XMPP::Jingle::Connection::close();
+            client->deleteLater();
+            client = nullptr;
+        }
+
+    protected:
+        qint64 writeData(const char *data, qint64 maxSize)
+        {
+            if (mode == Transport::Tcp)
+                return client->write(data, maxSize);
             return 0;
-    }
+        }
 
-private:
-    friend class Transport;
-    void enqueueIncomingUDP(const QByteArray &data)
-    {
-        datagrams.append(NetworkDatagram{data});
-        emit readyRead();
-    }
-};
+        qint64 readData(char *data, qint64 maxSize)
+        {
+            if (client)
+                return client->read(data, maxSize);
+            else
+                return 0;
+        }
 
-class V6LinkLocalSocksConnector : public  QObject
-{
-    Q_OBJECT
+    private:
+        friend class Transport;
+        void enqueueIncomingUDP(const QByteArray &data)
+        {
+            datagrams.append(NetworkDatagram { data });
+            emit readyRead();
+        }
+    };
 
-    QMap<QString,SocksClient*> clients;
-    SocksClient *client = nullptr;
-public:
-    using QObject::QObject;
+    class V6LinkLocalSocksConnector : public QObject {
+        Q_OBJECT
 
-    void connectToHost(const QHostAddress &proxyHost, int proxyPort, const QString &host, bool udpMode)
-    {
-        foreach(const QNetworkInterface &ni, QNetworkInterface::allInterfaces())
+        QMap<QString, SocksClient *> clients;
+        SocksClient *                client = nullptr;
+
+    public:
+        using QObject::QObject;
+
+        void connectToHost(const QHostAddress &proxyHost, int proxyPort, const QString &host, bool udpMode)
         {
-            if (!(ni.flags() & (QNetworkInterface::IsUp | QNetworkInterface::IsRunning))) {
-                continue;
-            }
-            if (ni.flags() & QNetworkInterface::IsLoopBack) {
-                continue;
-            }
-            QList<QNetworkAddressEntry> entries = ni.addressEntries();
-            foreach(const QNetworkAddressEntry &na, entries)
-            {
-                QHostAddress ha = na.ip();
-                if (ha.protocol() == QAbstractSocket::IPv6Protocol &&
-                #if QT_VERSION >= QT_VERSION_CHECK(5,11,0)
+            foreach (const QNetworkInterface &ni, QNetworkInterface::allInterfaces()) {
+                if (!(ni.flags() & (QNetworkInterface::IsUp | QNetworkInterface::IsRunning))) {
+                    continue;
+                }
+                if (ni.flags() & QNetworkInterface::IsLoopBack) {
+                    continue;
+                }
+                QList<QNetworkAddressEntry> entries = ni.addressEntries();
+                foreach (const QNetworkAddressEntry &na, entries) {
+                    QHostAddress ha = na.ip();
+                    if (ha.protocol() == QAbstractSocket::IPv6Protocol &&
+#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
                         ha.isLinkLocal()
-                #else
+#else
                         XMPP::Ice176::isIPv6LinkLocalAddress(ha)
-                #endif
-                        ) // && proxyHost.isInSubnet(ha, na.prefixLength())
-                {
-                    auto client = new SocksClient(this);
-                    clients.insert(ni.name(), client);
-                    break;
+#endif
+                            ) // && proxyHost.isInSubnet(ha, na.prefixLength())
+                    {
+                        auto client = new SocksClient(this);
+                        clients.insert(ni.name(), client);
+                        break;
+                    }
                 }
             }
-        }
-
-        if (!clients.size()) {
-            emit ready();
-            return;
-        }
 
-        QHostAddress ph(proxyHost);
-        for (auto it = clients.begin(); it != clients.end(); ++it) {
-            QString name = it.key();
-            SocksClient *client = it.value();
-            connect(client, &SocksClient::connected, this, [this, name, client](){
-                this->client = client;
-                clients.remove(name);
-                qDeleteAll(clients);
+            if (!clients.size()) {
                 emit ready();
-            });
-            connect(client, &SocksClient::error, this, [this, name, client](int error){
-                Q_UNUSED(error);
-                clients.remove(name);
-                delete client;
-                if (clients.isEmpty()) {
+                return;
+            }
+
+            QHostAddress ph(proxyHost);
+            for (auto it = clients.begin(); it != clients.end(); ++it) {
+                QString      name   = it.key();
+                SocksClient *client = it.value();
+                connect(client, &SocksClient::connected, this, [this, name, client]() {
+                    this->client = client;
+                    clients.remove(name);
+                    qDeleteAll(clients);
                     emit ready();
-                }
-            }, Qt::QueuedConnection);
-            ph.setScopeId(name);
-            client->connectToHost(ph.toString(), proxyPort, host, 0, udpMode);
+                });
+                connect(
+                    client, &SocksClient::error, this,
+                    [this, name, client](int error) {
+                        Q_UNUSED(error);
+                        clients.remove(name);
+                        delete client;
+                        if (clients.isEmpty()) {
+                            emit ready();
+                        }
+                    },
+                    Qt::QueuedConnection);
+                ph.setScopeId(name);
+                client->connectToHost(ph.toString(), proxyPort, host, 0, udpMode);
+            }
         }
-    }
 
-    SocksClient* takeClient()
-    {
-        auto c = client;
-        if (c) {
-            c->setParent(nullptr);
-            client = nullptr;
+        SocksClient *takeClient()
+        {
+            auto c = client;
+            if (c) {
+                c->setParent(nullptr);
+                client = nullptr;
+            }
+            return c;
         }
-        return c;
-    }
 
-signals:
-    void ready();
-};
+    signals:
+        void ready();
+    };
 
-class Candidate::Private : public QObject, public QSharedData {
-    Q_OBJECT
-public:
-    ~Private()
-    {
-        if (server && transport) {
-            server->unregisterKey(transport->directAddr());
+    class Candidate::Private : public QObject, public QSharedData {
+        Q_OBJECT
+    public:
+        ~Private()
+        {
+            if (server && transport) {
+                server->unregisterKey(transport->directAddr());
+            }
+            delete socksClient;
         }
-        delete socksClient;
-    }
 
-    QPointer<Transport> transport;
-    QString cid;
-    QString host;
-    Jid jid;
-    quint16 port = 0;
-    quint32 priority = 0;
-    Candidate::Type type = Candidate::Direct;
-    Candidate::State state = Candidate::New;
+        QPointer<Transport> transport;
+        QString             cid;
+        QString             host;
+        Jid                 jid;
+        quint16             port     = 0;
+        quint32             priority = 0;
+        Candidate::Type     type     = Candidate::Direct;
+        Candidate::State    state    = Candidate::New;
 
-    QSharedPointer<S5BServer> server;
-    SocksClient *socksClient = nullptr;
+        QSharedPointer<S5BServer> server;
+        SocksClient *             socksClient = nullptr;
 
-    void connectToHost(const QString &key, State successState, QObject *callbackContext, std::function<void(bool)> callback, bool isUdp)
-    {
-        QHostAddress ha(host);
-        if (!ha.isNull() && ha.protocol() == QAbstractSocket::IPv6Protocol && ha.scopeId().isEmpty() &&
-        #if QT_VERSION >= QT_VERSION_CHECK(5,11,0)
+        void connectToHost(const QString &key, State successState, QObject *callbackContext,
+                           std::function<void(bool)> callback, bool isUdp)
+        {
+            QHostAddress ha(host);
+            if (!ha.isNull() && ha.protocol() == QAbstractSocket::IPv6Protocol && ha.scopeId().isEmpty() &&
+#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
                 ha.isLinkLocal()
-        #else
+#else
                 XMPP::Ice176::isIPv6LinkLocalAddress(ha)
-        #endif
-                )
-        {
-            qDebug() << "connect to host with cid=" << cid << "and key=" << key << "candidate using V6LinkLocalSocksConnector";
-            // we have link local address without scope. We have to enumerate all possible scopes.
-            auto v6llConnector = new V6LinkLocalSocksConnector(this);
-            connect(v6llConnector, &V6LinkLocalSocksConnector::ready, this, [this, v6llConnector, callback, successState]() {
-                socksClient = v6llConnector->takeClient();
-                delete v6llConnector;
-                if (state == Candidate::Discarded) {
-                    return;
-                }
+#endif
+            ) {
+                qDebug() << "connect to host with cid=" << cid << "and key=" << key
+                         << "candidate using V6LinkLocalSocksConnector";
+                // we have link local address without scope. We have to enumerate all possible scopes.
+                auto v6llConnector = new V6LinkLocalSocksConnector(this);
+                connect(v6llConnector, &V6LinkLocalSocksConnector::ready, this,
+                        [this, v6llConnector, callback, successState]() {
+                            socksClient = v6llConnector->takeClient();
+                            delete v6llConnector;
+                            if (state == Candidate::Discarded) {
+                                return;
+                            }
 
-                if (socksClient) {
+                            if (socksClient) {
+                                state = successState;
+                                qDebug() << "socks client" << socksClient << "is connected";
+                                callback(true);
+                                return;
+                            }
+                            state = Candidate::Discarded;
+                            qDebug() << "socks client" << socksClient << "failed to connect";
+                            callback(false);
+                        });
+                v6llConnector->connectToHost(ha, port, key, isUdp);
+            } else {
+                socksClient = new SocksClient;
+                qDebug() << "connect to host with cid=" << cid << ", key=" << key << " and socks client" << socksClient;
+                connect(socksClient, &SocksClient::connected, callbackContext, [this, callback, successState]() {
                     state = successState;
-                    qDebug() << "socks client"  << socksClient << "is connected";
+                    qDebug() << "socks client" << socksClient << "is connected";
                     callback(true);
-                    return;
-                }
-                state = Candidate::Discarded;
-                qDebug() << "socks client"  << socksClient << "failed to connect";
-                callback(false);
-            });
-            v6llConnector->connectToHost(ha, port, key, isUdp);
-        } else {
-            socksClient = new SocksClient;
-            qDebug() << "connect to host with cid=" << cid << ", key=" << key << " and socks client" << socksClient;
-            connect(socksClient, &SocksClient::connected, callbackContext, [this, callback, successState](){
-                state = successState;
-                qDebug() << "socks client"  << socksClient << "is connected";
-                callback(true);
-            });
-            connect(socksClient, &SocksClient::error, callbackContext, [this, callback](int error){
+                });
+                connect(socksClient, &SocksClient::error, callbackContext, [this, callback](int error) {
+                    Q_UNUSED(error);
+                    state = Candidate::Discarded;
+                    qDebug() << "socks client" << socksClient << "failed to connect";
+                    callback(false);
+                });
+                // connect(&t, SIGNAL(timeout()), SLOT(trySendUDP()));
+
+                socksClient->connectToHost(host, port, key, 0, isUdp);
+            }
+        }
+
+        void setupIncomingSocksClient()
+        {
+            connect(socksClient, &SocksClient::error, [this](int error) {
                 Q_UNUSED(error);
                 state = Candidate::Discarded;
-                qDebug() << "socks client"  << socksClient << "failed to connect";
-                callback(false);
             });
-            //connect(&t, SIGNAL(timeout()), SLOT(trySendUDP()));
-
-            socksClient->connectToHost(host, port, key, 0, isUdp);
         }
-    }
+    };
+
+    Candidate::Candidate() {}
 
-    void setupIncomingSocksClient()
+    Candidate::Candidate(Transport *transport, const QDomElement &el)
     {
-        connect(socksClient, &SocksClient::error, [this](int error){
-            Q_UNUSED(error);
-            state = Candidate::Discarded;
-        });
-    }
-};
-
-Candidate::Candidate()
-{
-
-}
-
-Candidate::Candidate(Transport *transport, const QDomElement &el)
-{
-    bool ok;
-    QString host(el.attribute(QStringLiteral("host")));
-    Jid jid(el.attribute(QStringLiteral("jid")));
-    auto portStr = el.attribute(QStringLiteral("port"));
-    quint16 port = 0;
-    if (!portStr.isEmpty()) {
-        port = portStr.toUShort(&ok);
+        bool    ok;
+        QString host(el.attribute(QStringLiteral("host")));
+        Jid     jid(el.attribute(QStringLiteral("jid")));
+        auto    portStr = el.attribute(QStringLiteral("port"));
+        quint16 port    = 0;
+        if (!portStr.isEmpty()) {
+            port = portStr.toUShort(&ok);
+            if (!ok) {
+                return; // make the whole candidate invalid
+            }
+        }
+        auto priorityStr = el.attribute(QStringLiteral("priority"));
+        if (priorityStr.isEmpty()) {
+            return;
+        }
+        quint32 priority = priorityStr.toUInt(&ok);
         if (!ok) {
             return; // make the whole candidate invalid
         }
-    }
-    auto priorityStr = el.attribute(QStringLiteral("priority"));
-    if (priorityStr.isEmpty()) {
-        return;
-    }
-    quint32 priority = priorityStr.toUInt(&ok);
-    if (!ok) {
-        return; // make the whole candidate invalid
-    }
-    QString cid = el.attribute(QStringLiteral("cid"));
-    if (cid.isEmpty()) {
-        return;
-    }
+        QString cid = el.attribute(QStringLiteral("cid"));
+        if (cid.isEmpty()) {
+            return;
+        }
 
-    QString ct = el.attribute(QStringLiteral("type"));
-    if (ct.isEmpty()) {
-        ct = QStringLiteral("direct");
-    }
-    static QMap<QString,Type> types{{QStringLiteral("assisted"), Assisted},
-                                    {QStringLiteral("direct"),   Direct},
-                                    {QStringLiteral("proxy"),    Proxy},
-                                    {QStringLiteral("tunnel"),   Tunnel}
-                                   };
-    auto candidateType = types.value(ct);
-    if (ct.isEmpty() || candidateType == None) {
-        return;
+        QString ct = el.attribute(QStringLiteral("type"));
+        if (ct.isEmpty()) {
+            ct = QStringLiteral("direct");
+        }
+        static QMap<QString, Type> types { { QStringLiteral("assisted"), Assisted },
+                                           { QStringLiteral("direct"), Direct },
+                                           { QStringLiteral("proxy"), Proxy },
+                                           { QStringLiteral("tunnel"), Tunnel } };
+        auto                       candidateType = types.value(ct);
+        if (ct.isEmpty() || candidateType == None) {
+            return;
+        }
+
+        if ((candidateType == Proxy && !jid.isValid()) || (candidateType != Proxy && (host.isEmpty() || !port))) {
+            return;
+        }
+
+        auto d       = new Private;
+        d->transport = transport;
+        d->cid       = cid;
+        d->host      = host;
+        d->jid       = jid;
+        d->port      = port;
+        d->priority  = priority;
+        d->type      = candidateType;
+        d->state     = New;
+        this->d      = d;
     }
 
-    if ((candidateType == Proxy && !jid.isValid()) ||
-            (candidateType != Proxy && (host.isEmpty() || !port)))
+    Candidate::Candidate(const Candidate &other) : d(other.d) {}
+
+    Candidate::Candidate(Transport *transport, const Jid &proxy, const QString &cid, quint16 localPreference) :
+        d(new Private)
     {
-        return;
+        d->transport = transport;
+        d->cid       = cid;
+        d->jid       = proxy;
+        d->priority  = (ProxyPreference << 16) + localPreference;
+        d->type      = Proxy;
+        d->state     = Probing; // it's probing because it's a local side proxy and host and port are unknown
     }
 
-    auto d = new Private;
-    d->transport = transport;
-    d->cid = cid;
-    d->host = host;
-    d->jid = jid;
-    d->port = port;
-    d->priority = priority;
-    d->type = candidateType;
-    d->state = New;
-    this->d = d;
-}
-
-Candidate::Candidate(const Candidate &other) :
-    d(other.d)
-{
-
-}
-
-Candidate::Candidate(Transport *transport, const Jid &proxy, const QString &cid, quint16 localPreference) :
-    d(new Private)
-{
-    d->transport = transport;
-    d->cid = cid;
-    d->jid = proxy;
-    d->priority = (ProxyPreference << 16) + localPreference;
-    d->type = Proxy;
-    d->state = Probing; // it's probing because it's a local side proxy and host and port are unknown
-}
-
-Candidate::Candidate(Transport *transport, const TcpPortServer::Ptr &server, const QString &cid, quint16 localPreference) :
-    d(new Private)
-{
-    Type type = None;
-    switch (server->portType()) {
-    case TcpPortServer::Direct:
-        type = Candidate::Direct;
-        break;
-    case TcpPortServer::NatAssited:
-        type = Candidate::Assisted;
-        break;
-    case TcpPortServer::Tunneled:
-        type = Candidate::Tunnel;
-        break;
-    case TcpPortServer::NoType:
-    default:
-        type = None;
-    }
+    Candidate::Candidate(Transport *transport, const TcpPortServer::Ptr &server, const QString &cid,
+                         quint16 localPreference) :
+        d(new Private)
+    {
+        Type type = None;
+        switch (server->portType()) {
+        case TcpPortServer::Direct:
+            type = Candidate::Direct;
+            break;
+        case TcpPortServer::NatAssited:
+            type = Candidate::Assisted;
+            break;
+        case TcpPortServer::Tunneled:
+            type = Candidate::Tunnel;
+            break;
+        case TcpPortServer::NoType:
+        default:
+            type = None;
+        }
 
-    if (type == None) {
-        d.reset();
-        return;
-    }
+        if (type == None) {
+            d.reset();
+            return;
+        }
 
-    d->transport = transport;
-    d->server = server.staticCast<S5BServer>();
-    d->cid = cid;
-    d->host = server->publishHost();
-    d->port = server->publishPort();
-    d->type = type;
-    static const int priorities[] = {0, ProxyPreference, TunnelPreference, AssistedPreference, DirectPreference};
-    if (type >= Type(0) && type <= Direct) {
-        d->priority = (priorities[type] << 16) + localPreference;
-    } else {
-        d->priority = 0;
-    }
+        d->transport                  = transport;
+        d->server                     = server.staticCast<S5BServer>();
+        d->cid                        = cid;
+        d->host                       = server->publishHost();
+        d->port                       = server->publishPort();
+        d->type                       = type;
+        static const int priorities[] = { 0, ProxyPreference, TunnelPreference, AssistedPreference, DirectPreference };
+        if (type >= Type(0) && type <= Direct) {
+            d->priority = (priorities[type] << 16) + localPreference;
+        } else {
+            d->priority = 0;
+        }
 
-    d->state = New;
-}
-
-Candidate::~Candidate()
-{
-}
-
-Candidate::Type Candidate::type() const
-{
-    return d->type;
-}
-
-QString Candidate::cid() const
-{
-    return d->cid;
-}
-
-Jid Candidate::jid() const
-{
-    return d->jid;
-}
-
-QString Candidate::host() const
-{
-    return d->host;
-}
-
-void Candidate::setHost(const QString &host)
-{
-    d->host = host;
-}
-
-quint16 Candidate::port() const
-{
-    return d->port;
-}
-
-void Candidate::setPort(quint16 port)
-{
-    d->port = port;
-}
-
-quint16 Candidate::localPort() const
-{
-    return d->server ? d->server->serverPort() : 0;
-}
-
-QHostAddress Candidate::localAddress() const
-{
-    return d->server ? d->server->serverAddress() : QHostAddress();
-}
-
-Candidate::State Candidate::state() const
-{
-    return d->state;
-}
-
-void Candidate::setState(Candidate::State s)
-{
-    // don't close sockets here since pending events may change state machine or remote side and closed socket may break it
-    d->state = s;
-}
-
-const char *Candidate::stateText(Candidate::State s)
-{
-    switch (s) {
-    case New: return "New";
-    case Probing: return "Probing";
-    case Pending: return "Pending";
-    case Unacked: return "Unacked";
-    case Accepted: return "Accepted";
-    case Active: return "Active";
-    case Discarded: return "Discarded";
-    }
-    return nullptr;
-}
-
-quint32 Candidate::priority() const
-{
-    return d->priority;
-}
-
-QDomElement Candidate::toXml(QDomDocument *doc) const
-{
-    auto e = doc->createElement(QStringLiteral("candidate"));
-    e.setAttribute(QStringLiteral("cid"), d->cid);
-    if (d->type == Proxy) {
-        e.setAttribute(QStringLiteral("jid"), d->jid.full());
+        d->state = New;
     }
-    if (!d->host.isEmpty() && d->port) {
-        e.setAttribute(QStringLiteral("host"), d->host);
-        e.setAttribute(QStringLiteral("port"), d->port);
-    }
-    e.setAttribute(QStringLiteral("priority"), d->priority);
 
-    static const char *types[] = {"proxy", "tunnel", "assisted"}; // same order as in enum
-    if (d->type && d->type < Direct) {
-        e.setAttribute(QStringLiteral("type"), QLatin1String(types[d->type - 1]));
-    }
-    return e;
-}
-
-void Candidate::connectToHost(const QString &key, State successState, QObject *callbackContext, std::function<void(bool)> callback, bool isUdp)
-{
-    d->connectToHost(key, successState, callbackContext, callback, isUdp);
-}
-
-bool Candidate::incomingConnection(SocksClient *sc)
-{
-    qDebug() << "incoming connection on" << d->cid << "candidate with socks client" << sc;
-    if (d->socksClient) {
-        return false;
+    Candidate::~Candidate() {}
+
+    Candidate::Type Candidate::type() const { return d->type; }
+
+    QString Candidate::cid() const { return d->cid; }
+
+    Jid Candidate::jid() const { return d->jid; }
+
+    QString Candidate::host() const { return d->host; }
+
+    void Candidate::setHost(const QString &host) { d->host = host; }
+
+    quint16 Candidate::port() const { return d->port; }
+
+    void Candidate::setPort(quint16 port) { d->port = port; }
+
+    quint16 Candidate::localPort() const { return d->server ? d->server->serverPort() : 0; }
+
+    QHostAddress Candidate::localAddress() const { return d->server ? d->server->serverAddress() : QHostAddress(); }
+
+    Candidate::State Candidate::state() const { return d->state; }
+
+    void Candidate::setState(Candidate::State s)
+    {
+        // don't close sockets here since pending events may change state machine or remote side and closed socket may
+        // break it
+        d->state = s;
     }
-    d->socksClient = sc;
-    d->setupIncomingSocksClient();
-    return true;
-}
-
-SocksClient *Candidate::takeSocksClient()
-{
-    qDebug() << "taking socks client" << d->socksClient << "from " << d->cid << "candidate";
-    if (!d->socksClient) {
+
+    const char *Candidate::stateText(Candidate::State s)
+    {
+        switch (s) {
+        case New:
+            return "New";
+        case Probing:
+            return "Probing";
+        case Pending:
+            return "Pending";
+        case Unacked:
+            return "Unacked";
+        case Accepted:
+            return "Accepted";
+        case Active:
+            return "Active";
+        case Discarded:
+            return "Discarded";
+        }
         return nullptr;
     }
-    auto c = d->socksClient;
-    d->socksClient = nullptr;
-    d->disconnect(c);
-    return c;
-}
-
-void Candidate::deleteSocksClient()
-{
-    if (d->socksClient) {
-        d->socksClient->disconnect();
-        delete d->socksClient;
-        d->socksClient = nullptr;
+
+    quint32 Candidate::priority() const { return d->priority; }
+
+    QDomElement Candidate::toXml(QDomDocument *doc) const
+    {
+        auto e = doc->createElement(QStringLiteral("candidate"));
+        e.setAttribute(QStringLiteral("cid"), d->cid);
+        if (d->type == Proxy) {
+            e.setAttribute(QStringLiteral("jid"), d->jid.full());
+        }
+        if (!d->host.isEmpty() && d->port) {
+            e.setAttribute(QStringLiteral("host"), d->host);
+            e.setAttribute(QStringLiteral("port"), d->port);
+        }
+        e.setAttribute(QStringLiteral("priority"), d->priority);
+
+        static const char *types[] = { "proxy", "tunnel", "assisted" }; // same order as in enum
+        if (d->type && d->type < Direct) {
+            e.setAttribute(QStringLiteral("type"), QLatin1String(types[d->type - 1]));
+        }
+        return e;
     }
-}
-
-TcpPortServer::Ptr Candidate::server() const
-{
-    return d->server.staticCast<TcpPortServer>();
-}
-
-bool Candidate::operator==(const Candidate &other) const
-{
-    return d.data() == other.d.data();
-}
-
-class Transport::Private
-{
-public:
-    enum PendingActions {
-        NewCandidate    = 1,
-        CandidateUsed   = 2,
-        CandidateError  = 4,
-        Activated       = 8,
-        ProxyError      = 16
-    };
 
-    Transport *q = nullptr;
-    Pad::Ptr pad;
-    bool meCreator = true; // content created on local side
-    bool transportStarted = false; // where start() was called
-    bool offerSent = false;
-    bool waitingAck = true;
-    bool aborted = false;
-    bool remoteReportedCandidateError = false;
-    bool localReportedCandidateError = false;
-    bool proxyDiscoveryInProgress = false; // if we have valid proxy requests
-    quint16 pendingActions = 0;
-    int proxiesInDiscoCount = 0;
-    Application *application = nullptr;
-    QMap<QString,Candidate> localCandidates; // cid to candidate mapping
-    QMap<QString,Candidate> remoteCandidates;
-    Candidate localUsedCandidate; // we received "candidate-used" for this candidate from localCandidates list
-    Candidate remoteUsedCandidate; // we sent "candidate-used" for this candidate from remoteCandidates list
-    QString dstaddr; // an address for xmpp proxy as it comes from remote. each side calculates it like sha1(sid + local jid + remote jid)
-    QString directAddr; // like dstaddr but for direct connection. Basically it's sha1(sid + initiator jid + responder jid)
-    QString sid;
-    Transport::Mode mode = Transport::Tcp;
-    QTimer probingTimer;
-    QElapsedTimer lastConnectionStart;
-    size_t blockSize = 8192;
-    TcpPortDiscoverer *disco = nullptr;
-
-    QSharedPointer<Connection> connection;
-
-    // udp stuff
-    bool udpInitialized;
-    quint16 udpPort;
-    QHostAddress udpAddress;
-
-    inline Jid remoteJid() const
+    void Candidate::connectToHost(const QString &key, State successState, QObject *callbackContext,
+                                  std::function<void(bool)> callback, bool isUdp)
     {
-        return pad->session()->peer();
+        d->connectToHost(key, successState, callbackContext, callback, isUdp);
     }
 
-    QString generateCid() const
+    bool Candidate::incomingConnection(SocksClient *sc)
     {
-        QString cid;
-        do {
-            cid = QString("%1").arg(qrand() & 0xffff, 4, 16, QChar('0'));
-        } while (localCandidates.contains(cid) || remoteCandidates.contains(cid));
-        return cid;
+        qDebug() << "incoming connection on" << d->cid << "candidate with socks client" << sc;
+        if (d->socksClient) {
+            return false;
+        }
+        d->socksClient = sc;
+        d->setupIncomingSocksClient();
+        return true;
     }
 
-    bool isDup(const Candidate &c) const
+    SocksClient *Candidate::takeSocksClient()
     {
-        for (auto const &rc: remoteCandidates) {
-            if (c.host() == rc.host() && c.port() == rc.port()) {
-                return true;
-            }
+        qDebug() << "taking socks client" << d->socksClient << "from " << d->cid << "candidate";
+        if (!d->socksClient) {
+            return nullptr;
         }
-        return false;
+        auto c         = d->socksClient;
+        d->socksClient = nullptr;
+        d->disconnect(c);
+        return c;
     }
 
-    void discoS5BProxy()
+    void Candidate::deleteSocksClient()
     {
-        auto m = static_cast<Manager*>(pad->manager());
-        Jid proxy = m->userProxy();
-        if (proxy.isValid()) {
-            Candidate c(q, proxy, generateCid());
-            if (!isDup(c)) {
-                localCandidates.insert(c.cid(), c);
+        if (d->socksClient) {
+            d->socksClient->disconnect();
+            delete d->socksClient;
+            d->socksClient = nullptr;
+        }
+    }
+
+    TcpPortServer::Ptr Candidate::server() const { return d->server.staticCast<TcpPortServer>(); }
+
+    bool Candidate::operator==(const Candidate &other) const { return d.data() == other.d.data(); }
+
+    class Transport::Private {
+    public:
+        enum PendingActions { NewCandidate = 1, CandidateUsed = 2, CandidateError = 4, Activated = 8, ProxyError = 16 };
+
+        Transport *              q = nullptr;
+        Pad::Ptr                 pad;
+        bool                     meCreator                    = true;  // content created on local side
+        bool                     transportStarted             = false; // where start() was called
+        bool                     offerSent                    = false;
+        bool                     waitingAck                   = true;
+        bool                     aborted                      = false;
+        bool                     remoteReportedCandidateError = false;
+        bool                     localReportedCandidateError  = false;
+        bool                     proxyDiscoveryInProgress     = false; // if we have valid proxy requests
+        quint16                  pendingActions               = 0;
+        int                      proxiesInDiscoCount          = 0;
+        Application *            application                  = nullptr;
+        QMap<QString, Candidate> localCandidates; // cid to candidate mapping
+        QMap<QString, Candidate> remoteCandidates;
+        Candidate localUsedCandidate;  // we received "candidate-used" for this candidate from localCandidates list
+        Candidate remoteUsedCandidate; // we sent "candidate-used" for this candidate from remoteCandidates list
+        QString   dstaddr; // an address for xmpp proxy as it comes from remote. each side calculates it like sha1(sid +
+                           // local jid + remote jid)
+        QString directAddr; // like dstaddr but for direct connection. Basically it's sha1(sid + initiator jid +
+                            // responder jid)
+        QString            sid;
+        Transport::Mode    mode = Transport::Tcp;
+        QTimer             probingTimer;
+        QElapsedTimer      lastConnectionStart;
+        size_t             blockSize = 8192;
+        TcpPortDiscoverer *disco     = nullptr;
+
+        QSharedPointer<Connection> connection;
+
+        // udp stuff
+        bool         udpInitialized;
+        quint16      udpPort;
+        QHostAddress udpAddress;
+
+        inline Jid remoteJid() const { return pad->session()->peer(); }
+
+        QString generateCid() const
+        {
+            QString cid;
+            do {
+                cid = QString("%1").arg(qrand() & 0xffff, 4, 16, QChar('0'));
+            } while (localCandidates.contains(cid) || remoteCandidates.contains(cid));
+            return cid;
+        }
+
+        bool isDup(const Candidate &c) const
+        {
+            for (auto const &rc : remoteCandidates) {
+                if (c.host() == rc.host() && c.port() == rc.port()) {
+                    return true;
+                }
             }
+            return false;
         }
 
-        proxyDiscoveryInProgress = true;
-        QList<QSet<QString>> featureOptions = {{"http://jabber.org/protocol/bytestreams"}};
-        pad->session()->manager()->client()->serverInfoManager()->
-                queryServiceInfo(QStringLiteral("proxy"),
-                                 QStringLiteral("bytestreams"),
-                                 featureOptions,
-                                 QRegExp("proxy.*|socks.*|stream.*|s5b.*"),
-                                 ServerInfoManager::SQ_CheckAllOnNoMatch,
-                                 [this](const QList<DiscoItem> &items)
+        void discoS5BProxy()
         {
-            if (!proxyDiscoveryInProgress) { // check if new results are ever/still expected
-                // seems like we have successful connection via higher priority channel. so nobody cares about proxy
-                return;
+            auto m     = static_cast<Manager *>(pad->manager());
+            Jid  proxy = m->userProxy();
+            if (proxy.isValid()) {
+                Candidate c(q, proxy, generateCid());
+                if (!isDup(c)) {
+                    localCandidates.insert(c.cid(), c);
+                }
             }
-            auto m = static_cast<Manager*>(pad->manager());
-            Jid userProxy = m->userProxy();
-
-            // queries proxy's host/port and sends the candidate to remote
-            auto queryProxy = [this](const Jid &j, const QString &cid) {
-                proxiesInDiscoCount++;
-                auto query = new JT_S5B(pad->session()->manager()->client()->rootTask());
-                connect(query, &JT_S5B::finished, q, [this,query,cid](){
-                    if (!proxyDiscoveryInProgress) {
+
+            proxyDiscoveryInProgress            = true;
+            QList<QSet<QString>> featureOptions = { { "http://jabber.org/protocol/bytestreams" } };
+            pad->session()->manager()->client()->serverInfoManager()->queryServiceInfo(
+                QStringLiteral("proxy"), QStringLiteral("bytestreams"), featureOptions,
+                QRegExp("proxy.*|socks.*|stream.*|s5b.*"), ServerInfoManager::SQ_CheckAllOnNoMatch,
+                [this](const QList<DiscoItem> &items) {
+                    if (!proxyDiscoveryInProgress) { // check if new results are ever/still expected
+                        // seems like we have successful connection via higher priority channel. so nobody cares about
+                        // proxy
                         return;
                     }
-                    bool candidateUpdated = false;
-                    auto c = localCandidates.value(cid);
-                    if (c && c.state() == Candidate::Probing) {
-                        auto sh = query->proxyInfo();
-                        if (query->success() && !sh.host().isEmpty() && sh.port()) {
-                            // it can be discarded by this moment (e.g. got success on a higher priority candidate).
-                            // so we have to check.
-                            c.setHost(sh.host());
-                            c.setPort(sh.port());
-                            c.setState(Candidate::New);
-                            candidateUpdated = true;
-                            pendingActions |= Private::NewCandidate;
-                        } else {
-                            c.setState(Candidate::Discarded);
+                    auto m         = static_cast<Manager *>(pad->manager());
+                    Jid  userProxy = m->userProxy();
+
+                    // queries proxy's host/port and sends the candidate to remote
+                    auto queryProxy = [this](const Jid &j, const QString &cid) {
+                        proxiesInDiscoCount++;
+                        auto query = new JT_S5B(pad->session()->manager()->client()->rootTask());
+                        connect(query, &JT_S5B::finished, q, [this, query, cid]() {
+                            if (!proxyDiscoveryInProgress) {
+                                return;
+                            }
+                            bool candidateUpdated = false;
+                            auto c                = localCandidates.value(cid);
+                            if (c && c.state() == Candidate::Probing) {
+                                auto sh = query->proxyInfo();
+                                if (query->success() && !sh.host().isEmpty() && sh.port()) {
+                                    // it can be discarded by this moment (e.g. got success on a higher priority
+                                    // candidate). so we have to check.
+                                    c.setHost(sh.host());
+                                    c.setPort(sh.port());
+                                    c.setState(Candidate::New);
+                                    candidateUpdated = true;
+                                    pendingActions |= Private::NewCandidate;
+                                } else {
+                                    c.setState(Candidate::Discarded);
+                                }
+                            }
+                            proxiesInDiscoCount--;
+                            if (!proxiesInDiscoCount) {
+                                proxyDiscoveryInProgress = false;
+                            }
+                            if (candidateUpdated) {
+                                emit q->updated();
+                            } else if (!proxiesInDiscoCount) {
+                                // it's possible it was our last hope and probaby we have to send candidate-error now.
+                                checkAndFinishNegotiation();
+                            }
+                        });
+                        query->requestProxyInfo(j);
+                        query->go(true);
+                    };
+
+                    bool userProxyFound = !userProxy.isValid();
+                    for (const auto i : items) {
+                        int localPref = 0;
+                        if (!userProxyFound && i.jid() == userProxy) {
+                            localPref      = 1;
+                            userProxyFound = true;
                         }
+                        Candidate c(q, i.jid(), generateCid(), localPref);
+                        localCandidates.insert(c.cid(), c);
+
+                        queryProxy(i.jid(), c.cid());
                     }
-                    proxiesInDiscoCount--;
-                    if (!proxiesInDiscoCount) {
+                    if (!userProxyFound) {
+                        Candidate c(q, userProxy, generateCid(), 1);
+                        localCandidates.insert(c.cid(), c);
+                        queryProxy(userProxy, c.cid());
+                    } else if (items.count() == 0) {
+                        // seems like we don't have any proxy
                         proxyDiscoveryInProgress = false;
-                    }
-                    if (candidateUpdated) {
-                        emit q->updated();
-                    } else if (!proxiesInDiscoCount) {
-                        // it's possible it was our last hope and probaby we have to send candidate-error now.
                         checkAndFinishNegotiation();
                     }
                 });
-                query->requestProxyInfo(j);
-                query->go(true);
-            };
-
-            bool userProxyFound = !userProxy.isValid();
-            for (const auto i: items) {
-                int localPref = 0;
-                if (!userProxyFound && i.jid() == userProxy) {
-                    localPref = 1;
-                    userProxyFound = true;
-                }
-                Candidate c(q, i.jid(), generateCid(), localPref);
-                localCandidates.insert(c.cid(), c);
+        }
 
-                queryProxy(i.jid(), c.cid());
-            }
-            if (!userProxyFound) {
-                Candidate c(q, userProxy, generateCid(), 1);
-                localCandidates.insert(c.cid(), c);
-                queryProxy(userProxy, c.cid());
-            } else if (items.count() == 0) {
-                // seems like we don't have any proxy
-                proxyDiscoveryInProgress = false;
-                checkAndFinishNegotiation();
+        void tryConnectToRemoteCandidate()
+        {
+            if (!transportStarted) {
+                return; // will come back later
             }
-        });
-    }
-
-    void tryConnectToRemoteCandidate()
-    {
-        if (!transportStarted) {
-            return; // will come back later
-        }
-        quint64 maxProbingPrio = 0;
-        quint64 maxNewPrio = 0;
-        Candidate maxProbing;
-        QList<Candidate> maxNew; // keeps highest (same) priority New candidates
-
-        /*
-         We have to find highest-priority already connecting candidate and highest-priority new candidate.
-         If already-connecting is not found then start connecting to new if it's found.
-         If both already-connecting and new are found then
-            if new candidate has higher priority or the same priority then start connecting
-            else ensure the new candidate starts connecting in 200ms after previous connection attempt
-                 (if it's in future then reschedule this call for future)
-         In all the other cases just return and wait for events.
-        */
-
-        qDebug("tryConnectToRemoteCandidate()");
-        for (auto &c: remoteCandidates) {
-            if (c.state() == Candidate::New) {
-                if (c.priority() > maxNewPrio) {
-                    maxNew = QList<Candidate>();
-                    maxNew.append(c);
-                    maxNewPrio = c.priority();
-                } else if (c.priority() == maxNewPrio) {
-                    maxNew.append(c);
+            quint64          maxProbingPrio = 0;
+            quint64          maxNewPrio     = 0;
+            Candidate        maxProbing;
+            QList<Candidate> maxNew; // keeps highest (same) priority New candidates
+
+            /*
+             We have to find highest-priority already connecting candidate and highest-priority new candidate.
+             If already-connecting is not found then start connecting to new if it's found.
+             If both already-connecting and new are found then
+                if new candidate has higher priority or the same priority then start connecting
+                else ensure the new candidate starts connecting in 200ms after previous connection attempt
+                     (if it's in future then reschedule this call for future)
+             In all the other cases just return and wait for events.
+            */
+
+            qDebug("tryConnectToRemoteCandidate()");
+            for (auto &c : remoteCandidates) {
+                if (c.state() == Candidate::New) {
+                    if (c.priority() > maxNewPrio) {
+                        maxNew = QList<Candidate>();
+                        maxNew.append(c);
+                        maxNewPrio = c.priority();
+                    } else if (c.priority() == maxNewPrio) {
+                        maxNew.append(c);
+                    }
+                }
+                if (c.state() == Candidate::Probing && c.priority() > maxProbingPrio) {
+                    maxProbing     = c;
+                    maxProbingPrio = c.priority();
                 }
             }
-            if (c.state() == Candidate::Probing && c.priority() > maxProbingPrio) {
-                maxProbing = c;
-                maxProbingPrio = c.priority();
+            if (maxNew.isEmpty()) {
+                qDebug("  tryConnectToRemoteCandidate() no maxNew candidates");
+                return; // nowhere to connect
             }
-        }
-        if (maxNew.isEmpty()) {
-            qDebug("  tryConnectToRemoteCandidate() no maxNew candidates");
-            return; // nowhere to connect
-        }
 
-        // check if we have to hang on for a little if a higher priority candidate is Probing
-        if (maxProbing) {
-            if (maxNewPrio < maxProbing.priority()) {
-                if (probingTimer.isActive()) {
-                    qDebug("  tryConnectToRemoteCandidate() timer is already active. let's wait");
-                    return; // we will come back here soon
-                }
-                qint64 msToFuture = 200 - lastConnectionStart.elapsed();
-                if (msToFuture > 0) { // seems like we have to rescheduler for future
-                    probingTimer.start(int(msToFuture));
-                    qDebug("  tryConnectToRemoteCandidate() too early. timer started. let's wait");
-                    return;
+            // check if we have to hang on for a little if a higher priority candidate is Probing
+            if (maxProbing) {
+                if (maxNewPrio < maxProbing.priority()) {
+                    if (probingTimer.isActive()) {
+                        qDebug("  tryConnectToRemoteCandidate() timer is already active. let's wait");
+                        return; // we will come back here soon
+                    }
+                    qint64 msToFuture = 200 - lastConnectionStart.elapsed();
+                    if (msToFuture > 0) { // seems like we have to rescheduler for future
+                        probingTimer.start(int(msToFuture));
+                        qDebug("  tryConnectToRemoteCandidate() too early. timer started. let's wait");
+                        return;
+                    }
                 }
             }
-        }
-        probingTimer.start(200); // for the next candidate if any
-
-        // now we have to connect to maxNew candidates
-        for (auto &mnc: maxNew) {
-            lastConnectionStart.start();
-            QString key = mnc.type() == Candidate::Proxy? dstaddr : directAddr;
-            mnc.setState(Candidate::Probing);
-            mnc.connectToHost(key, Candidate::Pending, q, [this, mnc](bool success) {
-                // candidate's status had to be changed by connectToHost, so we don't set it again
-                if (success) {
-                    // let's reject candidates which are meaningless to try
-                    bool hasUnckeckedNew = false;
-                    for (auto &c: remoteCandidates) {
-                        if (c.state() == Candidate::New) {
-                            if (c.priority() <= mnc.priority()) {
-                                c.setState(Candidate::Discarded);
-                            } else {
-                                hasUnckeckedNew = true;
+            probingTimer.start(200); // for the next candidate if any
+
+            // now we have to connect to maxNew candidates
+            for (auto &mnc : maxNew) {
+                lastConnectionStart.start();
+                QString key = mnc.type() == Candidate::Proxy ? dstaddr : directAddr;
+                mnc.setState(Candidate::Probing);
+                mnc.connectToHost(
+                    key, Candidate::Pending, q,
+                    [this, mnc](bool success) {
+                        // candidate's status had to be changed by connectToHost, so we don't set it again
+                        if (success) {
+                            // let's reject candidates which are meaningless to try
+                            bool hasUnckeckedNew = false;
+                            for (auto &c : remoteCandidates) {
+                                if (c.state() == Candidate::New) {
+                                    if (c.priority() <= mnc.priority()) {
+                                        c.setState(Candidate::Discarded);
+                                    } else {
+                                        hasUnckeckedNew = true;
+                                    }
+                                }
+                            }
+                            if (!hasUnckeckedNew) {
+                                pendingActions
+                                    &= ~Private::NewCandidate; // just if we had it for example after proxy discovery
                             }
+                            setLocalProbingMinimalPreference(mnc.priority() >> 16);
+                            updateMinimalPriority();
                         }
-                    }
-                    if (!hasUnckeckedNew) {
-                        pendingActions &= ~Private::NewCandidate; // just if we had it for example after proxy discovery
-                    }
-                    setLocalProbingMinimalPreference(mnc.priority() >> 16);
-                    updateMinimalPriority();
-                }
-                checkAndFinishNegotiation();
-            }, mode == Transport::Udp);
-        }
-    }
-
-    /**
-     * @brief limitTcpDiscoByMinimalPreference take upper part of candidate preference (type preference)
-     *        and drops lower priority pending local servers disco
-     * @param preference
-     */
-    void setLocalProbingMinimalPreference(quint32 preference)
-    {
-        if (proxyDiscoveryInProgress && preference > Candidate::ProxyPreference) {
-            proxyDiscoveryInProgress = false; // doesn't make sense anymore
+                        checkAndFinishNegotiation();
+                    },
+                    mode == Transport::Udp);
+            }
         }
 
-        // and now local ports discoverer..
-        if (!disco) {
-            return;
-        }
-        TcpPortServer::PortTypes types = TcpPortServer::Direct;
-        if (preference >= Candidate::AssistedPreference) {
-            types |= TcpPortServer::NatAssited;
-        }
-        if (preference >= Candidate::TunnelPreference) {
-            types |= TcpPortServer::Tunneled;
-        }
-        if (!disco->setTypeMask(types)) {
-            delete disco;
-            disco = nullptr;
-        }
-    }
+        /**
+         * @brief limitTcpDiscoByMinimalPreference take upper part of candidate preference (type preference)
+         *        and drops lower priority pending local servers disco
+         * @param preference
+         */
+        void setLocalProbingMinimalPreference(quint32 preference)
+        {
+            if (proxyDiscoveryInProgress && preference > Candidate::ProxyPreference) {
+                proxyDiscoveryInProgress = false; // doesn't make sense anymore
+            }
 
-    bool hasUnaknowledgedLocalCandidates() const
-    {
-        // now ensure all local were sent to remote and no hope left
-        if (proxyDiscoveryInProgress || (disco && !disco->isDepleted())) {
-            return true;
+            // and now local ports discoverer..
+            if (!disco) {
+                return;
+            }
+            TcpPortServer::PortTypes types = TcpPortServer::Direct;
+            if (preference >= Candidate::AssistedPreference) {
+                types |= TcpPortServer::NatAssited;
+            }
+            if (preference >= Candidate::TunnelPreference) {
+                types |= TcpPortServer::Tunneled;
+            }
+            if (!disco->setTypeMask(types)) {
+                delete disco;
+                disco = nullptr;
+            }
         }
 
-        // now local candidates
-        for (const auto &c: localCandidates) {
-            auto s = c.state();
-            if (s == Candidate::Probing || s == Candidate::New || s == Candidate::Unacked) {
+        bool hasUnaknowledgedLocalCandidates() const
+        {
+            // now ensure all local were sent to remote and no hope left
+            if (proxyDiscoveryInProgress || (disco && !disco->isDepleted())) {
                 return true;
             }
-        }
 
-        return false;
-    }
-
-    Candidate preferredUsedCandidate() const
-    {
-        if (localUsedCandidate) {
-            if (remoteUsedCandidate) {
-                if (localUsedCandidate.priority() == remoteUsedCandidate.priority()) {
-                    if (pad->session()->role() == Origin::Initiator) {
-                        return remoteUsedCandidate;
-                    }
-                    return localUsedCandidate;
+            // now local candidates
+            for (const auto &c : localCandidates) {
+                auto s = c.state();
+                if (s == Candidate::Probing || s == Candidate::New || s == Candidate::Unacked) {
+                    return true;
                 }
-                return localUsedCandidate.priority() > remoteUsedCandidate.priority()?
-                            localUsedCandidate : remoteUsedCandidate;
             }
-            return localUsedCandidate;
-        }
-        return remoteUsedCandidate;
-    }
 
-    void checkAndFinishNegotiation()
-    {
-        // Why we can't send candidate-used/error right when this happens:
-        // so the situation: we discarded all remote candidates (failed to connect)
-        // but we have some local candidates which are still in Probing state (upnp for example)
-        // if we send candidate-error while we have unsent candidates this may trigger transport failure.
-        // So for candidate-error two conditions have to be met 1) all remote failed 2) all local were sent no more
-        // local candidates are expected to be discovered
-
-        if (!transportStarted || connection) { // if not started or already finished
-            qDebug("checkAndFinishNegotiation not finished: !connectionStarted || connection");
-            return;
+            return false;
         }
 
-        // sort out already handled states or states which will bring us here a little later
-        if (waitingAck || pendingActions || hasUnaknowledgedLocalCandidates())
+        Candidate preferredUsedCandidate() const
         {
-            // waitingAck some query waits for ack and in the callback this func will be called again
-            // pendingActions means we reported to app we have data to send but the app didn't take this data yet,
-            // but as soon as it's taken it will switch to waitingAck.
-            // And with unacknowledged local candidates we can't send used/error as well as report connected()/failure()
-            // until tried them all
-            qDebug("checkAndFinishNegotiation not finished: waitingAck=%d || pendingActions=%x || hasUnaknowledgedLocalCandidates()=%d",
-                   int(waitingAck), int(pendingActions), int(hasUnaknowledgedLocalCandidates()));
-            return;
-        }
-
-        // if we already sent used/error. In other words if we already have finished local part of negotiation
-        if (localReportedCandidateError || remoteUsedCandidate) {
-            // maybe it's time to report connected()/failure()
-            if (remoteReportedCandidateError || localUsedCandidate) {
-                // so remote seems to be finished too.
-                // tell application about it and it has to change its state immediatelly
-                auto c = preferredUsedCandidate();
-                if (c) {
-                    if (c.state() != Candidate::Active) {
-                        if (c.type() == Candidate::Proxy) { // local proxy
-                            // If it's proxy, first it has to be activated
-                            if (c == localUsedCandidate) {
-                                // it's our side who proposed proxy. so we have to connect to it and activate
-                                auto key = makeKey(sid, pad->session()->me(), pad->session()->peer());
-                                c.connectToHost(key, Candidate::Accepted, q, [this](bool success){
-                                    if (!success) {
-                                        pendingActions |= Private::ProxyError;
-                                        emit q->updated();
-                                        return;
-                                    }
-
-                                    auto query = new JT_S5B(pad->session()->manager()->client()->rootTask());
-                                    connect(query, &JT_S5B::finished, q, [this,query]() {
-                                        Q_ASSERT(localUsedCandidate.state() == Candidate::Accepted);
-                                        if (!query->success()) {
-                                            pendingActions |= Private::ProxyError;
-                                            emit q->updated();
-                                            return;
-                                        }
-                                        pendingActions |= Private::Activated;
-                                        localUsedCandidate.setState(Candidate::Active);
-                                        emit q->updated();
-                                        handleConnected(localUsedCandidate);
-                                    });
-                                    query->requestActivation(localUsedCandidate.jid(), sid, pad->session()->peer());
-                                    query->go(true);
-                                }, mode == Transport::Udp);
-                            } // else so it's remote proxy. let's just wait for <activated> from remote
-                        } else {
-                            c.setState(Candidate::Active);
+            if (localUsedCandidate) {
+                if (remoteUsedCandidate) {
+                    if (localUsedCandidate.priority() == remoteUsedCandidate.priority()) {
+                        if (pad->session()->role() == Origin::Initiator) {
+                            return remoteUsedCandidate;
                         }
+                        return localUsedCandidate;
                     }
-                    if (c.state() == Candidate::Active) {
-                        handleConnected(c);
-                    }
-                    else qDebug("checkAndFinishNegotiation not finished: preferred is not Active");
-                } else { // both sides reported candidate error
-                    emit q->failed();
+                    return localUsedCandidate.priority() > remoteUsedCandidate.priority() ? localUsedCandidate
+                                                                                          : remoteUsedCandidate;
                 }
-            } // else we have to wait till remote reports its status
-            else qDebug("checkAndFinishNegotiation not finished: remote didn't reported yet");
-            return;
+                return localUsedCandidate;
+            }
+            return remoteUsedCandidate;
         }
 
-        qDebug("checkAndFinishNegotiation not finished: trying to send condidate-used/error if any");
-        // if we are here then neither candidate-used nor candidate-error was sent to remote,
-        // but we can send it now.
-        // first let's check if we can send candidate-used
-        bool allRemoteDiscarded = true;
-        bool hasConnectedRemoteCandidate = false;
-        for (const auto &c: remoteCandidates) {
-            auto s = c.state();
-            qDebug() << "  candidate " << c.cid() << " is " << Candidate::stateText(s);
-            if (s != Candidate::Discarded) {
-                allRemoteDiscarded = false;
+        void checkAndFinishNegotiation()
+        {
+            // Why we can't send candidate-used/error right when this happens:
+            // so the situation: we discarded all remote candidates (failed to connect)
+            // but we have some local candidates which are still in Probing state (upnp for example)
+            // if we send candidate-error while we have unsent candidates this may trigger transport failure.
+            // So for candidate-error two conditions have to be met 1) all remote failed 2) all local were sent no more
+            // local candidates are expected to be discovered
+
+            if (!transportStarted || connection) { // if not started or already finished
+                qDebug("checkAndFinishNegotiation not finished: !connectionStarted || connection");
+                return;
             }
-            if (s == Candidate::Pending) { // connected but not yet sent
-                hasConnectedRemoteCandidate = true;
+
+            // sort out already handled states or states which will bring us here a little later
+            if (waitingAck || pendingActions || hasUnaknowledgedLocalCandidates()) {
+                // waitingAck some query waits for ack and in the callback this func will be called again
+                // pendingActions means we reported to app we have data to send but the app didn't take this data yet,
+                // but as soon as it's taken it will switch to waitingAck.
+                // And with unacknowledged local candidates we can't send used/error as well as report
+                // connected()/failure() until tried them all
+                qDebug("checkAndFinishNegotiation not finished: waitingAck=%d || pendingActions=%x || "
+                       "hasUnaknowledgedLocalCandidates()=%d",
+                       int(waitingAck), int(pendingActions), int(hasUnaknowledgedLocalCandidates()));
+                return;
             }
-        }
 
-        // if we have connection to remote candidate it's time to send it
-        if (hasConnectedRemoteCandidate) {
-            pendingActions |= Private::CandidateUsed;
-            qDebug("checkAndFinishNegotiation: used");
-            emit q->updated();
-            return;
-        }
+            // if we already sent used/error. In other words if we already have finished local part of negotiation
+            if (localReportedCandidateError || remoteUsedCandidate) {
+                // maybe it's time to report connected()/failure()
+                if (remoteReportedCandidateError || localUsedCandidate) {
+                    // so remote seems to be finished too.
+                    // tell application about it and it has to change its state immediatelly
+                    auto c = preferredUsedCandidate();
+                    if (c) {
+                        if (c.state() != Candidate::Active) {
+                            if (c.type() == Candidate::Proxy) { // local proxy
+                                // If it's proxy, first it has to be activated
+                                if (c == localUsedCandidate) {
+                                    // it's our side who proposed proxy. so we have to connect to it and activate
+                                    auto key = makeKey(sid, pad->session()->me(), pad->session()->peer());
+                                    c.connectToHost(
+                                        key, Candidate::Accepted, q,
+                                        [this](bool success) {
+                                            if (!success) {
+                                                pendingActions |= Private::ProxyError;
+                                                emit q->updated();
+                                                return;
+                                            }
+
+                                            auto query = new JT_S5B(pad->session()->manager()->client()->rootTask());
+                                            connect(query, &JT_S5B::finished, q, [this, query]() {
+                                                Q_ASSERT(localUsedCandidate.state() == Candidate::Accepted);
+                                                if (!query->success()) {
+                                                    pendingActions |= Private::ProxyError;
+                                                    emit q->updated();
+                                                    return;
+                                                }
+                                                pendingActions |= Private::Activated;
+                                                localUsedCandidate.setState(Candidate::Active);
+                                                emit q->updated();
+                                                handleConnected(localUsedCandidate);
+                                            });
+                                            query->requestActivation(localUsedCandidate.jid(), sid,
+                                                                     pad->session()->peer());
+                                            query->go(true);
+                                        },
+                                        mode == Transport::Udp);
+                                } // else so it's remote proxy. let's just wait for <activated> from remote
+                            } else {
+                                c.setState(Candidate::Active);
+                            }
+                        }
+                        if (c.state() == Candidate::Active) {
+                            handleConnected(c);
+                        } else
+                            qDebug("checkAndFinishNegotiation not finished: preferred is not Active");
+                    } else { // both sides reported candidate error
+                        emit q->failed();
+                    }
+                } // else we have to wait till remote reports its status
+                else
+                    qDebug("checkAndFinishNegotiation not finished: remote didn't reported yet");
+                return;
+            }
 
-        if (allRemoteDiscarded) {
-            pendingActions |= Private::CandidateError;
-            qDebug("checkAndFinishNegotiation: error");
-            emit q->updated();
-            return;
-        }
+            qDebug("checkAndFinishNegotiation not finished: trying to send condidate-used/error if any");
+            // if we are here then neither candidate-used nor candidate-error was sent to remote,
+            // but we can send it now.
+            // first let's check if we can send candidate-used
+            bool allRemoteDiscarded          = true;
+            bool hasConnectedRemoteCandidate = false;
+            for (const auto &c : remoteCandidates) {
+                auto s = c.state();
+                qDebug() << "  candidate " << c.cid() << " is " << Candidate::stateText(s);
+                if (s != Candidate::Discarded) {
+                    allRemoteDiscarded = false;
+                }
+                if (s == Candidate::Pending) { // connected but not yet sent
+                    hasConnectedRemoteCandidate = true;
+                }
+            }
 
-        qDebug("checkAndFinishNegotiation not finished: there are more remote candidates to try");
-        // apparently we haven't connected anywhere but there are more remote candidates to try
-    }
+            // if we have connection to remote candidate it's time to send it
+            if (hasConnectedRemoteCandidate) {
+                pendingActions |= Private::CandidateUsed;
+                qDebug("checkAndFinishNegotiation: used");
+                emit q->updated();
+                return;
+            }
 
-    // take used-candidate with highest priority and discard all with lower. also update used candidates themselves
-    void updateMinimalPriority() {
-        quint32 prio = 0;
-        if (localUsedCandidate && localUsedCandidate.state() != Candidate::Discarded) {
-            prio = localUsedCandidate.priority();
-        }
-        if (remoteUsedCandidate && prio < remoteUsedCandidate.priority() && remoteUsedCandidate.state() != Candidate::Discarded) {
-            prio = remoteUsedCandidate.priority();
+            if (allRemoteDiscarded) {
+                pendingActions |= Private::CandidateError;
+                qDebug("checkAndFinishNegotiation: error");
+                emit q->updated();
+                return;
+            }
+
+            qDebug("checkAndFinishNegotiation not finished: there are more remote candidates to try");
+            // apparently we haven't connected anywhere but there are more remote candidates to try
         }
 
-        for (auto &c: localCandidates) {
-            if (c.priority() < prio && c.state() != Candidate::Discarded) {
-                c.setState(Candidate::Discarded);
+        // take used-candidate with highest priority and discard all with lower. also update used candidates themselves
+        void updateMinimalPriority()
+        {
+            quint32 prio = 0;
+            if (localUsedCandidate && localUsedCandidate.state() != Candidate::Discarded) {
+                prio = localUsedCandidate.priority();
             }
-        }
-        for (auto &c: remoteCandidates) {
-            if (c.priority() < prio && c.state() != Candidate::Discarded) {
-                c.setState(Candidate::Discarded);
+            if (remoteUsedCandidate && prio < remoteUsedCandidate.priority()
+                && remoteUsedCandidate.state() != Candidate::Discarded) {
+                prio = remoteUsedCandidate.priority();
             }
-        }
-        prio >>= 16;
-        setLocalProbingMinimalPreference(prio);
-        // if we discarded "used" candidates then reset them to invalid
-        if (localUsedCandidate && localUsedCandidate.state() == Candidate::Discarded) {
-            localUsedCandidate = Candidate();
-        }
-        if (remoteUsedCandidate && remoteUsedCandidate.state() == Candidate::Discarded) {
-            remoteUsedCandidate = Candidate();
-        }
-        if (localUsedCandidate && remoteUsedCandidate) {
-            if (pad->session()->role() == Origin::Initiator) {
-                // i'm initiator. see 2.4.4
-                localUsedCandidate.setState(Candidate::Discarded);
+
+            for (auto &c : localCandidates) {
+                if (c.priority() < prio && c.state() != Candidate::Discarded) {
+                    c.setState(Candidate::Discarded);
+                }
+            }
+            for (auto &c : remoteCandidates) {
+                if (c.priority() < prio && c.state() != Candidate::Discarded) {
+                    c.setState(Candidate::Discarded);
+                }
+            }
+            prio >>= 16;
+            setLocalProbingMinimalPreference(prio);
+            // if we discarded "used" candidates then reset them to invalid
+            if (localUsedCandidate && localUsedCandidate.state() == Candidate::Discarded) {
                 localUsedCandidate = Candidate();
-                remoteReportedCandidateError = true; // as a sign of completeness even if not true
-            } else {
-                remoteUsedCandidate.setState(Candidate::Discarded);
+            }
+            if (remoteUsedCandidate && remoteUsedCandidate.state() == Candidate::Discarded) {
                 remoteUsedCandidate = Candidate();
-                localReportedCandidateError = true; // as a sign of completeness even if not true
             }
-        }
+            if (localUsedCandidate && remoteUsedCandidate) {
+                if (pad->session()->role() == Origin::Initiator) {
+                    // i'm initiator. see 2.4.4
+                    localUsedCandidate.setState(Candidate::Discarded);
+                    localUsedCandidate           = Candidate();
+                    remoteReportedCandidateError = true; // as a sign of completeness even if not true
+                } else {
+                    remoteUsedCandidate.setState(Candidate::Discarded);
+                    remoteUsedCandidate         = Candidate();
+                    localReportedCandidateError = true; // as a sign of completeness even if not true
+                }
+            }
 
-        // now check and reset NewCandidate pending action
-        bool haveNewCandidates = false;
-        for (auto &c: remoteCandidates) {
-            if (c.state() == Candidate::New) {
-                haveNewCandidates = true;
-                break;
+            // now check and reset NewCandidate pending action
+            bool haveNewCandidates = false;
+            for (auto &c : remoteCandidates) {
+                if (c.state() == Candidate::New) {
+                    haveNewCandidates = true;
+                    break;
+                }
+            }
+            if (!haveNewCandidates) {
+                pendingActions &= ~NewCandidate;
             }
         }
-        if (!haveNewCandidates) {
-            pendingActions &= ~NewCandidate;
-        }
-    }
-
-    void onLocalServerDiscovered()
-    {
-        bool hasNewCandidates = false;
-        for (auto serv: disco->takeServers()) {
-            auto s5bserv = serv.staticCast<S5BServer>();
-            s5bserv->registerKey(directAddr);
-            Candidate c(q, serv, generateCid());
-            if (c.isValid() && !isDup(c) && c.priority()) {
-                QObject::connect(s5bserv.data(), &S5BServer::incomingConnection, q, [this, c](SocksClient *sc, const QString &key) mutable {
-                    if (!connection && key == directAddr && (c.state() == Candidate::Pending || c.state() == Candidate::Unacked)) {
-                        c.incomingConnection(sc);
-                        c.server().data()->disconnect(q); // drop this connection.
-                        if(mode == Transport::Udp)
-                            sc->grantUDPAssociate("", 0);
-                        else
-                            sc->grantConnect();
-                        return;
-                    }
 
-                    sc->requestDeny();
-                    sc->deleteLater();
-                });
-                QObject::connect(s5bserv.data(), &S5BServer::incomingUdp, q, [this, c](bool isInit, const QHostAddress &addr, int sourcePort, const QString &key, const QByteArray &data){
-                    if (mode != Transport::Mode::Udp || !connection) {
-                        return false;
-                    }
+        void onLocalServerDiscovered()
+        {
+            bool hasNewCandidates = false;
+            for (auto serv : disco->takeServers()) {
+                auto s5bserv = serv.staticCast<S5BServer>();
+                s5bserv->registerKey(directAddr);
+                Candidate c(q, serv, generateCid());
+                if (c.isValid() && !isDup(c) && c.priority()) {
+                    QObject::connect(s5bserv.data(), &S5BServer::incomingConnection, q,
+                                     [this, c](SocksClient *sc, const QString &key) mutable {
+                                         if (!connection && key == directAddr
+                                             && (c.state() == Candidate::Pending || c.state() == Candidate::Unacked)) {
+                                             c.incomingConnection(sc);
+                                             c.server().data()->disconnect(q); // drop this connection.
+                                             if (mode == Transport::Udp)
+                                                 sc->grantUDPAssociate("", 0);
+                                             else
+                                                 sc->grantConnect();
+                                             return;
+                                         }
+
+                                         sc->requestDeny();
+                                         sc->deleteLater();
+                                     });
+                    QObject::connect(
+                        s5bserv.data(), &S5BServer::incomingUdp, q,
+                        [this, c](bool isInit, const QHostAddress &addr, int sourcePort, const QString &key,
+                                  const QByteArray &data) {
+                            if (mode != Transport::Mode::Udp || !connection) {
+                                return false;
+                            }
 
-                    if(isInit) {
-                        // TODO probably we could create a Connection here and put all the params inside
-                        if(udpInitialized)
-                            return false; // only init once
+                            if (isInit) {
+                                // TODO probably we could create a Connection here and put all the params inside
+                                if (udpInitialized)
+                                    return false; // only init once
 
-                        // lock on to this sender
-                        udpAddress = addr;
-                        udpPort = sourcePort;
-                        udpInitialized = true;
+                                // lock on to this sender
+                                udpAddress     = addr;
+                                udpPort        = sourcePort;
+                                udpInitialized = true;
 
-                        // reply that initialization was successful
-                        pad->session()->manager()->client()->s5bManager()->jtPush()->sendUDPSuccess(pad->session()->peer(), key); // TODO fix ->->->
-                        return true;
-                    }
+                                // reply that initialization was successful
+                                pad->session()->manager()->client()->s5bManager()->jtPush()->sendUDPSuccess(
+                                    pad->session()->peer(), key); // TODO fix ->->->
+                                return true;
+                            }
 
-                    // not initialized yet?  something went wrong
-                    if(!udpInitialized)
-                        return false;
+                            // not initialized yet?  something went wrong
+                            if (!udpInitialized)
+                                return false;
 
-                    // must come from same source as when initialized
-                    if(addr != udpAddress || sourcePort != udpPort)
-                        return false;
+                            // must come from same source as when initialized
+                            if (addr != udpAddress || sourcePort != udpPort)
+                                return false;
 
-                    connection->enqueueIncomingUDP(data); // man_udpReady
-                    return true;
-                });
-                localCandidates.insert(c.cid(), c);
-                pendingActions |= NewCandidate;
-                hasNewCandidates = true;
+                            connection->enqueueIncomingUDP(data); // man_udpReady
+                            return true;
+                        });
+                    localCandidates.insert(c.cid(), c);
+                    pendingActions |= NewCandidate;
+                    hasNewCandidates = true;
+                }
+            }
+            if (hasNewCandidates) {
+                emit q->updated();
             }
         }
-        if (hasNewCandidates) {
-            emit q->updated();
-        }
-    }
 
-    void handleConnected(Candidate &connCand)
-    {
-        connection.reset(new Connection(connCand.takeSocksClient(), mode));
-        probingTimer.stop();
-        for (auto &rc: remoteCandidates) {
-            if (rc != connCand && rc.state() == Candidate::Probing) {
-                rc.deleteSocksClient();
+        void handleConnected(Candidate &connCand)
+        {
+            connection.reset(new Connection(connCand.takeSocksClient(), mode));
+            probingTimer.stop();
+            for (auto &rc : remoteCandidates) {
+                if (rc != connCand && rc.state() == Candidate::Probing) {
+                    rc.deleteSocksClient();
+                }
             }
+            QTimer::singleShot(0, q, [this]() {
+                localCandidates.clear();
+                remoteCandidates.clear();
+                emit q->connected();
+            });
         }
-        QTimer::singleShot(0, q, [this](){
-            localCandidates.clear();
-            remoteCandidates.clear();
-            emit q->connected();
+    };
+
+    Transport::Transport(const TransportManagerPad::Ptr &pad) : d(new Private)
+    {
+        d->q   = this;
+        d->pad = pad.staticCast<Pad>();
+        d->probingTimer.setSingleShot(true);
+        connect(&d->probingTimer, &QTimer::timeout, [this]() { d->tryConnectToRemoteCandidate(); });
+        connect(pad->manager(), &TransportManager::abortAllRequested, this, [this]() {
+            d->aborted = true;
+            emit failed();
         });
     }
-};
-
-Transport::Transport(const TransportManagerPad::Ptr &pad) :
-    d(new Private)
-{
-    d->q = this;
-    d->pad = pad.staticCast<Pad>();
-    d->probingTimer.setSingleShot(true);
-    connect(&d->probingTimer, &QTimer::timeout, [this](){ d->tryConnectToRemoteCandidate(); });
-    connect(pad->manager(), &TransportManager::abortAllRequested, this, [this](){
-        d->aborted = true;
-        emit failed();
-    });
-}
-
-Transport::Transport(const TransportManagerPad::Ptr &pad, const QDomElement &transportEl) :
-    Transport::Transport(pad)
-{
-    d->meCreator = false;
-    d->sid = transportEl.attribute(QStringLiteral("sid"));
-    if (d->sid.isEmpty() || !update(transportEl)) {
-        d.reset();
-        return;
-    }
-}
-
-Transport::~Transport()
-{
-    if (d) {
-        // TODO unregister sid too
-        static_cast<Manager*>(d->pad->manager())->removeKeyMapping(d->directAddr);
-        for (auto &c: d->remoteCandidates) {
-            c.deleteSocksClient();
+
+    Transport::Transport(const TransportManagerPad::Ptr &pad, const QDomElement &transportEl) :
+        Transport::Transport(pad)
+    {
+        d->meCreator = false;
+        d->sid       = transportEl.attribute(QStringLiteral("sid"));
+        if (d->sid.isEmpty() || !update(transportEl)) {
+            d.reset();
+            return;
         }
-        for (auto &c: d->remoteCandidates) {
-            auto srv = c.server();
-            if (srv) {
-                srv.staticCast<S5BServer>()->unregisterKey(d->directAddr);
+    }
+
+    Transport::~Transport()
+    {
+        if (d) {
+            // TODO unregister sid too
+            static_cast<Manager *>(d->pad->manager())->removeKeyMapping(d->directAddr);
+            for (auto &c : d->remoteCandidates) {
+                c.deleteSocksClient();
+            }
+            for (auto &c : d->remoteCandidates) {
+                auto srv = c.server();
+                if (srv) {
+                    srv.staticCast<S5BServer>()->unregisterKey(d->directAddr);
+                }
             }
         }
     }
-}
-
-TransportManagerPad::Ptr Transport::pad() const
-{
-    return d->pad.staticCast<TransportManagerPad>();
-}
-
-void Transport::prepare()
-{
-    auto m = static_cast<Manager*>(d->pad->manager());
-    if (d->meCreator) {
-        d->sid = d->pad->generateSid();
-    }
-    d->pad->registerSid(d->sid);
-    d->directAddr = makeKey(d->sid, d->pad->session()->initiator(), d->pad->session()->responder());
-    m->addKeyMapping(d->directAddr, this);
 
-    auto scope = d->pad->discoScope();
-    d->disco = scope->disco(); // FIXME store and handle signale. delete when not needed
+    TransportManagerPad::Ptr Transport::pad() const { return d->pad.staticCast<TransportManagerPad>(); }
 
-    connect(d->disco, &TcpPortDiscoverer::portAvailable, this, [this](){
-        d->onLocalServerDiscovered();
-    });
-    d->onLocalServerDiscovered();
-
-    d->discoS5BProxy();
-
-    emit updated();
-}
-
-// we got content acceptance from any side and not can connect
-void Transport::start()
-{
-    d->transportStarted = true;
-    d->tryConnectToRemoteCandidate();
-    // if there is no higher priority candidates than ours but they are already connected then
-    d->checkAndFinishNegotiation();
-}
-
-bool Transport::update(const QDomElement &transportEl)
-{
-    // we can just on type of elements in transport-info
-    // so return as soon as any type handled. Though it leaves a room for  remote to send invalid transport-info
-    auto bs = transportEl.attribute(QString::fromLatin1("block-size"));
-    if (!bs.isEmpty()) {
-        size_t bsn = bs.toULongLong();
-        if (bsn && bsn <= d->blockSize) {
-            d->blockSize = bsn;
-        }
-    }
-    auto dstaddr = transportEl.attribute(QStringLiteral("dstaddr"));
-    if (!dstaddr.isEmpty()) {
-        d->dstaddr = dstaddr;
-    }
-    QString candidateTag(QStringLiteral("candidate"));
-    int candidatesAdded = 0;
-    for(QDomElement ce = transportEl.firstChildElement(candidateTag);
-        !ce.isNull(); ce = ce.nextSiblingElement(candidateTag)) {
-        Candidate c(this, ce);
-        if (!c) {
-            return false;
+    void Transport::prepare()
+    {
+        auto m = static_cast<Manager *>(d->pad->manager());
+        if (d->meCreator) {
+            d->sid = d->pad->generateSid();
         }
-        d->remoteCandidates.insert(c.cid(), c); // TODO check for collisions!
-        candidatesAdded++;
+        d->pad->registerSid(d->sid);
+        d->directAddr = makeKey(d->sid, d->pad->session()->initiator(), d->pad->session()->responder());
+        m->addKeyMapping(d->directAddr, this);
+
+        auto scope = d->pad->discoScope();
+        d->disco   = scope->disco(); // FIXME store and handle signale. delete when not needed
+
+        connect(d->disco, &TcpPortDiscoverer::portAvailable, this, [this]() { d->onLocalServerDiscovered(); });
+        d->onLocalServerDiscovered();
+
+        d->discoS5BProxy();
+
+        emit updated();
     }
-    if (candidatesAdded) {
-        d->pendingActions &= ~Private::CandidateError;
-        d->localReportedCandidateError = false;
-        QTimer::singleShot(0, this, [this](){
-            d->tryConnectToRemoteCandidate();
-        });
-        return true;
+
+    // we got content acceptance from any side and not can connect
+    void Transport::start()
+    {
+        d->transportStarted = true;
+        d->tryConnectToRemoteCandidate();
+        // if there is no higher priority candidates than ours but they are already connected then
+        d->checkAndFinishNegotiation();
     }
 
-    QDomElement el = transportEl.firstChildElement(QStringLiteral("candidate-used"));
-    if (!el.isNull()) {
-        auto cUsed = d->localCandidates.value(el.attribute(QStringLiteral("cid")));
-        if (!cUsed) {
-            return false;
+    bool Transport::update(const QDomElement &transportEl)
+    {
+        // we can just on type of elements in transport-info
+        // so return as soon as any type handled. Though it leaves a room for  remote to send invalid transport-info
+        auto bs = transportEl.attribute(QString::fromLatin1("block-size"));
+        if (!bs.isEmpty()) {
+            size_t bsn = bs.toULongLong();
+            if (bsn && bsn <= d->blockSize) {
+                d->blockSize = bsn;
+            }
         }
-        if (cUsed.state() == Candidate::Pending) {
-            cUsed.setState(Candidate::Accepted);
-            d->localUsedCandidate = cUsed;
-            d->updateMinimalPriority();
-            QTimer::singleShot(0, this, [this](){ d->checkAndFinishNegotiation(); });
-        } else {
-            //seems like we already rejected the candidate and either remote side already know about it or will soon
-            d->localUsedCandidate = Candidate();
-            d->remoteReportedCandidateError = true; // as a sign remote has finished
+        auto dstaddr = transportEl.attribute(QStringLiteral("dstaddr"));
+        if (!dstaddr.isEmpty()) {
+            d->dstaddr = dstaddr;
         }
-        return true;
-    }
-
-    el = transportEl.firstChildElement(QStringLiteral("candidate-error"));
-    if (!el.isNull()) {
-        d->remoteReportedCandidateError = true;
-        for (auto &c: d->localCandidates) {
-            if (c.state() == Candidate::Pending) {
-                c.setState(Candidate::Discarded);
+        QString candidateTag(QStringLiteral("candidate"));
+        int     candidatesAdded = 0;
+        for (QDomElement ce = transportEl.firstChildElement(candidateTag); !ce.isNull();
+             ce             = ce.nextSiblingElement(candidateTag)) {
+            Candidate c(this, ce);
+            if (!c) {
+                return false;
             }
+            d->remoteCandidates.insert(c.cid(), c); // TODO check for collisions!
+            candidatesAdded++;
         }
-        qDebug("recv candidate-error: all local pending candidates were discarded");
-        QTimer::singleShot(0, this, [this](){ d->checkAndFinishNegotiation(); });
-        return true;
-    }
-
-    el = transportEl.firstChildElement(QStringLiteral("activated"));
-    if (!el.isNull()) {
-        QString cid = el.attribute(QStringLiteral("cid"));
-        if (cid.isEmpty()) {
-            return false;
+        if (candidatesAdded) {
+            d->pendingActions &= ~Private::CandidateError;
+            d->localReportedCandidateError = false;
+            QTimer::singleShot(0, this, [this]() { d->tryConnectToRemoteCandidate(); });
+            return true;
         }
-        auto c = d->remoteUsedCandidate;
-        if (!(c.cid() == cid && c.type() == Candidate::Proxy && c.state() == Candidate::Accepted)) {
-            qDebug("Received <activated> on a candidate in an inappropriate state. Ignored.");
+
+        QDomElement el = transportEl.firstChildElement(QStringLiteral("candidate-used"));
+        if (!el.isNull()) {
+            auto cUsed = d->localCandidates.value(el.attribute(QStringLiteral("cid")));
+            if (!cUsed) {
+                return false;
+            }
+            if (cUsed.state() == Candidate::Pending) {
+                cUsed.setState(Candidate::Accepted);
+                d->localUsedCandidate = cUsed;
+                d->updateMinimalPriority();
+                QTimer::singleShot(0, this, [this]() { d->checkAndFinishNegotiation(); });
+            } else {
+                // seems like we already rejected the candidate and either remote side already know about it or will
+                // soon
+                d->localUsedCandidate           = Candidate();
+                d->remoteReportedCandidateError = true; // as a sign remote has finished
+            }
             return true;
         }
-        c.setState(Candidate::Active);
-        d->handleConnected(c);
-        return true;
-    }
 
-    el = transportEl.firstChildElement(QStringLiteral("proxy-error"));
-    if (!el.isNull()) {
-        auto c = d->localCandidates.value(el.attribute(QStringLiteral("cid")));
-        if (!c) {
-            return false;
+        el = transportEl.firstChildElement(QStringLiteral("candidate-error"));
+        if (!el.isNull()) {
+            d->remoteReportedCandidateError = true;
+            for (auto &c : d->localCandidates) {
+                if (c.state() == Candidate::Pending) {
+                    c.setState(Candidate::Discarded);
+                }
+            }
+            qDebug("recv candidate-error: all local pending candidates were discarded");
+            QTimer::singleShot(0, this, [this]() { d->checkAndFinishNegotiation(); });
+            return true;
         }
-        if (c != d->localUsedCandidate || c.state() != Candidate::Accepted) {
-            qDebug("Received <proxy-error> on a candidate in an inappropriate state. Ignored.");
+
+        el = transportEl.firstChildElement(QStringLiteral("activated"));
+        if (!el.isNull()) {
+            QString cid = el.attribute(QStringLiteral("cid"));
+            if (cid.isEmpty()) {
+                return false;
+            }
+            auto c = d->remoteUsedCandidate;
+            if (!(c.cid() == cid && c.type() == Candidate::Proxy && c.state() == Candidate::Accepted)) {
+                qDebug("Received <activated> on a candidate in an inappropriate state. Ignored.");
+                return true;
+            }
+            c.setState(Candidate::Active);
+            d->handleConnected(c);
             return true;
         }
 
-        // if we got proxy-error then the transport has to be considered failed according to spec
-        // so never send proxy-error while we have unaknowledged local non-proxy candidates,
-        // but we have to follow the standard.
+        el = transportEl.firstChildElement(QStringLiteral("proxy-error"));
+        if (!el.isNull()) {
+            auto c = d->localCandidates.value(el.attribute(QStringLiteral("cid")));
+            if (!c) {
+                return false;
+            }
+            if (c != d->localUsedCandidate || c.state() != Candidate::Accepted) {
+                qDebug("Received <proxy-error> on a candidate in an inappropriate state. Ignored.");
+                return true;
+            }
 
-        // Discard everything
-        for (auto &c: d->localCandidates) {
-            c.setState(Candidate::Discarded);
-        }
-        for (auto &c: d->remoteCandidates) {
-            c.setState(Candidate::Discarded);
+            // if we got proxy-error then the transport has to be considered failed according to spec
+            // so never send proxy-error while we have unaknowledged local non-proxy candidates,
+            // but we have to follow the standard.
+
+            // Discard everything
+            for (auto &c : d->localCandidates) {
+                c.setState(Candidate::Discarded);
+            }
+            for (auto &c : d->remoteCandidates) {
+                c.setState(Candidate::Discarded);
+            }
+            d->proxyDiscoveryInProgress = false;
+            delete d->disco;
+
+            QTimer::singleShot(0, this, [this]() { emit failed(); });
+            return true;
         }
-        d->proxyDiscoveryInProgress = false;
-        delete d->disco;
 
-        QTimer::singleShot(0, this, [this](){ emit failed(); });
+        // Seems like we got an empty transport. It's still valid though.
+        QTimer::singleShot(0, this, [this]() { d->checkAndFinishNegotiation(); });
+
         return true;
     }
 
-    // Seems like we got an empty transport. It's still valid though.
-    QTimer::singleShot(0, this, [this](){ d->checkAndFinishNegotiation(); });
-
-    return true;
-}
+    bool Transport::isInitialOfferReady() const
+    {
+        return isValid()
+            && (d->pendingActions || d->offerSent
+                || (d->localCandidates.isEmpty() && !d->proxyDiscoveryInProgress
+                    && !(d->disco && d->disco->inProgressPortTypes())));
+    }
 
-bool Transport::isInitialOfferReady() const
-{
-    return isValid() && (d->pendingActions || d->offerSent ||
-                         (d->localCandidates.isEmpty() && !d->proxyDiscoveryInProgress &&
-                          !(d->disco && d->disco->inProgressPortTypes())));
-}
+    OutgoingTransportInfoUpdate Transport::takeInitialOffer()
+    {
+        d->offerSent = true;
+        auto upd     = takeOutgoingUpdate();
+        auto tel     = std::get<0>(upd);
 
-OutgoingTransportInfoUpdate Transport::takeInitialOffer()
-{
-    d->offerSent = true;
-    auto upd = takeOutgoingUpdate();
-    auto tel = std::get<0>(upd);
+        if (d->meCreator && d->mode != Tcp) {
+            tel.setAttribute(QStringLiteral("mode"), "udp");
+        }
+        tel.setAttribute(QString::fromLatin1("block-size"), qulonglong(d->blockSize));
 
-    if (d->meCreator && d->mode != Tcp) {
-        tel.setAttribute(QStringLiteral("mode"), "udp");
+        return upd;
     }
-    tel.setAttribute(QString::fromLatin1("block-size"), qulonglong(d->blockSize));
 
-    return upd;
-}
+    bool Transport::hasUpdates() const { return isValid() && d->pendingActions; }
 
-bool Transport::hasUpdates() const
-{
-    return isValid() && d->pendingActions;
-}
+    OutgoingTransportInfoUpdate Transport::takeOutgoingUpdate()
+    {
+        OutgoingTransportInfoUpdate upd;
+        if (!isValid()) {
+            return upd;
+        }
 
-OutgoingTransportInfoUpdate Transport::takeOutgoingUpdate()
-{
-    OutgoingTransportInfoUpdate upd;
-    if (!isValid()) {
-        return upd;
-    }
+        auto doc = d->pad->session()->manager()->client()->doc();
 
-    auto doc = d->pad->session()->manager()->client()->doc();
+        QDomElement tel = doc->createElementNS(NS, "transport");
+        tel.setAttribute(QStringLiteral("sid"), d->sid);
 
-    QDomElement tel = doc->createElementNS(NS, "transport");
-    tel.setAttribute(QStringLiteral("sid"), d->sid);
+        if (d->pendingActions & Private::NewCandidate) {
+            d->pendingActions &= ~Private::NewCandidate;
+            bool             useProxy = false;
+            QList<Candidate> candidatesToSend;
+            for (auto &c : d->localCandidates) {
+                if (c.state() != Candidate::New) {
+                    continue;
+                }
+                if (c.type() == Candidate::Proxy) {
+                    useProxy = true;
+                }
+                tel.appendChild(c.toXml(doc));
+                candidatesToSend.append(c);
+                c.setState(Candidate::Unacked);
+            }
+            if (useProxy) {
+                QString dstaddr = makeKey(d->sid, d->pad->session()->me(), d->pad->session()->peer());
+                tel.setAttribute(QStringLiteral("dstaddr"), dstaddr);
+            }
+            if (!candidatesToSend.isEmpty()) {
+                d->waitingAck = true;
+                upd           = OutgoingTransportInfoUpdate { tel, [this, candidatesToSend]() mutable {
+                                                       d->waitingAck= false;
+                                                       for (auto &c : candidatesToSend) {
+                                                           if (c.state() == Candidate::Unacked) {
+                                                               c.setState(Candidate::Pending);
+                                                           }
+                                                       }
+                                                       d->checkAndFinishNegotiation();
+                                                   } };
+            } else {
+                qWarning("Got NewCandidate pending action but no candidate to send");
+            }
+        } else if (d->pendingActions & Private::CandidateUsed) {
+            d->pendingActions &= ~Private::CandidateUsed;
+            // we should have the only remote candidate in Pending state.
+            // all other has to be discarded by priority check
+            for (auto &c : d->remoteCandidates) {
+                if (c.state() != Candidate::Pending) {
+                    continue;
+                }
+                auto el = tel.appendChild(doc->createElement(QStringLiteral("candidate-used"))).toElement();
+                el.setAttribute(QStringLiteral("cid"), c.cid());
+                c.setState(Candidate::Unacked);
+
+                d->waitingAck = true;
+                upd           = OutgoingTransportInfoUpdate { tel, [this, c]() mutable {
+                                                       d->waitingAck= false;
+                                                       if (c.state() == Candidate::Unacked) {
+                                                           c.setState(Candidate::Accepted);
+                                                           d->remoteUsedCandidate = c;
+                                                       }
+                                                       d->checkAndFinishNegotiation();
+                                                   } };
 
-    if (d->pendingActions & Private::NewCandidate) {
-        d->pendingActions &= ~Private::NewCandidate;
-        bool useProxy = false;
-        QList<Candidate> candidatesToSend;
-        for (auto &c: d->localCandidates) {
-            if (c.state() != Candidate::New) {
-                continue;
+                break;
             }
-            if (c.type() == Candidate::Proxy) {
-                useProxy = true;
+            if (std::get<0>(upd).isNull()) {
+                qWarning("Got CandidateUsed pending action but no pending candidates");
             }
-            tel.appendChild(c.toXml(doc));
-            candidatesToSend.append(c);
-            c.setState(Candidate::Unacked);
-        }
-        if (useProxy) {
-            QString dstaddr = makeKey(d->sid, d->pad->session()->me(), d->pad->session()->peer());
-            tel.setAttribute(QStringLiteral("dstaddr"), dstaddr);
-        }
-        if (!candidatesToSend.isEmpty()) {
+        } else if (d->pendingActions & Private::CandidateError) {
+            d->pendingActions &= ~Private::CandidateError;
+            // we are here because all remote are already in Discardd state
+            tel.appendChild(doc->createElement(QStringLiteral("candidate-error")));
             d->waitingAck = true;
-            upd = OutgoingTransportInfoUpdate{tel, [this, candidatesToSend]() mutable {
-                d->waitingAck = false;
-                for (auto &c: candidatesToSend) {
-                    if (c.state() == Candidate::Unacked) {
-                        c.setState(Candidate::Pending);
+            upd           = OutgoingTransportInfoUpdate { tel, [this]() mutable {
+                                                   d->waitingAck= false;
+                                                   d->localReportedCandidateError= true;
+                                                   d->checkAndFinishNegotiation();
+                                               } };
+        } else if (d->pendingActions & Private::Activated) {
+            d->pendingActions &= ~Private::Activated;
+            if (d->localUsedCandidate) {
+                auto cand = d->localUsedCandidate;
+                auto el   = tel.appendChild(doc->createElement(QStringLiteral("activated"))).toElement();
+                el.setAttribute(QStringLiteral("cid"), cand.cid());
+                d->waitingAck = true;
+                upd           = OutgoingTransportInfoUpdate { tel, [this, cand]() mutable { d->waitingAck = false; } };
+            }
+        } else if (d->pendingActions & Private::ProxyError) {
+            // we send proxy error only for local proxy
+            d->pendingActions &= ~Private::ProxyError;
+            if (d->localUsedCandidate) {
+                auto cand = d->localUsedCandidate;
+                tel.appendChild(doc->createElement(QStringLiteral("proxy-error")));
+                d->waitingAck = true;
+                upd           = OutgoingTransportInfoUpdate {
+                    tel,
+                    [this, cand]() mutable {
+                        d->waitingAck = false;
+                        if (cand.state() != Candidate::Accepted || d->localUsedCandidate != cand) {
+                            return; // seems like state was changed while we was waiting for an ack
+                        }
+                        cand.setState(Candidate::Discarded);
+                        d->localUsedCandidate = Candidate();
+                        emit failed();
                     }
-                }
-                d->checkAndFinishNegotiation();
-            }};
+                };
+            } else {
+                qWarning("Got ProxyError pending action but no local used candidate is not set");
+            }
         } else {
-            qWarning("Got NewCandidate pending action but no candidate to send");
+            d->waitingAck = true;
+            upd           = OutgoingTransportInfoUpdate { tel, [this]() mutable { d->waitingAck = false; } };
         }
-    } else if (d->pendingActions & Private::CandidateUsed) {
-        d->pendingActions &= ~Private::CandidateUsed;
-        // we should have the only remote candidate in Pending state.
-        // all other has to be discarded by priority check
-        for (auto &c: d->remoteCandidates) {
-            if (c.state() != Candidate::Pending) {
-                continue;
-            }
-            auto el = tel.appendChild(doc->createElement(QStringLiteral("candidate-used"))).toElement();
-            el.setAttribute(QStringLiteral("cid"), c.cid());
-            c.setState(Candidate::Unacked);
 
-            d->waitingAck = true;
-            upd = OutgoingTransportInfoUpdate{tel, [this, c]() mutable {
-                d->waitingAck = false;
-                if (c.state() == Candidate::Unacked) {
-                    c.setState(Candidate::Accepted);
-                    d->remoteUsedCandidate = c;
-                }
-                d->checkAndFinishNegotiation();
-            }};
+        return upd; // TODO
+    }
 
-            break;
-        }
-        if (std::get<0>(upd).isNull()) {
-            qWarning("Got CandidateUsed pending action but no pending candidates");
-        }
-    } else if (d->pendingActions & Private::CandidateError) {
-        d->pendingActions &= ~Private::CandidateError;
-        // we are here because all remote are already in Discardd state
-        tel.appendChild(doc->createElement(QStringLiteral("candidate-error")));
-        d->waitingAck = true;
-        upd = OutgoingTransportInfoUpdate{tel, [this]() mutable {
-            d->waitingAck = false;
-            d->localReportedCandidateError = true;
-            d->checkAndFinishNegotiation();
-        }};
-    } else if (d->pendingActions & Private::Activated) {
-        d->pendingActions &= ~Private::Activated;
-        if (d->localUsedCandidate) {
-            auto cand = d->localUsedCandidate;
-            auto el = tel.appendChild(doc->createElement(QStringLiteral("activated"))).toElement();
-            el.setAttribute(QStringLiteral("cid"), cand.cid());
-            d->waitingAck = true;
-            upd = OutgoingTransportInfoUpdate{tel, [this, cand]() mutable {
-                d->waitingAck = false;
-            }};
-        }
-    } else if (d->pendingActions & Private::ProxyError) {
-        // we send proxy error only for local proxy
-        d->pendingActions &= ~Private::ProxyError;
-        if (d->localUsedCandidate) {
-            auto cand = d->localUsedCandidate;
-            tel.appendChild(doc->createElement(QStringLiteral("proxy-error")));
-            d->waitingAck = true;
-            upd = OutgoingTransportInfoUpdate{tel, [this, cand]() mutable {
-                d->waitingAck = false;
-                if (cand.state() != Candidate::Accepted || d->localUsedCandidate != cand) {
-                    return; // seems like state was changed while we was waiting for an ack
-                }
-                cand.setState(Candidate::Discarded);
-                d->localUsedCandidate = Candidate();
-                emit failed();
-            }};
-        } else {
-            qWarning("Got ProxyError pending action but no local used candidate is not set");
-        }
-    } else {
-        d->waitingAck = true;
-        upd = OutgoingTransportInfoUpdate{tel, [this]() mutable {
-            d->waitingAck = false;
-        }};
+    bool Transport::isValid() const { return d != nullptr; }
+
+    Transport::Features Transport::features() const { return Features(HardToConnect | Reliable | Fast); }
+
+    QString Transport::sid() const { return d->sid; }
+
+    QString Transport::directAddr() const { return d->directAddr; }
+
+    Connection::Ptr Transport::connection() const { return d->connection.staticCast<XMPP::Jingle::Connection>(); }
+
+    //----------------------------------------------------------------
+    // Manager
+    //----------------------------------------------------------------
+
+    class Manager::Private {
+    public:
+        XMPP::Jingle::Manager *jingleManager = nullptr;
+
+        // FIMME it's reuiqred to split transports by direction otherwise we gonna hit conflicts.
+        // jid,transport-sid -> transport mapping
+        QSet<QPair<Jid, QString>>   sids;
+        QHash<QString, Transport *> key2transport;
+        Jid                         proxy;
+    };
+
+    Manager::Manager(QObject *parent) : TransportManager(parent), d(new Private) {}
+
+    Manager::~Manager()
+    {
+        if (d->jingleManager)
+            d->jingleManager->unregisterTransport(NS);
     }
 
-    return upd; // TODO
-}
-
-bool Transport::isValid() const
-{
-    return d != nullptr;
-}
-
-Transport::Features Transport::features() const
-{
-    return Features(HardToConnect | Reliable | Fast);
-}
-
-QString Transport::sid() const
-{
-    return d->sid;
-}
-
-QString Transport::directAddr() const
-{
-    return d->directAddr;
-}
-
-Connection::Ptr Transport::connection() const
-{
-    return d->connection.staticCast<XMPP::Jingle::Connection>();
-}
-
-//----------------------------------------------------------------
-// Manager
-//----------------------------------------------------------------
-
-class Manager::Private
-{
-public:
-    XMPP::Jingle::Manager *jingleManager = nullptr;
-
-    // FIMME it's reuiqred to split transports by direction otherwise we gonna hit conflicts.
-    // jid,transport-sid -> transport mapping
-    QSet<QPair<Jid,QString>> sids;
-    QHash<QString,Transport*> key2transport;
-    Jid proxy;
-};
-
-Manager::Manager(QObject *parent) :
-    TransportManager(parent),
-    d(new Private)
-{
-
-}
-
-Manager::~Manager()
-{
-    if (d->jingleManager)
-        d->jingleManager->unregisterTransport(NS);
-}
-
-Transport::Features Manager::features() const
-{
-    return Transport::Reliable | Transport::Fast;
-}
-
-void Manager::setJingleManager(XMPP::Jingle::Manager *jm)
-{
-    d->jingleManager = jm;
-    if (!jm)
-        return;
-    // ensure S5BManager is initialized
-    QTimer::singleShot(0, this, [this](){
-        if (!d->jingleManager) // unregistered that early?
+    Transport::Features Manager::features() const { return Transport::Reliable | Transport::Fast; }
+
+    void Manager::setJingleManager(XMPP::Jingle::Manager *jm)
+    {
+        d->jingleManager = jm;
+        if (!jm)
             return;
-        auto jt = d->jingleManager->client()->s5bManager()->jtPush();
-        connect(jt, &JT_PushS5B::incomingUDPSuccess, this, [this](const Jid &from, const QString &dstaddr) {
-            Q_UNUSED(from);
-            auto t = d->key2transport.value(dstaddr);
-            if (t) {
-                // TODO return t->incomingUDPSuccess(from);
-            }
+        // ensure S5BManager is initialized
+        QTimer::singleShot(0, this, [this]() {
+            if (!d->jingleManager) // unregistered that early?
+                return;
+            auto jt = d->jingleManager->client()->s5bManager()->jtPush();
+            connect(jt, &JT_PushS5B::incomingUDPSuccess, this, [this](const Jid &from, const QString &dstaddr) {
+                Q_UNUSED(from);
+                auto t = d->key2transport.value(dstaddr);
+                if (t) {
+                    // TODO return t->incomingUDPSuccess(from);
+                }
+            });
         });
-    });
-}
-
-QSharedPointer<XMPP::Jingle::Transport> Manager::newTransport(const TransportManagerPad::Ptr &pad)
-{
-    return QSharedPointer<XMPP::Jingle::Transport>(new Transport(pad));
-}
-
-QSharedPointer<XMPP::Jingle::Transport> Manager::newTransport(const TransportManagerPad::Ptr &pad, const QDomElement &transportEl)
-{
-    auto t = new Transport(pad, transportEl);
-    QSharedPointer<XMPP::Jingle::Transport> ret(t);
-    if (t->isValid()) {
-        return ret;
     }
-    return QSharedPointer<XMPP::Jingle::Transport>();
-}
-
-TransportManagerPad* Manager::pad(Session *session)
-{
-    return new Pad(this, session);
-}
-
-void Manager::closeAll()
-{
-    emit abortAllRequested();
-}
-
-void Manager::addKeyMapping(const QString &key, Transport *transport)
-{
-    d->key2transport.insert(key, transport);
-}
-
-void Manager::removeKeyMapping(const QString &key)
-{
-    d->key2transport.remove(key);
-}
-
-QString Manager::generateSid(const Jid &remote)
-{
-    auto servers = d->jingleManager->client()->tcpPortReserver()->
-            scope(QString::fromLatin1("s5b"))->allServers();
-    QString sid;
-    QPair<Jid,QString> key;
-    QString key1;
-    QString key2;
-    auto servChecker = [&](const TcpPortServer::Ptr &s){
-        return s.staticCast<S5BServer>()->hasKey(key1) || s.staticCast<S5BServer>()->hasKey(key2);
-    };
 
-    do {
-        sid = QString("s5b_%1").arg(qrand() & 0xffff, 4, 16, QChar('0'));
-        key = qMakePair(remote, sid);
-        key1 = makeKey(sid, remote, d->jingleManager->client()->jid());
-        key2 = makeKey(sid, d->jingleManager->client()->jid(), remote);
-    } while (d->sids.contains(key) || std::find_if(servers.begin(), servers.end(), servChecker) != servers.end());
-    return sid;
-}
-
-void Manager::registerSid(const Jid &remote, const QString &sid)
-{
-    d->sids.insert(qMakePair(remote, sid));
-}
-
-Jid Manager::userProxy() const
-{
-    return d->proxy;
-}
-
-void Manager::setUserProxy(const Jid &jid)
-{
-    d->proxy = jid;
-}
-
-//----------------------------------------------------------------
-// Pad
-//----------------------------------------------------------------
-Pad::Pad(Manager *manager, Session *session) :
-    _manager(manager),
-    _session(session)
-{
-    auto reserver = _session->manager()->client()->tcpPortReserver();
-    _discoScope = reserver->scope(QString::fromLatin1("s5b"));
-}
-
-QString Pad::ns() const
-{
-    return NS;
-}
-
-Session *Pad::session() const
-{
-    return _session;
-}
-
-TransportManager *Pad::manager() const
-{
-    return _manager;
-}
-
-QString Pad::generateSid() const
-{
-    return _manager->generateSid(_session->peer());
-}
-
-void Pad::registerSid(const QString &sid)
-{
-    return _manager->registerSid(_session->peer(), sid);
-}
+    QSharedPointer<XMPP::Jingle::Transport> Manager::newTransport(const TransportManagerPad::Ptr &pad)
+    {
+        return QSharedPointer<XMPP::Jingle::Transport>(new Transport(pad));
+    }
+
+    QSharedPointer<XMPP::Jingle::Transport> Manager::newTransport(const TransportManagerPad::Ptr &pad,
+                                                                  const QDomElement &             transportEl)
+    {
+        auto                                    t = new Transport(pad, transportEl);
+        QSharedPointer<XMPP::Jingle::Transport> ret(t);
+        if (t->isValid()) {
+            return ret;
+        }
+        return QSharedPointer<XMPP::Jingle::Transport>();
+    }
+
+    TransportManagerPad *Manager::pad(Session *session) { return new Pad(this, session); }
+
+    void Manager::closeAll() { emit abortAllRequested(); }
+
+    void Manager::addKeyMapping(const QString &key, Transport *transport) { d->key2transport.insert(key, transport); }
+
+    void Manager::removeKeyMapping(const QString &key) { d->key2transport.remove(key); }
+
+    QString Manager::generateSid(const Jid &remote)
+    {
+        auto servers = d->jingleManager->client()->tcpPortReserver()->scope(QString::fromLatin1("s5b"))->allServers();
+        QString             sid;
+        QPair<Jid, QString> key;
+        QString             key1;
+        QString             key2;
+        auto                servChecker = [&](const TcpPortServer::Ptr &s) {
+            return s.staticCast<S5BServer>()->hasKey(key1) || s.staticCast<S5BServer>()->hasKey(key2);
+        };
+
+        do {
+            sid  = QString("s5b_%1").arg(qrand() & 0xffff, 4, 16, QChar('0'));
+            key  = qMakePair(remote, sid);
+            key1 = makeKey(sid, remote, d->jingleManager->client()->jid());
+            key2 = makeKey(sid, d->jingleManager->client()->jid(), remote);
+        } while (d->sids.contains(key) || std::find_if(servers.begin(), servers.end(), servChecker) != servers.end());
+        return sid;
+    }
+
+    void Manager::registerSid(const Jid &remote, const QString &sid) { d->sids.insert(qMakePair(remote, sid)); }
+
+    Jid Manager::userProxy() const { return d->proxy; }
+
+    void Manager::setUserProxy(const Jid &jid) { d->proxy = jid; }
+
+    //----------------------------------------------------------------
+    // Pad
+    //----------------------------------------------------------------
+    Pad::Pad(Manager *manager, Session *session) : _manager(manager), _session(session)
+    {
+        auto reserver = _session->manager()->client()->tcpPortReserver();
+        _discoScope   = reserver->scope(QString::fromLatin1("s5b"));
+    }
+
+    QString Pad::ns() const { return NS; }
+
+    Session *Pad::session() const { return _session; }
+
+    TransportManager *Pad::manager() const { return _manager; }
+
+    QString Pad::generateSid() const { return _manager->generateSid(_session->peer()); }
+
+    void Pad::registerSid(const QString &sid) { return _manager->registerSid(_session->peer(), sid); }
 } // namespace S5B
 } // namespace Jingle
 } // namespace XMPP
diff --git a/src/xmpp/xmpp-im/jingle-s5b.h b/src/xmpp/xmpp-im/jingle-s5b.h
index dffed154..e89e47c6 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.h
+++ b/src/xmpp/xmpp-im/jingle-s5b.h
@@ -29,192 +29,188 @@ class SocksClient;
 namespace XMPP {
 class Client;
 
-namespace Jingle {
-namespace S5B {
-extern const QString NS;
-
-class Transport;
-
-class Candidate {
-public:
-    enum Type {
-        None, // non standard, just a default
-        Proxy,
-        Tunnel,
-        Assisted,
-        Direct
+namespace Jingle { namespace S5B {
+    extern const QString NS;
+
+    class Transport;
+
+    class Candidate {
+    public:
+        enum Type {
+            None, // non standard, just a default
+            Proxy,
+            Tunnel,
+            Assisted,
+            Direct
+        };
+
+        enum { ProxyPreference = 10, TunnelPreference = 110, AssistedPreference = 120, DirectPreference = 126 };
+
+        /**
+         * Local candidates states:
+         *   Probing      - potential candidate but no ip:port yet. upnp for example
+         *   New          - candidate is ready to be sent to remote
+         *   Unacked      - candidate is sent to remote but no iq ack yet
+         *   Pending      - canidate sent to remote. we have iq ack but no "used" or "error"
+         *   Accepted     - we got "candidate-used" for this candidate
+         *   Active       - use this candidate for actual data transfer
+         *   Discarded    - we got "candidate-error" so all pending were marked Discarded
+         *
+         * Remote candidates states:
+         *   New          - the candidate waits its turn to start connection probing
+         *   Probing      - connection probing
+         *   Pending      - connection was successful, but we didn't send candidate-used to remote
+         *   Unacked      - connection was successful and we sent candidate-used to remote but no iq ack yet
+         *   Accepted     - we sent candidate-used and got iq ack
+         *   Active       - use this candidate for actual data transfer
+         *   Discarded    - failed to connect to all remote candidates
+         */
+        enum State {
+            New,
+            Probing,
+            Pending,
+            Unacked,
+            Accepted,
+            Active,
+            Discarded,
+        };
+
+        Candidate();
+        Candidate(Transport *transport, const QDomElement &el);
+        Candidate(const Candidate &other);
+        Candidate(Transport *transport, const Jid &proxy, const QString &cid, quint16 localPreference = 0);
+        Candidate(Transport *transport, const TcpPortServer::Ptr &server, const QString &cid,
+                  quint16 localPreference = 0);
+        ~Candidate();
+        Candidate &        operator=(const Candidate &other) = default;
+        inline bool        isValid() const { return d != nullptr; }
+        inline             operator bool() const { return isValid(); }
+        Type               type() const;
+        QString            cid() const;
+        Jid                jid() const;
+        QString            host() const;
+        void               setHost(const QString &host);
+        quint16            port() const;
+        void               setPort(quint16 port);
+        quint16            localPort() const;
+        QHostAddress       localAddress() const;
+        State              state() const;
+        void               setState(State s);
+        static const char *stateText(State s);
+        quint32            priority() const;
+
+        QDomElement toXml(QDomDocument *doc) const;
+
+        void               connectToHost(const QString &key, State successState, QObject *callbackContext,
+                                         std::function<void(bool)> callback, bool isUdp = false);
+        bool               incomingConnection(SocksClient *sc);
+        SocksClient *      takeSocksClient();
+        void               deleteSocksClient();
+        TcpPortServer::Ptr server() const;
+
+        bool        operator==(const Candidate &other) const;
+        inline bool operator!=(const Candidate &other) const { return !(*this == other); }
+
+    private:
+        class Private;
+        friend class Transport;
+        QExplicitlySharedDataPointer<Private> d;
     };
 
-    enum {
-        ProxyPreference = 10,
-        TunnelPreference = 110,
-        AssistedPreference = 120,
-        DirectPreference = 126
+    class Manager;
+    class Transport : public XMPP::Jingle::Transport {
+        Q_OBJECT
+    public:
+        enum Mode { Tcp, Udp };
+
+        Transport(const TransportManagerPad::Ptr &pad);
+        Transport(const TransportManagerPad::Ptr &pad, const QDomElement &transportEl);
+        ~Transport();
+
+        TransportManagerPad::Ptr pad() const override;
+
+        void                        prepare() override;
+        void                        start() override;
+        bool                        update(const QDomElement &transportEl) override;
+        bool                        isInitialOfferReady() const override;
+        OutgoingTransportInfoUpdate takeInitialOffer() override;
+        bool                        hasUpdates() const override;
+        OutgoingTransportInfoUpdate takeOutgoingUpdate() override;
+        bool                        isValid() const override;
+        Features                    features() const override;
+
+        QString         sid() const;
+        QString         directAddr() const;
+        Connection::Ptr connection() const override;
+
+    private:
+        friend class Manager;
+
+        class Private;
+        QScopedPointer<Private> d;
     };
 
-    /**
-     * Local candidates states:
-     *   Probing      - potential candidate but no ip:port yet. upnp for example
-     *   New          - candidate is ready to be sent to remote
-     *   Unacked      - candidate is sent to remote but no iq ack yet
-     *   Pending      - canidate sent to remote. we have iq ack but no "used" or "error"
-     *   Accepted     - we got "candidate-used" for this candidate
-     *   Active       - use this candidate for actual data transfer
-     *   Discarded    - we got "candidate-error" so all pending were marked Discarded
-     *
-     * Remote candidates states:
-     *   New          - the candidate waits its turn to start connection probing
-     *   Probing      - connection probing
-     *   Pending      - connection was successful, but we didn't send candidate-used to remote
-     *   Unacked      - connection was successful and we sent candidate-used to remote but no iq ack yet
-     *   Accepted     - we sent candidate-used and got iq ack
-     *   Active       - use this candidate for actual data transfer
-     *   Discarded    - failed to connect to all remote candidates
-     */
-    enum State {
-        New,
-        Probing,
-        Pending,
-        Unacked,
-        Accepted,
-        Active,
-        Discarded,
-    };
+    class Pad : public TransportManagerPad {
+        Q_OBJECT
+        // TODO
+    public:
+        typedef QSharedPointer<Pad> Ptr;
+
+        Pad(Manager *manager, Session *session);
+        QString           ns() const override;
+        Session *         session() const override;
+        TransportManager *manager() const override;
+
+        QString generateSid() const;
+        void    registerSid(const QString &sid);
 
-    Candidate();
-    Candidate(Transport *transport, const QDomElement &el);
-    Candidate(const Candidate &other);
-    Candidate(Transport *transport, const Jid &proxy, const QString &cid, quint16 localPreference = 0);
-    Candidate(Transport *transport, const TcpPortServer::Ptr &server, const QString &cid, quint16 localPreference = 0);
-    ~Candidate();
-    Candidate& operator=(const Candidate& other) = default;
-    inline bool isValid() const { return d != nullptr; }
-    inline operator bool() const { return isValid(); }
-    Type type() const;
-    QString cid() const;
-    Jid jid() const;
-    QString host() const;
-    void setHost(const QString &host);
-    quint16 port() const;
-    void setPort(quint16 port);
-    quint16 localPort() const;
-    QHostAddress localAddress() const;
-    State state() const;
-    void setState(State s);
-    static const char *stateText(State s);
-    quint32 priority() const;
-
-    QDomElement toXml(QDomDocument *doc) const;
-
-    void connectToHost(const QString &key, State successState, QObject *callbackContext, std::function<void (bool)> callback, bool isUdp = false);
-    bool incomingConnection(SocksClient *sc);
-    SocksClient* takeSocksClient();
-    void deleteSocksClient();
-    TcpPortServer::Ptr server() const;
-
-    bool operator==(const Candidate &other) const;
-    inline bool operator!=(const Candidate &other) const { return !(*this == other); }
-private:
-    class Private;
-    friend class Transport;
-    QExplicitlySharedDataPointer<Private> d;
-};
-
-class Manager;
-class Transport : public XMPP::Jingle::Transport
-{
-    Q_OBJECT
-public:
-    enum Mode {
-        Tcp,
-        Udp
+        inline TcpPortScope *discoScope() const { return _discoScope; }
+
+    private:
+        Manager *     _manager;
+        Session *     _session;
+        TcpPortScope *_discoScope;
     };
 
-    Transport(const TransportManagerPad::Ptr &pad);
-    Transport(const TransportManagerPad::Ptr &pad, const QDomElement &transportEl);
-    ~Transport();
-
-    TransportManagerPad::Ptr pad() const override;
-
-    void prepare() override;
-    void start() override;
-    bool update(const QDomElement &transportEl) override;
-    bool isInitialOfferReady() const override;
-    OutgoingTransportInfoUpdate takeInitialOffer() override;
-    bool hasUpdates() const override;
-    OutgoingTransportInfoUpdate takeOutgoingUpdate() override;
-    bool isValid() const override;
-    Features features() const override;
-
-    QString sid() const;
-    QString directAddr() const;
-    Connection::Ptr connection() const override;
-
-private:
-    friend class Manager;
-
-    class Private;
-    QScopedPointer<Private> d;
-};
-
-class Pad : public TransportManagerPad
-{
-    Q_OBJECT
-    // TODO
-public:
-    typedef QSharedPointer<Pad> Ptr;
-
-    Pad(Manager *manager, Session *session);
-    QString ns() const override;
-    Session *session() const override;
-    TransportManager *manager() const override;
-
-    QString generateSid() const;
-    void registerSid(const QString &sid);
-
-    inline TcpPortScope *discoScope() const { return _discoScope; }
-private:
-    Manager *_manager;
-    Session *_session;
-    TcpPortScope *_discoScope;
-};
-
-class Manager : public TransportManager {
-    Q_OBJECT
-public:
-    Manager(QObject *parent = nullptr);
-    ~Manager();
-
-    XMPP::Jingle::Transport::Features features() const override;
-    void setJingleManager(XMPP::Jingle::Manager *jm) override;
-    QSharedPointer<XMPP::Jingle::Transport> newTransport(const TransportManagerPad::Ptr &pad) override; // outgoing. one have to call Transport::start to collect candidates
-    QSharedPointer<XMPP::Jingle::Transport> newTransport(const TransportManagerPad::Ptr &pad, const QDomElement &transportEl) override; // incoming
-    TransportManagerPad* pad(Session *session) override;
-
-    void closeAll() override;
-
-    QString generateSid(const Jid &remote);
-    void registerSid(const Jid &remote, const QString &sid);
-
-    /**
-     * @brief userProxy returns custom (set by user) SOCKS proxy JID
-     * @return
-     */
-    Jid userProxy() const;
-    void setUserProxy(const Jid &jid);
-
-    /**
-     * @brief addKeyMapping sets mapping between key/socks hostname used for direct connection and transport.
-     *        The key is sha1(sid, initiator full jid, responder full jid)
-     * @param key
-     * @param transport
-     */
-    void addKeyMapping(const QString &key, Transport *transport);
-    void removeKeyMapping(const QString &key);
-private:
-    class Private;
-    QScopedPointer<Private> d;
-};
+    class Manager : public TransportManager {
+        Q_OBJECT
+    public:
+        Manager(QObject *parent = nullptr);
+        ~Manager();
+
+        XMPP::Jingle::Transport::Features       features() const override;
+        void                                    setJingleManager(XMPP::Jingle::Manager *jm) override;
+        QSharedPointer<XMPP::Jingle::Transport> newTransport(const TransportManagerPad::Ptr &pad)
+            override; // outgoing. one have to call Transport::start to collect candidates
+        QSharedPointer<XMPP::Jingle::Transport> newTransport(const TransportManagerPad::Ptr &pad,
+                                                             const QDomElement &transportEl) override; // incoming
+        TransportManagerPad *                   pad(Session *session) override;
+
+        void closeAll() override;
+
+        QString generateSid(const Jid &remote);
+        void    registerSid(const Jid &remote, const QString &sid);
+
+        /**
+         * @brief userProxy returns custom (set by user) SOCKS proxy JID
+         * @return
+         */
+        Jid  userProxy() const;
+        void setUserProxy(const Jid &jid);
+
+        /**
+         * @brief addKeyMapping sets mapping between key/socks hostname used for direct connection and transport.
+         *        The key is sha1(sid, initiator full jid, responder full jid)
+         * @param key
+         * @param transport
+         */
+        void addKeyMapping(const QString &key, Transport *transport);
+        void removeKeyMapping(const QString &key);
+
+    private:
+        class Private;
+        QScopedPointer<Private> d;
+    };
 } // namespace S5B
 } // namespace Jingle
 } // namespace XMPP
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index 6d166a81..fe5c0542 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -26,10 +26,10 @@
 #include <QSharedDataPointer>
 #include <QSharedPointer>
 #include <functional>
-#if QT_VERSION >= QT_VERSION_CHECK(5,8,0)
-# include <QNetworkDatagram>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
+#include <QNetworkDatagram>
 #else
-# include <QHostAddress>
+#include <QHostAddress>
 #endif
 
 class QDomDocument;
@@ -39,581 +39,576 @@ namespace XMPP {
 class Client;
 
 namespace Jingle {
-extern const QString NS;
+    extern const QString NS;
 
-class Manager;
-class Session;
+    class Manager;
+    class Session;
 
-enum class Origin {
-    None,
-    Both,
-    Initiator,
-    Responder
-};
+    enum class Origin { None, Both, Initiator, Responder };
 
-inline uint qHash(const XMPP::Jingle::Origin &o, uint seed = 0)
-{
-    return ::qHash(int(o), seed);
-}
+    inline uint qHash(const XMPP::Jingle::Origin &o, uint seed = 0) { return ::qHash(int(o), seed); }
 
-/*
- Session states:
-  * Created           - new session
-  * PrepareLocalOffer - user accepted session but it's not yet ready for session-initiate/accept message
-  * Unacked           - session-initiate/accept was sent. wait for IQ ack
-  * Pending           - session-initiate was acknowledged. awaits session-accept.
-  * Active            - session was accepted and now active.
-  * Finihed           - session-terminate was sent/received
-
- Locally initiated session passes all the above and remotely initiated skips Pending.
-*/
-enum class State {
-    Created,     // just after constructor
-    PrepareLocalOffer, // content accepted by local user but we are not ready yet to send content-accept or session-accept.
-                       // same for content-add/session-initiate, where user already already sent/added in ui and it's network turn.
-    Unacked,     // local content offer is sent to remote but no IQ ack yet
-    Pending,     // waits for session-accept or content-accept from remote
-    Accepted,    // app only: local: "accept" received, waits for start(). remote: "accept" sent and acknowledged, waits for start()
-    Connecting,  // app only: s5b/ice probes etc (particular application state. can be omited for other entities)
-    Active,      // active transfer. transport is connected. For session it means it was accepted
-    Finishing,   // app only: basically it's finished but has some pending operations. like sending content-reject/remove to remote
-    Finished     // transfering is finished for whatever reason. no more signals/state changes etc. can be deleted
-};
-
-enum class Action {
-    NoAction, // non-standard, just a default
-    ContentAccept,
-    ContentAdd,
-    ContentModify,
-    ContentReject,
-    ContentRemove,
-    DescriptionInfo,
-    SecurityInfo,
-    SessionAccept,
-    SessionInfo,
-    SessionInitiate,
-    SessionTerminate,
-    TransportAccept,
-    TransportInfo,
-    TransportReject,
-    TransportReplace
-};
-
-inline uint qHash(const XMPP::Jingle::Action &o, uint seed = 0)
-{
-    return ::qHash(int(o), seed);
-}
-
-typedef QPair<QString,Origin> ContentKey;
-typedef std::function<void ()> OutgoingUpdateCB;
-typedef std::tuple<QList<QDomElement>, OutgoingUpdateCB> OutgoingUpdate; // list of elements to b inserted to <jingle> and success callback
-typedef std::tuple<QDomElement, OutgoingUpdateCB> OutgoingTransportInfoUpdate; // transport element and success callback
-
-class ErrorUtil
-{
-public:
-    enum {
-        UnknownError, // unparsed/unknown error
-        OutOfOrder,
-        TieBreak,
-        UnknownSession,
-        UnsupportedInfo,
-        Last
+    /*
+     Session states:
+      * Created           - new session
+      * PrepareLocalOffer - user accepted session but it's not yet ready for session-initiate/accept message
+      * Unacked           - session-initiate/accept was sent. wait for IQ ack
+      * Pending           - session-initiate was acknowledged. awaits session-accept.
+      * Active            - session was accepted and now active.
+      * Finihed           - session-terminate was sent/received
+
+     Locally initiated session passes all the above and remotely initiated skips Pending.
+    */
+    enum class State {
+        Created,           // just after constructor
+        PrepareLocalOffer, // content accepted by local user but we are not ready yet to send content-accept or
+                           // session-accept. same for content-add/session-initiate, where user already already
+                           // sent/added in ui and it's network turn.
+        Unacked,    // local content offer is sent to remote but no IQ ack yet
+        Pending,    // waits for session-accept or content-accept from remote
+        Accepted,   // app only: local: "accept" received, waits for start(). remote: "accept" sent and acknowledged,
+                    // waits for start()
+        Connecting, // app only: s5b/ice probes etc (particular application state. can be omited for other entities)
+        Active,     // active transfer. transport is connected. For session it means it was accepted
+        Finishing,  // app only: basically it's finished but has some pending operations. like sending
+                    // content-reject/remove to remote
+        Finished    // transfering is finished for whatever reason. no more signals/state changes etc. can be deleted
     };
 
-    static const char* names[Last];
-
-    static XMPP::Stanza::Error make(QDomDocument &doc, int jingleCond, int type=XMPP::Stanza::Error::Cancel, int condition=XMPP::Stanza::Error::UndefinedCondition, const QString &text=QString());
-
-    static XMPP::Stanza::Error makeTieBreak(QDomDocument &doc);
-    static XMPP::Stanza::Error makeOutOfOrder(QDomDocument &doc);
-
-    static void fill(QDomDocument doc, XMPP::Stanza::Error &error, int jingleCond);
-    static int jingleCondition(const XMPP::Stanza::Error &error);
-};
-
-class Jingle
-{
-public:
-    Jingle(); // make invalid jingle element
-    Jingle(Action action, const QString &sid); // start making outgoing jingle
-    Jingle(const QDomElement &e); // likely incoming
-    Jingle(const Jingle &);
-    ~Jingle();
-
-    QDomElement toXml(QDomDocument *doc) const;
-    inline bool isValid() const { return d != nullptr; }
-    Action action() const;
-    const QString &sid() const;
-    const Jid &initiator() const;
-    void setInitiator(const Jid &jid);
-    const Jid &responder() const;
-    void setResponder(const Jid &jid);
-private:
-    class Private;
-    QSharedDataPointer<Private> d;
-    Jingle::Private *ensureD();
-};
-
-class Reason {
-    class Private;
-public:
-    enum Condition
-    {
-        NoReason = 0, // non-standard, just a default
-        AlternativeSession,
-        Busy,
-        Cancel,
-        ConnectivityError,
-        Decline,
-        Expired,
-        FailedApplication,
-        FailedTransport,
-        GeneralError,
-        Gone,
-        IncompatibleParameters,
-        MediaError,
-        SecurityError,
-        Success,
-        Timeout,
-        UnsupportedApplications,
-        UnsupportedTransports
+    enum class Action {
+        NoAction, // non-standard, just a default
+        ContentAccept,
+        ContentAdd,
+        ContentModify,
+        ContentReject,
+        ContentRemove,
+        DescriptionInfo,
+        SecurityInfo,
+        SessionAccept,
+        SessionInfo,
+        SessionInitiate,
+        SessionTerminate,
+        TransportAccept,
+        TransportInfo,
+        TransportReject,
+        TransportReplace
     };
 
-    Reason();
-    ~Reason();
-    Reason(Condition cond, const QString &text = QString());
-    Reason(const QDomElement &el);
-    Reason(const Reason &other);
-    Reason& operator=(const Reason &);
-    inline bool isValid() const { return d != nullptr; }
-    Condition condition() const;
-    void setCondition(Condition cond);
-    QString text() const;
-    void setText(const QString &text);
+    inline uint qHash(const XMPP::Jingle::Action &o, uint seed = 0) { return ::qHash(int(o), seed); }
+
+    typedef QPair<QString, Origin> ContentKey;
+    typedef std::function<void()>  OutgoingUpdateCB;
+    typedef std::tuple<QList<QDomElement>, OutgoingUpdateCB>
+        OutgoingUpdate; // list of elements to b inserted to <jingle> and success callback
+    typedef std::tuple<QDomElement, OutgoingUpdateCB>
+        OutgoingTransportInfoUpdate; // transport element and success callback
+
+    class ErrorUtil {
+    public:
+        enum {
+            UnknownError, // unparsed/unknown error
+            OutOfOrder,
+            TieBreak,
+            UnknownSession,
+            UnsupportedInfo,
+            Last
+        };
+
+        static const char *names[Last];
+
+        static XMPP::Stanza::Error make(QDomDocument &doc, int jingleCond, int type = XMPP::Stanza::Error::Cancel,
+                                        int            condition = XMPP::Stanza::Error::UndefinedCondition,
+                                        const QString &text      = QString());
+
+        static XMPP::Stanza::Error makeTieBreak(QDomDocument &doc);
+        static XMPP::Stanza::Error makeOutOfOrder(QDomDocument &doc);
+
+        static void fill(QDomDocument doc, XMPP::Stanza::Error &error, int jingleCond);
+        static int  jingleCondition(const XMPP::Stanza::Error &error);
+    };
 
-    QDomElement toXml(QDomDocument *doc) const;
+    class Jingle {
+    public:
+        Jingle();                                  // make invalid jingle element
+        Jingle(Action action, const QString &sid); // start making outgoing jingle
+        Jingle(const QDomElement &e);              // likely incoming
+        Jingle(const Jingle &);
+        ~Jingle();
+
+        QDomElement    toXml(QDomDocument *doc) const;
+        inline bool    isValid() const { return d != nullptr; }
+        Action         action() const;
+        const QString &sid() const;
+        const Jid &    initiator() const;
+        void           setInitiator(const Jid &jid);
+        const Jid &    responder() const;
+        void           setResponder(const Jid &jid);
+
+    private:
+        class Private;
+        QSharedDataPointer<Private> d;
+        Jingle::Private *           ensureD();
+    };
 
-private:
-    Private *ensureD();
+    class Reason {
+        class Private;
+
+    public:
+        enum Condition {
+            NoReason = 0, // non-standard, just a default
+            AlternativeSession,
+            Busy,
+            Cancel,
+            ConnectivityError,
+            Decline,
+            Expired,
+            FailedApplication,
+            FailedTransport,
+            GeneralError,
+            Gone,
+            IncompatibleParameters,
+            MediaError,
+            SecurityError,
+            Success,
+            Timeout,
+            UnsupportedApplications,
+            UnsupportedTransports
+        };
+
+        Reason();
+        ~Reason();
+        Reason(Condition cond, const QString &text = QString());
+        Reason(const QDomElement &el);
+        Reason(const Reason &other);
+        Reason &    operator=(const Reason &);
+        inline bool isValid() const { return d != nullptr; }
+        Condition   condition() const;
+        void        setCondition(Condition cond);
+        QString     text() const;
+        void        setText(const QString &text);
+
+        QDomElement toXml(QDomDocument *doc) const;
+
+    private:
+        Private *ensureD();
+
+        QSharedDataPointer<Private> d;
+    };
 
-    QSharedDataPointer<Private> d;
-};
+    class ContentBase {
+    public:
+        inline ContentBase() {}
+        ContentBase(Origin creator, const QString &name);
+        ContentBase(const QDomElement &el);
 
-class ContentBase {
-public:
+        inline bool isValid() const { return creator != Origin::None && !name.isEmpty(); }
 
-    inline ContentBase(){}
-    ContentBase(Origin creator, const QString &name);
-    ContentBase(const QDomElement &el);
+        QDomElement   toXml(QDomDocument *doc, const char *tagName) const;
+        static Origin creatorAttr(const QDomElement &el);
+        static bool   setCreatorAttr(QDomElement &el, Origin creator);
 
-    inline bool isValid() const { return creator != Origin::None && !name.isEmpty(); }
+        Origin  creator = Origin::None;
+        QString name;
+        Origin  senders = Origin::Both;
+        QString disposition; // default "session"
+    };
 
-    QDomElement toXml(QDomDocument *doc, const char *tagName) const;
-    static Origin creatorAttr(const QDomElement &el);
-    static bool setCreatorAttr(QDomElement &el, Origin creator);
+    class Security {
+    };
 
-    Origin  creator = Origin::None;
-    QString name;
-    Origin  senders = Origin::Both;
-    QString disposition; // default "session"
-};
+    /**
+     * @brief The SessionManagerPad class - TransportManager/AppManager PAD
+     *
+     * The class is intended to be used to monitor global session events
+     * as well as send them in context of specific application type.
+     *
+     * For example a session has 3 content elements (voice, video and whiteboard).
+     * voice and video are related to RTP application while whiteaboard (Jingle SXE)
+     * is a different application. Therefore the session will have 2 pads:
+     * rtp pad and whitebaord pad.
+     * The pads are connected to both session and transport/application manager
+     * and their main task to handle Jingle session-info events.
+     *
+     * SessionManagerPad is a base class for all kinds of pads.
+     * UI can connect to its signals.
+     */
+    class SessionManagerPad : public QObject {
+        Q_OBJECT
+    public:
+        virtual QDomElement takeOutgoingSessionInfoUpdate();
+        virtual QString     ns() const      = 0;
+        virtual Session *   session() const = 0;
+        QDomDocument *      doc() const;
+    };
 
-class Security
-{
+    class TransportManager;
+    class TransportManagerPad : public SessionManagerPad {
+        Q_OBJECT
+    public:
+        typedef QSharedPointer<TransportManagerPad> Ptr;
 
-};
+        virtual TransportManager *manager() const = 0;
+    };
 
-/**
- * @brief The SessionManagerPad class - TransportManager/AppManager PAD
- *
- * The class is intended to be used to monitor global session events
- * as well as send them in context of specific application type.
- *
- * For example a session has 3 content elements (voice, video and whiteboard).
- * voice and video are related to RTP application while whiteaboard (Jingle SXE)
- * is a different application. Therefore the session will have 2 pads:
- * rtp pad and whitebaord pad.
- * The pads are connected to both session and transport/application manager
- * and their main task to handle Jingle session-info events.
- *
- * SessionManagerPad is a base class for all kinds of pads.
- * UI can connect to its signals.
- */
-class SessionManagerPad : public QObject
-{
-    Q_OBJECT
-public:
-    virtual QDomElement takeOutgoingSessionInfoUpdate();
-    virtual QString ns() const = 0;
-    virtual Session *session() const = 0;
-    QDomDocument* doc() const;
-};
-
-class TransportManager;
-class TransportManagerPad : public SessionManagerPad
-{
-    Q_OBJECT
-public:
-    typedef QSharedPointer<TransportManagerPad> Ptr;
-
-    virtual TransportManager *manager() const = 0;
-};
-
-class ApplicationManager;
-class ApplicationManagerPad : public SessionManagerPad
-{
-    Q_OBJECT
-public:
-    typedef QSharedPointer<ApplicationManagerPad> Ptr;
-
-    using SessionManagerPad::SessionManagerPad;
-
-    virtual ApplicationManager *manager() const = 0;
+    class ApplicationManager;
+    class ApplicationManagerPad : public SessionManagerPad {
+        Q_OBJECT
+    public:
+        typedef QSharedPointer<ApplicationManagerPad> Ptr;
 
-    /*
-     * for example we transfer a file
-     * then first file may generate name "file1", next "file2" etc
-     * As result it will be sent as <content name="file1" ... >
-     */
-    virtual QString generateContentName(Origin senders) = 0;
-};
-
-#if QT_VERSION < QT_VERSION_CHECK(5,8,0)
-// stub implementation
-class NetworkDatagram
-{
-public:
-    bool _valid = false;
-    QByteArray _data;
-    inline NetworkDatagram(const QByteArray &data, const QHostAddress &destinationAddress = QHostAddress(), quint16 port = 0) :
-        _valid(true),
-        _data(data)
-    {
-        Q_UNUSED(destinationAddress);
-        Q_UNUSED(port)
-    }
-    inline NetworkDatagram(){}
-
-    inline bool isValid() const { return _valid; }
-    inline QByteArray data() const { return _data; }
-};
-#else
-typedef QNetworkDatagram NetworkDatagram;
-#endif
+        using SessionManagerPad::SessionManagerPad;
 
-class Connection : public ByteStream
-{
-    Q_OBJECT
-public:
-    using Ptr = QSharedPointer<Connection>; // will be shared between transport and application
-    virtual bool hasPendingDatagrams() const;
-    virtual NetworkDatagram receiveDatagram(qint64 maxSize = -1);
-    virtual size_t blockSize() const;
-};
-
-class Application;
-class Transport : public QObject {
-    Q_OBJECT
-public:
-    /*
-    Categorization by speed, reliability and connectivity
-    - speed: realtim, fast, slow
-    - reliability: reliable, not reliable (some transport can both modes)
-    - connectivity: always connect, hard to connect
+        virtual ApplicationManager *manager() const = 0;
 
-    Some transports may change their qualities, so we have to consider worst case.
+        /*
+         * for example we transfer a file
+         * then first file may generate name "file1", next "file2" etc
+         * As result it will be sent as <content name="file1" ... >
+         */
+        virtual QString generateContentName(Origin senders) = 0;
+    };
 
-    ICE-UDP: RealTime, Not Reliable, Hard To Connect
-    S5B:     Fast,     Reliable,     Hard To Connect
-    IBB:     Slow,     Reliable,     Always Connect
+#if QT_VERSION < QT_VERSION_CHECK(5, 8, 0)
+    // stub implementation
+    class NetworkDatagram {
+    public:
+        bool       _valid = false;
+        QByteArray _data;
+        inline NetworkDatagram(const QByteArray &data, const QHostAddress &destinationAddress = QHostAddress(),
+                               quint16 port = 0) :
+            _valid(true),
+            _data(data)
+        {
+            Q_UNUSED(destinationAddress);
+            Q_UNUSED(port)
+        }
+        inline NetworkDatagram() {}
+
+        inline bool       isValid() const { return _valid; }
+        inline QByteArray data() const { return _data; }
+    };
+#else
+    typedef QNetworkDatagram NetworkDatagram;
+#endif
 
-    Also most of transports may add extra features but it's matter of configuration.
-    For example all of them can enable p2p crypto mode (<security/> should work here)
-    */
-    enum Feature {
-        // connection establishment
-        HardToConnect = 0x01,  // anything else but ibb
-        AlwaysConnect = 0x02,  // ibb. basically it's always connected
-
-        // reliability
-        NotReliable   = 0x10,  // datagram-oriented
-        Reliable      = 0x20,  // connection-orinted
-
-        // speed.
-        Slow          = 0x100, // only ibb is here probably
-        Fast          = 0x200, // basically all tcp-based and reliable part of sctp
-        RealTime      = 0x400  // it's rather about synchronization of frames with time which implies fast
+    class Connection : public ByteStream {
+        Q_OBJECT
+    public:
+        using Ptr = QSharedPointer<Connection>; // will be shared between transport and application
+        virtual bool            hasPendingDatagrams() const;
+        virtual NetworkDatagram receiveDatagram(qint64 maxSize = -1);
+        virtual size_t          blockSize() const;
     };
-    Q_DECLARE_FLAGS(Features, Feature)
 
-    using QObject::QObject;
+    class Application;
+    class Transport : public QObject {
+        Q_OBJECT
+    public:
+        /*
+        Categorization by speed, reliability and connectivity
+        - speed: realtim, fast, slow
+        - reliability: reliable, not reliable (some transport can both modes)
+        - connectivity: always connect, hard to connect
+
+        Some transports may change their qualities, so we have to consider worst case.
+
+        ICE-UDP: RealTime, Not Reliable, Hard To Connect
+        S5B:     Fast,     Reliable,     Hard To Connect
+        IBB:     Slow,     Reliable,     Always Connect
+
+        Also most of transports may add extra features but it's matter of configuration.
+        For example all of them can enable p2p crypto mode (<security/> should work here)
+        */
+        enum Feature {
+            // connection establishment
+            HardToConnect = 0x01, // anything else but ibb
+            AlwaysConnect = 0x02, // ibb. basically it's always connected
+
+            // reliability
+            NotReliable = 0x10, // datagram-oriented
+            Reliable    = 0x20, // connection-orinted
+
+            // speed.
+            Slow     = 0x100, // only ibb is here probably
+            Fast     = 0x200, // basically all tcp-based and reliable part of sctp
+            RealTime = 0x400  // it's rather about synchronization of frames with time which implies fast
+        };
+        Q_DECLARE_FLAGS(Features, Feature)
+
+        using QObject::QObject;
+
+        enum Direction { // incoming or outgoing file/data transfer.
+            Outgoing,
+            Incoming
+        };
+
+        /**
+         * @brief prepare to send content-add/session-initiate
+         *  When ready, the application first set update type to ContentAdd and then emit updated()
+         */
+        virtual void prepare() = 0;
+
+        /**
+         * @brief start really transfer data. starting with connection to remote candidates for example
+         */
+        virtual void start() = 0; // for local transport start searching for candidates (including probing proxy,stun
+                                  // etc) for remote transport try to connect to all proposed hosts in order their
+                                  // priority. in-band transport may just emit updated() here
+        virtual bool update(const QDomElement &el) = 0; // accepts transport element on incoming transport-info
+        virtual bool isInitialOfferReady() const   = 0;
+        virtual bool hasUpdates() const            = 0;
+        virtual OutgoingTransportInfoUpdate takeInitialOffer()   = 0;
+        virtual OutgoingTransportInfoUpdate takeOutgoingUpdate() = 0;
+        virtual bool                        isValid() const      = 0;
+        virtual Features                    features() const     = 0;
+        virtual TransportManagerPad::Ptr    pad() const          = 0;
+        virtual Connection::Ptr             connection() const   = 0; // returns established QIODevice-based connection
+    signals:
+        void updated(); // found some candidates and they have to be sent. takeUpdate has to be called from this signal
+                        // handler. if it's just always ready then signal has to be sent at least once otherwise
+                        // session-initiate won't be sent.
+        void connected(); // this signal is for app logic. maybe to finally start drawing some progress bar
+        void failed();    // transport ailed for whatever reason. aborted for example
+    };
 
-    enum Direction { // incoming or outgoing file/data transfer.
-        Outgoing,
-        Incoming
+    class Application : public QObject {
+        Q_OBJECT
+    public:
+        enum SetDescError {
+            Ok,
+            Unparsed,
+            IncompatibleParameters // this one is for <reason>
+        };
+
+        virtual ApplicationManagerPad::Ptr pad() const   = 0;
+        virtual State                      state() const = 0;
+        virtual void setState(State state) = 0; // likely just remember the state and not generate any signals
+        virtual XMPP::Stanza::Error lastError() const         = 0;
+        virtual Reason              terminationReason() const = 0;
+
+        virtual Origin  creator() const     = 0;
+        virtual Origin  senders() const     = 0;
+        virtual QString contentName() const = 0;
+        virtual Origin  transportReplaceOrigin()
+            const = 0; // returns Origin::None if no transport-replace in progress or the side triggered the replace.
+        virtual SetDescError setDescription(const QDomElement &description) = 0;
+
+        /**
+         * @brief setTransport checks if transport is compatible and stores it
+         * @param transport
+         * @return false if not compatible
+         */
+        virtual bool                      setTransport(const QSharedPointer<Transport> &transport) = 0;
+        virtual QSharedPointer<Transport> transport() const                                        = 0;
+
+        /**
+         * @brief evaluateOutgoingUpdate computes and prepares next update which will be taken with takeOutgoingUpdate
+         *   The updated will be taked immediately if considered to be most preferred among other updates types of
+         *   other applications.
+         * @return update type
+         */
+        virtual Action         evaluateOutgoingUpdate() = 0;
+        virtual OutgoingUpdate takeOutgoingUpdate()
+            = 0; // this may return something only when evaluateOutgoingUpdate() != NoAction
+
+        /**
+         * @brief wantBetterTransport checks if the transport is a better match for the application
+         * @return
+         */
+        virtual bool wantBetterTransport(const QSharedPointer<Transport> &) const = 0;
+
+        /**
+         * @brief selectNextTransport selects next transport from compatible transports list.
+         *   The list is usually store in the application
+         * @return
+         */
+        virtual bool selectNextTransport() = 0;
+
+        /**
+         * @brief prepare to send content-add/session-initiate
+         *  When ready, the application first set update type to ContentAdd and then emit updated()
+         */
+        virtual void prepare()                     = 0;
+        virtual bool accept(const QDomElement &el) = 0; // remote accepted our content
+        virtual void start()                       = 0;
+        virtual void remove(Reason::Condition cond = Reason::Success, const QString &comment = QString()) = 0;
+
+        /**
+         * @brief incomingTransportReplace it's jingle transport-replace
+         * @param transport
+         * @return
+         */
+        virtual bool incomingTransportReplace(const QSharedPointer<Transport> &transport) = 0;
+        virtual bool incomingTransportAccept(const QDomElement &transportEl)              = 0;
+
+    signals:
+        void updated(); // signal for session it has to send updates to remote. so it will follow with
+                        // takeOutgoingUpdate() eventually
+        void stateChanged(State);
     };
 
-    /**
-     * @brief prepare to send content-add/session-initiate
-     *  When ready, the application first set update type to ContentAdd and then emit updated()
-     */
-    virtual void prepare() = 0;
+    class Session : public QObject {
+        Q_OBJECT
+    public:
+        // Note incoming session are not registered in Jingle Manager until validated.
+        // and then either rejected or registered in Pending state.
 
-    /**
-     * @brief start really transfer data. starting with connection to remote candidates for example
-     */
-    virtual void start() = 0;   // for local transport start searching for candidates (including probing proxy,stun etc)
-                                // for remote transport try to connect to all proposed hosts in order their priority.
-                                // in-band transport may just emit updated() here
-    virtual bool update(const QDomElement &el) = 0; // accepts transport element on incoming transport-info
-    virtual bool isInitialOfferReady() const = 0;
-    virtual bool hasUpdates() const = 0;
-    virtual OutgoingTransportInfoUpdate takeInitialOffer() = 0;
-    virtual OutgoingTransportInfoUpdate takeOutgoingUpdate() = 0;
-    virtual bool isValid() const = 0;
-    virtual Features features() const = 0;
-    virtual TransportManagerPad::Ptr pad() const = 0;
-    virtual Connection::Ptr connection() const = 0; // returns established QIODevice-based connection
-signals:
-    void updated(); // found some candidates and they have to be sent. takeUpdate has to be called from this signal handler.
-                    // if it's just always ready then signal has to be sent at least once otherwise session-initiate won't be sent.
-    void connected(); // this signal is for app logic. maybe to finally start drawing some progress bar
-    void failed();    // transport ailed for whatever reason. aborted for example
-};
-
-class Application : public QObject
-{
-    Q_OBJECT
-public:
-
-    enum SetDescError {
-        Ok,
-        Unparsed,
-        IncompatibleParameters // this one is for <reason>
-    };
+        Session(Manager *manager, const Jid &peer, Origin role = Origin::Initiator);
+        ~Session();
 
-    virtual ApplicationManagerPad::Ptr pad() const = 0;
-    virtual State state() const = 0;
-    virtual void setState(State state) = 0; // likely just remember the state and not generate any signals
-    virtual XMPP::Stanza::Error lastError() const = 0;
-    virtual Reason terminationReason() const = 0;
+        Manager *manager() const;
+        State    state() const;
 
-    virtual Origin creator() const = 0;
-    virtual Origin senders() const = 0;
-    virtual QString contentName() const = 0;
-    virtual Origin transportReplaceOrigin() const = 0; // returns Origin::None if no transport-replace in progress or the side triggered the replace.
-    virtual SetDescError setDescription(const QDomElement &description) = 0;
+        Jid     me() const;
+        Jid     peer() const;
+        Jid     initiator() const;
+        Jid     responder() const;
+        QString sid() const;
 
-    /**
-     * @brief setTransport checks if transport is compatible and stores it
-     * @param transport
-     * @return false if not compatible
-     */
-    virtual bool setTransport(const QSharedPointer<Transport> &transport) = 0;
-    virtual QSharedPointer<Transport> transport() const = 0;
+        Origin role() const; // my role in session: initiator or responder
+        Origin peerRole() const;
 
-    /**
-     * @brief evaluateOutgoingUpdate computes and prepares next update which will be taken with takeOutgoingUpdate
-     *   The updated will be taked immediately if considered to be most preferred among other updates types of
-     *   other applications.
-     * @return update type
-     */
-    virtual Action evaluateOutgoingUpdate() = 0;
-    virtual OutgoingUpdate takeOutgoingUpdate() = 0; // this may return something only when evaluateOutgoingUpdate() != NoAction
+        XMPP::Stanza::Error lastError() const;
 
-    /**
-     * @brief wantBetterTransport checks if the transport is a better match for the application
-     * @return
-     */
-    virtual bool wantBetterTransport(const QSharedPointer<Transport> &) const = 0;
+        // make new local content but do not add it to session yet
+        Application *newContent(const QString &ns, Origin senders = Origin::Both);
+        // get registered content if any
+        Application *                          content(const QString &contentName, Origin creator);
+        void                                   addContent(Application *content);
+        const QMap<ContentKey, Application *> &contentList() const;
 
-    /**
-     * @brief selectNextTransport selects next transport from compatible transports list.
-     *   The list is usually store in the application
-     * @return
-     */
-    virtual bool selectNextTransport() = 0;
+        ApplicationManagerPad::Ptr applicationPad(const QString &ns);
+        TransportManagerPad::Ptr   transportPad(const QString &ns);
 
-    /**
-     * @brief prepare to send content-add/session-initiate
-     *  When ready, the application first set update type to ContentAdd and then emit updated()
-     */
-    virtual void prepare() = 0;
-    virtual bool accept(const QDomElement &el) = 0; // remote accepted our content
-    virtual void start() = 0;
-    virtual void remove(Reason::Condition cond = Reason::Success, const QString &comment = QString()) = 0;
+        QSharedPointer<Transport> newOutgoingTransport(const QString &ns);
 
-    /**
-     * @brief incomingTransportReplace it's jingle transport-replace
-     * @param transport
-     * @return
-     */
-    virtual bool incomingTransportReplace(const QSharedPointer<Transport> &transport) = 0;
-    virtual bool incomingTransportAccept(const QDomElement &transportEl) = 0;
-
-signals:
-    void updated(); // signal for session it has to send updates to remote. so it will follow with takeOutgoingUpdate() eventually
-    void stateChanged(State);
-};
-
-class Session : public QObject
-{
-    Q_OBJECT
-public:
-    // Note incoming session are not registered in Jingle Manager until validated.
-    // and then either rejected or registered in Pending state.
-
-    Session(Manager *manager, const Jid &peer, Origin role = Origin::Initiator);
-    ~Session();
-
-    Manager* manager() const;
-    State state() const;
-
-    Jid me() const;
-    Jid peer() const;
-    Jid initiator() const;
-    Jid responder() const;
-    QString sid() const;
-
-    Origin role() const; // my role in session: initiator or responder
-    Origin peerRole() const;
-
-    XMPP::Stanza::Error lastError() const;
-
-    // make new local content but do not add it to session yet
-    Application *newContent(const QString &ns, Origin senders = Origin::Both);
-    // get registered content if any
-    Application *content(const QString &contentName, Origin creator);
-    void addContent(Application *content);
-    const QMap<ContentKey,Application*> &contentList() const;
-
-    ApplicationManagerPad::Ptr applicationPad(const QString &ns);
-    TransportManagerPad::Ptr transportPad(const QString &ns);
-
-    QSharedPointer<Transport> newOutgoingTransport(const QString &ns);
-
-    QString preferredApplication() const;
-    QStringList allApplicationTypes() const;
-
-    void setLocalJid(const Jid &jid); // w/o real use case the implementation is rather stub
-
-    void accept();
-    void initiate();
-    void terminate(Reason::Condition cond, const QString &comment = QString());
-
-    // allocates or returns existing pads
-    ApplicationManagerPad::Ptr applicationPadFactory(const QString &ns);
-    TransportManagerPad::Ptr transportPadFactory(const QString &ns);
-signals:
-    void managerPadAdded(const QString &ns);
-    void initiated();
-    void activated();
-    void terminated();
-    void newContentReceived();
-
-private:
-    friend class Manager;
-    friend class JTPush;
-    bool incomingInitiate(const Jingle &jingle, const QDomElement &jingleEl);
-    bool updateFromXml(Action action, const QDomElement &jingleEl);
-
-    class Private;
-    QScopedPointer<Private> d;
-};
-
-class ApplicationManager : public QObject
-{
-    Q_OBJECT
-public:
-    ApplicationManager(QObject *parent = nullptr);
-
-    virtual void setJingleManager(Manager *jm) = 0;
-    virtual Application* startApplication(const ApplicationManagerPad::Ptr &pad, const QString &contentName, Origin creator, Origin senders) = 0;
-    virtual ApplicationManagerPad *pad(Session *session) = 0;
-
-    // this method is supposed to gracefully close all related sessions as a preparation for plugin unload for example
-    virtual void closeAll() = 0;
-};
-
-class TransportManager : public QObject
-{
-    Q_OBJECT
-public:
-
-    TransportManager(QObject *parent = nullptr);
-
-    // may show more features than Transport instance. For example some transports may work in both reliable and not reliable modes
-    virtual Transport::Features features() const = 0;
-    virtual void setJingleManager(Manager *jm) = 0;
-
-    // FIXME rename methods
-    virtual QSharedPointer<Transport> newTransport(const TransportManagerPad::Ptr &pad) = 0; // outgoing. one have to call Transport::start to collect candidates
-    virtual QSharedPointer<Transport> newTransport(const TransportManagerPad::Ptr &pad, const QDomElement &transportEl) = 0; // incoming
-    virtual TransportManagerPad* pad(Session *session) = 0;
-
-    // this method is supposed to gracefully close all related sessions as a preparation for plugin unload for example
-    virtual void closeAll() = 0;
-signals:
-    void abortAllRequested(); // mostly used by transport instances to abort immediately
-};
-
-class Manager : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit Manager(XMPP::Client *client = nullptr);
-    ~Manager();
-
-    XMPP::Client* client() const;
-
-    // if we have another jingle manager we can add its contents' namespaces here.
-    void addExternalManager(const QString &ns);
-    // on outgoing session destroy an external manager should call this function.
-    void registerExternalSession(const QString &sid);
-    void forgetExternalSession(const QString &sid);
-
-    void setRedirection(const Jid &to);
-    const Jid &redirectionJid() const;
-
-    void registerApp(const QString &ns, ApplicationManager *app);
-    void unregisterApp(const QString &ns);
-    bool isRegisteredApplication(const QString &ns);
-    ApplicationManagerPad* applicationPad(Session *session, const QString &ns); // allocates new pad on application manager
-
-    void registerTransport(const QString &ns, TransportManager *transport);
-    void unregisterTransport(const QString &ns);
-    bool isRegisteredTransport(const QString &ns);
-    TransportManagerPad* transportPad(Session *session, const QString &ns); // allocates new pad on transport manager
-    QStringList availableTransports(const Transport::Features &features = Transport::Features()) const;
+        QString     preferredApplication() const;
+        QStringList allApplicationTypes() const;
 
-    /**
-     * @brief isAllowedParty checks if the remote jid allowed to initiate a session
-     * @param jid - remote jid
-     * @return true if allowed
-     */
-    bool isAllowedParty(const Jid &jid) const;
-    void setRemoteJidChecker(std::function<bool(const Jid &)> checker);
+        void setLocalJid(const Jid &jid); // w/o real use case the implementation is rather stub
 
-    Session* session(const Jid &remoteJid, const QString &sid);
-    Session* newSession(const Jid &j);
-    QString registerSession(Session *session);
-    XMPP::Stanza::Error lastError() const;
+        void accept();
+        void initiate();
+        void terminate(Reason::Condition cond, const QString &comment = QString());
 
-    void detachSession(Session *s); // disconnect the session from manager
-signals:
-    void incomingSession(Session *);
+        // allocates or returns existing pads
+        ApplicationManagerPad::Ptr applicationPadFactory(const QString &ns);
+        TransportManagerPad::Ptr   transportPadFactory(const QString &ns);
+    signals:
+        void managerPadAdded(const QString &ns);
+        void initiated();
+        void activated();
+        void terminated();
+        void newContentReceived();
+
+    private:
+        friend class Manager;
+        friend class JTPush;
+        bool incomingInitiate(const Jingle &jingle, const QDomElement &jingleEl);
+        bool updateFromXml(Action action, const QDomElement &jingleEl);
+
+        class Private;
+        QScopedPointer<Private> d;
+    };
 
-private:
-    friend class JTPush;
-    Session *incomingSessionInitiate(const Jid &from, const Jingle &jingle, const QDomElement &jingleEl);
+    class ApplicationManager : public QObject {
+        Q_OBJECT
+    public:
+        ApplicationManager(QObject *parent = nullptr);
 
-    class Private;
-    QScopedPointer<Private> d;
-};
+        virtual void         setJingleManager(Manager *jm) = 0;
+        virtual Application *startApplication(const ApplicationManagerPad::Ptr &pad, const QString &contentName,
+                                              Origin creator, Origin senders)
+            = 0;
+        virtual ApplicationManagerPad *pad(Session *session) = 0;
+
+        // this method is supposed to gracefully close all related sessions as a preparation for plugin unload for
+        // example
+        virtual void closeAll() = 0;
+    };
+
+    class TransportManager : public QObject {
+        Q_OBJECT
+    public:
+        TransportManager(QObject *parent = nullptr);
+
+        // may show more features than Transport instance. For example some transports may work in both reliable and not
+        // reliable modes
+        virtual Transport::Features features() const              = 0;
+        virtual void                setJingleManager(Manager *jm) = 0;
+
+        // FIXME rename methods
+        virtual QSharedPointer<Transport> newTransport(const TransportManagerPad::Ptr &pad)
+            = 0; // outgoing. one have to call Transport::start to collect candidates
+        virtual QSharedPointer<Transport> newTransport(const TransportManagerPad::Ptr &pad,
+                                                       const QDomElement &             transportEl)
+            = 0; // incoming
+        virtual TransportManagerPad *pad(Session *session) = 0;
+
+        // this method is supposed to gracefully close all related sessions as a preparation for plugin unload for
+        // example
+        virtual void closeAll() = 0;
+    signals:
+        void abortAllRequested(); // mostly used by transport instances to abort immediately
+    };
+
+    class Manager : public QObject {
+        Q_OBJECT
+
+    public:
+        explicit Manager(XMPP::Client *client = nullptr);
+        ~Manager();
+
+        XMPP::Client *client() const;
+
+        // if we have another jingle manager we can add its contents' namespaces here.
+        void addExternalManager(const QString &ns);
+        // on outgoing session destroy an external manager should call this function.
+        void registerExternalSession(const QString &sid);
+        void forgetExternalSession(const QString &sid);
+
+        void       setRedirection(const Jid &to);
+        const Jid &redirectionJid() const;
+
+        void                   registerApp(const QString &ns, ApplicationManager *app);
+        void                   unregisterApp(const QString &ns);
+        bool                   isRegisteredApplication(const QString &ns);
+        ApplicationManagerPad *applicationPad(Session *      session,
+                                              const QString &ns); // allocates new pad on application manager
+
+        void                 registerTransport(const QString &ns, TransportManager *transport);
+        void                 unregisterTransport(const QString &ns);
+        bool                 isRegisteredTransport(const QString &ns);
+        TransportManagerPad *transportPad(Session *      session,
+                                          const QString &ns); // allocates new pad on transport manager
+        QStringList          availableTransports(const Transport::Features &features = Transport::Features()) const;
+
+        /**
+         * @brief isAllowedParty checks if the remote jid allowed to initiate a session
+         * @param jid - remote jid
+         * @return true if allowed
+         */
+        bool isAllowedParty(const Jid &jid) const;
+        void setRemoteJidChecker(std::function<bool(const Jid &)> checker);
+
+        Session *           session(const Jid &remoteJid, const QString &sid);
+        Session *           newSession(const Jid &j);
+        QString             registerSession(Session *session);
+        XMPP::Stanza::Error lastError() const;
+
+        void detachSession(Session *s); // disconnect the session from manager
+    signals:
+        void incomingSession(Session *);
+
+    private:
+        friend class JTPush;
+        Session *incomingSessionInitiate(const Jid &from, const Jingle &jingle, const QDomElement &jingleEl);
+
+        class Private;
+        QScopedPointer<Private> d;
+    };
 
-Origin negateOrigin(Origin o);
+    Origin negateOrigin(Origin o);
 
 } // namespace Jingle
 } // namespace XMPP
diff --git a/src/xmpp/xmpp-im/s5b.cpp b/src/xmpp/xmpp-im/s5b.cpp
index d100d97c..4c8ff4ff 100644
--- a/src/xmpp/xmpp-im/s5b.cpp
+++ b/src/xmpp/xmpp-im/s5b.cpp
@@ -31,9 +31,9 @@
 #include <qca.h>
 #include <stdlib.h>
 #ifdef Q_OS_WIN
-# include <windows.h>
+#include <windows.h>
 #else
-# include <netinet/in.h>
+#include <netinet/in.h>
 #endif
 
 #define MAXSTREAMHOSTS 5
@@ -44,8 +44,8 @@ namespace XMPP {
 static QString makeKey(const QString &sid, const Jid &requester, const Jid &target)
 {
 #ifdef S5B_DEBUG
-    qDebug("makeKey: sid=%s requester=%s target=%s %s", qPrintable(sid),
-           qPrintable(requester.full()), qPrintable(target.full()),
+    qDebug("makeKey: sid=%s requester=%s target=%s %s", qPrintable(sid), qPrintable(requester.full()),
+           qPrintable(target.full()),
            qPrintable(QCA::Hash("sha1").hashToString(QString(sid + requester.full() + target.full()).toUtf8())));
 #endif
     QString str = sid + requester.full() + target.full();
@@ -54,15 +54,14 @@ static QString makeKey(const QString &sid, const Jid &requester, const Jid &targ
 
 static bool haveHost(const StreamHostList &list, const Jid &j)
 {
-    for(StreamHostList::ConstIterator it = list.begin(); it != list.end(); ++it) {
-        if((*it).jid().compare(j))
+    for (StreamHostList::ConstIterator it = list.begin(); it != list.end(); ++it) {
+        if ((*it).jid().compare(j))
             return true;
     }
     return false;
 }
 
-class S5BManager::Item : public QObject
-{
+class S5BManager::Item : public QObject {
     Q_OBJECT
 
 public:
@@ -70,42 +69,41 @@ class S5BManager::Item : public QObject
     enum { ErrRefused, ErrConnect, ErrWrongHost, ErrProxy };
     enum { Unknown, Fast, NotFast };
 
-    S5BManager *m = nullptr;
-    int state = 0;
-    QString sid, key, out_key, out_id, in_id;
-    Jid self, peer;
-    StreamHostList in_hosts;
-    JT_S5B *task = nullptr;
-    JT_S5B *proxy_task = nullptr;
+    S5BManager *                     m     = nullptr;
+    int                              state = 0;
+    QString                          sid, key, out_key, out_id, in_id;
+    Jid                              self, peer;
+    StreamHostList                   in_hosts;
+    JT_S5B *                         task       = nullptr;
+    JT_S5B *                         proxy_task = nullptr;
     QList<QSharedPointer<S5BServer>> relatedServers;
-    SocksClient *client = nullptr;
-    SocksClient *client_out = nullptr;
-    SocksUDP *client_udp = nullptr;
-    SocksUDP *client_out_udp = nullptr;
-    S5BConnector *conn = nullptr;
-    S5BConnector *proxy_conn = nullptr;
-    //S5BServersManager::S5BLocalServers *localServ = nullptr;
-    bool wantFast = false;
+    SocksClient *                    client         = nullptr;
+    SocksClient *                    client_out     = nullptr;
+    SocksUDP *                       client_udp     = nullptr;
+    SocksUDP *                       client_out_udp = nullptr;
+    S5BConnector *                   conn           = nullptr;
+    S5BConnector *                   proxy_conn     = nullptr;
+    // S5BServersManager::S5BLocalServers *localServ = nullptr;
+    bool       wantFast = false;
     StreamHost proxy;
-    int targetMode = 0; // requester sets this once it figures it out
-    bool fast; // target sets this
-    bool activated;
-    bool lateProxy;
-    bool connSuccess;
-    bool localFailed, remoteFailed;
-    bool allowIncoming;
-    bool udp;
-    int statusCode = 0;
-    Jid activatedStream;
+    int        targetMode = 0; // requester sets this once it figures it out
+    bool       fast;           // target sets this
+    bool       activated;
+    bool       lateProxy;
+    bool       connSuccess;
+    bool       localFailed, remoteFailed;
+    bool       allowIncoming;
+    bool       udp;
+    int        statusCode = 0;
+    Jid        activatedStream;
 
     Item(S5BManager *manager);
     ~Item();
 
     void resetConnection();
     void startRequester(const QString &_sid, const Jid &_self, const Jid &_peer, bool fast, bool udp);
-    void startTarget(const QString &_sid, const Jid &_self, const Jid &_peer,
-                     const QString &_dstaddr, const StreamHostList &hosts,
-                     const QString &iq_id, bool fast, bool udp);
+    void startTarget(const QString &_sid, const Jid &_self, const Jid &_peer, const QString &_dstaddr,
+                     const StreamHostList &hosts, const QString &iq_id, bool fast, bool udp);
     void handleFast(const StreamHostList &hosts, const QString &iq_id);
 
     void doOutgoing();
@@ -141,62 +139,44 @@ private slots:
 //----------------------------------------------------------------------------
 // S5BDatagram
 //----------------------------------------------------------------------------
-S5BDatagram::S5BDatagram()
-{
-}
+S5BDatagram::S5BDatagram() {}
 
-S5BDatagram::S5BDatagram(int source, int dest, const QByteArray &data)
-    : _source(source)
-    , _dest(dest)
-    , _buf(data)
-{
-}
+S5BDatagram::S5BDatagram(int source, int dest, const QByteArray &data) : _source(source), _dest(dest), _buf(data) {}
 
-int S5BDatagram::sourcePort() const
-{
-    return _source;
-}
+int S5BDatagram::sourcePort() const { return _source; }
 
-int S5BDatagram::destPort() const
-{
-    return _dest;
-}
+int S5BDatagram::destPort() const { return _dest; }
 
-QByteArray S5BDatagram::data() const
-{
-    return _buf;
-}
+QByteArray S5BDatagram::data() const { return _buf; }
 
 //----------------------------------------------------------------------------
 // S5BConnection
 //----------------------------------------------------------------------------
-class S5BConnection::Private
-{
+class S5BConnection::Private {
 public:
-    S5BManager *m;
-    SocksClient *sc;
-    SocksUDP *su;
-    int state;
-    Jid peer;
-    QString sid;
-    bool remote;
-    bool switched;
-    bool notifyRead, notifyClose;
-    int id;
-    S5BRequest req;
-    Jid proxy;
-    Mode mode;
-    QList<S5BDatagram*> dglist;
+    S5BManager *         m;
+    SocksClient *        sc;
+    SocksUDP *           su;
+    int                  state;
+    Jid                  peer;
+    QString              sid;
+    bool                 remote;
+    bool                 switched;
+    bool                 notifyRead, notifyClose;
+    int                  id;
+    S5BRequest           req;
+    Jid                  proxy;
+    Mode                 mode;
+    QList<S5BDatagram *> dglist;
 };
 
-static int id_conn = 0;
+static int id_conn  = 0;
 static int num_conn = 0;
 
-S5BConnection::S5BConnection(S5BManager *m, QObject *parent)
-    : BSConnection(parent)
+S5BConnection::S5BConnection(S5BManager *m, QObject *parent) : BSConnection(parent)
 {
-    d = new Private;
-    d->m = m;
+    d     = new Private;
+    d->m  = m;
     d->sc = nullptr;
     d->su = nullptr;
 
@@ -224,47 +204,41 @@ S5BConnection::~S5BConnection()
 void S5BConnection::resetConnection(bool clear)
 {
     d->m->con_unlink(this);
-    if(clear && d->sc) {
+    if (clear && d->sc) {
         delete d->sc;
         d->sc = nullptr;
     }
     delete d->su;
     d->su = nullptr;
-    if(clear) {
+    if (clear) {
         while (!d->dglist.isEmpty()) {
             delete d->dglist.takeFirst();
         }
     }
     d->state = Idle;
     setOpenMode(QIODevice::NotOpen);
-    d->peer = Jid();
-    d->sid = QString();
-    d->remote = false;
-    d->switched = false;
-    d->notifyRead = false;
+    d->peer        = Jid();
+    d->sid         = QString();
+    d->remote      = false;
+    d->switched    = false;
+    d->notifyRead  = false;
     d->notifyClose = false;
 }
 
-Jid S5BConnection::proxy() const
-{
-    return d->proxy;
-}
+Jid S5BConnection::proxy() const { return d->proxy; }
 
-void S5BConnection::setProxy(const Jid &proxy)
-{
-    d->proxy = proxy;
-}
+void S5BConnection::setProxy(const Jid &proxy) { d->proxy = proxy; }
 
 void S5BConnection::connectToJid(const Jid &peer, const QString &sid, Mode m)
 {
     resetConnection(true);
-    if(!d->m->isAcceptableSID(peer, sid))
+    if (!d->m->isAcceptableSID(peer, sid))
         return;
 
-    d->peer = peer;
-    d->sid = sid;
+    d->peer  = peer;
+    d->sid   = sid;
     d->state = Requesting;
-    d->mode = m;
+    d->mode  = m;
 #ifdef S5B_DEBUG
     qDebug("S5BConnection[%d]: connecting %s [%s]\n", d->id, qPrintable(d->peer.full()), qPrintable(d->sid));
 #endif
@@ -273,7 +247,7 @@ void S5BConnection::connectToJid(const Jid &peer, const QString &sid, Mode m)
 
 void S5BConnection::accept()
 {
-    if(d->state != WaitingForAccept)
+    if (d->state != WaitingForAccept)
         return;
 
     d->state = Connecting;
@@ -285,12 +259,12 @@ void S5BConnection::accept()
 
 void S5BConnection::close()
 {
-    if(d->state == Idle)
+    if (d->state == Idle)
         return;
 
-    if(d->state == WaitingForAccept)
+    if (d->state == WaitingForAccept)
         d->m->con_reject(this);
-    else if(d->state == Active)
+    else if (d->state == Active)
         d->sc->close();
 #ifdef S5B_DEBUG
     qDebug("S5BConnection[%d]: closing %s [%s]\n", d->id, qPrintable(d->peer.full()), qPrintable(d->sid));
@@ -298,46 +272,28 @@ void S5BConnection::close()
     resetConnection();
 }
 
-Jid S5BConnection::peer() const
-{
-    return d->peer;
-}
+Jid S5BConnection::peer() const { return d->peer; }
 
-QString S5BConnection::sid() const
-{
-    return d->sid;
-}
+QString S5BConnection::sid() const { return d->sid; }
 
-BytestreamManager* S5BConnection::manager() const
-{
-    return d->m;
-}
+BytestreamManager *S5BConnection::manager() const { return d->m; }
 
-bool S5BConnection::isRemote() const
-{
-    return d->remote;
-}
+bool S5BConnection::isRemote() const { return d->remote; }
 
-S5BConnection::Mode S5BConnection::mode() const
-{
-    return d->mode;
-}
+S5BConnection::Mode S5BConnection::mode() const { return d->mode; }
 
-int S5BConnection::state() const
-{
-    return d->state;
-}
+int S5BConnection::state() const { return d->state; }
 
 qint64 S5BConnection::writeData(const char *data, qint64 maxSize)
 {
-    if(d->state == Active && d->mode == Stream)
+    if (d->state == Active && d->mode == Stream)
         return d->sc->write(data, maxSize);
     return 0;
 }
 
 qint64 S5BConnection::readData(char *data, qint64 maxSize)
 {
-    if(d->sc)
+    if (d->sc)
         return d->sc->read(data, maxSize);
     else
         return 0;
@@ -345,7 +301,7 @@ qint64 S5BConnection::readData(char *data, qint64 maxSize)
 
 qint64 S5BConnection::bytesAvailable() const
 {
-    if(d->sc)
+    if (d->sc)
         return d->sc->bytesAvailable();
     else
         return 0;
@@ -353,7 +309,7 @@ qint64 S5BConnection::bytesAvailable() const
 
 qint64 S5BConnection::bytesToWrite() const
 {
-    if(d->state == Active)
+    if (d->state == Active)
         return d->sc->bytesToWrite();
     else
         return 0;
@@ -363,8 +319,8 @@ void S5BConnection::writeDatagram(const S5BDatagram &i)
 {
     QByteArray buf;
     buf.resize(i.data().size() + 4);
-    ushort ssp = htons(i.sourcePort());
-    ushort sdp = htons(i.destPort());
+    ushort     ssp  = htons(i.sourcePort());
+    ushort     sdp  = htons(i.destPort());
     QByteArray data = i.data();
     memcpy(buf.data(), &ssp, 2);
     memcpy(buf.data() + 2, &sdp, 2);
@@ -374,27 +330,24 @@ void S5BConnection::writeDatagram(const S5BDatagram &i)
 
 S5BDatagram S5BConnection::readDatagram()
 {
-    if(d->dglist.isEmpty())
+    if (d->dglist.isEmpty())
         return S5BDatagram();
-    S5BDatagram *i = d->dglist.takeFirst();
-    S5BDatagram val = *i;
+    S5BDatagram *i   = d->dglist.takeFirst();
+    S5BDatagram  val = *i;
     delete i;
     return val;
 }
 
-int S5BConnection::datagramsAvailable() const
-{
-    return d->dglist.count();
-}
+int S5BConnection::datagramsAvailable() const { return d->dglist.count(); }
 
 void S5BConnection::man_waitForAccept(const S5BRequest &r)
 {
-    d->state = WaitingForAccept;
+    d->state  = WaitingForAccept;
     d->remote = true;
-    d->req = r;
-    d->peer = r.from;
-    d->sid = r.sid;
-    d->mode = r.udp ? Datagram : Stream;
+    d->req    = r;
+    d->peer   = r.from;
+    d->sid    = r.sid;
+    d->mode   = r.udp ? Datagram : Stream;
 }
 
 void S5BConnection::man_clientReady(SocksClient *sc, SocksUDP *sc_udp)
@@ -406,7 +359,7 @@ void S5BConnection::man_clientReady(SocksClient *sc, SocksUDP *sc_udp)
     connect(d->sc, SIGNAL(bytesWritten(qint64)), SLOT(sc_bytesWritten(qint64)));
     connect(d->sc, SIGNAL(error(int)), SLOT(sc_error(int)));
 
-    if(sc_udp) {
+    if (sc_udp) {
         d->su = sc_udp;
         connect(d->su, SIGNAL(packetReady(QByteArray)), SLOT(su_packetReady(QByteArray)));
     }
@@ -418,57 +371,53 @@ void S5BConnection::man_clientReady(SocksClient *sc, SocksUDP *sc_udp)
 #endif
 
     // bytes already in the stream?
-    if(d->sc->bytesAvailable()) {
+    if (d->sc->bytesAvailable()) {
 #ifdef S5B_DEBUG
         qDebug("Stream has %d bytes in it.\n", (int)d->sc->bytesAvailable());
 #endif
         d->notifyRead = true;
     }
     // closed before it got here?
-    if(!d->sc->isOpen()) {
+    if (!d->sc->isOpen()) {
 #ifdef S5B_DEBUG
         qDebug("Stream was closed before S5B request finished?\n");
 #endif
         d->notifyClose = true;
     }
-    if(d->notifyRead || d->notifyClose)
+    if (d->notifyRead || d->notifyClose)
         QTimer::singleShot(0, this, SLOT(doPending()));
     emit connected();
 }
 
 void S5BConnection::doPending()
 {
-    if(d->notifyRead) {
-        if(d->notifyClose)
+    if (d->notifyRead) {
+        if (d->notifyClose)
             QTimer::singleShot(0, this, SLOT(doPending()));
         sc_readyRead();
-    }
-    else if(d->notifyClose)
+    } else if (d->notifyClose)
         sc_connectionClosed();
 }
 
-void S5BConnection::man_udpReady(const QByteArray &buf)
-{
-    handleUDP(buf);
-}
+void S5BConnection::man_udpReady(const QByteArray &buf) { handleUDP(buf); }
 
 void S5BConnection::man_failed(int x)
 {
     resetConnection(true);
-    if(x == S5BManager::Item::ErrRefused)
+    if (x == S5BManager::Item::ErrRefused)
         setError(ErrRefused);
-    if(x == S5BManager::Item::ErrConnect)
+    if (x == S5BManager::Item::ErrConnect)
         setError(ErrConnect);
-    if(x == S5BManager::Item::ErrWrongHost)
+    if (x == S5BManager::Item::ErrWrongHost)
         setError(ErrConnect);
-    if(x == S5BManager::Item::ErrProxy)
+    if (x == S5BManager::Item::ErrProxy)
         setError(ErrProxy);
 }
 
 void S5BConnection::sc_connectionClosed()
 {
     // if we have a pending read notification, postpone close
-    if(d->notifyRead) {
+    if (d->notifyRead) {
 #ifdef S5B_DEBUG
         qDebug("closed while pending read\n");
 #endif
@@ -488,7 +437,7 @@ void S5BConnection::sc_delayedCloseFinished()
 
 void S5BConnection::sc_readyRead()
 {
-    if(d->mode == Datagram) {
+    if (d->mode == Datagram) {
         // throw the data away
         d->sc->readAll();
         return;
@@ -511,22 +460,19 @@ void S5BConnection::sc_error(int)
     setError(ErrSocket);
 }
 
-void S5BConnection::su_packetReady(const QByteArray &buf)
-{
-    handleUDP(buf);
-}
+void S5BConnection::su_packetReady(const QByteArray &buf) { handleUDP(buf); }
 
 void S5BConnection::handleUDP(const QByteArray &buf)
 {
     // must be at least 4 bytes, to accomodate virtual ports
-    if(buf.size() < 4)
+    if (buf.size() < 4)
         return; // drop
 
     ushort ssp, sdp;
     memcpy(&ssp, buf.data(), 2);
     memcpy(&sdp, buf.data() + 2, 2);
-    int source = ntohs(ssp);
-    int dest = ntohs(sdp);
+    int        source = ntohs(ssp);
+    int        dest   = ntohs(sdp);
     QByteArray data;
     data.resize(buf.size() - 4);
     memcpy(data.data(), buf.data() + 4, data.size());
@@ -537,7 +483,7 @@ void S5BConnection::handleUDP(const QByteArray &buf)
 
 void S5BConnection::sendUDP(const QByteArray &buf)
 {
-    if(d->su)
+    if (d->su)
         d->su->write(buf);
     else
         d->m->con_sendUDP(this, buf);
@@ -546,50 +492,44 @@ void S5BConnection::sendUDP(const QByteArray &buf)
 //----------------------------------------------------------------------------
 // S5BManager
 //----------------------------------------------------------------------------
-class S5BManager::Entry
-{
+class S5BManager::Entry {
 public:
     Entry() = default;
 
-    ~Entry()
-    {
-        delete query;
-    }
+    ~Entry() { delete query; }
 
     S5BConnection *c = nullptr;
-    Item *i = nullptr;
-    QString sid;
-    JT_S5B *query = nullptr;
-    StreamHost proxyInfo;
+    Item *         i = nullptr;
+    QString        sid;
+    JT_S5B *       query = nullptr;
+    StreamHost     proxyInfo;
 
-    bool udp_init = false;
+    bool         udp_init = false;
     QHostAddress udp_addr;
-    int udp_port = 0;
+    int          udp_port = 0;
 };
 
-class S5BManager::Private
-{
+class S5BManager::Private {
 public:
-    Client *client;
-    QList<Entry*> activeList;
+    Client *          client;
+    QList<Entry *>    activeList;
     S5BConnectionList incomingConns;
-    JT_PushS5B *ps;
+    JT_PushS5B *      ps;
 };
 
-S5BManager::S5BManager(Client *parent)
-    : BytestreamManager(parent)
+S5BManager::S5BManager(Client *parent) : BytestreamManager(parent)
 {
     // S5B needs SHA1
-    //if(!QCA::isSupported(QCA::CAP_SHA1))
+    // if(!QCA::isSupported(QCA::CAP_SHA1))
     //    QCA::insertProvider(createProviderHash());
 
-    d = new Private;
+    d         = new Private;
     d->client = parent;
 
     d->ps = new JT_PushS5B(d->client->rootTask());
     connect(d->ps, SIGNAL(incoming(S5BRequest)), SLOT(ps_incoming(S5BRequest)));
-    connect(d->ps, SIGNAL(incomingUDPSuccess(Jid,QString)), SLOT(ps_incomingUDPSuccess(Jid,QString)));
-    connect(d->ps, SIGNAL(incomingActivate(Jid,QString,Jid)), SLOT(ps_incomingActivate(Jid,QString,Jid)));
+    connect(d->ps, SIGNAL(incomingUDPSuccess(Jid, QString)), SLOT(ps_incomingUDPSuccess(Jid, QString)));
+    connect(d->ps, SIGNAL(incomingActivate(Jid, QString, Jid)), SLOT(ps_incomingActivate(Jid, QString, Jid)));
 }
 
 S5BManager::~S5BManager()
@@ -601,37 +541,25 @@ S5BManager::~S5BManager()
     delete d;
 }
 
-const char* S5BManager::ns()
-{
-    return S5B_NS;
-}
+const char *S5BManager::ns() { return S5B_NS; }
 
-Client *S5BManager::client() const
-{
-    return d->client;
-}
+Client *S5BManager::client() const { return d->client; }
 
-JT_PushS5B* S5BManager::jtPush() const
-{
-    return d->ps;
-}
+JT_PushS5B *S5BManager::jtPush() const { return d->ps; }
 
-BSConnection *S5BManager::createConnection()
-{
-    return new S5BConnection(this);
-}
+BSConnection *S5BManager::createConnection() { return new S5BConnection(this); }
 
 S5BConnection *S5BManager::takeIncoming()
 {
-    if(d->incomingConns.isEmpty())
+    if (d->incomingConns.isEmpty())
         return nullptr;
 
     S5BConnection *c = d->incomingConns.takeFirst();
 
     // move to activeList
     Entry *e = new Entry;
-    e->c = c;
-    e->sid = c->d->sid;
+    e->c     = c;
+    e->sid   = c->d->sid;
     d->activeList.append(e);
 
     return c;
@@ -646,20 +574,20 @@ void S5BManager::ps_incoming(const S5BRequest &req)
     bool ok = false;
     // ensure we don't already have an incoming connection from this peer+sid
     S5BConnection *c = findIncoming(req.from, req.sid);
-    if(!c) {
+    if (!c) {
         // do we have an active entry with this sid already?
         Entry *e = findEntryBySID(req.from, req.sid);
-        if(e) {
-            if(e->i) {
+        if (e) {
+            if (e->i) {
                 // loopback
-                if(req.from.compare(d->client->jid()) && (req.id == e->i->out_id)) {
+                if (req.from.compare(d->client->jid()) && (req.id == e->i->out_id)) {
 #ifdef S5B_DEBUG
                     qDebug("ALLOWED: loopback\n");
 #endif
                     ok = true;
                 }
                 // allowed by 'fast mode'
-                else if(e->i->state == Item::Requester && e->i->targetMode == Item::Unknown) {
+                else if (e->i->state == Item::Requester && e->i->targetMode == Item::Unknown) {
 #ifdef S5B_DEBUG
                     qDebug("ALLOWED: fast-mode\n");
 #endif
@@ -667,15 +595,14 @@ void S5BManager::ps_incoming(const S5BRequest &req)
                     return;
                 }
             }
-        }
-        else {
+        } else {
 #ifdef S5B_DEBUG
             qDebug("ALLOWED: we don't have it\n");
 #endif
             ok = true;
         }
     }
-    if(!ok) {
+    if (!ok) {
         d->ps->respondError(req.from, req.id, Stanza::Error::NotAcceptable, "SID in use");
         return;
     }
@@ -690,10 +617,10 @@ void S5BManager::ps_incoming(const S5BRequest &req)
 void S5BManager::ps_incomingUDPSuccess(const Jid &from, const QString &key)
 {
     Entry *e = findEntryByHash(key);
-    if(e && e->i) {
-        if(e->i->conn)
+    if (e && e->i) {
+        if (e->i->conn)
             e->i->conn->man_udpSuccess(from);
-        else if(e->i->proxy_conn)
+        else if (e->i->proxy_conn)
             e->i->proxy_conn->man_udpSuccess(from);
     }
 }
@@ -701,7 +628,7 @@ void S5BManager::ps_incomingUDPSuccess(const Jid &from, const QString &key)
 void S5BManager::ps_incomingActivate(const Jid &from, const QString &sid, const Jid &streamHost)
 {
     Entry *e = findEntryBySID(from, sid);
-    if(e && e->i)
+    if (e && e->i)
         e->i->incomingActivate(streamHost);
 }
 
@@ -710,8 +637,7 @@ void S5BManager::doSuccess(const Jid &peer, const QString &id, const Jid &stream
     d->ps->respondSuccess(peer, id, streamHost);
 }
 
-void S5BManager::doError(const Jid &peer, const QString &id,
-                         Stanza::Error::ErrorCond cond, const QString &str)
+void S5BManager::doError(const Jid &peer, const QString &id, Stanza::Error::ErrorCond cond, const QString &str)
 {
     d->ps->respondError(peer, id, cond, str);
 }
@@ -723,15 +649,15 @@ void S5BManager::doActivate(const Jid &peer, const QString &sid, const Jid &stre
 
 bool S5BManager::isAcceptableSID(const Jid &peer, const QString &sid) const
 {
-    QString key = makeKey(sid, d->client->jid(), peer);
-    QString key_out = makeKey(sid, peer, d->client->jid()); //not valid in muc via proxy
+    QString key     = makeKey(sid, d->client->jid(), peer);
+    QString key_out = makeKey(sid, peer, d->client->jid()); // not valid in muc via proxy
 
-    foreach(Entry *e, d->activeList) {
-        if(e->i) {
+    foreach (Entry *e, d->activeList) {
+        if (e->i) {
             if (e->i->key == key || e->i->key == key_out)
                 return false;
             else {
-                for (auto &s: e->i->relatedServers) {
+                for (auto &s : e->i->relatedServers) {
                     if (s->hasKey(key) || s->hasKey(key_out)) {
                         return false;
                     }
@@ -743,15 +669,12 @@ bool S5BManager::isAcceptableSID(const Jid &peer, const QString &sid) const
     return true;
 }
 
-const char* S5BManager::sidPrefix() const
-{
-    return "s5b_";
-}
+const char *S5BManager::sidPrefix() const { return "s5b_"; }
 
 S5BConnection *S5BManager::findIncoming(const Jid &from, const QString &sid) const
 {
-    foreach(S5BConnection *c, d->incomingConns) {
-        if(c->d->peer.compare(from) && c->d->sid == sid)
+    foreach (S5BConnection *c, d->incomingConns) {
+        if (c->d->peer.compare(from) && c->d->sid == sid)
             return c;
     }
     return nullptr;
@@ -759,8 +682,8 @@ S5BConnection *S5BManager::findIncoming(const Jid &from, const QString &sid) con
 
 S5BManager::Entry *S5BManager::findEntry(S5BConnection *c) const
 {
-    foreach(Entry *e, d->activeList) {
-        if(e->c == c)
+    foreach (Entry *e, d->activeList) {
+        if (e->c == c)
             return e;
     }
     return nullptr;
@@ -768,8 +691,8 @@ S5BManager::Entry *S5BManager::findEntry(S5BConnection *c) const
 
 S5BManager::Entry *S5BManager::findEntry(Item *i) const
 {
-    foreach(Entry *e, d->activeList) {
-        if(e->i == i)
+    foreach (Entry *e, d->activeList) {
+        if (e->i == i)
             return e;
     }
     return nullptr;
@@ -777,8 +700,8 @@ S5BManager::Entry *S5BManager::findEntry(Item *i) const
 
 S5BManager::Entry *S5BManager::findEntryByHash(const QString &key) const
 {
-    foreach(Entry *e, d->activeList) {
-        if(e->i && e->i->key == key)
+    foreach (Entry *e, d->activeList) {
+        if (e->i && e->i->key == key)
             return e;
     }
     return nullptr;
@@ -786,8 +709,8 @@ S5BManager::Entry *S5BManager::findEntryByHash(const QString &key) const
 
 S5BManager::Entry *S5BManager::findEntryBySID(const Jid &peer, const QString &sid) const
 {
-    foreach(Entry *e, d->activeList) {
-        if(e->i && e->i->peer.compare(peer) && e->sid == sid)
+    foreach (Entry *e, d->activeList) {
+        if (e->i && e->i->peer.compare(peer) && e->sid == sid)
             return e;
     }
     return nullptr;
@@ -795,7 +718,7 @@ S5BManager::Entry *S5BManager::findEntryBySID(const Jid &peer, const QString &si
 
 bool S5BManager::srv_ownsHash(const QString &key) const
 {
-    if(findEntryByHash(key))
+    if (findEntryByHash(key))
         return true;
     return false;
 }
@@ -803,25 +726,26 @@ bool S5BManager::srv_ownsHash(const QString &key) const
 void S5BManager::srv_incomingReady(SocksClient *sc, const QString &key)
 {
     Entry *e = findEntryByHash(key);
-    if(!e->i->allowIncoming) {
+    if (!e->i->allowIncoming) {
         sc->requestDeny();
         return;
     }
-    if(e->c->d->mode == S5BConnection::Datagram)
+    if (e->c->d->mode == S5BConnection::Datagram)
         sc->grantUDPAssociate("", 0);
     else
         sc->grantConnect();
     e->i->setIncomingClient(sc);
 }
 
-void S5BManager::srv_incomingUDP(bool init, const QHostAddress &addr, int port, const QString &key, const QByteArray &data)
+void S5BManager::srv_incomingUDP(bool init, const QHostAddress &addr, int port, const QString &key,
+                                 const QByteArray &data)
 {
     Entry *e = findEntryByHash(key);
-    if(e->c->d->mode != S5BConnection::Datagram)
+    if (e->c->d->mode != S5BConnection::Datagram)
         return; // this key isn't in udp mode?  drop!
 
-    if(init) {
-        if(e->udp_init)
+    if (init) {
+        if (e->udp_init)
             return; // only init once
 
         // lock on to this sender
@@ -835,11 +759,11 @@ void S5BManager::srv_incomingUDP(bool init, const QHostAddress &addr, int port,
     }
 
     // not initialized yet?  something went wrong
-    if(!e->udp_init)
+    if (!e->udp_init)
         return;
 
     // must come from same source as when initialized
-    if(addr.toString() != e->udp_addr.toString() || port != e->udp_port)
+    if (addr.toString() != e->udp_addr.toString() || port != e->udp_port)
         return;
 
     e->c->man_udpReady(data);
@@ -847,14 +771,14 @@ void S5BManager::srv_incomingUDP(bool init, const QHostAddress &addr, int port,
 
 void S5BManager::con_connect(S5BConnection *c)
 {
-    if(findEntry(c))
+    if (findEntry(c))
         return;
     Entry *e = new Entry;
-    e->c = c;
-    e->sid = c->d->sid;
+    e->c     = c;
+    e->sid   = c->d->sid;
     d->activeList.append(e);
 
-    if(c->d->proxy.isValid()) {
+    if (c->d->proxy.isValid()) {
         queryProxy(e);
         return;
     }
@@ -864,11 +788,11 @@ void S5BManager::con_connect(S5BConnection *c)
 void S5BManager::con_accept(S5BConnection *c)
 {
     Entry *e = findEntry(c);
-    if(!e)
+    if (!e)
         return;
 
-    if(e->c->d->req.fast) {
-        if(targetShouldOfferProxy(e)) {
+    if (e->c->d->req.fast) {
+        if (targetShouldOfferProxy(e)) {
             queryProxy(e);
             return;
         }
@@ -878,20 +802,18 @@ void S5BManager::con_accept(S5BConnection *c)
 
 void S5BManager::con_reject(S5BConnection *c)
 {
-    d->ps->respondError(c->d->peer, c->d->req.id, Stanza::Error::NotAcceptable,
-                        "Not acceptable");
+    d->ps->respondError(c->d->peer, c->d->req.id, Stanza::Error::NotAcceptable, "Not acceptable");
 }
 
 void S5BManager::con_unlink(S5BConnection *c)
 {
     Entry *e = findEntry(c);
-    if(!e)
+    if (!e)
         return;
 
     // active incoming request?  cancel it
-    if(e->i && e->i->conn)
-        d->ps->respondError(e->i->peer, e->i->out_id,
-                            Stanza::Error::NotAcceptable, "Not acceptable");
+    if (e->i && e->i->conn)
+        d->ps->respondError(e->i->peer, e->i->out_id, Stanza::Error::NotAcceptable, "Not acceptable");
     delete e->i;
     d->activeList.removeAll(e);
     delete e;
@@ -900,18 +822,18 @@ void S5BManager::con_unlink(S5BConnection *c)
 void S5BManager::con_sendUDP(S5BConnection *c, const QByteArray &buf)
 {
     Entry *e = findEntry(c);
-    if(!e)
+    if (!e)
         return;
-    if(!e->udp_init)
+    if (!e->udp_init)
         return;
 
-    if(e->i->relatedServers.size()) // FIXME in fact we shoule keep eact related server in Connection
+    if (e->i->relatedServers.size()) // FIXME in fact we shoule keep eact related server in Connection
         e->i->relatedServers[0]->writeUDP(e->udp_addr, e->udp_port, buf);
 }
 
 void S5BManager::item_accepted()
 {
-    Item *i = static_cast<Item *>(sender());
+    Item * i = static_cast<Item *>(sender());
     Entry *e = findEntry(i);
 
     emit e->c->accepted(); // signal
@@ -919,7 +841,7 @@ void S5BManager::item_accepted()
 
 void S5BManager::item_tryingHosts(const StreamHostList &list)
 {
-    Item *i = static_cast<Item *>(sender());
+    Item * i = static_cast<Item *>(sender());
     Entry *e = findEntry(i);
 
     e->c->tryingHosts(list); // signal
@@ -927,7 +849,7 @@ void S5BManager::item_tryingHosts(const StreamHostList &list)
 
 void S5BManager::item_proxyConnect()
 {
-    Item *i = static_cast<Item *>(sender());
+    Item * i = static_cast<Item *>(sender());
     Entry *e = findEntry(i);
 
     e->c->proxyConnect(); // signal
@@ -935,7 +857,7 @@ void S5BManager::item_proxyConnect()
 
 void S5BManager::item_waitingForActivation()
 {
-    Item *i = static_cast<Item *>(sender());
+    Item * i = static_cast<Item *>(sender());
     Entry *e = findEntry(i);
 
     e->c->waitingForActivation(); // signal
@@ -943,14 +865,14 @@ void S5BManager::item_waitingForActivation()
 
 void S5BManager::item_connected()
 {
-    Item *i = static_cast<Item *>(sender());
+    Item * i = static_cast<Item *>(sender());
     Entry *e = findEntry(i);
 
     // grab the client
-    SocksClient *client = i->client;
-    i->client = nullptr;
+    SocksClient *client  = i->client;
+    i->client            = nullptr;
     SocksUDP *client_udp = i->client_udp;
-    i->client_udp = nullptr;
+    i->client_udp        = nullptr;
 
     // give it to the connection
     e->c->man_clientReady(client, client_udp);
@@ -958,7 +880,7 @@ void S5BManager::item_connected()
 
 void S5BManager::item_error(int x)
 {
-    Item *i = static_cast<Item *>(sender());
+    Item * i = static_cast<Item *>(sender());
     Entry *e = findEntry(i);
 
     e->c->man_failed(x);
@@ -966,7 +888,7 @@ void S5BManager::item_error(int x)
 
 void S5BManager::entryContinue(Entry *e)
 {
-    e->i = new Item(this);
+    e->i        = new Item(this);
     e->i->proxy = e->proxyInfo;
 
     connect(e->i, SIGNAL(accepted()), SLOT(item_accepted()));
@@ -976,12 +898,12 @@ void S5BManager::entryContinue(Entry *e)
     connect(e->i, SIGNAL(connected()), SLOT(item_connected()));
     connect(e->i, SIGNAL(error(int)), SLOT(item_error(int)));
 
-    if(e->c->isRemote()) {
+    if (e->c->isRemote()) {
         const S5BRequest &req = e->c->d->req;
         e->i->startTarget(e->sid, d->client->jid(), e->c->d->peer, req.dstaddr, req.hosts, req.id, req.fast, req.udp);
-    }
-    else {
-        e->i->startRequester(e->sid, d->client->jid(), e->c->d->peer, true, e->c->d->mode == S5BConnection::Datagram ? true: false);
+    } else {
+        e->i->startRequester(e->sid, d->client->jid(), e->c->d->peer, true,
+                             e->c->d->mode == S5BConnection::Datagram ? true : false);
         e->c->requesting(); // signal
     }
 }
@@ -990,7 +912,7 @@ void S5BManager::queryProxy(Entry *e)
 {
     QPointer<QObject> self = this;
     e->c->proxyQuery(); // signal
-    if(!self)
+    if (!self)
         return;
 
 #ifdef S5B_DEBUG
@@ -1005,27 +927,26 @@ void S5BManager::queryProxy(Entry *e)
 void S5BManager::query_finished()
 {
     JT_S5B *query = static_cast<JT_S5B *>(sender());
-    Entry* e = nullptr;
-    foreach(Entry* i, d->activeList) {
-        if(i->query == query) {
+    Entry * e     = nullptr;
+    foreach (Entry *i, d->activeList) {
+        if (i->query == query) {
             e = i;
             break;
         }
     }
-    if(!e)
+    if (!e)
         return;
     e->query = nullptr;
 
 #ifdef S5B_DEBUG
     qDebug("query finished: ");
 #endif
-    if(query->success()) {
+    if (query->success()) {
         e->proxyInfo = query->proxyInfo();
 #ifdef S5B_DEBUG
         qDebug("host/ip=[%s] port=[%d]\n", qPrintable(e->proxyInfo.host()), e->proxyInfo.port());
 #endif
-    }
-    else {
+    } else {
 #ifdef S5B_DEBUG
         qDebug("fail\n");
 #endif
@@ -1033,7 +954,7 @@ void S5BManager::query_finished()
 
     QPointer<QObject> self = this;
     e->c->proxyResult(query->success()); // signal
-    if(!self)
+    if (!self)
         return;
 
     entryContinue(e);
@@ -1041,18 +962,18 @@ void S5BManager::query_finished()
 
 bool S5BManager::targetShouldOfferProxy(Entry *e)
 {
-    if(!e->c->d->proxy.isValid())
+    if (!e->c->d->proxy.isValid())
         return false;
 
     // if target, don't offer any proxy if the requester already did
     const StreamHostList &hosts = e->c->d->req.hosts;
-    for(StreamHostList::ConstIterator it = hosts.begin(); it != hosts.end(); ++it) {
-        if((*it).isProxy())
+    for (StreamHostList::ConstIterator it = hosts.begin(); it != hosts.end(); ++it) {
+        if ((*it).isProxy())
             return false;
     }
 
     // ensure we don't offer the same proxy as the requester
-    if(haveHost(hosts, e->c->d->proxy))
+    if (haveHost(hosts, e->c->d->proxy))
         return false;
 
     return true;
@@ -1061,21 +982,13 @@ bool S5BManager::targetShouldOfferProxy(Entry *e)
 //----------------------------------------------------------------------------
 // S5BManager::Item
 //----------------------------------------------------------------------------
-S5BManager::Item::Item(S5BManager *manager)
-    : QObject(nullptr)
-    , m(manager)
-{
-    resetConnection();
-}
+S5BManager::Item::Item(S5BManager *manager) : QObject(nullptr), m(manager) { resetConnection(); }
 
-S5BManager::Item::~Item()
-{
-    resetConnection();
-}
+S5BManager::Item::~Item() { resetConnection(); }
 
 void S5BManager::Item::resetConnection()
 {
-    for (auto &s: relatedServers) {
+    for (auto &s : relatedServers) {
         s->unregisterKey(key);
         s.reset();
     }
@@ -1104,56 +1017,56 @@ void S5BManager::Item::resetConnection()
     delete client_out;
     client_out = nullptr;
 
-    state = Idle;
-    wantFast = false;
-    targetMode = Unknown;
-    fast = false;
-    activated = false;
-    lateProxy = false;
-    connSuccess = false;
-    localFailed = false;
-    remoteFailed = false;
+    state         = Idle;
+    wantFast      = false;
+    targetMode    = Unknown;
+    fast          = false;
+    activated     = false;
+    lateProxy     = false;
+    connSuccess   = false;
+    localFailed   = false;
+    remoteFailed  = false;
     allowIncoming = false;
-    udp = false;
+    udp           = false;
 }
 
 void S5BManager::Item::startRequester(const QString &_sid, const Jid &_self, const Jid &_peer, bool fast, bool _udp)
 {
-    sid = _sid;
-    self = _self;
-    peer = _peer;
-    key = makeKey(sid, self, peer);
-    out_key = makeKey(sid, peer, self);
+    sid      = _sid;
+    self     = _self;
+    peer     = _peer;
+    key      = makeKey(sid, self, peer);
+    out_key  = makeKey(sid, peer, self);
     wantFast = fast;
-    udp = _udp;
+    udp      = _udp;
 
 #ifdef S5B_DEBUG
-    qDebug("S5BManager::Item initiating request %s [%s] (inhash=%s)\n", qPrintable(peer.full()), qPrintable(sid), qPrintable(key));
+    qDebug("S5BManager::Item initiating request %s [%s] (inhash=%s)\n", qPrintable(peer.full()), qPrintable(sid),
+           qPrintable(key));
 #endif
     state = Requester;
     doOutgoing();
 }
 
-void S5BManager::Item::startTarget(const QString &_sid, const Jid &_self,
-                                   const Jid &_peer, const QString &_dstaddr,
-                                   const StreamHostList &hosts, const QString &iq_id,
-                                   bool _fast, bool _udp)
+void S5BManager::Item::startTarget(const QString &_sid, const Jid &_self, const Jid &_peer, const QString &_dstaddr,
+                                   const StreamHostList &hosts, const QString &iq_id, bool _fast, bool _udp)
 {
-    sid = _sid;
-    peer = _peer;
-    self = _self;
+    sid      = _sid;
+    peer     = _peer;
+    self     = _self;
     in_hosts = hosts;
-    in_id = iq_id;
-    fast = _fast;
-    key = makeKey(sid, self, peer);
-    out_key = _dstaddr.isEmpty() ? makeKey(sid, peer, self) : _dstaddr;
-    udp = _udp;
+    in_id    = iq_id;
+    fast     = _fast;
+    key      = makeKey(sid, self, peer);
+    out_key  = _dstaddr.isEmpty() ? makeKey(sid, peer, self) : _dstaddr;
+    udp      = _udp;
 
 #ifdef S5B_DEBUG
-    qDebug("S5BManager::Item incoming request %s [%s] (inhash=%s)\n", qPrintable(peer.full()), qPrintable(sid), qPrintable(key));
+    qDebug("S5BManager::Item incoming request %s [%s] (inhash=%s)\n", qPrintable(peer.full()), qPrintable(sid),
+           qPrintable(key));
 #endif
     state = Target;
-    if(fast)
+    if (fast)
         doOutgoing();
     doIncoming();
 }
@@ -1163,17 +1076,16 @@ void S5BManager::Item::handleFast(const StreamHostList &hosts, const QString &iq
     targetMode = Fast;
 
     QPointer<QObject> self = this;
-    emit accepted();
-    if(!self)
+    emit              accepted();
+    if (!self)
         return;
 
     // if we already have a stream, then bounce this request
-    if(client) {
+    if (client) {
         m->doError(peer, iq_id, Stanza::Error::NotAcceptable, "Not acceptable");
-    }
-    else {
+    } else {
         in_hosts = hosts;
-        in_id = iq_id;
+        in_id    = iq_id;
         doIncoming();
     }
 }
@@ -1181,8 +1093,8 @@ void S5BManager::Item::handleFast(const StreamHostList &hosts, const QString &iq
 void S5BManager::Item::doOutgoing()
 {
     StreamHostList hosts;
-    auto disco = m->client()->tcpPortReserver()->scope(QString::fromLatin1("s5b"))->disco();
-    if(!haveHost(in_hosts, self)) {
+    auto           disco = m->client()->tcpPortReserver()->scope(QString::fromLatin1("s5b"))->disco();
+    if (!haveHost(in_hosts, self)) {
         foreach (auto &c, disco->takeServers()) {
             auto server = c.staticCast<S5BServer>();
             server->registerKey(key);
@@ -1192,11 +1104,13 @@ void S5BManager::Item::doOutgoing()
                     m->srv_incomingReady(c, key);
                 }
             });
-            connect(server.data(), &S5BServer::incomingUdp, this, [this](bool isInit, const QHostAddress &addr, int sourcePort, const QString &key, const QByteArray &data) {
-                if (key == this->key) {
-                    m->srv_incomingUDP(isInit, addr, sourcePort, key, data);
-                }
-            });
+            connect(server.data(), &S5BServer::incomingUdp, this,
+                    [this](bool isInit, const QHostAddress &addr, int sourcePort, const QString &key,
+                           const QByteArray &data) {
+                        if (key == this->key) {
+                            m->srv_incomingUDP(isInit, addr, sourcePort, key, data);
+                        }
+                    });
             StreamHost h;
             h.setJid(self);
             h.setHost(c->publishHost());
@@ -1207,11 +1121,11 @@ void S5BManager::Item::doOutgoing()
     delete disco; // FIXME we could start listening for signals instead. it may send us upnp candidate
 
     // if the proxy is valid, then it's ok to add (the manager already ensured that it doesn't conflict)
-    if(proxy.jid().isValid())
+    if (proxy.jid().isValid())
         hosts += proxy;
 
     // if we're the target and we have no streamhosts of our own, then don't even bother with fast-mode
-    if(state == Target && hosts.isEmpty()) {
+    if (state == Target && hosts.isEmpty()) {
         fast = false;
         return;
     }
@@ -1227,40 +1141,38 @@ void S5BManager::Item::doOutgoing()
 
 void S5BManager::Item::doIncoming()
 {
-    if(in_hosts.isEmpty()) {
+    if (in_hosts.isEmpty()) {
         doConnectError();
         return;
     }
 
     StreamHostList list;
-    if(lateProxy) {
+    if (lateProxy) {
         // take just the proxy streamhosts
-        foreach (const StreamHost& it, in_hosts) {
+        foreach (const StreamHost &it, in_hosts) {
             if (it.isProxy())
                 list += it;
         }
         lateProxy = false;
-    }
-    else {
+    } else {
         // only try doing the late proxy trick if using fast mode AND we did not offer a proxy
-        if((state == Requester || (state == Target && fast)) && !proxy.jid().isValid()) {
+        if ((state == Requester || (state == Target && fast)) && !proxy.jid().isValid()) {
             // take just the non-proxy streamhosts
             bool hasProxies = false;
-            foreach (const StreamHost& it, in_hosts) {
+            foreach (const StreamHost &it, in_hosts) {
                 if (it.isProxy())
                     hasProxies = true;
                 else
                     list += it;
             }
-            if(hasProxies) {
+            if (hasProxies) {
                 lateProxy = true;
 
                 // no regular streamhosts?  wait for remote error
-                if(list.isEmpty())
+                if (list.isEmpty())
                     return;
             }
-        }
-        else
+        } else
             list = in_hosts;
     }
 
@@ -1269,7 +1181,7 @@ void S5BManager::Item::doIncoming()
 
     QPointer<QObject> self = this;
     tryingHosts(list);
-    if(!self)
+    if (!self)
         return;
 
     conn->start(this->self, list, out_key, udp, lateProxy ? 10 : 30);
@@ -1286,13 +1198,13 @@ void S5BManager::Item::setIncomingClient(SocksClient *sc)
     connect(sc, SIGNAL(error(int)), SLOT(sc_error(int)));
 
     sc->setParent(nullptr); // avoid deleting it by SocksServer destructor
-    client = sc;
+    client        = sc;
     allowIncoming = false;
 }
 
 void S5BManager::Item::incomingActivate(const Jid &streamHost)
 {
-    if(!activated) {
+    if (!activated) {
         activatedStream = streamHost;
         checkForActivation();
     }
@@ -1301,31 +1213,31 @@ void S5BManager::Item::incomingActivate(const Jid &streamHost)
 void S5BManager::Item::jt_finished()
 {
     JT_S5B *j = task;
-    task = nullptr;
+    task      = nullptr;
 
 #ifdef S5B_DEBUG
     qDebug("jt_finished: state=%s, %s\n", state == Requester ? "requester" : "target", j->success() ? "ok" : "fail");
 #endif
 
-    if(state == Requester) {
-        if(targetMode == Unknown) {
-            targetMode = NotFast;
+    if (state == Requester) {
+        if (targetMode == Unknown) {
+            targetMode             = NotFast;
             QPointer<QObject> self = this;
-            emit accepted();
-            if(!self)
+            emit              accepted();
+            if (!self)
                 return;
         }
     }
 
     // if we've already reported successfully connecting to them, then this response doesn't matter
-    if(state == Requester && connSuccess) {
+    if (state == Requester && connSuccess) {
         tryActivation();
         return;
     }
 
-    if(j->success()) {
+    if (j->success()) {
         // stop connecting out
-        if(conn || lateProxy) {
+        if (conn || lateProxy) {
             delete conn;
             conn = nullptr;
             doConnectError();
@@ -1334,27 +1246,25 @@ void S5BManager::Item::jt_finished()
         Jid streamHost = j->streamHostUsed();
 
         // they connected to us?
-        if(streamHost.compare(self)) {
-            if(client) {
-                if(state == Requester) {
+        if (streamHost.compare(self)) {
+            if (client) {
+                if (state == Requester) {
                     activatedStream = streamHost;
                     tryActivation();
-                }
-                else
+                } else
                     checkForActivation();
-            }
-            else {
+            } else {
 #ifdef S5B_DEBUG
-                qDebug("S5BManager::Item %s claims to have connected to us, but we don't see this\n", qPrintable(peer.full()));
+                qDebug("S5BManager::Item %s claims to have connected to us, but we don't see this\n",
+                       qPrintable(peer.full()));
 #endif
                 resetConnection();
                 error(ErrWrongHost);
             }
-        }
-        else if(streamHost.compare(proxy.jid())) {
+        } else if (streamHost.compare(proxy.jid())) {
             // toss out any direct incoming, since it won't be used
             delete client;
-            client = nullptr;
+            client        = nullptr;
             allowIncoming = false;
 
 #ifdef S5B_DEBUG
@@ -1368,33 +1278,31 @@ void S5BManager::Item::jt_finished()
 
             QPointer<QObject> self = this;
             proxyConnect();
-            if(!self)
+            if (!self)
                 return;
 
             proxy_conn->start(this->self, list, key, udp, 30);
-        }
-        else {
+        } else {
 #ifdef S5B_DEBUG
-            qDebug("S5BManager::Item %s claims to have connected to a streamhost we never offered\n", qPrintable(peer.full()));
+            qDebug("S5BManager::Item %s claims to have connected to a streamhost we never offered\n",
+                   qPrintable(peer.full()));
 #endif
             resetConnection();
             error(ErrWrongHost);
         }
-    }
-    else {
+    } else {
 #ifdef S5B_DEBUG
         qDebug("S5BManager::Item %s [%s] error\n", qPrintable(peer.full()), qPrintable(sid));
 #endif
         remoteFailed = true;
-        statusCode = j->statusCode();
+        statusCode   = j->statusCode();
 
-        if(lateProxy) {
-            if(!conn)
+        if (lateProxy) {
+            if (!conn)
                 doIncoming();
-        }
-        else {
+        } else {
             // if connSuccess is true at this point, then we're a Target
-            if(connSuccess)
+            if (connSuccess)
                 checkForActivation();
             else
                 checkFailure();
@@ -1404,17 +1312,16 @@ void S5BManager::Item::jt_finished()
 
 void S5BManager::Item::conn_result(bool b)
 {
-    if(b) {
-        SocksClient *sc = conn->takeClient();
-        SocksUDP *sc_udp = conn->takeUDP();
-        StreamHost h = conn->streamHostUsed();
+    if (b) {
+        SocksClient *sc     = conn->takeClient();
+        SocksUDP *   sc_udp = conn->takeUDP();
+        StreamHost   h      = conn->streamHostUsed();
         delete conn;
-        conn = nullptr;
+        conn        = nullptr;
         connSuccess = true;
 
 #ifdef S5B_DEBUG
-        qDebug("S5BManager::Item: %s [%s] successful outgoing connection\n",
-               qPrintable(peer.full()), qPrintable(sid));
+        qDebug("S5BManager::Item: %s [%s] successful outgoing connection\n", qPrintable(peer.full()), qPrintable(sid));
 #endif
 
         connect(sc, SIGNAL(readyRead()), SLOT(sc_readyRead()));
@@ -1427,32 +1334,29 @@ void S5BManager::Item::conn_result(bool b)
         lateProxy = false;
 
         // if requester, run with this one
-        if(state == Requester) {
+        if (state == Requester) {
             // if we had an incoming one, toss it
             delete client_udp;
             client_udp = sc_udp;
             delete client;
-            client = sc;
-            allowIncoming = false;
+            client          = sc;
+            allowIncoming   = false;
             activatedStream = peer;
             tryActivation();
-        }
-        else {
+        } else {
             client_out_udp = sc_udp;
-            client_out = sc;
+            client_out     = sc;
             checkForActivation();
         }
-    }
-    else {
+    } else {
         delete conn;
         conn = nullptr;
 
         // if we delayed the proxies for later, try now
-        if(lateProxy) {
-            if(remoteFailed)
+        if (lateProxy) {
+            if (remoteFailed)
                 doIncoming();
-        }
-        else
+        } else
             doConnectError();
     }
 }
@@ -1462,9 +1366,9 @@ void S5BManager::Item::proxy_result(bool b)
 #ifdef S5B_DEBUG
     qDebug("proxy_result: %s\n", b ? "ok" : "fail");
 #endif
-    if(b) {
-        SocksClient *sc = proxy_conn->takeClient();
-        SocksUDP *sc_udp = proxy_conn->takeUDP();
+    if (b) {
+        SocksClient *sc     = proxy_conn->takeClient();
+        SocksUDP *   sc_udp = proxy_conn->takeUDP();
         delete proxy_conn;
         proxy_conn = nullptr;
 
@@ -1472,7 +1376,7 @@ void S5BManager::Item::proxy_result(bool b)
         connect(sc, SIGNAL(bytesWritten(qint64)), SLOT(sc_bytesWritten(qint64)));
         connect(sc, SIGNAL(error(int)), SLOT(sc_error(int)));
 
-        client = sc;
+        client     = sc;
         client_udp = sc_udp;
 
         // activate
@@ -1483,8 +1387,7 @@ void S5BManager::Item::proxy_result(bool b)
         connect(proxy_task, SIGNAL(finished()), SLOT(proxy_finished()));
         proxy_task->requestActivation(proxy.jid(), sid, peer);
         proxy_task->go(true);
-    }
-    else {
+    } else {
         delete proxy_conn;
         proxy_conn = nullptr;
         resetConnection();
@@ -1494,21 +1397,19 @@ void S5BManager::Item::proxy_result(bool b)
 
 void S5BManager::Item::proxy_finished()
 {
-    JT_S5B *j = proxy_task;
+    JT_S5B *j  = proxy_task;
     proxy_task = nullptr;
 
-    if(j->success()) {
+    if (j->success()) {
 #ifdef S5B_DEBUG
         qDebug("proxy stream activated\n");
 #endif
-        if(state == Requester) {
+        if (state == Requester) {
             activatedStream = proxy.jid();
             tryActivation();
-        }
-        else
+        } else
             checkForActivation();
-    }
-    else {
+    } else {
         resetConnection();
         error(ErrProxy);
     }
@@ -1520,7 +1421,7 @@ void S5BManager::Item::sc_readyRead()
     qDebug("sc_readyRead\n");
 #endif
     // only targets check for activation, and only should do it if there is no pending outgoing iq-set
-    if(state == Target && !task && !proxy_task)
+    if (state == Target && !task && !proxy_task)
         checkForActivation();
 }
 
@@ -1545,8 +1446,7 @@ void S5BManager::Item::sc_error(int)
 void S5BManager::Item::doConnectError()
 {
     localFailed = true;
-    m->doError(peer, in_id, Stanza::Error::RemoteServerNotFound,
-               "Could not connect to given hosts");
+    m->doError(peer, in_id, Stanza::Error::RemoteServerNotFound, "Could not connect to given hosts");
     checkFailure();
 }
 
@@ -1555,21 +1455,20 @@ void S5BManager::Item::tryActivation()
 #ifdef S5B_DEBUG
     qDebug("tryActivation\n");
 #endif
-    if(activated) {
+    if (activated) {
 #ifdef S5B_DEBUG
         qDebug("already activated !?\n");
 #endif
         return;
     }
 
-    if(targetMode == NotFast) {
+    if (targetMode == NotFast) {
 #ifdef S5B_DEBUG
         qDebug("tryActivation: NotFast\n");
 #endif
         // nothing to activate, we're done
         finished();
-    }
-    else if(targetMode == Fast) {
+    } else if (targetMode == Fast) {
         // with fast mode, we don't wait for the iq reply, so delete the task (if any)
         delete task;
         task = nullptr;
@@ -1577,10 +1476,9 @@ void S5BManager::Item::tryActivation()
         activated = true;
 
         // if udp, activate using special stanza
-        if(udp) {
+        if (udp) {
             m->doActivate(peer, sid, activatedStream);
-        }
-        else {
+        } else {
 #ifdef S5B_DEBUG
             qDebug("sending extra CR\n");
 #endif
@@ -1592,31 +1490,31 @@ void S5BManager::Item::tryActivation()
 
 void S5BManager::Item::checkForActivation()
 {
-    QList<SocksClient*> clientList;
-    if(client)
+    QList<SocksClient *> clientList;
+    if (client)
         clientList.append(client);
-    if(client_out)
+    if (client_out)
         clientList.append(client_out);
-    foreach(SocksClient *sc, clientList) {
+    foreach (SocksClient *sc, clientList) {
 #ifdef S5B_DEBUG
         qDebug("checking for activation\n");
 #endif
-        if(fast) {
+        if (fast) {
             bool ok = false;
-            if(udp) {
-                if((sc == client_out && activatedStream.compare(self)) || (sc == client && !activatedStream.compare(self))) {
+            if (udp) {
+                if ((sc == client_out && activatedStream.compare(self))
+                    || (sc == client && !activatedStream.compare(self))) {
                     clientList.removeAll(sc);
                     ok = true;
                 }
-            }
-            else {
+            } else {
 #ifdef S5B_DEBUG
                 qDebug("need CR\n");
 #endif
-                if(sc->bytesAvailable() >= 1) {
+                if (sc->bytesAvailable() >= 1) {
                     clientList.removeAll(sc);
                     char c;
-                    if(!sc->getChar(&c) || c != '\r') {
+                    if (!sc->getChar(&c) || c != '\r') {
                         delete sc; // FIXME breaks S5BManager::Item destructor?
                         return;
                     }
@@ -1624,34 +1522,32 @@ void S5BManager::Item::checkForActivation()
                 }
             }
 
-            if(ok) {
+            if (ok) {
                 SocksUDP *sc_udp = nullptr;
-                if(sc == client) {
+                if (sc == client) {
                     delete client_out_udp;
                     client_out_udp = nullptr;
-                    sc_udp = client_udp;
-                }
-                else if(sc == client_out) {
+                    sc_udp         = client_udp;
+                } else if (sc == client_out) {
                     delete client_udp;
                     client_udp = nullptr;
-                    sc_udp = client_out_udp;
+                    sc_udp     = client_out_udp;
                 }
 
                 sc->disconnect(this);
                 while (!clientList.isEmpty()) {
                     delete clientList.takeFirst();
                 }
-                client = sc;
+                client     = sc;
                 client_out = nullptr;
                 client_udp = sc_udp;
-                activated = true;
+                activated  = true;
 #ifdef S5B_DEBUG
                 qDebug("activation success\n");
 #endif
                 break;
             }
-        }
-        else {
+        } else {
 #ifdef S5B_DEBUG
             qDebug("not fast mode, no need to wait for anything\n");
 #endif
@@ -1660,19 +1556,18 @@ void S5BManager::Item::checkForActivation()
             while (!clientList.isEmpty()) {
                 delete clientList.takeFirst();
             }
-            client = sc;
+            client     = sc;
             client_out = nullptr;
-            activated = true;
+            activated  = true;
             break;
         }
     }
 
-    if(activated) {
+    if (activated) {
         finished();
-    }
-    else {
+    } else {
         // only emit waitingForActivation if there is nothing left to do
-        if((connSuccess || localFailed) && !proxy_task && !proxy_conn)
+        if ((connSuccess || localFailed) && !proxy_task && !proxy_conn)
             waitingForActivation();
     }
 }
@@ -1680,28 +1575,26 @@ void S5BManager::Item::checkForActivation()
 void S5BManager::Item::checkFailure()
 {
     bool failed = false;
-    if(state == Requester) {
-        if(remoteFailed) {
-            if((localFailed && targetMode == Fast) || targetMode == NotFast)
+    if (state == Requester) {
+        if (remoteFailed) {
+            if ((localFailed && targetMode == Fast) || targetMode == NotFast)
                 failed = true;
         }
-    }
-    else {
-        if(localFailed) {
-            if((remoteFailed && fast) || !fast)
+    } else {
+        if (localFailed) {
+            if ((remoteFailed && fast) || !fast)
                 failed = true;
         }
     }
 
-    if(failed) {
-        if(state == Requester) {
+    if (failed) {
+        if (state == Requester) {
             resetConnection();
-            if(statusCode == 404)
+            if (statusCode == 404)
                 error(ErrConnect);
             else
                 error(ErrRefused);
-        }
-        else {
+        } else {
             resetConnection();
             error(ErrConnect);
         }
@@ -1721,43 +1614,30 @@ void S5BManager::Item::finished()
 //----------------------------------------------------------------------------
 // S5BConnector
 //----------------------------------------------------------------------------
-class S5BConnector::Item : public QObject
-{
+class S5BConnector::Item : public QObject {
     Q_OBJECT
 public:
     SocksClient *client;
-    SocksUDP *client_udp;
-    StreamHost host;
-    QString key;
-    bool udp;
-    int udp_tries;
-    QTimer t;
-    Jid jid;
-
-    Item(const Jid &self, const StreamHost &_host, const QString &_key, bool _udp)
-        : QObject(nullptr)
-        , client(new SocksClient)
-        , client_udp(nullptr)
-        , host(_host)
-        , key(_key)
-        , udp(_udp)
-        , udp_tries(0)
-        , jid(self)
+    SocksUDP *   client_udp;
+    StreamHost   host;
+    QString      key;
+    bool         udp;
+    int          udp_tries;
+    QTimer       t;
+    Jid          jid;
+
+    Item(const Jid &self, const StreamHost &_host, const QString &_key, bool _udp) :
+        QObject(nullptr), client(new SocksClient), client_udp(nullptr), host(_host), key(_key), udp(_udp), udp_tries(0),
+        jid(self)
     {
         connect(client, SIGNAL(connected()), SLOT(sc_connected()));
         connect(client, SIGNAL(error(int)), SLOT(sc_error(int)));
         connect(&t, SIGNAL(timeout()), SLOT(trySendUDP()));
     }
 
-    ~Item()
-    {
-        cleanup();
-    }
+    ~Item() { cleanup(); }
 
-    void start()
-    {
-        client->connectToHost(host.host(), host.port(), key, 0, udp);
-    }
+    void start() { client->connectToHost(host.host(), host.port(), key, 0, udp); }
 
     void udpSuccess()
     {
@@ -1773,10 +1653,10 @@ private slots:
     void sc_connected()
     {
         // if udp, need to send init packet before we are good
-        if(udp) {
+        if (udp) {
             // port 1 is init
             client_udp = client->createUDP(key, 1, client->peerAddress(), client->peerPort());
-            udp_tries = 0;
+            udp_tries  = 0;
             t.start(5000);
             trySendUDP();
             return;
@@ -1796,7 +1676,7 @@ private slots:
 
     void trySendUDP()
     {
-        if(udp_tries == 5) {
+        if (udp_tries == 5) {
             t.stop();
             cleanup();
             result(false);
@@ -1828,22 +1708,20 @@ private slots:
     }
 };
 
-class S5BConnector::Private
-{
+class S5BConnector::Private {
 public:
-    SocksClient *active;
-    SocksUDP *active_udp;
-    QList<Item*> itemList;
-    QString key;
-    StreamHost activeHost;
-    QTimer t;
+    SocksClient * active;
+    SocksUDP *    active_udp;
+    QList<Item *> itemList;
+    QString       key;
+    StreamHost    activeHost;
+    QTimer        t;
 };
 
-S5BConnector::S5BConnector(QObject *parent)
-:QObject(parent)
+S5BConnector::S5BConnector(QObject *parent) : QObject(parent)
 {
-    d = new Private;
-    d->active = nullptr;
+    d             = new Private;
+    d->active     = nullptr;
     d->active_udp = nullptr;
     connect(&d->t, SIGNAL(timeout()), SLOT(t_timeout()));
 }
@@ -1873,7 +1751,7 @@ void S5BConnector::start(const Jid &self, const StreamHostList &hosts, const QSt
 #ifdef S5B_DEBUG
     qDebug("S5BConnector: starting [%p]!\n", this);
 #endif
-    for(StreamHostList::ConstIterator it = hosts.begin(); it != hosts.end(); ++it) {
+    for (StreamHostList::ConstIterator it = hosts.begin(); it != hosts.end(); ++it) {
         Item *i = new Item(self, *it, key, udp);
         connect(i, SIGNAL(result(bool)), SLOT(item_result(bool)));
         d->itemList.append(i);
@@ -1885,28 +1763,25 @@ void S5BConnector::start(const Jid &self, const StreamHostList &hosts, const QSt
 SocksClient *S5BConnector::takeClient()
 {
     SocksClient *c = d->active;
-    d->active = nullptr;
+    d->active      = nullptr;
     return c;
 }
 
 SocksUDP *S5BConnector::takeUDP()
 {
-    SocksUDP *c = d->active_udp;
+    SocksUDP *c   = d->active_udp;
     d->active_udp = nullptr;
     return c;
 }
 
-StreamHost S5BConnector::streamHostUsed() const
-{
-    return d->activeHost;
-}
+StreamHost S5BConnector::streamHostUsed() const { return d->activeHost; }
 
 void S5BConnector::item_result(bool b)
 {
     Item *i = static_cast<Item *>(sender());
-    if(b) {
-        d->active = i->client;
-        i->client = nullptr;
+    if (b) {
+        d->active     = i->client;
+        i->client     = nullptr;
         d->active_udp = i->client_udp;
         i->client_udp = nullptr;
         d->activeHost = i->host;
@@ -1918,11 +1793,10 @@ void S5BConnector::item_result(bool b)
         qDebug("S5BConnector: complete! [%p]\n", this);
 #endif
         emit result(true);
-    }
-    else {
+    } else {
         d->itemList.removeAll(i);
         delete i;
-        if(d->itemList.isEmpty()) {
+        if (d->itemList.isEmpty()) {
             d->t.stop();
 #ifdef S5B_DEBUG
             qDebug("S5BConnector: failed! [%p]\n", this);
@@ -1944,8 +1818,8 @@ void S5BConnector::t_timeout()
 void S5BConnector::man_udpSuccess(const Jid &streamHost)
 {
     // was anyone sending to this streamhost?
-    foreach(Item *i, d->itemList) {
-        if(i->host.jid().compare(streamHost) && i->client_udp) {
+    foreach (Item *i, d->itemList) {
+        if (i->host.jid().compare(streamHost) && i->client_udp) {
             i->udpSuccess();
             return;
         }
@@ -1955,57 +1829,52 @@ void S5BConnector::man_udpSuccess(const Jid &streamHost)
 //----------------------------------------------------------------------------
 // JT_S5B
 //----------------------------------------------------------------------------
-class JT_S5B::Private
-{
+class JT_S5B::Private {
 public:
     QDomElement iq;
-    Jid to;
-    Jid streamHost;
-    StreamHost proxyInfo;
-    int mode;
-    QTimer t;
+    Jid         to;
+    Jid         streamHost;
+    StreamHost  proxyInfo;
+    int         mode;
+    QTimer      t;
 };
 
-JT_S5B::JT_S5B(Task *parent)
-:Task(parent)
+JT_S5B::JT_S5B(Task *parent) : Task(parent)
 {
-    d = new Private;
+    d       = new Private;
     d->mode = -1;
     connect(&d->t, SIGNAL(timeout()), SLOT(t_timeout()));
 }
 
-JT_S5B::~JT_S5B()
-{
-    delete d;
-}
+JT_S5B::~JT_S5B() { delete d; }
 
-void JT_S5B::request(const Jid &to, const QString &sid, const QString &dstaddr,
-                     const StreamHostList &hosts, bool fast, bool udp)
+void JT_S5B::request(const Jid &to, const QString &sid, const QString &dstaddr, const StreamHostList &hosts, bool fast,
+                     bool udp)
 {
     d->mode = 0;
 
     QDomElement iq;
-    d->to = to;
-    iq = createIQ(doc(), "set", to.full(), id());
+    d->to             = to;
+    iq                = createIQ(doc(), "set", to.full(), id());
     QDomElement query = doc()->createElementNS(S5B_NS, "query");
     query.setAttribute("sid", sid);
     if (!client()->groupChatNick(to.domain(), to.node()).isEmpty()) {
         query.setAttribute("dstaddr", dstaddr); // special case for muc as in xep-0065rc3
     }
-    query.setAttribute("mode", udp ? "udp" : "tcp" );
+    query.setAttribute("mode", udp ? "udp" : "tcp");
     iq.appendChild(query);
-    for(StreamHostList::ConstIterator it = hosts.begin(); it != hosts.end(); ++it) {
+    for (StreamHostList::ConstIterator it = hosts.begin(); it != hosts.end(); ++it) {
         QDomElement shost = doc()->createElement("streamhost");
         shost.setAttribute("jid", (*it).jid().full());
         shost.setAttribute("host", (*it).host());
         shost.setAttribute("port", QString::number((*it).port()));
-        if((*it).isProxy()) {
+        if ((*it).isProxy()) {
             QDomElement p = doc()->createElementNS("http://affinix.com/jabber/stream", "proxy");
             shost.appendChild(p);
         }
         query.appendChild(shost);
     }
-    if(fast) {
+    if (fast) {
         QDomElement e = doc()->createElementNS("http://affinix.com/jabber/stream", "fast");
         query.appendChild(e);
     }
@@ -2017,8 +1886,8 @@ void JT_S5B::requestProxyInfo(const Jid &to)
     d->mode = 1;
 
     QDomElement iq;
-    d->to = to;
-    iq = createIQ(doc(), "get", to.full(), id());
+    d->to             = to;
+    iq                = createIQ(doc(), "get", to.full(), id());
     QDomElement query = doc()->createElementNS(S5B_NS, "query");
     iq.appendChild(query);
     d->iq = iq;
@@ -2029,8 +1898,8 @@ void JT_S5B::requestActivation(const Jid &to, const QString &sid, const Jid &tar
     d->mode = 2;
 
     QDomElement iq;
-    d->to = to;
-    iq = createIQ(doc(), "set", to.full(), id());
+    d->to             = to;
+    iq                = createIQ(doc(), "set", to.full(), id());
     QDomElement query = doc()->createElementNS(S5B_NS, "query");
     query.setAttribute("sid", sid);
     iq.appendChild(query);
@@ -2042,49 +1911,45 @@ void JT_S5B::requestActivation(const Jid &to, const QString &sid, const Jid &tar
 
 void JT_S5B::onGo()
 {
-    if(d->mode == 1) {
+    if (d->mode == 1) {
         d->t.setSingleShot(true);
         d->t.start(15000);
     }
     send(d->iq);
 }
 
-void JT_S5B::onDisconnect()
-{
-    d->t.stop();
-}
+void JT_S5B::onDisconnect() { d->t.stop(); }
 
 bool JT_S5B::take(const QDomElement &x)
 {
-    if(d->mode == -1)
+    if (d->mode == -1)
         return false;
 
-    if(!iqVerify(x, d->to, id()))
+    if (!iqVerify(x, d->to, id()))
         return false;
 
     d->t.stop();
 
-    if(x.attribute("type") == "result") {
+    if (x.attribute("type") == "result") {
         QDomElement q = queryTag(x);
-        if(d->mode == 0) {
+        if (d->mode == 0) {
             d->streamHost = "";
-            if(!q.isNull()) {
+            if (!q.isNull()) {
                 QDomElement shost = q.elementsByTagName("streamhost-used").item(0).toElement();
-                if(!shost.isNull())
+                if (!shost.isNull())
                     d->streamHost = shost.attribute("jid");
             }
 
             setSuccess();
-        }
-        else if(d->mode == 1) {
-            if(!q.isNull()) {
+        } else if (d->mode == 1) {
+            if (!q.isNull()) {
                 QDomElement shost = q.elementsByTagName("streamhost").item(0).toElement();
-                if(!shost.isNull()) {
+                if (!shost.isNull()) {
                     Jid j = shost.attribute("jid");
-                    if(j.isValid()) {
+                    if (j.isValid()) {
                         QString host = shost.attribute("host");
-                        if(!host.isEmpty()) {
-                            int port = shost.attribute("port").toInt();
+                        if (!host.isEmpty()) {
+                            int        port = shost.attribute("port").toInt();
                             StreamHost h;
                             h.setJid(j);
                             h.setHost(host);
@@ -2097,12 +1962,10 @@ bool JT_S5B::take(const QDomElement &x)
             }
 
             setSuccess();
-        }
-        else {
+        } else {
             setSuccess();
         }
-    }
-    else {
+    } else {
         setError(x);
     }
 
@@ -2115,44 +1978,30 @@ void JT_S5B::t_timeout()
     setError(500, "Timed out");
 }
 
-Jid JT_S5B::streamHostUsed() const
-{
-    return d->streamHost;
-}
+Jid JT_S5B::streamHostUsed() const { return d->streamHost; }
 
-StreamHost JT_S5B::proxyInfo() const
-{
-    return d->proxyInfo;
-}
+StreamHost JT_S5B::proxyInfo() const { return d->proxyInfo; }
 
 //----------------------------------------------------------------------------
 // JT_PushS5B
 //----------------------------------------------------------------------------
-JT_PushS5B::JT_PushS5B(Task *parent)
-:Task(parent)
-{
-}
+JT_PushS5B::JT_PushS5B(Task *parent) : Task(parent) {}
 
-JT_PushS5B::~JT_PushS5B()
-{
-}
+JT_PushS5B::~JT_PushS5B() {}
 
-int JT_PushS5B::priority() const
-{
-    return 1;
-}
+int JT_PushS5B::priority() const { return 1; }
 
 bool JT_PushS5B::take(const QDomElement &e)
 {
     // look for udpsuccess
-    if(e.tagName() == "message") {
+    if (e.tagName() == "message") {
         QDomElement x = e.elementsByTagName("udpsuccess").item(0).toElement();
-        if(!x.isNull() && x.namespaceURI() == S5B_NS) {
+        if (!x.isNull() && x.namespaceURI() == S5B_NS) {
             incomingUDPSuccess(Jid(x.attribute("from")), x.attribute("dstaddr"));
             return true;
         }
         x = e.elementsByTagName("activate").item(0).toElement();
-        if(!x.isNull() && x.namespaceURI() == "http://affinix.com/jabber/stream") {
+        if (!x.isNull() && x.namespaceURI() == "http://affinix.com/jabber/stream") {
             incomingActivate(Jid(x.attribute("from")), x.attribute("sid"), Jid(x.attribute("jid")));
             return true;
         }
@@ -2160,32 +2009,32 @@ bool JT_PushS5B::take(const QDomElement &e)
     }
 
     // must be an iq-set tag
-    if(e.tagName() != "iq")
+    if (e.tagName() != "iq")
         return false;
-    if(e.attribute("type") != "set")
+    if (e.attribute("type") != "set")
         return false;
-    if(queryNS(e) != S5B_NS)
+    if (queryNS(e) != S5B_NS)
         return false;
 
-    Jid from(e.attribute("from"));
-    QDomElement q = queryTag(e);
-    QString sid = q.attribute("sid");
+    Jid         from(e.attribute("from"));
+    QDomElement q   = queryTag(e);
+    QString     sid = q.attribute("sid");
 
     StreamHostList hosts;
-    QDomNodeList nl = q.elementsByTagName("streamhost");
-    for(int n = 0; n < nl.count(); ++n) {
+    QDomNodeList   nl = q.elementsByTagName("streamhost");
+    for (int n = 0; n < nl.count(); ++n) {
         QDomElement shost = nl.item(n).toElement();
-        if(hosts.count() < MAXSTREAMHOSTS) {
+        if (hosts.count() < MAXSTREAMHOSTS) {
             Jid j = shost.attribute("jid");
-            if(!j.isValid())
+            if (!j.isValid())
                 continue;
             QString host = shost.attribute("host");
-            if(host.isEmpty())
+            if (host.isEmpty())
                 continue;
-            int port = shost.attribute("port").toInt();
-            QDomElement p = shost.elementsByTagName("proxy").item(0).toElement();
-            bool isProxy = false;
-            if(!p.isNull() && p.namespaceURI() == "http://affinix.com/jabber/stream")
+            int         port    = shost.attribute("port").toInt();
+            QDomElement p       = shost.elementsByTagName("proxy").item(0).toElement();
+            bool        isProxy = false;
+            if (!p.isNull() && p.namespaceURI() == "http://affinix.com/jabber/stream")
                 isProxy = true;
 
             StreamHost h;
@@ -2197,20 +2046,20 @@ bool JT_PushS5B::take(const QDomElement &e)
         }
     }
 
-    bool fast = false;
+    bool        fast = false;
     QDomElement t;
     t = q.elementsByTagName("fast").item(0).toElement();
-    if(!t.isNull() && t.namespaceURI() == "http://affinix.com/jabber/stream")
+    if (!t.isNull() && t.namespaceURI() == "http://affinix.com/jabber/stream")
         fast = true;
 
     S5BRequest r;
-    r.from = from;
-    r.id = e.attribute("id");
-    r.sid = sid;
+    r.from    = from;
+    r.id      = e.attribute("id");
+    r.sid     = sid;
     r.dstaddr = q.attribute("dstaddr"); // special case for muc as in xep-0065rc3
-    r.hosts = hosts;
-    r.fast = fast;
-    r.udp = q.attribute("mode") == "udp" ? true: false;
+    r.hosts   = hosts;
+    r.fast    = fast;
+    r.udp     = q.attribute("mode") == "udp" ? true : false;
 
     emit incoming(r);
     return true;
@@ -2218,7 +2067,7 @@ bool JT_PushS5B::take(const QDomElement &e)
 
 void JT_PushS5B::respondSuccess(const Jid &to, const QString &id, const Jid &streamHost)
 {
-    QDomElement iq = createIQ(doc(), "result", to.full(), id);
+    QDomElement iq    = createIQ(doc(), "result", to.full(), id);
     QDomElement query = doc()->createElementNS(S5B_NS, "query");
     iq.appendChild(query);
     QDomElement shost = doc()->createElement("streamhost-used");
@@ -2227,10 +2076,9 @@ void JT_PushS5B::respondSuccess(const Jid &to, const QString &id, const Jid &str
     send(iq);
 }
 
-void JT_PushS5B::respondError(const Jid &to, const QString &id,
-                              Stanza::Error::ErrorCond cond, const QString &str)
+void JT_PushS5B::respondError(const Jid &to, const QString &id, Stanza::Error::ErrorCond cond, const QString &str)
 {
-    QDomElement iq = createIQ(doc(), "error", to.full(), id);
+    QDomElement   iq = createIQ(doc(), "error", to.full(), id);
     Stanza::Error error(Stanza::Error::Cancel, cond, str);
     iq.appendChild(error.toXml(*client()->doc(), client()->stream().baseNS()));
     send(iq);
@@ -2263,102 +2111,66 @@ void JT_PushS5B::sendActivate(const Jid &to, const QString &sid, const Jid &stre
 StreamHost::StreamHost()
 {
     v_port = -1;
-    proxy = false;
+    proxy  = false;
 }
 
-const Jid & StreamHost::jid() const
-{
-    return j;
-}
+const Jid &StreamHost::jid() const { return j; }
 
-const QString & StreamHost::host() const
-{
-    return v_host;
-}
+const QString &StreamHost::host() const { return v_host; }
 
-int StreamHost::port() const
-{
-    return v_port;
-}
+int StreamHost::port() const { return v_port; }
 
-bool StreamHost::isProxy() const
-{
-    return proxy;
-}
+bool StreamHost::isProxy() const { return proxy; }
 
-void StreamHost::setJid(const Jid &_j)
-{
-    j = _j;
-}
+void StreamHost::setJid(const Jid &_j) { j = _j; }
 
-void StreamHost::setHost(const QString &host)
-{
-    v_host = host;
-}
+void StreamHost::setHost(const QString &host) { v_host = host; }
 
-void StreamHost::setPort(int port)
-{
-    v_port = port;
-}
+void StreamHost::setPort(int port) { v_port = port; }
 
-void StreamHost::setIsProxy(bool b)
-{
-    proxy = b;
-}
+void StreamHost::setIsProxy(bool b) { proxy = b; }
 
 //----------------------------------------------------------------------------
 // S5BServersProducer
 //----------------------------------------------------------------------------
-TcpPortServer *S5BServersProducer::makeServer(QTcpServer *socket)
-{
-    return new S5BServer(socket);
-}
+TcpPortServer *S5BServersProducer::makeServer(QTcpServer *socket) { return new S5BServer(socket); }
 
 //----------------------------------------------------------------------------
 // S5BIncomingConnection
 //----------------------------------------------------------------------------
-class S5BIncomingConnection : public QObject
-{
+class S5BIncomingConnection : public QObject {
     Q_OBJECT
 public:
     SocksClient *client;
-    QString host;
-    QTimer expire;
+    QString      host;
+    QTimer       expire;
 
     S5BIncomingConnection(SocksClient *c) : QObject(nullptr)
     {
         client = c;
-        connect(client, &SocksClient::incomingMethods, [this](int methods){
-            if(methods & SocksClient::AuthNone)
+        connect(client, &SocksClient::incomingMethods, [this](int methods) {
+            if (methods & SocksClient::AuthNone)
                 client->chooseMethod(SocksClient::AuthNone);
             else
                 doError();
         });
-        connect(client, &SocksClient::incomingConnectRequest, [this](const QString &_host, int port)
-        {
-            if(port == 0) {
+        connect(client, &SocksClient::incomingConnectRequest, [this](const QString &_host, int port) {
+            if (port == 0) {
                 host = _host;
                 client->disconnect(this);
                 expire.stop();
                 emit result(true);
-            }
-            else
+            } else
                 doError();
         });
-        connect(client, &SocksClient::error, [this](){ doError(); });
+        connect(client, &SocksClient::error, [this]() { doError(); });
         connect(&expire, SIGNAL(timeout()), SLOT(doError()));
         resetExpiration();
     }
 
-    ~S5BIncomingConnection()
-    {
-        delete client;
-    }
+    ~S5BIncomingConnection() { delete client; }
 
-    void resetExpiration()
-    {
-        expire.start(30000);
-    }
+    void resetExpiration() { expire.start(30000); }
 
 signals:
     void result(bool);
@@ -2376,34 +2188,32 @@ private slots:
 //----------------------------------------------------------------------------
 // S5BServer
 //----------------------------------------------------------------------------
-struct S5BServer::Private
-{
-    SocksServer serv;
+struct S5BServer::Private {
+    SocksServer   serv;
     QSet<QString> keys;
 };
 
-S5BServer::S5BServer(QTcpServer *serverSocket) :
-    TcpPortServer(serverSocket),
-    d(new Private)
+S5BServer::S5BServer(QTcpServer *serverSocket) : TcpPortServer(serverSocket), d(new Private)
 {
     d->serv.setServerSocket(serverSocket);
     connect(&d->serv, &SocksServer::incomingReady, this, [this]() {
         S5BIncomingConnection *inConn = new S5BIncomingConnection(d->serv.takeIncoming());
 #ifdef S5B_DEBUG
-        qDebug("S5BServer: incoming connection from %s:%d\n", qPrintable(i->client->peerAddress().toString()), i->client->peerPort());
+        qDebug("S5BServer: incoming connection from %s:%d\n", qPrintable(i->client->peerAddress().toString()),
+               i->client->peerPort());
 #endif
-        connect(inConn, &S5BIncomingConnection::result, this, [this, inConn](bool success){
+        connect(inConn, &S5BIncomingConnection::result, this, [this, inConn](bool success) {
 #ifdef S5B_DEBUG
             qDebug("S5BServer item result: %d\n", success);
 #endif
-            if(!success) {
+            if (!success) {
                 delete inConn;
                 return;
             }
 
             SocksClient *c = inConn->client;
             inConn->client = nullptr;
-            QString key = inConn->host;
+            QString key    = inConn->host;
             delete inConn;
 
             emit incomingConnection(c, key);
@@ -2412,12 +2222,13 @@ S5BServer::S5BServer(QTcpServer *serverSocket) :
             }
         });
     });
-    connect(&d->serv, &SocksServer::incomingUDP, this, [this](const QString &host, int port, const QHostAddress &addr, int sourcePort, const QByteArray &data){
-        if(port != 0 && port != 1)
-            return;
-        bool isInit = port == 1;
-        emit incomingUdp(isInit, addr, sourcePort, host, data);
-    });
+    connect(&d->serv, &SocksServer::incomingUDP, this,
+            [this](const QString &host, int port, const QHostAddress &addr, int sourcePort, const QByteArray &data) {
+                if (port != 0 && port != 1)
+                    return;
+                bool isInit = port == 1;
+                emit incomingUdp(isInit, addr, sourcePort, host, data);
+            });
 }
 
 S5BServer::~S5BServer()
@@ -2430,25 +2241,13 @@ void S5BServer::writeUDP(const QHostAddress &addr, int port, const QByteArray &d
     d->serv.writeUDP(addr, port, data);
 }
 
-bool S5BServer::isActive() const
-{
-    return d->serv.isActive();
-}
+bool S5BServer::isActive() const { return d->serv.isActive(); }
 
-bool S5BServer::hasKey(const QString &key)
-{
-    return d->keys.contains(key);
-}
+bool S5BServer::hasKey(const QString &key) { return d->keys.contains(key); }
 
-void S5BServer::registerKey(const QString &key)
-{
-    d->keys.insert(key);
-}
+void S5BServer::registerKey(const QString &key) { d->keys.insert(key); }
 
-void S5BServer::unregisterKey(const QString &key)
-{
-    d->keys.remove(key);
-}
+void S5BServer::unregisterKey(const QString &key) { d->keys.remove(key); }
 } // namespace XMPP
 
 #include "s5b.moc"
diff --git a/src/xmpp/xmpp-im/s5b.h b/src/xmpp/xmpp-im/s5b.h
index 86cd2d4a..7cbdbe24 100644
--- a/src/xmpp/xmpp-im/s5b.h
+++ b/src/xmpp/xmpp-im/s5b.h
@@ -35,316 +35,301 @@ class SocksClient;
 class SocksUDP;
 
 namespace XMPP {
-    namespace Jingle {
-        namespace S5B {
-            class Manager;
-        }
-    }
-
-    class Client;
-    class JT_PushS5B;
-    class S5BConnection;
-    class S5BManager;
-    class StreamHost;
-    class TcpPortReserver;
-    struct S5BRequest;
-    typedef QList<StreamHost> StreamHostList;
-    typedef QList<S5BConnection*> S5BConnectionList;
-
-    class S5BDatagram
-    {
-    public:
-        S5BDatagram();
-        S5BDatagram(int source, int dest, const QByteArray &data);
-
-        int sourcePort() const;
-        int destPort() const;
-        QByteArray data() const;
-
-    private:
-        int _source = 0;
-        int _dest = 0;
-        QByteArray _buf;
-    };
-
-    class S5BConnection : public BSConnection
-    {
-        Q_OBJECT
-    public:
-        enum Mode { Stream, Datagram };
-
-        ~S5BConnection();
-
-        Jid proxy() const;
-        void setProxy(const Jid &proxy);
-
-        void connectToJid(const Jid &peer, const QString &sid, Mode m = Stream);
-        void connectToJid(const Jid &peer, const QString &sid) {
-            connectToJid(peer, sid, Stream);
-        }
-
-        void accept();
-        void close();
-
-        Jid peer() const;
-        QString sid() const;
-        BytestreamManager* manager() const;
-        bool isRemote() const;
-        Mode mode() const;
-        int state() const;
-
-        qint64 bytesAvailable() const;
-        qint64 bytesToWrite() const;
-
-        void writeDatagram(const S5BDatagram &);
-        S5BDatagram readDatagram();
-        int datagramsAvailable() const;
-
-    protected:
-        qint64 writeData(const char *data, qint64 maxSize);
-        qint64 readData(char * data, qint64 maxSize);
-
-    signals:
-        void proxyQuery();                             // querying proxy for streamhost information
-        void proxyResult(bool b);                      // query success / fail
-        void requesting();                             // sent actual S5B request (requester only)
-        void accepted();                               // target accepted (requester only
-        void tryingHosts(const StreamHostList &hosts); // currently connecting to these hosts
-        void proxyConnect();                           // connecting to proxy
-        void waitingForActivation();                   // waiting for activation (target only)
-        void connected();                              // connection active
-        void datagramReady();
-
-    private slots:
-        void doPending();
-
-        void sc_connectionClosed();
-        void sc_delayedCloseFinished();
-        void sc_readyRead();
-        void sc_bytesWritten(qint64);
-        void sc_error(int);
-
-        void su_packetReady(const QByteArray &buf);
-
-    private:
-        class Private;
-        Private *d;
-
-        void resetConnection(bool clear=false);
-        void handleUDP(const QByteArray &buf);
-        void sendUDP(const QByteArray &buf);
-
-        friend class S5BManager;
-        void man_waitForAccept(const S5BRequest &r);
-        void man_clientReady(SocksClient *, SocksUDP *);
-        void man_udpReady(const QByteArray &buf);
-        void man_failed(int);
-        S5BConnection(S5BManager *, QObject *parent=nullptr);
-    };
-
-    class S5BManager : public BytestreamManager
-    {
-        Q_OBJECT
-    public:
-        S5BManager(Client *);
-        ~S5BManager();
-
-        static const char* ns();
-        Client *client() const;
-        JT_PushS5B *jtPush() const;
-
-        bool isAcceptableSID(const Jid &peer, const QString &sid) const;
-
-        BSConnection *createConnection();
-        S5BConnection *takeIncoming();
-
-        class Item;
-        class Entry;
-
-    protected:
-        const char* sidPrefix() const;
-
-    private slots:
-        void ps_incoming(const S5BRequest &req);
-        void ps_incomingUDPSuccess(const Jid &from, const QString &dstaddr);
-        void ps_incomingActivate(const Jid &from, const QString &sid, const Jid &streamHost);
-        void item_accepted();
-        void item_tryingHosts(const StreamHostList &list);
-        void item_proxyConnect();
-        void item_waitingForActivation();
-        void item_connected();
-        void item_error(int);
-        void query_finished();
-
-    private:
-        class Private;
-        Private *d;
-
-        S5BConnection *findIncoming(const Jid &from, const QString &sid) const;
-        Entry *findEntry(S5BConnection *) const;
-        Entry *findEntry(Item *) const;
-        Entry *findEntryByHash(const QString &key) const;
-        Entry *findEntryBySID(const Jid &peer, const QString &sid) const;
-
-        void entryContinue(Entry *e);
-        void queryProxy(Entry *e);
-        bool targetShouldOfferProxy(Entry *e);
-
-        friend class S5BConnection;
-        void con_connect(S5BConnection *);
-        void con_accept(S5BConnection *);
-        void con_reject(S5BConnection *);
-        void con_unlink(S5BConnection *);
-        void con_sendUDP(S5BConnection *, const QByteArray &buf);
-
-        friend class S5BServer;
-        bool srv_ownsHash(const QString &key) const;
-        void srv_incomingReady(SocksClient *sc, const QString &key);
-        void srv_incomingUDP(bool init, const QHostAddress &addr, int port, const QString &key, const QByteArray &data);
-
-        friend class Item;
-        void doSuccess(const Jid &peer, const QString &id, const Jid &streamHost);
-        void doError(const Jid &peer, const QString &id, Stanza::Error::ErrorCond, const QString &);
-        void doActivate(const Jid &peer, const QString &sid, const Jid &streamHost);
-    };
-
-    class S5BConnector : public QObject
-    {
-        Q_OBJECT
-    public:
-        S5BConnector(QObject *parent=nullptr);
-        ~S5BConnector();
-
-        void resetConnection();
-        void start(const Jid &self, const StreamHostList &hosts, const QString &key, bool udp, int timeout);
-        SocksClient *takeClient();
-        SocksUDP *takeUDP();
-        StreamHost streamHostUsed() const;
-
-        class Item;
-
-    signals:
-        void result(bool);
-
-    private slots:
-        void item_result(bool);
-        void t_timeout();
-
-    private:
-        class Private;
-        Private *d;
-
-        friend class S5BManager;
-        void man_udpSuccess(const Jid &streamHost);
-    };
-
-    class S5BServersProducer : public TcpPortScope
-    {
-    protected:
-        TcpPortServer* makeServer(QTcpServer *socket); // in fact returns S5BServer
-    };
-
-    class S5BServer : public TcpPortServer
-    {
-        Q_OBJECT
-
-    public:
-        S5BServer(QTcpServer *serverSocket);
-        ~S5BServer();
-
-        void writeUDP(const QHostAddress &addr, int port, const QByteArray &data);
-        bool isActive() const;
-        bool hasKey(const QString &key);
-        void registerKey(const QString &key);
-        void unregisterKey(const QString &key);
-
-    signals:
-        void incomingConnection(SocksClient *c, const QString &key);
-        void incomingUdp(bool isInit, const QHostAddress &addr, int sourcePort, const QString &key, const QByteArray &data);
-
-    private:
-        class Private;
-        QScopedPointer<Private> d;
-    };
-
-    class JT_S5B : public Task
-    {
-        Q_OBJECT
-    public:
-        JT_S5B(Task *);
-        ~JT_S5B();
-
-        void request(const Jid &to, const QString &sid, const QString &dstaddr,
-                     const StreamHostList &hosts, bool fast, bool udp=false);
-        void requestProxyInfo(const Jid &to);
-        void requestActivation(const Jid &to, const QString &sid, const Jid &target);
-
-        void onGo();
-        void onDisconnect();
-        bool take(const QDomElement &);
-
-        Jid streamHostUsed() const;
-        StreamHost proxyInfo() const;
-
-    private slots:
-        void t_timeout();
-
-    private:
-        class Private;
-        Private *d;
-    };
-
-    struct S5BRequest
-    {
-        Jid from;
-        QString id, sid, dstaddr;
-        StreamHostList hosts;
-        bool fast;
-        bool udp;
-    };
-    class JT_PushS5B : public Task
-    {
-        Q_OBJECT
-    public:
-        JT_PushS5B(Task *);
-        ~JT_PushS5B();
-
-        int priority() const;
-
-        void respondSuccess(const Jid &to, const QString &id, const Jid &streamHost);
-        void respondError(const Jid &to, const QString &id,
-                          Stanza::Error::ErrorCond cond, const QString &str);
-        void sendUDPSuccess(const Jid &to, const QString &dstaddr);
-        void sendActivate(const Jid &to, const QString &sid, const Jid &streamHost);
-
-        bool take(const QDomElement &);
-
-    signals:
-        void incoming(const S5BRequest &req);
-        void incomingUDPSuccess(const Jid &from, const QString &dstaddr);
-        void incomingActivate(const Jid &from, const QString &sid, const Jid &streamHost);
-    };
-
-    class StreamHost
-    {
-    public:
-        StreamHost();
-
-        const Jid & jid() const;
-        const QString & host() const;
-        int port() const;
-        bool isProxy() const;
-        void setJid(const Jid &);
-        void setHost(const QString &);
-        void setPort(int);
-        void setIsProxy(bool);
-
-    private:
-        Jid j;
-        QString v_host;
-        int v_port;
-        bool proxy;
-    };
+namespace Jingle { namespace S5B {
+    class Manager;
+}}
+
+class Client;
+class JT_PushS5B;
+class S5BConnection;
+class S5BManager;
+class StreamHost;
+class TcpPortReserver;
+struct S5BRequest;
+typedef QList<StreamHost>      StreamHostList;
+typedef QList<S5BConnection *> S5BConnectionList;
+
+class S5BDatagram {
+public:
+    S5BDatagram();
+    S5BDatagram(int source, int dest, const QByteArray &data);
+
+    int        sourcePort() const;
+    int        destPort() const;
+    QByteArray data() const;
+
+private:
+    int        _source = 0;
+    int        _dest   = 0;
+    QByteArray _buf;
+};
+
+class S5BConnection : public BSConnection {
+    Q_OBJECT
+public:
+    enum Mode { Stream, Datagram };
+
+    ~S5BConnection();
+
+    Jid  proxy() const;
+    void setProxy(const Jid &proxy);
+
+    void connectToJid(const Jid &peer, const QString &sid, Mode m = Stream);
+    void connectToJid(const Jid &peer, const QString &sid) { connectToJid(peer, sid, Stream); }
+
+    void accept();
+    void close();
+
+    Jid                peer() const;
+    QString            sid() const;
+    BytestreamManager *manager() const;
+    bool               isRemote() const;
+    Mode               mode() const;
+    int                state() const;
+
+    qint64 bytesAvailable() const;
+    qint64 bytesToWrite() const;
+
+    void        writeDatagram(const S5BDatagram &);
+    S5BDatagram readDatagram();
+    int         datagramsAvailable() const;
+
+protected:
+    qint64 writeData(const char *data, qint64 maxSize);
+    qint64 readData(char *data, qint64 maxSize);
+
+signals:
+    void proxyQuery();                             // querying proxy for streamhost information
+    void proxyResult(bool b);                      // query success / fail
+    void requesting();                             // sent actual S5B request (requester only)
+    void accepted();                               // target accepted (requester only
+    void tryingHosts(const StreamHostList &hosts); // currently connecting to these hosts
+    void proxyConnect();                           // connecting to proxy
+    void waitingForActivation();                   // waiting for activation (target only)
+    void connected();                              // connection active
+    void datagramReady();
+
+private slots:
+    void doPending();
+
+    void sc_connectionClosed();
+    void sc_delayedCloseFinished();
+    void sc_readyRead();
+    void sc_bytesWritten(qint64);
+    void sc_error(int);
+
+    void su_packetReady(const QByteArray &buf);
+
+private:
+    class Private;
+    Private *d;
+
+    void resetConnection(bool clear = false);
+    void handleUDP(const QByteArray &buf);
+    void sendUDP(const QByteArray &buf);
+
+    friend class S5BManager;
+    void man_waitForAccept(const S5BRequest &r);
+    void man_clientReady(SocksClient *, SocksUDP *);
+    void man_udpReady(const QByteArray &buf);
+    void man_failed(int);
+    S5BConnection(S5BManager *, QObject *parent = nullptr);
+};
+
+class S5BManager : public BytestreamManager {
+    Q_OBJECT
+public:
+    S5BManager(Client *);
+    ~S5BManager();
+
+    static const char *ns();
+    Client *           client() const;
+    JT_PushS5B *       jtPush() const;
+
+    bool isAcceptableSID(const Jid &peer, const QString &sid) const;
+
+    BSConnection * createConnection();
+    S5BConnection *takeIncoming();
+
+    class Item;
+    class Entry;
+
+protected:
+    const char *sidPrefix() const;
+
+private slots:
+    void ps_incoming(const S5BRequest &req);
+    void ps_incomingUDPSuccess(const Jid &from, const QString &dstaddr);
+    void ps_incomingActivate(const Jid &from, const QString &sid, const Jid &streamHost);
+    void item_accepted();
+    void item_tryingHosts(const StreamHostList &list);
+    void item_proxyConnect();
+    void item_waitingForActivation();
+    void item_connected();
+    void item_error(int);
+    void query_finished();
+
+private:
+    class Private;
+    Private *d;
+
+    S5BConnection *findIncoming(const Jid &from, const QString &sid) const;
+    Entry *        findEntry(S5BConnection *) const;
+    Entry *        findEntry(Item *) const;
+    Entry *        findEntryByHash(const QString &key) const;
+    Entry *        findEntryBySID(const Jid &peer, const QString &sid) const;
+
+    void entryContinue(Entry *e);
+    void queryProxy(Entry *e);
+    bool targetShouldOfferProxy(Entry *e);
+
+    friend class S5BConnection;
+    void con_connect(S5BConnection *);
+    void con_accept(S5BConnection *);
+    void con_reject(S5BConnection *);
+    void con_unlink(S5BConnection *);
+    void con_sendUDP(S5BConnection *, const QByteArray &buf);
+
+    friend class S5BServer;
+    bool srv_ownsHash(const QString &key) const;
+    void srv_incomingReady(SocksClient *sc, const QString &key);
+    void srv_incomingUDP(bool init, const QHostAddress &addr, int port, const QString &key, const QByteArray &data);
+
+    friend class Item;
+    void doSuccess(const Jid &peer, const QString &id, const Jid &streamHost);
+    void doError(const Jid &peer, const QString &id, Stanza::Error::ErrorCond, const QString &);
+    void doActivate(const Jid &peer, const QString &sid, const Jid &streamHost);
+};
+
+class S5BConnector : public QObject {
+    Q_OBJECT
+public:
+    S5BConnector(QObject *parent = nullptr);
+    ~S5BConnector();
+
+    void         resetConnection();
+    void         start(const Jid &self, const StreamHostList &hosts, const QString &key, bool udp, int timeout);
+    SocksClient *takeClient();
+    SocksUDP *   takeUDP();
+    StreamHost   streamHostUsed() const;
+
+    class Item;
+
+signals:
+    void result(bool);
+
+private slots:
+    void item_result(bool);
+    void t_timeout();
+
+private:
+    class Private;
+    Private *d;
+
+    friend class S5BManager;
+    void man_udpSuccess(const Jid &streamHost);
+};
+
+class S5BServersProducer : public TcpPortScope {
+protected:
+    TcpPortServer *makeServer(QTcpServer *socket); // in fact returns S5BServer
+};
+
+class S5BServer : public TcpPortServer {
+    Q_OBJECT
+
+public:
+    S5BServer(QTcpServer *serverSocket);
+    ~S5BServer();
+
+    void writeUDP(const QHostAddress &addr, int port, const QByteArray &data);
+    bool isActive() const;
+    bool hasKey(const QString &key);
+    void registerKey(const QString &key);
+    void unregisterKey(const QString &key);
+
+signals:
+    void incomingConnection(SocksClient *c, const QString &key);
+    void incomingUdp(bool isInit, const QHostAddress &addr, int sourcePort, const QString &key, const QByteArray &data);
+
+private:
+    class Private;
+    QScopedPointer<Private> d;
+};
+
+class JT_S5B : public Task {
+    Q_OBJECT
+public:
+    JT_S5B(Task *);
+    ~JT_S5B();
+
+    void request(const Jid &to, const QString &sid, const QString &dstaddr, const StreamHostList &hosts, bool fast,
+                 bool udp = false);
+    void requestProxyInfo(const Jid &to);
+    void requestActivation(const Jid &to, const QString &sid, const Jid &target);
+
+    void onGo();
+    void onDisconnect();
+    bool take(const QDomElement &);
+
+    Jid        streamHostUsed() const;
+    StreamHost proxyInfo() const;
+
+private slots:
+    void t_timeout();
+
+private:
+    class Private;
+    Private *d;
+};
+
+struct S5BRequest {
+    Jid            from;
+    QString        id, sid, dstaddr;
+    StreamHostList hosts;
+    bool           fast;
+    bool           udp;
+};
+class JT_PushS5B : public Task {
+    Q_OBJECT
+public:
+    JT_PushS5B(Task *);
+    ~JT_PushS5B();
+
+    int priority() const;
+
+    void respondSuccess(const Jid &to, const QString &id, const Jid &streamHost);
+    void respondError(const Jid &to, const QString &id, Stanza::Error::ErrorCond cond, const QString &str);
+    void sendUDPSuccess(const Jid &to, const QString &dstaddr);
+    void sendActivate(const Jid &to, const QString &sid, const Jid &streamHost);
+
+    bool take(const QDomElement &);
+
+signals:
+    void incoming(const S5BRequest &req);
+    void incomingUDPSuccess(const Jid &from, const QString &dstaddr);
+    void incomingActivate(const Jid &from, const QString &sid, const Jid &streamHost);
+};
+
+class StreamHost {
+public:
+    StreamHost();
+
+    const Jid &    jid() const;
+    const QString &host() const;
+    int            port() const;
+    bool           isProxy() const;
+    void           setJid(const Jid &);
+    void           setHost(const QString &);
+    void           setPort(int);
+    void           setIsProxy(bool);
+
+private:
+    Jid     j;
+    QString v_host;
+    int     v_port;
+    bool    proxy;
+};
 } // namespace XMPP
 
 #endif // XMPP_S5B_H
diff --git a/src/xmpp/xmpp-im/types.cpp b/src/xmpp/xmpp-im/types.cpp
index 6082b215..8ffd1bce 100644
--- a/src/xmpp/xmpp-im/types.cpp
+++ b/src/xmpp/xmpp-im/types.cpp
@@ -75,44 +75,29 @@ Url &Url::operator=(const Url &from)
 }
 
 //! \brief destroy Url object.
-Url::~Url()
-{
-    delete d;
-}
+Url::~Url() { delete d; }
 
 //! \brief Get url information.
 //!
 //! Returns url information.
-QString Url::url() const
-{
-    return d->url;
-}
+QString Url::url() const { return d->url; }
 
 //! \brief Get Description information.
 //!
 //! Returns desction of the URL.
-QString Url::desc() const
-{
-    return d->desc;
-}
+QString Url::desc() const { return d->desc; }
 
 //! \brief Set Url information.
 //!
 //! Set url information.
 //! \param url - url string (eg: http://psi.affinix.com/)
-void Url::setUrl(const QString &url)
-{
-    d->url = url;
-}
+void Url::setUrl(const QString &url) { d->url = url; }
 
 //! \brief Set Description information.
 //!
 //! Set description of the url.
 //! \param desc - description of url
-void Url::setDesc(const QString &desc)
-{
-    d->desc = desc;
-}
+void Url::setDesc(const QString &desc) { d->desc = desc; }
 
 //----------------------------------------------------------------------------
 // Address
@@ -124,16 +109,9 @@ void Url::setDesc(const QString &desc)
 //! \param Type - type (default: Unknown)
 //! \param Jid - specify address (default: empty string)
 //! \sa setType() setJid()
-Address::Address(Type type, const Jid &jid) :
-    v_jid(jid), v_delivered(false), v_type(type)
-{
-}
+Address::Address(Type type, const Jid &jid) : v_jid(jid), v_delivered(false), v_type(type) {}
 
-Address::Address(const QDomElement &e) :
-    v_delivered(false)
-{
-    fromXml(e);
-}
+Address::Address(const QDomElement &e) : v_delivered(false) { fromXml(e); }
 
 void Address::fromXml(const QDomElement &t)
 {
@@ -209,104 +187,68 @@ QDomElement Address::toXml(Stanza &s) const
 //! \brief Get Jid information.
 //!
 //! Returns jid information.
-const Jid &Address::jid() const
-{
-    return v_jid;
-}
+const Jid &Address::jid() const { return v_jid; }
 
 //! \brief Get Uri information.
 //!
 //! Returns desction of the Address.
-const QString &Address::uri() const
-{
-    return v_uri;
-}
+const QString &Address::uri() const { return v_uri; }
 
 //! \brief Get Node information.
 //!
 //! Returns node of the Address.
-const QString &Address::node() const
-{
-    return v_node;
-}
+const QString &Address::node() const { return v_node; }
 
 //! \brief Get Description information.
 //!
 //! Returns desction of the Address.
-const QString &Address::desc() const
-{
-    return v_desc;
-}
+const QString &Address::desc() const { return v_desc; }
 
 //! \brief Get Delivered information.
 //!
 //! Returns delivered of the Address.
-bool Address::delivered() const
-{
-    return v_delivered;
-}
+bool Address::delivered() const { return v_delivered; }
 
 //! \brief Get Type information.
 //!
 //! Returns type of the Address.
-Address::Type Address::type() const
-{
-    return v_type;
-}
+Address::Type Address::type() const { return v_type; }
 
 //! \brief Set Address information.
 //!
 //! Set jid information.
 //! \param jid - jid
-void Address::setJid(const Jid &jid)
-{
-    v_jid = jid;
-}
+void Address::setJid(const Jid &jid) { v_jid = jid; }
 
 //! \brief Set Address information.
 //!
 //! Set uri information.
 //! \param uri - url string (eg: http://psi.affinix.com/)
-void Address::setUri(const QString &uri)
-{
-    v_uri = uri;
-}
+void Address::setUri(const QString &uri) { v_uri = uri; }
 
 //! \brief Set Node information.
 //!
 //! Set node information.
 //! \param node - node string
-void Address::setNode(const QString &node)
-{
-    v_node = node;
-}
+void Address::setNode(const QString &node) { v_node = node; }
 
 //! \brief Set Description information.
 //!
 //! Set description of the url.
 //! \param desc - description of url
-void Address::setDesc(const QString &desc)
-{
-    v_desc = desc;
-}
+void Address::setDesc(const QString &desc) { v_desc = desc; }
 
 //! \brief Set delivered information.
 //!
 //! Set delivered information.
 //! \param delivered - delivered flag
-void Address::setDelivered(bool delivered)
-{
-    v_delivered = delivered;
-}
+void Address::setDelivered(bool delivered) { v_delivered = delivered; }
 
 //! \brief Set Type information.
 //!
 //! Set type information.
 //! \param type - type
-void Address::setType(Type type)
-{
-    v_type = type;
-}
+void Address::setType(Type type) { v_type = type; }
 
 //----------------------------------------------------------------------------
 // Hash
@@ -315,15 +257,13 @@ void Address::setType(Type type)
 static const struct {
     const char *text;
     Hash::Type  hashType;
-} hashTypes[] = {
-    { "sha-1", Hash::Type::Sha1 },
-    { "sha-256", Hash::Type::Sha256 },
-    { "sha-512", Hash::Type::Sha512 },
-    { "sha3-256", Hash::Type::Sha3_256 },
-    { "sha3-512", Hash::Type::Sha3_512 },
-    { "blake2b-256", Hash::Type::Blake2b256 },
-    { "blake2b-512", Hash::Type::Blake2b512 }
-};
+} hashTypes[] = { { "sha-1", Hash::Type::Sha1 },
+                  { "sha-256", Hash::Type::Sha256 },
+                  { "sha-512", Hash::Type::Sha512 },
+                  { "sha3-256", Hash::Type::Sha3_256 },
+                  { "sha3-512", Hash::Type::Sha3_512 },
+                  { "blake2b-256", Hash::Type::Blake2b256 },
+                  { "blake2b-512", Hash::Type::Blake2b512 } };
 
 Hash::Hash(const QDomElement &el)
 {
@@ -502,56 +442,25 @@ RosterExchangeItem::RosterExchangeItem(const Jid &jid, const QString &name, cons
 {
 }
 
-RosterExchangeItem::RosterExchangeItem(const QDomElement &el) :
-    action_(Add)
-{
-    fromXml(el);
-}
+RosterExchangeItem::RosterExchangeItem(const QDomElement &el) : action_(Add) { fromXml(el); }
 
-const Jid &RosterExchangeItem::jid() const
-{
-    return jid_;
-}
+const Jid &RosterExchangeItem::jid() const { return jid_; }
 
-RosterExchangeItem::Action RosterExchangeItem::action() const
-{
-    return action_;
-}
+RosterExchangeItem::Action RosterExchangeItem::action() const { return action_; }
 
-const QString &RosterExchangeItem::name() const
-{
-    return name_;
-}
+const QString &RosterExchangeItem::name() const { return name_; }
 
-const QStringList &RosterExchangeItem::groups() const
-{
-    return groups_;
-}
+const QStringList &RosterExchangeItem::groups() const { return groups_; }
 
-bool RosterExchangeItem::isNull() const
-{
-    return jid_.isEmpty();
-}
+bool RosterExchangeItem::isNull() const { return jid_.isEmpty(); }
 
-void RosterExchangeItem::setJid(const Jid &jid)
-{
-    jid_ = jid;
-}
+void RosterExchangeItem::setJid(const Jid &jid) { jid_ = jid; }
 
-void RosterExchangeItem::setAction(Action action)
-{
-    action_ = action;
-}
+void RosterExchangeItem::setAction(Action action) { action_ = action; }
 
-void RosterExchangeItem::setName(const QString &name)
-{
-    name_ = name;
-}
+void RosterExchangeItem::setName(const QString &name) { name_ = name; }
 
-void RosterExchangeItem::setGroups(const QStringList &groups)
-{
-    groups_ = groups;
-}
+void RosterExchangeItem::setGroups(const QStringList &groups) { groups_ = groups; }
 
 QDomElement RosterExchangeItem::toXml(Stanza &s) const
 {
@@ -599,76 +508,33 @@ void RosterExchangeItem::fromXml(const QDomElement &e)
 //----------------------------------------------------------------------------
 // MUCItem
 //----------------------------------------------------------------------------
-MUCItem::MUCItem(Role r, Affiliation a) :
-    affiliation_(a), role_(r)
-{
-}
+MUCItem::MUCItem(Role r, Affiliation a) : affiliation_(a), role_(r) {}
 
-MUCItem::MUCItem(const QDomElement &el) :
-    affiliation_(UnknownAffiliation), role_(UnknownRole)
-{
-    fromXml(el);
-}
+MUCItem::MUCItem(const QDomElement &el) : affiliation_(UnknownAffiliation), role_(UnknownRole) { fromXml(el); }
 
-void MUCItem::setNick(const QString &n)
-{
-    nick_ = n;
-}
+void MUCItem::setNick(const QString &n) { nick_ = n; }
 
-void MUCItem::setJid(const Jid &j)
-{
-    jid_ = j;
-}
+void MUCItem::setJid(const Jid &j) { jid_ = j; }
 
-void MUCItem::setAffiliation(Affiliation a)
-{
-    affiliation_ = a;
-}
+void MUCItem::setAffiliation(Affiliation a) { affiliation_ = a; }
 
-void MUCItem::setRole(Role r)
-{
-    role_ = r;
-}
+void MUCItem::setRole(Role r) { role_ = r; }
 
-void MUCItem::setActor(const Jid &a)
-{
-    actor_ = a;
-}
+void MUCItem::setActor(const Jid &a) { actor_ = a; }
 
-void MUCItem::setReason(const QString &r)
-{
-    reason_ = r;
-}
+void MUCItem::setReason(const QString &r) { reason_ = r; }
 
-const QString &MUCItem::nick() const
-{
-    return nick_;
-}
+const QString &MUCItem::nick() const { return nick_; }
 
-const Jid &MUCItem::jid() const
-{
-    return jid_;
-}
+const Jid &MUCItem::jid() const { return jid_; }
 
-MUCItem::Affiliation MUCItem::affiliation() const
-{
-    return affiliation_;
-}
+MUCItem::Affiliation MUCItem::affiliation() const { return affiliation_; }
 
-MUCItem::Role MUCItem::role() const
-{
-    return role_;
-}
+MUCItem::Role MUCItem::role() const { return role_; }
 
-const Jid &MUCItem::actor() const
-{
-    return actor_;
-}
+const Jid &MUCItem::actor() const { return actor_; }
 
-const QString &MUCItem::reason() const
-{
-    return reason_;
-}
+const QString &MUCItem::reason() const { return reason_; }
 
 void MUCItem::fromXml(const QDomElement &e)
 {
@@ -768,68 +634,36 @@ QDomElement MUCItem::toXml(QDomDocument &d)
 
 bool MUCItem::operator==(const MUCItem &o)
 {
-    return !nick_.compare(o.nick_) && ((!jid_.isValid() && !o.jid_.isValid()) || jid_.compare(o.jid_, true)) && ((!actor_.isValid() && !o.actor_.isValid()) || actor_.compare(o.actor_, true)) && affiliation_ == o.affiliation_ && role_ == o.role_ && !reason_.compare(o.reason_);
+    return !nick_.compare(o.nick_) && ((!jid_.isValid() && !o.jid_.isValid()) || jid_.compare(o.jid_, true))
+        && ((!actor_.isValid() && !o.actor_.isValid()) || actor_.compare(o.actor_, true))
+        && affiliation_ == o.affiliation_ && role_ == o.role_ && !reason_.compare(o.reason_);
 }
 
 //----------------------------------------------------------------------------
 // MUCInvite
 //----------------------------------------------------------------------------
 
-MUCInvite::MUCInvite() :
-    cont_(false)
-{
-}
+MUCInvite::MUCInvite() : cont_(false) {}
 
-MUCInvite::MUCInvite(const Jid &to, const QString &reason) :
-    to_(to), reason_(reason), cont_(false)
-{
-}
+MUCInvite::MUCInvite(const Jid &to, const QString &reason) : to_(to), reason_(reason), cont_(false) {}
 
-MUCInvite::MUCInvite(const QDomElement &e) :
-    cont_(false)
-{
-    fromXml(e);
-}
+MUCInvite::MUCInvite(const QDomElement &e) : cont_(false) { fromXml(e); }
 
-const Jid &MUCInvite::from() const
-{
-    return from_;
-}
+const Jid &MUCInvite::from() const { return from_; }
 
-void MUCInvite::setFrom(const Jid &j)
-{
-    from_ = j;
-}
+void MUCInvite::setFrom(const Jid &j) { from_ = j; }
 
-const Jid &MUCInvite::to() const
-{
-    return to_;
-}
+const Jid &MUCInvite::to() const { return to_; }
 
-void MUCInvite::setTo(const Jid &j)
-{
-    to_ = j;
-}
+void MUCInvite::setTo(const Jid &j) { to_ = j; }
 
-const QString &MUCInvite::reason() const
-{
-    return reason_;
-}
+const QString &MUCInvite::reason() const { return reason_; }
 
-void MUCInvite::setReason(const QString &r)
-{
-    reason_ = r;
-}
+void MUCInvite::setReason(const QString &r) { reason_ = r; }
 
-bool MUCInvite::cont() const
-{
-    return cont_;
-}
+bool MUCInvite::cont() const { return cont_; }
 
-void MUCInvite::setCont(bool b)
-{
-    cont_ = b;
-}
+void MUCInvite::setCont(bool b) { cont_ = b; }
 
 void MUCInvite::fromXml(const QDomElement &e)
 {
@@ -868,53 +702,27 @@ QDomElement MUCInvite::toXml(QDomDocument &d) const
     return invite;
 }
 
-bool MUCInvite::isNull() const
-{
-    return to_.isEmpty() && from_.isEmpty();
-}
+bool MUCInvite::isNull() const { return to_.isEmpty() && from_.isEmpty(); }
 
 //----------------------------------------------------------------------------
 // MUCDecline
 //----------------------------------------------------------------------------
 
-MUCDecline::MUCDecline()
-{
-}
+MUCDecline::MUCDecline() {}
 
-MUCDecline::MUCDecline(const QDomElement &e)
-{
-    fromXml(e);
-}
+MUCDecline::MUCDecline(const QDomElement &e) { fromXml(e); }
 
-const Jid &MUCDecline::from() const
-{
-    return from_;
-}
+const Jid &MUCDecline::from() const { return from_; }
 
-void MUCDecline::setFrom(const Jid &j)
-{
-    from_ = j;
-}
+void MUCDecline::setFrom(const Jid &j) { from_ = j; }
 
-const Jid &MUCDecline::to() const
-{
-    return to_;
-}
+const Jid &MUCDecline::to() const { return to_; }
 
-void MUCDecline::setTo(const Jid &j)
-{
-    to_ = j;
-}
+void MUCDecline::setTo(const Jid &j) { to_ = j; }
 
-const QString &MUCDecline::reason() const
-{
-    return reason_;
-}
+const QString &MUCDecline::reason() const { return reason_; }
 
-void MUCDecline::setReason(const QString &r)
-{
-    reason_ = r;
-}
+void MUCDecline::setReason(const QString &r) { reason_ = r; }
 
 void MUCDecline::fromXml(const QDomElement &e)
 {
@@ -948,43 +756,23 @@ QDomElement MUCDecline::toXml(QDomDocument &d) const
     return decline;
 }
 
-bool MUCDecline::isNull() const
-{
-    return to_.isEmpty() && from_.isEmpty();
-}
+bool MUCDecline::isNull() const { return to_.isEmpty() && from_.isEmpty(); }
 
 //----------------------------------------------------------------------------
 // MUCDestroy
 //----------------------------------------------------------------------------
 
-MUCDestroy::MUCDestroy()
-{
-}
+MUCDestroy::MUCDestroy() {}
 
-MUCDestroy::MUCDestroy(const QDomElement &e)
-{
-    fromXml(e);
-}
+MUCDestroy::MUCDestroy(const QDomElement &e) { fromXml(e); }
 
-const Jid &MUCDestroy::jid() const
-{
-    return jid_;
-}
+const Jid &MUCDestroy::jid() const { return jid_; }
 
-void MUCDestroy::setJid(const Jid &j)
-{
-    jid_ = j;
-}
+void MUCDestroy::setJid(const Jid &j) { jid_ = j; }
 
-const QString &MUCDestroy::reason() const
-{
-    return reason_;
-}
+const QString &MUCDestroy::reason() const { return reason_; }
 
-void MUCDestroy::setReason(const QString &r)
-{
-    reason_ = r;
-}
+void MUCDestroy::setReason(const QString &r) { reason_ = r; }
 
 void MUCDestroy::fromXml(const QDomElement &e)
 {
@@ -1017,21 +805,13 @@ QDomElement MUCDestroy::toXml(QDomDocument &d) const
 //----------------------------------------------------------------------------
 // HTMLElement
 //----------------------------------------------------------------------------
-HTMLElement::HTMLElement()
-{
-}
+HTMLElement::HTMLElement() {}
 
 HTMLElement::HTMLElement(const QDomElement &body) { setBody(body); }
 
-void HTMLElement::setBody(const QDomElement &body)
-{
-    body_ = doc_.importNode(body, true).toElement();
-}
+void HTMLElement::setBody(const QDomElement &body) { body_ = doc_.importNode(body, true).toElement(); }
 
-const QDomElement &HTMLElement::body() const
-{
-    return body_;
-}
+const QDomElement &HTMLElement::body() const { return body_; }
 
 /**
  * Returns the string reperesentation of the HTML element.
@@ -1056,20 +836,17 @@ QString HTMLElement::toString(const QString &rootTagName) const
     return (Stream::xmlToString(e));
 }
 
-QString HTMLElement::text() const
-{
-    return body_.text();
-}
+QString HTMLElement::text() const { return body_.text(); }
 
 void HTMLElement::filterOutUnwanted(bool strict)
 {
-    Q_UNUSED(strict) //TODO filter out not xhtml-im elements
+    Q_UNUSED(strict) // TODO filter out not xhtml-im elements
     filterOutUnwantedRecursive(body_, strict);
 }
 
 void HTMLElement::filterOutUnwantedRecursive(QDomElement &el, bool strict)
 {
-    Q_UNUSED(strict) //TODO filter out not xhtml-im elements
+    Q_UNUSED(strict) // TODO filter out not xhtml-im elements
 
     static QSet<QString> unwanted = QSet<QString>() << "script"
                                                     << "iframe";
@@ -1083,7 +860,7 @@ void HTMLElement::filterOutUnwantedRecursive(QDomElement &el, bool strict)
             } else {
                 QDomNamedNodeMap domAttrs = childEl.attributes();
                 int              acnt     = domAttrs.count();
-                QStringList      attrs; //attributes for removing
+                QStringList      attrs; // attributes for removing
                 for (int i = 0; i < acnt; i++) {
                     QString name = domAttrs.item(i).toAttr().name();
                     if (name.startsWith("on")) {
@@ -1145,7 +922,7 @@ class Message::Private : public QSharedData {
 
     bool spooled = false, wasEncrypted = false;
 
-    //XEP-0280 Message Carbons
+    // XEP-0280 Message Carbons
     bool                     isDisabledCarbons = false;
     Message::CarbonDir       carbonDir         = Message::NoCarbon; // it's a forwarded message
     Message::ProcessingHints processingHints;
@@ -1160,25 +937,16 @@ class Message::Private : public QSharedData {
 //!
 //! This function will construct a Message container.
 //! \param to - specify receiver (default: empty string)
-Message::Message()
-{
-}
+Message::Message() {}
 
-Message::Message(const Jid &to) :
-    d(new Private)
-{
-    d->to = to;
-}
+Message::Message(const Jid &to) : d(new Private) { d->to = to; }
 
 //! \brief Constructs a copy of Message object
 //!
 //! Overloaded constructor which will constructs a exact copy of the Message
 //! object that was passed to the constructor.
 //! \param from - Message object you want to copy
-Message::Message(const Message &from) :
-    d(from.d)
-{
-}
+Message::Message(const Message &from) : d(from.d) {}
 
 //! \brief Required for internel use.
 Message &Message::operator=(const Message &from)
@@ -1188,60 +956,31 @@ Message &Message::operator=(const Message &from)
 }
 
 //! \brief Destroy Message object.
-Message::~Message()
-{
-}
+Message::~Message() {}
 
 //! \brief Check if it's exactly the same instance.
-bool Message::operator==(const Message &from) const
-{
-    return d == from.d;
-}
+bool Message::operator==(const Message &from) const { return d == from.d; }
 
 //! \brief Return receiver's Jid information.
-Jid Message::to() const
-{
-    return d ? d->to : Jid();
-}
+Jid Message::to() const { return d ? d->to : Jid(); }
 
 //! \brief Return sender's Jid information.
-Jid Message::from() const
-{
-    return d ? d->from : Jid();
-}
+Jid Message::from() const { return d ? d->from : Jid(); }
 
-QString Message::id() const
-{
-    return d ? d->id : QString();
-}
+QString Message::id() const { return d ? d->id : QString(); }
 
 //! \brief Return type information
-QString Message::type() const
-{
-    return d ? d->type : QString();
-}
+QString Message::type() const { return d ? d->type : QString(); }
 
-QString Message::lang() const
-{
-    return d ? d->lang : QString();
-}
+QString Message::lang() const { return d ? d->lang : QString(); }
 
 //! \brief Return subject information.
-QString Message::subject(const QString &lang) const
-{
-    return d ? d->subject.value(lang) : QString();
-}
+QString Message::subject(const QString &lang) const { return d ? d->subject.value(lang) : QString(); }
 
 //! \brief Return subject information.
-QString Message::subject(const QLocale &lang) const
-{
-    return d ? d->subject.value(lang.bcp47Name()) : QString();
-}
+QString Message::subject(const QLocale &lang) const { return d ? d->subject.value(lang.bcp47Name()) : QString(); }
 
-StringMap Message::subjectMap() const
-{
-    return d ? d->subject : StringMap();
-}
+StringMap Message::subjectMap() const { return d ? d->subject : StringMap(); }
 
 //! \brief Return body information.
 //!
@@ -1268,10 +1007,7 @@ QString Message::body(const QString &lang) const
 //!
 //! \param lang - requested body's locale
 //! \note Returns first body if not found by locale.
-QString Message::body(const QLocale &lang) const
-{
-    return body(lang.bcp47Name());
-}
+QString Message::body(const QLocale &lang) const { return body(lang.bcp47Name()); }
 
 //! \brief Return xhtml body.
 //!
@@ -1294,20 +1030,11 @@ HTMLElement Message::html(const QString &lang) const
 //!
 //! Returns true if there is at least one xhtml-im body
 //! in the message.
-bool Message::containsHTML() const
-{
-    return d && !(d->htmlElements.isEmpty());
-}
+bool Message::containsHTML() const { return d && !(d->htmlElements.isEmpty()); }
 
-QString Message::thread() const
-{
-    return d ? d->thread : QString();
-}
+QString Message::thread() const { return d ? d->thread : QString(); }
 
-Stanza::Error Message::error() const
-{
-    return d ? d->error : Stanza::Error();
-}
+Stanza::Error Message::error() const { return d ? d->error : Stanza::Error(); }
 
 //! \brief Set receivers information
 //!
@@ -1315,19 +1042,16 @@ Stanza::Error Message::error() const
 void Message::setTo(const Jid &j)
 {
     MessageD()->to = j;
-    //d->flag = false;
+    // d->flag = false;
 }
 
 void Message::setFrom(const Jid &j)
 {
     MessageD()->from = j;
-    //d->flag = false;
+    // d->flag = false;
 }
 
-void Message::setId(const QString &s)
-{
-    MessageD()->id = s;
-}
+void Message::setId(const QString &s) { MessageD()->id = s; }
 
 //! \brief Set Type of message
 //!
@@ -1335,13 +1059,10 @@ void Message::setId(const QString &s)
 void Message::setType(const QString &s)
 {
     MessageD()->type = s;
-    //d->flag = false;
+    // d->flag = false;
 }
 
-void Message::setLang(const QString &s)
-{
-    MessageD()->lang = s;
-}
+void Message::setLang(const QString &s) { MessageD()->lang = s; }
 
 //! \brief Set subject
 //!
@@ -1349,7 +1070,7 @@ void Message::setLang(const QString &s)
 void Message::setSubject(const QString &s, const QString &lang)
 {
     MessageD()->subject[lang] = s;
-    //d->flag = false;
+    // d->flag = false;
 }
 
 //! \brief Set body
@@ -1360,7 +1081,7 @@ void Message::setSubject(const QString &s, const QString &lang)
 void Message::setBody(const QString &s, const QString &lang)
 {
     MessageD()->body[lang] = s;
-    //d->flag = false;
+    // d->flag = false;
 }
 
 //! \brief Set xhtml body
@@ -1368,10 +1089,7 @@ void Message::setBody(const QString &s, const QString &lang)
 //! \param s - body node
 //! \param lang - body language
 //! \note The body should be in xhtml.
-void Message::setHTML(const HTMLElement &e, const QString &lang)
-{
-    MessageD()->htmlElements[lang] = e;
-}
+void Message::setHTML(const HTMLElement &e, const QString &lang) { MessageD()->htmlElements[lang] = e; }
 
 void Message::setThread(const QString &s, bool send)
 {
@@ -1379,30 +1097,18 @@ void Message::setThread(const QString &s, bool send)
     d->thread              = s;
 }
 
-void Message::setError(const Stanza::Error &err)
-{
-    MessageD()->error = err;
-}
+void Message::setError(const Stanza::Error &err) { MessageD()->error = err; }
 
-QString Message::pubsubNode() const
-{
-    return d ? d->pubsubNode : QString();
-}
+QString Message::pubsubNode() const { return d ? d->pubsubNode : QString(); }
 
-QList<PubSubItem> Message::pubsubItems() const
-{
-    return d ? d->pubsubItems : QList<PubSubItem>();
-}
+QList<PubSubItem> Message::pubsubItems() const { return d ? d->pubsubItems : QList<PubSubItem>(); }
 
 QList<PubSubRetraction> Message::pubsubRetractions() const
 {
     return d ? d->pubsubRetractions : QList<PubSubRetraction>();
 }
 
-QDateTime Message::timeStamp() const
-{
-    return d ? d->timeStamp : QDateTime();
-}
+QDateTime Message::timeStamp() const { return d ? d->timeStamp : QDateTime(); }
 
 void Message::setTimeStamp(const QDateTime &ts, bool send)
 {
@@ -1411,18 +1117,12 @@ void Message::setTimeStamp(const QDateTime &ts, bool send)
 }
 
 //! \brief Return list of urls attached to message.
-UrlList Message::urlList() const
-{
-    return d ? d->urlList : UrlList();
-}
+UrlList Message::urlList() const { return d ? d->urlList : UrlList(); }
 
 //! \brief Add Url to the url list.
 //!
 //! \param url - url to append
-void Message::urlAdd(const Url &u)
-{
-    MessageD()->urlList += u;
-}
+void Message::urlAdd(const Url &u) { MessageD()->urlList += u; }
 
 //! \brief clear out the url list.
 void Message::urlsClear()
@@ -1435,24 +1135,15 @@ void Message::urlsClear()
 //! \brief Set urls to send
 //!
 //! \param urlList - list of urls to send
-void Message::setUrlList(const UrlList &list)
-{
-    MessageD()->urlList = list;
-}
+void Message::setUrlList(const UrlList &list) { MessageD()->urlList = list; }
 
 //! \brief Return list of addresses attached to message.
-AddressList Message::addresses() const
-{
-    return d ? d->addressList : AddressList();
-}
+AddressList Message::addresses() const { return d ? d->addressList : AddressList(); }
 
 //! \brief Add Address to the address list.
 //!
 //! \param address - address to append
-void Message::addAddress(const Address &a)
-{
-    MessageD()->addressList += a;
-}
+void Message::addAddress(const Address &a) { MessageD()->addressList += a; }
 
 //! \brief clear out the address list.
 void Message::clearAddresses()
@@ -1478,40 +1169,19 @@ AddressList Message::findAddresses(Address::Type t) const
 //! \brief Set addresses to send
 //!
 //! \param list - list of addresses to send
-void Message::setAddresses(const AddressList &list)
-{
-    MessageD()->addressList = list;
-}
+void Message::setAddresses(const AddressList &list) { MessageD()->addressList = list; }
 
-RosterExchangeItems Message::rosterExchangeItems() const
-{
-    return d ? d->rosterExchangeItems : RosterExchangeItems();
-}
+RosterExchangeItems Message::rosterExchangeItems() const { return d ? d->rosterExchangeItems : RosterExchangeItems(); }
 
-void Message::setRosterExchangeItems(const RosterExchangeItems &items)
-{
-    MessageD()->rosterExchangeItems = items;
-}
+void Message::setRosterExchangeItems(const RosterExchangeItems &items) { MessageD()->rosterExchangeItems = items; }
 
-QString Message::eventId() const
-{
-    return d ? d->eventId : QString();
-}
+QString Message::eventId() const { return d ? d->eventId : QString(); }
 
-void Message::setEventId(const QString &id)
-{
-    MessageD()->eventId = id;
-}
+void Message::setEventId(const QString &id) { MessageD()->eventId = id; }
 
-bool Message::containsEvents() const
-{
-    return d && !d->eventList.isEmpty();
-}
+bool Message::containsEvents() const { return d && !d->eventList.isEmpty(); }
 
-bool Message::containsEvent(MsgEvent e) const
-{
-    return d && d->eventList.contains(e);
-}
+bool Message::containsEvent(MsgEvent e) const { return d && d->eventList.contains(e); }
 
 void Message::addEvent(MsgEvent e)
 {
@@ -1522,270 +1192,111 @@ void Message::addEvent(MsgEvent e)
     }
 }
 
-ChatState Message::chatState() const
-{
-    return d ? d->chatState : StateNone;
-}
+ChatState Message::chatState() const { return d ? d->chatState : StateNone; }
 
-void Message::setChatState(ChatState state)
-{
-    MessageD()->chatState = state;
-}
+void Message::setChatState(ChatState state) { MessageD()->chatState = state; }
 
-MessageReceipt Message::messageReceipt() const
-{
-    return d ? d->messageReceipt : ReceiptNone;
-}
+MessageReceipt Message::messageReceipt() const { return d ? d->messageReceipt : ReceiptNone; }
 
-void Message::setMessageReceipt(MessageReceipt messageReceipt)
-{
-    MessageD()->messageReceipt = messageReceipt;
-}
+void Message::setMessageReceipt(MessageReceipt messageReceipt) { MessageD()->messageReceipt = messageReceipt; }
 
-QString Message::messageReceiptId() const
-{
-    return d ? d->messageReceiptId : QString();
-}
+QString Message::messageReceiptId() const { return d ? d->messageReceiptId : QString(); }
 
-void Message::setMessageReceiptId(const QString &s)
-{
-    MessageD()->messageReceiptId = s;
-}
+void Message::setMessageReceiptId(const QString &s) { MessageD()->messageReceiptId = s; }
 
-QString Message::xsigned() const
-{
-    return d ? d->xsigned : QString();
-}
+QString Message::xsigned() const { return d ? d->xsigned : QString(); }
 
-void Message::setXSigned(const QString &s)
-{
-    MessageD()->xsigned = s;
-}
+void Message::setXSigned(const QString &s) { MessageD()->xsigned = s; }
 
-QString Message::xencrypted() const
-{
-    return d ? d->xencrypted : QString();
-}
+QString Message::xencrypted() const { return d ? d->xencrypted : QString(); }
 
-void Message::setXEncrypted(const QString &s)
-{
-    MessageD()->xencrypted = s;
-}
+void Message::setXEncrypted(const QString &s) { MessageD()->xencrypted = s; }
 
-QList<int> Message::getMUCStatuses() const
-{
-    return d ? d->mucStatuses : QList<int>();
-}
+QList<int> Message::getMUCStatuses() const { return d ? d->mucStatuses : QList<int>(); }
 
-void Message::addMUCStatus(int i)
-{
-    MessageD()->mucStatuses += i;
-}
+void Message::addMUCStatus(int i) { MessageD()->mucStatuses += i; }
 
-void Message::addMUCInvite(const MUCInvite &i)
-{
-    MessageD()->mucInvites += i;
-}
+void Message::addMUCInvite(const MUCInvite &i) { MessageD()->mucInvites += i; }
 
-QList<MUCInvite> Message::mucInvites() const
-{
-    return d ? d->mucInvites : QList<MUCInvite>();
-}
+QList<MUCInvite> Message::mucInvites() const { return d ? d->mucInvites : QList<MUCInvite>(); }
 
-void Message::setMUCDecline(const MUCDecline &de)
-{
-    MessageD()->mucDecline = de;
-}
+void Message::setMUCDecline(const MUCDecline &de) { MessageD()->mucDecline = de; }
 
-MUCDecline Message::mucDecline() const
-{
-    return d ? d->mucDecline : MUCDecline();
-}
+MUCDecline Message::mucDecline() const { return d ? d->mucDecline : MUCDecline(); }
 
-QString Message::mucPassword() const
-{
-    return d ? d->mucPassword : QString();
-}
+QString Message::mucPassword() const { return d ? d->mucPassword : QString(); }
 
-void Message::setMUCPassword(const QString &p)
-{
-    MessageD()->mucPassword = p;
-}
+void Message::setMUCPassword(const QString &p) { MessageD()->mucPassword = p; }
 
-bool Message::hasMUCUser() const
-{
-    return d & d->hasMUCUser;
-}
+bool Message::hasMUCUser() const { return d & d->hasMUCUser; }
 
-Message::StanzaId Message::stanzaId() const
-{
-    return d ? d->stanzaId : StanzaId();
-}
+Message::StanzaId Message::stanzaId() const { return d ? d->stanzaId : StanzaId(); }
 
-void Message::setStanzaId(const Message::StanzaId &id)
-{
-    MessageD()->stanzaId = id;
-}
+void Message::setStanzaId(const Message::StanzaId &id) { MessageD()->stanzaId = id; }
 
-QString Message::originId() const
-{
-    return d ? d->originId : QString();
-}
+QString Message::originId() const { return d ? d->originId : QString(); }
 
-void Message::setOriginId(const QString &id)
-{
-    MessageD()->originId = id;
-}
+void Message::setOriginId(const QString &id) { MessageD()->originId = id; }
 
-QList<Reference> Message::references() const
-{
-    return d ? d->references : QList<Reference>();
-}
+QList<Reference> Message::references() const { return d ? d->references : QList<Reference>(); }
 
-void Message::addReference(const Reference &r)
-{
-    MessageD()->references.append(r);
-}
+void Message::addReference(const Reference &r) { MessageD()->references.append(r); }
 
-void Message::setReferences(const QList<Reference> &r)
-{
-    MessageD()->references = r;
-}
+void Message::setReferences(const QList<Reference> &r) { MessageD()->references = r; }
 
-QString Message::invite() const
-{
-    return d ? d->invite : QString();
-}
+QString Message::invite() const { return d ? d->invite : QString(); }
 
-void Message::setInvite(const QString &s)
-{
-    MessageD()->invite = s;
-}
+void Message::setInvite(const QString &s) { MessageD()->invite = s; }
 
-QString Message::nick() const
-{
-    return d ? d->nick : QString();
-}
+QString Message::nick() const { return d ? d->nick : QString(); }
 
-void Message::setNick(const QString &n)
-{
-    MessageD()->nick = n;
-}
+void Message::setNick(const QString &n) { MessageD()->nick = n; }
 
-void Message::setHttpAuthRequest(const HttpAuthRequest &req)
-{
-    MessageD()->httpAuthRequest = req;
-}
+void Message::setHttpAuthRequest(const HttpAuthRequest &req) { MessageD()->httpAuthRequest = req; }
 
-HttpAuthRequest Message::httpAuthRequest() const
-{
-    return d ? d->httpAuthRequest : HttpAuthRequest();
-}
+HttpAuthRequest Message::httpAuthRequest() const { return d ? d->httpAuthRequest : HttpAuthRequest(); }
 
-void Message::setForm(const XData &form)
-{
-    MessageD()->xdata = form;
-}
+void Message::setForm(const XData &form) { MessageD()->xdata = form; }
 
-XData Message::getForm() const
-{
-    return d ? d->xdata : XData();
-}
+XData Message::getForm() const { return d ? d->xdata : XData(); }
 
-QDomElement Message::sxe() const
-{
-    return d ? d->sxe : QDomElement();
-}
+QDomElement Message::sxe() const { return d ? d->sxe : QDomElement(); }
 
-void Message::setSxe(const QDomElement &e)
-{
-    MessageD()->sxe = e;
-}
+void Message::setSxe(const QDomElement &e) { MessageD()->sxe = e; }
 
-void Message::addBoBData(const BoBData &bob)
-{
-    MessageD()->bobDataList.append(bob);
-}
+void Message::addBoBData(const BoBData &bob) { MessageD()->bobDataList.append(bob); }
 
-QList<BoBData> Message::bobDataList() const
-{
-    return d ? d->bobDataList : QList<BoBData>();
-}
+QList<BoBData> Message::bobDataList() const { return d ? d->bobDataList : QList<BoBData>(); }
 
-IBBData Message::ibbData() const
-{
-    return d ? d->ibbData : IBBData();
-}
+IBBData Message::ibbData() const { return d ? d->ibbData : IBBData(); }
 
-void Message::setDisabledCarbons(bool disabled)
-{
-    MessageD()->isDisabledCarbons = disabled;
-}
+void Message::setDisabledCarbons(bool disabled) { MessageD()->isDisabledCarbons = disabled; }
 
-bool Message::isDisabledCarbons() const
-{
-    return d && d->isDisabledCarbons;
-}
+bool Message::isDisabledCarbons() const { return d && d->isDisabledCarbons; }
 
-void Message::setCarbonDirection(Message::CarbonDir cd)
-{
-    MessageD()->carbonDir = cd;
-}
+void Message::setCarbonDirection(Message::CarbonDir cd) { MessageD()->carbonDir = cd; }
 
-Message::CarbonDir Message::carbonDirection() const
-{
-    return d ? d->carbonDir : NoCarbon;
-}
+Message::CarbonDir Message::carbonDirection() const { return d ? d->carbonDir : NoCarbon; }
 
-void Message::setForwardedFrom(const Jid &jid)
-{
-    MessageD()->forwardedFrom = jid;
-}
+void Message::setForwardedFrom(const Jid &jid) { MessageD()->forwardedFrom = jid; }
 
-Jid Message::forwardedFrom() const
-{
-    return d ? d->forwardedFrom : Jid();
-}
+Jid Message::forwardedFrom() const { return d ? d->forwardedFrom : Jid(); }
 
-bool Message::spooled() const
-{
-    return d && d->spooled;
-}
+bool Message::spooled() const { return d && d->spooled; }
 
-void Message::setSpooled(bool b)
-{
-    MessageD()->spooled = b;
-}
+void Message::setSpooled(bool b) { MessageD()->spooled = b; }
 
-bool Message::wasEncrypted() const
-{
-    return d && d->wasEncrypted;
-}
+bool Message::wasEncrypted() const { return d && d->wasEncrypted; }
 
-void Message::setWasEncrypted(bool b)
-{
-    MessageD()->wasEncrypted = b;
-}
+void Message::setWasEncrypted(bool b) { MessageD()->wasEncrypted = b; }
 
-QString Message::replaceId() const
-{
-    return d ? d->replaceId : QString();
-}
+QString Message::replaceId() const { return d ? d->replaceId : QString(); }
 
-void Message::setReplaceId(const QString &id)
-{
-    MessageD()->replaceId = id;
-}
+void Message::setReplaceId(const QString &id) { MessageD()->replaceId = id; }
 
-void Message::setProcessingHints(const ProcessingHints &hints)
-{
-    MessageD()->processingHints = hints;
-}
+void Message::setProcessingHints(const ProcessingHints &hints) { MessageD()->processingHints = hints; }
 
-Message::ProcessingHints Message::processingHints() const
-{
-    return d ? d->processingHints : ProcessingHints();
-}
+Message::ProcessingHints Message::processingHints() const { return d ? d->processingHints : ProcessingHints(); }
 
 Stanza Message::toStanza(Stream *stream) const
 {
@@ -2064,18 +1575,12 @@ Stanza Message::toStanza(Stream *stream) const
 /**
   \brief Create Message from Stanza \a s, using given \a timeZoneOffset (old style)
   */
-bool Message::fromStanza(const Stanza &s, int timeZoneOffset)
-{
-    return fromStanza(s, true, timeZoneOffset);
-}
+bool Message::fromStanza(const Stanza &s, int timeZoneOffset) { return fromStanza(s, true, timeZoneOffset); }
 
 /**
   \brief Create Message from Stanza \a s
   */
-bool Message::fromStanza(const Stanza &s)
-{
-    return fromStanza(s, false, 0);
-}
+bool Message::fromStanza(const Stanza &s) { return fromStanza(s, false, 0); }
 
 /**
   \brief Create Message from Stanza \a s
@@ -2123,7 +1628,8 @@ bool Message::fromStanza(const Stanza &s, bool useTimeZoneOffset, int timeZoneOf
                     }
                 } else if (e.tagName() == QLatin1String("thread"))
                     d->thread = e.text();
-            } else if (e.tagName() == QLatin1String("event") && e.namespaceURI() == QLatin1String("http://jabber.org/protocol/pubsub#event")) {
+            } else if (e.tagName() == QLatin1String("event")
+                       && e.namespaceURI() == QLatin1String("http://jabber.org/protocol/pubsub#event")) {
                 for (QDomNode enode = e.firstChild(); !enode.isNull(); enode = enode.nextSibling()) {
                     QDomElement eel = enode.toElement();
                     if (eel.tagName() == QLatin1String("items")) {
@@ -2144,23 +1650,27 @@ bool Message::fromStanza(const Stanza &s, bool useTimeZoneOffset, int timeZoneOf
                         }
                     }
                 }
-            } else if (e.tagName() == QLatin1String("no-permanent-store") && e.namespaceURI() == QLatin1String("urn:xmpp:hints")) {
+            } else if (e.tagName() == QLatin1String("no-permanent-store")
+                       && e.namespaceURI() == QLatin1String("urn:xmpp:hints")) {
                 d->processingHints |= NoPermanentStore;
-            } else if (e.tagName() == QLatin1String("no-store") && e.namespaceURI() == QLatin1String("urn:xmpp:hints")) {
+            } else if (e.tagName() == QLatin1String("no-store")
+                       && e.namespaceURI() == QLatin1String("urn:xmpp:hints")) {
                 d->processingHints |= NoStore;
             } else if (e.tagName() == QLatin1String("no-copy") && e.namespaceURI() == QLatin1String("urn:xmpp:hints")) {
                 d->processingHints |= NoCopy;
             } else if (e.tagName() == QLatin1String("store") && e.namespaceURI() == QLatin1String("urn:xmpp:hints")) {
                 d->processingHints |= Store;
-            } else if (e.tagName() == QLatin1String("origin-id") && e.namespaceURI() == QLatin1String("urn:xmpp:sid:0")) {
+            } else if (e.tagName() == QLatin1String("origin-id")
+                       && e.namespaceURI() == QLatin1String("urn:xmpp:sid:0")) {
                 d->originId = e.attribute(QStringLiteral("id"));
-            } else if (e.tagName() == QLatin1String("stanza-id") && e.namespaceURI() == QLatin1String("urn:xmpp:sid:0")) {
+            } else if (e.tagName() == QLatin1String("stanza-id")
+                       && e.namespaceURI() == QLatin1String("urn:xmpp:sid:0")) {
                 d->stanzaId.id = e.attribute(QStringLiteral("id"));
                 d->stanzaId.by = Jid(e.attribute(QStringLiteral("by")));
             }
 
             else {
-                //printf("extension element: [%s]\n", e.tagName().latin1());
+                // printf("extension element: [%s]\n", e.tagName().latin1());
             }
         }
     }
@@ -2368,10 +1878,7 @@ bool Message::fromStanza(const Stanza &s, bool useTimeZoneOffset, int timeZoneOf
         d->httpAuthRequest = HttpAuthRequest();
     }
 
-    QDomElement captcha = childElementsByTagNameNS(root, "urn:xmpp:captcha",
-                                                   "captcha")
-                              .item(0)
-                              .toElement();
+    QDomElement captcha   = childElementsByTagNameNS(root, "urn:xmpp:captcha", "captcha").item(0).toElement();
     QDomElement xdataRoot = root;
     if (!captcha.isNull()) {
         xdataRoot = captcha;
@@ -2420,42 +1927,27 @@ HttpAuthRequest::HttpAuthRequest(const QString &m, const QString &u, const QStri
 /*!
         Constructs request of resource URL \a u, made by method \a m, without transaction id.
 */
-HttpAuthRequest::HttpAuthRequest(const QString &m, const QString &u) :
-    method_(m), url_(u), hasId_(false)
-{
-}
+HttpAuthRequest::HttpAuthRequest(const QString &m, const QString &u) : method_(m), url_(u), hasId_(false) {}
 
 /*!
     Constructs request object by reading XML <confirm/> element \a e.
 */
-HttpAuthRequest::HttpAuthRequest(const QDomElement &e)
-{
-    fromXml(e);
-}
+HttpAuthRequest::HttpAuthRequest(const QDomElement &e) { fromXml(e); }
 
 /*!
     Returns true is object is empty (not valid).
 */
-bool HttpAuthRequest::isEmpty() const
-{
-    return method_.isEmpty() && url_.isEmpty();
-}
+bool HttpAuthRequest::isEmpty() const { return method_.isEmpty() && url_.isEmpty(); }
 
 /*!
     Sets request method.
 */
-void HttpAuthRequest::setMethod(const QString &m)
-{
-    method_ = m;
-}
+void HttpAuthRequest::setMethod(const QString &m) { method_ = m; }
 
 /*!
     Sets requested URL.
 */
-void HttpAuthRequest::setUrl(const QString &u)
-{
-    url_ = u;
-}
+void HttpAuthRequest::setUrl(const QString &u) { url_ = u; }
 
 /*!
     Sets transaction identifier.
@@ -2469,35 +1961,23 @@ void HttpAuthRequest::setId(const QString &i)
 /*!
     Returns request method.
 */
-QString HttpAuthRequest::method() const
-{
-    return method_;
-}
+QString HttpAuthRequest::method() const { return method_; }
 
 /*!
     Returns requested URL.
 */
-QString HttpAuthRequest::url() const
-{
-    return url_;
-}
+QString HttpAuthRequest::url() const { return url_; }
 
 /*!
     Returns transaction identifier.
     Empty QString may mean both empty id or no id. Use hasId() to tell the difference.
 */
-QString HttpAuthRequest::id() const
-{
-    return id_;
-}
+QString HttpAuthRequest::id() const { return id_; }
 
 /*!
     Returns true if the request contains transaction id.
 */
-bool HttpAuthRequest::hasId() const
-{
-    return hasId_;
-}
+bool HttpAuthRequest::hasId() const { return hasId_; }
 
 /*!
     Returns XML element representing the request.
@@ -2540,15 +2020,9 @@ bool HttpAuthRequest::fromXml(const QDomElement &e)
 //---------------------------------------------------------------------------
 // Subscription
 //---------------------------------------------------------------------------
-Subscription::Subscription(SubType type)
-{
-    value = type;
-}
+Subscription::Subscription(SubType type) { value = type; }
 
-int Subscription::type() const
-{
-    return value;
-}
+int Subscription::type() const { return value; }
 
 QString Subscription::toString() const
 {
@@ -2591,10 +2065,7 @@ bool Subscription::fromString(const QString &s)
 /**
  * Default constructor.
  */
-CapsSpec::CapsSpec() :
-    hashAlgo_(CapsSpec::invalidAlgo)
-{
-}
+CapsSpec::CapsSpec() : hashAlgo_(CapsSpec::invalidAlgo) {}
 
 /**
  * \brief Basic constructor.
@@ -2608,9 +2079,7 @@ CapsSpec::CapsSpec(const QString &node, QCryptographicHash::Algorithm hashAlgo,
 }
 
 CapsSpec::CapsSpec(const DiscoItem &disco, QCryptographicHash::Algorithm hashAlgo) :
-    node_(disco.node().section('#', 0, 0)),
-    ver_(disco.capsHash(hashAlgo)),
-    hashAlgo_(hashAlgo)
+    node_(disco.node().section('#', 0, 0)), ver_(disco.capsHash(hashAlgo)), hashAlgo_(hashAlgo)
 {
 }
 
@@ -2618,31 +2087,19 @@ CapsSpec::CapsSpec(const DiscoItem &disco, QCryptographicHash::Algorithm hashAlg
  * @brief Checks for validity
  * @return true on valid
  */
-bool CapsSpec::isValid() const
-{
-    return !node_.isEmpty() && !ver_.isEmpty() && (hashAlgo_ != CapsSpec::invalidAlgo);
-}
+bool CapsSpec::isValid() const { return !node_.isEmpty() && !ver_.isEmpty() && (hashAlgo_ != CapsSpec::invalidAlgo); }
 
 /**
  * \brief Returns the node of the capabilities specification.
  */
-const QString &CapsSpec::node() const
-{
-    return node_;
-}
+const QString &CapsSpec::node() const { return node_; }
 
 /**
  * \brief Returns the version of the capabilities specification.
  */
-const QString &CapsSpec::version() const
-{
-    return ver_;
-}
+const QString &CapsSpec::version() const { return ver_; }
 
-QCryptographicHash::Algorithm CapsSpec::hashAlgorithm() const
-{
-    return hashAlgo_;
-}
+QCryptographicHash::Algorithm CapsSpec::hashAlgorithm() const { return hashAlgo_; }
 
 QDomElement CapsSpec::toXml(QDomDocument *doc) const
 {
@@ -2709,24 +2166,20 @@ QString CapsSpec::flatten() const
     return QString();
 }
 
-void CapsSpec::resetVersion()
-{
-    ver_.clear();
-}
+void CapsSpec::resetVersion() { ver_.clear(); }
 
 bool CapsSpec::operator==(const CapsSpec &s) const
 {
     return (node() == s.node() && version() == s.version() && hashAlgorithm() == s.hashAlgorithm());
 }
 
-bool CapsSpec::operator!=(const CapsSpec &s) const
-{
-    return !((*this) == s);
-}
+bool CapsSpec::operator!=(const CapsSpec &s) const { return !((*this) == s); }
 
 bool CapsSpec::operator<(const CapsSpec &s) const
 {
-    return (node() != s.node() ? node() < s.node() : (version() != s.version() ? version() < s.version() : hashAlgorithm() < s.hashAlgorithm()));
+    return (node() != s.node()
+                ? node() < s.node()
+                : (version() != s.version() ? version() < s.version() : hashAlgorithm() < s.hashAlgorithm()));
 }
 
 class StatusPrivate : public QSharedData {
@@ -2764,8 +2217,7 @@ class StatusPrivate : public QSharedData {
     QString estr;
 };
 
-Status::Status(const QString &show, const QString &status, int priority, bool available) :
-    d(new StatusPrivate)
+Status::Status(const QString &show, const QString &status, int priority, bool available) : d(new StatusPrivate)
 {
     d->isAvailable = available;
     d->show        = show;
@@ -2775,8 +2227,7 @@ Status::Status(const QString &show, const QString &status, int priority, bool av
     d->isInvisible = false;
 }
 
-Status::Status(Type type, const QString &status, int priority) :
-    d(new StatusPrivate)
+Status::Status(Type type, const QString &status, int priority) : d(new StatusPrivate)
 {
     d->status    = status;
     d->priority  = priority;
@@ -2784,10 +2235,7 @@ Status::Status(Type type, const QString &status, int priority) :
     setType(type);
 }
 
-Status::Status(const Status &other) :
-    d(other.d)
-{
-}
+Status::Status(const Status &other) : d(other.d) {}
 
 Status &Status::operator=(const Status &other)
 {
@@ -2795,14 +2243,9 @@ Status &Status::operator=(const Status &other)
     return *this;
 }
 
-Status::~Status()
-{
-}
+Status::~Status() {}
 
-bool Status::hasError() const
-{
-    return (d->ecode != -1);
-}
+bool Status::hasError() const { return (d->ecode != -1); }
 
 void Status::setError(int code, const QString &str)
 {
@@ -2810,20 +2253,11 @@ void Status::setError(int code, const QString &str)
     d->estr  = str;
 }
 
-void Status::setIsAvailable(bool available)
-{
-    d->isAvailable = available;
-}
+void Status::setIsAvailable(bool available) { d->isAvailable = available; }
 
-void Status::setIsInvisible(bool invisible)
-{
-    d->isInvisible = invisible;
-}
+void Status::setIsInvisible(bool invisible) { d->isInvisible = invisible; }
 
-void Status::setPriority(int x)
-{
-    d->priority = x;
-}
+void Status::setPriority(int x) { d->priority = x; }
 
 void Status::setType(Status::Type _type)
 {
@@ -2877,50 +2311,23 @@ Status::Type Status::txt2type(const QString &stat)
         return XMPP::Status::Away;
 }
 
-void Status::setType(const QString &stat)
-{
-    setType(txt2type(stat));
-}
+void Status::setType(const QString &stat) { setType(txt2type(stat)); }
 
-void Status::setShow(const QString &_show)
-{
-    d->show = _show;
-}
+void Status::setShow(const QString &_show) { d->show = _show; }
 
-void Status::setStatus(const QString &_status)
-{
-    d->status = _status;
-}
+void Status::setStatus(const QString &_status) { d->status = _status; }
 
-void Status::setTimeStamp(const QDateTime &_timestamp)
-{
-    d->timeStamp = _timestamp;
-}
+void Status::setTimeStamp(const QDateTime &_timestamp) { d->timeStamp = _timestamp; }
 
-void Status::setKeyID(const QString &key)
-{
-    d->key = key;
-}
+void Status::setKeyID(const QString &key) { d->key = key; }
 
-void Status::setXSigned(const QString &s)
-{
-    d->xsigned = s;
-}
+void Status::setXSigned(const QString &s) { d->xsigned = s; }
 
-void Status::setSongTitle(const QString &_songtitle)
-{
-    d->songTitle = _songtitle;
-}
+void Status::setSongTitle(const QString &_songtitle) { d->songTitle = _songtitle; }
 
-void Status::setCaps(const CapsSpec &caps)
-{
-    d->caps = caps;
-}
+void Status::setCaps(const CapsSpec &caps) { d->caps = caps; }
 
-void Status::setMUC()
-{
-    d->isMUC = true;
-}
+void Status::setMUC() { d->isMUC = true; }
 
 void Status::setMUCItem(const MUCItem &i)
 {
@@ -2942,10 +2349,7 @@ void Status::setMUCHistory(int maxchars, int maxstanzas, int seconds, const QDat
     d->mucHistorySince      = since;
 }
 
-const QByteArray &Status::photoHash() const
-{
-    return d->photoHash;
-}
+const QByteArray &Status::photoHash() const { return d->photoHash; }
 
 void Status::setPhotoHash(const QByteArray &h)
 {
@@ -2953,40 +2357,19 @@ void Status::setPhotoHash(const QByteArray &h)
     d->hasPhotoHash = true;
 }
 
-bool Status::hasPhotoHash() const
-{
-    return d->hasPhotoHash;
-}
+bool Status::hasPhotoHash() const { return d->hasPhotoHash; }
 
-void Status::addBoBData(const BoBData &bob)
-{
-    d->bobDataList.append(bob);
-}
+void Status::addBoBData(const BoBData &bob) { d->bobDataList.append(bob); }
 
-QList<BoBData> Status::bobDataList() const
-{
-    return d->bobDataList;
-}
+QList<BoBData> Status::bobDataList() const { return d->bobDataList; }
 
-bool Status::isAvailable() const
-{
-    return d->isAvailable;
-}
+bool Status::isAvailable() const { return d->isAvailable; }
 
-bool Status::isAway() const
-{
-    return (d->show == "away" || d->show == "xa" || d->show == "dnd");
-}
+bool Status::isAway() const { return (d->show == "away" || d->show == "xa" || d->show == "dnd"); }
 
-bool Status::isInvisible() const
-{
-    return d->isInvisible;
-}
+bool Status::isInvisible() const { return d->isInvisible; }
 
-int Status::priority() const
-{
-    return d->priority;
-}
+int Status::priority() const { return d->priority; }
 
 Status::Type Status::type() const
 {
@@ -3040,164 +2423,76 @@ QString Status::typeString() const
     return stat;
 }
 
-const QString &Status::show() const
-{
-    return d->show;
-}
-const QString &Status::status() const
-{
-    return d->status;
-}
+const QString &Status::show() const { return d->show; }
+const QString &Status::status() const { return d->status; }
 
-QDateTime Status::timeStamp() const
-{
-    return d->timeStamp;
-}
+QDateTime Status::timeStamp() const { return d->timeStamp; }
 
-const QString &Status::keyID() const
-{
-    return d->key;
-}
+const QString &Status::keyID() const { return d->key; }
 
-const QString &Status::xsigned() const
-{
-    return d->xsigned;
-}
+const QString &Status::xsigned() const { return d->xsigned; }
 
-const QString &Status::songTitle() const
-{
-    return d->songTitle;
-}
+const QString &Status::songTitle() const { return d->songTitle; }
 
-const CapsSpec &Status::caps() const
-{
-    return d->caps;
-}
+const CapsSpec &Status::caps() const { return d->caps; }
 
-bool Status::isMUC() const
-{
-    return d->isMUC || !d->mucPassword.isEmpty() || hasMUCHistory();
-}
+bool Status::isMUC() const { return d->isMUC || !d->mucPassword.isEmpty() || hasMUCHistory(); }
 
-bool Status::hasMUCItem() const
-{
-    return d->hasMUCItem;
-}
+bool Status::hasMUCItem() const { return d->hasMUCItem; }
 
-const MUCItem &Status::mucItem() const
-{
-    return d->mucItem;
-}
+const MUCItem &Status::mucItem() const { return d->mucItem; }
 
-bool Status::hasMUCDestroy() const
-{
-    return d->hasMUCDestroy;
-}
+bool Status::hasMUCDestroy() const { return d->hasMUCDestroy; }
 
-const MUCDestroy &Status::mucDestroy() const
-{
-    return d->mucDestroy;
-}
+const MUCDestroy &Status::mucDestroy() const { return d->mucDestroy; }
 
-const QList<int> &Status::getMUCStatuses() const
-{
-    return d->mucStatuses;
-}
+const QList<int> &Status::getMUCStatuses() const { return d->mucStatuses; }
 
-void Status::addMUCStatus(int i)
-{
-    d->mucStatuses += i;
-}
+void Status::addMUCStatus(int i) { d->mucStatuses += i; }
 
-const QString &Status::mucPassword() const
-{
-    return d->mucPassword;
-}
+const QString &Status::mucPassword() const { return d->mucPassword; }
 
 bool Status::hasMUCHistory() const
 {
-    return d->mucHistoryMaxChars >= 0 || d->mucHistoryMaxStanzas >= 0 || d->mucHistorySeconds >= 0 || !d->mucHistorySince.isNull();
+    return d->mucHistoryMaxChars >= 0 || d->mucHistoryMaxStanzas >= 0 || d->mucHistorySeconds >= 0
+        || !d->mucHistorySince.isNull();
 }
 
-int Status::mucHistoryMaxChars() const
-{
-    return d->mucHistoryMaxChars;
-}
+int Status::mucHistoryMaxChars() const { return d->mucHistoryMaxChars; }
 
-int Status::mucHistoryMaxStanzas() const
-{
-    return d->mucHistoryMaxStanzas;
-}
+int Status::mucHistoryMaxStanzas() const { return d->mucHistoryMaxStanzas; }
 
-int Status::mucHistorySeconds() const
-{
-    return d->mucHistorySeconds;
-}
+int Status::mucHistorySeconds() const { return d->mucHistorySeconds; }
 
-const QDateTime &Status::mucHistorySince() const
-{
-    return d->mucHistorySince;
-}
+const QDateTime &Status::mucHistorySince() const { return d->mucHistorySince; }
 
-void Status::setMUCPassword(const QString &i)
-{
-    d->mucPassword = i;
-}
+void Status::setMUCPassword(const QString &i) { d->mucPassword = i; }
 
-int Status::errorCode() const
-{
-    return d->ecode;
-}
+int Status::errorCode() const { return d->ecode; }
 
-const QString &Status::errorString() const
-{
-    return d->estr;
-}
+const QString &Status::errorString() const { return d->estr; }
 
 //---------------------------------------------------------------------------
 // Resource
 //---------------------------------------------------------------------------
-Resource::Resource(const QString &name, const Status &stat) :
-    v_name(name), v_status(stat)
-{
-}
+Resource::Resource(const QString &name, const Status &stat) : v_name(name), v_status(stat) {}
 
-const QString &Resource::name() const
-{
-    return v_name;
-}
+const QString &Resource::name() const { return v_name; }
 
-int Resource::priority() const
-{
-    return v_status.priority();
-}
+int Resource::priority() const { return v_status.priority(); }
 
-const Status &Resource::status() const
-{
-    return v_status;
-}
+const Status &Resource::status() const { return v_status; }
 
-void Resource::setName(const QString &_name)
-{
-    v_name = _name;
-}
+void Resource::setName(const QString &_name) { v_name = _name; }
 
-void Resource::setStatus(const Status &_status)
-{
-    v_status = _status;
-}
+void Resource::setStatus(const Status &_status) { v_status = _status; }
 
 //---------------------------------------------------------------------------
 // ResourceList
 //---------------------------------------------------------------------------
-ResourceList::ResourceList() :
-    QList<Resource>()
-{
-}
+ResourceList::ResourceList() : QList<Resource>() {}
 
-ResourceList::~ResourceList()
-{
-}
+ResourceList::~ResourceList() {}
 
 ResourceList::Iterator ResourceList::find(const QString &_find)
 {
@@ -3246,55 +2541,27 @@ ResourceList::ConstIterator ResourceList::priority() const
 //---------------------------------------------------------------------------
 // RosterItem
 //---------------------------------------------------------------------------
-RosterItem::RosterItem(const Jid &_jid) :
-    v_jid(_jid),
-    v_push(false)
-{
-}
+RosterItem::RosterItem(const Jid &_jid) : v_jid(_jid), v_push(false) {}
 
 RosterItem::RosterItem(const RosterItem &item) :
-    v_jid(item.v_jid),
-    v_name(item.v_name),
-    v_groups(item.v_groups),
-    v_subscription(item.v_subscription),
-    v_ask(item.v_ask),
-    v_push(item.v_push)
+    v_jid(item.v_jid), v_name(item.v_name), v_groups(item.v_groups), v_subscription(item.v_subscription),
+    v_ask(item.v_ask), v_push(item.v_push)
 {
 }
 
-RosterItem::~RosterItem()
-{
-}
+RosterItem::~RosterItem() {}
 
-const Jid &RosterItem::jid() const
-{
-    return v_jid;
-}
+const Jid &RosterItem::jid() const { return v_jid; }
 
-const QString &RosterItem::name() const
-{
-    return v_name;
-}
+const QString &RosterItem::name() const { return v_name; }
 
-const QStringList &RosterItem::groups() const
-{
-    return v_groups;
-}
+const QStringList &RosterItem::groups() const { return v_groups; }
 
-const Subscription &RosterItem::subscription() const
-{
-    return v_subscription;
-}
+const Subscription &RosterItem::subscription() const { return v_subscription; }
 
-const QString &RosterItem::ask() const
-{
-    return v_ask;
-}
+const QString &RosterItem::ask() const { return v_ask; }
 
-bool RosterItem::isPush() const
-{
-    return v_push;
-}
+bool RosterItem::isPush() const { return v_push; }
 
 bool RosterItem::inGroup(const QString &g) const
 {
@@ -3305,35 +2572,17 @@ bool RosterItem::inGroup(const QString &g) const
     return false;
 }
 
-void RosterItem::setJid(const Jid &_jid)
-{
-    v_jid = _jid;
-}
+void RosterItem::setJid(const Jid &_jid) { v_jid = _jid; }
 
-void RosterItem::setName(const QString &_name)
-{
-    v_name = _name;
-}
+void RosterItem::setName(const QString &_name) { v_name = _name; }
 
-void RosterItem::setGroups(const QStringList &_groups)
-{
-    v_groups = _groups;
-}
+void RosterItem::setGroups(const QStringList &_groups) { v_groups = _groups; }
 
-void RosterItem::setSubscription(const Subscription &type)
-{
-    v_subscription = type;
-}
+void RosterItem::setSubscription(const Subscription &type) { v_subscription = type; }
 
-void RosterItem::setAsk(const QString &_ask)
-{
-    v_ask = _ask;
-}
+void RosterItem::setAsk(const QString &_ask) { v_ask = _ask; }
 
-void RosterItem::setIsPush(bool b)
-{
-    v_push = b;
-}
+void RosterItem::setIsPush(bool b) { v_push = b; }
 
 bool RosterItem::addGroup(const QString &g)
 {
@@ -3407,14 +2656,9 @@ bool RosterItem::fromXml(const QDomElement &item)
 //---------------------------------------------------------------------------
 // Roster
 //---------------------------------------------------------------------------
-Roster::Roster() :
-    QList<RosterItem>()
-{
-}
+Roster::Roster() : QList<RosterItem>() {}
 
-Roster::~Roster()
-{
-}
+Roster::~Roster() {}
 
 Roster::Iterator Roster::find(const Jid &j)
 {
@@ -3450,19 +2694,11 @@ FormField::FormField(const QString &type, const QString &value)
     v_value = value;
 }
 
-FormField::~FormField()
-{
-}
+FormField::~FormField() {}
 
-int FormField::type() const
-{
-    return v_type;
-}
+int FormField::type() const { return v_type; }
 
-QString FormField::realName() const
-{
-    return typeToTagName(v_type);
-}
+QString FormField::realName() const { return typeToTagName(v_type); }
 
 QString FormField::fieldName() const
 {
@@ -3502,20 +2738,11 @@ QString FormField::fieldName() const
     };
 }
 
-bool FormField::isSecret() const
-{
-    return (type() == password);
-}
+bool FormField::isSecret() const { return (type() == password); }
 
-const QString &FormField::value() const
-{
-    return v_value;
-}
+const QString &FormField::value() const { return v_value; }
 
-void FormField::setType(int x)
-{
-    v_type = x;
-}
+void FormField::setType(int x) { v_type = x; }
 
 bool FormField::setType(const QString &in)
 {
@@ -3527,10 +2754,7 @@ bool FormField::setType(const QString &in)
     return true;
 }
 
-void FormField::setValue(const QString &in)
-{
-    v_value = in;
-}
+void FormField::setValue(const QString &in) { v_value = in; }
 
 int FormField::tagNameToType(const QString &in) const
 {
@@ -3609,148 +2833,69 @@ QString FormField::typeToTagName(int type) const
 //---------------------------------------------------------------------------
 // Form
 //---------------------------------------------------------------------------
-Form::Form(const Jid &j) :
-    QList<FormField>()
-{
-    setJid(j);
-}
+Form::Form(const Jid &j) : QList<FormField>() { setJid(j); }
 
-Form::~Form()
-{
-}
+Form::~Form() {}
 
-Jid Form::jid() const
-{
-    return v_jid;
-}
+Jid Form::jid() const { return v_jid; }
 
-QString Form::instructions() const
-{
-    return v_instructions;
-}
+QString Form::instructions() const { return v_instructions; }
 
-QString Form::key() const
-{
-    return v_key;
-}
+QString Form::key() const { return v_key; }
 
-void Form::setJid(const Jid &j)
-{
-    v_jid = j;
-}
+void Form::setJid(const Jid &j) { v_jid = j; }
 
-void Form::setInstructions(const QString &s)
-{
-    v_instructions = s;
-}
+void Form::setInstructions(const QString &s) { v_instructions = s; }
 
-void Form::setKey(const QString &s)
-{
-    v_key = s;
-}
+void Form::setKey(const QString &s) { v_key = s; }
 
 //---------------------------------------------------------------------------
 // SearchResult
 //---------------------------------------------------------------------------
-SearchResult::SearchResult(const Jid &jid)
-{
-    setJid(jid);
-}
+SearchResult::SearchResult(const Jid &jid) { setJid(jid); }
 
-SearchResult::~SearchResult()
-{
-}
+SearchResult::~SearchResult() {}
 
-const Jid &SearchResult::jid() const
-{
-    return v_jid;
-}
+const Jid &SearchResult::jid() const { return v_jid; }
 
-const QString &SearchResult::nick() const
-{
-    return v_nick;
-}
+const QString &SearchResult::nick() const { return v_nick; }
 
-const QString &SearchResult::first() const
-{
-    return v_first;
-}
+const QString &SearchResult::first() const { return v_first; }
 
-const QString &SearchResult::last() const
-{
-    return v_last;
-}
+const QString &SearchResult::last() const { return v_last; }
 
-const QString &SearchResult::email() const
-{
-    return v_email;
-}
+const QString &SearchResult::email() const { return v_email; }
 
-void SearchResult::setJid(const Jid &jid)
-{
-    v_jid = jid;
-}
+void SearchResult::setJid(const Jid &jid) { v_jid = jid; }
 
-void SearchResult::setNick(const QString &nick)
-{
-    v_nick = nick;
-}
+void SearchResult::setNick(const QString &nick) { v_nick = nick; }
 
-void SearchResult::setFirst(const QString &first)
-{
-    v_first = first;
-}
+void SearchResult::setFirst(const QString &first) { v_first = first; }
 
-void SearchResult::setLast(const QString &last)
-{
-    v_last = last;
-}
+void SearchResult::setLast(const QString &last) { v_last = last; }
 
-void SearchResult::setEmail(const QString &email)
-{
-    v_email = email;
-}
+void SearchResult::setEmail(const QString &email) { v_email = email; }
 
-PubSubItem::PubSubItem()
-{
-}
+PubSubItem::PubSubItem() {}
 
-PubSubItem::PubSubItem(const QString &id, const QDomElement &payload) :
-    id_(id), payload_(payload)
-{
-}
+PubSubItem::PubSubItem(const QString &id, const QDomElement &payload) : id_(id), payload_(payload) {}
 
-const QString &PubSubItem::id() const
-{
-    return id_;
-}
+const QString &PubSubItem::id() const { return id_; }
 
-const QDomElement &PubSubItem::payload() const
-{
-    return payload_;
-}
+const QDomElement &PubSubItem::payload() const { return payload_; }
 
-PubSubRetraction::PubSubRetraction()
-{
-}
+PubSubRetraction::PubSubRetraction() {}
 
-PubSubRetraction::PubSubRetraction(const QString &id) :
-    id_(id)
-{
-}
+PubSubRetraction::PubSubRetraction(const QString &id) : id_(id) {}
 
-const QString &PubSubRetraction::id() const
-{
-    return id_;
-}
+const QString &PubSubRetraction::id() const { return id_; }
 
 // =========================================
 //            CaptchaChallenge
 // =========================================
 class CaptchaChallengePrivate : public QSharedData {
 public:
-    CaptchaChallengePrivate() :
-        state(CaptchaChallenge::New) {}
+    CaptchaChallengePrivate() : state(CaptchaChallenge::New) {}
 
     CaptchaChallenge::State state;
     Jid                     arbiter;
@@ -3761,18 +2906,11 @@ class CaptchaChallengePrivate : public QSharedData {
     UrlList                 urls;
 };
 
-CaptchaChallenge::CaptchaChallenge() :
-    d(new CaptchaChallengePrivate)
-{
-}
+CaptchaChallenge::CaptchaChallenge() : d(new CaptchaChallengePrivate) {}
 
-CaptchaChallenge::CaptchaChallenge(const CaptchaChallenge &other) :
-    d(other.d)
-{
-}
+CaptchaChallenge::CaptchaChallenge(const CaptchaChallenge &other) : d(other.d) {}
 
-CaptchaChallenge::CaptchaChallenge(const Message &m) :
-    d(new CaptchaChallengePrivate)
+CaptchaChallenge::CaptchaChallenge(const Message &m) : d(new CaptchaChallengePrivate)
 {
     if (m.spooled()) {
         if (m.timeStamp().secsTo(QDateTime::currentDateTime()) < Timeout) {
@@ -3799,9 +2937,7 @@ CaptchaChallenge::CaptchaChallenge(const Message &m) :
     d->offendedJid = Jid(m.getForm().getField("from").value().value(0));
 }
 
-CaptchaChallenge::~CaptchaChallenge()
-{
-}
+CaptchaChallenge::~CaptchaChallenge() {}
 
 CaptchaChallenge &CaptchaChallenge::operator=(const CaptchaChallenge &from)
 {
@@ -3809,25 +2945,13 @@ CaptchaChallenge &CaptchaChallenge::operator=(const CaptchaChallenge &from)
     return *this;
 }
 
-const XData &CaptchaChallenge::form() const
-{
-    return d->form;
-}
+const XData &CaptchaChallenge::form() const { return d->form; }
 
-QString CaptchaChallenge::explanation() const
-{
-    return d->explanation;
-}
+QString CaptchaChallenge::explanation() const { return d->explanation; }
 
-const UrlList &CaptchaChallenge::urls() const
-{
-    return d->urls;
-}
+const UrlList &CaptchaChallenge::urls() const { return d->urls; }
 
-CaptchaChallenge::State CaptchaChallenge::state() const
-{
-    return d->state;
-}
+CaptchaChallenge::State CaptchaChallenge::state() const { return d->state; }
 
 CaptchaChallenge::Result CaptchaChallenge::validateResponse(const XData &xd)
 {
@@ -3841,15 +2965,9 @@ bool CaptchaChallenge::isValid() const
     return d->dt.isValid() && d->dt.secsTo(QDateTime::currentDateTime()) < Timeout && d->form.fields().count() > 0;
 }
 
-const Jid &CaptchaChallenge::offendedJid() const
-{
-    return d->offendedJid;
-}
+const Jid &CaptchaChallenge::offendedJid() const { return d->offendedJid; }
 
-const Jid &CaptchaChallenge::arbiter() const
-{
-    return d->arbiter;
-}
+const Jid &CaptchaChallenge::arbiter() const { return d->arbiter; }
 
 Thumbnail::Thumbnail(const QDomElement &el)
 {
diff --git a/src/xmpp/xmpp-im/xmpp_address.h b/src/xmpp/xmpp-im/xmpp_address.h
index 9343c888..60ce564d 100644
--- a/src/xmpp/xmpp-im/xmpp_address.h
+++ b/src/xmpp/xmpp-im/xmpp_address.h
@@ -27,39 +27,38 @@
 class QDomElement;
 
 namespace XMPP {
-    class Address
-    {
-    public:
-        typedef enum { Unknown, To, Cc, Bcc, ReplyTo, ReplyRoom, NoReply, OriginalFrom, OriginalTo } Type;
+class Address {
+public:
+    typedef enum { Unknown, To, Cc, Bcc, ReplyTo, ReplyRoom, NoReply, OriginalFrom, OriginalTo } Type;
 
-        Address(Type type = Unknown, const Jid& jid = Jid());
-        Address(const QDomElement&);
+    Address(Type type = Unknown, const Jid &jid = Jid());
+    Address(const QDomElement &);
 
-        const Jid& jid() const;
-        const QString& uri() const;
-        const QString& node() const;
-        const QString& desc() const;
-        bool delivered() const;
-        Type type() const;
+    const Jid &    jid() const;
+    const QString &uri() const;
+    const QString &node() const;
+    const QString &desc() const;
+    bool           delivered() const;
+    Type           type() const;
 
-        QDomElement toXml(Stanza&) const;
-        void fromXml(const QDomElement& t);
+    QDomElement toXml(Stanza &) const;
+    void        fromXml(const QDomElement &t);
 
-        void setJid(const Jid &);
-        void setUri(const QString &);
-        void setNode(const QString &);
-        void setDesc(const QString &);
-        void setDelivered(bool);
-        void setType(Type);
+    void setJid(const Jid &);
+    void setUri(const QString &);
+    void setNode(const QString &);
+    void setDesc(const QString &);
+    void setDelivered(bool);
+    void setType(Type);
 
-    private:
-        Jid v_jid;
-        QString v_uri, v_node, v_desc;
-        bool v_delivered;
-        Type v_type;
-    };
+private:
+    Jid     v_jid;
+    QString v_uri, v_node, v_desc;
+    bool    v_delivered;
+    Type    v_type;
+};
 
-    typedef QList<Address> AddressList;
+typedef QList<Address> AddressList;
 } // namespace XMPP
 
 #endif // XMPP_ADDRESS_H
diff --git a/src/xmpp/xmpp-im/xmpp_agentitem.h b/src/xmpp/xmpp-im/xmpp_agentitem.h
index f9570424..03b43beb 100644
--- a/src/xmpp/xmpp-im/xmpp_agentitem.h
+++ b/src/xmpp/xmpp-im/xmpp_agentitem.h
@@ -26,28 +26,27 @@
 #include <QString>
 
 namespace XMPP {
-    class AgentItem
-    {
-    public:
-        AgentItem() { }
-
-        const Jid & jid() const { return v_jid; }
-        const QString & name() const { return v_name; }
-        const QString & category() const { return v_category; }
-        const QString & type() const { return v_type; }
-        const Features & features() const { return v_features; }
-
-        void setJid(const Jid &j) { v_jid = j; }
-        void setName(const QString &n) { v_name = n; }
-        void setCategory(const QString &c) { v_category = c; }
-        void setType(const QString &t) { v_type = t; }
-        void setFeatures(const Features &f) { v_features = f; }
-
-    private:
-        Jid v_jid;
-        QString v_name, v_category, v_type;
-        Features v_features;
-    };
+class AgentItem {
+public:
+    AgentItem() {}
+
+    const Jid &     jid() const { return v_jid; }
+    const QString & name() const { return v_name; }
+    const QString & category() const { return v_category; }
+    const QString & type() const { return v_type; }
+    const Features &features() const { return v_features; }
+
+    void setJid(const Jid &j) { v_jid = j; }
+    void setName(const QString &n) { v_name = n; }
+    void setCategory(const QString &c) { v_category = c; }
+    void setType(const QString &t) { v_type = t; }
+    void setFeatures(const Features &f) { v_features = f; }
+
+private:
+    Jid      v_jid;
+    QString  v_name, v_category, v_type;
+    Features v_features;
+};
 } // namespace XMPP
 
 #endif // XMPP_AGENTITEM
diff --git a/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp b/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp
index 9b6ee453..6bbe76b8 100644
--- a/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp
+++ b/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp
@@ -32,43 +32,28 @@ class BoBData::Private : public QSharedData {
 public:
     QByteArray data; // file data itself
     QString    type; // mime type. e.g. image/png
-    //QString cid;      // content identifier without "cid:"
+    // QString cid;      // content identifier without "cid:"
     Hash         hash;
     unsigned int maxAge; // seconds to live
 };
 
-BoBData::BoBData() :
-    d(new Private)
-{
-}
+BoBData::BoBData() : d(new Private) {}
 
-BoBData::BoBData(const BoBData &other) :
-    d(other.d)
-{
-}
+BoBData::BoBData(const BoBData &other) : d(other.d) {}
 
-BoBData::BoBData(const QDomElement &e) :
-    d(new Private)
-{
-    fromXml(e);
-}
+BoBData::BoBData(const QDomElement &e) : d(new Private) { fromXml(e); }
 
-BoBData::~BoBData()
-{
-}
+BoBData::~BoBData() {}
 
 BoBData &BoBData::operator=(const BoBData &other)
 {
     if (this == &other)
-        return *this; //Protect against self-assignment
+        return *this; // Protect against self-assignment
     d = other.d;
     return *this;
 }
 
-bool BoBData::isNull() const
-{
-    return !d->hash.isValid() || d->data.isNull();
-}
+bool BoBData::isNull() const { return !d->hash.isValid() || d->data.isNull(); }
 
 Hash BoBData::cidToHash(const QString &cid)
 {
@@ -84,50 +69,23 @@ QString BoBData::cid() const
     return QString("%1+%2@bob.xmpp.org").arg(d->hash.stringType(), QString::fromLatin1(d->hash.data().toHex()));
 }
 
-void BoBData::setCid(const QString &cid)
-{
-    d->hash = cidToHash(cid);
-}
+void BoBData::setCid(const QString &cid) { d->hash = cidToHash(cid); }
 
-const Hash &BoBData::hash() const
-{
-    return d->hash;
-}
+const Hash &BoBData::hash() const { return d->hash; }
 
-void BoBData::setHash(const Hash &hash)
-{
-    d->hash = hash;
-}
+void BoBData::setHash(const Hash &hash) { d->hash = hash; }
 
-QByteArray BoBData::data() const
-{
-    return d->data;
-}
+QByteArray BoBData::data() const { return d->data; }
 
-void BoBData::setData(const QByteArray &data)
-{
-    d->data = data;
-}
+void BoBData::setData(const QByteArray &data) { d->data = data; }
 
-QString BoBData::type() const
-{
-    return d->type;
-}
+QString BoBData::type() const { return d->type; }
 
-void BoBData::setType(const QString &type)
-{
-    d->type = type;
-}
+void BoBData::setType(const QString &type) { d->type = type; }
 
-unsigned int BoBData::maxAge() const
-{
-    return d->maxAge;
-}
+unsigned int BoBData::maxAge() const { return d->maxAge; }
 
-void BoBData::setMaxAge(unsigned int maxAge)
-{
-    d->maxAge = maxAge;
-}
+void BoBData::setMaxAge(unsigned int maxAge) { d->maxAge = maxAge; }
 
 void BoBData::fromXml(const QDomElement &data)
 {
@@ -150,24 +108,14 @@ QDomElement BoBData::toXml(QDomDocument *doc) const
 // ---------------------------------------------------------
 // BoBCache
 // ---------------------------------------------------------
-BoBCache::BoBCache(QObject *parent) :
-    QObject(parent)
-{
-}
+BoBCache::BoBCache(QObject *parent) : QObject(parent) {}
 
 //------------------------------------------------------------------------------
 // BoBManager
 //------------------------------------------------------------------------------
-BoBManager::BoBManager(Client *client) :
-    QObject(client), _cache(nullptr)
-{
-    new JT_BoBServer(client->rootTask());
-}
+BoBManager::BoBManager(Client *client) : QObject(client), _cache(nullptr) { new JT_BoBServer(client->rootTask()); }
 
-void BoBManager::setCache(BoBCache *cache)
-{
-    _cache = cache;
-}
+void BoBManager::setCache(BoBCache *cache) { _cache = cache; }
 
 BoBData BoBManager::bobData(const QString &cid)
 {
@@ -192,8 +140,7 @@ BoBData BoBManager::bobData(const QString &cid)
     return bd;
 }
 
-BoBData BoBManager::append(const QByteArray &data, const QString &type,
-                           unsigned int maxAge)
+BoBData BoBManager::append(const QByteArray &data, const QString &type, unsigned int maxAge)
 {
     BoBData b;
     b.setHash(Hash::from(Hash::Sha1, data));
diff --git a/src/xmpp/xmpp-im/xmpp_bitsofbinary.h b/src/xmpp/xmpp-im/xmpp_bitsofbinary.h
index c8f2de3a..e871d635 100644
--- a/src/xmpp/xmpp-im/xmpp_bitsofbinary.h
+++ b/src/xmpp/xmpp-im/xmpp_bitsofbinary.h
@@ -86,15 +86,14 @@ class BoBManager : public QObject {
 
     BoBData bobData(const QString &);
     // file data, mime type, max age in seconds
-    BoBData append(const QByteArray &data, const QString &type,
-                   unsigned int maxAge = 0);
+    BoBData append(const QByteArray &data, const QString &type, unsigned int maxAge = 0);
     Hash    append(QFile &        file,
                    const QString &type = "application/octet-stream"); // this method adds just to runtime cache
     void    append(const BoBData &);
 
 private:
     BoBCache *                                 _cache;
-    QHash<XMPP::Hash, QPair<QString, QString>> _localFiles; //cid => (filename, mime)
+    QHash<XMPP::Hash, QPair<QString, QString>> _localFiles; // cid => (filename, mime)
 };
 } // namespace XMPP
 
diff --git a/src/xmpp/xmpp-im/xmpp_bytestream.cpp b/src/xmpp/xmpp-im/xmpp_bytestream.cpp
index 71863929..0478b3f7 100644
--- a/src/xmpp/xmpp-im/xmpp_bytestream.cpp
+++ b/src/xmpp/xmpp-im/xmpp_bytestream.cpp
@@ -24,25 +24,17 @@
 #include <QTimer>
 
 namespace XMPP {
-BytestreamManager::BytestreamManager(Client *parent)
-    : QObject(parent)
-{
-
-}
+BytestreamManager::BytestreamManager(Client *parent) : QObject(parent) {}
 
-BytestreamManager::~BytestreamManager()
-{
-
-}
+BytestreamManager::~BytestreamManager() {}
 
 QString BytestreamManager::genUniqueSID(const Jid &peer) const
 {
     // get unused key
     QString sid;
     do {
-        sid = QString("%1%2").arg(sidPrefix())
-                             .arg(qrand() & 0xffff, 4, 16, QChar('0'));
-    } while(!isAcceptableSID(peer, sid));
+        sid = QString("%1%2").arg(sidPrefix()).arg(qrand() & 0xffff, 4, 16, QChar('0'));
+    } while (!isAcceptableSID(peer, sid));
     return sid;
 }
 
@@ -53,8 +45,7 @@ void BytestreamManager::deleteConnection(BSConnection *c, int msec)
 {
     if (msec) {
         QTimer::singleShot(msec, c, SLOT(deleteLater()));
-    }
-    else {
+    } else {
         delete c;
     }
 }
diff --git a/src/xmpp/xmpp-im/xmpp_bytestream.h b/src/xmpp/xmpp-im/xmpp_bytestream.h
index 5933ff2e..9cb892f5 100644
--- a/src/xmpp/xmpp-im/xmpp_bytestream.h
+++ b/src/xmpp/xmpp-im/xmpp_bytestream.h
@@ -26,44 +26,42 @@
 #include <QObject>
 
 namespace XMPP {
-    class BytestreamManager;
-    class Client;
+class BytestreamManager;
+class Client;
 
-    class BSConnection : public ByteStream
-    {
-    public:
-        enum Error { ErrRefused = ErrCustom, ErrConnect, ErrProxy, ErrSocket };
-        enum State { Idle, Requesting, Connecting, WaitingForAccept, Active };
+class BSConnection : public ByteStream {
+public:
+    enum Error { ErrRefused = ErrCustom, ErrConnect, ErrProxy, ErrSocket };
+    enum State { Idle, Requesting, Connecting, WaitingForAccept, Active };
 
-        BSConnection(QObject *parent = nullptr) : ByteStream(parent) {}
+    BSConnection(QObject *parent = nullptr) : ByteStream(parent) {}
 
-        virtual void connectToJid(const Jid &peer, const QString &sid) = 0;
-        virtual void accept() = 0;
+    virtual void connectToJid(const Jid &peer, const QString &sid) = 0;
+    virtual void accept()                                          = 0;
 
-        virtual Jid peer() const = 0;
-        virtual QString sid() const = 0;
-        virtual BytestreamManager* manager() const = 0;
-    };
+    virtual Jid                peer() const    = 0;
+    virtual QString            sid() const     = 0;
+    virtual BytestreamManager *manager() const = 0;
+};
 
-    class BytestreamManager : public QObject
-    {
-        Q_OBJECT
+class BytestreamManager : public QObject {
+    Q_OBJECT
 
-    public:
-        BytestreamManager(Client *);
-        virtual ~BytestreamManager();
+public:
+    BytestreamManager(Client *);
+    virtual ~BytestreamManager();
 
-        virtual bool isAcceptableSID(const Jid &peer, const QString &sid) const = 0;
-        QString genUniqueSID(const Jid &peer) const;
-        virtual BSConnection* createConnection() = 0;
-        virtual void deleteConnection(BSConnection *c, int msec = 0);
+    virtual bool          isAcceptableSID(const Jid &peer, const QString &sid) const = 0;
+    QString               genUniqueSID(const Jid &peer) const;
+    virtual BSConnection *createConnection() = 0;
+    virtual void          deleteConnection(BSConnection *c, int msec = 0);
 
-    protected:
-        virtual const char* sidPrefix() const = 0;
+protected:
+    virtual const char *sidPrefix() const = 0;
 
-    signals:
-        void incomingReady();
-    };
+signals:
+    void incomingReady();
+};
 } // namespace XMPP
 
 #endif // BYTESTREAM_MANAGER_H
diff --git a/src/xmpp/xmpp-im/xmpp_caps.cpp b/src/xmpp/xmpp-im/xmpp_caps.cpp
index 2637bd84..856d6ef1 100644
--- a/src/xmpp/xmpp-im/xmpp_caps.cpp
+++ b/src/xmpp/xmpp-im/xmpp_caps.cpp
@@ -49,7 +49,7 @@ QDomElement CapsInfo::toXml(QDomDocument *doc) const
 CapsInfo CapsInfo::fromXml(const QDomElement &caps)
 {
     QDateTime lastSeen = QDateTime::fromString(caps.firstChildElement("atime").nodeValue(), Qt::ISODate);
-    DiscoItem item = DiscoItem::fromDiscoInfoResult(caps.firstChildElement("query"));
+    DiscoItem item     = DiscoItem::fromDiscoInfoResult(caps.firstChildElement("query"));
     if (item.features().isEmpty()) { // it's hardly possible if client does not support anything.
         return CapsInfo();
     }
@@ -67,10 +67,7 @@ CapsRegistry *CapsRegistry::instance_ = nullptr;
 /**
  * \brief Default constructor.
  */
-CapsRegistry::CapsRegistry(QObject *parent) :
-    QObject(parent)
-{
-}
+CapsRegistry::CapsRegistry(QObject *parent) : QObject(parent) {}
 
 CapsRegistry *CapsRegistry::instance()
 {
@@ -80,10 +77,7 @@ CapsRegistry *CapsRegistry::instance()
     return instance_;
 }
 
-void CapsRegistry::setInstance(CapsRegistry *instance)
-{
-    instance_ = instance;
-}
+void CapsRegistry::setInstance(CapsRegistry *instance) { instance_ = instance; }
 
 /**
  * \brief Convert all capabilities info to XML.
@@ -92,12 +86,12 @@ void CapsRegistry::save()
 {
     // Generate XML
     QDomDocument doc;
-    QDomElement capabilities = doc.createElement("capabilities");
+    QDomElement  capabilities = doc.createElement("capabilities");
     doc.appendChild(capabilities);
-    QHash<QString,CapsInfo>::ConstIterator i = capsInfo_.constBegin();
-    for( ; i != capsInfo_.end(); i++) {
+    QHash<QString, CapsInfo>::ConstIterator i = capsInfo_.constBegin();
+    for (; i != capsInfo_.end(); i++) {
         QDomElement info = i.value().toXml(&doc);
-        info.setAttribute("node",i.key());
+        info.setAttribute("node", i.key());
         capabilities.appendChild(info);
     }
 
@@ -110,10 +104,7 @@ void CapsRegistry::saveData(const QByteArray &data)
     return;
 }
 
-QByteArray CapsRegistry::loadData()
-{
-    return QByteArray();
-}
+QByteArray CapsRegistry::loadData() { return QByteArray(); }
 
 /**
  * \brief Sets the file to save the capabilities info to
@@ -141,28 +132,26 @@ void CapsRegistry::load()
 
     // keep unseen info for last 3 month. adjust if required
     QDateTime validTime = QDateTime::currentDateTime().addMonths(-3);
-    for(QDomNode n = caps.firstChild(); !n.isNull(); n = n.nextSibling()) {
+    for (QDomNode n = caps.firstChild(); !n.isNull(); n = n.nextSibling()) {
         QDomElement i = n.toElement();
-        if(i.isNull()) {
+        if (i.isNull()) {
             qWarning("capsregistry.cpp: Null element");
             continue;
         }
 
-        if(i.tagName() == "info") {
+        if (i.tagName() == "info") {
             QString node = i.attribute("node");
-            int sep = node.indexOf('#');
+            int     sep  = node.indexOf('#');
             if (sep > 0 && sep + 1 < node.length()) {
                 CapsInfo info = CapsInfo::fromXml(i);
                 if (info.isValid() && info.lastSeen() > validTime) {
                     capsInfo_[node] = CapsInfo::fromXml(i);
                 }
-                //qDebug() << QString("Read %1 %2").arg(node).arg(ver);
-            }
-            else {
+                // qDebug() << QString("Read %1 %2").arg(node).arg(ver);
+            } else {
                 qWarning() << "capsregistry.cpp: Node" << node << "invalid";
             }
-        }
-        else {
+        } else {
             qWarning("capsregistry.cpp: Unknown element");
         }
     }
@@ -171,7 +160,7 @@ void CapsRegistry::load()
 /**
  * \brief Registers capabilities of a client.
  */
-void CapsRegistry::registerCaps(const CapsSpec& spec, const DiscoItem &item)
+void CapsRegistry::registerCaps(const CapsSpec &spec, const DiscoItem &item)
 {
     QString dnode = spec.flatten();
     if (!isRegistered(dnode)) {
@@ -184,10 +173,7 @@ void CapsRegistry::registerCaps(const CapsSpec& spec, const DiscoItem &item)
 /**
  * \brief Checks if capabilities have been registered.
  */
-bool CapsRegistry::isRegistered(const QString& spec) const
-{
-    return capsInfo_.contains(spec);
-}
+bool CapsRegistry::isRegistered(const QString &spec) const { return capsInfo_.contains(spec); }
 
 DiscoItem CapsRegistry::disco(const QString &spec) const
 {
@@ -216,30 +202,19 @@ DiscoItem CapsRegistry::disco(const QString &spec) const
 /**
  * \brief Default constructor.
  */
-CapsManager::CapsManager(Client *client) :
-    QObject(client),
-    client_(client),
-    isEnabled_(true)
-{}
+CapsManager::CapsManager(Client *client) : QObject(client), client_(client), isEnabled_(true) {}
 
-CapsManager::~CapsManager()
-{}
+CapsManager::~CapsManager() {}
 
 /**
  * \brief Checks whether the caps manager is enabled (and does lookups).
  */
-bool CapsManager::isEnabled()
-{
-    return isEnabled_;
-}
+bool CapsManager::isEnabled() { return isEnabled_; }
 
 /**
  * \brief Enables or disables the caps manager.
  */
-void CapsManager::setEnabled(bool b)
-{
-    isEnabled_ = b;
-}
+void CapsManager::setEnabled(bool b) { isEnabled_ = b; }
 
 /**
  * \brief Registers new incoming capabilities information of a JID.
@@ -251,14 +226,15 @@ void CapsManager::setEnabled(bool b)
  * @param ver The entity's caps version
  * @param ext The entity's caps extensions
  */
-void CapsManager::updateCaps(const Jid& jid, const CapsSpec &c)
+void CapsManager::updateCaps(const Jid &jid, const CapsSpec &c)
 {
-    if (jid.compare(client_->jid(),false))
+    if (jid.compare(client_->jid(), false))
         return;
 
     QString fullNode = c.flatten();
     if (capsSpecs_[jid.full()] != c) {
-        //qDebug() << QString("caps.cpp: Updating caps for %1 (node=%2,ver=%3,ext=%4)").arg(QString(jid.full()).replace('%',"%%")).arg(node).arg(ver).arg(ext);
+        // qDebug() << QString("caps.cpp: Updating caps for %1
+        // (node=%2,ver=%3,ext=%4)").arg(QString(jid.full()).replace('%',"%%")).arg(node).arg(ver).arg(ext);
 
         // Unregister from all old caps node
         capsJids_[capsSpecs_[jid.full()].flatten()].removeAll(jid.full());
@@ -275,22 +251,24 @@ void CapsManager::updateCaps(const Jid& jid, const CapsSpec &c)
             // Register new caps and check if we need to discover features
             if (isEnabled()) {
                 if (!CapsRegistry::instance()->isRegistered(fullNode) && capsJids_[fullNode].count() == 1) {
-                    //qDebug() << QString("caps.cpp: Sending disco request to %1, node=%2").arg(QString(jid.full()).replace('%',"%%")).arg(node + "#" + s.extensions());
-                    JT_DiscoInfo* disco = new JT_DiscoInfo(client_->rootTask());
+                    // qDebug() << QString("caps.cpp: Sending disco request to %1,
+                    // node=%2").arg(QString(jid.full()).replace('%',"%%")).arg(node + "#" + s.extensions());
+                    JT_DiscoInfo *disco = new JT_DiscoInfo(client_->rootTask());
                     disco->setAllowCache(false);
                     connect(disco, SIGNAL(finished()), SLOT(discoFinished()));
                     disco->get(jid, fullNode);
                     disco->go(true);
                 }
             }
-        }
-        else {
+        } else {
             // Remove all caps specifications
-            qWarning() << QString("caps.cpp: Illegal caps info from %1: node=%2, ver=%3").arg(QString(jid.full()).replace('%',"%%")).arg(fullNode).arg(c.version());
+            qWarning() << QString("caps.cpp: Illegal caps info from %1: node=%2, ver=%3")
+                              .arg(QString(jid.full()).replace('%', "%%"))
+                              .arg(fullNode)
+                              .arg(c.version());
             capsSpecs_.remove(jid.full());
         }
-    }
-    else {
+    } else {
         // Add to the list of jids
         capsJids_[fullNode].push_back(jid.full());
     }
@@ -301,9 +279,9 @@ void CapsManager::updateCaps(const Jid& jid, const CapsSpec &c)
  *
  * @param jid The entity's JID
  */
-void CapsManager::disableCaps(const Jid& jid)
+void CapsManager::disableCaps(const Jid &jid)
 {
-    //qDebug() << QString("caps.cpp: Disabling caps for %1.").arg(QString(jid.full()).replace('%',"%%"));
+    // qDebug() << QString("caps.cpp: Disabling caps for %1.").arg(QString(jid.full()).replace('%',"%%"));
     if (capsEnabled(jid)) {
         QString node = capsSpecs_[jid.full()].flatten();
         if (!node.isEmpty()) {
@@ -341,11 +319,11 @@ void CapsManager::updateDisco(const Jid &jid, const DiscoItem &item)
  * \brief This slot is called whenever capabilities of a client were discovered.
  * All jids with the corresponding client are updated.
  */
-void CapsManager::capsRegistered(const CapsSpec& cs)
+void CapsManager::capsRegistered(const CapsSpec &cs)
 {
     // Notify affected jids.
-    foreach(const QString &s, capsJids_[cs.flatten()]) {
-        //qDebug() << QString("caps.cpp: Notifying %1.").arg(s.replace('%',"%%"));
+    foreach (const QString &s, capsJids_[cs.flatten()]) {
+        // qDebug() << QString("caps.cpp: Notifying %1.").arg(s.replace('%',"%%"));
         emit capsChanged(s);
     }
 }
@@ -353,54 +331,48 @@ void CapsManager::capsRegistered(const CapsSpec& cs)
 /**
  * \brief Checks whether a given JID is broadcastingn its entity capabilities.
  */
-bool CapsManager::capsEnabled(const Jid& jid) const
-{
-    return capsSpecs_.contains(jid.full());
-}
+bool CapsManager::capsEnabled(const Jid &jid) const { return capsSpecs_.contains(jid.full()); }
 
 /**
  * \brief Requests the list of features of a given JID.
  */
-XMPP::DiscoItem CapsManager::disco(const Jid& jid) const
+XMPP::DiscoItem CapsManager::disco(const Jid &jid) const
 {
-    //qDebug() << "caps.cpp: Retrieving features of " << jid.full();
+    // qDebug() << "caps.cpp: Retrieving features of " << jid.full();
     QStringList f;
     if (!capsEnabled(jid)) {
         return DiscoItem();
     }
     QString node = capsSpecs_[jid.full()].flatten();
-    //qDebug() << QString("    %1").arg(CapsRegistry::instance()->features(s).list().join("\n"));
+    // qDebug() << QString("    %1").arg(CapsRegistry::instance()->features(s).list().join("\n"));
     return CapsRegistry::instance()->disco(node);
 }
 
 /**
  * \brief Requests the list of features of a given JID.
  */
-XMPP::Features CapsManager::features(const Jid& jid) const
-{
-    return disco(jid).features();
-}
+XMPP::Features CapsManager::features(const Jid &jid) const { return disco(jid).features(); }
 
 /**
  * \brief Returns the client name of a given jid.
  * \param jid the jid to retrieve the client name of
  */
-QString CapsManager::clientName(const Jid& jid) const
+QString CapsManager::clientName(const Jid &jid) const
 {
     if (capsEnabled(jid)) {
         CapsSpec cs = capsSpecs_[jid.full()];
-        QString name;
+        QString  name;
 
         QString cs_str = cs.flatten();
         if (CapsRegistry::instance()->isRegistered(cs_str)) {
             DiscoItem disco = CapsRegistry::instance()->disco(cs_str);
-            XData si = disco.registeredExtension(QLatin1String("urn:xmpp:dataforms:softwareinfo"));
+            XData     si    = disco.registeredExtension(QLatin1String("urn:xmpp:dataforms:softwareinfo"));
             if (si.isValid()) {
                 name = si.getField("software").value().value(0);
             }
 
             if (name.isEmpty()) {
-                const DiscoItem::Identities& i = disco.identities();
+                const DiscoItem::Identities &i = disco.identities();
                 if (i.count() > 0) {
                     name = i.first().name;
                 }
@@ -409,8 +381,8 @@ QString CapsManager::clientName(const Jid& jid) const
 
         // Try to be intelligent about the name
         if (name.isEmpty()) {
-            const QString &node = cs.node();
-            int startPos = 0, ds = 0;
+            const QString &node     = cs.node();
+            int            startPos = 0, ds = 0;
             if (node.startsWith(QStringLiteral("http://")))
                 startPos = 7;
             else if (node.startsWith(QStringLiteral("https://")))
@@ -425,8 +397,7 @@ QString CapsManager::clientName(const Jid& jid) const
         }
 
         return name;
-    }
-    else {
+    } else {
         return QString();
     }
 }
@@ -434,17 +405,17 @@ QString CapsManager::clientName(const Jid& jid) const
 /**
  * \brief Returns the client version of a given jid.
  */
-QString CapsManager::clientVersion(const Jid& jid) const
+QString CapsManager::clientVersion(const Jid &jid) const
 {
     if (!capsEnabled(jid))
         return QString();
 
-    QString version;
-    const CapsSpec &cs = capsSpecs_[jid.full()];
-    QString cs_str = cs.flatten();
+    QString         version;
+    const CapsSpec &cs     = capsSpecs_[jid.full()];
+    QString         cs_str = cs.flatten();
     if (CapsRegistry::instance()->isRegistered(cs_str)) {
         XData form = CapsRegistry::instance()->disco(cs_str).registeredExtension("urn:xmpp:dataforms:softwareinfo");
-        version = form.getField("software_version").value().value(0);
+        version    = form.getField("software_version").value().value(0);
     }
 
     return version;
@@ -460,7 +431,7 @@ QString CapsManager::osVersion(const Jid &jid) const
         QString cs_str = capsSpecs_[jid.full()].flatten();
         if (CapsRegistry::instance()->isRegistered(cs_str)) {
             XData form = CapsRegistry::instance()->disco(cs_str).registeredExtension("urn:xmpp:dataforms:softwareinfo");
-            os_str = form.getField("os").value().value(0).trimmed();
+            os_str     = form.getField("os").value().value(0).trimmed();
             if (!os_str.isEmpty()) {
                 QString os_ver = form.getField("os_version").value().value(0).trimmed();
                 if (!os_ver.isEmpty())
@@ -471,8 +442,5 @@ QString CapsManager::osVersion(const Jid &jid) const
     return os_str;
 }
 
-CapsSpec CapsManager::capsSpec(const Jid &jid) const
-{
-    return capsSpecs_.value(jid.full());
-}
+CapsSpec CapsManager::capsSpec(const Jid &jid) const { return capsSpecs_.value(jid.full()); }
 } // namespace XMPP
diff --git a/src/xmpp/xmpp-im/xmpp_caps.h b/src/xmpp/xmpp-im/xmpp_caps.h
index 929c6f64..3acf4041 100644
--- a/src/xmpp/xmpp-im/xmpp_caps.h
+++ b/src/xmpp/xmpp-im/xmpp_caps.h
@@ -26,56 +26,54 @@
 #include <QPointer>
 
 namespace XMPP {
-class CapsInfo
-{
+class CapsInfo {
 public:
     inline CapsInfo() {}
     inline CapsInfo(const XMPP::DiscoItem &disco, const QDateTime &lastSeen = QDateTime()) :
-        _lastSeen(lastSeen.isNull()? QDateTime::currentDateTime() : lastSeen),
-        _disco(disco) {}
-    inline bool isValid() const { return _lastSeen.isValid(); }
-    inline const QDateTime &lastSeen() const { return _lastSeen; }
+        _lastSeen(lastSeen.isNull() ? QDateTime::currentDateTime() : lastSeen), _disco(disco)
+    {
+    }
+    inline bool                   isValid() const { return _lastSeen.isValid(); }
+    inline const QDateTime &      lastSeen() const { return _lastSeen; }
     inline const XMPP::DiscoItem &disco() const { return _disco; }
-    QDomElement toXml(QDomDocument *doc) const;
-    static CapsInfo fromXml(const QDomElement &ci);
+    QDomElement                   toXml(QDomDocument *doc) const;
+    static CapsInfo               fromXml(const QDomElement &ci);
 
 private:
-    QDateTime _lastSeen;
+    QDateTime       _lastSeen;
     XMPP::DiscoItem _disco;
 };
 
-class CapsRegistry : public QObject
-{
+class CapsRegistry : public QObject {
     Q_OBJECT
 
 public:
     CapsRegistry(QObject *parent = nullptr);
 
-    static CapsRegistry* instance();
-    static void setInstance(CapsRegistry*instance);
+    static CapsRegistry *instance();
+    static void          setInstance(CapsRegistry *instance);
 
-    void registerCaps(const CapsSpec&, const XMPP::DiscoItem &item);
-    bool isRegistered(const QString &) const;
-    DiscoItem disco(const QString&) const;
+    void      registerCaps(const CapsSpec &, const XMPP::DiscoItem &item);
+    bool      isRegistered(const QString &) const;
+    DiscoItem disco(const QString &) const;
 
 signals:
-    void registered(const XMPP::CapsSpec&);
+    void registered(const XMPP::CapsSpec &);
 
 public slots:
     void load();
     void save();
 
 protected:
-    virtual void saveData(const QByteArray &data); // reimplmenet these two functions
-    virtual QByteArray loadData();                 // to have permanent cache
+    virtual void       saveData(const QByteArray &data); // reimplmenet these two functions
+    virtual QByteArray loadData();                       // to have permanent cache
 
 private:
-    static CapsRegistry *instance_;
-    QHash<QString,CapsInfo> capsInfo_;
+    static CapsRegistry *    instance_;
+    QHash<QString, CapsInfo> capsInfo_;
 };
 
-class CapsManager : public QObject
-{
+class CapsManager : public QObject {
     Q_OBJECT
 
 public:
@@ -85,34 +83,34 @@ class CapsManager : public QObject
     bool isEnabled();
     void setEnabled(bool);
 
-    void updateCaps(const Jid& jid, const CapsSpec& caps);
-    void disableCaps(const Jid& jid);
-    bool capsEnabled(const Jid& jid) const;
+    void updateCaps(const Jid &jid, const CapsSpec &caps);
+    void disableCaps(const Jid &jid);
+    bool capsEnabled(const Jid &jid) const;
 
     XMPP::DiscoItem disco(const Jid &jid) const;
-    void updateDisco(const Jid &jid, const XMPP::DiscoItem &item);
+    void            updateDisco(const Jid &jid, const XMPP::DiscoItem &item);
 
-    XMPP::Features features(const Jid& jid) const;
-    QString clientName(const Jid& jid) const;
-    QString clientVersion(const Jid& jid) const;
-    QString osVersion(const Jid& jid) const;
-    CapsSpec capsSpec(const Jid &jid) const;
+    XMPP::Features features(const Jid &jid) const;
+    QString        clientName(const Jid &jid) const;
+    QString        clientVersion(const Jid &jid) const;
+    QString        osVersion(const Jid &jid) const;
+    CapsSpec       capsSpec(const Jid &jid) const;
 
 signals:
     /**
      * This signal is emitted when the feature list of a given JID have changed.
      */
-    void capsChanged(const Jid& jid);
+    void capsChanged(const Jid &jid);
 
 protected slots:
     void discoFinished();
-    void capsRegistered(const CapsSpec&);
+    void capsRegistered(const CapsSpec &);
 
 private:
-    Client *client_;
-    bool isEnabled_;
-    QMap<QString,CapsSpec> capsSpecs_;
-    QMap<QString,QList<QString> > capsJids_;
+    Client *                      client_;
+    bool                          isEnabled_;
+    QMap<QString, CapsSpec>       capsSpecs_;
+    QMap<QString, QList<QString>> capsJids_;
 };
 } // namespace XMPP
 
diff --git a/src/xmpp/xmpp-im/xmpp_captcha.h b/src/xmpp/xmpp-im/xmpp_captcha.h
index 27b76e85..23af0d31 100644
--- a/src/xmpp/xmpp-im/xmpp_captcha.h
+++ b/src/xmpp/xmpp-im/xmpp_captcha.h
@@ -25,48 +25,39 @@
 #include <QDateTime>
 
 namespace XMPP {
-    class CaptchaChallengePrivate;
-    class Message;
-    class XData;
+class CaptchaChallengePrivate;
+class Message;
+class XData;
 
-    class CaptchaChallenge
-    {
-    public:
-        enum Result {
-            Passed,
-            Unavailable,
-            NotAcceptable
-        };
+class CaptchaChallenge {
+public:
+    enum Result { Passed, Unavailable, NotAcceptable };
 
-        enum State {
-            New,
-            Success,
-            Fail
-        };
+    enum State { New, Success, Fail };
 
-        static const int Timeout = 120; // secs
+    static const int Timeout = 120; // secs
 
-        CaptchaChallenge();
-        CaptchaChallenge(const Message &);
-        CaptchaChallenge(const CaptchaChallenge &);
-        ~CaptchaChallenge();
+    CaptchaChallenge();
+    CaptchaChallenge(const Message &);
+    CaptchaChallenge(const CaptchaChallenge &);
+    ~CaptchaChallenge();
 
-        CaptchaChallenge & operator=(const CaptchaChallenge &);
+    CaptchaChallenge &operator=(const CaptchaChallenge &);
 
-        bool isValid() const;
-        const Jid &offendedJid() const;
-        const Jid &arbiter() const;
-        const XData &form() const;
-        QString explanation() const;
-        const UrlList &urls() const;
-        State state() const;
+    bool           isValid() const;
+    const Jid &    offendedJid() const;
+    const Jid &    arbiter() const;
+    const XData &  form() const;
+    QString        explanation() const;
+    const UrlList &urls() const;
+    State          state() const;
 
-        Result validateResponse(const XData &);
+    Result validateResponse(const XData &);
 
-    private:
-        friend class CaptchaChallengePrivate;
-        QSharedDataPointer<CaptchaChallengePrivate> d;
-    };
+private:
+    friend class CaptchaChallengePrivate;
+    QSharedDataPointer<CaptchaChallengePrivate> d;
+};
 } // namespace XMPP
 
 #endif // XMPP_CAPTCHA_H
diff --git a/src/xmpp/xmpp-im/xmpp_chatstate.h b/src/xmpp/xmpp-im/xmpp_chatstate.h
index 5596147d..a7a4e339 100644
--- a/src/xmpp/xmpp-im/xmpp_chatstate.h
+++ b/src/xmpp/xmpp-im/xmpp_chatstate.h
@@ -20,14 +20,7 @@
 #define XMPP_CHATSTATE
 
 namespace XMPP {
-    typedef enum {
-        StateNone,
-        StateActive,
-        StateComposing,
-        StatePaused,
-        StateInactive,
-        StateGone
-    } ChatState;
+typedef enum { StateNone, StateActive, StateComposing, StatePaused, StateInactive, StateGone } ChatState;
 } // namespace XMPP
 
 #endif // XMPP_CHATSTATE
diff --git a/src/xmpp/xmpp-im/xmpp_client.h b/src/xmpp/xmpp-im/xmpp_client.h
index 2bd4528e..9d44ed18 100644
--- a/src/xmpp/xmpp-im/xmpp_client.h
+++ b/src/xmpp/xmpp-im/xmpp_client.h
@@ -34,201 +34,202 @@ class QNetworkAccessManager;
 class QString;
 
 namespace XMPP {
-    class BSConnection;
-    class CapsManager;
-    class ClientStream;
-    class EncryptionHandler;
-    class Features;
-    class FileTransferManager;
-    class HttpFileUploadManager;
-    class IBBManager;
-    class JidLinkManager;
-    class LiveRoster;
-    class LiveRosterItem;
-    class Message;
-    class Resource;
-    class ResourceList;
-    class Roster;
-    class RosterItem;
-    class S5BManager;
-    class ServerInfoManager;
-    class Stream;
-    class Task;
-    class TcpPortReserver;
-    namespace Jingle {
+class BSConnection;
+class CapsManager;
+class ClientStream;
+class EncryptionHandler;
+class Features;
+class FileTransferManager;
+class HttpFileUploadManager;
+class IBBManager;
+class JidLinkManager;
+class LiveRoster;
+class LiveRosterItem;
+class Message;
+class Resource;
+class ResourceList;
+class Roster;
+class RosterItem;
+class S5BManager;
+class ServerInfoManager;
+class Stream;
+class Task;
+class TcpPortReserver;
+namespace Jingle {
+    class Manager;
+    namespace S5B {
         class Manager;
-        namespace S5B {
-            class Manager;
-        }
-        namespace IBB {
-            class Manager;
-        }
     }
+    namespace IBB {
+        class Manager;
+    }
+}
 }
 
 namespace XMPP {
-    class Client : public QObject
-    {
-        Q_OBJECT
-
-    public:
-        Client(QObject *parent=nullptr);
-        ~Client();
-
-        bool isActive() const;
-        void connectToServer(ClientStream *s, const Jid &j, bool auth=true);
-        void start(const QString &host, const QString &user, const QString &pass, const QString &resource);
-        void close(bool fast=false);
-
-        bool hasStream() const;
-        Stream & stream();
-        QString streamBaseNS() const;
-        const LiveRoster & roster() const;
-        const ResourceList & resourceList() const;
-        bool isSessionRequired() const;
-
-        void send(const QDomElement &);
-        void send(const QString &);
-        void clearSendQueue();
-
-        QString host() const;
-        QString user() const;
-        QString pass() const;
-        QString resource() const;
-        Jid jid() const;
-
-        void setNetworkAccessManager(QNetworkAccessManager *qnam);
-        QNetworkAccessManager *networkAccessManager() const;
-
-        void rosterRequest();
-        void sendMessage(Message &);
-        void sendSubscription(const Jid &, const QString &, const QString& nick = QString());
-        void setPresence(const Status &);
-
-        void debug(const QString &);
-        QString genUniqueId();
-        Task *rootTask();
-        QDomDocument *doc() const;
-
-        QString OSName() const;
-        QString OSVersion() const;
-        QString timeZone() const;
-        int timeZoneOffset() const;
-        bool manualTimeZoneOffset() const;
-        QString clientName() const;
-        QString clientVersion() const;
-        CapsSpec caps() const;
-        CapsSpec serverCaps() const;
-
-        void setOSName(const QString &);
-        void setOSVersion(const QString &);
-        void setTimeZone(const QString &, int);
-        void setClientName(const QString &);
-        void setClientVersion(const QString &);
-        void setCaps(const CapsSpec &);
-        void setEncryptionHandler(EncryptionHandler *);
-        EncryptionHandler *encryptionHandler() const;
-
-        void setIdentity(const DiscoItem::Identity &);
-        DiscoItem::Identity identity() const;
-
-        void setFeatures(const Features& f);
-        const Features& features() const;
-        DiscoItem makeDiscoResult(const QString &node = QString()) const;
-
-        void setTcpPortReserver(TcpPortReserver *portReserver);
-        TcpPortReserver *tcpPortReserver() const;
-        S5BManager *s5bManager() const;
-        IBBManager *ibbManager() const;
-        BoBManager *bobManager() const;
-        JidLinkManager *jidLinkManager() const;
-        CapsManager *capsManager() const;
-        ServerInfoManager *serverInfoManager() const;
-        HttpFileUploadManager *httpFileUploadManager() const;
-        Jingle::Manager* jingleManager() const;
-        Jingle::S5B::Manager *jingleS5BManager() const;
-        Jingle::IBB::Manager *jingleIBBManager() const;
-
-        void setFileTransferEnabled(bool b);
-        FileTransferManager *fileTransferManager() const;
-
-        QString groupChatPassword(const QString& host, const QString& room) const;
-        bool groupChatJoin(const QString &host, const QString &room, const QString &nick, const QString& password = QString(), int maxchars = -1, int maxstanzas = -1, int seconds = -1, const QDateTime &since = QDateTime(), const Status& = Status());
-        void groupChatSetStatus(const QString &host, const QString &room, const Status &);
-        void groupChatChangeNick(const QString &host, const QString &room, const QString &nick, const Status &);
-        void groupChatLeave(const QString &host, const QString &room, const QString &statusStr = QString());
-        void groupChatLeaveAll(const QString &statusStr = QString());
-        QString groupChatNick(const QString &host, const QString &room) const;
-
-    signals:
-        void activated();
-        void disconnected();
-        //void authFinished(bool, int, const QString &);
-        void rosterRequestFinished(bool, int, const QString &);
-        void rosterItemAdded(const RosterItem &);
-        void rosterItemUpdated(const RosterItem &);
-        void rosterItemRemoved(const RosterItem &);
-        void resourceAvailable(const Jid &, const Resource &);
-        void resourceUnavailable(const Jid &, const Resource &);
-        void presenceError(const Jid &, int, const QString &);
-        void subscription(const Jid &, const QString &, const QString &);
-        void messageReceived(const Message &);
-        void debugText(const QString &);
-        void xmlIncoming(const QString &);
-        void xmlOutgoing(const QString &);
-        void stanzaElementOutgoing(QDomElement &);
-        void groupChatJoined(const Jid &);
-        void groupChatLeft(const Jid &);
-        void groupChatPresence(const Jid &, const Status &);
-        void groupChatError(const Jid &, int, const QString &);
-
-        void incomingJidLink();
-
-        void beginImportRoster();
-        void endImportRoster();
-
-    private slots:
-        //void streamConnected();
-        //void streamHandshaken();
-        //void streamError(const StreamError &);
-        //void streamSSLCertificateReady(const QSSLCert &);
-        //void streamCloseFinished();
-        void streamError(int);
-        void streamReadyRead();
-        void streamIncomingXml(const QString &);
-        void streamOutgoingXml(const QString &);
-
-        void slotRosterRequestFinished();
-
-        // basic daemons
-        void ppSubscription(const Jid &, const QString &, const QString&);
-        void ppPresence(const Jid &, const Status &);
-        void pmMessage(const Message &);
-        void prRoster(const Roster &);
-
-        void s5b_incomingReady();
-        void ibb_incomingReady();
-
-        void handleSMAckResponse(int);    
-        void parseUnhandledStreamFeatures();
-
-    public:
-        class GroupChat;
-
-    private:
-        void cleanup();
-        void distribute(const QDomElement &);
-        void importRoster(const Roster &);
-        void importRosterItem(const RosterItem &);
-        void updateSelfPresence(const Jid &, const Status &);
-        void updatePresence(LiveRosterItem *, const Jid &, const Status &);
-        void handleIncoming(BSConnection *);
-
-        void sendAckRequest();
-
-        class ClientPrivate;
-        ClientPrivate *d;
-    };
+class Client : public QObject {
+    Q_OBJECT
+
+public:
+    Client(QObject *parent = nullptr);
+    ~Client();
+
+    bool isActive() const;
+    void connectToServer(ClientStream *s, const Jid &j, bool auth = true);
+    void start(const QString &host, const QString &user, const QString &pass, const QString &resource);
+    void close(bool fast = false);
+
+    bool                hasStream() const;
+    Stream &            stream();
+    QString             streamBaseNS() const;
+    const LiveRoster &  roster() const;
+    const ResourceList &resourceList() const;
+    bool                isSessionRequired() const;
+
+    void send(const QDomElement &);
+    void send(const QString &);
+    void clearSendQueue();
+
+    QString host() const;
+    QString user() const;
+    QString pass() const;
+    QString resource() const;
+    Jid     jid() const;
+
+    void                   setNetworkAccessManager(QNetworkAccessManager *qnam);
+    QNetworkAccessManager *networkAccessManager() const;
+
+    void rosterRequest();
+    void sendMessage(Message &);
+    void sendSubscription(const Jid &, const QString &, const QString &nick = QString());
+    void setPresence(const Status &);
+
+    void          debug(const QString &);
+    QString       genUniqueId();
+    Task *        rootTask();
+    QDomDocument *doc() const;
+
+    QString  OSName() const;
+    QString  OSVersion() const;
+    QString  timeZone() const;
+    int      timeZoneOffset() const;
+    bool     manualTimeZoneOffset() const;
+    QString  clientName() const;
+    QString  clientVersion() const;
+    CapsSpec caps() const;
+    CapsSpec serverCaps() const;
+
+    void               setOSName(const QString &);
+    void               setOSVersion(const QString &);
+    void               setTimeZone(const QString &, int);
+    void               setClientName(const QString &);
+    void               setClientVersion(const QString &);
+    void               setCaps(const CapsSpec &);
+    void               setEncryptionHandler(EncryptionHandler *);
+    EncryptionHandler *encryptionHandler() const;
+
+    void                setIdentity(const DiscoItem::Identity &);
+    DiscoItem::Identity identity() const;
+
+    void            setFeatures(const Features &f);
+    const Features &features() const;
+    DiscoItem       makeDiscoResult(const QString &node = QString()) const;
+
+    void                   setTcpPortReserver(TcpPortReserver *portReserver);
+    TcpPortReserver *      tcpPortReserver() const;
+    S5BManager *           s5bManager() const;
+    IBBManager *           ibbManager() const;
+    BoBManager *           bobManager() const;
+    JidLinkManager *       jidLinkManager() const;
+    CapsManager *          capsManager() const;
+    ServerInfoManager *    serverInfoManager() const;
+    HttpFileUploadManager *httpFileUploadManager() const;
+    Jingle::Manager *      jingleManager() const;
+    Jingle::S5B::Manager * jingleS5BManager() const;
+    Jingle::IBB::Manager * jingleIBBManager() const;
+
+    void                 setFileTransferEnabled(bool b);
+    FileTransferManager *fileTransferManager() const;
+
+    QString groupChatPassword(const QString &host, const QString &room) const;
+    bool    groupChatJoin(const QString &host, const QString &room, const QString &nick,
+                          const QString &password = QString(), int maxchars = -1, int maxstanzas = -1, int seconds = -1,
+                          const QDateTime &since = QDateTime(), const Status & = Status());
+    void    groupChatSetStatus(const QString &host, const QString &room, const Status &);
+    void    groupChatChangeNick(const QString &host, const QString &room, const QString &nick, const Status &);
+    void    groupChatLeave(const QString &host, const QString &room, const QString &statusStr = QString());
+    void    groupChatLeaveAll(const QString &statusStr = QString());
+    QString groupChatNick(const QString &host, const QString &room) const;
+
+signals:
+    void activated();
+    void disconnected();
+    // void authFinished(bool, int, const QString &);
+    void rosterRequestFinished(bool, int, const QString &);
+    void rosterItemAdded(const RosterItem &);
+    void rosterItemUpdated(const RosterItem &);
+    void rosterItemRemoved(const RosterItem &);
+    void resourceAvailable(const Jid &, const Resource &);
+    void resourceUnavailable(const Jid &, const Resource &);
+    void presenceError(const Jid &, int, const QString &);
+    void subscription(const Jid &, const QString &, const QString &);
+    void messageReceived(const Message &);
+    void debugText(const QString &);
+    void xmlIncoming(const QString &);
+    void xmlOutgoing(const QString &);
+    void stanzaElementOutgoing(QDomElement &);
+    void groupChatJoined(const Jid &);
+    void groupChatLeft(const Jid &);
+    void groupChatPresence(const Jid &, const Status &);
+    void groupChatError(const Jid &, int, const QString &);
+
+    void incomingJidLink();
+
+    void beginImportRoster();
+    void endImportRoster();
+
+private slots:
+    // void streamConnected();
+    // void streamHandshaken();
+    // void streamError(const StreamError &);
+    // void streamSSLCertificateReady(const QSSLCert &);
+    // void streamCloseFinished();
+    void streamError(int);
+    void streamReadyRead();
+    void streamIncomingXml(const QString &);
+    void streamOutgoingXml(const QString &);
+
+    void slotRosterRequestFinished();
+
+    // basic daemons
+    void ppSubscription(const Jid &, const QString &, const QString &);
+    void ppPresence(const Jid &, const Status &);
+    void pmMessage(const Message &);
+    void prRoster(const Roster &);
+
+    void s5b_incomingReady();
+    void ibb_incomingReady();
+
+    void handleSMAckResponse(int);
+    void parseUnhandledStreamFeatures();
+
+public:
+    class GroupChat;
+
+private:
+    void cleanup();
+    void distribute(const QDomElement &);
+    void importRoster(const Roster &);
+    void importRosterItem(const RosterItem &);
+    void updateSelfPresence(const Jid &, const Status &);
+    void updatePresence(LiveRosterItem *, const Jid &, const Status &);
+    void handleIncoming(BSConnection *);
+
+    void sendAckRequest();
+
+    class ClientPrivate;
+    ClientPrivate *d;
+};
 } // namespace XMPP
 
 #endif // XMPP_CLIENT_H
diff --git a/src/xmpp/xmpp-im/xmpp_discoinfotask.cpp b/src/xmpp/xmpp-im/xmpp_discoinfotask.cpp
index 4694152c..31f8b103 100644
--- a/src/xmpp/xmpp-im/xmpp_discoinfotask.cpp
+++ b/src/xmpp/xmpp-im/xmpp_discoinfotask.cpp
@@ -31,46 +31,35 @@
 
 using namespace XMPP;
 
-class DiscoInfoTask::Private
-{
+class DiscoInfoTask::Private {
 public:
-    bool allowCache = true;
-    Jid jid;
-    QString node;
+    bool                allowCache = true;
+    Jid                 jid;
+    QString             node;
     DiscoItem::Identity ident;
-    DiscoItem item;
+    DiscoItem           item;
 };
 
-DiscoInfoTask::DiscoInfoTask(Task *parent)
-: Task(parent)
-{
-    d = new Private;
-}
+DiscoInfoTask::DiscoInfoTask(Task *parent) : Task(parent) { d = new Private; }
 
-DiscoInfoTask::~DiscoInfoTask()
-{
-    delete d;
-}
+DiscoInfoTask::~DiscoInfoTask() { delete d; }
 
-void DiscoInfoTask::setAllowCache(bool allow)
-{
-    d->allowCache = allow;
-}
+void DiscoInfoTask::setAllowCache(bool allow) { d->allowCache = allow; }
 
 void DiscoInfoTask::get(const DiscoItem &item)
 {
     DiscoItem::Identity id;
-    if ( item.identities().count() == 1 )
+    if (item.identities().count() == 1)
         id = item.identities().first();
     get(item.jid(), item.node(), id);
 }
 
-void DiscoInfoTask::get (const Jid &j, const QString &node, DiscoItem::Identity ident)
+void DiscoInfoTask::get(const Jid &j, const QString &node, DiscoItem::Identity ident)
 {
     d->item = DiscoItem(); // clear item
 
-    d->jid = j;
-    d->node = node;
+    d->jid   = j;
+    d->node  = node;
     d->ident = ident;
 }
 
@@ -79,27 +68,18 @@ void DiscoInfoTask::get (const Jid &j, const QString &node, DiscoItem::Identity
  * Is here because sometimes the responder does not include this information
  * in the reply.
  */
-const Jid& DiscoInfoTask::jid() const
-{
-    return d->jid;
-}
+const Jid &DiscoInfoTask::jid() const { return d->jid; }
 
 /**
  * Original requested node.
  * Is here because sometimes the responder does not include this information
  * in the reply.
  */
-const QString& DiscoInfoTask::node() const
-{
-    return d->node;
-}
+const QString &DiscoInfoTask::node() const { return d->node; }
 
-const DiscoItem &DiscoInfoTask::item() const
-{
-    return d->item;
-}
+const DiscoItem &DiscoInfoTask::item() const { return d->item; }
 
-void DiscoInfoTask::onGo ()
+void DiscoInfoTask::onGo()
 {
     if (d->allowCache && client()->capsManager()->isEnabled()) {
         d->item = client()->capsManager()->disco(d->jid);
@@ -109,9 +89,9 @@ void DiscoInfoTask::onGo ()
         }
     }
 
-    QDomElement iq = createIQ(doc(), "get", d->jid.full(), id());
+    QDomElement iq    = createIQ(doc(), "get", d->jid.full(), id());
     QDomElement query = doc()->createElementNS("http://jabber.org/protocol/disco#info", "query");
-    if ( !d->node.isEmpty() )
+    if (!d->node.isEmpty())
         query.setAttribute("node", d->node);
 
 #if 0 // seems like disco#info get request was misinterpreted. xep-0030 says it has to be an EMPTY query.
@@ -133,25 +113,24 @@ void DiscoInfoTask::onGo ()
 
 void DiscoInfoTask::cachedReady()
 {
-    d->item.setJid( d->jid );
+    d->item.setJid(d->jid);
     setSuccess();
 }
 
 bool DiscoInfoTask::take(const QDomElement &x)
 {
-    if(!iqVerify(x, d->jid, id()))
+    if (!iqVerify(x, d->jid, id()))
         return false;
 
-    if(x.attribute("type") == "result") {
+    if (x.attribute("type") == "result") {
         d->item = DiscoItem::fromDiscoInfoResult(queryTag(x));
-        d->item.setJid( d->jid );
+        d->item.setJid(d->jid);
         if (d->allowCache && client()->capsManager()->isEnabled()) {
             client()->capsManager()->updateDisco(d->jid, d->item);
         }
 
         setSuccess();
-    }
-    else {
+    } else {
         setError(x);
     }
 
diff --git a/src/xmpp/xmpp-im/xmpp_discoinfotask.h b/src/xmpp/xmpp-im/xmpp_discoinfotask.h
index 03aa8885..a5f4da11 100644
--- a/src/xmpp/xmpp-im/xmpp_discoinfotask.h
+++ b/src/xmpp/xmpp-im/xmpp_discoinfotask.h
@@ -26,37 +26,36 @@ class QDomElement;
 class QString;
 
 namespace XMPP {
-    class Jid;
+class Jid;
 
-    class DiscoInfoTask : public Task
-    {
-        Q_OBJECT
-    public:
-        DiscoInfoTask(Task *);
-        ~DiscoInfoTask();
+class DiscoInfoTask : public Task {
+    Q_OBJECT
+public:
+    DiscoInfoTask(Task *);
+    ~DiscoInfoTask();
 
-        // Allow retreive result from cache and update cache on finish with new data
-        void setAllowCache(bool allow = true);
+    // Allow retreive result from cache and update cache on finish with new data
+    void setAllowCache(bool allow = true);
 
-        void get(const Jid &, const QString &node = QString(), const DiscoItem::Identity = DiscoItem::Identity());
-        void get(const DiscoItem &);
+    void get(const Jid &, const QString &node = QString(), const DiscoItem::Identity = DiscoItem::Identity());
+    void get(const DiscoItem &);
 
-        const DiscoItem &item() const;
-        const Jid& jid() const;
-        const QString& node() const;
+    const DiscoItem &item() const;
+    const Jid &      jid() const;
+    const QString &  node() const;
 
-        void onGo();
-        bool take(const QDomElement &);
+    void onGo();
+    bool take(const QDomElement &);
 
-    private slots:
-        void cachedReady();
+private slots:
+    void cachedReady();
 
-    private:
-        class Private;
-        Private *d;
-    };
-    // Deprecated name
-    typedef DiscoInfoTask JT_DiscoInfo;
+private:
+    class Private;
+    Private *d;
+};
+// Deprecated name
+typedef DiscoInfoTask JT_DiscoInfo;
 } // namespace XMPP
 
 #endif // XMPP_DISCOINFOTASK_H
diff --git a/src/xmpp/xmpp-im/xmpp_discoitem.cpp b/src/xmpp/xmpp-im/xmpp_discoitem.cpp
index 3006c91f..69286639 100644
--- a/src/xmpp/xmpp-im/xmpp_discoitem.cpp
+++ b/src/xmpp/xmpp-im/xmpp_discoitem.cpp
@@ -23,93 +23,79 @@
 
 using namespace XMPP;
 
-class XMPP::DiscoItemPrivate : public QSharedData
-{
+class XMPP::DiscoItemPrivate : public QSharedData {
 public:
-    DiscoItemPrivate()
-    {
-        action = DiscoItem::None;
-    }
+    DiscoItemPrivate() { action = DiscoItem::None; }
 
-    Jid jid;
-    QString name;
-    QString node;
+    Jid               jid;
+    QString           name;
+    QString           node;
     DiscoItem::Action action;
 
-    Features features;
+    Features              features;
     DiscoItem::Identities identities;
-    QList<XData> exts;
+    QList<XData>          exts;
 };
 
-DiscoItem::DiscoItem()
-    : d(new DiscoItemPrivate)
-{
-}
+DiscoItem::DiscoItem() : d(new DiscoItemPrivate) {}
 
-DiscoItem::DiscoItem(const DiscoItem &from)
-    : d(new DiscoItemPrivate)
-{
-    *this = from;
-}
+DiscoItem::DiscoItem(const DiscoItem &from) : d(new DiscoItemPrivate) { *this = from; }
 
-DiscoItem & DiscoItem::operator= (const DiscoItem &from)
+DiscoItem &DiscoItem::operator=(const DiscoItem &from)
 {
-    d->jid = from.d->jid;
-    d->name = from.d->name;
-    d->node = from.d->node;
-    d->action = from.d->action;
-    d->features = from.d->features;
+    d->jid        = from.d->jid;
+    d->name       = from.d->name;
+    d->node       = from.d->node;
+    d->action     = from.d->action;
+    d->features   = from.d->features;
     d->identities = from.d->identities;
-    d->exts = from.d->exts;
+    d->exts       = from.d->exts;
 
     return *this;
 }
 
-DiscoItem::~DiscoItem()
-{
-
-}
+DiscoItem::~DiscoItem() {}
 
 AgentItem DiscoItem::toAgentItem() const
 {
     AgentItem ai;
 
-    ai.setJid( jid() );
-    ai.setName( name() );
+    ai.setJid(jid());
+    ai.setName(name());
 
     Identity id;
-    if ( !identities().isEmpty() )
+    if (!identities().isEmpty())
         id = identities().first();
 
-    ai.setCategory( id.category );
-    ai.setType( id.type );
+    ai.setCategory(id.category);
+    ai.setType(id.type);
 
-    ai.setFeatures( d->features );
+    ai.setFeatures(d->features);
 
     return ai;
 }
 
 void DiscoItem::fromAgentItem(const AgentItem &ai)
 {
-    setJid( ai.jid() );
-    setName( ai.name() );
+    setJid(ai.jid());
+    setName(ai.name());
 
     Identity id;
     id.category = ai.category();
-    id.type = ai.type();
-    id.name = ai.name();
+    id.type     = ai.type();
+    id.name     = ai.name();
 
     Identities idList;
     idList << id;
 
-    setIdentities( idList );
+    setIdentities(idList);
 
-    setFeatures( ai.features() );
+    setFeatures(ai.features());
 }
 
 QString DiscoItem::capsHash(QCryptographicHash::Algorithm algo) const
 {
-    QStringList prep;
+    QStringList           prep;
     DiscoItem::Identities idents = d->identities;
     std::sort(idents.begin(), idents.end());
 
@@ -121,7 +107,7 @@ QString DiscoItem::capsHash(QCryptographicHash::Algorithm algo) const
     std::sort(fl.begin(), fl.end());
     prep += fl;
 
-    QMap<QString,XData> forms;
+    QMap<QString, XData> forms;
     foreach (const XData &xd, d->exts) {
         if (xd.registrarType().isEmpty()) {
             continue;
@@ -133,7 +119,7 @@ QString DiscoItem::capsHash(QCryptographicHash::Algorithm algo) const
     }
     foreach (const XData &xd, forms.values()) {
         prep << xd.registrarType();
-        QMap <QString, QStringList> values;
+        QMap<QString, QStringList> values;
         foreach (const XData::Field &f, xd.fields()) {
             if (f.var() == QLatin1String("FORM_TYPE")) {
                 continue;
@@ -148,7 +134,7 @@ QString DiscoItem::capsHash(QCryptographicHash::Algorithm algo) const
             std::sort(v.begin(), v.end());
             values[f.var()] = v;
         }
-        QMap <QString, QStringList>::ConstIterator it = values.constBegin();
+        QMap<QString, QStringList>::ConstIterator it = values.constBegin();
         for (; it != values.constEnd(); ++it) {
             prep += it.key();
             prep += it.value();
@@ -156,7 +142,7 @@ QString DiscoItem::capsHash(QCryptographicHash::Algorithm algo) const
     }
 
     QByteArray ba = QString(prep.join(QLatin1String("<")) + QLatin1Char('<')).toUtf8();
-    //qDebug() << "Server caps ver: " << (prep.join(QLatin1String("<")) + QLatin1Char('<'))
+    // qDebug() << "Server caps ver: " << (prep.join(QLatin1String("<")) + QLatin1Char('<'))
     //         << "Hash:" << QString::fromLatin1(QCryptographicHash::hash(ba, algo).toBase64());
     return QString::fromLatin1(QCryptographicHash::hash(ba, algo).toBase64());
 }
@@ -165,21 +151,20 @@ DiscoItem DiscoItem::fromDiscoInfoResult(const QDomElement &q)
 {
     DiscoItem item;
 
-    item.setNode( q.attribute("node") );
+    item.setNode(q.attribute("node"));
 
-    QStringList features;
+    QStringList           features;
     DiscoItem::Identities identities;
-    QList<XData> extList;
+    QList<XData>          extList;
 
-    for(QDomNode n = q.firstChild(); !n.isNull(); n = n.nextSibling()) {
+    for (QDomNode n = q.firstChild(); !n.isNull(); n = n.nextSibling()) {
         QDomElement e = n.toElement();
-        if( e.isNull() )
+        if (e.isNull())
             continue;
 
-        if ( e.tagName() == "feature" ) {
+        if (e.tagName() == "feature") {
             features << e.attribute("var");
-        }
-        else if ( e.tagName() == "identity" ) {
+        } else if (e.tagName() == "identity") {
             DiscoItem::Identity id;
 
             id.category = e.attribute("category");
@@ -187,25 +172,25 @@ DiscoItem DiscoItem::fromDiscoInfoResult(const QDomElement &q)
             id.lang     = e.attribute("lang");
             id.name     = e.attribute("name");
 
-            identities.append( id );
-        }
-        else if (e.tagName() == QLatin1String("x") && e.namespaceURI() == QLatin1String("jabber:x:data")) {
+            identities.append(id);
+        } else if (e.tagName() == QLatin1String("x") && e.namespaceURI() == QLatin1String("jabber:x:data")) {
             XData form;
             form.fromXml(e);
             extList.append(form);
         }
     }
 
-    item.setFeatures( features );
-    item.setIdentities( identities );
-    item.setExtensions( extList );
+    item.setFeatures(features);
+    item.setIdentities(identities);
+    item.setExtensions(extList);
 
     return item;
 }
 
 QDomElement DiscoItem::toDiscoInfoResult(QDomDocument *doc) const
 {
-    QDomElement q = doc->createElementNS(QLatin1String("http://jabber.org/protocol/disco#info"), QLatin1String("query"));
+    QDomElement q
+        = doc->createElementNS(QLatin1String("http://jabber.org/protocol/disco#info"), QLatin1String("query"));
     q.setAttribute("node", d->node);
 
     foreach (const Identity &id, d->identities) {
@@ -232,78 +217,39 @@ QDomElement DiscoItem::toDiscoInfoResult(QDomDocument *doc) const
     return q;
 }
 
-const Jid &DiscoItem::jid() const
-{
-    return d->jid;
-}
+const Jid &DiscoItem::jid() const { return d->jid; }
 
-void DiscoItem::setJid(const Jid &j)
-{
-    d->jid = j;
-}
+void DiscoItem::setJid(const Jid &j) { d->jid = j; }
 
-const QString &DiscoItem::name() const
-{
-    return d->name;
-}
+const QString &DiscoItem::name() const { return d->name; }
 
-void DiscoItem::setName(const QString &n)
-{
-    d->name = n;
-}
+void DiscoItem::setName(const QString &n) { d->name = n; }
 
-const QString &DiscoItem::node() const
-{
-    return d->node;
-}
+const QString &DiscoItem::node() const { return d->node; }
 
-void DiscoItem::setNode(const QString &n)
-{
-    d->node = n;
-}
+void DiscoItem::setNode(const QString &n) { d->node = n; }
 
-DiscoItem::Action DiscoItem::action() const
-{
-    return d->action;
-}
+DiscoItem::Action DiscoItem::action() const { return d->action; }
 
-void DiscoItem::setAction(Action a)
-{
-    d->action = a;
-}
+void DiscoItem::setAction(Action a) { d->action = a; }
 
-const Features &DiscoItem::features() const
-{
-    return d->features;
-}
+const Features &DiscoItem::features() const { return d->features; }
 
-void DiscoItem::setFeatures(const Features &f)
-{
-    d->features = f;
-}
+void DiscoItem::setFeatures(const Features &f) { d->features = f; }
 
-const DiscoItem::Identities &DiscoItem::identities() const
-{
-    return d->identities;
-}
+const DiscoItem::Identities &DiscoItem::identities() const { return d->identities; }
 
 void DiscoItem::setIdentities(const Identities &i)
 {
     d->identities = i;
 
-    if ( name().isEmpty() && i.count() )
-        setName( i.first().name );
+    if (name().isEmpty() && i.count())
+        setName(i.first().name);
 }
 
-const QList<XData> &DiscoItem::extensions() const
-{
-    return d->exts;
-}
+const QList<XData> &DiscoItem::extensions() const { return d->exts; }
 
-void DiscoItem::setExtensions(const QList<XData> &extlist)
-{
-    d->exts = extlist;
-}
+void DiscoItem::setExtensions(const QList<XData> &extlist) { d->exts = extlist; }
 
 XData DiscoItem::registeredExtension(const QString &ns) const
 {
@@ -319,9 +265,9 @@ DiscoItem::Action DiscoItem::string2action(const QString &s)
 {
     Action a;
 
-    if ( s == "update" )
+    if (s == "update")
         a = Update;
-    else if ( s == "remove" )
+    else if (s == "remove")
         a = Remove;
     else
         a = None;
@@ -333,9 +279,9 @@ QString DiscoItem::action2string(const Action a)
 {
     QString s;
 
-    if ( a == Update )
+    if (a == Update)
         s = "update";
-    else if ( a == Remove )
+    else if (a == Remove)
         s = "remove";
     else
         s = QString();
@@ -361,6 +307,5 @@ bool XMPP::operator<(const DiscoItem::Identity &a, const DiscoItem::Identity &b)
 
 bool DiscoItem::Identity::operator==(const DiscoItem::Identity &other) const
 {
-    return category == other.category && type == other.type &&
-            lang == other.lang && name == other.name;
+    return category == other.category && type == other.type && lang == other.lang && name == other.name;
 }
diff --git a/src/xmpp/xmpp-im/xmpp_discoitem.h b/src/xmpp/xmpp-im/xmpp_discoitem.h
index 051f6833..face5952 100644
--- a/src/xmpp/xmpp-im/xmpp_discoitem.h
+++ b/src/xmpp/xmpp-im/xmpp_discoitem.h
@@ -29,79 +29,76 @@
 #include <QString>
 
 namespace XMPP {
-    class DiscoItemPrivate;
+class DiscoItemPrivate;
 
-    class DiscoItem
-    {
-    public:
-        DiscoItem();
-        ~DiscoItem();
+class DiscoItem {
+public:
+    DiscoItem();
+    ~DiscoItem();
 
-        const Jid &jid() const;
-        const QString &node() const;
-        const QString &name() const;
+    const Jid &    jid() const;
+    const QString &node() const;
+    const QString &name() const;
 
-        void setJid(const Jid &);
-        void setName(const QString &);
-        void setNode(const QString &);
+    void setJid(const Jid &);
+    void setName(const QString &);
+    void setNode(const QString &);
 
-        enum Action {
-            None = 0,
-            Remove,
-            Update
-        };
+    enum Action { None = 0, Remove, Update };
 
-        Action action() const;
-        void setAction(Action);
+    Action action() const;
+    void   setAction(Action);
 
-        const Features &features() const;
-        void setFeatures(const Features &);
+    const Features &features() const;
+    void            setFeatures(const Features &);
 
-        struct Identity
-        {
-            QString category;
-            QString type;
-            QString lang;
-            QString name;
+    struct Identity {
+        QString category;
+        QString type;
+        QString lang;
+        QString name;
 
-            inline Identity() {}
-            inline Identity(const QString &categoty, const QString &type,
-                            const QString &lang = QString(), const QString &name = QString()) :
-                category(categoty), type(type), lang(lang), name(name) {}
-            bool operator==(const Identity &other) const;
-        };
+        inline Identity() {}
+        inline Identity(const QString &categoty, const QString &type, const QString &lang = QString(),
+                        const QString &name = QString()) :
+            category(categoty),
+            type(type), lang(lang), name(name)
+        {
+        }
+        bool operator==(const Identity &other) const;
+    };
 
-        typedef QList<Identity> Identities;
+    typedef QList<Identity> Identities;
 
-        const Identities &identities() const;
-        void setIdentities(const Identities &);
-        inline void setIdentities(const Identity &id) { setIdentities(Identities() << id); }
+    const Identities &identities() const;
+    void              setIdentities(const Identities &);
+    inline void       setIdentities(const Identity &id) { setIdentities(Identities() << id); }
 
-        const QList<XData> &extensions() const;
-        void setExtensions(const QList<XData> &extlist);
-        XData registeredExtension(const QString &ns) const;
+    const QList<XData> &extensions() const;
+    void                setExtensions(const QList<XData> &extlist);
+    XData               registeredExtension(const QString &ns) const;
 
-        // some useful helper functions
-        static Action string2action(const QString &s);
-        static QString action2string(const Action a);
+    // some useful helper functions
+    static Action  string2action(const QString &s);
+    static QString action2string(const Action a);
 
-        DiscoItem & operator= (const DiscoItem &);
-        DiscoItem(const DiscoItem &);
+    DiscoItem &operator=(const DiscoItem &);
+    DiscoItem(const DiscoItem &);
 
-        operator AgentItem() const { return toAgentItem(); }
-        AgentItem toAgentItem() const;
-        void fromAgentItem(const AgentItem &);
+              operator AgentItem() const { return toAgentItem(); }
+    AgentItem toAgentItem() const;
+    void      fromAgentItem(const AgentItem &);
 
-        QString capsHash(QCryptographicHash::Algorithm algo) const;
+    QString capsHash(QCryptographicHash::Algorithm algo) const;
 
-        static DiscoItem fromDiscoInfoResult(const QDomElement &x);
-        QDomElement toDiscoInfoResult(QDomDocument *doc) const;
+    static DiscoItem fromDiscoInfoResult(const QDomElement &x);
+    QDomElement      toDiscoInfoResult(QDomDocument *doc) const;
 
-    private:
-        QSharedDataPointer<DiscoItemPrivate> d;
-    };
+private:
+    QSharedDataPointer<DiscoItemPrivate> d;
+};
 
-    bool operator<(const DiscoItem::Identity &a, const DiscoItem::Identity &b);
+bool operator<(const DiscoItem::Identity &a, const DiscoItem::Identity &b);
 } // namespace XMPP
 
 #endif // XMPP_DISCOITEM
diff --git a/src/xmpp/xmpp-im/xmpp_encryptionhandler.h b/src/xmpp/xmpp-im/xmpp_encryptionhandler.h
index 89691f34..21e86c8f 100644
--- a/src/xmpp/xmpp-im/xmpp_encryptionhandler.h
+++ b/src/xmpp/xmpp-im/xmpp_encryptionhandler.h
@@ -23,12 +23,11 @@
 class QDomElement;
 
 namespace XMPP {
-    class EncryptionHandler
-    {
-    public:
-        virtual bool decryptMessageElement(QDomElement &) = 0;
-        virtual bool encryptMessageElement(QDomElement &) = 0;
-    };
+class EncryptionHandler {
+public:
+    virtual bool decryptMessageElement(QDomElement &) = 0;
+    virtual bool encryptMessageElement(QDomElement &) = 0;
+};
 } // namespace XMPP
 
-#endif //PSI_XMPP_ENCRYPTIONHANDLER_H
+#endif // PSI_XMPP_ENCRYPTIONHANDLER_H
diff --git a/src/xmpp/xmpp-im/xmpp_features.cpp b/src/xmpp/xmpp-im/xmpp_features.cpp
index 81af7ed8..ee2853d9 100644
--- a/src/xmpp/xmpp-im/xmpp_features.cpp
+++ b/src/xmpp/xmpp-im/xmpp_features.cpp
@@ -29,19 +29,11 @@
 
 using namespace XMPP;
 
-Features::Features()
-{
-}
+Features::Features() {}
 
-Features::Features(const QStringList &l)
-{
-    setList(l);
-}
+Features::Features(const QStringList &l) { setList(l); }
 
-Features::Features(const QSet<QString> &s)
-{
-    setList(s);
-}
+Features::Features(const QSet<QString> &s) { setList(s); }
 
 Features::Features(const QString &str)
 {
@@ -51,39 +43,19 @@ Features::Features(const QString &str)
     setList(l);
 }
 
-Features::~Features()
-{
-}
+Features::~Features() {}
 
-QStringList Features::list() const
-{
-    return _list.toList();
-}
+QStringList Features::list() const { return _list.toList(); }
 
-void Features::setList(const QStringList &l)
-{
-    _list = QSet<QString>::fromList(l);
-}
+void Features::setList(const QStringList &l) { _list = QSet<QString>::fromList(l); }
 
-void Features::setList(const QSet<QString> &l)
-{
-    _list = l;
-}
+void Features::setList(const QSet<QString> &l) { _list = l; }
 
-void Features::addFeature(const QString& s)
-{
-    _list += s;
-}
+void Features::addFeature(const QString &s) { _list += s; }
 
-bool Features::test(const QStringList &ns) const
-{
-    return _list.contains(QSet<QString>::fromList(ns));
-}
+bool Features::test(const QStringList &ns) const { return _list.contains(QSet<QString>::fromList(ns)); }
 
-bool Features::test(const QSet<QString> &ns) const
-{
-    return _list.contains(ns);
-}
+bool Features::test(const QSet<QString> &ns) const { return _list.contains(ns); }
 
 #define FID_MULTICAST "http://jabber.org/protocol/address"
 bool Features::hasMulticast() const
@@ -206,49 +178,47 @@ bool Features::hasJingleFT() const
 // custom Psi actions
 #define FID_ADD "psi:add"
 
-class Features::FeatureName : public QObject
-{
+class Features::FeatureName : public QObject {
     Q_OBJECT
 
 public:
-    FeatureName()
-    : QObject(QCoreApplication::instance())
+    FeatureName() : QObject(QCoreApplication::instance())
     {
-        id2s[FID_Invalid]       = tr("ERROR: Incorrect usage of Features class");
-        id2s[FID_None]          = tr("None");
-        id2s[FID_Register]      = tr("Register");
-        id2s[FID_Search]        = tr("Search");
-        id2s[FID_Groupchat]     = tr("Groupchat");
-        id2s[FID_Gateway]       = tr("Gateway");
-        id2s[FID_Disco]         = tr("Service Discovery");
-        id2s[FID_VCard]         = tr("VCard");
-        id2s[FID_AHCommand]     = tr("Execute command");
-        id2s[FID_QueryVersion]  = tr("Query version");
-        id2s[FID_MessageCarbons]= tr("Message Carbons");
+        id2s[FID_Invalid]        = tr("ERROR: Incorrect usage of Features class");
+        id2s[FID_None]           = tr("None");
+        id2s[FID_Register]       = tr("Register");
+        id2s[FID_Search]         = tr("Search");
+        id2s[FID_Groupchat]      = tr("Groupchat");
+        id2s[FID_Gateway]        = tr("Gateway");
+        id2s[FID_Disco]          = tr("Service Discovery");
+        id2s[FID_VCard]          = tr("VCard");
+        id2s[FID_AHCommand]      = tr("Execute command");
+        id2s[FID_QueryVersion]   = tr("Query version");
+        id2s[FID_MessageCarbons] = tr("Message Carbons");
 
         // custom Psi actions
-        id2s[FID_Add]            = tr("Add to roster");
+        id2s[FID_Add] = tr("Add to roster");
 
         // compute reverse map
-        //QMap<QString, long>::Iterator it = id2s.begin();
-        //for ( ; it != id2s.end(); ++it)
+        // QMap<QString, long>::Iterator it = id2s.begin();
+        // for ( ; it != id2s.end(); ++it)
         //    s2id[it.data()] = it.key();
 
-        id2f[FID_Register]      = FID_REGISTER;
-        id2f[FID_Search]        = FID_SEARCH;
-        id2f[FID_Groupchat]     = FID_GROUPCHAT;
-        id2f[FID_Gateway]       = FID_GATEWAY;
-        id2f[FID_Disco]         = FID_DISCO;
-        id2f[FID_VCard]         = FID_VCARD;
-        id2f[FID_AHCommand]     = FID_AHCOMMAND;
-        id2f[FID_QueryVersion]  = FID_QUERYVERSION;
-        id2f[FID_MessageCarbons]= FID_MESSAGECARBONS;
+        id2f[FID_Register]       = FID_REGISTER;
+        id2f[FID_Search]         = FID_SEARCH;
+        id2f[FID_Groupchat]      = FID_GROUPCHAT;
+        id2f[FID_Gateway]        = FID_GATEWAY;
+        id2f[FID_Disco]          = FID_DISCO;
+        id2f[FID_VCard]          = FID_VCARD;
+        id2f[FID_AHCommand]      = FID_AHCOMMAND;
+        id2f[FID_QueryVersion]   = FID_QUERYVERSION;
+        id2f[FID_MessageCarbons] = FID_MESSAGECARBONS;
 
         // custom Psi actions
-        id2f[FID_Add]           = FID_ADD;
+        id2f[FID_Add] = FID_ADD;
     }
 
-    //QMap<QString, long> s2id;
+    // QMap<QString, long> s2id;
     QMap<long, QString> id2s;
     QMap<long, QString> id2f;
 };
@@ -257,25 +227,25 @@ static Features::FeatureName *featureName = nullptr;
 
 long Features::id() const
 {
-    if ( _list.count() > 1 )
+    if (_list.count() > 1)
         return FID_Invalid;
-    else if ( hasRegister() )
+    else if (hasRegister())
         return FID_Register;
-    else if ( hasSearch() )
+    else if (hasSearch())
         return FID_Search;
-    else if ( hasGroupchat() )
+    else if (hasGroupchat())
         return FID_Groupchat;
-    else if ( hasGateway() )
+    else if (hasGateway())
         return FID_Gateway;
-    else if ( hasDisco() )
+    else if (hasDisco())
         return FID_Disco;
-    else if ( hasVCard() )
+    else if (hasVCard())
         return FID_VCard;
-    else if ( hasCommand() )
+    else if (hasCommand())
         return FID_AHCommand;
-    else if ( test(QStringList(FID_ADD)) )
+    else if (test(QStringList(FID_ADD)))
         return FID_Add;
-    else if ( hasVersion() )
+    else if (hasVersion())
         return FID_QueryVersion;
 
     return FID_None;
@@ -289,7 +259,7 @@ long Features::id(const QString &feature)
 
 QString Features::feature(long id)
 {
-    if ( !featureName )
+    if (!featureName)
         featureName = new FeatureName();
 
     return featureName->id2f[id];
@@ -303,16 +273,13 @@ Features &Features::operator<<(const QString &feature)
 
 QString Features::name(long id)
 {
-    if ( !featureName )
+    if (!featureName)
         featureName = new FeatureName();
 
     return featureName->id2s[id];
 }
 
-QString Features::name() const
-{
-    return name(id());
-}
+QString Features::name() const { return name(id()); }
 
 QString Features::name(const QString &feature)
 {
diff --git a/src/xmpp/xmpp-im/xmpp_features.h b/src/xmpp/xmpp-im/xmpp_features.h
index df628a14..c755ae1e 100644
--- a/src/xmpp/xmpp-im/xmpp_features.h
+++ b/src/xmpp/xmpp-im/xmpp_features.h
@@ -26,87 +26,85 @@
 class QString;
 
 namespace XMPP {
-    class Features
-    {
-    public:
-        Features();
-        Features(const QStringList &);
-        Features(const QSet<QString> &);
-        Features(const QString &);
-        ~Features();
-
-        QStringList list() const; // actual featurelist
-        void setList(const QStringList &);
-        void setList(const QSet<QString> &);
-        void addFeature(const QString&);
-
-        // features
-        inline bool isEmpty() const { return _list.isEmpty(); }
-        bool hasRegister() const;
-        bool hasSearch() const;
-        bool hasMulticast() const;
-        bool hasGroupchat() const;
-        bool hasVoice() const;
-        bool hasDisco() const;
-        bool hasChatState() const;
-        bool hasCommand() const;
-        bool hasGateway() const;
-        bool hasVersion() const;
-        bool hasVCard() const;
-        bool hasMessageCarbons() const;
-        bool hasJingleFT() const;
-
-        [[deprecated]] inline bool canRegister() const { return hasRegister(); }
-        [[deprecated]] inline bool canSearch() const { return hasSearch(); }
-        [[deprecated]] inline bool canMulticast() const { return hasMulticast(); }
-        [[deprecated]] inline bool canGroupchat() const { return hasGroupchat(); }
-        [[deprecated]] inline bool canVoice() const { return hasVoice(); }
-        [[deprecated]] inline bool canDisco() const { return hasDisco(); }
-        [[deprecated]] inline bool canChatState() const { return hasChatState(); }
-        [[deprecated]] inline bool canCommand() const { return hasCommand(); }
-        [[deprecated]] inline bool isGateway() const { return hasGateway(); }
-        [[deprecated]] inline bool haveVCard() const { return hasVCard(); }
-        [[deprecated]] inline bool canMessageCarbons() const { return hasMessageCarbons(); }
-
-        enum FeatureID {
-            FID_Invalid = -1,
-            FID_None,
-            FID_Register,
-            FID_Search,
-            FID_Groupchat,
-            FID_Disco,
-            FID_Gateway,
-            FID_VCard,
-            FID_AHCommand,
-            FID_QueryVersion,
-            FID_MessageCarbons,
-
-            // private Psi actions
-            FID_Add
-        };
-
-        // useful functions
-        inline bool test(const char *ns) const
-        { return test(QSet<QString>() << QLatin1String(ns)); }
-        bool test(const QStringList &) const;
-        bool test(const QSet<QString> &) const;
-
-        QString name() const;
-        static QString name(long id);
-        static QString name(const QString &feature);
-
-        long id() const;
-        static long id(const QString &feature);
-        static QString feature(long id);
-
-        Features &operator<<(const QString &feature);
-        inline bool operator==(const Features &other)
-        { return _list == other._list; }
-
-        class FeatureName;
-    private:
-        QSet<QString> _list;
+class Features {
+public:
+    Features();
+    Features(const QStringList &);
+    Features(const QSet<QString> &);
+    Features(const QString &);
+    ~Features();
+
+    QStringList list() const; // actual featurelist
+    void        setList(const QStringList &);
+    void        setList(const QSet<QString> &);
+    void        addFeature(const QString &);
+
+    // features
+    inline bool isEmpty() const { return _list.isEmpty(); }
+    bool        hasRegister() const;
+    bool        hasSearch() const;
+    bool        hasMulticast() const;
+    bool        hasGroupchat() const;
+    bool        hasVoice() const;
+    bool        hasDisco() const;
+    bool        hasChatState() const;
+    bool        hasCommand() const;
+    bool        hasGateway() const;
+    bool        hasVersion() const;
+    bool        hasVCard() const;
+    bool        hasMessageCarbons() const;
+    bool        hasJingleFT() const;
+
+    [[deprecated]] inline bool canRegister() const { return hasRegister(); }
+    [[deprecated]] inline bool canSearch() const { return hasSearch(); }
+    [[deprecated]] inline bool canMulticast() const { return hasMulticast(); }
+    [[deprecated]] inline bool canGroupchat() const { return hasGroupchat(); }
+    [[deprecated]] inline bool canVoice() const { return hasVoice(); }
+    [[deprecated]] inline bool canDisco() const { return hasDisco(); }
+    [[deprecated]] inline bool canChatState() const { return hasChatState(); }
+    [[deprecated]] inline bool canCommand() const { return hasCommand(); }
+    [[deprecated]] inline bool isGateway() const { return hasGateway(); }
+    [[deprecated]] inline bool haveVCard() const { return hasVCard(); }
+    [[deprecated]] inline bool canMessageCarbons() const { return hasMessageCarbons(); }
+
+    enum FeatureID {
+        FID_Invalid = -1,
+        FID_None,
+        FID_Register,
+        FID_Search,
+        FID_Groupchat,
+        FID_Disco,
+        FID_Gateway,
+        FID_VCard,
+        FID_AHCommand,
+        FID_QueryVersion,
+        FID_MessageCarbons,
+
+        // private Psi actions
+        FID_Add
     };
+
+    // useful functions
+    inline bool test(const char *ns) const { return test(QSet<QString>() << QLatin1String(ns)); }
+    bool        test(const QStringList &) const;
+    bool        test(const QSet<QString> &) const;
+
+    QString        name() const;
+    static QString name(long id);
+    static QString name(const QString &feature);
+
+    long           id() const;
+    static long    id(const QString &feature);
+    static QString feature(long id);
+
+    Features &  operator<<(const QString &feature);
+    inline bool operator==(const Features &other) { return _list == other._list; }
+
+    class FeatureName;
+
+private:
+    QSet<QString> _list;
+};
 } // namespace XMPP
 
 #endif // XMPP_FEATURES_H
diff --git a/src/xmpp/xmpp-im/xmpp_hash.h b/src/xmpp/xmpp-im/xmpp_hash.h
index 72b17a36..8f94659a 100644
--- a/src/xmpp/xmpp-im/xmpp_hash.h
+++ b/src/xmpp/xmpp-im/xmpp_hash.h
@@ -44,12 +44,9 @@ class Hash {
         LastType = Blake2b512
     };
 
-    inline Hash(Type type = Type::Unknown) :
-        v_type(type) {}
-    inline Hash(Type type, const QByteArray &data) :
-        v_type(type), v_data(data) {}
-    inline Hash(const QStringRef &algo) :
-        v_type(parseType(algo)) {}
+    inline Hash(Type type = Type::Unknown) : v_type(type) {}
+    inline Hash(Type type, const QByteArray &data) : v_type(type), v_data(data) {}
+    inline Hash(const QStringRef &algo) : v_type(parseType(algo)) {}
     Hash(const QDomElement &);
 
     inline bool operator==(const Hash &other) const { return v_type == other.v_type && v_data == other.v_data; }
@@ -65,9 +62,9 @@ class Hash {
     inline void       setData(const QByteArray &d) { v_data = d; } // sets already computed hash
     inline QByteArray toHex() const { return v_data.toHex(); }
     inline QByteArray toBase64() const { return v_data.toBase64(); }
-    inline QString    toString() const { return QString("%1+%2").arg(stringType(), QString::fromLatin1(v_data.toHex())); }
-    bool              compute(const QByteArray &); // computes hash from passed data
-    bool              compute(QIODevice *dev);
+    inline QString toString() const { return QString("%1+%2").arg(stringType(), QString::fromLatin1(v_data.toHex())); }
+    bool           compute(const QByteArray &); // computes hash from passed data
+    bool           compute(QIODevice *dev);
 
     QDomElement toXml(QDomDocument *doc) const;
     static void populateFeatures(XMPP::Features &);
diff --git a/src/xmpp/xmpp-im/xmpp_htmlelement.h b/src/xmpp/xmpp-im/xmpp_htmlelement.h
index 4fc42dfb..b7dbc1c5 100644
--- a/src/xmpp/xmpp-im/xmpp_htmlelement.h
+++ b/src/xmpp/xmpp-im/xmpp_htmlelement.h
@@ -24,24 +24,23 @@
 class QString;
 
 namespace XMPP {
-    class HTMLElement
-    {
-    public:
-        HTMLElement();
-        HTMLElement(const QDomElement &body);
-
-        void setBody(const QDomElement &body);
-        const QDomElement& body() const;
-        QString toString(const QString &rootTagName = "body") const;
-        QString text() const;
-        void filterOutUnwanted(bool strict = false);
-
-    private:
-        void filterOutUnwantedRecursive(QDomElement &el, bool strict);
-
-        QDomDocument doc_;
-        QDomElement body_;
-    };
+class HTMLElement {
+public:
+    HTMLElement();
+    HTMLElement(const QDomElement &body);
+
+    void               setBody(const QDomElement &body);
+    const QDomElement &body() const;
+    QString            toString(const QString &rootTagName = "body") const;
+    QString            text() const;
+    void               filterOutUnwanted(bool strict = false);
+
+private:
+    void filterOutUnwantedRecursive(QDomElement &el, bool strict);
+
+    QDomDocument doc_;
+    QDomElement  body_;
+};
 } // namespace XMPP
 
 #endif // XMPP_HTMLELEMENT_H
diff --git a/src/xmpp/xmpp-im/xmpp_httpauthrequest.h b/src/xmpp/xmpp-im/xmpp_httpauthrequest.h
index 3c9d429a..863eabce 100644
--- a/src/xmpp/xmpp-im/xmpp_httpauthrequest.h
+++ b/src/xmpp/xmpp-im/xmpp_httpauthrequest.h
@@ -25,31 +25,31 @@ class QDomDocument;
 class QDomElement;
 
 namespace XMPP {
-    class HttpAuthRequest
-    {
-    public:
-        HttpAuthRequest(const QString &m, const QString &u, const QString &i);
-        HttpAuthRequest(const QString &m = QString(), const QString &u = QString());
-        HttpAuthRequest(const QDomElement &);
-
-        bool isEmpty() const;
-
-        void setMethod(const QString&);
-        void setUrl(const QString&);
-        void setId(const QString&);
-        QString method() const;
-        QString url() const;
-        QString id() const;
-        bool hasId() const;
-
-        QDomElement toXml(QDomDocument &) const;
-        bool fromXml(const QDomElement &);
-
-        static Stanza::Error denyError;
-    private:
-        QString method_, url_, id_;
-        bool hasId_;
-    };
+class HttpAuthRequest {
+public:
+    HttpAuthRequest(const QString &m, const QString &u, const QString &i);
+    HttpAuthRequest(const QString &m = QString(), const QString &u = QString());
+    HttpAuthRequest(const QDomElement &);
+
+    bool isEmpty() const;
+
+    void    setMethod(const QString &);
+    void    setUrl(const QString &);
+    void    setId(const QString &);
+    QString method() const;
+    QString url() const;
+    QString id() const;
+    bool    hasId() const;
+
+    QDomElement toXml(QDomDocument &) const;
+    bool        fromXml(const QDomElement &);
+
+    static Stanza::Error denyError;
+
+private:
+    QString method_, url_, id_;
+    bool    hasId_;
+};
 } // namespace XMPP
 
 #endif // XMPP_AUTHREQUEST_H
diff --git a/src/xmpp/xmpp-im/xmpp_ibb.cpp b/src/xmpp/xmpp-im/xmpp_ibb.cpp
index 067da527..de3777ad 100644
--- a/src/xmpp/xmpp-im/xmpp_ibb.cpp
+++ b/src/xmpp/xmpp-im/xmpp_ibb.cpp
@@ -25,44 +25,42 @@
 #include <qtimer.h>
 #include <stdlib.h>
 
-#define IBB_PACKET_DELAY  0
+#define IBB_PACKET_DELAY 0
 
 using namespace XMPP;
 
-static int num_conn = 0;
-static int id_conn = 0;
-static const char *IBB_NS = "http://jabber.org/protocol/ibb";
+static int         num_conn = 0;
+static int         id_conn  = 0;
+static const char *IBB_NS   = "http://jabber.org/protocol/ibb";
 
 //----------------------------------------------------------------------------
 // IBBConnection
 //----------------------------------------------------------------------------
-class IBBConnection::Private
-{
+class IBBConnection::Private {
 public:
     Private() = default;
 
-    int state = 0;
-    quint16 seq = 0;
-    Jid peer;
-    QString sid;
+    int         state = 0;
+    quint16     seq   = 0;
+    Jid         peer;
+    QString     sid;
     IBBManager *m = nullptr;
-    JT_IBB *j = nullptr;
-    QString iq_id;
-    QString stanza;
+    JT_IBB *    j = nullptr;
+    QString     iq_id;
+    QString     stanza;
 
     int blockSize = IBBConnection::PacketSize;
-    //QByteArray recvBuf, sendBuf;
+    // QByteArray recvBuf, sendBuf;
     bool closePending, closing;
 
     int id; // connection id
 };
 
-IBBConnection::IBBConnection(IBBManager *m)
-    : BSConnection(m)
+IBBConnection::IBBConnection(IBBManager *m) : BSConnection(m)
 {
-    d = new Private;
-    d->m = m;
-    d->j = nullptr;
+    d            = new Private;
+    d->m         = m;
+    d->j         = nullptr;
     d->blockSize = PacketSize;
     resetConnection();
 
@@ -76,18 +74,18 @@ IBBConnection::IBBConnection(IBBManager *m)
 void IBBConnection::resetConnection(bool clear)
 {
     d->m->unlink(this);
-    d->state = Idle;
+    d->state        = Idle;
     d->closePending = false;
-    d->closing = false;
-    d->seq = 0;
+    d->closing      = false;
+    d->seq          = 0;
 
     delete d->j;
     d->j = nullptr;
 
     clearWriteBuffer();
-    if(clear)
+    if (clear)
         clearReadBuffer();
-    setOpenMode(clear || !bytesAvailable()? QIODevice::NotOpen : QIODevice::ReadOnly);
+    setOpenMode(clear || !bytesAvailable() ? QIODevice::NotOpen : QIODevice::ReadOnly);
 }
 
 IBBConnection::~IBBConnection()
@@ -103,10 +101,7 @@ IBBConnection::~IBBConnection()
     delete d;
 }
 
-void IBBConnection::setPacketSize(int blockSize)
-{
-    d->blockSize = blockSize;
-}
+void IBBConnection::setPacketSize(int blockSize) { d->blockSize = blockSize; }
 
 void IBBConnection::connectToJid(const Jid &peer, const QString &sid)
 {
@@ -114,8 +109,8 @@ void IBBConnection::connectToJid(const Jid &peer, const QString &sid)
     resetConnection(true);
 
     d->state = Requesting;
-    d->peer = peer;
-    d->sid = sid;
+    d->peer  = peer;
+    d->sid   = sid;
 
 #ifdef IBB_DEBUG
     qDebug("IBBConnection[%d]: initiating request to %s", d->id, qPrintable(peer.full()));
@@ -129,12 +124,11 @@ void IBBConnection::connectToJid(const Jid &peer, const QString &sid)
 
 void IBBConnection::accept()
 {
-    if(d->state != WaitingForAccept)
+    if (d->state != WaitingForAccept)
         return;
 
 #ifdef IBB_DEBUG
-    qDebug("IBBConnection[%d]: accepting %s [%s]", d->id,
-           qPrintable(d->peer.full()), qPrintable(d->sid));
+    qDebug("IBBConnection[%d]: accepting %s [%s]", d->id, qPrintable(d->peer.full()), qPrintable(d->sid));
 #endif
 
     d->m->doAccept(this, d->iq_id);
@@ -147,10 +141,10 @@ void IBBConnection::accept()
 
 void IBBConnection::close()
 {
-    if(d->state == Idle)
+    if (d->state == Idle)
         return;
 
-    if(d->state == WaitingForAccept) {
+    if (d->state == WaitingForAccept) {
         d->m->doReject(this, d->iq_id, Stanza::Error::Forbidden, "Rejected");
         resetConnection();
         return;
@@ -160,12 +154,12 @@ void IBBConnection::close()
     qDebug("IBBConnection[%d]: closing", d->id);
 #endif
 
-    if(d->state == Active) {
+    if (d->state == Active) {
         d->closePending = true;
         trySend();
 
         // if there is data pending to be written, then pend the closing
-        if(bytesToWrite() > 0 || d->closing) {
+        if (bytesToWrite() > 0 || d->closing) {
             return;
         }
     }
@@ -173,29 +167,17 @@ void IBBConnection::close()
     resetConnection();
 }
 
-int IBBConnection::state() const
-{
-    return d->state;
-}
+int IBBConnection::state() const { return d->state; }
 
-Jid IBBConnection::peer() const
-{
-    return d->peer;
-}
+Jid IBBConnection::peer() const { return d->peer; }
 
-QString IBBConnection::sid() const
-{
-    return d->sid;
-}
+QString IBBConnection::sid() const { return d->sid; }
 
-BytestreamManager* IBBConnection::manager() const
-{
-    return d->m;
-}
+BytestreamManager *IBBConnection::manager() const { return d->m; }
 
 bool IBBConnection::isOpen() const
 {
-    if(d->state == Active)
+    if (d->state == Active)
         return true;
     else
         return false;
@@ -203,7 +185,7 @@ bool IBBConnection::isOpen() const
 
 qint64 IBBConnection::writeData(const char *data, qint64 maxSize)
 {
-    if(d->state != Active || d->closePending || d->closing) {
+    if (d->state != Active || d->closePending || d->closing) {
         setErrorString("read only");
         return 0;
     }
@@ -213,20 +195,18 @@ qint64 IBBConnection::writeData(const char *data, qint64 maxSize)
     return maxSize;
 }
 
-void IBBConnection::waitForAccept(const Jid &peer, const QString &iq_id,
-                                  const QString &sid, int blockSize,
+void IBBConnection::waitForAccept(const Jid &peer, const QString &iq_id, const QString &sid, int blockSize,
                                   const QString &stanza)
 {
     close();
     resetConnection(true);
 
-    d->state = WaitingForAccept;
-    d->peer = peer;
-    d->iq_id = iq_id;
-    d->sid = sid;
+    d->state     = WaitingForAccept;
+    d->peer      = peer;
+    d->iq_id     = iq_id;
+    d->sid       = sid;
     d->blockSize = blockSize;
-    d->stanza = stanza;
-
+    d->stanza    = stanza;
 }
 
 void IBBConnection::takeIncomingData(const IBBData &ibbData)
@@ -254,41 +234,37 @@ void IBBConnection::setRemoteClosed()
 void IBBConnection::ibb_finished()
 {
     JT_IBB *j = d->j;
-    d->j = nullptr;
+    d->j      = nullptr;
 
-    if(j->success()) {
-        if(j->mode() == JT_IBB::ModeRequest) {
+    if (j->success()) {
+        if (j->mode() == JT_IBB::ModeRequest) {
 
 #ifdef IBB_DEBUG
-            qDebug("IBBConnection[%d]: %s [%s] accepted.", d->id,
-                   qPrintable(d->peer.full()), qPrintable(d->sid));
+            qDebug("IBBConnection[%d]: %s [%s] accepted.", d->id, qPrintable(d->peer.full()), qPrintable(d->sid));
 #endif
             d->state = Active;
             setOpenMode(QIODevice::ReadWrite);
             d->m->link(this);
             emit connected();
-        }
-        else {
-            if(d->closing) {
+        } else {
+            if (d->closing) {
                 resetConnection();
                 emit delayedCloseFinished();
             }
 
-            if(bytesToWrite() || d->closePending)
+            if (bytesToWrite() || d->closePending)
                 QTimer::singleShot(IBB_PACKET_DELAY, this, SLOT(trySend()));
 
             emit bytesWritten(j->bytesWritten()); // will delete this connection if no bytes left.
         }
-    }
-    else {
-        if(j->mode() == JT_IBB::ModeRequest) {
+    } else {
+        if (j->mode() == JT_IBB::ModeRequest) {
 #ifdef IBB_DEBUG
             qDebug("IBBConnection[%d]: %s refused.", d->id, qPrintable(d->peer.full()));
 #endif
             resetConnection(true);
             setError(ErrRequest);
-        }
-        else {
+        } else {
             resetConnection(true);
             setError(ErrData);
         }
@@ -298,24 +274,22 @@ void IBBConnection::ibb_finished()
 void IBBConnection::trySend()
 {
     // if we already have an active task, then don't do anything
-    if(d->j)
+    if (d->j)
         return;
 
     QByteArray a = takeWrite(d->blockSize);
 
-    if(a.isEmpty()) {
+    if (a.isEmpty()) {
         if (!d->closePending)
             return; // null operation?
         d->closePending = false;
-        d->closing = true;
+        d->closing      = true;
 #ifdef IBB_DEBUG
         qDebug("IBBConnection[%d]: closing", d->id);
 #endif
-    }
-    else {
+    } else {
 #ifdef IBB_DEBUG
-        qDebug("IBBConnection[%d]: sending [%d] bytes (%d bytes left)",
-               d->id, a.size(), bytesToWrite());
+        qDebug("IBBConnection[%d]: sending [%d] bytes (%d bytes left)", d->id, a.size(), bytesToWrite());
 #endif
     }
 
@@ -323,8 +297,7 @@ void IBBConnection::trySend()
     connect(d->j, SIGNAL(finished()), SLOT(ibb_finished()));
     if (d->closing) {
         d->j->close(d->peer, d->sid);
-    }
-    else {
+    } else {
         d->j->sendData(d->peer, IBBData(d->sid, d->seq++, a));
     }
     d->j->go(true);
@@ -333,10 +306,10 @@ void IBBConnection::trySend()
 //----------------------------------------------------------------------------
 // IBBData
 //----------------------------------------------------------------------------
-IBBData& IBBData::fromXml(const QDomElement &e)
+IBBData &IBBData::fromXml(const QDomElement &e)
 {
-    sid = e.attribute("sid");
-    seq = e.attribute("seq").toInt();
+    sid  = e.attribute("sid");
+    seq  = e.attribute("seq").toInt();
     data = QByteArray::fromBase64(e.text().toUtf8());
     return *this;
 }
@@ -352,33 +325,27 @@ QDomElement IBBData::toXml(QDomDocument *doc) const
 //----------------------------------------------------------------------------
 // IBBManager
 //----------------------------------------------------------------------------
-class IBBManager::Private
-{
+class IBBManager::Private {
 public:
     Private() = default;
 
-    Client *client = nullptr;
+    Client *          client = nullptr;
     IBBConnectionList activeConns;
     IBBConnectionList incomingConns;
-    JT_IBB *ibb = nullptr;
+    JT_IBB *          ibb = nullptr;
 };
 
-IBBManager::IBBManager(Client *parent)
-    : BytestreamManager(parent)
+IBBManager::IBBManager(Client *parent) : BytestreamManager(parent)
 {
-    d = new Private;
+    d         = new Private;
     d->client = parent;
 
     d->ibb = new JT_IBB(d->client->rootTask(), true);
-    connect(d->ibb,
-            SIGNAL(incomingRequest(Jid,QString,QString,int,QString)),
-            SLOT(ibb_incomingRequest(Jid,QString,QString,int,QString)));
-    connect(d->ibb,
-            SIGNAL(incomingData(Jid,QString,IBBData,Stanza::Kind)),
-            SLOT(takeIncomingData(Jid,QString,IBBData,Stanza::Kind)));
-    connect(d->ibb,
-            SIGNAL(closeRequest(Jid,QString,QString)),
-            SLOT(ibb_closeRequest(Jid,QString,QString)));
+    connect(d->ibb, SIGNAL(incomingRequest(Jid, QString, QString, int, QString)),
+            SLOT(ibb_incomingRequest(Jid, QString, QString, int, QString)));
+    connect(d->ibb, SIGNAL(incomingData(Jid, QString, IBBData, Stanza::Kind)),
+            SLOT(takeIncomingData(Jid, QString, IBBData, Stanza::Kind)));
+    connect(d->ibb, SIGNAL(closeRequest(Jid, QString, QString)), SLOT(ibb_closeRequest(Jid, QString, QString)));
 }
 
 IBBManager::~IBBManager()
@@ -389,28 +356,18 @@ IBBManager::~IBBManager()
     delete d;
 }
 
-const char* IBBManager::ns()
-{
-    return IBB_NS;
-}
+const char *IBBManager::ns() { return IBB_NS; }
 
-Client *IBBManager::client() const
-{
-    return d->client;
-}
+Client *IBBManager::client() const { return d->client; }
 
-BSConnection *IBBManager::createConnection()
-{
-    return new IBBConnection(this);
-}
+BSConnection *IBBManager::createConnection() { return new IBBConnection(this); }
 
 IBBConnection *IBBManager::takeIncoming()
 {
-    return d->incomingConns.isEmpty()? nullptr : d->incomingConns.takeFirst();
+    return d->incomingConns.isEmpty() ? nullptr : d->incomingConns.takeFirst();
 }
 
-void IBBManager::ibb_incomingRequest(const Jid &from, const QString &id,
-                                     const QString &sid, int blockSize,
+void IBBManager::ibb_incomingRequest(const Jid &from, const QString &id, const QString &sid, int blockSize,
                                      const QString &stanza)
 {
     // create a "waiting" connection
@@ -420,17 +377,15 @@ void IBBManager::ibb_incomingRequest(const Jid &from, const QString &id,
     emit incomingReady();
 }
 
-void IBBManager::takeIncomingData(const Jid &from, const QString &id,
-                                  const IBBData &data, Stanza::Kind sKind)
+void IBBManager::takeIncomingData(const Jid &from, const QString &id, const IBBData &data, Stanza::Kind sKind)
 {
     IBBConnection *c = findConnection(data.sid, from);
-    if(!c) {
+    if (!c) {
         if (sKind == Stanza::IQ) {
             d->ibb->respondError(from, id, Stanza::Error::ItemNotFound, "No such stream");
         }
         // TODO imeplement xep-0079 error processing in case of Stanza::Message
-    }
-    else {
+    } else {
         if (sKind == Stanza::IQ) {
             d->ibb->respondAck(from, id);
         }
@@ -438,55 +393,40 @@ void IBBManager::takeIncomingData(const Jid &from, const QString &id,
     }
 }
 
-void IBBManager::ibb_closeRequest(const Jid &from, const QString &id,
-                                  const QString &sid)
+void IBBManager::ibb_closeRequest(const Jid &from, const QString &id, const QString &sid)
 {
     IBBConnection *c = findConnection(sid, from);
-    if(!c) {
+    if (!c) {
         d->ibb->respondError(from, id, Stanza::Error::ItemNotFound, "No such stream");
-    }
-    else {
+    } else {
         d->ibb->respondAck(from, id);
         c->setRemoteClosed();
     }
 }
 
-bool IBBManager::isAcceptableSID(const XMPP::Jid &jid, const QString&sid) const
+bool IBBManager::isAcceptableSID(const XMPP::Jid &jid, const QString &sid) const
 {
     return findConnection(sid, jid) == nullptr;
 }
 
-const char* IBBManager::sidPrefix() const
-{
-    return "ibb_";
-}
+const char *IBBManager::sidPrefix() const { return "ibb_"; }
 
-void IBBManager::link(IBBConnection *c)
-{
-    d->activeConns.append(c);
-}
+void IBBManager::link(IBBConnection *c) { d->activeConns.append(c); }
 
-void IBBManager::unlink(IBBConnection *c)
-{
-    d->activeConns.removeAll(c);
-}
+void IBBManager::unlink(IBBConnection *c) { d->activeConns.removeAll(c); }
 
 IBBConnection *IBBManager::findConnection(const QString &sid, const Jid &peer) const
 {
-    foreach(IBBConnection* c, d->activeConns) {
-        if(c->sid() == sid && (peer.isEmpty() || c->peer().compare(peer)) )
+    foreach (IBBConnection *c, d->activeConns) {
+        if (c->sid() == sid && (peer.isEmpty() || c->peer().compare(peer)))
             return c;
     }
     return nullptr;
 }
 
-void IBBManager::doAccept(IBBConnection *c, const QString &id)
-{
-    d->ibb->respondAck(c->peer(), id);
-}
+void IBBManager::doAccept(IBBConnection *c, const QString &id) { d->ibb->respondAck(c->peer(), id); }
 
-void IBBManager::doReject(IBBConnection *c, const QString &id,
-                          Stanza::Error::ErrorCond cond, const QString &str)
+void IBBManager::doReject(IBBConnection *c, const QString &id, Stanza::Error::ErrorCond cond, const QString &str)
 {
     d->ibb->respondError(c->peer(), id, cond, str);
 }
@@ -494,39 +434,34 @@ void IBBManager::doReject(IBBConnection *c, const QString &id,
 //----------------------------------------------------------------------------
 // JT_IBB
 //----------------------------------------------------------------------------
-class JT_IBB::Private
-{
+class JT_IBB::Private {
 public:
     Private() = default;
 
     QDomElement iq;
-    int mode = 0;
-    bool serve = false;
-    Jid to;
-    QString sid;
-    int bytesWritten = 0;
+    int         mode  = 0;
+    bool        serve = false;
+    Jid         to;
+    QString     sid;
+    int         bytesWritten = 0;
 };
 
-JT_IBB::JT_IBB(Task *parent, bool serve)
-:Task(parent)
+JT_IBB::JT_IBB(Task *parent, bool serve) : Task(parent)
 {
-    d = new Private;
+    d        = new Private;
     d->serve = serve;
 }
 
-JT_IBB::~JT_IBB()
-{
-    delete d;
-}
+JT_IBB::~JT_IBB() { delete d; }
 
 void JT_IBB::request(const Jid &to, const QString &sid, int blockSize)
 {
     d->mode = ModeRequest;
     QDomElement iq;
-    d->to = to;
-    iq = createIQ(doc(), "set", to.full(), id());
+    d->to             = to;
+    iq                = createIQ(doc(), "set", to.full(), id());
     QDomElement query = doc()->createElementNS(IBB_NS, "open");
-    //genUniqueKey
+    // genUniqueKey
     query.setAttribute("sid", sid);
     query.setAttribute("block-size", blockSize);
     query.setAttribute("stanza", "iq");
@@ -538,9 +473,9 @@ void JT_IBB::sendData(const Jid &to, const IBBData &ibbData)
 {
     d->mode = ModeSendData;
     QDomElement iq;
-    d->to = to;
+    d->to           = to;
     d->bytesWritten = ibbData.data.size();
-    iq = createIQ(doc(), "set", to.full(), id());
+    iq              = createIQ(doc(), "set", to.full(), id());
     iq.appendChild(ibbData.toXml(doc()));
     d->iq = iq;
 }
@@ -549,54 +484,45 @@ void JT_IBB::close(const Jid &to, const QString &sid)
 {
     d->mode = ModeSendData;
     QDomElement iq;
-    d->to = to;
-    iq = createIQ(doc(), "set", to.full(), id());
+    d->to             = to;
+    iq                = createIQ(doc(), "set", to.full(), id());
     QDomElement query = iq.appendChild(doc()->createElementNS(IBB_NS, "close")).toElement();
     query.setAttribute("sid", sid);
 
     d->iq = iq;
 }
 
-void JT_IBB::respondError(const Jid &to, const QString &id,
-                          Stanza::Error::ErrorCond cond, const QString &text)
+void JT_IBB::respondError(const Jid &to, const QString &id, Stanza::Error::ErrorCond cond, const QString &text)
 {
-    QDomElement iq = createIQ(doc(), "error", to.full(), id);
+    QDomElement   iq = createIQ(doc(), "error", to.full(), id);
     Stanza::Error error(Stanza::Error::Cancel, cond, text);
     iq.appendChild(error.toXml(*client()->doc(), client()->stream().baseNS()));
     send(iq);
 }
 
-void JT_IBB::respondAck(const Jid &to, const QString &id)
-{
-    send( createIQ(doc(), "result", to.full(), id) );
-}
+void JT_IBB::respondAck(const Jid &to, const QString &id) { send(createIQ(doc(), "result", to.full(), id)); }
 
-void JT_IBB::onGo()
-{
-    send(d->iq);
-}
+void JT_IBB::onGo() { send(d->iq); }
 
 bool JT_IBB::take(const QDomElement &e)
 {
-    if(d->serve) {
+    if (d->serve) {
         // must be an iq-set tag
-        if(e.tagName() != "iq" || e.attribute("type") != "set")
+        if (e.tagName() != "iq" || e.attribute("type") != "set")
             return false;
 
-        QString id = e.attribute("id");
-        QString from = e.attribute("from");
+        QString     id     = e.attribute("id");
+        QString     from   = e.attribute("from");
         QDomElement openEl = e.firstChildElement("open");
         if (!openEl.isNull() && openEl.namespaceURI() == IBB_NS) {
-            emit incomingRequest(Jid(from), id,
-                            openEl.attribute("sid"),
-                            openEl.attribute("block-size").toInt(),
-                            openEl.attribute("stanza"));
+            emit incomingRequest(Jid(from), id, openEl.attribute("sid"), openEl.attribute("block-size").toInt(),
+                                 openEl.attribute("stanza"));
             return true;
         }
         QDomElement dataEl = e.firstChildElement("data");
         if (!dataEl.isNull() && dataEl.namespaceURI() == IBB_NS) {
             IBBData data;
-            emit incomingData(Jid(from), id, data.fromXml(dataEl), Stanza::IQ);
+            emit    incomingData(Jid(from), id, data.fromXml(dataEl), Stanza::IQ);
             return true;
         }
         QDomElement closeEl = e.firstChildElement("close");
@@ -605,16 +531,14 @@ bool JT_IBB::take(const QDomElement &e)
             return true;
         }
         return false;
-    }
-    else {
+    } else {
         Jid from(e.attribute("from"));
-        if(e.attribute("id") != id() || !d->to.compare(from))
+        if (e.attribute("id") != id() || !d->to.compare(from))
             return false;
 
-        if(e.attribute("type") == "result") {
+        if (e.attribute("type") == "result") {
             setSuccess();
-        }
-        else {
+        } else {
             setError(e);
         }
 
@@ -622,17 +546,8 @@ bool JT_IBB::take(const QDomElement &e)
     }
 }
 
-Jid JT_IBB::jid() const
-{
-    return d->to;
-}
+Jid JT_IBB::jid() const { return d->to; }
 
-int JT_IBB::mode() const
-{
-    return d->mode;
-}
+int JT_IBB::mode() const { return d->mode; }
 
-int JT_IBB::bytesWritten() const
-{
-    return d->bytesWritten;
-}
+int JT_IBB::bytesWritten() const { return d->bytesWritten; }
diff --git a/src/xmpp/xmpp-im/xmpp_ibb.h b/src/xmpp/xmpp-im/xmpp_ibb.h
index e12df7cc..f3c77d81 100644
--- a/src/xmpp/xmpp-im/xmpp_ibb.h
+++ b/src/xmpp/xmpp-im/xmpp_ibb.h
@@ -30,151 +30,133 @@
 #include <QObject>
 
 namespace XMPP {
-    class Client;
-    class IBBManager;
-
-    class IBBData
-    {
-    public:
-        IBBData() : seq(0) {}
-        IBBData(const QString &sid, quint16 seq, const QByteArray &data)
-            : sid(sid)
-            , seq(seq)
-            , data(data)
-        {}
-
-        IBBData& fromXml(const QDomElement &e);
-        QDomElement toXml(QDomDocument *) const;
-
-        QString sid;
-        quint16 seq;
-        QByteArray data;
-    };
-
-    // this is an IBB connection.  use it much like a qsocket
-    class IBBConnection : public BSConnection
-    {
-        Q_OBJECT
-    public:
-        static const int PacketSize = 4096;
-
-        enum { ErrRequest, ErrData };
-        enum { Idle, Requesting, WaitingForAccept, Active };
-        IBBConnection(IBBManager *);
-        ~IBBConnection();
-
-        void setPacketSize(int blockSize = IBBConnection::PacketSize);
-        void connectToJid(const Jid &peer, const QString &sid);
-        void accept();
-        void close();
-
-        int state() const;
-        Jid peer() const;
-        QString sid() const;
-        BytestreamManager* manager() const;
-
-        bool isOpen() const;
-
-    protected:
-        qint64 writeData(const char *data, qint64 maxSize);
-
-    signals:
-        void connected();
-
-    private slots:
-        void ibb_finished();
-        void trySend();
-
-    private:
-        class Private;
-        Private *d;
-
-        void resetConnection(bool clear=false);
-
-        friend class IBBManager;
-        void waitForAccept(const Jid &peer, const QString &iq_id,
-                           const QString &sid, int blockSize,
-                           const QString &stanza);
-        void takeIncomingData(const IBBData &ibbData);
-        void setRemoteClosed();
-    };
-
-    typedef QList<IBBConnection*> IBBConnectionList;
-    class IBBManager : public BytestreamManager
-    {
-        Q_OBJECT
-    public:
-        IBBManager(Client *);
-        ~IBBManager();
-
-        static const char* ns();
-        Client *client() const;
-
-        bool isAcceptableSID(const Jid &peer, const QString &sid) const;
-        BSConnection *createConnection();
-        IBBConnection *takeIncoming();
-
-    public slots:
-        void takeIncomingData(const Jid &from, const QString &id,
-                              const IBBData &data, Stanza::Kind);
-
-    protected:
-        const char* sidPrefix() const;
-
-    private slots:
-        void ibb_incomingRequest(const Jid &from, const QString &id,
-                                 const QString &sid, int blockSize,
-                                 const QString &stanza);
-        void ibb_closeRequest(const Jid &from, const QString &id,
-                              const QString &sid);
-
-    private:
-        class Private;
-        Private *d;
-
-        friend class IBBConnection;
-        IBBConnection *findConnection(const QString &sid, const Jid &peer="") const;
-        void link(IBBConnection *);
-        void unlink(IBBConnection *);
-        void doAccept(IBBConnection *c, const QString &id);
-        void doReject(IBBConnection *c, const QString &id,
-                      Stanza::Error::ErrorCond cond, const QString &);
-    };
-
-    class JT_IBB : public Task
-    {
-        Q_OBJECT
-    public:
-        enum { ModeRequest, ModeSendData };
-        JT_IBB(Task *, bool serve=false);
-        ~JT_IBB();
-
-        void request(const Jid &, const QString &sid, int blockSize = IBBConnection::PacketSize);
-        void sendData(const Jid &, const IBBData &ibbData);
-        void close(const Jid &, const QString &sid);
-        void respondError(const Jid &, const QString &id,
-                          Stanza::Error::ErrorCond cond, const QString &text = "");
-        void respondAck(const Jid &to, const QString &id);
-
-        void onGo();
-        bool take(const QDomElement &);
-
-        Jid jid() const;
-        int mode() const;
-        int bytesWritten() const;
-
-    signals:
-        void incomingRequest(const Jid &from, const QString &id,
-                             const QString &sid, int blockSize,
+class Client;
+class IBBManager;
+
+class IBBData {
+public:
+    IBBData() : seq(0) {}
+    IBBData(const QString &sid, quint16 seq, const QByteArray &data) : sid(sid), seq(seq), data(data) {}
+
+    IBBData &   fromXml(const QDomElement &e);
+    QDomElement toXml(QDomDocument *) const;
+
+    QString    sid;
+    quint16    seq;
+    QByteArray data;
+};
+
+// this is an IBB connection.  use it much like a qsocket
+class IBBConnection : public BSConnection {
+    Q_OBJECT
+public:
+    static const int PacketSize = 4096;
+
+    enum { ErrRequest, ErrData };
+    enum { Idle, Requesting, WaitingForAccept, Active };
+    IBBConnection(IBBManager *);
+    ~IBBConnection();
+
+    void setPacketSize(int blockSize = IBBConnection::PacketSize);
+    void connectToJid(const Jid &peer, const QString &sid);
+    void accept();
+    void close();
+
+    int                state() const;
+    Jid                peer() const;
+    QString            sid() const;
+    BytestreamManager *manager() const;
+
+    bool isOpen() const;
+
+protected:
+    qint64 writeData(const char *data, qint64 maxSize);
+
+signals:
+    void connected();
+
+private slots:
+    void ibb_finished();
+    void trySend();
+
+private:
+    class Private;
+    Private *d;
+
+    void resetConnection(bool clear = false);
+
+    friend class IBBManager;
+    void waitForAccept(const Jid &peer, const QString &iq_id, const QString &sid, int blockSize, const QString &stanza);
+    void takeIncomingData(const IBBData &ibbData);
+    void setRemoteClosed();
+};
+
+typedef QList<IBBConnection *> IBBConnectionList;
+class IBBManager : public BytestreamManager {
+    Q_OBJECT
+public:
+    IBBManager(Client *);
+    ~IBBManager();
+
+    static const char *ns();
+    Client *           client() const;
+
+    bool           isAcceptableSID(const Jid &peer, const QString &sid) const;
+    BSConnection * createConnection();
+    IBBConnection *takeIncoming();
+
+public slots:
+    void takeIncomingData(const Jid &from, const QString &id, const IBBData &data, Stanza::Kind);
+
+protected:
+    const char *sidPrefix() const;
+
+private slots:
+    void ibb_incomingRequest(const Jid &from, const QString &id, const QString &sid, int blockSize,
                              const QString &stanza);
-        void incomingData(const Jid &from, const QString &id,
-                          const IBBData &data, Stanza::Kind);
-        void closeRequest(const Jid &from, const QString &id, const QString &sid);
-
-    private:
-        class Private;
-        Private *d;
-    };
+    void ibb_closeRequest(const Jid &from, const QString &id, const QString &sid);
+
+private:
+    class Private;
+    Private *d;
+
+    friend class IBBConnection;
+    IBBConnection *findConnection(const QString &sid, const Jid &peer = "") const;
+    void           link(IBBConnection *);
+    void           unlink(IBBConnection *);
+    void           doAccept(IBBConnection *c, const QString &id);
+    void           doReject(IBBConnection *c, const QString &id, Stanza::Error::ErrorCond cond, const QString &);
+};
+
+class JT_IBB : public Task {
+    Q_OBJECT
+public:
+    enum { ModeRequest, ModeSendData };
+    JT_IBB(Task *, bool serve = false);
+    ~JT_IBB();
+
+    void request(const Jid &, const QString &sid, int blockSize = IBBConnection::PacketSize);
+    void sendData(const Jid &, const IBBData &ibbData);
+    void close(const Jid &, const QString &sid);
+    void respondError(const Jid &, const QString &id, Stanza::Error::ErrorCond cond, const QString &text = "");
+    void respondAck(const Jid &to, const QString &id);
+
+    void onGo();
+    bool take(const QDomElement &);
+
+    Jid jid() const;
+    int mode() const;
+    int bytesWritten() const;
+
+signals:
+    void incomingRequest(const Jid &from, const QString &id, const QString &sid, int blockSize, const QString &stanza);
+    void incomingData(const Jid &from, const QString &id, const IBBData &data, Stanza::Kind);
+    void closeRequest(const Jid &from, const QString &id, const QString &sid);
+
+private:
+    class Private;
+    Private *d;
+};
 } // namespace XMPP
 
 #endif // XMPP_IBB_H
diff --git a/src/xmpp/xmpp-im/xmpp_liveroster.h b/src/xmpp/xmpp-im/xmpp_liveroster.h
index 5cbfb1a8..b6f1e644 100644
--- a/src/xmpp/xmpp-im/xmpp_liveroster.h
+++ b/src/xmpp/xmpp-im/xmpp_liveroster.h
@@ -24,18 +24,17 @@
 #include <QList>
 
 namespace XMPP {
-    class Jid;
+class Jid;
 
-    class LiveRoster : public QList<LiveRosterItem>
-    {
-    public:
-        LiveRoster();
-        ~LiveRoster();
+class LiveRoster : public QList<LiveRosterItem> {
+public:
+    LiveRoster();
+    ~LiveRoster();
 
-        void flagAllForDelete();
-        LiveRoster::Iterator find(const Jid &, bool compareRes=true);
-        LiveRoster::ConstIterator find(const Jid &, bool compareRes=true) const;
-    };
+    void                      flagAllForDelete();
+    LiveRoster::Iterator      find(const Jid &, bool compareRes = true);
+    LiveRoster::ConstIterator find(const Jid &, bool compareRes = true) const;
+};
 } // namespace XMPP
 
 #endif // XMPP_LIVEROSTER_H
diff --git a/src/xmpp/xmpp-im/xmpp_liverosteritem.h b/src/xmpp/xmpp-im/xmpp_liverosteritem.h
index a9c71091..9ff16adf 100644
--- a/src/xmpp/xmpp-im/xmpp_liverosteritem.h
+++ b/src/xmpp/xmpp-im/xmpp_liverosteritem.h
@@ -24,34 +24,33 @@
 #include "xmpp_status.h"
 
 namespace XMPP {
-    class LiveRosterItem : public RosterItem
-    {
-    public:
-        LiveRosterItem(const Jid &j="");
-        LiveRosterItem(const RosterItem &);
-        ~LiveRosterItem();
-        LiveRosterItem& operator=(const LiveRosterItem& other) = default;
-
-        void setRosterItem(const RosterItem &);
-
-        ResourceList & resourceList();
-        ResourceList::Iterator priority();
-
-        const ResourceList & resourceList() const;
-        ResourceList::ConstIterator priority() const;
-
-        bool isAvailable() const;
-        const Status & lastUnavailableStatus() const;
-        bool flagForDelete() const;
-
-        void setLastUnavailableStatus(const Status &);
-        void setFlagForDelete(bool);
-
-    private:
-        ResourceList v_resourceList;
-        Status v_lastUnavailableStatus;
-        bool v_flagForDelete;
-    };
+class LiveRosterItem : public RosterItem {
+public:
+    LiveRosterItem(const Jid &j = "");
+    LiveRosterItem(const RosterItem &);
+    ~LiveRosterItem();
+    LiveRosterItem &operator=(const LiveRosterItem &other) = default;
+
+    void setRosterItem(const RosterItem &);
+
+    ResourceList &         resourceList();
+    ResourceList::Iterator priority();
+
+    const ResourceList &        resourceList() const;
+    ResourceList::ConstIterator priority() const;
+
+    bool          isAvailable() const;
+    const Status &lastUnavailableStatus() const;
+    bool          flagForDelete() const;
+
+    void setLastUnavailableStatus(const Status &);
+    void setFlagForDelete(bool);
+
+private:
+    ResourceList v_resourceList;
+    Status       v_lastUnavailableStatus;
+    bool         v_flagForDelete;
+};
 } // namespace XMPP
 
 #endif // XMPP_LIVEROSTERITEM_H
diff --git a/src/xmpp/xmpp-im/xmpp_message.h b/src/xmpp/xmpp-im/xmpp_message.h
index bc0d407b..457c6e2a 100644
--- a/src/xmpp/xmpp-im/xmpp_message.h
+++ b/src/xmpp/xmpp-im/xmpp_message.h
@@ -34,210 +34,203 @@ class QDateTime;
 class QString;
 
 namespace XMPP {
-    class BoBData;
-    class HTMLElement;
-    class HttpAuthRequest;
-    class IBBData;
-    class Jid;
-    class PubSubItem;
-    class PubSubRetraction;
-    class XData;
-
-    typedef QMap<QString, QString> StringMap;
-
-    typedef enum { OfflineEvent, DeliveredEvent, DisplayedEvent,
-            ComposingEvent, CancelEvent } MsgEvent;
-
-    class Message
-    {
-    public:
-        enum CarbonDir : quint8 {
-            NoCarbon,
-            Received, // other party messages are sent to another own client
-            Sent      // own messages are sent from other clients
-        };
-
-        // XEP-0334
-        enum ProcessingHint {
-            NoPermanentStore = 1,
-            NoStore          = 2,
-            NoCopy           = 4,
-            Store            = 8
-        };
-        Q_DECLARE_FLAGS(ProcessingHints, ProcessingHint)
-
-        struct StanzaId {
-            Jid by;
-            QString id;
-        };
-
-        Message();
-        Message(const Jid &to);
-        Message(const Message &from);
-        Message & operator=(const Message &from);
-        ~Message();
-        bool operator ==(const Message &from) const;
-        inline bool isNull() const { return d == nullptr; }
-
-        Jid to() const;
-        Jid from() const;
-        QString id() const;
-        QString type() const;
-        QString lang() const;
-        QString subject(const QString &lang=QString()) const;
-        QString subject(const QLocale &lang) const;
-        StringMap subjectMap() const;
-        QString body(const QString &lang="") const;
-        QString body(const QLocale &lang) const;
-        QString thread() const;
-        Stanza::Error error() const;
-
-        void setTo(const Jid &j);
-        void setFrom(const Jid &j);
-        void setId(const QString &s);
-        void setType(const QString &s);
-        void setLang(const QString &s);
-        void setSubject(const QString &s, const QString &lang="");
-        void setBody(const QString &s, const QString &lang="");
-        void setThread(const QString &s, bool send = false);
-        void setError(const Stanza::Error &err);
-
-        // XEP-0060
-        QString pubsubNode() const;
-        QList<PubSubItem> pubsubItems() const;
-        QList<PubSubRetraction> pubsubRetractions() const;
-
-        // XEP-0091
-        QDateTime timeStamp() const;
-        void setTimeStamp(const QDateTime &ts, bool send = false);
-
-        // XEP-0071
-        HTMLElement html(const QString &lang="") const;
-        void setHTML(const HTMLElement &s, const QString &lang="");
-        bool containsHTML() const;
-
-        // XEP-0066
-        UrlList urlList() const;
-        void urlAdd(const Url &u);
-        void urlsClear();
-        void setUrlList(const UrlList &list);
-
-        // XEP-0022
-        QString eventId() const;
-        void setEventId(const QString& id);
-        bool containsEvents() const;
-        bool containsEvent(MsgEvent e) const;
-        void addEvent(MsgEvent e);
-
-        // XEP-0085
-        ChatState chatState() const;
-        void setChatState(ChatState);
-
-        // XEP-0184
-        MessageReceipt messageReceipt() const;
-        void setMessageReceipt(MessageReceipt);
-        QString messageReceiptId() const;
-        void setMessageReceiptId(const QString &s);
-
-        // XEP-0027
-        QString xsigned() const;
-        void setXSigned(const QString &s);
-        QString xencrypted() const;
-        void setXEncrypted(const QString &s);
-
-        // XEP-0033
-        AddressList addresses() const;
-        AddressList findAddresses(Address::Type t) const;
-        void addAddress(const Address &a);
-        void clearAddresses();
-        void setAddresses(const AddressList &list);
-
-        // XEP-144
-        RosterExchangeItems rosterExchangeItems() const;
-        void setRosterExchangeItems(const RosterExchangeItems&);
-
-        // XEP-172
-        void setNick(const QString&);
-        QString nick() const;
-
-        // XEP-0070
-        void setHttpAuthRequest(const HttpAuthRequest&);
-        HttpAuthRequest httpAuthRequest() const;
-
-        // XEP-0004
-        void setForm(const XData&);
-        XData getForm() const;
-
-        // XEP-xxxx SXE
-        void setSxe(const QDomElement&);
-        QDomElement sxe() const;
-
-        // XEP-0231 bits of binary
-        void addBoBData(const BoBData &);
-        QList<BoBData> bobDataList() const;
-
-        // XEP-0047 ibb
-        IBBData ibbData() const;
-
-        // XEP-0280 Message Carbons
-        void setDisabledCarbons(bool disabled);
-        bool isDisabledCarbons() const;
-        void setCarbonDirection(CarbonDir);
-        CarbonDir carbonDirection() const;
-
-        // XEP-0297
-        void setForwardedFrom(const Jid &jid);
-        Jid forwardedFrom() const;
-
-        // XEP-0308
-        QString replaceId() const;
-        void setReplaceId(const QString& id);
-
-        // XEP-0334
-        void setProcessingHints(const ProcessingHints &hints);
-        ProcessingHints processingHints() const;
-
-        // MUC
-        void addMUCStatus(int);
-        QList<int> getMUCStatuses() const;
-        void addMUCInvite(const MUCInvite&);
-        QList<MUCInvite> mucInvites() const;
-        void setMUCDecline(const MUCDecline&);
-        MUCDecline mucDecline() const;
-        QString mucPassword() const;
-        void setMUCPassword(const QString&);
-        bool hasMUCUser() const;
-
-        // XEP-0359
-        StanzaId stanzaId() const;
-        void setStanzaId(const StanzaId &id);
-        QString originId() const;
-        void setOriginId(const QString &id);
-
-        // XEP-0385 and XEP-0372
-        QList<Reference> references() const;
-        void addReference(const Reference &r);
-        void setReferences(const QList<Reference> &r);
-
-        // Obsolete invitation
-        QString invite() const;
-        void setInvite(const QString &s);
-
-        // for compatibility.  delete me later
-        bool spooled() const;
-        void setSpooled(bool);
-        bool wasEncrypted() const;
-        void setWasEncrypted(bool);
-
-        Stanza toStanza(Stream *stream) const;
-        bool fromStanza(const Stanza &s);
-        bool fromStanza(const Stanza &s, int tzoffset);
-        bool fromStanza(const Stanza &s, bool useTimeZoneOffset, int timeZoneOffset);
-
-    private:
-        class Private;
-        QExplicitlySharedDataPointer<Private> d;
+class BoBData;
+class HTMLElement;
+class HttpAuthRequest;
+class IBBData;
+class Jid;
+class PubSubItem;
+class PubSubRetraction;
+class XData;
+
+typedef QMap<QString, QString> StringMap;
+
+typedef enum { OfflineEvent, DeliveredEvent, DisplayedEvent, ComposingEvent, CancelEvent } MsgEvent;
+
+class Message {
+public:
+    enum CarbonDir : quint8 {
+        NoCarbon,
+        Received, // other party messages are sent to another own client
+        Sent      // own messages are sent from other clients
     };
+
+    // XEP-0334
+    enum ProcessingHint { NoPermanentStore = 1, NoStore = 2, NoCopy = 4, Store = 8 };
+    Q_DECLARE_FLAGS(ProcessingHints, ProcessingHint)
+
+    struct StanzaId {
+        Jid     by;
+        QString id;
+    };
+
+    Message();
+    Message(const Jid &to);
+    Message(const Message &from);
+    Message &operator=(const Message &from);
+    ~Message();
+    bool        operator==(const Message &from) const;
+    inline bool isNull() const { return d == nullptr; }
+
+    Jid           to() const;
+    Jid           from() const;
+    QString       id() const;
+    QString       type() const;
+    QString       lang() const;
+    QString       subject(const QString &lang = QString()) const;
+    QString       subject(const QLocale &lang) const;
+    StringMap     subjectMap() const;
+    QString       body(const QString &lang = "") const;
+    QString       body(const QLocale &lang) const;
+    QString       thread() const;
+    Stanza::Error error() const;
+
+    void setTo(const Jid &j);
+    void setFrom(const Jid &j);
+    void setId(const QString &s);
+    void setType(const QString &s);
+    void setLang(const QString &s);
+    void setSubject(const QString &s, const QString &lang = "");
+    void setBody(const QString &s, const QString &lang = "");
+    void setThread(const QString &s, bool send = false);
+    void setError(const Stanza::Error &err);
+
+    // XEP-0060
+    QString                 pubsubNode() const;
+    QList<PubSubItem>       pubsubItems() const;
+    QList<PubSubRetraction> pubsubRetractions() const;
+
+    // XEP-0091
+    QDateTime timeStamp() const;
+    void      setTimeStamp(const QDateTime &ts, bool send = false);
+
+    // XEP-0071
+    HTMLElement html(const QString &lang = "") const;
+    void        setHTML(const HTMLElement &s, const QString &lang = "");
+    bool        containsHTML() const;
+
+    // XEP-0066
+    UrlList urlList() const;
+    void    urlAdd(const Url &u);
+    void    urlsClear();
+    void    setUrlList(const UrlList &list);
+
+    // XEP-0022
+    QString eventId() const;
+    void    setEventId(const QString &id);
+    bool    containsEvents() const;
+    bool    containsEvent(MsgEvent e) const;
+    void    addEvent(MsgEvent e);
+
+    // XEP-0085
+    ChatState chatState() const;
+    void      setChatState(ChatState);
+
+    // XEP-0184
+    MessageReceipt messageReceipt() const;
+    void           setMessageReceipt(MessageReceipt);
+    QString        messageReceiptId() const;
+    void           setMessageReceiptId(const QString &s);
+
+    // XEP-0027
+    QString xsigned() const;
+    void    setXSigned(const QString &s);
+    QString xencrypted() const;
+    void    setXEncrypted(const QString &s);
+
+    // XEP-0033
+    AddressList addresses() const;
+    AddressList findAddresses(Address::Type t) const;
+    void        addAddress(const Address &a);
+    void        clearAddresses();
+    void        setAddresses(const AddressList &list);
+
+    // XEP-144
+    RosterExchangeItems rosterExchangeItems() const;
+    void                setRosterExchangeItems(const RosterExchangeItems &);
+
+    // XEP-172
+    void    setNick(const QString &);
+    QString nick() const;
+
+    // XEP-0070
+    void            setHttpAuthRequest(const HttpAuthRequest &);
+    HttpAuthRequest httpAuthRequest() const;
+
+    // XEP-0004
+    void  setForm(const XData &);
+    XData getForm() const;
+
+    // XEP-xxxx SXE
+    void        setSxe(const QDomElement &);
+    QDomElement sxe() const;
+
+    // XEP-0231 bits of binary
+    void           addBoBData(const BoBData &);
+    QList<BoBData> bobDataList() const;
+
+    // XEP-0047 ibb
+    IBBData ibbData() const;
+
+    // XEP-0280 Message Carbons
+    void      setDisabledCarbons(bool disabled);
+    bool      isDisabledCarbons() const;
+    void      setCarbonDirection(CarbonDir);
+    CarbonDir carbonDirection() const;
+
+    // XEP-0297
+    void setForwardedFrom(const Jid &jid);
+    Jid  forwardedFrom() const;
+
+    // XEP-0308
+    QString replaceId() const;
+    void    setReplaceId(const QString &id);
+
+    // XEP-0334
+    void            setProcessingHints(const ProcessingHints &hints);
+    ProcessingHints processingHints() const;
+
+    // MUC
+    void             addMUCStatus(int);
+    QList<int>       getMUCStatuses() const;
+    void             addMUCInvite(const MUCInvite &);
+    QList<MUCInvite> mucInvites() const;
+    void             setMUCDecline(const MUCDecline &);
+    MUCDecline       mucDecline() const;
+    QString          mucPassword() const;
+    void             setMUCPassword(const QString &);
+    bool             hasMUCUser() const;
+
+    // XEP-0359
+    StanzaId stanzaId() const;
+    void     setStanzaId(const StanzaId &id);
+    QString  originId() const;
+    void     setOriginId(const QString &id);
+
+    // XEP-0385 and XEP-0372
+    QList<Reference> references() const;
+    void             addReference(const Reference &r);
+    void             setReferences(const QList<Reference> &r);
+
+    // Obsolete invitation
+    QString invite() const;
+    void    setInvite(const QString &s);
+
+    // for compatibility.  delete me later
+    bool spooled() const;
+    void setSpooled(bool);
+    bool wasEncrypted() const;
+    void setWasEncrypted(bool);
+
+    Stanza toStanza(Stream *stream) const;
+    bool   fromStanza(const Stanza &s);
+    bool   fromStanza(const Stanza &s, int tzoffset);
+    bool   fromStanza(const Stanza &s, bool useTimeZoneOffset, int timeZoneOffset);
+
+private:
+    class Private;
+    QExplicitlySharedDataPointer<Private> d;
+};
 } // namespace XMPP
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(XMPP::Message::ProcessingHints)
diff --git a/src/xmpp/xmpp-im/xmpp_muc.h b/src/xmpp/xmpp-im/xmpp_muc.h
index 7b4cfd54..770f5ff3 100644
--- a/src/xmpp/xmpp-im/xmpp_muc.h
+++ b/src/xmpp/xmpp-im/xmpp_muc.h
@@ -26,109 +26,105 @@
 #include <QString>
 
 namespace XMPP {
-    class MUCItem
-    {
-    public:
-        enum Affiliation { UnknownAffiliation, Outcast, NoAffiliation, Member, Admin, Owner };
-        enum Role { UnknownRole, NoRole, Visitor, Participant, Moderator };
-
-        MUCItem(Role = UnknownRole, Affiliation = UnknownAffiliation);
-        MUCItem(const QDomElement&);
-
-        void setNick(const QString&);
-        void setJid(const Jid&);
-        void setAffiliation(Affiliation);
-        void setRole(Role);
-        void setActor(const Jid&);
-        void setReason(const QString&);
-
-        const QString& nick() const;
-        const Jid& jid() const; // real jid of muc participant
-        Affiliation affiliation() const;
-        Role role() const;
-        const Jid& actor() const;
-        const QString& reason() const;
-
-        void fromXml(const QDomElement&);
-        QDomElement toXml(QDomDocument&);
-
-        bool operator==(const MUCItem& o);
-
-    private:
-        QString nick_;
-        Jid jid_, actor_;
-        Affiliation affiliation_;
-        Role role_;
-        QString reason_;
-    };
-
-    class MUCInvite
-    {
-    public:
-        MUCInvite();
-        MUCInvite(const QDomElement&);
-        MUCInvite(const Jid& to, const QString& reason = QString());
-
-        const Jid& to() const;
-        void setTo(const Jid&);
-        const Jid& from() const;
-        void setFrom(const Jid&);
-        const QString& reason() const;
-        void setReason(const QString&);
-        bool cont() const;
-        void setCont(bool);
-
-        void fromXml(const QDomElement&);
-        QDomElement toXml(QDomDocument&) const;
-        bool isNull() const;
-
-    private:
-        Jid to_, from_;
-        QString reason_, password_;
-        bool cont_;
-    };
-
-    class MUCDecline
-    {
-    public:
-        MUCDecline();
-        MUCDecline(const Jid& to, const QString& reason);
-        MUCDecline(const QDomElement&);
-
-        const Jid& to() const;
-        void setTo(const Jid&);
-        const Jid& from() const;
-        void setFrom(const Jid&);
-        const QString& reason() const;
-        void setReason(const QString&);
-
-        void fromXml(const QDomElement&);
-        QDomElement toXml(QDomDocument&) const;
-        bool isNull() const;
-
-    private:
-        Jid to_, from_;
-        QString reason_;
-    };
-
-    class MUCDestroy
-    {
-    public:
-        MUCDestroy();
-        MUCDestroy(const QDomElement&);
-
-        const Jid& jid() const;
-        void setJid(const Jid&);
-        const QString& reason() const;
-        void setReason(const QString&);
-
-        void fromXml(const QDomElement&);
-        QDomElement toXml(QDomDocument&) const;
-
-    private:
-        Jid jid_;
-        QString reason_;
-    };
+class MUCItem {
+public:
+    enum Affiliation { UnknownAffiliation, Outcast, NoAffiliation, Member, Admin, Owner };
+    enum Role { UnknownRole, NoRole, Visitor, Participant, Moderator };
+
+    MUCItem(Role = UnknownRole, Affiliation = UnknownAffiliation);
+    MUCItem(const QDomElement &);
+
+    void setNick(const QString &);
+    void setJid(const Jid &);
+    void setAffiliation(Affiliation);
+    void setRole(Role);
+    void setActor(const Jid &);
+    void setReason(const QString &);
+
+    const QString &nick() const;
+    const Jid &    jid() const; // real jid of muc participant
+    Affiliation    affiliation() const;
+    Role           role() const;
+    const Jid &    actor() const;
+    const QString &reason() const;
+
+    void        fromXml(const QDomElement &);
+    QDomElement toXml(QDomDocument &);
+
+    bool operator==(const MUCItem &o);
+
+private:
+    QString     nick_;
+    Jid         jid_, actor_;
+    Affiliation affiliation_;
+    Role        role_;
+    QString     reason_;
+};
+
+class MUCInvite {
+public:
+    MUCInvite();
+    MUCInvite(const QDomElement &);
+    MUCInvite(const Jid &to, const QString &reason = QString());
+
+    const Jid &    to() const;
+    void           setTo(const Jid &);
+    const Jid &    from() const;
+    void           setFrom(const Jid &);
+    const QString &reason() const;
+    void           setReason(const QString &);
+    bool           cont() const;
+    void           setCont(bool);
+
+    void        fromXml(const QDomElement &);
+    QDomElement toXml(QDomDocument &) const;
+    bool        isNull() const;
+
+private:
+    Jid     to_, from_;
+    QString reason_, password_;
+    bool    cont_;
+};
+
+class MUCDecline {
+public:
+    MUCDecline();
+    MUCDecline(const Jid &to, const QString &reason);
+    MUCDecline(const QDomElement &);
+
+    const Jid &    to() const;
+    void           setTo(const Jid &);
+    const Jid &    from() const;
+    void           setFrom(const Jid &);
+    const QString &reason() const;
+    void           setReason(const QString &);
+
+    void        fromXml(const QDomElement &);
+    QDomElement toXml(QDomDocument &) const;
+    bool        isNull() const;
+
+private:
+    Jid     to_, from_;
+    QString reason_;
+};
+
+class MUCDestroy {
+public:
+    MUCDestroy();
+    MUCDestroy(const QDomElement &);
+
+    const Jid &    jid() const;
+    void           setJid(const Jid &);
+    const QString &reason() const;
+    void           setReason(const QString &);
+
+    void        fromXml(const QDomElement &);
+    QDomElement toXml(QDomDocument &) const;
+
+private:
+    Jid     jid_;
+    QString reason_;
+};
 } // namespace XMPP
 
 #endif // XMPP_MUC_H
diff --git a/src/xmpp/xmpp-im/xmpp_pubsubitem.h b/src/xmpp/xmpp-im/xmpp_pubsubitem.h
index 3d2a6853..ca6d6de6 100644
--- a/src/xmpp/xmpp-im/xmpp_pubsubitem.h
+++ b/src/xmpp/xmpp-im/xmpp_pubsubitem.h
@@ -23,18 +23,17 @@
 #include <QString>
 
 namespace XMPP {
-    class PubSubItem
-    {
-    public:
-        PubSubItem();
-        PubSubItem(const QString& id, const QDomElement& payload);
-        const QString& id() const;
-        const QDomElement& payload() const;
+class PubSubItem {
+public:
+    PubSubItem();
+    PubSubItem(const QString &id, const QDomElement &payload);
+    const QString &    id() const;
+    const QDomElement &payload() const;
 
-    private:
-        QString id_;
-        QDomElement payload_;
-    };
+private:
+    QString     id_;
+    QDomElement payload_;
+};
 } // namespace XMPP
 
 #endif // XMPP_PUBSUBITEM_H
diff --git a/src/xmpp/xmpp-im/xmpp_pubsubretraction.h b/src/xmpp/xmpp-im/xmpp_pubsubretraction.h
index 8a0c463e..1a2023a5 100644
--- a/src/xmpp/xmpp-im/xmpp_pubsubretraction.h
+++ b/src/xmpp/xmpp-im/xmpp_pubsubretraction.h
@@ -23,16 +23,15 @@
 #include <QString>
 
 namespace XMPP {
-    class PubSubRetraction
-    {
-    public:
-        PubSubRetraction();
-        PubSubRetraction(const QString& id);
-        const QString& id() const;
+class PubSubRetraction {
+public:
+    PubSubRetraction();
+    PubSubRetraction(const QString &id);
+    const QString &id() const;
 
-    private:
-        QString id_;
-    };
+private:
+    QString id_;
+};
 } // namespace XMPP
 
 #endif // XMPP_PUBSUBRETRACTION_H
diff --git a/src/xmpp/xmpp-im/xmpp_receipts.h b/src/xmpp/xmpp-im/xmpp_receipts.h
index 1554eb72..3220e292 100644
--- a/src/xmpp/xmpp-im/xmpp_receipts.h
+++ b/src/xmpp/xmpp-im/xmpp_receipts.h
@@ -21,11 +21,7 @@
 #define XMPP_RECEIPTS_H
 
 namespace XMPP {
-    typedef enum {
-        ReceiptNone,
-        ReceiptRequest,
-        ReceiptReceived
-    } MessageReceipt;
+typedef enum { ReceiptNone, ReceiptRequest, ReceiptReceived } MessageReceipt;
 } // namespace XMPP
 
 #endif // XMPP_RECEIPTS_H
diff --git a/src/xmpp/xmpp-im/xmpp_reference.cpp b/src/xmpp/xmpp-im/xmpp_reference.cpp
index d610b8b3..59a94cb5 100644
--- a/src/xmpp/xmpp-im/xmpp_reference.cpp
+++ b/src/xmpp/xmpp-im/xmpp_reference.cpp
@@ -21,44 +21,32 @@
 
 using namespace XMPP;
 
-#define D() (d? d:(d=new Private))
+#define D() (d ? d : (d = new Private))
 
 const QString XMPP::MEDIASHARING_NS(QStringLiteral("urn:xmpp:sims:1"));
 const QString XMPP::REFERENCE_NS(QStringLiteral("urn:xmpp:reference:0"));
 
-class Reference::Private : public QSharedData
-{
+class Reference::Private : public QSharedData {
 public:
     Reference::Type type;
-    QString uri;
-    QString anchor;
-    int     begin = -1;
-    int     end   = -1;
-    MediaSharing mediaSharing;
+    QString         uri;
+    QString         anchor;
+    int             begin = -1;
+    int             end   = -1;
+    MediaSharing    mediaSharing;
 };
 
-Reference::Reference()
-{
-
-}
+Reference::Reference() {}
 
-Reference::Reference(Type type, const QString &uri) :
-    d(new Private)
+Reference::Reference(Type type, const QString &uri) : d(new Private)
 {
     d->type = type;
-    d->uri = uri;
-}
-
-Reference::~Reference()
-{
-
+    d->uri  = uri;
 }
 
-Reference::Reference(const Reference &other) :
-    d(other.d)
-{
+Reference::~Reference() {}
 
-}
+Reference::Reference(const Reference &other) : d(other.d) {}
 
 Reference &Reference::operator=(const Reference &other)
 {
@@ -66,58 +54,34 @@ Reference &Reference::operator=(const Reference &other)
     return *this;
 }
 
-Reference::Type Reference::type() const
-{
-    return d->type;
-}
+Reference::Type Reference::type() const { return d->type; }
 
-const QString &Reference::uri() const
-{
-    return d->uri;
-}
+const QString &Reference::uri() const { return d->uri; }
 
 void Reference::setRange(int begin, int end)
 {
     D()->begin = begin;
-    d->end = end;
+    d->end     = end;
 }
 
-int Reference::begin() const
-{
-    return d->begin;
-}
+int Reference::begin() const { return d->begin; }
 
-int Reference::end() const
-{
-    return d->end;
-}
+int Reference::end() const { return d->end; }
 
-const QString &Reference::anchor() const
-{
-    return d->anchor;
-}
+const QString &Reference::anchor() const { return d->anchor; }
 
-void Reference::setAnchor(const QString &anchor)
-{
-    D()->anchor = anchor;
-}
+void Reference::setAnchor(const QString &anchor) { D()->anchor = anchor; }
 
-void Reference::setMediaSharing(const MediaSharing &ms)
-{
-    D()->mediaSharing = ms;
-}
+void Reference::setMediaSharing(const MediaSharing &ms) { D()->mediaSharing = ms; }
 
-const MediaSharing &Reference::mediaSharing() const
-{
-    return d->mediaSharing;
-}
+const MediaSharing &Reference::mediaSharing() const { return d->mediaSharing; }
 
 bool Reference::fromXml(const QDomElement &e)
 {
-    QString type = e.attribute(QString::fromLatin1("type"));
-    QString uri = e.attribute(QString::fromLatin1("uri"));
-    QString begin = e.attribute(QString::fromLatin1("begin"));
-    QString end = e.attribute(QString::fromLatin1("end"));
+    QString type   = e.attribute(QString::fromLatin1("type"));
+    QString uri    = e.attribute(QString::fromLatin1("uri"));
+    QString begin  = e.attribute(QString::fromLatin1("begin"));
+    QString end    = e.attribute(QString::fromLatin1("end"));
     QString anchor = e.attribute(QString::fromLatin1("anchor"));
 
     if (type.isEmpty() || uri.isEmpty()) {
@@ -132,12 +96,12 @@ bool Reference::fromXml(const QDomElement &e)
     else
         return false;
 
-    int beginN = -1, endN = -1;
+    int  beginN = -1, endN = -1;
     bool ok;
-    if (!begin.isEmpty() && !(beginN = begin.toInt(&ok),ok))
+    if (!begin.isEmpty() && !(beginN = begin.toInt(&ok), ok))
         return false;
 
-    if (!end.isEmpty() && !(endN = end.toInt(&ok),ok))
+    if (!end.isEmpty() && !(endN = end.toInt(&ok), ok))
         return false;
 
     if (beginN >= 0 && endN >= 0 && endN < beginN)
@@ -146,10 +110,10 @@ bool Reference::fromXml(const QDomElement &e)
     if ((endN >= 0 && beginN == -1) || (endN == -1 && beginN >= 0))
         return false;
 
-    auto msEl = e.firstChildElement("media-sharing");
+    auto         msEl = e.firstChildElement("media-sharing");
     MediaSharing ms;
     if (msEl.namespaceURI() == MEDIASHARING_NS) {
-        auto fileEl = msEl.firstChildElement("file");
+        auto fileEl    = msEl.firstChildElement("file");
         auto sourcesEl = msEl.firstChildElement("sources");
         if (sourcesEl.isNull() || fileEl.isNull() || fileEl.namespaceURI() != XMPP::Jingle::FileTransfer::NS)
             return false;
@@ -172,11 +136,11 @@ bool Reference::fromXml(const QDomElement &e)
             return false;
     }
 
-    D()->type = t;
-    d->uri = uri;
-    d->begin = beginN;
-    d->end = endN;
-    d->anchor = anchor;
+    D()->type       = t;
+    d->uri          = uri;
+    d->begin        = beginN;
+    d->end          = endN;
+    d->anchor       = anchor;
     d->mediaSharing = ms;
 
     return true;
@@ -189,15 +153,16 @@ QDomElement Reference::toXml(QDomDocument *doc) const
     }
     auto root = doc->createElementNS(REFERENCE_NS, QString::fromLatin1("reference"));
     root.setAttribute(QString::fromLatin1("uri"), d->uri);
-    root.setAttribute(QString::fromLatin1("type"), QString(d->type == Reference::Mention? "mention": "data"));
+    root.setAttribute(QString::fromLatin1("type"), QString(d->type == Reference::Mention ? "mention" : "data"));
 
     if (d->mediaSharing.file.isValid() && d->mediaSharing.sources.count()) {
         auto msEl = doc->createElementNS(MEDIASHARING_NS, QString::fromLatin1("media-sharing"));
         root.appendChild(msEl);
         msEl.appendChild(d->mediaSharing.file.toXml(doc));
         auto sourcesEl = msEl.appendChild(doc->createElement(QString::fromLatin1("sources"))).toElement();
-        for (auto const &s: d->mediaSharing.sources) {
-            auto sEl = sourcesEl.appendChild(doc->createElementNS(REFERENCE_NS, QString::fromLatin1("reference"))).toElement();
+        for (auto const &s : d->mediaSharing.sources) {
+            auto sEl = sourcesEl.appendChild(doc->createElementNS(REFERENCE_NS, QString::fromLatin1("reference")))
+                           .toElement();
             sEl.setAttribute(QString::fromLatin1("uri"), s);
             sEl.setAttribute(QString::fromLatin1("type"), QString::fromLatin1("data"));
         }
@@ -214,4 +179,3 @@ QDomElement Reference::toXml(QDomDocument *doc) const
 
     return root;
 }
-
diff --git a/src/xmpp/xmpp-im/xmpp_reference.h b/src/xmpp/xmpp-im/xmpp_reference.h
index 9cf3e5ac..8a3aaace 100644
--- a/src/xmpp/xmpp-im/xmpp_reference.h
+++ b/src/xmpp/xmpp-im/xmpp_reference.h
@@ -26,54 +26,52 @@
 #include <QSharedPointer>
 
 namespace XMPP {
-    extern const QString MEDIASHARING_NS;
-    extern const QString REFERENCE_NS;
+extern const QString MEDIASHARING_NS;
+extern const QString REFERENCE_NS;
 
-    class MediaSharing
-    {
-    public:
-        Jingle::FileTransfer::File file;
-        QStringList sources;
+class MediaSharing {
+public:
+    Jingle::FileTransfer::File file;
+    QStringList                sources;
 
-        inline bool isValid() const { return file.isValid(); }
-    };
+    inline bool isValid() const { return file.isValid(); }
+};
 
-    class Reference
-    {
-    public:
-        enum Type : char {
+class Reference {
+public:
+    enum Type : char {
 
-            Mention,
-            Data
-        };
+        Mention,
+        Data
+    };
 
-        Reference();
-        Reference(Type type, const QString &uri);
-        ~Reference();
-        Reference(const Reference &other);
-        Reference &operator=(const Reference &other);
+    Reference();
+    Reference(Type type, const QString &uri);
+    ~Reference();
+    Reference(const Reference &other);
+    Reference &operator=(const Reference &other);
 
-        bool isValid() const { return d != nullptr; }
-        Type type() const;
-        const QString &uri() const;
+    bool           isValid() const { return d != nullptr; }
+    Type           type() const;
+    const QString &uri() const;
 
-        void setRange(int begin, int end);
-        int begin() const;
-        int end() const;
+    void setRange(int begin, int end);
+    int  begin() const;
+    int  end() const;
 
-        const QString &anchor() const;
-        void setAnchor(const QString &anchor);
+    const QString &anchor() const;
+    void           setAnchor(const QString &anchor);
 
-        void setMediaSharing(const MediaSharing &);
-        const MediaSharing &mediaSharing() const;
+    void                setMediaSharing(const MediaSharing &);
+    const MediaSharing &mediaSharing() const;
 
-        bool fromXml(const QDomElement &e);
-        QDomElement toXml(QDomDocument *) const;
+    bool        fromXml(const QDomElement &e);
+    QDomElement toXml(QDomDocument *) const;
 
-    private:
-        class Private;
-        QSharedDataPointer<Private> d;
-    };
+private:
+    class Private;
+    QSharedDataPointer<Private> d;
+};
 } // namespace XMPP
 
 #endif // XMPPREFERENCE_H
diff --git a/src/xmpp/xmpp-im/xmpp_resource.h b/src/xmpp/xmpp-im/xmpp_resource.h
index 7fd1b6b1..10a045f4 100644
--- a/src/xmpp/xmpp-im/xmpp_resource.h
+++ b/src/xmpp/xmpp-im/xmpp_resource.h
@@ -24,22 +24,21 @@
 #include <QString>
 
 namespace XMPP {
-    class Resource
-    {
-    public:
-        Resource(const QString &name="", const Status &s=Status());
-
-        const QString & name() const;
-        int priority() const;
-        const Status & status() const;
-
-        void setName(const QString &);
-        void setStatus(const Status &);
-
-    private:
-        QString v_name;
-        Status v_status;
-    };
+class Resource {
+public:
+    Resource(const QString &name = "", const Status &s = Status());
+
+    const QString &name() const;
+    int            priority() const;
+    const Status & status() const;
+
+    void setName(const QString &);
+    void setStatus(const Status &);
+
+private:
+    QString v_name;
+    Status  v_status;
+};
 } // namespace XMPP
 
 #endif // XMPP_RESOURCE_H
diff --git a/src/xmpp/xmpp-im/xmpp_resourcelist.h b/src/xmpp/xmpp-im/xmpp_resourcelist.h
index ae41bad2..93003581 100644
--- a/src/xmpp/xmpp-im/xmpp_resourcelist.h
+++ b/src/xmpp/xmpp-im/xmpp_resourcelist.h
@@ -26,18 +26,17 @@
 class QString;
 
 namespace XMPP {
-    class ResourceList : public QList<Resource>
-    {
-    public:
-        ResourceList();
-        ~ResourceList();
-
-        ResourceList::Iterator find(const QString &);
-        ResourceList::Iterator priority();
-
-        ResourceList::ConstIterator find(const QString &) const;
-        ResourceList::ConstIterator priority() const;
-    };
+class ResourceList : public QList<Resource> {
+public:
+    ResourceList();
+    ~ResourceList();
+
+    ResourceList::Iterator find(const QString &);
+    ResourceList::Iterator priority();
+
+    ResourceList::ConstIterator find(const QString &) const;
+    ResourceList::ConstIterator priority() const;
+};
 } // namespace XMPP
 
 #endif // XMPP_RESOURCELIST_H
diff --git a/src/xmpp/xmpp-im/xmpp_roster.h b/src/xmpp/xmpp-im/xmpp_roster.h
index 9572e580..669f2aff 100644
--- a/src/xmpp/xmpp-im/xmpp_roster.h
+++ b/src/xmpp/xmpp-im/xmpp_roster.h
@@ -27,21 +27,20 @@ class QDomDocument;
 class QDomElement;
 
 namespace XMPP {
-    class Jid;
+class Jid;
 
-    class Roster : public QList<RosterItem>
-    {
-    public:
-        Roster();
-        ~Roster();
+class Roster : public QList<RosterItem> {
+public:
+    Roster();
+    ~Roster();
 
-        Roster::Iterator find(const Jid &);
-        Roster::ConstIterator find(const Jid &) const;
+    Roster::Iterator      find(const Jid &);
+    Roster::ConstIterator find(const Jid &) const;
 
-    private:
-        class RosterPrivate;
-        RosterPrivate *d = nullptr;
-    };
+private:
+    class RosterPrivate;
+    RosterPrivate *d = nullptr;
+};
 } // namespace XMPP
 
 #endif // XMPP_ROSTER_H
diff --git a/src/xmpp/xmpp-im/xmpp_rosteritem.h b/src/xmpp/xmpp-im/xmpp_rosteritem.h
index 3fe1e486..e773ce33 100644
--- a/src/xmpp/xmpp-im/xmpp_rosteritem.h
+++ b/src/xmpp/xmpp-im/xmpp_rosteritem.h
@@ -25,58 +25,56 @@
 #include <QStringList>
 
 namespace XMPP {
-    class Subscription
-    {
-    public:
-        enum SubType { None, To, From, Both, Remove };
+class Subscription {
+public:
+    enum SubType { None, To, From, Both, Remove };
 
-        Subscription(SubType type=None);
+    Subscription(SubType type = None);
 
-        int type() const;
+    int type() const;
 
-        QString toString() const;
-        bool fromString(const QString &);
+    QString toString() const;
+    bool    fromString(const QString &);
 
-    private:
-        SubType value;
-    };
+private:
+    SubType value;
+};
 
-    class RosterItem
-    {
-    public:
-        RosterItem(const Jid &jid="");
-        RosterItem(const RosterItem &item);
-        virtual ~RosterItem();
-        RosterItem& operator=(const RosterItem& other) = default;
+class RosterItem {
+public:
+    RosterItem(const Jid &jid = "");
+    RosterItem(const RosterItem &item);
+    virtual ~RosterItem();
+    RosterItem &operator=(const RosterItem &other) = default;
 
-        const Jid & jid() const;
-        const QString & name() const;
-        const QStringList & groups() const;
-        const Subscription & subscription() const;
-        const QString & ask() const;
-        bool isPush() const;
-        bool inGroup(const QString &) const;
+    const Jid &         jid() const;
+    const QString &     name() const;
+    const QStringList & groups() const;
+    const Subscription &subscription() const;
+    const QString &     ask() const;
+    bool                isPush() const;
+    bool                inGroup(const QString &) const;
 
-        virtual void setJid(const Jid &);
-        void setName(const QString &);
-        void setGroups(const QStringList &);
-        void setSubscription(const Subscription &);
-        void setAsk(const QString &);
-        void setIsPush(bool);
-        bool addGroup(const QString &);
-        bool removeGroup(const QString &);
+    virtual void setJid(const Jid &);
+    void         setName(const QString &);
+    void         setGroups(const QStringList &);
+    void         setSubscription(const Subscription &);
+    void         setAsk(const QString &);
+    void         setIsPush(bool);
+    bool         addGroup(const QString &);
+    bool         removeGroup(const QString &);
 
-        QDomElement toXml(QDomDocument *) const;
-        bool fromXml(const QDomElement &);
+    QDomElement toXml(QDomDocument *) const;
+    bool        fromXml(const QDomElement &);
 
-    private:
-        Jid v_jid;
-        QString v_name;
-        QStringList v_groups;
-        Subscription v_subscription;
-        QString v_ask;
-        bool v_push;
-    };
+private:
+    Jid          v_jid;
+    QString      v_name;
+    QStringList  v_groups;
+    Subscription v_subscription;
+    QString      v_ask;
+    bool         v_push;
+};
 } // namespace XMPP
 
 #endif // XMPP_ROSTERITEM_H
diff --git a/src/xmpp/xmpp-im/xmpp_rosterx.h b/src/xmpp/xmpp-im/xmpp_rosterx.h
index 70a3f9de..98669d65 100644
--- a/src/xmpp/xmpp-im/xmpp_rosterx.h
+++ b/src/xmpp/xmpp-im/xmpp_rosterx.h
@@ -28,37 +28,37 @@
 class QDomElement;
 
 namespace XMPP {
-    class Stanza;
+class Stanza;
 
-    class RosterExchangeItem
-    {
-    public:
-        enum Action { Add, Delete, Modify };
+class RosterExchangeItem {
+public:
+    enum Action { Add, Delete, Modify };
 
-        RosterExchangeItem(const Jid& jid, const QString& name = "", const QStringList& groups = QStringList(), Action = Add);
-        RosterExchangeItem(const QDomElement&);
+    RosterExchangeItem(const Jid &jid, const QString &name = "", const QStringList &groups = QStringList(),
+                       Action = Add);
+    RosterExchangeItem(const QDomElement &);
 
-        const Jid& jid() const;
-        Action action() const;
-        const QString& name() const;
-        const QStringList& groups() const;
-        bool isNull() const;
+    const Jid &        jid() const;
+    Action             action() const;
+    const QString &    name() const;
+    const QStringList &groups() const;
+    bool               isNull() const;
 
-        void setJid(const Jid&);
-        void setAction(Action);
-        void setName(const QString&);
-        void setGroups(const QStringList&);
+    void setJid(const Jid &);
+    void setAction(Action);
+    void setName(const QString &);
+    void setGroups(const QStringList &);
 
-        QDomElement toXml(Stanza&) const;
-        void fromXml(const QDomElement&);
+    QDomElement toXml(Stanza &) const;
+    void        fromXml(const QDomElement &);
 
-    private:
-        Jid jid_;
-        QString name_;
-        QStringList groups_;
-        Action action_;
-    };
-    typedef QList<RosterExchangeItem> RosterExchangeItems;
+private:
+    Jid         jid_;
+    QString     name_;
+    QStringList groups_;
+    Action      action_;
+};
+typedef QList<RosterExchangeItem> RosterExchangeItems;
 } // namespace XMPP
 
 #endif // XMPP_ROSTERX_H
diff --git a/src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp b/src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp
index 72e5ee83..e9dc3589 100644
--- a/src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp
+++ b/src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp
@@ -23,14 +23,12 @@
 #include "xmpp_tasks.h"
 
 namespace XMPP {
-ServerInfoManager::ServerInfoManager(Client* client):
-    QObject(client),
-    _client(client),
-    _canMessageCarbons(false)
+ServerInfoManager::ServerInfoManager(Client *client) : QObject(client), _client(client), _canMessageCarbons(false)
 {
     deinitialize();
     // NOTE we can use this class for any server, but for this we shouldn't use roster signal here
-    connect(_client, SIGNAL(rosterRequestFinished(bool, int, const QString &)), SLOT(initialize()), Qt::QueuedConnection);
+    connect(_client, SIGNAL(rosterRequestFinished(bool, int, const QString &)), SLOT(initialize()),
+            Qt::QueuedConnection);
 }
 
 void ServerInfoManager::reset()
@@ -59,39 +57,31 @@ void ServerInfoManager::deinitialize()
     emit featuresChanged();
 }
 
-const QString& ServerInfoManager::multicastService() const
-{
-    return _multicastService;
-}
+const QString &ServerInfoManager::multicastService() const { return _multicastService; }
 
-bool ServerInfoManager::hasPEP() const
-{
-    return _hasPEP;
-}
+bool ServerInfoManager::hasPEP() const { return _hasPEP; }
 
-bool ServerInfoManager::canMessageCarbons() const
-{
-    return _canMessageCarbons;
-}
+bool ServerInfoManager::canMessageCarbons() const { return _canMessageCarbons; }
 
 void ServerInfoManager::queryServicesList()
 {
     _servicesListState = ST_InProgress;
-    auto jtitems = new JT_DiscoItems(_client->rootTask());
-    connect(jtitems, &JT_DiscoItems::finished, this, [=]()
-    {
-        _servicesInfo.clear(); //
-        if (jtitems->success()) {
-            _servicesListState = ST_Ready;
-            for (const auto &item: jtitems->items()) {
-                _servicesInfo.insert(item.jid().full(), {ST_NotQueried, item, QMap<QString,QVariant>()});
+    auto jtitems       = new JT_DiscoItems(_client->rootTask());
+    connect(
+        jtitems, &JT_DiscoItems::finished, this,
+        [=]() {
+            _servicesInfo.clear(); //
+            if (jtitems->success()) {
+                _servicesListState = ST_Ready;
+                for (const auto &item : jtitems->items()) {
+                    _servicesInfo.insert(item.jid().full(), { ST_NotQueried, item, QMap<QString, QVariant>() });
+                }
+            } else {
+                _servicesListState = ST_Failed;
             }
-        }
-        else {
-            _servicesListState = ST_Failed;
-        }
-        checkPendingServiceQueries();
-    }, Qt::QueuedConnection);
+            checkPendingServiceQueries();
+        },
+        Qt::QueuedConnection);
     jtitems->get(_client->jid().domain());
     jtitems->go(true);
 }
@@ -103,7 +93,7 @@ void ServerInfoManager::checkPendingServiceQueries()
         if (_servicesListState == ST_Failed) {
             const auto sqs = _serviceQueries;
             _serviceQueries.clear();
-            for (const auto &q: sqs) {
+            for (const auto &q : sqs) {
                 q.callback(QList<DiscoItem>());
             }
         }
@@ -112,13 +102,13 @@ void ServerInfoManager::checkPendingServiceQueries()
 
     // services list is ready here and we can start checking it and sending disco#info to not cached entries
     auto sqIt = _serviceQueries.begin();
-    while(sqIt != _serviceQueries.end()) {
+    while (sqIt != _serviceQueries.end()) {
 
         // populate services to query for this service request
         if (!sqIt->servicesToQueryDefined) {
             sqIt->spareServicesToQuery.clear();
             // grep all suitble service jids. moving forward preferred ones
-            QMapIterator<QString,ServiceInfo> si(_servicesInfo);
+            QMapIterator<QString, ServiceInfo> si(_servicesInfo);
             while (si.hasNext()) {
                 si.next();
                 if (!sqIt->nameHint.isEmpty()) {
@@ -145,33 +135,31 @@ void ServerInfoManager::checkPendingServiceQueries()
 
         // now `sqIt->servicesToQuery` definitely has something to check. maybe some info is already in cache.
         bool hasInProgress = false;
-        auto jidIt = sqIt->servicesToQuery.begin();
-        //bool foundMatch = false;
+        auto jidIt         = sqIt->servicesToQuery.begin();
+        // bool foundMatch = false;
         while (jidIt != sqIt->servicesToQuery.end()) {
             auto si = _servicesInfo.find(*jidIt); // find cached service corresponding to one of matched jids
             if (si == _servicesInfo.end() || si->state == ST_Failed) {
                 // the map was updated after the first service list request, or info request failed.
                 sqIt->servicesToQuery.erase(jidIt++);
                 continue;
-            } else
-            if (si->state == ST_Ready) { // disco info finished successfully for current jid from `servicesToQuery`
+            } else if (si->state
+                       == ST_Ready) { // disco info finished successfully for current jid from `servicesToQuery`
                 bool foundIdentity = sqIt->category.isEmpty() && sqIt->type.isEmpty();
                 if (!foundIdentity) {
-                    for (auto &i: si->item.identities()) {
-                        if ((sqIt->category.isEmpty() || sqIt->category == i.category) &&
-                                (sqIt->type.isEmpty() || sqIt->type == i.type))
-                        {
+                    for (auto &i : si->item.identities()) {
+                        if ((sqIt->category.isEmpty() || sqIt->category == i.category)
+                            && (sqIt->type.isEmpty() || sqIt->type == i.type)) {
                             foundIdentity = true;
                             break;
                         }
                     }
                 }
-                if (foundIdentity && (sqIt->features.isEmpty() || std::accumulate(sqIt->features.constBegin(),
-                                                                  sqIt->features.constEnd(), false,
-                                                                  [&si](bool a, const QSet<QString> &b) {
-                                                                     return a || si->item.features().test(b);
-                                                                  })))
-                {
+                if (foundIdentity
+                    && (sqIt->features.isEmpty()
+                        || std::accumulate(
+                            sqIt->features.constBegin(), sqIt->features.constEnd(), false,
+                            [&si](bool a, const QSet<QString> &b) { return a || si->item.features().test(b); }))) {
                     sqIt->result.append(si->item);
                     if (sqIt->options & SQ_FinishOnFirstMatch) {
                         break;
@@ -185,14 +173,14 @@ void ServerInfoManager::checkPendingServiceQueries()
             Q_ASSERT(si->state == ST_NotQueried || si->state == ST_InProgress);
             hasInProgress = true;
             if (si->state == ST_NotQueried) { // if not queried then let's query
-                si->state = ST_InProgress;
+                si->state   = ST_InProgress;
                 auto jtinfo = new JT_DiscoInfo(_client->rootTask());
-                connect(jtinfo, &DiscoInfoTask::finished, this, [this, jtinfo](){
+                connect(jtinfo, &DiscoInfoTask::finished, this, [this, jtinfo]() {
                     auto si = _servicesInfo.find(jtinfo->jid().full());
                     if (si != _servicesInfo.end()) {
                         if (jtinfo->success()) {
                             si.value().state = ST_Ready;
-                            si.value().item = jtinfo->item();
+                            si.value().item  = jtinfo->item();
                         } else {
                             si.value().state = ST_Failed;
                         }
@@ -206,7 +194,8 @@ void ServerInfoManager::checkPendingServiceQueries()
         }
 
         if (sqIt->result.isEmpty() && !hasInProgress && !sqIt->spareServicesToQuery.isEmpty()) {
-            // we don't check sqIt->servicesToQuery.isEmpty() since it comes from other conditions (sqIt->result.isEmpty() && !hasInProgress)
+            // we don't check sqIt->servicesToQuery.isEmpty() since it comes from other conditions
+            // (sqIt->result.isEmpty() && !hasInProgress)
             sqIt->servicesToQuery = sqIt->spareServicesToQuery;
             sqIt->spareServicesToQuery.clear();
             continue; // continue with the same ServiceQuery but with different jids list
@@ -217,7 +206,7 @@ void ServerInfoManager::checkPendingServiceQueries()
         // if nothing in progress then we have full result set or nothing found even in spare list
         if (forceFinish || !hasInProgress) { // self explanatory
             auto callback = std::move(sqIt->callback);
-            auto result = sqIt->result;
+            auto result   = sqIt->result;
             _serviceQueries.erase(sqIt++);
             callback(result);
         } else {
@@ -239,8 +228,9 @@ void ServerInfoManager::appendQuery(const ServiceQuery &q)
     }
 }
 
-void ServerInfoManager::queryServiceInfo(const QString &category, const QString &type, const QList<QSet<QString>> &features,
-                                     const QRegExp &nameHint, SQOptions options, std::function<void (const QList<DiscoItem> &items)> callback)
+void ServerInfoManager::queryServiceInfo(const QString &category, const QString &type,
+                                         const QList<QSet<QString>> &features, const QRegExp &nameHint,
+                                         SQOptions options, std::function<void(const QList<DiscoItem> &items)> callback)
 {
     appendQuery(ServiceQuery(type, category, features, nameHint, options, std::move(callback)));
 }
@@ -275,14 +265,15 @@ void ServerInfoManager::disco_finished()
 
         // Identities
         DiscoItem::Identities is = jt->item().identities();
-        foreach(DiscoItem::Identity i, is) {
+        foreach (DiscoItem::Identity i, is) {
             if (i.category == "pubsub" && i.type == "pep")
                 _hasPEP = true;
         }
 
-        for (const auto &x: jt->item().extensions()) {
-            if (x.type() == XData::Data_Result && x.registrarType() == QLatin1String("http://jabber.org/network/serverinfo")) {
-                for (const auto &f: x.fields()) {
+        for (const auto &x : jt->item().extensions()) {
+            if (x.type() == XData::Data_Result
+                && x.registrarType() == QLatin1String("http://jabber.org/network/serverinfo")) {
+                for (const auto &f : x.fields()) {
                     if (f.type() == XData::Field::Field_ListMulti) {
                         _extraServerInfo.insert(f.var(), f.value()); // covers XEP-0157
                     }
diff --git a/src/xmpp/xmpp-im/xmpp_serverinfomanager.h b/src/xmpp/xmpp-im/xmpp_serverinfomanager.h
index ebbaeeef..2fabf153 100644
--- a/src/xmpp/xmpp-im/xmpp_serverinfomanager.h
+++ b/src/xmpp/xmpp-im/xmpp_serverinfomanager.h
@@ -34,8 +34,7 @@ class Client;
 class Features;
 class Jid;
 
-class ServerInfoManager : public QObject
-{
+class ServerInfoManager : public QObject {
     Q_OBJECT
 public:
     enum SQOption {
@@ -47,50 +46,42 @@ class ServerInfoManager : public QObject
 
 private:
     struct ServiceQuery {
-        const QString type;
-        const QString category;
-        const QList<QSet<QString>> features;
-        const QRegExp nameHint;
-        const SQOptions options;
+        const QString                                           type;
+        const QString                                           category;
+        const QList<QSet<QString>>                              features;
+        const QRegExp                                           nameHint;
+        const SQOptions                                         options;
         const std::function<void(const QList<DiscoItem> &item)> callback;
-        QLinkedList<QString> servicesToQuery;
+        QLinkedList<QString>                                    servicesToQuery;
         QLinkedList<QString> spareServicesToQuery; // usually a fallback when the above is not matched
-        bool servicesToQueryDefined = false;
-        QList<DiscoItem> result;
-
-        ServiceQuery(const QString &type,
-                    const QString &category,
-                    const QList<QSet<QString>> &features,
-                    const QRegExp &nameHint,
-                    const SQOptions &options,
-                    const std::function<void(const QList<DiscoItem> &item)> &&callback
-                    ) :
-            type(type), category(category), features(features), nameHint(nameHint), options(options), callback(callback)
-        { }
+        bool                 servicesToQueryDefined = false;
+        QList<DiscoItem>     result;
+
+        ServiceQuery(const QString &type, const QString &category, const QList<QSet<QString>> &features,
+                     const QRegExp &nameHint, const SQOptions &options,
+                     const std::function<void(const QList<DiscoItem> &item)> &&callback) :
+            type(type),
+            category(category), features(features), nameHint(nameHint), options(options), callback(callback)
+        {
+        }
     };
 
-    enum ServicesState {
-        ST_NotQueried,
-        ST_InProgress,
-        ST_Ready,
-        ST_Failed
-    };
+    enum ServicesState { ST_NotQueried, ST_InProgress, ST_Ready, ST_Failed };
 
     struct ServiceInfo {
-        ServicesState state;
-        DiscoItem item;
-        QMap<QString,QVariant> meta;
+        ServicesState           state;
+        DiscoItem               item;
+        QMap<QString, QVariant> meta;
     };
 
 public:
+    ServerInfoManager(XMPP::Client *client);
 
-    ServerInfoManager(XMPP::Client* client);
-
-    const QString& multicastService() const;
-    bool hasPEP() const;
-    inline const Features &features() const { return _features; }
-    bool canMessageCarbons() const;
-    inline const QMap<QString,QStringList> &extraServerInfo() const { return _extraServerInfo; }
+    const QString &                          multicastService() const;
+    bool                                     hasPEP() const;
+    inline const Features &                  features() const { return _features; }
+    bool                                     canMessageCarbons() const;
+    inline const QMap<QString, QStringList> &extraServerInfo() const { return _extraServerInfo; }
 
     /*
      empty type/category/features/nameHint means it won't be checked.
@@ -109,10 +100,10 @@ class ServerInfoManager : public QObject
        nameHint = (http\..*|)  // search for service name like http.jabber.ru
      Result: disco info for upload.jabber.ru will be returned.
     */
-    void queryServiceInfo(const QString &category, const QString &type, const QList<QSet<QString>> &features,
-                          const QRegExp &nameHint, SQOptions options,
-                          std::function<void(const QList<DiscoItem> &items)> callback);
-    void setServiceMeta(const Jid &service, const QString &key, const QVariant &value);
+    void     queryServiceInfo(const QString &category, const QString &type, const QList<QSet<QString>> &features,
+                              const QRegExp &nameHint, SQOptions options,
+                              std::function<void(const QList<DiscoItem> &items)> callback);
+    void     setServiceMeta(const Jid &service, const QString &key, const QVariant &value);
     QVariant serviceMeta(const Jid &service, const QString &key);
 
 signals:
@@ -131,15 +122,16 @@ private slots:
     void appendQuery(const ServiceQuery &q);
 
 private:
-    XMPP::Client* _client = nullptr;
-    CapsSpec _caps;
-    Features _features;
-    QString _multicastService;
-    QMap<QString,QStringList> _extraServerInfo; // XEP-0128, XEP-0157
+    XMPP::Client *             _client = nullptr;
+    CapsSpec                   _caps;
+    Features                   _features;
+    QString                    _multicastService;
+    QMap<QString, QStringList> _extraServerInfo; // XEP-0128, XEP-0157
 
     std::list<ServiceQuery> _serviceQueries; // a storage of pending requests as result of `queryService` call
-    ServicesState _servicesListState = ST_NotQueried;
-    QMap<QString,ServiceInfo> _servicesInfo;  // all the diso#info requests for services of this server jid=>(state,info)
+    ServicesState           _servicesListState = ST_NotQueried;
+    QMap<QString, ServiceInfo>
+        _servicesInfo; // all the diso#info requests for services of this server jid=>(state,info)
 
     bool _featuresRequested;
     bool _hasPEP;
diff --git a/src/xmpp/xmpp-im/xmpp_status.h b/src/xmpp/xmpp-im/xmpp_status.h
index f3caa4a8..3208f425 100644
--- a/src/xmpp/xmpp-im/xmpp_status.h
+++ b/src/xmpp/xmpp-im/xmpp_status.h
@@ -68,13 +68,7 @@ class CapsSpec {
 
 class Status {
 public:
-    enum Type { Offline,
-                Online,
-                Away,
-                XA,
-                DND,
-                Invisible,
-                FFC };
+    enum Type { Offline, Online, Away, XA, DND, Invisible, FFC };
 
     Status(const QString &show = QString(), const QString &status = QString(), int priority = 0, bool available = true);
     Status(Type type, const QString &status = QString(), int priority = 0);
diff --git a/src/xmpp/xmpp-im/xmpp_subsets.cpp b/src/xmpp/xmpp-im/xmpp_subsets.cpp
index 5bdf0831..5925bbab 100644
--- a/src/xmpp/xmpp-im/xmpp_subsets.cpp
+++ b/src/xmpp/xmpp-im/xmpp_subsets.cpp
@@ -25,21 +25,20 @@ using namespace XMPP;
 
 static QLatin1String xmlns_ns_rsm("http://jabber.org/protocol/rsm");
 
-class SubsetsClientManager::Private
-{
+class SubsetsClientManager::Private {
 public:
     enum QueryType { None, Count, First, Last, Next, Previous, Index };
     struct {
         QueryType type;
-        int max;
-        int index;
+        int       max;
+        int       index;
     } query;
     struct {
-        int  count;
-        int  index;
-        bool first;
-        bool last;
-        int  itemsCount;
+        int     count;
+        int     index;
+        bool    first;
+        bool    last;
+        int     itemsCount;
         QString firstId;
         QString lastId;
     } result;
@@ -47,12 +46,12 @@ class SubsetsClientManager::Private
 
     void resetResult()
     {
-        result.count = -1;
-        result.index = -1;
-        result.first = false;
-        result.last  = false;
+        result.count      = -1;
+        result.index      = -1;
+        result.first      = false;
+        result.last       = false;
         result.itemsCount = 0;
-        valid        = false;
+        valid             = false;
     }
 
     QDomElement mainElement(QDomDocument *doc)
@@ -86,16 +85,16 @@ class SubsetsClientManager::Private
 
     bool updateFromElement(const QDomElement &el)
     {
-        valid = true;
-        bool ok = false;
-        QDomElement e = el.firstChildElement(QLatin1String("count"));
+        valid          = true;
+        bool        ok = false;
+        QDomElement e  = el.firstChildElement(QLatin1String("count"));
         if (!e.isNull())
             result.count = tagContent(e).toInt(&ok);
         if (!ok || result.count < 0)
             result.count = -1;
 
         result.index = -1;
-        e = el.firstChildElement(QLatin1String("first"));
+        e            = el.firstChildElement(QLatin1String("first"));
         if (!e.isNull()) {
             result.firstId = tagContent(e);
             if (result.firstId.isEmpty())
@@ -103,8 +102,7 @@ class SubsetsClientManager::Private
             int i = e.attribute(QLatin1String("index")).toInt(&ok);
             if (ok && i >= 0)
                 result.index = i;
-        }
-        else
+        } else
             result.firstId = "";
 
         e = el.firstChildElement(QLatin1String("last"));
@@ -112,18 +110,17 @@ class SubsetsClientManager::Private
             result.lastId = tagContent(e);
             if (result.lastId.isEmpty())
                 valid = false;
-        }
-        else
+        } else
             result.lastId = "";
 
         if (result.firstId.isEmpty() != result.lastId.isEmpty())
             valid = false;
 
-        result.first = query.type == First || result.index == 0 ||
-                (result.itemsCount == 0 && result.index == -1 && (query.type == Last || query.type == Previous));
-        result.last = query.type == Last ||
-                (result.index != -1 && result.count != -1 && result.count - result.itemsCount <= result.index) ||
-                (result.itemsCount == 0 && result.index == -1 && (query.type == First || query.type == Next));
+        result.first = query.type == First || result.index == 0
+            || (result.itemsCount == 0 && result.index == -1 && (query.type == Last || query.type == Previous));
+        result.last = query.type == Last
+            || (result.index != -1 && result.count != -1 && result.count - result.itemsCount <= result.index)
+            || (result.itemsCount == 0 && result.index == -1 && (query.type == First || query.type == Next));
         if (result.firstId.isEmpty() && result.lastId.isEmpty()) {
             switch (query.type) {
             case Previous:
@@ -147,10 +144,7 @@ SubsetsClientManager::SubsetsClientManager()
     reset();
 }
 
-SubsetsClientManager::~SubsetsClientManager()
-{
-    delete d;
-}
+SubsetsClientManager::~SubsetsClientManager() { delete d; }
 
 void SubsetsClientManager::reset()
 {
@@ -162,30 +156,15 @@ void SubsetsClientManager::reset()
     d->resetResult();
 }
 
-bool SubsetsClientManager::isValid() const
-{
-    return d->valid;
-}
+bool SubsetsClientManager::isValid() const { return d->valid; }
 
-bool SubsetsClientManager::isFirst() const
-{
-    return d->result.first;
-}
+bool SubsetsClientManager::isFirst() const { return d->result.first; }
 
-bool SubsetsClientManager::isLast() const
-{
-    return d->result.last;
-}
+bool SubsetsClientManager::isLast() const { return d->result.last; }
 
-int SubsetsClientManager::count() const
-{
-    return d->result.count;
-}
+int SubsetsClientManager::count() const { return d->result.count; }
 
-void SubsetsClientManager::setMax(int max)
-{
-    d->query.max = max;
-}
+void SubsetsClientManager::setMax(int max) { d->query.max = max; }
 
 QDomElement SubsetsClientManager::findElement(const QDomElement &el, bool child)
 {
diff --git a/src/xmpp/xmpp-im/xmpp_subsets.h b/src/xmpp/xmpp-im/xmpp_subsets.h
index d1f9b8e5..4e6bbd24 100644
--- a/src/xmpp/xmpp-im/xmpp_subsets.h
+++ b/src/xmpp/xmpp-im/xmpp_subsets.h
@@ -23,34 +23,33 @@
 #include <QDomDocument>
 
 namespace XMPP {
-    class SubsetsClientManager
-    {
-    public:
-        SubsetsClientManager();
-        ~SubsetsClientManager();
-
-        void reset();
-        bool isValid() const;
-        bool isFirst() const;
-        bool isLast() const;
-        int  count() const;
-        void setMax(int max);
-
-        void getCount();
-        void getFirst();
-        void getNext();
-        void getLast();
-        void getPrevious();
-        void getByIndex();
-
-        static QDomElement findElement(const QDomElement &el, bool child);
-        bool updateFromElement(const QDomElement &el, int itemsCount);
-        QDomElement makeQueryElement(QDomDocument *doc) const;
-
-    private:
-        class Private;
-        Private *d;
-    };
+class SubsetsClientManager {
+public:
+    SubsetsClientManager();
+    ~SubsetsClientManager();
+
+    void reset();
+    bool isValid() const;
+    bool isFirst() const;
+    bool isLast() const;
+    int  count() const;
+    void setMax(int max);
+
+    void getCount();
+    void getFirst();
+    void getNext();
+    void getLast();
+    void getPrevious();
+    void getByIndex();
+
+    static QDomElement findElement(const QDomElement &el, bool child);
+    bool               updateFromElement(const QDomElement &el, int itemsCount);
+    QDomElement        makeQueryElement(QDomDocument *doc) const;
+
+private:
+    class Private;
+    Private *d;
+};
 } // namespace XMPP
 
 #endif // XMPP_SUBSETS_H
diff --git a/src/xmpp/xmpp-im/xmpp_task.cpp b/src/xmpp/xmpp-im/xmpp_task.cpp
index 8b65987d..aa86cc9f 100644
--- a/src/xmpp/xmpp-im/xmpp_task.cpp
+++ b/src/xmpp/xmpp-im/xmpp_task.cpp
@@ -28,36 +28,33 @@
 
 using namespace XMPP;
 
-class Task::TaskPrivate
-{
+class Task::TaskPrivate {
 public:
     TaskPrivate() = default;
 
-    QString id;
-    bool success = false;
-    int statusCode = 0;
-    QString statusString;
+    QString             id;
+    bool                success    = false;
+    int                 statusCode = 0;
+    QString             statusString;
     XMPP::Stanza::Error error;
-    Client *client = nullptr;
-    bool insig = false;
-    bool deleteme = false;
-    bool autoDelete = false;
-    bool done = false;
-    int timeout = 0;
+    Client *            client     = nullptr;
+    bool                insig      = false;
+    bool                deleteme   = false;
+    bool                autoDelete = false;
+    bool                done       = false;
+    int                 timeout    = 0;
 };
 
-Task::Task(Task *parent)
-:QObject(parent)
+Task::Task(Task *parent) : QObject(parent)
 {
     init();
 
     d->client = parent->client();
-    d->id = client()->genUniqueId();
+    d->id     = client()->genUniqueId();
     connect(d->client, SIGNAL(disconnected()), SLOT(clientDisconnected()));
 }
 
-Task::Task(Client *parent, bool)
-:QObject(nullptr)
+Task::Task(Client *parent, bool) : QObject(nullptr)
 {
     init();
 
@@ -65,71 +62,38 @@ Task::Task(Client *parent, bool)
     connect(d->client, SIGNAL(disconnected()), SLOT(clientDisconnected()));
 }
 
-Task::~Task()
-{
-    delete d;
-}
+Task::~Task() { delete d; }
 
 void Task::init()
 {
-    d = new TaskPrivate;
-    d->success = false;
-    d->insig = false;
-    d->deleteme = false;
+    d             = new TaskPrivate;
+    d->success    = false;
+    d->insig      = false;
+    d->deleteme   = false;
     d->autoDelete = false;
-    d->done = false;
-    d->timeout = DEFAULT_TIMEOUT;
+    d->done       = false;
+    d->timeout    = DEFAULT_TIMEOUT;
 }
 
-Task *Task::parent() const
-{
-    return (Task *)QObject::parent();
-}
+Task *Task::parent() const { return (Task *)QObject::parent(); }
 
-Client *Task::client() const
-{
-    return d->client;
-}
+Client *Task::client() const { return d->client; }
 
-QDomDocument *Task::doc() const
-{
-    return client()->doc();
-}
+QDomDocument *Task::doc() const { return client()->doc(); }
 
-QString Task::id() const
-{
-    return d->id;
-}
+QString Task::id() const { return d->id; }
 
-bool Task::success() const
-{
-    return d->success;
-}
+bool Task::success() const { return d->success; }
 
-int Task::statusCode() const
-{
-    return d->statusCode;
-}
+int Task::statusCode() const { return d->statusCode; }
 
-const QString & Task::statusString() const
-{
-    return d->statusString;
-}
+const QString &Task::statusString() const { return d->statusString; }
 
-const Stanza::Error &Task::error() const
-{
-    return d->error;
-}
+const Stanza::Error &Task::error() const { return d->error; }
 
-void Task::setTimeout(int seconds) const
-{
-    d->timeout = seconds;
-}
+void Task::setTimeout(int seconds) const { d->timeout = seconds; }
 
-int Task::timeout()
-{
-    return d->timeout;
-}
+int Task::timeout() { return d->timeout; }
 
 void Task::go(bool autoDelete)
 {
@@ -140,8 +104,7 @@ void Task::go(bool autoDelete)
         if (autoDelete) {
             deleteLater();
         }
-    }
-    else {
+    } else {
         onGo();
         if (d->timeout) {
             QTimer::singleShot(d->timeout * 1000, this, SLOT(timeoutFinished()));
@@ -155,13 +118,13 @@ bool Task::take(const QDomElement &x)
 
     // pass along the xml
     Task *t;
-    for(QObjectList::ConstIterator it = p.begin(); it != p.end(); ++it) {
+    for (QObjectList::ConstIterator it = p.begin(); it != p.end(); ++it) {
         QObject *obj = *it;
-        if(!obj->inherits("XMPP::Task"))
+        if (!obj->inherits("XMPP::Task"))
             continue;
 
-        t = static_cast<Task*>(obj);
-        if(t->take(x)) // don't check for done here. it will hurt server tasks
+        t = static_cast<Task *>(obj);
+        if (t->take(x)) // don't check for done here. it will hurt server tasks
             return true;
     }
 
@@ -170,23 +133,21 @@ bool Task::take(const QDomElement &x)
 
 void Task::safeDelete()
 {
-    if(d->deleteme)
+    if (d->deleteme)
         return;
 
     d->deleteme = true;
-    if(!d->insig)
+    if (!d->insig)
         deleteLater();
 }
 
-void Task::onGo()
-{
-}
+void Task::onGo() {}
 
 void Task::onDisconnect()
 {
-    if(!d->done) {
-        d->success = false;
-        d->statusCode = ErrDisc;
+    if (!d->done) {
+        d->success      = false;
+        d->statusCode   = ErrDisc;
         d->statusString = tr("Disconnected");
 
         // delay this so that tasks that react don't block the shutdown
@@ -198,24 +159,21 @@ void Task::onDisconnect()
 
 void Task::onTimeout()
 {
-    if(!d->done) {
-        d->success = false;
-        d->statusCode = ErrTimeout;
+    if (!d->done) {
+        d->success      = false;
+        d->statusCode   = ErrTimeout;
         d->statusString = tr("Request timed out");
         done();
     }
 }
 
-void Task::send(const QDomElement &x)
-{
-    client()->send(x);
-}
+void Task::send(const QDomElement &x) { client()->send(x); }
 
 void Task::setSuccess(int code, const QString &str)
 {
-    if(!d->done) {
-        d->success = true;
-        d->statusCode = code;
+    if (!d->done) {
+        d->success      = true;
+        d->statusCode   = code;
         d->statusString = str;
         done();
     }
@@ -223,17 +181,17 @@ void Task::setSuccess(int code, const QString &str)
 
 void Task::setError(const QDomElement &e)
 {
-    if(!d->done) {
+    if (!d->done) {
         d->success = false;
 
         QDomElement tag = e.firstChildElement("error");
-        if(tag.isNull())
+        if (tag.isNull())
             return;
 
         XMPP::Stanza::Error err;
         err.fromXml(tag, d->client->streamBaseNS());
-        d->error = err;
-        d->statusCode = err.code();
+        d->error        = err;
+        d->statusCode   = err.code();
         d->statusString = err.toString();
         done();
     }
@@ -241,9 +199,9 @@ void Task::setError(const QDomElement &e)
 
 void Task::setError(int code, const QString &str)
 {
-    if(!d->done) {
-        d->success = false;
-        d->statusCode = code;
+    if (!d->done) {
+        d->success      = false;
+        d->statusCode   = code;
         d->statusString = str;
         done();
     }
@@ -251,25 +209,22 @@ void Task::setError(int code, const QString &str)
 
 void Task::done()
 {
-    if(d->done || d->insig)
+    if (d->done || d->insig)
         return;
     d->done = true;
 
-    if(d->autoDelete)
+    if (d->autoDelete)
         d->deleteme = true;
 
     d->insig = true;
     emit finished();
     d->insig = false;
 
-    if(d->deleteme)
+    if (d->deleteme)
         deleteLater();
 }
 
-void Task::clientDisconnected()
-{
-    onDisconnect();
-}
+void Task::clientDisconnected() { onDisconnect(); }
 
 void Task::timeoutFinished()
 {
@@ -287,10 +242,7 @@ void Task::debug(const char *fmt, ...)
     debug(str);
 }
 
-void Task::debug(const QString &str)
-{
-    client()->debug(QString("%1: ").arg(metaObject()->className()) + str);
-}
+void Task::debug(const QString &str) { client()->debug(QString("%1: ").arg(metaObject()->className()) + str); }
 
 /**
  * \brief verifiys a stanza is a IQ reply for this task
@@ -304,42 +256,42 @@ void Task::debug(const QString &str)
  * \param id the id of the send IQ
  * \param xmlns the expected namespace if the reply (if non empty)
  * \return true if it's a valid reply
-*/
+ */
 
 bool Task::iqVerify(const QDomElement &x, const Jid &to, const QString &id, const QString &xmlns)
 {
-    if(x.tagName() != QStringLiteral("iq"))
+    if (x.tagName() != QStringLiteral("iq"))
         return false;
 
     Jid from(x.attribute(QStringLiteral("from")));
-    Jid local = client()->jid();
+    Jid local  = client()->jid();
     Jid server = client()->host();
 
     // empty 'from' ?
-    if(from.isEmpty()) {
+    if (from.isEmpty()) {
         // allowed if we are querying the server
-        if(!to.isEmpty() && !to.compare(server))
+        if (!to.isEmpty() && !to.compare(server))
             return false;
     }
     // from ourself?
-    else if(from.compare(local, false) || from.compare(local.domain(),false)) {
+    else if (from.compare(local, false) || from.compare(local.domain(), false)) {
         // allowed if we are querying ourself or the server
-        if(!to.isEmpty() && !to.compare(local, false) && !to.compare(server))
+        if (!to.isEmpty() && !to.compare(local, false) && !to.compare(server))
             return false;
     }
     // from anywhere else?
     else {
-        if(!from.compare(to))
+        if (!from.compare(to))
             return false;
     }
 
-    if(!id.isEmpty()) {
-        if(x.attribute(QStringLiteral("id")) != id)
+    if (!id.isEmpty()) {
+        if (x.attribute(QStringLiteral("id")) != id)
             return false;
     }
 
-    if(!xmlns.isEmpty()) {
-        if(queryNS(x) != xmlns)
+    if (!xmlns.isEmpty()) {
+        if (queryNS(x) != xmlns)
             return false;
     }
 
diff --git a/src/xmpp/xmpp-im/xmpp_task.h b/src/xmpp/xmpp-im/xmpp_task.h
index fcdb9533..a760892b 100644
--- a/src/xmpp/xmpp-im/xmpp_task.h
+++ b/src/xmpp/xmpp-im/xmpp_task.h
@@ -29,61 +29,60 @@ class QDomDocument;
 class QDomElement;
 
 namespace XMPP {
-    class Client;
-    class Jid;
-
-    class Task : public QObject
-    {
-        Q_OBJECT
-    public:
-        enum { ErrDisc, ErrTimeout };
-        Task(Task *parent);
-        Task(Client *, bool isRoot);
-        virtual ~Task();
-
-        Task *parent() const;
-        Client *client() const;
-        QDomDocument *doc() const;
-        QString id() const;
-
-        bool success() const;
-        int statusCode() const;
-        const QString & statusString() const;
-        const Stanza::Error & error() const;
-
-        void setTimeout(int seconds) const;
-        int timeout();
-
-        void go(bool autoDelete=false);
-        virtual bool take(const QDomElement &);
-        void safeDelete();
-
-    signals:
-        void finished();
-
-    protected:
-        virtual void onGo();
-        virtual void onDisconnect();
-        virtual void onTimeout();
-        void send(const QDomElement &);
-        void setSuccess(int code=0, const QString &str="");
-        void setError(const QDomElement &);
-        void setError(int code=0, const QString &str="");
-        void debug(const char *, ...);
-        void debug(const QString &);
-        bool iqVerify(const QDomElement &x, const Jid &to, const QString &id, const QString &xmlns="");
-
-    private slots:
-        void clientDisconnected();
-        void timeoutFinished();
-        void done();
-
-    private:
-        void init();
-
-        class TaskPrivate;
-        TaskPrivate *d;
-    };
+class Client;
+class Jid;
+
+class Task : public QObject {
+    Q_OBJECT
+public:
+    enum { ErrDisc, ErrTimeout };
+    Task(Task *parent);
+    Task(Client *, bool isRoot);
+    virtual ~Task();
+
+    Task *        parent() const;
+    Client *      client() const;
+    QDomDocument *doc() const;
+    QString       id() const;
+
+    bool                 success() const;
+    int                  statusCode() const;
+    const QString &      statusString() const;
+    const Stanza::Error &error() const;
+
+    void setTimeout(int seconds) const;
+    int  timeout();
+
+    void         go(bool autoDelete = false);
+    virtual bool take(const QDomElement &);
+    void         safeDelete();
+
+signals:
+    void finished();
+
+protected:
+    virtual void onGo();
+    virtual void onDisconnect();
+    virtual void onTimeout();
+    void         send(const QDomElement &);
+    void         setSuccess(int code = 0, const QString &str = "");
+    void         setError(const QDomElement &);
+    void         setError(int code = 0, const QString &str = "");
+    void         debug(const char *, ...);
+    void         debug(const QString &);
+    bool         iqVerify(const QDomElement &x, const Jid &to, const QString &id, const QString &xmlns = "");
+
+private slots:
+    void clientDisconnected();
+    void timeoutFinished();
+    void done();
+
+private:
+    void init();
+
+    class TaskPrivate;
+    TaskPrivate *d;
+};
 } // namespace XMPP
 
 #endif // XMPP_TASK_H
diff --git a/src/xmpp/xmpp-im/xmpp_tasks.cpp b/src/xmpp/xmpp-im/xmpp_tasks.cpp
index 104a0de5..d0980794 100644
--- a/src/xmpp/xmpp-im/xmpp_tasks.cpp
+++ b/src/xmpp/xmpp-im/xmpp_tasks.cpp
@@ -93,10 +93,7 @@ static Roster xmlReadRoster(const QDomElement &q, bool push)
 //
 #include "protocol.h"
 
-JT_Session::JT_Session(Task *parent) :
-    Task(parent)
-{
-}
+JT_Session::JT_Session(Task *parent) : Task(parent) {}
 
 void JT_Session::onGo()
 {
@@ -139,8 +136,7 @@ class JT_Register::Private {
     int   type;
 };
 
-JT_Register::JT_Register(Task *parent) :
-    Task(parent)
+JT_Register::JT_Register(Task *parent) : Task(parent)
 {
     d             = new Private;
     d->type       = -1;
@@ -148,10 +144,7 @@ JT_Register::JT_Register(Task *parent) :
     d->registered = false;
 }
 
-JT_Register::~JT_Register()
-{
-    delete d;
-}
+JT_Register::~JT_Register() { delete d; }
 
 void JT_Register::reg(const QString &user, const QString &pass)
 {
@@ -227,30 +220,15 @@ void JT_Register::setForm(const Jid &to, const XData &xdata)
     query.appendChild(xdata.toXml(doc(), true));
 }
 
-const Form &JT_Register::form() const
-{
-    return d->form;
-}
+const Form &JT_Register::form() const { return d->form; }
 
-bool JT_Register::hasXData() const
-{
-    return d->hasXData;
-}
+bool JT_Register::hasXData() const { return d->hasXData; }
 
-const XData &JT_Register::xdata() const
-{
-    return d->xdata;
-}
+const XData &JT_Register::xdata() const { return d->xdata; }
 
-bool JT_Register::isRegistered() const
-{
-    return d->registered;
-}
+bool JT_Register::isRegistered() const { return d->registered; }
 
-void JT_Register::onGo()
-{
-    send(iq);
-}
+void JT_Register::onGo() { send(iq); }
 
 bool JT_Register::take(const QDomElement &x)
 {
@@ -308,8 +286,7 @@ class JT_UnRegister::Private {
     JT_Register *jt_reg = nullptr;
 };
 
-JT_UnRegister::JT_UnRegister(Task *parent) :
-    Task(parent)
+JT_UnRegister::JT_UnRegister(Task *parent) : Task(parent)
 {
     d         = new Private;
     d->jt_reg = nullptr;
@@ -321,10 +298,7 @@ JT_UnRegister::~JT_UnRegister()
     delete d;
 }
 
-void JT_UnRegister::unreg(const Jid &j)
-{
-    d->j = j;
-}
+void JT_UnRegister::unreg(const Jid &j) { d->j = j; }
 
 void JT_UnRegister::onGo()
 {
@@ -370,22 +344,18 @@ class JT_Roster::Private {
     QList<QDomElement> itemList;
 };
 
-JT_Roster::JT_Roster(Task *parent) :
-    Task(parent)
+JT_Roster::JT_Roster(Task *parent) : Task(parent)
 {
     type = -1;
     d    = new Private;
 }
 
-JT_Roster::~JT_Roster()
-{
-    delete d;
-}
+JT_Roster::~JT_Roster() { delete d; }
 
 void JT_Roster::get()
 {
     type = 0;
-    //to = client()->host();
+    // to = client()->host();
     iq                = createIQ(doc(), "get", to.full(), id());
     QDomElement query = doc()->createElementNS("jabber:iq:roster", "query");
     iq.appendChild(query);
@@ -394,7 +364,7 @@ void JT_Roster::get()
 void JT_Roster::set(const Jid &jid, const QString &name, const QStringList &groups)
 {
     type = 1;
-    //to = client()->host();
+    // to = client()->host();
     QDomElement item = doc()->createElement("item");
     item.setAttribute("jid", jid.full());
     if (!name.isEmpty())
@@ -407,7 +377,7 @@ void JT_Roster::set(const Jid &jid, const QString &name, const QStringList &grou
 void JT_Roster::remove(const Jid &jid)
 {
     type = 1;
-    //to = client()->host();
+    // to = client()->host();
     QDomElement item = doc()->createElement("item");
     item.setAttribute("jid", jid.full());
     item.setAttribute("subscription", "remove");
@@ -419,7 +389,7 @@ void JT_Roster::onGo()
     if (type == 0)
         send(iq);
     else if (type == 1) {
-        //to = client()->host();
+        // to = client()->host();
         iq                = createIQ(doc(), "set", to.full(), id());
         QDomElement query = doc()->createElementNS("jabber:iq:roster", "query");
         iq.appendChild(query);
@@ -429,10 +399,7 @@ void JT_Roster::onGo()
     }
 }
 
-const Roster &JT_Roster::roster() const
-{
-    return d->roster;
-}
+const Roster &JT_Roster::roster() const { return d->roster; }
 
 QString JT_Roster::toString() const
 {
@@ -508,14 +475,9 @@ bool JT_Roster::take(const QDomElement &x)
 //----------------------------------------------------------------------------
 // JT_PushRoster
 //----------------------------------------------------------------------------
-JT_PushRoster::JT_PushRoster(Task *parent) :
-    Task(parent)
-{
-}
+JT_PushRoster::JT_PushRoster(Task *parent) : Task(parent) {}
 
-JT_PushRoster::~JT_PushRoster()
-{
-}
+JT_PushRoster::~JT_PushRoster() {}
 
 bool JT_PushRoster::take(const QDomElement &e)
 {
@@ -535,14 +497,9 @@ bool JT_PushRoster::take(const QDomElement &e)
 //----------------------------------------------------------------------------
 // JT_Presence
 //----------------------------------------------------------------------------
-JT_Presence::JT_Presence(Task *parent) :
-    Task(parent)
-{
-}
+JT_Presence::JT_Presence(Task *parent) : Task(parent) {}
 
-JT_Presence::~JT_Presence()
-{
-}
+JT_Presence::~JT_Presence() {}
 
 void JT_Presence::pres(const Status &s)
 {
@@ -626,7 +583,9 @@ void JT_Presence::sub(const Jid &to, const QString &subType, const QString &nick
     tag = doc()->createElement("presence");
     tag.setAttribute("to", to.full());
     tag.setAttribute("type", subType);
-    if (!nick.isEmpty() && (subType == QLatin1String("subscribe") || subType == QLatin1String("subscribed") || subType == QLatin1String("unsubscribe") || subType == QLatin1String("unsubscribed"))) {
+    if (!nick.isEmpty()
+        && (subType == QLatin1String("subscribe") || subType == QLatin1String("subscribed")
+            || subType == QLatin1String("unsubscribe") || subType == QLatin1String("unsubscribed"))) {
         QDomElement nick_tag = textTagNS(doc(), "http://jabber.org/protocol/nick", "nick", nick);
         tag.appendChild(nick_tag);
     }
@@ -650,14 +609,9 @@ void JT_Presence::onGo()
 //----------------------------------------------------------------------------
 // JT_PushPresence
 //----------------------------------------------------------------------------
-JT_PushPresence::JT_PushPresence(Task *parent) :
-    Task(parent)
-{
-}
+JT_PushPresence::JT_PushPresence(Task *parent) : Task(parent) {}
 
-JT_PushPresence::~JT_PushPresence()
-{
-}
+JT_PushPresence::~JT_PushPresence() {}
 
 bool JT_PushPresence::take(const QDomElement &e)
 {
@@ -676,7 +630,8 @@ bool JT_PushPresence::take(const QDomElement &e)
             int     code = 0;
             getErrorFromElement(e, client()->stream().baseNS(), &code, &str);
             p.setError(code, str);
-        } else if (type == QLatin1String("subscribe") || type == QLatin1String("subscribed") || type == QLatin1String("unsubscribe") || type == QLatin1String("unsubscribed")) {
+        } else if (type == QLatin1String("subscribe") || type == QLatin1String("subscribed")
+                   || type == QLatin1String("unsubscribe") || type == QLatin1String("unsubscribed")) {
             QString     nick;
             QDomElement tag = e.firstChildElement("nick");
             if (!tag.isNull() && tag.namespaceURI() == "http://jabber.org/protocol/nick") {
@@ -740,7 +695,8 @@ bool JT_PushPresence::take(const QDomElement &e)
             QDomElement t;
             t = i.firstChildElement("photo");
             if (!t.isNull())
-                p.setPhotoHash(QByteArray::fromHex(tagContent(t).toLatin1())); // if hash is empty this may mean photo removal
+                p.setPhotoHash(
+                    QByteArray::fromHex(tagContent(t).toLatin1())); // if hash is empty this may mean photo removal
             // else vcard.hasPhotoHash() returns false and that's mean user is not yet ready to advertise his image
         } else if (i.tagName() == "x" && i.namespaceURI() == "http://jabber.org/protocol/muc#user") {
             for (QDomNode muc_n = i.firstChild(); !muc_n.isNull(); muc_n = muc_n.nextSibling()) {
@@ -792,9 +748,9 @@ static QDomElement oldStyleNS(const QDomElement &e)
 
     QDomElement i;
     int         x;
-    //if(noShowNS)
+    // if(noShowNS)
     i = e.ownerDocument().createElement(e.tagName());
-    //else
+    // else
     //    i = e.ownerDocument().createElementNS(e.namespaceURI(), e.tagName());
 
     // copy attributes
@@ -817,22 +773,19 @@ static QDomElement oldStyleNS(const QDomElement &e)
     return i;
 }
 
-JT_Message::JT_Message(Task *parent, Message &msg) :
-    Task(parent), m(msg)
+JT_Message::JT_Message(Task *parent, Message &msg) : Task(parent), m(msg)
 {
     if (msg.id().isEmpty())
         msg.setId(id());
 }
 
-JT_Message::~JT_Message()
-{
-}
+JT_Message::~JT_Message() {}
 
 void JT_Message::onGo()
 {
 
     Stanza      s = m.toStanza(&(client()->stream()));
-    QDomElement e = s.element(); //oldStyleNS(s.element());
+    QDomElement e = s.element(); // oldStyleNS(s.element());
 
     auto encryptionHandler = client()->encryptionHandler();
     bool wasEncrypted      = encryptionHandler && encryptionHandler->encryptMessageElement(e);
@@ -853,17 +806,13 @@ class JT_PushMessage::Private {
     EncryptionHandler *m_encryptionHandler;
 };
 
-JT_PushMessage::JT_PushMessage(Task *parent, EncryptionHandler *encryptionHandler) :
-    Task(parent)
+JT_PushMessage::JT_PushMessage(Task *parent, EncryptionHandler *encryptionHandler) : Task(parent)
 {
     d                      = new Private;
     d->m_encryptionHandler = encryptionHandler;
 }
 
-JT_PushMessage::~JT_PushMessage()
-{
-    delete d;
-}
+JT_PushMessage::~JT_PushMessage() { delete d; }
 
 bool JT_PushMessage::take(const QDomElement &e)
 {
@@ -872,7 +821,8 @@ bool JT_PushMessage::take(const QDomElement &e)
 
     QDomElement e1 = e;
 
-    bool wasEncrypted = d->m_encryptionHandler != nullptr && d->m_encryptionHandler->decryptMessageElement(e1) && !e1.isNull();
+    bool wasEncrypted
+        = d->m_encryptionHandler != nullptr && d->m_encryptionHandler->decryptMessageElement(e1) && !e1.isNull();
     if (wasEncrypted && e1.isNull()) {
         // The message was processed, but has to be discarded for some reason
         return true;
@@ -912,13 +862,13 @@ bool JT_PushMessage::take(const QDomElement &e)
 
     Stanza s = client()->stream().createStanza(addCorrectNS(forward.isNull() ? e1 : forward));
     if (s.isNull()) {
-        //printf("take: bad stanza??\n");
+        // printf("take: bad stanza??\n");
         return false;
     }
 
     Message m;
     if (!m.fromStanza(s, client()->manualTimeZoneOffset(), client()->timeZoneOffset())) {
-        //printf("bad message\n");
+        // printf("bad message\n");
         return false;
     }
     if (!forward.isNull()) {
@@ -943,17 +893,13 @@ class JT_VCard::Private {
     VCard       vcard;
 };
 
-JT_VCard::JT_VCard(Task *parent) :
-    Task(parent)
+JT_VCard::JT_VCard(Task *parent) : Task(parent)
 {
     type = -1;
     d    = new Private;
 }
 
-JT_VCard::~JT_VCard()
-{
-    delete d;
-}
+JT_VCard::~JT_VCard() { delete d; }
 
 void JT_VCard::get(const Jid &_jid)
 {
@@ -964,15 +910,9 @@ void JT_VCard::get(const Jid &_jid)
     d->iq.appendChild(v);
 }
 
-const Jid &JT_VCard::jid() const
-{
-    return d->jid;
-}
+const Jid &JT_VCard::jid() const { return d->jid; }
 
-const VCard &JT_VCard::vcard() const
-{
-    return d->vcard;
-}
+const VCard &JT_VCard::vcard() const { return d->vcard; }
 
 void JT_VCard::set(const VCard &card)
 {
@@ -993,10 +933,7 @@ void JT_VCard::set(const Jid &j, const VCard &card, bool isTarget)
     d->iq.appendChild(card.toXml(doc()));
 }
 
-void JT_VCard::onGo()
-{
-    send(d->iq);
-}
+void JT_VCard::onGo() { send(d->iq); }
 
 bool JT_VCard::take(const QDomElement &x)
 {
@@ -1049,17 +986,13 @@ class JT_Search::Private {
     QList<SearchResult> resultList;
 };
 
-JT_Search::JT_Search(Task *parent) :
-    Task(parent)
+JT_Search::JT_Search(Task *parent) : Task(parent)
 {
     d    = new Private;
     type = -1;
 }
 
-JT_Search::~JT_Search()
-{
-    delete d;
-}
+JT_Search::~JT_Search() { delete d; }
 
 void JT_Search::get(const Jid &jid)
 {
@@ -1105,30 +1038,15 @@ void JT_Search::set(const Jid &jid, const XData &form)
     query.appendChild(form.toXml(doc(), true));
 }
 
-const Form &JT_Search::form() const
-{
-    return d->form;
-}
+const Form &JT_Search::form() const { return d->form; }
 
-const QList<SearchResult> &JT_Search::results() const
-{
-    return d->resultList;
-}
+const QList<SearchResult> &JT_Search::results() const { return d->resultList; }
 
-bool JT_Search::hasXData() const
-{
-    return d->hasXData;
-}
+bool JT_Search::hasXData() const { return d->hasXData; }
 
-const XData &JT_Search::xdata() const
-{
-    return d->xdata;
-}
+const XData &JT_Search::xdata() const { return d->xdata; }
 
-void JT_Search::onGo()
-{
-    send(iq);
-}
+void JT_Search::onGo() { send(iq); }
 
 bool JT_Search::take(const QDomElement &x)
 {
@@ -1207,10 +1125,7 @@ bool JT_Search::take(const QDomElement &x)
 //----------------------------------------------------------------------------
 // JT_ClientVersion
 //----------------------------------------------------------------------------
-JT_ClientVersion::JT_ClientVersion(Task *parent) :
-    Task(parent)
-{
-}
+JT_ClientVersion::JT_ClientVersion(Task *parent) : Task(parent) {}
 
 void JT_ClientVersion::get(const Jid &jid)
 {
@@ -1220,10 +1135,7 @@ void JT_ClientVersion::get(const Jid &jid)
     iq.appendChild(query);
 }
 
-void JT_ClientVersion::onGo()
-{
-    send(iq);
-}
+void JT_ClientVersion::onGo() { send(iq); }
 
 bool JT_ClientVersion::take(const QDomElement &x)
 {
@@ -1251,41 +1163,23 @@ bool JT_ClientVersion::take(const QDomElement &x)
     return true;
 }
 
-const Jid &JT_ClientVersion::jid() const
-{
-    return j;
-}
+const Jid &JT_ClientVersion::jid() const { return j; }
 
-const QString &JT_ClientVersion::name() const
-{
-    return v_name;
-}
+const QString &JT_ClientVersion::name() const { return v_name; }
 
-const QString &JT_ClientVersion::version() const
-{
-    return v_ver;
-}
+const QString &JT_ClientVersion::version() const { return v_ver; }
 
-const QString &JT_ClientVersion::os() const
-{
-    return v_os;
-}
+const QString &JT_ClientVersion::os() const { return v_os; }
 
 //----------------------------------------------------------------------------
 // JT_EntityTime
 //----------------------------------------------------------------------------
-JT_EntityTime::JT_EntityTime(Task *parent) :
-    Task(parent)
-{
-}
+JT_EntityTime::JT_EntityTime(Task *parent) : Task(parent) {}
 
 /**
  * \brief Queried entity's JID.
  */
-const Jid &JT_EntityTime::jid() const
-{
-    return j;
-}
+const Jid &JT_EntityTime::jid() const { return j; }
 
 /**
  * \brief Prepares the task to get information from JID.
@@ -1298,10 +1192,7 @@ void JT_EntityTime::get(const Jid &jid)
     iq.appendChild(time);
 }
 
-void JT_EntityTime::onGo()
-{
-    send(iq);
-}
+void JT_EntityTime::onGo() { send(iq); }
 
 bool JT_EntityTime::take(const QDomElement &x)
 {
@@ -1336,27 +1227,16 @@ bool JT_EntityTime::take(const QDomElement &x)
     return true;
 }
 
-const QDateTime &JT_EntityTime::dateTime() const
-{
-    return utc;
-}
+const QDateTime &JT_EntityTime::dateTime() const { return utc; }
 
-int JT_EntityTime::timezoneOffset() const
-{
-    return tzo;
-}
+int JT_EntityTime::timezoneOffset() const { return tzo; }
 
 //----------------------------------------------------------------------------
 // JT_ServInfo
 //----------------------------------------------------------------------------
-JT_ServInfo::JT_ServInfo(Task *parent) :
-    Task(parent)
-{
-}
+JT_ServInfo::JT_ServInfo(Task *parent) : Task(parent) {}
 
-JT_ServInfo::~JT_ServInfo()
-{
-}
+JT_ServInfo::~JT_ServInfo() {}
 
 bool JT_ServInfo::take(const QDomElement &e)
 {
@@ -1436,11 +1316,7 @@ bool JT_ServInfo::take(const QDomElement &e)
 //----------------------------------------------------------------------------
 // JT_Gateway
 //----------------------------------------------------------------------------
-JT_Gateway::JT_Gateway(Task *parent) :
-    Task(parent)
-{
-    type = -1;
-}
+JT_Gateway::JT_Gateway(Task *parent) : Task(parent) { type = -1; }
 
 void JT_Gateway::get(const Jid &jid)
 {
@@ -1462,30 +1338,15 @@ void JT_Gateway::set(const Jid &jid, const QString &prompt)
     query.appendChild(textTag(doc(), "prompt", v_prompt));
 }
 
-void JT_Gateway::onGo()
-{
-    send(iq);
-}
+void JT_Gateway::onGo() { send(iq); }
 
-Jid JT_Gateway::jid() const
-{
-    return v_jid;
-}
+Jid JT_Gateway::jid() const { return v_jid; }
 
-QString JT_Gateway::desc() const
-{
-    return v_desc;
-}
+QString JT_Gateway::desc() const { return v_desc; }
 
-QString JT_Gateway::prompt() const
-{
-    return v_prompt;
-}
+QString JT_Gateway::prompt() const { return v_prompt; }
 
-Jid JT_Gateway::translatedJid() const
-{
-    return v_translatedJid;
-}
+Jid JT_Gateway::translatedJid() const { return v_translatedJid; }
 
 bool JT_Gateway::take(const QDomElement &x)
 {
@@ -1540,21 +1401,11 @@ class JT_DiscoItems::Private {
     QDomElement subsetsEl;
 };
 
-JT_DiscoItems::JT_DiscoItems(Task *parent) :
-    Task(parent)
-{
-    d = new Private;
-}
+JT_DiscoItems::JT_DiscoItems(Task *parent) : Task(parent) { d = new Private; }
 
-JT_DiscoItems::~JT_DiscoItems()
-{
-    delete d;
-}
+JT_DiscoItems::~JT_DiscoItems() { delete d; }
 
-void JT_DiscoItems::get(const DiscoItem &item)
-{
-    get(item.jid(), item.node());
-}
+void JT_DiscoItems::get(const DiscoItem &item) { get(item.jid(), item.node()); }
 
 void JT_DiscoItems::get(const Jid &j, const QString &node)
 {
@@ -1575,10 +1426,7 @@ void JT_DiscoItems::get(const Jid &j, const QString &node)
     d->iq.appendChild(query);
 }
 
-const DiscoList &JT_DiscoItems::items() const
-{
-    return d->items;
-}
+const DiscoList &JT_DiscoItems::items() const { return d->items; }
 
 void JT_DiscoItems::includeSubsetQuery(const SubsetsClientManager &subsets)
 {
@@ -1590,10 +1438,7 @@ bool JT_DiscoItems::extractSubsetInfo(SubsetsClientManager &subsets)
     return d->subsetsEl.isNull() ? false : subsets.updateFromElement(d->subsetsEl, d->items.count());
 }
 
-void JT_DiscoItems::onGo()
-{
-    send(d->iq);
-}
+void JT_DiscoItems::onGo() { send(d->iq); }
 
 bool JT_DiscoItems::take(const QDomElement &x)
 {
@@ -1642,16 +1487,9 @@ class JT_DiscoPublish::Private {
     DiscoList   list;
 };
 
-JT_DiscoPublish::JT_DiscoPublish(Task *parent) :
-    Task(parent)
-{
-    d = new Private;
-}
+JT_DiscoPublish::JT_DiscoPublish(Task *parent) : Task(parent) { d = new Private; }
 
-JT_DiscoPublish::~JT_DiscoPublish()
-{
-    delete d;
-}
+JT_DiscoPublish::~JT_DiscoPublish() { delete d; }
 
 void JT_DiscoPublish::set(const Jid &j, const DiscoList &list)
 {
@@ -1662,7 +1500,7 @@ void JT_DiscoPublish::set(const Jid &j, const DiscoList &list)
     QDomElement query = doc()->createElementNS("http://jabber.org/protocol/disco#items", "query");
 
     // FIXME: unsure about this
-    //if ( !node.isEmpty() )
+    // if ( !node.isEmpty() )
     //    query.setAttribute("node", node);
 
     DiscoList::ConstIterator it = list.begin();
@@ -1682,10 +1520,7 @@ void JT_DiscoPublish::set(const Jid &j, const DiscoList &list)
     d->iq.appendChild(query);
 }
 
-void JT_DiscoPublish::onGo()
-{
-    send(d->iq);
-}
+void JT_DiscoPublish::onGo() { send(d->iq); }
 
 bool JT_DiscoPublish::take(const QDomElement &x)
 {
@@ -1704,10 +1539,7 @@ bool JT_DiscoPublish::take(const QDomElement &x)
 // ---------------------------------------------------------
 // JT_BoBServer
 // ---------------------------------------------------------
-JT_BoBServer::JT_BoBServer(Task *parent) :
-    Task(parent)
-{
-}
+JT_BoBServer::JT_BoBServer(Task *parent) : Task(parent) {}
 
 bool JT_BoBServer::take(const QDomElement &e)
 {
@@ -1719,10 +1551,8 @@ bool JT_BoBServer::take(const QDomElement &e)
         QDomElement iq;
         BoBData     bd = client()->bobManager()->bobData(data.attribute("cid"));
         if (bd.isNull()) {
-            iq = createIQ(client()->doc(), "error",
-                          e.attribute("from"), e.attribute("id"));
-            Stanza::Error error(Stanza::Error::Cancel,
-                                Stanza::Error::ItemNotFound);
+            iq = createIQ(client()->doc(), "error", e.attribute("from"), e.attribute("id"));
+            Stanza::Error error(Stanza::Error::Cancel, Stanza::Error::ItemNotFound);
             iq.appendChild(error.toXml(*doc(), client()->stream().baseNS()));
         } else {
             iq = createIQ(doc(), "result", e.attribute("from"), e.attribute("id"));
@@ -1747,16 +1577,9 @@ class JT_BitsOfBinary::Private {
     BoBData     data;
 };
 
-JT_BitsOfBinary::JT_BitsOfBinary(Task *parent) :
-    Task(parent)
-{
-    d = new Private;
-}
+JT_BitsOfBinary::JT_BitsOfBinary(Task *parent) : Task(parent) { d = new Private; }
 
-JT_BitsOfBinary::~JT_BitsOfBinary()
-{
-    delete d;
-}
+JT_BitsOfBinary::~JT_BitsOfBinary() { delete d; }
 
 void JT_BitsOfBinary::get(const Jid &j, const QString &cid)
 {
@@ -1803,10 +1626,7 @@ bool JT_BitsOfBinary::take(const QDomElement &x)
     return true;
 }
 
-BoBData &JT_BitsOfBinary::data()
-{
-    return d->data;
-}
+BoBData &JT_BitsOfBinary::data() { return d->data; }
 
 //----------------------------------------------------------------------------
 // JT_PongServer
@@ -1816,10 +1636,7 @@ BoBData &JT_BitsOfBinary::data()
  * \brief Answers XMPP Pings
  */
 
-JT_PongServer::JT_PongServer(Task *parent) :
-    Task(parent)
-{
-}
+JT_PongServer::JT_PongServer(Task *parent) : Task(parent) {}
 
 bool JT_PongServer::take(const QDomElement &e)
 {
@@ -1844,16 +1661,9 @@ class JT_CaptchaChallenger::Private {
     CaptchaChallenge challenge;
 };
 
-JT_CaptchaChallenger::JT_CaptchaChallenger(Task *parent) :
-    Task(parent),
-    d(new Private)
-{
-}
+JT_CaptchaChallenger::JT_CaptchaChallenger(Task *parent) : Task(parent), d(new Private) {}
 
-JT_CaptchaChallenger::~JT_CaptchaChallenger()
-{
-    delete d;
-}
+JT_CaptchaChallenger::~JT_CaptchaChallenger() { delete d; }
 
 void JT_CaptchaChallenger::set(const Jid &j, const CaptchaChallenge &c)
 {
@@ -1894,7 +1704,8 @@ void JT_CaptchaChallenger::onGo()
 
 bool JT_CaptchaChallenger::take(const QDomElement &x)
 {
-    if (x.tagName() == "message" && x.attribute("id") == id() && Jid(x.attribute("from")) == d->j && !x.firstChildElement("error").isNull()) {
+    if (x.tagName() == "message" && x.attribute("id") == id() && Jid(x.attribute("from")) == d->j
+        && !x.firstChildElement("error").isNull()) {
         setError(x);
         return true;
     }
@@ -1902,7 +1713,10 @@ bool JT_CaptchaChallenger::take(const QDomElement &x)
     XDomNodeList nl;
     XData        xd;
     QString      rid = x.attribute("id");
-    if (rid.isEmpty() || x.tagName() != "iq" || Jid(x.attribute("from")) != d->j || x.attribute("type") != "set" || (nl = childElementsByTagNameNS(x, "urn:xmpp:captcha", "captcha")).isEmpty() || (nl = childElementsByTagNameNS(nl.item(0).toElement(), "jabber:x:data", "x")).isEmpty() || (xd.fromXml(nl.item(0).toElement()), xd.getField("challenge").value().value(0) != id())) {
+    if (rid.isEmpty() || x.tagName() != "iq" || Jid(x.attribute("from")) != d->j || x.attribute("type") != "set"
+        || (nl = childElementsByTagNameNS(x, "urn:xmpp:captcha", "captcha")).isEmpty()
+        || (nl = childElementsByTagNameNS(nl.item(0).toElement(), "jabber:x:data", "x")).isEmpty()
+        || (xd.fromXml(nl.item(0).toElement()), xd.getField("challenge").value().value(0) != id())) {
         return false;
     }
 
@@ -1931,24 +1745,17 @@ bool JT_CaptchaChallenger::take(const QDomElement &x)
 //---------------------------------------------------------------------------
 // JT_CaptchaSender
 //---------------------------------------------------------------------------
-JT_CaptchaSender::JT_CaptchaSender(Task *parent) :
-    Task(parent)
-{
-}
+JT_CaptchaSender::JT_CaptchaSender(Task *parent) : Task(parent) {}
 
 void JT_CaptchaSender::set(const Jid &j, const XData &xd)
 {
     to = j;
 
     iq = createIQ(doc(), "set", to.full(), id());
-    iq.appendChild(doc()->createElementNS("urn:xmpp:captcha", "captcha"))
-        .appendChild(xd.toXml(doc(), true));
+    iq.appendChild(doc()->createElementNS("urn:xmpp:captcha", "captcha")).appendChild(xd.toXml(doc(), true));
 }
 
-void JT_CaptchaSender::onGo()
-{
-    send(iq);
-}
+void JT_CaptchaSender::onGo() { send(iq); }
 
 bool JT_CaptchaSender::take(const QDomElement &x)
 {
@@ -1968,10 +1775,7 @@ bool JT_CaptchaSender::take(const QDomElement &x)
 //----------------------------------------------------------------------------
 // JT_MessageCarbons
 //----------------------------------------------------------------------------
-JT_MessageCarbons::JT_MessageCarbons(Task *parent) :
-    Task(parent)
-{
-}
+JT_MessageCarbons::JT_MessageCarbons(Task *parent) : Task(parent) {}
 
 void JT_MessageCarbons::enable()
 {
diff --git a/src/xmpp/xmpp-im/xmpp_tasks.h b/src/xmpp/xmpp-im/xmpp_tasks.h
index d183ff42..11f8a6b3 100644
--- a/src/xmpp/xmpp-im/xmpp_tasks.h
+++ b/src/xmpp/xmpp-im/xmpp_tasks.h
@@ -31,444 +31,421 @@
 #include <QtXml>
 
 namespace XMPP {
-    class BoBData;
-    class CaptchaChallenge;
-    class Roster;
-    class Status;
-
-    class JT_Register : public Task
-    {
-        Q_OBJECT
-    public:
-        JT_Register(Task *parent);
-        ~JT_Register();
-
-        // OLd style registration
-        void reg(const QString &user, const QString &pass);
-
-        void changepw(const QString &pass);
-        void unreg(const Jid &j="");
-
-        const Form & form() const;
-        bool hasXData() const;
-        const XData& xdata() const;
-        bool isRegistered() const;
-        void getForm(const Jid &);
-        void setForm(const Form &);
-        void setForm(const Jid&, const XData &);
-
-        void onGo();
-        bool take(const QDomElement &);
-
-    private:
-        QDomElement iq;
-        Jid to;
-
-        class Private;
-        Private *d = nullptr;
-    };
-
-    class JT_UnRegister : public Task
-    {
-        Q_OBJECT
-    public:
-        JT_UnRegister(Task *parent);
-        ~JT_UnRegister();
-
-        void unreg(const Jid &);
-
-        void onGo();
-
-    private slots:
-        void getFormFinished();
-        void unregFinished();
-
-    private:
-        class Private;
-        Private *d = nullptr;
-    };
-
-    class JT_Roster : public Task
-    {
-        Q_OBJECT
-    public:
-        JT_Roster(Task *parent);
-        ~JT_Roster();
-
-        void get();
-        void set(const Jid &, const QString &name, const QStringList &groups);
-        void remove(const Jid &);
-
-        const Roster & roster() const;
-
-        QString toString() const;
-        bool fromString(const QString &);
-
-        void onGo();
-        bool take(const QDomElement &x);
-
-    private:
-        int type;
-        QDomElement iq;
-        Jid to;
-
-        class Private;
-        Private *d = nullptr;
-    };
-
-    class JT_PushRoster : public Task
-    {
-        Q_OBJECT
-    public:
-        JT_PushRoster(Task *parent);
-        ~JT_PushRoster();
-
-        bool take(const QDomElement &);
-
-    signals:
-        void roster(const Roster &);
-
-    private:
-        class Private;
-        Private *d = nullptr;
-    };
-
-    class JT_Presence : public Task
-    {
-        Q_OBJECT
-    public:
-        JT_Presence(Task *parent);
-        ~JT_Presence();
-
-        void pres(const Status &);
-        void pres(const Jid &, const Status &);
-        void sub(const Jid &, const QString &subType, const QString& nick = QString());
-        void probe(const Jid &to);
-
-        void onGo();
-
-    private:
-        QDomElement tag;
-        int type = -1;
-
-        class Private;
-        Private *d = nullptr;
-    };
-
-    class JT_PushPresence : public Task
-    {
-        Q_OBJECT
-    public:
-        JT_PushPresence(Task *parent);
-        ~JT_PushPresence();
-
-        bool take(const QDomElement &);
-
-    signals:
-        void presence(const Jid &, const Status &);
-        void subscription(const Jid &, const QString &, const QString&);
-
-    private:
-        class Private;
-        Private *d = nullptr;
-    };
-
-    class JT_Session : public Task
-    {
-    public:
-        JT_Session(Task *parent);
-        void onGo();
-        bool take(const QDomElement&);
-    };
-
-    class JT_Message : public Task
-    {
-        Q_OBJECT
-    public:
-        JT_Message(Task *parent, Message &);
-        ~JT_Message();
-
-        void onGo();
-
-    private:
-        Message m;
-
-        class Private;
-        Private *d = nullptr;
-    };
-
-    class JT_PushMessage : public Task
-    {
-        Q_OBJECT
-    public:
-        JT_PushMessage(Task *parent, EncryptionHandler *encryptionHandler = nullptr);
-        ~JT_PushMessage();
-
-        bool take(const QDomElement &);
-
-    signals:
-        void message(const Message &);
-
-    private:
-        class Private;
-        Private *d = nullptr;
-    };
-
-    class JT_VCard : public Task
-    {
-        Q_OBJECT
-    public:
-        JT_VCard(Task *parent);
-        ~JT_VCard();
-
-        void get(const Jid &);
-        void set(const VCard &);
-        void set(const Jid &, const VCard &, bool isTarget = false);
-
-        const Jid & jid() const;
-        const VCard  & vcard() const;
-
-        void onGo();
-        bool take(const QDomElement &x);
-
-    private:
-        int type;
-
-        class Private;
-        Private *d = nullptr;
-    };
-
-    class JT_Search : public Task
-    {
-        Q_OBJECT
-    public:
-        JT_Search(Task *parent);
-        ~JT_Search();
-
-        const Form & form() const;
-        const QList<SearchResult> & results() const;
-
-        bool hasXData() const;
-        const XData & xdata() const;
-
-        void get(const Jid &);
-        void set(const Form &);
-        void set(const Jid &, const XData &);
-
-        void onGo();
-        bool take(const QDomElement &x);
-
-    private:
-        QDomElement iq;
-        int type;
-
-        class Private;
-        Private *d = nullptr;
-    };
-
-    class JT_ClientVersion : public Task
-    {
-        Q_OBJECT
-    public:
-        JT_ClientVersion(Task *);
-
-        void get(const Jid &);
-        void onGo();
-        bool take(const QDomElement &);
-
-        const Jid & jid() const;
-        const QString & name() const;
-        const QString & version() const;
-        const QString & os() const;
-
-    private:
-        QDomElement iq;
-
-        Jid j;
-        QString v_name, v_ver, v_os;
-    };
-
-    class JT_EntityTime : public Task
-    {
-    public:
-        JT_EntityTime(Task*);
-
-        void onGo();
-        bool take(const QDomElement &);
-        void get(const XMPP::Jid &j);
-        const XMPP::Jid & jid() const;
-
-        const QDateTime & dateTime() const;
-        int timezoneOffset() const;
-
-    private:
-        QDomElement iq;
-        XMPP::Jid j;
-        QDateTime utc;
-        int tzo = 0;
-    };
-
-    class JT_ServInfo : public Task
-    {
-        Q_OBJECT
-    public:
-        JT_ServInfo(Task *);
-        ~JT_ServInfo();
-
-        bool take(const QDomElement &);
-    };
-
-    class JT_Gateway : public Task
-    {
-        Q_OBJECT
-    public:
-        JT_Gateway(Task *);
-
-        void get(const Jid &);
-        void set(const Jid &, const QString &prompt);
-        void onGo();
-        bool take(const QDomElement &);
-
-        Jid jid() const;
-
-        QString desc() const;
-        QString prompt() const;
-        Jid translatedJid() const;
-
-    private:
-        QDomElement iq;
-
-        int type;
-        Jid v_jid;
-        Jid v_translatedJid;
-        QString v_prompt, v_desc;
-    };
-
-    class JT_DiscoItems : public Task
-    {
-        Q_OBJECT
-    public:
-        JT_DiscoItems(Task *);
-        ~JT_DiscoItems();
-
-        void get(const Jid &, const QString &node = QString());
-        void get(const DiscoItem &);
-
-        const DiscoList &items() const;
-
-        void includeSubsetQuery(const SubsetsClientManager &);
-        bool extractSubsetInfo(SubsetsClientManager &);
-
-        void onGo();
-        bool take(const QDomElement &);
-
-    private:
-        class Private;
-        Private *d = nullptr;
-    };
-
-    class JT_DiscoPublish : public Task
-    {
-        Q_OBJECT
-    public:
-        JT_DiscoPublish(Task *);
-        ~JT_DiscoPublish();
-
-        void set(const Jid &, const DiscoList &);
-
-        void onGo();
-        bool take(const QDomElement &);
-
-    private:
-        class Private;
-        Private *d = nullptr;
-    };
-
-    class JT_BoBServer : public Task
-    {
-        Q_OBJECT
-
-    public:
-        JT_BoBServer(Task *parent);
-        bool take(const QDomElement &);
-    };
-
-    class JT_BitsOfBinary : public Task
-    {
-        Q_OBJECT
-    public:
-        JT_BitsOfBinary(Task *);
-        ~JT_BitsOfBinary();
-
-        void get(const Jid &, const QString &);
-
-        void onGo();
-        bool take(const QDomElement &);
-        BoBData &data();
-
-    private:
-        class Private;
-        Private *d = nullptr;
-    };
-
-    class JT_PongServer : public Task
-    {
-        Q_OBJECT
-    public:
-        JT_PongServer(Task *);
-        bool take(const QDomElement &);
-    };
-
-    class JT_MessageCarbons : public Task
-    {
-        Q_OBJECT
-
-    public:
-        JT_MessageCarbons(Task *parent);
-        void enable();
-        void disable();
-
-        void onGo();
-        bool take(const QDomElement &e);
-
-    private:
-        QDomElement _iq;
-    };
-
-    class JT_CaptchaChallenger : public Task
-    {
-        Q_OBJECT
-    public:
-        const static int CaptchaValidTimeout = 120;
-
-        JT_CaptchaChallenger(Task *);
-        ~JT_CaptchaChallenger();
-
-        void set(const Jid &, const CaptchaChallenge &);
-
-        void onGo();
-        bool take(const QDomElement &);
-
-    private:
-        class Private;
-        Private *d = nullptr;
-    };
-
-    class JT_CaptchaSender : public Task
-    {
-        Q_OBJECT
-    public:
-        JT_CaptchaSender(Task *);
-
-        void set(const Jid &, const XData &);
-
-        void onGo();
-        bool take(const QDomElement &);
-
-    private:
-        Jid to;
-        QDomElement iq;
-    };
+class BoBData;
+class CaptchaChallenge;
+class Roster;
+class Status;
+
+class JT_Register : public Task {
+    Q_OBJECT
+public:
+    JT_Register(Task *parent);
+    ~JT_Register();
+
+    // OLd style registration
+    void reg(const QString &user, const QString &pass);
+
+    void changepw(const QString &pass);
+    void unreg(const Jid &j = "");
+
+    const Form & form() const;
+    bool         hasXData() const;
+    const XData &xdata() const;
+    bool         isRegistered() const;
+    void         getForm(const Jid &);
+    void         setForm(const Form &);
+    void         setForm(const Jid &, const XData &);
+
+    void onGo();
+    bool take(const QDomElement &);
+
+private:
+    QDomElement iq;
+    Jid         to;
+
+    class Private;
+    Private *d = nullptr;
+};
+
+class JT_UnRegister : public Task {
+    Q_OBJECT
+public:
+    JT_UnRegister(Task *parent);
+    ~JT_UnRegister();
+
+    void unreg(const Jid &);
+
+    void onGo();
+
+private slots:
+    void getFormFinished();
+    void unregFinished();
+
+private:
+    class Private;
+    Private *d = nullptr;
+};
+
+class JT_Roster : public Task {
+    Q_OBJECT
+public:
+    JT_Roster(Task *parent);
+    ~JT_Roster();
+
+    void get();
+    void set(const Jid &, const QString &name, const QStringList &groups);
+    void remove(const Jid &);
+
+    const Roster &roster() const;
+
+    QString toString() const;
+    bool    fromString(const QString &);
+
+    void onGo();
+    bool take(const QDomElement &x);
+
+private:
+    int         type;
+    QDomElement iq;
+    Jid         to;
+
+    class Private;
+    Private *d = nullptr;
+};
+
+class JT_PushRoster : public Task {
+    Q_OBJECT
+public:
+    JT_PushRoster(Task *parent);
+    ~JT_PushRoster();
+
+    bool take(const QDomElement &);
+
+signals:
+    void roster(const Roster &);
+
+private:
+    class Private;
+    Private *d = nullptr;
+};
+
+class JT_Presence : public Task {
+    Q_OBJECT
+public:
+    JT_Presence(Task *parent);
+    ~JT_Presence();
+
+    void pres(const Status &);
+    void pres(const Jid &, const Status &);
+    void sub(const Jid &, const QString &subType, const QString &nick = QString());
+    void probe(const Jid &to);
+
+    void onGo();
+
+private:
+    QDomElement tag;
+    int         type = -1;
+
+    class Private;
+    Private *d = nullptr;
+};
+
+class JT_PushPresence : public Task {
+    Q_OBJECT
+public:
+    JT_PushPresence(Task *parent);
+    ~JT_PushPresence();
+
+    bool take(const QDomElement &);
+
+signals:
+    void presence(const Jid &, const Status &);
+    void subscription(const Jid &, const QString &, const QString &);
+
+private:
+    class Private;
+    Private *d = nullptr;
+};
+
+class JT_Session : public Task {
+public:
+    JT_Session(Task *parent);
+    void onGo();
+    bool take(const QDomElement &);
+};
+
+class JT_Message : public Task {
+    Q_OBJECT
+public:
+    JT_Message(Task *parent, Message &);
+    ~JT_Message();
+
+    void onGo();
+
+private:
+    Message m;
+
+    class Private;
+    Private *d = nullptr;
+};
+
+class JT_PushMessage : public Task {
+    Q_OBJECT
+public:
+    JT_PushMessage(Task *parent, EncryptionHandler *encryptionHandler = nullptr);
+    ~JT_PushMessage();
+
+    bool take(const QDomElement &);
+
+signals:
+    void message(const Message &);
+
+private:
+    class Private;
+    Private *d = nullptr;
+};
+
+class JT_VCard : public Task {
+    Q_OBJECT
+public:
+    JT_VCard(Task *parent);
+    ~JT_VCard();
+
+    void get(const Jid &);
+    void set(const VCard &);
+    void set(const Jid &, const VCard &, bool isTarget = false);
+
+    const Jid &  jid() const;
+    const VCard &vcard() const;
+
+    void onGo();
+    bool take(const QDomElement &x);
+
+private:
+    int type;
+
+    class Private;
+    Private *d = nullptr;
+};
+
+class JT_Search : public Task {
+    Q_OBJECT
+public:
+    JT_Search(Task *parent);
+    ~JT_Search();
+
+    const Form &               form() const;
+    const QList<SearchResult> &results() const;
+
+    bool         hasXData() const;
+    const XData &xdata() const;
+
+    void get(const Jid &);
+    void set(const Form &);
+    void set(const Jid &, const XData &);
+
+    void onGo();
+    bool take(const QDomElement &x);
+
+private:
+    QDomElement iq;
+    int         type;
+
+    class Private;
+    Private *d = nullptr;
+};
+
+class JT_ClientVersion : public Task {
+    Q_OBJECT
+public:
+    JT_ClientVersion(Task *);
+
+    void get(const Jid &);
+    void onGo();
+    bool take(const QDomElement &);
+
+    const Jid &    jid() const;
+    const QString &name() const;
+    const QString &version() const;
+    const QString &os() const;
+
+private:
+    QDomElement iq;
+
+    Jid     j;
+    QString v_name, v_ver, v_os;
+};
+
+class JT_EntityTime : public Task {
+public:
+    JT_EntityTime(Task *);
+
+    void             onGo();
+    bool             take(const QDomElement &);
+    void             get(const XMPP::Jid &j);
+    const XMPP::Jid &jid() const;
+
+    const QDateTime &dateTime() const;
+    int              timezoneOffset() const;
+
+private:
+    QDomElement iq;
+    XMPP::Jid   j;
+    QDateTime   utc;
+    int         tzo = 0;
+};
+
+class JT_ServInfo : public Task {
+    Q_OBJECT
+public:
+    JT_ServInfo(Task *);
+    ~JT_ServInfo();
+
+    bool take(const QDomElement &);
+};
+
+class JT_Gateway : public Task {
+    Q_OBJECT
+public:
+    JT_Gateway(Task *);
+
+    void get(const Jid &);
+    void set(const Jid &, const QString &prompt);
+    void onGo();
+    bool take(const QDomElement &);
+
+    Jid jid() const;
+
+    QString desc() const;
+    QString prompt() const;
+    Jid     translatedJid() const;
+
+private:
+    QDomElement iq;
+
+    int     type;
+    Jid     v_jid;
+    Jid     v_translatedJid;
+    QString v_prompt, v_desc;
+};
+
+class JT_DiscoItems : public Task {
+    Q_OBJECT
+public:
+    JT_DiscoItems(Task *);
+    ~JT_DiscoItems();
+
+    void get(const Jid &, const QString &node = QString());
+    void get(const DiscoItem &);
+
+    const DiscoList &items() const;
+
+    void includeSubsetQuery(const SubsetsClientManager &);
+    bool extractSubsetInfo(SubsetsClientManager &);
+
+    void onGo();
+    bool take(const QDomElement &);
+
+private:
+    class Private;
+    Private *d = nullptr;
+};
+
+class JT_DiscoPublish : public Task {
+    Q_OBJECT
+public:
+    JT_DiscoPublish(Task *);
+    ~JT_DiscoPublish();
+
+    void set(const Jid &, const DiscoList &);
+
+    void onGo();
+    bool take(const QDomElement &);
+
+private:
+    class Private;
+    Private *d = nullptr;
+};
+
+class JT_BoBServer : public Task {
+    Q_OBJECT
+
+public:
+    JT_BoBServer(Task *parent);
+    bool take(const QDomElement &);
+};
+
+class JT_BitsOfBinary : public Task {
+    Q_OBJECT
+public:
+    JT_BitsOfBinary(Task *);
+    ~JT_BitsOfBinary();
+
+    void get(const Jid &, const QString &);
+
+    void     onGo();
+    bool     take(const QDomElement &);
+    BoBData &data();
+
+private:
+    class Private;
+    Private *d = nullptr;
+};
+
+class JT_PongServer : public Task {
+    Q_OBJECT
+public:
+    JT_PongServer(Task *);
+    bool take(const QDomElement &);
+};
+
+class JT_MessageCarbons : public Task {
+    Q_OBJECT
+
+public:
+    JT_MessageCarbons(Task *parent);
+    void enable();
+    void disable();
+
+    void onGo();
+    bool take(const QDomElement &e);
+
+private:
+    QDomElement _iq;
+};
+
+class JT_CaptchaChallenger : public Task {
+    Q_OBJECT
+public:
+    const static int CaptchaValidTimeout = 120;
+
+    JT_CaptchaChallenger(Task *);
+    ~JT_CaptchaChallenger();
+
+    void set(const Jid &, const CaptchaChallenge &);
+
+    void onGo();
+    bool take(const QDomElement &);
+
+private:
+    class Private;
+    Private *d = nullptr;
+};
+
+class JT_CaptchaSender : public Task {
+    Q_OBJECT
+public:
+    JT_CaptchaSender(Task *);
+
+    void set(const Jid &, const XData &);
+
+    void onGo();
+    bool take(const QDomElement &);
+
+private:
+    Jid         to;
+    QDomElement iq;
+};
 } // namespace XMPP
 
 #endif // XMPP_TASKS_H
diff --git a/src/xmpp/xmpp-im/xmpp_thumbs.h b/src/xmpp/xmpp-im/xmpp_thumbs.h
index bf913c01..918aea28 100644
--- a/src/xmpp/xmpp-im/xmpp_thumbs.h
+++ b/src/xmpp/xmpp-im/xmpp_thumbs.h
@@ -26,27 +26,27 @@
 #define XMPP_THUMBS_NS "urn:xmpp:thumbs:1" // TODO make nsdb.cpp/h with static declarations of all ns
 
 namespace XMPP {
-    class Thumbnail
+class Thumbnail {
+public:
+    inline Thumbnail() : width(0), height(0) {}
+    // data - for outgoing it's actual image data. for incoming - cid
+    inline Thumbnail(const QByteArray &data, const QString &mimeType = QString(), quint32 width = 0,
+                     quint32 height = 0) :
+        data(data),
+        mimeType(mimeType), width(width), height(height)
     {
-    public:
-        inline Thumbnail() : width(0), height(0) {}
-        // data - for outgoing it's actual image data. for incoming - cid
-        inline Thumbnail(const QByteArray &data,
-                           const QString &mimeType = QString(),
-                           quint32 width = 0, quint32 height = 0) :
-            data(data), mimeType(mimeType),
-            width(width), height(height) { }
-        Thumbnail(const QDomElement &el);
+    }
+    Thumbnail(const QDomElement &el);
 
-        inline bool isValid() const { return uri.isValid(); }
-        QDomElement toXml(QDomDocument *doc) const;
+    inline bool isValid() const { return uri.isValid(); }
+    QDomElement toXml(QDomDocument *doc) const;
 
-        QUrl       uri;
-        QByteArray data;
-        QString    mimeType;
-        quint32    width;
-        quint32    height;
-    };
+    QUrl       uri;
+    QByteArray data;
+    QString    mimeType;
+    quint32    width;
+    quint32    height;
+};
 } // namespace XMPP
 
 #endif // XMPP_THUMBS_H
diff --git a/src/xmpp/xmpp-im/xmpp_url.h b/src/xmpp/xmpp-im/xmpp_url.h
index 0f90b421..bee60f2a 100644
--- a/src/xmpp/xmpp-im/xmpp_url.h
+++ b/src/xmpp/xmpp-im/xmpp_url.h
@@ -22,26 +22,25 @@
 class QString;
 
 namespace XMPP {
-    class Url
-    {
-    public:
-        Url(const QString &url="", const QString &desc="");
-        Url(const Url &);
-        Url & operator=(const Url &);
-        ~Url();
-
-        QString url() const;
-        QString desc() const;
-
-        void setUrl(const QString &);
-        void setDesc(const QString &);
-
-    private:
-        class Private;
-        Private *d;
-    };
-
-    typedef QList<Url> UrlList;
+class Url {
+public:
+    Url(const QString &url = "", const QString &desc = "");
+    Url(const Url &);
+    Url &operator=(const Url &);
+    ~Url();
+
+    QString url() const;
+    QString desc() const;
+
+    void setUrl(const QString &);
+    void setDesc(const QString &);
+
+private:
+    class Private;
+    Private *d;
+};
+
+typedef QList<Url> UrlList;
 } // namespace XMPP
 
 #endif // XMPP_URL
diff --git a/src/xmpp/xmpp-im/xmpp_vcard.cpp b/src/xmpp/xmpp-im/xmpp_vcard.cpp
index d28a4c7a..cb36e270 100644
--- a/src/xmpp/xmpp-im/xmpp_vcard.cpp
+++ b/src/xmpp/xmpp-im/xmpp_vcard.cpp
@@ -37,24 +37,24 @@ using namespace XMLHelper;
 //----------------------------------------------------------------------------
 QString openedImage2type(QIODevice *dev)
 {
-    QString format = QImageReader::imageFormat( dev ).toUpper();
+    QString format = QImageReader::imageFormat(dev).toUpper();
 
     // TODO: add more formats: PBM PGM PPM XBM XPM
-    if ( format == QLatin1String("PNG") || format == QLatin1String("PSIPNG") ) // PsiPNG in normal case
+    if (format == QLatin1String("PNG") || format == QLatin1String("PSIPNG")) // PsiPNG in normal case
         return QLatin1String("image/png");
-    if ( format == QLatin1String("MNG") )
+    if (format == QLatin1String("MNG"))
         return QLatin1String("video/x-mng");
-    if ( format == QLatin1String("GIF") )
+    if (format == QLatin1String("GIF"))
         return QLatin1String("image/gif");
-    if ( format == QLatin1String("JPEG"))
+    if (format == QLatin1String("JPEG"))
         return QLatin1String("image/jpeg");
-    if ( format == QLatin1String("BMP") )
+    if (format == QLatin1String("BMP"))
         return QLatin1String("image/bmp");
-    if ( format == QLatin1String("WEBP") )
+    if (format == QLatin1String("WEBP"))
         return QLatin1String("image/webp");
-    if ( format == QLatin1String("XPM") )
+    if (format == QLatin1String("XPM"))
         return QLatin1String("image/x-xpm");
-    if ( format == QLatin1String("SVG") )
+    if (format == QLatin1String("SVG"))
         return QLatin1String("image/svg+xml");
 
     return QString();
@@ -77,7 +77,7 @@ static QString foldString(const QString &s)
     QString ret;
 
     for (int i = 0; i < (int)s.length(); i++) {
-        if ( !(i % 75) )
+        if (!(i % 75))
             ret += '\n';
         ret += s[i];
     }
@@ -85,14 +85,13 @@ static QString foldString(const QString &s)
     return ret;
 }
 
-class VCardPrivate : public QSharedData
-{
+class VCardPrivate : public QSharedData {
 public:
     VCardPrivate();
     ~VCardPrivate();
 
     // do we need copy constructor?
-    //VCardPrivate(const VCardPrivate &other) :
+    // VCardPrivate(const VCardPrivate &other) :
     //    QSharedData(other), version(other.version), fullName(other.fullName) { qDebug("Copy VCardPrivate"); }
 
     QString version;
@@ -101,411 +100,374 @@ class VCardPrivate : public QSharedData
     QString nickName;
 
     QByteArray photo;
-    QString photoURI;
+    QString    photoURI;
 
-    QString bday;
+    QString            bday;
     VCard::AddressList addressList;
-    VCard::LabelList labelList;
-    VCard::PhoneList phoneList;
-    VCard::EmailList emailList;
-    QString jid;
-    QString mailer;
-    QString timezone;
-    VCard::Geo geo;
-    QString title;
-    QString role;
+    VCard::LabelList   labelList;
+    VCard::PhoneList   phoneList;
+    VCard::EmailList   emailList;
+    QString            jid;
+    QString            mailer;
+    QString            timezone;
+    VCard::Geo         geo;
+    QString            title;
+    QString            role;
 
     QByteArray logo;
-    QString logoURI;
+    QString    logoURI;
 
     QSharedPointer<VCard> agent;
-    QString agentURI;
+    QString               agentURI;
 
-    VCard::Org org;
+    VCard::Org  org;
     QStringList categories;
-    QString note;
-    QString prodId;
-    QString rev;
-    QString sortString;
+    QString     note;
+    QString     prodId;
+    QString     rev;
+    QString     sortString;
 
     QByteArray sound;
-    QString soundURI, soundPhonetic;
+    QString    soundURI, soundPhonetic;
 
-    QString uid;
-    QString url;
-    QString desc;
+    QString             uid;
+    QString             url;
+    QString             desc;
     VCard::PrivacyClass privacyClass;
-    QByteArray key;
+    QByteArray          key;
 
     bool isEmpty() const;
 };
 
-VCardPrivate::VCardPrivate()
-{
-    privacyClass = VCard::pcNone;
-}
+VCardPrivate::VCardPrivate() { privacyClass = VCard::pcNone; }
 
-VCardPrivate::~VCardPrivate()
-{
-
-}
+VCardPrivate::~VCardPrivate() {}
 
 bool VCardPrivate::isEmpty() const
 {
-    if (    !version.isEmpty() ||
-        !fullName.isEmpty() ||
-        !familyName.isEmpty() || !givenName.isEmpty() || !middleName.isEmpty() || !prefixName.isEmpty() || !suffixName.isEmpty() ||
-        !nickName.isEmpty() ||
-        !photo.isEmpty() || !photoURI.isEmpty() ||
-        !bday.isEmpty() ||
-        !addressList.isEmpty() ||
-        !labelList.isEmpty() ||
-        !phoneList.isEmpty() ||
-        !emailList.isEmpty() ||
-        !jid.isEmpty() ||
-        !mailer.isEmpty() ||
-        !timezone.isEmpty() ||
-        !geo.lat.isEmpty() || !geo.lon.isEmpty() ||
-        !title.isEmpty() ||
-        !role.isEmpty() ||
-        !logo.isEmpty() || !logoURI.isEmpty() ||
-        (agent && !agent->isEmpty()) || !agentURI.isEmpty() ||
-        !org.name.isEmpty() || !org.unit.isEmpty() ||
-        !categories.isEmpty() ||
-        !note.isEmpty() ||
-        !prodId.isEmpty() ||
-        !rev.isEmpty() ||
-        !sortString.isEmpty() ||
-        !sound.isEmpty() || !soundURI.isEmpty() || !soundPhonetic.isEmpty() ||
-        !uid.isEmpty() ||
-        !url.isEmpty() ||
-        !desc.isEmpty() ||
-        (privacyClass != VCard::pcNone) ||
-        !key.isEmpty() )
-    {
+    if (!version.isEmpty() || !fullName.isEmpty() || !familyName.isEmpty() || !givenName.isEmpty()
+        || !middleName.isEmpty() || !prefixName.isEmpty() || !suffixName.isEmpty() || !nickName.isEmpty()
+        || !photo.isEmpty() || !photoURI.isEmpty() || !bday.isEmpty() || !addressList.isEmpty() || !labelList.isEmpty()
+        || !phoneList.isEmpty() || !emailList.isEmpty() || !jid.isEmpty() || !mailer.isEmpty() || !timezone.isEmpty()
+        || !geo.lat.isEmpty() || !geo.lon.isEmpty() || !title.isEmpty() || !role.isEmpty() || !logo.isEmpty()
+        || !logoURI.isEmpty() || (agent && !agent->isEmpty()) || !agentURI.isEmpty() || !org.name.isEmpty()
+        || !org.unit.isEmpty() || !categories.isEmpty() || !note.isEmpty() || !prodId.isEmpty() || !rev.isEmpty()
+        || !sortString.isEmpty() || !sound.isEmpty() || !soundURI.isEmpty() || !soundPhonetic.isEmpty()
+        || !uid.isEmpty() || !url.isEmpty() || !desc.isEmpty() || (privacyClass != VCard::pcNone) || !key.isEmpty()) {
         return false;
     }
     return true;
 }
 
-VCard::VCard()
-{
-}
+VCard::VCard() {}
 
-VCard::VCard(const VCard &from) :
-    d(from.d)
-{
-}
+VCard::VCard(const VCard &from) : d(from.d) {}
 
-VCard & VCard::operator=(const VCard &from)
+VCard &VCard::operator=(const VCard &from)
 {
     d = from.d;
     return *this;
 }
 
-VCard::~VCard()
-{
-}
+VCard::~VCard() {}
 
 QDomElement VCard::toXml(QDomDocument *doc) const
 {
     QDomElement v = doc->createElementNS("vcard-temp", "vCard");
 
-    if ( !d->version.isEmpty() )
-        v.appendChild( textTag(doc, "VERSION",    d->version) );
-    if ( !d->fullName.isEmpty() )
-        v.appendChild( textTag(doc, "FN",    d->fullName) );
+    if (!d->version.isEmpty())
+        v.appendChild(textTag(doc, "VERSION", d->version));
+    if (!d->fullName.isEmpty())
+        v.appendChild(textTag(doc, "FN", d->fullName));
 
-    if ( !d->familyName.isEmpty() || !d->givenName.isEmpty() || !d->middleName.isEmpty() ||
-         !d->prefixName.isEmpty() || !d->suffixName.isEmpty() ) {
+    if (!d->familyName.isEmpty() || !d->givenName.isEmpty() || !d->middleName.isEmpty() || !d->prefixName.isEmpty()
+        || !d->suffixName.isEmpty()) {
         QDomElement w = doc->createElement("N");
 
-        if ( !d->familyName.isEmpty() )
-            w.appendChild( textTag(doc, "FAMILY",    d->familyName) );
-        if ( !d->givenName.isEmpty() )
-            w.appendChild( textTag(doc, "GIVEN",    d->givenName) );
-        if ( !d->middleName.isEmpty() )
-            w.appendChild( textTag(doc, "MIDDLE",    d->middleName) );
-        if ( !d->prefixName.isEmpty() )
-            w.appendChild( textTag(doc, "PREFIX",    d->prefixName) );
-        if ( !d->suffixName.isEmpty() )
-            w.appendChild( textTag(doc, "SUFFIX",    d->suffixName) );
+        if (!d->familyName.isEmpty())
+            w.appendChild(textTag(doc, "FAMILY", d->familyName));
+        if (!d->givenName.isEmpty())
+            w.appendChild(textTag(doc, "GIVEN", d->givenName));
+        if (!d->middleName.isEmpty())
+            w.appendChild(textTag(doc, "MIDDLE", d->middleName));
+        if (!d->prefixName.isEmpty())
+            w.appendChild(textTag(doc, "PREFIX", d->prefixName));
+        if (!d->suffixName.isEmpty())
+            w.appendChild(textTag(doc, "SUFFIX", d->suffixName));
 
         v.appendChild(w);
     }
 
-    if ( !d->nickName.isEmpty() )
-        v.appendChild( textTag(doc, "NICKNAME",    d->nickName) );
+    if (!d->nickName.isEmpty())
+        v.appendChild(textTag(doc, "NICKNAME", d->nickName));
 
-    if ( !d->photo.isEmpty() || !d->photoURI.isEmpty() ) {
+    if (!d->photo.isEmpty() || !d->photoURI.isEmpty()) {
         QDomElement w = doc->createElement("PHOTO");
 
-        if ( !d->photo.isEmpty() ) {
-            w.appendChild( textTag(doc, "TYPE",    image2type(d->photo)) );
-            w.appendChild( textTag(doc, "BINVAL",    foldString( QCA::Base64().arrayToString(d->photo)) ) );
-        }
-        else if ( !d->photoURI.isEmpty() )
-            w.appendChild( textTag(doc, "EXTVAL",    d->photoURI) );
+        if (!d->photo.isEmpty()) {
+            w.appendChild(textTag(doc, "TYPE", image2type(d->photo)));
+            w.appendChild(textTag(doc, "BINVAL", foldString(QCA::Base64().arrayToString(d->photo))));
+        } else if (!d->photoURI.isEmpty())
+            w.appendChild(textTag(doc, "EXTVAL", d->photoURI));
 
         v.appendChild(w);
     }
 
-    if ( !d->bday.isEmpty() )
-        v.appendChild( textTag(doc, "BDAY",    d->bday) );
+    if (!d->bday.isEmpty())
+        v.appendChild(textTag(doc, "BDAY", d->bday));
 
-    if ( !d->addressList.isEmpty() ) {
+    if (!d->addressList.isEmpty()) {
         AddressList::ConstIterator it = d->addressList.constBegin();
-        for ( ; it != d->addressList.end(); ++it ) {
-            QDomElement w = doc->createElement("ADR");
+        for (; it != d->addressList.end(); ++it) {
+            QDomElement    w = doc->createElement("ADR");
             const Address &a = *it;
 
-            if ( a.home )
-                w.appendChild( emptyTag(doc, "HOME") );
-            if ( a.work )
-                w.appendChild( emptyTag(doc, "WORK") );
-            if ( a.postal )
-                w.appendChild( emptyTag(doc, "POSTAL") );
-            if ( a.parcel )
-                w.appendChild( emptyTag(doc, "PARCEL") );
-            if ( a.dom )
-                w.appendChild( emptyTag(doc, "DOM") );
-            if ( a.intl )
-                w.appendChild( emptyTag(doc, "INTL") );
-            if ( a.pref )
-                w.appendChild( emptyTag(doc, "PREF") );
-
-            if ( !a.pobox.isEmpty() )
-                w.appendChild( textTag(doc, "POBOX",    a.pobox) );
-            if ( !a.extaddr.isEmpty() )
-                w.appendChild( textTag(doc, "EXTADR",    a.extaddr) );
-            if ( !a.street.isEmpty() )
-                w.appendChild( textTag(doc, "STREET",    a.street) );
-            if ( !a.locality.isEmpty() )
-                w.appendChild( textTag(doc, "LOCALITY",    a.locality) );
-            if ( !a.region.isEmpty() )
-                w.appendChild( textTag(doc, "REGION",    a.region) );
-            if ( !a.pcode.isEmpty() )
-                w.appendChild( textTag(doc, "PCODE",    a.pcode) );
-            if ( !a.country.isEmpty() )
-                w.appendChild( textTag(doc, "CTRY",    a.country) );
+            if (a.home)
+                w.appendChild(emptyTag(doc, "HOME"));
+            if (a.work)
+                w.appendChild(emptyTag(doc, "WORK"));
+            if (a.postal)
+                w.appendChild(emptyTag(doc, "POSTAL"));
+            if (a.parcel)
+                w.appendChild(emptyTag(doc, "PARCEL"));
+            if (a.dom)
+                w.appendChild(emptyTag(doc, "DOM"));
+            if (a.intl)
+                w.appendChild(emptyTag(doc, "INTL"));
+            if (a.pref)
+                w.appendChild(emptyTag(doc, "PREF"));
+
+            if (!a.pobox.isEmpty())
+                w.appendChild(textTag(doc, "POBOX", a.pobox));
+            if (!a.extaddr.isEmpty())
+                w.appendChild(textTag(doc, "EXTADR", a.extaddr));
+            if (!a.street.isEmpty())
+                w.appendChild(textTag(doc, "STREET", a.street));
+            if (!a.locality.isEmpty())
+                w.appendChild(textTag(doc, "LOCALITY", a.locality));
+            if (!a.region.isEmpty())
+                w.appendChild(textTag(doc, "REGION", a.region));
+            if (!a.pcode.isEmpty())
+                w.appendChild(textTag(doc, "PCODE", a.pcode));
+            if (!a.country.isEmpty())
+                w.appendChild(textTag(doc, "CTRY", a.country));
 
             v.appendChild(w);
         }
     }
 
-    if ( !d->labelList.isEmpty() ) {
+    if (!d->labelList.isEmpty()) {
         LabelList::ConstIterator it = d->labelList.constBegin();
-        for ( ; it != d->labelList.end(); ++it ) {
-            QDomElement w = doc->createElement("LABEL");
+        for (; it != d->labelList.end(); ++it) {
+            QDomElement  w = doc->createElement("LABEL");
             const Label &l = *it;
 
-            if ( l.home )
-                w.appendChild( emptyTag(doc, "HOME") );
-            if ( l.work )
-                w.appendChild( emptyTag(doc, "WORK") );
-            if ( l.postal )
-                w.appendChild( emptyTag(doc, "POSTAL") );
-            if ( l.parcel )
-                w.appendChild( emptyTag(doc, "PARCEL") );
-            if ( l.dom )
-                w.appendChild( emptyTag(doc, "DOM") );
-            if ( l.intl )
-                w.appendChild( emptyTag(doc, "INTL") );
-            if ( l.pref )
-                w.appendChild( emptyTag(doc, "PREF") );
-
-            if ( !l.lines.isEmpty() ) {
+            if (l.home)
+                w.appendChild(emptyTag(doc, "HOME"));
+            if (l.work)
+                w.appendChild(emptyTag(doc, "WORK"));
+            if (l.postal)
+                w.appendChild(emptyTag(doc, "POSTAL"));
+            if (l.parcel)
+                w.appendChild(emptyTag(doc, "PARCEL"));
+            if (l.dom)
+                w.appendChild(emptyTag(doc, "DOM"));
+            if (l.intl)
+                w.appendChild(emptyTag(doc, "INTL"));
+            if (l.pref)
+                w.appendChild(emptyTag(doc, "PREF"));
+
+            if (!l.lines.isEmpty()) {
                 QStringList::ConstIterator it = l.lines.constBegin();
-                for ( ; it != l.lines.end(); ++it )
-                    w.appendChild( textTag(doc, "LINE", *it) );
+                for (; it != l.lines.end(); ++it)
+                    w.appendChild(textTag(doc, "LINE", *it));
             }
 
             v.appendChild(w);
         }
     }
 
-    if ( !d->phoneList.isEmpty() ) {
+    if (!d->phoneList.isEmpty()) {
         PhoneList::ConstIterator it = d->phoneList.constBegin();
-        for ( ; it != d->phoneList.end(); ++it ) {
-            QDomElement w = doc->createElement("TEL");
+        for (; it != d->phoneList.end(); ++it) {
+            QDomElement  w = doc->createElement("TEL");
             const Phone &p = *it;
 
-            if ( p.home )
-                w.appendChild( emptyTag(doc, "HOME") );
-            if ( p.work )
-                w.appendChild( emptyTag(doc, "WORK") );
-            if ( p.voice )
-                w.appendChild( emptyTag(doc, "VOICE") );
-            if ( p.fax )
-                w.appendChild( emptyTag(doc, "FAX") );
-            if ( p.pager )
-                w.appendChild( emptyTag(doc, "PAGER") );
-            if ( p.msg )
-                w.appendChild( emptyTag(doc, "MSG") );
-            if ( p.cell )
-                w.appendChild( emptyTag(doc, "CELL") );
-            if ( p.video )
-                w.appendChild( emptyTag(doc, "VIDEO") );
-            if ( p.bbs )
-                w.appendChild( emptyTag(doc, "BBS") );
-            if ( p.modem )
-                w.appendChild( emptyTag(doc, "MODEM") );
-            if ( p.isdn )
-                w.appendChild( emptyTag(doc, "ISDN") );
-            if ( p.pcs )
-                w.appendChild( emptyTag(doc, "PCS") );
-            if ( p.pref )
-                w.appendChild( emptyTag(doc, "PREF") );
-
-            if ( !p.number.isEmpty() )
-                w.appendChild( textTag(doc, "NUMBER",    p.number) );
+            if (p.home)
+                w.appendChild(emptyTag(doc, "HOME"));
+            if (p.work)
+                w.appendChild(emptyTag(doc, "WORK"));
+            if (p.voice)
+                w.appendChild(emptyTag(doc, "VOICE"));
+            if (p.fax)
+                w.appendChild(emptyTag(doc, "FAX"));
+            if (p.pager)
+                w.appendChild(emptyTag(doc, "PAGER"));
+            if (p.msg)
+                w.appendChild(emptyTag(doc, "MSG"));
+            if (p.cell)
+                w.appendChild(emptyTag(doc, "CELL"));
+            if (p.video)
+                w.appendChild(emptyTag(doc, "VIDEO"));
+            if (p.bbs)
+                w.appendChild(emptyTag(doc, "BBS"));
+            if (p.modem)
+                w.appendChild(emptyTag(doc, "MODEM"));
+            if (p.isdn)
+                w.appendChild(emptyTag(doc, "ISDN"));
+            if (p.pcs)
+                w.appendChild(emptyTag(doc, "PCS"));
+            if (p.pref)
+                w.appendChild(emptyTag(doc, "PREF"));
+
+            if (!p.number.isEmpty())
+                w.appendChild(textTag(doc, "NUMBER", p.number));
 
             v.appendChild(w);
         }
     }
 
-    if ( !d->emailList.isEmpty() ) {
+    if (!d->emailList.isEmpty()) {
         EmailList::ConstIterator it = d->emailList.constBegin();
-        for ( ; it != d->emailList.end(); ++it ) {
-            QDomElement w = doc->createElement("EMAIL");
+        for (; it != d->emailList.end(); ++it) {
+            QDomElement  w = doc->createElement("EMAIL");
             const Email &e = *it;
 
-            if ( e.home )
-                w.appendChild( emptyTag(doc, "HOME") );
-            if ( e.work )
-                w.appendChild( emptyTag(doc, "WORK") );
-            if ( e.internet )
-                w.appendChild( emptyTag(doc, "INTERNET") );
-            if ( e.x400 )
-                w.appendChild( emptyTag(doc, "X400") );
+            if (e.home)
+                w.appendChild(emptyTag(doc, "HOME"));
+            if (e.work)
+                w.appendChild(emptyTag(doc, "WORK"));
+            if (e.internet)
+                w.appendChild(emptyTag(doc, "INTERNET"));
+            if (e.x400)
+                w.appendChild(emptyTag(doc, "X400"));
 
-            if ( !e.userid.isEmpty() )
-                w.appendChild( textTag(doc, "USERID",    e.userid) );
+            if (!e.userid.isEmpty())
+                w.appendChild(textTag(doc, "USERID", e.userid));
 
             v.appendChild(w);
         }
     }
 
-    if ( !d->jid.isEmpty() )
-        v.appendChild( textTag(doc, "JABBERID",    d->jid) );
-    if ( !d->mailer.isEmpty() )
-        v.appendChild( textTag(doc, "MAILER",    d->mailer) );
-    if ( !d->timezone.isEmpty() )
-        v.appendChild( textTag(doc, "TZ",    d->timezone) );
+    if (!d->jid.isEmpty())
+        v.appendChild(textTag(doc, "JABBERID", d->jid));
+    if (!d->mailer.isEmpty())
+        v.appendChild(textTag(doc, "MAILER", d->mailer));
+    if (!d->timezone.isEmpty())
+        v.appendChild(textTag(doc, "TZ", d->timezone));
 
-    if ( !d->geo.lat.isEmpty() || !d->geo.lon.isEmpty() ) {
+    if (!d->geo.lat.isEmpty() || !d->geo.lon.isEmpty()) {
         QDomElement w = doc->createElement("GEO");
 
-        if ( !d->geo.lat.isEmpty() )
-            w.appendChild( textTag(doc, "LAT",    d->geo.lat) );
-        if ( !d->geo.lon.isEmpty() )
-            w.appendChild( textTag(doc, "LON",    d->geo.lon));
+        if (!d->geo.lat.isEmpty())
+            w.appendChild(textTag(doc, "LAT", d->geo.lat));
+        if (!d->geo.lon.isEmpty())
+            w.appendChild(textTag(doc, "LON", d->geo.lon));
 
         v.appendChild(w);
     }
 
-    if ( !d->title.isEmpty() )
-        v.appendChild( textTag(doc, "TITLE",    d->title) );
-    if ( !d->role.isEmpty() )
-        v.appendChild( textTag(doc, "ROLE",    d->role) );
+    if (!d->title.isEmpty())
+        v.appendChild(textTag(doc, "TITLE", d->title));
+    if (!d->role.isEmpty())
+        v.appendChild(textTag(doc, "ROLE", d->role));
 
-    if ( !d->logo.isEmpty() || !d->logoURI.isEmpty() ) {
+    if (!d->logo.isEmpty() || !d->logoURI.isEmpty()) {
         QDomElement w = doc->createElement("LOGO");
 
-        if ( !d->logo.isEmpty() ) {
-            w.appendChild( textTag(doc, "TYPE",    image2type(d->logo)) );
-            w.appendChild( textTag(doc, "BINVAL",    foldString( QCA::Base64().arrayToString(d->logo)) ) );
-        }
-        else if ( !d->logoURI.isEmpty() )
-            w.appendChild( textTag(doc, "EXTVAL",    d->logoURI) );
+        if (!d->logo.isEmpty()) {
+            w.appendChild(textTag(doc, "TYPE", image2type(d->logo)));
+            w.appendChild(textTag(doc, "BINVAL", foldString(QCA::Base64().arrayToString(d->logo))));
+        } else if (!d->logoURI.isEmpty())
+            w.appendChild(textTag(doc, "EXTVAL", d->logoURI));
 
         v.appendChild(w);
     }
 
-    if ( !d->agentURI.isEmpty() || (d->agent && d->agent->isEmpty()) ) {
+    if (!d->agentURI.isEmpty() || (d->agent && d->agent->isEmpty())) {
         QDomElement w = doc->createElement("AGENT");
 
-        if ( d->agent && !d->agent->isEmpty() )
-            w.appendChild( d->agent->toXml(doc) );
-        else if ( !d->agentURI.isEmpty() )
-            w.appendChild( textTag(doc, "EXTVAL",    d->agentURI) );
+        if (d->agent && !d->agent->isEmpty())
+            w.appendChild(d->agent->toXml(doc));
+        else if (!d->agentURI.isEmpty())
+            w.appendChild(textTag(doc, "EXTVAL", d->agentURI));
 
         v.appendChild(w);
     }
 
-    if ( !d->org.name.isEmpty() || !d->org.unit.isEmpty() ) {
+    if (!d->org.name.isEmpty() || !d->org.unit.isEmpty()) {
         QDomElement w = doc->createElement("ORG");
 
-        if ( !d->org.name.isEmpty() )
-            w.appendChild( textTag(doc, "ORGNAME",    d->org.name) );
+        if (!d->org.name.isEmpty())
+            w.appendChild(textTag(doc, "ORGNAME", d->org.name));
 
-        if ( !d->org.unit.isEmpty() ) {
+        if (!d->org.unit.isEmpty()) {
             QStringList::ConstIterator it = d->org.unit.constBegin();
-            for ( ; it != d->org.unit.end(); ++it )
-                w.appendChild( textTag(doc, "ORGUNIT",    *it) );
+            for (; it != d->org.unit.end(); ++it)
+                w.appendChild(textTag(doc, "ORGUNIT", *it));
         }
 
         v.appendChild(w);
     }
 
-    if ( !d->categories.isEmpty() ) {
+    if (!d->categories.isEmpty()) {
         QDomElement w = doc->createElement("CATEGORIES");
 
         QStringList::ConstIterator it = d->categories.constBegin();
-        for ( ; it != d->categories.end(); ++it )
-            w.appendChild( textTag(doc, "KEYWORD", *it) );
+        for (; it != d->categories.end(); ++it)
+            w.appendChild(textTag(doc, "KEYWORD", *it));
 
         v.appendChild(w);
     }
 
-    if ( !d->note.isEmpty() )
-        v.appendChild( textTag(doc, "NOTE",    d->note) );
-    if ( !d->prodId.isEmpty() )
-        v.appendChild( textTag(doc, "PRODID",    d->prodId) );
-    if ( !d->rev.isEmpty() )
-        v.appendChild( textTag(doc, "REV",    d->rev) );
-    if ( !d->sortString.isEmpty() )
-        v.appendChild( textTag(doc, "SORT-STRING",    d->sortString) );
+    if (!d->note.isEmpty())
+        v.appendChild(textTag(doc, "NOTE", d->note));
+    if (!d->prodId.isEmpty())
+        v.appendChild(textTag(doc, "PRODID", d->prodId));
+    if (!d->rev.isEmpty())
+        v.appendChild(textTag(doc, "REV", d->rev));
+    if (!d->sortString.isEmpty())
+        v.appendChild(textTag(doc, "SORT-STRING", d->sortString));
 
-    if ( !d->sound.isEmpty() || !d->soundURI.isEmpty() || !d->soundPhonetic.isEmpty() ) {
+    if (!d->sound.isEmpty() || !d->soundURI.isEmpty() || !d->soundPhonetic.isEmpty()) {
         QDomElement w = doc->createElement("SOUND");
 
-        if ( !d->sound.isEmpty() )
-            w.appendChild( textTag(doc, "BINVAL",    foldString( QCA::Base64().arrayToString(d->sound)) ) );
-        else if ( !d->soundURI.isEmpty() )
-            w.appendChild( textTag(doc, "EXTVAL",    d->soundURI) );
-        else if ( !d->soundPhonetic.isEmpty() )
-            w.appendChild( textTag(doc, "PHONETIC",    d->soundPhonetic) );
+        if (!d->sound.isEmpty())
+            w.appendChild(textTag(doc, "BINVAL", foldString(QCA::Base64().arrayToString(d->sound))));
+        else if (!d->soundURI.isEmpty())
+            w.appendChild(textTag(doc, "EXTVAL", d->soundURI));
+        else if (!d->soundPhonetic.isEmpty())
+            w.appendChild(textTag(doc, "PHONETIC", d->soundPhonetic));
 
         v.appendChild(w);
     }
 
-    if ( !d->uid.isEmpty() )
-        v.appendChild( textTag(doc, "UID",    d->uid) );
-    if ( !d->url.isEmpty() )
-        v.appendChild( textTag(doc, "URL",    d->url) );
-    if ( !d->desc.isEmpty() )
-        v.appendChild( textTag(doc, "DESC",    d->desc) );
+    if (!d->uid.isEmpty())
+        v.appendChild(textTag(doc, "UID", d->uid));
+    if (!d->url.isEmpty())
+        v.appendChild(textTag(doc, "URL", d->url));
+    if (!d->desc.isEmpty())
+        v.appendChild(textTag(doc, "DESC", d->desc));
 
-    if ( d->privacyClass != pcNone ) {
+    if (d->privacyClass != pcNone) {
         QDomElement w = doc->createElement("CLASS");
 
-        if ( d->privacyClass == pcPublic )
-            w.appendChild( emptyTag(doc, "PUBLIC") );
-        else if ( d->privacyClass == pcPrivate )
-            w.appendChild( emptyTag(doc, "PRIVATE") );
-        else if ( d->privacyClass == pcConfidential )
-            w.appendChild( emptyTag(doc, "CONFIDENTIAL") );
+        if (d->privacyClass == pcPublic)
+            w.appendChild(emptyTag(doc, "PUBLIC"));
+        else if (d->privacyClass == pcPrivate)
+            w.appendChild(emptyTag(doc, "PRIVATE"));
+        else if (d->privacyClass == pcConfidential)
+            w.appendChild(emptyTag(doc, "CONFIDENTIAL"));
 
         v.appendChild(w);
     }
 
-    if ( !d->key.isEmpty() ) {
+    if (!d->key.isEmpty()) {
         QDomElement w = doc->createElement("KEY");
 
         // TODO: Justin, please check out this code
-        w.appendChild( textTag(doc, "TYPE", "text/plain")); // FIXME
-        w.appendChild( textTag(doc, "CRED", QString::fromUtf8(d->key)) ); // FIXME
+        w.appendChild(textTag(doc, "TYPE", "text/plain"));              // FIXME
+        w.appendChild(textTag(doc, "CRED", QString::fromUtf8(d->key))); // FIXME
 
         v.appendChild(w);
     }
@@ -515,42 +477,41 @@ QDomElement VCard::toXml(QDomDocument *doc) const
 
 VCard VCard::fromXml(const QDomElement &q)
 {
-    if ( q.tagName().toUpper() != "VCARD" )
+    if (q.tagName().toUpper() != "VCARD")
         return VCard();
 
     VCard v;
     v.d = new VCardPrivate;
 
     QDomNode n = q.firstChild();
-    for ( ; !n.isNull(); n = n.nextSibling() ) {
+    for (; !n.isNull(); n = n.nextSibling()) {
         QDomElement i = n.toElement();
-        if ( i.isNull() )
+        if (i.isNull())
             continue;
 
         QString tag = i.tagName().toUpper();
 
         QDomElement e;
 
-        if ( tag == "VERSION" )
+        if (tag == "VERSION")
             v.d->version = i.text().trimmed();
-        else if ( tag == "FN" )
+        else if (tag == "FN")
             v.d->fullName = i.text().trimmed();
-        else if ( tag == "N" ) {
+        else if (tag == "N") {
             v.d->familyName = subTagText(i, "FAMILY");
             v.d->givenName  = subTagText(i, "GIVEN");
             v.d->middleName = subTagText(i, "MIDDLE");
             v.d->prefixName = subTagText(i, "PREFIX");
             v.d->suffixName = subTagText(i, "SUFFIX");
-        }
-        else if ( tag == "NICKNAME" )
+        } else if (tag == "NICKNAME")
             v.d->nickName = i.text().trimmed();
-        else if ( tag == "PHOTO" ) {
-            v.d->photo = QCA::Base64().stringToArray(subTagText(i, "BINVAL").replace(QRegExp("[\r\n]+"),"")).toByteArray();
+        else if (tag == "PHOTO") {
+            v.d->photo
+                = QCA::Base64().stringToArray(subTagText(i, "BINVAL").replace(QRegExp("[\r\n]+"), "")).toByteArray();
             v.d->photoURI = subTagText(i, "EXTVAL");
-        }
-        else if ( tag == "BDAY" )
+        } else if (tag == "BDAY")
             v.d->bday = i.text().trimmed();
-        else if ( tag == "ADR" ) {
+        else if (tag == "ADR") {
             Address a;
 
             a.home   = hasSubTag(i, "HOME");
@@ -569,17 +530,16 @@ VCard VCard::fromXml(const QDomElement &q)
             a.pcode    = subTagText(i, "PCODE");
             a.country  = subTagText(i, "CTRY");
 
-            if ( a.country.isEmpty() ) // FIXME: Workaround for Psi prior to 0.9
-                if ( hasSubTag(i, "COUNTRY") )
+            if (a.country.isEmpty()) // FIXME: Workaround for Psi prior to 0.9
+                if (hasSubTag(i, "COUNTRY"))
                     a.country = subTagText(i, "COUNTRY");
 
-            if ( a.extaddr.isEmpty() ) // FIXME: Workaround for Psi prior to 0.9
-                if ( hasSubTag(i, "EXTADD") )
+            if (a.extaddr.isEmpty()) // FIXME: Workaround for Psi prior to 0.9
+                if (hasSubTag(i, "EXTADD"))
                     a.extaddr = subTagText(i, "EXTADD");
 
-            v.d->addressList.append ( a );
-        }
-        else if ( tag == "LABEL" ) {
+            v.d->addressList.append(a);
+        } else if (tag == "LABEL") {
             Label l;
 
             l.home   = hasSubTag(i, "HOME");
@@ -591,18 +551,17 @@ VCard VCard::fromXml(const QDomElement &q)
             l.pref   = hasSubTag(i, "PREF");
 
             QDomNode nn = i.firstChild();
-            for ( ; !nn.isNull(); nn = nn.nextSibling() ) {
+            for (; !nn.isNull(); nn = nn.nextSibling()) {
                 QDomElement ii = nn.toElement();
-                if ( ii.isNull() )
+                if (ii.isNull())
                     continue;
 
-                if ( ii.tagName().toUpper() == "LINE" )
-                    l.lines.append ( ii.text().trimmed() );
+                if (ii.tagName().toUpper() == "LINE")
+                    l.lines.append(ii.text().trimmed());
             }
 
-            v.d->labelList.append ( l );
-        }
-        else if ( tag == "TEL" ) {
+            v.d->labelList.append(l);
+        } else if (tag == "TEL") {
             Phone p;
 
             p.home  = hasSubTag(i, "HOME");
@@ -621,13 +580,12 @@ VCard VCard::fromXml(const QDomElement &q)
 
             p.number = subTagText(i, "NUMBER");
 
-            if ( p.number.isEmpty() ) // FIXME: Workaround for Psi prior to 0.9
-                if ( hasSubTag(i, "VOICE") )
+            if (p.number.isEmpty()) // FIXME: Workaround for Psi prior to 0.9
+                if (hasSubTag(i, "VOICE"))
                     p.number = subTagText(i, "VOICE");
 
-            v.d->phoneList.append ( p );
-        }
-        else if ( tag == "EMAIL" ) {
+            v.d->phoneList.append(p);
+        } else if (tag == "EMAIL") {
             Email m;
 
             m.home     = hasSubTag(i, "HOME");
@@ -637,106 +595,98 @@ VCard VCard::fromXml(const QDomElement &q)
 
             m.userid = subTagText(i, "USERID");
 
-            if ( m.userid.isEmpty() ) // FIXME: Workaround for Psi prior to 0.9
-                if ( !i.text().isEmpty() )
+            if (m.userid.isEmpty()) // FIXME: Workaround for Psi prior to 0.9
+                if (!i.text().isEmpty())
                     m.userid = i.text().trimmed();
 
-            v.d->emailList.append ( m );
-        }
-        else if ( tag == "JABBERID" )
+            v.d->emailList.append(m);
+        } else if (tag == "JABBERID")
             v.d->jid = i.text().trimmed();
-        else if ( tag == "MAILER" )
+        else if (tag == "MAILER")
             v.d->mailer = i.text().trimmed();
-        else if ( tag == "TZ" )
+        else if (tag == "TZ")
             v.d->timezone = i.text().trimmed();
-        else if ( tag == "GEO" ) {
+        else if (tag == "GEO") {
             v.d->geo.lat = subTagText(i, "LAT");
             v.d->geo.lon = subTagText(i, "LON");
-        }
-        else if ( tag == "TITLE" )
+        } else if (tag == "TITLE")
             v.d->title = i.text().trimmed();
-        else if ( tag == "ROLE" )
+        else if (tag == "ROLE")
             v.d->role = i.text().trimmed();
-        else if ( tag == "LOGO" ) {
-            v.d->logo = QCA::Base64().stringToArray( subTagText(i, "BINVAL").replace("\n","") ).toByteArray();
+        else if (tag == "LOGO") {
+            v.d->logo    = QCA::Base64().stringToArray(subTagText(i, "BINVAL").replace("\n", "")).toByteArray();
             v.d->logoURI = subTagText(i, "EXTVAL");
-        }
-        else if ( tag == "AGENT" ) {
+        } else if (tag == "AGENT") {
             e = i.firstChildElement("VCARD");
-            if ( !e.isNull() ) {
+            if (!e.isNull()) {
                 VCard a;
-                if ( a.fromXml(e) ) {
-                    if ( !v.d->agent )
+                if (a.fromXml(e)) {
+                    if (!v.d->agent)
                         v.d->agent = QSharedPointer<VCard>(new VCard);
                     *(v.d->agent) = a;
                 }
             }
 
             v.d->agentURI = subTagText(i, "EXTVAL");
-        }
-        else if ( tag == "ORG" ) {
+        } else if (tag == "ORG") {
             v.d->org.name = subTagText(i, "ORGNAME");
 
             QDomNode nn = i.firstChild();
-            for ( ; !nn.isNull(); nn = nn.nextSibling() ) {
+            for (; !nn.isNull(); nn = nn.nextSibling()) {
                 QDomElement ii = nn.toElement();
-                if ( ii.isNull() )
+                if (ii.isNull())
                     continue;
 
-                if ( ii.tagName().toUpper() == "ORGUNIT" )
-                    v.d->org.unit.append( ii.text().trimmed() );
+                if (ii.tagName().toUpper() == "ORGUNIT")
+                    v.d->org.unit.append(ii.text().trimmed());
             }
-        }
-        else if ( tag == "CATEGORIES") {
+        } else if (tag == "CATEGORIES") {
             QDomNode nn = i.firstChild();
-            for ( ; !nn.isNull(); nn = nn.nextSibling() ) {
+            for (; !nn.isNull(); nn = nn.nextSibling()) {
                 QDomElement ee = nn.toElement();
-                if ( ee.isNull() )
+                if (ee.isNull())
                     continue;
 
-                if ( ee.tagName().toUpper() == "KEYWORD" )
+                if (ee.tagName().toUpper() == "KEYWORD")
                     v.d->categories << ee.text().trimmed();
             }
-        }
-        else if ( tag == "NOTE" )
+        } else if (tag == "NOTE")
             v.d->note = i.text().trimmed();
-        else if ( tag == "PRODID" )
+        else if (tag == "PRODID")
             v.d->prodId = i.text().trimmed();
-        else if ( tag == "REV" )
+        else if (tag == "REV")
             v.d->rev = i.text().trimmed();
-        else if ( tag == "SORT-STRING" )
+        else if (tag == "SORT-STRING")
             v.d->sortString = i.text().trimmed();
-        else if ( tag == "SOUND" ) {
-            v.d->sound = QCA::Base64().stringToArray( subTagText(i, "BINVAL").replace("\n","") ).toByteArray();
+        else if (tag == "SOUND") {
+            v.d->sound         = QCA::Base64().stringToArray(subTagText(i, "BINVAL").replace("\n", "")).toByteArray();
             v.d->soundURI      = subTagText(i, "EXTVAL");
             v.d->soundPhonetic = subTagText(i, "PHONETIC");
-        }
-        else if ( tag == "UID" )
+        } else if (tag == "UID")
             v.d->uid = i.text().trimmed();
-        else if ( tag == "URL")
+        else if (tag == "URL")
             v.d->url = i.text().trimmed();
-        else if ( tag == "DESC" )
+        else if (tag == "DESC")
             v.d->desc = i.text().trimmed();
-        else if ( tag == "CLASS" ) {
-            if ( hasSubTag(i, "PUBLIC") )
+        else if (tag == "CLASS") {
+            if (hasSubTag(i, "PUBLIC"))
                 v.d->privacyClass = pcPublic;
-            else if ( hasSubTag(i, "PRIVATE") )
+            else if (hasSubTag(i, "PRIVATE"))
                 v.d->privacyClass = pcPrivate;
-            else if ( hasSubTag(i, "CONFIDENTIAL") )
+            else if (hasSubTag(i, "CONFIDENTIAL"))
                 v.d->privacyClass = pcConfidential;
-        }
-        else if ( tag == "KEY" ) {
+        } else if (tag == "KEY") {
             // TODO: Justin, please check out this code
-            e = i.firstChildElement("TYPE");
+            e            = i.firstChildElement("TYPE");
             QString type = "text/plain";
-            if ( !e.isNull() )
+            if (!e.isNull())
                 type = e.text().trimmed();
 
             e = i.firstChildElement("CRED");
-            if ( e.isNull() )
+            if (e.isNull())
                 e = i.firstChildElement("BINVAL"); // case for very clever clients ;-)
 
-            if ( !e.isNull() )
+            if (!e.isNull())
                 v.d->key = e.text().toUtf8(); // FIXME
         }
     }
@@ -744,10 +694,7 @@ VCard VCard::fromXml(const QDomElement &q)
     return v;
 }
 
-bool VCard::isEmpty() const
-{
-    return !d || d->isEmpty();
-}
+bool VCard::isEmpty() const { return !d || d->isEmpty(); }
 
 VCard VCard::makeEmpty()
 {
@@ -758,275 +705,118 @@ VCard VCard::makeEmpty()
 
 // Some constructors
 
-VCard::Address::Address()
-{
-    home = work = postal = parcel = dom = intl = pref = false;
-}
+VCard::Address::Address() { home = work = postal = parcel = dom = intl = pref = false; }
 
-VCard::Label::Label()
-{
-    home = work = postal = parcel = dom = intl = pref = false;
-}
+VCard::Label::Label() { home = work = postal = parcel = dom = intl = pref = false; }
 
 VCard::Phone::Phone()
 {
     home = work = voice = fax = pager = msg = cell = video = bbs = modem = isdn = pcs = pref = false;
 }
 
-VCard::Email::Email()
-{
-    home = work = internet = x400 = false;
-}
+VCard::Email::Email() { home = work = internet = x400 = false; }
 
-VCard::Geo::Geo()
-{
-}
+VCard::Geo::Geo() {}
 
-VCard::Org::Org()
-{
-}
+VCard::Org::Org() {}
 
 // vCard properties...
 
-const QString &VCard::version() const
-{
-    return d->version;
-}
+const QString &VCard::version() const { return d->version; }
 
-void VCard::setVersion(const QString &v)
-{
-    d->version = v;
-}
+void VCard::setVersion(const QString &v) { d->version = v; }
 
-const QString &VCard::fullName() const
-{
-    return d->fullName;
-}
+const QString &VCard::fullName() const { return d->fullName; }
 
-void VCard::setFullName(const QString &n)
-{
-    d->fullName = n;
-}
+void VCard::setFullName(const QString &n) { d->fullName = n; }
 
-const QString &VCard::familyName() const
-{
-    return d->familyName;
-}
+const QString &VCard::familyName() const { return d->familyName; }
 
-void VCard::setFamilyName(const QString &n)
-{
-    d->familyName = n;
-}
+void VCard::setFamilyName(const QString &n) { d->familyName = n; }
 
-const QString &VCard::givenName() const
-{
-    return d->givenName;
-}
+const QString &VCard::givenName() const { return d->givenName; }
 
-void VCard::setGivenName(const QString &n)
-{
-    d->givenName = n;
-}
+void VCard::setGivenName(const QString &n) { d->givenName = n; }
 
-const QString &VCard::middleName() const
-{
-    return d->middleName;
-}
+const QString &VCard::middleName() const { return d->middleName; }
 
-void VCard::setMiddleName(const QString &n)
-{
-    d->middleName = n;
-}
+void VCard::setMiddleName(const QString &n) { d->middleName = n; }
 
-const QString &VCard::prefixName() const
-{
-    return d->prefixName;
-}
+const QString &VCard::prefixName() const { return d->prefixName; }
 
-void VCard::setPrefixName(const QString &p)
-{
-    d->prefixName = p;
-}
+void VCard::setPrefixName(const QString &p) { d->prefixName = p; }
 
-const QString &VCard::suffixName() const
-{
-    return d->suffixName;
-}
+const QString &VCard::suffixName() const { return d->suffixName; }
 
-void VCard::setSuffixName(const QString &s)
-{
-    d->suffixName = s;
-}
+void VCard::setSuffixName(const QString &s) { d->suffixName = s; }
 
-const QString &VCard::nickName() const
-{
-    return d->nickName;
-}
+const QString &VCard::nickName() const { return d->nickName; }
 
-void VCard::setNickName(const QString &n)
-{
-    d->nickName = n;
-}
+void VCard::setNickName(const QString &n) { d->nickName = n; }
 
-const QByteArray &VCard::photo() const
-{
-    return d->photo;
-}
+const QByteArray &VCard::photo() const { return d->photo; }
 
-void VCard::setPhoto(const QByteArray &i)
-{
-    d->photo = i;
-}
+void VCard::setPhoto(const QByteArray &i) { d->photo = i; }
 
-const QString &VCard::photoURI() const
-{
-    return d->photoURI;
-}
+const QString &VCard::photoURI() const { return d->photoURI; }
 
-void VCard::setPhotoURI(const QString &p)
-{
-    d->photoURI = p;
-}
+void VCard::setPhotoURI(const QString &p) { d->photoURI = p; }
 
-const QDate VCard::bday() const
-{
-    return QDate::fromString(d->bday);
-}
+const QDate VCard::bday() const { return QDate::fromString(d->bday); }
 
-void VCard::setBday(const QDate &date)
-{
-    d->bday = date.toString();
-}
+void VCard::setBday(const QDate &date) { d->bday = date.toString(); }
 
-const QString &VCard::bdayStr() const
-{
-    return d->bday;
-}
+const QString &VCard::bdayStr() const { return d->bday; }
 
-void VCard::setBdayStr(const QString &date)
-{
-    d->bday = date;
-}
+void VCard::setBdayStr(const QString &date) { d->bday = date; }
 
-const VCard::AddressList &VCard::addressList() const
-{
-    return d->addressList;
-}
+const VCard::AddressList &VCard::addressList() const { return d->addressList; }
 
-void VCard::setAddressList(const VCard::AddressList &a)
-{
-    d->addressList = a;
-}
+void VCard::setAddressList(const VCard::AddressList &a) { d->addressList = a; }
 
-const VCard::LabelList &VCard::labelList() const
-{
-    return d->labelList;
-}
+const VCard::LabelList &VCard::labelList() const { return d->labelList; }
 
-void VCard::setLabelList(const VCard::LabelList &l)
-{
-    d->labelList = l;
-}
+void VCard::setLabelList(const VCard::LabelList &l) { d->labelList = l; }
 
-const VCard::PhoneList &VCard::phoneList() const
-{
-    return d->phoneList;
-}
+const VCard::PhoneList &VCard::phoneList() const { return d->phoneList; }
 
-void VCard::setPhoneList(const VCard::PhoneList &p)
-{
-    d->phoneList = p;
-}
+void VCard::setPhoneList(const VCard::PhoneList &p) { d->phoneList = p; }
 
-const VCard::EmailList &VCard::emailList() const
-{
-    return d->emailList;
-}
+const VCard::EmailList &VCard::emailList() const { return d->emailList; }
 
-void VCard::setEmailList(const VCard::EmailList &e)
-{
-    d->emailList = e;
-}
+void VCard::setEmailList(const VCard::EmailList &e) { d->emailList = e; }
 
-const QString &VCard::jid() const
-{
-    return d->jid;
-}
+const QString &VCard::jid() const { return d->jid; }
 
-void VCard::setJid(const QString &j)
-{
-    d->jid = j;
-}
+void VCard::setJid(const QString &j) { d->jid = j; }
 
-const QString &VCard::mailer() const
-{
-    return d->mailer;
-}
+const QString &VCard::mailer() const { return d->mailer; }
 
-void VCard::setMailer(const QString &m)
-{
-    d->mailer = m;
-}
+void VCard::setMailer(const QString &m) { d->mailer = m; }
 
-const QString &VCard::timezone() const
-{
-    return d->timezone;
-}
+const QString &VCard::timezone() const { return d->timezone; }
 
-void VCard::setTimezone(const QString &t)
-{
-    d->timezone = t;
-}
+void VCard::setTimezone(const QString &t) { d->timezone = t; }
 
-const VCard::Geo &VCard::geo() const
-{
-    return d->geo;
-}
+const VCard::Geo &VCard::geo() const { return d->geo; }
 
-void VCard::setGeo(const VCard::Geo &g)
-{
-    d->geo = g;
-}
+void VCard::setGeo(const VCard::Geo &g) { d->geo = g; }
 
-const QString &VCard::title() const
-{
-    return d->title;
-}
+const QString &VCard::title() const { return d->title; }
 
-void VCard::setTitle(const QString &t)
-{
-    d->title = t;
-}
+void VCard::setTitle(const QString &t) { d->title = t; }
 
-const QString &VCard::role() const
-{
-    return d->role;
-}
+const QString &VCard::role() const { return d->role; }
 
-void VCard::setRole(const QString &r)
-{
-    d->role = r;
-}
+void VCard::setRole(const QString &r) { d->role = r; }
 
-const QByteArray &VCard::logo() const
-{
-    return d->logo;
-}
+const QByteArray &VCard::logo() const { return d->logo; }
 
-void VCard::setLogo(const QByteArray &i)
-{
-    d->logo = i;
-}
+void VCard::setLogo(const QByteArray &i) { d->logo = i; }
 
-const QString &VCard::logoURI() const
-{
-    return d->logoURI;
-}
+const QString &VCard::logoURI() const { return d->logoURI; }
 
-void VCard::setLogoURI(const QString &l)
-{
-    d->logoURI = l;
-}
+void VCard::setLogoURI(const QString &l) { d->logoURI = l; }
 
 VCard VCard::agent() const
 {
@@ -1038,158 +828,68 @@ VCard VCard::agent() const
 
 void VCard::setAgent(const VCard &v)
 {
-    if ( !d->agent )
+    if (!d->agent)
         d->agent = QSharedPointer<VCard>(new VCard);
     *(d->agent) = v;
 }
 
-const QString VCard::agentURI() const
-{
-    return d->agentURI;
-}
+const QString VCard::agentURI() const { return d->agentURI; }
 
-void VCard::setAgentURI(const QString &a)
-{
-    d->agentURI = a;
-}
+void VCard::setAgentURI(const QString &a) { d->agentURI = a; }
 
-const VCard::Org &VCard::org() const
-{
-    return d->org;
-}
+const VCard::Org &VCard::org() const { return d->org; }
 
-void VCard::setOrg(const VCard::Org &o)
-{
-    d->org = o;
-}
+void VCard::setOrg(const VCard::Org &o) { d->org = o; }
 
-const QStringList &VCard::categories() const
-{
-    return d->categories;
-}
+const QStringList &VCard::categories() const { return d->categories; }
 
-void VCard::setCategories(const QStringList &c)
-{
-    d->categories = c;
-}
+void VCard::setCategories(const QStringList &c) { d->categories = c; }
 
-const QString &VCard::note() const
-{
-    return d->note;
-}
+const QString &VCard::note() const { return d->note; }
 
-void VCard::setNote(const QString &n)
-{
-    d->note = n;
-}
+void VCard::setNote(const QString &n) { d->note = n; }
 
-const QString &VCard::prodId() const
-{
-    return d->prodId;
-}
+const QString &VCard::prodId() const { return d->prodId; }
 
-void VCard::setProdId(const QString &p)
-{
-    d->prodId = p;
-}
+void VCard::setProdId(const QString &p) { d->prodId = p; }
 
-const QString &VCard::rev() const
-{
-    return d->rev;
-}
+const QString &VCard::rev() const { return d->rev; }
 
-void VCard::setRev(const QString &r)
-{
-    d->rev = r;
-}
+void VCard::setRev(const QString &r) { d->rev = r; }
 
-const QString &VCard::sortString() const
-{
-    return d->sortString;
-}
+const QString &VCard::sortString() const { return d->sortString; }
 
-void VCard::setSortString(const QString &s)
-{
-    d->sortString = s;
-}
+void VCard::setSortString(const QString &s) { d->sortString = s; }
 
-const QByteArray &VCard::sound() const
-{
-    return d->sound;
-}
+const QByteArray &VCard::sound() const { return d->sound; }
 
-void VCard::setSound(const QByteArray &s)
-{
-    d->sound = s;
-}
+void VCard::setSound(const QByteArray &s) { d->sound = s; }
 
-const QString &VCard::soundURI() const
-{
-    return d->soundURI;
-}
+const QString &VCard::soundURI() const { return d->soundURI; }
 
-void VCard::setSoundURI(const QString &s)
-{
-    d->soundURI = s;
-}
+void VCard::setSoundURI(const QString &s) { d->soundURI = s; }
 
-const QString &VCard::soundPhonetic() const
-{
-    return d->soundPhonetic;
-}
+const QString &VCard::soundPhonetic() const { return d->soundPhonetic; }
 
-void VCard::setSoundPhonetic(const QString &s)
-{
-    d->soundPhonetic = s;
-}
+void VCard::setSoundPhonetic(const QString &s) { d->soundPhonetic = s; }
 
-const QString &VCard::uid() const
-{
-    return d->uid;
-}
+const QString &VCard::uid() const { return d->uid; }
 
-void VCard::setUid(const QString &u)
-{
-    d->uid = u;
-}
+void VCard::setUid(const QString &u) { d->uid = u; }
 
-const QString &VCard::url() const
-{
-    return d->url;
-}
+const QString &VCard::url() const { return d->url; }
 
-void VCard::setUrl(const QString &u)
-{
-    d->url = u;
-}
+void VCard::setUrl(const QString &u) { d->url = u; }
 
-const QString &VCard::desc() const
-{
-    return d->desc;
-}
+const QString &VCard::desc() const { return d->desc; }
 
-void VCard::setDesc(const QString &desc)
-{
-    d->desc = desc;
-}
+void VCard::setDesc(const QString &desc) { d->desc = desc; }
 
-const VCard::PrivacyClass &VCard::privacyClass() const
-{
-    return d->privacyClass;
-}
+const VCard::PrivacyClass &VCard::privacyClass() const { return d->privacyClass; }
 
-void VCard::setPrivacyClass(const VCard::PrivacyClass &c)
-{
-    d->privacyClass = c;
-}
+void VCard::setPrivacyClass(const VCard::PrivacyClass &c) { d->privacyClass = c; }
 
-const QByteArray &VCard::key() const
-{
-    return d->key;
-}
+const QByteArray &VCard::key() const { return d->key; }
 
-void VCard::setKey(const QByteArray &k)
-{
-    d->key = k;
-}
+void VCard::setKey(const QByteArray &k) { d->key = k; }
 } // namespace XMPP
diff --git a/src/xmpp/xmpp-im/xmpp_vcard.h b/src/xmpp/xmpp-im/xmpp_vcard.h
index 8dda52d3..5f4a7075 100644
--- a/src/xmpp/xmpp-im/xmpp_vcard.h
+++ b/src/xmpp/xmpp-im/xmpp_vcard.h
@@ -29,240 +29,234 @@
 class QDate;
 
 namespace XMPP {
-    class VCardPrivate;
+class VCardPrivate;
 
-    class VCard
-    {
+class VCard {
+public:
+    VCard();
+    VCard(const VCard &);
+    VCard &operator=(const VCard &);
+    ~VCard();
+
+    QDomElement  toXml(QDomDocument *) const;
+    static VCard fromXml(const QDomElement &);
+    bool         isEmpty() const;
+    inline bool  isNull() const { return !d; }
+    inline bool  operator!() const { return !d; }
+    inline       operator bool() const { return !!d; }
+    static VCard makeEmpty();
+
+    const QString &version() const;
+    void           setVersion(const QString &);
+
+    const QString &fullName() const;
+    void           setFullName(const QString &);
+
+    const QString &familyName() const;
+    void           setFamilyName(const QString &);
+
+    const QString &givenName() const;
+    void           setGivenName(const QString &);
+
+    const QString &middleName() const;
+    void           setMiddleName(const QString &);
+
+    const QString &prefixName() const;
+    void           setPrefixName(const QString &);
+
+    const QString &suffixName() const;
+    void           setSuffixName(const QString &);
+
+    const QString &nickName() const;
+    void           setNickName(const QString &);
+
+    const QByteArray &photo() const;
+    void              setPhoto(const QByteArray &);
+
+    const QString &photoURI() const;
+    void           setPhotoURI(const QString &);
+
+    const QDate bday() const;
+    void        setBday(const QDate &);
+
+    const QString &bdayStr() const;
+    void           setBdayStr(const QString &);
+
+    class Address {
     public:
-        VCard();
-        VCard(const VCard &);
-        VCard & operator=(const VCard &);
-        ~VCard();
-
-        QDomElement toXml(QDomDocument *) const;
-        static VCard fromXml(const QDomElement &);
-        bool isEmpty() const;
-        inline bool isNull() const { return !d; }
-        inline bool operator!() const { return !d; }
-        inline operator bool() const { return !!d; }
-        static VCard makeEmpty();
-
-        const QString &version() const;
-        void setVersion(const QString &);
-
-        const QString &fullName() const;
-        void setFullName(const QString &);
-
-        const QString &familyName() const;
-        void setFamilyName(const QString &);
-
-        const QString &givenName() const;
-        void setGivenName(const QString &);
-
-        const QString &middleName() const;
-        void setMiddleName(const QString &);
-
-        const QString &prefixName() const;
-        void setPrefixName(const QString &);
-
-        const QString &suffixName() const;
-        void setSuffixName(const QString &);
-
-        const QString &nickName() const;
-        void setNickName(const QString &);
-
-        const QByteArray &photo() const;
-        void setPhoto(const QByteArray &);
-
-        const QString &photoURI() const;
-        void setPhotoURI(const QString &);
-
-        const QDate bday() const;
-        void setBday(const QDate &);
-
-        const QString &bdayStr() const;
-        void setBdayStr(const QString &);
-
-        class Address {
-        public:
-            Address();
-
-            bool home;
-            bool work;
-            bool postal;
-            bool parcel;
-
-            bool dom;
-            bool intl;
-
-            bool pref;
-
-            QString pobox;
-            QString extaddr;
-            QString street;
-            QString locality;
-            QString region;
-            QString pcode;
-            QString country;
-        };
-        typedef QList<Address> AddressList;
-        const AddressList &addressList() const;
-        void setAddressList(const AddressList &);
-
-        class Label {
-        public:
-            Label();
-
-            bool home;
-            bool work;
-            bool postal;
-            bool parcel;
-
-            bool dom;
-            bool intl;
-
-            bool pref;
-
-            QStringList lines;
-        };
-        typedef QList<Label> LabelList;
-        const LabelList &labelList() const;
-        void setLabelList(const LabelList &);
-
-        class Phone {
-        public:
-            Phone();
+        Address();
+
+        bool home;
+        bool work;
+        bool postal;
+        bool parcel;
 
-            bool home;
-            bool work;
-            bool voice;
-            bool fax;
-            bool pager;
-            bool msg;
-            bool cell;
-            bool video;
-            bool bbs;
-            bool modem;
-            bool isdn;
-            bool pcs;
-            bool pref;
+        bool dom;
+        bool intl;
 
-            QString number;
-        };
-        typedef QList<Phone> PhoneList;
-        const PhoneList &phoneList() const;
-        void setPhoneList(const PhoneList &);
+        bool pref;
 
-        class Email {
-        public:
-            Email();
+        QString pobox;
+        QString extaddr;
+        QString street;
+        QString locality;
+        QString region;
+        QString pcode;
+        QString country;
+    };
+    typedef QList<Address> AddressList;
+    const AddressList &    addressList() const;
+    void                   setAddressList(const AddressList &);
 
-            bool home;
-            bool work;
-            bool internet;
-            bool x400;
+    class Label {
+    public:
+        Label();
 
-            QString userid;
-        };
-        typedef QList<Email> EmailList;
-        const EmailList &emailList() const;
-        void setEmailList(const EmailList &);
+        bool home;
+        bool work;
+        bool postal;
+        bool parcel;
 
-        const QString &jid() const;
-        void setJid(const QString &);
-
-        const QString &mailer() const;
-        void setMailer(const QString &);
-
-        const QString &timezone() const;
-        void setTimezone(const QString &);
-
-        class Geo {
-        public:
-            Geo();
-
-            QString lat;
-            QString lon;
-        };
-        const Geo &geo() const;
-        void setGeo(const Geo &);
-
-        const QString &title() const;
-        void setTitle(const QString &);
-
-        const QString &role() const;
-        void setRole(const QString &);
-
-        const QByteArray &logo() const;
-        void setLogo(const QByteArray &);
-
-        const QString &logoURI() const;
-        void setLogoURI(const QString &);
-
-        VCard agent() const;
-        void setAgent(const VCard &);
-
-        const QString agentURI() const;
-        void setAgentURI(const QString &);
-
-        class Org {
-        public:
-            Org();
+        bool dom;
+        bool intl;
 
-            QString name;
-            QStringList unit;
-        };
-        const Org &org() const;
-        void setOrg(const Org &);
-
-        const QStringList &categories() const;
-        void setCategories(const QStringList &);
+        bool pref;
 
-        const QString &note() const;
-        void setNote(const QString &);
+        QStringList lines;
+    };
+    typedef QList<Label> LabelList;
+    const LabelList &    labelList() const;
+    void                 setLabelList(const LabelList &);
 
-        const QString &prodId() const; // it must equal to "Psi" ;-)
-        void setProdId(const QString &);
-
-        const QString &rev() const;
-        void setRev(const QString &);
-
-        const QString &sortString() const;
-        void setSortString(const QString &);
-
-        const QByteArray &sound() const;
-        void setSound(const QByteArray &);
+    class Phone {
+    public:
+        Phone();
+
+        bool home;
+        bool work;
+        bool voice;
+        bool fax;
+        bool pager;
+        bool msg;
+        bool cell;
+        bool video;
+        bool bbs;
+        bool modem;
+        bool isdn;
+        bool pcs;
+        bool pref;
+
+        QString number;
+    };
+    typedef QList<Phone> PhoneList;
+    const PhoneList &    phoneList() const;
+    void                 setPhoneList(const PhoneList &);
 
-        const QString &soundURI() const;
-        void setSoundURI(const QString &);
+    class Email {
+    public:
+        Email();
 
-        const QString &soundPhonetic() const;
-        void setSoundPhonetic(const QString &);
+        bool home;
+        bool work;
+        bool internet;
+        bool x400;
 
-        const QString &uid() const;
-        void setUid(const QString &);
+        QString userid;
+    };
+    typedef QList<Email> EmailList;
+    const EmailList &    emailList() const;
+    void                 setEmailList(const EmailList &);
 
-        const QString &url() const;
-        void setUrl(const QString &);
+    const QString &jid() const;
+    void           setJid(const QString &);
 
-        const QString &desc() const;
-        void setDesc(const QString &);
+    const QString &mailer() const;
+    void           setMailer(const QString &);
 
-        enum PrivacyClass {
-            pcNone = 0,
-            pcPublic = 1,
-            pcPrivate,
-            pcConfidential
-        };
-        const PrivacyClass &privacyClass() const;
-        void setPrivacyClass(const PrivacyClass &);
+    const QString &timezone() const;
+    void           setTimezone(const QString &);
 
-        const QByteArray &key() const;
-        void setKey(const QByteArray &);
+    class Geo {
+    public:
+        Geo();
 
-    private:
-        QSharedDataPointer<VCardPrivate> d;
+        QString lat;
+        QString lon;
     };
+    const Geo &geo() const;
+    void       setGeo(const Geo &);
+
+    const QString &title() const;
+    void           setTitle(const QString &);
+
+    const QString &role() const;
+    void           setRole(const QString &);
+
+    const QByteArray &logo() const;
+    void              setLogo(const QByteArray &);
+
+    const QString &logoURI() const;
+    void           setLogoURI(const QString &);
+
+    VCard agent() const;
+    void  setAgent(const VCard &);
+
+    const QString agentURI() const;
+    void          setAgentURI(const QString &);
+
+    class Org {
+    public:
+        Org();
+
+        QString     name;
+        QStringList unit;
+    };
+    const Org &org() const;
+    void       setOrg(const Org &);
+
+    const QStringList &categories() const;
+    void               setCategories(const QStringList &);
+
+    const QString &note() const;
+    void           setNote(const QString &);
+
+    const QString &prodId() const; // it must equal to "Psi" ;-)
+    void           setProdId(const QString &);
+
+    const QString &rev() const;
+    void           setRev(const QString &);
+
+    const QString &sortString() const;
+    void           setSortString(const QString &);
+
+    const QByteArray &sound() const;
+    void              setSound(const QByteArray &);
+
+    const QString &soundURI() const;
+    void           setSoundURI(const QString &);
+
+    const QString &soundPhonetic() const;
+    void           setSoundPhonetic(const QString &);
+
+    const QString &uid() const;
+    void           setUid(const QString &);
+
+    const QString &url() const;
+    void           setUrl(const QString &);
+
+    const QString &desc() const;
+    void           setDesc(const QString &);
+
+    enum PrivacyClass { pcNone = 0, pcPublic = 1, pcPrivate, pcConfidential };
+    const PrivacyClass &privacyClass() const;
+    void                setPrivacyClass(const PrivacyClass &);
+
+    const QByteArray &key() const;
+    void              setKey(const QByteArray &);
+
+private:
+    QSharedDataPointer<VCardPrivate> d;
+};
 } // namespace XMPP
 
 QString openedImage2type(QIODevice *dev);
diff --git a/src/xmpp/xmpp-im/xmpp_xdata.cpp b/src/xmpp/xmpp-im/xmpp_xdata.cpp
index 2d4264c6..5e008d1c 100644
--- a/src/xmpp/xmpp-im/xmpp_xdata.cpp
+++ b/src/xmpp/xmpp-im/xmpp_xdata.cpp
@@ -34,127 +34,79 @@ using namespace XMPP;
 // XData::Field
 //----------------------------------------------------------------------------
 
-QString XData::Field::desc() const
-{
-    return _desc;
-}
+QString XData::Field::desc() const { return _desc; }
 
-void XData::Field::setDesc(const QString &d)
-{
-    _desc = d;
-}
+void XData::Field::setDesc(const QString &d) { _desc = d; }
 
-XData::Field::OptionList XData::Field::options() const
-{
-    return _options;
-}
+XData::Field::OptionList XData::Field::options() const { return _options; }
 
-void XData::Field::setOptions(XData::Field::OptionList o)
-{
-    _options = o;
-}
+void XData::Field::setOptions(XData::Field::OptionList o) { _options = o; }
 
-XData::Field::MediaElement XData::Field::mediaElement() const
-{
-    return _mediaElement;
-}
+XData::Field::MediaElement XData::Field::mediaElement() const { return _mediaElement; }
 
-void XData::Field::setMediaElement(const XData::Field::MediaElement &el)
-{
-    _mediaElement = el;
-}
+void XData::Field::setMediaElement(const XData::Field::MediaElement &el) { _mediaElement = el; }
 
-bool XData::Field::required() const
-{
-    return _required;
-}
+bool XData::Field::required() const { return _required; }
 
-void XData::Field::setRequired(bool r)
-{
-    _required = r;
-}
+void XData::Field::setRequired(bool r) { _required = r; }
 
-QString XData::Field::label() const
-{
-    return _label;
-}
+QString XData::Field::label() const { return _label; }
 
-void XData::Field::setLabel(const QString &l)
-{
-    _label = l;
-}
+void XData::Field::setLabel(const QString &l) { _label = l; }
 
-QString XData::Field::var() const
-{
-    return _var;
-}
+QString XData::Field::var() const { return _var; }
 
-void XData::Field::setVar(const QString &v)
-{
-    _var = v;
-}
+void XData::Field::setVar(const QString &v) { _var = v; }
 
-QStringList XData::Field::value() const
-{
-    return _value;
-}
+QStringList XData::Field::value() const { return _value; }
 
-void XData::Field::setValue(const QStringList &v)
-{
-    _value = v;
-}
+void XData::Field::setValue(const QStringList &v) { _value = v; }
 
-XData::Field::Type XData::Field::type() const
-{
-    return _type;
-}
+XData::Field::Type XData::Field::type() const { return _type; }
 
-void XData::Field::setType(XData::Field::Type t)
-{
-    _type = t;
-}
+void XData::Field::setType(XData::Field::Type t) { _type = t; }
 
 bool XData::Field::isValid() const
 {
-    if ( _required && _value.isEmpty() )
+    if (_required && _value.isEmpty())
         return false;
 
-    if ( _type == Field_Hidden || _type == Field_Fixed) {
+    if (_type == Field_Hidden || _type == Field_Fixed) {
         return true;
     }
-    if ( _type == Field_Boolean ) {
-        if ( _value.count() != 1 )
+    if (_type == Field_Boolean) {
+        if (_value.count() != 1)
             return false;
 
         QString str = _value.first();
-        if ( str == "0" || str == "1" || str == "true" || str == "false" || str == "yes" || str == "no" )
+        if (str == "0" || str == "1" || str == "true" || str == "false" || str == "yes" || str == "no")
             return true;
     }
-    if ( _type == Field_TextSingle || _type == Field_TextPrivate ) {
-        if ( _value.count() == 1 )
+    if (_type == Field_TextSingle || _type == Field_TextPrivate) {
+        if (_value.count() == 1)
             return true;
     }
-    if ( _type == Field_TextMulti ) {
-        //no particular test. empty/required case already caught (see above)
+    if (_type == Field_TextMulti) {
+        // no particular test. empty/required case already caught (see above)
         return true;
     }
-    if ( _type == Field_ListSingle || _type == Field_ListMulti ) {
-        //no particular test. empty/required case already caught (see above)
+    if (_type == Field_ListSingle || _type == Field_ListMulti) {
+        // no particular test. empty/required case already caught (see above)
         return true;
     }
-    if ( _type == Field_JidSingle ) {
-        if ( _value.count() != 1 )
+    if (_type == Field_JidSingle) {
+        if (_value.count() != 1)
             return false;
 
-        Jid j( _value.first() );
+        Jid j(_value.first());
         return j.isValid();
     }
-    if ( _type == Field_JidMulti ) {
-        QStringList::ConstIterator it = _value.begin();
-        bool allValid = true;
-        for ( ; it != _value.end(); ++it) {
+    if (_type == Field_JidMulti) {
+        QStringList::ConstIterator it       = _value.begin();
+        bool                       allValid = true;
+        for (; it != _value.end(); ++it) {
             Jid j(*it);
-            if ( !j.isValid() ) {
+            if (!j.isValid()) {
                 allValid = false;
                 break;
             }
@@ -167,30 +119,30 @@ bool XData::Field::isValid() const
 
 void XData::Field::fromXml(const QDomElement &e)
 {
-    if ( e.tagName() != "field" )
+    if (e.tagName() != "field")
         return;
 
-    _var = e.attribute("var");
+    _var   = e.attribute("var");
     _label = e.attribute("label");
 
     QString type = e.attribute("type");
-    if ( type == "boolean" )
+    if (type == "boolean")
         _type = Field_Boolean;
-    else if ( type == "fixed" )
+    else if (type == "fixed")
         _type = Field_Fixed;
-    else if ( type == "hidden" )
+    else if (type == "hidden")
         _type = Field_Hidden;
-    else if ( type == "jid-multi" )
+    else if (type == "jid-multi")
         _type = Field_JidMulti;
-    else if ( type == "jid-single" )
+    else if (type == "jid-single")
         _type = Field_JidSingle;
-    else if ( type == "list-multi" )
+    else if (type == "list-multi")
         _type = Field_ListMulti;
-    else if ( type == "list-single" )
+    else if (type == "list-single")
         _type = Field_ListSingle;
-    else if ( type == "text-multi" )
+    else if (type == "text-multi")
         _type = Field_TextMulti;
-    else if ( type == "text-private" )
+    else if (type == "text-private")
         _type = Field_TextPrivate;
     else
         _type = Field_TextSingle;
@@ -201,27 +153,26 @@ void XData::Field::fromXml(const QDomElement &e)
     _value.clear();
 
     QDomNode n = e.firstChild();
-    for ( ; !n.isNull(); n = n.nextSibling() ) {
+    for (; !n.isNull(); n = n.nextSibling()) {
         QDomElement i = n.toElement();
-        if ( i.isNull() )
+        if (i.isNull())
             continue;
 
         QString tag = i.tagName();
-        if ( tag == "required" )
+        if (tag == "required")
             _required = true;
-        else if ( tag == "desc" )
+        else if (tag == "desc")
             _desc = i.text().trimmed();
-        else if ( tag == "option" ) {
+        else if (tag == "option") {
             Option o;
             o.label = i.attribute("label");
             o.value = subTagText(i, "value");
             _options.append(o);
-        }
-        else if ( tag == "value" ) {
+        } else if (tag == "value") {
             _value.append(i.text());
-        }
-        else if (tag == "media" && (i.namespaceURI() == "urn:xmpp:media-element"
-                 || i.namespaceURI() == "urn:xmpp:media-element")) { // allow only one media element
+        } else if (tag == "media"
+                   && (i.namespaceURI() == "urn:xmpp:media-element"
+                       || i.namespaceURI() == "urn:xmpp:media-element")) { // allow only one media element
             QSize s;
             if (i.hasAttribute("width")) {
                 s.setWidth(i.attribute("width").toInt());
@@ -230,16 +181,16 @@ void XData::Field::fromXml(const QDomElement &e)
                 s.setHeight(i.attribute("height").toInt());
             }
             _mediaElement.setMediaSize(s);
-            for(QDomNode un = i.firstChild(); !un.isNull(); un = un.nextSibling()) {
+            for (QDomNode un = i.firstChild(); !un.isNull(); un = un.nextSibling()) {
                 QDomElement uel = un.toElement();
-                if(uel.isNull() || uel.tagName() != "uri") {
+                if (uel.isNull() || uel.tagName() != "uri") {
                     continue;
                 }
-                QStringList type = uel.attribute("type").split(';');
-                QHash<QString,QString> params;
+                QStringList             type = uel.attribute("type").split(';');
+                QHash<QString, QString> params;
                 for (int i = 1; i < type.size(); ++i) {
-                    QStringList p = type.value(i).split('=');
-                    QString key = p[0].trimmed();
+                    QStringList p   = type.value(i).split('=');
+                    QString     key = p[0].trimmed();
                     if (!key.isEmpty()) {
                         params[key] = p.value(1).trimmed();
                     }
@@ -255,68 +206,68 @@ QDomElement XData::Field::toXml(QDomDocument *doc, bool submitForm) const
     QDomElement f = doc->createElement("field");
 
     // setting attributes...
-    if ( !_var.isEmpty() )
+    if (!_var.isEmpty())
         f.setAttribute("var", _var);
-    if ( !submitForm && !_label.isEmpty() )
+    if (!submitForm && !_label.isEmpty())
         f.setAttribute("label", _label);
 
     // now we're gonna get the 'type'
     QString type = "text-single";
-    if ( _type == Field_Boolean )
+    if (_type == Field_Boolean)
         type = "boolean";
-    else if ( _type == Field_Fixed )
+    else if (_type == Field_Fixed)
         type = "fixed";
-    else if ( _type == Field_Hidden )
+    else if (_type == Field_Hidden)
         type = "hidden";
-    else if ( _type == Field_JidMulti )
+    else if (_type == Field_JidMulti)
         type = "jid-multi";
-    else if ( _type == Field_JidSingle )
+    else if (_type == Field_JidSingle)
         type = "jid-single";
-    else if ( _type == Field_ListMulti )
+    else if (_type == Field_ListMulti)
         type = "list-multi";
-    else if ( _type == Field_ListSingle )
+    else if (_type == Field_ListSingle)
         type = "list-single";
-    else if ( _type == Field_TextMulti )
+    else if (_type == Field_TextMulti)
         type = "text-multi";
-    else if ( _type == Field_TextPrivate )
+    else if (_type == Field_TextPrivate)
         type = "text-private";
 
     f.setAttribute("type", type);
 
     // now, setting nested tags...
-    if ( !submitForm && _required )
-        f.appendChild( emptyTag(doc, "required") );
+    if (!submitForm && _required)
+        f.appendChild(emptyTag(doc, "required"));
 
-    if ( !submitForm && !_desc.isEmpty() )
-        f.appendChild( textTag(doc, "desc", _desc) );
+    if (!submitForm && !_desc.isEmpty())
+        f.appendChild(textTag(doc, "desc", _desc));
 
-    if ( !submitForm && !_options.isEmpty() ) {
+    if (!submitForm && !_options.isEmpty()) {
         OptionList::ConstIterator it = _options.begin();
-        for ( ; it != _options.end(); ++it) {
+        for (; it != _options.end(); ++it) {
             QDomElement o = doc->createElement("option");
             o.appendChild(textTag(doc, "value", (*it).value));
-            if ( !(*it).label.isEmpty() )
+            if (!(*it).label.isEmpty())
                 o.setAttribute("label", (*it).label);
             f.appendChild(o);
         }
     }
 
-    if ( !_value.isEmpty() ) {
+    if (!_value.isEmpty()) {
         QStringList::ConstIterator it = _value.begin();
-        for ( ; it != _value.end(); ++it)
-            f.appendChild( textTag(doc, "value", *it) );
+        for (; it != _value.end(); ++it)
+            f.appendChild(textTag(doc, "value", *it));
     }
 
-    if ( !_mediaElement.isEmpty() ) {
+    if (!_mediaElement.isEmpty()) {
         QDomElement media = doc->createElementNS("urn:xmpp:media-element", "media");
-        QSize s = _mediaElement.mediaSize();
+        QSize       s     = _mediaElement.mediaSize();
         if (!s.isEmpty()) {
             media.setAttribute("width", s.width());
             media.setAttribute("height", s.height());
         }
-        foreach(const MediaUri &uri, _mediaElement) {
+        foreach (const MediaUri &uri, _mediaElement) {
             QDomElement uriEl = doc->createElement("uri");
-            QString type = uri.mimeType;
+            QString     type  = uri.mimeType;
             foreach (const QString &k, uri.params.keys()) {
                 type += ";" + k + "=" + uri.params[k];
             }
@@ -334,32 +285,24 @@ QDomElement XData::Field::toXml(QDomDocument *doc, bool submitForm) const
 // MediaElement
 //----------------------------------------------------------------------------
 
-void XData::Field::MediaElement::append(const QString &type, const QString &uri,
-                                        QHash<QString,QString> params)
+void XData::Field::MediaElement::append(const QString &type, const QString &uri, QHash<QString, QString> params)
 {
     XData::Field::MediaUri u;
     u.mimeType = type;
-    u.uri = uri;
-    u.params = params;
+    u.uri      = uri;
+    u.params   = params;
     QList<XData::Field::MediaUri>::append(u);
 }
 
-void XData::Field::MediaElement::setMediaSize(const QSize &size)
-{
-    _size = size;
-}
+void XData::Field::MediaElement::setMediaSize(const QSize &size) { _size = size; }
 
-QSize XData::Field::MediaElement::mediaSize() const
-{
-    return _size;
-}
+QSize XData::Field::MediaElement::mediaSize() const { return _size; }
 
 bool XData::Field::MediaElement::checkSupport(const QStringList &wildcards)
 {
     foreach (const XData::Field::MediaUri &uri, *this) {
         foreach (const QString &wildcard, wildcards) {
-            if (QRegExp(wildcard, Qt::CaseSensitive, QRegExp::Wildcard)
-                    .exactMatch(uri.mimeType)) {
+            if (QRegExp(wildcard, Qt::CaseSensitive, QRegExp::Wildcard).exactMatch(uri.mimeType)) {
                 return true;
             }
         }
@@ -371,57 +314,29 @@ bool XData::Field::MediaElement::checkSupport(const QStringList &wildcards)
 // XData
 //----------------------------------------------------------------------------
 
-XData::XData() :
-    d(new Private)
-{
-    d->type = Data_Form;
-}
+XData::XData() : d(new Private) { d->type = Data_Form; }
 
-QString XData::title() const
-{
-    return d->title;
-}
+QString XData::title() const { return d->title; }
 
-void XData::setTitle(const QString &t)
-{
-    d->title = t;
-}
+void XData::setTitle(const QString &t) { d->title = t; }
 
-QString XData::instructions() const
-{
-    return d->instructions;
-}
+QString XData::instructions() const { return d->instructions; }
 
-void XData::setInstructions(const QString &i)
-{
-    d->instructions = i;
-}
+void XData::setInstructions(const QString &i) { d->instructions = i; }
 
-XData::Type XData::type() const
-{
-    return d->type;
-}
+XData::Type XData::type() const { return d->type; }
 
-void XData::setType(Type t)
-{
-    d->type = t;
-}
+void XData::setType(Type t) { d->type = t; }
 
-QString XData::registrarType() const
-{
-    return d->registrarType;
-}
+QString XData::registrarType() const { return d->registrarType; }
 
-XData::FieldList XData::fields() const
-{
-    return d->fields;
-}
+XData::FieldList XData::fields() const { return d->fields; }
 
 XData::Field XData::getField(const QString &var) const
 {
-    if ( !d->fields.isEmpty() ) {
+    if (!d->fields.isEmpty()) {
         FieldList::ConstIterator it = d->fields.begin();
-        for ( ; it != d->fields.end(); ++it) {
+        for (; it != d->fields.end(); ++it) {
             Field f = *it;
             if (f.isValid() && f.var() == var)
                 return f;
@@ -433,7 +348,7 @@ XData::Field XData::getField(const QString &var) const
 XData::Field &XData::fieldRef(const QString &var)
 {
     FieldList::Iterator it = d->fields.begin();
-    for ( ; it != d->fields.end(); ++it) {
+    for (; it != d->fields.end(); ++it) {
         if (it->isValid() && it->var() == var)
             break;
     }
@@ -456,11 +371,11 @@ void XData::fromXml(const QDomElement &e)
         return;
 
     QString type = e.attribute("type");
-    if ( type == "result" )
+    if (type == "result")
         d->type = Data_Result;
-    else if ( type == "submit" )
+    else if (type == "submit")
         d->type = Data_Submit;
-    else if ( type == "cancel" )
+    else if (type == "cancel")
         d->type = Data_Cancel;
     else
         d->type = Data_Form;
@@ -471,49 +386,47 @@ void XData::fromXml(const QDomElement &e)
     d->fields.clear();
 
     QDomNode n = e.firstChild();
-    for ( ; !n.isNull(); n = n.nextSibling() ) {
+    for (; !n.isNull(); n = n.nextSibling()) {
         QDomElement i = n.toElement();
-        if ( i.isNull() )
+        if (i.isNull())
             continue;
 
-        if ( i.tagName() == "field" ) {
+        if (i.tagName() == "field") {
             Field f;
             f.fromXml(i);
             d->fields.append(f);
             if (f.type() == Field::Field_Hidden && f.var() == "FORM_TYPE") {
                 d->registrarType = f.value().value(0);
             }
-        }
-        else if ( i.tagName() == "reported" ) {
+        } else if (i.tagName() == "reported") {
             d->report.clear();
             d->reportItems.clear();
 
             QDomNode nn = i.firstChild();
-            for ( ; !nn.isNull(); nn = nn.nextSibling() ) {
+            for (; !nn.isNull(); nn = nn.nextSibling()) {
                 QDomElement ii = nn.toElement();
-                if ( ii.isNull() )
+                if (ii.isNull())
                     continue;
 
-                if ( ii.tagName() == "field" ) {
-                    d->report.append( ReportField( ii.attribute("label"), ii.attribute("var") ) );
+                if (ii.tagName() == "field") {
+                    d->report.append(ReportField(ii.attribute("label"), ii.attribute("var")));
                 }
             }
-        }
-        else if ( i.tagName() == "item" ) {
+        } else if (i.tagName() == "item") {
             ReportItem item;
 
             QDomNode nn = i.firstChild();
-            for ( ; !nn.isNull(); nn = nn.nextSibling() ) {
+            for (; !nn.isNull(); nn = nn.nextSibling()) {
                 QDomElement ii = nn.toElement();
-                if ( ii.isNull() )
+                if (ii.isNull())
                     continue;
 
-                if ( ii.tagName() == "field" ) {
+                if (ii.tagName() == "field") {
                     item.insert(ii.attribute("var"), subTagText(ii, "value"));
                 }
             }
 
-            d->reportItems.append( item );
+            d->reportItems.append(item);
         }
     }
 }
@@ -523,45 +436,39 @@ QDomElement XData::toXml(QDomDocument *doc, bool submitForm) const
     QDomElement x = doc->createElementNS("jabber:x:data", "x");
 
     QString type = "form";
-    if ( d->type == Data_Result )
+    if (d->type == Data_Result)
         type = "result";
-    else if ( d->type == Data_Submit )
+    else if (d->type == Data_Submit)
         type = "submit";
-    else if ( d->type == Data_Cancel )
+    else if (d->type == Data_Cancel)
         type = "cancel";
 
     x.setAttribute("type", type);
 
-    if ( !submitForm && !d->title.isEmpty() )
-        x.appendChild( textTag(doc, "title", d->title) );
-    if ( !submitForm && !d->instructions.isEmpty() )
-        x.appendChild( textTag(doc, "instructions", d->instructions) );
+    if (!submitForm && !d->title.isEmpty())
+        x.appendChild(textTag(doc, "title", d->title));
+    if (!submitForm && !d->instructions.isEmpty())
+        x.appendChild(textTag(doc, "instructions", d->instructions));
 
-    if ( !d->fields.isEmpty() ) {
+    if (!d->fields.isEmpty()) {
         FieldList::ConstIterator it = d->fields.begin();
-        for ( ; it != d->fields.end(); ++it) {
+        for (; it != d->fields.end(); ++it) {
             Field f = *it;
-            if ( !(submitForm && f.var().isEmpty()) )
-                x.appendChild( f.toXml(doc, submitForm) );
+            if (!(submitForm && f.var().isEmpty()))
+                x.appendChild(f.toXml(doc, submitForm));
         }
     }
 
     return x;
 }
 
-const QList<XData::ReportField> &XData::report() const
-{
-    return d->report;
-}
+const QList<XData::ReportField> &XData::report() const { return d->report; }
 
-const QList<XData::ReportItem> &XData::reportItems() const
-{
-    return d->reportItems;
-}
+const QList<XData::ReportItem> &XData::reportItems() const { return d->reportItems; }
 
 bool XData::isValid() const
 {
-    foreach(const Field &f, d->fields) {
+    foreach (const Field &f, d->fields) {
         if (!f.isValid())
             return false;
     }
diff --git a/src/xmpp/xmpp-im/xmpp_xdata.h b/src/xmpp/xmpp-im/xmpp_xdata.h
index de1f5e87..c36ca9f6 100644
--- a/src/xmpp/xmpp-im/xmpp_xdata.h
+++ b/src/xmpp/xmpp-im/xmpp_xdata.h
@@ -32,151 +32,141 @@ class QDomDocument;
 class QDomElement;
 
 namespace XMPP {
-    class XData
-    {
-    public:
-        XData();
+class XData {
+public:
+    XData();
 
-        QString title() const;
-        void setTitle(const QString &);
+    QString title() const;
+    void    setTitle(const QString &);
 
-        QString instructions() const;
-        void setInstructions(const QString &);
+    QString instructions() const;
+    void    setInstructions(const QString &);
 
-        enum Type {
-            Data_Form,
-            Data_Result,
-            Data_Submit,
-            Data_Cancel
-        };
+    enum Type { Data_Form, Data_Result, Data_Submit, Data_Cancel };
 
-        Type type() const;
-        void setType(Type);
-        QString registrarType() const;
-
-        struct ReportField {
-            ReportField() { }
-            ReportField(const QString &_label, const QString &_name)
-                : label(_label)
-                , name(_name)
-            { }
-            QString label;
-            QString name;
-        };
-        const QList<ReportField> &report() const;
+    Type    type() const;
+    void    setType(Type);
+    QString registrarType() const;
 
-        typedef QMap<QString, QString> ReportItem;
-        const QList<ReportItem> &reportItems() const;
+    struct ReportField {
+        ReportField() {}
+        ReportField(const QString &_label, const QString &_name) : label(_label), name(_name) {}
+        QString label;
+        QString name;
+    };
+    const QList<ReportField> &report() const;
 
-        void fromXml(const QDomElement &);
-        QDomElement toXml(QDomDocument *, bool submitForm = true) const;
-        bool isValid() const;
+    typedef QMap<QString, QString> ReportItem;
+    const QList<ReportItem> &      reportItems() const;
 
+    void        fromXml(const QDomElement &);
+    QDomElement toXml(QDomDocument *, bool submitForm = true) const;
+    bool        isValid() const;
+
+public:
+    class Field {
     public:
-        class Field {
+        explicit Field() = default;
+        ~Field() {}
+
+        QString desc() const;
+        void    setDesc(const QString &);
+
+        struct Option {
+            QString label;
+            QString value;
+        };
+
+        struct MediaUri {
+            QString                 mimeType;
+            QString                 uri;
+            QHash<QString, QString> params;
+        };
+
+        class MediaElement : public QList<MediaUri> {
         public:
-            explicit Field() = default;
-            ~Field() {}
-
-            QString desc() const;
-            void setDesc(const QString &);
-
-            struct Option {
-                QString label;
-                QString value;
-            };
-
-            struct MediaUri {
-                QString mimeType;
-                QString uri;
-                QHash<QString,QString> params;
-            };
-
-            class MediaElement : public QList<MediaUri>
-            {
-            public:
-                void append(const QString &type, const QString &uri, QHash<QString,QString> params);
-                void setMediaSize(const QSize &size);
-                QSize mediaSize() const;
-                bool checkSupport(const QStringList &wildcards);
-
-            private:
-                QSize _size;
-            };
-
-            typedef QList<Option> OptionList;
-            OptionList options() const;
-            void setOptions(OptionList);
-
-            MediaElement mediaElement() const;
-            void setMediaElement(const MediaElement &);
-
-            bool required() const;
-            void setRequired(bool);
-
-            QString label() const;
-            void setLabel(const QString &);
-
-            QString var() const;
-            void setVar(const QString &);
-
-            // generic value variable, because every possible Type
-            // can be converted to QStringList. Field_Single will
-            // use just one string in QStringList. Field_Boolean will
-            // use just one string, and that string will equal 0 or 1.
-            // and so on...
-            QStringList value() const;
-            void setValue(const QStringList &);
-
-            enum Type {
-                Field_Boolean,
-                Field_Fixed,
-                Field_Hidden,
-                Field_JidMulti,
-                Field_JidSingle,
-                Field_ListMulti,
-                Field_ListSingle,
-                Field_TextMulti,
-                Field_TextPrivate,
-                Field_TextSingle
-            };
-
-            Type type() const;
-            void setType(Type);
-
-            bool isValid() const;
-
-            void fromXml(const QDomElement &);
-            QDomElement toXml(QDomDocument *, bool submitForm = true) const;
+            void  append(const QString &type, const QString &uri, QHash<QString, QString> params);
+            void  setMediaSize(const QSize &size);
+            QSize mediaSize() const;
+            bool  checkSupport(const QStringList &wildcards);
 
         private:
-            QString _desc, _label, _var;
-            QList<Option> _options;
-            MediaElement _mediaElement;
-            bool _required = false;
-            Type _type;
-            QStringList _value;
+            QSize _size;
         };
 
-        typedef QList<Field> FieldList;
+        typedef QList<Option> OptionList;
+        OptionList            options() const;
+        void                  setOptions(OptionList);
 
-        FieldList fields() const;
-        Field getField(const QString &var) const;
-        Field &fieldRef(const QString &var);
-        void setFields(const FieldList &fl);
+        MediaElement mediaElement() const;
+        void         setMediaElement(const MediaElement &);
 
-    private:
-        class Private : public QSharedData {
-        public:
-            QString title, instructions;
-            XData::Type type;
-            QString registrarType;
-            FieldList fields;
-            QList<ReportField> report;
-            QList<ReportItem>  reportItems;
+        bool required() const;
+        void setRequired(bool);
+
+        QString label() const;
+        void    setLabel(const QString &);
+
+        QString var() const;
+        void    setVar(const QString &);
+
+        // generic value variable, because every possible Type
+        // can be converted to QStringList. Field_Single will
+        // use just one string in QStringList. Field_Boolean will
+        // use just one string, and that string will equal 0 or 1.
+        // and so on...
+        QStringList value() const;
+        void        setValue(const QStringList &);
+
+        enum Type {
+            Field_Boolean,
+            Field_Fixed,
+            Field_Hidden,
+            Field_JidMulti,
+            Field_JidSingle,
+            Field_ListMulti,
+            Field_ListSingle,
+            Field_TextMulti,
+            Field_TextPrivate,
+            Field_TextSingle
         };
-        QSharedDataPointer<Private> d;
+
+        Type type() const;
+        void setType(Type);
+
+        bool isValid() const;
+
+        void        fromXml(const QDomElement &);
+        QDomElement toXml(QDomDocument *, bool submitForm = true) const;
+
+    private:
+        QString       _desc, _label, _var;
+        QList<Option> _options;
+        MediaElement  _mediaElement;
+        bool          _required = false;
+        Type          _type;
+        QStringList   _value;
+    };
+
+    typedef QList<Field> FieldList;
+
+    FieldList fields() const;
+    Field     getField(const QString &var) const;
+    Field &   fieldRef(const QString &var);
+    void      setFields(const FieldList &fl);
+
+private:
+    class Private : public QSharedData {
+    public:
+        QString            title, instructions;
+        XData::Type        type;
+        QString            registrarType;
+        FieldList          fields;
+        QList<ReportField> report;
+        QList<ReportItem>  reportItems;
     };
+    QSharedDataPointer<Private> d;
+};
 }; // namespace XMPP
 
 #endif // XMPP_XDATA_H
diff --git a/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp b/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
index bba61fe5..e73e610a 100644
--- a/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
+++ b/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
@@ -32,14 +32,9 @@
 //----------------------------------------------------------------------------
 // XDomNodeList
 //----------------------------------------------------------------------------
-XDomNodeList::XDomNodeList()
-{
-}
+XDomNodeList::XDomNodeList() {}
 
-XDomNodeList::XDomNodeList(const XDomNodeList &from) :
-    list(from.list)
-{
-}
+XDomNodeList::XDomNodeList(const XDomNodeList &from) : list(from.list) {}
 
 XDomNodeList::XDomNodeList(const QDomNodeList &from)
 {
@@ -47,9 +42,7 @@ XDomNodeList::XDomNodeList(const QDomNodeList &from)
         list += from.item(n);
 }
 
-XDomNodeList::~XDomNodeList()
-{
-}
+XDomNodeList::~XDomNodeList() {}
 
 XDomNodeList &XDomNodeList::operator=(const XDomNodeList &from)
 {
@@ -57,30 +50,15 @@ XDomNodeList &XDomNodeList::operator=(const XDomNodeList &from)
     return *this;
 }
 
-bool XDomNodeList::isEmpty() const
-{
-    return list.isEmpty();
-}
+bool XDomNodeList::isEmpty() const { return list.isEmpty(); }
 
-QDomNode XDomNodeList::item(int index) const
-{
-    return list.value(index);
-}
+QDomNode XDomNodeList::item(int index) const { return list.value(index); }
 
-uint XDomNodeList::length() const
-{
-    return (uint)list.count();
-}
+uint XDomNodeList::length() const { return (uint)list.count(); }
 
-bool XDomNodeList::operator==(const XDomNodeList &a) const
-{
-    return (list == a.list);
-}
+bool XDomNodeList::operator==(const XDomNodeList &a) const { return (list == a.list); }
 
-void XDomNodeList::append(const QDomNode &i)
-{
-    list += i;
-}
+void XDomNodeList::append(const QDomNode &i) { list += i; }
 
 // YYYYMMDDThh:mm:ss
 QDateTime stamp2TS(const QString &ts)
@@ -124,13 +102,8 @@ QString TS2stamp(const QDateTime &d)
 {
     QString str;
 
-    str.sprintf("%04d%02d%02dT%02d:%02d:%02d",
-                d.date().year(),
-                d.date().month(),
-                d.date().day(),
-                d.time().hour(),
-                d.time().minute(),
-                d.time().second());
+    str.sprintf("%04d%02d%02dT%02d:%02d:%02d", d.date().year(), d.date().month(), d.date().day(), d.time().hour(),
+                d.time().minute(), d.time().second());
 
     return str;
 }
@@ -195,7 +168,7 @@ XDomNodeList childElementsByTagNameNS(const QDomElement &e, const QString &nsURI
  * \param to destination jid
  * \param id stanza id
  * \return the created stanza
-*/
+ */
 QDomElement createIQ(QDomDocument *doc, const QString &type, const QString &to, const QString &id)
 {
     QDomElement iq = doc->createElement("iq");
@@ -211,16 +184,10 @@ QDomElement createIQ(QDomDocument *doc, const QString &type, const QString &to,
 
 /** \brief returns direct child element named "query"
  * \return the element (or a null QDomElemnt if not found)
-*/
-QDomElement queryTag(const QDomElement &e)
-{
-    return e.firstChildElement("query");
-}
+ */
+QDomElement queryTag(const QDomElement &e) { return e.firstChildElement("query"); }
 
-QString queryNS(const QDomElement &e)
-{
-    return e.firstChildElement("query").namespaceURI();
-}
+QString queryNS(const QDomElement &e) { return e.firstChildElement("query").namespaceURI(); }
 
 /**
     \brief Extracts the error code and description from the stanza element.
@@ -275,7 +242,7 @@ QDomElement addCorrectNS(const QDomElement &e)
         n = n.parentNode();
     QString ns;
     if (n.isNull() || !n.toElement().hasAttribute(xmlns)) { // if not found or it's namespaceURI
-        if (n.toElement().namespaceURI().isEmpty()) {       // if nothing found, then use default jabber:client namespace
+        if (n.toElement().namespaceURI().isEmpty()) { // if nothing found, then use default jabber:client namespace
             ns = "jabber:client";
         } else {
             ns = n.toElement().namespaceURI();
@@ -305,7 +272,7 @@ QDomElement addCorrectNS(const QDomElement &e)
             i.appendChild(n.cloneNode());
     }
 
-    //i.appendChild(frag);
+    // i.appendChild(frag);
     return i;
 }
 
@@ -320,10 +287,7 @@ QDomElement emptyTag(QDomDocument *doc, const QString &name)
     return tag;
 }
 
-bool hasSubTag(const QDomElement &e, const QString &name)
-{
-    return !e.firstChildElement(name).isNull();
-}
+bool hasSubTag(const QDomElement &e, const QString &name) { return !e.firstChildElement(name).isNull(); }
 
 QString subTagText(const QDomElement &e, const QString &name)
 {
@@ -507,10 +471,7 @@ void xmlToStringList(const QDomElement &e, const QString &name, QStringList *v)
     *v = list;
 }
 
-void setBoolAttribute(QDomElement e, const QString &name, bool b)
-{
-    e.setAttribute(name, b ? "true" : "false");
-}
+void setBoolAttribute(QDomElement e, const QString &name, bool b) { e.setAttribute(name, b ? "true" : "false"); }
 
 void readBoolAttribute(QDomElement e, const QString &name, bool *v)
 {
@@ -530,10 +491,7 @@ QString sanitizedLang(const QString &lang)
     return QString();
 }
 
-void setTagText(QDomElement &e, const QString &text)
-{
-    e.appendChild(e.ownerDocument().createTextNode(text));
-}
+void setTagText(QDomElement &e, const QString &text) { e.appendChild(e.ownerDocument().createTextNode(text)); }
 
 QDomElement textTagNS(QDomDocument *doc, const QString &ns, const QString &name, const QString &content)
 {
diff --git a/src/xmpp/xmpp-im/xmpp_xmlcommon.h b/src/xmpp/xmpp-im/xmpp_xmlcommon.h
index 027ac610..e1a43805 100644
--- a/src/xmpp/xmpp-im/xmpp_xmlcommon.h
+++ b/src/xmpp/xmpp-im/xmpp_xmlcommon.h
@@ -48,10 +48,7 @@ class XDomNodeList {
 
     bool operator==(const XDomNodeList &a) const;
 
-    bool operator!=(const XDomNodeList &a) const
-    {
-        return !operator==(a);
-    }
+    bool operator!=(const XDomNodeList &a) const { return !operator==(a); }
 
 private:
     QList<QDomNode> list;
@@ -72,7 +69,7 @@ QDomElement  addCorrectNS(const QDomElement &e);
 
 namespace XMLHelper {
 
-//QDomElement findSubTag(const QDomElement &e, const QString &name, bool *found);
+// QDomElement findSubTag(const QDomElement &e, const QString &name, bool *found);
 bool hasSubTag(const QDomElement &e, const QString &name);
 
 QDomElement emptyTag(QDomDocument *doc, const QString &name);
@@ -100,7 +97,7 @@ void xmlToStringList(const QDomElement &e, const QString &name, QStringList *v);
 void setBoolAttribute(QDomElement e, const QString &name, bool b);
 void readBoolAttribute(QDomElement e, const QString &name, bool *v);
 
-//QString tagContent(const QDomElement &e); // obsolete;
+// QString tagContent(const QDomElement &e); // obsolete;
 QString sanitizedLang(const QString &lang);
 
 } // namespace XMLHelper
diff --git a/src/xmpp/zlib/common.h b/src/xmpp/zlib/common.h
index d738379e..eca97b6d 100644
--- a/src/xmpp/zlib/common.h
+++ b/src/xmpp/zlib/common.h
@@ -3,22 +3,22 @@
 
 #define CHUNK_SIZE 1024
 
-static void initZStream(z_stream* z)
+static void initZStream(z_stream *z)
 {
-    z->next_in = nullptr;
-    z->avail_in = 0;
-    z->total_in = 0;
-    z->next_out = nullptr;
+    z->next_in   = nullptr;
+    z->avail_in  = 0;
+    z->total_in  = 0;
+    z->next_out  = nullptr;
     z->avail_out = 0;
     z->total_out = 0;
-    z->msg = nullptr;
-    z->state = nullptr;
-    z->zalloc = Z_NULL;
-    z->zfree = Z_NULL;
-    z->opaque = Z_NULL;
+    z->msg       = nullptr;
+    z->state     = nullptr;
+    z->zalloc    = Z_NULL;
+    z->zfree     = Z_NULL;
+    z->opaque    = Z_NULL;
     z->data_type = Z_BINARY;
-    z->adler = 0;
-    z->reserved = 0;
+    z->adler     = 0;
+    z->reserved  = 0;
 }
 
 #endif // ZLIB_COMMON_H
diff --git a/src/xmpp/zlib/zlibcompressor.cpp b/src/xmpp/zlib/zlibcompressor.cpp
index bbf43256..da6f067a 100644
--- a/src/xmpp/zlib/zlibcompressor.cpp
+++ b/src/xmpp/zlib/zlibcompressor.cpp
@@ -7,9 +7,9 @@
 #include <QObject>
 #include <QtDebug>
 
-ZLibCompressor::ZLibCompressor(QIODevice* device, int compression) : device_(device)
+ZLibCompressor::ZLibCompressor(QIODevice *device, int compression) : device_(device)
 {
-    zlib_stream_ = (z_stream*) malloc(sizeof(z_stream));
+    zlib_stream_ = (z_stream *)malloc(sizeof(z_stream));
     initZStream(zlib_stream_);
     int result = deflateInit(zlib_stream_, compression);
     Q_ASSERT(result == Z_OK);
@@ -30,7 +30,7 @@ void ZLibCompressor::flush()
         return;
 
     // Flush
-    write(QByteArray(),true);
+    write(QByteArray(), true);
     int result = deflateEnd(zlib_stream_);
     if (result != Z_OK)
         qWarning() << QString("compressor.c: deflateEnd failed (%1)").arg(result);
@@ -38,16 +38,13 @@ void ZLibCompressor::flush()
     flushed_ = true;
 }
 
-int ZLibCompressor::write(const QByteArray& input)
-{
-    return write(input,false);
-}
+int ZLibCompressor::write(const QByteArray &input) { return write(input, false); }
 
-int ZLibCompressor::write(const QByteArray& input, bool flush)
+int ZLibCompressor::write(const QByteArray &input, bool flush)
 {
     int result;
     zlib_stream_->avail_in = input.size();
-    zlib_stream_->next_in = (Bytef*) input.data();
+    zlib_stream_->next_in  = (Bytef *)input.data();
     QByteArray output;
 
     // Write the data
@@ -55,15 +52,14 @@ int ZLibCompressor::write(const QByteArray& input, bool flush)
     do {
         output.resize(output_position + CHUNK_SIZE);
         zlib_stream_->avail_out = CHUNK_SIZE;
-        zlib_stream_->next_out = (Bytef*) (output.data() + output_position);
-        result = deflate(zlib_stream_,(flush ? Z_FINISH : Z_NO_FLUSH));
+        zlib_stream_->next_out  = (Bytef *)(output.data() + output_position);
+        result                  = deflate(zlib_stream_, (flush ? Z_FINISH : Z_NO_FLUSH));
         if (result == Z_STREAM_ERROR) {
             qWarning() << QString("compressor.cpp: Error ('%1')").arg(zlib_stream_->msg);
             return result;
         }
         output_position += CHUNK_SIZE;
-    }
-    while (zlib_stream_->avail_out == 0);
+    } while (zlib_stream_->avail_out == 0);
     if (zlib_stream_->avail_in != 0) {
         qWarning("ZLibCompressor: avail_in != 0");
     }
@@ -74,15 +70,14 @@ int ZLibCompressor::write(const QByteArray& input, bool flush)
         do {
             output.resize(output_position + CHUNK_SIZE);
             zlib_stream_->avail_out = CHUNK_SIZE;
-            zlib_stream_->next_out = (Bytef*) (output.data() + output_position);
-            result = deflate(zlib_stream_,Z_SYNC_FLUSH);
+            zlib_stream_->next_out  = (Bytef *)(output.data() + output_position);
+            result                  = deflate(zlib_stream_, Z_SYNC_FLUSH);
             if (result == Z_STREAM_ERROR) {
                 qWarning() << QString("compressor.cpp: Error ('%1')").arg(zlib_stream_->msg);
                 return result;
             }
             output_position += CHUNK_SIZE;
-        }
-        while (zlib_stream_->avail_out == 0);
+        } while (zlib_stream_->avail_out == 0);
         output_position -= zlib_stream_->avail_out;
     }
     output.resize(output_position);
diff --git a/src/xmpp/zlib/zlibcompressor.h b/src/xmpp/zlib/zlibcompressor.h
index 92d1f113..754c5034 100644
--- a/src/xmpp/zlib/zlibcompressor.h
+++ b/src/xmpp/zlib/zlibcompressor.h
@@ -7,26 +7,25 @@
 
 class QIODevice;
 
-class ZLibCompressor : public QObject
-{
+class ZLibCompressor : public QObject {
     Q_OBJECT
 
 public:
-    ZLibCompressor(QIODevice* device, int compression = Z_DEFAULT_COMPRESSION);
+    ZLibCompressor(QIODevice *device, int compression = Z_DEFAULT_COMPRESSION);
     ~ZLibCompressor();
 
-    int write(const QByteArray&);
+    int write(const QByteArray &);
 
 protected slots:
     void flush();
 
 protected:
-    int write(const QByteArray&, bool flush);
+    int write(const QByteArray &, bool flush);
 
 private:
-    QIODevice* device_;
-    z_stream* zlib_stream_;
-    bool flushed_;
+    QIODevice *device_;
+    z_stream * zlib_stream_;
+    bool       flushed_;
 };
 
 #endif // ZLIBCOMPRESSOR_H
diff --git a/src/xmpp/zlib/zlibdecompressor.cpp b/src/xmpp/zlib/zlibdecompressor.cpp
index 0f0aafaf..9c67e6dd 100644
--- a/src/xmpp/zlib/zlibdecompressor.cpp
+++ b/src/xmpp/zlib/zlibdecompressor.cpp
@@ -7,9 +7,9 @@
 #include <QObject>
 #include <QtDebug>
 
-ZLibDecompressor::ZLibDecompressor(QIODevice* device) : device_(device)
+ZLibDecompressor::ZLibDecompressor(QIODevice *device) : device_(device)
 {
-    zlib_stream_ = (z_stream*) malloc(sizeof(z_stream));
+    zlib_stream_ = (z_stream *)malloc(sizeof(z_stream));
     initZStream(zlib_stream_);
     int result = inflateInit2(zlib_stream_, 15 + 32);
     Q_ASSERT(result == Z_OK);
@@ -30,7 +30,7 @@ void ZLibDecompressor::flush()
         return;
 
     // Flush
-    write(QByteArray(),true);
+    write(QByteArray(), true);
     int result = inflateEnd(zlib_stream_);
     if (result != Z_OK)
         qWarning() << QString("compressor.c: inflateEnd failed (%1)").arg(result);
@@ -38,16 +38,13 @@ void ZLibDecompressor::flush()
     flushed_ = true;
 }
 
-qint64 ZLibDecompressor::write(const QByteArray& input)
-{
-    return write(input,false);
-}
+qint64 ZLibDecompressor::write(const QByteArray &input) { return write(input, false); }
 
-qint64 ZLibDecompressor::write(const QByteArray& input, bool flush)
+qint64 ZLibDecompressor::write(const QByteArray &input, bool flush)
 {
     int result;
     zlib_stream_->avail_in = input.size();
-    zlib_stream_->next_in = (Bytef*) input.data();
+    zlib_stream_->next_in  = (Bytef *)input.data();
     QByteArray output;
 
     // Write the data
@@ -55,18 +52,18 @@ qint64 ZLibDecompressor::write(const QByteArray& input, bool flush)
     do {
         output.resize(output_position + CHUNK_SIZE);
         zlib_stream_->avail_out = CHUNK_SIZE;
-        zlib_stream_->next_out = (Bytef*) (output.data() + output_position);
-        result = inflate(zlib_stream_,(flush ? Z_FINISH : Z_NO_FLUSH));
+        zlib_stream_->next_out  = (Bytef *)(output.data() + output_position);
+        result                  = inflate(zlib_stream_, (flush ? Z_FINISH : Z_NO_FLUSH));
         if (result == Z_STREAM_ERROR) {
             qWarning() << QString("compressor.cpp: Error ('%1')").arg(zlib_stream_->msg);
             return result;
         }
         output_position += CHUNK_SIZE;
-    }
-    while (zlib_stream_->avail_out == 0);
-    //Q_ASSERT(zlib_stream_->avail_in == 0);
+    } while (zlib_stream_->avail_out == 0);
+    // Q_ASSERT(zlib_stream_->avail_in == 0);
     if (zlib_stream_->avail_in != 0) {
-        qWarning() << "ZLibDecompressor: Unexpected state: avail_in=" << zlib_stream_->avail_in << ",avail_out=" << zlib_stream_->avail_out << ",result=" << result;
+        qWarning() << "ZLibDecompressor: Unexpected state: avail_in=" << zlib_stream_->avail_in
+                   << ",avail_out=" << zlib_stream_->avail_out << ",result=" << result;
         return Z_STREAM_ERROR; // FIXME: Should probably return 'result'
     }
     output_position -= zlib_stream_->avail_out;
@@ -76,15 +73,14 @@ qint64 ZLibDecompressor::write(const QByteArray& input, bool flush)
         do {
             output.resize(output_position + CHUNK_SIZE);
             zlib_stream_->avail_out = CHUNK_SIZE;
-            zlib_stream_->next_out = (Bytef*) (output.data() + output_position);
-            result = inflate(zlib_stream_,Z_SYNC_FLUSH);
+            zlib_stream_->next_out  = (Bytef *)(output.data() + output_position);
+            result                  = inflate(zlib_stream_, Z_SYNC_FLUSH);
             if (result == Z_STREAM_ERROR) {
                 qWarning() << QString("compressor.cpp: Error ('%1')").arg(zlib_stream_->msg);
                 return result;
             }
             output_position += CHUNK_SIZE;
-        }
-        while (zlib_stream_->avail_out == 0);
+        } while (zlib_stream_->avail_out == 0);
         output_position -= zlib_stream_->avail_out;
     }
     output.resize(output_position);
diff --git a/src/xmpp/zlib/zlibdecompressor.h b/src/xmpp/zlib/zlibdecompressor.h
index 898d8c7d..01b99153 100644
--- a/src/xmpp/zlib/zlibdecompressor.h
+++ b/src/xmpp/zlib/zlibdecompressor.h
@@ -7,26 +7,25 @@
 
 class QIODevice;
 
-class ZLibDecompressor : public QObject
-{
+class ZLibDecompressor : public QObject {
     Q_OBJECT
 
 public:
-    ZLibDecompressor(QIODevice* device);
+    ZLibDecompressor(QIODevice *device);
     ~ZLibDecompressor();
 
-    qint64 write(const QByteArray&);
+    qint64 write(const QByteArray &);
 
 protected slots:
     void flush();
 
 protected:
-    qint64 write(const QByteArray&, bool flush);
+    qint64 write(const QByteArray &, bool flush);
 
 private:
-    QIODevice* device_;
-    z_stream* zlib_stream_;
-    bool flushed_;
+    QIODevice *device_;
+    z_stream * zlib_stream_;
+    bool       flushed_;
 };
 
 #endif // ZLIBDECOMPRESSOR_H
diff --git a/tools/icetunnel/main.cpp b/tools/icetunnel/main.cpp
index aff007af..b4aa37e6 100644
--- a/tools/icetunnel/main.cpp
+++ b/tools/icetunnel/main.cpp
@@ -17,42 +17,39 @@
  */
 
 #include <QCoreApplication>
+#include <QNetworkAddressEntry>
+#include <QNetworkInterface>
 #include <QTimer>
 #include <QUdpSocket>
-#include <QNetworkInterface>
-#include <QNetworkAddressEntry>
 #include <QtCrypto>
-#include <iris/netnames.h>
+#include <iris/ice176.h>
 #include <iris/netinterface.h>
+#include <iris/netnames.h>
 #include <iris/processquit.h>
 #include <iris/udpportreserver.h>
-#include <iris/ice176.h>
 #include <stdio.h>
 
 // scope values: 0 = local, 1 = link-local, 2 = private, 3 = public
 static int getAddressScope(const QHostAddress &a)
 {
-    if(a.protocol() == QAbstractSocket::IPv6Protocol)
-    {
-        if(a == QHostAddress(QHostAddress::LocalHostIPv6))
+    if (a.protocol() == QAbstractSocket::IPv6Protocol) {
+        if (a == QHostAddress(QHostAddress::LocalHostIPv6))
             return 0;
-        else if(XMPP::Ice176::isIPv6LinkLocalAddress(a))
+        else if (XMPP::Ice176::isIPv6LinkLocalAddress(a))
             return 1;
-    }
-    else if(a.protocol() == QAbstractSocket::IPv4Protocol)
-    {
+    } else if (a.protocol() == QAbstractSocket::IPv4Protocol) {
         quint32 v4 = a.toIPv4Address();
-        quint8 a0 = v4 >> 24;
-        quint8 a1 = (v4 >> 16) & 0xff;
-        if(a0 == 127)
+        quint8  a0 = v4 >> 24;
+        quint8  a1 = (v4 >> 16) & 0xff;
+        if (a0 == 127)
             return 0;
-        else if(a0 == 169 && a1 == 254)
+        else if (a0 == 169 && a1 == 254)
             return 1;
-        else if(a0 == 10)
+        else if (a0 == 10)
             return 2;
-        else if(a0 == 172 && a1 >= 16 && a1 <= 31)
+        else if (a0 == 172 && a1 >= 16 && a1 <= 31)
             return 2;
-        else if(a0 == 192 && a1 == 168)
+        else if (a0 == 192 && a1 == 168)
             return 2;
     }
 
@@ -65,15 +62,15 @@ static int comparePriority(const QHostAddress &a, const QHostAddress &b)
     // prefer closer scope
     int a_scope = getAddressScope(a);
     int b_scope = getAddressScope(b);
-    if(a_scope < b_scope)
+    if (a_scope < b_scope)
         return -1;
-    else if(a_scope > b_scope)
+    else if (a_scope > b_scope)
         return 1;
 
     // prefer ipv6
-    if(a.protocol() == QAbstractSocket::IPv6Protocol && b.protocol() != QAbstractSocket::IPv6Protocol)
+    if (a.protocol() == QAbstractSocket::IPv6Protocol && b.protocol() != QAbstractSocket::IPv6Protocol)
         return -1;
-    else if(b.protocol() == QAbstractSocket::IPv6Protocol && a.protocol() != QAbstractSocket::IPv6Protocol)
+    else if (b.protocol() == QAbstractSocket::IPv6Protocol && a.protocol() != QAbstractSocket::IPv6Protocol)
         return 1;
 
     return 0;
@@ -83,12 +80,10 @@ static QList<QHostAddress> sortAddrs(const QList<QHostAddress> &in)
 {
     QList<QHostAddress> out;
 
-    foreach(const QHostAddress &a, in)
-    {
+    foreach (const QHostAddress &a, in) {
         int at;
-        for(at = 0; at < out.count(); ++at)
-        {
-            if(comparePriority(a, out[at]) < 0)
+        for (at = 0; at < out.count(); ++at) {
+            if (comparePriority(a, out[at]) < 0)
                 break;
         }
 
@@ -102,14 +97,11 @@ static QList<QHostAddress> sortAddrs(const QList<QHostAddress> &in)
 static QString urlishEncode(const QString &in)
 {
     QString out;
-    for(int n = 0; n < in.length(); ++n)
-    {
-        if(in[n] == '%' || in[n] == ',' || in[n] == ';' || in[n] == ' ' || in[n] == '\n')
-        {
+    for (int n = 0; n < in.length(); ++n) {
+        if (in[n] == '%' || in[n] == ',' || in[n] == ';' || in[n] == ' ' || in[n] == '\n') {
             unsigned char c = (unsigned char)in[n].toLatin1();
             out += QString().sprintf("%%%02x", c);
-        }
-        else
+        } else
             out += in[n];
     }
     return out;
@@ -118,23 +110,19 @@ static QString urlishEncode(const QString &in)
 static QString urlishDecode(const QString &in, bool *ok = 0)
 {
     QString out;
-    for(int n = 0; n < in.length(); ++n)
-    {
-        if(in[n] == '%')
-        {
-            if(n + 2 >= in.length())
-            {
-                if(ok)
+    for (int n = 0; n < in.length(); ++n) {
+        if (in[n] == '%') {
+            if (n + 2 >= in.length()) {
+                if (ok)
                     *ok = false;
                 return QString();
             }
 
             QString hex = in.mid(n + 1, 2);
-            bool b;
-            int x = hex.toInt(&b, 16);
-            if(!b)
-            {
-                if(ok)
+            bool    b;
+            int     x = hex.toInt(&b, 16);
+            if (!b) {
+                if (ok)
                     *ok = false;
                 return QString();
             }
@@ -142,12 +130,11 @@ static QString urlishDecode(const QString &in, bool *ok = 0)
             unsigned char c = (unsigned char)x;
             out += c;
             n += 2;
-        }
-        else
+        } else
             out += in[n];
     }
 
-    if(ok)
+    if (ok)
         *ok = true;
     return out;
 }
@@ -170,7 +157,7 @@ static QString candidate_to_line(const XMPP::Ice176::Candidate &in)
     list += QString::number(in.rem_port);
     list += in.type;
 
-    for(int n = 0; n < list.count(); ++n)
+    for (int n = 0; n < list.count(); ++n)
         list[n] = urlishEncode(list[n]);
     return list.join(",");
 }
@@ -178,40 +165,38 @@ static QString candidate_to_line(const XMPP::Ice176::Candidate &in)
 static XMPP::Ice176::Candidate line_to_candidate(const QString &in)
 {
     QStringList list = in.split(',');
-    if(list.count() < 14)
+    if (list.count() < 14)
         return XMPP::Ice176::Candidate();
 
-    for(int n = 0; n < list.count(); ++n)
-    {
-        bool ok;
+    for (int n = 0; n < list.count(); ++n) {
+        bool    ok;
         QString str = urlishDecode(list[n], &ok);
-        if(!ok)
+        if (!ok)
             return XMPP::Ice176::Candidate();
         list[n] = str;
     }
 
     XMPP::Ice176::Candidate out;
-    out.component = list[0].toInt();
+    out.component  = list[0].toInt();
     out.foundation = list[1];
     out.generation = list[2].toInt();
-    out.id = list[3];
-    out.ip = QHostAddress(list[4]);
-    out.network = list[5].toInt();
-    out.port = list[6].toInt();
-    out.priority = list[7].toInt();
-    out.protocol = list[8];
-    out.rel_addr = QHostAddress(list[9]);
-    out.rel_port = list[10].toInt();
-    out.rem_addr = QHostAddress(list[11]);
-    out.rem_port = list[12].toInt();
-    out.type = list[13];
+    out.id         = list[3];
+    out.ip         = QHostAddress(list[4]);
+    out.network    = list[5].toInt();
+    out.port       = list[6].toInt();
+    out.priority   = list[7].toInt();
+    out.protocol   = list[8];
+    out.rel_addr   = QHostAddress(list[9]);
+    out.rel_port   = list[10].toInt();
+    out.rem_addr   = QHostAddress(list[11]);
+    out.rem_port   = list[12].toInt();
+    out.type       = list[13];
     return out;
 }
 
-class IceOffer
-{
+class IceOffer {
 public:
-    QString user, pass;
+    QString                        user, pass;
     QList<XMPP::Ice176::Candidate> candidates;
 };
 
@@ -220,9 +205,8 @@ static QStringList line_wrap(const QString &in, int maxlen)
     Q_ASSERT(maxlen >= 1);
 
     QStringList out;
-    int at = 0;
-    while(at < in.length())
-    {
+    int         at = 0;
+    while (at < in.length()) {
         int takeAmount = qMin(maxlen, in.length() - at);
         out += in.mid(at, takeAmount);
         at += takeAmount;
@@ -230,10 +214,7 @@ static QStringList line_wrap(const QString &in, int maxlen)
     return out;
 }
 
-static QString lines_unwrap(const QStringList &in)
-{
-    return in.join(QString());
-}
+static QString lines_unwrap(const QStringList &in) { return in.join(QString()); }
 
 static QStringList iceblock_create(const IceOffer &in)
 {
@@ -245,7 +226,7 @@ static QStringList iceblock_create(const IceOffer &in)
         userpass += urlishEncode(in.user);
         userpass += urlishEncode(in.pass);
         body += userpass.join(",");
-        foreach(const XMPP::Ice176::Candidate &c, in.candidates)
+        foreach (const XMPP::Ice176::Candidate &c, in.candidates)
             body += candidate_to_line(c);
         out += line_wrap(body.join(";"), 78);
     }
@@ -256,44 +237,41 @@ static QStringList iceblock_create(const IceOffer &in)
 static IceOffer iceblock_parse(const QStringList &in)
 {
     IceOffer out;
-    if(in.count() < 3 || in[0] != "-----BEGIN ICE-----" || in[in.count()-1] != "-----END ICE-----")
+    if (in.count() < 3 || in[0] != "-----BEGIN ICE-----" || in[in.count() - 1] != "-----END ICE-----")
         return IceOffer();
 
     QStringList body = lines_unwrap(in.mid(1, in.count() - 2)).split(';');
-    if(body.count() < 2)
+    if (body.count() < 2)
         return IceOffer();
 
     QStringList parts = body[0].split(',');
-    if(parts.count() != 2)
+    if (parts.count() != 2)
         return IceOffer();
     bool ok;
     out.user = urlishDecode(parts[0], &ok);
-    if(!ok || out.user.isEmpty())
+    if (!ok || out.user.isEmpty())
         return IceOffer();
     out.pass = urlishDecode(parts[1], &ok);
-    if(!ok || out.pass.isEmpty())
+    if (!ok || out.pass.isEmpty())
         return IceOffer();
 
-    for(int n = 1; n < body.count(); ++n)
-    {
+    for (int n = 1; n < body.count(); ++n) {
         XMPP::Ice176::Candidate c = line_to_candidate(body[n]);
-        if(c.type.isEmpty())
+        if (c.type.isEmpty())
             return IceOffer();
         out.candidates += c;
     }
     return out;
 }
 
-class IceBlockReader : public QObject
-{
+class IceBlockReader : public QObject {
     Q_OBJECT
 
 public:
     QCA::ConsoleReference *con;
-    QByteArray in;
+    QByteArray             in;
 
-    IceBlockReader(QObject *parent = 0) :
-        QObject(parent)
+    IceBlockReader(QObject *parent = 0) : QObject(parent)
     {
         bool ok;
 
@@ -312,16 +290,15 @@ private slots:
     void con_readyRead()
     {
         in += con->read();
-        if(in.contains("-----END ICE-----"))
-        {
+        if (in.contains("-----END ICE-----")) {
             delete con;
             con = 0;
 
             QStringList out;
-            QBuffer buf(&in);
+            QBuffer     buf(&in);
             buf.open(QIODevice::ReadOnly | QIODevice::Text);
             QTextStream ts(&buf);
-            while(!ts.atEnd())
+            while (!ts.atEnd())
                 out += ts.readLine();
             emit finished(out);
         }
@@ -336,15 +313,13 @@ private slots:
     }
 };
 
-class EnterPrompt : public QObject
-{
+class EnterPrompt : public QObject {
     Q_OBJECT
 
 public:
     QCA::ConsoleReference *con;
 
-    EnterPrompt(QObject *parent = 0) :
-        QObject(parent)
+    EnterPrompt(QObject *parent = 0) : QObject(parent)
     {
         bool ok;
 
@@ -362,8 +337,7 @@ class EnterPrompt : public QObject
 private slots:
     void con_readyRead()
     {
-        if(con->read().contains('\n'))
-        {
+        if (con->read().contains('\n')) {
             delete con;
             con = 0;
 
@@ -412,52 +386,43 @@ private slots:
         return;
 }*/
 
-class App : public QObject
-{
+class App : public QObject {
     Q_OBJECT
 
 public:
-    class Channel
-    {
+    class Channel {
     public:
         QUdpSocket *sock6, *sock4;
-        bool ready;
+        bool        ready;
     };
 
-    enum StunServiceType
-    {
-        Auto,
-        Basic,
-        Relay
-    };
+    enum StunServiceType { Auto, Basic, Relay };
 
-    int opt_mode = 0;
-    int opt_localBase = 0;
-    int opt_iceBase = 0;
-    int opt_channels = 0;
-    QString opt_stunHost;
-    int opt_stunPort = 0;
+    int             opt_mode      = 0;
+    int             opt_localBase = 0;
+    int             opt_iceBase   = 0;
+    int             opt_channels  = 0;
+    QString         opt_stunHost;
+    int             opt_stunPort = 0;
     StunServiceType opt_stunType = Auto;
-    QString opt_user;
-    QString opt_pass;
-    bool opt_ipv6_only = false;
-    bool opt_relay_udp_only = false;
-    bool opt_relay_tcp_only = false;
-
-    XMPP::NameResolver dns;
-    QHostAddress stunAddr;
-    XMPP::UdpPortReserver portReserver;
-    XMPP::Ice176 *ice = nullptr;
+    QString         opt_user;
+    QString         opt_pass;
+    bool            opt_ipv6_only      = false;
+    bool            opt_relay_udp_only = false;
+    bool            opt_relay_tcp_only = false;
+
+    XMPP::NameResolver                dns;
+    QHostAddress                      stunAddr;
+    XMPP::UdpPortReserver             portReserver;
+    XMPP::Ice176 *                    ice = nullptr;
     QList<XMPP::Ice176::LocalAddress> localAddrs;
-    QList<Channel> channels;
-    QCA::Console *console = nullptr;
-    IceBlockReader *reader = nullptr;
-    EnterPrompt *prompt = nullptr;
-    IceOffer inOffer;
+    QList<Channel>                    channels;
+    QCA::Console *                    console = nullptr;
+    IceBlockReader *                  reader  = nullptr;
+    EnterPrompt *                     prompt  = nullptr;
+    IceOffer                          inOffer;
 
-    App() : portReserver(this)
-    {
-    }
+    App() : portReserver(this) {}
 
     ~App()
     {
@@ -467,18 +432,15 @@ class App : public QObject
 
         delete ice;
 
-        for(int n = 0; n < channels.count(); ++n)
-        {
-            if(channels[n].sock6)
-            {
+        for (int n = 0; n < channels.count(); ++n) {
+            if (channels[n].sock6) {
                 channels[n].sock6->disconnect(this);
                 channels[n].sock6->setParent(0);
                 channels[n].sock6->deleteLater();
                 channels[n].sock6 = 0;
             }
 
-            if(channels[n].sock4)
-            {
+            if (channels[n].sock4) {
                 channels[n].sock4->disconnect(this);
                 channels[n].sock4->setParent(0);
                 channels[n].sock4->deleteLater();
@@ -492,10 +454,11 @@ public slots:
     {
         connect(XMPP::ProcessQuit::instance(), SIGNAL(quit()), SLOT(do_quit()));
 
-        connect(&dns, SIGNAL(resultsReady(const QList<XMPP::NameRecord> &)), SLOT(dns_resultsReady(const QList<XMPP::NameRecord> &)));
+        connect(&dns, SIGNAL(resultsReady(const QList<XMPP::NameRecord> &)),
+                SLOT(dns_resultsReady(const QList<XMPP::NameRecord> &)));
         connect(&dns, SIGNAL(error(XMPP::NameResolver::Error)), SLOT(dns_error(XMPP::NameResolver::Error)));
 
-        if(!opt_stunHost.isEmpty())
+        if (!opt_stunHost.isEmpty())
             dns.start(opt_stunHost.toLatin1(), XMPP::NameRecord::A);
         else
             start_ice();
@@ -508,22 +471,21 @@ public slots:
         connect(ice, SIGNAL(started()), SLOT(ice_started()));
         connect(ice, SIGNAL(stopped()), SLOT(ice_stopped()));
         connect(ice, SIGNAL(error(XMPP::Ice176::Error)), SLOT(ice_error(XMPP::Ice176::Error)));
-        connect(ice, SIGNAL(localCandidatesReady(const QList<XMPP::Ice176::Candidate> &)), SLOT(ice_localCandidatesReady(const QList<XMPP::Ice176::Candidate> &)));
+        connect(ice, SIGNAL(localCandidatesReady(const QList<XMPP::Ice176::Candidate> &)),
+                SLOT(ice_localCandidatesReady(const QList<XMPP::Ice176::Candidate> &)));
         connect(ice, SIGNAL(componentReady(int)), SLOT(ice_componentReady(int)));
         connect(ice, SIGNAL(readyRead(int)), SLOT(ice_readyRead(int)));
         connect(ice, SIGNAL(datagramsWritten(int, int)), SLOT(ice_datagramsWritten(int, int)));
 
         // set up local ports for forwarding
-        for(int n = 0; n < opt_channels; ++n)
-        {
+        for (int n = 0; n < opt_channels; ++n) {
             Channel chan;
 
-            int port = opt_localBase + 32 + n;
+            int port   = opt_localBase + 32 + n;
             chan.sock6 = setupSocket(QHostAddress::LocalHostIPv6, port);
             chan.sock4 = setupSocket(QHostAddress::LocalHost, port);
 
-            if(!chan.sock6 && !chan.sock4)
-            {
+            if (!chan.sock6 && !chan.sock4) {
                 printf("Unable to bind to port %d.\n", port);
                 emit quit();
                 return;
@@ -535,8 +497,7 @@ public slots:
         }
 
         QList<QHostAddress> listenAddrs;
-        if(!opt_relay_tcp_only)
-        {
+        if (!opt_relay_tcp_only) {
             /*XMPP::NetInterfaceManager netman;
             foreach(const QString &id, netman.interfaces())
             {
@@ -560,18 +521,16 @@ public slots:
                     strList += addr.addr.toString();
                 }
             }*/
-            foreach(const QNetworkInterface &ni, QNetworkInterface::allInterfaces())
-            {
+            foreach (const QNetworkInterface &ni, QNetworkInterface::allInterfaces()) {
                 QList<QNetworkAddressEntry> entries = ni.addressEntries();
-                foreach(const QNetworkAddressEntry &na, entries)
-                {
+                foreach (const QNetworkAddressEntry &na, entries) {
                     QHostAddress h = na.ip();
 
-                    if(opt_ipv6_only && h.protocol() != QAbstractSocket::IPv6Protocol)
+                    if (opt_ipv6_only && h.protocol() != QAbstractSocket::IPv6Protocol)
                         continue;
 
                     // skip localhost
-                    if(getAddressScope(h) == 0)
+                    if (getAddressScope(h) == 0)
                         continue;
 
                     // don't put the same address in twice.
@@ -579,9 +538,8 @@ public slots:
                     //   two link-local ipv6 interfaces
                     //   with the exact same address, we
                     //   only use the first one
-                    if(!listenAddrs.contains(h))
-                    {
-                        if(h.protocol() == QAbstractSocket::IPv6Protocol && XMPP::Ice176::isIPv6LinkLocalAddress(h))
+                    if (!listenAddrs.contains(h)) {
+                        if (h.protocol() == QAbstractSocket::IPv6Protocol && XMPP::Ice176::isIPv6LinkLocalAddress(h))
                             h.setScopeId(ni.name());
                         listenAddrs += h;
                     }
@@ -598,7 +556,7 @@ public slots:
         listenAddrs = sortAddrs(listenAddrs);
 
         QStringList strList;
-        foreach(const QHostAddress &h, listenAddrs) //QNetworkInterface::allAddresses())
+        foreach (const QHostAddress &h, listenAddrs) // QNetworkInterface::allAddresses())
         {
             XMPP::Ice176::LocalAddress addr;
             addr.addr = h;
@@ -606,8 +564,7 @@ public slots:
             strList += h.toString();
         }
 
-        if(opt_iceBase > 0)
-        {
+        if (opt_iceBase > 0) {
             portReserver.setAddresses(listenAddrs);
             portReserver.setPorts(opt_iceBase, opt_channels);
 
@@ -616,22 +573,19 @@ public slots:
 
         ice->setLocalAddresses(localAddrs);
 
-        if(!strList.isEmpty())
-        {
+        if (!strList.isEmpty()) {
             printf("Host addresses:\n");
-            foreach(const QString &s, strList)
+            foreach (const QString &s, strList)
                 printf("  %s\n", qPrintable(s));
         }
 
         ice->setComponentCount(opt_channels);
         ice->setLocalCandidateTrickle(false);
 
-        if(!stunAddr.isNull())
-        {
-            if(opt_stunType == Basic || opt_stunType == Auto)
+        if (!stunAddr.isNull()) {
+            if (opt_stunType == Basic || opt_stunType == Auto)
                 ice->setStunBindService(stunAddr, opt_stunPort);
-            if((opt_stunType == Relay || opt_stunType == Auto) && !opt_user.isEmpty())
-            {
+            if ((opt_stunType == Relay || opt_stunType == Auto) && !opt_user.isEmpty()) {
                 ice->setStunRelayUdpService(stunAddr, opt_stunPort, opt_user, opt_pass.toUtf8());
                 ice->setStunRelayTcpService(stunAddr, opt_stunPort, opt_user, opt_pass.toUtf8());
             }
@@ -639,14 +593,13 @@ public slots:
             printf("STUN service: %s\n", qPrintable(stunAddr.toString()));
         }
 
-        if(opt_relay_udp_only)
-        {
+        if (opt_relay_udp_only) {
             ice->setUseLocal(false);
             ice->setUseStunBind(false);
             ice->setUseStunRelayTcp(false);
         }
 
-        if(opt_mode == 0)
+        if (opt_mode == 0)
             ice->start(XMPP::Ice176::Initiator);
         else
             ice->start(XMPP::Ice176::Responder);
@@ -661,8 +614,7 @@ public slots:
         QUdpSocket *sock = new QUdpSocket(this);
         connect(sock, SIGNAL(readyRead()), SLOT(sock_readyRead()));
         connect(sock, SIGNAL(bytesWritten(qint64)), SLOT(sock_bytesWritten(qint64)));
-        if(!sock->bind(addr, port))
-        {
+        if (!sock->bind(addr, port)) {
             delete sock;
             return 0;
         }
@@ -676,12 +628,10 @@ private slots:
         // a good idea
         XMPP::ProcessQuit::cleanup();
 
-        if(ice)
-        {
+        if (ice) {
             printf("Stopping ICE.\n");
             ice->stop();
-        }
-        else
+        } else
             emit quit();
     }
 
@@ -701,22 +651,16 @@ private slots:
 
     void ice_started()
     {
-        if(channels.count() > 1)
-        {
+        if (channels.count() > 1) {
             printf("Local ports: %d-%d\n", opt_localBase, opt_localBase + channels.count() - 1);
             printf("Tunnel ports: %d-%d\n", opt_localBase + 32, opt_localBase + 32 + channels.count() - 1);
-        }
-        else
-        {
+        } else {
             printf("Local port: %d\n", opt_localBase);
             printf("Tunnel port: %d\n", opt_localBase + 32);
         }
     }
 
-    void ice_stopped()
-    {
-        emit quit();
-    }
+    void ice_stopped() { emit quit(); }
 
     void ice_error(XMPP::Ice176::Error e)
     {
@@ -727,11 +671,11 @@ private slots:
     void ice_localCandidatesReady(const QList<XMPP::Ice176::Candidate> &list)
     {
         IceOffer out;
-        out.user = ice->localUfrag();
-        out.pass = ice->localPassword();
-        out.candidates = list;
+        out.user          = ice->localUfrag();
+        out.pass          = ice->localPassword();
+        out.candidates    = list;
         QStringList block = iceblock_create(out);
-        foreach(const QString &s, block)
+        foreach (const QString &s, block)
             printf("%s\n", qPrintable(s));
 
         printf("Give above ICE block to peer.  Obtain peer ICE block and paste below...\n");
@@ -749,30 +693,28 @@ private slots:
         channels[index].ready = true;
 
         bool allReady = true;
-        for(int n = 0; n < channels.count(); ++n)
-        {
-            if(!channels[n].ready)
-            {
+        for (int n = 0; n < channels.count(); ++n) {
+            if (!channels[n].ready) {
                 allReady = false;
                 break;
             }
         }
 
-        if(allReady)
-        {
+        if (allReady) {
             printf("Tunnel established!\n");
         }
     }
 
     void ice_readyRead(int componentIndex)
     {
-        while(ice->hasPendingDatagrams(componentIndex))
-        {
+        while (ice->hasPendingDatagrams(componentIndex)) {
             QByteArray buf = ice->readDatagram(componentIndex);
-            if(channels[componentIndex].sock6)
-                channels[componentIndex].sock6->writeDatagram(buf, QHostAddress::LocalHostIPv6, opt_localBase + componentIndex);
-            if(channels[componentIndex].sock4)
-                channels[componentIndex].sock4->writeDatagram(buf, QHostAddress::LocalHost, opt_localBase + componentIndex);
+            if (channels[componentIndex].sock6)
+                channels[componentIndex].sock6->writeDatagram(buf, QHostAddress::LocalHostIPv6,
+                                                              opt_localBase + componentIndex);
+            if (channels[componentIndex].sock4)
+                channels[componentIndex].sock4->writeDatagram(buf, QHostAddress::LocalHost,
+                                                              opt_localBase + componentIndex);
         }
     }
 
@@ -790,8 +732,7 @@ private slots:
         reader = 0;
 
         inOffer = iceblock_parse(lines);
-        if(inOffer.user.isEmpty())
-        {
+        if (inOffer.user.isEmpty()) {
             printf("Error parsing ICE block.\n");
             emit quit();
             return;
@@ -834,26 +775,23 @@ private slots:
     void sock_readyRead()
     {
         QUdpSocket *sock = static_cast<QUdpSocket *>(sender());
-        int at = -1;
-        for(int n = 0; n < channels.count(); ++n)
-        {
-            if(channels[n].sock6 == sock || channels[n].sock4 == sock)
-            {
+        int         at   = -1;
+        for (int n = 0; n < channels.count(); ++n) {
+            if (channels[n].sock6 == sock || channels[n].sock4 == sock) {
                 at = n;
                 break;
             }
         }
         Q_ASSERT(at != -1);
 
-        while(sock->hasPendingDatagrams())
-        {
+        while (sock->hasPendingDatagrams()) {
             QByteArray buf;
             buf.resize(sock->pendingDatagramSize());
 
             // note: we don't care who sent it
             sock->readDatagram(buf.data(), buf.size());
 
-            if(channels[at].ready)
+            if (channels[at].ready)
                 ice->writeDatagram(at, buf);
         }
     }
@@ -894,83 +832,72 @@ int main(int argc, char **argv)
     QStringList args = qapp.arguments();
     args.removeFirst();
 
-    int localBase = 60000;
-    int iceBase = 0;
-    int channels = 1;
-    QString stunHost;
-    int stunPort = 3478;
+    int                  localBase = 60000;
+    int                  iceBase   = 0;
+    int                  channels  = 1;
+    QString              stunHost;
+    int                  stunPort = 3478;
     App::StunServiceType stunType = App::Auto;
-    QString user, pass;
-    bool ipv6_only = false;
-    bool relay_udp_only = false;
-    bool relay_tcp_only = false;
+    QString              user, pass;
+    bool                 ipv6_only      = false;
+    bool                 relay_udp_only = false;
+    bool                 relay_tcp_only = false;
 
-    for(int n = 0; n < args.count(); ++n)
-    {
+    for (int n = 0; n < args.count(); ++n) {
         QString s = args[n];
-        if(!s.startsWith("--"))
+        if (!s.startsWith("--"))
             continue;
         QString var;
         QString val;
-        int x = s.indexOf('=');
-        if(x != -1)
-        {
+        int     x = s.indexOf('=');
+        if (x != -1) {
             var = s.mid(2, x - 2);
             val = s.mid(x + 1);
-        }
-        else
-        {
+        } else {
             var = s.mid(2);
         }
 
         bool known = true;
 
-        if(var == "localbase")
+        if (var == "localbase")
             localBase = val.toInt();
-        else if(var == "icebase")
+        else if (var == "icebase")
             iceBase = val.toInt();
-        else if(var == "channels")
-        {
+        else if (var == "channels") {
             channels = val.toInt();
-            if(channels < 1 || channels > 32)
-            {
+            if (channels < 1 || channels > 32) {
                 fprintf(stderr, "Number of channels must be between 1-32.\n");
                 return 1;
             }
-        }
-        else if(var == "stunhost")
+        } else if (var == "stunhost")
             stunHost = val;
-        else if(var == "stunport")
+        else if (var == "stunport")
             stunPort = val.toInt();
-        else if(var == "stuntype")
-        {
-            if(val == "auto")
+        else if (var == "stuntype") {
+            if (val == "auto")
                 stunType = App::Auto;
-            else if(val == "basic")
+            else if (val == "basic")
                 stunType = App::Basic;
-            else if(val == "relay")
+            else if (val == "relay")
                 stunType = App::Relay;
-            else
-            {
+            else {
                 usage();
                 return 1;
             }
-        }
-        else if(var == "user")
+        } else if (var == "user")
             user = val;
-        else if(var == "pass")
+        else if (var == "pass")
             pass = val;
-        else if(var == "ipv6-only")
+        else if (var == "ipv6-only")
             ipv6_only = true;
-        else if(var == "relay-udp-only")
+        else if (var == "relay-udp-only")
             relay_udp_only = true;
-        else if(var == "relay-tcp-only")
+        else if (var == "relay-tcp-only")
             relay_tcp_only = true;
         else
             known = false;
 
-        if(!known)
-        {
+        if (!known) {
             fprintf(stderr, "Unknown option '%s'.\n", qPrintable(var));
             return 1;
         }
@@ -979,47 +906,43 @@ int main(int argc, char **argv)
         --n; // adjust position
     }
 
-    if(args.isEmpty())
-    {
+    if (args.isEmpty()) {
         usage();
         return 1;
     }
 
-    if(relay_udp_only && relay_tcp_only)
-    {
+    if (relay_udp_only && relay_tcp_only) {
         fprintf(stderr, "Cannot use both --relay-udp-only and --relay-tcp-only.\n");
         return 1;
     }
 
     int mode = -1;
-    if(args[0] == "initiator")
+    if (args[0] == "initiator")
         mode = 0;
-    else if(args[0] == "responder")
+    else if (args[0] == "responder")
         mode = 1;
 
-    if(mode == -1)
-    {
+    if (mode == -1) {
         usage();
         return 1;
     }
 
-    if(!QCA::isSupported("hmac(sha1)"))
-    {
+    if (!QCA::isSupported("hmac(sha1)")) {
         printf("Error: Need hmac(sha1) support.\n");
         return 1;
     }
 
     App app;
-    app.opt_mode = mode;
-    app.opt_localBase = localBase;
-    app.opt_iceBase = iceBase;
-    app.opt_channels = channels;
-    app.opt_stunHost = stunHost;
-    app.opt_stunPort = stunPort;
-    app.opt_stunType = stunType;
-    app.opt_user = user;
-    app.opt_pass = pass;
-    app.opt_ipv6_only = ipv6_only;
+    app.opt_mode           = mode;
+    app.opt_localBase      = localBase;
+    app.opt_iceBase        = iceBase;
+    app.opt_channels       = channels;
+    app.opt_stunHost       = stunHost;
+    app.opt_stunPort       = stunPort;
+    app.opt_stunType       = stunType;
+    app.opt_user           = user;
+    app.opt_pass           = pass;
+    app.opt_ipv6_only      = ipv6_only;
     app.opt_relay_udp_only = relay_udp_only;
     app.opt_relay_tcp_only = relay_tcp_only;
 
diff --git a/tools/nettool/main.cpp b/tools/nettool/main.cpp
index d52bd627..483dea0b 100644
--- a/tools/nettool/main.cpp
+++ b/tools/nettool/main.cpp
@@ -35,23 +35,22 @@ static QString prompt(const QString &s)
 {
     printf("* %s ", qPrintable(s));
     fflush(stdout);
-    char line[256];
-    char *ret = fgets(line, 255, stdin);
+    char    line[256];
+    char *  ret = fgets(line, 255, stdin);
     QString result;
-    if(ret)
+    if (ret)
         result = QString::fromLocal8Bit(line);
-    if(result[result.length() - 1] == '\n')
+    if (result[result.length() - 1] == '\n')
         result.truncate(result.length() - 1);
     return result;
 }
 
-class NetMonitor : public QObject
-{
+class NetMonitor : public QObject {
     Q_OBJECT
 public:
-    NetInterfaceManager *man;
-    QList<NetInterface*> ifaces;
-    NetAvailability *netavail;
+    NetInterfaceManager * man;
+    QList<NetInterface *> ifaces;
+    NetAvailability *     netavail;
 
     ~NetMonitor()
     {
@@ -69,10 +68,9 @@ public slots:
         connect(ProcessQuit::instance(), SIGNAL(quit()), SIGNAL(quit()));
 
         man = new NetInterfaceManager;
-        connect(man, SIGNAL(interfaceAvailable(const QString &)),
-            SLOT(here(const QString &)));
+        connect(man, SIGNAL(interfaceAvailable(const QString &)), SLOT(here(const QString &)));
         QStringList list = man->interfaces();
-        for(int n = 0; n < list.count(); ++n)
+        for (int n = 0; n < list.count(); ++n)
             here(list[n]);
 
         netavail = new NetAvailability;
@@ -86,9 +84,9 @@ public slots:
         connect(iface, SIGNAL(unavailable()), SLOT(gone()));
         printf("HERE: %s name=[%s]\n", qPrintable(iface->id()), qPrintable(iface->name()));
         QList<QHostAddress> addrs = iface->addresses();
-        for(int n = 0; n < addrs.count(); ++n)
+        for (int n = 0; n < addrs.count(); ++n)
             printf("  address: %s\n", qPrintable(addrs[n].toString()));
-        if(!iface->gateway().isNull())
+        if (!iface->gateway().isNull())
             printf("  gateway: %s\n", qPrintable(iface->gateway().toString()));
         ifaces += iface;
     }
@@ -103,7 +101,7 @@ public slots:
 
     void avail(bool available)
     {
-        if(available)
+        if (available)
             printf("** Network available\n");
         else
             printf("** Network unavailable\n");
@@ -113,12 +111,11 @@ public slots:
 static QString dataToString(const QByteArray &buf)
 {
     QString out;
-    for(int n = 0; n < buf.size(); ++n)
-    {
+    for (int n = 0; n < buf.size(); ++n) {
         unsigned char c = (unsigned char)buf[n];
-        if(c == '\\')
+        if (c == '\\')
             out += "\\\\";
-        else if(c >= 0x20 || c < 0x7f)
+        else if (c >= 0x20 || c < 0x7f)
             out += c;
         else
             out += QString("\\x%1").arg((uint)c, 2, 16);
@@ -128,77 +125,75 @@ static QString dataToString(const QByteArray &buf)
 
 static void print_record(const NameRecord &r)
 {
-    switch(r.type())
-    {
-        case NameRecord::A:
-            printf("A: [%s] (ttl=%d)\n", qPrintable(r.address().toString()), r.ttl());
-            break;
-        case NameRecord::Aaaa:
-            printf("AAAA: [%s] (ttl=%d)\n", qPrintable(r.address().toString()), r.ttl());
-            break;
-        case NameRecord::Mx:
-            printf("MX: [%s] priority=%d (ttl=%d)\n", r.name().data(), r.priority(), r.ttl());
-            break;
-        case NameRecord::Srv:
-            printf("SRV: [%s] port=%d priority=%d weight=%d (ttl=%d)\n", r.name().data(), r.port(), r.priority(), r.weight(), r.ttl());
-            break;
-        case NameRecord::Ptr:
-            printf("PTR: [%s] (ttl=%d)\n", r.name().data(), r.ttl());
-            break;
-        case NameRecord::Txt:
-        {
-            QList<QByteArray> texts = r.texts();
-            printf("TXT: count=%d (ttl=%d)\n", texts.count(), r.ttl());
-            for(int n = 0; n < texts.count(); ++n)
-                printf("  len=%d [%s]\n", texts[n].size(), qPrintable(dataToString(texts[n])));
-            break;
-        }
-        case NameRecord::Hinfo:
-            printf("HINFO: [%s] [%s] (ttl=%d)\n", r.cpu().data(), r.os().data(), r.ttl());
-            break;
-        case NameRecord::Null:
-            printf("NULL: %d bytes (ttl=%d)\n", r.rawData().size(), r.ttl());
-            break;
-        default:
-            printf("(Unknown): type=%d (ttl=%d)\n", r.type(), r.ttl());
-            break;
+    switch (r.type()) {
+    case NameRecord::A:
+        printf("A: [%s] (ttl=%d)\n", qPrintable(r.address().toString()), r.ttl());
+        break;
+    case NameRecord::Aaaa:
+        printf("AAAA: [%s] (ttl=%d)\n", qPrintable(r.address().toString()), r.ttl());
+        break;
+    case NameRecord::Mx:
+        printf("MX: [%s] priority=%d (ttl=%d)\n", r.name().data(), r.priority(), r.ttl());
+        break;
+    case NameRecord::Srv:
+        printf("SRV: [%s] port=%d priority=%d weight=%d (ttl=%d)\n", r.name().data(), r.port(), r.priority(),
+               r.weight(), r.ttl());
+        break;
+    case NameRecord::Ptr:
+        printf("PTR: [%s] (ttl=%d)\n", r.name().data(), r.ttl());
+        break;
+    case NameRecord::Txt: {
+        QList<QByteArray> texts = r.texts();
+        printf("TXT: count=%d (ttl=%d)\n", texts.count(), r.ttl());
+        for (int n = 0; n < texts.count(); ++n)
+            printf("  len=%d [%s]\n", texts[n].size(), qPrintable(dataToString(texts[n])));
+        break;
+    }
+    case NameRecord::Hinfo:
+        printf("HINFO: [%s] [%s] (ttl=%d)\n", r.cpu().data(), r.os().data(), r.ttl());
+        break;
+    case NameRecord::Null:
+        printf("NULL: %d bytes (ttl=%d)\n", r.rawData().size(), r.ttl());
+        break;
+    default:
+        printf("(Unknown): type=%d (ttl=%d)\n", r.type(), r.ttl());
+        break;
     }
 }
 
 static int str2rtype(const QString &in)
 {
     QString str = in.toLower();
-    if(str == "a")
+    if (str == "a")
         return NameRecord::A;
-    else if(str == "aaaa")
+    else if (str == "aaaa")
         return NameRecord::Aaaa;
-    else if(str == "ptr")
+    else if (str == "ptr")
         return NameRecord::Ptr;
-    else if(str == "srv")
+    else if (str == "srv")
         return NameRecord::Srv;
-    else if(str == "mx")
+    else if (str == "mx")
         return NameRecord::Mx;
-    else if(str == "txt")
+    else if (str == "txt")
         return NameRecord::Txt;
-    else if(str == "hinfo")
+    else if (str == "hinfo")
         return NameRecord::Hinfo;
-    else if(str == "null")
+    else if (str == "null")
         return NameRecord::Null;
     else
         return -1;
 }
 
-class ResolveName : public QObject
-{
+class ResolveName : public QObject {
     Q_OBJECT
 public:
     ResolveName() = default;
 
-    QString name;
+    QString          name;
     NameRecord::Type type;
-    bool longlived = false;
-    NameResolver dns;
-    bool null_dump = false;
+    bool             longlived = false;
+    NameResolver     dns;
+    bool             null_dump = false;
 
 public slots:
     void start()
@@ -206,9 +201,8 @@ public slots:
         connect(ProcessQuit::instance(), SIGNAL(quit()), SIGNAL(quit()));
 
         connect(&dns, SIGNAL(resultsReady(const QList<XMPP::NameRecord> &)),
-            SLOT(dns_resultsReady(const QList<XMPP::NameRecord> &)));
-        connect(&dns, SIGNAL(error(XMPP::NameResolver::Error)),
-            SLOT(dns_error(XMPP::NameResolver::Error)));
+                SLOT(dns_resultsReady(const QList<XMPP::NameRecord> &)));
+        connect(&dns, SIGNAL(error(XMPP::NameResolver::Error)), SLOT(dns_error(XMPP::NameResolver::Error)));
 
         dns.start(name.toLatin1(), type, longlived ? NameResolver::LongLived : NameResolver::Single);
     }
@@ -219,11 +213,9 @@ public slots:
 private slots:
     void dns_resultsReady(const QList<XMPP::NameRecord> &list)
     {
-        if(null_dump && list[0].type() == NameRecord::Null)
-        {
+        if (null_dump && list[0].type() == NameRecord::Null) {
             QByteArray buf = list[0].rawData();
-            if(fwrite(buf.data(), buf.size(), 1, stdout) != static_cast<size_t>(buf.size()))
-            {
+            if (fwrite(buf.data(), buf.size(), 1, stdout) != static_cast<size_t>(buf.size())) {
                 /* FIXME:
                  C89/Unix allows fwrite() to return without having written everything.
                  The application should retry in that case.
@@ -232,14 +224,11 @@ private slots:
                 emit quit();
                 return;
             }
-        }
-        else
-        {
-            for(int n = 0; n < list.count(); ++n)
+        } else {
+            for (int n = 0; n < list.count(); ++n)
                 print_record(list[n]);
         }
-        if(!longlived)
-        {
+        if (!longlived) {
             dns.stop();
             emit quit();
         }
@@ -248,13 +237,13 @@ private slots:
     void dns_error(XMPP::NameResolver::Error e)
     {
         QString str;
-        if(e == NameResolver::ErrorNoName)
+        if (e == NameResolver::ErrorNoName)
             str = "ErrorNoName";
-        else if(e == NameResolver::ErrorTimeout)
+        else if (e == NameResolver::ErrorTimeout)
             str = "ErrorTimeout";
-        else if(e == NameResolver::ErrorNoLocal)
+        else if (e == NameResolver::ErrorNoLocal)
             str = "ErrorNoLocal";
-        else if(e == NameResolver::ErrorNoLongLived)
+        else if (e == NameResolver::ErrorNoLongLived)
             str = "ErrorNoLongLived";
         else // ErrorGeneric, or anything else
             str = "ErrorGeneric";
@@ -264,11 +253,10 @@ private slots:
     }
 };
 
-class ResolveAddr : public QObject
-{
+class ResolveAddr : public QObject {
     Q_OBJECT
 public:
-    QString name;
+    QString         name;
     AddressResolver dns;
 
 public slots:
@@ -277,9 +265,8 @@ public slots:
         connect(ProcessQuit::instance(), SIGNAL(quit()), SIGNAL(quit()));
 
         connect(&dns, SIGNAL(resultsReady(const QList<QHostAddress> &)),
-            SLOT(dns_resultsReady(const QList<QHostAddress> &)));
-        connect(&dns, SIGNAL(error(XMPP::AddressResolver::Error)),
-            SLOT(dns_error(XMPP::AddressResolver::Error)));
+                SLOT(dns_resultsReady(const QList<QHostAddress> &)));
+        connect(&dns, SIGNAL(error(XMPP::AddressResolver::Error)), SLOT(dns_error(XMPP::AddressResolver::Error)));
 
         dns.start(name.toLatin1());
     }
@@ -290,7 +277,7 @@ public slots:
 private slots:
     void dns_resultsReady(const QList<QHostAddress> &list)
     {
-        for(int n = 0; n < list.count(); ++n)
+        for (int n = 0; n < list.count(); ++n)
             printf("%s\n", qPrintable(list[n].toString()));
 
         emit quit();
@@ -301,19 +288,18 @@ private slots:
         Q_UNUSED(e);
 
         QString str;
-        //else // ErrorGeneric, or anything else
-            str = "ErrorGeneric";
+        // else // ErrorGeneric, or anything else
+        str = "ErrorGeneric";
 
         printf("Error: %s\n", qPrintable(str));
         emit quit();
     }
 };
 
-class BrowseServices : public QObject
-{
+class BrowseServices : public QObject {
     Q_OBJECT
 public:
-    QString type, domain;
+    QString        type, domain;
     ServiceBrowser browser;
 
 public slots:
@@ -322,9 +308,9 @@ public slots:
         connect(ProcessQuit::instance(), SIGNAL(quit()), SIGNAL(quit()));
 
         connect(&browser, SIGNAL(instanceAvailable(const XMPP::ServiceInstance &)),
-            SLOT(browser_instanceAvailable(const XMPP::ServiceInstance &)));
+                SLOT(browser_instanceAvailable(const XMPP::ServiceInstance &)));
         connect(&browser, SIGNAL(instanceUnavailable(const XMPP::ServiceInstance &)),
-            SLOT(browser_instanceUnavailable(const XMPP::ServiceInstance &)));
+                SLOT(browser_instanceUnavailable(const XMPP::ServiceInstance &)));
         connect(&browser, SIGNAL(error()), SLOT(browser_error()));
 
         browser.start(type, domain);
@@ -337,10 +323,9 @@ private slots:
     void browser_instanceAvailable(const XMPP::ServiceInstance &i)
     {
         printf("HERE: [%s] (%d attributes)\n", qPrintable(i.instance()), i.attributes().count());
-        QMap<QString,QByteArray> attribs = i.attributes();
-        QMapIterator<QString,QByteArray> it(attribs);
-        while(it.hasNext())
-        {
+        QMap<QString, QByteArray>         attribs = i.attributes();
+        QMapIterator<QString, QByteArray> it(attribs);
+        while (it.hasNext()) {
             it.next();
             printf("  [%s] = [%s]\n", qPrintable(it.key()), qPrintable(dataToString(it.value())));
         }
@@ -351,20 +336,17 @@ private slots:
         printf("GONE: [%s]\n", qPrintable(i.instance()));
     }
 
-    void browser_error()
-    {
-    }
+    void browser_error() {}
 };
 
-class ResolveService : public QObject
-{
+class ResolveService : public QObject {
     Q_OBJECT
 public:
-    int mode;
+    int     mode;
     QString instance;
     QString type;
     QString domain;
-    int port;
+    int     port;
 
     ServiceResolver dns;
 
@@ -374,13 +356,13 @@ public slots:
         connect(ProcessQuit::instance(), SIGNAL(quit()), SIGNAL(quit()));
 
         connect(&dns, SIGNAL(resultsReady(const QHostAddress &, int)),
-            SLOT(dns_resultsReady(const QHostAddress &, int)));
+                SLOT(dns_resultsReady(const QHostAddress &, int)));
         connect(&dns, SIGNAL(finished()), SLOT(dns_finished()));
         connect(&dns, SIGNAL(error()), SLOT(dns_error()));
 
-        if(mode == 0)
+        if (mode == 0)
             dns.startFromInstance(instance.toLatin1() + '.' + type.toLatin1() + ".local.");
-        else if(mode == 1)
+        else if (mode == 1)
             dns.startFromDomain(domain, type);
         else // 2
             dns.startFromPlain(domain, port);
@@ -396,10 +378,7 @@ private slots:
         dns.tryNext();
     }
 
-    void dns_finished()
-    {
-        emit quit();
-    }
+    void dns_finished() { emit quit(); }
 
     void dns_error()
     {
@@ -408,28 +387,27 @@ private slots:
     }
 };
 
-class PublishService : public QObject
-{
+class PublishService : public QObject {
     Q_OBJECT
 public:
-    QString instance;
-    QString type;
-    int port;
-    QMap<QString,QByteArray> attribs;
-    QByteArray extra_null;
+    QString                   instance;
+    QString                   type;
+    int                       port;
+    QMap<QString, QByteArray> attribs;
+    QByteArray                extra_null;
 
     ServiceLocalPublisher pub;
 
 public slots:
     void start()
     {
-        //NetInterfaceManager::instance();
+        // NetInterfaceManager::instance();
 
         connect(ProcessQuit::instance(), SIGNAL(quit()), SIGNAL(quit()));
 
         connect(&pub, SIGNAL(published()), SLOT(pub_published()));
         connect(&pub, SIGNAL(error(XMPP::ServiceLocalPublisher::Error)),
-            SLOT(pub_error(XMPP::ServiceLocalPublisher::Error)));
+                SLOT(pub_error(XMPP::ServiceLocalPublisher::Error)));
 
         pub.publish(instance, type, port, attribs);
     }
@@ -441,8 +419,7 @@ private slots:
     void pub_published()
     {
         printf("Published\n");
-        if(!extra_null.isEmpty())
-        {
+        if (!extra_null.isEmpty()) {
             NameRecord rec;
             rec.setNull(extra_null);
             pub.addRecord(rec);
@@ -456,17 +433,16 @@ private slots:
     }
 };
 
-class StunBind : public QObject
-{
+class StunBind : public QObject {
     Q_OBJECT
 public:
-    bool debug;
-    QHostAddress addr;
-    int port;
-    int localPort;
-    QUdpSocket *sock;
+    bool                 debug;
+    QHostAddress         addr;
+    int                  port;
+    int                  localPort;
+    QUdpSocket *         sock;
     StunTransactionPool *pool;
-    StunBinding *binding;
+    StunBinding *        binding;
 
     ~StunBind()
     {
@@ -481,15 +457,15 @@ public slots:
         connect(sock, SIGNAL(readyRead()), SLOT(sock_readyRead()));
 
         pool = new StunTransactionPool(StunTransaction::Udp, this);
-        if(debug)
+        if (debug)
             pool->setDebugLevel(StunTransactionPool::DL_Packet);
         else
             pool->setDebugLevel(StunTransactionPool::DL_Info);
-        connect(pool, SIGNAL(outgoingMessage(const QByteArray &, const QHostAddress &, int)), SLOT(pool_outgoingMessage(const QByteArray &, const QHostAddress &, int)));
+        connect(pool, SIGNAL(outgoingMessage(const QByteArray &, const QHostAddress &, int)),
+                SLOT(pool_outgoingMessage(const QByteArray &, const QHostAddress &, int)));
         connect(pool, SIGNAL(debugLine(const QString &)), SLOT(pool_debugLine(const QString &)));
 
-        if(!sock->bind(localPort != -1 ? localPort : 0))
-        {
+        if (!sock->bind(localPort != -1 ? localPort : 0)) {
             printf("Error binding to local port.\n");
             emit quit();
             return;
@@ -509,19 +485,15 @@ public slots:
 private slots:
     void sock_readyRead()
     {
-        while(sock->hasPendingDatagrams())
-        {
-            QByteArray buf(sock->pendingDatagramSize(), 0);
+        while (sock->hasPendingDatagrams()) {
+            QByteArray   buf(sock->pendingDatagramSize(), 0);
             QHostAddress from;
-            quint16 fromPort;
+            quint16      fromPort;
 
             sock->readDatagram(buf.data(), buf.size(), &from, &fromPort);
-            if(from == addr && fromPort == port)
-            {
+            if (from == addr && fromPort == port) {
                 processDatagram(buf);
-            }
-            else
-            {
+            } else {
                 printf("Response from unknown sender %s:%d, dropping.\n", qPrintable(from.toString()), fromPort);
             }
         }
@@ -536,15 +508,12 @@ private slots:
         sock->writeDatagram(packet, addr, port);
     }
 
-    void pool_debugLine(const QString &line)
-    {
-        printf("%s\n", qPrintable(line));
-    }
+    void pool_debugLine(const QString &line) { printf("%s\n", qPrintable(line)); }
 
     void binding_success()
     {
         QHostAddress saddr = binding->reflexiveAddress();
-        quint16 sport = binding->reflexivePort();
+        quint16      sport = binding->reflexivePort();
         printf("Server says we are %s;%d\n", qPrintable(saddr.toString()), sport);
         emit quit();
     }
@@ -560,34 +529,32 @@ private slots:
     void processDatagram(const QByteArray &buf)
     {
         StunMessage message = StunMessage::fromBinary(buf);
-        if(message.isNull())
-        {
+        if (message.isNull()) {
             printf("Warning: server responded with what doesn't seem to be a STUN packet, skipping.\n");
             return;
         }
 
-        if(!pool->writeIncomingMessage(message))
+        if (!pool->writeIncomingMessage(message))
             printf("Warning: received unexpected message, skipping.\n");
     }
 };
 
-class TurnClientTest : public QObject
-{
+class TurnClientTest : public QObject {
     Q_OBJECT
 public:
-    int mode = 0;
-    bool debug = false;
-    QHostAddress relayAddr;
-    int relayPort = 0;
-    QString relayUser;
-    QString relayPass;
-    QString relayRealm;
-    QHostAddress peerAddr;
-    int peerPort = 0;
-    QUdpSocket *udp = nullptr;
-    StunTransactionPool *pool = nullptr;
-    QList<bool> writeItems; // true = turn-originated, false = external
-    TurnClient *turn = nullptr;
+    int                  mode  = 0;
+    bool                 debug = false;
+    QHostAddress         relayAddr;
+    int                  relayPort = 0;
+    QString              relayUser;
+    QString              relayPass;
+    QString              relayRealm;
+    QHostAddress         peerAddr;
+    int                  peerPort = 0;
+    QUdpSocket *         udp      = nullptr;
+    StunTransactionPool *pool     = nullptr;
+    QList<bool>          writeItems; // true = turn-originated, false = external
+    TurnClient *         turn = nullptr;
 
     TurnClientTest() = default;
 
@@ -603,7 +570,7 @@ public slots:
         connect(ProcessQuit::instance(), SIGNAL(quit()), SLOT(do_quit()));
 
         turn = new TurnClient(this);
-        if(debug)
+        if (debug)
             turn->setDebugLevel(TurnClient::DL_Packet);
         else
             turn->setDebugLevel(TurnClient::DL_Info);
@@ -615,56 +582,51 @@ public slots:
         connect(turn, SIGNAL(retrying()), SLOT(turn_retrying()));
         connect(turn, SIGNAL(activated()), SLOT(turn_activated()));
         connect(turn, SIGNAL(readyRead()), SLOT(turn_readyRead()));
-        connect(turn, SIGNAL(packetsWritten(int, const QHostAddress &, int)), SLOT(turn_packetsWritten(int, const QHostAddress &, int)));
+        connect(turn, SIGNAL(packetsWritten(int, const QHostAddress &, int)),
+                SLOT(turn_packetsWritten(int, const QHostAddress &, int)));
         connect(turn, SIGNAL(error(XMPP::TurnClient::Error)), SLOT(turn_error(XMPP::TurnClient::Error)));
         connect(turn, SIGNAL(outgoingDatagram(const QByteArray &)), SLOT(turn_outgoingDatagram(const QByteArray &)));
         connect(turn, SIGNAL(debugLine(const QString &)), SLOT(turn_debugLine(const QString &)));
 
         turn->setClientSoftwareNameAndVersion("nettool (Iris)");
 
-        if(mode == 0)
-        {
+        if (mode == 0) {
             udp = new QUdpSocket(this);
             connect(udp, SIGNAL(readyRead()), SLOT(udp_readyRead()));
 
             // QUdpSocket bytesWritten is not DOR-DS safe, so we queue
-            connect(udp, SIGNAL(bytesWritten(qint64)), SLOT(udp_bytesWritten(qint64)),
-                Qt::QueuedConnection);
+            connect(udp, SIGNAL(bytesWritten(qint64)), SLOT(udp_bytesWritten(qint64)), Qt::QueuedConnection);
 
             pool = new StunTransactionPool(StunTransaction::Udp, this);
-            if(debug)
+            if (debug)
                 pool->setDebugLevel(StunTransactionPool::DL_Packet);
             else
                 pool->setDebugLevel(StunTransactionPool::DL_Info);
-            connect(pool, SIGNAL(outgoingMessage(const QByteArray &, const QHostAddress &, int)), SLOT(pool_outgoingMessage(const QByteArray &, const QHostAddress &, int)));
+            connect(pool, SIGNAL(outgoingMessage(const QByteArray &, const QHostAddress &, int)),
+                    SLOT(pool_outgoingMessage(const QByteArray &, const QHostAddress &, int)));
             connect(pool, SIGNAL(needAuthParams()), SLOT(pool_needAuthParams()));
             connect(pool, SIGNAL(debugLine(const QString &)), SLOT(pool_debugLine(const QString &)));
 
             pool->setLongTermAuthEnabled(true);
-            if(!relayUser.isEmpty())
-            {
+            if (!relayUser.isEmpty()) {
                 pool->setUsername(relayUser);
                 pool->setPassword(relayPass.toUtf8());
-                if(!relayRealm.isEmpty())
+                if (!relayRealm.isEmpty())
                     pool->setRealm(relayRealm);
             }
 
-            if(!udp->bind())
-            {
+            if (!udp->bind()) {
                 printf("Error binding to local port.\n");
                 emit quit();
                 return;
             }
 
             turn->connectToHost(pool);
-        }
-        else
-        {
-            if(!relayUser.isEmpty())
-            {
+        } else {
+            if (!relayUser.isEmpty()) {
                 turn->setUsername(relayUser);
                 turn->setPassword(relayPass.toUtf8());
-                if(!relayRealm.isEmpty())
+                if (!relayRealm.isEmpty())
                     turn->setRealm(relayRealm);
             }
 
@@ -679,15 +641,14 @@ public slots:
 private:
     void processDatagram(const QByteArray &buf)
     {
-        QByteArray data;
+        QByteArray   data;
         QHostAddress fromAddr;
-        int fromPort;
+        int          fromPort;
 
         bool notStun;
-        if(!pool->writeIncomingMessage(buf, &notStun))
-        {
+        if (!pool->writeIncomingMessage(buf, &notStun)) {
             data = turn->processIncomingDatagram(buf, notStun, &fromAddr, &fromPort);
-            if(!data.isNull())
+            if (!data.isNull())
                 processDataPacket(data, fromAddr, fromPort);
             else
                 printf("Warning: server responded with what doesn't seem to be a STUN or data packet, skipping.\n");
@@ -711,19 +672,15 @@ private slots:
 
     void udp_readyRead()
     {
-        while(udp->hasPendingDatagrams())
-        {
-            QByteArray buf(udp->pendingDatagramSize(), 0);
+        while (udp->hasPendingDatagrams()) {
+            QByteArray   buf(udp->pendingDatagramSize(), 0);
             QHostAddress from;
-            quint16 fromPort;
+            quint16      fromPort;
 
             udp->readDatagram(buf.data(), buf.size(), &from, &fromPort);
-            if(from == relayAddr && fromPort == relayPort)
-            {
+            if (from == relayAddr && fromPort == relayPort) {
                 processDatagram(buf);
-            }
-            else
-            {
+            } else {
                 printf("Response from unknown sender %s:%d, dropping.\n", qPrintable(from.toString()), fromPort);
             }
         }
@@ -733,7 +690,7 @@ private slots:
     {
         Q_UNUSED(bytes);
         bool wasTurnOriginated = writeItems.takeFirst();
-        if(wasTurnOriginated)
+        if (wasTurnOriginated)
             turn->outgoingDatagramsWritten(1);
     }
 
@@ -756,31 +713,20 @@ private slots:
         pool->setPassword(relayPass.toUtf8());
 
         QString str = prompt(QString("Realm: [%1]").arg(pool->realm()));
-        if(!str.isEmpty())
-        {
+        if (!str.isEmpty()) {
             relayRealm = str;
             pool->setRealm(relayRealm);
-        }
-        else
+        } else
             relayRealm = pool->realm();
 
         pool->continueAfterParams();
     }
 
-    void pool_debugLine(const QString &line)
-    {
-        turn_debugLine(line);
-    }
+    void pool_debugLine(const QString &line) { turn_debugLine(line); }
 
-    void turn_connected()
-    {
-        printf("TCP connected\n");
-    }
+    void turn_connected() { printf("TCP connected\n"); }
 
-    void turn_tlsHandshaken()
-    {
-        printf("TLS handshake completed\n");
-    }
+    void turn_tlsHandshaken() { printf("TLS handshake completed\n"); }
 
     void turn_closed()
     {
@@ -797,28 +743,23 @@ private slots:
         turn->setPassword(relayPass.toUtf8());
 
         QString str = prompt(QString("Realm: [%1]").arg(turn->realm()));
-        if(!str.isEmpty())
-        {
+        if (!str.isEmpty()) {
             relayRealm = str;
             turn->setRealm(relayRealm);
-        }
-        else
+        } else
             relayRealm = turn->realm();
 
         turn->continueAfterParams();
     }
 
-    void turn_retrying()
-    {
-        printf("Mismatch error, retrying...\n");
-    }
+    void turn_retrying() { printf("Mismatch error, retrying...\n"); }
 
     void turn_activated()
     {
         StunAllocate *allocate = turn->stunAllocate();
 
         QHostAddress saddr = allocate->reflexiveAddress();
-        quint16 sport = allocate->reflexivePort();
+        quint16      sport = allocate->reflexivePort();
         printf("Server says we are %s;%d\n", qPrintable(saddr.toString()), sport);
         saddr = allocate->relayedAddress();
         sport = allocate->relayedPort();
@@ -828,15 +769,16 @@ private slots:
         turn->addChannelPeer(peerAddr, peerPort);
 
         QByteArray buf = "Hello, world!";
-        printf("Relaying test packet of %d bytes [%s] to %s;%d...\n", buf.size(), buf.data(), qPrintable(peerAddr.toString()), peerPort);
+        printf("Relaying test packet of %d bytes [%s] to %s;%d...\n", buf.size(), buf.data(),
+               qPrintable(peerAddr.toString()), peerPort);
         turn->write(buf, peerAddr, peerPort);
     }
 
     void turn_readyRead()
     {
         QHostAddress addr;
-        int port;
-        QByteArray buf = turn->read(&addr, &port);
+        int          port;
+        QByteArray   buf = turn->read(&addr, &port);
 
         processDataPacket(buf, addr, port);
     }
@@ -862,10 +804,7 @@ private slots:
         udp->writeDatagram(buf, relayAddr, relayPort);
     }
 
-    void turn_debugLine(const QString &line)
-    {
-        printf("%s\n", qPrintable(line));
-    }
+    void turn_debugLine(const QString &line) { printf("%s\n", qPrintable(line)); }
 };
 
 void usage()
@@ -904,41 +843,36 @@ int main(int argc, char **argv)
     args.removeFirst();
 
     QString user, pass, realm;
-    bool debug = false;
+    bool    debug = false;
 
-    for(int n = 0; n < args.count(); ++n)
-    {
+    for (int n = 0; n < args.count(); ++n) {
         QString s = args[n];
-        if(!s.startsWith("--"))
+        if (!s.startsWith("--"))
             continue;
         QString var;
         QString val;
-        int x = s.indexOf('=');
-        if(x != -1)
-        {
+        int     x = s.indexOf('=');
+        if (x != -1) {
             var = s.mid(2, x - 2);
             val = s.mid(x + 1);
-        }
-        else
-        {
+        } else {
             var = s.mid(2);
         }
 
         bool known = true;
 
-        if(var == "debug")
+        if (var == "debug")
             debug = true;
-        else if(var == "user")
+        else if (var == "user")
             user = val;
-        else if(var == "pass")
+        else if (var == "pass")
             pass = val;
-        else if(var == "realm")
+        else if (var == "realm")
             realm = val;
         else
             known = false;
 
-        if(!known)
-        {
+        if (!known) {
             fprintf(stderr, "Unknown option '%s'.\n", qPrintable(var));
             return 1;
         }
@@ -947,66 +881,53 @@ int main(int argc, char **argv)
         --n; // adjust position
     }
 
-    if(args.isEmpty())
-    {
+    if (args.isEmpty()) {
         usage();
         return 1;
     }
 
-    if(args[0] == "netmon")
-    {
+    if (args[0] == "netmon") {
         NetMonitor a;
         QObject::connect(&a, SIGNAL(quit()), &qapp, SLOT(quit()));
         QTimer::singleShot(0, &a, SLOT(start()));
         qapp.exec();
-    }
-    else if(args[0] == "rname" || args[0] == "rnamel")
-    {
+    } else if (args[0] == "rname" || args[0] == "rnamel") {
         bool null_dump = false;
-        for(int n = 1; n < args.count(); ++n)
-        {
-            if(args[n] == "-r")
-            {
+        for (int n = 1; n < args.count(); ++n) {
+            if (args[n] == "-r") {
                 null_dump = true;
                 args.removeAt(n);
                 --n;
             }
         }
 
-        if(args.count() < 2)
-        {
+        if (args.count() < 2) {
             usage();
             return 1;
         }
-        if(args[0] == "rnamel" && args.count() < 3)
-        {
+        if (args[0] == "rnamel" && args.count() < 3) {
             usage();
             return 1;
         }
         int x = NameRecord::A;
-        if(args.count() >= 3)
-        {
+        if (args.count() >= 3) {
             x = str2rtype(args[2]);
-            if(x == -1)
-            {
+            if (x == -1) {
                 usage();
                 return 1;
             }
         }
         ResolveName a;
-        a.name = args[1];
-        a.type = (NameRecord::Type)x;
+        a.name      = args[1];
+        a.type      = (NameRecord::Type)x;
         a.longlived = (args[0] == "rnamel") ? true : false;
-        if(args[0] == "rname" && null_dump)
+        if (args[0] == "rname" && null_dump)
             a.null_dump = true;
         QObject::connect(&a, SIGNAL(quit()), &qapp, SLOT(quit()));
         QTimer::singleShot(0, &a, SLOT(start()));
         qapp.exec();
-    }
-    else if(args[0] == "raddr")
-    {
-        if(args.count() < 2)
-        {
+    } else if (args[0] == "raddr") {
+        if (args.count() < 2) {
             usage();
             return 1;
         }
@@ -1016,11 +937,8 @@ int main(int argc, char **argv)
         QObject::connect(&a, SIGNAL(quit()), &qapp, SLOT(quit()));
         QTimer::singleShot(0, &a, SLOT(start()));
         qapp.exec();
-    }
-    else if(args[0] == "browse")
-    {
-        if(args.count() < 2)
-        {
+    } else if (args[0] == "browse") {
+        if (args.count() < 2) {
             usage();
             return 1;
         }
@@ -1030,55 +948,41 @@ int main(int argc, char **argv)
         QObject::connect(&a, SIGNAL(quit()), &qapp, SLOT(quit()));
         QTimer::singleShot(0, &a, SLOT(start()));
         qapp.exec();
-    }
-    else if(args[0] == "rservi" || args[0] == "rservd" || args[0] == "rservp")
-    {
+    } else if (args[0] == "rservi" || args[0] == "rservd" || args[0] == "rservp") {
         // they all take 2 params
-        if(args.count() < 3)
-        {
+        if (args.count() < 3) {
             usage();
             return 1;
         }
 
         ResolveService a;
-        if(args[0] == "rservi")
-        {
-            a.mode = 0;
+        if (args[0] == "rservi") {
+            a.mode     = 0;
             a.instance = args[1];
-            a.type = args[2];
-        }
-        else if(args[0] == "rservd")
-        {
-            a.mode = 1;
+            a.type     = args[2];
+        } else if (args[0] == "rservd") {
+            a.mode   = 1;
             a.domain = args[1];
-            a.type = args[2];
-        }
-        else // rservp
+            a.type   = args[2];
+        } else // rservp
         {
-            a.mode = 2;
+            a.mode   = 2;
             a.domain = args[1];
-            a.port = args[2].toInt();
+            a.port   = args[2].toInt();
         }
         QObject::connect(&a, SIGNAL(quit()), &qapp, SLOT(quit()));
         QTimer::singleShot(0, &a, SLOT(start()));
         qapp.exec();
-    }
-    else if(args[0] == "pserv")
-    {
+    } else if (args[0] == "pserv") {
         QStringList addrecs;
-        for(int n = 1; n < args.count(); ++n)
-        {
-            if(args[n] == "-a")
-            {
-                if(n + 1 < args.count())
-                {
+        for (int n = 1; n < args.count(); ++n) {
+            if (args[n] == "-a") {
+                if (n + 1 < args.count()) {
                     addrecs += args[n + 1];
                     args.removeAt(n);
                     args.removeAt(n);
                     --n;
-                }
-                else
-                {
+                } else {
                     usage();
                     return 1;
                 }
@@ -1086,23 +990,19 @@ int main(int argc, char **argv)
         }
 
         QByteArray extra_null;
-        for(int n = 0; n < addrecs.count(); ++n)
-        {
+        for (int n = 0; n < addrecs.count(); ++n) {
             const QString &str = addrecs[n];
-            int x = str.indexOf(':');
-            if(x == -1 || str.mid(0, x) != "null")
-            {
+            int            x   = str.indexOf(':');
+            if (x == -1 || str.mid(0, x) != "null") {
                 usage();
                 return 1;
             }
 
             QString null_file = str.mid(x + 1);
 
-            if(!null_file.isEmpty())
-            {
+            if (!null_file.isEmpty()) {
                 QFile f(null_file);
-                if(!f.open(QFile::ReadOnly))
-                {
+                if (!f.open(QFile::ReadOnly)) {
                     printf("can't read file\n");
                     return 1;
                 }
@@ -1110,21 +1010,18 @@ int main(int argc, char **argv)
             }
         }
 
-        if(args.count() < 4)
-        {
+        if (args.count() < 4) {
             usage();
             return 1;
         }
 
-        QMap<QString,QByteArray> attribs;
-        if(args.count() > 4)
-        {
+        QMap<QString, QByteArray> attribs;
+        if (args.count() > 4) {
             QStringList parts = args[4].split(',');
-            for(int n = 0; n < parts.count(); ++n)
-            {
+            for (int n = 0; n < parts.count(); ++n) {
                 const QString &str = parts[n];
-                int x = str.indexOf('=');
-                if(x != -1)
+                int            x   = str.indexOf('=');
+                if (x != -1)
                     attribs.insert(str.mid(0, x), str.mid(x + 1).toUtf8());
                 else
                     attribs.insert(str, QByteArray());
@@ -1132,154 +1029,133 @@ int main(int argc, char **argv)
         }
 
         PublishService a;
-        a.instance = args[1];
-        a.type = args[2];
-        a.port = args[3].toInt();
-        a.attribs = attribs;
+        a.instance   = args[1];
+        a.type       = args[2];
+        a.port       = args[3].toInt();
+        a.attribs    = attribs;
         a.extra_null = extra_null;
         QObject::connect(&a, SIGNAL(quit()), &qapp, SLOT(quit()));
         QTimer::singleShot(0, &a, SLOT(start()));
         qapp.exec();
-    }
-    else if(args[0] == "stun")
-    {
-        if(args.count() < 2)
-        {
+    } else if (args[0] == "stun") {
+        if (args.count() < 2) {
             usage();
             return 1;
         }
 
         QString addrstr, portstr;
-        int x = args[1].indexOf(';');
-        if(x != -1)
-        {
+        int     x = args[1].indexOf(';');
+        if (x != -1) {
             addrstr = args[1].mid(0, x);
             portstr = args[1].mid(x + 1);
-        }
-        else
+        } else
             addrstr = args[1];
 
         QHostAddress addr = QHostAddress(addrstr);
-        if(addr.isNull())
-        {
+        if (addr.isNull()) {
             printf("Error: addr must be an IP address\n");
             return 1;
         }
 
         int port = 3478;
-        if(!portstr.isEmpty())
+        if (!portstr.isEmpty())
             port = portstr.toInt();
 
         int localPort = -1;
-        if(args.count() >= 3)
+        if (args.count() >= 3)
             localPort = args[2].toInt();
 
-        if(!QCA::isSupported("hmac(sha1)"))
-        {
+        if (!QCA::isSupported("hmac(sha1)")) {
             printf("Error: Need hmac(sha1) support to use STUN.\n");
             return 1;
         }
 
         StunBind a;
-        a.debug = debug;
+        a.debug     = debug;
         a.localPort = localPort;
-        a.addr = addr;
-        a.port = port;
+        a.addr      = addr;
+        a.port      = port;
         QObject::connect(&a, SIGNAL(quit()), &qapp, SLOT(quit()));
         QTimer::singleShot(0, &a, SLOT(start()));
         qapp.exec();
-    }
-    else if(args[0] == "turn")
-    {
-        if(args.count() < 4)
-        {
+    } else if (args[0] == "turn") {
+        if (args.count() < 4) {
             usage();
             return 1;
         }
 
         int mode;
-        if(args[1] == "udp")
+        if (args[1] == "udp")
             mode = 0;
-        else if(args[1] == "tcp")
+        else if (args[1] == "tcp")
             mode = 1;
-        else if(args[1] == "tcp-tls")
+        else if (args[1] == "tcp-tls")
             mode = 2;
-        else
-        {
+        else {
             usage();
             return 1;
         }
 
         QString addrstr, portstr;
-        int x = args[2].indexOf(';');
-        if(x != -1)
-        {
+        int     x = args[2].indexOf(';');
+        if (x != -1) {
             addrstr = args[2].mid(0, x);
             portstr = args[2].mid(x + 1);
-        }
-        else
+        } else
             addrstr = args[2];
 
         QHostAddress raddr = QHostAddress(addrstr);
-        if(raddr.isNull())
-        {
+        if (raddr.isNull()) {
             printf("Error: relayaddr must be an IP address\n");
             return 1;
         }
 
         int rport = 3478;
-        if(!portstr.isEmpty())
+        if (!portstr.isEmpty())
             rport = portstr.toInt();
 
         portstr.clear();
         x = args[3].indexOf(';');
-        if(x != -1)
-        {
+        if (x != -1) {
             addrstr = args[3].mid(0, x);
             portstr = args[3].mid(x + 1);
-        }
-        else
+        } else
             addrstr = args[3];
 
         QHostAddress paddr = QHostAddress(addrstr);
-        if(raddr.isNull())
-        {
+        if (raddr.isNull()) {
             printf("Error: peeraddr must be an IP address\n");
             return 1;
         }
 
         int pport = 4588;
-        if(!portstr.isEmpty())
+        if (!portstr.isEmpty())
             pport = portstr.toInt();
 
-        if(!QCA::isSupported("hmac(sha1)"))
-        {
+        if (!QCA::isSupported("hmac(sha1)")) {
             printf("Error: Need hmac(sha1) support to use TURN.\n");
             return 1;
         }
 
-        if(mode == 2 && !QCA::isSupported("tls"))
-        {
+        if (mode == 2 && !QCA::isSupported("tls")) {
             printf("Error: Need tls support to use tcp-tls mode.\n");
             return 1;
         }
 
         TurnClientTest a;
-        a.mode = mode;
-        a.debug = debug;
-        a.relayAddr = raddr;
-        a.relayPort = rport;
-        a.relayUser = user;
-        a.relayPass = pass;
+        a.mode       = mode;
+        a.debug      = debug;
+        a.relayAddr  = raddr;
+        a.relayPort  = rport;
+        a.relayUser  = user;
+        a.relayPass  = pass;
         a.relayRealm = realm;
-        a.peerAddr = paddr;
-        a.peerPort = pport;
+        a.peerAddr   = paddr;
+        a.peerPort   = pport;
         QObject::connect(&a, SIGNAL(quit()), &qapp, SLOT(quit()));
         QTimer::singleShot(0, &a, SLOT(start()));
         qapp.exec();
-    }
-    else
-    {
+    } else {
         usage();
         return 1;
     }
diff --git a/tools/xmpptest/xmpptest.cpp b/tools/xmpptest/xmpptest.cpp
index 4753d760..3458da67 100644
--- a/tools/xmpptest/xmpptest.cpp
+++ b/tools/xmpptest/xmpptest.cpp
@@ -16,9 +16,9 @@
  *
  */
 
+#include "xmpp.h"
 #include "im.h"
 #include "ui_test.h"
-#include "xmpp.h"
 
 #include <QApplication>
 #include <QTextBlock>
@@ -46,35 +46,32 @@
 static QString plain2rich(const QString &plain)
 {
     QString rich;
-    int col = 0;
+    int     col = 0;
 
-    for(int i = 0; i < (int)plain.length(); ++i) {
-        if(plain[i] == '\n') {
+    for (int i = 0; i < (int)plain.length(); ++i) {
+        if (plain[i] == '\n') {
             rich += "<br>";
             col = 0;
-        }
-        else if(plain[i] == '\t') {
+        } else if (plain[i] == '\t') {
             rich += QChar::Nbsp;
-            while(col % 4) {
+            while (col % 4) {
                 rich += QChar::Nbsp;
                 ++col;
             }
-        }
-        else if(plain[i].isSpace()) {
-            if(i > 0 && plain[i-1] == ' ')
+        } else if (plain[i].isSpace()) {
+            if (i > 0 && plain[i - 1] == ' ')
                 rich += QChar::Nbsp;
             else
                 rich += ' ';
-        }
-        else if(plain[i] == '<')
+        } else if (plain[i] == '<')
             rich += "&lt;";
-        else if(plain[i] == '>')
+        else if (plain[i] == '>')
             rich += "&gt;";
-        else if(plain[i] == '\"')
+        else if (plain[i] == '\"')
             rich += "&quot;";
-        else if(plain[i] == '\'')
+        else if (plain[i] == '\'')
             rich += "&apos;";
-        else if(plain[i] == '&')
+        else if (plain[i] == '&')
             rich += "&amp;";
         else
             rich += plain[i];
@@ -97,47 +94,47 @@ static QString plain2rich(const QString &plain)
 static QString resultToString(int result)
 {
     QString s;
-    switch(result) {
-        case QCA::TLS::NoCertificate:
-            s = QObject::tr("No certificate presented.");
-            break;
-        case QCA::TLS::Valid:
-            break;
-        case QCA::TLS::HostMismatch:
-            s = QObject::tr("Hostname mismatch.");
-            break;
-        case QCA::TLS::InvalidCertificate:
-            s = QObject::tr("Invalid Certificate.");
-            break;
-            // TODO: Inspect why
-//            case QCA::TLS::Untrusted:
-//                s = QObject::tr("Not trusted for the specified purpose.");
-//                break;
-//            case QCA::TLS::SignatureFailed:
-//                s = QObject::tr("Invalid signature.");
-//                break;
-//            case QCA::TLS::InvalidCA:
-//                s = QObject::tr("Invalid CA certificate.");
-//                break;
-//            case QCA::TLS::InvalidPurpose:
-//                s = QObject::tr("Invalid certificate purpose.");
-//                break;
-//            case QCA::TLS::SelfSigned:
-//                s = QObject::tr("Certificate is self-signed.");
-//                break;
-//            case QCA::TLS::Revoked:
-//                s = QObject::tr("Certificate has been revoked.");
-//                break;
-//            case QCA::TLS::PathLengthExceeded:
-//                s = QObject::tr("Maximum cert chain length exceeded.");
-//                break;
-//            case QCA::TLS::Expired:
-//                s = QObject::tr("Certificate has expired.");
-//                break;
-//            case QCA::TLS::Unknown:
-        default:
-            s = QObject::tr("General validation error.");
-            break;
+    switch (result) {
+    case QCA::TLS::NoCertificate:
+        s = QObject::tr("No certificate presented.");
+        break;
+    case QCA::TLS::Valid:
+        break;
+    case QCA::TLS::HostMismatch:
+        s = QObject::tr("Hostname mismatch.");
+        break;
+    case QCA::TLS::InvalidCertificate:
+        s = QObject::tr("Invalid Certificate.");
+        break;
+        // TODO: Inspect why
+        //            case QCA::TLS::Untrusted:
+        //                s = QObject::tr("Not trusted for the specified purpose.");
+        //                break;
+        //            case QCA::TLS::SignatureFailed:
+        //                s = QObject::tr("Invalid signature.");
+        //                break;
+        //            case QCA::TLS::InvalidCA:
+        //                s = QObject::tr("Invalid CA certificate.");
+        //                break;
+        //            case QCA::TLS::InvalidPurpose:
+        //                s = QObject::tr("Invalid certificate purpose.");
+        //                break;
+        //            case QCA::TLS::SelfSigned:
+        //                s = QObject::tr("Certificate is self-signed.");
+        //                break;
+        //            case QCA::TLS::Revoked:
+        //                s = QObject::tr("Certificate has been revoked.");
+        //                break;
+        //            case QCA::TLS::PathLengthExceeded:
+        //                s = QObject::tr("Maximum cert chain length exceeded.");
+        //                break;
+        //            case QCA::TLS::Expired:
+        //                s = QObject::tr("Certificate has expired.");
+        //                break;
+        //            case QCA::TLS::Unknown:
+    default:
+        s = QObject::tr("General validation error.");
+        break;
     }
     return s;
 }
@@ -145,7 +142,7 @@ static QString resultToString(int result)
 static QTextBlock get_block(QTextEdit *te, int index)
 {
     QTextBlock block = te->document()->begin();
-    for(int n = 0; n < index && block.isValid(); ++n)
+    for (int n = 0; n < index && block.isValid(); ++n)
         block = block.next();
     return block;
 }
@@ -153,7 +150,7 @@ static QTextBlock get_block(QTextEdit *te, int index)
 static int textedit_paragraphLength(QTextEdit *te, int paragraph)
 {
     QTextBlock block = get_block(te, paragraph);
-    if(block.isValid())
+    if (block.isValid())
         return block.length();
     else
         return 0;
@@ -161,11 +158,11 @@ static int textedit_paragraphLength(QTextEdit *te, int paragraph)
 
 static void textedit_setCursorPosition(QTextEdit *te, int line, int col)
 {
-    QTextCursor cur = te->textCursor();
-    QTextBlock block = get_block(te, line);
-    if(!block.isValid())
+    QTextCursor cur   = te->textCursor();
+    QTextBlock  block = get_block(te, line);
+    if (!block.isValid())
         return;
-    if(col > block.length())
+    if (col > block.length())
         col = block.length();
     cur.setPosition(block.position() + col);
     te->setTextCursor(cur);
@@ -176,24 +173,23 @@ static void textedit_setSelection(QTextEdit *te, int startLine, int startCol, in
     QTextCursor cur = te->textCursor();
 
     QTextBlock block = get_block(te, startLine);
-    if(!block.isValid())
+    if (!block.isValid())
         return;
-    if(startCol > block.length())
+    if (startCol > block.length())
         startCol = block.length();
     cur.setPosition(block.position() + startCol); // start
 
     block = get_block(te, endLine);
-    if(!block.isValid())
+    if (!block.isValid())
         return;
-    if(endCol > block.length())
+    if (endCol > block.length())
         endCol = block.length();
     cur.setPosition(block.position() + endCol, QTextCursor::KeepAnchor); // select
 
     te->setTextCursor(cur);
 }
 
-class TestDebug : public XMPP::Debug
-{
+class TestDebug : public XMPP::Debug {
 public:
     void msg(const QString &);
     void outgoingTag(const QString &);
@@ -202,18 +198,17 @@ class TestDebug : public XMPP::Debug
     void incomingXml(const QDomElement &);
 };
 
-class TestDlg : public QDialog, public Ui::TestUI
-{
+class TestDlg : public QDialog, public Ui::TestUI {
     Q_OBJECT
 public:
-    bool active, connected;
+    bool                     active, connected;
     XMPP::AdvancedConnector *conn;
-    QCA::TLS *tls;
-    XMPP::QCATLSHandler *tlsHandler;
-    XMPP::ClientStream *stream;
-    XMPP::Jid jid;
+    QCA::TLS *               tls;
+    XMPP::QCATLSHandler *    tlsHandler;
+    XMPP::ClientStream *     stream;
+    XMPP::Jid                jid;
 
-    TestDlg(QWidget *parent=0) : QDialog(parent)
+    TestDlg(QWidget *parent = 0) : QDialog(parent)
     {
         setupUi(this);
         setWindowTitle(tr("XMPP Test"));
@@ -238,15 +233,15 @@ class TestDlg : public QDialog, public Ui::TestUI
         ck_mutual->setChecked(false);
         pb_go->setText(tr("&Connect"));
 
-        //le_jid->setText("psitest@jabberd.jabberstudio.org/Test");
-        //ck_probe->setChecked(false);
-        //le_host->setText("jabberd.jabberstudio.org:15222");
-        //ck_mutual->setChecked(false);
-        //le_jid->setText("sasltest@e.jabber.ru/Test");
-        //le_jid->setText("psitest@jabber.cz/Test");
-        //le_pass->setText("psitest");
-        //cb_proxy->setCurrentItem(3);
-        //le_proxyurl->setText("http://connect.jabber.cz/");
+        // le_jid->setText("psitest@jabberd.jabberstudio.org/Test");
+        // ck_probe->setChecked(false);
+        // le_host->setText("jabberd.jabberstudio.org:15222");
+        // ck_mutual->setChecked(false);
+        // le_jid->setText("sasltest@e.jabber.ru/Test");
+        // le_jid->setText("psitest@jabber.cz/Test");
+        // le_pass->setText("psitest");
+        // cb_proxy->setCurrentItem(3);
+        // le_proxyurl->setText("http://connect.jabber.cz/");
 
         // setup xmpp
         conn = new XMPP::AdvancedConnector;
@@ -255,19 +250,18 @@ class TestDlg : public QDialog, public Ui::TestUI
         connect(conn, SIGNAL(httpSyncStarted()), SLOT(conn_httpSyncStarted()));
         connect(conn, SIGNAL(httpSyncFinished()), SLOT(conn_httpSyncFinished()));
 
-        if(QCA::isSupported("tls")) {
-            tls = new QCA::TLS;
+        if (QCA::isSupported("tls")) {
+            tls        = new QCA::TLS;
             tlsHandler = new XMPP::QCATLSHandler(tls);
             tlsHandler->setXMPPCertCheck(true);
             connect(tlsHandler, SIGNAL(tlsHandshaken()), SLOT(tls_handshaken()));
-        }
-        else {
-            tls = 0;
+        } else {
+            tls        = 0;
             tlsHandler = 0;
         }
 
         stream = new XMPP::ClientStream(conn, tlsHandler);
-        //stream->setOldOnly(true);
+        // stream->setOldOnly(true);
         connect(stream, SIGNAL(connected()), SLOT(cs_connected()));
         connect(stream, SIGNAL(securityLayerActivated(int)), SLOT(cs_securityLayerActivated(int)));
         connect(stream, SIGNAL(needAuthParams(bool, bool, bool)), SLOT(cs_needAuthParams(bool, bool, bool)));
@@ -282,7 +276,7 @@ class TestDlg : public QDialog, public Ui::TestUI
         QTimer::singleShot(0, this, SLOT(adjustLayout()));
 
         le_jid->setFocus();
-        active = false;
+        active    = false;
         connected = false;
     }
 
@@ -303,26 +297,24 @@ private slots:
 
     void about()
     {
-        QMessageBox::about(this, tr("About %1").arg(AppName), tr(
-            "%1 v1.0\n"
-            "\n"
-            "Utility to demonstrate the Iris XMPP library.\n"
-            "\n"
-            "Currently supports:\n"
-            "  draft-ietf-xmpp-core-21\n"
-            "  XEP-0025\n"
-            "\n"
-            "Copyright (C) 2003 Justin Karneges").arg(AppName));
+        QMessageBox::about(this, tr("About %1").arg(AppName),
+                           tr("%1 v1.0\n"
+                              "\n"
+                              "Utility to demonstrate the Iris XMPP library.\n"
+                              "\n"
+                              "Currently supports:\n"
+                              "  draft-ietf-xmpp-core-21\n"
+                              "  XEP-0025\n"
+                              "\n"
+                              "Copyright (C) 2003 Justin Karneges")
+                               .arg(AppName));
     }
 
-    void probe_toggled(bool)
-    {
-        setHostState();
-    }
+    void probe_toggled(bool) { setHostState(); }
 
     void proxy_activated(int x)
     {
-        bool ok = (x != 0);
+        bool ok     = (x != 0);
         bool okpoll = (x == 3);
         gb_proxy->setEnabled(ok);
         lb_proxyurl->setEnabled(okpoll);
@@ -338,101 +330,103 @@ private slots:
         pb_go->setText(tr("&Connect"));
         pb_go->setFocus();
         gb_server->setEnabled(true);
-        active = false;
+        active    = false;
         connected = false;
     }
 
     void start()
     {
-        if(active)
+        if (active)
             return;
 
         jid = XMPP::Jid(le_jid->text());
-        if(jid.domain().isEmpty() || jid.node().isEmpty() || jid.resource().isEmpty()) {
+        if (jid.domain().isEmpty() || jid.node().isEmpty() || jid.resource().isEmpty()) {
             QMessageBox::information(this, tr("Error"), tr("Please enter the Full JID to connect with."));
             return;
         }
 
-        int p = cb_proxy->currentIndex();
+        int                            p = cb_proxy->currentIndex();
         XMPP::AdvancedConnector::Proxy proxy;
-        if(p > 0) {
-            QString s = le_proxyhost->text();
+        if (p > 0) {
+            QString s   = le_proxyhost->text();
             QString url = le_proxyurl->text();
-            if(p != 3 && s.isEmpty()) {
+            if (p != 3 && s.isEmpty()) {
                 QMessageBox::information(this, tr("Error"), tr("You must specify a host:port for the proxy."));
                 return;
             }
-            if(p == 3 && s.isEmpty() && url.isEmpty()) {
+            if (p == 3 && s.isEmpty() && url.isEmpty()) {
                 QMessageBox::information(this, tr("Error"), tr("You must at least enter a URL to use http poll."));
                 return;
             }
             QString host;
-            int port = 0;
-            if(!s.isEmpty()) {
+            int     port = 0;
+            if (!s.isEmpty()) {
                 int n = s.indexOf(':');
-                if(n == -1) {
-                    QMessageBox::information(this, tr("Error"), tr("Please enter the proxy host in the form 'host:port'."));
+                if (n == -1) {
+                    QMessageBox::information(this, tr("Error"),
+                                             tr("Please enter the proxy host in the form 'host:port'."));
                     return;
                 }
                 host = s.mid(0, n);
-                port = s.mid(n+1).toInt();
+                port = s.mid(n + 1).toInt();
             }
-            if(p == 1)
+            if (p == 1)
                 proxy.setHttpConnect(host, port);
-            else if(p == 2)
+            else if (p == 2)
                 proxy.setSocks(host, port);
-            else if(p == 3) {
+            else if (p == 3) {
                 proxy.setHttpPoll(host, port, url);
                 proxy.setPollInterval(2); // fast during login
             }
             proxy.setUserPass(le_proxyuser->text(), le_proxypass->text());
         }
-        bool probe = (p != 3 && ck_probe->isChecked());
-        bool useHost = (!probe && !le_host->text().isEmpty());
+        bool    probe   = (p != 3 && ck_probe->isChecked());
+        bool    useHost = (!probe && !le_host->text().isEmpty());
         QString host;
-        int port = 0;
-        bool ssl = false;
-        if(useHost) {
+        int     port = 0;
+        bool    ssl  = false;
+        if (useHost) {
             QString s = le_host->text();
-            int n = s.indexOf(':');
-            if(n == -1) {
+            int     n = s.indexOf(':');
+            if (n == -1) {
                 QMessageBox::information(this, tr("Error"), tr("Please enter the host in the form 'host:port'."));
                 return;
             }
             host = s.mid(0, n);
-            port = s.mid(n+1).toInt();
+            port = s.mid(n + 1).toInt();
 
-            if(ck_ssl->isChecked())
+            if (ck_ssl->isChecked())
                 ssl = true;
         }
-        if(sb_ssfmin->value() > sb_ssfmax->value()) {
+        if (sb_ssfmin->value() > sb_ssfmax->value()) {
             QMessageBox::information(this, tr("Error"), tr("Error: SSF Min is greater than SSF Max."));
             return;
         }
 
-        if((probe || ssl) && !tls) {
+        if ((probe || ssl) && !tls) {
             QMessageBox::information(this, tr("Error"), tr("Error: TLS not available.  Disable any TLS options."));
             return;
         }
 
         // prepare
         conn->setProxy(proxy);
-        if(useHost)
+        if (useHost)
             conn->setOptHostPort(host, port);
         else
             conn->setOptHostPort("", 0);
         conn->setOptProbe(probe);
         conn->setOptSSL(ssl);
 
-        if(tls) {
+        if (tls) {
             tls->setTrustedCertificates(QCA::systemStore());
         }
 
         stream->setNoopTime(55000); // every 55 seconds
-        stream->setAllowPlain(ck_plain->isChecked() ? XMPP::ClientStream::AllowPlain : XMPP::ClientStream::NoAllowPlain);
+        stream->setAllowPlain(ck_plain->isChecked() ? XMPP::ClientStream::AllowPlain
+                                                    : XMPP::ClientStream::NoAllowPlain);
         stream->setRequireMutualAuth(ck_mutual->isChecked());
         stream->setSSFRange(sb_ssfmin->value(), sb_ssfmax->value());
-        //stream->setOldOnly(true);
+        // stream->setOldOnly(true);
         stream->setCompress(true);
 
         gb_server->setEnabled(false);
@@ -446,15 +440,14 @@ private slots:
 
     void stop()
     {
-        if(!active)
+        if (!active)
             return;
 
-        if(connected) {
+        if (connected) {
             pb_go->setEnabled(false);
             appendSysMsg("Disconnecting...");
             stream->close();
-        }
-        else {
+        } else {
             stream->close();
             appendSysMsg("Disconnected");
             cleanup();
@@ -463,7 +456,7 @@ private slots:
 
     void go()
     {
-        if(active)
+        if (active)
             stop();
         else
             start();
@@ -471,7 +464,7 @@ private slots:
 
     void send()
     {
-        if(te_input->toPlainText().isEmpty())
+        if (te_input->toPlainText().isEmpty())
             return;
 
         // construct a "temporary" document to parse the input
@@ -480,45 +473,49 @@ private slots:
         str += "</stream>";
 
         QDomDocument doc;
-        QString errMsg;
-        int errLine, errCol;
-        if(!doc.setContent(str, true, &errMsg, &errLine, &errCol)) {
+        QString      errMsg;
+        int          errLine, errCol;
+        if (!doc.setContent(str, true, &errMsg, &errLine, &errCol)) {
             int lines = str.split('\n', QString::KeepEmptyParts).count();
             --errLine; // skip the first line
-            if(errLine == lines-1) {
-                errLine = lines-2;
-                errCol = textedit_paragraphLength(te_input, errLine-1)+1;
-                errMsg = "incomplete input";
+            if (errLine == lines - 1) {
+                errLine = lines - 2;
+                errCol  = textedit_paragraphLength(te_input, errLine - 1) + 1;
+                errMsg  = "incomplete input";
             }
-            textedit_setCursorPosition(te_input, errLine-1, errCol-1);
-            QMessageBox::information(this, tr("Error"), tr("Bad XML input (%1,%2): %3\nPlease correct and try again.").arg(errCol).arg(errLine).arg(errMsg));
+            textedit_setCursorPosition(te_input, errLine - 1, errCol - 1);
+            QMessageBox::information(
+                this, tr("Error"),
+                tr("Bad XML input (%1,%2): %3\nPlease correct and try again.").arg(errCol).arg(errLine).arg(errMsg));
             return;
         }
         QDomElement e = doc.firstChild().toElement();
 
-        int num = 0;
-        QDomNodeList nl = e.childNodes();
+        int                 num = 0;
+        QDomNodeList        nl  = e.childNodes();
         QList<XMPP::Stanza> stanzaList;
-        for(int x = 0; x < nl.count(); ++x) {
+        for (int x = 0; x < nl.count(); ++x) {
             QDomNode n = nl.item(x);
-            if(n.isElement()) {
-                QDomElement e = n.toElement();
+            if (n.isElement()) {
+                QDomElement  e = n.toElement();
                 XMPP::Stanza s = stream->createStanza(e);
-                if(s.isNull()) {
-                    QMessageBox::information(this, tr("Error"), tr("Bad Stanza '%1'.  Must be 'message', 'presence', or 'iq'").arg(e.tagName()));
+                if (s.isNull()) {
+                    QMessageBox::information(
+                        this, tr("Error"),
+                        tr("Bad Stanza '%1'.  Must be 'message', 'presence', or 'iq'").arg(e.tagName()));
                     return;
                 }
                 stanzaList += s;
                 ++num;
             }
         }
-        if(num == 0) {
+        if (num == 0) {
             QMessageBox::information(this, tr("Error"), tr("You must enter at least one stanza!"));
             return;
         }
 
         // out the door
-        for(QList<XMPP::Stanza>::ConstIterator it = stanzaList.begin(); it != stanzaList.end(); ++it) {
+        for (QList<XMPP::Stanza>::ConstIterator it = stanzaList.begin(); it != stanzaList.end(); ++it) {
             appendXmlOut(XMPP::Stream::xmlToString((*it).element(), true));
             stream->write(*it);
         }
@@ -554,18 +551,17 @@ private slots:
     {
         QString to = le_to->text();
         QString s;
-        if(!to.isEmpty())
+        if (!to.isEmpty())
             s += QString("<message to=\"%1\">\n").arg(to);
         else
             s += QString("<message to=\"\">\n");
         s += " <body>hello world</body>\n";
         s += "</message>";
         te_input->setText(s);
-        if(!to.isEmpty()) {
+        if (!to.isEmpty()) {
             textedit_setCursorPosition(te_input, 1, 7);
             textedit_setSelection(te_input, 1, 7, 1, 18);
-        }
-        else
+        } else
             textedit_setCursorPosition(te_input, 0, 13);
         te_input->setFocus();
     }
@@ -574,53 +570,44 @@ private slots:
     {
         QString to = le_to->text();
         QString s;
-        if(!to.isEmpty())
+        if (!to.isEmpty())
             s += QString("<iq to=\"%1\" type=\"get\" id=\"abcde\">\n").arg(to);
         else
             s += QString("<iq to=\"\" type=\"get\" id=\"abcde\">\n");
         s += " <query xmlns=\"jabber:iq:version\"/>\n";
         s += "</iq>";
         te_input->setText(s);
-        if(!to.isEmpty()) {
+        if (!to.isEmpty()) {
             textedit_setCursorPosition(te_input, 0, 8);
             textedit_setSelection(te_input, 0, 8, 0, 8 + to.length());
-        }
-        else
+        } else
             textedit_setCursorPosition(te_input, 0, 8);
         te_input->setFocus();
     }
 
-    void conn_srvLookup(const QString &server)
-    {
-        appendLibMsg(QString("SRV lookup on [%1]").arg(server));
-    }
+    void conn_srvLookup(const QString &server) { appendLibMsg(QString("SRV lookup on [%1]").arg(server)); }
 
     void conn_srvResult(bool b)
     {
-        if(b)
+        if (b)
             appendLibMsg("SRV lookup success!");
         else
             appendLibMsg("SRV lookup failed");
     }
 
-    void conn_httpSyncStarted()
-    {
-        appendLibMsg("HttpPoll: syncing");
-    }
+    void conn_httpSyncStarted() { appendLibMsg("HttpPoll: syncing"); }
 
-    void conn_httpSyncFinished()
-    {
-        appendLibMsg("HttpPoll: done");
-    }
+    void conn_httpSyncFinished() { appendLibMsg("HttpPoll: done"); }
 
     void tls_handshaken()
     {
-        //QCA::Certificate cert = tls->peerCertificate();
+        // QCA::Certificate cert = tls->peerCertificate();
         int vr = tls->peerIdentityResult();
-        if (vr == QCA::TLS::Valid && !tlsHandler->certMatchesHostname()) vr = QCA::TLS::HostMismatch;
+        if (vr == QCA::TLS::Valid && !tlsHandler->certMatchesHostname())
+            vr = QCA::TLS::HostMismatch;
 
         appendSysMsg("Successful TLS handshake.");
-        if(vr == QCA::TLS::Valid)
+        if (vr == QCA::TLS::Valid)
             appendSysMsg("Valid certificate.");
         else {
             appendSysMsg(QString("Invalid certificate: %1").arg(resultToString(vr)), Qt::red);
@@ -633,43 +620,45 @@ private slots:
     void cs_connected()
     {
         QString s = "Connected";
-        if(conn->havePeerAddress())
+        if (conn->havePeerAddress())
             s += QString(" (%1:%2)").arg(conn->peerAddress().toString()).arg(conn->peerPort());
-        if(conn->useSSL())
+        if (conn->useSSL())
             s += " [ssl]";
         appendSysMsg(s);
     }
 
     void cs_securityLayerActivated(int type)
     {
-        appendSysMsg(QString("Security layer activated (%1)").arg((type == XMPP::ClientStream::LayerTLS) ? "TLS": "SASL"));
+        appendSysMsg(
+            QString("Security layer activated (%1)").arg((type == XMPP::ClientStream::LayerTLS) ? "TLS" : "SASL"));
     }
 
     void cs_needAuthParams(bool user, bool pass, bool realm)
     {
         QString s = "Need auth parameters -";
-        if(user)
+        if (user)
             s += " (Username)";
-        if(pass)
+        if (pass)
             s += " (Password)";
-        if(realm)
+        if (realm)
             s += " (Realm)";
         appendSysMsg(s);
 
-        if(user) {
-            if(!le_user->text().isEmpty())
+        if (user) {
+            if (!le_user->text().isEmpty())
                 stream->setUsername(le_user->text());
             else
                 stream->setUsername(jid.node());
         }
-        if(pass) {
-            if(!le_pass->text().isEmpty())
+        if (pass) {
+            if (!le_pass->text().isEmpty())
                 stream->setPassword(le_pass->text());
             else {
                 conn->changePollInterval(10); // slow down during prompt
-                bool ok;
-                QString s = QInputDialog::getText(this, tr("Password"), tr("Enter the password for %1").arg(jid.full()), QLineEdit::Password, QString(), &ok);
-                if(!ok) {
+                bool    ok;
+                QString s = QInputDialog::getText(this, tr("Password"), tr("Enter the password for %1").arg(jid.full()),
+                                                  QLineEdit::Password, QString(), &ok);
+                if (!ok) {
                     stop();
                     return;
                 }
@@ -678,7 +667,7 @@ private slots:
                 conn->changePollInterval(2); // resume speed
             }
         }
-        if(realm)
+        if (realm)
             stream->setRealm(jid.domain());
 
         stream->continueAfterParams();
@@ -706,23 +695,19 @@ private slots:
 
     void cs_readyRead()
     {
-        while(stream->stanzaAvailable()) {
+        while (stream->stanzaAvailable()) {
             XMPP::Stanza s = stream->read();
             appendXmlIn(XMPP::Stream::xmlToString(s.element(), true));
         }
     }
 
-    void cs_stanzaWritten()
-    {
-        appendSysMsg("Stanza sent");
-    }
+    void cs_stanzaWritten() { appendSysMsg("Stanza sent"); }
 
     void cs_warning(int warn)
     {
-        if(warn == XMPP::ClientStream::WarnOldVersion) {
+        if (warn == XMPP::ClientStream::WarnOldVersion) {
             appendSysMsg("Warning: pre-1.0 protocol server", Qt::red);
-        }
-        else if(warn == XMPP::ClientStream::WarnNoTLS) {
+        } else if (warn == XMPP::ClientStream::WarnNoTLS) {
             appendSysMsg("Warning: TLS not available!", Qt::red);
         }
         stream->continueAfterWarning();
@@ -730,109 +715,102 @@ private slots:
 
     void cs_error(int err)
     {
-        if(err == XMPP::ClientStream::ErrParse) {
+        if (err == XMPP::ClientStream::ErrParse) {
             appendErrMsg("XML parsing error");
-        }
-        else if(err == XMPP::ClientStream::ErrProtocol) {
+        } else if (err == XMPP::ClientStream::ErrProtocol) {
             appendErrMsg("XMPP protocol error");
-        }
-        else if(err == XMPP::ClientStream::ErrStream) {
-            int x = stream->errorCondition();
+        } else if (err == XMPP::ClientStream::ErrStream) {
+            int     x = stream->errorCondition();
             QString s;
-            if(x == XMPP::Stream::GenericStreamError)
+            if (x == XMPP::Stream::GenericStreamError)
                 s = "generic stream error";
-            else if(x == XMPP::ClientStream::Conflict)
+            else if (x == XMPP::ClientStream::Conflict)
                 s = "conflict (remote login replacing this one)";
-            else if(x == XMPP::ClientStream::ConnectionTimeout)
+            else if (x == XMPP::ClientStream::ConnectionTimeout)
                 s = "timed out from inactivity";
-            else if(x == XMPP::ClientStream::InternalServerError)
+            else if (x == XMPP::ClientStream::InternalServerError)
                 s = "internal server error";
-            else if(x == XMPP::ClientStream::InvalidFrom)
+            else if (x == XMPP::ClientStream::InvalidFrom)
                 s = "invalid from address";
-            else if(x == XMPP::ClientStream::InvalidXml)
+            else if (x == XMPP::ClientStream::InvalidXml)
                 s = "invalid XML";
-            else if(x == XMPP::ClientStream::PolicyViolation)
+            else if (x == XMPP::ClientStream::PolicyViolation)
                 s = "policy violation.  go to jail!";
-            else if(x == XMPP::ClientStream::ResourceConstraint)
+            else if (x == XMPP::ClientStream::ResourceConstraint)
                 s = "server out of resources";
-            else if(x == XMPP::ClientStream::SystemShutdown)
+            else if (x == XMPP::ClientStream::SystemShutdown)
                 s = "system is shutting down NOW";
             appendErrMsg(QString("XMPP stream error: %1").arg(s));
-        }
-        else if(err == XMPP::ClientStream::ErrConnection) {
-            int x = conn->errorCode();
+        } else if (err == XMPP::ClientStream::ErrConnection) {
+            int     x = conn->errorCode();
             QString s;
-            if(x == XMPP::AdvancedConnector::ErrConnectionRefused)
+            if (x == XMPP::AdvancedConnector::ErrConnectionRefused)
                 s = "unable to connect to server";
-            else if(x == XMPP::AdvancedConnector::ErrHostNotFound)
+            else if (x == XMPP::AdvancedConnector::ErrHostNotFound)
                 s = "host not found";
-            else if(x == XMPP::AdvancedConnector::ErrProxyConnect)
+            else if (x == XMPP::AdvancedConnector::ErrProxyConnect)
                 s = "proxy connect";
-            else if(x == XMPP::AdvancedConnector::ErrProxyNeg)
+            else if (x == XMPP::AdvancedConnector::ErrProxyNeg)
                 s = "proxy negotiating";
-            else if(x == XMPP::AdvancedConnector::ErrProxyAuth)
+            else if (x == XMPP::AdvancedConnector::ErrProxyAuth)
                 s = "proxy authorization";
-            else if(x == XMPP::AdvancedConnector::ErrStream)
+            else if (x == XMPP::AdvancedConnector::ErrStream)
                 s = "stream error";
             appendErrMsg(QString("Connection error: %1").arg(s));
-        }
-        else if(err == XMPP::ClientStream::ErrNeg) {
-            int x = stream->errorCondition();
+        } else if (err == XMPP::ClientStream::ErrNeg) {
+            int     x = stream->errorCondition();
             QString s;
-            if(x == XMPP::ClientStream::HostGone)
+            if (x == XMPP::ClientStream::HostGone)
                 s = "host no longer hosted";
-            else if(x == XMPP::ClientStream::HostUnknown)
+            else if (x == XMPP::ClientStream::HostUnknown)
                 s = "host unknown";
-            else if(x == XMPP::ClientStream::RemoteConnectionFailed)
+            else if (x == XMPP::ClientStream::RemoteConnectionFailed)
                 s = "a required remote connection failed";
-            else if(x == XMPP::ClientStream::SeeOtherHost)
+            else if (x == XMPP::ClientStream::SeeOtherHost)
                 s = QString("see other host: [%1]").arg(stream->errorText());
-            else if(x == XMPP::ClientStream::UnsupportedVersion)
+            else if (x == XMPP::ClientStream::UnsupportedVersion)
                 s = "server does not support proper xmpp version";
             appendErrMsg(QString("Stream negotiation error: %1").arg(s));
-        }
-        else if(err == XMPP::ClientStream::ErrTLS) {
-            int x = stream->errorCondition();
+        } else if (err == XMPP::ClientStream::ErrTLS) {
+            int     x = stream->errorCondition();
             QString s;
-            if(x == XMPP::ClientStream::TLSStart)
+            if (x == XMPP::ClientStream::TLSStart)
                 s = "server rejected STARTTLS";
-            else if(x == XMPP::ClientStream::TLSFail) {
+            else if (x == XMPP::ClientStream::TLSFail) {
                 int t = tlsHandler->tlsError();
-                if(t == QCA::TLS::ErrorHandshake)
+                if (t == QCA::TLS::ErrorHandshake)
                     s = "TLS handshake error";
                 else
                     s = "broken security layer (TLS)";
             }
             appendErrMsg(s);
-        }
-        else if(err == XMPP::ClientStream::ErrAuth) {
-            int x = stream->errorCondition();
+        } else if (err == XMPP::ClientStream::ErrAuth) {
+            int     x = stream->errorCondition();
             QString s;
-            if(x == XMPP::ClientStream::GenericAuthError)
+            if (x == XMPP::ClientStream::GenericAuthError)
                 s = "unable to login";
-            else if(x == XMPP::ClientStream::NoMech)
+            else if (x == XMPP::ClientStream::NoMech)
                 s = "no appropriate auth mechanism available for given security settings";
-            else if(x == XMPP::ClientStream::Aborted)
+            else if (x == XMPP::ClientStream::Aborted)
                 s = "server confirms abort";
-            else if(x == XMPP::ClientStream::MalformedRequest)
+            else if (x == XMPP::ClientStream::MalformedRequest)
                 s = "malformed request";
-            else if(x == XMPP::ClientStream::BadServ)
+            else if (x == XMPP::ClientStream::BadServ)
                 s = "server failed mutual authentication";
-            else if(x == XMPP::ClientStream::EncryptionRequired)
+            else if (x == XMPP::ClientStream::EncryptionRequired)
                 s = "encryption required for chosen SASL mechanism";
-            else if(x == XMPP::ClientStream::InvalidAuthzid)
+            else if (x == XMPP::ClientStream::InvalidAuthzid)
                 s = "invalid authzid";
-            else if(x == XMPP::ClientStream::InvalidMech)
+            else if (x == XMPP::ClientStream::InvalidMech)
                 s = "invalid SASL mechanism";
-            else if(x == XMPP::ClientStream::MechTooWeak)
+            else if (x == XMPP::ClientStream::MechTooWeak)
                 s = "SASL mechanism too weak for authzid";
-            else if(x == XMPP::ClientStream::NotAuthorized)
+            else if (x == XMPP::ClientStream::NotAuthorized)
                 s = "not authorized";
-            else if(x == XMPP::ClientStream::TemporaryAuthFailure)
+            else if (x == XMPP::ClientStream::TemporaryAuthFailure)
                 s = "temporary auth failure";
             appendErrMsg(QString("Auth error: %1").arg(s));
-        }
-        else if(err == XMPP::ClientStream::ErrSecurityLayer)
+        } else if (err == XMPP::ClientStream::ErrSecurityLayer)
             appendErrMsg("Broken security layer (SASL)");
         cleanup();
     }
@@ -841,48 +819,42 @@ private slots:
     void setHostState()
     {
         bool ok = false;
-        if(!ck_probe->isChecked() && cb_proxy->currentIndex() != 3)
+        if (!ck_probe->isChecked() && cb_proxy->currentIndex() != 3)
             ok = true;
         lb_host->setEnabled(ok);
         le_host->setEnabled(ok);
         ck_ssl->setEnabled(ok);
     }
 
-    void appendSysMsg(const QString &s, const QColor &_c=QColor())
+    void appendSysMsg(const QString &s, const QColor &_c = QColor())
     {
         QString str;
-        QColor c;
-        if(_c.isValid())
+        QColor  c;
+        if (_c.isValid())
             c = _c;
         else
             c = Qt::blue;
 
-        if(c.isValid())
+        if (c.isValid())
             str += QString("<font color=\"%1\">").arg(c.name());
         str += QString("*** %1").arg(s);
-        if(c.isValid())
+        if (c.isValid())
             str += QString("</font>");
         te_log->append(str);
     }
 
 public:
-    void appendLibMsg(const QString &s)
-    {
-        appendSysMsg(s, Qt::magenta);
-    }
+    void appendLibMsg(const QString &s) { appendSysMsg(s, Qt::magenta); }
 
-    void appendErrMsg(const QString &s)
-    {
-        appendSysMsg(s, Qt::red);
-    }
+    void appendErrMsg(const QString &s) { appendSysMsg(s, Qt::red); }
 
     void appendXmlOut(const QString &s)
     {
         QStringList lines = s.split('\n', QString::KeepEmptyParts);
-        QString str;
-        bool first = true;
-        for(QStringList::ConstIterator it = lines.begin(); it != lines.end(); ++it) {
-            if(!first)
+        QString     str;
+        bool        first = true;
+        for (QStringList::ConstIterator it = lines.begin(); it != lines.end(); ++it) {
+            if (!first)
                 str += "<br>";
             str += QString("<font color=\"%1\">%2</font>").arg(QColor(Qt::darkGreen).name()).arg(plain2rich(*it));
             first = false;
@@ -893,10 +865,10 @@ private slots:
     void appendXmlIn(const QString &s)
     {
         QStringList lines = s.split('\n', QString::KeepEmptyParts);
-        QString str;
-        bool first = true;
-        for(QStringList::ConstIterator it = lines.begin(); it != lines.end(); ++it) {
-            if(!first)
+        QString     str;
+        bool        first = true;
+        for (QStringList::ConstIterator it = lines.begin(); it != lines.end(); ++it) {
+            if (!first)
                 str += "<br>";
             str += QString("<font color=\"%1\">%2</font>").arg(QColor(Qt::darkBlue).name()).arg(plain2rich(*it));
             first = false;
@@ -909,33 +881,33 @@ TestDlg *td_glob = 0;
 
 void TestDebug::msg(const QString &s)
 {
-    if(td_glob)
+    if (td_glob)
         td_glob->appendLibMsg(s);
 }
 
 void TestDebug::outgoingTag(const QString &s)
 {
-    if(td_glob)
+    if (td_glob)
         td_glob->appendXmlOut(s);
 }
 
 void TestDebug::incomingTag(const QString &s)
 {
-    if(td_glob)
+    if (td_glob)
         td_glob->appendXmlIn(s);
 }
 
 void TestDebug::outgoingXml(const QDomElement &e)
 {
     QString out = XMPP::Stream::xmlToString(e, true);
-    if(td_glob)
+    if (td_glob)
         td_glob->appendXmlOut(out);
 }
 
 void TestDebug::incomingXml(const QDomElement &e)
 {
     QString out = XMPP::Stream::xmlToString(e, true);
-    if(td_glob)
+    if (td_glob)
         td_glob->appendXmlIn(out);
 }
 
@@ -954,8 +926,8 @@ int main(int argc, char **argv)
     // seed the random number generator (needed at least for HttpPoll)
     srand(time(NULL));
 
-    TestDlg *w = new TestDlg(0);
-    td_glob = w;
+    TestDlg *w    = new TestDlg(0);
+    td_glob       = w;
     TestDebug *td = new TestDebug;
     XMPP::setDebug(td);
     QObject::connect(&app, SIGNAL(lastWindowClosed()), &app, SLOT(quit()));

From c59b573fc8d8f533d4ed3a2e6218ebd4b05f1e59 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 13 Oct 2019 16:52:18 +0300
Subject: [PATCH 106/383] Added computedHashes method + ft streaming fix

---
 src/xmpp/xmpp-im/jingle-ft.cpp | 17 +++++++++++++++--
 src/xmpp/xmpp-im/jingle-ft.h   |  1 +
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 0411fabd..e54a1ef6 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -28,6 +28,7 @@
 #include <functional>
 
 namespace XMPP { namespace Jingle { namespace FileTransfer {
+
     const QString NS            = QStringLiteral("urn:xmpp:jingle:apps:file-transfer:5");
     const QString AMPLITUDES_NS = QStringLiteral("urn:audio:amplitudes");
 
@@ -268,6 +269,17 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
     QString File::description() const { return d ? d->desc : QString(); }
 
     QList<Hash> File::hashes() const { return d ? d->hashes : QList<Hash>(); }
+    QList<Hash> File::computedHashes() const
+    {
+        QList<Hash> ret;
+        if (!d)
+            return ret;
+        for (auto const &h : d->hashes) {
+            if (h.data().size())
+                ret.append(h);
+        }
+        return ret;
+    }
 
     Hash File::hash(Hash::Type t) const
     {
@@ -560,7 +572,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
             d->transportReplaceOrigin = Origin::None;
             d->transportReplaceState  = State::Finished; // not needed here probably
             d->connection             = d->transport->connection();
-            if (d->streamigMode) {
+            if (!d->streamigMode) {
                 connect(d->connection.data(), &Connection::readyRead, this, [this]() {
                     if (!d->device) {
                         return;
@@ -577,7 +589,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
                 });
             }
             d->setState(State::Active);
-            if (d->streamigMode) {
+            if (!d->streamigMode) {
                 if (d->acceptFile.range().isValid()) {
                     d->bytesLeft = d->acceptFile.range().length;
                     emit deviceRequested(d->acceptFile.range().offset, d->bytesLeft);
@@ -943,6 +955,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
         auto app   = _manager->startApplication(selfp, "ft", _session->role(), _session->role());
         app->setFile(file);
     }
+
 } // namespace FileTransfer
 } // namespace Jingle
 } // namespace XMPP
diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index 536a4727..efcd7d99 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -60,6 +60,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
         QDateTime   date() const;
         QString     description() const;
         QList<Hash> hashes() const;
+        QList<Hash> computedHashes() const;
         Hash        hash(Hash::Type t = Hash::Unknown) const;
         QString     mediaType() const;
         QString     name() const;

From b9556c482042522653bee9c3f25a8e537bfa2617 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 13 Oct 2019 23:37:01 +0300
Subject: [PATCH 107/383] Added incomingRemove virtual to applicatio interface

Previosuly an application didn't have a way to notify about termnation
on incoming content remove request
---
 src/xmpp/xmpp-im/jingle-ft.cpp |  6 ++++++
 src/xmpp/xmpp-im/jingle-ft.h   |  7 ++++---
 src/xmpp/xmpp-im/jingle.cpp    |  7 +++++--
 src/xmpp/xmpp-im/jingle.h      | 16 +++++++++-------
 4 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index e54a1ef6..76d708f8 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -901,6 +901,12 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
         return false;
     }
 
+    void Application::incomingRemove(const Reason &r)
+    {
+        d->terminationReason = r;
+        d->setState(State::Finished);
+    }
+
     bool Application::isValid() const
     {
         return d->file.isValid() && d->contentName.size() > 0
diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index efcd7d99..2a8239ff 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -170,12 +170,13 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
     protected:
         bool incomingTransportReplace(const QSharedPointer<Transport> &transport) override;
         bool incomingTransportAccept(const QDomElement &transportEl) override;
+        void incomingRemove(const Reason &r) override;
 
     signals:
         void connectionReady(); // streaming mode only
-        void
-             deviceRequested(quint64 offset,
-                             quint64 size); // if size = 0 then it's reamaining part of the file (non-streaming mode only)
+
+        // if size = 0 then it's reamaining part of the file (non-streaming mode only)
+        void deviceRequested(quint64 offset, quint64 size);
         void progress(quint64 offset);
 
     private:
diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index efcf2531..0ac149aa 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -1094,14 +1094,17 @@ namespace XMPP { namespace Jingle {
                 }
             }
 
+            auto   reasonEl = jingleEl.firstChildElement(QString::fromLatin1("reason"));
+            Reason reason   = reasonEl.isNull() ? Reason(Reason::Success) : Reason(reasonEl);
+
             for (auto app : toRemove) {
+                app->incomingRemove(reason);
                 contentList.remove(ContentKey { app->contentName(), app->creator() });
                 delete app;
             }
 
             if (contentList.isEmpty()) {
-                auto reasonEl   = jingleEl.firstChildElement(QString::fromLatin1("reason"));
-                terminateReason = reasonEl.isNull() ? Reason(Reason::Success) : Reason(reasonEl);
+                terminateReason = reason;
             }
 
             planStep();
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index fe5c0542..b66f366c 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -64,8 +64,8 @@ namespace Jingle {
         PrepareLocalOffer, // content accepted by local user but we are not ready yet to send content-accept or
                            // session-accept. same for content-add/session-initiate, where user already already
                            // sent/added in ui and it's network turn.
-        Unacked,    // local content offer is sent to remote but no IQ ack yet
-        Pending,    // waits for session-accept or content-accept from remote
+        Unacked,           // local content offer is sent to remote but no IQ ack yet
+        Pending,           // waits for session-accept or content-accept from remote
         Accepted,   // app only: local: "accept" received, waits for start(). remote: "accept" sent and acknowledged,
                     // waits for start()
         Connecting, // app only: s5b/ice probes etc (particular application state. can be omited for other entities)
@@ -389,8 +389,9 @@ namespace Jingle {
         virtual Origin  creator() const     = 0;
         virtual Origin  senders() const     = 0;
         virtual QString contentName() const = 0;
-        virtual Origin  transportReplaceOrigin()
-            const = 0; // returns Origin::None if no transport-replace in progress or the side triggered the replace.
+
+        // returns Origin::None if no transport-replace in progress or the side triggered the replace.
+        virtual Origin       transportReplaceOrigin() const                 = 0;
         virtual SetDescError setDescription(const QDomElement &description) = 0;
 
         /**
@@ -407,9 +408,9 @@ namespace Jingle {
          *   other applications.
          * @return update type
          */
-        virtual Action         evaluateOutgoingUpdate() = 0;
-        virtual OutgoingUpdate takeOutgoingUpdate()
-            = 0; // this may return something only when evaluateOutgoingUpdate() != NoAction
+        virtual Action evaluateOutgoingUpdate() = 0;
+        // this may return something only when evaluateOutgoingUpdate() != NoAction
+        virtual OutgoingUpdate takeOutgoingUpdate() = 0;
 
         /**
          * @brief wantBetterTransport checks if the transport is a better match for the application
@@ -440,6 +441,7 @@ namespace Jingle {
          */
         virtual bool incomingTransportReplace(const QSharedPointer<Transport> &transport) = 0;
         virtual bool incomingTransportAccept(const QDomElement &transportEl)              = 0;
+        virtual void incomingRemove(const Reason &r)                                      = 0;
 
     signals:
         void updated(); // signal for session it has to send updates to remote. so it will follow with

From e3429054e53099cb2cf5ec3079399409bf597e3b Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 15 Oct 2019 12:41:24 +0300
Subject: [PATCH 108/383] Remember accepted file in jingle-ft

Otherwise raned transfers stop working
---
 src/xmpp/xmpp-im/jingle-ft.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 76d708f8..a8ea9175 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -594,7 +594,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
                     d->bytesLeft = d->acceptFile.range().length;
                     emit deviceRequested(d->acceptFile.range().offset, d->bytesLeft);
                 } else {
-                    d->bytesLeft = d->file.size();
+                    d->bytesLeft = d->acceptFile.size();
                     emit deviceRequested(0, d->bytesLeft);
                 }
             } else {
@@ -774,6 +774,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
             }
             contentEl.appendChild(doc->createElementNS(NS, QString::fromLatin1("description")))
                 .appendChild(d->file.toXml(doc));
+            d->acceptFile                      = d->file;
             std::tie(transportEl, transportCB) = d->transport->takeInitialOffer();
             contentEl.appendChild(transportEl);
 

From e7537651c007c7f1747eb97c40f28f445f5739ee Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 16 Oct 2019 01:25:12 +0300
Subject: [PATCH 109/383] better support for ranged transfers

---
 src/xmpp/xmpp-im/jingle-ft.cpp | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index a8ea9175..9c69f858 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -425,6 +425,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
         QStringList               availableTransports;
         bool                      closeDeviceOnFinish = true;
         bool                      streamigMode        = false;
+        bool                      endlessRange        = false; // where range in accepted file doesn't have end
         QIODevice *               device              = nullptr;
         quint64                   bytesLeft           = 0;
 
@@ -450,27 +451,40 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
 
         void writeNextBlockToTransport()
         {
-            if (!bytesLeft) {
+            if (!(endlessRange || bytesLeft)) {
                 terminationReason = Reason(Reason::Condition::Success);
                 setState(State::Finished);
                 return; // everything is written
             }
             auto sz = connection->blockSize();
             sz      = sz ? sz : 8192;
-            if (sz > bytesLeft) {
+            if (!endlessRange && sz > bytesLeft) {
                 sz = bytesLeft;
             }
-            QByteArray data = device->read(sz);
+            QByteArray data;
+            if (device->isSequential()) {
+                if (!device->bytesAvailable())
+                    return; // we will come back on readyRead
+                data = device->read(qMin(qint64(sz), device->bytesAvailable()));
+            } else {
+                data = device->read(sz);
+            }
             if (data.isEmpty()) {
-                handleStreamFail();
+                if (endlessRange) {
+                    terminationReason = Reason(Reason::Condition::Success);
+                    setState(State::Finished);
+                } else {
+                    handleStreamFail();
+                }
                 return;
             }
+            qDebug("JINGLE-FT write %d bytes to connection", data.size());
             if (connection->write(data) == -1) {
                 handleStreamFail();
                 return;
             }
             emit q->progress(device->pos());
-            bytesLeft -= sz;
+            bytesLeft -= data.size();
         }
 
         void readNextBlockFromTransport()
@@ -592,6 +606,8 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
             if (!d->streamigMode) {
                 if (d->acceptFile.range().isValid()) {
                     d->bytesLeft = d->acceptFile.range().length;
+                    if (!d->bytesLeft)
+                        d->endlessRange = true;
                     emit deviceRequested(d->acceptFile.range().offset, d->bytesLeft);
                 } else {
                     d->bytesLeft = d->acceptFile.size();

From e5f3e82b17c97a039740bc73425fd201fc8b0cd3 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 16 Oct 2019 10:22:46 +0300
Subject: [PATCH 110/383] Comment out file transfer logs

---
 src/xmpp/xmpp-im/jingle-ft.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 9c69f858..0cdcaac3 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -478,7 +478,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
                 }
                 return;
             }
-            qDebug("JINGLE-FT write %d bytes to connection", data.size());
+            // qDebug("JINGLE-FT write %d bytes to connection", data.size());
             if (connection->write(data) == -1) {
                 handleStreamFail();
                 return;
@@ -499,6 +499,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
                     sz = bytesAvail;
                 }
                 QByteArray data = connection->read(sz);
+                // qDebug("JINGLE-FT read %d bytes from connection", data.size());
                 if (data.isEmpty()) {
                     handleStreamFail();
                     return;

From 1aae22c90a6213e3506bca72e3728999796d4ae6 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 21 Oct 2019 11:14:38 +0300
Subject: [PATCH 111/383] Clean binary xmlprtocol queues as well

On clean queues callwe cleaned just uplevel queue. Now all queues are cleaned up
---
 src/xmpp/xmpp-core/protocol.cpp    | 6 +++++-
 src/xmpp/xmpp-core/xmlprotocol.cpp | 7 ++++++-
 src/xmpp/xmpp-core/xmlprotocol.h   | 1 +
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/xmpp/xmpp-core/protocol.cpp b/src/xmpp/xmpp-core/protocol.cpp
index a7cc706d..39606957 100644
--- a/src/xmpp/xmpp-core/protocol.cpp
+++ b/src/xmpp/xmpp-core/protocol.cpp
@@ -194,7 +194,11 @@ void BasicProtocol::sendWhitespace()
     sendList += i;
 }
 
-void BasicProtocol::clearSendQueue() { sendList.clear(); }
+void BasicProtocol::clearSendQueue()
+{
+    sendList.clear();
+    XmlProtocol::clearSendQueue();
+}
 
 QDomElement BasicProtocol::recvStanza()
 {
diff --git a/src/xmpp/xmpp-core/xmlprotocol.cpp b/src/xmpp/xmpp-core/xmlprotocol.cpp
index 43761085..d40661dc 100644
--- a/src/xmpp/xmpp-core/xmlprotocol.cpp
+++ b/src/xmpp/xmpp-core/xmlprotocol.cpp
@@ -288,6 +288,12 @@ void XmlProtocol::outgoingDataWritten(int bytes)
         processTrackQueue(trackQueueNormal, b);
 }
 
+void XmlProtocol::clearSendQueue()
+{
+    outDataUrgent.clear();
+    outDataNormal.clear();
+}
+
 bool XmlProtocol::processStep()
 {
     Parser::Event pe;
@@ -505,7 +511,6 @@ int XmlProtocol::internalWriteData(const QByteArray &a, TrackItem::Type t, int i
 
 int XmlProtocol::internalWriteString(const QString &s, TrackItem::Type t, int id, bool urgent)
 {
-    QString out = sanitizeForStream(s);
     return internalWriteData(s.toUtf8(), t, id, urgent);
 }
 
diff --git a/src/xmpp/xmpp-core/xmlprotocol.h b/src/xmpp/xmpp-core/xmlprotocol.h
index 4e061eb7..75be1d57 100644
--- a/src/xmpp/xmpp-core/xmlprotocol.h
+++ b/src/xmpp/xmpp-core/xmlprotocol.h
@@ -64,6 +64,7 @@ class XmlProtocol : public QObject {
     void       addIncomingData(const QByteArray &);
     QByteArray takeOutgoingData();
     void       outgoingDataWritten(int);
+    void       clearSendQueue();
 
     // advance the state machine
     bool processStep();

From b7f72e16719463800aecb37f83015ed4a0e5761d Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 22 Oct 2019 00:14:11 +0300
Subject: [PATCH 112/383] avoid using im.h internally

---
 src/xmpp/CMakeLists.txt                     |  1 +
 src/xmpp/xmpp-im/client.cpp                 |  2 +-
 src/xmpp/xmpp-im/filetransfer.cpp           |  2 +
 src/xmpp/xmpp-im/filetransfer.h             |  7 +-
 src/xmpp/xmpp-im/httpfileupload.cpp         |  1 +
 src/xmpp/xmpp-im/httpfileupload.h           |  5 +-
 src/xmpp/xmpp-im/im.h                       | 77 +----------------
 src/xmpp/xmpp-im/types.cpp                  | 10 +++
 src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp      |  4 +-
 src/xmpp/xmpp-im/xmpp_form.h                | 96 +++++++++++++++++++++
 src/xmpp/xmpp-im/xmpp_hash.h                |  2 +
 src/xmpp/xmpp-im/xmpp_ibb.cpp               |  2 +
 src/xmpp/xmpp-im/xmpp_ibb.h                 |  1 -
 src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp |  1 +
 src/xmpp/xmpp-im/xmpp_tasks.cpp             |  2 +
 src/xmpp/xmpp-im/xmpp_tasks.h               |  3 +-
 src/xmpp/xmpp.pri                           | 79 ++++++++---------
 17 files changed, 173 insertions(+), 122 deletions(-)
 create mode 100644 src/xmpp/xmpp-im/xmpp_form.h

diff --git a/src/xmpp/CMakeLists.txt b/src/xmpp/CMakeLists.txt
index ef01da35..d7487222 100644
--- a/src/xmpp/CMakeLists.txt
+++ b/src/xmpp/CMakeLists.txt
@@ -29,6 +29,7 @@ set(HEADERS
     xmpp-im/xmpp_chatstate.h
     xmpp-im/xmpp_discoitem.h
     xmpp-im/xmpp_features.h
+    xmpp-im/xmpp_form.h
     xmpp-im/xmpp_htmlelement.h
     xmpp-im/xmpp_httpauthrequest.h
     xmpp-im/xmpp_liveroster.h
diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
index 2531e2c3..14b73885 100644
--- a/src/xmpp/xmpp-im/client.cpp
+++ b/src/xmpp/xmpp-im/client.cpp
@@ -438,7 +438,7 @@ void Client::close(bool)
         d->stream = nullptr;
     }
     disconnected();
-    cleanup();
+    cleanup(); // TODO wait till stream writes all data to the socket
 }
 
 void Client::cleanup()
diff --git a/src/xmpp/xmpp-im/filetransfer.cpp b/src/xmpp/xmpp-im/filetransfer.cpp
index 3f110003..5a52baab 100644
--- a/src/xmpp/xmpp-im/filetransfer.cpp
+++ b/src/xmpp/xmpp-im/filetransfer.cpp
@@ -20,7 +20,9 @@
 #include "filetransfer.h"
 
 #include "s5b.h"
+#include "xmpp_client.h"
 #include "xmpp_ibb.h"
+#include "xmpp_stream.h"
 #include "xmpp_xmlcommon.h"
 
 #include <QFileInfo>
diff --git a/src/xmpp/xmpp-im/filetransfer.h b/src/xmpp/xmpp-im/filetransfer.h
index 8e903090..cbf77dd9 100644
--- a/src/xmpp/xmpp-im/filetransfer.h
+++ b/src/xmpp/xmpp-im/filetransfer.h
@@ -20,12 +20,17 @@
 #ifndef XMPP_FILETRANSFER_H
 #define XMPP_FILETRANSFER_H
 
-#include "im.h"
+#include "xmpp/jid/jid.h"
+#include "xmpp_task.h"
+#include "xmpp_thumbs.h"
 
 namespace XMPP {
 class BSConnection;
 class BytestreamManager;
+class Client;
+class FileTransferManager;
 struct FTRequest;
+class Thumbnail;
 
 /*class AbstractFileTransfer
 {
diff --git a/src/xmpp/xmpp-im/httpfileupload.cpp b/src/xmpp/xmpp-im/httpfileupload.cpp
index 1be7ee0c..1a52fb3d 100644
--- a/src/xmpp/xmpp-im/httpfileupload.cpp
+++ b/src/xmpp/xmpp-im/httpfileupload.cpp
@@ -19,6 +19,7 @@
 
 #include "httpfileupload.h"
 
+#include "xmpp_client.h"
 #include "xmpp_serverinfomanager.h"
 #include "xmpp_tasks.h"
 #include "xmpp_xmlcommon.h"
diff --git a/src/xmpp/xmpp-im/httpfileupload.h b/src/xmpp/xmpp-im/httpfileupload.h
index 1d2f2705..8a4ae26a 100644
--- a/src/xmpp/xmpp-im/httpfileupload.h
+++ b/src/xmpp/xmpp-im/httpfileupload.h
@@ -20,14 +20,17 @@
 #ifndef XMPP_HTTPFILEUPLOAD_H
 #define XMPP_HTTPFILEUPLOAD_H
 
-#include "im.h"
+#include "xmpp/jid/jid.h"
+#include "xmpp_task.h"
 
 #include <functional>
 #include <memory>
 
+class QIODevice;
 class QNetworkAccessManager;
 
 namespace XMPP {
+class Client;
 namespace XEP0363 {
     enum version { vUnknown, v0_2_5, v0_3_1 };
     struct HttpHeader {
diff --git a/src/xmpp/xmpp-im/im.h b/src/xmpp/xmpp-im/im.h
index c2cc2814..48438d13 100644
--- a/src/xmpp/xmpp-im/im.h
+++ b/src/xmpp/xmpp-im/im.h
@@ -28,6 +28,7 @@
 #include "xmpp_client.h"
 #include "xmpp_discoitem.h"
 #include "xmpp_features.h"
+#include "xmpp_form.h"
 #include "xmpp_hash.h"
 #include "xmpp_htmlelement.h"
 #include "xmpp_httpauthrequest.h"
@@ -48,80 +49,4 @@
 #include "xmpp_url.h"
 #include "xmpp_xdata.h"
 
-#include <QList>
-#include <qdatetime.h>
-
-namespace XMPP {
-typedef QList<AgentItem> AgentList;
-typedef QList<DiscoItem> DiscoList;
-
-class FormField {
-public:
-    enum { username, nick, password, name, first, last, email, address, city, state, zip, phone, url, date, misc };
-    FormField(const QString &type = "", const QString &value = "");
-    ~FormField();
-
-    int            type() const;
-    QString        fieldName() const;
-    QString        realName() const;
-    bool           isSecret() const;
-    const QString &value() const;
-    void           setType(int);
-    bool           setType(const QString &);
-    void           setValue(const QString &);
-
-private:
-    int     tagNameToType(const QString &) const;
-    QString typeToTagName(int) const;
-
-    int     v_type;
-    QString v_value;
-
-    class Private;
-    Private *d = nullptr;
-};
-
-class Form : public QList<FormField> {
-public:
-    Form(const Jid &j = "");
-    ~Form();
-
-    Jid     jid() const;
-    QString instructions() const;
-    QString key() const;
-    void    setJid(const Jid &);
-    void    setInstructions(const QString &);
-    void    setKey(const QString &);
-
-private:
-    Jid     v_jid;
-    QString v_instructions, v_key;
-
-    class Private;
-    Private *d = nullptr;
-};
-
-class SearchResult {
-public:
-    SearchResult(const Jid &jid = "");
-    ~SearchResult();
-
-    const Jid &    jid() const;
-    const QString &nick() const;
-    const QString &first() const;
-    const QString &last() const;
-    const QString &email() const;
-
-    void setJid(const Jid &);
-    void setNick(const QString &);
-    void setFirst(const QString &);
-    void setLast(const QString &);
-    void setEmail(const QString &);
-
-private:
-    Jid     v_jid;
-    QString v_nick, v_first, v_last, v_email;
-};
-} // namespace XMPP
-
 #endif // XMPP_IM_H
diff --git a/src/xmpp/xmpp-im/types.cpp b/src/xmpp/xmpp-im/types.cpp
index 8ffd1bce..bdd70a5c 100644
--- a/src/xmpp/xmpp-im/types.cpp
+++ b/src/xmpp/xmpp-im/types.cpp
@@ -417,6 +417,16 @@ Hash Hash::from(XMPP::Hash::Type t, QIODevice *dev)
     return h;
 }
 
+Hash Hash::from(Hash::Type t, const QFileInfo &file)
+{
+    if (file.isReadable()) {
+        QFile f(file.filePath());
+        f.open(QIODevice::ReadOnly);
+        return from(t, &f);
+    }
+    return Hash();
+}
+
 Hash Hash::from(const QStringRef &str)
 {
     auto ind = str.indexOf('+');
diff --git a/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp b/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp
index 6bbe76b8..5dc85cef 100644
--- a/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp
+++ b/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp
@@ -92,7 +92,7 @@ void BoBData::fromXml(const QDomElement &data)
     setCid(data.attribute("cid"));
     d->maxAge = data.attribute("max-age").toInt();
     d->type   = data.attribute("type");
-    d->data   = QCA::Base64().stringToArray(data.text().replace("\n", "")).toByteArray();
+    d->data   = QByteArray::fromBase64(data.text().replace("\n", "").toLatin1());
 }
 
 QDomElement BoBData::toXml(QDomDocument *doc) const
@@ -101,7 +101,7 @@ QDomElement BoBData::toXml(QDomDocument *doc) const
     data.setAttribute("cid", cid());
     data.setAttribute("max-age", d->maxAge);
     data.setAttribute("type", d->type);
-    data.appendChild(doc->createTextNode(QCA::Base64().arrayToString(d->data)));
+    data.appendChild(doc->createTextNode(QString::fromLatin1(d->data.toBase64())));
     return data;
 }
 
diff --git a/src/xmpp/xmpp-im/xmpp_form.h b/src/xmpp/xmpp-im/xmpp_form.h
new file mode 100644
index 00000000..8ae5ca0a
--- /dev/null
+++ b/src/xmpp/xmpp-im/xmpp_form.h
@@ -0,0 +1,96 @@
+/*
+ * xmpp_form.h - XMPP form
+ * Copyright (C) 2003  Justin Karneges
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#pragma once 
+
+#include <QList>
+#include <qdatetime.h>
+
+namespace XMPP {
+typedef QList<AgentItem> AgentList;
+typedef QList<DiscoItem> DiscoList;
+
+class FormField {
+public:
+    enum { username, nick, password, name, first, last, email, address, city, state, zip, phone, url, date, misc };
+    FormField(const QString &type = "", const QString &value = "");
+    ~FormField();
+
+    int            type() const;
+    QString        fieldName() const;
+    QString        realName() const;
+    bool           isSecret() const;
+    const QString &value() const;
+    void           setType(int);
+    bool           setType(const QString &);
+    void           setValue(const QString &);
+
+private:
+    int     tagNameToType(const QString &) const;
+    QString typeToTagName(int) const;
+
+    int     v_type;
+    QString v_value;
+
+    class Private;
+    Private *d = nullptr;
+};
+
+class Form : public QList<FormField> {
+public:
+    Form(const Jid &j = "");
+    ~Form();
+
+    Jid     jid() const;
+    QString instructions() const;
+    QString key() const;
+    void    setJid(const Jid &);
+    void    setInstructions(const QString &);
+    void    setKey(const QString &);
+
+private:
+    Jid     v_jid;
+    QString v_instructions, v_key;
+
+    class Private;
+    Private *d = nullptr;
+};
+
+class SearchResult {
+public:
+    SearchResult(const Jid &jid = "");
+    ~SearchResult();
+
+    const Jid &    jid() const;
+    const QString &nick() const;
+    const QString &first() const;
+    const QString &last() const;
+    const QString &email() const;
+
+    void setJid(const Jid &);
+    void setNick(const QString &);
+    void setFirst(const QString &);
+    void setLast(const QString &);
+    void setEmail(const QString &);
+
+private:
+    Jid     v_jid;
+    QString v_nick, v_first, v_last, v_email;
+};
+} // namespace XMPP
diff --git a/src/xmpp/xmpp-im/xmpp_hash.h b/src/xmpp/xmpp-im/xmpp_hash.h
index 8f94659a..4a21bc37 100644
--- a/src/xmpp/xmpp-im/xmpp_hash.h
+++ b/src/xmpp/xmpp-im/xmpp_hash.h
@@ -21,6 +21,7 @@
 
 #include "xmpp_stanza.h"
 
+#include <QFileInfo>
 #include <QString>
 
 class QDomElement;
@@ -70,6 +71,7 @@ class Hash {
     static void populateFeatures(XMPP::Features &);
     static Hash from(Type t, const QByteArray &fileData);
     static Hash from(XMPP::Hash::Type t, QIODevice *dev);
+    static Hash from(XMPP::Hash::Type t, const QFileInfo &file);
     static Hash from(const QStringRef &str); // e.g. sha1+aabccddeeffaabbcc232387539465923645
 
 private:
diff --git a/src/xmpp/xmpp-im/xmpp_ibb.cpp b/src/xmpp/xmpp-im/xmpp_ibb.cpp
index de3777ad..0b190712 100644
--- a/src/xmpp/xmpp-im/xmpp_ibb.cpp
+++ b/src/xmpp/xmpp-im/xmpp_ibb.cpp
@@ -19,6 +19,8 @@
 
 #include "xmpp_ibb.h"
 
+#include "xmpp_client.h"
+#include "xmpp_stream.h"
 #include "xmpp_xmlcommon.h"
 
 #include <QtCrypto>
diff --git a/src/xmpp/xmpp-im/xmpp_ibb.h b/src/xmpp/xmpp-im/xmpp_ibb.h
index f3c77d81..044927d1 100644
--- a/src/xmpp/xmpp-im/xmpp_ibb.h
+++ b/src/xmpp/xmpp-im/xmpp_ibb.h
@@ -21,7 +21,6 @@
 #define XMPP_IBB_H
 
 #include "bytestream.h"
-#include "im.h"
 #include "xmpp_bytestream.h"
 #include "xmpp_task.h"
 
diff --git a/src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp b/src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp
index e9dc3589..bc670f9d 100644
--- a/src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp
+++ b/src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp
@@ -20,6 +20,7 @@
 #include "xmpp_serverinfomanager.h"
 
 #include "xmpp_caps.h"
+#include "xmpp_client.h"
 #include "xmpp_tasks.h"
 
 namespace XMPP {
diff --git a/src/xmpp/xmpp-im/xmpp_tasks.cpp b/src/xmpp/xmpp-im/xmpp_tasks.cpp
index d0980794..a616fb53 100644
--- a/src/xmpp/xmpp-im/xmpp_tasks.cpp
+++ b/src/xmpp/xmpp-im/xmpp_tasks.cpp
@@ -23,6 +23,8 @@
 #include "xmpp_bitsofbinary.h"
 #include "xmpp_caps.h"
 #include "xmpp_captcha.h"
+#include "xmpp_client.h"
+#include "xmpp_roster.h"
 #include "xmpp_vcard.h"
 #include "xmpp_xmlcommon.h"
 
diff --git a/src/xmpp/xmpp-im/xmpp_tasks.h b/src/xmpp/xmpp-im/xmpp_tasks.h
index 11f8a6b3..17532f1d 100644
--- a/src/xmpp/xmpp-im/xmpp_tasks.h
+++ b/src/xmpp/xmpp-im/xmpp_tasks.h
@@ -20,9 +20,10 @@
 #ifndef XMPP_TASKS_H
 #define XMPP_TASKS_H
 
-#include "im.h"
 #include "xmpp_discoinfotask.h"
 #include "xmpp_encryptionhandler.h"
+#include "xmpp_form.h"
+#include "xmpp_message.h"
 #include "xmpp_subsets.h"
 #include "xmpp_vcard.h"
 
diff --git a/src/xmpp/xmpp.pri b/src/xmpp/xmpp.pri
index 0ce51bf1..43cbb42c 100644
--- a/src/xmpp/xmpp.pri
+++ b/src/xmpp/xmpp.pri
@@ -27,62 +27,63 @@ INCLUDEPATH += \
     $$PWD/xmpp-im
 
 HEADERS += \
-    $$PWD/xmpp-core/securestream.h \
+    $$PWD/xmpp-core/compressionhandler.h \
     $$PWD/xmpp-core/parser.h \
-    $$PWD/xmpp-core/xmlprotocol.h \
     $$PWD/xmpp-core/protocol.h \
+    $$PWD/xmpp-core/securestream.h \
     $$PWD/xmpp-core/sm.h \
-    $$PWD/xmpp-core/compressionhandler.h \
     $$PWD/xmpp-core/td.h \
-    $$PWD/xmpp-im/xmpp_tasks.h \
-    $$PWD/xmpp-im/xmpp_discoinfotask.h \
-    $$PWD/xmpp-im/xmpp_xmlcommon.h \
-    $$PWD/xmpp-im/xmpp_vcard.h \
-    $$PWD/xmpp-im/xmpp_bytestream.h \
-    $$PWD/xmpp-im/s5b.h \
-    $$PWD/xmpp-im/xmpp_ibb.h \
-    $$PWD/xmpp-im/filetransfer.h \
-    $$PWD/xmpp-im/httpfileupload.h \
-    $$PWD/xmpp-core/xmpp.h \
-    $$PWD/xmpp-im/xmpp_url.h \
-    $$PWD/xmpp-im/xmpp_chatstate.h \
-    $$PWD/xmpp-im/xmpp_receipts.h \
-    $$PWD/xmpp-im/xmpp_client.h \
+    $$PWD/xmpp-core/xmlprotocol.h \
     $$PWD/xmpp-core/xmpp_clientstream.h \
+    $$PWD/xmpp-core/xmpp.h \
     $$PWD/xmpp-core/xmpp_stanza.h \
     $$PWD/xmpp-core/xmpp_stream.h \
+    $$PWD/xmpp-im/filetransfer.h \
+    $$PWD/xmpp-im/httpfileupload.h \
+    $$PWD/xmpp-im/im.h \
+    $$PWD/xmpp-im/jingle-ft.h \
+    $$PWD/xmpp-im/jingle.h \
+    $$PWD/xmpp-im/jingle-ibb.h \
+    $$PWD/xmpp-im/jingle-s5b.h \
+    $$PWD/xmpp-im/s5b.h \
     $$PWD/xmpp-im/xmpp_address.h \
+    $$PWD/xmpp-im/xmpp_agentitem.h \
+    $$PWD/xmpp-im/xmpp_bitsofbinary.h \
+    $$PWD/xmpp-im/xmpp_bytestream.h \
+    $$PWD/xmpp-im/xmpp_caps.h \
+    $$PWD/xmpp-im/xmpp_captcha.h \
+    $$PWD/xmpp-im/xmpp_chatstate.h \
+    $$PWD/xmpp-im/xmpp_client.h \
+    $$PWD/xmpp-im/xmpp_discoinfotask.h \
+    $$PWD/xmpp-im/xmpp_discoitem.h \
+    $$PWD/xmpp-im/xmpp_features.h \
+    $$PWD/xmpp-im/xmpp_form.h \
     $$PWD/xmpp-im/xmpp_hash.h \
-    $$PWD/xmpp-im/xmpp_thumbs.h \
     $$PWD/xmpp-im/xmpp_htmlelement.h \
-    $$PWD/xmpp-im/xmpp_muc.h \
-    $$PWD/xmpp-im/xmpp_reference.h \
+    $$PWD/xmpp-im/xmpp_httpauthrequest.h \
+    $$PWD/xmpp-im/xmpp_ibb.h \
+    $$PWD/xmpp-im/xmpp_liveroster.h \
+    $$PWD/xmpp-im/xmpp_liverosteritem.h \
     $$PWD/xmpp-im/xmpp_message.h \
+    $$PWD/xmpp-im/xmpp_muc.h \
     $$PWD/xmpp-im/xmpp_pubsubitem.h \
+    $$PWD/xmpp-im/xmpp_receipts.h \
+    $$PWD/xmpp-im/xmpp_reference.h \
     $$PWD/xmpp-im/xmpp_resource.h \
+    $$PWD/xmpp-im/xmpp_resourcelist.h \
     $$PWD/xmpp-im/xmpp_roster.h \
-    $$PWD/xmpp-im/xmpp_rosterx.h \
-    $$PWD/xmpp-im/xmpp_xdata.h \
     $$PWD/xmpp-im/xmpp_rosteritem.h \
-    $$PWD/xmpp-im/xmpp_liveroster.h \
-    $$PWD/xmpp-im/xmpp_liverosteritem.h \
-    $$PWD/xmpp-im/xmpp_resourcelist.h \
-    $$PWD/xmpp-im/xmpp_task.h \
-    $$PWD/xmpp-im/xmpp_httpauthrequest.h \
+    $$PWD/xmpp-im/xmpp_rosterx.h \
+    $$PWD/xmpp-im/xmpp_serverinfomanager.h \
     $$PWD/xmpp-im/xmpp_status.h \
     $$PWD/xmpp-im/xmpp_subsets.h \
-    $$PWD/xmpp-im/xmpp_captcha.h \
-    $$PWD/xmpp-im/xmpp_features.h \
-    $$PWD/xmpp-im/xmpp_agentitem.h \
-    $$PWD/xmpp-im/xmpp_discoitem.h \
-    $$PWD/xmpp-im/xmpp_bitsofbinary.h \
-    $$PWD/xmpp-im/xmpp_caps.h \
-    $$PWD/xmpp-im/im.h \
-    $$PWD/xmpp-im/xmpp_serverinfomanager.h \
-    $$PWD/xmpp-im/jingle.h \
-    $$PWD/xmpp-im/jingle-ft.h \
-    $$PWD/xmpp-im/jingle-s5b.h \
-    $$PWD/xmpp-im/jingle-ibb.h
+    $$PWD/xmpp-im/xmpp_task.h \
+    $$PWD/xmpp-im/xmpp_tasks.h \
+    $$PWD/xmpp-im/xmpp_thumbs.h \
+    $$PWD/xmpp-im/xmpp_url.h \
+    $$PWD/xmpp-im/xmpp_vcard.h \
+    $$PWD/xmpp-im/xmpp_xdata.h \
+    $$PWD/xmpp-im/xmpp_xmlcommon.h
 
 SOURCES += \
     $$PWD/xmpp-core/connector.cpp \

From 235444d86c43f09837e6fc217b8006ca9c84e656 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Thu, 24 Oct 2019 10:48:12 +0300
Subject: [PATCH 113/383] Add hash functions synonims for backward compat

---
 src/xmpp/xmpp-im/types.cpp | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/xmpp/xmpp-im/types.cpp b/src/xmpp/xmpp-im/types.cpp
index bdd70a5c..c598a819 100644
--- a/src/xmpp/xmpp-im/types.cpp
+++ b/src/xmpp/xmpp-im/types.cpp
@@ -253,11 +253,13 @@ void Address::setType(Type type) { v_type = type; }
 //----------------------------------------------------------------------------
 // Hash
 //----------------------------------------------------------------------------
+static const char *const sha1_synonims[] = { "sha1", nullptr };
 // NOTE: keep this in sync with enum. same order!
 static const struct {
-    const char *text;
-    Hash::Type  hashType;
-} hashTypes[] = { { "sha-1", Hash::Type::Sha1 },
+    const char *       text;
+    Hash::Type         hashType;
+    const char *const *synonims = nullptr;
+} hashTypes[] = { { "sha-1", Hash::Type::Sha1, sha1_synonims },
                   { "sha-256", Hash::Type::Sha256 },
                   { "sha-512", Hash::Type::Sha512 },
                   { "sha3-256", Hash::Type::Sha3_256 },
@@ -292,6 +294,15 @@ Hash::Type Hash::parseType(const QStringRef &algo)
             if (algo == QLatin1String(hashTypes[n].text)) {
                 return hashTypes[n].hashType;
             }
+            if (hashTypes[n].synonims) {
+                auto cur = hashTypes[n].synonims;
+                while (*cur) {
+                    if (algo == QLatin1String(*cur)) {
+                        return hashTypes[n].hashType;
+                    }
+                    cur++;
+                }
+            }
         }
     }
     return Unknown;

From 80d4b2e506c3be58d1978634c01eb01cd94f8511 Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Fri, 25 Oct 2019 21:33:43 +0300
Subject: [PATCH 114/383] Added lost header to xmpp-im/xmpp_httpauthrequest.h

---
 src/xmpp/xmpp-im/xmpp_httpauthrequest.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/xmpp/xmpp-im/xmpp_httpauthrequest.h b/src/xmpp/xmpp-im/xmpp_httpauthrequest.h
index 863eabce..7756d9e5 100644
--- a/src/xmpp/xmpp-im/xmpp_httpauthrequest.h
+++ b/src/xmpp/xmpp-im/xmpp_httpauthrequest.h
@@ -21,6 +21,8 @@
 
 #include <QString>
 
+#include "xmpp_stanza.h"
+
 class QDomDocument;
 class QDomElement;
 

From ec3a6e4373cf183e0a7372a7476cb25ced7315f0 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 4 Nov 2019 09:30:46 +0300
Subject: [PATCH 115/383] query custom s5b proxy early + a lot of debug logs

---
 src/xmpp/xmpp-im/jingle-s5b.cpp        | 224 ++++++++++++++++++-------
 src/xmpp/xmpp-im/jingle-s5b.h          |   5 +
 src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp |   2 +-
 3 files changed, 169 insertions(+), 62 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index ff155e2b..38655774 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -241,12 +241,12 @@ namespace XMPP { namespace Jingle { namespace S5B {
 
                             if (socksClient) {
                                 state = successState;
-                                qDebug() << "socks client" << socksClient << "is connected";
+                                qDebug() << "connected: cid=" << cid << "socks client (ipv6)" << socksClient;
                                 callback(true);
                                 return;
                             }
                             state = Candidate::Discarded;
-                            qDebug() << "socks client" << socksClient << "failed to connect";
+                            qDebug() << "failed to connect: cid=" << cid << "no socks client (ipv6)";
                             callback(false);
                         });
                 v6llConnector->connectToHost(ha, port, key, isUdp);
@@ -254,14 +254,20 @@ namespace XMPP { namespace Jingle { namespace S5B {
                 socksClient = new SocksClient;
                 qDebug() << "connect to host with cid=" << cid << ", key=" << key << " and socks client" << socksClient;
                 connect(socksClient, &SocksClient::connected, callbackContext, [this, callback, successState]() {
+                    if (state == Candidate::Discarded) {
+                        return;
+                    }
                     state = successState;
-                    qDebug() << "socks client" << socksClient << "is connected";
+                    qDebug() << "connected: cid=" << cid << "socks client" << socksClient;
                     callback(true);
                 });
                 connect(socksClient, &SocksClient::error, callbackContext, [this, callback](int error) {
                     Q_UNUSED(error);
+                    if (state == Candidate::Discarded) {
+                        return;
+                    }
                     state = Candidate::Discarded;
-                    qDebug() << "socks client" << socksClient << "failed to connect";
+                    qDebug() << "failed to connect: cid=" << cid << "socks client" << socksClient;
                     callback(false);
                 });
                 // connect(&t, SIGNAL(timeout()), SLOT(trySendUDP()));
@@ -394,6 +400,23 @@ namespace XMPP { namespace Jingle { namespace S5B {
 
     Candidate::Type Candidate::type() const { return d->type; }
 
+    const char *Candidate::typeText(Candidate::Type t)
+    {
+        switch (t) {
+        case None:
+            return "Unibitialized";
+        case Proxy:
+            return "Proxy";
+        case Tunnel:
+            return "Tunnel";
+        case Assisted:
+            return "Assisted";
+        case Direct:
+            return "Direct";
+        }
+        return "Unknown";
+    }
+
     QString Candidate::cid() const { return d->cid; }
 
     Jid Candidate::jid() const { return d->jid; }
@@ -432,6 +455,8 @@ namespace XMPP { namespace Jingle { namespace S5B {
             return "Unacked";
         case Accepted:
             return "Accepted";
+        case Activating:
+            return "Activating";
         case Active:
             return "Active";
         case Discarded:
@@ -462,6 +487,16 @@ namespace XMPP { namespace Jingle { namespace S5B {
         return e;
     }
 
+    QString Candidate::toString() const
+    {
+        if (d)
+            return QString("Cadidate(%1 cid=%2 %3)").arg(typeText(d->type), d->cid, stateText(d->state));
+        else
+            return QString("Candidate(null)");
+    }
+
+    // connect to the host and sets successState on success or discards the cadidate.
+    // If the candidate was discarded before the connection is finished, then the passed callback won't be called.
     void Candidate::connectToHost(const QString &key, State successState, QObject *callbackContext,
                                   std::function<void(bool)> callback, bool isUdp)
     {
@@ -532,6 +567,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
         QString            sid;
         Transport::Mode    mode = Transport::Tcp;
         QTimer             probingTimer;
+        QTimer             negotiationFinishTimer;
         QElapsedTimer      lastConnectionStart;
         size_t             blockSize = 8192;
         TcpPortDiscoverer *disco     = nullptr;
@@ -564,6 +600,46 @@ namespace XMPP { namespace Jingle { namespace S5B {
             return false;
         }
 
+        // queries proxy's host/port and sends the candidate to remote
+        void queryS5BProxy(const Jid &j, const QString &cid)
+        {
+            proxiesInDiscoCount++;
+            auto query = new JT_S5B(pad->session()->manager()->client()->rootTask());
+            connect(query, &JT_S5B::finished, q, [this, query, cid]() {
+                if (!proxyDiscoveryInProgress) {
+                    return;
+                }
+                bool candidateUpdated = false;
+                auto c                = localCandidates.value(cid);
+                if (c && c.state() == Candidate::Probing) {
+                    auto sh = query->proxyInfo();
+                    if (query->success() && !sh.host().isEmpty() && sh.port()) {
+                        // it can be discarded by this moment (e.g. got success on a higher priority
+                        // candidate). so we have to check.
+                        c.setHost(sh.host());
+                        c.setPort(sh.port());
+                        c.setState(Candidate::New);
+                        candidateUpdated = true;
+                        pendingActions |= Private::NewCandidate;
+                    } else {
+                        c.setState(Candidate::Discarded);
+                    }
+                }
+                proxiesInDiscoCount--;
+                if (!proxiesInDiscoCount) {
+                    proxyDiscoveryInProgress = false;
+                }
+                if (candidateUpdated) {
+                    emit q->updated();
+                } else if (!proxiesInDiscoCount) {
+                    // it's possible it was our last hope and probaby we have to send candidate-error now.
+                    checkAndFinishNegotiation();
+                }
+            });
+            query->requestProxyInfo(j);
+            query->go(true);
+        }
+
         void discoS5BProxy()
         {
             auto m     = static_cast<Manager *>(pad->manager());
@@ -571,7 +647,9 @@ namespace XMPP { namespace Jingle { namespace S5B {
             if (proxy.isValid()) {
                 Candidate c(q, proxy, generateCid());
                 if (!isDup(c)) {
+                    qDebug("new local candidate: %s", qPrintable(c.toString()));
                     localCandidates.insert(c.cid(), c);
+                    queryS5BProxy(c.jid(), c.cid());
                 }
             }
 
@@ -589,61 +667,24 @@ namespace XMPP { namespace Jingle { namespace S5B {
                     auto m         = static_cast<Manager *>(pad->manager());
                     Jid  userProxy = m->userProxy();
 
-                    // queries proxy's host/port and sends the candidate to remote
-                    auto queryProxy = [this](const Jid &j, const QString &cid) {
-                        proxiesInDiscoCount++;
-                        auto query = new JT_S5B(pad->session()->manager()->client()->rootTask());
-                        connect(query, &JT_S5B::finished, q, [this, query, cid]() {
-                            if (!proxyDiscoveryInProgress) {
-                                return;
-                            }
-                            bool candidateUpdated = false;
-                            auto c                = localCandidates.value(cid);
-                            if (c && c.state() == Candidate::Probing) {
-                                auto sh = query->proxyInfo();
-                                if (query->success() && !sh.host().isEmpty() && sh.port()) {
-                                    // it can be discarded by this moment (e.g. got success on a higher priority
-                                    // candidate). so we have to check.
-                                    c.setHost(sh.host());
-                                    c.setPort(sh.port());
-                                    c.setState(Candidate::New);
-                                    candidateUpdated = true;
-                                    pendingActions |= Private::NewCandidate;
-                                } else {
-                                    c.setState(Candidate::Discarded);
-                                }
-                            }
-                            proxiesInDiscoCount--;
-                            if (!proxiesInDiscoCount) {
-                                proxyDiscoveryInProgress = false;
-                            }
-                            if (candidateUpdated) {
-                                emit q->updated();
-                            } else if (!proxiesInDiscoCount) {
-                                // it's possible it was our last hope and probaby we have to send candidate-error now.
-                                checkAndFinishNegotiation();
-                            }
-                        });
-                        query->requestProxyInfo(j);
-                        query->go(true);
-                    };
-
                     bool userProxyFound = !userProxy.isValid();
                     for (const auto i : items) {
                         int localPref = 0;
                         if (!userProxyFound && i.jid() == userProxy) {
                             localPref      = 1;
                             userProxyFound = true;
+                            continue;
                         }
                         Candidate c(q, i.jid(), generateCid(), localPref);
                         localCandidates.insert(c.cid(), c);
-
-                        queryProxy(i.jid(), c.cid());
+                        qDebug("new local candidate: %s", qPrintable(c.toString()));
+                        queryS5BProxy(i.jid(), c.cid());
                     }
                     if (!userProxyFound) {
                         Candidate c(q, userProxy, generateCid(), 1);
                         localCandidates.insert(c.cid(), c);
-                        queryProxy(userProxy, c.cid());
+                        qDebug("new local candidate: %s", qPrintable(c.toString()));
+                        queryS5BProxy(userProxy, c.cid());
                     } else if (items.count() == 0) {
                         // seems like we don't have any proxy
                         proxyDiscoveryInProgress = false;
@@ -718,6 +759,9 @@ namespace XMPP { namespace Jingle { namespace S5B {
                 mnc.connectToHost(
                     key, Candidate::Pending, q,
                     [this, mnc](bool success) {
+                        if (mnc.state() == Candidate::Discarded)
+                            return;
+
                         // candidate's status had to be changed by connectToHost, so we don't set it again
                         if (success) {
                             // let's reject candidates which are meaningless to try
@@ -736,7 +780,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
                                     &= ~Private::NewCandidate; // just if we had it for example after proxy discovery
                             }
                             setLocalProbingMinimalPreference(mnc.priority() >> 16);
-                            updateMinimalPriority();
+                            updateMinimalPriorityOnConnected();
                         }
                         checkAndFinishNegotiation();
                     },
@@ -776,6 +820,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
         {
             // now ensure all local were sent to remote and no hope left
             if (proxyDiscoveryInProgress || (disco && !disco->isDepleted())) {
+                qDebug("still has: either s5b proxy or host candidates disco in progress");
                 return true;
             }
 
@@ -783,6 +828,8 @@ namespace XMPP { namespace Jingle { namespace S5B {
             for (const auto &c : localCandidates) {
                 auto s = c.state();
                 if (s == Candidate::Probing || s == Candidate::New || s == Candidate::Unacked) {
+                    qDebug("still has: a local candidte cid=%s in %s state", qPrintable(c.cid()),
+                           qPrintable(c.stateText(s)));
                     return true;
                 }
             }
@@ -818,7 +865,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
             // local candidates are expected to be discovered
 
             if (!transportStarted || connection) { // if not started or already finished
-                qDebug("checkAndFinishNegotiation not finished: !connectionStarted || connection");
+                qWarning("checkAndFinishNegotiation not finished: !connectionStarted || connection");
                 return;
             }
 
@@ -847,11 +894,19 @@ namespace XMPP { namespace Jingle { namespace S5B {
                             if (c.type() == Candidate::Proxy) { // local proxy
                                 // If it's proxy, first it has to be activated
                                 if (c == localUsedCandidate) {
-                                    // it's our side who proposed proxy. so we have to connect to it and activate
+                                    if (c.state() == Candidate::Activating) {
+                                        qDebug("The proxy cid=%s is still activating", qPrintable(c.cid()));
+                                        return;
+                                    }
+                                    // it's our side who offered proxy. so we have to connect to it and activate
                                     auto key = makeKey(sid, pad->session()->me(), pad->session()->peer());
+
+                                    qDebug("Connect to proxy offered by local side (cid=%s) and activate it",
+                                           qPrintable(c.cid()));
+                                    c.setState(Candidate::Activating);
                                     c.connectToHost(
-                                        key, Candidate::Accepted, q,
-                                        [this](bool success) {
+                                        key, Candidate::Activating, q,
+                                        [this, c](bool success) {
                                             if (!success) {
                                                 pendingActions |= Private::ProxyError;
                                                 emit q->updated();
@@ -859,8 +914,14 @@ namespace XMPP { namespace Jingle { namespace S5B {
                                             }
 
                                             auto query = new JT_S5B(pad->session()->manager()->client()->rootTask());
-                                            connect(query, &JT_S5B::finished, q, [this, query]() {
-                                                Q_ASSERT(localUsedCandidate.state() == Candidate::Accepted);
+                                            connect(query, &JT_S5B::finished, q, [this, c, query]() {
+                                                if (c.state() != Candidate::Activating) {
+                                                    qDebug(
+                                                        "Proxy candidate cid=%s was changed state while we were trying "
+                                                        "to activate(activate) it. Ignore the result",
+                                                        qPrintable(c.cid()));
+                                                    return;
+                                                }
                                                 if (!query->success()) {
                                                     pendingActions |= Private::ProxyError;
                                                     emit q->updated();
@@ -931,7 +992,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
         }
 
         // take used-candidate with highest priority and discard all with lower. also update used candidates themselves
-        void updateMinimalPriority()
+        void updateMinimalPriorityOnConnected()
         {
             quint32 prio = 0;
             if (localUsedCandidate && localUsedCandidate.state() != Candidate::Discarded) {
@@ -985,6 +1046,8 @@ namespace XMPP { namespace Jingle { namespace S5B {
             if (!haveNewCandidates) {
                 pendingActions &= ~NewCandidate;
             }
+
+            negotiationFinishTimer.start();
         }
 
         void onLocalServerDiscovered()
@@ -1047,6 +1110,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
                             return true;
                         });
                     localCandidates.insert(c.cid(), c);
+                    qDebug("new local candidate: %s", qPrintable(c.toString()));
                     pendingActions |= NewCandidate;
                     hasNewCandidates = true;
                 }
@@ -1060,6 +1124,8 @@ namespace XMPP { namespace Jingle { namespace S5B {
         {
             connection.reset(new Connection(connCand.takeSocksClient(), mode));
             probingTimer.stop();
+            negotiationFinishTimer.stop();
+            proxyDiscoveryInProgress = false;
             for (auto &rc : remoteCandidates) {
                 if (rc != connCand && rc.state() == Candidate::Probing) {
                     rc.deleteSocksClient();
@@ -1071,6 +1137,23 @@ namespace XMPP { namespace Jingle { namespace S5B {
                 emit q->connected();
             });
         }
+
+        void handleNegotiationTimeout()
+        {
+            // probingTimer.stop();
+            proxyDiscoveryInProgress = false;
+            for (auto &rc : remoteCandidates) {
+                if (rc.state() <= Candidate::Probing) {
+                    rc.setState(Candidate::Discarded);
+                }
+            }
+            for (auto &rc : localCandidates) {
+                if (rc.state() <= Candidate::Probing) {
+                    rc.setState(Candidate::Discarded);
+                }
+            }
+            checkAndFinishNegotiation();
+        }
     };
 
     Transport::Transport(const TransportManagerPad::Ptr &pad) : d(new Private)
@@ -1078,7 +1161,10 @@ namespace XMPP { namespace Jingle { namespace S5B {
         d->q   = this;
         d->pad = pad.staticCast<Pad>();
         d->probingTimer.setSingleShot(true);
+        d->negotiationFinishTimer.setSingleShot(true);
+        d->negotiationFinishTimer.setInterval(5000); // TODO select the value smart way
         connect(&d->probingTimer, &QTimer::timeout, [this]() { d->tryConnectToRemoteCandidate(); });
+        connect(&d->negotiationFinishTimer, &QTimer::timeout, this, [this]() { d->handleNegotiationTimeout(); });
         connect(pad->manager(), &TransportManager::abortAllRequested, this, [this]() {
             d->aborted = true;
             emit failed();
@@ -1187,13 +1273,15 @@ namespace XMPP { namespace Jingle { namespace S5B {
             if (cUsed.state() == Candidate::Pending) {
                 cUsed.setState(Candidate::Accepted);
                 d->localUsedCandidate = cUsed;
-                d->updateMinimalPriority();
+                d->updateMinimalPriorityOnConnected();
                 QTimer::singleShot(0, this, [this]() { d->checkAndFinishNegotiation(); });
             } else {
-                // seems like we already rejected the candidate and either remote side already know about it or will
-                // soon
+                // we already rejected the candidate and either remote side already knows about it or will soon
+                // it's possible for example if we were able to connect to higher priority candidate, so
+                // we have o pretend like remote couldn't select anything better but finished already, in other words
+                // like if it sent candidate-error.
                 d->localUsedCandidate           = Candidate();
-                d->remoteReportedCandidateError = true; // as a sign remote has finished
+                d->remoteReportedCandidateError = true;
             }
             return true;
         }
@@ -1309,6 +1397,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
                 if (c.type() == Candidate::Proxy) {
                     useProxy = true;
                 }
+                qDebug("sending local candidate: cid=%s", qPrintable(c.cid()));
                 tel.appendChild(c.toXml(doc));
                 candidatesToSend.append(c);
                 c.setState(Candidate::Unacked);
@@ -1324,6 +1413,8 @@ namespace XMPP { namespace Jingle { namespace S5B {
                                                        for (auto &c : candidatesToSend) {
                                                            if (c.state() == Candidate::Unacked) {
                                                                c.setState(Candidate::Pending);
+                                                               qDebug("ack: sending local candidate: cid=%s",
+                                                                      qPrintable(c.cid()));
                                                            }
                                                        }
                                                        d->checkAndFinishNegotiation();
@@ -1339,6 +1430,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
                 if (c.state() != Candidate::Pending) {
                     continue;
                 }
+                qDebug("sending candidate-used: cid=%s", qPrintable(c.cid()));
                 auto el = tel.appendChild(doc->createElement(QStringLiteral("candidate-used"))).toElement();
                 el.setAttribute(QStringLiteral("cid"), c.cid());
                 c.setState(Candidate::Unacked);
@@ -1348,6 +1440,8 @@ namespace XMPP { namespace Jingle { namespace S5B {
                                                        d->waitingAck= false;
                                                        if (c.state() == Candidate::Unacked) {
                                                            c.setState(Candidate::Accepted);
+                                                           qDebug("ack: sending candidate-used: cid=%s",
+                                                                  qPrintable(c.cid()));
                                                            d->remoteUsedCandidate = c;
                                                        }
                                                        d->checkAndFinishNegotiation();
@@ -1360,6 +1454,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
             }
         } else if (d->pendingActions & Private::CandidateError) {
             d->pendingActions &= ~Private::CandidateError;
+            qDebug("sending candidate-error");
             // we are here because all remote are already in Discardd state
             tel.appendChild(doc->createElement(QStringLiteral("candidate-error")));
             d->waitingAck = true;
@@ -1372,10 +1467,14 @@ namespace XMPP { namespace Jingle { namespace S5B {
             d->pendingActions &= ~Private::Activated;
             if (d->localUsedCandidate) {
                 auto cand = d->localUsedCandidate;
-                auto el   = tel.appendChild(doc->createElement(QStringLiteral("activated"))).toElement();
+                qDebug("sending activated: cid=%s", qPrintable(cand.cid()));
+                auto el = tel.appendChild(doc->createElement(QStringLiteral("activated"))).toElement();
                 el.setAttribute(QStringLiteral("cid"), cand.cid());
                 d->waitingAck = true;
-                upd           = OutgoingTransportInfoUpdate { tel, [this, cand]() mutable { d->waitingAck = false; } };
+                upd           = OutgoingTransportInfoUpdate { tel, [this, cand]() mutable {
+                                                       qDebug("ack: sending activated: cid=%s", qPrintable(cand.cid()));
+                                                       d->waitingAck= false;
+                                                   } };
             }
         } else if (d->pendingActions & Private::ProxyError) {
             // we send proxy error only for local proxy
@@ -1384,10 +1483,12 @@ namespace XMPP { namespace Jingle { namespace S5B {
                 auto cand = d->localUsedCandidate;
                 tel.appendChild(doc->createElement(QStringLiteral("proxy-error")));
                 d->waitingAck = true;
-                upd           = OutgoingTransportInfoUpdate {
+                qDebug("sending proxy error: cid=%s", qPrintable(cand.cid()));
+                upd = OutgoingTransportInfoUpdate {
                     tel,
                     [this, cand]() mutable {
                         d->waitingAck = false;
+                        qDebug("ack: sending proxy error: cid=%s", qPrintable(cand.cid()));
                         if (cand.state() != Candidate::Accepted || d->localUsedCandidate != cand) {
                             return; // seems like state was changed while we was waiting for an ack
                         }
@@ -1400,6 +1501,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
                 qWarning("Got ProxyError pending action but no local used candidate is not set");
             }
         } else {
+            qDebug("sending empty transport-info");
             d->waitingAck = true;
             upd           = OutgoingTransportInfoUpdate { tel, [this]() mutable { d->waitingAck = false; } };
         }
diff --git a/src/xmpp/xmpp-im/jingle-s5b.h b/src/xmpp/xmpp-im/jingle-s5b.h
index e89e47c6..482c4f70 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.h
+++ b/src/xmpp/xmpp-im/jingle-s5b.h
@@ -53,6 +53,7 @@ namespace Jingle { namespace S5B {
          *   Unacked      - candidate is sent to remote but no iq ack yet
          *   Pending      - canidate sent to remote. we have iq ack but no "used" or "error"
          *   Accepted     - we got "candidate-used" for this candidate
+         *   Activating   - only for proxy: we activate the proxy
          *   Active       - use this candidate for actual data transfer
          *   Discarded    - we got "candidate-error" so all pending were marked Discarded
          *
@@ -62,6 +63,7 @@ namespace Jingle { namespace S5B {
          *   Pending      - connection was successful, but we didn't send candidate-used to remote
          *   Unacked      - connection was successful and we sent candidate-used to remote but no iq ack yet
          *   Accepted     - we sent candidate-used and got iq ack
+         *   Activating   - [not used]
          *   Active       - use this candidate for actual data transfer
          *   Discarded    - failed to connect to all remote candidates
          */
@@ -71,6 +73,7 @@ namespace Jingle { namespace S5B {
             Pending,
             Unacked,
             Accepted,
+            Activating,
             Active,
             Discarded,
         };
@@ -86,6 +89,7 @@ namespace Jingle { namespace S5B {
         inline bool        isValid() const { return d != nullptr; }
         inline             operator bool() const { return isValid(); }
         Type               type() const;
+        static const char *typeText(Type t);
         QString            cid() const;
         Jid                jid() const;
         QString            host() const;
@@ -100,6 +104,7 @@ namespace Jingle { namespace S5B {
         quint32            priority() const;
 
         QDomElement toXml(QDomDocument *doc) const;
+        QString     toString() const;
 
         void               connectToHost(const QString &key, State successState, QObject *callbackContext,
                                          std::function<void(bool)> callback, bool isUdp = false);
diff --git a/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp b/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp
index 5dc85cef..d0523207 100644
--- a/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp
+++ b/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp
@@ -64,7 +64,7 @@ Hash BoBData::cidToHash(const QString &cid)
 
 QString BoBData::cid() const
 {
-    if (!isNull())
+    if (isNull())
         return QString();
     return QString("%1+%2@bob.xmpp.org").arg(d->hash.stringType(), QString::fromLatin1(d->hash.data().toHex()));
 }

From 74596dc89018f2dd0219f20914dab67464a39315 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 4 Nov 2019 09:51:59 +0300
Subject: [PATCH 116/383] Update minimal priority right on connect and not when
 local candidate-used sent

---
 src/xmpp/xmpp-im/jingle-s5b.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 38655774..7f5e4864 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -998,9 +998,10 @@ namespace XMPP { namespace Jingle { namespace S5B {
             if (localUsedCandidate && localUsedCandidate.state() != Candidate::Discarded) {
                 prio = localUsedCandidate.priority();
             }
-            if (remoteUsedCandidate && prio < remoteUsedCandidate.priority()
-                && remoteUsedCandidate.state() != Candidate::Discarded) {
-                prio = remoteUsedCandidate.priority();
+            for (const auto &c : remoteCandidates) {
+                if (c.state() != Candidate::Discarded && c.state() >= Candidate::Pending && c.priority() > prio) {
+                    prio = c.priority();
+                }
             }
 
             for (auto &c : localCandidates) {

From 259b88f1d21eeb8eae30d1bf190dcdf677e3a664 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 4 Nov 2019 09:54:29 +0300
Subject: [PATCH 117/383] An attempt to fix crash on reconect after sleep

---
 src/xmpp/xmpp-im/client.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
index 14b73885..66960b00 100644
--- a/src/xmpp/xmpp-im/client.cpp
+++ b/src/xmpp/xmpp-im/client.cpp
@@ -660,7 +660,11 @@ void Client::send(const QString &str)
 }
 
 /* drops any pending outgoing xml elements */
-void Client::clearSendQueue() { d->stream->clearSendQueue(); }
+void Client::clearSendQueue()
+{
+    if (d->stream)
+        d->stream->clearSendQueue();
+}
 
 bool Client::hasStream() const { return !!d->stream; }
 

From 3efff2bc9ce3579f354dd5eb495360e4da50afdf Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 4 Nov 2019 10:52:04 +0300
Subject: [PATCH 118/383] An attempt to fix fallback to in-band transfer

---
 src/xmpp/xmpp-im/jingle-s5b.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 7f5e4864..e479ee99 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -759,9 +759,6 @@ namespace XMPP { namespace Jingle { namespace S5B {
                 mnc.connectToHost(
                     key, Candidate::Pending, q,
                     [this, mnc](bool success) {
-                        if (mnc.state() == Candidate::Discarded)
-                            return;
-
                         // candidate's status had to be changed by connectToHost, so we don't set it again
                         if (success) {
                             // let's reject candidates which are meaningless to try

From 99545c10ce0303326e97f00ecfa50981bd7ac822 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Thu, 7 Nov 2019 22:50:52 +0300
Subject: [PATCH 119/383] Close uploaded file before finished signal

---
 src/xmpp/xmpp-im/httpfileupload.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/xmpp/xmpp-im/httpfileupload.cpp b/src/xmpp/xmpp-im/httpfileupload.cpp
index 1a52fb3d..46253721 100644
--- a/src/xmpp/xmpp-im/httpfileupload.cpp
+++ b/src/xmpp/xmpp-im/httpfileupload.cpp
@@ -443,6 +443,7 @@ HttpFileUpload *HttpFileUploadManager::upload(const QString &srcFilename, const
     auto f = new QFile(srcFilename);
     f->open(QIODevice::ReadOnly);
     auto hfu = upload(f, f->size(), dstFilename, mType);
+    connect(hfu, &HttpFileUpload::finished, this, [f](){f->close();});
     f->setParent(hfu);
     return hfu;
 }

From a34794ffe921993c938eaa70747727d12fa0b45d Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Thu, 7 Nov 2019 23:44:03 +0300
Subject: [PATCH 120/383] Use qint64 everywhere for file jingle size/offset

---
 src/xmpp/xmpp-im/jingle-ft.cpp | 26 +++++++++++++-------------
 src/xmpp/xmpp-im/jingle-ft.h   | 10 +++++-----
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 0cdcaac3..593adc7a 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -97,7 +97,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
         QString     mediaType;
         QString     name;
         QString     desc;
-        size_t      size           = 0;
+        qint64      size           = 0;
         bool        rangeSupported = false;
         bool        hasSize        = false;
         Range       range;
@@ -122,22 +122,22 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
                 name = ce.text();
 
             } else if (ce.tagName() == SIZE_TAG) {
-                size = ce.text().toULongLong(&ok);
-                if (!ok) {
+                size = ce.text().toLongLong(&ok);
+                if (!ok || size < 0) {
                     return;
                 }
                 hasSize = true;
 
             } else if (ce.tagName() == RANGE_TAG) {
                 if (ce.hasAttribute(QLatin1String("offset"))) {
-                    range.offset = ce.attribute(QLatin1String("offset")).toULongLong(&ok);
-                    if (!ok) {
+                    range.offset = ce.attribute(QLatin1String("offset")).toLongLong(&ok);
+                    if (!ok || range.offset < 0) {
                         return;
                     }
                 }
                 if (ce.hasAttribute(QLatin1String("length"))) {
-                    range.length = ce.attribute(QLatin1String("length")).toULongLong(&ok);
-                    if (!ok || !range.length) { // length should absent if we need to read till end of file. 0-length is
+                    range.length = ce.attribute(QLatin1String("length")).toLongLong(&ok);
+                    if (!ok || range.length <= 0) { // length should absent if we need to read till end of file. 0-length is
                                                 // nonsense
                         return;
                     }
@@ -299,7 +299,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
 
     QString File::name() const { return d ? d->name : QString(); }
 
-    quint64 File::size() const { return d ? d->size : 0; }
+    qint64 File::size() const { return d ? d->size : 0; }
 
     Range File::range() const { return d ? d->range : Range(); }
 
@@ -317,7 +317,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
 
     void File::setName(const QString &name) { ensureD()->name = name; }
 
-    void File::setSize(quint64 size)
+    void File::setSize(qint64 size)
     {
         ensureD()->size = size;
         d->hasSize      = true;
@@ -427,7 +427,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
         bool                      streamigMode        = false;
         bool                      endlessRange        = false; // where range in accepted file doesn't have end
         QIODevice *               device              = nullptr;
-        quint64                   bytesLeft           = 0;
+        qint64                    bytesLeft           = 0;
 
         void setState(State s)
         {
@@ -456,7 +456,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
                 setState(State::Finished);
                 return; // everything is written
             }
-            auto sz = connection->blockSize();
+            auto sz = qint64(connection->blockSize());
             sz      = sz ? sz : 8192;
             if (!endlessRange && sz > bytesLeft) {
                 sz = bytesLeft;
@@ -489,9 +489,9 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
 
         void readNextBlockFromTransport()
         {
-            quint64 bytesAvail;
+            qint64 bytesAvail;
             while (bytesLeft && (bytesAvail = connection->bytesAvailable())) {
-                quint64 sz = 65536; // shall we respect transport->blockSize() ?
+                qint64 sz = 65536; // shall we respect transport->blockSize() ?
                 if (sz > bytesLeft) {
                     sz = bytesLeft;
                 }
diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index 2a8239ff..d090524f 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -64,7 +64,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
         Hash        hash(Hash::Type t = Hash::Unknown) const;
         QString     mediaType() const;
         QString     name() const;
-        quint64     size() const;
+        qint64      size() const;
         Range       range() const;
         Thumbnail   thumbnail() const;
         QByteArray  amplitudes() const;
@@ -74,7 +74,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
         void addHash(const Hash &hash);
         void setMediaType(const QString &mediaType);
         void setName(const QString &name);
-        void setSize(quint64 size);
+        void setSize(qint64 size);
         void setRange(const Range &range = Range()); // default empty just to indicate it's supported
         void setThumbnail(const Thumbnail &thumb);
         void setAmplitudes(const QByteArray &amplitudes);
@@ -122,7 +122,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
         Q_OBJECT
     public:
         Application(const QSharedPointer<Pad> &pad, const QString &contentName, Origin creator, Origin senders);
-        ~Application();
+        ~Application() override;
 
         ApplicationManagerPad::Ptr pad() const override;
         State                      state() const override;
@@ -176,8 +176,8 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
         void connectionReady(); // streaming mode only
 
         // if size = 0 then it's reamaining part of the file (non-streaming mode only)
-        void deviceRequested(quint64 offset, quint64 size);
-        void progress(quint64 offset);
+        void deviceRequested(qint64 offset, qint64 size);
+        void progress(qint64 offset);
 
     private:
         class Private;

From 89ac1389a1d6f01431a49f47bbae0bea7334d7e3 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 10 Nov 2019 00:30:30 +0300
Subject: [PATCH 121/383] Check if s5b transport is still alive in its
 callbacks from jingle core

---
 src/xmpp/xmpp-im/jingle-s5b.cpp | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index e479ee99..fc8a3e30 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -1406,7 +1406,10 @@ namespace XMPP { namespace Jingle { namespace S5B {
             }
             if (!candidatesToSend.isEmpty()) {
                 d->waitingAck = true;
-                upd           = OutgoingTransportInfoUpdate { tel, [this, candidatesToSend]() mutable {
+                QPointer<Transport> trptr(d->q);
+                upd = OutgoingTransportInfoUpdate { tel, [this, candidatesToSend, trptr = std::move(trptr)]() mutable {
+                                                       if (!trptr)
+                                                           return;
                                                        d->waitingAck= false;
                                                        for (auto &c : candidatesToSend) {
                                                            if (c.state() == Candidate::Unacked) {
@@ -1434,7 +1437,10 @@ namespace XMPP { namespace Jingle { namespace S5B {
                 c.setState(Candidate::Unacked);
 
                 d->waitingAck = true;
-                upd           = OutgoingTransportInfoUpdate { tel, [this, c]() mutable {
+                QPointer<Transport> trptr(d->q);
+                upd = OutgoingTransportInfoUpdate { tel, [this, c, trptr = std::move(trptr)]() mutable {
+                                                       if (!trptr)
+                                                           return;
                                                        d->waitingAck= false;
                                                        if (c.state() == Candidate::Unacked) {
                                                            c.setState(Candidate::Accepted);
@@ -1456,7 +1462,10 @@ namespace XMPP { namespace Jingle { namespace S5B {
             // we are here because all remote are already in Discardd state
             tel.appendChild(doc->createElement(QStringLiteral("candidate-error")));
             d->waitingAck = true;
-            upd           = OutgoingTransportInfoUpdate { tel, [this]() mutable {
+            QPointer<Transport> trptr(d->q);
+            upd = OutgoingTransportInfoUpdate { tel, [this, trptr = std::move(trptr)]() mutable {
+                                                   if (!trptr)
+                                                       return;
                                                    d->waitingAck= false;
                                                    d->localReportedCandidateError= true;
                                                    d->checkAndFinishNegotiation();
@@ -1469,9 +1478,11 @@ namespace XMPP { namespace Jingle { namespace S5B {
                 auto el = tel.appendChild(doc->createElement(QStringLiteral("activated"))).toElement();
                 el.setAttribute(QStringLiteral("cid"), cand.cid());
                 d->waitingAck = true;
-                upd           = OutgoingTransportInfoUpdate { tel, [this, cand]() mutable {
+                QPointer<Transport> trptr(d->q);
+                upd = OutgoingTransportInfoUpdate { tel, [this, cand, trptr = std::move(trptr)]() mutable {
                                                        qDebug("ack: sending activated: cid=%s", qPrintable(cand.cid()));
-                                                       d->waitingAck= false;
+                                                       if (trptr)
+                                                           d->waitingAck = false;
                                                    } };
             }
         } else if (d->pendingActions & Private::ProxyError) {
@@ -1482,9 +1493,12 @@ namespace XMPP { namespace Jingle { namespace S5B {
                 tel.appendChild(doc->createElement(QStringLiteral("proxy-error")));
                 d->waitingAck = true;
                 qDebug("sending proxy error: cid=%s", qPrintable(cand.cid()));
+                QPointer<Transport> trptr(d->q);
                 upd = OutgoingTransportInfoUpdate {
                     tel,
-                    [this, cand]() mutable {
+                    [this, cand, trptr = std::move(trptr)]() mutable {
+                        if (!trptr)
+                            return;
                         d->waitingAck = false;
                         qDebug("ack: sending proxy error: cid=%s", qPrintable(cand.cid()));
                         if (cand.state() != Candidate::Accepted || d->localUsedCandidate != cand) {
@@ -1501,7 +1515,11 @@ namespace XMPP { namespace Jingle { namespace S5B {
         } else {
             qDebug("sending empty transport-info");
             d->waitingAck = true;
-            upd           = OutgoingTransportInfoUpdate { tel, [this]() mutable { d->waitingAck = false; } };
+            QPointer<Transport> trptr(d->q);
+            upd = OutgoingTransportInfoUpdate { tel, [this, trptr = std::move(trptr)]() mutable {
+                                                   if (trptr)
+                                                       d->waitingAck = false;
+                                               } };
         }
 
         return upd; // TODO

From 48ef58531cb4628e5e7ecf09a2e6b1fa3423215f Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 10 Dec 2019 19:45:18 +0300
Subject: [PATCH 122/383] Added preferred email address option to vcard parser

---
 src/xmpp/xmpp-im/xmpp_vcard.cpp | 13 +++++++------
 src/xmpp/xmpp-im/xmpp_vcard.h   |  2 ++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/xmpp/xmpp-im/xmpp_vcard.cpp b/src/xmpp/xmpp-im/xmpp_vcard.cpp
index cb36e270..1cd00f0c 100644
--- a/src/xmpp/xmpp-im/xmpp_vcard.cpp
+++ b/src/xmpp/xmpp-im/xmpp_vcard.cpp
@@ -333,6 +333,8 @@ QDomElement VCard::toXml(QDomDocument *doc) const
             QDomElement  w = doc->createElement("EMAIL");
             const Email &e = *it;
 
+            if (e.pref)
+                w.appendChild(emptyTag(doc, "PREF"));
             if (e.home)
                 w.appendChild(emptyTag(doc, "HOME"));
             if (e.work)
@@ -593,13 +595,12 @@ VCard VCard::fromXml(const QDomElement &q)
             m.internet = hasSubTag(i, "INTERNET");
             m.x400     = hasSubTag(i, "X400");
 
-            m.userid = subTagText(i, "USERID");
+            m.pref = hasSubTag(i, "PREF");
 
-            if (m.userid.isEmpty()) // FIXME: Workaround for Psi prior to 0.9
-                if (!i.text().isEmpty())
-                    m.userid = i.text().trimmed();
+            m.userid = subTagText(i, "USERID").trimmed();
+            if (!m.userid.isEmpty())
+                v.d->emailList.append(m);
 
-            v.d->emailList.append(m);
         } else if (tag == "JABBERID")
             v.d->jid = i.text().trimmed();
         else if (tag == "MAILER")
@@ -714,7 +715,7 @@ VCard::Phone::Phone()
     home = work = voice = fax = pager = msg = cell = video = bbs = modem = isdn = pcs = pref = false;
 }
 
-VCard::Email::Email() { home = work = internet = x400 = false; }
+VCard::Email::Email() { home = work = internet = x400 = pref = false; }
 
 VCard::Geo::Geo() {}
 
diff --git a/src/xmpp/xmpp-im/xmpp_vcard.h b/src/xmpp/xmpp-im/xmpp_vcard.h
index 5f4a7075..23300138 100644
--- a/src/xmpp/xmpp-im/xmpp_vcard.h
+++ b/src/xmpp/xmpp-im/xmpp_vcard.h
@@ -161,6 +161,8 @@ class VCard {
         bool internet;
         bool x400;
 
+        bool pref;
+
         QString userid;
     };
     typedef QList<Email> EmailList;

From 135c2d4145ea8f3ee71f787b2824f92936c70204 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 11 Dec 2019 22:00:50 +0300
Subject: [PATCH 123/383] Aggregate telephones and emails attributes by
 addresses

---
 src/xmpp/xmpp-im/xmpp_vcard.cpp | 43 +++++++++++++++++++++++++++------
 1 file changed, 36 insertions(+), 7 deletions(-)

diff --git a/src/xmpp/xmpp-im/xmpp_vcard.cpp b/src/xmpp/xmpp-im/xmpp_vcard.cpp
index 1cd00f0c..92d352fe 100644
--- a/src/xmpp/xmpp-im/xmpp_vcard.cpp
+++ b/src/xmpp/xmpp-im/xmpp_vcard.cpp
@@ -582,11 +582,29 @@ VCard VCard::fromXml(const QDomElement &q)
 
             p.number = subTagText(i, "NUMBER");
 
-            if (p.number.isEmpty()) // FIXME: Workaround for Psi prior to 0.9
-                if (hasSubTag(i, "VOICE"))
-                    p.number = subTagText(i, "VOICE");
-
-            v.d->phoneList.append(p);
+            if (!p.number.isEmpty()) {
+                v.d->phoneList.append(p);
+
+                auto it = std::find_if(v.d->phoneList.begin(), v.d->phoneList.end(),
+                                       [number = p.number](const Phone &p) { return p.number == number; });
+                if (it == v.d->phoneList.end()) {
+                    v.d->phoneList.append(p);
+                } else {
+                    it->home  = (it->home || p.home);
+                    it->work  = (it->work || p.work);
+                    it->voice = (it->voice || p.voice);
+                    it->fax   = (it->fax || p.fax);
+                    it->pager = (it->pager || p.pager);
+                    it->msg   = (it->msg || p.msg);
+                    it->cell  = (it->cell || p.cell);
+                    it->video = (it->video || p.video);
+                    it->bbs   = (it->bbs || p.bbs);
+                    it->modem = (it->modem || p.modem);
+                    it->isdn  = (it->isdn || p.isdn);
+                    it->pcs   = (it->pcs || p.pcs);
+                    it->pref  = (it->pref || p.pref);
+                }
+            }
         } else if (tag == "EMAIL") {
             Email m;
 
@@ -598,8 +616,19 @@ VCard VCard::fromXml(const QDomElement &q)
             m.pref = hasSubTag(i, "PREF");
 
             m.userid = subTagText(i, "USERID").trimmed();
-            if (!m.userid.isEmpty())
-                v.d->emailList.append(m);
+            if (!m.userid.isEmpty()) {
+                auto it = std::find_if(v.d->emailList.begin(), v.d->emailList.end(),
+                                       [user_id = m.userid](const Email &e) { return e.userid == user_id; });
+                if (it == v.d->emailList.end()) {
+                    v.d->emailList.append(m);
+                } else {
+                    it->home     = (it->home || m.home);
+                    it->work     = (it->work || m.work);
+                    it->internet = (it->internet || m.internet);
+                    it->x400     = (it->x400 || m.x400);
+                    it->pref     = (it->pref || m.pref);
+                }
+            }
 
         } else if (tag == "JABBERID")
             v.d->jid = i.text().trimmed();

From 00c17a94751e388b8f4a2cedfb92c1200066ae51 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 29 Jan 2020 21:16:30 +0300
Subject: [PATCH 124/383] Jingle framework refactoring

Introduced transport states and sometimes connections' creators/states. Some part of transport-replace logic is moved to the session class to simplify application classes
---
 include/iris/jingle-session.h           |    1 +
 src/xmpp/CMakeLists.txt                 |    6 +
 src/xmpp/xmpp-im/jingle-application.cpp |  203 +++++
 src/xmpp/xmpp-im/jingle-application.h   |  197 ++++
 src/xmpp/xmpp-im/jingle-ft.cpp          |  584 ++++++------
 src/xmpp/xmpp-im/jingle-ft.h            |   56 +-
 src/xmpp/xmpp-im/jingle-ibb.cpp         |  267 +++---
 src/xmpp/xmpp-im/jingle-ibb.h           |   21 +-
 src/xmpp/xmpp-im/jingle-s5b.cpp         |  756 +++++++--------
 src/xmpp/xmpp-im/jingle-s5b.h           |   21 +-
 src/xmpp/xmpp-im/jingle-session.cpp     | 1111 ++++++++++++++++++++++
 src/xmpp/xmpp-im/jingle-session.h       |   96 ++
 src/xmpp/xmpp-im/jingle-transport.cpp   |   58 ++
 src/xmpp/xmpp-im/jingle-transport.h     |  151 +++
 src/xmpp/xmpp-im/jingle.cpp             | 1115 +----------------------
 src/xmpp/xmpp-im/jingle.h               |  425 ++-------
 src/xmpp/xmpp-im/xmpp_hash.h            |    1 +
 src/xmpp/xmpp.pri                       |    8 +-
 18 files changed, 2797 insertions(+), 2280 deletions(-)
 create mode 100644 include/iris/jingle-session.h
 create mode 100644 src/xmpp/xmpp-im/jingle-application.cpp
 create mode 100644 src/xmpp/xmpp-im/jingle-application.h
 create mode 100644 src/xmpp/xmpp-im/jingle-session.cpp
 create mode 100644 src/xmpp/xmpp-im/jingle-session.h
 create mode 100644 src/xmpp/xmpp-im/jingle-transport.cpp
 create mode 100644 src/xmpp/xmpp-im/jingle-transport.h

diff --git a/include/iris/jingle-session.h b/include/iris/jingle-session.h
new file mode 100644
index 00000000..78248dcf
--- /dev/null
+++ b/include/iris/jingle-session.h
@@ -0,0 +1 @@
+#include "../../src/xmpp/xmpp-im/jingle-session.h"
diff --git a/src/xmpp/CMakeLists.txt b/src/xmpp/CMakeLists.txt
index d7487222..9d13e8e1 100644
--- a/src/xmpp/CMakeLists.txt
+++ b/src/xmpp/CMakeLists.txt
@@ -90,6 +90,9 @@ set(HEADERS
     xmpp-im/xmpp_task.h
     xmpp-im/xmpp_tasks.h
     xmpp-im/jingle.h
+    xmpp-im/jingle-transport.h
+    xmpp-im/jingle-application.h
+    xmpp-im/jingle-session.h
     xmpp-im/jingle-ft.h
     xmpp-im/jingle-s5b.h
     xmpp-im/jingle-ibb.h
@@ -128,6 +131,9 @@ set(SOURCES
     xmpp-im/xmpp_xdata.cpp
     xmpp-im/xmpp_xmlcommon.cpp
     xmpp-im/jingle.cpp
+    xmpp-im/jingle-transport.cpp
+    xmpp-im/jingle-application.cpp
+    xmpp-im/jingle-session.cpp
     xmpp-im/jingle-ft.cpp
     xmpp-im/jingle-s5b.cpp
     xmpp-im/jingle-ibb.cpp
diff --git a/src/xmpp/xmpp-im/jingle-application.cpp b/src/xmpp/xmpp-im/jingle-application.cpp
new file mode 100644
index 00000000..6514fa09
--- /dev/null
+++ b/src/xmpp/xmpp-im/jingle-application.cpp
@@ -0,0 +1,203 @@
+/*
+ * jignle-application.cpp - Base Jingle application classes
+ * Copyright (C) 2019  Sergey Ilinykh
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "jingle-application.h"
+#include "jingle-session.h"
+#include "xmpp_client.h"
+
+namespace XMPP { namespace Jingle {
+    //----------------------------------------------------------------------------
+    // Application
+    //----------------------------------------------------------------------------
+    ApplicationManager::ApplicationManager(QObject *parent) : QObject(parent) {}
+
+    //----------------------------------------------------------------------------
+    // Application
+    //----------------------------------------------------------------------------
+    Application::Update Application::evaluateOutgoingUpdate()
+    {
+        _update = { Action::NoAction, Reason() };
+        if (_state == State::Finished || _state == State::Created
+            || _pendingTransportReplace == PendingTransportReplace::NeedAck)
+            return _update;
+
+        if (_terminationReason.isValid()) {
+            _update = { Action::ContentRemove, _terminationReason };
+            return _update;
+        }
+
+        // missing transport means it's an incoming application with invalid transport,
+        // but basically it shouldn't happen
+        if ((_creator != _pad->session()->role() && _state == State::Pending) || !_transport) {
+            return _update;
+        }
+
+        bool inTrReplace = _pendingTransportReplace == PendingTransportReplace::InProgress;
+
+        if (_transport->state() == State::Finished) {
+            if (inTrReplace && _transport->creator() != _pad->session()->role())
+                _update = { Action::TransportReject, _transport->lastReason() };
+            else
+                _update = { canReplaceTransport() ? Action::TransportReplace : Action::ContentRemove,
+                            _transport->lastReason() };
+            return _update;
+        }
+
+        switch (_state) {
+        case State::ApprovedToSend:
+            if (_transport->hasUpdates() && _transport->state() == State::ApprovedToSend) {
+                if (inTrReplace) {
+                    // either we are waiting for incoming transport-accept or local confirmation of remote
+                    // transport-replace
+                    bool localTranport = _pad->session()->role() == _transport->creator();
+                    _update            = { localTranport ? Action::TransportInfo : Action::TransportAccept, Reason() };
+                } else
+                    _update = { _pad->session()->role() == _creator ? Action::ContentAdd : Action::ContentAccept,
+                                Reason() };
+            }
+            break;
+        case State::Pending:
+            if (_creator != _pad->session()->role() && !inTrReplace && _transport->hasUpdates()
+                && _transport->state() == State::ApprovedToSend) {
+                // if remote transport has initial updates and it's not transport-replace then it's time to accept the
+                // content
+                _update = { Action::ContentAccept, Reason() };
+                break;
+            }
+            // fallthrough
+        case State::Connecting:
+            if (inTrReplace) {
+                // for transport replace we handle just replace until it's finished
+                if (_transport->creator() == _pad->session()->role()) {
+                    if (_transport->state() == State::Finished)
+                        // replace over unconfirmed replace (2nd transport failed shortly)
+                        _update = { canReplaceTransport() ? Action::TransportReplace : Action::ContentRemove,
+                                    _transport->lastReason() };
+                    break;
+                }
+
+                if (_transport->hasUpdates() && _transport->state() == State::ApprovedToSend) {
+                    _update = { Action::TransportAccept, Reason() };
+                    break;
+                }
+                if (_transport->state() == State::Finished) {
+                    _update = { Action::TransportReject, _transport->lastReason() };
+                }
+                break;
+            }
+
+            if (_transport->hasUpdates()) {
+                if (_transport->state() == State::Connecting)
+                    _update = { Action::TransportInfo, Reason() };
+            } else if (_transport->state() == State::Finished) {
+                _update = { canReplaceTransport() ? Action::TransportReplace : Action::ContentRemove,
+                            _transport->lastReason() };
+            }
+            break;
+        case State::Active:
+            if (_transport->hasUpdates())
+                _update = { Action::TransportInfo, Reason() };
+
+            break;
+        default:
+            break;
+        }
+        return _update;
+    }
+
+    OutgoingUpdate Application::takeOutgoingUpdate()
+    {
+
+        QDomElement      transportEl;
+        OutgoingUpdateCB transportCB;
+        auto             client = _pad->session()->manager()->client();
+        auto             doc    = client->doc();
+
+        ContentBase cb(_creator, _contentName);
+        // we need to send senders for initial offer/answer
+        if (_state == State::ApprovedToSend)
+            cb.senders = _senders;
+        QList<QDomElement> updates;
+        auto               contentEl = cb.toXml(doc, "content");
+        updates << contentEl;
+
+        switch (_update.action) {
+        case Action::ContentReject:
+        case Action::ContentRemove:
+            if (_update.reason.isValid())
+                updates << _update.reason.toXml(doc);
+            return OutgoingUpdate { updates, [this](bool) { setState(State::Finished); } };
+        case Action::ContentAdd:
+            contentEl.appendChild(makeLocalOffer());
+            std::tie(transportEl, transportCB) = wrapOutgoingTransportUpdate();
+            contentEl.appendChild(transportEl);
+
+            setState(State::Unacked);
+            return OutgoingUpdate { updates, [this, transportCB](bool success) {
+                                       transportCB(success);
+                                       setState(State::Pending);
+                                   } };
+
+        case Action::ContentAccept:
+            contentEl.appendChild(makeLocalAnswer());
+            std::tie(transportEl, transportCB) = wrapOutgoingTransportUpdate();
+            contentEl.appendChild(transportEl);
+
+            setState(State::Unacked);
+            return OutgoingUpdate { updates, [this, transportCB](bool success) {
+                                       transportCB(success);
+                                       setState(State::Connecting);
+                                   } };
+        case Action::TransportInfo:
+            Q_ASSERT(_transport->hasUpdates());
+            std::tie(transportEl, transportCB) = wrapOutgoingTransportUpdate();
+            contentEl.appendChild(transportEl);
+            return OutgoingUpdate { updates, transportCB };
+        case Action::TransportReplace:
+        case Action::TransportAccept: {
+            Q_ASSERT(_transport->hasUpdates());
+            std::tie(transportEl, transportCB) = wrapOutgoingTransportUpdate();
+            contentEl.appendChild(transportEl);
+            return OutgoingUpdate { updates, transportCB };
+        }
+        default:
+            break;
+        }
+
+        return OutgoingUpdate(); // TODO
+    }
+
+    OutgoingTransportInfoUpdate Application::wrapOutgoingTransportUpdate()
+    {
+        QDomElement      transportEl;
+        OutgoingUpdateCB transportCB;
+        std::tie(transportEl, transportCB) = _transport->takeOutgoingUpdate();
+        auto wrapCB = [this, tr = _transport.toWeakRef(), cb = std::move(transportCB)](bool success) {
+            auto transport = tr.lock();
+            if (transport && cb)
+                cb(success);
+            if (_pendingTransportReplace == PendingTransportReplace::NeedAck) {
+                _pendingTransportReplace
+                    = success ? PendingTransportReplace::InProgress : PendingTransportReplace::None;
+                emit updated();
+            }
+        };
+        return OutgoingTransportInfoUpdate { transportEl, wrapCB };
+    }
+}}
diff --git a/src/xmpp/xmpp-im/jingle-application.h b/src/xmpp/xmpp-im/jingle-application.h
new file mode 100644
index 00000000..2d1b7ebd
--- /dev/null
+++ b/src/xmpp/xmpp-im/jingle-application.h
@@ -0,0 +1,197 @@
+/*
+ * jignle-application.h - Base Jingle application classes
+ * Copyright (C) 2019  Sergey Ilinykh
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef JINGLE_APPLICATION_H
+#define JINGLE_APPLICATION_H
+
+#include "jingle-transport.h"
+
+namespace XMPP { namespace Jingle {
+
+    class ApplicationManager;
+    class ApplicationManagerPad : public SessionManagerPad {
+        Q_OBJECT
+    public:
+        typedef QSharedPointer<ApplicationManagerPad> Ptr;
+
+        using SessionManagerPad::SessionManagerPad;
+
+        virtual ApplicationManager *manager() const = 0;
+
+        /*
+         * for example we transfer a file
+         * then first file may generate name "file1", next "file2" etc
+         * As result it will be sent as <content name="file1" ... >
+         */
+        virtual QString generateContentName(Origin senders) = 0;
+    };
+
+    // Represents a session for single application. for example a single file in a file transfer session.
+    // There maybe multiple application instances in a session.
+    // It's designed as QObject to exposed to JavaScript (qml/webkit)
+    class Application : public QObject {
+        Q_OBJECT
+    public:
+        struct Update {
+            Action action;
+            Reason reason;
+        };
+
+        enum SetDescError {
+            Ok,
+            Unparsed,
+            IncompatibleParameters // this one is for <reason>
+        };
+
+        virtual void setState(State state) = 0; // likely just remember the state and not generate any signals
+        virtual XMPP::Stanza::Error lastError() const  = 0;
+        virtual Reason              lastReason() const = 0;
+
+        inline ApplicationManagerPad::Ptr pad() const { return _pad; }
+        inline State                      state() const { return _state; }
+        inline Origin                     creator() const { return _creator; }
+        inline Origin                     senders() const { return _senders; }
+        inline QString                    contentName() const { return _contentName; }
+        inline QSharedPointer<Transport>  transport() const { return _transport; }
+
+        virtual SetDescError setRemoteOffer(const QDomElement &description)  = 0;
+        virtual SetDescError setRemoteAnswer(const QDomElement &description) = 0;
+        virtual QDomElement  makeLocalOffer()                                = 0;
+        virtual QDomElement  makeLocalAnswer()                               = 0;
+
+        /**
+         * @brief evaluateOutgoingUpdate computes and prepares next update which will be taken with takeOutgoingUpdate
+         *   The updated will be taked immediately if considered to be most preferred among other updates types of
+         *   other applications.
+         * @return update type
+         */
+        virtual Update evaluateOutgoingUpdate();
+        // this may return something only when evaluateOutgoingUpdate() != NoAction
+        virtual OutgoingUpdate takeOutgoingUpdate();
+
+        /**
+         * @brief setTransport checks if transport is compatible and stores it
+         * @param transport
+         * @return false if not compatible
+         */
+        virtual bool setTransport(const QSharedPointer<Transport> &transport, const Reason &reason = Reason()) = 0;
+
+        /**
+         * @brief canReplaceTransport returns true if the application has some spare transports to try
+         * @return
+         */
+        virtual bool canReplaceTransport() const = 0;
+
+        /**
+         * @brief selectNextTransport selects next transport from compatible transports list.
+         *   The list is usually stored in the application
+         * @return
+         */
+        virtual bool selectNextTransport(const QString preferredNS = QString()) = 0;
+
+        /**
+         * @brief wantBetterTransport checks if the transport is a better match for the application
+         * Used in content is provided twice with two different transports
+         * @return
+         */
+        virtual bool wantBetterTransport(const QSharedPointer<Transport> &) const = 0;
+
+        /**
+         * @brief prepare to send content-add/session-initiate
+         *  When ready, the application first set update type to ContentAdd and then emit updated()
+         */
+        virtual void prepare()                                                                            = 0;
+        virtual void start()                                                                              = 0;
+        virtual void remove(Reason::Condition cond = Reason::Success, const QString &comment = QString()) = 0;
+
+        /**
+         * @brief incomingTransportReplace it's jingle transport-replace
+         * @param transport
+         * @return
+         */
+        virtual bool incomingTransportReplace(const QSharedPointer<Transport> &transport) = 0;
+        virtual void incomingRemove(const Reason &r)                                      = 0;
+
+    protected:
+        // wraps transport update so transport can be safely-deleted before callback is triggered
+        OutgoingTransportInfoUpdate wrapOutgoingTransportUpdate();
+
+    signals:
+        void updated(); // signal for session it has to send updates to remote. so it will follow with
+                        // takeOutgoingUpdate() eventually
+        void stateChanged(State);
+
+    protected:
+        State _state = State::Created;
+
+        enum class PendingTransportReplace { None, NeedAck, InProgress };
+
+        // has to be set when whatever way remote knows about the current transport
+        // bool _remoteKnowsOfTheTransport = false;
+
+        // per session object responsible for all applications of this type
+        QSharedPointer<ApplicationManagerPad> _pad;
+
+        // content properties as come from the request
+        QString _contentName;
+        Origin  _creator;
+        Origin  _senders;
+
+        // current transport. either local or remote. has info about origin and state
+        QSharedPointer<Transport> _transport;
+
+        // when set the content will be removed with this reason
+        Reason _terminationReason;
+
+        State _prevTransportState = State::Created;
+
+        // if transport-replace is in progress. will be set to true when accepted by both sides.
+        PendingTransportReplace _pendingTransportReplace = PendingTransportReplace::None;
+
+        // while it's valid - we are in unaccepted yet transport-replace
+        Reason _transportReplaceReason;
+
+        // evaluated update to be sent
+        Update _update;
+    };
+
+    inline bool operator<(const Application::Update &a, const Application::Update &b)
+    {
+        return a.action < b.action || (a.action == b.action && a.reason.condition() < b.reason.condition());
+    }
+
+    class ApplicationManager : public QObject {
+        Q_OBJECT
+    public:
+        ApplicationManager(QObject *parent = nullptr);
+
+        virtual void         setJingleManager(Manager *jm) = 0;
+        virtual Application *startApplication(const ApplicationManagerPad::Ptr &pad, const QString &contentName,
+                                              Origin creator, Origin senders)
+            = 0;
+        virtual ApplicationManagerPad *pad(Session *session) = 0;
+
+        // this method is supposed to gracefully close all related sessions as a preparation for plugin unload for
+        // example
+        virtual void closeAll() = 0;
+    };
+
+}}
+
+#endif
diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 593adc7a..d2baeb0d 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -18,6 +18,7 @@
  */
 
 #include "jingle-ft.h"
+#include "jingle-session.h"
 
 #include "xmpp_client.h"
 #include "xmpp_hash.h"
@@ -66,14 +67,14 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
     //----------------------------------------------------------------------------
     class File::Private : public QSharedData {
     public:
+        bool        rangeSupported = false;
+        bool        hasSize        = false;
         QDateTime   date;
         QString     mediaType;
         QString     name;
         QString     desc;
         qint64      size = 0;
         Range       range;
-        bool        rangeSupported = false;
-        bool        hasSize        = false;
         QList<Hash> hashes;
         Thumbnail   thumbnail;
         QByteArray  amplitudes;
@@ -137,8 +138,8 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
                 }
                 if (ce.hasAttribute(QLatin1String("length"))) {
                     range.length = ce.attribute(QLatin1String("length")).toLongLong(&ok);
-                    if (!ok || range.length <= 0) { // length should absent if we need to read till end of file. 0-length is
-                                                // nonsense
+                    if (!ok || range.length <= 0) { // length should absent if we need to read till end of file.
+                                                    // 0-length is nonsense
                         return;
                     }
                 }
@@ -313,6 +314,8 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
 
     void File::addHash(const Hash &hash) { ensureD()->hashes.append(hash); }
 
+    void File::setHashes(const QList<Hash> &hashes) { ensureD()->hashes = hashes; }
+
     void File::setMediaType(const QString &mediaType) { ensureD()->mediaType = mediaType; }
 
     void File::setName(const QString &name) { ensureD()->name = name; }
@@ -400,38 +403,44 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
         return nullptr;
     }
 
-    QStringList Manager::availableTransports() const { return jingleManager->availableTransports(Transport::Reliable); }
+    QStringList Manager::availableTransports() const
+    {
+        return jingleManager->availableTransports(TransportFeature::Reliable);
+    }
 
     //----------------------------------------------------------------------------
     // Application
     //----------------------------------------------------------------------------
     class Application::Private {
     public:
-        Application *             q                     = nullptr;
-        State                     state                 = State::Created;
-        State                     transportReplaceState = State::Finished;
-        Action                    updateToSend          = Action::NoAction;
-        QSharedPointer<Pad>       pad;
-        QString                   contentName;
-        File                      file;
-        File                      acceptFile; // as it comes with "accept" response
-        Origin                    creator;
-        Origin                    senders;
-        Origin                    transportReplaceOrigin = Origin::None;
-        XMPP::Stanza::Error       lastError;
-        Reason                    terminationReason;
-        QSharedPointer<Transport> transport;
-        Connection::Ptr           connection;
-        QStringList               availableTransports;
-        bool                      closeDeviceOnFinish = true;
-        bool                      streamigMode        = false;
-        bool                      endlessRange        = false; // where range in accepted file doesn't have end
-        QIODevice *               device              = nullptr;
-        qint64                    bytesLeft           = 0;
+        struct TransportDesc {
+            Origin                    creator = Origin::None;
+            State                     state   = State::Created;
+            QSharedPointer<Transport> transport;
+        };
+
+        Application *q = nullptr;
+
+        Reason updateReason;
+        // Action              updateToSend            = Action::NoAction;
+        bool                closeDeviceOnFinish = true;
+        bool                streamingMode       = false;
+        bool                endlessRange        = false; // where range in accepted file doesn't have end
+        bool                outgoingReceived    = false;
+        File                file;
+        File                acceptFile; // as it comes with "accept" response
+        XMPP::Stanza::Error lastError;
+        Reason              lastReason;
+        Connection::Ptr     connection;
+        QStringList         availableTransports;
+        QIODevice *         device    = nullptr;
+        qint64              bytesLeft = 0;
+        QList<Hash>         outgoingChecksum;
+        qint64              outgoingChecksumRangeOffset = 0, outgoingChecksumRangeLength = 0;
 
         void setState(State s)
         {
-            state = s;
+            q->_state = s;
             if (s == State::Finished) {
                 if (device && closeDeviceOnFinish) {
                     device->close();
@@ -439,20 +448,26 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
                 if (connection) {
                     connection->close();
                 }
+                q->disconnect(q->transport().data(), &Transport::updated, q, nullptr);
+            }
+            if (s >= State::Finishing) {
+                q->disconnect(q->transport().data(), &Transport::failed, q, nullptr);
+                q->disconnect(q->transport().data(), &Transport::connected, q, nullptr);
+                // we can still try to send transport updates
             }
             emit q->stateChanged(s);
         }
 
         void handleStreamFail()
         {
-            terminationReason = Reason(Reason::Condition::FailedApplication, QString::fromLatin1("stream failed"));
+            lastReason = Reason(Reason::Condition::FailedApplication, QString::fromLatin1("stream failed"));
             setState(State::Finished);
         }
 
         void writeNextBlockToTransport()
         {
             if (!(endlessRange || bytesLeft)) {
-                terminationReason = Reason(Reason::Condition::Success);
+                lastReason = Reason(Reason::Condition::Success);
                 setState(State::Finished);
                 return; // everything is written
             }
@@ -471,7 +486,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
             }
             if (data.isEmpty()) {
                 if (endlessRange) {
-                    terminationReason = Reason(Reason::Condition::Success);
+                    lastReason = Reason(Reason::Condition::Success);
                     setState(State::Finished);
                 } else {
                     handleStreamFail();
@@ -513,7 +528,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
             }
             if (!bytesLeft) {
                 // TODO send <received>
-                terminationReason = Reason(Reason::Condition::Success);
+                lastReason = Reason(Reason::Condition::Success);
                 setState(State::Finished);
             }
         }
@@ -524,37 +539,92 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
         d(new Private)
     {
         d->q                   = this;
-        d->pad                 = pad;
-        d->contentName         = contentName;
-        d->creator             = creator;
-        d->senders             = senders;
+        _pad                   = pad;
+        _contentName           = contentName;
+        _creator               = creator;
+        _senders               = senders;
         d->availableTransports = static_cast<Manager *>(pad->manager())->availableTransports();
     }
 
     Application::~Application() {}
 
-    ApplicationManagerPad::Ptr Application::pad() const { return d->pad.staticCast<ApplicationManagerPad>(); }
-
-    State Application::state() const { return d->state; }
-
     void Application::setState(State state) { d->setState(state); }
 
     Stanza::Error Application::lastError() const { return d->lastError; }
 
-    Reason Application::terminationReason() const { return d->terminationReason; }
+    Reason Application::lastReason() const { return d->lastReason; }
+
+    static Application::SetDescError parseDescription(const QDomElement &description, File &file)
+    {
+        auto el = description.firstChildElement("file");
+        if (el.isNull())
+            return Application::Unparsed;
 
-    QString Application::contentName() const { return d->contentName; }
+        auto f = File(el);
+        if (!f.isValid())
+            return Application::IncompatibleParameters;
 
-    Origin Application::creator() const { return d->creator; }
+        file = f;
+        return Application::Ok;
+    }
 
-    Origin Application::senders() const { return d->senders; }
+    Application::SetDescError Application::setRemoteOffer(const QDomElement &description)
+    {
+        File f;
+        auto ret = parseDescription(description, f);
+        if (ret == Application::Ok)
+            d->file = f;
+        return ret;
+    }
+
+    Application::SetDescError Application::setRemoteAnswer(const QDomElement &description)
+    {
+        File f;
+        auto ret = parseDescription(description, f);
+        if (ret == Application::Ok) {
+            d->acceptFile = f;
+            setState(State::Accepted);
+        }
+        return ret;
+    }
+
+    void Application::prepareThumbnail(File &file)
+    {
+        if (file.thumbnail().data.size()) {
+            auto    client = _pad->session()->manager()->client();
+            auto    thumb  = file.thumbnail();
+            auto    bm     = client->bobManager();
+            BoBData data   = bm->append(thumb.data, thumb.mimeType);
+            thumb.uri      = QLatin1String("cid:") + data.cid();
+            d->file.setThumbnail(thumb);
+        }
+    }
+
+    QDomElement Application::makeLocalOffer()
+    {
+        if (!d->file.isValid()) {
+            return QDomElement();
+        }
+        auto doc = _pad->doc();
+        auto el  = doc->createElementNS(NS, "description");
+
+        prepareThumbnail(d->file);
+        el.appendChild(d->file.toXml(doc));
+        return el;
+    }
 
-    Application::SetDescError Application::setDescription(const QDomElement &description)
+    QDomElement Application::makeLocalAnswer()
     {
-        d->file = File(description.firstChildElement("file"));
-        // d->state = State::Pending; // basically it's incomming  content. so if we parsed it it's pending. if not
-        // parsed if will rejected anyway.
-        return d->file.isValid() ? Ok : Unparsed;
+        if (!d->file.isValid()) {
+            return QDomElement();
+        }
+        if (!d->acceptFile.isValid()) {
+            d->acceptFile = d->file;
+        }
+        auto doc = _pad->doc();
+        auto el  = doc->createElementNS(NS, "description");
+        el.appendChild(d->acceptFile.toXml(doc));
+        return el;
     }
 
     void Application::setFile(const File &file) { d->file = file; }
@@ -563,48 +633,115 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
 
     File Application::acceptFile() const { return d->acceptFile; }
 
+    bool Application::canReplaceTransport() const { return !d->availableTransports.isEmpty(); }
+
+    bool Application::wantBetterTransport(const QSharedPointer<Transport> &t) const
+    {
+        Q_UNUSED(t)
+        return true; // TODO check
+    }
+
+    bool Application::selectNextTransport(const QString preferredNS)
+    {
+        if (d->availableTransports.isEmpty()) {
+            emit updated(); // will be evaluated to content-remove
+            return false;
+        }
+
+        int idx = d->availableTransports.indexOf(preferredNS);
+        if (idx == -1)
+            idx = d->availableTransports.size() - 1;
+
+        do {
+            auto t = _pad->session()->newOutgoingTransport(d->availableTransports[idx]);
+            if (t && setTransport(t)) {
+                return true;
+            }
+            d->availableTransports.removeAt(idx);
+            idx = d->availableTransports.size() - 1;
+        } while (idx != -1);
+
+        /*if (_transport) {
+            disconnect(_transport.data());
+            _transport.reset();
+        }*/
+        emit updated(); // will be evaluated to content-remove
+        return false;
+    }
+
     // incoming one? or we have to check real direction
-    bool Application::setTransport(const QSharedPointer<Transport> &transport)
+    bool Application::setTransport(const QSharedPointer<Transport> &transport, const Reason &reason)
     {
-        if (!(transport->features() & Transport::Reliable))
+        if (transport.isNull() || !(transport->features() & TransportFeature::Reliable))
             return false;
 
-        int nsIndex = d->availableTransports.indexOf(transport->pad()->ns());
-        if (nsIndex == -1) {
+        // check if ns is registered or matches current
+        int  nsIndex = d->availableTransports.indexOf(transport->pad()->ns());
+        auto curNs   = _transport ? _transport->pad()->ns() : QString();
+        if (nsIndex == -1 && curNs != transport->pad()->ns()) {
             return false;
         }
 
         // in case we automatically select a new transport on our own we definitely will come up to this point
-        if (d->transport) {
-            d->transport->disconnect(this);
-            d->transport.reset();
+        if (_transport) {
+            if (_transport->state() < State::Unacked && _transport->creator() == _pad->session()->role()
+                && _transport->pad()->ns() != transport->pad()->ns()) {
+                // the transport will be reused later since the remote doesn't know about it yet
+                d->availableTransports.push_back(_transport->pad()->ns());
+            }
+
+            if (transport->creator() == _pad->session()->role()) {
+                auto ts = _transport->state() == State::Finished ? _transport->prevState() : _transport->state();
+                if (_transport->creator() != _pad->session()->role() || ts > State::Unacked) {
+                    // if remote knows of the current transport
+                    _pendingTransportReplace = PendingTransportReplace::InProgress;
+                } else if (_transport->creator() == _pad->session()->role() && ts == State::Unacked) {
+                    // if remote may know but we don't know yet about it
+                    _pendingTransportReplace = PendingTransportReplace::NeedAck;
+                }
+            } else {
+                _pendingTransportReplace = PendingTransportReplace::InProgress;
+            }
+
+            if (_pendingTransportReplace != PendingTransportReplace::None) {
+                if (_transport->state() == State::Finished) { // initiate replace?
+                    _transportReplaceReason = reason.isValid() ? reason : _transport->lastReason();
+                } else {
+                    _transportReplaceReason = reason;
+                }
+            }
+            _transport->disconnect(this);
+            _transport.reset();
         }
 
-        d->availableTransports.removeAt(nsIndex);
-        d->transport = transport;
+        if (nsIndex != -1)
+            d->availableTransports.removeAt(nsIndex);
+
+        _transport = transport;
         connect(transport.data(), &Transport::updated, this, &Application::updated);
         connect(transport.data(), &Transport::connected, this, [this]() {
-            d->transportReplaceOrigin = Origin::None;
-            d->transportReplaceState  = State::Finished; // not needed here probably
-            d->connection             = d->transport->connection();
-            if (!d->streamigMode) {
+            d->lastReason = Reason();
+            d->lastError.reset();
+            d->connection = _transport->connection();
+            if (!d->streamingMode) {
                 connect(d->connection.data(), &Connection::readyRead, this, [this]() {
                     if (!d->device) {
                         return;
                     }
-                    if (d->pad->session()->role() != d->senders) {
+                    if (_pad->session()->role() != _senders) {
                         d->readNextBlockFromTransport();
                     }
                 });
                 connect(d->connection.data(), &Connection::bytesWritten, this, [this](qint64 bytes) {
                     Q_UNUSED(bytes)
-                    if (d->pad->session()->role() == d->senders && !d->connection->bytesToWrite()) {
+                    if (_pad->session()->role() == _senders && !d->connection->bytesToWrite()) {
                         d->writeNextBlockToTransport();
                     }
                 });
             }
+
             d->setState(State::Active);
-            if (!d->streamigMode) {
+            if (!d->streamingMode) {
                 if (d->acceptFile.range().isValid()) {
                     d->bytesLeft = d->acceptFile.range().length;
                     if (!d->bytesLeft)
@@ -619,329 +756,160 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
             }
         });
 
-        connect(transport.data(), &Transport::failed, this, [this]() {
-            d->transportReplaceOrigin = d->pad->session()->role();
-            if (d->state >= State::Active) {
-                emit updated(); // late failure are unhandled. just notify the remote
-                return;
-            }
-            // we can try to replace the transport
-            if (!selectNextTransport()) { // we can do transport-replace here
-                if (d->state == State::PrepareLocalOffer && d->creator == d->pad->session()->role()) {
-                    // we were unable to send even initial offer
-                    d->setState(State::Finished);
-                } else {
-                    emit updated(); // we have to notify our peer about failure
-                }
-            } else {
-                d->transportReplaceState = State::PrepareLocalOffer;
-            }
-        });
+        connect(transport.data(), &Transport::failed, this, [this]() { selectNextTransport(); });
 
-        if (d->state >= State::Unacked) {
+        if (_state >= State::Unacked) {
             // seems like we are in transport failure recovery. d->transportFailed may confirm this
-            d->transport->prepare();
+            _transport->prepare();
         }
         return true;
     }
 
-    Origin Application::transportReplaceOrigin() const { return d->transportReplaceOrigin; }
-
     bool Application::incomingTransportReplace(const QSharedPointer<Transport> &transport)
     {
-        auto prev = d->transportReplaceOrigin;
-        if (d->pad->session()->role() == Origin::Responder && prev == Origin::Responder && d->transport) {
-            // if I'm a responder and tried to send transport-replace too, then push ns back
-            d->availableTransports.append(d->transport->pad()->ns());
-        }
-        d->transportReplaceOrigin = d->pad->session()->peerRole();
-        auto ret                  = setTransport(transport);
-        if (ret)
-            d->transportReplaceState = State::PrepareLocalOffer;
-        else {
-            d->transportReplaceOrigin = prev;
-            d->lastError.reset();
-            // REVIEW We have to fail application here on tie-break or propose another transport
+        if (_state >= State::Active) { // impossible case. needs full app renegotiation to continue
+            d->lastError = ErrorUtil::makeOutOfOrder(*_pad->doc());
+            return false;
         }
 
-        return ret;
-    }
+        Q_ASSERT(_transport != nullptr);
 
-    QSharedPointer<Transport> Application::transport() const { return d->transport; }
+        auto newns = transport->pad()->ns();
+        if (!(d->availableTransports.contains(newns) || _transport->pad()->ns() == newns)) {
+            return false; // unknown ns. TODO return reason for the reject
+        }
+
+        bool curIsLocal = _transport->creator() == _pad->session()->role();
+        if (curIsLocal && _transport->state() == State::Unacked && _pad->session()->role() == Origin::Initiator) {
+            d->lastError = ErrorUtil::makeTieBreak(*_pad->doc());
+            return false;
+        }
+        return setTransport(transport);
+    }
 
     void Application::setStreamingMode(bool mode)
     {
-        if (d->state <= State::Connecting) {
-            d->streamigMode = mode;
+        if (_state <= State::Connecting) {
+            d->streamingMode = mode;
         }
     }
 
-    Action Application::evaluateOutgoingUpdate()
+    XMPP::Jingle::Application::Update Application::evaluateOutgoingUpdate()
     {
-        d->updateToSend = Action::NoAction;
-        if (!isValid() || d->state == State::Created || d->state == State::Finished) {
-            return d->updateToSend;
+        if (!isValid()) {
+            _update = { Action::NoAction, Reason() };
+            return _update;
         }
 
-        auto evaluateTransportReplaceAction = [this]() {
-            if (d->transportReplaceState != State::PrepareLocalOffer || !d->transport->isInitialOfferReady())
-                return Action::NoAction;
-
-            return d->transportReplaceOrigin == d->pad->session()->role() ? Action::TransportReplace
-                                                                          : Action::TransportAccept;
-        };
-
-        switch (d->state) {
-        case State::Created:
-            break;
-        case State::PrepareLocalOffer:
-            if (d->transportReplaceOrigin != Origin::None) {
-                if (!d->transport) {
-                    d->updateToSend
-                        = Action::ContentReject; // case me=creator was already handled by this momemnt in case of
-                                                 // app.PrepareLocalOffer. see Transport::failed above
-                }
-                d->updateToSend = evaluateTransportReplaceAction();
-                if (d->updateToSend == Action::TransportAccept) {
-                    d->updateToSend = Action::ContentAccept;
-                }
-                return d->updateToSend;
-            }
-
-            if (d->transport->isInitialOfferReady())
-                d->updateToSend = d->creator == d->pad->session()->role() ? Action::ContentAdd : Action::ContentAccept;
-
-            break;
-        case State::Connecting:
-        case State::Pending:
-        case State::Active:
-            if (d->transportReplaceOrigin != Origin::None) {
-                if (d->state == State::Active || !d->transport)
-                    d->updateToSend = Action::ContentRemove;
-                else
-                    d->updateToSend = evaluateTransportReplaceAction();
-                return d->updateToSend;
-            }
-
-            if (d->terminationReason.isValid() && d->terminationReason.condition() != Reason::Condition::Success) {
-                d->updateToSend = Action::ContentRemove;
-            } else if (d->transport->hasUpdates())
-                d->updateToSend = Action::TransportInfo;
-
-            break;
-        case State::Finishing:
-            if (d->transportReplaceOrigin != Origin::None || d->terminationReason.isValid()) {
-                d->updateToSend = Action::ContentRemove;
-            } else {
-                d->updateToSend = Action::SessionInfo; // to send checksum
-            }
-            break;
-        default:
-            break;
-        }
-        return d->updateToSend; // TODO
+        if (_state == State::Active && (d->outgoingChecksum.size() > 0 || d->outgoingReceived))
+            _update = { Action::SessionInfo, Reason() };
+        else
+            return XMPP::Jingle::Application::evaluateOutgoingUpdate();
+        return _update;
     }
 
     OutgoingUpdate Application::takeOutgoingUpdate()
     {
-        if (d->updateToSend == Action::NoAction) {
+        if (_update.action == Action::NoAction) {
             return OutgoingUpdate();
         }
 
-        auto client = d->pad->session()->manager()->client();
+        auto client = _pad->session()->manager()->client();
         auto doc    = client->doc();
 
-        if (d->updateToSend == Action::SessionInfo) {
-            if (d->state != State::Finishing) {
-                // TODO implement
-                return OutgoingUpdate();
+        if (_update.action == Action::SessionInfo && (d->outgoingChecksum.size() > 0 || d->outgoingReceived)) {
+            if (d->outgoingReceived) {
+                d->outgoingReceived = false;
+                ContentBase cb(_pad->session()->role(), _contentName);
+                return OutgoingUpdate { QList<QDomElement>() << cb.toXml(doc, "received", NS),
+                                        [this](bool) { d->setState(State::Finished); } };
             }
-            ContentBase cb(d->pad->session()->role(), d->contentName);
-            return OutgoingUpdate { QList<QDomElement>() << cb.toXml(doc, "received"),
-                                    [this]() { d->setState(State::Finished); } };
-        }
-
-        QDomElement      transportEl;
-        OutgoingUpdateCB transportCB;
-
-        ContentBase cb(d->creator, d->contentName);
-        if (d->state == State::PrepareLocalOffer)
-            cb.senders = d->senders;
-        QList<QDomElement> updates;
-        auto               contentEl = cb.toXml(doc, "content");
-        updates << contentEl;
-
-        switch (d->updateToSend) {
-        case Action::ContentReject:
-        case Action::ContentRemove:
-            if (d->transportReplaceOrigin != Origin::None)
-                d->terminationReason = Reason(Reason::Condition::FailedTransport);
-            if (d->terminationReason.isValid())
-                updates << d->terminationReason.toXml(doc);
-            return OutgoingUpdate { updates, [this]() { d->setState(State::Finished); } };
-        case Action::ContentAdd:
-        case Action::ContentAccept:
-            Q_ASSERT(d->transport->isInitialOfferReady());
-            if (d->file.thumbnail().data.size()) {
-                auto    thumb = d->file.thumbnail();
-                auto    bm    = client->bobManager();
-                BoBData data  = bm->append(thumb.data, thumb.mimeType);
-                thumb.uri     = QLatin1String("cid:") + data.cid();
-                d->file.setThumbnail(thumb);
-            }
-            contentEl.appendChild(doc->createElementNS(NS, QString::fromLatin1("description")))
-                .appendChild(d->file.toXml(doc));
-            d->acceptFile                      = d->file;
-            std::tie(transportEl, transportCB) = d->transport->takeInitialOffer();
-            contentEl.appendChild(transportEl);
-
-            d->setState(State::Unacked);
-            return OutgoingUpdate { updates, [this, transportCB]() {
-                                       if (transportCB) {
-                                           transportCB();
-                                       }
-                                       d->setState(d->pad->session()->role() == Origin::Initiator ? State::Pending
-                                                                                                  : State::Connecting);
-                                   } };
-        case Action::TransportInfo:
-            Q_ASSERT(d->transport->hasUpdates());
-            std::tie(transportEl, transportCB) = d->transport->takeOutgoingUpdate();
-            contentEl.appendChild(transportEl);
-            return OutgoingUpdate { updates, transportCB };
-        case Action::TransportReplace:
-        case Action::TransportAccept: {
-            Q_ASSERT(d->transport->isInitialOfferReady());
-            d->transportReplaceState           = State::Unacked;
-            std::tie(transportEl, transportCB) = d->transport->takeInitialOffer();
-            contentEl.appendChild(transportEl);
-            auto action = d->updateToSend;
-            return OutgoingUpdate { updates, [this, transportCB, action]() {
-                                       if (transportCB) {
-                                           transportCB();
-                                       }
-                                       d->transportReplaceState
-                                           = action == Action::TransportReplace ? State::Pending : State::Finished;
-                                   } };
-        }
-        default:
-            break;
-        }
-
-        return OutgoingUpdate(); // TODO
-    }
-
-    bool Application::wantBetterTransport(const QSharedPointer<Transport> &t) const
-    {
-        Q_UNUSED(t)
-        return true; // TODO check
-    }
-
-    bool Application::selectNextTransport()
-    {
-        while (d->availableTransports.size()) {
-            auto t = d->pad->session()->newOutgoingTransport(d->availableTransports.last());
-            if (t && setTransport(t)) {
-                return true;
-            } else {
-                d->availableTransports.removeLast();
+            if (!d->outgoingChecksum.isEmpty()) {
+                ContentBase cb(_pad->session()->role(), _contentName);
+                File        f;
+                if (d->outgoingChecksumRangeOffset || d->outgoingChecksumRangeLength) {
+                    Range r;
+                    r.hashes = d->outgoingChecksum;
+                    r.offset = d->outgoingChecksumRangeOffset;
+                    r.length = d->outgoingChecksumRangeLength;
+                    f.setRange(r);
+                } else {
+                    f.setHashes(d->outgoingChecksum);
+                }
+                auto el = cb.toXml(doc, "checksum", NS);
+                el.appendChild(f.toXml(doc));
+                d->outgoingChecksum.clear();
+                return OutgoingUpdate { QList<QDomElement>() << el, [this](bool) { d->setState(State::Finished); } };
             }
         }
-        return false;
+        if (_update.action == Action::ContentAdd && _creator == _pad->session()->role()) {
+            // we are doing outgoing file transfer request. so need thumbnail
+        }
+
+        return XMPP::Jingle::Application::takeOutgoingUpdate();
     }
 
     void Application::prepare()
     {
-        if (!d->transport) {
+        if (!_transport) {
             selectNextTransport();
         }
-        if (d->transport) {
-            d->setState(State::PrepareLocalOffer);
-            d->transport->prepare();
+        if (_transport) {
+            d->setState(State::ApprovedToSend);
+            _transport->prepare();
         }
     }
 
     void Application::start()
     {
-        if (d->transport) {
+        if (_transport) {
             d->setState(State::Connecting);
-            d->transport->start();
+            _transport->start();
         }
         // TODO we need QIODevice somewhere here
     }
 
-    bool Application::accept(const QDomElement &el)
-    {
-        File f(el.firstChildElement("file"));
-        if (!f.isValid()) {
-            return false;
-        }
-        d->acceptFile = f;
-        // TODO validate if accept file matches to the offer
-        setState(State::Accepted);
-        return true;
-    }
-
     void Application::remove(Reason::Condition cond, const QString &comment)
     {
-        if (d->state >= State::Finishing)
+        if (_state >= State::Finishing)
             return;
 
-        d->terminationReason      = Reason(cond, comment);
-        d->transportReplaceOrigin = Origin::None; // just in case
-        d->transport->disconnect(this);
-        d->transport.reset();
+        _terminationReason = Reason(cond, comment);
+        _transport->disconnect(this);
+        _transport.reset();
 
-        if (d->creator == d->pad->session()->role() && d->state <= State::PrepareLocalOffer) {
+        if (_creator == _pad->session()->role() && _state <= State::ApprovedToSend) {
             // local content, not yet sent to remote
             setState(State::Finished);
             return;
         }
 
-        setState(State::Finishing);
         emit updated();
     }
 
-    bool Application::incomingTransportAccept(const QDomElement &transportEl)
-    {
-        if (d->transportReplaceOrigin != d->pad->session()->role()) {
-            d->lastError = ErrorUtil::makeOutOfOrder(*d->pad->doc());
-            return false;
-        }
-        if (d->transport->update(transportEl)) {
-            d->transportReplaceOrigin = Origin::None;
-            d->transportReplaceState  = State::Finished;
-            if (d->state >= State::Connecting) {
-                d->transport->start();
-            }
-            emit updated();
-            return true;
-        }
-        return false;
-    }
-
     void Application::incomingRemove(const Reason &r)
     {
-        d->terminationReason = r;
+        d->lastReason = r;
         d->setState(State::Finished);
     }
 
     bool Application::isValid() const
     {
-        return d->file.isValid() && d->contentName.size() > 0
-            && (d->senders == Origin::Initiator || d->senders == Origin::Responder);
+        return d->file.isValid() && _contentName.size() > 0
+            && (_senders == Origin::Initiator || _senders == Origin::Responder);
     }
 
     void Application::setDevice(QIODevice *dev, bool closeOnFinish)
     {
         if (!dev) { // failed to provide proper device
-            d->terminationReason
+            _terminationReason
                 = Reason(Reason::Condition::FailedApplication, QString::fromLatin1("No destination device"));
             emit updated();
             return;
         }
         d->device              = dev;
         d->closeDeviceOnFinish = closeOnFinish;
-        if (d->senders == d->pad->session()->role()) {
+        if (_senders == _pad->session()->role()) {
             d->writeNextBlockToTransport();
         } else {
             d->readNextBlockFromTransport();
diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index d090524f..4ca8e53c 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -20,6 +20,7 @@
 #ifndef JINGLEFT_H
 #define JINGLEFT_H
 
+#include "jingle-application.h"
 #include "jingle.h"
 #include "xmpp_hash.h"
 
@@ -41,6 +42,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
         inline Range() {}
         inline Range(qint64 offset, qint64 length) : offset(offset), length(length) {}
         inline bool isValid() const { return hashes.size() || offset || length; }
+        inline      operator bool() const { return isValid(); }
         QDomElement toXml(QDomDocument *doc) const;
     };
 
@@ -72,6 +74,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
         void setDate(const QDateTime &date);
         void setDescription(const QString &desc);
         void addHash(const Hash &hash);
+        void setHashes(const QList<Hash> &hashes);
         void setMediaType(const QString &mediaType);
         void setName(const QString &name);
         void setSize(qint64 size);
@@ -124,22 +127,29 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
         Application(const QSharedPointer<Pad> &pad, const QString &contentName, Origin creator, Origin senders);
         ~Application() override;
 
-        ApplicationManagerPad::Ptr pad() const override;
-        State                      state() const override;
-        void                       setState(State state) override;
-        XMPP::Stanza::Error        lastError() const override;
-        Reason                     terminationReason() const override;
-
-        QString                   contentName() const override;
-        Origin                    creator() const override;
-        Origin                    senders() const override;
-        Origin                    transportReplaceOrigin() const override;
-        SetDescError              setDescription(const QDomElement &description) override;
-        void                      setFile(const File &file);
-        File                      file() const;
-        File                      acceptFile() const;
-        bool                      setTransport(const QSharedPointer<Transport> &transport) override;
-        QSharedPointer<Transport> transport() const override;
+        void                setState(State state) override;
+        XMPP::Stanza::Error lastError() const override;
+        Reason              lastReason() const override;
+
+        SetDescError setRemoteOffer(const QDomElement &description) override;
+        SetDescError setRemoteAnswer(const QDomElement &description) override;
+        QDomElement  makeLocalOffer() override;
+        QDomElement  makeLocalAnswer() override;
+
+        bool canReplaceTransport() const override;
+        bool setTransport(const QSharedPointer<Transport> &transport, const Reason &reason = Reason()) override;
+        void remove(Reason::Condition cond = Reason::Success, const QString &comment = QString()) override;
+
+        XMPP::Jingle::Application::Update evaluateOutgoingUpdate() override;
+        OutgoingUpdate                    takeOutgoingUpdate() override;
+        bool wantBetterTransport(const QSharedPointer<XMPP::Jingle::Transport> &) const override;
+        bool selectNextTransport(const QString preferredNS = QString()) override;
+        void prepare() override;
+        void start() override;
+
+        void setFile(const File &file);
+        File file() const;
+        File acceptFile() const;
 
         /**
          * @brief setStreamingMode enables external download control.
@@ -152,16 +162,6 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
          * @param mode
          */
         void setStreamingMode(bool mode = true);
-
-        Action         evaluateOutgoingUpdate() override;
-        OutgoingUpdate takeOutgoingUpdate() override;
-        bool           wantBetterTransport(const QSharedPointer<XMPP::Jingle::Transport> &) const override;
-        bool           selectNextTransport() override;
-        void           prepare() override;
-        void           start() override;
-        bool           accept(const QDomElement &el) override;
-        void           remove(Reason::Condition cond = Reason::Success, const QString &comment = QString()) override;
-
         bool isValid() const;
 
         void            setDevice(QIODevice *dev, bool closeOnFinish = true);
@@ -169,9 +169,11 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
 
     protected:
         bool incomingTransportReplace(const QSharedPointer<Transport> &transport) override;
-        bool incomingTransportAccept(const QDomElement &transportEl) override;
         void incomingRemove(const Reason &r) override;
 
+    private:
+        void prepareThumbnail(File &file);
+
     signals:
         void connectionReady(); // streaming mode only
 
diff --git a/src/xmpp/xmpp-im/jingle-ibb.cpp b/src/xmpp/xmpp-im/jingle-ibb.cpp
index a1ce2c9a..840a37f4 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.cpp
+++ b/src/xmpp/xmpp-im/jingle-ibb.cpp
@@ -18,6 +18,7 @@
  */
 
 #include "jingle-ibb.h"
+#include "jingle-session.h"
 
 #include "xmpp/jid/jid.h"
 #include "xmpp_client.h"
@@ -37,11 +38,13 @@ namespace XMPP { namespace Jingle { namespace IBB {
         QString        sid;
         size_t         _blockSize;
         IBBConnection *connection = nullptr;
+        State          state      = State::Created;
+        Origin         creator    = Origin::None;
 
-        bool offerSent     = false;
-        bool offerReceived = false;
-        bool closing       = false;
-        bool finished      = false;
+        //        bool offerSent     = false;
+        //        bool offerReceived = false;
+        //        bool closing       = false;
+        //        bool finished      = false;
 
         Connection(Client *client, const Jid &jid, const QString &sid, size_t blockSize) :
             client(client), peer(jid), sid(sid), _blockSize(blockSize)
@@ -50,16 +53,21 @@ namespace XMPP { namespace Jingle { namespace IBB {
 
         void setConnection(IBBConnection *c)
         {
+            c->setParent(this);
             connection = c;
             connect(c, &IBBConnection::readyRead, this, &Connection::readyRead);
             connect(c, &IBBConnection::bytesWritten, this, &Connection::bytesWritten);
             connect(c, &IBBConnection::connectionClosed, this, &Connection::handleIBBClosed);
             connect(c, &IBBConnection::delayedCloseFinished, this, &Connection::handleIBBClosed);
             connect(c, &IBBConnection::aboutToClose, this, &Connection::aboutToClose);
-            connect(c, &IBBConnection::connected, this, [this]() {
-                setOpenMode(connection->openMode());
-                emit connected();
-            });
+            connect(c, &IBBConnection::connected, this, &Connection::handleConnnected);
+        }
+
+        void handleConnnected()
+        {
+            state = State::Active;
+            setOpenMode(connection->openMode());
+            emit connected();
         }
 
         size_t blockSize() const { return _blockSize; }
@@ -83,6 +91,7 @@ namespace XMPP { namespace Jingle { namespace IBB {
                 XMPP::Jingle::Connection::close();
                 emit connectionClosed();
             }
+            state = State::Finished;
         }
 
     signals:
@@ -93,8 +102,8 @@ namespace XMPP { namespace Jingle { namespace IBB {
 
         qint64 readData(char *data, qint64 maxSize)
         {
-            quint64 ret = connection->read(data, maxSize);
-            if (closing && !bytesAvailable()) {
+            qint64 ret = connection->read(data, maxSize);
+            if (state == State::Finishing && !bytesAvailable()) {
                 postCloseAllDataRead();
             }
             return ret;
@@ -103,7 +112,7 @@ namespace XMPP { namespace Jingle { namespace IBB {
     private:
         void handleIBBClosed()
         {
-            closing = true;
+            state = State::Finishing;
             if (bytesAvailable())
                 setOpenMode(QIODevice::ReadOnly);
             else
@@ -112,8 +121,7 @@ namespace XMPP { namespace Jingle { namespace IBB {
 
         void postCloseAllDataRead()
         {
-            closing  = false;
-            finished = true;
+            state = State::Finished;
             connection->deleteLater();
             connection = nullptr;
             setOpenMode(QIODevice::NotOpen);
@@ -123,124 +131,98 @@ namespace XMPP { namespace Jingle { namespace IBB {
 
     struct Transport::Private {
         Transport *                               q = nullptr;
-        Pad::Ptr                                  pad;
         QMap<QString, QSharedPointer<Connection>> connections;
         QList<QSharedPointer<Connection>>         readyConnections;
-        QSharedPointer<Connection>                lastOfferedConnection;
         size_t                                    defaultBlockSize = 4096;
         bool                                      started          = false;
-        bool                                      initialOfferSent = false; // if we ever sent anything
 
         void checkAndStartConnection(const QSharedPointer<Connection> &c)
         {
-            if (!c->connection && !c->finished && c->offerReceived && c->offerSent
-                && pad->session()->role() == Origin::Initiator) {
-                auto con    = pad->session()->manager()->client()->ibbManager()->createConnection();
+            if (c->connection || c->state != State::Accepted)
+                return;
+
+            c->state = State::Connecting;
+            if (q->_pad->session()->role() == Origin::Initiator) {
+                auto con    = q->_pad->session()->manager()->client()->ibbManager()->createConnection();
                 auto ibbcon = static_cast<IBBConnection *>(con);
-                ibbcon->setPacketSize(defaultBlockSize);
+                ibbcon->setPacketSize(int(c->blockSize()));
                 c->setConnection(ibbcon);
-                ibbcon->connectToJid(pad->session()->peer(), c->sid);
-            }
+                ibbcon->connectToJid(q->_pad->session()->peer(), c->sid);
+            } // else we are waiting for incoming open
         }
 
-        void handleConnected(const QSharedPointer<Connection> &c)
+        QSharedPointer<Connection> newStream(const QString &sid, std::size_t blockSize, Origin creator)
         {
-            if (c) {
-                readyConnections.append(c);
-                emit q->connected();
-            }
-        }
-
-        OutgoingTransportInfoUpdate makeOffer(const QSharedPointer<Connection> &connection)
-        {
-            OutgoingTransportInfoUpdate upd;
-            if (!connection) {
-                return upd;
-            }
-
-            auto doc = pad->session()->manager()->client()->doc();
-
-            QDomElement tel = doc->createElementNS(NS, "transport");
-            tel.setAttribute(QStringLiteral("sid"), connection->sid);
-            tel.setAttribute(QString::fromLatin1("block-size"), qulonglong(connection->_blockSize));
+            auto conn    = q->_pad.staticCast<Pad>()->makeConnection(sid, blockSize);
+            auto ibbConn = conn.staticCast<Connection>();
+            if (!ibbConn)
+                return ibbConn;
+            ibbConn->creator = creator;
+            QObject::connect(ibbConn.data(), &Connection::connected, q, [this]() {
+                if (q->_state == State::Connecting) {
+                    q->setState(State::Active);
+                    emit q->connected();
+                }
+            });
+            connections.insert(ibbConn->sid, ibbConn);
 
-            upd = OutgoingTransportInfoUpdate { tel, [this, connection]() mutable {
-                                                   if (started)
-                                                       checkAndStartConnection(connection);
-                                               } };
+            QObject::connect(ibbConn.data(), &Connection::connectionClosed, q, [this]() {
+                Connection *c = static_cast<Connection *>(q->sender());
+                connections.remove(c->sid);
+                QMutableListIterator<QSharedPointer<Connection>> it(readyConnections);
+                while (it.hasNext()) {
+                    auto &p = it.next();
+                    if (p.data() == c) {
+                        it.remove();
+                        break;
+                    }
+                }
+            });
 
-            lastOfferedConnection = connection;
-            connection->offerSent = true;
-            return upd;
+            return ibbConn;
         }
     };
 
-    Transport::Transport(const TransportManagerPad::Ptr &pad) : d(new Private)
+    Transport::Transport(const TransportManagerPad::Ptr &pad, Origin creator) :
+        XMPP::Jingle::Transport(pad, creator), d(new Private)
     {
-        d->q   = this;
-        d->pad = pad.staticCast<Pad>();
+        d->q = this;
         connect(pad->manager(), &TransportManager::abortAllRequested, this, [this]() {
             for (auto &c : d->connections) {
                 c->close();
             }
             // d->aborted = true;
-            emit failed();
+            emit failed(); // TODO review if necessary. likely it's not
         });
     }
 
-    Transport::Transport(const TransportManagerPad::Ptr &pad, const QDomElement &transportEl) : d(new Private)
-    {
-        d->q   = this;
-        d->pad = pad.staticCast<Pad>();
-        update(transportEl);
-        if (d->connections.isEmpty()) {
-            d.reset();
-            return;
-        }
-    }
-
     Transport::~Transport()
     {
         // we have to mark all of them as finished just in case they are captured somewhere else
         if (d) {
             for (auto &c : d->connections) {
-                c->finished = true;
+                c->close();
             }
         }
     }
 
-    TransportManagerPad::Ptr Transport::pad() const { return d->pad; }
-
     void Transport::prepare()
     {
-        if (d->connections.isEmpty()) { // seems like outgoing
-            auto conn    = d->pad->makeConnection(QString(), d->defaultBlockSize);
-            auto ibbConn = conn.staticCast<Connection>();
-            connect(ibbConn.data(), &Connection::connected, this, [this]() {
-                auto c = static_cast<Connection *>(sender());
-                d->handleConnected(d->connections.value(c->sid));
-            });
-            d->connections.insert(ibbConn->sid, ibbConn);
-
-            connect(ibbConn.data(), &Connection::connectionClosed, this, [this]() {
-                Connection *c = static_cast<Connection *>(sender());
-                d->connections.remove(c->sid);
-                QMutableListIterator<QSharedPointer<Connection>> it(d->readyConnections);
-                while (it.hasNext()) {
-                    auto &p = it.next();
-                    if (p.data() == c) {
-                        it.remove();
-                        break;
-                    }
-                }
-            });
+        setState(State::ApprovedToSend);
+        if (_creator == _pad->session()->role()) { // outgoing
+            auto c   = d->newStream(QString(), d->defaultBlockSize, _pad->session()->role());
+            c->state = State::ApprovedToSend;
+        } else {
+            for (auto &c : d->connections) {
+                c->state = State::ApprovedToSend;
+            }
         }
         emit updated();
     }
 
     void Transport::start()
     {
-        d->started = true;
+        setState(State::Connecting);
 
         for (auto &c : d->connections) {
             d->checkAndStartConnection(c);
@@ -249,8 +231,14 @@ namespace XMPP { namespace Jingle { namespace IBB {
 
     bool Transport::update(const QDomElement &transportEl)
     {
+        if (_state == State::Finished) {
+            qWarning("The IBB transport has finished already");
+            return false;
+        }
+
         QString sid = transportEl.attribute(QString::fromLatin1("sid"));
         if (sid.isEmpty()) {
+            qWarning("empty SID");
             return false;
         }
 
@@ -264,48 +252,43 @@ namespace XMPP { namespace Jingle { namespace IBB {
         }
 
         auto it = d->connections.find(sid);
-        if (it == d->connections.end()) {
-            auto c = d->pad->makeConnection(sid, bs_final);
-            if (c) {
-                auto ibbc = c.staticCast<Connection>();
-                it        = d->connections.insert(ibbc->sid, ibbc);
-                connect(ibbc.data(), &Connection::connected, this, [this]() {
-                    auto c = static_cast<Connection *>(sender());
-                    d->handleConnected(d->connections.value(c->sid));
-                });
-            } else {
+        if (it == d->connections.end()) { // new sid = new stream according to xep
+            auto c = d->newStream(sid, bs_final, _pad->session()->peerRole());
+            if (!c) {
                 qWarning("failed to create IBB connection");
                 return false;
             }
+            c->state = State::Pending;
+            if (_state == State::Created && _creator != _pad->session()->role()) {
+                // seems like we are just initing remote transport
+                setState(State::Pending);
+            }
         } else {
+            if ((*it)->creator != _pad->session()->role() || (*it)->state != State::Pending) {
+                qWarning("Unexpected IBB answer");
+                return false; // out of order or something like this
+            }
+
             if (bs_final < (*it)->_blockSize) {
                 (*it)->_blockSize = bs_final;
             }
+            if (_creator == _pad->session()->role()) {
+                setState(State::Accepted);
+            }
+            (*it)->state = State::Accepted;
         }
 
-        (*it)->offerReceived = true;
-        if (d->started) {
+        if (_state >= State::Connecting) {
             auto c = it.value();
             QTimer::singleShot(0, this, [this, c]() mutable { d->checkAndStartConnection(c); });
         }
         return true;
     }
 
-    bool Transport::isInitialOfferReady() const { return isValid() && (hasUpdates() || d->initialOfferSent); }
-
-    OutgoingTransportInfoUpdate Transport::takeInitialOffer()
-    {
-        auto upd = takeOutgoingUpdate();
-        if (std::get<0>(upd).isNull() && d->lastOfferedConnection) {
-            return d->makeOffer(d->lastOfferedConnection);
-        }
-        return upd;
-    }
-
     bool Transport::hasUpdates() const
     {
         for (auto &c : d->connections) {
-            if (!c->offerSent) {
+            if (c->state == State::ApprovedToSend) {
                 return true;
             }
         }
@@ -321,17 +304,52 @@ namespace XMPP { namespace Jingle { namespace IBB {
 
         QSharedPointer<Connection> connection;
         for (auto &c : d->connections) {
-            if (!c->offerSent) {
+            if (c->state == State::ApprovedToSend) {
                 connection = c;
                 break;
             }
         }
-        return d->makeOffer(connection);
+
+        if (!connection)
+            return upd;
+
+        connection->state = State::Unacked;
+        auto doc          = _pad->session()->manager()->client()->doc();
+
+        QDomElement tel = doc->createElementNS(NS, "transport");
+        tel.setAttribute(QStringLiteral("sid"), connection->sid);
+        tel.setAttribute(QString::fromLatin1("block-size"), qulonglong(connection->_blockSize));
+
+        if (_state == State::ApprovedToSend) {
+            setState(State::Unacked);
+        }
+        upd = OutgoingTransportInfoUpdate { tel, [this, connection](bool success) mutable {
+                                               if (!success || connection->state != State::Unacked)
+                                                   return;
+
+                                               if (connection->creator == _pad->session()->role()) {
+                                                   connection->state = State::Pending;
+                                               } else {
+                                                   connection->state = State::Accepted;
+                                               }
+
+                                               if (_state == State::Unacked) {
+                                                   setState(_creator == _pad->session()->role() ? State::Pending
+                                                                                                : State::Accepted);
+                                               }
+                                               if (_state >= State::Connecting)
+                                                   d->checkAndStartConnection(connection);
+                                           } };
+
+        return upd;
     }
 
     bool Transport::isValid() const { return d; }
 
-    Transport::Features Transport::features() const { return AlwaysConnect | Reliable | Slow; }
+    TransportFeatures Transport::features() const
+    {
+        return TransportFeature::AlwaysConnect | TransportFeature::Reliable | TransportFeature::Slow;
+    }
 
     Connection::Ptr Transport::connection() const
     {
@@ -369,27 +387,16 @@ namespace XMPP { namespace Jingle { namespace IBB {
             d->jingleManager->unregisterTransport(NS);
     }
 
-    Transport::Features Manager::features() const
+    TransportFeatures Manager::features() const
     {
-        return Transport::AlwaysConnect | Transport::Reliable | Transport::Slow;
+        return TransportFeature::AlwaysConnect | TransportFeature::Reliable | TransportFeature::Slow;
     }
 
     void Manager::setJingleManager(XMPP::Jingle::Manager *jm) { d->jingleManager = jm; }
 
-    QSharedPointer<XMPP::Jingle::Transport> Manager::newTransport(const TransportManagerPad::Ptr &pad)
+    QSharedPointer<XMPP::Jingle::Transport> Manager::newTransport(const TransportManagerPad::Ptr &pad, Origin creator)
     {
-        return QSharedPointer<XMPP::Jingle::Transport>(new Transport(pad));
-    }
-
-    QSharedPointer<XMPP::Jingle::Transport> Manager::newTransport(const TransportManagerPad::Ptr &pad,
-                                                                  const QDomElement &             transportEl)
-    {
-        auto                                    t = new Transport(pad, transportEl);
-        QSharedPointer<XMPP::Jingle::Transport> ret(t);
-        if (t->isValid()) {
-            return ret;
-        }
-        return QSharedPointer<XMPP::Jingle::Transport>();
+        return QSharedPointer<Transport>::create(pad, creator).staticCast<XMPP::Jingle::Transport>();
     }
 
     TransportManagerPad *Manager::pad(Session *session) { return new Pad(this, session); }
diff --git a/src/xmpp/xmpp-im/jingle-ibb.h b/src/xmpp/xmpp-im/jingle-ibb.h
index 8669f3ec..92c7c19c 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.h
+++ b/src/xmpp/xmpp-im/jingle-ibb.h
@@ -20,7 +20,7 @@
 #ifndef JINGLEIBB_H
 #define JINGLEIBB_H
 
-#include "jingle.h"
+#include "jingle-transport.h"
 
 namespace XMPP {
 class IBBConnection;
@@ -31,21 +31,16 @@ namespace Jingle { namespace IBB {
     class Transport : public XMPP::Jingle::Transport {
         Q_OBJECT
     public:
-        Transport(const TransportManagerPad::Ptr &pad);
-        Transport(const TransportManagerPad::Ptr &pad, const QDomElement &transportEl);
-        ~Transport();
-
-        TransportManagerPad::Ptr pad() const override;
+        Transport(const TransportManagerPad::Ptr &pad, Origin creator);
+        ~Transport() override;
 
         void                        prepare() override;
         void                        start() override;
-        bool                        isInitialOfferReady() const override;
-        OutgoingTransportInfoUpdate takeInitialOffer() override;
         bool                        update(const QDomElement &transportEl) override;
         bool                        hasUpdates() const override;
         OutgoingTransportInfoUpdate takeOutgoingUpdate() override;
         bool                        isValid() const override;
-        Features                    features() const override;
+        TransportFeatures           features() const override;
 
         Connection::Ptr connection() const override;
 
@@ -79,14 +74,12 @@ namespace Jingle { namespace IBB {
         Q_OBJECT
     public:
         Manager(QObject *parent = nullptr);
-        ~Manager();
+        ~Manager() override;
 
-        XMPP::Jingle::Transport::Features       features() const override;
+        XMPP::Jingle::TransportFeatures         features() const override;
         void                                    setJingleManager(XMPP::Jingle::Manager *jm) override;
-        QSharedPointer<XMPP::Jingle::Transport> newTransport(const TransportManagerPad::Ptr &pad)
-            override; // outgoing. one have to call Transport::start to collect candidates
         QSharedPointer<XMPP::Jingle::Transport> newTransport(const TransportManagerPad::Ptr &pad,
-                                                             const QDomElement &transportEl) override; // incoming
+                                                             Origin                          creator) override;
         TransportManagerPad *                   pad(Session *session) override;
 
         void closeAll() override;
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index fc8a3e30..b4a4a64a 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -20,6 +20,7 @@
 #include "jingle-s5b.h"
 
 #include "ice176.h"
+#include "jingle-session.h"
 #include "s5b.h"
 #include "socks.h"
 #include "xmpp/jid/jid.h"
@@ -63,7 +64,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
 
         NetworkDatagram receiveDatagram(qint64 maxSize = -1)
         {
-            Q_UNUSED(maxSize); // TODO or not?
+            Q_UNUSED(maxSize) // TODO or not?
             return datagrams.size() ? datagrams.takeFirst() : NetworkDatagram();
         }
 
@@ -166,7 +167,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
                 connect(
                     client, &SocksClient::error, this,
                     [this, name, client](int error) {
-                        Q_UNUSED(error);
+                        Q_UNUSED(error)
                         clients.remove(name);
                         delete client;
                         if (clients.isEmpty()) {
@@ -231,7 +232,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
                          << "candidate using V6LinkLocalSocksConnector";
                 // we have link local address without scope. We have to enumerate all possible scopes.
                 auto v6llConnector = new V6LinkLocalSocksConnector(this);
-                connect(v6llConnector, &V6LinkLocalSocksConnector::ready, this,
+                connect(v6llConnector, &V6LinkLocalSocksConnector::ready, callbackContext,
                         [this, v6llConnector, callback, successState]() {
                             socksClient = v6llConnector->takeClient();
                             delete v6llConnector;
@@ -262,7 +263,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
                     callback(true);
                 });
                 connect(socksClient, &SocksClient::error, callbackContext, [this, callback](int error) {
-                    Q_UNUSED(error);
+                    Q_UNUSED(error)
                     if (state == Candidate::Discarded) {
                         return;
                     }
@@ -279,7 +280,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
         void setupIncomingSocksClient()
         {
             connect(socksClient, &SocksClient::error, [this](int error) {
-                Q_UNUSED(error);
+                Q_UNUSED(error)
                 state = Candidate::Discarded;
             });
         }
@@ -371,8 +372,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
             type = Candidate::Tunnel;
             break;
         case TcpPortServer::NoType:
-        default:
-            type = None;
+            break;
         }
 
         if (type == None) {
@@ -380,13 +380,14 @@ namespace XMPP { namespace Jingle { namespace S5B {
             return;
         }
 
-        d->transport                  = transport;
-        d->server                     = server.staticCast<S5BServer>();
-        d->cid                        = cid;
-        d->host                       = server->publishHost();
-        d->port                       = server->publishPort();
-        d->type                       = type;
-        static const int priorities[] = { 0, ProxyPreference, TunnelPreference, AssistedPreference, DirectPreference };
+        d->transport = transport;
+        d->server    = server.staticCast<S5BServer>();
+        d->cid       = cid;
+        d->host      = server->publishHost();
+        d->port      = server->publishPort();
+        d->type      = type;
+        static const quint32 priorities[]
+            = { 0, ProxyPreference, TunnelPreference, AssistedPreference, DirectPreference };
         if (type >= Type(0) && type <= Direct) {
             d->priority = (priorities[type] << 16) + localPreference;
         } else {
@@ -437,8 +438,8 @@ namespace XMPP { namespace Jingle { namespace S5B {
 
     void Candidate::setState(Candidate::State s)
     {
-        // don't close sockets here since pending events may change state machine or remote side and closed socket may
-        // break it
+        // don't close sockets here since pending events may change state machine or remote side and closed socket
+        // may break it
         d->state = s;
     }
 
@@ -489,9 +490,16 @@ namespace XMPP { namespace Jingle { namespace S5B {
 
     QString Candidate::toString() const
     {
-        if (d)
-            return QString("Cadidate(%1 cid=%2 %3)").arg(typeText(d->type), d->cid, stateText(d->state));
-        else
+        if (d) {
+            QString extra;
+            if (d->type == Tunnel || d->type == Assisted || d->type == Direct) {
+                extra = QString("host=%1:%2").arg(d->host, QString::number(d->port));
+            } else if (d->type == Proxy) {
+                extra = QString("proxy=%1 host=%2:%3").arg(d->jid.full(), d->host, QString::number(d->port));
+            }
+            return QString("Cadidate(type=%1 cid=%2 state=%3 %4)")
+                .arg(typeText(d->type), d->cid, stateText(d->state), extra);
+        } else
             return QString("Candidate(null)");
     }
 
@@ -543,10 +551,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
     public:
         enum PendingActions { NewCandidate = 1, CandidateUsed = 2, CandidateError = 4, Activated = 8, ProxyError = 16 };
 
-        Transport *              q = nullptr;
-        Pad::Ptr                 pad;
-        bool                     meCreator                    = true;  // content created on local side
-        bool                     transportStarted             = false; // where start() was called
+        Transport *              q                            = nullptr;
         bool                     offerSent                    = false;
         bool                     waitingAck                   = true;
         bool                     aborted                      = false;
@@ -555,13 +560,12 @@ namespace XMPP { namespace Jingle { namespace S5B {
         bool                     proxyDiscoveryInProgress     = false; // if we have valid proxy requests
         quint16                  pendingActions               = 0;
         int                      proxiesInDiscoCount          = 0;
-        Application *            application                  = nullptr;
         QMap<QString, Candidate> localCandidates; // cid to candidate mapping
         QMap<QString, Candidate> remoteCandidates;
         Candidate localUsedCandidate;  // we received "candidate-used" for this candidate from localCandidates list
         Candidate remoteUsedCandidate; // we sent "candidate-used" for this candidate from remoteCandidates list
-        QString   dstaddr; // an address for xmpp proxy as it comes from remote. each side calculates it like sha1(sid +
-                           // local jid + remote jid)
+        QString   dstaddr;  // an address for xmpp proxy as it comes from remote. each side calculates it like sha1(sid
+                            // + local jid + remote jid)
         QString directAddr; // like dstaddr but for direct connection. Basically it's sha1(sid + initiator jid +
                             // responder jid)
         QString            sid;
@@ -579,7 +583,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
         quint16      udpPort;
         QHostAddress udpAddress;
 
-        inline Jid remoteJid() const { return pad->session()->peer(); }
+        inline Jid remoteJid() const { return q->_pad->session()->peer(); }
 
         QString generateCid() const
         {
@@ -604,7 +608,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
         void queryS5BProxy(const Jid &j, const QString &cid)
         {
             proxiesInDiscoCount++;
-            auto query = new JT_S5B(pad->session()->manager()->client()->rootTask());
+            auto query = new JT_S5B(q->_pad->session()->manager()->client()->rootTask());
             connect(query, &JT_S5B::finished, q, [this, query, cid]() {
                 if (!proxyDiscoveryInProgress) {
                     return;
@@ -617,7 +621,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
                         // it can be discarded by this moment (e.g. got success on a higher priority
                         // candidate). so we have to check.
                         c.setHost(sh.host());
-                        c.setPort(sh.port());
+                        c.setPort(quint16(sh.port()));
                         c.setState(Candidate::New);
                         candidateUpdated = true;
                         pendingActions |= Private::NewCandidate;
@@ -642,7 +646,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
 
         void discoS5BProxy()
         {
-            auto m     = static_cast<Manager *>(pad->manager());
+            auto m     = static_cast<Manager *>(q->_pad->manager());
             Jid  proxy = m->userProxy();
             if (proxy.isValid()) {
                 Candidate c(q, proxy, generateCid());
@@ -655,21 +659,21 @@ namespace XMPP { namespace Jingle { namespace S5B {
 
             proxyDiscoveryInProgress            = true;
             QList<QSet<QString>> featureOptions = { { "http://jabber.org/protocol/bytestreams" } };
-            pad->session()->manager()->client()->serverInfoManager()->queryServiceInfo(
+            q->_pad->session()->manager()->client()->serverInfoManager()->queryServiceInfo(
                 QStringLiteral("proxy"), QStringLiteral("bytestreams"), featureOptions,
                 QRegExp("proxy.*|socks.*|stream.*|s5b.*"), ServerInfoManager::SQ_CheckAllOnNoMatch,
                 [this](const QList<DiscoItem> &items) {
                     if (!proxyDiscoveryInProgress) { // check if new results are ever/still expected
-                        // seems like we have successful connection via higher priority channel. so nobody cares about
-                        // proxy
+                        // seems like we have successful connection via higher priority channel. so nobody cares
+                        // about proxy
                         return;
                     }
-                    auto m         = static_cast<Manager *>(pad->manager());
+                    auto m         = static_cast<Manager *>(q->_pad->manager());
                     Jid  userProxy = m->userProxy();
 
                     bool userProxyFound = !userProxy.isValid();
-                    for (const auto i : items) {
-                        int localPref = 0;
+                    for (const auto &i : items) {
+                        quint16 localPref = 0;
                         if (!userProxyFound && i.jid() == userProxy) {
                             localPref      = 1;
                             userProxyFound = true;
@@ -695,7 +699,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
 
         void tryConnectToRemoteCandidate()
         {
-            if (!transportStarted) {
+            if (q->_state < State::Accepted) {
                 return; // will come back later
             }
             quint64          maxProbingPrio = 0;
@@ -773,8 +777,8 @@ namespace XMPP { namespace Jingle { namespace S5B {
                                 }
                             }
                             if (!hasUnckeckedNew) {
-                                pendingActions
-                                    &= ~Private::NewCandidate; // just if we had it for example after proxy discovery
+                                pendingActions &= ~Private::NewCandidate; // just if we had it for example after
+                                                                          // proxy discovery
                             }
                             setLocalProbingMinimalPreference(mnc.priority() >> 16);
                             updateMinimalPriorityOnConnected();
@@ -839,7 +843,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
             if (localUsedCandidate) {
                 if (remoteUsedCandidate) {
                     if (localUsedCandidate.priority() == remoteUsedCandidate.priority()) {
-                        if (pad->session()->role() == Origin::Initiator) {
+                        if (q->_pad->session()->role() == Origin::Initiator) {
                             return remoteUsedCandidate;
                         }
                         return localUsedCandidate;
@@ -852,106 +856,78 @@ namespace XMPP { namespace Jingle { namespace S5B {
             return remoteUsedCandidate;
         }
 
-        void checkAndFinishNegotiation()
+        // We come here when both sides reported either candidate-used or candidate-error
+        void onBothSidesFinished()
         {
-            // Why we can't send candidate-used/error right when this happens:
-            // so the situation: we discarded all remote candidates (failed to connect)
-            // but we have some local candidates which are still in Probing state (upnp for example)
-            // if we send candidate-error while we have unsent candidates this may trigger transport failure.
-            // So for candidate-error two conditions have to be met 1) all remote failed 2) all local were sent no more
-            // local candidates are expected to be discovered
-
-            if (!transportStarted || connection) { // if not started or already finished
-                qWarning("checkAndFinishNegotiation not finished: !connectionStarted || connection");
-                return;
-            }
-
-            // sort out already handled states or states which will bring us here a little later
-            if (waitingAck || pendingActions || hasUnaknowledgedLocalCandidates()) {
-                // waitingAck some query waits for ack and in the callback this func will be called again
-                // pendingActions means we reported to app we have data to send but the app didn't take this data yet,
-                // but as soon as it's taken it will switch to waitingAck.
-                // And with unacknowledged local candidates we can't send used/error as well as report
-                // connected()/failure() until tried them all
-                qDebug("checkAndFinishNegotiation not finished: waitingAck=%d || pendingActions=%x || "
-                       "hasUnaknowledgedLocalCandidates()=%d",
-                       int(waitingAck), int(pendingActions), int(hasUnaknowledgedLocalCandidates()));
-                return;
-            }
-
-            // if we already sent used/error. In other words if we already have finished local part of negotiation
-            if (localReportedCandidateError || remoteUsedCandidate) {
-                // maybe it's time to report connected()/failure()
-                if (remoteReportedCandidateError || localUsedCandidate) {
-                    // so remote seems to be finished too.
-                    // tell application about it and it has to change its state immediatelly
-                    auto c = preferredUsedCandidate();
-                    if (c) {
-                        if (c.state() != Candidate::Active) {
-                            if (c.type() == Candidate::Proxy) { // local proxy
-                                // If it's proxy, first it has to be activated
-                                if (c == localUsedCandidate) {
-                                    if (c.state() == Candidate::Activating) {
-                                        qDebug("The proxy cid=%s is still activating", qPrintable(c.cid()));
+            // so remote seems to be finished too.
+            // tell application about it and it has to change its state immediatelly
+            auto c          = preferredUsedCandidate();
+            bool bothErrors = localReportedCandidateError && remoteReportedCandidateError;
+            if (!bothErrors && c) {
+                if (c.state() != Candidate::Active) {
+                    if (c.type() == Candidate::Proxy) { // local proxy
+                        // If it's proxy, first it has to be activated
+                        if (c == localUsedCandidate) {
+                            if (c.state() == Candidate::Activating) {
+                                qDebug("The proxy cid=%s is still activating", qPrintable(c.cid()));
+                                return;
+                            }
+                            // it's our side who offered proxy. so we have to connect to it and activate
+                            auto key = makeKey(sid, q->_pad->session()->manager()->client()->jid(),
+                                               q->_pad->session()->peer());
+
+                            qDebug("Connect to proxy offered by local side (cid=%s) and activate it",
+                                   qPrintable(c.cid()));
+                            c.setState(Candidate::Activating);
+                            c.connectToHost(
+                                key, Candidate::Activating, q,
+                                [this, c](bool success) {
+                                    if (!success) {
+                                        pendingActions |= Private::ProxyError;
+                                        emit q->updated();
                                         return;
                                     }
-                                    // it's our side who offered proxy. so we have to connect to it and activate
-                                    auto key = makeKey(sid, pad->session()->me(), pad->session()->peer());
-
-                                    qDebug("Connect to proxy offered by local side (cid=%s) and activate it",
-                                           qPrintable(c.cid()));
-                                    c.setState(Candidate::Activating);
-                                    c.connectToHost(
-                                        key, Candidate::Activating, q,
-                                        [this, c](bool success) {
-                                            if (!success) {
-                                                pendingActions |= Private::ProxyError;
-                                                emit q->updated();
-                                                return;
-                                            }
-
-                                            auto query = new JT_S5B(pad->session()->manager()->client()->rootTask());
-                                            connect(query, &JT_S5B::finished, q, [this, c, query]() {
-                                                if (c.state() != Candidate::Activating) {
-                                                    qDebug(
-                                                        "Proxy candidate cid=%s was changed state while we were trying "
-                                                        "to activate(activate) it. Ignore the result",
-                                                        qPrintable(c.cid()));
-                                                    return;
-                                                }
-                                                if (!query->success()) {
-                                                    pendingActions |= Private::ProxyError;
-                                                    emit q->updated();
-                                                    return;
-                                                }
-                                                pendingActions |= Private::Activated;
-                                                localUsedCandidate.setState(Candidate::Active);
-                                                emit q->updated();
-                                                handleConnected(localUsedCandidate);
-                                            });
-                                            query->requestActivation(localUsedCandidate.jid(), sid,
-                                                                     pad->session()->peer());
-                                            query->go(true);
-                                        },
-                                        mode == Transport::Udp);
-                                } // else so it's remote proxy. let's just wait for <activated> from remote
-                            } else {
-                                c.setState(Candidate::Active);
-                            }
-                        }
-                        if (c.state() == Candidate::Active) {
-                            handleConnected(c);
-                        } else
-                            qDebug("checkAndFinishNegotiation not finished: preferred is not Active");
-                    } else { // both sides reported candidate error
-                        emit q->failed();
+
+                                    auto query = new JT_S5B(q->_pad->session()->manager()->client()->rootTask());
+                                    connect(query, &JT_S5B::finished, q, [this, c, query]() {
+                                        if (c.state() != Candidate::Activating) {
+                                            qDebug("Proxy candidate cid=%s was changed state while we were "
+                                                   "trying "
+                                                   "to activate(activate) it. Ignore the result",
+                                                   qPrintable(c.cid()));
+                                            return;
+                                        }
+                                        if (!query->success()) {
+                                            pendingActions |= Private::ProxyError;
+                                            emit q->updated();
+                                            return;
+                                        }
+                                        pendingActions |= Private::Activated;
+                                        localUsedCandidate.setState(Candidate::Active);
+                                        emit q->updated();
+                                        handleConnected(localUsedCandidate);
+                                    });
+                                    query->requestActivation(localUsedCandidate.jid(), sid, q->_pad->session()->peer());
+                                    query->go(true);
+                                },
+                                mode == Transport::Udp);
+                        } // else so it's remote proxy. let's just wait for <activated> from remote
+                    } else {
+                        c.setState(Candidate::Active);
                     }
-                } // else we have to wait till remote reports its status
-                else
-                    qDebug("checkAndFinishNegotiation not finished: remote didn't reported yet");
-                return;
+                }
+                if (c.state() == Candidate::Active) {
+                    handleConnected(c);
+                } else
+                    qDebug("checkAndFinishNegotiation not finished: preferred is not Active");
+            } else { // both sides reported candidate error
+                q->setState(State::Finished);
+                emit q->failed();
             }
+        }
 
+        void sendCandidateUsedOrError()
+        {
             qDebug("checkAndFinishNegotiation not finished: trying to send condidate-used/error if any");
             // if we are here then neither candidate-used nor candidate-error was sent to remote,
             // but we can send it now.
@@ -972,14 +948,14 @@ namespace XMPP { namespace Jingle { namespace S5B {
             // if we have connection to remote candidate it's time to send it
             if (hasConnectedRemoteCandidate) {
                 pendingActions |= Private::CandidateUsed;
-                qDebug("checkAndFinishNegotiation: used");
+                qDebug("sendCandidateUsedOrError: sending used");
                 emit q->updated();
                 return;
             }
 
             if (allRemoteDiscarded) {
                 pendingActions |= Private::CandidateError;
-                qDebug("checkAndFinishNegotiation: error");
+                qDebug("sendCandidateUsedOrError: sending error");
                 emit q->updated();
                 return;
             }
@@ -988,7 +964,48 @@ namespace XMPP { namespace Jingle { namespace S5B {
             // apparently we haven't connected anywhere but there are more remote candidates to try
         }
 
-        // take used-candidate with highest priority and discard all with lower. also update used candidates themselves
+        void checkAndFinishNegotiation()
+        {
+            // Why we can't send candidate-used/error right when this happens:
+            // so the situation: we discarded all remote candidates (failed to connect)
+            // but we have some local candidates which are still in Probing state (upnp for example)
+            // if we send candidate-error while we have unsent candidates this may trigger transport failure.
+            // So for candidate-error two conditions have to be met 1) all remote failed 2) all local were sent no
+            // more local candidates are expected to be discovered
+
+            if (q->_state != State::Connecting) { // if not started or already finished
+                qWarning("checkAndFinishNegotiation not finished: !connectionStarted || connection");
+                return;
+            }
+
+            // sort out already handled states or states which will bring us here a little later
+            if (waitingAck || pendingActions || hasUnaknowledgedLocalCandidates()) {
+                // waitingAck some query waits for ack and in the callback this func will be called again
+                // pendingActions means we reported to app we have data to send but the app didn't take this data
+                // yet, but as soon as it's taken it will switch to waitingAck. And with unacknowledged local
+                // candidates we can't send used/error as well as report connected()/failure() until tried them all
+                qDebug("checkAndFinishNegotiation not finished: waitingAck=%d || pendingActions=%x || "
+                       "hasUnaknowledgedLocalCandidates()=%d",
+                       int(waitingAck), int(pendingActions), int(hasUnaknowledgedLocalCandidates()));
+                return;
+            }
+
+            bool localFinished  = localReportedCandidateError || remoteUsedCandidate;
+            bool remoteFinished = remoteReportedCandidateError || localUsedCandidate;
+
+            if (!localFinished || !remoteFinished) {
+                qDebug("checkAndFinishNegotiation: local=%s remote=%s", localFinished ? "finished" : "in-progress",
+                       remoteFinished ? "finished" : "in-progress");
+                if (!localFinished)
+                    sendCandidateUsedOrError();
+                return;
+            }
+
+            onBothSidesFinished();
+        }
+
+        // take used-candidate with highest priority and discard all with lower. also update used candidates
+        // themselves
         void updateMinimalPriorityOnConnected()
         {
             quint32 prio = 0;
@@ -1021,7 +1038,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
                 remoteUsedCandidate = Candidate();
             }
             if (localUsedCandidate && remoteUsedCandidate) {
-                if (pad->session()->role() == Origin::Initiator) {
+                if (q->_pad->session()->role() == Origin::Initiator) {
                     // i'm initiator. see 2.4.4
                     localUsedCandidate.setState(Candidate::Discarded);
                     localUsedCandidate           = Candidate();
@@ -1087,12 +1104,12 @@ namespace XMPP { namespace Jingle { namespace S5B {
 
                                 // lock on to this sender
                                 udpAddress     = addr;
-                                udpPort        = sourcePort;
+                                udpPort        = quint16(sourcePort);
                                 udpInitialized = true;
 
                                 // reply that initialization was successful
-                                pad->session()->manager()->client()->s5bManager()->jtPush()->sendUDPSuccess(
-                                    pad->session()->peer(), key); // TODO fix ->->->
+                                q->_pad->session()->manager()->client()->s5bManager()->jtPush()->sendUDPSuccess(
+                                    q->_pad->session()->peer(), key); // TODO fix ->->->
                                 return true;
                             }
 
@@ -1132,6 +1149,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
             QTimer::singleShot(0, q, [this]() {
                 localCandidates.clear();
                 remoteCandidates.clear();
+                q->setState(State::Active);
                 emit q->connected();
             });
         }
@@ -1152,39 +1170,151 @@ namespace XMPP { namespace Jingle { namespace S5B {
             }
             checkAndFinishNegotiation();
         }
+
+        bool handleIncomingCandidate(const QDomElement &transportEl)
+        {
+            QString candidateTag(QStringLiteral("candidate"));
+            int     candidatesAdded = 0;
+            for (QDomElement ce = transportEl.firstChildElement(candidateTag); !ce.isNull();
+                 ce             = ce.nextSiblingElement(candidateTag)) {
+                Candidate c(q, ce);
+                if (!c) {
+                    throw std::runtime_error("failed to parse incoming candidate");
+                }
+                qDebug("new remote candidate: %s", qPrintable(c.toString()));
+                remoteCandidates.insert(c.cid(), c); // TODO check for collisions!
+                candidatesAdded++;
+            }
+            if (candidatesAdded) {
+                pendingActions &= ~CandidateError;
+                localReportedCandidateError = false;
+                QTimer::singleShot(0, q, [this]() { tryConnectToRemoteCandidate(); });
+                return true;
+            }
+            return false;
+        }
+
+        bool handleIncomingCandidateUsed(const QDomElement &transportEl)
+        {
+            QDomElement el = transportEl.firstChildElement(QStringLiteral("candidate-used"));
+            if (!el.isNull()) {
+                auto cUsed = localCandidates.value(el.attribute(QStringLiteral("cid")));
+                if (!cUsed) {
+                    throw std::runtime_error("failed to find incoming candidate-used candidate");
+                }
+                if (cUsed.state() == Candidate::Pending) {
+                    cUsed.setState(Candidate::Accepted);
+                    localUsedCandidate = cUsed;
+                    updateMinimalPriorityOnConnected();
+                    QTimer::singleShot(0, q, [this]() { checkAndFinishNegotiation(); });
+                } else {
+                    // we already rejected the candidate and either remote side already knows about it or will soon
+                    // it's possible for example if we were able to connect to higher priority candidate, so
+                    // we have o pretend like remote couldn't select anything better but finished already, in other
+                    // words like if it sent candidate-error.
+                    localUsedCandidate           = Candidate();
+                    remoteReportedCandidateError = true;
+                }
+                return true;
+            }
+            return false;
+        }
+
+        bool handleIncomingCandidateError(const QDomElement &transportEl)
+        {
+            auto el = transportEl.firstChildElement(QStringLiteral("candidate-error"));
+            if (!el.isNull()) {
+                remoteReportedCandidateError = true;
+                for (auto &c : localCandidates) {
+                    if (c.state() == Candidate::Pending) {
+                        c.setState(Candidate::Discarded);
+                    }
+                }
+                qDebug("recv candidate-error: all local pending candidates were discarded");
+                QTimer::singleShot(0, q, [this]() { checkAndFinishNegotiation(); });
+                return true;
+            }
+            return false;
+        }
+
+        bool handleIncomingActivated(const QDomElement &transportEl)
+        {
+            auto el = transportEl.firstChildElement(QStringLiteral("activated"));
+            if (!el.isNull()) {
+                QString cid = el.attribute(QStringLiteral("cid"));
+                if (cid.isEmpty()) {
+                    throw std::runtime_error("failed to find incoming activated candidate");
+                }
+                auto c = remoteUsedCandidate;
+                if (!(c.cid() == cid && c.type() == Candidate::Proxy && c.state() == Candidate::Accepted)) {
+                    qDebug("Received <activated> on a candidate in an inappropriate state. Ignored.");
+                    return true;
+                }
+                c.setState(Candidate::Active);
+                handleConnected(c);
+                return true;
+            }
+            return false;
+        }
+
+        bool handleIncomingProxyError(const QDomElement &transportEl)
+        {
+            auto el = transportEl.firstChildElement(QStringLiteral("proxy-error"));
+            if (!el.isNull()) {
+                auto c = localCandidates.value(el.attribute(QStringLiteral("cid")));
+                if (!c) {
+                    throw std::runtime_error("failed to find incoming proxy-error candidate");
+                }
+                if (c != localUsedCandidate || c.state() != Candidate::Accepted) {
+                    qDebug("Received <proxy-error> on a candidate in an inappropriate state. Ignored.");
+                    return true;
+                }
+
+                // if we got proxy-error then the transport has to be considered failed according to spec
+                // so never send proxy-error while we have unaknowledged local non-proxy candidates,
+                // but we have to follow the standard.
+
+                // Discard everything
+                for (auto &c : localCandidates) {
+                    c.setState(Candidate::Discarded);
+                }
+                for (auto &c : remoteCandidates) {
+                    c.setState(Candidate::Discarded);
+                }
+                proxyDiscoveryInProgress = false;
+                delete disco;
+
+                QTimer::singleShot(0, q, [this]() {
+                    q->setState(State::Finished);
+                    emit q->failed();
+                });
+                return true;
+            }
+            return false;
+        }
     };
 
-    Transport::Transport(const TransportManagerPad::Ptr &pad) : d(new Private)
+    Transport::Transport(const TransportManagerPad::Ptr &pad, Origin creator) :
+        XMPP::Jingle::Transport(pad, creator), d(new Private)
     {
-        d->q   = this;
-        d->pad = pad.staticCast<Pad>();
+        d->q = this;
         d->probingTimer.setSingleShot(true);
         d->negotiationFinishTimer.setSingleShot(true);
         d->negotiationFinishTimer.setInterval(5000); // TODO select the value smart way
         connect(&d->probingTimer, &QTimer::timeout, [this]() { d->tryConnectToRemoteCandidate(); });
         connect(&d->negotiationFinishTimer, &QTimer::timeout, this, [this]() { d->handleNegotiationTimeout(); });
-        connect(pad->manager(), &TransportManager::abortAllRequested, this, [this]() {
+        connect(_pad->manager(), &TransportManager::abortAllRequested, this, [this]() {
             d->aborted = true;
+            _state     = State::Finished;
             emit failed();
         });
     }
 
-    Transport::Transport(const TransportManagerPad::Ptr &pad, const QDomElement &transportEl) :
-        Transport::Transport(pad)
-    {
-        d->meCreator = false;
-        d->sid       = transportEl.attribute(QStringLiteral("sid"));
-        if (d->sid.isEmpty() || !update(transportEl)) {
-            d.reset();
-            return;
-        }
-    }
-
     Transport::~Transport()
     {
         if (d) {
             // TODO unregister sid too
-            static_cast<Manager *>(d->pad->manager())->removeKeyMapping(d->directAddr);
+            static_cast<Manager *>(_pad.staticCast<Pad>()->manager())->removeKeyMapping(d->directAddr);
             for (auto &c : d->remoteCandidates) {
                 c.deleteSocksClient();
             }
@@ -1197,19 +1327,20 @@ namespace XMPP { namespace Jingle { namespace S5B {
         }
     }
 
-    TransportManagerPad::Ptr Transport::pad() const { return d->pad.staticCast<TransportManagerPad>(); }
-
     void Transport::prepare()
     {
-        auto m = static_cast<Manager *>(d->pad->manager());
-        if (d->meCreator) {
-            d->sid = d->pad->generateSid();
+        qDebug("Prepare local offer");
+        setState(State::ApprovedToSend);
+        auto m = static_cast<Manager *>(_pad.staticCast<Pad>()->manager());
+        if (_creator == _pad->session()->role()) { // I'm creator
+            d->sid = _pad.staticCast<Pad>()->generateSid();
         }
-        d->pad->registerSid(d->sid);
-        d->directAddr = makeKey(d->sid, d->pad->session()->initiator(), d->pad->session()->responder());
+        _pad.staticCast<Pad>()->registerSid(d->sid);
+        d->directAddr = makeKey(d->sid, _pad.staticCast<Pad>()->session()->initiator(),
+                                _pad.staticCast<Pad>()->session()->responder());
         m->addKeyMapping(d->directAddr, this);
 
-        auto scope = d->pad->discoScope();
+        auto scope = _pad.staticCast<Pad>()->discoScope();
         d->disco   = scope->disco(); // FIXME store and handle signale. delete when not needed
 
         connect(d->disco, &TcpPortDiscoverer::portAvailable, this, [this]() { d->onLocalServerDiscovered(); });
@@ -1220,10 +1351,11 @@ namespace XMPP { namespace Jingle { namespace S5B {
         emit updated();
     }
 
-    // we got content acceptance from any side and not can connect
+    // we got content acceptance from any side and now can connect
     void Transport::start()
     {
-        d->transportStarted = true;
+        qDebug("Starting connecting");
+        setState(State::Connecting);
         d->tryConnectToRemoteCandidate();
         // if there is no higher priority candidates than ours but they are already connected then
         d->checkAndFinishNegotiation();
@@ -1244,102 +1376,24 @@ namespace XMPP { namespace Jingle { namespace S5B {
         if (!dstaddr.isEmpty()) {
             d->dstaddr = dstaddr;
         }
-        QString candidateTag(QStringLiteral("candidate"));
-        int     candidatesAdded = 0;
-        for (QDomElement ce = transportEl.firstChildElement(candidateTag); !ce.isNull();
-             ce             = ce.nextSiblingElement(candidateTag)) {
-            Candidate c(this, ce);
-            if (!c) {
-                return false;
-            }
-            d->remoteCandidates.insert(c.cid(), c); // TODO check for collisions!
-            candidatesAdded++;
-        }
-        if (candidatesAdded) {
-            d->pendingActions &= ~Private::CandidateError;
-            d->localReportedCandidateError = false;
-            QTimer::singleShot(0, this, [this]() { d->tryConnectToRemoteCandidate(); });
-            return true;
-        }
-
-        QDomElement el = transportEl.firstChildElement(QStringLiteral("candidate-used"));
-        if (!el.isNull()) {
-            auto cUsed = d->localCandidates.value(el.attribute(QStringLiteral("cid")));
-            if (!cUsed) {
-                return false;
-            }
-            if (cUsed.state() == Candidate::Pending) {
-                cUsed.setState(Candidate::Accepted);
-                d->localUsedCandidate = cUsed;
-                d->updateMinimalPriorityOnConnected();
-                QTimer::singleShot(0, this, [this]() { d->checkAndFinishNegotiation(); });
-            } else {
-                // we already rejected the candidate and either remote side already knows about it or will soon
-                // it's possible for example if we were able to connect to higher priority candidate, so
-                // we have o pretend like remote couldn't select anything better but finished already, in other words
-                // like if it sent candidate-error.
-                d->localUsedCandidate           = Candidate();
-                d->remoteReportedCandidateError = true;
-            }
-            return true;
-        }
 
-        el = transportEl.firstChildElement(QStringLiteral("candidate-error"));
-        if (!el.isNull()) {
-            d->remoteReportedCandidateError = true;
-            for (auto &c : d->localCandidates) {
-                if (c.state() == Candidate::Pending) {
-                    c.setState(Candidate::Discarded);
+        try {
+            if (d->handleIncomingCandidate(transportEl) || d->handleIncomingCandidateUsed(transportEl)
+                || d->handleIncomingCandidateError(transportEl) || d->handleIncomingActivated(transportEl)
+                || d->handleIncomingProxyError(transportEl)) {
+                if (_state == State::Created && _creator != _pad->session()->role()) {
+                    // initial incoming transport
+                    setState(State::Pending);
+                }
+                if (_state == State::Pending && _creator == _pad->session()->role()) {
+                    // initial acceptance by remote of the local transport
+                    setState(State::Accepted);
                 }
-            }
-            qDebug("recv candidate-error: all local pending candidates were discarded");
-            QTimer::singleShot(0, this, [this]() { d->checkAndFinishNegotiation(); });
-            return true;
-        }
-
-        el = transportEl.firstChildElement(QStringLiteral("activated"));
-        if (!el.isNull()) {
-            QString cid = el.attribute(QStringLiteral("cid"));
-            if (cid.isEmpty()) {
-                return false;
-            }
-            auto c = d->remoteUsedCandidate;
-            if (!(c.cid() == cid && c.type() == Candidate::Proxy && c.state() == Candidate::Accepted)) {
-                qDebug("Received <activated> on a candidate in an inappropriate state. Ignored.");
-                return true;
-            }
-            c.setState(Candidate::Active);
-            d->handleConnected(c);
-            return true;
-        }
-
-        el = transportEl.firstChildElement(QStringLiteral("proxy-error"));
-        if (!el.isNull()) {
-            auto c = d->localCandidates.value(el.attribute(QStringLiteral("cid")));
-            if (!c) {
-                return false;
-            }
-            if (c != d->localUsedCandidate || c.state() != Candidate::Accepted) {
-                qDebug("Received <proxy-error> on a candidate in an inappropriate state. Ignored.");
                 return true;
             }
-
-            // if we got proxy-error then the transport has to be considered failed according to spec
-            // so never send proxy-error while we have unaknowledged local non-proxy candidates,
-            // but we have to follow the standard.
-
-            // Discard everything
-            for (auto &c : d->localCandidates) {
-                c.setState(Candidate::Discarded);
-            }
-            for (auto &c : d->remoteCandidates) {
-                c.setState(Candidate::Discarded);
-            }
-            d->proxyDiscoveryInProgress = false;
-            delete d->disco;
-
-            QTimer::singleShot(0, this, [this]() { emit failed(); });
-            return true;
+        } catch (std::runtime_error &e) {
+            qWarning("Transport updated failed: %s", e.what());
+            return false;
         }
 
         // Seems like we got an empty transport. It's still valid though.
@@ -1348,42 +1402,46 @@ namespace XMPP { namespace Jingle { namespace S5B {
         return true;
     }
 
-    bool Transport::isInitialOfferReady() const
-    {
-        return isValid()
-            && (d->pendingActions || d->offerSent
-                || (d->localCandidates.isEmpty() && !d->proxyDiscoveryInProgress
-                    && !(d->disco && d->disco->inProgressPortTypes())));
-    }
-
-    OutgoingTransportInfoUpdate Transport::takeInitialOffer()
-    {
-        d->offerSent = true;
-        auto upd     = takeOutgoingUpdate();
-        auto tel     = std::get<0>(upd);
-
-        if (d->meCreator && d->mode != Tcp) {
-            tel.setAttribute(QStringLiteral("mode"), "udp");
-        }
-        tel.setAttribute(QString::fromLatin1("block-size"), qulonglong(d->blockSize));
-
-        return upd;
-    }
-
     bool Transport::hasUpdates() const { return isValid() && d->pendingActions; }
 
     OutgoingTransportInfoUpdate Transport::takeOutgoingUpdate()
     {
+        qDebug("taking outgoing update");
         OutgoingTransportInfoUpdate upd;
         if (!isValid()) {
             return upd;
         }
 
-        auto doc = d->pad->session()->manager()->client()->doc();
+        auto makeUpdate = [&](QDomElement tel, std::function<void()> cb = std::function<void()>()) {
+            d->waitingAck = true;
+            return OutgoingTransportInfoUpdate { tel, [this, cb, trptr = QPointer<Transport>(d->q)](bool success) {
+                                                    if (!success || !trptr)
+                                                        return;
+                                                    d->waitingAck = false;
+                                                    if (cb)
+                                                        cb();
+                                                } };
+        };
+
+        auto doc = _pad.staticCast<Pad>()->session()->manager()->client()->doc();
 
         QDomElement tel = doc->createElementNS(NS, "transport");
         tel.setAttribute(QStringLiteral("sid"), d->sid);
 
+        // check where we make initial offer
+        bool noPending = (d->localCandidates.isEmpty() && !d->proxyDiscoveryInProgress
+                          && !(d->disco && d->disco->inProgressPortTypes()));
+        bool initial   = _state == State::ApprovedToSend && !d->offerSent
+            && ((!d->pendingActions && noPending) || d->pendingActions & Private::NewCandidate);
+
+        if (initial) {
+            if (_creator == _pad->session()->role() && d->mode != Tcp) {
+                tel.setAttribute(QStringLiteral("mode"), "udp");
+            }
+            tel.setAttribute(QString::fromLatin1("block-size"), qulonglong(d->blockSize));
+            d->offerSent = true;
+        }
+
         if (d->pendingActions & Private::NewCandidate) {
             d->pendingActions &= ~Private::NewCandidate;
             bool             useProxy = false;
@@ -1401,25 +1459,23 @@ namespace XMPP { namespace Jingle { namespace S5B {
                 c.setState(Candidate::Unacked);
             }
             if (useProxy) {
-                QString dstaddr = makeKey(d->sid, d->pad->session()->me(), d->pad->session()->peer());
+                QString dstaddr = makeKey(d->sid, _pad.staticCast<Pad>()->session()->manager()->client()->jid(),
+                                          _pad.staticCast<Pad>()->session()->peer());
                 tel.setAttribute(QStringLiteral("dstaddr"), dstaddr);
             }
             if (!candidatesToSend.isEmpty()) {
-                d->waitingAck = true;
-                QPointer<Transport> trptr(d->q);
-                upd = OutgoingTransportInfoUpdate { tel, [this, candidatesToSend, trptr = std::move(trptr)]() mutable {
-                                                       if (!trptr)
-                                                           return;
-                                                       d->waitingAck= false;
-                                                       for (auto &c : candidatesToSend) {
-                                                           if (c.state() == Candidate::Unacked) {
-                                                               c.setState(Candidate::Pending);
-                                                               qDebug("ack: sending local candidate: cid=%s",
-                                                                      qPrintable(c.cid()));
-                                                           }
-                                                       }
-                                                       d->checkAndFinishNegotiation();
-                                                   } };
+                upd = makeUpdate(tel, [this, candidatesToSend, initial]() mutable {
+                    if (initial) {
+                        _state = _creator == _pad->session()->role() ? State::Pending : State::Accepted;
+                    }
+                    for (auto &c : candidatesToSend) {
+                        if (c.state() == Candidate::Unacked) {
+                            c.setState(Candidate::Pending);
+                            qDebug("ack: sending local candidate: cid=%s", qPrintable(c.cid()));
+                        }
+                    }
+                    d->checkAndFinishNegotiation();
+                });
             } else {
                 qWarning("Got NewCandidate pending action but no candidate to send");
             }
@@ -1436,21 +1492,14 @@ namespace XMPP { namespace Jingle { namespace S5B {
                 el.setAttribute(QStringLiteral("cid"), c.cid());
                 c.setState(Candidate::Unacked);
 
-                d->waitingAck = true;
-                QPointer<Transport> trptr(d->q);
-                upd = OutgoingTransportInfoUpdate { tel, [this, c, trptr = std::move(trptr)]() mutable {
-                                                       if (!trptr)
-                                                           return;
-                                                       d->waitingAck= false;
-                                                       if (c.state() == Candidate::Unacked) {
-                                                           c.setState(Candidate::Accepted);
-                                                           qDebug("ack: sending candidate-used: cid=%s",
-                                                                  qPrintable(c.cid()));
-                                                           d->remoteUsedCandidate = c;
-                                                       }
-                                                       d->checkAndFinishNegotiation();
-                                                   } };
-
+                upd = makeUpdate(tel, [this, c]() mutable {
+                    if (c.state() == Candidate::Unacked) {
+                        c.setState(Candidate::Accepted);
+                        qDebug("ack: sending candidate-used: cid=%s", qPrintable(c.cid()));
+                        d->remoteUsedCandidate = c;
+                    }
+                    d->checkAndFinishNegotiation();
+                });
                 break;
             }
             if (std::get<0>(upd).isNull()) {
@@ -1461,15 +1510,10 @@ namespace XMPP { namespace Jingle { namespace S5B {
             qDebug("sending candidate-error");
             // we are here because all remote are already in Discardd state
             tel.appendChild(doc->createElement(QStringLiteral("candidate-error")));
-            d->waitingAck = true;
-            QPointer<Transport> trptr(d->q);
-            upd = OutgoingTransportInfoUpdate { tel, [this, trptr = std::move(trptr)]() mutable {
-                                                   if (!trptr)
-                                                       return;
-                                                   d->waitingAck= false;
-                                                   d->localReportedCandidateError= true;
-                                                   d->checkAndFinishNegotiation();
-                                               } };
+            upd = makeUpdate(tel, [this]() mutable {
+                d->localReportedCandidateError = true;
+                d->checkAndFinishNegotiation();
+            });
         } else if (d->pendingActions & Private::Activated) {
             d->pendingActions &= ~Private::Activated;
             if (d->localUsedCandidate) {
@@ -1477,13 +1521,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
                 qDebug("sending activated: cid=%s", qPrintable(cand.cid()));
                 auto el = tel.appendChild(doc->createElement(QStringLiteral("activated"))).toElement();
                 el.setAttribute(QStringLiteral("cid"), cand.cid());
-                d->waitingAck = true;
-                QPointer<Transport> trptr(d->q);
-                upd = OutgoingTransportInfoUpdate { tel, [this, cand, trptr = std::move(trptr)]() mutable {
-                                                       qDebug("ack: sending activated: cid=%s", qPrintable(cand.cid()));
-                                                       if (trptr)
-                                                           d->waitingAck = false;
-                                                   } };
+                upd = makeUpdate(tel);
             }
         } else if (d->pendingActions & Private::ProxyError) {
             // we send proxy error only for local proxy
@@ -1491,35 +1529,27 @@ namespace XMPP { namespace Jingle { namespace S5B {
             if (d->localUsedCandidate) {
                 auto cand = d->localUsedCandidate;
                 tel.appendChild(doc->createElement(QStringLiteral("proxy-error")));
-                d->waitingAck = true;
                 qDebug("sending proxy error: cid=%s", qPrintable(cand.cid()));
-                QPointer<Transport> trptr(d->q);
-                upd = OutgoingTransportInfoUpdate {
-                    tel,
-                    [this, cand, trptr = std::move(trptr)]() mutable {
-                        if (!trptr)
-                            return;
-                        d->waitingAck = false;
-                        qDebug("ack: sending proxy error: cid=%s", qPrintable(cand.cid()));
-                        if (cand.state() != Candidate::Accepted || d->localUsedCandidate != cand) {
-                            return; // seems like state was changed while we was waiting for an ack
-                        }
-                        cand.setState(Candidate::Discarded);
-                        d->localUsedCandidate = Candidate();
-                        emit failed();
+                upd = makeUpdate(tel, [this, cand]() mutable {
+                    qDebug("ack: sending proxy error: cid=%s", qPrintable(cand.cid()));
+                    if (cand.state() != Candidate::Accepted || d->localUsedCandidate != cand) {
+                        return; // seems like state was changed while we was waiting for an ack
                     }
-                };
+                    cand.setState(Candidate::Discarded);
+                    d->localUsedCandidate = Candidate();
+                    _state                = State::Finished;
+                    emit failed();
+                });
             } else {
                 qWarning("Got ProxyError pending action but no local used candidate is not set");
             }
         } else {
             qDebug("sending empty transport-info");
-            d->waitingAck = true;
-            QPointer<Transport> trptr(d->q);
-            upd = OutgoingTransportInfoUpdate { tel, [this, trptr = std::move(trptr)]() mutable {
-                                                   if (trptr)
-                                                       d->waitingAck = false;
-                                               } };
+            upd = makeUpdate(tel, [this, initial]() mutable {
+                if (initial) {
+                    _state = _creator == _pad->session()->role() ? State::Pending : State::Accepted;
+                }
+            });
         }
 
         return upd; // TODO
@@ -1527,7 +1557,10 @@ namespace XMPP { namespace Jingle { namespace S5B {
 
     bool Transport::isValid() const { return d != nullptr; }
 
-    Transport::Features Transport::features() const { return Features(HardToConnect | Reliable | Fast); }
+    TransportFeatures Transport::features() const
+    {
+        return TransportFeatures(TransportFeature::HardToConnect | TransportFeature::Reliable | TransportFeature::Fast);
+    }
 
     QString Transport::sid() const { return d->sid; }
 
@@ -1558,7 +1591,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
             d->jingleManager->unregisterTransport(NS);
     }
 
-    Transport::Features Manager::features() const { return Transport::Reliable | Transport::Fast; }
+    TransportFeatures Manager::features() const { return TransportFeature::Reliable | TransportFeature::Fast; }
 
     void Manager::setJingleManager(XMPP::Jingle::Manager *jm)
     {
@@ -1571,7 +1604,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
                 return;
             auto jt = d->jingleManager->client()->s5bManager()->jtPush();
             connect(jt, &JT_PushS5B::incomingUDPSuccess, this, [this](const Jid &from, const QString &dstaddr) {
-                Q_UNUSED(from);
+                Q_UNUSED(from)
                 auto t = d->key2transport.value(dstaddr);
                 if (t) {
                     // TODO return t->incomingUDPSuccess(from);
@@ -1580,20 +1613,9 @@ namespace XMPP { namespace Jingle { namespace S5B {
         });
     }
 
-    QSharedPointer<XMPP::Jingle::Transport> Manager::newTransport(const TransportManagerPad::Ptr &pad)
+    QSharedPointer<XMPP::Jingle::Transport> Manager::newTransport(const TransportManagerPad::Ptr &pad, Origin creator)
     {
-        return QSharedPointer<XMPP::Jingle::Transport>(new Transport(pad));
-    }
-
-    QSharedPointer<XMPP::Jingle::Transport> Manager::newTransport(const TransportManagerPad::Ptr &pad,
-                                                                  const QDomElement &             transportEl)
-    {
-        auto                                    t = new Transport(pad, transportEl);
-        QSharedPointer<XMPP::Jingle::Transport> ret(t);
-        if (t->isValid()) {
-            return ret;
-        }
-        return QSharedPointer<XMPP::Jingle::Transport>();
+        return QSharedPointer<Transport>::create(pad, creator).staticCast<XMPP::Jingle::Transport>();
     }
 
     TransportManagerPad *Manager::pad(Session *session) { return new Pad(this, session); }
diff --git a/src/xmpp/xmpp-im/jingle-s5b.h b/src/xmpp/xmpp-im/jingle-s5b.h
index 482c4f70..6b71d91f 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.h
+++ b/src/xmpp/xmpp-im/jingle-s5b.h
@@ -20,7 +20,7 @@
 #ifndef JINGLE_S5B_H
 #define JINGLE_S5B_H
 
-#include "jingle.h"
+#include "jingle-transport.h"
 #include "tcpportreserver.h"
 
 class QHostAddress;
@@ -128,21 +128,16 @@ namespace Jingle { namespace S5B {
     public:
         enum Mode { Tcp, Udp };
 
-        Transport(const TransportManagerPad::Ptr &pad);
-        Transport(const TransportManagerPad::Ptr &pad, const QDomElement &transportEl);
-        ~Transport();
-
-        TransportManagerPad::Ptr pad() const override;
+        Transport(const TransportManagerPad::Ptr &pad, Origin creator);
+        ~Transport() override;
 
         void                        prepare() override;
         void                        start() override;
         bool                        update(const QDomElement &transportEl) override;
-        bool                        isInitialOfferReady() const override;
-        OutgoingTransportInfoUpdate takeInitialOffer() override;
         bool                        hasUpdates() const override;
         OutgoingTransportInfoUpdate takeOutgoingUpdate() override;
         bool                        isValid() const override;
-        Features                    features() const override;
+        TransportFeatures           features() const override;
 
         QString         sid() const;
         QString         directAddr() const;
@@ -181,14 +176,12 @@ namespace Jingle { namespace S5B {
         Q_OBJECT
     public:
         Manager(QObject *parent = nullptr);
-        ~Manager();
+        ~Manager() override;
 
-        XMPP::Jingle::Transport::Features       features() const override;
+        XMPP::Jingle::TransportFeatures         features() const override;
         void                                    setJingleManager(XMPP::Jingle::Manager *jm) override;
-        QSharedPointer<XMPP::Jingle::Transport> newTransport(const TransportManagerPad::Ptr &pad)
-            override; // outgoing. one have to call Transport::start to collect candidates
         QSharedPointer<XMPP::Jingle::Transport> newTransport(const TransportManagerPad::Ptr &pad,
-                                                             const QDomElement &transportEl) override; // incoming
+                                                             Origin                          creator) override;
         TransportManagerPad *                   pad(Session *session) override;
 
         void closeAll() override;
diff --git a/src/xmpp/xmpp-im/jingle-session.cpp b/src/xmpp/xmpp-im/jingle-session.cpp
new file mode 100644
index 00000000..34e2ee59
--- /dev/null
+++ b/src/xmpp/xmpp-im/jingle-session.cpp
@@ -0,0 +1,1111 @@
+/*
+ * jignle-session.cpp - Jingle Session
+ * Copyright (C) 2019  Sergey Ilinykh
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "jingle-session.h"
+
+#include "jingle-application.h"
+#include "xmpp/jid/jid.h"
+#include "xmpp_client.h"
+#include "xmpp_task.h"
+#include "xmpp_xmlcommon.h"
+
+#include <QPointer>
+#include <QTimer>
+
+namespace XMPP { namespace Jingle {
+    //----------------------------------------------------------------------------
+    // JT - Jingle Task
+    //----------------------------------------------------------------------------
+    class JT : public Task {
+        Q_OBJECT
+
+        QDomElement iq_;
+        Jid         to_;
+
+    public:
+        JT(Task *parent) : Task(parent) {}
+
+        ~JT() {}
+
+        void request(const Jid &to, const QDomElement &jingleEl)
+        {
+            to_ = to;
+            iq_ = createIQ(doc(), "set", to.full(), id());
+            iq_.appendChild(jingleEl);
+        }
+
+        void onGo() { send(iq_); }
+
+        bool take(const QDomElement &x)
+        {
+            if (!iqVerify(x, to_, id()))
+                return false;
+
+            if (x.attribute("type") == "error") {
+                setError(x);
+            } else {
+                setSuccess();
+            }
+            return true;
+        }
+    };
+
+    //----------------------------------------------------------------------------
+    // Session
+    //----------------------------------------------------------------------------
+    class Session::Private {
+    public:
+        Session *q;
+        Manager *manager;
+        QTimer   stepTimer;
+        State    state = State::Created; // state of session on our side. if it's incoming we start from Created anyaway
+                                         // but Pending state is skipped
+        Origin                                             role = Origin::Initiator; // my role in the session
+        XMPP::Stanza::Error                                lastError;
+        Reason                                             terminateReason;
+        QMap<QString, QWeakPointer<ApplicationManagerPad>> applicationPads;
+        QMap<QString, QWeakPointer<TransportManagerPad>>   transportPads;
+        QMap<ContentKey, Application *>                    contentList;
+        QSet<Application *>                                signalingContent;
+        QList<Application *>
+            initialIncomingUnacceptedContent; // not yet acccepted applications from initial incoming request
+
+        // session level updates. session-info for example or some rejected apps
+        QHash<Action, OutgoingUpdate> outgoingUpdates;
+
+        QString sid;
+        Jid     origFrom;   // "from" attr of IQ.
+        Jid     otherParty; // either "from" or initiator/responder. it's where to send all requests.
+        Jid     localParty; // that one will be set as initiator/responder if provided
+        bool    waitingAck = false;
+
+        void setSessionFinished()
+        {
+            state = State::Finished;
+            emit q->terminated();
+            signalingContent.clear();
+            for (auto &c : contentList) {
+                if (c->state() != State::Finished) {
+                    c->setState(State::Finished);
+                }
+            }
+            auto vals = contentList.values();
+            contentList.clear();
+            while (vals.size()) {
+                vals.takeLast()->deleteLater();
+            }
+            q->deleteLater();
+        }
+
+        void sendJingle(Action action, QList<QDomElement> update,
+                        std::function<void(bool)> callback = std::function<void(bool)>())
+        {
+            QDomDocument &doc = *manager->client()->doc();
+            Jingle        jingle(action, sid);
+            if (action == Action::SessionInitiate) {
+                jingle.setInitiator(manager->client()->jid());
+            }
+            if (action == Action::SessionAccept) {
+                jingle.setResponder(manager->client()->jid());
+            }
+            auto xml = jingle.toXml(&doc);
+
+            for (const QDomElement &e : update) {
+                xml.appendChild(e);
+            }
+
+            auto jt = new JT(manager->client()->rootTask());
+            jt->request(otherParty, xml);
+            QObject::connect(jt, &JT::finished, q, [jt, jingle, callback, this]() {
+                waitingAck = false;
+                if (callback) {
+                    callback(jt->success());
+                }
+                if (jt->success()) {
+                    planStep();
+                } else {
+                    lastError = jt->error();
+                    if (ErrorUtil::jingleCondition(lastError) != ErrorUtil::TieBreak)
+                        setSessionFinished();
+                    else
+                        planStep();
+                }
+            });
+            waitingAck = true;
+            jt->go(true);
+        }
+
+        void planStep()
+        {
+            if (waitingAck) {
+                return;
+            }
+            lastError = Stanza::Error(0, 0);
+            if (!stepTimer.isActive()) {
+                stepTimer.start();
+            }
+        }
+
+        void doStep()
+        {
+            if (waitingAck) { // we will return here when ack is received. Session::Unacked is possible also only with
+                              // waitingAck
+                return;
+            }
+            if (terminateReason.condition() && state != State::Finished) {
+                if (state != State::Created || role == Origin::Responder) {
+                    sendJingle(Action::SessionTerminate,
+                               QList<QDomElement>() << terminateReason.toXml(manager->client()->doc()));
+                }
+                setSessionFinished();
+                return;
+            }
+            if (state == State::Created || state == State::Finished) {
+                return; // we will start doing something when initiate() is called
+            }
+
+            if (outgoingUpdates.size()) {
+                auto it       = outgoingUpdates.begin();
+                auto action   = it.key();
+                auto updates  = it.value();
+                auto elements = std::get<0>(updates);
+                auto cb       = std::get<1>(updates);
+                outgoingUpdates.erase(it);
+                sendJingle(action, elements, [this, cb](bool success) {
+                    if (cb) {
+                        cb(success);
+                    }
+                    planStep();
+                });
+                return;
+            }
+
+            typedef std::tuple<QPointer<Application>, OutgoingUpdateCB> AckHndl; // will be used from callback on iq ack
+            if (state == State::ApprovedToSend) { // we are going to send session-initiate/accept (already accepted
+                                                  // by the user but not sent yet)
+                /*
+                 * For session-initiate everything is prety much straightforward, just any content with
+                 * Action::ContentAdd update type has to be added. But with session-accept things are more complicated
+                 *   1. Local client could add its content. So we have to check content origin too.
+                 *   2. Remote client could add more content before local session-accept. Then we have two options
+                 *         a) send content-accept and skip this content in session-accept later
+                 *         b) don't send content-accept and accept everything with session-accept
+                 *      We prefer option (b) in our implementation.
+                 */
+                if (role == Origin::Responder) {
+                    for (const auto &c : initialIncomingUnacceptedContent) {
+                        auto out = c->evaluateOutgoingUpdate();
+                        if (out.action == Action::ContentReject) {
+                            lastError
+                                = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
+                            setSessionFinished();
+                            return;
+                        }
+                        if (out.action != Action::ContentAccept) {
+                            return; // keep waiting.
+                        }
+                    }
+                } else {
+                    for (const auto &c : contentList) {
+                        auto out = c->evaluateOutgoingUpdate();
+                        if (out.action == Action::ContentRemove) {
+                            lastError
+                                = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
+                            setSessionFinished();
+                            return;
+                        }
+                        if (out.action != Action::ContentAdd) {
+                            return; // keep waiting.
+                        }
+                    }
+                }
+                Action actionToSend = Action::SessionAccept;
+                State  finalState   = State::Active;
+                // so all contents is ready for session-initiate. let's do it
+                if (role == Origin::Initiator) {
+                    sid          = manager->registerSession(q);
+                    actionToSend = Action::SessionInitiate;
+                    finalState   = State::Pending;
+                }
+
+                QList<QDomElement> contents;
+                QList<AckHndl>     acceptApps;
+                for (const auto &app : contentList) {
+                    QList<QDomElement> xml;
+                    OutgoingUpdateCB   callback;
+                    std::tie(xml, callback) = app->takeOutgoingUpdate();
+                    contents += xml;
+                    // p->setState(State::Unacked);
+                    if (callback) {
+                        acceptApps.append(AckHndl { app, callback });
+                    }
+                }
+                state = State::Unacked;
+                sendJingle(actionToSend, contents, [this, acceptApps, finalState](bool success) {
+                    if (!success)
+                        return; // TODO any error means session error. but for content-add error handling has to be
+                                // moved out of sendJingle
+                    state = finalState;
+                    for (const auto &h : acceptApps) {
+                        auto app      = std::get<0>(h);
+                        auto callback = std::get<1>(h);
+                        if (app) {
+                            callback(true);
+                            if (role == Origin::Responder) {
+                                app->start();
+                            }
+                        }
+                    }
+                    if (finalState == State::Active) {
+                        emit q->activated();
+                    }
+                    planStep();
+                });
+
+                return;
+            }
+
+            // So session is either in State::Pending or State::Active here.
+            // State::Connecting status is skipped for session.
+            QList<QDomElement> updateXml;
+            for (auto mp : applicationPads) {
+                auto        p  = mp.toStrongRef();
+                QDomElement el = p->takeOutgoingSessionInfoUpdate();
+                if (!el.isNull()) {
+                    updateXml.append(el);
+                    // we can send session-info for just one application. so stop processing
+                    sendJingle(Action::SessionInfo, updateXml, [this](bool success) {
+                        if (!success)
+                            qWarning("failure for session-info is ignored");
+                        planStep();
+                    });
+                    return;
+                }
+            }
+
+            QMultiMap<Application::Update, Application *> updates;
+
+            for (auto app : signalingContent) {
+                auto updateType = app->evaluateOutgoingUpdate();
+                if (updateType.action != Action::NoAction) {
+                    updates.insert(updateType, app);
+                }
+            }
+
+            QList<AckHndl> acceptApps;
+            if (updates.size()) {
+                auto upd  = updates.begin().key(); // NOTE maybe some actions have more priority than others
+                auto apps = updates.values(upd);
+                for (auto app : apps) {
+                    QList<QDomElement> xml;
+                    OutgoingUpdateCB   callback;
+                    std::tie(xml, callback) = app->takeOutgoingUpdate();
+                    updateXml += xml;
+                    if (callback) {
+                        acceptApps.append(AckHndl { app, callback });
+                    }
+                }
+                sendJingle(upd.action, updateXml, [this, acceptApps](bool success) {
+                    for (const auto &h : acceptApps) {
+                        auto app      = std::get<0>(h);
+                        auto callback = std::get<1>(h);
+                        if (app) {
+                            callback(success);
+                        }
+                    }
+                    planStep();
+                });
+            }
+        }
+
+        Reason reason(const QDomElement &jingleEl)
+        {
+            QDomElement re = jingleEl.firstChildElement(QLatin1String("reason"));
+            Reason      reason;
+            if (!re.isNull()) {
+                reason = Reason(re);
+                if (!reason.isValid()) {
+                    qDebug("invalid reason");
+                }
+            }
+            return reason;
+        }
+
+        using TransportResult = std::tuple<bool, Reason::Condition, QSharedPointer<Transport>>;
+        TransportResult parseIncomingTransport(const QDomElement &contentEl)
+        {
+            auto    tel = contentEl.firstChildElement(QLatin1String("transport"));
+            QString transportNS;
+            if (tel.isNull() || (transportNS = tel.namespaceURI()).isEmpty()) {
+                TransportResult { false, Reason::NoReason, nullptr };
+            }
+            auto trPad = q->transportPadFactory(transportNS);
+            if (!trPad) {
+                return TransportResult { true, Reason::UnsupportedTransports, nullptr };
+            }
+            auto transport = trPad->manager()->newTransport(trPad, negateOrigin(role));
+            if (transport && transport->update(tel)) {
+                return TransportResult { true, Reason::NoReason, transport };
+            }
+            return TransportResult { false, Reason::NoReason, nullptr };
+        }
+
+        void addAndInitContent(Origin creator, Application *content)
+        {
+            contentList.insert(ContentKey { content->contentName(), creator }, content);
+            if (state != State::Created && content->evaluateOutgoingUpdate().action != Action::NoAction) {
+                signalingContent.insert(content);
+            }
+            QObject::connect(content, &Application::updated, q, [this, content]() {
+                signalingContent.insert(content);
+                planStep();
+            });
+            QObject::connect(content, &Application::destroyed, q, [this, content]() {
+                signalingContent.remove(content);
+                initialIncomingUnacceptedContent.removeOne(content);
+                for (auto it = contentList.begin(); it != contentList.end(); ++it) { // optimize for large lists?
+                    if (it.value() == content) {
+                        contentList.erase(it);
+                        break;
+                    }
+                }
+            });
+        }
+
+        enum AddContentError { Ok, Unparsed, Unexpected, Unsupported };
+
+        std::tuple<AddContentError, Reason::Condition, Application *> parseContentAdd(const QDomElement &ce)
+        {
+            QDomElement descriptionEl = ce.firstChildElement(QLatin1String("description"));
+            QString     descriptionNS = descriptionEl.namespaceURI();
+            typedef std::tuple<AddContentError, Reason::Condition, Application *> result;
+
+            ContentBase c(ce);
+            auto        trpr = parseIncomingTransport(ce);
+            if (!c.isValid() || descriptionEl.isNull() || descriptionNS.isEmpty() || !std::get<0>(trpr)) {
+                return result { Unparsed, Reason::Success, nullptr };
+            }
+
+            auto appPad   = q->applicationPadFactory(descriptionNS);
+            auto trReason = std::get<1>(trpr);
+            if (!appPad || trReason != Reason::NoReason) {
+                return result { Unsupported, trReason == Reason::NoReason ? Reason::UnsupportedApplications : trReason,
+                                nullptr };
+            }
+            QScopedPointer<Application> app(appPad->manager()->startApplication(appPad, c.name, c.creator, c.senders));
+
+            auto descErr = app->setRemoteOffer(descriptionEl);
+            if (descErr == Application::IncompatibleParameters) {
+                return result { Unsupported, Reason::IncompatibleParameters, nullptr };
+            } else if (descErr == Application::Unparsed) {
+                return result { Unparsed, Reason::Success, nullptr };
+            }
+
+            if (app->setTransport(std::get<2>(trpr))) {
+                return result { Ok, Reason::Success, app.take() };
+            }
+            // TODO We can do transport-replace in all cases where std::get<1>(trpr) != NoReason
+            return result { Unsupported, Reason::IncompatibleParameters, app.take() };
+        }
+
+        typedef std::tuple<AddContentError, Reason::Condition, QList<Application *>, QList<QDomElement>>
+            ParseContentListResult;
+
+        ParseContentListResult parseContentAddList(const QDomElement &jingleEl)
+        {
+            QMap<QString, Application *>                             addSet;
+            QMap<QString, std::pair<QDomElement, Reason::Condition>> rejectSet;
+
+            QString contentTag(QStringLiteral("content"));
+            for (QDomElement ce = jingleEl.firstChildElement(contentTag); !ce.isNull();
+                 ce             = ce.nextSiblingElement(contentTag)) {
+
+                Private::AddContentError err;
+                Reason::Condition        cond;
+                Application *            app;
+
+                std::tie(err, cond, app) = parseContentAdd(ce);
+                if (err == Private::AddContentError::Unparsed) {
+                    lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
+                    qDeleteAll(addSet);
+                    return ParseContentListResult(Unparsed, cond, QList<Application *>(), QList<QDomElement>());
+                }
+
+                auto contentName = app->contentName();
+                auto it          = addSet.find(contentName);
+                if (err != Private::AddContentError::Ok) {
+                    // can't continue as well
+                    if (app) { // we are going to reject it completely so delete
+                        delete app;
+                    }
+
+                    if (it == addSet.end()) {
+                        rejectSet.insert(contentName, std::make_pair(ce, cond));
+                    }
+                    continue;
+                }
+
+                rejectSet.remove(contentName);
+                if (it == addSet.end()
+                    || (*it)->wantBetterTransport(
+                        app->transport())) { // probably not wantBetterTransport but wantBetterApplication
+                    if (it == addSet.end()) {
+                        addSet.insert(contentName, app);
+                    } else {
+                        delete *it; // unpreferred app
+                        *it = app;
+                    }
+                }
+            }
+
+            if (rejectSet.size()) {
+                QList<QDomElement> rejectList;
+                for (auto const &i : rejectSet) {
+                    rejectList.append(i.first);
+                }
+                return ParseContentListResult(Unsupported, rejectSet.first().second, addSet.values(), rejectList);
+            }
+
+            return ParseContentListResult(Ok, Reason::Success, addSet.values(), QList<QDomElement>());
+        }
+
+        std::tuple<AddContentError, Reason::Condition, Application *> parseContentAccept(const QDomElement &ce)
+        {
+            QDomElement descriptionEl = ce.firstChildElement(QLatin1String("description"));
+            QDomElement transportEl   = ce.firstChildElement(QLatin1String("transport"));
+            QString     descriptionNS = descriptionEl.namespaceURI();
+            QString     transportNS   = transportEl.namespaceURI();
+            typedef std::tuple<AddContentError, Reason::Condition, Application *> result;
+
+            ContentBase c(ce);
+            if (!c.isValid() || role != c.creator || descriptionEl.isNull() || transportEl.isNull()
+                || descriptionNS.isEmpty() || transportNS.isEmpty()) {
+                return result { Unparsed, Reason::NoReason, nullptr };
+            }
+
+            auto app = q->content(c.name, role);
+            if (!(app && app->state() == State::Pending)) { // reaccept is possible
+                return result { AddContentError::Unexpected, Reason::NoReason, app };
+            }
+
+            if (app->pad()->ns() != descriptionNS || app->transport()->pad()->ns() != transportNS) {
+                // well it's more than unexpected. let's send unparsed
+                return result { AddContentError::Unparsed, Reason::NoReason, app };
+            }
+
+            if (!app->transport()->update(transportEl)) {
+                // clearly unparsed. otherwise the app will generate failure event with a Reason.
+                return result { AddContentError::Unparsed, Reason::NoReason, app };
+            }
+
+            auto ansret = app->setRemoteAnswer(descriptionEl);
+            if (ansret == Application::Unparsed)
+                return result { AddContentError::Unparsed, Reason::NoReason, app };
+
+            if (ansret == Application::IncompatibleParameters || app->state() != State::Accepted) {
+                // parsed but was not accepted. so it's somehow incompatible
+                return result { AddContentError::Unsupported, Reason::IncompatibleParameters, app };
+            }
+
+            return result { AddContentError::Ok, Reason::Success, app };
+        }
+
+        std::tuple<bool, QList<Application *>> parseContentAcceptList(const QDomElement &jingleEl)
+        {
+            QMap<QString, Application *>                             acceptSet;
+            QMap<QString, std::pair<QDomElement, Reason::Condition>> rejectSet;
+
+            QString contentTag(QStringLiteral("content"));
+            for (QDomElement ce = jingleEl.firstChildElement(contentTag); !ce.isNull();
+                 ce             = ce.nextSiblingElement(contentTag)) {
+
+                Private::AddContentError err;
+                Reason::Condition        cond;
+                Application *            app;
+
+                std::tie(err, cond, app) = parseContentAccept(ce);
+                if (err == Private::AddContentError::Unparsed || err == Private::AddContentError::Unexpected) {
+                    for (auto &a : acceptSet) {
+                        a->setState(State::Pending); // reset state to pending for already passed validation before
+                                                     // passing error back
+                    }
+                    lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel,
+                                                    err == Private::AddContentError::Unexpected
+                                                        ? XMPP::Stanza::Error::UnexpectedRequest
+                                                        : XMPP::Stanza::Error::BadRequest);
+                    if (err == Private::AddContentError::Unexpected) {
+                        ErrorUtil::fill(jingleEl.ownerDocument(), lastError, ErrorUtil::OutOfOrder);
+                    }
+                    return std::tuple<bool, QList<Application *>>(false, QList<Application *>());
+                }
+
+                auto contentName = app->contentName();
+                auto it          = acceptSet.find(contentName);
+                auto rit         = rejectSet.find(contentName);
+                if (it != acceptSet.end() || rit != rejectSet.end()) {
+                    // duplicates are not allowed in accept request
+                    for (auto &a : acceptSet) {
+                        a->setState(State::Pending); // reset state to pending for already passed validation before
+                                                     // passing error back
+                    }
+                    lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
+                    return std::tuple<bool, QList<Application *>>(false, QList<Application *>());
+                }
+
+                if (err != Private::AddContentError::Ok) {
+                    app->setState(State::Finished); // we can't keep working with this content for whatever reason. if
+                                                    // "accept" failed there is no fallback
+                    rejectSet.insert(
+                        contentName,
+                        std::make_pair(ce,
+                                       cond)); // NOTE, probably instead of ce we have to generate original description
+                    continue;
+                }
+                acceptSet.insert(contentName, app);
+            }
+
+            if (rejectSet.size()) {
+                QTimer::singleShot(0, q, [this, rejectSet]() mutable {
+                    auto               cond = rejectSet.first().second;
+                    QList<QDomElement> rejects;
+                    for (auto const &i : rejectSet) {
+                        rejects.append(i.first);
+                    }
+                    rejects += Reason(cond).toXml(manager->client()->doc());
+                    outgoingUpdates.insert(Action::ContentRemove,
+                                           OutgoingUpdate { rejects, [this, rejects](bool) {
+                                                               for (auto &r : rejects) {
+                                                                   ContentBase c(r);
+                                                                   delete contentList.take(ContentKey { c.name, role });
+                                                               }
+                                                               if (contentList.isEmpty()) {
+                                                                   // the other party has to generate session-terminate
+                                                                   // but we do not care already
+                                                                   setSessionFinished();
+                                                               }
+                                                           } });
+                });
+            }
+            return std::tuple<bool, QList<Application *>>(true, acceptSet.values());
+        }
+
+        bool handleIncomingContentAdd(const QDomElement &jingleEl)
+        {
+            Private::AddContentError err;
+            Reason::Condition        cond;
+            QList<Application *>     apps;
+            QList<QDomElement>       rejects;
+
+            std::tie(err, cond, apps, rejects) = parseContentAddList(jingleEl);
+            switch (err) {
+            case Private::AddContentError::Unparsed:
+            case Private::AddContentError::Unexpected:
+                lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
+                if (err == Private::AddContentError::Unexpected) {
+                    ErrorUtil::fill(jingleEl.ownerDocument(), lastError, ErrorUtil::OutOfOrder);
+                }
+                return false;
+            case Private::AddContentError::Unsupported:
+                rejects += Reason(cond).toXml(manager->client()->doc());
+                outgoingUpdates.insert(Action::ContentReject, OutgoingUpdate { rejects, OutgoingUpdateCB() });
+                break;
+            case Private::AddContentError::Ok:
+                break;
+            }
+
+            if (apps.size()) {
+                Origin remoteRole = negateOrigin(role);
+                for (auto app : apps) {
+                    addAndInitContent(remoteRole, app); // TODO check conflicts
+                }
+                QTimer::singleShot(0, q, [this]() { emit q->newContentReceived(); });
+            }
+            planStep();
+
+            return true;
+        }
+
+        bool handleIncomingContentRemove(const QDomElement &jingleEl)
+        {
+            QSet<Application *> toRemove;
+            QString             contentTag(QStringLiteral("content"));
+            for (QDomElement ce = jingleEl.firstChildElement(contentTag); !ce.isNull();
+                 ce             = ce.nextSiblingElement(contentTag)) {
+                ContentBase cb(ce);
+                if (!cb.isValid()) {
+                    lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
+                    return false;
+                }
+                Application *app = contentList.value(ContentKey { cb.name, cb.creator });
+                if (app) {
+                    toRemove.insert(app);
+                }
+            }
+
+            auto   reasonEl = jingleEl.firstChildElement(QString::fromLatin1("reason"));
+            Reason reason   = reasonEl.isNull() ? Reason(Reason::Success) : Reason(reasonEl);
+
+            for (auto app : toRemove) {
+                app->incomingRemove(reason);
+                contentList.remove(ContentKey { app->contentName(), app->creator() });
+                delete app;
+            }
+
+            if (contentList.isEmpty()) {
+                terminateReason = reason;
+            }
+
+            planStep();
+            return true;
+        }
+
+        bool handleIncomingSessionTerminate(const QDomElement &jingleEl)
+        {
+            terminateReason = Reason(jingleEl.firstChildElement(QString::fromLatin1("reason")));
+            setSessionFinished();
+            return true;
+        }
+
+        bool handleIncomingSessionAccept(const QDomElement &jingleEl)
+        {
+            bool                 parsed;
+            QList<Application *> apps;
+
+            std::tie(parsed, apps) = parseContentAcceptList(jingleEl);
+            if (!parsed) {
+                lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
+                return false;
+            }
+
+            state = State::Connecting;
+            if (apps.size()) {
+                for (auto app : apps) {
+                    app->start();
+                }
+            }
+            QTimer::singleShot(0, q, [this]() { emit q->activated(); });
+            planStep();
+
+            return true;
+        }
+
+        bool handleIncomingContentAccept(const QDomElement &jingleEl)
+        {
+            bool                 parsed;
+            QList<Application *> apps;
+
+            std::tie(parsed, apps) = parseContentAcceptList(jingleEl); // marks valid apps as accepted
+            if (!parsed) {
+                lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
+                return false;
+            }
+
+            if (apps.size() && state >= State::Active) {
+                for (auto app : apps) {
+                    app->start(); // start accepted app. connection establishing and data transfer are inside
+                }
+            }
+            planStep();
+
+            return true;
+        }
+
+        bool handleIncomingTransportReplace(const QDomElement &jingleEl)
+        {
+            QList<std::tuple<Application *, QSharedPointer<Transport>, QDomElement>> passed;
+            QList<QDomElement>                                                       toReject;
+            QString contentTag(QStringLiteral("content"));
+            bool    doTieBreak = false;
+            for (QDomElement ce = jingleEl.firstChildElement(contentTag); !ce.isNull();
+                 ce             = ce.nextSiblingElement(contentTag)) {
+
+                ContentBase               cb(ce);
+                bool                      transportParsed;
+                Reason::Condition         errReason;
+                QSharedPointer<Transport> transport;
+                std::tie(transportParsed, errReason, transport) = parseIncomingTransport(ce);
+
+                if (!cb.isValid() || !transportParsed) {
+                    lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
+                    return false;
+                }
+                Application *app = contentList.value(ContentKey { cb.name, cb.creator });
+                if (!app || (app->creator() == role && app->state() <= State::Unacked)) {
+                    qDebug("not existing app or inaporpriate app state");
+                    lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::ItemNotFound);
+                    return false;
+                }
+
+                if (errReason) {
+                    qDebug("failed to construct transport");
+                    toReject.append(ce);
+                    continue;
+                }
+
+                auto old = app->transport();
+                Q_ASSERT(old != nullptr);
+                // if it's my transport and it's sent but unacknowledged but has to be accepted
+                if (old->creator() == q->peerRole() && old->state() == State::Unacked && role == Origin::Initiator) {
+                    doTieBreak = true;
+                    continue;
+                }
+
+                passed.append(std::make_tuple(app, transport, ce));
+            }
+
+            for (auto &v : passed) {
+                Application *             app;
+                QSharedPointer<Transport> transport;
+                QDomElement               ce;
+                std::tie(app, transport, ce) = v;
+                if (doTieBreak) {
+                    if (app->transport()->creator() == role && app->transport()->state() < State::Unacked)
+                        continue; // it will send transport soon
+                    app->selectNextTransport(transport->pad()->ns());
+                } else if (!app->incomingTransportReplace(transport)) {
+                    // app should generate transport accept eventually. content-accept will
+                    // work too if the content wasn't accepted yet
+                    toReject.append(ce);
+                }
+            }
+
+            if (doTieBreak) {
+                lastError = ErrorUtil::makeTieBreak(*manager->client()->doc());
+                return false;
+            } else if (toReject.size()) {
+                outgoingUpdates.insert(Action::TransportReject, OutgoingUpdate { toReject, OutgoingUpdateCB() });
+            }
+
+            planStep();
+            return true;
+        }
+
+        bool handleIncomingTransportAccept(const QDomElement &jingleEl)
+        {
+            QString                                  contentTag(QStringLiteral("content"));
+            QList<QPair<Application *, QDomElement>> updates;
+            for (QDomElement ce = jingleEl.firstChildElement(contentTag); !ce.isNull();
+                 ce             = ce.nextSiblingElement(contentTag)) {
+                ContentBase cb(ce);
+                auto        transportEl = ce.firstChildElement(QString::fromLatin1("transport"));
+                QString     transportNS = transportEl.namespaceURI();
+                if (!cb.isValid() || transportEl.isNull() || transportNS.isEmpty()) {
+                    lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
+                    return false;
+                }
+
+                Application *app = contentList.value(ContentKey { cb.name, cb.creator });
+                if (!app || !app->transport() || app->transport()->creator() != role
+                    || app->transport()->state() != State::Pending) {
+                    // ignore out of order
+                    continue;
+                }
+                updates.append(qMakePair(app, transportEl));
+            }
+
+            for (auto &u : updates) {
+                if (u.first->transport()->update(u.second) && u.first->state() >= State::Connecting) {
+                    u.first->transport()->start();
+                }
+                // if update fails transport should trigger replace procedure
+            }
+
+            planStep();
+            return true;
+        }
+
+        bool handleIncomingTransportInfo(const QDomElement &jingleEl)
+        {
+            QString                                              contentTag(QStringLiteral("content"));
+            QList<QPair<QSharedPointer<Transport>, QDomElement>> updates;
+            for (QDomElement ce = jingleEl.firstChildElement(contentTag); !ce.isNull();
+                 ce             = ce.nextSiblingElement(contentTag)) {
+                Application *app = nullptr;
+                ContentBase  cb(ce);
+                if (!cb.isValid() || !(app = q->content(cb.name, cb.creator)) || app->state() >= State::Finishing
+                    || !app->transport()) {
+                    lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
+                    return false;
+                }
+                auto tel = ce.firstChildElement(QStringLiteral("transport"));
+                if (tel.isNull() || tel.namespaceURI() != app->transport()->pad()->ns()) {
+                    lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
+                    return false;
+                }
+                updates.append(qMakePair(app->transport(), tel));
+            }
+
+            for (auto &u : updates) {
+                u.first->update(u.second); // failure should trigger transport replace
+            }
+
+            return true;
+        }
+    };
+
+    Session::Session(Manager *manager, const Jid &peer, Origin role) : d(new Private)
+    {
+        d->q          = this;
+        d->role       = role;
+        d->manager    = manager;
+        d->otherParty = peer;
+        d->stepTimer.setSingleShot(true);
+        d->stepTimer.setInterval(0);
+        connect(&d->stepTimer, &QTimer::timeout, this, [this]() { d->doStep(); });
+    }
+
+    Session::~Session()
+    {
+        qDeleteAll(d->contentList);
+        qDebug("session %s destroyed", qPrintable(d->sid));
+    }
+
+    Manager *Session::manager() const { return d->manager; }
+    State    Session::state() const { return d->state; }
+    Jid      Session::me() const { return d->localParty; }
+    Jid      Session::peer() const { return d->otherParty; }
+
+    Jid Session::initiator() const
+    {
+        return d->role == Origin::Initiator ? d->manager->client()->jid() : d->otherParty;
+    }
+
+    Jid Session::responder() const
+    {
+        return d->role == Origin::Responder ? d->manager->client()->jid() : d->otherParty;
+    }
+
+    QString Session::sid() const { return d->sid; }
+
+    Origin Session::role() const { return d->role; }
+
+    Origin Session::peerRole() const { return negateOrigin(d->role); }
+
+    XMPP::Stanza::Error Session::lastError() const { return d->lastError; }
+
+    Application *Session::newContent(const QString &ns, Origin senders)
+    {
+        auto pad = applicationPadFactory(ns);
+        if (pad) {
+            return pad->manager()->startApplication(pad, pad->generateContentName(senders), d->role, senders);
+        }
+        return nullptr;
+    }
+
+    Application *Session::content(const QString &contentName, Origin creator)
+    {
+        return d->contentList.value(ContentKey { contentName, creator });
+    }
+
+    void Session::addContent(Application *content)
+    {
+        Q_ASSERT(d->state < State::Finishing);
+        d->addAndInitContent(d->role, content);
+        if (d->state >= State::ApprovedToSend) {
+            // If we add content to already initiated session then we are gonna
+            // send it immediatelly. So start prepare
+            content->prepare();
+        }
+    }
+
+    const QMap<ContentKey, Application *> &Session::contentList() const { return d->contentList; }
+
+    ApplicationManagerPad::Ptr Session::applicationPad(const QString &ns)
+    {
+        return d->applicationPads.value(ns).toStrongRef();
+    }
+
+    TransportManagerPad::Ptr Session::transportPad(const QString &ns)
+    {
+        return d->transportPads.value(ns).toStrongRef();
+    }
+
+    QSharedPointer<Transport> Session::newOutgoingTransport(const QString &ns)
+    {
+        auto pad = transportPadFactory(ns);
+        if (pad) {
+            return pad->manager()->newTransport(pad, d->role); // pad on both side becaue we need shared pointer
+        }
+        return QSharedPointer<Transport>();
+    }
+
+    QString Session::preferredApplication() const
+    {
+        // TODO some heuristics to detect preferred application
+        if (d->applicationPads.size()) {
+            return d->applicationPads.constBegin().key();
+        }
+        return QString();
+    }
+
+    QStringList Session::allApplicationTypes() const { return d->applicationPads.keys(); }
+
+    void Session::setLocalJid(const Jid &jid) { d->localParty = jid; }
+
+    void Session::accept()
+    {
+        Q_ASSERT(d->role == Origin::Responder && d->state == State::Created);
+        // So we presented a user incoming session in UI, the user modified it somehow and finally accepted.
+        d->state = State::ApprovedToSend;
+        for (auto &c : d->contentList) {
+            c->prepare();
+        }
+        d->planStep();
+    }
+
+    void Session::initiate()
+    {
+        emit initiated();
+        if (d->role == Origin::Initiator && d->state == State::Created) {
+            d->state = State::ApprovedToSend;
+            for (auto &c : d->contentList) {
+                c->prepare();
+            }
+            d->planStep();
+        }
+    }
+
+    void Session::terminate(Reason::Condition cond, const QString &comment)
+    {
+        if (d->role == Origin::Initiator && d->state == State::ApprovedToSend) {
+            d->setSessionFinished();
+            return;
+        }
+        d->state           = State::Finishing;
+        d->terminateReason = Reason(cond, comment);
+        d->planStep();
+    }
+
+    TransportManagerPad::Ptr Session::transportPadFactory(const QString &ns)
+    {
+        auto pad = d->transportPads.value(ns).toStrongRef();
+        if (!pad) {
+            auto deleter = [ns, this](TransportManagerPad *pad) {
+                d->transportPads.remove(ns);
+                delete pad;
+            };
+            pad = TransportManagerPad::Ptr(d->manager->transportPad(this, ns), deleter);
+            if (pad) {
+                d->transportPads.insert(ns, pad);
+            }
+        }
+        return pad;
+    }
+
+    ApplicationManagerPad::Ptr Session::applicationPadFactory(const QString &ns)
+    {
+        auto pad = d->applicationPads.value(ns).toStrongRef();
+        if (!pad) {
+            auto deleter = [ns, this](ApplicationManagerPad *pad) {
+                d->applicationPads.remove(ns);
+                delete pad;
+            };
+            pad = ApplicationManagerPad::Ptr(d->manager->applicationPad(this, ns), deleter);
+            if (pad) {
+                d->applicationPads.insert(ns, pad);
+            }
+        }
+        return pad;
+    }
+
+    bool Session::incomingInitiate(const Jingle &jingle, const QDomElement &jingleEl)
+    {
+        d->sid      = jingle.sid();
+        d->origFrom = d->otherParty;
+        if (jingle.initiator().isValid() && !jingle.initiator().compare(d->origFrom)) {
+            d->otherParty = jingle.initiator();
+        }
+
+        Private::AddContentError err;
+        Reason::Condition        cond;
+        QList<Application *>     apps;
+        QList<QDomElement>       rejects;
+
+        std::tie(err, cond, apps, rejects) = d->parseContentAddList(jingleEl);
+        switch (err) {
+        case Private::AddContentError::Unparsed:
+        case Private::AddContentError::Unexpected:
+            return false;
+        case Private::AddContentError::Unsupported:
+            d->terminateReason = Reason(cond);
+            d->planStep();
+            return true;
+        case Private::AddContentError::Ok:
+            if (!apps.size())
+                return false;
+            d->initialIncomingUnacceptedContent = apps;
+            for (auto app : apps) {
+                d->addAndInitContent(Origin::Initiator, app);
+            }
+            d->planStep();
+            return true;
+        }
+
+        return false;
+    }
+
+    bool Session::updateFromXml(Action action, const QDomElement &jingleEl)
+    {
+        if (d->state == State::Finished) {
+            d->lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::UnexpectedRequest);
+            ErrorUtil::fill(jingleEl.ownerDocument(), d->lastError, ErrorUtil::OutOfOrder);
+            return false;
+        }
+
+        switch (action) {
+        case Action::ContentAccept:
+            return d->handleIncomingContentAccept(jingleEl);
+        case Action::ContentAdd:
+            return d->handleIncomingContentAdd(jingleEl);
+        case Action::ContentModify:
+            break;
+        case Action::ContentReject:
+            break;
+        case Action::ContentRemove:
+            return d->handleIncomingContentRemove(jingleEl);
+        case Action::DescriptionInfo:
+            break;
+        case Action::SecurityInfo:
+            break;
+        case Action::SessionAccept:
+            return d->handleIncomingSessionAccept(jingleEl);
+        case Action::SessionInfo:
+            break;
+        case Action::SessionInitiate: // impossible case. but let compiler be happy
+            break;
+        case Action::SessionTerminate:
+            return d->handleIncomingSessionTerminate(jingleEl);
+        case Action::TransportAccept:
+            return d->handleIncomingTransportAccept(jingleEl);
+        case Action::TransportInfo:
+            return d->handleIncomingTransportInfo(jingleEl);
+        case Action::TransportReject:
+            break;
+        case Action::TransportReplace:
+            return d->handleIncomingTransportReplace(jingleEl);
+        case Action::NoAction:
+            break;
+        }
+
+        d->lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::FeatureNotImplemented);
+        return false;
+    }
+}}
+
+#include "jingle-session.moc"
diff --git a/src/xmpp/xmpp-im/jingle-session.h b/src/xmpp/xmpp-im/jingle-session.h
new file mode 100644
index 00000000..b72a03d2
--- /dev/null
+++ b/src/xmpp/xmpp-im/jingle-session.h
@@ -0,0 +1,96 @@
+/*
+ * jignle-session.h - Jingle Session
+ * Copyright (C) 2019  Sergey Ilinykh
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef JINGLE_SESSION_H
+#define JINGLE_SESSION_H
+
+#include "jingle-application.h"
+#include "jingle-transport.h"
+
+namespace XMPP { namespace Jingle {
+
+    // class Manager;
+    class Application;
+
+    class Session : public QObject {
+        Q_OBJECT
+    public:
+        // Note incoming session are not registered in Jingle Manager until validated.
+        // and then either rejected or registered in Pending state.
+
+        Session(Manager *manager, const Jid &peer, Origin role = Origin::Initiator);
+        ~Session();
+
+        Manager *manager() const;
+        State    state() const;
+
+        Jid     me() const;
+        Jid     peer() const;
+        Jid     initiator() const;
+        Jid     responder() const;
+        QString sid() const;
+
+        Origin role() const; // my role in session: initiator or responder
+        Origin peerRole() const;
+
+        XMPP::Stanza::Error lastError() const;
+
+        // make new local content but do not add it to session yet
+        Application *newContent(const QString &ns, Origin senders = Origin::Both);
+        // get registered content if any
+        Application *                          content(const QString &contentName, Origin creator);
+        void                                   addContent(Application *content);
+        const QMap<ContentKey, Application *> &contentList() const;
+
+        ApplicationManagerPad::Ptr applicationPad(const QString &ns);
+        TransportManagerPad::Ptr   transportPad(const QString &ns);
+
+        QSharedPointer<Transport> newOutgoingTransport(const QString &ns);
+
+        QString     preferredApplication() const;
+        QStringList allApplicationTypes() const;
+
+        void setLocalJid(const Jid &jid); // w/o real use case the implementation is rather stub
+
+        void accept();
+        void initiate();
+        void terminate(Reason::Condition cond, const QString &comment = QString());
+
+        // allocates or returns existing pads
+        ApplicationManagerPad::Ptr applicationPadFactory(const QString &ns);
+        TransportManagerPad::Ptr   transportPadFactory(const QString &ns);
+    signals:
+        void managerPadAdded(const QString &ns);
+        void initiated();
+        void activated();
+        void terminated();
+        void newContentReceived();
+
+    private:
+        friend class Manager;
+        friend class JTPush;
+        bool incomingInitiate(const Jingle &jingle, const QDomElement &jingleEl);
+        bool updateFromXml(Action action, const QDomElement &jingleEl);
+
+        class Private;
+        QScopedPointer<Private> d;
+    };
+}}
+
+#endif // JINGLE_SESSION_H
diff --git a/src/xmpp/xmpp-im/jingle-transport.cpp b/src/xmpp/xmpp-im/jingle-transport.cpp
new file mode 100644
index 00000000..ba5b0c31
--- /dev/null
+++ b/src/xmpp/xmpp-im/jingle-transport.cpp
@@ -0,0 +1,58 @@
+/*
+ * jignle-transport.cpp - Base Jingle transport classes
+ * Copyright (C) 2019  Sergey Ilinykh
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "jingle-transport.h"
+#include "jingle-session.h"
+
+namespace XMPP { namespace Jingle {
+    //----------------------------------------------------------------------------
+    // TransportManager
+    //----------------------------------------------------------------------------
+    TransportManager::TransportManager(QObject *parent) : QObject(parent) {}
+
+    //----------------------------------------------------------------------------
+    // Transport
+    //----------------------------------------------------------------------------
+    Transport::Transport(TransportManagerPad::Ptr pad, Origin creator) : _creator(creator), _pad(pad) {}
+
+    bool Transport::isRemote() const { return _pad->session()->role() == _creator; }
+
+    void Transport::setState(State newState)
+    {
+        _prevState = _state;
+        _state     = newState;
+        emit stateChanged();
+    }
+
+    //----------------------------------------------------------------------------
+    // Connection
+    //----------------------------------------------------------------------------
+    bool Connection::hasPendingDatagrams() const { return false; }
+
+    NetworkDatagram Connection::receiveDatagram(qint64 maxSize)
+    {
+        Q_UNUSED(maxSize)
+        return NetworkDatagram();
+    }
+
+    size_t Connection::blockSize() const
+    {
+        return 0; // means "block" is not applicable for this kind of connection
+    }
+}}
diff --git a/src/xmpp/xmpp-im/jingle-transport.h b/src/xmpp/xmpp-im/jingle-transport.h
new file mode 100644
index 00000000..4a4d007d
--- /dev/null
+++ b/src/xmpp/xmpp-im/jingle-transport.h
@@ -0,0 +1,151 @@
+/*
+ * jignle-transport.h - Base Jingle transport classes
+ * Copyright (C) 2019  Sergey Ilinykh
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef JINGLE_TRANSPORT_H
+#define JINGLE_TRANSPORT_H
+
+#include "bytestream.h"
+#include "jingle.h"
+
+#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
+#include <QNetworkDatagram>
+#else
+#include <QHostAddress>
+#endif
+
+namespace XMPP { namespace Jingle {
+#if QT_VERSION < QT_VERSION_CHECK(5, 8, 0)
+    // stub implementation
+    class NetworkDatagram {
+    public:
+        bool       _valid = false;
+        QByteArray _data;
+        inline NetworkDatagram(const QByteArray &data, const QHostAddress &destinationAddress = QHostAddress(),
+                               quint16 port = 0) :
+            _valid(true),
+            _data(data)
+        {
+            Q_UNUSED(destinationAddress);
+            Q_UNUSED(port)
+        }
+        inline NetworkDatagram() {}
+
+        inline bool       isValid() const { return _valid; }
+        inline QByteArray data() const { return _data; }
+    };
+#else
+    typedef QNetworkDatagram NetworkDatagram;
+#endif
+
+    class Connection : public ByteStream {
+        Q_OBJECT
+    public:
+        using Ptr = QSharedPointer<Connection>; // will be shared between transport and application
+        virtual bool            hasPendingDatagrams() const;
+        virtual NetworkDatagram receiveDatagram(qint64 maxSize = -1);
+        virtual size_t          blockSize() const;
+    };
+
+    class TransportManager;
+    class TransportManagerPad : public SessionManagerPad {
+        Q_OBJECT
+    public:
+        typedef QSharedPointer<TransportManagerPad> Ptr;
+
+        virtual TransportManager *manager() const = 0;
+    };
+
+    class Transport : public QObject {
+        Q_OBJECT
+    public:
+        Transport(TransportManagerPad::Ptr pad, Origin creator);
+
+        /*enum Direction { // incoming or outgoing file/data transfer.
+            Outgoing,
+            Incoming
+        };*/
+
+        inline Origin                   creator() const { return _creator; }
+        inline State                    state() const { return _state; }
+        inline State                    prevState() const { return _prevState; }
+        inline Reason                   lastReason() const { return _lastReason; }
+        inline TransportManagerPad::Ptr pad() const { return _pad; }
+        bool                            isRemote() const;
+        inline bool                     isLocal() const { return !isRemote(); }
+
+        /**
+         * @brief prepare to send content-add/session-initiate
+         *  When ready, the application first set update type to ContentAdd and then emit updated()
+         */
+        virtual void prepare() = 0;
+
+        /**
+         * @brief start really transfer data. starting with connection to remote candidates for example
+         */
+        virtual void start() = 0; // for local transport start searching for candidates (including probing proxy,stun
+                                  // etc) for remote transport try to connect to all proposed hosts in order their
+                                  // priority. in-band transport may just emit updated() here
+        virtual bool update(const QDomElement &el) = 0; // accepts transport element on incoming transport-info
+        virtual bool hasUpdates() const            = 0;
+        virtual OutgoingTransportInfoUpdate takeOutgoingUpdate() = 0;
+        virtual bool                        isValid() const      = 0;
+        virtual TransportFeatures           features() const     = 0;
+        virtual Connection::Ptr             connection() const   = 0; // returns established QIODevice-based connection
+    signals:
+        void updated(); // found some candidates and they have to be sent. takeUpdate has to be called from this signal
+                        // handler. if it's just always ready then signal has to be sent at least once otherwise
+                        // session-initiate won't be sent.
+        void connected(); // this signal is for app logic. maybe to finally start drawing some progress bar
+        void failed();    // transport ailed for whatever reason. aborted for example. _state will be State::Finished
+        void stateChanged();
+
+    protected:
+        // just updates state and signals about the change. No any loggic attached to the new state
+        void setState(State newState);
+
+        State                               _state     = State::Created;
+        State                               _prevState = State::Created;
+        Origin                              _creator   = Origin::None;
+        QSharedPointer<TransportManagerPad> _pad;
+        Reason                              _lastReason;
+    };
+
+    class TransportManager : public QObject {
+        Q_OBJECT
+    public:
+        TransportManager(QObject *parent = nullptr);
+
+        // may show more features than Transport instance. For example some transports may work in both reliable and not
+        // reliable modes
+        virtual TransportFeatures features() const              = 0;
+        virtual void              setJingleManager(Manager *jm) = 0;
+
+        // FIXME rename methods
+        virtual QSharedPointer<Transport> newTransport(const TransportManagerPad::Ptr &pad, Origin creator) = 0;
+        virtual TransportManagerPad *     pad(Session *session)                                             = 0;
+
+        // this method is supposed to gracefully close all related sessions as a preparation for plugin unload for
+        // example
+        virtual void closeAll() = 0;
+    signals:
+        void abortAllRequested(); // mostly used by transport instances to abort immediately
+    };
+}}
+
+#endif
diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index 0ac149aa..53a072ec 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -1,4 +1,4 @@
-/*
+/*
  * jignle.cpp - General purpose Jingle
  * Copyright (C) 2019  Sergey Ilinykh
  *
@@ -19,6 +19,8 @@
 
 #include "jingle.h"
 
+#include "jingle-application.h"
+#include "jingle-session.h"
 #include "xmpp-im/xmpp_hash.h"
 #include "xmpp/jid/jid.h"
 #include "xmpp_client.h"
@@ -54,6 +56,21 @@ namespace XMPP { namespace Jingle {
             { "transport-info", Action::TransportInfo },       { "transport-reject", Action::TransportReject },
             { "transport-replace", Action::TransportReplace } };
 
+    Origin negateOrigin(Origin o)
+    {
+        switch (o) {
+        case Origin::None:
+            return Origin::Both;
+        case Origin::Both:
+            return Origin::None;
+        case Origin::Initiator:
+            return Origin::Responder;
+        case Origin::Responder:
+            return Origin::Initiator;
+        }
+        return Origin::None;
+    }
+
     class Jingle::Private : public QSharedData {
     public:
         Action  action;
@@ -73,20 +90,18 @@ namespace XMPP { namespace Jingle {
     Jingle::Jingle(const QDomElement &e)
     {
         QString actionStr = e.attribute(QLatin1String("action"));
-        Action  action;
-        QString sid = e.attribute(QLatin1String("sid"));
+        Action  action    = Action::NoAction;
+        QString sid       = e.attribute(QLatin1String("sid"));
         Jid     initiator;
         Jid     responder;
 
-        bool found = false;
         for (unsigned int i = 0; i < sizeof(jingleActions) / sizeof(jingleActions[0]); i++) {
             if (actionStr == jingleActions[i].text) {
-                found  = true;
                 action = jingleActions[i].action;
                 break;
             }
         }
-        if (!found || sid.isEmpty()) {
+        if (action == Action::NoAction || sid.isEmpty()) {
             return;
         }
 
@@ -290,12 +305,13 @@ namespace XMPP { namespace Jingle {
         disposition = el.attribute(QLatin1String("disposition")); // if empty, it's "session"
     }
 
-    QDomElement ContentBase::toXml(QDomDocument *doc, const char *tagName) const
+    QDomElement ContentBase::toXml(QDomDocument *doc, const char *tagName, const QString &ns) const
     {
         if (!isValid()) {
             return QDomElement();
         }
-        auto el = doc->createElement(QLatin1String(tagName));
+        auto el = ns.isEmpty() ? doc->createElement(QLatin1String(tagName))
+                               : doc->createElementNS(ns, QLatin1String(tagName));
         setCreatorAttr(el, creator);
         el.setAttribute(QLatin1String("name"), name);
 
@@ -314,7 +330,6 @@ namespace XMPP { namespace Jingle {
             break;
 
         case Origin::Both:
-        default:
             break;
         }
 
@@ -353,16 +368,6 @@ namespace XMPP { namespace Jingle {
         return true;
     }
 
-    //----------------------------------------------------------------------------
-    // Application
-    //----------------------------------------------------------------------------
-    ApplicationManager::ApplicationManager(QObject *parent) : QObject(parent) {}
-
-    //----------------------------------------------------------------------------
-    // TransportManager
-    //----------------------------------------------------------------------------
-    TransportManager::TransportManager(QObject *parent) : QObject(parent) {}
-
     //----------------------------------------------------------------------------
     // JTPush - Jingle Task
     //----------------------------------------------------------------------------
@@ -501,1036 +506,6 @@ namespace XMPP { namespace Jingle {
         }
     };
 
-    //----------------------------------------------------------------------------
-    // JT - Jingle Task
-    //----------------------------------------------------------------------------
-    class JT : public Task {
-        Q_OBJECT
-
-        QDomElement iq_;
-        Jid         to_;
-
-    public:
-        JT(Task *parent) : Task(parent) {}
-
-        ~JT() {}
-
-        void request(const Jid &to, const QDomElement &jingleEl)
-        {
-            to_ = to;
-            iq_ = createIQ(doc(), "set", to.full(), id());
-            iq_.appendChild(jingleEl);
-        }
-
-        void onGo() { send(iq_); }
-
-        bool take(const QDomElement &x)
-        {
-            if (!iqVerify(x, to_, id()))
-                return false;
-
-            if (x.attribute("type") == "error") {
-                setError(x);
-            } else {
-                setSuccess();
-            }
-            return true;
-        }
-    };
-
-    //----------------------------------------------------------------------------
-    // Session
-    //----------------------------------------------------------------------------
-    class Session::Private {
-    public:
-        Session *q;
-        Manager *manager;
-        QTimer   stepTimer;
-        State    state = State::Created; // state of session on our side. if it's incoming we start from Created anyaway
-                                         // but Pending state is skipped
-        Origin                                             role = Origin::Initiator; // my role in the session
-        XMPP::Stanza::Error                                lastError;
-        Reason                                             terminateReason;
-        QMap<QString, QWeakPointer<ApplicationManagerPad>> applicationPads;
-        QMap<QString, QWeakPointer<TransportManagerPad>>   transportPads;
-        // QMap<QString,Application*> myContent;     // content::creator=(role ==
-        // Session::Role::Initiator?initiator:responder) QMap<QString,Application*> remoteContent; //
-        // content::creator=(role == Session::Role::Responder?initiator:responder)
-        QMap<ContentKey, Application *> contentList;
-        QSet<Application *>             signalingContent;
-        QHash<Action, OutgoingUpdate>
-                outgoingUpdates; // session level updates. session-info for example or some rejected apps
-        QString sid;
-        Jid     origFrom;   // "from" attr of IQ.
-        Jid     otherParty; // either "from" or initiator/responder. it's where to send all requests.
-        Jid     localParty; // that one will be set as initiator/responder if provided
-        bool    waitingAck = false;
-
-        void setSessionFinished()
-        {
-            state = State::Finished;
-            emit q->terminated();
-            signalingContent.clear();
-            for (auto &c : contentList) {
-                if (c->state() != State::Finished) {
-                    c->setState(State::Finished);
-                }
-            }
-            auto vals = contentList.values();
-            contentList.clear();
-            while (vals.size()) {
-                vals.takeLast()->deleteLater();
-            }
-            q->deleteLater();
-        }
-
-        void sendJingle(Action action, QList<QDomElement> update,
-                        std::function<void()> successCB = std::function<void()>())
-        {
-            QDomDocument &doc = *manager->client()->doc();
-            Jingle        jingle(action, sid);
-            if (action == Action::SessionInitiate) {
-                jingle.setInitiator(manager->client()->jid());
-            }
-            if (action == Action::SessionAccept) {
-                jingle.setResponder(manager->client()->jid());
-            }
-            auto xml = jingle.toXml(&doc);
-
-            for (const QDomElement &e : update) {
-                xml.appendChild(e);
-            }
-
-            auto jt = new JT(manager->client()->rootTask());
-            jt->request(otherParty, xml);
-            QObject::connect(jt, &JT::finished, q, [jt, jingle, successCB, this]() {
-                waitingAck = false;
-                if (jt->success()) {
-                    if (successCB) {
-                        successCB();
-                    } else {
-                        planStep();
-                    }
-                } else {
-                    lastError = jt->error();
-                    if (ErrorUtil::jingleCondition(lastError) != ErrorUtil::TieBreak)
-                        setSessionFinished();
-                    else
-                        planStep();
-                }
-            });
-            waitingAck = true;
-            jt->go(true);
-        }
-
-        void planStep()
-        {
-            if (waitingAck) {
-                return;
-            }
-            lastError = Stanza::Error(0, 0);
-            if (!stepTimer.isActive()) {
-                stepTimer.start();
-            }
-        }
-
-        void doStep()
-        {
-            if (waitingAck) { // we will return here when ack is received. Session::Unacked is possible also only with
-                              // waitingAck
-                return;
-            }
-            if (terminateReason.condition() && state != State::Finished) {
-                if (state != State::Created || role == Origin::Responder) {
-                    sendJingle(Action::SessionTerminate,
-                               QList<QDomElement>() << terminateReason.toXml(manager->client()->doc()));
-                }
-                setSessionFinished();
-                return;
-            }
-            if (state == State::Created || state == State::Finished) {
-                return; // we will start doing something when initiate() is called
-            }
-
-            if (outgoingUpdates.size()) {
-                auto it       = outgoingUpdates.begin();
-                auto action   = it.key();
-                auto updates  = it.value();
-                auto elements = std::get<0>(updates);
-                auto cb       = std::get<1>(updates);
-                outgoingUpdates.erase(it);
-                sendJingle(action, elements, [this, cb]() {
-                    if (cb) {
-                        cb();
-                    }
-                    planStep();
-                });
-                return;
-            }
-
-            typedef std::tuple<QPointer<Application>, OutgoingUpdateCB> AckHndl; // will be used from callback on iq ack
-            if (state == State::PrepareLocalOffer) { // we are going to send session-initiate/accept (already accepted
-                                                     // by the user but not sent yet)
-                /*
-                 * For session-initiate everything is prety much straightforward, just any content with
-                 * Action::ContentAdd update type has to be added. But with session-accept things are more complicated
-                 *   1. Local client could add its content. So we have to check content origin too.
-                 *   2. Remote client could add more content before local session-accept. Then we have two options
-                 *         a) send content-accept and skip this content in session-accept later
-                 *         b) don't send content-accept and accept everything with session-accept
-                 *      We prefer option (b) in our implementation.
-                 */
-                Action expectedContentAction = role == Origin::Initiator ? Action::ContentAdd : Action::ContentAccept;
-                for (const auto &c : contentList) {
-                    auto out = c->evaluateOutgoingUpdate();
-                    if (out == Action::ContentReject) { // yeah we are rejecting local content. invalid?
-                        lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
-                        setSessionFinished();
-                        return;
-                    }
-                    if (out != expectedContentAction) {
-                        return; // keep waiting.
-                    }
-                }
-                Action actionToSend = Action::SessionAccept;
-                State  finalState   = State::Active;
-                // so all contents is ready for session-initiate. let's do it
-                if (role == Origin::Initiator) {
-                    sid          = manager->registerSession(q);
-                    actionToSend = Action::SessionInitiate;
-                    finalState   = State::Pending;
-                }
-
-                QList<QDomElement> contents;
-                QList<AckHndl>     acceptApps;
-                for (const auto &p : contentList) {
-                    QList<QDomElement> xml;
-                    OutgoingUpdateCB   callback;
-                    std::tie(xml, callback) = p->takeOutgoingUpdate();
-                    contents += xml;
-                    // p->setState(State::Unacked);
-                    if (callback) {
-                        acceptApps.append(AckHndl { p, callback });
-                    }
-                }
-                state = State::Unacked;
-                sendJingle(actionToSend, contents, [this, acceptApps, finalState]() {
-                    state = finalState;
-                    for (const auto &h : acceptApps) {
-                        auto app      = std::get<0>(h);
-                        auto callback = std::get<1>(h);
-                        if (app) {
-                            callback();
-                            if (role == Origin::Responder) {
-                                app->start();
-                            }
-                        }
-                    }
-                    if (finalState == State::Active) {
-                        emit q->activated();
-                    }
-                    planStep();
-                });
-
-                return;
-            }
-
-            // So session is either in State::Pending or State::Active here.
-            // State::Connecting status is skipped for session.
-            QList<QDomElement> updateXml;
-            for (auto mp : applicationPads) {
-                auto        p  = mp.toStrongRef();
-                QDomElement el = p->takeOutgoingSessionInfoUpdate();
-                if (!el.isNull()) {
-                    updateXml.append(el);
-                    // we can send session-info for just one application. so stop processing
-                    sendJingle(Action::SessionInfo, updateXml, [this]() { planStep(); });
-                    return;
-                }
-            }
-
-            QMultiMap<Action, Application *> updates;
-
-            for (auto app : signalingContent) {
-                Action updateType = app->evaluateOutgoingUpdate();
-                if (updateType != Action::NoAction) {
-                    updates.insert(updateType, app);
-                }
-            }
-
-            QList<AckHndl> acceptApps;
-            if (updates.size()) {
-                Action action = updates.begin().key(); // NOTE maybe some actions have more priority than another
-                auto   apps   = updates.values(action);
-                for (auto app : apps) {
-                    QList<QDomElement> xml;
-                    OutgoingUpdateCB   callback;
-                    std::tie(xml, callback) = app->takeOutgoingUpdate();
-                    updateXml += xml;
-                    if (callback) {
-                        acceptApps.append(AckHndl { app, callback });
-                    }
-                }
-                sendJingle(action, updateXml, [this, acceptApps]() {
-                    for (const auto &h : acceptApps) {
-                        auto app      = std::get<0>(h);
-                        auto callback = std::get<1>(h);
-                        if (app) {
-                            callback();
-                        }
-                    }
-                    planStep();
-                });
-            }
-        }
-
-        Reason reason(const QDomElement &jingleEl)
-        {
-            QDomElement re = jingleEl.firstChildElement(QLatin1String("reason"));
-            Reason      reason;
-            if (!re.isNull()) {
-                reason = Reason(re);
-                if (!reason.isValid()) {
-                    qDebug("invalid reason");
-                }
-            }
-            return reason;
-        }
-
-        void addAndInitContent(Origin creator, Application *content)
-        {
-            contentList.insert(ContentKey { content->contentName(), creator }, content);
-            if (state != State::Created && content->evaluateOutgoingUpdate() != Action::NoAction) {
-                signalingContent.insert(content);
-            }
-            QObject::connect(content, &Application::updated, q, [this, content]() {
-                signalingContent.insert(content);
-                planStep();
-            });
-            QObject::connect(content, &Application::destroyed, q, [this, content]() {
-                signalingContent.remove(content);
-                for (auto it = contentList.begin(); it != contentList.end(); ++it) { // optimize for large lists?
-                    if (it.value() == content) {
-                        contentList.erase(it);
-                        break;
-                    }
-                }
-            });
-        }
-
-        enum AddContentError { Ok, Unparsed, Unexpected, Unsupported };
-
-        std::tuple<AddContentError, Reason::Condition, Application *> parseContentAdd(const QDomElement &ce)
-        {
-            QDomElement descriptionEl = ce.firstChildElement(QLatin1String("description"));
-            QDomElement transportEl   = ce.firstChildElement(QLatin1String("transport"));
-            QString     descriptionNS = descriptionEl.namespaceURI();
-            QString     transportNS   = transportEl.namespaceURI();
-            typedef std::tuple<AddContentError, Reason::Condition, Application *> result;
-
-            ContentBase c(ce);
-            if (!c.isValid() || descriptionEl.isNull() || transportEl.isNull() || descriptionNS.isEmpty()
-                || transportNS.isEmpty()) {
-                return result { Unparsed, Reason::Success, nullptr };
-            }
-
-            auto appPad = q->applicationPadFactory(descriptionNS);
-            if (!appPad) {
-                return result { Unsupported, Reason::UnsupportedApplications,
-                                nullptr }; // <unsupported-applications/> condition
-            }
-            QScopedPointer<Application> app(appPad->manager()->startApplication(appPad, c.name, c.creator, c.senders));
-            auto                        descErr = app->setDescription(descriptionEl);
-            if (descErr == Application::IncompatibleParameters) {
-                return result { Unsupported, Reason::IncompatibleParameters, nullptr };
-            } else if (descErr == Application::Unparsed) {
-                return result { Unparsed, Reason::Success, nullptr };
-            } else {
-                // same for transport
-                auto trPad = q->transportPadFactory(transportNS);
-                if (!trPad) {
-                    return result {
-                        Unsupported, Reason::UnsupportedTransports, app.take()
-                    }; // <unsupported-transports/> condition or we can try fallback and fail with <failed-transport/>
-                }
-                auto transport = trPad->manager()->newTransport(trPad, transportEl);
-                if (transport) {
-                    if (app->setTransport(transport)) {
-                        return result { Ok, Reason::Success, app.take() };
-                    }
-                    return result { Unsupported, Reason::UnsupportedTransports, app.take() };
-                }
-            }
-
-            return result { Unparsed, Reason::Success, nullptr };
-        }
-
-        typedef std::tuple<AddContentError, Reason::Condition, QList<Application *>, QList<QDomElement>>
-            ParseContentListResult;
-
-        ParseContentListResult parseContentAddList(const QDomElement &jingleEl)
-        {
-            QMap<QString, Application *>                             addSet;
-            QMap<QString, std::pair<QDomElement, Reason::Condition>> rejectSet;
-
-            QString contentTag(QStringLiteral("content"));
-            for (QDomElement ce = jingleEl.firstChildElement(contentTag); !ce.isNull();
-                 ce             = ce.nextSiblingElement(contentTag)) {
-
-                Private::AddContentError err;
-                Reason::Condition        cond;
-                Application *            app;
-
-                std::tie(err, cond, app) = parseContentAdd(ce);
-                if (err == Private::AddContentError::Unparsed) {
-                    lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
-                    qDeleteAll(addSet);
-                    return ParseContentListResult(Unparsed, cond, QList<Application *>(), QList<QDomElement>());
-                }
-
-                auto contentName = app->contentName();
-                auto it          = addSet.find(contentName);
-                if (err != Private::AddContentError::Ok) {
-                    // can't continue as well
-                    if (app) { // we are going to reject it completely so delete
-                        delete app;
-                    }
-
-                    if (it == addSet.end()) {
-                        rejectSet.insert(contentName, std::make_pair(ce, cond));
-                    }
-                    continue;
-                }
-
-                rejectSet.remove(contentName);
-                if (it == addSet.end()
-                    || (*it)->wantBetterTransport(
-                        app->transport())) { // probably not wantBetterTransport but wantBetterApplication
-                    if (it == addSet.end()) {
-                        addSet.insert(contentName, app);
-                    } else {
-                        delete *it; // unpreferred app
-                        *it = app;
-                    }
-                }
-            }
-
-            if (rejectSet.size()) {
-                QList<QDomElement> rejectList;
-                for (auto const &i : rejectSet) {
-                    rejectList.append(i.first);
-                }
-                return ParseContentListResult(Unsupported, rejectSet.first().second, addSet.values(), rejectList);
-            }
-
-            return ParseContentListResult(Ok, Reason::Success, addSet.values(), QList<QDomElement>());
-        }
-
-        std::tuple<AddContentError, Reason::Condition, Application *> parseContentAccept(const QDomElement &ce)
-        {
-            QDomElement descriptionEl = ce.firstChildElement(QLatin1String("description"));
-            QDomElement transportEl   = ce.firstChildElement(QLatin1String("transport"));
-            QString     descriptionNS = descriptionEl.namespaceURI();
-            QString     transportNS   = transportEl.namespaceURI();
-            typedef std::tuple<AddContentError, Reason::Condition, Application *> result;
-
-            ContentBase c(ce);
-            if (!c.isValid() || role != c.creator || descriptionEl.isNull() || transportEl.isNull()
-                || descriptionNS.isEmpty() || transportNS.isEmpty()) {
-                return result { Unparsed, Reason::NoReason, nullptr };
-            }
-
-            auto app = q->content(c.name, role);
-            if (!(app && app->state() == State::Pending)) { // reaccept is possible
-                return result { AddContentError::Unexpected, Reason::NoReason, app };
-            }
-
-            if (app->pad()->ns() != descriptionNS || app->transport()->pad()->ns() != transportNS) {
-                // well it's more than unexpected. let's send unparsed
-                return result { AddContentError::Unparsed, Reason::NoReason, app };
-            }
-
-            if (!app->transport()->update(transportEl) || !app->accept(descriptionEl)) {
-                // clearly unparsed. otherwise the app will generate failure event with a Reason.
-                return result { AddContentError::Unparsed, Reason::NoReason, app };
-            }
-
-            if (app->state() != State::Accepted) { // parsed but was not accepted. so it's somehow incompatible
-                return result { AddContentError::Unsupported, Reason::IncompatibleParameters, app };
-            }
-
-            return result { AddContentError::Ok, Reason::Success, app };
-        }
-
-        std::tuple<bool, QList<Application *>> parseContentAcceptList(const QDomElement &jingleEl)
-        {
-            QMap<QString, Application *>                             acceptSet;
-            QMap<QString, std::pair<QDomElement, Reason::Condition>> rejectSet;
-
-            QString contentTag(QStringLiteral("content"));
-            for (QDomElement ce = jingleEl.firstChildElement(contentTag); !ce.isNull();
-                 ce             = ce.nextSiblingElement(contentTag)) {
-
-                Private::AddContentError err;
-                Reason::Condition        cond;
-                Application *            app;
-
-                std::tie(err, cond, app) = parseContentAccept(ce);
-                if (err == Private::AddContentError::Unparsed || err == Private::AddContentError::Unexpected) {
-                    for (auto &a : acceptSet) {
-                        a->setState(State::Pending); // reset state to pending for already passed validation before
-                                                     // passing error back
-                    }
-                    lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel,
-                                                    err == Private::AddContentError::Unexpected
-                                                        ? XMPP::Stanza::Error::UnexpectedRequest
-                                                        : XMPP::Stanza::Error::BadRequest);
-                    if (err == Private::AddContentError::Unexpected) {
-                        ErrorUtil::fill(jingleEl.ownerDocument(), lastError, ErrorUtil::OutOfOrder);
-                    }
-                    return std::tuple<bool, QList<Application *>>(false, QList<Application *>());
-                }
-
-                auto contentName = app->contentName();
-                auto it          = acceptSet.find(contentName);
-                auto rit         = rejectSet.find(contentName);
-                if (it != acceptSet.end() || rit != rejectSet.end()) {
-                    // duplicates are not allowed in accept request
-                    for (auto &a : acceptSet) {
-                        a->setState(State::Pending); // reset state to pending for already passed validation before
-                                                     // passing error back
-                    }
-                    lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
-                    return std::tuple<bool, QList<Application *>>(false, QList<Application *>());
-                }
-
-                if (err != Private::AddContentError::Ok) {
-                    app->setState(State::Finished); // we can't keep working with this content for whatever reason. if
-                                                    // "accept" failed there is no fallback
-                    rejectSet.insert(
-                        contentName,
-                        std::make_pair(ce,
-                                       cond)); // NOTE, probably instead of ce we have to generate original description
-                    continue;
-                }
-                acceptSet.insert(contentName, app);
-            }
-
-            if (rejectSet.size()) {
-                QTimer::singleShot(0, q, [this, rejectSet]() mutable {
-                    auto               cond = rejectSet.first().second;
-                    QList<QDomElement> rejects;
-                    for (auto const &i : rejectSet) {
-                        rejects.append(i.first);
-                    }
-                    rejects += Reason(cond).toXml(manager->client()->doc());
-                    outgoingUpdates.insert(Action::ContentRemove,
-                                           OutgoingUpdate { rejects, [this, rejects]() {
-                                                               for (auto &r : rejects) {
-                                                                   ContentBase c(r);
-                                                                   delete contentList.take(ContentKey { c.name, role });
-                                                               }
-                                                               if (contentList.isEmpty()) {
-                                                                   // the other party has to generate session-terminate
-                                                                   // but we do not care already
-                                                                   setSessionFinished();
-                                                               }
-                                                           } });
-                });
-            }
-            return std::tuple<bool, QList<Application *>>(true, acceptSet.values());
-        }
-
-        bool handleIncomingContentAdd(const QDomElement &jingleEl)
-        {
-            Private::AddContentError err;
-            Reason::Condition        cond;
-            QList<Application *>     apps;
-            QList<QDomElement>       rejects;
-
-            std::tie(err, cond, apps, rejects) = parseContentAddList(jingleEl);
-            switch (err) {
-            case Private::AddContentError::Unparsed:
-            case Private::AddContentError::Unexpected:
-                lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
-                if (err == Private::AddContentError::Unexpected) {
-                    ErrorUtil::fill(jingleEl.ownerDocument(), lastError, ErrorUtil::OutOfOrder);
-                }
-                return false;
-            case Private::AddContentError::Unsupported:
-                rejects += Reason(cond).toXml(manager->client()->doc());
-                outgoingUpdates.insert(Action::ContentReject, OutgoingUpdate { rejects, OutgoingUpdateCB() });
-                break;
-            case Private::AddContentError::Ok:
-                break;
-            }
-
-            if (apps.size()) {
-                Origin remoteRole = negateOrigin(role);
-                for (auto app : apps) {
-                    addAndInitContent(remoteRole, app); // TODO check conflicts
-                }
-                QTimer::singleShot(0, q, [this]() { emit q->newContentReceived(); });
-            }
-            planStep();
-
-            return true;
-        }
-
-        bool handleIncomingContentRemove(const QDomElement &jingleEl)
-        {
-            QSet<Application *> toRemove;
-            QString             contentTag(QStringLiteral("content"));
-            for (QDomElement ce = jingleEl.firstChildElement(contentTag); !ce.isNull();
-                 ce             = ce.nextSiblingElement(contentTag)) {
-                ContentBase cb(ce);
-                if (!cb.isValid()) {
-                    lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
-                    return false;
-                }
-                Application *app = contentList.value(ContentKey { cb.name, cb.creator });
-                if (app) {
-                    toRemove.insert(app);
-                }
-            }
-
-            auto   reasonEl = jingleEl.firstChildElement(QString::fromLatin1("reason"));
-            Reason reason   = reasonEl.isNull() ? Reason(Reason::Success) : Reason(reasonEl);
-
-            for (auto app : toRemove) {
-                app->incomingRemove(reason);
-                contentList.remove(ContentKey { app->contentName(), app->creator() });
-                delete app;
-            }
-
-            if (contentList.isEmpty()) {
-                terminateReason = reason;
-            }
-
-            planStep();
-            return true;
-        }
-
-        bool handleIncomingSessionTerminate(const QDomElement &jingleEl)
-        {
-            terminateReason = Reason(jingleEl.firstChildElement(QString::fromLatin1("reason")));
-            setSessionFinished();
-            return true;
-        }
-
-        bool handleIncomingSessionAccept(const QDomElement &jingleEl)
-        {
-            bool                 parsed;
-            QList<Application *> apps;
-
-            std::tie(parsed, apps) = parseContentAcceptList(jingleEl);
-            if (!parsed) {
-                lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
-                return false;
-            }
-
-            state = State::Connecting;
-            if (apps.size()) {
-                for (auto app : apps) {
-                    app->start();
-                }
-            }
-            QTimer::singleShot(0, q, [this]() { emit q->activated(); });
-            planStep();
-
-            return true;
-        }
-
-        bool handleIncomingContentAccept(const QDomElement &jingleEl)
-        {
-            bool                 parsed;
-            QList<Application *> apps;
-
-            std::tie(parsed, apps) = parseContentAcceptList(jingleEl); // marks valid apps as accepted
-            if (!parsed) {
-                lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
-                return false;
-            }
-
-            if (apps.size() && state >= State::Active) {
-                for (auto app : apps) {
-                    app->start(); // start accepted app. connection establishing and data transfer are inside
-                }
-            }
-            planStep();
-
-            return true;
-        }
-
-        bool handleIncomingTransportReplace(const QDomElement &jingleEl)
-        {
-            QList<std::tuple<Application *, QSharedPointer<Transport>, QDomElement>> passed;
-            QList<QDomElement>                                                       toReject;
-            QString contentTag(QStringLiteral("content"));
-            for (QDomElement ce = jingleEl.firstChildElement(contentTag); !ce.isNull();
-                 ce             = ce.nextSiblingElement(contentTag)) {
-                ContentBase cb(ce);
-                auto        transportEl = ce.firstChildElement(QString::fromLatin1("transport"));
-                QString     transportNS = transportEl.namespaceURI();
-                if (!cb.isValid() || transportEl.isNull() || transportNS.isEmpty()) {
-                    lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
-                    return false;
-                }
-                Application *app = contentList.value(ContentKey { cb.name, cb.creator });
-                if (!app) {
-                    toReject.append(ce);
-                    continue;
-                }
-
-                auto trPad = q->transportPadFactory(transportNS);
-                if (!trPad) {
-                    toReject.append(ce);
-                    continue;
-                }
-
-                auto transport = trPad->manager()->newTransport(trPad, transportEl);
-                if (!transport) {
-                    toReject.append(ce);
-                    continue;
-                }
-
-                auto tfo = app->transportReplaceOrigin();
-                // if transport recovery is in progress and I as an inititiator started it then forbid remote
-                // transport-replace
-                if (tfo != Origin::None && tfo != q->peerRole() && role == Origin::Initiator) {
-                    lastError = ErrorUtil::makeTieBreak(*manager->client()->doc());
-                    return false;
-                }
-
-                passed.append(std::make_tuple(app, transport, ce));
-            }
-
-            for (auto &v : passed) {
-                Application *             app;
-                QSharedPointer<Transport> transport;
-                QDomElement               ce;
-                std::tie(app, transport, ce) = v;
-                if (!app->incomingTransportReplace(
-                        transport)) { // app should generate transport accept eventually. content-accept will work too
-                                      // if the content wasn't accepted yet
-                    toReject.append(ce);
-                }
-            }
-
-            if (toReject.size()) {
-                outgoingUpdates.insert(Action::TransportReject, OutgoingUpdate { toReject, OutgoingUpdateCB() });
-            }
-
-            planStep();
-            return true;
-        }
-
-        bool handleIncomingTransportAccept(const QDomElement &jingleEl)
-        {
-            QString contentTag(QStringLiteral("content"));
-            for (QDomElement ce = jingleEl.firstChildElement(contentTag); !ce.isNull();
-                 ce             = ce.nextSiblingElement(contentTag)) {
-                ContentBase cb(ce);
-                auto        transportEl = ce.firstChildElement(QString::fromLatin1("transport"));
-                QString     transportNS = transportEl.namespaceURI();
-                if (!cb.isValid() || transportEl.isNull() || transportNS.isEmpty()) {
-                    lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
-                    return false;
-                }
-                Application *app = contentList.value(ContentKey { cb.name, cb.creator });
-                if (!app || !app->transport() || app->transport()->pad()->ns() != transportNS
-                    || !app->incomingTransportAccept(transportEl)) {
-                    lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
-                    return false;
-                }
-            }
-
-            planStep();
-            return true;
-        }
-
-        bool handleIncomingTransportInfo(const QDomElement &jingleEl)
-        {
-            QString                                              contentTag(QStringLiteral("content"));
-            QList<QPair<QSharedPointer<Transport>, QDomElement>> updates;
-            for (QDomElement ce = jingleEl.firstChildElement(contentTag); !ce.isNull();
-                 ce             = ce.nextSiblingElement(contentTag)) {
-                Application *app;
-                ContentBase  cb(ce);
-                if (!cb.isValid() || !(app = q->content(cb.name, cb.creator)) || app->state() >= State::Finishing
-                    || !app->transport()) {
-                    lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
-                    return false;
-                }
-                auto tel = ce.firstChildElement(QStringLiteral("transport"));
-                if (tel.isNull() || tel.namespaceURI() != app->transport()->pad()->ns()) {
-                    lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
-                    return false;
-                }
-                updates.append(qMakePair(app->transport(), tel));
-            }
-
-            for (auto &u : updates) {
-                if (!u.first->update(u.second)) {
-                    lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
-                    return false; // yes this may lead to half updated content, but what choice do we have?
-                }
-            }
-
-            return true;
-        }
-    };
-
-    Session::Session(Manager *manager, const Jid &peer, Origin role) : d(new Private)
-    {
-        d->q          = this;
-        d->role       = role;
-        d->manager    = manager;
-        d->otherParty = peer;
-        d->stepTimer.setSingleShot(true);
-        d->stepTimer.setInterval(0);
-        connect(&d->stepTimer, &QTimer::timeout, this, [this]() { d->doStep(); });
-    }
-
-    Session::~Session()
-    {
-        qDeleteAll(d->contentList);
-        qDebug("session %s destroyed", qPrintable(d->sid));
-    }
-
-    Manager *Session::manager() const { return d->manager; }
-
-    State Session::state() const { return d->state; }
-
-    Jid Session::me() const { return d->manager->client()->jid(); }
-
-    Jid Session::peer() const { return d->otherParty; }
-
-    Jid Session::initiator() const
-    {
-        return d->role == Origin::Initiator ? d->manager->client()->jid() : d->otherParty;
-    }
-
-    Jid Session::responder() const
-    {
-        return d->role == Origin::Responder ? d->manager->client()->jid() : d->otherParty;
-    }
-
-    QString Session::sid() const { return d->sid; }
-
-    Origin Session::role() const { return d->role; }
-
-    Origin Session::peerRole() const { return negateOrigin(d->role); }
-
-    XMPP::Stanza::Error Session::lastError() const { return d->lastError; }
-
-    Application *Session::newContent(const QString &ns, Origin senders)
-    {
-        auto pad = applicationPadFactory(ns);
-        if (pad) {
-            return pad->manager()->startApplication(pad, pad->generateContentName(senders), d->role, senders);
-        }
-        return nullptr;
-    }
-
-    Application *Session::content(const QString &contentName, Origin creator)
-    {
-        return d->contentList.value(ContentKey { contentName, creator });
-    }
-
-    void Session::addContent(Application *content)
-    {
-        Q_ASSERT(d->state < State::Finishing);
-        d->addAndInitContent(d->role, content);
-        if (d->state >= State::PrepareLocalOffer) {
-            // If we add content to already initiated session then we are gonna
-            // send it immediatelly. So start prepare
-            content->prepare();
-        }
-    }
-
-    const QMap<ContentKey, Application *> &Session::contentList() const { return d->contentList; }
-
-    ApplicationManagerPad::Ptr Session::applicationPad(const QString &ns)
-    {
-        return d->applicationPads.value(ns).toStrongRef();
-    }
-
-    TransportManagerPad::Ptr Session::transportPad(const QString &ns)
-    {
-        return d->transportPads.value(ns).toStrongRef();
-    }
-
-    QSharedPointer<Transport> Session::newOutgoingTransport(const QString &ns)
-    {
-        auto pad = transportPadFactory(ns);
-        if (pad) {
-            return pad->manager()->newTransport(pad); // pad on both side becaue we need shared pointer
-        }
-        return QSharedPointer<Transport>();
-    }
-
-    QString Session::preferredApplication() const
-    {
-        // TODO some heuristics to detect preferred application
-        if (d->applicationPads.size()) {
-            return d->applicationPads.constBegin().key();
-        }
-        return QString();
-    }
-
-    QStringList Session::allApplicationTypes() const { return d->applicationPads.keys(); }
-
-    void Session::setLocalJid(const Jid &jid) { d->localParty = jid; }
-
-    void Session::accept()
-    {
-        // So we presented a user incoming session in UI, the user modified it somehow and finally accepted.
-        if (d->role == Origin::Responder && d->state == State::Created) {
-            d->state = State::PrepareLocalOffer;
-            for (auto &c : d->contentList) {
-                c->prepare();
-            }
-            d->planStep();
-        }
-    }
-
-    void Session::initiate()
-    {
-        emit initiated();
-        if (d->role == Origin::Initiator && d->state == State::Created) {
-            d->state = State::PrepareLocalOffer;
-            for (auto &c : d->contentList) {
-                c->prepare();
-            }
-            d->planStep();
-        }
-    }
-
-    void Session::terminate(Reason::Condition cond, const QString &comment)
-    {
-        if (d->role == Origin::Initiator && d->state == State::PrepareLocalOffer) {
-            d->setSessionFinished();
-            return;
-        }
-        d->state           = State::Finishing;
-        d->terminateReason = Reason(cond, comment);
-        d->planStep();
-    }
-
-    TransportManagerPad::Ptr Session::transportPadFactory(const QString &ns)
-    {
-        auto pad = d->transportPads.value(ns).toStrongRef();
-        if (!pad) {
-            auto deleter = [ns, this](TransportManagerPad *pad) {
-                d->transportPads.remove(ns);
-                delete pad;
-            };
-            pad = TransportManagerPad::Ptr(d->manager->transportPad(this, ns), deleter);
-            if (pad) {
-                d->transportPads.insert(ns, pad);
-            }
-        }
-        return pad;
-    }
-
-    ApplicationManagerPad::Ptr Session::applicationPadFactory(const QString &ns)
-    {
-        auto pad = d->applicationPads.value(ns).toStrongRef();
-        if (!pad) {
-            auto deleter = [ns, this](ApplicationManagerPad *pad) {
-                d->applicationPads.remove(ns);
-                delete pad;
-            };
-            pad = ApplicationManagerPad::Ptr(d->manager->applicationPad(this, ns), deleter);
-            if (pad) {
-                d->applicationPads.insert(ns, pad);
-            }
-        }
-        return pad;
-    }
-
-    bool Session::incomingInitiate(const Jingle &jingle, const QDomElement &jingleEl)
-    {
-        d->sid      = jingle.sid();
-        d->origFrom = d->otherParty;
-        if (jingle.initiator().isValid() && !jingle.initiator().compare(d->origFrom)) {
-            d->otherParty = jingle.initiator();
-        }
-
-        Private::AddContentError err;
-        Reason::Condition        cond;
-        QList<Application *>     apps;
-        QList<QDomElement>       rejects;
-
-        std::tie(err, cond, apps, rejects) = d->parseContentAddList(jingleEl);
-        switch (err) {
-        case Private::AddContentError::Unparsed:
-        case Private::AddContentError::Unexpected:
-            return false;
-        case Private::AddContentError::Unsupported:
-            d->terminateReason = Reason(cond);
-            d->planStep();
-            return true;
-        case Private::AddContentError::Ok:
-            for (auto app : apps) {
-                d->addAndInitContent(Origin::Initiator, app);
-            }
-            d->planStep();
-            return true;
-        }
-
-        return false;
-    }
-
-    bool Session::updateFromXml(Action action, const QDomElement &jingleEl)
-    {
-        if (d->state == State::Finished) {
-            d->lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::UnexpectedRequest);
-            ErrorUtil::fill(jingleEl.ownerDocument(), d->lastError, ErrorUtil::OutOfOrder);
-            return false;
-        }
-
-        switch (action) {
-        case Action::ContentAccept:
-            return d->handleIncomingContentAccept(jingleEl);
-        case Action::ContentAdd:
-            return d->handleIncomingContentAdd(jingleEl);
-        case Action::ContentModify:
-            break;
-        case Action::ContentReject:
-            break;
-        case Action::ContentRemove:
-            return d->handleIncomingContentRemove(jingleEl);
-        case Action::DescriptionInfo:
-            break;
-        case Action::SecurityInfo:
-            break;
-        case Action::SessionAccept:
-            return d->handleIncomingSessionAccept(jingleEl);
-        case Action::SessionInfo:
-            break;
-        case Action::SessionInitiate: // impossible case. but let compiler be happy
-            break;
-        case Action::SessionTerminate:
-            return d->handleIncomingSessionTerminate(jingleEl);
-        case Action::TransportAccept:
-            return d->handleIncomingTransportAccept(jingleEl);
-        case Action::TransportInfo:
-            return d->handleIncomingTransportInfo(jingleEl);
-        case Action::TransportReject:
-            break;
-        case Action::TransportReplace:
-            return d->handleIncomingTransportReplace(jingleEl);
-        case Action::NoAction:
-        default:
-            break;
-        }
-
-        d->lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::FeatureNotImplemented);
-        return false;
-    }
-
     //----------------------------------------------------------------------------
     // SessionManagerPad - handle event related to a type of app/transport but not specific instance
     //----------------------------------------------------------------------------
@@ -1570,6 +545,12 @@ namespace XMPP { namespace Jingle {
         d->client  = client;
         d->manager = this;
         d->pushTask.reset(new JTPush(client->rootTask()));
+        /*
+        static bool mtReg = false;
+        if (!mtReg) {
+            qRegisterMetaType<Session>();
+        }
+        */
     }
 
     Manager::~Manager()
@@ -1668,7 +649,7 @@ namespace XMPP { namespace Jingle {
         return transportManager->pad(session);
     }
 
-    QStringList Manager::availableTransports(const Transport::Features &features) const
+    QStringList Manager::availableTransports(const TransportFeatures &features) const
     {
         QStringList ret;
         for (auto it = d->transportManagers.cbegin(); it != d->transportManagers.cend(); ++it) {
@@ -1693,7 +674,8 @@ namespace XMPP { namespace Jingle {
             // emit incomingSession makes sense when there are no unsolved conflicts in content descriptions /
             // transports
             // QTimer::singleShot(0,[s, this](){ emit incomingSession(s); });
-            QMetaObject::invokeMethod(this, "incomingSession", Qt::QueuedConnection, Q_ARG(Session *, s));
+            // QMetaObject::invokeMethod(this, "incomingSession", Qt::QueuedConnection, Q_ARG(Session *, s));
+            QTimer::singleShot(0, this, [s, this]() { emit incomingSession(s); });
             return s;
         }
         d->lastError = s->lastError();
@@ -1721,34 +703,9 @@ namespace XMPP { namespace Jingle {
         return id;
     }
 
-    Origin negateOrigin(Origin o)
-    {
-        switch (o) {
-        case Origin::None:
-            return Origin::Both;
-        case Origin::Both:
-            return Origin::None;
-        case Origin::Initiator:
-            return Origin::Responder;
-        case Origin::Responder:
-            return Origin::Initiator;
-        }
-        return Origin::None;
-    }
-
-    bool Connection::hasPendingDatagrams() const { return false; }
-
-    NetworkDatagram Connection::receiveDatagram(qint64 maxSize)
-    {
-        Q_UNUSED(maxSize)
-        return NetworkDatagram();
-    }
-
-    size_t Connection::blockSize() const
-    {
-        return 0; // means "block" is not applicable for this kind of connection
-    }
-
+    //----------------------------------------------------------------------------
+    // ErrorUtil
+    //----------------------------------------------------------------------------
     const char *ErrorUtil::names[ErrorUtil::Last]
         = { "out-of-order", "tie-break", "unknown-session", "unsupported-info" };
 
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index b66f366c..6b82e9e3 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -20,17 +20,11 @@
 #ifndef JINGLE_H
 #define JINGLE_H
 
-#include "bytestream.h"
 #include "xmpp_stanza.h"
 
 #include <QSharedDataPointer>
 #include <QSharedPointer>
 #include <functional>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
-#include <QNetworkDatagram>
-#else
-#include <QHostAddress>
-#endif
 
 class QDomDocument;
 class QDomElement;
@@ -51,29 +45,58 @@ namespace Jingle {
     /*
      Session states:
       * Created           - new session
-      * PrepareLocalOffer - user accepted session but it's not yet ready for session-initiate/accept message
+      * ApprovedToSend    - user accepted session but it's not yet ready for session-initiate/accept message
       * Unacked           - session-initiate/accept was sent. wait for IQ ack
-      * Pending           - session-initiate was acknowledged. awaits session-accept.
+      * Pending           - local only: session-initiate was acknowledged. awaits session-accept.
       * Active            - session was accepted and now active.
       * Finihed           - session-terminate was sent/received
 
+     Local app states:
+      * Created           - after constructor till local user initiates the sending
+      * ApprovedToSend    - user already clicked "send" but our offer is not ready yet (collecting candidates)
+      * Unacked           - initial offer is sent but no iq result yet
+      * Pending           - got iq result but no accept (answer) request yet
+      * Accepted          - remote accepted the app. waiting for start() (for example when all session is accepted)
+      * Connecting        - session was accepted (or content-accepted for early-session). negotiating connection
+      * Active            - connection was established. now real data passes.
+      * Finishing         - need to send some final statuses over signalling
+      * Finished          - app was removed from session
+
+     Remote app states:
+      * Created           - after constructor till local user accepts the app
+      * ApprovedToSend    - user already accepted but our answer is not ready yet (collecting candidates)
+      * Unacked           - the answer is sent but no iq result yet
+      * Accepted          - waiting for start() (for example when all session is accepted)
+      * Connecting        - session was accepted (or content-accepted for early-session). negotiating connection
+      * Active            - connection was established. now real data passes.
+      * Finishing         - need to send some final statuses over signalling
+      * Finished          - app was removed from session
+
+     Local transport states (our initial offer or our outgoing transport-replace):
+      * Created           - initial: just after constructor but before "send" button was pushed.
+      *                     replace: if previous was > Created then replace will start right from ApprovedToSend
+      * ApprovedToSend    - initial: we are preparing initial offer ("send" was pushed already)
+      *                     replace: we are going to replace previously sent trasport offer. preparing new one
+      * Unacked           - no iq "result" yet
+      * Pending           - got iq result but no any kind of transport accept
+      * Accepted          - session/content/transport-replace accepted. app should start negotiation explicitly
+      * Connecting        - connetion negotiation
+      * Active            - traferring data
+      * Finished          - In failure case: Needs to report transport failure / replace / reject
+
+     Remote transport states (remote initial offer or remote transport-replace):
+      * Created           - initial: local user hasn't accepted yet the offer
+      *                     replace: remote changes its own offer before local accepted anything
+      * ApprovedToSend    - initial/replace: user accepted the offer. we are preparing our response
+      * Unacked           - no iq "result" yet
+      * Accepted          - session/content/transport-replace accepted. app should start negotiation explicitly
+      * Connecting        - connetion negotiation
+      * Active            - traferring data
+      * Finished          - In failure case: Needs to report transport failure / replace / reject
+
      Locally initiated session passes all the above and remotely initiated skips Pending.
     */
-    enum class State {
-        Created,           // just after constructor
-        PrepareLocalOffer, // content accepted by local user but we are not ready yet to send content-accept or
-                           // session-accept. same for content-add/session-initiate, where user already already
-                           // sent/added in ui and it's network turn.
-        Unacked,           // local content offer is sent to remote but no IQ ack yet
-        Pending,           // waits for session-accept or content-accept from remote
-        Accepted,   // app only: local: "accept" received, waits for start(). remote: "accept" sent and acknowledged,
-                    // waits for start()
-        Connecting, // app only: s5b/ice probes etc (particular application state. can be omited for other entities)
-        Active,     // active transfer. transport is connected. For session it means it was accepted
-        Finishing,  // app only: basically it's finished but has some pending operations. like sending
-                    // content-reject/remove to remote
-        Finished    // transfering is finished for whatever reason. no more signals/state changes etc. can be deleted
-    };
+    enum class State { Created, ApprovedToSend, Unacked, Pending, Accepted, Connecting, Active, Finishing, Finished };
 
     enum class Action {
         NoAction, // non-standard, just a default
@@ -96,8 +119,39 @@ namespace Jingle {
 
     inline uint qHash(const XMPP::Jingle::Action &o, uint seed = 0) { return ::qHash(int(o), seed); }
 
-    typedef QPair<QString, Origin> ContentKey;
-    typedef std::function<void()>  OutgoingUpdateCB;
+    /*
+    Categorization by speed, reliability and connectivity
+    - speed: realtim, fast, slow
+    - reliability: reliable, not reliable (some transport can both modes)
+    - connectivity: always connect, hard to connect
+
+    Some transports may change their qualities, so we have to consider worst case.
+
+    ICE-UDP: RealTime, Not Reliable, Hard To Connect
+    S5B:     Fast,     Reliable,     Hard To Connect
+    IBB:     Slow,     Reliable,     Always Connect
+
+    Also most of transports may add extra features but it's matter of configuration.
+    For example all of them can enable p2p crypto mode (<security/> should work here)
+    */
+    enum class TransportFeature {
+        // connection establishment
+        HardToConnect = 0x01, // anything else but ibb
+        AlwaysConnect = 0x02, // ibb. basically it's always connected
+
+        // reliability
+        NotReliable = 0x10, // datagram-oriented
+        Reliable    = 0x20, // connection-orinted
+
+        // speed.
+        Slow     = 0x100, // only ibb is here probably
+        Fast     = 0x200, // basically all tcp-based and reliable part of sctp
+        RealTime = 0x400  // it's rather about synchronization of frames with time which implies fast
+    };
+    Q_DECLARE_FLAGS(TransportFeatures, TransportFeature)
+
+    typedef QPair<QString, Origin>            ContentKey;
+    typedef std::function<void(bool success)> OutgoingUpdateCB;
     typedef std::tuple<QList<QDomElement>, OutgoingUpdateCB>
         OutgoingUpdate; // list of elements to b inserted to <jingle> and success callback
     typedef std::tuple<QDomElement, OutgoingUpdateCB>
@@ -203,7 +257,7 @@ namespace Jingle {
 
         inline bool isValid() const { return creator != Origin::None && !name.isEmpty(); }
 
-        QDomElement   toXml(QDomDocument *doc, const char *tagName) const;
+        QDomElement   toXml(QDomDocument *doc, const char *tagName, const QString &ns = QString()) const;
         static Origin creatorAttr(const QDomElement &el);
         static bool   setCreatorAttr(QDomElement &el, Origin creator);
 
@@ -241,319 +295,10 @@ namespace Jingle {
         QDomDocument *      doc() const;
     };
 
-    class TransportManager;
-    class TransportManagerPad : public SessionManagerPad {
-        Q_OBJECT
-    public:
-        typedef QSharedPointer<TransportManagerPad> Ptr;
-
-        virtual TransportManager *manager() const = 0;
-    };
-
     class ApplicationManager;
-    class ApplicationManagerPad : public SessionManagerPad {
-        Q_OBJECT
-    public:
-        typedef QSharedPointer<ApplicationManagerPad> Ptr;
-
-        using SessionManagerPad::SessionManagerPad;
-
-        virtual ApplicationManager *manager() const = 0;
-
-        /*
-         * for example we transfer a file
-         * then first file may generate name "file1", next "file2" etc
-         * As result it will be sent as <content name="file1" ... >
-         */
-        virtual QString generateContentName(Origin senders) = 0;
-    };
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 8, 0)
-    // stub implementation
-    class NetworkDatagram {
-    public:
-        bool       _valid = false;
-        QByteArray _data;
-        inline NetworkDatagram(const QByteArray &data, const QHostAddress &destinationAddress = QHostAddress(),
-                               quint16 port = 0) :
-            _valid(true),
-            _data(data)
-        {
-            Q_UNUSED(destinationAddress);
-            Q_UNUSED(port)
-        }
-        inline NetworkDatagram() {}
-
-        inline bool       isValid() const { return _valid; }
-        inline QByteArray data() const { return _data; }
-    };
-#else
-    typedef QNetworkDatagram NetworkDatagram;
-#endif
-
-    class Connection : public ByteStream {
-        Q_OBJECT
-    public:
-        using Ptr = QSharedPointer<Connection>; // will be shared between transport and application
-        virtual bool            hasPendingDatagrams() const;
-        virtual NetworkDatagram receiveDatagram(qint64 maxSize = -1);
-        virtual size_t          blockSize() const;
-    };
-
-    class Application;
-    class Transport : public QObject {
-        Q_OBJECT
-    public:
-        /*
-        Categorization by speed, reliability and connectivity
-        - speed: realtim, fast, slow
-        - reliability: reliable, not reliable (some transport can both modes)
-        - connectivity: always connect, hard to connect
-
-        Some transports may change their qualities, so we have to consider worst case.
-
-        ICE-UDP: RealTime, Not Reliable, Hard To Connect
-        S5B:     Fast,     Reliable,     Hard To Connect
-        IBB:     Slow,     Reliable,     Always Connect
-
-        Also most of transports may add extra features but it's matter of configuration.
-        For example all of them can enable p2p crypto mode (<security/> should work here)
-        */
-        enum Feature {
-            // connection establishment
-            HardToConnect = 0x01, // anything else but ibb
-            AlwaysConnect = 0x02, // ibb. basically it's always connected
-
-            // reliability
-            NotReliable = 0x10, // datagram-oriented
-            Reliable    = 0x20, // connection-orinted
-
-            // speed.
-            Slow     = 0x100, // only ibb is here probably
-            Fast     = 0x200, // basically all tcp-based and reliable part of sctp
-            RealTime = 0x400  // it's rather about synchronization of frames with time which implies fast
-        };
-        Q_DECLARE_FLAGS(Features, Feature)
-
-        using QObject::QObject;
-
-        enum Direction { // incoming or outgoing file/data transfer.
-            Outgoing,
-            Incoming
-        };
-
-        /**
-         * @brief prepare to send content-add/session-initiate
-         *  When ready, the application first set update type to ContentAdd and then emit updated()
-         */
-        virtual void prepare() = 0;
-
-        /**
-         * @brief start really transfer data. starting with connection to remote candidates for example
-         */
-        virtual void start() = 0; // for local transport start searching for candidates (including probing proxy,stun
-                                  // etc) for remote transport try to connect to all proposed hosts in order their
-                                  // priority. in-band transport may just emit updated() here
-        virtual bool update(const QDomElement &el) = 0; // accepts transport element on incoming transport-info
-        virtual bool isInitialOfferReady() const   = 0;
-        virtual bool hasUpdates() const            = 0;
-        virtual OutgoingTransportInfoUpdate takeInitialOffer()   = 0;
-        virtual OutgoingTransportInfoUpdate takeOutgoingUpdate() = 0;
-        virtual bool                        isValid() const      = 0;
-        virtual Features                    features() const     = 0;
-        virtual TransportManagerPad::Ptr    pad() const          = 0;
-        virtual Connection::Ptr             connection() const   = 0; // returns established QIODevice-based connection
-    signals:
-        void updated(); // found some candidates and they have to be sent. takeUpdate has to be called from this signal
-                        // handler. if it's just always ready then signal has to be sent at least once otherwise
-                        // session-initiate won't be sent.
-        void connected(); // this signal is for app logic. maybe to finally start drawing some progress bar
-        void failed();    // transport ailed for whatever reason. aborted for example
-    };
-
-    class Application : public QObject {
-        Q_OBJECT
-    public:
-        enum SetDescError {
-            Ok,
-            Unparsed,
-            IncompatibleParameters // this one is for <reason>
-        };
-
-        virtual ApplicationManagerPad::Ptr pad() const   = 0;
-        virtual State                      state() const = 0;
-        virtual void setState(State state) = 0; // likely just remember the state and not generate any signals
-        virtual XMPP::Stanza::Error lastError() const         = 0;
-        virtual Reason              terminationReason() const = 0;
-
-        virtual Origin  creator() const     = 0;
-        virtual Origin  senders() const     = 0;
-        virtual QString contentName() const = 0;
-
-        // returns Origin::None if no transport-replace in progress or the side triggered the replace.
-        virtual Origin       transportReplaceOrigin() const                 = 0;
-        virtual SetDescError setDescription(const QDomElement &description) = 0;
-
-        /**
-         * @brief setTransport checks if transport is compatible and stores it
-         * @param transport
-         * @return false if not compatible
-         */
-        virtual bool                      setTransport(const QSharedPointer<Transport> &transport) = 0;
-        virtual QSharedPointer<Transport> transport() const                                        = 0;
-
-        /**
-         * @brief evaluateOutgoingUpdate computes and prepares next update which will be taken with takeOutgoingUpdate
-         *   The updated will be taked immediately if considered to be most preferred among other updates types of
-         *   other applications.
-         * @return update type
-         */
-        virtual Action evaluateOutgoingUpdate() = 0;
-        // this may return something only when evaluateOutgoingUpdate() != NoAction
-        virtual OutgoingUpdate takeOutgoingUpdate() = 0;
-
-        /**
-         * @brief wantBetterTransport checks if the transport is a better match for the application
-         * @return
-         */
-        virtual bool wantBetterTransport(const QSharedPointer<Transport> &) const = 0;
-
-        /**
-         * @brief selectNextTransport selects next transport from compatible transports list.
-         *   The list is usually store in the application
-         * @return
-         */
-        virtual bool selectNextTransport() = 0;
-
-        /**
-         * @brief prepare to send content-add/session-initiate
-         *  When ready, the application first set update type to ContentAdd and then emit updated()
-         */
-        virtual void prepare()                     = 0;
-        virtual bool accept(const QDomElement &el) = 0; // remote accepted our content
-        virtual void start()                       = 0;
-        virtual void remove(Reason::Condition cond = Reason::Success, const QString &comment = QString()) = 0;
-
-        /**
-         * @brief incomingTransportReplace it's jingle transport-replace
-         * @param transport
-         * @return
-         */
-        virtual bool incomingTransportReplace(const QSharedPointer<Transport> &transport) = 0;
-        virtual bool incomingTransportAccept(const QDomElement &transportEl)              = 0;
-        virtual void incomingRemove(const Reason &r)                                      = 0;
-
-    signals:
-        void updated(); // signal for session it has to send updates to remote. so it will follow with
-                        // takeOutgoingUpdate() eventually
-        void stateChanged(State);
-    };
-
-    class Session : public QObject {
-        Q_OBJECT
-    public:
-        // Note incoming session are not registered in Jingle Manager until validated.
-        // and then either rejected or registered in Pending state.
-
-        Session(Manager *manager, const Jid &peer, Origin role = Origin::Initiator);
-        ~Session();
-
-        Manager *manager() const;
-        State    state() const;
-
-        Jid     me() const;
-        Jid     peer() const;
-        Jid     initiator() const;
-        Jid     responder() const;
-        QString sid() const;
-
-        Origin role() const; // my role in session: initiator or responder
-        Origin peerRole() const;
-
-        XMPP::Stanza::Error lastError() const;
-
-        // make new local content but do not add it to session yet
-        Application *newContent(const QString &ns, Origin senders = Origin::Both);
-        // get registered content if any
-        Application *                          content(const QString &contentName, Origin creator);
-        void                                   addContent(Application *content);
-        const QMap<ContentKey, Application *> &contentList() const;
-
-        ApplicationManagerPad::Ptr applicationPad(const QString &ns);
-        TransportManagerPad::Ptr   transportPad(const QString &ns);
-
-        QSharedPointer<Transport> newOutgoingTransport(const QString &ns);
-
-        QString     preferredApplication() const;
-        QStringList allApplicationTypes() const;
-
-        void setLocalJid(const Jid &jid); // w/o real use case the implementation is rather stub
-
-        void accept();
-        void initiate();
-        void terminate(Reason::Condition cond, const QString &comment = QString());
-
-        // allocates or returns existing pads
-        ApplicationManagerPad::Ptr applicationPadFactory(const QString &ns);
-        TransportManagerPad::Ptr   transportPadFactory(const QString &ns);
-    signals:
-        void managerPadAdded(const QString &ns);
-        void initiated();
-        void activated();
-        void terminated();
-        void newContentReceived();
-
-    private:
-        friend class Manager;
-        friend class JTPush;
-        bool incomingInitiate(const Jingle &jingle, const QDomElement &jingleEl);
-        bool updateFromXml(Action action, const QDomElement &jingleEl);
-
-        class Private;
-        QScopedPointer<Private> d;
-    };
-
-    class ApplicationManager : public QObject {
-        Q_OBJECT
-    public:
-        ApplicationManager(QObject *parent = nullptr);
-
-        virtual void         setJingleManager(Manager *jm) = 0;
-        virtual Application *startApplication(const ApplicationManagerPad::Ptr &pad, const QString &contentName,
-                                              Origin creator, Origin senders)
-            = 0;
-        virtual ApplicationManagerPad *pad(Session *session) = 0;
-
-        // this method is supposed to gracefully close all related sessions as a preparation for plugin unload for
-        // example
-        virtual void closeAll() = 0;
-    };
-
-    class TransportManager : public QObject {
-        Q_OBJECT
-    public:
-        TransportManager(QObject *parent = nullptr);
-
-        // may show more features than Transport instance. For example some transports may work in both reliable and not
-        // reliable modes
-        virtual Transport::Features features() const              = 0;
-        virtual void                setJingleManager(Manager *jm) = 0;
-
-        // FIXME rename methods
-        virtual QSharedPointer<Transport> newTransport(const TransportManagerPad::Ptr &pad)
-            = 0; // outgoing. one have to call Transport::start to collect candidates
-        virtual QSharedPointer<Transport> newTransport(const TransportManagerPad::Ptr &pad,
-                                                       const QDomElement &             transportEl)
-            = 0; // incoming
-        virtual TransportManagerPad *pad(Session *session) = 0;
-
-        // this method is supposed to gracefully close all related sessions as a preparation for plugin unload for
-        // example
-        virtual void closeAll() = 0;
-    signals:
-        void abortAllRequested(); // mostly used by transport instances to abort immediately
-    };
-
+    class ApplicationManagerPad;
+    class TransportManager;
+    class TransportManagerPad;
     class Manager : public QObject {
         Q_OBJECT
 
@@ -583,7 +328,7 @@ namespace Jingle {
         bool                 isRegisteredTransport(const QString &ns);
         TransportManagerPad *transportPad(Session *      session,
                                           const QString &ns); // allocates new pad on transport manager
-        QStringList          availableTransports(const Transport::Features &features = Transport::Features()) const;
+        QStringList          availableTransports(const TransportFeatures &features = TransportFeatures()) const;
 
         /**
          * @brief isAllowedParty checks if the remote jid allowed to initiate a session
@@ -615,6 +360,6 @@ namespace Jingle {
 } // namespace Jingle
 } // namespace XMPP
 
-Q_DECLARE_OPERATORS_FOR_FLAGS(XMPP::Jingle::Transport::Features)
+Q_DECLARE_OPERATORS_FOR_FLAGS(XMPP::Jingle::TransportFeatures)
 
 #endif // JINGLE_H
diff --git a/src/xmpp/xmpp-im/xmpp_hash.h b/src/xmpp/xmpp-im/xmpp_hash.h
index 4a21bc37..8929ae28 100644
--- a/src/xmpp/xmpp-im/xmpp_hash.h
+++ b/src/xmpp/xmpp-im/xmpp_hash.h
@@ -53,6 +53,7 @@ class Hash {
     inline bool operator==(const Hash &other) const { return v_type == other.v_type && v_data == other.v_data; }
 
     inline bool isValid() const { return v_type > Unknown && v_type <= LastType; }
+    inline      operator bool() const { return isValid(); }
 
     inline Type type() const { return v_type; }
     inline void setType(Type t) { v_type = t; }
diff --git a/src/xmpp/xmpp.pri b/src/xmpp/xmpp.pri
index 43cbb42c..c3030ac2 100644
--- a/src/xmpp/xmpp.pri
+++ b/src/xmpp/xmpp.pri
@@ -41,8 +41,11 @@ HEADERS += \
     $$PWD/xmpp-im/filetransfer.h \
     $$PWD/xmpp-im/httpfileupload.h \
     $$PWD/xmpp-im/im.h \
-    $$PWD/xmpp-im/jingle-ft.h \
     $$PWD/xmpp-im/jingle.h \
+    $$PWD/xmpp-im/jingle-transport.h \
+    $$PWD/xmpp-im/jingle-application.h \
+    $$PWD/xmpp-im/jingle-session.h \
+    $$PWD/xmpp-im/jingle-ft.h \
     $$PWD/xmpp-im/jingle-ibb.h \
     $$PWD/xmpp-im/jingle-s5b.h \
     $$PWD/xmpp-im/s5b.h \
@@ -118,6 +121,9 @@ SOURCES += \
     $$PWD/xmpp-im/xmpp_caps.cpp \
     $$PWD/xmpp-im/xmpp_serverinfomanager.cpp \
     $$PWD/xmpp-im/jingle.cpp \
+    $$PWD/xmpp-im/jingle-transport.cpp \
+    $$PWD/xmpp-im/jingle-application.cpp \
+    $$PWD/xmpp-im/jingle-session.cpp \
     $$PWD/xmpp-im/jingle-ft.cpp \
     $$PWD/xmpp-im/jingle-s5b.cpp \
     $$PWD/xmpp-im/jingle-ibb.cpp

From 2be1e380268c631f4507f33b608d0befad55ac73 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 19 Feb 2020 01:56:38 +0300
Subject: [PATCH 125/383] Some work on generic jingle transport selector
 interface

---
 include/iris/jingle-application.h            |  1 +
 include/iris/jingle-nstransportslist.h       |  1 +
 include/iris/jingle-transport.h              |  1 +
 src/xmpp/CMakeLists.txt                      |  6 +-
 src/xmpp/xmpp-im/jingle-nstransportslist.cpp | 65 ++++++++++++++++++++
 src/xmpp/xmpp-im/jingle-nstransportslist.h   | 43 +++++++++++++
 src/xmpp/xmpp-im/jingle-session.cpp          |  6 +-
 src/xmpp/xmpp-im/jingle-transport.cpp        |  3 +
 src/xmpp/xmpp-im/jingle-transport.h          | 24 ++++++++
 src/xmpp/xmpp.pri                            |  2 +
 10 files changed, 147 insertions(+), 5 deletions(-)
 create mode 100644 include/iris/jingle-application.h
 create mode 100644 include/iris/jingle-nstransportslist.h
 create mode 100644 include/iris/jingle-transport.h
 create mode 100644 src/xmpp/xmpp-im/jingle-nstransportslist.cpp
 create mode 100644 src/xmpp/xmpp-im/jingle-nstransportslist.h

diff --git a/include/iris/jingle-application.h b/include/iris/jingle-application.h
new file mode 100644
index 00000000..adab289d
--- /dev/null
+++ b/include/iris/jingle-application.h
@@ -0,0 +1 @@
+#include "../../src/xmpp/xmpp-im/jingle-application.h"
diff --git a/include/iris/jingle-nstransportslist.h b/include/iris/jingle-nstransportslist.h
new file mode 100644
index 00000000..affbfd0e
--- /dev/null
+++ b/include/iris/jingle-nstransportslist.h
@@ -0,0 +1 @@
+#include "../../src/xmpp/xmpp-im/jingle-nstransportslist.h"
diff --git a/include/iris/jingle-transport.h b/include/iris/jingle-transport.h
new file mode 100644
index 00000000..b83eb5a4
--- /dev/null
+++ b/include/iris/jingle-transport.h
@@ -0,0 +1 @@
+#include "../../src/xmpp/xmpp-im/jingle-transport.h"
diff --git a/src/xmpp/CMakeLists.txt b/src/xmpp/CMakeLists.txt
index 9d13e8e1..4861bc95 100644
--- a/src/xmpp/CMakeLists.txt
+++ b/src/xmpp/CMakeLists.txt
@@ -91,6 +91,7 @@ set(HEADERS
     xmpp-im/xmpp_tasks.h
     xmpp-im/jingle.h
     xmpp-im/jingle-transport.h
+    xmpp-im/jingle-nstransportslist.h
     xmpp-im/jingle-application.h
     xmpp-im/jingle-session.h
     xmpp-im/jingle-ft.h
@@ -131,9 +132,10 @@ set(SOURCES
     xmpp-im/xmpp_xdata.cpp
     xmpp-im/xmpp_xmlcommon.cpp
     xmpp-im/jingle.cpp
-    xmpp-im/jingle-transport.cpp
-    xmpp-im/jingle-application.cpp
     xmpp-im/jingle-session.cpp
+    xmpp-im/jingle-application.cpp
+    xmpp-im/jingle-transport.cpp
+    xmpp-im/jingle-nstransportslist.cpp
     xmpp-im/jingle-ft.cpp
     xmpp-im/jingle-s5b.cpp
     xmpp-im/jingle-ibb.cpp
diff --git a/src/xmpp/xmpp-im/jingle-nstransportslist.cpp b/src/xmpp/xmpp-im/jingle-nstransportslist.cpp
new file mode 100644
index 00000000..9d51590e
--- /dev/null
+++ b/src/xmpp/xmpp-im/jingle-nstransportslist.cpp
@@ -0,0 +1,65 @@
+/*
+ * jignle-nstransportslist.cpp - Simple transport selector based on sorted namespaces list
+ * Copyright (C) 2020  Sergey Ilinykh
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "jingle-nstransportslist.h"
+#include "jingle-session.h"
+
+namespace XMPP { namespace Jingle {
+
+    QSharedPointer<Transport> NSTransportsList::getNextTransport(QSharedPointer<Transport> alike)
+    {
+        return getNextTransport(alike->pad()->ns());
+    }
+
+    QSharedPointer<Transport> NSTransportsList::getNextTransport(const QString &preferredNS)
+    {
+        if (_transports.isEmpty()) {
+            return QSharedPointer<Transport>();
+        }
+
+        int idx = _transports.indexOf(preferredNS);
+        if (idx == -1)
+            idx = _transports.size() - 1;
+
+        do {
+            auto t = _session->newOutgoingTransport(_transports[idx]);
+            if (t) {
+                return t;
+            }
+            _transports.removeAt(idx);
+            idx = _transports.size() - 1;
+        } while (idx != -1);
+
+        return QSharedPointer<Transport>();
+    }
+
+    void NSTransportsList::backupTransport(QSharedPointer<Transport> tr) { _transports += tr->pad()->ns(); }
+
+    bool NSTransportsList::hasMoreTransports() const { return !_transports.isEmpty(); }
+
+    bool NSTransportsList::hasTransport(QSharedPointer<Transport>) const { return false; }
+
+    int NSTransportsList::compare(QSharedPointer<Transport> a, QSharedPointer<Transport> b) const
+    {
+        auto idxA = _transports.indexOf(a->pad()->ns());
+        auto idxB = _transports.indexOf(b->pad()->ns());
+        return idxA < idxB ? -1 : idxA > idxB ? 1 : 0;
+    }
+
+}}
diff --git a/src/xmpp/xmpp-im/jingle-nstransportslist.h b/src/xmpp/xmpp-im/jingle-nstransportslist.h
new file mode 100644
index 00000000..085cb12e
--- /dev/null
+++ b/src/xmpp/xmpp-im/jingle-nstransportslist.h
@@ -0,0 +1,43 @@
+/*
+ * jignle-nstransportslist.h - Simple transport selector based on sorted namespaces list
+ * Copyright (C) 2020  Sergey Ilinykh
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef JINGLENSTRANSPORTSLIST_H
+#define JINGLENSTRANSPORTSLIST_H
+
+#include "jingle-transport.h"
+
+namespace XMPP { namespace Jingle {
+
+    class NSTransportsList : public TransportSelector {
+    public:
+        QSharedPointer<Transport> getNextTransport(QSharedPointer<Transport> alike) override;
+        QSharedPointer<Transport> getNextTransport(const QString &preferredNS);
+
+        void backupTransport(QSharedPointer<Transport>) override;
+        bool hasMoreTransports() const override;
+        bool hasTransport(QSharedPointer<Transport>) const override;
+        int  compare(QSharedPointer<Transport> a, QSharedPointer<Transport> b) const override;
+
+    private:
+        Session *   _session = nullptr;
+        QStringList _transports;
+    };
+
+}}
+#endif
diff --git a/src/xmpp/xmpp-im/jingle-session.cpp b/src/xmpp/xmpp-im/jingle-session.cpp
index 34e2ee59..d2de89a0 100644
--- a/src/xmpp/xmpp-im/jingle-session.cpp
+++ b/src/xmpp/xmpp-im/jingle-session.cpp
@@ -353,17 +353,17 @@ namespace XMPP { namespace Jingle {
             auto    tel = contentEl.firstChildElement(QLatin1String("transport"));
             QString transportNS;
             if (tel.isNull() || (transportNS = tel.namespaceURI()).isEmpty()) {
-                TransportResult { false, Reason::NoReason, nullptr };
+                TransportResult { false, Reason::NoReason, QSharedPointer<Transport>() };
             }
             auto trPad = q->transportPadFactory(transportNS);
             if (!trPad) {
-                return TransportResult { true, Reason::UnsupportedTransports, nullptr };
+                return TransportResult { true, Reason::UnsupportedTransports, QSharedPointer<Transport>() };
             }
             auto transport = trPad->manager()->newTransport(trPad, negateOrigin(role));
             if (transport && transport->update(tel)) {
                 return TransportResult { true, Reason::NoReason, transport };
             }
-            return TransportResult { false, Reason::NoReason, nullptr };
+            return TransportResult { false, Reason::NoReason, QSharedPointer<Transport>() };
         }
 
         void addAndInitContent(Origin creator, Application *content)
diff --git a/src/xmpp/xmpp-im/jingle-transport.cpp b/src/xmpp/xmpp-im/jingle-transport.cpp
index ba5b0c31..2a7e3b81 100644
--- a/src/xmpp/xmpp-im/jingle-transport.cpp
+++ b/src/xmpp/xmpp-im/jingle-transport.cpp
@@ -55,4 +55,7 @@ namespace XMPP { namespace Jingle {
     {
         return 0; // means "block" is not applicable for this kind of connection
     }
+
+    TransportSelector::~TransportSelector() {}
+
 }}
diff --git a/src/xmpp/xmpp-im/jingle-transport.h b/src/xmpp/xmpp-im/jingle-transport.h
index 4a4d007d..9c580cd0 100644
--- a/src/xmpp/xmpp-im/jingle-transport.h
+++ b/src/xmpp/xmpp-im/jingle-transport.h
@@ -126,6 +126,30 @@ namespace XMPP { namespace Jingle {
         Reason                              _lastReason;
     };
 
+    struct TransportSelector {
+        virtual ~TransportSelector();
+        // allocate the most preferred transport from the set
+        virtual QSharedPointer<Transport> getNextTransport(QSharedPointer<Transport> alike
+                                                           = QSharedPointer<Transport>())
+            = 0;
+
+        // put transport back to the set for future use
+        virtual void backupTransport(QSharedPointer<Transport>) = 0;
+
+        // where we can allocate another transport for a replacement
+        virtual bool hasMoreTransports() const = 0;
+
+        // check where we can (still) use this transport for the application
+        virtual bool hasTransport(QSharedPointer<Transport>) const = 0;
+
+        /*
+            >0: transport `a` is more preferred than `b`
+            <0: transport `a` is less preferred
+            =0: it's essentially the same transport, so hardly a replacement.
+        */
+        virtual int compare(QSharedPointer<Transport> a, QSharedPointer<Transport> b) const = 0;
+    };
+
     class TransportManager : public QObject {
         Q_OBJECT
     public:
diff --git a/src/xmpp/xmpp.pri b/src/xmpp/xmpp.pri
index c3030ac2..ba22e0f8 100644
--- a/src/xmpp/xmpp.pri
+++ b/src/xmpp/xmpp.pri
@@ -43,6 +43,7 @@ HEADERS += \
     $$PWD/xmpp-im/im.h \
     $$PWD/xmpp-im/jingle.h \
     $$PWD/xmpp-im/jingle-transport.h \
+    $$PWD/xmpp-im/jingle-nstransportslist.h \
     $$PWD/xmpp-im/jingle-application.h \
     $$PWD/xmpp-im/jingle-session.h \
     $$PWD/xmpp-im/jingle-ft.h \
@@ -123,6 +124,7 @@ SOURCES += \
     $$PWD/xmpp-im/jingle.cpp \
     $$PWD/xmpp-im/jingle-transport.cpp \
     $$PWD/xmpp-im/jingle-application.cpp \
+    $$PWD/xmpp-im/jingle-nstransportslist.cpp \
     $$PWD/xmpp-im/jingle-session.cpp \
     $$PWD/xmpp-im/jingle-ft.cpp \
     $$PWD/xmpp-im/jingle-s5b.cpp \

From 45598dc2c0a6a14b133250eab2aaabff7abff285 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sat, 22 Feb 2020 00:55:05 +0300
Subject: [PATCH 126/383] Split more general purpose code from jingle ft

---
 src/xmpp/xmpp-im/jingle-application.cpp      |  88 +++++++++++-
 src/xmpp/xmpp-im/jingle-application.h        |  43 +++---
 src/xmpp/xmpp-im/jingle-ft.cpp               | 133 ++-----------------
 src/xmpp/xmpp-im/jingle-ft.h                 |  11 +-
 src/xmpp/xmpp-im/jingle-nstransportslist.cpp |  29 +++-
 src/xmpp/xmpp-im/jingle-nstransportslist.h   |  13 +-
 src/xmpp/xmpp-im/jingle-s5b.cpp              |  49 ++++---
 src/xmpp/xmpp-im/jingle-session.cpp          |  23 +++-
 src/xmpp/xmpp-im/jingle-transport.cpp        |   9 +-
 src/xmpp/xmpp-im/jingle-transport.h          |  29 +++-
 10 files changed, 233 insertions(+), 194 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-application.cpp b/src/xmpp/xmpp-im/jingle-application.cpp
index 6514fa09..8ba8f550 100644
--- a/src/xmpp/xmpp-im/jingle-application.cpp
+++ b/src/xmpp/xmpp-im/jingle-application.cpp
@@ -54,7 +54,7 @@ namespace XMPP { namespace Jingle {
             if (inTrReplace && _transport->creator() != _pad->session()->role())
                 _update = { Action::TransportReject, _transport->lastReason() };
             else
-                _update = { canReplaceTransport() ? Action::TransportReplace : Action::ContentRemove,
+                _update = { _transportSelector->hasMoreTransports() ? Action::TransportReplace : Action::ContentRemove,
                             _transport->lastReason() };
             return _update;
         }
@@ -87,7 +87,8 @@ namespace XMPP { namespace Jingle {
                 if (_transport->creator() == _pad->session()->role()) {
                     if (_transport->state() == State::Finished)
                         // replace over unconfirmed replace (2nd transport failed shortly)
-                        _update = { canReplaceTransport() ? Action::TransportReplace : Action::ContentRemove,
+                        _update = { _transportSelector->hasMoreTransports() ? Action::TransportReplace
+                                                                            : Action::ContentRemove,
                                     _transport->lastReason() };
                     break;
                 }
@@ -106,7 +107,7 @@ namespace XMPP { namespace Jingle {
                 if (_transport->state() == State::Connecting)
                     _update = { Action::TransportInfo, Reason() };
             } else if (_transport->state() == State::Finished) {
-                _update = { canReplaceTransport() ? Action::TransportReplace : Action::ContentRemove,
+                _update = { _transportSelector->hasMoreTransports() ? Action::TransportReplace : Action::ContentRemove,
                             _transport->lastReason() };
             }
             break;
@@ -200,4 +201,85 @@ namespace XMPP { namespace Jingle {
         };
         return OutgoingTransportInfoUpdate { transportEl, wrapCB };
     }
+
+    bool Application::selectNextTransport(const QSharedPointer<Transport> alikeTransport)
+    {
+        if (!_transportSelector->hasMoreTransports()) {
+            emit updated(); // will be evaluated to content-remove
+            return false;
+        }
+
+        if (alikeTransport) {
+            auto tr = _transportSelector->getAlikeTransport(alikeTransport);
+            if (tr && setTransport(tr))
+                return true;
+        }
+
+        QSharedPointer<Transport> t;
+        while ((t = _transportSelector->getNextTransport()))
+            if (setTransport(t))
+                return true;
+
+        emit updated(); // will be evaluated to content-remove
+        return false;
+    }
+
+    bool Application::wantBetterTransport(const QSharedPointer<Transport> &t) const
+    {
+        if (!_transportSelector->hasTransport(t))
+            return false;
+
+        return !_transport || _transportSelector->compare(t, _transport) > 0;
+    }
+
+    bool Application::isTransportReplaceEnabled() const { return true; }
+
+    bool Application::setTransport(const QSharedPointer<Transport> &transport, const Reason &reason)
+    {
+        if (!isTransportReplaceEnabled() || !_transportSelector->replace(_transport, transport))
+            return false;
+
+        // in case we automatically select a new transport on our own we definitely will come up to this point
+        if (_transport) {
+            if (_transport->state() < State::Unacked && _transport->creator() == _pad->session()->role()
+                && _transport->pad()->ns() != transport->pad()->ns()) {
+                // the transport will be reused later since the remote doesn't know about it yet
+                _transportSelector->backupTransport(_transport);
+            }
+
+            if (transport->creator() == _pad->session()->role()) {
+                auto ts = _transport->state() == State::Finished ? _transport->prevState() : _transport->state();
+                if (_transport->creator() != _pad->session()->role() || ts > State::Unacked) {
+                    // if remote knows of the current transport
+                    _pendingTransportReplace = PendingTransportReplace::InProgress;
+                } else if (_transport->creator() == _pad->session()->role() && ts == State::Unacked) {
+                    // if remote may know but we don't know yet about it
+                    _pendingTransportReplace = PendingTransportReplace::NeedAck;
+                }
+            } else {
+                _pendingTransportReplace = PendingTransportReplace::InProgress;
+            }
+
+            if (_pendingTransportReplace != PendingTransportReplace::None) {
+                if (_transport->state() == State::Finished) { // initiate replace?
+                    _transportReplaceReason = reason.isValid() ? reason : _transport->lastReason();
+                } else {
+                    _transportReplaceReason = reason;
+                }
+            }
+            _transport->disconnect(this);
+            _transport.reset();
+        }
+
+        _transport = transport;
+        connect(transport.data(), &Transport::updated, this, &Application::updated);
+        connect(transport.data(), &Transport::failed, this, [this]() { selectNextTransport(); });
+
+        initTransport();
+
+        if (_state >= State::Unacked) {
+            _transport->prepare();
+        }
+        return true;
+    }
 }}
diff --git a/src/xmpp/xmpp-im/jingle-application.h b/src/xmpp/xmpp-im/jingle-application.h
index 2d1b7ebd..9eede390 100644
--- a/src/xmpp/xmpp-im/jingle-application.h
+++ b/src/xmpp/xmpp-im/jingle-application.h
@@ -69,6 +69,7 @@ namespace XMPP { namespace Jingle {
         inline Origin                     senders() const { return _senders; }
         inline QString                    contentName() const { return _contentName; }
         inline QSharedPointer<Transport>  transport() const { return _transport; }
+        inline TransportSelector *        transportSelector() const { return _transportSelector.data(); }
 
         virtual SetDescError setRemoteOffer(const QDomElement &description)  = 0;
         virtual SetDescError setRemoteAnswer(const QDomElement &description) = 0;
@@ -90,27 +91,27 @@ namespace XMPP { namespace Jingle {
          * @param transport
          * @return false if not compatible
          */
-        virtual bool setTransport(const QSharedPointer<Transport> &transport, const Reason &reason = Reason()) = 0;
+        bool setTransport(const QSharedPointer<Transport> &transport, const Reason &reason = Reason());
 
         /**
-         * @brief canReplaceTransport returns true if the application has some spare transports to try
+         * @brief selectNextTransport selects next transport from compatible transports list.
+         *   The list is usually stored in the application
          * @return
          */
-        virtual bool canReplaceTransport() const = 0;
+        bool selectNextTransport(const QSharedPointer<Transport> alikeTransport = QSharedPointer<Transport>());
 
         /**
-         * @brief selectNextTransport selects next transport from compatible transports list.
-         *   The list is usually stored in the application
+         * @brief Checks where transport-replace is possible atm
          * @return
          */
-        virtual bool selectNextTransport(const QString preferredNS = QString()) = 0;
+        virtual bool isTransportReplaceEnabled() const;
 
         /**
          * @brief wantBetterTransport checks if the transport is a better match for the application
          * Used in content is provided twice with two different transports
          * @return
          */
-        virtual bool wantBetterTransport(const QSharedPointer<Transport> &) const = 0;
+        virtual bool wantBetterTransport(const QSharedPointer<Transport> &) const;
 
         /**
          * @brief prepare to send content-add/session-initiate
@@ -120,18 +121,19 @@ namespace XMPP { namespace Jingle {
         virtual void start()                                                                              = 0;
         virtual void remove(Reason::Condition cond = Reason::Success, const QString &comment = QString()) = 0;
 
-        /**
-         * @brief incomingTransportReplace it's jingle transport-replace
-         * @param transport
-         * @return
-         */
-        virtual bool incomingTransportReplace(const QSharedPointer<Transport> &transport) = 0;
-        virtual void incomingRemove(const Reason &r)                                      = 0;
+        virtual void incomingRemove(const Reason &r) = 0;
 
     protected:
-        // wraps transport update so transport can be safely-deleted before callback is triggered
+        /**
+         * @brief wraps transport update so transport can be safely-deleted before callback is triggered
+         */
         OutgoingTransportInfoUpdate wrapOutgoingTransportUpdate();
 
+        /**
+         * @brief initTransport in general connects any necessary for the application transport signals
+         */
+        virtual void initTransport() = 0;
+
     signals:
         void updated(); // signal for session it has to send updates to remote. so it will follow with
                         // takeOutgoingUpdate() eventually
@@ -154,12 +156,8 @@ namespace XMPP { namespace Jingle {
         Origin  _senders;
 
         // current transport. either local or remote. has info about origin and state
-        QSharedPointer<Transport> _transport;
-
-        // when set the content will be removed with this reason
-        Reason _terminationReason;
-
-        State _prevTransportState = State::Created;
+        QSharedPointer<Transport>         _transport;
+        QScopedPointer<TransportSelector> _transportSelector;
 
         // if transport-replace is in progress. will be set to true when accepted by both sides.
         PendingTransportReplace _pendingTransportReplace = PendingTransportReplace::None;
@@ -167,6 +165,9 @@ namespace XMPP { namespace Jingle {
         // while it's valid - we are in unaccepted yet transport-replace
         Reason _transportReplaceReason;
 
+        // when set the content will be removed with this reason
+        Reason _terminationReason;
+
         // evaluated update to be sent
         Update _update;
     };
diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index d2baeb0d..2a0f6d49 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -18,6 +18,7 @@
  */
 
 #include "jingle-ft.h"
+#include "jingle-nstransportslist.h"
 #include "jingle-session.h"
 
 #include "xmpp_client.h"
@@ -432,7 +433,6 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
         XMPP::Stanza::Error lastError;
         Reason              lastReason;
         Connection::Ptr     connection;
-        QStringList         availableTransports;
         QIODevice *         device    = nullptr;
         qint64              bytesLeft = 0;
         QList<Hash>         outgoingChecksum;
@@ -538,12 +538,13 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
                              Origin senders) :
         d(new Private)
     {
-        d->q                   = this;
-        _pad                   = pad;
-        _contentName           = contentName;
-        _creator               = creator;
-        _senders               = senders;
-        d->availableTransports = static_cast<Manager *>(pad->manager())->availableTransports();
+        d->q         = this;
+        _pad         = pad;
+        _contentName = contentName;
+        _creator     = creator;
+        _senders     = senders;
+        _transportSelector.reset(
+            new NSTransportsList(pad->session(), static_cast<Manager *>(pad->manager())->availableTransports()));
     }
 
     Application::~Application() {}
@@ -633,93 +634,11 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
 
     File Application::acceptFile() const { return d->acceptFile; }
 
-    bool Application::canReplaceTransport() const { return !d->availableTransports.isEmpty(); }
+    bool Application::isTransportReplaceEnabled() const { return _state < State::Active; }
 
-    bool Application::wantBetterTransport(const QSharedPointer<Transport> &t) const
+    void Application::initTransport()
     {
-        Q_UNUSED(t)
-        return true; // TODO check
-    }
-
-    bool Application::selectNextTransport(const QString preferredNS)
-    {
-        if (d->availableTransports.isEmpty()) {
-            emit updated(); // will be evaluated to content-remove
-            return false;
-        }
-
-        int idx = d->availableTransports.indexOf(preferredNS);
-        if (idx == -1)
-            idx = d->availableTransports.size() - 1;
-
-        do {
-            auto t = _pad->session()->newOutgoingTransport(d->availableTransports[idx]);
-            if (t && setTransport(t)) {
-                return true;
-            }
-            d->availableTransports.removeAt(idx);
-            idx = d->availableTransports.size() - 1;
-        } while (idx != -1);
-
-        /*if (_transport) {
-            disconnect(_transport.data());
-            _transport.reset();
-        }*/
-        emit updated(); // will be evaluated to content-remove
-        return false;
-    }
-
-    // incoming one? or we have to check real direction
-    bool Application::setTransport(const QSharedPointer<Transport> &transport, const Reason &reason)
-    {
-        if (transport.isNull() || !(transport->features() & TransportFeature::Reliable))
-            return false;
-
-        // check if ns is registered or matches current
-        int  nsIndex = d->availableTransports.indexOf(transport->pad()->ns());
-        auto curNs   = _transport ? _transport->pad()->ns() : QString();
-        if (nsIndex == -1 && curNs != transport->pad()->ns()) {
-            return false;
-        }
-
-        // in case we automatically select a new transport on our own we definitely will come up to this point
-        if (_transport) {
-            if (_transport->state() < State::Unacked && _transport->creator() == _pad->session()->role()
-                && _transport->pad()->ns() != transport->pad()->ns()) {
-                // the transport will be reused later since the remote doesn't know about it yet
-                d->availableTransports.push_back(_transport->pad()->ns());
-            }
-
-            if (transport->creator() == _pad->session()->role()) {
-                auto ts = _transport->state() == State::Finished ? _transport->prevState() : _transport->state();
-                if (_transport->creator() != _pad->session()->role() || ts > State::Unacked) {
-                    // if remote knows of the current transport
-                    _pendingTransportReplace = PendingTransportReplace::InProgress;
-                } else if (_transport->creator() == _pad->session()->role() && ts == State::Unacked) {
-                    // if remote may know but we don't know yet about it
-                    _pendingTransportReplace = PendingTransportReplace::NeedAck;
-                }
-            } else {
-                _pendingTransportReplace = PendingTransportReplace::InProgress;
-            }
-
-            if (_pendingTransportReplace != PendingTransportReplace::None) {
-                if (_transport->state() == State::Finished) { // initiate replace?
-                    _transportReplaceReason = reason.isValid() ? reason : _transport->lastReason();
-                } else {
-                    _transportReplaceReason = reason;
-                }
-            }
-            _transport->disconnect(this);
-            _transport.reset();
-        }
-
-        if (nsIndex != -1)
-            d->availableTransports.removeAt(nsIndex);
-
-        _transport = transport;
-        connect(transport.data(), &Transport::updated, this, &Application::updated);
-        connect(transport.data(), &Transport::connected, this, [this]() {
+        connect(_transport.data(), &Transport::connected, this, [this]() {
             d->lastReason = Reason();
             d->lastError.reset();
             d->connection = _transport->connection();
@@ -755,36 +674,6 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
                 emit connectionReady();
             }
         });
-
-        connect(transport.data(), &Transport::failed, this, [this]() { selectNextTransport(); });
-
-        if (_state >= State::Unacked) {
-            // seems like we are in transport failure recovery. d->transportFailed may confirm this
-            _transport->prepare();
-        }
-        return true;
-    }
-
-    bool Application::incomingTransportReplace(const QSharedPointer<Transport> &transport)
-    {
-        if (_state >= State::Active) { // impossible case. needs full app renegotiation to continue
-            d->lastError = ErrorUtil::makeOutOfOrder(*_pad->doc());
-            return false;
-        }
-
-        Q_ASSERT(_transport != nullptr);
-
-        auto newns = transport->pad()->ns();
-        if (!(d->availableTransports.contains(newns) || _transport->pad()->ns() == newns)) {
-            return false; // unknown ns. TODO return reason for the reject
-        }
-
-        bool curIsLocal = _transport->creator() == _pad->session()->role();
-        if (curIsLocal && _transport->state() == State::Unacked && _pad->session()->role() == Origin::Initiator) {
-            d->lastError = ErrorUtil::makeTieBreak(*_pad->doc());
-            return false;
-        }
-        return setTransport(transport);
     }
 
     void Application::setStreamingMode(bool mode)
diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index 4ca8e53c..326b2a8c 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -136,16 +136,13 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
         QDomElement  makeLocalOffer() override;
         QDomElement  makeLocalAnswer() override;
 
-        bool canReplaceTransport() const override;
-        bool setTransport(const QSharedPointer<Transport> &transport, const Reason &reason = Reason()) override;
+        bool isTransportReplaceEnabled() const override;
         void remove(Reason::Condition cond = Reason::Success, const QString &comment = QString()) override;
 
         XMPP::Jingle::Application::Update evaluateOutgoingUpdate() override;
         OutgoingUpdate                    takeOutgoingUpdate() override;
-        bool wantBetterTransport(const QSharedPointer<XMPP::Jingle::Transport> &) const override;
-        bool selectNextTransport(const QString preferredNS = QString()) override;
-        void prepare() override;
-        void start() override;
+        void                              prepare() override;
+        void                              start() override;
 
         void setFile(const File &file);
         File file() const;
@@ -168,8 +165,8 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
         Connection::Ptr connection() const;
 
     protected:
-        bool incomingTransportReplace(const QSharedPointer<Transport> &transport) override;
         void incomingRemove(const Reason &r) override;
+        void initTransport() override;
 
     private:
         void prepareThumbnail(File &file);
diff --git a/src/xmpp/xmpp-im/jingle-nstransportslist.cpp b/src/xmpp/xmpp-im/jingle-nstransportslist.cpp
index 9d51590e..75b97c17 100644
--- a/src/xmpp/xmpp-im/jingle-nstransportslist.cpp
+++ b/src/xmpp/xmpp-im/jingle-nstransportslist.cpp
@@ -22,12 +22,14 @@
 
 namespace XMPP { namespace Jingle {
 
-    QSharedPointer<Transport> NSTransportsList::getNextTransport(QSharedPointer<Transport> alike)
+    QSharedPointer<Transport> NSTransportsList::getNextTransport() { return getNextNSTransport(); }
+
+    QSharedPointer<Transport> NSTransportsList::getAlikeTransport(QSharedPointer<Transport> alike)
     {
-        return getNextTransport(alike->pad()->ns());
+        return getNextNSTransport(alike->pad()->ns());
     }
 
-    QSharedPointer<Transport> NSTransportsList::getNextTransport(const QString &preferredNS)
+    QSharedPointer<Transport> NSTransportsList::getNextNSTransport(const QString &preferredNS)
     {
         if (_transports.isEmpty()) {
             return QSharedPointer<Transport>();
@@ -53,13 +55,28 @@ namespace XMPP { namespace Jingle {
 
     bool NSTransportsList::hasMoreTransports() const { return !_transports.isEmpty(); }
 
-    bool NSTransportsList::hasTransport(QSharedPointer<Transport>) const { return false; }
+    bool NSTransportsList::hasTransport(QSharedPointer<Transport> t) const
+    {
+        return t && _transports.indexOf(t->pad()->ns()) != -1;
+    }
 
     int NSTransportsList::compare(QSharedPointer<Transport> a, QSharedPointer<Transport> b) const
     {
-        auto idxA = _transports.indexOf(a->pad()->ns());
-        auto idxB = _transports.indexOf(b->pad()->ns());
+        int idxA = -1;
+        if (a)
+            idxA = _transports.indexOf(a->pad()->ns());
+        int idxB = -1;
+        if (b)
+            idxB = _transports.indexOf(b->pad()->ns());
         return idxA < idxB ? -1 : idxA > idxB ? 1 : 0;
     }
 
+    bool NSTransportsList::replace(QSharedPointer<Transport> old, QSharedPointer<Transport> newer)
+    {
+        if (!newer || !canReplace(old, newer))
+            return false;
+        _transports.removeAll(newer->pad()->ns());
+        return true;
+    }
+
 }}
diff --git a/src/xmpp/xmpp-im/jingle-nstransportslist.h b/src/xmpp/xmpp-im/jingle-nstransportslist.h
index 085cb12e..6ed27d02 100644
--- a/src/xmpp/xmpp-im/jingle-nstransportslist.h
+++ b/src/xmpp/xmpp-im/jingle-nstransportslist.h
@@ -24,15 +24,24 @@
 
 namespace XMPP { namespace Jingle {
 
+    class Session;
     class NSTransportsList : public TransportSelector {
     public:
-        QSharedPointer<Transport> getNextTransport(QSharedPointer<Transport> alike) override;
-        QSharedPointer<Transport> getNextTransport(const QString &preferredNS);
+        inline NSTransportsList(Session *session, const QStringList &transports) :
+            _session(session), _transports(transports)
+        {
+        }
+
+        QSharedPointer<Transport> getNextTransport() override;
+        QSharedPointer<Transport> getAlikeTransport(QSharedPointer<Transport> alike) override;
+
+        QSharedPointer<Transport> getNextNSTransport(const QString &preferredNS = QString());
 
         void backupTransport(QSharedPointer<Transport>) override;
         bool hasMoreTransports() const override;
         bool hasTransport(QSharedPointer<Transport>) const override;
         int  compare(QSharedPointer<Transport> a, QSharedPointer<Transport> b) const override;
+        bool replace(QSharedPointer<Transport> old, QSharedPointer<Transport> newer) override;
 
     private:
         Session *   _session = nullptr;
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index b4a4a64a..9a4803f7 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -36,8 +36,10 @@ namespace XMPP { namespace Jingle { namespace S5B {
 
     static QString makeKey(const QString &sid, const Jid &j1, const Jid &j2)
     {
-        return QString::fromLatin1(
+        auto data = QString::fromLatin1(
             QCryptographicHash::hash((sid + j1.full() + j2.full()).toUtf8(), QCryptographicHash::Sha1).toHex());
+        qDebug() << "Generated key from:" << sid << j1.full() << j2.full() << " = " << data;
+        return data;
     }
 
     class Connection : public XMPP::Jingle::Connection {
@@ -217,6 +219,18 @@ namespace XMPP { namespace Jingle { namespace S5B {
         QSharedPointer<S5BServer> server;
         SocksClient *             socksClient = nullptr;
 
+        QString toString() const
+        {
+            QString extra;
+            if (type == Tunnel || type == Assisted || type == Direct) {
+                extra = QString("host=%1:%2").arg(host, QString::number(port));
+            } else if (type == Proxy) {
+                extra = QString("proxy=%1 host=%2:%3").arg(jid.full(), host, QString::number(port));
+            }
+            return QString("Cadidate(type=%1 cid=%2 state=%3 %4)")
+                .arg(typeText(type), cid, Candidate::stateText(state), extra);
+        }
+
         void connectToHost(const QString &key, State successState, QObject *callbackContext,
                            std::function<void(bool)> callback, bool isUdp)
         {
@@ -228,8 +242,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
                 XMPP::Ice176::isIPv6LinkLocalAddress(ha)
 #endif
             ) {
-                qDebug() << "connect to host with cid=" << cid << "and key=" << key
-                         << "candidate using V6LinkLocalSocksConnector";
+                qDebug() << "connect to " << toString() << "with key=" << key << "using V6LinkLocalSocksConnector";
                 // we have link local address without scope. We have to enumerate all possible scopes.
                 auto v6llConnector = new V6LinkLocalSocksConnector(this);
                 connect(v6llConnector, &V6LinkLocalSocksConnector::ready, callbackContext,
@@ -242,24 +255,24 @@ namespace XMPP { namespace Jingle { namespace S5B {
 
                             if (socksClient) {
                                 state = successState;
-                                qDebug() << "connected: cid=" << cid << "socks client (ipv6)" << socksClient;
+                                qDebug() << "connected: " << toString() << "socks client (ipv6)" << socksClient;
                                 callback(true);
                                 return;
                             }
                             state = Candidate::Discarded;
-                            qDebug() << "failed to connect: cid=" << cid << "no socks client (ipv6)";
+                            qDebug() << "failed to connect: " << toString() << "no socks client (ipv6)";
                             callback(false);
                         });
                 v6llConnector->connectToHost(ha, port, key, isUdp);
             } else {
                 socksClient = new SocksClient;
-                qDebug() << "connect to host with cid=" << cid << ", key=" << key << " and socks client" << socksClient;
+                qDebug() << "connect to " << toString() << "with key=" << key << " and socks client" << socksClient;
                 connect(socksClient, &SocksClient::connected, callbackContext, [this, callback, successState]() {
                     if (state == Candidate::Discarded) {
                         return;
                     }
                     state = successState;
-                    qDebug() << "connected: cid=" << cid << "socks client" << socksClient;
+                    qDebug() << "connected: " << toString() << "socks client" << socksClient;
                     callback(true);
                 });
                 connect(socksClient, &SocksClient::error, callbackContext, [this, callback](int error) {
@@ -268,7 +281,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
                         return;
                     }
                     state = Candidate::Discarded;
-                    qDebug() << "failed to connect: cid=" << cid << "socks client" << socksClient;
+                    qDebug() << "failed to connect: " << toString() << "socks client" << socksClient;
                     callback(false);
                 });
                 // connect(&t, SIGNAL(timeout()), SLOT(trySendUDP()));
@@ -491,14 +504,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
     QString Candidate::toString() const
     {
         if (d) {
-            QString extra;
-            if (d->type == Tunnel || d->type == Assisted || d->type == Direct) {
-                extra = QString("host=%1:%2").arg(d->host, QString::number(d->port));
-            } else if (d->type == Proxy) {
-                extra = QString("proxy=%1 host=%2:%3").arg(d->jid.full(), d->host, QString::number(d->port));
-            }
-            return QString("Cadidate(type=%1 cid=%2 state=%3 %4)")
-                .arg(typeText(d->type), d->cid, stateText(d->state), extra);
+            return d->toString();
         } else
             return QString("Candidate(null)");
     }
@@ -932,11 +938,12 @@ namespace XMPP { namespace Jingle { namespace S5B {
             // if we are here then neither candidate-used nor candidate-error was sent to remote,
             // but we can send it now.
             // first let's check if we can send candidate-used
-            bool allRemoteDiscarded          = true;
-            bool hasConnectedRemoteCandidate = false;
+            bool    allRemoteDiscarded          = true;
+            bool    hasConnectedRemoteCandidate = false;
+            QString states;
             for (const auto &c : remoteCandidates) {
                 auto s = c.state();
-                qDebug() << "  candidate " << c.cid() << " is " << Candidate::stateText(s);
+                states += QString("\n%1").arg(c.toString());
                 if (s != Candidate::Discarded) {
                     allRemoteDiscarded = false;
                 }
@@ -944,6 +951,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
                     hasConnectedRemoteCandidate = true;
                 }
             }
+            qDebug().noquote() << "Candidates dump:" << states;
 
             // if we have connection to remote candidate it's time to send it
             if (hasConnectedRemoteCandidate) {
@@ -1372,6 +1380,9 @@ namespace XMPP { namespace Jingle { namespace S5B {
                 d->blockSize = bsn;
             }
         }
+        if (_state == State::Created && isRemote() && d->sid.isEmpty()) {
+            d->sid = transportEl.attribute(QStringLiteral("sid"));
+        }
         auto dstaddr = transportEl.attribute(QStringLiteral("dstaddr"));
         if (!dstaddr.isEmpty()) {
             d->dstaddr = dstaddr;
diff --git a/src/xmpp/xmpp-im/jingle-session.cpp b/src/xmpp/xmpp-im/jingle-session.cpp
index d2de89a0..b5af1b23 100644
--- a/src/xmpp/xmpp-im/jingle-session.cpp
+++ b/src/xmpp/xmpp-im/jingle-session.cpp
@@ -462,9 +462,8 @@ namespace XMPP { namespace Jingle {
                 }
 
                 rejectSet.remove(contentName);
-                if (it == addSet.end()
-                    || (*it)->wantBetterTransport(
-                        app->transport())) { // probably not wantBetterTransport but wantBetterApplication
+                // REVIEW probably not wantBetterTransport but wantBetterApplication
+                if (it == addSet.end() || (*it)->wantBetterTransport(app->transport())) {
                     if (it == addSet.end()) {
                         addSet.insert(contentName, app);
                     } else {
@@ -761,11 +760,23 @@ namespace XMPP { namespace Jingle {
                 auto old = app->transport();
                 Q_ASSERT(old != nullptr);
                 // if it's my transport and it's sent but unacknowledged but has to be accepted
-                if (old->creator() == q->peerRole() && old->state() == State::Unacked && role == Origin::Initiator) {
+                if (old->isLocal() && old->state() == State::Unacked && role == Origin::Initiator) {
                     doTieBreak = true;
                     continue;
                 }
 
+                if (!app->transportSelector()->canReplace(app->transport(), transport)) {
+                    qDebug("incoming unsupported or already used transport");
+                    toReject.append(ce);
+                    continue;
+                }
+
+                if (!app->isTransportReplaceEnabled()) {
+                    qDebug("transport replace is disabled for %s", qPrintable(app->contentName()));
+                    toReject.append(ce);
+                    continue;
+                }
+
                 passed.append(std::make_tuple(app, transport, ce));
             }
 
@@ -777,8 +788,8 @@ namespace XMPP { namespace Jingle {
                 if (doTieBreak) {
                     if (app->transport()->creator() == role && app->transport()->state() < State::Unacked)
                         continue; // it will send transport soon
-                    app->selectNextTransport(transport->pad()->ns());
-                } else if (!app->incomingTransportReplace(transport)) {
+                    app->selectNextTransport(transport);
+                } else if (!app->setTransport(transport)) {
                     // app should generate transport accept eventually. content-accept will
                     // work too if the content wasn't accepted yet
                     toReject.append(ce);
diff --git a/src/xmpp/xmpp-im/jingle-transport.cpp b/src/xmpp/xmpp-im/jingle-transport.cpp
index 2a7e3b81..21d348aa 100644
--- a/src/xmpp/xmpp-im/jingle-transport.cpp
+++ b/src/xmpp/xmpp-im/jingle-transport.cpp
@@ -31,7 +31,7 @@ namespace XMPP { namespace Jingle {
     //----------------------------------------------------------------------------
     Transport::Transport(TransportManagerPad::Ptr pad, Origin creator) : _creator(creator), _pad(pad) {}
 
-    bool Transport::isRemote() const { return _pad->session()->role() == _creator; }
+    bool Transport::isRemote() const { return _pad->session()->role() != _creator; }
 
     void Transport::setState(State newState)
     {
@@ -56,6 +56,13 @@ namespace XMPP { namespace Jingle {
         return 0; // means "block" is not applicable for this kind of connection
     }
 
+    //----------------------------------------------------------------------------
+    // TransportSelector
+    //----------------------------------------------------------------------------
     TransportSelector::~TransportSelector() {}
 
+    bool TransportSelector::canReplace(QSharedPointer<Transport> old, QSharedPointer<Transport> newer)
+    {
+        return newer && (hasTransport(newer) || compare(old, newer) == 0);
+    }
 }}
diff --git a/src/xmpp/xmpp-im/jingle-transport.h b/src/xmpp/xmpp-im/jingle-transport.h
index 9c580cd0..a322ea06 100644
--- a/src/xmpp/xmpp-im/jingle-transport.h
+++ b/src/xmpp/xmpp-im/jingle-transport.h
@@ -126,20 +126,30 @@ namespace XMPP { namespace Jingle {
         Reason                              _lastReason;
     };
 
+    // It's an available transports collection per application
     struct TransportSelector {
         virtual ~TransportSelector();
-        // allocate the most preferred transport from the set
-        virtual QSharedPointer<Transport> getNextTransport(QSharedPointer<Transport> alike
-                                                           = QSharedPointer<Transport>())
-            = 0;
+        // Allocate the most preferred transport from the set
+        // Returned transport is removed from the list of available.
+        virtual QSharedPointer<Transport> getNextTransport() = 0;
 
-        // put transport back to the set for future use
+        // Allocate alike transport (e.g. we have remote transport but instead want to use our
+        // own of the same type and similar parameters)
+        // Returned transport is removed from the list of available.
+        virtual QSharedPointer<Transport> getAlikeTransport(QSharedPointer<Transport> alike) = 0;
+
+        // Checks if replacement old with newer is possible (e.g. calls canReplace) and removes
+        // the newer transport from the list of available.
+        // Returns false if impossible.
+        virtual bool replace(QSharedPointer<Transport> old, QSharedPointer<Transport> newer) = 0;
+
+        // Put transport back to the set for future use
         virtual void backupTransport(QSharedPointer<Transport>) = 0;
 
-        // where we can allocate another transport for a replacement
+        // Where we can allocate another transport for a replacement
         virtual bool hasMoreTransports() const = 0;
 
-        // check where we can (still) use this transport for the application
+        // Check where we can (still) use this transport for the application
         virtual bool hasTransport(QSharedPointer<Transport>) const = 0;
 
         /*
@@ -148,6 +158,11 @@ namespace XMPP { namespace Jingle {
             =0: it's essentially the same transport, so hardly a replacement.
         */
         virtual int compare(QSharedPointer<Transport> a, QSharedPointer<Transport> b) const = 0;
+
+        // Returns false if it's impossible to replace old with newer for example if the newer is
+        // not supported or already proven to be useless.
+        // Default implementation checks is thew newer transport is among remaining or same as old
+        virtual bool canReplace(QSharedPointer<Transport> old, QSharedPointer<Transport> newer);
     };
 
     class TransportManager : public QObject {

From 4b86793b11d5542032c5921a28933e74253c0837 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sat, 22 Feb 2020 01:47:41 +0300
Subject: [PATCH 127/383] Merged Psi+ patch for nested groups

---
 src/xmpp/xmpp-im/client.cpp        | 53 ++++++++++++++++---
 src/xmpp/xmpp-im/types.cpp         | 25 ++++++++-
 src/xmpp/xmpp-im/xmpp_client.h     |  3 +-
 src/xmpp/xmpp-im/xmpp_liveroster.h | 10 ++++
 src/xmpp/xmpp-im/xmpp_roster.h     | 10 +++-
 src/xmpp/xmpp-im/xmpp_tasks.cpp    | 83 ++++++++++++++++++++++++------
 src/xmpp/xmpp-im/xmpp_tasks.h      |  7 +++
 7 files changed, 163 insertions(+), 28 deletions(-)

diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
index 66960b00..be3b121a 100644
--- a/src/xmpp/xmpp-im/client.cpp
+++ b/src/xmpp/xmpp-im/client.cpp
@@ -93,6 +93,8 @@
 #define vsnprintf _vsnprintf
 #endif
 
+#define GROUPS_DELIMITER_TIMEOUT 10
+
 namespace XMPP {
 //----------------------------------------------------------------------------
 // Client
@@ -883,15 +885,35 @@ void Client::pmMessage(const Message &m)
 
 void Client::prRoster(const Roster &r) { importRoster(r); }
 
-void Client::rosterRequest()
+void Client::rosterRequest(bool withGroupsDelimiter)
 {
     if (!d->active)
         return;
 
     JT_Roster *r = new JT_Roster(rootTask());
-    connect(r, SIGNAL(finished()), SLOT(slotRosterRequestFinished()));
-    r->get();
-    d->roster.flagAllForDelete(); // mod_groups patch
+    if (withGroupsDelimiter) {
+        connect(r, &JT_Roster::finished, this, [this, r]() mutable {
+            if (r->success()) {
+                d->roster.setGroupsDelimiter(r->groupsDelimiter());
+                emit rosterGroupsDelimiterRequestFinished(r->groupsDelimiter());
+            }
+
+            r = new JT_Roster(rootTask());
+            connect(r, SIGNAL(finished()), SLOT(slotRosterRequestFinished()));
+            r->get();
+            d->roster.flagAllForDelete(); // mod_groups patch
+            r->go(true);
+        });
+        r->getGroupsDelimiter();
+        // WORKAROUND: Some bad servers (Facebook for example) don't respond
+        // on groups delimiter request. Wait timeout and go ahead.
+        r->setTimeout(GROUPS_DELIMITER_TIMEOUT);
+    } else {
+        connect(r, SIGNAL(finished()), SLOT(slotRosterRequestFinished()));
+        r->get();
+        d->roster.flagAllForDelete(); // mod_groups patch
+    }
+
     r->go(true);
 }
 
@@ -1249,10 +1271,25 @@ void LiveRosterItem::setFlagForDelete(bool b) { v_flagForDelete = b; }
 //---------------------------------------------------------------------------
 // LiveRoster
 //---------------------------------------------------------------------------
-LiveRoster::LiveRoster() : QList<LiveRosterItem>() {}
+class LiveRoster::Private {
+public:
+    QString groupsDelimiter;
+};
 
-LiveRoster::~LiveRoster() {}
+LiveRoster::LiveRoster() : QList<LiveRosterItem>(), d(new LiveRoster::Private) {}
+LiveRoster::LiveRoster(const LiveRoster &other) : QList<LiveRosterItem>(other), d(new LiveRoster::Private)
+{
+    d->groupsDelimiter = other.d->groupsDelimiter;
+}
 
+LiveRoster::~LiveRoster() { delete d; }
+
+LiveRoster &LiveRoster::operator=(const LiveRoster &other)
+{
+    QList<LiveRosterItem>::operator=(other);
+    d->groupsDelimiter             = other.d->groupsDelimiter;
+    return *this;
+}
 void LiveRoster::flagAllForDelete()
 {
     for (Iterator it = begin(); it != end(); ++it)
@@ -1279,4 +1316,8 @@ LiveRoster::ConstIterator LiveRoster::find(const Jid &j, bool compareRes) const
     return it;
 }
 
+void LiveRoster::setGroupsDelimiter(const QString &groupsDelimiter) { d->groupsDelimiter = groupsDelimiter; }
+
+QString LiveRoster::groupsDelimiter() const { return d->groupsDelimiter; }
+
 }
diff --git a/src/xmpp/xmpp-im/types.cpp b/src/xmpp/xmpp-im/types.cpp
index c598a819..b08d0248 100644
--- a/src/xmpp/xmpp-im/types.cpp
+++ b/src/xmpp/xmpp-im/types.cpp
@@ -2677,9 +2677,26 @@ bool RosterItem::fromXml(const QDomElement &item)
 //---------------------------------------------------------------------------
 // Roster
 //---------------------------------------------------------------------------
-Roster::Roster() : QList<RosterItem>() {}
+class Roster::Private {
+public:
+    QString groupsDelimiter;
+};
+
+Roster::Roster() : QList<RosterItem>(), d(new Roster::Private) {}
+
+Roster::~Roster() { delete d; }
+
+Roster::Roster(const Roster &other) : QList<RosterItem>(other), d(new Roster::Private)
+{
+    d->groupsDelimiter = other.d->groupsDelimiter;
+}
 
-Roster::~Roster() {}
+Roster &Roster::operator=(const Roster &other)
+{
+    QList<RosterItem>::operator=(other);
+    d->groupsDelimiter         = other.d->groupsDelimiter;
+    return *this;
+}
 
 Roster::Iterator Roster::find(const Jid &j)
 {
@@ -2701,6 +2718,10 @@ Roster::ConstIterator Roster::find(const Jid &j) const
     return end();
 }
 
+void Roster::setGroupsDelimiter(const QString &groupsDelimiter) { d->groupsDelimiter = groupsDelimiter; }
+
+QString Roster::groupsDelimiter() const { return d->groupsDelimiter; }
+
 //---------------------------------------------------------------------------
 // FormField
 //---------------------------------------------------------------------------
diff --git a/src/xmpp/xmpp-im/xmpp_client.h b/src/xmpp/xmpp-im/xmpp_client.h
index 9d44ed18..63c9a7b4 100644
--- a/src/xmpp/xmpp-im/xmpp_client.h
+++ b/src/xmpp/xmpp-im/xmpp_client.h
@@ -99,7 +99,7 @@ class Client : public QObject {
     void                   setNetworkAccessManager(QNetworkAccessManager *qnam);
     QNetworkAccessManager *networkAccessManager() const;
 
-    void rosterRequest();
+    void rosterRequest(bool withGroupsDelimiter = true);
     void sendMessage(Message &);
     void sendSubscription(const Jid &, const QString &, const QString &nick = QString());
     void setPresence(const Status &);
@@ -165,6 +165,7 @@ class Client : public QObject {
     void activated();
     void disconnected();
     // void authFinished(bool, int, const QString &);
+    void rosterGroupsDelimiterRequestFinished(const QString &);
     void rosterRequestFinished(bool, int, const QString &);
     void rosterItemAdded(const RosterItem &);
     void rosterItemUpdated(const RosterItem &);
diff --git a/src/xmpp/xmpp-im/xmpp_liveroster.h b/src/xmpp/xmpp-im/xmpp_liveroster.h
index b6f1e644..4c0fbb2a 100644
--- a/src/xmpp/xmpp-im/xmpp_liveroster.h
+++ b/src/xmpp/xmpp-im/xmpp_liveroster.h
@@ -29,11 +29,21 @@ class Jid;
 class LiveRoster : public QList<LiveRosterItem> {
 public:
     LiveRoster();
+    LiveRoster(const LiveRoster &other);
     ~LiveRoster();
 
+    LiveRoster &operator=(const LiveRoster &other);
+
     void                      flagAllForDelete();
     LiveRoster::Iterator      find(const Jid &, bool compareRes = true);
     LiveRoster::ConstIterator find(const Jid &, bool compareRes = true) const;
+
+    void    setGroupsDelimiter(const QString &groupsDelimiter);
+    QString groupsDelimiter() const;
+
+private:
+    class Private;
+    Private *d;
 };
 } // namespace XMPP
 
diff --git a/src/xmpp/xmpp-im/xmpp_roster.h b/src/xmpp/xmpp-im/xmpp_roster.h
index 669f2aff..4b0bb93a 100644
--- a/src/xmpp/xmpp-im/xmpp_roster.h
+++ b/src/xmpp/xmpp-im/xmpp_roster.h
@@ -32,14 +32,20 @@ class Jid;
 class Roster : public QList<RosterItem> {
 public:
     Roster();
+    Roster(const Roster &other);
     ~Roster();
 
+    Roster &operator=(const Roster &other);
+
     Roster::Iterator      find(const Jid &);
     Roster::ConstIterator find(const Jid &) const;
 
+    void    setGroupsDelimiter(const QString &groupsDelimiter);
+    QString groupsDelimiter() const;
+
 private:
-    class RosterPrivate;
-    RosterPrivate *d = nullptr;
+    class Private;
+    Private *d = nullptr;
 };
 } // namespace XMPP
 
diff --git a/src/xmpp/xmpp-im/xmpp_tasks.cpp b/src/xmpp/xmpp-im/xmpp_tasks.cpp
index a616fb53..b0196f2d 100644
--- a/src/xmpp/xmpp-im/xmpp_tasks.cpp
+++ b/src/xmpp/xmpp-im/xmpp_tasks.cpp
@@ -343,12 +343,13 @@ class JT_Roster::Private {
     Private() = default;
 
     Roster             roster;
+    QString            groupsDelimiter;
     QList<QDomElement> itemList;
 };
 
 JT_Roster::JT_Roster(Task *parent) : Task(parent)
 {
-    type = -1;
+    type = Unknown;
     d    = new Private;
 }
 
@@ -356,7 +357,7 @@ JT_Roster::~JT_Roster() { delete d; }
 
 void JT_Roster::get()
 {
-    type = 0;
+    type = Get;
     // to = client()->host();
     iq                = createIQ(doc(), "get", to.full(), id());
     QDomElement query = doc()->createElementNS("jabber:iq:roster", "query");
@@ -365,7 +366,7 @@ void JT_Roster::get()
 
 void JT_Roster::set(const Jid &jid, const QString &name, const QStringList &groups)
 {
-    type = 1;
+    type = Set;
     // to = client()->host();
     QDomElement item = doc()->createElement("item");
     item.setAttribute("jid", jid.full());
@@ -378,7 +379,7 @@ void JT_Roster::set(const Jid &jid, const QString &name, const QStringList &grou
 
 void JT_Roster::remove(const Jid &jid)
 {
-    type = 1;
+    type = Remove;
     // to = client()->host();
     QDomElement item = doc()->createElement("item");
     item.setAttribute("jid", jid.full());
@@ -386,11 +387,46 @@ void JT_Roster::remove(const Jid &jid)
     d->itemList += item;
 }
 
+void JT_Roster::getGroupsDelimiter()
+{
+    type = GetDelimiter;
+    // to = client()->host();
+    iq = createIQ(doc(), "get", to.full(), id());
+
+    QDomElement roster = doc()->createElement("roster");
+    roster.setAttribute("xmlns", "roster:delimiter");
+
+    QDomElement query = doc()->createElement("query");
+    query.setAttribute("xmlns", "jabber:iq:private");
+    query.appendChild(roster);
+
+    iq.appendChild(query);
+}
+
+void JT_Roster::setGroupsDelimiter(const QString &groupsDelimiter)
+{
+    type = SetDelimiter;
+    // to = client()->host();
+    iq = createIQ(doc(), "set", to.full(), id());
+
+    QDomText text = doc()->createTextNode(groupsDelimiter);
+
+    QDomElement roster = doc()->createElement("roster");
+    roster.setAttribute("xmlns", "roster:delimiter");
+    roster.appendChild(text);
+
+    QDomElement query = doc()->createElement("query");
+    query.setAttribute("xmlns", "jabber:iq:private");
+    query.appendChild(roster);
+
+    iq.appendChild(query);
+}
+
 void JT_Roster::onGo()
 {
-    if (type == 0)
+    if (type == Get)
         send(iq);
-    else if (type == 1) {
+    else if (type == Set || type == Remove) {
         // to = client()->host();
         iq                = createIQ(doc(), "set", to.full(), id());
         QDomElement query = doc()->createElementNS("jabber:iq:roster", "query");
@@ -398,14 +434,20 @@ void JT_Roster::onGo()
         foreach (const QDomElement &it, d->itemList)
             query.appendChild(it);
         send(iq);
+    } else if (type == GetDelimiter) {
+        send(iq);
+    } else if (type == SetDelimiter) {
+        send(iq);
     }
 }
 
 const Roster &JT_Roster::roster() const { return d->roster; }
 
+QString JT_Roster::groupsDelimiter() const { return d->groupsDelimiter; }
+
 QString JT_Roster::toString() const
 {
-    if (type != 1)
+    if (type != Set)
         return "";
 
     QDomElement i = doc()->createElement("request");
@@ -413,7 +455,6 @@ QString JT_Roster::toString() const
     foreach (const QDomElement &it, d->itemList)
         i.appendChild(it);
     return lineEncode(Stream::xmlToString(i));
-    return "";
 }
 
 bool JT_Roster::fromString(const QString &str)
@@ -427,7 +468,7 @@ bool JT_Roster::fromString(const QString &str)
     if (e.tagName() != "request" || e.attribute("type") != "JT_Roster")
         return false;
 
-    type = 1;
+    type = Set;
     d->itemList.clear();
     for (QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling()) {
         QDomElement i = n.toElement();
@@ -444,8 +485,7 @@ bool JT_Roster::take(const QDomElement &x)
     if (!iqVerify(x, client()->host(), id()))
         return false;
 
-    // get
-    if (type == 0) {
+    if (type == Get) {
         if (x.attribute("type") == "result") {
             QDomElement q = queryTag(x);
             d->roster     = xmlReadRoster(q, false);
@@ -455,18 +495,27 @@ bool JT_Roster::take(const QDomElement &x)
         }
 
         return true;
-    }
-    // set
-    else if (type == 1) {
+    } else if (type == Set) {
         if (x.attribute("type") == "result")
             setSuccess();
         else
             setError(x);
 
         return true;
-    }
-    // remove
-    else if (type == 2) {
+    } else if (type == Remove) {
+        setSuccess();
+        return true;
+    } else if (type == GetDelimiter) {
+        if (x.attribute("type") == "result") {
+            QDomElement q         = queryTag(x);
+            QDomElement delimiter = q.firstChild().toElement();
+            d->groupsDelimiter    = delimiter.firstChild().toText().data();
+            setSuccess();
+        } else {
+            setError(x);
+        }
+        return true;
+    } else if (type == SetDelimiter) {
         setSuccess();
         return true;
     }
diff --git a/src/xmpp/xmpp-im/xmpp_tasks.h b/src/xmpp/xmpp-im/xmpp_tasks.h
index 17532f1d..dcd06a00 100644
--- a/src/xmpp/xmpp-im/xmpp_tasks.h
+++ b/src/xmpp/xmpp-im/xmpp_tasks.h
@@ -97,7 +97,12 @@ class JT_Roster : public Task {
     void set(const Jid &, const QString &name, const QStringList &groups);
     void remove(const Jid &);
 
+    // XEP-0083
+    void getGroupsDelimiter();
+    void setGroupsDelimiter(const QString &groupsDelimiter);
+
     const Roster &roster() const;
+    QString       groupsDelimiter() const;
 
     QString toString() const;
     bool    fromString(const QString &);
@@ -106,6 +111,8 @@ class JT_Roster : public Task {
     bool take(const QDomElement &x);
 
 private:
+    enum Type { Get, Set, Remove, GetDelimiter, SetDelimiter, Unknown = -1 };
+
     int         type;
     QDomElement iq;
     Jid         to;

From 92277c5e0dc9aca67fe8bfb86b43da2d90a6e915 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 29 Mar 2020 00:56:11 +0300
Subject: [PATCH 128/383] Cleanup null socks5 servers

Next time when resetConnection will be called, unregisterKey won't be called on nullptr
---
 src/xmpp/xmpp-im/s5b.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/xmpp/xmpp-im/s5b.cpp b/src/xmpp/xmpp-im/s5b.cpp
index 4c8ff4ff..4a7de61e 100644
--- a/src/xmpp/xmpp-im/s5b.cpp
+++ b/src/xmpp/xmpp-im/s5b.cpp
@@ -992,6 +992,7 @@ void S5BManager::Item::resetConnection()
         s->unregisterKey(key);
         s.reset();
     }
+    relatedServers.clear();
 
     delete task;
     task = nullptr;

From 9f33b0978c9e129dbe766d96d0832ce5e726079b Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 22 Mar 2020 14:56:08 +0300
Subject: [PATCH 129/383] ICE refactoring wrt RFC 8445

---
 include/iris/jingle-ice.h                 |    1 +
 src/irisnet/noncore/ice176.cpp            |  424 ++++----
 src/irisnet/noncore/ice176.h              |   41 +-
 src/irisnet/noncore/icecomponent.cpp      |  214 ++--
 src/irisnet/noncore/icecomponent.h        |   18 +-
 src/irisnet/noncore/icelocaltransport.cpp |    8 +-
 src/irisnet/noncore/icelocaltransport.h   |    3 +
 src/irisnet/noncore/iceturntransport.cpp  |   12 +-
 src/irisnet/noncore/iceturntransport.h    |    1 +
 src/irisnet/noncore/stunbinding.cpp       |    2 +
 src/irisnet/noncore/stunbinding.h         |    1 +
 src/irisnet/noncore/stunmessage.cpp       |   11 +
 src/irisnet/noncore/stunmessage.h         |    1 +
 src/irisnet/noncore/stuntypes.cpp         |    6 +-
 src/irisnet/noncore/udpportreserver.cpp   |   12 +-
 src/xmpp/CMakeLists.txt                   |    2 +
 src/xmpp/xmpp-im/client.cpp               |    6 +
 src/xmpp/xmpp-im/jingle-ft.cpp            |    2 +-
 src/xmpp/xmpp-im/jingle-ibb.cpp           |    8 +-
 src/xmpp/xmpp-im/jingle-ibb.h             |    3 +-
 src/xmpp/xmpp-im/jingle-ice.cpp           | 1088 +++++++++++++++++++++
 src/xmpp/xmpp-im/jingle-ice.h             |  219 +++++
 src/xmpp/xmpp-im/jingle-s5b.cpp           |   10 +-
 src/xmpp/xmpp-im/jingle-s5b.h             |    2 +-
 src/xmpp/xmpp-im/jingle-transport.cpp     |    2 +
 src/xmpp/xmpp-im/jingle-transport.h       |   17 +-
 src/xmpp/xmpp-im/xmpp_client.h            |    4 +
 src/xmpp/xmpp.pri                         |    3 +
 tools/icetunnel/icetunnel.pro             |   12 +-
 tools/icetunnel/main.cpp                  |    2 +
 30 files changed, 1821 insertions(+), 314 deletions(-)
 create mode 100644 include/iris/jingle-ice.h
 create mode 100644 src/xmpp/xmpp-im/jingle-ice.cpp
 create mode 100644 src/xmpp/xmpp-im/jingle-ice.h

diff --git a/include/iris/jingle-ice.h b/include/iris/jingle-ice.h
new file mode 100644
index 00000000..98b263fb
--- /dev/null
+++ b/include/iris/jingle-ice.h
@@ -0,0 +1 @@
+#include "../../src/xmpp/xmpp-im/jingle-ice.h"
diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index 54a4a765..e8153ea1 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -24,6 +24,7 @@
 #include "stunbinding.h"
 #include "stunmessage.h"
 #include "stuntransaction.h"
+#include "stuntypes.h"
 #include "udpportreserver.h"
 
 #include <QSet>
@@ -107,7 +108,8 @@ class Ice176::Private : public QObject {
     Q_OBJECT
 
 public:
-    enum State { Stopped, Starting, Started, Stopping };
+    // note, Nominating state is skipped when aggressive nomination is enabled.
+    enum State { Stopped, Starting, Started, Nominating, Stopping };
 
     enum CandidatePairState { PWaiting, PInProgress, PSucceeded, PFailed, PFrozen };
 
@@ -116,21 +118,19 @@ class Ice176::Private : public QObject {
     class CandidatePair {
     public:
         IceComponent::CandidateInfo local, remote;
-        bool                        isDefault;
-        bool                        isValid;
-        bool                        isNominated;
-        CandidatePairState          state;
+        bool                        isDefault   = false;
+        bool                        isValid     = false;
+        bool                        isNominated = false;
+        CandidatePairState          state       = CandidatePairState::PFrozen;
 
-        qint64  priority;
+        qint64  priority = 0;
         QString foundation;
 
-        StunBinding *binding;
+        StunBinding *binding = nullptr;
 
         // FIXME: this is wrong i think, it should be in LocalTransport
         //   or such, to multiplex ids
-        StunTransactionPool *pool;
-
-        CandidatePair() : binding(nullptr), pool(nullptr) {}
+        StunTransactionPool *pool = nullptr;
     };
 
     class CheckList {
@@ -141,60 +141,54 @@ class Ice176::Private : public QObject {
 
     class Component {
     public:
-        int           id;
-        IceComponent *ic;
-        bool          localFinished;
-        bool          stopped;
-        bool          lowOverhead;
-
-        Component() : localFinished(false), stopped(false), lowOverhead(false) {}
+        int           id            = 0;
+        IceComponent *ic            = nullptr;
+        bool          localFinished = false;
+        bool          stopped       = false;
+        bool          lowOverhead   = false;
     };
 
-    Ice176 *                       q;
-    Ice176::Mode                   mode;
-    State                          state;
-    TurnClient::Proxy              proxy;
-    UdpPortReserver *              portReserver;
-    int                            componentCount;
-    QList<Ice176::LocalAddress>    localAddrs;
-    QList<Ice176::ExternalAddress> extAddrs;
-    QHostAddress                   stunBindAddr;
-    int                            stunBindPort;
-    QHostAddress                   stunRelayUdpAddr;
-    int                            stunRelayUdpPort;
-    QString                        stunRelayUdpUser;
-    QCA::SecureArray               stunRelayUdpPass;
-    QHostAddress                   stunRelayTcpAddr;
-    int                            stunRelayTcpPort;
-    QString                        stunRelayTcpUser;
-    QCA::SecureArray               stunRelayTcpPass;
-    QString                        localUser, localPass;
-    QString                        peerUser, peerPass;
-    QList<Component>               components;
-    QList<IceComponent::Candidate> localCandidates;
-    QSet<IceTransport *>           iceTransports;
-    CheckList                      checkList;
-    QList<QList<QByteArray>>       in;
-    bool                           useLocal;
-    bool                           useStunBind;
-    bool                           useStunRelayUdp;
-    bool                           useStunRelayTcp;
-    bool                           useTrickle;
-    QTimer *                       collectTimer;
-
-    Private(Ice176 *_q) :
-        QObject(_q), q(_q), state(Stopped), portReserver(nullptr), componentCount(0), useLocal(true), useStunBind(true),
-        useStunRelayUdp(true), useStunRelayTcp(true), useTrickle(false), collectTimer(nullptr)
-    {
-    }
+    Ice176 *                           q;
+    Ice176::Mode                       mode;
+    State                              state = Stopped;
+    TurnClient::Proxy                  proxy;
+    UdpPortReserver *                  portReserver   = nullptr;
+    int                                componentCount = 0;
+    QList<Ice176::LocalAddress>        localAddrs;
+    QList<Ice176::ExternalAddress>     extAddrs;
+    QHostAddress                       stunBindAddr;
+    int                                stunBindPort;
+    QHostAddress                       stunRelayUdpAddr;
+    int                                stunRelayUdpPort;
+    QString                            stunRelayUdpUser;
+    QCA::SecureArray                   stunRelayUdpPass;
+    QHostAddress                       stunRelayTcpAddr;
+    int                                stunRelayTcpPort;
+    QString                            stunRelayTcpUser;
+    QCA::SecureArray                   stunRelayTcpPass;
+    QString                            localUser, localPass;
+    QString                            peerUser, peerPass;
+    QList<Component>                   components;
+    QList<IceComponent::Candidate>     localCandidates;
+    QList<IceComponent::CandidateInfo> remoteCandidates;
+    QSet<IceTransport *>               iceTransports;
+    CheckList                          checkList;
+    CheckList                          triggeredCheckList;
+    QList<QList<QByteArray>>           in;
+    bool                               useLocal                     = true;
+    bool                               useStunBind                  = true;
+    bool                               useStunRelayUdp              = true;
+    bool                               useStunRelayTcp              = true;
+    bool                               useTrickle                   = true;
+    bool                               aggressiveNomination         = false; // RFC 8445 compliant de default
+    bool                               localGatheringComplete       = false;
+    bool                               remoteGatheringComplete      = false;
+    bool                               expectRemoteCandidatesSignal = true;
+
+    Private(Ice176 *_q) : QObject(_q), q(_q) {}
 
     ~Private()
     {
-        if (collectTimer) {
-            collectTimer->disconnect(this);
-            collectTimer->deleteLater();
-        }
-
         foreach (const Component &c, components)
             delete c.ic;
 
@@ -272,6 +266,7 @@ class Ice176::Private : public QObject {
 
         QList<QUdpSocket *> socketList;
         if (portReserver)
+            // list size = componentCount * number of interfaces
             socketList = portReserver->borrowSockets(componentCount, this);
 
         for (int n = 0; n < componentCount; ++n) {
@@ -284,6 +279,7 @@ class Ice176::Private : public QObject {
             connect(c.ic, SIGNAL(candidateRemoved(XMPP::IceComponent::Candidate)),
                     SLOT(ic_candidateRemoved(XMPP::IceComponent::Candidate)));
             connect(c.ic, SIGNAL(localFinished()), SLOT(ic_localFinished()));
+            connect(c.ic, &IceComponent::gatheringComplete, this, &Private::ic_gatheringComplete);
             connect(c.ic, SIGNAL(stopped()), SLOT(ic_stopped()));
             connect(c.ic, SIGNAL(debugLine(QString)), SLOT(ic_debugLine(QString)));
 
@@ -327,9 +323,11 @@ class Ice176::Private : public QObject {
 
         state = Stopping;
 
+        // will trigger candidateRemoved events and result pairs cleanup.
         if (!components.isEmpty()) {
             for (int n = 0; n < components.count(); ++n)
                 components[n].ic->stop();
+
         } else {
             // TODO: hmm, is it possible to have no components?
             QMetaObject::invokeMethod(this, "postStop", Qt::QueuedConnection);
@@ -339,7 +337,7 @@ class Ice176::Private : public QObject {
     void addRemoteCandidates(const QList<Candidate> &list)
     {
         QList<IceComponent::CandidateInfo> remoteCandidates;
-        foreach (const Candidate &c, list) {
+        for (const Candidate &c : list) {
             IceComponent::CandidateInfo ci;
             ci.addr.addr = c.ip;
             ci.addr.addr.setScopeId(QString());
@@ -357,14 +355,20 @@ class Ice176::Private : public QObject {
             ci.id      = c.id;
             remoteCandidates += ci;
         }
+        this->remoteCandidates += remoteCandidates;
 
-        printf("adding %d remote candidates\n", remoteCandidates.count());
+        printf("adding %d remote candidates. total=%d\n", remoteCandidates.count(), this->remoteCandidates.count());
+        doPairing(localCandidates, remoteCandidates);
+    }
 
+    void doPairing(const QList<IceComponent::Candidate> &    localCandidates,
+                   const QList<IceComponent::CandidateInfo> &remoteCandidates)
+    {
         QList<CandidatePair> pairs;
-        foreach (const IceComponent::Candidate &cc, localCandidates) {
+        for (const IceComponent::Candidate &cc : localCandidates) {
             const IceComponent::CandidateInfo &lc = cc.info;
 
-            foreach (const IceComponent::CandidateInfo &rc, remoteCandidates) {
+            for (const IceComponent::CandidateInfo &rc : remoteCandidates) {
                 if (lc.componentId != rc.componentId)
                     continue;
 
@@ -403,7 +407,7 @@ class Ice176::Private : public QObject {
         // combine pairs with existing, and sort
         pairs = checkList.pairs + pairs;
         checkList.pairs.clear();
-        foreach (const CandidatePair &pair, pairs) {
+        for (const CandidatePair &pair : pairs) {
             int at;
             for (at = 0; at < checkList.pairs.count(); ++at) {
                 if (compare_pair(pair, checkList.pairs[at]) < 0)
@@ -464,7 +468,7 @@ class Ice176::Private : public QObject {
             int at = findLocalCandidate(pair.local.addr.addr, pair.local.addr.port);
             Q_ASSERT(at != -1);
 
-            IceComponent::Candidate &lc = localCandidates[at];
+            auto &lc = localCandidates[at];
 
             Component &c = components[findComponent(lc.info.componentId)];
 
@@ -476,13 +480,15 @@ class Ice176::Private : public QObject {
 
             pair.binding = new StunBinding(pair.pool);
             connect(pair.binding, SIGNAL(success()), SLOT(binding_success()));
+            connect(pair.binding, &StunBinding::error, this, &Ice176::Private::binding_error);
 
             int prflx_priority = c.ic->peerReflexivePriority(lc.iceTransport, lc.path);
             pair.binding->setPriority(prflx_priority);
 
             if (mode == Ice176::Initiator) {
                 pair.binding->setIceControlling(0);
-                pair.binding->setUseCandidate(true);
+                if (aggressiveNomination)
+                    pair.binding->setUseCandidate(true);
             } else
                 pair.binding->setIceControlled(0);
 
@@ -532,6 +538,27 @@ class Ice176::Private : public QObject {
         // FIXME: actually do something
     }
 
+    // ice negotiation failed. either initial or on ICE restart
+    void tryComponentFailed(int componentId)
+    {
+        Q_ASSERT(state == Starting);
+        if (!(localGatheringComplete && remoteGatheringComplete)) {
+            return; // if we have something to gather then we still have a chance for success
+        }
+
+        if (std::find_if(checkList.pairs.begin(), checkList.pairs.end(),
+                         [&](auto const &p) mutable {
+                             return p.local.componentId == componentId
+                                 && (p.state != CandidatePairState::PSucceeded
+                                     && p.state != CandidatePairState::PFailed);
+                         })
+            != checkList.pairs.end())
+            return; // not all finished
+
+        stop();
+        emit q->error(ErrorGeneric);
+    }
+
 private:
     int findComponent(const IceComponent *ic) const
     {
@@ -630,6 +657,31 @@ class Ice176::Private : public QObject {
         return 0;
     }
 
+    static void toOutCandidate(const IceComponent::Candidate &cc, Ice176::Candidate &out)
+    {
+        out.component  = cc.info.componentId;
+        out.foundation = cc.info.foundation;
+        out.generation = 0; // TODO
+        out.id         = cc.info.id;
+        out.ip         = cc.info.addr.addr;
+        out.ip.setScopeId(QString());
+        out.network  = cc.info.network;
+        out.port     = cc.info.addr.port;
+        out.priority = cc.info.priority;
+        out.protocol = "udp";
+        if (cc.info.type != IceComponent::HostType) {
+            out.rel_addr = cc.info.base.addr;
+            out.rel_addr.setScopeId(QString());
+            out.rel_port = cc.info.base.port;
+        } else {
+            out.rel_addr = QHostAddress();
+            out.rel_port = -1;
+        }
+        out.rem_addr = QHostAddress();
+        out.rem_port = -1;
+        out.type     = candidateType_to_string(cc.info.type);
+    }
+
 private slots:
     void postStop()
     {
@@ -645,6 +697,9 @@ private slots:
         // TODO
         localCandidates += cc;
 
+        QList<IceComponent::Candidate> update;
+        update << cc;
+
         printf("C%d: candidate added: %s;%d\n", cc.info.componentId, qPrintable(cc.info.addr.addr.toString()),
                cc.info.addr.port);
 
@@ -656,35 +711,18 @@ private slots:
             iceTransports += cc.iceTransport;
         }
 
-        if (state == Started && useTrickle) {
+        if (useTrickle) {
             QList<Ice176::Candidate> list;
 
             Ice176::Candidate c;
-            c.component  = cc.info.componentId;
-            c.foundation = cc.info.foundation;
-            c.generation = 0; // TODO
-            c.id         = cc.info.id;
-            c.ip         = cc.info.addr.addr;
-            c.ip.setScopeId(QString());
-            c.network  = cc.info.network;
-            c.port     = cc.info.addr.port;
-            c.priority = cc.info.priority;
-            c.protocol = "udp";
-            if (cc.info.type != IceComponent::HostType) {
-                c.rel_addr = cc.info.base.addr;
-                c.rel_addr.setScopeId(QString());
-                c.rel_port = cc.info.base.port;
-            } else {
-                c.rel_addr = QHostAddress();
-                c.rel_port = -1;
-            }
-            c.rem_addr = QHostAddress();
-            c.rem_port = -1;
-            c.type     = candidateType_to_string(cc.info.type);
+            toOutCandidate(cc, c);
             list += c;
 
             emit q->localCandidatesReady(list);
         }
+        if (state == Started) {
+            doPairing(update, remoteCandidates);
+        }
     }
 
     void ic_candidateRemoved(const XMPP::IceComponent::Candidate &cc)
@@ -743,60 +781,48 @@ private slots:
 
         components[at].localFinished = true;
 
-        bool allFinished = true;
+        bool allLocalFinished = true;
         foreach (const Component &c, components) {
             if (!c.localFinished) {
-                allFinished = false;
+                allLocalFinished = false;
                 break;
             }
         }
 
-        if (allFinished) {
+        if (allLocalFinished && useTrickle) {
             state = Started;
-
             emit q->started();
+        }
+    }
 
-            if (!useTrickle) {
-                // FIXME: there should be a way to not wait if
-                //   we know for sure there is nothing else
-                //   possibly coming
-                collectTimer = new QTimer(this);
-                connect(collectTimer, SIGNAL(timeout()), SLOT(collect_timeout()));
-                collectTimer->setSingleShot(true);
-                collectTimer->start(4000);
+    void ic_gatheringComplete()
+    {
+        if (localGatheringComplete)
+            return; // wtf? Why are we here then
+
+        for (auto const &c : components) {
+            if (!c.ic->isGatheringComplete()) {
                 return;
             }
+        }
+        localGatheringComplete = true;
 
-            // FIXME: DOR-SS
-            QList<Ice176::Candidate> list;
-            foreach (const IceComponent::Candidate &cc, localCandidates) {
-                Ice176::Candidate c;
-                c.component  = cc.info.componentId;
-                c.foundation = cc.info.foundation;
-                c.generation = 0; // TODO
-                c.id         = cc.info.id;
-                c.ip         = cc.info.addr.addr;
-                c.ip.setScopeId(QString());
-                c.network  = cc.info.network;
-                c.port     = cc.info.addr.port;
-                c.priority = cc.info.priority;
-                c.protocol = "udp";
-                if (cc.info.type != IceComponent::HostType) {
-                    c.rel_addr = cc.info.base.addr;
-                    c.rel_addr.setScopeId(QString());
-                    c.rel_port = cc.info.base.port;
-                } else {
-                    c.rel_addr = QHostAddress();
-                    c.rel_port = -1;
-                }
-                c.rem_addr = QHostAddress();
-                c.rem_port = -1;
-                c.type     = candidateType_to_string(cc.info.type);
-                list += c;
-            }
-            if (!list.isEmpty())
-                emit q->localCandidatesReady(list);
+        if (useTrickle) { // It was already started
+            emit q->localGatheringComplete();
+            return;
+        }
+
+        QList<Ice176::Candidate> list;
+        foreach (const IceComponent::Candidate &cc, localCandidates) {
+            Ice176::Candidate c;
+            toOutCandidate(cc, c);
+            list += c;
         }
+        if (!list.isEmpty())
+            emit q->localCandidatesReady(list);
+
+        state = Started;
+        emit q->started();
     }
 
     void ic_stopped()
@@ -829,42 +855,6 @@ private slots:
         printf("C%d: %s\n", at + 1, qPrintable(line));
     }
 
-    void collect_timeout()
-    {
-        collectTimer->disconnect(this);
-        collectTimer->deleteLater();
-        collectTimer = nullptr;
-
-        QList<Ice176::Candidate> list;
-        foreach (const IceComponent::Candidate &cc, localCandidates) {
-            Ice176::Candidate c;
-            c.component  = cc.info.componentId;
-            c.foundation = cc.info.foundation;
-            c.generation = 0; // TODO
-            c.id         = cc.info.id;
-            c.ip         = cc.info.addr.addr;
-            c.ip.setScopeId(QString());
-            c.network  = cc.info.network;
-            c.port     = cc.info.addr.port;
-            c.priority = cc.info.priority;
-            c.protocol = "udp";
-            if (cc.info.type != IceComponent::HostType) {
-                c.rel_addr = cc.info.base.addr;
-                c.rel_addr.setScopeId(QString());
-                c.rel_port = cc.info.base.port;
-            } else {
-                c.rel_addr = QHostAddress();
-                c.rel_port = -1;
-            }
-            c.rem_addr = QHostAddress();
-            c.rem_port = -1;
-            c.type     = candidateType_to_string(cc.info.type);
-            list += c;
-        }
-        if (!list.isEmpty())
-            emit q->localCandidatesReady(list);
-    }
-
     void it_readyRead(int path)
     {
         IceTransport *it = static_cast<IceTransport *>(sender());
@@ -930,7 +920,7 @@ private slots:
 
                 QList<StunMessage::Attribute> list;
                 StunMessage::Attribute        attr;
-                attr.type  = 0x0020;
+                attr.type  = 0x0020; // XOR-MAPPED-ADDRESS / rfc5389
                 attr.value = val;
                 list += attr;
 
@@ -938,6 +928,10 @@ private slots:
 
                 QByteArray packet = response.toBinary(StunMessage::MessageIntegrity | StunMessage::Fingerprint, reqkey);
                 sock->writeDatagram(path, packet, fromAddr, fromPort);
+
+                if (msg.hasAttribute(StunTypes::USE_CANDIDATE)) {
+                    find
+                }
             } else {
                 QByteArray  reskey = peerPass.toUtf8();
                 StunMessage msg    = StunMessage::fromBinary(
@@ -1029,19 +1023,20 @@ private slots:
     void binding_success()
     {
         StunBinding *binding = static_cast<StunBinding *>(sender());
-        int          at      = -1;
-        for (int n = 0; n < checkList.pairs.count(); ++n) {
-            if (checkList.pairs[n].binding == binding) {
-                at = n;
-                break;
-            }
-        }
-        if (at == -1)
+
+        auto it = std::find_if(checkList.pairs.begin(), checkList.pairs.end(),
+                               [&](auto const &p) { return p.binding == binding; });
+        if (it == checkList.pairs.constEnd())
             return;
 
         printf("check success\n");
 
-        CandidatePair &pair = checkList.pairs[at];
+        CandidatePair &pair = *it;
+        pair.isValid        = true;
+        pair.state          = CandidatePairState::PSucceeded;
+        if (!binding->useCandidate()) { // not nomination
+            return;
+        }
 
         // TODO: if we were cool, we'd do something with the peer
         //   reflexive address received
@@ -1050,33 +1045,60 @@ private slots:
         //   that currently we check everything anyway so this is not
         //   relevant
 
-        // check if there's a candidate already valid
-        at = -1;
-        for (int n = 0; n < checkList.pairs.count(); ++n) {
-            if (checkList.pairs[n].local.componentId == pair.local.componentId && checkList.pairs[n].isValid) {
-                at = n;
-                break;
-            }
+        // check if component already has nominated pair
+        it = std::find_if(checkList.pairs.begin(), checkList.pairs.end(), [&](auto const &p) {
+            return p.local.componentId == pair.local.componentId && p.isNominated;
+        });
+
+        if (it != checkList.pairs.end()) {
+            printf("component %d already active, not signalling\n", pair.local.componentId);
+            return;
+        }
+        pair.isNominated = true;
+
+        int        at = findComponent(pair.local.componentId);
+        Component &c  = components[at];
+        if (c.lowOverhead) {
+            printf("component is flagged for low overhead.  setting up for %s;%d -> %s;%d\n",
+                   qPrintable(pair.local.addr.addr.toString()), pair.local.addr.port,
+                   qPrintable(pair.remote.addr.addr.toString()), pair.remote.addr.port);
+            at                          = findLocalCandidate(pair.local.addr.addr, pair.local.addr.port);
+            IceComponent::Candidate &cc = localCandidates[at];
+            c.ic->flagPathAsLowOverhead(cc.id, pair.remote.addr.addr, pair.remote.addr.port);
         }
 
-        pair.isValid = true;
-
-        if (at == -1) {
-            int        at = findComponent(pair.local.componentId);
-            Component &c  = components[at];
-            if (c.lowOverhead) {
-                printf("component is flagged for low overhead.  setting up for %s;%d -> %s;%d\n",
-                       qPrintable(pair.local.addr.addr.toString()), pair.local.addr.port,
-                       qPrintable(pair.remote.addr.addr.toString()), pair.remote.addr.port);
-                at                          = findLocalCandidate(pair.local.addr.addr, pair.local.addr.port);
-                IceComponent::Candidate &cc = localCandidates[at];
-                c.ic->flagPathAsLowOverhead(cc.id, pair.remote.addr.addr, pair.remote.addr.port);
-            }
+        emit q->componentReady(pair.local.componentId - 1);
+    }
 
-            emit q->componentReady(pair.local.componentId - 1);
-        } else {
-            printf("component %d already active, not signalling\n", pair.local.componentId);
+    void binding_error(XMPP::StunBinding::Error)
+    {
+        Q_ASSERT(state != Stopped);
+        if (state == Stopping)
+            return; // we don't care about late errors
+
+        StunBinding *binding = static_cast<StunBinding *>(sender());
+
+        auto it = std::find_if(checkList.pairs.begin(), checkList.pairs.end(),
+                               [&](auto const &p) { return p.binding == binding; });
+        if (it == checkList.pairs.constEnd())
+            return;
+
+        printf("check failed\n");
+
+        CandidatePair &pair = *it;
+        pair.state          = CandidatePairState::PFailed;
+
+        if (state == Started) {
+            // oops already started ICE reports errors. keep-alive checks?
+            if (pair.isNominated) {
+                printf("check failed on nominated candidate. set ICE status to failed");
+                stop();
+                emit q->error(ErrorDisconnected);
+            }
+            return;
         }
+
+        tryComponentFailed(pair.local.componentId);
     }
 };
 
@@ -1140,6 +1162,10 @@ void Ice176::setComponentCount(int count)
 
 void Ice176::setLocalCandidateTrickle(bool enabled) { d->useTrickle = enabled; }
 
+void Ice176::setAggressiveNomination(bool enabled) { d->aggressiveNomination = enabled; }
+
+void Ice176::setExpectRemoteCandidatesSignal(bool enabled) { d->expectRemoteCandidatesSignal = enabled; }
+
 void Ice176::start(Mode mode)
 {
     d->mode = mode;
@@ -1158,6 +1184,8 @@ void Ice176::setPeerPassword(const QString &pass) { d->peerPass = pass; }
 
 void Ice176::addRemoteCandidates(const QList<Candidate> &list) { d->addRemoteCandidates(list); }
 
+void Ice176::setRemoteGatheringComplete() { d->remoteGatheringComplete = true; }
+
 bool Ice176::hasPendingDatagrams(int componentIndex) const { return !d->in[componentIndex].isEmpty(); }
 
 QByteArray Ice176::readDatagram(int componentIndex) { return d->in[componentIndex].takeFirst(); }
diff --git a/src/irisnet/noncore/ice176.h b/src/irisnet/noncore/ice176.h
index 690b7efe..3e441091 100644
--- a/src/irisnet/noncore/ice176.h
+++ b/src/irisnet/noncore/ice176.h
@@ -36,7 +36,7 @@ class Ice176 : public QObject {
     Q_OBJECT
 
 public:
-    enum Error { ErrorGeneric };
+    enum Error { ErrorGeneric, ErrorDisconnected };
 
     enum Mode { Initiator, Responder };
 
@@ -60,22 +60,20 @@ class Ice176 : public QObject {
 
     class Candidate {
     public:
-        int          component;
+        int          component = -1;
         QString      foundation;
-        int          generation;
+        int          generation = -1;
         QString      id;
         QHostAddress ip;
-        int          network; // -1 = unknown
-        int          port;
-        int          priority;
+        int          network  = -1; // -1 = unknown
+        int          port     = -1;
+        int          priority = -1;
         QString      protocol;
         QHostAddress rel_addr;
-        int          rel_port;
+        int          rel_port = -1;
         QHostAddress rem_addr;
-        int          rem_port;
+        int          rem_port = -1;
         QString      type;
-
-        Candidate() : component(-1), generation(-1), network(-1), port(-1), priority(-1), rel_port(-1), rem_port(-1) {}
     };
 
     Ice176(QObject *parent = nullptr);
@@ -107,7 +105,26 @@ class Ice176 : public QObject {
     void setUseStunRelayTcp(bool enabled);
 
     void setComponentCount(int count);
-    void setLocalCandidateTrickle(bool enabled); // default false
+    void setLocalCandidateTrickle(bool enabled); // default true
+
+    /**
+     * @brief setAggressiveNomination - local will use aggressive nomination technique of rfc5245 when enabled.
+     *   Note, agressive nomination was deprecated in rfc8445.
+     *   default: false.
+     *
+     * If remote doesn't support "urn:xmpp:jingle:transports:ice:1" this has to be set to true.
+     * @param enabled
+     */
+    void setAggressiveNomination(bool enabled); // agressive nomination was deprecated in rfc8445 (default false)
+
+    /**
+     * @brief setExpectRemoteCandidatesSignal - where remote MUST send remote-candidates.
+     *   default: true
+     *
+     * If remote doesn't support "urn:xmpp:jingle:transports:ice:1" this has to be set to false.
+     * @param enabled
+     */
+    void setExpectRemoteCandidatesSignal(bool enabled);
 
     void start(Mode mode);
     void stop();
@@ -119,6 +136,7 @@ class Ice176 : public QObject {
     void setPeerPassword(const QString &pass);
 
     void addRemoteCandidates(const QList<Candidate> &list);
+    void setRemoteGatheringComplete();
 
     bool       hasPendingDatagrams(int componentIndex) const;
     QByteArray readDatagram(int componentIndex);
@@ -144,6 +162,7 @@ class Ice176 : public QObject {
     void error(XMPP::Ice176::Error e);
 
     void localCandidatesReady(const QList<XMPP::Ice176::Candidate> &list);
+    void localGatheringComplete();
     void componentReady(int index);
 
     void readyRead(int componentIndex);
diff --git a/src/irisnet/noncore/icecomponent.cpp b/src/irisnet/noncore/icecomponent.cpp
index 45282dba..0466e55f 100644
--- a/src/irisnet/noncore/icecomponent.cpp
+++ b/src/irisnet/noncore/icecomponent.cpp
@@ -23,6 +23,7 @@
 #include "objectsession.h"
 #include "udpportreserver.h"
 
+#include <QTimer>
 #include <QUdpSocket>
 #include <QtCrypto>
 #include <stdlib.h>
@@ -43,10 +44,36 @@ static int calc_priority(int typePref, int localPref, int componentId)
 class IceComponent::Private : public QObject {
     Q_OBJECT
 
+    struct IceSocket {
+        using Ptr = QSharedPointer<IceSocket>;
+
+        ~IceSocket()
+        {
+            if (!sock)
+                return;
+
+            sock->disconnect(ic);
+            sock->disconnect(ic->d);
+            if (borrowed) {
+                auto pr = ic->portReserver();
+                Q_ASSERT(pr);
+                pr->returnSockets(QList<QUdpSocket *>() << sock);
+            } else {
+                sock->deleteLater();
+            }
+        }
+
+        QUdpSocket *  sock = nullptr;
+        IceComponent *ic   = nullptr;
+        bool          borrowed;
+    };
+
 public:
     class Config {
     public:
-        QList<Ice176::LocalAddress>    localAddrs;
+        QList<Ice176::LocalAddress> localAddrs;
+
+        // for example manually provided external address mapped to every local
         QList<Ice176::ExternalAddress> extAddrs;
 
         QHostAddress stunBindAddr;
@@ -73,7 +100,7 @@ class IceComponent::Private : public QObject {
         bool               isVpn;
         bool               started;
         bool               stun_started;
-        bool               stun_finished, turn_finished;
+        bool               stun_finished, turn_finished; // candidates emitted
         QHostAddress       extAddr;
         bool               ext_finished;
 
@@ -89,27 +116,25 @@ class IceComponent::Private : public QObject {
     int                                id;
     QString                            clientSoftware;
     TurnClient::Proxy                  proxy;
-    UdpPortReserver *                  portReserver;
+    UdpPortReserver *                  portReserver = nullptr;
     Config                             pending;
     Config                             config;
-    bool                               stopping;
-    QList<LocalTransport *>            localLeap;
-    QList<LocalTransport *>            localStun;
-    IceTurnTransport *                 tt;
+    bool                               stopping = false;
+    QList<LocalTransport *>            localLeap;    // transport for local host-only candidates
+    QList<LocalTransport *>            localStun;    // designated for server reflexive and udp relay candidates
+    IceTurnTransport *                 tt = nullptr; // tcp relay candidate
     QList<Candidate>                   localCandidates;
     QHash<int, QSet<TransportAddress>> channelPeers;
-    bool                               useLocal;
-    bool                               useStunBind;
-    bool                               useStunRelayUdp;
-    bool                               useStunRelayTcp;
-    bool                               local_finished;
-    int                                debugLevel;
-
-    Private(IceComponent *_q) :
-        QObject(_q), q(_q), sess(this), portReserver(nullptr), stopping(false), tt(nullptr), useLocal(true),
-        useStunBind(true), useStunRelayUdp(true), useStunRelayTcp(true), local_finished(false), debugLevel(DL_None)
-    {
-    }
+    bool                               useLocal          = true; // use local host candidates
+    bool                               useStunBind       = true;
+    bool                               useStunRelayUdp   = true;
+    bool                               useStunRelayTcp   = true;
+    bool                               localFinished     = false;
+    bool                               stunFinished      = false;
+    bool                               gatheringComplete = false;
+    int                                debugLevel        = DL_None;
+
+    Private(IceComponent *_q) : QObject(_q), q(_q), sess(this) {}
 
     ~Private()
     {
@@ -137,13 +162,15 @@ class IceComponent::Private : public QObject {
         delete tt;
     }
 
+    void update2(QList<QUdpSocket *> *socketList) { Q_ASSERT(!stopping); }
+
     void update(QList<QUdpSocket *> *socketList)
     {
         Q_ASSERT(!stopping);
 
         // for now, only allow setting localAddrs once
         if (!pending.localAddrs.isEmpty() && config.localAddrs.isEmpty()) {
-            foreach (const Ice176::LocalAddress &la, pending.localAddrs) {
+            for (const Ice176::LocalAddress &la : pending.localAddrs) {
                 // skip duplicate addrs
                 if (findLocalAddr(la.addr) != -1)
                     continue;
@@ -159,10 +186,8 @@ class IceComponent::Private : public QObject {
                 if (socketList)
                     qsock = takeFromSocketList(socketList, la.addr, this);
 
-                bool borrowedSocket;
-                if (qsock) {
-                    borrowedSocket = true;
-                } else {
+                bool borrowedSocket = true;
+                if (!qsock) {
                     // otherwise, bind to random
                     qsock = new QUdpSocket(this);
                     if (!qsock->bind(la.addr, 0)) {
@@ -183,7 +208,7 @@ class IceComponent::Private : public QObject {
                 lt->qsock          = qsock;
                 lt->borrowedSocket = borrowedSocket;
                 lt->sock           = new IceLocalTransport(this);
-                lt->sock->setDebugLevel((IceTransport::DebugLevel)debugLevel);
+                lt->sock->setDebugLevel(IceTransport::DebugLevel(debugLevel));
                 lt->network = la.network;
                 lt->isVpn   = la.isVpn;
                 connect(lt->sock, SIGNAL(started()), SLOT(lt_started()));
@@ -205,7 +230,7 @@ class IceComponent::Private : public QObject {
 
             bool need_doExt = false;
 
-            foreach (LocalTransport *lt, localLeap) {
+            for (auto lt : localLeap) {
                 // already assigned an ext address?  skip
                 if (!lt->extAddr.isNull())
                     continue;
@@ -213,25 +238,39 @@ class IceComponent::Private : public QObject {
                 QHostAddress laddr = lt->sock->localAddress();
                 int          lport = lt->sock->localPort();
 
-                int at = -1;
-                for (int n = 0; n < config.extAddrs.count(); ++n) {
-                    const Ice176::ExternalAddress &ea = config.extAddrs[n];
-                    if (laddr.protocol() != QAbstractSocket::IPv6Protocol && ea.base.addr == laddr
-                        && (ea.portBase == -1 || ea.portBase == lport)) {
-                        at = n;
-                        break;
-                    }
-                }
+                if (laddr.protocol() == QAbstractSocket::IPv6Protocol)
+                    continue;
 
-                if (at != -1) {
-                    lt->extAddr = config.extAddrs[at].addr;
+                // find external address by address of local socket (external has to be configured that way)
+                auto eaIt = std::find_if(config.extAddrs.constBegin(), config.extAddrs.constEnd(), [&](auto const &ea) {
+                    return ea.base.addr == laddr && (ea.portBase == -1 || ea.portBase == lport);
+                });
+
+                if (eaIt != config.extAddrs.constEnd()) {
+                    lt->extAddr = eaIt->addr;
                     if (lt->started)
                         need_doExt = true;
                 }
             }
 
             if (need_doExt)
-                sess.defer(this, "doExt");
+                QTimer::singleShot(0, this, [this]() {
+                    if (stopping)
+                        return;
+
+                    ObjectSessionWatcher watch(&sess);
+
+                    for (auto lt : localLeap) {
+                        if (lt->started) {
+                            int addrAt = findLocalAddr(lt->addr);
+                            Q_ASSERT(addrAt != -1);
+
+                            ensureExt(lt, addrAt); // will emit candidateAdded if everything goes well
+                            if (!watch.isValid())
+                                return;
+                        }
+                    }
+                });
         }
 
         // only allow setting stun stuff once
@@ -261,7 +300,7 @@ class IceComponent::Private : public QObject {
                 LocalTransport *lt = new LocalTransport;
                 lt->addr           = la.addr;
                 lt->sock           = new IceLocalTransport(this);
-                lt->sock->setDebugLevel((IceTransport::DebugLevel)debugLevel);
+                lt->sock->setDebugLevel(IceTransport::DebugLevel(debugLevel));
                 lt->network = la.network;
                 lt->isVpn   = la.isVpn;
                 connect(lt->sock, SIGNAL(started()), SLOT(lt_started()));
@@ -279,6 +318,7 @@ class IceComponent::Private : public QObject {
         }
 
         if ((!config.stunBindAddr.isNull() || !config.stunRelayUdpAddr.isNull()) && !localStun.isEmpty()) {
+            // this loop is likely noop since lt->sock->start above doesn't start immediatelly
             for (int n = 0; n < localStun.count(); ++n) {
                 if (localStun[n]->started && !localStun[n]->stun_started)
                     tryStun(n);
@@ -287,7 +327,7 @@ class IceComponent::Private : public QObject {
 
         if (useStunRelayTcp && !config.stunRelayTcpAddr.isNull() && !config.stunRelayTcpUser.isEmpty() && !tt) {
             tt = new IceTurnTransport(this);
-            tt->setDebugLevel((IceTransport::DebugLevel)debugLevel);
+            tt->setDebugLevel(IceTransport::DebugLevel(debugLevel));
             connect(tt, SIGNAL(started()), SLOT(tt_started()));
             connect(tt, SIGNAL(stopped()), SLOT(tt_stopped()));
             connect(tt, SIGNAL(error(int)), SLOT(tt_error(int)));
@@ -302,10 +342,18 @@ class IceComponent::Private : public QObject {
                               + QString::number(config.stunRelayTcpPort) + " for component " + QString::number(id));
         }
 
-        if (localLeap.isEmpty() && localStun.isEmpty() && !local_finished) {
-            local_finished = true;
+        if (localStun.isEmpty())
+            stunFinished = true;
+
+        if (localLeap.isEmpty() && !localFinished) {
+            localFinished = true;
             sess.defer(q, "localFinished");
         }
+
+        if (localFinished && stunFinished && !tt && !gatheringComplete) { // nothing really to be done
+            gatheringComplete = true;
+            sess.defer(q, "gatheringComplete");
+        }
     }
 
     void stop()
@@ -541,26 +589,40 @@ class IceComponent::Private : public QObject {
             postStop();
     }
 
-private slots:
-    void doExt()
+    void tryGatheringComplete()
     {
-        if (stopping)
+        if (gatheringComplete || (tt && !tt->isStarted()))
             return;
 
-        ObjectSessionWatcher watch(&sess);
+        auto checkFinished = [&](const LocalTransport *lt) {
+            return lt->started && (!lt->sock->hasStunBindService() || lt->stun_finished)
+                && (!lt->sock->hasStunRelayService() || lt->turn_finished);
+        };
 
-        foreach (LocalTransport *lt, localLeap) {
-            if (lt->started) {
-                int addrAt = findLocalAddr(lt->addr);
-                Q_ASSERT(addrAt != -1);
-
-                ensureExt(lt, addrAt);
-                if (!watch.isValid())
-                    return;
+        bool allFinished = true;
+        for (const LocalTransport *lt : localLeap) {
+            if (!checkFinished(lt)) {
+                allFinished = false;
+                break;
             }
         }
+        if (allFinished) {
+            for (const LocalTransport *lt : localStun) {
+                if (!checkFinished(lt)) {
+                    allFinished = false;
+                    break;
+                }
+            }
+        }
+
+        if (allFinished) {
+            gatheringComplete = true;
+            emit q->gatheringComplete();
+        }
     }
 
+private slots:
+
     void postStop()
     {
         stopping = false;
@@ -618,26 +680,30 @@ private slots:
         if (!isLocalLeap && !lt->stun_started)
             tryStun(at);
 
-        bool allFinished = true;
-        foreach (const LocalTransport *lt, localLeap) {
-            if (!lt->started) {
-                allFinished = false;
-                break;
+        if (isLocalLeap && !localFinished) {
+            bool allFinished = true;
+            foreach (const LocalTransport *lt, localLeap) {
+                if (!lt->started) {
+                    allFinished = false;
+                    break;
+                }
             }
-        }
-        if (allFinished) {
+            if (allFinished) {
+                localFinished = true;
+                emit q->localFinished();
+            }
+        } else if (!isLocalLeap && !stunFinished) {
+            bool allFinished = true;
             foreach (const LocalTransport *lt, localStun) {
                 if (!lt->started) {
                     allFinished = false;
                     break;
                 }
             }
+            stunFinished = allFinished;
         }
 
-        if (allFinished && !local_finished) {
-            local_finished = true;
-            emit q->localFinished();
-        }
+        tryGatheringComplete();
     }
 
     void lt_stopped()
@@ -758,11 +824,13 @@ private slots:
 
             emit q->candidateAdded(c);
         }
+
+        tryGatheringComplete();
     }
 
     void lt_error(int e)
     {
-        Q_UNUSED(e);
+        Q_UNUSED(e)
 
         IceLocalTransport *sock        = static_cast<IceLocalTransport *>(sender());
         bool               isLocalLeap = false;
@@ -796,6 +864,7 @@ private slots:
             delete lt;
             localStun.removeAt(at);
         }
+        tryGatheringComplete();
     }
 
     void lt_debugLine(const QString &line) { emit q->debugLine(line); }
@@ -823,6 +892,8 @@ private slots:
         localCandidates += c;
 
         emit q->candidateAdded(c);
+
+        tryGatheringComplete();
     }
 
     void tt_stopped()
@@ -841,7 +912,7 @@ private slots:
 
     void tt_error(int e)
     {
-        Q_UNUSED(e);
+        Q_UNUSED(e)
 
         ObjectSessionWatcher watch(&sess);
 
@@ -851,6 +922,7 @@ private slots:
 
         delete tt;
         tt = nullptr;
+        tryGatheringComplete();
     }
 
     void tt_debugLine(const QString &line) { emit q->debugLine(line); }
@@ -866,12 +938,16 @@ IceComponent::~IceComponent() { delete d; }
 
 int IceComponent::id() const { return d->id; }
 
+bool IceComponent::isGatheringComplete() const { return d->gatheringComplete; }
+
 void IceComponent::setClientSoftwareNameAndVersion(const QString &str) { d->clientSoftware = str; }
 
 void IceComponent::setProxy(const TurnClient::Proxy &proxy) { d->proxy = proxy; }
 
 void IceComponent::setPortReserver(UdpPortReserver *portReserver) { d->portReserver = portReserver; }
 
+UdpPortReserver *IceComponent::portReserver() const { return d->portReserver; }
+
 void IceComponent::setLocalAddresses(const QList<Ice176::LocalAddress> &addrs) { d->pending.localAddrs = addrs; }
 
 void IceComponent::setExternalAddresses(const QList<Ice176::ExternalAddress> &addrs) { d->pending.extAddrs = addrs; }
@@ -926,9 +1002,9 @@ void IceComponent::setDebugLevel(DebugLevel level)
 {
     d->debugLevel = level;
     foreach (const Private::LocalTransport *lt, d->localLeap)
-        lt->sock->setDebugLevel((IceTransport::DebugLevel)level);
+        lt->sock->setDebugLevel(IceTransport::DebugLevel(level));
     foreach (const Private::LocalTransport *lt, d->localStun)
-        lt->sock->setDebugLevel((IceTransport::DebugLevel)level);
+        lt->sock->setDebugLevel(IceTransport::DebugLevel(level));
     if (d->tt)
         d->tt->setDebugLevel((IceTransport::DebugLevel)level);
 }
diff --git a/src/irisnet/noncore/icecomponent.h b/src/irisnet/noncore/icecomponent.h
index 74055b0c..14ef5b93 100644
--- a/src/irisnet/noncore/icecomponent.h
+++ b/src/irisnet/noncore/icecomponent.h
@@ -91,12 +91,14 @@ class IceComponent : public QObject {
     IceComponent(int id, QObject *parent = nullptr);
     ~IceComponent();
 
-    int id() const;
+    int  id() const;
+    bool isGatheringComplete() const;
 
     void setClientSoftwareNameAndVersion(const QString &str);
     void setProxy(const TurnClient::Proxy &proxy);
 
-    void setPortReserver(UdpPortReserver *portReserver);
+    void             setPortReserver(UdpPortReserver *portReserver);
+    UdpPortReserver *portReserver() const;
 
     // can be set once, but later changes are ignored
     void setLocalAddresses(const QList<Ice176::LocalAddress> &addrs);
@@ -112,12 +114,17 @@ class IceComponent : public QObject {
 
     // these all start out enabled, but can be disabled for diagnostic
     //   purposes
-    void setUseLocal(bool enabled);
+    void setUseLocal(bool enabled); // where to make local host candidates
     void setUseStunBind(bool enabled);
     void setUseStunRelayUdp(bool enabled);
     void setUseStunRelayTcp(bool enabled);
 
-    // if socketList is not null then port reserver must be set
+    /**
+     * @brief update component with local listening sockets
+     * @param socketList
+     * If socketList is not null then port reserver must be set.
+     * If the pool doesn't have enough sockets, the component will allocate its own.
+     */
     void update(QList<QUdpSocket *> *socketList = nullptr);
     void stop();
 
@@ -140,6 +147,9 @@ class IceComponent : public QObject {
     //   note that it is possible there are no HostType candidates.
     void localFinished();
 
+    // no more candidates will be emitted unless network candidition changes
+    void gatheringComplete();
+
     void stopped();
 
     // reports debug of iceTransports as well.  not DOR-SS/DS safe
diff --git a/src/irisnet/noncore/icelocaltransport.cpp b/src/irisnet/noncore/icelocaltransport.cpp
index d0a799fe..af5046ed 100644
--- a/src/irisnet/noncore/icelocaltransport.cpp
+++ b/src/irisnet/noncore/icelocaltransport.cpp
@@ -422,8 +422,8 @@ private slots:
     {
         ObjectSessionWatcher watch(&sess);
 
-        QList<Datagram> dreads;
-        QList<Datagram> rreads;
+        QList<Datagram> dreads; // direct
+        QList<Datagram> rreads; // relayed
 
         while (sock->hasPendingDatagrams()) {
             QHostAddress from;
@@ -685,6 +685,10 @@ void IceLocalTransport::setStunRelayService(const QHostAddress &addr, int port,
     d->stunPass      = pass;
 }
 
+bool IceLocalTransport::hasStunBindService() const { return !d->stunBindAddr.isNull(); }
+
+bool IceLocalTransport::hasStunRelayService() const { return !d->stunRelayAddr.isNull(); }
+
 void IceLocalTransport::stunStart() { d->stunStart(); }
 
 QHostAddress IceLocalTransport::localAddress() const { return d->addr; }
diff --git a/src/irisnet/noncore/icelocaltransport.h b/src/irisnet/noncore/icelocaltransport.h
index aa43f178..9082322c 100644
--- a/src/irisnet/noncore/icelocaltransport.h
+++ b/src/irisnet/noncore/icelocaltransport.h
@@ -58,6 +58,9 @@ class IceLocalTransport : public IceTransport {
     void setStunBindService(const QHostAddress &addr, int port);
     void setStunRelayService(const QHostAddress &addr, int port, const QString &user, const QCA::SecureArray &pass);
 
+    bool hasStunBindService() const;
+    bool hasStunRelayService() const;
+
     // obtain relay / reflexive
     void stunStart();
 
diff --git a/src/irisnet/noncore/iceturntransport.cpp b/src/irisnet/noncore/iceturntransport.cpp
index 62145739..7d4848a8 100644
--- a/src/irisnet/noncore/iceturntransport.cpp
+++ b/src/irisnet/noncore/iceturntransport.cpp
@@ -36,8 +36,9 @@ class IceTurnTransport::Private : public QObject {
     QHostAddress      relayAddr;
     int               relayPort;
     TurnClient        turn;
-    int               turnErrorCode;
+    int               turnErrorCode = 0;
     int               debugLevel;
+    bool              started = false;
 
     Private(IceTurnTransport *_q) : QObject(_q), q(_q), turn(this), debugLevel(IceTransport::DL_None)
     {
@@ -114,6 +115,7 @@ private slots:
 
         relayAddr = saddr;
         relayPort = sport;
+        started   = true;
 
         emit q->started();
     }
@@ -164,6 +166,8 @@ QHostAddress IceTurnTransport::relayedAddress() const { return d->relayAddr; }
 
 int IceTurnTransport::relayedPort() const { return d->relayPort; }
 
+bool IceTurnTransport::isStarted() const { return d->started; }
+
 void IceTurnTransport::addChannelPeer(const QHostAddress &addr, int port) { d->turn.addChannelPeer(addr, port); }
 
 TurnClient::Error IceTurnTransport::turnErrorCode() const { return (TurnClient::Error)d->turnErrorCode; }
@@ -173,7 +177,7 @@ void IceTurnTransport::stop() { d->stop(); }
 bool IceTurnTransport::hasPendingDatagrams(int path) const
 {
     Q_ASSERT(path == 0);
-    Q_UNUSED(path);
+    Q_UNUSED(path)
 
     return (d->turn.packetsToRead() > 0 ? true : false);
 }
@@ -181,7 +185,7 @@ bool IceTurnTransport::hasPendingDatagrams(int path) const
 QByteArray IceTurnTransport::readDatagram(int path, QHostAddress *addr, int *port)
 {
     Q_ASSERT(path == 0);
-    Q_UNUSED(path);
+    Q_UNUSED(path)
 
     return d->turn.read(addr, port);
 }
@@ -189,7 +193,7 @@ QByteArray IceTurnTransport::readDatagram(int path, QHostAddress *addr, int *por
 void IceTurnTransport::writeDatagram(int path, const QByteArray &buf, const QHostAddress &addr, int port)
 {
     Q_ASSERT(path == 0);
-    Q_UNUSED(path);
+    Q_UNUSED(path)
 
     d->turn.write(buf, addr, port);
 }
diff --git a/src/irisnet/noncore/iceturntransport.h b/src/irisnet/noncore/iceturntransport.h
index 8d9ecd89..ffd842a5 100644
--- a/src/irisnet/noncore/iceturntransport.h
+++ b/src/irisnet/noncore/iceturntransport.h
@@ -49,6 +49,7 @@ class IceTurnTransport : public IceTransport {
 
     QHostAddress relayedAddress() const;
     int          relayedPort() const;
+    bool         isStarted() const;
 
     TurnClient::Error turnErrorCode() const;
 
diff --git a/src/irisnet/noncore/stunbinding.cpp b/src/irisnet/noncore/stunbinding.cpp
index 86ca1a3a..a8fd0e3f 100644
--- a/src/irisnet/noncore/stunbinding.cpp
+++ b/src/irisnet/noncore/stunbinding.cpp
@@ -204,6 +204,8 @@ void StunBinding::setPriority(quint32 i)
 
 void StunBinding::setUseCandidate(bool enabled) { d->extUseCandidate = enabled; }
 
+bool StunBinding::useCandidate() const { return d->extUseCandidate; }
+
 void StunBinding::setIceControlling(quint64 i)
 {
     d->use_extIceControlling = true;
diff --git a/src/irisnet/noncore/stunbinding.h b/src/irisnet/noncore/stunbinding.h
index 3fcc490e..26a2eeaf 100644
--- a/src/irisnet/noncore/stunbinding.h
+++ b/src/irisnet/noncore/stunbinding.h
@@ -38,6 +38,7 @@ class StunBinding : public QObject {
     // for ICE-use only
     void setPriority(quint32 i);
     void setUseCandidate(bool enabled);
+    bool useCandidate() const;
     void setIceControlling(quint64 i);
     void setIceControlled(quint64 i);
 
diff --git a/src/irisnet/noncore/stunmessage.cpp b/src/irisnet/noncore/stunmessage.cpp
index ca8b75e9..742b1b20 100644
--- a/src/irisnet/noncore/stunmessage.cpp
+++ b/src/irisnet/noncore/stunmessage.cpp
@@ -391,6 +391,17 @@ QByteArray StunMessage::attribute(quint16 type) const
     return QByteArray();
 }
 
+bool StunMessage::hasAttribute(quint16 type) const
+{
+    Q_ASSERT(d);
+
+    foreach (const Attribute &i, d->attribs) {
+        if (i.type == type)
+            return true;
+    }
+    return false;
+}
+
 void StunMessage::setClass(Class mclass)
 {
     ENSURE_D
diff --git a/src/irisnet/noncore/stunmessage.h b/src/irisnet/noncore/stunmessage.h
index e9bb3d6c..59df9fd2 100644
--- a/src/irisnet/noncore/stunmessage.h
+++ b/src/irisnet/noncore/stunmessage.h
@@ -57,6 +57,7 @@ class StunMessage {
 
     // returns the first instance or null
     QByteArray attribute(quint16 type) const;
+    bool       hasAttribute(quint16 type) const;
 
     void setClass(Class mclass);
     void setMethod(quint16 method);
diff --git a/src/irisnet/noncore/stuntypes.cpp b/src/irisnet/noncore/stuntypes.cpp
index 99fa0bcb..b9a9acc5 100644
--- a/src/irisnet/noncore/stuntypes.cpp
+++ b/src/irisnet/noncore/stuntypes.cpp
@@ -487,7 +487,7 @@ namespace StunTypes {
                 if (!typeList.isEmpty()) {
                     QStringList strList;
                     foreach (quint16 i, typeList)
-                        strList += QString().sprintf("0x%04x", i);
+                        strList += QString::asprintf("0x%04x", i);
                     return strList.join(", ");
                 } else
                     return "(None)";
@@ -516,7 +516,7 @@ namespace StunTypes {
         case CHANNEL_NUMBER: {
             quint16 i;
             if (parseChannelNumber(val, &i))
-                return QString().sprintf("0x%04x", (int)i);
+                return QString::asprintf("0x%04x", (int)i);
             break;
         }
         case LIFETIME: {
@@ -634,7 +634,7 @@ namespace StunTypes {
                     if (!val.isEmpty())
                         out += QString(" = %1").arg(val);
                 } else
-                    out += QString().sprintf("  Unknown attribute (0x%04x) of %d bytes", a.type, a.value.size());
+                    out += QString::asprintf("  Unknown attribute (0x%04x) of %d bytes", a.type, a.value.size());
             }
         } else
             out += "\n  (None)";
diff --git a/src/irisnet/noncore/udpportreserver.cpp b/src/irisnet/noncore/udpportreserver.cpp
index 96ba77cc..f70ed28d 100644
--- a/src/irisnet/noncore/udpportreserver.cpp
+++ b/src/irisnet/noncore/udpportreserver.cpp
@@ -55,8 +55,16 @@ class UdpPortReserver::Private : public QObject {
 
     UdpPortReserver *   q;
     QList<QHostAddress> addrs;
-    QList<int>          ports; // sorted
-    QList<Item>         items; // in order sorted by port
+    QList<int>          ports; // sorted.
+
+    // addrs * ports = all available sockets
+
+    /**
+     * @brief items kind of ports slice over all provided addresses.
+     * When we request binding on one port it means it will be bound on one item (all its addresses).
+     * The items are sorted by port.
+     */
+    QList<Item> items;
 
     Private(UdpPortReserver *_q) : QObject(_q), q(_q) {}
 
diff --git a/src/xmpp/CMakeLists.txt b/src/xmpp/CMakeLists.txt
index 4861bc95..768f7938 100644
--- a/src/xmpp/CMakeLists.txt
+++ b/src/xmpp/CMakeLists.txt
@@ -95,6 +95,7 @@ set(HEADERS
     xmpp-im/jingle-application.h
     xmpp-im/jingle-session.h
     xmpp-im/jingle-ft.h
+    xmpp-im/jingle-ice.h
     xmpp-im/jingle-s5b.h
     xmpp-im/jingle-ibb.h
 
@@ -137,6 +138,7 @@ set(SOURCES
     xmpp-im/jingle-transport.cpp
     xmpp-im/jingle-nstransportslist.cpp
     xmpp-im/jingle-ft.cpp
+    xmpp-im/jingle-ice.cpp
     xmpp-im/jingle-s5b.cpp
     xmpp-im/jingle-ibb.cpp
 
diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
index be3b121a..f0f7eed3 100644
--- a/src/xmpp/xmpp-im/client.cpp
+++ b/src/xmpp/xmpp-im/client.cpp
@@ -70,6 +70,7 @@
 #include "im.h"
 #include "jingle-ft.h"
 #include "jingle-ibb.h"
+#include "jingle-ice.h"
 #include "jingle-s5b.h"
 #include "jingle.h"
 #include "protocol.h"
@@ -135,6 +136,7 @@ class Client::ClientPrivate {
     S5BManager *           s5bman                = nullptr;
     Jingle::S5B::Manager * jingleS5BManager      = nullptr;
     Jingle::IBB::Manager * jingleIBBManager      = nullptr;
+    Jingle::ICE::Manager * jingleICEManager      = nullptr;
     IBBManager *           ibbman                = nullptr;
     BoBManager *           bobman                = nullptr;
     FileTransferManager *  ftman                 = nullptr;
@@ -175,8 +177,10 @@ Client::Client(QObject *par) : QObject(par)
     d->jingleManager->registerApp(Jingle::FileTransfer::NS, ft);
     d->jingleS5BManager = new Jingle::S5B::Manager(d->jingleManager);
     d->jingleIBBManager = new Jingle::IBB::Manager(d->jingleManager);
+    d->jingleICEManager = new Jingle::ICE::Manager(d->jingleManager);
     d->jingleManager->registerTransport(Jingle::S5B::NS, d->jingleS5BManager);
     d->jingleManager->registerTransport(Jingle::IBB::NS, d->jingleIBBManager);
+    d->jingleManager->registerTransport(Jingle::ICE::NS, d->jingleICEManager);
 }
 
 Client::~Client()
@@ -264,6 +268,8 @@ Jingle::S5B::Manager *Client::jingleS5BManager() const { return d->jingleS5BMana
 
 Jingle::IBB::Manager *Client::jingleIBBManager() const { return d->jingleIBBManager; }
 
+Jingle::ICE::Manager *Client::jingleICEManager() const { return d->jingleICEManager; }
+
 IBBManager *Client::ibbManager() const { return d->ibbman; }
 
 BoBManager *Client::bobManager() const { return d->bobman; }
diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 2a0f6d49..267e16ff 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -641,7 +641,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
         connect(_transport.data(), &Transport::connected, this, [this]() {
             d->lastReason = Reason();
             d->lastError.reset();
-            d->connection = _transport->connection();
+            d->connection = _transport->addChannel();
             if (!d->streamingMode) {
                 connect(d->connection.data(), &Connection::readyRead, this, [this]() {
                     if (!d->device) {
diff --git a/src/xmpp/xmpp-im/jingle-ibb.cpp b/src/xmpp/xmpp-im/jingle-ibb.cpp
index 840a37f4..dc50e031 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.cpp
+++ b/src/xmpp/xmpp-im/jingle-ibb.cpp
@@ -348,10 +348,12 @@ namespace XMPP { namespace Jingle { namespace IBB {
 
     TransportFeatures Transport::features() const
     {
-        return TransportFeature::AlwaysConnect | TransportFeature::Reliable | TransportFeature::Slow;
+        return TransportFeatures(TransportFeature::AlwaysConnect) | TransportFeature::Reliable | TransportFeature::Slow;
     }
 
-    Connection::Ptr Transport::connection() const
+    int Transport::maxSupportedChannels() const { return -1; }
+
+    Connection::Ptr Transport::addChannel() const
     {
         return d->readyConnections.isEmpty() ? Connection::Ptr()
                                              : d->readyConnections.takeFirst().staticCast<XMPP::Jingle::Connection>();
@@ -389,7 +391,7 @@ namespace XMPP { namespace Jingle { namespace IBB {
 
     TransportFeatures Manager::features() const
     {
-        return TransportFeature::AlwaysConnect | TransportFeature::Reliable | TransportFeature::Slow;
+        return TransportFeatures(TransportFeature::AlwaysConnect) | TransportFeature::Reliable | TransportFeature::Slow;
     }
 
     void Manager::setJingleManager(XMPP::Jingle::Manager *jm) { d->jingleManager = jm; }
diff --git a/src/xmpp/xmpp-im/jingle-ibb.h b/src/xmpp/xmpp-im/jingle-ibb.h
index 92c7c19c..66cb1feb 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.h
+++ b/src/xmpp/xmpp-im/jingle-ibb.h
@@ -41,8 +41,9 @@ namespace Jingle { namespace IBB {
         OutgoingTransportInfoUpdate takeOutgoingUpdate() override;
         bool                        isValid() const override;
         TransportFeatures           features() const override;
+        int                         maxSupportedChannels() const override;
 
-        Connection::Ptr connection() const override;
+        Connection::Ptr addChannel() const override;
 
     private:
         friend class Manager;
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
new file mode 100644
index 00000000..6638f71b
--- /dev/null
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -0,0 +1,1088 @@
+/*
+ * jignle-s5b.cpp - Jingle SOCKS5 transport
+ * Copyright (C) 2019  Sergey Ilinykh
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "jingle-ice.h"
+
+#include "ice176.h"
+#include "jingle-session.h"
+#include "netnames.h"
+#include "udpportreserver.h"
+#include "xmpp/jid/jid.h"
+#include "xmpp_client.h"
+#include "xmpp_serverinfomanager.h"
+
+#include <QElapsedTimer>
+#include <QNetworkInterface>
+#include <QTimer>
+
+namespace XMPP { namespace Jingle { namespace ICE {
+    const QString NS(QStringLiteral("urn:xmpp:jingle:transports:ice:0"));
+
+    // TODO: reject offers that don't contain at least one of audio or video
+    // TODO: support candidate negotiations over the JingleRtpChannel thread
+    //   boundary, so we can change candidates after the stream is active
+
+    // scope values: 0 = local, 1 = link-local, 2 = private, 3 = public
+    static int getAddressScope(const QHostAddress &a)
+    {
+        if (a.protocol() == QAbstractSocket::IPv6Protocol) {
+            if (a == QHostAddress(QHostAddress::LocalHostIPv6))
+                return 0;
+            else if (XMPP::Ice176::isIPv6LinkLocalAddress(a))
+                return 1;
+        } else if (a.protocol() == QAbstractSocket::IPv4Protocol) {
+            quint32 v4 = a.toIPv4Address();
+            quint8  a0 = v4 >> 24;
+            quint8  a1 = (v4 >> 16) & 0xff;
+            if (a0 == 127)
+                return 0;
+            else if (a0 == 169 && a1 == 254)
+                return 1;
+            else if (a0 == 10)
+                return 2;
+            else if (a0 == 172 && a1 >= 16 && a1 <= 31)
+                return 2;
+            else if (a0 == 192 && a1 == 168)
+                return 2;
+        }
+
+        return 3;
+    }
+
+    // -1 = a is higher priority, 1 = b is higher priority, 0 = equal
+    static int comparePriority(const QHostAddress &a, const QHostAddress &b)
+    {
+        // prefer closer scope
+        int a_scope = getAddressScope(a);
+        int b_scope = getAddressScope(b);
+        if (a_scope < b_scope)
+            return -1;
+        else if (a_scope > b_scope)
+            return 1;
+
+        // prefer ipv6
+        if (a.protocol() == QAbstractSocket::IPv6Protocol && b.protocol() != QAbstractSocket::IPv6Protocol)
+            return -1;
+        else if (b.protocol() == QAbstractSocket::IPv6Protocol && a.protocol() != QAbstractSocket::IPv6Protocol)
+            return 1;
+
+        return 0;
+    }
+
+    static QList<QHostAddress> sortAddrs(const QList<QHostAddress> &in)
+    {
+        QList<QHostAddress> out;
+
+        foreach (const QHostAddress &a, in) {
+            int at;
+            for (at = 0; at < out.count(); ++at) {
+                if (comparePriority(a, out[at]) < 0)
+                    break;
+            }
+
+            out.insert(at, a);
+        }
+
+        return out;
+    }
+
+    static QChar randomPrintableChar()
+    {
+        // 0-25 = a-z
+        // 26-51 = A-Z
+        // 52-61 = 0-9
+
+        uchar c = QCA::Random::randomChar() % 62;
+        if (c <= 25)
+            return 'a' + c;
+        else if (c <= 51)
+            return 'A' + (c - 26);
+        else
+            return '0' + (c - 52);
+    }
+
+    static QString randomCredential(int len)
+    {
+        QString out;
+        for (int n = 0; n < len; ++n)
+            out += randomPrintableChar();
+        return out;
+    }
+
+    // resolve external address and stun server
+    // TODO: resolve hosts and start ice engine simultaneously
+    // FIXME: when/if our ICE engine supports adding these dynamically, we should
+    //   not have the lookups block on each other
+    class Resolver : public QObject {
+        Q_OBJECT
+
+    private:
+        XMPP::NameResolver dnsA;
+        XMPP::NameResolver dnsB;
+        XMPP::NameResolver dnsC;
+        XMPP::NameResolver dnsD;
+        QString            extHost;
+        QString            stunBindHost, stunRelayUdpHost, stunRelayTcpHost;
+        bool               extDone;
+        bool               stunBindDone;
+        bool               stunRelayUdpDone;
+        bool               stunRelayTcpDone;
+
+    public:
+        QHostAddress extAddr;
+        QHostAddress stunBindAddr, stunRelayUdpAddr, stunRelayTcpAddr;
+
+        Resolver(QObject *parent = nullptr) : QObject(parent), dnsA(parent), dnsB(parent), dnsC(parent), dnsD(parent)
+        {
+            connect(&dnsA, SIGNAL(resultsReady(const QList<XMPP::NameRecord> &)),
+                    SLOT(dns_resultsReady(const QList<XMPP::NameRecord> &)));
+            connect(&dnsA, SIGNAL(error(XMPP::NameResolver::Error)), SLOT(dns_error(XMPP::NameResolver::Error)));
+
+            connect(&dnsB, SIGNAL(resultsReady(const QList<XMPP::NameRecord> &)),
+                    SLOT(dns_resultsReady(const QList<XMPP::NameRecord> &)));
+            connect(&dnsB, SIGNAL(error(XMPP::NameResolver::Error)), SLOT(dns_error(XMPP::NameResolver::Error)));
+
+            connect(&dnsC, SIGNAL(resultsReady(const QList<XMPP::NameRecord> &)),
+                    SLOT(dns_resultsReady(const QList<XMPP::NameRecord> &)));
+            connect(&dnsC, SIGNAL(error(XMPP::NameResolver::Error)), SLOT(dns_error(XMPP::NameResolver::Error)));
+
+            connect(&dnsD, SIGNAL(resultsReady(const QList<XMPP::NameRecord> &)),
+                    SLOT(dns_resultsReady(const QList<XMPP::NameRecord> &)));
+            connect(&dnsD, SIGNAL(error(XMPP::NameResolver::Error)), SLOT(dns_error(XMPP::NameResolver::Error)));
+        }
+
+        void start(const QString &_extHost, const QString &_stunBindHost, const QString &_stunRelayUdpHost,
+                   const QString &_stunRelayTcpHost)
+        {
+            extHost          = _extHost;
+            stunBindHost     = _stunBindHost;
+            stunRelayUdpHost = _stunRelayUdpHost;
+            stunRelayTcpHost = _stunRelayTcpHost;
+
+            if (!extHost.isEmpty()) {
+                extDone = false;
+                dnsA.start(extHost.toLatin1());
+            } else
+                extDone = true;
+
+            if (!stunBindHost.isEmpty()) {
+                stunBindDone = false;
+                dnsB.start(stunBindHost.toLatin1());
+            } else
+                stunBindDone = true;
+
+            if (!stunRelayUdpHost.isEmpty()) {
+                stunRelayUdpDone = false;
+                dnsC.start(stunRelayUdpHost.toLatin1());
+            } else
+                stunRelayUdpDone = true;
+
+            if (!stunRelayTcpHost.isEmpty()) {
+                stunRelayTcpDone = false;
+                dnsD.start(stunRelayTcpHost.toLatin1());
+            } else
+                stunRelayTcpDone = true;
+
+            if (extDone && stunBindDone && stunRelayUdpDone && stunRelayTcpDone)
+                QMetaObject::invokeMethod(this, "finished", Qt::QueuedConnection);
+        }
+
+    signals:
+        void finished();
+
+    private slots:
+        void dns_resultsReady(const QList<XMPP::NameRecord> &results)
+        {
+            XMPP::NameResolver *dns = static_cast<XMPP::NameResolver *>(sender());
+
+            // FIXME: support more than one address?
+            QHostAddress addr = results.first().address();
+
+            if (dns == &dnsA) {
+                extAddr = addr;
+                extDone = true;
+                tryFinish();
+            } else if (dns == &dnsB) {
+                stunBindAddr = addr;
+                stunBindDone = true;
+                tryFinish();
+            } else if (dns == &dnsC) {
+                stunRelayUdpAddr = addr;
+                stunRelayUdpDone = true;
+                tryFinish();
+            } else // dnsD
+            {
+                stunRelayTcpAddr = addr;
+                stunRelayTcpDone = true;
+                tryFinish();
+            }
+        }
+
+        void dns_error(XMPP::NameResolver::Error e)
+        {
+            Q_UNUSED(e)
+
+            XMPP::NameResolver *dns = static_cast<XMPP::NameResolver *>(sender());
+
+            if (dns == &dnsA) {
+                extDone = true;
+                tryFinish();
+            } else if (dns == &dnsB) {
+                stunBindDone = true;
+                tryFinish();
+            } else if (dns == &dnsC) {
+                stunRelayUdpDone = true;
+                tryFinish();
+            } else // dnsD
+            {
+                stunRelayTcpDone = true;
+                tryFinish();
+            }
+        }
+
+    private:
+        void tryFinish()
+        {
+            if (extDone && stunBindDone && stunRelayUdpDone && stunRelayTcpDone)
+                emit finished();
+        }
+    };
+
+    class IceStopper : public QObject {
+        Q_OBJECT
+
+    public:
+        QTimer                 t;
+        XMPP::UdpPortReserver *portReserver;
+        QList<XMPP::Ice176 *>  left;
+
+        IceStopper(QObject *parent = nullptr) : QObject(parent), t(this), portReserver(nullptr)
+        {
+            connect(&t, SIGNAL(timeout()), SLOT(t_timeout()));
+            t.setSingleShot(true);
+        }
+
+        ~IceStopper()
+        {
+            qDeleteAll(left);
+            delete portReserver;
+            printf("IceStopper done\n");
+        }
+
+        void start(XMPP::UdpPortReserver *_portReserver, const QList<XMPP::Ice176 *> iceList)
+        {
+            if (_portReserver) {
+                portReserver = _portReserver;
+                portReserver->setParent(this);
+            }
+            left = iceList;
+
+            foreach (XMPP::Ice176 *ice, left) {
+                ice->setParent(this);
+
+                // TODO: error() also?
+                connect(ice, SIGNAL(stopped()), SLOT(ice_stopped()));
+                connect(ice, SIGNAL(error(XMPP::Ice176::Error)), SLOT(ice_error(XMPP::Ice176::Error)));
+                ice->stop();
+            }
+
+            t.start(3000);
+        }
+
+    private slots:
+        void ice_stopped()
+        {
+            XMPP::Ice176 *ice = static_cast<XMPP::Ice176 *>(sender());
+            ice->disconnect(this);
+            ice->setParent(nullptr);
+            ice->deleteLater();
+            left.removeAll(ice);
+            if (left.isEmpty())
+                deleteLater();
+        }
+
+        void ice_error(XMPP::Ice176::Error e)
+        {
+            Q_UNUSED(e)
+
+            ice_stopped();
+        }
+
+        void t_timeout() { deleteLater(); }
+    };
+
+    class Manager::Private {
+    public:
+        XMPP::Jingle::Manager *jingleManager = nullptr;
+
+        int          basePort = -1;
+        QString      extHost;
+        QHostAddress selfAddr;
+
+        QString stunBindHost;
+        int     stunBindPort;
+        QString stunRelayUdpHost;
+        int     stunRelayUdpPort;
+        QString stunRelayUdpUser;
+        QString stunRelayUdpPass;
+        QString stunRelayTcpHost;
+        int     stunRelayTcpPort;
+        QString stunRelayTcpUser;
+        QString stunRelayTcpPass;
+
+        XMPP::TurnClient::Proxy stunProxy;
+
+        // FIMME it's reuiqred to split transports by direction otherwise we gonna hit conflicts.
+        // jid,transport-sid -> transport mapping
+        //        QSet<QPair<Jid, QString>>   sids;
+        //        QHash<QString, Transport *> key2transport;
+        //        Jid                         proxy;
+    };
+
+    class JingleRtpRemoteCandidate {
+    public:
+        int          component;
+        QHostAddress addr;
+        int          port;
+
+        JingleRtpRemoteCandidate() : component(-1), port(-1) {}
+    };
+
+    class JingleRtpTrans {
+    public:
+        QString                         user;
+        QString                         pass;
+        QList<XMPP::Ice176::Candidate>  candidates;
+        QList<JingleRtpRemoteCandidate> remoteCandidates;
+    };
+
+    static XMPP::Ice176::Candidate elementToCandidate(const QDomElement &e)
+    {
+        if (e.tagName() != "candidate")
+            return XMPP::Ice176::Candidate();
+
+        XMPP::Ice176::Candidate c;
+        c.component  = e.attribute("component").toInt();
+        c.foundation = e.attribute("foundation");
+        c.generation = e.attribute("generation").toInt();
+        c.id         = e.attribute("id");
+        c.ip         = QHostAddress(e.attribute("ip"));
+        c.network    = e.attribute("network").toInt();
+        c.port       = e.attribute("port").toInt();
+        c.priority   = e.attribute("priority").toInt();
+        c.protocol   = e.attribute("protocol");
+        c.rel_addr   = QHostAddress(e.attribute("rel-addr"));
+        c.rel_port   = e.attribute("rel-port").toInt();
+        // TODO: remove this?
+        // c.rem_addr = QHostAddress(e.attribute("rem-addr"));
+        // c.rem_port = e.attribute("rem-port").toInt();
+        c.type = e.attribute("type");
+        return c;
+    }
+
+    class Connection : public XMPP::Jingle::Connection {
+        Q_OBJECT
+    public:
+        QList<NetworkDatagram> datagrams;
+        void *                 client;
+        int                    channelIndex;
+
+        Connection(int channelIndex) : channelIndex(channelIndex)
+        {
+            /*connect(client, &SocksClient::readyRead, this, &Connection::readyRead);
+            connect(client, &SocksClient::bytesWritten, this, &Connection::bytesWritten);
+            connect(client, &SocksClient::aboutToClose, this, &Connection::aboutToClose);
+            if (client->isOpen()) {
+                setOpenMode(client->openMode());
+            } else {
+                qWarning("Creating S5B Transport connection on closed SockClient connection %p", client);
+            }*/
+        }
+
+        bool hasPendingDatagrams() const { return datagrams.size() > 0; }
+
+        NetworkDatagram receiveDatagram(qint64 maxSize = -1)
+        {
+            Q_UNUSED(maxSize) // TODO or not?
+            return datagrams.size() ? datagrams.takeFirst() : NetworkDatagram();
+        }
+
+        qint64 bytesAvailable() const { return 0; }
+
+        qint64 bytesToWrite() const { return 0; /*client->bytesToWrite();*/ }
+
+        void close() { XMPP::Jingle::Connection::close(); }
+
+    protected:
+        qint64 writeData(const char *data, qint64 maxSize)
+        {
+            return 0; // client->write(data, maxSize);
+        }
+
+        qint64 readData(char *data, qint64 maxSize) { return 0; }
+
+    private:
+        friend class Transport;
+
+        void onConnected(Ice176 *ice) { emit connected(); }
+
+        void enqueueIncomingUDP(const QByteArray &data)
+        {
+            datagrams.append(NetworkDatagram { data });
+            emit readyRead();
+        }
+    };
+
+    class Transport::Private {
+    public:
+        enum PendingActions { NewCandidate = 1, RemoteCandidate = 2, GatheringComplete = 4 };
+
+        Transport *                    q                               = nullptr;
+        bool                           offerSent                       = false;
+        bool                           waitingAck                      = true;
+        bool                           aborted                         = false;
+        bool                           proxyDiscoveryInProgress        = false; // if we have valid proxy requests
+        bool                           remoteReportedGatheringComplete = false;
+        bool                           iceStarted                      = false;
+        quint16                        pendingActions                  = 0;
+        int                            proxiesInDiscoCount             = 0;
+        QList<XMPP::Ice176::Candidate> localCandidates; // cid to candidate mapping
+        QList<XMPP::Ice176::Candidate> remoteCandidates;
+        QString                        remoteUfrag;
+        QString                        remotePassword;
+
+        // QString            sid;
+        // Transport::Mode    mode = Transport::Tcp;
+        // QTimer             probingTimer;
+        // QTimer             negotiationFinishTimer;
+        // QElapsedTimer      lastConnectionStart;
+        // size_t             blockSize    = 8192;
+        TcpPortDiscoverer *disco        = nullptr;
+        UdpPortReserver *  portReserver = nullptr;
+        Resolver           resolver;
+        XMPP::Ice176 *     ice = nullptr;
+
+        QHostAddress extAddr;
+        QHostAddress stunBindAddr, stunRelayUdpAddr, stunRelayTcpAddr;
+        int          stunBindPort;
+        int          stunRelayUdpPort;
+        int          stunRelayTcpPort;
+
+        QMap<int, QSharedPointer<Connection>> channels;
+
+        // udp stuff
+        bool         udpInitialized;
+        quint16      udpPort;
+        QHostAddress udpAddress;
+
+        inline Jid remoteJid() const { return q->_pad->session()->peer(); }
+
+        void flushRemoteCandidates()
+        {
+            if (q->_state < State::ApprovedToSend || q->_state == State::Finished)
+                return;
+            ice->setPeerUfrag(remoteUfrag);
+            ice->setPeerPassword(remotePassword);
+            if (!remoteCandidates.isEmpty()) {
+                ice->addRemoteCandidates(remoteCandidates);
+                remoteCandidates.clear();
+            }
+        }
+
+        bool handleIncomingCandidate(const QDomElement &transportEl)
+        {
+            QString candidateTag(QStringLiteral("candidate"));
+            int     candidatesAdded = 0;
+            for (QDomElement ce = transportEl.firstChildElement(candidateTag); !ce.isNull();
+                 ce             = ce.nextSiblingElement(candidateTag)) {
+                XMPP::Ice176::Candidate ic = elementToCandidate(ce);
+                if (ic.type.isEmpty()) {
+                    throw std::runtime_error("failed to parse incoming candidate");
+                }
+                if (!candidatesAdded) {
+                    remoteUfrag    = transportEl.attribute("ufrag");
+                    remotePassword = transportEl.attribute("pwd");
+                    if (remoteUfrag.isEmpty() || remotePassword.isEmpty())
+                        throw std::runtime_error("user fragment or password can't be empty");
+                }
+                // qDebug("new remote candidate: %s", qPrintable(c.toString()));
+                remoteCandidates.append(ic); // TODO check for collisions!
+                candidatesAdded++;
+            }
+            if (candidatesAdded) {
+                QTimer::singleShot(0, q, [this]() { flushRemoteCandidates(); });
+                return true;
+            }
+            return false;
+        }
+
+        bool handleIncomingRemoteCandidate(const QDomElement &transportEl)
+        {
+            QDomElement el = transportEl.firstChildElement(QStringLiteral("remote-candidate"));
+            if (!el.isNull()) {
+                bool     ok, ok2;
+                auto     component = el.attribute(QLatin1String("component")).toUInt(&ok);
+                auto     ip        = QHostAddress(el.attribute(QLatin1String("ip")));
+                uint16_t port      = el.attribute(QLatin1String("port")).toUShort(&ok2);
+
+                if (!(ok && ok2 && !ip.isNull()))
+                    throw std::runtime_error("failed to parse remote-candidate");
+                /*
+                                auto cUsed = localCandidates.value(el.attribute(QStringLiteral("cid")));
+                                if (!cUsed) {
+                                    throw std::runtime_error("failed to find incoming candidate-used candidate");
+                                }
+                                if (cUsed.state() == Candidate::Pending) {
+                                    cUsed.setState(Candidate::Accepted);
+                                    localUsedCandidate = cUsed;
+                                    updateMinimalPriorityOnConnected();
+                                    QTimer::singleShot(0, q, [this]() { checkAndFinishNegotiation(); });
+                                } else {
+                                    // we already rejected the candidate and either remote side already knows about it
+                   or will soon
+                                    // it's possible for example if we were able to connect to higher priority
+                   candidate, so
+                                    // we have o pretend like remote couldn't select anything better but finished
+                   already, in other
+                                    // words like if it sent candidate-error.
+                                    localUsedCandidate           = Candidate();
+                                }
+                                */
+                return true;
+            }
+            return false;
+        }
+
+        bool handleIncomingGatheringComplete(const QDomElement &transportEl)
+        {
+            auto el = transportEl.firstChildElement(QStringLiteral("gathering-complete"));
+            if (!el.isNull()) {
+                remoteReportedGatheringComplete = true;
+                /*
+                for (auto &c : localCandidates) {
+                    if (c.state() == Candidate::Pending) {
+                        c.setState(Candidate::Discarded);
+                    }
+                }
+                */
+                qDebug("recv gathering-complete: all local pending candidates were discarded");
+                // QTimer::singleShot(0, q, [this]() { checkAndFinishNegotiation(); });
+                return true;
+            }
+            return false;
+        }
+
+        void startIce()
+        {
+            auto manager = dynamic_cast<Manager *>(q->_pad->manager())->d.data();
+
+            stunBindPort     = manager->stunBindPort;
+            stunRelayUdpPort = manager->stunRelayUdpPort;
+            stunRelayTcpPort = manager->stunRelayTcpPort;
+            if (!stunBindAddr.isNull() && stunBindPort > 0)
+                printf("STUN service: %s;%d\n", qPrintable(stunBindAddr.toString()), stunBindPort);
+            if (!stunRelayUdpAddr.isNull() && stunRelayUdpPort > 0 && !manager->stunRelayUdpUser.isEmpty())
+                printf("TURN w/ UDP service: %s;%d\n", qPrintable(stunRelayUdpAddr.toString()), stunRelayUdpPort);
+            if (!stunRelayTcpAddr.isNull() && stunRelayTcpPort > 0 && !manager->stunRelayTcpUser.isEmpty())
+                printf("TURN w/ TCP service: %s;%d\n", qPrintable(stunRelayTcpAddr.toString()), stunRelayTcpPort);
+
+            QList<QHostAddress> listenAddrs;
+            for (const QNetworkInterface &ni : QNetworkInterface::allInterfaces()) {
+                QList<QNetworkAddressEntry> entries = ni.addressEntries();
+                foreach (const QNetworkAddressEntry &na, entries) {
+                    QHostAddress h = na.ip();
+
+                    // skip localhost
+                    if (getAddressScope(h) == 0)
+                        continue;
+
+                    // don't put the same address in twice.
+                    //   this also means that if there are
+                    //   two link-local ipv6 interfaces
+                    //   with the exact same address, we
+                    //   only use the first one
+                    if (listenAddrs.contains(h))
+                        continue;
+
+                    if (h.protocol() == QAbstractSocket::IPv6Protocol && XMPP::Ice176::isIPv6LinkLocalAddress(h))
+                        h.setScopeId(ni.name());
+                    listenAddrs += h;
+                }
+            }
+
+            listenAddrs = sortAddrs(listenAddrs);
+
+            QList<XMPP::Ice176::LocalAddress> localAddrs;
+
+            QStringList strList;
+            foreach (const QHostAddress &h, listenAddrs) {
+                XMPP::Ice176::LocalAddress addr;
+                addr.addr = h;
+                localAddrs += addr;
+                strList += h.toString();
+            }
+
+            if (manager->basePort != -1) {
+                portReserver = new XMPP::UdpPortReserver(q);
+                portReserver->setAddresses(listenAddrs);
+                portReserver->setPorts(manager->basePort, 4);
+            }
+
+            if (!strList.isEmpty()) {
+                printf("Host addresses:\n");
+                foreach (const QString &s, strList)
+                    printf("  %s\n", qPrintable(s));
+            }
+
+            ice = new XMPP::Ice176(q);
+
+            iceStarted = false;
+            //            iceA_status.channelsReady.resize(2);
+            //            iceA_status.channelsReady[0] = false;
+            //            iceA_status.channelsReady[1] = false;
+
+            q->connect(ice, &XMPP::Ice176::started, [this]() {
+                for (auto &c : channels) {
+                    ice->flagComponentAsLowOverhead((c->hints() & Connection::AvoidRelays) ? 0 : 1);
+                }
+                iceStarted = true;
+            });
+            q->connect(ice, &XMPP::Ice176::error, [this](XMPP::Ice176::Error err) {
+                q->_lastReason = Reason(Reason::Condition::FailedTransport, "ICE failed");
+                q->setState(State::Finished);
+                emit q->failed();
+            });
+            q->connect(ice, &XMPP::Ice176::localCandidatesReady,
+                       [this](const QList<XMPP::Ice176::Candidate> &candidates) {
+                           localCandidates = candidates;
+                           if (q->_state >= State::ApprovedToSend)
+                               emit q->updated();
+                       });
+            QObject::connect(
+                ice, &XMPP::Ice176::componentReady, q,
+                [this](int componentIdx) {
+                    for (auto &c : channels) {
+                        if (c->channelIndex == componentIdx) {
+                            c->onConnected(ice);
+                        }
+                    }
+                },
+                Qt::QueuedConnection); // signal is not DOR-SS
+
+            ice->setProxy(manager->stunProxy);
+            if (portReserver)
+                ice->setPortReserver(portReserver);
+
+            // QList<XMPP::Ice176::LocalAddress> localAddrs;
+            // XMPP::Ice176::LocalAddress addr;
+
+            // FIXME: the following is not true, a local address is not
+            //   required, for example if you use TURN with TCP only
+
+            // a local address is required to use ice.  however, if
+            //   we don't have a local address, we won't handle it as
+            //   an error here.  instead, we'll start Ice176 anyway,
+            //   which should immediately error back at us.
+            /*if(manager->selfAddr.isNull())
+            {
+                printf("no self address to use.  this will fail.\n");
+                return;
+            }
+
+            addr.addr = manager->selfAddr;
+            localAddrs += addr;*/
+            ice->setLocalAddresses(localAddrs);
+
+            // if an external address is manually provided, then apply
+            //   it only to the selfAddr.  FIXME: maybe we should apply
+            //   it to all local addresses?
+            if (!extAddr.isNull()) {
+                QList<XMPP::Ice176::ExternalAddress> extAddrs;
+                /*XMPP::Ice176::ExternalAddress eaddr;
+                eaddr.base = addr;
+                eaddr.addr = extAddr;
+                extAddrs += eaddr;*/
+                foreach (const XMPP::Ice176::LocalAddress &la, localAddrs) {
+                    XMPP::Ice176::ExternalAddress ea;
+                    ea.base = la;
+                    ea.addr = extAddr;
+                    extAddrs += ea;
+                }
+                ice->setExternalAddresses(extAddrs);
+            }
+
+            if (!stunBindAddr.isNull() && stunBindPort > 0)
+                ice->setStunBindService(stunBindAddr, stunBindPort);
+            if (!stunRelayUdpAddr.isNull() && !manager->stunRelayUdpUser.isEmpty())
+                ice->setStunRelayUdpService(stunRelayUdpAddr, stunRelayUdpPort, manager->stunRelayUdpUser,
+                                            manager->stunRelayUdpPass.toUtf8());
+            if (!stunRelayTcpAddr.isNull() && !manager->stunRelayTcpUser.isEmpty())
+                ice->setStunRelayTcpService(stunRelayTcpAddr, stunRelayTcpPort, manager->stunRelayTcpUser,
+                                            manager->stunRelayTcpPass.toUtf8());
+
+            // RTP+RTCP
+            ice->setComponentCount(channels.count());
+
+            ice->setLocalCandidateTrickle(true);
+
+            auto mode = q->creator() == q->pad()->session()->role() ? XMPP::Ice176::Initiator : XMPP::Ice176::Responder;
+            ice->start(mode);
+        }
+    };
+
+    Transport::Transport(const TransportManagerPad::Ptr &pad, Origin creator) :
+        XMPP::Jingle::Transport(pad, creator), d(new Private)
+    {
+        d->q = this;
+        connect(_pad->manager(), &TransportManager::abortAllRequested, this, [this]() {
+            d->aborted = true;
+            _state     = State::Finished;
+            emit failed();
+        });
+    }
+
+    Transport::~Transport()
+    {
+        if (d) {
+        }
+    }
+
+    void Transport::prepare()
+    {
+        qDebug("Prepare local offer");
+        setState(State::ApprovedToSend);
+        // auto md = static_cast<Manager *>(_pad.staticCast<Pad>()->manager())->d.data();
+        /*
+         if (_creator == _pad->session()->role()) { // I'm creator
+             d->sid = _pad.staticCast<Pad>()->generateSid();
+         }
+         _pad.staticCast<Pad>()->registerSid(d->sid);
+         d->directAddr = makeKey(d->sid, _pad.staticCast<Pad>()->session()->initiator(),
+                                 _pad.staticCast<Pad>()->session()->responder());
+         m->addKeyMapping(d->directAddr, this);
+ */
+        // auto scope = _pad.staticCast<Pad>()->discoScope();
+        // d->disco   = scope->disco(); // FIXME store and handle signale. delete when not needed
+
+        auto manager  = dynamic_cast<Manager *>(_pad->manager())->d.data();
+        auto resolver = new Resolver();
+        connect(resolver, &Resolver::finished, this, [this, resolver]() {
+            d->extAddr          = resolver->extAddr;
+            d->stunBindAddr     = resolver->stunBindAddr;
+            d->stunRelayUdpAddr = resolver->stunRelayUdpAddr;
+            d->stunRelayTcpAddr = resolver->stunRelayTcpAddr;
+
+            printf("resolver finished\n");
+            resolver->deleteLater();
+            d->startIce();
+        });
+        d->resolver.start(manager->extHost, manager->stunBindHost, manager->stunRelayUdpHost,
+                          manager->stunRelayTcpHost);
+
+        // connect(d->disco, &TcpPortDiscoverer::portAvailable, this, [this]() { d->onLocalServerDiscovered(); });
+        // d->onLocalServerDiscovered();
+
+        emit updated();
+    }
+
+    // we got content acceptance from any side and now can connect
+    void Transport::start()
+    {
+        qDebug("Starting connecting");
+        setState(State::Connecting);
+    }
+
+    bool Transport::update(const QDomElement &transportEl)
+    {
+        try {
+            if (d->handleIncomingCandidate(transportEl) || d->handleIncomingRemoteCandidate(transportEl)
+                || d->handleIncomingGatheringComplete(transportEl)) {
+                if (_state == State::Created && _creator != _pad->session()->role()) {
+                    // initial incoming transport
+                    setState(State::Pending);
+                }
+                if (_state == State::Pending && _creator == _pad->session()->role()) {
+                    // initial acceptance by remote of the local transport
+                    setState(State::Accepted);
+                }
+                return true;
+            }
+        } catch (std::runtime_error &e) {
+            qWarning("Transport updated failed: %s", e.what());
+            return false;
+        }
+
+        return true;
+    }
+
+    bool Transport::hasUpdates() const { return isValid() && d->pendingActions; }
+
+    OutgoingTransportInfoUpdate Transport::takeOutgoingUpdate()
+    {
+        qDebug("taking outgoing update");
+        OutgoingTransportInfoUpdate upd;
+        if (!isValid()) {
+            return upd;
+        }
+
+        auto makeUpdate = [&](QDomElement tel, std::function<void()> cb = std::function<void()>()) {
+            d->waitingAck = true;
+            return OutgoingTransportInfoUpdate { tel, [this, cb, trptr = QPointer<Transport>(d->q)](bool success) {
+                                                    if (!success || !trptr)
+                                                        return;
+                                                    d->waitingAck = false;
+                                                    if (cb)
+                                                        cb();
+                                                } };
+        };
+
+        auto doc = _pad.staticCast<Pad>()->session()->manager()->client()->doc();
+
+        QDomElement tel = doc->createElementNS(NS, "transport");
+        // tel.setAttribute(QStringLiteral("sid"), d->sid);
+
+        // check where we make initial offer
+        bool noPending = (d->localCandidates.isEmpty() && !d->proxyDiscoveryInProgress
+                          && !(d->disco && d->disco->inProgressPortTypes()));
+        bool initial   = _state == State::ApprovedToSend && !d->offerSent
+            && ((!d->pendingActions && noPending) || d->pendingActions & Private::NewCandidate);
+
+        if (initial) {
+            d->offerSent = true;
+        }
+
+        if (d->pendingActions & Private::NewCandidate) {
+            d->pendingActions &= ~Private::NewCandidate;
+            QList<XMPP::Ice176::Candidate> candidatesToSend;
+            for (auto &c : d->localCandidates) {
+                //                if (c.state() != Candidate::New) {
+                //                    continue;
+                //                }
+                //                if (c.type() == Candidate::Proxy) {
+                //                    useProxy = true;
+                //                }
+                //                qDebug("sending local candidate: cid=%s", qPrintable(c.cid()));
+                //                tel.appendChild(c.toXml(doc));
+                //                candidatesToSend.append(c);
+                //                c.setState(Candidate::Unacked);
+            }
+            if (!candidatesToSend.isEmpty()) {
+                upd = makeUpdate(tel, [this, candidatesToSend, initial]() mutable {
+                    if (initial) {
+                        _state = _creator == _pad->session()->role() ? State::Pending : State::Accepted;
+                    }
+                    // d->checkAndFinishNegotiation();
+                });
+            } else {
+                qWarning("Got NewCandidate pending action but no candidate to send");
+            }
+        } else if (d->pendingActions & Private::RemoteCandidate) {
+            d->pendingActions &= ~Private::RemoteCandidate;
+            // we should have the only remote candidate in Pending state.
+            // all other has to be discarded by priority check
+            for (auto &c : d->remoteCandidates) {
+                //                if (c.state() != Candidate::Pending) {
+                //                    continue;
+                //                }
+                //                qDebug("sending candidate-used: cid=%s", qPrintable(c.cid()));
+                auto el = tel.appendChild(doc->createElement(QStringLiteral("remote-candidate"))).toElement();
+                // el.setAttribute(QStringLiteral("cid"), c.cid());
+                // c.setState(Candidate::Unacked);
+
+                upd = makeUpdate(tel, [this, c]() mutable {
+                    //                    if (c.state() == Candidate::Unacked) {
+                    //                        c.setState(Candidate::Accepted);
+                    //                        qDebug("ack: sending candidate-used: cid=%s", qPrintable(c.cid()));
+                    //                        d->remoteUsedCandidate = c;
+                    //                    }
+                    // d->checkAndFinishNegotiation();
+                });
+                break;
+            }
+            if (std::get<0>(upd).isNull()) {
+                qWarning("Got CandidateUsed pending action but no pending candidates");
+            }
+        } else if (d->pendingActions & Private::GatheringComplete) {
+            d->pendingActions &= ~Private::GatheringComplete;
+            qDebug("sending gathering-complete");
+            // we are here because all remote are already in Discardd state
+            tel.appendChild(doc->createElement(QStringLiteral("gathering-complete")));
+            upd = makeUpdate(tel, [this]() mutable {
+                // d->localReportedGatheringComplete = true;
+                // d->checkAndFinishNegotiation();
+            });
+        } else {
+            qDebug("sending empty transport-info");
+            upd = makeUpdate(tel, [this, initial]() mutable {
+                if (initial) {
+                    _state = _creator == _pad->session()->role() ? State::Pending : State::Accepted;
+                }
+            });
+        }
+
+        return upd; // TODO
+    }
+
+    bool Transport::isValid() const { return d != nullptr; }
+
+    TransportFeatures Transport::features() const
+    {
+        return TransportFeatures(TransportFeature::HardToConnect) | TransportFeature::Reliable | TransportFeature::Fast;
+    }
+
+    int Transport::maxSupportedChannels() const { return -1; };
+
+    Connection::Ptr Transport::addChannel() const
+    {
+        if (_state >= State::ApprovedToSend) {
+            qWarning("Adding channel after negotiation start is not yet supported");
+            return Connection::Ptr();
+        }
+        int  channelIdx = 0;
+        auto it         = d->channels.constBegin();
+        while (it != d->channels.constEnd()) {
+            if (it.key() != channelIdx)
+                break;
+            channelIdx++;
+            ++it;
+        }
+        auto conn = QSharedPointer<Connection>::create(channelIdx);
+        d->channels.insert(it, channelIdx, conn);
+
+        return conn.staticCast<XMPP::Jingle::Connection>();
+    }
+
+    //----------------------------------------------------------------
+    // Manager
+    //----------------------------------------------------------------
+    Manager::Manager(QObject *parent) : TransportManager(parent), d(new Private) {}
+
+    Manager::~Manager()
+    {
+        if (d->jingleManager)
+            d->jingleManager->unregisterTransport(NS);
+    }
+
+    TransportFeatures Manager::features() const
+    {
+        return TransportFeatures(TransportFeature::Reliable) | TransportFeature::NotReliable
+            | TransportFeature::RealTime;
+    }
+
+    void Manager::setJingleManager(XMPP::Jingle::Manager *jm) { d->jingleManager = jm; }
+
+    QSharedPointer<XMPP::Jingle::Transport> Manager::newTransport(const TransportManagerPad::Ptr &pad, Origin creator)
+    {
+        return QSharedPointer<Transport>::create(pad, creator).staticCast<XMPP::Jingle::Transport>();
+    }
+
+    TransportManagerPad *Manager::pad(Session *session) { return new Pad(this, session); }
+
+    void Manager::closeAll() { emit abortAllRequested(); }
+
+    void Manager::setBasePort(int port) { d->basePort = port; }
+
+    void Manager::setExternalAddress(const QString &host) { d->extHost = host; }
+
+    void Manager::setSelfAddress(const QHostAddress &addr) { d->selfAddr = addr; }
+
+    void Manager::setStunBindService(const QString &host, int port)
+    {
+        d->stunBindHost = host;
+        d->stunBindPort = port;
+    }
+
+    void Manager::setStunRelayUdpService(const QString &host, int port, const QString &user, const QString &pass)
+    {
+        d->stunRelayUdpHost = host;
+        d->stunRelayUdpPort = port;
+        d->stunRelayUdpUser = user;
+        d->stunRelayUdpPass = pass;
+    }
+
+    void Manager::setStunRelayTcpService(const QString &host, int port, const XMPP::AdvancedConnector::Proxy &proxy,
+                                         const QString &user, const QString &pass)
+    {
+        d->stunRelayTcpHost = host;
+        d->stunRelayTcpPort = port;
+        d->stunRelayTcpUser = user;
+        d->stunRelayTcpPass = pass;
+
+        XMPP::TurnClient::Proxy tproxy;
+
+        if (proxy.type() == XMPP::AdvancedConnector::Proxy::HttpConnect) {
+            tproxy.setHttpConnect(proxy.host(), proxy.port());
+            tproxy.setUserPass(proxy.user(), proxy.pass());
+        } else if (proxy.type() == XMPP::AdvancedConnector::Proxy::Socks) {
+            tproxy.setSocks(proxy.host(), proxy.port());
+            tproxy.setUserPass(proxy.user(), proxy.pass());
+        }
+
+        d->stunProxy = tproxy;
+    }
+
+    // void Manager::addKeyMapping(const QString &key, Transport *transport) { d->key2transport.insert(key, transport);
+    // }
+
+    // void Manager::removeKeyMapping(const QString &key) { d->key2transport.remove(key); }
+
+    //    QString Manager::generateSid(const Jid &remote)
+    //    {
+    //        auto servers =
+    //        d->jingleManager->client()->tcpPortReserver()->scope(QString::fromLatin1("s5b"))->allServers(); QString
+    //        sid; QPair<Jid, QString> key; QString             key1; QString             key2; auto servChecker =
+    //        [&](const TcpPortServer::Ptr &s) {
+    //            return s.staticCast<S5BServer>()->hasKey(key1) || s.staticCast<S5BServer>()->hasKey(key2);
+    //        };
+
+    //        do {
+    //            sid  = QString("s5b_%1").arg(qrand() & 0xffff, 4, 16, QChar('0'));
+    //            key  = qMakePair(remote, sid);
+    //            key1 = makeKey(sid, remote, d->jingleManager->client()->jid());
+    //            key2 = makeKey(sid, d->jingleManager->client()->jid(), remote);
+    //        } while (d->sids.contains(key) || std::find_if(servers.begin(), servers.end(), servChecker) !=
+    //        servers.end()); return sid;
+    //    }
+
+    // void Manager::registerSid(const Jid &remote, const QString &sid) { d->sids.insert(qMakePair(remote, sid)); }
+
+    // Jid Manager::userProxy() const { return d->proxy; }
+
+    // void Manager::setUserProxy(const Jid &jid) { d->proxy = jid; }
+
+    //----------------------------------------------------------------
+    // Pad
+    //----------------------------------------------------------------
+    Pad::Pad(Manager *manager, Session *session) : _manager(manager), _session(session)
+    {
+        auto reserver = _session->manager()->client()->tcpPortReserver();
+        _discoScope   = reserver->scope(QString::fromLatin1("s5b"));
+    }
+
+    QString Pad::ns() const { return NS; }
+
+    Session *Pad::session() const { return _session; }
+
+    TransportManager *Pad::manager() const { return _manager; }
+
+} // namespace Ice
+} // namespace Jingle
+} // namespace XMPP
+
+#include "jingle-ice.moc"
diff --git a/src/xmpp/xmpp-im/jingle-ice.h b/src/xmpp/xmpp-im/jingle-ice.h
new file mode 100644
index 00000000..613140ad
--- /dev/null
+++ b/src/xmpp/xmpp-im/jingle-ice.h
@@ -0,0 +1,219 @@
+/*
+ * jignle-ice.h - Jingle SOCKS5 transport
+ * Copyright (C) 2019  Sergey Ilinykh
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef JINGLE_ICE_H
+#define JINGLE_ICE_H
+
+#include "jingle-transport.h"
+#include "tcpportreserver.h"
+#include "xmpp.h"
+
+class QHostAddress;
+
+namespace XMPP {
+class Client;
+
+namespace Jingle { namespace ICE {
+    extern const QString NS;
+
+    class Transport;
+#if 0
+    class Candidate {
+    public:
+        enum Type {
+            None, // non standard, just a default
+            Proxy,
+            Tunnel,
+            Assisted,
+            Direct
+        };
+
+        enum { ProxyPreference = 10, TunnelPreference = 110, AssistedPreference = 120, DirectPreference = 126 };
+
+        /**
+         * Local candidates states:
+         *   Probing      - potential candidate but no ip:port yet. upnp for example
+         *   New          - candidate is ready to be sent to remote
+         *   Unacked      - candidate is sent to remote but no iq ack yet
+         *   Pending      - canidate sent to remote. we have iq ack but no "used" or "error"
+         *   Accepted     - we got "candidate-used" for this candidate
+         *   Activating   - only for proxy: we activate the proxy
+         *   Active       - use this candidate for actual data transfer
+         *   Discarded    - we got "candidate-error" so all pending were marked Discarded
+         *
+         * Remote candidates states:
+         *   New          - the candidate waits its turn to start connection probing
+         *   Probing      - connection probing
+         *   Pending      - connection was successful, but we didn't send candidate-used to remote
+         *   Unacked      - connection was successful and we sent candidate-used to remote but no iq ack yet
+         *   Accepted     - we sent candidate-used and got iq ack
+         *   Activating   - [not used]
+         *   Active       - use this candidate for actual data transfer
+         *   Discarded    - failed to connect to all remote candidates
+         */
+        enum State {
+            New,
+            Probing,
+            Pending,
+            Unacked,
+            Accepted,
+            Activating,
+            Active,
+            Discarded,
+        };
+
+        Candidate();
+        Candidate(Transport *transport, const QDomElement &el);
+        Candidate(const Candidate &other);
+        Candidate(Transport *transport, const Jid &proxy, const QString &cid, quint16 localPreference = 0);
+        Candidate(Transport *transport, const TcpPortServer::Ptr &server, const QString &cid,
+                  quint16 localPreference = 0);
+        ~Candidate();
+        Candidate &        operator=(const Candidate &other) = default;
+        inline bool        isValid() const { return d != nullptr; }
+        inline             operator bool() const { return isValid(); }
+        Type               type() const;
+        static const char *typeText(Type t);
+        QString            cid() const;
+        Jid                jid() const;
+        QString            host() const;
+        void               setHost(const QString &host);
+        quint16            port() const;
+        void               setPort(quint16 port);
+        quint16            localPort() const;
+        QHostAddress       localAddress() const;
+        State              state() const;
+        void               setState(State s);
+        static const char *stateText(State s);
+        quint32            priority() const;
+
+        QDomElement toXml(QDomDocument *doc) const;
+        QString     toString() const;
+
+        void connectToHost(const QString &key, State successState, QObject *callbackContext,
+                           std::function<void(bool)> callback, bool isUdp = false);
+        // bool               incomingConnection(SocksClient *sc);
+        // SocksClient *      takeSocksClient();
+        // void               deleteSocksClient();
+        TcpPortServer::Ptr server() const;
+
+        bool        operator==(const Candidate &other) const;
+        inline bool operator!=(const Candidate &other) const { return !(*this == other); }
+
+    private:
+        class Private;
+        friend class Transport;
+        QExplicitlySharedDataPointer<Private> d;
+    };
+#endif
+    class Manager;
+    class Transport : public XMPP::Jingle::Transport {
+        Q_OBJECT
+    public:
+        enum Mode { Tcp, Udp };
+
+        Transport(const TransportManagerPad::Ptr &pad, Origin creator);
+        ~Transport() override;
+
+        void                        prepare() override;
+        void                        start() override;
+        bool                        update(const QDomElement &transportEl) override;
+        bool                        hasUpdates() const override;
+        OutgoingTransportInfoUpdate takeOutgoingUpdate() override;
+        bool                        isValid() const override;
+        TransportFeatures           features() const override;
+        int                         maxSupportedChannels() const override;
+
+        Connection::Ptr addChannel() const override;
+
+    private:
+        friend class Manager;
+
+        class Private;
+        QScopedPointer<Private> d;
+    };
+
+    class Pad : public TransportManagerPad {
+        Q_OBJECT
+        // TODO
+    public:
+        typedef QSharedPointer<Pad> Ptr;
+
+        Pad(Manager *manager, Session *session);
+        QString           ns() const override;
+        Session *         session() const override;
+        TransportManager *manager() const override;
+
+        inline TcpPortScope *discoScope() const { return _discoScope; }
+
+    private:
+        Manager *     _manager;
+        Session *     _session;
+        TcpPortScope *_discoScope;
+    };
+
+    class Manager : public TransportManager {
+        Q_OBJECT
+    public:
+        Manager(QObject *parent = nullptr);
+        ~Manager() override;
+
+        XMPP::Jingle::TransportFeatures         features() const override;
+        void                                    setJingleManager(XMPP::Jingle::Manager *jm) override;
+        QSharedPointer<XMPP::Jingle::Transport> newTransport(const TransportManagerPad::Ptr &pad,
+                                                             Origin                          creator) override;
+        TransportManagerPad *                   pad(Session *session) override;
+
+        void closeAll() override;
+
+        /**
+         * @brief userProxy returns custom (set by user) SOCKS proxy JID
+         * @return
+         */
+        // Jid  userProxy() const;
+        // void setUserProxy(const Jid &jid);
+
+        /**
+         * @brief addKeyMapping sets mapping between key/socks hostname used for direct connection and transport.
+         *        The key is sha1(sid, initiator full jid, responder full jid)
+         * @param key
+         * @param transport
+         */
+        void addKeyMapping(const QString &key, Transport *transport);
+        void removeKeyMapping(const QString &key);
+
+        void setBasePort(int port);
+        void setExternalAddress(const QString &host);
+        void setSelfAddress(const QHostAddress &addr);
+        void setStunBindService(const QString &host, int port);
+        void setStunRelayUdpService(const QString &host, int port, const QString &user, const QString &pass);
+        void setStunRelayTcpService(const QString &host, int port, const XMPP::AdvancedConnector::Proxy &proxy,
+                                    const QString &user, const QString &pass);
+        // stunProxy() const;
+
+    private:
+        friend class Transport;
+        class Private;
+        QScopedPointer<Private> d;
+    };
+} // namespace Ice
+} // namespace Jingle
+} // namespace XMPP
+
+#endif // JINGLE_ICE_H
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 9a4803f7..c5c5b8dc 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -21,6 +21,7 @@
 
 #include "ice176.h"
 #include "jingle-session.h"
+#include "jingle.h"
 #include "s5b.h"
 #include "socks.h"
 #include "xmpp/jid/jid.h"
@@ -1570,14 +1571,14 @@ namespace XMPP { namespace Jingle { namespace S5B {
 
     TransportFeatures Transport::features() const
     {
-        return TransportFeatures(TransportFeature::HardToConnect | TransportFeature::Reliable | TransportFeature::Fast);
+        return TransportFeatures(TransportFeature::HardToConnect) | TransportFeature::Reliable | TransportFeature::Fast;
     }
 
     QString Transport::sid() const { return d->sid; }
 
     QString Transport::directAddr() const { return d->directAddr; }
 
-    Connection::Ptr Transport::connection() const { return d->connection.staticCast<XMPP::Jingle::Connection>(); }
+    Connection::Ptr Transport::addChannel() const { return d->connection.staticCast<XMPP::Jingle::Connection>(); }
 
     //----------------------------------------------------------------
     // Manager
@@ -1602,7 +1603,10 @@ namespace XMPP { namespace Jingle { namespace S5B {
             d->jingleManager->unregisterTransport(NS);
     }
 
-    TransportFeatures Manager::features() const { return TransportFeature::Reliable | TransportFeature::Fast; }
+    TransportFeatures Manager::features() const
+    {
+        return TransportFeatures(TransportFeature::Reliable) | TransportFeature::Fast;
+    }
 
     void Manager::setJingleManager(XMPP::Jingle::Manager *jm)
     {
diff --git a/src/xmpp/xmpp-im/jingle-s5b.h b/src/xmpp/xmpp-im/jingle-s5b.h
index 6b71d91f..4daf38f0 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.h
+++ b/src/xmpp/xmpp-im/jingle-s5b.h
@@ -141,7 +141,7 @@ namespace Jingle { namespace S5B {
 
         QString         sid() const;
         QString         directAddr() const;
-        Connection::Ptr connection() const override;
+        Connection::Ptr addChannel() const override;
 
     private:
         friend class Manager;
diff --git a/src/xmpp/xmpp-im/jingle-transport.cpp b/src/xmpp/xmpp-im/jingle-transport.cpp
index 21d348aa..ef159240 100644
--- a/src/xmpp/xmpp-im/jingle-transport.cpp
+++ b/src/xmpp/xmpp-im/jingle-transport.cpp
@@ -33,6 +33,8 @@ namespace XMPP { namespace Jingle {
 
     bool Transport::isRemote() const { return _pad->session()->role() != _creator; }
 
+    int Transport::maxSupportedChannels() const { return 1; }
+
     void Transport::setState(State newState)
     {
         _prevState = _state;
diff --git a/src/xmpp/xmpp-im/jingle-transport.h b/src/xmpp/xmpp-im/jingle-transport.h
index a322ea06..439db2c9 100644
--- a/src/xmpp/xmpp-im/jingle-transport.h
+++ b/src/xmpp/xmpp-im/jingle-transport.h
@@ -56,11 +56,24 @@ namespace XMPP { namespace Jingle {
     class Connection : public ByteStream {
         Q_OBJECT
     public:
+        enum Hint { AvoidRelays = 1 };
+        Q_DECLARE_FLAGS(Hints, Hint)
+
         using Ptr = QSharedPointer<Connection>; // will be shared between transport and application
         virtual bool            hasPendingDatagrams() const;
         virtual NetworkDatagram receiveDatagram(qint64 maxSize = -1);
         virtual size_t          blockSize() const;
+
+        inline void  setHints(Hints hints) { _hints = hints; }
+        inline Hints hints() const { return _hints; }
+
+    signals:
+        void connected();
+
+    protected:
+        Hints _hints;
     };
+    Q_DECLARE_OPERATORS_FOR_FLAGS(Connection::Hints)
 
     class TransportManager;
     class TransportManagerPad : public SessionManagerPad {
@@ -106,7 +119,8 @@ namespace XMPP { namespace Jingle {
         virtual OutgoingTransportInfoUpdate takeOutgoingUpdate() = 0;
         virtual bool                        isValid() const      = 0;
         virtual TransportFeatures           features() const     = 0;
-        virtual Connection::Ptr             connection() const   = 0; // returns established QIODevice-based connection
+        virtual int                         maxSupportedChannels() const;
+        virtual Connection::Ptr             addChannel() const = 0; // returns established QIODevice-based connection
     signals:
         void updated(); // found some candidates and they have to be sent. takeUpdate has to be called from this signal
                         // handler. if it's just always ready then signal has to be sent at least once otherwise
@@ -124,6 +138,7 @@ namespace XMPP { namespace Jingle {
         Origin                              _creator   = Origin::None;
         QSharedPointer<TransportManagerPad> _pad;
         Reason                              _lastReason;
+        int                                 _channelCount = 1;
     };
 
     // It's an available transports collection per application
diff --git a/src/xmpp/xmpp-im/xmpp_client.h b/src/xmpp/xmpp-im/xmpp_client.h
index 63c9a7b4..521c1d32 100644
--- a/src/xmpp/xmpp-im/xmpp_client.h
+++ b/src/xmpp/xmpp-im/xmpp_client.h
@@ -63,6 +63,9 @@ namespace Jingle {
     namespace IBB {
         class Manager;
     }
+    namespace ICE {
+        class Manager;
+    }
 }
 }
 
@@ -147,6 +150,7 @@ class Client : public QObject {
     Jingle::Manager *      jingleManager() const;
     Jingle::S5B::Manager * jingleS5BManager() const;
     Jingle::IBB::Manager * jingleIBBManager() const;
+    Jingle::ICE::Manager * jingleICEManager() const;
 
     void                 setFileTransferEnabled(bool b);
     FileTransferManager *fileTransferManager() const;
diff --git a/src/xmpp/xmpp.pri b/src/xmpp/xmpp.pri
index ba22e0f8..22d2c0b5 100644
--- a/src/xmpp/xmpp.pri
+++ b/src/xmpp/xmpp.pri
@@ -41,6 +41,7 @@ HEADERS += \
     $$PWD/xmpp-im/filetransfer.h \
     $$PWD/xmpp-im/httpfileupload.h \
     $$PWD/xmpp-im/im.h \
+    $$PWD/xmpp-im/jingle-ice.h \
     $$PWD/xmpp-im/jingle.h \
     $$PWD/xmpp-im/jingle-transport.h \
     $$PWD/xmpp-im/jingle-nstransportslist.h \
@@ -101,6 +102,7 @@ SOURCES += \
     $$PWD/xmpp-core/stream.cpp \
     $$PWD/xmpp-core/simplesasl.cpp \
     $$PWD/xmpp-core/xmpp_stanza.cpp \
+    $$PWD/xmpp-im/jingle-ice.cpp \
     $$PWD/xmpp-im/types.cpp \
     $$PWD/xmpp-im/client.cpp \
     $$PWD/xmpp-im/xmpp_features.cpp \
@@ -130,3 +132,4 @@ SOURCES += \
     $$PWD/xmpp-im/jingle-s5b.cpp \
     $$PWD/xmpp-im/jingle-ibb.cpp
 
+OTHER_FILES += $$PWD/CMakeLists.txt
diff --git a/tools/icetunnel/icetunnel.pro b/tools/icetunnel/icetunnel.pro
index 565757b0..11bd64d3 100644
--- a/tools/icetunnel/icetunnel.pro
+++ b/tools/icetunnel/icetunnel.pro
@@ -1,7 +1,7 @@
 IRIS_BASE = ../..
 include(../../confapp.pri)
 
-CONFIG += console
+CONFIG += console crypto
 CONFIG -= app_bundle
 QT -= gui
 QT += network
@@ -17,14 +17,4 @@ else {
     LIBS += -L$$IRIS_BASE/lib -lirisnet
 }
 
-# qt < 4.4 doesn't enable link_prl by default.  we could just enable it,
-#   except that in 4.3 or earlier the link_prl feature is too aggressive and
-#   pulls in unnecessary deps.  so, for 4.3 and earlier, we'll just explicitly
-#   specify the stuff the prl should have given us.
-# also, mingw seems to have broken prl support??
-win32-g++|contains($$list($$[QT_VERSION]), 4.0.*|4.1.*|4.2.*|4.3.*) {
-    DEFINES += IRISNET_STATIC             # from irisnet
-    windows:LIBS += -lWs2_32 -lAdvapi32   # from jdns
-}
-
 SOURCES += main.cpp
diff --git a/tools/icetunnel/main.cpp b/tools/icetunnel/main.cpp
index b4aa37e6..e3fa4f6f 100644
--- a/tools/icetunnel/main.cpp
+++ b/tools/icetunnel/main.cpp
@@ -581,6 +581,8 @@ public slots:
 
         ice->setComponentCount(opt_channels);
         ice->setLocalCandidateTrickle(false);
+        ice->setAggressiveNomination(true);          // TODO
+        ice->setExpectRemoteCandidatesSignal(false); // TODO
 
         if (!stunAddr.isNull()) {
             if (opt_stunType == Basic || opt_stunType == Auto)

From 609160be4ac1012d397fb6493e947f19ac31a3eb Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Thu, 2 Apr 2020 01:03:47 +0300
Subject: [PATCH 130/383] Implemented ICE triggered checks

---
 src/irisnet/noncore/ice176.cpp            | 481 +++++++++++++-------
 src/irisnet/noncore/ice176.h              |   6 +-
 src/irisnet/noncore/icecomponent.cpp      | 525 ++++++++--------------
 src/irisnet/noncore/icecomponent.h        |  11 +-
 src/irisnet/noncore/icelocaltransport.cpp |   6 +-
 src/irisnet/noncore/icelocaltransport.h   |  15 +-
 src/irisnet/noncore/icetransport.h        |   6 +-
 src/irisnet/noncore/iceturntransport.h    |   3 +-
 src/irisnet/noncore/stunbinding.cpp       |  62 +--
 src/irisnet/noncore/stunbinding.h         |   1 +
 src/irisnet/noncore/stuntransaction.cpp   |  20 +-
 src/irisnet/noncore/stuntransaction.h     |   1 +
 tools/icetunnel/main.cpp                  |   2 +
 13 files changed, 585 insertions(+), 554 deletions(-)

diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index e8153ea1..cfd43310 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2009-2010  Barracuda Networks, Inc.
+ * Copyright (C) 2020  Sergey Ilinykh
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -27,6 +28,7 @@
 #include "stuntypes.h"
 #include "udpportreserver.h"
 
+#include <QQueue>
 #include <QSet>
 #include <QTimer>
 #include <QUdpSocket>
@@ -118,25 +120,37 @@ class Ice176::Private : public QObject {
     class CandidatePair {
     public:
         IceComponent::CandidateInfo local, remote;
-        bool                        isDefault   = false;
-        bool                        isValid     = false;
-        bool                        isNominated = false;
-        CandidatePairState          state       = CandidatePairState::PFrozen;
+        bool                        isDefault               = false; // not used in xmpp
+        bool                        isValid                 = false;
+        bool                        isNominated             = false;
+        bool                        isTriggeredForNominated = false;
+        CandidatePairState          state                   = CandidatePairState::PFrozen;
 
         qint64  priority = 0;
-        QString foundation;
+        QString foundation; // rfc8445 6.1.2.6 (combination of foundations)
 
         StunBinding *binding = nullptr;
 
         // FIXME: this is wrong i think, it should be in LocalTransport
         //   or such, to multiplex ids
         StunTransactionPool *pool = nullptr;
+
+        inline bool isNull() const { return local.addr.addr.isNull() || remote.addr.addr.isNull(); }
+        inline      operator QString() const
+        {
+            if (isNull())
+                return QLatin1String("null pair");
+            return QString(QLatin1String("%1 %2 -> %3 %4"))
+                .arg(candidateType_to_string(local.type), QString(local.addr), candidateType_to_string(remote.type),
+                     QString(remote.addr));
+        }
     };
 
     class CheckList {
     public:
-        QList<CandidatePair> pairs;
-        CheckListState       state;
+        QList<QSharedPointer<CandidatePair>> pairs;
+        QQueue<QWeakPointer<CandidatePair>>  triggeredPairs;
+        CheckListState                       state;
     };
 
     class Component {
@@ -151,6 +165,7 @@ class Ice176::Private : public QObject {
     Ice176 *                           q;
     Ice176::Mode                       mode;
     State                              state = Stopped;
+    QTimer                             checkTimer;
     TurnClient::Proxy                  proxy;
     UdpPortReserver *                  portReserver   = nullptr;
     int                                componentCount = 0;
@@ -171,9 +186,8 @@ class Ice176::Private : public QObject {
     QList<Component>                   components;
     QList<IceComponent::Candidate>     localCandidates;
     QList<IceComponent::CandidateInfo> remoteCandidates;
-    QSet<IceTransport *>               iceTransports;
+    QSet<QWeakPointer<IceTransport>>   iceTransports;
     CheckList                          checkList;
-    CheckList                          triggeredCheckList;
     QList<QList<QByteArray>>           in;
     bool                               useLocal                     = true;
     bool                               useStunBind                  = true;
@@ -185,7 +199,16 @@ class Ice176::Private : public QObject {
     bool                               remoteGatheringComplete      = false;
     bool                               expectRemoteCandidatesSignal = true;
 
-    Private(Ice176 *_q) : QObject(_q), q(_q) {}
+    Private(Ice176 *_q) : QObject(_q), q(_q)
+    {
+        connect(&checkTimer, &QTimer::timeout, this, [this]() {
+            auto pair = selectNextPairToCheck();
+            if (pair)
+                checkPair(pair);
+        });
+        checkTimer.setInterval(20);
+        checkTimer.setSingleShot(false);
+    }
 
     ~Private()
     {
@@ -212,10 +235,7 @@ class Ice176::Private : public QObject {
         }*/
     }
 
-    void reset()
-    {
-        // TODO
-    }
+    void reset() { checkTimer.stop(); /*TODO*/ }
 
     int findLocalAddress(const QHostAddress &addr)
     {
@@ -234,7 +254,7 @@ class Ice176::Private : public QObject {
             return;
 
         localAddrs.clear();
-        foreach (const LocalAddress &la, addrs) {
+        for (const auto &la : addrs) {
             int at = findLocalAddress(la.addr);
             if (at == -1)
                 localAddrs += la;
@@ -353,7 +373,25 @@ class Ice176::Private : public QObject {
             }
             ci.network = c.network;
             ci.id      = c.id;
-            remoteCandidates += ci;
+
+            // find remote prflx with same addr. we have to replace them instead adding new one. RFC 8445 7.3.1.3
+            auto it = std::find_if(this->remoteCandidates.begin(), this->remoteCandidates.end(),
+                                   [&](const IceComponent::CandidateInfo &rc) {
+                                       return ci.addr.addr == rc.addr.addr && ci.addr.port == rc.addr.port
+                                           && ci.componentId == rc.componentId
+                                           && rc.type == IceComponent::PeerReflexiveType;
+                                   });
+            if (it != this->remoteCandidates.end()) {
+                it->type       = ci.type;
+                it->foundation = ci.foundation;
+                it->base       = ci.base;
+                it->network    = ci.network;
+                it->id         = ci.id;
+                printf("Previously known remote prflx was updated from signalling: %s:%d",
+                       qPrintable(it->addr.addr.toString()), it->addr.port);
+            } else {
+                remoteCandidates += ci;
+            }
         }
         this->remoteCandidates += remoteCandidates;
 
@@ -361,79 +399,67 @@ class Ice176::Private : public QObject {
         doPairing(localCandidates, remoteCandidates);
     }
 
-    void doPairing(const QList<IceComponent::Candidate> &    localCandidates,
-                   const QList<IceComponent::CandidateInfo> &remoteCandidates)
+    // returns a pair is pairable or null
+    QSharedPointer<CandidatePair> makeCandidatesPair(const IceComponent::CandidateInfo &lc,
+                                                     const IceComponent::CandidateInfo &rc)
     {
-        QList<CandidatePair> pairs;
-        for (const IceComponent::Candidate &cc : localCandidates) {
-            const IceComponent::CandidateInfo &lc = cc.info;
-
-            for (const IceComponent::CandidateInfo &rc : remoteCandidates) {
-                if (lc.componentId != rc.componentId)
-                    continue;
-
-                // don't pair ipv4 with ipv6.  FIXME: is this right?
-                if (lc.addr.addr.protocol() != rc.addr.addr.protocol())
-                    continue;
-
-                // don't relay to localhost.  turnserver
-                //   doesn't like it.  i don't know if this
-                //   should qualify as a HACK or not.
-                //   trying to relay to localhost is pretty
-                //   stupid anyway
-                if (lc.type == IceComponent::RelayedType && getAddressScope(rc.addr.addr) == 0)
-                    continue;
+        if (lc.componentId != rc.componentId)
+            return {};
+
+        // don't pair ipv4 with ipv6.  FIXME: is this right?
+        if (lc.addr.addr.protocol() != rc.addr.addr.protocol())
+            return {};
+
+        // don't relay to localhost.  turnserver
+        //   doesn't like it.  i don't know if this
+        //   should qualify as a HACK or not.
+        //   trying to relay to localhost is pretty
+        //   stupid anyway
+        if (lc.type == IceComponent::RelayedType && getAddressScope(rc.addr.addr) == 0)
+            return {};
+
+        auto pair    = QSharedPointer<CandidatePair>::create();
+        pair->local  = lc;
+        pair->remote = rc;
+        if (pair->local.addr.addr.protocol() == QAbstractSocket::IPv6Protocol
+            && isIPv6LinkLocalAddress(pair->local.addr.addr))
+            pair->remote.addr.addr.setScopeId(pair->local.addr.addr.scopeId());
+        if (mode == Ice176::Initiator)
+            pair->priority = calc_pair_priority(lc.priority, rc.priority);
+        else
+            pair->priority = calc_pair_priority(rc.priority, lc.priority);
 
-                CandidatePair pair;
-                pair.state  = PFrozen; // FIXME: setting state here may be wrong
-                pair.local  = lc;
-                pair.remote = rc;
-                if (pair.local.addr.addr.protocol() == QAbstractSocket::IPv6Protocol
-                    && isIPv6LinkLocalAddress(pair.local.addr.addr))
-                    pair.remote.addr.addr.setScopeId(pair.local.addr.addr.scopeId());
-                pair.isDefault   = false;
-                pair.isValid     = false;
-                pair.isNominated = false;
-                if (mode == Ice176::Initiator)
-                    pair.priority = calc_pair_priority(lc.priority, rc.priority);
-                else
-                    pair.priority = calc_pair_priority(rc.priority, lc.priority);
-                pairs += pair;
-            }
-        }
+        return pair;
+    }
 
+    // adds new pairs, sorts, prunes
+    void addChecklistPairs(const QList<QSharedPointer<CandidatePair>> &pairs)
+    {
         printf("%d pairs\n", pairs.count());
 
         // combine pairs with existing, and sort
-        pairs = checkList.pairs + pairs;
-        checkList.pairs.clear();
-        for (const CandidatePair &pair : pairs) {
-            int at;
-            for (at = 0; at < checkList.pairs.count(); ++at) {
-                if (compare_pair(pair, checkList.pairs[at]) < 0)
-                    break;
-            }
-
-            checkList.pairs.insert(at, pair);
-        }
+        checkList.pairs += pairs;
+        std::sort(checkList.pairs.begin(), checkList.pairs.end(),
+                  [&](const QSharedPointer<CandidatePair> &a, const QSharedPointer<CandidatePair> &b) {
+                      return a->priority == b->priority ? a->local.componentId < b->local.componentId
+                                                        : a->priority > b->priority;
+                  });
 
         // pruning
-
-        for (int n = 0; n < checkList.pairs.count(); ++n) {
-            CandidatePair &pair = checkList.pairs[n];
-            if (pair.local.type == IceComponent::ServerReflexiveType)
-                pair.local.addr = pair.local.base;
+        for (auto &pair : checkList.pairs) {
+            if (pair->local.type == IceComponent::ServerReflexiveType)
+                pair->local.addr = pair->local.base;
         }
 
         for (int n = 0; n < checkList.pairs.count(); ++n) {
-            CandidatePair &pair = checkList.pairs[n];
-            printf("%d, %s:%d -> %s:%d\n", pair.local.componentId, qPrintable(pair.local.addr.addr.toString()),
-                   pair.local.addr.port, qPrintable(pair.remote.addr.addr.toString()), pair.remote.addr.port);
+            auto &pair = checkList.pairs[n];
+            printf("%d, %s -> %s\n", pair->local.componentId, qPrintable(pair->local.addr),
+                   qPrintable(pair->remote.addr));
 
             bool found = false;
             for (int i = n - 1; i >= 0; --i) {
-                if (compare_candidates(pair.local, checkList.pairs[i].local)
-                    && compare_candidates(pair.remote, checkList.pairs[i].remote)) {
+                if (compare_candidates(pair->local, checkList.pairs[i]->local)
+                    && compare_candidates(pair->remote, checkList.pairs[i]->remote)) {
                     found = true;
                     break;
                 }
@@ -451,59 +477,108 @@ class Ice176::Private : public QObject {
             checkList.pairs.removeLast();
 
         printf("%d after pruning\n", checkList.pairs.count());
+    }
 
-        // set state
-        for (int n = 0; n < checkList.pairs.count(); ++n) {
-            CandidatePair &pair = checkList.pairs[n];
+    QSharedPointer<CandidatePair> selectNextPairToCheck()
+    {
+        // rfc8445 6.1.4.2.  Performing Connectivity Checks
+
+        QSharedPointer<CandidatePair> pair;
+        while (!checkList.triggeredPairs.empty() && !(pair = checkList.triggeredPairs.dequeue().lock()))
+            ;
+
+        if (pair) {
+            // according to rfc - check just this one
+            printf("next check from triggered list: %s\n", qPrintable(*pair));
+            return pair;
+        }
+
+        auto it = std::find_if(checkList.pairs.begin(), checkList.pairs.end(), [&](const auto &p) mutable {
+            if (p->state == PFrozen && !pair)
+                pair = p;
+            return p->state == PWaiting;
+        });
+        if (it != checkList.pairs.end()) { // found waiting
+            // the list was sorted already by priority and componentId. So first one is Ok
+            printf("next check for already waiting: %s\n", qPrintable(**it));
+            return *it;
+        }
+
+        if (pair) { // now it's frozen highest-priority pair
+            printf("next check for a frozen pair: %s\n", qPrintable(*pair));
+        }
 
-            // only initialize the new pairs
-            if (pair.state != PFrozen)
-                continue;
+        // FIXME real algo should be (but is requires significant refactoring)
+        //   1) go over all knows pair foundations over all checklists
+        //   2) if for the foundation there is a frozen pair but no (in-progress or waiting)
+        //   3)    - do checks on this pair
 
-            pair.foundation = pair.local.foundation + pair.remote.foundation;
+        return pair;
+    }
 
-            // FIXME: for now we just do checks to everything immediately
-            pair.state = PInProgress;
+    void checkPair(QSharedPointer<CandidatePair> pair)
+    {
+        pair->foundation = pair->local.foundation + pair->remote.foundation;
+        pair->state      = PInProgress;
 
-            int at = findLocalCandidate(pair.local.addr.addr, pair.local.addr.port);
-            Q_ASSERT(at != -1);
+        int at = findLocalCandidate(pair->local.addr.addr, pair->local.addr.port);
+        Q_ASSERT(at != -1);
 
-            auto &lc = localCandidates[at];
+        auto &lc = localCandidates[at];
 
-            Component &c = components[findComponent(lc.info.componentId)];
+        Component &c = components[findComponent(lc.info.componentId)];
 
-            pair.pool = new StunTransactionPool(StunTransaction::Udp, this);
-            connect(pair.pool, SIGNAL(outgoingMessage(QByteArray, QHostAddress, int)),
-                    SLOT(pool_outgoingMessage(QByteArray, QHostAddress, int)));
-            // pair.pool->setUsername(peerUser + ':' + localUser);
-            // pair.pool->setPassword(peerPass.toUtf8());
+        pair->pool = new StunTransactionPool(StunTransaction::Udp, this);
+        connect(pair->pool, SIGNAL(outgoingMessage(QByteArray, QHostAddress, int)),
+                SLOT(pool_outgoingMessage(QByteArray, QHostAddress, int)));
+        // pair->pool->setUsername(peerUser + ':' + localUser);
+        // pair->pool->setPassword(peerPass.toUtf8());
 
-            pair.binding = new StunBinding(pair.pool);
-            connect(pair.binding, SIGNAL(success()), SLOT(binding_success()));
-            connect(pair.binding, &StunBinding::error, this, &Ice176::Private::binding_error);
+        pair->binding = new StunBinding(pair->pool);
+        connect(pair->binding, SIGNAL(success()), SLOT(binding_success()));
+        connect(pair->binding, &StunBinding::error, this, &Ice176::Private::binding_error);
 
-            int prflx_priority = c.ic->peerReflexivePriority(lc.iceTransport, lc.path);
-            pair.binding->setPriority(prflx_priority);
+        int prflx_priority = c.ic->peerReflexivePriority(lc.iceTransport, lc.path);
+        pair->binding->setPriority(prflx_priority);
 
-            if (mode == Ice176::Initiator) {
-                pair.binding->setIceControlling(0);
-                if (aggressiveNomination)
-                    pair.binding->setUseCandidate(true);
-            } else
-                pair.binding->setIceControlled(0);
+        if (mode == Ice176::Initiator) {
+            pair->binding->setIceControlling(0);
+            if (aggressiveNomination)
+                pair->binding->setUseCandidate(true);
+        } else
+            pair->binding->setIceControlled(0);
 
-            pair.binding->setShortTermUsername(peerUser + ':' + localUser);
-            pair.binding->setShortTermPassword(peerPass);
+        pair->binding->setShortTermUsername(peerUser + ':' + localUser);
+        pair->binding->setShortTermPassword(peerPass);
 
-            pair.binding->start();
+        pair->binding->start();
+    }
+
+    void doPairing(const QList<IceComponent::Candidate> &    localCandidates,
+                   const QList<IceComponent::CandidateInfo> &remoteCandidates)
+    {
+        QList<QSharedPointer<CandidatePair>> pairs;
+        for (const IceComponent::Candidate &cc : localCandidates) {
+            const IceComponent::CandidateInfo &lc = cc.info;
+
+            for (const IceComponent::CandidateInfo &rc : remoteCandidates) {
+                auto pair = makeCandidatesPair(lc, rc);
+                if (!pair.isNull())
+                    pairs += pair;
+            }
         }
+
+        addChecklistPairs(pairs);
+
+        if (!checkTimer.isActive())
+            checkTimer.start();
     }
 
     void write(int componentIndex, const QByteArray &datagram)
     {
         int at = -1;
         for (int n = 0; n < checkList.pairs.count(); ++n) {
-            if (checkList.pairs[n].local.componentId - 1 == componentIndex && checkList.pairs[n].isValid) {
+            if (checkList.pairs[n]->local.componentId - 1 == componentIndex && checkList.pairs[n]->isValid) {
                 at = n;
                 break;
             }
@@ -511,7 +586,7 @@ class Ice176::Private : public QObject {
         if (at == -1)
             return;
 
-        CandidatePair &pair = checkList.pairs[at];
+        auto &pair = *checkList.pairs[at];
 
         at = findLocalCandidate(pair.local.addr.addr, pair.local.addr.port);
         if (at == -1) // FIXME: assert?
@@ -519,10 +594,9 @@ class Ice176::Private : public QObject {
 
         IceComponent::Candidate &lc = localCandidates[at];
 
-        IceTransport *sock = lc.iceTransport;
-        int           path = lc.path;
+        int path = lc.path;
 
-        sock->writeDatagram(path, datagram, pair.remote.addr.addr, pair.remote.addr.port);
+        lc.iceTransport->writeDatagram(path, datagram, pair.remote.addr.addr, pair.remote.addr.port);
 
         // DOR-SR?
         QMetaObject::invokeMethod(q, "datagramsWritten", Qt::QueuedConnection, Q_ARG(int, componentIndex),
@@ -538,6 +612,23 @@ class Ice176::Private : public QObject {
         // FIXME: actually do something
     }
 
+    void tryComponentSuccess(QSharedPointer<CandidatePair> &pair)
+    {
+        // TODO the pair can change with aggressive validation (?)
+        pair->isNominated = true;
+
+        int        at = findComponent(pair->local.componentId);
+        Component &c  = components[at];
+        if (c.lowOverhead) {
+            printf("component is flagged for low overhead.  setting up for %s\n", qPrintable(*pair));
+            at                          = findLocalCandidate(pair->local.addr.addr, pair->local.addr.port);
+            IceComponent::Candidate &cc = localCandidates[at];
+            c.ic->flagPathAsLowOverhead(cc.id, pair->remote.addr.addr, pair->remote.addr.port);
+        }
+
+        emit q->componentReady(pair->local.componentId - 1);
+    }
+
     // ice negotiation failed. either initial or on ICE restart
     void tryComponentFailed(int componentId)
     {
@@ -548,9 +639,9 @@ class Ice176::Private : public QObject {
 
         if (std::find_if(checkList.pairs.begin(), checkList.pairs.end(),
                          [&](auto const &p) mutable {
-                             return p.local.componentId == componentId
-                                 && (p.state != CandidatePairState::PSucceeded
-                                     && p.state != CandidatePairState::PFailed);
+                             return p->local.componentId == componentId
+                                 && (p->state != CandidatePairState::PSucceeded
+                                     && p->state != CandidatePairState::PFailed);
                          })
             != checkList.pairs.end())
             return; // not all finished
@@ -559,6 +650,51 @@ class Ice176::Private : public QObject {
         emit q->error(ErrorGeneric);
     }
 
+    // nominated - out side=responder. and remote request had USE_CANDIDATE
+    void doTriggeredCheck(const IceComponent::Candidate &locCand, const IceComponent::CandidateInfo &remCand,
+                          bool nominated)
+    {
+        // let's figure out of this pair already in the check list
+        auto it = std::find_if(checkList.pairs.begin(), checkList.pairs.end(), [&](auto const &p) {
+            return p->local.isSame(locCand.info) && p->remote.isSame(remCand);
+        });
+        if (it == checkList.pairs.end()) {
+            auto pair = makeCandidatesPair(locCand.info, remCand);
+            if (pair.isNull()) {
+                return;
+            }
+            pair->isTriggeredForNominated = nominated;
+            pair->state                   = PWaiting;
+            addChecklistPairs(QList<QSharedPointer<CandidatePair>>() << pair);
+            checkList.triggeredPairs.enqueue(pair.toWeakRef());
+            if (!checkTimer.isActive())
+                checkTimer.start();
+            return;
+        }
+
+        QSharedPointer<CandidatePair> p = *it;
+        if (p->state == CandidatePairState::PSucceeded) {
+            // Check nominated here?
+            printf("Don't do triggered check since pair is already in success state\n");
+            if (mode == Responder && nominated)
+                tryComponentSuccess(p);
+            return; // nothing todo. rfc 8445 7.3.1.4
+        }
+        p->isNominated = false;
+        if (p->state == CandidatePairState::PInProgress) {
+            p->binding->cancel();
+        }
+        if (p->state == PFailed) {
+            // if (state == Stopped) {
+            // TODO Stopped? maybe Failed? and we have to notify the outer world
+            //}
+        }
+
+        p->state                   = PWaiting;
+        p->isTriggeredForNominated = nominated;
+        checkList.triggeredPairs.append(p);
+    }
+
 private:
     int findComponent(const IceComponent *ic) const
     {
@@ -580,11 +716,12 @@ class Ice176::Private : public QObject {
         return -1;
     }
 
-    int findLocalCandidate(const IceTransport *iceTransport, int path) const
+    int findLocalCandidate(const IceTransport *iceTransport, int path, bool withSrvRflx = true) const
     {
         for (int n = 0; n < localCandidates.count(); ++n) {
             const IceComponent::Candidate &cc = localCandidates[n];
-            if (cc.iceTransport == iceTransport && cc.path == path)
+            if (cc.iceTransport == iceTransport && cc.path == path
+                && (withSrvRflx || cc.info.type != IceComponent::ServerReflexiveType))
                 return n;
         }
 
@@ -704,8 +841,8 @@ private slots:
                cc.info.addr.port);
 
         if (!iceTransports.contains(cc.iceTransport)) {
-            connect(cc.iceTransport, SIGNAL(readyRead(int)), SLOT(it_readyRead(int)));
-            connect(cc.iceTransport, SIGNAL(datagramsWritten(int, int, QHostAddress, int)),
+            connect(cc.iceTransport.data(), SIGNAL(readyRead(int)), SLOT(it_readyRead(int)));
+            connect(cc.iceTransport.data(), SIGNAL(datagramsWritten(int, int, QHostAddress, int)),
                     SLOT(it_datagramsWritten(int, int, QHostAddress, int)));
 
             iceTransports += cc.iceTransport;
@@ -755,9 +892,9 @@ private slots:
         }
 
         for (int n = 0; n < checkList.pairs.count(); ++n) {
-            if (idList.contains(checkList.pairs[n].local.id)) {
-                StunBinding *        binding = checkList.pairs[n].binding;
-                StunTransactionPool *pool    = checkList.pairs[n].pool;
+            if (idList.contains(checkList.pairs[n]->local.id)) {
+                StunBinding *        binding = checkList.pairs[n]->binding;
+                StunTransactionPool *pool    = checkList.pairs[n]->pool;
 
                 delete binding;
 
@@ -855,13 +992,14 @@ private slots:
         printf("C%d: %s\n", at + 1, qPrintable(line));
     }
 
+    // path is either direct or relayed
     void it_readyRead(int path)
     {
         IceTransport *it = static_cast<IceTransport *>(sender());
-        int           at = findLocalCandidate(it, path);
+        int           at = findLocalCandidate(it, path, false); // without server-reflexive
         Q_ASSERT(at != -1);
 
-        IceComponent::Candidate &cc = localCandidates[at];
+        IceComponent::Candidate &locCand = localCandidates[at];
 
         IceTransport *sock = it;
 
@@ -929,8 +1067,24 @@ private slots:
                 QByteArray packet = response.toBinary(StunMessage::MessageIntegrity | StunMessage::Fingerprint, reqkey);
                 sock->writeDatagram(path, packet, fromAddr, fromPort);
 
-                if (msg.hasAttribute(StunTypes::USE_CANDIDATE)) {
-                    find
+                auto it        = std::find_if(remoteCandidates.begin(), remoteCandidates.end(),
+                                       [&](const IceComponent::CandidateInfo &remCand) {
+                                           return remCand.componentId == locCand.info.componentId
+                                               && remCand.addr.addr == fromAddr && remCand.addr.port == fromPort;
+                                       });
+                bool nominated = false;
+                if (mode == Responder)
+                    nominated = msg.hasAttribute(StunTypes::USE_CANDIDATE);
+                if (it == remoteCandidates.end()) {
+                    printf("found NEW remote prflx! %s:%d\n", qPrintable(fromAddr.toString()), fromPort);
+                    quint32 priority;
+                    StunTypes::parsePriority(msg.attribute(StunTypes::PRIORITY), &priority);
+                    auto remCand = IceComponent::CandidateInfo::makeRemotePrflx(locCand.info.componentId, fromAddr,
+                                                                                fromPort, priority);
+                    remoteCandidates += remCand;
+                    doTriggeredCheck(locCand, remCand, nominated);
+                } else {
+                    doTriggeredCheck(locCand, *it, nominated);
                 }
             } else {
                 QByteArray  reskey = peerPass.toUtf8();
@@ -938,12 +1092,14 @@ private slots:
                     buf, &result, StunMessage::MessageIntegrity | StunMessage::Fingerprint, reskey);
                 if (!msg.isNull()
                     && (msg.mclass() == StunMessage::SuccessResponse || msg.mclass() == StunMessage::ErrorResponse)) {
-                    printf("received validated response\n");
+                    printf("received validated response from %s:%d to %s\n", qPrintable(fromAddr.toString()), fromPort,
+                           qPrintable(locCand.info.addr));
 
                     // FIXME: this is so gross and completely defeats the point of having pools
                     for (int n = 0; n < checkList.pairs.count(); ++n) {
-                        CandidatePair &pair = checkList.pairs[n];
-                        if (pair.local.addr.addr == cc.info.addr.addr && pair.local.addr.port == cc.info.addr.port)
+                        CandidatePair &pair = *checkList.pairs[n];
+                        if (pair.state == PInProgress && pair.local.addr.addr == locCand.info.addr.addr
+                            && pair.local.addr.port == locCand.info.addr.port)
                             pair.pool->writeIncomingMessage(msg);
                     }
                 } else {
@@ -957,8 +1113,9 @@ private slots:
 
                     int at = -1;
                     for (int n = 0; n < checkList.pairs.count(); ++n) {
-                        CandidatePair &pair = checkList.pairs[n];
-                        if (pair.local.addr.addr == cc.info.addr.addr && pair.local.addr.port == cc.info.addr.port) {
+                        CandidatePair &pair = *checkList.pairs[n];
+                        if (pair.local.addr.addr == locCand.info.addr.addr
+                            && pair.local.addr.port == locCand.info.addr.port) {
                             at = n;
                             break;
                         }
@@ -968,7 +1125,7 @@ private slots:
                         continue;
                     }
 
-                    int componentIndex = checkList.pairs[at].local.componentId - 1;
+                    int componentIndex = checkList.pairs[at]->local.componentId - 1;
                     // printf("packet is considered to be application data for component index %d\n", componentIndex);
 
                     // FIXME: this assumes components are ordered by id in our local arrays
@@ -996,7 +1153,7 @@ private slots:
         StunTransactionPool *pool = static_cast<StunTransactionPool *>(sender());
         int                  at   = -1;
         for (int n = 0; n < checkList.pairs.count(); ++n) {
-            if (checkList.pairs[n].pool == pool) {
+            if (checkList.pairs[n]->pool == pool) {
                 at = n;
                 break;
             }
@@ -1004,7 +1161,7 @@ private slots:
         if (at == -1) // FIXME: assert?
             return;
 
-        CandidatePair &pair = checkList.pairs[at];
+        CandidatePair &pair = *checkList.pairs[at];
 
         at = findLocalCandidate(pair.local.addr.addr, pair.local.addr.port);
         if (at == -1) // FIXME: assert?
@@ -1012,12 +1169,12 @@ private slots:
 
         IceComponent::Candidate &lc = localCandidates[at];
 
-        IceTransport *sock = lc.iceTransport;
-        int           path = lc.path;
+        int path = lc.path;
 
-        printf("connectivity check from %s:%d to %s:%d\n", qPrintable(pair.local.addr.addr.toString()),
-               pair.local.addr.port, qPrintable(pair.remote.addr.addr.toString()), pair.remote.addr.port);
-        sock->writeDatagram(path, packet, pair.remote.addr.addr, pair.remote.addr.port);
+        printf("connectivity check from %s:%d to %s:%d %s\n", qPrintable(pair.local.addr.addr.toString()),
+               pair.local.addr.port, qPrintable(pair.remote.addr.addr.toString()), pair.remote.addr.port,
+               pair.isNominated ? (mode == Initiator ? "(nominating)" : "(triggered check for nominated)") : "");
+        lc.iceTransport->writeDatagram(path, packet, pair.remote.addr.addr, pair.remote.addr.port);
     }
 
     void binding_success()
@@ -1025,49 +1182,37 @@ private slots:
         StunBinding *binding = static_cast<StunBinding *>(sender());
 
         auto it = std::find_if(checkList.pairs.begin(), checkList.pairs.end(),
-                               [&](auto const &p) { return p.binding == binding; });
+                               [&](auto const &p) { return p->binding == binding; });
         if (it == checkList.pairs.constEnd())
             return;
 
-        printf("check success\n");
+        auto pair     = *it;
+        pair->isValid = true;
+        pair->state   = CandidatePairState::PSucceeded;
 
-        CandidatePair &pair = *it;
-        pair.isValid        = true;
-        pair.state          = CandidatePairState::PSucceeded;
-        if (!binding->useCandidate()) { // not nomination
-            return;
+        printf("check success for %s\n", qPrintable(QString(*pair)));
+
+        if (mode == Ice176::Initiator) {
+            if (!binding->useCandidate())
+                return;
+        } else {
+            if (!pair->isTriggeredForNominated)
+                return;
         }
 
         // TODO: if we were cool, we'd do something with the peer
         //   reflexive address received
 
-        // TODO: we're also supposed to do triggered checks.  except
-        //   that currently we check everything anyway so this is not
-        //   relevant
-
         // check if component already has nominated pair
         it = std::find_if(checkList.pairs.begin(), checkList.pairs.end(), [&](auto const &p) {
-            return p.local.componentId == pair.local.componentId && p.isNominated;
+            return p->local.componentId == pair->local.componentId && p->isNominated;
         });
 
         if (it != checkList.pairs.end()) {
-            printf("component %d already active, not signalling\n", pair.local.componentId);
+            printf("component %d already active, not signalling\n", pair->local.componentId);
             return;
         }
-        pair.isNominated = true;
-
-        int        at = findComponent(pair.local.componentId);
-        Component &c  = components[at];
-        if (c.lowOverhead) {
-            printf("component is flagged for low overhead.  setting up for %s;%d -> %s;%d\n",
-                   qPrintable(pair.local.addr.addr.toString()), pair.local.addr.port,
-                   qPrintable(pair.remote.addr.addr.toString()), pair.remote.addr.port);
-            at                          = findLocalCandidate(pair.local.addr.addr, pair.local.addr.port);
-            IceComponent::Candidate &cc = localCandidates[at];
-            c.ic->flagPathAsLowOverhead(cc.id, pair.remote.addr.addr, pair.remote.addr.port);
-        }
-
-        emit q->componentReady(pair.local.componentId - 1);
+        tryComponentSuccess(pair);
     }
 
     void binding_error(XMPP::StunBinding::Error)
@@ -1079,13 +1224,13 @@ private slots:
         StunBinding *binding = static_cast<StunBinding *>(sender());
 
         auto it = std::find_if(checkList.pairs.begin(), checkList.pairs.end(),
-                               [&](auto const &p) { return p.binding == binding; });
+                               [&](auto const &p) { return p->binding == binding; });
         if (it == checkList.pairs.constEnd())
             return;
 
         printf("check failed\n");
 
-        CandidatePair &pair = *it;
+        CandidatePair &pair = **it;
         pair.state          = CandidatePairState::PFailed;
 
         if (state == Started) {
diff --git a/src/irisnet/noncore/ice176.h b/src/irisnet/noncore/ice176.h
index 3e441091..beecdc8c 100644
--- a/src/irisnet/noncore/ice176.h
+++ b/src/irisnet/noncore/ice176.h
@@ -43,10 +43,8 @@ class Ice176 : public QObject {
     class LocalAddress {
     public:
         QHostAddress addr;
-        int          network; // -1 = unknown
-        bool         isVpn;
-
-        LocalAddress() : network(-1), isVpn(false) {}
+        int          network = -1; // -1 = unknown
+        bool         isVpn   = false;
     };
 
     class ExternalAddress {
diff --git a/src/irisnet/noncore/icecomponent.cpp b/src/irisnet/noncore/icecomponent.cpp
index 0466e55f..91b2de0a 100644
--- a/src/irisnet/noncore/icecomponent.cpp
+++ b/src/irisnet/noncore/icecomponent.cpp
@@ -25,6 +25,7 @@
 
 #include <QTimer>
 #include <QUdpSocket>
+#include <QUuid>
 #include <QtCrypto>
 #include <stdlib.h>
 
@@ -47,25 +48,26 @@ class IceComponent::Private : public QObject {
     struct IceSocket {
         using Ptr = QSharedPointer<IceSocket>;
 
+        IceSocket(QUdpSocket *sock, bool borrowed, IceComponent::Private *ic) : sock(sock), ic(ic), borrowed(borrowed)
+        {
+        }
         ~IceSocket()
         {
             if (!sock)
                 return;
 
             sock->disconnect(ic);
-            sock->disconnect(ic->d);
             if (borrowed) {
-                auto pr = ic->portReserver();
-                Q_ASSERT(pr);
-                pr->returnSockets(QList<QUdpSocket *>() << sock);
+                Q_ASSERT(ic->portReserver);
+                ic->portReserver->returnSockets(QList<QUdpSocket *>() << sock);
             } else {
                 sock->deleteLater();
             }
         }
 
-        QUdpSocket *  sock = nullptr;
-        IceComponent *ic   = nullptr;
-        bool          borrowed;
+        QUdpSocket *           sock = nullptr;
+        IceComponent::Private *ic   = nullptr;
+        bool                   borrowed;
     };
 
 public:
@@ -92,21 +94,20 @@ class IceComponent::Private : public QObject {
 
     class LocalTransport {
     public:
-        QUdpSocket *       qsock;
-        bool               borrowedSocket;
-        QHostAddress       addr;
-        IceLocalTransport *sock;
-        int                network;
-        bool               isVpn;
-        bool               started;
-        bool               stun_started;
-        bool               stun_finished, turn_finished; // candidates emitted
-        QHostAddress       extAddr;
-        bool               ext_finished;
+        IceSocket::Ptr                    qsock;
+        QHostAddress                      addr;
+        QSharedPointer<IceLocalTransport> sock;
+        int                               network;
+        bool                              isVpn;
+        bool                              started;
+        bool                              stun_started;
+        bool                              stun_finished, turn_finished; // candidates emitted
+        QHostAddress                      extAddr;
+        bool                              ext_finished;
 
         LocalTransport() :
-            qsock(nullptr), borrowedSocket(false), sock(nullptr), network(-1), isVpn(false), started(false),
-            stun_started(false), stun_finished(false), turn_finished(false), ext_finished(false)
+            network(-1), isVpn(false), started(false), stun_started(false), stun_finished(false), turn_finished(false),
+            ext_finished(false)
         {
         }
     };
@@ -120,54 +121,58 @@ class IceComponent::Private : public QObject {
     Config                             pending;
     Config                             config;
     bool                               stopping = false;
-    QList<LocalTransport *>            localLeap;    // transport for local host-only candidates
-    QList<LocalTransport *>            localStun;    // designated for server reflexive and udp relay candidates
-    IceTurnTransport *                 tt = nullptr; // tcp relay candidate
+    QList<LocalTransport *>            udpTransports; // transport for local host-only candidates
+    QSharedPointer<IceTurnTransport>   tcpTurn;       // tcp relay candidate
     QList<Candidate>                   localCandidates;
     QHash<int, QSet<TransportAddress>> channelPeers;
-    bool                               useLocal          = true; // use local host candidates
-    bool                               useStunBind       = true;
-    bool                               useStunRelayUdp   = true;
-    bool                               useStunRelayTcp   = true;
-    bool                               localFinished     = false;
-    bool                               stunFinished      = false;
-    bool                               gatheringComplete = false;
-    int                                debugLevel        = DL_None;
+    bool                               useLocal        = true; // use local host candidates
+    bool                               useStunBind     = true;
+    bool                               useStunRelayUdp = true;
+    bool                               useStunRelayTcp = true;
+    bool                               localFinished   = false;
+    // bool                               stunFinished      = false;
+    bool gatheringComplete = false;
+    int  debugLevel        = DL_None;
 
     Private(IceComponent *_q) : QObject(_q), q(_q), sess(this) {}
 
-    ~Private()
-    {
-        QList<QUdpSocket *> socketsToReturn;
-
-        for (int n = 0; n < localLeap.count(); ++n) {
-            delete localLeap[n]->sock;
-
-            if (localLeap[n]->borrowedSocket)
-                socketsToReturn += localLeap[n]->qsock;
-            else
-                localLeap[n]->qsock->deleteLater();
-        }
-
-        if (!socketsToReturn.isEmpty())
-            portReserver->returnSockets(socketsToReturn);
-
-        qDeleteAll(localLeap);
+    ~Private() { qDeleteAll(udpTransports); }
 
-        for (int n = 0; n < localStun.count(); ++n)
-            delete localStun[n]->sock;
-
-        qDeleteAll(localStun);
-
-        delete tt;
+    LocalTransport *createLocalTransport(IceSocket::Ptr socket, const Ice176::LocalAddress &la)
+    {
+        auto lt   = new LocalTransport;
+        lt->qsock = socket;
+        lt->addr  = la.addr;
+        lt->sock  = QSharedPointer<IceLocalTransport>::create();
+        lt->sock->setDebugLevel(IceTransport::DebugLevel(debugLevel));
+        lt->network = la.network;
+        lt->isVpn   = la.isVpn;
+        connect(lt->sock.data(), SIGNAL(started()), SLOT(lt_started()));
+        connect(lt->sock.data(), SIGNAL(stopped()), SLOT(lt_stopped()));
+        connect(lt->sock.data(), SIGNAL(addressesChanged()), SLOT(lt_addressesChanged()));
+        connect(lt->sock.data(), SIGNAL(error(int)), SLOT(lt_error(int)));
+        connect(lt->sock.data(), SIGNAL(debugLine(QString)), SLOT(lt_debugLine(QString)));
+        return lt;
     }
 
-    void update2(QList<QUdpSocket *> *socketList) { Q_ASSERT(!stopping); }
-
     void update(QList<QUdpSocket *> *socketList)
     {
         Q_ASSERT(!stopping);
 
+        // only allow setting stun stuff once
+        if (!pending.stunBindAddr.isNull() && config.stunBindAddr.isNull()) {
+            config.stunBindAddr     = pending.stunBindAddr;
+            config.stunBindPort     = pending.stunBindPort;
+            config.stunRelayUdpAddr = pending.stunRelayUdpAddr;
+            config.stunRelayUdpPort = pending.stunRelayUdpPort;
+            config.stunRelayUdpUser = pending.stunRelayUdpUser;
+            config.stunRelayUdpPass = pending.stunRelayUdpPass;
+            config.stunRelayTcpAddr = pending.stunRelayTcpAddr;
+            config.stunRelayTcpPort = pending.stunRelayTcpPort;
+            config.stunRelayTcpUser = pending.stunRelayTcpUser;
+            config.stunRelayTcpPass = pending.stunRelayTcpPass;
+        }
+
         // for now, only allow setting localAddrs once
         if (!pending.localAddrs.isEmpty() && config.localAddrs.isEmpty()) {
             for (const Ice176::LocalAddress &la : pending.localAddrs) {
@@ -175,18 +180,11 @@ class IceComponent::Private : public QObject {
                 if (findLocalAddr(la.addr) != -1)
                     continue;
 
-                if (!useLocal) {
-                    // skip out, but log the address in
-                    //   case we need it for stun
-                    config.localAddrs += la;
-                    continue;
-                }
-
                 QUdpSocket *qsock = nullptr;
-                if (socketList)
+                if (useLocal && socketList) {
                     qsock = takeFromSocketList(socketList, la.addr, this);
-
-                bool borrowedSocket = true;
+                }
+                bool borrowedSocket = qsock != nullptr;
                 if (!qsock) {
                     // otherwise, bind to random
                     qsock = new QUdpSocket(this);
@@ -195,29 +193,21 @@ class IceComponent::Private : public QObject {
                         emit q->debugLine("Warning: unable to bind to random port.");
                         continue;
                     }
-
-                    borrowedSocket = false;
                 }
 
-                int port = qsock->localPort();
-
                 config.localAddrs += la;
+                auto lt = createLocalTransport(IceSocket::Ptr::create(qsock, borrowedSocket, this), la);
+                udpTransports += lt;
 
-                LocalTransport *lt = new LocalTransport;
-                lt->addr           = la.addr;
-                lt->qsock          = qsock;
-                lt->borrowedSocket = borrowedSocket;
-                lt->sock           = new IceLocalTransport(this);
-                lt->sock->setDebugLevel(IceTransport::DebugLevel(debugLevel));
-                lt->network = la.network;
-                lt->isVpn   = la.isVpn;
-                connect(lt->sock, SIGNAL(started()), SLOT(lt_started()));
-                connect(lt->sock, SIGNAL(stopped()), SLOT(lt_stopped()));
-                connect(lt->sock, SIGNAL(addressesChanged()), SLOT(lt_addressesChanged()));
-                connect(lt->sock, SIGNAL(error(int)), SLOT(lt_error(int)));
-                connect(lt->sock, SIGNAL(debugLine(QString)), SLOT(lt_debugLine(QString)));
-                localLeap += lt;
+                if (useStunBind && !config.stunBindAddr.isNull()) {
+                    lt->sock->setStunBindService(config.stunBindAddr, config.stunBindPort);
+                }
+                if (useStunRelayUdp && !config.stunRelayUdpAddr.isNull() && !config.stunRelayUdpUser.isEmpty()) {
+                    lt->sock->setStunRelayService(config.stunRelayUdpAddr, config.stunRelayUdpPort,
+                                                  config.stunRelayUdpUser, config.stunRelayUdpPass);
+                }
 
+                int port = qsock->localPort();
                 lt->sock->start(qsock);
                 emit q->debugLine(QString("starting transport ") + la.addr.toString() + ';' + QString::number(port)
                                   + " for component " + QString::number(id));
@@ -230,7 +220,7 @@ class IceComponent::Private : public QObject {
 
             bool need_doExt = false;
 
-            for (auto lt : localLeap) {
+            for (auto lt : udpTransports) {
                 // already assigned an ext address?  skip
                 if (!lt->extAddr.isNull())
                     continue;
@@ -260,7 +250,7 @@ class IceComponent::Private : public QObject {
 
                     ObjectSessionWatcher watch(&sess);
 
-                    for (auto lt : localLeap) {
+                    for (auto lt : udpTransports) {
                         if (lt->started) {
                             int addrAt = findLocalAddr(lt->addr);
                             Q_ASSERT(addrAt != -1);
@@ -273,87 +263,28 @@ class IceComponent::Private : public QObject {
                 });
         }
 
-        // only allow setting stun stuff once
-        if (!pending.stunBindAddr.isNull() && config.stunBindAddr.isNull()) {
-            config.stunBindAddr     = pending.stunBindAddr;
-            config.stunBindPort     = pending.stunBindPort;
-            config.stunRelayUdpAddr = pending.stunRelayUdpAddr;
-            config.stunRelayUdpPort = pending.stunRelayUdpPort;
-            config.stunRelayUdpUser = pending.stunRelayUdpUser;
-            config.stunRelayUdpPass = pending.stunRelayUdpPass;
-            config.stunRelayTcpAddr = pending.stunRelayTcpAddr;
-            config.stunRelayTcpPort = pending.stunRelayTcpPort;
-            config.stunRelayTcpUser = pending.stunRelayTcpUser;
-            config.stunRelayTcpPass = pending.stunRelayTcpPass;
-        }
-
-        // localStun sockets created on demand if stun settings are
-        //   present, but only once (cannot be changed, for now)
-        if (((useStunBind && !config.stunBindAddr.isNull())
-             || (useStunRelayUdp && !config.stunRelayUdpAddr.isNull() && !config.stunRelayUdpUser.isEmpty()))
-            && !config.localAddrs.isEmpty() && localStun.isEmpty()) {
-            foreach (const Ice176::LocalAddress &la, config.localAddrs) {
-                // don't setup stun ports for ipv6
-                if (la.addr.protocol() == QAbstractSocket::IPv6Protocol)
-                    continue;
-
-                LocalTransport *lt = new LocalTransport;
-                lt->addr           = la.addr;
-                lt->sock           = new IceLocalTransport(this);
-                lt->sock->setDebugLevel(IceTransport::DebugLevel(debugLevel));
-                lt->network = la.network;
-                lt->isVpn   = la.isVpn;
-                connect(lt->sock, SIGNAL(started()), SLOT(lt_started()));
-                connect(lt->sock, SIGNAL(stopped()), SLOT(lt_stopped()));
-                connect(lt->sock, SIGNAL(addressesChanged()), SLOT(lt_addressesChanged()));
-                connect(lt->sock, SIGNAL(error(int)), SLOT(lt_error(int)));
-                connect(lt->sock, SIGNAL(debugLine(QString)), SLOT(lt_debugLine(QString)));
-                localStun += lt;
-
-                lt->sock->setClientSoftwareNameAndVersion(clientSoftware);
-                lt->sock->start(la.addr);
-                emit q->debugLine(QString("starting transport ") + la.addr.toString() + ";(dyn)" + " for component "
-                                  + QString::number(id));
-            }
-        }
-
-        if ((!config.stunBindAddr.isNull() || !config.stunRelayUdpAddr.isNull()) && !localStun.isEmpty()) {
-            // this loop is likely noop since lt->sock->start above doesn't start immediatelly
-            for (int n = 0; n < localStun.count(); ++n) {
-                if (localStun[n]->started && !localStun[n]->stun_started)
-                    tryStun(n);
-            }
-        }
-
-        if (useStunRelayTcp && !config.stunRelayTcpAddr.isNull() && !config.stunRelayTcpUser.isEmpty() && !tt) {
-            tt = new IceTurnTransport(this);
-            tt->setDebugLevel(IceTransport::DebugLevel(debugLevel));
-            connect(tt, SIGNAL(started()), SLOT(tt_started()));
-            connect(tt, SIGNAL(stopped()), SLOT(tt_stopped()));
-            connect(tt, SIGNAL(error(int)), SLOT(tt_error(int)));
-            connect(tt, SIGNAL(debugLine(QString)), SLOT(tt_debugLine(QString)));
-            tt->setClientSoftwareNameAndVersion(clientSoftware);
-            tt->setProxy(proxy);
-            tt->setUsername(config.stunRelayTcpUser);
-            tt->setPassword(config.stunRelayTcpPass);
-            tt->start(config.stunRelayTcpAddr, config.stunRelayTcpPort);
+        if (useStunRelayTcp && !config.stunRelayTcpAddr.isNull() && !config.stunRelayTcpUser.isEmpty() && !tcpTurn) {
+            tcpTurn = QSharedPointer<IceTurnTransport>::create();
+            tcpTurn->setDebugLevel(IceTransport::DebugLevel(debugLevel));
+            connect(tcpTurn.data(), SIGNAL(started()), SLOT(tt_started()));
+            connect(tcpTurn.data(), SIGNAL(stopped()), SLOT(tt_stopped()));
+            connect(tcpTurn.data(), SIGNAL(error(int)), SLOT(tt_error(int)));
+            connect(tcpTurn.data(), SIGNAL(debugLine(QString)), SLOT(tt_debugLine(QString)));
+            tcpTurn->setClientSoftwareNameAndVersion(clientSoftware);
+            tcpTurn->setProxy(proxy);
+            tcpTurn->setUsername(config.stunRelayTcpUser);
+            tcpTurn->setPassword(config.stunRelayTcpPass);
+            tcpTurn->start(config.stunRelayTcpAddr, config.stunRelayTcpPort);
 
             emit q->debugLine(QString("starting TURN transport with server ") + config.stunRelayTcpAddr.toString() + ';'
                               + QString::number(config.stunRelayTcpPort) + " for component " + QString::number(id));
         }
 
-        if (localStun.isEmpty())
-            stunFinished = true;
-
-        if (localLeap.isEmpty() && !localFinished) {
+        if (udpTransports.isEmpty() && !localFinished) {
             localFinished = true;
             sess.defer(q, "localFinished");
         }
-
-        if (localFinished && stunFinished && !tt && !gatheringComplete) { // nothing really to be done
-            gatheringComplete = true;
-            sess.defer(q, "gatheringComplete");
-        }
+        sess.defer(this, "tryGatheringComplete");
     }
 
     void stop()
@@ -368,34 +299,31 @@ class IceComponent::Private : public QObject {
             return;
         }
 
-        foreach (LocalTransport *lt, localLeap)
+        for (LocalTransport *lt : udpTransports)
             lt->sock->stop();
 
-        foreach (LocalTransport *lt, localStun)
-            lt->sock->stop();
-
-        if (tt)
-            tt->stop();
+        if (tcpTurn)
+            tcpTurn->stop();
     }
 
-    int peerReflexivePriority(const IceTransport *iceTransport, int path) const
+    int peerReflexivePriority(QSharedPointer<IceTransport> iceTransport, int path) const
     {
         int                      addrAt = -1;
-        const IceLocalTransport *lt     = qobject_cast<const IceLocalTransport *>(iceTransport);
+        const IceLocalTransport *lt     = qobject_cast<const IceLocalTransport *>(iceTransport.data());
         if (lt) {
-            bool isLocalLeap = false;
-            addrAt           = findLocalTransport(lt, &isLocalLeap);
-            if (addrAt != -1 && path == 1) {
+            auto it = std::find_if(udpTransports.begin(), udpTransports.end(),
+                                   [&](auto const &a) { return a->sock == lt; });
+            Q_ASSERT(it != udpTransports.end());
+            addrAt = std::distance(udpTransports.begin(), it);
+            if (path == 1) {
                 // lower priority, but not as far as IceTurnTransport
                 addrAt += 512;
             }
-        } else if (qobject_cast<const IceTurnTransport *>(iceTransport) == tt) {
+        } else if (qobject_cast<const IceTurnTransport *>(iceTransport) == tcpTurn) {
             // lower priority by making it seem like the last nic
             addrAt = 1024;
         }
 
-        Q_ASSERT(addrAt != -1);
-
         return choose_default_priority(PeerReflexiveType, 65535 - addrAt, false, id);
     }
 
@@ -487,48 +415,6 @@ class IceComponent::Private : public QObject {
         return -1;
     }
 
-    int findLocalTransport(const IceLocalTransport *sock, bool *isLocalLeap) const
-    {
-        for (int n = 0; n < localLeap.count(); ++n) {
-            if (localLeap[n]->sock == sock) {
-                *isLocalLeap = true;
-                return n;
-            }
-        }
-
-        for (int n = 0; n < localStun.count(); ++n) {
-            if (localStun[n]->sock == sock) {
-                *isLocalLeap = false;
-                return n;
-            }
-        }
-
-        return -1;
-    }
-
-    void tryStun(int at)
-    {
-        LocalTransport *lt = localStun[at];
-
-        bool atLeastOne = false;
-        if (useStunBind && !config.stunBindAddr.isNull()) {
-            atLeastOne = true;
-            lt->sock->setStunBindService(config.stunBindAddr, config.stunBindPort);
-        }
-        if (useStunRelayUdp && !config.stunRelayUdpAddr.isNull() && !config.stunRelayUdpUser.isEmpty()) {
-            atLeastOne = true;
-            lt->sock->setStunRelayService(config.stunRelayUdpAddr, config.stunRelayUdpPort, config.stunRelayUdpUser,
-                                          config.stunRelayUdpPass);
-        }
-
-        Q_ASSERT(atLeastOne);
-        if (!atLeastOne)
-            abort();
-
-        lt->stun_started = true;
-        lt->sock->stunStart();
-    }
-
     void ensureExt(LocalTransport *lt, int addrAt)
     {
         if (!lt->extAddr.isNull() && !lt->ext_finished) {
@@ -555,7 +441,7 @@ class IceComponent::Private : public QObject {
         }
     }
 
-    void removeLocalCandidates(const IceTransport *sock)
+    void removeLocalCandidates(const QSharedPointer<IceTransport> sock)
     {
         ObjectSessionWatcher watch(&sess);
 
@@ -575,13 +461,7 @@ class IceComponent::Private : public QObject {
         }
     }
 
-    bool allStopped() const
-    {
-        if (localLeap.isEmpty() && localStun.isEmpty() && !tt)
-            return true;
-        else
-            return false;
-    }
+    bool allStopped() const { return udpTransports.isEmpty() && !tcpTurn; }
 
     void tryStopped()
     {
@@ -589,9 +469,10 @@ class IceComponent::Private : public QObject {
             postStop();
     }
 
+private slots:
     void tryGatheringComplete()
     {
-        if (gatheringComplete || (tt && !tt->isStarted()))
+        if (gatheringComplete || (tcpTurn && !tcpTurn->isStarted()))
             return;
 
         auto checkFinished = [&](const LocalTransport *lt) {
@@ -600,20 +481,12 @@ class IceComponent::Private : public QObject {
         };
 
         bool allFinished = true;
-        for (const LocalTransport *lt : localLeap) {
+        for (const LocalTransport *lt : udpTransports) {
             if (!checkFinished(lt)) {
                 allFinished = false;
                 break;
             }
         }
-        if (allFinished) {
-            for (const LocalTransport *lt : localStun) {
-                if (!checkFinished(lt)) {
-                    allFinished = false;
-                    break;
-                }
-            }
-        }
 
         if (allFinished) {
             gatheringComplete = true;
@@ -621,8 +494,6 @@ class IceComponent::Private : public QObject {
         }
     }
 
-private slots:
-
     void postStop()
     {
         stopping = false;
@@ -632,16 +503,12 @@ private slots:
 
     void lt_started()
     {
-        IceLocalTransport *sock        = static_cast<IceLocalTransport *>(sender());
-        bool               isLocalLeap = false;
-        int                at          = findLocalTransport(sock, &isLocalLeap);
-        Q_ASSERT(at != -1);
+        IceLocalTransport *sock = static_cast<IceLocalTransport *>(sender());
 
-        LocalTransport *lt;
-        if (isLocalLeap)
-            lt = localLeap[at];
-        else
-            lt = localStun[at];
+        auto it
+            = std::find_if(udpTransports.begin(), udpTransports.end(), [&](auto const &a) { return a->sock == sock; });
+        Q_ASSERT(it != udpTransports.end());
+        LocalTransport *lt = *it;
 
         lt->started = true;
 
@@ -650,7 +517,7 @@ private slots:
 
         ObjectSessionWatcher watch(&sess);
 
-        if (useLocal && isLocalLeap) {
+        if (useLocal) {
             CandidateInfo ci;
             ci.addr.addr   = lt->sock->localAddress();
             ci.addr.port   = lt->sock->localPort();
@@ -663,7 +530,7 @@ private slots:
             Candidate c;
             c.id           = getId();
             c.info         = ci;
-            c.iceTransport = sock;
+            c.iceTransport = sock->sharedFromThis();
             c.path         = 0;
 
             localCandidates += c;
@@ -677,30 +544,40 @@ private slots:
                 return;
         }
 
-        if (!isLocalLeap && !lt->stun_started)
-            tryStun(at);
+        // setup stun/turn
+        bool bind  = useStunBind && !config.stunBindAddr.isNull();
+        bool relay = useStunRelayUdp && !config.stunRelayUdpAddr.isNull() && !config.stunRelayUdpUser.isEmpty();
+        if (lt->stun_started || !(bind || relay) || lt->addr.protocol() == QAbstractSocket::IPv6Protocol)
+            return;
 
-        if (isLocalLeap && !localFinished) {
-            bool allFinished = true;
-            foreach (const LocalTransport *lt, localLeap) {
+        lt->sock->setClientSoftwareNameAndVersion(clientSoftware);
+        if (bind) {
+            lt->sock->setStunBindService(config.stunBindAddr, config.stunBindPort);
+        }
+        if (relay) {
+            lt->sock->setStunRelayService(config.stunRelayUdpAddr, config.stunRelayUdpPort, config.stunRelayUdpUser,
+                                          config.stunRelayUdpPass);
+        }
+        lt->stun_started = true;
+        lt->sock->stunStart();
+        if (!watch.isValid())
+            return;
+
+        // check completeness of various stuff
+        if (!localFinished) {
+            bool allStarted = true;
+            for (const LocalTransport *lt : udpTransports) {
                 if (!lt->started) {
-                    allFinished = false;
+                    allStarted = false;
                     break;
                 }
             }
-            if (allFinished) {
+            if (allStarted) {
                 localFinished = true;
                 emit q->localFinished();
+                if (!watch.isValid())
+                    return;
             }
-        } else if (!isLocalLeap && !stunFinished) {
-            bool allFinished = true;
-            foreach (const LocalTransport *lt, localStun) {
-                if (!lt->started) {
-                    allFinished = false;
-                    break;
-                }
-            }
-            stunFinished = allFinished;
         }
 
         tryGatheringComplete();
@@ -708,16 +585,11 @@ private slots:
 
     void lt_stopped()
     {
-        IceLocalTransport *sock        = static_cast<IceLocalTransport *>(sender());
-        bool               isLocalLeap = false;
-        int                at          = findLocalTransport(sock, &isLocalLeap);
-        Q_ASSERT(at != -1);
-
-        LocalTransport *lt;
-        if (isLocalLeap)
-            lt = localLeap[at];
-        else
-            lt = localStun[at];
+        IceLocalTransport *sock = static_cast<IceLocalTransport *>(sender());
+        auto               it
+            = std::find_if(udpTransports.begin(), udpTransports.end(), [&](auto const &a) { return a->sock == sock; });
+        Q_ASSERT(it != udpTransports.end());
+        LocalTransport *lt = *it;
 
         ObjectSessionWatcher watch(&sess);
 
@@ -725,36 +597,21 @@ private slots:
         if (!watch.isValid())
             return;
 
-        delete lt->sock;
-        lt->sock = nullptr;
-
-        if (isLocalLeap) {
-            if (lt->borrowedSocket)
-                portReserver->returnSockets(QList<QUdpSocket *>() << lt->qsock);
-            else
-                lt->qsock->deleteLater();
-
-            delete lt;
-            localLeap.removeAt(at);
-        } else {
-            delete lt;
-            localStun.removeAt(at);
-        }
+        lt->sock->disconnect(this);
+        delete lt;
 
+        udpTransports.erase(it);
         tryStopped();
     }
 
     void lt_addressesChanged()
     {
-        IceLocalTransport *sock        = static_cast<IceLocalTransport *>(sender());
-        bool               isLocalLeap = false;
-        int                at          = findLocalTransport(sock, &isLocalLeap);
-        Q_ASSERT(at != -1);
+        IceLocalTransport *sock = static_cast<IceLocalTransport *>(sender());
+        auto               it
+            = std::find_if(udpTransports.begin(), udpTransports.end(), [&](auto const &a) { return a->sock == sock; });
 
-        // leap does not use stun, so we should not get this signal
-        Q_ASSERT(!isLocalLeap);
-
-        LocalTransport *lt = localStun[at];
+        Q_ASSERT(it != udpTransports.end());
+        LocalTransport *lt = *it;
 
         int addrAt = findLocalAddr(lt->addr);
         Q_ASSERT(addrAt != -1);
@@ -763,7 +620,7 @@ private slots:
 
         if (useStunBind && !lt->sock->serverReflexiveAddress().isNull() && !lt->stun_finished) {
             // automatically assign ext to related leaps, if possible
-            foreach (LocalTransport *i, localLeap) {
+            for (LocalTransport *i : udpTransports) {
                 if (i->extAddr.isNull() && i->sock->localAddress() == lt->sock->localAddress()) {
                     i->extAddr = lt->sock->serverReflexiveAddress();
                     if (i->started) {
@@ -791,7 +648,7 @@ private slots:
             Candidate c;
             c.id           = getId();
             c.info         = ci;
-            c.iceTransport = sock;
+            c.iceTransport = sock->sharedFromThis();
             c.path         = 0;
 
             localCandidates += c;
@@ -816,7 +673,7 @@ private slots:
             Candidate c;
             c.id           = getId();
             c.info         = ci;
-            c.iceTransport = sock;
+            c.iceTransport = sock->sharedFromThis();
             c.path         = 1;
 
             localCandidates += c;
@@ -832,16 +689,12 @@ private slots:
     {
         Q_UNUSED(e)
 
-        IceLocalTransport *sock        = static_cast<IceLocalTransport *>(sender());
-        bool               isLocalLeap = false;
-        int                at          = findLocalTransport(sock, &isLocalLeap);
-        Q_ASSERT(at != -1);
+        IceLocalTransport *sock = static_cast<IceLocalTransport *>(sender());
+        auto               it
+            = std::find_if(udpTransports.begin(), udpTransports.end(), [&](auto const &a) { return a->sock == sock; });
 
-        LocalTransport *lt;
-        if (isLocalLeap)
-            lt = localLeap[at];
-        else
-            lt = localStun[at];
+        Q_ASSERT(it != udpTransports.end());
+        LocalTransport *lt = *it;
 
         ObjectSessionWatcher watch(&sess);
 
@@ -849,21 +702,11 @@ private slots:
         if (!watch.isValid())
             return;
 
-        delete lt->sock;
-        lt->sock = nullptr;
+        lt->sock->disconnect(this);
+        delete lt;
 
-        if (isLocalLeap) {
-            if (lt->borrowedSocket)
-                portReserver->returnSockets(QList<QUdpSocket *>() << lt->qsock);
-            else
-                lt->qsock->deleteLater();
+        udpTransports.erase(it);
 
-            delete lt;
-            localLeap.removeAt(at);
-        } else {
-            delete lt;
-            localStun.removeAt(at);
-        }
         tryGatheringComplete();
     }
 
@@ -875,8 +718,8 @@ private slots:
         int addrAt = 1024;
 
         CandidateInfo ci;
-        ci.addr.addr   = tt->relayedAddress();
-        ci.addr.port   = tt->relayedPort();
+        ci.addr.addr   = tcpTurn->relayedAddress();
+        ci.addr.port   = tcpTurn->relayedPort();
         ci.type        = RelayedType;
         ci.componentId = id;
         ci.priority    = choose_default_priority(ci.type, 65535 - addrAt, false, ci.componentId);
@@ -886,7 +729,7 @@ private slots:
         Candidate c;
         c.id           = getId();
         c.info         = ci;
-        c.iceTransport = tt;
+        c.iceTransport = tcpTurn->sharedFromThis();
         c.path         = 0;
 
         localCandidates += c;
@@ -900,12 +743,12 @@ private slots:
     {
         ObjectSessionWatcher watch(&sess);
 
-        removeLocalCandidates(tt);
+        removeLocalCandidates(tcpTurn->sharedFromThis());
         if (!watch.isValid())
             return;
 
-        delete tt;
-        tt = nullptr;
+        tcpTurn->disconnect(this);
+        tcpTurn.reset();
 
         tryStopped();
     }
@@ -916,12 +759,12 @@ private slots:
 
         ObjectSessionWatcher watch(&sess);
 
-        removeLocalCandidates(tt);
+        removeLocalCandidates(tcpTurn);
         if (!watch.isValid())
             return;
 
-        delete tt;
-        tt = nullptr;
+        tcpTurn->disconnect(this);
+        tcpTurn.reset();
         tryGatheringComplete();
     }
 
@@ -988,7 +831,7 @@ void IceComponent::update(QList<QUdpSocket *> *socketList) { d->update(socketLis
 
 void IceComponent::stop() { d->stop(); }
 
-int IceComponent::peerReflexivePriority(const IceTransport *iceTransport, int path) const
+int IceComponent::peerReflexivePriority(QSharedPointer<IceTransport> iceTransport, int path) const
 {
     return d->peerReflexivePriority(iceTransport, path);
 }
@@ -1001,12 +844,24 @@ void IceComponent::flagPathAsLowOverhead(int id, const QHostAddress &addr, int p
 void IceComponent::setDebugLevel(DebugLevel level)
 {
     d->debugLevel = level;
-    foreach (const Private::LocalTransport *lt, d->localLeap)
+    foreach (const Private::LocalTransport *lt, d->udpTransports)
         lt->sock->setDebugLevel(IceTransport::DebugLevel(level));
-    foreach (const Private::LocalTransport *lt, d->localStun)
-        lt->sock->setDebugLevel(IceTransport::DebugLevel(level));
-    if (d->tt)
-        d->tt->setDebugLevel((IceTransport::DebugLevel)level);
+    if (d->tcpTurn)
+        d->tcpTurn->setDebugLevel((IceTransport::DebugLevel)level);
+}
+
+IceComponent::CandidateInfo IceComponent::CandidateInfo::makeRemotePrflx(int componentId, const QHostAddress &fromAddr,
+                                                                         quint16 fromPort, quint32 priority)
+{
+    IceComponent::CandidateInfo c;
+    c.addr = TransportAddress(fromAddr, fromPort);
+    c.addr.addr.setScopeId(QString());
+    c.type        = PeerReflexiveType;
+    c.priority    = priority;
+    c.foundation  = QUuid::createUuid().toString();
+    c.componentId = componentId;
+    c.network     = -1;
+    return c;
 }
 
 } // namespace XMPP
diff --git a/src/irisnet/noncore/icecomponent.h b/src/irisnet/noncore/icecomponent.h
index 14ef5b93..4bf42b4f 100644
--- a/src/irisnet/noncore/icecomponent.h
+++ b/src/irisnet/noncore/icecomponent.h
@@ -54,6 +54,7 @@ class IceComponent : public QObject {
         }
 
         inline bool operator!=(const TransportAddress &other) const { return !operator==(other); }
+        inline      operator QString() const { return QString("%1:%2").arg(addr.toString(), QString::number(port)); }
     };
 
     class CandidateInfo {
@@ -67,6 +68,10 @@ class IceComponent : public QObject {
         TransportAddress related;
         QString          id;
         int              network;
+
+        static CandidateInfo makeRemotePrflx(int componentId, const QHostAddress &fromAddr, quint16 fromPort,
+                                             quint32 priority);
+        inline bool isSame(const CandidateInfo &o) const { return addr == o.addr && componentId == o.componentId; }
     };
 
     class Candidate {
@@ -82,8 +87,8 @@ class IceComponent : public QObject {
         CandidateInfo info;
 
         // note that these may be the same for multiple candidates
-        IceTransport *iceTransport;
-        int           path;
+        QSharedPointer<IceTransport> iceTransport;
+        int                          path;
     };
 
     enum DebugLevel { DL_None, DL_Info, DL_Packet };
@@ -129,7 +134,7 @@ class IceComponent : public QObject {
     void stop();
 
     // prflx priority to use when replying from this transport/path
-    int peerReflexivePriority(const IceTransport *iceTransport, int path) const;
+    int peerReflexivePriority(QSharedPointer<IceTransport> iceTransport, int path) const;
 
     void flagPathAsLowOverhead(int id, const QHostAddress &addr, int port);
 
diff --git a/src/irisnet/noncore/icelocaltransport.cpp b/src/irisnet/noncore/icelocaltransport.cpp
index af5046ed..3ba95722 100644
--- a/src/irisnet/noncore/icelocaltransport.cpp
+++ b/src/irisnet/noncore/icelocaltransport.cpp
@@ -198,9 +198,9 @@ class IceLocalTransport::Private : public QObject {
         turn          = nullptr;
         turnActivated = false;
 
-        if (sock) {
+        if (sock) { // if started
             if (extSock) {
-                sock->release();
+                sock->release(); // detaches the socket but doesn't destroy
                 extSock = nullptr;
             }
 
@@ -240,7 +240,7 @@ class IceLocalTransport::Private : public QObject {
         stopping = true;
 
         if (turn)
-            turn->close();
+            turn->close(); // will emit stopped() eventually calling postStop()
         else
             sess.defer(this, "postStop");
     }
diff --git a/src/irisnet/noncore/icelocaltransport.h b/src/irisnet/noncore/icelocaltransport.h
index 9082322c..9992fbbd 100644
--- a/src/irisnet/noncore/icelocaltransport.h
+++ b/src/irisnet/noncore/icelocaltransport.h
@@ -22,6 +22,7 @@
 #include "icetransport.h"
 
 #include <QByteArray>
+#include <QEnableSharedFromThis>
 #include <QObject>
 
 class QHostAddress;
@@ -36,7 +37,7 @@ namespace XMPP {
 //   relationship with an associated STUN/TURN server.  if TURN is used, this
 //   class offers two paths (0=direct and 1=relayed), otherwise it offers
 //   just one path (0=direct)
-class IceLocalTransport : public IceTransport {
+class IceLocalTransport : public IceTransport, public QEnableSharedFromThis<IceLocalTransport> {
     Q_OBJECT
 
 public:
@@ -74,12 +75,12 @@ class IceLocalTransport : public IceTransport {
     int          relayedPort() const;
 
     // reimplemented
-    virtual void       stop();
-    virtual bool       hasPendingDatagrams(int path) const;
-    virtual QByteArray readDatagram(int path, QHostAddress *addr, int *port);
-    virtual void       writeDatagram(int path, const QByteArray &buf, const QHostAddress &addr, int port);
-    virtual void       addChannelPeer(const QHostAddress &addr, int port);
-    virtual void       setDebugLevel(DebugLevel level);
+    void       stop() override;
+    bool       hasPendingDatagrams(int path) const override;
+    QByteArray readDatagram(int path, QHostAddress *addr, int *port) override;
+    void       writeDatagram(int path, const QByteArray &buf, const QHostAddress &addr, int port) override;
+    void       addChannelPeer(const QHostAddress &addr, int port) override;
+    void       setDebugLevel(DebugLevel level) override;
 
 signals:
     // may be emitted multiple times.
diff --git a/src/irisnet/noncore/icetransport.h b/src/irisnet/noncore/icetransport.h
index e3789378..a46f1c9c 100644
--- a/src/irisnet/noncore/icetransport.h
+++ b/src/irisnet/noncore/icetransport.h
@@ -21,6 +21,7 @@
 
 #include <QByteArray>
 #include <QObject>
+#include <QWeakPointer>
 
 class QHostAddress;
 
@@ -47,7 +48,7 @@ class IceTransport : public QObject {
 
 signals:
     void started();
-    void stopped();
+    void stopped(); // emitted when stop() finished cleaning up
     void error(int e);
 
     void readyRead(int path);
@@ -56,6 +57,9 @@ class IceTransport : public QObject {
     // not DOR-SS/DS safe
     void debugLine(const QString &str);
 };
+
+inline uint qHash(const QWeakPointer<IceTransport> &p) { return qHash(p.data()); }
+
 } // namespace XMPP
 
 #endif // ICETRANSPORT_H
diff --git a/src/irisnet/noncore/iceturntransport.h b/src/irisnet/noncore/iceturntransport.h
index ffd842a5..9c909932 100644
--- a/src/irisnet/noncore/iceturntransport.h
+++ b/src/irisnet/noncore/iceturntransport.h
@@ -23,12 +23,13 @@
 #include "turnclient.h"
 
 #include <QByteArray>
+#include <QEnableSharedFromThis>
 #include <QHostAddress>
 #include <QObject>
 
 namespace XMPP {
 // for the turn transport, only path 0 is used
-class IceTurnTransport : public IceTransport {
+class IceTurnTransport : public IceTransport, public QEnableSharedFromThis<IceTurnTransport> {
     Q_OBJECT
 
 public:
diff --git a/src/irisnet/noncore/stunbinding.cpp b/src/irisnet/noncore/stunbinding.cpp
index a8fd0e3f..56cb5b48 100644
--- a/src/irisnet/noncore/stunbinding.cpp
+++ b/src/irisnet/noncore/stunbinding.cpp
@@ -29,28 +29,24 @@ class StunBinding::Private : public QObject {
     Q_OBJECT
 
 public:
-    StunBinding *        q;
-    StunTransactionPool *pool;
-    StunTransaction *    trans;
-    QHostAddress         stunAddr;
-    int                  stunPort;
-    QHostAddress         addr;
-    int                  port;
-    QString              errorString;
-    bool                 use_extPriority, use_extIceControlling, use_extIceControlled;
-    quint32              extPriority;
-    bool                 extUseCandidate;
-    quint64              extIceControlling, extIceControlled;
-    QString              stuser, stpass;
-    bool                 fpRequired;
-
-    Private(StunBinding *_q) :
-        QObject(_q), q(_q), pool(nullptr), trans(nullptr), use_extPriority(false), use_extIceControlling(false),
-        use_extIceControlled(false), extUseCandidate(false), fpRequired(false)
-    {
-    }
-
-    ~Private() { delete trans; }
+    StunBinding *                   q;
+    StunTransactionPool *           pool = nullptr;
+    QScopedPointer<StunTransaction> trans;
+    QHostAddress                    stunAddr;
+    int                             stunPort = 0;
+    QHostAddress                    addr;
+    int                             port = 0;
+    QString                         errorString;
+    bool    use_extPriority = false, use_extIceControlling = false, use_extIceControlled = false;
+    quint32 extPriority       = 0;
+    bool    extUseCandidate   = false;
+    quint64 extIceControlling = 0, extIceControlled = 0;
+    QString stuser, stpass;
+    bool    fpRequired = false;
+
+    Private(StunBinding *_q) : QObject(_q), q(_q) {}
+
+    ~Private() {}
 
     void start(const QHostAddress &_addr = QHostAddress(), int _port = -1)
     {
@@ -59,10 +55,11 @@ class StunBinding::Private : public QObject {
         stunAddr = _addr;
         stunPort = _port;
 
-        trans = new StunTransaction(this);
-        connect(trans, SIGNAL(createMessage(QByteArray)), SLOT(trans_createMessage(QByteArray)));
-        connect(trans, SIGNAL(finished(XMPP::StunMessage)), SLOT(trans_finished(XMPP::StunMessage)));
-        connect(trans, SIGNAL(error(XMPP::StunTransaction::Error)), SLOT(trans_error(XMPP::StunTransaction::Error)));
+        trans.reset(new StunTransaction());
+        connect(trans.data(), SIGNAL(createMessage(QByteArray)), SLOT(trans_createMessage(QByteArray)));
+        connect(trans.data(), SIGNAL(finished(XMPP::StunMessage)), SLOT(trans_finished(XMPP::StunMessage)));
+        connect(trans.data(), SIGNAL(error(XMPP::StunTransaction::Error)),
+                SLOT(trans_error(XMPP::StunTransaction::Error)));
 
         if (!stuser.isEmpty()) {
             trans->setShortTermUsername(stuser);
@@ -117,8 +114,7 @@ private slots:
 
     void trans_finished(const XMPP::StunMessage &response)
     {
-        delete trans;
-        trans = nullptr;
+        trans.reset();
 
         bool    error = false;
         int     code;
@@ -175,8 +171,7 @@ private slots:
 
     void trans_error(XMPP::StunTransaction::Error e)
     {
-        delete trans;
-        trans = nullptr;
+        trans.reset();
 
         if (e == StunTransaction::ErrorTimeout) {
             errorString = "Request timed out.";
@@ -228,6 +223,13 @@ void StunBinding::start() { d->start(); }
 
 void StunBinding::start(const QHostAddress &addr, int port) { d->start(addr, port); }
 
+void StunBinding::cancel()
+{
+    if (d->trans) {
+        d->trans.take()->cancel(); // will self-delete
+    }
+}
+
 QHostAddress StunBinding::reflexiveAddress() const { return d->addr; }
 
 int StunBinding::reflexivePort() const { return d->port; }
diff --git a/src/irisnet/noncore/stunbinding.h b/src/irisnet/noncore/stunbinding.h
index 26a2eeaf..ca0d8264 100644
--- a/src/irisnet/noncore/stunbinding.h
+++ b/src/irisnet/noncore/stunbinding.h
@@ -49,6 +49,7 @@ class StunBinding : public QObject {
 
     void start();
     void start(const QHostAddress &addr, int port); // use addr association
+    void cancel();
 
     QHostAddress reflexiveAddress() const;
     int          reflexivePort() const;
diff --git a/src/irisnet/noncore/stuntransaction.cpp b/src/irisnet/noncore/stuntransaction.cpp
index 3c12f512..30d040b4 100644
--- a/src/irisnet/noncore/stuntransaction.cpp
+++ b/src/irisnet/noncore/stuntransaction.cpp
@@ -124,6 +124,7 @@ class StunTransactionPrivate : public QObject {
 
     StunTransactionPool * pool;
     bool                  active;
+    bool                  cancelling = false;
     StunTransaction::Mode mode;
     StunMessage           origMessage;
     QByteArray            id;
@@ -282,6 +283,10 @@ class StunTransactionPrivate : public QObject {
 private slots:
     void t_timeout()
     {
+        if (cancelling) {
+            q->deleteLater();
+            return;
+        }
         if (mode == StunTransaction::Tcp || tries == rc) {
             pool->d->remove(q);
             emit q->error(StunTransaction::ErrorTimeout);
@@ -330,6 +335,10 @@ private slots:
     {
         active = false;
         t->stop();
+        if (cancelling) {
+            q->deleteLater();
+            return;
+        }
 
         if (pool->d->debugLevel >= StunTransactionPool::DL_Packet)
             emit pool->debugLine(QString("matched incoming response to existing request.  elapsed=")
@@ -430,7 +439,12 @@ private slots:
     }
 
 public slots:
-    void continueAfterParams() { retry(); }
+    void continueAfterParams()
+    {
+        if (cancelling)
+            return;
+        retry();
+    }
 };
 
 StunTransaction::StunTransaction(QObject *parent) : QObject(parent) { d = new StunTransactionPrivate(this); }
@@ -443,6 +457,8 @@ void StunTransaction::start(StunTransactionPool *pool, const QHostAddress &toAdd
     d->start(pool, toAddress, toPort);
 }
 
+void StunTransaction::cancel() { d->cancelling = true; }
+
 void StunTransaction::setMessage(const StunMessage &request) { d->setMessage(request); }
 
 void StunTransaction::setRTO(int i)
@@ -629,7 +645,7 @@ void StunTransactionPool::continueAfterParams()
     foreach (StunTransaction *trans, d->transactions) {
         // the only reason an inactive transaction would be in the
         //   list is if it is waiting for an auth retry
-        if (!trans->d->active) {
+        if (!trans->d->active && !trans->d->cancelling) {
             // use queued call to prevent all sorts of DOR-SS
             //   nastiness
             QMetaObject::invokeMethod(trans->d, "continueAfterParams", Qt::QueuedConnection);
diff --git a/src/irisnet/noncore/stuntransaction.h b/src/irisnet/noncore/stuntransaction.h
index 43b8b44d..2bda0fae 100644
--- a/src/irisnet/noncore/stuntransaction.h
+++ b/src/irisnet/noncore/stuntransaction.h
@@ -76,6 +76,7 @@ class StunTransaction : public QObject {
     // note: not DOR-DS safe.  this function will cause the pool's
     //   outgoingMessage() signal to be emitted.
     void start(StunTransactionPool *pool, const QHostAddress &toAddress = QHostAddress(), int toPort = -1);
+    void cancel();
 
     // pass message with class unset.  use transaction id from the
     //   createMessage signal.
diff --git a/tools/icetunnel/main.cpp b/tools/icetunnel/main.cpp
index e3fa4f6f..4422ca61 100644
--- a/tools/icetunnel/main.cpp
+++ b/tools/icetunnel/main.cpp
@@ -522,6 +522,8 @@ public slots:
                 }
             }*/
             foreach (const QNetworkInterface &ni, QNetworkInterface::allInterfaces()) {
+                if (!(ni.flags() & QNetworkInterface::IsUp))
+                    continue;
                 QList<QNetworkAddressEntry> entries = ni.addressEntries();
                 foreach (const QNetworkAddressEntry &na, entries) {
                     QHostAddress h = na.ip();

From 1194b749ee672bd0cd9bac58266202c5024d3f4a Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sat, 11 Apr 2020 14:31:19 +0300
Subject: [PATCH 131/383] work in progress on ICE implementation udpate

---
 include/iris/iceagent.h                   |   1 +
 src/irisnet/noncore/ice176.cpp            | 118 +++++++++++++++-------
 src/irisnet/noncore/iceagent.cpp          |  80 +++++++++++++++
 src/irisnet/noncore/iceagent.h            |  35 +++++++
 src/irisnet/noncore/icecomponent.cpp      |  61 +++++++++--
 src/irisnet/noncore/icecomponent.h        |  22 ++--
 src/irisnet/noncore/icelocaltransport.cpp |  80 +++++++--------
 src/irisnet/noncore/icelocaltransport.h   |   5 +-
 src/irisnet/noncore/noncore.pri           |   2 +
 src/irisnet/noncore/stunbinding.cpp       |   2 +
 src/irisnet/noncore/stunbinding.h         |  11 +-
 src/irisnet/noncore/turnclient.cpp        |   2 +
 src/irisnet/noncore/turnclient.h          |   2 +
 src/xmpp/xmpp-im/jingle-ice.cpp           |  23 -----
 14 files changed, 316 insertions(+), 128 deletions(-)
 create mode 100644 include/iris/iceagent.h
 create mode 100644 src/irisnet/noncore/iceagent.cpp
 create mode 100644 src/irisnet/noncore/iceagent.h

diff --git a/include/iris/iceagent.h b/include/iris/iceagent.h
new file mode 100644
index 00000000..61b9e68e
--- /dev/null
+++ b/include/iris/iceagent.h
@@ -0,0 +1 @@
+#include "../../src/irisnet/noncore/iceagent.h"
diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index cfd43310..1d4c58ab 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -19,6 +19,7 @@
 
 #include "ice176.h"
 
+#include "iceagent.h"
 #include "icecomponent.h"
 #include "icelocaltransport.h"
 #include "iceturntransport.h"
@@ -37,29 +38,6 @@
 namespace XMPP {
 enum { Direct, Relayed };
 
-static QChar randomPrintableChar()
-{
-    // 0-25 = a-z
-    // 26-51 = A-Z
-    // 52-61 = 0-9
-
-    uchar c = QCA::Random::randomChar() % 62;
-    if (c <= 25)
-        return 'a' + c;
-    else if (c <= 51)
-        return 'A' + (c - 26);
-    else
-        return '0' + (c - 52);
-}
-
-static QString randomCredential(int len)
-{
-    QString out;
-    for (int n = 0; n < len; ++n)
-        out += randomPrintableChar();
-    return out;
-}
-
 static qint64 calc_pair_priority(int a, int b)
 {
     qint64 priority = ((qint64)1 << 32) * qMin(a, b);
@@ -150,6 +128,7 @@ class Ice176::Private : public QObject {
     public:
         QList<QSharedPointer<CandidatePair>> pairs;
         QQueue<QWeakPointer<CandidatePair>>  triggeredPairs;
+        QList<QSharedPointer<CandidatePair>> validPairs;
         CheckListState                       state;
     };
 
@@ -194,7 +173,7 @@ class Ice176::Private : public QObject {
     bool                               useStunRelayUdp              = true;
     bool                               useStunRelayTcp              = true;
     bool                               useTrickle                   = true;
-    bool                               aggressiveNomination         = false; // RFC 8445 compliant de default
+    bool                               aggressiveNomination         = false; // RFC8445 compliant de default
     bool                               localGatheringComplete       = false;
     bool                               remoteGatheringComplete      = false;
     bool                               expectRemoteCandidatesSignal = true;
@@ -281,8 +260,8 @@ class Ice176::Private : public QObject {
 
         state = Starting;
 
-        localUser = randomCredential(4);
-        localPass = randomCredential(22);
+        localUser = IceAgent::randomCredential(4);
+        localPass = IceAgent::randomCredential(22);
 
         QList<QUdpSocket *> socketList;
         if (portReserver)
@@ -374,7 +353,7 @@ class Ice176::Private : public QObject {
             ci.network = c.network;
             ci.id      = c.id;
 
-            // find remote prflx with same addr. we have to replace them instead adding new one. RFC 8445 7.3.1.3
+            // find remote prflx with same addr. we have to replace them instead adding new one. RFC8445 7.3.1.3
             auto it = std::find_if(this->remoteCandidates.begin(), this->remoteCandidates.end(),
                                    [&](const IceComponent::CandidateInfo &rc) {
                                        return ci.addr.addr == rc.addr.addr && ci.addr.port == rc.addr.port
@@ -560,6 +539,11 @@ class Ice176::Private : public QObject {
         QList<QSharedPointer<CandidatePair>> pairs;
         for (const IceComponent::Candidate &cc : localCandidates) {
             const IceComponent::CandidateInfo &lc = cc.info;
+            if (lc.type == IceComponent::PeerReflexiveType) {
+                printf("not pairing local prflx. %s\n", qPrintable(lc.addr));
+                // see RFC8445 7.2.5.3.1.  Discovering Peer-Reflexive Candidates
+                continue;
+            }
 
             for (const IceComponent::CandidateInfo &rc : remoteCandidates) {
                 auto pair = makeCandidatesPair(lc, rc);
@@ -819,6 +803,17 @@ class Ice176::Private : public QObject {
         out.type     = candidateType_to_string(cc.info.type);
     }
 
+    QString generateIdForCandidate()
+    {
+        QString id;
+        do {
+            id = IceAgent::randomCredential(10);
+        } while (std::find_if(localCandidates.begin(), localCandidates.end(),
+                              [&id](auto const &c) { return c.info.id == id; })
+                 != localCandidates.end());
+        return id;
+    }
+
 private slots:
     void postStop()
     {
@@ -829,15 +824,13 @@ private slots:
     void ic_candidateAdded(const XMPP::IceComponent::Candidate &_cc)
     {
         IceComponent::Candidate cc = _cc;
-        cc.info.id                 = randomCredential(10); // FIXME: ensure unique
-        cc.info.foundation         = "0";                  // FIXME
-        // TODO
-        localCandidates += cc;
 
-        QList<IceComponent::Candidate> update;
-        update << cc;
+        cc.info.id = generateIdForCandidate();
 
-        printf("C%d: candidate added: %s;%d\n", cc.info.componentId, qPrintable(cc.info.addr.addr.toString()),
+        localCandidates += cc;
+
+        printf("C%d: candidate added: %s %s;%d\n", cc.info.componentId,
+               qPrintable(candidateType_to_string(cc.info.type)), qPrintable(cc.info.addr.addr.toString()),
                cc.info.addr.port);
 
         if (!iceTransports.contains(cc.iceTransport)) {
@@ -858,7 +851,7 @@ private slots:
             emit q->localCandidatesReady(list);
         }
         if (state == Started) {
-            doPairing(update, remoteCandidates);
+            doPairing(QList<IceComponent::Candidate>() << cc, remoteCandidates);
         }
     }
 
@@ -1179,6 +1172,14 @@ private slots:
 
     void binding_success()
     {
+        /*
+            RFC8445 7.2.5.2.1.  Non-Symmetric Transport Addresses
+            tells us addr:port of source->dest of request MUST match with dest<-source of the response,
+            and we should mark the pair as failed if doesn't match.
+            But StunTransaction already does this for us in its checkActiveAndFrom.
+            So it will fail with timeout instead if response comes from a wrong address.
+        */
+
         StunBinding *binding = static_cast<StunBinding *>(sender());
 
         auto it = std::find_if(checkList.pairs.begin(), checkList.pairs.end(),
@@ -1186,12 +1187,53 @@ private slots:
         if (it == checkList.pairs.constEnd())
             return;
 
-        auto pair     = *it;
-        pair->isValid = true;
-        pair->state   = CandidatePairState::PSucceeded;
+        auto pair = *it;
+        // pair->isValid = true;
+        pair->state = CandidatePairState::PSucceeded;
 
         printf("check success for %s\n", qPrintable(QString(*pair)));
 
+        // RFC8445 7.2.5.3.1.  Discovering Peer-Reflexive Candidates
+        auto mappedAddr = IceComponent::TransportAddress(binding->reflexiveAddress(), binding->reflexivePort());
+        if (pair->local.addr != mappedAddr) {
+            // so mapped address doesn't match with local candidate sending binding request.
+            // gotta find/create one
+            auto locIt = std::find_if(localCandidates.begin(), localCandidates.end(), [&](const auto &c) {
+                return c.info.base == mappedAddr || c.info.addr == mappedAddr;
+            });
+            if (locIt == localCandidates.end()) {
+                // new peer-reflexive local candidate discovered
+                components[pair->local.componentId].ic->addLocalPeerReflexiveCandidate(mappedAddr, pair->local,
+                                                                                       binding->priority());
+                locIt = std::find_if(localCandidates.begin(), localCandidates.end(),
+                                     [&](const auto &c) { return c.info.addr == mappedAddr; }); // just inserted
+                Q_ASSERT(locIt != localCandidates.end());
+                pair = makeCandidatesPair(locIt->info, pair->remote);
+                // TODO start media flow on valid pair
+            } else {
+                // local candidate found. If it's a part of a pair on checklist, we have to add this pair to valid list,
+                // otherwise we have to create a new pair and add it to valid list
+                it = std::find_if(checkList.pairs.begin(), checkList.pairs.end(), [&](auto const &p) {
+                    return p->local.id == locIt->info.id && p->remote.addr == pair->remote.addr;
+                });
+                if (it == checkList.pairs.constEnd()) {
+                    pair = makeCandidatesPair(locIt->info, pair->remote);
+                } else {
+                    pair = *it;
+                    printf("mapped address belongs to another pair on checklist %s\n", qPrintable(QString(*pair)));
+                    if (pair->isValid) { // already valid as result of previous checks probably
+                        return;
+                    }
+                }
+            }
+        }
+
+        pair->isValid = true;
+        pair->state   = PSucceeded; // what if it was in progress?
+        checkList.validPairs.append(pair);
+
+        // TODO add *locIt and pair.remote to valid list
+
         if (mode == Ice176::Initiator) {
             if (!binding->useCandidate())
                 return;
diff --git a/src/irisnet/noncore/iceagent.cpp b/src/irisnet/noncore/iceagent.cpp
new file mode 100644
index 00000000..e92ad827
--- /dev/null
+++ b/src/irisnet/noncore/iceagent.cpp
@@ -0,0 +1,80 @@
+#include "iceagent.h"
+
+#include <QCoreApplication>
+#include <QtCrypto>
+
+namespace XMPP {
+
+struct Foundation {
+    IceComponent::CandidateType type;
+    const QHostAddress          baseAddr;
+    const QHostAddress          stunServAddr;
+    QAbstractSocket::SocketType stunRequestProto;
+
+    bool operator==(const Foundation &f) const
+    {
+        return type == f.type && baseAddr == f.baseAddr && stunServAddr == f.stunServAddr
+            && stunRequestProto == f.stunRequestProto;
+    };
+};
+
+inline uint qHash(const Foundation &f, uint seed = 0)
+{
+    auto tmp = uint(f.stunRequestProto) & (uint(f.type) << 8);
+    return qHash(f.baseAddr, seed) ^ qHash(f.stunServAddr, seed) ^ tmp;
+}
+
+static QChar randomPrintableChar()
+{
+    // 0-25 = a-z
+    // 26-51 = A-Z
+    // 52-61 = 0-9
+
+    uchar c = QCA::Random::randomChar() % 62;
+    if (c <= 25)
+        return 'a' + c;
+    else if (c <= 51)
+        return 'A' + (c - 26);
+    else
+        return '0' + (c - 52);
+}
+
+struct IceAgent::Private {
+    QHash<Foundation, QString> foundations;
+};
+
+IceAgent *IceAgent::instance()
+{
+    static auto i = new IceAgent(QCoreApplication::instance());
+    return i;
+}
+
+IceAgent::~IceAgent() {}
+
+QString IceAgent::foundation(IceComponent::CandidateType type, const QHostAddress baseAddr,
+                             const QHostAddress &stunServAddr, QAbstractSocket::SocketType stunRequestProto)
+{
+    Foundation f { type, baseAddr, stunServAddr, stunRequestProto };
+    QString    ret = d->foundations.value(f);
+    if (ret.isEmpty()) {
+        do {
+            ret = randomCredential(8);
+        } while (std::find_if(d->foundations.begin(), d->foundations.end(), [&](auto const &fp) { return fp == ret; })
+                 != d->foundations.end());
+        d->foundations.insert(f, ret);
+    }
+    return ret;
+}
+
+QString IceAgent::randomCredential(int len)
+{
+    QString out;
+    out.reserve(len);
+    for (int n = 0; n < len; ++n)
+        out += randomPrintableChar();
+    return out;
+}
+
+IceAgent::IceAgent(QObject *parent) : QObject(parent) {}
+
+} // namespace XMPP
diff --git a/src/irisnet/noncore/iceagent.h b/src/irisnet/noncore/iceagent.h
new file mode 100644
index 00000000..bd2566d8
--- /dev/null
+++ b/src/irisnet/noncore/iceagent.h
@@ -0,0 +1,35 @@
+#ifndef XMPP_ICEAGENT_H
+#define XMPP_ICEAGENT_H
+
+#include "icecomponent.h"
+
+#include <QObject>
+#include <memory>
+
+namespace XMPP {
+
+class IceAgent : public QObject {
+    Q_OBJECT
+public:
+    static IceAgent *instance();
+    ~IceAgent();
+
+    QString foundation(IceComponent::CandidateType type, const QHostAddress baseAddr,
+                       const QHostAddress &        stunServAddr     = QHostAddress(),
+                       QAbstractSocket::SocketType stunRequestProto = QAbstractSocket::UnknownSocketType);
+
+    static QString randomCredential(int len);
+
+private:
+    explicit IceAgent(QObject *parent = nullptr);
+
+signals:
+
+private:
+    struct Private;
+    std::unique_ptr<Private> d;
+};
+
+} // namespace XMPP
+
+#endif // XMPP_ICEAGENT_H
diff --git a/src/irisnet/noncore/icecomponent.cpp b/src/irisnet/noncore/icecomponent.cpp
index 91b2de0a..699b39b5 100644
--- a/src/irisnet/noncore/icecomponent.cpp
+++ b/src/irisnet/noncore/icecomponent.cpp
@@ -18,6 +18,7 @@
 
 #include "icecomponent.h"
 
+#include "iceagent.h"
 #include "icelocaltransport.h"
 #include "iceturntransport.h"
 #include "objectsession.h"
@@ -352,6 +353,34 @@ class IceComponent::Private : public QObject {
         }
     }
 
+    void addLocalPeerReflexiveCandidate(const IceComponent::TransportAddress &addr,
+                                        const IceComponent::CandidateInfo &base, quint32 priority)
+    {
+        IceComponent::CandidateInfo ci;
+        ci.addr = addr;
+        ci.addr.addr.setScopeId(QString());
+        ci.base        = base.addr;
+        ci.type        = IceComponent::PeerReflexiveType;
+        ci.priority    = priority;
+        ci.foundation  = IceAgent::instance()->foundation(IceComponent::PeerReflexiveType, ci.base.addr);
+        ci.componentId = base.componentId;
+        ci.network     = base.network;
+
+        auto baseCand = std::find_if(localCandidates.begin(), localCandidates.end(),
+                                     [&](auto const &c) { return c.info.id == base.id; });
+        Q_ASSERT(baseCand != localCandidates.end());
+
+        Candidate c;
+        c.id           = getId();
+        c.info         = ci;
+        c.iceTransport = baseCand->iceTransport;
+        c.path         = 0;
+
+        localCandidates += c;
+
+        emit q->candidateAdded(c);
+    }
+
 private:
     // localPref is the priority of the network interface being used for
     //   this candidate.  the value must be between 0-65535 and different
@@ -427,6 +456,7 @@ class IceComponent::Private : public QObject {
             ci.base.addr   = lt->sock->localAddress();
             ci.base.port   = lt->sock->localPort();
             ci.network     = lt->network;
+            ci.foundation  = IceAgent::instance()->foundation(ServerReflexiveType, ci.base.addr);
 
             Candidate c;
             c.id           = getId();
@@ -476,8 +506,8 @@ private slots:
             return;
 
         auto checkFinished = [&](const LocalTransport *lt) {
-            return lt->started && (!lt->sock->hasStunBindService() || lt->stun_finished)
-                && (!lt->sock->hasStunRelayService() || lt->turn_finished);
+            return lt->started && (lt->sock->stunBindServiceAddress().isNull() || lt->stun_finished)
+                && (lt->sock->stunRelayServiceAddress().isNull() || lt->turn_finished);
         };
 
         bool allFinished = true;
@@ -526,6 +556,7 @@ private slots:
             ci.priority    = choose_default_priority(ci.type, 65535 - addrAt, lt->isVpn, ci.componentId);
             ci.base        = ci.addr;
             ci.network     = lt->network;
+            ci.foundation  = IceAgent::instance()->foundation(HostType, ci.base.addr);
 
             Candidate c;
             c.id           = getId();
@@ -634,16 +665,14 @@ private slots:
             CandidateInfo ci;
             ci.addr.addr   = lt->sock->serverReflexiveAddress();
             ci.addr.port   = lt->sock->serverReflexivePort();
+            ci.base.addr   = lt->sock->localAddress();
+            ci.base.port   = lt->sock->localPort();
             ci.type        = ServerReflexiveType;
             ci.componentId = id;
             ci.priority    = choose_default_priority(ci.type, 65535 - addrAt, lt->isVpn, ci.componentId);
-            // stun is only used on non-leap sockets, but we don't
-            //   announce non-leap local candidates, so make the
-            //   base the same as the srflx
-            // ci.base.addr = lt->sock->localAddress();
-            // ci.base.port = lt->sock->localPort();
-            ci.base    = ci.addr;
-            ci.network = lt->network;
+            ci.network     = lt->network;
+            ci.foundation  = IceAgent::instance()->foundation(
+                ServerReflexiveType, ci.base.addr, lt->sock->reflexiveAddressSource(), QAbstractSocket::UdpSocket);
 
             Candidate c;
             c.id           = getId();
@@ -663,12 +692,14 @@ private slots:
             CandidateInfo ci;
             ci.addr.addr   = lt->sock->relayedAddress();
             ci.addr.port   = lt->sock->relayedPort();
+            ci.base.addr   = lt->sock->relayedAddress();
+            ci.base.port   = lt->sock->relayedPort();
             ci.type        = RelayedType;
             ci.componentId = id;
             ci.priority    = choose_default_priority(ci.type, 65535 - addrAt, lt->isVpn, ci.componentId);
-            ci.base.addr   = lt->sock->serverReflexiveAddress();
-            ci.base.port   = lt->sock->serverReflexivePort();
             ci.network     = lt->network;
+            ci.foundation  = IceAgent::instance()->foundation(
+                RelayedType, ci.base.addr, lt->sock->stunRelayServiceAddress(), QAbstractSocket::UdpSocket);
 
             Candidate c;
             c.id           = getId();
@@ -725,6 +756,8 @@ private slots:
         ci.priority    = choose_default_priority(ci.type, 65535 - addrAt, false, ci.componentId);
         ci.base        = ci.addr;
         ci.network     = 0; // not relevant
+        ci.foundation  = IceAgent::instance()->foundation(RelayedType, ci.base.addr, config.stunRelayTcpAddr,
+                                                         QAbstractSocket::TcpSocket);
 
         Candidate c;
         c.id           = getId();
@@ -836,6 +869,12 @@ int IceComponent::peerReflexivePriority(QSharedPointer<IceTransport> iceTranspor
     return d->peerReflexivePriority(iceTransport, path);
 }
 
+void IceComponent::addLocalPeerReflexiveCandidate(const IceComponent::TransportAddress &addr,
+                                                  const IceComponent::CandidateInfo &base, quint32 priority)
+{
+    d->addLocalPeerReflexiveCandidate(addr, base, priority);
+}
+
 void IceComponent::flagPathAsLowOverhead(int id, const QHostAddress &addr, int port)
 {
     return d->flagPathAsLowOverhead(id, addr, port);
diff --git a/src/irisnet/noncore/icecomponent.h b/src/irisnet/noncore/icecomponent.h
index 4bf42b4f..01ee48d3 100644
--- a/src/irisnet/noncore/icecomponent.h
+++ b/src/irisnet/noncore/icecomponent.h
@@ -59,15 +59,17 @@ class IceComponent : public QObject {
 
     class CandidateInfo {
     public:
-        TransportAddress addr;
-        CandidateType    type;
-        int              priority;
-        QString          foundation;
-        int              componentId;
-        TransportAddress base;
-        TransportAddress related;
-        QString          id;
-        int              network;
+        CandidateType type;
+        int           priority;
+        int           componentId;
+        int           network;
+
+        TransportAddress addr;    // address according to candidate type
+        TransportAddress base;    // network interface address
+        TransportAddress related; // not used in agent but usefule for diagnostics
+
+        QString foundation;
+        QString id;
 
         static CandidateInfo makeRemotePrflx(int componentId, const QHostAddress &fromAddr, quint16 fromPort,
                                              quint32 priority);
@@ -136,6 +138,8 @@ class IceComponent : public QObject {
     // prflx priority to use when replying from this transport/path
     int peerReflexivePriority(QSharedPointer<IceTransport> iceTransport, int path) const;
 
+    void addLocalPeerReflexiveCandidate(const TransportAddress &addr, const CandidateInfo &base, quint32 priority);
+
     void flagPathAsLowOverhead(int id, const QHostAddress &addr, int port);
 
     void setDebugLevel(DebugLevel level);
diff --git a/src/irisnet/noncore/icelocaltransport.cpp b/src/irisnet/noncore/icelocaltransport.cpp
index 3ba95722..3d683772 100644
--- a/src/irisnet/noncore/icelocaltransport.cpp
+++ b/src/irisnet/noncore/icelocaltransport.cpp
@@ -162,6 +162,7 @@ class IceLocalTransport::Private : public QObject {
     int                  port;
     QHostAddress         refAddr;
     int                  refPort;
+    QHostAddress         refAddrSource;
     QHostAddress         relAddr;
     int                  relPort;
     QHostAddress         stunBindAddr;
@@ -211,8 +212,9 @@ class IceLocalTransport::Private : public QObject {
         addr = QHostAddress();
         port = -1;
 
-        refAddr = QHostAddress();
-        refPort = -1;
+        refAddr       = QHostAddress();
+        refPort       = -1;
+        refAddrSource = QHostAddress();
 
         relAddr = QHostAddress();
         relPort = -1;
@@ -262,21 +264,38 @@ class IceLocalTransport::Private : public QObject {
             pool->setPassword(stunPass);
         }
 
-        if (!stunBindAddr.isNull()) {
-            stunBinding = new StunBinding(pool);
-            connect(stunBinding, SIGNAL(success()), SLOT(binding_success()));
-            connect(stunBinding, SIGNAL(error(XMPP::StunBinding::Error)),
-                    SLOT(binding_error(XMPP::StunBinding::Error)));
-            stunBinding->start(stunBindAddr, stunBindPort);
-        }
+        do_stun();
+        do_turn();
+    }
 
-        if (!stunRelayAddr.isNull()) {
-            do_turn();
+    void do_stun()
+    {
+        if (stunBindAddr.isNull()) {
+            return;
         }
+        stunBinding = new StunBinding(pool);
+        connect(stunBinding, &StunBinding::success, this, [&]() {
+            refAddr       = stunBinding->reflexiveAddress();
+            refPort       = stunBinding->reflexivePort();
+            refAddrSource = stunBindAddr;
+
+            delete stunBinding;
+            stunBinding = nullptr;
+
+            emit q->addressesChanged();
+        });
+        connect(stunBinding, &StunBinding::error, this, [&](XMPP::StunBinding::Error) {
+            delete stunBinding;
+            stunBinding = nullptr;
+        });
+        stunBinding->start(stunBindAddr, stunBindPort);
     }
 
     void do_turn()
     {
+        if (stunRelayAddr.isNull()) {
+            return;
+        }
         turn = new TurnClient(this);
         turn->setDebugLevel((TurnClient::DebugLevel)debugLevel);
         connect(turn, SIGNAL(connected()), SLOT(turn_connected()));
@@ -347,8 +366,9 @@ class IceLocalTransport::Private : public QObject {
 
             prepareSocket();
 
-            refAddr = QHostAddress();
-            refPort = -1;
+            refAddr       = QHostAddress();
+            refPort       = -1;
+            refAddrSource = QHostAddress();
 
             relAddr = QHostAddress();
             relPort = -1;
@@ -537,29 +557,6 @@ private slots:
 
     void pool_debugLine(const QString &line) { emit q->debugLine(line); }
 
-    void binding_success()
-    {
-        refAddr = stunBinding->reflexiveAddress();
-        refPort = stunBinding->reflexivePort();
-
-        delete stunBinding;
-        stunBinding = nullptr;
-
-        emit q->addressesChanged();
-    }
-
-    void binding_error(XMPP::StunBinding::Error e)
-    {
-        Q_UNUSED(e);
-
-        delete stunBinding;
-        stunBinding = nullptr;
-
-        // don't report any error
-        // if(stunType == IceLocalTransport::Basic || (stunType == IceLocalTransport::Auto && !turn))
-        //    emit q->addressesChanged();
-    }
-
     void turn_connected()
     {
         if (debugLevel >= IceTransport::DL_Info)
@@ -591,8 +588,9 @@ private slots:
         // take reflexive address from TURN only if we are not using a
         //   separate STUN server
         if (stunBindAddr.isNull() || stunBindAddr == stunRelayAddr) {
-            refAddr = allocate->reflexiveAddress();
-            refPort = allocate->reflexivePort();
+            refAddr       = allocate->reflexiveAddress();
+            refPort       = allocate->reflexivePort();
+            refAddrSource = stunRelayAddr;
         }
 
         if (debugLevel >= IceTransport::DL_Info)
@@ -685,9 +683,9 @@ void IceLocalTransport::setStunRelayService(const QHostAddress &addr, int port,
     d->stunPass      = pass;
 }
 
-bool IceLocalTransport::hasStunBindService() const { return !d->stunBindAddr.isNull(); }
+QHostAddress IceLocalTransport::stunBindServiceAddress() const { return d->stunBindAddr; }
 
-bool IceLocalTransport::hasStunRelayService() const { return !d->stunRelayAddr.isNull(); }
+QHostAddress IceLocalTransport::stunRelayServiceAddress() const { return d->stunRelayAddr; }
 
 void IceLocalTransport::stunStart() { d->stunStart(); }
 
@@ -699,6 +697,8 @@ QHostAddress IceLocalTransport::serverReflexiveAddress() const { return d->refAd
 
 int IceLocalTransport::serverReflexivePort() const { return d->refPort; }
 
+QHostAddress IceLocalTransport::reflexiveAddressSource() const { return d->refAddrSource; }
+
 QHostAddress IceLocalTransport::relayedAddress() const { return d->relAddr; }
 
 int IceLocalTransport::relayedPort() const { return d->relPort; }
diff --git a/src/irisnet/noncore/icelocaltransport.h b/src/irisnet/noncore/icelocaltransport.h
index 9992fbbd..f6c599f5 100644
--- a/src/irisnet/noncore/icelocaltransport.h
+++ b/src/irisnet/noncore/icelocaltransport.h
@@ -59,8 +59,8 @@ class IceLocalTransport : public IceTransport, public QEnableSharedFromThis<IceL
     void setStunBindService(const QHostAddress &addr, int port);
     void setStunRelayService(const QHostAddress &addr, int port, const QString &user, const QCA::SecureArray &pass);
 
-    bool hasStunBindService() const;
-    bool hasStunRelayService() const;
+    QHostAddress stunBindServiceAddress() const;
+    QHostAddress stunRelayServiceAddress() const;
 
     // obtain relay / reflexive
     void stunStart();
@@ -70,6 +70,7 @@ class IceLocalTransport : public IceTransport, public QEnableSharedFromThis<IceL
 
     QHostAddress serverReflexiveAddress() const;
     int          serverReflexivePort() const;
+    QHostAddress reflexiveAddressSource() const; // address of stun/turn server provided the srflx
 
     QHostAddress relayedAddress() const;
     int          relayedPort() const;
diff --git a/src/irisnet/noncore/noncore.pri b/src/irisnet/noncore/noncore.pri
index c4b0e005..157ba764 100644
--- a/src/irisnet/noncore/noncore.pri
+++ b/src/irisnet/noncore/noncore.pri
@@ -14,6 +14,7 @@ INCLUDEPATH += $$PWD/../corelib
 include($$PWD/cutestuff/cutestuff.pri)
 
 HEADERS += \
+    $$PWD/iceagent.h \
     $$PWD/processquit.h \
     $$PWD/stunutil.h \
     $$PWD/stunmessage.h \
@@ -31,6 +32,7 @@ HEADERS += \
     $$PWD/tcpportreserver.h
 
 SOURCES += \
+    $$PWD/iceagent.cpp \
     $$PWD/processquit.cpp \
     $$PWD/stunutil.cpp \
     $$PWD/stunmessage.cpp \
diff --git a/src/irisnet/noncore/stunbinding.cpp b/src/irisnet/noncore/stunbinding.cpp
index 56cb5b48..a3ad10e1 100644
--- a/src/irisnet/noncore/stunbinding.cpp
+++ b/src/irisnet/noncore/stunbinding.cpp
@@ -197,6 +197,8 @@ void StunBinding::setPriority(quint32 i)
     d->extPriority     = i;
 }
 
+quint32 StunBinding::priority() const { return d->extPriority; }
+
 void StunBinding::setUseCandidate(bool enabled) { d->extUseCandidate = enabled; }
 
 bool StunBinding::useCandidate() const { return d->extUseCandidate; }
diff --git a/src/irisnet/noncore/stunbinding.h b/src/irisnet/noncore/stunbinding.h
index ca0d8264..8ae244e5 100644
--- a/src/irisnet/noncore/stunbinding.h
+++ b/src/irisnet/noncore/stunbinding.h
@@ -36,11 +36,12 @@ class StunBinding : public QObject {
     ~StunBinding();
 
     // for ICE-use only
-    void setPriority(quint32 i);
-    void setUseCandidate(bool enabled);
-    bool useCandidate() const;
-    void setIceControlling(quint64 i);
-    void setIceControlled(quint64 i);
+    void    setPriority(quint32 i);
+    quint32 priority() const;
+    void    setUseCandidate(bool enabled);
+    bool    useCandidate() const;
+    void    setIceControlling(quint64 i);
+    void    setIceControlled(quint64 i);
 
     void setShortTermUsername(const QString &username);
     void setShortTermPassword(const QString &password);
diff --git a/src/irisnet/noncore/turnclient.cpp b/src/irisnet/noncore/turnclient.cpp
index 87515903..ba21ca23 100644
--- a/src/irisnet/noncore/turnclient.cpp
+++ b/src/irisnet/noncore/turnclient.cpp
@@ -886,6 +886,8 @@ void TurnClient::connectToHost(const QHostAddress &addr, int port, Mode mode)
     d->do_connect();
 }
 
+QHostAddress TurnClient::serverAddress() const { return d->serverAddr; }
+
 QByteArray TurnClient::processIncomingDatagram(const QByteArray &buf, bool notStun, QHostAddress *addr, int *port)
 {
     return d->processNonPoolPacket(buf, notStun, addr, port);
diff --git a/src/irisnet/noncore/turnclient.h b/src/irisnet/noncore/turnclient.h
index 69ccd7f8..1f141c04 100644
--- a/src/irisnet/noncore/turnclient.h
+++ b/src/irisnet/noncore/turnclient.h
@@ -110,6 +110,8 @@ class TurnClient : public QObject {
     // for TCP and TCP-TLS
     void connectToHost(const QHostAddress &addr, int port, Mode mode = PlainMode);
 
+    QHostAddress serverAddress() const;
+
     // for UDP, use this function to process incoming packets instead of
     //   read().
     QByteArray processIncomingDatagram(const QByteArray &buf, bool notStun, QHostAddress *addr, int *port);
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index 6638f71b..9c263755 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -102,29 +102,6 @@ namespace XMPP { namespace Jingle { namespace ICE {
         return out;
     }
 
-    static QChar randomPrintableChar()
-    {
-        // 0-25 = a-z
-        // 26-51 = A-Z
-        // 52-61 = 0-9
-
-        uchar c = QCA::Random::randomChar() % 62;
-        if (c <= 25)
-            return 'a' + c;
-        else if (c <= 51)
-            return 'A' + (c - 26);
-        else
-            return '0' + (c - 52);
-    }
-
-    static QString randomCredential(int len)
-    {
-        QString out;
-        for (int n = 0; n < len; ++n)
-            out += randomPrintableChar();
-        return out;
-    }
-
     // resolve external address and stun server
     // TODO: resolve hosts and start ice engine simultaneously
     // FIXME: when/if our ICE engine supports adding these dynamically, we should

From a349fa5a57752fb09b215ac2ba7258ba39b9fb4c Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sat, 11 Apr 2020 14:45:19 +0300
Subject: [PATCH 132/383] even happier compiler

---
 .gitignore                                    |  2 ++
 src/irisnet/noncore/cutestuff/httpconnect.cpp |  2 +-
 src/jdns/src/qjdns/qjdnsshared.cpp            |  3 +--
 src/xmpp/xmpp-core/protocol.cpp               |  3 +--
 src/xmpp/xmpp-im/client.cpp                   |  6 ++----
 src/xmpp/xmpp-im/xmpp_xmlcommon.cpp           | 12 ++++--------
 tools/icetunnel/main.cpp                      |  2 +-
 7 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index f5a83e70..024469ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,5 @@ object_script.*
 /bin
 /lib
 /plugins
+build-*
+*.pro.user*
diff --git a/src/irisnet/noncore/cutestuff/httpconnect.cpp b/src/irisnet/noncore/cutestuff/httpconnect.cpp
index 9c2c88f5..1371d0c8 100644
--- a/src/irisnet/noncore/cutestuff/httpconnect.cpp
+++ b/src/irisnet/noncore/cutestuff/httpconnect.cpp
@@ -41,7 +41,7 @@ QString escapeOutput(const QByteArray &in)
         } else if (in[n] >= 32 && in[n] < 127) {
             out += QChar::fromLatin1(in[n]);
         } else {
-            out += QString().sprintf("\\x%02x", (unsigned char)in[n]);
+            out += QString::asprintf("\\x%02x", (unsigned char)in[n]);
         }
     }
     return out;
diff --git a/src/jdns/src/qjdns/qjdnsshared.cpp b/src/jdns/src/qjdns/qjdnsshared.cpp
index 6d8f35a1..a47f686f 100644
--- a/src/jdns/src/qjdns/qjdnsshared.cpp
+++ b/src/jdns/src/qjdns/qjdnsshared.cpp
@@ -100,8 +100,7 @@ static bool matchRecordExceptTtl(const QJDns::Record &a, const QJDns::Record &b)
 
 static void getHex(unsigned char in, char *hi, char *lo)
 {
-    QString str;
-    str.sprintf("%02x", in);
+    auto str = QString::asprintf("%02x", in);
     if (!str.isEmpty())
     {
         *hi = str[0].toLatin1();
diff --git a/src/xmpp/xmpp-core/protocol.cpp b/src/xmpp/xmpp-core/protocol.cpp
index 39606957..6d2c821c 100644
--- a/src/xmpp/xmpp-core/protocol.cpp
+++ b/src/xmpp/xmpp-core/protocol.cpp
@@ -45,8 +45,7 @@ static QString printArray(const QByteArray &a)
     for (int n = 0; n < a.size(); ++n) {
         unsigned char c = (unsigned char)a[(int)n];
         if (c < 32 || c >= 127) {
-            QString str;
-            str.sprintf("[%02x]", c);
+            QString str = QString::asprintf("[%02x]", c);
             s += str;
         } else
             s += c;
diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
index f0f7eed3..c146ee36 100644
--- a/src/xmpp/xmpp-im/client.cpp
+++ b/src/xmpp/xmpp-im/client.cpp
@@ -579,8 +579,7 @@ void Client::debug(const QString &str) { emit debugText(str); }
 
 QString Client::genUniqueId()
 {
-    QString s;
-    s.sprintf("a%x", d->id_seed);
+    QString s = QString::asprintf("a%x", d->id_seed);
     d->id_seed += 0x10;
     return s;
 }
@@ -981,8 +980,7 @@ void Client::importRosterItem(const RosterItem &item)
         break;
     }
 
-    QString dstr, str;
-    str.sprintf("  %s %-32s", qPrintable(substr), qPrintable(item.jid().full()));
+    QString dstr, str = QString::asprintf("  %s %-32s", qPrintable(substr), qPrintable(item.jid().full()));
     if (!item.name().isEmpty())
         str += QString(" [") + item.name() + "]";
     str += '\n';
diff --git a/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp b/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
index e73e610a..3414afdf 100644
--- a/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
+++ b/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
@@ -100,10 +100,8 @@ bool stamp2TS(const QString &ts, QDateTime *d)
 
 QString TS2stamp(const QDateTime &d)
 {
-    QString str;
-
-    str.sprintf("%04d%02d%02dT%02d:%02d:%02d", d.date().year(), d.date().month(), d.date().day(), d.time().hour(),
-                d.time().minute(), d.time().second());
+    QString str = QString::asprintf("%04d%02d%02dT%02d:%02d:%02d", d.date().year(), d.date().month(),
+                                    d.date().day(), d.time().hour(), d.time().minute(), d.time().second());
 
     return str;
 }
@@ -326,8 +324,7 @@ QDomElement textTag(QDomDocument &doc, const QString &name, bool content)
 
 QDomElement textTag(QDomDocument &doc, const QString &name, QSize &s)
 {
-    QString str;
-    str.sprintf("%d,%d", s.width(), s.height());
+    QString str = QString::asprintf("%d,%d", s.width(), s.height());
 
     QDomElement tag  = doc.createElement(name);
     QDomText    text = doc.createTextNode(str);
@@ -338,8 +335,7 @@ QDomElement textTag(QDomDocument &doc, const QString &name, QSize &s)
 
 QDomElement textTag(QDomDocument &doc, const QString &name, QRect &r)
 {
-    QString str;
-    str.sprintf("%d,%d,%d,%d", r.x(), r.y(), r.width(), r.height());
+    QString str = QString::asprintf("%d,%d,%d,%d", r.x(), r.y(), r.width(), r.height());
 
     QDomElement tag  = doc.createElement(name);
     QDomText    text = doc.createTextNode(str);
diff --git a/tools/icetunnel/main.cpp b/tools/icetunnel/main.cpp
index 4422ca61..bc79d36e 100644
--- a/tools/icetunnel/main.cpp
+++ b/tools/icetunnel/main.cpp
@@ -100,7 +100,7 @@ static QString urlishEncode(const QString &in)
     for (int n = 0; n < in.length(); ++n) {
         if (in[n] == '%' || in[n] == ',' || in[n] == ';' || in[n] == ' ' || in[n] == '\n') {
             unsigned char c = (unsigned char)in[n].toLatin1();
-            out += QString().sprintf("%%%02x", c);
+            out += QString::asprintf("%%%02x", c);
         } else
             out += in[n];
     }

From 82d108cf75db2163fb6ea7d00a1887f1b6b0e24f Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sat, 11 Apr 2020 15:47:37 +0300
Subject: [PATCH 133/383] Added IceAgent to cmake

---
 src/irisnet/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/irisnet/CMakeLists.txt b/src/irisnet/CMakeLists.txt
index 3141406e..eafb4e7a 100644
--- a/src/irisnet/CMakeLists.txt
+++ b/src/irisnet/CMakeLists.txt
@@ -38,6 +38,7 @@ set(SOURCES
     corelib/netnames.cpp
     corelib/objectsession.cpp
 
+    noncore/iceagent.cpp
     noncore/ice176.cpp
     noncore/icecomponent.cpp
     noncore/icelocaltransport.cpp
@@ -79,6 +80,7 @@ set(HEADERS
     corelib/netnames.h
     corelib/objectsession.h
 
+    noncore/iceagent.h
     noncore/ice176.h
     noncore/icecomponent.h
     noncore/icelocaltransport.h

From 2893be920ac771778d44be5d472cb2cee467a6b1 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 20 Apr 2020 01:34:28 +0300
Subject: [PATCH 134/383] Jingle ICE: reflexive candidates support is ready

---
 src/irisnet/noncore/ice176.cpp       | 119 ++++++++++++---------------
 src/irisnet/noncore/ice176.h         |  35 ++++----
 src/irisnet/noncore/icecomponent.cpp |  28 +++++--
 src/irisnet/noncore/stunbinding.cpp  |  26 ++++--
 src/xmpp/xmpp-im/jingle-ice.cpp      |   9 +-
 tools/icetunnel/main.cpp             |   5 +-
 6 files changed, 111 insertions(+), 111 deletions(-)

diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index 1d4c58ab..2a1ed325 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -168,15 +168,14 @@ class Ice176::Private : public QObject {
     QSet<QWeakPointer<IceTransport>>   iceTransports;
     CheckList                          checkList;
     QList<QList<QByteArray>>           in;
-    bool                               useLocal                     = true;
-    bool                               useStunBind                  = true;
-    bool                               useStunRelayUdp              = true;
-    bool                               useStunRelayTcp              = true;
-    bool                               useTrickle                   = true;
-    bool                               aggressiveNomination         = false; // RFC8445 compliant de default
-    bool                               localGatheringComplete       = false;
-    bool                               remoteGatheringComplete      = false;
-    bool                               expectRemoteCandidatesSignal = true;
+    Features                           remoteFeatures;
+    Features                           localFeatures;
+    bool                               useLocal                = true;
+    bool                               useStunBind             = true;
+    bool                               useStunRelayUdp         = true;
+    bool                               useStunRelayTcp         = true;
+    bool                               localGatheringComplete  = false;
+    bool                               remoteGatheringComplete = false;
 
     Private(Ice176 *_q) : QObject(_q), q(_q)
     {
@@ -522,7 +521,7 @@ class Ice176::Private : public QObject {
 
         if (mode == Ice176::Initiator) {
             pair->binding->setIceControlling(0);
-            if (aggressiveNomination)
+            if (localFeatures & AggressiveNomination)
                 pair->binding->setUseCandidate(true);
         } else
             pair->binding->setIceControlled(0);
@@ -560,19 +559,15 @@ class Ice176::Private : public QObject {
 
     void write(int componentIndex, const QByteArray &datagram)
     {
-        int at = -1;
-        for (int n = 0; n < checkList.pairs.count(); ++n) {
-            if (checkList.pairs[n]->local.componentId - 1 == componentIndex && checkList.pairs[n]->isValid) {
-                at = n;
-                break;
-            }
-        }
-        if (at == -1)
+        auto it = std::find_if(checkList.validPairs.begin(), checkList.validPairs.end(),
+                               [&](const auto &p) { return p->local.componentId - 1 == componentIndex; });
+        if (it == checkList.validPairs.end()) {
+            qDebug("An attempt to write to an ICE component w/o valid sockets");
             return;
+        }
 
-        auto &pair = *checkList.pairs[at];
-
-        at = findLocalCandidate(pair.local.addr.addr, pair.local.addr.port);
+        auto &pair = *it;
+        int   at   = findLocalCandidate(pair->local.addr.addr, pair->local.addr.port);
         if (at == -1) // FIXME: assert?
             return;
 
@@ -580,7 +575,7 @@ class Ice176::Private : public QObject {
 
         int path = lc.path;
 
-        lc.iceTransport->writeDatagram(path, datagram, pair.remote.addr.addr, pair.remote.addr.port);
+        lc.iceTransport->writeDatagram(path, datagram, pair->remote.addr.addr, pair->remote.addr.port);
 
         // DOR-SR?
         QMetaObject::invokeMethod(q, "datagramsWritten", Qt::QueuedConnection, Q_ARG(int, componentIndex),
@@ -638,45 +633,43 @@ class Ice176::Private : public QObject {
     void doTriggeredCheck(const IceComponent::Candidate &locCand, const IceComponent::CandidateInfo &remCand,
                           bool nominated)
     {
-        // let's figure out of this pair already in the check list
+        // let's figure out if this pair already in the check list
         auto it = std::find_if(checkList.pairs.begin(), checkList.pairs.end(), [&](auto const &p) {
             return p->local.isSame(locCand.info) && p->remote.isSame(remCand);
         });
-        if (it == checkList.pairs.end()) {
-            auto pair = makeCandidatesPair(locCand.info, remCand);
+        QSharedPointer<CandidatePair> pair = (it == checkList.pairs.end()) ? QSharedPointer<CandidatePair>() : *it;
+        if (pair) {
+            if (pair->state == CandidatePairState::PSucceeded) {
+                // Check nominated here?
+                printf("Don't do triggered check since pair is already in success state\n");
+                if (mode == Responder && nominated)
+                    tryComponentSuccess(pair);
+                return; // nothing todo. rfc 8445 7.3.1.4
+            }
+            pair->isNominated = false;
+            if (pair->state == CandidatePairState::PInProgress) {
+                pair->binding->cancel();
+            }
+            if (pair->state == PFailed) {
+                // if (state == Stopped) {
+                // TODO Stopped? maybe Failed? and we have to notify the outer world
+                //}
+            }
+        } else {
+            // RFC8445 7.3.1.4.  Triggered Checks / "If the pair is not already on the checklist"
+            pair = makeCandidatesPair(locCand.info, remCand);
             if (pair.isNull()) {
                 return;
             }
-            pair->isTriggeredForNominated = nominated;
-            pair->state                   = PWaiting;
             addChecklistPairs(QList<QSharedPointer<CandidatePair>>() << pair);
-            checkList.triggeredPairs.enqueue(pair.toWeakRef());
-            if (!checkTimer.isActive())
-                checkTimer.start();
-            return;
         }
 
-        QSharedPointer<CandidatePair> p = *it;
-        if (p->state == CandidatePairState::PSucceeded) {
-            // Check nominated here?
-            printf("Don't do triggered check since pair is already in success state\n");
-            if (mode == Responder && nominated)
-                tryComponentSuccess(p);
-            return; // nothing todo. rfc 8445 7.3.1.4
-        }
-        p->isNominated = false;
-        if (p->state == CandidatePairState::PInProgress) {
-            p->binding->cancel();
-        }
-        if (p->state == PFailed) {
-            // if (state == Stopped) {
-            // TODO Stopped? maybe Failed? and we have to notify the outer world
-            //}
-        }
+        pair->state                   = PWaiting;
+        pair->isTriggeredForNominated = nominated;
+        checkList.triggeredPairs.enqueue(pair);
 
-        p->state                   = PWaiting;
-        p->isTriggeredForNominated = nominated;
-        checkList.triggeredPairs.append(p);
+        if (!checkTimer.isActive())
+            checkTimer.start();
     }
 
 private:
@@ -841,7 +834,7 @@ private slots:
             iceTransports += cc.iceTransport;
         }
 
-        if (useTrickle) {
+        if (localFeatures & Trickle) {
             QList<Ice176::Candidate> list;
 
             Ice176::Candidate c;
@@ -919,7 +912,7 @@ private slots:
             }
         }
 
-        if (allLocalFinished && useTrickle) {
+        if (allLocalFinished && (localFeatures & Trickle)) {
             state = Started;
             emit q->started();
         }
@@ -937,7 +930,7 @@ private slots:
         }
         localGatheringComplete = true;
 
-        if (useTrickle) { // It was already started
+        if (localFeatures & Trickle) { // It was already started
             emit q->localGatheringComplete();
             return;
         }
@@ -1074,7 +1067,7 @@ private slots:
                     StunTypes::parsePriority(msg.attribute(StunTypes::PRIORITY), &priority);
                     auto remCand = IceComponent::CandidateInfo::makeRemotePrflx(locCand.info.componentId, fromAddr,
                                                                                 fromPort, priority);
-                    remoteCandidates += remCand;
+                    // remoteCandidates += remCand; // RFC8445 7.2.5.3.2.3 hints we shouldn't do that
                     doTriggeredCheck(locCand, remCand, nominated);
                 } else {
                     doTriggeredCheck(locCand, *it, nominated);
@@ -1195,19 +1188,22 @@ private slots:
 
         // RFC8445 7.2.5.3.1.  Discovering Peer-Reflexive Candidates
         auto mappedAddr = IceComponent::TransportAddress(binding->reflexiveAddress(), binding->reflexivePort());
-        if (pair->local.addr != mappedAddr) {
+        if (pair->local.addr != mappedAddr) { // skip "If the valid pair equals the pair that generated the check"
+
             // so mapped address doesn't match with local candidate sending binding request.
             // gotta find/create one
             auto locIt = std::find_if(localCandidates.begin(), localCandidates.end(), [&](const auto &c) {
                 return c.info.base == mappedAddr || c.info.addr == mappedAddr;
             });
             if (locIt == localCandidates.end()) {
+                // RFC8445 7.2.5.3.1.  Discovering Peer-Reflexive Candidates
                 // new peer-reflexive local candidate discovered
                 components[pair->local.componentId].ic->addLocalPeerReflexiveCandidate(mappedAddr, pair->local,
                                                                                        binding->priority());
                 locIt = std::find_if(localCandidates.begin(), localCandidates.end(),
                                      [&](const auto &c) { return c.info.addr == mappedAddr; }); // just inserted
                 Q_ASSERT(locIt != localCandidates.end());
+                // local candidate wasn't found, so it wasn't on the checklist  RFC8445 7.2.5.3.1.3
                 pair = makeCandidatesPair(locIt->info, pair->remote);
                 // TODO start media flow on valid pair
             } else {
@@ -1232,8 +1228,6 @@ private slots:
         pair->state   = PSucceeded; // what if it was in progress?
         checkList.validPairs.append(pair);
 
-        // TODO add *locIt and pair.remote to valid list
-
         if (mode == Ice176::Initiator) {
             if (!binding->useCandidate())
                 return;
@@ -1242,9 +1236,6 @@ private slots:
                 return;
         }
 
-        // TODO: if we were cool, we'd do something with the peer
-        //   reflexive address received
-
         // check if component already has nominated pair
         it = std::find_if(checkList.pairs.begin(), checkList.pairs.end(), [&](auto const &p) {
             return p->local.componentId == pair->local.componentId && p->isNominated;
@@ -1347,11 +1338,9 @@ void Ice176::setComponentCount(int count)
     d->componentCount = count;
 }
 
-void Ice176::setLocalCandidateTrickle(bool enabled) { d->useTrickle = enabled; }
-
-void Ice176::setAggressiveNomination(bool enabled) { d->aggressiveNomination = enabled; }
+void Ice176::setLocalFeatures(const Features &features) { d->localFeatures = features; }
 
-void Ice176::setExpectRemoteCandidatesSignal(bool enabled) { d->expectRemoteCandidatesSignal = enabled; }
+void Ice176::setRemoteFeatures(const Features &features) { d->remoteFeatures = features; }
 
 void Ice176::start(Mode mode)
 {
diff --git a/src/irisnet/noncore/ice176.h b/src/irisnet/noncore/ice176.h
index beecdc8c..385560f6 100644
--- a/src/irisnet/noncore/ice176.h
+++ b/src/irisnet/noncore/ice176.h
@@ -53,7 +53,7 @@ class Ice176 : public QObject {
         QHostAddress addr;
         int          portBase; // -1 = same as base
 
-        ExternalAddress() : portBase(-1) {}
+        ExternalAddress() : portBase(-1) { }
     };
 
     class Candidate {
@@ -103,26 +103,17 @@ class Ice176 : public QObject {
     void setUseStunRelayTcp(bool enabled);
 
     void setComponentCount(int count);
-    void setLocalCandidateTrickle(bool enabled); // default true
-
-    /**
-     * @brief setAggressiveNomination - local will use aggressive nomination technique of rfc5245 when enabled.
-     *   Note, agressive nomination was deprecated in rfc8445.
-     *   default: false.
-     *
-     * If remote doesn't support "urn:xmpp:jingle:transports:ice:1" this has to be set to true.
-     * @param enabled
-     */
-    void setAggressiveNomination(bool enabled); // agressive nomination was deprecated in rfc8445 (default false)
-
-    /**
-     * @brief setExpectRemoteCandidatesSignal - where remote MUST send remote-candidates.
-     *   default: true
-     *
-     * If remote doesn't support "urn:xmpp:jingle:transports:ice:1" this has to be set to false.
-     * @param enabled
-     */
-    void setExpectRemoteCandidatesSignal(bool enabled);
+
+    enum Feature {
+        Trickle              = 0x1, // additional candidates will be sent later when discovered
+        AggressiveNomination = 0x2, // all the candidates are nominated. so select by priority
+        NotNominatedData     = 0x4, // Data on valid but not nominated candidates is allowed
+        RTPOptimization      = 0x8, // Different formula for RTO, not used in RFC8445
+    };
+    Q_DECLARE_FLAGS(Features, Feature)
+
+    void setLocalFeatures(const Features &features);
+    void setRemoteFeatures(const Features &features);
 
     void start(Mode mode);
     void stop();
@@ -171,6 +162,8 @@ class Ice176 : public QObject {
     friend class Private;
     Private *d;
 };
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(Ice176::Features)
 } // namespace XMPP
 
 #endif // ICE176_H
diff --git a/src/irisnet/noncore/icecomponent.cpp b/src/irisnet/noncore/icecomponent.cpp
index 699b39b5..d66f6585 100644
--- a/src/irisnet/noncore/icecomponent.cpp
+++ b/src/irisnet/noncore/icecomponent.cpp
@@ -135,7 +135,7 @@ class IceComponent::Private : public QObject {
     bool gatheringComplete = false;
     int  debugLevel        = DL_None;
 
-    Private(IceComponent *_q) : QObject(_q), q(_q), sess(this) {}
+    Private(IceComponent *_q) : QObject(_q), q(_q), sess(this) { }
 
     ~Private() { qDeleteAll(udpTransports); }
 
@@ -464,10 +464,9 @@ class IceComponent::Private : public QObject {
             c.iceTransport = lt->sock;
             c.path         = 0;
 
-            localCandidates += c;
             lt->ext_finished = true;
 
-            emit q->candidateAdded(c);
+            storeLocalNotReduntantCandidate(c);
         }
     }
 
@@ -491,6 +490,19 @@ class IceComponent::Private : public QObject {
         }
     }
 
+    void storeLocalNotReduntantCandidate(const Candidate &c)
+    {
+        ObjectSessionWatcher watch(&sess);
+        // RFC8445 5.1.3.  Eliminating Redundant Candidates
+        auto it = std::find_if(localCandidates.begin(), localCandidates.end(), [&](const Candidate &cc) {
+            return cc.info.addr == c.info.addr && cc.info.base == c.info.base && cc.info.priority >= c.info.priority;
+        });
+        if (it == localCandidates.end()) { // not reduntant
+            localCandidates += c;
+            emit q->candidateAdded(c);
+        }
+    }
+
     bool allStopped() const { return udpTransports.isEmpty() && !tcpTurn; }
 
     void tryStopped()
@@ -680,12 +692,9 @@ private slots:
             c.iceTransport = sock->sharedFromThis();
             c.path         = 0;
 
-            localCandidates += c;
             lt->stun_finished = true;
 
-            emit q->candidateAdded(c);
-            if (!watch.isValid())
-                return;
+            storeLocalNotReduntantCandidate(c);
         }
 
         if (!lt->sock->relayedAddress().isNull() && !lt->turn_finished) {
@@ -707,11 +716,12 @@ private slots:
             c.iceTransport = sock->sharedFromThis();
             c.path         = 1;
 
-            localCandidates += c;
             lt->turn_finished = true;
 
-            emit q->candidateAdded(c);
+            storeLocalNotReduntantCandidate(c);
         }
+        if (!watch.isValid())
+            return;
 
         tryGatheringComplete();
     }
diff --git a/src/irisnet/noncore/stunbinding.cpp b/src/irisnet/noncore/stunbinding.cpp
index a3ad10e1..77a501f4 100644
--- a/src/irisnet/noncore/stunbinding.cpp
+++ b/src/irisnet/noncore/stunbinding.cpp
@@ -44,9 +44,9 @@ class StunBinding::Private : public QObject {
     QString stuser, stpass;
     bool    fpRequired = false;
 
-    Private(StunBinding *_q) : QObject(_q), q(_q) {}
+    Private(StunBinding *_q) : QObject(_q), q(_q) { }
 
-    ~Private() {}
+    ~Private() { }
 
     void start(const QHostAddress &_addr = QHostAddress(), int _port = -1)
     {
@@ -71,6 +71,21 @@ class StunBinding::Private : public QObject {
         trans->start(pool, stunAddr, stunPort);
     }
 
+    void cancel()
+    {
+        if (!trans)
+            return;
+        auto t = trans.take();
+        t->disconnect(this);
+        t->cancel(); // will self-delete the transaction either on incoming or timeout
+        // just in case those too
+        addr = QHostAddress();
+        port = 0;
+        errorString.clear();
+
+        // now the binding can be reused
+    }
+
 private slots:
     void trans_createMessage(const QByteArray &transactionId)
     {
@@ -225,12 +240,7 @@ void StunBinding::start() { d->start(); }
 
 void StunBinding::start(const QHostAddress &addr, int port) { d->start(addr, port); }
 
-void StunBinding::cancel()
-{
-    if (d->trans) {
-        d->trans.take()->cancel(); // will self-delete
-    }
-}
+void StunBinding::cancel() { d->cancel(); }
 
 QHostAddress StunBinding::reflexiveAddress() const { return d->addr; }
 
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index 9c263755..c7ecfc15 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -338,7 +338,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
         QHostAddress addr;
         int          port;
 
-        JingleRtpRemoteCandidate() : component(-1), port(-1) {}
+        JingleRtpRemoteCandidate() : component(-1), port(-1) { }
     };
 
     class JingleRtpTrans {
@@ -716,7 +716,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
             // RTP+RTCP
             ice->setComponentCount(channels.count());
 
-            ice->setLocalCandidateTrickle(true);
+            ice->setLocalFeatures(Ice176::Trickle);
 
             auto mode = q->creator() == q->pad()->session()->role() ? XMPP::Ice176::Initiator : XMPP::Ice176::Responder;
             ice->start(mode);
@@ -736,8 +736,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
 
     Transport::~Transport()
     {
-        if (d) {
-        }
+        if (d) { }
     }
 
     void Transport::prepare()
@@ -948,7 +947,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
     //----------------------------------------------------------------
     // Manager
     //----------------------------------------------------------------
-    Manager::Manager(QObject *parent) : TransportManager(parent), d(new Private) {}
+    Manager::Manager(QObject *parent) : TransportManager(parent), d(new Private) { }
 
     Manager::~Manager()
     {
diff --git a/tools/icetunnel/main.cpp b/tools/icetunnel/main.cpp
index bc79d36e..9bf3f865 100644
--- a/tools/icetunnel/main.cpp
+++ b/tools/icetunnel/main.cpp
@@ -422,7 +422,7 @@ class App : public QObject {
     EnterPrompt *                     prompt  = nullptr;
     IceOffer                          inOffer;
 
-    App() : portReserver(this) {}
+    App() : portReserver(this) { }
 
     ~App()
     {
@@ -582,8 +582,7 @@ public slots:
         }
 
         ice->setComponentCount(opt_channels);
-        ice->setLocalCandidateTrickle(false);
-        ice->setAggressiveNomination(true);          // TODO
+        ice->setLocalFeatures(XMPP::Ice176::Trickle | XMPP::Ice176::AggressiveNomination);
         ice->setExpectRemoteCandidatesSignal(false); // TODO
 
         if (!stunAddr.isNull()) {

From 80ce77e9cacf1f9eb6f485dc3821fc2a2db676ed Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 21 Apr 2020 01:21:36 +0300
Subject: [PATCH 135/383] Send all local host candidates at once

---
 src/irisnet/noncore/ice176.cpp     | 60 +++++++++++++++++-------------
 src/irisnet/noncore/iceagent.cpp   |  4 +-
 src/irisnet/noncore/icetransport.h |  2 +-
 tools/icetunnel/main.cpp           |  1 -
 4 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index 2a1ed325..b606fc88 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -99,7 +99,7 @@ class Ice176::Private : public QObject {
     public:
         IceComponent::CandidateInfo local, remote;
         bool                        isDefault               = false; // not used in xmpp
-        bool                        isValid                 = false;
+        bool                        isValid                 = false; // a pair which is also in valid list
         bool                        isNominated             = false;
         bool                        isTriggeredForNominated = false;
         CandidatePairState          state                   = CandidatePairState::PFrozen;
@@ -170,12 +170,13 @@ class Ice176::Private : public QObject {
     QList<QList<QByteArray>>           in;
     Features                           remoteFeatures;
     Features                           localFeatures;
-    bool                               useLocal                = true;
-    bool                               useStunBind             = true;
-    bool                               useStunRelayUdp         = true;
-    bool                               useStunRelayTcp         = true;
-    bool                               localGatheringComplete  = false;
-    bool                               remoteGatheringComplete = false;
+    bool                               useLocal                   = true;
+    bool                               useStunBind                = true;
+    bool                               useStunRelayUdp            = true;
+    bool                               useStunRelayTcp            = true;
+    bool                               localHostGatheringFinished = false;
+    bool                               localGatheringComplete     = false;
+    bool                               remoteGatheringComplete    = false;
 
     Private(Ice176 *_q) : QObject(_q), q(_q)
     {
@@ -796,6 +797,22 @@ class Ice176::Private : public QObject {
         out.type     = candidateType_to_string(cc.info.type);
     }
 
+    void dumpCandidatesAndStart()
+    {
+        QList<Ice176::Candidate> list;
+        for (auto const &cc : localCandidates) {
+            Ice176::Candidate c;
+            toOutCandidate(cc, c);
+            list += c;
+        }
+        if (list.size())
+            emit q->localCandidatesReady(list);
+
+        state = Started;
+        emit q->started();
+        doPairing(localCandidates, remoteCandidates);
+    }
+
     QString generateIdForCandidate()
     {
         QString id;
@@ -834,6 +851,9 @@ private slots:
             iceTransports += cc.iceTransport;
         }
 
+        if (!localHostGatheringFinished)
+            return; // all local IPs will be reported at once
+
         if (localFeatures & Trickle) {
             QList<Ice176::Candidate> list;
 
@@ -901,21 +921,19 @@ private slots:
         IceComponent *ic = static_cast<IceComponent *>(sender());
         int           at = findComponent(ic);
         Q_ASSERT(at != -1);
+        Q_ASSERT(!components[at].localFinished);
 
         components[at].localFinished = true;
 
-        bool allLocalFinished = true;
-        foreach (const Component &c, components) {
+        for (const Component &c : components) {
             if (!c.localFinished) {
-                allLocalFinished = false;
-                break;
+                return;
             }
         }
 
-        if (allLocalFinished && (localFeatures & Trickle)) {
-            state = Started;
-            emit q->started();
-        }
+        localHostGatheringFinished = true;
+        if (localFeatures & Trickle)
+            dumpCandidatesAndStart();
     }
 
     void ic_gatheringComplete()
@@ -935,17 +953,7 @@ private slots:
             return;
         }
 
-        QList<Ice176::Candidate> list;
-        foreach (const IceComponent::Candidate &cc, localCandidates) {
-            Ice176::Candidate c;
-            toOutCandidate(cc, c);
-            list += c;
-        }
-        if (!list.isEmpty())
-            emit q->localCandidatesReady(list);
-
-        state = Started;
-        emit q->started();
+        dumpCandidatesAndStart();
     }
 
     void ic_stopped()
diff --git a/src/irisnet/noncore/iceagent.cpp b/src/irisnet/noncore/iceagent.cpp
index e92ad827..1e8cfde2 100644
--- a/src/irisnet/noncore/iceagent.cpp
+++ b/src/irisnet/noncore/iceagent.cpp
@@ -49,7 +49,7 @@ IceAgent *IceAgent::instance()
     return i;
 }
 
-IceAgent::~IceAgent() {}
+IceAgent::~IceAgent() { }
 
 QString IceAgent::foundation(IceComponent::CandidateType type, const QHostAddress baseAddr,
                              const QHostAddress &stunServAddr, QAbstractSocket::SocketType stunRequestProto)
@@ -75,6 +75,6 @@ QString IceAgent::randomCredential(int len)
     return out;
 }
 
-IceAgent::IceAgent(QObject *parent) : QObject(parent) {}
+IceAgent::IceAgent(QObject *parent) : QObject(parent), d(new Private) { }
 
 } // namespace XMPP
diff --git a/src/irisnet/noncore/icetransport.h b/src/irisnet/noncore/icetransport.h
index a46f1c9c..6b83b11b 100644
--- a/src/irisnet/noncore/icetransport.h
+++ b/src/irisnet/noncore/icetransport.h
@@ -58,7 +58,7 @@ class IceTransport : public QObject {
     void debugLine(const QString &str);
 };
 
-inline uint qHash(const QWeakPointer<IceTransport> &p) { return qHash(p.data()); }
+inline uint qHash(const QWeakPointer<IceTransport> &p) { return qHash(p.toStrongRef().data()); }
 
 } // namespace XMPP
 
diff --git a/tools/icetunnel/main.cpp b/tools/icetunnel/main.cpp
index 9bf3f865..43151a4c 100644
--- a/tools/icetunnel/main.cpp
+++ b/tools/icetunnel/main.cpp
@@ -583,7 +583,6 @@ public slots:
 
         ice->setComponentCount(opt_channels);
         ice->setLocalFeatures(XMPP::Ice176::Trickle | XMPP::Ice176::AggressiveNomination);
-        ice->setExpectRemoteCandidatesSignal(false); // TODO
 
         if (!stunAddr.isNull()) {
             if (opt_stunType == Basic || opt_stunType == Auto)

From 3a5fe0b561d81aacdb0a33c41babd5e1659f4166 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 22 Apr 2020 01:12:32 +0300
Subject: [PATCH 136/383] Fixed a few cppcheck warnings/errors

---
 src/irisnet/noncore/tcpportreserver.cpp | 13 ++++++-----
 src/irisnet/noncore/turnclient.cpp      | 30 ++++++++++++-------------
 src/irisnet/noncore/turnclient.h        |  2 +-
 src/xmpp/xmpp-im/httpfileupload.cpp     |  4 ++--
 4 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/src/irisnet/noncore/tcpportreserver.cpp b/src/irisnet/noncore/tcpportreserver.cpp
index ba4fe14d..9a3affa4 100644
--- a/src/irisnet/noncore/tcpportreserver.cpp
+++ b/src/irisnet/noncore/tcpportreserver.cpp
@@ -26,7 +26,7 @@
 #include <QTcpSocket>
 
 namespace XMPP {
-TcpPortDiscoverer::TcpPortDiscoverer(TcpPortScope *scope) : QObject(scope), scope(scope) {}
+TcpPortDiscoverer::TcpPortDiscoverer(TcpPortScope *scope) : QObject(scope), scope(scope) { }
 
 bool TcpPortDiscoverer::setExternalHost(const QString &extHost, quint16 extPort, const QHostAddress &localAddr,
                                         quint16 localPort)
@@ -62,7 +62,8 @@ TcpPortServer::PortTypes TcpPortDiscoverer::setTypeMask(TcpPortServer::PortTypes
 {
     this->typeMask = mask;
     // drop ready ports if any
-    std::remove_if(servers.begin(), servers.end(), [mask](auto &s) { return !(s->portType() & mask); });
+    auto it = std::remove_if(servers.begin(), servers.end(), [mask](auto &s) { return !(s->portType() & mask); });
+    servers.erase(it, servers.end());
 
     TcpPortServer::PortTypes pendingTypes;
     for (auto &s : servers)
@@ -148,9 +149,9 @@ struct TcpPortScope::Private {
     QHash<QPair<QHostAddress, quint16>, QWeakPointer<TcpPortServer>> servers;
 };
 
-TcpPortScope::TcpPortScope() : d(new Private) {}
+TcpPortScope::TcpPortScope() : d(new Private) { }
 
-TcpPortScope::~TcpPortScope() {}
+TcpPortScope::~TcpPortScope() { }
 
 TcpPortDiscoverer *TcpPortScope::disco()
 {
@@ -206,9 +207,9 @@ TcpPortServer::Ptr TcpPortScope::bind(const QHostAddress &addr, quint16 port)
 // --------------------------------------------------------------------------
 // TcpPortScope
 // --------------------------------------------------------------------------
-TcpPortReserver::TcpPortReserver(QObject *parent) : QObject(parent) {}
+TcpPortReserver::TcpPortReserver(QObject *parent) : QObject(parent) { }
 
-TcpPortReserver::~TcpPortReserver() {}
+TcpPortReserver::~TcpPortReserver() { }
 
 TcpPortScope *TcpPortReserver::scope(const QString &id)
 {
diff --git a/src/irisnet/noncore/turnclient.cpp b/src/irisnet/noncore/turnclient.cpp
index ba21ca23..2051199d 100644
--- a/src/irisnet/noncore/turnclient.cpp
+++ b/src/irisnet/noncore/turnclient.cpp
@@ -34,9 +34,9 @@ namespace XMPP {
 //----------------------------------------------------------------------------
 // TurnClient::Proxy
 //----------------------------------------------------------------------------
-TurnClient::Proxy::Proxy() { t = None; }
+TurnClient::Proxy::Proxy() : t(None) { }
 
-TurnClient::Proxy::~Proxy() {}
+TurnClient::Proxy::~Proxy() { }
 
 int TurnClient::Proxy::type() const { return t; }
 
@@ -78,24 +78,24 @@ class TurnClient::Private : public QObject {
     TurnClient *         q;
     Proxy                proxy;
     QString              clientSoftware;
-    TurnClient::Mode     mode;
+    TurnClient::Mode     mode = PlainMode;
     QHostAddress         serverAddr;
-    int                  serverPort;
+    int                  serverPort = 0;
     ObjectSession        sess;
-    ByteStream *         bs;
-    QCA::TLS *           tls;
-    bool                 tlsHandshaken;
+    ByteStream *         bs            = nullptr;
+    QCA::TLS *           tls           = nullptr;
+    bool                 tlsHandshaken = false;
     QByteArray           inStream;
-    bool                 udp;
-    StunTransactionPool *pool;
-    StunAllocate *       allocate;
-    bool                 allocateStarted;
+    bool                 udp             = false;
+    StunTransactionPool *pool            = nullptr;
+    StunAllocate *       allocate        = nullptr;
+    bool                 allocateStarted = false;
     QString              user;
     QCA::SecureArray     pass;
     QString              realm;
-    int                  retryCount;
+    int                  retryCount = 0;
     QString              errorString;
-    int                  debugLevel;
+    int                  debugLevel = 0;
 
     class WriteItem {
     public:
@@ -106,7 +106,7 @@ class TurnClient::Private : public QObject {
         QHostAddress addr;
         int          port;
 
-        WriteItem(int _size) : type(Other), size(_size), port(-1) {}
+        WriteItem(int _size) : type(Other), size(_size), port(-1) { }
 
         WriteItem(int _size, const QHostAddress &_addr, int _port) : type(Data), size(_size), addr(_addr), port(_port)
         {
@@ -126,7 +126,7 @@ class TurnClient::Private : public QObject {
         // for outbound
         bool requireChannel;
 
-        Packet() : port(-1), requireChannel(false) {}
+        Packet() : port(-1), requireChannel(false) { }
     };
 
     QList<Packet>                in;
diff --git a/src/irisnet/noncore/turnclient.h b/src/irisnet/noncore/turnclient.h
index 1f141c04..2bf3fdc1 100644
--- a/src/irisnet/noncore/turnclient.h
+++ b/src/irisnet/noncore/turnclient.h
@@ -89,7 +89,7 @@ class TurnClient : public QObject {
     private:
         int     t;
         QString v_host;
-        quint16 v_port;
+        quint16 v_port = 0;
         QString v_user, v_pass;
     };
 
diff --git a/src/xmpp/xmpp-im/httpfileupload.cpp b/src/xmpp/xmpp-im/httpfileupload.cpp
index 46253721..0cff4302 100644
--- a/src/xmpp/xmpp-im/httpfileupload.cpp
+++ b/src/xmpp/xmpp-im/httpfileupload.cpp
@@ -255,7 +255,7 @@ const QString &HttpFileUpload::statusString() const { return d->result.statusStr
 
 HttpFileUpload::HttpSlot HttpFileUpload::getHttpSlot()
 {
-    HttpSlot slot;
+    HttpSlot slot {};
     if (d->state == State::Success) {
         slot.get.url         = d->result.getUrl;
         slot.put.url         = d->result.putUrl;
@@ -443,7 +443,7 @@ HttpFileUpload *HttpFileUploadManager::upload(const QString &srcFilename, const
     auto f = new QFile(srcFilename);
     f->open(QIODevice::ReadOnly);
     auto hfu = upload(f, f->size(), dstFilename, mType);
-    connect(hfu, &HttpFileUpload::finished, this, [f](){f->close();});
+    connect(hfu, &HttpFileUpload::finished, this, [f]() { f->close(); });
     f->setParent(hfu);
     return hfu;
 }

From 43e7986c7268e86e5c0b222a4751f7e4f89645e1 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 22 Apr 2020 10:02:33 +0300
Subject: [PATCH 137/383] fixed more cppcheck warnings

---
 src/irisnet/corelib/irisnetglobal.cpp | 8 ++++----
 src/irisnet/corelib/netinterface.cpp  | 6 +++---
 src/xmpp/xmpp-im/xmpp_task.cpp        | 5 ++---
 tools/nettool/main.cpp                | 4 ++--
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/irisnet/corelib/irisnetglobal.cpp b/src/irisnet/corelib/irisnetglobal.cpp
index 4bd0dd23..50f6f1b6 100644
--- a/src/irisnet/corelib/irisnetglobal.cpp
+++ b/src/irisnet/corelib/irisnetglobal.cpp
@@ -39,11 +39,11 @@ extern IrisNetProvider *irisnet_createAppleProvider();
 //----------------------------------------------------------------------------
 class PluginInstance {
 private:
-    QPluginLoader *_loader;
-    QObject *      _instance;
-    bool           _ownInstance;
+    QPluginLoader *_loader      = nullptr;
+    QObject *      _instance    = nullptr;
+    bool           _ownInstance = false;
 
-    PluginInstance() {}
+    PluginInstance() { }
 
 public:
     static PluginInstance *fromFile(const QString &fname)
diff --git a/src/irisnet/corelib/netinterface.cpp b/src/irisnet/corelib/netinterface.cpp
index 4824541d..24966630 100644
--- a/src/irisnet/corelib/netinterface.cpp
+++ b/src/irisnet/corelib/netinterface.cpp
@@ -172,11 +172,11 @@ class NetTrackerThread : public QThread {
 
 private:
     QWaitCondition startCond;
-    QMutex *       startMutex;
+    QMutex *       startMutex = nullptr;
     // these are all protected by global nettracker_mutex.
-    int                      refs;
+    int                      refs = 0;
     static NetTrackerThread *self;
-    NetTracker *             nettracker;
+    NetTracker *             nettracker = nullptr;
 };
 
 NetTrackerThread *NetTrackerThread::self = nullptr;
diff --git a/src/xmpp/xmpp-im/xmpp_task.cpp b/src/xmpp/xmpp-im/xmpp_task.cpp
index aa86cc9f..91a24b0a 100644
--- a/src/xmpp/xmpp-im/xmpp_task.cpp
+++ b/src/xmpp/xmpp-im/xmpp_task.cpp
@@ -141,7 +141,7 @@ void Task::safeDelete()
         deleteLater();
 }
 
-void Task::onGo() {}
+void Task::onGo() { }
 
 void Task::onDisconnect()
 {
@@ -236,8 +236,7 @@ void Task::debug(const char *fmt, ...)
 {
     va_list ap;
     va_start(ap, fmt);
-    QString str;
-    str.vsprintf(fmt, ap);
+    QString str = QString::vasprintf(fmt, ap);
     va_end(ap);
     debug(str);
 }
diff --git a/tools/nettool/main.cpp b/tools/nettool/main.cpp
index 483dea0b..b409d948 100644
--- a/tools/nettool/main.cpp
+++ b/tools/nettool/main.cpp
@@ -115,7 +115,7 @@ static QString dataToString(const QByteArray &buf)
         unsigned char c = (unsigned char)buf[n];
         if (c == '\\')
             out += "\\\\";
-        else if (c >= 0x20 || c < 0x7f)
+        else if (c >= 0x20 && c < 0x7f)
             out += c;
         else
             out += QString("\\x%1").arg((uint)c, 2, 16);
@@ -336,7 +336,7 @@ private slots:
         printf("GONE: [%s]\n", qPrintable(i.instance()));
     }
 
-    void browser_error() {}
+    void browser_error() { }
 };
 
 class ResolveService : public QObject {

From 0ece58c1e0cc5f9c0b29ed4ebe0b466f948adadb Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Thu, 23 Apr 2020 11:18:49 +0300
Subject: [PATCH 138/383] Some bug fixes after refactoring. But not all of them

---
 src/irisnet/noncore/ice176.cpp       |  7 +++---
 src/irisnet/noncore/icecomponent.cpp | 33 ++++++++++++++--------------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index b606fc88..db45e4c9 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -810,7 +810,8 @@ class Ice176::Private : public QObject {
 
         state = Started;
         emit q->started();
-        doPairing(localCandidates, remoteCandidates);
+        if (mode == Responder)
+            doPairing(localCandidates, remoteCandidates);
     }
 
     QString generateIdForCandidate()
@@ -1206,8 +1207,8 @@ private slots:
             if (locIt == localCandidates.end()) {
                 // RFC8445 7.2.5.3.1.  Discovering Peer-Reflexive Candidates
                 // new peer-reflexive local candidate discovered
-                components[pair->local.componentId].ic->addLocalPeerReflexiveCandidate(mappedAddr, pair->local,
-                                                                                       binding->priority());
+                components[findComponent(pair->local.componentId)].ic->addLocalPeerReflexiveCandidate(
+                    mappedAddr, pair->local, binding->priority());
                 locIt = std::find_if(localCandidates.begin(), localCandidates.end(),
                                      [&](const auto &c) { return c.info.addr == mappedAddr; }); // just inserted
                 Q_ASSERT(locIt != localCandidates.end());
diff --git a/src/irisnet/noncore/icecomponent.cpp b/src/irisnet/noncore/icecomponent.cpp
index d66f6585..a47bc9f3 100644
--- a/src/irisnet/noncore/icecomponent.cpp
+++ b/src/irisnet/noncore/icecomponent.cpp
@@ -366,8 +366,9 @@ class IceComponent::Private : public QObject {
         ci.componentId = base.componentId;
         ci.network     = base.network;
 
-        auto baseCand = std::find_if(localCandidates.begin(), localCandidates.end(),
-                                     [&](auto const &c) { return c.info.id == base.id; });
+        auto baseCand = std::find_if(localCandidates.begin(), localCandidates.end(), [&](auto const &c) {
+            return c.info.base == base.base && c.info.type == HostType;
+        });
         Q_ASSERT(baseCand != localCandidates.end());
 
         Candidate c;
@@ -590,21 +591,21 @@ private slots:
         // setup stun/turn
         bool bind  = useStunBind && !config.stunBindAddr.isNull();
         bool relay = useStunRelayUdp && !config.stunRelayUdpAddr.isNull() && !config.stunRelayUdpUser.isEmpty();
-        if (lt->stun_started || !(bind || relay) || lt->addr.protocol() == QAbstractSocket::IPv6Protocol)
-            return;
-
-        lt->sock->setClientSoftwareNameAndVersion(clientSoftware);
-        if (bind) {
-            lt->sock->setStunBindService(config.stunBindAddr, config.stunBindPort);
-        }
-        if (relay) {
-            lt->sock->setStunRelayService(config.stunRelayUdpAddr, config.stunRelayUdpPort, config.stunRelayUdpUser,
-                                          config.stunRelayUdpPass);
+        // if need to start stun/turn
+        if (!lt->stun_started && (bind || relay) && lt->addr.protocol() != QAbstractSocket::IPv6Protocol) {
+            lt->sock->setClientSoftwareNameAndVersion(clientSoftware);
+            if (bind) {
+                lt->sock->setStunBindService(config.stunBindAddr, config.stunBindPort);
+            }
+            if (relay) {
+                lt->sock->setStunRelayService(config.stunRelayUdpAddr, config.stunRelayUdpPort, config.stunRelayUdpUser,
+                                              config.stunRelayUdpPass);
+            }
+            lt->stun_started = true;
+            lt->sock->stunStart();
+            if (!watch.isValid())
+                return;
         }
-        lt->stun_started = true;
-        lt->sock->stunStart();
-        if (!watch.isValid())
-            return;
 
         // check completeness of various stuff
         if (!localFinished) {

From 674f5858faf523a7ebba00bb6ee4f7b4a5fcb4ee Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Thu, 23 Apr 2020 13:55:56 +0300
Subject: [PATCH 139/383] Fixed IPv6 binding requests

Previously implementation ignored address family treating all ass ipv4.
---
 src/irisnet/noncore/ice176.cpp | 27 ++++-----------------------
 1 file changed, 4 insertions(+), 23 deletions(-)

diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index db45e4c9..a711572e 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -1028,33 +1028,14 @@ private slots:
 
                 StunMessage response;
                 response.setClass(StunMessage::SuccessResponse);
-                response.setMethod(0x001);
+                response.setMethod(StunTypes::Binding);
                 response.setId(msg.id());
 
-                quint16       port16 = fromPort;
-                quint32       addr4  = fromAddr.toIPv4Address();
-                QByteArray    val(8, 0);
-                quint8 *      p     = (quint8 *)val.data();
-                const quint8 *magic = response.magic();
-                p[0]                = 0;
-                p[1]                = 0x01;
-                p[2]                = (port16 >> 8) & 0xff;
-                p[2] ^= magic[0];
-                p[3] = port16 & 0xff;
-                p[3] ^= magic[1];
-                p[4] = (addr4 >> 24) & 0xff;
-                p[4] ^= magic[0];
-                p[5] = (addr4 >> 16) & 0xff;
-                p[5] ^= magic[1];
-                p[6] = (addr4 >> 8) & 0xff;
-                p[6] ^= magic[2];
-                p[7] = addr4 & 0xff;
-                p[7] ^= magic[3];
-
                 QList<StunMessage::Attribute> list;
                 StunMessage::Attribute        attr;
-                attr.type  = 0x0020; // XOR-MAPPED-ADDRESS / rfc5389
-                attr.value = val;
+                attr.type = StunTypes::XOR_MAPPED_ADDRESS;
+                attr.value
+                    = StunTypes::createXorPeerAddress(fromAddr, quint16(fromPort), response.magic(), response.id());
                 list += attr;
 
                 response.setAttributes(list);

From 926cd07674d33e1f53cdf3eb4e43b26ad2869392 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Fri, 24 Apr 2020 11:13:16 +0300
Subject: [PATCH 140/383] Check if nomination changeed on attempt to do
 triggered check on already valid pair

Without this a component many times reported componentReady
---
 src/irisnet/noncore/ice176.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index a711572e..d6fdae29 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -643,8 +643,10 @@ class Ice176::Private : public QObject {
             if (pair->state == CandidatePairState::PSucceeded) {
                 // Check nominated here?
                 printf("Don't do triggered check since pair is already in success state\n");
-                if (mode == Responder && nominated)
+                if (mode == Responder && !pair->isNominated && nominated) {
+                    pair->isNominated = true;
                     tryComponentSuccess(pair);
+                }
                 return; // nothing todo. rfc 8445 7.3.1.4
             }
             pair->isNominated = false;
@@ -1214,6 +1216,11 @@ private slots:
             }
         }
 
+        if (!pair) {
+            qWarning("binding success but failed to build a pair with mapped address %s!", qPrintable(mappedAddr));
+            return;
+        }
+
         pair->isValid = true;
         pair->state   = PSucceeded; // what if it was in progress?
         checkList.validPairs.append(pair);

From a648888fa7528cb61d6f84749d146531b81b4eab Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sat, 25 Apr 2020 13:11:37 +0300
Subject: [PATCH 141/383] Use shared pointer for candidates to not update all
 copies

---
 src/irisnet/noncore/ice176.cpp       | 361 +++++++++++++--------------
 src/irisnet/noncore/icecomponent.cpp | 150 +++++------
 src/irisnet/noncore/icecomponent.h   |  16 +-
 tools/icetunnel/main.cpp             |  26 +-
 4 files changed, 261 insertions(+), 292 deletions(-)

diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index d6fdae29..442d8c3f 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -48,12 +48,9 @@ static qint64 calc_pair_priority(int a, int b)
 }
 
 // see if candidates are considered the same for pruning purposes
-static bool compare_candidates(const IceComponent::CandidateInfo &a, const IceComponent::CandidateInfo &b)
+static bool compare_candidates(IceComponent::CandidateInfo::Ptr a, IceComponent::CandidateInfo::Ptr b)
 {
-    if (a.addr == b.addr && a.componentId == b.componentId)
-        return true;
-    else
-        return false;
+    return a->addr == b->addr && a->componentId == b->componentId;
 }
 
 // scope values: 0 = local, 1 = link-local, 2 = private, 3 = public
@@ -97,12 +94,14 @@ class Ice176::Private : public QObject {
 
     class CandidatePair {
     public:
-        IceComponent::CandidateInfo local, remote;
-        bool                        isDefault               = false; // not used in xmpp
-        bool                        isValid                 = false; // a pair which is also in valid list
-        bool                        isNominated             = false;
-        bool                        isTriggeredForNominated = false;
-        CandidatePairState          state                   = CandidatePairState::PFrozen;
+        using Ptr = QSharedPointer<CandidatePair>;
+
+        IceComponent::CandidateInfo::Ptr local, remote;
+        bool                             isDefault               = false; // not used in xmpp
+        bool                             isValid                 = false; // a pair which is also in valid list
+        bool                             isNominated             = false;
+        bool                             isTriggeredForNominated = false;
+        CandidatePairState               state                   = CandidatePairState::PFrozen;
 
         qint64  priority = 0;
         QString foundation; // rfc8445 6.1.2.6 (combination of foundations)
@@ -113,14 +112,14 @@ class Ice176::Private : public QObject {
         //   or such, to multiplex ids
         StunTransactionPool *pool = nullptr;
 
-        inline bool isNull() const { return local.addr.addr.isNull() || remote.addr.addr.isNull(); }
+        inline bool isNull() const { return local->addr.addr.isNull() || remote->addr.addr.isNull(); }
         inline      operator QString() const
         {
             if (isNull())
                 return QLatin1String("null pair");
             return QString(QLatin1String("%1 %2 -> %3 %4"))
-                .arg(candidateType_to_string(local.type), QString(local.addr), candidateType_to_string(remote.type),
-                     QString(remote.addr));
+                .arg(candidateType_to_string(local->type), QString(local->addr), candidateType_to_string(remote->type),
+                     QString(remote->addr));
         }
     };
 
@@ -141,42 +140,42 @@ class Ice176::Private : public QObject {
         bool          lowOverhead   = false;
     };
 
-    Ice176 *                           q;
-    Ice176::Mode                       mode;
-    State                              state = Stopped;
-    QTimer                             checkTimer;
-    TurnClient::Proxy                  proxy;
-    UdpPortReserver *                  portReserver   = nullptr;
-    int                                componentCount = 0;
-    QList<Ice176::LocalAddress>        localAddrs;
-    QList<Ice176::ExternalAddress>     extAddrs;
-    QHostAddress                       stunBindAddr;
-    int                                stunBindPort;
-    QHostAddress                       stunRelayUdpAddr;
-    int                                stunRelayUdpPort;
-    QString                            stunRelayUdpUser;
-    QCA::SecureArray                   stunRelayUdpPass;
-    QHostAddress                       stunRelayTcpAddr;
-    int                                stunRelayTcpPort;
-    QString                            stunRelayTcpUser;
-    QCA::SecureArray                   stunRelayTcpPass;
-    QString                            localUser, localPass;
-    QString                            peerUser, peerPass;
-    QList<Component>                   components;
-    QList<IceComponent::Candidate>     localCandidates;
-    QList<IceComponent::CandidateInfo> remoteCandidates;
-    QSet<QWeakPointer<IceTransport>>   iceTransports;
-    CheckList                          checkList;
-    QList<QList<QByteArray>>           in;
-    Features                           remoteFeatures;
-    Features                           localFeatures;
-    bool                               useLocal                   = true;
-    bool                               useStunBind                = true;
-    bool                               useStunRelayUdp            = true;
-    bool                               useStunRelayTcp            = true;
-    bool                               localHostGatheringFinished = false;
-    bool                               localGatheringComplete     = false;
-    bool                               remoteGatheringComplete    = false;
+    Ice176 *                                q;
+    Ice176::Mode                            mode;
+    State                                   state = Stopped;
+    QTimer                                  checkTimer;
+    TurnClient::Proxy                       proxy;
+    UdpPortReserver *                       portReserver   = nullptr;
+    int                                     componentCount = 0;
+    QList<Ice176::LocalAddress>             localAddrs;
+    QList<Ice176::ExternalAddress>          extAddrs;
+    QHostAddress                            stunBindAddr;
+    int                                     stunBindPort;
+    QHostAddress                            stunRelayUdpAddr;
+    int                                     stunRelayUdpPort;
+    QString                                 stunRelayUdpUser;
+    QCA::SecureArray                        stunRelayUdpPass;
+    QHostAddress                            stunRelayTcpAddr;
+    int                                     stunRelayTcpPort;
+    QString                                 stunRelayTcpUser;
+    QCA::SecureArray                        stunRelayTcpPass;
+    QString                                 localUser, localPass;
+    QString                                 peerUser, peerPass;
+    QList<Component>                        components;
+    QList<IceComponent::Candidate>          localCandidates;
+    QList<IceComponent::CandidateInfo::Ptr> remoteCandidates;
+    QSet<QWeakPointer<IceTransport>>        iceTransports;
+    CheckList                               checkList;
+    QList<QList<QByteArray>>                in;
+    Features                                remoteFeatures;
+    Features                                localFeatures;
+    bool                                    useLocal                   = true;
+    bool                                    useStunBind                = true;
+    bool                                    useStunRelayUdp            = true;
+    bool                                    useStunRelayTcp            = true;
+    bool                                    localHostGatheringFinished = false;
+    bool                                    localGatheringComplete     = false;
+    bool                                    remoteGatheringComplete    = false;
 
     Private(Ice176 *_q) : QObject(_q), q(_q)
     {
@@ -335,39 +334,39 @@ class Ice176::Private : public QObject {
 
     void addRemoteCandidates(const QList<Candidate> &list)
     {
-        QList<IceComponent::CandidateInfo> remoteCandidates;
+        QList<IceComponent::CandidateInfo::Ptr> remoteCandidates;
         for (const Candidate &c : list) {
-            IceComponent::CandidateInfo ci;
-            ci.addr.addr = c.ip;
-            ci.addr.addr.setScopeId(QString());
-            ci.addr.port   = c.port;
-            ci.type        = (IceComponent::CandidateType)string_to_candidateType(c.type); // TODO: handle error
-            ci.componentId = c.component;
-            ci.priority    = c.priority;
-            ci.foundation  = c.foundation;
+            auto ci       = IceComponent::CandidateInfo::Ptr::create();
+            ci->addr.addr = c.ip;
+            ci->addr.addr.setScopeId(QString());
+            ci->addr.port   = c.port;
+            ci->type        = (IceComponent::CandidateType)string_to_candidateType(c.type); // TODO: handle error
+            ci->componentId = c.component;
+            ci->priority    = c.priority;
+            ci->foundation  = c.foundation;
             if (!c.rel_addr.isNull()) {
-                ci.base.addr = c.rel_addr;
-                ci.base.addr.setScopeId(QString());
-                ci.base.port = c.rel_port;
+                ci->base.addr = c.rel_addr;
+                ci->base.addr.setScopeId(QString());
+                ci->base.port = c.rel_port;
             }
-            ci.network = c.network;
-            ci.id      = c.id;
+            ci->network = c.network;
+            ci->id      = c.id;
 
-            // find remote prflx with same addr. we have to replace them instead adding new one. RFC8445 7.3.1.3
+            // find remote prflx with same addr. we have to update them instead adding new one. RFC8445 7.3.1.3
             auto it = std::find_if(this->remoteCandidates.begin(), this->remoteCandidates.end(),
-                                   [&](const IceComponent::CandidateInfo &rc) {
-                                       return ci.addr.addr == rc.addr.addr && ci.addr.port == rc.addr.port
-                                           && ci.componentId == rc.componentId
-                                           && rc.type == IceComponent::PeerReflexiveType;
+                                   [&](IceComponent::CandidateInfo::Ptr rc) {
+                                       return ci->addr == rc->addr && ci->componentId == rc->componentId
+                                           && rc->type == IceComponent::PeerReflexiveType;
                                    });
             if (it != this->remoteCandidates.end()) {
-                it->type       = ci.type;
-                it->foundation = ci.foundation;
-                it->base       = ci.base;
-                it->network    = ci.network;
-                it->id         = ci.id;
-                printf("Previously known remote prflx was updated from signalling: %s:%d",
-                       qPrintable(it->addr.addr.toString()), it->addr.port);
+                (*it)->type = ci->type; // RFC8445 5.1.2.1.  Recommended Formula (peer-reflexive are preferred)
+                                        // B.7.  Why Prefer Peer-Reflexive Candidates?
+                                        // if srflx == prflx -> set srflx because not secure anyway
+                (*it)->foundation = ci->foundation;
+                (*it)->base       = ci->base;
+                (*it)->network    = ci->network;
+                (*it)->id         = ci->id;
+                printf("Previously known remote prflx was updated from signalling: %s", qPrintable((*it)->addr));
             } else {
                 remoteCandidates += ci;
             }
@@ -379,14 +378,14 @@ class Ice176::Private : public QObject {
     }
 
     // returns a pair is pairable or null
-    QSharedPointer<CandidatePair> makeCandidatesPair(const IceComponent::CandidateInfo &lc,
-                                                     const IceComponent::CandidateInfo &rc)
+    QSharedPointer<CandidatePair> makeCandidatesPair(IceComponent::CandidateInfo::Ptr lc,
+                                                     IceComponent::CandidateInfo::Ptr rc)
     {
-        if (lc.componentId != rc.componentId)
+        if (lc->componentId != rc->componentId)
             return {};
 
         // don't pair ipv4 with ipv6.  FIXME: is this right?
-        if (lc.addr.addr.protocol() != rc.addr.addr.protocol())
+        if (lc->addr.addr.protocol() != rc->addr.addr.protocol())
             return {};
 
         // don't relay to localhost.  turnserver
@@ -394,19 +393,19 @@ class Ice176::Private : public QObject {
         //   should qualify as a HACK or not.
         //   trying to relay to localhost is pretty
         //   stupid anyway
-        if (lc.type == IceComponent::RelayedType && getAddressScope(rc.addr.addr) == 0)
+        if (lc->type == IceComponent::RelayedType && getAddressScope(rc->addr.addr) == 0)
             return {};
 
         auto pair    = QSharedPointer<CandidatePair>::create();
         pair->local  = lc;
         pair->remote = rc;
-        if (pair->local.addr.addr.protocol() == QAbstractSocket::IPv6Protocol
-            && isIPv6LinkLocalAddress(pair->local.addr.addr))
-            pair->remote.addr.addr.setScopeId(pair->local.addr.addr.scopeId());
+        if (pair->local->addr.addr.protocol() == QAbstractSocket::IPv6Protocol
+            && isIPv6LinkLocalAddress(pair->local->addr.addr))
+            pair->remote->addr.addr.setScopeId(pair->local->addr.addr.scopeId());
         if (mode == Ice176::Initiator)
-            pair->priority = calc_pair_priority(lc.priority, rc.priority);
+            pair->priority = calc_pair_priority(lc->priority, rc->priority);
         else
-            pair->priority = calc_pair_priority(rc.priority, lc.priority);
+            pair->priority = calc_pair_priority(rc->priority, lc->priority);
 
         return pair;
     }
@@ -420,34 +419,27 @@ class Ice176::Private : public QObject {
         checkList.pairs += pairs;
         std::sort(checkList.pairs.begin(), checkList.pairs.end(),
                   [&](const QSharedPointer<CandidatePair> &a, const QSharedPointer<CandidatePair> &b) {
-                      return a->priority == b->priority ? a->local.componentId < b->local.componentId
+                      return a->priority == b->priority ? a->local->componentId < b->local->componentId
                                                         : a->priority > b->priority;
                   });
 
         // pruning
-        for (auto &pair : checkList.pairs) {
-            if (pair->local.type == IceComponent::ServerReflexiveType)
-                pair->local.addr = pair->local.base;
-        }
-
         for (int n = 0; n < checkList.pairs.count(); ++n) {
             auto &pair = checkList.pairs[n];
-            printf("%d, %s -> %s\n", pair->local.componentId, qPrintable(pair->local.addr),
-                   qPrintable(pair->remote.addr));
+            printf("%d, %s -> %s\n", pair->local->componentId, qPrintable(pair->local->addr),
+                   qPrintable(pair->remote->addr));
 
-            bool found = false;
             for (int i = n - 1; i >= 0; --i) {
-                if (compare_candidates(pair->local, checkList.pairs[i]->local)
-                    && compare_candidates(pair->remote, checkList.pairs[i]->remote)) {
-                    found = true;
+                // RFC8445 says to use base only for reflexive. but base is set properly for host and relayed too.
+                if (pair->local->componentId == checkList.pairs[i]->local->componentId
+                    && pair->local->base == checkList.pairs[i]->local->base
+                    && pair->remote->addr == checkList.pairs[i]->remote->addr) {
+
+                    checkList.pairs.removeAt(n);
+                    --n; // adjust position
                     break;
                 }
             }
-
-            if (found) {
-                checkList.pairs.removeAt(n);
-                --n; // adjust position
-            }
         }
 
         // max pairs is 100 * number of components
@@ -497,15 +489,15 @@ class Ice176::Private : public QObject {
 
     void checkPair(QSharedPointer<CandidatePair> pair)
     {
-        pair->foundation = pair->local.foundation + pair->remote.foundation;
+        pair->foundation = pair->local->foundation + pair->remote->foundation;
         pair->state      = PInProgress;
 
-        int at = findLocalCandidate(pair->local.addr.addr, pair->local.addr.port);
+        int at = findLocalCandidate(pair->local->addr.addr, pair->local->addr.port);
         Q_ASSERT(at != -1);
 
         auto &lc = localCandidates[at];
 
-        Component &c = components[findComponent(lc.info.componentId)];
+        Component &c = components[findComponent(lc.info->componentId)];
 
         pair->pool = new StunTransactionPool(StunTransaction::Udp, this);
         connect(pair->pool, SIGNAL(outgoingMessage(QByteArray, QHostAddress, int)),
@@ -533,19 +525,19 @@ class Ice176::Private : public QObject {
         pair->binding->start();
     }
 
-    void doPairing(const QList<IceComponent::Candidate> &    localCandidates,
-                   const QList<IceComponent::CandidateInfo> &remoteCandidates)
+    void doPairing(const QList<IceComponent::Candidate> &         localCandidates,
+                   const QList<IceComponent::CandidateInfo::Ptr> &remoteCandidates)
     {
         QList<QSharedPointer<CandidatePair>> pairs;
         for (const IceComponent::Candidate &cc : localCandidates) {
-            const IceComponent::CandidateInfo &lc = cc.info;
-            if (lc.type == IceComponent::PeerReflexiveType) {
-                printf("not pairing local prflx. %s\n", qPrintable(lc.addr));
+            auto lc = cc.info;
+            if (lc->type == IceComponent::PeerReflexiveType) {
+                printf("not pairing local prflx. %s\n", qPrintable(lc->addr));
                 // see RFC8445 7.2.5.3.1.  Discovering Peer-Reflexive Candidates
                 continue;
             }
 
-            for (const IceComponent::CandidateInfo &rc : remoteCandidates) {
+            for (IceComponent::CandidateInfo::Ptr rc : remoteCandidates) {
                 auto pair = makeCandidatesPair(lc, rc);
                 if (!pair.isNull())
                     pairs += pair;
@@ -561,14 +553,14 @@ class Ice176::Private : public QObject {
     void write(int componentIndex, const QByteArray &datagram)
     {
         auto it = std::find_if(checkList.validPairs.begin(), checkList.validPairs.end(),
-                               [&](const auto &p) { return p->local.componentId - 1 == componentIndex; });
+                               [&](const auto &p) { return p->local->componentId - 1 == componentIndex; });
         if (it == checkList.validPairs.end()) {
             qDebug("An attempt to write to an ICE component w/o valid sockets");
             return;
         }
 
         auto &pair = *it;
-        int   at   = findLocalCandidate(pair->local.addr.addr, pair->local.addr.port);
+        int   at   = findLocalCandidate(pair->local->addr.addr, pair->local->addr.port);
         if (at == -1) // FIXME: assert?
             return;
 
@@ -576,7 +568,7 @@ class Ice176::Private : public QObject {
 
         int path = lc.path;
 
-        lc.iceTransport->writeDatagram(path, datagram, pair->remote.addr.addr, pair->remote.addr.port);
+        lc.iceTransport->writeDatagram(path, datagram, pair->remote->addr.addr, pair->remote->addr.port);
 
         // DOR-SR?
         QMetaObject::invokeMethod(q, "datagramsWritten", Qt::QueuedConnection, Q_ARG(int, componentIndex),
@@ -597,16 +589,16 @@ class Ice176::Private : public QObject {
         // TODO the pair can change with aggressive validation (?)
         pair->isNominated = true;
 
-        int        at = findComponent(pair->local.componentId);
+        int        at = findComponent(pair->local->componentId);
         Component &c  = components[at];
         if (c.lowOverhead) {
             printf("component is flagged for low overhead.  setting up for %s\n", qPrintable(*pair));
-            at                          = findLocalCandidate(pair->local.addr.addr, pair->local.addr.port);
+            at                          = findLocalCandidate(pair->local->addr.addr, pair->local->addr.port);
             IceComponent::Candidate &cc = localCandidates[at];
-            c.ic->flagPathAsLowOverhead(cc.id, pair->remote.addr.addr, pair->remote.addr.port);
+            c.ic->flagPathAsLowOverhead(cc.id, pair->remote->addr.addr, pair->remote->addr.port);
         }
 
-        emit q->componentReady(pair->local.componentId - 1);
+        emit q->componentReady(pair->local->componentId - 1);
     }
 
     // ice negotiation failed. either initial or on ICE restart
@@ -619,7 +611,7 @@ class Ice176::Private : public QObject {
 
         if (std::find_if(checkList.pairs.begin(), checkList.pairs.end(),
                          [&](auto const &p) mutable {
-                             return p->local.componentId == componentId
+                             return p->local->componentId == componentId
                                  && (p->state != CandidatePairState::PSucceeded
                                      && p->state != CandidatePairState::PFailed);
                          })
@@ -631,20 +623,19 @@ class Ice176::Private : public QObject {
     }
 
     // nominated - out side=responder. and remote request had USE_CANDIDATE
-    void doTriggeredCheck(const IceComponent::Candidate &locCand, const IceComponent::CandidateInfo &remCand,
+    void doTriggeredCheck(const IceComponent::Candidate &locCand, IceComponent::CandidateInfo::Ptr remCand,
                           bool nominated)
     {
         // let's figure out if this pair already in the check list
-        auto it = std::find_if(checkList.pairs.begin(), checkList.pairs.end(), [&](auto const &p) {
-            return p->local.isSame(locCand.info) && p->remote.isSame(remCand);
-        });
-        QSharedPointer<CandidatePair> pair = (it == checkList.pairs.end()) ? QSharedPointer<CandidatePair>() : *it;
+        auto it = std::find_if(checkList.pairs.begin(), checkList.pairs.end(),
+                               [&](auto const &p) { return *(p->local) == locCand.info && *(p->remote) == remCand; });
+
+        CandidatePair::Ptr pair = (it == checkList.pairs.end()) ? CandidatePair::Ptr() : *it;
         if (pair) {
             if (pair->state == CandidatePairState::PSucceeded) {
                 // Check nominated here?
                 printf("Don't do triggered check since pair is already in success state\n");
                 if (mode == Responder && !pair->isNominated && nominated) {
-                    pair->isNominated = true;
                     tryComponentSuccess(pair);
                 }
                 return; // nothing todo. rfc 8445 7.3.1.4
@@ -664,7 +655,7 @@ class Ice176::Private : public QObject {
             if (pair.isNull()) {
                 return;
             }
-            addChecklistPairs(QList<QSharedPointer<CandidatePair>>() << pair);
+            addChecklistPairs(QList<CandidatePair::Ptr>() << pair);
         }
 
         pair->state                   = PWaiting;
@@ -701,7 +692,7 @@ class Ice176::Private : public QObject {
         for (int n = 0; n < localCandidates.count(); ++n) {
             const IceComponent::Candidate &cc = localCandidates[n];
             if (cc.iceTransport == iceTransport && cc.path == path
-                && (withSrvRflx || cc.info.type != IceComponent::ServerReflexiveType))
+                && (withSrvRflx || cc.info->type != IceComponent::ServerReflexiveType))
                 return n;
         }
 
@@ -712,7 +703,7 @@ class Ice176::Private : public QObject {
     {
         for (int n = 0; n < localCandidates.count(); ++n) {
             const IceComponent::Candidate &cc = localCandidates[n];
-            if (cc.info.addr.addr == fromAddr && cc.info.addr.port == fromPort)
+            if (cc.info->addr.addr == fromAddr && cc.info->addr.port == fromPort)
                 return n;
         }
 
@@ -755,48 +746,29 @@ class Ice176::Private : public QObject {
             return -1;
     }
 
-    static int compare_pair(const CandidatePair &a, const CandidatePair &b)
-    {
-        // prefer remote srflx, for leap
-        if (a.remote.type == IceComponent::ServerReflexiveType && b.remote.type != IceComponent::ServerReflexiveType
-            && b.remote.addr.addr.protocol() != QAbstractSocket::IPv6Protocol)
-            return -1;
-        else if (b.remote.type == IceComponent::ServerReflexiveType
-                 && a.remote.type != IceComponent::ServerReflexiveType
-                 && a.remote.addr.addr.protocol() != QAbstractSocket::IPv6Protocol)
-            return 1;
-
-        if (a.priority > b.priority)
-            return -1;
-        else if (b.priority > a.priority)
-            return 1;
-
-        return 0;
-    }
-
     static void toOutCandidate(const IceComponent::Candidate &cc, Ice176::Candidate &out)
     {
-        out.component  = cc.info.componentId;
-        out.foundation = cc.info.foundation;
+        out.component  = cc.info->componentId;
+        out.foundation = cc.info->foundation;
         out.generation = 0; // TODO
-        out.id         = cc.info.id;
-        out.ip         = cc.info.addr.addr;
+        out.id         = cc.info->id;
+        out.ip         = cc.info->addr.addr;
         out.ip.setScopeId(QString());
-        out.network  = cc.info.network;
-        out.port     = cc.info.addr.port;
-        out.priority = cc.info.priority;
+        out.network  = cc.info->network;
+        out.port     = cc.info->addr.port;
+        out.priority = cc.info->priority;
         out.protocol = "udp";
-        if (cc.info.type != IceComponent::HostType) {
-            out.rel_addr = cc.info.base.addr;
+        if (cc.info->type != IceComponent::HostType) {
+            out.rel_addr = cc.info->base.addr;
             out.rel_addr.setScopeId(QString());
-            out.rel_port = cc.info.base.port;
+            out.rel_port = cc.info->base.port;
         } else {
             out.rel_addr = QHostAddress();
             out.rel_port = -1;
         }
         out.rem_addr = QHostAddress();
         out.rem_port = -1;
-        out.type     = candidateType_to_string(cc.info.type);
+        out.type     = candidateType_to_string(cc.info->type);
     }
 
     void dumpCandidatesAndStart()
@@ -822,7 +794,7 @@ class Ice176::Private : public QObject {
         do {
             id = IceAgent::randomCredential(10);
         } while (std::find_if(localCandidates.begin(), localCandidates.end(),
-                              [&id](auto const &c) { return c.info.id == id; })
+                              [&id](auto const &c) { return c.info->id == id; })
                  != localCandidates.end());
         return id;
     }
@@ -838,13 +810,13 @@ private slots:
     {
         IceComponent::Candidate cc = _cc;
 
-        cc.info.id = generateIdForCandidate();
+        cc.info->id = generateIdForCandidate();
 
         localCandidates += cc;
 
-        printf("C%d: candidate added: %s %s;%d\n", cc.info.componentId,
-               qPrintable(candidateType_to_string(cc.info.type)), qPrintable(cc.info.addr.addr.toString()),
-               cc.info.addr.port);
+        printf("C%d: candidate added: %s %s;%d\n", cc.info->componentId,
+               qPrintable(candidateType_to_string(cc.info->type)), qPrintable(cc.info->addr.addr.toString()),
+               cc.info->addr.port);
 
         if (!iceTransports.contains(cc.iceTransport)) {
             connect(cc.iceTransport.data(), SIGNAL(readyRead(int)), SLOT(it_readyRead(int)));
@@ -874,14 +846,14 @@ private slots:
     void ic_candidateRemoved(const XMPP::IceComponent::Candidate &cc)
     {
         // TODO
-        printf("C%d: candidate removed: %s;%d\n", cc.info.componentId, qPrintable(cc.info.addr.addr.toString()),
-               cc.info.addr.port);
+        printf("C%d: candidate removed: %s;%d\n", cc.info->componentId, qPrintable(cc.info->addr.addr.toString()),
+               cc.info->addr.port);
 
         QStringList idList;
         for (int n = 0; n < localCandidates.count(); ++n) {
-            if (localCandidates[n].id == cc.id && localCandidates[n].info.componentId == cc.info.componentId) {
+            if (localCandidates[n].id == cc.id && localCandidates[n].info->componentId == cc.info->componentId) {
                 // FIXME: this is rather ridiculous I think
-                idList += localCandidates[n].info.id;
+                idList += localCandidates[n].info->id;
 
                 localCandidates.removeAt(n);
                 --n; // adjust position
@@ -901,7 +873,7 @@ private slots:
         }
 
         for (int n = 0; n < checkList.pairs.count(); ++n) {
-            if (idList.contains(checkList.pairs[n]->local.id)) {
+            if (idList.contains(checkList.pairs[n]->local->id)) {
                 StunBinding *        binding = checkList.pairs[n]->binding;
                 StunTransactionPool *pool    = checkList.pairs[n]->pool;
 
@@ -1016,14 +988,14 @@ private slots:
             if (!msg.isNull() && (msg.mclass() == StunMessage::Request || msg.mclass() == StunMessage::Indication)) {
                 printf("received validated request or indication from %s:%d\n", qPrintable(fromAddr.toString()),
                        fromPort);
-                QString user = QString::fromUtf8(msg.attribute(0x0006)); // USERNAME
+                QString user = QString::fromUtf8(msg.attribute(StunTypes::USERNAME));
                 if (requser != user) {
                     printf("user [%s] is wrong.  it should be [%s].  skipping\n", qPrintable(user),
                            qPrintable(requser));
                     continue;
                 }
 
-                if (msg.method() != 0x001) {
+                if (msg.method() != StunTypes::Binding) {
                     printf("not a binding request.  skipping\n");
                     continue;
                 }
@@ -1046,20 +1018,21 @@ private slots:
                 sock->writeDatagram(path, packet, fromAddr, fromPort);
 
                 auto it        = std::find_if(remoteCandidates.begin(), remoteCandidates.end(),
-                                       [&](const IceComponent::CandidateInfo &remCand) {
-                                           return remCand.componentId == locCand.info.componentId
-                                               && remCand.addr.addr == fromAddr && remCand.addr.port == fromPort;
+                                       [&](IceComponent::CandidateInfo::Ptr remCand) {
+                                           return remCand->componentId == locCand.info->componentId
+                                               && remCand->addr.addr == fromAddr && remCand->addr.port == fromPort;
                                        });
                 bool nominated = false;
                 if (mode == Responder)
                     nominated = msg.hasAttribute(StunTypes::USE_CANDIDATE);
                 if (it == remoteCandidates.end()) {
+                    // RFC8445 7.3.1.3.  Learning Peer-Reflexive Candidates
                     printf("found NEW remote prflx! %s:%d\n", qPrintable(fromAddr.toString()), fromPort);
                     quint32 priority;
                     StunTypes::parsePriority(msg.attribute(StunTypes::PRIORITY), &priority);
-                    auto remCand = IceComponent::CandidateInfo::makeRemotePrflx(locCand.info.componentId, fromAddr,
+                    auto remCand = IceComponent::CandidateInfo::makeRemotePrflx(locCand.info->componentId, fromAddr,
                                                                                 fromPort, priority);
-                    // remoteCandidates += remCand; // RFC8445 7.2.5.3.2.3 hints we shouldn't do that
+                    remoteCandidates += remCand;
                     doTriggeredCheck(locCand, remCand, nominated);
                 } else {
                     doTriggeredCheck(locCand, *it, nominated);
@@ -1071,13 +1044,13 @@ private slots:
                 if (!msg.isNull()
                     && (msg.mclass() == StunMessage::SuccessResponse || msg.mclass() == StunMessage::ErrorResponse)) {
                     printf("received validated response from %s:%d to %s\n", qPrintable(fromAddr.toString()), fromPort,
-                           qPrintable(locCand.info.addr));
+                           qPrintable(locCand.info->addr));
 
                     // FIXME: this is so gross and completely defeats the point of having pools
                     for (int n = 0; n < checkList.pairs.count(); ++n) {
                         CandidatePair &pair = *checkList.pairs[n];
-                        if (pair.state == PInProgress && pair.local.addr.addr == locCand.info.addr.addr
-                            && pair.local.addr.port == locCand.info.addr.port)
+                        if (pair.state == PInProgress && pair.local->addr.addr == locCand.info->addr.addr
+                            && pair.local->addr.port == locCand.info->addr.port)
                             pair.pool->writeIncomingMessage(msg);
                     }
                 } else {
@@ -1092,8 +1065,8 @@ private slots:
                     int at = -1;
                     for (int n = 0; n < checkList.pairs.count(); ++n) {
                         CandidatePair &pair = *checkList.pairs[n];
-                        if (pair.local.addr.addr == locCand.info.addr.addr
-                            && pair.local.addr.port == locCand.info.addr.port) {
+                        if (pair.local->addr.addr == locCand.info->addr.addr
+                            && pair.local->addr.port == locCand.info->addr.port) {
                             at = n;
                             break;
                         }
@@ -1103,7 +1076,7 @@ private slots:
                         continue;
                     }
 
-                    int componentIndex = checkList.pairs[at]->local.componentId - 1;
+                    int componentIndex = checkList.pairs[at]->local->componentId - 1;
                     // printf("packet is considered to be application data for component index %d\n", componentIndex);
 
                     // FIXME: this assumes components are ordered by id in our local arrays
@@ -1141,7 +1114,7 @@ private slots:
 
         CandidatePair &pair = *checkList.pairs[at];
 
-        at = findLocalCandidate(pair.local.addr.addr, pair.local.addr.port);
+        at = findLocalCandidate(pair.local->addr.addr, pair.local->addr.port);
         if (at == -1) // FIXME: assert?
             return;
 
@@ -1149,10 +1122,10 @@ private slots:
 
         int path = lc.path;
 
-        printf("connectivity check from %s:%d to %s:%d %s\n", qPrintable(pair.local.addr.addr.toString()),
-               pair.local.addr.port, qPrintable(pair.remote.addr.addr.toString()), pair.remote.addr.port,
+        printf("connectivity check from %s:%d to %s:%d %s\n", qPrintable(pair.local->addr.addr.toString()),
+               pair.local->addr.port, qPrintable(pair.remote->addr.addr.toString()), pair.remote->addr.port,
                pair.isNominated ? (mode == Initiator ? "(nominating)" : "(triggered check for nominated)") : "");
-        lc.iceTransport->writeDatagram(path, packet, pair.remote.addr.addr, pair.remote.addr.port);
+        lc.iceTransport->writeDatagram(path, packet, pair.remote->addr.addr, pair.remote->addr.port);
     }
 
     void binding_success()
@@ -1180,20 +1153,20 @@ private slots:
 
         // RFC8445 7.2.5.3.1.  Discovering Peer-Reflexive Candidates
         auto mappedAddr = IceComponent::TransportAddress(binding->reflexiveAddress(), binding->reflexivePort());
-        if (pair->local.addr != mappedAddr) { // skip "If the valid pair equals the pair that generated the check"
+        if (pair->local->addr != mappedAddr) { // skip "If the valid pair equals the pair that generated the check"
 
             // so mapped address doesn't match with local candidate sending binding request.
             // gotta find/create one
             auto locIt = std::find_if(localCandidates.begin(), localCandidates.end(), [&](const auto &c) {
-                return c.info.base == mappedAddr || c.info.addr == mappedAddr;
+                return c.info->base == mappedAddr || c.info->addr == mappedAddr;
             });
             if (locIt == localCandidates.end()) {
                 // RFC8445 7.2.5.3.1.  Discovering Peer-Reflexive Candidates
                 // new peer-reflexive local candidate discovered
-                components[findComponent(pair->local.componentId)].ic->addLocalPeerReflexiveCandidate(
+                components[findComponent(pair->local->componentId)].ic->addLocalPeerReflexiveCandidate(
                     mappedAddr, pair->local, binding->priority());
                 locIt = std::find_if(localCandidates.begin(), localCandidates.end(),
-                                     [&](const auto &c) { return c.info.addr == mappedAddr; }); // just inserted
+                                     [&](const auto &c) { return c.info->addr == mappedAddr; }); // just inserted
                 Q_ASSERT(locIt != localCandidates.end());
                 // local candidate wasn't found, so it wasn't on the checklist  RFC8445 7.2.5.3.1.3
                 pair = makeCandidatesPair(locIt->info, pair->remote);
@@ -1202,7 +1175,7 @@ private slots:
                 // local candidate found. If it's a part of a pair on checklist, we have to add this pair to valid list,
                 // otherwise we have to create a new pair and add it to valid list
                 it = std::find_if(checkList.pairs.begin(), checkList.pairs.end(), [&](auto const &p) {
-                    return p->local.id == locIt->info.id && p->remote.addr == pair->remote.addr;
+                    return p->local->id == locIt->info->id && p->remote->addr == pair->remote->addr;
                 });
                 if (it == checkList.pairs.constEnd()) {
                     pair = makeCandidatesPair(locIt->info, pair->remote);
@@ -1235,11 +1208,11 @@ private slots:
 
         // check if component already has nominated pair
         it = std::find_if(checkList.pairs.begin(), checkList.pairs.end(), [&](auto const &p) {
-            return p->local.componentId == pair->local.componentId && p->isNominated;
+            return p->local->componentId == pair->local->componentId && p->isNominated;
         });
 
         if (it != checkList.pairs.end()) {
-            printf("component %d already active, not signalling\n", pair->local.componentId);
+            printf("component %d already active, not signalling\n", pair->local->componentId);
             return;
         }
         tryComponentSuccess(pair);
@@ -1273,7 +1246,7 @@ private slots:
             return;
         }
 
-        tryComponentFailed(pair.local.componentId);
+        tryComponentFailed(pair.local->componentId);
     }
 };
 
diff --git a/src/irisnet/noncore/icecomponent.cpp b/src/irisnet/noncore/icecomponent.cpp
index a47bc9f3..59fc3ebf 100644
--- a/src/irisnet/noncore/icecomponent.cpp
+++ b/src/irisnet/noncore/icecomponent.cpp
@@ -354,20 +354,20 @@ class IceComponent::Private : public QObject {
     }
 
     void addLocalPeerReflexiveCandidate(const IceComponent::TransportAddress &addr,
-                                        const IceComponent::CandidateInfo &base, quint32 priority)
+                                        IceComponent::CandidateInfo::Ptr base, quint32 priority)
     {
-        IceComponent::CandidateInfo ci;
-        ci.addr = addr;
-        ci.addr.addr.setScopeId(QString());
-        ci.base        = base.addr;
-        ci.type        = IceComponent::PeerReflexiveType;
-        ci.priority    = priority;
-        ci.foundation  = IceAgent::instance()->foundation(IceComponent::PeerReflexiveType, ci.base.addr);
-        ci.componentId = base.componentId;
-        ci.network     = base.network;
+        auto ci  = IceComponent::CandidateInfo::Ptr::create();
+        ci->addr = addr;
+        ci->addr.addr.setScopeId(QString());
+        ci->base        = base->addr;
+        ci->type        = IceComponent::PeerReflexiveType;
+        ci->priority    = priority;
+        ci->foundation  = IceAgent::instance()->foundation(IceComponent::PeerReflexiveType, ci->base.addr);
+        ci->componentId = base->componentId;
+        ci->network     = base->network;
 
         auto baseCand = std::find_if(localCandidates.begin(), localCandidates.end(), [&](auto const &c) {
-            return c.info.base == base.base && c.info.type == HostType;
+            return c.info->base == base->base && c.info->type == HostType;
         });
         Q_ASSERT(baseCand != localCandidates.end());
 
@@ -448,16 +448,16 @@ class IceComponent::Private : public QObject {
     void ensureExt(LocalTransport *lt, int addrAt)
     {
         if (!lt->extAddr.isNull() && !lt->ext_finished) {
-            CandidateInfo ci;
-            ci.addr.addr   = lt->extAddr;
-            ci.addr.port   = lt->sock->localPort();
-            ci.type        = ServerReflexiveType;
-            ci.componentId = id;
-            ci.priority    = choose_default_priority(ci.type, 65535 - addrAt, lt->isVpn, ci.componentId);
-            ci.base.addr   = lt->sock->localAddress();
-            ci.base.port   = lt->sock->localPort();
-            ci.network     = lt->network;
-            ci.foundation  = IceAgent::instance()->foundation(ServerReflexiveType, ci.base.addr);
+            auto ci         = CandidateInfo::Ptr::create();
+            ci->addr.addr   = lt->extAddr;
+            ci->addr.port   = lt->sock->localPort();
+            ci->type        = ServerReflexiveType;
+            ci->componentId = id;
+            ci->priority    = choose_default_priority(ci->type, 65535 - addrAt, lt->isVpn, ci->componentId);
+            ci->base.addr   = lt->sock->localAddress();
+            ci->base.port   = lt->sock->localPort();
+            ci->network     = lt->network;
+            ci->foundation  = IceAgent::instance()->foundation(ServerReflexiveType, ci->base.addr);
 
             Candidate c;
             c.id           = getId();
@@ -496,7 +496,8 @@ class IceComponent::Private : public QObject {
         ObjectSessionWatcher watch(&sess);
         // RFC8445 5.1.3.  Eliminating Redundant Candidates
         auto it = std::find_if(localCandidates.begin(), localCandidates.end(), [&](const Candidate &cc) {
-            return cc.info.addr == c.info.addr && cc.info.base == c.info.base && cc.info.priority >= c.info.priority;
+            return cc.info->addr == c.info->addr && cc.info->base == c.info->base
+                && cc.info->priority >= c.info->priority;
         });
         if (it == localCandidates.end()) { // not reduntant
             localCandidates += c;
@@ -561,15 +562,15 @@ private slots:
         ObjectSessionWatcher watch(&sess);
 
         if (useLocal) {
-            CandidateInfo ci;
-            ci.addr.addr   = lt->sock->localAddress();
-            ci.addr.port   = lt->sock->localPort();
-            ci.type        = HostType;
-            ci.componentId = id;
-            ci.priority    = choose_default_priority(ci.type, 65535 - addrAt, lt->isVpn, ci.componentId);
-            ci.base        = ci.addr;
-            ci.network     = lt->network;
-            ci.foundation  = IceAgent::instance()->foundation(HostType, ci.base.addr);
+            auto ci         = CandidateInfo::Ptr::create();
+            ci->addr.addr   = lt->sock->localAddress();
+            ci->addr.port   = lt->sock->localPort();
+            ci->type        = HostType;
+            ci->componentId = id;
+            ci->priority    = choose_default_priority(ci->type, 65535 - addrAt, lt->isVpn, ci->componentId);
+            ci->base        = ci->addr;
+            ci->network     = lt->network;
+            ci->foundation  = IceAgent::instance()->foundation(HostType, ci->base.addr);
 
             Candidate c;
             c.id           = getId();
@@ -675,17 +676,17 @@ private slots:
                 }
             }
 
-            CandidateInfo ci;
-            ci.addr.addr   = lt->sock->serverReflexiveAddress();
-            ci.addr.port   = lt->sock->serverReflexivePort();
-            ci.base.addr   = lt->sock->localAddress();
-            ci.base.port   = lt->sock->localPort();
-            ci.type        = ServerReflexiveType;
-            ci.componentId = id;
-            ci.priority    = choose_default_priority(ci.type, 65535 - addrAt, lt->isVpn, ci.componentId);
-            ci.network     = lt->network;
-            ci.foundation  = IceAgent::instance()->foundation(
-                ServerReflexiveType, ci.base.addr, lt->sock->reflexiveAddressSource(), QAbstractSocket::UdpSocket);
+            auto ci         = CandidateInfo::Ptr::create();
+            ci->addr.addr   = lt->sock->serverReflexiveAddress();
+            ci->addr.port   = lt->sock->serverReflexivePort();
+            ci->base.addr   = lt->sock->localAddress();
+            ci->base.port   = lt->sock->localPort();
+            ci->type        = ServerReflexiveType;
+            ci->componentId = id;
+            ci->priority    = choose_default_priority(ci->type, 65535 - addrAt, lt->isVpn, ci->componentId);
+            ci->network     = lt->network;
+            ci->foundation  = IceAgent::instance()->foundation(
+                ServerReflexiveType, ci->base.addr, lt->sock->reflexiveAddressSource(), QAbstractSocket::UdpSocket);
 
             Candidate c;
             c.id           = getId();
@@ -699,17 +700,17 @@ private slots:
         }
 
         if (!lt->sock->relayedAddress().isNull() && !lt->turn_finished) {
-            CandidateInfo ci;
-            ci.addr.addr   = lt->sock->relayedAddress();
-            ci.addr.port   = lt->sock->relayedPort();
-            ci.base.addr   = lt->sock->relayedAddress();
-            ci.base.port   = lt->sock->relayedPort();
-            ci.type        = RelayedType;
-            ci.componentId = id;
-            ci.priority    = choose_default_priority(ci.type, 65535 - addrAt, lt->isVpn, ci.componentId);
-            ci.network     = lt->network;
-            ci.foundation  = IceAgent::instance()->foundation(
-                RelayedType, ci.base.addr, lt->sock->stunRelayServiceAddress(), QAbstractSocket::UdpSocket);
+            auto ci         = CandidateInfo::Ptr::create();
+            ci->addr.addr   = lt->sock->relayedAddress();
+            ci->addr.port   = lt->sock->relayedPort();
+            ci->base.addr   = lt->sock->relayedAddress();
+            ci->base.port   = lt->sock->relayedPort();
+            ci->type        = RelayedType;
+            ci->componentId = id;
+            ci->priority    = choose_default_priority(ci->type, 65535 - addrAt, lt->isVpn, ci->componentId);
+            ci->network     = lt->network;
+            ci->foundation  = IceAgent::instance()->foundation(
+                RelayedType, ci->base.addr, lt->sock->stunRelayServiceAddress(), QAbstractSocket::UdpSocket);
 
             Candidate c;
             c.id           = getId();
@@ -759,16 +760,16 @@ private slots:
         // lower priority by making it seem like the last nic
         int addrAt = 1024;
 
-        CandidateInfo ci;
-        ci.addr.addr   = tcpTurn->relayedAddress();
-        ci.addr.port   = tcpTurn->relayedPort();
-        ci.type        = RelayedType;
-        ci.componentId = id;
-        ci.priority    = choose_default_priority(ci.type, 65535 - addrAt, false, ci.componentId);
-        ci.base        = ci.addr;
-        ci.network     = 0; // not relevant
-        ci.foundation  = IceAgent::instance()->foundation(RelayedType, ci.base.addr, config.stunRelayTcpAddr,
-                                                         QAbstractSocket::TcpSocket);
+        auto ci         = CandidateInfo::Ptr::create();
+        ci->addr.addr   = tcpTurn->relayedAddress();
+        ci->addr.port   = tcpTurn->relayedPort();
+        ci->type        = RelayedType;
+        ci->componentId = id;
+        ci->priority    = choose_default_priority(ci->type, 65535 - addrAt, false, ci->componentId);
+        ci->base        = ci->addr;
+        ci->network     = 0; // not relevant
+        ci->foundation  = IceAgent::instance()->foundation(RelayedType, ci->base.addr, config.stunRelayTcpAddr,
+                                                          QAbstractSocket::TcpSocket);
 
         Candidate c;
         c.id           = getId();
@@ -881,7 +882,7 @@ int IceComponent::peerReflexivePriority(QSharedPointer<IceTransport> iceTranspor
 }
 
 void IceComponent::addLocalPeerReflexiveCandidate(const IceComponent::TransportAddress &addr,
-                                                  const IceComponent::CandidateInfo &base, quint32 priority)
+                                                  IceComponent::CandidateInfo::Ptr base, quint32 priority)
 {
     d->addLocalPeerReflexiveCandidate(addr, base, priority);
 }
@@ -900,17 +901,18 @@ void IceComponent::setDebugLevel(DebugLevel level)
         d->tcpTurn->setDebugLevel((IceTransport::DebugLevel)level);
 }
 
-IceComponent::CandidateInfo IceComponent::CandidateInfo::makeRemotePrflx(int componentId, const QHostAddress &fromAddr,
-                                                                         quint16 fromPort, quint32 priority)
+IceComponent::CandidateInfo::Ptr IceComponent::CandidateInfo::makeRemotePrflx(int                 componentId,
+                                                                              const QHostAddress &fromAddr,
+                                                                              quint16 fromPort, quint32 priority)
 {
-    IceComponent::CandidateInfo c;
-    c.addr = TransportAddress(fromAddr, fromPort);
-    c.addr.addr.setScopeId(QString());
-    c.type        = PeerReflexiveType;
-    c.priority    = priority;
-    c.foundation  = QUuid::createUuid().toString();
-    c.componentId = componentId;
-    c.network     = -1;
+    auto c  = IceComponent::CandidateInfo::Ptr::create();
+    c->addr = TransportAddress(fromAddr, fromPort);
+    c->addr.addr.setScopeId(QString());
+    c->type        = PeerReflexiveType;
+    c->priority    = priority;
+    c->foundation  = QUuid::createUuid().toString();
+    c->componentId = componentId;
+    c->network     = -1;
     return c;
 }
 
diff --git a/src/irisnet/noncore/icecomponent.h b/src/irisnet/noncore/icecomponent.h
index 01ee48d3..956b3974 100644
--- a/src/irisnet/noncore/icecomponent.h
+++ b/src/irisnet/noncore/icecomponent.h
@@ -41,9 +41,9 @@ class IceComponent : public QObject {
         QHostAddress addr;
         int          port;
 
-        TransportAddress() : port(-1) {}
+        TransportAddress() : port(-1) { }
 
-        TransportAddress(const QHostAddress &_addr, int _port) : addr(_addr), port(_port) {}
+        TransportAddress(const QHostAddress &_addr, int _port) : addr(_addr), port(_port) { }
 
         bool operator==(const TransportAddress &other) const
         {
@@ -59,6 +59,8 @@ class IceComponent : public QObject {
 
     class CandidateInfo {
     public:
+        using Ptr = QSharedPointer<CandidateInfo>;
+
         CandidateType type;
         int           priority;
         int           componentId;
@@ -71,9 +73,9 @@ class IceComponent : public QObject {
         QString foundation;
         QString id;
 
-        static CandidateInfo makeRemotePrflx(int componentId, const QHostAddress &fromAddr, quint16 fromPort,
-                                             quint32 priority);
-        inline bool isSame(const CandidateInfo &o) const { return addr == o.addr && componentId == o.componentId; }
+        static Ptr  makeRemotePrflx(int componentId, const QHostAddress &fromAddr, quint16 fromPort, quint32 priority);
+        inline bool operator==(const CandidateInfo &o) const { return addr == o.addr && componentId == o.componentId; }
+        inline bool operator==(CandidateInfo::Ptr o) const { return *this == *o; }
     };
 
     class Candidate {
@@ -86,7 +88,7 @@ class IceComponent : public QObject {
         //   is up to the user to create the candidate id.
         // info.foundation is also unset, since awareness of all
         //   components and candidates is needed to calculate it.
-        CandidateInfo info;
+        CandidateInfo::Ptr info;
 
         // note that these may be the same for multiple candidates
         QSharedPointer<IceTransport> iceTransport;
@@ -138,7 +140,7 @@ class IceComponent : public QObject {
     // prflx priority to use when replying from this transport/path
     int peerReflexivePriority(QSharedPointer<IceTransport> iceTransport, int path) const;
 
-    void addLocalPeerReflexiveCandidate(const TransportAddress &addr, const CandidateInfo &base, quint32 priority);
+    void addLocalPeerReflexiveCandidate(const TransportAddress &addr, CandidateInfo::Ptr base, quint32 priority);
 
     void flagPathAsLowOverhead(int id, const QHostAddress &addr, int port);
 
diff --git a/tools/icetunnel/main.cpp b/tools/icetunnel/main.cpp
index 43151a4c..6479e71a 100644
--- a/tools/icetunnel/main.cpp
+++ b/tools/icetunnel/main.cpp
@@ -454,9 +454,15 @@ public slots:
     {
         connect(XMPP::ProcessQuit::instance(), SIGNAL(quit()), SLOT(do_quit()));
 
-        connect(&dns, SIGNAL(resultsReady(const QList<XMPP::NameRecord> &)),
-                SLOT(dns_resultsReady(const QList<XMPP::NameRecord> &)));
-        connect(&dns, SIGNAL(error(XMPP::NameResolver::Error)), SLOT(dns_error(XMPP::NameResolver::Error)));
+        connect(&dns, &XMPP::NameResolver::resultsReady, this, [this](const QList<XMPP::NameRecord> &results) {
+            stunAddr = results.first().address();
+            start_ice();
+        });
+        connect(&dns, &XMPP::NameResolver::error, this, [this](XMPP::NameResolver::Error e) {
+            Q_UNUSED(e);
+            printf("Unable to resolve stun host.\n");
+            emit quit();
+        });
 
         if (!opt_stunHost.isEmpty())
             dns.start(opt_stunHost.toLatin1(), XMPP::NameRecord::A);
@@ -637,20 +643,6 @@ private slots:
             emit quit();
     }
 
-    void dns_resultsReady(const QList<XMPP::NameRecord> &results)
-    {
-        stunAddr = results.first().address();
-
-        start_ice();
-    }
-
-    void dns_error(XMPP::NameResolver::Error e)
-    {
-        Q_UNUSED(e);
-        printf("Unable to resolve stun host.\n");
-        emit quit();
-    }
-
     void ice_started()
     {
         if (channels.count() > 1) {

From f0cd546163a3366479374ee6647fa3fdd698d896 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sat, 25 Apr 2020 13:46:05 +0300
Subject: [PATCH 142/383] Get rid of Qt foreach

---
 src/irisnet/appledns/appledns.cpp           | 22 +++++++++----------
 src/irisnet/appledns/qdnssd.cpp             |  8 +++----
 src/irisnet/corelib/netinterface.cpp        |  2 +-
 src/irisnet/corelib/netnames.cpp            | 14 ++++++------
 src/irisnet/corelib/netnames_jdns.cpp       | 10 ++++-----
 src/irisnet/corelib/objectsession.cpp       |  2 +-
 src/irisnet/noncore/cutestuff/httppoll.cpp  |  4 ++--
 src/irisnet/noncore/ice176.cpp              | 12 +++--------
 src/irisnet/noncore/icecomponent.cpp        |  2 +-
 src/irisnet/noncore/icelocaltransport.cpp   |  2 +-
 src/irisnet/noncore/stunmessage.cpp         |  6 +++---
 src/irisnet/noncore/stuntransaction.cpp     | 13 +++++------
 src/irisnet/noncore/stuntypes.cpp           |  2 +-
 src/irisnet/noncore/tcpportreserver.cpp     |  4 ++--
 src/irisnet/noncore/turnclient.cpp          |  4 ++--
 src/irisnet/noncore/udpportreserver.cpp     | 24 ++++++++++-----------
 src/xmpp/xmpp-core/protocol.cpp             |  2 +-
 src/xmpp/xmpp-core/securestream.cpp         | 10 ++++-----
 src/xmpp/xmpp-core/simplesasl.cpp           |  2 +-
 src/xmpp/xmpp-core/stream.cpp               |  8 +++----
 src/xmpp/xmpp-core/tlshandler.cpp           | 16 +++++++-------
 src/xmpp/xmpp-im/client.cpp                 | 12 +++++------
 src/xmpp/xmpp-im/filetransfer.cpp           |  8 +++----
 src/xmpp/xmpp-im/jingle-ice.cpp             | 10 ++++-----
 src/xmpp/xmpp-im/jingle-s5b.cpp             |  4 ++--
 src/xmpp/xmpp-im/s5b.cpp                    | 24 ++++++++++-----------
 src/xmpp/xmpp-im/types.cpp                  | 20 ++++++++---------
 src/xmpp/xmpp-im/xmpp_caps.cpp              |  2 +-
 src/xmpp/xmpp-im/xmpp_discoitem.cpp         | 16 +++++++-------
 src/xmpp/xmpp-im/xmpp_ibb.cpp               |  2 +-
 src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp |  2 +-
 src/xmpp/xmpp-im/xmpp_tasks.cpp             |  2 +-
 src/xmpp/xmpp-im/xmpp_xdata.cpp             | 12 +++++------
 tools/icetunnel/main.cpp                    |  6 +++---
 34 files changed, 142 insertions(+), 147 deletions(-)

diff --git a/src/irisnet/appledns/appledns.cpp b/src/irisnet/appledns/appledns.cpp
index 33fdd5e6..0a678b0a 100644
--- a/src/irisnet/appledns/appledns.cpp
+++ b/src/irisnet/appledns/appledns.cpp
@@ -44,7 +44,7 @@ static QByteArray nameToDottedString(const QByteArray &in)
 static QMap<QString, QByteArray> textsToAttribs(const QList<QByteArray> &texts)
 {
     QMap<QString, QByteArray> out;
-    foreach (const QByteArray &a, texts) {
+    for (const QByteArray &a : texts) {
         QString    key;
         QByteArray value;
         int        x = a.indexOf('=');
@@ -140,7 +140,7 @@ static XMPP::NameRecord importQDnsSdRecord(const QDnsSd::Record &in)
 namespace {
 class QDnsSdDelegate {
 public:
-    virtual ~QDnsSdDelegate() {}
+    virtual ~QDnsSdDelegate() { }
 
     virtual void dns_queryResult(int id, const QDnsSd::QueryResult &result)
     {
@@ -181,7 +181,7 @@ class IdManager {
     }
 
 public:
-    IdManager() : at(0) {}
+    IdManager() : at(0) { }
 
     int reserveId()
     {
@@ -335,7 +335,7 @@ class AppleBrowse : public QObject, public QDnsSdDelegate {
             return;
         }
 
-        foreach (const QDnsSd::BrowseEntry &e, result.entries) {
+        for (const QDnsSd::BrowseEntry &e : result.entries) {
             XMPP::ServiceInstance si(e.serviceName, e.serviceType, e.replyDomain, QMap<QString, QByteArray>());
 
             if (e.added) {
@@ -400,7 +400,7 @@ class AppleBrowse : public QObject, public QDnsSdDelegate {
 
         // does qdnssd guarantee we won't receive dups?
         bool found = false;
-        foreach (const XMPP::ServiceInstance &i, instances) {
+        for (const XMPP::ServiceInstance &i : instances) {
             if (i.name() == si.name()) {
                 found = true;
                 break;
@@ -556,7 +556,7 @@ class AppleNameProvider : public XMPP::NameProvider, public QDnsSdDelegate {
 public:
     AppleProvider *global;
 
-    AppleNameProvider(AppleProvider *parent) : NameProvider(parent), global(parent) {}
+    AppleNameProvider(AppleProvider *parent) : NameProvider(parent), global(parent) { }
 
     ~AppleNameProvider() { global->stop_all(this); }
 
@@ -586,7 +586,7 @@ class AppleNameProvider : public XMPP::NameProvider, public QDnsSdDelegate {
         }
 
         QList<XMPP::NameRecord> results;
-        foreach (const QDnsSd::Record &rec, result.records) {
+        for (const QDnsSd::Record &rec : result.records) {
             XMPP::NameRecord nr = importQDnsSdRecord(rec);
 
             // unsupported type
@@ -616,7 +616,7 @@ class AppleServiceProvider : public XMPP::ServiceProvider, public QDnsSdDelegate
         int                   id;
         AppleBrowse *         browse;
 
-        Browse(AppleServiceProvider *_parent) : parent(_parent), id(-1), browse(0) {}
+        Browse(AppleServiceProvider *_parent) : parent(_parent), id(-1), browse(0) { }
 
         ~Browse()
         {
@@ -631,7 +631,7 @@ class AppleServiceProvider : public XMPP::ServiceProvider, public QDnsSdDelegate
         int                   id;
         AppleBrowseLookup *   resolve;
 
-        Resolve(AppleServiceProvider *_parent) : parent(_parent), id(-1), resolve(0) {}
+        Resolve(AppleServiceProvider *_parent) : parent(_parent), id(-1), resolve(0) { }
 
         ~Resolve()
         {
@@ -645,7 +645,7 @@ class AppleServiceProvider : public XMPP::ServiceProvider, public QDnsSdDelegate
     QList<Resolve *> resolveList;
     IdManager        idManager;
 
-    AppleServiceProvider(AppleProvider *parent) : ServiceProvider(parent), global(parent) {}
+    AppleServiceProvider(AppleProvider *parent) : ServiceProvider(parent), global(parent) { }
 
     ~AppleServiceProvider()
     {
@@ -856,7 +856,7 @@ private slots:
         delete r;
 
         QList<ResolveResult> results;
-        foreach (const QHostAddress &addr, addrs) {
+        for (const QHostAddress &addr : addrs) {
             ResolveResult r;
             r.address = addr;
             r.port    = port;
diff --git a/src/irisnet/appledns/qdnssd.cpp b/src/irisnet/appledns/qdnssd.cpp
index dda1189c..6b4eeca5 100644
--- a/src/irisnet/appledns/qdnssd.cpp
+++ b/src/irisnet/appledns/qdnssd.cpp
@@ -149,7 +149,7 @@ class IdManager {
     }
 
 public:
-    IdManager() : at(0) {}
+    IdManager() : at(0) { }
 
     int reserveId()
     {
@@ -185,7 +185,7 @@ class QDnsSd::Private : public QObject {
         int        _id;
         RecordRef *_sdref;
 
-        SubRecord(Private *self) : _self(self), _id(-1), _sdref(0) {}
+        SubRecord(Private *self) : _self(self), _id(-1), _sdref(0) { }
 
         ~SubRecord()
         {
@@ -249,7 +249,7 @@ class QDnsSd::Private : public QObject {
     QHash<SafeTimer *, Request *>          _requestsByTimer;
     QHash<int, Request *>                  _requestsByRecId;
 
-    Private(QDnsSd *_q) : QObject(_q), q(_q) {}
+    Private(QDnsSd *_q) : QObject(_q), q(_q) { }
 
     ~Private() { qDeleteAll(_requestsById); }
 
@@ -837,7 +837,7 @@ QByteArray QDnsSd::createTxtRecord(const QList<QByteArray> &strings)
     // split into var/val and validate
     QList<QByteArray> vars;
     QList<QByteArray> vals; // null = no value, empty = empty value
-    foreach (const QByteArray &i, strings) {
+    for (const QByteArray &i : strings) {
         QByteArray var;
         QByteArray val;
         int        n = i.indexOf('=');
diff --git a/src/irisnet/corelib/netinterface.cpp b/src/irisnet/corelib/netinterface.cpp
index 24966630..79c426b9 100644
--- a/src/irisnet/corelib/netinterface.cpp
+++ b/src/irisnet/corelib/netinterface.cpp
@@ -44,7 +44,7 @@ class NetTracker : public QObject {
         QList<IrisNetProvider *> list = irisNetProviders();
 
         c = nullptr;
-        foreach (IrisNetProvider *p, list) {
+        for (IrisNetProvider *p: list) {
             c = p->createNetInterfaceProvider();
             if (c)
                 break;
diff --git a/src/irisnet/corelib/netnames.cpp b/src/irisnet/corelib/netnames.cpp
index ae5099fc..27f9b129 100644
--- a/src/irisnet/corelib/netnames.cpp
+++ b/src/irisnet/corelib/netnames.cpp
@@ -489,7 +489,7 @@ XMPP::NameRecord WeightedNameRecordList::takeNext()
 
     /* Find the new total weight of this priority group */
     int totalWeight = 0;
-    foreach (const XMPP::NameRecord &record, *currentPriorityGroup) {
+    for (const XMPP::NameRecord &record: *currentPriorityGroup) {
         totalWeight += record.weight();
     }
 
@@ -537,8 +537,8 @@ void WeightedNameRecordList::clear()
 void WeightedNameRecordList::append(const XMPP::WeightedNameRecordList &list)
 {
     /* Copy over all records from all groups */
-    foreach (const WeightedNameRecordPriorityGroup &group, list.priorityGroups) {
-        foreach (const NameRecord &record, group) {
+    for (const WeightedNameRecordPriorityGroup &group: list.priorityGroups) {
+        for (const NameRecord &record: group) {
             append(record);
         }
     }
@@ -549,7 +549,7 @@ void WeightedNameRecordList::append(const XMPP::WeightedNameRecordList &list)
 
 void WeightedNameRecordList::append(const QList<XMPP::NameRecord> &list)
 {
-    foreach (const XMPP::NameRecord &record, list) {
+    for (const XMPP::NameRecord &record: list) {
         if (record.type() != XMPP::NameRecord::Srv) {
             continue;
         }
@@ -622,7 +622,7 @@ QDebug operator<<(QDebug dbg, const XMPP::WeightedNameRecordList &list)
 
     dbg.nospace() << "{";
 
-    foreach (int priority, list.priorityGroups.keys()) {
+    for (int priority: list.priorityGroups.keys()) {
         dbg.nospace() << "\t" << priority << "->" << list.priorityGroups.value(priority) << endl;
     }
 
@@ -734,7 +734,7 @@ class NameManager : public QObject {
                 sub_instances_to_remove += it.key();
         }
 
-        foreach (int res_sub_id, sub_instances_to_remove) {
+        for (int res_sub_id: sub_instances_to_remove) {
             res_sub_instances.remove(res_sub_id);
             p_local->resolve_stop(res_sub_id);
         }
@@ -1099,7 +1099,7 @@ void ServiceResolver::clear_resolvers()
 #endif
 
     /* cleanup all resolvers */
-    foreach (XMPP::NameResolver *resolver, d->resolverList) {
+    for (XMPP::NameResolver *resolver: d->resolverList) {
         cleanup_resolver(resolver);
     }
 }
diff --git a/src/irisnet/corelib/netnames_jdns.cpp b/src/irisnet/corelib/netnames_jdns.cpp
index 311d986a..84ec91ac 100644
--- a/src/irisnet/corelib/netnames_jdns.cpp
+++ b/src/irisnet/corelib/netnames_jdns.cpp
@@ -327,7 +327,7 @@ class JDnsGlobal : public QObject {
             //   fetching should not trigger any calls to
             //   updateMulticastInterfaces().  only future
             //   activity should do that.
-            foreach (const QString &id, netman.interfaces()) {
+            for (const QString &id: netman.interfaces()) {
                 NetInterface *iface = new NetInterface(id, &netman);
                 connect(iface, SIGNAL(unavailable()), SLOT(iface_unavailable()));
                 ifaces += iface;
@@ -646,7 +646,7 @@ private slots:
 
         if (req->success()) {
             QList<NameRecord> out;
-            foreach (const QJDns::Record &r, req->results()) {
+            for (const QJDns::Record &r: req->results()) {
                 // unless we are asking for all types, only
                 //   accept the type we asked for
                 if (i->type == QJDns::Any || r.type == i->type) {
@@ -1507,7 +1507,7 @@ public slots:
             doPublishTxt();
 
         // publish extra records as needed
-        foreach (JDnsPublishExtra *extra, extraList) {
+        for (JDnsPublishExtra *extra: extraList) {
             if (!extra->have)
                 doPublishExtra(extra);
         }
@@ -1653,7 +1653,7 @@ private slots:
     {
         QJDnsSharedRequest *req   = static_cast<QJDnsSharedRequest *>(sender());
         JDnsPublishExtra *  extra = 0;
-        foreach (JDnsPublishExtra *e, extraList) {
+        for (JDnsPublishExtra *e: extraList) {
             if (&e->pub == req) {
                 extra = e;
                 break;
@@ -2181,7 +2181,7 @@ class JDnsServiceProvider : public ServiceProvider {
         // remove all extra publishes associated with this publish.
         //   the association can be checked via QObject parenting.
         QSet<PublishExtraItem *> remove;
-        foreach (PublishExtraItem *i, publishExtraItemList.items) {
+        for (PublishExtraItem *i: publishExtraItemList.items) {
             if (static_cast<JDnsPublish *>(i->publish->parent()) == pi->publish)
                 remove += i;
         }
diff --git a/src/irisnet/corelib/objectsession.cpp b/src/irisnet/corelib/objectsession.cpp
index d4f40a14..1b616602 100644
--- a/src/irisnet/corelib/objectsession.cpp
+++ b/src/irisnet/corelib/objectsession.cpp
@@ -124,7 +124,7 @@ class ObjectSessionPrivate : public QObject {
 
     bool havePendingCall(QObject *obj, const char *method) const
     {
-        foreach (const MethodCall *call, pendingCalls) {
+        for (const MethodCall *call: pendingCalls) {
             if (call->obj == obj && qstrcmp(call->method.data(), method) == 0)
                 return true;
         }
diff --git a/src/irisnet/noncore/cutestuff/httppoll.cpp b/src/irisnet/noncore/cutestuff/httppoll.cpp
index 54db6d04..4191fc8f 100644
--- a/src/irisnet/noncore/cutestuff/httppoll.cpp
+++ b/src/irisnet/noncore/cutestuff/httppoll.cpp
@@ -500,7 +500,7 @@ QByteArray HttpProxyPost::body() const { return d->body; }
 
 QString HttpProxyPost::getHeader(const QString &var) const
 {
-    foreach (const QString &s, d->headerLines) {
+    for (const QString &s: d->headerLines) {
         int n = s.indexOf(": ");
         if (n == -1)
             continue;
@@ -773,7 +773,7 @@ void HttpProxyGetStream::stop() { resetConnection(); }
 
 QString HttpProxyGetStream::getHeader(const QString &var) const
 {
-    foreach (const QString &s, d->headerLines) {
+    for (const QString &s: d->headerLines) {
         int n = s.indexOf(": ");
         if (n == -1)
             continue;
diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index 442d8c3f..31f9f2fe 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -47,12 +47,6 @@ static qint64 calc_pair_priority(int a, int b)
     return priority;
 }
 
-// see if candidates are considered the same for pruning purposes
-static bool compare_candidates(IceComponent::CandidateInfo::Ptr a, IceComponent::CandidateInfo::Ptr b)
-{
-    return a->addr == b->addr && a->componentId == b->componentId;
-}
-
 // scope values: 0 = local, 1 = link-local, 2 = private, 3 = public
 // FIXME: dry (this is in psi avcall also)
 static int getAddressScope(const QHostAddress &a)
@@ -246,7 +240,7 @@ class Ice176::Private : public QObject {
             return;
 
         extAddrs.clear();
-        foreach (const ExternalAddress &ea, addrs) {
+        for (const ExternalAddress &ea : addrs) {
             int at = findLocalAddress(ea.base.addr);
             if (at != -1)
                 extAddrs += ea;
@@ -861,7 +855,7 @@ private slots:
         }
 
         bool iceTransportInUse = false;
-        foreach (const IceComponent::Candidate &lc, localCandidates) {
+        for (const IceComponent::Candidate &lc : localCandidates) {
             if (lc.iceTransport == cc.iceTransport) {
                 iceTransportInUse = true;
                 break;
@@ -940,7 +934,7 @@ private slots:
         components[at].stopped = true;
 
         bool allStopped = true;
-        foreach (const Component &c, components) {
+        for (const Component &c : components) {
             if (!c.stopped) {
                 allStopped = false;
                 break;
diff --git a/src/irisnet/noncore/icecomponent.cpp b/src/irisnet/noncore/icecomponent.cpp
index 59fc3ebf..5f5e7c71 100644
--- a/src/irisnet/noncore/icecomponent.cpp
+++ b/src/irisnet/noncore/icecomponent.cpp
@@ -423,7 +423,7 @@ class IceComponent::Private : public QObject {
     {
         for (int n = 0;; ++n) {
             bool found = false;
-            foreach (const Candidate &c, localCandidates) {
+            for (const Candidate &c : localCandidates) {
                 if (c.id == n) {
                     found = true;
                     break;
diff --git a/src/irisnet/noncore/icelocaltransport.cpp b/src/irisnet/noncore/icelocaltransport.cpp
index 3d683772..e12c782e 100644
--- a/src/irisnet/noncore/icelocaltransport.cpp
+++ b/src/irisnet/noncore/icelocaltransport.cpp
@@ -522,7 +522,7 @@ private slots:
         ObjectSessionWatcher watch(&sess);
 
         if (!dwrites.isEmpty()) {
-            foreach (const Written &wr, dwrites) {
+            for (const Written &wr: dwrites) {
                 emit q->datagramsWritten(Direct, wr.count, wr.addr, wr.port);
                 if (!watch.isValid())
                     return;
diff --git a/src/irisnet/noncore/stunmessage.cpp b/src/irisnet/noncore/stunmessage.cpp
index 742b1b20..d1523160 100644
--- a/src/irisnet/noncore/stunmessage.cpp
+++ b/src/irisnet/noncore/stunmessage.cpp
@@ -384,7 +384,7 @@ QByteArray StunMessage::attribute(quint16 type) const
 {
     Q_ASSERT(d);
 
-    foreach (const Attribute &i, d->attribs) {
+    for (const Attribute &i: d->attribs) {
         if (i.type == type)
             return i.value;
     }
@@ -395,7 +395,7 @@ bool StunMessage::hasAttribute(quint16 type) const
 {
     Q_ASSERT(d);
 
-    foreach (const Attribute &i, d->attribs) {
+    for (const Attribute &i: d->attribs) {
         if (i.type == type)
             return true;
     }
@@ -473,7 +473,7 @@ QByteArray StunMessage::toBinary(int validationFlags, const QByteArray &key) con
     memcpy(p + 4, d->magic, 4);
     memcpy(p + 8, d->id, 12);
 
-    foreach (const Attribute &i, d->attribs) {
+    for (const Attribute &i: d->attribs) {
         int at = append_attribute_uninitialized(&buf, i.type, i.value.size());
         if (at == -1)
             return QByteArray();
diff --git a/src/irisnet/noncore/stuntransaction.cpp b/src/irisnet/noncore/stuntransaction.cpp
index 30d040b4..f12d4370 100644
--- a/src/irisnet/noncore/stuntransaction.cpp
+++ b/src/irisnet/noncore/stuntransaction.cpp
@@ -23,6 +23,7 @@
 #include "stuntypes.h"
 #include "stunutil.h"
 
+#include <QElapsedTimer>
 #include <QHash>
 #include <QMetaType>
 #include <QTime>
@@ -137,11 +138,11 @@ class StunTransactionPrivate : public QObject {
     int     last_interval;
     QTimer *t;
 
-    QString    stuser;
-    QString    stpass;
-    bool       fpRequired;
-    QByteArray key;
-    QTime      time;
+    QString       stuser;
+    QString       stpass;
+    bool          fpRequired;
+    QByteArray    key;
+    QElapsedTimer time;
 
     StunTransactionPrivate(StunTransaction *_q) : QObject(_q), q(_q), pool(nullptr), fpRequired(false)
     {
@@ -642,7 +643,7 @@ void StunTransactionPool::continueAfterParams()
     d->needLongTermAuth  = false;
     d->triedLongTermAuth = true;
 
-    foreach (StunTransaction *trans, d->transactions) {
+    for (StunTransaction *trans : d->transactions) {
         // the only reason an inactive transaction would be in the
         //   list is if it is waiting for an auth retry
         if (!trans->d->active && !trans->d->cancelling) {
diff --git a/src/irisnet/noncore/stuntypes.cpp b/src/irisnet/noncore/stuntypes.cpp
index b9a9acc5..36bb0721 100644
--- a/src/irisnet/noncore/stuntypes.cpp
+++ b/src/irisnet/noncore/stuntypes.cpp
@@ -621,7 +621,7 @@ namespace StunTypes {
         out += "Attributes:";
         QList<StunMessage::Attribute> attribs = message.attributes();
         if (!attribs.isEmpty()) {
-            foreach (const StunMessage::Attribute &a, attribs) {
+            for (const StunMessage::Attribute &a: attribs) {
                 out += '\n';
 
                 QString name = attributeTypeToString(a.type);
diff --git a/src/irisnet/noncore/tcpportreserver.cpp b/src/irisnet/noncore/tcpportreserver.cpp
index 9a3affa4..764569f7 100644
--- a/src/irisnet/noncore/tcpportreserver.cpp
+++ b/src/irisnet/noncore/tcpportreserver.cpp
@@ -76,7 +76,7 @@ TcpPortServer::PortTypes TcpPortDiscoverer::setTypeMask(TcpPortServer::PortTypes
 void TcpPortDiscoverer::start()
 {
     QList<QHostAddress> listenAddrs;
-    foreach (const QNetworkInterface &ni, QNetworkInterface::allInterfaces()) {
+    for (const QNetworkInterface &ni: QNetworkInterface::allInterfaces()) {
         if (!(ni.flags() & (QNetworkInterface::IsUp | QNetworkInterface::IsRunning))) {
             continue;
         }
@@ -84,7 +84,7 @@ void TcpPortDiscoverer::start()
             continue;
         }
         QList<QNetworkAddressEntry> entries = ni.addressEntries();
-        foreach (const QNetworkAddressEntry &na, entries) {
+        for (const QNetworkAddressEntry &na: entries) {
             QHostAddress h = na.ip();
             if (h.isLoopback()) {
                 continue;
diff --git a/src/irisnet/noncore/turnclient.cpp b/src/irisnet/noncore/turnclient.cpp
index 2051199d..5eb3ad00 100644
--- a/src/irisnet/noncore/turnclient.cpp
+++ b/src/irisnet/noncore/turnclient.cpp
@@ -505,7 +505,7 @@ class TurnClient::Private : public QObject {
     void ensureChannels(const QList<StunAllocate::Channel> &channels)
     {
         bool changed = false;
-        foreach (const StunAllocate::Channel &c, channels) {
+        for (const StunAllocate::Channel &c: channels) {
             if (!desiredChannels.contains(c)) {
                 if (debugLevel >= TurnClient::DL_Info)
                     emit q->debugLine(
@@ -568,7 +568,7 @@ class TurnClient::Private : public QObject {
     void emitPacketsWritten(const QList<Written> &writtenDests)
     {
         ObjectSessionWatcher watch(&sess);
-        foreach (const Written &wr, writtenDests) {
+        for (const Written &wr: writtenDests) {
             emit q->packetsWritten(wr.count, wr.addr, wr.port);
             if (!watch.isValid())
                 return;
diff --git a/src/irisnet/noncore/udpportreserver.cpp b/src/irisnet/noncore/udpportreserver.cpp
index f70ed28d..ef79231b 100644
--- a/src/irisnet/noncore/udpportreserver.cpp
+++ b/src/irisnet/noncore/udpportreserver.cpp
@@ -44,7 +44,7 @@ class UdpPortReserver::Private : public QObject {
 
         bool haveAddress(const QHostAddress &addr) const
         {
-            foreach (const QUdpSocket *sock, sockList) {
+            for (const QUdpSocket *sock: sockList) {
                 if (sock->localAddress() == addr)
                     return true;
             }
@@ -71,7 +71,7 @@ class UdpPortReserver::Private : public QObject {
     ~Private()
     {
         bool lendingAny = false;
-        foreach (const Item &i, items) {
+        for (const Item &i: items) {
             if (i.lent) {
                 lendingAny = true;
                 break;
@@ -82,7 +82,7 @@ class UdpPortReserver::Private : public QObject {
         if (lendingAny)
             abort();
 
-        foreach (const Item &i, items) {
+        for (const Item &i: items) {
             foreach (QUdpSocket *sock, i.sockList)
                 sock->deleteLater();
         }
@@ -99,9 +99,9 @@ class UdpPortReserver::Private : public QObject {
     void updatePorts(const QList<int> &newPorts)
     {
         QList<int> added;
-        foreach (int x, newPorts) {
+        for (int x: newPorts) {
             bool found = false;
-            foreach (const Item &i, items) {
+            for (const Item &i: items) {
                 if (i.port == x) {
                     found = true;
                     break;
@@ -117,7 +117,7 @@ class UdpPortReserver::Private : public QObject {
         // keep ports in sorted order
         std::sort(ports.begin(), ports.end());
 
-        foreach (int x, added) {
+        for (int x: added) {
             int insert_before = items.count();
             for (int n = 0; n < items.count(); ++n) {
                 if (x < items[n].port) {
@@ -138,7 +138,7 @@ class UdpPortReserver::Private : public QObject {
     bool reservedAll() const
     {
         bool ok = true;
-        foreach (const Item &i, items) {
+        for (const Item &i: items) {
             // skip ports we don't care about
             if (!ports.contains(i.port))
                 continue;
@@ -192,7 +192,7 @@ class UdpPortReserver::Private : public QObject {
 
     void returnSockets(const QList<QUdpSocket *> &sockList)
     {
-        foreach (QUdpSocket *sock, sockList) {
+        for (QUdpSocket *sock: sockList) {
             int at = -1;
             for (int n = 0; n < items.count(); ++n) {
                 if (items[n].sockList.contains(sock)) {
@@ -245,12 +245,12 @@ private slots:
                 continue;
 
             QList<QHostAddress> neededAddrs;
-            foreach (const QHostAddress &a, addrs) {
+            for (const QHostAddress &a: addrs) {
                 if (!i.haveAddress(a))
                     neededAddrs += a;
             }
 
-            foreach (const QHostAddress &a, neededAddrs) {
+            for (const QHostAddress &a: neededAddrs) {
                 QUdpSocket *sock = new QUdpSocket(q);
 
                 if (!sock->bind(a, i.port)) {
@@ -302,7 +302,7 @@ private slots:
         if (addrs.isEmpty())
             return false;
 
-        foreach (const QHostAddress &a, addrs) {
+        for (const QHostAddress &a: addrs) {
             if (!i.haveAddress(a))
                 return false;
         }
@@ -343,7 +343,7 @@ private slots:
         QList<QUdpSocket *> out;
 
         i->lent = true;
-        foreach (QUdpSocket *sock, i->sockList) {
+        for (QUdpSocket *sock: i->sockList) {
             i->lentAddrs += sock->localAddress();
             sock->disconnect(this);
             sock->setParent(parent);
diff --git a/src/xmpp/xmpp-core/protocol.cpp b/src/xmpp/xmpp-core/protocol.cpp
index 6d2c821c..e3c94092 100644
--- a/src/xmpp/xmpp-core/protocol.cpp
+++ b/src/xmpp/xmpp-core/protocol.cpp
@@ -1279,7 +1279,7 @@ bool CoreProtocol::normalStep(const QDomElement &e)
             }
         } else {
             QDomElement mechs = doc.createElementNS(NS_SASL, "mechanisms");
-            foreach (const QString &it, sasl_mechlist) {
+            for (const QString &it: sasl_mechlist) {
                 QDomElement m = doc.createElement("mechanism");
                 m.appendChild(doc.createTextNode(it));
                 mechs.appendChild(m);
diff --git a/src/xmpp/xmpp-core/securestream.cpp b/src/xmpp/xmpp-core/securestream.cpp
index 0f648e3f..5123b411 100644
--- a/src/xmpp/xmpp-core/securestream.cpp
+++ b/src/xmpp/xmpp-core/securestream.cpp
@@ -348,7 +348,7 @@ class SecureStream::Private {
 
     bool haveTLS() const
     {
-        foreach (SecureLayer *s, layers) {
+        for (SecureLayer *s: layers) {
             if (s->type == SecureLayer::TLS
 #ifdef USE_TLSHANDLER
                 || s->type == SecureLayer::TLSH
@@ -362,7 +362,7 @@ class SecureStream::Private {
 
     bool haveSASL() const
     {
-        foreach (SecureLayer *s, layers) {
+        for (SecureLayer *s: layers) {
             if (s->type == SecureLayer::SASL)
                 return true;
         }
@@ -371,7 +371,7 @@ class SecureStream::Private {
 
     bool haveCompress() const
     {
-        foreach (SecureLayer *s, layers) {
+        for (SecureLayer *s: layers) {
             if (s->type == SecureLayer::Compression)
                 return true;
         }
@@ -417,7 +417,7 @@ void SecureStream::linkLayer(QObject *s)
 int SecureStream::calcPrebytes() const
 {
     int x = 0;
-    foreach (SecureLayer *s, d->layers) {
+    for (SecureLayer *s: d->layers) {
         x += s->prebytes;
     }
     return (d->pending - x);
@@ -545,7 +545,7 @@ void SecureStream::bs_readyRead()
 
 void SecureStream::bs_bytesWritten(qint64 bytes)
 {
-    foreach (SecureLayer *s, d->layers) {
+    for (SecureLayer *s: d->layers) {
         bytes = s->finished(bytes);
     }
 
diff --git a/src/xmpp/xmpp-core/simplesasl.cpp b/src/xmpp/xmpp-core/simplesasl.cpp
index 4194a9aa..f6878f01 100644
--- a/src/xmpp/xmpp-core/simplesasl.cpp
+++ b/src/xmpp/xmpp-core/simplesasl.cpp
@@ -140,7 +140,7 @@ class SimpleSASLContext : public QCA::SASLContext {
         Q_UNUSED(allowClientSendFirst);
 
         mechanism_ = QString();
-        foreach (QString mech, mechlist) {
+        for (QString mech: mechlist) {
             if (mech == "SCRAM-SHA-1") {
                 mechanism_ = "SCRAM-SHA-1";
                 break;
diff --git a/src/xmpp/xmpp-core/stream.cpp b/src/xmpp/xmpp-core/stream.cpp
index 68dac8b8..f261865a 100644
--- a/src/xmpp/xmpp-core/stream.cpp
+++ b/src/xmpp/xmpp-core/stream.cpp
@@ -272,7 +272,7 @@ void ClientStream::reset(bool all)
         }
     } else {
         QSharedPointer<QDomDocument> sd;
-        foreach (Stanza *s, d->in) {
+        for (Stanza *s: d->in) {
             sd = s->unboundDocument(sd);
         }
     }
@@ -883,7 +883,7 @@ void ClientStream::processNext()
 #endif
         bool ok = d->client.processStep();
         // deal with send/received items
-        foreach (const XmlProtocol::TransferItem &i, d->client.transferItemList) {
+        for (const XmlProtocol::TransferItem &i: d->client.transferItemList) {
             if (i.isExternal)
                 continue;
             QString str;
@@ -1125,7 +1125,7 @@ bool ClientStream::handleNeed()
 
         // ensure simplesasl provider is installed
         bool found = false;
-        foreach (QCA::Provider *p, QCA::providers()) {
+        for (QCA::Provider *p: QCA::providers()) {
             if (p->name() == "simplesasl") {
                 found = true;
                 break;
@@ -1160,7 +1160,7 @@ bool ClientStream::handleNeed()
         }
 
         QString saslProvider;
-        foreach (const QString &mech, d->mechProviders.keys()) {
+        for (const QString &mech: d->mechProviders.keys()) {
             if (ml.contains(mech)) {
                 saslProvider = d->mechProviders[mech];
                 break;
diff --git a/src/xmpp/xmpp-core/tlshandler.cpp b/src/xmpp/xmpp-core/tlshandler.cpp
index 7bc311ec..6c849051 100644
--- a/src/xmpp/xmpp-core/tlshandler.cpp
+++ b/src/xmpp/xmpp-core/tlshandler.cpp
@@ -149,11 +149,11 @@ static bool cert_match_domain(const QString &certname, const QString &acedomain)
         return false;
 
     // don't allow empty parts
-    foreach (const QString &s, parts_name) {
+    for (const QString &s: parts_name) {
         if (s.isEmpty())
             return false;
     }
-    foreach (const QString &s, parts_compare) {
+    for (const QString &s: parts_compare) {
         if (s.isEmpty())
             return false;
     }
@@ -220,19 +220,19 @@ static bool matchesHostName(const QCA::Certificate &cert, const QString &host)
     if (!ipaddr.isEmpty()) // ip address
     {
         // check iPAddress
-        foreach (const QString &s, cert.subjectInfo().values(IPAddress)) {
+        for (const QString &s: cert.subjectInfo().values(IPAddress)) {
             if (cert_match_ipaddress(s, ipaddr))
                 return true;
         }
 
         // check dNSName
-        foreach (const QString &s, cert.subjectInfo().values(DNS)) {
+        for (const QString &s: cert.subjectInfo().values(DNS)) {
             if (cert_match_ipaddress(s, ipaddr))
                 return true;
         }
 
         // check commonName
-        foreach (const QString &s, cert.subjectInfo().values(CommonName)) {
+        for (const QString &s: cert.subjectInfo().values(CommonName)) {
             if (cert_match_ipaddress(s, ipaddr))
                 return true;
         }
@@ -257,13 +257,13 @@ static bool matchesHostName(const QCA::Certificate &cert, const QString &host)
             return false;
 
         // check dNSName
-        foreach (const QString &s, cert.subjectInfo().values(DNS)) {
+        for (const QString &s: cert.subjectInfo().values(DNS)) {
             if (cert_match_domain(s, name))
                 return true;
         }
 
         // check commonName
-        foreach (const QString &s, cert.subjectInfo().values(CommonName)) {
+        for (const QString &s: cert.subjectInfo().values(CommonName)) {
             if (cert_match_domain(s, name))
                 return true;
         }
@@ -319,7 +319,7 @@ bool QCATLSHandler::certMatchesHostname()
 
     Jid host(d->host);
 
-    foreach (const QString &idOnXmppAddr, peerCert.primary().subjectInfo().values(QCA::XMPP)) {
+    for (const QString &idOnXmppAddr: peerCert.primary().subjectInfo().values(QCA::XMPP)) {
         if (host.compare(Jid(idOnXmppAddr)))
             return true;
     }
diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
index c146ee36..e2458f3c 100644
--- a/src/xmpp/xmpp-im/client.cpp
+++ b/src/xmpp/xmpp-im/client.cpp
@@ -287,7 +287,7 @@ bool Client::isActive() const { return d->active; }
 QString Client::groupChatPassword(const QString &host, const QString &room) const
 {
     Jid jid(room + "@" + host);
-    foreach (const GroupChat &i, d->groupChatList) {
+    for (const GroupChat &i: d->groupChatList) {
         if (i.j.compare(jid, false)) {
             return i.password;
         }
@@ -355,7 +355,7 @@ void Client::groupChatSetStatus(const QString &host, const QString &room, const
 {
     Jid  jid(room + "@" + host);
     bool found = false;
-    foreach (const GroupChat &i, d->groupChatList) {
+    for (const GroupChat &i: d->groupChatList) {
         if (i.j.compare(jid, false)) {
             found = true;
             jid   = i.j;
@@ -414,7 +414,7 @@ void Client::groupChatLeaveAll(const QString &statusStr)
 QString Client::groupChatNick(const QString &host, const QString &room) const
 {
     Jid jid(room + "@" + host);
-    foreach (const GroupChat &gc, d->groupChatList) {
+    for (const GroupChat &gc: d->groupChatList) {
         if (gc.j.compare(jid, false)) {
             return gc.j.resource();
         }
@@ -565,7 +565,7 @@ void Client::streamOutgoingXml(const QString &s)
 void Client::parseUnhandledStreamFeatures()
 {
     QList<QDomElement> nl = d->stream->unhandledFeatures();
-    foreach (const QDomElement &e, nl) {
+    for (const QDomElement &e: nl) {
         if (e.localName() == "c" && e.namespaceURI() == NS_CAPS) {
             d->serverCaps = CapsSpec::fromXml(e);
             if (d->capsman->isEnabled()) {
@@ -866,7 +866,7 @@ void Client::pmMessage(const Message &m)
     debug(QString("Client: Message from %1\n").arg(m.from().full()));
 
     // bits of binary. we can't do this in Message, since it knows nothing about Client
-    foreach (const BoBData &b, m.bobDataList()) {
+    for (const BoBData &b: m.bobDataList()) {
         d->bobman->append(b);
     }
 
@@ -1151,7 +1151,7 @@ DiscoItem Client::makeDiscoResult(const QString &node) const
     Hash::populateFeatures(features);
 
     // Client-specific features
-    foreach (const QString &i, d->features.list()) {
+    for (const QString &i: d->features.list()) {
         features.addFeature(i);
     }
 
diff --git a/src/xmpp/xmpp-im/filetransfer.cpp b/src/xmpp/xmpp-im/filetransfer.cpp
index 5a52baab..9108d906 100644
--- a/src/xmpp/xmpp-im/filetransfer.cpp
+++ b/src/xmpp/xmpp-im/filetransfer.cpp
@@ -400,7 +400,7 @@ void FileTransferManager::setDisabled(const QString &ns, bool state)
 void FileTransferManager::pft_incoming(const FTRequest &req)
 {
     QString streamType;
-    foreach (const QString &ns, d->streamPriority) {
+    for (const QString &ns: d->streamPriority) {
         if (req.streamTypes.contains(ns)) {
             BytestreamManager *manager = streamManager(ns);
             if (manager && manager->isAcceptableSID(req.from, req.id)) {
@@ -432,7 +432,7 @@ BytestreamManager *FileTransferManager::streamManager(const QString &ns) const
 QStringList FileTransferManager::streamPriority() const
 {
     QStringList ret;
-    foreach (const QString &ns, d->streamPriority) {
+    for (const QString &ns: d->streamPriority) {
         if (!d->disabledStreamTypes.contains(ns)) {
             ret.append(ns);
         }
@@ -442,7 +442,7 @@ QStringList FileTransferManager::streamPriority() const
 
 void FileTransferManager::stream_incomingReady(BSConnection *c)
 {
-    foreach (FileTransfer *ft, d->list) {
+    for (FileTransfer *ft: d->list) {
         if (ft->d->needStream && ft->d->peer.compare(c->peer()) && ft->d->id == c->sid()) {
             ft->takeConnection(c);
             return;
@@ -459,7 +459,7 @@ QString FileTransferManager::link(FileTransfer *ft)
     do {
         found = false;
         id    = QString("ft_%1").arg(qrand() & 0xffff, 4, 16, QChar('0'));
-        foreach (FileTransfer *ft, d->list) {
+        for (FileTransfer *ft: d->list) {
             if (ft->d->peer.compare(ft->d->peer) && ft->d->id == id) {
                 found = true;
                 break;
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index c7ecfc15..7ac429b8 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -89,7 +89,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
     {
         QList<QHostAddress> out;
 
-        foreach (const QHostAddress &a, in) {
+        for (const QHostAddress &a : in) {
             int at;
             for (at = 0; at < out.count(); ++at) {
                 if (comparePriority(a, out[at]) < 0)
@@ -270,7 +270,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
             }
             left = iceList;
 
-            foreach (XMPP::Ice176 *ice, left) {
+            for (XMPP::Ice176 *ice : left) {
                 ice->setParent(this);
 
                 // TODO: error() also?
@@ -582,7 +582,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
             QList<QHostAddress> listenAddrs;
             for (const QNetworkInterface &ni : QNetworkInterface::allInterfaces()) {
                 QList<QNetworkAddressEntry> entries = ni.addressEntries();
-                foreach (const QNetworkAddressEntry &na, entries) {
+                for (const QNetworkAddressEntry &na : entries) {
                     QHostAddress h = na.ip();
 
                     // skip localhost
@@ -608,7 +608,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
             QList<XMPP::Ice176::LocalAddress> localAddrs;
 
             QStringList strList;
-            foreach (const QHostAddress &h, listenAddrs) {
+            for (const QHostAddress &h : listenAddrs) {
                 XMPP::Ice176::LocalAddress addr;
                 addr.addr = h;
                 localAddrs += addr;
@@ -695,7 +695,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
                 eaddr.base = addr;
                 eaddr.addr = extAddr;
                 extAddrs += eaddr;*/
-                foreach (const XMPP::Ice176::LocalAddress &la, localAddrs) {
+                for (const XMPP::Ice176::LocalAddress &la : localAddrs) {
                     XMPP::Ice176::ExternalAddress ea;
                     ea.base = la;
                     ea.addr = extAddr;
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index c5c5b8dc..07eead7c 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -127,7 +127,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
 
         void connectToHost(const QHostAddress &proxyHost, int proxyPort, const QString &host, bool udpMode)
         {
-            foreach (const QNetworkInterface &ni, QNetworkInterface::allInterfaces()) {
+            for (const QNetworkInterface &ni: QNetworkInterface::allInterfaces()) {
                 if (!(ni.flags() & (QNetworkInterface::IsUp | QNetworkInterface::IsRunning))) {
                     continue;
                 }
@@ -135,7 +135,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
                     continue;
                 }
                 QList<QNetworkAddressEntry> entries = ni.addressEntries();
-                foreach (const QNetworkAddressEntry &na, entries) {
+                for (const QNetworkAddressEntry &na: entries) {
                     QHostAddress ha = na.ip();
                     if (ha.protocol() == QAbstractSocket::IPv6Protocol &&
 #if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
diff --git a/src/xmpp/xmpp-im/s5b.cpp b/src/xmpp/xmpp-im/s5b.cpp
index 4a7de61e..2b48754a 100644
--- a/src/xmpp/xmpp-im/s5b.cpp
+++ b/src/xmpp/xmpp-im/s5b.cpp
@@ -652,7 +652,7 @@ bool S5BManager::isAcceptableSID(const Jid &peer, const QString &sid) const
     QString key     = makeKey(sid, d->client->jid(), peer);
     QString key_out = makeKey(sid, peer, d->client->jid()); // not valid in muc via proxy
 
-    foreach (Entry *e, d->activeList) {
+    for (Entry *e: d->activeList) {
         if (e->i) {
             if (e->i->key == key || e->i->key == key_out)
                 return false;
@@ -673,7 +673,7 @@ const char *S5BManager::sidPrefix() const { return "s5b_"; }
 
 S5BConnection *S5BManager::findIncoming(const Jid &from, const QString &sid) const
 {
-    foreach (S5BConnection *c, d->incomingConns) {
+    for (S5BConnection *c: d->incomingConns) {
         if (c->d->peer.compare(from) && c->d->sid == sid)
             return c;
     }
@@ -682,7 +682,7 @@ S5BConnection *S5BManager::findIncoming(const Jid &from, const QString &sid) con
 
 S5BManager::Entry *S5BManager::findEntry(S5BConnection *c) const
 {
-    foreach (Entry *e, d->activeList) {
+    for (Entry *e: d->activeList) {
         if (e->c == c)
             return e;
     }
@@ -691,7 +691,7 @@ S5BManager::Entry *S5BManager::findEntry(S5BConnection *c) const
 
 S5BManager::Entry *S5BManager::findEntry(Item *i) const
 {
-    foreach (Entry *e, d->activeList) {
+    for (Entry *e: d->activeList) {
         if (e->i == i)
             return e;
     }
@@ -700,7 +700,7 @@ S5BManager::Entry *S5BManager::findEntry(Item *i) const
 
 S5BManager::Entry *S5BManager::findEntryByHash(const QString &key) const
 {
-    foreach (Entry *e, d->activeList) {
+    for (Entry *e: d->activeList) {
         if (e->i && e->i->key == key)
             return e;
     }
@@ -709,7 +709,7 @@ S5BManager::Entry *S5BManager::findEntryByHash(const QString &key) const
 
 S5BManager::Entry *S5BManager::findEntryBySID(const Jid &peer, const QString &sid) const
 {
-    foreach (Entry *e, d->activeList) {
+    for (Entry *e: d->activeList) {
         if (e->i && e->i->peer.compare(peer) && e->sid == sid)
             return e;
     }
@@ -928,7 +928,7 @@ void S5BManager::query_finished()
 {
     JT_S5B *query = static_cast<JT_S5B *>(sender());
     Entry * e     = nullptr;
-    foreach (Entry *i, d->activeList) {
+    for (Entry *i: d->activeList) {
         if (i->query == query) {
             e = i;
             break;
@@ -1096,7 +1096,7 @@ void S5BManager::Item::doOutgoing()
     StreamHostList hosts;
     auto           disco = m->client()->tcpPortReserver()->scope(QString::fromLatin1("s5b"))->disco();
     if (!haveHost(in_hosts, self)) {
-        foreach (auto &c, disco->takeServers()) {
+        for (auto &c: disco->takeServers()) {
             auto server = c.staticCast<S5BServer>();
             server->registerKey(key);
             relatedServers.append(server);
@@ -1150,7 +1150,7 @@ void S5BManager::Item::doIncoming()
     StreamHostList list;
     if (lateProxy) {
         // take just the proxy streamhosts
-        foreach (const StreamHost &it, in_hosts) {
+        for (const StreamHost &it: in_hosts) {
             if (it.isProxy())
                 list += it;
         }
@@ -1160,7 +1160,7 @@ void S5BManager::Item::doIncoming()
         if ((state == Requester || (state == Target && fast)) && !proxy.jid().isValid()) {
             // take just the non-proxy streamhosts
             bool hasProxies = false;
-            foreach (const StreamHost &it, in_hosts) {
+            for (const StreamHost &it: in_hosts) {
                 if (it.isProxy())
                     hasProxies = true;
                 else
@@ -1496,7 +1496,7 @@ void S5BManager::Item::checkForActivation()
         clientList.append(client);
     if (client_out)
         clientList.append(client_out);
-    foreach (SocksClient *sc, clientList) {
+    for (SocksClient *sc: clientList) {
 #ifdef S5B_DEBUG
         qDebug("checking for activation\n");
 #endif
@@ -1819,7 +1819,7 @@ void S5BConnector::t_timeout()
 void S5BConnector::man_udpSuccess(const Jid &streamHost)
 {
     // was anyone sending to this streamhost?
-    foreach (Item *i, d->itemList) {
+    for (Item *i: d->itemList) {
         if (i->host.jid().compare(streamHost) && i->client_udp) {
             i->udpSuccess();
             return;
diff --git a/src/xmpp/xmpp-im/types.cpp b/src/xmpp/xmpp-im/types.cpp
index b08d0248..33caeac4 100644
--- a/src/xmpp/xmpp-im/types.cpp
+++ b/src/xmpp/xmpp-im/types.cpp
@@ -500,7 +500,7 @@ QDomElement RosterExchangeItem::toXml(Stanza &s) const
         e.setAttribute("action", "modify");
         break;
     }
-    foreach (QString group, groups_) {
+    for (QString group: groups_) {
         e.appendChild(s.createTextElement("http://jabber.org/protocol/rosterx", "group", group));
     }
     return e;
@@ -888,7 +888,7 @@ void HTMLElement::filterOutUnwantedRecursive(QDomElement &el, bool strict)
                         attrs.append(name);
                     }
                 }
-                foreach (const QString &name, attrs) {
+                for (const QString &name: attrs) {
                     domAttrs.removeNamedItem(name);
                 }
                 filterOutUnwantedRecursive(childEl, strict);
@@ -1180,7 +1180,7 @@ AddressList Message::findAddresses(Address::Type t) const
         return AddressList();
     }
     AddressList matches;
-    foreach (Address a, d->addressList) {
+    for (Address a: d->addressList) {
         if (a.type() == t)
             matches.append(a);
     }
@@ -1355,7 +1355,7 @@ Stanza Message::toStanza(Stream *stream) const
     if (containsHTML()) {
         QDomElement html = s.createElement("http://jabber.org/protocol/xhtml-im", "html");
         s.appendChild(html);
-        foreach (HTMLElement el, d->htmlElements) {
+        for (HTMLElement el: d->htmlElements) {
             html.appendChild(s.doc().importNode(el.body(), true).toElement());
         }
     }
@@ -1381,7 +1381,7 @@ Stanza Message::toStanza(Stream *stream) const
     }
 
     // urls
-    foreach (const Url &uit, d->urlList) {
+    for (const Url &uit: d->urlList) {
         QDomElement x = s.createElement("jabber:x:oob", "x");
         x.appendChild(s.createTextElement("jabber:x:oob", "url", uit.url()));
         if (!uit.desc().isEmpty())
@@ -1400,7 +1400,7 @@ Stanza Message::toStanza(Stream *stream) const
                 x.appendChild(s.createTextElement("jabber:x:event", "id", d->eventId));
         }
 
-        foreach (const MsgEvent &ev, d->eventList) {
+        for (const MsgEvent &ev: d->eventList) {
             switch (ev) {
             case OfflineEvent:
                 x.appendChild(s.createElement("jabber:x:event", "offline"));
@@ -1476,7 +1476,7 @@ Stanza Message::toStanza(Stream *stream) const
     // addresses
     if (!d->addressList.isEmpty()) {
         QDomElement as = s.createElement("http://jabber.org/protocol/address", "addresses");
-        foreach (Address a, d->addressList) {
+        for (Address a: d->addressList) {
             as.appendChild(a.toXml(s));
         }
         s.appendChild(as);
@@ -1485,7 +1485,7 @@ Stanza Message::toStanza(Stream *stream) const
     // roster item exchange
     if (!d->rosterExchangeItems.isEmpty()) {
         QDomElement rx = s.createElement("http://jabber.org/protocol/rosterx", "x");
-        foreach (RosterExchangeItem r, d->rosterExchangeItems) {
+        for (RosterExchangeItem r: d->rosterExchangeItems) {
             rx.appendChild(r.toXml(s));
         }
         s.appendChild(rx);
@@ -1511,7 +1511,7 @@ Stanza Message::toStanza(Stream *stream) const
     // muc
     if (!d->mucInvites.isEmpty()) {
         QDomElement e = s.createElement("http://jabber.org/protocol/muc#user", "x");
-        foreach (MUCInvite i, d->mucInvites) {
+        for (MUCInvite i: d->mucInvites) {
             e.appendChild(i.toXml(s.doc()));
         }
         if (!d->mucPassword.isEmpty()) {
@@ -1540,7 +1540,7 @@ Stanza Message::toStanza(Stream *stream) const
     }
 
     // bits of binary
-    foreach (const BoBData &bd, d->bobDataList) {
+    for (const BoBData &bd: d->bobDataList) {
         s.appendChild(bd.toXml(&s.doc()));
     }
 
diff --git a/src/xmpp/xmpp-im/xmpp_caps.cpp b/src/xmpp/xmpp-im/xmpp_caps.cpp
index 856d6ef1..1656afeb 100644
--- a/src/xmpp/xmpp-im/xmpp_caps.cpp
+++ b/src/xmpp/xmpp-im/xmpp_caps.cpp
@@ -322,7 +322,7 @@ void CapsManager::updateDisco(const Jid &jid, const DiscoItem &item)
 void CapsManager::capsRegistered(const CapsSpec &cs)
 {
     // Notify affected jids.
-    foreach (const QString &s, capsJids_[cs.flatten()]) {
+    for (const QString &s: capsJids_[cs.flatten()]) {
         // qDebug() << QString("caps.cpp: Notifying %1.").arg(s.replace('%',"%%"));
         emit capsChanged(s);
     }
diff --git a/src/xmpp/xmpp-im/xmpp_discoitem.cpp b/src/xmpp/xmpp-im/xmpp_discoitem.cpp
index 69286639..2175390c 100644
--- a/src/xmpp/xmpp-im/xmpp_discoitem.cpp
+++ b/src/xmpp/xmpp-im/xmpp_discoitem.cpp
@@ -99,7 +99,7 @@ QString DiscoItem::capsHash(QCryptographicHash::Algorithm algo) const
     DiscoItem::Identities idents = d->identities;
     std::sort(idents.begin(), idents.end());
 
-    foreach (const DiscoItem::Identity &id, idents) {
+    for (const DiscoItem::Identity &id: idents) {
         prep << QString("%1/%2/%3/%4").arg(id.category, id.type, id.lang, id.name);
     }
 
@@ -108,7 +108,7 @@ QString DiscoItem::capsHash(QCryptographicHash::Algorithm algo) const
     prep += fl;
 
     QMap<QString, XData> forms;
-    foreach (const XData &xd, d->exts) {
+    for (const XData &xd: d->exts) {
         if (xd.registrarType().isEmpty()) {
             continue;
         }
@@ -117,10 +117,10 @@ QString DiscoItem::capsHash(QCryptographicHash::Algorithm algo) const
         }
         forms.insert(xd.registrarType(), xd);
     }
-    foreach (const XData &xd, forms.values()) {
+    for (const XData &xd: forms.values()) {
         prep << xd.registrarType();
         QMap<QString, QStringList> values;
-        foreach (const XData::Field &f, xd.fields()) {
+        for (const XData::Field &f: xd.fields()) {
             if (f.var() == QLatin1String("FORM_TYPE")) {
                 continue;
             }
@@ -193,7 +193,7 @@ QDomElement DiscoItem::toDiscoInfoResult(QDomDocument *doc) const
         = doc->createElementNS(QLatin1String("http://jabber.org/protocol/disco#info"), QLatin1String("query"));
     q.setAttribute("node", d->node);
 
-    foreach (const Identity &id, d->identities) {
+    for (const Identity &id: d->identities) {
         QDomElement idel = q.appendChild(doc->createElement(QLatin1String("identity"))).toElement();
         idel.setAttribute("category", id.category);
         idel.setAttribute("type", id.type);
@@ -205,12 +205,12 @@ QDomElement DiscoItem::toDiscoInfoResult(QDomDocument *doc) const
         }
     }
 
-    foreach (const QString &f, d->features.list()) {
+    for (const QString &f: d->features.list()) {
         QDomElement fel = q.appendChild(doc->createElement(QLatin1String("feature"))).toElement();
         fel.setAttribute("var", f);
     }
 
-    foreach (const XData &f, d->exts) {
+    for (const XData &f: d->exts) {
         q.appendChild(f.toXml(doc));
     }
 
@@ -253,7 +253,7 @@ void DiscoItem::setExtensions(const QList<XData> &extlist) { d->exts = extlist;
 
 XData DiscoItem::registeredExtension(const QString &ns) const
 {
-    foreach (const XData &xd, d->exts) {
+    for (const XData &xd: d->exts) {
         if (xd.registrarType() == ns) {
             return xd;
         }
diff --git a/src/xmpp/xmpp-im/xmpp_ibb.cpp b/src/xmpp/xmpp-im/xmpp_ibb.cpp
index 0b190712..a7bc1f29 100644
--- a/src/xmpp/xmpp-im/xmpp_ibb.cpp
+++ b/src/xmpp/xmpp-im/xmpp_ibb.cpp
@@ -419,7 +419,7 @@ void IBBManager::unlink(IBBConnection *c) { d->activeConns.removeAll(c); }
 
 IBBConnection *IBBManager::findConnection(const QString &sid, const Jid &peer) const
 {
-    foreach (IBBConnection *c, d->activeConns) {
+    for (IBBConnection *c: d->activeConns) {
         if (c->sid() == sid && (peer.isEmpty() || c->peer().compare(peer)))
             return c;
     }
diff --git a/src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp b/src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp
index bc670f9d..bb47cc2e 100644
--- a/src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp
+++ b/src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp
@@ -266,7 +266,7 @@ void ServerInfoManager::disco_finished()
 
         // Identities
         DiscoItem::Identities is = jt->item().identities();
-        foreach (DiscoItem::Identity i, is) {
+        for (DiscoItem::Identity i: is) {
             if (i.category == "pubsub" && i.type == "pep")
                 _hasPEP = true;
         }
diff --git a/src/xmpp/xmpp-im/xmpp_tasks.cpp b/src/xmpp/xmpp-im/xmpp_tasks.cpp
index b0196f2d..5539b2d0 100644
--- a/src/xmpp/xmpp-im/xmpp_tasks.cpp
+++ b/src/xmpp/xmpp-im/xmpp_tasks.cpp
@@ -615,7 +615,7 @@ void JT_Presence::pres(const Status &s)
         }
 
         // bits of binary
-        foreach (const BoBData &bd, s.bobDataList()) {
+        for (const BoBData &bd: s.bobDataList()) {
             tag.appendChild(bd.toXml(doc()));
         }
     }
diff --git a/src/xmpp/xmpp-im/xmpp_xdata.cpp b/src/xmpp/xmpp-im/xmpp_xdata.cpp
index 5e008d1c..52948ddf 100644
--- a/src/xmpp/xmpp-im/xmpp_xdata.cpp
+++ b/src/xmpp/xmpp-im/xmpp_xdata.cpp
@@ -265,10 +265,10 @@ QDomElement XData::Field::toXml(QDomDocument *doc, bool submitForm) const
             media.setAttribute("width", s.width());
             media.setAttribute("height", s.height());
         }
-        foreach (const MediaUri &uri, _mediaElement) {
+        for (const MediaUri &uri: _mediaElement) {
             QDomElement uriEl = doc->createElement("uri");
             QString     type  = uri.mimeType;
-            foreach (const QString &k, uri.params.keys()) {
+            for (const QString &k: uri.params.keys()) {
                 type += ";" + k + "=" + uri.params[k];
             }
             uriEl.setAttribute("type", type);
@@ -300,8 +300,8 @@ QSize XData::Field::MediaElement::mediaSize() const { return _size; }
 
 bool XData::Field::MediaElement::checkSupport(const QStringList &wildcards)
 {
-    foreach (const XData::Field::MediaUri &uri, *this) {
-        foreach (const QString &wildcard, wildcards) {
+    for (const XData::Field::MediaUri &uri: *this) {
+        for (const QString &wildcard: wildcards) {
             if (QRegExp(wildcard, Qt::CaseSensitive, QRegExp::Wildcard).exactMatch(uri.mimeType)) {
                 return true;
             }
@@ -358,7 +358,7 @@ XData::Field &XData::fieldRef(const QString &var)
 void XData::setFields(const FieldList &fl)
 {
     d->fields = fl;
-    foreach (const Field &f, fl) {
+    for (const Field &f: fl) {
         if (f.type() == Field::Field_Hidden && f.var() == "FORM_TYPE") {
             d->registrarType = f.value().value(0);
         }
@@ -468,7 +468,7 @@ const QList<XData::ReportItem> &XData::reportItems() const { return d->reportIte
 
 bool XData::isValid() const
 {
-    foreach (const Field &f, d->fields) {
+    for (const Field &f: d->fields) {
         if (!f.isValid())
             return false;
     }
diff --git a/tools/icetunnel/main.cpp b/tools/icetunnel/main.cpp
index 6479e71a..a9cef336 100644
--- a/tools/icetunnel/main.cpp
+++ b/tools/icetunnel/main.cpp
@@ -80,7 +80,7 @@ static QList<QHostAddress> sortAddrs(const QList<QHostAddress> &in)
 {
     QList<QHostAddress> out;
 
-    foreach (const QHostAddress &a, in) {
+    for (const QHostAddress &a : in) {
         int at;
         for (at = 0; at < out.count(); ++at) {
             if (comparePriority(a, out[at]) < 0)
@@ -527,11 +527,11 @@ public slots:
                     strList += addr.addr.toString();
                 }
             }*/
-            foreach (const QNetworkInterface &ni, QNetworkInterface::allInterfaces()) {
+            for (const QNetworkInterface &ni : QNetworkInterface::allInterfaces()) {
                 if (!(ni.flags() & QNetworkInterface::IsUp))
                     continue;
                 QList<QNetworkAddressEntry> entries = ni.addressEntries();
-                foreach (const QNetworkAddressEntry &na, entries) {
+                for (const QNetworkAddressEntry &na : entries) {
                     QHostAddress h = na.ip();
 
                     if (opt_ipv6_only && h.protocol() != QAbstractSocket::IPv6Protocol)

From a9fcb0df582a94705f750e1ffa8d52c449710588 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sat, 25 Apr 2020 13:49:06 +0300
Subject: [PATCH 143/383] Reformat with clang-format-10

---
 src/irisnet/appledns/sdtest.cpp               |  2 +-
 src/irisnet/corelib/netavailability.cpp       |  2 +-
 src/irisnet/corelib/netinterface.cpp          |  2 +-
 src/irisnet/corelib/netinterface_qtname.cpp   |  2 +-
 src/irisnet/corelib/netnames.cpp              | 37 ++++-----
 src/irisnet/corelib/objectsession.cpp         |  4 +-
 src/irisnet/noncore/cutestuff/bytestream.cpp  |  2 +-
 src/irisnet/noncore/cutestuff/httpconnect.cpp |  2 +-
 src/irisnet/noncore/cutestuff/httppoll.cpp    | 10 +--
 src/irisnet/noncore/cutestuff/socks.cpp       |  2 +-
 src/irisnet/noncore/icelocaltransport.cpp     |  2 +-
 src/irisnet/noncore/icetransport.cpp          |  4 +-
 src/irisnet/noncore/stunmessage.cpp           | 12 +--
 src/irisnet/noncore/stuntypes.cpp             |  2 +-
 src/irisnet/noncore/tcpportreserver.cpp       |  4 +-
 src/irisnet/noncore/turnclient.cpp            |  4 +-
 src/irisnet/noncore/udpportreserver.cpp       | 28 +++----
 src/xmpp/base/randomnumbergenerator.cpp       |  2 +-
 .../unittest/randomnumbergeneratortest.cpp    |  2 +-
 src/xmpp/jid/jid.cpp                          |  4 +-
 .../qttestutil/example/myfirstclasstest.cpp   |  4 +-
 .../qttestutil/example/mysecondclasstest.cpp  |  4 +-
 src/xmpp/qa/unittest.template/myclasstest.cpp |  4 +-
 src/xmpp/sasl/digestmd5proplist.cpp           |  2 +-
 .../sasl/unittest/scramsha1messagetest.cpp    |  2 +-
 .../sasl/unittest/scramsha1responsetest.cpp   |  2 +-
 src/xmpp/xmpp-core/connector.cpp              |  2 +-
 src/xmpp/xmpp-core/parser.cpp                 |  2 +-
 src/xmpp/xmpp-core/protocol.cpp               |  4 +-
 src/xmpp/xmpp-core/securestream.cpp           | 10 +--
 src/xmpp/xmpp-core/simplesasl.cpp             |  8 +-
 src/xmpp/xmpp-core/stream.cpp                 | 18 ++--
 src/xmpp/xmpp-core/tlshandler.cpp             | 20 ++---
 src/xmpp/xmpp-core/xmlprotocol.cpp            |  4 +-
 src/xmpp/xmpp-im/client.cpp                   | 18 ++--
 src/xmpp/xmpp-im/filetransfer.cpp             | 12 +--
 src/xmpp/xmpp-im/jingle-application.cpp       |  2 +-
 src/xmpp/xmpp-im/jingle-ft.cpp                | 14 ++--
 src/xmpp/xmpp-im/jingle-ibb.cpp               |  2 +-
 src/xmpp/xmpp-im/jingle-s5b.cpp               | 12 +--
 src/xmpp/xmpp-im/jingle-session.cpp           |  4 +-
 src/xmpp/xmpp-im/jingle-transport.cpp         |  6 +-
 src/xmpp/xmpp-im/jingle.cpp                   | 18 ++--
 src/xmpp/xmpp-im/s5b.cpp                      | 32 ++++----
 src/xmpp/xmpp-im/types.cpp                    | 82 +++++++++----------
 src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp        |  8 +-
 src/xmpp/xmpp-im/xmpp_bytestream.cpp          |  4 +-
 src/xmpp/xmpp-im/xmpp_caps.cpp                |  8 +-
 src/xmpp/xmpp-im/xmpp_discoitem.cpp           | 20 ++---
 src/xmpp/xmpp-im/xmpp_features.cpp            |  4 +-
 src/xmpp/xmpp-im/xmpp_ibb.cpp                 |  2 +-
 src/xmpp/xmpp-im/xmpp_reference.cpp           |  6 +-
 src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp   |  2 +-
 src/xmpp/xmpp-im/xmpp_tasks.cpp               | 42 +++++-----
 src/xmpp/xmpp-im/xmpp_vcard.cpp               | 12 +--
 src/xmpp/xmpp-im/xmpp_xdata.cpp               | 12 +--
 src/xmpp/xmpp-im/xmpp_xmlcommon.cpp           | 10 +--
 57 files changed, 273 insertions(+), 274 deletions(-)

diff --git a/src/irisnet/appledns/sdtest.cpp b/src/irisnet/appledns/sdtest.cpp
index 038e74b2..a9363aca 100644
--- a/src/irisnet/appledns/sdtest.cpp
+++ b/src/irisnet/appledns/sdtest.cpp
@@ -44,7 +44,7 @@ class Command {
     bool error;
     bool done; // for resolve
 
-    Command() : error(false), done(false) {}
+    Command() : error(false), done(false) { }
 };
 
 static QString nameToString(const QByteArray &in)
diff --git a/src/irisnet/corelib/netavailability.cpp b/src/irisnet/corelib/netavailability.cpp
index 1172dcae..6ec68361 100644
--- a/src/irisnet/corelib/netavailability.cpp
+++ b/src/irisnet/corelib/netavailability.cpp
@@ -25,7 +25,7 @@ class NetAvailability::Private : public QObject {
 public:
     NetAvailability *q;
 
-    Private(NetAvailability *_q) : QObject(_q), q(_q) {}
+    Private(NetAvailability *_q) : QObject(_q), q(_q) { }
 };
 
 NetAvailability::NetAvailability(QObject *parent) : QObject(parent) { d = new Private(this); }
diff --git a/src/irisnet/corelib/netinterface.cpp b/src/irisnet/corelib/netinterface.cpp
index 79c426b9..5fb449c2 100644
--- a/src/irisnet/corelib/netinterface.cpp
+++ b/src/irisnet/corelib/netinterface.cpp
@@ -44,7 +44,7 @@ class NetTracker : public QObject {
         QList<IrisNetProvider *> list = irisNetProviders();
 
         c = nullptr;
-        for (IrisNetProvider *p: list) {
+        for (IrisNetProvider *p : list) {
             c = p->createNetInterfaceProvider();
             if (c)
                 break;
diff --git a/src/irisnet/corelib/netinterface_qtname.cpp b/src/irisnet/corelib/netinterface_qtname.cpp
index 3c96a4e1..07a9cfa0 100644
--- a/src/irisnet/corelib/netinterface_qtname.cpp
+++ b/src/irisnet/corelib/netinterface_qtname.cpp
@@ -36,7 +36,7 @@ class IrisQtName : public NameProvider {
                                 // is way better)
 
 public:
-    IrisQtName(QObject *parent = nullptr) : NameProvider(parent), currentId(0) {}
+    IrisQtName(QObject *parent = nullptr) : NameProvider(parent), currentId(0) { }
 
     ~IrisQtName()
     {
diff --git a/src/irisnet/corelib/netnames.cpp b/src/irisnet/corelib/netnames.cpp
index 27f9b129..09644b6b 100644
--- a/src/irisnet/corelib/netnames.cpp
+++ b/src/irisnet/corelib/netnames.cpp
@@ -55,7 +55,7 @@ class NameRecord::Private : public QSharedData {
             d = new Private;                                                                                           \
     }
 
-NameRecord::NameRecord() : d(nullptr) {}
+NameRecord::NameRecord() : d(nullptr) { }
 
 NameRecord::NameRecord(const QByteArray &owner, int ttl) : d(nullptr)
 {
@@ -65,7 +65,7 @@ NameRecord::NameRecord(const QByteArray &owner, int ttl) : d(nullptr)
 
 NameRecord::NameRecord(const NameRecord &from) : d(nullptr) { *this = from; }
 
-NameRecord::~NameRecord() {}
+NameRecord::~NameRecord() { }
 
 NameRecord &NameRecord::operator=(const NameRecord &from)
 {
@@ -357,7 +357,7 @@ class ServiceInstance::Private : public QSharedData {
     QByteArray                name;
 };
 
-ServiceInstance::ServiceInstance() : d(new Private) {}
+ServiceInstance::ServiceInstance() : d(new Private) { }
 
 ServiceInstance::ServiceInstance(const QString &instance, const QString &type, const QString &domain,
                                  const QMap<QString, QByteArray> &attribs) :
@@ -374,7 +374,7 @@ ServiceInstance::ServiceInstance(const QString &instance, const QString &type, c
 
 ServiceInstance::ServiceInstance(const ServiceInstance &from) : d(nullptr) { *this = from; }
 
-ServiceInstance::~ServiceInstance() {}
+ServiceInstance::~ServiceInstance() { }
 
 ServiceInstance &ServiceInstance::operator=(const ServiceInstance &from)
 {
@@ -408,7 +408,7 @@ class NameResolver::Private {
     bool longLived;
     int  id;
 
-    Private(NameResolver *_q) : q(_q) {}
+    Private(NameResolver *_q) : q(_q) { }
 };
 
 class ServiceBrowser::Private {
@@ -417,7 +417,7 @@ class ServiceBrowser::Private {
 
     int id;
 
-    Private(ServiceBrowser *_q) : q(_q) {}
+    Private(ServiceBrowser *_q) : q(_q) { }
 };
 
 class ServiceResolver::Private : public QObject {
@@ -466,7 +466,7 @@ WeightedNameRecordList &WeightedNameRecordList::operator=(const WeightedNameReco
     return *this;
 }
 
-WeightedNameRecordList::~WeightedNameRecordList() {}
+WeightedNameRecordList::~WeightedNameRecordList() { }
 
 bool WeightedNameRecordList::isEmpty() const
 {
@@ -489,7 +489,7 @@ XMPP::NameRecord WeightedNameRecordList::takeNext()
 
     /* Find the new total weight of this priority group */
     int totalWeight = 0;
-    for (const XMPP::NameRecord &record: *currentPriorityGroup) {
+    for (const XMPP::NameRecord &record : *currentPriorityGroup) {
         totalWeight += record.weight();
     }
 
@@ -506,8 +506,7 @@ XMPP::NameRecord WeightedNameRecordList::takeNext()
 
     /* Iterate through the priority group until we found the randomly selected entry */
     WeightedNameRecordPriorityGroup::iterator it(currentPriorityGroup->begin());
-    for (int currentWeight = it->weight(); currentWeight < randomWeight; currentWeight += (++it)->weight()) {
-    }
+    for (int currentWeight = it->weight(); currentWeight < randomWeight; currentWeight += (++it)->weight()) { }
     Q_ASSERT(it != currentPriorityGroup->end());
 
     /* We are going to delete the entry in the list, so save it */
@@ -537,8 +536,8 @@ void WeightedNameRecordList::clear()
 void WeightedNameRecordList::append(const XMPP::WeightedNameRecordList &list)
 {
     /* Copy over all records from all groups */
-    for (const WeightedNameRecordPriorityGroup &group: list.priorityGroups) {
-        for (const NameRecord &record: group) {
+    for (const WeightedNameRecordPriorityGroup &group : list.priorityGroups) {
+        for (const NameRecord &record : group) {
             append(record);
         }
     }
@@ -549,7 +548,7 @@ void WeightedNameRecordList::append(const XMPP::WeightedNameRecordList &list)
 
 void WeightedNameRecordList::append(const QList<XMPP::NameRecord> &list)
 {
-    for (const XMPP::NameRecord &record: list) {
+    for (const XMPP::NameRecord &record : list) {
         if (record.type() != XMPP::NameRecord::Srv) {
             continue;
         }
@@ -622,7 +621,7 @@ QDebug operator<<(QDebug dbg, const XMPP::WeightedNameRecordList &list)
 
     dbg.nospace() << "{";
 
-    for (int priority: list.priorityGroups.keys()) {
+    for (int priority : list.priorityGroups.keys()) {
         dbg.nospace() << "\t" << priority << "->" << list.priorityGroups.value(priority) << endl;
     }
 
@@ -636,7 +635,7 @@ class ServiceLocalPublisher::Private {
 
     int id;
 
-    Private(ServiceLocalPublisher *_q) : q(_q) {}
+    Private(ServiceLocalPublisher *_q) : q(_q) { }
 };
 
 class NameManager : public QObject {
@@ -734,7 +733,7 @@ class NameManager : public QObject {
                 sub_instances_to_remove += it.key();
         }
 
-        for (int res_sub_id: sub_instances_to_remove) {
+        for (int res_sub_id : sub_instances_to_remove) {
             res_sub_instances.remove(res_sub_id);
             p_local->resolve_stop(res_sub_id);
         }
@@ -1076,7 +1075,7 @@ void ServiceBrowser::start(const QString &type, const QString &domain)
     NameManager::instance()->browse_start(d, type, domain);
 }
 
-void ServiceBrowser::stop() {}
+void ServiceBrowser::stop() { }
 
 //----------------------------------------------------------------------------
 // ServiceResolver
@@ -1099,7 +1098,7 @@ void ServiceResolver::clear_resolvers()
 #endif
 
     /* cleanup all resolvers */
-    for (XMPP::NameResolver *resolver: d->resolverList) {
+    for (XMPP::NameResolver *resolver : d->resolverList) {
         cleanup_resolver(resolver);
     }
 }
@@ -1405,7 +1404,7 @@ void ServiceLocalPublisher::updateAttributes(const QMap<QString, QByteArray> &at
 
 void ServiceLocalPublisher::addRecord(const NameRecord &rec) { NameManager::instance()->publish_extra_start(d, rec); }
 
-void ServiceLocalPublisher::cancel() {}
+void ServiceLocalPublisher::cancel() { }
 
 //----------------------------------------------------------------------------
 // NetNames
diff --git a/src/irisnet/corelib/objectsession.cpp b/src/irisnet/corelib/objectsession.cpp
index 1b616602..77219a5c 100644
--- a/src/irisnet/corelib/objectsession.cpp
+++ b/src/irisnet/corelib/objectsession.cpp
@@ -48,7 +48,7 @@ class ObjectSessionPrivate : public QObject {
         };
         QList<Argument> args;
 
-        MethodCall(QObject *_obj, const char *_method) : obj(_obj), method(_method) {}
+        MethodCall(QObject *_obj, const char *_method) : obj(_obj), method(_method) { }
 
         ~MethodCall() { clearArgs(); }
 
@@ -124,7 +124,7 @@ class ObjectSessionPrivate : public QObject {
 
     bool havePendingCall(QObject *obj, const char *method) const
     {
-        for (const MethodCall *call: pendingCalls) {
+        for (const MethodCall *call : pendingCalls) {
             if (call->obj == obj && qstrcmp(call->method.data(), method) == 0)
                 return true;
         }
diff --git a/src/irisnet/noncore/cutestuff/bytestream.cpp b/src/irisnet/noncore/cutestuff/bytestream.cpp
index 053a737d..2a0603fe 100644
--- a/src/irisnet/noncore/cutestuff/bytestream.cpp
+++ b/src/irisnet/noncore/cutestuff/bytestream.cpp
@@ -57,7 +57,7 @@
 
 class ByteStream::Private {
 public:
-    Private() {}
+    Private() { }
 
     QByteArray readBuf, writeBuf;
     int        errorCode;
diff --git a/src/irisnet/noncore/cutestuff/httpconnect.cpp b/src/irisnet/noncore/cutestuff/httpconnect.cpp
index 1371d0c8..f6d4c22c 100644
--- a/src/irisnet/noncore/cutestuff/httpconnect.cpp
+++ b/src/irisnet/noncore/cutestuff/httpconnect.cpp
@@ -89,7 +89,7 @@ static bool extractMainHeader(const QString &line, QString *proto, int *code, QS
 
 class HttpConnect::Private {
 public:
-    Private(HttpConnect *_q) : sock(_q) {}
+    Private(HttpConnect *_q) : sock(_q) { }
 
     BSocket sock;
     QString host;
diff --git a/src/irisnet/noncore/cutestuff/httppoll.cpp b/src/irisnet/noncore/cutestuff/httppoll.cpp
index 4191fc8f..7fed90a1 100644
--- a/src/irisnet/noncore/cutestuff/httppoll.cpp
+++ b/src/irisnet/noncore/cutestuff/httppoll.cpp
@@ -57,7 +57,7 @@ static QString hpk(int n, const QString &s)
 
 class HttpPoll::Private {
 public:
-    Private(HttpPoll *_q) : http(_q) {}
+    Private(HttpPoll *_q) : http(_q) { }
 
     HttpProxyPost http;
     QString       host;
@@ -415,7 +415,7 @@ static bool extractMainHeader(const QString &line, QString *proto, int *code, QS
 
 class HttpProxyPost::Private {
 public:
-    Private(HttpProxyPost *_q) : sock(_q), tls(nullptr) {}
+    Private(HttpProxyPost *_q) : sock(_q), tls(nullptr) { }
 
     ~Private() { delete tls; }
 
@@ -500,7 +500,7 @@ QByteArray HttpProxyPost::body() const { return d->body; }
 
 QString HttpProxyPost::getHeader(const QString &var) const
 {
-    for (const QString &s: d->headerLines) {
+    for (const QString &s : d->headerLines) {
         int n = s.indexOf(": ");
         if (n == -1)
             continue;
@@ -695,7 +695,7 @@ void HttpProxyPost::sock_error(int x)
 //----------------------------------------------------------------------------
 class HttpProxyGetStream::Private {
 public:
-    Private(HttpProxyGetStream *_q) : sock(_q) {}
+    Private(HttpProxyGetStream *_q) : sock(_q) { }
 
     BSocket     sock;
     QByteArray  recvBuf;
@@ -773,7 +773,7 @@ void HttpProxyGetStream::stop() { resetConnection(); }
 
 QString HttpProxyGetStream::getHeader(const QString &var) const
 {
-    for (const QString &s: d->headerLines) {
+    for (const QString &s : d->headerLines) {
         int n = s.indexOf(": ");
         if (n == -1)
             continue;
diff --git a/src/irisnet/noncore/cutestuff/socks.cpp b/src/irisnet/noncore/cutestuff/socks.cpp
index 0f754e41..8f41fe78 100644
--- a/src/irisnet/noncore/cutestuff/socks.cpp
+++ b/src/irisnet/noncore/cutestuff/socks.cpp
@@ -389,7 +389,7 @@ enum { StepVersion, StepAuth, StepRequest };
 
 class SocksClient::Private {
 public:
-    Private(SocksClient *_q) : sock(_q) {}
+    Private(SocksClient *_q) : sock(_q) { }
 
     BSocket sock;
     QString host;
diff --git a/src/irisnet/noncore/icelocaltransport.cpp b/src/irisnet/noncore/icelocaltransport.cpp
index e12c782e..5f8d9c26 100644
--- a/src/irisnet/noncore/icelocaltransport.cpp
+++ b/src/irisnet/noncore/icelocaltransport.cpp
@@ -522,7 +522,7 @@ private slots:
         ObjectSessionWatcher watch(&sess);
 
         if (!dwrites.isEmpty()) {
-            for (const Written &wr: dwrites) {
+            for (const Written &wr : dwrites) {
                 emit q->datagramsWritten(Direct, wr.count, wr.addr, wr.port);
                 if (!watch.isValid())
                     return;
diff --git a/src/irisnet/noncore/icetransport.cpp b/src/irisnet/noncore/icetransport.cpp
index dfeb3057..a34a80c4 100644
--- a/src/irisnet/noncore/icetransport.cpp
+++ b/src/irisnet/noncore/icetransport.cpp
@@ -19,8 +19,8 @@
 #include "icetransport.h"
 
 namespace XMPP {
-IceTransport::IceTransport(QObject *parent) : QObject(parent) {}
+IceTransport::IceTransport(QObject *parent) : QObject(parent) { }
 
-IceTransport::~IceTransport() {}
+IceTransport::~IceTransport() { }
 
 } // namespace XMPP
diff --git a/src/irisnet/noncore/stunmessage.cpp b/src/irisnet/noncore/stunmessage.cpp
index d1523160..faf29924 100644
--- a/src/irisnet/noncore/stunmessage.cpp
+++ b/src/irisnet/noncore/stunmessage.cpp
@@ -336,11 +336,11 @@ class StunMessage::Private : public QSharedData {
     }
 };
 
-StunMessage::StunMessage() : d(nullptr) {}
+StunMessage::StunMessage() : d(nullptr) { }
 
-StunMessage::StunMessage(const StunMessage &from) : d(from.d) {}
+StunMessage::StunMessage(const StunMessage &from) : d(from.d) { }
 
-StunMessage::~StunMessage() {}
+StunMessage::~StunMessage() { }
 
 StunMessage &StunMessage::operator=(const StunMessage &from)
 {
@@ -384,7 +384,7 @@ QByteArray StunMessage::attribute(quint16 type) const
 {
     Q_ASSERT(d);
 
-    for (const Attribute &i: d->attribs) {
+    for (const Attribute &i : d->attribs) {
         if (i.type == type)
             return i.value;
     }
@@ -395,7 +395,7 @@ bool StunMessage::hasAttribute(quint16 type) const
 {
     Q_ASSERT(d);
 
-    for (const Attribute &i: d->attribs) {
+    for (const Attribute &i : d->attribs) {
         if (i.type == type)
             return true;
     }
@@ -473,7 +473,7 @@ QByteArray StunMessage::toBinary(int validationFlags, const QByteArray &key) con
     memcpy(p + 4, d->magic, 4);
     memcpy(p + 8, d->id, 12);
 
-    for (const Attribute &i: d->attribs) {
+    for (const Attribute &i : d->attribs) {
         int at = append_attribute_uninitialized(&buf, i.type, i.value.size());
         if (at == -1)
             return QByteArray();
diff --git a/src/irisnet/noncore/stuntypes.cpp b/src/irisnet/noncore/stuntypes.cpp
index 36bb0721..ae1ea808 100644
--- a/src/irisnet/noncore/stuntypes.cpp
+++ b/src/irisnet/noncore/stuntypes.cpp
@@ -621,7 +621,7 @@ namespace StunTypes {
         out += "Attributes:";
         QList<StunMessage::Attribute> attribs = message.attributes();
         if (!attribs.isEmpty()) {
-            for (const StunMessage::Attribute &a: attribs) {
+            for (const StunMessage::Attribute &a : attribs) {
                 out += '\n';
 
                 QString name = attributeTypeToString(a.type);
diff --git a/src/irisnet/noncore/tcpportreserver.cpp b/src/irisnet/noncore/tcpportreserver.cpp
index 764569f7..528bffb7 100644
--- a/src/irisnet/noncore/tcpportreserver.cpp
+++ b/src/irisnet/noncore/tcpportreserver.cpp
@@ -76,7 +76,7 @@ TcpPortServer::PortTypes TcpPortDiscoverer::setTypeMask(TcpPortServer::PortTypes
 void TcpPortDiscoverer::start()
 {
     QList<QHostAddress> listenAddrs;
-    for (const QNetworkInterface &ni: QNetworkInterface::allInterfaces()) {
+    for (const QNetworkInterface &ni : QNetworkInterface::allInterfaces()) {
         if (!(ni.flags() & (QNetworkInterface::IsUp | QNetworkInterface::IsRunning))) {
             continue;
         }
@@ -84,7 +84,7 @@ void TcpPortDiscoverer::start()
             continue;
         }
         QList<QNetworkAddressEntry> entries = ni.addressEntries();
-        for (const QNetworkAddressEntry &na: entries) {
+        for (const QNetworkAddressEntry &na : entries) {
             QHostAddress h = na.ip();
             if (h.isLoopback()) {
                 continue;
diff --git a/src/irisnet/noncore/turnclient.cpp b/src/irisnet/noncore/turnclient.cpp
index 5eb3ad00..a2935343 100644
--- a/src/irisnet/noncore/turnclient.cpp
+++ b/src/irisnet/noncore/turnclient.cpp
@@ -505,7 +505,7 @@ class TurnClient::Private : public QObject {
     void ensureChannels(const QList<StunAllocate::Channel> &channels)
     {
         bool changed = false;
-        for (const StunAllocate::Channel &c: channels) {
+        for (const StunAllocate::Channel &c : channels) {
             if (!desiredChannels.contains(c)) {
                 if (debugLevel >= TurnClient::DL_Info)
                     emit q->debugLine(
@@ -568,7 +568,7 @@ class TurnClient::Private : public QObject {
     void emitPacketsWritten(const QList<Written> &writtenDests)
     {
         ObjectSessionWatcher watch(&sess);
-        for (const Written &wr: writtenDests) {
+        for (const Written &wr : writtenDests) {
             emit q->packetsWritten(wr.count, wr.addr, wr.port);
             if (!watch.isValid())
                 return;
diff --git a/src/irisnet/noncore/udpportreserver.cpp b/src/irisnet/noncore/udpportreserver.cpp
index ef79231b..5c2be256 100644
--- a/src/irisnet/noncore/udpportreserver.cpp
+++ b/src/irisnet/noncore/udpportreserver.cpp
@@ -40,11 +40,11 @@ class UdpPortReserver::Private : public QObject {
         // keep track of which addresses we lent out
         QList<QHostAddress> lentAddrs;
 
-        Item() : port(-1), lent(false) {}
+        Item() : port(-1), lent(false) { }
 
         bool haveAddress(const QHostAddress &addr) const
         {
-            for (const QUdpSocket *sock: sockList) {
+            for (const QUdpSocket *sock : sockList) {
                 if (sock->localAddress() == addr)
                     return true;
             }
@@ -66,12 +66,12 @@ class UdpPortReserver::Private : public QObject {
      */
     QList<Item> items;
 
-    Private(UdpPortReserver *_q) : QObject(_q), q(_q) {}
+    Private(UdpPortReserver *_q) : QObject(_q), q(_q) { }
 
     ~Private()
     {
         bool lendingAny = false;
-        for (const Item &i: items) {
+        for (const Item &i : items) {
             if (i.lent) {
                 lendingAny = true;
                 break;
@@ -82,7 +82,7 @@ class UdpPortReserver::Private : public QObject {
         if (lendingAny)
             abort();
 
-        for (const Item &i: items) {
+        for (const Item &i : items) {
             foreach (QUdpSocket *sock, i.sockList)
                 sock->deleteLater();
         }
@@ -99,9 +99,9 @@ class UdpPortReserver::Private : public QObject {
     void updatePorts(const QList<int> &newPorts)
     {
         QList<int> added;
-        for (int x: newPorts) {
+        for (int x : newPorts) {
             bool found = false;
-            for (const Item &i: items) {
+            for (const Item &i : items) {
                 if (i.port == x) {
                     found = true;
                     break;
@@ -117,7 +117,7 @@ class UdpPortReserver::Private : public QObject {
         // keep ports in sorted order
         std::sort(ports.begin(), ports.end());
 
-        for (int x: added) {
+        for (int x : added) {
             int insert_before = items.count();
             for (int n = 0; n < items.count(); ++n) {
                 if (x < items[n].port) {
@@ -138,7 +138,7 @@ class UdpPortReserver::Private : public QObject {
     bool reservedAll() const
     {
         bool ok = true;
-        for (const Item &i: items) {
+        for (const Item &i : items) {
             // skip ports we don't care about
             if (!ports.contains(i.port))
                 continue;
@@ -192,7 +192,7 @@ class UdpPortReserver::Private : public QObject {
 
     void returnSockets(const QList<QUdpSocket *> &sockList)
     {
-        for (QUdpSocket *sock: sockList) {
+        for (QUdpSocket *sock : sockList) {
             int at = -1;
             for (int n = 0; n < items.count(); ++n) {
                 if (items[n].sockList.contains(sock)) {
@@ -245,12 +245,12 @@ private slots:
                 continue;
 
             QList<QHostAddress> neededAddrs;
-            for (const QHostAddress &a: addrs) {
+            for (const QHostAddress &a : addrs) {
                 if (!i.haveAddress(a))
                     neededAddrs += a;
             }
 
-            for (const QHostAddress &a: neededAddrs) {
+            for (const QHostAddress &a : neededAddrs) {
                 QUdpSocket *sock = new QUdpSocket(q);
 
                 if (!sock->bind(a, i.port)) {
@@ -302,7 +302,7 @@ private slots:
         if (addrs.isEmpty())
             return false;
 
-        for (const QHostAddress &a: addrs) {
+        for (const QHostAddress &a : addrs) {
             if (!i.haveAddress(a))
                 return false;
         }
@@ -343,7 +343,7 @@ private slots:
         QList<QUdpSocket *> out;
 
         i->lent = true;
-        for (QUdpSocket *sock: i->sockList) {
+        for (QUdpSocket *sock : i->sockList) {
             i->lentAddrs += sock->localAddress();
             sock->disconnect(this);
             sock->setParent(parent);
diff --git a/src/xmpp/base/randomnumbergenerator.cpp b/src/xmpp/base/randomnumbergenerator.cpp
index f4521451..224d010c 100644
--- a/src/xmpp/base/randomnumbergenerator.cpp
+++ b/src/xmpp/base/randomnumbergenerator.cpp
@@ -21,7 +21,7 @@
 #include <cassert>
 
 namespace XMPP {
-RandomNumberGenerator::~RandomNumberGenerator() {}
+RandomNumberGenerator::~RandomNumberGenerator() { }
 
 double RandomNumberGenerator::generateNumberBetween(double a, double b) const
 {
diff --git a/src/xmpp/base/unittest/randomnumbergeneratortest.cpp b/src/xmpp/base/unittest/randomnumbergeneratortest.cpp
index cba6b0aa..48a99fbe 100644
--- a/src/xmpp/base/unittest/randomnumbergeneratortest.cpp
+++ b/src/xmpp/base/unittest/randomnumbergeneratortest.cpp
@@ -30,7 +30,7 @@ class RandomNumberGeneratorTest : public QObject {
 private:
     class DummyRandomNumberGenerator : public RandomNumberGenerator {
     public:
-        DummyRandomNumberGenerator(double value, double maximum) : value_(value), maximum_(maximum) {}
+        DummyRandomNumberGenerator(double value, double maximum) : value_(value), maximum_(maximum) { }
 
         double generateNumber() const { return value_; }
         double getMaximumGeneratedNumber() const { return maximum_; }
diff --git a/src/xmpp/jid/jid.cpp b/src/xmpp/jid/jid.cpp
index e1149d07..e4d2f774 100644
--- a/src/xmpp/jid/jid.cpp
+++ b/src/xmpp/jid/jid.cpp
@@ -170,7 +170,7 @@ StringPrepCache *StringPrepCache::instance()
     return _instance.data();
 }
 
-StringPrepCache::StringPrepCache() {}
+StringPrepCache::StringPrepCache() { }
 
 //----------------------------------------------------------------------------
 // Jid
@@ -191,7 +191,7 @@ Jid::Jid()
     null  = true;
 }
 
-Jid::~Jid() {}
+Jid::~Jid() { }
 
 Jid::Jid(const QString &s) { set(s); }
 
diff --git a/src/xmpp/qa/qttestutil/example/myfirstclasstest.cpp b/src/xmpp/qa/qttestutil/example/myfirstclasstest.cpp
index 243768ff..89c12a0a 100644
--- a/src/xmpp/qa/qttestutil/example/myfirstclasstest.cpp
+++ b/src/xmpp/qa/qttestutil/example/myfirstclasstest.cpp
@@ -7,9 +7,9 @@ class MyFirstClassTest : public QObject {
     Q_OBJECT
 
 private slots:
-    void initTestCase() {}
+    void initTestCase() { }
 
-    void cleanupTestCase() {}
+    void cleanupTestCase() { }
 
     void testMyMethod()
     {
diff --git a/src/xmpp/qa/qttestutil/example/mysecondclasstest.cpp b/src/xmpp/qa/qttestutil/example/mysecondclasstest.cpp
index 15b762c6..4d73775f 100644
--- a/src/xmpp/qa/qttestutil/example/mysecondclasstest.cpp
+++ b/src/xmpp/qa/qttestutil/example/mysecondclasstest.cpp
@@ -7,9 +7,9 @@ class MySecondClassTest : public QObject {
     Q_OBJECT
 
 private slots:
-    void initTestCase() {}
+    void initTestCase() { }
 
-    void cleanupTestCase() {}
+    void cleanupTestCase() { }
 
     void testMyMethod()
     {
diff --git a/src/xmpp/qa/unittest.template/myclasstest.cpp b/src/xmpp/qa/unittest.template/myclasstest.cpp
index d1555cb2..ff7008ae 100644
--- a/src/xmpp/qa/unittest.template/myclasstest.cpp
+++ b/src/xmpp/qa/unittest.template/myclasstest.cpp
@@ -25,9 +25,9 @@ class MyClassTest : public QObject {
     Q_OBJECT
 
 private slots:
-    void initTestCase() {}
+    void initTestCase() { }
 
-    void cleanupTestCase() {}
+    void cleanupTestCase() { }
 
     void testMyMethod()
     {
diff --git a/src/xmpp/sasl/digestmd5proplist.cpp b/src/xmpp/sasl/digestmd5proplist.cpp
index 01bff42f..58090747 100644
--- a/src/xmpp/sasl/digestmd5proplist.cpp
+++ b/src/xmpp/sasl/digestmd5proplist.cpp
@@ -19,7 +19,7 @@
 #include "xmpp/sasl/digestmd5proplist.h"
 
 namespace XMPP {
-DIGESTMD5PropList::DIGESTMD5PropList() : QList<DIGESTMD5Prop>() {}
+DIGESTMD5PropList::DIGESTMD5PropList() : QList<DIGESTMD5Prop>() { }
 
 void DIGESTMD5PropList::set(const QByteArray &var, const QByteArray &val)
 {
diff --git a/src/xmpp/sasl/unittest/scramsha1messagetest.cpp b/src/xmpp/sasl/unittest/scramsha1messagetest.cpp
index 8310742c..9df7ca99 100644
--- a/src/xmpp/sasl/unittest/scramsha1messagetest.cpp
+++ b/src/xmpp/sasl/unittest/scramsha1messagetest.cpp
@@ -30,7 +30,7 @@ class SCRAMSHA1MessageTest : public QObject {
     Q_OBJECT
 
 private slots:
-    void testConstructor_WithAuthzid() {}
+    void testConstructor_WithAuthzid() { }
 
     void testConstructor_WithoutAuthzid()
     {
diff --git a/src/xmpp/sasl/unittest/scramsha1responsetest.cpp b/src/xmpp/sasl/unittest/scramsha1responsetest.cpp
index 4d09222b..96b232dd 100644
--- a/src/xmpp/sasl/unittest/scramsha1responsetest.cpp
+++ b/src/xmpp/sasl/unittest/scramsha1responsetest.cpp
@@ -31,7 +31,7 @@ class SCRAMSHA1ResponseTest : public QObject {
     Q_OBJECT
 
 private slots:
-    void testConstructor_WithAuthzid() {}
+    void testConstructor_WithAuthzid() { }
 
     void testConstructor_WithoutAuthzid()
     {
diff --git a/src/xmpp/xmpp-core/connector.cpp b/src/xmpp/xmpp-core/connector.cpp
index f10f75c7..74d2966f 100644
--- a/src/xmpp/xmpp-core/connector.cpp
+++ b/src/xmpp/xmpp-core/connector.cpp
@@ -61,7 +61,7 @@ Connector::Connector(QObject *parent) : QObject(parent)
     setPeerAddressNone();
 }
 
-Connector::~Connector() {}
+Connector::~Connector() { }
 
 bool Connector::useSSL() const { return ssl; }
 
diff --git a/src/xmpp/xmpp-core/parser.cpp b/src/xmpp/xmpp-core/parser.cpp
index 37bd9fdc..edbe6c5e 100644
--- a/src/xmpp/xmpp-core/parser.cpp
+++ b/src/xmpp/xmpp-core/parser.cpp
@@ -328,7 +328,7 @@ class StreamInput : public QXmlInputSource {
 namespace XMPP {
 class ParserHandler : public QXmlDefaultHandler {
 public:
-    explicit ParserHandler(StreamInput *_in, QDomDocument *_doc) : in(_in), doc(_doc) {}
+    explicit ParserHandler(StreamInput *_in, QDomDocument *_doc) : in(_in), doc(_doc) { }
 
     ~ParserHandler()
     {
diff --git a/src/xmpp/xmpp-core/protocol.cpp b/src/xmpp/xmpp-core/protocol.cpp
index e3c94092..14ae2174 100644
--- a/src/xmpp/xmpp-core/protocol.cpp
+++ b/src/xmpp/xmpp-core/protocol.cpp
@@ -137,7 +137,7 @@ BasicProtocol::StreamCondEntry BasicProtocol::streamCondTable[] = {
 
 BasicProtocol::BasicProtocol() : XmlProtocol() { init(); }
 
-BasicProtocol::~BasicProtocol() {}
+BasicProtocol::~BasicProtocol() { }
 
 void BasicProtocol::init()
 {
@@ -1279,7 +1279,7 @@ bool CoreProtocol::normalStep(const QDomElement &e)
             }
         } else {
             QDomElement mechs = doc.createElementNS(NS_SASL, "mechanisms");
-            for (const QString &it: sasl_mechlist) {
+            for (const QString &it : sasl_mechlist) {
                 QDomElement m = doc.createElement("mechanism");
                 m.appendChild(doc.createTextNode(it));
                 mechs.appendChild(m);
diff --git a/src/xmpp/xmpp-core/securestream.cpp b/src/xmpp/xmpp-core/securestream.cpp
index 5123b411..213a032f 100644
--- a/src/xmpp/xmpp-core/securestream.cpp
+++ b/src/xmpp/xmpp-core/securestream.cpp
@@ -348,7 +348,7 @@ class SecureStream::Private {
 
     bool haveTLS() const
     {
-        for (SecureLayer *s: layers) {
+        for (SecureLayer *s : layers) {
             if (s->type == SecureLayer::TLS
 #ifdef USE_TLSHANDLER
                 || s->type == SecureLayer::TLSH
@@ -362,7 +362,7 @@ class SecureStream::Private {
 
     bool haveSASL() const
     {
-        for (SecureLayer *s: layers) {
+        for (SecureLayer *s : layers) {
             if (s->type == SecureLayer::SASL)
                 return true;
         }
@@ -371,7 +371,7 @@ class SecureStream::Private {
 
     bool haveCompress() const
     {
-        for (SecureLayer *s: layers) {
+        for (SecureLayer *s : layers) {
             if (s->type == SecureLayer::Compression)
                 return true;
         }
@@ -417,7 +417,7 @@ void SecureStream::linkLayer(QObject *s)
 int SecureStream::calcPrebytes() const
 {
     int x = 0;
-    for (SecureLayer *s: d->layers) {
+    for (SecureLayer *s : d->layers) {
         x += s->prebytes;
     }
     return (d->pending - x);
@@ -545,7 +545,7 @@ void SecureStream::bs_readyRead()
 
 void SecureStream::bs_bytesWritten(qint64 bytes)
 {
-    for (SecureLayer *s: d->layers) {
+    for (SecureLayer *s : d->layers) {
         bytes = s->finished(bytes);
     }
 
diff --git a/src/xmpp/xmpp-core/simplesasl.cpp b/src/xmpp/xmpp-core/simplesasl.cpp
index f6878f01..a8621500 100644
--- a/src/xmpp/xmpp-core/simplesasl.cpp
+++ b/src/xmpp/xmpp-core/simplesasl.cpp
@@ -140,7 +140,7 @@ class SimpleSASLContext : public QCA::SASLContext {
         Q_UNUSED(allowClientSendFirst);
 
         mechanism_ = QString();
-        for (QString mech: mechlist) {
+        for (QString mech : mechlist) {
             if (mech == "SCRAM-SHA-1") {
                 mechanism_ = "SCRAM-SHA-1";
                 break;
@@ -413,10 +413,10 @@ class SimpleSASLContext : public QCA::SASLContext {
 
 class QCASimpleSASL : public QCA::Provider {
 public:
-    QCASimpleSASL() {}
-    ~QCASimpleSASL() {}
+    QCASimpleSASL() { }
+    ~QCASimpleSASL() { }
 
-    void init() {}
+    void init() { }
 
     QString name() const { return "simplesasl"; }
 
diff --git a/src/xmpp/xmpp-core/stream.cpp b/src/xmpp/xmpp-core/stream.cpp
index f261865a..9f7e1d91 100644
--- a/src/xmpp/xmpp-core/stream.cpp
+++ b/src/xmpp/xmpp-core/stream.cpp
@@ -91,9 +91,9 @@ static QString genId()
 // Stream
 //----------------------------------------------------------------------------
 static XmlProtocol *foo = nullptr;
-Stream::Stream(QObject *parent) : QObject(parent) {}
+Stream::Stream(QObject *parent) : QObject(parent) { }
 
-Stream::~Stream() {}
+Stream::~Stream() { }
 
 Stanza Stream::createStanza(Stanza::Kind k, const Jid &to, const QString &type, const QString &id)
 {
@@ -272,7 +272,7 @@ void ClientStream::reset(bool all)
         }
     } else {
         QSharedPointer<QDomDocument> sd;
-        for (Stanza *s: d->in) {
+        for (Stanza *s : d->in) {
             sd = s->unboundDocument(sd);
         }
     }
@@ -883,7 +883,7 @@ void ClientStream::processNext()
 #endif
         bool ok = d->client.processStep();
         // deal with send/received items
-        for (const XmlProtocol::TransferItem &i: d->client.transferItemList) {
+        for (const XmlProtocol::TransferItem &i : d->client.transferItemList) {
             if (i.isExternal)
                 continue;
             QString str;
@@ -1125,7 +1125,7 @@ bool ClientStream::handleNeed()
 
         // ensure simplesasl provider is installed
         bool found = false;
-        for (QCA::Provider *p: QCA::providers()) {
+        for (QCA::Provider *p : QCA::providers()) {
             if (p->name() == "simplesasl") {
                 found = true;
                 break;
@@ -1160,7 +1160,7 @@ bool ClientStream::handleNeed()
         }
 
         QString saslProvider;
-        for (const QString &mech: d->mechProviders.keys()) {
+        for (const QString &mech : d->mechProviders.keys()) {
             if (ml.contains(mech)) {
                 saslProvider = d->mechProviders[mech];
                 break;
@@ -1523,12 +1523,12 @@ QList<QDomElement> ClientStream::unhandledFeatures() const { return d->client.un
 //----------------------------------------------------------------------------
 // Debug
 //----------------------------------------------------------------------------
-Debug::~Debug() {}
+Debug::~Debug() { }
 
 #ifdef XMPP_TEST
-TD::TD() {}
+TD::TD() { }
 
-TD::~TD() {}
+TD::~TD() { }
 
 void TD::msg(const QString &s)
 {
diff --git a/src/xmpp/xmpp-core/tlshandler.cpp b/src/xmpp/xmpp-core/tlshandler.cpp
index 6c849051..9c7f8718 100644
--- a/src/xmpp/xmpp-core/tlshandler.cpp
+++ b/src/xmpp/xmpp-core/tlshandler.cpp
@@ -149,11 +149,11 @@ static bool cert_match_domain(const QString &certname, const QString &acedomain)
         return false;
 
     // don't allow empty parts
-    for (const QString &s: parts_name) {
+    for (const QString &s : parts_name) {
         if (s.isEmpty())
             return false;
     }
-    for (const QString &s: parts_compare) {
+    for (const QString &s : parts_compare) {
         if (s.isEmpty())
             return false;
     }
@@ -220,19 +220,19 @@ static bool matchesHostName(const QCA::Certificate &cert, const QString &host)
     if (!ipaddr.isEmpty()) // ip address
     {
         // check iPAddress
-        for (const QString &s: cert.subjectInfo().values(IPAddress)) {
+        for (const QString &s : cert.subjectInfo().values(IPAddress)) {
             if (cert_match_ipaddress(s, ipaddr))
                 return true;
         }
 
         // check dNSName
-        for (const QString &s: cert.subjectInfo().values(DNS)) {
+        for (const QString &s : cert.subjectInfo().values(DNS)) {
             if (cert_match_ipaddress(s, ipaddr))
                 return true;
         }
 
         // check commonName
-        for (const QString &s: cert.subjectInfo().values(CommonName)) {
+        for (const QString &s : cert.subjectInfo().values(CommonName)) {
             if (cert_match_ipaddress(s, ipaddr))
                 return true;
         }
@@ -257,13 +257,13 @@ static bool matchesHostName(const QCA::Certificate &cert, const QString &host)
             return false;
 
         // check dNSName
-        for (const QString &s: cert.subjectInfo().values(DNS)) {
+        for (const QString &s : cert.subjectInfo().values(DNS)) {
             if (cert_match_domain(s, name))
                 return true;
         }
 
         // check commonName
-        for (const QString &s: cert.subjectInfo().values(CommonName)) {
+        for (const QString &s : cert.subjectInfo().values(CommonName)) {
             if (cert_match_domain(s, name))
                 return true;
         }
@@ -275,9 +275,9 @@ static bool matchesHostName(const QCA::Certificate &cert, const QString &host)
 //----------------------------------------------------------------------------
 // TLSHandler
 //----------------------------------------------------------------------------
-TLSHandler::TLSHandler(QObject *parent) : QObject(parent) {}
+TLSHandler::TLSHandler(QObject *parent) : QObject(parent) { }
 
-TLSHandler::~TLSHandler() {}
+TLSHandler::~TLSHandler() { }
 
 //----------------------------------------------------------------------------
 // QCATLSHandler
@@ -319,7 +319,7 @@ bool QCATLSHandler::certMatchesHostname()
 
     Jid host(d->host);
 
-    for (const QString &idOnXmppAddr: peerCert.primary().subjectInfo().values(QCA::XMPP)) {
+    for (const QString &idOnXmppAddr : peerCert.primary().subjectInfo().values(QCA::XMPP)) {
         if (host.compare(Jid(idOnXmppAddr)))
             return true;
     }
diff --git a/src/xmpp/xmpp-core/xmlprotocol.cpp b/src/xmpp/xmpp-core/xmlprotocol.cpp
index d40661dc..f5de5863 100644
--- a/src/xmpp/xmpp-core/xmlprotocol.cpp
+++ b/src/xmpp/xmpp-core/xmlprotocol.cpp
@@ -228,7 +228,7 @@ static QString sanitizeForStream(const QString &in)
 //----------------------------------------------------------------------------
 // Protocol
 //----------------------------------------------------------------------------
-XmlProtocol::TransferItem::TransferItem() {}
+XmlProtocol::TransferItem::TransferItem() { }
 
 XmlProtocol::TransferItem::TransferItem(const QString &_str, bool sent, bool external) :
     isSent(sent), isString(true), isExternal(external), str(_str)
@@ -242,7 +242,7 @@ XmlProtocol::TransferItem::TransferItem(const QDomElement &_elem, bool sent, boo
 
 XmlProtocol::XmlProtocol() { init(); }
 
-XmlProtocol::~XmlProtocol() {}
+XmlProtocol::~XmlProtocol() { }
 
 void XmlProtocol::init()
 {
diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
index e2458f3c..34231c6a 100644
--- a/src/xmpp/xmpp-im/client.cpp
+++ b/src/xmpp/xmpp-im/client.cpp
@@ -112,7 +112,7 @@ class Client::GroupChat {
 
 class Client::ClientPrivate {
 public:
-    ClientPrivate() {}
+    ClientPrivate() { }
 
     QPointer<ClientStream>  stream;
     QDomDocument            doc;
@@ -287,7 +287,7 @@ bool Client::isActive() const { return d->active; }
 QString Client::groupChatPassword(const QString &host, const QString &room) const
 {
     Jid jid(room + "@" + host);
-    for (const GroupChat &i: d->groupChatList) {
+    for (const GroupChat &i : d->groupChatList) {
         if (i.j.compare(jid, false)) {
             return i.password;
         }
@@ -355,7 +355,7 @@ void Client::groupChatSetStatus(const QString &host, const QString &room, const
 {
     Jid  jid(room + "@" + host);
     bool found = false;
-    for (const GroupChat &i: d->groupChatList) {
+    for (const GroupChat &i : d->groupChatList) {
         if (i.j.compare(jid, false)) {
             found = true;
             jid   = i.j;
@@ -414,7 +414,7 @@ void Client::groupChatLeaveAll(const QString &statusStr)
 QString Client::groupChatNick(const QString &host, const QString &room) const
 {
     Jid jid(room + "@" + host);
-    for (const GroupChat &gc: d->groupChatList) {
+    for (const GroupChat &gc : d->groupChatList) {
         if (gc.j.compare(jid, false)) {
             return gc.j.resource();
         }
@@ -565,7 +565,7 @@ void Client::streamOutgoingXml(const QString &s)
 void Client::parseUnhandledStreamFeatures()
 {
     QList<QDomElement> nl = d->stream->unhandledFeatures();
-    for (const QDomElement &e: nl) {
+    for (const QDomElement &e : nl) {
         if (e.localName() == "c" && e.namespaceURI() == NS_CAPS) {
             d->serverCaps = CapsSpec::fromXml(e);
             if (d->capsman->isEnabled()) {
@@ -866,7 +866,7 @@ void Client::pmMessage(const Message &m)
     debug(QString("Client: Message from %1\n").arg(m.from().full()));
 
     // bits of binary. we can't do this in Message, since it knows nothing about Client
-    for (const BoBData &b: m.bobDataList()) {
+    for (const BoBData &b : m.bobDataList()) {
         d->bobman->append(b);
     }
 
@@ -1151,7 +1151,7 @@ DiscoItem Client::makeDiscoResult(const QString &node) const
     Hash::populateFeatures(features);
 
     // Client-specific features
-    for (const QString &i: d->features.list()) {
+    for (const QString &i : d->features.list()) {
         features.addFeature(i);
     }
 
@@ -1237,7 +1237,7 @@ LiveRosterItem::LiveRosterItem(const RosterItem &i)
     setFlagForDelete(false);
 }
 
-LiveRosterItem::~LiveRosterItem() {}
+LiveRosterItem::~LiveRosterItem() { }
 
 void LiveRosterItem::setRosterItem(const RosterItem &i)
 {
@@ -1280,7 +1280,7 @@ class LiveRoster::Private {
     QString groupsDelimiter;
 };
 
-LiveRoster::LiveRoster() : QList<LiveRosterItem>(), d(new LiveRoster::Private) {}
+LiveRoster::LiveRoster() : QList<LiveRosterItem>(), d(new LiveRoster::Private) { }
 LiveRoster::LiveRoster(const LiveRoster &other) : QList<LiveRosterItem>(other), d(new LiveRoster::Private)
 {
     d->groupsDelimiter = other.d->groupsDelimiter;
diff --git a/src/xmpp/xmpp-im/filetransfer.cpp b/src/xmpp/xmpp-im/filetransfer.cpp
index 9108d906..3ff010b3 100644
--- a/src/xmpp/xmpp-im/filetransfer.cpp
+++ b/src/xmpp/xmpp-im/filetransfer.cpp
@@ -400,7 +400,7 @@ void FileTransferManager::setDisabled(const QString &ns, bool state)
 void FileTransferManager::pft_incoming(const FTRequest &req)
 {
     QString streamType;
-    for (const QString &ns: d->streamPriority) {
+    for (const QString &ns : d->streamPriority) {
         if (req.streamTypes.contains(ns)) {
             BytestreamManager *manager = streamManager(ns);
             if (manager && manager->isAcceptableSID(req.from, req.id)) {
@@ -432,7 +432,7 @@ BytestreamManager *FileTransferManager::streamManager(const QString &ns) const
 QStringList FileTransferManager::streamPriority() const
 {
     QStringList ret;
-    for (const QString &ns: d->streamPriority) {
+    for (const QString &ns : d->streamPriority) {
         if (!d->disabledStreamTypes.contains(ns)) {
             ret.append(ns);
         }
@@ -442,7 +442,7 @@ QStringList FileTransferManager::streamPriority() const
 
 void FileTransferManager::stream_incomingReady(BSConnection *c)
 {
-    for (FileTransfer *ft: d->list) {
+    for (FileTransfer *ft : d->list) {
         if (ft->d->needStream && ft->d->peer.compare(c->peer()) && ft->d->id == c->sid()) {
             ft->takeConnection(c);
             return;
@@ -459,7 +459,7 @@ QString FileTransferManager::link(FileTransfer *ft)
     do {
         found = false;
         id    = QString("ft_%1").arg(qrand() & 0xffff, 4, 16, QChar('0'));
-        for (FileTransfer *ft: d->list) {
+        for (FileTransfer *ft : d->list) {
             if (ft->d->peer.compare(ft->d->peer) && ft->d->id == id) {
                 found = true;
                 break;
@@ -642,9 +642,9 @@ bool JT_FT::take(const QDomElement &x)
 //----------------------------------------------------------------------------
 // JT_PushFT
 //----------------------------------------------------------------------------
-JT_PushFT::JT_PushFT(Task *parent) : Task(parent) {}
+JT_PushFT::JT_PushFT(Task *parent) : Task(parent) { }
 
-JT_PushFT::~JT_PushFT() {}
+JT_PushFT::~JT_PushFT() { }
 
 void JT_PushFT::respondSuccess(const Jid &to, const QString &id, qlonglong rangeOffset, qlonglong rangeLength,
                                const QString &streamType)
diff --git a/src/xmpp/xmpp-im/jingle-application.cpp b/src/xmpp/xmpp-im/jingle-application.cpp
index 8ba8f550..5b3cfa40 100644
--- a/src/xmpp/xmpp-im/jingle-application.cpp
+++ b/src/xmpp/xmpp-im/jingle-application.cpp
@@ -25,7 +25,7 @@ namespace XMPP { namespace Jingle {
     //----------------------------------------------------------------------------
     // Application
     //----------------------------------------------------------------------------
-    ApplicationManager::ApplicationManager(QObject *parent) : QObject(parent) {}
+    ApplicationManager::ApplicationManager(QObject *parent) : QObject(parent) { }
 
     //----------------------------------------------------------------------------
     // Application
diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 267e16ff..872c8ad4 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -81,9 +81,9 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
         QByteArray  amplitudes;
     };
 
-    File::File() {}
+    File::File() { }
 
-    File::~File() {}
+    File::~File() { }
 
     File &File::operator=(const File &other)
     {
@@ -91,7 +91,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
         return *this;
     }
 
-    File::File(const File &other) : d(other.d) {}
+    File::File(const File &other) : d(other.d) { }
 
     File::File(const QDomElement &file)
     {
@@ -372,7 +372,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
     //----------------------------------------------------------------------------
     // ApplicationManager
     //----------------------------------------------------------------------------
-    Manager::Manager(QObject *parent) : XMPP::Jingle::ApplicationManager(parent) {}
+    Manager::Manager(QObject *parent) : XMPP::Jingle::ApplicationManager(parent) { }
 
     Manager::~Manager()
     {
@@ -394,7 +394,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
 
     ApplicationManagerPad *Manager::pad(Session *session) { return new Pad(this, session); }
 
-    void Manager::closeAll() {}
+    void Manager::closeAll() { }
 
     Client *Manager::client()
     {
@@ -547,7 +547,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
             new NSTransportsList(pad->session(), static_cast<Manager *>(pad->manager())->availableTransports()));
     }
 
-    Application::~Application() {}
+    Application::~Application() { }
 
     void Application::setState(State state) { d->setState(state); }
 
@@ -807,7 +807,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
 
     Connection::Ptr Application::connection() const { return d->connection.staticCast<XMPP::Jingle::Connection>(); }
 
-    Pad::Pad(Manager *manager, Session *session) : _manager(manager), _session(session) {}
+    Pad::Pad(Manager *manager, Session *session) : _manager(manager), _session(session) { }
 
     QDomElement Pad::takeOutgoingSessionInfoUpdate()
     {
diff --git a/src/xmpp/xmpp-im/jingle-ibb.cpp b/src/xmpp/xmpp-im/jingle-ibb.cpp
index dc50e031..8641c793 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.cpp
+++ b/src/xmpp/xmpp-im/jingle-ibb.cpp
@@ -381,7 +381,7 @@ namespace XMPP { namespace Jingle { namespace IBB {
         XMPP::Jingle::Manager *                                jingleManager = nullptr;
     };
 
-    Manager::Manager(QObject *parent) : TransportManager(parent), d(new Private) {}
+    Manager::Manager(QObject *parent) : TransportManager(parent), d(new Private) { }
 
     Manager::~Manager()
     {
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 07eead7c..59574dc2 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -127,7 +127,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
 
         void connectToHost(const QHostAddress &proxyHost, int proxyPort, const QString &host, bool udpMode)
         {
-            for (const QNetworkInterface &ni: QNetworkInterface::allInterfaces()) {
+            for (const QNetworkInterface &ni : QNetworkInterface::allInterfaces()) {
                 if (!(ni.flags() & (QNetworkInterface::IsUp | QNetworkInterface::IsRunning))) {
                     continue;
                 }
@@ -135,7 +135,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
                     continue;
                 }
                 QList<QNetworkAddressEntry> entries = ni.addressEntries();
-                for (const QNetworkAddressEntry &na: entries) {
+                for (const QNetworkAddressEntry &na : entries) {
                     QHostAddress ha = na.ip();
                     if (ha.protocol() == QAbstractSocket::IPv6Protocol &&
 #if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
@@ -300,7 +300,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
         }
     };
 
-    Candidate::Candidate() {}
+    Candidate::Candidate() { }
 
     Candidate::Candidate(Transport *transport, const QDomElement &el)
     {
@@ -357,7 +357,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
         this->d      = d;
     }
 
-    Candidate::Candidate(const Candidate &other) : d(other.d) {}
+    Candidate::Candidate(const Candidate &other) : d(other.d) { }
 
     Candidate::Candidate(Transport *transport, const Jid &proxy, const QString &cid, quint16 localPreference) :
         d(new Private)
@@ -411,7 +411,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
         d->state = New;
     }
 
-    Candidate::~Candidate() {}
+    Candidate::~Candidate() { }
 
     Candidate::Type Candidate::type() const { return d->type; }
 
@@ -1595,7 +1595,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
         Jid                         proxy;
     };
 
-    Manager::Manager(QObject *parent) : TransportManager(parent), d(new Private) {}
+    Manager::Manager(QObject *parent) : TransportManager(parent), d(new Private) { }
 
     Manager::~Manager()
     {
diff --git a/src/xmpp/xmpp-im/jingle-session.cpp b/src/xmpp/xmpp-im/jingle-session.cpp
index b5af1b23..beaf60d6 100644
--- a/src/xmpp/xmpp-im/jingle-session.cpp
+++ b/src/xmpp/xmpp-im/jingle-session.cpp
@@ -39,9 +39,9 @@ namespace XMPP { namespace Jingle {
         Jid         to_;
 
     public:
-        JT(Task *parent) : Task(parent) {}
+        JT(Task *parent) : Task(parent) { }
 
-        ~JT() {}
+        ~JT() { }
 
         void request(const Jid &to, const QDomElement &jingleEl)
         {
diff --git a/src/xmpp/xmpp-im/jingle-transport.cpp b/src/xmpp/xmpp-im/jingle-transport.cpp
index ef159240..8fe6eb8b 100644
--- a/src/xmpp/xmpp-im/jingle-transport.cpp
+++ b/src/xmpp/xmpp-im/jingle-transport.cpp
@@ -24,12 +24,12 @@ namespace XMPP { namespace Jingle {
     //----------------------------------------------------------------------------
     // TransportManager
     //----------------------------------------------------------------------------
-    TransportManager::TransportManager(QObject *parent) : QObject(parent) {}
+    TransportManager::TransportManager(QObject *parent) : QObject(parent) { }
 
     //----------------------------------------------------------------------------
     // Transport
     //----------------------------------------------------------------------------
-    Transport::Transport(TransportManagerPad::Ptr pad, Origin creator) : _creator(creator), _pad(pad) {}
+    Transport::Transport(TransportManagerPad::Ptr pad, Origin creator) : _creator(creator), _pad(pad) { }
 
     bool Transport::isRemote() const { return _pad->session()->role() != _creator; }
 
@@ -61,7 +61,7 @@ namespace XMPP { namespace Jingle {
     //----------------------------------------------------------------------------
     // TransportSelector
     //----------------------------------------------------------------------------
-    TransportSelector::~TransportSelector() {}
+    TransportSelector::~TransportSelector() { }
 
     bool TransportSelector::canReplace(QSharedPointer<Transport> old, QSharedPointer<Transport> newer)
     {
diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index 53a072ec..48e4c87e 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -79,7 +79,7 @@ namespace XMPP { namespace Jingle {
         Jid     responder;
     };
 
-    Jingle::Jingle() {}
+    Jingle::Jingle() { }
 
     Jingle::Jingle(Action action, const QString &sid) : d(new Private)
     {
@@ -126,9 +126,9 @@ namespace XMPP { namespace Jingle {
         d->responder = responder;
     }
 
-    Jingle::Jingle(const Jingle &other) : d(other.d) {}
+    Jingle::Jingle(const Jingle &other) : d(other.d) { }
 
-    Jingle::~Jingle() {}
+    Jingle::~Jingle() { }
 
     Jingle::Private *Jingle::ensureD()
     {
@@ -202,9 +202,9 @@ namespace XMPP { namespace Jingle {
         QString           text;
     };
 
-    Reason::Reason() {}
+    Reason::Reason() { }
 
-    Reason::~Reason() {}
+    Reason::~Reason() { }
 
     Reason::Reason(Reason::Condition cond, const QString &text) : d(new Private)
     {
@@ -238,7 +238,7 @@ namespace XMPP { namespace Jingle {
         }
     }
 
-    Reason::Reason(const Reason &other) : d(other.d) {}
+    Reason::Reason(const Reason &other) : d(other.d) { }
 
     Reason &Reason::operator=(const Reason &other)
     {
@@ -292,7 +292,7 @@ namespace XMPP { namespace Jingle {
     //----------------------------------------------------------------------------
     // ContentBase
     //----------------------------------------------------------------------------
-    ContentBase::ContentBase(Origin creator, const QString &name) : creator(creator), name(name) {}
+    ContentBase::ContentBase(Origin creator, const QString &name) : creator(creator), name(name) { }
 
     ContentBase::ContentBase(const QDomElement &el)
     {
@@ -378,9 +378,9 @@ namespace XMPP { namespace Jingle {
         QList<QString> externalSessions;
 
     public:
-        JTPush(Task *parent) : Task(parent) {}
+        JTPush(Task *parent) : Task(parent) { }
 
-        ~JTPush() {}
+        ~JTPush() { }
 
         inline void addExternalManager(const QString &ns) { externalManagers.append(ns); }
         inline void forgetExternalSession(const QString &sid) { externalSessions.removeOne(sid); }
diff --git a/src/xmpp/xmpp-im/s5b.cpp b/src/xmpp/xmpp-im/s5b.cpp
index 2b48754a..a1d0f335 100644
--- a/src/xmpp/xmpp-im/s5b.cpp
+++ b/src/xmpp/xmpp-im/s5b.cpp
@@ -139,9 +139,9 @@ private slots:
 //----------------------------------------------------------------------------
 // S5BDatagram
 //----------------------------------------------------------------------------
-S5BDatagram::S5BDatagram() {}
+S5BDatagram::S5BDatagram() { }
 
-S5BDatagram::S5BDatagram(int source, int dest, const QByteArray &data) : _source(source), _dest(dest), _buf(data) {}
+S5BDatagram::S5BDatagram(int source, int dest, const QByteArray &data) : _source(source), _dest(dest), _buf(data) { }
 
 int S5BDatagram::sourcePort() const { return _source; }
 
@@ -652,7 +652,7 @@ bool S5BManager::isAcceptableSID(const Jid &peer, const QString &sid) const
     QString key     = makeKey(sid, d->client->jid(), peer);
     QString key_out = makeKey(sid, peer, d->client->jid()); // not valid in muc via proxy
 
-    for (Entry *e: d->activeList) {
+    for (Entry *e : d->activeList) {
         if (e->i) {
             if (e->i->key == key || e->i->key == key_out)
                 return false;
@@ -673,7 +673,7 @@ const char *S5BManager::sidPrefix() const { return "s5b_"; }
 
 S5BConnection *S5BManager::findIncoming(const Jid &from, const QString &sid) const
 {
-    for (S5BConnection *c: d->incomingConns) {
+    for (S5BConnection *c : d->incomingConns) {
         if (c->d->peer.compare(from) && c->d->sid == sid)
             return c;
     }
@@ -682,7 +682,7 @@ S5BConnection *S5BManager::findIncoming(const Jid &from, const QString &sid) con
 
 S5BManager::Entry *S5BManager::findEntry(S5BConnection *c) const
 {
-    for (Entry *e: d->activeList) {
+    for (Entry *e : d->activeList) {
         if (e->c == c)
             return e;
     }
@@ -691,7 +691,7 @@ S5BManager::Entry *S5BManager::findEntry(S5BConnection *c) const
 
 S5BManager::Entry *S5BManager::findEntry(Item *i) const
 {
-    for (Entry *e: d->activeList) {
+    for (Entry *e : d->activeList) {
         if (e->i == i)
             return e;
     }
@@ -700,7 +700,7 @@ S5BManager::Entry *S5BManager::findEntry(Item *i) const
 
 S5BManager::Entry *S5BManager::findEntryByHash(const QString &key) const
 {
-    for (Entry *e: d->activeList) {
+    for (Entry *e : d->activeList) {
         if (e->i && e->i->key == key)
             return e;
     }
@@ -709,7 +709,7 @@ S5BManager::Entry *S5BManager::findEntryByHash(const QString &key) const
 
 S5BManager::Entry *S5BManager::findEntryBySID(const Jid &peer, const QString &sid) const
 {
-    for (Entry *e: d->activeList) {
+    for (Entry *e : d->activeList) {
         if (e->i && e->i->peer.compare(peer) && e->sid == sid)
             return e;
     }
@@ -928,7 +928,7 @@ void S5BManager::query_finished()
 {
     JT_S5B *query = static_cast<JT_S5B *>(sender());
     Entry * e     = nullptr;
-    for (Entry *i: d->activeList) {
+    for (Entry *i : d->activeList) {
         if (i->query == query) {
             e = i;
             break;
@@ -1096,7 +1096,7 @@ void S5BManager::Item::doOutgoing()
     StreamHostList hosts;
     auto           disco = m->client()->tcpPortReserver()->scope(QString::fromLatin1("s5b"))->disco();
     if (!haveHost(in_hosts, self)) {
-        for (auto &c: disco->takeServers()) {
+        for (auto &c : disco->takeServers()) {
             auto server = c.staticCast<S5BServer>();
             server->registerKey(key);
             relatedServers.append(server);
@@ -1150,7 +1150,7 @@ void S5BManager::Item::doIncoming()
     StreamHostList list;
     if (lateProxy) {
         // take just the proxy streamhosts
-        for (const StreamHost &it: in_hosts) {
+        for (const StreamHost &it : in_hosts) {
             if (it.isProxy())
                 list += it;
         }
@@ -1160,7 +1160,7 @@ void S5BManager::Item::doIncoming()
         if ((state == Requester || (state == Target && fast)) && !proxy.jid().isValid()) {
             // take just the non-proxy streamhosts
             bool hasProxies = false;
-            for (const StreamHost &it: in_hosts) {
+            for (const StreamHost &it : in_hosts) {
                 if (it.isProxy())
                     hasProxies = true;
                 else
@@ -1496,7 +1496,7 @@ void S5BManager::Item::checkForActivation()
         clientList.append(client);
     if (client_out)
         clientList.append(client_out);
-    for (SocksClient *sc: clientList) {
+    for (SocksClient *sc : clientList) {
 #ifdef S5B_DEBUG
         qDebug("checking for activation\n");
 #endif
@@ -1819,7 +1819,7 @@ void S5BConnector::t_timeout()
 void S5BConnector::man_udpSuccess(const Jid &streamHost)
 {
     // was anyone sending to this streamhost?
-    for (Item *i: d->itemList) {
+    for (Item *i : d->itemList) {
         if (i->host.jid().compare(streamHost) && i->client_udp) {
             i->udpSuccess();
             return;
@@ -1986,9 +1986,9 @@ StreamHost JT_S5B::proxyInfo() const { return d->proxyInfo; }
 //----------------------------------------------------------------------------
 // JT_PushS5B
 //----------------------------------------------------------------------------
-JT_PushS5B::JT_PushS5B(Task *parent) : Task(parent) {}
+JT_PushS5B::JT_PushS5B(Task *parent) : Task(parent) { }
 
-JT_PushS5B::~JT_PushS5B() {}
+JT_PushS5B::~JT_PushS5B() { }
 
 int JT_PushS5B::priority() const { return 1; }
 
diff --git a/src/xmpp/xmpp-im/types.cpp b/src/xmpp/xmpp-im/types.cpp
index 33caeac4..1f3e1116 100644
--- a/src/xmpp/xmpp-im/types.cpp
+++ b/src/xmpp/xmpp-im/types.cpp
@@ -109,7 +109,7 @@ void Url::setDesc(const QString &desc) { d->desc = desc; }
 //! \param Type - type (default: Unknown)
 //! \param Jid - specify address (default: empty string)
 //! \sa setType() setJid()
-Address::Address(Type type, const Jid &jid) : v_jid(jid), v_delivered(false), v_type(type) {}
+Address::Address(Type type, const Jid &jid) : v_jid(jid), v_delivered(false), v_type(type) { }
 
 Address::Address(const QDomElement &e) : v_delivered(false) { fromXml(e); }
 
@@ -500,7 +500,7 @@ QDomElement RosterExchangeItem::toXml(Stanza &s) const
         e.setAttribute("action", "modify");
         break;
     }
-    for (QString group: groups_) {
+    for (QString group : groups_) {
         e.appendChild(s.createTextElement("http://jabber.org/protocol/rosterx", "group", group));
     }
     return e;
@@ -529,7 +529,7 @@ void RosterExchangeItem::fromXml(const QDomElement &e)
 //----------------------------------------------------------------------------
 // MUCItem
 //----------------------------------------------------------------------------
-MUCItem::MUCItem(Role r, Affiliation a) : affiliation_(a), role_(r) {}
+MUCItem::MUCItem(Role r, Affiliation a) : affiliation_(a), role_(r) { }
 
 MUCItem::MUCItem(const QDomElement &el) : affiliation_(UnknownAffiliation), role_(UnknownRole) { fromXml(el); }
 
@@ -664,9 +664,9 @@ bool MUCItem::operator==(const MUCItem &o)
 // MUCInvite
 //----------------------------------------------------------------------------
 
-MUCInvite::MUCInvite() : cont_(false) {}
+MUCInvite::MUCInvite() : cont_(false) { }
 
-MUCInvite::MUCInvite(const Jid &to, const QString &reason) : to_(to), reason_(reason), cont_(false) {}
+MUCInvite::MUCInvite(const Jid &to, const QString &reason) : to_(to), reason_(reason), cont_(false) { }
 
 MUCInvite::MUCInvite(const QDomElement &e) : cont_(false) { fromXml(e); }
 
@@ -729,7 +729,7 @@ bool MUCInvite::isNull() const { return to_.isEmpty() && from_.isEmpty(); }
 // MUCDecline
 //----------------------------------------------------------------------------
 
-MUCDecline::MUCDecline() {}
+MUCDecline::MUCDecline() { }
 
 MUCDecline::MUCDecline(const QDomElement &e) { fromXml(e); }
 
@@ -783,7 +783,7 @@ bool MUCDecline::isNull() const { return to_.isEmpty() && from_.isEmpty(); }
 // MUCDestroy
 //----------------------------------------------------------------------------
 
-MUCDestroy::MUCDestroy() {}
+MUCDestroy::MUCDestroy() { }
 
 MUCDestroy::MUCDestroy(const QDomElement &e) { fromXml(e); }
 
@@ -826,7 +826,7 @@ QDomElement MUCDestroy::toXml(QDomDocument &d) const
 //----------------------------------------------------------------------------
 // HTMLElement
 //----------------------------------------------------------------------------
-HTMLElement::HTMLElement() {}
+HTMLElement::HTMLElement() { }
 
 HTMLElement::HTMLElement(const QDomElement &body) { setBody(body); }
 
@@ -888,7 +888,7 @@ void HTMLElement::filterOutUnwantedRecursive(QDomElement &el, bool strict)
                         attrs.append(name);
                     }
                 }
-                for (const QString &name: attrs) {
+                for (const QString &name : attrs) {
                     domAttrs.removeNamedItem(name);
                 }
                 filterOutUnwantedRecursive(childEl, strict);
@@ -958,7 +958,7 @@ class Message::Private : public QSharedData {
 //!
 //! This function will construct a Message container.
 //! \param to - specify receiver (default: empty string)
-Message::Message() {}
+Message::Message() { }
 
 Message::Message(const Jid &to) : d(new Private) { d->to = to; }
 
@@ -967,7 +967,7 @@ Message::Message(const Jid &to) : d(new Private) { d->to = to; }
 //! Overloaded constructor which will constructs a exact copy of the Message
 //! object that was passed to the constructor.
 //! \param from - Message object you want to copy
-Message::Message(const Message &from) : d(from.d) {}
+Message::Message(const Message &from) : d(from.d) { }
 
 //! \brief Required for internel use.
 Message &Message::operator=(const Message &from)
@@ -977,7 +977,7 @@ Message &Message::operator=(const Message &from)
 }
 
 //! \brief Destroy Message object.
-Message::~Message() {}
+Message::~Message() { }
 
 //! \brief Check if it's exactly the same instance.
 bool Message::operator==(const Message &from) const { return d == from.d; }
@@ -1180,7 +1180,7 @@ AddressList Message::findAddresses(Address::Type t) const
         return AddressList();
     }
     AddressList matches;
-    for (Address a: d->addressList) {
+    for (Address a : d->addressList) {
         if (a.type() == t)
             matches.append(a);
     }
@@ -1355,7 +1355,7 @@ Stanza Message::toStanza(Stream *stream) const
     if (containsHTML()) {
         QDomElement html = s.createElement("http://jabber.org/protocol/xhtml-im", "html");
         s.appendChild(html);
-        for (HTMLElement el: d->htmlElements) {
+        for (HTMLElement el : d->htmlElements) {
             html.appendChild(s.doc().importNode(el.body(), true).toElement());
         }
     }
@@ -1381,7 +1381,7 @@ Stanza Message::toStanza(Stream *stream) const
     }
 
     // urls
-    for (const Url &uit: d->urlList) {
+    for (const Url &uit : d->urlList) {
         QDomElement x = s.createElement("jabber:x:oob", "x");
         x.appendChild(s.createTextElement("jabber:x:oob", "url", uit.url()));
         if (!uit.desc().isEmpty())
@@ -1400,7 +1400,7 @@ Stanza Message::toStanza(Stream *stream) const
                 x.appendChild(s.createTextElement("jabber:x:event", "id", d->eventId));
         }
 
-        for (const MsgEvent &ev: d->eventList) {
+        for (const MsgEvent &ev : d->eventList) {
             switch (ev) {
             case OfflineEvent:
                 x.appendChild(s.createElement("jabber:x:event", "offline"));
@@ -1476,7 +1476,7 @@ Stanza Message::toStanza(Stream *stream) const
     // addresses
     if (!d->addressList.isEmpty()) {
         QDomElement as = s.createElement("http://jabber.org/protocol/address", "addresses");
-        for (Address a: d->addressList) {
+        for (Address a : d->addressList) {
             as.appendChild(a.toXml(s));
         }
         s.appendChild(as);
@@ -1485,7 +1485,7 @@ Stanza Message::toStanza(Stream *stream) const
     // roster item exchange
     if (!d->rosterExchangeItems.isEmpty()) {
         QDomElement rx = s.createElement("http://jabber.org/protocol/rosterx", "x");
-        for (RosterExchangeItem r: d->rosterExchangeItems) {
+        for (RosterExchangeItem r : d->rosterExchangeItems) {
             rx.appendChild(r.toXml(s));
         }
         s.appendChild(rx);
@@ -1511,7 +1511,7 @@ Stanza Message::toStanza(Stream *stream) const
     // muc
     if (!d->mucInvites.isEmpty()) {
         QDomElement e = s.createElement("http://jabber.org/protocol/muc#user", "x");
-        for (MUCInvite i: d->mucInvites) {
+        for (MUCInvite i : d->mucInvites) {
             e.appendChild(i.toXml(s.doc()));
         }
         if (!d->mucPassword.isEmpty()) {
@@ -1540,7 +1540,7 @@ Stanza Message::toStanza(Stream *stream) const
     }
 
     // bits of binary
-    for (const BoBData &bd: d->bobDataList) {
+    for (const BoBData &bd : d->bobDataList) {
         s.appendChild(bd.toXml(&s.doc()));
     }
 
@@ -1948,7 +1948,7 @@ HttpAuthRequest::HttpAuthRequest(const QString &m, const QString &u, const QStri
 /*!
         Constructs request of resource URL \a u, made by method \a m, without transaction id.
 */
-HttpAuthRequest::HttpAuthRequest(const QString &m, const QString &u) : method_(m), url_(u), hasId_(false) {}
+HttpAuthRequest::HttpAuthRequest(const QString &m, const QString &u) : method_(m), url_(u), hasId_(false) { }
 
 /*!
     Constructs request object by reading XML <confirm/> element \a e.
@@ -2086,7 +2086,7 @@ bool Subscription::fromString(const QString &s)
 /**
  * Default constructor.
  */
-CapsSpec::CapsSpec() : hashAlgo_(CapsSpec::invalidAlgo) {}
+CapsSpec::CapsSpec() : hashAlgo_(CapsSpec::invalidAlgo) { }
 
 /**
  * \brief Basic constructor.
@@ -2256,7 +2256,7 @@ Status::Status(Type type, const QString &status, int priority) : d(new StatusPri
     setType(type);
 }
 
-Status::Status(const Status &other) : d(other.d) {}
+Status::Status(const Status &other) : d(other.d) { }
 
 Status &Status::operator=(const Status &other)
 {
@@ -2264,7 +2264,7 @@ Status &Status::operator=(const Status &other)
     return *this;
 }
 
-Status::~Status() {}
+Status::~Status() { }
 
 bool Status::hasError() const { return (d->ecode != -1); }
 
@@ -2496,7 +2496,7 @@ const QString &Status::errorString() const { return d->estr; }
 //---------------------------------------------------------------------------
 // Resource
 //---------------------------------------------------------------------------
-Resource::Resource(const QString &name, const Status &stat) : v_name(name), v_status(stat) {}
+Resource::Resource(const QString &name, const Status &stat) : v_name(name), v_status(stat) { }
 
 const QString &Resource::name() const { return v_name; }
 
@@ -2511,9 +2511,9 @@ void Resource::setStatus(const Status &_status) { v_status = _status; }
 //---------------------------------------------------------------------------
 // ResourceList
 //---------------------------------------------------------------------------
-ResourceList::ResourceList() : QList<Resource>() {}
+ResourceList::ResourceList() : QList<Resource>() { }
 
-ResourceList::~ResourceList() {}
+ResourceList::~ResourceList() { }
 
 ResourceList::Iterator ResourceList::find(const QString &_find)
 {
@@ -2562,7 +2562,7 @@ ResourceList::ConstIterator ResourceList::priority() const
 //---------------------------------------------------------------------------
 // RosterItem
 //---------------------------------------------------------------------------
-RosterItem::RosterItem(const Jid &_jid) : v_jid(_jid), v_push(false) {}
+RosterItem::RosterItem(const Jid &_jid) : v_jid(_jid), v_push(false) { }
 
 RosterItem::RosterItem(const RosterItem &item) :
     v_jid(item.v_jid), v_name(item.v_name), v_groups(item.v_groups), v_subscription(item.v_subscription),
@@ -2570,7 +2570,7 @@ RosterItem::RosterItem(const RosterItem &item) :
 {
 }
 
-RosterItem::~RosterItem() {}
+RosterItem::~RosterItem() { }
 
 const Jid &RosterItem::jid() const { return v_jid; }
 
@@ -2682,7 +2682,7 @@ class Roster::Private {
     QString groupsDelimiter;
 };
 
-Roster::Roster() : QList<RosterItem>(), d(new Roster::Private) {}
+Roster::Roster() : QList<RosterItem>(), d(new Roster::Private) { }
 
 Roster::~Roster() { delete d; }
 
@@ -2736,7 +2736,7 @@ FormField::FormField(const QString &type, const QString &value)
     v_value = value;
 }
 
-FormField::~FormField() {}
+FormField::~FormField() { }
 
 int FormField::type() const { return v_type; }
 
@@ -2877,7 +2877,7 @@ QString FormField::typeToTagName(int type) const
 //---------------------------------------------------------------------------
 Form::Form(const Jid &j) : QList<FormField>() { setJid(j); }
 
-Form::~Form() {}
+Form::~Form() { }
 
 Jid Form::jid() const { return v_jid; }
 
@@ -2896,7 +2896,7 @@ void Form::setKey(const QString &s) { v_key = s; }
 //---------------------------------------------------------------------------
 SearchResult::SearchResult(const Jid &jid) { setJid(jid); }
 
-SearchResult::~SearchResult() {}
+SearchResult::~SearchResult() { }
 
 const Jid &SearchResult::jid() const { return v_jid; }
 
@@ -2918,17 +2918,17 @@ void SearchResult::setLast(const QString &last) { v_last = last; }
 
 void SearchResult::setEmail(const QString &email) { v_email = email; }
 
-PubSubItem::PubSubItem() {}
+PubSubItem::PubSubItem() { }
 
-PubSubItem::PubSubItem(const QString &id, const QDomElement &payload) : id_(id), payload_(payload) {}
+PubSubItem::PubSubItem(const QString &id, const QDomElement &payload) : id_(id), payload_(payload) { }
 
 const QString &PubSubItem::id() const { return id_; }
 
 const QDomElement &PubSubItem::payload() const { return payload_; }
 
-PubSubRetraction::PubSubRetraction() {}
+PubSubRetraction::PubSubRetraction() { }
 
-PubSubRetraction::PubSubRetraction(const QString &id) : id_(id) {}
+PubSubRetraction::PubSubRetraction(const QString &id) : id_(id) { }
 
 const QString &PubSubRetraction::id() const { return id_; }
 
@@ -2937,7 +2937,7 @@ const QString &PubSubRetraction::id() const { return id_; }
 // =========================================
 class CaptchaChallengePrivate : public QSharedData {
 public:
-    CaptchaChallengePrivate() : state(CaptchaChallenge::New) {}
+    CaptchaChallengePrivate() : state(CaptchaChallenge::New) { }
 
     CaptchaChallenge::State state;
     Jid                     arbiter;
@@ -2948,9 +2948,9 @@ class CaptchaChallengePrivate : public QSharedData {
     UrlList                 urls;
 };
 
-CaptchaChallenge::CaptchaChallenge() : d(new CaptchaChallengePrivate) {}
+CaptchaChallenge::CaptchaChallenge() : d(new CaptchaChallengePrivate) { }
 
-CaptchaChallenge::CaptchaChallenge(const CaptchaChallenge &other) : d(other.d) {}
+CaptchaChallenge::CaptchaChallenge(const CaptchaChallenge &other) : d(other.d) { }
 
 CaptchaChallenge::CaptchaChallenge(const Message &m) : d(new CaptchaChallengePrivate)
 {
@@ -2979,7 +2979,7 @@ CaptchaChallenge::CaptchaChallenge(const Message &m) : d(new CaptchaChallengePri
     d->offendedJid = Jid(m.getForm().getField("from").value().value(0));
 }
 
-CaptchaChallenge::~CaptchaChallenge() {}
+CaptchaChallenge::~CaptchaChallenge() { }
 
 CaptchaChallenge &CaptchaChallenge::operator=(const CaptchaChallenge &from)
 {
diff --git a/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp b/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp
index d0523207..52c4c216 100644
--- a/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp
+++ b/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp
@@ -37,13 +37,13 @@ class BoBData::Private : public QSharedData {
     unsigned int maxAge; // seconds to live
 };
 
-BoBData::BoBData() : d(new Private) {}
+BoBData::BoBData() : d(new Private) { }
 
-BoBData::BoBData(const BoBData &other) : d(other.d) {}
+BoBData::BoBData(const BoBData &other) : d(other.d) { }
 
 BoBData::BoBData(const QDomElement &e) : d(new Private) { fromXml(e); }
 
-BoBData::~BoBData() {}
+BoBData::~BoBData() { }
 
 BoBData &BoBData::operator=(const BoBData &other)
 {
@@ -108,7 +108,7 @@ QDomElement BoBData::toXml(QDomDocument *doc) const
 // ---------------------------------------------------------
 // BoBCache
 // ---------------------------------------------------------
-BoBCache::BoBCache(QObject *parent) : QObject(parent) {}
+BoBCache::BoBCache(QObject *parent) : QObject(parent) { }
 
 //------------------------------------------------------------------------------
 // BoBManager
diff --git a/src/xmpp/xmpp-im/xmpp_bytestream.cpp b/src/xmpp/xmpp-im/xmpp_bytestream.cpp
index 0478b3f7..ed3324b6 100644
--- a/src/xmpp/xmpp-im/xmpp_bytestream.cpp
+++ b/src/xmpp/xmpp-im/xmpp_bytestream.cpp
@@ -24,9 +24,9 @@
 #include <QTimer>
 
 namespace XMPP {
-BytestreamManager::BytestreamManager(Client *parent) : QObject(parent) {}
+BytestreamManager::BytestreamManager(Client *parent) : QObject(parent) { }
 
-BytestreamManager::~BytestreamManager() {}
+BytestreamManager::~BytestreamManager() { }
 
 QString BytestreamManager::genUniqueSID(const Jid &peer) const
 {
diff --git a/src/xmpp/xmpp-im/xmpp_caps.cpp b/src/xmpp/xmpp-im/xmpp_caps.cpp
index 1656afeb..6a3e166a 100644
--- a/src/xmpp/xmpp-im/xmpp_caps.cpp
+++ b/src/xmpp/xmpp-im/xmpp_caps.cpp
@@ -67,7 +67,7 @@ CapsRegistry *CapsRegistry::instance_ = nullptr;
 /**
  * \brief Default constructor.
  */
-CapsRegistry::CapsRegistry(QObject *parent) : QObject(parent) {}
+CapsRegistry::CapsRegistry(QObject *parent) : QObject(parent) { }
 
 CapsRegistry *CapsRegistry::instance()
 {
@@ -202,9 +202,9 @@ DiscoItem CapsRegistry::disco(const QString &spec) const
 /**
  * \brief Default constructor.
  */
-CapsManager::CapsManager(Client *client) : QObject(client), client_(client), isEnabled_(true) {}
+CapsManager::CapsManager(Client *client) : QObject(client), client_(client), isEnabled_(true) { }
 
-CapsManager::~CapsManager() {}
+CapsManager::~CapsManager() { }
 
 /**
  * \brief Checks whether the caps manager is enabled (and does lookups).
@@ -322,7 +322,7 @@ void CapsManager::updateDisco(const Jid &jid, const DiscoItem &item)
 void CapsManager::capsRegistered(const CapsSpec &cs)
 {
     // Notify affected jids.
-    for (const QString &s: capsJids_[cs.flatten()]) {
+    for (const QString &s : capsJids_[cs.flatten()]) {
         // qDebug() << QString("caps.cpp: Notifying %1.").arg(s.replace('%',"%%"));
         emit capsChanged(s);
     }
diff --git a/src/xmpp/xmpp-im/xmpp_discoitem.cpp b/src/xmpp/xmpp-im/xmpp_discoitem.cpp
index 2175390c..11fdd536 100644
--- a/src/xmpp/xmpp-im/xmpp_discoitem.cpp
+++ b/src/xmpp/xmpp-im/xmpp_discoitem.cpp
@@ -37,7 +37,7 @@ class XMPP::DiscoItemPrivate : public QSharedData {
     QList<XData>          exts;
 };
 
-DiscoItem::DiscoItem() : d(new DiscoItemPrivate) {}
+DiscoItem::DiscoItem() : d(new DiscoItemPrivate) { }
 
 DiscoItem::DiscoItem(const DiscoItem &from) : d(new DiscoItemPrivate) { *this = from; }
 
@@ -54,7 +54,7 @@ DiscoItem &DiscoItem::operator=(const DiscoItem &from)
     return *this;
 }
 
-DiscoItem::~DiscoItem() {}
+DiscoItem::~DiscoItem() { }
 
 AgentItem DiscoItem::toAgentItem() const
 {
@@ -99,7 +99,7 @@ QString DiscoItem::capsHash(QCryptographicHash::Algorithm algo) const
     DiscoItem::Identities idents = d->identities;
     std::sort(idents.begin(), idents.end());
 
-    for (const DiscoItem::Identity &id: idents) {
+    for (const DiscoItem::Identity &id : idents) {
         prep << QString("%1/%2/%3/%4").arg(id.category, id.type, id.lang, id.name);
     }
 
@@ -108,7 +108,7 @@ QString DiscoItem::capsHash(QCryptographicHash::Algorithm algo) const
     prep += fl;
 
     QMap<QString, XData> forms;
-    for (const XData &xd: d->exts) {
+    for (const XData &xd : d->exts) {
         if (xd.registrarType().isEmpty()) {
             continue;
         }
@@ -117,10 +117,10 @@ QString DiscoItem::capsHash(QCryptographicHash::Algorithm algo) const
         }
         forms.insert(xd.registrarType(), xd);
     }
-    for (const XData &xd: forms.values()) {
+    for (const XData &xd : forms.values()) {
         prep << xd.registrarType();
         QMap<QString, QStringList> values;
-        for (const XData::Field &f: xd.fields()) {
+        for (const XData::Field &f : xd.fields()) {
             if (f.var() == QLatin1String("FORM_TYPE")) {
                 continue;
             }
@@ -193,7 +193,7 @@ QDomElement DiscoItem::toDiscoInfoResult(QDomDocument *doc) const
         = doc->createElementNS(QLatin1String("http://jabber.org/protocol/disco#info"), QLatin1String("query"));
     q.setAttribute("node", d->node);
 
-    for (const Identity &id: d->identities) {
+    for (const Identity &id : d->identities) {
         QDomElement idel = q.appendChild(doc->createElement(QLatin1String("identity"))).toElement();
         idel.setAttribute("category", id.category);
         idel.setAttribute("type", id.type);
@@ -205,12 +205,12 @@ QDomElement DiscoItem::toDiscoInfoResult(QDomDocument *doc) const
         }
     }
 
-    for (const QString &f: d->features.list()) {
+    for (const QString &f : d->features.list()) {
         QDomElement fel = q.appendChild(doc->createElement(QLatin1String("feature"))).toElement();
         fel.setAttribute("var", f);
     }
 
-    for (const XData &f: d->exts) {
+    for (const XData &f : d->exts) {
         q.appendChild(f.toXml(doc));
     }
 
@@ -253,7 +253,7 @@ void DiscoItem::setExtensions(const QList<XData> &extlist) { d->exts = extlist;
 
 XData DiscoItem::registeredExtension(const QString &ns) const
 {
-    for (const XData &xd: d->exts) {
+    for (const XData &xd : d->exts) {
         if (xd.registrarType() == ns) {
             return xd;
         }
diff --git a/src/xmpp/xmpp-im/xmpp_features.cpp b/src/xmpp/xmpp-im/xmpp_features.cpp
index ee2853d9..e3698074 100644
--- a/src/xmpp/xmpp-im/xmpp_features.cpp
+++ b/src/xmpp/xmpp-im/xmpp_features.cpp
@@ -29,7 +29,7 @@
 
 using namespace XMPP;
 
-Features::Features() {}
+Features::Features() { }
 
 Features::Features(const QStringList &l) { setList(l); }
 
@@ -43,7 +43,7 @@ Features::Features(const QString &str)
     setList(l);
 }
 
-Features::~Features() {}
+Features::~Features() { }
 
 QStringList Features::list() const { return _list.toList(); }
 
diff --git a/src/xmpp/xmpp-im/xmpp_ibb.cpp b/src/xmpp/xmpp-im/xmpp_ibb.cpp
index a7bc1f29..1f2141c4 100644
--- a/src/xmpp/xmpp-im/xmpp_ibb.cpp
+++ b/src/xmpp/xmpp-im/xmpp_ibb.cpp
@@ -419,7 +419,7 @@ void IBBManager::unlink(IBBConnection *c) { d->activeConns.removeAll(c); }
 
 IBBConnection *IBBManager::findConnection(const QString &sid, const Jid &peer) const
 {
-    for (IBBConnection *c: d->activeConns) {
+    for (IBBConnection *c : d->activeConns) {
         if (c->sid() == sid && (peer.isEmpty() || c->peer().compare(peer)))
             return c;
     }
diff --git a/src/xmpp/xmpp-im/xmpp_reference.cpp b/src/xmpp/xmpp-im/xmpp_reference.cpp
index 59a94cb5..935ccc5b 100644
--- a/src/xmpp/xmpp-im/xmpp_reference.cpp
+++ b/src/xmpp/xmpp-im/xmpp_reference.cpp
@@ -36,7 +36,7 @@ class Reference::Private : public QSharedData {
     MediaSharing    mediaSharing;
 };
 
-Reference::Reference() {}
+Reference::Reference() { }
 
 Reference::Reference(Type type, const QString &uri) : d(new Private)
 {
@@ -44,9 +44,9 @@ Reference::Reference(Type type, const QString &uri) : d(new Private)
     d->uri  = uri;
 }
 
-Reference::~Reference() {}
+Reference::~Reference() { }
 
-Reference::Reference(const Reference &other) : d(other.d) {}
+Reference::Reference(const Reference &other) : d(other.d) { }
 
 Reference &Reference::operator=(const Reference &other)
 {
diff --git a/src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp b/src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp
index bb47cc2e..2b144da8 100644
--- a/src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp
+++ b/src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp
@@ -266,7 +266,7 @@ void ServerInfoManager::disco_finished()
 
         // Identities
         DiscoItem::Identities is = jt->item().identities();
-        for (DiscoItem::Identity i: is) {
+        for (DiscoItem::Identity i : is) {
             if (i.category == "pubsub" && i.type == "pep")
                 _hasPEP = true;
         }
diff --git a/src/xmpp/xmpp-im/xmpp_tasks.cpp b/src/xmpp/xmpp-im/xmpp_tasks.cpp
index 5539b2d0..3a65349b 100644
--- a/src/xmpp/xmpp-im/xmpp_tasks.cpp
+++ b/src/xmpp/xmpp-im/xmpp_tasks.cpp
@@ -95,7 +95,7 @@ static Roster xmlReadRoster(const QDomElement &q, bool push)
 //
 #include "protocol.h"
 
-JT_Session::JT_Session(Task *parent) : Task(parent) {}
+JT_Session::JT_Session(Task *parent) : Task(parent) { }
 
 void JT_Session::onGo()
 {
@@ -526,9 +526,9 @@ bool JT_Roster::take(const QDomElement &x)
 //----------------------------------------------------------------------------
 // JT_PushRoster
 //----------------------------------------------------------------------------
-JT_PushRoster::JT_PushRoster(Task *parent) : Task(parent) {}
+JT_PushRoster::JT_PushRoster(Task *parent) : Task(parent) { }
 
-JT_PushRoster::~JT_PushRoster() {}
+JT_PushRoster::~JT_PushRoster() { }
 
 bool JT_PushRoster::take(const QDomElement &e)
 {
@@ -548,9 +548,9 @@ bool JT_PushRoster::take(const QDomElement &e)
 //----------------------------------------------------------------------------
 // JT_Presence
 //----------------------------------------------------------------------------
-JT_Presence::JT_Presence(Task *parent) : Task(parent) {}
+JT_Presence::JT_Presence(Task *parent) : Task(parent) { }
 
-JT_Presence::~JT_Presence() {}
+JT_Presence::~JT_Presence() { }
 
 void JT_Presence::pres(const Status &s)
 {
@@ -615,7 +615,7 @@ void JT_Presence::pres(const Status &s)
         }
 
         // bits of binary
-        for (const BoBData &bd: s.bobDataList()) {
+        for (const BoBData &bd : s.bobDataList()) {
             tag.appendChild(bd.toXml(doc()));
         }
     }
@@ -660,9 +660,9 @@ void JT_Presence::onGo()
 //----------------------------------------------------------------------------
 // JT_PushPresence
 //----------------------------------------------------------------------------
-JT_PushPresence::JT_PushPresence(Task *parent) : Task(parent) {}
+JT_PushPresence::JT_PushPresence(Task *parent) : Task(parent) { }
 
-JT_PushPresence::~JT_PushPresence() {}
+JT_PushPresence::~JT_PushPresence() { }
 
 bool JT_PushPresence::take(const QDomElement &e)
 {
@@ -830,7 +830,7 @@ JT_Message::JT_Message(Task *parent, Message &msg) : Task(parent), m(msg)
         msg.setId(id());
 }
 
-JT_Message::~JT_Message() {}
+JT_Message::~JT_Message() { }
 
 void JT_Message::onGo()
 {
@@ -1176,7 +1176,7 @@ bool JT_Search::take(const QDomElement &x)
 //----------------------------------------------------------------------------
 // JT_ClientVersion
 //----------------------------------------------------------------------------
-JT_ClientVersion::JT_ClientVersion(Task *parent) : Task(parent) {}
+JT_ClientVersion::JT_ClientVersion(Task *parent) : Task(parent) { }
 
 void JT_ClientVersion::get(const Jid &jid)
 {
@@ -1225,7 +1225,7 @@ const QString &JT_ClientVersion::os() const { return v_os; }
 //----------------------------------------------------------------------------
 // JT_EntityTime
 //----------------------------------------------------------------------------
-JT_EntityTime::JT_EntityTime(Task *parent) : Task(parent) {}
+JT_EntityTime::JT_EntityTime(Task *parent) : Task(parent) { }
 
 /**
  * \brief Queried entity's JID.
@@ -1285,9 +1285,9 @@ int JT_EntityTime::timezoneOffset() const { return tzo; }
 //----------------------------------------------------------------------------
 // JT_ServInfo
 //----------------------------------------------------------------------------
-JT_ServInfo::JT_ServInfo(Task *parent) : Task(parent) {}
+JT_ServInfo::JT_ServInfo(Task *parent) : Task(parent) { }
 
-JT_ServInfo::~JT_ServInfo() {}
+JT_ServInfo::~JT_ServInfo() { }
 
 bool JT_ServInfo::take(const QDomElement &e)
 {
@@ -1444,7 +1444,7 @@ bool JT_Gateway::take(const QDomElement &x)
 //----------------------------------------------------------------------------
 class JT_DiscoItems::Private {
 public:
-    Private() {}
+    Private() { }
 
     QDomElement iq;
     Jid         jid;
@@ -1531,7 +1531,7 @@ bool JT_DiscoItems::take(const QDomElement &x)
 //----------------------------------------------------------------------------
 class JT_DiscoPublish::Private {
 public:
-    Private() {}
+    Private() { }
 
     QDomElement iq;
     Jid         jid;
@@ -1590,7 +1590,7 @@ bool JT_DiscoPublish::take(const QDomElement &x)
 // ---------------------------------------------------------
 // JT_BoBServer
 // ---------------------------------------------------------
-JT_BoBServer::JT_BoBServer(Task *parent) : Task(parent) {}
+JT_BoBServer::JT_BoBServer(Task *parent) : Task(parent) { }
 
 bool JT_BoBServer::take(const QDomElement &e)
 {
@@ -1620,7 +1620,7 @@ bool JT_BoBServer::take(const QDomElement &e)
 //----------------------------------------------------------------------------
 class JT_BitsOfBinary::Private {
 public:
-    Private() {}
+    Private() { }
 
     QDomElement iq;
     Jid         jid;
@@ -1687,7 +1687,7 @@ BoBData &JT_BitsOfBinary::data() { return d->data; }
  * \brief Answers XMPP Pings
  */
 
-JT_PongServer::JT_PongServer(Task *parent) : Task(parent) {}
+JT_PongServer::JT_PongServer(Task *parent) : Task(parent) { }
 
 bool JT_PongServer::take(const QDomElement &e)
 {
@@ -1712,7 +1712,7 @@ class JT_CaptchaChallenger::Private {
     CaptchaChallenge challenge;
 };
 
-JT_CaptchaChallenger::JT_CaptchaChallenger(Task *parent) : Task(parent), d(new Private) {}
+JT_CaptchaChallenger::JT_CaptchaChallenger(Task *parent) : Task(parent), d(new Private) { }
 
 JT_CaptchaChallenger::~JT_CaptchaChallenger() { delete d; }
 
@@ -1796,7 +1796,7 @@ bool JT_CaptchaChallenger::take(const QDomElement &x)
 //---------------------------------------------------------------------------
 // JT_CaptchaSender
 //---------------------------------------------------------------------------
-JT_CaptchaSender::JT_CaptchaSender(Task *parent) : Task(parent) {}
+JT_CaptchaSender::JT_CaptchaSender(Task *parent) : Task(parent) { }
 
 void JT_CaptchaSender::set(const Jid &j, const XData &xd)
 {
@@ -1826,7 +1826,7 @@ bool JT_CaptchaSender::take(const QDomElement &x)
 //----------------------------------------------------------------------------
 // JT_MessageCarbons
 //----------------------------------------------------------------------------
-JT_MessageCarbons::JT_MessageCarbons(Task *parent) : Task(parent) {}
+JT_MessageCarbons::JT_MessageCarbons(Task *parent) : Task(parent) { }
 
 void JT_MessageCarbons::enable()
 {
diff --git a/src/xmpp/xmpp-im/xmpp_vcard.cpp b/src/xmpp/xmpp-im/xmpp_vcard.cpp
index 92d352fe..61c26fc4 100644
--- a/src/xmpp/xmpp-im/xmpp_vcard.cpp
+++ b/src/xmpp/xmpp-im/xmpp_vcard.cpp
@@ -141,7 +141,7 @@ class VCardPrivate : public QSharedData {
 
 VCardPrivate::VCardPrivate() { privacyClass = VCard::pcNone; }
 
-VCardPrivate::~VCardPrivate() {}
+VCardPrivate::~VCardPrivate() { }
 
 bool VCardPrivate::isEmpty() const
 {
@@ -159,9 +159,9 @@ bool VCardPrivate::isEmpty() const
     return true;
 }
 
-VCard::VCard() {}
+VCard::VCard() { }
 
-VCard::VCard(const VCard &from) : d(from.d) {}
+VCard::VCard(const VCard &from) : d(from.d) { }
 
 VCard &VCard::operator=(const VCard &from)
 {
@@ -169,7 +169,7 @@ VCard &VCard::operator=(const VCard &from)
     return *this;
 }
 
-VCard::~VCard() {}
+VCard::~VCard() { }
 
 QDomElement VCard::toXml(QDomDocument *doc) const
 {
@@ -746,9 +746,9 @@ VCard::Phone::Phone()
 
 VCard::Email::Email() { home = work = internet = x400 = pref = false; }
 
-VCard::Geo::Geo() {}
+VCard::Geo::Geo() { }
 
-VCard::Org::Org() {}
+VCard::Org::Org() { }
 
 // vCard properties...
 
diff --git a/src/xmpp/xmpp-im/xmpp_xdata.cpp b/src/xmpp/xmpp-im/xmpp_xdata.cpp
index 52948ddf..6cc4260c 100644
--- a/src/xmpp/xmpp-im/xmpp_xdata.cpp
+++ b/src/xmpp/xmpp-im/xmpp_xdata.cpp
@@ -265,10 +265,10 @@ QDomElement XData::Field::toXml(QDomDocument *doc, bool submitForm) const
             media.setAttribute("width", s.width());
             media.setAttribute("height", s.height());
         }
-        for (const MediaUri &uri: _mediaElement) {
+        for (const MediaUri &uri : _mediaElement) {
             QDomElement uriEl = doc->createElement("uri");
             QString     type  = uri.mimeType;
-            for (const QString &k: uri.params.keys()) {
+            for (const QString &k : uri.params.keys()) {
                 type += ";" + k + "=" + uri.params[k];
             }
             uriEl.setAttribute("type", type);
@@ -300,8 +300,8 @@ QSize XData::Field::MediaElement::mediaSize() const { return _size; }
 
 bool XData::Field::MediaElement::checkSupport(const QStringList &wildcards)
 {
-    for (const XData::Field::MediaUri &uri: *this) {
-        for (const QString &wildcard: wildcards) {
+    for (const XData::Field::MediaUri &uri : *this) {
+        for (const QString &wildcard : wildcards) {
             if (QRegExp(wildcard, Qt::CaseSensitive, QRegExp::Wildcard).exactMatch(uri.mimeType)) {
                 return true;
             }
@@ -358,7 +358,7 @@ XData::Field &XData::fieldRef(const QString &var)
 void XData::setFields(const FieldList &fl)
 {
     d->fields = fl;
-    for (const Field &f: fl) {
+    for (const Field &f : fl) {
         if (f.type() == Field::Field_Hidden && f.var() == "FORM_TYPE") {
             d->registrarType = f.value().value(0);
         }
@@ -468,7 +468,7 @@ const QList<XData::ReportItem> &XData::reportItems() const { return d->reportIte
 
 bool XData::isValid() const
 {
-    for (const Field &f: d->fields) {
+    for (const Field &f : d->fields) {
         if (!f.isValid())
             return false;
     }
diff --git a/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp b/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
index 3414afdf..4f4a7ccb 100644
--- a/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
+++ b/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
@@ -32,9 +32,9 @@
 //----------------------------------------------------------------------------
 // XDomNodeList
 //----------------------------------------------------------------------------
-XDomNodeList::XDomNodeList() {}
+XDomNodeList::XDomNodeList() { }
 
-XDomNodeList::XDomNodeList(const XDomNodeList &from) : list(from.list) {}
+XDomNodeList::XDomNodeList(const XDomNodeList &from) : list(from.list) { }
 
 XDomNodeList::XDomNodeList(const QDomNodeList &from)
 {
@@ -42,7 +42,7 @@ XDomNodeList::XDomNodeList(const QDomNodeList &from)
         list += from.item(n);
 }
 
-XDomNodeList::~XDomNodeList() {}
+XDomNodeList::~XDomNodeList() { }
 
 XDomNodeList &XDomNodeList::operator=(const XDomNodeList &from)
 {
@@ -100,8 +100,8 @@ bool stamp2TS(const QString &ts, QDateTime *d)
 
 QString TS2stamp(const QDateTime &d)
 {
-    QString str = QString::asprintf("%04d%02d%02dT%02d:%02d:%02d", d.date().year(), d.date().month(),
-                                    d.date().day(), d.time().hour(), d.time().minute(), d.time().second());
+    QString str = QString::asprintf("%04d%02d%02dT%02d:%02d:%02d", d.date().year(), d.date().month(), d.date().day(),
+                                    d.time().hour(), d.time().minute(), d.time().second());
 
     return str;
 }

From defcc44d3e5d9995c8395218a44c4ecce7add8eb Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sat, 25 Apr 2020 13:50:57 +0300
Subject: [PATCH 144/383] Reformat with clang-format-10

---
 src/irisnet/appledns/qdnssd.h             |  4 ++--
 src/irisnet/corelib/irisnetplugin.h       | 10 +++++-----
 src/irisnet/noncore/stunallocate.h        |  2 +-
 src/irisnet/noncore/tcpportreserver.h     |  2 +-
 src/xmpp/base/randrandomnumbergenerator.h |  2 +-
 src/xmpp/qa/qttestutil/testregistry.h     |  2 +-
 src/xmpp/xmpp-core/xmpp.h                 |  2 +-
 src/xmpp/xmpp-im/jingle-ft.h              |  6 +++---
 src/xmpp/xmpp-im/jingle-transport.h       |  2 +-
 src/xmpp/xmpp-im/jingle.h                 |  2 +-
 src/xmpp/xmpp-im/xmpp_agentitem.h         |  2 +-
 src/xmpp/xmpp-im/xmpp_bytestream.h        |  2 +-
 src/xmpp/xmpp-im/xmpp_caps.h              |  2 +-
 src/xmpp/xmpp-im/xmpp_discoitem.h         |  2 +-
 src/xmpp/xmpp-im/xmpp_form.h              |  2 +-
 src/xmpp/xmpp-im/xmpp_hash.h              |  6 +++---
 src/xmpp/xmpp-im/xmpp_ibb.h               |  4 ++--
 src/xmpp/xmpp-im/xmpp_thumbs.h            |  2 +-
 src/xmpp/xmpp-im/xmpp_xdata.h             |  6 +++---
 19 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/irisnet/appledns/qdnssd.h b/src/irisnet/appledns/qdnssd.h
index 635ef489..2bfba78c 100644
--- a/src/irisnet/appledns/qdnssd.h
+++ b/src/irisnet/appledns/qdnssd.h
@@ -32,9 +32,9 @@ class QDnsSd : public QObject {
         QString func;
         int     code;
 
-        LowLevelError() : code(0) {}
+        LowLevelError() : code(0) { }
 
-        LowLevelError(const QString &_func, int _code) : func(_func), code(_code) {}
+        LowLevelError(const QString &_func, int _code) : func(_func), code(_code) { }
     };
 
     class Record {
diff --git a/src/irisnet/corelib/irisnetplugin.h b/src/irisnet/corelib/irisnetplugin.h
index a3844de4..0cc8a81f 100644
--- a/src/irisnet/corelib/irisnetplugin.h
+++ b/src/irisnet/corelib/irisnetplugin.h
@@ -54,7 +54,7 @@ class IRISNET_EXPORT NetInterfaceProvider : public QObject {
         QList<QHostAddress> addresses;
     };
 
-    NetInterfaceProvider(QObject *parent = nullptr) : QObject(parent) {}
+    NetInterfaceProvider(QObject *parent = nullptr) : QObject(parent) { }
 
     // calling start should populate an initial list that can be
     //   immediately fetched.  do not signal updated() for this.
@@ -75,7 +75,7 @@ class IRISNET_EXPORT NetGatewayProvider : public QObject {
         QHostAddress gateway;
     };
 
-    NetGatewayProvider(QObject *parent = nullptr) : QObject(parent) {}
+    NetGatewayProvider(QObject *parent = nullptr) : QObject(parent) { }
 
     // calling start should populate an initial list that can be
     //   immediately fetched.  do not signal updated() for this.
@@ -90,7 +90,7 @@ class IRISNET_EXPORT NetAvailabilityProvider : public QObject {
     Q_OBJECT
 
 public:
-    NetAvailabilityProvider(QObject *parent = nullptr) : QObject(parent) {}
+    NetAvailabilityProvider(QObject *parent = nullptr) : QObject(parent) { }
 
     // calling start should populate an initial value that can be
     //   immediately fetched.  do not signal updated() for this.
@@ -105,7 +105,7 @@ class IRISNET_EXPORT NameProvider : public QObject {
     Q_OBJECT
 
 public:
-    NameProvider(QObject *parent = nullptr) : QObject(parent) {}
+    NameProvider(QObject *parent = nullptr) : QObject(parent) { }
 
     virtual bool supportsSingle() const;
     virtual bool supportsLongLived() const;
@@ -138,7 +138,7 @@ class IRISNET_EXPORT ServiceProvider : public QObject {
         QByteArray                hostName; // optional
     };
 
-    ServiceProvider(QObject *parent = nullptr) : QObject(parent) {}
+    ServiceProvider(QObject *parent = nullptr) : QObject(parent) { }
 
     virtual int  browse_start(const QString &type, const QString &domain) = 0;
     virtual void browse_stop(int id)                                      = 0;
diff --git a/src/irisnet/noncore/stunallocate.h b/src/irisnet/noncore/stunallocate.h
index 6dc7b88c..2cb46d39 100644
--- a/src/irisnet/noncore/stunallocate.h
+++ b/src/irisnet/noncore/stunallocate.h
@@ -40,7 +40,7 @@ class StunAllocate : public QObject {
         QHostAddress address;
         int          port;
 
-        Channel(const QHostAddress &_address, int _port) : address(_address), port(_port) {}
+        Channel(const QHostAddress &_address, int _port) : address(_address), port(_port) { }
 
         inline bool operator==(const Channel &other)
         {
diff --git a/src/irisnet/noncore/tcpportreserver.h b/src/irisnet/noncore/tcpportreserver.h
index 12151b74..bc88decd 100644
--- a/src/irisnet/noncore/tcpportreserver.h
+++ b/src/irisnet/noncore/tcpportreserver.h
@@ -41,7 +41,7 @@ class TcpPortServer : public QObject {
         QVariant meta;
     };
 
-    inline TcpPortServer(QTcpServer *serverSocket) : serverSocket(serverSocket) {}
+    inline TcpPortServer(QTcpServer *serverSocket) : serverSocket(serverSocket) { }
     inline void            setPortInfo(const Port &port) { this->port = port; }
     inline QHostAddress    serverAddress() const { return serverSocket->serverAddress(); }
     inline quint16         serverPort() const { return serverSocket->serverPort(); }
diff --git a/src/xmpp/base/randrandomnumbergenerator.h b/src/xmpp/base/randrandomnumbergenerator.h
index 9d03cfd5..069db228 100644
--- a/src/xmpp/base/randrandomnumbergenerator.h
+++ b/src/xmpp/base/randrandomnumbergenerator.h
@@ -26,7 +26,7 @@
 namespace XMPP {
 class RandRandomNumberGenerator : public RandomNumberGenerator {
 public:
-    RandRandomNumberGenerator() {}
+    RandRandomNumberGenerator() { }
 
     virtual double generateNumber() const { return rand(); }
 
diff --git a/src/xmpp/qa/qttestutil/testregistry.h b/src/xmpp/qa/qttestutil/testregistry.h
index de3f3339..ff56252a 100644
--- a/src/xmpp/qa/qttestutil/testregistry.h
+++ b/src/xmpp/qa/qttestutil/testregistry.h
@@ -50,7 +50,7 @@ class TestRegistry {
     int runTests(int argc, char *argv[]);
 
 private:
-    TestRegistry() {}
+    TestRegistry() { }
 
 private:
     QList<QObject *> tests_;
diff --git a/src/xmpp/xmpp-core/xmpp.h b/src/xmpp/xmpp-core/xmpp.h
index 834a40ae..a904ca82 100644
--- a/src/xmpp/xmpp-core/xmpp.h
+++ b/src/xmpp/xmpp-core/xmpp.h
@@ -107,7 +107,7 @@ class AdvancedConnector : public Connector {
     public:
         enum { None, HttpConnect, HttpPoll, Socks };
         Proxy() = default;
-        ~Proxy() {}
+        ~Proxy() { }
 
         int     type() const;
         QString host() const;
diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index 326b2a8c..08c506c2 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -39,8 +39,8 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
         qint64      length = 0; // 0 - from offset to the end of the file
         QList<Hash> hashes;
 
-        inline Range() {}
-        inline Range(qint64 offset, qint64 length) : offset(offset), length(length) {}
+        inline Range() { }
+        inline Range(qint64 offset, qint64 length) : offset(offset), length(length) { }
         inline bool isValid() const { return hashes.size() || offset || length; }
         inline      operator bool() const { return isValid(); }
         QDomElement toXml(QDomDocument *doc) const;
@@ -89,7 +89,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
     };
 
     class Checksum : public ContentBase {
-        inline Checksum() {}
+        inline Checksum() { }
         Checksum(const QDomElement &file);
         bool        isValid() const;
         QDomElement toXml(QDomDocument *doc) const;
diff --git a/src/xmpp/xmpp-im/jingle-transport.h b/src/xmpp/xmpp-im/jingle-transport.h
index 439db2c9..4b2a62be 100644
--- a/src/xmpp/xmpp-im/jingle-transport.h
+++ b/src/xmpp/xmpp-im/jingle-transport.h
@@ -44,7 +44,7 @@ namespace XMPP { namespace Jingle {
             Q_UNUSED(destinationAddress);
             Q_UNUSED(port)
         }
-        inline NetworkDatagram() {}
+        inline NetworkDatagram() { }
 
         inline bool       isValid() const { return _valid; }
         inline QByteArray data() const { return _data; }
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index 6b82e9e3..25a04da5 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -251,7 +251,7 @@ namespace Jingle {
 
     class ContentBase {
     public:
-        inline ContentBase() {}
+        inline ContentBase() { }
         ContentBase(Origin creator, const QString &name);
         ContentBase(const QDomElement &el);
 
diff --git a/src/xmpp/xmpp-im/xmpp_agentitem.h b/src/xmpp/xmpp-im/xmpp_agentitem.h
index 03b43beb..adb958d3 100644
--- a/src/xmpp/xmpp-im/xmpp_agentitem.h
+++ b/src/xmpp/xmpp-im/xmpp_agentitem.h
@@ -28,7 +28,7 @@
 namespace XMPP {
 class AgentItem {
 public:
-    AgentItem() {}
+    AgentItem() { }
 
     const Jid &     jid() const { return v_jid; }
     const QString & name() const { return v_name; }
diff --git a/src/xmpp/xmpp-im/xmpp_bytestream.h b/src/xmpp/xmpp-im/xmpp_bytestream.h
index 9cb892f5..c805c8f4 100644
--- a/src/xmpp/xmpp-im/xmpp_bytestream.h
+++ b/src/xmpp/xmpp-im/xmpp_bytestream.h
@@ -34,7 +34,7 @@ class BSConnection : public ByteStream {
     enum Error { ErrRefused = ErrCustom, ErrConnect, ErrProxy, ErrSocket };
     enum State { Idle, Requesting, Connecting, WaitingForAccept, Active };
 
-    BSConnection(QObject *parent = nullptr) : ByteStream(parent) {}
+    BSConnection(QObject *parent = nullptr) : ByteStream(parent) { }
 
     virtual void connectToJid(const Jid &peer, const QString &sid) = 0;
     virtual void accept()                                          = 0;
diff --git a/src/xmpp/xmpp-im/xmpp_caps.h b/src/xmpp/xmpp-im/xmpp_caps.h
index 3acf4041..06038dfa 100644
--- a/src/xmpp/xmpp-im/xmpp_caps.h
+++ b/src/xmpp/xmpp-im/xmpp_caps.h
@@ -28,7 +28,7 @@
 namespace XMPP {
 class CapsInfo {
 public:
-    inline CapsInfo() {}
+    inline CapsInfo() { }
     inline CapsInfo(const XMPP::DiscoItem &disco, const QDateTime &lastSeen = QDateTime()) :
         _lastSeen(lastSeen.isNull() ? QDateTime::currentDateTime() : lastSeen), _disco(disco)
     {
diff --git a/src/xmpp/xmpp-im/xmpp_discoitem.h b/src/xmpp/xmpp-im/xmpp_discoitem.h
index face5952..a0545bd3 100644
--- a/src/xmpp/xmpp-im/xmpp_discoitem.h
+++ b/src/xmpp/xmpp-im/xmpp_discoitem.h
@@ -58,7 +58,7 @@ class DiscoItem {
         QString lang;
         QString name;
 
-        inline Identity() {}
+        inline Identity() { }
         inline Identity(const QString &categoty, const QString &type, const QString &lang = QString(),
                         const QString &name = QString()) :
             category(categoty),
diff --git a/src/xmpp/xmpp-im/xmpp_form.h b/src/xmpp/xmpp-im/xmpp_form.h
index 8ae5ca0a..e0bd99af 100644
--- a/src/xmpp/xmpp-im/xmpp_form.h
+++ b/src/xmpp/xmpp-im/xmpp_form.h
@@ -17,7 +17,7 @@
  *
  */
 
-#pragma once 
+#pragma once
 
 #include <QList>
 #include <qdatetime.h>
diff --git a/src/xmpp/xmpp-im/xmpp_hash.h b/src/xmpp/xmpp-im/xmpp_hash.h
index 8929ae28..f07fbd28 100644
--- a/src/xmpp/xmpp-im/xmpp_hash.h
+++ b/src/xmpp/xmpp-im/xmpp_hash.h
@@ -45,9 +45,9 @@ class Hash {
         LastType = Blake2b512
     };
 
-    inline Hash(Type type = Type::Unknown) : v_type(type) {}
-    inline Hash(Type type, const QByteArray &data) : v_type(type), v_data(data) {}
-    inline Hash(const QStringRef &algo) : v_type(parseType(algo)) {}
+    inline Hash(Type type = Type::Unknown) : v_type(type) { }
+    inline Hash(Type type, const QByteArray &data) : v_type(type), v_data(data) { }
+    inline Hash(const QStringRef &algo) : v_type(parseType(algo)) { }
     Hash(const QDomElement &);
 
     inline bool operator==(const Hash &other) const { return v_type == other.v_type && v_data == other.v_data; }
diff --git a/src/xmpp/xmpp-im/xmpp_ibb.h b/src/xmpp/xmpp-im/xmpp_ibb.h
index 044927d1..0ceb5916 100644
--- a/src/xmpp/xmpp-im/xmpp_ibb.h
+++ b/src/xmpp/xmpp-im/xmpp_ibb.h
@@ -34,8 +34,8 @@ class IBBManager;
 
 class IBBData {
 public:
-    IBBData() : seq(0) {}
-    IBBData(const QString &sid, quint16 seq, const QByteArray &data) : sid(sid), seq(seq), data(data) {}
+    IBBData() : seq(0) { }
+    IBBData(const QString &sid, quint16 seq, const QByteArray &data) : sid(sid), seq(seq), data(data) { }
 
     IBBData &   fromXml(const QDomElement &e);
     QDomElement toXml(QDomDocument *) const;
diff --git a/src/xmpp/xmpp-im/xmpp_thumbs.h b/src/xmpp/xmpp-im/xmpp_thumbs.h
index 918aea28..48bf3ddb 100644
--- a/src/xmpp/xmpp-im/xmpp_thumbs.h
+++ b/src/xmpp/xmpp-im/xmpp_thumbs.h
@@ -28,7 +28,7 @@
 namespace XMPP {
 class Thumbnail {
 public:
-    inline Thumbnail() : width(0), height(0) {}
+    inline Thumbnail() : width(0), height(0) { }
     // data - for outgoing it's actual image data. for incoming - cid
     inline Thumbnail(const QByteArray &data, const QString &mimeType = QString(), quint32 width = 0,
                      quint32 height = 0) :
diff --git a/src/xmpp/xmpp-im/xmpp_xdata.h b/src/xmpp/xmpp-im/xmpp_xdata.h
index c36ca9f6..313cd975 100644
--- a/src/xmpp/xmpp-im/xmpp_xdata.h
+++ b/src/xmpp/xmpp-im/xmpp_xdata.h
@@ -49,8 +49,8 @@ class XData {
     QString registrarType() const;
 
     struct ReportField {
-        ReportField() {}
-        ReportField(const QString &_label, const QString &_name) : label(_label), name(_name) {}
+        ReportField() { }
+        ReportField(const QString &_label, const QString &_name) : label(_label), name(_name) { }
         QString label;
         QString name;
     };
@@ -67,7 +67,7 @@ class XData {
     class Field {
     public:
         explicit Field() = default;
-        ~Field() {}
+        ~Field() { }
 
         QString desc() const;
         void    setDesc(const QString &);

From edb5228d7fb9fb2ba5fbfa39e356f4f745d16ede Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sat, 25 Apr 2020 14:02:13 +0300
Subject: [PATCH 145/383] Fixed deprecation warnings

---
 src/xmpp/xmpp-im/xmpp_features.cpp | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/xmpp/xmpp-im/xmpp_features.cpp b/src/xmpp/xmpp-im/xmpp_features.cpp
index e3698074..de2123fe 100644
--- a/src/xmpp/xmpp-im/xmpp_features.cpp
+++ b/src/xmpp/xmpp-im/xmpp_features.cpp
@@ -45,15 +45,37 @@ Features::Features(const QString &str)
 
 Features::~Features() { }
 
-QStringList Features::list() const { return _list.toList(); }
+QStringList Features::list() const
+{
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+    return QStringList(_list.begin(), _list.end());
+#else
+    return _list.toList();
+#endif
+}
 
-void Features::setList(const QStringList &l) { _list = QSet<QString>::fromList(l); }
+void Features::setList(const QStringList &l)
+{
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+    _list = QSet<QString>(l.begin(), l.end());
+#else
+    _list   = QSet<QString>::fromList(l);
+#endif
+}
 
 void Features::setList(const QSet<QString> &l) { _list = l; }
 
 void Features::addFeature(const QString &s) { _list += s; }
 
-bool Features::test(const QStringList &ns) const { return _list.contains(QSet<QString>::fromList(ns)); }
+bool Features::test(const QStringList &ns) const
+{
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+    auto ss = QSet<QString>(ns.begin(), ns.end());
+#else
+    auto ss = QSet<QString>::fromList(ns);
+#endif
+    return _list.contains(ss);
+}
 
 bool Features::test(const QSet<QString> &ns) const { return _list.contains(ns); }
 

From c567567b9d61ce76eaba5e8d080aa542801ba3d1 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sat, 25 Apr 2020 17:14:41 +0300
Subject: [PATCH 146/383] More foreach optimizations

---
 src/irisnet/corelib/netinterface_qtnet.cpp | 3 ++-
 src/irisnet/noncore/tcpportreserver.cpp    | 3 ++-
 src/xmpp/xmpp-core/simplesasl.cpp          | 2 +-
 src/xmpp/xmpp-im/jingle-ice.cpp            | 3 ++-
 src/xmpp/xmpp-im/jingle-s5b.cpp            | 3 ++-
 src/xmpp/xmpp-im/types.cpp                 | 2 +-
 src/xmpp/xmpp-im/xmpp_xdata.cpp            | 2 +-
 src/xmpp/xmpp-im/xmpp_xdata.h              | 2 +-
 tools/icetunnel/main.cpp                   | 3 ++-
 9 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/irisnet/corelib/netinterface_qtnet.cpp b/src/irisnet/corelib/netinterface_qtnet.cpp
index 64539f18..f2433c2c 100644
--- a/src/irisnet/corelib/netinterface_qtnet.cpp
+++ b/src/irisnet/corelib/netinterface_qtnet.cpp
@@ -43,7 +43,8 @@ class IrisQtNet : public NetInterfaceProvider {
     {
         QList<Info> ifaces;
 
-        for (auto &iface : QNetworkInterface::allInterfaces()) {
+        auto const interfaces = QNetworkInterface::allInterfaces();
+        for (auto &iface : interfaces) {
             Info i;
             i.id         = iface.name();
             i.name       = iface.humanReadableName();
diff --git a/src/irisnet/noncore/tcpportreserver.cpp b/src/irisnet/noncore/tcpportreserver.cpp
index 528bffb7..e3cbacca 100644
--- a/src/irisnet/noncore/tcpportreserver.cpp
+++ b/src/irisnet/noncore/tcpportreserver.cpp
@@ -76,7 +76,8 @@ TcpPortServer::PortTypes TcpPortDiscoverer::setTypeMask(TcpPortServer::PortTypes
 void TcpPortDiscoverer::start()
 {
     QList<QHostAddress> listenAddrs;
-    for (const QNetworkInterface &ni : QNetworkInterface::allInterfaces()) {
+    auto const          interfaces = QNetworkInterface::allInterfaces();
+    for (const QNetworkInterface &ni : interfaces) {
         if (!(ni.flags() & (QNetworkInterface::IsUp | QNetworkInterface::IsRunning))) {
             continue;
         }
diff --git a/src/xmpp/xmpp-core/simplesasl.cpp b/src/xmpp/xmpp-core/simplesasl.cpp
index a8621500..3d697ec8 100644
--- a/src/xmpp/xmpp-core/simplesasl.cpp
+++ b/src/xmpp/xmpp-core/simplesasl.cpp
@@ -140,7 +140,7 @@ class SimpleSASLContext : public QCA::SASLContext {
         Q_UNUSED(allowClientSendFirst);
 
         mechanism_ = QString();
-        for (QString mech : mechlist) {
+        for (const QString &mech : mechlist) {
             if (mech == "SCRAM-SHA-1") {
                 mechanism_ = "SCRAM-SHA-1";
                 break;
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index 7ac429b8..d03b42cb 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -580,7 +580,8 @@ namespace XMPP { namespace Jingle { namespace ICE {
                 printf("TURN w/ TCP service: %s;%d\n", qPrintable(stunRelayTcpAddr.toString()), stunRelayTcpPort);
 
             QList<QHostAddress> listenAddrs;
-            for (const QNetworkInterface &ni : QNetworkInterface::allInterfaces()) {
+            auto const          interfaces = QNetworkInterface::allInterfaces();
+            for (const QNetworkInterface &ni : interfaces) {
                 QList<QNetworkAddressEntry> entries = ni.addressEntries();
                 for (const QNetworkAddressEntry &na : entries) {
                     QHostAddress h = na.ip();
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 59574dc2..eb4eb706 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -127,7 +127,8 @@ namespace XMPP { namespace Jingle { namespace S5B {
 
         void connectToHost(const QHostAddress &proxyHost, int proxyPort, const QString &host, bool udpMode)
         {
-            for (const QNetworkInterface &ni : QNetworkInterface::allInterfaces()) {
+            auto const interfaces = QNetworkInterface::allInterfaces();
+            for (const QNetworkInterface &ni : interfaces) {
                 if (!(ni.flags() & (QNetworkInterface::IsUp | QNetworkInterface::IsRunning))) {
                     continue;
                 }
diff --git a/src/xmpp/xmpp-im/types.cpp b/src/xmpp/xmpp-im/types.cpp
index 1f3e1116..d92fe7f0 100644
--- a/src/xmpp/xmpp-im/types.cpp
+++ b/src/xmpp/xmpp-im/types.cpp
@@ -500,7 +500,7 @@ QDomElement RosterExchangeItem::toXml(Stanza &s) const
         e.setAttribute("action", "modify");
         break;
     }
-    for (QString group : groups_) {
+    for (const QString &group : groups_) {
         e.appendChild(s.createTextElement("http://jabber.org/protocol/rosterx", "group", group));
     }
     return e;
diff --git a/src/xmpp/xmpp-im/xmpp_xdata.cpp b/src/xmpp/xmpp-im/xmpp_xdata.cpp
index 6cc4260c..a2e2954a 100644
--- a/src/xmpp/xmpp-im/xmpp_xdata.cpp
+++ b/src/xmpp/xmpp-im/xmpp_xdata.cpp
@@ -330,7 +330,7 @@ void XData::setType(Type t) { d->type = t; }
 
 QString XData::registrarType() const { return d->registrarType; }
 
-XData::FieldList XData::fields() const { return d->fields; }
+const XData::FieldList &XData::fields() const { return d->fields; }
 
 XData::Field XData::getField(const QString &var) const
 {
diff --git a/src/xmpp/xmpp-im/xmpp_xdata.h b/src/xmpp/xmpp-im/xmpp_xdata.h
index 313cd975..34833fba 100644
--- a/src/xmpp/xmpp-im/xmpp_xdata.h
+++ b/src/xmpp/xmpp-im/xmpp_xdata.h
@@ -150,7 +150,7 @@ class XData {
 
     typedef QList<Field> FieldList;
 
-    FieldList fields() const;
+    const FieldList &fields() const;
     Field     getField(const QString &var) const;
     Field &   fieldRef(const QString &var);
     void      setFields(const FieldList &fl);
diff --git a/tools/icetunnel/main.cpp b/tools/icetunnel/main.cpp
index a9cef336..90fd162f 100644
--- a/tools/icetunnel/main.cpp
+++ b/tools/icetunnel/main.cpp
@@ -527,7 +527,8 @@ public slots:
                     strList += addr.addr.toString();
                 }
             }*/
-            for (const QNetworkInterface &ni : QNetworkInterface::allInterfaces()) {
+            auto const interfaces = QNetworkInterface::allInterfaces();
+            for (const QNetworkInterface &ni : interfaces) {
                 if (!(ni.flags() & QNetworkInterface::IsUp))
                     continue;
                 QList<QNetworkAddressEntry> entries = ni.addressEntries();

From 683b9bc02a538119072b93fe7e4dde9dd609ec98 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sat, 25 Apr 2020 17:22:30 +0300
Subject: [PATCH 147/383] More foreach replacements

---
 src/irisnet/appledns/appledns.cpp          | 2 +-
 src/irisnet/appledns/qdnssd.cpp            | 2 +-
 src/irisnet/corelib/addressresolver.cpp    | 4 ++--
 src/irisnet/corelib/netnames_jdns.cpp      | 6 +++---
 src/irisnet/noncore/cutestuff/httppoll.cpp | 4 ++--
 src/irisnet/noncore/ice176.cpp             | 2 +-
 src/irisnet/noncore/icecomponent.cpp       | 2 +-
 src/irisnet/noncore/stuntypes.cpp          | 2 +-
 src/irisnet/noncore/udpportreserver.cpp    | 4 ++--
 src/xmpp/xmpp-im/jingle-ice.cpp            | 2 +-
 src/xmpp/xmpp-im/xmpp_tasks.cpp            | 4 ++--
 tools/icetunnel/main.cpp                   | 8 ++++----
 12 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/irisnet/appledns/appledns.cpp b/src/irisnet/appledns/appledns.cpp
index 0a678b0a..a84af2dd 100644
--- a/src/irisnet/appledns/appledns.cpp
+++ b/src/irisnet/appledns/appledns.cpp
@@ -272,7 +272,7 @@ class AppleProvider : public XMPP::IrisNetProvider {
             if (it.value() == p)
                 ids += it.key();
         }
-        foreach (int id, ids)
+        for (int id : ids)
             stop(id);
     }
 
diff --git a/src/irisnet/appledns/qdnssd.cpp b/src/irisnet/appledns/qdnssd.cpp
index 6b4eeca5..7c2816e8 100644
--- a/src/irisnet/appledns/qdnssd.cpp
+++ b/src/irisnet/appledns/qdnssd.cpp
@@ -271,7 +271,7 @@ class QDnsSd::Private : public QObject {
 
     void removeRequest(Request *req)
     {
-        foreach (const SubRecord *srec, req->_subRecords)
+        for (const SubRecord *srec : req->_subRecords)
             _requestsByRecId.remove(srec->_id);
         if (req->_errorTrigger)
             _requestsByTimer.remove(req->_errorTrigger);
diff --git a/src/irisnet/corelib/addressresolver.cpp b/src/irisnet/corelib/addressresolver.cpp
index 9985797d..ac4e9d37 100644
--- a/src/irisnet/corelib/addressresolver.cpp
+++ b/src/irisnet/corelib/addressresolver.cpp
@@ -124,7 +124,7 @@ class AddressResolver::Private : public QObject {
 private slots:
     void req6_resultsReady(const QList<XMPP::NameRecord> &results)
     {
-        foreach (const NameRecord &rec, results)
+        for (const NameRecord &rec : results)
             addrs6 += rec.address();
 
         done6 = true;
@@ -141,7 +141,7 @@ private slots:
 
     void req4_resultsReady(const QList<XMPP::NameRecord> &results)
     {
-        foreach (const NameRecord &rec, results)
+        for (const NameRecord &rec : results)
             addrs4 += rec.address();
 
         done4 = true;
diff --git a/src/irisnet/corelib/netnames_jdns.cpp b/src/irisnet/corelib/netnames_jdns.cpp
index 84ec91ac..d7a2f8ca 100644
--- a/src/irisnet/corelib/netnames_jdns.cpp
+++ b/src/irisnet/corelib/netnames_jdns.cpp
@@ -1545,7 +1545,7 @@ public slots:
 
     void cleanup()
     {
-        foreach (JDnsPublishExtra *extra, extraList)
+        for (JDnsPublishExtra *extra : extraList)
             cleanupExtra(extra);
         qDeleteAll(extraList);
         extraList.clear();
@@ -2186,7 +2186,7 @@ class JDnsServiceProvider : public ServiceProvider {
                 remove += i;
         }
 
-        foreach (PublishExtraItem *i, remove)
+        for (PublishExtraItem *i : remove)
             publishExtraItemList.remove(i);
     }
 
@@ -2315,7 +2315,7 @@ private slots:
     void pub_addresses_hostName(const QByteArray &name)
     {
         // tell all active publishes about the change
-        foreach (PublishItem *item, publishItemList.items)
+        for (PublishItem *item : publishItemList.items)
             item->publish->hostChanged(name);
     }
 
diff --git a/src/irisnet/noncore/cutestuff/httppoll.cpp b/src/irisnet/noncore/cutestuff/httppoll.cpp
index 7fed90a1..d10ff99a 100644
--- a/src/irisnet/noncore/cutestuff/httppoll.cpp
+++ b/src/irisnet/noncore/cutestuff/httppoll.cpp
@@ -636,7 +636,7 @@ void HttpProxyPost::processData(const QByteArray &block)
 #ifdef PROX_DEBUG
                 fprintf(stderr, "HttpProxyPost: header proto=[%s] code=[%d] msg=[%s]\n", proto.latin1(), code,
                         msg.latin1());
-                foreach (const QString &s, d->headerLines)
+                for (const QString &s : d->headerLines)
                     fprintf(stderr, "HttpProxyPost: * [%s]\n", qPrintable(s));
 #endif
             }
@@ -888,7 +888,7 @@ void HttpProxyGetStream::processData(const QByteArray &block)
 #ifdef PROX_DEBUG
                 fprintf(stderr, "HttpProxyGetStream: header proto=[%s] code=[%d] msg=[%s]\n", proto.latin1(), code,
                         msg.latin1());
-                foreach (const QString &s, d->headerLines)
+                for (const QString &s : d->headerLines)
                     fprintf(stderr, "HttpProxyGetStream: * [%s]\n", qPrintable(s));
 #endif
             }
diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index 31f9f2fe..bb31cb60 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -184,7 +184,7 @@ class Ice176::Private : public QObject {
 
     ~Private()
     {
-        foreach (const Component &c, components)
+        for (const Component &c : components)
             delete c.ic;
 
         // no need to delete pools and bindings since pools already deleted here
diff --git a/src/irisnet/noncore/icecomponent.cpp b/src/irisnet/noncore/icecomponent.cpp
index 5f5e7c71..e4240fab 100644
--- a/src/irisnet/noncore/icecomponent.cpp
+++ b/src/irisnet/noncore/icecomponent.cpp
@@ -895,7 +895,7 @@ void IceComponent::flagPathAsLowOverhead(int id, const QHostAddress &addr, int p
 void IceComponent::setDebugLevel(DebugLevel level)
 {
     d->debugLevel = level;
-    foreach (const Private::LocalTransport *lt, d->udpTransports)
+    for (const Private::LocalTransport *lt : d->udpTransports)
         lt->sock->setDebugLevel(IceTransport::DebugLevel(level));
     if (d->tcpTurn)
         d->tcpTurn->setDebugLevel((IceTransport::DebugLevel)level);
diff --git a/src/irisnet/noncore/stuntypes.cpp b/src/irisnet/noncore/stuntypes.cpp
index ae1ea808..b3c1765c 100644
--- a/src/irisnet/noncore/stuntypes.cpp
+++ b/src/irisnet/noncore/stuntypes.cpp
@@ -486,7 +486,7 @@ namespace StunTypes {
             if (parseUnknownAttributes(val, &typeList)) {
                 if (!typeList.isEmpty()) {
                     QStringList strList;
-                    foreach (quint16 i, typeList)
+                    for (quint16 i : typeList)
                         strList += QString::asprintf("0x%04x", i);
                     return strList.join(", ");
                 } else
diff --git a/src/irisnet/noncore/udpportreserver.cpp b/src/irisnet/noncore/udpportreserver.cpp
index 5c2be256..c9d1acbd 100644
--- a/src/irisnet/noncore/udpportreserver.cpp
+++ b/src/irisnet/noncore/udpportreserver.cpp
@@ -83,7 +83,7 @@ class UdpPortReserver::Private : public QObject {
             abort();
 
         for (const Item &i : items) {
-            foreach (QUdpSocket *sock, i.sockList)
+            for (QUdpSocket *sock : i.sockList)
                 sock->deleteLater();
         }
     }
@@ -272,7 +272,7 @@ private slots:
 
             // don't care about this port anymore?
             if (!i.lent && !ports.contains(i.port)) {
-                foreach (QUdpSocket *sock, i.sockList)
+                for (QUdpSocket *sock : i.sockList)
                     sock->deleteLater();
 
                 items.removeAt(n);
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index d03b42cb..aadb1394 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -624,7 +624,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
 
             if (!strList.isEmpty()) {
                 printf("Host addresses:\n");
-                foreach (const QString &s, strList)
+                for (const QString &s : strList)
                     printf("  %s\n", qPrintable(s));
             }
 
diff --git a/src/xmpp/xmpp-im/xmpp_tasks.cpp b/src/xmpp/xmpp-im/xmpp_tasks.cpp
index 3a65349b..124702e9 100644
--- a/src/xmpp/xmpp-im/xmpp_tasks.cpp
+++ b/src/xmpp/xmpp-im/xmpp_tasks.cpp
@@ -431,7 +431,7 @@ void JT_Roster::onGo()
         iq                = createIQ(doc(), "set", to.full(), id());
         QDomElement query = doc()->createElementNS("jabber:iq:roster", "query");
         iq.appendChild(query);
-        foreach (const QDomElement &it, d->itemList)
+        for (const QDomElement &it : d->itemList)
             query.appendChild(it);
         send(iq);
     } else if (type == GetDelimiter) {
@@ -452,7 +452,7 @@ QString JT_Roster::toString() const
 
     QDomElement i = doc()->createElement("request");
     i.setAttribute("type", "JT_Roster");
-    foreach (const QDomElement &it, d->itemList)
+    for (const QDomElement &it : d->itemList)
         i.appendChild(it);
     return lineEncode(Stream::xmlToString(i));
 }
diff --git a/tools/icetunnel/main.cpp b/tools/icetunnel/main.cpp
index 90fd162f..b8b21341 100644
--- a/tools/icetunnel/main.cpp
+++ b/tools/icetunnel/main.cpp
@@ -226,7 +226,7 @@ static QStringList iceblock_create(const IceOffer &in)
         userpass += urlishEncode(in.user);
         userpass += urlishEncode(in.pass);
         body += userpass.join(",");
-        foreach (const XMPP::Ice176::Candidate &c, in.candidates)
+        for (const XMPP::Ice176::Candidate &c : in.candidates)
             body += candidate_to_line(c);
         out += line_wrap(body.join(";"), 78);
     }
@@ -565,7 +565,7 @@ public slots:
         listenAddrs = sortAddrs(listenAddrs);
 
         QStringList strList;
-        foreach (const QHostAddress &h, listenAddrs) // QNetworkInterface::allAddresses())
+        for (const QHostAddress &h : listenAddrs) // QNetworkInterface::allAddresses())
         {
             XMPP::Ice176::LocalAddress addr;
             addr.addr = h;
@@ -584,7 +584,7 @@ public slots:
 
         if (!strList.isEmpty()) {
             printf("Host addresses:\n");
-            foreach (const QString &s, strList)
+            for (const QString &s : strList)
                 printf("  %s\n", qPrintable(s));
         }
 
@@ -670,7 +670,7 @@ private slots:
         out.pass          = ice->localPassword();
         out.candidates    = list;
         QStringList block = iceblock_create(out);
-        foreach (const QString &s, block)
+        for (const QString &s : block)
             printf("%s\n", qPrintable(s));
 
         printf("Give above ICE block to peer.  Obtain peer ICE block and paste below...\n");

From 5a9e209f5d4375ed0cff3f2e444a70d8d21da387 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 26 Apr 2020 23:04:26 +0300
Subject: [PATCH 148/383] Introduce readyToSendMedia ICE signal

---
 src/irisnet/noncore/ice176.cpp | 69 ++++++++++++++++++++++++++++++----
 src/irisnet/noncore/ice176.h   |  4 +-
 2 files changed, 64 insertions(+), 9 deletions(-)

diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index bb31cb60..dc178105 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -80,7 +80,14 @@ class Ice176::Private : public QObject {
 
 public:
     // note, Nominating state is skipped when aggressive nomination is enabled.
-    enum State { Stopped, Starting, Started, Nominating, Stopping };
+    enum State {
+        Stopped,
+        Starting,   // preparing local candidates right after start() call
+        Started,    // local candidates ready. ready for pairing with remote
+        Nominating, // for ice2 it's a state when we decided to nominate one of active pairs
+        Active,     // all components have a nominated pair and media transferred over them
+        Stopping    // when received a command from the user to stop
+    };
 
     enum CandidatePairState { PWaiting, PInProgress, PSucceeded, PFailed, PFrozen };
 
@@ -121,17 +128,19 @@ class Ice176::Private : public QObject {
     public:
         QList<QSharedPointer<CandidatePair>> pairs;
         QQueue<QWeakPointer<CandidatePair>>  triggeredPairs;
-        QList<QSharedPointer<CandidatePair>> validPairs;
+        QList<QSharedPointer<CandidatePair>> validPairs; // highest priority and nominated come first
         CheckListState                       state;
     };
 
     class Component {
     public:
-        int           id            = 0;
-        IceComponent *ic            = nullptr;
-        bool          localFinished = false;
-        bool          stopped       = false;
-        bool          lowOverhead   = false;
+        int           id                = 0;
+        IceComponent *ic                = nullptr;
+        bool          localFinished     = false;
+        bool          hasValidPairs     = false;
+        bool          hasNominatedPairs = false;
+        bool          stopped           = false;
+        bool          lowOverhead       = false;
     };
 
     Ice176 *                                q;
@@ -170,6 +179,7 @@ class Ice176::Private : public QObject {
     bool                                    localHostGatheringFinished = false;
     bool                                    localGatheringComplete     = false;
     bool                                    remoteGatheringComplete    = false;
+    bool                                    readyToSendMedia           = false;
 
     Private(Ice176 *_q) : QObject(_q), q(_q)
     {
@@ -256,6 +266,9 @@ class Ice176::Private : public QObject {
         localUser = IceAgent::randomCredential(4);
         localPass = IceAgent::randomCredential(22);
 
+        if (!useLocal)
+            useStunBind = false;
+
         QList<QUdpSocket *> socketList;
         if (portReserver)
             // list size = componentCount * number of interfaces
@@ -578,6 +591,19 @@ class Ice176::Private : public QObject {
         // FIXME: actually do something
     }
 
+    void tryIceSuccess()
+    {
+        if (!readyToSendMedia || !(state == Nominating || state == Started))
+            return;
+        if (!(localFeatures & AggressiveNomination)) {
+            state = Active;
+            emit q->iceFinished(); // nominated won't change anymore
+            return;
+        }
+        // Otherwise we are going to cease checks as soon as we have any "host" or "reflexive" local
+        // valid candidate.
+    }
+
     void tryComponentSuccess(QSharedPointer<CandidatePair> &pair)
     {
         // TODO the pair can change with aggressive validation (?)
@@ -593,6 +619,16 @@ class Ice176::Private : public QObject {
         }
 
         emit q->componentReady(pair->local->componentId - 1);
+
+        if (!readyToSendMedia && !(localFeatures & NotNominatedData && remoteFeatures & NotNominatedData)) {
+            // if both follow RFC8445 and allow to send data on any valid pair
+            components[findComponent(pair->local->componentId)].hasNominatedPairs = true;
+            if (std::all_of(components.begin(), components.end(), [](auto &c) { return c.hasNominatedPairs; })) {
+                readyToSendMedia = true;
+                emit q->readyToSendMedia();
+            }
+        }
+        tryIceSuccess();
     }
 
     // ice negotiation failed. either initial or on ICE restart
@@ -1190,7 +1226,24 @@ private slots:
 
         pair->isValid = true;
         pair->state   = PSucceeded; // what if it was in progress?
-        checkList.validPairs.append(pair);
+        auto insIt    = std::upper_bound(
+            checkList.validPairs.begin(), checkList.validPairs.end(), pair, [](auto &item, auto &toins) {
+                if (toins->isNominated ^ item->isNominated)
+                    return item->isNominated;
+                return item->priority == toins->priority
+                    ? item->local->componentId < toins->local->componentId
+                    : item->priority >= toins->priority; // inverted since we need high priority first
+            });
+        checkList.validPairs.insert(insIt, pair); // nominated and highest priority first
+
+        if (!readyToSendMedia && localFeatures & NotNominatedData && remoteFeatures & NotNominatedData) {
+            // if both follow RFC8445 and allow to send data on any valid pair
+            components[findComponent(pair->local->componentId)].hasValidPairs = true;
+            if (std::all_of(components.begin(), components.end(), [](auto &c) { return c.hasValidPairs; })) {
+                readyToSendMedia = true;
+                emit q->readyToSendMedia();
+            }
+        }
 
         if (mode == Ice176::Initiator) {
             if (!binding->useCandidate())
diff --git a/src/irisnet/noncore/ice176.h b/src/irisnet/noncore/ice176.h
index 385560f6..ea450a34 100644
--- a/src/irisnet/noncore/ice176.h
+++ b/src/irisnet/noncore/ice176.h
@@ -152,7 +152,9 @@ class Ice176 : public QObject {
 
     void localCandidatesReady(const QList<XMPP::Ice176::Candidate> &list);
     void localGatheringComplete();
-    void componentReady(int index);
+    void readyToSendMedia();        // Has at least one valid candidate for each component
+    void componentReady(int index); // has valid nominated candidate for component with index
+    void iceFinished();             // Final nominated candidates are selected for all components
 
     void readyRead(int componentIndex);
     void datagramsWritten(int componentIndex, int count);

From ec2cc51ace470f5d0655abb5abe2fe5c8ed3b512 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 26 Apr 2020 23:05:48 +0300
Subject: [PATCH 149/383] Added pre-commit config

see https://pre-commit.com/ for usage
---
 .pre-commit-config.yaml | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 .pre-commit-config.yaml

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 00000000..b454d589
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,29 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+
+exclude: '^3rdparty'
+repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v2.5.0
+    hooks:
+    -   id: trailing-whitespace
+    -   id: end-of-file-fixer
+    -   id: check-added-large-files
+    -   id: check-merge-conflict
+-   repo: https://github.com/doublify/pre-commit-clang-format
+    # for clang-tidy we can take github.com/pocc/pre-commit-hooks
+    rev: f4c4ac5948aff384af2b439bfabb2bdd65d2b3ac
+    hooks:
+    -   id: clang-format
+-   repo: https://github.com/Lucas-C/pre-commit-hooks
+    rev: v1.1.7
+    hooks:
+    -   id: forbid-crlf
+    -   id: remove-crlf
+    -   id: forbid-tabs
+    -   id: remove-tabs
+-   repo: https://github.com/openstack-dev/bashate
+    rev: 2.0.0
+    hooks:
+    -   id: bashate
+        args: ['--ignore', 'E006']

From 3d1744ded52e063b55b9ad5144931deac9ffc04b Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 27 Apr 2020 01:23:22 +0300
Subject: [PATCH 150/383] Disable invalid double init of stun/turn

---
 src/irisnet/noncore/icecomponent.cpp | 34 ++++++++++++----------------
 tools/icetunnel/main.cpp             | 10 ++++----
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/src/irisnet/noncore/icecomponent.cpp b/src/irisnet/noncore/icecomponent.cpp
index e4240fab..706b604a 100644
--- a/src/irisnet/noncore/icecomponent.cpp
+++ b/src/irisnet/noncore/icecomponent.cpp
@@ -161,7 +161,9 @@ class IceComponent::Private : public QObject {
         Q_ASSERT(!stopping);
 
         // only allow setting stun stuff once
-        if (!pending.stunBindAddr.isNull() && config.stunBindAddr.isNull()) {
+        if ((!pending.stunBindAddr.isNull() && config.stunBindAddr.isNull())
+            || (!pending.stunRelayUdpAddr.isNull() && config.stunRelayUdpAddr.isNull())
+            || (!pending.stunRelayTcpAddr.isNull() && config.stunRelayTcpAddr.isNull())) {
             config.stunBindAddr     = pending.stunBindAddr;
             config.stunBindPort     = pending.stunBindPort;
             config.stunRelayUdpAddr = pending.stunRelayUdpAddr;
@@ -200,12 +202,15 @@ class IceComponent::Private : public QObject {
                 auto lt = createLocalTransport(IceSocket::Ptr::create(qsock, borrowedSocket, this), la);
                 udpTransports += lt;
 
-                if (useStunBind && !config.stunBindAddr.isNull()) {
-                    lt->sock->setStunBindService(config.stunBindAddr, config.stunBindPort);
-                }
-                if (useStunRelayUdp && !config.stunRelayUdpAddr.isNull() && !config.stunRelayUdpUser.isEmpty()) {
-                    lt->sock->setStunRelayService(config.stunRelayUdpAddr, config.stunRelayUdpPort,
-                                                  config.stunRelayUdpUser, config.stunRelayUdpPass);
+                if (lt->addr.protocol() != QAbstractSocket::IPv6Protocol) {
+                    lt->sock->setClientSoftwareNameAndVersion(clientSoftware);
+                    if (useStunBind && !config.stunBindAddr.isNull()) {
+                        lt->sock->setStunBindService(config.stunBindAddr, config.stunBindPort);
+                    }
+                    if (useStunRelayUdp && !config.stunRelayUdpAddr.isNull() && !config.stunRelayUdpUser.isEmpty()) {
+                        lt->sock->setStunRelayService(config.stunRelayUdpAddr, config.stunRelayUdpPort,
+                                                      config.stunRelayUdpUser, config.stunRelayUdpPass);
+                    }
                 }
 
                 int port = qsock->localPort();
@@ -589,19 +594,8 @@ private slots:
                 return;
         }
 
-        // setup stun/turn
-        bool bind  = useStunBind && !config.stunBindAddr.isNull();
-        bool relay = useStunRelayUdp && !config.stunRelayUdpAddr.isNull() && !config.stunRelayUdpUser.isEmpty();
-        // if need to start stun/turn
-        if (!lt->stun_started && (bind || relay) && lt->addr.protocol() != QAbstractSocket::IPv6Protocol) {
-            lt->sock->setClientSoftwareNameAndVersion(clientSoftware);
-            if (bind) {
-                lt->sock->setStunBindService(config.stunBindAddr, config.stunBindPort);
-            }
-            if (relay) {
-                lt->sock->setStunRelayService(config.stunRelayUdpAddr, config.stunRelayUdpPort, config.stunRelayUdpUser,
-                                              config.stunRelayUdpPass);
-            }
+        if (!lt->stun_started
+            && (!lt->sock->stunBindServiceAddress().isNull() || !lt->sock->stunRelayServiceAddress().isNull())) {
             lt->stun_started = true;
             lt->sock->stunStart();
             if (!watch.isValid())
diff --git a/tools/icetunnel/main.cpp b/tools/icetunnel/main.cpp
index b8b21341..9b412210 100644
--- a/tools/icetunnel/main.cpp
+++ b/tools/icetunnel/main.cpp
@@ -415,6 +415,7 @@ class App : public QObject {
     QHostAddress                      stunAddr;
     XMPP::UdpPortReserver             portReserver;
     XMPP::Ice176 *                    ice = nullptr;
+    QList<XMPP::Ice176::Candidate>    localCandidates;
     QList<XMPP::Ice176::LocalAddress> localAddrs;
     QList<Channel>                    channels;
     QCA::Console *                    console = nullptr;
@@ -477,8 +478,9 @@ public slots:
         connect(ice, SIGNAL(started()), SLOT(ice_started()));
         connect(ice, SIGNAL(stopped()), SLOT(ice_stopped()));
         connect(ice, SIGNAL(error(XMPP::Ice176::Error)), SLOT(ice_error(XMPP::Ice176::Error)));
-        connect(ice, SIGNAL(localCandidatesReady(const QList<XMPP::Ice176::Candidate> &)),
-                SLOT(ice_localCandidatesReady(const QList<XMPP::Ice176::Candidate> &)));
+        connect(ice, &XMPP::Ice176::localCandidatesReady, this,
+                [this](const QList<XMPP::Ice176::Candidate> &cs) { localCandidates += cs; });
+        connect(ice, &XMPP::Ice176::localGatheringComplete, this, &App::ice_localGatheringComplete);
         connect(ice, SIGNAL(componentReady(int)), SLOT(ice_componentReady(int)));
         connect(ice, SIGNAL(readyRead(int)), SLOT(ice_readyRead(int)));
         connect(ice, SIGNAL(datagramsWritten(int, int)), SLOT(ice_datagramsWritten(int, int)));
@@ -663,12 +665,12 @@ private slots:
         emit quit();
     }
 
-    void ice_localCandidatesReady(const QList<XMPP::Ice176::Candidate> &list)
+    void ice_localGatheringComplete()
     {
         IceOffer out;
         out.user          = ice->localUfrag();
         out.pass          = ice->localPassword();
-        out.candidates    = list;
+        out.candidates    = localCandidates;
         QStringList block = iceblock_create(out);
         for (const QString &s : block)
             printf("%s\n", qPrintable(s));

From 82d26610afc4ae7b1616030a9de41875b0cffa16 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 28 Apr 2020 00:04:18 +0300
Subject: [PATCH 151/383] Careful handling of ICE gathering complete

---
 src/irisnet/noncore/ice176.cpp | 461 ++++++++++++++++++++-------------
 src/irisnet/noncore/ice176.h   |   1 +
 2 files changed, 288 insertions(+), 174 deletions(-)

diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index dc178105..d12d3fcd 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -102,6 +102,7 @@ class Ice176::Private : public QObject {
         bool                             isValid                 = false; // a pair which is also in valid list
         bool                             isNominated             = false;
         bool                             isTriggeredForNominated = false;
+        bool                             finalNomination         = false;
         CandidatePairState               state                   = CandidatePairState::PFrozen;
 
         qint64  priority = 0;
@@ -118,7 +119,7 @@ class Ice176::Private : public QObject {
         {
             if (isNull())
                 return QLatin1String("null pair");
-            return QString(QLatin1String("%1 %2 -> %3 %4"))
+            return QString(QLatin1String("L:\"%1\" %2 - R:\"%3\" %4"))
                 .arg(candidateType_to_string(local->type), QString(local->addr), candidateType_to_string(remote->type),
                      QString(remote->addr));
         }
@@ -148,8 +149,12 @@ class Ice176::Private : public QObject {
     State                                   state = Stopped;
     QTimer                                  checkTimer;
     TurnClient::Proxy                       proxy;
-    UdpPortReserver *                       portReserver   = nullptr;
-    int                                     componentCount = 0;
+    UdpPortReserver *                       portReserver = nullptr;
+    std::unique_ptr<QTimer>                 nominationTimer;
+    std::unique_ptr<QTimer>                 remoteGatheringCompleteTimer;
+    int                                     agressiveNominationTimeout     = 3000;  // 3s
+    int                                     remoteGatheringCompleteTimeout = 30000; // 30s
+    int                                     componentCount                 = 0;
     QList<Ice176::LocalAddress>             localAddrs;
     QList<Ice176::ExternalAddress>          extAddrs;
     QHostAddress                            stunBindAddr;
@@ -324,9 +329,11 @@ class Ice176::Private : public QObject {
 
     void stop()
     {
-        Q_ASSERT(state == Starting || state == Started);
+        Q_ASSERT(state == Starting || state == Started || state == Nominating || state == Active);
 
         state = Stopping;
+        nominationTimer.reset();
+        remoteGatheringCompleteTimer.reset();
 
         // will trigger candidateRemoved events and result pairs cleanup.
         if (!components.isEmpty()) {
@@ -341,6 +348,7 @@ class Ice176::Private : public QObject {
 
     void addRemoteCandidates(const QList<Candidate> &list)
     {
+        updateRemoteGatheringTimeout();
         QList<IceComponent::CandidateInfo::Ptr> remoteCandidates;
         for (const Candidate &c : list) {
             auto ci       = IceComponent::CandidateInfo::Ptr::create();
@@ -384,6 +392,15 @@ class Ice176::Private : public QObject {
         doPairing(localCandidates, remoteCandidates);
     }
 
+    void setRemoteGatheringComplete()
+    {
+        remoteGatheringComplete = true;
+        remoteGatheringCompleteTimer.reset();
+
+        printf("Got remote gathering complete signal");
+        onRemoteGatheringCompleted();
+    }
+
     // returns a pair is pairable or null
     QSharedPointer<CandidatePair> makeCandidatesPair(IceComponent::CandidateInfo::Ptr lc,
                                                      IceComponent::CandidateInfo::Ptr rc)
@@ -513,15 +530,23 @@ class Ice176::Private : public QObject {
         // pair->pool->setPassword(peerPass.toUtf8());
 
         pair->binding = new StunBinding(pair->pool);
-        connect(pair->binding, SIGNAL(success()), SLOT(binding_success()));
-        connect(pair->binding, &StunBinding::error, this, &Ice176::Private::binding_error);
+        connect(pair->binding, &StunBinding::success, this, [this, wpair = pair.toWeakRef()]() {
+            auto pair = wpair.lock();
+            if (pair)
+                handlePairBindingSuccess(pair);
+        });
+        connect(pair->binding, &StunBinding::error, this, [this, wpair = pair.toWeakRef()](XMPP::StunBinding::Error e) {
+            auto pair = wpair.lock();
+            if (pair)
+                handlePairBindingError(pair, e);
+        });
 
         int prflx_priority = c.ic->peerReflexivePriority(lc.iceTransport, lc.path);
         pair->binding->setPriority(prflx_priority);
 
         if (mode == Ice176::Initiator) {
             pair->binding->setIceControlling(0);
-            if (localFeatures & AggressiveNomination)
+            if (localFeatures & AggressiveNomination || pair->finalNomination)
                 pair->binding->setUseCandidate(true);
         } else
             pair->binding->setIceControlled(0);
@@ -591,51 +616,101 @@ class Ice176::Private : public QObject {
         // FIXME: actually do something
     }
 
-    void tryIceSuccess()
+    void cleanupButSelectedPair()
     {
-        if (!readyToSendMedia || !(state == Nominating || state == Started))
-            return;
-        if (!(localFeatures & AggressiveNomination)) {
-            state = Active;
-            emit q->iceFinished(); // nominated won't change anymore
+        Q_ASSERT(!checkList.validPairs.isEmpty());
+        checkList.validPairs.erase(checkList.validPairs.begin() + 1, checkList.validPairs.end());
+        auto  ci = checkList.validPairs.first()->local;
+        auto &t  = localCandidates[findLocalCandidate(ci->addr.addr, ci->addr.port)].iceTransport;
+        // cancel active transactions
+        for (auto &p : checkList.pairs) {
+            if (p->state == PInProgress) {
+                p->binding->cancel();
+                p->state = PFailed;
+            }
+        }
+        // stop not used transports
+        for (auto &c : localCandidates) {
+            if (c.iceTransport != t) {
+                c.iceTransport->stop();
+            }
+        }
+    }
+
+    bool canHaveMoreRemoteCandidates() const { return remoteGatheringComplete || !(remoteFeatures & Trickle); }
+
+    void tryNominateSelectedPair()
+    {
+        if (mode != Initiator || state != Started || checkList.validPairs.isEmpty())
             return;
+        Q_ASSERT(!checkList.validPairs.first()->isNominated);
+        if (checkList.validPairs.first()->local->type == IceComponent::RelayedType) {
+            if (!(localGatheringComplete && canHaveMoreRemoteCandidates())) {
+                printf("Wiating for gathering complete on both sides before nomination of relayed pair");
+                return; // maybe we gonna have a non-relayed pair. RFC8445 anyway allows to send data on any valid.
+            }
+
+            // if there is any non-relayed pending pair
+            if (std::any_of(checkList.pairs.begin(), checkList.pairs.end(), [](auto &p) {
+                    return p->state != PSucceeded && p->state != PFailed && p->local->type != IceComponent::RelayedType;
+                })) {
+                printf("There are some non-relayed pairs to check before relayed nomination");
+                return; // either till checked or remote gathering timeout
+            }
         }
-        // Otherwise we are going to cease checks as soon as we have any "host" or "reflexive" local
-        // valid candidate.
+        state                 = Nominating;
+        auto pair             = checkList.validPairs.first();
+        pair->finalNomination = true;
+        printf("Nominating valid pair: %s", qPrintable(*pair));
+        checkList.triggeredPairs.prepend(pair);
     }
 
+    // execute when new nominated pair
     void tryComponentSuccess(QSharedPointer<CandidatePair> &pair)
     {
-        // TODO the pair can change with aggressive validation (?)
-        pair->isNominated = true;
-
-        int        at = findComponent(pair->local->componentId);
-        Component &c  = components[at];
+        Component &c        = components[findComponent(pair->local->componentId)];
+        pair->isNominated   = true;
+        c.hasNominatedPairs = true;
         if (c.lowOverhead) {
             printf("component is flagged for low overhead.  setting up for %s\n", qPrintable(*pair));
-            at                          = findLocalCandidate(pair->local->addr.addr, pair->local->addr.port);
-            IceComponent::Candidate &cc = localCandidates[at];
+            auto &cc = localCandidates[findLocalCandidate(pair->local->addr.addr, pair->local->addr.port)];
             c.ic->flagPathAsLowOverhead(cc.id, pair->remote->addr.addr, pair->remote->addr.port);
         }
 
         emit q->componentReady(pair->local->componentId - 1);
 
-        if (!readyToSendMedia && !(localFeatures & NotNominatedData && remoteFeatures & NotNominatedData)) {
-            // if both follow RFC8445 and allow to send data on any valid pair
-            components[findComponent(pair->local->componentId)].hasNominatedPairs = true;
-            if (std::all_of(components.begin(), components.end(), [](auto &c) { return c.hasNominatedPairs; })) {
-                readyToSendMedia = true;
-                emit q->readyToSendMedia();
-            }
+        if (!std::all_of(components.begin(), components.end(), [](auto &c) { return c.hasNominatedPairs; }))
+            return;
+
+        // so all components have nominated pair here
+        if (!readyToSendMedia) {
+            readyToSendMedia = true;
+            emit q->readyToSendMedia();
+        }
+
+        if (localFeatures & AggressiveNomination) {
+            // nominated candidate may change. start a timer to cease all checks later
+            nominationTimer.reset(new QTimer(this));
+            nominationTimer->setSingleShot(true);
+            nominationTimer->setInterval(agressiveNominationTimeout);
+            connect(nominationTimer.get(), &QTimer::timeout, this, [this]() {
+                cleanupButSelectedPair();
+                state = Active;
+                emit q->iceFinished();
+            });
+            nominationTimer->start();
+        } else {
+            // all the checks had to be cancelled already. So nothing more
+            state = Active;
+            emit q->iceFinished(); // nominated won't change anymore
         }
-        tryIceSuccess();
     }
 
     // ice negotiation failed. either initial or on ICE restart
     void tryComponentFailed(int componentId)
     {
         Q_ASSERT(state == Starting);
-        if (!(localGatheringComplete && remoteGatheringComplete)) {
+        if (!(localGatheringComplete && canHaveMoreRemoteCandidates())) {
             return; // if we have something to gather then we still have a chance for success
         }
 
@@ -696,6 +771,39 @@ class Ice176::Private : public QObject {
             checkTimer.start();
     }
 
+    void onRemoteGatheringCompleted()
+    {
+        remoteGatheringComplete = true;
+        if (!localGatheringComplete || state != Started)
+            return;
+
+        if (!checkList.validPairs.isEmpty() && mode == Initiator && !(localFeatures & AggressiveNomination))
+            tryNominateSelectedPair();
+    }
+
+    void updateRemoteGatheringTimeout()
+    {
+        if (remoteFeatures & GatheringComplete || !(remoteFeatures & Trickle)) {
+            remoteGatheringCompleteTimer.reset();
+            printf("Don't use Remote Gatherging Complete timeout");
+            return;
+        } else if (remoteGatheringCompleteTimer) {
+            printf("Remote Gatherging Complete was restarted");
+            remoteGatheringCompleteTimer->start(); // restart
+            return;
+        }
+        remoteGatheringCompleteTimer.reset(new QTimer(this));
+        remoteGatheringCompleteTimer->setSingleShot(true);
+        remoteGatheringCompleteTimer->setInterval(remoteGatheringCompleteTimeout);
+        connect(remoteGatheringCompleteTimer.get(), &QTimer::timeout, this, [this]() {
+            remoteGatheringCompleteTimer.release()->deleteLater();
+            printf("Timeout waiting for Gathering Complete signal");
+            onRemoteGatheringCompleted();
+        });
+        printf("Start Remote Gatherging Complete timer");
+        remoteGatheringCompleteTimer->start();
+    }
+
 private:
     int findComponent(const IceComponent *ic) const
     {
@@ -829,6 +937,145 @@ class Ice176::Private : public QObject {
         return id;
     }
 
+    void handlePairBindingSuccess(CandidatePair::Ptr pair)
+    {
+        /*
+            RFC8445 7.2.5.2.1.  Non-Symmetric Transport Addresses
+            tells us addr:port of source->dest of request MUST match with dest<-source of the response,
+            and we should mark the pair as failed if doesn't match.
+            But StunTransaction already does this for us in its checkActiveAndFrom.
+            So it will fail with timeout instead if response comes from a wrong address.
+        */
+
+        StunBinding *binding = pair->binding;
+        // pair->isValid = true;
+        pair->state                  = CandidatePairState::PSucceeded;
+        bool isTriggeredForNominated = pair->isTriggeredForNominated;
+        bool finalNomination         = pair->finalNomination;
+
+        printf("check success for %s\n", qPrintable(QString(*pair)));
+
+        // RFC8445 7.2.5.3.1.  Discovering Peer-Reflexive Candidates
+        auto mappedAddr = IceComponent::TransportAddress(binding->reflexiveAddress(), binding->reflexivePort());
+        if (pair->local->addr != mappedAddr) { // skip "If the valid pair equals the pair that generated the check"
+
+            // so mapped address doesn't match with local candidate sending binding request.
+            // gotta find/create one
+            auto locIt = std::find_if(localCandidates.begin(), localCandidates.end(), [&](const auto &c) {
+                return c.info->base == mappedAddr || c.info->addr == mappedAddr;
+            });
+            if (locIt == localCandidates.end()) {
+                // RFC8445 7.2.5.3.1.  Discovering Peer-Reflexive Candidates
+                // new peer-reflexive local candidate discovered
+                components[findComponent(pair->local->componentId)].ic->addLocalPeerReflexiveCandidate(
+                    mappedAddr, pair->local, binding->priority());
+                locIt = std::find_if(localCandidates.begin(), localCandidates.end(),
+                                     [&](const auto &c) { return c.info->addr == mappedAddr; }); // just inserted
+                Q_ASSERT(locIt != localCandidates.end());
+                // local candidate wasn't found, so it wasn't on the checklist  RFC8445 7.2.5.3.1.3
+                pair = makeCandidatesPair(locIt->info, pair->remote);
+            } else {
+                // local candidate found. If it's a part of a pair on checklist, we have to add this pair to valid list,
+                // otherwise we have to create a new pair and add it to valid list
+                auto it = std::find_if(checkList.pairs.begin(), checkList.pairs.end(), [&](auto const &p) {
+                    return p->local->id == locIt->info->id && p->remote->addr == pair->remote->addr;
+                });
+                if (it == checkList.pairs.constEnd()) {
+                    pair = makeCandidatesPair(locIt->info, pair->remote);
+                } else {
+                    pair = *it;
+                    printf("mapped address belongs to another pair on checklist %s\n", qPrintable(QString(*pair)));
+                    if (pair->isValid) { // already valid as result of previous checks probably
+                        return;
+                    }
+                }
+            }
+        }
+
+        if (!pair) {
+            qWarning("binding success but failed to build a pair with mapped address %s!", qPrintable(mappedAddr));
+            return;
+        }
+
+        pair->isValid                 = true;
+        pair->state                   = PSucceeded; // what if it was in progress?
+        pair->isTriggeredForNominated = isTriggeredForNominated;
+        pair->finalNomination         = finalNomination;
+
+        auto insIt = std::upper_bound(
+            checkList.validPairs.begin(), checkList.validPairs.end(), pair, [](auto &item, auto &toins) {
+                if (toins->isNominated ^ item->isNominated)
+                    return item->isNominated;
+                return item->priority == toins->priority
+                    ? item->local->componentId < toins->local->componentId
+                    : item->priority >= toins->priority; // inverted since we need high priority first
+            });
+        checkList.validPairs.insert(insIt, pair); // nominated and highest priority first
+
+        if (!readyToSendMedia && localFeatures & NotNominatedData && remoteFeatures & NotNominatedData) {
+            // if both follow RFC8445 and allow to send data on any valid pair
+            components[findComponent(pair->local->componentId)].hasValidPairs = true;
+            if (std::all_of(components.begin(), components.end(), [](auto &c) { return c.hasValidPairs; })) {
+                readyToSendMedia = true;
+                emit q->readyToSendMedia();
+            }
+        }
+
+        if (mode == Ice176::Initiator) {
+            if (!binding->useCandidate()) {
+                if (!(localFeatures & AggressiveNomination))
+                    tryNominateSelectedPair();
+                return;
+            }
+        } else {
+            if (!pair->isTriggeredForNominated)
+                return;
+        }
+
+        // check if component already has nominated pair
+        auto it = std::find_if(checkList.pairs.begin(), checkList.pairs.end(), [&](auto const &p) {
+            return p->local->componentId == pair->local->componentId && p->isNominated;
+        });
+
+        if (it != checkList.pairs.end()) {
+            printf("component %d already active, not signalling\n", pair->local->componentId);
+            return;
+        }
+        tryComponentSuccess(pair);
+    }
+
+    void handlePairBindingError(CandidatePair::Ptr pair, XMPP::StunBinding::Error)
+    {
+        Q_ASSERT(state != Stopped);
+        if (state == Stopping)
+            return; // we don't care about late errors
+
+        printf("check failed for %s\n", qPrintable(*pair));
+        pair->state = CandidatePairState::PFailed;
+        if (pair->isValid) { // RFC8445 7.2.5.3.4.  Updating the Nominated Flag /  about failure
+            checkList.validPairs.removeOne(pair);
+            pair->isValid = false;
+        }
+
+        if (state == Started) {
+            // oops, already-started ICE reports errors. keep-alive checks?
+            if (pair->isNominated) {
+                printf("check failed on nominated candidate. set ICE status to failed");
+                stop();
+                emit q->error(ErrorDisconnected);
+            }
+            return;
+        }
+        if (state == Nominating && pair->finalNomination) {
+            printf("Failed to nominate selected pair. set ICE status to failed");
+            stop();
+            emit q->error(ErrorDisconnected);
+            return;
+        }
+
+        tryComponentFailed(pair->local->componentId);
+    }
+
 private slots:
     void postStop()
     {
@@ -1152,149 +1399,11 @@ private slots:
 
         int path = lc.path;
 
-        printf("connectivity check from %s:%d to %s:%d %s\n", qPrintable(pair.local->addr.addr.toString()),
-               pair.local->addr.port, qPrintable(pair.remote->addr.addr.toString()), pair.remote->addr.port,
-               pair.isNominated ? (mode == Initiator ? "(nominating)" : "(triggered check for nominated)") : "");
+        printf("connectivity check for pair %s%s\n", qPrintable(pair),
+               (mode == Initiator ? (pair.binding->useCandidate() ? " (nominating)" : "")
+                                  : (pair.isTriggeredForNominated ? " (triggered check for nominated)" : "")));
         lc.iceTransport->writeDatagram(path, packet, pair.remote->addr.addr, pair.remote->addr.port);
     }
-
-    void binding_success()
-    {
-        /*
-            RFC8445 7.2.5.2.1.  Non-Symmetric Transport Addresses
-            tells us addr:port of source->dest of request MUST match with dest<-source of the response,
-            and we should mark the pair as failed if doesn't match.
-            But StunTransaction already does this for us in its checkActiveAndFrom.
-            So it will fail with timeout instead if response comes from a wrong address.
-        */
-
-        StunBinding *binding = static_cast<StunBinding *>(sender());
-
-        auto it = std::find_if(checkList.pairs.begin(), checkList.pairs.end(),
-                               [&](auto const &p) { return p->binding == binding; });
-        if (it == checkList.pairs.constEnd())
-            return;
-
-        auto pair = *it;
-        // pair->isValid = true;
-        pair->state = CandidatePairState::PSucceeded;
-
-        printf("check success for %s\n", qPrintable(QString(*pair)));
-
-        // RFC8445 7.2.5.3.1.  Discovering Peer-Reflexive Candidates
-        auto mappedAddr = IceComponent::TransportAddress(binding->reflexiveAddress(), binding->reflexivePort());
-        if (pair->local->addr != mappedAddr) { // skip "If the valid pair equals the pair that generated the check"
-
-            // so mapped address doesn't match with local candidate sending binding request.
-            // gotta find/create one
-            auto locIt = std::find_if(localCandidates.begin(), localCandidates.end(), [&](const auto &c) {
-                return c.info->base == mappedAddr || c.info->addr == mappedAddr;
-            });
-            if (locIt == localCandidates.end()) {
-                // RFC8445 7.2.5.3.1.  Discovering Peer-Reflexive Candidates
-                // new peer-reflexive local candidate discovered
-                components[findComponent(pair->local->componentId)].ic->addLocalPeerReflexiveCandidate(
-                    mappedAddr, pair->local, binding->priority());
-                locIt = std::find_if(localCandidates.begin(), localCandidates.end(),
-                                     [&](const auto &c) { return c.info->addr == mappedAddr; }); // just inserted
-                Q_ASSERT(locIt != localCandidates.end());
-                // local candidate wasn't found, so it wasn't on the checklist  RFC8445 7.2.5.3.1.3
-                pair = makeCandidatesPair(locIt->info, pair->remote);
-                // TODO start media flow on valid pair
-            } else {
-                // local candidate found. If it's a part of a pair on checklist, we have to add this pair to valid list,
-                // otherwise we have to create a new pair and add it to valid list
-                it = std::find_if(checkList.pairs.begin(), checkList.pairs.end(), [&](auto const &p) {
-                    return p->local->id == locIt->info->id && p->remote->addr == pair->remote->addr;
-                });
-                if (it == checkList.pairs.constEnd()) {
-                    pair = makeCandidatesPair(locIt->info, pair->remote);
-                } else {
-                    pair = *it;
-                    printf("mapped address belongs to another pair on checklist %s\n", qPrintable(QString(*pair)));
-                    if (pair->isValid) { // already valid as result of previous checks probably
-                        return;
-                    }
-                }
-            }
-        }
-
-        if (!pair) {
-            qWarning("binding success but failed to build a pair with mapped address %s!", qPrintable(mappedAddr));
-            return;
-        }
-
-        pair->isValid = true;
-        pair->state   = PSucceeded; // what if it was in progress?
-        auto insIt    = std::upper_bound(
-            checkList.validPairs.begin(), checkList.validPairs.end(), pair, [](auto &item, auto &toins) {
-                if (toins->isNominated ^ item->isNominated)
-                    return item->isNominated;
-                return item->priority == toins->priority
-                    ? item->local->componentId < toins->local->componentId
-                    : item->priority >= toins->priority; // inverted since we need high priority first
-            });
-        checkList.validPairs.insert(insIt, pair); // nominated and highest priority first
-
-        if (!readyToSendMedia && localFeatures & NotNominatedData && remoteFeatures & NotNominatedData) {
-            // if both follow RFC8445 and allow to send data on any valid pair
-            components[findComponent(pair->local->componentId)].hasValidPairs = true;
-            if (std::all_of(components.begin(), components.end(), [](auto &c) { return c.hasValidPairs; })) {
-                readyToSendMedia = true;
-                emit q->readyToSendMedia();
-            }
-        }
-
-        if (mode == Ice176::Initiator) {
-            if (!binding->useCandidate())
-                return;
-        } else {
-            if (!pair->isTriggeredForNominated)
-                return;
-        }
-
-        // check if component already has nominated pair
-        it = std::find_if(checkList.pairs.begin(), checkList.pairs.end(), [&](auto const &p) {
-            return p->local->componentId == pair->local->componentId && p->isNominated;
-        });
-
-        if (it != checkList.pairs.end()) {
-            printf("component %d already active, not signalling\n", pair->local->componentId);
-            return;
-        }
-        tryComponentSuccess(pair);
-    }
-
-    void binding_error(XMPP::StunBinding::Error)
-    {
-        Q_ASSERT(state != Stopped);
-        if (state == Stopping)
-            return; // we don't care about late errors
-
-        StunBinding *binding = static_cast<StunBinding *>(sender());
-
-        auto it = std::find_if(checkList.pairs.begin(), checkList.pairs.end(),
-                               [&](auto const &p) { return p->binding == binding; });
-        if (it == checkList.pairs.constEnd())
-            return;
-
-        printf("check failed\n");
-
-        CandidatePair &pair = **it;
-        pair.state          = CandidatePairState::PFailed;
-
-        if (state == Started) {
-            // oops already started ICE reports errors. keep-alive checks?
-            if (pair.isNominated) {
-                printf("check failed on nominated candidate. set ICE status to failed");
-                stop();
-                emit q->error(ErrorDisconnected);
-            }
-            return;
-        }
-
-        tryComponentFailed(pair.local->componentId);
-    }
 };
 
 Ice176::Ice176(QObject *parent) : QObject(parent) { d = new Private(this); }
@@ -1357,7 +1466,11 @@ void Ice176::setComponentCount(int count)
 
 void Ice176::setLocalFeatures(const Features &features) { d->localFeatures = features; }
 
-void Ice176::setRemoteFeatures(const Features &features) { d->remoteFeatures = features; }
+void Ice176::setRemoteFeatures(const Features &features)
+{
+    d->remoteFeatures = features;
+    d->updateRemoteGatheringTimeout();
+}
 
 void Ice176::start(Mode mode)
 {
@@ -1377,7 +1490,7 @@ void Ice176::setPeerPassword(const QString &pass) { d->peerPass = pass; }
 
 void Ice176::addRemoteCandidates(const QList<Candidate> &list) { d->addRemoteCandidates(list); }
 
-void Ice176::setRemoteGatheringComplete() { d->remoteGatheringComplete = true; }
+void Ice176::setRemoteGatheringComplete() { d->setRemoteGatheringComplete(); }
 
 bool Ice176::hasPendingDatagrams(int componentIndex) const { return !d->in[componentIndex].isEmpty(); }
 
diff --git a/src/irisnet/noncore/ice176.h b/src/irisnet/noncore/ice176.h
index ea450a34..9ddb0c2d 100644
--- a/src/irisnet/noncore/ice176.h
+++ b/src/irisnet/noncore/ice176.h
@@ -109,6 +109,7 @@ class Ice176 : public QObject {
         AggressiveNomination = 0x2, // all the candidates are nominated. so select by priority
         NotNominatedData     = 0x4, // Data on valid but not nominated candidates is allowed
         RTPOptimization      = 0x8, // Different formula for RTO, not used in RFC8445
+        GatheringComplete    = 0x10 // Looks MUST in XEP-0371 but missed in XEP-0176
     };
     Q_DECLARE_FLAGS(Features, Feature)
 

From 5ae373aad2bf902de21dc16271d64804230c208f Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 28 Apr 2020 00:56:36 +0300
Subject: [PATCH 152/383] Switch to RFC8445 features for icetunnel app

---
 src/irisnet/noncore/ice176.cpp | 15 ++++++++++-----
 tools/icetunnel/main.cpp       |  5 ++++-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index d12d3fcd..a4046826 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -700,7 +700,7 @@ class Ice176::Private : public QObject {
             });
             nominationTimer->start();
         } else {
-            // all the checks had to be cancelled already. So nothing more
+            cleanupButSelectedPair();
             state = Active;
             emit q->iceFinished(); // nominated won't change anymore
         }
@@ -1056,6 +1056,9 @@ class Ice176::Private : public QObject {
             checkList.validPairs.removeOne(pair);
             pair->isValid = false;
         }
+        if (state == Active) {
+            return; // TODO hadle keep-alive binding properly
+        }
 
         if (state == Started) {
             // oops, already-started ICE reports errors. keep-alive checks?
@@ -1066,10 +1069,12 @@ class Ice176::Private : public QObject {
             }
             return;
         }
-        if (state == Nominating && pair->finalNomination) {
-            printf("Failed to nominate selected pair. set ICE status to failed");
-            stop();
-            emit q->error(ErrorDisconnected);
+        if (state == Nominating) {
+            if (pair->finalNomination) {
+                printf("Failed to nominate selected pair. set ICE status to failed");
+                stop();
+                emit q->error(ErrorDisconnected);
+            }
             return;
         }
 
diff --git a/tools/icetunnel/main.cpp b/tools/icetunnel/main.cpp
index 9b412210..67627d40 100644
--- a/tools/icetunnel/main.cpp
+++ b/tools/icetunnel/main.cpp
@@ -484,6 +484,9 @@ public slots:
         connect(ice, SIGNAL(componentReady(int)), SLOT(ice_componentReady(int)));
         connect(ice, SIGNAL(readyRead(int)), SLOT(ice_readyRead(int)));
         connect(ice, SIGNAL(datagramsWritten(int, int)), SLOT(ice_datagramsWritten(int, int)));
+        connect(ice, &XMPP::Ice176::readyToSendMedia, this, []() { printf("ICE ready to send media.\n"); });
+        connect(ice, &XMPP::Ice176::iceFinished, this,
+                []() { printf("ICE negotiation has finished and media stream is active now.\n"); });
 
         // set up local ports for forwarding
         for (int n = 0; n < opt_channels; ++n) {
@@ -591,7 +594,7 @@ public slots:
         }
 
         ice->setComponentCount(opt_channels);
-        ice->setLocalFeatures(XMPP::Ice176::Trickle | XMPP::Ice176::AggressiveNomination);
+        ice->setLocalFeatures(XMPP::Ice176::Trickle | XMPP::Ice176::NotNominatedData);
 
         if (!stunAddr.isNull()) {
             if (opt_stunType == Basic || opt_stunType == Auto)

From c74cbe61ac6e8d4a96031574f253b76880cfac4e Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 28 Apr 2020 13:56:18 +0300
Subject: [PATCH 153/383] Fixed bug with triggered checks ping-pong where
 simultaneous checks cancel each other

---
 src/irisnet/noncore/ice176.cpp | 227 +++++++++++++++++++--------------
 1 file changed, 132 insertions(+), 95 deletions(-)

diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index a4046826..232782c2 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -98,12 +98,16 @@ class Ice176::Private : public QObject {
         using Ptr = QSharedPointer<CandidatePair>;
 
         IceComponent::CandidateInfo::Ptr local, remote;
-        bool                             isDefault               = false; // not used in xmpp
-        bool                             isValid                 = false; // a pair which is also in valid list
-        bool                             isNominated             = false;
-        bool                             isTriggeredForNominated = false;
-        bool                             finalNomination         = false;
-        CandidatePairState               state                   = CandidatePairState::PFrozen;
+        bool                             isDefault   = false; // not used in xmpp
+        bool                             isValid     = false; // a pair which is also in valid list
+        bool                             isNominated = false;
+
+        // states for last or comming checks
+        bool isTriggered             = false; // last scheduled check was a triggered check
+        bool isTriggeredForNominated = false;
+        bool finalNomination         = false;
+
+        CandidatePairState state = CandidatePairState::PFrozen;
 
         qint64  priority = 0;
         QString foundation; // rfc8445 6.1.2.6 (combination of foundations)
@@ -135,13 +139,14 @@ class Ice176::Private : public QObject {
 
     class Component {
     public:
-        int           id                = 0;
-        IceComponent *ic                = nullptr;
-        bool          localFinished     = false;
-        bool          hasValidPairs     = false;
-        bool          hasNominatedPairs = false;
-        bool          stopped           = false;
-        bool          lowOverhead       = false;
+        int                     id              = 0;
+        IceComponent *          ic              = nullptr;
+        std::unique_ptr<QTimer> nominationTimer = std::unique_ptr<QTimer>();
+        bool                    localFinished   = false;
+        bool                    hasValidPairs   = false;
+        bool                    finalSelected   = false;
+        bool                    stopped         = false;
+        bool                    lowOverhead     = false;
     };
 
     Ice176 *                                q;
@@ -150,7 +155,6 @@ class Ice176::Private : public QObject {
     QTimer                                  checkTimer;
     TurnClient::Proxy                       proxy;
     UdpPortReserver *                       portReserver = nullptr;
-    std::unique_ptr<QTimer>                 nominationTimer;
     std::unique_ptr<QTimer>                 remoteGatheringCompleteTimer;
     int                                     agressiveNominationTimeout     = 3000;  // 3s
     int                                     remoteGatheringCompleteTimeout = 30000; // 30s
@@ -169,7 +173,7 @@ class Ice176::Private : public QObject {
     QCA::SecureArray                        stunRelayTcpPass;
     QString                                 localUser, localPass;
     QString                                 peerUser, peerPass;
-    QList<Component>                        components;
+    std::vector<Component>                  components;
     QList<IceComponent::Candidate>          localCandidates;
     QList<IceComponent::CandidateInfo::Ptr> remoteCandidates;
     QSet<QWeakPointer<IceTransport>>        iceTransports;
@@ -279,10 +283,12 @@ class Ice176::Private : public QObject {
             // list size = componentCount * number of interfaces
             socketList = portReserver->borrowSockets(componentCount, this);
 
+        components.reserve(componentCount);
         for (int n = 0; n < componentCount; ++n) {
-            Component c;
-            c.id = n + 1;
-            c.ic = new IceComponent(c.id, this);
+            components.emplace_back();
+            Component &c = components.back();
+            c.id         = n + 1;
+            c.ic         = new IceComponent(c.id, this);
             c.ic->setDebugLevel(IceComponent::DL_Info);
             connect(c.ic, SIGNAL(candidateAdded(XMPP::IceComponent::Candidate)),
                     SLOT(ic_candidateAdded(XMPP::IceComponent::Candidate)));
@@ -314,8 +320,6 @@ class Ice176::Private : public QObject {
             // create an inbound queue for this component
             in += QList<QByteArray>();
 
-            components += c;
-
             c.ic->update(&socketList);
         }
 
@@ -332,13 +336,14 @@ class Ice176::Private : public QObject {
         Q_ASSERT(state == Starting || state == Started || state == Nominating || state == Active);
 
         state = Stopping;
-        nominationTimer.reset();
         remoteGatheringCompleteTimer.reset();
 
         // will trigger candidateRemoved events and result pairs cleanup.
-        if (!components.isEmpty()) {
-            for (int n = 0; n < components.count(); ++n)
-                components[n].ic->stop();
+        if (!components.empty()) {
+            for (auto &c : components) {
+                c.nominationTimer.reset();
+                c.ic->stop();
+            }
 
         } else {
             // TODO: hmm, is it possible to have no components?
@@ -450,8 +455,7 @@ class Ice176::Private : public QObject {
         // pruning
         for (int n = 0; n < checkList.pairs.count(); ++n) {
             auto &pair = checkList.pairs[n];
-            printf("%d, %s -> %s\n", pair->local->componentId, qPrintable(pair->local->addr),
-                   qPrintable(pair->remote->addr));
+            printf("%d, %s\n", pair->local->componentId, qPrintable(*pair));
 
             for (int i = n - 1; i >= 0; --i) {
                 // RFC8445 says to use base only for reflexive. but base is set properly for host and relayed too.
@@ -467,22 +471,25 @@ class Ice176::Private : public QObject {
         }
 
         // max pairs is 100 * number of components
-        int max_pairs = 100 * components.count();
+        int max_pairs = 100 * components.size();
         while (checkList.pairs.count() > max_pairs)
             checkList.pairs.removeLast();
 
         printf("%d after pruning\n", checkList.pairs.count());
+        for (auto &p : checkList.pairs) {
+            printf("%d, %s\n", p->local->componentId, qPrintable(*p));
+        }
     }
 
     QSharedPointer<CandidatePair> selectNextPairToCheck()
     {
         // rfc8445 6.1.4.2.  Performing Connectivity Checks
-
         QSharedPointer<CandidatePair> pair;
         while (!checkList.triggeredPairs.empty() && !(pair = checkList.triggeredPairs.dequeue().lock()))
             ;
 
         if (pair) {
+            pair->isTriggered = true;
             // according to rfc - check just this one
             printf("next check from triggered list: %s\n", qPrintable(*pair));
             return pair;
@@ -496,10 +503,12 @@ class Ice176::Private : public QObject {
         if (it != checkList.pairs.end()) { // found waiting
             // the list was sorted already by priority and componentId. So first one is Ok
             printf("next check for already waiting: %s\n", qPrintable(**it));
+            (*it)->isTriggered = false;
             return *it;
         }
 
         if (pair) { // now it's frozen highest-priority pair
+            pair->isTriggered = false;
             printf("next check for a frozen pair: %s\n", qPrintable(*pair));
         }
 
@@ -521,7 +530,7 @@ class Ice176::Private : public QObject {
 
         auto &lc = localCandidates[at];
 
-        Component &c = components[findComponent(lc.info->componentId)];
+        Component &c = *findComponent(lc.info->componentId);
 
         pair->pool = new StunTransactionPool(StunTransaction::Udp, this);
         connect(pair->pool, SIGNAL(outgoingMessage(QByteArray, QHostAddress, int)),
@@ -616,22 +625,37 @@ class Ice176::Private : public QObject {
         // FIXME: actually do something
     }
 
-    void cleanupButSelectedPair()
+    void cleanupButSelectedPair(int componentId)
     {
-        Q_ASSERT(!checkList.validPairs.isEmpty());
-        checkList.validPairs.erase(checkList.validPairs.begin() + 1, checkList.validPairs.end());
-        auto  ci = checkList.validPairs.first()->local;
-        auto &t  = localCandidates[findLocalCandidate(ci->addr.addr, ci->addr.port)].iceTransport;
+        CandidatePair::Ptr selected;
+
+        auto it = std::remove_if(checkList.validPairs.begin(), checkList.validPairs.end(),
+                                 [&, keep = true](auto &pair) mutable {
+                                     if (pair->local->componentId == componentId) {
+                                         if (keep) {
+                                             selected = pair;
+                                             keep     = false;
+                                             return false;
+                                         }
+                                         return true;
+                                     }
+                                     return false;
+                                 });
+        checkList.validPairs.erase(it, checkList.validPairs.end());
+        Q_ASSERT(selected.get() != nullptr);
+
+        auto &sa = selected->local->addr;
+        auto &t  = localCandidates[findLocalCandidate(sa.addr, sa.port)].iceTransport;
         // cancel active transactions
         for (auto &p : checkList.pairs) {
-            if (p->state == PInProgress) {
+            if (p->local->componentId == componentId && p->state == PInProgress) {
                 p->binding->cancel();
                 p->state = PFailed;
             }
         }
         // stop not used transports
         for (auto &c : localCandidates) {
-            if (c.iceTransport != t) {
+            if (c.info->componentId == componentId && c.iceTransport != t) {
                 c.iceTransport->stop();
             }
         }
@@ -661,16 +685,27 @@ class Ice176::Private : public QObject {
         state                 = Nominating;
         auto pair             = checkList.validPairs.first();
         pair->finalNomination = true;
-        printf("Nominating valid pair: %s", qPrintable(*pair));
+        printf("Nominating valid pair: %s\n", qPrintable(*pair));
         checkList.triggeredPairs.prepend(pair);
     }
 
+    void tryIceFinished()
+    {
+        if (!std::all_of(components.begin(), components.end(), [](auto &c) { return c.finalSelected; }))
+            return;
+        if (!readyToSendMedia) {
+            readyToSendMedia = true;
+            emit q->readyToSendMedia();
+        }
+        state = Active;
+        emit q->iceFinished();
+    }
+
     // execute when new nominated pair
     void tryComponentSuccess(QSharedPointer<CandidatePair> &pair)
     {
-        Component &c        = components[findComponent(pair->local->componentId)];
-        pair->isNominated   = true;
-        c.hasNominatedPairs = true;
+        Component &c      = *findComponent(pair->local->componentId);
+        pair->isNominated = true;
         if (c.lowOverhead) {
             printf("component is flagged for low overhead.  setting up for %s\n", qPrintable(*pair));
             auto &cc = localCandidates[findLocalCandidate(pair->local->addr.addr, pair->local->addr.port)];
@@ -679,30 +714,30 @@ class Ice176::Private : public QObject {
 
         emit q->componentReady(pair->local->componentId - 1);
 
-        if (!std::all_of(components.begin(), components.end(), [](auto &c) { return c.hasNominatedPairs; }))
-            return;
-
-        // so all components have nominated pair here
-        if (!readyToSendMedia) {
-            readyToSendMedia = true;
-            emit q->readyToSendMedia();
-        }
-
-        if (localFeatures & AggressiveNomination) {
+        bool agrNom = (mode == Initiator ? localFeatures : remoteFeatures) & AggressiveNomination;
+        if (agrNom) {
+            if (c.nominationTimer)
+                return;
             // nominated candidate may change. start a timer to cease all checks later
-            nominationTimer.reset(new QTimer(this));
-            nominationTimer->setSingleShot(true);
-            nominationTimer->setInterval(agressiveNominationTimeout);
-            connect(nominationTimer.get(), &QTimer::timeout, this, [this]() {
-                cleanupButSelectedPair();
-                state = Active;
-                emit q->iceFinished();
+            auto timer = new QTimer();
+            c.nominationTimer.reset(timer);
+            timer->setSingleShot(true);
+            timer->setInterval(agressiveNominationTimeout);
+            connect(timer, &QTimer::timeout, this, [this, componentId = pair->local->componentId]() {
+                if (state != Started && state != Nominating)
+                    return; // likely user stopped or it's alreday active
+                auto &finalSelected = findComponent(componentId)->finalSelected;
+                if (finalSelected)
+                    return;
+                cleanupButSelectedPair(componentId);
+                finalSelected = true;
+                tryIceFinished();
             });
-            nominationTimer->start();
+            timer->start();
         } else {
-            cleanupButSelectedPair();
-            state = Active;
-            emit q->iceFinished(); // nominated won't change anymore
+            cleanupButSelectedPair(pair->local->componentId);
+            c.finalSelected = true;
+            tryIceFinished();
         }
     }
 
@@ -747,6 +782,11 @@ class Ice176::Private : public QObject {
             }
             pair->isNominated = false;
             if (pair->state == CandidatePairState::PInProgress) {
+                if (pair->isTriggered) {
+                    printf("Current in-progress check is already triggered. Don't cancel it while have to according to "
+                           "RFC8445\n");
+                    return;
+                }
                 pair->binding->cancel();
             }
             if (pair->state == PFailed) {
@@ -785,10 +825,10 @@ class Ice176::Private : public QObject {
     {
         if (remoteFeatures & GatheringComplete || !(remoteFeatures & Trickle)) {
             remoteGatheringCompleteTimer.reset();
-            printf("Don't use Remote Gatherging Complete timeout");
+            printf("Don't use Remote Gatherging Complete timeout\n");
             return;
         } else if (remoteGatheringCompleteTimer) {
-            printf("Remote Gatherging Complete was restarted");
+            printf("Remote Gatherging Complete was restarted\n");
             remoteGatheringCompleteTimer->start(); // restart
             return;
         }
@@ -797,40 +837,31 @@ class Ice176::Private : public QObject {
         remoteGatheringCompleteTimer->setInterval(remoteGatheringCompleteTimeout);
         connect(remoteGatheringCompleteTimer.get(), &QTimer::timeout, this, [this]() {
             remoteGatheringCompleteTimer.release()->deleteLater();
-            printf("Timeout waiting for Gathering Complete signal");
+            printf("Timeout waiting for Gathering Complete signal\n");
             onRemoteGatheringCompleted();
         });
-        printf("Start Remote Gatherging Complete timer");
+        printf("Start Remote Gatherging Complete timer\n");
         remoteGatheringCompleteTimer->start();
     }
 
 private:
-    int findComponent(const IceComponent *ic) const
+    inline decltype(components)::iterator findComponent(const IceComponent *ic)
     {
-        for (int n = 0; n < components.count(); ++n) {
-            if (components[n].ic == ic)
-                return n;
-        }
-
-        return -1;
+        return std::find_if(components.begin(), components.end(), [&](auto &c) { return c.ic == ic; });
     }
 
-    int findComponent(int id) const
+    inline decltype(components)::iterator findComponent(int id)
     {
-        for (int n = 0; n < components.count(); ++n) {
-            if (components[n].id == id)
-                return n;
-        }
-
-        return -1;
+        return std::find_if(components.begin(), components.end(), [&](auto &c) { return c.id == id; });
     }
 
-    int findLocalCandidate(const IceTransport *iceTransport, int path, bool withSrvRflx = true) const
+    int findLocalCandidate(const IceTransport *iceTransport, int path, bool hostAndRelayOnly = false) const
     {
         for (int n = 0; n < localCandidates.count(); ++n) {
             const IceComponent::Candidate &cc = localCandidates[n];
             if (cc.iceTransport == iceTransport && cc.path == path
-                && (withSrvRflx || cc.info->type != IceComponent::ServerReflexiveType))
+                && (!hostAndRelayOnly || cc.info->type == IceComponent::RelayedType
+                    || cc.info->type == IceComponent::HostType))
                 return n;
         }
 
@@ -967,8 +998,8 @@ class Ice176::Private : public QObject {
             if (locIt == localCandidates.end()) {
                 // RFC8445 7.2.5.3.1.  Discovering Peer-Reflexive Candidates
                 // new peer-reflexive local candidate discovered
-                components[findComponent(pair->local->componentId)].ic->addLocalPeerReflexiveCandidate(
-                    mappedAddr, pair->local, binding->priority());
+                findComponent(pair->local->componentId)
+                    ->ic->addLocalPeerReflexiveCandidate(mappedAddr, pair->local, binding->priority());
                 locIt = std::find_if(localCandidates.begin(), localCandidates.end(),
                                      [&](const auto &c) { return c.info->addr == mappedAddr; }); // just inserted
                 Q_ASSERT(locIt != localCandidates.end());
@@ -1002,6 +1033,12 @@ class Ice176::Private : public QObject {
         pair->isTriggeredForNominated = isTriggeredForNominated;
         pair->finalNomination         = finalNomination;
 
+        // mark all with same foundation as Waiting to prioritize them
+        for (auto &p : checkList.pairs)
+            if (p->state == PFrozen && p->foundation == pair->foundation)
+                p->state = PWaiting;
+
+        // find position to insert in sorted list of valid pairs
         auto insIt = std::upper_bound(
             checkList.validPairs.begin(), checkList.validPairs.end(), pair, [](auto &item, auto &toins) {
                 if (toins->isNominated ^ item->isNominated)
@@ -1014,7 +1051,7 @@ class Ice176::Private : public QObject {
 
         if (!readyToSendMedia && localFeatures & NotNominatedData && remoteFeatures & NotNominatedData) {
             // if both follow RFC8445 and allow to send data on any valid pair
-            components[findComponent(pair->local->componentId)].hasValidPairs = true;
+            findComponent(pair->local->componentId)->hasValidPairs = true;
             if (std::all_of(components.begin(), components.end(), [](auto &c) { return c.hasValidPairs; })) {
                 readyToSendMedia = true;
                 emit q->readyToSendMedia();
@@ -1176,11 +1213,11 @@ private slots:
     void ic_localFinished()
     {
         IceComponent *ic = static_cast<IceComponent *>(sender());
-        int           at = findComponent(ic);
-        Q_ASSERT(at != -1);
-        Q_ASSERT(!components[at].localFinished);
+        auto          it = findComponent(ic);
+        Q_ASSERT(it != components.end());
+        Q_ASSERT(!it->localFinished);
 
-        components[at].localFinished = true;
+        it->localFinished = true;
 
         for (const Component &c : components) {
             if (!c.localFinished) {
@@ -1216,10 +1253,10 @@ private slots:
     void ic_stopped()
     {
         IceComponent *ic = static_cast<IceComponent *>(sender());
-        int           at = findComponent(ic);
-        Q_ASSERT(at != -1);
+        auto          it = findComponent(ic);
+        Q_ASSERT(it != components.end());
 
-        components[at].stopped = true;
+        it->stopped = true;
 
         bool allStopped = true;
         for (const Component &c : components) {
@@ -1236,18 +1273,18 @@ private slots:
     void ic_debugLine(const QString &line)
     {
         IceComponent *ic = static_cast<IceComponent *>(sender());
-        int           at = findComponent(ic);
-        Q_ASSERT(at != -1);
+        auto          it = findComponent(ic);
+        Q_ASSERT(it != components.end());
 
         // FIXME: components are always sorted?
-        printf("C%d: %s\n", at + 1, qPrintable(line));
+        printf("C%d: %s\n", it->id, qPrintable(line));
     }
 
     // path is either direct or relayed
     void it_readyRead(int path)
     {
         IceTransport *it = static_cast<IceTransport *>(sender());
-        int           at = findLocalCandidate(it, path, false); // without server-reflexive
+        int           at = findLocalCandidate(it, path, true); // just host or relay
         Q_ASSERT(at != -1);
 
         IceComponent::Candidate &locCand = localCandidates[at];

From 0c3be0ea27b4f502726149525786cc48bd5d5dc7 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 28 Apr 2020 14:45:42 +0300
Subject: [PATCH 154/383] Added an ice method canSendMedia currently used in
 jinglertp

---
 src/irisnet/noncore/ice176.cpp | 2 ++
 src/irisnet/noncore/ice176.h   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index 232782c2..e57076cf 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -1534,6 +1534,8 @@ void Ice176::addRemoteCandidates(const QList<Candidate> &list) { d->addRemoteCan
 
 void Ice176::setRemoteGatheringComplete() { d->setRemoteGatheringComplete(); }
 
+bool Ice176::canSendMedia() const { return d->readyToSendMedia; }
+
 bool Ice176::hasPendingDatagrams(int componentIndex) const { return !d->in[componentIndex].isEmpty(); }
 
 QByteArray Ice176::readDatagram(int componentIndex) { return d->in[componentIndex].takeFirst(); }
diff --git a/src/irisnet/noncore/ice176.h b/src/irisnet/noncore/ice176.h
index 9ddb0c2d..578d7e0c 100644
--- a/src/irisnet/noncore/ice176.h
+++ b/src/irisnet/noncore/ice176.h
@@ -128,6 +128,7 @@ class Ice176 : public QObject {
     void addRemoteCandidates(const QList<Candidate> &list);
     void setRemoteGatheringComplete();
 
+    bool       canSendMedia() const;
     bool       hasPendingDatagrams(int componentIndex) const;
     QByteArray readDatagram(int componentIndex);
     void       writeDatagram(int componentIndex, const QByteArray &datagram);

From b44ed7aed101d1404c8b98cfe3dce8c20d7ba6de Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 28 Apr 2020 15:33:22 +0300
Subject: [PATCH 155/383] Fixed compatibility with old Qt

---
 src/irisnet/noncore/ice176.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index e57076cf..06e545b6 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -642,7 +642,7 @@ class Ice176::Private : public QObject {
                                      return false;
                                  });
         checkList.validPairs.erase(it, checkList.validPairs.end());
-        Q_ASSERT(selected.get() != nullptr);
+        Q_ASSERT(selected.data() != nullptr);
 
         auto &sa = selected->local->addr;
         auto &t  = localCandidates[findLocalCandidate(sa.addr, sa.port)].iceTransport;

From 134e839f5ee7bf865c9162d9e31859c9d0dd2aa8 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sat, 2 May 2020 21:40:41 +0300
Subject: [PATCH 156/383] Use shared pointer for shared stun transaction pool

---
 src/irisnet/noncore/ice176.cpp            | 86 +++++++----------------
 src/irisnet/noncore/icelocaltransport.cpp | 68 +++++++++---------
 src/irisnet/noncore/stunallocate.cpp      | 51 +++++++-------
 src/irisnet/noncore/stunallocate.h        |  2 +-
 src/irisnet/noncore/stunbinding.cpp       |  6 +-
 src/irisnet/noncore/stuntransaction.cpp   | 24 +++----
 src/irisnet/noncore/stuntransaction.h     |  6 +-
 src/irisnet/noncore/turnclient.cpp        | 78 ++++++++++----------
 tools/nettool/main.cpp                    | 40 +++++------
 9 files changed, 167 insertions(+), 194 deletions(-)

diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index 06e545b6..b5237969 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -116,7 +116,7 @@ class Ice176::Private : public QObject {
 
         // FIXME: this is wrong i think, it should be in LocalTransport
         //   or such, to multiplex ids
-        StunTransactionPool *pool = nullptr;
+        StunTransactionPool::Ptr pool;
 
         inline bool isNull() const { return local->addr.addr.isNull() || remote->addr.addr.isNull(); }
         inline      operator QString() const
@@ -205,25 +205,6 @@ class Ice176::Private : public QObject {
     {
         for (const Component &c : components)
             delete c.ic;
-
-        // no need to delete pools and bindings since pools already deleted here
-        // by QObject destructor as children of this(Ice176::Private) object.
-        // Bindings deleted too as children of pool
-        // should be reviewed by Justin =)
-        /*for(int n = 0; n < checkList.pairs.count(); ++n)
-        {
-            StunBinding *binding = checkList.pairs[n].binding;
-            StunTransactionPool *pool = checkList.pairs[n].pool;
-
-            delete binding;
-
-            if(pool)
-            {
-                pool->disconnect(this);
-                pool->setParent(0);
-                pool->deleteLater();
-            }
-        }*/
     }
 
     void reset() { checkTimer.stop(); /*TODO*/ }
@@ -532,13 +513,31 @@ class Ice176::Private : public QObject {
 
         Component &c = *findComponent(lc.info->componentId);
 
-        pair->pool = new StunTransactionPool(StunTransaction::Udp, this);
-        connect(pair->pool, SIGNAL(outgoingMessage(QByteArray, QHostAddress, int)),
-                SLOT(pool_outgoingMessage(QByteArray, QHostAddress, int)));
+        // read comment to the pool member how wrong it is
+        pair->pool = StunTransactionPool::Ptr::create(StunTransaction::Udp);
+        connect(pair->pool.data(), &StunTransactionPool::outgoingMessage, this,
+                [this, weakPair = pair.toWeakRef()](const QByteArray &packet, const QHostAddress &, int) {
+                    auto pair = weakPair.toStrongRef();
+                    if (!pair)
+                        return;
+                    int at = findLocalCandidate(pair->local->addr.addr, pair->local->addr.port);
+                    if (at == -1) // FIXME: assert?
+                        return;
+
+                    IceComponent::Candidate &lc   = localCandidates[at];
+                    int                      path = lc.path;
+
+                    printf("connectivity check for pair %s%s\n", qPrintable(*pair),
+                           (mode == Initiator
+                                ? (pair->binding->useCandidate() ? " (nominating)" : "")
+                                : (pair->isTriggeredForNominated ? " (triggered check for nominated)" : "")));
+                    lc.iceTransport->writeDatagram(path, packet, pair->remote->addr.addr, pair->remote->addr.port);
+                });
+
         // pair->pool->setUsername(peerUser + ':' + localUser);
         // pair->pool->setPassword(peerPass.toUtf8());
 
-        pair->binding = new StunBinding(pair->pool);
+        pair->binding = new StunBinding(pair->pool.data());
         connect(pair->binding, &StunBinding::success, this, [this, wpair = pair.toWeakRef()]() {
             auto pair = wpair.lock();
             if (pair)
@@ -1193,16 +1192,15 @@ private slots:
 
         for (int n = 0; n < checkList.pairs.count(); ++n) {
             if (idList.contains(checkList.pairs[n]->local->id)) {
-                StunBinding *        binding = checkList.pairs[n]->binding;
-                StunTransactionPool *pool    = checkList.pairs[n]->pool;
+                StunBinding *binding = checkList.pairs[n]->binding;
+                auto         pool    = checkList.pairs[n]->pool;
 
                 delete binding;
 
                 if (pool) {
                     pool->disconnect(this);
-                    pool->setParent(nullptr);
-                    pool->deleteLater();
                 }
+                checkList.pairs[n]->pool.reset();
 
                 checkList.pairs.removeAt(n);
                 --n; // adjust position
@@ -1414,38 +1412,6 @@ private slots:
         Q_UNUSED(addr);
         Q_UNUSED(port);
     }
-
-    void pool_outgoingMessage(const QByteArray &packet, const QHostAddress &addr, int port)
-    {
-        Q_UNUSED(addr);
-        Q_UNUSED(port);
-
-        StunTransactionPool *pool = static_cast<StunTransactionPool *>(sender());
-        int                  at   = -1;
-        for (int n = 0; n < checkList.pairs.count(); ++n) {
-            if (checkList.pairs[n]->pool == pool) {
-                at = n;
-                break;
-            }
-        }
-        if (at == -1) // FIXME: assert?
-            return;
-
-        CandidatePair &pair = *checkList.pairs[at];
-
-        at = findLocalCandidate(pair.local->addr.addr, pair.local->addr.port);
-        if (at == -1) // FIXME: assert?
-            return;
-
-        IceComponent::Candidate &lc = localCandidates[at];
-
-        int path = lc.path;
-
-        printf("connectivity check for pair %s%s\n", qPrintable(pair),
-               (mode == Initiator ? (pair.binding->useCandidate() ? " (nominating)" : "")
-                                  : (pair.isTriggeredForNominated ? " (triggered check for nominated)" : "")));
-        lc.iceTransport->writeDatagram(path, packet, pair.remote->addr.addr, pair.remote->addr.port);
-    }
 };
 
 Ice176::Ice176(QObject *parent) : QObject(parent) { d = new Private(this); }
diff --git a/src/irisnet/noncore/icelocaltransport.cpp b/src/irisnet/noncore/icelocaltransport.cpp
index 5f8d9c26..4fa09d95 100644
--- a/src/irisnet/noncore/icelocaltransport.cpp
+++ b/src/irisnet/noncore/icelocaltransport.cpp
@@ -150,34 +150,34 @@ class IceLocalTransport::Private : public QObject {
         QByteArray   buf;
     };
 
-    IceLocalTransport *  q;
-    ObjectSession        sess;
-    QUdpSocket *         extSock;
-    SafeUdpSocket *      sock;
-    StunTransactionPool *pool;
-    StunBinding *        stunBinding;
-    TurnClient *         turn;
-    bool                 turnActivated;
-    QHostAddress         addr;
-    int                  port;
-    QHostAddress         refAddr;
-    int                  refPort;
-    QHostAddress         refAddrSource;
-    QHostAddress         relAddr;
-    int                  relPort;
-    QHostAddress         stunBindAddr;
-    int                  stunBindPort;
-    QHostAddress         stunRelayAddr;
-    int                  stunRelayPort;
-    QString              stunUser;
-    QCA::SecureArray     stunPass;
-    QString              clientSoftware;
-    QList<Datagram>      in;
-    QList<Datagram>      inRelayed;
-    QList<WriteItem>     pendingWrites;
-    int                  retryCount;
-    bool                 stopping;
-    int                  debugLevel;
+    IceLocalTransport *      q;
+    ObjectSession            sess;
+    QUdpSocket *             extSock;
+    SafeUdpSocket *          sock;
+    StunTransactionPool::Ptr pool;
+    StunBinding *            stunBinding;
+    TurnClient *             turn;
+    bool                     turnActivated;
+    QHostAddress             addr;
+    int                      port;
+    QHostAddress             refAddr;
+    int                      refPort;
+    QHostAddress             refAddrSource;
+    QHostAddress             relAddr;
+    int                      relPort;
+    QHostAddress             stunBindAddr;
+    int                      stunBindPort;
+    QHostAddress             stunRelayAddr;
+    int                      stunRelayPort;
+    QString                  stunUser;
+    QCA::SecureArray         stunPass;
+    QString                  clientSoftware;
+    QList<Datagram>          in;
+    QList<Datagram>          inRelayed;
+    QList<WriteItem>         pendingWrites;
+    int                      retryCount;
+    bool                     stopping;
+    int                      debugLevel;
 
     Private(IceLocalTransport *_q) :
         QObject(_q), q(_q), sess(this), extSock(nullptr), sock(nullptr), pool(nullptr), stunBinding(nullptr),
@@ -251,12 +251,12 @@ class IceLocalTransport::Private : public QObject {
     {
         Q_ASSERT(!pool);
 
-        pool = new StunTransactionPool(StunTransaction::Udp, this);
+        pool = StunTransactionPool::Ptr::create(StunTransaction::Udp);
         pool->setDebugLevel((StunTransactionPool::DebugLevel)debugLevel);
-        connect(pool, SIGNAL(outgoingMessage(QByteArray, QHostAddress, int)),
+        connect(pool.data(), SIGNAL(outgoingMessage(QByteArray, QHostAddress, int)),
                 SLOT(pool_outgoingMessage(QByteArray, QHostAddress, int)));
-        connect(pool, SIGNAL(needAuthParams()), SLOT(pool_needAuthParams()));
-        connect(pool, SIGNAL(debugLine(QString)), SLOT(pool_debugLine(QString)));
+        connect(pool.data(), SIGNAL(needAuthParams()), SLOT(pool_needAuthParams()));
+        connect(pool.data(), SIGNAL(debugLine(QString)), SLOT(pool_debugLine(QString)));
 
         pool->setLongTermAuthEnabled(true);
         if (!stunUser.isEmpty()) {
@@ -273,7 +273,7 @@ class IceLocalTransport::Private : public QObject {
         if (stunBindAddr.isNull()) {
             return;
         }
-        stunBinding = new StunBinding(pool);
+        stunBinding = new StunBinding(pool.data());
         connect(stunBinding, &StunBinding::success, this, [&]() {
             refAddr       = stunBinding->reflexiveAddress();
             refPort       = stunBinding->reflexivePort();
@@ -310,7 +310,7 @@ class IceLocalTransport::Private : public QObject {
 
         turn->setClientSoftwareNameAndVersion(clientSoftware);
 
-        turn->connectToHost(pool, stunRelayAddr, stunRelayPort);
+        turn->connectToHost(pool.data(), stunRelayAddr, stunRelayPort);
     }
 
 private:
diff --git a/src/irisnet/noncore/stunallocate.cpp b/src/irisnet/noncore/stunallocate.cpp
index 2ae8f479..afcf205b 100644
--- a/src/irisnet/noncore/stunallocate.cpp
+++ b/src/irisnet/noncore/stunallocate.cpp
@@ -74,18 +74,18 @@ class StunAllocatePermission : public QObject {
     Q_OBJECT
 
 public:
-    QTimer *             timer;
-    StunTransactionPool *pool;
-    StunTransaction *    trans;
-    QHostAddress         stunAddr;
-    int                  stunPort;
-    QHostAddress         addr;
-    bool                 active;
+    QTimer *                 timer;
+    StunTransactionPool::Ptr pool;
+    StunTransaction *        trans;
+    QHostAddress             stunAddr;
+    int                      stunPort;
+    QHostAddress             addr;
+    bool                     active;
 
     enum Error { ErrorGeneric, ErrorProtocol, ErrorCapacity, ErrorForbidden, ErrorRejected, ErrorTimeout };
 
-    StunAllocatePermission(StunTransactionPool *_pool, const QHostAddress &_addr) :
-        QObject(_pool), pool(_pool), trans(nullptr), addr(_addr), active(false)
+    StunAllocatePermission(StunTransactionPool::Ptr _pool, const QHostAddress &_addr) :
+        QObject(_pool.data()), pool(_pool), trans(nullptr), addr(_addr), active(false)
     {
         timer = new QTimer(this);
         connect(timer, SIGNAL(timeout()), SLOT(timer_timeout()));
@@ -149,7 +149,7 @@ class StunAllocatePermission : public QObject {
         connect(trans, SIGNAL(createMessage(QByteArray)), SLOT(trans_createMessage(QByteArray)));
         connect(trans, SIGNAL(finished(XMPP::StunMessage)), SLOT(trans_finished(XMPP::StunMessage)));
         connect(trans, SIGNAL(error(XMPP::StunTransaction::Error)), SLOT(trans_error(XMPP::StunTransaction::Error)));
-        trans->start(pool, stunAddr, stunPort);
+        trans->start(pool.data(), stunAddr, stunPort);
     }
 
     void restartTimer() { timer->start(); }
@@ -236,20 +236,21 @@ class StunAllocateChannel : public QObject {
     Q_OBJECT
 
 public:
-    QTimer *             timer;
-    StunTransactionPool *pool;
-    StunTransaction *    trans;
-    QHostAddress         stunAddr;
-    int                  stunPort;
-    int                  channelId;
-    QHostAddress         addr;
-    int                  port;
-    bool                 active;
+    QTimer *                 timer;
+    StunTransactionPool::Ptr pool;
+    StunTransaction *        trans;
+    QHostAddress             stunAddr;
+    int                      stunPort;
+    int                      channelId;
+    QHostAddress             addr;
+    int                      port;
+    bool                     active;
 
     enum Error { ErrorGeneric, ErrorProtocol, ErrorCapacity, ErrorForbidden, ErrorRejected, ErrorTimeout };
 
-    StunAllocateChannel(StunTransactionPool *_pool, int _channelId, const QHostAddress &_addr, int _port) :
-        QObject(_pool), pool(_pool), trans(nullptr), channelId(_channelId), addr(_addr), port(_port), active(false)
+    StunAllocateChannel(StunTransactionPool::Ptr _pool, int _channelId, const QHostAddress &_addr, int _port) :
+        QObject(_pool.data()), pool(_pool), trans(nullptr), channelId(_channelId), addr(_addr), port(_port),
+        active(false)
     {
         timer = new QTimer(this);
         connect(timer, SIGNAL(timeout()), SLOT(timer_timeout()));
@@ -314,7 +315,7 @@ class StunAllocateChannel : public QObject {
         connect(trans, SIGNAL(createMessage(QByteArray)), SLOT(trans_createMessage(QByteArray)));
         connect(trans, SIGNAL(finished(XMPP::StunMessage)), SLOT(trans_finished(XMPP::StunMessage)));
         connect(trans, SIGNAL(error(XMPP::StunTransaction::Error)), SLOT(trans_error(XMPP::StunTransaction::Error)));
-        trans->start(pool, stunAddr, stunPort);
+        trans->start(pool.data(), stunAddr, stunPort);
     }
 
     void restartTimer() { timer->start(); }
@@ -417,7 +418,7 @@ class StunAllocate::Private : public QObject {
 
     StunAllocate *                  q;
     ObjectSession                   sess;
-    StunTransactionPool *           pool;
+    StunTransactionPool::Ptr        pool;
     StunTransaction *               trans;
     QHostAddress                    stunAddr;
     int                             stunPort;
@@ -725,7 +726,7 @@ class StunAllocate::Private : public QObject {
         connect(trans, SIGNAL(createMessage(QByteArray)), SLOT(trans_createMessage(QByteArray)));
         connect(trans, SIGNAL(finished(XMPP::StunMessage)), SLOT(trans_finished(XMPP::StunMessage)));
         connect(trans, SIGNAL(error(XMPP::StunTransaction::Error)), SLOT(trans_error(XMPP::StunTransaction::Error)));
-        trans->start(pool, stunAddr, stunPort);
+        trans->start(pool.data(), stunAddr, stunPort);
     }
 
     void restartRefreshTimer()
@@ -1088,7 +1089,7 @@ private slots:
 StunAllocate::StunAllocate(StunTransactionPool *pool) : QObject(pool)
 {
     d       = new Private(this);
-    d->pool = pool;
+    d->pool = pool->sharedFromThis();
 }
 
 StunAllocate::~StunAllocate() { delete d; }
diff --git a/src/irisnet/noncore/stunallocate.h b/src/irisnet/noncore/stunallocate.h
index 2cb46d39..a7b9f1a1 100644
--- a/src/irisnet/noncore/stunallocate.h
+++ b/src/irisnet/noncore/stunallocate.h
@@ -53,7 +53,7 @@ class StunAllocate : public QObject {
         inline bool operator!=(const Channel &other) { return !operator==(other); }
     };
 
-    StunAllocate(StunTransactionPool *pool);
+    StunAllocate(XMPP::StunTransactionPool *pool);
     ~StunAllocate();
 
     void setClientSoftwareNameAndVersion(const QString &str);
diff --git a/src/irisnet/noncore/stunbinding.cpp b/src/irisnet/noncore/stunbinding.cpp
index 77a501f4..dd8124d3 100644
--- a/src/irisnet/noncore/stunbinding.cpp
+++ b/src/irisnet/noncore/stunbinding.cpp
@@ -30,7 +30,7 @@ class StunBinding::Private : public QObject {
 
 public:
     StunBinding *                   q;
-    StunTransactionPool *           pool = nullptr;
+    StunTransactionPool::Ptr        pool;
     QScopedPointer<StunTransaction> trans;
     QHostAddress                    stunAddr;
     int                             stunPort = 0;
@@ -68,7 +68,7 @@ class StunBinding::Private : public QObject {
 
         trans->setFingerprintRequired(fpRequired);
 
-        trans->start(pool, stunAddr, stunPort);
+        trans->start(pool.data(), stunAddr, stunPort);
     }
 
     void cancel()
@@ -201,7 +201,7 @@ private slots:
 StunBinding::StunBinding(StunTransactionPool *pool) : QObject(pool)
 {
     d       = new Private(this);
-    d->pool = pool;
+    d->pool = pool->sharedFromThis();
 }
 
 StunBinding::~StunBinding() { delete d; }
diff --git a/src/irisnet/noncore/stuntransaction.cpp b/src/irisnet/noncore/stuntransaction.cpp
index f12d4370..390bc6cf 100644
--- a/src/irisnet/noncore/stuntransaction.cpp
+++ b/src/irisnet/noncore/stuntransaction.cpp
@@ -123,15 +123,15 @@ class StunTransactionPrivate : public QObject {
 public:
     StunTransaction *q;
 
-    StunTransactionPool * pool;
-    bool                  active;
-    bool                  cancelling = false;
-    StunTransaction::Mode mode;
-    StunMessage           origMessage;
-    QByteArray            id;
-    QByteArray            packet;
-    QHostAddress          to_addr;
-    int                   to_port;
+    StunTransactionPool::Ptr pool;
+    bool                     active;
+    bool                     cancelling = false;
+    StunTransaction::Mode    mode;
+    StunMessage              origMessage;
+    QByteArray               id;
+    QByteArray               packet;
+    QHostAddress             to_addr;
+    int                      to_port;
 
     int     rto, rc, rm, ti;
     int     tries;
@@ -171,7 +171,7 @@ class StunTransactionPrivate : public QObject {
         t->deleteLater();
     }
 
-    void start(StunTransactionPool *_pool, const QHostAddress &toAddress, int toPort)
+    void start(StunTransactionPool::Ptr _pool, const QHostAddress &toAddress, int toPort)
     {
         pool    = _pool;
         mode    = pool->d->mode;
@@ -455,7 +455,7 @@ StunTransaction::~StunTransaction() { delete d; }
 void StunTransaction::start(StunTransactionPool *pool, const QHostAddress &toAddress, int toPort)
 {
     Q_ASSERT(!d->active);
-    d->start(pool, toAddress, toPort);
+    d->start(pool->sharedFromThis(), toAddress, toPort);
 }
 
 void StunTransaction::cancel() { d->cancelling = true; }
@@ -531,7 +531,7 @@ void StunTransactionPoolPrivate::transmit(StunTransaction *trans)
     emit q->outgoingMessage(trans->d->packet, trans->d->to_addr, trans->d->to_port);
 }
 
-StunTransactionPool::StunTransactionPool(StunTransaction::Mode mode, QObject *parent) : QObject(parent)
+StunTransactionPool::StunTransactionPool(StunTransaction::Mode mode)
 {
     d       = new StunTransactionPoolPrivate(this);
     d->mode = mode;
diff --git a/src/irisnet/noncore/stuntransaction.h b/src/irisnet/noncore/stuntransaction.h
index 2bda0fae..0ace46cc 100644
--- a/src/irisnet/noncore/stuntransaction.h
+++ b/src/irisnet/noncore/stuntransaction.h
@@ -121,13 +121,15 @@ class StunTransaction : public QObject {
 //   emitted as a direct result of calling certain member functions of this
 //   class as well as any other class that might use it (such as StunBinding).
 //   so, be careful with what you do in your retransmit slot.
-class StunTransactionPool : public QObject {
+class StunTransactionPool : public QObject, public QEnableSharedFromThis<StunTransactionPool> {
     Q_OBJECT
 
 public:
+    using Ptr = QSharedPointer<StunTransactionPool>;
+
     enum DebugLevel { DL_None, DL_Info, DL_Packet };
 
-    StunTransactionPool(StunTransaction::Mode mode, QObject *parent = nullptr);
+    StunTransactionPool(StunTransaction::Mode mode);
     ~StunTransactionPool();
 
     StunTransaction::Mode mode() const;
diff --git a/src/irisnet/noncore/turnclient.cpp b/src/irisnet/noncore/turnclient.cpp
index a2935343..7ac1dfd4 100644
--- a/src/irisnet/noncore/turnclient.cpp
+++ b/src/irisnet/noncore/turnclient.cpp
@@ -75,27 +75,27 @@ class TurnClient::Private : public QObject {
     Q_OBJECT
 
 public:
-    TurnClient *         q;
-    Proxy                proxy;
-    QString              clientSoftware;
-    TurnClient::Mode     mode = PlainMode;
-    QHostAddress         serverAddr;
-    int                  serverPort = 0;
-    ObjectSession        sess;
-    ByteStream *         bs            = nullptr;
-    QCA::TLS *           tls           = nullptr;
-    bool                 tlsHandshaken = false;
-    QByteArray           inStream;
-    bool                 udp             = false;
-    StunTransactionPool *pool            = nullptr;
-    StunAllocate *       allocate        = nullptr;
-    bool                 allocateStarted = false;
-    QString              user;
-    QCA::SecureArray     pass;
-    QString              realm;
-    int                  retryCount = 0;
-    QString              errorString;
-    int                  debugLevel = 0;
+    TurnClient *             q;
+    Proxy                    proxy;
+    QString                  clientSoftware;
+    TurnClient::Mode         mode = PlainMode;
+    QHostAddress             serverAddr;
+    int                      serverPort = 0;
+    ObjectSession            sess;
+    ByteStream *             bs            = nullptr;
+    QCA::TLS *               tls           = nullptr;
+    bool                     tlsHandshaken = false;
+    QByteArray               inStream;
+    bool                     udp             = false;
+    StunTransactionPool::Ptr pool            = nullptr;
+    StunAllocate *           allocate        = nullptr;
+    bool                     allocateStarted = false;
+    QString                  user;
+    QCA::SecureArray         pass;
+    QString                  realm;
+    int                      retryCount = 0;
+    QString                  errorString;
+    int                      debugLevel = 0;
 
     class WriteItem {
     public:
@@ -150,15 +150,21 @@ class TurnClient::Private : public QObject {
 
     ~Private() { cleanup(); }
 
+    void unsetPool()
+    {
+        pool->disconnect(this);
+        pool.reset();
+    }
+
     void cleanup()
     {
         delete allocate;
         allocate = nullptr;
 
         // in udp mode, we don't own the pool
-        if (!udp)
-            delete pool;
-        pool = nullptr;
+        if (!udp) {
+            unsetPool();
+        }
 
         delete tls;
         tls = nullptr;
@@ -233,8 +239,7 @@ class TurnClient::Private : public QObject {
 
             // in udp mode, we don't own the pool
             if (!udp)
-                delete pool;
-            pool = nullptr;
+                unsetPool();
 
             if (udp)
                 sess.defer(q, "closed");
@@ -272,12 +277,12 @@ class TurnClient::Private : public QObject {
     {
         // when retrying, pool will be non-null because we reuse it
         if (!udp && !pool) {
-            pool = new StunTransactionPool(StunTransaction::Tcp, this);
+            pool = StunTransactionPool::Ptr::create(StunTransaction::Tcp);
             pool->setDebugLevel((StunTransactionPool::DebugLevel)debugLevel);
-            connect(pool, SIGNAL(outgoingMessage(QByteArray, QHostAddress, int)),
+            connect(pool.data(), SIGNAL(outgoingMessage(QByteArray, QHostAddress, int)),
                     SLOT(pool_outgoingMessage(QByteArray, QHostAddress, int)));
-            connect(pool, SIGNAL(needAuthParams()), SLOT(pool_needAuthParams()));
-            connect(pool, SIGNAL(debugLine(QString)), SLOT(pool_debugLine(QString)));
+            connect(pool.data(), SIGNAL(needAuthParams()), SLOT(pool_needAuthParams()));
+            connect(pool.data(), SIGNAL(debugLine(QString)), SLOT(pool_debugLine(QString)));
 
             pool->setLongTermAuthEnabled(true);
             if (!user.isEmpty()) {
@@ -288,7 +293,7 @@ class TurnClient::Private : public QObject {
             }
         }
 
-        allocate = new StunAllocate(pool);
+        allocate = new StunAllocate(pool.data());
         connect(allocate, SIGNAL(started()), SLOT(allocate_started()));
         connect(allocate, SIGNAL(stopped()), SLOT(allocate_stopped()));
         connect(allocate, SIGNAL(error(XMPP::StunAllocate::Error)), SLOT(allocate_error(XMPP::StunAllocate::Error)));
@@ -586,9 +591,9 @@ class TurnClient::Private : public QObject {
             // start completely over, but retain the same pool
             //   so the user isn't asked to auth again
 
-            int                  tmp_retryCount = retryCount;
-            StunTransactionPool *tmp_pool       = pool;
-            pool                                = nullptr;
+            int                      tmp_retryCount = retryCount;
+            StunTransactionPool::Ptr tmp_pool       = pool;
+            pool.reset();
 
             cleanup();
 
@@ -803,8 +808,7 @@ private slots:
 
         // in udp mode, we don't own the pool
         if (!udp)
-            delete pool;
-        pool = nullptr;
+            unsetPool();
 
         if (udp)
             emit q->closed();
@@ -871,7 +875,7 @@ void TurnClient::connectToHost(StunTransactionPool *pool, const QHostAddress &ad
     d->serverAddr = addr;
     d->serverPort = port;
     d->udp        = true;
-    d->pool       = pool;
+    d->pool       = pool->sharedFromThis();
     d->in.clear();
     d->do_connect();
 }
diff --git a/tools/nettool/main.cpp b/tools/nettool/main.cpp
index b409d948..eef9fe0f 100644
--- a/tools/nettool/main.cpp
+++ b/tools/nettool/main.cpp
@@ -436,13 +436,13 @@ private slots:
 class StunBind : public QObject {
     Q_OBJECT
 public:
-    bool                 debug;
-    QHostAddress         addr;
-    int                  port;
-    int                  localPort;
-    QUdpSocket *         sock;
-    StunTransactionPool *pool;
-    StunBinding *        binding;
+    bool                     debug;
+    QHostAddress             addr;
+    int                      port;
+    int                      localPort;
+    QUdpSocket *             sock;
+    StunTransactionPool::Ptr pool;
+    StunBinding *            binding;
 
     ~StunBind()
     {
@@ -542,19 +542,19 @@ private slots:
 class TurnClientTest : public QObject {
     Q_OBJECT
 public:
-    int                  mode  = 0;
-    bool                 debug = false;
-    QHostAddress         relayAddr;
-    int                  relayPort = 0;
-    QString              relayUser;
-    QString              relayPass;
-    QString              relayRealm;
-    QHostAddress         peerAddr;
-    int                  peerPort = 0;
-    QUdpSocket *         udp      = nullptr;
-    StunTransactionPool *pool     = nullptr;
-    QList<bool>          writeItems; // true = turn-originated, false = external
-    TurnClient *         turn = nullptr;
+    int                      mode  = 0;
+    bool                     debug = false;
+    QHostAddress             relayAddr;
+    int                      relayPort = 0;
+    QString                  relayUser;
+    QString                  relayPass;
+    QString                  relayRealm;
+    QHostAddress             peerAddr;
+    int                      peerPort = 0;
+    QUdpSocket *             udp      = nullptr;
+    StunTransactionPool::Ptr pool;
+    QList<bool>              writeItems; // true = turn-originated, false = external
+    TurnClient *             turn = nullptr;
 
     TurnClientTest() = default;
 

From 82107e83636e4107b903534c6f543f338ba829d4 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sat, 2 May 2020 22:25:00 +0300
Subject: [PATCH 157/383] Fixed CI

---
 src/irisnet/noncore/turnclient.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/irisnet/noncore/turnclient.cpp b/src/irisnet/noncore/turnclient.cpp
index 7ac1dfd4..e8079a3a 100644
--- a/src/irisnet/noncore/turnclient.cpp
+++ b/src/irisnet/noncore/turnclient.cpp
@@ -86,8 +86,8 @@ class TurnClient::Private : public QObject {
     QCA::TLS *               tls           = nullptr;
     bool                     tlsHandshaken = false;
     QByteArray               inStream;
-    bool                     udp             = false;
-    StunTransactionPool::Ptr pool            = nullptr;
+    bool                     udp = false;
+    StunTransactionPool::Ptr pool;
     StunAllocate *           allocate        = nullptr;
     bool                     allocateStarted = false;
     QString                  user;

From dfb131b451088608fc9c9ec8cd81e54be086f509 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sat, 2 May 2020 23:56:24 +0300
Subject: [PATCH 158/383] Don't crash on stopping already stopping transport

---
 src/irisnet/noncore/icelocaltransport.cpp | 6 +++++-
 src/irisnet/noncore/stuntransaction.h     | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/irisnet/noncore/icelocaltransport.cpp b/src/irisnet/noncore/icelocaltransport.cpp
index 4fa09d95..adfe73dc 100644
--- a/src/irisnet/noncore/icelocaltransport.cpp
+++ b/src/irisnet/noncore/icelocaltransport.cpp
@@ -237,7 +237,11 @@ class IceLocalTransport::Private : public QObject {
     void stop()
     {
         Q_ASSERT(sock);
-        Q_ASSERT(!stopping);
+        if (stopping) {
+            auto as = QString("%1:%2").arg(addr.toString(), QString::number(port));
+            emit q->debugLine(QString("local transport %1 is already stopping. just wait...").arg(as));
+            return;
+        }
 
         stopping = true;
 
diff --git a/src/irisnet/noncore/stuntransaction.h b/src/irisnet/noncore/stuntransaction.h
index 0ace46cc..5aec3a53 100644
--- a/src/irisnet/noncore/stuntransaction.h
+++ b/src/irisnet/noncore/stuntransaction.h
@@ -20,6 +20,7 @@
 #define STUNTRANSACTION_H
 
 #include <QByteArray>
+#include <QEnableSharedFromThis>
 #include <QHostAddress>
 #include <QObject>
 

From a62e171bd1eecd2efa9061e581b677f49e00d93c Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 3 May 2020 01:08:18 +0300
Subject: [PATCH 159/383] Ensure unused ICE sockets are returned to the
 reserver from proper thread

---
 src/irisnet/noncore/icecomponent.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/irisnet/noncore/icecomponent.cpp b/src/irisnet/noncore/icecomponent.cpp
index 706b604a..a2935bf9 100644
--- a/src/irisnet/noncore/icecomponent.cpp
+++ b/src/irisnet/noncore/icecomponent.cpp
@@ -60,7 +60,12 @@ class IceComponent::Private : public QObject {
             sock->disconnect(ic);
             if (borrowed) {
                 Q_ASSERT(ic->portReserver);
-                ic->portReserver->returnSockets(QList<QUdpSocket *>() << sock);
+                // It's quite common to move Ice176 to another thread, but port reserver is not moved anywhere,
+                // so we still need to carefully return not needed sockets.
+                QTimer::singleShot(0, ic->portReserver->thread(), [pr = ic->portReserver, sock = sock]() {
+                    sock->moveToThread(pr->thread());
+                    pr->returnSockets(QList<QUdpSocket *>() << sock);
+                });
             } else {
                 sock->deleteLater();
             }

From 1ee0f92feced993b7bc164a316ce1051acc6a276 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 3 May 2020 11:35:44 +0300
Subject: [PATCH 160/383] Fixes/workarounds to make ICE sockets working

---
 src/irisnet/corelib/irisnetglobal.cpp |  1 +
 src/irisnet/corelib/netnames.cpp      |  1 -
 src/irisnet/noncore/ice176.cpp        | 10 +++++++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/irisnet/corelib/irisnetglobal.cpp b/src/irisnet/corelib/irisnetglobal.cpp
index 50f6f1b6..ff00c686 100644
--- a/src/irisnet/corelib/irisnetglobal.cpp
+++ b/src/irisnet/corelib/irisnetglobal.cpp
@@ -230,6 +230,7 @@ static void init()
     if (global)
         return;
 
+    qRegisterMetaType<QHostAddress>("QHostAddress");
     global = new IrisNetGlobal;
     qAddPostRoutine(deinit);
 }
diff --git a/src/irisnet/corelib/netnames.cpp b/src/irisnet/corelib/netnames.cpp
index 09644b6b..63ccc435 100644
--- a/src/irisnet/corelib/netnames.cpp
+++ b/src/irisnet/corelib/netnames.cpp
@@ -798,7 +798,6 @@ class NameManager : public QObject {
             p_serv = c;
 
             // use queued connections
-            qRegisterMetaType<QHostAddress>("QHostAddress");
             qRegisterMetaType<QList<XMPP::ServiceProvider::ResolveResult>>(
                 "QList<XMPP::ServiceProvider::ResolveResult>");
             connect(p_serv, SIGNAL(resolve_resultsReady(int, QList<XMPP::ServiceProvider::ResolveResult>)),
diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index b5237969..25c93f3c 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -601,8 +601,11 @@ class Ice176::Private : public QObject {
 
         auto &pair = *it;
         int   at   = findLocalCandidate(pair->local->addr.addr, pair->local->addr.port);
-        if (at == -1) // FIXME: assert?
+        if (at == -1) { // FIXME: assert?
+            qDebug("FIXME! Failed to find local candidate for componentId=%d, addr=%s", componentIndex + 1,
+                   qPrintable(pair->local->addr));
             return;
+        }
 
         IceComponent::Candidate &lc = localCandidates[at];
 
@@ -655,7 +658,8 @@ class Ice176::Private : public QObject {
         // stop not used transports
         for (auto &c : localCandidates) {
             if (c.info->componentId == componentId && c.iceTransport != t) {
-                c.iceTransport->stop();
+                // FIXME! it cleanups more candidates than it should (particularly ones from selected pairs)
+                // c.iceTransport->stop();
             }
         }
     }
@@ -1048,7 +1052,7 @@ class Ice176::Private : public QObject {
             });
         checkList.validPairs.insert(insIt, pair); // nominated and highest priority first
 
-        if (!readyToSendMedia && localFeatures & NotNominatedData && remoteFeatures & NotNominatedData) {
+        if (!readyToSendMedia && (localFeatures & NotNominatedData) && (remoteFeatures & NotNominatedData)) {
             // if both follow RFC8445 and allow to send data on any valid pair
             findComponent(pair->local->componentId)->hasValidPairs = true;
             if (std::all_of(components.begin(), components.end(), [](auto &c) { return c.hasValidPairs; })) {

From 222c86920c68bee3d7251d7ebc096e177e5c664f Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 4 May 2020 13:40:30 +0300
Subject: [PATCH 161/383] Changed algo for selected pair setting and cleanup

---
 src/irisnet/noncore/ice176.cpp            | 150 +++++++++++++---------
 src/irisnet/noncore/icelocaltransport.cpp |   3 +
 2 files changed, 92 insertions(+), 61 deletions(-)

diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index 25c93f3c..63664c9e 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -142,11 +142,11 @@ class Ice176::Private : public QObject {
         int                     id              = 0;
         IceComponent *          ic              = nullptr;
         std::unique_ptr<QTimer> nominationTimer = std::unique_ptr<QTimer>();
-        bool                    localFinished   = false;
-        bool                    hasValidPairs   = false;
-        bool                    finalSelected   = false;
-        bool                    stopped         = false;
-        bool                    lowOverhead     = false;
+        CandidatePair::Ptr      selectedPair;
+        bool                    localFinished = false;
+        bool                    hasValidPairs = false;
+        bool                    stopped       = false;
+        bool                    lowOverhead   = false;
     };
 
     Ice176 *                                q;
@@ -592,18 +592,22 @@ class Ice176::Private : public QObject {
 
     void write(int componentIndex, const QByteArray &datagram)
     {
-        auto it = std::find_if(checkList.validPairs.begin(), checkList.validPairs.end(),
-                               [&](const auto &p) { return p->local->componentId - 1 == componentIndex; });
-        if (it == checkList.validPairs.end()) {
-            qDebug("An attempt to write to an ICE component w/o valid sockets");
-            return;
+        auto cIt = findComponent(componentIndex + 1);
+        Q_ASSERT(cIt != components.end());
+
+        auto pair = cIt->selectedPair;
+        if (!pair) {
+            pair = chooseSelectedPair(componentIndex + 1);
+            if (!pair) {
+                qDebug("An attempt to write to an ICE component w/o valid sockets");
+                return;
+            }
         }
 
-        auto &pair = *it;
-        int   at   = findLocalCandidate(pair->local->addr.addr, pair->local->addr.port);
+        int at = findLocalCandidate(pair->local->addr.addr, pair->local->addr.port);
         if (at == -1) { // FIXME: assert?
-            qDebug("FIXME! Failed to find local candidate for componentId=%d, addr=%s", componentIndex + 1,
-                   qPrintable(pair->local->addr));
+            // qDebug("FIXME! Failed to find local candidate for componentId=%d, addr=%s", componentIndex + 1,
+            //       qPrintable(pair->local->addr));
             return;
         }
 
@@ -629,49 +633,55 @@ class Ice176::Private : public QObject {
 
     void cleanupButSelectedPair(int componentId)
     {
-        CandidatePair::Ptr selected;
-
-        auto it = std::remove_if(checkList.validPairs.begin(), checkList.validPairs.end(),
-                                 [&, keep = true](auto &pair) mutable {
-                                     if (pair->local->componentId == componentId) {
-                                         if (keep) {
-                                             selected = pair;
-                                             keep     = false;
-                                             return false;
-                                         }
-                                         return true;
-                                     }
-                                     return false;
-                                 });
-        checkList.validPairs.erase(it, checkList.validPairs.end());
-        Q_ASSERT(selected.data() != nullptr);
-
-        auto &sa = selected->local->addr;
+        CandidatePair::Ptr selected = findComponent(componentId)->selectedPair;
+        Q_ASSERT(selected);
+        decltype(checkList.validPairs) newValid;
+        newValid.push_back(selected);
+        for (auto &p : checkList.validPairs)
+            if (p->local->componentId != componentId)
+                newValid.push_back(p);
+        checkList.validPairs = newValid;
+
+        qDebug("C%d: selected pair: %s", componentId, qPrintable(*selected));
+
+        auto &sa = selected->local->base;
         auto &t  = localCandidates[findLocalCandidate(sa.addr, sa.port)].iceTransport;
+        Q_ASSERT(t.data() != nullptr);
         // cancel active transactions
         for (auto &p : checkList.pairs) {
             if (p->local->componentId == componentId && p->state == PInProgress) {
                 p->binding->cancel();
                 p->state = PFailed;
+                qDebug("Cancel %s setting it to failed state", qPrintable(*p));
             }
         }
         // stop not used transports
         for (auto &c : localCandidates) {
             if (c.info->componentId == componentId && c.iceTransport != t) {
                 // FIXME! it cleanups more candidates than it should (particularly ones from selected pairs)
-                // c.iceTransport->stop();
+                c.iceTransport->stop();
             }
         }
     }
 
+    CandidatePair::Ptr chooseSelectedPair(int componentId)
+    {
+        auto it = std::find_if(checkList.validPairs.begin(), checkList.validPairs.end(),
+                               [&](auto &pair) mutable { return pair->local->componentId == componentId; });
+        return it == checkList.validPairs.end() ? CandidatePair::Ptr() : *it;
+    }
+
     bool canHaveMoreRemoteCandidates() const { return remoteGatheringComplete || !(remoteFeatures & Trickle); }
 
-    void tryNominateSelectedPair()
+    void tryNominateSelectedPair(int componentId)
     {
         if (mode != Initiator || state != Started || checkList.validPairs.isEmpty())
             return;
-        Q_ASSERT(!checkList.validPairs.first()->isNominated);
-        if (checkList.validPairs.first()->local->type == IceComponent::RelayedType) {
+        auto pair = chooseSelectedPair(componentId);
+        if (!pair)
+            return;
+        Q_ASSERT(!pair->isNominated);
+        if (pair->local->type == IceComponent::RelayedType) {
             if (!(localGatheringComplete && canHaveMoreRemoteCandidates())) {
                 printf("Wiating for gathering complete on both sides before nomination of relayed pair");
                 return; // maybe we gonna have a non-relayed pair. RFC8445 anyway allows to send data on any valid.
@@ -686,7 +696,6 @@ class Ice176::Private : public QObject {
             }
         }
         state                 = Nominating;
-        auto pair             = checkList.validPairs.first();
         pair->finalNomination = true;
         printf("Nominating valid pair: %s\n", qPrintable(*pair));
         checkList.triggeredPairs.prepend(pair);
@@ -694,11 +703,10 @@ class Ice176::Private : public QObject {
 
     void tryIceFinished()
     {
-        if (!std::all_of(components.begin(), components.end(), [](auto &c) { return c.finalSelected; }))
+        if (!std::all_of(components.begin(), components.end(), [](auto &c) { return c.selectedPair != nullptr; }))
             return;
         if (!readyToSendMedia) {
-            readyToSendMedia = true;
-            emit q->readyToSendMedia();
+            onReadyToSendMedia();
         }
         state = Active;
         emit q->iceFinished();
@@ -729,17 +737,17 @@ class Ice176::Private : public QObject {
             connect(timer, &QTimer::timeout, this, [this, componentId = pair->local->componentId]() {
                 if (state != Started && state != Nominating)
                     return; // likely user stopped or it's alreday active
-                auto &finalSelected = findComponent(componentId)->finalSelected;
-                if (finalSelected)
+                auto &selectedPair = findComponent(componentId)->selectedPair;
+                if (selectedPair)
                     return;
+                selectedPair = chooseSelectedPair(componentId);
                 cleanupButSelectedPair(componentId);
-                finalSelected = true;
                 tryIceFinished();
             });
             timer->start();
         } else {
+            c.selectedPair = chooseSelectedPair(pair->local->componentId);
             cleanupButSelectedPair(pair->local->componentId);
-            c.finalSelected = true;
             tryIceFinished();
         }
     }
@@ -821,7 +829,8 @@ class Ice176::Private : public QObject {
             return;
 
         if (!checkList.validPairs.isEmpty() && mode == Initiator && !(localFeatures & AggressiveNomination))
-            tryNominateSelectedPair();
+            for (auto &c : components)
+                tryNominateSelectedPair(c.id);
     }
 
     void updateRemoteGatheringTimeout()
@@ -971,6 +980,17 @@ class Ice176::Private : public QObject {
         return id;
     }
 
+    void onReadyToSendMedia()
+    {
+        qDebug("Ready to send media!");
+        for (auto &c : components) {
+            qDebug("  Selected pair for component %d: %s (base: %s)", c.id, qPrintable(*c.selectedPair),
+                   qPrintable(c.selectedPair->local->base));
+        }
+        readyToSendMedia = true;
+        emit q->readyToSendMedia();
+    }
+
     void handlePairBindingSuccess(CandidatePair::Ptr pair)
     {
         /*
@@ -983,9 +1003,10 @@ class Ice176::Private : public QObject {
 
         StunBinding *binding = pair->binding;
         // pair->isValid = true;
-        pair->state                  = CandidatePairState::PSucceeded;
-        bool isTriggeredForNominated = pair->isTriggeredForNominated;
-        bool finalNomination         = pair->finalNomination;
+        pair->state                   = CandidatePairState::PSucceeded;
+        bool  isTriggeredForNominated = pair->isTriggeredForNominated;
+        bool  finalNomination         = pair->finalNomination;
+        auto &component               = *findComponent(pair->local->componentId);
 
         printf("check success for %s\n", qPrintable(QString(*pair)));
 
@@ -1041,30 +1062,37 @@ class Ice176::Private : public QObject {
             if (p->state == PFrozen && p->foundation == pair->foundation)
                 p->state = PWaiting;
 
-        // find position to insert in sorted list of valid pairs
-        auto insIt = std::upper_bound(
-            checkList.validPairs.begin(), checkList.validPairs.end(), pair, [](auto &item, auto &toins) {
-                if (toins->isNominated ^ item->isNominated)
-                    return item->isNominated;
-                return item->priority == toins->priority
-                    ? item->local->componentId < toins->local->componentId
-                    : item->priority >= toins->priority; // inverted since we need high priority first
-            });
-        checkList.validPairs.insert(insIt, pair); // nominated and highest priority first
+        if (!component.selectedPair) {
+            // find position to insert in sorted list of valid pairs
+            auto insIt = std::upper_bound(
+                checkList.validPairs.begin(), checkList.validPairs.end(), pair, [](auto &item, auto &toins) {
+                    if (toins->isNominated ^ item->isNominated)
+                        return item->isNominated;
+                    return item->priority == toins->priority
+                        ? item->local->componentId < toins->local->componentId
+                        : item->priority >= toins->priority; // inverted since we need high priority first
+                });
+
+            checkList.validPairs.insert(insIt, pair); // nominated and highest priority first
+            qDebug("C%d: insert to valid list %s", component.id, qPrintable(*pair));
+            qDebug("Current valid list state:");
+            for (auto &p : checkList.validPairs) {
+                qDebug("  C%d: %s", component.id, qPrintable(*p));
+            }
+        }
 
         if (!readyToSendMedia && (localFeatures & NotNominatedData) && (remoteFeatures & NotNominatedData)) {
             // if both follow RFC8445 and allow to send data on any valid pair
             findComponent(pair->local->componentId)->hasValidPairs = true;
             if (std::all_of(components.begin(), components.end(), [](auto &c) { return c.hasValidPairs; })) {
-                readyToSendMedia = true;
-                emit q->readyToSendMedia();
+                onReadyToSendMedia();
             }
         }
 
         if (mode == Ice176::Initiator) {
             if (!binding->useCandidate()) {
                 if (!(localFeatures & AggressiveNomination))
-                    tryNominateSelectedPair();
+                    tryNominateSelectedPair(component.id);
                 return;
             }
         } else {
diff --git a/src/irisnet/noncore/icelocaltransport.cpp b/src/irisnet/noncore/icelocaltransport.cpp
index adfe73dc..09b77f9b 100644
--- a/src/irisnet/noncore/icelocaltransport.cpp
+++ b/src/irisnet/noncore/icelocaltransport.cpp
@@ -241,6 +241,9 @@ class IceLocalTransport::Private : public QObject {
             auto as = QString("%1:%2").arg(addr.toString(), QString::number(port));
             emit q->debugLine(QString("local transport %1 is already stopping. just wait...").arg(as));
             return;
+        } else {
+            auto as = QString("%1:%2").arg(addr.toString(), QString::number(port));
+            emit q->debugLine(QString("stopping local transport %1.").arg(as));
         }
 
         stopping = true;

From 33ff7008abd06030553f81a17c7a2d9c1b4e9765 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 4 May 2020 14:05:52 +0300
Subject: [PATCH 162/383] Conditional logs

---
 src/irisnet/noncore/ice176.cpp | 145 ++++++++++++++++++---------------
 1 file changed, 81 insertions(+), 64 deletions(-)

diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index 63664c9e..31a2bdba 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -35,6 +35,13 @@
 #include <QUdpSocket>
 #include <QtCrypto>
 
+#define ICE_DEBUG
+#ifdef ICE_DEBUG
+#define iceDebug qDebug
+#else
+#define iceDebug(...)
+#endif
+
 namespace XMPP {
 enum { Direct, Relayed };
 
@@ -367,14 +374,14 @@ class Ice176::Private : public QObject {
                 (*it)->base       = ci->base;
                 (*it)->network    = ci->network;
                 (*it)->id         = ci->id;
-                printf("Previously known remote prflx was updated from signalling: %s", qPrintable((*it)->addr));
+                iceDebug("Previously known remote prflx was updated from signalling: %s", qPrintable((*it)->addr));
             } else {
                 remoteCandidates += ci;
             }
         }
         this->remoteCandidates += remoteCandidates;
 
-        printf("adding %d remote candidates. total=%d\n", remoteCandidates.count(), this->remoteCandidates.count());
+        iceDebug("adding %d remote candidates. total=%d", remoteCandidates.count(), this->remoteCandidates.count());
         doPairing(localCandidates, remoteCandidates);
     }
 
@@ -383,7 +390,7 @@ class Ice176::Private : public QObject {
         remoteGatheringComplete = true;
         remoteGatheringCompleteTimer.reset();
 
-        printf("Got remote gathering complete signal");
+        iceDebug("Got remote gathering complete signal");
         onRemoteGatheringCompleted();
     }
 
@@ -423,7 +430,7 @@ class Ice176::Private : public QObject {
     // adds new pairs, sorts, prunes
     void addChecklistPairs(const QList<QSharedPointer<CandidatePair>> &pairs)
     {
-        printf("%d pairs\n", pairs.count());
+        iceDebug("%d pairs", pairs.count());
 
         // combine pairs with existing, and sort
         checkList.pairs += pairs;
@@ -436,7 +443,7 @@ class Ice176::Private : public QObject {
         // pruning
         for (int n = 0; n < checkList.pairs.count(); ++n) {
             auto &pair = checkList.pairs[n];
-            printf("%d, %s\n", pair->local->componentId, qPrintable(*pair));
+            iceDebug("%d, %s", pair->local->componentId, qPrintable(*pair));
 
             for (int i = n - 1; i >= 0; --i) {
                 // RFC8445 says to use base only for reflexive. but base is set properly for host and relayed too.
@@ -455,11 +462,12 @@ class Ice176::Private : public QObject {
         int max_pairs = 100 * components.size();
         while (checkList.pairs.count() > max_pairs)
             checkList.pairs.removeLast();
-
-        printf("%d after pruning\n", checkList.pairs.count());
+#ifdef ICE_DEBUG
+        iceDebug("%d after pruning", checkList.pairs.count());
         for (auto &p : checkList.pairs) {
-            printf("%d, %s\n", p->local->componentId, qPrintable(*p));
+            iceDebug("%d, %s", p->local->componentId, qPrintable(*p));
         }
+#endif
     }
 
     QSharedPointer<CandidatePair> selectNextPairToCheck()
@@ -472,7 +480,7 @@ class Ice176::Private : public QObject {
         if (pair) {
             pair->isTriggered = true;
             // according to rfc - check just this one
-            printf("next check from triggered list: %s\n", qPrintable(*pair));
+            iceDebug("next check from triggered list: %s", qPrintable(*pair));
             return pair;
         }
 
@@ -483,14 +491,14 @@ class Ice176::Private : public QObject {
         });
         if (it != checkList.pairs.end()) { // found waiting
             // the list was sorted already by priority and componentId. So first one is Ok
-            printf("next check for already waiting: %s\n", qPrintable(**it));
+            iceDebug("next check for already waiting: %s", qPrintable(**it));
             (*it)->isTriggered = false;
             return *it;
         }
 
         if (pair) { // now it's frozen highest-priority pair
             pair->isTriggered = false;
-            printf("next check for a frozen pair: %s\n", qPrintable(*pair));
+            iceDebug("next check for a frozen pair: %s", qPrintable(*pair));
         }
 
         // FIXME real algo should be (but is requires significant refactoring)
@@ -527,10 +535,10 @@ class Ice176::Private : public QObject {
                     IceComponent::Candidate &lc   = localCandidates[at];
                     int                      path = lc.path;
 
-                    printf("connectivity check for pair %s%s\n", qPrintable(*pair),
-                           (mode == Initiator
-                                ? (pair->binding->useCandidate() ? " (nominating)" : "")
-                                : (pair->isTriggeredForNominated ? " (triggered check for nominated)" : "")));
+                    iceDebug("connectivity check for pair %s%s", qPrintable(*pair),
+                             (mode == Initiator
+                                  ? (pair->binding->useCandidate() ? " (nominating)" : "")
+                                  : (pair->isTriggeredForNominated ? " (triggered check for nominated)" : "")));
                     lc.iceTransport->writeDatagram(path, packet, pair->remote->addr.addr, pair->remote->addr.port);
                 });
 
@@ -572,7 +580,7 @@ class Ice176::Private : public QObject {
         for (const IceComponent::Candidate &cc : localCandidates) {
             auto lc = cc.info;
             if (lc->type == IceComponent::PeerReflexiveType) {
-                printf("not pairing local prflx. %s\n", qPrintable(lc->addr));
+                iceDebug("not pairing local prflx. %s", qPrintable(lc->addr));
                 // see RFC8445 7.2.5.3.1.  Discovering Peer-Reflexive Candidates
                 continue;
             }
@@ -599,15 +607,15 @@ class Ice176::Private : public QObject {
         if (!pair) {
             pair = chooseSelectedPair(componentIndex + 1);
             if (!pair) {
-                qDebug("An attempt to write to an ICE component w/o valid sockets");
+                iceDebug("An attempt to write to an ICE component w/o valid sockets");
                 return;
             }
         }
 
         int at = findLocalCandidate(pair->local->addr.addr, pair->local->addr.port);
         if (at == -1) { // FIXME: assert?
-            // qDebug("FIXME! Failed to find local candidate for componentId=%d, addr=%s", componentIndex + 1,
-            //       qPrintable(pair->local->addr));
+            iceDebug("FIXME! Failed to find local candidate for componentId=%d, addr=%s", componentIndex + 1,
+                     qPrintable(pair->local->addr));
             return;
         }
 
@@ -642,7 +650,8 @@ class Ice176::Private : public QObject {
                 newValid.push_back(p);
         checkList.validPairs = newValid;
 
-        qDebug("C%d: selected pair: %s", componentId, qPrintable(*selected));
+        iceDebug("C%d: selected pair: %s (base: %s)", componentId, qPrintable(*selected),
+                 qPrintable(selected->local->base));
 
         auto &sa = selected->local->base;
         auto &t  = localCandidates[findLocalCandidate(sa.addr, sa.port)].iceTransport;
@@ -652,13 +661,12 @@ class Ice176::Private : public QObject {
             if (p->local->componentId == componentId && p->state == PInProgress) {
                 p->binding->cancel();
                 p->state = PFailed;
-                qDebug("Cancel %s setting it to failed state", qPrintable(*p));
+                iceDebug("Cancel %s setting it to failed state", qPrintable(*p));
             }
         }
         // stop not used transports
         for (auto &c : localCandidates) {
             if (c.info->componentId == componentId && c.iceTransport != t) {
-                // FIXME! it cleanups more candidates than it should (particularly ones from selected pairs)
                 c.iceTransport->stop();
             }
         }
@@ -683,7 +691,7 @@ class Ice176::Private : public QObject {
         Q_ASSERT(!pair->isNominated);
         if (pair->local->type == IceComponent::RelayedType) {
             if (!(localGatheringComplete && canHaveMoreRemoteCandidates())) {
-                printf("Wiating for gathering complete on both sides before nomination of relayed pair");
+                iceDebug("Wiating for gathering complete on both sides before nomination of relayed pair");
                 return; // maybe we gonna have a non-relayed pair. RFC8445 anyway allows to send data on any valid.
             }
 
@@ -691,13 +699,13 @@ class Ice176::Private : public QObject {
             if (std::any_of(checkList.pairs.begin(), checkList.pairs.end(), [](auto &p) {
                     return p->state != PSucceeded && p->state != PFailed && p->local->type != IceComponent::RelayedType;
                 })) {
-                printf("There are some non-relayed pairs to check before relayed nomination");
+                iceDebug("There are some non-relayed pairs to check before relayed nomination");
                 return; // either till checked or remote gathering timeout
             }
         }
         state                 = Nominating;
         pair->finalNomination = true;
-        printf("Nominating valid pair: %s\n", qPrintable(*pair));
+        iceDebug("Nominating valid pair: %s", qPrintable(*pair));
         checkList.triggeredPairs.prepend(pair);
     }
 
@@ -718,7 +726,7 @@ class Ice176::Private : public QObject {
         Component &c      = *findComponent(pair->local->componentId);
         pair->isNominated = true;
         if (c.lowOverhead) {
-            printf("component is flagged for low overhead.  setting up for %s\n", qPrintable(*pair));
+            iceDebug("component is flagged for low overhead.  setting up for %s", qPrintable(*pair));
             auto &cc = localCandidates[findLocalCandidate(pair->local->addr.addr, pair->local->addr.port)];
             c.ic->flagPathAsLowOverhead(cc.id, pair->remote->addr.addr, pair->remote->addr.port);
         }
@@ -785,7 +793,7 @@ class Ice176::Private : public QObject {
         if (pair) {
             if (pair->state == CandidatePairState::PSucceeded) {
                 // Check nominated here?
-                printf("Don't do triggered check since pair is already in success state\n");
+                iceDebug("Don't do triggered check since pair is already in success state");
                 if (mode == Responder && !pair->isNominated && nominated) {
                     tryComponentSuccess(pair);
                 }
@@ -794,8 +802,9 @@ class Ice176::Private : public QObject {
             pair->isNominated = false;
             if (pair->state == CandidatePairState::PInProgress) {
                 if (pair->isTriggered) {
-                    printf("Current in-progress check is already triggered. Don't cancel it while have to according to "
-                           "RFC8445\n");
+                    iceDebug(
+                        "Current in-progress check is already triggered. Don't cancel it while have to according to "
+                        "RFC8445\n");
                     return;
                 }
                 pair->binding->cancel();
@@ -837,10 +846,10 @@ class Ice176::Private : public QObject {
     {
         if (remoteFeatures & GatheringComplete || !(remoteFeatures & Trickle)) {
             remoteGatheringCompleteTimer.reset();
-            printf("Don't use Remote Gatherging Complete timeout\n");
+            iceDebug("Don't use Remote Gatherging Complete timeout");
             return;
         } else if (remoteGatheringCompleteTimer) {
-            printf("Remote Gatherging Complete was restarted\n");
+            iceDebug("Remote Gatherging Complete was restarted");
             remoteGatheringCompleteTimer->start(); // restart
             return;
         }
@@ -849,10 +858,10 @@ class Ice176::Private : public QObject {
         remoteGatheringCompleteTimer->setInterval(remoteGatheringCompleteTimeout);
         connect(remoteGatheringCompleteTimer.get(), &QTimer::timeout, this, [this]() {
             remoteGatheringCompleteTimer.release()->deleteLater();
-            printf("Timeout waiting for Gathering Complete signal\n");
+            iceDebug("Timeout waiting for Gathering Complete signal");
             onRemoteGatheringCompleted();
         });
-        printf("Start Remote Gatherging Complete timer\n");
+        iceDebug("Start Remote Gatherging Complete timer");
         remoteGatheringCompleteTimer->start();
     }
 
@@ -982,11 +991,13 @@ class Ice176::Private : public QObject {
 
     void onReadyToSendMedia()
     {
-        qDebug("Ready to send media!");
+#ifdef ICE_DEBUG
+        iceDebug("Ready to send media!");
         for (auto &c : components) {
-            qDebug("  Selected pair for component %d: %s (base: %s)", c.id, qPrintable(*c.selectedPair),
-                   qPrintable(c.selectedPair->local->base));
+            iceDebug("  C%d: selected pair: %s (base: %s)", c.id, qPrintable(*c.selectedPair),
+                     qPrintable(c.selectedPair->local->base));
         }
+#endif
         readyToSendMedia = true;
         emit q->readyToSendMedia();
     }
@@ -1008,7 +1019,7 @@ class Ice176::Private : public QObject {
         bool  finalNomination         = pair->finalNomination;
         auto &component               = *findComponent(pair->local->componentId);
 
-        printf("check success for %s\n", qPrintable(QString(*pair)));
+        iceDebug("check success for %s", qPrintable(QString(*pair)));
 
         // RFC8445 7.2.5.3.1.  Discovering Peer-Reflexive Candidates
         auto mappedAddr = IceComponent::TransportAddress(binding->reflexiveAddress(), binding->reflexivePort());
@@ -1039,7 +1050,7 @@ class Ice176::Private : public QObject {
                     pair = makeCandidatesPair(locIt->info, pair->remote);
                 } else {
                     pair = *it;
-                    printf("mapped address belongs to another pair on checklist %s\n", qPrintable(QString(*pair)));
+                    iceDebug("mapped address belongs to another pair on checklist %s", qPrintable(QString(*pair)));
                     if (pair->isValid) { // already valid as result of previous checks probably
                         return;
                     }
@@ -1074,11 +1085,13 @@ class Ice176::Private : public QObject {
                 });
 
             checkList.validPairs.insert(insIt, pair); // nominated and highest priority first
-            qDebug("C%d: insert to valid list %s", component.id, qPrintable(*pair));
-            qDebug("Current valid list state:");
+#ifdef ICE_DEBUG
+            iceDebug("C%d: insert to valid list %s", component.id, qPrintable(*pair));
+            iceDebug("Current valid list state:");
             for (auto &p : checkList.validPairs) {
-                qDebug("  C%d: %s", component.id, qPrintable(*p));
+                iceDebug("  C%d: %s", component.id, qPrintable(*p));
             }
+#endif
         }
 
         if (!readyToSendMedia && (localFeatures & NotNominatedData) && (remoteFeatures & NotNominatedData)) {
@@ -1106,7 +1119,7 @@ class Ice176::Private : public QObject {
         });
 
         if (it != checkList.pairs.end()) {
-            printf("component %d already active, not signalling\n", pair->local->componentId);
+            iceDebug("component %d already active, not signalling", pair->local->componentId);
             return;
         }
         tryComponentSuccess(pair);
@@ -1118,7 +1131,7 @@ class Ice176::Private : public QObject {
         if (state == Stopping)
             return; // we don't care about late errors
 
-        printf("check failed for %s\n", qPrintable(*pair));
+        iceDebug("check failed for %s", qPrintable(*pair));
         pair->state = CandidatePairState::PFailed;
         if (pair->isValid) { // RFC8445 7.2.5.3.4.  Updating the Nominated Flag /  about failure
             checkList.validPairs.removeOne(pair);
@@ -1131,7 +1144,7 @@ class Ice176::Private : public QObject {
         if (state == Started) {
             // oops, already-started ICE reports errors. keep-alive checks?
             if (pair->isNominated) {
-                printf("check failed on nominated candidate. set ICE status to failed");
+                iceDebug("check failed on nominated candidate. set ICE status to failed");
                 stop();
                 emit q->error(ErrorDisconnected);
             }
@@ -1139,7 +1152,7 @@ class Ice176::Private : public QObject {
         }
         if (state == Nominating) {
             if (pair->finalNomination) {
-                printf("Failed to nominate selected pair. set ICE status to failed");
+                iceDebug("Failed to nominate selected pair. set ICE status to failed");
                 stop();
                 emit q->error(ErrorDisconnected);
             }
@@ -1164,9 +1177,9 @@ private slots:
 
         localCandidates += cc;
 
-        printf("C%d: candidate added: %s %s;%d\n", cc.info->componentId,
-               qPrintable(candidateType_to_string(cc.info->type)), qPrintable(cc.info->addr.addr.toString()),
-               cc.info->addr.port);
+        iceDebug("C%d: candidate added: %s %s;%d", cc.info->componentId,
+                 qPrintable(candidateType_to_string(cc.info->type)), qPrintable(cc.info->addr.addr.toString()),
+                 cc.info->addr.port);
 
         if (!iceTransports.contains(cc.iceTransport)) {
             connect(cc.iceTransport.data(), SIGNAL(readyRead(int)), SLOT(it_readyRead(int)));
@@ -1196,8 +1209,8 @@ private slots:
     void ic_candidateRemoved(const XMPP::IceComponent::Candidate &cc)
     {
         // TODO
-        printf("C%d: candidate removed: %s;%d\n", cc.info->componentId, qPrintable(cc.info->addr.addr.toString()),
-               cc.info->addr.port);
+        iceDebug("C%d: candidate removed: %s;%d", cc.info->componentId, qPrintable(cc.info->addr.addr.toString()),
+                 cc.info->addr.port);
 
         QStringList idList;
         for (int n = 0; n < localCandidates.count(); ++n) {
@@ -1302,12 +1315,16 @@ private slots:
 
     void ic_debugLine(const QString &line)
     {
+#ifdef ICE_DEBUG
         IceComponent *ic = static_cast<IceComponent *>(sender());
         auto          it = findComponent(ic);
         Q_ASSERT(it != components.end());
 
         // FIXME: components are always sorted?
-        printf("C%d: %s\n", it->id, qPrintable(line));
+        iceDebug("C%d: %s", it->id, qPrintable(line));
+#else
+        Q_UNUSED(line)
+#endif
     }
 
     // path is either direct or relayed
@@ -1326,7 +1343,7 @@ private slots:
             int          fromPort;
             QByteArray   buf = sock->readDatagram(path, &fromAddr, &fromPort);
 
-            // printf("port %d: received packet (%d bytes)\n", lt->sock->localPort(), buf.size());
+            // iceDebug("port %d: received packet (%d bytes)", lt->sock->localPort(), buf.size());
 
             QString    requser = localUser + ':' + peerUser;
             QByteArray reqkey  = localPass.toUtf8();
@@ -1335,17 +1352,17 @@ private slots:
             StunMessage                msg = StunMessage::fromBinary(buf, &result,
                                                       StunMessage::MessageIntegrity | StunMessage::Fingerprint, reqkey);
             if (!msg.isNull() && (msg.mclass() == StunMessage::Request || msg.mclass() == StunMessage::Indication)) {
-                printf("received validated request or indication from %s:%d\n", qPrintable(fromAddr.toString()),
-                       fromPort);
+                iceDebug("received validated request or indication from %s:%d", qPrintable(fromAddr.toString()),
+                         fromPort);
                 QString user = QString::fromUtf8(msg.attribute(StunTypes::USERNAME));
                 if (requser != user) {
-                    printf("user [%s] is wrong.  it should be [%s].  skipping\n", qPrintable(user),
-                           qPrintable(requser));
+                    iceDebug("user [%s] is wrong.  it should be [%s].  skipping", qPrintable(user),
+                             qPrintable(requser));
                     continue;
                 }
 
                 if (msg.method() != StunTypes::Binding) {
-                    printf("not a binding request.  skipping\n");
+                    iceDebug("not a binding request.  skipping");
                     continue;
                 }
 
@@ -1376,7 +1393,7 @@ private slots:
                     nominated = msg.hasAttribute(StunTypes::USE_CANDIDATE);
                 if (it == remoteCandidates.end()) {
                     // RFC8445 7.3.1.3.  Learning Peer-Reflexive Candidates
-                    printf("found NEW remote prflx! %s:%d\n", qPrintable(fromAddr.toString()), fromPort);
+                    iceDebug("found NEW remote prflx! %s:%d", qPrintable(fromAddr.toString()), fromPort);
                     quint32 priority;
                     StunTypes::parsePriority(msg.attribute(StunTypes::PRIORITY), &priority);
                     auto remCand = IceComponent::CandidateInfo::makeRemotePrflx(locCand.info->componentId, fromAddr,
@@ -1392,8 +1409,8 @@ private slots:
                     buf, &result, StunMessage::MessageIntegrity | StunMessage::Fingerprint, reskey);
                 if (!msg.isNull()
                     && (msg.mclass() == StunMessage::SuccessResponse || msg.mclass() == StunMessage::ErrorResponse)) {
-                    printf("received validated response from %s:%d to %s\n", qPrintable(fromAddr.toString()), fromPort,
-                           qPrintable(locCand.info->addr));
+                    iceDebug("received validated response from %s:%d to %s", qPrintable(fromAddr.toString()), fromPort,
+                             qPrintable(locCand.info->addr));
 
                     // FIXME: this is so gross and completely defeats the point of having pools
                     for (int n = 0; n < checkList.pairs.count(); ++n) {
@@ -1403,11 +1420,11 @@ private slots:
                             pair.pool->writeIncomingMessage(msg);
                     }
                 } else {
-                    // printf("received some non-stun or invalid stun packet\n");
+                    // iceDebug("received some non-stun or invalid stun packet");
 
                     // FIXME: i don't know if this is good enough
                     if (StunMessage::isProbablyStun(buf)) {
-                        printf("unexpected stun packet (loopback?), skipping.\n");
+                        iceDebug("unexpected stun packet (loopback?), skipping.");
                         continue;
                     }
 
@@ -1421,12 +1438,12 @@ private slots:
                         }
                     }
                     if (at == -1) {
-                        printf("the local transport does not seem to be associated with a candidate?!\n");
+                        iceDebug("the local transport does not seem to be associated with a candidate?!");
                         continue;
                     }
 
                     int componentIndex = checkList.pairs[at]->local->componentId - 1;
-                    // printf("packet is considered to be application data for component index %d\n", componentIndex);
+                    // iceDebug("packet is considered to be application data for component index %d", componentIndex);
 
                     // FIXME: this assumes components are ordered by id in our local arrays
                     in[componentIndex] += buf;

From b28b432aa449e92d53b27fef9436379bfa3b8e79 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 6 May 2020 11:49:04 +0300
Subject: [PATCH 163/383] Added another tool to change thread since current one
 doesn't work with shared pointers

---
 src/irisnet/noncore/ice176.cpp            |  14 +++
 src/irisnet/noncore/ice176.h              |   2 +
 src/irisnet/noncore/icecomponent.cpp      | 113 ++++++----------------
 src/irisnet/noncore/icelocaltransport.cpp |   7 ++
 src/irisnet/noncore/icelocaltransport.h   |   1 +
 src/irisnet/noncore/icetransport.h        |   1 +
 src/irisnet/noncore/iceturntransport.cpp  |   6 ++
 src/irisnet/noncore/iceturntransport.h    |   1 +
 src/irisnet/noncore/turnclient.cpp        |   7 ++
 src/irisnet/noncore/turnclient.h          |   1 +
 10 files changed, 72 insertions(+), 81 deletions(-)

diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index 31a2bdba..d06f4a9d 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -29,6 +29,7 @@
 #include "stuntypes.h"
 #include "udpportreserver.h"
 
+#include <QEvent>
 #include <QQueue>
 #include <QSet>
 #include <QTimer>
@@ -1572,6 +1573,19 @@ bool Ice176::isIPv6LinkLocalAddress(const QHostAddress &addr)
         return false;
 }
 
+void Ice176::changeThread(QThread *thread)
+{
+    for (auto &c : d->localCandidates) {
+        if (c.iceTransport)
+            c.iceTransport->changeThread(thread);
+    }
+    for (auto &p : d->checkList.pairs) {
+        if (p->pool)
+            p->pool->moveToThread(thread);
+    }
+    moveToThread(thread);
+}
+
 } // namespace XMPP
 
 #include "ice176.moc"
diff --git a/src/irisnet/noncore/ice176.h b/src/irisnet/noncore/ice176.h
index 578d7e0c..a3db6ac3 100644
--- a/src/irisnet/noncore/ice176.h
+++ b/src/irisnet/noncore/ice176.h
@@ -144,6 +144,8 @@ class Ice176 : public QObject {
     // FIXME: this should probably be in netinterface.h or such
     static bool isIPv6LinkLocalAddress(const QHostAddress &addr);
 
+    void changeThread(QThread *thread);
+
 signals:
     // indicates that the ice engine is started and is ready to receive
     //   peer creds and remote candidates
diff --git a/src/irisnet/noncore/icecomponent.cpp b/src/irisnet/noncore/icecomponent.cpp
index a2935bf9..5b11df9f 100644
--- a/src/irisnet/noncore/icecomponent.cpp
+++ b/src/irisnet/noncore/icecomponent.cpp
@@ -46,36 +46,6 @@ static int calc_priority(int typePref, int localPref, int componentId)
 class IceComponent::Private : public QObject {
     Q_OBJECT
 
-    struct IceSocket {
-        using Ptr = QSharedPointer<IceSocket>;
-
-        IceSocket(QUdpSocket *sock, bool borrowed, IceComponent::Private *ic) : sock(sock), ic(ic), borrowed(borrowed)
-        {
-        }
-        ~IceSocket()
-        {
-            if (!sock)
-                return;
-
-            sock->disconnect(ic);
-            if (borrowed) {
-                Q_ASSERT(ic->portReserver);
-                // It's quite common to move Ice176 to another thread, but port reserver is not moved anywhere,
-                // so we still need to carefully return not needed sockets.
-                QTimer::singleShot(0, ic->portReserver->thread(), [pr = ic->portReserver, sock = sock]() {
-                    sock->moveToThread(pr->thread());
-                    pr->returnSockets(QList<QUdpSocket *>() << sock);
-                });
-            } else {
-                sock->deleteLater();
-            }
-        }
-
-        QUdpSocket *           sock = nullptr;
-        IceComponent::Private *ic   = nullptr;
-        bool                   borrowed;
-    };
-
 public:
     class Config {
     public:
@@ -100,7 +70,7 @@ class IceComponent::Private : public QObject {
 
     class LocalTransport {
     public:
-        IceSocket::Ptr                    qsock;
+        QUdpSocket *                      qsock;
         QHostAddress                      addr;
         QSharedPointer<IceLocalTransport> sock;
         int                               network;
@@ -110,6 +80,7 @@ class IceComponent::Private : public QObject {
         bool                              stun_finished, turn_finished; // candidates emitted
         QHostAddress                      extAddr;
         bool                              ext_finished;
+        bool                              borrowed = false;
 
         LocalTransport() :
             network(-1), isVpn(false), started(false), stun_started(false), stun_finished(false), turn_finished(false),
@@ -144,7 +115,7 @@ class IceComponent::Private : public QObject {
 
     ~Private() { qDeleteAll(udpTransports); }
 
-    LocalTransport *createLocalTransport(IceSocket::Ptr socket, const Ice176::LocalAddress &la)
+    LocalTransport *createLocalTransport(QUdpSocket *socket, const Ice176::LocalAddress &la)
     {
         auto lt   = new LocalTransport;
         lt->qsock = socket;
@@ -154,9 +125,15 @@ class IceComponent::Private : public QObject {
         lt->network = la.network;
         lt->isVpn   = la.isVpn;
         connect(lt->sock.data(), SIGNAL(started()), SLOT(lt_started()));
-        connect(lt->sock.data(), SIGNAL(stopped()), SLOT(lt_stopped()));
+        connect(lt->sock.data(), &IceLocalTransport::stopped, this, [this, lt]() {
+            if (eraseLocalTransport(lt))
+                tryStopped();
+        });
         connect(lt->sock.data(), SIGNAL(addressesChanged()), SLOT(lt_addressesChanged()));
-        connect(lt->sock.data(), SIGNAL(error(int)), SLOT(lt_error(int)));
+        connect(lt->sock.data(), &IceLocalTransport::error, this, [this, lt](int) {
+            if (eraseLocalTransport(lt))
+                tryGatheringComplete();
+        });
         connect(lt->sock.data(), SIGNAL(debugLine(QString)), SLOT(lt_debugLine(QString)));
         return lt;
     }
@@ -204,7 +181,8 @@ class IceComponent::Private : public QObject {
                 }
 
                 config.localAddrs += la;
-                auto lt = createLocalTransport(IceSocket::Ptr::create(qsock, borrowedSocket, this), la);
+                auto lt      = createLocalTransport(qsock, la);
+                lt->borrowed = borrowedSocket;
                 udpTransports += lt;
 
                 if (lt->addr.protocol() != QAbstractSocket::IPv6Protocol) {
@@ -523,6 +501,25 @@ class IceComponent::Private : public QObject {
             postStop();
     }
 
+    // return true if component is still alive after transport removal
+    bool eraseLocalTransport(LocalTransport *lt)
+    {
+        ObjectSessionWatcher watch(&sess);
+
+        removeLocalCandidates(lt->sock);
+        if (!watch.isValid())
+            return false;
+
+        lt->sock->disconnect(this);
+        if (lt->borrowed) {
+            lt->qsock->disconnect(this);
+            portReserver->returnSockets({ lt->qsock });
+        }
+        delete lt;
+        udpTransports.removeOne(lt);
+        return true;
+    }
+
 private slots:
     void tryGatheringComplete()
     {
@@ -627,27 +624,6 @@ private slots:
         tryGatheringComplete();
     }
 
-    void lt_stopped()
-    {
-        IceLocalTransport *sock = static_cast<IceLocalTransport *>(sender());
-        auto               it
-            = std::find_if(udpTransports.begin(), udpTransports.end(), [&](auto const &a) { return a->sock == sock; });
-        Q_ASSERT(it != udpTransports.end());
-        LocalTransport *lt = *it;
-
-        ObjectSessionWatcher watch(&sess);
-
-        removeLocalCandidates(lt->sock);
-        if (!watch.isValid())
-            return;
-
-        lt->sock->disconnect(this);
-        delete lt;
-
-        udpTransports.erase(it);
-        tryStopped();
-    }
-
     void lt_addressesChanged()
     {
         IceLocalTransport *sock = static_cast<IceLocalTransport *>(sender());
@@ -727,31 +703,6 @@ private slots:
         tryGatheringComplete();
     }
 
-    void lt_error(int e)
-    {
-        Q_UNUSED(e)
-
-        IceLocalTransport *sock = static_cast<IceLocalTransport *>(sender());
-        auto               it
-            = std::find_if(udpTransports.begin(), udpTransports.end(), [&](auto const &a) { return a->sock == sock; });
-
-        Q_ASSERT(it != udpTransports.end());
-        LocalTransport *lt = *it;
-
-        ObjectSessionWatcher watch(&sess);
-
-        removeLocalCandidates(lt->sock);
-        if (!watch.isValid())
-            return;
-
-        lt->sock->disconnect(this);
-        delete lt;
-
-        udpTransports.erase(it);
-
-        tryGatheringComplete();
-    }
-
     void lt_debugLine(const QString &line) { emit q->debugLine(line); }
 
     void tt_started()
diff --git a/src/irisnet/noncore/icelocaltransport.cpp b/src/irisnet/noncore/icelocaltransport.cpp
index 09b77f9b..dc8bcbc1 100644
--- a/src/irisnet/noncore/icelocaltransport.cpp
+++ b/src/irisnet/noncore/icelocaltransport.cpp
@@ -772,6 +772,13 @@ void IceLocalTransport::setDebugLevel(DebugLevel level)
         d->turn->setDebugLevel((TurnClient::DebugLevel)level);
 }
 
+void IceLocalTransport::changeThread(QThread *thread)
+{
+    if (d->pool)
+        d->pool->moveToThread(thread);
+    moveToThread(thread);
+}
+
 } // namespace XMPP
 
 #include "icelocaltransport.moc"
diff --git a/src/irisnet/noncore/icelocaltransport.h b/src/irisnet/noncore/icelocaltransport.h
index f6c599f5..03f56d36 100644
--- a/src/irisnet/noncore/icelocaltransport.h
+++ b/src/irisnet/noncore/icelocaltransport.h
@@ -82,6 +82,7 @@ class IceLocalTransport : public IceTransport, public QEnableSharedFromThis<IceL
     void       writeDatagram(int path, const QByteArray &buf, const QHostAddress &addr, int port) override;
     void       addChannelPeer(const QHostAddress &addr, int port) override;
     void       setDebugLevel(DebugLevel level) override;
+    void       changeThread(QThread *thread) override;
 
 signals:
     // may be emitted multiple times.
diff --git a/src/irisnet/noncore/icetransport.h b/src/irisnet/noncore/icetransport.h
index 6b83b11b..3abcf3ef 100644
--- a/src/irisnet/noncore/icetransport.h
+++ b/src/irisnet/noncore/icetransport.h
@@ -45,6 +45,7 @@ class IceTransport : public QObject {
     virtual void       addChannelPeer(const QHostAddress &addr, int port)                                 = 0;
 
     virtual void setDebugLevel(DebugLevel level) = 0;
+    virtual void changeThread(QThread *thread)   = 0;
 
 signals:
     void started();
diff --git a/src/irisnet/noncore/iceturntransport.cpp b/src/irisnet/noncore/iceturntransport.cpp
index 7d4848a8..93fd2b15 100644
--- a/src/irisnet/noncore/iceturntransport.cpp
+++ b/src/irisnet/noncore/iceturntransport.cpp
@@ -204,6 +204,12 @@ void IceTurnTransport::setDebugLevel(DebugLevel level)
     d->turn.setDebugLevel((TurnClient::DebugLevel)level);
 }
 
+void IceTurnTransport::changeThread(QThread *thread)
+{
+    d->turn.changeThread(thread);
+    moveToThread(thread);
+}
+
 } // namespace XMPP
 
 #include "iceturntransport.moc"
diff --git a/src/irisnet/noncore/iceturntransport.h b/src/irisnet/noncore/iceturntransport.h
index 9c909932..0769ea62 100644
--- a/src/irisnet/noncore/iceturntransport.h
+++ b/src/irisnet/noncore/iceturntransport.h
@@ -61,6 +61,7 @@ class IceTurnTransport : public IceTransport, public QEnableSharedFromThis<IceTu
     virtual void       writeDatagram(int path, const QByteArray &buf, const QHostAddress &addr, int port);
     virtual void       addChannelPeer(const QHostAddress &addr, int port);
     virtual void       setDebugLevel(DebugLevel level);
+    virtual void       changeThread(QThread *thread) override;
 
 private:
     class Private;
diff --git a/src/irisnet/noncore/turnclient.cpp b/src/irisnet/noncore/turnclient.cpp
index e8079a3a..e13907e4 100644
--- a/src/irisnet/noncore/turnclient.cpp
+++ b/src/irisnet/noncore/turnclient.cpp
@@ -965,6 +965,13 @@ void TurnClient::setDebugLevel(DebugLevel level)
     if (d->pool)
         d->pool->setDebugLevel((StunTransactionPool::DebugLevel)level);
 }
+
+void TurnClient::changeThread(QThread *thread)
+{
+    if (d->pool)
+        d->pool->moveToThread(thread);
+    moveToThread(thread);
+}
 } // namespace XMPP
 
 #include "turnclient.moc"
diff --git a/src/irisnet/noncore/turnclient.h b/src/irisnet/noncore/turnclient.h
index 2bf3fdc1..e1d4baf2 100644
--- a/src/irisnet/noncore/turnclient.h
+++ b/src/irisnet/noncore/turnclient.h
@@ -144,6 +144,7 @@ class TurnClient : public QObject {
     QString errorString() const;
 
     void setDebugLevel(DebugLevel level); // default DL_None
+    void changeThread(QThread *thread);
 
 signals:
     void connected(); // tcp connected

From 52b9839d9c37ddfcb10cd2e70d36e33ad3ddcd6d Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 6 May 2020 13:44:42 +0300
Subject: [PATCH 164/383] Cleanup ICE turn tcp pool only if set

---
 src/irisnet/noncore/turnclient.cpp | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/irisnet/noncore/turnclient.cpp b/src/irisnet/noncore/turnclient.cpp
index e13907e4..d7b4f11d 100644
--- a/src/irisnet/noncore/turnclient.cpp
+++ b/src/irisnet/noncore/turnclient.cpp
@@ -152,8 +152,11 @@ class TurnClient::Private : public QObject {
 
     void unsetPool()
     {
-        pool->disconnect(this);
-        pool.reset();
+        // in udp mode, we don't own the pool
+        if (!udp && pool) {
+            pool->disconnect(this);
+            pool.reset();
+        }
     }
 
     void cleanup()
@@ -161,10 +164,7 @@ class TurnClient::Private : public QObject {
         delete allocate;
         allocate = nullptr;
 
-        // in udp mode, we don't own the pool
-        if (!udp) {
-            unsetPool();
-        }
+        unsetPool();
 
         delete tls;
         tls = nullptr;
@@ -237,9 +237,7 @@ class TurnClient::Private : public QObject {
             delete allocate;
             allocate = nullptr;
 
-            // in udp mode, we don't own the pool
-            if (!udp)
-                unsetPool();
+            unsetPool();
 
             if (udp)
                 sess.defer(q, "closed");
@@ -806,9 +804,7 @@ private slots:
         delete allocate;
         allocate = nullptr;
 
-        // in udp mode, we don't own the pool
-        if (!udp)
-            unsetPool();
+        unsetPool();
 
         if (udp)
             emit q->closed();

From aff0100ba2ddae4e9dcc609e4ad719373feb504e Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 6 May 2020 14:13:04 +0300
Subject: [PATCH 165/383] Use qDebug instead of warning for s5b state message

To ease testing with QT_FATAL_WARNINGS
---
 src/xmpp/xmpp-im/jingle-s5b.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index eb4eb706..aaaaee76 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -984,7 +984,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
             // more local candidates are expected to be discovered
 
             if (q->_state != State::Connecting) { // if not started or already finished
-                qWarning("checkAndFinishNegotiation not finished: !connectionStarted || connection");
+                qDebug("checkAndFinishNegotiation not finished: !connectionStarted || connection");
                 return;
             }
 

From 7fb76f0a780e101db1d0c1903df35aa815584a68 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 6 May 2020 17:47:23 +0300
Subject: [PATCH 166/383] A little nonsense: avoid potentially unsafe ranged
 loops

---
 src/xmpp/xmpp-core/tlshandler.cpp | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/xmpp/xmpp-core/tlshandler.cpp b/src/xmpp/xmpp-core/tlshandler.cpp
index 9c7f8718..29ea491e 100644
--- a/src/xmpp/xmpp-core/tlshandler.cpp
+++ b/src/xmpp/xmpp-core/tlshandler.cpp
@@ -220,19 +220,22 @@ static bool matchesHostName(const QCA::Certificate &cert, const QString &host)
     if (!ipaddr.isEmpty()) // ip address
     {
         // check iPAddress
-        for (const QString &s : cert.subjectInfo().values(IPAddress)) {
+        const auto ipAddresses = cert.subjectInfo().values(IPAddress);
+        for (const QString &s : ipAddresses) {
             if (cert_match_ipaddress(s, ipaddr))
                 return true;
         }
 
         // check dNSName
-        for (const QString &s : cert.subjectInfo().values(DNS)) {
+        const auto dnsNames = cert.subjectInfo().values(DNS);
+        for (const QString &s : dnsNames) {
             if (cert_match_ipaddress(s, ipaddr))
                 return true;
         }
 
         // check commonName
-        for (const QString &s : cert.subjectInfo().values(CommonName)) {
+        const auto commonNames = cert.subjectInfo().values(CommonName);
+        for (const QString &s : commonNames) {
             if (cert_match_ipaddress(s, ipaddr))
                 return true;
         }
@@ -257,13 +260,15 @@ static bool matchesHostName(const QCA::Certificate &cert, const QString &host)
             return false;
 
         // check dNSName
-        for (const QString &s : cert.subjectInfo().values(DNS)) {
+        const auto dnsNames = cert.subjectInfo().values(DNS);
+        for (const QString &s : dnsNames) {
             if (cert_match_domain(s, name))
                 return true;
         }
 
         // check commonName
-        for (const QString &s : cert.subjectInfo().values(CommonName)) {
+        const auto commonNames = cert.subjectInfo().values(CommonName);
+        for (const QString &s : commonNames) {
             if (cert_match_domain(s, name))
                 return true;
         }
@@ -319,7 +324,8 @@ bool QCATLSHandler::certMatchesHostname()
 
     Jid host(d->host);
 
-    for (const QString &idOnXmppAddr : peerCert.primary().subjectInfo().values(QCA::XMPP)) {
+    const auto hosts = peerCert.primary().subjectInfo().values(QCA::XMPP);
+    for (const QString &idOnXmppAddr : hosts) {
         if (host.compare(Jid(idOnXmppAddr)))
             return true;
     }

From fa8c3f0eef6dd99f15657e1b799277c6774026fe Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Fri, 8 May 2020 20:08:15 +0300
Subject: [PATCH 167/383] Carefully handle nomination timeout without selected
 pairs

---
 src/irisnet/noncore/ice176.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index d06f4a9d..c5164adc 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -746,10 +746,20 @@ class Ice176::Private : public QObject {
             connect(timer, &QTimer::timeout, this, [this, componentId = pair->local->componentId]() {
                 if (state != Started && state != Nominating)
                     return; // likely user stopped or it's alreday active
+                Component &c = *findComponent(componentId);
+                if (c.stopped)
+                    return; // already queue signal likely
                 auto &selectedPair = findComponent(componentId)->selectedPair;
                 if (selectedPair)
                     return;
                 selectedPair = chooseSelectedPair(componentId);
+                if (!selectedPair) {
+                    qWarning("failed to find selected pair for previously nominated component. Candidates removed "
+                             "without ICE restart?");
+                    stop();
+                    emit q->error(ErrorGeneric);
+                    return;
+                }
                 cleanupButSelectedPair(componentId);
                 tryIceFinished();
             });
@@ -1301,6 +1311,7 @@ private slots:
         Q_ASSERT(it != components.end());
 
         it->stopped = true;
+        it->nominationTimer.reset();
 
         bool allStopped = true;
         for (const Component &c : components) {

From 6b621441a7ddbde9893e94c3d197b0fee097bded Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Fri, 8 May 2020 22:29:24 +0300
Subject: [PATCH 168/383] More logs and check on handling peer reflexive
 candidates

---
 src/irisnet/noncore/ice176.cpp | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index c5164adc..bfa581f1 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -397,22 +397,27 @@ class Ice176::Private : public QObject {
 
     // returns a pair is pairable or null
     QSharedPointer<CandidatePair> makeCandidatesPair(IceComponent::CandidateInfo::Ptr lc,
-                                                     IceComponent::CandidateInfo::Ptr rc)
+                                                     IceComponent::CandidateInfo::Ptr rc,
+                                                     bool                             allowProtoMismatch = false)
     {
         if (lc->componentId != rc->componentId)
             return {};
 
         // don't pair ipv4 with ipv6.  FIXME: is this right?
-        if (lc->addr.addr.protocol() != rc->addr.addr.protocol())
+        if (!allowProtoMismatch && lc->addr.addr.protocol() != rc->addr.addr.protocol()) {
+            qDebug("Skip building pair: %s - %s (protocol mismatch)", qPrintable(lc->addr), qPrintable(rc->addr));
             return {};
+        }
 
         // don't relay to localhost.  turnserver
         //   doesn't like it.  i don't know if this
         //   should qualify as a HACK or not.
         //   trying to relay to localhost is pretty
         //   stupid anyway
-        if (lc->type == IceComponent::RelayedType && getAddressScope(rc->addr.addr) == 0)
+        if (lc->type == IceComponent::RelayedType && getAddressScope(rc->addr.addr) == 0) {
+            qDebug("Skip building pair: %s - %s (relay to localhost)", qPrintable(lc->addr), qPrintable(rc->addr));
             return {};
+        }
 
         auto pair    = QSharedPointer<CandidatePair>::create();
         pair->local  = lc;
@@ -1039,26 +1044,30 @@ class Ice176::Private : public QObject {
             // so mapped address doesn't match with local candidate sending binding request.
             // gotta find/create one
             auto locIt = std::find_if(localCandidates.begin(), localCandidates.end(), [&](const auto &c) {
-                return c.info->base == mappedAddr || c.info->addr == mappedAddr;
+                return (c.info->base == mappedAddr || c.info->addr == mappedAddr)
+                    && c.info->componentId == component.id;
             });
             if (locIt == localCandidates.end()) {
                 // RFC8445 7.2.5.3.1.  Discovering Peer-Reflexive Candidates
                 // new peer-reflexive local candidate discovered
-                findComponent(pair->local->componentId)
-                    ->ic->addLocalPeerReflexiveCandidate(mappedAddr, pair->local, binding->priority());
+                component.ic->addLocalPeerReflexiveCandidate(mappedAddr, pair->local, binding->priority());
+                // find just inserted prflx candidate
                 locIt = std::find_if(localCandidates.begin(), localCandidates.end(),
-                                     [&](const auto &c) { return c.info->addr == mappedAddr; }); // just inserted
+                                     [&](const auto &c) { return c.info->addr == mappedAddr; });
                 Q_ASSERT(locIt != localCandidates.end());
                 // local candidate wasn't found, so it wasn't on the checklist  RFC8445 7.2.5.3.1.3
-                pair = makeCandidatesPair(locIt->info, pair->remote);
+                // allow v4/v6 proto mismatch in case NAT does magic
+                pair = makeCandidatesPair(locIt->info, pair->remote, true);
             } else {
                 // local candidate found. If it's a part of a pair on checklist, we have to add this pair to valid list,
                 // otherwise we have to create a new pair and add it to valid list
                 auto it = std::find_if(checkList.pairs.begin(), checkList.pairs.end(), [&](auto const &p) {
-                    return p->local->id == locIt->info->id && p->remote->addr == pair->remote->addr;
+                    return p->local->base == locIt->info->base && p->remote->addr == pair->remote->addr
+                        && p->local->componentId == locIt->info->componentId;
                 });
                 if (it == checkList.pairs.constEnd()) {
-                    pair = makeCandidatesPair(locIt->info, pair->remote);
+                    // allow v4/v6 proto mismatch in case NAT does magic
+                    pair = makeCandidatesPair(locIt->info, pair->remote, true);
                 } else {
                     pair = *it;
                     iceDebug("mapped address belongs to another pair on checklist %s", qPrintable(QString(*pair)));

From 546b32fd2ae542c0029faeb20022acca242ee3ea Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Fri, 8 May 2020 23:45:43 +0300
Subject: [PATCH 169/383] Less logs and send media even earlier

---
 src/irisnet/noncore/ice176.cpp | 47 +++++++++++++++++++++++++---------
 1 file changed, 35 insertions(+), 12 deletions(-)

diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index bfa581f1..41843be1 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -114,6 +114,9 @@ class Ice176::Private : public QObject {
         bool isTriggered             = false; // last scheduled check was a triggered check
         bool isTriggeredForNominated = false;
         bool finalNomination         = false;
+#ifdef ICE_DEBUG
+        bool logNew = false;
+#endif
 
         CandidatePairState state = CandidatePairState::PFrozen;
 
@@ -151,10 +154,11 @@ class Ice176::Private : public QObject {
         IceComponent *          ic              = nullptr;
         std::unique_ptr<QTimer> nominationTimer = std::unique_ptr<QTimer>();
         CandidatePair::Ptr      selectedPair;
-        bool                    localFinished = false;
-        bool                    hasValidPairs = false;
-        bool                    stopped       = false;
-        bool                    lowOverhead   = false;
+        bool                    localFinished     = false;
+        bool                    hasValidPairs     = false;
+        bool                    hasNominatedPairs = false;
+        bool                    stopped           = false;
+        bool                    lowOverhead       = false;
     };
 
     Ice176 *                                q;
@@ -436,7 +440,13 @@ class Ice176::Private : public QObject {
     // adds new pairs, sorts, prunes
     void addChecklistPairs(const QList<QSharedPointer<CandidatePair>> &pairs)
     {
-        iceDebug("%d pairs", pairs.count());
+#ifdef ICE_DEBUG
+        iceDebug("%d new pairs", pairs.count());
+        for (auto &p : pairs)
+            p->logNew = true;
+#endif
+        if (!pairs.count())
+            return;
 
         // combine pairs with existing, and sort
         checkList.pairs += pairs;
@@ -449,7 +459,10 @@ class Ice176::Private : public QObject {
         // pruning
         for (int n = 0; n < checkList.pairs.count(); ++n) {
             auto &pair = checkList.pairs[n];
-            iceDebug("%d, %s", pair->local->componentId, qPrintable(*pair));
+#ifdef ICE_DEBUG
+            if (pair->logNew)
+                iceDebug("%d, %s", pair->local->componentId, qPrintable(*pair));
+#endif
 
             for (int i = n - 1; i >= 0; --i) {
                 // RFC8445 says to use base only for reflexive. but base is set properly for host and relayed too.
@@ -469,9 +482,11 @@ class Ice176::Private : public QObject {
         while (checkList.pairs.count() > max_pairs)
             checkList.pairs.removeLast();
 #ifdef ICE_DEBUG
-        iceDebug("%d after pruning", checkList.pairs.count());
+        iceDebug("%d after pruning (just new below):", checkList.pairs.count());
         for (auto &p : checkList.pairs) {
-            iceDebug("%d, %s", p->local->componentId, qPrintable(*p));
+            if (p->logNew)
+                iceDebug("%d, %s", p->local->componentId, qPrintable(*p));
+            p->logNew = false;
         }
 #endif
     }
@@ -598,8 +613,10 @@ class Ice176::Private : public QObject {
             }
         }
 
-        addChecklistPairs(pairs);
+        if (!pairs.count())
+            return;
 
+        addChecklistPairs(pairs);
         if (!checkTimer.isActive())
             checkTimer.start();
     }
@@ -1088,6 +1105,10 @@ class Ice176::Private : public QObject {
         pair->isTriggeredForNominated = isTriggeredForNominated;
         pair->finalNomination         = finalNomination;
 
+        component.hasValidPairs = true;
+        if (isTriggeredForNominated || binding->useCandidate())
+            component.hasNominatedPairs = true;
+
         // mark all with same foundation as Waiting to prioritize them
         for (auto &p : checkList.pairs)
             if (p->state == PFrozen && p->foundation == pair->foundation)
@@ -1114,10 +1135,12 @@ class Ice176::Private : public QObject {
 #endif
         }
 
-        if (!readyToSendMedia && (localFeatures & NotNominatedData) && (remoteFeatures & NotNominatedData)) {
+        if (!readyToSendMedia) {
+            bool allowNotNominatedData = (localFeatures & NotNominatedData) && (remoteFeatures & NotNominatedData);
             // if both follow RFC8445 and allow to send data on any valid pair
-            findComponent(pair->local->componentId)->hasValidPairs = true;
-            if (std::all_of(components.begin(), components.end(), [](auto &c) { return c.hasValidPairs; })) {
+            if (std::all_of(components.begin(), components.end(), [&](auto &c) {
+                    return (allowNotNominatedData && c.hasValidPairs) || c.hasNominatedPairs;
+                })) {
                 onReadyToSendMedia();
             }
         }

From a18454a00f3939c22b7f1b2632ba6cc75e10428d Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sat, 9 May 2020 00:01:47 +0300
Subject: [PATCH 170/383] Fixed crash in debug mode on output of readyForMedia
 components

---
 src/irisnet/noncore/ice176.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index 41843be1..a882df07 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -153,7 +153,7 @@ class Ice176::Private : public QObject {
         int                     id              = 0;
         IceComponent *          ic              = nullptr;
         std::unique_ptr<QTimer> nominationTimer = std::unique_ptr<QTimer>();
-        CandidatePair::Ptr      selectedPair;
+        CandidatePair::Ptr      selectedPair; // final selected pair. won't be changed
         bool                    localFinished     = false;
         bool                    hasValidPairs     = false;
         bool                    hasNominatedPairs = false;
@@ -1027,8 +1027,11 @@ class Ice176::Private : public QObject {
 #ifdef ICE_DEBUG
         iceDebug("Ready to send media!");
         for (auto &c : components) {
-            iceDebug("  C%d: selected pair: %s (base: %s)", c.id, qPrintable(*c.selectedPair),
-                     qPrintable(c.selectedPair->local->base));
+            if (c.selectedPair)
+                iceDebug("  C%d: selected pair: %s (base: %s)", c.id, qPrintable(*c.selectedPair),
+                         qPrintable(c.selectedPair->local->base));
+            else
+                iceDebug("  C%d: any pair from valid list", c.id);
         }
 #endif
         readyToSendMedia = true;

From ce6fa724f1e7ccfe6b4f4ecce05b39f49419453e Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sat, 9 May 2020 15:41:15 +0300
Subject: [PATCH 171/383] Keep nominating status per component but not global

---
 src/irisnet/noncore/ice176.cpp | 162 ++++++++++++++++++---------------
 tools/icetunnel/main.cpp       |  26 ++----
 2 files changed, 96 insertions(+), 92 deletions(-)

diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index a882df07..bcf6dea1 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -90,11 +90,10 @@ class Ice176::Private : public QObject {
     // note, Nominating state is skipped when aggressive nomination is enabled.
     enum State {
         Stopped,
-        Starting,   // preparing local candidates right after start() call
-        Started,    // local candidates ready. ready for pairing with remote
-        Nominating, // for ice2 it's a state when we decided to nominate one of active pairs
-        Active,     // all components have a nominated pair and media transferred over them
-        Stopping    // when received a command from the user to stop
+        Starting, // preparing local candidates right after start() call
+        Started,  // local candidates ready. ready for pairing with remote
+        Active,   // all components have a nominated pair and media transferred over them
+        Stopping  // when received a command from the user to stop
     };
 
     enum CandidatePairState { PWaiting, PInProgress, PSucceeded, PFailed, PFrozen };
@@ -159,6 +158,9 @@ class Ice176::Private : public QObject {
         bool                    hasNominatedPairs = false;
         bool                    stopped           = false;
         bool                    lowOverhead       = false;
+
+        // initiator is nominating the final pair (will be set as `selectePair` when ready)
+        bool nominating = false; // with aggressive nomination it's always false
     };
 
     Ice176 *                                q;
@@ -326,7 +328,7 @@ class Ice176::Private : public QObject {
 
     void stop()
     {
-        Q_ASSERT(state == Starting || state == Started || state == Nominating || state == Active);
+        Q_ASSERT(state == Starting || state == Started || state == Active);
 
         state = Stopping;
         remoteGatheringCompleteTimer.reset();
@@ -702,11 +704,30 @@ class Ice176::Private : public QObject {
         return it == checkList.validPairs.end() ? CandidatePair::Ptr() : *it;
     }
 
+    void setSelectedPair(int componentId)
+    {
+        auto &selectedPair = findComponent(componentId)->selectedPair;
+        if (selectedPair)
+            return;
+        selectedPair = chooseSelectedPair(componentId);
+        if (!selectedPair) {
+            qWarning("failed to find selected pair for previously nominated component. Candidates removed "
+                     "without ICE restart?");
+            stop();
+            emit q->error(ErrorGeneric);
+            return;
+        }
+        cleanupButSelectedPair(componentId);
+        emit q->componentReady(componentId - 1);
+        tryIceFinished();
+    }
+
     bool canHaveMoreRemoteCandidates() const { return remoteGatheringComplete || !(remoteFeatures & Trickle); }
 
     void tryNominateSelectedPair(int componentId)
     {
-        if (mode != Initiator || state != Started || checkList.validPairs.isEmpty())
+        auto &c = *findComponent(componentId);
+        if (mode != Initiator || state != Started || checkList.validPairs.isEmpty() || c.nominating)
             return;
         auto pair = chooseSelectedPair(componentId);
         if (!pair)
@@ -726,7 +747,7 @@ class Ice176::Private : public QObject {
                 return; // either till checked or remote gathering timeout
             }
         }
-        state                 = Nominating;
+        c.nominating          = true;
         pair->finalNomination = true;
         iceDebug("Nominating valid pair: %s", qPrintable(*pair));
         checkList.triggeredPairs.prepend(pair);
@@ -736,25 +757,30 @@ class Ice176::Private : public QObject {
     {
         if (!std::all_of(components.begin(), components.end(), [](auto &c) { return c.selectedPair != nullptr; }))
             return;
-        if (!readyToSendMedia) {
-            onReadyToSendMedia();
+        tryReadyToSendMedia();
+#ifdef ICE_DEBUG
+        iceDebug("ICE selected final pairs!");
+        for (auto &c : components) {
+            iceDebug("  C%d: %s", c.id, qPrintable(*c.selectedPair));
         }
+        iceDebug("Signalling iceFinished now");
+#endif
         state = Active;
         emit q->iceFinished();
     }
 
     // execute when new nominated pair
-    void tryComponentSuccess(QSharedPointer<CandidatePair> &pair)
+    void onComponentNominatedPair(QSharedPointer<CandidatePair> &pair)
     {
-        Component &c      = *findComponent(pair->local->componentId);
-        pair->isNominated = true;
-        if (c.lowOverhead) {
-            iceDebug("component is flagged for low overhead.  setting up for %s", qPrintable(*pair));
-            auto &cc = localCandidates[findLocalCandidate(pair->local->addr.addr, pair->local->addr.port)];
-            c.ic->flagPathAsLowOverhead(cc.id, pair->remote->addr.addr, pair->remote->addr.port);
-        }
+        Component &c        = *findComponent(pair->local->componentId);
+        pair->isNominated   = true;
+        c.hasNominatedPairs = true;
 
-        emit q->componentReady(pair->local->componentId - 1);
+        // if (c.lowOverhead) { // commented out since we need turn permissions for all components
+        iceDebug("component is flagged for low overhead.  setting up for %s", qPrintable(*pair));
+        auto &cc = localCandidates[findLocalCandidate(pair->local->addr.addr, pair->local->addr.port)];
+        c.ic->flagPathAsLowOverhead(cc.id, pair->remote->addr.addr, pair->remote->addr.port);
+        //}
 
         bool agrNom = (mode == Initiator ? localFeatures : remoteFeatures) & AggressiveNomination;
         if (agrNom) {
@@ -766,30 +792,16 @@ class Ice176::Private : public QObject {
             timer->setSingleShot(true);
             timer->setInterval(agressiveNominationTimeout);
             connect(timer, &QTimer::timeout, this, [this, componentId = pair->local->componentId]() {
-                if (state != Started && state != Nominating)
+                if (state != Started)
                     return; // likely user stopped or it's alreday active
                 Component &c = *findComponent(componentId);
                 if (c.stopped)
                     return; // already queue signal likely
-                auto &selectedPair = findComponent(componentId)->selectedPair;
-                if (selectedPair)
-                    return;
-                selectedPair = chooseSelectedPair(componentId);
-                if (!selectedPair) {
-                    qWarning("failed to find selected pair for previously nominated component. Candidates removed "
-                             "without ICE restart?");
-                    stop();
-                    emit q->error(ErrorGeneric);
-                    return;
-                }
-                cleanupButSelectedPair(componentId);
-                tryIceFinished();
+                setSelectedPair(componentId);
             });
             timer->start();
         } else {
-            c.selectedPair = chooseSelectedPair(pair->local->componentId);
-            cleanupButSelectedPair(pair->local->componentId);
-            tryIceFinished();
+            setSelectedPair(pair->local->componentId);
         }
     }
 
@@ -801,6 +813,7 @@ class Ice176::Private : public QObject {
             return; // if we have something to gather then we still have a chance for success
         }
 
+        // TODO implement ICE-PAC
         if (std::find_if(checkList.pairs.begin(), checkList.pairs.end(),
                          [&](auto const &p) mutable {
                              return p->local->componentId == componentId
@@ -828,7 +841,8 @@ class Ice176::Private : public QObject {
                 // Check nominated here?
                 iceDebug("Don't do triggered check since pair is already in success state");
                 if (mode == Responder && !pair->isNominated && nominated) {
-                    tryComponentSuccess(pair);
+                    onComponentNominatedPair(pair);
+                    tryReadyToSendMedia();
                 }
                 return; // nothing todo. rfc 8445 7.3.1.4
             }
@@ -1022,8 +1036,17 @@ class Ice176::Private : public QObject {
         return id;
     }
 
-    void onReadyToSendMedia()
+    void tryReadyToSendMedia()
     {
+        if (readyToSendMedia) {
+            return;
+        }
+        bool allowNotNominatedData = (localFeatures & NotNominatedData) && (remoteFeatures & NotNominatedData);
+        // if both follow RFC8445 and allow to send data on any valid pair
+        if (!std::all_of(components.begin(), components.end(),
+                         [&](auto &c) { return (allowNotNominatedData && c.hasValidPairs) || c.hasNominatedPairs; })) {
+            return;
+        }
 #ifdef ICE_DEBUG
         iceDebug("Ready to send media!");
         for (auto &c : components) {
@@ -1108,16 +1131,23 @@ class Ice176::Private : public QObject {
         pair->isTriggeredForNominated = isTriggeredForNominated;
         pair->finalNomination         = finalNomination;
 
-        component.hasValidPairs = true;
-        if (isTriggeredForNominated || binding->useCandidate())
+        bool signalCompValidPairs = false;
+        if (!component.hasValidPairs) {
+            component.hasValidPairs = true;
+            signalCompValidPairs    = true;
+        }
+        bool signalCompNominated = false;
+        if (!component.hasNominatedPairs && (isTriggeredForNominated || binding->useCandidate())) {
             component.hasNominatedPairs = true;
+            signalCompNominated         = true;
+        }
 
         // mark all with same foundation as Waiting to prioritize them
         for (auto &p : checkList.pairs)
             if (p->state == PFrozen && p->foundation == pair->foundation)
                 p->state = PWaiting;
 
-        if (!component.selectedPair) {
+        if (!component.selectedPair) { // no final pair yet
             // find position to insert in sorted list of valid pairs
             auto insIt = std::upper_bound(
                 checkList.validPairs.begin(), checkList.validPairs.end(), pair, [](auto &item, auto &toins) {
@@ -1138,15 +1168,9 @@ class Ice176::Private : public QObject {
 #endif
         }
 
-        if (!readyToSendMedia) {
-            bool allowNotNominatedData = (localFeatures & NotNominatedData) && (remoteFeatures & NotNominatedData);
-            // if both follow RFC8445 and allow to send data on any valid pair
-            if (std::all_of(components.begin(), components.end(), [&](auto &c) {
-                    return (allowNotNominatedData && c.hasValidPairs) || c.hasNominatedPairs;
-                })) {
-                onReadyToSendMedia();
-            }
-        }
+        if (signalCompNominated || signalCompValidPairs) {
+            tryReadyToSendMedia();
+        } // else nothing changed so nothing to try
 
         if (mode == Ice176::Initiator) {
             if (!binding->useCandidate()) {
@@ -1159,16 +1183,12 @@ class Ice176::Private : public QObject {
                 return;
         }
 
-        // check if component already has nominated pair
-        auto it = std::find_if(checkList.pairs.begin(), checkList.pairs.end(), [&](auto const &p) {
-            return p->local->componentId == pair->local->componentId && p->isNominated;
-        });
-
-        if (it != checkList.pairs.end()) {
+        // we have nomination success.
+        if (!signalCompNominated) {
             iceDebug("component %d already active, not signalling", pair->local->componentId);
             return;
         }
-        tryComponentSuccess(pair);
+        onComponentNominatedPair(pair);
     }
 
     void handlePairBindingError(CandidatePair::Ptr pair, XMPP::StunBinding::Error)
@@ -1187,24 +1207,22 @@ class Ice176::Private : public QObject {
             return; // TODO hadle keep-alive binding properly
         }
 
-        if (state == Started) {
-            // oops, already-started ICE reports errors. keep-alive checks?
-            if (pair->isNominated) {
-                iceDebug("check failed on nominated candidate. set ICE status to failed");
-                stop();
-                emit q->error(ErrorDisconnected);
-            }
-            return;
-        }
-        if (state == Nominating) {
-            if (pair->finalNomination) {
-                iceDebug("Failed to nominate selected pair. set ICE status to failed");
-                stop();
-                emit q->error(ErrorDisconnected);
-            }
+        auto &c = *findComponent(pair->local->componentId);
+        if ((c.nominating && pair->finalNomination)
+            || (!(remoteFeatures & AggressiveNomination) && pair->isTriggeredForNominated)) {
+
+            if (pair->isTriggeredForNominated)
+                qInfo("Failed to do triggered check for nominated selectedPair. set ICE status to failed");
+            else
+                qInfo("Failed to nominate selected pair. set ICE status to failed");
+            stop();
+            emit q->error(ErrorDisconnected);
             return;
         }
 
+        // if not nominating but use-candidate then I'm initiator with aggressive nomination. It's Ok to fail.
+        // if nominating but not use-candidate then I'm initiator and something not important failed
+
         tryComponentFailed(pair->local->componentId);
     }
 
diff --git a/tools/icetunnel/main.cpp b/tools/icetunnel/main.cpp
index 67627d40..a375e75b 100644
--- a/tools/icetunnel/main.cpp
+++ b/tools/icetunnel/main.cpp
@@ -481,12 +481,16 @@ public slots:
         connect(ice, &XMPP::Ice176::localCandidatesReady, this,
                 [this](const QList<XMPP::Ice176::Candidate> &cs) { localCandidates += cs; });
         connect(ice, &XMPP::Ice176::localGatheringComplete, this, &App::ice_localGatheringComplete);
-        connect(ice, SIGNAL(componentReady(int)), SLOT(ice_componentReady(int)));
+        connect(ice, &XMPP::Ice176::componentReady, this, [this](int componentIndex) {
+            printf("Channel %d ready.\n", componentIndex);
+            channels[componentIndex].ready = true;
+        });
+
         connect(ice, SIGNAL(readyRead(int)), SLOT(ice_readyRead(int)));
         connect(ice, SIGNAL(datagramsWritten(int, int)), SLOT(ice_datagramsWritten(int, int)));
         connect(ice, &XMPP::Ice176::readyToSendMedia, this, []() { printf("ICE ready to send media.\n"); });
         connect(ice, &XMPP::Ice176::iceFinished, this,
-                []() { printf("ICE negotiation has finished and media stream is active now.\n"); });
+                []() { printf("ICE negotiation has finished and media stream is active now!\n"); });
 
         // set up local ports for forwarding
         for (int n = 0; n < opt_channels; ++n) {
@@ -687,24 +691,6 @@ private slots:
         connect(reader, SIGNAL(error()), SLOT(reader_error()));
     }
 
-    void ice_componentReady(int index)
-    {
-        printf("Channel %d ready.\n", index);
-        channels[index].ready = true;
-
-        bool allReady = true;
-        for (int n = 0; n < channels.count(); ++n) {
-            if (!channels[n].ready) {
-                allReady = false;
-                break;
-            }
-        }
-
-        if (allReady) {
-            printf("Tunnel established!\n");
-        }
-    }
-
     void ice_readyRead(int componentIndex)
     {
         while (ice->hasPendingDatagrams(componentIndex)) {

From 777aaf0877de9ddc981e12733adabf656b97ba58 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 10 May 2020 10:14:36 +0300
Subject: [PATCH 172/383] fixed crash on invalid jingle application

---
 src/xmpp/xmpp-im/jingle-session.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/xmpp/xmpp-im/jingle-session.cpp b/src/xmpp/xmpp-im/jingle-session.cpp
index beaf60d6..c0f96136 100644
--- a/src/xmpp/xmpp-im/jingle-session.cpp
+++ b/src/xmpp/xmpp-im/jingle-session.cpp
@@ -409,6 +409,8 @@ namespace XMPP { namespace Jingle {
                                 nullptr };
             }
             QScopedPointer<Application> app(appPad->manager()->startApplication(appPad, c.name, c.creator, c.senders));
+            if (!app)
+                return result { Unparsed, Reason::Success, nullptr };
 
             auto descErr = app->setRemoteOffer(descriptionEl);
             if (descErr == Application::IncompatibleParameters) {

From 78f14320f5df5658be91a8559a7e5c47cc35e5ae Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 10 May 2020 19:35:57 +0300
Subject: [PATCH 173/383] Be more tolerant to invalid Jingle transports
 implementations

---
 src/xmpp/xmpp-im/jingle-application.cpp | 21 +++---
 src/xmpp/xmpp-im/jingle-s5b.cpp         | 98 +++++++++++++++++--------
 src/xmpp/xmpp-im/jingle-s5b.h           |  1 +
 src/xmpp/xmpp-im/jingle-session.cpp     | 43 +++++------
 src/xmpp/xmpp-im/jingle-transport.h     |  2 +
 src/xmpp/xmpp-im/jingle.h               |  5 +-
 6 files changed, 104 insertions(+), 66 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-application.cpp b/src/xmpp/xmpp-im/jingle-application.cpp
index 5b3cfa40..22cabb99 100644
--- a/src/xmpp/xmpp-im/jingle-application.cpp
+++ b/src/xmpp/xmpp-im/jingle-application.cpp
@@ -20,6 +20,7 @@
 #include "jingle-application.h"
 #include "jingle-session.h"
 #include "xmpp_client.h"
+#include "xmpp_task.h"
 
 namespace XMPP { namespace Jingle {
     //----------------------------------------------------------------------------
@@ -150,9 +151,10 @@ namespace XMPP { namespace Jingle {
             contentEl.appendChild(transportEl);
 
             setState(State::Unacked);
-            return OutgoingUpdate { updates, [this, transportCB](bool success) {
-                                       transportCB(success);
-                                       setState(State::Pending);
+            return OutgoingUpdate { updates, [this, transportCB](Task *task) {
+                                       transportCB(task);
+                                       if (task->success())
+                                           setState(State::Pending);
                                    } };
 
         case Action::ContentAccept:
@@ -161,9 +163,10 @@ namespace XMPP { namespace Jingle {
             contentEl.appendChild(transportEl);
 
             setState(State::Unacked);
-            return OutgoingUpdate { updates, [this, transportCB](bool success) {
-                                       transportCB(success);
-                                       setState(State::Connecting);
+            return OutgoingUpdate { updates, [this, transportCB](Task *task) {
+                                       transportCB(task);
+                                       if (task->success())
+                                           setState(State::Connecting);
                                    } };
         case Action::TransportInfo:
             Q_ASSERT(_transport->hasUpdates());
@@ -189,13 +192,13 @@ namespace XMPP { namespace Jingle {
         QDomElement      transportEl;
         OutgoingUpdateCB transportCB;
         std::tie(transportEl, transportCB) = _transport->takeOutgoingUpdate();
-        auto wrapCB = [this, tr = _transport.toWeakRef(), cb = std::move(transportCB)](bool success) {
+        auto wrapCB = [this, tr = _transport.toWeakRef(), cb = std::move(transportCB)](Task *task) {
             auto transport = tr.lock();
             if (transport && cb)
-                cb(success);
+                cb(task);
             if (_pendingTransportReplace == PendingTransportReplace::NeedAck) {
                 _pendingTransportReplace
-                    = success ? PendingTransportReplace::InProgress : PendingTransportReplace::None;
+                    = task->success() ? PendingTransportReplace::InProgress : PendingTransportReplace::None;
                 emit updated();
             }
         };
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index aaaaee76..f81ff2bf 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -545,6 +545,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
     void Candidate::deleteSocksClient()
     {
         if (d->socksClient) {
+            qDebug("deleting socks client %p", d->socksClient);
             d->socksClient->disconnect();
             delete d->socksClient;
             d->socksClient = nullptr;
@@ -553,6 +554,8 @@ namespace XMPP { namespace Jingle { namespace S5B {
 
     TcpPortServer::Ptr Candidate::server() const { return d->server.staticCast<TcpPortServer>(); }
 
+    bool Candidate::isConnected() const { return d->socksClient != nullptr; }
+
     bool Candidate::operator==(const Candidate &other) const { return d.data() == other.d.data(); }
 
     class Transport::Private {
@@ -852,8 +855,12 @@ namespace XMPP { namespace Jingle { namespace S5B {
                 if (remoteUsedCandidate) {
                     if (localUsedCandidate.priority() == remoteUsedCandidate.priority()) {
                         if (q->_pad->session()->role() == Origin::Initiator) {
+                            qDebug("Both sides have condidate-used with same priority. Our(inititator) selection is "
+                                   "preferred");
                             return remoteUsedCandidate;
                         }
+                        qDebug("Both sides have condidate-used with same priority. Remote(initiator) selection is "
+                               "preferred");
                         return localUsedCandidate;
                     }
                     return localUsedCandidate.priority() > remoteUsedCandidate.priority() ? localUsedCandidate
@@ -1189,7 +1196,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
                  ce             = ce.nextSiblingElement(candidateTag)) {
                 Candidate c(q, ce);
                 if (!c) {
-                    throw std::runtime_error("failed to parse incoming candidate");
+                    throw Stanza::Error(Stanza::Error::Cancel, Stanza::Error::BadRequest);
                 }
                 qDebug("new remote candidate: %s", qPrintable(c.toString()));
                 remoteCandidates.insert(c.cid(), c); // TODO check for collisions!
@@ -1210,9 +1217,14 @@ namespace XMPP { namespace Jingle { namespace S5B {
             if (!el.isNull()) {
                 auto cUsed = localCandidates.value(el.attribute(QStringLiteral("cid")));
                 if (!cUsed) {
-                    throw std::runtime_error("failed to find incoming candidate-used candidate");
+                    throw Stanza::Error(Stanza::Error::Cancel, Stanza::Error::ItemNotFound,
+                                        "failed to find incoming candidate-used candidate");
                 }
                 if (cUsed.state() == Candidate::Pending) {
+                    if (!cUsed.isConnected()) {
+                        throw Stanza::Error(Stanza::Error::Cancel, Stanza::Error::NotAcceptable,
+                                            "incoming candidate-used refers a candidate w/o active socks connection");
+                    }
                     cUsed.setState(Candidate::Accepted);
                     localUsedCandidate = cUsed;
                     updateMinimalPriorityOnConnected();
@@ -1253,7 +1265,8 @@ namespace XMPP { namespace Jingle { namespace S5B {
             if (!el.isNull()) {
                 QString cid = el.attribute(QStringLiteral("cid"));
                 if (cid.isEmpty()) {
-                    throw std::runtime_error("failed to find incoming activated candidate");
+                    throw Stanza::Error(Stanza::Error::Cancel, Stanza::Error::ItemNotFound,
+                                        "failed to find incoming activated candidate");
                 }
                 auto c = remoteUsedCandidate;
                 if (!(c.cid() == cid && c.type() == Candidate::Proxy && c.state() == Candidate::Accepted)) {
@@ -1273,7 +1286,8 @@ namespace XMPP { namespace Jingle { namespace S5B {
             if (!el.isNull()) {
                 auto c = localCandidates.value(el.attribute(QStringLiteral("cid")));
                 if (!c) {
-                    throw std::runtime_error("failed to find incoming proxy-error candidate");
+                    throw Stanza::Error(Stanza::Error::Cancel, Stanza::Error::ItemNotFound,
+                                        "failed to find incoming proxy-error candidate");
                 }
                 if (c != localUsedCandidate || c.state() != Candidate::Accepted) {
                     qDebug("Received <proxy-error> on a candidate in an inappropriate state. Ignored.");
@@ -1404,8 +1418,9 @@ namespace XMPP { namespace Jingle { namespace S5B {
                 }
                 return true;
             }
-        } catch (std::runtime_error &e) {
-            qWarning("Transport updated failed: %s", e.what());
+        } catch (XMPP::Stanza::Error &e) {
+            qWarning("Transport updated failed: %s", qPrintable(e.toString()));
+            _lastError = e;
             return false;
         }
 
@@ -1425,15 +1440,23 @@ namespace XMPP { namespace Jingle { namespace S5B {
             return upd;
         }
 
-        auto makeUpdate = [&](QDomElement tel, std::function<void()> cb = std::function<void()>()) {
+        auto makeUpdate = [&](QDomElement tel, bool expectedSuccess = false,
+                              std::function<void(Task *)> cb = std::function<void(Task *)>()) {
             d->waitingAck = true;
-            return OutgoingTransportInfoUpdate { tel, [this, cb, trptr = QPointer<Transport>(d->q)](bool success) {
-                                                    if (!success || !trptr)
-                                                        return;
-                                                    d->waitingAck = false;
-                                                    if (cb)
-                                                        cb();
-                                                } };
+            return OutgoingTransportInfoUpdate { tel,
+                                                 [this, cb, expectedSuccess,
+                                                  trptr = QPointer<Transport>(d->q)](Task *task) {
+                                                     if (!trptr)
+                                                         return;
+                                                     d->waitingAck = false;
+                                                     if (expectedSuccess && !task->success()) {
+                                                         _state = State::Finished;
+                                                         d->localCandidates.clear();
+                                                         d->remoteCandidates.clear();
+                                                         emit failed();
+                                                     } else if (cb)
+                                                         cb(task);
+                                                 } };
         };
 
         auto doc = _pad.staticCast<Pad>()->session()->manager()->client()->doc();
@@ -1477,15 +1500,25 @@ namespace XMPP { namespace Jingle { namespace S5B {
                 tel.setAttribute(QStringLiteral("dstaddr"), dstaddr);
             }
             if (!candidatesToSend.isEmpty()) {
-                upd = makeUpdate(tel, [this, candidatesToSend, initial]() mutable {
-                    if (initial) {
-                        _state = _creator == _pad->session()->role() ? State::Pending : State::Accepted;
-                    }
-                    for (auto &c : candidatesToSend) {
-                        if (c.state() == Candidate::Unacked) {
-                            c.setState(Candidate::Pending);
-                            qDebug("ack: sending local candidate: cid=%s", qPrintable(c.cid()));
+                upd = makeUpdate(tel, false, [this, candidatesToSend, initial](Task *jt) mutable {
+                    if (jt->success()) {
+                        if (initial) {
+                            _state = _creator == _pad->session()->role() ? State::Pending : State::Accepted;
+                        }
+                        for (auto &c : candidatesToSend) {
+                            if (c.state() == Candidate::Unacked) {
+                                c.setState(Candidate::Pending);
+                                qDebug("ack: remote side accepted local candidate: cid=%s", qPrintable(c.cid()));
+                            }
                         }
+                    } else {
+                        for (auto &c : candidatesToSend) {
+                            if (c.state() == Candidate::Unacked) {
+                                c.setState(Candidate::Discarded);
+                                qDebug("ack: remote side discarded local candidate: cid=%s", qPrintable(c.cid()));
+                            }
+                        }
+                        d->updateMinimalPriorityOnConnected();
                     }
                     d->checkAndFinishNegotiation();
                 });
@@ -1505,7 +1538,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
                 el.setAttribute(QStringLiteral("cid"), c.cid());
                 c.setState(Candidate::Unacked);
 
-                upd = makeUpdate(tel, [this, c]() mutable {
+                upd = makeUpdate(tel, true, [this, c](Task *) mutable {
                     if (c.state() == Candidate::Unacked) {
                         c.setState(Candidate::Accepted);
                         qDebug("ack: sending candidate-used: cid=%s", qPrintable(c.cid()));
@@ -1523,7 +1556,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
             qDebug("sending candidate-error");
             // we are here because all remote are already in Discardd state
             tel.appendChild(doc->createElement(QStringLiteral("candidate-error")));
-            upd = makeUpdate(tel, [this]() mutable {
+            upd = makeUpdate(tel, true, [this](Task *) mutable {
                 d->localReportedCandidateError = true;
                 d->checkAndFinishNegotiation();
             });
@@ -1534,7 +1567,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
                 qDebug("sending activated: cid=%s", qPrintable(cand.cid()));
                 auto el = tel.appendChild(doc->createElement(QStringLiteral("activated"))).toElement();
                 el.setAttribute(QStringLiteral("cid"), cand.cid());
-                upd = makeUpdate(tel);
+                upd = makeUpdate(tel, true);
             }
         } else if (d->pendingActions & Private::ProxyError) {
             // we send proxy error only for local proxy
@@ -1543,10 +1576,10 @@ namespace XMPP { namespace Jingle { namespace S5B {
                 auto cand = d->localUsedCandidate;
                 tel.appendChild(doc->createElement(QStringLiteral("proxy-error")));
                 qDebug("sending proxy error: cid=%s", qPrintable(cand.cid()));
-                upd = makeUpdate(tel, [this, cand]() mutable {
+                upd = makeUpdate(tel, true, [this, cand](Task *task) mutable {
                     qDebug("ack: sending proxy error: cid=%s", qPrintable(cand.cid()));
-                    if (cand.state() != Candidate::Accepted || d->localUsedCandidate != cand) {
-                        return; // seems like state was changed while we was waiting for an ack
+                    if ((cand.state() != Candidate::Accepted || d->localUsedCandidate != cand) && task->success()) {
+                        return; // seems like state was changed while we were waiting for an ack
                     }
                     cand.setState(Candidate::Discarded);
                     d->localUsedCandidate = Candidate();
@@ -1558,7 +1591,14 @@ namespace XMPP { namespace Jingle { namespace S5B {
             }
         } else {
             qDebug("sending empty transport-info");
-            upd = makeUpdate(tel, [this, initial]() mutable {
+            upd = makeUpdate(tel, false, [this, initial](Task *jt) mutable {
+                if (!jt->success()) {
+                    if (initial) {
+                        _state = State::Finished;
+                        emit failed();
+                    } else
+                        qWarning("Ignored failed IQ response");
+                }
                 if (initial) {
                     _state = _creator == _pad->session()->role() ? State::Pending : State::Accepted;
                 }
diff --git a/src/xmpp/xmpp-im/jingle-s5b.h b/src/xmpp/xmpp-im/jingle-s5b.h
index 4daf38f0..b00d844b 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.h
+++ b/src/xmpp/xmpp-im/jingle-s5b.h
@@ -112,6 +112,7 @@ namespace Jingle { namespace S5B {
         SocksClient *      takeSocksClient();
         void               deleteSocksClient();
         TcpPortServer::Ptr server() const;
+        bool               isConnected() const;
 
         bool        operator==(const Candidate &other) const;
         inline bool operator!=(const Candidate &other) const { return !(*this == other); }
diff --git a/src/xmpp/xmpp-im/jingle-session.cpp b/src/xmpp/xmpp-im/jingle-session.cpp
index c0f96136..b2acb07b 100644
--- a/src/xmpp/xmpp-im/jingle-session.cpp
+++ b/src/xmpp/xmpp-im/jingle-session.cpp
@@ -114,7 +114,7 @@ namespace XMPP { namespace Jingle {
         }
 
         void sendJingle(Action action, QList<QDomElement> update,
-                        std::function<void(bool)> callback = std::function<void(bool)>())
+                        std::function<void(JT *)> callback = std::function<void(JT *)>())
         {
             QDomDocument &doc = *manager->client()->doc();
             Jingle        jingle(action, sid);
@@ -135,17 +135,12 @@ namespace XMPP { namespace Jingle {
             QObject::connect(jt, &JT::finished, q, [jt, jingle, callback, this]() {
                 waitingAck = false;
                 if (callback) {
-                    callback(jt->success());
+                    callback(jt);
                 }
-                if (jt->success()) {
-                    planStep();
-                } else {
+                if (!jt->success()) {
                     lastError = jt->error();
-                    if (ErrorUtil::jingleCondition(lastError) != ErrorUtil::TieBreak)
-                        setSessionFinished();
-                    else
-                        planStep();
                 }
+                planStep();
             });
             waitingAck = true;
             jt->go(true);
@@ -187,12 +182,7 @@ namespace XMPP { namespace Jingle {
                 auto elements = std::get<0>(updates);
                 auto cb       = std::get<1>(updates);
                 outgoingUpdates.erase(it);
-                sendJingle(action, elements, [this, cb](bool success) {
-                    if (cb) {
-                        cb(success);
-                    }
-                    planStep();
-                });
+                sendJingle(action, elements, cb);
                 return;
             }
 
@@ -257,16 +247,15 @@ namespace XMPP { namespace Jingle {
                     }
                 }
                 state = State::Unacked;
-                sendJingle(actionToSend, contents, [this, acceptApps, finalState](bool success) {
-                    if (!success)
-                        return; // TODO any error means session error. but for content-add error handling has to be
-                                // moved out of sendJingle
+                sendJingle(actionToSend, contents, [this, acceptApps, finalState](JT *jt) {
+                    if (!jt->success())
+                        return;
                     state = finalState;
                     for (const auto &h : acceptApps) {
                         auto app      = std::get<0>(h);
                         auto callback = std::get<1>(h);
                         if (app) {
-                            callback(true);
+                            callback(jt);
                             if (role == Origin::Responder) {
                                 app->start();
                             }
@@ -290,10 +279,9 @@ namespace XMPP { namespace Jingle {
                 if (!el.isNull()) {
                     updateXml.append(el);
                     // we can send session-info for just one application. so stop processing
-                    sendJingle(Action::SessionInfo, updateXml, [this](bool success) {
-                        if (!success)
+                    sendJingle(Action::SessionInfo, updateXml, [](JT *jt) {
+                        if (!jt->success())
                             qWarning("failure for session-info is ignored");
-                        planStep();
                     });
                     return;
                 }
@@ -321,12 +309,12 @@ namespace XMPP { namespace Jingle {
                         acceptApps.append(AckHndl { app, callback });
                     }
                 }
-                sendJingle(upd.action, updateXml, [this, acceptApps](bool success) {
+                sendJingle(upd.action, updateXml, [this, acceptApps](JT *jt) {
                     for (const auto &h : acceptApps) {
                         auto app      = std::get<0>(h);
                         auto callback = std::get<1>(h);
                         if (app) {
-                            callback(success);
+                            callback(jt);
                         }
                     }
                     planStep();
@@ -865,7 +853,10 @@ namespace XMPP { namespace Jingle {
             }
 
             for (auto &u : updates) {
-                u.first->update(u.second); // failure should trigger transport replace
+                if (!u.first->update(u.second)) {
+                    lastError = u.first->lastError();
+                    return false; // failure should trigger transport replace
+                }
             }
 
             return true;
diff --git a/src/xmpp/xmpp-im/jingle-transport.h b/src/xmpp/xmpp-im/jingle-transport.h
index 4b2a62be..0253203d 100644
--- a/src/xmpp/xmpp-im/jingle-transport.h
+++ b/src/xmpp/xmpp-im/jingle-transport.h
@@ -98,6 +98,7 @@ namespace XMPP { namespace Jingle {
         inline State                    state() const { return _state; }
         inline State                    prevState() const { return _prevState; }
         inline Reason                   lastReason() const { return _lastReason; }
+        inline XMPP::Stanza::Error      lastError() const { return _lastError; }
         inline TransportManagerPad::Ptr pad() const { return _pad; }
         bool                            isRemote() const;
         inline bool                     isLocal() const { return !isRemote(); }
@@ -138,6 +139,7 @@ namespace XMPP { namespace Jingle {
         Origin                              _creator   = Origin::None;
         QSharedPointer<TransportManagerPad> _pad;
         Reason                              _lastReason;
+        XMPP::Stanza::Error                 _lastError;
         int                                 _channelCount = 1;
     };
 
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index 25a04da5..2919b9cc 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -31,6 +31,7 @@ class QDomElement;
 
 namespace XMPP {
 class Client;
+class Task;
 
 namespace Jingle {
     extern const QString NS;
@@ -150,8 +151,8 @@ namespace Jingle {
     };
     Q_DECLARE_FLAGS(TransportFeatures, TransportFeature)
 
-    typedef QPair<QString, Origin>            ContentKey;
-    typedef std::function<void(bool success)> OutgoingUpdateCB;
+    typedef QPair<QString, Origin>      ContentKey;
+    typedef std::function<void(Task *)> OutgoingUpdateCB;
     typedef std::tuple<QList<QDomElement>, OutgoingUpdateCB>
         OutgoingUpdate; // list of elements to b inserted to <jingle> and success callback
     typedef std::tuple<QDomElement, OutgoingUpdateCB>

From 727f722264d25d81c32304c96a19161b495d374e Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 10 May 2020 21:24:37 +0300
Subject: [PATCH 174/383] Log rejected incoming socks5 connections

---
 src/xmpp/xmpp-im/jingle-s5b.cpp | 3 ++-
 src/xmpp/xmpp-im/s5b.cpp        | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index f81ff2bf..0b84b0b2 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -1102,7 +1102,8 @@ namespace XMPP { namespace Jingle { namespace S5B {
                                                  sc->grantConnect();
                                              return;
                                          }
-
+                                         qDebug("Reject incoming socks5 connection with key %s (%s)", qPrintable(key),
+                                                connection ? "already has connection" : "key mismatch");
                                          sc->requestDeny();
                                          sc->deleteLater();
                                      });
diff --git a/src/xmpp/xmpp-im/s5b.cpp b/src/xmpp/xmpp-im/s5b.cpp
index a1d0f335..969adb8c 100644
--- a/src/xmpp/xmpp-im/s5b.cpp
+++ b/src/xmpp/xmpp-im/s5b.cpp
@@ -37,6 +37,7 @@
 #endif
 
 #define MAXSTREAMHOSTS 5
+//#define S5B_DEBUG
 
 static const char *S5B_NS = "http://jabber.org/protocol/bytestreams";
 
@@ -2200,8 +2201,8 @@ S5BServer::S5BServer(QTcpServer *serverSocket) : TcpPortServer(serverSocket), d(
     connect(&d->serv, &SocksServer::incomingReady, this, [this]() {
         S5BIncomingConnection *inConn = new S5BIncomingConnection(d->serv.takeIncoming());
 #ifdef S5B_DEBUG
-        qDebug("S5BServer: incoming connection from %s:%d\n", qPrintable(i->client->peerAddress().toString()),
-               i->client->peerPort());
+        qDebug("S5BServer: incoming connection from %s:%d\n", qPrintable(inConn->client->peerAddress().toString()),
+               inConn->client->peerPort());
 #endif
         connect(inConn, &S5BIncomingConnection::result, this, [this, inConn](bool success) {
 #ifdef S5B_DEBUG

From ef442d9c0402afa244d2e6c4693df1d155f860b2 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 11 May 2020 13:11:41 +0300
Subject: [PATCH 175/383] Avoid early setting permissions on TURN. queue them
 instead

---
 src/irisnet/noncore/ice176.cpp       | 5 ++++-
 src/irisnet/noncore/stunallocate.cpp | 9 +++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index bcf6dea1..667a65b4 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -411,7 +411,7 @@ class Ice176::Private : public QObject {
 
         // don't pair ipv4 with ipv6.  FIXME: is this right?
         if (!allowProtoMismatch && lc->addr.addr.protocol() != rc->addr.addr.protocol()) {
-            qDebug("Skip building pair: %s - %s (protocol mismatch)", qPrintable(lc->addr), qPrintable(rc->addr));
+            iceDebug("Skip building pair: %s - %s (protocol mismatch)", qPrintable(lc->addr), qPrintable(rc->addr));
             return {};
         }
 
@@ -1448,6 +1448,9 @@ private slots:
                 QByteArray packet = response.toBinary(StunMessage::MessageIntegrity | StunMessage::Fingerprint, reqkey);
                 sock->writeDatagram(path, packet, fromAddr, fromPort);
 
+                if (state != Started) // only in started state we do triggered checks
+                    return;
+
                 auto it        = std::find_if(remoteCandidates.begin(), remoteCandidates.end(),
                                        [&](IceComponent::CandidateInfo::Ptr remCand) {
                                            return remCand->componentId == locCand.info->componentId
diff --git a/src/irisnet/noncore/stunallocate.cpp b/src/irisnet/noncore/stunallocate.cpp
index afcf205b..f98ea938 100644
--- a/src/irisnet/noncore/stunallocate.cpp
+++ b/src/irisnet/noncore/stunallocate.cpp
@@ -433,6 +433,7 @@ class StunAllocate::Private : public QObject {
     QTimer *                        allocateRefreshTimer;
     QList<StunAllocatePermission *> perms;
     QList<StunAllocateChannel *>    channels;
+    QList<QHostAddress>             permQueue;
     QList<QHostAddress>             permsOut;
     QList<StunAllocate::Channel>    channelsOut;
     int                             erroringCode;
@@ -495,6 +496,11 @@ class StunAllocate::Private : public QObject {
         if (state == Erroring)
             return;
 
+        if (state == Starting) {
+            permQueue += newPerms;
+            return;
+        }
+
         Q_ASSERT(state == Started);
 
         int freeCount = 0;
@@ -970,6 +976,9 @@ private slots:
             state = Started;
             restartRefreshTimer();
 
+            setPermissions(permQueue);
+            permQueue.clear();
+
             emit q->started();
         } else if (state == Stopping || state == Erroring) {
             if (error) {

From 40e2e980ee1c74aa96f15b8f17032a497015b362 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 11 May 2020 16:22:58 +0300
Subject: [PATCH 176/383] Cleanup triggerred list for a component when it get
 selectedPair

---
 src/irisnet/noncore/ice176.cpp | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index 667a65b4..d207e339 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -210,6 +210,8 @@ class Ice176::Private : public QObject {
             auto pair = selectNextPairToCheck();
             if (pair)
                 checkPair(pair);
+            else
+                checkTimer.stop();
         });
         checkTimer.setInterval(20);
         checkTimer.setSingleShot(false);
@@ -675,13 +677,17 @@ class Ice176::Private : public QObject {
                 newValid.push_back(p);
         checkList.validPairs = newValid;
 
-        iceDebug("C%d: selected pair: %s (base: %s)", componentId, qPrintable(*selected),
-                 qPrintable(selected->local->base));
-
         auto &sa = selected->local->base;
         auto &t  = localCandidates[findLocalCandidate(sa.addr, sa.port)].iceTransport;
         Q_ASSERT(t.data() != nullptr);
-        // cancel active transactions
+
+        // cancel planned/active transactions
+        QMutableListIterator<QWeakPointer<CandidatePair>> it(checkList.triggeredPairs);
+        while (it.hasNext()) {
+            auto p = it.next().toStrongRef();
+            if (!p || p->local->componentId == componentId)
+                it.remove();
+        }
         for (auto &p : checkList.pairs) {
             if (p->local->componentId == componentId && p->state == PInProgress) {
                 p->binding->cancel();
@@ -709,14 +715,23 @@ class Ice176::Private : public QObject {
         auto &selectedPair = findComponent(componentId)->selectedPair;
         if (selectedPair)
             return;
+#ifdef ICE_DEBUG
+        iceDebug("Current valid list state:");
+        for (auto &p : checkList.validPairs) {
+            iceDebug("  C%d: %s", p->local->componentId, qPrintable(*p));
+        }
+#endif
         selectedPair = chooseSelectedPair(componentId);
         if (!selectedPair) {
-            qWarning("failed to find selected pair for previously nominated component. Candidates removed "
-                     "without ICE restart?");
+            qWarning("C%d: failed to find selected pair for previously nominated component. Candidates removed "
+                     "without ICE restart?",
+                     componentId);
             stop();
             emit q->error(ErrorGeneric);
             return;
         }
+        iceDebug("C%d: selected pair: %s (base: %s)", componentId, qPrintable(*selectedPair),
+                 qPrintable(selectedPair->local->base));
         cleanupButSelectedPair(componentId);
         emit q->componentReady(componentId - 1);
         tryIceFinished();
@@ -1159,13 +1174,7 @@ class Ice176::Private : public QObject {
                 });
 
             checkList.validPairs.insert(insIt, pair); // nominated and highest priority first
-#ifdef ICE_DEBUG
             iceDebug("C%d: insert to valid list %s", component.id, qPrintable(*pair));
-            iceDebug("Current valid list state:");
-            for (auto &p : checkList.validPairs) {
-                iceDebug("  C%d: %s", component.id, qPrintable(*p));
-            }
-#endif
         }
 
         if (signalCompNominated || signalCompValidPairs) {

From 2c3924cd357f61cb3f25094cee6dc9993ce8997b Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 13 May 2020 14:10:38 +0300
Subject: [PATCH 177/383] Added Jingle ICE features checkers

---
 src/xmpp/xmpp-im/xmpp_features.cpp | 6 ++++++
 src/xmpp/xmpp-im/xmpp_features.h   | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/src/xmpp/xmpp-im/xmpp_features.cpp b/src/xmpp/xmpp-im/xmpp_features.cpp
index de2123fe..94a24648 100644
--- a/src/xmpp/xmpp-im/xmpp_features.cpp
+++ b/src/xmpp/xmpp-im/xmpp_features.cpp
@@ -197,6 +197,12 @@ bool Features::hasJingleFT() const
     return test(ns);
 }
 
+#define FID_JINGLEICEUDP "urn:xmpp:jingle:transports:ice-udp:1"
+bool Features::hasJingleIceUdp() const { return test(QStringList() << QLatin1String(FID_JINGLEICEUDP)); }
+
+#define FID_JINGLEICE "urn:xmpp:jingle:transports:ice:0"
+bool Features::hasJingleIce() const { return test(QStringList() << QLatin1String(FID_JINGLEICE)); }
+
 // custom Psi actions
 #define FID_ADD "psi:add"
 
diff --git a/src/xmpp/xmpp-im/xmpp_features.h b/src/xmpp/xmpp-im/xmpp_features.h
index c755ae1e..b8378c16 100644
--- a/src/xmpp/xmpp-im/xmpp_features.h
+++ b/src/xmpp/xmpp-im/xmpp_features.h
@@ -54,6 +54,8 @@ class Features {
     bool        hasVCard() const;
     bool        hasMessageCarbons() const;
     bool        hasJingleFT() const;
+    bool        hasJingleIceUdp() const;
+    bool        hasJingleIce() const;
 
     [[deprecated]] inline bool canRegister() const { return hasRegister(); }
     [[deprecated]] inline bool canSearch() const { return hasSearch(); }

From 5d06e89174bec99bfedf7608860d420b7f317efe Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 13 May 2020 19:33:50 +0300
Subject: [PATCH 178/383] disallow protocol family mismatch. That was initialy
 invalid decision

---
 src/irisnet/noncore/ice176.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index d207e339..adeda5ee 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -405,14 +405,13 @@ class Ice176::Private : public QObject {
 
     // returns a pair is pairable or null
     QSharedPointer<CandidatePair> makeCandidatesPair(IceComponent::CandidateInfo::Ptr lc,
-                                                     IceComponent::CandidateInfo::Ptr rc,
-                                                     bool                             allowProtoMismatch = false)
+                                                     IceComponent::CandidateInfo::Ptr rc)
     {
         if (lc->componentId != rc->componentId)
             return {};
 
         // don't pair ipv4 with ipv6.  FIXME: is this right?
-        if (!allowProtoMismatch && lc->addr.addr.protocol() != rc->addr.addr.protocol()) {
+        if (lc->addr.addr.protocol() != rc->addr.addr.protocol()) {
             iceDebug("Skip building pair: %s - %s (protocol mismatch)", qPrintable(lc->addr), qPrintable(rc->addr));
             return {};
         }
@@ -1115,7 +1114,7 @@ class Ice176::Private : public QObject {
                 Q_ASSERT(locIt != localCandidates.end());
                 // local candidate wasn't found, so it wasn't on the checklist  RFC8445 7.2.5.3.1.3
                 // allow v4/v6 proto mismatch in case NAT does magic
-                pair = makeCandidatesPair(locIt->info, pair->remote, true);
+                pair = makeCandidatesPair(locIt->info, pair->remote);
             } else {
                 // local candidate found. If it's a part of a pair on checklist, we have to add this pair to valid list,
                 // otherwise we have to create a new pair and add it to valid list
@@ -1125,7 +1124,7 @@ class Ice176::Private : public QObject {
                 });
                 if (it == checkList.pairs.constEnd()) {
                     // allow v4/v6 proto mismatch in case NAT does magic
-                    pair = makeCandidatesPair(locIt->info, pair->remote, true);
+                    pair = makeCandidatesPair(locIt->info, pair->remote);
                 } else {
                     pair = *it;
                     iceDebug("mapped address belongs to another pair on checklist %s", qPrintable(QString(*pair)));

From 45bf4ef6bc595b14c9f14853d950e9f4c06fb585 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 13 May 2020 20:02:12 +0300
Subject: [PATCH 179/383] Stop check timer on moving to ICE stopping state

---
 src/irisnet/noncore/ice176.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index adeda5ee..5ef3bf3d 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -334,6 +334,7 @@ class Ice176::Private : public QObject {
 
         state = Stopping;
         remoteGatheringCompleteTimer.reset();
+        checkTimer.stop();
 
         // will trigger candidateRemoved events and result pairs cleanup.
         if (!components.empty()) {
@@ -350,6 +351,7 @@ class Ice176::Private : public QObject {
 
     void addRemoteCandidates(const QList<Candidate> &list)
     {
+        Q_ASSERT(state == Started || state == Starting);
         updateRemoteGatheringTimeout();
         QList<IceComponent::CandidateInfo::Ptr> remoteCandidates;
         for (const Candidate &c : list) {

From 560eda171e814909a9f2013c87e2938a931a1d29 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 13 May 2020 21:55:52 +0300
Subject: [PATCH 180/383] An option to disable IP exposure + some optimizations

---
 src/irisnet/noncore/ice176.cpp | 60 +++++++++++++++++++++++++++++++---
 src/irisnet/noncore/ice176.h   |  1 +
 2 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index 5ef3bf3d..c0472c82 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -195,6 +195,7 @@ class Ice176::Private : public QObject {
     QList<QList<QByteArray>>                in;
     Features                                remoteFeatures;
     Features                                localFeatures;
+    bool                                    allowIpExposure            = true;
     bool                                    useLocal                   = true;
     bool                                    useStunBind                = true;
     bool                                    useStunRelayUdp            = true;
@@ -309,8 +310,8 @@ class Ice176::Private : public QObject {
             if (!stunRelayTcpAddr.isNull())
                 c.ic->setStunRelayTcpService(stunRelayTcpAddr, stunRelayTcpPort, stunRelayTcpUser, stunRelayTcpPass);
 
-            c.ic->setUseLocal(useLocal);
-            c.ic->setUseStunBind(useStunBind);
+            c.ic->setUseLocal(useLocal && allowIpExposure);
+            c.ic->setUseStunBind(useStunBind && allowIpExposure);
             c.ic->setUseStunRelayUdp(useStunRelayUdp);
             c.ic->setUseStunRelayTcp(useStunRelayTcp);
 
@@ -466,7 +467,7 @@ class Ice176::Private : public QObject {
             auto &pair = checkList.pairs[n];
 #ifdef ICE_DEBUG
             if (pair->logNew)
-                iceDebug("%d, %s", pair->local->componentId, qPrintable(*pair));
+                iceDebug("C%d, %s", pair->local->componentId, qPrintable(*pair));
 #endif
 
             for (int i = n - 1; i >= 0; --i) {
@@ -740,6 +741,50 @@ class Ice176::Private : public QObject {
 
     bool canHaveMoreRemoteCandidates() const { return remoteGatheringComplete || !(remoteFeatures & Trickle); }
 
+    void optimizeCheckList(int componentId)
+    {
+        bool hasHost  = false;
+        bool hasPrflx = false;
+        bool hasSrflx = false;
+        bool hasRelay = false;
+
+        for (auto &p : checkList.validPairs) {
+            if (p->local->componentId != componentId)
+                continue;
+            switch (p->local->type) {
+            case IceComponent::HostType:
+                hasHost = true;
+                break;
+            case IceComponent::PeerReflexiveType:
+                hasPrflx = true;
+                break;
+            case IceComponent::ServerReflexiveType:
+                hasSrflx = true;
+                break;
+            case IceComponent::RelayedType:
+                hasRelay = true;
+                break;
+            }
+        }
+        // TODO figureout if those are highest priority too
+
+        bool stopRelay = hasRelay || hasSrflx || hasPrflx || hasHost;
+        bool stopSrflx = hasPrflx || hasHost; // || hasSrflx but who knows about the priority
+        bool stopPrflx = hasHost;
+        // we don't stop other hosts since they are quite cheap and maybe highest priority is on the way
+
+        for (auto &p : checkList.pairs) {
+            bool toStop = p->local->componentId == componentId && (p->state == PFrozen || p->state == PWaiting)
+                && ((stopRelay && p->local->type == IceComponent::RelayedType)
+                    || (stopSrflx && p->local->type == IceComponent::ServerReflexiveType)
+                    || (stopPrflx && p->local->type == IceComponent::PeerReflexiveType));
+            if (toStop) {
+                iceDebug("Disable checks for %s since we already have better valid pairs", qPrintable(*p));
+                p->state = PFailed;
+            }
+        }
+    }
+
     void tryNominateSelectedPair(int componentId)
     {
         auto &c = *findComponent(componentId);
@@ -824,7 +869,7 @@ class Ice176::Private : public QObject {
     // ice negotiation failed. either initial or on ICE restart
     void tryComponentFailed(int componentId)
     {
-        Q_ASSERT(state == Starting);
+        Q_ASSERT(state == Starting || state == Started);
         if (!(localGatheringComplete && canHaveMoreRemoteCandidates())) {
             return; // if we have something to gather then we still have a chance for success
         }
@@ -909,7 +954,8 @@ class Ice176::Private : public QObject {
     {
         if (remoteFeatures & GatheringComplete || !(remoteFeatures & Trickle)) {
             remoteGatheringCompleteTimer.reset();
-            iceDebug("Don't use Remote Gatherging Complete timeout");
+            iceDebug("Don't use Remote Gatherging Complete timeout: %s",
+                     (remoteFeatures & GatheringComplete) ? "remote will notify" : "non-trickle mode");
             return;
         } else if (remoteGatheringCompleteTimer) {
             iceDebug("Remote Gatherging Complete was restarted");
@@ -1178,6 +1224,8 @@ class Ice176::Private : public QObject {
             iceDebug("C%d: insert to valid list %s", component.id, qPrintable(*pair));
         }
 
+        optimizeCheckList(component.id);
+
         if (signalCompNominated || signalCompValidPairs) {
             tryReadyToSendMedia();
         } // else nothing changed so nothing to try
@@ -1584,6 +1632,8 @@ void Ice176::setStunRelayTcpService(const QHostAddress &addr, int port, const QS
     d->stunRelayTcpPass = pass;
 }
 
+void Ice176::setAllowIpExposure(bool enabled) { d->allowIpExposure = enabled; }
+
 void Ice176::setUseLocal(bool enabled) { d->useLocal = enabled; }
 
 void Ice176::setUseStunBind(bool enabled) { d->useStunBind = enabled; }
diff --git a/src/irisnet/noncore/ice176.h b/src/irisnet/noncore/ice176.h
index a3db6ac3..f1e864f4 100644
--- a/src/irisnet/noncore/ice176.h
+++ b/src/irisnet/noncore/ice176.h
@@ -101,6 +101,7 @@ class Ice176 : public QObject {
     void setUseStunBind(bool enabled);
     void setUseStunRelayUdp(bool enabled);
     void setUseStunRelayTcp(bool enabled);
+    void setAllowIpExposure(bool enabled);
 
     void setComponentCount(int count);
 

From b61cb7e3dcb2ce69492a02cd99e80142f83d09b1 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Thu, 14 May 2020 14:28:54 +0300
Subject: [PATCH 181/383] Fixed ICE component log entry

---
 src/irisnet/noncore/ice176.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index c0472c82..9c0386d3 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -491,7 +491,7 @@ class Ice176::Private : public QObject {
         iceDebug("%d after pruning (just new below):", checkList.pairs.count());
         for (auto &p : checkList.pairs) {
             if (p->logNew)
-                iceDebug("%d, %s", p->local->componentId, qPrintable(*p));
+                iceDebug("C%d, %s", p->local->componentId, qPrintable(*p));
             p->logNew = false;
         }
 #endif

From 18f923d498c3c89de77a44a729a2237b733e18d7 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 17 May 2020 01:47:33 +0300
Subject: [PATCH 182/383] Initial support for ICE-PAC

https://datatracker.ietf.org/doc/draft-ietf-ice-pac/
---
 src/irisnet/noncore/ice176.cpp          | 198 ++++++++++--------------
 src/irisnet/noncore/ice176.h            |   3 +-
 src/irisnet/noncore/stuntransaction.cpp |   1 +
 3 files changed, 85 insertions(+), 117 deletions(-)

diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index 9c0386d3..6bc046a1 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -133,9 +133,9 @@ class Ice176::Private : public QObject {
         {
             if (isNull())
                 return QLatin1String("null pair");
-            return QString(QLatin1String("L:\"%1\" %2 - R:\"%3\" %4"))
+            return QString(QLatin1String("L:%1 %2 - R:%3 %4 (prio:%5)"))
                 .arg(candidateType_to_string(local->type), QString(local->addr), candidateType_to_string(remote->type),
-                     QString(remote->addr));
+                     QString(remote->addr), QString::number(priority));
         }
     };
 
@@ -153,6 +153,7 @@ class Ice176::Private : public QObject {
         IceComponent *          ic              = nullptr;
         std::unique_ptr<QTimer> nominationTimer = std::unique_ptr<QTimer>();
         CandidatePair::Ptr      selectedPair; // final selected pair. won't be changed
+        CandidatePair::Ptr      highestPair;  // current highest priority pair to send data
         bool                    localFinished     = false;
         bool                    hasValidPairs     = false;
         bool                    hasNominatedPairs = false;
@@ -169,10 +170,10 @@ class Ice176::Private : public QObject {
     QTimer                                  checkTimer;
     TurnClient::Proxy                       proxy;
     UdpPortReserver *                       portReserver = nullptr;
-    std::unique_ptr<QTimer>                 remoteGatheringCompleteTimer;
-    int                                     agressiveNominationTimeout     = 3000;  // 3s
-    int                                     remoteGatheringCompleteTimeout = 30000; // 30s
-    int                                     componentCount                 = 0;
+    std::unique_ptr<QTimer>                 pacTimer;
+    int                                     agressiveNominationTimeout = 3000; // 3s
+    int                                     pacTimeout = 30000; // 30s todo: compute from rto. see draft-ietf-ice-pac-06
+    int                                     componentCount = 0;
     QList<Ice176::LocalAddress>             localAddrs;
     QList<Ice176::ExternalAddress>          extAddrs;
     QHostAddress                            stunBindAddr;
@@ -204,6 +205,7 @@ class Ice176::Private : public QObject {
     bool                                    localGatheringComplete     = false;
     bool                                    remoteGatheringComplete    = false;
     bool                                    readyToSendMedia           = false;
+    bool                                    canStartChecks             = false;
 
     Private(Ice176 *_q) : QObject(_q), q(_q)
     {
@@ -329,12 +331,24 @@ class Ice176::Private : public QObject {
             portReserver->returnSockets(socketList);
     }
 
+    void startChecks()
+    {
+        pacTimer.reset(new QTimer(this));
+        pacTimer->setSingleShot(true);
+        pacTimer->setInterval(pacTimeout);
+        connect(pacTimer.get(), &QTimer::timeout, this, &Ice176::Private::onPacTimeout);
+        iceDebug("Start Patiently Awaiting Connectivity timer");
+        canStartChecks = true;
+        pacTimer->start();
+        checkTimer.start();
+    }
+
     void stop()
     {
         Q_ASSERT(state == Starting || state == Started || state == Active);
 
         state = Stopping;
-        remoteGatheringCompleteTimer.reset();
+        pacTimer.reset();
         checkTimer.stop();
 
         // will trigger candidateRemoved events and result pairs cleanup.
@@ -353,7 +367,6 @@ class Ice176::Private : public QObject {
     void addRemoteCandidates(const QList<Candidate> &list)
     {
         Q_ASSERT(state == Started || state == Starting);
-        updateRemoteGatheringTimeout();
         QList<IceComponent::CandidateInfo::Ptr> remoteCandidates;
         for (const Candidate &c : list) {
             auto ci       = IceComponent::CandidateInfo::Ptr::create();
@@ -400,10 +413,13 @@ class Ice176::Private : public QObject {
     void setRemoteGatheringComplete()
     {
         remoteGatheringComplete = true;
-        remoteGatheringCompleteTimer.reset();
+        if (!localGatheringComplete || state != Started)
+            return;
 
-        iceDebug("Got remote gathering complete signal");
-        onRemoteGatheringCompleted();
+        if (mode == Initiator && !(localFeatures & AggressiveNomination))
+            for (auto &c : components)
+                if (c.highestPair)
+                    tryNominateSelectedPair(c.id);
     }
 
     // returns a pair is pairable or null
@@ -562,7 +578,7 @@ class Ice176::Private : public QObject {
                     IceComponent::Candidate &lc   = localCandidates[at];
                     int                      path = lc.path;
 
-                    iceDebug("connectivity check for pair %s%s", qPrintable(*pair),
+                    iceDebug("send connectivity check for pair %s%s", qPrintable(*pair),
                              (mode == Initiator
                                   ? (pair->binding->useCandidate() ? " (nominating)" : "")
                                   : (pair->isTriggeredForNominated ? " (triggered check for nominated)" : "")));
@@ -623,7 +639,7 @@ class Ice176::Private : public QObject {
             return;
 
         addChecklistPairs(pairs);
-        if (!checkTimer.isActive())
+        if (canStartChecks && !checkTimer.isActive())
             checkTimer.start();
     }
 
@@ -634,7 +650,7 @@ class Ice176::Private : public QObject {
 
         auto pair = cIt->selectedPair;
         if (!pair) {
-            pair = chooseSelectedPair(componentIndex + 1);
+            pair = cIt->highestPair;
             if (!pair) {
                 iceDebug("An attempt to write to an ICE component w/o valid sockets");
                 return;
@@ -705,17 +721,11 @@ class Ice176::Private : public QObject {
         }
     }
 
-    CandidatePair::Ptr chooseSelectedPair(int componentId)
-    {
-        auto it = std::find_if(checkList.validPairs.begin(), checkList.validPairs.end(),
-                               [&](auto &pair) mutable { return pair->local->componentId == componentId; });
-        return it == checkList.validPairs.end() ? CandidatePair::Ptr() : *it;
-    }
-
     void setSelectedPair(int componentId)
     {
-        auto &selectedPair = findComponent(componentId)->selectedPair;
-        if (selectedPair)
+        auto &component = *findComponent(componentId);
+        auto &pair      = component.selectedPair;
+        if (pair)
             return;
 #ifdef ICE_DEBUG
         iceDebug("Current valid list state:");
@@ -723,8 +733,8 @@ class Ice176::Private : public QObject {
             iceDebug("  C%d: %s", p->local->componentId, qPrintable(*p));
         }
 #endif
-        selectedPair = chooseSelectedPair(componentId);
-        if (!selectedPair) {
+        pair = component.highestPair;
+        if (!pair) {
             qWarning("C%d: failed to find selected pair for previously nominated component. Candidates removed "
                      "without ICE restart?",
                      componentId);
@@ -732,52 +742,21 @@ class Ice176::Private : public QObject {
             emit q->error(ErrorGeneric);
             return;
         }
-        iceDebug("C%d: selected pair: %s (base: %s)", componentId, qPrintable(*selectedPair),
-                 qPrintable(selectedPair->local->base));
+        iceDebug("C%d: selected pair: %s (base: %s)", componentId, qPrintable(*pair), qPrintable(pair->local->base));
         cleanupButSelectedPair(componentId);
         emit q->componentReady(componentId - 1);
         tryIceFinished();
     }
 
-    bool canHaveMoreRemoteCandidates() const { return remoteGatheringComplete || !(remoteFeatures & Trickle); }
-
     void optimizeCheckList(int componentId)
     {
-        bool hasHost  = false;
-        bool hasPrflx = false;
-        bool hasSrflx = false;
-        bool hasRelay = false;
-
-        for (auto &p : checkList.validPairs) {
-            if (p->local->componentId != componentId)
-                continue;
-            switch (p->local->type) {
-            case IceComponent::HostType:
-                hasHost = true;
-                break;
-            case IceComponent::PeerReflexiveType:
-                hasPrflx = true;
-                break;
-            case IceComponent::ServerReflexiveType:
-                hasSrflx = true;
-                break;
-            case IceComponent::RelayedType:
-                hasRelay = true;
-                break;
-            }
-        }
-        // TODO figureout if those are highest priority too
-
-        bool stopRelay = hasRelay || hasSrflx || hasPrflx || hasHost;
-        bool stopSrflx = hasPrflx || hasHost; // || hasSrflx but who knows about the priority
-        bool stopPrflx = hasHost;
-        // we don't stop other hosts since they are quite cheap and maybe highest priority is on the way
-
+        auto it = std::find_if(checkList.validPairs.begin(), checkList.validPairs.end(),
+                               [&](auto &p) { return p->local->componentId == componentId; });
+        Q_ASSERT(it != checkList.validPairs.end());
+        auto minPriority = (*it)->priority;
         for (auto &p : checkList.pairs) {
             bool toStop = p->local->componentId == componentId && (p->state == PFrozen || p->state == PWaiting)
-                && ((stopRelay && p->local->type == IceComponent::RelayedType)
-                    || (stopSrflx && p->local->type == IceComponent::ServerReflexiveType)
-                    || (stopPrflx && p->local->type == IceComponent::PeerReflexiveType));
+                && p->priority < minPriority;
             if (toStop) {
                 iceDebug("Disable checks for %s since we already have better valid pairs", qPrintable(*p));
                 p->state = PFailed;
@@ -790,13 +769,13 @@ class Ice176::Private : public QObject {
         auto &c = *findComponent(componentId);
         if (mode != Initiator || state != Started || checkList.validPairs.isEmpty() || c.nominating)
             return;
-        auto pair = chooseSelectedPair(componentId);
+        auto pair = c.highestPair;
         if (!pair)
             return;
         Q_ASSERT(!pair->isNominated);
         if (pair->local->type == IceComponent::RelayedType) {
-            if (!(localGatheringComplete && canHaveMoreRemoteCandidates())) {
-                iceDebug("Wiating for gathering complete on both sides before nomination of relayed pair");
+            if (!(localGatheringComplete && remoteGatheringComplete)) {
+                iceDebug("Waiting for gathering complete on both sides before nomination of relayed pair");
                 return; // maybe we gonna have a non-relayed pair. RFC8445 anyway allows to send data on any valid.
             }
 
@@ -870,7 +849,7 @@ class Ice176::Private : public QObject {
     void tryComponentFailed(int componentId)
     {
         Q_ASSERT(state == Starting || state == Started);
-        if (!(localGatheringComplete && canHaveMoreRemoteCandidates())) {
+        if (!(localGatheringComplete && remoteGatheringComplete)) {
             return; // if we have something to gather then we still have a chance for success
         }
 
@@ -935,43 +914,18 @@ class Ice176::Private : public QObject {
         pair->isTriggeredForNominated = nominated;
         checkList.triggeredPairs.enqueue(pair);
 
-        if (!checkTimer.isActive())
+        if (canStartChecks && !checkTimer.isActive())
             checkTimer.start();
     }
 
-    void onRemoteGatheringCompleted()
-    {
-        remoteGatheringComplete = true;
-        if (!localGatheringComplete || state != Started)
-            return;
-
-        if (!checkList.validPairs.isEmpty() && mode == Initiator && !(localFeatures & AggressiveNomination))
-            for (auto &c : components)
-                tryNominateSelectedPair(c.id);
-    }
-
-    void updateRemoteGatheringTimeout()
+    void onPacTimeout()
     {
-        if (remoteFeatures & GatheringComplete || !(remoteFeatures & Trickle)) {
-            remoteGatheringCompleteTimer.reset();
-            iceDebug("Don't use Remote Gatherging Complete timeout: %s",
-                     (remoteFeatures & GatheringComplete) ? "remote will notify" : "non-trickle mode");
-            return;
-        } else if (remoteGatheringCompleteTimer) {
-            iceDebug("Remote Gatherging Complete was restarted");
-            remoteGatheringCompleteTimer->start(); // restart
-            return;
-        }
-        remoteGatheringCompleteTimer.reset(new QTimer(this));
-        remoteGatheringCompleteTimer->setSingleShot(true);
-        remoteGatheringCompleteTimer->setInterval(remoteGatheringCompleteTimeout);
-        connect(remoteGatheringCompleteTimer.get(), &QTimer::timeout, this, [this]() {
-            remoteGatheringCompleteTimer.release()->deleteLater();
-            iceDebug("Timeout waiting for Gathering Complete signal");
-            onRemoteGatheringCompleted();
-        });
-        iceDebug("Start Remote Gatherging Complete timer");
-        remoteGatheringCompleteTimer->start();
+        pacTimer.release()->deleteLater();
+        iceDebug("Patiently Awaiting Connectivity timeout");
+        setRemoteGatheringComplete();
+        for (auto &c : components)
+            if (state == Starting || state == Started)
+                tryComponentFailed(c.id);
     }
 
 private:
@@ -1115,8 +1069,10 @@ class Ice176::Private : public QObject {
             if (c.selectedPair)
                 iceDebug("  C%d: selected pair: %s (base: %s)", c.id, qPrintable(*c.selectedPair),
                          qPrintable(c.selectedPair->local->base));
-            else
+            else {
                 iceDebug("  C%d: any pair from valid list", c.id);
+                iceDebug("       highest: %s", qPrintable(*c.highestPair));
+            }
         }
 #endif
         readyToSendMedia = true;
@@ -1204,7 +1160,7 @@ class Ice176::Private : public QObject {
             signalCompNominated         = true;
         }
 
-        // mark all with same foundation as Waiting to prioritize them
+        // mark all with same foundation as Waiting to prioritize them (see RFC8445 7.2.5.3.3)
         for (auto &p : checkList.pairs)
             if (p->state == PFrozen && p->foundation == pair->foundation)
                 p->state = PWaiting;
@@ -1213,15 +1169,19 @@ class Ice176::Private : public QObject {
             // find position to insert in sorted list of valid pairs
             auto insIt = std::upper_bound(
                 checkList.validPairs.begin(), checkList.validPairs.end(), pair, [](auto &item, auto &toins) {
-                    if (toins->isNominated ^ item->isNominated)
-                        return item->isNominated;
                     return item->priority == toins->priority
                         ? item->local->componentId < toins->local->componentId
                         : item->priority >= toins->priority; // inverted since we need high priority first
                 });
 
+            bool highest = false;
+            if (!component.highestPair || component.highestPair->priority < pair->priority) {
+                component.highestPair = pair;
+                highest               = true;
+            }
             checkList.validPairs.insert(insIt, pair); // nominated and highest priority first
-            iceDebug("C%d: insert to valid list %s", component.id, qPrintable(*pair));
+            iceDebug("C%d: insert to valid list %s%s", component.id, qPrintable(*pair),
+                     highest ? " (as highest priority)" : "");
         }
 
         optimizeCheckList(component.id);
@@ -1255,17 +1215,23 @@ class Ice176::Private : public QObject {
         if (state == Stopping)
             return; // we don't care about late errors
 
+        if (state == Active) {
+            iceDebug("todo! binding error ignored in Active state");
+            return; // TODO hadle keep-alive binding properly
+        }
+
         iceDebug("check failed for %s", qPrintable(*pair));
+        auto &c     = *findComponent(pair->local->componentId);
         pair->state = CandidatePairState::PFailed;
         if (pair->isValid) { // RFC8445 7.2.5.3.4.  Updating the Nominated Flag /  about failure
             checkList.validPairs.removeOne(pair);
             pair->isValid = false;
-        }
-        if (state == Active) {
-            return; // TODO hadle keep-alive binding properly
+            if (c.highestPair == pair) {
+                // the failed binding is nomination or triggered after receiving success on canceled binding
+                c.highestPair.reset();
+            }
         }
 
-        auto &c = *findComponent(pair->local->componentId);
         if ((c.nominating && pair->finalNomination)
             || (!(remoteFeatures & AggressiveNomination) && pair->isTriggeredForNominated)) {
 
@@ -1280,8 +1246,6 @@ class Ice176::Private : public QObject {
 
         // if not nominating but use-candidate then I'm initiator with aggressive nomination. It's Ok to fail.
         // if nominating but not use-candidate then I'm initiator and something not important failed
-
-        tryComponentFailed(pair->local->componentId);
     }
 
 private slots:
@@ -1651,11 +1615,7 @@ void Ice176::setComponentCount(int count)
 
 void Ice176::setLocalFeatures(const Features &features) { d->localFeatures = features; }
 
-void Ice176::setRemoteFeatures(const Features &features)
-{
-    d->remoteFeatures = features;
-    d->updateRemoteGatheringTimeout();
-}
+void Ice176::setRemoteFeatures(const Features &features) { d->remoteFeatures = features; }
 
 void Ice176::start(Mode mode)
 {
@@ -1665,6 +1625,8 @@ void Ice176::start(Mode mode)
 
 void Ice176::stop() { d->stop(); }
 
+void Ice176::startChecks() { d->startChecks(); }
+
 QString Ice176::localUfrag() const { return d->localUser; }
 
 QString Ice176::localPassword() const { return d->localPass; }
@@ -1675,7 +1637,11 @@ void Ice176::setPeerPassword(const QString &pass) { d->peerPass = pass; }
 
 void Ice176::addRemoteCandidates(const QList<Candidate> &list) { d->addRemoteCandidates(list); }
 
-void Ice176::setRemoteGatheringComplete() { d->setRemoteGatheringComplete(); }
+void Ice176::setRemoteGatheringComplete()
+{
+    iceDebug("Got remote gathering complete signal");
+    d->setRemoteGatheringComplete();
+}
 
 bool Ice176::canSendMedia() const { return d->readyToSendMedia; }
 
diff --git a/src/irisnet/noncore/ice176.h b/src/irisnet/noncore/ice176.h
index f1e864f4..3fd60d46 100644
--- a/src/irisnet/noncore/ice176.h
+++ b/src/irisnet/noncore/ice176.h
@@ -117,8 +117,9 @@ class Ice176 : public QObject {
     void setLocalFeatures(const Features &features);
     void setRemoteFeatures(const Features &features);
 
-    void start(Mode mode);
+    void start(Mode mode); // init everything and prepare candidates
     void stop();
+    void startChecks(); // actually start doing checks when connection is accepted
 
     QString localUfrag() const;
     QString localPassword() const;
diff --git a/src/irisnet/noncore/stuntransaction.cpp b/src/irisnet/noncore/stuntransaction.cpp
index 390bc6cf..83af93ee 100644
--- a/src/irisnet/noncore/stuntransaction.cpp
+++ b/src/irisnet/noncore/stuntransaction.cpp
@@ -302,6 +302,7 @@ private slots:
             rto *= 2;
         }
 
+        emit pool->debugLine("stun transaction timeout. retransmitting..");
         transmit();
     }
 

From f3d0fdfe542cc8d7638d4a9ada5d79ffbf540735 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 17 May 2020 17:43:42 +0300
Subject: [PATCH 183/383] Optimizations wrt ICE-PAC

---
 src/irisnet/noncore/ice176.cpp | 298 +++++++++++++++++----------------
 src/irisnet/noncore/ice176.h   |   1 +
 tools/icetunnel/main.cpp       |   1 +
 3 files changed, 154 insertions(+), 146 deletions(-)

diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index 6bc046a1..d9f6fa19 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -171,7 +171,7 @@ class Ice176::Private : public QObject {
     TurnClient::Proxy                       proxy;
     UdpPortReserver *                       portReserver = nullptr;
     std::unique_ptr<QTimer>                 pacTimer;
-    int                                     agressiveNominationTimeout = 3000; // 3s
+    int                                     nominationTimeout = 3000; // 3s
     int                                     pacTimeout = 30000; // 30s todo: compute from rto. see draft-ietf-ice-pac-06
     int                                     componentCount = 0;
     QList<Ice176::LocalAddress>             localAddrs;
@@ -345,7 +345,8 @@ class Ice176::Private : public QObject {
 
     void stop()
     {
-        Q_ASSERT(state == Starting || state == Started || state == Active);
+        if (state == Stopped || state == Stopping)
+            return; // stopped as a result of previous error?
 
         state = Stopping;
         pacTimer.reset();
@@ -416,10 +417,8 @@ class Ice176::Private : public QObject {
         if (!localGatheringComplete || state != Started)
             return;
 
-        if (mode == Initiator && !(localFeatures & AggressiveNomination))
-            for (auto &c : components)
-                if (c.highestPair)
-                    tryNominateSelectedPair(c.id);
+        for (auto &c : components)
+            tryNominateSelectedPair(c.id);
     }
 
     // returns a pair is pairable or null
@@ -733,6 +732,7 @@ class Ice176::Private : public QObject {
             iceDebug("  C%d: %s", p->local->componentId, qPrintable(*p));
         }
 #endif
+        component.nominationTimer.reset();
         pair = component.highestPair;
         if (!pair) {
             qWarning("C%d: failed to find selected pair for previously nominated component. Candidates removed "
@@ -750,33 +750,41 @@ class Ice176::Private : public QObject {
 
     void optimizeCheckList(int componentId)
     {
-        auto it = std::find_if(checkList.validPairs.begin(), checkList.validPairs.end(),
-                               [&](auto &p) { return p->local->componentId == componentId; });
-        Q_ASSERT(it != checkList.validPairs.end());
-        auto minPriority = (*it)->priority;
+        auto it = findComponent(componentId);
+        Q_ASSERT(it != components.end() && it->highestPair);
+
+        auto minPriority = it->highestPair->priority;
         for (auto &p : checkList.pairs) {
             bool toStop = p->local->componentId == componentId && (p->state == PFrozen || p->state == PWaiting)
                 && p->priority < minPriority;
             if (toStop) {
-                iceDebug("Disable checks for %s since we already have better valid pairs", qPrintable(*p));
+                iceDebug("Disable check for %s since we already have better valid pairs", qPrintable(*p));
+                p->state = PFailed;
+            }
+        }
+        for (auto &pWeak : checkList.triggeredPairs) {
+            auto p = pWeak.toStrongRef();
+            if (p->local->componentId == componentId && p->priority < minPriority) {
+                iceDebug("Disable triggered check for %s since we already have better valid pairs", qPrintable(*p));
                 p->state = PFailed;
             }
         }
     }
 
-    void tryNominateSelectedPair(int componentId)
+    bool doesItWorthNominateNow(int componentId)
     {
         auto &c = *findComponent(componentId);
-        if (mode != Initiator || state != Started || checkList.validPairs.isEmpty() || c.nominating)
-            return;
+        if (mode != Initiator || (localFeatures & AggressiveNomination) || state != Started || !c.highestPair
+            || c.selectedPair || c.nominating)
+            return false;
+
         auto pair = c.highestPair;
-        if (!pair)
-            return;
         Q_ASSERT(!pair->isNominated);
         if (pair->local->type == IceComponent::RelayedType) {
             if (!(localGatheringComplete && remoteGatheringComplete)) {
                 iceDebug("Waiting for gathering complete on both sides before nomination of relayed pair");
-                return; // maybe we gonna have a non-relayed pair. RFC8445 anyway allows to send data on any valid.
+                return false; // maybe we gonna have a non-relayed pair. RFC8445 anyway allows to send data on any
+                              // valid.
             }
 
             // if there is any non-relayed pending pair
@@ -784,13 +792,29 @@ class Ice176::Private : public QObject {
                     return p->state != PSucceeded && p->state != PFailed && p->local->type != IceComponent::RelayedType;
                 })) {
                 iceDebug("There are some non-relayed pairs to check before relayed nomination");
-                return; // either till checked or remote gathering timeout
+                return false; // either till checked or remote gathering timeout
             }
         }
-        c.nominating          = true;
-        pair->finalNomination = true;
-        iceDebug("Nominating valid pair: %s", qPrintable(*pair));
-        checkList.triggeredPairs.prepend(pair);
+        return true;
+    }
+
+    void nominateSelectedPair(int componentId)
+    {
+        auto &c = *findComponent(componentId);
+        Q_ASSERT(mode == Initiator && c.highestPair && !c.selectedPair && !c.nominating);
+        c.nominationTimer.reset();
+        c.nominating                   = true;
+        c.highestPair->finalNomination = true;
+        iceDebug("Nominating valid pair: %s", qPrintable(*c.highestPair));
+        checkList.triggeredPairs.prepend(c.highestPair);
+        if (!checkTimer.isActive())
+            checkTimer.start();
+    }
+
+    void tryNominateSelectedPair(int componentId)
+    {
+        if (doesItWorthNominateNow(componentId))
+            nominateSelectedPair(componentId);
     }
 
     void tryIceFinished()
@@ -805,66 +829,36 @@ class Ice176::Private : public QObject {
         }
         iceDebug("Signalling iceFinished now");
 #endif
+        pacTimer.reset();
         state = Active;
         emit q->iceFinished();
     }
 
-    // execute when new nominated pair
-    void onComponentNominatedPair(QSharedPointer<CandidatePair> &pair)
+    void setupNominationTimer(int componentId)
     {
-        Component &c        = *findComponent(pair->local->componentId);
-        pair->isNominated   = true;
-        c.hasNominatedPairs = true;
-
-        // if (c.lowOverhead) { // commented out since we need turn permissions for all components
-        iceDebug("component is flagged for low overhead.  setting up for %s", qPrintable(*pair));
-        auto &cc = localCandidates[findLocalCandidate(pair->local->addr.addr, pair->local->addr.port)];
-        c.ic->flagPathAsLowOverhead(cc.id, pair->remote->addr.addr, pair->remote->addr.port);
-        //}
-
+        Component &c = *findComponent(componentId);
+        if (c.nominationTimer)
+            return;
         bool agrNom = (mode == Initiator ? localFeatures : remoteFeatures) & AggressiveNomination;
-        if (agrNom) {
-            if (c.nominationTimer)
-                return;
-            // nominated candidate may change. start a timer to cease all checks later
-            auto timer = new QTimer();
-            c.nominationTimer.reset(timer);
-            timer->setSingleShot(true);
-            timer->setInterval(agressiveNominationTimeout);
-            connect(timer, &QTimer::timeout, this, [this, componentId = pair->local->componentId]() {
-                if (state != Started)
-                    return; // likely user stopped or it's alreday active
-                Component &c = *findComponent(componentId);
-                if (c.stopped)
-                    return; // already queue signal likely
+        if (!agrNom && mode == Responder)
+            return; // responder will wait for nominated pairs till very end
+
+        auto timer = new QTimer();
+        c.nominationTimer.reset(timer);
+        timer->setSingleShot(true);
+        timer->setInterval(nominationTimeout);
+        connect(timer, &QTimer::timeout, this, [this, componentId, agrNom]() {
+            Q_ASSERT(state == Started);
+            Component &c = *findComponent(componentId);
+            c.nominationTimer.release()->deleteLater();
+            if (c.stopped)
+                return; // already queue signal likely
+            if (agrNom)
                 setSelectedPair(componentId);
-            });
-            timer->start();
-        } else {
-            setSelectedPair(pair->local->componentId);
-        }
-    }
-
-    // ice negotiation failed. either initial or on ICE restart
-    void tryComponentFailed(int componentId)
-    {
-        Q_ASSERT(state == Starting || state == Started);
-        if (!(localGatheringComplete && remoteGatheringComplete)) {
-            return; // if we have something to gather then we still have a chance for success
-        }
-
-        // TODO implement ICE-PAC
-        if (std::find_if(checkList.pairs.begin(), checkList.pairs.end(),
-                         [&](auto const &p) mutable {
-                             return p->local->componentId == componentId
-                                 && (p->state != CandidatePairState::PSucceeded
-                                     && p->state != CandidatePairState::PFailed);
-                         })
-            != checkList.pairs.end())
-            return; // not all finished
-
-        stop();
-        emit q->error(ErrorGeneric);
+            else if (!c.nominating && !c.selectedPair)
+                nominateSelectedPair(componentId);
+        });
+        timer->start();
     }
 
     // nominated - out side=responder. and remote request had USE_CANDIDATE
@@ -875,14 +869,21 @@ class Ice176::Private : public QObject {
         auto it = std::find_if(checkList.pairs.begin(), checkList.pairs.end(),
                                [&](auto const &p) { return *(p->local) == locCand.info && *(p->remote) == remCand; });
 
-        CandidatePair::Ptr pair = (it == checkList.pairs.end()) ? CandidatePair::Ptr() : *it;
+        CandidatePair::Ptr pair        = (it == checkList.pairs.end()) ? CandidatePair::Ptr() : *it;
+        Component &        component   = *findComponent(locCand.info->componentId);
+        int                minPriority = component.highestPair ? component.highestPair->priority : 0;
         if (pair) {
+            if (pair->priority < minPriority) {
+                iceDebug(
+                    "Don't do triggered check for known pair since the pair has lower priority than highest valid");
+                return;
+            }
             if (pair->state == CandidatePairState::PSucceeded) {
                 // Check nominated here?
                 iceDebug("Don't do triggered check since pair is already in success state");
                 if (mode == Responder && !pair->isNominated && nominated) {
-                    onComponentNominatedPair(pair);
-                    tryReadyToSendMedia();
+                    pair->isNominated = true;
+                    onNewValidPair(pair);
                 }
                 return; // nothing todo. rfc 8445 7.3.1.4
             }
@@ -907,6 +908,11 @@ class Ice176::Private : public QObject {
             if (pair.isNull()) {
                 return;
             }
+            if (pair->priority < minPriority) {
+                iceDebug(
+                    "Don't do triggered check for a new pair since the pair has lower priority than highest valid");
+                return;
+            }
             addChecklistPairs(QList<CandidatePair::Ptr>() << pair);
         }
 
@@ -920,12 +926,11 @@ class Ice176::Private : public QObject {
 
     void onPacTimeout()
     {
+        Q_ASSERT(state == Starting || state == Started);
         pacTimer.release()->deleteLater();
         iceDebug("Patiently Awaiting Connectivity timeout");
-        setRemoteGatheringComplete();
-        for (auto &c : components)
-            if (state == Starting || state == Started)
-                tryComponentFailed(c.id);
+        stop();
+        emit q->error(ErrorGeneric);
     }
 
 private:
@@ -1079,6 +1084,66 @@ class Ice176::Private : public QObject {
         emit q->readyToSendMedia();
     }
 
+    void insertIntoValidList(int componentId, CandidatePair::Ptr pair)
+    {
+        auto &component = *findComponent(componentId);
+        if (!component.selectedPair) { // no final pair yet
+            // find position to insert in sorted list of valid pairs
+            auto insIt = std::upper_bound(
+                checkList.validPairs.begin(), checkList.validPairs.end(), pair, [](auto &item, auto &toins) {
+                    return item->priority == toins->priority
+                        ? item->local->componentId < toins->local->componentId
+                        : item->priority >= toins->priority; // inverted since we need high priority first
+                });
+
+            bool highest = false;
+            if (!component.highestPair || component.highestPair->priority < pair->priority) {
+                component.highestPair = pair;
+                highest               = true;
+            }
+            checkList.validPairs.insert(insIt, pair); // nominated and highest priority first
+            iceDebug("C%d: insert to valid list %s%s", component.id, qPrintable(*pair),
+                     highest ? " (as highest priority)" : "");
+        }
+    }
+
+    void onNewValidPair(CandidatePair::Ptr pair)
+    {
+        auto &component          = *findComponent(pair->local->componentId);
+        bool  alreadyInValidList = pair->isValid;
+        pair->isValid            = true;
+        pair->state              = PSucceeded; // what if it was in progress?
+
+        component.hasValidPairs = true;
+
+        // mark all with same foundation as Waiting to prioritize them (see RFC8445 7.2.5.3.3)
+        for (auto &p : checkList.pairs)
+            if (p->state == PFrozen && p->foundation == pair->foundation)
+                p->state = PWaiting;
+
+        if (!alreadyInValidList)
+            insertIntoValidList(component.id, pair);
+
+        optimizeCheckList(component.id);
+
+        // if (c.lowOverhead) { // commented out since we need turn permissions for all components
+        iceDebug("component is flagged for low overhead.  setting up for %s", qPrintable(*pair));
+        auto &cc = localCandidates[findLocalCandidate(pair->local->addr.addr, pair->local->addr.port)];
+        component.ic->flagPathAsLowOverhead(cc.id, pair->remote->addr.addr, pair->remote->addr.port);
+        //}
+
+        if (pair->isNominated) {
+            component.hasNominatedPairs = true;
+            bool agrNom                 = (mode == Initiator ? localFeatures : remoteFeatures) & AggressiveNomination;
+            if (!agrNom) {
+                setSelectedPair(component.id);
+            } else
+                setupNominationTimer(component.id);
+        } else
+            setupNominationTimer(component.id);
+        tryReadyToSendMedia();
+    }
+
     void handlePairBindingSuccess(CandidatePair::Ptr pair)
     {
         /*
@@ -1093,6 +1158,7 @@ class Ice176::Private : public QObject {
         // pair->isValid = true;
         pair->state                   = CandidatePairState::PSucceeded;
         bool  isTriggeredForNominated = pair->isTriggeredForNominated;
+        bool  isNominatedByInitiator  = mode == Initiator && binding->useCandidate();
         bool  finalNomination         = pair->finalNomination;
         auto &component               = *findComponent(pair->local->componentId);
 
@@ -1132,9 +1198,6 @@ class Ice176::Private : public QObject {
                 } else {
                     pair = *it;
                     iceDebug("mapped address belongs to another pair on checklist %s", qPrintable(QString(*pair)));
-                    if (pair->isValid) { // already valid as result of previous checks probably
-                        return;
-                    }
                 }
             }
         }
@@ -1144,69 +1207,10 @@ class Ice176::Private : public QObject {
             return;
         }
 
-        pair->isValid                 = true;
-        pair->state                   = PSucceeded; // what if it was in progress?
         pair->isTriggeredForNominated = isTriggeredForNominated;
         pair->finalNomination         = finalNomination;
-
-        bool signalCompValidPairs = false;
-        if (!component.hasValidPairs) {
-            component.hasValidPairs = true;
-            signalCompValidPairs    = true;
-        }
-        bool signalCompNominated = false;
-        if (!component.hasNominatedPairs && (isTriggeredForNominated || binding->useCandidate())) {
-            component.hasNominatedPairs = true;
-            signalCompNominated         = true;
-        }
-
-        // mark all with same foundation as Waiting to prioritize them (see RFC8445 7.2.5.3.3)
-        for (auto &p : checkList.pairs)
-            if (p->state == PFrozen && p->foundation == pair->foundation)
-                p->state = PWaiting;
-
-        if (!component.selectedPair) { // no final pair yet
-            // find position to insert in sorted list of valid pairs
-            auto insIt = std::upper_bound(
-                checkList.validPairs.begin(), checkList.validPairs.end(), pair, [](auto &item, auto &toins) {
-                    return item->priority == toins->priority
-                        ? item->local->componentId < toins->local->componentId
-                        : item->priority >= toins->priority; // inverted since we need high priority first
-                });
-
-            bool highest = false;
-            if (!component.highestPair || component.highestPair->priority < pair->priority) {
-                component.highestPair = pair;
-                highest               = true;
-            }
-            checkList.validPairs.insert(insIt, pair); // nominated and highest priority first
-            iceDebug("C%d: insert to valid list %s%s", component.id, qPrintable(*pair),
-                     highest ? " (as highest priority)" : "");
-        }
-
-        optimizeCheckList(component.id);
-
-        if (signalCompNominated || signalCompValidPairs) {
-            tryReadyToSendMedia();
-        } // else nothing changed so nothing to try
-
-        if (mode == Ice176::Initiator) {
-            if (!binding->useCandidate()) {
-                if (!(localFeatures & AggressiveNomination))
-                    tryNominateSelectedPair(component.id);
-                return;
-            }
-        } else {
-            if (!pair->isTriggeredForNominated)
-                return;
-        }
-
-        // we have nomination success.
-        if (!signalCompNominated) {
-            iceDebug("component %d already active, not signalling", pair->local->componentId);
-            return;
-        }
-        onComponentNominatedPair(pair);
+        pair->isNominated             = isTriggeredForNominated || isNominatedByInitiator;
+        onNewValidPair(pair);
     }
 
     void handlePairBindingError(CandidatePair::Ptr pair, XMPP::StunBinding::Error)
@@ -1625,6 +1629,8 @@ void Ice176::start(Mode mode)
 
 void Ice176::stop() { d->stop(); }
 
+bool Ice176::isStopped() const { return d->state == Private::Stopped; }
+
 void Ice176::startChecks() { d->startChecks(); }
 
 QString Ice176::localUfrag() const { return d->localUser; }
diff --git a/src/irisnet/noncore/ice176.h b/src/irisnet/noncore/ice176.h
index 3fd60d46..5d44b93f 100644
--- a/src/irisnet/noncore/ice176.h
+++ b/src/irisnet/noncore/ice176.h
@@ -119,6 +119,7 @@ class Ice176 : public QObject {
 
     void start(Mode mode); // init everything and prepare candidates
     void stop();
+    bool isStopped() const;
     void startChecks(); // actually start doing checks when connection is accepted
 
     QString localUfrag() const;
diff --git a/tools/icetunnel/main.cpp b/tools/icetunnel/main.cpp
index a375e75b..03bd2827 100644
--- a/tools/icetunnel/main.cpp
+++ b/tools/icetunnel/main.cpp
@@ -747,6 +747,7 @@ private slots:
         ice->setPeerUfrag(inOffer.user);
         ice->setPeerPassword(inOffer.pass);
         ice->addRemoteCandidates(inOffer.candidates);
+        ice->startChecks();
     }
 
     void prompt_error()

From 1fd2c01b2033dccfb3e2f4c4a2e2ac6daa12a7a6 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 19 May 2020 02:39:51 +0300
Subject: [PATCH 184/383] Use system blake2 library where possible

---
 CMakeLists.txt             |    1 +
 cmake/modules/FindB2.cmake |   78 +
 configure                  | 3584 ++++++++++++++++++------------------
 configure.exe              |  Bin 118219 -> 125280 bytes
 iris.qc                    |    3 +
 qcm/b2.qcm                 |   70 +
 src/xmpp/CMakeLists.txt    |   18 +-
 src/xmpp/blake2/blake2.pri |   17 +-
 8 files changed, 1975 insertions(+), 1796 deletions(-)
 create mode 100644 cmake/modules/FindB2.cmake
 create mode 100644 qcm/b2.qcm

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f716cf4c..d494c9f1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,6 +118,7 @@ elseif(USE_QJDNS)
 endif()
 
 find_package(IDN REQUIRED)
+find_package(B2)
 
 add_definitions(-DIRISNET_STATIC)
 
diff --git a/cmake/modules/FindB2.cmake b/cmake/modules/FindB2.cmake
new file mode 100644
index 00000000..9b9dafe9
--- /dev/null
+++ b/cmake/modules/FindB2.cmake
@@ -0,0 +1,78 @@
+#=============================================================================
+# Copyright (C) 2016-2020  Psi+ Project, Vitaly Tonkacheyev
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#=============================================================================
+if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND WIN32)
+    set(D "d")
+endif()
+if( B2_INCLUDE_DIR AND B2_LIBRARY )
+    # in cache already
+    set(B2_FIND_QUIETLY TRUE)
+endif( B2_INCLUDE_DIR AND B2_LIBRARY )
+
+if( UNIX AND NOT( APPLE OR CYGWIN ) )
+    find_package( PkgConfig QUIET )
+    pkg_check_modules( PC_B2 QUIET libb2 )
+    if( PC_B2_FOUND )
+        set( B2_DEFINITIONS ${PC_B2_CFLAGS} ${PC_B2_CFLAGS_OTHER} )
+    endif( PC_B2_FOUND )
+endif( UNIX AND NOT( APPLE OR CYGWIN ) )
+
+set( B2_ROOT "" CACHE STRING "Path to libb2 library" )
+
+find_path(
+    B2_INCLUDE_DIR blake2.h
+    HINTS
+    ${B2_ROOT}/include
+    ${PC_B2_INCLUDEDIR}
+    ${PC_B2_INCLUDE_DIRS}
+)
+set(B2_NAMES
+    b2${D}
+    libb2${D}
+)
+find_library(
+    B2_LIBRARY
+    NAMES ${B2_NAMES}
+    HINTS
+    ${PC_B2_LIBDIR}
+    ${PC_B2_LIBRARY_DIRS}
+    ${B2_ROOT}/lib
+    ${B2_ROOT}/bin
+)
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(
+                B2
+                DEFAULT_MSG
+                B2_LIBRARY
+                B2_INCLUDE_DIR
+)
+if( B2_FOUND )
+    set( B2_LIBRARIES ${B2_LIBRARY} )
+    set( B2_INCLUDE_DIRS ${B2_INCLUDE_DIR} )
+endif( B2_FOUND )
+
+mark_as_advanced( B2_INCLUDE_DIR B2_LIBRARY )
diff --git a/configure b/configure
index d76a9b55..da9c922b 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Generated by qconf 2.0 ( http://delta.affinix.com/qconf/ )
+# Generated by qconf 2.0 ( https://github.com/psi-plus/qconf )
 #
 
 show_usage() {
@@ -41,222 +41,235 @@ Dependency options:
   --with-zlib-lib=[path]     Path to zlib library files
   --with-qjdns-inc=[path]    Path to QJDns include files
   --with-qjdns-lib=[path]    Path to QJDns library files
+  --with-b2-inc=[path]       Path to libb2 include files
+  --with-b2-lib=[path]       Path to libb2 library or framework files
 
 EOT
 }
 
 # which/make detection adapted from Qt
 which_command() {
-	ALL_MATCHES=
-	if [ "$1" = "-a" ]; then
-		ALL_MATCHES="-a"
-		shift
-	fi
-
-	OLD_HOME=$HOME
-	HOME=/dev/null
-	export HOME
-
-	WHICH=`which which 2>/dev/null`
-	if echo $WHICH | grep 'shell built-in command' >/dev/null 2>&1; then
-		WHICH=which
-	elif [ -z "$WHICH" ]; then
-		if which which >/dev/null 2>&1; then
-			WHICH=which
-		else
-			for a in /usr/ucb /usr/bin /bin /usr/local/bin; do
-				if [ -x $a/which ]; then
-					WHICH=$a/which
-					break
-				fi
-			done
-		fi
-	fi
-
-	RET_CODE=1
-	if [ -z "$WHICH" ]; then
-		OLD_IFS=$IFS
-		IFS=:
-		for a in $PATH; do
-			if [ -x $a/$1 ]; then
-				echo "$a/$1"
-				RET_CODE=0
-				[ -z "$ALL_MATCHES" ] && break
-			fi
-		done
-		IFS=$OLD_IFS
-		export IFS
-	else
-		a=`"$WHICH" "$ALL_MATCHES" "$1" 2>/dev/null`
-		if [ ! -z "$a" -a -x "$a" ]; then
-			echo "$a"
-			RET_CODE=0
-		fi
-	fi
-	HOME=$OLD_HOME
-	export HOME
-	return $RET_CODE
+    ALL_MATCHES=
+    if [ "$1" = "-a" ]; then
+        ALL_MATCHES="-a"
+        shift
+    fi
+
+    OLD_HOME=$HOME
+    HOME=/dev/null
+    export HOME
+
+    WHICH=`which which 2>/dev/null`
+    if echo $WHICH | grep 'shell built-in command' >/dev/null 2>&1; then
+        WHICH=which
+    elif [ -z "$WHICH" ]; then
+        if which which >/dev/null 2>&1; then
+            WHICH=which
+        else
+            for a in /usr/ucb /usr/bin /bin /usr/local/bin; do
+                if [ -x $a/which ]; then
+                    WHICH=$a/which
+                    break
+                fi
+            done
+        fi
+    fi
+
+    RET_CODE=1
+    if [ -z "$WHICH" ]; then
+        OLD_IFS=$IFS
+        IFS=:
+        for a in $PATH; do
+            if [ -x $a/$1 ]; then
+                echo "$a/$1"
+                RET_CODE=0
+                [ -z "$ALL_MATCHES" ] && break
+            fi
+        done
+        IFS=$OLD_IFS
+        export IFS
+    else
+        a=`"$WHICH" "$ALL_MATCHES" "$1" 2>/dev/null`
+        if [ ! -z "$a" -a -x "$a" ]; then
+            echo "$a"
+            RET_CODE=0
+        fi
+    fi
+    HOME=$OLD_HOME
+    export HOME
+    return $RET_CODE
 }
 WHICH=which_command
 
 # find a make command
 if [ -z "$MAKE" ]; then
-	MAKE=
-	for mk in gmake make; do
-		if $WHICH $mk >/dev/null 2>&1; then
-			MAKE=`$WHICH $mk`
-			break
-		fi
-	done
-	if [ -z "$MAKE" ]; then
-		echo "You don't seem to have 'make' or 'gmake' in your PATH."
-		echo "Cannot proceed."
-		exit 1
-	fi
+    MAKE=
+    for mk in gmake make; do
+        if $WHICH $mk >/dev/null 2>&1; then
+            MAKE=`$WHICH $mk`
+            break
+        fi
+    done
+    if [ -z "$MAKE" ]; then
+        echo "You don't seem to have 'make' or 'gmake' in your PATH."
+        echo "Cannot proceed."
+        exit 1
+    fi
 fi
 
 show_qt_info() {
-	printf "Be sure you have a proper Qt 4.0+ build environment set up.  This means not\n"
-	printf "just Qt, but also a C++ compiler, a make tool, and any other packages\n"
-	printf "necessary for compiling C++ programs.\n"
-	printf "\n"
-	printf "If you are certain everything is installed, then it could be that Qt is not\n"
-	printf "being recognized or that a different version of Qt is being detected by\n"
-	printf "mistake (for example, this could happen if \$QTDIR is pointing to a Qt 3\n"
-	printf "installation).  At least one of the following conditions must be satisfied:\n"
-	printf "\n"
-	printf " 1) --qtdir is set to the location of Qt\n"
-	printf " 2) \$QTDIR is set to the location of Qt\n"
-	printf " 3) QtCore is in the pkg-config database\n"
-	printf " 4) qmake is in the \$PATH\n"
-	printf "\n"
-	printf "This script will use the first one it finds to be true, checked in the above\n"
-	printf "order.  #3 and #4 are the recommended options.  #1 and #2 are mainly for\n"
-	printf "overriding the system configuration.\n"
-	printf "\n"
+    printf "Be sure you have a proper Qt 4.0+ build environment set up.  This means not\n"
+    printf "just Qt, but also a C++ compiler, a make tool, and any other packages\n"
+    printf "necessary for compiling C++ programs.\n"
+    printf "\n"
+    printf "If you are certain everything is installed, then it could be that Qt is not\n"
+    printf "being recognized or that a different version of Qt is being detected by\n"
+    printf "mistake (for example, this could happen if \$QTDIR is pointing to a Qt 3\n"
+    printf "installation).  At least one of the following conditions must be satisfied:\n"
+    printf "\n"
+    printf " 1) --qtdir is set to the location of Qt\n"
+    printf " 2) \$QTDIR is set to the location of Qt\n"
+    printf " 3) QtCore is in the pkg-config database\n"
+    printf " 4) qmake is in the \$PATH\n"
+    printf "\n"
+    printf "This script will use the first one it finds to be true, checked in the above\n"
+    printf "order.  #3 and #4 are the recommended options.  #1 and #2 are mainly for\n"
+    printf "overriding the system configuration.\n"
+    printf "\n"
 }
 
 while [ $# -gt 0 ]; do
-	optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-	case "$1" in
-		--qtdir=*)
-			EX_QTDIR=$optarg
-			shift
-			;;
-
-		--static)
-			QC_STATIC="Y"
-			shift
-			;;
-
-		--extraconf=*)
-			QC_EXTRACONF=$optarg
-			shift
-			;;
-
-		--release)
-			QC_RELEASE="Y"
-			shift
-			;;
-
-		--debug)
-			QC_DEBUG="Y"
-			shift
-			;;
-
-		--debug-and-release)
-			QC_DEBUG_AND_RELEASE="Y"
-			shift
-			;;
-
-		--no-separate-debug-info)
-			QC_NO_SEPARATE_DEBUG_INFO="Y"
-			shift
-			;;
-
-		--separate-debug-info)
-			QC_SEPARATE_DEBUG_INFO="Y"
-			shift
-			;;
-
-		--no-framework)
-			QC_NO_FRAMEWORK="Y"
-			shift
-			;;
-
-		--framework)
-			QC_FRAMEWORK="Y"
-			shift
-			;;
-
-		--universal)
-			QC_UNIVERSAL="Y"
-			shift
-			;;
-
-		--mac-sdk=*)
-			QC_MAC_SDK=$optarg
-			shift
-			;;
-
-		--enable-tests)
-			QC_ENABLE_TESTS="Y"
-			shift
-			;;
-
-		--with-idn-inc=*)
-			QC_WITH_IDN_INC=$optarg
-			shift
-			;;
-
-		--with-idn-lib=*)
-			QC_WITH_IDN_LIB=$optarg
-			shift
-			;;
-
-		--with-qca-inc=*)
-			QC_WITH_QCA_INC=$optarg
-			shift
-			;;
-
-		--with-qca-lib=*)
-			QC_WITH_QCA_LIB=$optarg
-			shift
-			;;
-
-		--with-zlib-inc=*)
-			QC_WITH_ZLIB_INC=$optarg
-			shift
-			;;
-
-		--with-zlib-lib=*)
-			QC_WITH_ZLIB_LIB=$optarg
-			shift
-			;;
-
-		--with-qjdns-inc=*)
-			QC_WITH_QJDNS_INC=$optarg
-			shift
-			;;
-
-		--with-qjdns-lib=*)
-			QC_WITH_QJDNS_LIB=$optarg
-			shift
-			;;
-
-		--verbose)
-			QC_VERBOSE="Y"
-			shift
-			;;
-		--qtselect=*)
-			QC_QTSELECT="${optarg}"
-			shift
-			;;
-		--help) show_usage; exit ;;
-		*) echo "configure: WARNING: unrecognized options: $1" >&2; shift; ;;
-	esac
+    optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
+    case "$1" in
+        --qtdir=*)
+            EX_QTDIR=$optarg
+            shift
+            ;;
+
+        --static)
+            QC_STATIC="Y"
+            shift
+            ;;
+
+        --extraconf=*)
+            QC_EXTRACONF=$optarg
+            shift
+            ;;
+
+        --release)
+            QC_RELEASE="Y"
+            shift
+            ;;
+
+        --debug)
+            QC_DEBUG="Y"
+            shift
+            ;;
+
+        --debug-and-release)
+            QC_DEBUG_AND_RELEASE="Y"
+            shift
+            ;;
+
+        --no-separate-debug-info)
+            QC_NO_SEPARATE_DEBUG_INFO="Y"
+            shift
+            ;;
+
+        --separate-debug-info)
+            QC_SEPARATE_DEBUG_INFO="Y"
+            shift
+            ;;
+
+        --no-framework)
+            QC_NO_FRAMEWORK="Y"
+            shift
+            ;;
+
+        --framework)
+            QC_FRAMEWORK="Y"
+            shift
+            ;;
+
+        --universal)
+            QC_UNIVERSAL="Y"
+            shift
+            ;;
+
+        --mac-sdk=*)
+            QC_MAC_SDK=$optarg
+            shift
+            ;;
+
+        --enable-tests)
+            QC_ENABLE_TESTS="Y"
+            shift
+            ;;
+
+        --with-idn-inc=*)
+            QC_WITH_IDN_INC=$optarg
+            shift
+            ;;
+
+        --with-idn-lib=*)
+            QC_WITH_IDN_LIB=$optarg
+            shift
+            ;;
+
+        --with-qca-inc=*)
+            QC_WITH_QCA_INC=$optarg
+            shift
+            ;;
+
+        --with-qca-lib=*)
+            QC_WITH_QCA_LIB=$optarg
+            shift
+            ;;
+
+        --with-zlib-inc=*)
+            QC_WITH_ZLIB_INC=$optarg
+            shift
+            ;;
+
+        --with-zlib-lib=*)
+            QC_WITH_ZLIB_LIB=$optarg
+            shift
+            ;;
+
+        --with-qjdns-inc=*)
+            QC_WITH_QJDNS_INC=$optarg
+            shift
+            ;;
+
+        --with-qjdns-lib=*)
+            QC_WITH_QJDNS_LIB=$optarg
+            shift
+            ;;
+
+        --with-b2-inc=*)
+            QC_WITH_B2_INC=$optarg
+            shift
+            ;;
+
+        --with-b2-lib=*)
+            QC_WITH_B2_LIB=$optarg
+            shift
+            ;;
+
+        --verbose)
+            QC_VERBOSE="Y"
+            shift
+            ;;
+        --qtselect=*)
+            QC_QTSELECT="${optarg}"
+            shift
+            ;;
+        --help) show_usage; exit ;;
+        *) echo "configure: WARNING: unrecognized options: $1" >&2; shift; ;;
+    esac
 done
 
+
 echo "Configuring Iris ..."
 
 if [ "$QC_VERBOSE" = "Y" ]; then
@@ -282,52 +295,54 @@ echo QC_WITH_ZLIB_INC=$QC_WITH_ZLIB_INC
 echo QC_WITH_ZLIB_LIB=$QC_WITH_ZLIB_LIB
 echo QC_WITH_QJDNS_INC=$QC_WITH_QJDNS_INC
 echo QC_WITH_QJDNS_LIB=$QC_WITH_QJDNS_LIB
+echo QC_WITH_B2_INC=$QC_WITH_B2_INC
+echo QC_WITH_B2_LIB=$QC_WITH_B2_LIB
 echo
 fi
 
 printf "Verifying Qt build environment ... "
 
 if [ -z "$QC_QTSELECT" ]; then
-	QC_QTSELECT="$(echo $QT_SELECT | tr -d "qt")"
+    QC_QTSELECT="$(echo $QT_SELECT | tr -d "qt")"
 fi
 
 if [ ! -z "$QC_QTSELECT" ]; then
-	QTSEARCHTEXT="$QC_QTSELECT"
+    QTSEARCHTEXT="$QC_QTSELECT"
 else
-	QTSEARCHTEXT="4 or 5"
+    QTSEARCHTEXT="4 or 5"
 fi
 
 # run qmake and check version
 qmake_check() {
-	if [ -x "$1" ]; then
-		cmd="\"$1\" -query QT_VERSION"
-		if [ "$QC_VERBOSE" = "Y" ]; then
-			echo "running: $cmd"
-		fi
-		vout=`/bin/sh -c "$cmd" 2>&1`
-		case "${vout}" in
-			*.*.*)
-				vmaj="${vout%%.*}"
-				if [ ! -z "$QC_QTSELECT" ]; then
-					if [ "$vmaj" = "$QC_QTSELECT" ]; then
-						return 0
-					fi
-				else
-					if [ "$vmaj" = "4" ] || [ "$vmaj" = "5" ]; then
-						return 0
-					fi
-				fi
-				;;
-		esac
-		if [ "$QC_VERBOSE" = "Y" ]; then
-			echo "Warning: $1 not for Qt ${QTSEARCHTEXT}"
-		fi
-	fi
-	return 1
+    if [ -x "$1" ]; then
+        cmd="\"$1\" -query QT_VERSION"
+        if [ "$QC_VERBOSE" = "Y" ]; then
+            echo "running: $cmd"
+        fi
+        vout=`/bin/sh -c "$cmd" 2>&1`
+        case "${vout}" in
+            *.*.*)
+                vmaj="${vout%%.*}"
+                if [ ! -z "$QC_QTSELECT" ]; then
+                    if [ "$vmaj" = "$QC_QTSELECT" ]; then
+                        return 0
+                    fi
+                else
+                    if [ "$vmaj" = "4" ] || [ "$vmaj" = "5" ]; then
+                        return 0
+                    fi
+                fi
+                ;;
+        esac
+        if [ "$QC_VERBOSE" = "Y" ]; then
+            echo "Warning: $1 not for Qt ${QTSEARCHTEXT}"
+        fi
+    fi
+    return 1
 }
 
 if [ "$QC_VERBOSE" = "Y" ]; then
-	echo
+    echo
 fi
 
 qm=""
@@ -335,160 +350,160 @@ qt4_names="qmake-qt4 qmake4"
 qt5_names="qmake-qt5 qmake5"
 names="qmake"
 if [ -z "$QC_QTSELECT" ]; then
-	names="${qt5_names} ${qt4_names} $names"
+    names="${qt5_names} ${qt4_names} $names"
 else
-	if [ "$QC_QTSELECT" = "4" ]; then
-		names="${qt4_names} $names"
-	elif [ "$QC_QTSELECT" -ge "5" ]; then
-		names="${qt5_names} $names"
-	fi
+    if [ "$QC_QTSELECT" = "4" ]; then
+        names="${qt4_names} $names"
+    elif [ "$QC_QTSELECT" -ge "5" ]; then
+        names="${qt5_names} $names"
+    fi
 fi
 
 if [ -z "$qm" ] && [ ! -z "$EX_QTDIR" ]; then
-	# qt4 check: --qtdir
-	for n in $names; do
-		qstr=$EX_QTDIR/bin/$n
-		if qmake_check "$qstr"; then
-			qm=$qstr
-			break
-		fi
-	done
-	if [ -z "$qm" ] && [ "$QC_VERBOSE" = "Y" ]; then
-		echo "Warning: qmake not found via --qtdir"
-	fi
+    # qt4 check: --qtdir
+    for n in $names; do
+        qstr=$EX_QTDIR/bin/$n
+        if qmake_check "$qstr"; then
+            qm=$qstr
+            break
+        fi
+    done
+    if [ -z "$qm" ] && [ "$QC_VERBOSE" = "Y" ]; then
+        echo "Warning: qmake not found via --qtdir"
+    fi
 
 elif [ -z "$qm" ] && [ ! -z "$QTDIR" ]; then
-	# qt4 check: QTDIR
-	for n in $names; do
-		qstr=$QTDIR/bin/$n
-		if qmake_check "$qstr"; then
-			qm=$qstr
-			break
-		fi
-	done
-	if [ -z "$qm" ] && [ "$QC_VERBOSE" = "Y" ]; then
-		echo "Warning: qmake not found via \$QTDIR"
-	fi
+    # qt4 check: QTDIR
+    for n in $names; do
+        qstr=$QTDIR/bin/$n
+        if qmake_check "$qstr"; then
+            qm=$qstr
+            break
+        fi
+    done
+    if [ -z "$qm" ] && [ "$QC_VERBOSE" = "Y" ]; then
+        echo "Warning: qmake not found via \$QTDIR"
+    fi
 
 else
-	# Try all other implicit checks
-
-	# qtchooser
-	if [ -z "$qm" ]; then
-		qtchooser=$($WHICH qtchooser 2>/dev/null)
-		if [ ! -z "$qtchooser" ]; then
-			if [ ! -z "$QC_QTSELECT" ]; then
-				versions="$QC_QTSELECT"
-			else
-				cmd="$qtchooser --list-versions"
-				if [ "$QC_VERBOSE" = "Y" ]; then
-					echo "running: $cmd"
-				fi
-				versions=`$cmd`
-			fi
-			for version in $versions; do
-				cmd="$qtchooser -run-tool=qmake -qt=${version} -query QT_INSTALL_BINS"
-				if [ "$QC_VERBOSE" = "Y" ]; then
-					echo "running: $cmd"
-				fi
-				qtbins=`$cmd 2>/dev/null`
-				if [ ! -z "$qtbins" ] && qmake_check "$qtbins/qmake"; then
-					qm="$qtbins/qmake"
-					break
-				fi
-			done
-		fi
-	fi
-	if [ -z "$qm" ] && [ "$QC_VERBOSE" = "Y" ]; then
-		echo "Warning: qmake not found via qtchooser"
-	fi
-
-	# qt4: pkg-config
-	if [ -z "$qm" ]; then
-		cmd="pkg-config QtCore --variable=exec_prefix"
-		if [ "$QC_VERBOSE" = "Y" ]; then
-			echo "running: $cmd"
-		fi
-		str=`$cmd 2>/dev/null`
-		if [ ! -z "$str" ]; then
-			for n in $names; do
-				qstr=$str/bin/$n
-				if qmake_check "$qstr"; then
-					qm=$qstr
-					break
-				fi
-			done
-		fi
-	fi
-	if [ -z "$qm" ] && [ "$QC_VERBOSE" = "Y" ]; then
-		echo "Warning: qmake not found via pkg-config"
-	fi
-
-	# qmake in PATH
-	if [ -z "$qm" ]; then
-		for n in $names; do
-			qstr=`$WHICH -a $n 2>/dev/null`
-			for q in $qstr; do
-				if qmake_check "$q"; then
-					qm="$q"
-					break
-				fi
-			done
-			if [ ! -z "$qm" ]; then
-				break
-			fi
-		done
-	fi
-	if [ -z "$qm" ] && [ "$QC_VERBOSE" = "Y" ]; then
-		echo "Warning: qmake not found via \$PATH"
-	fi
-
-	# end of implicit checks
+    # Try all other implicit checks
+
+    # qtchooser
+    if [ -z "$qm" ]; then
+        qtchooser=$($WHICH qtchooser 2>/dev/null)
+        if [ ! -z "$qtchooser" ]; then
+            if [ ! -z "$QC_QTSELECT" ]; then
+                versions="$QC_QTSELECT"
+            else
+                cmd="$qtchooser --list-versions"
+                if [ "$QC_VERBOSE" = "Y" ]; then
+                    echo "running: $cmd"
+                fi
+                versions=`$cmd`
+            fi
+            for version in $versions; do
+                cmd="$qtchooser -run-tool=qmake -qt=${version} -query QT_INSTALL_BINS"
+                if [ "$QC_VERBOSE" = "Y" ]; then
+                    echo "running: $cmd"
+                fi
+                qtbins=`$cmd 2>/dev/null`
+                if [ ! -z "$qtbins" ] && qmake_check "$qtbins/qmake"; then
+                    qm="$qtbins/qmake"
+                    break
+                fi
+            done
+        fi
+    fi
+    if [ -z "$qm" ] && [ "$QC_VERBOSE" = "Y" ]; then
+        echo "Warning: qmake not found via qtchooser"
+    fi
+
+    # qt4: pkg-config
+    if [ -z "$qm" ]; then
+        cmd="pkg-config QtCore --variable=exec_prefix"
+        if [ "$QC_VERBOSE" = "Y" ]; then
+            echo "running: $cmd"
+        fi
+        str=`$cmd 2>/dev/null`
+        if [ ! -z "$str" ]; then
+            for n in $names; do
+                qstr=$str/bin/$n
+                if qmake_check "$qstr"; then
+                    qm=$qstr
+                    break
+                fi
+            done
+        fi
+    fi
+    if [ -z "$qm" ] && [ "$QC_VERBOSE" = "Y" ]; then
+        echo "Warning: qmake not found via pkg-config"
+    fi
+
+    # qmake in PATH
+    if [ -z "$qm" ]; then
+        for n in $names; do
+            qstr=`$WHICH -a $n 2>/dev/null`
+            for q in $qstr; do
+                if qmake_check "$q"; then
+                    qm="$q"
+                    break
+                fi
+            done
+            if [ ! -z "$qm" ]; then
+                break
+            fi
+        done
+    fi
+    if [ -z "$qm" ] && [ "$QC_VERBOSE" = "Y" ]; then
+        echo "Warning: qmake not found via \$PATH"
+    fi
+
+    # end of implicit checks
 fi
 
 if [ -z "$qm" ]; then
-	if [ "$QC_VERBOSE" = "Y" ]; then
-		echo " -> fail"
-	else
-		echo "fail"
-	fi
-	printf "\n"
-	printf "Reason: Unable to find the 'qmake' tool for Qt ${QTSEARCHTEXT}.\n"
-	printf "\n"
-	show_qt_info
-	exit 1;
+    if [ "$QC_VERBOSE" = "Y" ]; then
+        echo " -> fail"
+    else
+        echo "fail"
+    fi
+    printf "\n"
+    printf "Reason: Unable to find the 'qmake' tool for Qt ${QTSEARCHTEXT}.\n"
+    printf "\n"
+    show_qt_info
+    exit 1;
 fi
 if [ "$QC_VERBOSE" = "Y" ]; then
-	echo qmake found in "$qm"
+    echo qmake found in "$qm"
 fi
 
 # try to determine the active makespec
 defmakespec=$QMAKESPEC
 if [ -z "$defmakespec" ]; then
-	if $WHICH readlink >/dev/null 2>&1; then
-		READLINK=`$WHICH readlink`
-	fi
-	if [ ! -z "$READLINK" ]; then
-		qt_mkspecsdir=`"$qm" -query QT_INSTALL_DATA`/mkspecs
-		if [ -d "$qt_mkspecsdir" ] && [ -h "$qt_mkspecsdir/default" ]; then
-			defmakespec=`$READLINK $qt_mkspecsdir/default`
-		fi
-	fi
+    if $WHICH readlink >/dev/null 2>&1; then
+        READLINK=`$WHICH readlink`
+    fi
+    if [ ! -z "$READLINK" ]; then
+        qt_mkspecsdir=`"$qm" -query QT_INSTALL_DATA`/mkspecs
+        if [ -d "$qt_mkspecsdir" ] && [ -h "$qt_mkspecsdir/default" ]; then
+            defmakespec=`$READLINK $qt_mkspecsdir/default`
+        fi
+    fi
 fi
 
 if [ "$QC_VERBOSE" = "Y" ]; then
-	echo makespec is $defmakespec
+    echo makespec is $defmakespec
 fi
 
 qm_spec=""
 # if the makespec is macx-xcode, force macx-g++
 if [ "$defmakespec" = "macx-xcode" ]; then
-	qm_spec=macx-g++
-	QMAKESPEC=$qm_spec
-	export QMAKESPEC
-	if [ "$QC_VERBOSE" = "Y" ]; then
-		echo overriding makespec to $qm_spec
-	fi
+    qm_spec=macx-g++
+    QMAKESPEC=$qm_spec
+    export QMAKESPEC
+    if [ "$QC_VERBOSE" = "Y" ]; then
+        echo overriding makespec to $qm_spec
+    fi
 fi
 
 gen_files() {
@@ -502,17 +517,17 @@ name: Qt >= 4.2
 class qc_qt42 : public ConfObj
 {
 public:
-	qc_qt42(Conf *c) : ConfObj(c) {}
-	QString name() const { return "Qt >= 4.2"; }
-	QString shortname() const { return "qt42"; }
-	bool exec()
-	{
-		conf->debug(QString("QT_VERSION = 0x%1").arg(QString::number(QT_VERSION, 16)));
-		if(QT_VERSION >= 0x040200)
-			return true;
-		else
-			return false;
-	}
+    qc_qt42(Conf *c) : ConfObj(c) {}
+    QString name() const { return "Qt >= 4.2"; }
+    QString shortname() const { return "qt42"; }
+    bool exec()
+    {
+        conf->debug(QString("QT_VERSION = 0x%1").arg(QString::number(QT_VERSION, 16)));
+        if(QT_VERSION >= 0x040200)
+            return true;
+        else
+            return false;
+    }
 };
 #line 1 "buildmode.qcm"
 /*
@@ -538,183 +553,183 @@ bool qc_buildmode_separate_debug_info = false;
 class qc_buildmode : public ConfObj
 {
 public:
-	qc_buildmode(Conf *c) : ConfObj(c) {}
-	QString name() const { return "buildmode"; }
-	QString shortname() const { return "buildmode"; }
-
-	// no output
-	QString checkString() const { return QString(); }
-
-	bool exec()
-	{
-		// first, parse out the options
-		bool opt_release = false;
-		bool opt_debug = false;
-		bool opt_debug_and_release = false;
-		bool opt_no_framework = false;
-		bool opt_framework = false;
-		bool opt_no_separate_debug_info = false;
-		bool opt_separate_debug_info = false;
-
-		if(conf->getenv("QC_RELEASE") == "Y")
-			opt_release = true;
-		if(conf->getenv("QC_DEBUG") == "Y")
-			opt_debug = true;
-		if(conf->getenv("QC_DEBUG_AND_RELEASE") == "Y")
-			opt_debug_and_release = true;
-		if(conf->getenv("QC_NO_FRAMEWORK") == "Y")
-			opt_no_framework = true;
-		if(conf->getenv("QC_FRAMEWORK") == "Y")
-			opt_framework = true;
-		if(conf->getenv("QC_NO_SEPARATE_DEBUG_INFO") == "Y")
-			opt_no_separate_debug_info = true;
-		if(conf->getenv("QC_SEPARATE_DEBUG_INFO") == "Y")
-			opt_separate_debug_info = true;
-
-		bool staticmode = false;
-		if(conf->getenv("QC_STATIC") == "Y")
-			staticmode = true;
+    qc_buildmode(Conf *c) : ConfObj(c) {}
+    QString name() const { return "buildmode"; }
+    QString shortname() const { return "buildmode"; }
+
+    // no output
+    QString checkString() const { return QString(); }
+
+    bool exec()
+    {
+        // first, parse out the options
+        bool opt_release = false;
+        bool opt_debug = false;
+        bool opt_debug_and_release = false;
+        bool opt_no_framework = false;
+        bool opt_framework = false;
+        bool opt_no_separate_debug_info = false;
+        bool opt_separate_debug_info = false;
+
+        if(conf->getenv("QC_RELEASE") == "Y")
+            opt_release = true;
+        if(conf->getenv("QC_DEBUG") == "Y")
+            opt_debug = true;
+        if(conf->getenv("QC_DEBUG_AND_RELEASE") == "Y")
+            opt_debug_and_release = true;
+        if(conf->getenv("QC_NO_FRAMEWORK") == "Y")
+            opt_no_framework = true;
+        if(conf->getenv("QC_FRAMEWORK") == "Y")
+            opt_framework = true;
+        if(conf->getenv("QC_NO_SEPARATE_DEBUG_INFO") == "Y")
+            opt_no_separate_debug_info = true;
+        if(conf->getenv("QC_SEPARATE_DEBUG_INFO") == "Y")
+            opt_separate_debug_info = true;
+
+        bool staticmode = false;
+        if(conf->getenv("QC_STATIC") == "Y")
+            staticmode = true;
 
 #ifndef Q_OS_MAC
-		if(opt_debug_and_release)
-		{
-			printf("\\nError: The --debug-and-release option is for mac only.\\n");
-			exit(1);
-		}
-
-		if(opt_framework)
-		{
-			printf("\\nError: The --framework option is for mac only.\\n");
-			exit(1);
-		}
+        if(opt_debug_and_release)
+        {
+            printf("\\nError: The --debug-and-release option is for mac only.\\n");
+            exit(1);
+        }
+
+        if(opt_framework)
+        {
+            printf("\\nError: The --framework option is for mac only.\\n");
+            exit(1);
+        }
 #endif
 
-		if(opt_framework && opt_debug)
-		{
-			printf("\\nError: Cannot use both --framework and --debug.\\n");
-			exit(1);
-		}
-
-		// sanity check exclusive options
-		int x;
-
-		// build mode
-		x = 0;
-		if(opt_release)
-			++x;
-		if(opt_debug)
-			++x;
-		if(opt_debug_and_release)
-			++x;
-		if(x > 1)
-		{
-			printf("\\nError: Use only one of --release, --debug, or --debug-and-release.\\n");
-			exit(1);
-		}
-
-		// framework
-		if(opt_framework && staticmode)
-		{
-			printf("\\nError: Cannot use both --framework and --static.\\n");
-			exit(1);
-		}
-
-		x = 0;
-		if(opt_no_framework)
-			++x;
-		if(opt_framework)
-			++x;
-		if(x > 1)
-		{
-			printf("\\nError: Use only one of --framework or --no-framework.\\n");
-			exit(1);
-		}
-
-		// debug info
-		x = 0;
-		if(opt_no_separate_debug_info)
-			++x;
-		if(opt_separate_debug_info)
-			++x;
-		if(x > 1)
-		{
-			printf("\\nError: Use only one of --separate-debug-info or --no-separate-debug-info\\n");
-			exit(1);
-		}
-
-		// now process the options
-
-		if(opt_release)
-			qc_buildmode_release = true;
-		else if(opt_debug)
-			qc_buildmode_debug = true;
-		else if(opt_debug_and_release)
-		{
-			qc_buildmode_release = true;
-			qc_buildmode_debug = true;
-		}
-		else // default
-			qc_buildmode_release = true;
-
-		if(opt_framework)
-			qc_buildmode_framework = true;
-		else if(opt_no_framework)
-		{
-			// nothing to do
-		}
-		else // default
-		{
-			if(!staticmode && !opt_debug)
-				qc_buildmode_framework = true;
-		}
-
-		if(opt_separate_debug_info)
-			qc_buildmode_separate_debug_info = true;
-		else if(opt_no_separate_debug_info)
-		{
-			// nothing to do
-		}
-		else // default
-		{
+        if(opt_framework && opt_debug)
+        {
+            printf("\\nError: Cannot use both --framework and --debug.\\n");
+            exit(1);
+        }
+
+        // sanity check exclusive options
+        int x;
+
+        // build mode
+        x = 0;
+        if(opt_release)
+            ++x;
+        if(opt_debug)
+            ++x;
+        if(opt_debug_and_release)
+            ++x;
+        if(x > 1)
+        {
+            printf("\\nError: Use only one of --release, --debug, or --debug-and-release.\\n");
+            exit(1);
+        }
+
+        // framework
+        if(opt_framework && staticmode)
+        {
+            printf("\\nError: Cannot use both --framework and --static.\\n");
+            exit(1);
+        }
+
+        x = 0;
+        if(opt_no_framework)
+            ++x;
+        if(opt_framework)
+            ++x;
+        if(x > 1)
+        {
+            printf("\\nError: Use only one of --framework or --no-framework.\\n");
+            exit(1);
+        }
+
+        // debug info
+        x = 0;
+        if(opt_no_separate_debug_info)
+            ++x;
+        if(opt_separate_debug_info)
+            ++x;
+        if(x > 1)
+        {
+            printf("\\nError: Use only one of --separate-debug-info or --no-separate-debug-info\\n");
+            exit(1);
+        }
+
+        // now process the options
+
+        if(opt_release)
+            qc_buildmode_release = true;
+        else if(opt_debug)
+            qc_buildmode_debug = true;
+        else if(opt_debug_and_release)
+        {
+            qc_buildmode_release = true;
+            qc_buildmode_debug = true;
+        }
+        else // default
+            qc_buildmode_release = true;
+
+        if(opt_framework)
+            qc_buildmode_framework = true;
+        else if(opt_no_framework)
+        {
+            // nothing to do
+        }
+        else // default
+        {
+            if(!staticmode && !opt_debug)
+                qc_buildmode_framework = true;
+        }
+
+        if(opt_separate_debug_info)
+            qc_buildmode_separate_debug_info = true;
+        else if(opt_no_separate_debug_info)
+        {
+            // nothing to do
+        }
+        else // default
+        {
 #ifndef Q_OS_MAC
-			qc_buildmode_separate_debug_info = true;
+            qc_buildmode_separate_debug_info = true;
 #endif
-		}
-
-		// make the string
-		QStringList opts;
-		QString other;
-
-		if(qc_buildmode_release && qc_buildmode_debug)
-		{
-			opts += "debug_and_release";
-			opts += "build_all";
-		}
-		else if(qc_buildmode_release)
-			opts += "release";
-		else // qc_buildmode_debug
-			opts += "debug";
+        }
+
+        // make the string
+        QStringList opts;
+        QString other;
+
+        if(qc_buildmode_release && qc_buildmode_debug)
+        {
+            opts += "debug_and_release";
+            opts += "build_all";
+        }
+        else if(qc_buildmode_release)
+            opts += "release";
+        else // qc_buildmode_debug
+            opts += "debug";
 
 #ifdef Q_OS_MAC
-		if(qc_buildmode_framework)
-			opts += "lib_bundle";
+        if(qc_buildmode_framework)
+            opts += "lib_bundle";
 #endif
 
-		if(qc_buildmode_separate_debug_info)
-		{
-			opts += "separate_debug_info";
-			other += "QMAKE_CFLAGS += -g\\n";
-			other += "QMAKE_CXXFLAGS += -g\\n";
-		}
+        if(qc_buildmode_separate_debug_info)
+        {
+            opts += "separate_debug_info";
+            other += "QMAKE_CFLAGS += -g\\n";
+            other += "QMAKE_CXXFLAGS += -g\\n";
+        }
 
-		QString str = QString("CONFIG += ") + opts.join(" ") + '\\n';
-		conf->addExtra(str);
+        QString str = QString("CONFIG += ") + opts.join(" ") + '\\n';
+        conf->addExtra(str);
 
-		if(!other.isEmpty())
-			conf->addExtra(other);
+        if(!other.isEmpty())
+            conf->addExtra(other);
 
-		return true;
-	}
+        return true;
+    }
 };
 #line 1 "universal.qcm"
 /*
@@ -736,35 +751,35 @@ QString qc_universal_sdk;
 class qc_universal : public ConfObj
 {
 public:
-	qc_universal(Conf *c) : ConfObj(c) {}
-	QString name() const { return "Mac universal binary support"; }
-	QString shortname() const { return "universal"; }
-	QString checkString() const { return QString(); }
+    qc_universal(Conf *c) : ConfObj(c) {}
+    QString name() const { return "Mac universal binary support"; }
+    QString shortname() const { return "universal"; }
+    QString checkString() const { return QString(); }
 
-	bool exec()
-	{
+    bool exec()
+    {
 #ifdef Q_OS_MAC
-		if(qc_getenv("QC_UNIVERSAL") == "Y")
-		{
-			qc_universal_enabled = true;
-
-			QString str =
-			"contains(QT_CONFIG,x86):contains(QT_CONFIG,ppc) {\\n"
-			"	CONFIG += x86 ppc\\n"
-			"}\\n";
-
-			QString sdk = qc_getenv("QC_MAC_SDK");
-			if(!sdk.isEmpty())
-			{
-				str += QString("QMAKE_MAC_SDK = %1\\n").arg(sdk);
-				qc_universal_sdk = sdk;
-			}
-
-			conf->addExtra(str);
-		}
+        if(qc_getenv("QC_UNIVERSAL") == "Y")
+        {
+            qc_universal_enabled = true;
+
+            QString str =
+            "contains(QT_CONFIG,x86):contains(QT_CONFIG,ppc) {\\n"
+            "    CONFIG += x86 ppc\\n"
+            "}\\n";
+
+            QString sdk = qc_getenv("QC_MAC_SDK");
+            if(!sdk.isEmpty())
+            {
+                str += QString("QMAKE_MAC_SDK = %1\\n").arg(sdk);
+                qc_universal_sdk = sdk;
+            }
+
+            conf->addExtra(str);
+        }
 #endif
-		return true;
-	}
+        return true;
+    }
 };
 #line 1 "idn.qcm"
 /*
@@ -781,47 +796,47 @@ arg: with-idn-lib=[path],Path to libidn library or framework files
 class qc_idn : public ConfObj
 {
 public:
-	qc_idn(Conf *c) : ConfObj(c) {}
-	QString name() const { return "LibIDN"; }
-	QString shortname() const { return "libidn"; }
-	bool exec()
-	{
-		QString idn_incdir, idn_libdir;
-		idn_incdir = conf->getenv("QC_WITH_IDN_INC");
-		idn_libdir = conf->getenv("QC_WITH_IDN_LIB");
-
-		if (!idn_incdir.isEmpty() || !idn_libdir.isEmpty()) { // prefer this if given
-			if ((!idn_incdir.isEmpty() && conf->checkHeader(idn_incdir, "stringprep.h")) ||
-			    (idn_incdir.isEmpty() && conf->findHeader("stringprep.h", QStringList(), &idn_incdir))) {
-				conf->addIncludePath(idn_incdir);
-			} else {
-				printf("Headers not found!\\n");
-				return false;
-			}
-
-			if((!idn_libdir.isEmpty() && conf->checkLibrary(idn_libdir, "idn")) ||
-			   (idn_libdir.isEmpty() && conf->findLibrary("idn", &idn_libdir))) {
-				conf->addLib(idn_libdir.isEmpty()? "-lidn" : QString("-L%1 -lidn").arg(idn_libdir));
-			} else {
-				printf("Libraries not found!\\n");
-				return false;
-			}
-			return true;
-		}
-
-		QStringList incs;
-		QString version, libs, other;
-		if(conf->findPkgConfig("libidn", VersionAny, QString::null, &version, &incs, &libs, &other))
-		{
-			for(int n = 0; n < incs.count(); ++n)
-				conf->addIncludePath(incs[n]);
-			if(!libs.isEmpty())
-				conf->addLib(libs);
-			return true;
-		}
-
-		return false;
-	}
+    qc_idn(Conf *c) : ConfObj(c) {}
+    QString name() const { return "LibIDN"; }
+    QString shortname() const { return "libidn"; }
+    bool exec()
+    {
+        QString idn_incdir, idn_libdir;
+        idn_incdir = conf->getenv("QC_WITH_IDN_INC");
+        idn_libdir = conf->getenv("QC_WITH_IDN_LIB");
+
+        if (!idn_incdir.isEmpty() || !idn_libdir.isEmpty()) { // prefer this if given
+            if ((!idn_incdir.isEmpty() && conf->checkHeader(idn_incdir, "stringprep.h")) ||
+                (idn_incdir.isEmpty() && conf->findHeader("stringprep.h", QStringList(), &idn_incdir))) {
+                conf->addIncludePath(idn_incdir);
+            } else {
+                printf("Headers not found!\\n");
+                return false;
+            }
+
+            if((!idn_libdir.isEmpty() && conf->checkLibrary(idn_libdir, "idn")) ||
+               (idn_libdir.isEmpty() && conf->findLibrary("idn", &idn_libdir))) {
+                conf->addLib(idn_libdir.isEmpty()? "-lidn" : QString("-L%1 -lidn").arg(idn_libdir));
+            } else {
+                printf("Libraries not found!\\n");
+                return false;
+            }
+            return true;
+        }
+
+        QStringList incs;
+        QString version, libs, other;
+        if(conf->findPkgConfig("libidn", VersionAny, QString::null, &version, &incs, &libs, &other))
+        {
+            for(int n = 0; n < incs.count(); ++n)
+                conf->addIncludePath(incs[n]);
+            if(!libs.isEmpty())
+                conf->addLib(libs);
+            return true;
+        }
+
+        return false;
+    }
 };
 #line 1 "qca.qcm"
 /*
@@ -849,10 +864,10 @@ static QString internal_crypto_prf(const QString &incdir, const QString &libdir,
 "!isEmpty(QCA_FRAMEWORKDIR): {\\n"
 "    framework_dir = \$\$QCA_FRAMEWORKDIR\\n"
 "    exists(\$\$framework_dir/\$\${QCA_NAME}.framework) {\\n"
-"    	#QMAKE_FRAMEWORKPATH *= \$\$framework_dir\\n"
-"    	LIBS *= -F\$\$framework_dir\\n"
-"    	INCLUDEPATH += \$\$framework_dir/\$\${QCA_NAME}.framework/Headers\\n"
-"    	LINKAGE = -framework \$\${QCA_NAME}\\n"
+"        #QMAKE_FRAMEWORKPATH *= \$\$framework_dir\\n"
+"        LIBS *= -F\$\$framework_dir\\n"
+"        INCLUDEPATH += \$\$framework_dir/\$\${QCA_NAME}.framework/Headers\\n"
+"        LINKAGE = -framework \$\${QCA_NAME}\\n"
 "    }\\n"
 "}\\n"
 "\\n"
@@ -862,8 +877,8 @@ static QString internal_crypto_prf(const QString &incdir, const QString &libdir,
 "    !isEmpty(QCA_LIBDIR):LIBS += -L\$\$QCA_LIBDIR\\n"
 "    LINKAGE = -l\$\${QCA_NAME}\\n"
 "    CONFIG(debug, debug|release) {\\n"
-"    	windows:LINKAGE = -l\$\${QCA_NAME}d\\n"
-"    	mac:LINKAGE = -l\$\${QCA_NAME}_debug\\n"
+"        windows:LINKAGE = -l\$\${QCA_NAME}d\\n"
+"        mac:LINKAGE = -l\$\${QCA_NAME}_debug\\n"
 "    }\\n"
 "}\\n"
 "\\n"
@@ -878,9 +893,9 @@ static bool qca_try(Conf *conf, const QString &incdir, const QString &libdir, co
     QString proextra;
     QString prf;
     if (!incdir.isEmpty() || !libdir.isEmpty() || !frameworkdir.isEmpty()) {
-    	prf = internal_crypto_prf(conf->escapePath(incdir), conf->escapePath(libdir), frameworkdir);
+        prf = internal_crypto_prf(conf->escapePath(incdir), conf->escapePath(libdir), frameworkdir);
     } else {
-    	prf = "CONFIG += crypto\\n";
+        prf = "CONFIG += crypto\\n";
     }
     proextra =
     "CONFIG += qt\\n"
@@ -893,24 +908,24 @@ static bool qca_try(Conf *conf, const QString &incdir, const QString &libdir, co
     "\\n"
     "int main()\\n"
     "{\\n"
-    "	unsigned long x = QCA_VERSION;\\n"
-    "	if(x >= 0x020000 && x < 0x030000) return 0; else return 1;\\n"
+    "    unsigned long x = QCA_VERSION;\\n"
+    "    if(x >= 0x020000 && x < 0x030000) return 0; else return 1;\\n"
     "}\\n";
 
     // test desired versions, potentially both release and debug
 
     if(release)
     {
-    	int ret;
-    	if(!conf->doCompileAndLink(str, QStringList(), QString(), proextra + "CONFIG += release\\n", &ret) || ret != 0)
-    		return false;
+        int ret;
+        if(!conf->doCompileAndLink(str, QStringList(), QString(), proextra + "CONFIG += release\\n", &ret) || ret != 0)
+            return false;
     }
 
     if(debug)
     {
-    	int ret;
-    	if(!conf->doCompileAndLink(str, QStringList(), QString(), proextra + "CONFIG += debug\\n", &ret) || ret != 0)
-    		return false;
+        int ret;
+        if(!conf->doCompileAndLink(str, QStringList(), QString(), proextra + "CONFIG += debug\\n", &ret) || ret != 0)
+            return false;
     }
 
     *_prf = prf;
@@ -944,42 +959,42 @@ public:
     QString shortname() const { return "qca"; }
     bool exec()
     {
-    	// get the build mode
+        // get the build mode
 #ifdef QC_BUILDMODE
-    	bool release = qc_buildmode_release;
-    	bool debug = qc_buildmode_debug;
+        bool release = qc_buildmode_release;
+        bool debug = qc_buildmode_debug;
 #else
-    	// else, default to just release mode
-    	bool release = true;
-    	bool debug = false;
+        // else, default to just release mode
+        bool release = true;
+        bool debug = false;
 #endif
 
-    	QString qca_incdir, qca_libdir, qca_crypto_prf;
-    	qca_incdir = conf->getenv("QC_WITH_QCA_INC");
-    	qca_libdir = conf->getenv("QC_WITH_QCA_LIB");
+        QString qca_incdir, qca_libdir, qca_crypto_prf;
+        qca_incdir = conf->getenv("QC_WITH_QCA_INC");
+        qca_libdir = conf->getenv("QC_WITH_QCA_LIB");
 
 #if defined(Q_OS_MAC)
-    	if(!qca_libdir.isEmpty() && qca_try_framework(conf, qca_libdir, release, debug, &qca_crypto_prf))
-    	{
-    		conf->addExtra(qca_crypto_prf);
-    		return true;
-    	}
+        if(!qca_libdir.isEmpty() && qca_try_framework(conf, qca_libdir, release, debug, &qca_crypto_prf))
+        {
+            conf->addExtra(qca_crypto_prf);
+            return true;
+        }
 #endif
 
-    	if(!qca_incdir.isEmpty() && !qca_libdir.isEmpty() && qca_try_lib(conf, qca_incdir, qca_libdir, release, debug, &qca_crypto_prf))
-    	{
-    		conf->addExtra(qca_crypto_prf);
-    		return true;
-    	}
-    	
-    	if (qca_try_ext_prf(conf, release, debug, &qca_crypto_prf))
-    	{
-    		conf->addExtra(qca_crypto_prf);
-    		return true;
-    	}
-
-    	QStringList incs;
-    	QString version, libs, other;
+        if(!qca_incdir.isEmpty() && !qca_libdir.isEmpty() && qca_try_lib(conf, qca_incdir, qca_libdir, release, debug, &qca_crypto_prf))
+        {
+            conf->addExtra(qca_crypto_prf);
+            return true;
+        }
+
+        if (qca_try_ext_prf(conf, release, debug, &qca_crypto_prf))
+        {
+            conf->addExtra(qca_crypto_prf);
+            return true;
+        }
+
+        QStringList incs;
+        QString version, libs, other;
 
         if(conf->findPkgConfig("qca2-qt5", VersionMin, "2.0.0", &version, &incs, &libs, &other))
         {
@@ -990,27 +1005,27 @@ public:
             return true;
         }
 
-    	QStringList prefixes;
+        QStringList prefixes;
 #ifndef Q_OS_WIN
         prefixes += "/usr";
-    	prefixes += "/usr/local";
+        prefixes += "/usr/local";
 #endif
         QString prefix = conf->getenv("PREFIX");
         if (!prefix.isEmpty()) {
             prefixes += prefix;
         }
 
-    	for(int n = 0; n < prefixes.count(); ++n)
-    	{
-    		const QString &prefix = prefixes[n];
-    		if(qca_try_lib(conf, prefix + "/include", prefix + "/lib", release, debug, &qca_crypto_prf))
-    		{
-    			conf->addExtra(qca_crypto_prf);
-    			return true;
-    		}
-    	}
-
-    	return false;
+        for(int n = 0; n < prefixes.count(); ++n)
+        {
+            const QString &prefix = prefixes[n];
+            if(qca_try_lib(conf, prefix + "/include", prefix + "/lib", release, debug, &qca_crypto_prf))
+            {
+                conf->addExtra(qca_crypto_prf);
+                return true;
+            }
+        }
+
+        return false;
     }
 };
 #line 1 "zlib.qcm"
@@ -1028,46 +1043,46 @@ arg: with-zlib-lib=[path],Path to zlib library files
 class qc_zlib : public ConfObj
 {
 public:
-	qc_zlib(Conf *c) : ConfObj(c) {}
-	QString name() const { return "zlib"; }
-	QString shortname() const { return "zlib"; }
-	bool exec()
-	{
-		QString inc, lib;
-		QString s;
-
-		s = conf->getenv("QC_WITH_ZLIB_INC");
-		if(!s.isEmpty()) {
-			if(!conf->checkHeader(s, "zlib.h"))
-				return false;
-			inc = s;
-		}
-		else {
-			if(!conf->findHeader("zlib.h", QStringList(), &s))
-				return false;
-			inc = s;
-		}
-
-		s = conf->getenv("QC_WITH_ZLIB_LIB");
-		if(!s.isEmpty()) {
-			if(!conf->checkLibrary(s, "z"))
-				return false;
-			lib = s;
-		}
-		else {
-			if(!conf->findLibrary("z", &s))
-				return false;
-			lib = s;
-		}
-
-		if(!inc.isEmpty())
-			conf->addIncludePath(inc);
-		if(!lib.isEmpty())
-			conf->addLib(QString("-L") + s);
-		conf->addLib("-lz");
-
-		return true;
-	}
+    qc_zlib(Conf *c) : ConfObj(c) {}
+    QString name() const { return "zlib"; }
+    QString shortname() const { return "zlib"; }
+    bool exec()
+    {
+        QString inc, lib;
+        QString s;
+
+        s = conf->getenv("QC_WITH_ZLIB_INC");
+        if(!s.isEmpty()) {
+            if(!conf->checkHeader(s, "zlib.h"))
+                return false;
+            inc = s;
+        }
+        else {
+            if(!conf->findHeader("zlib.h", QStringList(), &s))
+                return false;
+            inc = s;
+        }
+
+        s = conf->getenv("QC_WITH_ZLIB_LIB");
+        if(!s.isEmpty()) {
+            if(!conf->checkLibrary(s, "z"))
+                return false;
+            lib = s;
+        }
+        else {
+            if(!conf->findLibrary("z", &s))
+                return false;
+            lib = s;
+        }
+
+        if(!inc.isEmpty())
+            conf->addIncludePath(inc);
+        if(!lib.isEmpty())
+            conf->addLib(QString("-L") + s);
+        conf->addLib("-lz");
+
+        return true;
+    }
 };
 #line 1 "extra.qcm"
 /*
@@ -1081,76 +1096,76 @@ arg: enable-tests,Build examples and unittests.
 class qc_extra : public ConfObj
 {
 public:
-	qc_extra(Conf *c) : ConfObj(c) {}
-	QString name() const { return "extra"; }
-	QString shortname() const { return "extra"; }
+    qc_extra(Conf *c) : ConfObj(c) {}
+    QString name() const { return "extra"; }
+    QString shortname() const { return "extra"; }
 
-	// no output
-	QString checkString() const { return QString(); }
+    // no output
+    QString checkString() const { return QString(); }
 
-	bool exec()
-	{
-		QString str;
-		QFile f;
+    bool exec()
+    {
+        QString str;
+        QFile f;
 
-		if(conf->getenv("QC_ENABLE_TESTS") == "Y")
-			str += "CONFIG += iris_tests\\n";
+        if(conf->getenv("QC_ENABLE_TESTS") == "Y")
+            str += "CONFIG += iris_tests\\n";
 
-		conf->addExtra(str);
+        conf->addExtra(str);
 
-		bool release = true;
-		bool debug = false;
-		bool debug_info = false;
-		bool universal = false;
-		QString sdk;
+        bool release = true;
+        bool debug = false;
+        bool debug_info = false;
+        bool universal = false;
+        QString sdk;
 
 #ifdef QC_BUILDMODE
-		release = qc_buildmode_release;
-		debug = qc_buildmode_debug;
-		debug_info = qc_buildmode_separate_debug_info;
+        release = qc_buildmode_release;
+        debug = qc_buildmode_debug;
+        debug_info = qc_buildmode_separate_debug_info;
 #endif
 
 #ifdef QC_UNIVERSAL
-		universal = qc_universal_enabled;
-		sdk = qc_universal_sdk;
+        universal = qc_universal_enabled;
+        sdk = qc_universal_sdk;
 #endif
 
-		// write confapp_unix.pri
-		str = QString();
+        // write confapp_unix.pri
+        str = QString();
                 QString var = conf->getenv("BINDIR");
                 if(!var.isEmpty())
-			str += QString("BINDIR = %1\\n").arg(var);
-		if(debug) // debug or debug-and-release
-			str += QString("CONFIG += debug\\n");
-		else // release
-			str += QString("CONFIG += release\\n");
-		if(debug_info)
-		{
-			str += QString("CONFIG += separate_debug_info\\n");
-			str += "QMAKE_CFLAGS += -g\\n";
-			str += "QMAKE_CXXFLAGS += -g\\n";
-		}
-		if(universal)
-		{
-			str +=
-			"contains(QT_CONFIG,x86):contains(QT_CONFIG,ppc) {\\n"
-			"	CONFIG += x86 ppc\\n"
-			"}\\n";
-
-			if(!sdk.isEmpty())
-				str += QString("QMAKE_MAC_SDK = %1\\n").arg(sdk);
-		}
+            str += QString("BINDIR = %1\\n").arg(var);
+        if(debug) // debug or debug-and-release
+            str += QString("CONFIG += debug\\n");
+        else // release
+            str += QString("CONFIG += release\\n");
+        if(debug_info)
+        {
+            str += QString("CONFIG += separate_debug_info\\n");
+            str += "QMAKE_CFLAGS += -g\\n";
+            str += "QMAKE_CXXFLAGS += -g\\n";
+        }
+        if(universal)
+        {
+            str +=
+            "contains(QT_CONFIG,x86):contains(QT_CONFIG,ppc) {\\n"
+            "    CONFIG += x86 ppc\\n"
+            "}\\n";
+
+            if(!sdk.isEmpty())
+                str += QString("QMAKE_MAC_SDK = %1\\n").arg(sdk);
+        }
 #ifdef QC_QCA
-		if(!qc_qca_procode.isEmpty())
-			str += qc_qca_procode;
+        if(!qc_qca_procode.isEmpty())
+            str += qc_qca_procode;
 #endif
-		f.setFileName("confapp_unix.pri");
-		if(f.open(QFile::WriteOnly | QFile::Truncate))
-			f.write(str.toLatin1());
-		f.close();
+        f.setFileName("confapp_unix.pri");
+        if(f.open(QFile::WriteOnly | QFile::Truncate))
+            f.write(str.toLatin1());
+        f.close();
 
-		return true;
-	}
+        return true;
+    }
 };
 #line 1 "qjdns.qcm"
 /*
@@ -1167,62 +1182,133 @@ arg: with-qjdns-lib=[path],Path to QJDns library files
 class qc_qjdns : public ConfObj
 {
 public:
-	qc_qjdns(Conf *c) : ConfObj(c) {}
-	QString name() const { return "QJDns"; }
-	QString shortname() const { return "qjdns"; }
-	QString resultString() const
-	{
+    qc_qjdns(Conf *c) : ConfObj(c) {}
+    QString name() const { return "QJDns"; }
+    QString shortname() const { return "qjdns"; }
+    QString resultString() const
+    {
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-		return "Disabled for Qt5 and above";
+        return "Disabled for Qt5 and above";
 #else
-		return ConfObj::resultString();
+        return ConfObj::resultString();
 #endif
-	}
-	bool exec()
-	{
+    }
+    bool exec()
+    {
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-		return true; // hack. TODO: figure out how to force jdns
+        return true; // hack. TODO: figure out how to force jdns
 #endif
-		conf->addExtra("CONFIG += need_jdns");
+        conf->addExtra("CONFIG += need_jdns");
 #if defined Q_OS_WIN || defined Q_OS_MAC
-		// HACK: on Windows and Mac OS X, always use psi's bundled qjdns
-		conf->addExtra("CONFIG += iris-qjdns");
-		return true;
+        // HACK: on Windows and Mac OS X, always use psi's bundled qjdns
+        conf->addExtra("CONFIG += iris-qjdns");
+        return true;
 #else
-		QStringList incs;
-		QString version, libs, other;
-		QString s;
+        QStringList incs;
+        QString version, libs, other;
+        QString s;
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-		bool found = conf->findPkgConfig("qjdns-qt5", VersionMin, "2.0.3", &version, &incs, &libs, &other);
+        bool found = conf->findPkgConfig("qjdns-qt5", VersionMin, "2.0.3", &version, &incs, &libs, &other);
 #else
-		bool found = conf->findPkgConfig("qjdns-qt4", VersionMin, "2.0.3", &version, &incs, &libs, &other);
+        bool found = conf->findPkgConfig("qjdns-qt4", VersionMin, "2.0.3", &version, &incs, &libs, &other);
 #endif
-		if(!found && !conf->findPkgConfig("qjdns", VersionMin, "2.0.0", &version, &incs, &libs, &other)) {
-			s = conf->getenv("QC_WITH_QJDNS_INC");
-			if ((!s.isEmpty() && conf->checkHeader(s, "qjdns.h")) ||
-				(s.isEmpty() && conf->findHeader("qjdns.h", QStringList(), &s))) {
-				incs.append(s);
-			}
-
-			s = conf->getenv("QC_WITH_QJDNS_LIB");
-			if((!s.isEmpty() && conf->checkLibrary(s, "qjdns")) ||
-			   (s.isEmpty() && conf->findLibrary("qjdns", &s))) {
-				libs = s.isEmpty()? "-lqjdns -ljdns" : QString("-L%1 -lqjdns -ljdns").arg(s);
-			}
-		}
-
-		if (!incs.isEmpty() && !libs.isEmpty()) {
-			foreach(const QString &inc, incs) {
-				conf->addIncludePath(inc);
-			}
-			conf->addLib(libs);
-			conf->addExtra("CONFIG += ext-qjdns");
-		}
-
-		return true;
+        if(!found && !conf->findPkgConfig("qjdns", VersionMin, "2.0.0", &version, &incs, &libs, &other)) {
+            s = conf->getenv("QC_WITH_QJDNS_INC");
+            if ((!s.isEmpty() && conf->checkHeader(s, "qjdns.h")) ||
+                (s.isEmpty() && conf->findHeader("qjdns.h", QStringList(), &s))) {
+                incs.append(s);
+            }
+
+            s = conf->getenv("QC_WITH_QJDNS_LIB");
+            if((!s.isEmpty() && conf->checkLibrary(s, "qjdns")) ||
+               (s.isEmpty() && conf->findLibrary("qjdns", &s))) {
+                libs = s.isEmpty()? "-lqjdns -ljdns" : QString("-L%1 -lqjdns -ljdns").arg(s);
+            }
+        }
+
+        if (!incs.isEmpty() && !libs.isEmpty()) {
+            foreach(const QString &inc, incs) {
+                conf->addIncludePath(inc);
+            }
+            conf->addLib(libs);
+            conf->addExtra("CONFIG += ext-qjdns");
+        }
+
+        return true;
 #endif
-	}
+    }
+};
+#line 1 "b2.qcm"
+/*
+-----BEGIN QCMOD-----
+name: libb2
+arg: with-b2-inc=[path],Path to libb2 include files
+arg: with-b2-lib=[path],Path to libb2 library or framework files
+-----END QCMOD-----
+*/
+
+//----------------------------------------------------------------------------
+// qc_b2
+//----------------------------------------------------------------------------
+class qc_b2 : public ConfObj
+{
+    bool use_system = false;
+public:
+    qc_b2(Conf *c) : ConfObj(c) {}
+    QString name() const { return "LibB2"; }
+    QString shortname() const { return "libb2"; }
+    QString resultString() const { return use_system? "system":"bundled"; }
+    bool exec()
+    {
+        QString b2_incdir, b2_libdir;
+        b2_incdir = conf->getenv("QC_WITH_B2_INC");
+        b2_libdir = conf->getenv("QC_WITH_B2_LIB");
+
+        if (b2_incdir.isEmpty() && b2_libdir.isEmpty()) {
+            if (!checkCustomDirs(b2_incdir, b2_libdir)) {
+                printf("b2 search paths provided but library is not found there. use bundled");
+                return true;
+            }
+            use_system = true;
+        } else {
+            QStringList incs;
+            QString version, libs, other;
+            if(conf->findPkgConfig("libb2", VersionAny, QString::null, &version, &incs, &libs, &other))
+            {
+                    for(int n = 0; n < incs.count(); ++n)
+                            conf->addIncludePath(incs[n]);
+                    if(!libs.isEmpty())
+                            conf->addLib(libs);
+                    use_system = true;
+            }
+        }
+
+        if (use_system) {
+            conf->addExtra("CONFIG += bundled_blake2");
+        }
+
+        return true;
+    }
+
+    bool checkCustomDirs(QString &b2_incdir, QString &b2_libdir)
+    {
+        if ((b2_incdir.isEmpty() && !conf->findHeader("blake2.h", QStringList(), &b2_incdir)) ||
+            (!b2_incdir.isEmpty() && !conf->checkHeader(b2_incdir, "blake2.h"))) {
+            printf("Headers not found!\\n");
+            return false;
+        }
+
+        if((!b2_libdir.isEmpty() && conf->checkLibrary(b2_libdir, "b2")) ||
+           (b2_libdir.isEmpty() && conf->findLibrary("b2", &b2_libdir))) {
+            conf->addLib(b2_libdir.isEmpty()? "-lb2" : QString("-L%1 -lb2").arg(b2_libdir));
+            conf->addIncludePath(b2_incdir);
+            return true;
+        }
+
+        printf("Libraries not found!\\n");
+        return false;
+    }
 };
 
 EOT
@@ -1251,6 +1337,9 @@ cat >"$1/modules_new.cpp" <<EOT
     o = new qc_qjdns(conf);
     o->required = true;
     o->disabled = false;
+    o = new qc_b2(conf);
+    o->required = true;
+    o->disabled = false;
 
 EOT
 cat >"$1/conf4.h" <<EOT
@@ -1274,99 +1363,102 @@ enum VersionMode { VersionMin, VersionExact, VersionMax, VersionAny };
 // ConfObj
 //
 // Subclass ConfObj to create a new configuration module.
-class ConfObj
-{
+class ConfObj {
 public:
-	Conf *conf;
-	bool required;
-	bool disabled;
-	bool success;
+    Conf *conf;
+    bool  required;
+    bool  disabled;
+    bool  success;
 
-	ConfObj(Conf *c);
-	virtual ~ConfObj();
+    ConfObj(Conf *c);
+    virtual ~ConfObj();
 
-	// long or descriptive name of what is being checked/performed
-	// example: "KDE >= 3.3"
-	virtual QString name() const = 0;
+    // long or descriptive name of what is being checked/performed
+    // example: "KDE >= 3.3"
+    virtual QString name() const = 0;
 
-	// short name
-	// example: "kde"
-	virtual QString shortname() const = 0;
+    // short name
+    // example: "kde"
+    virtual QString shortname() const = 0;
 
-	// string to display during check
-	// default: "Checking for [name] ..."
-	virtual QString checkString() const;
+    // string to display during check
+    // default: "Checking for [name] ..."
+    virtual QString checkString() const;
 
-	// string to display after check
-	// default: "yes" or "no", based on result of exec()
-	virtual QString resultString() const;
+    // string to display after check
+    // default: "yes" or "no", based on result of exec()
+    virtual QString resultString() const;
 
-	// this is where the checking code goes
-	virtual bool exec() = 0;
+    // this is where the checking code goes
+    virtual bool exec() = 0;
 };
 
 // Conf
 //
 // Interact with this class from your ConfObj to perform detection
 // operations and to output configuration parameters.
-class Conf
-{
+class Conf {
 public:
-	bool debug_enabled;
-	QString qmake_path;
-	QString qmakespec;
-	QString maketool;
-
-	QString DEFINES;
-	QStringList INCLUDEPATH;
-	QStringList LIBS;
-	QString extra;
-
-	QList<ConfObj*> list;
-	QMap<QString,QString> vars;
-
-	Conf();
-	~Conf();
-
-	QString getenv(const QString &var);
-	QString qvar(const QString &s);
-	QString normalizePath(const QString &s) const;
-	QString escapeQmakeVar(const QString &s) const;
-	inline QString escapePath(const QString &s) /* prepare fs path for qmake file */
-	{ return escapeQmakeVar(normalizePath(s)); }
-	QString escapedIncludes() const;
-	QString escapedLibs() const;
-
-	bool exec();
-
-	void debug(const QString &s);
-
-	QString expandIncludes(const QString &inc);
-	QString expandLibs(const QString &lib);
-
-	int doCommand(const QString &s, QByteArray *out = 0);
-	int doCommand(const QString &prog, const QStringList &args, QByteArray *out = 0);
-
-	bool doCompileAndLink(const QString &filedata, const QStringList &incs, const QString &libs, const QString &proextra, int *retcode = 0);
-	bool checkHeader(const QString &path, const QString &h);
-	bool findHeader(const QString &h, const QStringList &ext, QString *inc);
-	bool checkLibrary(const QString &path, const QString &name);
-	bool findLibrary(const QString &name, QString *lib);
-	QString findProgram(const QString &prog);
-	bool findSimpleLibrary(const QString &incvar, const QString &libvar, const QString &incname, const QString &libname, QString *incpath, QString *libs);
-	bool findFooConfig(const QString &path, QString *version, QStringList *incs, QString *libs, QString *otherflags);
-	bool findPkgConfig(const QString &name, VersionMode mode, const QString &req_version, QString *version, QStringList *incs, QString *libs, QString *otherflags);
-
-	void addDefine(const QString &str);
-	void addLib(const QString &str);
-	void addIncludePath(const QString &str);
-	void addExtra(const QString &str);
+    bool    debug_enabled;
+    QString qmake_path;
+    QString qmakespec;
+    QString maketool;
+
+    QString     DEFINES;
+    QStringList INCLUDEPATH;
+    QStringList LIBS;
+    QString     extra;
+
+    QList<ConfObj *>       list;
+    QMap<QString, QString> vars;
+
+    Conf();
+    ~Conf();
+
+    QString        getenv(const QString &var);
+    QString        qvar(const QString &s);
+    QString        normalizePath(const QString &s) const;
+    QString        escapeQmakeVar(const QString &s) const;
+    inline QString escapePath(const QString &s) /* prepare fs path for qmake file */
+    {
+        return escapeQmakeVar(normalizePath(s));
+    }
+    QString escapedIncludes() const;
+    QString escapedLibs() const;
+
+    bool exec();
+
+    void debug(const QString &s);
+
+    QString expandIncludes(const QString &inc);
+    QString expandLibs(const QString &lib);
+
+    int doCommand(const QString &s, QByteArray *out = 0);
+    int doCommand(const QString &prog, const QStringList &args, QByteArray *out = 0);
+
+    bool    doCompileAndLink(const QString &filedata, const QStringList &incs, const QString &libs,
+                             const QString &proextra, int *retcode = 0);
+    bool    checkHeader(const QString &path, const QString &h);
+    bool    findHeader(const QString &h, const QStringList &ext, QString *inc);
+    bool    checkLibrary(const QString &path, const QString &name);
+    bool    findLibrary(const QString &name, QString *lib);
+    QString findProgram(const QString &prog);
+    bool findSimpleLibrary(const QString &incvar, const QString &libvar, const QString &incname, const QString &libname,
+                           QString *incpath, QString *libs);
+    bool findFooConfig(const QString &path, QString *version, QStringList *incs, QString *libs, QString *otherflags);
+    bool findPkgConfig(const QString &name, VersionMode mode, const QString &req_version, QString *version,
+                       QStringList *incs, QString *libs, QString *otherflags);
+
+    void addDefine(const QString &str);
+    void addLib(const QString &str);
+    void addIncludePath(const QString &str);
+    void addExtra(const QString &str);
 
 private:
-	bool first_debug;
+    bool first_debug;
 
-	friend class ConfObj;
-	void added(ConfObj *o);
+    friend class ConfObj;
+    void added(ConfObj *o);
 };
 
 #endif
@@ -1387,359 +1479,344 @@ preserved.
 #include <stdio.h>
 #include <stdlib.h>
 #ifndef PATH_MAX
-# ifdef Q_OS_WIN
-#  define PATH_MAX 260
-# endif
+#ifdef Q_OS_WIN
+#define PATH_MAX 260
+#endif
 #endif
 
-class MocTestObject : public QObject
-{
-	Q_OBJECT
+class MocTestObject : public QObject {
+
+    Q_OBJECT
 public:
-	MocTestObject() {}
+    MocTestObject() {}
 };
 
 QString qc_getenv(const QString &var)
 {
-	char *p = ::getenv(var.toLatin1().data());
-	if(!p)
-		return QString();
-	return QString(p);
+    char *p = ::getenv(var.toLatin1().data());
+    if (!p)
+        return QString();
+    return QString(p);
 }
 
 QStringList qc_pathlist()
 {
-	QStringList list;
-	QString path = qc_getenv("PATH");
-	if(!path.isEmpty())
-	{
+    QStringList list;
+    QString     path = qc_getenv("PATH");
+    if (!path.isEmpty()) {
 #ifdef Q_OS_WIN
-		list = path.split(';', QString::SkipEmptyParts);
+        list = path.split(';', QString::SkipEmptyParts);
 #else
-		list = path.split(':', QString::SkipEmptyParts);
+        list = path.split(':', QString::SkipEmptyParts);
 #endif
-	}
+    }
 #ifdef Q_OS_WIN
-	list.prepend(".");
+    list.prepend(".");
 #endif
-	return list;
+    return list;
 }
 
 QString qc_findprogram(const QString &prog)
 {
-	QString out;
-	QStringList list = qc_pathlist();
-	for(int n = 0; n < list.count(); ++n)
-	{
-		QFileInfo fi(list[n] + '/' + prog);
-		if(fi.exists() && fi.isExecutable())
-		{
-			out = fi.filePath();
-			break;
-		}
+    QString     out;
+    QStringList list = qc_pathlist();
+    for (int n = 0; n < list.count(); ++n) {
+        QFileInfo fi(list[n] + '/' + prog);
+        if (fi.exists() && fi.isExecutable()) {
+            out = fi.filePath();
+            break;
+        }
 
 #ifdef Q_OS_WIN
-		// on windows, be sure to look for .exe
-		if(prog.right(4).toLower() != ".exe")
-		{
-			fi = QFileInfo(list[n] + '/' + prog + ".exe");
-			if(fi.exists() && fi.isExecutable())
-			{
-				out = fi.filePath();
-				break;
-			}
-		}
+        // on windows, be sure to look for .exe
+        if (prog.right(4).toLower() != ".exe") {
+            fi = QFileInfo(list[n] + '/' + prog + ".exe");
+            if (fi.exists() && fi.isExecutable()) {
+                out = fi.filePath();
+                break;
+            }
+        }
 #endif
-	}
-	return out;
+    }
+    return out;
 }
 
 QString qc_findself(const QString &argv0)
 {
 #ifdef Q_OS_WIN
-	if(argv0.contains('\\\\'))
+    if (argv0.contains('\\\\'))
 #else
-	if(argv0.contains('/'))
+    if (argv0.contains('/'))
 #endif
-		return argv0;
-	else
-		return qc_findprogram(argv0);
+        return argv0;
+    else
+        return qc_findprogram(argv0);
 }
 
-int qc_run_program_or_command(const QString &prog, const QStringList &args, const QString &command, QByteArray *out, bool showOutput)
+int qc_run_program_or_command(const QString &prog, const QStringList &args, const QString &command, QByteArray *out,
+                              bool showOutput)
 {
-	if(out)
-		out->clear();
-
-	QProcess process;
-	process.setReadChannel(QProcess::StandardOutput);
-
-	if(!prog.isEmpty())
-		process.start(prog, args);
-	else if(!command.isEmpty())
-		process.start(command);
-	else
-		return -1;
-
-	if(!process.waitForStarted(-1))
-		return -1;
-
-	QByteArray buf;
-
-	while(process.waitForReadyRead(-1))
-	{
-		buf = process.readAllStandardOutput();
-		if(out)
-			out->append(buf);
-		if(showOutput)
-			fprintf(stdout, "%s", buf.data());
-
-		buf = process.readAllStandardError();
-		if(showOutput)
-			fprintf(stderr, "%s", buf.data());
-	}
-
-	buf = process.readAllStandardError();
-	if(showOutput)
-		fprintf(stderr, "%s", buf.data());
-
-	// calling waitForReadyRead will cause the process to eventually be
-	//   marked as finished, so we should not need to separately call
-	//   waitForFinished. however, we will do it anyway just to be safe.
-	//   we won't check the return value since false could still mean
-	//   success (if the process had already been marked as finished).
-	process.waitForFinished(-1);
-
-	if(process.exitStatus() != QProcess::NormalExit)
-		return -1;
-
-	return process.exitCode();
+    if (out)
+        out->clear();
+
+    QProcess process;
+    process.setReadChannel(QProcess::StandardOutput);
+
+    if (!prog.isEmpty())
+        process.start(prog, args);
+    else if (!command.isEmpty())
+        process.start(command);
+    else
+        return -1;
+
+    if (!process.waitForStarted(-1))
+        return -1;
+
+    QByteArray buf;
+
+    while (process.waitForReadyRead(-1)) {
+        buf = process.readAllStandardOutput();
+        if (out)
+            out->append(buf);
+        if (showOutput)
+            fprintf(stdout, "%s", buf.data());
+
+        buf = process.readAllStandardError();
+        if (showOutput)
+            fprintf(stderr, "%s", buf.data());
+    }
+
+    buf = process.readAllStandardError();
+    if (showOutput)
+        fprintf(stderr, "%s", buf.data());
+
+    // calling waitForReadyRead will cause the process to eventually be
+    //   marked as finished, so we should not need to separately call
+    //   waitForFinished. however, we will do it anyway just to be safe.
+    //   we won't check the return value since false could still mean
+    //   success (if the process had already been marked as finished).
+    process.waitForFinished(-1);
+
+    if (process.exitStatus() != QProcess::NormalExit)
+        return -1;
+
+    return process.exitCode();
 }
 
 int qc_runcommand(const QString &command, QByteArray *out, bool showOutput)
 {
-	return qc_run_program_or_command(QString(), QStringList(), command, out, showOutput);
+    return qc_run_program_or_command(QString(), QStringList(), command, out, showOutput);
 }
 
 int qc_runprogram(const QString &prog, const QStringList &args, QByteArray *out, bool showOutput)
 {
-	return qc_run_program_or_command(prog, args, QString(), out, showOutput);
+    return qc_run_program_or_command(prog, args, QString(), out, showOutput);
 }
 
 bool qc_removedir(const QString &dirPath)
 {
-	QDir dir(dirPath);
-	if(!dir.exists())
-		return false;
-	QStringList list = dir.entryList();
-	foreach(QString s, list)
-	{
-		if(s == "." || s == "..")
-			continue;
-		QFileInfo fi(dir.filePath(s));
-		if(fi.isDir())
-		{
-			if(!qc_removedir(fi.filePath()))
-				return false;
-		}
-		else
-		{
-			if(!dir.remove(s))
-				return false;
-		}
-	}
-	QString dirName = dir.dirName();
-	if(!dir.cdUp())
-		return false;
-	if(!dir.rmdir(dirName))
-		return false;
-	return true;
+    QDir dir(dirPath);
+    if (!dir.exists())
+        return false;
+    QStringList list = dir.entryList();
+    foreach (QString s, list) {
+        if (s == "." || s == "..")
+            continue;
+        QFileInfo fi(dir.filePath(s));
+        if (fi.isDir()) {
+            if (!qc_removedir(fi.filePath()))
+                return false;
+        } else {
+            if (!dir.remove(s))
+                return false;
+        }
+    }
+    QString dirName = dir.dirName();
+    if (!dir.cdUp())
+        return false;
+    if (!dir.rmdir(dirName))
+        return false;
+    return true;
 }
 
 // simple command line arguemnts splitter able to understand quoted args.
 // the splitter removes quotes and unescapes symbols as well.
 QStringList qc_splitflags(const QString &flags)
 {
-	QStringList ret;
-	bool searchStart = true;
-	bool inQuotes = false;
-	bool escaped = false;
-	QChar quote, backslash = QLatin1Char('\\\\');
-	QString buf;
+    QStringList ret;
+    bool        searchStart = true;
+    bool        inQuotes    = false;
+    bool        escaped     = false;
+    QChar       quote, backslash = QLatin1Char('\\\\');
+    QString     buf;
 #ifdef PATH_MAX
-	buf.reserve(PATH_MAX);
+    buf.reserve(PATH_MAX);
 #endif
-	for (int i=0; i < flags.length(); i++) {
-		if (searchStart && flags[i].isSpace()) {
-			continue;
-		}
-		if (searchStart) {
-			searchStart = false;
-			buf.clear();
-		}
-		if (escaped) {
-			buf += flags[i];
-			escaped = false;
-			continue;
-		}
-		//buf += flags[i];
-		if (inQuotes) {
-			if (quote == QLatin1Char('\\'')) {
-				if (flags[i] == quote) {
-					inQuotes = false;
-					continue;
-				}
-			} else { // we are in double quoetes
-				if (flags[i] == backslash && i < flags.length() - 1 &&
-						(flags[i+1] == QLatin1Char('"') || flags[i+1] == backslash))
-				{
-					// if next symbol is one of in parentheses ("\\)
-					escaped = true;
-					continue;
-				}
-			}
-		} else {
-			if (flags[i].isSpace()) {
-				ret.append(buf);
-				searchStart = true;
-				buf.clear();
-				continue;
+    for (int i = 0; i < flags.length(); i++) {
+        if (searchStart && flags[i].isSpace()) {
+            continue;
+        }
+        if (searchStart) {
+            searchStart = false;
+            buf.clear();
+        }
+        if (escaped) {
+            buf += flags[i];
+            escaped = false;
+            continue;
+        }
+        // buf += flags[i];
+        if (inQuotes) {
+            if (quote == QLatin1Char('\\'')) {
+                if (flags[i] == quote) {
+                    inQuotes = false;
+                    continue;
+                }
+            } else { // we are in double quoetes
+                if (flags[i] == backslash && i < flags.length() - 1
+                    && (flags[i + 1] == QLatin1Char('"') || flags[i + 1] == backslash)) {
+                    // if next symbol is one of in parentheses ("\\)
+                    escaped = true;
+                    continue;
+                }
+            }
+        } else {
+            if (flags[i].isSpace()) {
+                ret.append(buf);
+                searchStart = true;
+                buf.clear();
+                continue;
 #ifndef Q_OS_WIN /* on windows backslash is just a path separator */
-			} else if (flags[i] == backslash) {
-				escaped = true;
-				continue; // just add next symbol
+            } else if (flags[i] == backslash) {
+                escaped = true;
+                continue; // just add next symbol
 #endif
-			} else if (flags[i] == QLatin1Char('\\'') || flags[i] == QLatin1Char('"')) {
-				inQuotes = true;
-				quote = flags[i];
-				continue;
-			}
-		}
-		buf += flags[i];
-	}
-	if (buf.size()) {
-		ret.append(buf);
-	}
-	return ret;
+            } else if (flags[i] == QLatin1Char('\\'') || flags[i] == QLatin1Char('"')) {
+                inQuotes = true;
+                quote    = flags[i];
+                continue;
+            }
+        }
+        buf += flags[i];
+    }
+    if (buf.size()) {
+        ret.append(buf);
+    }
+    return ret;
 }
 
 void qc_splitcflags(const QString &cflags, QStringList *incs, QStringList *otherflags)
 {
-	incs->clear();
-	otherflags->clear();
-
-	QStringList cflagsList = qc_splitflags(cflags);
-	for(int n = 0; n < cflagsList.count(); ++n)
-	{
-		QString str = cflagsList[n];
-		if(str.startsWith("-I"))
-		{
-			// we want everything except the leading "-I"
-			incs->append(str.remove(0, 2));
-		}
-		else
-		{
-			// we want whatever is left
-			otherflags->append(str);
-		}
-	}
+    incs->clear();
+    otherflags->clear();
+
+    QStringList cflagsList = qc_splitflags(cflags);
+    for (int n = 0; n < cflagsList.count(); ++n) {
+        QString str = cflagsList[n];
+        if (str.startsWith("-I")) {
+            // we want everything except the leading "-I"
+            incs->append(str.remove(0, 2));
+        } else {
+            // we want whatever is left
+            otherflags->append(str);
+        }
+    }
 }
 
 QString qc_escapeArg(const QString &str)
 {
-	QString out;
-	for(int n = 0; n < (int)str.length(); ++n) {
-		if(str[n] == '-')
-			out += '_';
-		else
-			out += str[n];
-	}
-	return out;
+    QString out;
+    for (int n = 0; n < (int)str.length(); ++n) {
+        if (str[n] == '-')
+            out += '_';
+        else
+            out += str[n];
+    }
+    return out;
 }
 
 QString qc_trim_char(const QString &s, const QChar &ch)
 {
-	if (s.startsWith(ch) && s.endsWith(ch)) {
-		return s.mid(1, s.size() - 2);
-	}
-	return s;
+    if (s.startsWith(ch) && s.endsWith(ch)) {
+        return s.mid(1, s.size() - 2);
+    }
+    return s;
 }
 
 // removes surrounding quotes, removes trailing slashes, converts to native separators.
 // accepts unescaped but possible quoted path
 QString qc_normalize_path(const QString &str)
 {
-	QString path = str.trimmed();
-	path = qc_trim_char(path, QLatin1Char('"'));
-	path = qc_trim_char(path, QLatin1Char('\\''));
-
-	// It's OK to use unix style'/' pathes on windows Qt handles this without any problems.
-	// Using Windows-style '\\\\' can leads strange compilation error with MSYS which uses
-	// unix style.
-	QLatin1Char nativeSep('/');
+    QString path = str.trimmed();
+    path         = qc_trim_char(path, QLatin1Char('"'));
+    path         = qc_trim_char(path, QLatin1Char('\\''));
+
+    // It's OK to use unix style'/' paths on windows Qt handles this without any problems.
+    // Using Windows-style '\\\\' can leads strange compilation error with MSYS which uses
+    // unix style.
+    QLatin1Char nativeSep('/');
 #ifdef Q_OS_WIN
-	path.replace(QLatin1Char('\\\\'), QLatin1Char('/'));
+    path.replace(QLatin1Char('\\\\'), QLatin1Char('/'));
 #endif
-	// trim trailing slashes
-	while (path.length() && path[path.length() - 1] == nativeSep) {
-		path.resize(path.length() - 1);
-	}
-	return path;
+    // trim trailing slashes
+    while (path.length() && path[path.length() - 1] == nativeSep) {
+        path.resize(path.length() - 1);
+    }
+    return path;
 }
 
 // escape filesystem path to be added to qmake pro/pri file.
 QString qc_escape_string_var(const QString &str)
 {
-	QString path = str;
-	path.replace(QLatin1Char('\\\\'), QLatin1String("\\\\\\\\"))
-			.replace(QLatin1Char('"'), QLatin1String("\\\\\\""));
-	if (path.indexOf(QLatin1Char(' ')) != -1) { // has spaces
-		return QLatin1Char('"') + path + QLatin1Char('"');
-	}
-	return path;
+    QString path = str;
+    path.replace(QLatin1Char('\\\\'), QLatin1String("\\\\\\\\")).replace(QLatin1Char('"'), QLatin1String("\\\\\\""));
+    if (path.indexOf(QLatin1Char(' ')) != -1) { // has spaces
+        return QLatin1Char('"') + path + QLatin1Char('"');
+    }
+    return path;
 }
 
 // escapes each path in incs and join into single string suiable for INCLUDEPATH var
 QString qc_prepare_includepath(const QStringList &incs)
 {
-	if (incs.empty()) {
-		return QString();
-	}
-	QStringList ret;
-	foreach (const QString &path, incs) {
-		ret.append(qc_escape_string_var(path));
-	}
-	return ret.join(QLatin1String(" "));
+    if (incs.empty()) {
+        return QString();
+    }
+    QStringList ret;
+    foreach (const QString &path, incs) {
+        ret.append(qc_escape_string_var(path));
+    }
+    return ret.join(QLatin1String(" "));
 }
 
 // escapes each path in libs and to make it suiable for LIBS var
 // notice, entries of libs are every single arg for linker.
 QString qc_prepare_libs(const QStringList &libs)
 {
-	if (libs.isEmpty()) {
-		return QString();
-	}
-	QSet<QString> pathSet;
-	QStringList paths;
-	QStringList ordered;
-	foreach (const QString &arg, libs) {
-		if (arg.startsWith(QLatin1String("-L"))) {
-			QString path = qc_escape_string_var(arg.mid(2));
-			if (!pathSet.contains(path)) {
-				pathSet.insert(path);
-				paths.append(path);
-			}
-		} else if (arg.startsWith(QLatin1String("-l"))) {
-			ordered.append(arg);
-		} else {
-			ordered.append(qc_escape_string_var(arg));
-		}
-	}
-	QString ret;
-	if (paths.size()) {
-		ret += (QLatin1String(" -L") + paths.join(QLatin1String(" -L")) + QLatin1Char(' '));
-	}
-	return ret + ordered.join(QLatin1String(" "));
+    if (libs.isEmpty()) {
+        return QString();
+    }
+    QSet<QString> pathSet;
+    QStringList   paths;
+    QStringList   ordered;
+    foreach (const QString &arg, libs) {
+        if (arg.startsWith(QLatin1String("-L"))) {
+            QString path = qc_escape_string_var(arg.mid(2));
+            if (!pathSet.contains(path)) {
+                pathSet.insert(path);
+                paths.append(path);
+            }
+        } else if (arg.startsWith(QLatin1String("-l"))) {
+            ordered.append(arg);
+        } else {
+            ordered.append(qc_escape_string_var(arg));
+        }
+    }
+    QString ret;
+    if (paths.size()) {
+        ret += (QLatin1String(" -L") + paths.join(QLatin1String(" -L")) + QLatin1Char(' '));
+    }
+    return ret + ordered.join(QLatin1String(" "));
 }
 
 //----------------------------------------------------------------------------
@@ -1747,70 +1824,63 @@ QString qc_prepare_libs(const QStringList &libs)
 //----------------------------------------------------------------------------
 ConfObj::ConfObj(Conf *c)
 {
-	conf = c;
-	conf->added(this);
-	required = false;
-	disabled = false;
-	success = false;
+    conf = c;
+    conf->added(this);
+    required = false;
+    disabled = false;
+    success  = false;
 }
 
-ConfObj::~ConfObj()
-{
-}
+ConfObj::~ConfObj() {}
 
-QString ConfObj::checkString() const
-{
-	return QString("Checking for %1 ...").arg(name());
-}
+QString ConfObj::checkString() const { return QString("Checking for %1 ...").arg(name()); }
 
 QString ConfObj::resultString() const
 {
-	if(success)
-		return "yes";
-	else
-		return "no";
+    if (success)
+        return "yes";
+    else
+        return "no";
 }
 
 //----------------------------------------------------------------------------
 // qc_internal_pkgconfig
 //----------------------------------------------------------------------------
-class qc_internal_pkgconfig : public ConfObj
-{
+class qc_internal_pkgconfig : public ConfObj {
 public:
-	QString pkgname, desc;
-	VersionMode mode;
-	QString req_ver;
-
-        qc_internal_pkgconfig(Conf *c, const QString &_name, const QString &_desc, VersionMode _mode, const QString &_req_ver) : ConfObj(c)
-	{
-		pkgname = _name;
-		desc = _desc;
-		mode = _mode;
-		req_ver = _req_ver;
-	}
-
-	QString name() const { return desc; }
-	QString shortname() const { return pkgname; }
-
-	bool exec()
-	{
-		QStringList incs;
-		QString version, libs, other;
-		if(!conf->findPkgConfig(pkgname, mode, req_ver, &version, &incs, &libs, &other))
-			return false;
-
-		for(int n = 0; n < incs.count(); ++n)
-			conf->addIncludePath(incs[n]);
-		if(!libs.isEmpty())
-			conf->addLib(libs);
-		//if(!other.isEmpty())
-		//	conf->addExtra(QString("QMAKE_CFLAGS += %1\\n").arg(other));
-
-		if(!required)
-			conf->addDefine("HAVE_PKG_" + qc_escapeArg(pkgname).toUpper());
-
-		return true;
-	}
+    QString     pkgname, desc;
+    VersionMode mode;
+    QString     req_ver;
+
+    qc_internal_pkgconfig(Conf *c, const QString &_name, const QString &_desc, VersionMode _mode,
+                          const QString &_req_ver) :
+        ConfObj(c),
+        pkgname(_name), desc(_desc), mode(_mode), req_ver(_req_ver)
+    {
+    }
+
+    QString name() const { return desc; }
+    QString shortname() const { return pkgname; }
+
+    bool exec()
+    {
+        QStringList incs;
+        QString     version, libs, other;
+        if (!conf->findPkgConfig(pkgname, mode, req_ver, &version, &incs, &libs, &other))
+            return false;
+
+        for (int n = 0; n < incs.count(); ++n)
+            conf->addIncludePath(incs[n]);
+        if (!libs.isEmpty())
+            conf->addLib(libs);
+        // if(!other.isEmpty())
+        //    conf->addExtra(QString("QMAKE_CFLAGS += %1\\n").arg(other));
+
+        if (!required)
+            conf->addDefine("HAVE_PKG_" + qc_escapeArg(pkgname).toUpper());
+
+        return true;
+    }
 };
 
 //----------------------------------------------------------------------------
@@ -1818,532 +1888,474 @@ public:
 //----------------------------------------------------------------------------
 Conf::Conf()
 {
-	// TODO: no more vars?
-	//vars.insert("QMAKE_INCDIR_X11", new QString(X11_INC));
-	//vars.insert("QMAKE_LIBDIR_X11", new QString(X11_LIBDIR));
-	//vars.insert("QMAKE_LIBS_X11",   new QString(X11_LIB));
-	//vars.insert("QMAKE_CC", CC);
+    // TODO: no more vars?
+    // vars.insert("QMAKE_INCDIR_X11", new QString(X11_INC));
+    // vars.insert("QMAKE_LIBDIR_X11", new QString(X11_LIBDIR));
+    // vars.insert("QMAKE_LIBS_X11",   new QString(X11_LIB));
+    // vars.insert("QMAKE_CC", CC);
 
-	debug_enabled = false;
+    debug_enabled = false;
+    first_debug   = true;
 }
 
-Conf::~Conf()
-{
-	qDeleteAll(list);
-}
+Conf::~Conf() { qDeleteAll(list); }
 
-void Conf::added(ConfObj *o)
-{
-	list.append(o);
-}
+void Conf::added(ConfObj *o) { list.append(o); }
 
-QString Conf::getenv(const QString &var)
-{
-	return qc_getenv(var);
-}
+QString Conf::getenv(const QString &var) { return qc_getenv(var); }
 
 void Conf::debug(const QString &s)
 {
-	if(debug_enabled)
-	{
-		if(first_debug)
-			printf("\\n");
-		first_debug = false;
-		printf(" * %s\\n", qPrintable(s));
-	}
+    if (debug_enabled) {
+        if (first_debug)
+            printf("\\n");
+        first_debug = false;
+        printf(" * %s\\n", qPrintable(s));
+    }
 }
 
 bool Conf::exec()
 {
-	for(int n = 0; n < list.count(); ++n)
-	{
-		ConfObj *o = list[n];
-
-		// if this was a disabled-by-default option, check if it was enabled
-		if(o->disabled)
-		{
-			QString v = QString("QC_ENABLE_") + qc_escapeArg(o->shortname());
-			if(getenv(v) != "Y")
-				continue;
-		}
-		// and the opposite?
-		else
-		{
-			QString v = QString("QC_DISABLE_") + qc_escapeArg(o->shortname());
-			if(getenv(v) == "Y")
-				continue;
-		}
-
-		bool output = true;
-		QString check = o->checkString();
-		if(check.isEmpty())
-			output = false;
-
-		if(output)
-		{
-			printf("%s", check.toLatin1().data());
-			fflush(stdout);
-		}
-
-		first_debug = true;
-		bool ok = o->exec();
-		o->success = ok;
-
-		if(output)
-		{
-			QString result = o->resultString();
-			if(!first_debug)
-				printf(" -> %s\\n", result.toLatin1().data());
-			else
-				printf(" %s\\n", result.toLatin1().data());
-		}
-
-		if(!ok && o->required)
-		{
-			printf("\\nError: need %s!\\n", o->name().toLatin1().data());
-			return false;
-		}
-	}
-	return true;
-}
+    for (int n = 0; n < list.count(); ++n) {
+        ConfObj *o = list[n];
 
-QString Conf::qvar(const QString &s)
-{
-	return vars.value(s);
-}
+        // if this was a disabled-by-default option, check if it was enabled
+        if (o->disabled) {
+            QString v = QString("QC_ENABLE_") + qc_escapeArg(o->shortname());
+            if (getenv(v) != "Y")
+                continue;
+        }
+        // and the opposite?
+        else {
+            QString v = QString("QC_DISABLE_") + qc_escapeArg(o->shortname());
+            if (getenv(v) == "Y")
+                continue;
+        }
 
-QString Conf::normalizePath(const QString &s) const
-{
-	return qc_normalize_path(s);
-}
+        bool    output = true;
+        QString check  = o->checkString();
+        if (check.isEmpty())
+            output = false;
 
-QString Conf::escapeQmakeVar(const QString &s) const
-{
-	return qc_escape_string_var(s);
-}
+        if (output) {
+            printf("%s", check.toLatin1().data());
+            fflush(stdout);
+        }
 
-QString Conf::escapedIncludes() const
-{
-	return qc_prepare_includepath(INCLUDEPATH);
-}
+        first_debug = true;
+        bool ok     = o->exec();
+        o->success  = ok;
 
-QString Conf::escapedLibs() const
-{
-	return qc_prepare_libs(LIBS);
-}
+        if (output) {
+            QString result = o->resultString();
+            if (!first_debug)
+                printf(" -> %s\\n", result.toLatin1().data());
+            else
+                printf(" %s\\n", result.toLatin1().data());
+        }
 
-QString Conf::expandIncludes(const QString &inc)
-{
-	return QLatin1String("-I") + inc;
+        if (!ok && o->required) {
+            printf("\\nError: need %s!\\n", o->name().toLatin1().data());
+            return false;
+        }
+    }
+    return true;
 }
 
-QString Conf::expandLibs(const QString &lib)
-{
-	return QLatin1String("-L") + lib;
-}
+QString Conf::qvar(const QString &s) { return vars.value(s); }
+
+QString Conf::normalizePath(const QString &s) const { return qc_normalize_path(s); }
+
+QString Conf::escapeQmakeVar(const QString &s) const { return qc_escape_string_var(s); }
+
+QString Conf::escapedIncludes() const { return qc_prepare_includepath(INCLUDEPATH); }
+
+QString Conf::escapedLibs() const { return qc_prepare_libs(LIBS); }
+
+QString Conf::expandIncludes(const QString &inc) { return QLatin1String("-I") + inc; }
+
+QString Conf::expandLibs(const QString &lib) { return QLatin1String("-L") + lib; }
 
 int Conf::doCommand(const QString &s, QByteArray *out)
 {
-	debug(QString("[%1]").arg(s));
-	int r = qc_runcommand(s, out, debug_enabled);
-	debug(QString("returned: %1").arg(r));
-	return r;
+    debug(QString("[%1]").arg(s));
+    int r = qc_runcommand(s, out, debug_enabled);
+    debug(QString("returned: %1").arg(r));
+    return r;
 }
 
 int Conf::doCommand(const QString &prog, const QStringList &args, QByteArray *out)
 {
-	QString fullcmd = prog;
-	QString argstr = args.join(QLatin1String(" "));
-	if(!argstr.isEmpty())
-		fullcmd += QString(" ") + argstr;
-	debug(QString("[%1]").arg(fullcmd));
-	int r = qc_runprogram(prog, args, out, debug_enabled);
-	debug(QString("returned: %1").arg(r));
-	return r;
+    QString fullcmd = prog;
+    QString argstr  = args.join(QLatin1String(" "));
+    if (!argstr.isEmpty())
+        fullcmd += QString(" ") + argstr;
+    debug(QString("[%1]").arg(fullcmd));
+    int r = qc_runprogram(prog, args, out, debug_enabled);
+    debug(QString("returned: %1").arg(r));
+    return r;
 }
 
-bool Conf::doCompileAndLink(const QString &filedata, const QStringList &incs, const QString &libs, const QString &proextra, int *retcode)
+bool Conf::doCompileAndLink(const QString &filedata, const QStringList &incs, const QString &libs,
+                            const QString &proextra, int *retcode)
 {
 #ifdef Q_OS_WIN
-	QDir tmp("qconftemp");
+    QDir tmp("qconftemp");
 #else
-	QDir tmp(".qconftemp");
+    QDir tmp(".qconftemp");
 #endif
-	QStringList normalizedLibs;
-	foreach (const QString &l, qc_splitflags(libs)) {
-		normalizedLibs.append(qc_normalize_path(l));
-	}
-
-	if(!tmp.mkdir("atest"))
-	{
-		debug(QString("unable to create atest dir: %1").arg(tmp.absoluteFilePath("atest")));
-		return false;
-	}
-	QDir dir(tmp.filePath("atest"));
-	if(!dir.exists())
-	{
-		debug("atest dir does not exist");
-		return false;
-	}
-
-	QString fname = dir.filePath("atest.cpp");
-	QString out = "atest";
-	QFile f(fname);
-	if(!f.open(QFile::WriteOnly | QFile::Truncate))
-	{
-		debug("unable to open atest.cpp for writing");
-		return false;
-	}
-	if(f.write(filedata.toLatin1()) == -1)
-	{
-		debug("error writing to atest.cpp");
-		return false;
-	}
-	f.close();
-
-	debug(QString("Wrote atest.cpp:\\n%1").arg(filedata));
-
-	QString pro = QString(
-		"CONFIG  += console\\n"
-		"CONFIG  -= qt app_bundle\\n"
-		"DESTDIR  = \$\$PWD\\n"
-		"SOURCES += atest.cpp\\n");
-	QString inc = qc_prepare_includepath(incs);
-	if(!inc.isEmpty())
-		pro += "INCLUDEPATH += " + inc + '\\n';
-	QString escaped_libs = qc_prepare_libs(normalizedLibs);
-	if(!escaped_libs.isEmpty())
-		pro += "LIBS += " + escaped_libs + '\\n';
-	pro += proextra;
-
-	fname = dir.filePath("atest.pro");
-	f.setFileName(fname);
-	if(!f.open(QFile::WriteOnly | QFile::Truncate))
-	{
-		debug("unable to open atest.pro for writing");
-		return false;
-	}
-	if(f.write(pro.toLatin1()) == -1)
-	{
-		debug("error writing to atest.pro");
-		return false;
-	}
-	f.close();
-
-	debug(QString("Wrote atest.pro:\\n%1").arg(pro));
-
-	QString oldpath = QDir::currentPath();
-	QDir::setCurrent(dir.path());
-
-	bool ok = false;
-	int r = doCommand(qmake_path, QStringList() << "atest.pro");
-	if(r == 0)
-	{
-		r = doCommand(maketool, QStringList());
-		if(r == 0)
-		{
-			ok = true;
-			if(retcode)
-			{
-				QString runatest = out;
+    QStringList normalizedLibs;
+    foreach (const QString &l, qc_splitflags(libs)) {
+        normalizedLibs.append(qc_normalize_path(l));
+    }
+
+    if (!tmp.mkdir("atest")) {
+        debug(QString("unable to create atest dir: %1").arg(tmp.absoluteFilePath("atest")));
+        return false;
+    }
+    QDir dir(tmp.filePath("atest"));
+    if (!dir.exists()) {
+        debug("atest dir does not exist");
+        return false;
+    }
+
+    QString fname = dir.filePath("atest.cpp");
+    QString out   = "atest";
+    QFile   f(fname);
+    if (!f.open(QFile::WriteOnly | QFile::Truncate)) {
+        debug("unable to open atest.cpp for writing");
+        return false;
+    }
+    if (f.write(filedata.toLatin1()) == -1) {
+        debug("error writing to atest.cpp");
+        return false;
+    }
+    f.close();
+
+    debug(QString("Wrote atest.cpp:\\n%1").arg(filedata));
+
+    QString pro = QString("CONFIG  += console\\n"
+                          "CONFIG  -= qt app_bundle\\n"
+                          "DESTDIR  = \$\$PWD\\n"
+                          "SOURCES += atest.cpp\\n");
+    QString inc = qc_prepare_includepath(incs);
+    if (!inc.isEmpty())
+        pro += "INCLUDEPATH += " + inc + '\\n';
+    QString escaped_libs = qc_prepare_libs(normalizedLibs);
+    if (!escaped_libs.isEmpty())
+        pro += "LIBS += " + escaped_libs + '\\n';
+    pro += proextra;
+
+    fname = dir.filePath("atest.pro");
+    f.setFileName(fname);
+    if (!f.open(QFile::WriteOnly | QFile::Truncate)) {
+        debug("unable to open atest.pro for writing");
+        return false;
+    }
+    if (f.write(pro.toLatin1()) == -1) {
+        debug("error writing to atest.pro");
+        return false;
+    }
+    f.close();
+
+    debug(QString("Wrote atest.pro:\\n%1").arg(pro));
+
+    QString oldpath = QDir::currentPath();
+    QDir::setCurrent(dir.path());
+
+    bool ok = false;
+    int  r  = doCommand(qmake_path, QStringList() << "atest.pro");
+    if (r == 0) {
+        r = doCommand(maketool, QStringList());
+        if (r == 0) {
+            ok = true;
+            if (retcode) {
+                QString runatest = out;
 #ifdef Q_OS_UNIX
-				runatest.prepend("./");
+                runatest.prepend("./");
 #endif
-				*retcode = doCommand(runatest, QStringList());
-			}
-		}
-		r = doCommand(maketool, QStringList() << "distclean");
-		if(r != 0)
-			debug("error during atest distclean");
-	}
-
-	QDir::setCurrent(oldpath);
-
-	// cleanup
-	//dir.remove("atest.pro");
-	//dir.remove("atest.cpp");
-	//tmp.rmdir("atest");
-
-	// remove whole dir since distclean doesn't always work
-	qc_removedir(tmp.filePath("atest"));
-
-	if(!ok)
-		return false;
-	return true;
-}
+                *retcode = doCommand(runatest, QStringList());
+            }
+        }
+        r = doCommand(maketool, QStringList() << "distclean");
+        if (r != 0)
+            debug("error during atest distclean");
+    }
 
-bool Conf::checkHeader(const QString &path, const QString &h)
-{
-	return QDir(path).exists(h);
+    QDir::setCurrent(oldpath);
+
+    // cleanup
+    // dir.remove("atest.pro");
+    // dir.remove("atest.cpp");
+    // tmp.rmdir("atest");
+
+    // remove whole dir since distclean doesn't always work
+    qc_removedir(tmp.filePath("atest"));
+
+    if (!ok)
+        return false;
+    return true;
 }
 
+bool Conf::checkHeader(const QString &path, const QString &h) { return QDir(path).exists(h); }
+
 bool Conf::findHeader(const QString &h, const QStringList &ext, QString *inc)
 {
-	if(checkHeader("/usr/include", h))
-	{
-		*inc = "";
-		return true;
-	}
-	QStringList dirs;
-	dirs += "/usr/local/include";
-	dirs += ext;
-
-	QString prefix = qc_getenv("PREFIX");
-	if (!prefix.isEmpty()) {
-		prefix += "/include";
-		prefix = qc_normalize_path(prefix);
-		if (!dirs.contains(prefix))
-			dirs << prefix;
-	}
-
-	for(QStringList::ConstIterator it = dirs.begin(); it != dirs.end(); ++it)
-	{
-		if(checkHeader(*it, h))
-		{
-			*inc = *it;
-			return true;
-		}
-	}
-	return false;
+    if (checkHeader("/usr/include", h)) {
+        *inc = "";
+        return true;
+    }
+    QStringList dirs;
+    dirs += "/usr/local/include";
+    dirs += ext;
+
+    QString prefix = qc_getenv("PREFIX");
+    if (!prefix.isEmpty()) {
+        prefix += "/include";
+        prefix = qc_normalize_path(prefix);
+        if (!dirs.contains(prefix))
+            dirs << prefix;
+    }
+
+    for (QStringList::ConstIterator it = dirs.begin(); it != dirs.end(); ++it) {
+        if (checkHeader(*it, h)) {
+            *inc = *it;
+            return true;
+        }
+    }
+    return false;
 }
 
 bool Conf::checkLibrary(const QString &path, const QString &name)
 {
-	QString str =
-		//"#include <stdio.h>\\n"
-		"int main()\\n"
-		"{\\n"
-		//"    printf(\\"library checker running\\\\\\\\n\\");\\n"
-		"    return 0;\\n"
-		"}\\n";
-
-	QString libs;
-	if(!path.isEmpty())
-		libs += QString("-L") + path + ' ';
-	libs += QString("-l") + name;
-	if(!doCompileAndLink(str, QStringList(), libs, QString()))
-		return false;
-	return true;
+    QString str =
+        //"#include <stdio.h>\\n"
+        "int main()\\n"
+        "{\\n"
+        //"    printf(\\"library checker running\\\\\\\\n\\");\\n"
+        "    return 0;\\n"
+        "}\\n";
+
+    QString libs;
+    if (!path.isEmpty())
+        libs += QString("-L") + path + ' ';
+    libs += QString("-l") + name;
+    if (!doCompileAndLink(str, QStringList(), libs, QString()))
+        return false;
+    return true;
 }
 
 bool Conf::findLibrary(const QString &name, QString *lib)
 {
-	if(checkLibrary("", name))
-	{
-		*lib = "";
-		return true;
-	}
-	if(checkLibrary("/usr/local/lib", name))
-	{
-		*lib = "/usr/local/lib";
-		return true;
-	}
-
-	QString prefix = qc_getenv("PREFIX");
-	if (!prefix.isEmpty()) {
-		prefix += "/lib";
-		prefix = qc_normalize_path(prefix);
-		if(checkLibrary(prefix, name))
-		{
-			*lib = prefix;
-			return true;
-		}
-	}
-
-	return false;
-}
+    if (checkLibrary("", name)) {
+        *lib = "";
+        return true;
+    }
+    if (checkLibrary("/usr/local/lib", name)) {
+        *lib = "/usr/local/lib";
+        return true;
+    }
 
-QString Conf::findProgram(const QString &prog)
-{
-	return qc_findprogram(prog);
+    QString prefix = qc_getenv("PREFIX");
+    if (!prefix.isEmpty()) {
+        prefix += "/lib";
+        prefix = qc_normalize_path(prefix);
+        if (checkLibrary(prefix, name)) {
+            *lib = prefix;
+            return true;
+        }
+    }
+
+    return false;
 }
 
-bool Conf::findSimpleLibrary(const QString &incvar, const QString &libvar, const QString &incname, const QString &libname, QString *incpath, QString *libs)
+QString Conf::findProgram(const QString &prog) { return qc_findprogram(prog); }
+
+bool Conf::findSimpleLibrary(const QString &incvar, const QString &libvar, const QString &incname,
+                             const QString &libname, QString *incpath, QString *libs)
 {
-	QString inc, lib;
-	QString s;
-
-	s = getenv(incvar).trimmed();
-	if(!s.isEmpty()) {
-		if(!checkHeader(s, incname)) {
-			if(debug_enabled)
-				printf("%s is not found in \\"%s\\"\\n", qPrintable(incname), qPrintable(s));
-			return false;
-		}
-		inc = s;
-	}
-	else {
-		if(!findHeader(incname, QStringList(), &s)) {
-			if(debug_enabled)
-				printf("%s is not found anywhere\\n", qPrintable(incname));
-			return false;
-		}
-		inc = s;
-	}
-
-	s = getenv(libvar).trimmed();
-	if(!s.isEmpty()) {
-		if(!checkLibrary(s, libname)) {
-			if(debug_enabled)
-				printf("%s is not found in \\"%s\\"\\n", qPrintable(libname), qPrintable(s));
-			return false;
-		}
-		lib = s;
-	}
-	else {
-		if(!findLibrary(libname, &s)) {
-			if(debug_enabled)
-				printf("%s is not found anywhere\\n", qPrintable(libname));
-			return false;
-		}
-		lib = s;
-	}
-
-	QString lib_out;
-	if(!lib.isEmpty())
-		lib_out += QString("-L") + s + " ";
-	lib_out += QString("-l") + libname;
-
-	*incpath = inc;
-	*libs = lib_out;
-	return true;
+    QString inc, lib;
+    QString s;
+
+    s = getenv(incvar).trimmed();
+    if (!s.isEmpty()) {
+        if (!checkHeader(s, incname)) {
+            if (debug_enabled)
+                printf("%s is not found in \\"%s\\"\\n", qPrintable(incname), qPrintable(s));
+            return false;
+        }
+        inc = s;
+    } else {
+        if (!findHeader(incname, QStringList(), &s)) {
+            if (debug_enabled)
+                printf("%s is not found anywhere\\n", qPrintable(incname));
+            return false;
+        }
+        inc = s;
+    }
+
+    s = getenv(libvar).trimmed();
+    if (!s.isEmpty()) {
+        if (!checkLibrary(s, libname)) {
+            if (debug_enabled)
+                printf("%s is not found in \\"%s\\"\\n", qPrintable(libname), qPrintable(s));
+            return false;
+        }
+        lib = s;
+    } else {
+        if (!findLibrary(libname, &s)) {
+            if (debug_enabled)
+                printf("%s is not found anywhere\\n", qPrintable(libname));
+            return false;
+        }
+        lib = s;
+    }
+
+    QString lib_out;
+    if (!lib.isEmpty())
+        lib_out += QString("-L") + s + " ";
+    lib_out += QString("-l") + libname;
+
+    *incpath = inc;
+    *libs    = lib_out;
+    return true;
 }
 
 bool Conf::findFooConfig(const QString &path, QString *version, QStringList *incs, QString *libs, QString *otherflags)
 {
-	QStringList args;
-	QByteArray out;
-	int ret;
+    QStringList args;
+    QByteArray  out;
+    int         ret;
 
-	args += "--version";
-	ret = doCommand(path, args, &out);
-	if(ret != 0)
-		return false;
+    args += "--version";
+    ret = doCommand(path, args, &out);
+    if (ret != 0)
+        return false;
 
-	QString version_out = QString::fromLatin1(out).trimmed();
+    QString version_out = QString::fromLatin1(out).trimmed();
 
-	args.clear();
-	args += "--libs";
-	ret = doCommand(path, args, &out);
-	if(ret != 0)
-		return false;
+    args.clear();
+    args += "--libs";
+    ret = doCommand(path, args, &out);
+    if (ret != 0)
+        return false;
 
-	QString libs_out = QString::fromLatin1(out).trimmed();
+    QString libs_out = QString::fromLatin1(out).trimmed();
 
-	args.clear();
-	args += "--cflags";
-	ret = doCommand(path, args, &out);
-	if(ret != 0)
-		return false;
+    args.clear();
+    args += "--cflags";
+    ret = doCommand(path, args, &out);
+    if (ret != 0)
+        return false;
 
-	QString cflags = QString::fromLatin1(out).trimmed();
+    QString cflags = QString::fromLatin1(out).trimmed();
 
-	QStringList incs_out, otherflags_out;
-	qc_splitcflags(cflags, &incs_out, &otherflags_out);
+    QStringList incs_out, otherflags_out;
+    qc_splitcflags(cflags, &incs_out, &otherflags_out);
 
-	*version = version_out;
-	*incs = incs_out;
-	*libs = libs_out;
-	*otherflags = otherflags_out.join(QLatin1String(" "));
-	return true;
+    *version    = version_out;
+    *incs       = incs_out;
+    *libs       = libs_out;
+    *otherflags = otherflags_out.join(QLatin1String(" "));
+    return true;
 }
 
-bool Conf::findPkgConfig(const QString &name, VersionMode mode, const QString &req_version, QString *version, QStringList *incs, QString *libs, QString *otherflags)
-{
-	QStringList args;
-	QByteArray out;
-	int ret;
-
-	args += name;
-	args += "--exists";
-	ret = doCommand("pkg-config", args, &out);
-	if(ret != 0)
-		return false;
-
-	if(mode != VersionAny)
-	{
-		args.clear();
-		args += name;
-		if(mode == VersionMin)
-			args += QString("--atleast-version=%1").arg(req_version);
-		else if(mode == VersionMax)
-			args += QString("--max-version=%1").arg(req_version);
-		else
-			args += QString("--exact-version=%1").arg(req_version);
-		ret = doCommand("pkg-config", args, &out);
-		if(ret != 0)
-			return false;
-	}
-
-	args.clear();
-	args += name;
-	args += "--modversion";
-	ret = doCommand("pkg-config", args, &out);
-	if(ret != 0)
-		return false;
-
-	QString version_out = QString::fromLatin1(out).trimmed();
-
-	args.clear();
-	args += name;
-	args += "--libs";
-	ret = doCommand("pkg-config", args, &out);
-	if(ret != 0)
-		return false;
-
-	QString libs_out = QString::fromLatin1(out).trimmed();
-
-	args.clear();
-	args += name;
-	args += "--cflags";
-	ret = doCommand("pkg-config", args, &out);
-	if(ret != 0)
-		return false;
-
-	QString cflags = QString::fromLatin1(out).trimmed();
-
-	QStringList incs_out, otherflags_out;
-	qc_splitcflags(cflags, &incs_out, &otherflags_out);
-
-	*version = version_out;
-	*incs = incs_out;
-	*libs = libs_out;
-	*otherflags = otherflags_out.join(QLatin1String(" "));
-	return true;
+bool Conf::findPkgConfig(const QString &name, VersionMode mode, const QString &req_version, QString *version,
+                         QStringList *incs, QString *libs, QString *otherflags)
+{
+    QStringList args;
+    QByteArray  out;
+    int         ret;
+
+    args += name;
+    args += "--exists";
+    ret = doCommand("pkg-config", args, &out);
+    if (ret != 0)
+        return false;
+
+    if (mode != VersionAny) {
+        args.clear();
+        args += name;
+        if (mode == VersionMin)
+            args += QString("--atleast-version=%1").arg(req_version);
+        else if (mode == VersionMax)
+            args += QString("--max-version=%1").arg(req_version);
+        else
+            args += QString("--exact-version=%1").arg(req_version);
+        ret = doCommand("pkg-config", args, &out);
+        if (ret != 0)
+            return false;
+    }
+
+    args.clear();
+    args += name;
+    args += "--modversion";
+    ret = doCommand("pkg-config", args, &out);
+    if (ret != 0)
+        return false;
+
+    QString version_out = QString::fromLatin1(out).trimmed();
+
+    args.clear();
+    args += name;
+    args += "--libs";
+    ret = doCommand("pkg-config", args, &out);
+    if (ret != 0)
+        return false;
+
+    QString libs_out = QString::fromLatin1(out).trimmed();
+
+    args.clear();
+    args += name;
+    args += "--cflags";
+    ret = doCommand("pkg-config", args, &out);
+    if (ret != 0)
+        return false;
+
+    QString cflags = QString::fromLatin1(out).trimmed();
+
+    QStringList incs_out, otherflags_out;
+    qc_splitcflags(cflags, &incs_out, &otherflags_out);
+
+    *version    = version_out;
+    *incs       = incs_out;
+    *libs       = libs_out;
+    *otherflags = otherflags_out.join(QLatin1String(" "));
+    return true;
 }
 
 void Conf::addDefine(const QString &str)
 {
-	if(DEFINES.isEmpty())
-		DEFINES = str;
-	else
-		DEFINES += QString(" ") + str;
-	debug(QString("DEFINES += %1").arg(str));
+    if (DEFINES.isEmpty())
+        DEFINES = str;
+    else
+        DEFINES += QString(" ") + str;
+    debug(QString("DEFINES += %1").arg(str));
 }
 
 void Conf::addLib(const QString &str)
 {
-	QStringList libs = qc_splitflags(str);
-	foreach (const QString &lib, libs) {
-		if (lib.startsWith("-l")) {
-			LIBS.append(lib);
-		} else {
-			LIBS.append(qc_normalize_path(lib)); // we don't care about -L prefix since normalier does not touch it.
-		}
-	}
-	debug(QString("LIBS += %1").arg(str));
+    QStringList libs = qc_splitflags(str);
+    foreach (const QString &lib, libs) {
+        if (lib.startsWith("-l")) {
+            LIBS.append(lib);
+        } else {
+            LIBS.append(qc_normalize_path(lib)); // we don't care about -L prefix since normalier does not touch it.
+        }
+    }
+    debug(QString("LIBS += %1").arg(str));
 }
 
 void Conf::addIncludePath(const QString &str)
 {
-	INCLUDEPATH.append(qc_normalize_path(str));
-	debug(QString("INCLUDEPATH += %1").arg(str));
+    INCLUDEPATH.append(qc_normalize_path(str));
+    debug(QString("INCLUDEPATH += %1").arg(str));
 }
 
 void Conf::addExtra(const QString &str)
 {
-	extra += str + '\\n';
-	debug(QString("extra += %1").arg(str));
+    extra += str + '\\n';
+    debug(QString("extra += %1").arg(str));
 }
 
 //----------------------------------------------------------------------------
@@ -2352,134 +2364,129 @@ void Conf::addExtra(const QString &str)
 #include "conf4.moc"
 
 #ifdef HAVE_MODULES
-# include"modules.cpp"
+#include "modules.cpp"
 #endif
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
-	QCoreApplication app(argc, argv);
-	Conf *conf = new Conf;
-	ConfObj *o = 0;
-	Q_UNUSED(o);
+    QCoreApplication app(argc, argv);
+    Conf *           conf = new Conf;
+    ConfObj *        o    = 0;
+    Q_UNUSED(o);
 #ifdef HAVE_MODULES
-# include"modules_new.cpp"
+#include "modules_new.cpp"
 #endif
 
-	conf->debug_enabled = (qc_getenv("QC_VERBOSE") == "Y") ? true: false;
-	if(conf->debug_enabled)
-		printf(" -> ok\\n");
-	else
-		printf("ok\\n");
-
-	QString confCommand = qc_getenv("QC_COMMAND");
-	QString proName = qc_getenv("QC_PROFILE");
-	conf->qmake_path = qc_getenv("QC_QMAKE");
-	conf->qmakespec = qc_getenv("QC_QMAKESPEC");
-	conf->maketool = qc_getenv("QC_MAKETOOL");
-
-	if(conf->debug_enabled)
-		printf("conf command: [%s]\\n", qPrintable(confCommand));
-
-	QString confPath = qc_findself(confCommand);
-	if(confPath.isEmpty())
-	{
-		printf("Error: cannot find myself; rerun with an absolute path\\n");
-		return 1;
-	}
-
-	QString srcdir = QFileInfo(confPath).absolutePath();
-	QString builddir = QDir::current().absolutePath();
-	QString proPath = QDir(srcdir).filePath(proName);
-
-	if(conf->debug_enabled)
-	{
-		printf("conf path:    [%s]\\n", qPrintable(confPath));
-		printf("srcdir:       [%s]\\n", qPrintable(srcdir));
-		printf("builddir:     [%s]\\n", qPrintable(builddir));
-		printf("profile:      [%s]\\n", qPrintable(proPath));
-		printf("qmake path:   [%s]\\n", qPrintable(conf->qmake_path));
-		printf("qmakespec:    [%s]\\n", qPrintable(conf->qmakespec));
-		printf("make tool:    [%s]\\n", qPrintable(conf->maketool));
-		printf("\\n");
-	}
-
-	bool success = false;
-	if(conf->exec())
-	{
-		QFile f("conf.pri");
-		if(!f.open(QFile::WriteOnly | QFile::Truncate))
-		{
-			printf("Error writing %s\\n", qPrintable(f.fileName()));
-			return 1;
-		}
-
-		QString str;
-		str += "# qconf\\n\\n";
-		str += "greaterThan(QT_MAJOR_VERSION, 4):CONFIG += c++11\\n";
-
-		QString var;
-		var = qc_normalize_path(qc_getenv("PREFIX"));
-		if(!var.isEmpty())
-			str += QString("PREFIX = %1\\n").arg(var);
-		var = qc_normalize_path(qc_getenv("BINDIR"));
-		if(!var.isEmpty())
-			str += QString("BINDIR = %1\\n").arg(var);
-		var = qc_normalize_path(qc_getenv("INCDIR"));
-		if(!var.isEmpty())
-			str += QString("INCDIR = %1\\n").arg(var);
-		var = qc_normalize_path(qc_getenv("LIBDIR"));
-		if(!var.isEmpty())
-			str += QString("LIBDIR = %1\\n").arg(var);
-		var = qc_normalize_path(qc_getenv("DATADIR"));
-		if(!var.isEmpty())
-			str += QString("DATADIR = %1\\n").arg(var);
-		str += '\\n';
-
-		if(qc_getenv("QC_STATIC") == "Y")
-			str += "CONFIG += staticlib\\n";
-
-		// TODO: don't need this?
-		//str += "QT_PATH_PLUGINS = " + QString(qInstallPathPlugins()) + '\\n';
-
-		if(!conf->DEFINES.isEmpty())
-			str += "DEFINES += " + conf->DEFINES + '\\n';
-		if(!conf->INCLUDEPATH.isEmpty())
-			str += "INCLUDEPATH += " + qc_prepare_includepath(conf->INCLUDEPATH) + '\\n';
-		if(!conf->LIBS.isEmpty())
-			str += "LIBS += " + qc_prepare_libs(conf->LIBS) + '\\n';
-		if(!conf->extra.isEmpty())
-			str += conf->extra;
-		str += '\\n';
-
-		var = qc_getenv("QC_EXTRACONF");
-		if (!var.isEmpty())
-			str += ("\\n# Extra conf from command line\\n" + var + "\\n");
-
-		QByteArray cs = str.toLatin1();
-		f.write(cs);
-		f.close();
-		success = true;
-	}
-	QString qmake_path = conf->qmake_path;
-	QString qmakespec = conf->qmakespec;
-	delete conf;
-
-	if(!success)
-		return 1;
-
-	// run qmake on the project file
-	QStringList args;
-	if(!qmakespec.isEmpty())
-	{
-		args += "-spec";
-		args += qmakespec;
-	}
-	args += proPath;
-	int ret = qc_runprogram(qmake_path, args, 0, true);
-	if(ret != 0)
-		return 1;
-
-	return 0;
+    conf->debug_enabled = (qc_getenv("QC_VERBOSE") == "Y") ? true : false;
+    if (conf->debug_enabled)
+        printf(" -> ok\\n");
+    else
+        printf("ok\\n");
+
+    QString confCommand = qc_getenv("QC_COMMAND");
+    QString proName     = qc_getenv("QC_PROFILE");
+    conf->qmake_path    = qc_getenv("QC_QMAKE");
+    conf->qmakespec     = qc_getenv("QC_QMAKESPEC");
+    conf->maketool      = qc_getenv("QC_MAKETOOL");
+
+    if (conf->debug_enabled)
+        printf("conf command: [%s]\\n", qPrintable(confCommand));
+
+    QString confPath = qc_findself(confCommand);
+    if (confPath.isEmpty()) {
+        printf("Error: cannot find myself; rerun with an absolute path\\n");
+        return 1;
+    }
+
+    QString srcdir   = QFileInfo(confPath).absolutePath();
+    QString builddir = QDir::current().absolutePath();
+    QString proPath  = QDir(srcdir).filePath(proName);
+
+    if (conf->debug_enabled) {
+        printf("conf path:    [%s]\\n", qPrintable(confPath));
+        printf("srcdir:       [%s]\\n", qPrintable(srcdir));
+        printf("builddir:     [%s]\\n", qPrintable(builddir));
+        printf("profile:      [%s]\\n", qPrintable(proPath));
+        printf("qmake path:   [%s]\\n", qPrintable(conf->qmake_path));
+        printf("qmakespec:    [%s]\\n", qPrintable(conf->qmakespec));
+        printf("make tool:    [%s]\\n", qPrintable(conf->maketool));
+        printf("\\n");
+    }
+
+    bool success = false;
+    if (conf->exec()) {
+        QFile f("conf.pri");
+        if (!f.open(QFile::WriteOnly | QFile::Truncate)) {
+            printf("Error writing %s\\n", qPrintable(f.fileName()));
+            return 1;
+        }
+
+        QString str;
+        str += "# qconf\\n\\n";
+        str += "greaterThan(QT_MAJOR_VERSION, 4):CONFIG += c++11\\n";
+
+        QString var;
+        var = qc_normalize_path(qc_getenv("PREFIX"));
+        if (!var.isEmpty())
+            str += QString("PREFIX = %1\\n").arg(var);
+        var = qc_normalize_path(qc_getenv("BINDIR"));
+        if (!var.isEmpty())
+            str += QString("BINDIR = %1\\n").arg(var);
+        var = qc_normalize_path(qc_getenv("INCDIR"));
+        if (!var.isEmpty())
+            str += QString("INCDIR = %1\\n").arg(var);
+        var = qc_normalize_path(qc_getenv("LIBDIR"));
+        if (!var.isEmpty())
+            str += QString("LIBDIR = %1\\n").arg(var);
+        var = qc_normalize_path(qc_getenv("DATADIR"));
+        if (!var.isEmpty())
+            str += QString("DATADIR = %1\\n").arg(var);
+        str += '\\n';
+
+        if (qc_getenv("QC_STATIC") == "Y")
+            str += "CONFIG += staticlib\\n";
+
+        // TODO: don't need this?
+        // str += "QT_PATH_PLUGINS = " + QString(qInstallPathPlugins()) + '\\n';
+
+        if (!conf->DEFINES.isEmpty())
+            str += "DEFINES += " + conf->DEFINES + '\\n';
+        if (!conf->INCLUDEPATH.isEmpty())
+            str += "INCLUDEPATH += " + qc_prepare_includepath(conf->INCLUDEPATH) + '\\n';
+        if (!conf->LIBS.isEmpty())
+            str += "LIBS += " + qc_prepare_libs(conf->LIBS) + '\\n';
+        if (!conf->extra.isEmpty())
+            str += conf->extra;
+        str += '\\n';
+
+        var = qc_getenv("QC_EXTRACONF");
+        if (!var.isEmpty())
+            str += ("\\n# Extra conf from command line\\n" + var + "\\n");
+
+        QByteArray cs = str.toLatin1();
+        f.write(cs);
+        f.close();
+        success = true;
+    }
+    QString qmake_path = conf->qmake_path;
+    QString qmakespec  = conf->qmakespec;
+    delete conf;
+
+    if (!success)
+        return 1;
+
+    // run qmake on the project file
+    QStringList args;
+    if (!qmakespec.isEmpty()) {
+        args += "-spec";
+        args += qmakespec;
+    }
+    args += proPath;
+    int ret = qc_runprogram(qmake_path, args, 0, true);
+    if (ret != 0)
+        return 1;
+
+    return 0;
 }
 
 EOT
@@ -2493,6 +2500,7 @@ DESTDIR  = \$\$PWD
 HEADERS += conf4.h
 SOURCES += conf4.cpp
 
+
 DEFINES += HAVE_MODULES
 
 greaterThan(QT_MAJOR_VERSION, 4):CONFIG += c++11
@@ -2521,38 +2529,40 @@ export QC_WITH_ZLIB_INC
 export QC_WITH_ZLIB_LIB
 export QC_WITH_QJDNS_INC
 export QC_WITH_QJDNS_LIB
+export QC_WITH_B2_INC
+export QC_WITH_B2_LIB
 export QC_VERBOSE
 export QC_QTSELECT
 rm -rf ".qconftemp"
 (
-	mkdir ".qconftemp"
-	gen_files ".qconftemp"
-	cd ".qconftemp"
-	if [ ! -z "$qm_spec" ]; then
-		"$qm" -spec $qm_spec conf4.pro >/dev/null
-	else
-		"$qm" conf4.pro >/dev/null
-	fi
-	$MAKE clean >/dev/null 2>&1
-	$MAKE >../conf.log 2>&1
+    mkdir ".qconftemp"
+    gen_files ".qconftemp"
+    cd ".qconftemp"
+    if [ ! -z "$qm_spec" ]; then
+        "$qm" -spec $qm_spec conf4.pro >/dev/null
+    else
+        "$qm" conf4.pro >/dev/null
+    fi
+    $MAKE clean >/dev/null 2>&1
+    $MAKE >../conf.log 2>&1
 )
 
 if [ "$?" != "0" ]; then
-	rm -rf ".qconftemp"
-	if [ "$QC_VERBOSE" = "Y" ]; then
-		echo " -> fail"
-	else
-		echo "fail"
-	fi
-	printf "\n"
-	printf "Reason: There was an error compiling 'conf'.  See conf.log for details.\n"
-	printf "\n"
-	show_qt_info
-	if [ "$QC_VERBOSE" = "Y" ]; then
-		echo "conf.log:"
-		cat conf.log
-	fi
-	exit 1;
+    rm -rf ".qconftemp"
+    if [ "$QC_VERBOSE" = "Y" ]; then
+        echo " -> fail"
+    else
+        echo "fail"
+    fi
+    printf "\n"
+    printf "Reason: There was an error compiling 'conf'.  See conf.log for details.\n"
+    printf "\n"
+    show_qt_info
+    if [ "$QC_VERBOSE" = "Y" ]; then
+        echo "conf.log:"
+        cat conf.log
+    fi
+    exit 1;
 fi
 
 QC_COMMAND=$0
@@ -2568,22 +2578,22 @@ export QC_MAKETOOL
 ".qconftemp/conf"
 ret="$?"
 if [ "$ret" = "1" ]; then
-	rm -rf ".qconftemp"
-	echo
-	exit 1;
+    rm -rf ".qconftemp"
+    echo
+    exit 1;
 else
-	if [ "$ret" != "0" ]; then
-		rm -rf ".qconftemp"
-		if [ "$QC_VERBOSE" = "Y" ]; then
-			echo " -> fail"
-		else
-			echo "fail"
-		fi
-		echo
-		echo "Reason: Unexpected error launching 'conf'"
-		echo
-		exit 1;
-	fi
+    if [ "$ret" != "0" ]; then
+        rm -rf ".qconftemp"
+        if [ "$QC_VERBOSE" = "Y" ]; then
+            echo " -> fail"
+        else
+            echo "fail"
+        fi
+        echo
+        echo "Reason: Unexpected error launching 'conf'"
+        echo
+        exit 1;
+    fi
 fi
 rm -rf ".qconftemp"
 
diff --git a/configure.exe b/configure.exe
index 139fbc1cdc0da4934e9b01f73383d8cb99ffcaf6..392518730028816e8f9024700dc52ae8ff76a2b2 100644
GIT binary patch
delta 16496
zcmc&b3v^Z0m29j91Bj6D3nAS15|WqCdkMi029iKNC<=s#)GA<jdGEgD!OMH$-S>bP
zeu}m-v}(0-u%ZHLwQ50~wrH)2TD9YJ#@fzIzq4v*)=b+qtJVIdGi!C~?7h!9_nw;<
z@Y7jq?plz0&)H}1efIC{v(I^dd+&s|zdK>ySKz-Ve*A5F+_(wHPQ5n~0u#iEsc>GP
zuPK~N$67WFMRNn2EcvX(cPp2%Qpvu)CNX$E%qB4WIvdz$>Y(i0qH*KK%{sN<0{GeZ
zrIU6fa|2<CADhqb>FB*?<<*z>wm0>zT+@Lq<6H<t?S~M5o(`qs*Z%xeX)z36HmM?&
zOxxB%D~Rm;^9oonojEItX8W5hMMeB<A(WgeISyY2bLRRuuJ=y~c|9;5aV@_C){5`6
z!g=)ZozFl?m;}(5$)v2jWA{44PR<^*TC7Ag<=9J#hVp%>WURS}fVRbY`^0_4Fjthd
zLB+YNl6~z>Vr3hIr!Wt}CDv|&6F=Py^TczjplF_lvCRrf)WPOpUp^gA*>N%42J`C)
zanHJ3Hkt0X`kH!CG4W)!o?a0tzAj<X1cm&5V;NW_QkcOSU(Y+(vln|-t!$?rcTh56
zg<Q0eq|-Gxlp7A!SXEUX39q@v8gWMwNg5r94cM`*9eF308SG4E9S@zsWetst(-89+
z!dc}KAylE|*wJikz#@}#tf6dXdopgvt-gGYEG`?(4qHjbN@sFbB7@SgaszhOj*vzW
zhNY$FD{kwAz-FSt!gk4dqDJNAvU${<?%QqIsLN4PQ!-zbbaEC7-SNO_nAp|`<saj>
zJsn^vBRkm$ZQ`dLFj4$#2TT{wPlgHN_Z@JFI6WCYX8c#z33ak}eJ3n1Iv5Un&lCGQ
zVHSg2<~KV(=fr?F&E0;rdNU^Bi}{@}LzI33rtMV{>+MTLx7tlwa1xg*l&qc0XVZqH
z6n6H6(JI#lTIHHjy=%18CQY@5k&o<kX^{DN=Hi(dSzjQQNhiXsiDWu{xgCw$Su_*o
zH!=`(k&|{pHT9N97Y%LKE|&n!DTIMaxs9aIt_@s~;K?W&E@(Xl7EP{(t(S1=NBl4X
z)?)odf0ejYRM0&>jf9vJ6ou%CpmHZ(3sb6H*$_Qc#c1wHI%>q+@>S9k$X`$dhFqCH
zRxrV+F&G;>iDGyOr!YXg)c_?kiBJRsr3YApA%VsR&T|DI4x*7t3!l;m!HIfG;>l(x
z5qDe%bKond9=i^<j2DrOFm*g4U%nA8or*zw0;%r8$iTR9Q(h29lJKVZ?I!q_y=a7H
zwCq42tCm2eYq4RW9Jl3@SvzjF#gk674+Emv=Hz2B+d;2nT@$YEzAYhzQ-!|m$!snk
zO<8-mTeSAV1UaD<z0ek*2{klW_Ri?wP|9w$f>(BSS*<PBqR65kBNaz`p<<B&a|SZm
zoRy9a+T7<GxHWFe5sIMbX@j{%EmouAPVCzZGp5D!9K+e#B>tw&P$e0<)_p_JfNVRy
z87`7<KiCY_{B|e`A=y+Dg~vw=R0`0t;&xxYzt>J1GSmLKZ4f=amx8R6rLWx?vSa>c
zg3jT}r{<xdNhF<JEB3Bj)3wewfP*D2<g3<qcCB50_2q?~xcvBs5H8d~E*sTE2+2~V
zP^-3;0W4evoSZ_pIy$tJSZT*4(TxPH*7j)DG>4Ef0#-hKu*}UVAZD>?E0nhR*i`ha
zZHO-v%cL><>p@kH!l@f1te72xP%*vx+b!{T0;)bPv5RaBdZrN22s45&;?)?`$Y3aA
zxE^jhvFMN;Uzv`j@^Rb2)tLG4v#Eg4-wgmp&30h#v}5k9w`Y=ZX%+=Dny4is`r=S8
zjqCO})X2AY<Cv)&xCf?B!bP)D&0b*Zy2&&ZZE@nhd*K==5>HKrVsAAAOB}T!Jk5k;
z>lf1!FjKty2+Wu|pl~WoVsZky3I`nO$9ReGrPHMhG+kO8xbMjX%#a+vmVjFM_L~Ic
z3V1ryjf?ZUkHc)OmIM8emGFP+hkg?tK_`g7lh80hyYc-4P&t)m!}5&A<0yP_>^UgW
z$o_3W3vOx>!gJk;ConC_^|D`TTs=vcDd`R*p=tckdJ2^Pab7Apn9MnmfmX3=3)Ehe
zNXPAjMXuDldif`dDv}BM?&<Abhk5gwq6++?ELa0rO&2#7Rfykhfu?zAXVT((yW6km
z>bTk$d&QEi&?d=`Y=yd7;*@i_A-P7=w_4GZQIaiDt9WHAG%cVv)xkb*c&AEL3G{*#
z%q=HSi5jDhw;)kUg3}RiQC6}(1($dW%xx)HTuQ@s7fhI1#g9@@DtZ4y3R>q-oAw-f
z&*W905bc9%-AZJ#mKeaVNuKvv;*LS6oJ1q&K^Da`2r<=wpmy<Q8fNfXL0|OrW$oxz
zDGd6=CElIK>@<XY7(3HYQGhX%h6Xkx8cvU<T|A05^)daG^kzPzc%Uvb4Xm)!@nnMa
zC7YElGkNh|3gsQhKzITTBFa4(nCE_M!;fm}p+}9vOkq1NWz<4>GQZG=_+kd`Ha&)2
ze>`>^%R>nVZc;qz!!s)U2)D*knC!d3sb_6ALrXbj{c=fX<hzGpkxg%eBY=JVhVi&O
zs4)>I7tQ8E1XXV#zdBHJUe5?(nZdzmIzAQ-0o!19C6V$?Pt88OP`ND0s&N~XZzM>1
zMg#P;59jRV*=%$e_avCqFq1n5k}2CF&S-9t9noZNMJ9U{X0*ffUnsoLmt2Y)vM_H`
zcRn|i$HdmNvI0R811!ww&=6`ngcL`CW5%*WBJ#vfqr`8wL8a$yNU*Aj+UX%OXBwAK
zyEP|=$$0iq7G|)is}z?Quc|#8j)L(j{(V0Sozk7l9B7wsy$*EAw};)fUpUYq+v;;r
z?po~X95l>k=JCJLDiH^BkdlM`D+kZJZvpZBJbdzU8rFk*Rtt0G5dNczfRZ8`4W-cb
zPRu-TiS>l2h#0B9=-&>Nb%YHgjUB~(Y)D5Wr=C+6bK^{g^u%_UouC2w!4*E2Oq;vX
zo)u_0E7OULl}HkEkpzAdhard3bv=+6O(fB-J8=#^TOtUeHF*cj->bp(-@-{y&zL)5
zR}@)$Ftgnz@-FrFLC0_uf+#BN+5rK!G#6nkzJBQJk|q9M+5t0pJs@I*e2ZV~fH!!4
z=8A-HQbsygpuw`pu#RGduLxkmB-1_lOwM))-mUV`hY6&TFKU)R#Z(KTubz&9XqH}Z
z!o|Z-T|;l$80eitgIdV-y3HfSwZl+;34zdZ6~fAhm87g|3I17XB~sCTCz7(${b&F+
z*j86(+LU;37;{M)te--I@>U2^fFTPL5e+xG{36h}aSjnTi0j7PMJ|29uS7H&Hx9Mx
zP_8tc4arTO9TOTYR-fE8{<BR8w_}L7X>82Ijn?XDcEp`GK#+B$$<SXKp*gf#TC8nk
z5j2!D++wT;DI0Ma<qpo%M|rVE>j|G)4voM9UkZS2;>}%9D%wY&RIRB~sSKj|u<9(4
z8G*nod|9}OnCgqhwmPY(Gaz^WlzU^wePRR}nVD&ZG-c6<n=hxm#0TQh<9N)dAm$>w
zuEzB=(d{B*u1FfdZ(D`cEP@-;yfgxjeM-A--UaQv717;d;cnb3yuAyiH0mb(*R!s%
z$%=D#Lrnp)RRwc2v_Cc?HW#9LCOfA-ZyxleA4BLI6tKOA<WXqZ5|S*H#N{M!u>H}0
zOijo^;=SE4u#iYnVbjRRs3}9GRW^R3Lk6hZ_dp{j4xCTFvWJr05zVG0ezOPWxk4w#
zoLp8WX3jNO_74TaE2+TcjUaNOaW6#tLXYkRD@A?ujA?u5?mKL2M-)Tkj)7>--fm~9
zJe;x<IhP$8Y|celCGun}o=P6y*$a)neFSD!GBWW@r|*MW*9z3cHl*1JtHag)#Sll5
zuBv;hz0l@ME153|guEac2`4#Gs~eNY#7eIlc(5SEK4_5n%j?JvYmZQ=5l&<<84oS2
zw;W{(R@iD%6IGL(c_X|c5&Y;zD8GOPQz3}{(j)%oMyMIHwL+}92`0*+*W3h^V%JTu
zNPa$f6Re*_qfsOIbaJQV<c3prM4HRY{ZP;5LS)3>-;8_y6F0*Yv1LCL%i(+W!yNf`
zct0#-SZ3u%`@v!yiuFJ5hkexHE~LzO3sO_ZA3h3YL`yL^{uXHV@V4Fpi$>v{BW}9|
zKGj3WNwee-5nG;tn5L@4tQ4X%bIIPAX@_|C(=eNA79TGroTG4w#se^KI&rO2IW^Nq
zJ_SFJ6501@m|00|(Q`KP;>4$67T2OpMx=7FAV$Oe9hod9@Vc5xd@kT*8sWtEZ-vT|
zRp_NAzl1?_-3kl+ZaRD`%->9X=0j6jhigDG?bx&-qZxXRpdqQ*(d)z*Fj5!<E#A5n
znsg12hb!*&Xx!`>1jdXOqUHe9E!VUqZlC5zypl;W0m)opKo$EAz<Seqes}=>*hXkE
zlqWFOtKunrg<G*YWXD6ffu!Dw>cX}^qY`gzfSD6jG20UJ4g#jiBVyS>s1}Vic!qSt
zL8!oG9UDr-(+8EJIR?oBxEFntjRc2nCn#s*i#y`i2jO?uVe~a?@X9b)HbYzcsk~i}
zg+fP7<r8++NoLZkGjZD*#Q%KO#Dj2Fy%>FQvnwK>g{WB#pp^gi&%)d-EHi@cP*wU^
zO}*QusD^rpHlE}V@er2E90X#Tp<belABt3{SG~xYk0_1sA8{;%r*bq{T+s$~lN53~
zcNM#_CVwSyVLAi3rks?~L$4N2il$Dxw?5p%@k-)Bq5{Ojw?Q`__RS}FC4IFibf?Gb
z$E4e#Ld@-i$pVk|s?VXppX`Kk`r?DW;&U*3ifL6a!wXf1Z--?ZSqVAmJD?4yMjhq-
z{&rZ*i<Uv&%SXi0JK(t>bs_GnyF0s^@$?i0nzgx5-o_jf+3BByOW6PEW7X%N+5I?x
zJ-qB;4;9z7QwMuiFTb*@x1$3Op*lLy`xuw+)WL7$M)?!@(WkGtzL7yRH>(Q0HDYb+
zv{N?LP*SN7RTOcXBj(=;^RX_*n`rIx8S1#|PN+KvJH(B5!c6p#!*@c6xg}xwm@#7+
zbsFq=-b0eo$I%<p=9#Dg?w^)9#HzIxI2(m^7nE>ubaxR>k9Ul6j<OtIB(0T=g36J#
zMlz(F!>Y|76`DP#2CgBAyY7OnY9dJwO(PR-)dyqd45?fE<}PSoLvQ+_0sSc2^!Cv9
z8Y|FZ1+NYICr^;Ef~|oOiF-c}Gq|KpkX%@kv!PFVi0Ewbh0jABt3ftORz1qNZ~4HK
z-MQ<XH>O2c7IO_qQ_w+-&lbqODo`~1v5v1z=+&CwNe=Q1;`&aQy~xEl+HYCFOs+t-
z19wBUZ-$9PD(_%bCKpF^=3*orgUI@A$n#R_<Jo1l(kt?gtm~s2Zo&VsNiPrtfVJl$
zc5LcD3!i_w8!96jhlULpoD}L`EItGgU$NV_glJ?UdkE?-)nBRr=u*I`;Jy`^b_14S
z<pd>OJ_JjBocV*NhnU`^1&Ub$E@XG_7BB<d-4<{$e?K6g48JpnaohJj0Tws@QNVoJ
zI9oIvh6~QaKp}~UpWOnp&o|B}DVE^iN**T;!#o^!{ym87+lQfy8<*qPB;2~-&KuVY
z1jp_M-4j6Yz!#v3PRUe3^XNS=U*>S9?}3PXd*>dg=JZKTH7la`KuAonA+o4Og#~TL
ziF_&*8;ql_sh%wt9o<K@?HnFv9Qy(UD@Z(K00G%LW^MZ?2q;-Vwo1jEdts9NTyQU3
z;_)WmZn+mS<`OQ?^6(I^N|YXf5((6B1m?-N)kpM12aiCRY~!@|_z@`ema-R)K$z97
zEQMLl4Gu*Hw_;f{6vPdjlk@Kk#gzMCy@!FW97y!r?}GpvC?oOJXALV8C+~v_-|#sT
zwFJf6N1<$aY-mWwc-?`{i}J+yB>7Qtry?viCqfBMP-H6-7f-zmVc+(5+x^hsqglc$
zDZzg2emZIL!liioepuj#Eg@x6RW0M-MqaI{hmPZ2vgHqG*<Swu%$ybM=w7p8<z*J_
zGBI8|nUsy|m2viZ4k8kFJb(wc?r|(PoqPaKe%z)8gbJ?fUVl|b*E&MQla8QRyv0uo
z294foVZW*7t&A&!PyoNjw7SZp>c)atbrcqJeT@}{nHimI)0GxXC-h}AFA#|bk3tRC
zdeQWWE&O9%4j|=Ku>P^+VdqFWYcOy8K*}i-sbf&=m%6K=yN|*A(HbhBiqy50kb3y)
z%b66_Bn@=YaXs@5$6-E=as#|uETl#%?^@`{cOF-Vog|+u)%6<96-WH|ID}By@);Y3
z`Y`C~yh_3HA0A-mVw6GSw&I;NFh{gM2m#*bn}DMKL6~3I`d1GE8H)FK`GEIEJT4Hw
zd=RF)aFS6>Ga5bJQm2^o5LEM(QWXp6^rg8ORoRixX6<w?lu5<ahEQjyRA^4;hx8};
zygG=Go*FT<L^<r9hd`#q_(4%7J7`83<yqp%hhVYP*e@S~s%m16m=0vNdK?!nOX9jO
zp+|N;3{4#WZ+Mv39`P`&b1mst5938k!`ExseXL+mx(yLhc)c`0%2N3oAE+bCYGXog
z<O#usypwH6Wn$4(1EQpxAqu62Ku6KDTlN@+?Dbu+pnNEcR|IxS1pZ;fiTL&xp|YFa
z=wSg6wg@GHQQX7hxg`xBb>PDUmo7!;q)s_6rB6<6YaW3WOAQeaUQW8yCA->WuHKSm
zYe`uCuOx-N;xl+Hk`=C2|7RY7^&A#-Ork}w#Z3@J`J*t0@97ezAo<oHvLC9U$f!vK
zN6asA)uV8szT9kaKBd&sxWt4D?#3@AR!y9umk|WXUdIe(Z#)W>(#GC-)Ht!c;7f4n
z+0L`j##UWJT)T3^dnR-RHWb7i7cWC*h^R$&XxVyy14De`=U;-VPD3|(v|(L{@9el(
zq{6kaQq#u#gW10Lm{`q6yzm&5l^OJ@UGX5%u<m(?GAU8?IJB|5t$v){ZOh|e7i1}z
zhQ0YXEUhJcT2E;2ynmOv(ygdEIf42opxoUt2F&%y;E#R6G+rzQAl?Ek5M6@x?>t@O
zqi%Zi7IT3k?=y=>pMWK+WuN@NFz8Ub^aFZB;;3z9e+Bg}Qt|XJL%lC*e*nJ3HD87$
z%Lu=IJ{%uPq^G_N<z8BPW|4|tA>fDR@$eI{P^>=zr5{RQ(ml>5u=`JZ1ZGfRje8Nd
zv;;4>ll<OKc7B$m?6i4eUoWPjMts4RvBC>Bi<?iv^kS^n;?@Kg2@GS(am9@%VL>CY
zLP3=R6xs~FNvz~=>U`TrO}udu4qQ*86f?XO(dI&VkaxkwyJf|R42{7D=dGNJ2Jxa3
z4y#I<=B)WCsNhgdR*3_s7-3`ye$h!s{mGNCq@M5-R{z1XL5C*w7ZBO~6fEXl%2|oT
z_+;!aAT#f2xLB?UfoJsX-;t-`q75{^S|uxbZ_y=4&l*UVtT*na52H`(l>6wz>l5!j
zt@nDkw#*lo{WV<g3!r~qgM~=E>e$5L@c&Ht<Qmd)3^mF7G)jV`{}wBr>5#XxLSot1
zU@qJ32euB1c=$u6k`2~~8*K|!ND|ddcx+KC5uyq+rQV-V_3mWaO9BZ-{KHqE**$XO
z+SgdaqB}<oYxpW$?3QQ?N+}}qRaorpM;gBdb-ubzp>r@VxEY?atZ;^fv(qiXa2O{z
z$_<IyM{q+viusVlO~?EQWXUm?(ab+2S--1(1j7H%uKI^(U`Yqfn@kO_+tY3PvDN|A
zMM;4^4)vLu*!-+6)9iZ|*301YPtWRYDiv&K9g`;=W@1TnvBQ6apYj)Kh(Eg1uS@d?
zZ&pCZsuP>wc(9$$WCz8MkKp0R{;$Ioyt^i(GU1W`i+}t&TqpT%d`@3d-}D@8m`9LY
zAE32{_5^iS^~SV1dKYg#2Y;G~VUqSrmiXQ`pm8$V&~{yK6H}gtAYZNRpaZ;GLZ%+v
z|ImqE+TOv3Rx*eY6#mG>1I!RK-O!TD)U}ANN|Ots%jHwH(~CH$tP(6zmvSZS{m(<o
zG^<(vijWYYxW%*=VP-ph(4%ujE8L3vd)$U7$@;Xbfi!?bAASKE`1D9;6}U%UgVC7K
ziqs2G#(|z@8E*A{6GFXs*(uhm>h(eVc_yFrXv)R_`mqSXk3C@B+O7`&ApKJk9)sni
zMYS+(`juT*cXwm@qLKzJ0WT)jya>%w@$nZSTt$P)Dv6J^{#}<5{l$qFp_5}9!K;J<
zZ}HNXE<3D~Kd5xF^lM6#$+XkjA1*x&i`WVc(Ge}Yzjzud-EBT<3h%#qOOANqG+gX4
z{-3AeLhq~oC9^O75?ti<-TM->dS5?&30l0b(wAW=Yl>Lcn)VDqO@<E;^a+8#$fRVY
z&lF7W=If<c*9?*{v4)b=`XX8+<Uk^l!K=mM*_Y|Anm1GG7yte;EcPAC`^8K!iaUDM
zqI3fkHHzi0;L$g|(Ic*X1zOpk=}Qm5V@Ihs1{r!4&rvr%1`~^o7{jb0oS*|8@#|Nh
z*2BpITD}RB+{%_8dh<66piiC|`nv_tb1{~6uDl9EqQ|A5Lg%ZaC^Vdbl~b=m9iJT1
zOgWO_B_a-GY`4@(nCT|av@$63U&Wa78U(yqFMSP4-90x|#IAb{R=5QR=1)4ZS~;ZT
zUVaV2<wS-a1IRckk$^K^ht>X*X^D;Ex`ep#by(~&fT+atuVdYD3m$+sshP<Us<JCd
zo@v(Nz1NL;B{Sw~`_gZj-m>#sU|pe+B_cbr$($X+t2dr*jQYBU^ZaIXIZnLsEp^bR
zt&t<8418RB*TK{K;ar^0ulYiV7t=xkMa0VvJ#S&{qLQ-tw8i+X4F2eLz(#k^Y_Vf|
z@dwXX<Yp+v#;8phOT^{ONDvH{^)f+XHRuUMcevwamt1zKa~dtI$O=V3*(cum8@SM|
S=ojXwqo#H$@CH0~&i?{XbEXXd

delta 10753
zcmcIq3v^WFwRS@gP5=Q3&m`nz5|T+mW<pRN0fLYO<O(DZC|(VQ$;?SIWHK|HnaP8Q
zfRAOXTpqsus#qUIy&woG8j%)7ZLwM(P^*Zgg4(WoyRP1AyH<PATfN`@&wpkn57FMW
zE=zOf{Qv&<d+&emJ#+Tt;5Y6cy!jBFA9C@l?_6}zU`O{iLnwRjpwx>lx@b)I?vZqE
zfcVvDx^%#z&h9g#sdJHd)kkA#UH6ARS~oy!Z=&G?hBbHpq=}v)v1dFDtEmVD8}&jj
z{?1O-8bYCfZW`-je$(*T?>>LT(-26!M`B*D5sA!BP1X2tb;CNRLQ;Su;w3+gAx(VX
zr+Ii}tfL8d%vwh|Ihxz8N18)sR1bPujZ}U$Iy|l6fKjG9T6~5Br+>JPoPa;HjvRQL
zUPpO&q_oI~tA(=hR@*|C<FU1c^6}_ykq16$p(i$_cBO`64FSKmOo`$%8e&cLM$qPe
zd2Q762b=Wut)3R6KJ1A$gX12Hk+9)ST4T5<l)}Q=aFtaH7cZ--O+YR2N22=TWfhy2
ztg5W4nZNSNURz5RFGzxh%u&-L5%R$~N{5BzdH}C{bg3siM-iK%p5=O*$Be7o$%?*#
z5AvrtXQYd%?KE+Cg1o-IO?<I~Mi1iyHvi)5y)-#Bu^>D_Du5=p1!?&JtxNm|UQ_gq
zFoqtY?91ZkjEL70HhfF`4H0L7?hOT*Tcv2D!|+<Xw1xaWUHs>68kfSmVpoW!0Qs*&
zlE(QEO~)G^nW834(+5eH6Fb9nwK#Hs@`mek^%7=QdZIY^0+kMlzl}UX3kIt<@z#2p
zrNA2fL7({i7>yHa-=K@d-WO^3K!AxwCKZBM%%rFYzf9S3u_!_&79WmKlki1o)&Kym
ziBj$`O>*w>v4CRK4oZ{Yd!v%?_oGxi#$u|`Z$_f^(zB$1Suq3{JUm9F1J>>o2(7op
zoHoi3fi}t#HEonOt1;*^8g=%J`la))PR-H%jl8hDzPh%4_2Ok%(DCjM8gUrCbb1Mv
z#Y=5eIu>rN0d~PZRaLA^IJg+mE+cG3I~8SW{zhkZxFA*2Od}dIgSs-d^c3-UJC&x}
zc9h;~yP6db;_G%wFSKwVCS3kVRckof=_~-kuGE}f+-jOw(m^u@;CXuo%}moa_5~4V
zI%p!a@>K_wkFY80p&0wOSkXz26s<92ierzG<6@=(TzfhxH$?*z;uQAFvBb+7&cG)c
z{jNrTz^DOtQY1}lFbz)&uz`AC@|sw=ft(h$TQ^Y75F48~yn)<<fHsMYMdw=yB`ARu
zlglxJK7V5>zlkkfbX5*3&SN&UmADWTQI9_uapu?6<wJWpMj(Pj2V#HgqRjDe>quxY
zZ*6O0_VskP_~u4Rb1^Q6%$CHXxZE2sJf@2B8Z*R+R}WiHoEKMYq-mS@Og0vqdKgYq
zV6I5iV@934KSc-O2!|IFh8H@sy`k1tPtbRvlM2K>2F{d^6;I^=@GI)fnycO8k1h<E
zwM^3RIg6*V3-yFwzMwN|%r{L>r`{05rIV_)H^a2dU^0pohR4^*e-x4~;1Szyp!{iU
zJX=SWl04xsY~lnuW|FsY&9qm?qG3yuni#T)a@k>lATzVdG(%FS{es@GiE;+9S6R^M
z3Ftm}#pgf^FCV*^D)G2(GcCYl_hzcX<1_1R+7_z7+lDPPX&^Wg4{jm%h+ZlYf80WW
z!Aeb{{(4Fm?Kje{o+~qNqN`_W%Pak+?(>^Y{Lj(A0<!_|>M}ZTfgm?0sl3qxLjy#d
zx`}eH<d`!&-e#wL6-1`UO9uy7y)2(TcdqVmIrQtV*VSj2gYjwX+WugSks)E;Oj#4<
z0R*N$0-h|YjD>}K6#L@OC6wmikWpT)HZ5LFqczlKI3ooG;)@a*b1~pJo~mx4?5pAe
zd3~$G{fc8tY_=*@EJH!juiUTQLa&dr6Oc@Oa9+s3_ltP&b{ccJmDT;h<*`uIfXuqB
zGkFE6OD}18c}26w6uGxj{w5o*<;W^e#?!n8e{`8f#4sVKy$XBT`2)t#o&I1{_s=bv
zt^4&kdSk%T6mbQNV3SO9y1%HXKxei28+B&{iNM<|BTLWAV_5Ogtu%U5FWa!fdx2Xx
zv}6PcDUnIRW<1Ssg0m1P$<<*1=|woj9A4{R0}aBiTo5cWd`Zgb=_icJ?e6C&GiYmE
z5fF|akz)z4O73ks?2hZ%FbWF0eGSEjlHJpiK@)HPh$iC>fWM~PM$<+^Ys@wNITiXM
zam{U%J*jBw8m80W@wP+)o=CHFBz67Z@ME`832RviEai=wRwQ7tAIdEEMqTDu<@CBu
zat*?zHtg{l@M~#WnF?IJGMLuOSW$7{b{aH>dFW*=@OSQZsvd|PF=s2~;*RN`PqAYw
z6<mT%#Tc7Fe6f`#h=1QoPAOlKY7_EF?X!iGE#FgUDK13rYiR5+9p*XW-w>A>A=pde
zfq)d}{)L)H!NA@~(!HmNwcBKYwP72TSXIN*+sIjErL1@&i<;okE1Bddzcwgclrvh?
zv~Ix2YCodNQM}k8?JEr<O1G0s>MpRI^h+(rNlsT{&vwd?04KK71QZU;=YMafl1t;U
zk82vyz}3wB9aOlC{g;V?19qzX;`{>kIzVy!<k#nO=qM8Qss)Y>U{`mm#JVw6oY_Hh
zaD8O%q(Z*Gs&`UWie#c=C%uA=d3VsHK^k{5qV*0cNPNuE>he*7$P)Fpci@^b#Q8gD
z8jh6QNvlS2^A!vFJM>7jGhnzN)vi0OLj6uEOXpp5O0D?g@dvnLl7V4F0GEFkUBRq`
z?jqe{CHo$D(bIQP)7ZFDm?0Phf<Y?r>pLl5)ZI-ZQdkw@ojYl)*m5^zf|*C|rZUF%
z>D@Ffj_tvD(rwriT!yMdWw0paBp0_(nR-pi?qZanJVrZDa2d!(TQBGoS4z4wfCeV1
z-nk%RBWibI<vPn$D=&{^g1m~xtOpYz(`Q%>w7PJ0C$dB&DzXHniqC(HCLFx|{a(r$
zx&+>6XTY+1X{z+K_IoL77BnU83X(3Alm^#upd~9DYbRm{QDPmEYT~c=QfVIhoW+I>
zh1yRZPR>lC@jfb=BHcQnNK63OrCC=}x*oABPTohWER{~ZpZ>O#Q$Zug9!~Jb;&QZ5
zDE*?%epzYS(*#Z-su-~c3Q0?9rXX(FMfyPWJL2(Ol%K+lk2tZ5N};us2dHSWj4f;Y
zz)_{#!O>|%93ZcvN;Ew{e-Q`g(a;69RrGL66VDu`pwEghr#~>vh(8ou8uA%>EB;`~
zP9<QtzRiH&rt0`74*i5Y!u=qnU#nNBX@?iI!I`FzLX3Jw4jdYz=XXU$W8D0%Xn<ph
zoR{Ks;GSaMVgwT(5)T!SbFjiJb}pq!V&ZBl9)P0Ce2A)%qHL*^HdDoOQ>jS2dku{j
z?uThGnBeM&om?EfiZUGhN!s1*=8aIa*)WsbAMoP-hv|yZ);Zf;tX@rg{V>fJDfu);
zG~7?C#i2*2Ugn0C)s@v{dN2gtnT8xq%;Ry6xcsLyV<3Ns{FKV%heKGY!wQctY&Ui+
zUpoJ)s``ow#}vJyLZ+x5gBoZ@35P12m0nh+h8^q>>nn|bfes=NKqMokj-8}5(Y2c{
zN#k8!vK>AI)MD3eDoW=a<t*#H^-VY)Y;%Go1~|8yoGVyoJ$O(i#&S}>FO?F;1S#6+
zbkqeMQmsk*3C5wj4d`u=;2wIECiHD~KYx_QaSj;%7*$P>nhzD1+i}5Uz%aHuAEO1;
z_y9I+rVI3JROtU~73DqdVUB&|ZFF-wY^;aE;ZVdMHDDP#GAyLC9;XVv?|UHSvcG?%
zI4&z;+(>ArAfjCx*a72hHoPrZhXnFtt(>u0Z8~VkwVn>Ag>r3VwijDEh<9ujr~ZGX
z{8n(<*cgaKnsKZ8z=Tvfw`W>U&D(5Q%qoWLxfGINak)w|%xVkYi>v`lssg-NB&Y7N
zYA9@FC*fxR*yE-><VwQ_`~F6cZ8?M3wuf>uIFDLrvqLRhq=Tp(P~zuVG*K+tOGU7^
z?TmIt<QoeAiHG*mWfPN}RYpylClKRK3BLN-UYeerv=3(vhRjw^0L7IYXIfwnJb_u*
zHBTU=Fs#`41Z5$EV%3?NI4s;B)A&m;wzQ{~OaL(B#jt%e%sQFA50`YR*trk*YW7iv
zwHn%oIjmfD#}~$l)BCXY<bK@rL-)&q?cpaO@Vxyr2vKn5esbZl0o!;yx}O@H@r2tL
z3k1Ba+(qz=Vs;`E^ROanis?_1V*=YM+gj-9OQH+gzzJ%T@p%17nvoz>a)3fSS1iNQ
z`2(`xn0OG%(8Sz>lz|88gz+MFkS204ii1?_kS1he(bll5wT1gjhX;*eRF;kGB;wBp
zX%&p95{hj@zCY0j>tgu}lrdiNi^IuHxjek*Dat`1-{&yw^x0EX<cg~Wo(YvG+N_m@
zn3CwoM|{_C5HOSCp%qk|A`yT6EM|_6Jx!y>_JbY3;&)F|u03oU`V39Z?hlSz!B7O1
zx-1;mK0`Am#yNs{z>x}jCu`!VXK36?O><OKFI%{Hk**h`TZ`&wX6hSaL0`Z?js%#a
zvZ{7v<>D1OPUq&<tgckcwbiRuR8-Y+T`V>1@`l4ItBR&WG-a$55mjI>i$8NndeQF>
z(M&l~$$Zwb-@Iq3AdSafj1iCcpk3VfEJr7r5F^T3<Y~c$^yvOJ71lgQSxG9K#6v6V
z7U*M7Q0t}1bn&O>XdIkwP`Bj2q?@wFtK7=z%623k378_(O*7F9H9FDQ@Jw7yNso1t
zbB4@Z@pUV6A>kxavpi=+y{JB9=3)ndx#mBQ$-exw;d$;Ocx}(~<Q|F-e0%W!0u&~T
z%)@l)NJR$s4U@-K^<m0aqp>ZADPs*^H#|8A#=?C4v%9Ogj^(y4TRr{l!PruDZZ}7o
zHOa9fO*-GO7icE5b>$0`H&J>*sD;_+rD+j-5#uucq97}g+jNdZt6a7Nu(?32J&sBt
z?Fh}6UQ>63^cj{`3*lqXo`Z`>8^5|vII67+O|};hk&AtC{0L1Nsqq{88XQe>{M8Zp
zJypg+nt<t8*u+e~gZCY75D3KZ4Hpv-XJ4|0kvo1y8R^igL^Ed&T$T?2gl`dUDBu4X
zEp%Hf!V%;}dL<^JhUqNyN2lo4prVUSqa?txaFx<nt3LnX&uLYa%|7>H`dq-e-Hsf^
zjy?xhsz2mvE>{uBuGfkIwzEJjbXiX^_b6RfiAd&>SQ(&Xwu0G+CyQ^_16*)I2u@Gj
zKJ*ISw~oq@>0ghkd1(5JG;35`>vjyVRhLLJ9ea_+V{XGz76S9Pn+X|i)Jv2%ttYHI
z7BSs{kk=D%<8;3UhB=cAhtN+poP9_d4G{w>BaTtV7_eh0-r~tRB6Y6<r2QDpvu?-3
zfES+QG+O-IF{%}hnE2H4G8JUUH3oC=AhrQovy~{n>k~&`rb*US(x+nuBj3DCnOsaj
z)4gj~tcvniaktg~0=;?gRT?60euXY|W4%}W$e_3UpRERe=i)|Z;XvY(S7^$GNz9)7
zJ#a$BhhM#rC|_dt!gQo4)4ojr%L@Gn@X;^63vr34`y~zK$zy+-Nk*Ko4p!@NKSN*a
z<#_Aq<o6s$$Mo4RX#{EbI5}5_C&vQ37plfFc4eM5ClIm6XNl->TDQ=40-15R=D~ra
zZ%q_oz9qO%Pt_PirkUbmG_Ks&vY(4NuThT93<8Xs2ARZr$_S{fuhHxri6UtToP?1X
z{Rhx}`8LfQ*&ChM`7268D*t{Qz5b5;jyUCn^`-v_y8H^QPzeT=sZUD(ocLIg{IHi2
zy0w?Y(G#*PlsaDY23;q1AE&aF|5rt;Za+y&)>ki5Pbc1@qU*j(?XZd*4ZtivuuL{T
z*ooV%3t`7-lWY+;uRUWxSdM&?#>h$0)HkUNb({=Y8z;&Ig>$K=12~Zi05)12c$0GQ
zX7?`E;@5A|WUhUg>pGcAlD(yONbtqfi#=NjeRTo>m964>`F`$L`u%Cdy_5O>ZtU!x
zS>J)(cGmBQ@&D0T&!3>#CG1G*2PZvqj9P^2<6=j+E3=CBld`|L?<B24#Qo)@EH$~!
z83A3%TP9-78^u+>p^O}O2md_99+?1!TMMnnjPQ})kbj7*4skn(tas@eVBYwy92f6@
zm#!VB$x5435EmImdVXDy$J}D_Z|Q%AaA<PvBMRQ5l2rZ%x~)LArN(>YD3m`TvVMOA
zQG!OhoU-At8n)?$+;fyLws!!Z!1m>P@&^Xv->135$`ZA6qu6ws#!Q6>c5AK|m!scD
zjlzN{E!lhaI<OyopWKNr^ia5RlK|3*d68pzMSabR>V=D!R7qUcv@`KjqCUWK%+(u|
ze_+%<WNnSue2Oj}p~k58Pmja{r&OuLk`07p;_NBe(N6k+iZj_kn3I~`rB)Y1uK$24
zv*I@!zOR?HWxU8Ry{J9K#~(;18Gf3kjkHrD_fL#ctUOJ*vJhkHcJK4xX`0Si<IHKg
zjGq%ewBA>LNSE{bT^~|8KTm&1bNQL|JDRg5VG?Bw&L(nNlNij{^`8=|xZE1xsLW`$
zzz!A|&4phomo*?8Vb>s*SreC>p_vtl`<$hgV#j5(B1V(Wit0QEMh3#Vpe$tZ-5WbG
z)<yV_R5DIgxADW6$uL6k_cP>T+0Iu}p78$OYC*A>Gkn3~W$1P>FOYE9Um%8mlms04
zC<z$R*AqBTe5Lj?&yqV%;pVfHj?t6i&5AIvfy>~fv-siHe`U}h@%dTG(&Z4)8qoSe
z!F>GK&cIieJdWo{AZD{==V+l-$=-ert<$g?%xw;zqdaTvPv=mE$hC}*ZMarUimbIC
ze@s(Rt+U20_m`1>PYsRDN_uCxdowDEKA~)Ufrf7t#8=gz+x3a%GlxGRy%fVdSG$R6
zrPFH-tCPBC;Ic;k2%AJ#CUQQd{KU6#G7LGk#M)0Otq6m79uo7f)Z|Z0m|=wlzGPo(
z^7kv^z^9ZQkNo7Cix0)|_Q<|nz+qo}j$$UuS6qB4eh7<5nKq;fDJ;qsA61!5FJ>$l
a7VG}N6ADmFzJ67)CfV$M?hmwg;Qs>EK|vk>

diff --git a/iris.qc b/iris.qc
index dee09baf..b3741541 100644
--- a/iris.qc
+++ b/iris.qc
@@ -28,4 +28,7 @@
  <dep type='qjdns'>
   <required/>
  </dep>
+ <dep type='b2'>
+  <required/>
+ </dep>
 </qconf>
diff --git a/qcm/b2.qcm b/qcm/b2.qcm
new file mode 100644
index 00000000..e01c072e
--- /dev/null
+++ b/qcm/b2.qcm
@@ -0,0 +1,70 @@
+/*
+-----BEGIN QCMOD-----
+name: libb2
+arg: with-b2-inc=[path],Path to libb2 include files
+arg: with-b2-lib=[path],Path to libb2 library or framework files
+-----END QCMOD-----
+*/
+
+//----------------------------------------------------------------------------
+// qc_b2
+//----------------------------------------------------------------------------
+class qc_b2 : public ConfObj
+{
+    bool use_system = false;
+public:
+    qc_b2(Conf *c) : ConfObj(c) {}
+    QString name() const { return "LibB2"; }
+    QString shortname() const { return "libb2"; }
+    QString resultString() const { return use_system? "system":"bundled"; }
+    bool exec()
+    {
+        QString b2_incdir, b2_libdir;
+        b2_incdir = conf->getenv("QC_WITH_B2_INC");
+        b2_libdir = conf->getenv("QC_WITH_B2_LIB");
+
+        if (b2_incdir.isEmpty() && b2_libdir.isEmpty()) {
+            if (!checkCustomDirs(b2_incdir, b2_libdir)) {
+                printf("b2 search paths provided but library is not found there. use bundled");
+                return true;
+            }
+            use_system = true;
+        } else {
+            QStringList incs;
+            QString version, libs, other;
+            if(conf->findPkgConfig("libb2", VersionAny, QString::null, &version, &incs, &libs, &other))
+            {
+                    for(int n = 0; n < incs.count(); ++n)
+                            conf->addIncludePath(incs[n]);
+                    if(!libs.isEmpty())
+                            conf->addLib(libs);
+                    use_system = true;
+            }
+        }
+
+        if (use_system) {
+            conf->addExtra("CONFIG += bundled_blake2");
+        }
+
+        return true;
+    }
+
+    bool checkCustomDirs(QString &b2_incdir, QString &b2_libdir)
+    {
+        if ((b2_incdir.isEmpty() && !conf->findHeader("blake2.h", QStringList(), &b2_incdir)) ||
+            (!b2_incdir.isEmpty() && !conf->checkHeader(b2_incdir, "blake2.h"))) {
+            printf("Headers not found!\n");
+            return false;
+        }
+
+        if((!b2_libdir.isEmpty() && conf->checkLibrary(b2_libdir, "b2")) ||
+           (b2_libdir.isEmpty() && conf->findLibrary("b2", &b2_libdir))) {
+            conf->addLib(b2_libdir.isEmpty()? "-lb2" : QString("-L%1 -lb2").arg(b2_libdir));
+            conf->addIncludePath(b2_incdir);
+            return true;
+        }
+
+        printf("Libraries not found!\n");
+        return false;
+    }
+};
diff --git a/src/xmpp/CMakeLists.txt b/src/xmpp/CMakeLists.txt
index 768f7938..ef729274 100644
--- a/src/xmpp/CMakeLists.txt
+++ b/src/xmpp/CMakeLists.txt
@@ -68,8 +68,6 @@ set(HEADERS
     sasl/scramsha1signature.h
 
     blake2/blake2qt.h
-    blake2/blake2.h
-    blake2/blake2-impl.h
 
     xmpp-core/compressionhandler.h
     xmpp-core/securestream.h
@@ -149,8 +147,6 @@ set(SOURCES
     zlib/zlibdecompressor.cpp
 
     blake2/blake2qt.cpp
-    blake2/blake2b-ref.c
-    blake2/blake2s-ref.c
 
     jid/jid.cpp
 
@@ -174,6 +170,20 @@ add_library(iris
     ${SOURCES}
 )
 
+if (B2_FOUND)
+    message(STATUS "Building with system blake2 library")
+    target_compile_definitions(iris PUBLIC IRIS_SYSTEM_BLAKE2)
+else (B2_FOUND)
+    message(STATUS "Building with slow blake2 reference implementation")
+    target_sources(iris PRIVATE
+            blake2/blake2b-ref.c
+            blake2/blake2s-ref.c
+            blake2/blake2.h
+            blake2/blake2-impl.h)
+    target_include_directories(iris PRIVATE blake2)
+endif (B2_FOUND)
+
+
 if( SEPARATE_QJDNS AND WIN32)
     set(EXTRA_LDFLAGS ws2_32)
 endif()
diff --git a/src/xmpp/blake2/blake2.pri b/src/xmpp/blake2/blake2.pri
index 8762944d..6ed4bd71 100644
--- a/src/xmpp/blake2/blake2.pri
+++ b/src/xmpp/blake2/blake2.pri
@@ -1,11 +1,18 @@
 INCLUDEPATH *= $$PWD/../..
 DEPENDPATH *= $$PWD/../..
 
-SOURCES += $$PWD/blake2qt.cpp \
-    $$PWD/blake2s-ref.c \
-    $$PWD/blake2b-ref.c
+SOURCES += $$PWD/blake2qt.cpp
 
-HEADERS += $$PWD/blake2qt.h \
-    $$PWD/blake2.h
+bundled_blake2 {
+    SOURCES += \
+        $$PWD/blake2s-ref.c \
+        $$PWD/blake2b-ref.c
+    HEADERS += $$PWD/blake2.h
+    INCLUDEPATH += $PWD
+} else {
+    DEFINES += IRIS_SYSTEM_BLAKE2
+}
+
+HEADERS += $$PWD/blake2qt.h
 
 OTHER_FILES += $$PWD/README.md

From b1188c76446eb73aa0f35f9494167f64502f0ce9 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 19 May 2020 02:57:49 +0300
Subject: [PATCH 185/383] An attempt to fix linkage

---
 src/xmpp/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/xmpp/CMakeLists.txt b/src/xmpp/CMakeLists.txt
index ef729274..7eb474e6 100644
--- a/src/xmpp/CMakeLists.txt
+++ b/src/xmpp/CMakeLists.txt
@@ -173,6 +173,7 @@ add_library(iris
 if (B2_FOUND)
     message(STATUS "Building with system blake2 library")
     target_compile_definitions(iris PUBLIC IRIS_SYSTEM_BLAKE2)
+    target_link_libraries(iris ${B2_LIBRARY})
 else (B2_FOUND)
     message(STATUS "Building with slow blake2 reference implementation")
     target_sources(iris PRIVATE

From e8fc8fb9061209993fb47d2ace62897abf4e72ad Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Tue, 19 May 2020 14:29:17 +0300
Subject: [PATCH 186/383] CMake files updated. Some modernization of CMake
 files.

---
 CMakeLists.txt              | 23 +++++++++++++++++------
 cmake/modules/FindB2.cmake  |  9 ++++-----
 cmake/modules/FindIDN.cmake | 10 ++++------
 cmake/modules/FindQca.cmake | 12 +++++++-----
 src/irisnet/CMakeLists.txt  |  3 ++-
 src/xmpp/CMakeLists.txt     | 15 +++++++++------
 6 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d494c9f1..f224f8e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,11 +5,19 @@ endif()
 project(iris)
 cmake_minimum_required(VERSION 3.1.0)
 
+#Set automoc and autouic policy
 if(POLICY CMP0071)
-    cmake_policy(SET CMP0071 OLD)
+    if(${CMAKE_VERSION} VERSION_LESS "3.10.0")
+        cmake_policy(SET CMP0071 OLD)
+        message(STATUS "CMP0071 policy set to OLD")
+    else()
+        cmake_policy(SET CMP0071 NEW)
+        message(STATUS "CMP0071 policy set to NEW")
+    endif()
 endif()
 if(POLICY CMP0074)
     cmake_policy(SET CMP0074 NEW)
+    message(STATUS "CMP0074 policy set to NEW")
 endif()
 
 set( IRIS_LIB_VERSION_MAJOR 1 )
@@ -19,12 +27,13 @@ set( IRIS_LIB_VERSION_STRING
     ${IRIS_LIB_VERSION_MAJOR}.${IRIS_LIB_VERSION_MINOR}.${IRIS_LIB_VERSION_PATCH}
     )
 
+get_filename_component(ABS_PARENT_DIR "${CMAKE_CURRENT_LIST_DIR}/.." ABSOLUTE)
+
 set( CMAKE_MODULE_PATH
     "${CMAKE_MODULE_PATH}"
     "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
-    "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/modules"
+    "${ABS_PARENT_DIR}/cmake/modules"
     "${PROJECT_SOURCE_DIR}/cmake/modules"
-    "${PROJECT_SOURCE_DIR}/../cmake/modules"
     )
 
 option( USE_QJDNS "Use qjdns/jdns library. Disabled by default for Qt5" OFF )
@@ -55,8 +64,7 @@ include_directories(
 )
 
 if(NOT USE_QJDNS AND SEPARATE_QJDNS)
-    message(WARNING "SEPARATE_QJDNS flag enabled, but USE_QJDNS flag disabled. Both flags will be disabled")
-    set(SEPARATE_QJDNS OFF)
+    message(FATAL_ERROR "SEPARATE_QJDNS flag enabled, but USE_QJDNS flag disabled.\nPlease enable flag USE_QJDNS or disable both flags")
 endif()
 
 if(USE_QJDNS AND (NOT SEPARATE_QJDNS))
@@ -118,7 +126,10 @@ elseif(USE_QJDNS)
 endif()
 
 find_package(IDN REQUIRED)
-find_package(B2)
+find_package(B2 QUIET)
+if(B2_FOUND)
+    message(STATUS "Found B2: ${B2_LIBRARY}")
+endif()
 
 add_definitions(-DIRISNET_STATIC)
 
diff --git a/cmake/modules/FindB2.cmake b/cmake/modules/FindB2.cmake
index 9b9dafe9..e4564f1f 100644
--- a/cmake/modules/FindB2.cmake
+++ b/cmake/modules/FindB2.cmake
@@ -31,15 +31,15 @@ endif()
 if( B2_INCLUDE_DIR AND B2_LIBRARY )
     # in cache already
     set(B2_FIND_QUIETLY TRUE)
-endif( B2_INCLUDE_DIR AND B2_LIBRARY )
+endif()
 
 if( UNIX AND NOT( APPLE OR CYGWIN ) )
     find_package( PkgConfig QUIET )
     pkg_check_modules( PC_B2 QUIET libb2 )
     if( PC_B2_FOUND )
         set( B2_DEFINITIONS ${PC_B2_CFLAGS} ${PC_B2_CFLAGS_OTHER} )
-    endif( PC_B2_FOUND )
-endif( UNIX AND NOT( APPLE OR CYGWIN ) )
+    endif()
+endif()
 
 set( B2_ROOT "" CACHE STRING "Path to libb2 library" )
 
@@ -52,7 +52,6 @@ find_path(
 )
 set(B2_NAMES
     b2${D}
-    libb2${D}
 )
 find_library(
     B2_LIBRARY
@@ -73,6 +72,6 @@ find_package_handle_standard_args(
 if( B2_FOUND )
     set( B2_LIBRARIES ${B2_LIBRARY} )
     set( B2_INCLUDE_DIRS ${B2_INCLUDE_DIR} )
-endif( B2_FOUND )
+endif()
 
 mark_as_advanced( B2_INCLUDE_DIR B2_LIBRARY )
diff --git a/cmake/modules/FindIDN.cmake b/cmake/modules/FindIDN.cmake
index 5fbe937a..1ec04ce9 100644
--- a/cmake/modules/FindIDN.cmake
+++ b/cmake/modules/FindIDN.cmake
@@ -31,15 +31,15 @@ endif()
 if( IDN_INCLUDE_DIR AND IDN_LIBRARY )
     # in cache already
     set(IDN_FIND_QUIETLY TRUE)
-endif( IDN_INCLUDE_DIR AND IDN_LIBRARY )
+endif()
 
 if( UNIX AND NOT( APPLE OR CYGWIN ) )
     find_package( PkgConfig QUIET )
     pkg_check_modules( PC_IDN QUIET libidn )
     if( PC_IDN_FOUND )
         set( IDN_DEFINITIONS ${PC_IDN_CFLAGS} ${PC_IDN_CFLAGS_OTHER} )
-    endif( PC_IDN_FOUND )
-endif( UNIX AND NOT( APPLE OR CYGWIN ) )
+    endif()
+endif()
 
 set( IDN_ROOT "" CACHE STRING "Path to libidn library" )
 
@@ -52,9 +52,7 @@ find_path(
 )
 set(IDN_NAMES
     idn${D}
-    libidn${D}
     idn-11${D}
-    libidn-11${D}
 )
 find_library(
     IDN_LIBRARY
@@ -75,6 +73,6 @@ find_package_handle_standard_args(
 if( IDN_FOUND )
     set( IDN_LIBRARIES ${IDN_LIBRARY} )
     set( IDN_INCLUDE_DIRS ${IDN_INCLUDE_DIR} )
-endif( IDN_FOUND )
+endif()
 
 mark_as_advanced( IDN_INCLUDE_DIR IDN_LIBRARY )
diff --git a/cmake/modules/FindQca.cmake b/cmake/modules/FindQca.cmake
index 17e5a14a..96ea7d40 100644
--- a/cmake/modules/FindQca.cmake
+++ b/cmake/modules/FindQca.cmake
@@ -1,5 +1,5 @@
 #=============================================================================
-# Copyright (C) 2016-2017  Psi+ Project, Vitaly Tonkacheyev
+# Copyright 2016-2020 Psi+ Project, Vitaly Tonkacheyev
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -31,13 +31,14 @@ endif()
 if (Qca_INCLUDE_DIR AND Qca_LIBRARY)
     # in cache already
     set(Qca_FIND_QUIETLY TRUE)
-endif ()
+endif()
 
 set(EXTRA_PATH_SUFFIXES
     qt5/Qca-qt5/QtCrypto
     Qca-qt5/QtCrypto
     qt5/QtCrypto
     qt/Qca-qt5/QtCrypto
+    lib/qca-qt5.framework/Versions/2/Headers
 )
 
 find_path(
@@ -52,10 +53,11 @@ find_path(
 find_library(
     Qca_LIBRARY
     NAMES qca-qt5${D}
-    HINTS 
+    HINTS
     ${QCA_DIR}/lib
     ${QCA_DIR}/bin
 )
+
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(
                 Qca
@@ -63,10 +65,10 @@ find_package_handle_standard_args(
                 Qca_LIBRARY
                 Qca_INCLUDE_DIR
 )
+
 if (Qca_FOUND)
     set ( Qca_LIBRARIES ${Qca_LIBRARY} )
     set ( Qca_INCLUDE_DIRS ${Qca_INCLUDE_DIR} )
-endif(Qca_FOUND)
+endif()
 
 mark_as_advanced( Qca_INCLUDE_DIR Qca_LIBRARY )
-
diff --git a/src/irisnet/CMakeLists.txt b/src/irisnet/CMakeLists.txt
index eafb4e7a..0ef741d9 100644
--- a/src/irisnet/CMakeLists.txt
+++ b/src/irisnet/CMakeLists.txt
@@ -1,4 +1,5 @@
 cmake_minimum_required(VERSION 3.1.0)
+get_filename_component(ABS_PARENT_DIR "${CMAKE_CURRENT_LIST_DIR}/.." ABSOLUTE)
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     corelib
@@ -11,7 +12,7 @@ include_directories(
 set( CMAKE_MODULE_PATH
     "${CMAKE_MODULE_PATH}"
     "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
-    "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/modules"
+    "${ABS_PARENT_DIR}/cmake/modules"
 )
 
 set(SOURCES
diff --git a/src/xmpp/CMakeLists.txt b/src/xmpp/CMakeLists.txt
index 7eb474e6..5a193f99 100644
--- a/src/xmpp/CMakeLists.txt
+++ b/src/xmpp/CMakeLists.txt
@@ -1,11 +1,14 @@
+cmake_minimum_required(VERSION 3.1.0)
 add_definitions(-DXMPP_TEST)
 
 find_package(ZLIB REQUIRED)
+get_filename_component(ABS_PARENT_DIR "${CMAKE_CURRENT_LIST_DIR}/.." ABSOLUTE)
+get_filename_component(ABS_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE)
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_LIST_DIR}
-    ..
-    ../irisnet/corelib
+    ${ABS_PARENT_DIR}
+    ${ABS_PARENT_DIR}/irisnet/corelib
     xmpp-core
     xmpp-im
     ${IDN_INCLUDE_DIRS}
@@ -170,11 +173,11 @@ add_library(iris
     ${SOURCES}
 )
 
-if (B2_FOUND)
+if(B2_FOUND)
     message(STATUS "Building with system blake2 library")
     target_compile_definitions(iris PUBLIC IRIS_SYSTEM_BLAKE2)
     target_link_libraries(iris ${B2_LIBRARY})
-else (B2_FOUND)
+else()
     message(STATUS "Building with slow blake2 reference implementation")
     target_sources(iris PRIVATE
             blake2/blake2b-ref.c
@@ -182,7 +185,7 @@ else (B2_FOUND)
             blake2/blake2.h
             blake2/blake2-impl.h)
     target_include_directories(iris PRIVATE blake2)
-endif (B2_FOUND)
+endif()
 
 
 if( SEPARATE_QJDNS AND WIN32)
@@ -192,4 +195,4 @@ endif()
 target_link_libraries(iris ${IDN_LIBRARY} ${ZLIB_LIBRARY} ${EXTRA_LDFLAGS})
 target_link_libraries(iris irisnet Qt5::Core Qt5::Gui Qt5::Network Qt5::Xml ${qca_LIB})
 target_compile_definitions(iris INTERFACE IRISNET_STATIC)
-target_include_directories(iris INTERFACE ../../include ../../include/iris ..)
+target_include_directories(iris INTERFACE ${ABS_ROOT_DIR}/include ${ABS_ROOT_DIR}/include/iris ${ABS_PARENT_DIR})

From ff3e2bd20116b15019c1ff0d0e3438a4b4969f46 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 19 May 2020 21:41:35 +0300
Subject: [PATCH 187/383] Rewrite xmpp_hash to use qca hash algorithms which
 should be faster than reference implementations in Qt

---
 src/xmpp/blake2/blake2qt.cpp | 70 ++++++-----------------------------
 src/xmpp/xmpp-im/types.cpp   | 71 ++++++++++++++++++++++--------------
 2 files changed, 56 insertions(+), 85 deletions(-)

diff --git a/src/xmpp/blake2/blake2qt.cpp b/src/xmpp/blake2/blake2qt.cpp
index ea9bfec6..d68be9b6 100644
--- a/src/xmpp/blake2/blake2qt.cpp
+++ b/src/xmpp/blake2/blake2qt.cpp
@@ -7,28 +7,20 @@
 namespace XMPP {
 QByteArray computeBlake2Hash(const QByteArray &ba, Blake2DigestSize digestSize)
 {
-    QByteArray ret;
-    int        retCode;
-    if (digestSize == Blake2Digest256) {
-        ret.reserve(BLAKE2S_OUTBYTES);
-        retCode = blake2s(ret.data(), BLAKE2S_OUTBYTES, ba.data(), ba.size(), nullptr, 0);
-    } else {
-        ret.reserve(BLAKE2B_OUTBYTES);
-        retCode = blake2b(ret.data(), BLAKE2B_OUTBYTES, ba.data(), ba.size(), nullptr, 0);
-    }
+    // otherwise try to libb2 or bundled reference implementation depending on which is available
 
-    if (retCode != 0) {
+    size_t     digestSizeBytes = digestSize == Blake2Digest256 ? 32 : 64;
+    QByteArray ret(digestSizeBytes, Qt::Uninitialized);
+
+    if (blake2b(ret.data(), digestSizeBytes, ba.data(), ba.size(), nullptr, 0) != 0) {
         ret.clear();
     }
 
     return ret;
 }
 
-static QByteArray computeBlake2Hash256(QIODevice *dev)
+QByteArray computeBlake2Hash(QIODevice *dev, Blake2DigestSize digestSize)
 {
-    int           retCode;
-    blake2s_state state;
-
     if (!dev->isOpen()) {
         dev->open(QIODevice::ReadOnly);
     }
@@ -36,46 +28,17 @@ static QByteArray computeBlake2Hash256(QIODevice *dev)
         return QByteArray();
     }
 
-    retCode = blake2s_init(&state, BLAKE2S_OUTBYTES);
-    if (retCode != 0) {
-        return QByteArray();
-    }
-    QByteArray buf;
-    while ((buf = dev->read(64 * 1024 * 1024)).size() > 0) {
-        retCode = blake2s_update(&state, buf.data(), buf.size());
-        if (retCode != 0) {
-            return QByteArray();
-        }
-    }
-
-    QByteArray ret;
-    ret.reserve(BLAKE2S_OUTBYTES);
-    retCode = blake2s_final(&state, ret.data(), ret.size());
-    if (retCode != 0) {
-        return QByteArray();
-    }
-
-    return ret;
-}
+    // otherwise try to libb2 or bundled reference implementation depending on which is available
 
-static QByteArray computeBlake2Hash512(QIODevice *dev)
-{
-    int           retCode;
+    size_t        digestSizeBytes = digestSize == Blake2Digest256 ? 32 : 64;
     blake2b_state state;
-
-    if (!dev->isOpen()) {
-        dev->open(QIODevice::ReadOnly);
-    }
-    if (!dev->isOpen()) {
-        return QByteArray();
-    }
-
-    retCode = blake2b_init(&state, BLAKE2B_OUTBYTES);
+    int           retCode = blake2b_init(&state, digestSizeBytes);
     if (retCode != 0) {
         return QByteArray();
     }
     QByteArray buf;
-    while ((buf = dev->read(64 * 1024 * 1024)).size() > 0) {
+    // reading by 1Mb should work well with disk caches
+    while ((buf = dev->read(1024 * 1024)).size() > 0) {
         retCode = blake2b_update(&state, buf.data(), buf.size());
         if (retCode != 0) {
             return QByteArray();
@@ -83,7 +46,7 @@ static QByteArray computeBlake2Hash512(QIODevice *dev)
     }
 
     QByteArray ret;
-    ret.reserve(BLAKE2B_OUTBYTES);
+    ret.resize(digestSizeBytes);
     retCode = blake2b_final(&state, ret.data(), ret.size());
     if (retCode != 0) {
         return QByteArray();
@@ -92,13 +55,4 @@ static QByteArray computeBlake2Hash512(QIODevice *dev)
     return ret;
 }
 
-QByteArray computeBlake2Hash(QIODevice *dev, Blake2DigestSize digestSize)
-{
-    QByteArray ret;
-    if (digestSize == Blake2Digest256) {
-        return computeBlake2Hash256(dev);
-    } else {
-        return computeBlake2Hash512(dev);
-    }
-}
 } // namespace XMPP
diff --git a/src/xmpp/xmpp-im/types.cpp b/src/xmpp/xmpp-im/types.cpp
index d92fe7f0..a35557f8 100644
--- a/src/xmpp/xmpp-im/types.cpp
+++ b/src/xmpp/xmpp-im/types.cpp
@@ -343,48 +343,65 @@ bool Hash::compute(const QByteArray &ba)
 
 bool Hash::compute(QIODevice *dev)
 {
+    QString                       qcaType;
+    QCryptographicHash::Algorithm qtType  = QCryptographicHash::Algorithm(-1);
+    Blake2DigestSize              blakeDS = Blake2DigestSize(-1);
+
+    v_data.clear();
+
     switch (v_type) {
-    case Type::Sha1: {
-        QCryptographicHash h(QCryptographicHash::Sha1);
-        h.addData(dev);
-        v_data = h.result();
+    case Type::Sha1:
+        qtType  = QCryptographicHash::Sha1;
+        qcaType = "sha1";
         break;
-    }
-    case Type::Sha256: {
-        QCryptographicHash h(QCryptographicHash::Sha256);
-        h.addData(dev);
-        v_data = h.result();
+    case Type::Sha256:
+        qtType  = QCryptographicHash::Sha256;
+        qcaType = "sha256";
         break;
-    }
-    case Type::Sha512: {
-        QCryptographicHash h(QCryptographicHash::Sha512);
-        h.addData(dev);
-        v_data = h.result();
+    case Type::Sha512:
+        qtType  = QCryptographicHash::Sha512;
+        qcaType = "sha512";
         break;
-    }
-    case Type::Sha3_256: {
-        QCryptographicHash h(QCryptographicHash::Sha3_256);
-        h.addData(dev);
-        v_data = h.result();
+    case Type::Sha3_256:
+        qtType  = QCryptographicHash::Sha3_256;
+        qcaType = "sha3_256";
         break;
-    }
-    case Type::Sha3_512: {
-        QCryptographicHash h(QCryptographicHash::Sha3_512);
-        h.addData(dev);
-        v_data = h.result();
+    case Type::Sha3_512:
+        qtType  = QCryptographicHash::Sha3_512;
+        qcaType = "sha3_512";
         break;
-    }
     case Type::Blake2b256:
-        v_data = computeBlake2Hash(dev, Blake2Digest256);
+        qcaType = "blake2b_256";
+        blakeDS = Blake2Digest256;
         break;
     case Type::Blake2b512:
-        v_data = computeBlake2Hash(dev, Blake2Digest512);
+        qcaType = "blake2b_512";
+        blakeDS = Blake2Digest512;
         break;
     case Type::Unknown:
     default:
         qDebug("invalid hash type");
         return false;
     }
+
+    if (!qcaType.isEmpty()) {
+        QCA::Hash hashObj(qcaType);
+        if (hashObj.context()) {
+            hashObj.update(dev);
+            v_data = hashObj.final().toByteArray();
+            if (!v_data.isEmpty())
+                return true;
+        }
+    }
+
+    if (qtType != QCryptographicHash::Algorithm(-1)) {
+        QCryptographicHash h(QCryptographicHash::Sha1);
+        h.addData(dev);
+        v_data = h.result();
+    } else if (blakeDS != Blake2DigestSize(-1)) {
+        v_data = computeBlake2Hash(dev, blakeDS);
+    }
+
     return !v_data.isEmpty();
 }
 

From 149dbcbb07d9b65538bbcfe387ff1ca599b1d1c5 Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Thu, 21 May 2020 14:09:44 +0300
Subject: [PATCH 188/383] Updated CMake files. Fixed build with MSVC. Removed
 unused strings

---
 cmake/modules/FindB2.cmake  | 2 --
 cmake/modules/FindIDN.cmake | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/cmake/modules/FindB2.cmake b/cmake/modules/FindB2.cmake
index e4564f1f..d712e9b2 100644
--- a/cmake/modules/FindB2.cmake
+++ b/cmake/modules/FindB2.cmake
@@ -41,8 +41,6 @@ if( UNIX AND NOT( APPLE OR CYGWIN ) )
     endif()
 endif()
 
-set( B2_ROOT "" CACHE STRING "Path to libb2 library" )
-
 find_path(
     B2_INCLUDE_DIR blake2.h
     HINTS
diff --git a/cmake/modules/FindIDN.cmake b/cmake/modules/FindIDN.cmake
index 1ec04ce9..81892530 100644
--- a/cmake/modules/FindIDN.cmake
+++ b/cmake/modules/FindIDN.cmake
@@ -41,8 +41,6 @@ if( UNIX AND NOT( APPLE OR CYGWIN ) )
     endif()
 endif()
 
-set( IDN_ROOT "" CACHE STRING "Path to libidn library" )
-
 find_path(
     IDN_INCLUDE_DIR idna.h
     HINTS
@@ -52,6 +50,7 @@ find_path(
 )
 set(IDN_NAMES
     idn${D}
+    libidn${D}
     idn-11${D}
 )
 find_library(

From c235aae8ba89c3d95c7a04db7cb289f3047a1734 Mon Sep 17 00:00:00 2001
From: Vitaly Tonkacheyev <Vitozz@users.noreply.github.com>
Date: Thu, 21 May 2020 22:33:04 +0300
Subject: [PATCH 189/383] Updated src/xmpp/CMakeLists.txt

Fixed warning about CMP0074 policy (CMake >= 3.12)
---
 src/xmpp/CMakeLists.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/xmpp/CMakeLists.txt b/src/xmpp/CMakeLists.txt
index 5a193f99..7b2d6885 100644
--- a/src/xmpp/CMakeLists.txt
+++ b/src/xmpp/CMakeLists.txt
@@ -1,4 +1,9 @@
 cmake_minimum_required(VERSION 3.1.0)
+if(POLICY CMP0074)
+    cmake_policy(SET CMP0074 NEW)
+    message(STATUS "CMP0074 policy set to NEW")
+endif()
+
 add_definitions(-DXMPP_TEST)
 
 find_package(ZLIB REQUIRED)

From 46abb60f71af96c88dcf2b3ba00c97311794fea2 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 27 May 2020 01:46:13 +0300
Subject: [PATCH 190/383] Added some debug logs to ICE

---
 src/irisnet/noncore/ice176.cpp            | 5 ++++-
 src/irisnet/noncore/icelocaltransport.cpp | 6 ++++++
 src/irisnet/noncore/stuntransaction.cpp   | 6 +++++-
 src/irisnet/noncore/turnclient.cpp        | 3 +++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index d9f6fa19..72f26cf4 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -571,8 +571,11 @@ class Ice176::Private : public QObject {
                     if (!pair)
                         return;
                     int at = findLocalCandidate(pair->local->addr.addr, pair->local->addr.port);
-                    if (at == -1) // FIXME: assert?
+                    if (at == -1) { // FIXME: assert?
+                        qDebug("Failed to find local candidate %s:%d", qPrintable(pair->local->addr.addr.toString()),
+                               pair->local->addr.port);
                         return;
+                    }
 
                     IceComponent::Candidate &lc   = localCandidates[at];
                     int                      path = lc.path;
diff --git a/src/irisnet/noncore/icelocaltransport.cpp b/src/irisnet/noncore/icelocaltransport.cpp
index dc8bcbc1..613a0089 100644
--- a/src/irisnet/noncore/icelocaltransport.cpp
+++ b/src/irisnet/noncore/icelocaltransport.cpp
@@ -550,6 +550,12 @@ private slots:
         WriteItem wi;
         wi.type = WriteItem::Pool;
         pendingWrites += wi;
+        // emit q->debugLine(QString("Sending udp packet from: %1:%2 to: %3:%4")
+        //                      .arg(sock->localAddress().toString())
+        //                      .arg(sock->localPort())
+        //                      .arg(toAddress.toString())
+        //                      .arg(toPort));
+
         sock->writeDatagram(packet, toAddress, toPort);
     }
 
diff --git a/src/irisnet/noncore/stuntransaction.cpp b/src/irisnet/noncore/stuntransaction.cpp
index 83af93ee..7a1ea92a 100644
--- a/src/irisnet/noncore/stuntransaction.cpp
+++ b/src/irisnet/noncore/stuntransaction.cpp
@@ -302,7 +302,11 @@ private slots:
             rto *= 2;
         }
 
-        emit pool->debugLine("stun transaction timeout. retransmitting..");
+        QString dbg;
+        if (!to_addr.isNull())
+            dbg += QString("to=(") + to_addr.toString() + ';' + QString::number(to_port) + ')';
+
+        emit pool->debugLine(QString("stun transaction %1 timeout. retransmitting..").arg(dbg));
         transmit();
     }
 
diff --git a/src/irisnet/noncore/turnclient.cpp b/src/irisnet/noncore/turnclient.cpp
index d7b4f11d..818ca0cf 100644
--- a/src/irisnet/noncore/turnclient.cpp
+++ b/src/irisnet/noncore/turnclient.cpp
@@ -780,6 +780,9 @@ private slots:
 
         writeItems += WriteItem(packet.size());
 
+        // emit q->debugLine(QString("Sending turn packet to: %1:%2")
+        //                      .arg(bs->abstractSocket()->peerAddress().toString())
+        //                      .arg(bs->abstractSocket()->peerPort()));
         if (tls)
             tls->write(packet);
         else

From 03686c4be9f8b91775d190c37880ccd784424638 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Thu, 28 May 2020 11:45:04 +0300
Subject: [PATCH 191/383] Implement caps#optimize from xep-0115 and add caps
 feature to disco

Fixes https://github.com/psi-im/psi/issues/582
---
 src/xmpp/xmpp-core/protocol.h      |  1 +
 src/xmpp/xmpp-im/client.cpp        | 23 ++++++++++++++++++-----
 src/xmpp/xmpp-im/xmpp_client.h     |  2 ++
 src/xmpp/xmpp-im/xmpp_features.cpp |  6 ++++++
 src/xmpp/xmpp-im/xmpp_features.h   |  2 ++
 src/xmpp/xmpp-im/xmpp_tasks.cpp    |  2 +-
 6 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/xmpp/xmpp-core/protocol.h b/src/xmpp/xmpp-core/protocol.h
index 50608c6b..2db6352f 100644
--- a/src/xmpp/xmpp-core/protocol.h
+++ b/src/xmpp/xmpp-core/protocol.h
@@ -40,6 +40,7 @@
 #define NS_STANZAS "urn:ietf:params:xml:ns:xmpp-stanzas"
 #define NS_BIND "urn:ietf:params:xml:ns:xmpp-bind"
 #define NS_CAPS "http://jabber.org/protocol/caps"
+#define NS_CAPS_OPTIMIZE "http://jabber.org/protocol/caps#optimize"
 #define NS_COMPRESS_FEATURE "http://jabber.org/features/compress"
 #define NS_COMPRESS_PROTOCOL "http://jabber.org/protocol/compress"
 #define NS_HOSTS "http://barracuda.com/xmppextensions/hosts"
diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
index 34231c6a..3c1f2bbb 100644
--- a/src/xmpp/xmpp-im/client.cpp
+++ b/src/xmpp/xmpp-im/client.cpp
@@ -125,9 +125,10 @@ class Client::ClientPrivate {
     DiscoItem::Identity     identity;
     Features                features;
     QMap<QString, Features> extension_features;
-    int                     tzoffset    = 0;
-    bool                    useTzoffset = false; // manual tzoffset is old way of doing utc<->local translations
-    bool                    active      = false;
+    int                     tzoffset         = 0;
+    bool                    useTzoffset      = false; // manual tzoffset is old way of doing utc<->local translations
+    bool                    active           = false;
+    bool                    capsOptimization = false; // don't send caps every time
 
     LiveRoster             roster;
     ResourceList           resourceList;
@@ -276,6 +277,17 @@ BoBManager *Client::bobManager() const { return d->bobman; }
 
 CapsManager *Client::capsManager() const { return d->capsman; }
 
+void Client::setCapsOptimizationAllowed(bool allowed) { d->capsOptimization = allowed; }
+
+bool Client::capsOptimizationAllowed() const
+{
+    if (d->capsOptimization && d->active && d->serverInfoManager->features().hasCapsOptimize()) {
+        auto it = d->resourceList.find(d->resource);
+        return it != d->resourceList.end() && it->status().isAvailable();
+    }
+    return false;
+}
+
 ServerInfoManager *Client::serverInfoManager() const { return d->serverInfoManager; }
 
 HttpFileUploadManager *Client::httpFileUploadManager() const { return d->httpFileUploadManager; }
@@ -1146,9 +1158,10 @@ DiscoItem Client::makeDiscoResult(const QString &node) const
     // TODO rather do foreach for all registered jingle apps and transports
     features.addFeature("urn:xmpp:jingle:transports:s5b:1");
     features.addFeature("urn:xmpp:jingle:transports:ibb:1");
-    features.addFeature(
-        "urn:xmpp:jingle:apps:file-transfer:5"); // TODO: since it depends on UI it needs a way to be disabled
+    // TODO: since it depends on UI it needs a way to be disabled
+    features.addFeature("urn:xmpp:jingle:apps:file-transfer:5");
     Hash::populateFeatures(features);
+    features.addFeature(NS_CAPS);
 
     // Client-specific features
     for (const QString &i : d->features.list()) {
diff --git a/src/xmpp/xmpp-im/xmpp_client.h b/src/xmpp/xmpp-im/xmpp_client.h
index 521c1d32..edf83034 100644
--- a/src/xmpp/xmpp-im/xmpp_client.h
+++ b/src/xmpp/xmpp-im/xmpp_client.h
@@ -137,6 +137,8 @@ class Client : public QObject {
     void            setFeatures(const Features &f);
     const Features &features() const;
     DiscoItem       makeDiscoResult(const QString &node = QString()) const;
+    void            setCapsOptimizationAllowed(bool allowed);
+    bool            capsOptimizationAllowed() const;
 
     void                   setTcpPortReserver(TcpPortReserver *portReserver);
     TcpPortReserver *      tcpPortReserver() const;
diff --git a/src/xmpp/xmpp-im/xmpp_features.cpp b/src/xmpp/xmpp-im/xmpp_features.cpp
index 94a24648..6a81e052 100644
--- a/src/xmpp/xmpp-im/xmpp_features.cpp
+++ b/src/xmpp/xmpp-im/xmpp_features.cpp
@@ -203,6 +203,12 @@ bool Features::hasJingleIceUdp() const { return test(QStringList() << QLatin1Str
 #define FID_JINGLEICE "urn:xmpp:jingle:transports:ice:0"
 bool Features::hasJingleIce() const { return test(QStringList() << QLatin1String(FID_JINGLEICE)); }
 
+#define NS_CAPS "http://jabber.org/protocol/caps"
+bool Features::hasCaps() const { return test(QStringList() << QLatin1String(NS_CAPS)); }
+
+#define NS_CAPS_OPTIMIZE "http://jabber.org/protocol/caps#optimize"
+bool Features::hasCapsOptimize() const { return test(QStringList() << QLatin1String(NS_CAPS_OPTIMIZE)); }
+
 // custom Psi actions
 #define FID_ADD "psi:add"
 
diff --git a/src/xmpp/xmpp-im/xmpp_features.h b/src/xmpp/xmpp-im/xmpp_features.h
index b8378c16..2585ae07 100644
--- a/src/xmpp/xmpp-im/xmpp_features.h
+++ b/src/xmpp/xmpp-im/xmpp_features.h
@@ -56,6 +56,8 @@ class Features {
     bool        hasJingleFT() const;
     bool        hasJingleIceUdp() const;
     bool        hasJingleIce() const;
+    bool        hasCaps() const;
+    bool        hasCapsOptimize() const;
 
     [[deprecated]] inline bool canRegister() const { return hasRegister(); }
     [[deprecated]] inline bool canSearch() const { return hasSearch(); }
diff --git a/src/xmpp/xmpp-im/xmpp_tasks.cpp b/src/xmpp/xmpp-im/xmpp_tasks.cpp
index 124702e9..72df34ae 100644
--- a/src/xmpp/xmpp-im/xmpp_tasks.cpp
+++ b/src/xmpp/xmpp-im/xmpp_tasks.cpp
@@ -581,7 +581,7 @@ void JT_Presence::pres(const Status &s)
             tag.appendChild(x);
         }
 
-        if (client()->capsManager()->isEnabled()) {
+        if (client()->capsManager()->isEnabled() && !client()->capsOptimizationAllowed()) {
             CapsSpec cs = client()->caps();
             if (cs.isValid()) {
                 tag.appendChild(cs.toXml(doc()));

From 28a8b4fce343095fc1a295743c759a868dbc3c5a Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Thu, 28 May 2020 13:13:06 +0300
Subject: [PATCH 192/383] Added checked for Direct Muc Invite in disco features

---
 src/xmpp/xmpp-im/xmpp_features.cpp | 3 +++
 src/xmpp/xmpp-im/xmpp_features.h   | 1 +
 2 files changed, 4 insertions(+)

diff --git a/src/xmpp/xmpp-im/xmpp_features.cpp b/src/xmpp/xmpp-im/xmpp_features.cpp
index 6a81e052..8c28cadf 100644
--- a/src/xmpp/xmpp-im/xmpp_features.cpp
+++ b/src/xmpp/xmpp-im/xmpp_features.cpp
@@ -209,6 +209,9 @@ bool Features::hasCaps() const { return test(QStringList() << QLatin1String(NS_C
 #define NS_CAPS_OPTIMIZE "http://jabber.org/protocol/caps#optimize"
 bool Features::hasCapsOptimize() const { return test(QStringList() << QLatin1String(NS_CAPS_OPTIMIZE)); }
 
+#define NS_DIRECT_MUC_INVITE "jabber:x:conference"
+bool Features::hasDirectMucInvite() const { return test(QStringList() << QLatin1String(NS_DIRECT_MUC_INVITE)); }
+
 // custom Psi actions
 #define FID_ADD "psi:add"
 
diff --git a/src/xmpp/xmpp-im/xmpp_features.h b/src/xmpp/xmpp-im/xmpp_features.h
index 2585ae07..d85ceb07 100644
--- a/src/xmpp/xmpp-im/xmpp_features.h
+++ b/src/xmpp/xmpp-im/xmpp_features.h
@@ -58,6 +58,7 @@ class Features {
     bool        hasJingleIce() const;
     bool        hasCaps() const;
     bool        hasCapsOptimize() const;
+    bool        hasDirectMucInvite() const;
 
     [[deprecated]] inline bool canRegister() const { return hasRegister(); }
     [[deprecated]] inline bool canSearch() const { return hasSearch(); }

From 7a0a5f4b43416507270b270e244fb1093c9da8d5 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Thu, 28 May 2020 19:35:53 +0300
Subject: [PATCH 193/383] Added urn:xmpp:hashes:2 to published disco

---
 src/xmpp/xmpp-im/types.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/xmpp/xmpp-im/types.cpp b/src/xmpp/xmpp-im/types.cpp
index a35557f8..574b262e 100644
--- a/src/xmpp/xmpp-im/types.cpp
+++ b/src/xmpp/xmpp-im/types.cpp
@@ -424,6 +424,7 @@ QDomElement Hash::toXml(QDomDocument *doc) const
 
 void Hash::populateFeatures(Features &features)
 {
+    features.addFeature("urn:xmpp:hashes:2");
     for (size_t n = 0; n < sizeof(hashTypes) / sizeof(hashTypes[0]); ++n) {
         features.addFeature(QLatin1String("urn:xmpp:hash-function-text-names:") + QLatin1String(hashTypes[n].text));
     }

From 4b787142d2ecbf6ffcd960acbcc1e06504e38dee Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
Date: Thu, 28 May 2020 22:25:53 +0300
Subject: [PATCH 194/383] Fix carbons for OMEMO

---
 src/xmpp/xmpp-im/types.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/xmpp/xmpp-im/types.cpp b/src/xmpp/xmpp-im/types.cpp
index 574b262e..b63a520f 100644
--- a/src/xmpp/xmpp-im/types.cpp
+++ b/src/xmpp/xmpp-im/types.cpp
@@ -1563,7 +1563,7 @@ Stanza Message::toStanza(Stream *stream) const
     }
 
     // Avoiding Carbons
-    if (isDisabledCarbons() || wasEncrypted()) {
+    if (isDisabledCarbons()) {
         QDomElement e = s.createElement("urn:xmpp:carbons:2", "private");
         s.appendChild(e);
     }

From bbe57dd1eae5a6981dd0dfa98cea33b3da42fc10 Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
Date: Thu, 28 May 2020 23:27:13 +0300
Subject: [PATCH 195/383] Correctly disable carbons for OpenPGP encrypted
 messages

---
 src/xmpp/xmpp-im/types.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/xmpp/xmpp-im/types.cpp b/src/xmpp/xmpp-im/types.cpp
index b63a520f..311f7492 100644
--- a/src/xmpp/xmpp-im/types.cpp
+++ b/src/xmpp/xmpp-im/types.cpp
@@ -1487,9 +1487,16 @@ Stanza Message::toStanza(Stream *stream) const
     if (!d->xsigned.isEmpty())
         s.appendChild(s.createTextElement("jabber:x:signed", "x", d->xsigned));
 
-    // xencrypted
-    if (!d->xencrypted.isEmpty())
+    // OpenPGP encrypted message
+    if (!d->xencrypted.isEmpty()) {
+        // See: XEP-0027: Current Jabber OpenPGP Usage
         s.appendChild(s.createTextElement("jabber:x:encrypted", "x", d->xencrypted));
+        // See: XEP-0280: Message Carbons
+        QDomElement nc = s.createElement("urn:xmpp:hints", "no-copy");
+        QDomElement pr = s.createElement("urn:xmpp:carbons:2", "private");
+        s.appendChild(nc);
+        s.appendChild(pr);
+    }
 
     // addresses
     if (!d->addressList.isEmpty()) {

From 9ff27df2df697e9a1f600cf5d62b0634f0e081ba Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
Date: Thu, 28 May 2020 23:31:52 +0300
Subject: [PATCH 196/383] OpenPGP: add necessary changes for XEP-0380

(Explicit Message Encryption)
---
 src/xmpp/xmpp-im/types.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/xmpp/xmpp-im/types.cpp b/src/xmpp/xmpp-im/types.cpp
index 311f7492..e01478fb 100644
--- a/src/xmpp/xmpp-im/types.cpp
+++ b/src/xmpp/xmpp-im/types.cpp
@@ -1496,6 +1496,10 @@ Stanza Message::toStanza(Stream *stream) const
         QDomElement pr = s.createElement("urn:xmpp:carbons:2", "private");
         s.appendChild(nc);
         s.appendChild(pr);
+        // See: XEP-0380: Explicit Message Encryption
+        QDomElement en = s.createElement("urn:xmpp:eme:0", "encryption");
+        en.setAttribute("namespace", "jabber:x:encrypted");
+        s.appendChild(en);
     }
 
     // addresses

From e25e69346b5c1b826a32f880a411bd5606a760d7 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 31 May 2020 02:10:59 +0300
Subject: [PATCH 197/383] Fixed deprecation warnings

---
 src/irisnet/corelib/netnames.cpp     | 11 +++++++++--
 src/xmpp/xmpp-im/filetransfer.cpp    |  9 ++++++++-
 src/xmpp/xmpp-im/jingle-ft.cpp       |  7 +++++++
 src/xmpp/xmpp-im/jingle-ibb.cpp      |  9 ++++++++-
 src/xmpp/xmpp-im/jingle-s5b.cpp      |  7 +++++++
 src/xmpp/xmpp-im/jingle.cpp          |  7 +++++++
 src/xmpp/xmpp-im/xmpp_bytestream.cpp |  7 +++++++
 7 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/src/irisnet/corelib/netnames.cpp b/src/irisnet/corelib/netnames.cpp
index 63ccc435..4650d2cf 100644
--- a/src/irisnet/corelib/netnames.cpp
+++ b/src/irisnet/corelib/netnames.cpp
@@ -23,6 +23,9 @@
 #include "irisnetglobal_p.h"
 #include "irisnetplugin.h"
 
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+#include <QRandomGenerator>
+#endif
 //#include <idna.h>
 #include <limits>
 
@@ -498,7 +501,11 @@ XMPP::NameRecord WeightedNameRecordList::takeNext()
 #endif
 
     /* Pick a random entry */
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+    int randomWeight = totalWeight ? QRandomGenerator::global()->bounded(totalWeight) : 0;
+#else
     int randomWeight = qrand() / static_cast<float>(RAND_MAX) * totalWeight;
+#endif
 
 #ifdef NETNAMES_DEBUG
     NNDEBUG << "Picked weight:" << randomWeight;
@@ -616,13 +623,13 @@ QDebug operator<<(QDebug dbg, const XMPP::WeightedNameRecordList &list)
     /* operator(QDebug, QMap const&) has a bug which makes it crash when trying to print the dereferenced end() iterator
      */
     if (!list.isEmpty()) {
-        dbg.nospace() << "current=" << *list.currentPriorityGroup << endl;
+        dbg.nospace() << "current=" << *list.currentPriorityGroup << Qt::endl;
     }
 
     dbg.nospace() << "{";
 
     for (int priority : list.priorityGroups.keys()) {
-        dbg.nospace() << "\t" << priority << "->" << list.priorityGroups.value(priority) << endl;
+        dbg.nospace() << "\t" << priority << "->" << list.priorityGroups.value(priority) << Qt::endl;
     }
 
     dbg.nospace() << "})";
diff --git a/src/xmpp/xmpp-im/filetransfer.cpp b/src/xmpp/xmpp-im/filetransfer.cpp
index 3ff010b3..b71258f1 100644
--- a/src/xmpp/xmpp-im/filetransfer.cpp
+++ b/src/xmpp/xmpp-im/filetransfer.cpp
@@ -30,6 +30,9 @@
 #include <QPointer>
 #include <QSet>
 #include <QTimer>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+#include <QRandomGenerator>
+#endif
 
 #define SENDBUFSIZE 65536
 
@@ -458,7 +461,11 @@ QString FileTransferManager::link(FileTransfer *ft)
     bool    found;
     do {
         found = false;
-        id    = QString("ft_%1").arg(qrand() & 0xffff, 4, 16, QChar('0'));
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+        id = QString("ft_%1").arg(QRandomGenerator::global()->generate() & 0xffff, 4, 16, QChar('0'));
+#else
+        id = QString("ft_%1").arg(qrand() & 0xffff, 4, 16, QChar('0'));
+#endif
         for (FileTransfer *ft : d->list) {
             if (ft->d->peer.compare(ft->d->peer) && ft->d->id == id) {
                 found = true;
diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 872c8ad4..afb17537 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -26,6 +26,9 @@
 #include "xmpp_thumbs.h"
 #include "xmpp_xmlcommon.h"
 
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+#include <QRandomGenerator>
+#endif
 #include <cmath>
 #include <functional>
 
@@ -825,7 +828,11 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
         QString prefix = senders == _session->role() ? "fileoffer" : "filereq";
         QString name;
         do {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+            name = prefix + QString("_%1").arg(QRandomGenerator::global()->generate() & 0xffff, 4, 16, QChar('0'));
+#else
             name = prefix + QString("_%1").arg(qrand() & 0xffff, 4, 16, QChar('0'));
+#endif
         } while (_session->content(name, _session->role()));
         return name;
     }
diff --git a/src/xmpp/xmpp-im/jingle-ibb.cpp b/src/xmpp/xmpp-im/jingle-ibb.cpp
index 8641c793..acd0297b 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.cpp
+++ b/src/xmpp/xmpp-im/jingle-ibb.cpp
@@ -25,6 +25,9 @@
 #include "xmpp_ibb.h"
 
 #include <QTimer>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+#include <QRandomGenerator>
+#endif
 
 namespace XMPP { namespace Jingle { namespace IBB {
     const QString NS(QStringLiteral("urn:xmpp:jingle:transports:ibb:1"));
@@ -415,7 +418,11 @@ namespace XMPP { namespace Jingle { namespace IBB {
         if (s.isEmpty()) {
             QPair<Jid, QString> key;
             do {
-                s   = QString("ibb_%1").arg(qrand() & 0xffff, 4, 16, QChar('0'));
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+                s = QString("ibb_%1").arg(QRandomGenerator::global()->generate() & 0xffff, 4, 16, QChar('0'));
+#else
+                s = QString("ibb_%1").arg(qrand() & 0xffff, 4, 16, QChar('0'));
+#endif
                 key = qMakePair(peer, s);
             } while (d->connections.contains(key));
         }
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 0b84b0b2..33aab610 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -31,6 +31,9 @@
 #include <QElapsedTimer>
 #include <QNetworkInterface>
 #include <QTimer>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+#include <QRandomGenerator>
+#endif
 
 namespace XMPP { namespace Jingle { namespace S5B {
     const QString NS(QStringLiteral("urn:xmpp:jingle:transports:s5b:1"));
@@ -600,7 +603,11 @@ namespace XMPP { namespace Jingle { namespace S5B {
         {
             QString cid;
             do {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+                cid = QString("%1").arg(QRandomGenerator::global()->generate() & 0xffff, 4, 16, QChar('0'));
+#else
                 cid = QString("%1").arg(qrand() & 0xffff, 4, 16, QChar('0'));
+#endif
             } while (localCandidates.contains(cid) || remoteCandidates.contains(cid));
             return cid;
         }
diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index 48e4c87e..9364be89 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -35,6 +35,9 @@
 #include <QPointer>
 #include <QTimer>
 #include <functional>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+#include <QRandomGenerator>
+#endif
 
 namespace XMPP { namespace Jingle {
     const QString NS(QStringLiteral("urn:xmpp:jingle:1"));
@@ -697,7 +700,11 @@ namespace XMPP { namespace Jingle {
         QString id;
         auto    peer = session->peer();
         do {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+            id = QString("%1").arg(QRandomGenerator::global()->generate(), 6, 32, QChar('0'));
+#else
             id = QString("%1").arg(quint32(qrand()), 6, 32, QChar('0'));
+#endif
         } while (d->sessions.contains(qMakePair(peer, id)));
         d->sessions.insert(qMakePair(peer, id), session);
         return id;
diff --git a/src/xmpp/xmpp-im/xmpp_bytestream.cpp b/src/xmpp/xmpp-im/xmpp_bytestream.cpp
index ed3324b6..caaadf7b 100644
--- a/src/xmpp/xmpp-im/xmpp_bytestream.cpp
+++ b/src/xmpp/xmpp-im/xmpp_bytestream.cpp
@@ -22,6 +22,9 @@
 #include "xmpp_client.h"
 
 #include <QTimer>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+#include <QRandomGenerator>
+#endif
 
 namespace XMPP {
 BytestreamManager::BytestreamManager(Client *parent) : QObject(parent) { }
@@ -33,7 +36,11 @@ QString BytestreamManager::genUniqueSID(const Jid &peer) const
     // get unused key
     QString sid;
     do {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+        sid = QString("%1%2").arg(sidPrefix()).arg(QRandomGenerator::global()->generate() & 0xffff, 4, 16, QChar('0'));
+#else
         sid = QString("%1%2").arg(sidPrefix()).arg(qrand() & 0xffff, 4, 16, QChar('0'));
+#endif
     } while (!isAcceptableSID(peer, sid));
     return sid;
 }

From 854b8fa6a6ed33015f3163823f70efb75a38b184 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 31 May 2020 12:28:36 +0300
Subject: [PATCH 198/383] Keep working on deprecation warnings

---
 src/irisnet/corelib/netnames.cpp            |  8 ++++++++
 src/irisnet/noncore/tcpportreserver.cpp     |  2 +-
 src/xmpp/xmpp-im/httpfileupload.cpp         | 12 ++++++------
 src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp | 12 ++++++------
 src/xmpp/xmpp-im/xmpp_serverinfomanager.h   | 11 ++++++-----
 5 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/src/irisnet/corelib/netnames.cpp b/src/irisnet/corelib/netnames.cpp
index 4650d2cf..ddd2c29b 100644
--- a/src/irisnet/corelib/netnames.cpp
+++ b/src/irisnet/corelib/netnames.cpp
@@ -623,13 +623,21 @@ QDebug operator<<(QDebug dbg, const XMPP::WeightedNameRecordList &list)
     /* operator(QDebug, QMap const&) has a bug which makes it crash when trying to print the dereferenced end() iterator
      */
     if (!list.isEmpty()) {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
         dbg.nospace() << "current=" << *list.currentPriorityGroup << Qt::endl;
+#else
+        dbg.nospace() << "current=" << *list.currentPriorityGroup << endl;
+#endif
     }
 
     dbg.nospace() << "{";
 
     for (int priority : list.priorityGroups.keys()) {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
         dbg.nospace() << "\t" << priority << "->" << list.priorityGroups.value(priority) << Qt::endl;
+#else
+        dbg.nospace() << "\t" << priority << "->" << list.priorityGroups.value(priority) << endl;
+#endif
     }
 
     dbg.nospace() << "})";
diff --git a/src/irisnet/noncore/tcpportreserver.cpp b/src/irisnet/noncore/tcpportreserver.cpp
index e3cbacca..35fd74a7 100644
--- a/src/irisnet/noncore/tcpportreserver.cpp
+++ b/src/irisnet/noncore/tcpportreserver.cpp
@@ -50,7 +50,7 @@ bool TcpPortDiscoverer::setExternalHost(const QString &extHost, quint16 extPort,
 
 TcpPortServer::PortTypes TcpPortDiscoverer::inProgressPortTypes() const
 {
-    return nullptr; // same as for stop()
+    return {}; // same as for stop()
 }
 
 bool TcpPortDiscoverer::isDepleted() const
diff --git a/src/xmpp/xmpp-im/httpfileupload.cpp b/src/xmpp/xmpp-im/httpfileupload.cpp
index 0cff4302..d5a3f2d1 100644
--- a/src/xmpp/xmpp-im/httpfileupload.cpp
+++ b/src/xmpp/xmpp-im/httpfileupload.cpp
@@ -417,12 +417,12 @@ bool JT_HTTPFileUpload::take(const QDomElement &e)
 
 class HttpFileUploadManager::Private {
 public:
-    Client *                              client = nullptr;
-    QPointer<QNetworkAccessManager>       qnam;
-    int                                   discoStatus = 0;
-    QList<HttpFileUpload::HttpHost>       discoHosts;
-    bool                                  externalQnam = false;
-    QLinkedList<HttpFileUpload::HttpHost> hosts;
+    Client *                            client = nullptr;
+    QPointer<QNetworkAccessManager>     qnam;
+    int                                 discoStatus = 0;
+    QList<HttpFileUpload::HttpHost>     discoHosts;
+    bool                                externalQnam = false;
+    std::list<HttpFileUpload::HttpHost> hosts;
 };
 
 HttpFileUploadManager::HttpFileUploadManager(Client *parent) : QObject(parent), d(new Private) { d->client = parent; }
diff --git a/src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp b/src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp
index 2b144da8..70de73bf 100644
--- a/src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp
+++ b/src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp
@@ -114,19 +114,19 @@ void ServerInfoManager::checkPendingServiceQueries()
                 si.next();
                 if (!sqIt->nameHint.isEmpty()) {
                     if (sqIt->nameHint.isEmpty() || sqIt->nameHint.exactMatch(si.key())) {
-                        sqIt->servicesToQuery.append(si.key());
+                        sqIt->servicesToQuery.push_back(si.key());
                     } else if (sqIt->options & SQ_CheckAllOnNoMatch) {
-                        sqIt->spareServicesToQuery.append(si.key());
+                        sqIt->spareServicesToQuery.push_back(si.key());
                     }
                 } else {
-                    sqIt->servicesToQuery.append(si.key());
+                    sqIt->servicesToQuery.push_back(si.key());
                 }
             }
-            if (sqIt->servicesToQuery.isEmpty()) {
+            if (sqIt->servicesToQuery.empty()) {
                 sqIt->servicesToQuery = sqIt->spareServicesToQuery;
                 sqIt->spareServicesToQuery.clear();
             }
-            if (sqIt->servicesToQuery.isEmpty()) {
+            if (sqIt->servicesToQuery.empty()) {
                 sqIt->callback(QList<DiscoItem>());
                 _serviceQueries.erase(sqIt++);
                 continue;
@@ -194,7 +194,7 @@ void ServerInfoManager::checkPendingServiceQueries()
             ++jidIt;
         }
 
-        if (sqIt->result.isEmpty() && !hasInProgress && !sqIt->spareServicesToQuery.isEmpty()) {
+        if (sqIt->result.isEmpty() && !hasInProgress && !sqIt->spareServicesToQuery.empty()) {
             // we don't check sqIt->servicesToQuery.isEmpty() since it comes from other conditions
             // (sqIt->result.isEmpty() && !hasInProgress)
             sqIt->servicesToQuery = sqIt->spareServicesToQuery;
diff --git a/src/xmpp/xmpp-im/xmpp_serverinfomanager.h b/src/xmpp/xmpp-im/xmpp_serverinfomanager.h
index 2fabf153..7a0261f3 100644
--- a/src/xmpp/xmpp-im/xmpp_serverinfomanager.h
+++ b/src/xmpp/xmpp-im/xmpp_serverinfomanager.h
@@ -23,12 +23,13 @@
 #include "xmpp_caps.h"
 #include "xmpp_discoitem.h"
 
-#include <QLinkedList>
 #include <QObject>
 #include <QString>
 #include <QVariant>
 #include <functional>
 
+#include <list>
+
 namespace XMPP {
 class Client;
 class Features;
@@ -52,10 +53,10 @@ class ServerInfoManager : public QObject {
         const QRegExp                                           nameHint;
         const SQOptions                                         options;
         const std::function<void(const QList<DiscoItem> &item)> callback;
-        QLinkedList<QString>                                    servicesToQuery;
-        QLinkedList<QString> spareServicesToQuery; // usually a fallback when the above is not matched
-        bool                 servicesToQueryDefined = false;
-        QList<DiscoItem>     result;
+        std::list<QString>                                      servicesToQuery;
+        std::list<QString> spareServicesToQuery; // usually a fallback when the above is not matched
+        bool               servicesToQueryDefined = false;
+        QList<DiscoItem>   result;
 
         ServiceQuery(const QString &type, const QString &category, const QList<QSet<QString>> &features,
                      const QRegExp &nameHint, const SQOptions &options,

From 8f5ac806906e5f5ed69c0bc6add2e380f2e47792 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 31 May 2020 14:07:27 +0300
Subject: [PATCH 199/383] More deprecation fixes

---
 src/irisnet/CMakeLists.txt                |  8 +++++++-
 src/irisnet/corelib/corelib.pri           |  6 +++++-
 src/irisnet/corelib/irisnetglobal.cpp     |  4 ++++
 src/irisnet/corelib/netinterface_unix.cpp | 22 +++++++++++++++++-----
 src/xmpp/xmpp-core/tlshandler.cpp         | 19 +++++++++++++++++--
 src/xmpp/xmpp-im/jingle-s5b.cpp           |  6 +++++-
 src/xmpp/xmpp-im/types.cpp                |  4 ++++
 tools/xmpptest/xmpptest.cpp               | 20 ++++++++++++++++----
 8 files changed, 75 insertions(+), 14 deletions(-)

diff --git a/src/irisnet/CMakeLists.txt b/src/irisnet/CMakeLists.txt
index 0ef741d9..9b62c47b 100644
--- a/src/irisnet/CMakeLists.txt
+++ b/src/irisnet/CMakeLists.txt
@@ -35,7 +35,6 @@ set(SOURCES
     corelib/addressresolver.cpp
     corelib/netavailability.cpp
     corelib/netinterface.cpp
-    corelib/netinterface_qtnet.cpp
     corelib/netnames.cpp
     corelib/objectsession.cpp
 
@@ -64,6 +63,9 @@ if(NOT USE_QJDNS)
 else()
     list(APPEND SOURCES corelib/netnames_jdns.cpp)
 endif()
+if (Qt5Network_VERSION VERSION_LESS 5.15.0)
+    list(APPEND SOURCES corelib/netinterface_qtnet.cpp)
+endif()
 
 set(HEADERS
     corelib/irisnetexport.h
@@ -115,5 +117,9 @@ if(NOT USE_QJDNS)
     set(QJDns_LIBRARY "")
 endif()
 
+if (Qt5Network_VERSION VERSION_LESS 5.15.0)
+    target_compile_definitions(irisnet PRIVATE HAVE_QTNET)
+endif()
+
 target_link_libraries(irisnet ${QJDns_LIBRARY} ${EXTRA_LDFLAGS})
 target_link_libraries(irisnet Qt5::Core Qt5::Network Qt5::Xml ${qca_LIB})
diff --git a/src/irisnet/corelib/corelib.pri b/src/irisnet/corelib/corelib.pri
index 60a2ef44..f188bbfe 100644
--- a/src/irisnet/corelib/corelib.pri
+++ b/src/irisnet/corelib/corelib.pri
@@ -16,7 +16,6 @@ SOURCES += \
     $$PWD/irisnetplugin.cpp \
     $$PWD/irisnetglobal.cpp \
     $$PWD/netinterface.cpp \
-    $$PWD/netinterface_qtnet.cpp \
     $$PWD/netavailability.cpp \
     $$PWD/netnames.cpp \
     $$PWD/addressresolver.cpp
@@ -40,6 +39,11 @@ need_jdns|lessThan(QT_MAJOR_VERSION, 5) {
     SOURCES += $$PWD/netinterface_qtname.cpp \
 }
 
+equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 15) {
+    SOURCES += $$PWD/netinterface_qtnet.cpp
+    DEFINES += HAVE_QTNET
+}
+
 #include(legacy/legacy.pri)
 
 appledns:appledns_bundle {
diff --git a/src/irisnet/corelib/irisnetglobal.cpp b/src/irisnet/corelib/irisnetglobal.cpp
index ff00c686..275fa686 100644
--- a/src/irisnet/corelib/irisnetglobal.cpp
+++ b/src/irisnet/corelib/irisnetglobal.cpp
@@ -21,7 +21,9 @@
 
 namespace XMPP {
 // built-in providers
+#ifdef HAVE_QTNET
 extern IrisNetProvider *irisnet_createQtNetProvider();
+#endif
 #ifdef Q_OS_UNIX
 extern IrisNetProvider *irisnet_createUnixNetProvider();
 #endif
@@ -160,7 +162,9 @@ class PluginManager {
     void scan()
     {
         if (!builtin_done) {
+#ifdef HAVE_QTNET
             addBuiltIn(irisnet_createQtNetProvider()); // interfaces. crossplatform. no need to reimplement
+#endif
 #ifdef Q_OS_UNIX
             addBuiltIn(irisnet_createUnixNetProvider()); // gateways
 #endif
diff --git a/src/irisnet/corelib/netinterface_unix.cpp b/src/irisnet/corelib/netinterface_unix.cpp
index 47e6c109..da1d2cbc 100644
--- a/src/irisnet/corelib/netinterface_unix.cpp
+++ b/src/irisnet/corelib/netinterface_unix.cpp
@@ -58,7 +58,11 @@ static QStringList read_proc_as_lines(const char *procfile)
     fclose(f);
 
     QString str = QString::fromLocal8Bit(buf);
-    out         = str.split('\n', QString::SkipEmptyParts);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
+    out = str.split('\n', Qt::SkipEmptyParts);
+#else
+    out = str.split('\n', QString::SkipEmptyParts);
+#endif
     return out;
 }
 
@@ -104,8 +108,12 @@ static QList<XMPP::NetGatewayProvider::Info> get_linux_gateways()
     QStringList lines = read_proc_as_lines("/proc/net/route");
     // skip the first line, so we start at 1
     for (int n = 1; n < lines.count(); ++n) {
-        const QString &line  = lines[n];
-        QStringList    parts = line.simplified().split(' ', QString::SkipEmptyParts);
+        const QString &line = lines[n];
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
+        QStringList parts = line.simplified().split(' ', Qt::SkipEmptyParts);
+#else
+        QStringList parts = line.simplified().split(' ', QString::SkipEmptyParts);
+#endif
         if (parts.count() < 10) // net-tools does 10, but why not 11?
             continue;
 
@@ -128,8 +136,12 @@ static QList<XMPP::NetGatewayProvider::Info> get_linux_gateways()
 
     lines = read_proc_as_lines("/proc/net/ipv6_route");
     for (int n = 0; n < lines.count(); ++n) {
-        const QString &line  = lines[n];
-        QStringList    parts = line.simplified().split(' ', QString::SkipEmptyParts);
+        const QString &line = lines[n];
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
+        QStringList parts = line.simplified().split(' ', Qt::SkipEmptyParts);
+#else
+        QStringList parts = line.simplified().split(' ', QString::SkipEmptyParts);
+#endif
         if (parts.count() < 10)
             continue;
 
diff --git a/src/xmpp/xmpp-core/tlshandler.cpp b/src/xmpp/xmpp-core/tlshandler.cpp
index 29ea491e..ce9d98a6 100644
--- a/src/xmpp/xmpp-core/tlshandler.cpp
+++ b/src/xmpp/xmpp-core/tlshandler.cpp
@@ -33,7 +33,11 @@ static QByteArray ipaddr_str2bin(const QString &str)
 {
     // ipv6
     if (str.contains(':')) {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
+        QStringList parts = str.split(':', Qt::KeepEmptyParts);
+#else
         QStringList parts = str.split(':', QString::KeepEmptyParts);
+#endif
         if (parts.count() < 3 || parts.count() > 8)
             return QByteArray();
 
@@ -90,7 +94,11 @@ static QByteArray ipaddr_str2bin(const QString &str)
 
         return ipv6;
     } else if (str.contains('.')) {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
+        QStringList parts = str.split('.', Qt::KeepEmptyParts);
+#else
         QStringList parts = str.split('.', QString::KeepEmptyParts);
+#endif
         if (parts.count() != 4)
             return QByteArray();
 
@@ -131,8 +139,12 @@ static bool cert_match_domain(const QString &certname, const QString &acedomain)
     if (QRegExp("[^a-z0-9\\.\\*\\-]").indexIn(name) >= 0)
         return false;
 
-    // hack into parts, and require at least 1 part
+        // hack into parts, and require at least 1 part
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
+    QStringList parts_name = name.split('.', Qt::KeepEmptyParts);
+#else
     QStringList parts_name = name.split('.', QString::KeepEmptyParts);
+#endif
     if (parts_name.isEmpty())
         return false;
 
@@ -143,8 +155,11 @@ static bool cert_match_domain(const QString &certname, const QString &acedomain)
         return false;
     if (parts_name.count() >= 2 && parts_name[parts_name.count() - 2].contains('*'))
         return false;
-
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
+    QStringList parts_compare = acedomain.split('.', Qt::KeepEmptyParts);
+#else
     QStringList parts_compare = acedomain.split('.', QString::KeepEmptyParts);
+#endif
     if (parts_compare.isEmpty())
         return false;
 
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 33aab610..35e6b0da 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -1702,7 +1702,11 @@ namespace XMPP { namespace Jingle { namespace S5B {
         };
 
         do {
-            sid  = QString("s5b_%1").arg(qrand() & 0xffff, 4, 16, QChar('0'));
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+            sid = QString("s5b_%1").arg(QRandomGenerator::global()->bounded(0x10000), 4, 16, QChar('0'));
+#else
+            sid = QString("s5b_%1").arg(qrand() & 0xffff, 4, 16, QChar('0'));
+#endif
             key  = qMakePair(remote, sid);
             key1 = makeKey(sid, remote, d->jingleManager->client()->jid());
             key2 = makeKey(sid, d->jingleManager->client()->jid(), remote);
diff --git a/src/xmpp/xmpp-im/types.cpp b/src/xmpp/xmpp-im/types.cpp
index e01478fb..3421ea35 100644
--- a/src/xmpp/xmpp-im/types.cpp
+++ b/src/xmpp/xmpp-im/types.cpp
@@ -2177,7 +2177,11 @@ CapsSpec CapsSpec::fromXml(const QDomElement &e)
         }
         cs = CapsSpec(node, algo, ver);
         if (!ext.isEmpty()) {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
+            cs.ext_ = ext.split(" ", Qt::SkipEmptyParts);
+#else
             cs.ext_ = ext.split(" ", QString::SkipEmptyParts);
+#endif
         }
     }
     return cs;
diff --git a/tools/xmpptest/xmpptest.cpp b/tools/xmpptest/xmpptest.cpp
index 3458da67..d15d4522 100644
--- a/tools/xmpptest/xmpptest.cpp
+++ b/tools/xmpptest/xmpptest.cpp
@@ -476,7 +476,11 @@ private slots:
         QString      errMsg;
         int          errLine, errCol;
         if (!doc.setContent(str, true, &errMsg, &errLine, &errCol)) {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
+            int lines = str.split('\n', Qt::KeepEmptyParts).count();
+#else
             int lines = str.split('\n', QString::KeepEmptyParts).count();
+#endif
             --errLine; // skip the first line
             if (errLine == lines - 1) {
                 errLine = lines - 2;
@@ -850,9 +854,13 @@ private slots:
 
     void appendXmlOut(const QString &s)
     {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
+        QStringList lines = s.split('\n', Qt::KeepEmptyParts);
+#else
         QStringList lines = s.split('\n', QString::KeepEmptyParts);
-        QString     str;
-        bool        first = true;
+#endif
+        QString str;
+        bool    first = true;
         for (QStringList::ConstIterator it = lines.begin(); it != lines.end(); ++it) {
             if (!first)
                 str += "<br>";
@@ -864,9 +872,13 @@ private slots:
 
     void appendXmlIn(const QString &s)
     {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
+        QStringList lines = s.split('\n', Qt::KeepEmptyParts);
+#else
         QStringList lines = s.split('\n', QString::KeepEmptyParts);
-        QString     str;
-        bool        first = true;
+#endif
+        QString str;
+        bool    first = true;
         for (QStringList::ConstIterator it = lines.begin(); it != lines.end(); ++it) {
             if (!first)
                 str += "<br>";

From 222f8e9ec0a1e39817c8a8cb1da83bca90aa3e4c Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
Date: Mon, 1 Jun 2020 01:14:57 +0300
Subject: [PATCH 200/383] Improve detection of encrypted messages

---
 src/xmpp/xmpp-im/xmpp_tasks.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/xmpp/xmpp-im/xmpp_tasks.cpp b/src/xmpp/xmpp-im/xmpp_tasks.cpp
index 72df34ae..5ee38d8f 100644
--- a/src/xmpp/xmpp-im/xmpp_tasks.cpp
+++ b/src/xmpp/xmpp-im/xmpp_tasks.cpp
@@ -838,8 +838,13 @@ void JT_Message::onGo()
     Stanza      s = m.toStanza(&(client()->stream()));
     QDomElement e = s.element(); // oldStyleNS(s.element());
 
+    bool wasEncrypted      = false;
     auto encryptionHandler = client()->encryptionHandler();
-    bool wasEncrypted      = encryptionHandler && encryptionHandler->encryptMessageElement(e);
+    if (encryptionHandler && encryptionHandler->encryptMessageElement(e)) {
+        if (!e.firstChildElement("encrypted").isNull()) {
+            wasEncrypted = true;
+        }
+    }
     m.setWasEncrypted(wasEncrypted);
 
     // if the element is null, then the encryption is happening asynchronously
@@ -926,6 +931,10 @@ bool JT_PushMessage::take(const QDomElement &e)
         m.setForwardedFrom(fromJid);
         m.setCarbonDirection(cd);
     }
+
+    if (!e1.firstChildElement("encrypted").isNull()) {
+        wasEncrypted = true;
+    }
     m.setWasEncrypted(wasEncrypted);
 
     emit message(m);

From 913b01bc1939a9133eea60a0b4c9ea83627477bc Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
Date: Mon, 1 Jun 2020 01:38:05 +0300
Subject: [PATCH 201/383] Simplify logic of detection of encrypted messages

---
 src/xmpp/xmpp-im/xmpp_tasks.cpp | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/xmpp/xmpp-im/xmpp_tasks.cpp b/src/xmpp/xmpp-im/xmpp_tasks.cpp
index 5ee38d8f..cdd1eaf8 100644
--- a/src/xmpp/xmpp-im/xmpp_tasks.cpp
+++ b/src/xmpp/xmpp-im/xmpp_tasks.cpp
@@ -838,13 +838,11 @@ void JT_Message::onGo()
     Stanza      s = m.toStanza(&(client()->stream()));
     QDomElement e = s.element(); // oldStyleNS(s.element());
 
-    bool wasEncrypted      = false;
-    auto encryptionHandler = client()->encryptionHandler();
-    if (encryptionHandler && encryptionHandler->encryptMessageElement(e)) {
-        if (!e.firstChildElement("encrypted").isNull()) {
-            wasEncrypted = true;
-        }
+    if (auto encryptionHandler = client()->encryptionHandler()) {
+        Q_UNUSED(encryptionHandler->encryptMessageElement(e));
     }
+
+    const bool wasEncrypted = !e.firstChildElement("encrypted").isNull();
     m.setWasEncrypted(wasEncrypted);
 
     // if the element is null, then the encryption is happening asynchronously
@@ -877,11 +875,13 @@ bool JT_PushMessage::take(const QDomElement &e)
 
     QDomElement e1 = e;
 
-    bool wasEncrypted
-        = d->m_encryptionHandler != nullptr && d->m_encryptionHandler->decryptMessageElement(e1) && !e1.isNull();
-    if (wasEncrypted && e1.isNull()) {
-        // The message was processed, but has to be discarded for some reason
-        return true;
+    if (d->m_encryptionHandler) {
+        if (d->m_encryptionHandler->decryptMessageElement(e1)) {
+            if (e1.isNull()) {
+                // The message was processed, but has to be discarded for some reason
+                return true;
+            }
+        }
     }
 
     QDomElement        forward;
@@ -932,9 +932,7 @@ bool JT_PushMessage::take(const QDomElement &e)
         m.setCarbonDirection(cd);
     }
 
-    if (!e1.firstChildElement("encrypted").isNull()) {
-        wasEncrypted = true;
-    }
+    const bool wasEncrypted = !e1.firstChildElement("encrypted").isNull();
     m.setWasEncrypted(wasEncrypted);
 
     emit message(m);

From d89a9bb98a33a85bc65168e739ee954261469144 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 2 Jun 2020 02:02:52 +0300
Subject: [PATCH 202/383] Fixed regression in s5b proxied transfer

---
 src/irisnet/noncore/tcpportreserver.cpp |  2 +-
 src/xmpp/xmpp-im/jingle-s5b.cpp         | 58 ++++++++++++++++---------
 src/xmpp/xmpp-im/jingle-s5b.h           |  1 +
 3 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/src/irisnet/noncore/tcpportreserver.cpp b/src/irisnet/noncore/tcpportreserver.cpp
index 35fd74a7..a6d00f3d 100644
--- a/src/irisnet/noncore/tcpportreserver.cpp
+++ b/src/irisnet/noncore/tcpportreserver.cpp
@@ -158,7 +158,7 @@ TcpPortDiscoverer *TcpPortScope::disco()
 {
     auto discoverer = new TcpPortDiscoverer(this);
     QMetaObject::invokeMethod(parent(), "newDiscoverer", Q_ARG(TcpPortDiscoverer *, discoverer));
-    QMetaObject::invokeMethod(discoverer, "start");
+    QMetaObject::invokeMethod(discoverer, "start", Qt::QueuedConnection);
     return discoverer;
 }
 
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 35e6b0da..1cb25917 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -561,11 +561,15 @@ namespace XMPP { namespace Jingle { namespace S5B {
 
     bool Candidate::operator==(const Candidate &other) const { return d.data() == other.d.data(); }
 
+    // ------------------------------------------------------------------
+    // Transport::Private
+    // ------------------------------------------------------------------
     class Transport::Private {
     public:
         enum PendingActions { NewCandidate = 1, CandidateUsed = 2, CandidateError = 4, Activated = 8, ProxyError = 16 };
 
         Transport *              q                            = nullptr;
+        bool                     p2pAllowed                   = true;
         bool                     offerSent                    = false;
         bool                     waitingAck                   = true;
         bool                     aborted                      = false;
@@ -822,12 +826,15 @@ namespace XMPP { namespace Jingle { namespace S5B {
             if (!disco) {
                 return;
             }
-            TcpPortServer::PortTypes types = TcpPortServer::Direct;
-            if (preference >= Candidate::AssistedPreference) {
-                types |= TcpPortServer::NatAssited;
-            }
-            if (preference >= Candidate::TunnelPreference) {
-                types |= TcpPortServer::Tunneled;
+            TcpPortServer::PortTypes types = TcpPortServer::NoType;
+            if (p2pAllowed) {
+                types |= TcpPortServer::Direct;
+                if (preference >= Candidate::AssistedPreference) {
+                    types |= TcpPortServer::NatAssited;
+                }
+                if (preference >= Candidate::TunnelPreference) {
+                    types |= TcpPortServer::Tunneled;
+                }
             }
             if (!disco->setTypeMask(types)) {
                 delete disco;
@@ -1036,6 +1043,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
             if (localUsedCandidate && localUsedCandidate.state() != Candidate::Discarded) {
                 prio = localUsedCandidate.priority();
             }
+            // find highest priority withing connected remote candidates
             for (const auto &c : remoteCandidates) {
                 if (c.state() != Candidate::Discarded && c.state() >= Candidate::Pending && c.priority() > prio) {
                     prio = c.priority();
@@ -1199,39 +1207,47 @@ namespace XMPP { namespace Jingle { namespace S5B {
         bool handleIncomingCandidate(const QDomElement &transportEl)
         {
             QString candidateTag(QStringLiteral("candidate"));
-            int     candidatesAdded = 0;
+            bool    handled     = false;
+            bool    reallyAdded = false;
             for (QDomElement ce = transportEl.firstChildElement(candidateTag); !ce.isNull();
                  ce             = ce.nextSiblingElement(candidateTag)) {
                 Candidate c(q, ce);
                 if (!c) {
                     throw Stanza::Error(Stanza::Error::Cancel, Stanza::Error::BadRequest);
                 }
-                qDebug("new remote candidate: %s", qPrintable(c.toString()));
-                remoteCandidates.insert(c.cid(), c); // TODO check for collisions!
-                candidatesAdded++;
+                if (!p2pAllowed && c.type() != Candidate::Proxy) {
+                    qDebug("new remote candidate discarded with forbidden p2p: %s", qPrintable(c));
+                } else {
+                    qDebug("new remote candidate: %s", qPrintable(c.toString()));
+                    remoteCandidates.insert(c.cid(), c); // TODO check for collisions!
+                    reallyAdded = true;
+                }
+                handled = true;
             }
-            if (candidatesAdded) {
+            if (reallyAdded) {
                 pendingActions &= ~CandidateError;
                 localReportedCandidateError = false;
                 QTimer::singleShot(0, q, [this]() { tryConnectToRemoteCandidate(); });
-                return true;
             }
-            return false;
+            return handled;
         }
 
         bool handleIncomingCandidateUsed(const QDomElement &transportEl)
         {
             QDomElement el = transportEl.firstChildElement(QStringLiteral("candidate-used"));
             if (!el.isNull()) {
-                auto cUsed = localCandidates.value(el.attribute(QStringLiteral("cid")));
+                auto cid   = QStringLiteral("cid");
+                auto cUsed = localCandidates.value(el.attribute(cid));
                 if (!cUsed) {
                     throw Stanza::Error(Stanza::Error::Cancel, Stanza::Error::ItemNotFound,
-                                        "failed to find incoming candidate-used candidate");
+                                        QString("failed to find incoming candidate-used candidate %1").arg(cid));
                 }
                 if (cUsed.state() == Candidate::Pending) {
-                    if (!cUsed.isConnected()) {
-                        throw Stanza::Error(Stanza::Error::Cancel, Stanza::Error::NotAcceptable,
-                                            "incoming candidate-used refers a candidate w/o active socks connection");
+                    if (cUsed.type() != Candidate::Proxy && !cUsed.isConnected()) {
+                        throw Stanza::Error(
+                            Stanza::Error::Cancel, Stanza::Error::NotAcceptable,
+                            QString("incoming candidate-used refers a candidate w/o active socks connection: %1")
+                                .arg(QString(cUsed)));
                     }
                     cUsed.setState(Candidate::Accepted);
                     localUsedCandidate = cUsed;
@@ -1373,10 +1389,10 @@ namespace XMPP { namespace Jingle { namespace S5B {
         m->addKeyMapping(d->directAddr, this);
 
         auto scope = _pad.staticCast<Pad>()->discoScope();
-        d->disco   = scope->disco(); // FIXME store and handle signale. delete when not needed
+        d->disco   = scope->disco(); // FIXME store and handle signal. delete when not needed
 
         connect(d->disco, &TcpPortDiscoverer::portAvailable, this, [this]() { d->onLocalServerDiscovered(); });
-        d->onLocalServerDiscovered();
+        d->setLocalProbingMinimalPreference(0); // allow all on start
 
         d->discoS5BProxy();
 
@@ -1710,7 +1726,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
             key  = qMakePair(remote, sid);
             key1 = makeKey(sid, remote, d->jingleManager->client()->jid());
             key2 = makeKey(sid, d->jingleManager->client()->jid(), remote);
-        } while (d->sids.contains(key) || std::find_if(servers.begin(), servers.end(), servChecker) != servers.end());
+        } while (d->sids.contains(key) || std::any_of(servers.begin(), servers.end(), servChecker));
         return sid;
     }
 
diff --git a/src/xmpp/xmpp-im/jingle-s5b.h b/src/xmpp/xmpp-im/jingle-s5b.h
index b00d844b..d947f1ec 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.h
+++ b/src/xmpp/xmpp-im/jingle-s5b.h
@@ -105,6 +105,7 @@ namespace Jingle { namespace S5B {
 
         QDomElement toXml(QDomDocument *doc) const;
         QString     toString() const;
+        inline      operator QString() const { return toString(); }
 
         void               connectToHost(const QString &key, State successState, QObject *callbackContext,
                                          std::function<void(bool)> callback, bool isUdp = false);

From 0b21ba08f2ff42eac552505ec752ad9489a3e203 Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Wed, 3 Jun 2020 00:58:11 +0300
Subject: [PATCH 203/383] Less compilation warnings

---
 src/irisnet/noncore/ice176.cpp | 2 +-
 src/xmpp/blake2/blake2.h       | 6 ------
 src/xmpp/blake2/blake2b-ref.c  | 5 +++++
 src/xmpp/blake2/blake2qt.cpp   | 4 ++++
 src/xmpp/blake2/blake2s-ref.c  | 5 +++++
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index 72f26cf4..3815fa96 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -499,7 +499,7 @@ class Ice176::Private : public QObject {
         }
 
         // max pairs is 100 * number of components
-        int max_pairs = 100 * components.size();
+        int max_pairs = 100 * int(components.size());
         while (checkList.pairs.count() > max_pairs)
             checkList.pairs.removeLast();
 #ifdef ICE_DEBUG
diff --git a/src/xmpp/blake2/blake2.h b/src/xmpp/blake2/blake2.h
index 87bfeb40..202bc4b7 100644
--- a/src/xmpp/blake2/blake2.h
+++ b/src/xmpp/blake2/blake2.h
@@ -124,12 +124,6 @@ typedef struct blake2xb_state__ {
     blake2b_param P[1];
 } blake2xb_state;
 
-/* Padded structs result in a compile-time error */
-enum {
-    BLAKE2_DUMMY_1 = 1 / (sizeof(blake2s_param) == BLAKE2S_OUTBYTES),
-    BLAKE2_DUMMY_2 = 1 / (sizeof(blake2b_param) == BLAKE2B_OUTBYTES)
-};
-
 /* Streaming API */
 int blake2s_init(blake2s_state *S, size_t outlen);
 int blake2s_init_key(blake2s_state *S, size_t outlen, const void *key, size_t keylen);
diff --git a/src/xmpp/blake2/blake2b-ref.c b/src/xmpp/blake2/blake2b-ref.c
index ab5fbde8..a09b7f35 100644
--- a/src/xmpp/blake2/blake2b-ref.c
+++ b/src/xmpp/blake2/blake2b-ref.c
@@ -16,10 +16,15 @@
 #include "blake2-impl.h"
 #include "blake2.h"
 
+#include <assert.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 
+/* Padded structs result in a compile-time error */
+static_assert(sizeof(blake2s_param) == BLAKE2S_OUTBYTES, "sizeof(blake2s_param) != BLAKE2S_OUTBYTES");
+static_assert(sizeof(blake2b_param) == BLAKE2B_OUTBYTES, "sizeof(blake2b_param) != BLAKE2B_OUTBYTES");
+
 static const uint64_t blake2b_IV[8] =
 {
   0x6a09e667f3bcc908ULL, 0xbb67ae8584caa73bULL,
diff --git a/src/xmpp/blake2/blake2qt.cpp b/src/xmpp/blake2/blake2qt.cpp
index d68be9b6..50be9a32 100644
--- a/src/xmpp/blake2/blake2qt.cpp
+++ b/src/xmpp/blake2/blake2qt.cpp
@@ -5,6 +5,10 @@
 #include <QIODevice>
 
 namespace XMPP {
+/* Padded structs result in a compile-time error */
+static_assert(sizeof(blake2s_param) == BLAKE2S_OUTBYTES, "sizeof(blake2s_param) != BLAKE2S_OUTBYTES");
+static_assert(sizeof(blake2b_param) == BLAKE2B_OUTBYTES, "sizeof(blake2b_param) != BLAKE2B_OUTBYTES");
+
 QByteArray computeBlake2Hash(const QByteArray &ba, Blake2DigestSize digestSize)
 {
     // otherwise try to libb2 or bundled reference implementation depending on which is available
diff --git a/src/xmpp/blake2/blake2s-ref.c b/src/xmpp/blake2/blake2s-ref.c
index f4e09dfc..fe799669 100644
--- a/src/xmpp/blake2/blake2s-ref.c
+++ b/src/xmpp/blake2/blake2s-ref.c
@@ -16,10 +16,15 @@
 #include "blake2-impl.h"
 #include "blake2.h"
 
+#include <assert.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 
+/* Padded structs result in a compile-time error */
+static_assert(sizeof(blake2s_param) == BLAKE2S_OUTBYTES, "sizeof(blake2s_param) != BLAKE2S_OUTBYTES");
+static_assert(sizeof(blake2b_param) == BLAKE2B_OUTBYTES, "sizeof(blake2b_param) != BLAKE2B_OUTBYTES");
+
 static const uint32_t blake2s_IV[8] =
 {
   0x6A09E667UL, 0xBB67AE85UL, 0x3C6EF372UL, 0xA54FF53AUL,

From 47028c0dbbe45b10bf65b1676bc0945fca8882ea Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
Date: Wed, 3 Jun 2020 03:05:39 +0300
Subject: [PATCH 204/383] Fix typo in code related to XEP-0380 support

---
 src/xmpp/xmpp-im/xmpp_tasks.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/xmpp/xmpp-im/xmpp_tasks.cpp b/src/xmpp/xmpp-im/xmpp_tasks.cpp
index cdd1eaf8..86665dc4 100644
--- a/src/xmpp/xmpp-im/xmpp_tasks.cpp
+++ b/src/xmpp/xmpp-im/xmpp_tasks.cpp
@@ -842,7 +842,8 @@ void JT_Message::onGo()
         Q_UNUSED(encryptionHandler->encryptMessageElement(e));
     }
 
-    const bool wasEncrypted = !e.firstChildElement("encrypted").isNull();
+    // See: XEP-0380: Explicit Message Encryption
+    const bool wasEncrypted = !e.firstChildElement("encryption").isNull();
     m.setWasEncrypted(wasEncrypted);
 
     // if the element is null, then the encryption is happening asynchronously
@@ -932,7 +933,8 @@ bool JT_PushMessage::take(const QDomElement &e)
         m.setCarbonDirection(cd);
     }
 
-    const bool wasEncrypted = !e1.firstChildElement("encrypted").isNull();
+    // See: XEP-0380: Explicit Message Encryption
+    const bool wasEncrypted = !e1.firstChildElement("encryption").isNull();
     m.setWasEncrypted(wasEncrypted);
 
     emit message(m);

From 59c87816772697c984764779c7565d7e11f0ed88 Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
Date: Wed, 3 Jun 2020 21:36:22 +0300
Subject: [PATCH 205/383] Improve support of XEP-0380

---
 src/xmpp/xmpp-im/types.cpp      |  5 +++++
 src/xmpp/xmpp-im/xmpp_message.h |  4 ++++
 src/xmpp/xmpp-im/xmpp_task.cpp  | 24 ++++++++++++++++++++++++
 src/xmpp/xmpp-im/xmpp_task.h    |  1 +
 src/xmpp/xmpp-im/xmpp_tasks.cpp |  2 ++
 5 files changed, 36 insertions(+)

diff --git a/src/xmpp/xmpp-im/types.cpp b/src/xmpp/xmpp-im/types.cpp
index 3421ea35..4bab096e 100644
--- a/src/xmpp/xmpp-im/types.cpp
+++ b/src/xmpp/xmpp-im/types.cpp
@@ -967,6 +967,7 @@ class Message::Private : public QSharedData {
     Message::ProcessingHints processingHints;
     QString                  replaceId;
     QString                  originId;   // XEP-0359
+    QString                  encryptionProtocol; // XEP-0380
     Message::StanzaId        stanzaId;   // XEP-0359
     QList<Reference>         references; // XEP-0385 and XEP-0372
 };
@@ -1277,6 +1278,10 @@ QString Message::originId() const { return d ? d->originId : QString(); }
 
 void Message::setOriginId(const QString &id) { MessageD()->originId = id; }
 
+QString Message::encryptionProtocol() const { return d ? d->encryptionProtocol : QString(); }
+
+void Message::setEncryptionProtocol(const QString &protocol) { MessageD()->encryptionProtocol = protocol; }
+
 QList<Reference> Message::references() const { return d ? d->references : QList<Reference>(); }
 
 void Message::addReference(const Reference &r) { MessageD()->references.append(r); }
diff --git a/src/xmpp/xmpp-im/xmpp_message.h b/src/xmpp/xmpp-im/xmpp_message.h
index 457c6e2a..a5de37a6 100644
--- a/src/xmpp/xmpp-im/xmpp_message.h
+++ b/src/xmpp/xmpp-im/xmpp_message.h
@@ -207,6 +207,10 @@ class Message {
     QString  originId() const;
     void     setOriginId(const QString &id);
 
+    // XEP-0380
+    QString  encryptionProtocol() const;
+    void     setEncryptionProtocol(const QString &protocol);
+
     // XEP-0385 and XEP-0372
     QList<Reference> references() const;
     void             addReference(const Reference &r);
diff --git a/src/xmpp/xmpp-im/xmpp_task.cpp b/src/xmpp/xmpp-im/xmpp_task.cpp
index 91a24b0a..7aa1de1a 100644
--- a/src/xmpp/xmpp-im/xmpp_task.cpp
+++ b/src/xmpp/xmpp-im/xmpp_task.cpp
@@ -296,3 +296,27 @@ bool Task::iqVerify(const QDomElement &x, const Jid &to, const QString &id, cons
 
     return true;
 }
+
+QString Task::encryptionProtocol(const QDomElement &e) const
+{
+    if (e.elementsByTagNameNS("urn:xmpp:eme:0", "encryption").isEmpty())
+        return QString();
+
+    QDomElement encryption = e.elementsByTagNameNS("urn:xmpp:eme:0", "encryption").at(0).toElement();
+    const QString &&ns = encryption.attribute("namespace");
+
+    // https://xmpp.org/extensions/xep-0380.html#protocols
+    QString protocol;
+    if (ns == "urn:xmpp:otr:0") {
+        protocol = "OTR";
+    } else if (ns == "jabber:x:encrypted") {
+        protocol = "Legacy OpenPGP";
+    } else if (ns == "urn:xmpp:openpgp:0") {
+        protocol = "OpenPGP for XMPP";
+    } else if (ns == "eu.siacs.conversations.axolotl") {
+        protocol = "OMEMO";
+    } else if (encryption.attribute("name").isEmpty()) {
+        protocol = encryption.attribute("name");
+    }
+    return protocol;
+}
diff --git a/src/xmpp/xmpp-im/xmpp_task.h b/src/xmpp/xmpp-im/xmpp_task.h
index a760892b..1fa60559 100644
--- a/src/xmpp/xmpp-im/xmpp_task.h
+++ b/src/xmpp/xmpp-im/xmpp_task.h
@@ -71,6 +71,7 @@ class Task : public QObject {
     void         debug(const char *, ...);
     void         debug(const QString &);
     bool         iqVerify(const QDomElement &x, const Jid &to, const QString &id, const QString &xmlns = "");
+    QString      encryptionProtocol(const QDomElement &) const;
 
 private slots:
     void clientDisconnected();
diff --git a/src/xmpp/xmpp-im/xmpp_tasks.cpp b/src/xmpp/xmpp-im/xmpp_tasks.cpp
index 86665dc4..c41d172a 100644
--- a/src/xmpp/xmpp-im/xmpp_tasks.cpp
+++ b/src/xmpp/xmpp-im/xmpp_tasks.cpp
@@ -845,6 +845,7 @@ void JT_Message::onGo()
     // See: XEP-0380: Explicit Message Encryption
     const bool wasEncrypted = !e.firstChildElement("encryption").isNull();
     m.setWasEncrypted(wasEncrypted);
+    m.setEncryptionProtocol(encryptionProtocol(e));
 
     // if the element is null, then the encryption is happening asynchronously
     if (!e.isNull()) {
@@ -936,6 +937,7 @@ bool JT_PushMessage::take(const QDomElement &e)
     // See: XEP-0380: Explicit Message Encryption
     const bool wasEncrypted = !e1.firstChildElement("encryption").isNull();
     m.setWasEncrypted(wasEncrypted);
+    m.setEncryptionProtocol(encryptionProtocol(e));
 
     emit message(m);
     return true;

From a6f423f0330fe6e428b35c5f7ce4e40408ba11f2 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 10 Jun 2020 22:55:01 +0300
Subject: [PATCH 206/383] Fixed crash on early socket reset on connected signal

---
 src/irisnet/noncore/cutestuff/bsocket.cpp | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/irisnet/noncore/cutestuff/bsocket.cpp b/src/irisnet/noncore/cutestuff/bsocket.cpp
index 869aa7aa..f42a3149 100644
--- a/src/irisnet/noncore/cutestuff/bsocket.cpp
+++ b/src/irisnet/noncore/cutestuff/bsocket.cpp
@@ -112,8 +112,8 @@ class HappyEyeballsConnector : public QObject {
         sd.sock->setReadBufferSize(READBUFSIZE);
         sd.relay    = new QTcpSocketSignalRelay(sd.sock, this);
         sd.resolver = nullptr;
-        connect(sd.relay, SIGNAL(connected()), SLOT(qs_connected()));
-        connect(sd.relay, SIGNAL(error(QAbstractSocket::SocketError)), SLOT(qs_error(QAbstractSocket::SocketError)));
+        connect(sd.relay, &QTcpSocketSignalRelay::connected, this, &HappyEyeballsConnector::qs_connected);
+        connect(sd.relay, &QTcpSocketSignalRelay::error, this, &HappyEyeballsConnector::qs_error);
         sockets.append(sd);
         return sockets[sockets.count() - 1];
     }
@@ -259,6 +259,7 @@ private slots:
 #ifdef BS_DEBUG
         BSDEBUG;
 #endif
+        QPointer<HappyEyeballsConnector> valid(this);
         setCurrentByRelay(static_cast<QTcpSocketSignalRelay *>(sender()));
         for (int i = 0; i < sockets.count(); i++) {
             if (i != lastIndex) {
@@ -268,6 +269,8 @@ private slots:
                 sockets[i].state = Connected;
             }
             emit connected();
+            if (!valid)
+                return;
         }
     }
 
@@ -408,7 +411,9 @@ void BSocket::resetConnection(bool clear)
     BSDEBUG << clear;
 #endif
     if (d->connector) {
-        delete d->connector; // fixme: deleteLater?
+        d->connector->deleteLater();
+        disconnect(d->connector);
+        d->connector = nullptr;
     }
 
     if (d->qsock) {
@@ -446,9 +451,8 @@ void BSocket::ensureConnector()
 {
     if (!d->connector) {
         d->connector = new HappyEyeballsConnector(this);
-        connect(d->connector, SIGNAL(connected()), SLOT(qs_connected()));
-        connect(d->connector, SIGNAL(error(QAbstractSocket::SocketError)),
-                SLOT(qs_error(QAbstractSocket::SocketError)));
+        connect(d->connector, &HappyEyeballsConnector::connected, this, &BSocket::qs_connected);
+        connect(d->connector, &HappyEyeballsConnector::error, this, &BSocket::qs_error);
     }
 }
 
@@ -634,11 +638,12 @@ void BSocket::qs_connected_step2(bool signalConnected)
 #ifdef BS_DEBUG
     BSDEBUG << "Connected";
 #endif
+    QPointer<BSocket> valid(this);
     if (signalConnected) {
         emit connected();
     }
 
-    if (d->qsock->bytesAvailable()) {
+    if (valid && d->qsock->bytesAvailable()) {
         qs_readyRead();
     }
 }

From 136f069533f475fdf74a0a29d2de86acd88adc23 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 10 Jun 2020 22:55:26 +0300
Subject: [PATCH 207/383] Added QXmlStreamREader-based parser instead of
 deprecated simple reader

---
 src/xmpp/xmpp-core/parser.cpp      | 863 +++++++++--------------------
 src/xmpp/xmpp-core/parser.h        |  37 +-
 src/xmpp/xmpp-core/protocol.cpp    |  20 +-
 src/xmpp/xmpp-core/xmlprotocol.cpp |   2 +-
 4 files changed, 287 insertions(+), 635 deletions(-)

diff --git a/src/xmpp/xmpp-core/parser.cpp b/src/xmpp/xmpp-core/parser.cpp
index edbe6c5e..e58024e6 100644
--- a/src/xmpp/xmpp-core/parser.cpp
+++ b/src/xmpp/xmpp-core/parser.cpp
@@ -1,6 +1,6 @@
 /*
  * parser.cpp - parse an XMPP "document"
- * Copyright (C) 2003  Justin Karneges
+ * Copyright (C) 2020  Sergey Ilinykh
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -17,532 +17,45 @@
  *
  */
 
-/*
-  TODO:
-
-  For XMPP::Parser to be "perfect", some things must be solved/changed in the
-  Qt library:
-
-  - Fix weird QDomElement::haveAttributeNS() bug (patch submitted to
-    Trolltech on Aug 31st, 2003).
-  - Fix weird behavior in QXmlSimpleReader of reporting endElement() when
-    the '/' character of a self-closing tag is reached, instead of when
-    the final '>' is reached.
-  - Fix incremental parsing bugs in QXmlSimpleReader.  At the moment, the
-    only bug I've found is related to attribute parsing, but there might
-    be more (search for '###' in $QTDIR/src/xml/qxml.cpp).
-
-  We have workarounds for all of the above problems in the code below.
-
-  - Deal with the <?xml?> processing instruction as an event type, so that we
-    can feed it back to the application properly.  Right now it is completely
-    untrackable and is simply tacked into the first event's actualString.  We
-    can't easily do this because QXmlSimpleReader eats an extra byte beyond
-    the processing instruction before reporting it.
-
-  - Make QXmlInputSource capable of accepting data incrementally, to ensure
-    proper text encoding detection and processing over a network.  This is
-    technically not a bug, as we have our own subclass below to do it, but
-    it would be nice if Qt had this already.
-*/
-
 #include "parser.h"
 
-#include <qtextcodec.h>
-#include <string.h>
-
-using namespace XMPP;
-
-static bool qt_bug_check = false;
-static bool qt_bug_have;
-
-//----------------------------------------------------------------------------
-// StreamInput
-//----------------------------------------------------------------------------
-class StreamInput : public QXmlInputSource {
-public:
-    StreamInput()
-    {
-        dec = nullptr;
-        reset();
-    }
-
-    ~StreamInput() { delete dec; }
-
-    void reset()
-    {
-        delete dec;
-        dec = nullptr;
-        in.resize(0);
-        out                 = "";
-        at                  = 0;
-        paused              = false;
-        mightChangeEncoding = true;
-        checkBad            = true;
-        last                = QChar();
-        v_encoding          = "";
-        resetLastData();
-    }
+#include <queue>
 
-    void resetLastData() { last_string = ""; }
-
-    QString lastString() const { return last_string; }
-
-    void appendData(const QByteArray &a)
-    {
-        int oldsize = in.size();
-        in.resize(oldsize + a.size());
-        memcpy(in.data() + oldsize, a.data(), a.size());
-        processBuf();
-    }
-
-    QChar lastRead() { return last; }
-
-    QChar next()
-    {
-        if (paused)
-            return EndOfData;
-        else
-            return readNext();
-    }
-
-    // NOTE: setting 'peek' to true allows the same char to be read again,
-    //       however this still advances the internal byte processing.
-    QChar readNext(bool peek = false)
-    {
-        QChar c;
-        if (mightChangeEncoding)
-            c = EndOfData;
-        else {
-            if (out.isEmpty()) {
-                QString s;
-                if (!tryExtractPart(&s))
-                    c = EndOfData;
-                else {
-                    out = s;
-                    c   = out[0];
-                }
-            } else
-                c = out[0];
-            if (!peek)
-                out.remove(0, 1);
-        }
-        if (c == EndOfData) {
-#ifdef XMPP_PARSER_DEBUG
-            printf("next() = EOD\n");
-#endif
-        } else {
-#ifdef XMPP_PARSER_DEBUG
-            printf("next() = [%c]\n", c.latin1());
-#endif
-            last = c;
-        }
-
-        return c;
-    }
-
-    QByteArray unprocessed() const
-    {
-        QByteArray a;
-        a.resize(in.size() - at);
-        memcpy(a.data(), in.data() + at, a.size());
-        return a;
-    }
-
-    void pause(bool b) { paused = b; }
-
-    bool isPaused() { return paused; }
-
-    QString encoding() const { return v_encoding; }
-
-private:
-    QTextDecoder *dec;
-    QByteArray    in;
-    QString       out;
-    int           at;
-    bool          paused;
-    bool          mightChangeEncoding;
-    QChar         last;
-    QString       v_encoding;
-    QString       last_string;
-    bool          checkBad;
-
-    void processBuf()
-    {
-#ifdef XMPP_PARSER_DEBUG
-        printf("processing.  size=%d, at=%d\n", in.size(), at);
-#endif
-        if (!dec) {
-            QTextCodec *codec = nullptr;
-            uchar *     p     = (uchar *)in.data() + at;
-            int         size  = in.size() - at;
-
-            // do we have enough information to determine the encoding?
-            if (size == 0)
-                return;
-            bool utf16 = false;
-            if (p[0] == 0xfe || p[0] == 0xff) {
-                // probably going to be a UTF-16 byte order mark
-                if (size < 2)
-                    return;
-                if ((p[0] == 0xfe && p[1] == 0xff) || (p[0] == 0xff && p[1] == 0xfe)) {
-                    // ok it is UTF-16
-                    utf16 = true;
-                }
-            }
-            if (utf16)
-                codec = QTextCodec::codecForMib(1000); // UTF-16
-            else
-                codec = QTextCodec::codecForMib(106); // UTF-8
-
-            v_encoding = codec->name();
-            dec        = codec->makeDecoder();
-
-            // for utf16, put in the byte order mark
-            if (utf16) {
-                out += dec->toUnicode((const char *)p, 2);
-                at += 2;
-            }
-        }
-
-        if (mightChangeEncoding) {
-            while (1) {
-                int n = out.indexOf('<');
-                if (n != -1) {
-                    // we need a closing bracket
-                    int n2 = out.indexOf('>', n);
-                    if (n2 != -1) {
-                        ++n2;
-                        QString     h     = out.mid(n, n2 - n);
-                        QString     enc   = processXmlHeader(h);
-                        QTextCodec *codec = nullptr;
-                        if (!enc.isEmpty())
-                            codec = QTextCodec::codecForName(enc.toLatin1());
-
-                        // changing codecs
-                        if (codec) {
-                            v_encoding = codec->name();
-                            delete dec;
-                            dec = codec->makeDecoder();
-                        }
-                        mightChangeEncoding = false;
-                        out.truncate(0);
-                        at = 0;
-                        resetLastData();
-                        break;
-                    }
-                }
-                QString s;
-                if (!tryExtractPart(&s))
-                    break;
-                if (checkBad && checkForBadChars(s)) {
-                    // go to the parser
-                    mightChangeEncoding = false;
-                    out.truncate(0);
-                    at = 0;
-                    resetLastData();
-                    break;
-                }
-                out += s;
-            }
-        }
-    }
-
-    QString processXmlHeader(const QString &h)
-    {
-        if (h.left(5) != "<?xml")
-            return "";
-
-        int endPos   = h.indexOf(">");
-        int startPos = h.indexOf("encoding");
-        if (startPos < endPos && startPos != -1) {
-            QString encoding;
-            do {
-                startPos++;
-                if (startPos > endPos) {
-                    return "";
-                }
-            } while (h[startPos] != '"' && h[startPos] != '\'');
-            startPos++;
-            while (h[startPos] != '"' && h[startPos] != '\'') {
-                encoding += h[startPos];
-                startPos++;
-                if (startPos > endPos) {
-                    return "";
-                }
-            }
-            return encoding;
-        } else
-            return "";
-    }
-
-    bool tryExtractPart(QString *s)
-    {
-        int size = in.size() - at;
-        if (size == 0)
-            return false;
-        uchar * p = (uchar *)in.data() + at;
-        QString nextChars;
-        while (1) {
-            nextChars = dec->toUnicode((const char *)p, 1);
-            ++p;
-            ++at;
-            if (!nextChars.isEmpty())
-                break;
-            if (at == (int)in.size())
-                return false;
-        }
-        last_string += nextChars;
-        *s = nextChars;
-
-        // free processed data?
-        if (at >= 1024) {
-            char *p    = in.data();
-            int   size = in.size() - at;
-            memmove(p, p + at, size);
-            in.resize(size);
-            at = 0;
-        }
-
-        return true;
-    }
-
-    bool checkForBadChars(const QString &s)
-    {
-        int len = s.indexOf('<');
-        if (len == -1)
-            len = s.length();
-        else
-            checkBad = false;
-        for (int n = 0; n < len; ++n) {
-            if (!s.at(n).isSpace())
-                return true;
-        }
-        return false;
-    }
-};
-
-//----------------------------------------------------------------------------
-// ParserHandler
-//----------------------------------------------------------------------------
 namespace XMPP {
-class ParserHandler : public QXmlDefaultHandler {
-public:
-    explicit ParserHandler(StreamInput *_in, QDomDocument *_doc) : in(_in), doc(_doc) { }
-
-    ~ParserHandler()
-    {
-        while (!eventList.isEmpty()) {
-            delete eventList.takeFirst();
-        }
-    }
-
-    bool startDocument()
-    {
-        depth = 0;
-        return true;
-    }
-
-    bool endDocument() { return true; }
-
-    bool startPrefixMapping(const QString &prefix, const QString &uri)
-    {
-        if (depth == 0) {
-            nsnames += prefix;
-            nsvalues += uri;
-        }
-        return true;
-    }
-
-    bool startElement(const QString &namespaceURI, const QString &localName, const QString &qName,
-                      const QXmlAttributes &atts)
-    {
-        if (depth == 0) {
-            Parser::Event *e = new Parser::Event;
-            QXmlAttributes a;
-            for (int n = 0; n < atts.length(); ++n) {
-                QString uri = atts.uri(n);
-                QString ln  = atts.localName(n);
-                if (a.index(uri, ln) == -1)
-                    a.append(atts.qName(n), uri, ln, atts.value(n));
-            }
-            e->setDocumentOpen(namespaceURI, localName, qName, a, nsnames, nsvalues);
-            nsnames.clear();
-            nsvalues.clear();
-            e->setActualString(in->lastString());
-
-            in->resetLastData();
-            eventList.append(e);
-            in->pause(true);
-        } else {
-            QDomElement e = doc->createElementNS(namespaceURI, qName);
-            for (int n = 0; n < atts.length(); ++n) {
-                QString uri = atts.uri(n);
-                QString ln  = atts.localName(n);
-                bool    have;
-                if (!uri.isEmpty()) {
-                    have = e.hasAttributeNS(uri, ln);
-                    if (qt_bug_have)
-                        have = !have;
-                } else
-                    have = e.hasAttribute(ln);
-                if (!have)
-                    e.setAttributeNS(uri, atts.qName(n), atts.value(n));
-            }
-
-            if (depth == 1) {
-                elem    = e;
-                current = e;
-            } else {
-                current.appendChild(e);
-                current = e;
-            }
-        }
-        ++depth;
-        return true;
-    }
-
-    bool endElement(const QString &namespaceURI, const QString &localName, const QString &qName)
-    {
-        --depth;
-        if (depth == 0) {
-            Parser::Event *e = new Parser::Event;
-            e->setDocumentClose(namespaceURI, localName, qName);
-            e->setActualString(in->lastString());
-            in->resetLastData();
-            eventList.append(e);
-            in->pause(true);
-        } else {
-            // done with a depth 1 element?
-            if (depth == 1) {
-                Parser::Event *e = new Parser::Event;
-                e->setElement(elem);
-                e->setActualString(in->lastString());
-                in->resetLastData();
-                eventList.append(e);
-                in->pause(true);
-
-                elem    = QDomElement();
-                current = QDomElement();
-            } else
-                current = current.parentNode().toElement();
-        }
-
-        if (in->lastRead() == '/')
-            checkNeedMore();
-
-        return true;
-    }
-
-    bool characters(const QString &str)
-    {
-        if (depth >= 1) {
-            QString content = str;
-            if (content.isEmpty())
-                return true;
-
-            if (!current.isNull()) {
-                QDomText text = doc->createTextNode(content);
-                current.appendChild(text);
-            }
-        }
-        return true;
-    }
-
-    /*bool processingInstruction(const QString &target, const QString &data)
-    {
-        printf("Processing: [%s], [%s]\n", target.latin1(), data.latin1());
-        in->resetLastData();
-        return true;
-    }*/
-
-    void checkNeedMore()
-    {
-        // Here we will work around QXmlSimpleReader strangeness and self-closing tags.
-        // The problem is that endElement() is called when the '/' is read, not when
-        // the final '>' is read.  This is a potential problem when obtaining unprocessed
-        // bytes from StreamInput after this event, as the '>' character will end up
-        // in the unprocessed chunk.  To work around this, we need to advance StreamInput's
-        // internal byte processing, but not the xml character data.  This way, the '>'
-        // will get processed and will no longer be in the unprocessed return, but
-        // QXmlSimpleReader can still read it.  To do this, we call StreamInput::readNext
-        // with 'peek' mode.
-        QChar c = in->readNext(true); // peek
-        if (c == QXmlInputSource::EndOfData) {
-            needMore = true;
-        } else {
-            // We'll assume the next char is a '>'.  If it isn't, then
-            // QXmlSimpleReader will deal with that problem on the next
-            // parse.  We don't need to take any action here.
-            needMore = false;
-
-            // there should have been a pending event
-            if (!eventList.isEmpty()) {
-                Parser::Event *e = eventList.first();
-                e->setActualString(e->actualString() + '>');
-                in->resetLastData();
-            }
-        }
-    }
-
-    Parser::Event *takeEvent()
-    {
-        if (needMore)
-            return nullptr;
-        if (eventList.isEmpty())
-            return nullptr;
-
-        Parser::Event *e = eventList.takeFirst();
-        in->pause(false);
-        return e;
-    }
-
-    StreamInput *          in;
-    QDomDocument *         doc;
-    int                    depth = 1;
-    QStringList            nsnames, nsvalues;
-    QDomElement            elem, current;
-    QList<Parser::Event *> eventList;
-    bool                   needMore = false;
-};
-}; // namespace XMPP
 
 //----------------------------------------------------------------------------
 // Event
 //----------------------------------------------------------------------------
-class Parser::Event::Private {
+class Parser::Event::Private : public QSharedData {
 public:
-    int            type;
-    QString        ns, ln, qn;
-    QXmlAttributes a;
-    QDomElement    e;
-    QString        str;
-    QStringList    nsnames, nsvalues;
+    int                  type;
+    QString              ns, ln, qn;
+    QXmlStreamAttributes a;
+    QDomElement          e;
+    QString              str;
+
+    QXmlStreamNamespaceDeclarations nsPrefixes;
 };
 
-Parser::Event::Event() { d = nullptr; }
+Parser::Event::Event() { }
 
-Parser::Event::Event(const Event &from)
-{
-    d     = nullptr;
-    *this = from;
-}
+Parser::Event::Event(const Event &from) : d(from.d) { }
 
 Parser::Event &Parser::Event::operator=(const Event &from)
 {
-    if (&from == this)
-        return *this;
-
-    delete d;
-    d = nullptr;
-    if (from.d)
-        d = new Private(*from.d);
+    d = from.d;
     return *this;
 }
 
-Parser::Event::~Event() { delete d; }
+Parser::Event::~Event() { }
 
-bool Parser::Event::isNull() const { return (d ? false : true); }
+bool Parser::Event::isNull() const { return d == nullptr; }
+
+void Parser::Event::ensureD()
+{
+    if (!d)
+        d = new Private();
+}
 
 int Parser::Event::type() const
 {
@@ -553,46 +66,65 @@ int Parser::Event::type() const
 
 QString Parser::Event::nsprefix(const QString &s) const
 {
-    QStringList::ConstIterator it  = d->nsnames.constBegin();
-    QStringList::ConstIterator it2 = d->nsvalues.constBegin();
-    for (; it != d->nsnames.constEnd(); ++it) {
-        if ((*it) == s)
-            return (*it2);
-        ++it2;
-    }
-    return QString();
+    Q_ASSERT(d != nullptr);
+    auto it
+        = std::find_if(d->nsPrefixes.cbegin(), d->nsPrefixes.cend(), [&](auto const &v) { return v.prefix() == s; });
+    if (it == d->nsPrefixes.cend())
+        return QString();
+    return it->namespaceUri().toString();
 }
 
-QString Parser::Event::namespaceURI() const { return d->ns; }
+QString Parser::Event::namespaceURI() const
+{
+    Q_ASSERT(d != nullptr);
+    return d->ns;
+}
 
-QString Parser::Event::localName() const { return d->ln; }
+QString Parser::Event::localName() const
+{
+    Q_ASSERT(d != nullptr);
+    return d->ln;
+}
 
-QString Parser::Event::qName() const { return d->qn; }
+QString Parser::Event::qName() const
+{
+    Q_ASSERT(d != nullptr);
+    return d->qn;
+}
 
-QXmlAttributes Parser::Event::atts() const { return d->a; }
+QXmlStreamAttributes Parser::Event::atts() const
+{
+    Q_ASSERT(d != nullptr);
+    return d->a;
+}
 
-QString Parser::Event::actualString() const { return d->str; }
+QString Parser::Event::actualString() const
+{
+    Q_ASSERT(d != nullptr);
+    return d->str;
+}
 
-QDomElement Parser::Event::element() const { return d->e; }
+QDomElement Parser::Event::element() const
+{
+    Q_ASSERT(d != nullptr);
+    return d->e;
+}
 
 void Parser::Event::setDocumentOpen(const QString &namespaceURI, const QString &localName, const QString &qName,
-                                    const QXmlAttributes &atts, const QStringList &nsnames, const QStringList &nsvalues)
+                                    const QXmlStreamAttributes &atts, const QXmlStreamNamespaceDeclarations &nsPrefixes)
 {
-    if (!d)
-        d = new Private;
-    d->type     = DocumentOpen;
-    d->ns       = namespaceURI;
-    d->ln       = localName;
-    d->qn       = qName;
-    d->a        = atts;
-    d->nsnames  = nsnames;
-    d->nsvalues = nsvalues;
+    ensureD();
+    d->type       = DocumentOpen;
+    d->ns         = namespaceURI;
+    d->ln         = localName;
+    d->qn         = qName;
+    d->a          = atts;
+    d->nsPrefixes = nsPrefixes;
 }
 
 void Parser::Event::setDocumentClose(const QString &namespaceURI, const QString &localName, const QString &qName)
 {
-    if (!d)
-        d = new Private;
+    ensureD();
     d->type = DocumentClose;
     d->ns   = namespaceURI;
     d->ln   = localName;
@@ -601,117 +133,226 @@ void Parser::Event::setDocumentClose(const QString &namespaceURI, const QString
 
 void Parser::Event::setElement(const QDomElement &elem)
 {
-    if (!d)
-        d = new Private;
+    ensureD();
     d->type = Element;
     d->e    = elem;
 }
 
 void Parser::Event::setError()
 {
-    if (!d)
-        d = new Private;
+    ensureD();
     d->type = Error;
 }
 
-void Parser::Event::setActualString(const QString &str) { d->str = str; }
+void Parser::Event::setActualString(const QString &str)
+{
+    ensureD();
+    d->str = str;
+}
 
 //----------------------------------------------------------------------------
 // Parser
 //----------------------------------------------------------------------------
 class Parser::Private {
 public:
-    Private()
+    QDomDocument          doc;
+    QDomElement           curElement;
+    QDomElement           element; // root part
+    std::list<QByteArray> in;
+    QXmlStreamReader      reader;
+    const char *          completeTag    = nullptr; // this is basically a workaround for bugs like QTBUG-14661
+    int                   completeOffset = 0;
+    bool                  streamOpened   = false;
+    bool                  readerStarted  = false;
+    std::queue<Event>     events;
+    QString               streamQName;
+
+    void pushDataToReader()
     {
-        doc     = nullptr;
-        in      = 0;
-        handler = nullptr;
-        reader  = 0;
-        reset();
+        if (completeTag) {
+            readerStarted = true;
+            while (!in.empty()) {
+                if (in.front().constData() != completeTag) {
+                    reader.addData(in.front());
+                    in.erase(in.begin());
+                } else {
+                    // Qt has some bugs, so ensure we push data only ending with '>'
+                    if (completeOffset == in.front().size() - 1) {
+                        reader.addData(in.front());
+                        in.erase(in.begin());
+                    } else {
+                        QByteArray part = in.front().left(completeOffset + 1);
+                        reader.addData(part);
+                        in.front().remove(0, completeOffset + 1);
+                    }
+                    completeTag = nullptr;
+                    break;
+                }
+            }
+        }
     }
 
-    ~Private() { reset(false); }
-
-    void reset(bool create = true)
+    void handleStartElement()
     {
-        delete reader;
-        delete handler;
-        delete in;
-        delete doc;
-
-        if (create) {
-            doc     = new QDomDocument;
-            in      = new StreamInput;
-            handler = new ParserHandler(in, doc);
-            reader  = new QXmlSimpleReader;
-            reader->setContentHandler(handler);
-
-            // initialize the reader
-            in->pause(true);
-            reader->parse(in, true);
-            in->pause(false);
+        auto    ns   = reader.namespaceUri().toString();
+        QString name = reader.name().toString();
+        if (streamOpened) {
+            QDomElement newEl;
+            if (ns.isEmpty())
+                newEl = doc.createElement(name);
+            else
+                newEl = doc.createElementNS(ns, name);
+            if (curElement.isNull()) {
+                curElement = newEl;
+                element    = newEl;
+            } else {
+                curElement = curElement.appendChild(newEl).toElement();
+            }
+
+            for (auto const &a : reader.attributes()) {
+                QDomAttr da;
+                if (a.namespaceUri().isEmpty())
+                    da = doc.createAttribute(a.name().toString());
+                else
+                    da = doc.createAttributeNS(a.namespaceUri().toString(), a.name().toString());
+                da.setPrefix(a.prefix().toString());
+                da.setValue(a.value().toString());
+                if (a.namespaceUri().isEmpty())
+                    curElement.setAttributeNode(da);
+                else
+                    curElement.setAttributeNodeNS(da);
+            }
         } else {
-            reader  = nullptr;
-            handler = nullptr;
-            in      = nullptr;
-            doc     = 0;
+            Event e;
+            streamQName = reader.qualifiedName().toString();
+            e.setDocumentOpen(ns, name, streamQName, reader.attributes(), reader.namespaceDeclarations());
+            events.push(e);
+            streamOpened = true;
         }
     }
 
-    QDomDocument *    doc;
-    StreamInput *     in;
-    ParserHandler *   handler;
-    QXmlSimpleReader *reader;
-};
+    void handleEndElement()
+    {
+        if (curElement.isNull() && reader.qualifiedName() == streamQName) {
+            Event e;
+            e.setDocumentClose(reader.namespaceUri().toString(), reader.name().toString(), streamQName);
+            events.push(e);
+            return;
+        }
+        Q_ASSERT_X(!curElement.isNull(), "xml parser", "XML reader hasn't reported error for invalid element close");
+        Q_ASSERT_X(
+            curElement.namespaceURI() == reader.namespaceUri() && curElement.tagName() == reader.name(), "xml parser",
+            qPrintable(
+                QString("XML reader hasn't reported open/close tags mismatch. expected close for <%1 xmlns=\"%2\"> "
+                        "but got close for <%3 xmlns=\"%4\">")
+                    .arg(curElement.tagName(), curElement.namespaceURI(), reader.name(), reader.namespaceUri())));
+#if 0
+        if (element.isNull()) {
+            Event e;
+            qWarning("xml parser: closing not existing element: %s", qPrintable(reader.qualifiedName().toString()));
+            e.setError();
+            return;
+        }
 
-Parser::Parser()
-{
-    d = new Private;
-
-    // check for evil bug in Qt <= 3.2.1
-    if (!qt_bug_check) {
-        qt_bug_check  = true;
-        QDomElement e = d->doc->createElementNS("someuri", "somename");
-        if (e.hasAttributeNS("someuri", "somename"))
-            qt_bug_have = true;
-        else
-            qt_bug_have = false;
+        if (!(element.namespaceURI() == reader.namespaceUri() && element.tagName() == reader.name())) {
+            Event e;
+            qWarning("XML reader hasn't reported open/close tags mismatch: %s vs %s", qPrintable(element.tagName()),
+                     qPrintable(reader.qualifiedName().toString()));
+            e.setError();
+            return;
+        }
+#endif
+        if (curElement.parentNode().isNull()) {
+            Event e;
+            e.setElement(curElement);
+            events.push(e);
+        }
+        curElement = curElement.parentNode().toElement();
     }
-}
 
-Parser::~Parser() { delete d; }
+    void handleText()
+    {
+        if (curElement.isNull()) {
+            if (!reader.isWhitespace())
+                qWarning("Text node out of element (ignored): %s", qPrintable(reader.text().toString()));
+            return;
+        }
+        auto node = doc.createTextNode(reader.text().toString());
+        curElement.appendChild(node);
+    }
+
+    void collectEvents()
+    {
+        auto tt = reader.readNext();
+        while (tt != QXmlStreamReader::NoToken && tt != QXmlStreamReader::Invalid) {
+            if (tt == QXmlStreamReader::StartElement) {
+                handleStartElement();
+            } else if (tt == QXmlStreamReader::EndElement) {
+                handleEndElement();
+            } else if (tt == QXmlStreamReader::Characters) {
+                handleText();
+            } else {
+                Q_ASSERT_X(tt != QXmlStreamReader::EntityReference, "xml parser",
+                           qPrintable(QString("unexpected xml entity: %1").arg(reader.text())));
+            }
+            tt = reader.readNext();
+        }
+        if (tt == QXmlStreamReader::Invalid) {
+            if (reader.error() == QXmlStreamReader::PrematureEndOfDocumentError)
+                return;
+            qDebug("xml parser error: %s", qPrintable(reader.errorString()));
+            Event e;
+            e.setError();
+            events.push(e);
+        }
+    }
+
+    Parser::Event readNext()
+    {
+        Event e;
+        pushDataToReader();
+        if (!readerStarted)
+            return e;
+        collectEvents();
+        if (!events.empty()) {
+            e = events.front();
+            events.pop();
+        }
+        return e;
+    }
+};
+
+Parser::Parser() { reset(); }
 
-void Parser::reset() { d->reset(); }
+Parser::~Parser() { }
+
+void Parser::reset() { d.reset(new Private); }
 
 void Parser::appendData(const QByteArray &a)
 {
-    d->in->appendData(a);
-
-    // if handler was waiting for more, give it a kick
-    if (d->handler->needMore)
-        d->handler->checkNeedMore();
+    if (a.isEmpty())
+        return;
+    d->in.push_back(a);
+    for (int i = a.size() - 1; i >= 0; --i) {
+        if (a.at(i) == '>') { // this may happend in CDATA too, but let's hope Qt handles it properly
+            d->completeTag    = a.constData();
+            d->completeOffset = i;
+            break;
+        }
+    }
 }
 
-Parser::Event Parser::readNext()
+Parser::Event Parser::readNext() { return d->readNext(); }
+
+QByteArray Parser::unprocessed() const
 {
-    Event e;
-    if (d->handler->needMore)
-        return e;
-    Event *ep = d->handler->takeEvent();
-    if (!ep) {
-        if (!d->reader->parseContinue()) {
-            e.setError();
-            return e;
-        }
-        ep = d->handler->takeEvent();
-        if (!ep)
-            return e;
+    QByteArray ret;
+    for (auto const &a : d->in) {
+        ret += a;
     }
-    e = *ep;
-    delete ep;
-    return e;
+    return ret;
 }
 
-QByteArray Parser::unprocessed() const { return d->in->unprocessed(); }
+QStringRef Parser::encoding() const { return d->reader.documentEncoding(); }
 
-QString Parser::encoding() const { return d->in->encoding(); }
+}
diff --git a/src/xmpp/xmpp-core/parser.h b/src/xmpp/xmpp-core/parser.h
index 8b153186..b4039ed9 100644
--- a/src/xmpp/xmpp-core/parser.h
+++ b/src/xmpp/xmpp-core/parser.h
@@ -1,6 +1,6 @@
 /*
  * parser.h - parse an XMPP "document"
- * Copyright (C) 2003  Justin Karneges
+ * Copyright (C) 2003-2020  Justin Karneges, Sergey Ilinykh
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,14 +20,20 @@
 #ifndef PARSER_H
 #define PARSER_H
 
-#include <qdom.h>
-#include <qxml.h>
+#include <QDomElement>
+#include <QExplicitlySharedDataPointer>
+#include <QXmlStreamAttributes>
+
+#include <memory>
 
 namespace XMPP {
+
 class Parser {
 public:
-    Parser();
-    ~Parser();
+    struct NSPrefix {
+        QString name;
+        QString value;
+    };
 
     class Event {
     public:
@@ -44,10 +50,10 @@ class Parser {
         QString nsprefix(const QString &s = QString()) const;
 
         // for document open / close
-        QString        namespaceURI() const;
-        QString        localName() const;
-        QString        qName() const;
-        QXmlAttributes atts() const;
+        QString              namespaceURI() const;
+        QString              localName() const;
+        QString              qName() const;
+        QXmlStreamAttributes atts() const;
 
         // for element
         QDomElement element() const;
@@ -57,27 +63,32 @@ class Parser {
 
         // setup
         void setDocumentOpen(const QString &namespaceURI, const QString &localName, const QString &qName,
-                             const QXmlAttributes &atts, const QStringList &nsnames, const QStringList &nsvalues);
+                             const QXmlStreamAttributes &atts, const QXmlStreamNamespaceDeclarations &nsPrefixes);
         void setDocumentClose(const QString &namespaceURI, const QString &localName, const QString &qName);
         void setElement(const QDomElement &elem);
         void setError();
         void setActualString(const QString &);
 
     private:
+        void ensureD();
         class Private;
-        Private *d;
+        QExplicitlySharedDataPointer<Private> d;
     };
 
+    Parser();
+    ~Parser();
+
     void       reset();
     void       appendData(const QByteArray &a);
     Event      readNext();
     QByteArray unprocessed() const;
-    QString    encoding() const;
+    QStringRef encoding() const;
 
 private:
     class Private;
-    Private *d;
+    std::unique_ptr<Private> d;
 };
+
 } // namespace XMPP
 
 #endif // PARSER_H
diff --git a/src/xmpp/xmpp-core/protocol.cpp b/src/xmpp/xmpp-core/protocol.cpp
index 14ae2174..1bf8e88d 100644
--- a/src/xmpp/xmpp-core/protocol.cpp
+++ b/src/xmpp/xmpp-core/protocol.cpp
@@ -419,12 +419,12 @@ void BasicProtocol::handleDocOpen(const Parser::Event &pe)
     }
 
     if (pe.namespaceURI() == NS_ETHERX && pe.localName() == "stream") {
-        QXmlAttributes atts = pe.atts();
+        auto atts = pe.atts();
 
         // grab the version
-        int     major  = 0;
-        int     minor  = 0;
-        QString verstr = atts.value("version");
+        int  major  = 0;
+        int  minor  = 0;
+        auto verstr = atts.value("version");
         if (!verstr.isEmpty()) {
             int n = verstr.indexOf('.');
             if (n != -1) {
@@ -438,16 +438,16 @@ void BasicProtocol::handleDocOpen(const Parser::Event &pe)
         version = Version(major, minor);
 
         if (isIncoming()) {
-            to               = atts.value("to");
-            QString peerLang = atts.value(NS_XML, "lang");
+            to            = atts.value("to").toString();
+            auto peerLang = atts.value(NS_XML, "lang");
             if (!peerLang.isEmpty())
-                lang = peerLang;
+                lang = peerLang.toString();
         }
         // outgoing
         else {
-            from = atts.value("from");
-            lang = atts.value(NS_XML, "lang");
-            id   = atts.value("id");
+            from = atts.value("from").toString();
+            lang = atts.value(NS_XML, "lang").toString();
+            id   = atts.value("id").toString();
         }
 
         handleStreamOpen(pe);
diff --git a/src/xmpp/xmpp-core/xmlprotocol.cpp b/src/xmpp/xmpp-core/xmlprotocol.cpp
index f5de5863..98268818 100644
--- a/src/xmpp/xmpp-core/xmlprotocol.cpp
+++ b/src/xmpp/xmpp-core/xmlprotocol.cpp
@@ -361,7 +361,7 @@ bool XmlProtocol::processStep()
     return baseStep(pe);
 }
 
-QString XmlProtocol::xmlEncoding() const { return xml.encoding(); }
+QString XmlProtocol::xmlEncoding() const { return xml.encoding().toString(); }
 
 QString XmlProtocol::elementToString(const QDomElement &e, bool clip)
 {

From d05322aad9af53a5c0b25238cc00ec31a68f75fd Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Thu, 11 Jun 2020 00:32:04 +0300
Subject: [PATCH 208/383] An attemp to fix build in Haiku OS

---
 src/xmpp/CMakeLists.txt       | 6 ++++++
 src/xmpp/blake2/blake2b-ref.c | 4 ++--
 src/xmpp/blake2/blake2s-ref.c | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/xmpp/CMakeLists.txt b/src/xmpp/CMakeLists.txt
index 7b2d6885..c0a24b5b 100644
--- a/src/xmpp/CMakeLists.txt
+++ b/src/xmpp/CMakeLists.txt
@@ -172,12 +172,18 @@ set(SOURCES
     xmpp-im/xmpp_features.cpp
     )
 
+if(NOT MSVC)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
+endif()
+
 add_library(iris
     STATIC
     ${HEADERS}
     ${SOURCES}
 )
 
+set_property(TARGET iris PROPERTY C_STANDARD 11)
+
 if(B2_FOUND)
     message(STATUS "Building with system blake2 library")
     target_compile_definitions(iris PUBLIC IRIS_SYSTEM_BLAKE2)
diff --git a/src/xmpp/blake2/blake2b-ref.c b/src/xmpp/blake2/blake2b-ref.c
index a09b7f35..f046c4c7 100644
--- a/src/xmpp/blake2/blake2b-ref.c
+++ b/src/xmpp/blake2/blake2b-ref.c
@@ -22,8 +22,8 @@
 #include <string.h>
 
 /* Padded structs result in a compile-time error */
-static_assert(sizeof(blake2s_param) == BLAKE2S_OUTBYTES, "sizeof(blake2s_param) != BLAKE2S_OUTBYTES");
-static_assert(sizeof(blake2b_param) == BLAKE2B_OUTBYTES, "sizeof(blake2b_param) != BLAKE2B_OUTBYTES");
+_Static_assert(sizeof(blake2s_param) == BLAKE2S_OUTBYTES, "sizeof(blake2s_param) != BLAKE2S_OUTBYTES");
+_Static_assert(sizeof(blake2b_param) == BLAKE2B_OUTBYTES, "sizeof(blake2b_param) != BLAKE2B_OUTBYTES");
 
 static const uint64_t blake2b_IV[8] =
 {
diff --git a/src/xmpp/blake2/blake2s-ref.c b/src/xmpp/blake2/blake2s-ref.c
index fe799669..4c3e1324 100644
--- a/src/xmpp/blake2/blake2s-ref.c
+++ b/src/xmpp/blake2/blake2s-ref.c
@@ -22,8 +22,8 @@
 #include <string.h>
 
 /* Padded structs result in a compile-time error */
-static_assert(sizeof(blake2s_param) == BLAKE2S_OUTBYTES, "sizeof(blake2s_param) != BLAKE2S_OUTBYTES");
-static_assert(sizeof(blake2b_param) == BLAKE2B_OUTBYTES, "sizeof(blake2b_param) != BLAKE2B_OUTBYTES");
+_Static_assert(sizeof(blake2s_param) == BLAKE2S_OUTBYTES, "sizeof(blake2s_param) != BLAKE2S_OUTBYTES");
+_Static_assert(sizeof(blake2b_param) == BLAKE2B_OUTBYTES, "sizeof(blake2b_param) != BLAKE2B_OUTBYTES");
 
 static const uint32_t blake2s_IV[8] =
 {

From 4ce94a3a48f2021112cfd8c777211e1599d5f7ea Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Thu, 11 Jun 2020 01:27:06 +0300
Subject: [PATCH 209/383] Fix build in debug mode

---
 src/xmpp/xmpp-core/parser.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/xmpp/xmpp-core/parser.cpp b/src/xmpp/xmpp-core/parser.cpp
index e58024e6..5046e341 100644
--- a/src/xmpp/xmpp-core/parser.cpp
+++ b/src/xmpp/xmpp-core/parser.cpp
@@ -245,7 +245,8 @@ class Parser::Private {
             qPrintable(
                 QString("XML reader hasn't reported open/close tags mismatch. expected close for <%1 xmlns=\"%2\"> "
                         "but got close for <%3 xmlns=\"%4\">")
-                    .arg(curElement.tagName(), curElement.namespaceURI(), reader.name(), reader.namespaceUri())));
+                    .arg(curElement.tagName(), curElement.namespaceURI(), reader.name().toString(),
+                         reader.namespaceUri().toString())));
 #if 0
         if (element.isNull()) {
             Event e;

From 12e5ab7dff2c0237927b906190b4911efe804a3a Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sat, 13 Jun 2020 00:49:18 +0300
Subject: [PATCH 210/383] Added DiscoItem::findExtension to find extension by
 XData::Type and registrar

---
 src/xmpp/xmpp-im/xmpp_discoitem.cpp         | 10 ++++++++++
 src/xmpp/xmpp-im/xmpp_discoitem.h           |  1 +
 src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp | 13 ++++++-------
 src/xmpp/xmpp-im/xmpp_xdata.cpp             |  5 ++++-
 src/xmpp/xmpp-im/xmpp_xdata.h               | 12 ++++++------
 5 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/src/xmpp/xmpp-im/xmpp_discoitem.cpp b/src/xmpp/xmpp-im/xmpp_discoitem.cpp
index 11fdd536..0485006f 100644
--- a/src/xmpp/xmpp-im/xmpp_discoitem.cpp
+++ b/src/xmpp/xmpp-im/xmpp_discoitem.cpp
@@ -249,6 +249,16 @@ void DiscoItem::setIdentities(const Identities &i)
 
 const QList<XData> &DiscoItem::extensions() const { return d->exts; }
 
+XData DiscoItem::findExtension(XData::Type xdataType, const QString &formType) const
+{
+    for (const auto &x : d->exts) {
+        if (x.type() == xdataType && (formType.isEmpty() || x.registrarType() == formType)) {
+            return x;
+        }
+    }
+    return XData(XData::Data_Invalid);
+}
+
 void DiscoItem::setExtensions(const QList<XData> &extlist) { d->exts = extlist; }
 
 XData DiscoItem::registeredExtension(const QString &ns) const
diff --git a/src/xmpp/xmpp-im/xmpp_discoitem.h b/src/xmpp/xmpp-im/xmpp_discoitem.h
index a0545bd3..281c33d1 100644
--- a/src/xmpp/xmpp-im/xmpp_discoitem.h
+++ b/src/xmpp/xmpp-im/xmpp_discoitem.h
@@ -75,6 +75,7 @@ class DiscoItem {
     inline void       setIdentities(const Identity &id) { setIdentities(Identities() << id); }
 
     const QList<XData> &extensions() const;
+    XData               findExtension(XData::Type xdataType, const QString &formType = QString()) const;
     void                setExtensions(const QList<XData> &extlist);
     XData               registeredExtension(const QString &ns) const;
 
diff --git a/src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp b/src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp
index 70de73bf..505070d1 100644
--- a/src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp
+++ b/src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp
@@ -271,13 +271,12 @@ void ServerInfoManager::disco_finished()
                 _hasPEP = true;
         }
 
-        for (const auto &x : jt->item().extensions()) {
-            if (x.type() == XData::Data_Result
-                && x.registrarType() == QLatin1String("http://jabber.org/network/serverinfo")) {
-                for (const auto &f : x.fields()) {
-                    if (f.type() == XData::Field::Field_ListMulti) {
-                        _extraServerInfo.insert(f.var(), f.value()); // covers XEP-0157
-                    }
+        auto servInfo
+            = jt->item().findExtension(XData::Data_Result, QLatin1String("http://jabber.org/network/serverinfo"));
+        if (servInfo.isValid()) {
+            for (const auto &f : servInfo.fields()) {
+                if (f.type() == XData::Field::Field_ListMulti) {
+                    _extraServerInfo.insert(f.var(), f.value()); // covers XEP-0157
                 }
             }
         }
diff --git a/src/xmpp/xmpp-im/xmpp_xdata.cpp b/src/xmpp/xmpp-im/xmpp_xdata.cpp
index a2e2954a..c399c53d 100644
--- a/src/xmpp/xmpp-im/xmpp_xdata.cpp
+++ b/src/xmpp/xmpp-im/xmpp_xdata.cpp
@@ -314,7 +314,7 @@ bool XData::Field::MediaElement::checkSupport(const QStringList &wildcards)
 // XData
 //----------------------------------------------------------------------------
 
-XData::XData() : d(new Private) { d->type = Data_Form; }
+XData::XData(Type type) : d(new Private) { d->type = type; }
 
 QString XData::title() const { return d->title; }
 
@@ -468,6 +468,9 @@ const QList<XData::ReportItem> &XData::reportItems() const { return d->reportIte
 
 bool XData::isValid() const
 {
+    if (d->type == Data_Invalid)
+        return false;
+
     for (const Field &f : d->fields) {
         if (!f.isValid())
             return false;
diff --git a/src/xmpp/xmpp-im/xmpp_xdata.h b/src/xmpp/xmpp-im/xmpp_xdata.h
index 34833fba..1b268bd9 100644
--- a/src/xmpp/xmpp-im/xmpp_xdata.h
+++ b/src/xmpp/xmpp-im/xmpp_xdata.h
@@ -34,7 +34,9 @@ class QDomElement;
 namespace XMPP {
 class XData {
 public:
-    XData();
+    enum Type { Data_Form, Data_Result, Data_Submit, Data_Cancel, Data_Invalid };
+
+    XData(Type type = Data_Form);
 
     QString title() const;
     void    setTitle(const QString &);
@@ -42,8 +44,6 @@ class XData {
     QString instructions() const;
     void    setInstructions(const QString &);
 
-    enum Type { Data_Form, Data_Result, Data_Submit, Data_Cancel };
-
     Type    type() const;
     void    setType(Type);
     QString registrarType() const;
@@ -151,9 +151,9 @@ class XData {
     typedef QList<Field> FieldList;
 
     const FieldList &fields() const;
-    Field     getField(const QString &var) const;
-    Field &   fieldRef(const QString &var);
-    void      setFields(const FieldList &fl);
+    Field            getField(const QString &var) const;
+    Field &          fieldRef(const QString &var);
+    void             setFields(const FieldList &fl);
 
 private:
     class Private : public QSharedData {

From 9d84cfde1c956b2a91bb16c893f8504773924040 Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Mon, 22 Jun 2020 13:39:24 +0300
Subject: [PATCH 211/383] Updated blake2b-ref.c and blake2s-ref.c. Removed
 static_asserts because those checks are present in blake2qt.cpp and the
 result of check anyway will be compile-time error.

---
 src/xmpp/blake2/blake2b-ref.c | 5 -----
 src/xmpp/blake2/blake2s-ref.c | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/src/xmpp/blake2/blake2b-ref.c b/src/xmpp/blake2/blake2b-ref.c
index f046c4c7..ab5fbde8 100644
--- a/src/xmpp/blake2/blake2b-ref.c
+++ b/src/xmpp/blake2/blake2b-ref.c
@@ -16,15 +16,10 @@
 #include "blake2-impl.h"
 #include "blake2.h"
 
-#include <assert.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 
-/* Padded structs result in a compile-time error */
-_Static_assert(sizeof(blake2s_param) == BLAKE2S_OUTBYTES, "sizeof(blake2s_param) != BLAKE2S_OUTBYTES");
-_Static_assert(sizeof(blake2b_param) == BLAKE2B_OUTBYTES, "sizeof(blake2b_param) != BLAKE2B_OUTBYTES");
-
 static const uint64_t blake2b_IV[8] =
 {
   0x6a09e667f3bcc908ULL, 0xbb67ae8584caa73bULL,
diff --git a/src/xmpp/blake2/blake2s-ref.c b/src/xmpp/blake2/blake2s-ref.c
index 4c3e1324..f4e09dfc 100644
--- a/src/xmpp/blake2/blake2s-ref.c
+++ b/src/xmpp/blake2/blake2s-ref.c
@@ -16,15 +16,10 @@
 #include "blake2-impl.h"
 #include "blake2.h"
 
-#include <assert.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 
-/* Padded structs result in a compile-time error */
-_Static_assert(sizeof(blake2s_param) == BLAKE2S_OUTBYTES, "sizeof(blake2s_param) != BLAKE2S_OUTBYTES");
-_Static_assert(sizeof(blake2b_param) == BLAKE2B_OUTBYTES, "sizeof(blake2b_param) != BLAKE2B_OUTBYTES");
-
 static const uint32_t blake2s_IV[8] =
 {
   0x6A09E667UL, 0xBB67AE85UL, 0x3C6EF372UL, 0xA54FF53AUL,

From bb6181b7b2ede2dd23f56f501fb24d18522399da Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 30 Jun 2020 00:03:16 +0300
Subject: [PATCH 212/383] Reset current capsSpec version every time we change
 software information since it's included into disco

---
 src/xmpp/xmpp-im/client.cpp | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
index 3c1f2bbb..d044b7f5 100644
--- a/src/xmpp/xmpp-im/client.cpp
+++ b/src/xmpp/xmpp-im/client.cpp
@@ -1088,9 +1088,19 @@ CapsSpec Client::caps() const { return d->caps; }
 
 CapsSpec Client::serverCaps() const { return d->serverCaps; }
 
-void Client::setOSName(const QString &name) { d->osName = name; }
+void Client::setOSName(const QString &name)
+{
+    if (d->osName != name)
+        d->caps.resetVersion();
+    d->osName = name;
+}
 
-void Client::setOSVersion(const QString &version) { d->osVersion = version; }
+void Client::setOSVersion(const QString &version)
+{
+    if (d->osVersion != version)
+        d->caps.resetVersion();
+    d->osVersion = version;
+}
 
 void Client::setTimeZone(const QString &name, int offset)
 {
@@ -1099,9 +1109,19 @@ void Client::setTimeZone(const QString &name, int offset)
     d->useTzoffset = true;
 }
 
-void Client::setClientName(const QString &s) { d->clientName = s; }
+void Client::setClientName(const QString &s)
+{
+    if (d->clientName != s)
+        d->caps.resetVersion();
+    d->clientName = s;
+}
 
-void Client::setClientVersion(const QString &s) { d->clientVersion = s; }
+void Client::setClientVersion(const QString &s)
+{
+    if (d->clientVersion != s)
+        d->caps.resetVersion();
+    d->clientVersion = s;
+}
 
 void Client::setCaps(const CapsSpec &s) { d->caps = s; }
 

From 13e00658083d93deefcccf1de85a945d74e8c3ed Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 30 Jun 2020 00:05:10 +0300
Subject: [PATCH 213/383] Removed unused function

---
 src/xmpp/xmpp-im/client.cpp | 37 -------------------------------------
 1 file changed, 37 deletions(-)

diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
index d044b7f5..273f91fd 100644
--- a/src/xmpp/xmpp-im/client.cpp
+++ b/src/xmpp/xmpp-im/client.cpp
@@ -504,43 +504,6 @@ void Client::streamCloseFinished()
     closeFinished();
 }*/
 
-static QDomElement oldStyleNS(const QDomElement &e)
-{
-    // find closest parent with a namespace
-    QDomNode par = e.parentNode();
-    while (!par.isNull() && par.namespaceURI().isNull())
-        par = par.parentNode();
-    bool noShowNS = false;
-    if (!par.isNull() && par.namespaceURI() == e.namespaceURI())
-        noShowNS = true;
-
-    QDomElement i;
-    int         x;
-    // if(noShowNS)
-    i = e.ownerDocument().createElement(e.tagName());
-    // else
-    //    i = e.ownerDocument().createElementNS(e.namespaceURI(), e.tagName());
-
-    // copy attributes
-    QDomNamedNodeMap al = e.attributes();
-    for (x = 0; x < al.count(); ++x)
-        i.setAttributeNode(al.item(x).cloneNode().toAttr());
-
-    if (!noShowNS)
-        i.setAttribute("xmlns", e.namespaceURI());
-
-    // copy children
-    QDomNodeList nl = e.childNodes();
-    for (x = 0; x < nl.count(); ++x) {
-        QDomNode n = nl.item(x);
-        if (n.isElement())
-            i.appendChild(oldStyleNS(n.toElement()));
-        else
-            i.appendChild(n.cloneNode());
-    }
-    return i;
-}
-
 void Client::streamReadyRead()
 {
     // fprintf(stderr, "\tClientStream::streamReadyRead\n");

From d19dbc740fd832cdc898d88f0d0c7110778b941f Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Thu, 9 Jul 2020 15:11:48 +0300
Subject: [PATCH 214/383] Drop LibIDN dependency in favour of bundled
 stringprep

---
 3rdparty/stringprep/CMakeLists.txt      |   30 +
 3rdparty/stringprep/CMakeLists.txt.user |  361 ++
 3rdparty/stringprep/COPYING             |   30 +
 3rdparty/stringprep/README.md           |    3 +
 3rdparty/stringprep/profiles.cpp        |  246 ++
 3rdparty/stringprep/qstringprep.h       |  180 +
 3rdparty/stringprep/rfc3454.cpp         | 4763 +++++++++++++++++++++++
 3rdparty/stringprep/rfc3454.h           |   20 +
 3rdparty/stringprep/stringprep.cpp      |  515 +++
 3rdparty/stringprep/stringprep.pri      |    7 +
 3rdparty/stringprep/stringprep.pro      |    8 +
 CMakeLists.txt                          |    2 +-
 cmake/modules/FindIDN.cmake             |   77 -
 configure                               |  221 +-
 configure.exe                           |  Bin 125280 -> 124424 bytes
 iris.pri                                |    5 -
 iris.qc                                 |    3 -
 qcm/idn.qcm                             |   56 -
 qcm/qca.qcm                             |  215 +-
 src/irisnet/corelib/netnames.cpp        |    1 -
 src/irisnet/noncore/noncore.pro         |    2 +-
 src/xmpp/CMakeLists.txt                 |    3 +-
 src/xmpp/jid/jid.cpp                    |   38 +-
 src/xmpp/modules.pri                    |    1 +
 src/xmpp/xmpp.pri                       |    1 +
 src/xmpp/xmpp.pro                       |    2 +-
 26 files changed, 6353 insertions(+), 437 deletions(-)
 create mode 100644 3rdparty/stringprep/CMakeLists.txt
 create mode 100644 3rdparty/stringprep/CMakeLists.txt.user
 create mode 100644 3rdparty/stringprep/COPYING
 create mode 100644 3rdparty/stringprep/README.md
 create mode 100644 3rdparty/stringprep/profiles.cpp
 create mode 100644 3rdparty/stringprep/qstringprep.h
 create mode 100644 3rdparty/stringprep/rfc3454.cpp
 create mode 100644 3rdparty/stringprep/rfc3454.h
 create mode 100644 3rdparty/stringprep/stringprep.cpp
 create mode 100644 3rdparty/stringprep/stringprep.pri
 create mode 100644 3rdparty/stringprep/stringprep.pro
 delete mode 100644 cmake/modules/FindIDN.cmake
 delete mode 100644 qcm/idn.qcm

diff --git a/3rdparty/stringprep/CMakeLists.txt b/3rdparty/stringprep/CMakeLists.txt
new file mode 100644
index 00000000..1f2ddd69
--- /dev/null
+++ b/3rdparty/stringprep/CMakeLists.txt
@@ -0,0 +1,30 @@
+cmake_minimum_required(VERSION 3.1.2)
+
+project(stringprep LANGUAGES CXX)
+
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+if(CMAKE_VERSION VERSION_LESS "3.7.0")
+    set(CMAKE_INCLUDE_CURRENT_DIR ON)
+endif()
+
+find_package(Qt5 COMPONENTS Core REQUIRED)
+
+add_library(stringprep STATIC
+  stringprep.cpp
+  profiles.cpp
+  rfc3454.cpp
+)
+target_compile_definitions(stringprep PRIVATE LIBIDN_BUILDING)
+target_include_directories(stringprep PUBLIC
+  ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+if(MSVC)
+  target_compile_definitions(stringprep PRIVATE _CRT_SECURE_NO_WARNINGS _GENERATED_STDINT_H)
+endif()
+
+target_link_libraries(stringprep Qt5::Core)
diff --git a/3rdparty/stringprep/CMakeLists.txt.user b/3rdparty/stringprep/CMakeLists.txt.user
new file mode 100644
index 00000000..7e6a4fbf
--- /dev/null
+++ b/3rdparty/stringprep/CMakeLists.txt.user
@@ -0,0 +1,361 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE QtCreatorProject>
+<!-- Written by QtCreator 4.12.4, 2020-07-09T00:49:31. -->
+<qtcreator>
+ <data>
+  <variable>EnvironmentId</variable>
+  <value type="QByteArray">{e9dbd3dd-4147-44c5-8d24-28818ff28a88}</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.ActiveTarget</variable>
+  <value type="int">0</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.EditorSettings</variable>
+  <valuemap type="QVariantMap">
+   <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
+   <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
+   <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
+   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
+    <value type="QString" key="language">Cpp</value>
+    <valuemap type="QVariantMap" key="value">
+     <value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
+    </valuemap>
+   </valuemap>
+   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
+    <value type="QString" key="language">QmlJS</value>
+    <valuemap type="QVariantMap" key="value">
+     <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
+    </valuemap>
+   </valuemap>
+   <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
+   <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
+   <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
+   <value type="int" key="EditorConfiguration.IndentSize">4</value>
+   <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
+   <value type="int" key="EditorConfiguration.MarginColumn">80</value>
+   <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
+   <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
+   <value type="int" key="EditorConfiguration.PaddingMode">1</value>
+   <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
+   <value type="bool" key="EditorConfiguration.ShowMargin">false</value>
+   <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
+   <value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value>
+   <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
+   <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
+   <value type="int" key="EditorConfiguration.TabSize">8</value>
+   <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
+   <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
+   <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
+   <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
+   <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
+   <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.PluginSettings</variable>
+  <valuemap type="QVariantMap">
+   <valuelist type="QVariantList" key="ClangCodeModel.CustomCommandLineKey"/>
+   <value type="bool" key="ClangCodeModel.UseGlobalConfig">true</value>
+   <value type="QString" key="ClangCodeModel.WarningConfigId">Builtin.Questionable</value>
+   <valuemap type="QVariantMap" key="ClangTools">
+    <value type="bool" key="ClangTools.BuildBeforeAnalysis">true</value>
+    <value type="QString" key="ClangTools.DiagnosticConfig">Builtin.DefaultTidyAndClazy</value>
+    <value type="int" key="ClangTools.ParallelJobs">6</value>
+    <valuelist type="QVariantList" key="ClangTools.SelectedDirs"/>
+    <valuelist type="QVariantList" key="ClangTools.SelectedFiles"/>
+    <valuelist type="QVariantList" key="ClangTools.SuppressedDiagnostics"/>
+    <value type="bool" key="ClangTools.UseGlobalSettings">true</value>
+   </valuemap>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Target.0</variable>
+  <valuemap type="QVariantMap">
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 5.15.0 в PATH (qt5)</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Qt 5.15.0 в PATH (qt5)</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{f6433f79-d84b-4783-82dd-ce57d2700763}</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
+    <valuelist type="QVariantList" key="CMake.Configuration">
+     <value type="QString">CMAKE_BUILD_TYPE:STRING=Debug</value>
+     <value type="QString">CMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx}</value>
+     <value type="QString">CMAKE_C_COMPILER:STRING=%{Compiler:Executable:C}</value>
+     <value type="QString">CMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX}</value>
+     <value type="QString">QT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable}</value>
+    </valuelist>
+    <value type="int" key="EnableQmlDebugging">2</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/rion/projects/psi/git/iris/3rdparty/build-stringprep-Qt_5_15_0_PATH_qt5-Debug</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>
+      <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
+       <value type="QString">all</value>
+      </valuelist>
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Сборка</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Сборка</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>
+      <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
+       <value type="QString">clean</value>
+      </valuelist>
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Очистка</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Очистка</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Отладка</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeBuildConfiguration</value>
+   </valuemap>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
+    <valuelist type="QVariantList" key="CMake.Configuration">
+     <value type="QString">CMAKE_BUILD_TYPE:STRING=Release</value>
+     <value type="QString">CMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx}</value>
+     <value type="QString">CMAKE_C_COMPILER:STRING=%{Compiler:Executable:C}</value>
+     <value type="QString">CMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX}</value>
+     <value type="QString">QT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable}</value>
+    </valuelist>
+    <value type="int" key="EnableQmlDebugging">2</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/rion/projects/psi/git/iris/3rdparty/build-stringprep-Qt_5_15_0_PATH_qt5-Release</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>
+      <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
+       <value type="QString">all</value>
+      </valuelist>
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Сборка</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Сборка</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>
+      <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
+       <value type="QString">clean</value>
+      </valuelist>
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Очистка</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Очистка</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Выпуск</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeBuildConfiguration</value>
+   </valuemap>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
+    <valuelist type="QVariantList" key="CMake.Configuration">
+     <value type="QString">CMAKE_BUILD_TYPE:STRING=RelWithDebInfo</value>
+     <value type="QString">CMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx}</value>
+     <value type="QString">CMAKE_C_COMPILER:STRING=%{Compiler:Executable:C}</value>
+     <value type="QString">CMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX}</value>
+     <value type="QString">QT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable}</value>
+    </valuelist>
+    <value type="int" key="EnableQmlDebugging">2</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/rion/projects/psi/git/iris/3rdparty/build-stringprep-Qt_5_15_0_PATH_qt5-RelWithDebInfo</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>
+      <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
+       <value type="QString">all</value>
+      </valuelist>
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Сборка</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Сборка</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>
+      <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
+       <value type="QString">clean</value>
+      </valuelist>
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Очистка</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Очистка</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Выпуск с отладочной информацией</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeBuildConfiguration</value>
+   </valuemap>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.3">
+    <valuelist type="QVariantList" key="CMake.Configuration">
+     <value type="QString">CMAKE_BUILD_TYPE:STRING=MinSizeRel</value>
+     <value type="QString">CMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx}</value>
+     <value type="QString">CMAKE_C_COMPILER:STRING=%{Compiler:Executable:C}</value>
+     <value type="QString">CMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX}</value>
+     <value type="QString">QT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable}</value>
+    </valuelist>
+    <value type="int" key="EnableQmlDebugging">2</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/rion/projects/psi/git/iris/3rdparty/build-stringprep-Qt_5_15_0_PATH_qt5-MinSizeRel</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>
+      <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
+       <value type="QString">all</value>
+      </valuelist>
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Сборка</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Сборка</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>
+      <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
+       <value type="QString">clean</value>
+      </valuelist>
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Очистка</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Очистка</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Выпуск минимального размера</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeBuildConfiguration</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">4</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Развёртывание</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Развёртывание</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.DeployConfiguration.CustomData"/>
+    <value type="bool" key="ProjectExplorer.DeployConfiguration.CustomDataEnabled">false</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
+    <value type="QString" key="Analyzer.Perf.CallgraphMode">dwarf</value>
+    <valuelist type="QVariantList" key="Analyzer.Perf.Events">
+     <value type="QString">cpu-cycles</value>
+    </valuelist>
+    <valuelist type="QVariantList" key="Analyzer.Perf.ExtraArguments"/>
+    <value type="int" key="Analyzer.Perf.Frequency">250</value>
+    <valuelist type="QVariantList" key="Analyzer.Perf.RecordArguments">
+     <value type="QString">-e</value>
+     <value type="QString">cpu-cycles</value>
+     <value type="QString">--call-graph</value>
+     <value type="QString">dwarf,4096</value>
+     <value type="QString">-F</value>
+     <value type="QString">250</value>
+    </valuelist>
+    <value type="QString" key="Analyzer.Perf.SampleMode">-F</value>
+    <value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>
+    <value type="int" key="Analyzer.Perf.StackSize">4096</value>
+    <value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
+    <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
+    <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value>
+    <value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
+    <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
+    <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
+    <value type="QString" key="Analyzer.Valgrind.KCachegrindExecutable">kcachegrind</value>
+    <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
+    <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
+    <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
+    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
+    <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
+    <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
+    <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
+     <value type="int">0</value>
+     <value type="int">1</value>
+     <value type="int">2</value>
+     <value type="int">3</value>
+     <value type="int">4</value>
+     <value type="int">5</value>
+     <value type="int">6</value>
+     <value type="int">7</value>
+     <value type="int">8</value>
+     <value type="int">9</value>
+     <value type="int">10</value>
+     <value type="int">11</value>
+     <value type="int">12</value>
+     <value type="int">13</value>
+     <value type="int">14</value>
+    </valuelist>
+    <value type="int" key="PE.EnvironmentAspect.Base">2</value>
+    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
+    <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Executable"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value>
+    <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey"></value>
+    <value type="QString" key="RunConfiguration.Arguments"></value>
+    <value type="bool" key="RunConfiguration.Arguments.multi">false</value>
+    <value type="QString" key="RunConfiguration.OverrideDebuggerStartup"></value>
+    <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
+    <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
+    <value type="QString" key="RunConfiguration.WorkingDirectory"></value>
+    <value type="QString" key="RunConfiguration.WorkingDirectory.default"></value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.TargetCount</variable>
+  <value type="int">1</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
+  <value type="int">22</value>
+ </data>
+ <data>
+  <variable>Version</variable>
+  <value type="int">22</value>
+ </data>
+</qtcreator>
diff --git a/3rdparty/stringprep/COPYING b/3rdparty/stringprep/COPYING
new file mode 100644
index 00000000..e6ea90ab
--- /dev/null
+++ b/3rdparty/stringprep/COPYING
@@ -0,0 +1,30 @@
+Libidn COPYING -- Explanation of licensing conditions.
+Copyright (C) 2002-2015 Simon Josefsson
+See the end for copying conditions.
+
+The source code for the C library (libidn.a or libidn.so), the C#
+library (Libidn.dll) and the Java library (libidn-*.jar) are licensed
+under the terms of either the GNU General Public License version 2.0
+or later (see the file COPYINGv2) or the GNU Lesser General Public
+License version 3.0 or later (see the file COPYING.LESSERv3), or both
+in parallel as here.
+
+The author of the Java library has agreed to also distribute it under
+the Apache License Version 2.0 (see the file java/LICENSE-2.0).
+
+The manual is licensed under the GNU Free Documentation License,
+Version 1.3 or any later.
+
+The command line tool, self tests, examples, and other auxilliary
+files, are licensed under the GNU General Public License version 3.0
+or later.
+
+Other files are licensed as indicated in each file.
+
+There may be exceptions to these general rules, see each file for
+precise information.
+
+----------------------------------------------------------------------
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.
diff --git a/3rdparty/stringprep/README.md b/3rdparty/stringprep/README.md
new file mode 100644
index 00000000..e9b753b4
--- /dev/null
+++ b/3rdparty/stringprep/README.md
@@ -0,0 +1,3 @@
+This is a stringprep library extracted from LibIDN and slightly rewritten to use Qt's unicode support instead glib's one.
+
+The current version corresponds to 86e84739c5186faf3722a0f42e1e2db27870b3a5 commit of git://git.savannah.gnu.org/libidn.git
diff --git a/3rdparty/stringprep/profiles.cpp b/3rdparty/stringprep/profiles.cpp
new file mode 100644
index 00000000..f63a532a
--- /dev/null
+++ b/3rdparty/stringprep/profiles.cpp
@@ -0,0 +1,246 @@
+/* profiles.c --- Definitions of stringprep profiles.
+   Copyright (C) 2002-2016 Simon Josefsson
+
+   This file is part of GNU Libidn.
+
+   GNU Libidn is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Libidn is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>. */
+
+#include "qstringprep.h"
+#include "rfc3454.h"
+
+const Stringprep_profiles stringprep_profiles[] = { { "Nameprep", stringprep_nameprep },
+                                                    { "KRBprep", stringprep_kerberos5 }, /* Deprecate? */
+                                                    { "Nodeprep", stringprep_xmpp_nodeprep },
+                                                    { "Resourceprep", stringprep_xmpp_resourceprep },
+                                                    { "plain", stringprep_plain }, /* sasl-anon-00. */
+                                                    { "trace", stringprep_trace }, /* sasl-anon-01,02,03. */
+                                                    { "SASLprep", stringprep_saslprep },
+                                                    { "ISCSIprep", stringprep_iscsi }, /* Obsolete. */
+                                                    { "iSCSI", stringprep_iscsi },     /* IANA. */
+                                                    { NULL, NULL } };
+
+/* number of elements within an array */
+#define countof(a) (sizeof(a) / sizeof(*(a)))
+
+/* helper for profile definitions */
+#define TABLE(x) stringprep_rfc3454_##x, N_STRINGPREP_rfc3454_##x
+
+const Stringprep_profile stringprep_nameprep[]
+    = { { STRINGPREP_MAP_TABLE, 0, TABLE(B_1) },
+        { STRINGPREP_MAP_TABLE, 0, TABLE(B_2) },
+        { STRINGPREP_NFKC, 0, 0, 0 },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_1_2) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_2) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_3) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_4) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_5) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_6) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_7) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_8) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_9) },
+        { STRINGPREP_BIDI, 0, 0, 0 },
+        { STRINGPREP_BIDI_PROHIBIT_TABLE, ~STRINGPREP_NO_BIDI, TABLE(C_8) },
+        { STRINGPREP_BIDI_RAL_TABLE, 0, TABLE(D_1) },
+        { STRINGPREP_BIDI_L_TABLE, 0, TABLE(D_2) },
+        { STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED, TABLE(A_1) },
+        { 0 } };
+
+const Stringprep_profile stringprep_kerberos5[] = {
+    /* XXX this is likely to be wrong as the specification is
+       a rough draft. */
+    { STRINGPREP_MAP_TABLE, 0, TABLE(B_1) },
+    { STRINGPREP_MAP_TABLE, 0, TABLE(B_3) },
+    { STRINGPREP_NFKC, 0, 0, 0 },
+    { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_1_2) },
+    { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_2) },
+    { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_3) },
+    { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_4) },
+    { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_5) },
+    { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_6) },
+    { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_7) },
+    { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_8) },
+    { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_9) },
+    { STRINGPREP_BIDI, 0, 0, 0 },
+    { STRINGPREP_BIDI_PROHIBIT_TABLE, ~STRINGPREP_NO_BIDI, TABLE(C_8) },
+    { STRINGPREP_BIDI_RAL_TABLE, 0, TABLE(D_1) },
+    { STRINGPREP_BIDI_L_TABLE, 0, TABLE(D_2) },
+    { STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED, TABLE(A_1) },
+    { 0 }
+};
+
+const Stringprep_table_element stringprep_xmpp_nodeprep_prohibit[] = { { 0x000022, 0x000022 }, /* #x22 (") */
+                                                                       { 0x000026, 0x000026 }, /* #x26 (&) */
+                                                                       { 0x000027, 0x000027 }, /* #x27 (') */
+                                                                       { 0x00002F, 0x00002F }, /* #x2F (/) */
+                                                                       { 0x00003A, 0x00003A }, /* #x3A (:) */
+                                                                       { 0x00003C, 0x00003C }, /* #x3C (<) */
+                                                                       { 0x00003E, 0x00003E }, /* #x3E (>) */
+                                                                       { 0x000040, 0x000040 }, /* #x40 (@) */
+                                                                       { 0 } };
+
+const Stringprep_profile stringprep_xmpp_nodeprep[]
+    = { { STRINGPREP_MAP_TABLE, 0, TABLE(B_1) },
+        { STRINGPREP_MAP_TABLE, 0, TABLE(B_2) },
+        { STRINGPREP_NFKC, 0, 0, 0 },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_1_1) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_1_2) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_1) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_2) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_3) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_4) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_5) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_6) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_7) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_8) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_9) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, stringprep_xmpp_nodeprep_prohibit,
+          countof(stringprep_xmpp_nodeprep_prohibit) - 1 },
+        { STRINGPREP_BIDI, 0, 0, 0 },
+        { STRINGPREP_BIDI_PROHIBIT_TABLE, 0, TABLE(C_8) },
+        { STRINGPREP_BIDI_RAL_TABLE, 0, TABLE(D_1) },
+        { STRINGPREP_BIDI_L_TABLE, 0, TABLE(D_2) },
+        { STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED, TABLE(A_1) },
+        { 0 } };
+
+const Stringprep_profile stringprep_xmpp_resourceprep[]
+    = { { STRINGPREP_MAP_TABLE, 0, TABLE(B_1) },
+        { STRINGPREP_NFKC, 0, 0, 0 },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_1_2) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_1) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_2) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_3) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_4) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_5) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_6) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_7) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_8) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_9) },
+        { STRINGPREP_BIDI, 0, 0, 0 },
+        { STRINGPREP_BIDI_PROHIBIT_TABLE, 0, TABLE(C_8) },
+        { STRINGPREP_BIDI_RAL_TABLE, ~STRINGPREP_NO_BIDI, TABLE(D_1) },
+        { STRINGPREP_BIDI_L_TABLE, ~STRINGPREP_NO_BIDI, TABLE(D_2) },
+        { STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED, TABLE(A_1) },
+        { 0 } };
+
+const Stringprep_profile stringprep_plain[] = { { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_1) },
+                                                { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_2) },
+                                                { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_3) },
+                                                { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_4) },
+                                                { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_5) },
+                                                { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_6) },
+                                                { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_8) },
+                                                { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_9) },
+                                                { STRINGPREP_BIDI, 0, 0, 0 },
+                                                { STRINGPREP_BIDI_PROHIBIT_TABLE, 0, TABLE(C_8) },
+                                                { STRINGPREP_BIDI_RAL_TABLE, ~STRINGPREP_NO_BIDI, TABLE(D_1) },
+                                                { STRINGPREP_BIDI_L_TABLE, ~STRINGPREP_NO_BIDI, TABLE(D_2) },
+                                                { 0 } };
+
+const Stringprep_profile stringprep_trace[] = { { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_1) },
+                                                { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_2) },
+                                                { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_3) },
+                                                { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_4) },
+                                                { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_5) },
+                                                { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_6) },
+                                                { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_8) },
+                                                { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_9) },
+                                                { STRINGPREP_BIDI, 0, 0, 0 },
+                                                { STRINGPREP_BIDI_PROHIBIT_TABLE, 0, TABLE(C_8) },
+                                                { STRINGPREP_BIDI_RAL_TABLE, ~STRINGPREP_NO_BIDI, TABLE(D_1) },
+                                                { STRINGPREP_BIDI_L_TABLE, ~STRINGPREP_NO_BIDI, TABLE(D_2) },
+                                                { 0 } };
+
+const Stringprep_table_element stringprep_iscsi_prohibit[]
+    = { { 0x0000, 0x002C }, /* [ASCII CONTROL CHARACTERS and SPACE through ,] */
+        { 0x002F, 0x002F }, /* [ASCII /] */
+        { 0x003B, 0x0040 }, /* [ASCII ; through @] */
+        { 0x005B, 0x0060 }, /* [ASCII [ through `] */
+        { 0x007B, 0x007F }, /* [ASCII { through DEL] */
+        { 0x3002, 0x3002 }, /* ideographic full stop */
+        { 0 } };
+
+const Stringprep_profile stringprep_iscsi[]
+    = { { STRINGPREP_MAP_TABLE, 0, TABLE(B_1) },
+        { STRINGPREP_MAP_TABLE, 0, TABLE(B_2) },
+        { STRINGPREP_NFKC, 0, 0, 0 },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_1_1) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_1_2) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_1) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_2) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_3) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_4) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_5) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_6) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_7) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_8) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_9) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, stringprep_iscsi_prohibit, countof(stringprep_iscsi_prohibit) - 1 },
+        { STRINGPREP_BIDI, 0, 0, 0 },
+        { STRINGPREP_BIDI_PROHIBIT_TABLE, 0, TABLE(C_8) },
+        { STRINGPREP_BIDI_RAL_TABLE, ~STRINGPREP_NO_BIDI, TABLE(D_1) },
+        { STRINGPREP_BIDI_L_TABLE, ~STRINGPREP_NO_BIDI, TABLE(D_2) },
+        { STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED, TABLE(A_1) },
+        { 0 } };
+
+const Stringprep_table_element stringprep_saslprep_space_map[]
+    = { { 0x00A0, 0x00A0, { 0x0020 } }, /* 00A0; NO-BREAK SPACE */
+        { 0x1680, 0x1680, { 0x0020 } }, /* 1680; OGHAM SPACE MARK */
+        { 0x2000, 0x200B, { 0x0020 } }, /* 2000; EN QUAD */
+                                        /* 2001; EM QUAD */
+                                        /* 2002; EN SPACE */
+                                        /* 2003; EM SPACE */
+                                        /* 2004; THREE-PER-EM SPACE */
+                                        /* 2005; FOUR-PER-EM SPACE */
+                                        /* 2006; SIX-PER-EM SPACE */
+                                        /* 2007; FIGURE SPACE */
+                                        /* 2008; PUNCTUATION SPACE */
+                                        /* 2009; THIN SPACE */
+                                        /* 200A; HAIR SPACE */
+                                        /* 200B; ZERO WIDTH SPACE */
+        { 0x202F, 0x202F, { 0x0020 } }, /* 202F; NARROW NO-BREAK SPACE */
+        { 0x205F, 0x205F, { 0x0020 } }, /* 205F; MEDIUM MATHEMATICAL SPACE */
+        { 0x3000, 0x3000, { 0x0020 } }, /* 3000; IDEOGRAPHIC SPACE */
+        { 0 } };
+
+const Stringprep_profile stringprep_saslprep[]
+    = { { STRINGPREP_MAP_TABLE, 0, stringprep_saslprep_space_map, countof(stringprep_saslprep_space_map) - 1 },
+        { STRINGPREP_MAP_TABLE, 0, TABLE(B_1) },
+        { STRINGPREP_NFKC, 0, 0, 0 },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_1_2) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_1) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_2_2) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_3) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_4) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_5) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_6) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_7) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_8) },
+        { STRINGPREP_PROHIBIT_TABLE, 0, TABLE(C_9) },
+        { STRINGPREP_BIDI, 0, 0, 0 },
+        { STRINGPREP_BIDI_PROHIBIT_TABLE, 0, TABLE(C_8) },
+        { STRINGPREP_BIDI_RAL_TABLE, ~STRINGPREP_NO_BIDI, TABLE(D_1) },
+        { STRINGPREP_BIDI_L_TABLE, ~STRINGPREP_NO_BIDI, TABLE(D_2) },
+        { STRINGPREP_UNASSIGNED_TABLE, ~STRINGPREP_NO_UNASSIGNED, TABLE(A_1) },
+        { 0 } };
diff --git a/3rdparty/stringprep/qstringprep.h b/3rdparty/stringprep/qstringprep.h
new file mode 100644
index 00000000..8edd9536
--- /dev/null
+++ b/3rdparty/stringprep/qstringprep.h
@@ -0,0 +1,180 @@
+/* stringprep.h --- Header file for stringprep functions.
+   Copyright (C) 2002-2016 Simon Josefsson
+
+   This file is part of GNU Libidn.
+
+   GNU Libidn is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Libidn is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>. */
+
+#ifndef STRINGPREP_H
+#define STRINGPREP_H
+
+#include <QtCore/QtGlobal>
+
+#if defined(LIBIDN_BUILDING)
+#define IDNAPI Q_DECL_EXPORT
+#else
+#define IDNAPI Q_DECL_IMPORT
+#endif
+
+#include <stddef.h> /* size_t */
+#include <stdint.h> /* uint32_t */
+
+class QString;
+
+#define STRINGPREP_VERSION "1.35"
+
+/* Error codes. */
+typedef enum {
+    STRINGPREP_OK = 0,
+    /* Stringprep errors. */
+    STRINGPREP_CONTAINS_UNASSIGNED      = 1,
+    STRINGPREP_CONTAINS_PROHIBITED      = 2,
+    STRINGPREP_BIDI_BOTH_L_AND_RAL      = 3,
+    STRINGPREP_BIDI_LEADTRAIL_NOT_RAL   = 4,
+    STRINGPREP_BIDI_CONTAINS_PROHIBITED = 5,
+    /* Error in calling application. */
+    STRINGPREP_TOO_SMALL_BUFFER = 100,
+    STRINGPREP_PROFILE_ERROR    = 101,
+    STRINGPREP_FLAG_ERROR       = 102,
+    STRINGPREP_UNKNOWN_PROFILE  = 103,
+    STRINGPREP_ICONV_ERROR      = 104,
+    /* Internal errors. */
+    STRINGPREP_NFKC_FAILED  = 200,
+    STRINGPREP_MALLOC_ERROR = 201
+} Stringprep_rc;
+
+enum Stringprep_profile_flags { STRINGPREP_NO_NFKC = 1, STRINGPREP_NO_BIDI = 2, STRINGPREP_NO_UNASSIGNED = 4 };
+
+/* Steps in a stringprep profile. */
+typedef enum {
+    STRINGPREP_NFKC                = 1,
+    STRINGPREP_BIDI                = 2,
+    STRINGPREP_MAP_TABLE           = 3,
+    STRINGPREP_UNASSIGNED_TABLE    = 4,
+    STRINGPREP_PROHIBIT_TABLE      = 5,
+    STRINGPREP_BIDI_PROHIBIT_TABLE = 6,
+    STRINGPREP_BIDI_RAL_TABLE      = 7,
+    STRINGPREP_BIDI_L_TABLE        = 8
+} Stringprep_profile_steps;
+
+#define STRINGPREP_MAX_MAP_CHARS 4
+
+struct Stringprep_table_element {
+    uint32_t start;
+    uint32_t end                           = 0;  /* 0 if only one character */
+    uint32_t map[STRINGPREP_MAX_MAP_CHARS] = {}; /* NULL if end is not 0 */
+};
+typedef struct Stringprep_table_element Stringprep_table_element;
+
+struct Stringprep_table {
+    Stringprep_table(int operation, long flags = 0, const Stringprep_table_element *table = nullptr,
+                     size_t table_size = 0) :
+        operation(Stringprep_profile_steps(operation)),
+        flags(Stringprep_profile_flags(flags)), table(table), table_size(table_size)
+    {
+    }
+
+    Stringprep_profile_steps        operation  = Stringprep_profile_steps(0);
+    Stringprep_profile_flags        flags      = Stringprep_profile_flags(0);
+    const Stringprep_table_element *table      = nullptr;
+    size_t                          table_size = 0;
+};
+typedef struct Stringprep_table Stringprep_profile;
+
+struct Stringprep_profiles {
+    const char *              name;
+    const Stringprep_profile *tables;
+};
+typedef struct Stringprep_profiles Stringprep_profiles;
+
+extern IDNAPI const Stringprep_profiles stringprep_profiles[];
+
+/* Profiles */
+extern IDNAPI const Stringprep_table_element stringprep_rfc3454_A_1[];
+extern IDNAPI const Stringprep_table_element stringprep_rfc3454_B_1[];
+extern IDNAPI const Stringprep_table_element stringprep_rfc3454_B_2[];
+extern IDNAPI const Stringprep_table_element stringprep_rfc3454_B_3[];
+extern IDNAPI const Stringprep_table_element stringprep_rfc3454_C_1_1[];
+extern IDNAPI const Stringprep_table_element stringprep_rfc3454_C_1_2[];
+extern IDNAPI const Stringprep_table_element stringprep_rfc3454_C_2_1[];
+extern IDNAPI const Stringprep_table_element stringprep_rfc3454_C_2_2[];
+extern IDNAPI const Stringprep_table_element stringprep_rfc3454_C_3[];
+extern IDNAPI const Stringprep_table_element stringprep_rfc3454_C_4[];
+extern IDNAPI const Stringprep_table_element stringprep_rfc3454_C_5[];
+extern IDNAPI const Stringprep_table_element stringprep_rfc3454_C_6[];
+extern IDNAPI const Stringprep_table_element stringprep_rfc3454_C_7[];
+extern IDNAPI const Stringprep_table_element stringprep_rfc3454_C_8[];
+extern IDNAPI const Stringprep_table_element stringprep_rfc3454_C_9[];
+extern IDNAPI const Stringprep_table_element stringprep_rfc3454_D_1[];
+extern IDNAPI const Stringprep_table_element stringprep_rfc3454_D_2[];
+
+/* Nameprep */
+
+extern IDNAPI const Stringprep_profile stringprep_nameprep[];
+
+#define stringprep_nameprep(in, maxlen) stringprep(in, maxlen, 0, stringprep_nameprep)
+
+#define stringprep_nameprep_no_unassigned(in, maxlen)                                                                  \
+    stringprep(in, maxlen, STRINGPREP_NO_UNASSIGNED, stringprep_nameprep)
+
+/* SASL */
+
+extern IDNAPI const Stringprep_profile       stringprep_saslprep[];
+extern IDNAPI const Stringprep_table_element stringprep_saslprep_space_map[];
+extern IDNAPI const Stringprep_profile       stringprep_plain[];
+extern IDNAPI const Stringprep_profile       stringprep_trace[];
+
+#define stringprep_plain(in, maxlen) stringprep(in, maxlen, 0, stringprep_plain)
+
+/* Kerberos */
+
+extern IDNAPI const Stringprep_profile stringprep_kerberos5[];
+
+#define stringprep_kerberos5(in, maxlen) stringprep(in, maxlen, 0, stringprep_kerberos5)
+
+/* XMPP */
+
+extern IDNAPI const Stringprep_profile       stringprep_xmpp_nodeprep[];
+extern IDNAPI const Stringprep_profile       stringprep_xmpp_resourceprep[];
+extern IDNAPI const Stringprep_table_element stringprep_xmpp_nodeprep_prohibit[];
+
+#define stringprep_xmpp_nodeprep(in, maxlen) stringprep(in, maxlen, 0, stringprep_xmpp_nodeprep)
+#define stringprep_xmpp_resourceprep(in, maxlen) stringprep(in, maxlen, 0, stringprep_xmpp_resourceprep)
+
+/* iSCSI */
+
+extern IDNAPI const Stringprep_profile       stringprep_iscsi[];
+extern IDNAPI const Stringprep_table_element stringprep_iscsi_prohibit[];
+
+#define stringprep_iscsi(in, maxlen) stringprep(in, maxlen, 0, stringprep_iscsi)
+
+/* API */
+
+extern IDNAPI int stringprep_4i(QString &input, Stringprep_profile_flags flags, const Stringprep_profile *profile);
+extern IDNAPI int stringprep(QString &input, Stringprep_profile_flags flags, const Stringprep_profile *profile);
+
+extern IDNAPI int stringprep_profile(const char *in, char **out, const char *profile, Stringprep_profile_flags flags);
+
+#endif /* STRINGPREP_H */
diff --git a/3rdparty/stringprep/rfc3454.cpp b/3rdparty/stringprep/rfc3454.cpp
new file mode 100644
index 00000000..ac74b41e
--- /dev/null
+++ b/3rdparty/stringprep/rfc3454.cpp
@@ -0,0 +1,4763 @@
+/* This file is automatically generated.  DO NOT EDIT!
+   Instead, edit gen-stringprep-tables.pl and re-run.  */
+
+#include "qstringprep.h"
+
+/*
+ * So we can use this material.  There may be other legal analysis that
+ * also reach the same conclusion.
+
+ */
+
+const Stringprep_table_element stringprep_rfc3454_A_1[] = {
+    { 0x000221, 0x000221 }, /* 0221 */
+    { 0x000234, 0x00024F }, /* 0234-024F */
+    { 0x0002AE, 0x0002AF }, /* 02AE-02AF */
+    { 0x0002EF, 0x0002FF }, /* 02EF-02FF */
+    { 0x000350, 0x00035F }, /* 0350-035F */
+    { 0x000370, 0x000373 }, /* 0370-0373 */
+    { 0x000376, 0x000379 }, /* 0376-0379 */
+    { 0x00037B, 0x00037D }, /* 037B-037D */
+    { 0x00037F, 0x000383 }, /* 037F-0383 */
+    { 0x00038B, 0x00038B }, /* 038B */
+    { 0x00038D, 0x00038D }, /* 038D */
+    { 0x0003A2, 0x0003A2 }, /* 03A2 */
+    { 0x0003CF, 0x0003CF }, /* 03CF */
+    { 0x0003F7, 0x0003FF }, /* 03F7-03FF */
+    { 0x000487, 0x000487 }, /* 0487 */
+    { 0x0004CF, 0x0004CF }, /* 04CF */
+    { 0x0004F6, 0x0004F7 }, /* 04F6-04F7 */
+    { 0x0004FA, 0x0004FF }, /* 04FA-04FF */
+    { 0x000510, 0x000530 }, /* 0510-0530 */
+    { 0x000557, 0x000558 }, /* 0557-0558 */
+    { 0x000560, 0x000560 }, /* 0560 */
+    { 0x000588, 0x000588 }, /* 0588 */
+    { 0x00058B, 0x000590 }, /* 058B-0590 */
+    { 0x0005A2, 0x0005A2 }, /* 05A2 */
+    { 0x0005BA, 0x0005BA }, /* 05BA */
+    { 0x0005C5, 0x0005CF }, /* 05C5-05CF */
+    { 0x0005EB, 0x0005EF }, /* 05EB-05EF */
+    { 0x0005F5, 0x00060B }, /* 05F5-060B */
+    { 0x00060D, 0x00061A }, /* 060D-061A */
+    { 0x00061C, 0x00061E }, /* 061C-061E */
+    { 0x000620, 0x000620 }, /* 0620 */
+    { 0x00063B, 0x00063F }, /* 063B-063F */
+    { 0x000656, 0x00065F }, /* 0656-065F */
+    { 0x0006EE, 0x0006EF }, /* 06EE-06EF */
+    { 0x0006FF, 0x0006FF }, /* 06FF */
+    { 0x00070E, 0x00070E }, /* 070E */
+    { 0x00072D, 0x00072F }, /* 072D-072F */
+    { 0x00074B, 0x00077F }, /* 074B-077F */
+    { 0x0007B2, 0x000900 }, /* 07B2-0900 */
+    { 0x000904, 0x000904 }, /* 0904 */
+    { 0x00093A, 0x00093B }, /* 093A-093B */
+    { 0x00094E, 0x00094F }, /* 094E-094F */
+    { 0x000955, 0x000957 }, /* 0955-0957 */
+    { 0x000971, 0x000980 }, /* 0971-0980 */
+    { 0x000984, 0x000984 }, /* 0984 */
+    { 0x00098D, 0x00098E }, /* 098D-098E */
+    { 0x000991, 0x000992 }, /* 0991-0992 */
+    { 0x0009A9, 0x0009A9 }, /* 09A9 */
+    { 0x0009B1, 0x0009B1 }, /* 09B1 */
+    { 0x0009B3, 0x0009B5 }, /* 09B3-09B5 */
+    { 0x0009BA, 0x0009BB }, /* 09BA-09BB */
+    { 0x0009BD, 0x0009BD }, /* 09BD */
+    { 0x0009C5, 0x0009C6 }, /* 09C5-09C6 */
+    { 0x0009C9, 0x0009CA }, /* 09C9-09CA */
+    { 0x0009CE, 0x0009D6 }, /* 09CE-09D6 */
+    { 0x0009D8, 0x0009DB }, /* 09D8-09DB */
+    { 0x0009DE, 0x0009DE }, /* 09DE */
+    { 0x0009E4, 0x0009E5 }, /* 09E4-09E5 */
+    { 0x0009FB, 0x000A01 }, /* 09FB-0A01 */
+    { 0x000A03, 0x000A04 }, /* 0A03-0A04 */
+    { 0x000A0B, 0x000A0E }, /* 0A0B-0A0E */
+    { 0x000A11, 0x000A12 }, /* 0A11-0A12 */
+    { 0x000A29, 0x000A29 }, /* 0A29 */
+    { 0x000A31, 0x000A31 }, /* 0A31 */
+    { 0x000A34, 0x000A34 }, /* 0A34 */
+    { 0x000A37, 0x000A37 }, /* 0A37 */
+    { 0x000A3A, 0x000A3B }, /* 0A3A-0A3B */
+    { 0x000A3D, 0x000A3D }, /* 0A3D */
+    { 0x000A43, 0x000A46 }, /* 0A43-0A46 */
+    { 0x000A49, 0x000A4A }, /* 0A49-0A4A */
+    { 0x000A4E, 0x000A58 }, /* 0A4E-0A58 */
+    { 0x000A5D, 0x000A5D }, /* 0A5D */
+    { 0x000A5F, 0x000A65 }, /* 0A5F-0A65 */
+    { 0x000A75, 0x000A80 }, /* 0A75-0A80 */
+    { 0x000A84, 0x000A84 }, /* 0A84 */
+    { 0x000A8C, 0x000A8C }, /* 0A8C */
+    { 0x000A8E, 0x000A8E }, /* 0A8E */
+    { 0x000A92, 0x000A92 }, /* 0A92 */
+    { 0x000AA9, 0x000AA9 }, /* 0AA9 */
+    { 0x000AB1, 0x000AB1 }, /* 0AB1 */
+    { 0x000AB4, 0x000AB4 }, /* 0AB4 */
+    { 0x000ABA, 0x000ABB }, /* 0ABA-0ABB */
+    { 0x000AC6, 0x000AC6 }, /* 0AC6 */
+    { 0x000ACA, 0x000ACA }, /* 0ACA */
+    { 0x000ACE, 0x000ACF }, /* 0ACE-0ACF */
+    { 0x000AD1, 0x000ADF }, /* 0AD1-0ADF */
+    { 0x000AE1, 0x000AE5 }, /* 0AE1-0AE5 */
+    { 0x000AF0, 0x000B00 }, /* 0AF0-0B00 */
+    { 0x000B04, 0x000B04 }, /* 0B04 */
+    { 0x000B0D, 0x000B0E }, /* 0B0D-0B0E */
+    { 0x000B11, 0x000B12 }, /* 0B11-0B12 */
+    { 0x000B29, 0x000B29 }, /* 0B29 */
+    { 0x000B31, 0x000B31 }, /* 0B31 */
+    { 0x000B34, 0x000B35 }, /* 0B34-0B35 */
+    { 0x000B3A, 0x000B3B }, /* 0B3A-0B3B */
+    { 0x000B44, 0x000B46 }, /* 0B44-0B46 */
+    { 0x000B49, 0x000B4A }, /* 0B49-0B4A */
+    { 0x000B4E, 0x000B55 }, /* 0B4E-0B55 */
+    { 0x000B58, 0x000B5B }, /* 0B58-0B5B */
+    { 0x000B5E, 0x000B5E }, /* 0B5E */
+    { 0x000B62, 0x000B65 }, /* 0B62-0B65 */
+    { 0x000B71, 0x000B81 }, /* 0B71-0B81 */
+    { 0x000B84, 0x000B84 }, /* 0B84 */
+    { 0x000B8B, 0x000B8D }, /* 0B8B-0B8D */
+    { 0x000B91, 0x000B91 }, /* 0B91 */
+    { 0x000B96, 0x000B98 }, /* 0B96-0B98 */
+    { 0x000B9B, 0x000B9B }, /* 0B9B */
+    { 0x000B9D, 0x000B9D }, /* 0B9D */
+    { 0x000BA0, 0x000BA2 }, /* 0BA0-0BA2 */
+    { 0x000BA5, 0x000BA7 }, /* 0BA5-0BA7 */
+    { 0x000BAB, 0x000BAD }, /* 0BAB-0BAD */
+    { 0x000BB6, 0x000BB6 }, /* 0BB6 */
+    { 0x000BBA, 0x000BBD }, /* 0BBA-0BBD */
+    { 0x000BC3, 0x000BC5 }, /* 0BC3-0BC5 */
+    { 0x000BC9, 0x000BC9 }, /* 0BC9 */
+    { 0x000BCE, 0x000BD6 }, /* 0BCE-0BD6 */
+    { 0x000BD8, 0x000BE6 }, /* 0BD8-0BE6 */
+    { 0x000BF3, 0x000C00 }, /* 0BF3-0C00 */
+    { 0x000C04, 0x000C04 }, /* 0C04 */
+    { 0x000C0D, 0x000C0D }, /* 0C0D */
+    { 0x000C11, 0x000C11 }, /* 0C11 */
+    { 0x000C29, 0x000C29 }, /* 0C29 */
+    { 0x000C34, 0x000C34 }, /* 0C34 */
+    { 0x000C3A, 0x000C3D }, /* 0C3A-0C3D */
+    { 0x000C45, 0x000C45 }, /* 0C45 */
+    { 0x000C49, 0x000C49 }, /* 0C49 */
+    { 0x000C4E, 0x000C54 }, /* 0C4E-0C54 */
+    { 0x000C57, 0x000C5F }, /* 0C57-0C5F */
+    { 0x000C62, 0x000C65 }, /* 0C62-0C65 */
+    { 0x000C70, 0x000C81 }, /* 0C70-0C81 */
+    { 0x000C84, 0x000C84 }, /* 0C84 */
+    { 0x000C8D, 0x000C8D }, /* 0C8D */
+    { 0x000C91, 0x000C91 }, /* 0C91 */
+    { 0x000CA9, 0x000CA9 }, /* 0CA9 */
+    { 0x000CB4, 0x000CB4 }, /* 0CB4 */
+    { 0x000CBA, 0x000CBD }, /* 0CBA-0CBD */
+    { 0x000CC5, 0x000CC5 }, /* 0CC5 */
+    { 0x000CC9, 0x000CC9 }, /* 0CC9 */
+    { 0x000CCE, 0x000CD4 }, /* 0CCE-0CD4 */
+    { 0x000CD7, 0x000CDD }, /* 0CD7-0CDD */
+    { 0x000CDF, 0x000CDF }, /* 0CDF */
+    { 0x000CE2, 0x000CE5 }, /* 0CE2-0CE5 */
+    { 0x000CF0, 0x000D01 }, /* 0CF0-0D01 */
+    { 0x000D04, 0x000D04 }, /* 0D04 */
+    { 0x000D0D, 0x000D0D }, /* 0D0D */
+    { 0x000D11, 0x000D11 }, /* 0D11 */
+    { 0x000D29, 0x000D29 }, /* 0D29 */
+    { 0x000D3A, 0x000D3D }, /* 0D3A-0D3D */
+    { 0x000D44, 0x000D45 }, /* 0D44-0D45 */
+    { 0x000D49, 0x000D49 }, /* 0D49 */
+    { 0x000D4E, 0x000D56 }, /* 0D4E-0D56 */
+    { 0x000D58, 0x000D5F }, /* 0D58-0D5F */
+    { 0x000D62, 0x000D65 }, /* 0D62-0D65 */
+    { 0x000D70, 0x000D81 }, /* 0D70-0D81 */
+    { 0x000D84, 0x000D84 }, /* 0D84 */
+    { 0x000D97, 0x000D99 }, /* 0D97-0D99 */
+    { 0x000DB2, 0x000DB2 }, /* 0DB2 */
+    { 0x000DBC, 0x000DBC }, /* 0DBC */
+    { 0x000DBE, 0x000DBF }, /* 0DBE-0DBF */
+    { 0x000DC7, 0x000DC9 }, /* 0DC7-0DC9 */
+    { 0x000DCB, 0x000DCE }, /* 0DCB-0DCE */
+    { 0x000DD5, 0x000DD5 }, /* 0DD5 */
+    { 0x000DD7, 0x000DD7 }, /* 0DD7 */
+    { 0x000DE0, 0x000DF1 }, /* 0DE0-0DF1 */
+    { 0x000DF5, 0x000E00 }, /* 0DF5-0E00 */
+    { 0x000E3B, 0x000E3E }, /* 0E3B-0E3E */
+    { 0x000E5C, 0x000E80 }, /* 0E5C-0E80 */
+    { 0x000E83, 0x000E83 }, /* 0E83 */
+    { 0x000E85, 0x000E86 }, /* 0E85-0E86 */
+    { 0x000E89, 0x000E89 }, /* 0E89 */
+    { 0x000E8B, 0x000E8C }, /* 0E8B-0E8C */
+    { 0x000E8E, 0x000E93 }, /* 0E8E-0E93 */
+    { 0x000E98, 0x000E98 }, /* 0E98 */
+    { 0x000EA0, 0x000EA0 }, /* 0EA0 */
+    { 0x000EA4, 0x000EA4 }, /* 0EA4 */
+    { 0x000EA6, 0x000EA6 }, /* 0EA6 */
+    { 0x000EA8, 0x000EA9 }, /* 0EA8-0EA9 */
+    { 0x000EAC, 0x000EAC }, /* 0EAC */
+    { 0x000EBA, 0x000EBA }, /* 0EBA */
+    { 0x000EBE, 0x000EBF }, /* 0EBE-0EBF */
+    { 0x000EC5, 0x000EC5 }, /* 0EC5 */
+    { 0x000EC7, 0x000EC7 }, /* 0EC7 */
+    { 0x000ECE, 0x000ECF }, /* 0ECE-0ECF */
+    { 0x000EDA, 0x000EDB }, /* 0EDA-0EDB */
+    { 0x000EDE, 0x000EFF }, /* 0EDE-0EFF */
+    { 0x000F48, 0x000F48 }, /* 0F48 */
+    { 0x000F6B, 0x000F70 }, /* 0F6B-0F70 */
+    { 0x000F8C, 0x000F8F }, /* 0F8C-0F8F */
+    { 0x000F98, 0x000F98 }, /* 0F98 */
+    { 0x000FBD, 0x000FBD }, /* 0FBD */
+    { 0x000FCD, 0x000FCE }, /* 0FCD-0FCE */
+    { 0x000FD0, 0x000FFF }, /* 0FD0-0FFF */
+    { 0x001022, 0x001022 }, /* 1022 */
+    { 0x001028, 0x001028 }, /* 1028 */
+    { 0x00102B, 0x00102B }, /* 102B */
+    { 0x001033, 0x001035 }, /* 1033-1035 */
+    { 0x00103A, 0x00103F }, /* 103A-103F */
+    { 0x00105A, 0x00109F }, /* 105A-109F */
+    { 0x0010C6, 0x0010CF }, /* 10C6-10CF */
+    { 0x0010F9, 0x0010FA }, /* 10F9-10FA */
+    { 0x0010FC, 0x0010FF }, /* 10FC-10FF */
+    { 0x00115A, 0x00115E }, /* 115A-115E */
+    { 0x0011A3, 0x0011A7 }, /* 11A3-11A7 */
+    { 0x0011FA, 0x0011FF }, /* 11FA-11FF */
+    { 0x001207, 0x001207 }, /* 1207 */
+    { 0x001247, 0x001247 }, /* 1247 */
+    { 0x001249, 0x001249 }, /* 1249 */
+    { 0x00124E, 0x00124F }, /* 124E-124F */
+    { 0x001257, 0x001257 }, /* 1257 */
+    { 0x001259, 0x001259 }, /* 1259 */
+    { 0x00125E, 0x00125F }, /* 125E-125F */
+    { 0x001287, 0x001287 }, /* 1287 */
+    { 0x001289, 0x001289 }, /* 1289 */
+    { 0x00128E, 0x00128F }, /* 128E-128F */
+    { 0x0012AF, 0x0012AF }, /* 12AF */
+    { 0x0012B1, 0x0012B1 }, /* 12B1 */
+    { 0x0012B6, 0x0012B7 }, /* 12B6-12B7 */
+    { 0x0012BF, 0x0012BF }, /* 12BF */
+    { 0x0012C1, 0x0012C1 }, /* 12C1 */
+    { 0x0012C6, 0x0012C7 }, /* 12C6-12C7 */
+    { 0x0012CF, 0x0012CF }, /* 12CF */
+    { 0x0012D7, 0x0012D7 }, /* 12D7 */
+    { 0x0012EF, 0x0012EF }, /* 12EF */
+    { 0x00130F, 0x00130F }, /* 130F */
+    { 0x001311, 0x001311 }, /* 1311 */
+    { 0x001316, 0x001317 }, /* 1316-1317 */
+    { 0x00131F, 0x00131F }, /* 131F */
+    { 0x001347, 0x001347 }, /* 1347 */
+    { 0x00135B, 0x001360 }, /* 135B-1360 */
+    { 0x00137D, 0x00139F }, /* 137D-139F */
+    { 0x0013F5, 0x001400 }, /* 13F5-1400 */
+    { 0x001677, 0x00167F }, /* 1677-167F */
+    { 0x00169D, 0x00169F }, /* 169D-169F */
+    { 0x0016F1, 0x0016FF }, /* 16F1-16FF */
+    { 0x00170D, 0x00170D }, /* 170D */
+    { 0x001715, 0x00171F }, /* 1715-171F */
+    { 0x001737, 0x00173F }, /* 1737-173F */
+    { 0x001754, 0x00175F }, /* 1754-175F */
+    { 0x00176D, 0x00176D }, /* 176D */
+    { 0x001771, 0x001771 }, /* 1771 */
+    { 0x001774, 0x00177F }, /* 1774-177F */
+    { 0x0017DD, 0x0017DF }, /* 17DD-17DF */
+    { 0x0017EA, 0x0017FF }, /* 17EA-17FF */
+    { 0x00180F, 0x00180F }, /* 180F */
+    { 0x00181A, 0x00181F }, /* 181A-181F */
+    { 0x001878, 0x00187F }, /* 1878-187F */
+    { 0x0018AA, 0x001DFF }, /* 18AA-1DFF */
+    { 0x001E9C, 0x001E9F }, /* 1E9C-1E9F */
+    { 0x001EFA, 0x001EFF }, /* 1EFA-1EFF */
+    { 0x001F16, 0x001F17 }, /* 1F16-1F17 */
+    { 0x001F1E, 0x001F1F }, /* 1F1E-1F1F */
+    { 0x001F46, 0x001F47 }, /* 1F46-1F47 */
+    { 0x001F4E, 0x001F4F }, /* 1F4E-1F4F */
+    { 0x001F58, 0x001F58 }, /* 1F58 */
+    { 0x001F5A, 0x001F5A }, /* 1F5A */
+    { 0x001F5C, 0x001F5C }, /* 1F5C */
+    { 0x001F5E, 0x001F5E }, /* 1F5E */
+    { 0x001F7E, 0x001F7F }, /* 1F7E-1F7F */
+    { 0x001FB5, 0x001FB5 }, /* 1FB5 */
+    { 0x001FC5, 0x001FC5 }, /* 1FC5 */
+    { 0x001FD4, 0x001FD5 }, /* 1FD4-1FD5 */
+    { 0x001FDC, 0x001FDC }, /* 1FDC */
+    { 0x001FF0, 0x001FF1 }, /* 1FF0-1FF1 */
+    { 0x001FF5, 0x001FF5 }, /* 1FF5 */
+    { 0x001FFF, 0x001FFF }, /* 1FFF */
+    { 0x002053, 0x002056 }, /* 2053-2056 */
+    { 0x002058, 0x00205E }, /* 2058-205E */
+    { 0x002064, 0x002069 }, /* 2064-2069 */
+    { 0x002072, 0x002073 }, /* 2072-2073 */
+    { 0x00208F, 0x00209F }, /* 208F-209F */
+    { 0x0020B2, 0x0020CF }, /* 20B2-20CF */
+    { 0x0020EB, 0x0020FF }, /* 20EB-20FF */
+    { 0x00213B, 0x00213C }, /* 213B-213C */
+    { 0x00214C, 0x002152 }, /* 214C-2152 */
+    { 0x002184, 0x00218F }, /* 2184-218F */
+    { 0x0023CF, 0x0023FF }, /* 23CF-23FF */
+    { 0x002427, 0x00243F }, /* 2427-243F */
+    { 0x00244B, 0x00245F }, /* 244B-245F */
+    { 0x0024FF, 0x0024FF }, /* 24FF */
+    { 0x002614, 0x002615 }, /* 2614-2615 */
+    { 0x002618, 0x002618 }, /* 2618 */
+    { 0x00267E, 0x00267F }, /* 267E-267F */
+    { 0x00268A, 0x002700 }, /* 268A-2700 */
+    { 0x002705, 0x002705 }, /* 2705 */
+    { 0x00270A, 0x00270B }, /* 270A-270B */
+    { 0x002728, 0x002728 }, /* 2728 */
+    { 0x00274C, 0x00274C }, /* 274C */
+    { 0x00274E, 0x00274E }, /* 274E */
+    { 0x002753, 0x002755 }, /* 2753-2755 */
+    { 0x002757, 0x002757 }, /* 2757 */
+    { 0x00275F, 0x002760 }, /* 275F-2760 */
+    { 0x002795, 0x002797 }, /* 2795-2797 */
+    { 0x0027B0, 0x0027B0 }, /* 27B0 */
+    { 0x0027BF, 0x0027CF }, /* 27BF-27CF */
+    { 0x0027EC, 0x0027EF }, /* 27EC-27EF */
+    { 0x002B00, 0x002E7F }, /* 2B00-2E7F */
+    { 0x002E9A, 0x002E9A }, /* 2E9A */
+    { 0x002EF4, 0x002EFF }, /* 2EF4-2EFF */
+    { 0x002FD6, 0x002FEF }, /* 2FD6-2FEF */
+    { 0x002FFC, 0x002FFF }, /* 2FFC-2FFF */
+    { 0x003040, 0x003040 }, /* 3040 */
+    { 0x003097, 0x003098 }, /* 3097-3098 */
+    { 0x003100, 0x003104 }, /* 3100-3104 */
+    { 0x00312D, 0x003130 }, /* 312D-3130 */
+    { 0x00318F, 0x00318F }, /* 318F */
+    { 0x0031B8, 0x0031EF }, /* 31B8-31EF */
+    { 0x00321D, 0x00321F }, /* 321D-321F */
+    { 0x003244, 0x003250 }, /* 3244-3250 */
+    { 0x00327C, 0x00327E }, /* 327C-327E */
+    { 0x0032CC, 0x0032CF }, /* 32CC-32CF */
+    { 0x0032FF, 0x0032FF }, /* 32FF */
+    { 0x003377, 0x00337A }, /* 3377-337A */
+    { 0x0033DE, 0x0033DF }, /* 33DE-33DF */
+    { 0x0033FF, 0x0033FF }, /* 33FF */
+    { 0x004DB6, 0x004DFF }, /* 4DB6-4DFF */
+    { 0x009FA6, 0x009FFF }, /* 9FA6-9FFF */
+    { 0x00A48D, 0x00A48F }, /* A48D-A48F */
+    { 0x00A4C7, 0x00ABFF }, /* A4C7-ABFF */
+    { 0x00D7A4, 0x00D7FF }, /* D7A4-D7FF */
+    { 0x00FA2E, 0x00FA2F }, /* FA2E-FA2F */
+    { 0x00FA6B, 0x00FAFF }, /* FA6B-FAFF */
+    { 0x00FB07, 0x00FB12 }, /* FB07-FB12 */
+    { 0x00FB18, 0x00FB1C }, /* FB18-FB1C */
+    { 0x00FB37, 0x00FB37 }, /* FB37 */
+    { 0x00FB3D, 0x00FB3D }, /* FB3D */
+    { 0x00FB3F, 0x00FB3F }, /* FB3F */
+    { 0x00FB42, 0x00FB42 }, /* FB42 */
+    { 0x00FB45, 0x00FB45 }, /* FB45 */
+    { 0x00FBB2, 0x00FBD2 }, /* FBB2-FBD2 */
+    { 0x00FD40, 0x00FD4F }, /* FD40-FD4F */
+    { 0x00FD90, 0x00FD91 }, /* FD90-FD91 */
+    { 0x00FDC8, 0x00FDCF }, /* FDC8-FDCF */
+    { 0x00FDFD, 0x00FDFF }, /* FDFD-FDFF */
+    { 0x00FE10, 0x00FE1F }, /* FE10-FE1F */
+    { 0x00FE24, 0x00FE2F }, /* FE24-FE2F */
+    { 0x00FE47, 0x00FE48 }, /* FE47-FE48 */
+    { 0x00FE53, 0x00FE53 }, /* FE53 */
+    { 0x00FE67, 0x00FE67 }, /* FE67 */
+    { 0x00FE6C, 0x00FE6F }, /* FE6C-FE6F */
+    { 0x00FE75, 0x00FE75 }, /* FE75 */
+    { 0x00FEFD, 0x00FEFE }, /* FEFD-FEFE */
+    { 0x00FF00, 0x00FF00 }, /* FF00 */
+    { 0x00FFBF, 0x00FFC1 }, /* FFBF-FFC1 */
+    { 0x00FFC8, 0x00FFC9 }, /* FFC8-FFC9 */
+    { 0x00FFD0, 0x00FFD1 }, /* FFD0-FFD1 */
+    { 0x00FFD8, 0x00FFD9 }, /* FFD8-FFD9 */
+    { 0x00FFDD, 0x00FFDF }, /* FFDD-FFDF */
+    { 0x00FFE7, 0x00FFE7 }, /* FFE7 */
+    { 0x00FFEF, 0x00FFF8 }, /* FFEF-FFF8 */
+    { 0x010000, 0x0102FF }, /* 10000-102FF */
+    { 0x01031F, 0x01031F }, /* 1031F */
+    { 0x010324, 0x01032F }, /* 10324-1032F */
+    { 0x01034B, 0x0103FF }, /* 1034B-103FF */
+    { 0x010426, 0x010427 }, /* 10426-10427 */
+    { 0x01044E, 0x01CFFF }, /* 1044E-1CFFF */
+    { 0x01D0F6, 0x01D0FF }, /* 1D0F6-1D0FF */
+    { 0x01D127, 0x01D129 }, /* 1D127-1D129 */
+    { 0x01D1DE, 0x01D3FF }, /* 1D1DE-1D3FF */
+    { 0x01D455, 0x01D455 }, /* 1D455 */
+    { 0x01D49D, 0x01D49D }, /* 1D49D */
+    { 0x01D4A0, 0x01D4A1 }, /* 1D4A0-1D4A1 */
+    { 0x01D4A3, 0x01D4A4 }, /* 1D4A3-1D4A4 */
+    { 0x01D4A7, 0x01D4A8 }, /* 1D4A7-1D4A8 */
+    { 0x01D4AD, 0x01D4AD }, /* 1D4AD */
+    { 0x01D4BA, 0x01D4BA }, /* 1D4BA */
+    { 0x01D4BC, 0x01D4BC }, /* 1D4BC */
+    { 0x01D4C1, 0x01D4C1 }, /* 1D4C1 */
+    { 0x01D4C4, 0x01D4C4 }, /* 1D4C4 */
+    { 0x01D506, 0x01D506 }, /* 1D506 */
+    { 0x01D50B, 0x01D50C }, /* 1D50B-1D50C */
+    { 0x01D515, 0x01D515 }, /* 1D515 */
+    { 0x01D51D, 0x01D51D }, /* 1D51D */
+    { 0x01D53A, 0x01D53A }, /* 1D53A */
+    { 0x01D53F, 0x01D53F }, /* 1D53F */
+    { 0x01D545, 0x01D545 }, /* 1D545 */
+    { 0x01D547, 0x01D549 }, /* 1D547-1D549 */
+    { 0x01D551, 0x01D551 }, /* 1D551 */
+    { 0x01D6A4, 0x01D6A7 }, /* 1D6A4-1D6A7 */
+    { 0x01D7CA, 0x01D7CD }, /* 1D7CA-1D7CD */
+    { 0x01D800, 0x01FFFD }, /* 1D800-1FFFD */
+    { 0x02A6D7, 0x02F7FF }, /* 2A6D7-2F7FF */
+    { 0x02FA1E, 0x02FFFD }, /* 2FA1E-2FFFD */
+    { 0x030000, 0x03FFFD }, /* 30000-3FFFD */
+    { 0x040000, 0x04FFFD }, /* 40000-4FFFD */
+    { 0x050000, 0x05FFFD }, /* 50000-5FFFD */
+    { 0x060000, 0x06FFFD }, /* 60000-6FFFD */
+    { 0x070000, 0x07FFFD }, /* 70000-7FFFD */
+    { 0x080000, 0x08FFFD }, /* 80000-8FFFD */
+    { 0x090000, 0x09FFFD }, /* 90000-9FFFD */
+    { 0x0A0000, 0x0AFFFD }, /* A0000-AFFFD */
+    { 0x0B0000, 0x0BFFFD }, /* B0000-BFFFD */
+    { 0x0C0000, 0x0CFFFD }, /* C0000-CFFFD */
+    { 0x0D0000, 0x0DFFFD }, /* D0000-DFFFD */
+    { 0x0E0000, 0x0E0000 }, /* E0000 */
+    { 0x0E0002, 0x0E001F }, /* E0002-E001F */
+    { 0x0E0080, 0x0EFFFD }, /* E0080-EFFFD */
+    { 0 },
+};
+
+/*
+ * E0080-EFFFD
+ *
+ */
+
+const Stringprep_table_element stringprep_rfc3454_B_1[] = {
+    { 0x0000AD, 0x0000AD }, /* 00AD; ; Map to nothing */
+    { 0x00034F, 0x00034F }, /* 034F; ; Map to nothing */
+    { 0x001806, 0x001806 }, /* 1806; ; Map to nothing */
+    { 0x00180B, 0x00180B }, /* 180B; ; Map to nothing */
+    { 0x00180C, 0x00180C }, /* 180C; ; Map to nothing */
+    { 0x00180D, 0x00180D }, /* 180D; ; Map to nothing */
+    { 0x00200B, 0x00200B }, /* 200B; ; Map to nothing */
+    { 0x00200C, 0x00200C }, /* 200C; ; Map to nothing */
+    { 0x00200D, 0x00200D }, /* 200D; ; Map to nothing */
+    { 0x002060, 0x002060 }, /* 2060; ; Map to nothing */
+    { 0x00FE00, 0x00FE00 }, /* FE00; ; Map to nothing */
+    { 0x00FE01, 0x00FE01 }, /* FE01; ; Map to nothing */
+    { 0x00FE02, 0x00FE02 }, /* FE02; ; Map to nothing */
+    { 0x00FE03, 0x00FE03 }, /* FE03; ; Map to nothing */
+    { 0x00FE04, 0x00FE04 }, /* FE04; ; Map to nothing */
+    { 0x00FE05, 0x00FE05 }, /* FE05; ; Map to nothing */
+    { 0x00FE06, 0x00FE06 }, /* FE06; ; Map to nothing */
+    { 0x00FE07, 0x00FE07 }, /* FE07; ; Map to nothing */
+    { 0x00FE08, 0x00FE08 }, /* FE08; ; Map to nothing */
+    { 0x00FE09, 0x00FE09 }, /* FE09; ; Map to nothing */
+    { 0x00FE0A, 0x00FE0A }, /* FE0A; ; Map to nothing */
+    { 0x00FE0B, 0x00FE0B }, /* FE0B; ; Map to nothing */
+    { 0x00FE0C, 0x00FE0C }, /* FE0C; ; Map to nothing */
+    { 0x00FE0D, 0x00FE0D }, /* FE0D; ; Map to nothing */
+    { 0x00FE0E, 0x00FE0E }, /* FE0E; ; Map to nothing */
+    { 0x00FE0F, 0x00FE0F }, /* FE0F; ; Map to nothing */
+    { 0x00FEFF, 0x00FEFF }, /* FEFF; ; Map to nothing */
+    { 0 },
+};
+
+/*
+ * FEFF; ; Map to nothing
+ *
+ */
+
+const Stringprep_table_element stringprep_rfc3454_B_2[] = {
+    { 0x000041, 0x000041, { 0x000061 } }, /* 0041; 0061; Case map */
+    { 0x000042, 0x000042, { 0x000062 } }, /* 0042; 0062; Case map */
+    { 0x000043, 0x000043, { 0x000063 } }, /* 0043; 0063; Case map */
+    { 0x000044, 0x000044, { 0x000064 } }, /* 0044; 0064; Case map */
+    { 0x000045, 0x000045, { 0x000065 } }, /* 0045; 0065; Case map */
+    { 0x000046, 0x000046, { 0x000066 } }, /* 0046; 0066; Case map */
+    { 0x000047, 0x000047, { 0x000067 } }, /* 0047; 0067; Case map */
+    { 0x000048, 0x000048, { 0x000068 } }, /* 0048; 0068; Case map */
+    { 0x000049, 0x000049, { 0x000069 } }, /* 0049; 0069; Case map */
+    { 0x00004A, 0x00004A, { 0x00006A } }, /* 004A; 006A; Case map */
+    { 0x00004B, 0x00004B, { 0x00006B } }, /* 004B; 006B; Case map */
+    { 0x00004C, 0x00004C, { 0x00006C } }, /* 004C; 006C; Case map */
+    { 0x00004D, 0x00004D, { 0x00006D } }, /* 004D; 006D; Case map */
+    { 0x00004E, 0x00004E, { 0x00006E } }, /* 004E; 006E; Case map */
+    { 0x00004F, 0x00004F, { 0x00006F } }, /* 004F; 006F; Case map */
+    { 0x000050, 0x000050, { 0x000070 } }, /* 0050; 0070; Case map */
+    { 0x000051, 0x000051, { 0x000071 } }, /* 0051; 0071; Case map */
+    { 0x000052, 0x000052, { 0x000072 } }, /* 0052; 0072; Case map */
+    { 0x000053, 0x000053, { 0x000073 } }, /* 0053; 0073; Case map */
+    { 0x000054, 0x000054, { 0x000074 } }, /* 0054; 0074; Case map */
+    { 0x000055, 0x000055, { 0x000075 } }, /* 0055; 0075; Case map */
+    { 0x000056, 0x000056, { 0x000076 } }, /* 0056; 0076; Case map */
+    { 0x000057, 0x000057, { 0x000077 } }, /* 0057; 0077; Case map */
+    { 0x000058, 0x000058, { 0x000078 } }, /* 0058; 0078; Case map */
+    { 0x000059, 0x000059, { 0x000079 } }, /* 0059; 0079; Case map */
+    { 0x00005A, 0x00005A, { 0x00007A } }, /* 005A; 007A; Case map */
+    { 0x0000B5, 0x0000B5, { 0x0003BC } }, /* 00B5; 03BC; Case map */
+    { 0x0000C0, 0x0000C0, { 0x0000E0 } }, /* 00C0; 00E0; Case map */
+    { 0x0000C1, 0x0000C1, { 0x0000E1 } }, /* 00C1; 00E1; Case map */
+    { 0x0000C2, 0x0000C2, { 0x0000E2 } }, /* 00C2; 00E2; Case map */
+    { 0x0000C3, 0x0000C3, { 0x0000E3 } }, /* 00C3; 00E3; Case map */
+    { 0x0000C4, 0x0000C4, { 0x0000E4 } }, /* 00C4; 00E4; Case map */
+    { 0x0000C5, 0x0000C5, { 0x0000E5 } }, /* 00C5; 00E5; Case map */
+    { 0x0000C6, 0x0000C6, { 0x0000E6 } }, /* 00C6; 00E6; Case map */
+    { 0x0000C7, 0x0000C7, { 0x0000E7 } }, /* 00C7; 00E7; Case map */
+    { 0x0000C8, 0x0000C8, { 0x0000E8 } }, /* 00C8; 00E8; Case map */
+    { 0x0000C9, 0x0000C9, { 0x0000E9 } }, /* 00C9; 00E9; Case map */
+    { 0x0000CA, 0x0000CA, { 0x0000EA } }, /* 00CA; 00EA; Case map */
+    { 0x0000CB, 0x0000CB, { 0x0000EB } }, /* 00CB; 00EB; Case map */
+    { 0x0000CC, 0x0000CC, { 0x0000EC } }, /* 00CC; 00EC; Case map */
+    { 0x0000CD, 0x0000CD, { 0x0000ED } }, /* 00CD; 00ED; Case map */
+    { 0x0000CE, 0x0000CE, { 0x0000EE } }, /* 00CE; 00EE; Case map */
+    { 0x0000CF, 0x0000CF, { 0x0000EF } }, /* 00CF; 00EF; Case map */
+    { 0x0000D0, 0x0000D0, { 0x0000F0 } }, /* 00D0; 00F0; Case map */
+    { 0x0000D1, 0x0000D1, { 0x0000F1 } }, /* 00D1; 00F1; Case map */
+    { 0x0000D2, 0x0000D2, { 0x0000F2 } }, /* 00D2; 00F2; Case map */
+    { 0x0000D3, 0x0000D3, { 0x0000F3 } }, /* 00D3; 00F3; Case map */
+    { 0x0000D4, 0x0000D4, { 0x0000F4 } }, /* 00D4; 00F4; Case map */
+    { 0x0000D5, 0x0000D5, { 0x0000F5 } }, /* 00D5; 00F5; Case map */
+    { 0x0000D6, 0x0000D6, { 0x0000F6 } }, /* 00D6; 00F6; Case map */
+    { 0x0000D8, 0x0000D8, { 0x0000F8 } }, /* 00D8; 00F8; Case map */
+    { 0x0000D9, 0x0000D9, { 0x0000F9 } }, /* 00D9; 00F9; Case map */
+    { 0x0000DA, 0x0000DA, { 0x0000FA } }, /* 00DA; 00FA; Case map */
+    { 0x0000DB, 0x0000DB, { 0x0000FB } }, /* 00DB; 00FB; Case map */
+    { 0x0000DC, 0x0000DC, { 0x0000FC } }, /* 00DC; 00FC; Case map */
+    { 0x0000DD, 0x0000DD, { 0x0000FD } }, /* 00DD; 00FD; Case map */
+    { 0x0000DE, 0x0000DE, { 0x0000FE } }, /* 00DE; 00FE; Case map */
+    { 0x0000DF,
+      0x0000DF,
+      { 0x000073, /* 00DF; 0073 0073; Case map */
+        0x000073 } },
+    { 0x000100, 0x000100, { 0x000101 } }, /* 0100; 0101; Case map */
+    { 0x000102, 0x000102, { 0x000103 } }, /* 0102; 0103; Case map */
+    { 0x000104, 0x000104, { 0x000105 } }, /* 0104; 0105; Case map */
+    { 0x000106, 0x000106, { 0x000107 } }, /* 0106; 0107; Case map */
+    { 0x000108, 0x000108, { 0x000109 } }, /* 0108; 0109; Case map */
+    { 0x00010A, 0x00010A, { 0x00010B } }, /* 010A; 010B; Case map */
+    { 0x00010C, 0x00010C, { 0x00010D } }, /* 010C; 010D; Case map */
+    { 0x00010E, 0x00010E, { 0x00010F } }, /* 010E; 010F; Case map */
+    { 0x000110, 0x000110, { 0x000111 } }, /* 0110; 0111; Case map */
+    { 0x000112, 0x000112, { 0x000113 } }, /* 0112; 0113; Case map */
+    { 0x000114, 0x000114, { 0x000115 } }, /* 0114; 0115; Case map */
+    { 0x000116, 0x000116, { 0x000117 } }, /* 0116; 0117; Case map */
+    { 0x000118, 0x000118, { 0x000119 } }, /* 0118; 0119; Case map */
+    { 0x00011A, 0x00011A, { 0x00011B } }, /* 011A; 011B; Case map */
+    { 0x00011C, 0x00011C, { 0x00011D } }, /* 011C; 011D; Case map */
+    { 0x00011E, 0x00011E, { 0x00011F } }, /* 011E; 011F; Case map */
+    { 0x000120, 0x000120, { 0x000121 } }, /* 0120; 0121; Case map */
+    { 0x000122, 0x000122, { 0x000123 } }, /* 0122; 0123; Case map */
+    { 0x000124, 0x000124, { 0x000125 } }, /* 0124; 0125; Case map */
+    { 0x000126, 0x000126, { 0x000127 } }, /* 0126; 0127; Case map */
+    { 0x000128, 0x000128, { 0x000129 } }, /* 0128; 0129; Case map */
+    { 0x00012A, 0x00012A, { 0x00012B } }, /* 012A; 012B; Case map */
+    { 0x00012C, 0x00012C, { 0x00012D } }, /* 012C; 012D; Case map */
+    { 0x00012E, 0x00012E, { 0x00012F } }, /* 012E; 012F; Case map */
+    { 0x000130,
+      0x000130,
+      { 0x000069, /* 0130; 0069 0307; Case map */
+        0x000307 } },
+    { 0x000132, 0x000132, { 0x000133 } }, /* 0132; 0133; Case map */
+    { 0x000134, 0x000134, { 0x000135 } }, /* 0134; 0135; Case map */
+    { 0x000136, 0x000136, { 0x000137 } }, /* 0136; 0137; Case map */
+    { 0x000139, 0x000139, { 0x00013A } }, /* 0139; 013A; Case map */
+    { 0x00013B, 0x00013B, { 0x00013C } }, /* 013B; 013C; Case map */
+    { 0x00013D, 0x00013D, { 0x00013E } }, /* 013D; 013E; Case map */
+    { 0x00013F, 0x00013F, { 0x000140 } }, /* 013F; 0140; Case map */
+    { 0x000141, 0x000141, { 0x000142 } }, /* 0141; 0142; Case map */
+    { 0x000143, 0x000143, { 0x000144 } }, /* 0143; 0144; Case map */
+    { 0x000145, 0x000145, { 0x000146 } }, /* 0145; 0146; Case map */
+    { 0x000147, 0x000147, { 0x000148 } }, /* 0147; 0148; Case map */
+    { 0x000149,
+      0x000149,
+      { 0x0002BC, /* 0149; 02BC 006E; Case map */
+        0x00006E } },
+    { 0x00014A, 0x00014A, { 0x00014B } }, /* 014A; 014B; Case map */
+    { 0x00014C, 0x00014C, { 0x00014D } }, /* 014C; 014D; Case map */
+    { 0x00014E, 0x00014E, { 0x00014F } }, /* 014E; 014F; Case map */
+    { 0x000150, 0x000150, { 0x000151 } }, /* 0150; 0151; Case map */
+    { 0x000152, 0x000152, { 0x000153 } }, /* 0152; 0153; Case map */
+    { 0x000154, 0x000154, { 0x000155 } }, /* 0154; 0155; Case map */
+    { 0x000156, 0x000156, { 0x000157 } }, /* 0156; 0157; Case map */
+    { 0x000158, 0x000158, { 0x000159 } }, /* 0158; 0159; Case map */
+    { 0x00015A, 0x00015A, { 0x00015B } }, /* 015A; 015B; Case map */
+    { 0x00015C, 0x00015C, { 0x00015D } }, /* 015C; 015D; Case map */
+    { 0x00015E, 0x00015E, { 0x00015F } }, /* 015E; 015F; Case map */
+    { 0x000160, 0x000160, { 0x000161 } }, /* 0160; 0161; Case map */
+    { 0x000162, 0x000162, { 0x000163 } }, /* 0162; 0163; Case map */
+    { 0x000164, 0x000164, { 0x000165 } }, /* 0164; 0165; Case map */
+    { 0x000166, 0x000166, { 0x000167 } }, /* 0166; 0167; Case map */
+    { 0x000168, 0x000168, { 0x000169 } }, /* 0168; 0169; Case map */
+    { 0x00016A, 0x00016A, { 0x00016B } }, /* 016A; 016B; Case map */
+    { 0x00016C, 0x00016C, { 0x00016D } }, /* 016C; 016D; Case map */
+    { 0x00016E, 0x00016E, { 0x00016F } }, /* 016E; 016F; Case map */
+    { 0x000170, 0x000170, { 0x000171 } }, /* 0170; 0171; Case map */
+    { 0x000172, 0x000172, { 0x000173 } }, /* 0172; 0173; Case map */
+    { 0x000174, 0x000174, { 0x000175 } }, /* 0174; 0175; Case map */
+    { 0x000176, 0x000176, { 0x000177 } }, /* 0176; 0177; Case map */
+    { 0x000178, 0x000178, { 0x0000FF } }, /* 0178; 00FF; Case map */
+    { 0x000179, 0x000179, { 0x00017A } }, /* 0179; 017A; Case map */
+    { 0x00017B, 0x00017B, { 0x00017C } }, /* 017B; 017C; Case map */
+    { 0x00017D, 0x00017D, { 0x00017E } }, /* 017D; 017E; Case map */
+    { 0x00017F, 0x00017F, { 0x000073 } }, /* 017F; 0073; Case map */
+    { 0x000181, 0x000181, { 0x000253 } }, /* 0181; 0253; Case map */
+    { 0x000182, 0x000182, { 0x000183 } }, /* 0182; 0183; Case map */
+    { 0x000184, 0x000184, { 0x000185 } }, /* 0184; 0185; Case map */
+    { 0x000186, 0x000186, { 0x000254 } }, /* 0186; 0254; Case map */
+    { 0x000187, 0x000187, { 0x000188 } }, /* 0187; 0188; Case map */
+    { 0x000189, 0x000189, { 0x000256 } }, /* 0189; 0256; Case map */
+    { 0x00018A, 0x00018A, { 0x000257 } }, /* 018A; 0257; Case map */
+    { 0x00018B, 0x00018B, { 0x00018C } }, /* 018B; 018C; Case map */
+    { 0x00018E, 0x00018E, { 0x0001DD } }, /* 018E; 01DD; Case map */
+    { 0x00018F, 0x00018F, { 0x000259 } }, /* 018F; 0259; Case map */
+    { 0x000190, 0x000190, { 0x00025B } }, /* 0190; 025B; Case map */
+    { 0x000191, 0x000191, { 0x000192 } }, /* 0191; 0192; Case map */
+    { 0x000193, 0x000193, { 0x000260 } }, /* 0193; 0260; Case map */
+    { 0x000194, 0x000194, { 0x000263 } }, /* 0194; 0263; Case map */
+    { 0x000196, 0x000196, { 0x000269 } }, /* 0196; 0269; Case map */
+    { 0x000197, 0x000197, { 0x000268 } }, /* 0197; 0268; Case map */
+    { 0x000198, 0x000198, { 0x000199 } }, /* 0198; 0199; Case map */
+    { 0x00019C, 0x00019C, { 0x00026F } }, /* 019C; 026F; Case map */
+    { 0x00019D, 0x00019D, { 0x000272 } }, /* 019D; 0272; Case map */
+    { 0x00019F, 0x00019F, { 0x000275 } }, /* 019F; 0275; Case map */
+    { 0x0001A0, 0x0001A0, { 0x0001A1 } }, /* 01A0; 01A1; Case map */
+    { 0x0001A2, 0x0001A2, { 0x0001A3 } }, /* 01A2; 01A3; Case map */
+    { 0x0001A4, 0x0001A4, { 0x0001A5 } }, /* 01A4; 01A5; Case map */
+    { 0x0001A6, 0x0001A6, { 0x000280 } }, /* 01A6; 0280; Case map */
+    { 0x0001A7, 0x0001A7, { 0x0001A8 } }, /* 01A7; 01A8; Case map */
+    { 0x0001A9, 0x0001A9, { 0x000283 } }, /* 01A9; 0283; Case map */
+    { 0x0001AC, 0x0001AC, { 0x0001AD } }, /* 01AC; 01AD; Case map */
+    { 0x0001AE, 0x0001AE, { 0x000288 } }, /* 01AE; 0288; Case map */
+    { 0x0001AF, 0x0001AF, { 0x0001B0 } }, /* 01AF; 01B0; Case map */
+    { 0x0001B1, 0x0001B1, { 0x00028A } }, /* 01B1; 028A; Case map */
+    { 0x0001B2, 0x0001B2, { 0x00028B } }, /* 01B2; 028B; Case map */
+    { 0x0001B3, 0x0001B3, { 0x0001B4 } }, /* 01B3; 01B4; Case map */
+    { 0x0001B5, 0x0001B5, { 0x0001B6 } }, /* 01B5; 01B6; Case map */
+    { 0x0001B7, 0x0001B7, { 0x000292 } }, /* 01B7; 0292; Case map */
+    { 0x0001B8, 0x0001B8, { 0x0001B9 } }, /* 01B8; 01B9; Case map */
+    { 0x0001BC, 0x0001BC, { 0x0001BD } }, /* 01BC; 01BD; Case map */
+    { 0x0001C4, 0x0001C4, { 0x0001C6 } }, /* 01C4; 01C6; Case map */
+    { 0x0001C5, 0x0001C5, { 0x0001C6 } }, /* 01C5; 01C6; Case map */
+    { 0x0001C7, 0x0001C7, { 0x0001C9 } }, /* 01C7; 01C9; Case map */
+    { 0x0001C8, 0x0001C8, { 0x0001C9 } }, /* 01C8; 01C9; Case map */
+    { 0x0001CA, 0x0001CA, { 0x0001CC } }, /* 01CA; 01CC; Case map */
+    { 0x0001CB, 0x0001CB, { 0x0001CC } }, /* 01CB; 01CC; Case map */
+    { 0x0001CD, 0x0001CD, { 0x0001CE } }, /* 01CD; 01CE; Case map */
+    { 0x0001CF, 0x0001CF, { 0x0001D0 } }, /* 01CF; 01D0; Case map */
+    { 0x0001D1, 0x0001D1, { 0x0001D2 } }, /* 01D1; 01D2; Case map */
+    { 0x0001D3, 0x0001D3, { 0x0001D4 } }, /* 01D3; 01D4; Case map */
+    { 0x0001D5, 0x0001D5, { 0x0001D6 } }, /* 01D5; 01D6; Case map */
+    { 0x0001D7, 0x0001D7, { 0x0001D8 } }, /* 01D7; 01D8; Case map */
+    { 0x0001D9, 0x0001D9, { 0x0001DA } }, /* 01D9; 01DA; Case map */
+    { 0x0001DB, 0x0001DB, { 0x0001DC } }, /* 01DB; 01DC; Case map */
+    { 0x0001DE, 0x0001DE, { 0x0001DF } }, /* 01DE; 01DF; Case map */
+    { 0x0001E0, 0x0001E0, { 0x0001E1 } }, /* 01E0; 01E1; Case map */
+    { 0x0001E2, 0x0001E2, { 0x0001E3 } }, /* 01E2; 01E3; Case map */
+    { 0x0001E4, 0x0001E4, { 0x0001E5 } }, /* 01E4; 01E5; Case map */
+    { 0x0001E6, 0x0001E6, { 0x0001E7 } }, /* 01E6; 01E7; Case map */
+    { 0x0001E8, 0x0001E8, { 0x0001E9 } }, /* 01E8; 01E9; Case map */
+    { 0x0001EA, 0x0001EA, { 0x0001EB } }, /* 01EA; 01EB; Case map */
+    { 0x0001EC, 0x0001EC, { 0x0001ED } }, /* 01EC; 01ED; Case map */
+    { 0x0001EE, 0x0001EE, { 0x0001EF } }, /* 01EE; 01EF; Case map */
+    { 0x0001F0,
+      0x0001F0,
+      { 0x00006A, /* 01F0; 006A 030C; Case map */
+        0x00030C } },
+    { 0x0001F1, 0x0001F1, { 0x0001F3 } }, /* 01F1; 01F3; Case map */
+    { 0x0001F2, 0x0001F2, { 0x0001F3 } }, /* 01F2; 01F3; Case map */
+    { 0x0001F4, 0x0001F4, { 0x0001F5 } }, /* 01F4; 01F5; Case map */
+    { 0x0001F6, 0x0001F6, { 0x000195 } }, /* 01F6; 0195; Case map */
+    { 0x0001F7, 0x0001F7, { 0x0001BF } }, /* 01F7; 01BF; Case map */
+    { 0x0001F8, 0x0001F8, { 0x0001F9 } }, /* 01F8; 01F9; Case map */
+    { 0x0001FA, 0x0001FA, { 0x0001FB } }, /* 01FA; 01FB; Case map */
+    { 0x0001FC, 0x0001FC, { 0x0001FD } }, /* 01FC; 01FD; Case map */
+    { 0x0001FE, 0x0001FE, { 0x0001FF } }, /* 01FE; 01FF; Case map */
+    { 0x000200, 0x000200, { 0x000201 } }, /* 0200; 0201; Case map */
+    { 0x000202, 0x000202, { 0x000203 } }, /* 0202; 0203; Case map */
+    { 0x000204, 0x000204, { 0x000205 } }, /* 0204; 0205; Case map */
+    { 0x000206, 0x000206, { 0x000207 } }, /* 0206; 0207; Case map */
+    { 0x000208, 0x000208, { 0x000209 } }, /* 0208; 0209; Case map */
+    { 0x00020A, 0x00020A, { 0x00020B } }, /* 020A; 020B; Case map */
+    { 0x00020C, 0x00020C, { 0x00020D } }, /* 020C; 020D; Case map */
+    { 0x00020E, 0x00020E, { 0x00020F } }, /* 020E; 020F; Case map */
+    { 0x000210, 0x000210, { 0x000211 } }, /* 0210; 0211; Case map */
+    { 0x000212, 0x000212, { 0x000213 } }, /* 0212; 0213; Case map */
+    { 0x000214, 0x000214, { 0x000215 } }, /* 0214; 0215; Case map */
+    { 0x000216, 0x000216, { 0x000217 } }, /* 0216; 0217; Case map */
+    { 0x000218, 0x000218, { 0x000219 } }, /* 0218; 0219; Case map */
+    { 0x00021A, 0x00021A, { 0x00021B } }, /* 021A; 021B; Case map */
+    { 0x00021C, 0x00021C, { 0x00021D } }, /* 021C; 021D; Case map */
+    { 0x00021E, 0x00021E, { 0x00021F } }, /* 021E; 021F; Case map */
+    { 0x000220, 0x000220, { 0x00019E } }, /* 0220; 019E; Case map */
+    { 0x000222, 0x000222, { 0x000223 } }, /* 0222; 0223; Case map */
+    { 0x000224, 0x000224, { 0x000225 } }, /* 0224; 0225; Case map */
+    { 0x000226, 0x000226, { 0x000227 } }, /* 0226; 0227; Case map */
+    { 0x000228, 0x000228, { 0x000229 } }, /* 0228; 0229; Case map */
+    { 0x00022A, 0x00022A, { 0x00022B } }, /* 022A; 022B; Case map */
+    { 0x00022C, 0x00022C, { 0x00022D } }, /* 022C; 022D; Case map */
+    { 0x00022E, 0x00022E, { 0x00022F } }, /* 022E; 022F; Case map */
+    { 0x000230, 0x000230, { 0x000231 } }, /* 0230; 0231; Case map */
+    { 0x000232, 0x000232, { 0x000233 } }, /* 0232; 0233; Case map */
+    { 0x000345, 0x000345, { 0x0003B9 } }, /* 0345; 03B9; Case map */
+    { 0x00037A,
+      0x00037A,
+      { 0x000020, /* 037A; 0020 03B9; Additional folding */
+        0x0003B9 } },
+    { 0x000386, 0x000386, { 0x0003AC } }, /* 0386; 03AC; Case map */
+    { 0x000388, 0x000388, { 0x0003AD } }, /* 0388; 03AD; Case map */
+    { 0x000389, 0x000389, { 0x0003AE } }, /* 0389; 03AE; Case map */
+    { 0x00038A, 0x00038A, { 0x0003AF } }, /* 038A; 03AF; Case map */
+    { 0x00038C, 0x00038C, { 0x0003CC } }, /* 038C; 03CC; Case map */
+    { 0x00038E, 0x00038E, { 0x0003CD } }, /* 038E; 03CD; Case map */
+    { 0x00038F, 0x00038F, { 0x0003CE } }, /* 038F; 03CE; Case map */
+    { 0x000390,
+      0x000390,
+      { 0x0003B9, /* 0390; 03B9 0308 0301; Case map */
+        0x000308, 0x000301 } },
+    { 0x000391, 0x000391, { 0x0003B1 } }, /* 0391; 03B1; Case map */
+    { 0x000392, 0x000392, { 0x0003B2 } }, /* 0392; 03B2; Case map */
+    { 0x000393, 0x000393, { 0x0003B3 } }, /* 0393; 03B3; Case map */
+    { 0x000394, 0x000394, { 0x0003B4 } }, /* 0394; 03B4; Case map */
+    { 0x000395, 0x000395, { 0x0003B5 } }, /* 0395; 03B5; Case map */
+    { 0x000396, 0x000396, { 0x0003B6 } }, /* 0396; 03B6; Case map */
+    { 0x000397, 0x000397, { 0x0003B7 } }, /* 0397; 03B7; Case map */
+    { 0x000398, 0x000398, { 0x0003B8 } }, /* 0398; 03B8; Case map */
+    { 0x000399, 0x000399, { 0x0003B9 } }, /* 0399; 03B9; Case map */
+    { 0x00039A, 0x00039A, { 0x0003BA } }, /* 039A; 03BA; Case map */
+    { 0x00039B, 0x00039B, { 0x0003BB } }, /* 039B; 03BB; Case map */
+    { 0x00039C, 0x00039C, { 0x0003BC } }, /* 039C; 03BC; Case map */
+    { 0x00039D, 0x00039D, { 0x0003BD } }, /* 039D; 03BD; Case map */
+    { 0x00039E, 0x00039E, { 0x0003BE } }, /* 039E; 03BE; Case map */
+    { 0x00039F, 0x00039F, { 0x0003BF } }, /* 039F; 03BF; Case map */
+    { 0x0003A0, 0x0003A0, { 0x0003C0 } }, /* 03A0; 03C0; Case map */
+    { 0x0003A1, 0x0003A1, { 0x0003C1 } }, /* 03A1; 03C1; Case map */
+    { 0x0003A3, 0x0003A3, { 0x0003C3 } }, /* 03A3; 03C3; Case map */
+    { 0x0003A4, 0x0003A4, { 0x0003C4 } }, /* 03A4; 03C4; Case map */
+    { 0x0003A5, 0x0003A5, { 0x0003C5 } }, /* 03A5; 03C5; Case map */
+    { 0x0003A6, 0x0003A6, { 0x0003C6 } }, /* 03A6; 03C6; Case map */
+    { 0x0003A7, 0x0003A7, { 0x0003C7 } }, /* 03A7; 03C7; Case map */
+    { 0x0003A8, 0x0003A8, { 0x0003C8 } }, /* 03A8; 03C8; Case map */
+    { 0x0003A9, 0x0003A9, { 0x0003C9 } }, /* 03A9; 03C9; Case map */
+    { 0x0003AA, 0x0003AA, { 0x0003CA } }, /* 03AA; 03CA; Case map */
+    { 0x0003AB, 0x0003AB, { 0x0003CB } }, /* 03AB; 03CB; Case map */
+    { 0x0003B0,
+      0x0003B0,
+      { 0x0003C5, /* 03B0; 03C5 0308 0301; Case map */
+        0x000308, 0x000301 } },
+    { 0x0003C2, 0x0003C2, { 0x0003C3 } }, /* 03C2; 03C3; Case map */
+    { 0x0003D0, 0x0003D0, { 0x0003B2 } }, /* 03D0; 03B2; Case map */
+    { 0x0003D1, 0x0003D1, { 0x0003B8 } }, /* 03D1; 03B8; Case map */
+    { 0x0003D2, 0x0003D2, { 0x0003C5 } }, /* 03D2; 03C5; Additional folding */
+    { 0x0003D3, 0x0003D3, { 0x0003CD } }, /* 03D3; 03CD; Additional folding */
+    { 0x0003D4, 0x0003D4, { 0x0003CB } }, /* 03D4; 03CB; Additional folding */
+    { 0x0003D5, 0x0003D5, { 0x0003C6 } }, /* 03D5; 03C6; Case map */
+    { 0x0003D6, 0x0003D6, { 0x0003C0 } }, /* 03D6; 03C0; Case map */
+    { 0x0003D8, 0x0003D8, { 0x0003D9 } }, /* 03D8; 03D9; Case map */
+    { 0x0003DA, 0x0003DA, { 0x0003DB } }, /* 03DA; 03DB; Case map */
+    { 0x0003DC, 0x0003DC, { 0x0003DD } }, /* 03DC; 03DD; Case map */
+    { 0x0003DE, 0x0003DE, { 0x0003DF } }, /* 03DE; 03DF; Case map */
+    { 0x0003E0, 0x0003E0, { 0x0003E1 } }, /* 03E0; 03E1; Case map */
+    { 0x0003E2, 0x0003E2, { 0x0003E3 } }, /* 03E2; 03E3; Case map */
+    { 0x0003E4, 0x0003E4, { 0x0003E5 } }, /* 03E4; 03E5; Case map */
+    { 0x0003E6, 0x0003E6, { 0x0003E7 } }, /* 03E6; 03E7; Case map */
+    { 0x0003E8, 0x0003E8, { 0x0003E9 } }, /* 03E8; 03E9; Case map */
+    { 0x0003EA, 0x0003EA, { 0x0003EB } }, /* 03EA; 03EB; Case map */
+    { 0x0003EC, 0x0003EC, { 0x0003ED } }, /* 03EC; 03ED; Case map */
+    { 0x0003EE, 0x0003EE, { 0x0003EF } }, /* 03EE; 03EF; Case map */
+    { 0x0003F0, 0x0003F0, { 0x0003BA } }, /* 03F0; 03BA; Case map */
+    { 0x0003F1, 0x0003F1, { 0x0003C1 } }, /* 03F1; 03C1; Case map */
+    { 0x0003F2, 0x0003F2, { 0x0003C3 } }, /* 03F2; 03C3; Case map */
+    { 0x0003F4, 0x0003F4, { 0x0003B8 } }, /* 03F4; 03B8; Case map */
+    { 0x0003F5, 0x0003F5, { 0x0003B5 } }, /* 03F5; 03B5; Case map */
+    { 0x000400, 0x000400, { 0x000450 } }, /* 0400; 0450; Case map */
+    { 0x000401, 0x000401, { 0x000451 } }, /* 0401; 0451; Case map */
+    { 0x000402, 0x000402, { 0x000452 } }, /* 0402; 0452; Case map */
+    { 0x000403, 0x000403, { 0x000453 } }, /* 0403; 0453; Case map */
+    { 0x000404, 0x000404, { 0x000454 } }, /* 0404; 0454; Case map */
+    { 0x000405, 0x000405, { 0x000455 } }, /* 0405; 0455; Case map */
+    { 0x000406, 0x000406, { 0x000456 } }, /* 0406; 0456; Case map */
+    { 0x000407, 0x000407, { 0x000457 } }, /* 0407; 0457; Case map */
+    { 0x000408, 0x000408, { 0x000458 } }, /* 0408; 0458; Case map */
+    { 0x000409, 0x000409, { 0x000459 } }, /* 0409; 0459; Case map */
+    { 0x00040A, 0x00040A, { 0x00045A } }, /* 040A; 045A; Case map */
+    { 0x00040B, 0x00040B, { 0x00045B } }, /* 040B; 045B; Case map */
+    { 0x00040C, 0x00040C, { 0x00045C } }, /* 040C; 045C; Case map */
+    { 0x00040D, 0x00040D, { 0x00045D } }, /* 040D; 045D; Case map */
+    { 0x00040E, 0x00040E, { 0x00045E } }, /* 040E; 045E; Case map */
+    { 0x00040F, 0x00040F, { 0x00045F } }, /* 040F; 045F; Case map */
+    { 0x000410, 0x000410, { 0x000430 } }, /* 0410; 0430; Case map */
+    { 0x000411, 0x000411, { 0x000431 } }, /* 0411; 0431; Case map */
+    { 0x000412, 0x000412, { 0x000432 } }, /* 0412; 0432; Case map */
+    { 0x000413, 0x000413, { 0x000433 } }, /* 0413; 0433; Case map */
+    { 0x000414, 0x000414, { 0x000434 } }, /* 0414; 0434; Case map */
+    { 0x000415, 0x000415, { 0x000435 } }, /* 0415; 0435; Case map */
+    { 0x000416, 0x000416, { 0x000436 } }, /* 0416; 0436; Case map */
+    { 0x000417, 0x000417, { 0x000437 } }, /* 0417; 0437; Case map */
+    { 0x000418, 0x000418, { 0x000438 } }, /* 0418; 0438; Case map */
+    { 0x000419, 0x000419, { 0x000439 } }, /* 0419; 0439; Case map */
+    { 0x00041A, 0x00041A, { 0x00043A } }, /* 041A; 043A; Case map */
+    { 0x00041B, 0x00041B, { 0x00043B } }, /* 041B; 043B; Case map */
+    { 0x00041C, 0x00041C, { 0x00043C } }, /* 041C; 043C; Case map */
+    { 0x00041D, 0x00041D, { 0x00043D } }, /* 041D; 043D; Case map */
+    { 0x00041E, 0x00041E, { 0x00043E } }, /* 041E; 043E; Case map */
+    { 0x00041F, 0x00041F, { 0x00043F } }, /* 041F; 043F; Case map */
+    { 0x000420, 0x000420, { 0x000440 } }, /* 0420; 0440; Case map */
+    { 0x000421, 0x000421, { 0x000441 } }, /* 0421; 0441; Case map */
+    { 0x000422, 0x000422, { 0x000442 } }, /* 0422; 0442; Case map */
+    { 0x000423, 0x000423, { 0x000443 } }, /* 0423; 0443; Case map */
+    { 0x000424, 0x000424, { 0x000444 } }, /* 0424; 0444; Case map */
+    { 0x000425, 0x000425, { 0x000445 } }, /* 0425; 0445; Case map */
+    { 0x000426, 0x000426, { 0x000446 } }, /* 0426; 0446; Case map */
+    { 0x000427, 0x000427, { 0x000447 } }, /* 0427; 0447; Case map */
+    { 0x000428, 0x000428, { 0x000448 } }, /* 0428; 0448; Case map */
+    { 0x000429, 0x000429, { 0x000449 } }, /* 0429; 0449; Case map */
+    { 0x00042A, 0x00042A, { 0x00044A } }, /* 042A; 044A; Case map */
+    { 0x00042B, 0x00042B, { 0x00044B } }, /* 042B; 044B; Case map */
+    { 0x00042C, 0x00042C, { 0x00044C } }, /* 042C; 044C; Case map */
+    { 0x00042D, 0x00042D, { 0x00044D } }, /* 042D; 044D; Case map */
+    { 0x00042E, 0x00042E, { 0x00044E } }, /* 042E; 044E; Case map */
+    { 0x00042F, 0x00042F, { 0x00044F } }, /* 042F; 044F; Case map */
+    { 0x000460, 0x000460, { 0x000461 } }, /* 0460; 0461; Case map */
+    { 0x000462, 0x000462, { 0x000463 } }, /* 0462; 0463; Case map */
+    { 0x000464, 0x000464, { 0x000465 } }, /* 0464; 0465; Case map */
+    { 0x000466, 0x000466, { 0x000467 } }, /* 0466; 0467; Case map */
+    { 0x000468, 0x000468, { 0x000469 } }, /* 0468; 0469; Case map */
+    { 0x00046A, 0x00046A, { 0x00046B } }, /* 046A; 046B; Case map */
+    { 0x00046C, 0x00046C, { 0x00046D } }, /* 046C; 046D; Case map */
+    { 0x00046E, 0x00046E, { 0x00046F } }, /* 046E; 046F; Case map */
+    { 0x000470, 0x000470, { 0x000471 } }, /* 0470; 0471; Case map */
+    { 0x000472, 0x000472, { 0x000473 } }, /* 0472; 0473; Case map */
+    { 0x000474, 0x000474, { 0x000475 } }, /* 0474; 0475; Case map */
+    { 0x000476, 0x000476, { 0x000477 } }, /* 0476; 0477; Case map */
+    { 0x000478, 0x000478, { 0x000479 } }, /* 0478; 0479; Case map */
+    { 0x00047A, 0x00047A, { 0x00047B } }, /* 047A; 047B; Case map */
+    { 0x00047C, 0x00047C, { 0x00047D } }, /* 047C; 047D; Case map */
+    { 0x00047E, 0x00047E, { 0x00047F } }, /* 047E; 047F; Case map */
+    { 0x000480, 0x000480, { 0x000481 } }, /* 0480; 0481; Case map */
+    { 0x00048A, 0x00048A, { 0x00048B } }, /* 048A; 048B; Case map */
+    { 0x00048C, 0x00048C, { 0x00048D } }, /* 048C; 048D; Case map */
+    { 0x00048E, 0x00048E, { 0x00048F } }, /* 048E; 048F; Case map */
+    { 0x000490, 0x000490, { 0x000491 } }, /* 0490; 0491; Case map */
+    { 0x000492, 0x000492, { 0x000493 } }, /* 0492; 0493; Case map */
+    { 0x000494, 0x000494, { 0x000495 } }, /* 0494; 0495; Case map */
+    { 0x000496, 0x000496, { 0x000497 } }, /* 0496; 0497; Case map */
+    { 0x000498, 0x000498, { 0x000499 } }, /* 0498; 0499; Case map */
+    { 0x00049A, 0x00049A, { 0x00049B } }, /* 049A; 049B; Case map */
+    { 0x00049C, 0x00049C, { 0x00049D } }, /* 049C; 049D; Case map */
+    { 0x00049E, 0x00049E, { 0x00049F } }, /* 049E; 049F; Case map */
+    { 0x0004A0, 0x0004A0, { 0x0004A1 } }, /* 04A0; 04A1; Case map */
+    { 0x0004A2, 0x0004A2, { 0x0004A3 } }, /* 04A2; 04A3; Case map */
+    { 0x0004A4, 0x0004A4, { 0x0004A5 } }, /* 04A4; 04A5; Case map */
+    { 0x0004A6, 0x0004A6, { 0x0004A7 } }, /* 04A6; 04A7; Case map */
+    { 0x0004A8, 0x0004A8, { 0x0004A9 } }, /* 04A8; 04A9; Case map */
+    { 0x0004AA, 0x0004AA, { 0x0004AB } }, /* 04AA; 04AB; Case map */
+    { 0x0004AC, 0x0004AC, { 0x0004AD } }, /* 04AC; 04AD; Case map */
+    { 0x0004AE, 0x0004AE, { 0x0004AF } }, /* 04AE; 04AF; Case map */
+    { 0x0004B0, 0x0004B0, { 0x0004B1 } }, /* 04B0; 04B1; Case map */
+    { 0x0004B2, 0x0004B2, { 0x0004B3 } }, /* 04B2; 04B3; Case map */
+    { 0x0004B4, 0x0004B4, { 0x0004B5 } }, /* 04B4; 04B5; Case map */
+    { 0x0004B6, 0x0004B6, { 0x0004B7 } }, /* 04B6; 04B7; Case map */
+    { 0x0004B8, 0x0004B8, { 0x0004B9 } }, /* 04B8; 04B9; Case map */
+    { 0x0004BA, 0x0004BA, { 0x0004BB } }, /* 04BA; 04BB; Case map */
+    { 0x0004BC, 0x0004BC, { 0x0004BD } }, /* 04BC; 04BD; Case map */
+    { 0x0004BE, 0x0004BE, { 0x0004BF } }, /* 04BE; 04BF; Case map */
+    { 0x0004C1, 0x0004C1, { 0x0004C2 } }, /* 04C1; 04C2; Case map */
+    { 0x0004C3, 0x0004C3, { 0x0004C4 } }, /* 04C3; 04C4; Case map */
+    { 0x0004C5, 0x0004C5, { 0x0004C6 } }, /* 04C5; 04C6; Case map */
+    { 0x0004C7, 0x0004C7, { 0x0004C8 } }, /* 04C7; 04C8; Case map */
+    { 0x0004C9, 0x0004C9, { 0x0004CA } }, /* 04C9; 04CA; Case map */
+    { 0x0004CB, 0x0004CB, { 0x0004CC } }, /* 04CB; 04CC; Case map */
+    { 0x0004CD, 0x0004CD, { 0x0004CE } }, /* 04CD; 04CE; Case map */
+    { 0x0004D0, 0x0004D0, { 0x0004D1 } }, /* 04D0; 04D1; Case map */
+    { 0x0004D2, 0x0004D2, { 0x0004D3 } }, /* 04D2; 04D3; Case map */
+    { 0x0004D4, 0x0004D4, { 0x0004D5 } }, /* 04D4; 04D5; Case map */
+    { 0x0004D6, 0x0004D6, { 0x0004D7 } }, /* 04D6; 04D7; Case map */
+    { 0x0004D8, 0x0004D8, { 0x0004D9 } }, /* 04D8; 04D9; Case map */
+    { 0x0004DA, 0x0004DA, { 0x0004DB } }, /* 04DA; 04DB; Case map */
+    { 0x0004DC, 0x0004DC, { 0x0004DD } }, /* 04DC; 04DD; Case map */
+    { 0x0004DE, 0x0004DE, { 0x0004DF } }, /* 04DE; 04DF; Case map */
+    { 0x0004E0, 0x0004E0, { 0x0004E1 } }, /* 04E0; 04E1; Case map */
+    { 0x0004E2, 0x0004E2, { 0x0004E3 } }, /* 04E2; 04E3; Case map */
+    { 0x0004E4, 0x0004E4, { 0x0004E5 } }, /* 04E4; 04E5; Case map */
+    { 0x0004E6, 0x0004E6, { 0x0004E7 } }, /* 04E6; 04E7; Case map */
+    { 0x0004E8, 0x0004E8, { 0x0004E9 } }, /* 04E8; 04E9; Case map */
+    { 0x0004EA, 0x0004EA, { 0x0004EB } }, /* 04EA; 04EB; Case map */
+    { 0x0004EC, 0x0004EC, { 0x0004ED } }, /* 04EC; 04ED; Case map */
+    { 0x0004EE, 0x0004EE, { 0x0004EF } }, /* 04EE; 04EF; Case map */
+    { 0x0004F0, 0x0004F0, { 0x0004F1 } }, /* 04F0; 04F1; Case map */
+    { 0x0004F2, 0x0004F2, { 0x0004F3 } }, /* 04F2; 04F3; Case map */
+    { 0x0004F4, 0x0004F4, { 0x0004F5 } }, /* 04F4; 04F5; Case map */
+    { 0x0004F8, 0x0004F8, { 0x0004F9 } }, /* 04F8; 04F9; Case map */
+    { 0x000500, 0x000500, { 0x000501 } }, /* 0500; 0501; Case map */
+    { 0x000502, 0x000502, { 0x000503 } }, /* 0502; 0503; Case map */
+    { 0x000504, 0x000504, { 0x000505 } }, /* 0504; 0505; Case map */
+    { 0x000506, 0x000506, { 0x000507 } }, /* 0506; 0507; Case map */
+    { 0x000508, 0x000508, { 0x000509 } }, /* 0508; 0509; Case map */
+    { 0x00050A, 0x00050A, { 0x00050B } }, /* 050A; 050B; Case map */
+    { 0x00050C, 0x00050C, { 0x00050D } }, /* 050C; 050D; Case map */
+    { 0x00050E, 0x00050E, { 0x00050F } }, /* 050E; 050F; Case map */
+    { 0x000531, 0x000531, { 0x000561 } }, /* 0531; 0561; Case map */
+    { 0x000532, 0x000532, { 0x000562 } }, /* 0532; 0562; Case map */
+    { 0x000533, 0x000533, { 0x000563 } }, /* 0533; 0563; Case map */
+    { 0x000534, 0x000534, { 0x000564 } }, /* 0534; 0564; Case map */
+    { 0x000535, 0x000535, { 0x000565 } }, /* 0535; 0565; Case map */
+    { 0x000536, 0x000536, { 0x000566 } }, /* 0536; 0566; Case map */
+    { 0x000537, 0x000537, { 0x000567 } }, /* 0537; 0567; Case map */
+    { 0x000538, 0x000538, { 0x000568 } }, /* 0538; 0568; Case map */
+    { 0x000539, 0x000539, { 0x000569 } }, /* 0539; 0569; Case map */
+    { 0x00053A, 0x00053A, { 0x00056A } }, /* 053A; 056A; Case map */
+    { 0x00053B, 0x00053B, { 0x00056B } }, /* 053B; 056B; Case map */
+    { 0x00053C, 0x00053C, { 0x00056C } }, /* 053C; 056C; Case map */
+    { 0x00053D, 0x00053D, { 0x00056D } }, /* 053D; 056D; Case map */
+    { 0x00053E, 0x00053E, { 0x00056E } }, /* 053E; 056E; Case map */
+    { 0x00053F, 0x00053F, { 0x00056F } }, /* 053F; 056F; Case map */
+    { 0x000540, 0x000540, { 0x000570 } }, /* 0540; 0570; Case map */
+    { 0x000541, 0x000541, { 0x000571 } }, /* 0541; 0571; Case map */
+    { 0x000542, 0x000542, { 0x000572 } }, /* 0542; 0572; Case map */
+    { 0x000543, 0x000543, { 0x000573 } }, /* 0543; 0573; Case map */
+    { 0x000544, 0x000544, { 0x000574 } }, /* 0544; 0574; Case map */
+    { 0x000545, 0x000545, { 0x000575 } }, /* 0545; 0575; Case map */
+    { 0x000546, 0x000546, { 0x000576 } }, /* 0546; 0576; Case map */
+    { 0x000547, 0x000547, { 0x000577 } }, /* 0547; 0577; Case map */
+    { 0x000548, 0x000548, { 0x000578 } }, /* 0548; 0578; Case map */
+    { 0x000549, 0x000549, { 0x000579 } }, /* 0549; 0579; Case map */
+    { 0x00054A, 0x00054A, { 0x00057A } }, /* 054A; 057A; Case map */
+    { 0x00054B, 0x00054B, { 0x00057B } }, /* 054B; 057B; Case map */
+    { 0x00054C, 0x00054C, { 0x00057C } }, /* 054C; 057C; Case map */
+    { 0x00054D, 0x00054D, { 0x00057D } }, /* 054D; 057D; Case map */
+    { 0x00054E, 0x00054E, { 0x00057E } }, /* 054E; 057E; Case map */
+    { 0x00054F, 0x00054F, { 0x00057F } }, /* 054F; 057F; Case map */
+    { 0x000550, 0x000550, { 0x000580 } }, /* 0550; 0580; Case map */
+    { 0x000551, 0x000551, { 0x000581 } }, /* 0551; 0581; Case map */
+    { 0x000552, 0x000552, { 0x000582 } }, /* 0552; 0582; Case map */
+    { 0x000553, 0x000553, { 0x000583 } }, /* 0553; 0583; Case map */
+    { 0x000554, 0x000554, { 0x000584 } }, /* 0554; 0584; Case map */
+    { 0x000555, 0x000555, { 0x000585 } }, /* 0555; 0585; Case map */
+    { 0x000556, 0x000556, { 0x000586 } }, /* 0556; 0586; Case map */
+    { 0x000587,
+      0x000587,
+      { 0x000565, /* 0587; 0565 0582; Case map */
+        0x000582 } },
+    { 0x001E00, 0x001E00, { 0x001E01 } }, /* 1E00; 1E01; Case map */
+    { 0x001E02, 0x001E02, { 0x001E03 } }, /* 1E02; 1E03; Case map */
+    { 0x001E04, 0x001E04, { 0x001E05 } }, /* 1E04; 1E05; Case map */
+    { 0x001E06, 0x001E06, { 0x001E07 } }, /* 1E06; 1E07; Case map */
+    { 0x001E08, 0x001E08, { 0x001E09 } }, /* 1E08; 1E09; Case map */
+    { 0x001E0A, 0x001E0A, { 0x001E0B } }, /* 1E0A; 1E0B; Case map */
+    { 0x001E0C, 0x001E0C, { 0x001E0D } }, /* 1E0C; 1E0D; Case map */
+    { 0x001E0E, 0x001E0E, { 0x001E0F } }, /* 1E0E; 1E0F; Case map */
+    { 0x001E10, 0x001E10, { 0x001E11 } }, /* 1E10; 1E11; Case map */
+    { 0x001E12, 0x001E12, { 0x001E13 } }, /* 1E12; 1E13; Case map */
+    { 0x001E14, 0x001E14, { 0x001E15 } }, /* 1E14; 1E15; Case map */
+    { 0x001E16, 0x001E16, { 0x001E17 } }, /* 1E16; 1E17; Case map */
+    { 0x001E18, 0x001E18, { 0x001E19 } }, /* 1E18; 1E19; Case map */
+    { 0x001E1A, 0x001E1A, { 0x001E1B } }, /* 1E1A; 1E1B; Case map */
+    { 0x001E1C, 0x001E1C, { 0x001E1D } }, /* 1E1C; 1E1D; Case map */
+    { 0x001E1E, 0x001E1E, { 0x001E1F } }, /* 1E1E; 1E1F; Case map */
+    { 0x001E20, 0x001E20, { 0x001E21 } }, /* 1E20; 1E21; Case map */
+    { 0x001E22, 0x001E22, { 0x001E23 } }, /* 1E22; 1E23; Case map */
+    { 0x001E24, 0x001E24, { 0x001E25 } }, /* 1E24; 1E25; Case map */
+    { 0x001E26, 0x001E26, { 0x001E27 } }, /* 1E26; 1E27; Case map */
+    { 0x001E28, 0x001E28, { 0x001E29 } }, /* 1E28; 1E29; Case map */
+    { 0x001E2A, 0x001E2A, { 0x001E2B } }, /* 1E2A; 1E2B; Case map */
+    { 0x001E2C, 0x001E2C, { 0x001E2D } }, /* 1E2C; 1E2D; Case map */
+    { 0x001E2E, 0x001E2E, { 0x001E2F } }, /* 1E2E; 1E2F; Case map */
+    { 0x001E30, 0x001E30, { 0x001E31 } }, /* 1E30; 1E31; Case map */
+    { 0x001E32, 0x001E32, { 0x001E33 } }, /* 1E32; 1E33; Case map */
+    { 0x001E34, 0x001E34, { 0x001E35 } }, /* 1E34; 1E35; Case map */
+    { 0x001E36, 0x001E36, { 0x001E37 } }, /* 1E36; 1E37; Case map */
+    { 0x001E38, 0x001E38, { 0x001E39 } }, /* 1E38; 1E39; Case map */
+    { 0x001E3A, 0x001E3A, { 0x001E3B } }, /* 1E3A; 1E3B; Case map */
+    { 0x001E3C, 0x001E3C, { 0x001E3D } }, /* 1E3C; 1E3D; Case map */
+    { 0x001E3E, 0x001E3E, { 0x001E3F } }, /* 1E3E; 1E3F; Case map */
+    { 0x001E40, 0x001E40, { 0x001E41 } }, /* 1E40; 1E41; Case map */
+    { 0x001E42, 0x001E42, { 0x001E43 } }, /* 1E42; 1E43; Case map */
+    { 0x001E44, 0x001E44, { 0x001E45 } }, /* 1E44; 1E45; Case map */
+    { 0x001E46, 0x001E46, { 0x001E47 } }, /* 1E46; 1E47; Case map */
+    { 0x001E48, 0x001E48, { 0x001E49 } }, /* 1E48; 1E49; Case map */
+    { 0x001E4A, 0x001E4A, { 0x001E4B } }, /* 1E4A; 1E4B; Case map */
+    { 0x001E4C, 0x001E4C, { 0x001E4D } }, /* 1E4C; 1E4D; Case map */
+    { 0x001E4E, 0x001E4E, { 0x001E4F } }, /* 1E4E; 1E4F; Case map */
+    { 0x001E50, 0x001E50, { 0x001E51 } }, /* 1E50; 1E51; Case map */
+    { 0x001E52, 0x001E52, { 0x001E53 } }, /* 1E52; 1E53; Case map */
+    { 0x001E54, 0x001E54, { 0x001E55 } }, /* 1E54; 1E55; Case map */
+    { 0x001E56, 0x001E56, { 0x001E57 } }, /* 1E56; 1E57; Case map */
+    { 0x001E58, 0x001E58, { 0x001E59 } }, /* 1E58; 1E59; Case map */
+    { 0x001E5A, 0x001E5A, { 0x001E5B } }, /* 1E5A; 1E5B; Case map */
+    { 0x001E5C, 0x001E5C, { 0x001E5D } }, /* 1E5C; 1E5D; Case map */
+    { 0x001E5E, 0x001E5E, { 0x001E5F } }, /* 1E5E; 1E5F; Case map */
+    { 0x001E60, 0x001E60, { 0x001E61 } }, /* 1E60; 1E61; Case map */
+    { 0x001E62, 0x001E62, { 0x001E63 } }, /* 1E62; 1E63; Case map */
+    { 0x001E64, 0x001E64, { 0x001E65 } }, /* 1E64; 1E65; Case map */
+    { 0x001E66, 0x001E66, { 0x001E67 } }, /* 1E66; 1E67; Case map */
+    { 0x001E68, 0x001E68, { 0x001E69 } }, /* 1E68; 1E69; Case map */
+    { 0x001E6A, 0x001E6A, { 0x001E6B } }, /* 1E6A; 1E6B; Case map */
+    { 0x001E6C, 0x001E6C, { 0x001E6D } }, /* 1E6C; 1E6D; Case map */
+    { 0x001E6E, 0x001E6E, { 0x001E6F } }, /* 1E6E; 1E6F; Case map */
+    { 0x001E70, 0x001E70, { 0x001E71 } }, /* 1E70; 1E71; Case map */
+    { 0x001E72, 0x001E72, { 0x001E73 } }, /* 1E72; 1E73; Case map */
+    { 0x001E74, 0x001E74, { 0x001E75 } }, /* 1E74; 1E75; Case map */
+    { 0x001E76, 0x001E76, { 0x001E77 } }, /* 1E76; 1E77; Case map */
+    { 0x001E78, 0x001E78, { 0x001E79 } }, /* 1E78; 1E79; Case map */
+    { 0x001E7A, 0x001E7A, { 0x001E7B } }, /* 1E7A; 1E7B; Case map */
+    { 0x001E7C, 0x001E7C, { 0x001E7D } }, /* 1E7C; 1E7D; Case map */
+    { 0x001E7E, 0x001E7E, { 0x001E7F } }, /* 1E7E; 1E7F; Case map */
+    { 0x001E80, 0x001E80, { 0x001E81 } }, /* 1E80; 1E81; Case map */
+    { 0x001E82, 0x001E82, { 0x001E83 } }, /* 1E82; 1E83; Case map */
+    { 0x001E84, 0x001E84, { 0x001E85 } }, /* 1E84; 1E85; Case map */
+    { 0x001E86, 0x001E86, { 0x001E87 } }, /* 1E86; 1E87; Case map */
+    { 0x001E88, 0x001E88, { 0x001E89 } }, /* 1E88; 1E89; Case map */
+    { 0x001E8A, 0x001E8A, { 0x001E8B } }, /* 1E8A; 1E8B; Case map */
+    { 0x001E8C, 0x001E8C, { 0x001E8D } }, /* 1E8C; 1E8D; Case map */
+    { 0x001E8E, 0x001E8E, { 0x001E8F } }, /* 1E8E; 1E8F; Case map */
+    { 0x001E90, 0x001E90, { 0x001E91 } }, /* 1E90; 1E91; Case map */
+    { 0x001E92, 0x001E92, { 0x001E93 } }, /* 1E92; 1E93; Case map */
+    { 0x001E94, 0x001E94, { 0x001E95 } }, /* 1E94; 1E95; Case map */
+    { 0x001E96,
+      0x001E96,
+      { 0x000068, /* 1E96; 0068 0331; Case map */
+        0x000331 } },
+    { 0x001E97,
+      0x001E97,
+      { 0x000074, /* 1E97; 0074 0308; Case map */
+        0x000308 } },
+    { 0x001E98,
+      0x001E98,
+      { 0x000077, /* 1E98; 0077 030A; Case map */
+        0x00030A } },
+    { 0x001E99,
+      0x001E99,
+      { 0x000079, /* 1E99; 0079 030A; Case map */
+        0x00030A } },
+    { 0x001E9A,
+      0x001E9A,
+      { 0x000061, /* 1E9A; 0061 02BE; Case map */
+        0x0002BE } },
+    { 0x001E9B, 0x001E9B, { 0x001E61 } }, /* 1E9B; 1E61; Case map */
+    { 0x001EA0, 0x001EA0, { 0x001EA1 } }, /* 1EA0; 1EA1; Case map */
+    { 0x001EA2, 0x001EA2, { 0x001EA3 } }, /* 1EA2; 1EA3; Case map */
+    { 0x001EA4, 0x001EA4, { 0x001EA5 } }, /* 1EA4; 1EA5; Case map */
+    { 0x001EA6, 0x001EA6, { 0x001EA7 } }, /* 1EA6; 1EA7; Case map */
+    { 0x001EA8, 0x001EA8, { 0x001EA9 } }, /* 1EA8; 1EA9; Case map */
+    { 0x001EAA, 0x001EAA, { 0x001EAB } }, /* 1EAA; 1EAB; Case map */
+    { 0x001EAC, 0x001EAC, { 0x001EAD } }, /* 1EAC; 1EAD; Case map */
+    { 0x001EAE, 0x001EAE, { 0x001EAF } }, /* 1EAE; 1EAF; Case map */
+    { 0x001EB0, 0x001EB0, { 0x001EB1 } }, /* 1EB0; 1EB1; Case map */
+    { 0x001EB2, 0x001EB2, { 0x001EB3 } }, /* 1EB2; 1EB3; Case map */
+    { 0x001EB4, 0x001EB4, { 0x001EB5 } }, /* 1EB4; 1EB5; Case map */
+    { 0x001EB6, 0x001EB6, { 0x001EB7 } }, /* 1EB6; 1EB7; Case map */
+    { 0x001EB8, 0x001EB8, { 0x001EB9 } }, /* 1EB8; 1EB9; Case map */
+    { 0x001EBA, 0x001EBA, { 0x001EBB } }, /* 1EBA; 1EBB; Case map */
+    { 0x001EBC, 0x001EBC, { 0x001EBD } }, /* 1EBC; 1EBD; Case map */
+    { 0x001EBE, 0x001EBE, { 0x001EBF } }, /* 1EBE; 1EBF; Case map */
+    { 0x001EC0, 0x001EC0, { 0x001EC1 } }, /* 1EC0; 1EC1; Case map */
+    { 0x001EC2, 0x001EC2, { 0x001EC3 } }, /* 1EC2; 1EC3; Case map */
+    { 0x001EC4, 0x001EC4, { 0x001EC5 } }, /* 1EC4; 1EC5; Case map */
+    { 0x001EC6, 0x001EC6, { 0x001EC7 } }, /* 1EC6; 1EC7; Case map */
+    { 0x001EC8, 0x001EC8, { 0x001EC9 } }, /* 1EC8; 1EC9; Case map */
+    { 0x001ECA, 0x001ECA, { 0x001ECB } }, /* 1ECA; 1ECB; Case map */
+    { 0x001ECC, 0x001ECC, { 0x001ECD } }, /* 1ECC; 1ECD; Case map */
+    { 0x001ECE, 0x001ECE, { 0x001ECF } }, /* 1ECE; 1ECF; Case map */
+    { 0x001ED0, 0x001ED0, { 0x001ED1 } }, /* 1ED0; 1ED1; Case map */
+    { 0x001ED2, 0x001ED2, { 0x001ED3 } }, /* 1ED2; 1ED3; Case map */
+    { 0x001ED4, 0x001ED4, { 0x001ED5 } }, /* 1ED4; 1ED5; Case map */
+    { 0x001ED6, 0x001ED6, { 0x001ED7 } }, /* 1ED6; 1ED7; Case map */
+    { 0x001ED8, 0x001ED8, { 0x001ED9 } }, /* 1ED8; 1ED9; Case map */
+    { 0x001EDA, 0x001EDA, { 0x001EDB } }, /* 1EDA; 1EDB; Case map */
+    { 0x001EDC, 0x001EDC, { 0x001EDD } }, /* 1EDC; 1EDD; Case map */
+    { 0x001EDE, 0x001EDE, { 0x001EDF } }, /* 1EDE; 1EDF; Case map */
+    { 0x001EE0, 0x001EE0, { 0x001EE1 } }, /* 1EE0; 1EE1; Case map */
+    { 0x001EE2, 0x001EE2, { 0x001EE3 } }, /* 1EE2; 1EE3; Case map */
+    { 0x001EE4, 0x001EE4, { 0x001EE5 } }, /* 1EE4; 1EE5; Case map */
+    { 0x001EE6, 0x001EE6, { 0x001EE7 } }, /* 1EE6; 1EE7; Case map */
+    { 0x001EE8, 0x001EE8, { 0x001EE9 } }, /* 1EE8; 1EE9; Case map */
+    { 0x001EEA, 0x001EEA, { 0x001EEB } }, /* 1EEA; 1EEB; Case map */
+    { 0x001EEC, 0x001EEC, { 0x001EED } }, /* 1EEC; 1EED; Case map */
+    { 0x001EEE, 0x001EEE, { 0x001EEF } }, /* 1EEE; 1EEF; Case map */
+    { 0x001EF0, 0x001EF0, { 0x001EF1 } }, /* 1EF0; 1EF1; Case map */
+    { 0x001EF2, 0x001EF2, { 0x001EF3 } }, /* 1EF2; 1EF3; Case map */
+    { 0x001EF4, 0x001EF4, { 0x001EF5 } }, /* 1EF4; 1EF5; Case map */
+    { 0x001EF6, 0x001EF6, { 0x001EF7 } }, /* 1EF6; 1EF7; Case map */
+    { 0x001EF8, 0x001EF8, { 0x001EF9 } }, /* 1EF8; 1EF9; Case map */
+    { 0x001F08, 0x001F08, { 0x001F00 } }, /* 1F08; 1F00; Case map */
+    { 0x001F09, 0x001F09, { 0x001F01 } }, /* 1F09; 1F01; Case map */
+    { 0x001F0A, 0x001F0A, { 0x001F02 } }, /* 1F0A; 1F02; Case map */
+    { 0x001F0B, 0x001F0B, { 0x001F03 } }, /* 1F0B; 1F03; Case map */
+    { 0x001F0C, 0x001F0C, { 0x001F04 } }, /* 1F0C; 1F04; Case map */
+    { 0x001F0D, 0x001F0D, { 0x001F05 } }, /* 1F0D; 1F05; Case map */
+    { 0x001F0E, 0x001F0E, { 0x001F06 } }, /* 1F0E; 1F06; Case map */
+    { 0x001F0F, 0x001F0F, { 0x001F07 } }, /* 1F0F; 1F07; Case map */
+    { 0x001F18, 0x001F18, { 0x001F10 } }, /* 1F18; 1F10; Case map */
+    { 0x001F19, 0x001F19, { 0x001F11 } }, /* 1F19; 1F11; Case map */
+    { 0x001F1A, 0x001F1A, { 0x001F12 } }, /* 1F1A; 1F12; Case map */
+    { 0x001F1B, 0x001F1B, { 0x001F13 } }, /* 1F1B; 1F13; Case map */
+    { 0x001F1C, 0x001F1C, { 0x001F14 } }, /* 1F1C; 1F14; Case map */
+    { 0x001F1D, 0x001F1D, { 0x001F15 } }, /* 1F1D; 1F15; Case map */
+    { 0x001F28, 0x001F28, { 0x001F20 } }, /* 1F28; 1F20; Case map */
+    { 0x001F29, 0x001F29, { 0x001F21 } }, /* 1F29; 1F21; Case map */
+    { 0x001F2A, 0x001F2A, { 0x001F22 } }, /* 1F2A; 1F22; Case map */
+    { 0x001F2B, 0x001F2B, { 0x001F23 } }, /* 1F2B; 1F23; Case map */
+    { 0x001F2C, 0x001F2C, { 0x001F24 } }, /* 1F2C; 1F24; Case map */
+    { 0x001F2D, 0x001F2D, { 0x001F25 } }, /* 1F2D; 1F25; Case map */
+    { 0x001F2E, 0x001F2E, { 0x001F26 } }, /* 1F2E; 1F26; Case map */
+    { 0x001F2F, 0x001F2F, { 0x001F27 } }, /* 1F2F; 1F27; Case map */
+    { 0x001F38, 0x001F38, { 0x001F30 } }, /* 1F38; 1F30; Case map */
+    { 0x001F39, 0x001F39, { 0x001F31 } }, /* 1F39; 1F31; Case map */
+    { 0x001F3A, 0x001F3A, { 0x001F32 } }, /* 1F3A; 1F32; Case map */
+    { 0x001F3B, 0x001F3B, { 0x001F33 } }, /* 1F3B; 1F33; Case map */
+    { 0x001F3C, 0x001F3C, { 0x001F34 } }, /* 1F3C; 1F34; Case map */
+    { 0x001F3D, 0x001F3D, { 0x001F35 } }, /* 1F3D; 1F35; Case map */
+    { 0x001F3E, 0x001F3E, { 0x001F36 } }, /* 1F3E; 1F36; Case map */
+    { 0x001F3F, 0x001F3F, { 0x001F37 } }, /* 1F3F; 1F37; Case map */
+    { 0x001F48, 0x001F48, { 0x001F40 } }, /* 1F48; 1F40; Case map */
+    { 0x001F49, 0x001F49, { 0x001F41 } }, /* 1F49; 1F41; Case map */
+    { 0x001F4A, 0x001F4A, { 0x001F42 } }, /* 1F4A; 1F42; Case map */
+    { 0x001F4B, 0x001F4B, { 0x001F43 } }, /* 1F4B; 1F43; Case map */
+    { 0x001F4C, 0x001F4C, { 0x001F44 } }, /* 1F4C; 1F44; Case map */
+    { 0x001F4D, 0x001F4D, { 0x001F45 } }, /* 1F4D; 1F45; Case map */
+    { 0x001F50,
+      0x001F50,
+      { 0x0003C5, /* 1F50; 03C5 0313; Case map */
+        0x000313 } },
+    { 0x001F52,
+      0x001F52,
+      { 0x0003C5, /* 1F52; 03C5 0313 0300; Case map */
+        0x000313, 0x000300 } },
+    { 0x001F54,
+      0x001F54,
+      { 0x0003C5, /* 1F54; 03C5 0313 0301; Case map */
+        0x000313, 0x000301 } },
+    { 0x001F56,
+      0x001F56,
+      { 0x0003C5, /* 1F56; 03C5 0313 0342; Case map */
+        0x000313, 0x000342 } },
+    { 0x001F59, 0x001F59, { 0x001F51 } }, /* 1F59; 1F51; Case map */
+    { 0x001F5B, 0x001F5B, { 0x001F53 } }, /* 1F5B; 1F53; Case map */
+    { 0x001F5D, 0x001F5D, { 0x001F55 } }, /* 1F5D; 1F55; Case map */
+    { 0x001F5F, 0x001F5F, { 0x001F57 } }, /* 1F5F; 1F57; Case map */
+    { 0x001F68, 0x001F68, { 0x001F60 } }, /* 1F68; 1F60; Case map */
+    { 0x001F69, 0x001F69, { 0x001F61 } }, /* 1F69; 1F61; Case map */
+    { 0x001F6A, 0x001F6A, { 0x001F62 } }, /* 1F6A; 1F62; Case map */
+    { 0x001F6B, 0x001F6B, { 0x001F63 } }, /* 1F6B; 1F63; Case map */
+    { 0x001F6C, 0x001F6C, { 0x001F64 } }, /* 1F6C; 1F64; Case map */
+    { 0x001F6D, 0x001F6D, { 0x001F65 } }, /* 1F6D; 1F65; Case map */
+    { 0x001F6E, 0x001F6E, { 0x001F66 } }, /* 1F6E; 1F66; Case map */
+    { 0x001F6F, 0x001F6F, { 0x001F67 } }, /* 1F6F; 1F67; Case map */
+    { 0x001F80,
+      0x001F80,
+      { 0x001F00, /* 1F80; 1F00 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F81,
+      0x001F81,
+      { 0x001F01, /* 1F81; 1F01 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F82,
+      0x001F82,
+      { 0x001F02, /* 1F82; 1F02 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F83,
+      0x001F83,
+      { 0x001F03, /* 1F83; 1F03 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F84,
+      0x001F84,
+      { 0x001F04, /* 1F84; 1F04 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F85,
+      0x001F85,
+      { 0x001F05, /* 1F85; 1F05 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F86,
+      0x001F86,
+      { 0x001F06, /* 1F86; 1F06 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F87,
+      0x001F87,
+      { 0x001F07, /* 1F87; 1F07 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F88,
+      0x001F88,
+      { 0x001F00, /* 1F88; 1F00 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F89,
+      0x001F89,
+      { 0x001F01, /* 1F89; 1F01 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F8A,
+      0x001F8A,
+      { 0x001F02, /* 1F8A; 1F02 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F8B,
+      0x001F8B,
+      { 0x001F03, /* 1F8B; 1F03 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F8C,
+      0x001F8C,
+      { 0x001F04, /* 1F8C; 1F04 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F8D,
+      0x001F8D,
+      { 0x001F05, /* 1F8D; 1F05 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F8E,
+      0x001F8E,
+      { 0x001F06, /* 1F8E; 1F06 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F8F,
+      0x001F8F,
+      { 0x001F07, /* 1F8F; 1F07 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F90,
+      0x001F90,
+      { 0x001F20, /* 1F90; 1F20 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F91,
+      0x001F91,
+      { 0x001F21, /* 1F91; 1F21 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F92,
+      0x001F92,
+      { 0x001F22, /* 1F92; 1F22 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F93,
+      0x001F93,
+      { 0x001F23, /* 1F93; 1F23 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F94,
+      0x001F94,
+      { 0x001F24, /* 1F94; 1F24 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F95,
+      0x001F95,
+      { 0x001F25, /* 1F95; 1F25 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F96,
+      0x001F96,
+      { 0x001F26, /* 1F96; 1F26 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F97,
+      0x001F97,
+      { 0x001F27, /* 1F97; 1F27 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F98,
+      0x001F98,
+      { 0x001F20, /* 1F98; 1F20 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F99,
+      0x001F99,
+      { 0x001F21, /* 1F99; 1F21 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F9A,
+      0x001F9A,
+      { 0x001F22, /* 1F9A; 1F22 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F9B,
+      0x001F9B,
+      { 0x001F23, /* 1F9B; 1F23 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F9C,
+      0x001F9C,
+      { 0x001F24, /* 1F9C; 1F24 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F9D,
+      0x001F9D,
+      { 0x001F25, /* 1F9D; 1F25 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F9E,
+      0x001F9E,
+      { 0x001F26, /* 1F9E; 1F26 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F9F,
+      0x001F9F,
+      { 0x001F27, /* 1F9F; 1F27 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FA0,
+      0x001FA0,
+      { 0x001F60, /* 1FA0; 1F60 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FA1,
+      0x001FA1,
+      { 0x001F61, /* 1FA1; 1F61 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FA2,
+      0x001FA2,
+      { 0x001F62, /* 1FA2; 1F62 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FA3,
+      0x001FA3,
+      { 0x001F63, /* 1FA3; 1F63 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FA4,
+      0x001FA4,
+      { 0x001F64, /* 1FA4; 1F64 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FA5,
+      0x001FA5,
+      { 0x001F65, /* 1FA5; 1F65 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FA6,
+      0x001FA6,
+      { 0x001F66, /* 1FA6; 1F66 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FA7,
+      0x001FA7,
+      { 0x001F67, /* 1FA7; 1F67 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FA8,
+      0x001FA8,
+      { 0x001F60, /* 1FA8; 1F60 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FA9,
+      0x001FA9,
+      { 0x001F61, /* 1FA9; 1F61 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FAA,
+      0x001FAA,
+      { 0x001F62, /* 1FAA; 1F62 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FAB,
+      0x001FAB,
+      { 0x001F63, /* 1FAB; 1F63 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FAC,
+      0x001FAC,
+      { 0x001F64, /* 1FAC; 1F64 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FAD,
+      0x001FAD,
+      { 0x001F65, /* 1FAD; 1F65 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FAE,
+      0x001FAE,
+      { 0x001F66, /* 1FAE; 1F66 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FAF,
+      0x001FAF,
+      { 0x001F67, /* 1FAF; 1F67 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FB2,
+      0x001FB2,
+      { 0x001F70, /* 1FB2; 1F70 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FB3,
+      0x001FB3,
+      { 0x0003B1, /* 1FB3; 03B1 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FB4,
+      0x001FB4,
+      { 0x0003AC, /* 1FB4; 03AC 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FB6,
+      0x001FB6,
+      { 0x0003B1, /* 1FB6; 03B1 0342; Case map */
+        0x000342 } },
+    { 0x001FB7,
+      0x001FB7,
+      { 0x0003B1, /* 1FB7; 03B1 0342 03B9; Case map */
+        0x000342, 0x0003B9 } },
+    { 0x001FB8, 0x001FB8, { 0x001FB0 } }, /* 1FB8; 1FB0; Case map */
+    { 0x001FB9, 0x001FB9, { 0x001FB1 } }, /* 1FB9; 1FB1; Case map */
+    { 0x001FBA, 0x001FBA, { 0x001F70 } }, /* 1FBA; 1F70; Case map */
+    { 0x001FBB, 0x001FBB, { 0x001F71 } }, /* 1FBB; 1F71; Case map */
+    { 0x001FBC,
+      0x001FBC,
+      { 0x0003B1, /* 1FBC; 03B1 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FBE, 0x001FBE, { 0x0003B9 } }, /* 1FBE; 03B9; Case map */
+    { 0x001FC2,
+      0x001FC2,
+      { 0x001F74, /* 1FC2; 1F74 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FC3,
+      0x001FC3,
+      { 0x0003B7, /* 1FC3; 03B7 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FC4,
+      0x001FC4,
+      { 0x0003AE, /* 1FC4; 03AE 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FC6,
+      0x001FC6,
+      { 0x0003B7, /* 1FC6; 03B7 0342; Case map */
+        0x000342 } },
+    { 0x001FC7,
+      0x001FC7,
+      { 0x0003B7, /* 1FC7; 03B7 0342 03B9; Case map */
+        0x000342, 0x0003B9 } },
+    { 0x001FC8, 0x001FC8, { 0x001F72 } }, /* 1FC8; 1F72; Case map */
+    { 0x001FC9, 0x001FC9, { 0x001F73 } }, /* 1FC9; 1F73; Case map */
+    { 0x001FCA, 0x001FCA, { 0x001F74 } }, /* 1FCA; 1F74; Case map */
+    { 0x001FCB, 0x001FCB, { 0x001F75 } }, /* 1FCB; 1F75; Case map */
+    { 0x001FCC,
+      0x001FCC,
+      { 0x0003B7, /* 1FCC; 03B7 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FD2,
+      0x001FD2,
+      { 0x0003B9, /* 1FD2; 03B9 0308 0300; Case map */
+        0x000308, 0x000300 } },
+    { 0x001FD3,
+      0x001FD3,
+      { 0x0003B9, /* 1FD3; 03B9 0308 0301; Case map */
+        0x000308, 0x000301 } },
+    { 0x001FD6,
+      0x001FD6,
+      { 0x0003B9, /* 1FD6; 03B9 0342; Case map */
+        0x000342 } },
+    { 0x001FD7,
+      0x001FD7,
+      { 0x0003B9, /* 1FD7; 03B9 0308 0342; Case map */
+        0x000308, 0x000342 } },
+    { 0x001FD8, 0x001FD8, { 0x001FD0 } }, /* 1FD8; 1FD0; Case map */
+    { 0x001FD9, 0x001FD9, { 0x001FD1 } }, /* 1FD9; 1FD1; Case map */
+    { 0x001FDA, 0x001FDA, { 0x001F76 } }, /* 1FDA; 1F76; Case map */
+    { 0x001FDB, 0x001FDB, { 0x001F77 } }, /* 1FDB; 1F77; Case map */
+    { 0x001FE2,
+      0x001FE2,
+      { 0x0003C5, /* 1FE2; 03C5 0308 0300; Case map */
+        0x000308, 0x000300 } },
+    { 0x001FE3,
+      0x001FE3,
+      { 0x0003C5, /* 1FE3; 03C5 0308 0301; Case map */
+        0x000308, 0x000301 } },
+    { 0x001FE4,
+      0x001FE4,
+      { 0x0003C1, /* 1FE4; 03C1 0313; Case map */
+        0x000313 } },
+    { 0x001FE6,
+      0x001FE6,
+      { 0x0003C5, /* 1FE6; 03C5 0342; Case map */
+        0x000342 } },
+    { 0x001FE7,
+      0x001FE7,
+      { 0x0003C5, /* 1FE7; 03C5 0308 0342; Case map */
+        0x000308, 0x000342 } },
+    { 0x001FE8, 0x001FE8, { 0x001FE0 } }, /* 1FE8; 1FE0; Case map */
+    { 0x001FE9, 0x001FE9, { 0x001FE1 } }, /* 1FE9; 1FE1; Case map */
+    { 0x001FEA, 0x001FEA, { 0x001F7A } }, /* 1FEA; 1F7A; Case map */
+    { 0x001FEB, 0x001FEB, { 0x001F7B } }, /* 1FEB; 1F7B; Case map */
+    { 0x001FEC, 0x001FEC, { 0x001FE5 } }, /* 1FEC; 1FE5; Case map */
+    { 0x001FF2,
+      0x001FF2,
+      { 0x001F7C, /* 1FF2; 1F7C 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FF3,
+      0x001FF3,
+      { 0x0003C9, /* 1FF3; 03C9 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FF4,
+      0x001FF4,
+      { 0x0003CE, /* 1FF4; 03CE 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FF6,
+      0x001FF6,
+      { 0x0003C9, /* 1FF6; 03C9 0342; Case map */
+        0x000342 } },
+    { 0x001FF7,
+      0x001FF7,
+      { 0x0003C9, /* 1FF7; 03C9 0342 03B9; Case map */
+        0x000342, 0x0003B9 } },
+    { 0x001FF8, 0x001FF8, { 0x001F78 } }, /* 1FF8; 1F78; Case map */
+    { 0x001FF9, 0x001FF9, { 0x001F79 } }, /* 1FF9; 1F79; Case map */
+    { 0x001FFA, 0x001FFA, { 0x001F7C } }, /* 1FFA; 1F7C; Case map */
+    { 0x001FFB, 0x001FFB, { 0x001F7D } }, /* 1FFB; 1F7D; Case map */
+    { 0x001FFC,
+      0x001FFC,
+      { 0x0003C9, /* 1FFC; 03C9 03B9; Case map */
+        0x0003B9 } },
+    { 0x0020A8,
+      0x0020A8,
+      { 0x000072, /* 20A8; 0072 0073; Additional folding */
+        0x000073 } },
+    { 0x002102, 0x002102, { 0x000063 } }, /* 2102; 0063; Additional folding */
+    { 0x002103,
+      0x002103,
+      { 0x0000B0, /* 2103; 00B0 0063; Additional folding */
+        0x000063 } },
+    { 0x002107, 0x002107, { 0x00025B } }, /* 2107; 025B; Additional folding */
+    { 0x002109,
+      0x002109,
+      { 0x0000B0, /* 2109; 00B0 0066; Additional folding */
+        0x000066 } },
+    { 0x00210B, 0x00210B, { 0x000068 } }, /* 210B; 0068; Additional folding */
+    { 0x00210C, 0x00210C, { 0x000068 } }, /* 210C; 0068; Additional folding */
+    { 0x00210D, 0x00210D, { 0x000068 } }, /* 210D; 0068; Additional folding */
+    { 0x002110, 0x002110, { 0x000069 } }, /* 2110; 0069; Additional folding */
+    { 0x002111, 0x002111, { 0x000069 } }, /* 2111; 0069; Additional folding */
+    { 0x002112, 0x002112, { 0x00006C } }, /* 2112; 006C; Additional folding */
+    { 0x002115, 0x002115, { 0x00006E } }, /* 2115; 006E; Additional folding */
+    { 0x002116,
+      0x002116,
+      { 0x00006E, /* 2116; 006E 006F; Additional folding */
+        0x00006F } },
+    { 0x002119, 0x002119, { 0x000070 } }, /* 2119; 0070; Additional folding */
+    { 0x00211A, 0x00211A, { 0x000071 } }, /* 211A; 0071; Additional folding */
+    { 0x00211B, 0x00211B, { 0x000072 } }, /* 211B; 0072; Additional folding */
+    { 0x00211C, 0x00211C, { 0x000072 } }, /* 211C; 0072; Additional folding */
+    { 0x00211D, 0x00211D, { 0x000072 } }, /* 211D; 0072; Additional folding */
+    { 0x002120,
+      0x002120,
+      { 0x000073, /* 2120; 0073 006D; Additional folding */
+        0x00006D } },
+    { 0x002121,
+      0x002121,
+      { 0x000074, /* 2121; 0074 0065 006C; Additional folding */
+        0x000065, 0x00006C } },
+    { 0x002122,
+      0x002122,
+      { 0x000074, /* 2122; 0074 006D; Additional folding */
+        0x00006D } },
+    { 0x002124, 0x002124, { 0x00007A } }, /* 2124; 007A; Additional folding */
+    { 0x002126, 0x002126, { 0x0003C9 } }, /* 2126; 03C9; Case map */
+    { 0x002128, 0x002128, { 0x00007A } }, /* 2128; 007A; Additional folding */
+    { 0x00212A, 0x00212A, { 0x00006B } }, /* 212A; 006B; Case map */
+    { 0x00212B, 0x00212B, { 0x0000E5 } }, /* 212B; 00E5; Case map */
+    { 0x00212C, 0x00212C, { 0x000062 } }, /* 212C; 0062; Additional folding */
+    { 0x00212D, 0x00212D, { 0x000063 } }, /* 212D; 0063; Additional folding */
+    { 0x002130, 0x002130, { 0x000065 } }, /* 2130; 0065; Additional folding */
+    { 0x002131, 0x002131, { 0x000066 } }, /* 2131; 0066; Additional folding */
+    { 0x002133, 0x002133, { 0x00006D } }, /* 2133; 006D; Additional folding */
+    { 0x00213E, 0x00213E, { 0x0003B3 } }, /* 213E; 03B3; Additional folding */
+    { 0x00213F, 0x00213F, { 0x0003C0 } }, /* 213F; 03C0; Additional folding */
+    { 0x002145, 0x002145, { 0x000064 } }, /* 2145; 0064; Additional folding */
+    { 0x002160, 0x002160, { 0x002170 } }, /* 2160; 2170; Case map */
+    { 0x002161, 0x002161, { 0x002171 } }, /* 2161; 2171; Case map */
+    { 0x002162, 0x002162, { 0x002172 } }, /* 2162; 2172; Case map */
+    { 0x002163, 0x002163, { 0x002173 } }, /* 2163; 2173; Case map */
+    { 0x002164, 0x002164, { 0x002174 } }, /* 2164; 2174; Case map */
+    { 0x002165, 0x002165, { 0x002175 } }, /* 2165; 2175; Case map */
+    { 0x002166, 0x002166, { 0x002176 } }, /* 2166; 2176; Case map */
+    { 0x002167, 0x002167, { 0x002177 } }, /* 2167; 2177; Case map */
+    { 0x002168, 0x002168, { 0x002178 } }, /* 2168; 2178; Case map */
+    { 0x002169, 0x002169, { 0x002179 } }, /* 2169; 2179; Case map */
+    { 0x00216A, 0x00216A, { 0x00217A } }, /* 216A; 217A; Case map */
+    { 0x00216B, 0x00216B, { 0x00217B } }, /* 216B; 217B; Case map */
+    { 0x00216C, 0x00216C, { 0x00217C } }, /* 216C; 217C; Case map */
+    { 0x00216D, 0x00216D, { 0x00217D } }, /* 216D; 217D; Case map */
+    { 0x00216E, 0x00216E, { 0x00217E } }, /* 216E; 217E; Case map */
+    { 0x00216F, 0x00216F, { 0x00217F } }, /* 216F; 217F; Case map */
+    { 0x0024B6, 0x0024B6, { 0x0024D0 } }, /* 24B6; 24D0; Case map */
+    { 0x0024B7, 0x0024B7, { 0x0024D1 } }, /* 24B7; 24D1; Case map */
+    { 0x0024B8, 0x0024B8, { 0x0024D2 } }, /* 24B8; 24D2; Case map */
+    { 0x0024B9, 0x0024B9, { 0x0024D3 } }, /* 24B9; 24D3; Case map */
+    { 0x0024BA, 0x0024BA, { 0x0024D4 } }, /* 24BA; 24D4; Case map */
+    { 0x0024BB, 0x0024BB, { 0x0024D5 } }, /* 24BB; 24D5; Case map */
+    { 0x0024BC, 0x0024BC, { 0x0024D6 } }, /* 24BC; 24D6; Case map */
+    { 0x0024BD, 0x0024BD, { 0x0024D7 } }, /* 24BD; 24D7; Case map */
+    { 0x0024BE, 0x0024BE, { 0x0024D8 } }, /* 24BE; 24D8; Case map */
+    { 0x0024BF, 0x0024BF, { 0x0024D9 } }, /* 24BF; 24D9; Case map */
+    { 0x0024C0, 0x0024C0, { 0x0024DA } }, /* 24C0; 24DA; Case map */
+    { 0x0024C1, 0x0024C1, { 0x0024DB } }, /* 24C1; 24DB; Case map */
+    { 0x0024C2, 0x0024C2, { 0x0024DC } }, /* 24C2; 24DC; Case map */
+    { 0x0024C3, 0x0024C3, { 0x0024DD } }, /* 24C3; 24DD; Case map */
+    { 0x0024C4, 0x0024C4, { 0x0024DE } }, /* 24C4; 24DE; Case map */
+    { 0x0024C5, 0x0024C5, { 0x0024DF } }, /* 24C5; 24DF; Case map */
+    { 0x0024C6, 0x0024C6, { 0x0024E0 } }, /* 24C6; 24E0; Case map */
+    { 0x0024C7, 0x0024C7, { 0x0024E1 } }, /* 24C7; 24E1; Case map */
+    { 0x0024C8, 0x0024C8, { 0x0024E2 } }, /* 24C8; 24E2; Case map */
+    { 0x0024C9, 0x0024C9, { 0x0024E3 } }, /* 24C9; 24E3; Case map */
+    { 0x0024CA, 0x0024CA, { 0x0024E4 } }, /* 24CA; 24E4; Case map */
+    { 0x0024CB, 0x0024CB, { 0x0024E5 } }, /* 24CB; 24E5; Case map */
+    { 0x0024CC, 0x0024CC, { 0x0024E6 } }, /* 24CC; 24E6; Case map */
+    { 0x0024CD, 0x0024CD, { 0x0024E7 } }, /* 24CD; 24E7; Case map */
+    { 0x0024CE, 0x0024CE, { 0x0024E8 } }, /* 24CE; 24E8; Case map */
+    { 0x0024CF, 0x0024CF, { 0x0024E9 } }, /* 24CF; 24E9; Case map */
+    { 0x003371,
+      0x003371,
+      { 0x000068, /* 3371; 0068 0070 0061; Additional folding */
+        0x000070, 0x000061 } },
+    { 0x003373,
+      0x003373,
+      { 0x000061, /* 3373; 0061 0075; Additional folding */
+        0x000075 } },
+    { 0x003375,
+      0x003375,
+      { 0x00006F, /* 3375; 006F 0076; Additional folding */
+        0x000076 } },
+    { 0x003380,
+      0x003380,
+      { 0x000070, /* 3380; 0070 0061; Additional folding */
+        0x000061 } },
+    { 0x003381,
+      0x003381,
+      { 0x00006E, /* 3381; 006E 0061; Additional folding */
+        0x000061 } },
+    { 0x003382,
+      0x003382,
+      { 0x0003BC, /* 3382; 03BC 0061; Additional folding */
+        0x000061 } },
+    { 0x003383,
+      0x003383,
+      { 0x00006D, /* 3383; 006D 0061; Additional folding */
+        0x000061 } },
+    { 0x003384,
+      0x003384,
+      { 0x00006B, /* 3384; 006B 0061; Additional folding */
+        0x000061 } },
+    { 0x003385,
+      0x003385,
+      { 0x00006B, /* 3385; 006B 0062; Additional folding */
+        0x000062 } },
+    { 0x003386,
+      0x003386,
+      { 0x00006D, /* 3386; 006D 0062; Additional folding */
+        0x000062 } },
+    { 0x003387,
+      0x003387,
+      { 0x000067, /* 3387; 0067 0062; Additional folding */
+        0x000062 } },
+    { 0x00338A,
+      0x00338A,
+      { 0x000070, /* 338A; 0070 0066; Additional folding */
+        0x000066 } },
+    { 0x00338B,
+      0x00338B,
+      { 0x00006E, /* 338B; 006E 0066; Additional folding */
+        0x000066 } },
+    { 0x00338C,
+      0x00338C,
+      { 0x0003BC, /* 338C; 03BC 0066; Additional folding */
+        0x000066 } },
+    { 0x003390,
+      0x003390,
+      { 0x000068, /* 3390; 0068 007A; Additional folding */
+        0x00007A } },
+    { 0x003391,
+      0x003391,
+      { 0x00006B, /* 3391; 006B 0068 007A; Additional folding */
+        0x000068, 0x00007A } },
+    { 0x003392,
+      0x003392,
+      { 0x00006D, /* 3392; 006D 0068 007A; Additional folding */
+        0x000068, 0x00007A } },
+    { 0x003393,
+      0x003393,
+      { 0x000067, /* 3393; 0067 0068 007A; Additional folding */
+        0x000068, 0x00007A } },
+    { 0x003394,
+      0x003394,
+      { 0x000074, /* 3394; 0074 0068 007A; Additional folding */
+        0x000068, 0x00007A } },
+    { 0x0033A9,
+      0x0033A9,
+      { 0x000070, /* 33A9; 0070 0061; Additional folding */
+        0x000061 } },
+    { 0x0033AA,
+      0x0033AA,
+      { 0x00006B, /* 33AA; 006B 0070 0061; Additional folding */
+        0x000070, 0x000061 } },
+    { 0x0033AB,
+      0x0033AB,
+      { 0x00006D, /* 33AB; 006D 0070 0061; Additional folding */
+        0x000070, 0x000061 } },
+    { 0x0033AC,
+      0x0033AC,
+      { 0x000067, /* 33AC; 0067 0070 0061; Additional folding */
+        0x000070, 0x000061 } },
+    { 0x0033B4,
+      0x0033B4,
+      { 0x000070, /* 33B4; 0070 0076; Additional folding */
+        0x000076 } },
+    { 0x0033B5,
+      0x0033B5,
+      { 0x00006E, /* 33B5; 006E 0076; Additional folding */
+        0x000076 } },
+    { 0x0033B6,
+      0x0033B6,
+      { 0x0003BC, /* 33B6; 03BC 0076; Additional folding */
+        0x000076 } },
+    { 0x0033B7,
+      0x0033B7,
+      { 0x00006D, /* 33B7; 006D 0076; Additional folding */
+        0x000076 } },
+    { 0x0033B8,
+      0x0033B8,
+      { 0x00006B, /* 33B8; 006B 0076; Additional folding */
+        0x000076 } },
+    { 0x0033B9,
+      0x0033B9,
+      { 0x00006D, /* 33B9; 006D 0076; Additional folding */
+        0x000076 } },
+    { 0x0033BA,
+      0x0033BA,
+      { 0x000070, /* 33BA; 0070 0077; Additional folding */
+        0x000077 } },
+    { 0x0033BB,
+      0x0033BB,
+      { 0x00006E, /* 33BB; 006E 0077; Additional folding */
+        0x000077 } },
+    { 0x0033BC,
+      0x0033BC,
+      { 0x0003BC, /* 33BC; 03BC 0077; Additional folding */
+        0x000077 } },
+    { 0x0033BD,
+      0x0033BD,
+      { 0x00006D, /* 33BD; 006D 0077; Additional folding */
+        0x000077 } },
+    { 0x0033BE,
+      0x0033BE,
+      { 0x00006B, /* 33BE; 006B 0077; Additional folding */
+        0x000077 } },
+    { 0x0033BF,
+      0x0033BF,
+      { 0x00006D, /* 33BF; 006D 0077; Additional folding */
+        0x000077 } },
+    { 0x0033C0,
+      0x0033C0,
+      { 0x00006B, /* 33C0; 006B 03C9; Additional folding */
+        0x0003C9 } },
+    { 0x0033C1,
+      0x0033C1,
+      { 0x00006D, /* 33C1; 006D 03C9; Additional folding */
+        0x0003C9 } },
+    { 0x0033C3,
+      0x0033C3,
+      { 0x000062, /* 33C3; 0062 0071; Additional folding */
+        0x000071 } },
+    { 0x0033C6,
+      0x0033C6,
+      { 0x000063, /* 33C6; 0063 2215 006B 0067; Additional folding */
+        0x002215, 0x00006B, 0x000067 } },
+    { 0x0033C7,
+      0x0033C7,
+      { 0x000063, /* 33C7; 0063 006F 002E; Additional folding */
+        0x00006F, 0x00002E } },
+    { 0x0033C8,
+      0x0033C8,
+      { 0x000064, /* 33C8; 0064 0062; Additional folding */
+        0x000062 } },
+    { 0x0033C9,
+      0x0033C9,
+      { 0x000067, /* 33C9; 0067 0079; Additional folding */
+        0x000079 } },
+    { 0x0033CB,
+      0x0033CB,
+      { 0x000068, /* 33CB; 0068 0070; Additional folding */
+        0x000070 } },
+    { 0x0033CD,
+      0x0033CD,
+      { 0x00006B, /* 33CD; 006B 006B; Additional folding */
+        0x00006B } },
+    { 0x0033CE,
+      0x0033CE,
+      { 0x00006B, /* 33CE; 006B 006D; Additional folding */
+        0x00006D } },
+    { 0x0033D7,
+      0x0033D7,
+      { 0x000070, /* 33D7; 0070 0068; Additional folding */
+        0x000068 } },
+    { 0x0033D9,
+      0x0033D9,
+      { 0x000070, /* 33D9; 0070 0070 006D; Additional folding */
+        0x000070, 0x00006D } },
+    { 0x0033DA,
+      0x0033DA,
+      { 0x000070, /* 33DA; 0070 0072; Additional folding */
+        0x000072 } },
+    { 0x0033DC,
+      0x0033DC,
+      { 0x000073, /* 33DC; 0073 0076; Additional folding */
+        0x000076 } },
+    { 0x0033DD,
+      0x0033DD,
+      { 0x000077, /* 33DD; 0077 0062; Additional folding */
+        0x000062 } },
+    { 0x00FB00,
+      0x00FB00,
+      { 0x000066, /* FB00; 0066 0066; Case map */
+        0x000066 } },
+    { 0x00FB01,
+      0x00FB01,
+      { 0x000066, /* FB01; 0066 0069; Case map */
+        0x000069 } },
+    { 0x00FB02,
+      0x00FB02,
+      { 0x000066, /* FB02; 0066 006C; Case map */
+        0x00006C } },
+    { 0x00FB03,
+      0x00FB03,
+      { 0x000066, /* FB03; 0066 0066 0069; Case map */
+        0x000066, 0x000069 } },
+    { 0x00FB04,
+      0x00FB04,
+      { 0x000066, /* FB04; 0066 0066 006C; Case map */
+        0x000066, 0x00006C } },
+    { 0x00FB05,
+      0x00FB05,
+      { 0x000073, /* FB05; 0073 0074; Case map */
+        0x000074 } },
+    { 0x00FB06,
+      0x00FB06,
+      { 0x000073, /* FB06; 0073 0074; Case map */
+        0x000074 } },
+    { 0x00FB13,
+      0x00FB13,
+      { 0x000574, /* FB13; 0574 0576; Case map */
+        0x000576 } },
+    { 0x00FB14,
+      0x00FB14,
+      { 0x000574, /* FB14; 0574 0565; Case map */
+        0x000565 } },
+    { 0x00FB15,
+      0x00FB15,
+      { 0x000574, /* FB15; 0574 056B; Case map */
+        0x00056B } },
+    { 0x00FB16,
+      0x00FB16,
+      { 0x00057E, /* FB16; 057E 0576; Case map */
+        0x000576 } },
+    { 0x00FB17,
+      0x00FB17,
+      { 0x000574, /* FB17; 0574 056D; Case map */
+        0x00056D } },
+    { 0x00FF21, 0x00FF21, { 0x00FF41 } }, /* FF21; FF41; Case map */
+    { 0x00FF22, 0x00FF22, { 0x00FF42 } }, /* FF22; FF42; Case map */
+    { 0x00FF23, 0x00FF23, { 0x00FF43 } }, /* FF23; FF43; Case map */
+    { 0x00FF24, 0x00FF24, { 0x00FF44 } }, /* FF24; FF44; Case map */
+    { 0x00FF25, 0x00FF25, { 0x00FF45 } }, /* FF25; FF45; Case map */
+    { 0x00FF26, 0x00FF26, { 0x00FF46 } }, /* FF26; FF46; Case map */
+    { 0x00FF27, 0x00FF27, { 0x00FF47 } }, /* FF27; FF47; Case map */
+    { 0x00FF28, 0x00FF28, { 0x00FF48 } }, /* FF28; FF48; Case map */
+    { 0x00FF29, 0x00FF29, { 0x00FF49 } }, /* FF29; FF49; Case map */
+    { 0x00FF2A, 0x00FF2A, { 0x00FF4A } }, /* FF2A; FF4A; Case map */
+    { 0x00FF2B, 0x00FF2B, { 0x00FF4B } }, /* FF2B; FF4B; Case map */
+    { 0x00FF2C, 0x00FF2C, { 0x00FF4C } }, /* FF2C; FF4C; Case map */
+    { 0x00FF2D, 0x00FF2D, { 0x00FF4D } }, /* FF2D; FF4D; Case map */
+    { 0x00FF2E, 0x00FF2E, { 0x00FF4E } }, /* FF2E; FF4E; Case map */
+    { 0x00FF2F, 0x00FF2F, { 0x00FF4F } }, /* FF2F; FF4F; Case map */
+    { 0x00FF30, 0x00FF30, { 0x00FF50 } }, /* FF30; FF50; Case map */
+    { 0x00FF31, 0x00FF31, { 0x00FF51 } }, /* FF31; FF51; Case map */
+    { 0x00FF32, 0x00FF32, { 0x00FF52 } }, /* FF32; FF52; Case map */
+    { 0x00FF33, 0x00FF33, { 0x00FF53 } }, /* FF33; FF53; Case map */
+    { 0x00FF34, 0x00FF34, { 0x00FF54 } }, /* FF34; FF54; Case map */
+    { 0x00FF35, 0x00FF35, { 0x00FF55 } }, /* FF35; FF55; Case map */
+    { 0x00FF36, 0x00FF36, { 0x00FF56 } }, /* FF36; FF56; Case map */
+    { 0x00FF37, 0x00FF37, { 0x00FF57 } }, /* FF37; FF57; Case map */
+    { 0x00FF38, 0x00FF38, { 0x00FF58 } }, /* FF38; FF58; Case map */
+    { 0x00FF39, 0x00FF39, { 0x00FF59 } }, /* FF39; FF59; Case map */
+    { 0x00FF3A, 0x00FF3A, { 0x00FF5A } }, /* FF3A; FF5A; Case map */
+    { 0x010400, 0x010400, { 0x010428 } }, /* 10400; 10428; Case map */
+    { 0x010401, 0x010401, { 0x010429 } }, /* 10401; 10429; Case map */
+    { 0x010402, 0x010402, { 0x01042A } }, /* 10402; 1042A; Case map */
+    { 0x010403, 0x010403, { 0x01042B } }, /* 10403; 1042B; Case map */
+    { 0x010404, 0x010404, { 0x01042C } }, /* 10404; 1042C; Case map */
+    { 0x010405, 0x010405, { 0x01042D } }, /* 10405; 1042D; Case map */
+    { 0x010406, 0x010406, { 0x01042E } }, /* 10406; 1042E; Case map */
+    { 0x010407, 0x010407, { 0x01042F } }, /* 10407; 1042F; Case map */
+    { 0x010408, 0x010408, { 0x010430 } }, /* 10408; 10430; Case map */
+    { 0x010409, 0x010409, { 0x010431 } }, /* 10409; 10431; Case map */
+    { 0x01040A, 0x01040A, { 0x010432 } }, /* 1040A; 10432; Case map */
+    { 0x01040B, 0x01040B, { 0x010433 } }, /* 1040B; 10433; Case map */
+    { 0x01040C, 0x01040C, { 0x010434 } }, /* 1040C; 10434; Case map */
+    { 0x01040D, 0x01040D, { 0x010435 } }, /* 1040D; 10435; Case map */
+    { 0x01040E, 0x01040E, { 0x010436 } }, /* 1040E; 10436; Case map */
+    { 0x01040F, 0x01040F, { 0x010437 } }, /* 1040F; 10437; Case map */
+    { 0x010410, 0x010410, { 0x010438 } }, /* 10410; 10438; Case map */
+    { 0x010411, 0x010411, { 0x010439 } }, /* 10411; 10439; Case map */
+    { 0x010412, 0x010412, { 0x01043A } }, /* 10412; 1043A; Case map */
+    { 0x010413, 0x010413, { 0x01043B } }, /* 10413; 1043B; Case map */
+    { 0x010414, 0x010414, { 0x01043C } }, /* 10414; 1043C; Case map */
+    { 0x010415, 0x010415, { 0x01043D } }, /* 10415; 1043D; Case map */
+    { 0x010416, 0x010416, { 0x01043E } }, /* 10416; 1043E; Case map */
+    { 0x010417, 0x010417, { 0x01043F } }, /* 10417; 1043F; Case map */
+    { 0x010418, 0x010418, { 0x010440 } }, /* 10418; 10440; Case map */
+    { 0x010419, 0x010419, { 0x010441 } }, /* 10419; 10441; Case map */
+    { 0x01041A, 0x01041A, { 0x010442 } }, /* 1041A; 10442; Case map */
+    { 0x01041B, 0x01041B, { 0x010443 } }, /* 1041B; 10443; Case map */
+    { 0x01041C, 0x01041C, { 0x010444 } }, /* 1041C; 10444; Case map */
+    { 0x01041D, 0x01041D, { 0x010445 } }, /* 1041D; 10445; Case map */
+    { 0x01041E, 0x01041E, { 0x010446 } }, /* 1041E; 10446; Case map */
+    { 0x01041F, 0x01041F, { 0x010447 } }, /* 1041F; 10447; Case map */
+    { 0x010420, 0x010420, { 0x010448 } }, /* 10420; 10448; Case map */
+    { 0x010421, 0x010421, { 0x010449 } }, /* 10421; 10449; Case map */
+    { 0x010422, 0x010422, { 0x01044A } }, /* 10422; 1044A; Case map */
+    { 0x010423, 0x010423, { 0x01044B } }, /* 10423; 1044B; Case map */
+    { 0x010424, 0x010424, { 0x01044C } }, /* 10424; 1044C; Case map */
+    { 0x010425, 0x010425, { 0x01044D } }, /* 10425; 1044D; Case map */
+    { 0x01D400, 0x01D400, { 0x000061 } }, /* 1D400; 0061; Additional folding */
+    { 0x01D401, 0x01D401, { 0x000062 } }, /* 1D401; 0062; Additional folding */
+    { 0x01D402, 0x01D402, { 0x000063 } }, /* 1D402; 0063; Additional folding */
+    { 0x01D403, 0x01D403, { 0x000064 } }, /* 1D403; 0064; Additional folding */
+    { 0x01D404, 0x01D404, { 0x000065 } }, /* 1D404; 0065; Additional folding */
+    { 0x01D405, 0x01D405, { 0x000066 } }, /* 1D405; 0066; Additional folding */
+    { 0x01D406, 0x01D406, { 0x000067 } }, /* 1D406; 0067; Additional folding */
+    { 0x01D407, 0x01D407, { 0x000068 } }, /* 1D407; 0068; Additional folding */
+    { 0x01D408, 0x01D408, { 0x000069 } }, /* 1D408; 0069; Additional folding */
+    { 0x01D409, 0x01D409, { 0x00006A } }, /* 1D409; 006A; Additional folding */
+    { 0x01D40A, 0x01D40A, { 0x00006B } }, /* 1D40A; 006B; Additional folding */
+    { 0x01D40B, 0x01D40B, { 0x00006C } }, /* 1D40B; 006C; Additional folding */
+    { 0x01D40C, 0x01D40C, { 0x00006D } }, /* 1D40C; 006D; Additional folding */
+    { 0x01D40D, 0x01D40D, { 0x00006E } }, /* 1D40D; 006E; Additional folding */
+    { 0x01D40E, 0x01D40E, { 0x00006F } }, /* 1D40E; 006F; Additional folding */
+    { 0x01D40F, 0x01D40F, { 0x000070 } }, /* 1D40F; 0070; Additional folding */
+    { 0x01D410, 0x01D410, { 0x000071 } }, /* 1D410; 0071; Additional folding */
+    { 0x01D411, 0x01D411, { 0x000072 } }, /* 1D411; 0072; Additional folding */
+    { 0x01D412, 0x01D412, { 0x000073 } }, /* 1D412; 0073; Additional folding */
+    { 0x01D413, 0x01D413, { 0x000074 } }, /* 1D413; 0074; Additional folding */
+    { 0x01D414, 0x01D414, { 0x000075 } }, /* 1D414; 0075; Additional folding */
+    { 0x01D415, 0x01D415, { 0x000076 } }, /* 1D415; 0076; Additional folding */
+    { 0x01D416, 0x01D416, { 0x000077 } }, /* 1D416; 0077; Additional folding */
+    { 0x01D417, 0x01D417, { 0x000078 } }, /* 1D417; 0078; Additional folding */
+    { 0x01D418, 0x01D418, { 0x000079 } }, /* 1D418; 0079; Additional folding */
+    { 0x01D419, 0x01D419, { 0x00007A } }, /* 1D419; 007A; Additional folding */
+    { 0x01D434, 0x01D434, { 0x000061 } }, /* 1D434; 0061; Additional folding */
+    { 0x01D435, 0x01D435, { 0x000062 } }, /* 1D435; 0062; Additional folding */
+    { 0x01D436, 0x01D436, { 0x000063 } }, /* 1D436; 0063; Additional folding */
+    { 0x01D437, 0x01D437, { 0x000064 } }, /* 1D437; 0064; Additional folding */
+    { 0x01D438, 0x01D438, { 0x000065 } }, /* 1D438; 0065; Additional folding */
+    { 0x01D439, 0x01D439, { 0x000066 } }, /* 1D439; 0066; Additional folding */
+    { 0x01D43A, 0x01D43A, { 0x000067 } }, /* 1D43A; 0067; Additional folding */
+    { 0x01D43B, 0x01D43B, { 0x000068 } }, /* 1D43B; 0068; Additional folding */
+    { 0x01D43C, 0x01D43C, { 0x000069 } }, /* 1D43C; 0069; Additional folding */
+    { 0x01D43D, 0x01D43D, { 0x00006A } }, /* 1D43D; 006A; Additional folding */
+    { 0x01D43E, 0x01D43E, { 0x00006B } }, /* 1D43E; 006B; Additional folding */
+    { 0x01D43F, 0x01D43F, { 0x00006C } }, /* 1D43F; 006C; Additional folding */
+    { 0x01D440, 0x01D440, { 0x00006D } }, /* 1D440; 006D; Additional folding */
+    { 0x01D441, 0x01D441, { 0x00006E } }, /* 1D441; 006E; Additional folding */
+    { 0x01D442, 0x01D442, { 0x00006F } }, /* 1D442; 006F; Additional folding */
+    { 0x01D443, 0x01D443, { 0x000070 } }, /* 1D443; 0070; Additional folding */
+    { 0x01D444, 0x01D444, { 0x000071 } }, /* 1D444; 0071; Additional folding */
+    { 0x01D445, 0x01D445, { 0x000072 } }, /* 1D445; 0072; Additional folding */
+    { 0x01D446, 0x01D446, { 0x000073 } }, /* 1D446; 0073; Additional folding */
+    { 0x01D447, 0x01D447, { 0x000074 } }, /* 1D447; 0074; Additional folding */
+    { 0x01D448, 0x01D448, { 0x000075 } }, /* 1D448; 0075; Additional folding */
+    { 0x01D449, 0x01D449, { 0x000076 } }, /* 1D449; 0076; Additional folding */
+    { 0x01D44A, 0x01D44A, { 0x000077 } }, /* 1D44A; 0077; Additional folding */
+    { 0x01D44B, 0x01D44B, { 0x000078 } }, /* 1D44B; 0078; Additional folding */
+    { 0x01D44C, 0x01D44C, { 0x000079 } }, /* 1D44C; 0079; Additional folding */
+    { 0x01D44D, 0x01D44D, { 0x00007A } }, /* 1D44D; 007A; Additional folding */
+    { 0x01D468, 0x01D468, { 0x000061 } }, /* 1D468; 0061; Additional folding */
+    { 0x01D469, 0x01D469, { 0x000062 } }, /* 1D469; 0062; Additional folding */
+    { 0x01D46A, 0x01D46A, { 0x000063 } }, /* 1D46A; 0063; Additional folding */
+    { 0x01D46B, 0x01D46B, { 0x000064 } }, /* 1D46B; 0064; Additional folding */
+    { 0x01D46C, 0x01D46C, { 0x000065 } }, /* 1D46C; 0065; Additional folding */
+    { 0x01D46D, 0x01D46D, { 0x000066 } }, /* 1D46D; 0066; Additional folding */
+    { 0x01D46E, 0x01D46E, { 0x000067 } }, /* 1D46E; 0067; Additional folding */
+    { 0x01D46F, 0x01D46F, { 0x000068 } }, /* 1D46F; 0068; Additional folding */
+    { 0x01D470, 0x01D470, { 0x000069 } }, /* 1D470; 0069; Additional folding */
+    { 0x01D471, 0x01D471, { 0x00006A } }, /* 1D471; 006A; Additional folding */
+    { 0x01D472, 0x01D472, { 0x00006B } }, /* 1D472; 006B; Additional folding */
+    { 0x01D473, 0x01D473, { 0x00006C } }, /* 1D473; 006C; Additional folding */
+    { 0x01D474, 0x01D474, { 0x00006D } }, /* 1D474; 006D; Additional folding */
+    { 0x01D475, 0x01D475, { 0x00006E } }, /* 1D475; 006E; Additional folding */
+    { 0x01D476, 0x01D476, { 0x00006F } }, /* 1D476; 006F; Additional folding */
+    { 0x01D477, 0x01D477, { 0x000070 } }, /* 1D477; 0070; Additional folding */
+    { 0x01D478, 0x01D478, { 0x000071 } }, /* 1D478; 0071; Additional folding */
+    { 0x01D479, 0x01D479, { 0x000072 } }, /* 1D479; 0072; Additional folding */
+    { 0x01D47A, 0x01D47A, { 0x000073 } }, /* 1D47A; 0073; Additional folding */
+    { 0x01D47B, 0x01D47B, { 0x000074 } }, /* 1D47B; 0074; Additional folding */
+    { 0x01D47C, 0x01D47C, { 0x000075 } }, /* 1D47C; 0075; Additional folding */
+    { 0x01D47D, 0x01D47D, { 0x000076 } }, /* 1D47D; 0076; Additional folding */
+    { 0x01D47E, 0x01D47E, { 0x000077 } }, /* 1D47E; 0077; Additional folding */
+    { 0x01D47F, 0x01D47F, { 0x000078 } }, /* 1D47F; 0078; Additional folding */
+    { 0x01D480, 0x01D480, { 0x000079 } }, /* 1D480; 0079; Additional folding */
+    { 0x01D481, 0x01D481, { 0x00007A } }, /* 1D481; 007A; Additional folding */
+    { 0x01D49C, 0x01D49C, { 0x000061 } }, /* 1D49C; 0061; Additional folding */
+    { 0x01D49E, 0x01D49E, { 0x000063 } }, /* 1D49E; 0063; Additional folding */
+    { 0x01D49F, 0x01D49F, { 0x000064 } }, /* 1D49F; 0064; Additional folding */
+    { 0x01D4A2, 0x01D4A2, { 0x000067 } }, /* 1D4A2; 0067; Additional folding */
+    { 0x01D4A5, 0x01D4A5, { 0x00006A } }, /* 1D4A5; 006A; Additional folding */
+    { 0x01D4A6, 0x01D4A6, { 0x00006B } }, /* 1D4A6; 006B; Additional folding */
+    { 0x01D4A9, 0x01D4A9, { 0x00006E } }, /* 1D4A9; 006E; Additional folding */
+    { 0x01D4AA, 0x01D4AA, { 0x00006F } }, /* 1D4AA; 006F; Additional folding */
+    { 0x01D4AB, 0x01D4AB, { 0x000070 } }, /* 1D4AB; 0070; Additional folding */
+    { 0x01D4AC, 0x01D4AC, { 0x000071 } }, /* 1D4AC; 0071; Additional folding */
+    { 0x01D4AE, 0x01D4AE, { 0x000073 } }, /* 1D4AE; 0073; Additional folding */
+    { 0x01D4AF, 0x01D4AF, { 0x000074 } }, /* 1D4AF; 0074; Additional folding */
+    { 0x01D4B0, 0x01D4B0, { 0x000075 } }, /* 1D4B0; 0075; Additional folding */
+    { 0x01D4B1, 0x01D4B1, { 0x000076 } }, /* 1D4B1; 0076; Additional folding */
+    { 0x01D4B2, 0x01D4B2, { 0x000077 } }, /* 1D4B2; 0077; Additional folding */
+    { 0x01D4B3, 0x01D4B3, { 0x000078 } }, /* 1D4B3; 0078; Additional folding */
+    { 0x01D4B4, 0x01D4B4, { 0x000079 } }, /* 1D4B4; 0079; Additional folding */
+    { 0x01D4B5, 0x01D4B5, { 0x00007A } }, /* 1D4B5; 007A; Additional folding */
+    { 0x01D4D0, 0x01D4D0, { 0x000061 } }, /* 1D4D0; 0061; Additional folding */
+    { 0x01D4D1, 0x01D4D1, { 0x000062 } }, /* 1D4D1; 0062; Additional folding */
+    { 0x01D4D2, 0x01D4D2, { 0x000063 } }, /* 1D4D2; 0063; Additional folding */
+    { 0x01D4D3, 0x01D4D3, { 0x000064 } }, /* 1D4D3; 0064; Additional folding */
+    { 0x01D4D4, 0x01D4D4, { 0x000065 } }, /* 1D4D4; 0065; Additional folding */
+    { 0x01D4D5, 0x01D4D5, { 0x000066 } }, /* 1D4D5; 0066; Additional folding */
+    { 0x01D4D6, 0x01D4D6, { 0x000067 } }, /* 1D4D6; 0067; Additional folding */
+    { 0x01D4D7, 0x01D4D7, { 0x000068 } }, /* 1D4D7; 0068; Additional folding */
+    { 0x01D4D8, 0x01D4D8, { 0x000069 } }, /* 1D4D8; 0069; Additional folding */
+    { 0x01D4D9, 0x01D4D9, { 0x00006A } }, /* 1D4D9; 006A; Additional folding */
+    { 0x01D4DA, 0x01D4DA, { 0x00006B } }, /* 1D4DA; 006B; Additional folding */
+    { 0x01D4DB, 0x01D4DB, { 0x00006C } }, /* 1D4DB; 006C; Additional folding */
+    { 0x01D4DC, 0x01D4DC, { 0x00006D } }, /* 1D4DC; 006D; Additional folding */
+    { 0x01D4DD, 0x01D4DD, { 0x00006E } }, /* 1D4DD; 006E; Additional folding */
+    { 0x01D4DE, 0x01D4DE, { 0x00006F } }, /* 1D4DE; 006F; Additional folding */
+    { 0x01D4DF, 0x01D4DF, { 0x000070 } }, /* 1D4DF; 0070; Additional folding */
+    { 0x01D4E0, 0x01D4E0, { 0x000071 } }, /* 1D4E0; 0071; Additional folding */
+    { 0x01D4E1, 0x01D4E1, { 0x000072 } }, /* 1D4E1; 0072; Additional folding */
+    { 0x01D4E2, 0x01D4E2, { 0x000073 } }, /* 1D4E2; 0073; Additional folding */
+    { 0x01D4E3, 0x01D4E3, { 0x000074 } }, /* 1D4E3; 0074; Additional folding */
+    { 0x01D4E4, 0x01D4E4, { 0x000075 } }, /* 1D4E4; 0075; Additional folding */
+    { 0x01D4E5, 0x01D4E5, { 0x000076 } }, /* 1D4E5; 0076; Additional folding */
+    { 0x01D4E6, 0x01D4E6, { 0x000077 } }, /* 1D4E6; 0077; Additional folding */
+    { 0x01D4E7, 0x01D4E7, { 0x000078 } }, /* 1D4E7; 0078; Additional folding */
+    { 0x01D4E8, 0x01D4E8, { 0x000079 } }, /* 1D4E8; 0079; Additional folding */
+    { 0x01D4E9, 0x01D4E9, { 0x00007A } }, /* 1D4E9; 007A; Additional folding */
+    { 0x01D504, 0x01D504, { 0x000061 } }, /* 1D504; 0061; Additional folding */
+    { 0x01D505, 0x01D505, { 0x000062 } }, /* 1D505; 0062; Additional folding */
+    { 0x01D507, 0x01D507, { 0x000064 } }, /* 1D507; 0064; Additional folding */
+    { 0x01D508, 0x01D508, { 0x000065 } }, /* 1D508; 0065; Additional folding */
+    { 0x01D509, 0x01D509, { 0x000066 } }, /* 1D509; 0066; Additional folding */
+    { 0x01D50A, 0x01D50A, { 0x000067 } }, /* 1D50A; 0067; Additional folding */
+    { 0x01D50D, 0x01D50D, { 0x00006A } }, /* 1D50D; 006A; Additional folding */
+    { 0x01D50E, 0x01D50E, { 0x00006B } }, /* 1D50E; 006B; Additional folding */
+    { 0x01D50F, 0x01D50F, { 0x00006C } }, /* 1D50F; 006C; Additional folding */
+    { 0x01D510, 0x01D510, { 0x00006D } }, /* 1D510; 006D; Additional folding */
+    { 0x01D511, 0x01D511, { 0x00006E } }, /* 1D511; 006E; Additional folding */
+    { 0x01D512, 0x01D512, { 0x00006F } }, /* 1D512; 006F; Additional folding */
+    { 0x01D513, 0x01D513, { 0x000070 } }, /* 1D513; 0070; Additional folding */
+    { 0x01D514, 0x01D514, { 0x000071 } }, /* 1D514; 0071; Additional folding */
+    { 0x01D516, 0x01D516, { 0x000073 } }, /* 1D516; 0073; Additional folding */
+    { 0x01D517, 0x01D517, { 0x000074 } }, /* 1D517; 0074; Additional folding */
+    { 0x01D518, 0x01D518, { 0x000075 } }, /* 1D518; 0075; Additional folding */
+    { 0x01D519, 0x01D519, { 0x000076 } }, /* 1D519; 0076; Additional folding */
+    { 0x01D51A, 0x01D51A, { 0x000077 } }, /* 1D51A; 0077; Additional folding */
+    { 0x01D51B, 0x01D51B, { 0x000078 } }, /* 1D51B; 0078; Additional folding */
+    { 0x01D51C, 0x01D51C, { 0x000079 } }, /* 1D51C; 0079; Additional folding */
+    { 0x01D538, 0x01D538, { 0x000061 } }, /* 1D538; 0061; Additional folding */
+    { 0x01D539, 0x01D539, { 0x000062 } }, /* 1D539; 0062; Additional folding */
+    { 0x01D53B, 0x01D53B, { 0x000064 } }, /* 1D53B; 0064; Additional folding */
+    { 0x01D53C, 0x01D53C, { 0x000065 } }, /* 1D53C; 0065; Additional folding */
+    { 0x01D53D, 0x01D53D, { 0x000066 } }, /* 1D53D; 0066; Additional folding */
+    { 0x01D53E, 0x01D53E, { 0x000067 } }, /* 1D53E; 0067; Additional folding */
+    { 0x01D540, 0x01D540, { 0x000069 } }, /* 1D540; 0069; Additional folding */
+    { 0x01D541, 0x01D541, { 0x00006A } }, /* 1D541; 006A; Additional folding */
+    { 0x01D542, 0x01D542, { 0x00006B } }, /* 1D542; 006B; Additional folding */
+    { 0x01D543, 0x01D543, { 0x00006C } }, /* 1D543; 006C; Additional folding */
+    { 0x01D544, 0x01D544, { 0x00006D } }, /* 1D544; 006D; Additional folding */
+    { 0x01D546, 0x01D546, { 0x00006F } }, /* 1D546; 006F; Additional folding */
+    { 0x01D54A, 0x01D54A, { 0x000073 } }, /* 1D54A; 0073; Additional folding */
+    { 0x01D54B, 0x01D54B, { 0x000074 } }, /* 1D54B; 0074; Additional folding */
+    { 0x01D54C, 0x01D54C, { 0x000075 } }, /* 1D54C; 0075; Additional folding */
+    { 0x01D54D, 0x01D54D, { 0x000076 } }, /* 1D54D; 0076; Additional folding */
+    { 0x01D54E, 0x01D54E, { 0x000077 } }, /* 1D54E; 0077; Additional folding */
+    { 0x01D54F, 0x01D54F, { 0x000078 } }, /* 1D54F; 0078; Additional folding */
+    { 0x01D550, 0x01D550, { 0x000079 } }, /* 1D550; 0079; Additional folding */
+    { 0x01D56C, 0x01D56C, { 0x000061 } }, /* 1D56C; 0061; Additional folding */
+    { 0x01D56D, 0x01D56D, { 0x000062 } }, /* 1D56D; 0062; Additional folding */
+    { 0x01D56E, 0x01D56E, { 0x000063 } }, /* 1D56E; 0063; Additional folding */
+    { 0x01D56F, 0x01D56F, { 0x000064 } }, /* 1D56F; 0064; Additional folding */
+    { 0x01D570, 0x01D570, { 0x000065 } }, /* 1D570; 0065; Additional folding */
+    { 0x01D571, 0x01D571, { 0x000066 } }, /* 1D571; 0066; Additional folding */
+    { 0x01D572, 0x01D572, { 0x000067 } }, /* 1D572; 0067; Additional folding */
+    { 0x01D573, 0x01D573, { 0x000068 } }, /* 1D573; 0068; Additional folding */
+    { 0x01D574, 0x01D574, { 0x000069 } }, /* 1D574; 0069; Additional folding */
+    { 0x01D575, 0x01D575, { 0x00006A } }, /* 1D575; 006A; Additional folding */
+    { 0x01D576, 0x01D576, { 0x00006B } }, /* 1D576; 006B; Additional folding */
+    { 0x01D577, 0x01D577, { 0x00006C } }, /* 1D577; 006C; Additional folding */
+    { 0x01D578, 0x01D578, { 0x00006D } }, /* 1D578; 006D; Additional folding */
+    { 0x01D579, 0x01D579, { 0x00006E } }, /* 1D579; 006E; Additional folding */
+    { 0x01D57A, 0x01D57A, { 0x00006F } }, /* 1D57A; 006F; Additional folding */
+    { 0x01D57B, 0x01D57B, { 0x000070 } }, /* 1D57B; 0070; Additional folding */
+    { 0x01D57C, 0x01D57C, { 0x000071 } }, /* 1D57C; 0071; Additional folding */
+    { 0x01D57D, 0x01D57D, { 0x000072 } }, /* 1D57D; 0072; Additional folding */
+    { 0x01D57E, 0x01D57E, { 0x000073 } }, /* 1D57E; 0073; Additional folding */
+    { 0x01D57F, 0x01D57F, { 0x000074 } }, /* 1D57F; 0074; Additional folding */
+    { 0x01D580, 0x01D580, { 0x000075 } }, /* 1D580; 0075; Additional folding */
+    { 0x01D581, 0x01D581, { 0x000076 } }, /* 1D581; 0076; Additional folding */
+    { 0x01D582, 0x01D582, { 0x000077 } }, /* 1D582; 0077; Additional folding */
+    { 0x01D583, 0x01D583, { 0x000078 } }, /* 1D583; 0078; Additional folding */
+    { 0x01D584, 0x01D584, { 0x000079 } }, /* 1D584; 0079; Additional folding */
+    { 0x01D585, 0x01D585, { 0x00007A } }, /* 1D585; 007A; Additional folding */
+    { 0x01D5A0, 0x01D5A0, { 0x000061 } }, /* 1D5A0; 0061; Additional folding */
+    { 0x01D5A1, 0x01D5A1, { 0x000062 } }, /* 1D5A1; 0062; Additional folding */
+    { 0x01D5A2, 0x01D5A2, { 0x000063 } }, /* 1D5A2; 0063; Additional folding */
+    { 0x01D5A3, 0x01D5A3, { 0x000064 } }, /* 1D5A3; 0064; Additional folding */
+    { 0x01D5A4, 0x01D5A4, { 0x000065 } }, /* 1D5A4; 0065; Additional folding */
+    { 0x01D5A5, 0x01D5A5, { 0x000066 } }, /* 1D5A5; 0066; Additional folding */
+    { 0x01D5A6, 0x01D5A6, { 0x000067 } }, /* 1D5A6; 0067; Additional folding */
+    { 0x01D5A7, 0x01D5A7, { 0x000068 } }, /* 1D5A7; 0068; Additional folding */
+    { 0x01D5A8, 0x01D5A8, { 0x000069 } }, /* 1D5A8; 0069; Additional folding */
+    { 0x01D5A9, 0x01D5A9, { 0x00006A } }, /* 1D5A9; 006A; Additional folding */
+    { 0x01D5AA, 0x01D5AA, { 0x00006B } }, /* 1D5AA; 006B; Additional folding */
+    { 0x01D5AB, 0x01D5AB, { 0x00006C } }, /* 1D5AB; 006C; Additional folding */
+    { 0x01D5AC, 0x01D5AC, { 0x00006D } }, /* 1D5AC; 006D; Additional folding */
+    { 0x01D5AD, 0x01D5AD, { 0x00006E } }, /* 1D5AD; 006E; Additional folding */
+    { 0x01D5AE, 0x01D5AE, { 0x00006F } }, /* 1D5AE; 006F; Additional folding */
+    { 0x01D5AF, 0x01D5AF, { 0x000070 } }, /* 1D5AF; 0070; Additional folding */
+    { 0x01D5B0, 0x01D5B0, { 0x000071 } }, /* 1D5B0; 0071; Additional folding */
+    { 0x01D5B1, 0x01D5B1, { 0x000072 } }, /* 1D5B1; 0072; Additional folding */
+    { 0x01D5B2, 0x01D5B2, { 0x000073 } }, /* 1D5B2; 0073; Additional folding */
+    { 0x01D5B3, 0x01D5B3, { 0x000074 } }, /* 1D5B3; 0074; Additional folding */
+    { 0x01D5B4, 0x01D5B4, { 0x000075 } }, /* 1D5B4; 0075; Additional folding */
+    { 0x01D5B5, 0x01D5B5, { 0x000076 } }, /* 1D5B5; 0076; Additional folding */
+    { 0x01D5B6, 0x01D5B6, { 0x000077 } }, /* 1D5B6; 0077; Additional folding */
+    { 0x01D5B7, 0x01D5B7, { 0x000078 } }, /* 1D5B7; 0078; Additional folding */
+    { 0x01D5B8, 0x01D5B8, { 0x000079 } }, /* 1D5B8; 0079; Additional folding */
+    { 0x01D5B9, 0x01D5B9, { 0x00007A } }, /* 1D5B9; 007A; Additional folding */
+    { 0x01D5D4, 0x01D5D4, { 0x000061 } }, /* 1D5D4; 0061; Additional folding */
+    { 0x01D5D5, 0x01D5D5, { 0x000062 } }, /* 1D5D5; 0062; Additional folding */
+    { 0x01D5D6, 0x01D5D6, { 0x000063 } }, /* 1D5D6; 0063; Additional folding */
+    { 0x01D5D7, 0x01D5D7, { 0x000064 } }, /* 1D5D7; 0064; Additional folding */
+    { 0x01D5D8, 0x01D5D8, { 0x000065 } }, /* 1D5D8; 0065; Additional folding */
+    { 0x01D5D9, 0x01D5D9, { 0x000066 } }, /* 1D5D9; 0066; Additional folding */
+    { 0x01D5DA, 0x01D5DA, { 0x000067 } }, /* 1D5DA; 0067; Additional folding */
+    { 0x01D5DB, 0x01D5DB, { 0x000068 } }, /* 1D5DB; 0068; Additional folding */
+    { 0x01D5DC, 0x01D5DC, { 0x000069 } }, /* 1D5DC; 0069; Additional folding */
+    { 0x01D5DD, 0x01D5DD, { 0x00006A } }, /* 1D5DD; 006A; Additional folding */
+    { 0x01D5DE, 0x01D5DE, { 0x00006B } }, /* 1D5DE; 006B; Additional folding */
+    { 0x01D5DF, 0x01D5DF, { 0x00006C } }, /* 1D5DF; 006C; Additional folding */
+    { 0x01D5E0, 0x01D5E0, { 0x00006D } }, /* 1D5E0; 006D; Additional folding */
+    { 0x01D5E1, 0x01D5E1, { 0x00006E } }, /* 1D5E1; 006E; Additional folding */
+    { 0x01D5E2, 0x01D5E2, { 0x00006F } }, /* 1D5E2; 006F; Additional folding */
+    { 0x01D5E3, 0x01D5E3, { 0x000070 } }, /* 1D5E3; 0070; Additional folding */
+    { 0x01D5E4, 0x01D5E4, { 0x000071 } }, /* 1D5E4; 0071; Additional folding */
+    { 0x01D5E5, 0x01D5E5, { 0x000072 } }, /* 1D5E5; 0072; Additional folding */
+    { 0x01D5E6, 0x01D5E6, { 0x000073 } }, /* 1D5E6; 0073; Additional folding */
+    { 0x01D5E7, 0x01D5E7, { 0x000074 } }, /* 1D5E7; 0074; Additional folding */
+    { 0x01D5E8, 0x01D5E8, { 0x000075 } }, /* 1D5E8; 0075; Additional folding */
+    { 0x01D5E9, 0x01D5E9, { 0x000076 } }, /* 1D5E9; 0076; Additional folding */
+    { 0x01D5EA, 0x01D5EA, { 0x000077 } }, /* 1D5EA; 0077; Additional folding */
+    { 0x01D5EB, 0x01D5EB, { 0x000078 } }, /* 1D5EB; 0078; Additional folding */
+    { 0x01D5EC, 0x01D5EC, { 0x000079 } }, /* 1D5EC; 0079; Additional folding */
+    { 0x01D5ED, 0x01D5ED, { 0x00007A } }, /* 1D5ED; 007A; Additional folding */
+    { 0x01D608, 0x01D608, { 0x000061 } }, /* 1D608; 0061; Additional folding */
+    { 0x01D609, 0x01D609, { 0x000062 } }, /* 1D609; 0062; Additional folding */
+    { 0x01D60A, 0x01D60A, { 0x000063 } }, /* 1D60A; 0063; Additional folding */
+    { 0x01D60B, 0x01D60B, { 0x000064 } }, /* 1D60B; 0064; Additional folding */
+    { 0x01D60C, 0x01D60C, { 0x000065 } }, /* 1D60C; 0065; Additional folding */
+    { 0x01D60D, 0x01D60D, { 0x000066 } }, /* 1D60D; 0066; Additional folding */
+    { 0x01D60E, 0x01D60E, { 0x000067 } }, /* 1D60E; 0067; Additional folding */
+    { 0x01D60F, 0x01D60F, { 0x000068 } }, /* 1D60F; 0068; Additional folding */
+    { 0x01D610, 0x01D610, { 0x000069 } }, /* 1D610; 0069; Additional folding */
+    { 0x01D611, 0x01D611, { 0x00006A } }, /* 1D611; 006A; Additional folding */
+    { 0x01D612, 0x01D612, { 0x00006B } }, /* 1D612; 006B; Additional folding */
+    { 0x01D613, 0x01D613, { 0x00006C } }, /* 1D613; 006C; Additional folding */
+    { 0x01D614, 0x01D614, { 0x00006D } }, /* 1D614; 006D; Additional folding */
+    { 0x01D615, 0x01D615, { 0x00006E } }, /* 1D615; 006E; Additional folding */
+    { 0x01D616, 0x01D616, { 0x00006F } }, /* 1D616; 006F; Additional folding */
+    { 0x01D617, 0x01D617, { 0x000070 } }, /* 1D617; 0070; Additional folding */
+    { 0x01D618, 0x01D618, { 0x000071 } }, /* 1D618; 0071; Additional folding */
+    { 0x01D619, 0x01D619, { 0x000072 } }, /* 1D619; 0072; Additional folding */
+    { 0x01D61A, 0x01D61A, { 0x000073 } }, /* 1D61A; 0073; Additional folding */
+    { 0x01D61B, 0x01D61B, { 0x000074 } }, /* 1D61B; 0074; Additional folding */
+    { 0x01D61C, 0x01D61C, { 0x000075 } }, /* 1D61C; 0075; Additional folding */
+    { 0x01D61D, 0x01D61D, { 0x000076 } }, /* 1D61D; 0076; Additional folding */
+    { 0x01D61E, 0x01D61E, { 0x000077 } }, /* 1D61E; 0077; Additional folding */
+    { 0x01D61F, 0x01D61F, { 0x000078 } }, /* 1D61F; 0078; Additional folding */
+    { 0x01D620, 0x01D620, { 0x000079 } }, /* 1D620; 0079; Additional folding */
+    { 0x01D621, 0x01D621, { 0x00007A } }, /* 1D621; 007A; Additional folding */
+    { 0x01D63C, 0x01D63C, { 0x000061 } }, /* 1D63C; 0061; Additional folding */
+    { 0x01D63D, 0x01D63D, { 0x000062 } }, /* 1D63D; 0062; Additional folding */
+    { 0x01D63E, 0x01D63E, { 0x000063 } }, /* 1D63E; 0063; Additional folding */
+    { 0x01D63F, 0x01D63F, { 0x000064 } }, /* 1D63F; 0064; Additional folding */
+    { 0x01D640, 0x01D640, { 0x000065 } }, /* 1D640; 0065; Additional folding */
+    { 0x01D641, 0x01D641, { 0x000066 } }, /* 1D641; 0066; Additional folding */
+    { 0x01D642, 0x01D642, { 0x000067 } }, /* 1D642; 0067; Additional folding */
+    { 0x01D643, 0x01D643, { 0x000068 } }, /* 1D643; 0068; Additional folding */
+    { 0x01D644, 0x01D644, { 0x000069 } }, /* 1D644; 0069; Additional folding */
+    { 0x01D645, 0x01D645, { 0x00006A } }, /* 1D645; 006A; Additional folding */
+    { 0x01D646, 0x01D646, { 0x00006B } }, /* 1D646; 006B; Additional folding */
+    { 0x01D647, 0x01D647, { 0x00006C } }, /* 1D647; 006C; Additional folding */
+    { 0x01D648, 0x01D648, { 0x00006D } }, /* 1D648; 006D; Additional folding */
+    { 0x01D649, 0x01D649, { 0x00006E } }, /* 1D649; 006E; Additional folding */
+    { 0x01D64A, 0x01D64A, { 0x00006F } }, /* 1D64A; 006F; Additional folding */
+    { 0x01D64B, 0x01D64B, { 0x000070 } }, /* 1D64B; 0070; Additional folding */
+    { 0x01D64C, 0x01D64C, { 0x000071 } }, /* 1D64C; 0071; Additional folding */
+    { 0x01D64D, 0x01D64D, { 0x000072 } }, /* 1D64D; 0072; Additional folding */
+    { 0x01D64E, 0x01D64E, { 0x000073 } }, /* 1D64E; 0073; Additional folding */
+    { 0x01D64F, 0x01D64F, { 0x000074 } }, /* 1D64F; 0074; Additional folding */
+    { 0x01D650, 0x01D650, { 0x000075 } }, /* 1D650; 0075; Additional folding */
+    { 0x01D651, 0x01D651, { 0x000076 } }, /* 1D651; 0076; Additional folding */
+    { 0x01D652, 0x01D652, { 0x000077 } }, /* 1D652; 0077; Additional folding */
+    { 0x01D653, 0x01D653, { 0x000078 } }, /* 1D653; 0078; Additional folding */
+    { 0x01D654, 0x01D654, { 0x000079 } }, /* 1D654; 0079; Additional folding */
+    { 0x01D655, 0x01D655, { 0x00007A } }, /* 1D655; 007A; Additional folding */
+    { 0x01D670, 0x01D670, { 0x000061 } }, /* 1D670; 0061; Additional folding */
+    { 0x01D671, 0x01D671, { 0x000062 } }, /* 1D671; 0062; Additional folding */
+    { 0x01D672, 0x01D672, { 0x000063 } }, /* 1D672; 0063; Additional folding */
+    { 0x01D673, 0x01D673, { 0x000064 } }, /* 1D673; 0064; Additional folding */
+    { 0x01D674, 0x01D674, { 0x000065 } }, /* 1D674; 0065; Additional folding */
+    { 0x01D675, 0x01D675, { 0x000066 } }, /* 1D675; 0066; Additional folding */
+    { 0x01D676, 0x01D676, { 0x000067 } }, /* 1D676; 0067; Additional folding */
+    { 0x01D677, 0x01D677, { 0x000068 } }, /* 1D677; 0068; Additional folding */
+    { 0x01D678, 0x01D678, { 0x000069 } }, /* 1D678; 0069; Additional folding */
+    { 0x01D679, 0x01D679, { 0x00006A } }, /* 1D679; 006A; Additional folding */
+    { 0x01D67A, 0x01D67A, { 0x00006B } }, /* 1D67A; 006B; Additional folding */
+    { 0x01D67B, 0x01D67B, { 0x00006C } }, /* 1D67B; 006C; Additional folding */
+    { 0x01D67C, 0x01D67C, { 0x00006D } }, /* 1D67C; 006D; Additional folding */
+    { 0x01D67D, 0x01D67D, { 0x00006E } }, /* 1D67D; 006E; Additional folding */
+    { 0x01D67E, 0x01D67E, { 0x00006F } }, /* 1D67E; 006F; Additional folding */
+    { 0x01D67F, 0x01D67F, { 0x000070 } }, /* 1D67F; 0070; Additional folding */
+    { 0x01D680, 0x01D680, { 0x000071 } }, /* 1D680; 0071; Additional folding */
+    { 0x01D681, 0x01D681, { 0x000072 } }, /* 1D681; 0072; Additional folding */
+    { 0x01D682, 0x01D682, { 0x000073 } }, /* 1D682; 0073; Additional folding */
+    { 0x01D683, 0x01D683, { 0x000074 } }, /* 1D683; 0074; Additional folding */
+    { 0x01D684, 0x01D684, { 0x000075 } }, /* 1D684; 0075; Additional folding */
+    { 0x01D685, 0x01D685, { 0x000076 } }, /* 1D685; 0076; Additional folding */
+    { 0x01D686, 0x01D686, { 0x000077 } }, /* 1D686; 0077; Additional folding */
+    { 0x01D687, 0x01D687, { 0x000078 } }, /* 1D687; 0078; Additional folding */
+    { 0x01D688, 0x01D688, { 0x000079 } }, /* 1D688; 0079; Additional folding */
+    { 0x01D689, 0x01D689, { 0x00007A } }, /* 1D689; 007A; Additional folding */
+    { 0x01D6A8, 0x01D6A8, { 0x0003B1 } }, /* 1D6A8; 03B1; Additional folding */
+    { 0x01D6A9, 0x01D6A9, { 0x0003B2 } }, /* 1D6A9; 03B2; Additional folding */
+    { 0x01D6AA, 0x01D6AA, { 0x0003B3 } }, /* 1D6AA; 03B3; Additional folding */
+    { 0x01D6AB, 0x01D6AB, { 0x0003B4 } }, /* 1D6AB; 03B4; Additional folding */
+    { 0x01D6AC, 0x01D6AC, { 0x0003B5 } }, /* 1D6AC; 03B5; Additional folding */
+    { 0x01D6AD, 0x01D6AD, { 0x0003B6 } }, /* 1D6AD; 03B6; Additional folding */
+    { 0x01D6AE, 0x01D6AE, { 0x0003B7 } }, /* 1D6AE; 03B7; Additional folding */
+    { 0x01D6AF, 0x01D6AF, { 0x0003B8 } }, /* 1D6AF; 03B8; Additional folding */
+    { 0x01D6B0, 0x01D6B0, { 0x0003B9 } }, /* 1D6B0; 03B9; Additional folding */
+    { 0x01D6B1, 0x01D6B1, { 0x0003BA } }, /* 1D6B1; 03BA; Additional folding */
+    { 0x01D6B2, 0x01D6B2, { 0x0003BB } }, /* 1D6B2; 03BB; Additional folding */
+    { 0x01D6B3, 0x01D6B3, { 0x0003BC } }, /* 1D6B3; 03BC; Additional folding */
+    { 0x01D6B4, 0x01D6B4, { 0x0003BD } }, /* 1D6B4; 03BD; Additional folding */
+    { 0x01D6B5, 0x01D6B5, { 0x0003BE } }, /* 1D6B5; 03BE; Additional folding */
+    { 0x01D6B6, 0x01D6B6, { 0x0003BF } }, /* 1D6B6; 03BF; Additional folding */
+    { 0x01D6B7, 0x01D6B7, { 0x0003C0 } }, /* 1D6B7; 03C0; Additional folding */
+    { 0x01D6B8, 0x01D6B8, { 0x0003C1 } }, /* 1D6B8; 03C1; Additional folding */
+    { 0x01D6B9, 0x01D6B9, { 0x0003B8 } }, /* 1D6B9; 03B8; Additional folding */
+    { 0x01D6BA, 0x01D6BA, { 0x0003C3 } }, /* 1D6BA; 03C3; Additional folding */
+    { 0x01D6BB, 0x01D6BB, { 0x0003C4 } }, /* 1D6BB; 03C4; Additional folding */
+    { 0x01D6BC, 0x01D6BC, { 0x0003C5 } }, /* 1D6BC; 03C5; Additional folding */
+    { 0x01D6BD, 0x01D6BD, { 0x0003C6 } }, /* 1D6BD; 03C6; Additional folding */
+    { 0x01D6BE, 0x01D6BE, { 0x0003C7 } }, /* 1D6BE; 03C7; Additional folding */
+    { 0x01D6BF, 0x01D6BF, { 0x0003C8 } }, /* 1D6BF; 03C8; Additional folding */
+    { 0x01D6C0, 0x01D6C0, { 0x0003C9 } }, /* 1D6C0; 03C9; Additional folding */
+    { 0x01D6D3, 0x01D6D3, { 0x0003C3 } }, /* 1D6D3; 03C3; Additional folding */
+    { 0x01D6E2, 0x01D6E2, { 0x0003B1 } }, /* 1D6E2; 03B1; Additional folding */
+    { 0x01D6E3, 0x01D6E3, { 0x0003B2 } }, /* 1D6E3; 03B2; Additional folding */
+    { 0x01D6E4, 0x01D6E4, { 0x0003B3 } }, /* 1D6E4; 03B3; Additional folding */
+    { 0x01D6E5, 0x01D6E5, { 0x0003B4 } }, /* 1D6E5; 03B4; Additional folding */
+    { 0x01D6E6, 0x01D6E6, { 0x0003B5 } }, /* 1D6E6; 03B5; Additional folding */
+    { 0x01D6E7, 0x01D6E7, { 0x0003B6 } }, /* 1D6E7; 03B6; Additional folding */
+    { 0x01D6E8, 0x01D6E8, { 0x0003B7 } }, /* 1D6E8; 03B7; Additional folding */
+    { 0x01D6E9, 0x01D6E9, { 0x0003B8 } }, /* 1D6E9; 03B8; Additional folding */
+    { 0x01D6EA, 0x01D6EA, { 0x0003B9 } }, /* 1D6EA; 03B9; Additional folding */
+    { 0x01D6EB, 0x01D6EB, { 0x0003BA } }, /* 1D6EB; 03BA; Additional folding */
+    { 0x01D6EC, 0x01D6EC, { 0x0003BB } }, /* 1D6EC; 03BB; Additional folding */
+    { 0x01D6ED, 0x01D6ED, { 0x0003BC } }, /* 1D6ED; 03BC; Additional folding */
+    { 0x01D6EE, 0x01D6EE, { 0x0003BD } }, /* 1D6EE; 03BD; Additional folding */
+    { 0x01D6EF, 0x01D6EF, { 0x0003BE } }, /* 1D6EF; 03BE; Additional folding */
+    { 0x01D6F0, 0x01D6F0, { 0x0003BF } }, /* 1D6F0; 03BF; Additional folding */
+    { 0x01D6F1, 0x01D6F1, { 0x0003C0 } }, /* 1D6F1; 03C0; Additional folding */
+    { 0x01D6F2, 0x01D6F2, { 0x0003C1 } }, /* 1D6F2; 03C1; Additional folding */
+    { 0x01D6F3, 0x01D6F3, { 0x0003B8 } }, /* 1D6F3; 03B8; Additional folding */
+    { 0x01D6F4, 0x01D6F4, { 0x0003C3 } }, /* 1D6F4; 03C3; Additional folding */
+    { 0x01D6F5, 0x01D6F5, { 0x0003C4 } }, /* 1D6F5; 03C4; Additional folding */
+    { 0x01D6F6, 0x01D6F6, { 0x0003C5 } }, /* 1D6F6; 03C5; Additional folding */
+    { 0x01D6F7, 0x01D6F7, { 0x0003C6 } }, /* 1D6F7; 03C6; Additional folding */
+    { 0x01D6F8, 0x01D6F8, { 0x0003C7 } }, /* 1D6F8; 03C7; Additional folding */
+    { 0x01D6F9, 0x01D6F9, { 0x0003C8 } }, /* 1D6F9; 03C8; Additional folding */
+    { 0x01D6FA, 0x01D6FA, { 0x0003C9 } }, /* 1D6FA; 03C9; Additional folding */
+    { 0x01D70D, 0x01D70D, { 0x0003C3 } }, /* 1D70D; 03C3; Additional folding */
+    { 0x01D71C, 0x01D71C, { 0x0003B1 } }, /* 1D71C; 03B1; Additional folding */
+    { 0x01D71D, 0x01D71D, { 0x0003B2 } }, /* 1D71D; 03B2; Additional folding */
+    { 0x01D71E, 0x01D71E, { 0x0003B3 } }, /* 1D71E; 03B3; Additional folding */
+    { 0x01D71F, 0x01D71F, { 0x0003B4 } }, /* 1D71F; 03B4; Additional folding */
+    { 0x01D720, 0x01D720, { 0x0003B5 } }, /* 1D720; 03B5; Additional folding */
+    { 0x01D721, 0x01D721, { 0x0003B6 } }, /* 1D721; 03B6; Additional folding */
+    { 0x01D722, 0x01D722, { 0x0003B7 } }, /* 1D722; 03B7; Additional folding */
+    { 0x01D723, 0x01D723, { 0x0003B8 } }, /* 1D723; 03B8; Additional folding */
+    { 0x01D724, 0x01D724, { 0x0003B9 } }, /* 1D724; 03B9; Additional folding */
+    { 0x01D725, 0x01D725, { 0x0003BA } }, /* 1D725; 03BA; Additional folding */
+    { 0x01D726, 0x01D726, { 0x0003BB } }, /* 1D726; 03BB; Additional folding */
+    { 0x01D727, 0x01D727, { 0x0003BC } }, /* 1D727; 03BC; Additional folding */
+    { 0x01D728, 0x01D728, { 0x0003BD } }, /* 1D728; 03BD; Additional folding */
+    { 0x01D729, 0x01D729, { 0x0003BE } }, /* 1D729; 03BE; Additional folding */
+    { 0x01D72A, 0x01D72A, { 0x0003BF } }, /* 1D72A; 03BF; Additional folding */
+    { 0x01D72B, 0x01D72B, { 0x0003C0 } }, /* 1D72B; 03C0; Additional folding */
+    { 0x01D72C, 0x01D72C, { 0x0003C1 } }, /* 1D72C; 03C1; Additional folding */
+    { 0x01D72D, 0x01D72D, { 0x0003B8 } }, /* 1D72D; 03B8; Additional folding */
+    { 0x01D72E, 0x01D72E, { 0x0003C3 } }, /* 1D72E; 03C3; Additional folding */
+    { 0x01D72F, 0x01D72F, { 0x0003C4 } }, /* 1D72F; 03C4; Additional folding */
+    { 0x01D730, 0x01D730, { 0x0003C5 } }, /* 1D730; 03C5; Additional folding */
+    { 0x01D731, 0x01D731, { 0x0003C6 } }, /* 1D731; 03C6; Additional folding */
+    { 0x01D732, 0x01D732, { 0x0003C7 } }, /* 1D732; 03C7; Additional folding */
+    { 0x01D733, 0x01D733, { 0x0003C8 } }, /* 1D733; 03C8; Additional folding */
+    { 0x01D734, 0x01D734, { 0x0003C9 } }, /* 1D734; 03C9; Additional folding */
+    { 0x01D747, 0x01D747, { 0x0003C3 } }, /* 1D747; 03C3; Additional folding */
+    { 0x01D756, 0x01D756, { 0x0003B1 } }, /* 1D756; 03B1; Additional folding */
+    { 0x01D757, 0x01D757, { 0x0003B2 } }, /* 1D757; 03B2; Additional folding */
+    { 0x01D758, 0x01D758, { 0x0003B3 } }, /* 1D758; 03B3; Additional folding */
+    { 0x01D759, 0x01D759, { 0x0003B4 } }, /* 1D759; 03B4; Additional folding */
+    { 0x01D75A, 0x01D75A, { 0x0003B5 } }, /* 1D75A; 03B5; Additional folding */
+    { 0x01D75B, 0x01D75B, { 0x0003B6 } }, /* 1D75B; 03B6; Additional folding */
+    { 0x01D75C, 0x01D75C, { 0x0003B7 } }, /* 1D75C; 03B7; Additional folding */
+    { 0x01D75D, 0x01D75D, { 0x0003B8 } }, /* 1D75D; 03B8; Additional folding */
+    { 0x01D75E, 0x01D75E, { 0x0003B9 } }, /* 1D75E; 03B9; Additional folding */
+    { 0x01D75F, 0x01D75F, { 0x0003BA } }, /* 1D75F; 03BA; Additional folding */
+    { 0x01D760, 0x01D760, { 0x0003BB } }, /* 1D760; 03BB; Additional folding */
+    { 0x01D761, 0x01D761, { 0x0003BC } }, /* 1D761; 03BC; Additional folding */
+    { 0x01D762, 0x01D762, { 0x0003BD } }, /* 1D762; 03BD; Additional folding */
+    { 0x01D763, 0x01D763, { 0x0003BE } }, /* 1D763; 03BE; Additional folding */
+    { 0x01D764, 0x01D764, { 0x0003BF } }, /* 1D764; 03BF; Additional folding */
+    { 0x01D765, 0x01D765, { 0x0003C0 } }, /* 1D765; 03C0; Additional folding */
+    { 0x01D766, 0x01D766, { 0x0003C1 } }, /* 1D766; 03C1; Additional folding */
+    { 0x01D767, 0x01D767, { 0x0003B8 } }, /* 1D767; 03B8; Additional folding */
+    { 0x01D768, 0x01D768, { 0x0003C3 } }, /* 1D768; 03C3; Additional folding */
+    { 0x01D769, 0x01D769, { 0x0003C4 } }, /* 1D769; 03C4; Additional folding */
+    { 0x01D76A, 0x01D76A, { 0x0003C5 } }, /* 1D76A; 03C5; Additional folding */
+    { 0x01D76B, 0x01D76B, { 0x0003C6 } }, /* 1D76B; 03C6; Additional folding */
+    { 0x01D76C, 0x01D76C, { 0x0003C7 } }, /* 1D76C; 03C7; Additional folding */
+    { 0x01D76D, 0x01D76D, { 0x0003C8 } }, /* 1D76D; 03C8; Additional folding */
+    { 0x01D76E, 0x01D76E, { 0x0003C9 } }, /* 1D76E; 03C9; Additional folding */
+    { 0x01D781, 0x01D781, { 0x0003C3 } }, /* 1D781; 03C3; Additional folding */
+    { 0x01D790, 0x01D790, { 0x0003B1 } }, /* 1D790; 03B1; Additional folding */
+    { 0x01D791, 0x01D791, { 0x0003B2 } }, /* 1D791; 03B2; Additional folding */
+    { 0x01D792, 0x01D792, { 0x0003B3 } }, /* 1D792; 03B3; Additional folding */
+    { 0x01D793, 0x01D793, { 0x0003B4 } }, /* 1D793; 03B4; Additional folding */
+    { 0x01D794, 0x01D794, { 0x0003B5 } }, /* 1D794; 03B5; Additional folding */
+    { 0x01D795, 0x01D795, { 0x0003B6 } }, /* 1D795; 03B6; Additional folding */
+    { 0x01D796, 0x01D796, { 0x0003B7 } }, /* 1D796; 03B7; Additional folding */
+    { 0x01D797, 0x01D797, { 0x0003B8 } }, /* 1D797; 03B8; Additional folding */
+    { 0x01D798, 0x01D798, { 0x0003B9 } }, /* 1D798; 03B9; Additional folding */
+    { 0x01D799, 0x01D799, { 0x0003BA } }, /* 1D799; 03BA; Additional folding */
+    { 0x01D79A, 0x01D79A, { 0x0003BB } }, /* 1D79A; 03BB; Additional folding */
+    { 0x01D79B, 0x01D79B, { 0x0003BC } }, /* 1D79B; 03BC; Additional folding */
+    { 0x01D79C, 0x01D79C, { 0x0003BD } }, /* 1D79C; 03BD; Additional folding */
+    { 0x01D79D, 0x01D79D, { 0x0003BE } }, /* 1D79D; 03BE; Additional folding */
+    { 0x01D79E, 0x01D79E, { 0x0003BF } }, /* 1D79E; 03BF; Additional folding */
+    { 0x01D79F, 0x01D79F, { 0x0003C0 } }, /* 1D79F; 03C0; Additional folding */
+    { 0x01D7A0, 0x01D7A0, { 0x0003C1 } }, /* 1D7A0; 03C1; Additional folding */
+    { 0x01D7A1, 0x01D7A1, { 0x0003B8 } }, /* 1D7A1; 03B8; Additional folding */
+    { 0x01D7A2, 0x01D7A2, { 0x0003C3 } }, /* 1D7A2; 03C3; Additional folding */
+    { 0x01D7A3, 0x01D7A3, { 0x0003C4 } }, /* 1D7A3; 03C4; Additional folding */
+    { 0x01D7A4, 0x01D7A4, { 0x0003C5 } }, /* 1D7A4; 03C5; Additional folding */
+    { 0x01D7A5, 0x01D7A5, { 0x0003C6 } }, /* 1D7A5; 03C6; Additional folding */
+    { 0x01D7A6, 0x01D7A6, { 0x0003C7 } }, /* 1D7A6; 03C7; Additional folding */
+    { 0x01D7A7, 0x01D7A7, { 0x0003C8 } }, /* 1D7A7; 03C8; Additional folding */
+    { 0x01D7A8, 0x01D7A8, { 0x0003C9 } }, /* 1D7A8; 03C9; Additional folding */
+    { 0x01D7BB, 0x01D7BB, { 0x0003C3 } }, /* 1D7BB; 03C3; Additional folding */
+    { 0 },
+};
+
+/*
+ * FF3A; FF5A; Case map
+ * 10400; 10428; Case map
+10401; 10429; Case map
+10402; 1042A; Case map
+10403; 1042B; Case map
+10404; 1042C; Case map
+10405; 1042D; Case map
+10406; 1042E; Case map
+10407; 1042F; Case map
+10408; 10430; Case map
+10409; 10431; Case map
+1040A; 10432; Case map
+1040B; 10433; Case map
+1040C; 10434; Case map
+1040D; 10435; Case map
+1040E; 10436; Case map
+1040F; 10437; Case map
+10410; 10438; Case map
+10411; 10439; Case map
+10412; 1043A; Case map
+10413; 1043B; Case map
+10414; 1043C; Case map
+10415; 1043D; Case map
+10416; 1043E; Case map
+10417; 1043F; Case map
+10418; 10440; Case map
+10419; 10441; Case map
+1041A; 10442; Case map
+1041B; 10443; Case map
+1041C; 10444; Case map
+1041D; 10445; Case map
+1041E; 10446; Case map
+1041F; 10447; Case map
+10420; 10448; Case map
+10421; 10449; Case map
+10422; 1044A; Case map
+10423; 1044B; Case map
+10424; 1044C; Case map
+10425; 1044D; Case map
+1D400; 0061; Additional folding
+1D401; 0062; Additional folding
+1D402; 0063; Additional folding
+1D403; 0064; Additional folding
+1D404; 0065; Additional folding
+1D405; 0066; Additional folding
+1D406; 0067; Additional folding
+1D407; 0068; Additional folding
+1D408; 0069; Additional folding
+1D409; 006A; Additional folding
+1D40A; 006B; Additional folding
+1D40B; 006C; Additional folding
+1D40C; 006D; Additional folding
+1D40D; 006E; Additional folding
+1D40E; 006F; Additional folding
+1D40F; 0070; Additional folding
+1D410; 0071; Additional folding
+1D411; 0072; Additional folding
+1D412; 0073; Additional folding
+1D413; 0074; Additional folding
+1D414; 0075; Additional folding
+1D415; 0076; Additional folding
+1D416; 0077; Additional folding
+1D417; 0078; Additional folding
+1D418; 0079; Additional folding
+1D419; 007A; Additional folding
+1D434; 0061; Additional folding
+1D435; 0062; Additional folding
+1D436; 0063; Additional folding
+1D437; 0064; Additional folding
+1D438; 0065; Additional folding
+1D439; 0066; Additional folding
+1D43A; 0067; Additional folding
+1D43B; 0068; Additional folding
+1D43C; 0069; Additional folding
+1D43D; 006A; Additional folding
+1D43E; 006B; Additional folding
+1D43F; 006C; Additional folding
+1D440; 006D; Additional folding
+1D441; 006E; Additional folding
+1D442; 006F; Additional folding
+1D443; 0070; Additional folding
+1D444; 0071; Additional folding
+1D445; 0072; Additional folding
+1D446; 0073; Additional folding
+1D447; 0074; Additional folding
+1D448; 0075; Additional folding
+1D449; 0076; Additional folding
+1D44A; 0077; Additional folding
+1D44B; 0078; Additional folding
+1D44C; 0079; Additional folding
+1D44D; 007A; Additional folding
+1D468; 0061; Additional folding
+1D469; 0062; Additional folding
+1D46A; 0063; Additional folding
+1D46B; 0064; Additional folding
+1D46C; 0065; Additional folding
+1D46D; 0066; Additional folding
+1D46E; 0067; Additional folding
+1D46F; 0068; Additional folding
+1D470; 0069; Additional folding
+1D471; 006A; Additional folding
+1D472; 006B; Additional folding
+1D473; 006C; Additional folding
+1D474; 006D; Additional folding
+1D475; 006E; Additional folding
+1D476; 006F; Additional folding
+1D477; 0070; Additional folding
+1D478; 0071; Additional folding
+1D479; 0072; Additional folding
+1D47A; 0073; Additional folding
+1D47B; 0074; Additional folding
+1D47C; 0075; Additional folding
+1D47D; 0076; Additional folding
+1D47E; 0077; Additional folding
+1D47F; 0078; Additional folding
+1D480; 0079; Additional folding
+1D481; 007A; Additional folding
+1D49C; 0061; Additional folding
+1D49E; 0063; Additional folding
+1D49F; 0064; Additional folding
+1D4A2; 0067; Additional folding
+1D4A5; 006A; Additional folding
+1D4A6; 006B; Additional folding
+1D4A9; 006E; Additional folding
+1D4AA; 006F; Additional folding
+1D4AB; 0070; Additional folding
+1D4AC; 0071; Additional folding
+1D4AE; 0073; Additional folding
+1D4AF; 0074; Additional folding
+1D4B0; 0075; Additional folding
+1D4B1; 0076; Additional folding
+1D4B2; 0077; Additional folding
+1D4B3; 0078; Additional folding
+1D4B4; 0079; Additional folding
+1D4B5; 007A; Additional folding
+1D4D0; 0061; Additional folding
+1D4D1; 0062; Additional folding
+1D4D2; 0063; Additional folding
+1D4D3; 0064; Additional folding
+1D4D4; 0065; Additional folding
+1D4D5; 0066; Additional folding
+1D4D6; 0067; Additional folding
+1D4D7; 0068; Additional folding
+1D4D8; 0069; Additional folding
+1D4D9; 006A; Additional folding
+1D4DA; 006B; Additional folding
+1D4DB; 006C; Additional folding
+1D4DC; 006D; Additional folding
+1D4DD; 006E; Additional folding
+1D4DE; 006F; Additional folding
+1D4DF; 0070; Additional folding
+1D4E0; 0071; Additional folding
+1D4E1; 0072; Additional folding
+1D4E2; 0073; Additional folding
+1D4E3; 0074; Additional folding
+1D4E4; 0075; Additional folding
+1D4E5; 0076; Additional folding
+1D4E6; 0077; Additional folding
+1D4E7; 0078; Additional folding
+1D4E8; 0079; Additional folding
+1D4E9; 007A; Additional folding
+1D504; 0061; Additional folding
+1D505; 0062; Additional folding
+1D507; 0064; Additional folding
+1D508; 0065; Additional folding
+1D509; 0066; Additional folding
+1D50A; 0067; Additional folding
+1D50D; 006A; Additional folding
+1D50E; 006B; Additional folding
+1D50F; 006C; Additional folding
+1D510; 006D; Additional folding
+1D511; 006E; Additional folding
+1D512; 006F; Additional folding
+1D513; 0070; Additional folding
+1D514; 0071; Additional folding
+1D516; 0073; Additional folding
+1D517; 0074; Additional folding
+1D518; 0075; Additional folding
+1D519; 0076; Additional folding
+1D51A; 0077; Additional folding
+1D51B; 0078; Additional folding
+1D51C; 0079; Additional folding
+1D538; 0061; Additional folding
+1D539; 0062; Additional folding
+1D53B; 0064; Additional folding
+1D53C; 0065; Additional folding
+1D53D; 0066; Additional folding
+1D53E; 0067; Additional folding
+1D540; 0069; Additional folding
+1D541; 006A; Additional folding
+1D542; 006B; Additional folding
+1D543; 006C; Additional folding
+1D544; 006D; Additional folding
+1D546; 006F; Additional folding
+1D54A; 0073; Additional folding
+1D54B; 0074; Additional folding
+1D54C; 0075; Additional folding
+1D54D; 0076; Additional folding
+1D54E; 0077; Additional folding
+1D54F; 0078; Additional folding
+1D550; 0079; Additional folding
+1D56C; 0061; Additional folding
+1D56D; 0062; Additional folding
+1D56E; 0063; Additional folding
+1D56F; 0064; Additional folding
+1D570; 0065; Additional folding
+1D571; 0066; Additional folding
+1D572; 0067; Additional folding
+1D573; 0068; Additional folding
+1D574; 0069; Additional folding
+1D575; 006A; Additional folding
+1D576; 006B; Additional folding
+1D577; 006C; Additional folding
+1D578; 006D; Additional folding
+1D579; 006E; Additional folding
+1D57A; 006F; Additional folding
+1D57B; 0070; Additional folding
+1D57C; 0071; Additional folding
+1D57D; 0072; Additional folding
+1D57E; 0073; Additional folding
+1D57F; 0074; Additional folding
+1D580; 0075; Additional folding
+1D581; 0076; Additional folding
+1D582; 0077; Additional folding
+1D583; 0078; Additional folding
+1D584; 0079; Additional folding
+1D585; 007A; Additional folding
+1D5A0; 0061; Additional folding
+1D5A1; 0062; Additional folding
+1D5A2; 0063; Additional folding
+1D5A3; 0064; Additional folding
+1D5A4; 0065; Additional folding
+1D5A5; 0066; Additional folding
+1D5A6; 0067; Additional folding
+1D5A7; 0068; Additional folding
+1D5A8; 0069; Additional folding
+1D5A9; 006A; Additional folding
+1D5AA; 006B; Additional folding
+1D5AB; 006C; Additional folding
+1D5AC; 006D; Additional folding
+1D5AD; 006E; Additional folding
+1D5AE; 006F; Additional folding
+1D5AF; 0070; Additional folding
+1D5B0; 0071; Additional folding
+1D5B1; 0072; Additional folding
+1D5B2; 0073; Additional folding
+1D5B3; 0074; Additional folding
+1D5B4; 0075; Additional folding
+1D5B5; 0076; Additional folding
+1D5B6; 0077; Additional folding
+1D5B7; 0078; Additional folding
+1D5B8; 0079; Additional folding
+1D5B9; 007A; Additional folding
+1D5D4; 0061; Additional folding
+1D5D5; 0062; Additional folding
+1D5D6; 0063; Additional folding
+1D5D7; 0064; Additional folding
+1D5D8; 0065; Additional folding
+1D5D9; 0066; Additional folding
+1D5DA; 0067; Additional folding
+1D5DB; 0068; Additional folding
+1D5DC; 0069; Additional folding
+1D5DD; 006A; Additional folding
+1D5DE; 006B; Additional folding
+1D5DF; 006C; Additional folding
+1D5E0; 006D; Additional folding
+1D5E1; 006E; Additional folding
+1D5E2; 006F; Additional folding
+1D5E3; 0070; Additional folding
+1D5E4; 0071; Additional folding
+1D5E5; 0072; Additional folding
+1D5E6; 0073; Additional folding
+1D5E7; 0074; Additional folding
+1D5E8; 0075; Additional folding
+1D5E9; 0076; Additional folding
+1D5EA; 0077; Additional folding
+1D5EB; 0078; Additional folding
+1D5EC; 0079; Additional folding
+1D5ED; 007A; Additional folding
+1D608; 0061; Additional folding
+1D609; 0062; Additional folding
+1D60A; 0063; Additional folding
+1D60B; 0064; Additional folding
+1D60C; 0065; Additional folding
+1D60D; 0066; Additional folding
+1D60E; 0067; Additional folding
+1D60F; 0068; Additional folding
+1D610; 0069; Additional folding
+1D611; 006A; Additional folding
+1D612; 006B; Additional folding
+1D613; 006C; Additional folding
+1D614; 006D; Additional folding
+1D615; 006E; Additional folding
+1D616; 006F; Additional folding
+1D617; 0070; Additional folding
+1D618; 0071; Additional folding
+1D619; 0072; Additional folding
+1D61A; 0073; Additional folding
+1D61B; 0074; Additional folding
+1D61C; 0075; Additional folding
+1D61D; 0076; Additional folding
+1D61E; 0077; Additional folding
+1D61F; 0078; Additional folding
+1D620; 0079; Additional folding
+1D621; 007A; Additional folding
+1D63C; 0061; Additional folding
+1D63D; 0062; Additional folding
+1D63E; 0063; Additional folding
+1D63F; 0064; Additional folding
+1D640; 0065; Additional folding
+1D641; 0066; Additional folding
+1D642; 0067; Additional folding
+1D643; 0068; Additional folding
+1D644; 0069; Additional folding
+1D645; 006A; Additional folding
+1D646; 006B; Additional folding
+1D647; 006C; Additional folding
+1D648; 006D; Additional folding
+1D649; 006E; Additional folding
+1D64A; 006F; Additional folding
+1D64B; 0070; Additional folding
+1D64C; 0071; Additional folding
+1D64D; 0072; Additional folding
+1D64E; 0073; Additional folding
+1D64F; 0074; Additional folding
+1D650; 0075; Additional folding
+1D651; 0076; Additional folding
+1D652; 0077; Additional folding
+1D653; 0078; Additional folding
+1D654; 0079; Additional folding
+1D655; 007A; Additional folding
+1D670; 0061; Additional folding
+1D671; 0062; Additional folding
+1D672; 0063; Additional folding
+1D673; 0064; Additional folding
+1D674; 0065; Additional folding
+1D675; 0066; Additional folding
+1D676; 0067; Additional folding
+1D677; 0068; Additional folding
+1D678; 0069; Additional folding
+1D679; 006A; Additional folding
+1D67A; 006B; Additional folding
+1D67B; 006C; Additional folding
+1D67C; 006D; Additional folding
+1D67D; 006E; Additional folding
+1D67E; 006F; Additional folding
+1D67F; 0070; Additional folding
+1D680; 0071; Additional folding
+1D681; 0072; Additional folding
+1D682; 0073; Additional folding
+1D683; 0074; Additional folding
+1D684; 0075; Additional folding
+1D685; 0076; Additional folding
+1D686; 0077; Additional folding
+1D687; 0078; Additional folding
+1D688; 0079; Additional folding
+1D689; 007A; Additional folding
+1D6A8; 03B1; Additional folding
+1D6A9; 03B2; Additional folding
+1D6AA; 03B3; Additional folding
+1D6AB; 03B4; Additional folding
+1D6AC; 03B5; Additional folding
+1D6AD; 03B6; Additional folding
+1D6AE; 03B7; Additional folding
+1D6AF; 03B8; Additional folding
+1D6B0; 03B9; Additional folding
+1D6B1; 03BA; Additional folding
+1D6B2; 03BB; Additional folding
+1D6B3; 03BC; Additional folding
+1D6B4; 03BD; Additional folding
+1D6B5; 03BE; Additional folding
+1D6B6; 03BF; Additional folding
+1D6B7; 03C0; Additional folding
+1D6B8; 03C1; Additional folding
+1D6B9; 03B8; Additional folding
+1D6BA; 03C3; Additional folding
+1D6BB; 03C4; Additional folding
+1D6BC; 03C5; Additional folding
+1D6BD; 03C6; Additional folding
+1D6BE; 03C7; Additional folding
+1D6BF; 03C8; Additional folding
+1D6C0; 03C9; Additional folding
+1D6D3; 03C3; Additional folding
+1D6E2; 03B1; Additional folding
+1D6E3; 03B2; Additional folding
+1D6E4; 03B3; Additional folding
+1D6E5; 03B4; Additional folding
+1D6E6; 03B5; Additional folding
+1D6E7; 03B6; Additional folding
+1D6E8; 03B7; Additional folding
+1D6E9; 03B8; Additional folding
+1D6EA; 03B9; Additional folding
+1D6EB; 03BA; Additional folding
+1D6EC; 03BB; Additional folding
+1D6ED; 03BC; Additional folding
+1D6EE; 03BD; Additional folding
+1D6EF; 03BE; Additional folding
+1D6F0; 03BF; Additional folding
+1D6F1; 03C0; Additional folding
+1D6F2; 03C1; Additional folding
+1D6F3; 03B8; Additional folding
+1D6F4; 03C3; Additional folding
+1D6F5; 03C4; Additional folding
+1D6F6; 03C5; Additional folding
+1D6F7; 03C6; Additional folding
+1D6F8; 03C7; Additional folding
+1D6F9; 03C8; Additional folding
+1D6FA; 03C9; Additional folding
+1D70D; 03C3; Additional folding
+1D71C; 03B1; Additional folding
+1D71D; 03B2; Additional folding
+1D71E; 03B3; Additional folding
+1D71F; 03B4; Additional folding
+1D720; 03B5; Additional folding
+1D721; 03B6; Additional folding
+1D722; 03B7; Additional folding
+1D723; 03B8; Additional folding
+1D724; 03B9; Additional folding
+1D725; 03BA; Additional folding
+1D726; 03BB; Additional folding
+1D727; 03BC; Additional folding
+1D728; 03BD; Additional folding
+1D729; 03BE; Additional folding
+1D72A; 03BF; Additional folding
+1D72B; 03C0; Additional folding
+1D72C; 03C1; Additional folding
+1D72D; 03B8; Additional folding
+1D72E; 03C3; Additional folding
+1D72F; 03C4; Additional folding
+1D730; 03C5; Additional folding
+1D731; 03C6; Additional folding
+1D732; 03C7; Additional folding
+1D733; 03C8; Additional folding
+1D734; 03C9; Additional folding
+1D747; 03C3; Additional folding
+1D756; 03B1; Additional folding
+1D757; 03B2; Additional folding
+1D758; 03B3; Additional folding
+1D759; 03B4; Additional folding
+1D75A; 03B5; Additional folding
+1D75B; 03B6; Additional folding
+1D75C; 03B7; Additional folding
+1D75D; 03B8; Additional folding
+1D75E; 03B9; Additional folding
+1D75F; 03BA; Additional folding
+1D760; 03BB; Additional folding
+1D761; 03BC; Additional folding
+1D762; 03BD; Additional folding
+1D763; 03BE; Additional folding
+1D764; 03BF; Additional folding
+1D765; 03C0; Additional folding
+1D766; 03C1; Additional folding
+1D767; 03B8; Additional folding
+1D768; 03C3; Additional folding
+1D769; 03C4; Additional folding
+1D76A; 03C5; Additional folding
+1D76B; 03C6; Additional folding
+1D76C; 03C7; Additional folding
+1D76D; 03C8; Additional folding
+1D76E; 03C9; Additional folding
+1D781; 03C3; Additional folding
+1D790; 03B1; Additional folding
+1D791; 03B2; Additional folding
+1D792; 03B3; Additional folding
+1D793; 03B4; Additional folding
+1D794; 03B5; Additional folding
+1D795; 03B6; Additional folding
+1D796; 03B7; Additional folding
+1D797; 03B8; Additional folding
+1D798; 03B9; Additional folding
+1D799; 03BA; Additional folding
+1D79A; 03BB; Additional folding
+1D79B; 03BC; Additional folding
+1D79C; 03BD; Additional folding
+1D79D; 03BE; Additional folding
+1D79E; 03BF; Additional folding
+1D79F; 03C0; Additional folding
+1D7A0; 03C1; Additional folding
+1D7A1; 03B8; Additional folding
+1D7A2; 03C3; Additional folding
+1D7A3; 03C4; Additional folding
+1D7A4; 03C5; Additional folding
+1D7A5; 03C6; Additional folding
+1D7A6; 03C7; Additional folding
+1D7A7; 03C8; Additional folding
+1D7A8; 03C9; Additional folding
+1D7BB; 03C3; Additional folding
+
+ */
+
+const Stringprep_table_element stringprep_rfc3454_B_3[] = {
+    { 0x000041, 0x000041, { 0x000061 } }, /* 0041; 0061; Case map */
+    { 0x000042, 0x000042, { 0x000062 } }, /* 0042; 0062; Case map */
+    { 0x000043, 0x000043, { 0x000063 } }, /* 0043; 0063; Case map */
+    { 0x000044, 0x000044, { 0x000064 } }, /* 0044; 0064; Case map */
+    { 0x000045, 0x000045, { 0x000065 } }, /* 0045; 0065; Case map */
+    { 0x000046, 0x000046, { 0x000066 } }, /* 0046; 0066; Case map */
+    { 0x000047, 0x000047, { 0x000067 } }, /* 0047; 0067; Case map */
+    { 0x000048, 0x000048, { 0x000068 } }, /* 0048; 0068; Case map */
+    { 0x000049, 0x000049, { 0x000069 } }, /* 0049; 0069; Case map */
+    { 0x00004A, 0x00004A, { 0x00006A } }, /* 004A; 006A; Case map */
+    { 0x00004B, 0x00004B, { 0x00006B } }, /* 004B; 006B; Case map */
+    { 0x00004C, 0x00004C, { 0x00006C } }, /* 004C; 006C; Case map */
+    { 0x00004D, 0x00004D, { 0x00006D } }, /* 004D; 006D; Case map */
+    { 0x00004E, 0x00004E, { 0x00006E } }, /* 004E; 006E; Case map */
+    { 0x00004F, 0x00004F, { 0x00006F } }, /* 004F; 006F; Case map */
+    { 0x000050, 0x000050, { 0x000070 } }, /* 0050; 0070; Case map */
+    { 0x000051, 0x000051, { 0x000071 } }, /* 0051; 0071; Case map */
+    { 0x000052, 0x000052, { 0x000072 } }, /* 0052; 0072; Case map */
+    { 0x000053, 0x000053, { 0x000073 } }, /* 0053; 0073; Case map */
+    { 0x000054, 0x000054, { 0x000074 } }, /* 0054; 0074; Case map */
+    { 0x000055, 0x000055, { 0x000075 } }, /* 0055; 0075; Case map */
+    { 0x000056, 0x000056, { 0x000076 } }, /* 0056; 0076; Case map */
+    { 0x000057, 0x000057, { 0x000077 } }, /* 0057; 0077; Case map */
+    { 0x000058, 0x000058, { 0x000078 } }, /* 0058; 0078; Case map */
+    { 0x000059, 0x000059, { 0x000079 } }, /* 0059; 0079; Case map */
+    { 0x00005A, 0x00005A, { 0x00007A } }, /* 005A; 007A; Case map */
+    { 0x0000B5, 0x0000B5, { 0x0003BC } }, /* 00B5; 03BC; Case map */
+    { 0x0000C0, 0x0000C0, { 0x0000E0 } }, /* 00C0; 00E0; Case map */
+    { 0x0000C1, 0x0000C1, { 0x0000E1 } }, /* 00C1; 00E1; Case map */
+    { 0x0000C2, 0x0000C2, { 0x0000E2 } }, /* 00C2; 00E2; Case map */
+    { 0x0000C3, 0x0000C3, { 0x0000E3 } }, /* 00C3; 00E3; Case map */
+    { 0x0000C4, 0x0000C4, { 0x0000E4 } }, /* 00C4; 00E4; Case map */
+    { 0x0000C5, 0x0000C5, { 0x0000E5 } }, /* 00C5; 00E5; Case map */
+    { 0x0000C6, 0x0000C6, { 0x0000E6 } }, /* 00C6; 00E6; Case map */
+    { 0x0000C7, 0x0000C7, { 0x0000E7 } }, /* 00C7; 00E7; Case map */
+    { 0x0000C8, 0x0000C8, { 0x0000E8 } }, /* 00C8; 00E8; Case map */
+    { 0x0000C9, 0x0000C9, { 0x0000E9 } }, /* 00C9; 00E9; Case map */
+    { 0x0000CA, 0x0000CA, { 0x0000EA } }, /* 00CA; 00EA; Case map */
+    { 0x0000CB, 0x0000CB, { 0x0000EB } }, /* 00CB; 00EB; Case map */
+    { 0x0000CC, 0x0000CC, { 0x0000EC } }, /* 00CC; 00EC; Case map */
+    { 0x0000CD, 0x0000CD, { 0x0000ED } }, /* 00CD; 00ED; Case map */
+    { 0x0000CE, 0x0000CE, { 0x0000EE } }, /* 00CE; 00EE; Case map */
+    { 0x0000CF, 0x0000CF, { 0x0000EF } }, /* 00CF; 00EF; Case map */
+    { 0x0000D0, 0x0000D0, { 0x0000F0 } }, /* 00D0; 00F0; Case map */
+    { 0x0000D1, 0x0000D1, { 0x0000F1 } }, /* 00D1; 00F1; Case map */
+    { 0x0000D2, 0x0000D2, { 0x0000F2 } }, /* 00D2; 00F2; Case map */
+    { 0x0000D3, 0x0000D3, { 0x0000F3 } }, /* 00D3; 00F3; Case map */
+    { 0x0000D4, 0x0000D4, { 0x0000F4 } }, /* 00D4; 00F4; Case map */
+    { 0x0000D5, 0x0000D5, { 0x0000F5 } }, /* 00D5; 00F5; Case map */
+    { 0x0000D6, 0x0000D6, { 0x0000F6 } }, /* 00D6; 00F6; Case map */
+    { 0x0000D8, 0x0000D8, { 0x0000F8 } }, /* 00D8; 00F8; Case map */
+    { 0x0000D9, 0x0000D9, { 0x0000F9 } }, /* 00D9; 00F9; Case map */
+    { 0x0000DA, 0x0000DA, { 0x0000FA } }, /* 00DA; 00FA; Case map */
+    { 0x0000DB, 0x0000DB, { 0x0000FB } }, /* 00DB; 00FB; Case map */
+    { 0x0000DC, 0x0000DC, { 0x0000FC } }, /* 00DC; 00FC; Case map */
+    { 0x0000DD, 0x0000DD, { 0x0000FD } }, /* 00DD; 00FD; Case map */
+    { 0x0000DE, 0x0000DE, { 0x0000FE } }, /* 00DE; 00FE; Case map */
+    { 0x0000DF,
+      0x0000DF,
+      { 0x000073, /* 00DF; 0073 0073; Case map */
+        0x000073 } },
+    { 0x000100, 0x000100, { 0x000101 } }, /* 0100; 0101; Case map */
+    { 0x000102, 0x000102, { 0x000103 } }, /* 0102; 0103; Case map */
+    { 0x000104, 0x000104, { 0x000105 } }, /* 0104; 0105; Case map */
+    { 0x000106, 0x000106, { 0x000107 } }, /* 0106; 0107; Case map */
+    { 0x000108, 0x000108, { 0x000109 } }, /* 0108; 0109; Case map */
+    { 0x00010A, 0x00010A, { 0x00010B } }, /* 010A; 010B; Case map */
+    { 0x00010C, 0x00010C, { 0x00010D } }, /* 010C; 010D; Case map */
+    { 0x00010E, 0x00010E, { 0x00010F } }, /* 010E; 010F; Case map */
+    { 0x000110, 0x000110, { 0x000111 } }, /* 0110; 0111; Case map */
+    { 0x000112, 0x000112, { 0x000113 } }, /* 0112; 0113; Case map */
+    { 0x000114, 0x000114, { 0x000115 } }, /* 0114; 0115; Case map */
+    { 0x000116, 0x000116, { 0x000117 } }, /* 0116; 0117; Case map */
+    { 0x000118, 0x000118, { 0x000119 } }, /* 0118; 0119; Case map */
+    { 0x00011A, 0x00011A, { 0x00011B } }, /* 011A; 011B; Case map */
+    { 0x00011C, 0x00011C, { 0x00011D } }, /* 011C; 011D; Case map */
+    { 0x00011E, 0x00011E, { 0x00011F } }, /* 011E; 011F; Case map */
+    { 0x000120, 0x000120, { 0x000121 } }, /* 0120; 0121; Case map */
+    { 0x000122, 0x000122, { 0x000123 } }, /* 0122; 0123; Case map */
+    { 0x000124, 0x000124, { 0x000125 } }, /* 0124; 0125; Case map */
+    { 0x000126, 0x000126, { 0x000127 } }, /* 0126; 0127; Case map */
+    { 0x000128, 0x000128, { 0x000129 } }, /* 0128; 0129; Case map */
+    { 0x00012A, 0x00012A, { 0x00012B } }, /* 012A; 012B; Case map */
+    { 0x00012C, 0x00012C, { 0x00012D } }, /* 012C; 012D; Case map */
+    { 0x00012E, 0x00012E, { 0x00012F } }, /* 012E; 012F; Case map */
+    { 0x000130,
+      0x000130,
+      { 0x000069, /* 0130; 0069 0307; Case map */
+        0x000307 } },
+    { 0x000132, 0x000132, { 0x000133 } }, /* 0132; 0133; Case map */
+    { 0x000134, 0x000134, { 0x000135 } }, /* 0134; 0135; Case map */
+    { 0x000136, 0x000136, { 0x000137 } }, /* 0136; 0137; Case map */
+    { 0x000139, 0x000139, { 0x00013A } }, /* 0139; 013A; Case map */
+    { 0x00013B, 0x00013B, { 0x00013C } }, /* 013B; 013C; Case map */
+    { 0x00013D, 0x00013D, { 0x00013E } }, /* 013D; 013E; Case map */
+    { 0x00013F, 0x00013F, { 0x000140 } }, /* 013F; 0140; Case map */
+    { 0x000141, 0x000141, { 0x000142 } }, /* 0141; 0142; Case map */
+    { 0x000143, 0x000143, { 0x000144 } }, /* 0143; 0144; Case map */
+    { 0x000145, 0x000145, { 0x000146 } }, /* 0145; 0146; Case map */
+    { 0x000147, 0x000147, { 0x000148 } }, /* 0147; 0148; Case map */
+    { 0x000149,
+      0x000149,
+      { 0x0002BC, /* 0149; 02BC 006E; Case map */
+        0x00006E } },
+    { 0x00014A, 0x00014A, { 0x00014B } }, /* 014A; 014B; Case map */
+    { 0x00014C, 0x00014C, { 0x00014D } }, /* 014C; 014D; Case map */
+    { 0x00014E, 0x00014E, { 0x00014F } }, /* 014E; 014F; Case map */
+    { 0x000150, 0x000150, { 0x000151 } }, /* 0150; 0151; Case map */
+    { 0x000152, 0x000152, { 0x000153 } }, /* 0152; 0153; Case map */
+    { 0x000154, 0x000154, { 0x000155 } }, /* 0154; 0155; Case map */
+    { 0x000156, 0x000156, { 0x000157 } }, /* 0156; 0157; Case map */
+    { 0x000158, 0x000158, { 0x000159 } }, /* 0158; 0159; Case map */
+    { 0x00015A, 0x00015A, { 0x00015B } }, /* 015A; 015B; Case map */
+    { 0x00015C, 0x00015C, { 0x00015D } }, /* 015C; 015D; Case map */
+    { 0x00015E, 0x00015E, { 0x00015F } }, /* 015E; 015F; Case map */
+    { 0x000160, 0x000160, { 0x000161 } }, /* 0160; 0161; Case map */
+    { 0x000162, 0x000162, { 0x000163 } }, /* 0162; 0163; Case map */
+    { 0x000164, 0x000164, { 0x000165 } }, /* 0164; 0165; Case map */
+    { 0x000166, 0x000166, { 0x000167 } }, /* 0166; 0167; Case map */
+    { 0x000168, 0x000168, { 0x000169 } }, /* 0168; 0169; Case map */
+    { 0x00016A, 0x00016A, { 0x00016B } }, /* 016A; 016B; Case map */
+    { 0x00016C, 0x00016C, { 0x00016D } }, /* 016C; 016D; Case map */
+    { 0x00016E, 0x00016E, { 0x00016F } }, /* 016E; 016F; Case map */
+    { 0x000170, 0x000170, { 0x000171 } }, /* 0170; 0171; Case map */
+    { 0x000172, 0x000172, { 0x000173 } }, /* 0172; 0173; Case map */
+    { 0x000174, 0x000174, { 0x000175 } }, /* 0174; 0175; Case map */
+    { 0x000176, 0x000176, { 0x000177 } }, /* 0176; 0177; Case map */
+    { 0x000178, 0x000178, { 0x0000FF } }, /* 0178; 00FF; Case map */
+    { 0x000179, 0x000179, { 0x00017A } }, /* 0179; 017A; Case map */
+    { 0x00017B, 0x00017B, { 0x00017C } }, /* 017B; 017C; Case map */
+    { 0x00017D, 0x00017D, { 0x00017E } }, /* 017D; 017E; Case map */
+    { 0x00017F, 0x00017F, { 0x000073 } }, /* 017F; 0073; Case map */
+    { 0x000181, 0x000181, { 0x000253 } }, /* 0181; 0253; Case map */
+    { 0x000182, 0x000182, { 0x000183 } }, /* 0182; 0183; Case map */
+    { 0x000184, 0x000184, { 0x000185 } }, /* 0184; 0185; Case map */
+    { 0x000186, 0x000186, { 0x000254 } }, /* 0186; 0254; Case map */
+    { 0x000187, 0x000187, { 0x000188 } }, /* 0187; 0188; Case map */
+    { 0x000189, 0x000189, { 0x000256 } }, /* 0189; 0256; Case map */
+    { 0x00018A, 0x00018A, { 0x000257 } }, /* 018A; 0257; Case map */
+    { 0x00018B, 0x00018B, { 0x00018C } }, /* 018B; 018C; Case map */
+    { 0x00018E, 0x00018E, { 0x0001DD } }, /* 018E; 01DD; Case map */
+    { 0x00018F, 0x00018F, { 0x000259 } }, /* 018F; 0259; Case map */
+    { 0x000190, 0x000190, { 0x00025B } }, /* 0190; 025B; Case map */
+    { 0x000191, 0x000191, { 0x000192 } }, /* 0191; 0192; Case map */
+    { 0x000193, 0x000193, { 0x000260 } }, /* 0193; 0260; Case map */
+    { 0x000194, 0x000194, { 0x000263 } }, /* 0194; 0263; Case map */
+    { 0x000196, 0x000196, { 0x000269 } }, /* 0196; 0269; Case map */
+    { 0x000197, 0x000197, { 0x000268 } }, /* 0197; 0268; Case map */
+    { 0x000198, 0x000198, { 0x000199 } }, /* 0198; 0199; Case map */
+    { 0x00019C, 0x00019C, { 0x00026F } }, /* 019C; 026F; Case map */
+    { 0x00019D, 0x00019D, { 0x000272 } }, /* 019D; 0272; Case map */
+    { 0x00019F, 0x00019F, { 0x000275 } }, /* 019F; 0275; Case map */
+    { 0x0001A0, 0x0001A0, { 0x0001A1 } }, /* 01A0; 01A1; Case map */
+    { 0x0001A2, 0x0001A2, { 0x0001A3 } }, /* 01A2; 01A3; Case map */
+    { 0x0001A4, 0x0001A4, { 0x0001A5 } }, /* 01A4; 01A5; Case map */
+    { 0x0001A6, 0x0001A6, { 0x000280 } }, /* 01A6; 0280; Case map */
+    { 0x0001A7, 0x0001A7, { 0x0001A8 } }, /* 01A7; 01A8; Case map */
+    { 0x0001A9, 0x0001A9, { 0x000283 } }, /* 01A9; 0283; Case map */
+    { 0x0001AC, 0x0001AC, { 0x0001AD } }, /* 01AC; 01AD; Case map */
+    { 0x0001AE, 0x0001AE, { 0x000288 } }, /* 01AE; 0288; Case map */
+    { 0x0001AF, 0x0001AF, { 0x0001B0 } }, /* 01AF; 01B0; Case map */
+    { 0x0001B1, 0x0001B1, { 0x00028A } }, /* 01B1; 028A; Case map */
+    { 0x0001B2, 0x0001B2, { 0x00028B } }, /* 01B2; 028B; Case map */
+    { 0x0001B3, 0x0001B3, { 0x0001B4 } }, /* 01B3; 01B4; Case map */
+    { 0x0001B5, 0x0001B5, { 0x0001B6 } }, /* 01B5; 01B6; Case map */
+    { 0x0001B7, 0x0001B7, { 0x000292 } }, /* 01B7; 0292; Case map */
+    { 0x0001B8, 0x0001B8, { 0x0001B9 } }, /* 01B8; 01B9; Case map */
+    { 0x0001BC, 0x0001BC, { 0x0001BD } }, /* 01BC; 01BD; Case map */
+    { 0x0001C4, 0x0001C4, { 0x0001C6 } }, /* 01C4; 01C6; Case map */
+    { 0x0001C5, 0x0001C5, { 0x0001C6 } }, /* 01C5; 01C6; Case map */
+    { 0x0001C7, 0x0001C7, { 0x0001C9 } }, /* 01C7; 01C9; Case map */
+    { 0x0001C8, 0x0001C8, { 0x0001C9 } }, /* 01C8; 01C9; Case map */
+    { 0x0001CA, 0x0001CA, { 0x0001CC } }, /* 01CA; 01CC; Case map */
+    { 0x0001CB, 0x0001CB, { 0x0001CC } }, /* 01CB; 01CC; Case map */
+    { 0x0001CD, 0x0001CD, { 0x0001CE } }, /* 01CD; 01CE; Case map */
+    { 0x0001CF, 0x0001CF, { 0x0001D0 } }, /* 01CF; 01D0; Case map */
+    { 0x0001D1, 0x0001D1, { 0x0001D2 } }, /* 01D1; 01D2; Case map */
+    { 0x0001D3, 0x0001D3, { 0x0001D4 } }, /* 01D3; 01D4; Case map */
+    { 0x0001D5, 0x0001D5, { 0x0001D6 } }, /* 01D5; 01D6; Case map */
+    { 0x0001D7, 0x0001D7, { 0x0001D8 } }, /* 01D7; 01D8; Case map */
+    { 0x0001D9, 0x0001D9, { 0x0001DA } }, /* 01D9; 01DA; Case map */
+    { 0x0001DB, 0x0001DB, { 0x0001DC } }, /* 01DB; 01DC; Case map */
+    { 0x0001DE, 0x0001DE, { 0x0001DF } }, /* 01DE; 01DF; Case map */
+    { 0x0001E0, 0x0001E0, { 0x0001E1 } }, /* 01E0; 01E1; Case map */
+    { 0x0001E2, 0x0001E2, { 0x0001E3 } }, /* 01E2; 01E3; Case map */
+    { 0x0001E4, 0x0001E4, { 0x0001E5 } }, /* 01E4; 01E5; Case map */
+    { 0x0001E6, 0x0001E6, { 0x0001E7 } }, /* 01E6; 01E7; Case map */
+    { 0x0001E8, 0x0001E8, { 0x0001E9 } }, /* 01E8; 01E9; Case map */
+    { 0x0001EA, 0x0001EA, { 0x0001EB } }, /* 01EA; 01EB; Case map */
+    { 0x0001EC, 0x0001EC, { 0x0001ED } }, /* 01EC; 01ED; Case map */
+    { 0x0001EE, 0x0001EE, { 0x0001EF } }, /* 01EE; 01EF; Case map */
+    { 0x0001F0,
+      0x0001F0,
+      { 0x00006A, /* 01F0; 006A 030C; Case map */
+        0x00030C } },
+    { 0x0001F1, 0x0001F1, { 0x0001F3 } }, /* 01F1; 01F3; Case map */
+    { 0x0001F2, 0x0001F2, { 0x0001F3 } }, /* 01F2; 01F3; Case map */
+    { 0x0001F4, 0x0001F4, { 0x0001F5 } }, /* 01F4; 01F5; Case map */
+    { 0x0001F6, 0x0001F6, { 0x000195 } }, /* 01F6; 0195; Case map */
+    { 0x0001F7, 0x0001F7, { 0x0001BF } }, /* 01F7; 01BF; Case map */
+    { 0x0001F8, 0x0001F8, { 0x0001F9 } }, /* 01F8; 01F9; Case map */
+    { 0x0001FA, 0x0001FA, { 0x0001FB } }, /* 01FA; 01FB; Case map */
+    { 0x0001FC, 0x0001FC, { 0x0001FD } }, /* 01FC; 01FD; Case map */
+    { 0x0001FE, 0x0001FE, { 0x0001FF } }, /* 01FE; 01FF; Case map */
+    { 0x000200, 0x000200, { 0x000201 } }, /* 0200; 0201; Case map */
+    { 0x000202, 0x000202, { 0x000203 } }, /* 0202; 0203; Case map */
+    { 0x000204, 0x000204, { 0x000205 } }, /* 0204; 0205; Case map */
+    { 0x000206, 0x000206, { 0x000207 } }, /* 0206; 0207; Case map */
+    { 0x000208, 0x000208, { 0x000209 } }, /* 0208; 0209; Case map */
+    { 0x00020A, 0x00020A, { 0x00020B } }, /* 020A; 020B; Case map */
+    { 0x00020C, 0x00020C, { 0x00020D } }, /* 020C; 020D; Case map */
+    { 0x00020E, 0x00020E, { 0x00020F } }, /* 020E; 020F; Case map */
+    { 0x000210, 0x000210, { 0x000211 } }, /* 0210; 0211; Case map */
+    { 0x000212, 0x000212, { 0x000213 } }, /* 0212; 0213; Case map */
+    { 0x000214, 0x000214, { 0x000215 } }, /* 0214; 0215; Case map */
+    { 0x000216, 0x000216, { 0x000217 } }, /* 0216; 0217; Case map */
+    { 0x000218, 0x000218, { 0x000219 } }, /* 0218; 0219; Case map */
+    { 0x00021A, 0x00021A, { 0x00021B } }, /* 021A; 021B; Case map */
+    { 0x00021C, 0x00021C, { 0x00021D } }, /* 021C; 021D; Case map */
+    { 0x00021E, 0x00021E, { 0x00021F } }, /* 021E; 021F; Case map */
+    { 0x000220, 0x000220, { 0x00019E } }, /* 0220; 019E; Case map */
+    { 0x000222, 0x000222, { 0x000223 } }, /* 0222; 0223; Case map */
+    { 0x000224, 0x000224, { 0x000225 } }, /* 0224; 0225; Case map */
+    { 0x000226, 0x000226, { 0x000227 } }, /* 0226; 0227; Case map */
+    { 0x000228, 0x000228, { 0x000229 } }, /* 0228; 0229; Case map */
+    { 0x00022A, 0x00022A, { 0x00022B } }, /* 022A; 022B; Case map */
+    { 0x00022C, 0x00022C, { 0x00022D } }, /* 022C; 022D; Case map */
+    { 0x00022E, 0x00022E, { 0x00022F } }, /* 022E; 022F; Case map */
+    { 0x000230, 0x000230, { 0x000231 } }, /* 0230; 0231; Case map */
+    { 0x000232, 0x000232, { 0x000233 } }, /* 0232; 0233; Case map */
+    { 0x000345, 0x000345, { 0x0003B9 } }, /* 0345; 03B9; Case map */
+    { 0x000386, 0x000386, { 0x0003AC } }, /* 0386; 03AC; Case map */
+    { 0x000388, 0x000388, { 0x0003AD } }, /* 0388; 03AD; Case map */
+    { 0x000389, 0x000389, { 0x0003AE } }, /* 0389; 03AE; Case map */
+    { 0x00038A, 0x00038A, { 0x0003AF } }, /* 038A; 03AF; Case map */
+    { 0x00038C, 0x00038C, { 0x0003CC } }, /* 038C; 03CC; Case map */
+    { 0x00038E, 0x00038E, { 0x0003CD } }, /* 038E; 03CD; Case map */
+    { 0x00038F, 0x00038F, { 0x0003CE } }, /* 038F; 03CE; Case map */
+    { 0x000390,
+      0x000390,
+      { 0x0003B9, /* 0390; 03B9 0308 0301; Case map */
+        0x000308, 0x000301 } },
+    { 0x000391, 0x000391, { 0x0003B1 } }, /* 0391; 03B1; Case map */
+    { 0x000392, 0x000392, { 0x0003B2 } }, /* 0392; 03B2; Case map */
+    { 0x000393, 0x000393, { 0x0003B3 } }, /* 0393; 03B3; Case map */
+    { 0x000394, 0x000394, { 0x0003B4 } }, /* 0394; 03B4; Case map */
+    { 0x000395, 0x000395, { 0x0003B5 } }, /* 0395; 03B5; Case map */
+    { 0x000396, 0x000396, { 0x0003B6 } }, /* 0396; 03B6; Case map */
+    { 0x000397, 0x000397, { 0x0003B7 } }, /* 0397; 03B7; Case map */
+    { 0x000398, 0x000398, { 0x0003B8 } }, /* 0398; 03B8; Case map */
+    { 0x000399, 0x000399, { 0x0003B9 } }, /* 0399; 03B9; Case map */
+    { 0x00039A, 0x00039A, { 0x0003BA } }, /* 039A; 03BA; Case map */
+    { 0x00039B, 0x00039B, { 0x0003BB } }, /* 039B; 03BB; Case map */
+    { 0x00039C, 0x00039C, { 0x0003BC } }, /* 039C; 03BC; Case map */
+    { 0x00039D, 0x00039D, { 0x0003BD } }, /* 039D; 03BD; Case map */
+    { 0x00039E, 0x00039E, { 0x0003BE } }, /* 039E; 03BE; Case map */
+    { 0x00039F, 0x00039F, { 0x0003BF } }, /* 039F; 03BF; Case map */
+    { 0x0003A0, 0x0003A0, { 0x0003C0 } }, /* 03A0; 03C0; Case map */
+    { 0x0003A1, 0x0003A1, { 0x0003C1 } }, /* 03A1; 03C1; Case map */
+    { 0x0003A3, 0x0003A3, { 0x0003C3 } }, /* 03A3; 03C3; Case map */
+    { 0x0003A4, 0x0003A4, { 0x0003C4 } }, /* 03A4; 03C4; Case map */
+    { 0x0003A5, 0x0003A5, { 0x0003C5 } }, /* 03A5; 03C5; Case map */
+    { 0x0003A6, 0x0003A6, { 0x0003C6 } }, /* 03A6; 03C6; Case map */
+    { 0x0003A7, 0x0003A7, { 0x0003C7 } }, /* 03A7; 03C7; Case map */
+    { 0x0003A8, 0x0003A8, { 0x0003C8 } }, /* 03A8; 03C8; Case map */
+    { 0x0003A9, 0x0003A9, { 0x0003C9 } }, /* 03A9; 03C9; Case map */
+    { 0x0003AA, 0x0003AA, { 0x0003CA } }, /* 03AA; 03CA; Case map */
+    { 0x0003AB, 0x0003AB, { 0x0003CB } }, /* 03AB; 03CB; Case map */
+    { 0x0003B0,
+      0x0003B0,
+      { 0x0003C5, /* 03B0; 03C5 0308 0301; Case map */
+        0x000308, 0x000301 } },
+    { 0x0003C2, 0x0003C2, { 0x0003C3 } }, /* 03C2; 03C3; Case map */
+    { 0x0003D0, 0x0003D0, { 0x0003B2 } }, /* 03D0; 03B2; Case map */
+    { 0x0003D1, 0x0003D1, { 0x0003B8 } }, /* 03D1; 03B8; Case map */
+    { 0x0003D5, 0x0003D5, { 0x0003C6 } }, /* 03D5; 03C6; Case map */
+    { 0x0003D6, 0x0003D6, { 0x0003C0 } }, /* 03D6; 03C0; Case map */
+    { 0x0003D8, 0x0003D8, { 0x0003D9 } }, /* 03D8; 03D9; Case map */
+    { 0x0003DA, 0x0003DA, { 0x0003DB } }, /* 03DA; 03DB; Case map */
+    { 0x0003DC, 0x0003DC, { 0x0003DD } }, /* 03DC; 03DD; Case map */
+    { 0x0003DE, 0x0003DE, { 0x0003DF } }, /* 03DE; 03DF; Case map */
+    { 0x0003E0, 0x0003E0, { 0x0003E1 } }, /* 03E0; 03E1; Case map */
+    { 0x0003E2, 0x0003E2, { 0x0003E3 } }, /* 03E2; 03E3; Case map */
+    { 0x0003E4, 0x0003E4, { 0x0003E5 } }, /* 03E4; 03E5; Case map */
+    { 0x0003E6, 0x0003E6, { 0x0003E7 } }, /* 03E6; 03E7; Case map */
+    { 0x0003E8, 0x0003E8, { 0x0003E9 } }, /* 03E8; 03E9; Case map */
+    { 0x0003EA, 0x0003EA, { 0x0003EB } }, /* 03EA; 03EB; Case map */
+    { 0x0003EC, 0x0003EC, { 0x0003ED } }, /* 03EC; 03ED; Case map */
+    { 0x0003EE, 0x0003EE, { 0x0003EF } }, /* 03EE; 03EF; Case map */
+    { 0x0003F0, 0x0003F0, { 0x0003BA } }, /* 03F0; 03BA; Case map */
+    { 0x0003F1, 0x0003F1, { 0x0003C1 } }, /* 03F1; 03C1; Case map */
+    { 0x0003F2, 0x0003F2, { 0x0003C3 } }, /* 03F2; 03C3; Case map */
+    { 0x0003F4, 0x0003F4, { 0x0003B8 } }, /* 03F4; 03B8; Case map */
+    { 0x0003F5, 0x0003F5, { 0x0003B5 } }, /* 03F5; 03B5; Case map */
+    { 0x000400, 0x000400, { 0x000450 } }, /* 0400; 0450; Case map */
+    { 0x000401, 0x000401, { 0x000451 } }, /* 0401; 0451; Case map */
+    { 0x000402, 0x000402, { 0x000452 } }, /* 0402; 0452; Case map */
+    { 0x000403, 0x000403, { 0x000453 } }, /* 0403; 0453; Case map */
+    { 0x000404, 0x000404, { 0x000454 } }, /* 0404; 0454; Case map */
+    { 0x000405, 0x000405, { 0x000455 } }, /* 0405; 0455; Case map */
+    { 0x000406, 0x000406, { 0x000456 } }, /* 0406; 0456; Case map */
+    { 0x000407, 0x000407, { 0x000457 } }, /* 0407; 0457; Case map */
+    { 0x000408, 0x000408, { 0x000458 } }, /* 0408; 0458; Case map */
+    { 0x000409, 0x000409, { 0x000459 } }, /* 0409; 0459; Case map */
+    { 0x00040A, 0x00040A, { 0x00045A } }, /* 040A; 045A; Case map */
+    { 0x00040B, 0x00040B, { 0x00045B } }, /* 040B; 045B; Case map */
+    { 0x00040C, 0x00040C, { 0x00045C } }, /* 040C; 045C; Case map */
+    { 0x00040D, 0x00040D, { 0x00045D } }, /* 040D; 045D; Case map */
+    { 0x00040E, 0x00040E, { 0x00045E } }, /* 040E; 045E; Case map */
+    { 0x00040F, 0x00040F, { 0x00045F } }, /* 040F; 045F; Case map */
+    { 0x000410, 0x000410, { 0x000430 } }, /* 0410; 0430; Case map */
+    { 0x000411, 0x000411, { 0x000431 } }, /* 0411; 0431; Case map */
+    { 0x000412, 0x000412, { 0x000432 } }, /* 0412; 0432; Case map */
+    { 0x000413, 0x000413, { 0x000433 } }, /* 0413; 0433; Case map */
+    { 0x000414, 0x000414, { 0x000434 } }, /* 0414; 0434; Case map */
+    { 0x000415, 0x000415, { 0x000435 } }, /* 0415; 0435; Case map */
+    { 0x000416, 0x000416, { 0x000436 } }, /* 0416; 0436; Case map */
+    { 0x000417, 0x000417, { 0x000437 } }, /* 0417; 0437; Case map */
+    { 0x000418, 0x000418, { 0x000438 } }, /* 0418; 0438; Case map */
+    { 0x000419, 0x000419, { 0x000439 } }, /* 0419; 0439; Case map */
+    { 0x00041A, 0x00041A, { 0x00043A } }, /* 041A; 043A; Case map */
+    { 0x00041B, 0x00041B, { 0x00043B } }, /* 041B; 043B; Case map */
+    { 0x00041C, 0x00041C, { 0x00043C } }, /* 041C; 043C; Case map */
+    { 0x00041D, 0x00041D, { 0x00043D } }, /* 041D; 043D; Case map */
+    { 0x00041E, 0x00041E, { 0x00043E } }, /* 041E; 043E; Case map */
+    { 0x00041F, 0x00041F, { 0x00043F } }, /* 041F; 043F; Case map */
+    { 0x000420, 0x000420, { 0x000440 } }, /* 0420; 0440; Case map */
+    { 0x000421, 0x000421, { 0x000441 } }, /* 0421; 0441; Case map */
+    { 0x000422, 0x000422, { 0x000442 } }, /* 0422; 0442; Case map */
+    { 0x000423, 0x000423, { 0x000443 } }, /* 0423; 0443; Case map */
+    { 0x000424, 0x000424, { 0x000444 } }, /* 0424; 0444; Case map */
+    { 0x000425, 0x000425, { 0x000445 } }, /* 0425; 0445; Case map */
+    { 0x000426, 0x000426, { 0x000446 } }, /* 0426; 0446; Case map */
+    { 0x000427, 0x000427, { 0x000447 } }, /* 0427; 0447; Case map */
+    { 0x000428, 0x000428, { 0x000448 } }, /* 0428; 0448; Case map */
+    { 0x000429, 0x000429, { 0x000449 } }, /* 0429; 0449; Case map */
+    { 0x00042A, 0x00042A, { 0x00044A } }, /* 042A; 044A; Case map */
+    { 0x00042B, 0x00042B, { 0x00044B } }, /* 042B; 044B; Case map */
+    { 0x00042C, 0x00042C, { 0x00044C } }, /* 042C; 044C; Case map */
+    { 0x00042D, 0x00042D, { 0x00044D } }, /* 042D; 044D; Case map */
+    { 0x00042E, 0x00042E, { 0x00044E } }, /* 042E; 044E; Case map */
+    { 0x00042F, 0x00042F, { 0x00044F } }, /* 042F; 044F; Case map */
+    { 0x000460, 0x000460, { 0x000461 } }, /* 0460; 0461; Case map */
+    { 0x000462, 0x000462, { 0x000463 } }, /* 0462; 0463; Case map */
+    { 0x000464, 0x000464, { 0x000465 } }, /* 0464; 0465; Case map */
+    { 0x000466, 0x000466, { 0x000467 } }, /* 0466; 0467; Case map */
+    { 0x000468, 0x000468, { 0x000469 } }, /* 0468; 0469; Case map */
+    { 0x00046A, 0x00046A, { 0x00046B } }, /* 046A; 046B; Case map */
+    { 0x00046C, 0x00046C, { 0x00046D } }, /* 046C; 046D; Case map */
+    { 0x00046E, 0x00046E, { 0x00046F } }, /* 046E; 046F; Case map */
+    { 0x000470, 0x000470, { 0x000471 } }, /* 0470; 0471; Case map */
+    { 0x000472, 0x000472, { 0x000473 } }, /* 0472; 0473; Case map */
+    { 0x000474, 0x000474, { 0x000475 } }, /* 0474; 0475; Case map */
+    { 0x000476, 0x000476, { 0x000477 } }, /* 0476; 0477; Case map */
+    { 0x000478, 0x000478, { 0x000479 } }, /* 0478; 0479; Case map */
+    { 0x00047A, 0x00047A, { 0x00047B } }, /* 047A; 047B; Case map */
+    { 0x00047C, 0x00047C, { 0x00047D } }, /* 047C; 047D; Case map */
+    { 0x00047E, 0x00047E, { 0x00047F } }, /* 047E; 047F; Case map */
+    { 0x000480, 0x000480, { 0x000481 } }, /* 0480; 0481; Case map */
+    { 0x00048A, 0x00048A, { 0x00048B } }, /* 048A; 048B; Case map */
+    { 0x00048C, 0x00048C, { 0x00048D } }, /* 048C; 048D; Case map */
+    { 0x00048E, 0x00048E, { 0x00048F } }, /* 048E; 048F; Case map */
+    { 0x000490, 0x000490, { 0x000491 } }, /* 0490; 0491; Case map */
+    { 0x000492, 0x000492, { 0x000493 } }, /* 0492; 0493; Case map */
+    { 0x000494, 0x000494, { 0x000495 } }, /* 0494; 0495; Case map */
+    { 0x000496, 0x000496, { 0x000497 } }, /* 0496; 0497; Case map */
+    { 0x000498, 0x000498, { 0x000499 } }, /* 0498; 0499; Case map */
+    { 0x00049A, 0x00049A, { 0x00049B } }, /* 049A; 049B; Case map */
+    { 0x00049C, 0x00049C, { 0x00049D } }, /* 049C; 049D; Case map */
+    { 0x00049E, 0x00049E, { 0x00049F } }, /* 049E; 049F; Case map */
+    { 0x0004A0, 0x0004A0, { 0x0004A1 } }, /* 04A0; 04A1; Case map */
+    { 0x0004A2, 0x0004A2, { 0x0004A3 } }, /* 04A2; 04A3; Case map */
+    { 0x0004A4, 0x0004A4, { 0x0004A5 } }, /* 04A4; 04A5; Case map */
+    { 0x0004A6, 0x0004A6, { 0x0004A7 } }, /* 04A6; 04A7; Case map */
+    { 0x0004A8, 0x0004A8, { 0x0004A9 } }, /* 04A8; 04A9; Case map */
+    { 0x0004AA, 0x0004AA, { 0x0004AB } }, /* 04AA; 04AB; Case map */
+    { 0x0004AC, 0x0004AC, { 0x0004AD } }, /* 04AC; 04AD; Case map */
+    { 0x0004AE, 0x0004AE, { 0x0004AF } }, /* 04AE; 04AF; Case map */
+    { 0x0004B0, 0x0004B0, { 0x0004B1 } }, /* 04B0; 04B1; Case map */
+    { 0x0004B2, 0x0004B2, { 0x0004B3 } }, /* 04B2; 04B3; Case map */
+    { 0x0004B4, 0x0004B4, { 0x0004B5 } }, /* 04B4; 04B5; Case map */
+    { 0x0004B6, 0x0004B6, { 0x0004B7 } }, /* 04B6; 04B7; Case map */
+    { 0x0004B8, 0x0004B8, { 0x0004B9 } }, /* 04B8; 04B9; Case map */
+    { 0x0004BA, 0x0004BA, { 0x0004BB } }, /* 04BA; 04BB; Case map */
+    { 0x0004BC, 0x0004BC, { 0x0004BD } }, /* 04BC; 04BD; Case map */
+    { 0x0004BE, 0x0004BE, { 0x0004BF } }, /* 04BE; 04BF; Case map */
+    { 0x0004C1, 0x0004C1, { 0x0004C2 } }, /* 04C1; 04C2; Case map */
+    { 0x0004C3, 0x0004C3, { 0x0004C4 } }, /* 04C3; 04C4; Case map */
+    { 0x0004C5, 0x0004C5, { 0x0004C6 } }, /* 04C5; 04C6; Case map */
+    { 0x0004C7, 0x0004C7, { 0x0004C8 } }, /* 04C7; 04C8; Case map */
+    { 0x0004C9, 0x0004C9, { 0x0004CA } }, /* 04C9; 04CA; Case map */
+    { 0x0004CB, 0x0004CB, { 0x0004CC } }, /* 04CB; 04CC; Case map */
+    { 0x0004CD, 0x0004CD, { 0x0004CE } }, /* 04CD; 04CE; Case map */
+    { 0x0004D0, 0x0004D0, { 0x0004D1 } }, /* 04D0; 04D1; Case map */
+    { 0x0004D2, 0x0004D2, { 0x0004D3 } }, /* 04D2; 04D3; Case map */
+    { 0x0004D4, 0x0004D4, { 0x0004D5 } }, /* 04D4; 04D5; Case map */
+    { 0x0004D6, 0x0004D6, { 0x0004D7 } }, /* 04D6; 04D7; Case map */
+    { 0x0004D8, 0x0004D8, { 0x0004D9 } }, /* 04D8; 04D9; Case map */
+    { 0x0004DA, 0x0004DA, { 0x0004DB } }, /* 04DA; 04DB; Case map */
+    { 0x0004DC, 0x0004DC, { 0x0004DD } }, /* 04DC; 04DD; Case map */
+    { 0x0004DE, 0x0004DE, { 0x0004DF } }, /* 04DE; 04DF; Case map */
+    { 0x0004E0, 0x0004E0, { 0x0004E1 } }, /* 04E0; 04E1; Case map */
+    { 0x0004E2, 0x0004E2, { 0x0004E3 } }, /* 04E2; 04E3; Case map */
+    { 0x0004E4, 0x0004E4, { 0x0004E5 } }, /* 04E4; 04E5; Case map */
+    { 0x0004E6, 0x0004E6, { 0x0004E7 } }, /* 04E6; 04E7; Case map */
+    { 0x0004E8, 0x0004E8, { 0x0004E9 } }, /* 04E8; 04E9; Case map */
+    { 0x0004EA, 0x0004EA, { 0x0004EB } }, /* 04EA; 04EB; Case map */
+    { 0x0004EC, 0x0004EC, { 0x0004ED } }, /* 04EC; 04ED; Case map */
+    { 0x0004EE, 0x0004EE, { 0x0004EF } }, /* 04EE; 04EF; Case map */
+    { 0x0004F0, 0x0004F0, { 0x0004F1 } }, /* 04F0; 04F1; Case map */
+    { 0x0004F2, 0x0004F2, { 0x0004F3 } }, /* 04F2; 04F3; Case map */
+    { 0x0004F4, 0x0004F4, { 0x0004F5 } }, /* 04F4; 04F5; Case map */
+    { 0x0004F8, 0x0004F8, { 0x0004F9 } }, /* 04F8; 04F9; Case map */
+    { 0x000500, 0x000500, { 0x000501 } }, /* 0500; 0501; Case map */
+    { 0x000502, 0x000502, { 0x000503 } }, /* 0502; 0503; Case map */
+    { 0x000504, 0x000504, { 0x000505 } }, /* 0504; 0505; Case map */
+    { 0x000506, 0x000506, { 0x000507 } }, /* 0506; 0507; Case map */
+    { 0x000508, 0x000508, { 0x000509 } }, /* 0508; 0509; Case map */
+    { 0x00050A, 0x00050A, { 0x00050B } }, /* 050A; 050B; Case map */
+    { 0x00050C, 0x00050C, { 0x00050D } }, /* 050C; 050D; Case map */
+    { 0x00050E, 0x00050E, { 0x00050F } }, /* 050E; 050F; Case map */
+    { 0x000531, 0x000531, { 0x000561 } }, /* 0531; 0561; Case map */
+    { 0x000532, 0x000532, { 0x000562 } }, /* 0532; 0562; Case map */
+    { 0x000533, 0x000533, { 0x000563 } }, /* 0533; 0563; Case map */
+    { 0x000534, 0x000534, { 0x000564 } }, /* 0534; 0564; Case map */
+    { 0x000535, 0x000535, { 0x000565 } }, /* 0535; 0565; Case map */
+    { 0x000536, 0x000536, { 0x000566 } }, /* 0536; 0566; Case map */
+    { 0x000537, 0x000537, { 0x000567 } }, /* 0537; 0567; Case map */
+    { 0x000538, 0x000538, { 0x000568 } }, /* 0538; 0568; Case map */
+    { 0x000539, 0x000539, { 0x000569 } }, /* 0539; 0569; Case map */
+    { 0x00053A, 0x00053A, { 0x00056A } }, /* 053A; 056A; Case map */
+    { 0x00053B, 0x00053B, { 0x00056B } }, /* 053B; 056B; Case map */
+    { 0x00053C, 0x00053C, { 0x00056C } }, /* 053C; 056C; Case map */
+    { 0x00053D, 0x00053D, { 0x00056D } }, /* 053D; 056D; Case map */
+    { 0x00053E, 0x00053E, { 0x00056E } }, /* 053E; 056E; Case map */
+    { 0x00053F, 0x00053F, { 0x00056F } }, /* 053F; 056F; Case map */
+    { 0x000540, 0x000540, { 0x000570 } }, /* 0540; 0570; Case map */
+    { 0x000541, 0x000541, { 0x000571 } }, /* 0541; 0571; Case map */
+    { 0x000542, 0x000542, { 0x000572 } }, /* 0542; 0572; Case map */
+    { 0x000543, 0x000543, { 0x000573 } }, /* 0543; 0573; Case map */
+    { 0x000544, 0x000544, { 0x000574 } }, /* 0544; 0574; Case map */
+    { 0x000545, 0x000545, { 0x000575 } }, /* 0545; 0575; Case map */
+    { 0x000546, 0x000546, { 0x000576 } }, /* 0546; 0576; Case map */
+    { 0x000547, 0x000547, { 0x000577 } }, /* 0547; 0577; Case map */
+    { 0x000548, 0x000548, { 0x000578 } }, /* 0548; 0578; Case map */
+    { 0x000549, 0x000549, { 0x000579 } }, /* 0549; 0579; Case map */
+    { 0x00054A, 0x00054A, { 0x00057A } }, /* 054A; 057A; Case map */
+    { 0x00054B, 0x00054B, { 0x00057B } }, /* 054B; 057B; Case map */
+    { 0x00054C, 0x00054C, { 0x00057C } }, /* 054C; 057C; Case map */
+    { 0x00054D, 0x00054D, { 0x00057D } }, /* 054D; 057D; Case map */
+    { 0x00054E, 0x00054E, { 0x00057E } }, /* 054E; 057E; Case map */
+    { 0x00054F, 0x00054F, { 0x00057F } }, /* 054F; 057F; Case map */
+    { 0x000550, 0x000550, { 0x000580 } }, /* 0550; 0580; Case map */
+    { 0x000551, 0x000551, { 0x000581 } }, /* 0551; 0581; Case map */
+    { 0x000552, 0x000552, { 0x000582 } }, /* 0552; 0582; Case map */
+    { 0x000553, 0x000553, { 0x000583 } }, /* 0553; 0583; Case map */
+    { 0x000554, 0x000554, { 0x000584 } }, /* 0554; 0584; Case map */
+    { 0x000555, 0x000555, { 0x000585 } }, /* 0555; 0585; Case map */
+    { 0x000556, 0x000556, { 0x000586 } }, /* 0556; 0586; Case map */
+    { 0x000587,
+      0x000587,
+      { 0x000565, /* 0587; 0565 0582; Case map */
+        0x000582 } },
+    { 0x001E00, 0x001E00, { 0x001E01 } }, /* 1E00; 1E01; Case map */
+    { 0x001E02, 0x001E02, { 0x001E03 } }, /* 1E02; 1E03; Case map */
+    { 0x001E04, 0x001E04, { 0x001E05 } }, /* 1E04; 1E05; Case map */
+    { 0x001E06, 0x001E06, { 0x001E07 } }, /* 1E06; 1E07; Case map */
+    { 0x001E08, 0x001E08, { 0x001E09 } }, /* 1E08; 1E09; Case map */
+    { 0x001E0A, 0x001E0A, { 0x001E0B } }, /* 1E0A; 1E0B; Case map */
+    { 0x001E0C, 0x001E0C, { 0x001E0D } }, /* 1E0C; 1E0D; Case map */
+    { 0x001E0E, 0x001E0E, { 0x001E0F } }, /* 1E0E; 1E0F; Case map */
+    { 0x001E10, 0x001E10, { 0x001E11 } }, /* 1E10; 1E11; Case map */
+    { 0x001E12, 0x001E12, { 0x001E13 } }, /* 1E12; 1E13; Case map */
+    { 0x001E14, 0x001E14, { 0x001E15 } }, /* 1E14; 1E15; Case map */
+    { 0x001E16, 0x001E16, { 0x001E17 } }, /* 1E16; 1E17; Case map */
+    { 0x001E18, 0x001E18, { 0x001E19 } }, /* 1E18; 1E19; Case map */
+    { 0x001E1A, 0x001E1A, { 0x001E1B } }, /* 1E1A; 1E1B; Case map */
+    { 0x001E1C, 0x001E1C, { 0x001E1D } }, /* 1E1C; 1E1D; Case map */
+    { 0x001E1E, 0x001E1E, { 0x001E1F } }, /* 1E1E; 1E1F; Case map */
+    { 0x001E20, 0x001E20, { 0x001E21 } }, /* 1E20; 1E21; Case map */
+    { 0x001E22, 0x001E22, { 0x001E23 } }, /* 1E22; 1E23; Case map */
+    { 0x001E24, 0x001E24, { 0x001E25 } }, /* 1E24; 1E25; Case map */
+    { 0x001E26, 0x001E26, { 0x001E27 } }, /* 1E26; 1E27; Case map */
+    { 0x001E28, 0x001E28, { 0x001E29 } }, /* 1E28; 1E29; Case map */
+    { 0x001E2A, 0x001E2A, { 0x001E2B } }, /* 1E2A; 1E2B; Case map */
+    { 0x001E2C, 0x001E2C, { 0x001E2D } }, /* 1E2C; 1E2D; Case map */
+    { 0x001E2E, 0x001E2E, { 0x001E2F } }, /* 1E2E; 1E2F; Case map */
+    { 0x001E30, 0x001E30, { 0x001E31 } }, /* 1E30; 1E31; Case map */
+    { 0x001E32, 0x001E32, { 0x001E33 } }, /* 1E32; 1E33; Case map */
+    { 0x001E34, 0x001E34, { 0x001E35 } }, /* 1E34; 1E35; Case map */
+    { 0x001E36, 0x001E36, { 0x001E37 } }, /* 1E36; 1E37; Case map */
+    { 0x001E38, 0x001E38, { 0x001E39 } }, /* 1E38; 1E39; Case map */
+    { 0x001E3A, 0x001E3A, { 0x001E3B } }, /* 1E3A; 1E3B; Case map */
+    { 0x001E3C, 0x001E3C, { 0x001E3D } }, /* 1E3C; 1E3D; Case map */
+    { 0x001E3E, 0x001E3E, { 0x001E3F } }, /* 1E3E; 1E3F; Case map */
+    { 0x001E40, 0x001E40, { 0x001E41 } }, /* 1E40; 1E41; Case map */
+    { 0x001E42, 0x001E42, { 0x001E43 } }, /* 1E42; 1E43; Case map */
+    { 0x001E44, 0x001E44, { 0x001E45 } }, /* 1E44; 1E45; Case map */
+    { 0x001E46, 0x001E46, { 0x001E47 } }, /* 1E46; 1E47; Case map */
+    { 0x001E48, 0x001E48, { 0x001E49 } }, /* 1E48; 1E49; Case map */
+    { 0x001E4A, 0x001E4A, { 0x001E4B } }, /* 1E4A; 1E4B; Case map */
+    { 0x001E4C, 0x001E4C, { 0x001E4D } }, /* 1E4C; 1E4D; Case map */
+    { 0x001E4E, 0x001E4E, { 0x001E4F } }, /* 1E4E; 1E4F; Case map */
+    { 0x001E50, 0x001E50, { 0x001E51 } }, /* 1E50; 1E51; Case map */
+    { 0x001E52, 0x001E52, { 0x001E53 } }, /* 1E52; 1E53; Case map */
+    { 0x001E54, 0x001E54, { 0x001E55 } }, /* 1E54; 1E55; Case map */
+    { 0x001E56, 0x001E56, { 0x001E57 } }, /* 1E56; 1E57; Case map */
+    { 0x001E58, 0x001E58, { 0x001E59 } }, /* 1E58; 1E59; Case map */
+    { 0x001E5A, 0x001E5A, { 0x001E5B } }, /* 1E5A; 1E5B; Case map */
+    { 0x001E5C, 0x001E5C, { 0x001E5D } }, /* 1E5C; 1E5D; Case map */
+    { 0x001E5E, 0x001E5E, { 0x001E5F } }, /* 1E5E; 1E5F; Case map */
+    { 0x001E60, 0x001E60, { 0x001E61 } }, /* 1E60; 1E61; Case map */
+    { 0x001E62, 0x001E62, { 0x001E63 } }, /* 1E62; 1E63; Case map */
+    { 0x001E64, 0x001E64, { 0x001E65 } }, /* 1E64; 1E65; Case map */
+    { 0x001E66, 0x001E66, { 0x001E67 } }, /* 1E66; 1E67; Case map */
+    { 0x001E68, 0x001E68, { 0x001E69 } }, /* 1E68; 1E69; Case map */
+    { 0x001E6A, 0x001E6A, { 0x001E6B } }, /* 1E6A; 1E6B; Case map */
+    { 0x001E6C, 0x001E6C, { 0x001E6D } }, /* 1E6C; 1E6D; Case map */
+    { 0x001E6E, 0x001E6E, { 0x001E6F } }, /* 1E6E; 1E6F; Case map */
+    { 0x001E70, 0x001E70, { 0x001E71 } }, /* 1E70; 1E71; Case map */
+    { 0x001E72, 0x001E72, { 0x001E73 } }, /* 1E72; 1E73; Case map */
+    { 0x001E74, 0x001E74, { 0x001E75 } }, /* 1E74; 1E75; Case map */
+    { 0x001E76, 0x001E76, { 0x001E77 } }, /* 1E76; 1E77; Case map */
+    { 0x001E78, 0x001E78, { 0x001E79 } }, /* 1E78; 1E79; Case map */
+    { 0x001E7A, 0x001E7A, { 0x001E7B } }, /* 1E7A; 1E7B; Case map */
+    { 0x001E7C, 0x001E7C, { 0x001E7D } }, /* 1E7C; 1E7D; Case map */
+    { 0x001E7E, 0x001E7E, { 0x001E7F } }, /* 1E7E; 1E7F; Case map */
+    { 0x001E80, 0x001E80, { 0x001E81 } }, /* 1E80; 1E81; Case map */
+    { 0x001E82, 0x001E82, { 0x001E83 } }, /* 1E82; 1E83; Case map */
+    { 0x001E84, 0x001E84, { 0x001E85 } }, /* 1E84; 1E85; Case map */
+    { 0x001E86, 0x001E86, { 0x001E87 } }, /* 1E86; 1E87; Case map */
+    { 0x001E88, 0x001E88, { 0x001E89 } }, /* 1E88; 1E89; Case map */
+    { 0x001E8A, 0x001E8A, { 0x001E8B } }, /* 1E8A; 1E8B; Case map */
+    { 0x001E8C, 0x001E8C, { 0x001E8D } }, /* 1E8C; 1E8D; Case map */
+    { 0x001E8E, 0x001E8E, { 0x001E8F } }, /* 1E8E; 1E8F; Case map */
+    { 0x001E90, 0x001E90, { 0x001E91 } }, /* 1E90; 1E91; Case map */
+    { 0x001E92, 0x001E92, { 0x001E93 } }, /* 1E92; 1E93; Case map */
+    { 0x001E94, 0x001E94, { 0x001E95 } }, /* 1E94; 1E95; Case map */
+    { 0x001E96,
+      0x001E96,
+      { 0x000068, /* 1E96; 0068 0331; Case map */
+        0x000331 } },
+    { 0x001E97,
+      0x001E97,
+      { 0x000074, /* 1E97; 0074 0308; Case map */
+        0x000308 } },
+    { 0x001E98,
+      0x001E98,
+      { 0x000077, /* 1E98; 0077 030A; Case map */
+        0x00030A } },
+    { 0x001E99,
+      0x001E99,
+      { 0x000079, /* 1E99; 0079 030A; Case map */
+        0x00030A } },
+    { 0x001E9A,
+      0x001E9A,
+      { 0x000061, /* 1E9A; 0061 02BE; Case map */
+        0x0002BE } },
+    { 0x001E9B, 0x001E9B, { 0x001E61 } }, /* 1E9B; 1E61; Case map */
+    { 0x001EA0, 0x001EA0, { 0x001EA1 } }, /* 1EA0; 1EA1; Case map */
+    { 0x001EA2, 0x001EA2, { 0x001EA3 } }, /* 1EA2; 1EA3; Case map */
+    { 0x001EA4, 0x001EA4, { 0x001EA5 } }, /* 1EA4; 1EA5; Case map */
+    { 0x001EA6, 0x001EA6, { 0x001EA7 } }, /* 1EA6; 1EA7; Case map */
+    { 0x001EA8, 0x001EA8, { 0x001EA9 } }, /* 1EA8; 1EA9; Case map */
+    { 0x001EAA, 0x001EAA, { 0x001EAB } }, /* 1EAA; 1EAB; Case map */
+    { 0x001EAC, 0x001EAC, { 0x001EAD } }, /* 1EAC; 1EAD; Case map */
+    { 0x001EAE, 0x001EAE, { 0x001EAF } }, /* 1EAE; 1EAF; Case map */
+    { 0x001EB0, 0x001EB0, { 0x001EB1 } }, /* 1EB0; 1EB1; Case map */
+    { 0x001EB2, 0x001EB2, { 0x001EB3 } }, /* 1EB2; 1EB3; Case map */
+    { 0x001EB4, 0x001EB4, { 0x001EB5 } }, /* 1EB4; 1EB5; Case map */
+    { 0x001EB6, 0x001EB6, { 0x001EB7 } }, /* 1EB6; 1EB7; Case map */
+    { 0x001EB8, 0x001EB8, { 0x001EB9 } }, /* 1EB8; 1EB9; Case map */
+    { 0x001EBA, 0x001EBA, { 0x001EBB } }, /* 1EBA; 1EBB; Case map */
+    { 0x001EBC, 0x001EBC, { 0x001EBD } }, /* 1EBC; 1EBD; Case map */
+    { 0x001EBE, 0x001EBE, { 0x001EBF } }, /* 1EBE; 1EBF; Case map */
+    { 0x001EC0, 0x001EC0, { 0x001EC1 } }, /* 1EC0; 1EC1; Case map */
+    { 0x001EC2, 0x001EC2, { 0x001EC3 } }, /* 1EC2; 1EC3; Case map */
+    { 0x001EC4, 0x001EC4, { 0x001EC5 } }, /* 1EC4; 1EC5; Case map */
+    { 0x001EC6, 0x001EC6, { 0x001EC7 } }, /* 1EC6; 1EC7; Case map */
+    { 0x001EC8, 0x001EC8, { 0x001EC9 } }, /* 1EC8; 1EC9; Case map */
+    { 0x001ECA, 0x001ECA, { 0x001ECB } }, /* 1ECA; 1ECB; Case map */
+    { 0x001ECC, 0x001ECC, { 0x001ECD } }, /* 1ECC; 1ECD; Case map */
+    { 0x001ECE, 0x001ECE, { 0x001ECF } }, /* 1ECE; 1ECF; Case map */
+    { 0x001ED0, 0x001ED0, { 0x001ED1 } }, /* 1ED0; 1ED1; Case map */
+    { 0x001ED2, 0x001ED2, { 0x001ED3 } }, /* 1ED2; 1ED3; Case map */
+    { 0x001ED4, 0x001ED4, { 0x001ED5 } }, /* 1ED4; 1ED5; Case map */
+    { 0x001ED6, 0x001ED6, { 0x001ED7 } }, /* 1ED6; 1ED7; Case map */
+    { 0x001ED8, 0x001ED8, { 0x001ED9 } }, /* 1ED8; 1ED9; Case map */
+    { 0x001EDA, 0x001EDA, { 0x001EDB } }, /* 1EDA; 1EDB; Case map */
+    { 0x001EDC, 0x001EDC, { 0x001EDD } }, /* 1EDC; 1EDD; Case map */
+    { 0x001EDE, 0x001EDE, { 0x001EDF } }, /* 1EDE; 1EDF; Case map */
+    { 0x001EE0, 0x001EE0, { 0x001EE1 } }, /* 1EE0; 1EE1; Case map */
+    { 0x001EE2, 0x001EE2, { 0x001EE3 } }, /* 1EE2; 1EE3; Case map */
+    { 0x001EE4, 0x001EE4, { 0x001EE5 } }, /* 1EE4; 1EE5; Case map */
+    { 0x001EE6, 0x001EE6, { 0x001EE7 } }, /* 1EE6; 1EE7; Case map */
+    { 0x001EE8, 0x001EE8, { 0x001EE9 } }, /* 1EE8; 1EE9; Case map */
+    { 0x001EEA, 0x001EEA, { 0x001EEB } }, /* 1EEA; 1EEB; Case map */
+    { 0x001EEC, 0x001EEC, { 0x001EED } }, /* 1EEC; 1EED; Case map */
+    { 0x001EEE, 0x001EEE, { 0x001EEF } }, /* 1EEE; 1EEF; Case map */
+    { 0x001EF0, 0x001EF0, { 0x001EF1 } }, /* 1EF0; 1EF1; Case map */
+    { 0x001EF2, 0x001EF2, { 0x001EF3 } }, /* 1EF2; 1EF3; Case map */
+    { 0x001EF4, 0x001EF4, { 0x001EF5 } }, /* 1EF4; 1EF5; Case map */
+    { 0x001EF6, 0x001EF6, { 0x001EF7 } }, /* 1EF6; 1EF7; Case map */
+    { 0x001EF8, 0x001EF8, { 0x001EF9 } }, /* 1EF8; 1EF9; Case map */
+    { 0x001F08, 0x001F08, { 0x001F00 } }, /* 1F08; 1F00; Case map */
+    { 0x001F09, 0x001F09, { 0x001F01 } }, /* 1F09; 1F01; Case map */
+    { 0x001F0A, 0x001F0A, { 0x001F02 } }, /* 1F0A; 1F02; Case map */
+    { 0x001F0B, 0x001F0B, { 0x001F03 } }, /* 1F0B; 1F03; Case map */
+    { 0x001F0C, 0x001F0C, { 0x001F04 } }, /* 1F0C; 1F04; Case map */
+    { 0x001F0D, 0x001F0D, { 0x001F05 } }, /* 1F0D; 1F05; Case map */
+    { 0x001F0E, 0x001F0E, { 0x001F06 } }, /* 1F0E; 1F06; Case map */
+    { 0x001F0F, 0x001F0F, { 0x001F07 } }, /* 1F0F; 1F07; Case map */
+    { 0x001F18, 0x001F18, { 0x001F10 } }, /* 1F18; 1F10; Case map */
+    { 0x001F19, 0x001F19, { 0x001F11 } }, /* 1F19; 1F11; Case map */
+    { 0x001F1A, 0x001F1A, { 0x001F12 } }, /* 1F1A; 1F12; Case map */
+    { 0x001F1B, 0x001F1B, { 0x001F13 } }, /* 1F1B; 1F13; Case map */
+    { 0x001F1C, 0x001F1C, { 0x001F14 } }, /* 1F1C; 1F14; Case map */
+    { 0x001F1D, 0x001F1D, { 0x001F15 } }, /* 1F1D; 1F15; Case map */
+    { 0x001F28, 0x001F28, { 0x001F20 } }, /* 1F28; 1F20; Case map */
+    { 0x001F29, 0x001F29, { 0x001F21 } }, /* 1F29; 1F21; Case map */
+    { 0x001F2A, 0x001F2A, { 0x001F22 } }, /* 1F2A; 1F22; Case map */
+    { 0x001F2B, 0x001F2B, { 0x001F23 } }, /* 1F2B; 1F23; Case map */
+    { 0x001F2C, 0x001F2C, { 0x001F24 } }, /* 1F2C; 1F24; Case map */
+    { 0x001F2D, 0x001F2D, { 0x001F25 } }, /* 1F2D; 1F25; Case map */
+    { 0x001F2E, 0x001F2E, { 0x001F26 } }, /* 1F2E; 1F26; Case map */
+    { 0x001F2F, 0x001F2F, { 0x001F27 } }, /* 1F2F; 1F27; Case map */
+    { 0x001F38, 0x001F38, { 0x001F30 } }, /* 1F38; 1F30; Case map */
+    { 0x001F39, 0x001F39, { 0x001F31 } }, /* 1F39; 1F31; Case map */
+    { 0x001F3A, 0x001F3A, { 0x001F32 } }, /* 1F3A; 1F32; Case map */
+    { 0x001F3B, 0x001F3B, { 0x001F33 } }, /* 1F3B; 1F33; Case map */
+    { 0x001F3C, 0x001F3C, { 0x001F34 } }, /* 1F3C; 1F34; Case map */
+    { 0x001F3D, 0x001F3D, { 0x001F35 } }, /* 1F3D; 1F35; Case map */
+    { 0x001F3E, 0x001F3E, { 0x001F36 } }, /* 1F3E; 1F36; Case map */
+    { 0x001F3F, 0x001F3F, { 0x001F37 } }, /* 1F3F; 1F37; Case map */
+    { 0x001F48, 0x001F48, { 0x001F40 } }, /* 1F48; 1F40; Case map */
+    { 0x001F49, 0x001F49, { 0x001F41 } }, /* 1F49; 1F41; Case map */
+    { 0x001F4A, 0x001F4A, { 0x001F42 } }, /* 1F4A; 1F42; Case map */
+    { 0x001F4B, 0x001F4B, { 0x001F43 } }, /* 1F4B; 1F43; Case map */
+    { 0x001F4C, 0x001F4C, { 0x001F44 } }, /* 1F4C; 1F44; Case map */
+    { 0x001F4D, 0x001F4D, { 0x001F45 } }, /* 1F4D; 1F45; Case map */
+    { 0x001F50,
+      0x001F50,
+      { 0x0003C5, /* 1F50; 03C5 0313; Case map */
+        0x000313 } },
+    { 0x001F52,
+      0x001F52,
+      { 0x0003C5, /* 1F52; 03C5 0313 0300; Case map */
+        0x000313, 0x000300 } },
+    { 0x001F54,
+      0x001F54,
+      { 0x0003C5, /* 1F54; 03C5 0313 0301; Case map */
+        0x000313, 0x000301 } },
+    { 0x001F56,
+      0x001F56,
+      { 0x0003C5, /* 1F56; 03C5 0313 0342; Case map */
+        0x000313, 0x000342 } },
+    { 0x001F59, 0x001F59, { 0x001F51 } }, /* 1F59; 1F51; Case map */
+    { 0x001F5B, 0x001F5B, { 0x001F53 } }, /* 1F5B; 1F53; Case map */
+    { 0x001F5D, 0x001F5D, { 0x001F55 } }, /* 1F5D; 1F55; Case map */
+    { 0x001F5F, 0x001F5F, { 0x001F57 } }, /* 1F5F; 1F57; Case map */
+    { 0x001F68, 0x001F68, { 0x001F60 } }, /* 1F68; 1F60; Case map */
+    { 0x001F69, 0x001F69, { 0x001F61 } }, /* 1F69; 1F61; Case map */
+    { 0x001F6A, 0x001F6A, { 0x001F62 } }, /* 1F6A; 1F62; Case map */
+    { 0x001F6B, 0x001F6B, { 0x001F63 } }, /* 1F6B; 1F63; Case map */
+    { 0x001F6C, 0x001F6C, { 0x001F64 } }, /* 1F6C; 1F64; Case map */
+    { 0x001F6D, 0x001F6D, { 0x001F65 } }, /* 1F6D; 1F65; Case map */
+    { 0x001F6E, 0x001F6E, { 0x001F66 } }, /* 1F6E; 1F66; Case map */
+    { 0x001F6F, 0x001F6F, { 0x001F67 } }, /* 1F6F; 1F67; Case map */
+    { 0x001F80,
+      0x001F80,
+      { 0x001F00, /* 1F80; 1F00 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F81,
+      0x001F81,
+      { 0x001F01, /* 1F81; 1F01 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F82,
+      0x001F82,
+      { 0x001F02, /* 1F82; 1F02 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F83,
+      0x001F83,
+      { 0x001F03, /* 1F83; 1F03 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F84,
+      0x001F84,
+      { 0x001F04, /* 1F84; 1F04 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F85,
+      0x001F85,
+      { 0x001F05, /* 1F85; 1F05 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F86,
+      0x001F86,
+      { 0x001F06, /* 1F86; 1F06 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F87,
+      0x001F87,
+      { 0x001F07, /* 1F87; 1F07 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F88,
+      0x001F88,
+      { 0x001F00, /* 1F88; 1F00 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F89,
+      0x001F89,
+      { 0x001F01, /* 1F89; 1F01 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F8A,
+      0x001F8A,
+      { 0x001F02, /* 1F8A; 1F02 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F8B,
+      0x001F8B,
+      { 0x001F03, /* 1F8B; 1F03 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F8C,
+      0x001F8C,
+      { 0x001F04, /* 1F8C; 1F04 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F8D,
+      0x001F8D,
+      { 0x001F05, /* 1F8D; 1F05 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F8E,
+      0x001F8E,
+      { 0x001F06, /* 1F8E; 1F06 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F8F,
+      0x001F8F,
+      { 0x001F07, /* 1F8F; 1F07 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F90,
+      0x001F90,
+      { 0x001F20, /* 1F90; 1F20 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F91,
+      0x001F91,
+      { 0x001F21, /* 1F91; 1F21 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F92,
+      0x001F92,
+      { 0x001F22, /* 1F92; 1F22 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F93,
+      0x001F93,
+      { 0x001F23, /* 1F93; 1F23 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F94,
+      0x001F94,
+      { 0x001F24, /* 1F94; 1F24 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F95,
+      0x001F95,
+      { 0x001F25, /* 1F95; 1F25 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F96,
+      0x001F96,
+      { 0x001F26, /* 1F96; 1F26 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F97,
+      0x001F97,
+      { 0x001F27, /* 1F97; 1F27 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F98,
+      0x001F98,
+      { 0x001F20, /* 1F98; 1F20 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F99,
+      0x001F99,
+      { 0x001F21, /* 1F99; 1F21 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F9A,
+      0x001F9A,
+      { 0x001F22, /* 1F9A; 1F22 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F9B,
+      0x001F9B,
+      { 0x001F23, /* 1F9B; 1F23 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F9C,
+      0x001F9C,
+      { 0x001F24, /* 1F9C; 1F24 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F9D,
+      0x001F9D,
+      { 0x001F25, /* 1F9D; 1F25 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F9E,
+      0x001F9E,
+      { 0x001F26, /* 1F9E; 1F26 03B9; Case map */
+        0x0003B9 } },
+    { 0x001F9F,
+      0x001F9F,
+      { 0x001F27, /* 1F9F; 1F27 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FA0,
+      0x001FA0,
+      { 0x001F60, /* 1FA0; 1F60 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FA1,
+      0x001FA1,
+      { 0x001F61, /* 1FA1; 1F61 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FA2,
+      0x001FA2,
+      { 0x001F62, /* 1FA2; 1F62 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FA3,
+      0x001FA3,
+      { 0x001F63, /* 1FA3; 1F63 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FA4,
+      0x001FA4,
+      { 0x001F64, /* 1FA4; 1F64 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FA5,
+      0x001FA5,
+      { 0x001F65, /* 1FA5; 1F65 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FA6,
+      0x001FA6,
+      { 0x001F66, /* 1FA6; 1F66 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FA7,
+      0x001FA7,
+      { 0x001F67, /* 1FA7; 1F67 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FA8,
+      0x001FA8,
+      { 0x001F60, /* 1FA8; 1F60 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FA9,
+      0x001FA9,
+      { 0x001F61, /* 1FA9; 1F61 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FAA,
+      0x001FAA,
+      { 0x001F62, /* 1FAA; 1F62 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FAB,
+      0x001FAB,
+      { 0x001F63, /* 1FAB; 1F63 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FAC,
+      0x001FAC,
+      { 0x001F64, /* 1FAC; 1F64 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FAD,
+      0x001FAD,
+      { 0x001F65, /* 1FAD; 1F65 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FAE,
+      0x001FAE,
+      { 0x001F66, /* 1FAE; 1F66 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FAF,
+      0x001FAF,
+      { 0x001F67, /* 1FAF; 1F67 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FB2,
+      0x001FB2,
+      { 0x001F70, /* 1FB2; 1F70 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FB3,
+      0x001FB3,
+      { 0x0003B1, /* 1FB3; 03B1 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FB4,
+      0x001FB4,
+      { 0x0003AC, /* 1FB4; 03AC 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FB6,
+      0x001FB6,
+      { 0x0003B1, /* 1FB6; 03B1 0342; Case map */
+        0x000342 } },
+    { 0x001FB7,
+      0x001FB7,
+      { 0x0003B1, /* 1FB7; 03B1 0342 03B9; Case map */
+        0x000342, 0x0003B9 } },
+    { 0x001FB8, 0x001FB8, { 0x001FB0 } }, /* 1FB8; 1FB0; Case map */
+    { 0x001FB9, 0x001FB9, { 0x001FB1 } }, /* 1FB9; 1FB1; Case map */
+    { 0x001FBA, 0x001FBA, { 0x001F70 } }, /* 1FBA; 1F70; Case map */
+    { 0x001FBB, 0x001FBB, { 0x001F71 } }, /* 1FBB; 1F71; Case map */
+    { 0x001FBC,
+      0x001FBC,
+      { 0x0003B1, /* 1FBC; 03B1 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FBE, 0x001FBE, { 0x0003B9 } }, /* 1FBE; 03B9; Case map */
+    { 0x001FC2,
+      0x001FC2,
+      { 0x001F74, /* 1FC2; 1F74 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FC3,
+      0x001FC3,
+      { 0x0003B7, /* 1FC3; 03B7 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FC4,
+      0x001FC4,
+      { 0x0003AE, /* 1FC4; 03AE 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FC6,
+      0x001FC6,
+      { 0x0003B7, /* 1FC6; 03B7 0342; Case map */
+        0x000342 } },
+    { 0x001FC7,
+      0x001FC7,
+      { 0x0003B7, /* 1FC7; 03B7 0342 03B9; Case map */
+        0x000342, 0x0003B9 } },
+    { 0x001FC8, 0x001FC8, { 0x001F72 } }, /* 1FC8; 1F72; Case map */
+    { 0x001FC9, 0x001FC9, { 0x001F73 } }, /* 1FC9; 1F73; Case map */
+    { 0x001FCA, 0x001FCA, { 0x001F74 } }, /* 1FCA; 1F74; Case map */
+    { 0x001FCB, 0x001FCB, { 0x001F75 } }, /* 1FCB; 1F75; Case map */
+    { 0x001FCC,
+      0x001FCC,
+      { 0x0003B7, /* 1FCC; 03B7 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FD2,
+      0x001FD2,
+      { 0x0003B9, /* 1FD2; 03B9 0308 0300; Case map */
+        0x000308, 0x000300 } },
+    { 0x001FD3,
+      0x001FD3,
+      { 0x0003B9, /* 1FD3; 03B9 0308 0301; Case map */
+        0x000308, 0x000301 } },
+    { 0x001FD6,
+      0x001FD6,
+      { 0x0003B9, /* 1FD6; 03B9 0342; Case map */
+        0x000342 } },
+    { 0x001FD7,
+      0x001FD7,
+      { 0x0003B9, /* 1FD7; 03B9 0308 0342; Case map */
+        0x000308, 0x000342 } },
+    { 0x001FD8, 0x001FD8, { 0x001FD0 } }, /* 1FD8; 1FD0; Case map */
+    { 0x001FD9, 0x001FD9, { 0x001FD1 } }, /* 1FD9; 1FD1; Case map */
+    { 0x001FDA, 0x001FDA, { 0x001F76 } }, /* 1FDA; 1F76; Case map */
+    { 0x001FDB, 0x001FDB, { 0x001F77 } }, /* 1FDB; 1F77; Case map */
+    { 0x001FE2,
+      0x001FE2,
+      { 0x0003C5, /* 1FE2; 03C5 0308 0300; Case map */
+        0x000308, 0x000300 } },
+    { 0x001FE3,
+      0x001FE3,
+      { 0x0003C5, /* 1FE3; 03C5 0308 0301; Case map */
+        0x000308, 0x000301 } },
+    { 0x001FE4,
+      0x001FE4,
+      { 0x0003C1, /* 1FE4; 03C1 0313; Case map */
+        0x000313 } },
+    { 0x001FE6,
+      0x001FE6,
+      { 0x0003C5, /* 1FE6; 03C5 0342; Case map */
+        0x000342 } },
+    { 0x001FE7,
+      0x001FE7,
+      { 0x0003C5, /* 1FE7; 03C5 0308 0342; Case map */
+        0x000308, 0x000342 } },
+    { 0x001FE8, 0x001FE8, { 0x001FE0 } }, /* 1FE8; 1FE0; Case map */
+    { 0x001FE9, 0x001FE9, { 0x001FE1 } }, /* 1FE9; 1FE1; Case map */
+    { 0x001FEA, 0x001FEA, { 0x001F7A } }, /* 1FEA; 1F7A; Case map */
+    { 0x001FEB, 0x001FEB, { 0x001F7B } }, /* 1FEB; 1F7B; Case map */
+    { 0x001FEC, 0x001FEC, { 0x001FE5 } }, /* 1FEC; 1FE5; Case map */
+    { 0x001FF2,
+      0x001FF2,
+      { 0x001F7C, /* 1FF2; 1F7C 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FF3,
+      0x001FF3,
+      { 0x0003C9, /* 1FF3; 03C9 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FF4,
+      0x001FF4,
+      { 0x0003CE, /* 1FF4; 03CE 03B9; Case map */
+        0x0003B9 } },
+    { 0x001FF6,
+      0x001FF6,
+      { 0x0003C9, /* 1FF6; 03C9 0342; Case map */
+        0x000342 } },
+    { 0x001FF7,
+      0x001FF7,
+      { 0x0003C9, /* 1FF7; 03C9 0342 03B9; Case map */
+        0x000342, 0x0003B9 } },
+    { 0x001FF8, 0x001FF8, { 0x001F78 } }, /* 1FF8; 1F78; Case map */
+    { 0x001FF9, 0x001FF9, { 0x001F79 } }, /* 1FF9; 1F79; Case map */
+    { 0x001FFA, 0x001FFA, { 0x001F7C } }, /* 1FFA; 1F7C; Case map */
+    { 0x001FFB, 0x001FFB, { 0x001F7D } }, /* 1FFB; 1F7D; Case map */
+    { 0x001FFC,
+      0x001FFC,
+      { 0x0003C9, /* 1FFC; 03C9 03B9; Case map */
+        0x0003B9 } },
+    { 0x002126, 0x002126, { 0x0003C9 } }, /* 2126; 03C9; Case map */
+    { 0x00212A, 0x00212A, { 0x00006B } }, /* 212A; 006B; Case map */
+    { 0x00212B, 0x00212B, { 0x0000E5 } }, /* 212B; 00E5; Case map */
+    { 0x002160, 0x002160, { 0x002170 } }, /* 2160; 2170; Case map */
+    { 0x002161, 0x002161, { 0x002171 } }, /* 2161; 2171; Case map */
+    { 0x002162, 0x002162, { 0x002172 } }, /* 2162; 2172; Case map */
+    { 0x002163, 0x002163, { 0x002173 } }, /* 2163; 2173; Case map */
+    { 0x002164, 0x002164, { 0x002174 } }, /* 2164; 2174; Case map */
+    { 0x002165, 0x002165, { 0x002175 } }, /* 2165; 2175; Case map */
+    { 0x002166, 0x002166, { 0x002176 } }, /* 2166; 2176; Case map */
+    { 0x002167, 0x002167, { 0x002177 } }, /* 2167; 2177; Case map */
+    { 0x002168, 0x002168, { 0x002178 } }, /* 2168; 2178; Case map */
+    { 0x002169, 0x002169, { 0x002179 } }, /* 2169; 2179; Case map */
+    { 0x00216A, 0x00216A, { 0x00217A } }, /* 216A; 217A; Case map */
+    { 0x00216B, 0x00216B, { 0x00217B } }, /* 216B; 217B; Case map */
+    { 0x00216C, 0x00216C, { 0x00217C } }, /* 216C; 217C; Case map */
+    { 0x00216D, 0x00216D, { 0x00217D } }, /* 216D; 217D; Case map */
+    { 0x00216E, 0x00216E, { 0x00217E } }, /* 216E; 217E; Case map */
+    { 0x00216F, 0x00216F, { 0x00217F } }, /* 216F; 217F; Case map */
+    { 0x0024B6, 0x0024B6, { 0x0024D0 } }, /* 24B6; 24D0; Case map */
+    { 0x0024B7, 0x0024B7, { 0x0024D1 } }, /* 24B7; 24D1; Case map */
+    { 0x0024B8, 0x0024B8, { 0x0024D2 } }, /* 24B8; 24D2; Case map */
+    { 0x0024B9, 0x0024B9, { 0x0024D3 } }, /* 24B9; 24D3; Case map */
+    { 0x0024BA, 0x0024BA, { 0x0024D4 } }, /* 24BA; 24D4; Case map */
+    { 0x0024BB, 0x0024BB, { 0x0024D5 } }, /* 24BB; 24D5; Case map */
+    { 0x0024BC, 0x0024BC, { 0x0024D6 } }, /* 24BC; 24D6; Case map */
+    { 0x0024BD, 0x0024BD, { 0x0024D7 } }, /* 24BD; 24D7; Case map */
+    { 0x0024BE, 0x0024BE, { 0x0024D8 } }, /* 24BE; 24D8; Case map */
+    { 0x0024BF, 0x0024BF, { 0x0024D9 } }, /* 24BF; 24D9; Case map */
+    { 0x0024C0, 0x0024C0, { 0x0024DA } }, /* 24C0; 24DA; Case map */
+    { 0x0024C1, 0x0024C1, { 0x0024DB } }, /* 24C1; 24DB; Case map */
+    { 0x0024C2, 0x0024C2, { 0x0024DC } }, /* 24C2; 24DC; Case map */
+    { 0x0024C3, 0x0024C3, { 0x0024DD } }, /* 24C3; 24DD; Case map */
+    { 0x0024C4, 0x0024C4, { 0x0024DE } }, /* 24C4; 24DE; Case map */
+    { 0x0024C5, 0x0024C5, { 0x0024DF } }, /* 24C5; 24DF; Case map */
+    { 0x0024C6, 0x0024C6, { 0x0024E0 } }, /* 24C6; 24E0; Case map */
+    { 0x0024C7, 0x0024C7, { 0x0024E1 } }, /* 24C7; 24E1; Case map */
+    { 0x0024C8, 0x0024C8, { 0x0024E2 } }, /* 24C8; 24E2; Case map */
+    { 0x0024C9, 0x0024C9, { 0x0024E3 } }, /* 24C9; 24E3; Case map */
+    { 0x0024CA, 0x0024CA, { 0x0024E4 } }, /* 24CA; 24E4; Case map */
+    { 0x0024CB, 0x0024CB, { 0x0024E5 } }, /* 24CB; 24E5; Case map */
+    { 0x0024CC, 0x0024CC, { 0x0024E6 } }, /* 24CC; 24E6; Case map */
+    { 0x0024CD, 0x0024CD, { 0x0024E7 } }, /* 24CD; 24E7; Case map */
+    { 0x0024CE, 0x0024CE, { 0x0024E8 } }, /* 24CE; 24E8; Case map */
+    { 0x0024CF, 0x0024CF, { 0x0024E9 } }, /* 24CF; 24E9; Case map */
+    { 0x00FB00,
+      0x00FB00,
+      { 0x000066, /* FB00; 0066 0066; Case map */
+        0x000066 } },
+    { 0x00FB01,
+      0x00FB01,
+      { 0x000066, /* FB01; 0066 0069; Case map */
+        0x000069 } },
+    { 0x00FB02,
+      0x00FB02,
+      { 0x000066, /* FB02; 0066 006C; Case map */
+        0x00006C } },
+    { 0x00FB03,
+      0x00FB03,
+      { 0x000066, /* FB03; 0066 0066 0069; Case map */
+        0x000066, 0x000069 } },
+    { 0x00FB04,
+      0x00FB04,
+      { 0x000066, /* FB04; 0066 0066 006C; Case map */
+        0x000066, 0x00006C } },
+    { 0x00FB05,
+      0x00FB05,
+      { 0x000073, /* FB05; 0073 0074; Case map */
+        0x000074 } },
+    { 0x00FB06,
+      0x00FB06,
+      { 0x000073, /* FB06; 0073 0074; Case map */
+        0x000074 } },
+    { 0x00FB13,
+      0x00FB13,
+      { 0x000574, /* FB13; 0574 0576; Case map */
+        0x000576 } },
+    { 0x00FB14,
+      0x00FB14,
+      { 0x000574, /* FB14; 0574 0565; Case map */
+        0x000565 } },
+    { 0x00FB15,
+      0x00FB15,
+      { 0x000574, /* FB15; 0574 056B; Case map */
+        0x00056B } },
+    { 0x00FB16,
+      0x00FB16,
+      { 0x00057E, /* FB16; 057E 0576; Case map */
+        0x000576 } },
+    { 0x00FB17,
+      0x00FB17,
+      { 0x000574, /* FB17; 0574 056D; Case map */
+        0x00056D } },
+    { 0x00FF21, 0x00FF21, { 0x00FF41 } }, /* FF21; FF41; Case map */
+    { 0x00FF22, 0x00FF22, { 0x00FF42 } }, /* FF22; FF42; Case map */
+    { 0x00FF23, 0x00FF23, { 0x00FF43 } }, /* FF23; FF43; Case map */
+    { 0x00FF24, 0x00FF24, { 0x00FF44 } }, /* FF24; FF44; Case map */
+    { 0x00FF25, 0x00FF25, { 0x00FF45 } }, /* FF25; FF45; Case map */
+    { 0x00FF26, 0x00FF26, { 0x00FF46 } }, /* FF26; FF46; Case map */
+    { 0x00FF27, 0x00FF27, { 0x00FF47 } }, /* FF27; FF47; Case map */
+    { 0x00FF28, 0x00FF28, { 0x00FF48 } }, /* FF28; FF48; Case map */
+    { 0x00FF29, 0x00FF29, { 0x00FF49 } }, /* FF29; FF49; Case map */
+    { 0x00FF2A, 0x00FF2A, { 0x00FF4A } }, /* FF2A; FF4A; Case map */
+    { 0x00FF2B, 0x00FF2B, { 0x00FF4B } }, /* FF2B; FF4B; Case map */
+    { 0x00FF2C, 0x00FF2C, { 0x00FF4C } }, /* FF2C; FF4C; Case map */
+    { 0x00FF2D, 0x00FF2D, { 0x00FF4D } }, /* FF2D; FF4D; Case map */
+    { 0x00FF2E, 0x00FF2E, { 0x00FF4E } }, /* FF2E; FF4E; Case map */
+    { 0x00FF2F, 0x00FF2F, { 0x00FF4F } }, /* FF2F; FF4F; Case map */
+    { 0x00FF30, 0x00FF30, { 0x00FF50 } }, /* FF30; FF50; Case map */
+    { 0x00FF31, 0x00FF31, { 0x00FF51 } }, /* FF31; FF51; Case map */
+    { 0x00FF32, 0x00FF32, { 0x00FF52 } }, /* FF32; FF52; Case map */
+    { 0x00FF33, 0x00FF33, { 0x00FF53 } }, /* FF33; FF53; Case map */
+    { 0x00FF34, 0x00FF34, { 0x00FF54 } }, /* FF34; FF54; Case map */
+    { 0x00FF35, 0x00FF35, { 0x00FF55 } }, /* FF35; FF55; Case map */
+    { 0x00FF36, 0x00FF36, { 0x00FF56 } }, /* FF36; FF56; Case map */
+    { 0x00FF37, 0x00FF37, { 0x00FF57 } }, /* FF37; FF57; Case map */
+    { 0x00FF38, 0x00FF38, { 0x00FF58 } }, /* FF38; FF58; Case map */
+    { 0x00FF39, 0x00FF39, { 0x00FF59 } }, /* FF39; FF59; Case map */
+    { 0x00FF3A, 0x00FF3A, { 0x00FF5A } }, /* FF3A; FF5A; Case map */
+    { 0x010400, 0x010400, { 0x010428 } }, /* 10400; 10428; Case map */
+    { 0x010401, 0x010401, { 0x010429 } }, /* 10401; 10429; Case map */
+    { 0x010402, 0x010402, { 0x01042A } }, /* 10402; 1042A; Case map */
+    { 0x010403, 0x010403, { 0x01042B } }, /* 10403; 1042B; Case map */
+    { 0x010404, 0x010404, { 0x01042C } }, /* 10404; 1042C; Case map */
+    { 0x010405, 0x010405, { 0x01042D } }, /* 10405; 1042D; Case map */
+    { 0x010406, 0x010406, { 0x01042E } }, /* 10406; 1042E; Case map */
+    { 0x010407, 0x010407, { 0x01042F } }, /* 10407; 1042F; Case map */
+    { 0x010408, 0x010408, { 0x010430 } }, /* 10408; 10430; Case map */
+    { 0x010409, 0x010409, { 0x010431 } }, /* 10409; 10431; Case map */
+    { 0x01040A, 0x01040A, { 0x010432 } }, /* 1040A; 10432; Case map */
+    { 0x01040B, 0x01040B, { 0x010433 } }, /* 1040B; 10433; Case map */
+    { 0x01040C, 0x01040C, { 0x010434 } }, /* 1040C; 10434; Case map */
+    { 0x01040D, 0x01040D, { 0x010435 } }, /* 1040D; 10435; Case map */
+    { 0x01040E, 0x01040E, { 0x010436 } }, /* 1040E; 10436; Case map */
+    { 0x01040F, 0x01040F, { 0x010437 } }, /* 1040F; 10437; Case map */
+    { 0x010410, 0x010410, { 0x010438 } }, /* 10410; 10438; Case map */
+    { 0x010411, 0x010411, { 0x010439 } }, /* 10411; 10439; Case map */
+    { 0x010412, 0x010412, { 0x01043A } }, /* 10412; 1043A; Case map */
+    { 0x010413, 0x010413, { 0x01043B } }, /* 10413; 1043B; Case map */
+    { 0x010414, 0x010414, { 0x01043C } }, /* 10414; 1043C; Case map */
+    { 0x010415, 0x010415, { 0x01043D } }, /* 10415; 1043D; Case map */
+    { 0x010416, 0x010416, { 0x01043E } }, /* 10416; 1043E; Case map */
+    { 0x010417, 0x010417, { 0x01043F } }, /* 10417; 1043F; Case map */
+    { 0x010418, 0x010418, { 0x010440 } }, /* 10418; 10440; Case map */
+    { 0x010419, 0x010419, { 0x010441 } }, /* 10419; 10441; Case map */
+    { 0x01041A, 0x01041A, { 0x010442 } }, /* 1041A; 10442; Case map */
+    { 0x01041B, 0x01041B, { 0x010443 } }, /* 1041B; 10443; Case map */
+    { 0x01041C, 0x01041C, { 0x010444 } }, /* 1041C; 10444; Case map */
+    { 0x01041D, 0x01041D, { 0x010445 } }, /* 1041D; 10445; Case map */
+    { 0x01041E, 0x01041E, { 0x010446 } }, /* 1041E; 10446; Case map */
+    { 0x01041F, 0x01041F, { 0x010447 } }, /* 1041F; 10447; Case map */
+    { 0x010420, 0x010420, { 0x010448 } }, /* 10420; 10448; Case map */
+    { 0x010421, 0x010421, { 0x010449 } }, /* 10421; 10449; Case map */
+    { 0x010422, 0x010422, { 0x01044A } }, /* 10422; 1044A; Case map */
+    { 0x010423, 0x010423, { 0x01044B } }, /* 10423; 1044B; Case map */
+    { 0x010424, 0x010424, { 0x01044C } }, /* 10424; 1044C; Case map */
+    { 0x010425, 0x010425, { 0x01044D } }, /* 10425; 1044D; Case map */
+    { 0 },
+};
+
+/*
+ * FF3A; FF5A; Case map
+ * 10400; 10428; Case map
+10401; 10429; Case map
+10402; 1042A; Case map
+10403; 1042B; Case map
+10404; 1042C; Case map
+10405; 1042D; Case map
+10406; 1042E; Case map
+10407; 1042F; Case map
+10408; 10430; Case map
+10409; 10431; Case map
+1040A; 10432; Case map
+1040B; 10433; Case map
+1040C; 10434; Case map
+1040D; 10435; Case map
+1040E; 10436; Case map
+1040F; 10437; Case map
+10410; 10438; Case map
+10411; 10439; Case map
+10412; 1043A; Case map
+10413; 1043B; Case map
+10414; 1043C; Case map
+10415; 1043D; Case map
+10416; 1043E; Case map
+10417; 1043F; Case map
+10418; 10440; Case map
+10419; 10441; Case map
+1041A; 10442; Case map
+1041B; 10443; Case map
+1041C; 10444; Case map
+1041D; 10445; Case map
+1041E; 10446; Case map
+1041F; 10447; Case map
+10420; 10448; Case map
+10421; 10449; Case map
+10422; 1044A; Case map
+10423; 1044B; Case map
+10424; 1044C; Case map
+10425; 1044D; Case map
+
+ */
+
+const Stringprep_table_element stringprep_rfc3454_C_1_1[] = {
+    { 0x000020, 0x000020 }, /* 0020; SPACE */
+    { 0 },
+};
+
+/*
+ * FF3A; FF5A; Case map
+ *  * 10400; 10428; Case map
+10401; 10429; Case map
+10402; 1042A; Case map
+10403; 1042B; Case map
+10404; 1042C; Case map
+10405; 1042D; Case map
+10406; 1042E; Case map
+10407; 1042F; Case map
+10408; 10430; Case map
+10409; 10431; Case map
+1040A; 10432; Case map
+1040B; 10433; Case map
+1040C; 10434; Case map
+1040D; 10435; Case map
+1040E; 10436; Case map
+1040F; 10437; Case map
+10410; 10438; Case map
+10411; 10439; Case map
+10412; 1043A; Case map
+10413; 1043B; Case map
+10414; 1043C; Case map
+10415; 1043D; Case map
+10416; 1043E; Case map
+10417; 1043F; Case map
+10418; 10440; Case map
+10419; 10441; Case map
+1041A; 10442; Case map
+1041B; 10443; Case map
+1041C; 10444; Case map
+1041D; 10445; Case map
+1041E; 10446; Case map
+1041F; 10447; Case map
+10420; 10448; Case map
+10421; 10449; Case map
+10422; 1044A; Case map
+10423; 1044B; Case map
+10424; 1044C; Case map
+10425; 1044D; Case map
+
+0020; SPACE
+
+ */
+
+const Stringprep_table_element stringprep_rfc3454_C_1_2[] = {
+    { 0x0000A0, 0x0000A0 }, /* 00A0; NO-BREAK SPACE */
+    { 0x001680, 0x001680 }, /* 1680; OGHAM SPACE MARK */
+    { 0x002000, 0x002000 }, /* 2000; EN QUAD */
+    { 0x002001, 0x002001 }, /* 2001; EM QUAD */
+    { 0x002002, 0x002002 }, /* 2002; EN SPACE */
+    { 0x002003, 0x002003 }, /* 2003; EM SPACE */
+    { 0x002004, 0x002004 }, /* 2004; THREE-PER-EM SPACE */
+    { 0x002005, 0x002005 }, /* 2005; FOUR-PER-EM SPACE */
+    { 0x002006, 0x002006 }, /* 2006; SIX-PER-EM SPACE */
+    { 0x002007, 0x002007 }, /* 2007; FIGURE SPACE */
+    { 0x002008, 0x002008 }, /* 2008; PUNCTUATION SPACE */
+    { 0x002009, 0x002009 }, /* 2009; THIN SPACE */
+    { 0x00200A, 0x00200A }, /* 200A; HAIR SPACE */
+    { 0x00200B, 0x00200B }, /* 200B; ZERO WIDTH SPACE */
+    { 0x00202F, 0x00202F }, /* 202F; NARROW NO-BREAK SPACE */
+    { 0x00205F, 0x00205F }, /* 205F; MEDIUM MATHEMATICAL SPACE */
+    { 0x003000, 0x003000 }, /* 3000; IDEOGRAPHIC SPACE */
+    { 0 },
+};
+
+/*
+ * FF3A; FF5A; Case map
+ *  *  * 10400; 10428; Case map
+10401; 10429; Case map
+10402; 1042A; Case map
+10403; 1042B; Case map
+10404; 1042C; Case map
+10405; 1042D; Case map
+10406; 1042E; Case map
+10407; 1042F; Case map
+10408; 10430; Case map
+10409; 10431; Case map
+1040A; 10432; Case map
+1040B; 10433; Case map
+1040C; 10434; Case map
+1040D; 10435; Case map
+1040E; 10436; Case map
+1040F; 10437; Case map
+10410; 10438; Case map
+10411; 10439; Case map
+10412; 1043A; Case map
+10413; 1043B; Case map
+10414; 1043C; Case map
+10415; 1043D; Case map
+10416; 1043E; Case map
+10417; 1043F; Case map
+10418; 10440; Case map
+10419; 10441; Case map
+1041A; 10442; Case map
+1041B; 10443; Case map
+1041C; 10444; Case map
+1041D; 10445; Case map
+1041E; 10446; Case map
+1041F; 10447; Case map
+10420; 10448; Case map
+10421; 10449; Case map
+10422; 1044A; Case map
+10423; 1044B; Case map
+10424; 1044C; Case map
+10425; 1044D; Case map
+
+0020; SPACE
+
+00A0; NO-BREAK SPACE
+1680; OGHAM SPACE MARK
+2000; EN QUAD
+2001; EM QUAD
+2002; EN SPACE
+2003; EM SPACE
+2004; THREE-PER-EM SPACE
+2005; FOUR-PER-EM SPACE
+2006; SIX-PER-EM SPACE
+2007; FIGURE SPACE
+2008; PUNCTUATION SPACE
+2009; THIN SPACE
+200A; HAIR SPACE
+200B; ZERO WIDTH SPACE
+202F; NARROW NO-BREAK SPACE
+205F; MEDIUM MATHEMATICAL SPACE
+3000; IDEOGRAPHIC SPACE
+
+ */
+
+const Stringprep_table_element stringprep_rfc3454_C_2_1[] = {
+    { 0x000000, 0x00001F }, /* 0000-001F; [CONTROL CHARACTERS] */
+    { 0x00007F, 0x00007F }, /* 007F; DELETE */
+    { 0 },
+};
+
+/*
+ * FF3A; FF5A; Case map
+ *  *  *  * 10400; 10428; Case map
+10401; 10429; Case map
+10402; 1042A; Case map
+10403; 1042B; Case map
+10404; 1042C; Case map
+10405; 1042D; Case map
+10406; 1042E; Case map
+10407; 1042F; Case map
+10408; 10430; Case map
+10409; 10431; Case map
+1040A; 10432; Case map
+1040B; 10433; Case map
+1040C; 10434; Case map
+1040D; 10435; Case map
+1040E; 10436; Case map
+1040F; 10437; Case map
+10410; 10438; Case map
+10411; 10439; Case map
+10412; 1043A; Case map
+10413; 1043B; Case map
+10414; 1043C; Case map
+10415; 1043D; Case map
+10416; 1043E; Case map
+10417; 1043F; Case map
+10418; 10440; Case map
+10419; 10441; Case map
+1041A; 10442; Case map
+1041B; 10443; Case map
+1041C; 10444; Case map
+1041D; 10445; Case map
+1041E; 10446; Case map
+1041F; 10447; Case map
+10420; 10448; Case map
+10421; 10449; Case map
+10422; 1044A; Case map
+10423; 1044B; Case map
+10424; 1044C; Case map
+10425; 1044D; Case map
+
+0020; SPACE
+
+00A0; NO-BREAK SPACE
+1680; OGHAM SPACE MARK
+2000; EN QUAD
+2001; EM QUAD
+2002; EN SPACE
+2003; EM SPACE
+2004; THREE-PER-EM SPACE
+2005; FOUR-PER-EM SPACE
+2006; SIX-PER-EM SPACE
+2007; FIGURE SPACE
+2008; PUNCTUATION SPACE
+2009; THIN SPACE
+200A; HAIR SPACE
+200B; ZERO WIDTH SPACE
+202F; NARROW NO-BREAK SPACE
+205F; MEDIUM MATHEMATICAL SPACE
+3000; IDEOGRAPHIC SPACE
+
+0000-001F; [CONTROL CHARACTERS]
+007F; DELETE
+
+ */
+
+const Stringprep_table_element stringprep_rfc3454_C_2_2[] = {
+    { 0x000080, 0x00009F }, /* 0080-009F; [CONTROL CHARACTERS] */
+    { 0x0006DD, 0x0006DD }, /* 06DD; ARABIC END OF AYAH */
+    { 0x00070F, 0x00070F }, /* 070F; SYRIAC ABBREVIATION MARK */
+    { 0x00180E, 0x00180E }, /* 180E; MONGOLIAN VOWEL SEPARATOR */
+    { 0x00200C, 0x00200C }, /* 200C; ZERO WIDTH NON-JOINER */
+    { 0x00200D, 0x00200D }, /* 200D; ZERO WIDTH JOINER */
+    { 0x002028, 0x002028 }, /* 2028; LINE SEPARATOR */
+    { 0x002029, 0x002029 }, /* 2029; PARAGRAPH SEPARATOR */
+    { 0x002060, 0x002060 }, /* 2060; WORD JOINER */
+    { 0x002061, 0x002061 }, /* 2061; FUNCTION APPLICATION */
+    { 0x002062, 0x002062 }, /* 2062; INVISIBLE TIMES */
+    { 0x002063, 0x002063 }, /* 2063; INVISIBLE SEPARATOR */
+    { 0x00206A, 0x00206F }, /* 206A-206F; [CONTROL CHARACTERS] */
+    { 0x00FEFF, 0x00FEFF }, /* FEFF; ZERO WIDTH NO-BREAK SPACE */
+    { 0x00FFF9, 0x00FFFC }, /* FFF9-FFFC; [CONTROL CHARACTERS] */
+    { 0x01D173, 0x01D17A }, /* 1D173-1D17A; [MUSICAL CONTROL CHARACTERS] */
+    { 0 },
+};
+
+/*
+ * FFF9-FFFC; [CONTROL CHARACTERS]
+ * 1D173-1D17A; [MUSICAL CONTROL CHARACTERS]
+
+ */
+
+const Stringprep_table_element stringprep_rfc3454_C_3[] = {
+    { 0x00E000, 0x00F8FF }, /* E000-F8FF; [PRIVATE USE, PLANE 0] */
+    { 0x0F0000, 0x0FFFFD }, /* F0000-FFFFD; [PRIVATE USE, PLANE 15] */
+    { 0x100000, 0x10FFFD }, /* 100000-10FFFD; [PRIVATE USE, PLANE 16] */
+    { 0 },
+};
+
+/*
+ * F0000-FFFFD; [PRIVATE USE, PLANE 15]
+ * 100000-10FFFD; [PRIVATE USE, PLANE 16]
+
+ */
+
+const Stringprep_table_element stringprep_rfc3454_C_4[] = {
+    { 0x00FDD0, 0x00FDEF }, /* FDD0-FDEF; [NONCHARACTER CODE POINTS] */
+    { 0x00FFFE, 0x00FFFF }, /* FFFE-FFFF; [NONCHARACTER CODE POINTS] */
+    { 0x01FFFE, 0x01FFFF }, /* 1FFFE-1FFFF; [NONCHARACTER CODE POINTS] */
+    { 0x02FFFE, 0x02FFFF }, /* 2FFFE-2FFFF; [NONCHARACTER CODE POINTS] */
+    { 0x03FFFE, 0x03FFFF }, /* 3FFFE-3FFFF; [NONCHARACTER CODE POINTS] */
+    { 0x04FFFE, 0x04FFFF }, /* 4FFFE-4FFFF; [NONCHARACTER CODE POINTS] */
+    { 0x05FFFE, 0x05FFFF }, /* 5FFFE-5FFFF; [NONCHARACTER CODE POINTS] */
+    { 0x06FFFE, 0x06FFFF }, /* 6FFFE-6FFFF; [NONCHARACTER CODE POINTS] */
+    { 0x07FFFE, 0x07FFFF }, /* 7FFFE-7FFFF; [NONCHARACTER CODE POINTS] */
+    { 0x08FFFE, 0x08FFFF }, /* 8FFFE-8FFFF; [NONCHARACTER CODE POINTS] */
+    { 0x09FFFE, 0x09FFFF }, /* 9FFFE-9FFFF; [NONCHARACTER CODE POINTS] */
+    { 0x0AFFFE, 0x0AFFFF }, /* AFFFE-AFFFF; [NONCHARACTER CODE POINTS] */
+    { 0x0BFFFE, 0x0BFFFF }, /* BFFFE-BFFFF; [NONCHARACTER CODE POINTS] */
+    { 0x0CFFFE, 0x0CFFFF }, /* CFFFE-CFFFF; [NONCHARACTER CODE POINTS] */
+    { 0x0DFFFE, 0x0DFFFF }, /* DFFFE-DFFFF; [NONCHARACTER CODE POINTS] */
+    { 0x0EFFFE, 0x0EFFFF }, /* EFFFE-EFFFF; [NONCHARACTER CODE POINTS] */
+    { 0x0FFFFE, 0x0FFFFF }, /* FFFFE-FFFFF; [NONCHARACTER CODE POINTS] */
+    { 0x10FFFE, 0x10FFFF }, /* 10FFFE-10FFFF; [NONCHARACTER CODE POINTS] */
+    { 0 },
+};
+
+/*
+ * FFFFE-FFFFF; [NONCHARACTER CODE POINTS]
+ * 10FFFE-10FFFF; [NONCHARACTER CODE POINTS]
+
+ */
+
+const Stringprep_table_element stringprep_rfc3454_C_5[] = {
+    { 0x00D800, 0x00DFFF }, /* D800-DFFF; [SURROGATE CODES] */
+    { 0 },
+};
+
+/*
+ * D800-DFFF; [SURROGATE CODES]
+ *
+ */
+
+const Stringprep_table_element stringprep_rfc3454_C_6[] = {
+    { 0x00FFF9, 0x00FFF9 }, /* FFF9; INTERLINEAR ANNOTATION ANCHOR */
+    { 0x00FFFA, 0x00FFFA }, /* FFFA; INTERLINEAR ANNOTATION SEPARATOR */
+    { 0x00FFFB, 0x00FFFB }, /* FFFB; INTERLINEAR ANNOTATION TERMINATOR */
+    { 0x00FFFC, 0x00FFFC }, /* FFFC; OBJECT REPLACEMENT CHARACTER */
+    { 0x00FFFD, 0x00FFFD }, /* FFFD; REPLACEMENT CHARACTER */
+    { 0 },
+};
+
+/*
+ * FFFD; REPLACEMENT CHARACTER
+ *
+ */
+
+const Stringprep_table_element stringprep_rfc3454_C_7[] = {
+    { 0x002FF0, 0x002FFB }, /* 2FF0-2FFB; [IDEOGRAPHIC DESCRIPTION CHARACTERS] */
+    { 0 },
+};
+
+/*
+ * FFFD; REPLACEMENT CHARACTER
+ *  *
+2FF0-2FFB; [IDEOGRAPHIC DESCRIPTION CHARACTERS]
+
+ */
+
+const Stringprep_table_element stringprep_rfc3454_C_8[] = {
+    { 0x000340, 0x000340 }, /* 0340; COMBINING GRAVE TONE MARK */
+    { 0x000341, 0x000341 }, /* 0341; COMBINING ACUTE TONE MARK */
+    { 0x00200E, 0x00200E }, /* 200E; LEFT-TO-RIGHT MARK */
+    { 0x00200F, 0x00200F }, /* 200F; RIGHT-TO-LEFT MARK */
+    { 0x00202A, 0x00202A }, /* 202A; LEFT-TO-RIGHT EMBEDDING */
+    { 0x00202B, 0x00202B }, /* 202B; RIGHT-TO-LEFT EMBEDDING */
+    { 0x00202C, 0x00202C }, /* 202C; POP DIRECTIONAL FORMATTING */
+    { 0x00202D, 0x00202D }, /* 202D; LEFT-TO-RIGHT OVERRIDE */
+    { 0x00202E, 0x00202E }, /* 202E; RIGHT-TO-LEFT OVERRIDE */
+    { 0x00206A, 0x00206A }, /* 206A; INHIBIT SYMMETRIC SWAPPING */
+    { 0x00206B, 0x00206B }, /* 206B; ACTIVATE SYMMETRIC SWAPPING */
+    { 0x00206C, 0x00206C }, /* 206C; INHIBIT ARABIC FORM SHAPING */
+    { 0x00206D, 0x00206D }, /* 206D; ACTIVATE ARABIC FORM SHAPING */
+    { 0x00206E, 0x00206E }, /* 206E; NATIONAL DIGIT SHAPES */
+    { 0x00206F, 0x00206F }, /* 206F; NOMINAL DIGIT SHAPES */
+    { 0 },
+};
+
+/*
+ * FFFD; REPLACEMENT CHARACTER
+ *  *  *
+2FF0-2FFB; [IDEOGRAPHIC DESCRIPTION CHARACTERS]
+
+0340; COMBINING GRAVE TONE MARK
+0341; COMBINING ACUTE TONE MARK
+200E; LEFT-TO-RIGHT MARK
+200F; RIGHT-TO-LEFT MARK
+202A; LEFT-TO-RIGHT EMBEDDING
+202B; RIGHT-TO-LEFT EMBEDDING
+202C; POP DIRECTIONAL FORMATTING
+202D; LEFT-TO-RIGHT OVERRIDE
+202E; RIGHT-TO-LEFT OVERRIDE
+206A; INHIBIT SYMMETRIC SWAPPING
+206B; ACTIVATE SYMMETRIC SWAPPING
+206C; INHIBIT ARABIC FORM SHAPING
+206D; ACTIVATE ARABIC FORM SHAPING
+206E; NATIONAL DIGIT SHAPES
+206F; NOMINAL DIGIT SHAPES
+
+ */
+
+const Stringprep_table_element stringprep_rfc3454_C_9[] = {
+    { 0x0E0001, 0x0E0001 }, /* E0001; LANGUAGE TAG */
+    { 0x0E0020, 0x0E007F }, /* E0020-E007F; [TAGGING CHARACTERS] */
+    { 0 },
+};
+
+/*
+ * E0020-E007F; [TAGGING CHARACTERS]
+ *
+ */
+
+const Stringprep_table_element stringprep_rfc3454_D_1[] = {
+    { 0x0005BE, 0x0005BE }, /* 05BE */
+    { 0x0005C0, 0x0005C0 }, /* 05C0 */
+    { 0x0005C3, 0x0005C3 }, /* 05C3 */
+    { 0x0005D0, 0x0005EA }, /* 05D0-05EA */
+    { 0x0005F0, 0x0005F4 }, /* 05F0-05F4 */
+    { 0x00061B, 0x00061B }, /* 061B */
+    { 0x00061F, 0x00061F }, /* 061F */
+    { 0x000621, 0x00063A }, /* 0621-063A */
+    { 0x000640, 0x00064A }, /* 0640-064A */
+    { 0x00066D, 0x00066F }, /* 066D-066F */
+    { 0x000671, 0x0006D5 }, /* 0671-06D5 */
+    { 0x0006DD, 0x0006DD }, /* 06DD */
+    { 0x0006E5, 0x0006E6 }, /* 06E5-06E6 */
+    { 0x0006FA, 0x0006FE }, /* 06FA-06FE */
+    { 0x000700, 0x00070D }, /* 0700-070D */
+    { 0x000710, 0x000710 }, /* 0710 */
+    { 0x000712, 0x00072C }, /* 0712-072C */
+    { 0x000780, 0x0007A5 }, /* 0780-07A5 */
+    { 0x0007B1, 0x0007B1 }, /* 07B1 */
+    { 0x00200F, 0x00200F }, /* 200F */
+    { 0x00FB1D, 0x00FB1D }, /* FB1D */
+    { 0x00FB1F, 0x00FB28 }, /* FB1F-FB28 */
+    { 0x00FB2A, 0x00FB36 }, /* FB2A-FB36 */
+    { 0x00FB38, 0x00FB3C }, /* FB38-FB3C */
+    { 0x00FB3E, 0x00FB3E }, /* FB3E */
+    { 0x00FB40, 0x00FB41 }, /* FB40-FB41 */
+    { 0x00FB43, 0x00FB44 }, /* FB43-FB44 */
+    { 0x00FB46, 0x00FBB1 }, /* FB46-FBB1 */
+    { 0x00FBD3, 0x00FD3D }, /* FBD3-FD3D */
+    { 0x00FD50, 0x00FD8F }, /* FD50-FD8F */
+    { 0x00FD92, 0x00FDC7 }, /* FD92-FDC7 */
+    { 0x00FDF0, 0x00FDFC }, /* FDF0-FDFC */
+    { 0x00FE70, 0x00FE74 }, /* FE70-FE74 */
+    { 0x00FE76, 0x00FEFC }, /* FE76-FEFC */
+    { 0 },
+};
+
+/*
+ * FE76-FEFC
+ *
+ */
+
+const Stringprep_table_element stringprep_rfc3454_D_2[] = {
+    { 0x000041, 0x00005A }, /* 0041-005A */
+    { 0x000061, 0x00007A }, /* 0061-007A */
+    { 0x0000AA, 0x0000AA }, /* 00AA */
+    { 0x0000B5, 0x0000B5 }, /* 00B5 */
+    { 0x0000BA, 0x0000BA }, /* 00BA */
+    { 0x0000C0, 0x0000D6 }, /* 00C0-00D6 */
+    { 0x0000D8, 0x0000F6 }, /* 00D8-00F6 */
+    { 0x0000F8, 0x000220 }, /* 00F8-0220 */
+    { 0x000222, 0x000233 }, /* 0222-0233 */
+    { 0x000250, 0x0002AD }, /* 0250-02AD */
+    { 0x0002B0, 0x0002B8 }, /* 02B0-02B8 */
+    { 0x0002BB, 0x0002C1 }, /* 02BB-02C1 */
+    { 0x0002D0, 0x0002D1 }, /* 02D0-02D1 */
+    { 0x0002E0, 0x0002E4 }, /* 02E0-02E4 */
+    { 0x0002EE, 0x0002EE }, /* 02EE */
+    { 0x00037A, 0x00037A }, /* 037A */
+    { 0x000386, 0x000386 }, /* 0386 */
+    { 0x000388, 0x00038A }, /* 0388-038A */
+    { 0x00038C, 0x00038C }, /* 038C */
+    { 0x00038E, 0x0003A1 }, /* 038E-03A1 */
+    { 0x0003A3, 0x0003CE }, /* 03A3-03CE */
+    { 0x0003D0, 0x0003F5 }, /* 03D0-03F5 */
+    { 0x000400, 0x000482 }, /* 0400-0482 */
+    { 0x00048A, 0x0004CE }, /* 048A-04CE */
+    { 0x0004D0, 0x0004F5 }, /* 04D0-04F5 */
+    { 0x0004F8, 0x0004F9 }, /* 04F8-04F9 */
+    { 0x000500, 0x00050F }, /* 0500-050F */
+    { 0x000531, 0x000556 }, /* 0531-0556 */
+    { 0x000559, 0x00055F }, /* 0559-055F */
+    { 0x000561, 0x000587 }, /* 0561-0587 */
+    { 0x000589, 0x000589 }, /* 0589 */
+    { 0x000903, 0x000903 }, /* 0903 */
+    { 0x000905, 0x000939 }, /* 0905-0939 */
+    { 0x00093D, 0x000940 }, /* 093D-0940 */
+    { 0x000949, 0x00094C }, /* 0949-094C */
+    { 0x000950, 0x000950 }, /* 0950 */
+    { 0x000958, 0x000961 }, /* 0958-0961 */
+    { 0x000964, 0x000970 }, /* 0964-0970 */
+    { 0x000982, 0x000983 }, /* 0982-0983 */
+    { 0x000985, 0x00098C }, /* 0985-098C */
+    { 0x00098F, 0x000990 }, /* 098F-0990 */
+    { 0x000993, 0x0009A8 }, /* 0993-09A8 */
+    { 0x0009AA, 0x0009B0 }, /* 09AA-09B0 */
+    { 0x0009B2, 0x0009B2 }, /* 09B2 */
+    { 0x0009B6, 0x0009B9 }, /* 09B6-09B9 */
+    { 0x0009BE, 0x0009C0 }, /* 09BE-09C0 */
+    { 0x0009C7, 0x0009C8 }, /* 09C7-09C8 */
+    { 0x0009CB, 0x0009CC }, /* 09CB-09CC */
+    { 0x0009D7, 0x0009D7 }, /* 09D7 */
+    { 0x0009DC, 0x0009DD }, /* 09DC-09DD */
+    { 0x0009DF, 0x0009E1 }, /* 09DF-09E1 */
+    { 0x0009E6, 0x0009F1 }, /* 09E6-09F1 */
+    { 0x0009F4, 0x0009FA }, /* 09F4-09FA */
+    { 0x000A05, 0x000A0A }, /* 0A05-0A0A */
+    { 0x000A0F, 0x000A10 }, /* 0A0F-0A10 */
+    { 0x000A13, 0x000A28 }, /* 0A13-0A28 */
+    { 0x000A2A, 0x000A30 }, /* 0A2A-0A30 */
+    { 0x000A32, 0x000A33 }, /* 0A32-0A33 */
+    { 0x000A35, 0x000A36 }, /* 0A35-0A36 */
+    { 0x000A38, 0x000A39 }, /* 0A38-0A39 */
+    { 0x000A3E, 0x000A40 }, /* 0A3E-0A40 */
+    { 0x000A59, 0x000A5C }, /* 0A59-0A5C */
+    { 0x000A5E, 0x000A5E }, /* 0A5E */
+    { 0x000A66, 0x000A6F }, /* 0A66-0A6F */
+    { 0x000A72, 0x000A74 }, /* 0A72-0A74 */
+    { 0x000A83, 0x000A83 }, /* 0A83 */
+    { 0x000A85, 0x000A8B }, /* 0A85-0A8B */
+    { 0x000A8D, 0x000A8D }, /* 0A8D */
+    { 0x000A8F, 0x000A91 }, /* 0A8F-0A91 */
+    { 0x000A93, 0x000AA8 }, /* 0A93-0AA8 */
+    { 0x000AAA, 0x000AB0 }, /* 0AAA-0AB0 */
+    { 0x000AB2, 0x000AB3 }, /* 0AB2-0AB3 */
+    { 0x000AB5, 0x000AB9 }, /* 0AB5-0AB9 */
+    { 0x000ABD, 0x000AC0 }, /* 0ABD-0AC0 */
+    { 0x000AC9, 0x000AC9 }, /* 0AC9 */
+    { 0x000ACB, 0x000ACC }, /* 0ACB-0ACC */
+    { 0x000AD0, 0x000AD0 }, /* 0AD0 */
+    { 0x000AE0, 0x000AE0 }, /* 0AE0 */
+    { 0x000AE6, 0x000AEF }, /* 0AE6-0AEF */
+    { 0x000B02, 0x000B03 }, /* 0B02-0B03 */
+    { 0x000B05, 0x000B0C }, /* 0B05-0B0C */
+    { 0x000B0F, 0x000B10 }, /* 0B0F-0B10 */
+    { 0x000B13, 0x000B28 }, /* 0B13-0B28 */
+    { 0x000B2A, 0x000B30 }, /* 0B2A-0B30 */
+    { 0x000B32, 0x000B33 }, /* 0B32-0B33 */
+    { 0x000B36, 0x000B39 }, /* 0B36-0B39 */
+    { 0x000B3D, 0x000B3E }, /* 0B3D-0B3E */
+    { 0x000B40, 0x000B40 }, /* 0B40 */
+    { 0x000B47, 0x000B48 }, /* 0B47-0B48 */
+    { 0x000B4B, 0x000B4C }, /* 0B4B-0B4C */
+    { 0x000B57, 0x000B57 }, /* 0B57 */
+    { 0x000B5C, 0x000B5D }, /* 0B5C-0B5D */
+    { 0x000B5F, 0x000B61 }, /* 0B5F-0B61 */
+    { 0x000B66, 0x000B70 }, /* 0B66-0B70 */
+    { 0x000B83, 0x000B83 }, /* 0B83 */
+    { 0x000B85, 0x000B8A }, /* 0B85-0B8A */
+    { 0x000B8E, 0x000B90 }, /* 0B8E-0B90 */
+    { 0x000B92, 0x000B95 }, /* 0B92-0B95 */
+    { 0x000B99, 0x000B9A }, /* 0B99-0B9A */
+    { 0x000B9C, 0x000B9C }, /* 0B9C */
+    { 0x000B9E, 0x000B9F }, /* 0B9E-0B9F */
+    { 0x000BA3, 0x000BA4 }, /* 0BA3-0BA4 */
+    { 0x000BA8, 0x000BAA }, /* 0BA8-0BAA */
+    { 0x000BAE, 0x000BB5 }, /* 0BAE-0BB5 */
+    { 0x000BB7, 0x000BB9 }, /* 0BB7-0BB9 */
+    { 0x000BBE, 0x000BBF }, /* 0BBE-0BBF */
+    { 0x000BC1, 0x000BC2 }, /* 0BC1-0BC2 */
+    { 0x000BC6, 0x000BC8 }, /* 0BC6-0BC8 */
+    { 0x000BCA, 0x000BCC }, /* 0BCA-0BCC */
+    { 0x000BD7, 0x000BD7 }, /* 0BD7 */
+    { 0x000BE7, 0x000BF2 }, /* 0BE7-0BF2 */
+    { 0x000C01, 0x000C03 }, /* 0C01-0C03 */
+    { 0x000C05, 0x000C0C }, /* 0C05-0C0C */
+    { 0x000C0E, 0x000C10 }, /* 0C0E-0C10 */
+    { 0x000C12, 0x000C28 }, /* 0C12-0C28 */
+    { 0x000C2A, 0x000C33 }, /* 0C2A-0C33 */
+    { 0x000C35, 0x000C39 }, /* 0C35-0C39 */
+    { 0x000C41, 0x000C44 }, /* 0C41-0C44 */
+    { 0x000C60, 0x000C61 }, /* 0C60-0C61 */
+    { 0x000C66, 0x000C6F }, /* 0C66-0C6F */
+    { 0x000C82, 0x000C83 }, /* 0C82-0C83 */
+    { 0x000C85, 0x000C8C }, /* 0C85-0C8C */
+    { 0x000C8E, 0x000C90 }, /* 0C8E-0C90 */
+    { 0x000C92, 0x000CA8 }, /* 0C92-0CA8 */
+    { 0x000CAA, 0x000CB3 }, /* 0CAA-0CB3 */
+    { 0x000CB5, 0x000CB9 }, /* 0CB5-0CB9 */
+    { 0x000CBE, 0x000CBE }, /* 0CBE */
+    { 0x000CC0, 0x000CC4 }, /* 0CC0-0CC4 */
+    { 0x000CC7, 0x000CC8 }, /* 0CC7-0CC8 */
+    { 0x000CCA, 0x000CCB }, /* 0CCA-0CCB */
+    { 0x000CD5, 0x000CD6 }, /* 0CD5-0CD6 */
+    { 0x000CDE, 0x000CDE }, /* 0CDE */
+    { 0x000CE0, 0x000CE1 }, /* 0CE0-0CE1 */
+    { 0x000CE6, 0x000CEF }, /* 0CE6-0CEF */
+    { 0x000D02, 0x000D03 }, /* 0D02-0D03 */
+    { 0x000D05, 0x000D0C }, /* 0D05-0D0C */
+    { 0x000D0E, 0x000D10 }, /* 0D0E-0D10 */
+    { 0x000D12, 0x000D28 }, /* 0D12-0D28 */
+    { 0x000D2A, 0x000D39 }, /* 0D2A-0D39 */
+    { 0x000D3E, 0x000D40 }, /* 0D3E-0D40 */
+    { 0x000D46, 0x000D48 }, /* 0D46-0D48 */
+    { 0x000D4A, 0x000D4C }, /* 0D4A-0D4C */
+    { 0x000D57, 0x000D57 }, /* 0D57 */
+    { 0x000D60, 0x000D61 }, /* 0D60-0D61 */
+    { 0x000D66, 0x000D6F }, /* 0D66-0D6F */
+    { 0x000D82, 0x000D83 }, /* 0D82-0D83 */
+    { 0x000D85, 0x000D96 }, /* 0D85-0D96 */
+    { 0x000D9A, 0x000DB1 }, /* 0D9A-0DB1 */
+    { 0x000DB3, 0x000DBB }, /* 0DB3-0DBB */
+    { 0x000DBD, 0x000DBD }, /* 0DBD */
+    { 0x000DC0, 0x000DC6 }, /* 0DC0-0DC6 */
+    { 0x000DCF, 0x000DD1 }, /* 0DCF-0DD1 */
+    { 0x000DD8, 0x000DDF }, /* 0DD8-0DDF */
+    { 0x000DF2, 0x000DF4 }, /* 0DF2-0DF4 */
+    { 0x000E01, 0x000E30 }, /* 0E01-0E30 */
+    { 0x000E32, 0x000E33 }, /* 0E32-0E33 */
+    { 0x000E40, 0x000E46 }, /* 0E40-0E46 */
+    { 0x000E4F, 0x000E5B }, /* 0E4F-0E5B */
+    { 0x000E81, 0x000E82 }, /* 0E81-0E82 */
+    { 0x000E84, 0x000E84 }, /* 0E84 */
+    { 0x000E87, 0x000E88 }, /* 0E87-0E88 */
+    { 0x000E8A, 0x000E8A }, /* 0E8A */
+    { 0x000E8D, 0x000E8D }, /* 0E8D */
+    { 0x000E94, 0x000E97 }, /* 0E94-0E97 */
+    { 0x000E99, 0x000E9F }, /* 0E99-0E9F */
+    { 0x000EA1, 0x000EA3 }, /* 0EA1-0EA3 */
+    { 0x000EA5, 0x000EA5 }, /* 0EA5 */
+    { 0x000EA7, 0x000EA7 }, /* 0EA7 */
+    { 0x000EAA, 0x000EAB }, /* 0EAA-0EAB */
+    { 0x000EAD, 0x000EB0 }, /* 0EAD-0EB0 */
+    { 0x000EB2, 0x000EB3 }, /* 0EB2-0EB3 */
+    { 0x000EBD, 0x000EBD }, /* 0EBD */
+    { 0x000EC0, 0x000EC4 }, /* 0EC0-0EC4 */
+    { 0x000EC6, 0x000EC6 }, /* 0EC6 */
+    { 0x000ED0, 0x000ED9 }, /* 0ED0-0ED9 */
+    { 0x000EDC, 0x000EDD }, /* 0EDC-0EDD */
+    { 0x000F00, 0x000F17 }, /* 0F00-0F17 */
+    { 0x000F1A, 0x000F34 }, /* 0F1A-0F34 */
+    { 0x000F36, 0x000F36 }, /* 0F36 */
+    { 0x000F38, 0x000F38 }, /* 0F38 */
+    { 0x000F3E, 0x000F47 }, /* 0F3E-0F47 */
+    { 0x000F49, 0x000F6A }, /* 0F49-0F6A */
+    { 0x000F7F, 0x000F7F }, /* 0F7F */
+    { 0x000F85, 0x000F85 }, /* 0F85 */
+    { 0x000F88, 0x000F8B }, /* 0F88-0F8B */
+    { 0x000FBE, 0x000FC5 }, /* 0FBE-0FC5 */
+    { 0x000FC7, 0x000FCC }, /* 0FC7-0FCC */
+    { 0x000FCF, 0x000FCF }, /* 0FCF */
+    { 0x001000, 0x001021 }, /* 1000-1021 */
+    { 0x001023, 0x001027 }, /* 1023-1027 */
+    { 0x001029, 0x00102A }, /* 1029-102A */
+    { 0x00102C, 0x00102C }, /* 102C */
+    { 0x001031, 0x001031 }, /* 1031 */
+    { 0x001038, 0x001038 }, /* 1038 */
+    { 0x001040, 0x001057 }, /* 1040-1057 */
+    { 0x0010A0, 0x0010C5 }, /* 10A0-10C5 */
+    { 0x0010D0, 0x0010F8 }, /* 10D0-10F8 */
+    { 0x0010FB, 0x0010FB }, /* 10FB */
+    { 0x001100, 0x001159 }, /* 1100-1159 */
+    { 0x00115F, 0x0011A2 }, /* 115F-11A2 */
+    { 0x0011A8, 0x0011F9 }, /* 11A8-11F9 */
+    { 0x001200, 0x001206 }, /* 1200-1206 */
+    { 0x001208, 0x001246 }, /* 1208-1246 */
+    { 0x001248, 0x001248 }, /* 1248 */
+    { 0x00124A, 0x00124D }, /* 124A-124D */
+    { 0x001250, 0x001256 }, /* 1250-1256 */
+    { 0x001258, 0x001258 }, /* 1258 */
+    { 0x00125A, 0x00125D }, /* 125A-125D */
+    { 0x001260, 0x001286 }, /* 1260-1286 */
+    { 0x001288, 0x001288 }, /* 1288 */
+    { 0x00128A, 0x00128D }, /* 128A-128D */
+    { 0x001290, 0x0012AE }, /* 1290-12AE */
+    { 0x0012B0, 0x0012B0 }, /* 12B0 */
+    { 0x0012B2, 0x0012B5 }, /* 12B2-12B5 */
+    { 0x0012B8, 0x0012BE }, /* 12B8-12BE */
+    { 0x0012C0, 0x0012C0 }, /* 12C0 */
+    { 0x0012C2, 0x0012C5 }, /* 12C2-12C5 */
+    { 0x0012C8, 0x0012CE }, /* 12C8-12CE */
+    { 0x0012D0, 0x0012D6 }, /* 12D0-12D6 */
+    { 0x0012D8, 0x0012EE }, /* 12D8-12EE */
+    { 0x0012F0, 0x00130E }, /* 12F0-130E */
+    { 0x001310, 0x001310 }, /* 1310 */
+    { 0x001312, 0x001315 }, /* 1312-1315 */
+    { 0x001318, 0x00131E }, /* 1318-131E */
+    { 0x001320, 0x001346 }, /* 1320-1346 */
+    { 0x001348, 0x00135A }, /* 1348-135A */
+    { 0x001361, 0x00137C }, /* 1361-137C */
+    { 0x0013A0, 0x0013F4 }, /* 13A0-13F4 */
+    { 0x001401, 0x001676 }, /* 1401-1676 */
+    { 0x001681, 0x00169A }, /* 1681-169A */
+    { 0x0016A0, 0x0016F0 }, /* 16A0-16F0 */
+    { 0x001700, 0x00170C }, /* 1700-170C */
+    { 0x00170E, 0x001711 }, /* 170E-1711 */
+    { 0x001720, 0x001731 }, /* 1720-1731 */
+    { 0x001735, 0x001736 }, /* 1735-1736 */
+    { 0x001740, 0x001751 }, /* 1740-1751 */
+    { 0x001760, 0x00176C }, /* 1760-176C */
+    { 0x00176E, 0x001770 }, /* 176E-1770 */
+    { 0x001780, 0x0017B6 }, /* 1780-17B6 */
+    { 0x0017BE, 0x0017C5 }, /* 17BE-17C5 */
+    { 0x0017C7, 0x0017C8 }, /* 17C7-17C8 */
+    { 0x0017D4, 0x0017DA }, /* 17D4-17DA */
+    { 0x0017DC, 0x0017DC }, /* 17DC */
+    { 0x0017E0, 0x0017E9 }, /* 17E0-17E9 */
+    { 0x001810, 0x001819 }, /* 1810-1819 */
+    { 0x001820, 0x001877 }, /* 1820-1877 */
+    { 0x001880, 0x0018A8 }, /* 1880-18A8 */
+    { 0x001E00, 0x001E9B }, /* 1E00-1E9B */
+    { 0x001EA0, 0x001EF9 }, /* 1EA0-1EF9 */
+    { 0x001F00, 0x001F15 }, /* 1F00-1F15 */
+    { 0x001F18, 0x001F1D }, /* 1F18-1F1D */
+    { 0x001F20, 0x001F45 }, /* 1F20-1F45 */
+    { 0x001F48, 0x001F4D }, /* 1F48-1F4D */
+    { 0x001F50, 0x001F57 }, /* 1F50-1F57 */
+    { 0x001F59, 0x001F59 }, /* 1F59 */
+    { 0x001F5B, 0x001F5B }, /* 1F5B */
+    { 0x001F5D, 0x001F5D }, /* 1F5D */
+    { 0x001F5F, 0x001F7D }, /* 1F5F-1F7D */
+    { 0x001F80, 0x001FB4 }, /* 1F80-1FB4 */
+    { 0x001FB6, 0x001FBC }, /* 1FB6-1FBC */
+    { 0x001FBE, 0x001FBE }, /* 1FBE */
+    { 0x001FC2, 0x001FC4 }, /* 1FC2-1FC4 */
+    { 0x001FC6, 0x001FCC }, /* 1FC6-1FCC */
+    { 0x001FD0, 0x001FD3 }, /* 1FD0-1FD3 */
+    { 0x001FD6, 0x001FDB }, /* 1FD6-1FDB */
+    { 0x001FE0, 0x001FEC }, /* 1FE0-1FEC */
+    { 0x001FF2, 0x001FF4 }, /* 1FF2-1FF4 */
+    { 0x001FF6, 0x001FFC }, /* 1FF6-1FFC */
+    { 0x00200E, 0x00200E }, /* 200E */
+    { 0x002071, 0x002071 }, /* 2071 */
+    { 0x00207F, 0x00207F }, /* 207F */
+    { 0x002102, 0x002102 }, /* 2102 */
+    { 0x002107, 0x002107 }, /* 2107 */
+    { 0x00210A, 0x002113 }, /* 210A-2113 */
+    { 0x002115, 0x002115 }, /* 2115 */
+    { 0x002119, 0x00211D }, /* 2119-211D */
+    { 0x002124, 0x002124 }, /* 2124 */
+    { 0x002126, 0x002126 }, /* 2126 */
+    { 0x002128, 0x002128 }, /* 2128 */
+    { 0x00212A, 0x00212D }, /* 212A-212D */
+    { 0x00212F, 0x002131 }, /* 212F-2131 */
+    { 0x002133, 0x002139 }, /* 2133-2139 */
+    { 0x00213D, 0x00213F }, /* 213D-213F */
+    { 0x002145, 0x002149 }, /* 2145-2149 */
+    { 0x002160, 0x002183 }, /* 2160-2183 */
+    { 0x002336, 0x00237A }, /* 2336-237A */
+    { 0x002395, 0x002395 }, /* 2395 */
+    { 0x00249C, 0x0024E9 }, /* 249C-24E9 */
+    { 0x003005, 0x003007 }, /* 3005-3007 */
+    { 0x003021, 0x003029 }, /* 3021-3029 */
+    { 0x003031, 0x003035 }, /* 3031-3035 */
+    { 0x003038, 0x00303C }, /* 3038-303C */
+    { 0x003041, 0x003096 }, /* 3041-3096 */
+    { 0x00309D, 0x00309F }, /* 309D-309F */
+    { 0x0030A1, 0x0030FA }, /* 30A1-30FA */
+    { 0x0030FC, 0x0030FF }, /* 30FC-30FF */
+    { 0x003105, 0x00312C }, /* 3105-312C */
+    { 0x003131, 0x00318E }, /* 3131-318E */
+    { 0x003190, 0x0031B7 }, /* 3190-31B7 */
+    { 0x0031F0, 0x00321C }, /* 31F0-321C */
+    { 0x003220, 0x003243 }, /* 3220-3243 */
+    { 0x003260, 0x00327B }, /* 3260-327B */
+    { 0x00327F, 0x0032B0 }, /* 327F-32B0 */
+    { 0x0032C0, 0x0032CB }, /* 32C0-32CB */
+    { 0x0032D0, 0x0032FE }, /* 32D0-32FE */
+    { 0x003300, 0x003376 }, /* 3300-3376 */
+    { 0x00337B, 0x0033DD }, /* 337B-33DD */
+    { 0x0033E0, 0x0033FE }, /* 33E0-33FE */
+    { 0x003400, 0x004DB5 }, /* 3400-4DB5 */
+    { 0x004E00, 0x009FA5 }, /* 4E00-9FA5 */
+    { 0x00A000, 0x00A48C }, /* A000-A48C */
+    { 0x00AC00, 0x00D7A3 }, /* AC00-D7A3 */
+    { 0x00D800, 0x00FA2D }, /* D800-FA2D */
+    { 0x00FA30, 0x00FA6A }, /* FA30-FA6A */
+    { 0x00FB00, 0x00FB06 }, /* FB00-FB06 */
+    { 0x00FB13, 0x00FB17 }, /* FB13-FB17 */
+    { 0x00FF21, 0x00FF3A }, /* FF21-FF3A */
+    { 0x00FF41, 0x00FF5A }, /* FF41-FF5A */
+    { 0x00FF66, 0x00FFBE }, /* FF66-FFBE */
+    { 0x00FFC2, 0x00FFC7 }, /* FFC2-FFC7 */
+    { 0x00FFCA, 0x00FFCF }, /* FFCA-FFCF */
+    { 0x00FFD2, 0x00FFD7 }, /* FFD2-FFD7 */
+    { 0x00FFDA, 0x00FFDC }, /* FFDA-FFDC */
+    { 0x010300, 0x01031E }, /* 10300-1031E */
+    { 0x010320, 0x010323 }, /* 10320-10323 */
+    { 0x010330, 0x01034A }, /* 10330-1034A */
+    { 0x010400, 0x010425 }, /* 10400-10425 */
+    { 0x010428, 0x01044D }, /* 10428-1044D */
+    { 0x01D000, 0x01D0F5 }, /* 1D000-1D0F5 */
+    { 0x01D100, 0x01D126 }, /* 1D100-1D126 */
+    { 0x01D12A, 0x01D166 }, /* 1D12A-1D166 */
+    { 0x01D16A, 0x01D172 }, /* 1D16A-1D172 */
+    { 0x01D183, 0x01D184 }, /* 1D183-1D184 */
+    { 0x01D18C, 0x01D1A9 }, /* 1D18C-1D1A9 */
+    { 0x01D1AE, 0x01D1DD }, /* 1D1AE-1D1DD */
+    { 0x01D400, 0x01D454 }, /* 1D400-1D454 */
+    { 0x01D456, 0x01D49C }, /* 1D456-1D49C */
+    { 0x01D49E, 0x01D49F }, /* 1D49E-1D49F */
+    { 0x01D4A2, 0x01D4A2 }, /* 1D4A2 */
+    { 0x01D4A5, 0x01D4A6 }, /* 1D4A5-1D4A6 */
+    { 0x01D4A9, 0x01D4AC }, /* 1D4A9-1D4AC */
+    { 0x01D4AE, 0x01D4B9 }, /* 1D4AE-1D4B9 */
+    { 0x01D4BB, 0x01D4BB }, /* 1D4BB */
+    { 0x01D4BD, 0x01D4C0 }, /* 1D4BD-1D4C0 */
+    { 0x01D4C2, 0x01D4C3 }, /* 1D4C2-1D4C3 */
+    { 0x01D4C5, 0x01D505 }, /* 1D4C5-1D505 */
+    { 0x01D507, 0x01D50A }, /* 1D507-1D50A */
+    { 0x01D50D, 0x01D514 }, /* 1D50D-1D514 */
+    { 0x01D516, 0x01D51C }, /* 1D516-1D51C */
+    { 0x01D51E, 0x01D539 }, /* 1D51E-1D539 */
+    { 0x01D53B, 0x01D53E }, /* 1D53B-1D53E */
+    { 0x01D540, 0x01D544 }, /* 1D540-1D544 */
+    { 0x01D546, 0x01D546 }, /* 1D546 */
+    { 0x01D54A, 0x01D550 }, /* 1D54A-1D550 */
+    { 0x01D552, 0x01D6A3 }, /* 1D552-1D6A3 */
+    { 0x01D6A8, 0x01D7C9 }, /* 1D6A8-1D7C9 */
+    { 0x020000, 0x02A6D6 }, /* 20000-2A6D6 */
+    { 0x02F800, 0x02FA1D }, /* 2F800-2FA1D */
+    { 0x0F0000, 0x0FFFFD }, /* F0000-FFFFD */
+    { 0x100000, 0x10FFFD }, /* 100000-10FFFD */
+    { 0 },
+};
diff --git a/3rdparty/stringprep/rfc3454.h b/3rdparty/stringprep/rfc3454.h
new file mode 100644
index 00000000..eead9964
--- /dev/null
+++ b/3rdparty/stringprep/rfc3454.h
@@ -0,0 +1,20 @@
+/* This file is automatically generated.  DO NOT EDIT!
+   Instead, edit gen-stringprep-tables.pl and re-run.  */
+
+#define N_STRINGPREP_rfc3454_A_1 396
+#define N_STRINGPREP_rfc3454_B_1 27
+#define N_STRINGPREP_rfc3454_B_2 1371
+#define N_STRINGPREP_rfc3454_B_3 838
+#define N_STRINGPREP_rfc3454_C_1_1 1
+#define N_STRINGPREP_rfc3454_C_1_2 17
+#define N_STRINGPREP_rfc3454_C_2_1 2
+#define N_STRINGPREP_rfc3454_C_2_2 16
+#define N_STRINGPREP_rfc3454_C_3 3
+#define N_STRINGPREP_rfc3454_C_4 18
+#define N_STRINGPREP_rfc3454_C_5 1
+#define N_STRINGPREP_rfc3454_C_6 5
+#define N_STRINGPREP_rfc3454_C_7 1
+#define N_STRINGPREP_rfc3454_C_8 15
+#define N_STRINGPREP_rfc3454_C_9 2
+#define N_STRINGPREP_rfc3454_D_1 34
+#define N_STRINGPREP_rfc3454_D_2 360
diff --git a/3rdparty/stringprep/stringprep.cpp b/3rdparty/stringprep/stringprep.cpp
new file mode 100644
index 00000000..a277391d
--- /dev/null
+++ b/3rdparty/stringprep/stringprep.cpp
@@ -0,0 +1,515 @@
+/* stringprep.c --- Core stringprep implementation.
+   Copyright (C) 2002-2016 Simon Josefsson
+
+   This file is part of GNU Libidn.
+
+   GNU Libidn is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Libidn is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>. */
+
+#include <QString>
+#include <QVector>
+
+#include <stdlib.h>
+
+#include "qstringprep.h"
+
+static int _compare_table_element(const uint32_t *c, const Stringprep_table_element *e)
+{
+    if (*c < e->start)
+        return -1;
+    if (*c > e->end)
+        return 1;
+    return 0;
+}
+
+static qsizetype stringprep_find_character_in_table(uint32_t ucs4, const Stringprep_table_element *table,
+                                                    size_t table_size)
+{
+    /* This is where typical uses of Libidn spends very close to all CPU
+       time and causes most cache misses.  One could easily do a binary
+       search instead.  Before rewriting this, I want hard evidence this
+       slowness is at all relevant in typical applications.  (I don't
+       dispute optimization may improve matters significantly, I'm
+       mostly interested in having someone give real-world benchmark on
+       the impact of libidn.)
+     *
+     * Answer (Tim Rühsen rockdaboot@gmx.de):
+     * Testing the fuzz corpora just once via make check takes ~54 billion CPU cycles.
+     * That is almost 20s on my Intel i3 3.1GHz !!!
+     * That even makes fuzzing almost useless, eating up CPU cycles for nothing.
+     *
+     * The bsearch() approach takes ~3 billion CPU cycles.
+     * Almost a factor of 20 faster (but still pretty slow).
+     * There are still ~2 million calls to bsearch() which make ~30% of CPU time used.
+     * Most time is spent in _g_utf8_normalize_wc().
+
+    qsizetype i;
+
+    for (i = 0; table[i].start || table[i].end; i++)
+      if (ucs4 >= table[i].start &&
+          ucs4 <= (table[i].end ? table[i].end : table[i].start))
+        return i;
+    */
+
+    const Stringprep_table_element *p = static_cast<const Stringprep_table_element *>(
+        bsearch(&ucs4, table, table_size, sizeof(Stringprep_table_element),
+                (int (*)(const void *, const void *))_compare_table_element));
+
+    return p ? (p - table) : -1;
+}
+
+static qsizetype stringprep_find_string_in_table(uint *ucs4, int len, size_t *tablepos,
+                                                 const Stringprep_table_element *table, size_t table_size)
+{
+    int       j;
+    qsizetype pos;
+
+    for (j = 0; j < len; j++)
+        if ((pos = stringprep_find_character_in_table(ucs4[j], table, table_size)) != -1) {
+            if (tablepos)
+                *tablepos = pos;
+            return j;
+        }
+
+    return -1;
+}
+
+static int stringprep_apply_table_to_string(QVector<uint> &ucs4, const Stringprep_table_element *table,
+                                            size_t table_size)
+{
+    qsizetype pos;
+    size_t    i, maplen;
+    uint32_t *src    = ucs4.data(); /* points to unprocessed data */
+    size_t    srclen = ucs4.size(); /* length of unprocessed data */
+
+    while ((pos = stringprep_find_string_in_table(src, srclen, &i, table, table_size)) != -1) {
+        for (maplen = STRINGPREP_MAX_MAP_CHARS; maplen > 0 && table[i].map[maplen - 1] == 0; maplen--)
+            ;
+
+        if (maplen > 1) {
+            ucs4.resize(ucs4.size() + maplen - 1);
+        }
+
+        memmove(src + pos + maplen, src + pos + 1, sizeof(uint32_t) * (srclen - pos - 1));
+        memcpy(src + pos, table[i].map, sizeof(uint32_t) * maplen);
+        src += pos + maplen;
+        srclen -= pos + 1;
+    }
+
+    return STRINGPREP_OK;
+}
+
+#define INVERTED(x) ((x) & ((~0UL) >> 1))
+#define UNAPPLICAPLEFLAGS(flags, profileflags)                                                                         \
+    ((!INVERTED(profileflags) && !(profileflags & flags) && profileflags)                                              \
+     || (INVERTED(profileflags) && (profileflags & flags)))
+
+/**
+ * stringprep_4i:
+ * @ucs4: input/output array with string to prepare.
+ * @len: on input, length of input array with Unicode code points,
+ *   on exit, length of output array with Unicode code points.
+ * @maxucs4len: maximum length of input/output array.
+ * @flags: a #Stringprep_profile_flags value, or 0.
+ * @profile: pointer to #Stringprep_profile to use.
+ *
+ * Prepare the input UCS-4 string according to the stringprep profile,
+ * and write back the result to the input string.
+ *
+ * The input is not required to be zero terminated (@ucs4[@len] = 0).
+ * The output will not be zero terminated unless @ucs4[@len] = 0.
+ * Instead, see stringprep_4zi() if your input is zero terminated or
+ * if you want the output to be.
+ *
+ * Since the stringprep operation can expand the string, @maxucs4len
+ * indicate how large the buffer holding the string is.  This function
+ * will not read or write to code points outside that size.
+ *
+ * The @flags are one of #Stringprep_profile_flags values, or 0.
+ *
+ * The @profile contain the #Stringprep_profile instructions to
+ * perform.  Your application can define new profiles, possibly
+ * re-using the generic stringprep tables that always will be part of
+ * the library, or use one of the currently supported profiles.
+ *
+ * Return value: Returns %STRINGPREP_OK iff successful, or an
+ *   #Stringprep_rc error code.
+ **/
+int stringprep_4i(QString &input, Stringprep_profile_flags flags, const Stringprep_profile *profile)
+{
+    size_t        i, j;
+    qsizetype     k;
+    QVector<uint> ucs4vector = input.toUcs4();
+    // size_t        ucs4len    = ucs4vector.size();
+    ucs4vector.reserve(ucs4vector.size() * 2); // to pass nfkc
+    // uint32_t *ucs4 = ucs4vector.data();
+    int rc;
+
+    for (i = 0; profile[i].operation; i++) {
+        switch (profile[i].operation) {
+        case STRINGPREP_NFKC:
+            if (UNAPPLICAPLEFLAGS(flags, profile[i].flags))
+                break;
+
+            if (flags & STRINGPREP_NO_NFKC && !profile[i].flags)
+                /* Profile requires NFKC, but callee asked for no NFKC. */
+                return STRINGPREP_FLAG_ERROR;
+
+            ucs4vector = QString::fromUcs4(ucs4vector.data(), ucs4vector.length())
+                             .normalized(QString::NormalizationForm_KC)
+                             .toUcs4();
+            break;
+
+        case STRINGPREP_PROHIBIT_TABLE:
+            k = stringprep_find_string_in_table(ucs4vector.data(), ucs4vector.length(), NULL, profile[i].table,
+                                                profile[i].table_size);
+            if (k != -1)
+                return STRINGPREP_CONTAINS_PROHIBITED;
+            break;
+
+        case STRINGPREP_UNASSIGNED_TABLE:
+            if (UNAPPLICAPLEFLAGS(flags, profile[i].flags))
+                break;
+            if (flags & STRINGPREP_NO_UNASSIGNED) {
+                k = stringprep_find_string_in_table(ucs4vector.data(), ucs4vector.length(), NULL, profile[i].table,
+                                                    profile[i].table_size);
+                if (k != -1)
+                    return STRINGPREP_CONTAINS_UNASSIGNED;
+            }
+            break;
+
+        case STRINGPREP_MAP_TABLE:
+            if (UNAPPLICAPLEFLAGS(flags, profile[i].flags))
+                break;
+            rc = stringprep_apply_table_to_string(ucs4vector, profile[i].table, profile[i].table_size);
+            if (rc != STRINGPREP_OK)
+                return rc;
+            break;
+
+        case STRINGPREP_BIDI_PROHIBIT_TABLE:
+        case STRINGPREP_BIDI_RAL_TABLE:
+        case STRINGPREP_BIDI_L_TABLE:
+            break;
+
+        case STRINGPREP_BIDI: {
+            int    done_prohibited = 0;
+            int    done_ral        = 0;
+            int    done_l          = 0;
+            size_t contains_ral    = SIZE_MAX;
+            size_t contains_l      = SIZE_MAX;
+
+            for (j = 0; profile[j].operation; j++)
+                if (profile[j].operation == STRINGPREP_BIDI_PROHIBIT_TABLE) {
+                    done_prohibited = 1;
+                    k = stringprep_find_string_in_table(ucs4vector.data(), ucs4vector.length(), NULL, profile[j].table,
+                                                        profile[j].table_size);
+                    if (k != -1)
+                        return STRINGPREP_BIDI_CONTAINS_PROHIBITED;
+                } else if (profile[j].operation == STRINGPREP_BIDI_RAL_TABLE) {
+                    done_ral = 1;
+                    if (stringprep_find_string_in_table(ucs4vector.data(), ucs4vector.length(), NULL, profile[j].table,
+                                                        profile[j].table_size)
+                        != -1)
+                        contains_ral = j;
+                } else if (profile[j].operation == STRINGPREP_BIDI_L_TABLE) {
+                    done_l = 1;
+                    if (stringprep_find_string_in_table(ucs4vector.data(), ucs4vector.length(), NULL, profile[j].table,
+                                                        profile[j].table_size)
+                        != -1)
+                        contains_l = j;
+                }
+
+            if (!done_prohibited || !done_ral || !done_l)
+                return STRINGPREP_PROFILE_ERROR;
+
+            if (contains_ral != SIZE_MAX && contains_l != SIZE_MAX)
+                return STRINGPREP_BIDI_BOTH_L_AND_RAL;
+
+            if (contains_ral != SIZE_MAX) {
+                if (!(stringprep_find_character_in_table(ucs4vector.first(), profile[contains_ral].table,
+                                                         profile[contains_ral].table_size)
+                          != -1
+                      && stringprep_find_character_in_table(ucs4vector.last(), profile[contains_ral].table,
+                                                            profile[contains_ral].table_size)
+                          != -1))
+                    return STRINGPREP_BIDI_LEADTRAIL_NOT_RAL;
+            }
+        } break;
+
+        default:
+            return STRINGPREP_PROFILE_ERROR;
+            break;
+        }
+    }
+
+    input = QString::fromUcs4(ucs4vector.data(), ucs4vector.size());
+
+    return STRINGPREP_OK;
+}
+
+/**
+ * stringprep:
+ * @in: input/ouput array with string to prepare.
+ * @maxlen: maximum length of input/output array.
+ * @flags: a #Stringprep_profile_flags value, or 0.
+ * @profile: pointer to #Stringprep_profile to use.
+ *
+ * Prepare the input zero terminated UTF-8 string according to the
+ * stringprep profile, and write back the result to the input string.
+ *
+ * Note that you must convert strings entered in the systems locale
+ * into UTF-8 before using this function, see
+ * stringprep_locale_to_utf8().
+ *
+ * Since the stringprep operation can expand the string, @maxlen
+ * indicate how large the buffer holding the string is.  This function
+ * will not read or write to characters outside that size.
+ *
+ * The @flags are one of #Stringprep_profile_flags values, or 0.
+ *
+ * The @profile contain the #Stringprep_profile instructions to
+ * perform.  Your application can define new profiles, possibly
+ * re-using the generic stringprep tables that always will be part of
+ * the library, or use one of the currently supported profiles.
+ *
+ * Return value: Returns %STRINGPREP_OK iff successful, or an error code.
+ **/
+int stringprep(QString &input, Stringprep_profile_flags flags, const Stringprep_profile *profile)
+{
+    int rc = stringprep_4i(input, flags, profile);
+    if (rc != STRINGPREP_OK) {
+        return rc;
+    }
+
+    return STRINGPREP_OK;
+}
+
+/*! \mainpage GNU Internationalized Domain Name Library
+ *
+ * \section intro Introduction
+ *
+ * GNU Libidn is an implementation of the Stringprep, Punycode and IDNA
+ * specifications defined by the IETF Internationalized Domain Names
+ * (IDN) working group, used for internationalized domain names.  The
+ * package is available under the GNU Lesser General Public License.
+ *
+ * The library contains a generic Stringprep implementation that does
+ * Unicode 3.2 NFKC normalization, mapping and prohibitation of
+ * characters, and bidirectional character handling.  Profiles for
+ * Nameprep, iSCSI, SASL and XMPP are included.  Punycode and ASCII
+ * Compatible Encoding (ACE) via IDNA are supported.  A mechanism to
+ * define Top-Level Domain (TLD) specific validation tables, and to
+ * compare strings against those tables, is included.  Default tables
+ * for some TLDs are also included.
+ *
+ * The Stringprep API consists of two main functions, one for
+ * converting data from the system's native representation into UTF-8,
+ * and one function to perform the Stringprep processing.  Adding a
+ * new Stringprep profile for your application within the API is
+ * straightforward.  The Punycode API consists of one encoding
+ * function and one decoding function.  The IDNA API consists of the
+ * ToASCII and ToUnicode functions, as well as an high-level interface
+ * for converting entire domain names to and from the ACE encoded
+ * form.  The TLD API consists of one set of functions to extract the
+ * TLD name from a domain string, one set of functions to locate the
+ * proper TLD table to use based on the TLD name, and core functions
+ * to validate a string against a TLD table, and some utility wrappers
+ * to perform all the steps in one call.
+ *
+ * The library is used by, e.g., GNU SASL and Shishi to process user
+ * names and passwords.  Libidn can be built into GNU Libc to enable a
+ * new system-wide getaddrinfo() flag for IDN processing.
+ *
+ * Libidn is developed for the GNU/Linux system, but runs on over 20 Unix
+ * platforms (including Solaris, IRIX, AIX, and Tru64) and Windows.
+ * Libidn is written in C and (parts of) the API is accessible from C,
+ * C++, Emacs Lisp, Python and Java.
+ *
+ * The project web page:\n
+ * http://www.gnu.org/software/libidn/
+ *
+ * The software archive:\n
+ * ftp://alpha.gnu.org/pub/gnu/libidn/
+ *
+ * For more information see:\n
+ * http://www.ietf.org/html.charters/idn-charter.html\n
+ * http://www.ietf.org/rfc/rfc3454.txt (stringprep specification)\n
+ * http://www.ietf.org/rfc/rfc3490.txt (idna specification)\n
+ * http://www.ietf.org/rfc/rfc3491.txt (nameprep specification)\n
+ * http://www.ietf.org/rfc/rfc3492.txt (punycode specification)\n
+ * http://www.ietf.org/internet-drafts/draft-ietf-ips-iscsi-string-prep-04.txt\n
+ * http://www.ietf.org/internet-drafts/draft-ietf-krb-wg-utf8-profile-01.txt\n
+ * http://www.ietf.org/internet-drafts/draft-ietf-sasl-anon-00.txt\n
+ * http://www.ietf.org/internet-drafts/draft-ietf-sasl-saslprep-00.txt\n
+ * http://www.ietf.org/internet-drafts/draft-ietf-xmpp-nodeprep-01.txt\n
+ * http://www.ietf.org/internet-drafts/draft-ietf-xmpp-resourceprep-01.txt\n
+ *
+ * Further information and paid contract development:\n
+ * Simon Josefsson <simon@josefsson.org>
+ *
+ * \section examples Examples
+ *
+ * \include example.c
+ * \include example3.c
+ * \include example4.c
+ * \include example5.c
+ */
+
+/**
+ * STRINGPREP_VERSION
+ *
+ * String defined via CPP denoting the header file version number.
+ * Used together with stringprep_check_version() to verify header file
+ * and run-time library consistency.
+ */
+
+/**
+ * STRINGPREP_MAX_MAP_CHARS
+ *
+ * Maximum number of code points that can replace a single code point,
+ * during stringprep mapping.
+ */
+
+/**
+ * Stringprep_rc:
+ * @STRINGPREP_OK: Successful operation.  This value is guaranteed to
+ *   always be zero, the remaining ones are only guaranteed to hold
+ *   non-zero values, for logical comparison purposes.
+ * @STRINGPREP_CONTAINS_UNASSIGNED: String contain unassigned Unicode
+ *   code points, which is forbidden by the profile.
+ * @STRINGPREP_CONTAINS_PROHIBITED: String contain code points
+ *   prohibited by the profile.
+ * @STRINGPREP_BIDI_BOTH_L_AND_RAL: String contain code points with
+ *   conflicting bidirection category.
+ * @STRINGPREP_BIDI_LEADTRAIL_NOT_RAL: Leading and trailing character
+ *   in string not of proper bidirectional category.
+ * @STRINGPREP_BIDI_CONTAINS_PROHIBITED: Contains prohibited code
+ *   points detected by bidirectional code.
+ * @STRINGPREP_TOO_SMALL_BUFFER: Buffer handed to function was too
+ *   small.  This usually indicate a problem in the calling
+ *   application.
+ * @STRINGPREP_PROFILE_ERROR: The stringprep profile was inconsistent.
+ *   This usually indicate an internal error in the library.
+ * @STRINGPREP_FLAG_ERROR: The supplied flag conflicted with profile.
+ *   This usually indicate a problem in the calling application.
+ * @STRINGPREP_UNKNOWN_PROFILE: The supplied profile name was not
+ *   known to the library.
+ * @STRINGPREP_ICONV_ERROR: Could not convert string in locale encoding.
+ * @STRINGPREP_NFKC_FAILED: The Unicode NFKC operation failed.  This
+ *   usually indicate an internal error in the library.
+ * @STRINGPREP_MALLOC_ERROR: The malloc() was out of memory.  This is
+ *   usually a fatal error.
+ *
+ * Enumerated return codes of stringprep(), stringprep_profile()
+ * functions (and macros using those functions).  The value 0 is
+ * guaranteed to always correspond to success.
+ */
+
+/**
+ * Stringprep_profile_flags:
+ * @STRINGPREP_NO_NFKC: Disable the NFKC normalization, as well as
+ *   selecting the non-NFKC case folding tables.  Usually the profile
+ *   specifies BIDI and NFKC settings, and applications should not
+ *   override it unless in special situations.
+ * @STRINGPREP_NO_BIDI: Disable the BIDI step.  Usually the profile
+ *   specifies BIDI and NFKC settings, and applications should not
+ *   override it unless in special situations.
+ * @STRINGPREP_NO_UNASSIGNED: Make the library return with an error if
+ *   string contains unassigned characters according to profile.
+ *
+ * Stringprep profile flags.
+ */
+
+/**
+ * Stringprep_profile_steps:
+ * @STRINGPREP_NFKC: The NFKC step.
+ * @STRINGPREP_BIDI: The BIDI step.
+ * @STRINGPREP_MAP_TABLE: The MAP step.
+ * @STRINGPREP_UNASSIGNED_TABLE: The Unassigned step.
+ * @STRINGPREP_PROHIBIT_TABLE: The Prohibited step.
+ * @STRINGPREP_BIDI_PROHIBIT_TABLE: The BIDI-Prohibited step.
+ * @STRINGPREP_BIDI_RAL_TABLE: The BIDI-RAL step.
+ * @STRINGPREP_BIDI_L_TABLE: The BIDI-L step.
+ *
+ * Various steps in the stringprep algorithm.  You really want to
+ * study the source code to understand this one.  Only useful if you
+ * want to add another profile.
+ */
+
+/**
+ * stringprep_nameprep:
+ * @in: input/ouput array with string to prepare.
+ * @maxlen: maximum length of input/output array.
+ *
+ * Prepare the input UTF-8 string according to the nameprep profile.
+ * The AllowUnassigned flag is true, use
+ * stringprep_nameprep_no_unassigned() if you want a false
+ * AllowUnassigned.  Returns 0 iff successful, or an error code.
+ **/
+
+/**
+ * stringprep_nameprep_no_unassigned:
+ * @in: input/ouput array with string to prepare.
+ * @maxlen: maximum length of input/output array.
+ *
+ * Prepare the input UTF-8 string according to the nameprep profile.
+ * The AllowUnassigned flag is false, use stringprep_nameprep() for
+ * true AllowUnassigned.  Returns 0 iff successful, or an error code.
+ **/
+
+/**
+ * stringprep_iscsi:
+ * @in: input/ouput array with string to prepare.
+ * @maxlen: maximum length of input/output array.
+ *
+ * Prepare the input UTF-8 string according to the draft iSCSI
+ * stringprep profile.  Returns 0 iff successful, or an error code.
+ **/
+
+/**
+ * stringprep_plain:
+ * @in: input/ouput array with string to prepare.
+ * @maxlen: maximum length of input/output array.
+ *
+ * Prepare the input UTF-8 string according to the draft SASL
+ * ANONYMOUS profile.  Returns 0 iff successful, or an error code.
+ **/
+
+/**
+ * stringprep_xmpp_nodeprep:
+ * @in: input/ouput array with string to prepare.
+ * @maxlen: maximum length of input/output array.
+ *
+ * Prepare the input UTF-8 string according to the draft XMPP node
+ * identifier profile.  Returns 0 iff successful, or an error code.
+ **/
+
+/**
+ * stringprep_xmpp_resourceprep:
+ * @in: input/ouput array with string to prepare.
+ * @maxlen: maximum length of input/output array.
+ *
+ * Prepare the input UTF-8 string according to the draft XMPP resource
+ * identifier profile.  Returns 0 iff successful, or an error code.
+ **/
diff --git a/3rdparty/stringprep/stringprep.pri b/3rdparty/stringprep/stringprep.pri
new file mode 100644
index 00000000..9c0767ce
--- /dev/null
+++ b/3rdparty/stringprep/stringprep.pri
@@ -0,0 +1,7 @@
+SOURCES *= $$PWD/rfc3454.cpp \
+    $$PWD/stringprep.cpp \
+    $$PWD/profiles.cpp
+HEADERS *= $$PWD/rfc3454.h
+    $$PWD/qstringprep.h
+INCLUDEPATH *= $$PWD
+OTHER_FILES *= $$PWD/CMakeLists.txt $$PWD/COPYING
diff --git a/3rdparty/stringprep/stringprep.pro b/3rdparty/stringprep/stringprep.pro
new file mode 100644
index 00000000..5845e5c9
--- /dev/null
+++ b/3rdparty/stringprep/stringprep.pro
@@ -0,0 +1,8 @@
+TEMPLATE = lib
+TARGET = stringprep
+DESTDIR  = $$IRIS_BASE/lib
+CONFIG  += staticlib create_prl
+OBJECTS_DIR = .obj
+MOC_DIR = .moc
+UI_DIR = .ui
+include($$PWD/stringprep.pri)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f224f8e7..5fe06ff6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -125,7 +125,6 @@ elseif(USE_QJDNS)
     include_directories( ${QJDns_INCLUDE_DIR} )
 endif()
 
-find_package(IDN REQUIRED)
 find_package(B2 QUIET)
 if(B2_FOUND)
     message(STATUS "Found B2: ${B2_LIBRARY}")
@@ -133,5 +132,6 @@ endif()
 
 add_definitions(-DIRISNET_STATIC)
 
+add_subdirectory(3rdparty/stringprep)
 add_subdirectory(src/irisnet)
 add_subdirectory(src/xmpp)
diff --git a/cmake/modules/FindIDN.cmake b/cmake/modules/FindIDN.cmake
deleted file mode 100644
index 81892530..00000000
--- a/cmake/modules/FindIDN.cmake
+++ /dev/null
@@ -1,77 +0,0 @@
-#=============================================================================
-# Copyright (C) 2016-2017  Psi+ Project, Vitaly Tonkacheyev
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote products
-#    derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#=============================================================================
-if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND WIN32)
-    set(D "d")
-endif()
-if( IDN_INCLUDE_DIR AND IDN_LIBRARY )
-    # in cache already
-    set(IDN_FIND_QUIETLY TRUE)
-endif()
-
-if( UNIX AND NOT( APPLE OR CYGWIN ) )
-    find_package( PkgConfig QUIET )
-    pkg_check_modules( PC_IDN QUIET libidn )
-    if( PC_IDN_FOUND )
-        set( IDN_DEFINITIONS ${PC_IDN_CFLAGS} ${PC_IDN_CFLAGS_OTHER} )
-    endif()
-endif()
-
-find_path(
-    IDN_INCLUDE_DIR idna.h
-    HINTS
-    ${IDN_ROOT}/include
-    ${PC_IDN_INCLUDEDIR}
-    ${PC_IDN_INCLUDE_DIRS}
-)
-set(IDN_NAMES
-    idn${D}
-    libidn${D}
-    idn-11${D}
-)
-find_library(
-    IDN_LIBRARY
-    NAMES ${IDN_NAMES}
-    HINTS
-    ${PC_IDN_LIBDIR}
-    ${PC_IDN_LIBRARY_DIRS}
-    ${IDN_ROOT}/lib
-    ${IDN_ROOT}/bin
-)
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(
-                IDN
-                DEFAULT_MSG
-                IDN_LIBRARY
-                IDN_INCLUDE_DIR
-)
-if( IDN_FOUND )
-    set( IDN_LIBRARIES ${IDN_LIBRARY} )
-    set( IDN_INCLUDE_DIRS ${IDN_INCLUDE_DIR} )
-endif()
-
-mark_as_advanced( IDN_INCLUDE_DIR IDN_LIBRARY )
diff --git a/configure b/configure
index da9c922b..9d8c8370 100755
--- a/configure
+++ b/configure
@@ -33,8 +33,6 @@ Project options:
   --enable-tests              Build examples and unittests.
 
 Dependency options:
-  --with-idn-inc=[path]      Path to libidn include files
-  --with-idn-lib=[path]      Path to libidn library or framework files
   --with-qca-inc=[path]      Path to QCA include files
   --with-qca-lib=[path]      Path to QCA library or framework files
   --with-zlib-inc=[path]     Path to zlib include files
@@ -206,16 +204,6 @@ while [ $# -gt 0 ]; do
             shift
             ;;
 
-        --with-idn-inc=*)
-            QC_WITH_IDN_INC=$optarg
-            shift
-            ;;
-
-        --with-idn-lib=*)
-            QC_WITH_IDN_LIB=$optarg
-            shift
-            ;;
-
         --with-qca-inc=*)
             QC_WITH_QCA_INC=$optarg
             shift
@@ -287,8 +275,6 @@ echo QC_FRAMEWORK=$QC_FRAMEWORK
 echo QC_UNIVERSAL=$QC_UNIVERSAL
 echo QC_MAC_SDK=$QC_MAC_SDK
 echo QC_ENABLE_TESTS=$QC_ENABLE_TESTS
-echo QC_WITH_IDN_INC=$QC_WITH_IDN_INC
-echo QC_WITH_IDN_LIB=$QC_WITH_IDN_LIB
 echo QC_WITH_QCA_INC=$QC_WITH_QCA_INC
 echo QC_WITH_QCA_LIB=$QC_WITH_QCA_LIB
 echo QC_WITH_ZLIB_INC=$QC_WITH_ZLIB_INC
@@ -781,63 +767,6 @@ public:
         return true;
     }
 };
-#line 1 "idn.qcm"
-/*
------BEGIN QCMOD-----
-name: libidn
-arg: with-idn-inc=[path],Path to libidn include files
-arg: with-idn-lib=[path],Path to libidn library or framework files
------END QCMOD-----
-*/
-
-//----------------------------------------------------------------------------
-// qc_idn
-//----------------------------------------------------------------------------
-class qc_idn : public ConfObj
-{
-public:
-    qc_idn(Conf *c) : ConfObj(c) {}
-    QString name() const { return "LibIDN"; }
-    QString shortname() const { return "libidn"; }
-    bool exec()
-    {
-        QString idn_incdir, idn_libdir;
-        idn_incdir = conf->getenv("QC_WITH_IDN_INC");
-        idn_libdir = conf->getenv("QC_WITH_IDN_LIB");
-
-        if (!idn_incdir.isEmpty() || !idn_libdir.isEmpty()) { // prefer this if given
-            if ((!idn_incdir.isEmpty() && conf->checkHeader(idn_incdir, "stringprep.h")) ||
-                (idn_incdir.isEmpty() && conf->findHeader("stringprep.h", QStringList(), &idn_incdir))) {
-                conf->addIncludePath(idn_incdir);
-            } else {
-                printf("Headers not found!\\n");
-                return false;
-            }
-
-            if((!idn_libdir.isEmpty() && conf->checkLibrary(idn_libdir, "idn")) ||
-               (idn_libdir.isEmpty() && conf->findLibrary("idn", &idn_libdir))) {
-                conf->addLib(idn_libdir.isEmpty()? "-lidn" : QString("-L%1 -lidn").arg(idn_libdir));
-            } else {
-                printf("Libraries not found!\\n");
-                return false;
-            }
-            return true;
-        }
-
-        QStringList incs;
-        QString version, libs, other;
-        if(conf->findPkgConfig("libidn", VersionAny, QString::null, &version, &incs, &libs, &other))
-        {
-            for(int n = 0; n < incs.count(); ++n)
-                conf->addIncludePath(incs[n]);
-            if(!libs.isEmpty())
-                conf->addLib(libs);
-            return true;
-        }
-
-        return false;
-    }
-};
 #line 1 "qca.qcm"
 /*
 -----BEGIN QCMOD-----
@@ -850,45 +779,45 @@ arg: with-qca-lib=[path],Path to QCA library or framework files
 // adapted from crypto.prf
 static QString internal_crypto_prf(const QString &incdir, const QString &libdir, const QString &frameworkdir)
 {
-    QString out = QString(
-"QCA_INCDIR = %1\\n"
-"QCA_LIBDIR = %2\\n"
-"QMAKE_RPATHDIR = %2\\n"
-"QCA_FRAMEWORKDIR = %3\\n"
-"\\n"
-"CONFIG *= qt\\n"
-"\\n"
-"LINKAGE =\\n"
-"QCA_NAME = qca-qt5\\n"
-"\\n"
-"!isEmpty(QCA_FRAMEWORKDIR): {\\n"
-"    framework_dir = \$\$QCA_FRAMEWORKDIR\\n"
-"    exists(\$\$framework_dir/\$\${QCA_NAME}.framework) {\\n"
-"        #QMAKE_FRAMEWORKPATH *= \$\$framework_dir\\n"
-"        LIBS *= -F\$\$framework_dir\\n"
-"        INCLUDEPATH += \$\$framework_dir/\$\${QCA_NAME}.framework/Headers\\n"
-"        LINKAGE = -framework \$\${QCA_NAME}\\n"
-"    }\\n"
-"}\\n"
-"\\n"
-"# else, link normally\\n"
-"isEmpty(LINKAGE) {\\n"
-"    !isEmpty(QCA_INCDIR):INCLUDEPATH += \$\$QCA_INCDIR/QtCrypto\\n"
-"    !isEmpty(QCA_LIBDIR):LIBS += -L\$\$QCA_LIBDIR\\n"
-"    LINKAGE = -l\$\${QCA_NAME}\\n"
-"    CONFIG(debug, debug|release) {\\n"
-"        windows:LINKAGE = -l\$\${QCA_NAME}d\\n"
-"        mac:LINKAGE = -l\$\${QCA_NAME}_debug\\n"
-"    }\\n"
-"}\\n"
-"\\n"
-"LIBS += \$\$LINKAGE\\n"
-    ).arg(incdir, libdir, frameworkdir);
+    QString out = QString("QCA_INCDIR = %1\\n"
+                          "QCA_LIBDIR = %2\\n"
+                          "QMAKE_RPATHDIR = %2\\n"
+                          "QCA_FRAMEWORKDIR = %3\\n"
+                          "\\n"
+                          "CONFIG *= qt\\n"
+                          "\\n"
+                          "LINKAGE =\\n"
+                          "QCA_NAME = qca-qt5\\n"
+                          "\\n"
+                          "!isEmpty(QCA_FRAMEWORKDIR): {\\n"
+                          "    framework_dir = \$\$QCA_FRAMEWORKDIR\\n"
+                          "    exists(\$\$framework_dir/\$\${QCA_NAME}.framework) {\\n"
+                          "        #QMAKE_FRAMEWORKPATH *= \$\$framework_dir\\n"
+                          "        LIBS *= -F\$\$framework_dir\\n"
+                          "        INCLUDEPATH += \$\$framework_dir/\$\${QCA_NAME}.framework/Headers\\n"
+                          "        LINKAGE = -framework \$\${QCA_NAME}\\n"
+                          "    }\\n"
+                          "}\\n"
+                          "\\n"
+                          "# else, link normally\\n"
+                          "isEmpty(LINKAGE) {\\n"
+                          "    !isEmpty(QCA_INCDIR):INCLUDEPATH += \$\$QCA_INCDIR/QtCrypto\\n"
+                          "    !isEmpty(QCA_LIBDIR):LIBS += -L\$\$QCA_LIBDIR\\n"
+                          "    LINKAGE = -l\$\${QCA_NAME}\\n"
+                          "    CONFIG(debug, debug|release) {\\n"
+                          "        windows:LINKAGE = -l\$\${QCA_NAME}d\\n"
+                          "        mac:LINKAGE = -l\$\${QCA_NAME}_debug\\n"
+                          "    }\\n"
+                          "}\\n"
+                          "\\n"
+                          "LIBS += \$\$LINKAGE\\n")
+                      .arg(incdir, libdir, frameworkdir);
     return out;
 }
 
 // set either libdir or frameworkdir, but not both
-static bool qca_try(Conf *conf, const QString &incdir, const QString &libdir, const QString &frameworkdir, bool release, bool debug, QString *_prf)
+static bool qca_try(Conf *conf, const QString &incdir, const QString &libdir, const QString &frameworkdir, bool release,
+                    bool debug, QString *_prf)
 {
     QString proextra;
     QString prf;
@@ -897,34 +826,30 @@ static bool qca_try(Conf *conf, const QString &incdir, const QString &libdir, co
     } else {
         prf = "CONFIG += crypto\\n";
     }
-    proextra =
-    "CONFIG += qt\\n"
-    "CONFIG -= debug_and_release debug release\\n"
-    "QT -= gui\\n";
+    proextra = "CONFIG += qt\\n"
+               "CONFIG -= debug_and_release debug release\\n"
+               "QT -= gui\\n";
     proextra += prf;
 
-    QString str =
-    "#include <QtCrypto>\\n"
-    "\\n"
-    "int main()\\n"
-    "{\\n"
-    "    unsigned long x = QCA_VERSION;\\n"
-    "    if(x >= 0x020000 && x < 0x030000) return 0; else return 1;\\n"
-    "}\\n";
+    QString str = "#include <QtCrypto>\\n"
+                  "\\n"
+                  "int main()\\n"
+                  "{\\n"
+                  "    unsigned long x = QCA_VERSION;\\n"
+                  "    if(x >= 0x020000 && x < 0x030000) return 0; else return 1;\\n"
+                  "}\\n";
 
     // test desired versions, potentially both release and debug
 
-    if(release)
-    {
+    if (release) {
         int ret;
-        if(!conf->doCompileAndLink(str, QStringList(), QString(), proextra + "CONFIG += release\\n", &ret) || ret != 0)
+        if (!conf->doCompileAndLink(str, QStringList(), QString(), proextra + "CONFIG += release\\n", &ret) || ret != 0)
             return false;
     }
 
-    if(debug)
-    {
+    if (debug) {
         int ret;
-        if(!conf->doCompileAndLink(str, QStringList(), QString(), proextra + "CONFIG += debug\\n", &ret) || ret != 0)
+        if (!conf->doCompileAndLink(str, QStringList(), QString(), proextra + "CONFIG += debug\\n", &ret) || ret != 0)
             return false;
     }
 
@@ -932,10 +857,11 @@ static bool qca_try(Conf *conf, const QString &incdir, const QString &libdir, co
     return true;
 }
 
-static bool qca_try_lib(Conf *conf, const QString &incdir, const QString &libdir, bool release, bool debug, QString *prf)
+static bool qca_try_lib(Conf *conf, const QString &incdir, const QString &libdir, bool release, bool debug,
+                        QString *prf)
 {
-    return qca_try(conf, incdir, libdir, QString(), release, debug, prf) ||
-            qca_try(conf, incdir + "/Qca-qt5", libdir, QString(), release, debug, prf);
+    return qca_try(conf, incdir, libdir, QString(), release, debug, prf)
+        || qca_try(conf, incdir + "/Qca-qt5", libdir, QString(), release, debug, prf);
 }
 
 static bool qca_try_framework(Conf *conf, const QString &frameworkdir, bool release, bool debug, QString *prf)
@@ -951,22 +877,21 @@ static bool qca_try_ext_prf(Conf *conf, bool release, bool debug, QString *prf)
 //----------------------------------------------------------------------------
 // qc_qca
 //----------------------------------------------------------------------------
-class qc_qca : public ConfObj
-{
+class qc_qca : public ConfObj {
 public:
-    qc_qca(Conf *c) : ConfObj(c) {}
+    qc_qca(Conf *c) : ConfObj(c) { }
     QString name() const { return "QCA >= 2.0"; }
     QString shortname() const { return "qca"; }
-    bool exec()
+    bool    exec()
     {
         // get the build mode
 #ifdef QC_BUILDMODE
         bool release = qc_buildmode_release;
-        bool debug = qc_buildmode_debug;
+        bool debug   = qc_buildmode_debug;
 #else
         // else, default to just release mode
         bool release = true;
-        bool debug = false;
+        bool debug   = false;
 #endif
 
         QString qca_incdir, qca_libdir, qca_crypto_prf;
@@ -974,33 +899,30 @@ public:
         qca_libdir = conf->getenv("QC_WITH_QCA_LIB");
 
 #if defined(Q_OS_MAC)
-        if(!qca_libdir.isEmpty() && qca_try_framework(conf, qca_libdir, release, debug, &qca_crypto_prf))
-        {
+        if (!qca_libdir.isEmpty() && qca_try_framework(conf, qca_libdir, release, debug, &qca_crypto_prf)) {
             conf->addExtra(qca_crypto_prf);
             return true;
         }
 #endif
 
-        if(!qca_incdir.isEmpty() && !qca_libdir.isEmpty() && qca_try_lib(conf, qca_incdir, qca_libdir, release, debug, &qca_crypto_prf))
-        {
+        if (!qca_incdir.isEmpty() && !qca_libdir.isEmpty()
+            && qca_try_lib(conf, qca_incdir, qca_libdir, release, debug, &qca_crypto_prf)) {
             conf->addExtra(qca_crypto_prf);
             return true;
         }
 
-        if (qca_try_ext_prf(conf, release, debug, &qca_crypto_prf))
-        {
+        if (qca_try_ext_prf(conf, release, debug, &qca_crypto_prf)) {
             conf->addExtra(qca_crypto_prf);
             return true;
         }
 
         QStringList incs;
-        QString version, libs, other;
+        QString     version, libs, other;
 
-        if(conf->findPkgConfig("qca2-qt5", VersionMin, "2.0.0", &version, &incs, &libs, &other))
-        {
-            for(int n = 0; n < incs.count(); ++n)
+        if (conf->findPkgConfig("qca2-qt5", VersionMin, "2.0.0", &version, &incs, &libs, &other)) {
+            for (int n = 0; n < incs.count(); ++n)
                 conf->addIncludePath(incs[n]);
-            if(!libs.isEmpty())
+            if (!libs.isEmpty())
                 conf->addLib(libs);
             return true;
         }
@@ -1015,11 +937,9 @@ public:
             prefixes += prefix;
         }
 
-        for(int n = 0; n < prefixes.count(); ++n)
-        {
+        for (int n = 0; n < prefixes.count(); ++n) {
             const QString &prefix = prefixes[n];
-            if(qca_try_lib(conf, prefix + "/include", prefix + "/lib", release, debug, &qca_crypto_prf))
-            {
+            if (qca_try_lib(conf, prefix + "/include", prefix + "/lib", release, debug, &qca_crypto_prf)) {
                 conf->addExtra(qca_crypto_prf);
                 return true;
             }
@@ -1322,9 +1242,6 @@ cat >"$1/modules_new.cpp" <<EOT
     o = new qc_universal(conf);
     o->required = true;
     o->disabled = false;
-    o = new qc_idn(conf);
-    o->required = true;
-    o->disabled = false;
     o = new qc_qca(conf);
     o->required = true;
     o->disabled = false;
@@ -2521,8 +2438,6 @@ export QC_FRAMEWORK
 export QC_UNIVERSAL
 export QC_MAC_SDK
 export QC_ENABLE_TESTS
-export QC_WITH_IDN_INC
-export QC_WITH_IDN_LIB
 export QC_WITH_QCA_INC
 export QC_WITH_QCA_LIB
 export QC_WITH_ZLIB_INC
diff --git a/configure.exe b/configure.exe
index 392518730028816e8f9024700dc52ae8ff76a2b2..953703b782d714abe37b682ecdb78f0b507c5af8 100644
GIT binary patch
delta 1542
zcmbVMUuaWz6!r^EqfM=0nXw&f{duD<Q8%?F(IiH5^Os<k&h9}F!KTe^7ZwxSX2WU=
ziXz&As09!D(6wx1P#AR}+>Nnyu$K)S?9am<W})kYKIyinA!BSO_onT=9XRm!^!swY
zbIy0Z-?>@%(RSs&?fgAFU0XlDe$5)2Q2$wr4y$^<2|oiH)eju_9O_3ezz0kAeRbZ6
zhnv)VJ9^=ij>hGanQT0f=@JpKZSRSaL^sB;k?wY*UXONUVzp?yDN4WZLo?kR!;2cZ
zMJtu+l3!0A>+CvGOW9{isgq35A;mkhsZ3hzh=_rTDYS~YUh2qXkI3nyh?r<Dt!b8f
zvigDE+^Yi>zlpG_4)yyWt!SpJKI}BWdp-mW@Uahj4Y17*w*kt2qz&+j-&ks$B>0S)
zv{)rGUZt%?atoz6r0f#KLg{T$Di5B@6^p~B5-zDQlst91GVH1O;T7jh1bXU6%%Cb9
zfX@KS0c<hA>jAuCfNH=v0xbrxYbE*|6S?@+VsDC_5wUe^O)rb}Y71r&f)4G+qP}gv
zjlfFV58!%T)izQOprqfn2eGGBEbR$b()OgG%BmeI1`)6=fyp33^dN{<x;2KTWrv;A
z{3SNgoiQ|6r6tFlv^fNiMx=BI3H>%6!W%CO&!AFNazhIHyWFf$s)#|QLfwn}eS8*1
zin3weh<9i3l6$m4qZRsuC$IFp)Bmizel3N32Qi^f|5YRENK{~>M-g7nLlM-|p9kT!
zFSi~UQFljh!9vF;v4Q3eqs<~lY4$yCk0>(DJic;9>GgQEj1|drB8t~^C&#1kI;uAH
zl*>h-iDakeqS&Ixe~n^?eruG`@?Yj287@7Zmf_QHBQo0c+pLU?_6Y0%{Uzh1MVzBQ
zrs1Ng98c2`XUo{A4OIF94yRiw<qLhfWmQSlq)%el-MBn3|40ilbUv#LeV4;Ja?G%K
zm*d#~|J3q4TWtS<lfqNH+R+5;7U7|5$5>`h0*7t2$EF8U2-EyHv!h8?FQ(B(p=oTR
z?=Nw)Ckd|b)-;@Sb_RBBB3+7B|3VT``Y_4!{*=TGTA1QL$ulYLFgeWRPiHysaSF}$
z>fF^+o&DPsj?=_#uBg>svFvD)zt`>@T4?wiG|}C!x&2%oR&^qcbSnz<OCEo#?mk2=
F{tL7o%PIf>

delta 2140
zcmah~O;B4^6wX&d=nDvR3Z!(XTmr#7NCH8i<tIr)_{%_PXpzp)(ln44c$x-CLY)rH
z*y`xGa8Wls&Ny{iM;ET@qBC)Hw0rB+pJ~U18`^Pnp$oU_boAc)l7?1h%;M(VbI<pk
z@0@$yd2fGHvHe5E<=gmkuVq^^nJRAP|JjS_@-jW1qM2$m9!=^?{F&*g<>Y2uV+lQ}
zWvq<3-LLA|RX0C!a}VF?^;mXwk;z|#KeFr^Gmvz%8jk!_HGTwa`PN!|fq+19LX*i<
zGaHJY3eQbO!=p3N@JxuCOjSFXpY@pzkC^fg_Q8iekzez5`|*oSYHisMhsTI$jipxx
z*%J~Ts36bvjI!BIGz##wG1OT~YMbarCl1nA5uB9N{xL+VmXonehHWfIxj%ht1CvLW
zofx!C>q}fc{j?t)MV2?m!J6W!D32Z2(=NtAQ67Ll4_OsOP}KUtY70r*)uJ_U8q6lF
zJWXL0&I#sh5qLV@i~6G_CXb#OJHMX2=u}m<#k#uKdRj|pX_j5pGmN8F^b1;w6G#Sw
zg3F=db7-Q+FQKAGP!$E*GugDBTHzGyo>e<%ymU!G#eF(Ue$+G%W-Yl=a31wlrE^uK
zJE!n`DRY^al4Dvjqp>Z)sL;<*Fgh`b`s$p>kIQpPb#&w$oHCeEDHpSI=BKpmI2BS3
z(BJb=UK3s})-GfiNL5rs23uZBCEWg4JkIZE2e?$a0JHP{<pgYy&7PDsaN6C|4lgsz
zs)skz4y5|ujG)kk80<2ohMWkS*0P)F6w9VJHF2>yE0xXRa2ZdOuFRpn*d*3P1o*L3
znpjKI)$3?A%M#tWj^;8^tL;V98K&B^sH@+N+e#nTp*jCo2bK}E+Gj&S@g9waPcR>I
zc+aHlhK)B=!PaBgjs>U2q9-E3xyhY&`pt!ds$IH-j?avTCs>D%ZDgfEF4N(eso=yI
z^NAgO>V~acx?l6~8Vq~TNmo1=p!*(psksZSbfyav^ko-1$L*q>a+1YZ<zuVt4i_I6
zsaIHPEqy+gOkR{H#Re~g<d-UAe%*}`YWJeIToO{C2M5gZ<dzpN&>vo|p|1z7?%m_@
zN}Ob!KGxP&;1y7zOr^>f@rZsOL<8A+aoM7*rxVOa4?B6Meb$Rve$&tOp}RqP+Y9C4
zOh$QVp%4A^K3~kjfxhp<A)_=@(+``)Zm6H^hl^hC$0*(JN5tVwYe_AZ(NsygC09jH
zWf^axp~5af#|~p-5AO$d7mW_yM{#XwbLD>_Gc<n$Ekzu?cLeWHWDp&6YXBBX4nVCD
z@43jm@XOyAz?D6;Z9^rwhWUjaSb&4F!<eLd3)sgCaDNyc{%7$)tyGrQ){;zWp@0u9
z+#dIF`sOJ#v<t=^4!j!^F+K%`tgTuqt|zQUZuG#1UQt&+dd$kka*V_Xq;5aV^s*mz
zvltJw5kNhC;zzjJKo!cQ5CUj(JoCcIz`3Wx=m|O%K$qaCq7MQH?MBqHJCWoos2x6v
zq1~W8yF(3BVXjQ;nXLGXW{hj4#yK=obr6-1W1)e(K?Eu#M1<V3Qgo3wI)CvMx)Vej
zJzC@!!ncfS&!K|8I}0nZ&tb6?#Ep+&g8RNZf)CA#7$`#_wA0l^l#3xF(@<zV1eH$|
zUXYJMSg0+Si^oqY`t%GlusOq-Pi?uU8!`Ste`^#Ihj5$j#qd~u5+BAenZLUP-y8n|
DJI+C5

diff --git a/iris.pri b/iris.pri
index bbdba3b3..eaf40ccc 100644
--- a/iris.pri
+++ b/iris.pri
@@ -31,11 +31,6 @@ windows {
         LIBS += -lqcad
     }
 
-    contains(LIBS, -lidn) {
-        LIBS -= -lidn
-        LIBS += -lidn
-    }
-
     contains(LIBS, -lz) {
         LIBS -= -lz
         LIBS += -lz
diff --git a/iris.qc b/iris.qc
index b3741541..8ac35ae3 100644
--- a/iris.qc
+++ b/iris.qc
@@ -13,9 +13,6 @@
  <dep type='universal'>
   <required/>
  </dep>
- <dep type='idn'>
-  <required/>
- </dep>
  <dep type='qca'>
   <required/>
  </dep>
diff --git a/qcm/idn.qcm b/qcm/idn.qcm
deleted file mode 100644
index 28151246..00000000
--- a/qcm/idn.qcm
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
------BEGIN QCMOD-----
-name: libidn
-arg: with-idn-inc=[path],Path to libidn include files
-arg: with-idn-lib=[path],Path to libidn library or framework files
------END QCMOD-----
-*/
-
-//----------------------------------------------------------------------------
-// qc_idn
-//----------------------------------------------------------------------------
-class qc_idn : public ConfObj
-{
-public:
-	qc_idn(Conf *c) : ConfObj(c) {}
-	QString name() const { return "LibIDN"; }
-	QString shortname() const { return "libidn"; }
-	bool exec()
-	{
-		QString idn_incdir, idn_libdir;
-		idn_incdir = conf->getenv("QC_WITH_IDN_INC");
-		idn_libdir = conf->getenv("QC_WITH_IDN_LIB");
-
-		if (!idn_incdir.isEmpty() || !idn_libdir.isEmpty()) { // prefer this if given
-			if ((!idn_incdir.isEmpty() && conf->checkHeader(idn_incdir, "stringprep.h")) ||
-			    (idn_incdir.isEmpty() && conf->findHeader("stringprep.h", QStringList(), &idn_incdir))) {
-				conf->addIncludePath(idn_incdir);
-			} else {
-				printf("Headers not found!\n");
-				return false;
-			}
-
-			if((!idn_libdir.isEmpty() && conf->checkLibrary(idn_libdir, "idn")) ||
-			   (idn_libdir.isEmpty() && conf->findLibrary("idn", &idn_libdir))) {
-				conf->addLib(idn_libdir.isEmpty()? "-lidn" : QString("-L%1 -lidn").arg(idn_libdir));
-			} else {
-				printf("Libraries not found!\n");
-				return false;
-			}
-			return true;
-		}
-
-		QStringList incs;
-		QString version, libs, other;
-		if(conf->findPkgConfig("libidn", VersionAny, QString::null, &version, &incs, &libs, &other))
-		{
-			for(int n = 0; n < incs.count(); ++n)
-				conf->addIncludePath(incs[n]);
-			if(!libs.isEmpty())
-				conf->addLib(libs);
-			return true;
-		}
-
-		return false;
-	}
-};
diff --git a/qcm/qca.qcm b/qcm/qca.qcm
index 25ede5dd..ca7591d5 100644
--- a/qcm/qca.qcm
+++ b/qcm/qca.qcm
@@ -9,92 +9,89 @@ arg: with-qca-lib=[path],Path to QCA library or framework files
 // adapted from crypto.prf
 static QString internal_crypto_prf(const QString &incdir, const QString &libdir, const QString &frameworkdir)
 {
-    QString out = QString(
-"QCA_INCDIR = %1\n"
-"QCA_LIBDIR = %2\n"
-"QMAKE_RPATHDIR = %2\n"
-"QCA_FRAMEWORKDIR = %3\n"
-"\n"
-"CONFIG *= qt\n"
-"\n"
-"LINKAGE =\n"
-"QCA_NAME = qca-qt5\n"
-"\n"
-"!isEmpty(QCA_FRAMEWORKDIR): {\n"
-"    framework_dir = $$QCA_FRAMEWORKDIR\n"
-"    exists($$framework_dir/$${QCA_NAME}.framework) {\n"
-"    	#QMAKE_FRAMEWORKPATH *= $$framework_dir\n"
-"    	LIBS *= -F$$framework_dir\n"
-"    	INCLUDEPATH += $$framework_dir/$${QCA_NAME}.framework/Headers\n"
-"    	LINKAGE = -framework $${QCA_NAME}\n"
-"    }\n"
-"}\n"
-"\n"
-"# else, link normally\n"
-"isEmpty(LINKAGE) {\n"
-"    !isEmpty(QCA_INCDIR):INCLUDEPATH += $$QCA_INCDIR/QtCrypto\n"
-"    !isEmpty(QCA_LIBDIR):LIBS += -L$$QCA_LIBDIR\n"
-"    LINKAGE = -l$${QCA_NAME}\n"
-"    CONFIG(debug, debug|release) {\n"
-"    	windows:LINKAGE = -l$${QCA_NAME}d\n"
-"    	mac:LINKAGE = -l$${QCA_NAME}_debug\n"
-"    }\n"
-"}\n"
-"\n"
-"LIBS += $$LINKAGE\n"
-    ).arg(incdir, libdir, frameworkdir);
+    QString out = QString("QCA_INCDIR = %1\n"
+                          "QCA_LIBDIR = %2\n"
+                          "QMAKE_RPATHDIR = %2\n"
+                          "QCA_FRAMEWORKDIR = %3\n"
+                          "\n"
+                          "CONFIG *= qt\n"
+                          "\n"
+                          "LINKAGE =\n"
+                          "QCA_NAME = qca-qt5\n"
+                          "\n"
+                          "!isEmpty(QCA_FRAMEWORKDIR): {\n"
+                          "    framework_dir = $$QCA_FRAMEWORKDIR\n"
+                          "    exists($$framework_dir/$${QCA_NAME}.framework) {\n"
+                          "        #QMAKE_FRAMEWORKPATH *= $$framework_dir\n"
+                          "        LIBS *= -F$$framework_dir\n"
+                          "        INCLUDEPATH += $$framework_dir/$${QCA_NAME}.framework/Headers\n"
+                          "        LINKAGE = -framework $${QCA_NAME}\n"
+                          "    }\n"
+                          "}\n"
+                          "\n"
+                          "# else, link normally\n"
+                          "isEmpty(LINKAGE) {\n"
+                          "    !isEmpty(QCA_INCDIR):INCLUDEPATH += $$QCA_INCDIR/QtCrypto\n"
+                          "    !isEmpty(QCA_LIBDIR):LIBS += -L$$QCA_LIBDIR\n"
+                          "    LINKAGE = -l$${QCA_NAME}\n"
+                          "    CONFIG(debug, debug|release) {\n"
+                          "        windows:LINKAGE = -l$${QCA_NAME}d\n"
+                          "        mac:LINKAGE = -l$${QCA_NAME}_debug\n"
+                          "    }\n"
+                          "}\n"
+                          "\n"
+                          "LIBS += $$LINKAGE\n")
+                      .arg(incdir, libdir, frameworkdir);
     return out;
 }
 
 // set either libdir or frameworkdir, but not both
-static bool qca_try(Conf *conf, const QString &incdir, const QString &libdir, const QString &frameworkdir, bool release, bool debug, QString *_prf)
+static bool qca_try(Conf *conf, const QString &incdir, const QString &libdir, const QString &frameworkdir, bool release,
+                    bool debug, QString *_prf)
 {
     QString proextra;
     QString prf;
     if (!incdir.isEmpty() || !libdir.isEmpty() || !frameworkdir.isEmpty()) {
-    	prf = internal_crypto_prf(conf->escapePath(incdir), conf->escapePath(libdir), frameworkdir);
+        prf = internal_crypto_prf(conf->escapePath(incdir), conf->escapePath(libdir), frameworkdir);
     } else {
-    	prf = "CONFIG += crypto\n";
+        prf = "CONFIG += crypto\n";
     }
-    proextra =
-    "CONFIG += qt\n"
-    "CONFIG -= debug_and_release debug release\n"
-    "QT -= gui\n";
+    proextra = "CONFIG += qt\n"
+               "CONFIG -= debug_and_release debug release\n"
+               "QT -= gui\n";
     proextra += prf;
 
-    QString str =
-    "#include <QtCrypto>\n"
-    "\n"
-    "int main()\n"
-    "{\n"
-    "	unsigned long x = QCA_VERSION;\n"
-    "	if(x >= 0x020000 && x < 0x030000) return 0; else return 1;\n"
-    "}\n";
+    QString str = "#include <QtCrypto>\n"
+                  "\n"
+                  "int main()\n"
+                  "{\n"
+                  "    unsigned long x = QCA_VERSION;\n"
+                  "    if(x >= 0x020000 && x < 0x030000) return 0; else return 1;\n"
+                  "}\n";
 
     // test desired versions, potentially both release and debug
 
-    if(release)
-    {
-    	int ret;
-    	if(!conf->doCompileAndLink(str, QStringList(), QString(), proextra + "CONFIG += release\n", &ret) || ret != 0)
-    		return false;
+    if (release) {
+        int ret;
+        if (!conf->doCompileAndLink(str, QStringList(), QString(), proextra + "CONFIG += release\n", &ret) || ret != 0)
+            return false;
     }
 
-    if(debug)
-    {
-    	int ret;
-    	if(!conf->doCompileAndLink(str, QStringList(), QString(), proextra + "CONFIG += debug\n", &ret) || ret != 0)
-    		return false;
+    if (debug) {
+        int ret;
+        if (!conf->doCompileAndLink(str, QStringList(), QString(), proextra + "CONFIG += debug\n", &ret) || ret != 0)
+            return false;
     }
 
     *_prf = prf;
     return true;
 }
 
-static bool qca_try_lib(Conf *conf, const QString &incdir, const QString &libdir, bool release, bool debug, QString *prf)
+static bool qca_try_lib(Conf *conf, const QString &incdir, const QString &libdir, bool release, bool debug,
+                        QString *prf)
 {
-    return qca_try(conf, incdir, libdir, QString(), release, debug, prf) ||
-            qca_try(conf, incdir + "/Qca-qt5", libdir, QString(), release, debug, prf);
+    return qca_try(conf, incdir, libdir, QString(), release, debug, prf)
+        || qca_try(conf, incdir + "/Qca-qt5", libdir, QString(), release, debug, prf);
 }
 
 static bool qca_try_framework(Conf *conf, const QString &frameworkdir, bool release, bool debug, QString *prf)
@@ -110,80 +107,74 @@ static bool qca_try_ext_prf(Conf *conf, bool release, bool debug, QString *prf)
 //----------------------------------------------------------------------------
 // qc_qca
 //----------------------------------------------------------------------------
-class qc_qca : public ConfObj
-{
+class qc_qca : public ConfObj {
 public:
-    qc_qca(Conf *c) : ConfObj(c) {}
+    qc_qca(Conf *c) : ConfObj(c) { }
     QString name() const { return "QCA >= 2.0"; }
     QString shortname() const { return "qca"; }
-    bool exec()
+    bool    exec()
     {
-    	// get the build mode
+        // get the build mode
 #ifdef QC_BUILDMODE
-    	bool release = qc_buildmode_release;
-    	bool debug = qc_buildmode_debug;
+        bool release = qc_buildmode_release;
+        bool debug   = qc_buildmode_debug;
 #else
-    	// else, default to just release mode
-    	bool release = true;
-    	bool debug = false;
+        // else, default to just release mode
+        bool release = true;
+        bool debug   = false;
 #endif
 
-    	QString qca_incdir, qca_libdir, qca_crypto_prf;
-    	qca_incdir = conf->getenv("QC_WITH_QCA_INC");
-    	qca_libdir = conf->getenv("QC_WITH_QCA_LIB");
+        QString qca_incdir, qca_libdir, qca_crypto_prf;
+        qca_incdir = conf->getenv("QC_WITH_QCA_INC");
+        qca_libdir = conf->getenv("QC_WITH_QCA_LIB");
 
 #if defined(Q_OS_MAC)
-    	if(!qca_libdir.isEmpty() && qca_try_framework(conf, qca_libdir, release, debug, &qca_crypto_prf))
-    	{
-    		conf->addExtra(qca_crypto_prf);
-    		return true;
-    	}
+        if (!qca_libdir.isEmpty() && qca_try_framework(conf, qca_libdir, release, debug, &qca_crypto_prf)) {
+            conf->addExtra(qca_crypto_prf);
+            return true;
+        }
 #endif
 
-    	if(!qca_incdir.isEmpty() && !qca_libdir.isEmpty() && qca_try_lib(conf, qca_incdir, qca_libdir, release, debug, &qca_crypto_prf))
-    	{
-    		conf->addExtra(qca_crypto_prf);
-    		return true;
-    	}
-    	
-    	if (qca_try_ext_prf(conf, release, debug, &qca_crypto_prf))
-    	{
-    		conf->addExtra(qca_crypto_prf);
-    		return true;
-    	}
-
-    	QStringList incs;
-    	QString version, libs, other;
-
-        if(conf->findPkgConfig("qca2-qt5", VersionMin, "2.0.0", &version, &incs, &libs, &other))
-        {
-            for(int n = 0; n < incs.count(); ++n)
+        if (!qca_incdir.isEmpty() && !qca_libdir.isEmpty()
+            && qca_try_lib(conf, qca_incdir, qca_libdir, release, debug, &qca_crypto_prf)) {
+            conf->addExtra(qca_crypto_prf);
+            return true;
+        }
+
+        if (qca_try_ext_prf(conf, release, debug, &qca_crypto_prf)) {
+            conf->addExtra(qca_crypto_prf);
+            return true;
+        }
+
+        QStringList incs;
+        QString     version, libs, other;
+
+        if (conf->findPkgConfig("qca2-qt5", VersionMin, "2.0.0", &version, &incs, &libs, &other)) {
+            for (int n = 0; n < incs.count(); ++n)
                 conf->addIncludePath(incs[n]);
-            if(!libs.isEmpty())
+            if (!libs.isEmpty())
                 conf->addLib(libs);
             return true;
         }
 
-    	QStringList prefixes;
+        QStringList prefixes;
 #ifndef Q_OS_WIN
         prefixes += "/usr";
-    	prefixes += "/usr/local";
+        prefixes += "/usr/local";
 #endif
         QString prefix = conf->getenv("PREFIX");
         if (!prefix.isEmpty()) {
             prefixes += prefix;
         }
 
-    	for(int n = 0; n < prefixes.count(); ++n)
-    	{
-    		const QString &prefix = prefixes[n];
-    		if(qca_try_lib(conf, prefix + "/include", prefix + "/lib", release, debug, &qca_crypto_prf))
-    		{
-    			conf->addExtra(qca_crypto_prf);
-    			return true;
-    		}
-    	}
-
-    	return false;
+        for (int n = 0; n < prefixes.count(); ++n) {
+            const QString &prefix = prefixes[n];
+            if (qca_try_lib(conf, prefix + "/include", prefix + "/lib", release, debug, &qca_crypto_prf)) {
+                conf->addExtra(qca_crypto_prf);
+                return true;
+            }
+        }
+
+        return false;
     }
 };
diff --git a/src/irisnet/corelib/netnames.cpp b/src/irisnet/corelib/netnames.cpp
index ddd2c29b..1dd97225 100644
--- a/src/irisnet/corelib/netnames.cpp
+++ b/src/irisnet/corelib/netnames.cpp
@@ -26,7 +26,6 @@
 #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
 #include <QRandomGenerator>
 #endif
-//#include <idna.h>
 #include <limits>
 
 //#define NETNAMES_DEBUG
diff --git a/src/irisnet/noncore/noncore.pro b/src/irisnet/noncore/noncore.pro
index 66676d00..29ee6f57 100644
--- a/src/irisnet/noncore/noncore.pro
+++ b/src/irisnet/noncore/noncore.pro
@@ -4,7 +4,7 @@ TEMPLATE = lib
 QT      -= gui
 TARGET   = irisnet
 DESTDIR  = $$IRIS_BASE/lib
-CONFIG  += staticlib create_prl
+CONFIG  += staticlib create_prl crypto
 
 VERSION = 1.0.0
 
diff --git a/src/xmpp/CMakeLists.txt b/src/xmpp/CMakeLists.txt
index c0a24b5b..ed079d2a 100644
--- a/src/xmpp/CMakeLists.txt
+++ b/src/xmpp/CMakeLists.txt
@@ -16,7 +16,6 @@ include_directories(
     ${ABS_PARENT_DIR}/irisnet/corelib
     xmpp-core
     xmpp-im
-    ${IDN_INCLUDE_DIRS}
     ${ZLIB_INCLUDE_DIRS}
     ${QCA_INCLUDES}
     )
@@ -203,7 +202,7 @@ if( SEPARATE_QJDNS AND WIN32)
     set(EXTRA_LDFLAGS ws2_32)
 endif()
 
-target_link_libraries(iris ${IDN_LIBRARY} ${ZLIB_LIBRARY} ${EXTRA_LDFLAGS})
+target_link_libraries(iris ${ZLIB_LIBRARY} ${EXTRA_LDFLAGS} stringprep)
 target_link_libraries(iris irisnet Qt5::Core Qt5::Gui Qt5::Network Qt5::Xml ${qca_LIB})
 target_compile_definitions(iris INTERFACE IRISNET_STATIC)
 target_include_directories(iris INTERFACE ${ABS_ROOT_DIR}/include ${ABS_ROOT_DIR}/include/iris ${ABS_PARENT_DIR})
diff --git a/src/xmpp/jid/jid.cpp b/src/xmpp/jid/jid.cpp
index e4d2f774..3bf2e83f 100644
--- a/src/xmpp/jid/jid.cpp
+++ b/src/xmpp/jid/jid.cpp
@@ -23,8 +23,8 @@
 #include "irisnetglobal_p.h"
 #endif
 
+#include "qstringprep.h"
 #include <QCoreApplication>
-#include <stringprep.h>
 
 using namespace XMPP;
 
@@ -51,16 +51,13 @@ bool StringPrepCache::nameprep(const QString &in, int maxbytes, QString &out)
         return true;
     }
 
-    QByteArray cs = in.toUtf8();
-    cs.resize(maxbytes);
-    if (stringprep(cs.data(), maxbytes, (Stringprep_profile_flags)0, stringprep_nameprep) != 0) {
+    out = in;
+    if (stringprep(out, (Stringprep_profile_flags)0, stringprep_nameprep) != 0 || out.size() > maxbytes) {
         that->nameprep_table.insert(in, QString());
         return false;
     }
 
-    QString norm = QString::fromUtf8(cs);
-    that->nameprep_table.insert(in, norm);
-    out = norm;
+    that->nameprep_table.insert(in, out);
     return true;
 }
 
@@ -82,16 +79,13 @@ bool StringPrepCache::nodeprep(const QString &in, int maxbytes, QString &out)
         return true;
     }
 
-    QByteArray cs = in.toUtf8();
-    cs.resize(maxbytes);
-    if (stringprep(cs.data(), maxbytes, (Stringprep_profile_flags)0, stringprep_xmpp_nodeprep) != 0) {
+    out = in;
+    if (stringprep(out, (Stringprep_profile_flags)0, stringprep_xmpp_nodeprep) != 0 || out.size() > maxbytes) {
         that->nodeprep_table.insert(in, QString());
         return false;
     }
 
-    QString norm = QString::fromUtf8(cs);
-    that->nodeprep_table.insert(in, norm);
-    out = norm;
+    that->nodeprep_table.insert(in, out);
     return true;
 }
 
@@ -113,16 +107,13 @@ bool StringPrepCache::resourceprep(const QString &in, int maxbytes, QString &out
         return true;
     }
 
-    QByteArray cs = in.toUtf8();
-    cs.resize(maxbytes);
-    if (stringprep(cs.data(), maxbytes, (Stringprep_profile_flags)0, stringprep_xmpp_resourceprep) != 0) {
+    out = in;
+    if (stringprep(out, (Stringprep_profile_flags)0, stringprep_xmpp_resourceprep) != 0 || out.size() > maxbytes) {
         that->resourceprep_table.insert(in, QString());
         return false;
     }
 
-    QString norm = QString::fromUtf8(cs);
-    that->resourceprep_table.insert(in, norm);
-    out = norm;
+    that->resourceprep_table.insert(in, out);
     return true;
 }
 
@@ -144,16 +135,13 @@ bool StringPrepCache::saslprep(const QString &in, int maxbytes, QString &out)
         return true;
     }
 
-    QByteArray cs = in.toUtf8();
-    cs.resize(maxbytes);
-    if (stringprep(cs.data(), maxbytes, (Stringprep_profile_flags)0, stringprep_saslprep) != 0) {
+    out = in;
+    if (stringprep(out, (Stringprep_profile_flags)0, stringprep_saslprep) != 0 || out.size() > maxbytes) {
         that->saslprep_table.insert(in, QString());
         return false;
     }
 
-    QString norm = QString::fromUtf8(cs);
-    that->saslprep_table.insert(in, norm);
-    out = norm;
+    that->saslprep_table.insert(in, out);
     return true;
 }
 
diff --git a/src/xmpp/modules.pri b/src/xmpp/modules.pri
index 9a31f009..cc0a3632 100644
--- a/src/xmpp/modules.pri
+++ b/src/xmpp/modules.pri
@@ -4,3 +4,4 @@ IRIS_XMPP_SASL_MODULE = $$PWD/sasl/sasl.pri
 IRIS_XMPP_BASE_MODULE = $$PWD/base/base.pri
 IRIS_XMPP_ZLIB_MODULE = $$PWD/zlib/zlib.pri
 IRIS_XMPP_BLAKE2_MODULE = $$PWD/blake2/blake2.pri
+IRIS_XMPP_STRINGPREP_MODULE = $$PWD/../../3rdparty/stringprep/stringprep.pri
diff --git a/src/xmpp/xmpp.pri b/src/xmpp/xmpp.pri
index 22d2c0b5..e5d2268e 100644
--- a/src/xmpp/xmpp.pri
+++ b/src/xmpp/xmpp.pri
@@ -17,6 +17,7 @@ include($$IRIS_XMPP_ZLIB_MODULE)
 include($$IRIS_XMPP_JID_MODULE)
 include($$IRIS_XMPP_SASL_MODULE)
 include($$IRIS_XMPP_BLAKE2_MODULE)
+include($$IRIS_XMPP_STRINGPREP_MODULE)
 
 DEFINES += XMPP_TEST
 
diff --git a/src/xmpp/xmpp.pro b/src/xmpp/xmpp.pro
index f9fe3c9a..32b0b236 100644
--- a/src/xmpp/xmpp.pro
+++ b/src/xmpp/xmpp.pro
@@ -4,7 +4,7 @@ TEMPLATE = lib
 #QT      -= gui
 TARGET   = iris
 DESTDIR  = $$IRIS_BASE/lib
-CONFIG  += staticlib create_prl
+CONFIG  += staticlib create_prl crypto
 OBJECTS_DIR = .obj
 MOC_DIR = .moc
 UI_DIR = .ui

From 2bbebcab0edf073b2732b6100caac4caf80f2183 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Thu, 9 Jul 2020 15:35:53 +0300
Subject: [PATCH 215/383] Remove accidently commited qtcreator project file for
 stringprep

---
 3rdparty/stringprep/CMakeLists.txt.user | 361 ------------------------
 1 file changed, 361 deletions(-)
 delete mode 100644 3rdparty/stringprep/CMakeLists.txt.user

diff --git a/3rdparty/stringprep/CMakeLists.txt.user b/3rdparty/stringprep/CMakeLists.txt.user
deleted file mode 100644
index 7e6a4fbf..00000000
--- a/3rdparty/stringprep/CMakeLists.txt.user
+++ /dev/null
@@ -1,361 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.12.4, 2020-07-09T00:49:31. -->
-<qtcreator>
- <data>
-  <variable>EnvironmentId</variable>
-  <value type="QByteArray">{e9dbd3dd-4147-44c5-8d24-28818ff28a88}</value>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.ActiveTarget</variable>
-  <value type="int">0</value>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.EditorSettings</variable>
-  <valuemap type="QVariantMap">
-   <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
-   <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
-   <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
-   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
-    <value type="QString" key="language">Cpp</value>
-    <valuemap type="QVariantMap" key="value">
-     <value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
-    </valuemap>
-   </valuemap>
-   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
-    <value type="QString" key="language">QmlJS</value>
-    <valuemap type="QVariantMap" key="value">
-     <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
-    </valuemap>
-   </valuemap>
-   <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
-   <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
-   <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
-   <value type="int" key="EditorConfiguration.IndentSize">4</value>
-   <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
-   <value type="int" key="EditorConfiguration.MarginColumn">80</value>
-   <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
-   <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
-   <value type="int" key="EditorConfiguration.PaddingMode">1</value>
-   <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
-   <value type="bool" key="EditorConfiguration.ShowMargin">false</value>
-   <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
-   <value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value>
-   <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
-   <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
-   <value type="int" key="EditorConfiguration.TabSize">8</value>
-   <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
-   <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
-   <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
-   <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
-   <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
-   <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
-  </valuemap>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.PluginSettings</variable>
-  <valuemap type="QVariantMap">
-   <valuelist type="QVariantList" key="ClangCodeModel.CustomCommandLineKey"/>
-   <value type="bool" key="ClangCodeModel.UseGlobalConfig">true</value>
-   <value type="QString" key="ClangCodeModel.WarningConfigId">Builtin.Questionable</value>
-   <valuemap type="QVariantMap" key="ClangTools">
-    <value type="bool" key="ClangTools.BuildBeforeAnalysis">true</value>
-    <value type="QString" key="ClangTools.DiagnosticConfig">Builtin.DefaultTidyAndClazy</value>
-    <value type="int" key="ClangTools.ParallelJobs">6</value>
-    <valuelist type="QVariantList" key="ClangTools.SelectedDirs"/>
-    <valuelist type="QVariantList" key="ClangTools.SelectedFiles"/>
-    <valuelist type="QVariantList" key="ClangTools.SuppressedDiagnostics"/>
-    <value type="bool" key="ClangTools.UseGlobalSettings">true</value>
-   </valuemap>
-  </valuemap>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.Target.0</variable>
-  <valuemap type="QVariantMap">
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 5.15.0 в PATH (qt5)</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Qt 5.15.0 в PATH (qt5)</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{f6433f79-d84b-4783-82dd-ce57d2700763}</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
-    <valuelist type="QVariantList" key="CMake.Configuration">
-     <value type="QString">CMAKE_BUILD_TYPE:STRING=Debug</value>
-     <value type="QString">CMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx}</value>
-     <value type="QString">CMAKE_C_COMPILER:STRING=%{Compiler:Executable:C}</value>
-     <value type="QString">CMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX}</value>
-     <value type="QString">QT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable}</value>
-    </valuelist>
-    <value type="int" key="EnableQmlDebugging">2</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/rion/projects/psi/git/iris/3rdparty/build-stringprep-Qt_5_15_0_PATH_qt5-Debug</value>
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
-      <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>
-      <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
-       <value type="QString">all</value>
-      </valuelist>
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
-     </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Сборка</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Сборка</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
-    </valuemap>
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
-      <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>
-      <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
-       <value type="QString">clean</value>
-      </valuelist>
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
-     </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Очистка</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Очистка</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
-    </valuemap>
-    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
-    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
-    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Отладка</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeBuildConfiguration</value>
-   </valuemap>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
-    <valuelist type="QVariantList" key="CMake.Configuration">
-     <value type="QString">CMAKE_BUILD_TYPE:STRING=Release</value>
-     <value type="QString">CMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx}</value>
-     <value type="QString">CMAKE_C_COMPILER:STRING=%{Compiler:Executable:C}</value>
-     <value type="QString">CMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX}</value>
-     <value type="QString">QT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable}</value>
-    </valuelist>
-    <value type="int" key="EnableQmlDebugging">2</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/rion/projects/psi/git/iris/3rdparty/build-stringprep-Qt_5_15_0_PATH_qt5-Release</value>
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
-      <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>
-      <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
-       <value type="QString">all</value>
-      </valuelist>
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
-     </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Сборка</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Сборка</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
-    </valuemap>
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
-      <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>
-      <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
-       <value type="QString">clean</value>
-      </valuelist>
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
-     </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Очистка</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Очистка</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
-    </valuemap>
-    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
-    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
-    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Выпуск</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeBuildConfiguration</value>
-   </valuemap>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
-    <valuelist type="QVariantList" key="CMake.Configuration">
-     <value type="QString">CMAKE_BUILD_TYPE:STRING=RelWithDebInfo</value>
-     <value type="QString">CMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx}</value>
-     <value type="QString">CMAKE_C_COMPILER:STRING=%{Compiler:Executable:C}</value>
-     <value type="QString">CMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX}</value>
-     <value type="QString">QT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable}</value>
-    </valuelist>
-    <value type="int" key="EnableQmlDebugging">2</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/rion/projects/psi/git/iris/3rdparty/build-stringprep-Qt_5_15_0_PATH_qt5-RelWithDebInfo</value>
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
-      <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>
-      <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
-       <value type="QString">all</value>
-      </valuelist>
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
-     </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Сборка</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Сборка</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
-    </valuemap>
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
-      <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>
-      <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
-       <value type="QString">clean</value>
-      </valuelist>
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
-     </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Очистка</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Очистка</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
-    </valuemap>
-    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
-    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
-    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Выпуск с отладочной информацией</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeBuildConfiguration</value>
-   </valuemap>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.3">
-    <valuelist type="QVariantList" key="CMake.Configuration">
-     <value type="QString">CMAKE_BUILD_TYPE:STRING=MinSizeRel</value>
-     <value type="QString">CMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx}</value>
-     <value type="QString">CMAKE_C_COMPILER:STRING=%{Compiler:Executable:C}</value>
-     <value type="QString">CMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX}</value>
-     <value type="QString">QT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable}</value>
-    </valuelist>
-    <value type="int" key="EnableQmlDebugging">2</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/rion/projects/psi/git/iris/3rdparty/build-stringprep-Qt_5_15_0_PATH_qt5-MinSizeRel</value>
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
-      <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>
-      <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
-       <value type="QString">all</value>
-      </valuelist>
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
-     </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Сборка</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Сборка</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
-    </valuemap>
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
-      <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>
-      <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
-       <value type="QString">clean</value>
-      </valuelist>
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
-     </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Очистка</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Очистка</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
-    </valuemap>
-    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
-    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
-    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Выпуск минимального размера</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeBuildConfiguration</value>
-   </valuemap>
-   <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">4</value>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Развёртывание</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Развёртывание</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
-    </valuemap>
-    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
-    <valuemap type="QVariantMap" key="ProjectExplorer.DeployConfiguration.CustomData"/>
-    <value type="bool" key="ProjectExplorer.DeployConfiguration.CustomDataEnabled">false</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
-   </valuemap>
-   <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
-    <value type="QString" key="Analyzer.Perf.CallgraphMode">dwarf</value>
-    <valuelist type="QVariantList" key="Analyzer.Perf.Events">
-     <value type="QString">cpu-cycles</value>
-    </valuelist>
-    <valuelist type="QVariantList" key="Analyzer.Perf.ExtraArguments"/>
-    <value type="int" key="Analyzer.Perf.Frequency">250</value>
-    <valuelist type="QVariantList" key="Analyzer.Perf.RecordArguments">
-     <value type="QString">-e</value>
-     <value type="QString">cpu-cycles</value>
-     <value type="QString">--call-graph</value>
-     <value type="QString">dwarf,4096</value>
-     <value type="QString">-F</value>
-     <value type="QString">250</value>
-    </valuelist>
-    <value type="QString" key="Analyzer.Perf.SampleMode">-F</value>
-    <value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>
-    <value type="int" key="Analyzer.Perf.StackSize">4096</value>
-    <value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
-    <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
-    <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value>
-    <value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
-    <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
-    <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
-    <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
-    <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
-    <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
-    <value type="QString" key="Analyzer.Valgrind.KCachegrindExecutable">kcachegrind</value>
-    <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
-    <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
-    <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
-    <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
-    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
-    <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
-    <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
-    <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
-    <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
-     <value type="int">0</value>
-     <value type="int">1</value>
-     <value type="int">2</value>
-     <value type="int">3</value>
-     <value type="int">4</value>
-     <value type="int">5</value>
-     <value type="int">6</value>
-     <value type="int">7</value>
-     <value type="int">8</value>
-     <value type="int">9</value>
-     <value type="int">10</value>
-     <value type="int">11</value>
-     <value type="int">12</value>
-     <value type="int">13</value>
-     <value type="int">14</value>
-    </valuelist>
-    <value type="int" key="PE.EnvironmentAspect.Base">2</value>
-    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
-    <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Executable"></value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value>
-    <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey"></value>
-    <value type="QString" key="RunConfiguration.Arguments"></value>
-    <value type="bool" key="RunConfiguration.Arguments.multi">false</value>
-    <value type="QString" key="RunConfiguration.OverrideDebuggerStartup"></value>
-    <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
-    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
-    <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
-    <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
-    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
-    <value type="QString" key="RunConfiguration.WorkingDirectory"></value>
-    <value type="QString" key="RunConfiguration.WorkingDirectory.default"></value>
-   </valuemap>
-   <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
-  </valuemap>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.TargetCount</variable>
-  <value type="int">1</value>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
-  <value type="int">22</value>
- </data>
- <data>
-  <variable>Version</variable>
-  <value type="int">22</value>
- </data>
-</qtcreator>

From 938ebbe0744584f017f63428722c6cd7cc2dc16a Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Thu, 9 Jul 2020 15:59:28 +0300
Subject: [PATCH 216/383] Use std::ptrdiff_t instead of qsizetype for backward
 compatibility

---
 3rdparty/stringprep/stringprep.cpp | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/3rdparty/stringprep/stringprep.cpp b/3rdparty/stringprep/stringprep.cpp
index a277391d..831a2622 100644
--- a/3rdparty/stringprep/stringprep.cpp
+++ b/3rdparty/stringprep/stringprep.cpp
@@ -30,6 +30,7 @@
 #include <QString>
 #include <QVector>
 
+#include <cstddef>
 #include <stdlib.h>
 
 #include "qstringprep.h"
@@ -43,8 +44,8 @@ static int _compare_table_element(const uint32_t *c, const Stringprep_table_elem
     return 0;
 }
 
-static qsizetype stringprep_find_character_in_table(uint32_t ucs4, const Stringprep_table_element *table,
-                                                    size_t table_size)
+static std::ptrdiff_t stringprep_find_character_in_table(uint32_t ucs4, const Stringprep_table_element *table,
+                                                         size_t table_size)
 {
     /* This is where typical uses of Libidn spends very close to all CPU
        time and causes most cache misses.  One could easily do a binary
@@ -64,7 +65,7 @@ static qsizetype stringprep_find_character_in_table(uint32_t ucs4, const Stringp
      * There are still ~2 million calls to bsearch() which make ~30% of CPU time used.
      * Most time is spent in _g_utf8_normalize_wc().
 
-    qsizetype i;
+    std::ptrdiff_t i;
 
     for (i = 0; table[i].start || table[i].end; i++)
       if (ucs4 >= table[i].start &&
@@ -79,11 +80,11 @@ static qsizetype stringprep_find_character_in_table(uint32_t ucs4, const Stringp
     return p ? (p - table) : -1;
 }
 
-static qsizetype stringprep_find_string_in_table(uint *ucs4, int len, size_t *tablepos,
-                                                 const Stringprep_table_element *table, size_t table_size)
+static std::ptrdiff_t stringprep_find_string_in_table(uint *ucs4, int len, size_t *tablepos,
+                                                      const Stringprep_table_element *table, size_t table_size)
 {
-    int       j;
-    qsizetype pos;
+    int            j;
+    std::ptrdiff_t pos;
 
     for (j = 0; j < len; j++)
         if ((pos = stringprep_find_character_in_table(ucs4[j], table, table_size)) != -1) {
@@ -98,10 +99,10 @@ static qsizetype stringprep_find_string_in_table(uint *ucs4, int len, size_t *ta
 static int stringprep_apply_table_to_string(QVector<uint> &ucs4, const Stringprep_table_element *table,
                                             size_t table_size)
 {
-    qsizetype pos;
-    size_t    i, maplen;
-    uint32_t *src    = ucs4.data(); /* points to unprocessed data */
-    size_t    srclen = ucs4.size(); /* length of unprocessed data */
+    std::ptrdiff_t pos;
+    size_t         i, maplen;
+    uint32_t *     src    = ucs4.data(); /* points to unprocessed data */
+    size_t         srclen = ucs4.size(); /* length of unprocessed data */
 
     while ((pos = stringprep_find_string_in_table(src, srclen, &i, table, table_size)) != -1) {
         for (maplen = STRINGPREP_MAX_MAP_CHARS; maplen > 0 && table[i].map[maplen - 1] == 0; maplen--)
@@ -158,9 +159,9 @@ static int stringprep_apply_table_to_string(QVector<uint> &ucs4, const Stringpre
  **/
 int stringprep_4i(QString &input, Stringprep_profile_flags flags, const Stringprep_profile *profile)
 {
-    size_t        i, j;
-    qsizetype     k;
-    QVector<uint> ucs4vector = input.toUcs4();
+    size_t         i, j;
+    std::ptrdiff_t k;
+    QVector<uint>  ucs4vector = input.toUcs4();
     // size_t        ucs4len    = ucs4vector.size();
     ucs4vector.reserve(ucs4vector.size() * 2); // to pass nfkc
     // uint32_t *ucs4 = ucs4vector.data();

From ce1ef4f91e6832451a7a0d4bc34b499e1edd5398 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Fri, 10 Jul 2020 00:02:10 +0300
Subject: [PATCH 217/383] Fix bundled stringprep compilation with Visual Studio

---
 3rdparty/stringprep/CMakeLists.txt | 2 +-
 3rdparty/stringprep/qstringprep.h  | 2 +-
 3rdparty/stringprep/stringprep.cpp | 6 +++---
 CMakeLists.txt                     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/3rdparty/stringprep/CMakeLists.txt b/3rdparty/stringprep/CMakeLists.txt
index 1f2ddd69..8120cce8 100644
--- a/3rdparty/stringprep/CMakeLists.txt
+++ b/3rdparty/stringprep/CMakeLists.txt
@@ -18,7 +18,7 @@ add_library(stringprep STATIC
   profiles.cpp
   rfc3454.cpp
 )
-target_compile_definitions(stringprep PRIVATE LIBIDN_BUILDING)
+target_compile_definitions(stringprep PRIVATE QSTRINGPREP_BUILDING)
 target_include_directories(stringprep PUBLIC
   ${CMAKE_CURRENT_SOURCE_DIR}
 )
diff --git a/3rdparty/stringprep/qstringprep.h b/3rdparty/stringprep/qstringprep.h
index 8edd9536..7bb84f0c 100644
--- a/3rdparty/stringprep/qstringprep.h
+++ b/3rdparty/stringprep/qstringprep.h
@@ -32,7 +32,7 @@
 
 #include <QtCore/QtGlobal>
 
-#if defined(LIBIDN_BUILDING)
+#if defined(QSTRINGPREP_BUILDING)
 #define IDNAPI Q_DECL_EXPORT
 #else
 #define IDNAPI Q_DECL_IMPORT
diff --git a/3rdparty/stringprep/stringprep.cpp b/3rdparty/stringprep/stringprep.cpp
index 831a2622..f5793f69 100644
--- a/3rdparty/stringprep/stringprep.cpp
+++ b/3rdparty/stringprep/stringprep.cpp
@@ -80,10 +80,10 @@ static std::ptrdiff_t stringprep_find_character_in_table(uint32_t ucs4, const St
     return p ? (p - table) : -1;
 }
 
-static std::ptrdiff_t stringprep_find_string_in_table(uint *ucs4, int len, size_t *tablepos,
+static std::ptrdiff_t stringprep_find_string_in_table(uint *ucs4, size_t len, size_t *tablepos,
                                                       const Stringprep_table_element *table, size_t table_size)
 {
-    int            j;
+    size_t         j;
     std::ptrdiff_t pos;
 
     for (j = 0; j < len; j++)
@@ -109,7 +109,7 @@ static int stringprep_apply_table_to_string(QVector<uint> &ucs4, const Stringpre
             ;
 
         if (maplen > 1) {
-            ucs4.resize(ucs4.size() + maplen - 1);
+            ucs4.resize(ucs4.size() + int(maplen) - 1);
         }
 
         memmove(src + pos + maplen, src + pos + 1, sizeof(uint32_t) * (srclen - pos - 1));
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5fe06ff6..36906670 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -130,7 +130,7 @@ if(B2_FOUND)
     message(STATUS "Found B2: ${B2_LIBRARY}")
 endif()
 
-add_definitions(-DIRISNET_STATIC)
+add_definitions(-DIRISNET_STATIC -DQSTRINGPREP_BUILDING)
 
 add_subdirectory(3rdparty/stringprep)
 add_subdirectory(src/irisnet)

From a91927d954d216463c7f475dae48e619aba0edb8 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 13 Jul 2020 20:26:06 +0300
Subject: [PATCH 218/383] Added a couple useless files from libidn package to
 satisfy Debian policies

---
 3rdparty/stringprep/README.md                |    2 +
 3rdparty/stringprep/gen-stringprep-tables.pl |  130 +
 3rdparty/stringprep/rfc3454.txt              | 3246 ++++++++++++++++++
 3 files changed, 3378 insertions(+)
 create mode 100755 3rdparty/stringprep/gen-stringprep-tables.pl
 create mode 100644 3rdparty/stringprep/rfc3454.txt

diff --git a/3rdparty/stringprep/README.md b/3rdparty/stringprep/README.md
index e9b753b4..db1401bb 100644
--- a/3rdparty/stringprep/README.md
+++ b/3rdparty/stringprep/README.md
@@ -1,3 +1,5 @@
 This is a stringprep library extracted from LibIDN and slightly rewritten to use Qt's unicode support instead glib's one.
 
 The current version corresponds to 86e84739c5186faf3722a0f42e1e2db27870b3a5 commit of git://git.savannah.gnu.org/libidn.git
+
+Note this directory contains generated rfc3454 files from rfc3454.txt. It's very unlikely these files will ever be regenerated but just in case the directory also contains both rfc3454.txt and a perl script to generate the files.
diff --git a/3rdparty/stringprep/gen-stringprep-tables.pl b/3rdparty/stringprep/gen-stringprep-tables.pl
new file mode 100755
index 00000000..13eaef64
--- /dev/null
+++ b/3rdparty/stringprep/gen-stringprep-tables.pl
@@ -0,0 +1,130 @@
+#! /usr/bin/perl -w
+
+# Copyright (C) 2002-2016 Simon Josefsson
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# I consider the output of this program to be unrestricted.  Use it as
+# you will.
+
+use strict;
+
+my ($tab) = 59;
+my ($intable) = 0;
+my ($entries) = 0;
+my ($tablename);
+my ($varname);
+my ($starheader, $header);
+my ($profile) = "rfc3454";
+my ($filename) = "$profile.c";
+my ($headername) = "$profile.h";
+my ($line, $start, $end, @map);
+
+open(FH, ">$filename") or die "cannot open $filename for writing";
+
+print FH "/* This file is automatically generated.  DO NOT EDIT!\n";
+print FH "   Instead, edit gen-stringprep-tables.pl and re-run.  */\n\n";
+
+print FH "#include <config.h>\n";
+print FH "#include \"stringprep.h\"\n";
+
+open(FHH, ">$headername") or die "cannot open $headername for writing";
+print FHH "/* This file is automatically generated.  DO NOT EDIT!\n";
+print FHH "   Instead, edit gen-stringprep-tables.pl and re-run.  */\n\n";
+
+while(<>) {
+    s/^   (.*)/$1/g; # for rfc
+    $line = $_;
+
+    die "already in table" if $intable && m,^----- Start Table (.*) -----,;
+    die "not in table" if !$intable && m,^----- End Table (.*) -----,;
+
+    if ($intable && m,^----- End Table (.*) -----,) {
+	die "table error" unless $1 eq $tablename ||
+	    ($1 eq "C.1.2" && $tablename eq "C.1.1"); # Typo in draft
+	print FH "  { 0 },\n";
+	print FH "};\n\n";
+	print FHH "#define N_STRINGPREP_${profile}_${varname} ${entries}\n";
+	$intable = 0;
+   $entries = 0;
+    }
+
+    if (m,^[A-Z],) {
+	$header = $line;
+    } elsif (!m,^[ -],) {
+	$header .= $line;
+    }
+
+    next unless ($intable || m,^----- Start Table (.*) -----,);
+
+    if ($intable) {
+	$_ = $line;
+	chop $line;
+
+	next if m,^$,;
+	next if m,^Hoffman & Blanchet          Standards Track                    \[Page [0-9]+\]$,;
+	next if m,^$,;
+	next if m,RFC 3454        Preparation of Internationalized Strings   December 2002,;
+
+	die "regexp failed on line: $line" unless
+	    m,^([0-9A-F]+)(-([0-9A-F]+))?(; ([0-9A-F]+)( ([0-9A-F]+))?( ([0-9A-F]+))?( ([0-9A-F]+))?;)?,;
+
+	die "too many mapping targets on line: $line" if $12;
+
+	$start = $1;
+	$end = $3;
+	$map[0] = $5;
+	$map[1] = $7;
+	$map[2] = $9;
+	$map[3] = $11;
+
+	die "tables tried to map a range" if $end && $map[0];
+
+	if ($map[3]) {
+	    printf FH "  { 0x%06s, 0x%06s, { 0x%06s,%*s/* %s */\n                   0x%06s, 0x%06s, 0x%06s }},\n",
+	    $start, $start, $map[0], $tab-length($line)-13, " ", $line,
+	    $map[1], $map[2], $map[3];
+	} elsif ($map[2]) {
+	    printf FH "  { 0x%06s, 0x%06s, { 0x%06s,%*s/* %s */\n                   0x%06s, 0x%06s }},\n",
+	    $start, $start, $map[0], $tab-length($line)-14, " ", $line,
+	    $map[1], $map[2];
+	} elsif ($map[1]) {
+	    printf FH "  { 0x%06s, 0x%06s, { 0x%06s,%*s/* %s */\n                   0x%06s }},\n",
+	    $start, $start, $map[0], $tab-length($line)-14, " ", $line,
+	    $map[1];
+	} elsif ($map[0]) {
+	    printf FH "  { 0x%06s, 0x%06s, { 0x%06s }},%*s/* %s */\n",
+	    $start, $start, $map[0], $tab-length($line)-17, " ",  $line;
+	} elsif ($end) {
+	    printf FH "  { 0x%06s, 0x%06s },%*s/* %s */\n",
+	    $start, $end, $tab-length($line)-11, " ",  $line;
+	} else {
+	    printf FH "  { 0x%06s, 0x%06s },%*s/* %s */\n",
+	    $start, $start, $tab-length($line)-11, " ",  $line;
+	}
+   $entries++;
+    } else {
+	$intable = 1 if !$intable;
+	$tablename = $1;
+
+	($varname = $tablename) =~ tr/./_/;
+	$header =~ s/\n/\n * /s;
+
+	print FH "\n/*\n * $header */\n\n";
+	print FH "const Stringprep_table_element stringprep_${profile}_${varname}\[\] = {\n";
+    }
+}
+
+close FHH or die "cannot close $headername";
+close FH or die "cannot close $filename";
diff --git a/3rdparty/stringprep/rfc3454.txt b/3rdparty/stringprep/rfc3454.txt
new file mode 100644
index 00000000..bdf8edb5
--- /dev/null
+++ b/3rdparty/stringprep/rfc3454.txt
@@ -0,0 +1,3246 @@
+Below there are data tables extracted from RFC 3454.  The license for
+RFC 3454 is:
+
+   Copyright (C) The Internet Society (2002).  All Rights Reserved.
+
+   This document and translations of it may be copied and furnished to
+   others, and derivative works that comment on or otherwise explain it
+   or assist in its implementation may be prepared, copied, published
+   and distributed, in whole or in part, without restriction of any
+   kind, provided that the above copyright notice and this paragraph are
+   included on all such copies and derivative works.  However, this
+   document itself may not be modified in any way, such as by removing
+   the copyright notice or references to the Internet Society or other
+   Internet organizations, except as needed for the purpose of
+   developing Internet standards in which case the procedures for
+   copyrights defined in the Internet Standards process must be
+   followed, or as required to translate it into languages other than
+   English.
+
+   The limited permissions granted above are perpetual and will not be
+   revoked by the Internet Society or its successors or assigns.
+
+   This document and the information contained herein is provided on an
+   "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING
+   TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
+   BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION
+   HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
+   MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+Unfortunately, that license is non-free according to
+licensing@fsf.org:
+
+ From: "Dave Turner via RT" <licensing@fsf.org>
+ Date: Thu, 08 Dec 2005 16:33:57 -0500
+ Subject: [gnu.org #211910] Are RFC specifications freely licensed? 
+
+ > Hi Dave!  I know this is an old issue (last post in this thread was
+ > about a year ago), but have you heard back from the licensing
+ > committee on the RFC 2026 and RFC 3978 licenses?
+
+ Sorry for the delay.  The old terms are officially non-free.
+
+However, to be copyrightable there needs to be some originality, which
+isn't present here, see:
+
+ From: "novalis@fsf.org via RT" <licensing@fsf.org>
+ Subject: Re: [gnu.org #211910] Are RFC specifications freely licensed?
+ Date: Thu, 06 Jan 2005 18:32:02 -0500
+
+ >> >> > If not, it's entirely possible that they're not copyrightable, or that
+ >> >> > they have very thin protection.  I would need to see them specifically
+ >> >> > to be able to determine this.
+ >> >> 
+ >> >> The table fall under the old license.  The ASN.1 schema fall under the
+ >> >> new license.  I'm attaching the tables, and the ASN.1 schema below.
+ >> >> If it matters: Some tables are derived from Unicode tables, and some
+ >> >> were probably created by hand.
+ >> >
+ >> > It looks to me like these tables do not have enough originality to be
+ >> > copyrightable.  The text surrounding them ("The following is the mapping
+ >> > table from section 3....") is probably minimally original and should be
+ >> > removed.
+ >> 
+ >> Are you sure about this?  I'm looking for something strong than "It
+ >> looks".  The tables were not trivial to create, it took the IETF some
+ >> time (years) to arrive with the final tables.  Perhaps the tables
+ >> could be argued to contain some artistic value.  But I'm not an expert
+ >> on this, so these are just my thoughts.
+ >
+ > I'm not a lawyer.  This isn't legal advice.  If you need legal advice,
+ > talk to a lawyer.  I can get a second opinion on this from our lawyers,
+ > if you think it's important, but it still won't be legal advice.
+ > 
+ > From a copyright perspective, the time and effort ("sweat of the brow")
+ > that a given thing takes don't matter (Fiest v. Rural Telephone
+ > Service).  What matters is the originality.  
+ >
+ > I don't see a lot here that's original.  The names are probably
+ > original, but names are generally unprotected.  And if the names are
+ > needed for compatibility, the scenes a faire doctrine comes into play.  
+
+ Right, the names are not required, only the actual numbers are.
+
+ Thanks, this information seem to solve my problem for the source code
+ in libidn.
+
+So we can use this material.  There may be other legal analysis that
+also reach the same conclusion.
+
+   ----- Start Table A.1 -----
+   0221
+   0234-024F
+   02AE-02AF
+   02EF-02FF
+   0350-035F
+   0370-0373
+   0376-0379
+   037B-037D
+   037F-0383
+   038B
+   038D
+   03A2
+   03CF
+   03F7-03FF
+   0487
+   04CF
+   04F6-04F7
+   04FA-04FF
+   0510-0530
+   0557-0558
+   0560
+   0588
+   058B-0590
+   05A2
+   05BA
+   05C5-05CF
+   05EB-05EF
+   05F5-060B
+   060D-061A
+   061C-061E
+   0620
+   063B-063F
+   0656-065F
+   06EE-06EF
+   06FF
+   070E
+   072D-072F
+   074B-077F
+   07B2-0900
+   0904
+   093A-093B
+   094E-094F
+   0955-0957
+   0971-0980
+   0984
+   098D-098E
+   0991-0992
+   09A9
+   09B1
+   09B3-09B5
+   09BA-09BB
+   09BD
+   09C5-09C6
+   09C9-09CA
+   09CE-09D6
+   09D8-09DB
+   09DE
+   09E4-09E5
+   09FB-0A01
+   0A03-0A04
+   0A0B-0A0E
+   0A11-0A12
+   0A29
+   0A31
+   0A34
+   0A37
+   0A3A-0A3B
+   0A3D
+   0A43-0A46
+   0A49-0A4A
+   0A4E-0A58
+   0A5D
+   0A5F-0A65
+   0A75-0A80
+   0A84
+   0A8C
+   0A8E
+   0A92
+   0AA9
+   0AB1
+   0AB4
+   0ABA-0ABB
+   0AC6
+   0ACA
+   0ACE-0ACF
+   0AD1-0ADF
+   0AE1-0AE5
+   0AF0-0B00
+   0B04
+   0B0D-0B0E
+   0B11-0B12
+   0B29
+   0B31
+   0B34-0B35
+   0B3A-0B3B
+   0B44-0B46
+   0B49-0B4A
+   0B4E-0B55
+   0B58-0B5B
+   0B5E
+   0B62-0B65
+   0B71-0B81
+   0B84
+   0B8B-0B8D
+   0B91
+   0B96-0B98
+   0B9B
+   0B9D
+   0BA0-0BA2
+   0BA5-0BA7
+   0BAB-0BAD
+   0BB6
+   0BBA-0BBD
+   0BC3-0BC5
+   0BC9
+   0BCE-0BD6
+   0BD8-0BE6
+   0BF3-0C00
+   0C04
+   0C0D
+   0C11
+   0C29
+   0C34
+   0C3A-0C3D
+   0C45
+   0C49
+   0C4E-0C54
+   0C57-0C5F
+   0C62-0C65
+   0C70-0C81
+   0C84
+   0C8D
+   0C91
+   0CA9
+   0CB4
+   0CBA-0CBD
+   0CC5
+   0CC9
+   0CCE-0CD4
+   0CD7-0CDD
+   0CDF
+   0CE2-0CE5
+   0CF0-0D01
+   0D04
+   0D0D
+   0D11
+   0D29
+   0D3A-0D3D
+   0D44-0D45
+   0D49
+   0D4E-0D56
+   0D58-0D5F
+   0D62-0D65
+   0D70-0D81
+   0D84
+   0D97-0D99
+   0DB2
+   0DBC
+   0DBE-0DBF
+   0DC7-0DC9
+   0DCB-0DCE
+   0DD5
+   0DD7
+   0DE0-0DF1
+   0DF5-0E00
+   0E3B-0E3E
+   0E5C-0E80
+   0E83
+   0E85-0E86
+   0E89
+   0E8B-0E8C
+   0E8E-0E93
+   0E98
+   0EA0
+   0EA4
+   0EA6
+   0EA8-0EA9
+   0EAC
+   0EBA
+   0EBE-0EBF
+   0EC5
+   0EC7
+   0ECE-0ECF
+   0EDA-0EDB
+   0EDE-0EFF
+   0F48
+   0F6B-0F70
+   0F8C-0F8F
+   0F98
+   0FBD
+   0FCD-0FCE
+   0FD0-0FFF
+   1022
+   1028
+   102B
+   1033-1035
+   103A-103F
+   105A-109F
+   10C6-10CF
+   10F9-10FA
+   10FC-10FF
+   115A-115E
+   11A3-11A7
+   11FA-11FF
+   1207
+   1247
+   1249
+   124E-124F
+   1257
+   1259
+   125E-125F
+   1287
+   1289
+   128E-128F
+   12AF
+   12B1
+   12B6-12B7
+   12BF
+   12C1
+   12C6-12C7
+   12CF
+   12D7
+   12EF
+   130F
+   1311
+   1316-1317
+   131F
+   1347
+   135B-1360
+   137D-139F
+   13F5-1400
+   1677-167F
+   169D-169F
+   16F1-16FF
+   170D
+   1715-171F
+   1737-173F
+   1754-175F
+   176D
+   1771
+   1774-177F
+   17DD-17DF
+   17EA-17FF
+   180F
+   181A-181F
+   1878-187F
+   18AA-1DFF
+   1E9C-1E9F
+   1EFA-1EFF
+   1F16-1F17
+   1F1E-1F1F
+   1F46-1F47
+   1F4E-1F4F
+   1F58
+   1F5A
+   1F5C
+   1F5E
+   1F7E-1F7F
+   1FB5
+   1FC5
+   1FD4-1FD5
+   1FDC
+   1FF0-1FF1
+   1FF5
+   1FFF
+   2053-2056
+   2058-205E
+   2064-2069
+   2072-2073
+   208F-209F
+   20B2-20CF
+   20EB-20FF
+   213B-213C
+   214C-2152
+   2184-218F
+   23CF-23FF
+   2427-243F
+   244B-245F
+   24FF
+   2614-2615
+   2618
+   267E-267F
+   268A-2700
+   2705
+   270A-270B
+   2728
+   274C
+   274E
+   2753-2755
+   2757
+   275F-2760
+   2795-2797
+   27B0
+   27BF-27CF
+   27EC-27EF
+   2B00-2E7F
+   2E9A
+   2EF4-2EFF
+   2FD6-2FEF
+   2FFC-2FFF
+   3040
+   3097-3098
+   3100-3104
+   312D-3130
+   318F
+   31B8-31EF
+   321D-321F
+   3244-3250
+   327C-327E
+   32CC-32CF
+   32FF
+   3377-337A
+   33DE-33DF
+   33FF
+   4DB6-4DFF
+   9FA6-9FFF
+   A48D-A48F
+   A4C7-ABFF
+   D7A4-D7FF
+   FA2E-FA2F
+   FA6B-FAFF
+   FB07-FB12
+   FB18-FB1C
+   FB37
+   FB3D
+   FB3F
+   FB42
+   FB45
+   FBB2-FBD2
+   FD40-FD4F
+   FD90-FD91
+   FDC8-FDCF
+   FDFD-FDFF
+   FE10-FE1F
+   FE24-FE2F
+   FE47-FE48
+   FE53
+   FE67
+   FE6C-FE6F
+   FE75
+   FEFD-FEFE
+   FF00
+   FFBF-FFC1
+   FFC8-FFC9
+   FFD0-FFD1
+   FFD8-FFD9
+   FFDD-FFDF
+   FFE7
+   FFEF-FFF8
+   10000-102FF
+   1031F
+   10324-1032F
+   1034B-103FF
+   10426-10427
+   1044E-1CFFF
+   1D0F6-1D0FF
+   1D127-1D129
+   1D1DE-1D3FF
+   1D455
+   1D49D
+   1D4A0-1D4A1
+   1D4A3-1D4A4
+   1D4A7-1D4A8
+   1D4AD
+   1D4BA
+   1D4BC
+   1D4C1
+   1D4C4
+   1D506
+   1D50B-1D50C
+   1D515
+   1D51D
+   1D53A
+   1D53F
+   1D545
+   1D547-1D549
+   1D551
+   1D6A4-1D6A7
+   1D7CA-1D7CD
+   1D800-1FFFD
+   2A6D7-2F7FF
+   2FA1E-2FFFD
+   30000-3FFFD
+   40000-4FFFD
+   50000-5FFFD
+   60000-6FFFD
+   70000-7FFFD
+   80000-8FFFD
+   90000-9FFFD
+   A0000-AFFFD
+   B0000-BFFFD
+   C0000-CFFFD
+   D0000-DFFFD
+   E0000
+   E0002-E001F
+   E0080-EFFFD
+   ----- End Table A.1 -----
+
+   ----- Start Table B.1 -----
+   00AD; ; Map to nothing
+   034F; ; Map to nothing
+   1806; ; Map to nothing
+   180B; ; Map to nothing
+   180C; ; Map to nothing
+   180D; ; Map to nothing
+   200B; ; Map to nothing
+   200C; ; Map to nothing
+   200D; ; Map to nothing
+   2060; ; Map to nothing
+   FE00; ; Map to nothing
+   FE01; ; Map to nothing
+   FE02; ; Map to nothing
+   FE03; ; Map to nothing
+   FE04; ; Map to nothing
+   FE05; ; Map to nothing
+   FE06; ; Map to nothing
+   FE07; ; Map to nothing
+   FE08; ; Map to nothing
+   FE09; ; Map to nothing
+   FE0A; ; Map to nothing
+   FE0B; ; Map to nothing
+   FE0C; ; Map to nothing
+   FE0D; ; Map to nothing
+   FE0E; ; Map to nothing
+   FE0F; ; Map to nothing
+   FEFF; ; Map to nothing
+   ----- End Table B.1 -----
+
+   ----- Start Table B.2 -----
+   0041; 0061; Case map
+   0042; 0062; Case map
+   0043; 0063; Case map
+   0044; 0064; Case map
+   0045; 0065; Case map
+   0046; 0066; Case map
+   0047; 0067; Case map
+   0048; 0068; Case map
+   0049; 0069; Case map
+   004A; 006A; Case map
+   004B; 006B; Case map
+   004C; 006C; Case map
+   004D; 006D; Case map
+   004E; 006E; Case map
+   004F; 006F; Case map
+   0050; 0070; Case map
+   0051; 0071; Case map
+   0052; 0072; Case map
+   0053; 0073; Case map
+   0054; 0074; Case map
+   0055; 0075; Case map
+   0056; 0076; Case map
+   0057; 0077; Case map
+   0058; 0078; Case map
+   0059; 0079; Case map
+   005A; 007A; Case map
+   00B5; 03BC; Case map
+   00C0; 00E0; Case map
+   00C1; 00E1; Case map
+   00C2; 00E2; Case map
+   00C3; 00E3; Case map
+   00C4; 00E4; Case map
+   00C5; 00E5; Case map
+   00C6; 00E6; Case map
+   00C7; 00E7; Case map
+   00C8; 00E8; Case map
+   00C9; 00E9; Case map
+   00CA; 00EA; Case map
+   00CB; 00EB; Case map
+   00CC; 00EC; Case map
+   00CD; 00ED; Case map
+   00CE; 00EE; Case map
+   00CF; 00EF; Case map
+   00D0; 00F0; Case map
+   00D1; 00F1; Case map
+   00D2; 00F2; Case map
+   00D3; 00F3; Case map
+   00D4; 00F4; Case map
+   00D5; 00F5; Case map
+   00D6; 00F6; Case map
+   00D8; 00F8; Case map
+   00D9; 00F9; Case map
+   00DA; 00FA; Case map
+   00DB; 00FB; Case map
+   00DC; 00FC; Case map
+   00DD; 00FD; Case map
+   00DE; 00FE; Case map
+   00DF; 0073 0073; Case map
+   0100; 0101; Case map
+   0102; 0103; Case map
+   0104; 0105; Case map
+   0106; 0107; Case map
+   0108; 0109; Case map
+   010A; 010B; Case map
+   010C; 010D; Case map
+   010E; 010F; Case map
+   0110; 0111; Case map
+   0112; 0113; Case map
+   0114; 0115; Case map
+   0116; 0117; Case map
+   0118; 0119; Case map
+   011A; 011B; Case map
+   011C; 011D; Case map
+   011E; 011F; Case map
+   0120; 0121; Case map
+   0122; 0123; Case map
+   0124; 0125; Case map
+   0126; 0127; Case map
+   0128; 0129; Case map
+   012A; 012B; Case map
+   012C; 012D; Case map
+   012E; 012F; Case map
+   0130; 0069 0307; Case map
+   0132; 0133; Case map
+   0134; 0135; Case map
+   0136; 0137; Case map
+   0139; 013A; Case map
+   013B; 013C; Case map
+   013D; 013E; Case map
+   013F; 0140; Case map
+   0141; 0142; Case map
+   0143; 0144; Case map
+   0145; 0146; Case map
+   0147; 0148; Case map
+   0149; 02BC 006E; Case map
+   014A; 014B; Case map
+   014C; 014D; Case map
+   014E; 014F; Case map
+   0150; 0151; Case map
+   0152; 0153; Case map
+   0154; 0155; Case map
+   0156; 0157; Case map
+   0158; 0159; Case map
+   015A; 015B; Case map
+   015C; 015D; Case map
+   015E; 015F; Case map
+   0160; 0161; Case map
+   0162; 0163; Case map
+   0164; 0165; Case map
+   0166; 0167; Case map
+   0168; 0169; Case map
+   016A; 016B; Case map
+   016C; 016D; Case map
+   016E; 016F; Case map
+   0170; 0171; Case map
+   0172; 0173; Case map
+   0174; 0175; Case map
+   0176; 0177; Case map
+   0178; 00FF; Case map
+   0179; 017A; Case map
+   017B; 017C; Case map
+   017D; 017E; Case map
+   017F; 0073; Case map
+   0181; 0253; Case map
+   0182; 0183; Case map
+   0184; 0185; Case map
+   0186; 0254; Case map
+   0187; 0188; Case map
+   0189; 0256; Case map
+   018A; 0257; Case map
+   018B; 018C; Case map
+   018E; 01DD; Case map
+   018F; 0259; Case map
+   0190; 025B; Case map
+   0191; 0192; Case map
+   0193; 0260; Case map
+   0194; 0263; Case map
+   0196; 0269; Case map
+   0197; 0268; Case map
+   0198; 0199; Case map
+   019C; 026F; Case map
+   019D; 0272; Case map
+   019F; 0275; Case map
+   01A0; 01A1; Case map
+   01A2; 01A3; Case map
+   01A4; 01A5; Case map
+   01A6; 0280; Case map
+   01A7; 01A8; Case map
+   01A9; 0283; Case map
+   01AC; 01AD; Case map
+   01AE; 0288; Case map
+   01AF; 01B0; Case map
+   01B1; 028A; Case map
+   01B2; 028B; Case map
+   01B3; 01B4; Case map
+   01B5; 01B6; Case map
+   01B7; 0292; Case map
+   01B8; 01B9; Case map
+   01BC; 01BD; Case map
+   01C4; 01C6; Case map
+   01C5; 01C6; Case map
+   01C7; 01C9; Case map
+   01C8; 01C9; Case map
+   01CA; 01CC; Case map
+   01CB; 01CC; Case map
+   01CD; 01CE; Case map
+   01CF; 01D0; Case map
+   01D1; 01D2; Case map
+   01D3; 01D4; Case map
+   01D5; 01D6; Case map
+   01D7; 01D8; Case map
+   01D9; 01DA; Case map
+   01DB; 01DC; Case map
+   01DE; 01DF; Case map
+   01E0; 01E1; Case map
+   01E2; 01E3; Case map
+   01E4; 01E5; Case map
+   01E6; 01E7; Case map
+   01E8; 01E9; Case map
+   01EA; 01EB; Case map
+   01EC; 01ED; Case map
+   01EE; 01EF; Case map
+   01F0; 006A 030C; Case map
+   01F1; 01F3; Case map
+   01F2; 01F3; Case map
+   01F4; 01F5; Case map
+   01F6; 0195; Case map
+   01F7; 01BF; Case map
+   01F8; 01F9; Case map
+   01FA; 01FB; Case map
+   01FC; 01FD; Case map
+   01FE; 01FF; Case map
+   0200; 0201; Case map
+   0202; 0203; Case map
+   0204; 0205; Case map
+   0206; 0207; Case map
+   0208; 0209; Case map
+   020A; 020B; Case map
+   020C; 020D; Case map
+   020E; 020F; Case map
+   0210; 0211; Case map
+   0212; 0213; Case map
+   0214; 0215; Case map
+   0216; 0217; Case map
+   0218; 0219; Case map
+   021A; 021B; Case map
+   021C; 021D; Case map
+   021E; 021F; Case map
+   0220; 019E; Case map
+   0222; 0223; Case map
+   0224; 0225; Case map
+   0226; 0227; Case map
+   0228; 0229; Case map
+   022A; 022B; Case map
+   022C; 022D; Case map
+   022E; 022F; Case map
+   0230; 0231; Case map
+   0232; 0233; Case map
+   0345; 03B9; Case map
+   037A; 0020 03B9; Additional folding
+   0386; 03AC; Case map
+   0388; 03AD; Case map
+   0389; 03AE; Case map
+   038A; 03AF; Case map
+   038C; 03CC; Case map
+   038E; 03CD; Case map
+   038F; 03CE; Case map
+   0390; 03B9 0308 0301; Case map
+   0391; 03B1; Case map
+   0392; 03B2; Case map
+   0393; 03B3; Case map
+   0394; 03B4; Case map
+   0395; 03B5; Case map
+   0396; 03B6; Case map
+   0397; 03B7; Case map
+   0398; 03B8; Case map
+   0399; 03B9; Case map
+   039A; 03BA; Case map
+   039B; 03BB; Case map
+   039C; 03BC; Case map
+   039D; 03BD; Case map
+   039E; 03BE; Case map
+   039F; 03BF; Case map
+   03A0; 03C0; Case map
+   03A1; 03C1; Case map
+   03A3; 03C3; Case map
+   03A4; 03C4; Case map
+   03A5; 03C5; Case map
+   03A6; 03C6; Case map
+   03A7; 03C7; Case map
+   03A8; 03C8; Case map
+   03A9; 03C9; Case map
+   03AA; 03CA; Case map
+   03AB; 03CB; Case map
+   03B0; 03C5 0308 0301; Case map
+   03C2; 03C3; Case map
+   03D0; 03B2; Case map
+   03D1; 03B8; Case map
+   03D2; 03C5; Additional folding
+   03D3; 03CD; Additional folding
+   03D4; 03CB; Additional folding
+   03D5; 03C6; Case map
+   03D6; 03C0; Case map
+   03D8; 03D9; Case map
+   03DA; 03DB; Case map
+   03DC; 03DD; Case map
+   03DE; 03DF; Case map
+   03E0; 03E1; Case map
+   03E2; 03E3; Case map
+   03E4; 03E5; Case map
+   03E6; 03E7; Case map
+   03E8; 03E9; Case map
+   03EA; 03EB; Case map
+   03EC; 03ED; Case map
+   03EE; 03EF; Case map
+   03F0; 03BA; Case map
+   03F1; 03C1; Case map
+   03F2; 03C3; Case map
+   03F4; 03B8; Case map
+   03F5; 03B5; Case map
+   0400; 0450; Case map
+   0401; 0451; Case map
+   0402; 0452; Case map
+   0403; 0453; Case map
+   0404; 0454; Case map
+   0405; 0455; Case map
+   0406; 0456; Case map
+   0407; 0457; Case map
+   0408; 0458; Case map
+   0409; 0459; Case map
+   040A; 045A; Case map
+   040B; 045B; Case map
+   040C; 045C; Case map
+   040D; 045D; Case map
+   040E; 045E; Case map
+   040F; 045F; Case map
+   0410; 0430; Case map
+   0411; 0431; Case map
+   0412; 0432; Case map
+   0413; 0433; Case map
+   0414; 0434; Case map
+   0415; 0435; Case map
+   0416; 0436; Case map
+   0417; 0437; Case map
+   0418; 0438; Case map
+   0419; 0439; Case map
+   041A; 043A; Case map
+   041B; 043B; Case map
+   041C; 043C; Case map
+   041D; 043D; Case map
+   041E; 043E; Case map
+   041F; 043F; Case map
+   0420; 0440; Case map
+   0421; 0441; Case map
+   0422; 0442; Case map
+   0423; 0443; Case map
+   0424; 0444; Case map
+   0425; 0445; Case map
+   0426; 0446; Case map
+   0427; 0447; Case map
+   0428; 0448; Case map
+   0429; 0449; Case map
+   042A; 044A; Case map
+   042B; 044B; Case map
+   042C; 044C; Case map
+   042D; 044D; Case map
+   042E; 044E; Case map
+   042F; 044F; Case map
+   0460; 0461; Case map
+   0462; 0463; Case map
+   0464; 0465; Case map
+   0466; 0467; Case map
+   0468; 0469; Case map
+   046A; 046B; Case map
+   046C; 046D; Case map
+   046E; 046F; Case map
+   0470; 0471; Case map
+   0472; 0473; Case map
+   0474; 0475; Case map
+   0476; 0477; Case map
+   0478; 0479; Case map
+   047A; 047B; Case map
+   047C; 047D; Case map
+   047E; 047F; Case map
+   0480; 0481; Case map
+   048A; 048B; Case map
+   048C; 048D; Case map
+   048E; 048F; Case map
+   0490; 0491; Case map
+   0492; 0493; Case map
+   0494; 0495; Case map
+   0496; 0497; Case map
+   0498; 0499; Case map
+   049A; 049B; Case map
+   049C; 049D; Case map
+   049E; 049F; Case map
+   04A0; 04A1; Case map
+   04A2; 04A3; Case map
+   04A4; 04A5; Case map
+   04A6; 04A7; Case map
+   04A8; 04A9; Case map
+   04AA; 04AB; Case map
+   04AC; 04AD; Case map
+   04AE; 04AF; Case map
+   04B0; 04B1; Case map
+   04B2; 04B3; Case map
+   04B4; 04B5; Case map
+   04B6; 04B7; Case map
+   04B8; 04B9; Case map
+   04BA; 04BB; Case map
+   04BC; 04BD; Case map
+   04BE; 04BF; Case map
+   04C1; 04C2; Case map
+   04C3; 04C4; Case map
+   04C5; 04C6; Case map
+   04C7; 04C8; Case map
+   04C9; 04CA; Case map
+   04CB; 04CC; Case map
+   04CD; 04CE; Case map
+   04D0; 04D1; Case map
+   04D2; 04D3; Case map
+   04D4; 04D5; Case map
+   04D6; 04D7; Case map
+   04D8; 04D9; Case map
+   04DA; 04DB; Case map
+   04DC; 04DD; Case map
+   04DE; 04DF; Case map
+   04E0; 04E1; Case map
+   04E2; 04E3; Case map
+   04E4; 04E5; Case map
+   04E6; 04E7; Case map
+   04E8; 04E9; Case map
+   04EA; 04EB; Case map
+   04EC; 04ED; Case map
+   04EE; 04EF; Case map
+   04F0; 04F1; Case map
+   04F2; 04F3; Case map
+   04F4; 04F5; Case map
+   04F8; 04F9; Case map
+   0500; 0501; Case map
+   0502; 0503; Case map
+   0504; 0505; Case map
+   0506; 0507; Case map
+   0508; 0509; Case map
+   050A; 050B; Case map
+   050C; 050D; Case map
+   050E; 050F; Case map
+   0531; 0561; Case map
+   0532; 0562; Case map
+   0533; 0563; Case map
+   0534; 0564; Case map
+   0535; 0565; Case map
+   0536; 0566; Case map
+   0537; 0567; Case map
+   0538; 0568; Case map
+   0539; 0569; Case map
+   053A; 056A; Case map
+   053B; 056B; Case map
+   053C; 056C; Case map
+   053D; 056D; Case map
+   053E; 056E; Case map
+   053F; 056F; Case map
+   0540; 0570; Case map
+   0541; 0571; Case map
+   0542; 0572; Case map
+   0543; 0573; Case map
+   0544; 0574; Case map
+   0545; 0575; Case map
+   0546; 0576; Case map
+   0547; 0577; Case map
+   0548; 0578; Case map
+   0549; 0579; Case map
+   054A; 057A; Case map
+   054B; 057B; Case map
+   054C; 057C; Case map
+   054D; 057D; Case map
+   054E; 057E; Case map
+   054F; 057F; Case map
+   0550; 0580; Case map
+   0551; 0581; Case map
+   0552; 0582; Case map
+   0553; 0583; Case map
+   0554; 0584; Case map
+   0555; 0585; Case map
+   0556; 0586; Case map
+   0587; 0565 0582; Case map
+   1E00; 1E01; Case map
+   1E02; 1E03; Case map
+   1E04; 1E05; Case map
+   1E06; 1E07; Case map
+   1E08; 1E09; Case map
+   1E0A; 1E0B; Case map
+   1E0C; 1E0D; Case map
+   1E0E; 1E0F; Case map
+   1E10; 1E11; Case map
+   1E12; 1E13; Case map
+   1E14; 1E15; Case map
+   1E16; 1E17; Case map
+   1E18; 1E19; Case map
+   1E1A; 1E1B; Case map
+   1E1C; 1E1D; Case map
+   1E1E; 1E1F; Case map
+   1E20; 1E21; Case map
+   1E22; 1E23; Case map
+   1E24; 1E25; Case map
+   1E26; 1E27; Case map
+   1E28; 1E29; Case map
+   1E2A; 1E2B; Case map
+   1E2C; 1E2D; Case map
+   1E2E; 1E2F; Case map
+   1E30; 1E31; Case map
+   1E32; 1E33; Case map
+   1E34; 1E35; Case map
+   1E36; 1E37; Case map
+   1E38; 1E39; Case map
+   1E3A; 1E3B; Case map
+   1E3C; 1E3D; Case map
+   1E3E; 1E3F; Case map
+   1E40; 1E41; Case map
+   1E42; 1E43; Case map
+   1E44; 1E45; Case map
+   1E46; 1E47; Case map
+   1E48; 1E49; Case map
+   1E4A; 1E4B; Case map
+   1E4C; 1E4D; Case map
+   1E4E; 1E4F; Case map
+   1E50; 1E51; Case map
+   1E52; 1E53; Case map
+   1E54; 1E55; Case map
+   1E56; 1E57; Case map
+   1E58; 1E59; Case map
+   1E5A; 1E5B; Case map
+   1E5C; 1E5D; Case map
+   1E5E; 1E5F; Case map
+   1E60; 1E61; Case map
+   1E62; 1E63; Case map
+   1E64; 1E65; Case map
+   1E66; 1E67; Case map
+   1E68; 1E69; Case map
+   1E6A; 1E6B; Case map
+   1E6C; 1E6D; Case map
+   1E6E; 1E6F; Case map
+   1E70; 1E71; Case map
+   1E72; 1E73; Case map
+   1E74; 1E75; Case map
+   1E76; 1E77; Case map
+   1E78; 1E79; Case map
+   1E7A; 1E7B; Case map
+   1E7C; 1E7D; Case map
+   1E7E; 1E7F; Case map
+   1E80; 1E81; Case map
+   1E82; 1E83; Case map
+   1E84; 1E85; Case map
+   1E86; 1E87; Case map
+   1E88; 1E89; Case map
+   1E8A; 1E8B; Case map
+   1E8C; 1E8D; Case map
+   1E8E; 1E8F; Case map
+   1E90; 1E91; Case map
+   1E92; 1E93; Case map
+   1E94; 1E95; Case map
+   1E96; 0068 0331; Case map
+   1E97; 0074 0308; Case map
+   1E98; 0077 030A; Case map
+   1E99; 0079 030A; Case map
+   1E9A; 0061 02BE; Case map
+   1E9B; 1E61; Case map
+   1EA0; 1EA1; Case map
+   1EA2; 1EA3; Case map
+   1EA4; 1EA5; Case map
+   1EA6; 1EA7; Case map
+   1EA8; 1EA9; Case map
+   1EAA; 1EAB; Case map
+   1EAC; 1EAD; Case map
+   1EAE; 1EAF; Case map
+   1EB0; 1EB1; Case map
+   1EB2; 1EB3; Case map
+   1EB4; 1EB5; Case map
+   1EB6; 1EB7; Case map
+   1EB8; 1EB9; Case map
+   1EBA; 1EBB; Case map
+   1EBC; 1EBD; Case map
+   1EBE; 1EBF; Case map
+   1EC0; 1EC1; Case map
+   1EC2; 1EC3; Case map
+   1EC4; 1EC5; Case map
+   1EC6; 1EC7; Case map
+   1EC8; 1EC9; Case map
+   1ECA; 1ECB; Case map
+   1ECC; 1ECD; Case map
+   1ECE; 1ECF; Case map
+   1ED0; 1ED1; Case map
+   1ED2; 1ED3; Case map
+   1ED4; 1ED5; Case map
+   1ED6; 1ED7; Case map
+   1ED8; 1ED9; Case map
+   1EDA; 1EDB; Case map
+   1EDC; 1EDD; Case map
+   1EDE; 1EDF; Case map
+   1EE0; 1EE1; Case map
+   1EE2; 1EE3; Case map
+   1EE4; 1EE5; Case map
+   1EE6; 1EE7; Case map
+   1EE8; 1EE9; Case map
+   1EEA; 1EEB; Case map
+   1EEC; 1EED; Case map
+   1EEE; 1EEF; Case map
+   1EF0; 1EF1; Case map
+   1EF2; 1EF3; Case map
+   1EF4; 1EF5; Case map
+   1EF6; 1EF7; Case map
+   1EF8; 1EF9; Case map
+   1F08; 1F00; Case map
+   1F09; 1F01; Case map
+   1F0A; 1F02; Case map
+   1F0B; 1F03; Case map
+   1F0C; 1F04; Case map
+   1F0D; 1F05; Case map
+   1F0E; 1F06; Case map
+   1F0F; 1F07; Case map
+   1F18; 1F10; Case map
+   1F19; 1F11; Case map
+   1F1A; 1F12; Case map
+   1F1B; 1F13; Case map
+   1F1C; 1F14; Case map
+   1F1D; 1F15; Case map
+   1F28; 1F20; Case map
+   1F29; 1F21; Case map
+   1F2A; 1F22; Case map
+   1F2B; 1F23; Case map
+   1F2C; 1F24; Case map
+   1F2D; 1F25; Case map
+   1F2E; 1F26; Case map
+   1F2F; 1F27; Case map
+   1F38; 1F30; Case map
+   1F39; 1F31; Case map
+   1F3A; 1F32; Case map
+   1F3B; 1F33; Case map
+   1F3C; 1F34; Case map
+   1F3D; 1F35; Case map
+   1F3E; 1F36; Case map
+   1F3F; 1F37; Case map
+   1F48; 1F40; Case map
+   1F49; 1F41; Case map
+   1F4A; 1F42; Case map
+   1F4B; 1F43; Case map
+   1F4C; 1F44; Case map
+   1F4D; 1F45; Case map
+   1F50; 03C5 0313; Case map
+   1F52; 03C5 0313 0300; Case map
+   1F54; 03C5 0313 0301; Case map
+   1F56; 03C5 0313 0342; Case map
+   1F59; 1F51; Case map
+   1F5B; 1F53; Case map
+   1F5D; 1F55; Case map
+   1F5F; 1F57; Case map
+   1F68; 1F60; Case map
+   1F69; 1F61; Case map
+   1F6A; 1F62; Case map
+   1F6B; 1F63; Case map
+   1F6C; 1F64; Case map
+   1F6D; 1F65; Case map
+   1F6E; 1F66; Case map
+   1F6F; 1F67; Case map
+   1F80; 1F00 03B9; Case map
+   1F81; 1F01 03B9; Case map
+   1F82; 1F02 03B9; Case map
+   1F83; 1F03 03B9; Case map
+   1F84; 1F04 03B9; Case map
+   1F85; 1F05 03B9; Case map
+   1F86; 1F06 03B9; Case map
+   1F87; 1F07 03B9; Case map
+   1F88; 1F00 03B9; Case map
+   1F89; 1F01 03B9; Case map
+   1F8A; 1F02 03B9; Case map
+   1F8B; 1F03 03B9; Case map
+   1F8C; 1F04 03B9; Case map
+   1F8D; 1F05 03B9; Case map
+   1F8E; 1F06 03B9; Case map
+   1F8F; 1F07 03B9; Case map
+   1F90; 1F20 03B9; Case map
+   1F91; 1F21 03B9; Case map
+   1F92; 1F22 03B9; Case map
+   1F93; 1F23 03B9; Case map
+   1F94; 1F24 03B9; Case map
+   1F95; 1F25 03B9; Case map
+   1F96; 1F26 03B9; Case map
+   1F97; 1F27 03B9; Case map
+   1F98; 1F20 03B9; Case map
+   1F99; 1F21 03B9; Case map
+   1F9A; 1F22 03B9; Case map
+   1F9B; 1F23 03B9; Case map
+   1F9C; 1F24 03B9; Case map
+   1F9D; 1F25 03B9; Case map
+   1F9E; 1F26 03B9; Case map
+   1F9F; 1F27 03B9; Case map
+   1FA0; 1F60 03B9; Case map
+   1FA1; 1F61 03B9; Case map
+   1FA2; 1F62 03B9; Case map
+   1FA3; 1F63 03B9; Case map
+   1FA4; 1F64 03B9; Case map
+   1FA5; 1F65 03B9; Case map
+   1FA6; 1F66 03B9; Case map
+   1FA7; 1F67 03B9; Case map
+   1FA8; 1F60 03B9; Case map
+   1FA9; 1F61 03B9; Case map
+   1FAA; 1F62 03B9; Case map
+   1FAB; 1F63 03B9; Case map
+   1FAC; 1F64 03B9; Case map
+   1FAD; 1F65 03B9; Case map
+   1FAE; 1F66 03B9; Case map
+   1FAF; 1F67 03B9; Case map
+   1FB2; 1F70 03B9; Case map
+   1FB3; 03B1 03B9; Case map
+   1FB4; 03AC 03B9; Case map
+   1FB6; 03B1 0342; Case map
+   1FB7; 03B1 0342 03B9; Case map
+   1FB8; 1FB0; Case map
+   1FB9; 1FB1; Case map
+   1FBA; 1F70; Case map
+   1FBB; 1F71; Case map
+   1FBC; 03B1 03B9; Case map
+   1FBE; 03B9; Case map
+   1FC2; 1F74 03B9; Case map
+   1FC3; 03B7 03B9; Case map
+   1FC4; 03AE 03B9; Case map
+   1FC6; 03B7 0342; Case map
+   1FC7; 03B7 0342 03B9; Case map
+   1FC8; 1F72; Case map
+   1FC9; 1F73; Case map
+   1FCA; 1F74; Case map
+   1FCB; 1F75; Case map
+   1FCC; 03B7 03B9; Case map
+   1FD2; 03B9 0308 0300; Case map
+   1FD3; 03B9 0308 0301; Case map
+   1FD6; 03B9 0342; Case map
+   1FD7; 03B9 0308 0342; Case map
+   1FD8; 1FD0; Case map
+   1FD9; 1FD1; Case map
+   1FDA; 1F76; Case map
+   1FDB; 1F77; Case map
+   1FE2; 03C5 0308 0300; Case map
+   1FE3; 03C5 0308 0301; Case map
+   1FE4; 03C1 0313; Case map
+   1FE6; 03C5 0342; Case map
+   1FE7; 03C5 0308 0342; Case map
+   1FE8; 1FE0; Case map
+   1FE9; 1FE1; Case map
+   1FEA; 1F7A; Case map
+   1FEB; 1F7B; Case map
+   1FEC; 1FE5; Case map
+   1FF2; 1F7C 03B9; Case map
+   1FF3; 03C9 03B9; Case map
+   1FF4; 03CE 03B9; Case map
+   1FF6; 03C9 0342; Case map
+   1FF7; 03C9 0342 03B9; Case map
+   1FF8; 1F78; Case map
+   1FF9; 1F79; Case map
+   1FFA; 1F7C; Case map
+   1FFB; 1F7D; Case map
+   1FFC; 03C9 03B9; Case map
+   20A8; 0072 0073; Additional folding
+   2102; 0063; Additional folding
+   2103; 00B0 0063; Additional folding
+   2107; 025B; Additional folding
+   2109; 00B0 0066; Additional folding
+   210B; 0068; Additional folding
+   210C; 0068; Additional folding
+   210D; 0068; Additional folding
+   2110; 0069; Additional folding
+   2111; 0069; Additional folding
+   2112; 006C; Additional folding
+   2115; 006E; Additional folding
+   2116; 006E 006F; Additional folding
+   2119; 0070; Additional folding
+   211A; 0071; Additional folding
+   211B; 0072; Additional folding
+   211C; 0072; Additional folding
+   211D; 0072; Additional folding
+   2120; 0073 006D; Additional folding
+   2121; 0074 0065 006C; Additional folding
+   2122; 0074 006D; Additional folding
+   2124; 007A; Additional folding
+   2126; 03C9; Case map
+   2128; 007A; Additional folding
+   212A; 006B; Case map
+   212B; 00E5; Case map
+   212C; 0062; Additional folding
+   212D; 0063; Additional folding
+   2130; 0065; Additional folding
+   2131; 0066; Additional folding
+   2133; 006D; Additional folding
+   213E; 03B3; Additional folding
+   213F; 03C0; Additional folding
+   2145; 0064; Additional folding
+   2160; 2170; Case map
+   2161; 2171; Case map
+   2162; 2172; Case map
+   2163; 2173; Case map
+   2164; 2174; Case map
+   2165; 2175; Case map
+   2166; 2176; Case map
+   2167; 2177; Case map
+   2168; 2178; Case map
+   2169; 2179; Case map
+   216A; 217A; Case map
+   216B; 217B; Case map
+   216C; 217C; Case map
+   216D; 217D; Case map
+   216E; 217E; Case map
+   216F; 217F; Case map
+   24B6; 24D0; Case map
+   24B7; 24D1; Case map
+   24B8; 24D2; Case map
+   24B9; 24D3; Case map
+   24BA; 24D4; Case map
+   24BB; 24D5; Case map
+   24BC; 24D6; Case map
+   24BD; 24D7; Case map
+   24BE; 24D8; Case map
+   24BF; 24D9; Case map
+   24C0; 24DA; Case map
+   24C1; 24DB; Case map
+   24C2; 24DC; Case map
+   24C3; 24DD; Case map
+   24C4; 24DE; Case map
+   24C5; 24DF; Case map
+   24C6; 24E0; Case map
+   24C7; 24E1; Case map
+   24C8; 24E2; Case map
+   24C9; 24E3; Case map
+   24CA; 24E4; Case map
+   24CB; 24E5; Case map
+   24CC; 24E6; Case map
+   24CD; 24E7; Case map
+   24CE; 24E8; Case map
+   24CF; 24E9; Case map
+   3371; 0068 0070 0061; Additional folding
+   3373; 0061 0075; Additional folding
+   3375; 006F 0076; Additional folding
+   3380; 0070 0061; Additional folding
+   3381; 006E 0061; Additional folding
+   3382; 03BC 0061; Additional folding
+   3383; 006D 0061; Additional folding
+   3384; 006B 0061; Additional folding
+   3385; 006B 0062; Additional folding
+   3386; 006D 0062; Additional folding
+   3387; 0067 0062; Additional folding
+   338A; 0070 0066; Additional folding
+   338B; 006E 0066; Additional folding
+   338C; 03BC 0066; Additional folding
+   3390; 0068 007A; Additional folding
+   3391; 006B 0068 007A; Additional folding
+   3392; 006D 0068 007A; Additional folding
+   3393; 0067 0068 007A; Additional folding
+   3394; 0074 0068 007A; Additional folding
+   33A9; 0070 0061; Additional folding
+   33AA; 006B 0070 0061; Additional folding
+   33AB; 006D 0070 0061; Additional folding
+   33AC; 0067 0070 0061; Additional folding
+   33B4; 0070 0076; Additional folding
+   33B5; 006E 0076; Additional folding
+   33B6; 03BC 0076; Additional folding
+   33B7; 006D 0076; Additional folding
+   33B8; 006B 0076; Additional folding
+   33B9; 006D 0076; Additional folding
+   33BA; 0070 0077; Additional folding
+   33BB; 006E 0077; Additional folding
+   33BC; 03BC 0077; Additional folding
+   33BD; 006D 0077; Additional folding
+   33BE; 006B 0077; Additional folding
+   33BF; 006D 0077; Additional folding
+   33C0; 006B 03C9; Additional folding
+   33C1; 006D 03C9; Additional folding
+   33C3; 0062 0071; Additional folding
+   33C6; 0063 2215 006B 0067; Additional folding
+   33C7; 0063 006F 002E; Additional folding
+   33C8; 0064 0062; Additional folding
+   33C9; 0067 0079; Additional folding
+   33CB; 0068 0070; Additional folding
+   33CD; 006B 006B; Additional folding
+   33CE; 006B 006D; Additional folding
+   33D7; 0070 0068; Additional folding
+   33D9; 0070 0070 006D; Additional folding
+   33DA; 0070 0072; Additional folding
+   33DC; 0073 0076; Additional folding
+   33DD; 0077 0062; Additional folding
+   FB00; 0066 0066; Case map
+   FB01; 0066 0069; Case map
+   FB02; 0066 006C; Case map
+   FB03; 0066 0066 0069; Case map
+   FB04; 0066 0066 006C; Case map
+   FB05; 0073 0074; Case map
+   FB06; 0073 0074; Case map
+   FB13; 0574 0576; Case map
+   FB14; 0574 0565; Case map
+   FB15; 0574 056B; Case map
+   FB16; 057E 0576; Case map
+   FB17; 0574 056D; Case map
+   FF21; FF41; Case map
+   FF22; FF42; Case map
+   FF23; FF43; Case map
+   FF24; FF44; Case map
+   FF25; FF45; Case map
+   FF26; FF46; Case map
+   FF27; FF47; Case map
+   FF28; FF48; Case map
+   FF29; FF49; Case map
+   FF2A; FF4A; Case map
+   FF2B; FF4B; Case map
+   FF2C; FF4C; Case map
+   FF2D; FF4D; Case map
+   FF2E; FF4E; Case map
+   FF2F; FF4F; Case map
+   FF30; FF50; Case map
+   FF31; FF51; Case map
+   FF32; FF52; Case map
+   FF33; FF53; Case map
+   FF34; FF54; Case map
+   FF35; FF55; Case map
+   FF36; FF56; Case map
+   FF37; FF57; Case map
+   FF38; FF58; Case map
+   FF39; FF59; Case map
+   FF3A; FF5A; Case map
+   10400; 10428; Case map
+   10401; 10429; Case map
+   10402; 1042A; Case map
+   10403; 1042B; Case map
+   10404; 1042C; Case map
+   10405; 1042D; Case map
+   10406; 1042E; Case map
+   10407; 1042F; Case map
+   10408; 10430; Case map
+   10409; 10431; Case map
+   1040A; 10432; Case map
+   1040B; 10433; Case map
+   1040C; 10434; Case map
+   1040D; 10435; Case map
+   1040E; 10436; Case map
+   1040F; 10437; Case map
+   10410; 10438; Case map
+   10411; 10439; Case map
+   10412; 1043A; Case map
+   10413; 1043B; Case map
+   10414; 1043C; Case map
+   10415; 1043D; Case map
+   10416; 1043E; Case map
+   10417; 1043F; Case map
+   10418; 10440; Case map
+   10419; 10441; Case map
+   1041A; 10442; Case map
+   1041B; 10443; Case map
+   1041C; 10444; Case map
+   1041D; 10445; Case map
+   1041E; 10446; Case map
+   1041F; 10447; Case map
+   10420; 10448; Case map
+   10421; 10449; Case map
+   10422; 1044A; Case map
+   10423; 1044B; Case map
+   10424; 1044C; Case map
+   10425; 1044D; Case map
+   1D400; 0061; Additional folding
+   1D401; 0062; Additional folding
+   1D402; 0063; Additional folding
+   1D403; 0064; Additional folding
+   1D404; 0065; Additional folding
+   1D405; 0066; Additional folding
+   1D406; 0067; Additional folding
+   1D407; 0068; Additional folding
+   1D408; 0069; Additional folding
+   1D409; 006A; Additional folding
+   1D40A; 006B; Additional folding
+   1D40B; 006C; Additional folding
+   1D40C; 006D; Additional folding
+   1D40D; 006E; Additional folding
+   1D40E; 006F; Additional folding
+   1D40F; 0070; Additional folding
+   1D410; 0071; Additional folding
+   1D411; 0072; Additional folding
+   1D412; 0073; Additional folding
+   1D413; 0074; Additional folding
+   1D414; 0075; Additional folding
+   1D415; 0076; Additional folding
+   1D416; 0077; Additional folding
+   1D417; 0078; Additional folding
+   1D418; 0079; Additional folding
+   1D419; 007A; Additional folding
+   1D434; 0061; Additional folding
+   1D435; 0062; Additional folding
+   1D436; 0063; Additional folding
+   1D437; 0064; Additional folding
+   1D438; 0065; Additional folding
+   1D439; 0066; Additional folding
+   1D43A; 0067; Additional folding
+   1D43B; 0068; Additional folding
+   1D43C; 0069; Additional folding
+   1D43D; 006A; Additional folding
+   1D43E; 006B; Additional folding
+   1D43F; 006C; Additional folding
+   1D440; 006D; Additional folding
+   1D441; 006E; Additional folding
+   1D442; 006F; Additional folding
+   1D443; 0070; Additional folding
+   1D444; 0071; Additional folding
+   1D445; 0072; Additional folding
+   1D446; 0073; Additional folding
+   1D447; 0074; Additional folding
+   1D448; 0075; Additional folding
+   1D449; 0076; Additional folding
+   1D44A; 0077; Additional folding
+   1D44B; 0078; Additional folding
+   1D44C; 0079; Additional folding
+   1D44D; 007A; Additional folding
+   1D468; 0061; Additional folding
+   1D469; 0062; Additional folding
+   1D46A; 0063; Additional folding
+   1D46B; 0064; Additional folding
+   1D46C; 0065; Additional folding
+   1D46D; 0066; Additional folding
+   1D46E; 0067; Additional folding
+   1D46F; 0068; Additional folding
+   1D470; 0069; Additional folding
+   1D471; 006A; Additional folding
+   1D472; 006B; Additional folding
+   1D473; 006C; Additional folding
+   1D474; 006D; Additional folding
+   1D475; 006E; Additional folding
+   1D476; 006F; Additional folding
+   1D477; 0070; Additional folding
+   1D478; 0071; Additional folding
+   1D479; 0072; Additional folding
+   1D47A; 0073; Additional folding
+   1D47B; 0074; Additional folding
+   1D47C; 0075; Additional folding
+   1D47D; 0076; Additional folding
+   1D47E; 0077; Additional folding
+   1D47F; 0078; Additional folding
+   1D480; 0079; Additional folding
+   1D481; 007A; Additional folding
+   1D49C; 0061; Additional folding
+   1D49E; 0063; Additional folding
+   1D49F; 0064; Additional folding
+   1D4A2; 0067; Additional folding
+   1D4A5; 006A; Additional folding
+   1D4A6; 006B; Additional folding
+   1D4A9; 006E; Additional folding
+   1D4AA; 006F; Additional folding
+   1D4AB; 0070; Additional folding
+   1D4AC; 0071; Additional folding
+   1D4AE; 0073; Additional folding
+   1D4AF; 0074; Additional folding
+   1D4B0; 0075; Additional folding
+   1D4B1; 0076; Additional folding
+   1D4B2; 0077; Additional folding
+   1D4B3; 0078; Additional folding
+   1D4B4; 0079; Additional folding
+   1D4B5; 007A; Additional folding
+   1D4D0; 0061; Additional folding
+   1D4D1; 0062; Additional folding
+   1D4D2; 0063; Additional folding
+   1D4D3; 0064; Additional folding
+   1D4D4; 0065; Additional folding
+   1D4D5; 0066; Additional folding
+   1D4D6; 0067; Additional folding
+   1D4D7; 0068; Additional folding
+   1D4D8; 0069; Additional folding
+   1D4D9; 006A; Additional folding
+   1D4DA; 006B; Additional folding
+   1D4DB; 006C; Additional folding
+   1D4DC; 006D; Additional folding
+   1D4DD; 006E; Additional folding
+   1D4DE; 006F; Additional folding
+   1D4DF; 0070; Additional folding
+   1D4E0; 0071; Additional folding
+   1D4E1; 0072; Additional folding
+   1D4E2; 0073; Additional folding
+   1D4E3; 0074; Additional folding
+   1D4E4; 0075; Additional folding
+   1D4E5; 0076; Additional folding
+   1D4E6; 0077; Additional folding
+   1D4E7; 0078; Additional folding
+   1D4E8; 0079; Additional folding
+   1D4E9; 007A; Additional folding
+   1D504; 0061; Additional folding
+   1D505; 0062; Additional folding
+   1D507; 0064; Additional folding
+   1D508; 0065; Additional folding
+   1D509; 0066; Additional folding
+   1D50A; 0067; Additional folding
+   1D50D; 006A; Additional folding
+   1D50E; 006B; Additional folding
+   1D50F; 006C; Additional folding
+   1D510; 006D; Additional folding
+   1D511; 006E; Additional folding
+   1D512; 006F; Additional folding
+   1D513; 0070; Additional folding
+   1D514; 0071; Additional folding
+   1D516; 0073; Additional folding
+   1D517; 0074; Additional folding
+   1D518; 0075; Additional folding
+   1D519; 0076; Additional folding
+   1D51A; 0077; Additional folding
+   1D51B; 0078; Additional folding
+   1D51C; 0079; Additional folding
+   1D538; 0061; Additional folding
+   1D539; 0062; Additional folding
+   1D53B; 0064; Additional folding
+   1D53C; 0065; Additional folding
+   1D53D; 0066; Additional folding
+   1D53E; 0067; Additional folding
+   1D540; 0069; Additional folding
+   1D541; 006A; Additional folding
+   1D542; 006B; Additional folding
+   1D543; 006C; Additional folding
+   1D544; 006D; Additional folding
+   1D546; 006F; Additional folding
+   1D54A; 0073; Additional folding
+   1D54B; 0074; Additional folding
+   1D54C; 0075; Additional folding
+   1D54D; 0076; Additional folding
+   1D54E; 0077; Additional folding
+   1D54F; 0078; Additional folding
+   1D550; 0079; Additional folding
+   1D56C; 0061; Additional folding
+   1D56D; 0062; Additional folding
+   1D56E; 0063; Additional folding
+   1D56F; 0064; Additional folding
+   1D570; 0065; Additional folding
+   1D571; 0066; Additional folding
+   1D572; 0067; Additional folding
+   1D573; 0068; Additional folding
+   1D574; 0069; Additional folding
+   1D575; 006A; Additional folding
+   1D576; 006B; Additional folding
+   1D577; 006C; Additional folding
+   1D578; 006D; Additional folding
+   1D579; 006E; Additional folding
+   1D57A; 006F; Additional folding
+   1D57B; 0070; Additional folding
+   1D57C; 0071; Additional folding
+   1D57D; 0072; Additional folding
+   1D57E; 0073; Additional folding
+   1D57F; 0074; Additional folding
+   1D580; 0075; Additional folding
+   1D581; 0076; Additional folding
+   1D582; 0077; Additional folding
+   1D583; 0078; Additional folding
+   1D584; 0079; Additional folding
+   1D585; 007A; Additional folding
+   1D5A0; 0061; Additional folding
+   1D5A1; 0062; Additional folding
+   1D5A2; 0063; Additional folding
+   1D5A3; 0064; Additional folding
+   1D5A4; 0065; Additional folding
+   1D5A5; 0066; Additional folding
+   1D5A6; 0067; Additional folding
+   1D5A7; 0068; Additional folding
+   1D5A8; 0069; Additional folding
+   1D5A9; 006A; Additional folding
+   1D5AA; 006B; Additional folding
+   1D5AB; 006C; Additional folding
+   1D5AC; 006D; Additional folding
+   1D5AD; 006E; Additional folding
+   1D5AE; 006F; Additional folding
+   1D5AF; 0070; Additional folding
+   1D5B0; 0071; Additional folding
+   1D5B1; 0072; Additional folding
+   1D5B2; 0073; Additional folding
+   1D5B3; 0074; Additional folding
+   1D5B4; 0075; Additional folding
+   1D5B5; 0076; Additional folding
+   1D5B6; 0077; Additional folding
+   1D5B7; 0078; Additional folding
+   1D5B8; 0079; Additional folding
+   1D5B9; 007A; Additional folding
+   1D5D4; 0061; Additional folding
+   1D5D5; 0062; Additional folding
+   1D5D6; 0063; Additional folding
+   1D5D7; 0064; Additional folding
+   1D5D8; 0065; Additional folding
+   1D5D9; 0066; Additional folding
+   1D5DA; 0067; Additional folding
+   1D5DB; 0068; Additional folding
+   1D5DC; 0069; Additional folding
+   1D5DD; 006A; Additional folding
+   1D5DE; 006B; Additional folding
+   1D5DF; 006C; Additional folding
+   1D5E0; 006D; Additional folding
+   1D5E1; 006E; Additional folding
+   1D5E2; 006F; Additional folding
+   1D5E3; 0070; Additional folding
+   1D5E4; 0071; Additional folding
+   1D5E5; 0072; Additional folding
+   1D5E6; 0073; Additional folding
+   1D5E7; 0074; Additional folding
+   1D5E8; 0075; Additional folding
+   1D5E9; 0076; Additional folding
+   1D5EA; 0077; Additional folding
+   1D5EB; 0078; Additional folding
+   1D5EC; 0079; Additional folding
+   1D5ED; 007A; Additional folding
+   1D608; 0061; Additional folding
+   1D609; 0062; Additional folding
+   1D60A; 0063; Additional folding
+   1D60B; 0064; Additional folding
+   1D60C; 0065; Additional folding
+   1D60D; 0066; Additional folding
+   1D60E; 0067; Additional folding
+   1D60F; 0068; Additional folding
+   1D610; 0069; Additional folding
+   1D611; 006A; Additional folding
+   1D612; 006B; Additional folding
+   1D613; 006C; Additional folding
+   1D614; 006D; Additional folding
+   1D615; 006E; Additional folding
+   1D616; 006F; Additional folding
+   1D617; 0070; Additional folding
+   1D618; 0071; Additional folding
+   1D619; 0072; Additional folding
+   1D61A; 0073; Additional folding
+   1D61B; 0074; Additional folding
+   1D61C; 0075; Additional folding
+   1D61D; 0076; Additional folding
+   1D61E; 0077; Additional folding
+   1D61F; 0078; Additional folding
+   1D620; 0079; Additional folding
+   1D621; 007A; Additional folding
+   1D63C; 0061; Additional folding
+   1D63D; 0062; Additional folding
+   1D63E; 0063; Additional folding
+   1D63F; 0064; Additional folding
+   1D640; 0065; Additional folding
+   1D641; 0066; Additional folding
+   1D642; 0067; Additional folding
+   1D643; 0068; Additional folding
+   1D644; 0069; Additional folding
+   1D645; 006A; Additional folding
+   1D646; 006B; Additional folding
+   1D647; 006C; Additional folding
+   1D648; 006D; Additional folding
+   1D649; 006E; Additional folding
+   1D64A; 006F; Additional folding
+   1D64B; 0070; Additional folding
+   1D64C; 0071; Additional folding
+   1D64D; 0072; Additional folding
+   1D64E; 0073; Additional folding
+   1D64F; 0074; Additional folding
+   1D650; 0075; Additional folding
+   1D651; 0076; Additional folding
+   1D652; 0077; Additional folding
+   1D653; 0078; Additional folding
+   1D654; 0079; Additional folding
+   1D655; 007A; Additional folding
+   1D670; 0061; Additional folding
+   1D671; 0062; Additional folding
+   1D672; 0063; Additional folding
+   1D673; 0064; Additional folding
+   1D674; 0065; Additional folding
+   1D675; 0066; Additional folding
+   1D676; 0067; Additional folding
+   1D677; 0068; Additional folding
+   1D678; 0069; Additional folding
+   1D679; 006A; Additional folding
+   1D67A; 006B; Additional folding
+   1D67B; 006C; Additional folding
+   1D67C; 006D; Additional folding
+   1D67D; 006E; Additional folding
+   1D67E; 006F; Additional folding
+   1D67F; 0070; Additional folding
+   1D680; 0071; Additional folding
+   1D681; 0072; Additional folding
+   1D682; 0073; Additional folding
+   1D683; 0074; Additional folding
+   1D684; 0075; Additional folding
+   1D685; 0076; Additional folding
+   1D686; 0077; Additional folding
+   1D687; 0078; Additional folding
+   1D688; 0079; Additional folding
+   1D689; 007A; Additional folding
+   1D6A8; 03B1; Additional folding
+   1D6A9; 03B2; Additional folding
+   1D6AA; 03B3; Additional folding
+   1D6AB; 03B4; Additional folding
+   1D6AC; 03B5; Additional folding
+   1D6AD; 03B6; Additional folding
+   1D6AE; 03B7; Additional folding
+   1D6AF; 03B8; Additional folding
+   1D6B0; 03B9; Additional folding
+   1D6B1; 03BA; Additional folding
+   1D6B2; 03BB; Additional folding
+   1D6B3; 03BC; Additional folding
+   1D6B4; 03BD; Additional folding
+   1D6B5; 03BE; Additional folding
+   1D6B6; 03BF; Additional folding
+   1D6B7; 03C0; Additional folding
+   1D6B8; 03C1; Additional folding
+   1D6B9; 03B8; Additional folding
+   1D6BA; 03C3; Additional folding
+   1D6BB; 03C4; Additional folding
+   1D6BC; 03C5; Additional folding
+   1D6BD; 03C6; Additional folding
+   1D6BE; 03C7; Additional folding
+   1D6BF; 03C8; Additional folding
+   1D6C0; 03C9; Additional folding
+   1D6D3; 03C3; Additional folding
+   1D6E2; 03B1; Additional folding
+   1D6E3; 03B2; Additional folding
+   1D6E4; 03B3; Additional folding
+   1D6E5; 03B4; Additional folding
+   1D6E6; 03B5; Additional folding
+   1D6E7; 03B6; Additional folding
+   1D6E8; 03B7; Additional folding
+   1D6E9; 03B8; Additional folding
+   1D6EA; 03B9; Additional folding
+   1D6EB; 03BA; Additional folding
+   1D6EC; 03BB; Additional folding
+   1D6ED; 03BC; Additional folding
+   1D6EE; 03BD; Additional folding
+   1D6EF; 03BE; Additional folding
+   1D6F0; 03BF; Additional folding
+   1D6F1; 03C0; Additional folding
+   1D6F2; 03C1; Additional folding
+   1D6F3; 03B8; Additional folding
+   1D6F4; 03C3; Additional folding
+   1D6F5; 03C4; Additional folding
+   1D6F6; 03C5; Additional folding
+   1D6F7; 03C6; Additional folding
+   1D6F8; 03C7; Additional folding
+   1D6F9; 03C8; Additional folding
+   1D6FA; 03C9; Additional folding
+   1D70D; 03C3; Additional folding
+   1D71C; 03B1; Additional folding
+   1D71D; 03B2; Additional folding
+   1D71E; 03B3; Additional folding
+   1D71F; 03B4; Additional folding
+   1D720; 03B5; Additional folding
+   1D721; 03B6; Additional folding
+   1D722; 03B7; Additional folding
+   1D723; 03B8; Additional folding
+   1D724; 03B9; Additional folding
+   1D725; 03BA; Additional folding
+   1D726; 03BB; Additional folding
+   1D727; 03BC; Additional folding
+   1D728; 03BD; Additional folding
+   1D729; 03BE; Additional folding
+   1D72A; 03BF; Additional folding
+   1D72B; 03C0; Additional folding
+   1D72C; 03C1; Additional folding
+   1D72D; 03B8; Additional folding
+   1D72E; 03C3; Additional folding
+   1D72F; 03C4; Additional folding
+   1D730; 03C5; Additional folding
+   1D731; 03C6; Additional folding
+   1D732; 03C7; Additional folding
+   1D733; 03C8; Additional folding
+   1D734; 03C9; Additional folding
+   1D747; 03C3; Additional folding
+   1D756; 03B1; Additional folding
+   1D757; 03B2; Additional folding
+   1D758; 03B3; Additional folding
+   1D759; 03B4; Additional folding
+   1D75A; 03B5; Additional folding
+   1D75B; 03B6; Additional folding
+   1D75C; 03B7; Additional folding
+   1D75D; 03B8; Additional folding
+   1D75E; 03B9; Additional folding
+   1D75F; 03BA; Additional folding
+   1D760; 03BB; Additional folding
+   1D761; 03BC; Additional folding
+   1D762; 03BD; Additional folding
+   1D763; 03BE; Additional folding
+   1D764; 03BF; Additional folding
+   1D765; 03C0; Additional folding
+   1D766; 03C1; Additional folding
+   1D767; 03B8; Additional folding
+   1D768; 03C3; Additional folding
+   1D769; 03C4; Additional folding
+   1D76A; 03C5; Additional folding
+   1D76B; 03C6; Additional folding
+   1D76C; 03C7; Additional folding
+   1D76D; 03C8; Additional folding
+   1D76E; 03C9; Additional folding
+   1D781; 03C3; Additional folding
+   1D790; 03B1; Additional folding
+   1D791; 03B2; Additional folding
+   1D792; 03B3; Additional folding
+   1D793; 03B4; Additional folding
+   1D794; 03B5; Additional folding
+   1D795; 03B6; Additional folding
+   1D796; 03B7; Additional folding
+   1D797; 03B8; Additional folding
+   1D798; 03B9; Additional folding
+   1D799; 03BA; Additional folding
+   1D79A; 03BB; Additional folding
+   1D79B; 03BC; Additional folding
+   1D79C; 03BD; Additional folding
+   1D79D; 03BE; Additional folding
+   1D79E; 03BF; Additional folding
+   1D79F; 03C0; Additional folding
+   1D7A0; 03C1; Additional folding
+   1D7A1; 03B8; Additional folding
+   1D7A2; 03C3; Additional folding
+   1D7A3; 03C4; Additional folding
+   1D7A4; 03C5; Additional folding
+   1D7A5; 03C6; Additional folding
+   1D7A6; 03C7; Additional folding
+   1D7A7; 03C8; Additional folding
+   1D7A8; 03C9; Additional folding
+   1D7BB; 03C3; Additional folding
+   ----- End Table B.2 -----
+
+   ----- Start Table B.3 -----
+   0041; 0061; Case map
+   0042; 0062; Case map
+   0043; 0063; Case map
+   0044; 0064; Case map
+   0045; 0065; Case map
+   0046; 0066; Case map
+   0047; 0067; Case map
+   0048; 0068; Case map
+   0049; 0069; Case map
+   004A; 006A; Case map
+   004B; 006B; Case map
+   004C; 006C; Case map
+   004D; 006D; Case map
+   004E; 006E; Case map
+   004F; 006F; Case map
+   0050; 0070; Case map
+   0051; 0071; Case map
+   0052; 0072; Case map
+   0053; 0073; Case map
+   0054; 0074; Case map
+   0055; 0075; Case map
+   0056; 0076; Case map
+   0057; 0077; Case map
+   0058; 0078; Case map
+   0059; 0079; Case map
+   005A; 007A; Case map
+   00B5; 03BC; Case map
+   00C0; 00E0; Case map
+   00C1; 00E1; Case map
+   00C2; 00E2; Case map
+   00C3; 00E3; Case map
+   00C4; 00E4; Case map
+   00C5; 00E5; Case map
+   00C6; 00E6; Case map
+   00C7; 00E7; Case map
+   00C8; 00E8; Case map
+   00C9; 00E9; Case map
+   00CA; 00EA; Case map
+   00CB; 00EB; Case map
+   00CC; 00EC; Case map
+   00CD; 00ED; Case map
+   00CE; 00EE; Case map
+   00CF; 00EF; Case map
+   00D0; 00F0; Case map
+   00D1; 00F1; Case map
+   00D2; 00F2; Case map
+   00D3; 00F3; Case map
+   00D4; 00F4; Case map
+   00D5; 00F5; Case map
+   00D6; 00F6; Case map
+   00D8; 00F8; Case map
+   00D9; 00F9; Case map
+   00DA; 00FA; Case map
+   00DB; 00FB; Case map
+   00DC; 00FC; Case map
+   00DD; 00FD; Case map
+   00DE; 00FE; Case map
+   00DF; 0073 0073; Case map
+   0100; 0101; Case map
+   0102; 0103; Case map
+   0104; 0105; Case map
+   0106; 0107; Case map
+   0108; 0109; Case map
+   010A; 010B; Case map
+   010C; 010D; Case map
+   010E; 010F; Case map
+   0110; 0111; Case map
+   0112; 0113; Case map
+   0114; 0115; Case map
+   0116; 0117; Case map
+   0118; 0119; Case map
+   011A; 011B; Case map
+   011C; 011D; Case map
+   011E; 011F; Case map
+   0120; 0121; Case map
+   0122; 0123; Case map
+   0124; 0125; Case map
+   0126; 0127; Case map
+   0128; 0129; Case map
+   012A; 012B; Case map
+   012C; 012D; Case map
+   012E; 012F; Case map
+   0130; 0069 0307; Case map
+   0132; 0133; Case map
+   0134; 0135; Case map
+   0136; 0137; Case map
+   0139; 013A; Case map
+   013B; 013C; Case map
+   013D; 013E; Case map
+   013F; 0140; Case map
+   0141; 0142; Case map
+   0143; 0144; Case map
+   0145; 0146; Case map
+   0147; 0148; Case map
+   0149; 02BC 006E; Case map
+   014A; 014B; Case map
+   014C; 014D; Case map
+   014E; 014F; Case map
+   0150; 0151; Case map
+   0152; 0153; Case map
+   0154; 0155; Case map
+   0156; 0157; Case map
+   0158; 0159; Case map
+   015A; 015B; Case map
+   015C; 015D; Case map
+   015E; 015F; Case map
+   0160; 0161; Case map
+   0162; 0163; Case map
+   0164; 0165; Case map
+   0166; 0167; Case map
+   0168; 0169; Case map
+   016A; 016B; Case map
+   016C; 016D; Case map
+   016E; 016F; Case map
+   0170; 0171; Case map
+   0172; 0173; Case map
+   0174; 0175; Case map
+   0176; 0177; Case map
+   0178; 00FF; Case map
+   0179; 017A; Case map
+   017B; 017C; Case map
+   017D; 017E; Case map
+   017F; 0073; Case map
+   0181; 0253; Case map
+   0182; 0183; Case map
+   0184; 0185; Case map
+   0186; 0254; Case map
+   0187; 0188; Case map
+   0189; 0256; Case map
+   018A; 0257; Case map
+   018B; 018C; Case map
+   018E; 01DD; Case map
+   018F; 0259; Case map
+   0190; 025B; Case map
+   0191; 0192; Case map
+   0193; 0260; Case map
+   0194; 0263; Case map
+   0196; 0269; Case map
+   0197; 0268; Case map
+   0198; 0199; Case map
+   019C; 026F; Case map
+   019D; 0272; Case map
+   019F; 0275; Case map
+   01A0; 01A1; Case map
+   01A2; 01A3; Case map
+   01A4; 01A5; Case map
+   01A6; 0280; Case map
+   01A7; 01A8; Case map
+   01A9; 0283; Case map
+   01AC; 01AD; Case map
+   01AE; 0288; Case map
+   01AF; 01B0; Case map
+   01B1; 028A; Case map
+   01B2; 028B; Case map
+   01B3; 01B4; Case map
+   01B5; 01B6; Case map
+   01B7; 0292; Case map
+   01B8; 01B9; Case map
+   01BC; 01BD; Case map
+   01C4; 01C6; Case map
+   01C5; 01C6; Case map
+   01C7; 01C9; Case map
+   01C8; 01C9; Case map
+   01CA; 01CC; Case map
+   01CB; 01CC; Case map
+   01CD; 01CE; Case map
+   01CF; 01D0; Case map
+   01D1; 01D2; Case map
+   01D3; 01D4; Case map
+   01D5; 01D6; Case map
+   01D7; 01D8; Case map
+   01D9; 01DA; Case map
+   01DB; 01DC; Case map
+   01DE; 01DF; Case map
+   01E0; 01E1; Case map
+   01E2; 01E3; Case map
+   01E4; 01E5; Case map
+   01E6; 01E7; Case map
+   01E8; 01E9; Case map
+   01EA; 01EB; Case map
+   01EC; 01ED; Case map
+   01EE; 01EF; Case map
+   01F0; 006A 030C; Case map
+   01F1; 01F3; Case map
+   01F2; 01F3; Case map
+   01F4; 01F5; Case map
+   01F6; 0195; Case map
+   01F7; 01BF; Case map
+   01F8; 01F9; Case map
+   01FA; 01FB; Case map
+   01FC; 01FD; Case map
+   01FE; 01FF; Case map
+   0200; 0201; Case map
+   0202; 0203; Case map
+   0204; 0205; Case map
+   0206; 0207; Case map
+   0208; 0209; Case map
+   020A; 020B; Case map
+   020C; 020D; Case map
+   020E; 020F; Case map
+   0210; 0211; Case map
+   0212; 0213; Case map
+   0214; 0215; Case map
+   0216; 0217; Case map
+   0218; 0219; Case map
+   021A; 021B; Case map
+   021C; 021D; Case map
+   021E; 021F; Case map
+   0220; 019E; Case map
+   0222; 0223; Case map
+   0224; 0225; Case map
+   0226; 0227; Case map
+   0228; 0229; Case map
+   022A; 022B; Case map
+   022C; 022D; Case map
+   022E; 022F; Case map
+   0230; 0231; Case map
+   0232; 0233; Case map
+   0345; 03B9; Case map
+   0386; 03AC; Case map
+   0388; 03AD; Case map
+   0389; 03AE; Case map
+   038A; 03AF; Case map
+   038C; 03CC; Case map
+   038E; 03CD; Case map
+   038F; 03CE; Case map
+   0390; 03B9 0308 0301; Case map
+   0391; 03B1; Case map
+   0392; 03B2; Case map
+   0393; 03B3; Case map
+   0394; 03B4; Case map
+   0395; 03B5; Case map
+   0396; 03B6; Case map
+   0397; 03B7; Case map
+   0398; 03B8; Case map
+   0399; 03B9; Case map
+   039A; 03BA; Case map
+   039B; 03BB; Case map
+   039C; 03BC; Case map
+   039D; 03BD; Case map
+   039E; 03BE; Case map
+   039F; 03BF; Case map
+   03A0; 03C0; Case map
+   03A1; 03C1; Case map
+   03A3; 03C3; Case map
+   03A4; 03C4; Case map
+   03A5; 03C5; Case map
+   03A6; 03C6; Case map
+   03A7; 03C7; Case map
+   03A8; 03C8; Case map
+   03A9; 03C9; Case map
+   03AA; 03CA; Case map
+   03AB; 03CB; Case map
+   03B0; 03C5 0308 0301; Case map
+   03C2; 03C3; Case map
+   03D0; 03B2; Case map
+   03D1; 03B8; Case map
+   03D5; 03C6; Case map
+   03D6; 03C0; Case map
+   03D8; 03D9; Case map
+   03DA; 03DB; Case map
+   03DC; 03DD; Case map
+   03DE; 03DF; Case map
+   03E0; 03E1; Case map
+   03E2; 03E3; Case map
+   03E4; 03E5; Case map
+   03E6; 03E7; Case map
+   03E8; 03E9; Case map
+   03EA; 03EB; Case map
+   03EC; 03ED; Case map
+   03EE; 03EF; Case map
+   03F0; 03BA; Case map
+   03F1; 03C1; Case map
+   03F2; 03C3; Case map
+   03F4; 03B8; Case map
+   03F5; 03B5; Case map
+   0400; 0450; Case map
+   0401; 0451; Case map
+   0402; 0452; Case map
+   0403; 0453; Case map
+   0404; 0454; Case map
+   0405; 0455; Case map
+   0406; 0456; Case map
+   0407; 0457; Case map
+   0408; 0458; Case map
+   0409; 0459; Case map
+   040A; 045A; Case map
+   040B; 045B; Case map
+   040C; 045C; Case map
+   040D; 045D; Case map
+   040E; 045E; Case map
+   040F; 045F; Case map
+   0410; 0430; Case map
+   0411; 0431; Case map
+   0412; 0432; Case map
+   0413; 0433; Case map
+   0414; 0434; Case map
+   0415; 0435; Case map
+   0416; 0436; Case map
+   0417; 0437; Case map
+   0418; 0438; Case map
+   0419; 0439; Case map
+   041A; 043A; Case map
+   041B; 043B; Case map
+   041C; 043C; Case map
+   041D; 043D; Case map
+   041E; 043E; Case map
+   041F; 043F; Case map
+   0420; 0440; Case map
+   0421; 0441; Case map
+   0422; 0442; Case map
+   0423; 0443; Case map
+   0424; 0444; Case map
+   0425; 0445; Case map
+   0426; 0446; Case map
+   0427; 0447; Case map
+   0428; 0448; Case map
+   0429; 0449; Case map
+   042A; 044A; Case map
+   042B; 044B; Case map
+   042C; 044C; Case map
+   042D; 044D; Case map
+   042E; 044E; Case map
+   042F; 044F; Case map
+   0460; 0461; Case map
+   0462; 0463; Case map
+   0464; 0465; Case map
+   0466; 0467; Case map
+   0468; 0469; Case map
+   046A; 046B; Case map
+   046C; 046D; Case map
+   046E; 046F; Case map
+   0470; 0471; Case map
+   0472; 0473; Case map
+   0474; 0475; Case map
+   0476; 0477; Case map
+   0478; 0479; Case map
+   047A; 047B; Case map
+   047C; 047D; Case map
+   047E; 047F; Case map
+   0480; 0481; Case map
+   048A; 048B; Case map
+   048C; 048D; Case map
+   048E; 048F; Case map
+   0490; 0491; Case map
+   0492; 0493; Case map
+   0494; 0495; Case map
+   0496; 0497; Case map
+   0498; 0499; Case map
+   049A; 049B; Case map
+   049C; 049D; Case map
+   049E; 049F; Case map
+   04A0; 04A1; Case map
+   04A2; 04A3; Case map
+   04A4; 04A5; Case map
+   04A6; 04A7; Case map
+   04A8; 04A9; Case map
+   04AA; 04AB; Case map
+   04AC; 04AD; Case map
+   04AE; 04AF; Case map
+   04B0; 04B1; Case map
+   04B2; 04B3; Case map
+   04B4; 04B5; Case map
+   04B6; 04B7; Case map
+   04B8; 04B9; Case map
+   04BA; 04BB; Case map
+   04BC; 04BD; Case map
+   04BE; 04BF; Case map
+   04C1; 04C2; Case map
+   04C3; 04C4; Case map
+   04C5; 04C6; Case map
+   04C7; 04C8; Case map
+   04C9; 04CA; Case map
+   04CB; 04CC; Case map
+   04CD; 04CE; Case map
+   04D0; 04D1; Case map
+   04D2; 04D3; Case map
+   04D4; 04D5; Case map
+   04D6; 04D7; Case map
+   04D8; 04D9; Case map
+   04DA; 04DB; Case map
+   04DC; 04DD; Case map
+   04DE; 04DF; Case map
+   04E0; 04E1; Case map
+   04E2; 04E3; Case map
+   04E4; 04E5; Case map
+   04E6; 04E7; Case map
+   04E8; 04E9; Case map
+   04EA; 04EB; Case map
+   04EC; 04ED; Case map
+   04EE; 04EF; Case map
+   04F0; 04F1; Case map
+   04F2; 04F3; Case map
+   04F4; 04F5; Case map
+   04F8; 04F9; Case map
+   0500; 0501; Case map
+   0502; 0503; Case map
+   0504; 0505; Case map
+   0506; 0507; Case map
+   0508; 0509; Case map
+   050A; 050B; Case map
+   050C; 050D; Case map
+   050E; 050F; Case map
+   0531; 0561; Case map
+   0532; 0562; Case map
+   0533; 0563; Case map
+   0534; 0564; Case map
+   0535; 0565; Case map
+   0536; 0566; Case map
+   0537; 0567; Case map
+   0538; 0568; Case map
+   0539; 0569; Case map
+   053A; 056A; Case map
+   053B; 056B; Case map
+   053C; 056C; Case map
+   053D; 056D; Case map
+   053E; 056E; Case map
+   053F; 056F; Case map
+   0540; 0570; Case map
+   0541; 0571; Case map
+   0542; 0572; Case map
+   0543; 0573; Case map
+   0544; 0574; Case map
+   0545; 0575; Case map
+   0546; 0576; Case map
+   0547; 0577; Case map
+   0548; 0578; Case map
+   0549; 0579; Case map
+   054A; 057A; Case map
+   054B; 057B; Case map
+   054C; 057C; Case map
+   054D; 057D; Case map
+   054E; 057E; Case map
+   054F; 057F; Case map
+   0550; 0580; Case map
+   0551; 0581; Case map
+   0552; 0582; Case map
+   0553; 0583; Case map
+   0554; 0584; Case map
+   0555; 0585; Case map
+   0556; 0586; Case map
+   0587; 0565 0582; Case map
+   1E00; 1E01; Case map
+   1E02; 1E03; Case map
+   1E04; 1E05; Case map
+   1E06; 1E07; Case map
+   1E08; 1E09; Case map
+   1E0A; 1E0B; Case map
+   1E0C; 1E0D; Case map
+   1E0E; 1E0F; Case map
+   1E10; 1E11; Case map
+   1E12; 1E13; Case map
+   1E14; 1E15; Case map
+   1E16; 1E17; Case map
+   1E18; 1E19; Case map
+   1E1A; 1E1B; Case map
+   1E1C; 1E1D; Case map
+   1E1E; 1E1F; Case map
+   1E20; 1E21; Case map
+   1E22; 1E23; Case map
+   1E24; 1E25; Case map
+   1E26; 1E27; Case map
+   1E28; 1E29; Case map
+   1E2A; 1E2B; Case map
+   1E2C; 1E2D; Case map
+   1E2E; 1E2F; Case map
+   1E30; 1E31; Case map
+   1E32; 1E33; Case map
+   1E34; 1E35; Case map
+   1E36; 1E37; Case map
+   1E38; 1E39; Case map
+   1E3A; 1E3B; Case map
+   1E3C; 1E3D; Case map
+   1E3E; 1E3F; Case map
+   1E40; 1E41; Case map
+   1E42; 1E43; Case map
+   1E44; 1E45; Case map
+   1E46; 1E47; Case map
+   1E48; 1E49; Case map
+   1E4A; 1E4B; Case map
+   1E4C; 1E4D; Case map
+   1E4E; 1E4F; Case map
+   1E50; 1E51; Case map
+   1E52; 1E53; Case map
+   1E54; 1E55; Case map
+   1E56; 1E57; Case map
+   1E58; 1E59; Case map
+   1E5A; 1E5B; Case map
+   1E5C; 1E5D; Case map
+   1E5E; 1E5F; Case map
+   1E60; 1E61; Case map
+   1E62; 1E63; Case map
+   1E64; 1E65; Case map
+   1E66; 1E67; Case map
+   1E68; 1E69; Case map
+   1E6A; 1E6B; Case map
+   1E6C; 1E6D; Case map
+   1E6E; 1E6F; Case map
+   1E70; 1E71; Case map
+   1E72; 1E73; Case map
+   1E74; 1E75; Case map
+   1E76; 1E77; Case map
+   1E78; 1E79; Case map
+   1E7A; 1E7B; Case map
+   1E7C; 1E7D; Case map
+   1E7E; 1E7F; Case map
+   1E80; 1E81; Case map
+   1E82; 1E83; Case map
+   1E84; 1E85; Case map
+   1E86; 1E87; Case map
+   1E88; 1E89; Case map
+   1E8A; 1E8B; Case map
+   1E8C; 1E8D; Case map
+   1E8E; 1E8F; Case map
+   1E90; 1E91; Case map
+   1E92; 1E93; Case map
+   1E94; 1E95; Case map
+   1E96; 0068 0331; Case map
+   1E97; 0074 0308; Case map
+   1E98; 0077 030A; Case map
+   1E99; 0079 030A; Case map
+   1E9A; 0061 02BE; Case map
+   1E9B; 1E61; Case map
+   1EA0; 1EA1; Case map
+   1EA2; 1EA3; Case map
+   1EA4; 1EA5; Case map
+   1EA6; 1EA7; Case map
+   1EA8; 1EA9; Case map
+   1EAA; 1EAB; Case map
+   1EAC; 1EAD; Case map
+   1EAE; 1EAF; Case map
+   1EB0; 1EB1; Case map
+   1EB2; 1EB3; Case map
+   1EB4; 1EB5; Case map
+   1EB6; 1EB7; Case map
+   1EB8; 1EB9; Case map
+   1EBA; 1EBB; Case map
+   1EBC; 1EBD; Case map
+   1EBE; 1EBF; Case map
+   1EC0; 1EC1; Case map
+   1EC2; 1EC3; Case map
+   1EC4; 1EC5; Case map
+   1EC6; 1EC7; Case map
+   1EC8; 1EC9; Case map
+   1ECA; 1ECB; Case map
+   1ECC; 1ECD; Case map
+   1ECE; 1ECF; Case map
+   1ED0; 1ED1; Case map
+   1ED2; 1ED3; Case map
+   1ED4; 1ED5; Case map
+   1ED6; 1ED7; Case map
+   1ED8; 1ED9; Case map
+   1EDA; 1EDB; Case map
+   1EDC; 1EDD; Case map
+   1EDE; 1EDF; Case map
+   1EE0; 1EE1; Case map
+   1EE2; 1EE3; Case map
+   1EE4; 1EE5; Case map
+   1EE6; 1EE7; Case map
+   1EE8; 1EE9; Case map
+   1EEA; 1EEB; Case map
+   1EEC; 1EED; Case map
+   1EEE; 1EEF; Case map
+   1EF0; 1EF1; Case map
+   1EF2; 1EF3; Case map
+   1EF4; 1EF5; Case map
+   1EF6; 1EF7; Case map
+   1EF8; 1EF9; Case map
+   1F08; 1F00; Case map
+   1F09; 1F01; Case map
+   1F0A; 1F02; Case map
+   1F0B; 1F03; Case map
+   1F0C; 1F04; Case map
+   1F0D; 1F05; Case map
+   1F0E; 1F06; Case map
+   1F0F; 1F07; Case map
+   1F18; 1F10; Case map
+   1F19; 1F11; Case map
+   1F1A; 1F12; Case map
+   1F1B; 1F13; Case map
+   1F1C; 1F14; Case map
+   1F1D; 1F15; Case map
+   1F28; 1F20; Case map
+   1F29; 1F21; Case map
+   1F2A; 1F22; Case map
+   1F2B; 1F23; Case map
+   1F2C; 1F24; Case map
+   1F2D; 1F25; Case map
+   1F2E; 1F26; Case map
+   1F2F; 1F27; Case map
+   1F38; 1F30; Case map
+   1F39; 1F31; Case map
+   1F3A; 1F32; Case map
+   1F3B; 1F33; Case map
+   1F3C; 1F34; Case map
+   1F3D; 1F35; Case map
+   1F3E; 1F36; Case map
+   1F3F; 1F37; Case map
+   1F48; 1F40; Case map
+   1F49; 1F41; Case map
+   1F4A; 1F42; Case map
+   1F4B; 1F43; Case map
+   1F4C; 1F44; Case map
+   1F4D; 1F45; Case map
+   1F50; 03C5 0313; Case map
+   1F52; 03C5 0313 0300; Case map
+   1F54; 03C5 0313 0301; Case map
+   1F56; 03C5 0313 0342; Case map
+   1F59; 1F51; Case map
+   1F5B; 1F53; Case map
+   1F5D; 1F55; Case map
+   1F5F; 1F57; Case map
+   1F68; 1F60; Case map
+   1F69; 1F61; Case map
+   1F6A; 1F62; Case map
+   1F6B; 1F63; Case map
+   1F6C; 1F64; Case map
+   1F6D; 1F65; Case map
+   1F6E; 1F66; Case map
+   1F6F; 1F67; Case map
+   1F80; 1F00 03B9; Case map
+   1F81; 1F01 03B9; Case map
+   1F82; 1F02 03B9; Case map
+   1F83; 1F03 03B9; Case map
+   1F84; 1F04 03B9; Case map
+   1F85; 1F05 03B9; Case map
+   1F86; 1F06 03B9; Case map
+   1F87; 1F07 03B9; Case map
+   1F88; 1F00 03B9; Case map
+   1F89; 1F01 03B9; Case map
+   1F8A; 1F02 03B9; Case map
+   1F8B; 1F03 03B9; Case map
+   1F8C; 1F04 03B9; Case map
+   1F8D; 1F05 03B9; Case map
+   1F8E; 1F06 03B9; Case map
+   1F8F; 1F07 03B9; Case map
+   1F90; 1F20 03B9; Case map
+   1F91; 1F21 03B9; Case map
+   1F92; 1F22 03B9; Case map
+   1F93; 1F23 03B9; Case map
+   1F94; 1F24 03B9; Case map
+   1F95; 1F25 03B9; Case map
+   1F96; 1F26 03B9; Case map
+   1F97; 1F27 03B9; Case map
+   1F98; 1F20 03B9; Case map
+   1F99; 1F21 03B9; Case map
+   1F9A; 1F22 03B9; Case map
+   1F9B; 1F23 03B9; Case map
+   1F9C; 1F24 03B9; Case map
+   1F9D; 1F25 03B9; Case map
+   1F9E; 1F26 03B9; Case map
+   1F9F; 1F27 03B9; Case map
+   1FA0; 1F60 03B9; Case map
+   1FA1; 1F61 03B9; Case map
+   1FA2; 1F62 03B9; Case map
+   1FA3; 1F63 03B9; Case map
+   1FA4; 1F64 03B9; Case map
+   1FA5; 1F65 03B9; Case map
+   1FA6; 1F66 03B9; Case map
+   1FA7; 1F67 03B9; Case map
+   1FA8; 1F60 03B9; Case map
+   1FA9; 1F61 03B9; Case map
+   1FAA; 1F62 03B9; Case map
+   1FAB; 1F63 03B9; Case map
+   1FAC; 1F64 03B9; Case map
+   1FAD; 1F65 03B9; Case map
+   1FAE; 1F66 03B9; Case map
+   1FAF; 1F67 03B9; Case map
+   1FB2; 1F70 03B9; Case map
+   1FB3; 03B1 03B9; Case map
+   1FB4; 03AC 03B9; Case map
+   1FB6; 03B1 0342; Case map
+   1FB7; 03B1 0342 03B9; Case map
+   1FB8; 1FB0; Case map
+   1FB9; 1FB1; Case map
+   1FBA; 1F70; Case map
+   1FBB; 1F71; Case map
+   1FBC; 03B1 03B9; Case map
+   1FBE; 03B9; Case map
+   1FC2; 1F74 03B9; Case map
+   1FC3; 03B7 03B9; Case map
+   1FC4; 03AE 03B9; Case map
+   1FC6; 03B7 0342; Case map
+   1FC7; 03B7 0342 03B9; Case map
+   1FC8; 1F72; Case map
+   1FC9; 1F73; Case map
+   1FCA; 1F74; Case map
+   1FCB; 1F75; Case map
+   1FCC; 03B7 03B9; Case map
+   1FD2; 03B9 0308 0300; Case map
+   1FD3; 03B9 0308 0301; Case map
+   1FD6; 03B9 0342; Case map
+   1FD7; 03B9 0308 0342; Case map
+   1FD8; 1FD0; Case map
+   1FD9; 1FD1; Case map
+   1FDA; 1F76; Case map
+   1FDB; 1F77; Case map
+   1FE2; 03C5 0308 0300; Case map
+   1FE3; 03C5 0308 0301; Case map
+   1FE4; 03C1 0313; Case map
+   1FE6; 03C5 0342; Case map
+   1FE7; 03C5 0308 0342; Case map
+   1FE8; 1FE0; Case map
+   1FE9; 1FE1; Case map
+   1FEA; 1F7A; Case map
+   1FEB; 1F7B; Case map
+   1FEC; 1FE5; Case map
+   1FF2; 1F7C 03B9; Case map
+   1FF3; 03C9 03B9; Case map
+   1FF4; 03CE 03B9; Case map
+   1FF6; 03C9 0342; Case map
+   1FF7; 03C9 0342 03B9; Case map
+   1FF8; 1F78; Case map
+   1FF9; 1F79; Case map
+   1FFA; 1F7C; Case map
+   1FFB; 1F7D; Case map
+   1FFC; 03C9 03B9; Case map
+   2126; 03C9; Case map
+   212A; 006B; Case map
+   212B; 00E5; Case map
+   2160; 2170; Case map
+   2161; 2171; Case map
+   2162; 2172; Case map
+   2163; 2173; Case map
+   2164; 2174; Case map
+   2165; 2175; Case map
+   2166; 2176; Case map
+   2167; 2177; Case map
+   2168; 2178; Case map
+   2169; 2179; Case map
+   216A; 217A; Case map
+   216B; 217B; Case map
+   216C; 217C; Case map
+   216D; 217D; Case map
+   216E; 217E; Case map
+   216F; 217F; Case map
+   24B6; 24D0; Case map
+   24B7; 24D1; Case map
+   24B8; 24D2; Case map
+   24B9; 24D3; Case map
+   24BA; 24D4; Case map
+   24BB; 24D5; Case map
+   24BC; 24D6; Case map
+   24BD; 24D7; Case map
+   24BE; 24D8; Case map
+   24BF; 24D9; Case map
+   24C0; 24DA; Case map
+   24C1; 24DB; Case map
+   24C2; 24DC; Case map
+   24C3; 24DD; Case map
+   24C4; 24DE; Case map
+   24C5; 24DF; Case map
+   24C6; 24E0; Case map
+   24C7; 24E1; Case map
+   24C8; 24E2; Case map
+   24C9; 24E3; Case map
+   24CA; 24E4; Case map
+   24CB; 24E5; Case map
+   24CC; 24E6; Case map
+   24CD; 24E7; Case map
+   24CE; 24E8; Case map
+   24CF; 24E9; Case map
+   FB00; 0066 0066; Case map
+   FB01; 0066 0069; Case map
+   FB02; 0066 006C; Case map
+   FB03; 0066 0066 0069; Case map
+   FB04; 0066 0066 006C; Case map
+   FB05; 0073 0074; Case map
+   FB06; 0073 0074; Case map
+   FB13; 0574 0576; Case map
+   FB14; 0574 0565; Case map
+   FB15; 0574 056B; Case map
+   FB16; 057E 0576; Case map
+   FB17; 0574 056D; Case map
+   FF21; FF41; Case map
+   FF22; FF42; Case map
+   FF23; FF43; Case map
+   FF24; FF44; Case map
+   FF25; FF45; Case map
+   FF26; FF46; Case map
+   FF27; FF47; Case map
+   FF28; FF48; Case map
+   FF29; FF49; Case map
+   FF2A; FF4A; Case map
+   FF2B; FF4B; Case map
+   FF2C; FF4C; Case map
+   FF2D; FF4D; Case map
+   FF2E; FF4E; Case map
+   FF2F; FF4F; Case map
+   FF30; FF50; Case map
+   FF31; FF51; Case map
+   FF32; FF52; Case map
+   FF33; FF53; Case map
+   FF34; FF54; Case map
+   FF35; FF55; Case map
+   FF36; FF56; Case map
+   FF37; FF57; Case map
+   FF38; FF58; Case map
+   FF39; FF59; Case map
+   FF3A; FF5A; Case map
+   10400; 10428; Case map
+   10401; 10429; Case map
+   10402; 1042A; Case map
+   10403; 1042B; Case map
+   10404; 1042C; Case map
+   10405; 1042D; Case map
+   10406; 1042E; Case map
+   10407; 1042F; Case map
+   10408; 10430; Case map
+   10409; 10431; Case map
+   1040A; 10432; Case map
+   1040B; 10433; Case map
+   1040C; 10434; Case map
+   1040D; 10435; Case map
+   1040E; 10436; Case map
+   1040F; 10437; Case map
+   10410; 10438; Case map
+   10411; 10439; Case map
+   10412; 1043A; Case map
+   10413; 1043B; Case map
+   10414; 1043C; Case map
+   10415; 1043D; Case map
+   10416; 1043E; Case map
+   10417; 1043F; Case map
+   10418; 10440; Case map
+   10419; 10441; Case map
+   1041A; 10442; Case map
+   1041B; 10443; Case map
+   1041C; 10444; Case map
+   1041D; 10445; Case map
+   1041E; 10446; Case map
+   1041F; 10447; Case map
+   10420; 10448; Case map
+   10421; 10449; Case map
+   10422; 1044A; Case map
+   10423; 1044B; Case map
+   10424; 1044C; Case map
+   10425; 1044D; Case map
+   ----- End Table B.3 -----
+
+   ----- Start Table C.1.1 -----
+   0020; SPACE
+   ----- End Table C.1.1 -----
+
+   ----- Start Table C.1.2 -----
+   00A0; NO-BREAK SPACE
+   1680; OGHAM SPACE MARK
+   2000; EN QUAD
+   2001; EM QUAD
+   2002; EN SPACE
+   2003; EM SPACE
+   2004; THREE-PER-EM SPACE
+   2005; FOUR-PER-EM SPACE
+   2006; SIX-PER-EM SPACE
+   2007; FIGURE SPACE
+   2008; PUNCTUATION SPACE
+   2009; THIN SPACE
+   200A; HAIR SPACE
+   200B; ZERO WIDTH SPACE
+   202F; NARROW NO-BREAK SPACE
+   205F; MEDIUM MATHEMATICAL SPACE
+   3000; IDEOGRAPHIC SPACE
+   ----- End Table C.1.2 -----
+
+   ----- Start Table C.2.1 -----
+   0000-001F; [CONTROL CHARACTERS]
+   007F; DELETE
+   ----- End Table C.2.1 -----
+
+   ----- Start Table C.2.2 -----
+   0080-009F; [CONTROL CHARACTERS]
+   06DD; ARABIC END OF AYAH
+   070F; SYRIAC ABBREVIATION MARK
+   180E; MONGOLIAN VOWEL SEPARATOR
+   200C; ZERO WIDTH NON-JOINER
+   200D; ZERO WIDTH JOINER
+   2028; LINE SEPARATOR
+   2029; PARAGRAPH SEPARATOR
+   2060; WORD JOINER
+   2061; FUNCTION APPLICATION
+   2062; INVISIBLE TIMES
+   2063; INVISIBLE SEPARATOR
+   206A-206F; [CONTROL CHARACTERS]
+   FEFF; ZERO WIDTH NO-BREAK SPACE
+   FFF9-FFFC; [CONTROL CHARACTERS]
+   1D173-1D17A; [MUSICAL CONTROL CHARACTERS]
+   ----- End Table C.2.2 -----
+
+   ----- Start Table C.3 -----
+   E000-F8FF; [PRIVATE USE, PLANE 0]
+   F0000-FFFFD; [PRIVATE USE, PLANE 15]
+   100000-10FFFD; [PRIVATE USE, PLANE 16]
+   ----- End Table C.3 -----
+
+   ----- Start Table C.4 -----
+   FDD0-FDEF; [NONCHARACTER CODE POINTS]
+   FFFE-FFFF; [NONCHARACTER CODE POINTS]
+   1FFFE-1FFFF; [NONCHARACTER CODE POINTS]
+   2FFFE-2FFFF; [NONCHARACTER CODE POINTS]
+   3FFFE-3FFFF; [NONCHARACTER CODE POINTS]
+   4FFFE-4FFFF; [NONCHARACTER CODE POINTS]
+   5FFFE-5FFFF; [NONCHARACTER CODE POINTS]
+   6FFFE-6FFFF; [NONCHARACTER CODE POINTS]
+   7FFFE-7FFFF; [NONCHARACTER CODE POINTS]
+   8FFFE-8FFFF; [NONCHARACTER CODE POINTS]
+   9FFFE-9FFFF; [NONCHARACTER CODE POINTS]
+   AFFFE-AFFFF; [NONCHARACTER CODE POINTS]
+   BFFFE-BFFFF; [NONCHARACTER CODE POINTS]
+   CFFFE-CFFFF; [NONCHARACTER CODE POINTS]
+   DFFFE-DFFFF; [NONCHARACTER CODE POINTS]
+   EFFFE-EFFFF; [NONCHARACTER CODE POINTS]
+   FFFFE-FFFFF; [NONCHARACTER CODE POINTS]
+   10FFFE-10FFFF; [NONCHARACTER CODE POINTS]
+   ----- End Table C.4 -----
+
+   ----- Start Table C.5 -----
+   D800-DFFF; [SURROGATE CODES]
+   ----- End Table C.5 -----
+
+   ----- Start Table C.6 -----
+   FFF9; INTERLINEAR ANNOTATION ANCHOR
+   FFFA; INTERLINEAR ANNOTATION SEPARATOR
+   FFFB; INTERLINEAR ANNOTATION TERMINATOR
+   FFFC; OBJECT REPLACEMENT CHARACTER
+   FFFD; REPLACEMENT CHARACTER
+   ----- End Table C.6 -----
+
+   ----- Start Table C.7 -----
+   2FF0-2FFB; [IDEOGRAPHIC DESCRIPTION CHARACTERS]
+   ----- End Table C.7 -----
+
+   ----- Start Table C.8 -----
+   0340; COMBINING GRAVE TONE MARK
+   0341; COMBINING ACUTE TONE MARK
+   200E; LEFT-TO-RIGHT MARK
+   200F; RIGHT-TO-LEFT MARK
+   202A; LEFT-TO-RIGHT EMBEDDING
+   202B; RIGHT-TO-LEFT EMBEDDING
+   202C; POP DIRECTIONAL FORMATTING
+   202D; LEFT-TO-RIGHT OVERRIDE
+   202E; RIGHT-TO-LEFT OVERRIDE
+   206A; INHIBIT SYMMETRIC SWAPPING
+   206B; ACTIVATE SYMMETRIC SWAPPING
+   206C; INHIBIT ARABIC FORM SHAPING
+   206D; ACTIVATE ARABIC FORM SHAPING
+   206E; NATIONAL DIGIT SHAPES
+   206F; NOMINAL DIGIT SHAPES
+   ----- End Table C.8 -----
+
+   ----- Start Table C.9 -----
+   E0001; LANGUAGE TAG
+   E0020-E007F; [TAGGING CHARACTERS]
+   ----- End Table C.9 -----
+
+   ----- Start Table D.1 -----
+   05BE
+   05C0
+   05C3
+   05D0-05EA
+   05F0-05F4
+   061B
+   061F
+   0621-063A
+   0640-064A
+   066D-066F
+   0671-06D5
+   06DD
+   06E5-06E6
+   06FA-06FE
+   0700-070D
+   0710
+   0712-072C
+   0780-07A5
+   07B1
+   200F
+   FB1D
+   FB1F-FB28
+   FB2A-FB36
+   FB38-FB3C
+   FB3E
+   FB40-FB41
+   FB43-FB44
+   FB46-FBB1
+   FBD3-FD3D
+   FD50-FD8F
+   FD92-FDC7
+   FDF0-FDFC
+   FE70-FE74
+   FE76-FEFC
+   ----- End Table D.1 -----
+
+   ----- Start Table D.2 -----
+   0041-005A
+   0061-007A
+   00AA
+   00B5
+   00BA
+   00C0-00D6
+   00D8-00F6
+   00F8-0220
+   0222-0233
+   0250-02AD
+   02B0-02B8
+   02BB-02C1
+   02D0-02D1
+   02E0-02E4
+   02EE
+   037A
+   0386
+   0388-038A
+   038C
+   038E-03A1
+   03A3-03CE
+   03D0-03F5
+   0400-0482
+   048A-04CE
+   04D0-04F5
+   04F8-04F9
+   0500-050F
+   0531-0556
+   0559-055F
+   0561-0587
+   0589
+   0903
+   0905-0939
+   093D-0940
+   0949-094C
+   0950
+   0958-0961
+   0964-0970
+   0982-0983
+   0985-098C
+   098F-0990
+   0993-09A8
+   09AA-09B0
+   09B2
+   09B6-09B9
+   09BE-09C0
+   09C7-09C8
+   09CB-09CC
+   09D7
+   09DC-09DD
+   09DF-09E1
+   09E6-09F1
+   09F4-09FA
+   0A05-0A0A
+   0A0F-0A10
+   0A13-0A28
+   0A2A-0A30
+   0A32-0A33
+   0A35-0A36
+   0A38-0A39
+   0A3E-0A40
+   0A59-0A5C
+   0A5E
+   0A66-0A6F
+   0A72-0A74
+   0A83
+   0A85-0A8B
+   0A8D
+   0A8F-0A91
+   0A93-0AA8
+   0AAA-0AB0
+   0AB2-0AB3
+   0AB5-0AB9
+   0ABD-0AC0
+   0AC9
+   0ACB-0ACC
+   0AD0
+   0AE0
+   0AE6-0AEF
+   0B02-0B03
+   0B05-0B0C
+   0B0F-0B10
+   0B13-0B28
+   0B2A-0B30
+   0B32-0B33
+   0B36-0B39
+   0B3D-0B3E
+   0B40
+   0B47-0B48
+   0B4B-0B4C
+   0B57
+   0B5C-0B5D
+   0B5F-0B61
+   0B66-0B70
+   0B83
+   0B85-0B8A
+   0B8E-0B90
+   0B92-0B95
+   0B99-0B9A
+   0B9C
+   0B9E-0B9F
+   0BA3-0BA4
+   0BA8-0BAA
+   0BAE-0BB5
+   0BB7-0BB9
+   0BBE-0BBF
+   0BC1-0BC2
+   0BC6-0BC8
+   0BCA-0BCC
+   0BD7
+   0BE7-0BF2
+   0C01-0C03
+   0C05-0C0C
+   0C0E-0C10
+   0C12-0C28
+   0C2A-0C33
+   0C35-0C39
+   0C41-0C44
+   0C60-0C61
+   0C66-0C6F
+   0C82-0C83
+   0C85-0C8C
+   0C8E-0C90
+   0C92-0CA8
+   0CAA-0CB3
+   0CB5-0CB9
+   0CBE
+   0CC0-0CC4
+   0CC7-0CC8
+   0CCA-0CCB
+   0CD5-0CD6
+   0CDE
+   0CE0-0CE1
+   0CE6-0CEF
+   0D02-0D03
+   0D05-0D0C
+   0D0E-0D10
+   0D12-0D28
+   0D2A-0D39
+   0D3E-0D40
+   0D46-0D48
+   0D4A-0D4C
+   0D57
+   0D60-0D61
+   0D66-0D6F
+   0D82-0D83
+   0D85-0D96
+   0D9A-0DB1
+   0DB3-0DBB
+   0DBD
+   0DC0-0DC6
+   0DCF-0DD1
+   0DD8-0DDF
+   0DF2-0DF4
+   0E01-0E30
+   0E32-0E33
+   0E40-0E46
+   0E4F-0E5B
+   0E81-0E82
+   0E84
+   0E87-0E88
+   0E8A
+   0E8D
+   0E94-0E97
+   0E99-0E9F
+   0EA1-0EA3
+   0EA5
+   0EA7
+   0EAA-0EAB
+   0EAD-0EB0
+   0EB2-0EB3
+   0EBD
+   0EC0-0EC4
+   0EC6
+   0ED0-0ED9
+   0EDC-0EDD
+   0F00-0F17
+   0F1A-0F34
+   0F36
+   0F38
+   0F3E-0F47
+   0F49-0F6A
+   0F7F
+   0F85
+   0F88-0F8B
+   0FBE-0FC5
+   0FC7-0FCC
+   0FCF
+   1000-1021
+   1023-1027
+   1029-102A
+   102C
+   1031
+   1038
+   1040-1057
+   10A0-10C5
+   10D0-10F8
+   10FB
+   1100-1159
+   115F-11A2
+   11A8-11F9
+   1200-1206
+   1208-1246
+   1248
+   124A-124D
+   1250-1256
+   1258
+   125A-125D
+   1260-1286
+   1288
+   128A-128D
+   1290-12AE
+   12B0
+   12B2-12B5
+   12B8-12BE
+   12C0
+   12C2-12C5
+   12C8-12CE
+   12D0-12D6
+   12D8-12EE
+   12F0-130E
+   1310
+   1312-1315
+   1318-131E
+   1320-1346
+   1348-135A
+   1361-137C
+   13A0-13F4
+   1401-1676
+   1681-169A
+   16A0-16F0
+   1700-170C
+   170E-1711
+   1720-1731
+   1735-1736
+   1740-1751
+   1760-176C
+   176E-1770
+   1780-17B6
+   17BE-17C5
+   17C7-17C8
+   17D4-17DA
+   17DC
+   17E0-17E9
+   1810-1819
+   1820-1877
+   1880-18A8
+   1E00-1E9B
+   1EA0-1EF9
+   1F00-1F15
+   1F18-1F1D
+   1F20-1F45
+   1F48-1F4D
+   1F50-1F57
+   1F59
+   1F5B
+   1F5D
+   1F5F-1F7D
+   1F80-1FB4
+   1FB6-1FBC
+   1FBE
+   1FC2-1FC4
+   1FC6-1FCC
+   1FD0-1FD3
+   1FD6-1FDB
+   1FE0-1FEC
+   1FF2-1FF4
+   1FF6-1FFC
+   200E
+   2071
+   207F
+   2102
+   2107
+   210A-2113
+   2115
+   2119-211D
+   2124
+   2126
+   2128
+   212A-212D
+   212F-2131
+   2133-2139
+   213D-213F
+   2145-2149
+   2160-2183
+   2336-237A
+   2395
+   249C-24E9
+   3005-3007
+   3021-3029
+   3031-3035
+   3038-303C
+   3041-3096
+   309D-309F
+   30A1-30FA
+   30FC-30FF
+   3105-312C
+   3131-318E
+   3190-31B7
+   31F0-321C
+   3220-3243
+   3260-327B
+   327F-32B0
+   32C0-32CB
+   32D0-32FE
+   3300-3376
+   337B-33DD
+   33E0-33FE
+   3400-4DB5
+   4E00-9FA5
+   A000-A48C
+   AC00-D7A3
+   D800-FA2D
+   FA30-FA6A
+   FB00-FB06
+   FB13-FB17
+   FF21-FF3A
+   FF41-FF5A
+   FF66-FFBE
+   FFC2-FFC7
+   FFCA-FFCF
+   FFD2-FFD7
+   FFDA-FFDC
+   10300-1031E
+   10320-10323
+   10330-1034A
+   10400-10425
+   10428-1044D
+   1D000-1D0F5
+   1D100-1D126
+   1D12A-1D166
+   1D16A-1D172
+   1D183-1D184
+   1D18C-1D1A9
+   1D1AE-1D1DD
+   1D400-1D454
+   1D456-1D49C
+   1D49E-1D49F
+   1D4A2
+   1D4A5-1D4A6
+   1D4A9-1D4AC
+   1D4AE-1D4B9
+   1D4BB
+   1D4BD-1D4C0
+   1D4C2-1D4C3
+   1D4C5-1D505
+   1D507-1D50A
+   1D50D-1D514
+   1D516-1D51C
+   1D51E-1D539
+   1D53B-1D53E
+   1D540-1D544
+   1D546
+   1D54A-1D550
+   1D552-1D6A3
+   1D6A8-1D7C9
+   20000-2A6D6
+   2F800-2FA1D
+   F0000-FFFFD
+   100000-10FFFD
+   ----- End Table D.2 -----

From 8533db13a409b36bce8b328d4c3be97d5de14eaa Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sat, 8 Aug 2020 21:48:17 +0300
Subject: [PATCH 219/383] Add and enable bundled qca by default

---
 CMakeLists.txt             | 36 ++++++++++++++++++++++++++++++------
 iris.pro                   |  2 ++
 src/irisnet/CMakeLists.txt |  3 +++
 src/xmpp/CMakeLists.txt    |  8 +++++++-
 4 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 36906670..edade0b3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,6 +38,7 @@ set( CMAKE_MODULE_PATH
 
 option( USE_QJDNS "Use qjdns/jdns library. Disabled by default for Qt5" OFF )
 option( SEPARATE_QJDNS "Build qjdns with iris library" OFF )
+option( BUNDLED_QCA "Adds: DTLS, Blake2b and other useful for XMPP crypto-stuff" ON)
 
 set(CMAKE_CXX_STANDARD 14)
 
@@ -49,13 +50,34 @@ set(CMAKE_AUTOMOC ON)
 find_package(Qt5 COMPONENTS Core Gui Xml Network REQUIRED)
 if(USE_QJDNS)
     message(WARNING "USE_QJDNS flag is enabled with Qt5. If you have problems with connection please disable this flag")
+    add_definitions(-DNEED_JDNS)
 endif()
 
-if(USE_QJDNS)
-    add_definitions(-DNEED_JDNS)
+if(BUNDLED_QCA)
+    message(STATUS "QCA: using bundled")
+    set(QCA_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/qca)
+    set(Qca_INCLUDE_DIR ${QCA_PREFIX}/include/Qca-qt5/QtCrypto)
+    set(Qca_LIBRARY ${QCA_PREFIX}/lib/libqca-qt5.a
+        ${QCA_PREFIX}/lib/qca-qt5/crypto/libqca-ossl.a)
+
+    include(ExternalProject)
+    set(QCA_BUILD_OPTIONS -DBUILD_SHARED_LIBS=OFF -DBUILD_PLUGINS=ossl
+        -DBUILD_TESTS=OFF -DBUILD_TOOLS=OFF
+        -DCMAKE_INSTALL_PREFIX=${QCA_PREFIX})
+    if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/3rdpaty/qca)
+        ExternalProject_Add(qca
+            SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdpaty/qca
+            CMAKE_ARGS ${QCA_BUILD_OPTIONS})
+    else()
+        ExternalProject_Add(qca
+            GIT_REPOSITORY https://github.com/psi-im/qca.git
+            CMAKE_ARGS ${QCA_BUILD_OPTIONS})
+    endif()
+else()
+    message(STATUS "QCA: using system")
+    find_package(Qca REQUIRED)
 endif()
 
-find_package(Qca REQUIRED)
 set(QCA_INCLUDES ${Qca_INCLUDE_DIR})
 set(qca_LIB ${Qca_LIBRARY})
 
@@ -125,9 +147,11 @@ elseif(USE_QJDNS)
     include_directories( ${QJDns_INCLUDE_DIR} )
 endif()
 
-find_package(B2 QUIET)
-if(B2_FOUND)
-    message(STATUS "Found B2: ${B2_LIBRARY}")
+if (NOT BUNDLED_QCA)
+    find_package(B2 QUIET)
+    if(B2_FOUND)
+        message(STATUS "Found B2: ${B2_LIBRARY}")
+    endif()
 endif()
 
 add_definitions(-DIRISNET_STATIC -DQSTRINGPREP_BUILDING)
diff --git a/iris.pro b/iris.pro
index f8ba8ae5..4612f91f 100644
--- a/iris.pro
+++ b/iris.pro
@@ -18,3 +18,5 @@ sub_tools.depends = sub_src
 build_src:SUBDIRS += sub_src
 
 iris_tests:SUBDIRS += sub_tools
+
+OTHER_FILES += README.md CMakeLists.txt
diff --git a/src/irisnet/CMakeLists.txt b/src/irisnet/CMakeLists.txt
index 9b62c47b..f81d99ff 100644
--- a/src/irisnet/CMakeLists.txt
+++ b/src/irisnet/CMakeLists.txt
@@ -123,3 +123,6 @@ endif()
 
 target_link_libraries(irisnet ${QJDns_LIBRARY} ${EXTRA_LDFLAGS})
 target_link_libraries(irisnet Qt5::Core Qt5::Network Qt5::Xml ${qca_LIB})
+if (BUNDLED_QCA)
+    add_dependencies(irisnet qca)
+endif()
diff --git a/src/xmpp/CMakeLists.txt b/src/xmpp/CMakeLists.txt
index ed079d2a..912093ff 100644
--- a/src/xmpp/CMakeLists.txt
+++ b/src/xmpp/CMakeLists.txt
@@ -188,7 +188,9 @@ if(B2_FOUND)
     target_compile_definitions(iris PUBLIC IRIS_SYSTEM_BLAKE2)
     target_link_libraries(iris ${B2_LIBRARY})
 else()
-    message(STATUS "Building with slow blake2 reference implementation")
+    if (NOT BUNDLED_QCA)
+        message(STATUS "No system blake2 and bundled QCA is disabled. Expect slow hashing.")
+    endif()
     target_sources(iris PRIVATE
             blake2/blake2b-ref.c
             blake2/blake2s-ref.c
@@ -204,5 +206,9 @@ endif()
 
 target_link_libraries(iris ${ZLIB_LIBRARY} ${EXTRA_LDFLAGS} stringprep)
 target_link_libraries(iris irisnet Qt5::Core Qt5::Gui Qt5::Network Qt5::Xml ${qca_LIB})
+if (BUNDLED_QCA)
+    add_dependencies(iris qca)
+    target_include_directories(iris INTERFACE ${Qca_INCLUDE_DIR})
+endif()
 target_compile_definitions(iris INTERFACE IRISNET_STATIC)
 target_include_directories(iris INTERFACE ${ABS_ROOT_DIR}/include ${ABS_ROOT_DIR}/include/iris ${ABS_PARENT_DIR})

From 5ef94ec3a059713ea9a243799530adeb14e0b28e Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 9 Aug 2020 12:13:17 +0300
Subject: [PATCH 220/383] Fix Ninja with bundled qca. But this affects minimal
 cmake version

---
 CMakeLists.txt             | 17 +++++++++++------
 src/irisnet/CMakeLists.txt |  7 +++++--
 src/xmpp/CMakeLists.txt    |  8 ++++++--
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index edade0b3..84bc2ce9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,22 +57,27 @@ if(BUNDLED_QCA)
     message(STATUS "QCA: using bundled")
     set(QCA_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/qca)
     set(Qca_INCLUDE_DIR ${QCA_PREFIX}/include/Qca-qt5/QtCrypto)
-    set(Qca_LIBRARY ${QCA_PREFIX}/lib/libqca-qt5.a
-        ${QCA_PREFIX}/lib/qca-qt5/crypto/libqca-ossl.a)
+    set(Qca_CORE_LIB ${QCA_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}qca-qt5${CMAKE_STATIC_LIBRARY_SUFFIX})
+    set(Qca_LIBRARY ${Qca_CORE_LIB}
+        ${QCA_PREFIX}/lib/qca-qt5/crypto/${CMAKE_STATIC_LIBRARY_PREFIX}qca-ossl${CMAKE_STATIC_LIBRARY_SUFFIX})
 
     include(ExternalProject)
     set(QCA_BUILD_OPTIONS -DBUILD_SHARED_LIBS=OFF -DBUILD_PLUGINS=ossl
         -DBUILD_TESTS=OFF -DBUILD_TOOLS=OFF
         -DCMAKE_INSTALL_PREFIX=${QCA_PREFIX})
     if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/3rdpaty/qca)
-        ExternalProject_Add(qca
+        ExternalProject_Add(QcaProject
             SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdpaty/qca
-            CMAKE_ARGS ${QCA_BUILD_OPTIONS})
+            CMAKE_ARGS ${QCA_BUILD_OPTIONS}
+            BUILD_BYPRODUCTS ${Qca_LIBRARY})
     else()
-        ExternalProject_Add(qca
+        ExternalProject_Add(QcaProject
             GIT_REPOSITORY https://github.com/psi-im/qca.git
-            CMAKE_ARGS ${QCA_BUILD_OPTIONS})
+            CMAKE_ARGS ${QCA_BUILD_OPTIONS}
+            BUILD_BYPRODUCTS ${Qca_LIBRARY})
     endif()
+    add_library(Qca STATIC IMPORTED)
+    set_target_properties(Qca PROPERTIES IMPORTED_LOCATION ${Qca_CORE_LIB})
 else()
     message(STATUS "QCA: using system")
     find_package(Qca REQUIRED)
diff --git a/src/irisnet/CMakeLists.txt b/src/irisnet/CMakeLists.txt
index f81d99ff..228f2f87 100644
--- a/src/irisnet/CMakeLists.txt
+++ b/src/irisnet/CMakeLists.txt
@@ -122,7 +122,10 @@ if (Qt5Network_VERSION VERSION_LESS 5.15.0)
 endif()
 
 target_link_libraries(irisnet ${QJDns_LIBRARY} ${EXTRA_LDFLAGS})
-target_link_libraries(irisnet Qt5::Core Qt5::Network Qt5::Xml ${qca_LIB})
+target_link_libraries(irisnet Qt5::Core Qt5::Network Qt5::Xml Qca)
 if (BUNDLED_QCA)
-    add_dependencies(irisnet qca)
+    target_link_libraries(irisnet Qca)
+    add_dependencies(irisnet QcaProject)
+else()
+    target_link_libraries(irisnet ${qca_LIB})
 endif()
diff --git a/src/xmpp/CMakeLists.txt b/src/xmpp/CMakeLists.txt
index 912093ff..ea0344f7 100644
--- a/src/xmpp/CMakeLists.txt
+++ b/src/xmpp/CMakeLists.txt
@@ -205,10 +205,14 @@ if( SEPARATE_QJDNS AND WIN32)
 endif()
 
 target_link_libraries(iris ${ZLIB_LIBRARY} ${EXTRA_LDFLAGS} stringprep)
-target_link_libraries(iris irisnet Qt5::Core Qt5::Gui Qt5::Network Qt5::Xml ${qca_LIB})
+target_link_libraries(iris irisnet Qt5::Core Qt5::Gui Qt5::Network Qt5::Xml ${Qca})
 if (BUNDLED_QCA)
-    add_dependencies(iris qca)
+    add_dependencies(iris QcaProject)
+    target_link_libraries(iris Qca)
     target_include_directories(iris INTERFACE ${Qca_INCLUDE_DIR})
+else()
+    target_link_libraries(iris ${qca_LIB})
 endif()
+
 target_compile_definitions(iris INTERFACE IRISNET_STATIC)
 target_include_directories(iris INTERFACE ${ABS_ROOT_DIR}/include ${ABS_ROOT_DIR}/include/iris ${ABS_PARENT_DIR})

From 45ba0b5846730e0fe70e08b4e06708e24964a3aa Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 9 Aug 2020 14:59:17 +0300
Subject: [PATCH 221/383] Remove redundant qca linkage breaking unbundled build

---
 src/irisnet/CMakeLists.txt | 2 +-
 src/xmpp/CMakeLists.txt    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/irisnet/CMakeLists.txt b/src/irisnet/CMakeLists.txt
index 228f2f87..77ebb3ba 100644
--- a/src/irisnet/CMakeLists.txt
+++ b/src/irisnet/CMakeLists.txt
@@ -122,7 +122,7 @@ if (Qt5Network_VERSION VERSION_LESS 5.15.0)
 endif()
 
 target_link_libraries(irisnet ${QJDns_LIBRARY} ${EXTRA_LDFLAGS})
-target_link_libraries(irisnet Qt5::Core Qt5::Network Qt5::Xml Qca)
+target_link_libraries(irisnet Qt5::Core Qt5::Network Qt5::Xml)
 if (BUNDLED_QCA)
     target_link_libraries(irisnet Qca)
     add_dependencies(irisnet QcaProject)
diff --git a/src/xmpp/CMakeLists.txt b/src/xmpp/CMakeLists.txt
index ea0344f7..0f19dc1d 100644
--- a/src/xmpp/CMakeLists.txt
+++ b/src/xmpp/CMakeLists.txt
@@ -205,7 +205,7 @@ if( SEPARATE_QJDNS AND WIN32)
 endif()
 
 target_link_libraries(iris ${ZLIB_LIBRARY} ${EXTRA_LDFLAGS} stringprep)
-target_link_libraries(iris irisnet Qt5::Core Qt5::Gui Qt5::Network Qt5::Xml ${Qca})
+target_link_libraries(iris irisnet Qt5::Core Qt5::Gui Qt5::Network Qt5::Xml)
 if (BUNDLED_QCA)
     add_dependencies(iris QcaProject)
     target_link_libraries(iris Qca)

From 70eec5dbfa7a1cc58272a5e4b8d1a2ec19040d4c Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Mon, 10 Aug 2020 21:42:34 +0300
Subject: [PATCH 222/383] Updated CMake files. Disable BUNDLED_QCA for systems
 with Qt5 < 5.6. Use the same build type and Qt environment for bundled qca.
 Up minimum CMake version to 3.2

---
 3rdparty/stringprep/CMakeLists.txt |  2 +-
 CMakeLists.txt                     | 15 ++++++++++++---
 src/irisnet/CMakeLists.txt         |  2 +-
 src/xmpp/CMakeLists.txt            |  2 +-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/3rdparty/stringprep/CMakeLists.txt b/3rdparty/stringprep/CMakeLists.txt
index 8120cce8..c7158f16 100644
--- a/3rdparty/stringprep/CMakeLists.txt
+++ b/3rdparty/stringprep/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1.2)
+cmake_minimum_required(VERSION 3.2.0)
 
 project(stringprep LANGUAGES CXX)
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84bc2ce9..2f9f3fd8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ if(NOT CMAKE_BUILD_TYPE)
 endif()
 
 project(iris)
-cmake_minimum_required(VERSION 3.1.0)
+cmake_minimum_required(VERSION 3.2.0)
 
 #Set automoc and autouic policy
 if(POLICY CMP0071)
@@ -48,6 +48,15 @@ include_directories(include/iris)
 set(CMAKE_AUTOMOC ON)
 
 find_package(Qt5 COMPONENTS Core Gui Xml Network REQUIRED)
+
+if(Qt5Core_FOUND)
+    message(STATUS "Qt5 found, version ${Qt5Core_VERSION}")
+    if("${Qt5Core_VERSION}" VERSION_LESS "5.6")
+        message(WARNING "Version of Qt is less than needed to build bundled qca.\nBUNDLED_QCA flag will be disabled")
+        set(BUNDLED_QCA OFF)
+    endif()
+endif()
+
 if(USE_QJDNS)
     message(WARNING "USE_QJDNS flag is enabled with Qt5. If you have problems with connection please disable this flag")
     add_definitions(-DNEED_JDNS)
@@ -63,8 +72,8 @@ if(BUNDLED_QCA)
 
     include(ExternalProject)
     set(QCA_BUILD_OPTIONS -DBUILD_SHARED_LIBS=OFF -DBUILD_PLUGINS=ossl
-        -DBUILD_TESTS=OFF -DBUILD_TOOLS=OFF
-        -DCMAKE_INSTALL_PREFIX=${QCA_PREFIX})
+        -DBUILD_TESTS=OFF -DBUILD_TOOLS=OFF -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+        -DCMAKE_INSTALL_PREFIX=${QCA_PREFIX} -DQt5_DIR=${Qt5_DIR})
     if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/3rdpaty/qca)
         ExternalProject_Add(QcaProject
             SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdpaty/qca
diff --git a/src/irisnet/CMakeLists.txt b/src/irisnet/CMakeLists.txt
index 77ebb3ba..e3e1a5b5 100644
--- a/src/irisnet/CMakeLists.txt
+++ b/src/irisnet/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1.0)
+cmake_minimum_required(VERSION 3.2.0)
 get_filename_component(ABS_PARENT_DIR "${CMAKE_CURRENT_LIST_DIR}/.." ABSOLUTE)
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/src/xmpp/CMakeLists.txt b/src/xmpp/CMakeLists.txt
index 0f19dc1d..ebaeda1e 100644
--- a/src/xmpp/CMakeLists.txt
+++ b/src/xmpp/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1.0)
+cmake_minimum_required(VERSION 3.2.0)
 if(POLICY CMP0074)
     cmake_policy(SET CMP0074 NEW)
     message(STATUS "CMP0074 policy set to NEW")

From 950c2b5a1b49a78f934b8be9b482c5b22b6a36c8 Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Tue, 11 Aug 2020 14:11:39 +0300
Subject: [PATCH 223/383] Updated CMakeLists.txt. Fixed typo BUNDLED_QCA
 disabled by default till 2.0 release An attempt to fix build in macOS

---
 CMakeLists.txt | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f9f3fd8..d7329beb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,7 +38,7 @@ set( CMAKE_MODULE_PATH
 
 option( USE_QJDNS "Use qjdns/jdns library. Disabled by default for Qt5" OFF )
 option( SEPARATE_QJDNS "Build qjdns with iris library" OFF )
-option( BUNDLED_QCA "Adds: DTLS, Blake2b and other useful for XMPP crypto-stuff" ON)
+option( BUNDLED_QCA "Adds: DTLS, Blake2b and other useful for XMPP crypto-stuff" OFF)
 
 set(CMAKE_CXX_STANDARD 14)
 
@@ -51,9 +51,8 @@ find_package(Qt5 COMPONENTS Core Gui Xml Network REQUIRED)
 
 if(Qt5Core_FOUND)
     message(STATUS "Qt5 found, version ${Qt5Core_VERSION}")
-    if("${Qt5Core_VERSION}" VERSION_LESS "5.6")
-        message(WARNING "Version of Qt is less than needed to build bundled qca.\nBUNDLED_QCA flag will be disabled")
-        set(BUNDLED_QCA OFF)
+    if(BUNDLED_QCA AND("${Qt5Core_VERSION}" VERSION_LESS "5.6"))
+        message(FATAL_ERROR "Minimal Qt version for bundled Qca is 5.6. Please disable BUNDLED_QCA option")
     endif()
 endif()
 
@@ -69,14 +68,16 @@ if(BUNDLED_QCA)
     set(Qca_CORE_LIB ${QCA_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}qca-qt5${CMAKE_STATIC_LIBRARY_SUFFIX})
     set(Qca_LIBRARY ${Qca_CORE_LIB}
         ${QCA_PREFIX}/lib/qca-qt5/crypto/${CMAKE_STATIC_LIBRARY_PREFIX}qca-ossl${CMAKE_STATIC_LIBRARY_SUFFIX})
+    set(QCA_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qca)
 
     include(ExternalProject)
     set(QCA_BUILD_OPTIONS -DBUILD_SHARED_LIBS=OFF -DBUILD_PLUGINS=ossl
         -DBUILD_TESTS=OFF -DBUILD_TOOLS=OFF -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-        -DCMAKE_INSTALL_PREFIX=${QCA_PREFIX} -DQt5_DIR=${Qt5_DIR})
-    if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/3rdpaty/qca)
+        -DCMAKE_INSTALL_PREFIX=${QCA_PREFIX} -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH})
+    if (EXISTS ${QCA_SOURCE_DIR})
+        message(STATUS "QCA: found bundled sources")
         ExternalProject_Add(QcaProject
-            SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdpaty/qca
+            SOURCE_DIR ${QCA_SOURCE_DIR}
             CMAKE_ARGS ${QCA_BUILD_OPTIONS}
             BUILD_BYPRODUCTS ${Qca_LIBRARY})
     else()
@@ -88,6 +89,7 @@ if(BUNDLED_QCA)
     add_library(Qca STATIC IMPORTED)
     set_target_properties(Qca PROPERTIES IMPORTED_LOCATION ${Qca_CORE_LIB})
 else()
+    message(WARNING "Disabling BUNDLED_QCA option makes impossible to use DTLS and PsiMedia")
     message(STATUS "QCA: using system")
     find_package(Qca REQUIRED)
 endif()

From 78ed91ba9d82897600da0c7f8f3ac3f7dd77ed50 Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Thu, 13 Aug 2020 15:04:40 +0300
Subject: [PATCH 224/383] Updated CMakeLists.txt. An attemp to fix build with
 non linux systems.

---
 CMakeLists.txt | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d7329beb..208da808 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,11 +69,13 @@ if(BUNDLED_QCA)
     set(Qca_LIBRARY ${Qca_CORE_LIB}
         ${QCA_PREFIX}/lib/qca-qt5/crypto/${CMAKE_STATIC_LIBRARY_PREFIX}qca-ossl${CMAKE_STATIC_LIBRARY_SUFFIX})
     set(QCA_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qca)
+    find_package(OpenSSL REQUIRED)
 
     include(ExternalProject)
     set(QCA_BUILD_OPTIONS -DBUILD_SHARED_LIBS=OFF -DBUILD_PLUGINS=ossl
         -DBUILD_TESTS=OFF -DBUILD_TOOLS=OFF -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-        -DCMAKE_INSTALL_PREFIX=${QCA_PREFIX} -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH})
+        -DCMAKE_INSTALL_PREFIX=${QCA_PREFIX} -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
+        -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR})
     if (EXISTS ${QCA_SOURCE_DIR})
         message(STATUS "QCA: found bundled sources")
         ExternalProject_Add(QcaProject
@@ -81,6 +83,11 @@ if(BUNDLED_QCA)
             CMAKE_ARGS ${QCA_BUILD_OPTIONS}
             BUILD_BYPRODUCTS ${Qca_LIBRARY})
     else()
+        include(FindGit)
+        find_package(Git)
+        if(NOT Git_FOUND)
+            message(FATAL_ERROR "Git not found! Bundled Qca needs Git utility.\nPlease set GIT_EXECUTABLE variable or add git to PATH")
+        endif()
         ExternalProject_Add(QcaProject
             GIT_REPOSITORY https://github.com/psi-im/qca.git
             CMAKE_ARGS ${QCA_BUILD_OPTIONS}

From aaf54b9d7f9143577bf91e4c6a6791152d4dde8a Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Sat, 15 Aug 2020 14:03:04 +0300
Subject: [PATCH 225/383] Fixed bundled qca compilation with MXE

---
 CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 208da808..5de0aa44 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,10 +72,11 @@ if(BUNDLED_QCA)
     find_package(OpenSSL REQUIRED)
 
     include(ExternalProject)
+    #set CMake options and transfer the environment to an external project
     set(QCA_BUILD_OPTIONS -DBUILD_SHARED_LIBS=OFF -DBUILD_PLUGINS=ossl
         -DBUILD_TESTS=OFF -DBUILD_TOOLS=OFF -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
         -DCMAKE_INSTALL_PREFIX=${QCA_PREFIX} -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
-        -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR})
+        -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE})
     if (EXISTS ${QCA_SOURCE_DIR})
         message(STATUS "QCA: found bundled sources")
         ExternalProject_Add(QcaProject

From c70dc03f41ef7b17221f47a2cc87a1684aa43a40 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sat, 22 Aug 2020 23:22:06 +0300
Subject: [PATCH 226/383] bundled qca fixes (really works now)

---
 .gitignore                          |   1 +
 CMakeLists.txt                      |  10 +-
 src/xmpp/sasl/scramsha1response.cpp | 143 ++++++++++++++--------------
 3 files changed, 82 insertions(+), 72 deletions(-)

diff --git a/.gitignore b/.gitignore
index 024469ce..fbb23911 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ object_script.*
 /plugins
 build-*
 *.pro.user*
+3rdparty/qca
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5de0aa44..32492958 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,14 +66,14 @@ if(BUNDLED_QCA)
     set(QCA_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/qca)
     set(Qca_INCLUDE_DIR ${QCA_PREFIX}/include/Qca-qt5/QtCrypto)
     set(Qca_CORE_LIB ${QCA_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}qca-qt5${CMAKE_STATIC_LIBRARY_SUFFIX})
-    set(Qca_LIBRARY ${Qca_CORE_LIB}
-        ${QCA_PREFIX}/lib/qca-qt5/crypto/${CMAKE_STATIC_LIBRARY_PREFIX}qca-ossl${CMAKE_STATIC_LIBRARY_SUFFIX})
+    set(Qca_OSSL_LIB ${QCA_PREFIX}/lib/qca-qt5/crypto/${CMAKE_STATIC_LIBRARY_PREFIX}qca-ossl${CMAKE_STATIC_LIBRARY_SUFFIX})
+    set(Qca_LIBRARY ${Qca_CORE_LIB} ${Qca_OSSL_LIB})
     set(QCA_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qca)
     find_package(OpenSSL REQUIRED)
 
     include(ExternalProject)
     #set CMake options and transfer the environment to an external project
-    set(QCA_BUILD_OPTIONS -DBUILD_SHARED_LIBS=OFF -DBUILD_PLUGINS=ossl
+    set(QCA_BUILD_OPTIONS -DBUILD_SHARED_LIBS=OFF -DBUILD_PLUGINS=ossl -DLOAD_SHARED_PLUGINS=OFF
         -DBUILD_TESTS=OFF -DBUILD_TOOLS=OFF -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
         -DCMAKE_INSTALL_PREFIX=${QCA_PREFIX} -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
         -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE})
@@ -96,6 +96,10 @@ if(BUNDLED_QCA)
     endif()
     add_library(Qca STATIC IMPORTED)
     set_target_properties(Qca PROPERTIES IMPORTED_LOCATION ${Qca_CORE_LIB})
+    set_target_properties(Qca
+        PROPERTIES IMPORTED_LINK_INTERFACE_LIBRARIES
+        ${Qca_OSSL_LIB} OpenSSL::SSL OpenSSL::Crypto
+        )
 else()
     message(WARNING "Disabling BUNDLED_QCA option makes impossible to use DTLS and PsiMedia")
     message(STATUS "QCA: using system")
diff --git a/src/xmpp/sasl/scramsha1response.cpp b/src/xmpp/sasl/scramsha1response.cpp
index 09d034b7..07df1669 100644
--- a/src/xmpp/sasl/scramsha1response.cpp
+++ b/src/xmpp/sasl/scramsha1response.cpp
@@ -46,92 +46,97 @@ SCRAMSHA1Response::SCRAMSHA1Response(const QByteArray &server_first_message, con
     QRegExp pattern("r=(.*),s=(.+),i=(\\d+)");
     int     pos = pattern.indexIn(QString(server_first_message));
     isValid_    = true;
-    if (pos > -1) {
-        QString clientservernonce = pattern.cap(1);
-        QString salt              = pattern.cap(2);
-        QString icount            = pattern.cap(3);
-
-        unsigned int dkLen;
-
-        QCA::Hash shaHash("sha1");
-        shaHash.update("", 0);
-        dkLen = shaHash.final().size();
-
-        QCA::PBKDF2 hi("sha1");
-
-        QByteArray password;
-
-        // SaltedPassword  := Hi(Normalize(password), salt, i)
-        if (salted_password_base64.size() > 0)
-            salted_password_
-                = QCA::SymmetricKey(QCA::SecureArray(QCA::Base64().stringToArray(salted_password_base64.toUtf8())));
-        if (salted_password_.size() == 0) {
-            if (!StringPrepCache::saslprep(pass_in, 1023, pass_out)) {
-                isValid_ = false;
-                return;
-            }
-
-            password = pass_out.toUtf8();
-            salted_password_
-                = hi.makeKey(QCA::SecureArray(password), QCA::InitializationVector(QCA::Base64().stringToArray(salt)),
-                             dkLen, icount.toULong());
-        }
-
-        // ClientKey       := HMAC(SaltedPassword, "Client Key")
-        QCA::SecureArray client_key(HMAC_SHA_1(salted_password_.toByteArray(), QByteArray("Client Key")));
+    if (pos < 0) {
+        qWarning("SASL/SCRAM-SHA-1: Failed to match pattern for server-final-message.");
+        isValid_ = false;
+        return;
+    }
+    QCA::PBKDF2 hi("sha1");
+    if (!hi.context()) {
+        qWarning("SASL/SCRAM-SHA-1: sha1 is not supported by qca.");
+        isValid_ = false;
+        return;
+    }
 
-        // StoredKey       := H(ClientKey)
-        QCA::SecureArray stored_key = QCA::Hash("sha1").process(client_key);
+    QString clientservernonce = pattern.cap(1);
+    QString salt              = pattern.cap(2);
+    QString icount            = pattern.cap(3);
 
-        // assemble client-final-message-without-proof
+    unsigned int dkLen;
 
-        QString gs2_header;
-        {
-            QRegExp pattern("(.+)n=.+");
-            pattern.indexIn(QString(client_first_message));
-            gs2_header = pattern.cap(1);
-        }
+    QCA::Hash shaHash("sha1");
+    shaHash.update("", 0);
+    dkLen = shaHash.final().size();
 
-        QString     client_final_message;
-        QTextStream final_message_stream(&client_final_message);
-        final_message_stream << "c=" << QCA::Base64().arrayToString((gs2_header.toUtf8()));
-        final_message_stream << ",r=" << clientservernonce;
+    QByteArray password;
 
-        // AuthMessage     := client-first-message-bare + "," + server-first-message + "," +
-        // client-final-message-without-proof
-        QRegExp extract_cfmb_pattern("(n=.+)");
-        if (extract_cfmb_pattern.indexIn(QString(client_first_message)) < 0) {
+    // SaltedPassword  := Hi(Normalize(password), salt, i)
+    if (salted_password_base64.size() > 0)
+        salted_password_
+            = QCA::SymmetricKey(QCA::SecureArray(QCA::Base64().stringToArray(salted_password_base64.toUtf8())));
+    if (salted_password_.size() == 0) {
+        if (!StringPrepCache::saslprep(pass_in, 1023, pass_out)) {
             isValid_ = false;
             return;
         }
 
-        QString client_first_message_bare = extract_cfmb_pattern.cap(1);
+        password = pass_out.toUtf8();
+        salted_password_
+            = hi.makeKey(QCA::SecureArray(password), QCA::InitializationVector(QCA::Base64().stringToArray(salt)),
+                         dkLen, icount.toULong());
+    }
 
-        QCA::SecureArray auth_message = QCA::SecureArray(client_first_message_bare.toUtf8());
-        auth_message += QCA::SecureArray(",") + QCA::SecureArray(server_first_message);
-        auth_message += QCA::SecureArray(",") + QCA::SecureArray(client_final_message.toUtf8());
+    // ClientKey       := HMAC(SaltedPassword, "Client Key")
+    QCA::SecureArray client_key(HMAC_SHA_1(salted_password_.toByteArray(), QByteArray("Client Key")));
 
-        // ClientSignature := HMAC(StoredKey, AuthMessage)
-        QCA::SecureArray client_signature = HMAC_SHA_1(stored_key, auth_message);
+    // StoredKey       := H(ClientKey)
+    QCA::SecureArray stored_key = QCA::Hash("sha1").process(client_key);
 
-        // ClientProof     := ClientKey XOR ClientSignature
-        QCA::SecureArray client_proof(client_key.size());
-        for (int i = 0; i < client_proof.size(); ++i) {
-            client_proof[i] = client_key[i] ^ client_signature[i];
-        }
+    // assemble client-final-message-without-proof
 
-        // ServerKey       := HMAC(SaltedPassword, "Server Key")
-        QCA::SecureArray server_key = HMAC_SHA_1(salted_password_, QByteArray("Server Key"));
+    QString gs2_header;
+    {
+        QRegExp pattern("(.+)n=.+");
+        pattern.indexIn(QString(client_first_message));
+        gs2_header = pattern.cap(1);
+    }
 
-        // ServerSignature := HMAC(ServerKey, AuthMessage)
-        server_signature_ = HMAC_SHA_1(server_key, auth_message);
+    QString     client_final_message;
+    QTextStream final_message_stream(&client_final_message);
+    final_message_stream << "c=" << QCA::Base64().arrayToString((gs2_header.toUtf8()));
+    final_message_stream << ",r=" << clientservernonce;
 
-        final_message_stream << ",p=" << QCA::Base64().arrayToString(client_proof);
-        value_ = client_final_message.toUtf8();
-    } else {
-        qWarning("SASL/SCRAM-SHA-1: Failed to match pattern for server-final-message.");
+    // AuthMessage     := client-first-message-bare + "," + server-first-message + "," +
+    // client-final-message-without-proof
+    QRegExp extract_cfmb_pattern("(n=.+)");
+    if (extract_cfmb_pattern.indexIn(QString(client_first_message)) < 0) {
         isValid_ = false;
+        return;
+    }
+
+    QString client_first_message_bare = extract_cfmb_pattern.cap(1);
+
+    QCA::SecureArray auth_message = QCA::SecureArray(client_first_message_bare.toUtf8());
+    auth_message += QCA::SecureArray(",") + QCA::SecureArray(server_first_message);
+    auth_message += QCA::SecureArray(",") + QCA::SecureArray(client_final_message.toUtf8());
+
+    // ClientSignature := HMAC(StoredKey, AuthMessage)
+    QCA::SecureArray client_signature = HMAC_SHA_1(stored_key, auth_message);
+
+    // ClientProof     := ClientKey XOR ClientSignature
+    QCA::SecureArray client_proof(client_key.size());
+    for (int i = 0; i < client_proof.size(); ++i) {
+        client_proof[i] = client_key[i] ^ client_signature[i];
     }
+
+    // ServerKey       := HMAC(SaltedPassword, "Server Key")
+    QCA::SecureArray server_key = HMAC_SHA_1(salted_password_, QByteArray("Server Key"));
+
+    // ServerSignature := HMAC(ServerKey, AuthMessage)
+    server_signature_ = HMAC_SHA_1(server_key, auth_message);
+
+    final_message_stream << ",p=" << QCA::Base64().arrayToString(client_proof);
+    value_ = client_final_message.toUtf8();
 }
 
 const QString SCRAMSHA1Response::getSaltedPassword() { return QCA::Base64().arrayToString(salted_password_); }

From ce522964d6eb2730854fd9036021226873e96f84 Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Mon, 24 Aug 2020 00:07:23 +0300
Subject: [PATCH 227/383] Updated CMakeLists.txt. Added Qca_OSSL_LIB_EXPORT
 variable to PARENT SCOPE to link psi with qca-ossl

---
 CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 32492958..ed2b523e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,6 +67,7 @@ if(BUNDLED_QCA)
     set(Qca_INCLUDE_DIR ${QCA_PREFIX}/include/Qca-qt5/QtCrypto)
     set(Qca_CORE_LIB ${QCA_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}qca-qt5${CMAKE_STATIC_LIBRARY_SUFFIX})
     set(Qca_OSSL_LIB ${QCA_PREFIX}/lib/qca-qt5/crypto/${CMAKE_STATIC_LIBRARY_PREFIX}qca-ossl${CMAKE_STATIC_LIBRARY_SUFFIX})
+    set(Qca_OSSL_LIB_EXPORT ${Qca_OSSL_LIB} PARENT_SCOPE)
     set(Qca_LIBRARY ${Qca_CORE_LIB} ${Qca_OSSL_LIB})
     set(QCA_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qca)
     find_package(OpenSSL REQUIRED)

From 8b61062ac256d0f4167d1f7cfbe708820477f711 Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Mon, 24 Aug 2020 17:01:07 +0300
Subject: [PATCH 228/383] Updated CMake files. Scripts simplification

---
 CMakeLists.txt             |  7 ++++---
 src/irisnet/CMakeLists.txt |  7 ++-----
 src/xmpp/CMakeLists.txt    | 10 +++++-----
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ed2b523e..37b9d5c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,10 +65,11 @@ if(BUNDLED_QCA)
     message(STATUS "QCA: using bundled")
     set(QCA_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/qca)
     set(Qca_INCLUDE_DIR ${QCA_PREFIX}/include/Qca-qt5/QtCrypto)
+    set(Qca_INCLUDE_DIR_EXPORT ${Qca_INCLUDE_DIR} PARENT_SCOPE)
     set(Qca_CORE_LIB ${QCA_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}qca-qt5${CMAKE_STATIC_LIBRARY_SUFFIX})
     set(Qca_OSSL_LIB ${QCA_PREFIX}/lib/qca-qt5/crypto/${CMAKE_STATIC_LIBRARY_PREFIX}qca-ossl${CMAKE_STATIC_LIBRARY_SUFFIX})
-    set(Qca_OSSL_LIB_EXPORT ${Qca_OSSL_LIB} PARENT_SCOPE)
-    set(Qca_LIBRARY ${Qca_CORE_LIB} ${Qca_OSSL_LIB})
+    set(Qca_LIBRARY ${Qca_OSSL_LIB} ${Qca_CORE_LIB})
+    set(Qca_LIBRARY_EXPORT ${Qca_LIBRARY} PARENT_SCOPE)
     set(QCA_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qca)
     find_package(OpenSSL REQUIRED)
 
@@ -111,7 +112,7 @@ set(QCA_INCLUDES ${Qca_INCLUDE_DIR})
 set(qca_LIB ${Qca_LIBRARY})
 
 include_directories(
-    ${QCA_INCLUDES}
+    ${Qca_INCLUDE_DIR}
 )
 
 if(NOT USE_QJDNS AND SEPARATE_QJDNS)
diff --git a/src/irisnet/CMakeLists.txt b/src/irisnet/CMakeLists.txt
index e3e1a5b5..2bf81892 100644
--- a/src/irisnet/CMakeLists.txt
+++ b/src/irisnet/CMakeLists.txt
@@ -120,12 +120,9 @@ endif()
 if (Qt5Network_VERSION VERSION_LESS 5.15.0)
     target_compile_definitions(irisnet PRIVATE HAVE_QTNET)
 endif()
-
-target_link_libraries(irisnet ${QJDns_LIBRARY} ${EXTRA_LDFLAGS})
 target_link_libraries(irisnet Qt5::Core Qt5::Network Qt5::Xml)
 if (BUNDLED_QCA)
-    target_link_libraries(irisnet Qca)
     add_dependencies(irisnet QcaProject)
-else()
-    target_link_libraries(irisnet ${qca_LIB})
 endif()
+target_link_libraries(irisnet ${qca_LIB})
+target_link_libraries(irisnet ${QJDns_LIBRARY} ${EXTRA_LDFLAGS})
diff --git a/src/xmpp/CMakeLists.txt b/src/xmpp/CMakeLists.txt
index ebaeda1e..5f3b4d67 100644
--- a/src/xmpp/CMakeLists.txt
+++ b/src/xmpp/CMakeLists.txt
@@ -204,15 +204,15 @@ if( SEPARATE_QJDNS AND WIN32)
     set(EXTRA_LDFLAGS ws2_32)
 endif()
 
-target_link_libraries(iris ${ZLIB_LIBRARY} ${EXTRA_LDFLAGS} stringprep)
-target_link_libraries(iris irisnet Qt5::Core Qt5::Gui Qt5::Network Qt5::Xml)
+target_link_libraries(iris ${ZLIB_LIBRARY} ${EXTRA_LDFLAGS} stringprep irisnet)
+target_link_libraries(iris Qt5::Core Qt5::Gui Qt5::Network Qt5::Xml)
 if (BUNDLED_QCA)
     add_dependencies(iris QcaProject)
-    target_link_libraries(iris Qca)
+    include_directories(${Qca_INCLUDE_DIR})
     target_include_directories(iris INTERFACE ${Qca_INCLUDE_DIR})
-else()
-    target_link_libraries(iris ${qca_LIB})
 endif()
+target_link_libraries(iris ${qca_LIB})
+
 
 target_compile_definitions(iris INTERFACE IRISNET_STATIC)
 target_include_directories(iris INTERFACE ${ABS_ROOT_DIR}/include ${ABS_ROOT_DIR}/include/iris ${ABS_PARENT_DIR})

From 0dbf5283a7447f6dddd52a22e352352dcd18d089 Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Mon, 24 Aug 2020 22:54:39 +0300
Subject: [PATCH 229/383] Updated CMakeLists.txt Use EXTERNAL_PROJECT option
 for QCA

---
 CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 37b9d5c2..a53b9f69 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,10 +75,10 @@ if(BUNDLED_QCA)
 
     include(ExternalProject)
     #set CMake options and transfer the environment to an external project
-    set(QCA_BUILD_OPTIONS -DBUILD_SHARED_LIBS=OFF -DBUILD_PLUGINS=ossl -DLOAD_SHARED_PLUGINS=OFF
-        -DBUILD_TESTS=OFF -DBUILD_TOOLS=OFF -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-        -DCMAKE_INSTALL_PREFIX=${QCA_PREFIX} -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
-        -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE})
+    set(QCA_BUILD_OPTIONS -DEXTERNAL_PROJECT=ON -DBUILD_PLUGINS=ossl
+        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${QCA_PREFIX}
+        -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR}
+        -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE})
     if (EXISTS ${QCA_SOURCE_DIR})
         message(STATUS "QCA: found bundled sources")
         ExternalProject_Add(QcaProject

From eff26aa2f5f8127dccec054da1881d43d7169697 Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Tue, 25 Aug 2020 00:46:51 +0300
Subject: [PATCH 230/383] Revert "Updated CMakeLists.txt"

This reverts commit 0dbf5283a7447f6dddd52a22e352352dcd18d089.
---
 CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a53b9f69..37b9d5c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,10 +75,10 @@ if(BUNDLED_QCA)
 
     include(ExternalProject)
     #set CMake options and transfer the environment to an external project
-    set(QCA_BUILD_OPTIONS -DEXTERNAL_PROJECT=ON -DBUILD_PLUGINS=ossl
-        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${QCA_PREFIX}
-        -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR}
-        -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE})
+    set(QCA_BUILD_OPTIONS -DBUILD_SHARED_LIBS=OFF -DBUILD_PLUGINS=ossl -DLOAD_SHARED_PLUGINS=OFF
+        -DBUILD_TESTS=OFF -DBUILD_TOOLS=OFF -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+        -DCMAKE_INSTALL_PREFIX=${QCA_PREFIX} -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
+        -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE})
     if (EXISTS ${QCA_SOURCE_DIR})
         message(STATUS "QCA: found bundled sources")
         ExternalProject_Add(QcaProject

From d9e7049dfec3f489df387ed259a70294233a8018 Mon Sep 17 00:00:00 2001
From: Vitaly Tonkacheyev <thetvg@gmail.com>
Date: Wed, 26 Aug 2020 01:17:21 +0300
Subject: [PATCH 231/383] Updated CMakeLists.txt. Moved qjdns code to separate
 file src/jdns.cmake. added EXCLUDE_FROM_ALL with BUNDLED_QCA as attempt to
 exclude qca files from install with make install

---
 CMakeLists.txt | 65 +++++++++-----------------------------------------
 src/jdns.cmake | 52 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 54 deletions(-)
 create mode 100644 src/jdns.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 37b9d5c2..ec00c49f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,8 @@ if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "Release")
 endif()
 
+get_directory_property(IS_SUBPROJECT PARENT_DIRECTORY)
+
 project(iris)
 cmake_minimum_required(VERSION 3.2.0)
 
@@ -65,11 +67,13 @@ if(BUNDLED_QCA)
     message(STATUS "QCA: using bundled")
     set(QCA_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/qca)
     set(Qca_INCLUDE_DIR ${QCA_PREFIX}/include/Qca-qt5/QtCrypto)
-    set(Qca_INCLUDE_DIR_EXPORT ${Qca_INCLUDE_DIR} PARENT_SCOPE)
     set(Qca_CORE_LIB ${QCA_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}qca-qt5${CMAKE_STATIC_LIBRARY_SUFFIX})
     set(Qca_OSSL_LIB ${QCA_PREFIX}/lib/qca-qt5/crypto/${CMAKE_STATIC_LIBRARY_PREFIX}qca-ossl${CMAKE_STATIC_LIBRARY_SUFFIX})
     set(Qca_LIBRARY ${Qca_OSSL_LIB} ${Qca_CORE_LIB})
-    set(Qca_LIBRARY_EXPORT ${Qca_LIBRARY} PARENT_SCOPE)
+    if(IS_SUBPROJECT)
+        set(Qca_LIBRARY_EXPORT ${Qca_LIBRARY} PARENT_SCOPE)
+        set(Qca_INCLUDE_DIR_EXPORT ${Qca_INCLUDE_DIR} PARENT_SCOPE)
+    endif()
     set(QCA_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qca)
     find_package(OpenSSL REQUIRED)
 
@@ -84,7 +88,8 @@ if(BUNDLED_QCA)
         ExternalProject_Add(QcaProject
             SOURCE_DIR ${QCA_SOURCE_DIR}
             CMAKE_ARGS ${QCA_BUILD_OPTIONS}
-            BUILD_BYPRODUCTS ${Qca_LIBRARY})
+            BUILD_BYPRODUCTS ${Qca_LIBRARY}
+            EXCLUDE_FROM_ALL TRUE)
     else()
         include(FindGit)
         find_package(Git)
@@ -94,7 +99,8 @@ if(BUNDLED_QCA)
         ExternalProject_Add(QcaProject
             GIT_REPOSITORY https://github.com/psi-im/qca.git
             CMAKE_ARGS ${QCA_BUILD_OPTIONS}
-            BUILD_BYPRODUCTS ${Qca_LIBRARY})
+            BUILD_BYPRODUCTS ${Qca_LIBRARY}
+            EXCLUDE_FROM_ALL TRUE)
     endif()
     add_library(Qca STATIC IMPORTED)
     set_target_properties(Qca PROPERTIES IMPORTED_LOCATION ${Qca_CORE_LIB})
@@ -120,56 +126,7 @@ if(NOT USE_QJDNS AND SEPARATE_QJDNS)
 endif()
 
 if(USE_QJDNS AND (NOT SEPARATE_QJDNS))
-    add_definitions(-DJDNS_STATIC)
-    set(QJDns_LIBRARY qjdns)
-    include_directories(
-        src/jdns/include/jdns
-        )
-    set(jdns_SRCS
-        src/jdns/src/jdns/jdns.c
-        src/jdns/src/jdns/jdns_mdnsd.c
-        src/jdns/src/jdns/jdns_packet.c
-        src/jdns/src/jdns/jdns_sys.c
-        src/jdns/src/jdns/jdns_util.c
-        )
-    set(jdns_PUBLIC_HEADERS
-        src/jdns/include/jdns/jdns.h
-        src/jdns/include/jdns/jdns_export.h
-        )
-    set(jdns_HEADERS
-        src/jdns/src/jdns/jdns_packet.h
-        src/jdns/src/jdns/jdns_mdnsd.h
-        src/jdns/src/jdns/jdns_p.h
-        )
-    add_library(jdns STATIC ${jdns_SRCS} ${jdns_HEADERS} ${jdns_PUBLIC_HEADERS})
-    if(WIN32)
-        target_link_libraries(jdns ws2_32 advapi32)
-    endif()
-    set(qjdns_MOC_HDRS
-        src/jdns/include/jdns/qjdns.h
-        src/jdns/include/jdns/qjdnsshared.h
-        src/jdns/src/qjdns/qjdns_p.h
-        src/jdns/src/qjdns/qjdnsshared_p.h
-        )
-
-    qt_wrap_cpp(qjdns_MOC_SRCS ${qjdns_MOC_HDRS})
-
-    set(qjdns_SRCS
-        src/jdns/src/qjdns/qjdns.cpp
-        src/jdns/src/qjdns/qjdns_sock.cpp
-        src/jdns/src/qjdns/qjdnsshared.cpp
-        )
-
-    set(qjdns_PUBLIC_HEADERS
-        src/jdns/include/jdns/qjdns.h
-        src/jdns/include/jdns/qjdnsshared.h
-        )
-    set(qjdns_HEADERS
-        src/jdns/src/qjdns/qjdns_sock.h
-        )
-    add_library(${QJDns_LIBRARY} STATIC ${qjdns_SRCS} ${qjdns_MOC_SRCS} ${qjdns_MOC_HDRS} ${qjdns_PUBLIC_HEADERS})
-    target_link_libraries(${QJDns_LIBRARY} Qt5::Core Qt5::Network)
-    target_link_libraries(${QJDns_LIBRARY} jdns)
+    include(src/jdns.cmake)
 elseif(USE_QJDNS)
     set(QJDns_SUFFIX -qt5)
     find_package(QJDns REQUIRED)
diff --git a/src/jdns.cmake b/src/jdns.cmake
new file mode 100644
index 00000000..64d98145
--- /dev/null
+++ b/src/jdns.cmake
@@ -0,0 +1,52 @@
+add_definitions(-DJDNS_STATIC)
+set(QJDns_LIBRARY qjdns)
+include_directories(
+    src/jdns/include/jdns
+)
+set(jdns_SRCS
+    src/jdns/src/jdns/jdns.c
+    src/jdns/src/jdns/jdns_mdnsd.c
+    src/jdns/src/jdns/jdns_packet.c
+    src/jdns/src/jdns/jdns_sys.c
+    src/jdns/src/jdns/jdns_util.c
+)
+set(jdns_PUBLIC_HEADERS
+    src/jdns/include/jdns/jdns.h
+    src/jdns/include/jdns/jdns_export.h
+)
+set(jdns_HEADERS
+    src/jdns/src/jdns/jdns_packet.h
+    src/jdns/src/jdns/jdns_mdnsd.h
+    src/jdns/src/jdns/jdns_p.h
+)
+
+add_library(jdns STATIC ${jdns_SRCS} ${jdns_HEADERS} ${jdns_PUBLIC_HEADERS})
+
+if(WIN32)
+    target_link_libraries(jdns ws2_32 advapi32)
+endif()
+set(qjdns_MOC_HDRS
+    src/jdns/include/jdns/qjdns.h
+    src/jdns/include/jdns/qjdnsshared.h
+    src/jdns/src/qjdns/qjdns_p.h
+    src/jdns/src/qjdns/qjdnsshared_p.h
+)
+
+set(qjdns_SRCS
+    src/jdns/src/qjdns/qjdns.cpp
+    src/jdns/src/qjdns/qjdns_sock.cpp
+    src/jdns/src/qjdns/qjdnsshared.cpp
+)
+
+set(qjdns_PUBLIC_HEADERS
+    src/jdns/include/jdns/qjdns.h
+    src/jdns/include/jdns/qjdnsshared.h
+)
+set(qjdns_HEADERS
+    src/jdns/src/qjdns/qjdns_sock.h
+)
+
+add_library(${QJDns_LIBRARY} STATIC ${qjdns_SRCS} ${qjdns_MOC_SRCS} ${qjdns_MOC_HDRS} ${qjdns_PUBLIC_HEADERS})
+
+target_link_libraries(${QJDns_LIBRARY} Qt5::Core Qt5::Network)
+target_link_libraries(${QJDns_LIBRARY} jdns) 

From 205138767f6265f8112d53371cf76348f887758d Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Wed, 26 Aug 2020 03:01:18 +0300
Subject: [PATCH 232/383] Updated CMakeLists.txt. Do not install bundled qca
 files at all

---
 CMakeLists.txt | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec00c49f..7799c873 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,31 +65,42 @@ endif()
 
 if(BUNDLED_QCA)
     message(STATUS "QCA: using bundled")
+    set(QCA_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qca)
     set(QCA_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/qca)
-    set(Qca_INCLUDE_DIR ${QCA_PREFIX}/include/Qca-qt5/QtCrypto)
-    set(Qca_CORE_LIB ${QCA_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}qca-qt5${CMAKE_STATIC_LIBRARY_SUFFIX})
-    set(Qca_OSSL_LIB ${QCA_PREFIX}/lib/qca-qt5/crypto/${CMAKE_STATIC_LIBRARY_PREFIX}qca-ossl${CMAKE_STATIC_LIBRARY_SUFFIX})
+    set(QCA_BUILD_DIR ${QCA_PREFIX}/build)
+    set(Qca_INCLUDE_DIR ${QCA_BUILD_DIR})
+    if(NOT EXISTS ${QCA_SOURCE_DIR})
+        list(APPEND Qca_INCLUDE_DIR ${QCA_PREFIX}/src/QcaProject/include/QtCrypto)
+    else()
+        list(APPEND Qca_INCLUDE_DIR ${QCA_SOURCE_DIR}/include/QtCrypto)
+    endif()
+    set(Qca_CORE_LIB ${QCA_BUILD_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}qca-qt5${CMAKE_STATIC_LIBRARY_SUFFIX})
+    set(Qca_OSSL_LIB ${QCA_BUILD_DIR}/lib/qca-qt5/crypto/${CMAKE_STATIC_LIBRARY_PREFIX}qca-ossl${CMAKE_STATIC_LIBRARY_SUFFIX})
     set(Qca_LIBRARY ${Qca_OSSL_LIB} ${Qca_CORE_LIB})
     if(IS_SUBPROJECT)
         set(Qca_LIBRARY_EXPORT ${Qca_LIBRARY} PARENT_SCOPE)
         set(Qca_INCLUDE_DIR_EXPORT ${Qca_INCLUDE_DIR} PARENT_SCOPE)
     endif()
-    set(QCA_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qca)
+
     find_package(OpenSSL REQUIRED)
 
     include(ExternalProject)
     #set CMake options and transfer the environment to an external project
-    set(QCA_BUILD_OPTIONS -DBUILD_SHARED_LIBS=OFF -DBUILD_PLUGINS=ossl -DLOAD_SHARED_PLUGINS=OFF
+    set(QCA_BUILD_OPTIONS
+        -DBUILD_SHARED_LIBS=OFF -DBUILD_PLUGINS=ossl -DLOAD_SHARED_PLUGINS=OFF
         -DBUILD_TESTS=OFF -DBUILD_TOOLS=OFF -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
         -DCMAKE_INSTALL_PREFIX=${QCA_PREFIX} -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
         -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE})
     if (EXISTS ${QCA_SOURCE_DIR})
         message(STATUS "QCA: found bundled sources")
         ExternalProject_Add(QcaProject
+            PREFIX ${QCA_PREFIX}
+            BINARY_DIR ${QCA_BUILD_DIR}
             SOURCE_DIR ${QCA_SOURCE_DIR}
             CMAKE_ARGS ${QCA_BUILD_OPTIONS}
             BUILD_BYPRODUCTS ${Qca_LIBRARY}
-            EXCLUDE_FROM_ALL TRUE)
+            INSTALL_COMMAND ""
+            )
     else()
         include(FindGit)
         find_package(Git)
@@ -97,10 +108,13 @@ if(BUNDLED_QCA)
             message(FATAL_ERROR "Git not found! Bundled Qca needs Git utility.\nPlease set GIT_EXECUTABLE variable or add git to PATH")
         endif()
         ExternalProject_Add(QcaProject
+            PREFIX ${QCA_PREFIX}
+            BINARY_DIR ${QCA_BUILD_DIR}
             GIT_REPOSITORY https://github.com/psi-im/qca.git
             CMAKE_ARGS ${QCA_BUILD_OPTIONS}
             BUILD_BYPRODUCTS ${Qca_LIBRARY}
-            EXCLUDE_FROM_ALL TRUE)
+            INSTALL_COMMAND ""
+            )
     endif()
     add_library(Qca STATIC IMPORTED)
     set_target_properties(Qca PROPERTIES IMPORTED_LOCATION ${Qca_CORE_LIB})

From 81e1d3fd77eb69ac9fb0eb37b1eee303a09983e0 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 7 Sep 2020 00:49:23 +0300
Subject: [PATCH 233/383] Added core DTLS transport code

---
 include/iris/dtls.h                 |   1 +
 src/irisnet/CMakeLists.txt          |   2 +
 src/irisnet/noncore/dtls.cpp        | 185 ++++++++++++++++++++++++++++
 src/irisnet/noncore/dtls.h          |  49 ++++++++
 src/irisnet/noncore/noncore.pri     |   2 +
 src/irisnet/noncore/stunmessage.cpp |   3 +-
 tools/icetunnel/main.cpp            |  20 ++-
 7 files changed, 258 insertions(+), 4 deletions(-)
 create mode 100644 include/iris/dtls.h
 create mode 100644 src/irisnet/noncore/dtls.cpp
 create mode 100644 src/irisnet/noncore/dtls.h

diff --git a/include/iris/dtls.h b/include/iris/dtls.h
new file mode 100644
index 00000000..02d353d7
--- /dev/null
+++ b/include/iris/dtls.h
@@ -0,0 +1 @@
+#include "../../src/irisnet/noncore/dtls.h"
diff --git a/src/irisnet/CMakeLists.txt b/src/irisnet/CMakeLists.txt
index 2bf81892..c58ba395 100644
--- a/src/irisnet/CMakeLists.txt
+++ b/src/irisnet/CMakeLists.txt
@@ -50,6 +50,7 @@ set(SOURCES
     noncore/turnclient.cpp
     noncore/udpportreserver.cpp
     noncore/tcpportreserver.cpp
+    noncore/dtls.cpp
 
     noncore/cutestuff/bsocket.cpp
 )
@@ -96,6 +97,7 @@ set(HEADERS
     noncore/turnclient.h
     noncore/udpportreserver.h
     noncore/tcpportreserver.h
+    noncore/dtls.h
 
     noncore/cutestuff/bsocket.h
     noncore/cutestuff/bytestream.h
diff --git a/src/irisnet/noncore/dtls.cpp b/src/irisnet/noncore/dtls.cpp
new file mode 100644
index 00000000..148707bb
--- /dev/null
+++ b/src/irisnet/noncore/dtls.cpp
@@ -0,0 +1,185 @@
+#include "dtls.h"
+#include <QtCrypto>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+#include <QRandomGenerator>
+#endif
+#include <QAbstractSocket>
+
+#define DTLS_DEBUG qDebug
+
+namespace XMPP {
+
+class Dtls::Private : public QObject {
+    Q_OBJECT
+public:
+    Dtls *    q;
+    QCA::TLS *tls;
+
+    Hash                         fingerprint;
+    Hash                         remoteFingerprint;
+    QAbstractSocket::SocketError lastError = QAbstractSocket::UnknownSocketError;
+
+    Private(Dtls *q) : QObject(q), q(q)
+    {
+        tls = new QCA::TLS(QCA::TLS::Datagram);
+
+        connect(tls, &QCA::TLS::certificateRequested, tls, &QCA::TLS::continueAfterStep);
+        connect(tls, &QCA::TLS::handshaken, this, &Dtls::Private::tls_handshaken);
+        connect(tls, &QCA::TLS::readyRead, q, &Dtls::readyRead);
+        connect(tls, &QCA::TLS::readyReadOutgoing, q, &Dtls::readyReadOutgoing);
+        connect(tls, &QCA::TLS::closed, q, &Dtls::closed);
+        connect(tls, &QCA::TLS::error, this, &Dtls::Private::tls_error);
+    }
+
+    static Hash computeFingerprint(const QCA::Certificate &cert, Hash::Type hashType)
+    {
+        if (cert.isNull()) {
+            return Hash();
+        }
+        return Hash::from(hashType, cert.toDER());
+    }
+
+    void tls_handshaken()
+    {
+        DTLS_DEBUG("tls handshaken");
+        auto peerIdentity = tls->peerIdentityResult();
+        if (peerIdentity == QCA::TLS::Valid || peerIdentity == QCA::TLS::InvalidCertificate) {
+            auto &cert = tls->peerCertificateChain().first();
+            if (computeFingerprint(cert, remoteFingerprint.type()) == remoteFingerprint) {
+                DTLS_DEBUG("valid");
+                tls->continueAfterStep();
+                emit q->connected();
+                return;
+            } else {
+                qWarning("dtls fingerprints do not match: %d", int(tls->peerIdentityResult()));
+            }
+        } else {
+            qWarning("dtls peerIdentity failure: %d", int(tls->peerIdentityResult()));
+        }
+
+        lastError = QAbstractSocket::SslHandshakeFailedError;
+        tls->reset();
+        emit q->errorOccurred(lastError);
+    }
+
+    void tls_error()
+    {
+        DTLS_DEBUG("tls error: %d", tls->errorCode());
+        switch (tls->errorCode()) {
+        case QCA::TLS::ErrorSignerExpired:
+        case QCA::TLS::ErrorSignerInvalid:
+        case QCA::TLS::ErrorCertKeyMismatch:
+            lastError = QAbstractSocket::SocketError::SslInvalidUserDataError;
+            break;
+        case QCA::TLS::ErrorInit:
+            lastError = QAbstractSocket::SocketError::SslInternalError;
+            break;
+        case QCA::TLS::ErrorHandshake:
+            lastError = QAbstractSocket::SocketError::SslHandshakeFailedError;
+            break;
+        case QCA::TLS::ErrorCrypt:
+        default:
+            lastError = QAbstractSocket::SocketError::UnknownSocketError;
+            break;
+        }
+        emit q->errorOccurred(lastError);
+    }
+};
+
+Dtls::Dtls(QObject *parent) : QObject(parent), d(new Private(this))
+{
+    if (!d->tls->context()) {
+        qWarning("DTLS is not supported by your version of QCA");
+    }
+}
+
+bool Dtls::generateCertificate(const QString &localJid)
+{
+    QCA::CertificateOptions opts;
+
+    QCA::CertificateInfo info;
+    info.insert(QCA::CommonName, QStringLiteral("iris.psi-im.org"));
+    if (!localJid.isEmpty())
+        info.insert(QCA::XMPP, localJid);
+    opts.setInfo(info);
+
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+    QCA::BigInteger sn(QRandomGenerator::global()->generate());
+#else
+    QCA::BigInteger sn(qrand());
+#endif
+    opts.setSerialNumber(sn);
+
+    auto nowUTC = QDateTime::currentDateTimeUtc();
+    opts.setValidityPeriod(nowUTC, nowUTC.addDays(30));
+
+    QCA::Constraints constraints
+        = { { QCA::DigitalSignature, QCA::KeyEncipherment, QCA::DataEncipherment, QCA::ClientAuth, QCA::ServerAuth } };
+    opts.setConstraints(constraints);
+    opts.setAsCA();
+
+    auto pkey = QCA::KeyGenerator().createRSA(2048);
+    auto cert = QCA::Certificate(opts, pkey);
+    d->tls->setCertificate(cert, pkey);
+    d->fingerprint = Private::computeFingerprint(cert, Hash::Sha256);
+}
+
+void Dtls::setCertificate(const QCA::Certificate &cert, const QCA::PrivateKey &pkey)
+{
+    Hash::Type hashType = Hash::Sha256;
+    switch (cert.signatureAlgorithm()) {
+    case QCA::EMSA1_SHA1:
+    case QCA::EMSA3_SHA1:
+        hashType = Hash::Sha1;
+        break;
+    case QCA::EMSA3_SHA256:
+        hashType = Hash::Sha256;
+        break;
+    case QCA::EMSA3_SHA512:
+        hashType = Hash::Sha512;
+        break;
+    default:
+        break;
+    }
+
+    d->tls->setCertificate(cert, pkey);
+    d->fingerprint = Private::computeFingerprint(cert, hashType);
+}
+
+Hash Dtls::fingerprint() { return d->fingerprint; }
+
+void Dtls::setRemoteFingerprint(const Hash &fingerprint) { d->remoteFingerprint = fingerprint; }
+
+QAbstractSocket::SocketError Dtls::error() const { return d->lastError; }
+
+void Dtls::startServer() { d->tls->startServer(); }
+
+void Dtls::startClient() { d->tls->startClient(); }
+
+QByteArray Dtls::readDatagram()
+{
+    QByteArray a = d->tls->read();
+    DTLS_DEBUG("dtls: read %d bytes of decrypted data", a.size());
+    return a;
+}
+
+QByteArray Dtls::readOutgoingDatagram()
+{
+    auto ba = d->tls->readOutgoing();
+    DTLS_DEBUG("dtls: read outgoing packet of %d bytes", ba.size());
+    return ba;
+}
+
+void Dtls::writeDatagram(const QByteArray &data)
+{
+    DTLS_DEBUG("dtls: write %d bytes for encryption\n", data.size());
+    d->tls->write(data);
+}
+
+void Dtls::writeIncomingDatagram(const QByteArray &data)
+{
+    DTLS_DEBUG("dtls: write incoming %d bytes for decryption\n", data.size());
+    d->tls->writeIncoming(data);
+}
+
+} // namespace XMPP
diff --git a/src/irisnet/noncore/dtls.h b/src/irisnet/noncore/dtls.h
new file mode 100644
index 00000000..2b4c693c
--- /dev/null
+++ b/src/irisnet/noncore/dtls.h
@@ -0,0 +1,49 @@
+#ifndef XMPP_DTLS_H
+#define XMPP_DTLS_H
+
+#include <QAbstractSocket>
+
+#include "xmpp_hash.h"
+
+namespace QCA {
+class Certificate;
+class PrivateKey;
+}
+
+namespace XMPP {
+
+class Dtls : public QObject {
+    Q_OBJECT
+public:
+    explicit Dtls(QObject *parent = nullptr);
+
+    // jid is used as subjectAltName XmppAddr identifier
+    bool generateCertificate(const QString &localJid = QString());
+    void setCertificate(const QCA::Certificate &cert, const QCA::PrivateKey &pkey);
+    Hash fingerprint();
+    void setRemoteFingerprint(const Hash &fingerprint);
+
+    QAbstractSocket::SocketError error() const;
+
+    QByteArray readDatagram();
+    QByteArray readOutgoingDatagram();
+    void       writeDatagram(const QByteArray &data);
+    void       writeIncomingDatagram(const QByteArray &data);
+
+    void startServer();
+    void startClient();
+signals:
+    void readyRead();
+    void readyReadOutgoing();
+    void connected();
+    void errorOccurred(QAbstractSocket::SocketError);
+    void closed();
+
+private:
+    class Private;
+    Private *d;
+};
+
+} // namespace XMPP
+
+#endif // XMPP_DTLS_H
diff --git a/src/irisnet/noncore/noncore.pri b/src/irisnet/noncore/noncore.pri
index 157ba764..9a4bcf16 100644
--- a/src/irisnet/noncore/noncore.pri
+++ b/src/irisnet/noncore/noncore.pri
@@ -14,6 +14,7 @@ INCLUDEPATH += $$PWD/../corelib
 include($$PWD/cutestuff/cutestuff.pri)
 
 HEADERS += \
+    $$PWD/dtls.h \
     $$PWD/iceagent.h \
     $$PWD/processquit.h \
     $$PWD/stunutil.h \
@@ -32,6 +33,7 @@ HEADERS += \
     $$PWD/tcpportreserver.h
 
 SOURCES += \
+    $$PWD/dtls.cpp \
     $$PWD/iceagent.cpp \
     $$PWD/processquit.cpp \
     $$PWD/stunutil.cpp \
diff --git a/src/irisnet/noncore/stunmessage.cpp b/src/irisnet/noncore/stunmessage.cpp
index faf29924..66b90b88 100644
--- a/src/irisnet/noncore/stunmessage.cpp
+++ b/src/irisnet/noncore/stunmessage.cpp
@@ -105,8 +105,7 @@ static int check_and_get_length(const QByteArray &buf)
 
     // minimal 3-field check
 
-    // top 2 bits of packet must be 0
-    if (buf[0] & 0xC0)
+    if (buf[0] < 0 || buf[0] > 3) // rfc7983 p.7
         return -1;
 
     const quint8 *p    = (const quint8 *)buf.data();
diff --git a/tools/icetunnel/main.cpp b/tools/icetunnel/main.cpp
index 03bd2827..122e72e3 100644
--- a/tools/icetunnel/main.cpp
+++ b/tools/icetunnel/main.cpp
@@ -22,6 +22,7 @@
 #include <QTimer>
 #include <QUdpSocket>
 #include <QtCrypto>
+#include <iris/dtls.h>
 #include <iris/ice176.h>
 #include <iris/netinterface.h>
 #include <iris/netnames.h>
@@ -414,7 +415,8 @@ class App : public QObject {
     XMPP::NameResolver                dns;
     QHostAddress                      stunAddr;
     XMPP::UdpPortReserver             portReserver;
-    XMPP::Ice176 *                    ice = nullptr;
+    XMPP::Ice176 *                    ice  = nullptr;
+    XMPP::Dtls *                      dtls = nullptr;
     QList<XMPP::Ice176::Candidate>    localCandidates;
     QList<XMPP::Ice176::LocalAddress> localAddrs;
     QList<Channel>                    channels;
@@ -488,7 +490,7 @@ public slots:
 
         connect(ice, SIGNAL(readyRead(int)), SLOT(ice_readyRead(int)));
         connect(ice, SIGNAL(datagramsWritten(int, int)), SLOT(ice_datagramsWritten(int, int)));
-        connect(ice, &XMPP::Ice176::readyToSendMedia, this, []() { printf("ICE ready to send media.\n"); });
+        connect(ice, &XMPP::Ice176::readyToSendMedia, this, &App::ice_readToSendMedia);
         connect(ice, &XMPP::Ice176::iceFinished, this,
                 []() { printf("ICE negotiation has finished and media stream is active now!\n"); });
 
@@ -789,6 +791,17 @@ private slots:
 
         // do nothing
     }
+
+    void ice_readToSendMedia()
+    {
+        if (QCA::isSupported("dtls")) {
+            dtls = new XMPP::Dtls(this);
+            dtls->generateCertificate();
+            auto h = dtls->fingerprint();
+            printf("%s:%s\n", qPrintable(h.stringType()), h.data().toHex(':').data());
+        }
+        printf("ICE ready to send media.\n");
+    }
 };
 
 void usage()
@@ -829,6 +842,7 @@ int main(int argc, char **argv)
     bool                 ipv6_only      = false;
     bool                 relay_udp_only = false;
     bool                 relay_tcp_only = false;
+    bool                 enable_dtls    = true;
 
     for (int n = 0; n < args.count(); ++n) {
         QString s = args[n];
@@ -881,6 +895,8 @@ int main(int argc, char **argv)
             relay_udp_only = true;
         else if (var == "relay-tcp-only")
             relay_tcp_only = true;
+        else if (var == "dtls")
+            enable_dtls = true;
         else
             known = false;
 

From 3081cedd1fb44cf6e292e5441136b800d51730dd Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 7 Sep 2020 11:17:17 +0300
Subject: [PATCH 234/383] Move dtls init into a separate function

---
 CMakeLists.txt           |  1 +
 tools/icetunnel/main.cpp | 23 +++++++++++++----------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7799c873..54c1b54b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,6 +41,7 @@ set( CMAKE_MODULE_PATH
 option( USE_QJDNS "Use qjdns/jdns library. Disabled by default for Qt5" OFF )
 option( SEPARATE_QJDNS "Build qjdns with iris library" OFF )
 option( BUNDLED_QCA "Adds: DTLS, Blake2b and other useful for XMPP crypto-stuff" OFF)
+option( BUILD_IRIS_TOOLS "Build tools and examples" OFF)
 
 set(CMAKE_CXX_STANDARD 14)
 
diff --git a/tools/icetunnel/main.cpp b/tools/icetunnel/main.cpp
index 122e72e3..c281b5ce 100644
--- a/tools/icetunnel/main.cpp
+++ b/tools/icetunnel/main.cpp
@@ -623,6 +623,18 @@ public slots:
             ice->start(XMPP::Ice176::Initiator);
         else
             ice->start(XMPP::Ice176::Responder);
+
+        if (QCA::isSupported("dtls")) {
+            start_dtls();
+        }
+    }
+
+    void start_dtls()
+    {
+        dtls = new XMPP::Dtls(this);
+        dtls->generateCertificate();
+        auto h = dtls->fingerprint();
+        printf("%s:%s\n", qPrintable(h.stringType()), h.data().toHex(':').data());
     }
 
 signals:
@@ -792,16 +804,7 @@ private slots:
         // do nothing
     }
 
-    void ice_readToSendMedia()
-    {
-        if (QCA::isSupported("dtls")) {
-            dtls = new XMPP::Dtls(this);
-            dtls->generateCertificate();
-            auto h = dtls->fingerprint();
-            printf("%s:%s\n", qPrintable(h.stringType()), h.data().toHex(':').data());
-        }
-        printf("ICE ready to send media.\n");
-    }
+    void ice_readToSendMedia() { printf("ICE ready to send media.\n"); }
 };
 
 void usage()

From ab11a21431826805d1b4fb9c56a78c1f719e6aea Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 7 Sep 2020 11:17:45 +0300
Subject: [PATCH 235/383] Added missed files

---
 tools/CMakeLists.txt           | 1 +
 tools/icetunnel/CMakeLists.txt | 3 +++
 2 files changed, 4 insertions(+)
 create mode 100644 tools/CMakeLists.txt
 create mode 100644 tools/icetunnel/CMakeLists.txt

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
new file mode 100644
index 00000000..4ab9da6d
--- /dev/null
+++ b/tools/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(icetunnel)
diff --git a/tools/icetunnel/CMakeLists.txt b/tools/icetunnel/CMakeLists.txt
new file mode 100644
index 00000000..f3507730
--- /dev/null
+++ b/tools/icetunnel/CMakeLists.txt
@@ -0,0 +1,3 @@
+project (ICETunnel)
+add_executable (icetunnel main.cpp)
+target_link_libraries (icetunnel PUBLIC libiris)

From 3a1ecddd932f5b9969e076dad7c5d0732359761b Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Fri, 11 Sep 2020 11:07:55 +0300
Subject: [PATCH 236/383] icetunnel util: pass traffic through DTLS when
 supported (incomplete)

---
 CMakeLists.txt                 |  3 ++
 src/irisnet/noncore/dtls.cpp   |  4 ++-
 src/irisnet/noncore/dtls.h     |  2 +-
 tools/icetunnel/CMakeLists.txt |  6 ++--
 tools/icetunnel/main.cpp       | 64 +++++++++++++++++++++++-----------
 5 files changed, 55 insertions(+), 24 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 54c1b54b..0a768b7c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -161,3 +161,6 @@ add_definitions(-DIRISNET_STATIC -DQSTRINGPREP_BUILDING)
 add_subdirectory(3rdparty/stringprep)
 add_subdirectory(src/irisnet)
 add_subdirectory(src/xmpp)
+if(BUILD_IRIS_TOOLS)
+    add_subdirectory(tools)
+endif()
diff --git a/src/irisnet/noncore/dtls.cpp b/src/irisnet/noncore/dtls.cpp
index 148707bb..1f3bebd9 100644
--- a/src/irisnet/noncore/dtls.cpp
+++ b/src/irisnet/noncore/dtls.cpp
@@ -93,7 +93,7 @@ Dtls::Dtls(QObject *parent) : QObject(parent), d(new Private(this))
     }
 }
 
-bool Dtls::generateCertificate(const QString &localJid)
+void Dtls::generateCertificate(const QString &localJid)
 {
     QCA::CertificateOptions opts;
 
@@ -183,3 +183,5 @@ void Dtls::writeIncomingDatagram(const QByteArray &data)
 }
 
 } // namespace XMPP
+
+#include "dtls.moc"
diff --git a/src/irisnet/noncore/dtls.h b/src/irisnet/noncore/dtls.h
index 2b4c693c..0fe4e542 100644
--- a/src/irisnet/noncore/dtls.h
+++ b/src/irisnet/noncore/dtls.h
@@ -18,7 +18,7 @@ class Dtls : public QObject {
     explicit Dtls(QObject *parent = nullptr);
 
     // jid is used as subjectAltName XmppAddr identifier
-    bool generateCertificate(const QString &localJid = QString());
+    void generateCertificate(const QString &localJid = QString());
     void setCertificate(const QCA::Certificate &cert, const QCA::PrivateKey &pkey);
     Hash fingerprint();
     void setRemoteFingerprint(const Hash &fingerprint);
diff --git a/tools/icetunnel/CMakeLists.txt b/tools/icetunnel/CMakeLists.txt
index f3507730..19674615 100644
--- a/tools/icetunnel/CMakeLists.txt
+++ b/tools/icetunnel/CMakeLists.txt
@@ -1,3 +1,5 @@
-project (ICETunnel)
+project (ICETunnel LANGUAGES CXX)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_CXX_STANDARD 14)
 add_executable (icetunnel main.cpp)
-target_link_libraries (icetunnel PUBLIC libiris)
+target_link_libraries (icetunnel PUBLIC iris Qt::Core Qt::Network)
diff --git a/tools/icetunnel/main.cpp b/tools/icetunnel/main.cpp
index c281b5ce..c5763a16 100644
--- a/tools/icetunnel/main.cpp
+++ b/tools/icetunnel/main.cpp
@@ -415,8 +415,8 @@ class App : public QObject {
     XMPP::NameResolver                dns;
     QHostAddress                      stunAddr;
     XMPP::UdpPortReserver             portReserver;
-    XMPP::Ice176 *                    ice  = nullptr;
-    XMPP::Dtls *                      dtls = nullptr;
+    XMPP::Ice176 *                    ice = nullptr;
+    QList<XMPP::Dtls *>               dtls;
     QList<XMPP::Ice176::Candidate>    localCandidates;
     QList<XMPP::Ice176::LocalAddress> localAddrs;
     QList<Channel>                    channels;
@@ -464,7 +464,7 @@ public slots:
         connect(&dns, &XMPP::NameResolver::error, this, [this](XMPP::NameResolver::Error e) {
             Q_UNUSED(e);
             printf("Unable to resolve stun host.\n");
-            emit quit();
+            Q_EMIT quit();
         });
 
         if (!opt_stunHost.isEmpty())
@@ -629,18 +629,38 @@ public slots:
         }
     }
 
-    void start_dtls()
+Q_SIGNALS:
+    void quit();
+
+private:
+    void proxyNet2App(int componentIndex, const QByteArray &buf)
     {
-        dtls = new XMPP::Dtls(this);
-        dtls->generateCertificate();
-        auto h = dtls->fingerprint();
-        printf("%s:%s\n", qPrintable(h.stringType()), h.data().toHex(':').data());
+        if (channels[componentIndex].sock6)
+            channels[componentIndex].sock6->writeDatagram(buf, QHostAddress::LocalHostIPv6,
+                                                          opt_localBase + componentIndex);
+        if (channels[componentIndex].sock4)
+            channels[componentIndex].sock4->writeDatagram(buf, QHostAddress::LocalHost, opt_localBase + componentIndex);
     }
 
-signals:
-    void quit();
+    void start_dtls()
+    {
+        dtls.reserve(opt_channels);
+        for (int componentIndex = 0; componentIndex < opt_channels; componentIndex++) {
+            dtls[componentIndex] = new XMPP::Dtls(this);
+            dtls[componentIndex]->generateCertificate();
+            auto h = dtls[componentIndex]->fingerprint();
+            printf("fingerprint[%d]:%s:%s\n", componentIndex, qPrintable(h.stringType()), h.data().toHex(':').data());
+            connect(dtls[componentIndex], &XMPP::Dtls::readyRead, this,
+                    [this, dtls = dtls[componentIndex], componentIndex]() {
+                        proxyNet2App(componentIndex, dtls->readDatagram());
+                    });
+            connect(dtls[componentIndex], &XMPP::Dtls::readyReadOutgoing, this,
+                    [this, dtls = dtls[componentIndex], componentIndex]() {
+                        ice->writeDatagram(componentIndex, dtls->readOutgoingDatagram());
+                    });
+        }
+    }
 
-private:
     QUdpSocket *setupSocket(const QHostAddress &addr, int port)
     {
         QUdpSocket *sock = new QUdpSocket(this);
@@ -654,7 +674,7 @@ public slots:
         return sock;
     }
 
-private slots:
+private Q_SLOTS:
     void do_quit()
     {
         // a good idea
@@ -709,12 +729,11 @@ private slots:
     {
         while (ice->hasPendingDatagrams(componentIndex)) {
             QByteArray buf = ice->readDatagram(componentIndex);
-            if (channels[componentIndex].sock6)
-                channels[componentIndex].sock6->writeDatagram(buf, QHostAddress::LocalHostIPv6,
-                                                              opt_localBase + componentIndex);
-            if (channels[componentIndex].sock4)
-                channels[componentIndex].sock4->writeDatagram(buf, QHostAddress::LocalHost,
-                                                              opt_localBase + componentIndex);
+            if (componentIndex < dtls.size()) {
+                dtls[componentIndex]->writeIncomingDatagram(buf);
+            } else {
+                proxyNet2App(componentIndex, buf);
+            }
         }
     }
 
@@ -792,8 +811,13 @@ private slots:
             // note: we don't care who sent it
             sock->readDatagram(buf.data(), buf.size());
 
-            if (channels[at].ready)
-                ice->writeDatagram(at, buf);
+            if (channels[at].ready) {
+                if (at < dtls.size()) {
+                    dtls[at]->writeDatagram(buf);
+                } else {
+                    ice->writeDatagram(at, buf);
+                }
+            }
         }
     }
 

From b019e3e905f77fb4a15c6f17f125f66e8b4c56bb Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sat, 12 Sep 2020 17:40:33 +0300
Subject: [PATCH 237/383] Make icetunnel with DTLS working

---
 CMakeLists.txt                 |  6 ---
 src/irisnet/noncore/dtls.cpp   |  3 +-
 src/xmpp/CMakeLists.txt        |  8 +--
 tools/icetunnel/CMakeLists.txt |  1 +
 tools/icetunnel/main.cpp       | 93 ++++++++++++++++++++++++++++------
 5 files changed, 84 insertions(+), 27 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a768b7c..b4237427 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -117,12 +117,6 @@ if(BUNDLED_QCA)
             INSTALL_COMMAND ""
             )
     endif()
-    add_library(Qca STATIC IMPORTED)
-    set_target_properties(Qca PROPERTIES IMPORTED_LOCATION ${Qca_CORE_LIB})
-    set_target_properties(Qca
-        PROPERTIES IMPORTED_LINK_INTERFACE_LIBRARIES
-        ${Qca_OSSL_LIB} OpenSSL::SSL OpenSSL::Crypto
-        )
 else()
     message(WARNING "Disabling BUNDLED_QCA option makes impossible to use DTLS and PsiMedia")
     message(STATUS "QCA: using system")
diff --git a/src/irisnet/noncore/dtls.cpp b/src/irisnet/noncore/dtls.cpp
index 1f3bebd9..fac22183 100644
--- a/src/irisnet/noncore/dtls.cpp
+++ b/src/irisnet/noncore/dtls.cpp
@@ -44,7 +44,8 @@ class Dtls::Private : public QObject {
         DTLS_DEBUG("tls handshaken");
         auto peerIdentity = tls->peerIdentityResult();
         if (peerIdentity == QCA::TLS::Valid || peerIdentity == QCA::TLS::InvalidCertificate) {
-            auto &cert = tls->peerCertificateChain().first();
+            const auto  chain = tls->peerCertificateChain();
+            const auto &cert  = chain.first();
             if (computeFingerprint(cert, remoteFingerprint.type()) == remoteFingerprint) {
                 DTLS_DEBUG("valid");
                 tls->continueAfterStep();
diff --git a/src/xmpp/CMakeLists.txt b/src/xmpp/CMakeLists.txt
index 5f3b4d67..4dcf8aea 100644
--- a/src/xmpp/CMakeLists.txt
+++ b/src/xmpp/CMakeLists.txt
@@ -204,15 +204,15 @@ if( SEPARATE_QJDNS AND WIN32)
     set(EXTRA_LDFLAGS ws2_32)
 endif()
 
-target_link_libraries(iris ${ZLIB_LIBRARY} ${EXTRA_LDFLAGS} stringprep irisnet)
-target_link_libraries(iris Qt5::Core Qt5::Gui Qt5::Network Qt5::Xml)
+target_link_libraries(iris PRIVATE ${EXTRA_LDFLAGS} stringprep irisnet)
+target_link_libraries(iris PUBLIC ${ZLIB_LIBRARY} Qt5::Core Qt5::Gui Qt5::Network Qt5::Xml)
+target_link_libraries(iris PUBLIC ${qca_LIB})
 if (BUNDLED_QCA)
     add_dependencies(iris QcaProject)
     include_directories(${Qca_INCLUDE_DIR})
     target_include_directories(iris INTERFACE ${Qca_INCLUDE_DIR})
+    target_link_libraries(iris PUBLIC OpenSSL::SSL)
 endif()
-target_link_libraries(iris ${qca_LIB})
-
 
 target_compile_definitions(iris INTERFACE IRISNET_STATIC)
 target_include_directories(iris INTERFACE ${ABS_ROOT_DIR}/include ${ABS_ROOT_DIR}/include/iris ${ABS_PARENT_DIR})
diff --git a/tools/icetunnel/CMakeLists.txt b/tools/icetunnel/CMakeLists.txt
index 19674615..7a8101f7 100644
--- a/tools/icetunnel/CMakeLists.txt
+++ b/tools/icetunnel/CMakeLists.txt
@@ -3,3 +3,4 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_CXX_STANDARD 14)
 add_executable (icetunnel main.cpp)
 target_link_libraries (icetunnel PUBLIC iris Qt::Core Qt::Network)
+target_compile_definitions(icetunnel PUBLIC QCA_STATIC)
diff --git a/tools/icetunnel/main.cpp b/tools/icetunnel/main.cpp
index c5763a16..45e990d4 100644
--- a/tools/icetunnel/main.cpp
+++ b/tools/icetunnel/main.cpp
@@ -21,7 +21,13 @@
 #include <QNetworkInterface>
 #include <QTimer>
 #include <QUdpSocket>
+
 #include <QtCrypto>
+#ifdef QCA_STATIC
+#include <QtPlugin>
+Q_IMPORT_PLUGIN(qca_ossl)
+#endif
+
 #include <iris/dtls.h>
 #include <iris/ice176.h>
 #include <iris/netinterface.h>
@@ -199,29 +205,41 @@ class IceOffer {
 public:
     QString                        user, pass;
     QList<XMPP::Ice176::Candidate> candidates;
+    QList<XMPP::Hash>              dtlsFingerprint;
 };
 
-static QStringList line_wrap(const QString &in, int maxlen)
+static QStringList line_wrap(const QString &prefix, const QString &in, int maxlen)
 {
     Q_ASSERT(maxlen >= 1);
 
     QStringList out;
     int         at = 0;
     while (at < in.length()) {
-        int takeAmount = qMin(maxlen, in.length() - at);
-        out += in.mid(at, takeAmount);
+        int takeAmount = qMin(maxlen - prefix.size() - 1, in.length() - at);
+        out += QString("%1:%2").arg(prefix, in.mid(at, takeAmount));
         at += takeAmount;
     }
     return out;
 }
 
-static QString lines_unwrap(const QStringList &in) { return in.join(QString()); }
+static QMap<QString, QString> lines_unwrap(const QStringList &in)
+{
+    QMap<QString, QString> prefix2body;
+    for (auto const &l : in) {
+        auto prefix = l.section(':', 0, 0);
+        auto body   = l.section(':', 1, 1);
+        prefix2body[prefix] += body;
+    }
+
+    return prefix2body;
+}
 
 static QStringList iceblock_create(const IceOffer &in)
 {
     QStringList out;
-    out += "-----BEGIN ICE-----";
+    out += "-----BEGIN SESSION-----";
     {
+        // ice
         QStringList body;
         QStringList userpass;
         userpass += urlishEncode(in.user);
@@ -229,19 +247,28 @@ static QStringList iceblock_create(const IceOffer &in)
         body += userpass.join(",");
         for (const XMPP::Ice176::Candidate &c : in.candidates)
             body += candidate_to_line(c);
-        out += line_wrap(body.join(";"), 78);
+        out += line_wrap(QLatin1String("ice"), body.join(";"), 78);
+
+        // dtls
+        body.clear();
+        for (auto const &h : in.dtlsFingerprint) {
+            body += h.toString();
+        }
+        out += line_wrap(QLatin1String("dtls"), body.join(";"), 78);
     }
-    out += "-----END ICE-----";
+    out += "-----END SESSION-----";
     return out;
 }
 
 static IceOffer iceblock_parse(const QStringList &in)
 {
     IceOffer out;
-    if (in.count() < 3 || in[0] != "-----BEGIN ICE-----" || in[in.count() - 1] != "-----END ICE-----")
+    if (in.count() < 3 || in[0] != "-----BEGIN SESSION-----" || in[in.count() - 1] != "-----END SESSION-----")
         return IceOffer();
 
-    QStringList body = lines_unwrap(in.mid(1, in.count() - 2)).split(';');
+    QMap<QString, QString> lines = lines_unwrap(in.mid(1, in.count() - 2));
+
+    QStringList body = lines.value(QLatin1String("ice")).split(';');
     if (body.count() < 2)
         return IceOffer();
 
@@ -262,6 +289,12 @@ static IceOffer iceblock_parse(const QStringList &in)
             return IceOffer();
         out.candidates += c;
     }
+
+    body = lines.value(QLatin1String("dtls")).split(';');
+    for (auto const &b : body) {
+        out.dtlsFingerprint += XMPP::Hash::from(QStringRef(&b));
+    }
+
     return out;
 }
 
@@ -291,7 +324,7 @@ private slots:
     void con_readyRead()
     {
         in += con->read();
-        if (in.contains("-----END ICE-----")) {
+        if (in.contains("-----END SESSION-----")) {
             delete con;
             con = 0;
 
@@ -644,9 +677,10 @@ public slots:
 
     void start_dtls()
     {
+        dtls.clear();
         dtls.reserve(opt_channels);
         for (int componentIndex = 0; componentIndex < opt_channels; componentIndex++) {
-            dtls[componentIndex] = new XMPP::Dtls(this);
+            dtls.append(new XMPP::Dtls(this));
             dtls[componentIndex]->generateCertificate();
             auto h = dtls[componentIndex]->fingerprint();
             printf("fingerprint[%d]:%s:%s\n", componentIndex, qPrintable(h.stringType()), h.data().toHex(':').data());
@@ -658,6 +692,10 @@ public slots:
                     [this, dtls = dtls[componentIndex], componentIndex]() {
                         ice->writeDatagram(componentIndex, dtls->readOutgoingDatagram());
                     });
+            connect(dtls[componentIndex], &XMPP::Dtls::connected, this, []() { printf("DTLS connected\n"); });
+            connect(dtls[componentIndex], &XMPP::Dtls::closed, this, []() { printf("DTLS closed\n"); });
+            connect(dtls[componentIndex], &XMPP::Dtls::errorOccurred, this,
+                    [](QAbstractSocket::SocketError err) { printf("DTLS error: %d\n", int(err)); });
         }
     }
 
@@ -709,14 +747,18 @@ private Q_SLOTS:
     void ice_localGatheringComplete()
     {
         IceOffer out;
-        out.user          = ice->localUfrag();
-        out.pass          = ice->localPassword();
-        out.candidates    = localCandidates;
+        out.user       = ice->localUfrag();
+        out.pass       = ice->localPassword();
+        out.candidates = localCandidates;
+        for (const auto d : dtls) {
+            out.dtlsFingerprint += d->fingerprint();
+        }
         QStringList block = iceblock_create(out);
+
         for (const QString &s : block)
             printf("%s\n", qPrintable(s));
 
-        printf("Give above ICE block to peer.  Obtain peer ICE block and paste below...\n");
+        printf("Give above SESSION block to peer.  Obtain peer ICE block and paste below...\n");
 
         console = new QCA::Console(QCA::Console::Stdio, QCA::Console::Read, QCA::Console::Default, this);
 
@@ -757,6 +799,14 @@ private Q_SLOTS:
             return;
         }
 
+        if (dtls.size() != inOffer.dtlsFingerprint.size()) {
+            printf("DTLS disabled due to mismatch in amount of dtls instances and remote fingerprints (not yet "
+                   "unsupported).\n");
+            qDeleteAll(dtls);
+            dtls.clear();
+            inOffer.dtlsFingerprint.clear();
+        }
+
         printf("Press enter to begin.\n");
         prompt = new EnterPrompt(this);
         connect(prompt, SIGNAL(finished()), SLOT(prompt_finished()));
@@ -828,7 +878,17 @@ private Q_SLOTS:
         // do nothing
     }
 
-    void ice_readToSendMedia() { printf("ICE ready to send media.\n"); }
+    void ice_readToSendMedia()
+    {
+        printf("ICE ready to send media.\n");
+        for (int i = 0; i < dtls.size(); i++) {
+            dtls[i]->setRemoteFingerprint(inOffer.dtlsFingerprint[i]);
+            if (opt_mode == 0)
+                dtls[i]->startClient();
+            else
+                dtls[i]->startServer();
+        }
+    }
 };
 
 void usage()
@@ -853,6 +913,7 @@ void usage()
 
 int main(int argc, char **argv)
 {
+
     QCA::Initializer qcaInit;
     QCoreApplication qapp(argc, argv);
 

From 06e7272c7d591e052f5d9d578fadc59766487662 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 29 Sep 2020 01:39:34 +0300
Subject: [PATCH 238/383] Partial received and checksum support for jingle-ft

---
 src/xmpp/xmpp-im/jingle-application.cpp |  3 +++
 src/xmpp/xmpp-im/jingle-application.h   |  2 ++
 src/xmpp/xmpp-im/jingle-ft.cpp          | 34 +++++++++++++++++++++++++
 src/xmpp/xmpp-im/jingle-ft.h            |  6 ++++-
 src/xmpp/xmpp-im/jingle-session.cpp     | 21 ++++++++++++++-
 src/xmpp/xmpp-im/jingle.h               |  5 ++--
 6 files changed, 67 insertions(+), 4 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-application.cpp b/src/xmpp/xmpp-im/jingle-application.cpp
index 22cabb99..90fe6ef6 100644
--- a/src/xmpp/xmpp-im/jingle-application.cpp
+++ b/src/xmpp/xmpp-im/jingle-application.cpp
@@ -285,4 +285,7 @@ namespace XMPP { namespace Jingle {
         }
         return true;
     }
+
+    bool ApplicationManagerPad::incomingSessionInfo(const QDomElement &) { return false; /* unsupported by default */ }
+
 }}
diff --git a/src/xmpp/xmpp-im/jingle-application.h b/src/xmpp/xmpp-im/jingle-application.h
index 9eede390..5031ab22 100644
--- a/src/xmpp/xmpp-im/jingle-application.h
+++ b/src/xmpp/xmpp-im/jingle-application.h
@@ -40,6 +40,8 @@ namespace XMPP { namespace Jingle {
          * As result it will be sent as <content name="file1" ... >
          */
         virtual QString generateContentName(Origin senders) = 0;
+
+        virtual bool incomingSessionInfo(const QDomElement &el);
     };
 
     // Represents a session for single application. for example a single file in a file transfer session.
diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index afb17537..fdc30d09 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -47,6 +47,8 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
     static const QString SIZE_TAG       = QStringLiteral("size");
     static const QString RANGE_TAG      = QStringLiteral("range");
     static const QString THUMBNAIL_TAG  = QStringLiteral("thumbnail");
+    static const QString CHECKSUM_TAG   = QStringLiteral("checksum");
+    static const QString RECEIVED_TAG   = QStringLiteral("received");
 
     QDomElement Range::toXml(QDomDocument *doc) const
     {
@@ -810,6 +812,18 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
 
     Connection::Ptr Application::connection() const { return d->connection.staticCast<XMPP::Jingle::Connection>(); }
 
+    void Application::incomingChecksum(const QList<Hash> &hashes)
+    {
+        // TODO
+        qDebug("got checksum: %s", qPrintable(hashes.value(0).toString()));
+    }
+
+    void Application::incomingReceived()
+    {
+        // TODO
+        qDebug("got received");
+    }
+
     Pad::Pad(Manager *manager, Session *session) : _manager(manager), _session(session) { }
 
     QDomElement Pad::takeOutgoingSessionInfoUpdate()
@@ -837,6 +851,26 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
         return name;
     }
 
+    bool Pad::incomingSessionInfo(const QDomElement &el)
+    {
+        if (el.tagName() == CHECKSUM_TAG) {
+            Checksum checksum(el);
+            auto     app = session()->content(checksum.name, checksum.creator);
+            if (app) {
+                static_cast<Application *>(app)->incomingChecksum(checksum.file.hashes());
+            }
+            return true;
+        } else if (el.tagName() == RECEIVED_TAG) {
+            Received received(el);
+            auto     app = session()->content(received.name, received.creator);
+            if (app) {
+                static_cast<Application *>(app)->incomingReceived();
+            }
+            return true;
+        }
+        return false;
+    }
+
     void Pad::addOutgoingOffer(const File &file)
     {
         auto selfp = _session->applicationPad(NS);
diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index 08c506c2..b4c186c2 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -89,12 +89,12 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
     };
 
     class Checksum : public ContentBase {
+    public:
         inline Checksum() { }
         Checksum(const QDomElement &file);
         bool        isValid() const;
         QDomElement toXml(QDomDocument *doc) const;
 
-    private:
         File file;
     };
 
@@ -113,6 +113,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
         Session *           session() const override;
         ApplicationManager *manager() const override;
         QString             generateContentName(Origin senders) override;
+        bool                incomingSessionInfo(const QDomElement &el) override;
 
         void addOutgoingOffer(const File &file);
 
@@ -164,6 +165,9 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
         void            setDevice(QIODevice *dev, bool closeOnFinish = true);
         Connection::Ptr connection() const;
 
+        void incomingChecksum(const QList<Hash> &hashes);
+        void incomingReceived();
+
     protected:
         void incomingRemove(const Reason &r) override;
         void initTransport() override;
diff --git a/src/xmpp/xmpp-im/jingle-session.cpp b/src/xmpp/xmpp-im/jingle-session.cpp
index b2acb07b..173f2e15 100644
--- a/src/xmpp/xmpp-im/jingle-session.cpp
+++ b/src/xmpp/xmpp-im/jingle-session.cpp
@@ -831,6 +831,25 @@ namespace XMPP { namespace Jingle {
             return true;
         }
 
+        bool handleIncomingSessionInfo(const QDomElement &jingleEl)
+        {
+            bool hasElements = false;
+            for (QDomElement child = jingleEl.firstChildElement(); !child.isNull();
+                 child             = child.nextSiblingElement()) {
+                hasElements = true;
+                auto pad    = q->applicationPad(child.namespaceURI());
+                if (pad) {
+                    return pad->incomingSessionInfo(jingleEl); // should return true if supported
+                }
+            }
+            if (!hasElements) {
+                // TODO implement session ping
+                outgoingUpdates.insert(Action::SessionInfo, {});
+                return true;
+            }
+            return false;
+        }
+
         bool handleIncomingTransportInfo(const QDomElement &jingleEl)
         {
             QString                                              contentTag(QStringLiteral("content"));
@@ -1090,7 +1109,7 @@ namespace XMPP { namespace Jingle {
         case Action::SessionAccept:
             return d->handleIncomingSessionAccept(jingleEl);
         case Action::SessionInfo:
-            break;
+            return d->handleIncomingSessionInfo(jingleEl);
         case Action::SessionInitiate: // impossible case. but let compiler be happy
             break;
         case Action::SessionTerminate:
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index 2919b9cc..8cc5cc9d 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -153,8 +153,9 @@ namespace Jingle {
 
     typedef QPair<QString, Origin>      ContentKey;
     typedef std::function<void(Task *)> OutgoingUpdateCB;
-    typedef std::tuple<QList<QDomElement>, OutgoingUpdateCB>
-        OutgoingUpdate; // list of elements to b inserted to <jingle> and success callback
+
+    // list of elements to b inserted to <jingle> and success callback
+    typedef std::tuple<QList<QDomElement>, OutgoingUpdateCB> OutgoingUpdate;
     typedef std::tuple<QDomElement, OutgoingUpdateCB>
         OutgoingTransportInfoUpdate; // transport element and success callback
 

From 7791170a0e8b96efac6cc45f68e346879a1d3203 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sat, 10 Oct 2020 10:05:25 +0300
Subject: [PATCH 239/383] Use single style for target_link_libraries

---
 src/xmpp/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/xmpp/CMakeLists.txt b/src/xmpp/CMakeLists.txt
index 4dcf8aea..833fc429 100644
--- a/src/xmpp/CMakeLists.txt
+++ b/src/xmpp/CMakeLists.txt
@@ -186,7 +186,7 @@ set_property(TARGET iris PROPERTY C_STANDARD 11)
 if(B2_FOUND)
     message(STATUS "Building with system blake2 library")
     target_compile_definitions(iris PUBLIC IRIS_SYSTEM_BLAKE2)
-    target_link_libraries(iris ${B2_LIBRARY})
+    target_link_libraries(iris PRIVATE ${B2_LIBRARY})
 else()
     if (NOT BUNDLED_QCA)
         message(STATUS "No system blake2 and bundled QCA is disabled. Expect slow hashing.")

From 051fb925a9f260596b7096212cc9e894a991622a Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 21 Oct 2020 12:40:15 +0300
Subject: [PATCH 240/383] Added bundled usrsctp

---
 CMakeLists.txt                          | 56 +++++++++++++++++++++++++
 cmake/modules/FindUsrSCTP.cmake         | 24 +++++++++++
 src/irisnet/CMakeLists.txt              |  1 +
 src/xmpp/xmpp-im/jingle-application.cpp |  1 +
 4 files changed, 82 insertions(+)
 create mode 100644 cmake/modules/FindUsrSCTP.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b4237427..5b5cc3b6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,6 +41,7 @@ set( CMAKE_MODULE_PATH
 option( USE_QJDNS "Use qjdns/jdns library. Disabled by default for Qt5" OFF )
 option( SEPARATE_QJDNS "Build qjdns with iris library" OFF )
 option( BUNDLED_QCA "Adds: DTLS, Blake2b and other useful for XMPP crypto-stuff" OFF)
+option( BUNDLED_USRSCTP "Compile compatible usrsctp lib when system one is not available or uncompatible (required for datachannel jingle transport)" OFF)
 option( BUILD_IRIS_TOOLS "Build tools and examples" OFF)
 
 set(CMAKE_CXX_STANDARD 14)
@@ -130,6 +131,61 @@ include_directories(
     ${Qca_INCLUDE_DIR}
 )
 
+if(NOT BUNDLED_USRSCTP)
+    find_package(UsrSCTP)
+    if (USRSCTP_FOUND)
+        message(STATUS "USRSCTP: using system")
+    endif()
+endif()
+if (NOT USRSCTP_FOUND)
+    message(STATUS "USRSCTP: using bundled")
+    set(USRSCTP_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/usrsctp)
+    set(USRSCTP_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/usrsctp)
+    set(USRSCTP_BUILD_DIR ${USRSCTP_PREFIX}/build)
+    set(USRSCTP_INCLUDE_DIR ${USRSCTP_SOURCE_DIR}/include)
+    set(USRSCTP_LIBRARY ${USRSCTP_BUILD_DIR}/usrsctplib/${CMAKE_STATIC_LIBRARY_PREFIX}usrsctp${CMAKE_STATIC_LIBRARY_SUFFIX})
+
+    include(ExternalProject)
+    #set CMake options and transfer the environment to an external project
+    set(USRSCTP_BUILD_OPTIONS
+        -DBUILD_SHARED_LIBS=OFF -Dsctp_build_programs=OFF -Dsctp_debug=OFF -Dsctp_inet=OFF -Dsctp_inet6=OFF
+        -DCMAKE_INSTALL_PREFIX=${USRSCTP_PREFIX} -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
+        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE})
+    if (EXISTS ${USRSCTP_SOURCE_DIR})
+        message(STATUS "USRSCTP: found bundled sources")
+        ExternalProject_Add(UsrSCTPProject
+            PREFIX ${USRSCTP_PREFIX}
+            BINARY_DIR ${USRSCTP_BUILD_DIR}
+            SOURCE_DIR ${USRSCTP_SOURCE_DIR}
+            CMAKE_ARGS ${USRSCTP_BUILD_OPTIONS}
+            BUILD_BYPRODUCTS ${USRSCTP_LIBRARY}
+            INSTALL_COMMAND ""
+            )
+    else()
+        include(FindGit)
+        find_package(Git)
+        if(NOT Git_FOUND)
+            message(FATAL_ERROR "Git not found! Bundled UsrSCTP needs Git utility.\nPlease set GIT_EXECUTABLE variable or add git to PATH")
+        endif()
+        ExternalProject_Add(UsrSCTPProject
+            PREFIX ${USRSCTP_PREFIX}
+            BINARY_DIR ${USRSCTP_BUILD_DIR}
+            GIT_REPOSITORY https://github.com/sctplab/usrsctp.git
+            GIT_TAG f4925bd5ebb2db38263eef0ec816bf393293cf9c
+            CMAKE_ARGS ${USRSCTP_BUILD_OPTIONS}
+            BUILD_BYPRODUCTS ${USRSCTP_LIBRARY}
+            INSTALL_COMMAND ""
+            )
+    endif()
+    add_library(SctpLab::UsrSCTP UNKNOWN IMPORTED)
+    set_target_properties(SctpLab::UsrSCTP PROPERTIES
+            IMPORTED_LOCATION "${USRSCTP_LIBRARY}"
+            INTERFACE_COMPILE_DEFINITIONS "${USRSCTP_DEFINITIONS}"
+            INTERFACE_INCLUDE_DIRECTORIES "${USRSCTP_INCLUDE_DIR}"
+            IMPORTED_LINK_INTERFACE_LANGUAGES "C")
+    add_dependencies(SctpLab::UsrSCTP ${USRSCTP_LIBRARY})
+endif()
+
 if(NOT USE_QJDNS AND SEPARATE_QJDNS)
     message(FATAL_ERROR "SEPARATE_QJDNS flag enabled, but USE_QJDNS flag disabled.\nPlease enable flag USE_QJDNS or disable both flags")
 endif()
diff --git a/cmake/modules/FindUsrSCTP.cmake b/cmake/modules/FindUsrSCTP.cmake
new file mode 100644
index 00000000..7058190b
--- /dev/null
+++ b/cmake/modules/FindUsrSCTP.cmake
@@ -0,0 +1,24 @@
+# Simple libnice cmake find
+
+if (NOT TARGET SctpLab::UsrSCTP)
+    #set(USRSCTP_DEFINITIONS INET INET6)
+    find_path(USRSCTP_INCLUDE usrsctp.h HINTS ${USRSCTP_INCLUDE_DIR} PATH_SUFFIXES usrsctp)
+    find_library(USRSCTP_LIBRARY NAMES usrsctp libusrsctp HINTS ${USRSCTP_LIB_DIR})
+
+    include(FindPackageHandleStandardArgs)
+    find_package_handle_standard_args(Usrsctp DEFAULT_MSG USRSCTP_LIBRARY USRSCTP_INCLUDE)
+
+    mark_as_advanced(USRSCTP_INCLUDE USRSCTP_LIBRARY)
+
+    set(USRSCTP_LIBRARIES ${USRSCTP_LIBRARY})
+    set(USRSCTP_INCLUDES ${USRSCTP_INCLUDE})
+
+    if (USRSCTP_FOUND)
+        add_library(SctpLab::UsrSCTP UNKNOWN IMPORTED)
+        set_target_properties(SctpLab::UsrSCTP PROPERTIES
+                IMPORTED_LOCATION "${USRSCTP_LIBRARY}"
+                INTERFACE_COMPILE_DEFINITIONS "${USRSCTP_DEFINITIONS}"
+                INTERFACE_INCLUDE_DIRECTORIES "${USRSCTP_INCLUDES}"
+                IMPORTED_LINK_INTERFACE_LANGUAGES "C")
+    endif ()
+endif ()
diff --git a/src/irisnet/CMakeLists.txt b/src/irisnet/CMakeLists.txt
index c58ba395..65430551 100644
--- a/src/irisnet/CMakeLists.txt
+++ b/src/irisnet/CMakeLists.txt
@@ -127,4 +127,5 @@ if (BUNDLED_QCA)
     add_dependencies(irisnet QcaProject)
 endif()
 target_link_libraries(irisnet ${qca_LIB})
+target_link_libraries(irisnet ${USRSCTP_LIBRARY})
 target_link_libraries(irisnet ${QJDns_LIBRARY} ${EXTRA_LDFLAGS})
diff --git a/src/xmpp/xmpp-im/jingle-application.cpp b/src/xmpp/xmpp-im/jingle-application.cpp
index 90fe6ef6..220d34d9 100644
--- a/src/xmpp/xmpp-im/jingle-application.cpp
+++ b/src/xmpp/xmpp-im/jingle-application.cpp
@@ -242,6 +242,7 @@ namespace XMPP { namespace Jingle {
         if (!isTransportReplaceEnabled() || !_transportSelector->replace(_transport, transport))
             return false;
 
+        qDebug("setting transport %s", qPrintable(transport->pad()->ns()));
         // in case we automatically select a new transport on our own we definitely will come up to this point
         if (_transport) {
             if (_transport->state() < State::Unacked && _transport->creator() == _pad->session()->role()

From 903530d8339cf77a834a0d44ee3c00fe4f10acaa Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Wed, 21 Oct 2020 13:16:13 +0300
Subject: [PATCH 241/383] Fixed letter case in CMake modules

---
 CMakeLists.txt                  | 4 ++--
 cmake/modules/FindUsrSCTP.cmake | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b5cc3b6..22a3d8f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -133,11 +133,11 @@ include_directories(
 
 if(NOT BUNDLED_USRSCTP)
     find_package(UsrSCTP)
-    if (USRSCTP_FOUND)
+    if (UsrSCTP_FOUND)
         message(STATUS "USRSCTP: using system")
     endif()
 endif()
-if (NOT USRSCTP_FOUND)
+if (NOT UsrSCTP_FOUND)
     message(STATUS "USRSCTP: using bundled")
     set(USRSCTP_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/usrsctp)
     set(USRSCTP_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/usrsctp)
diff --git a/cmake/modules/FindUsrSCTP.cmake b/cmake/modules/FindUsrSCTP.cmake
index 7058190b..efc77ab6 100644
--- a/cmake/modules/FindUsrSCTP.cmake
+++ b/cmake/modules/FindUsrSCTP.cmake
@@ -6,14 +6,14 @@ if (NOT TARGET SctpLab::UsrSCTP)
     find_library(USRSCTP_LIBRARY NAMES usrsctp libusrsctp HINTS ${USRSCTP_LIB_DIR})
 
     include(FindPackageHandleStandardArgs)
-    find_package_handle_standard_args(Usrsctp DEFAULT_MSG USRSCTP_LIBRARY USRSCTP_INCLUDE)
+    find_package_handle_standard_args(UsrSCTP DEFAULT_MSG USRSCTP_LIBRARY USRSCTP_INCLUDE)
 
     mark_as_advanced(USRSCTP_INCLUDE USRSCTP_LIBRARY)
 
     set(USRSCTP_LIBRARIES ${USRSCTP_LIBRARY})
     set(USRSCTP_INCLUDES ${USRSCTP_INCLUDE})
 
-    if (USRSCTP_FOUND)
+    if (UsrSCTP_FOUND)
         add_library(SctpLab::UsrSCTP UNKNOWN IMPORTED)
         set_target_properties(SctpLab::UsrSCTP PROPERTIES
                 IMPORTED_LOCATION "${USRSCTP_LIBRARY}"

From ad11964c3bfd1557f124a4eafb2ed6e3c41a6b15 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 25 Oct 2020 18:58:23 +0300
Subject: [PATCH 242/383] Simpler and more flexible dns resolver for ICE stuff

---
 src/xmpp/xmpp-im/jingle-ice.cpp | 177 +++++++-------------------------
 1 file changed, 37 insertions(+), 140 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index aadb1394..ccec1fff 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -102,142 +102,42 @@ namespace XMPP { namespace Jingle { namespace ICE {
         return out;
     }
 
-    // resolve external address and stun server
-    // TODO: resolve hosts and start ice engine simultaneously
-    // FIXME: when/if our ICE engine supports adding these dynamically, we should
-    //   not have the lookups block on each other
     class Resolver : public QObject {
         Q_OBJECT
+        using QObject::QObject;
 
-    private:
-        XMPP::NameResolver dnsA;
-        XMPP::NameResolver dnsB;
-        XMPP::NameResolver dnsC;
-        XMPP::NameResolver dnsD;
-        QString            extHost;
-        QString            stunBindHost, stunRelayUdpHost, stunRelayTcpHost;
-        bool               extDone;
-        bool               stunBindDone;
-        bool               stunRelayUdpDone;
-        bool               stunRelayTcpDone;
-
-    public:
-        QHostAddress extAddr;
-        QHostAddress stunBindAddr, stunRelayUdpAddr, stunRelayTcpAddr;
-
-        Resolver(QObject *parent = nullptr) : QObject(parent), dnsA(parent), dnsB(parent), dnsC(parent), dnsD(parent)
-        {
-            connect(&dnsA, SIGNAL(resultsReady(const QList<XMPP::NameRecord> &)),
-                    SLOT(dns_resultsReady(const QList<XMPP::NameRecord> &)));
-            connect(&dnsA, SIGNAL(error(XMPP::NameResolver::Error)), SLOT(dns_error(XMPP::NameResolver::Error)));
-
-            connect(&dnsB, SIGNAL(resultsReady(const QList<XMPP::NameRecord> &)),
-                    SLOT(dns_resultsReady(const QList<XMPP::NameRecord> &)));
-            connect(&dnsB, SIGNAL(error(XMPP::NameResolver::Error)), SLOT(dns_error(XMPP::NameResolver::Error)));
-
-            connect(&dnsC, SIGNAL(resultsReady(const QList<XMPP::NameRecord> &)),
-                    SLOT(dns_resultsReady(const QList<XMPP::NameRecord> &)));
-            connect(&dnsC, SIGNAL(error(XMPP::NameResolver::Error)), SLOT(dns_error(XMPP::NameResolver::Error)));
-
-            connect(&dnsD, SIGNAL(resultsReady(const QList<XMPP::NameRecord> &)),
-                    SLOT(dns_resultsReady(const QList<XMPP::NameRecord> &)));
-            connect(&dnsD, SIGNAL(error(XMPP::NameResolver::Error)), SLOT(dns_error(XMPP::NameResolver::Error)));
-        }
-
-        void start(const QString &_extHost, const QString &_stunBindHost, const QString &_stunRelayUdpHost,
-                   const QString &_stunRelayTcpHost)
-        {
-            extHost          = _extHost;
-            stunBindHost     = _stunBindHost;
-            stunRelayUdpHost = _stunRelayUdpHost;
-            stunRelayTcpHost = _stunRelayTcpHost;
-
-            if (!extHost.isEmpty()) {
-                extDone = false;
-                dnsA.start(extHost.toLatin1());
-            } else
-                extDone = true;
-
-            if (!stunBindHost.isEmpty()) {
-                stunBindDone = false;
-                dnsB.start(stunBindHost.toLatin1());
-            } else
-                stunBindDone = true;
-
-            if (!stunRelayUdpHost.isEmpty()) {
-                stunRelayUdpDone = false;
-                dnsC.start(stunRelayUdpHost.toLatin1());
-            } else
-                stunRelayUdpDone = true;
-
-            if (!stunRelayTcpHost.isEmpty()) {
-                stunRelayTcpDone = false;
-                dnsD.start(stunRelayTcpHost.toLatin1());
-            } else
-                stunRelayTcpDone = true;
-
-            if (extDone && stunBindDone && stunRelayUdpDone && stunRelayTcpDone)
-                QMetaObject::invokeMethod(this, "finished", Qt::QueuedConnection);
-        }
+        int                   counter;
+        std::function<void()> callback;
 
-    signals:
-        void finished();
-
-    private slots:
-        void dns_resultsReady(const QList<XMPP::NameRecord> &results)
+        void onOneFinished()
         {
-            XMPP::NameResolver *dns = static_cast<XMPP::NameResolver *>(sender());
-
-            // FIXME: support more than one address?
-            QHostAddress addr = results.first().address();
-
-            if (dns == &dnsA) {
-                extAddr = addr;
-                extDone = true;
-                tryFinish();
-            } else if (dns == &dnsB) {
-                stunBindAddr = addr;
-                stunBindDone = true;
-                tryFinish();
-            } else if (dns == &dnsC) {
-                stunRelayUdpAddr = addr;
-                stunRelayUdpDone = true;
-                tryFinish();
-            } else // dnsD
-            {
-                stunRelayTcpAddr = addr;
-                stunRelayTcpDone = true;
-                tryFinish();
+            if (--counter) {
+                callback();
+                deleteLater();
             }
         }
 
-        void dns_error(XMPP::NameResolver::Error e)
-        {
-            Q_UNUSED(e)
-
-            XMPP::NameResolver *dns = static_cast<XMPP::NameResolver *>(sender());
-
-            if (dns == &dnsA) {
-                extDone = true;
-                tryFinish();
-            } else if (dns == &dnsB) {
-                stunBindDone = true;
-                tryFinish();
-            } else if (dns == &dnsC) {
-                stunRelayUdpDone = true;
-                tryFinish();
-            } else // dnsD
-            {
-                stunRelayTcpDone = true;
-                tryFinish();
-            }
-        }
+    public:
+        using ResolveList = std::list<std::pair<QString, std::reference_wrapper<QHostAddress>>>;
 
-    private:
-        void tryFinish()
+        static void resolve(QObject *parent, ResolveList list, std::function<void()> &&callback)
         {
-            if (extDone && stunBindDone && stunRelayUdpDone && stunRelayTcpDone)
-                emit finished();
+            auto resolver      = new Resolver(parent);
+            resolver->counter  = list.size();
+            resolver->callback = callback;
+            for (auto &item : list) {
+                auto *dns = new NameResolver(parent);
+
+                connect(dns, &NameResolver::resultsReady, resolver,
+                        [result = item.second, resolver](const QList<XMPP::NameRecord> &records) {
+                            result.get() = records.first().address();
+                            resolver->onOneFinished();
+                        });
+                connect(dns, &NameResolver::error, resolver,
+                        [resolver](XMPP::NameResolver::Error) { resolver->onOneFinished(); });
+
+                dns->start(item.first.toLatin1());
+            }
         }
     };
 
@@ -757,20 +657,17 @@ namespace XMPP { namespace Jingle { namespace ICE {
         // auto scope = _pad.staticCast<Pad>()->discoScope();
         // d->disco   = scope->disco(); // FIXME store and handle signale. delete when not needed
 
-        auto manager  = dynamic_cast<Manager *>(_pad->manager())->d.data();
-        auto resolver = new Resolver();
-        connect(resolver, &Resolver::finished, this, [this, resolver]() {
-            d->extAddr          = resolver->extAddr;
-            d->stunBindAddr     = resolver->stunBindAddr;
-            d->stunRelayUdpAddr = resolver->stunRelayUdpAddr;
-            d->stunRelayTcpAddr = resolver->stunRelayTcpAddr;
-
-            printf("resolver finished\n");
-            resolver->deleteLater();
-            d->startIce();
-        });
-        d->resolver.start(manager->extHost, manager->stunBindHost, manager->stunRelayUdpHost,
-                          manager->stunRelayTcpHost);
+        auto manager = dynamic_cast<Manager *>(_pad->manager())->d.data();
+
+        Resolver::resolve(this,
+                          { { manager->extHost, std::ref(d->extAddr) },
+                            { manager->stunBindHost, std::ref(d->stunBindAddr) },
+                            { manager->stunRelayUdpHost, std::ref(d->stunRelayUdpAddr) },
+                            { manager->stunRelayTcpHost, std::ref(d->stunRelayTcpAddr) } },
+                          [this]() {
+                              printf("resolver finished\n");
+                              d->startIce();
+                          });
 
         // connect(d->disco, &TcpPortDiscoverer::portAvailable, this, [this]() { d->onLocalServerDiscovered(); });
         // d->onLocalServerDiscovered();

From fff865892971bdcd0f37c0a413bea4bb18bab982 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 25 Oct 2020 19:03:42 +0300
Subject: [PATCH 243/383] Added SCTP wrapping code from MediaSoup project

---
 src/irisnet/CMakeLists.txt                    |  15 +
 src/irisnet/noncore/sctp/DepUsrSCTP.cpp       | 205 ++++
 src/irisnet/noncore/sctp/DepUsrSCTP.hpp       |  48 +
 src/irisnet/noncore/sctp/LICENSE              |  15 +
 src/irisnet/noncore/sctp/Logger.hpp           |  21 +
 src/irisnet/noncore/sctp/MediaSoupErrors.hpp  |  64 ++
 src/irisnet/noncore/sctp/README.md            |  18 +
 src/irisnet/noncore/sctp/RTC/DataConsumer.hpp |  14 +
 src/irisnet/noncore/sctp/RTC/DataProducer.hpp |  14 +
 .../noncore/sctp/RTC/SctpParameters.hpp       |  14 +
 src/irisnet/noncore/sctp/SctpAssociation.cpp  | 894 ++++++++++++++++++
 src/irisnet/noncore/sctp/SctpAssociation.hpp  | 104 ++
 12 files changed, 1426 insertions(+)
 create mode 100644 src/irisnet/noncore/sctp/DepUsrSCTP.cpp
 create mode 100644 src/irisnet/noncore/sctp/DepUsrSCTP.hpp
 create mode 100644 src/irisnet/noncore/sctp/LICENSE
 create mode 100644 src/irisnet/noncore/sctp/Logger.hpp
 create mode 100644 src/irisnet/noncore/sctp/MediaSoupErrors.hpp
 create mode 100644 src/irisnet/noncore/sctp/README.md
 create mode 100644 src/irisnet/noncore/sctp/RTC/DataConsumer.hpp
 create mode 100644 src/irisnet/noncore/sctp/RTC/DataProducer.hpp
 create mode 100644 src/irisnet/noncore/sctp/RTC/SctpParameters.hpp
 create mode 100644 src/irisnet/noncore/sctp/SctpAssociation.cpp
 create mode 100644 src/irisnet/noncore/sctp/SctpAssociation.hpp

diff --git a/src/irisnet/CMakeLists.txt b/src/irisnet/CMakeLists.txt
index 65430551..7f9051ff 100644
--- a/src/irisnet/CMakeLists.txt
+++ b/src/irisnet/CMakeLists.txt
@@ -53,6 +53,9 @@ set(SOURCES
     noncore/dtls.cpp
 
     noncore/cutestuff/bsocket.cpp
+
+    noncore/sctp/SctpAssociation.cpp
+    noncore/sctp/DepUsrSCTP.cpp
 )
 
 if(UNIX)
@@ -107,6 +110,12 @@ set(HEADERS
 
     noncore/legacy/ndns.h
     noncore/legacy/srvresolver.h
+
+    noncore/sctp/SctpAssociation.hpp
+    noncore/sctp/DepUsrSCTP.hpp
+    noncore/sctp/RTC/DataConsumer.hpp
+    noncore/sctp/RTC/DataProducer.hpp
+    noncore/sctp/RTC/SctpParameters.hpp
 )
 
 add_library(irisnet STATIC ${SOURCES} ${HEADERS} )
@@ -129,3 +138,9 @@ endif()
 target_link_libraries(irisnet ${qca_LIB})
 target_link_libraries(irisnet ${USRSCTP_LIBRARY})
 target_link_libraries(irisnet ${QJDns_LIBRARY} ${EXTRA_LDFLAGS})
+
+# usrsctp requires pthread
+if(NOT WIN32)
+    find_package(Threads)
+    target_link_libraries(irisnet Threads::Threads)
+endif()
diff --git a/src/irisnet/noncore/sctp/DepUsrSCTP.cpp b/src/irisnet/noncore/sctp/DepUsrSCTP.cpp
new file mode 100644
index 00000000..fe14f4d2
--- /dev/null
+++ b/src/irisnet/noncore/sctp/DepUsrSCTP.cpp
@@ -0,0 +1,205 @@
+#define MS_CLASS "DepUsrSCTP"
+// #define MS_LOG_DEV_LEVEL 3
+
+#include "DepUsrSCTP.hpp"
+//#include "DepLibUV.hpp"
+//#include "Logger.hpp"
+#include <usrsctp.h>
+
+#include <QTimer>
+
+#include <cstring>
+
+#define MS_TRACE()
+#define MS_WARN_TAG(args...)
+#define MS_DEBUG_TAG(args...)
+#define MS_ASSERT(cond, what) Q_ASSERT_X(cond, "sctp", what)
+
+/* Static. */
+
+static constexpr size_t CheckerInterval { 10u }; // In ms.
+
+/* Static methods for usrsctp global callbacks. */
+
+inline static int onSendSctpData(void *addr, void *data, size_t len, uint8_t /*tos*/, uint8_t /*setDf*/)
+{
+    auto *sctpAssociation = DepUsrSCTP::RetrieveSctpAssociation(reinterpret_cast<uintptr_t>(addr));
+
+    if (!sctpAssociation) {
+        MS_WARN_TAG(sctp, "no SctpAssociation found");
+
+        return -1;
+    }
+
+    sctpAssociation->OnUsrSctpSendSctpData(data, len);
+
+    // NOTE: Must not free data, usrsctp lib does it.
+
+    return 0;
+}
+
+// Static method for printing usrsctp debug.
+inline static void sctpDebug(const char *format, ...)
+{
+    char    buffer[10000];
+    va_list ap;
+
+    va_start(ap, format);
+    vsprintf(buffer, format, ap);
+
+    // Remove the artificial carriage return set by usrsctp.
+    buffer[std::strlen(buffer) - 1] = '\0';
+
+    MS_DEBUG_TAG(sctp, "%s", buffer);
+
+    va_end(ap);
+}
+
+/* Static variables. */
+
+DepUsrSCTP::Checker *                                 DepUsrSCTP::checker { nullptr };
+uint64_t                                              DepUsrSCTP::numSctpAssociations { 0u };
+uintptr_t                                             DepUsrSCTP::nextSctpAssociationId { 0u };
+std::unordered_map<uintptr_t, RTC::SctpAssociation *> DepUsrSCTP::mapIdSctpAssociation;
+
+/* Static methods. */
+
+void DepUsrSCTP::ClassInit()
+{
+    MS_TRACE();
+
+    MS_DEBUG_TAG(info, "usrsctp");
+
+    usrsctp_init_nothreads(0, onSendSctpData, sctpDebug);
+
+    // Disable explicit congestion notifications (ecn).
+    usrsctp_sysctl_set_sctp_ecn_enable(0);
+
+#ifdef SCTP_DEBUG
+    usrsctp_sysctl_set_sctp_debug_on(SCTP_DEBUG_ALL);
+#endif
+
+    DepUsrSCTP::checker = new DepUsrSCTP::Checker();
+}
+
+void DepUsrSCTP::ClassDestroy()
+{
+    MS_TRACE();
+
+    usrsctp_finish();
+
+    delete DepUsrSCTP::checker;
+}
+
+uintptr_t DepUsrSCTP::GetNextSctpAssociationId()
+{
+    MS_TRACE();
+
+    // NOTE: usrsctp_connect() fails with a value of 0.
+    if (DepUsrSCTP::nextSctpAssociationId == 0u)
+        ++DepUsrSCTP::nextSctpAssociationId;
+
+    // In case we've wrapped around and need to find an empty spot from a removed
+    // SctpAssociation. Assumes we'll never be full.
+    while (DepUsrSCTP::mapIdSctpAssociation.find(DepUsrSCTP::nextSctpAssociationId)
+           != DepUsrSCTP::mapIdSctpAssociation.end()) {
+        ++DepUsrSCTP::nextSctpAssociationId;
+
+        if (DepUsrSCTP::nextSctpAssociationId == 0u)
+            ++DepUsrSCTP::nextSctpAssociationId;
+    }
+
+    return DepUsrSCTP::nextSctpAssociationId++;
+}
+
+void DepUsrSCTP::RegisterSctpAssociation(RTC::SctpAssociation *sctpAssociation)
+{
+    MS_TRACE();
+
+    auto it = DepUsrSCTP::mapIdSctpAssociation.find(sctpAssociation->id);
+
+    MS_ASSERT(it == DepUsrSCTP::mapIdSctpAssociation.end(), "the id of the SctpAssociation is already in the map");
+
+    DepUsrSCTP::mapIdSctpAssociation[sctpAssociation->id] = sctpAssociation;
+
+    if (++DepUsrSCTP::numSctpAssociations == 1u)
+        DepUsrSCTP::checker->Start();
+}
+
+void DepUsrSCTP::DeregisterSctpAssociation(RTC::SctpAssociation *sctpAssociation)
+{
+    MS_TRACE();
+
+    auto found = DepUsrSCTP::mapIdSctpAssociation.erase(sctpAssociation->id);
+
+    MS_ASSERT(found > 0, "SctpAssociation not found");
+    MS_ASSERT(DepUsrSCTP::numSctpAssociations > 0u, "numSctpAssociations was not higher than 0");
+
+    if (--DepUsrSCTP::numSctpAssociations == 0u)
+        DepUsrSCTP::checker->Stop();
+}
+
+RTC::SctpAssociation *DepUsrSCTP::RetrieveSctpAssociation(uintptr_t id)
+{
+    MS_TRACE();
+
+    auto it = DepUsrSCTP::mapIdSctpAssociation.find(id);
+
+    if (it == DepUsrSCTP::mapIdSctpAssociation.end())
+        return nullptr;
+
+    return it->second;
+}
+
+/* DepUsrSCTP::Checker instance methods. */
+
+DepUsrSCTP::Checker::Checker()
+{
+    MS_TRACE();
+
+    this->timer = new QTimer();
+}
+
+DepUsrSCTP::Checker::~Checker()
+{
+    MS_TRACE();
+
+    delete this->timer;
+}
+
+void DepUsrSCTP::Checker::Start()
+{
+    MS_TRACE();
+
+    MS_DEBUG_TAG(sctp, "usrsctp periodic check started");
+
+    this->elapsedTimer.invalidate();
+
+    this->timer->setInterval(CheckerInterval);
+    this->timer->start();
+}
+
+void DepUsrSCTP::Checker::Stop()
+{
+    MS_TRACE();
+
+    MS_DEBUG_TAG(sctp, "usrsctp periodic check stopped");
+
+    this->elapsedTimer.invalidate();
+
+    this->timer->stop();
+}
+
+void DepUsrSCTP::Checker::OnTimer()
+{
+    MS_TRACE();
+
+    qint64 elapsedMs = 0;
+    if (elapsedTimer.isValid()) {
+        elapsedMs = elapsedTimer.restart();
+    } else {
+        elapsedTimer.start();
+    }
+
+    usrsctp_handle_timers(elapsedMs);
+}
diff --git a/src/irisnet/noncore/sctp/DepUsrSCTP.hpp b/src/irisnet/noncore/sctp/DepUsrSCTP.hpp
new file mode 100644
index 00000000..55a0bdd1
--- /dev/null
+++ b/src/irisnet/noncore/sctp/DepUsrSCTP.hpp
@@ -0,0 +1,48 @@
+#ifndef MS_DEP_USRSCTP_HPP
+#define MS_DEP_USRSCTP_HPP
+
+//#include "common.hpp"
+#include "SctpAssociation.hpp"
+//#include "handles/Timer.hpp"
+#include <unordered_map>
+
+#include <QElapsedTimer>
+#include <QTimer>
+#include <QtGlobal>
+
+class DepUsrSCTP {
+private:
+    class Checker {
+    public:
+        Checker();
+        ~Checker();
+
+    public:
+        void Start();
+        void Stop();
+
+        /* Pure virtual methods inherited from Timer::Listener. */
+    public:
+        void OnTimer();
+
+    private:
+        QTimer *      timer { nullptr };
+        QElapsedTimer elapsedTimer;
+    };
+
+public:
+    static void                  ClassInit();
+    static void                  ClassDestroy();
+    static uintptr_t             GetNextSctpAssociationId();
+    static void                  RegisterSctpAssociation(RTC::SctpAssociation *sctpAssociation);
+    static void                  DeregisterSctpAssociation(RTC::SctpAssociation *sctpAssociation);
+    static RTC::SctpAssociation *RetrieveSctpAssociation(uintptr_t id);
+
+private:
+    static Checker *                                             checker;
+    static uint64_t                                              numSctpAssociations;
+    static uintptr_t                                             nextSctpAssociationId;
+    static std::unordered_map<uintptr_t, RTC::SctpAssociation *> mapIdSctpAssociation;
+};
+
+#endif
diff --git a/src/irisnet/noncore/sctp/LICENSE b/src/irisnet/noncore/sctp/LICENSE
new file mode 100644
index 00000000..0fcef6b3
--- /dev/null
+++ b/src/irisnet/noncore/sctp/LICENSE
@@ -0,0 +1,15 @@
+ISC License
+
+Copyright © 2015, Iñaki Baz Castillo <ibc@aliax.net>
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/src/irisnet/noncore/sctp/Logger.hpp b/src/irisnet/noncore/sctp/Logger.hpp
new file mode 100644
index 00000000..a03a07b0
--- /dev/null
+++ b/src/irisnet/noncore/sctp/Logger.hpp
@@ -0,0 +1,21 @@
+#pragma once
+
+#include <QtGlobal>
+#include <cinttypes>
+
+#define MS_WARN_TAG(tag, args...) qWarning("sctp:" args)
+#define MS_DEBUG_TAG(tag, args...) qDebug("sctp:" args)
+#define MS_TRACE()
+#define MS_ERROR(args...) qCritical(args)
+#define MS_DEBUG_DEV(args...) qDebug(args)
+#define MS_HAS_DEBUG_TAG(tag) false
+
+#define MS_ABORT(desc, ...)                                                                                            \
+    do {                                                                                                               \
+        qFatal("(ABORT) " desc, ##__VA_ARGS__);                                                                        \
+    } while (false)
+
+#define MS_ASSERT(condition, desc, ...)                                                                                \
+    if (!(condition)) {                                                                                                \
+        MS_ABORT("failed assertion `%s': " desc, #condition, ##__VA_ARGS__);                                           \
+    }
diff --git a/src/irisnet/noncore/sctp/MediaSoupErrors.hpp b/src/irisnet/noncore/sctp/MediaSoupErrors.hpp
new file mode 100644
index 00000000..d6de2ed2
--- /dev/null
+++ b/src/irisnet/noncore/sctp/MediaSoupErrors.hpp
@@ -0,0 +1,64 @@
+#ifndef MS_MEDIASOUP_ERRORS_HPP
+#define MS_MEDIASOUP_ERRORS_HPP
+
+#include "Logger.hpp"
+#include <cstdio> // std::snprintf()
+#include <stdexcept>
+
+class MediaSoupError : public std::runtime_error {
+public:
+    explicit MediaSoupError(const char *description) : std::runtime_error(description) { }
+};
+
+class MediaSoupTypeError : public MediaSoupError {
+public:
+    explicit MediaSoupTypeError(const char *description) : MediaSoupError(description) { }
+};
+
+// clang-format off
+#define MS_THROW_ERROR(desc, ...) \
+    do \
+    { \
+        MS_ERROR("throwing MediaSoupError: " desc, ##__VA_ARGS__); \
+        \
+        static char buffer[2000]; \
+        \
+        std::snprintf(buffer, 2000, desc, ##__VA_ARGS__); \
+        throw MediaSoupError(buffer); \
+    } while (false)
+
+#define MS_THROW_ERROR_STD(desc, ...) \
+    do \
+    { \
+        MS_ERROR_STD("throwing MediaSoupError: " desc, ##__VA_ARGS__); \
+        \
+        static char buffer[2000]; \
+        \
+        std::snprintf(buffer, 2000, desc, ##__VA_ARGS__); \
+        throw MediaSoupError(buffer); \
+    } while (false)
+
+#define MS_THROW_TYPE_ERROR(desc, ...) \
+    do \
+    { \
+        MS_ERROR("throwing MediaSoupTypeError: " desc, ##__VA_ARGS__); \
+        \
+        static char buffer[2000]; \
+        \
+        std::snprintf(buffer, 2000, desc, ##__VA_ARGS__); \
+        throw MediaSoupTypeError(buffer); \
+    } while (false)
+
+#define MS_THROW_TYPE_ERROR_STD(desc, ...) \
+    do \
+    { \
+        MS_ERROR_STD("throwing MediaSoupTypeError: " desc, ##__VA_ARGS__); \
+        \
+        static char buffer[2000]; \
+        \
+        std::snprintf(buffer, 2000, desc, ##__VA_ARGS__); \
+        throw MediaSoupTypeError(buffer); \
+    } while (false)
+// clang-format on
+
+#endif
diff --git a/src/irisnet/noncore/sctp/README.md b/src/irisnet/noncore/sctp/README.md
new file mode 100644
index 00000000..af44487f
--- /dev/null
+++ b/src/irisnet/noncore/sctp/README.md
@@ -0,0 +1,18 @@
+DataChannel implementation is borrowed from https://github.com/versatica/mediasoup/tree/v3/worker
+https://github.com/versatica/mediasoup/commit/45dfac41b35d5cd88822fbdf92bbb85e258b4017
+on Oct 21, 2020
+
+Files taken:
+* DepUsrSCTP.cpp
+* DepUsrSCTP.hpp
+* SctpAssociation.cpp
+* SctpAssociation.hpp
+* MediaSoupErrors.hpp
+* Logger.hpp (partially, just to make it compile)
+
+Remaining files are writte nfrom scratch.
+
+Changes to aforementioned files:
+* removed not needed includes
+* fixed printf format lines to avoid warnings
+* replaced channel notifier with emit, added QObject stuff correspondingly
diff --git a/src/irisnet/noncore/sctp/RTC/DataConsumer.hpp b/src/irisnet/noncore/sctp/RTC/DataConsumer.hpp
new file mode 100644
index 00000000..6e1e1d42
--- /dev/null
+++ b/src/irisnet/noncore/sctp/RTC/DataConsumer.hpp
@@ -0,0 +1,14 @@
+#pragma once
+
+#include "SctpParameters.hpp"
+
+namespace RTC {
+
+class DataConsumer {
+    SctpParameters sctpParameters;
+
+public:
+    const SctpParameters &GetSctpStreamParameters() const { return sctpParameters; }
+};
+
+}
diff --git a/src/irisnet/noncore/sctp/RTC/DataProducer.hpp b/src/irisnet/noncore/sctp/RTC/DataProducer.hpp
new file mode 100644
index 00000000..47786521
--- /dev/null
+++ b/src/irisnet/noncore/sctp/RTC/DataProducer.hpp
@@ -0,0 +1,14 @@
+#pragma once
+
+#include "SctpParameters.hpp"
+
+namespace RTC {
+
+class DataProducer {
+    SctpParameters sctpParameters;
+
+public:
+    const SctpParameters &GetSctpStreamParameters() const { return sctpParameters; }
+};
+
+}
diff --git a/src/irisnet/noncore/sctp/RTC/SctpParameters.hpp b/src/irisnet/noncore/sctp/RTC/SctpParameters.hpp
new file mode 100644
index 00000000..6a17408c
--- /dev/null
+++ b/src/irisnet/noncore/sctp/RTC/SctpParameters.hpp
@@ -0,0 +1,14 @@
+#pragma once
+
+#include <QtGlobal>
+
+namespace RTC {
+
+struct SctpParameters {
+    quint16 streamId          = 0;
+    bool    ordered           = false;
+    quint32 maxPacketLifeTime = 0;
+    quint32 maxRetransmits    = 0;
+};
+
+}
diff --git a/src/irisnet/noncore/sctp/SctpAssociation.cpp b/src/irisnet/noncore/sctp/SctpAssociation.cpp
new file mode 100644
index 00000000..619be327
--- /dev/null
+++ b/src/irisnet/noncore/sctp/SctpAssociation.cpp
@@ -0,0 +1,894 @@
+#define MS_CLASS "RTC::SctpAssociation"
+// #define MS_LOG_DEV_LEVEL 3
+
+#include "SctpAssociation.hpp"
+#include "DepUsrSCTP.hpp"
+#include "Logger.hpp"
+#include "MediaSoupErrors.hpp"
+//#include "Channel/Notifier.hpp"
+#include <cstdlib> // std::malloc(), std::free()
+#include <cstring> // std::memset(), std::memcpy()
+#include <string>
+
+// Free send buffer threshold (in bytes) upon which send_cb will be executed.
+static uint32_t SendBufferThreshold { 256u };
+
+/* SCTP events to which we are subscribing. */
+
+/* clang-format off */
+uint16_t EventTypes[] =
+{
+    SCTP_ADAPTATION_INDICATION,
+    SCTP_ASSOC_CHANGE,
+    SCTP_ASSOC_RESET_EVENT,
+    SCTP_REMOTE_ERROR,
+    SCTP_SHUTDOWN_EVENT,
+    SCTP_SEND_FAILED_EVENT,
+    SCTP_STREAM_RESET_EVENT,
+    SCTP_STREAM_CHANGE_EVENT
+};
+/* clang-format on */
+
+/* Static methods for usrsctp callbacks. */
+
+inline static int onRecvSctpData(struct socket * /*sock*/, union sctp_sockstore /*addr*/, void *data, size_t len,
+                                 struct sctp_rcvinfo rcv, int flags, void *ulpInfo)
+{
+    auto *sctpAssociation = DepUsrSCTP::RetrieveSctpAssociation(reinterpret_cast<uintptr_t>(ulpInfo));
+
+    if (!sctpAssociation) {
+        MS_WARN_TAG(sctp, "no SctpAssociation found");
+
+        std::free(data);
+
+        return 0;
+    }
+
+    if (flags & MSG_NOTIFICATION) {
+        sctpAssociation->OnUsrSctpReceiveSctpNotification(static_cast<union sctp_notification *>(data), len);
+    } else {
+        uint16_t streamId = rcv.rcv_sid;
+        uint32_t ppid     = ntohl(rcv.rcv_ppid);
+        uint16_t ssn      = rcv.rcv_ssn;
+
+        MS_DEBUG_TAG(sctp,
+                     "data chunk received [length:%lu, streamId:%" PRIu16 ", SSN:%" PRIu16 ", TSN:%" PRIu32
+                     ", PPID:%" PRIu32 ", context:%" PRIu32 ", flags:%d]",
+                     len, rcv.rcv_sid, rcv.rcv_ssn, rcv.rcv_tsn, ntohl(rcv.rcv_ppid), rcv.rcv_context, flags);
+
+        sctpAssociation->OnUsrSctpReceiveSctpData(streamId, ssn, ppid, flags, static_cast<uint8_t *>(data), len);
+    }
+
+    std::free(data);
+
+    return 1;
+}
+
+inline static int onSendSctpData(struct socket * /*sock*/, uint32_t freeBuffer, void *ulpInfo)
+{
+    auto *sctpAssociation = DepUsrSCTP::RetrieveSctpAssociation(reinterpret_cast<uintptr_t>(ulpInfo));
+
+    if (!sctpAssociation) {
+        MS_WARN_TAG(sctp, "no SctpAssociation found");
+
+        return 0;
+    }
+
+    sctpAssociation->OnUsrSctpSentData(freeBuffer);
+
+    return 1;
+}
+
+namespace RTC {
+/* Static. */
+
+static constexpr size_t   SctpMtu { 1200 };
+static constexpr uint16_t MaxSctpStreams { 65535 };
+
+/* Instance methods. */
+
+SctpAssociation::SctpAssociation(Listener *listener, uint16_t os, uint16_t mis, size_t maxSctpMessageSize,
+                                 size_t sctpSendBufferSize, bool isDataChannel) :
+    listener(listener),
+    os(os), mis(mis), maxSctpMessageSize(maxSctpMessageSize), sctpSendBufferSize(sctpSendBufferSize),
+    isDataChannel(isDataChannel)
+{
+    MS_TRACE();
+
+    // Get a id for this SctpAssociation.
+    this->id = DepUsrSCTP::GetNextSctpAssociationId();
+
+    // Register ourselves in usrsctp.
+    // NOTE: This must be done before calling usrsctp_bind().
+    usrsctp_register_address(reinterpret_cast<void *>(this->id));
+
+    int ret;
+
+    this->socket = usrsctp_socket(AF_CONN, SOCK_STREAM, IPPROTO_SCTP, onRecvSctpData, onSendSctpData,
+                                  SendBufferThreshold, reinterpret_cast<void *>(this->id));
+
+    if (!this->socket) {
+        usrsctp_deregister_address(reinterpret_cast<void *>(this->id));
+
+        MS_THROW_ERROR("usrsctp_socket() failed: %s", std::strerror(errno));
+    }
+
+    usrsctp_set_ulpinfo(this->socket, reinterpret_cast<void *>(this->id));
+
+    // Make the socket non-blocking.
+    ret = usrsctp_set_non_blocking(this->socket, 1);
+
+    if (ret < 0) {
+        usrsctp_deregister_address(reinterpret_cast<void *>(this->id));
+
+        MS_THROW_ERROR("usrsctp_set_non_blocking() failed: %s", std::strerror(errno));
+    }
+
+    // Set SO_LINGER.
+    // This ensures that the usrsctp close call deletes the association. This
+    // prevents usrsctp from calling the global send callback with references to
+    // this class as the address.
+    struct linger lingerOpt; // NOLINT(cppcoreguidelines-pro-type-member-init)
+
+    lingerOpt.l_onoff  = 1;
+    lingerOpt.l_linger = 0;
+
+    ret = usrsctp_setsockopt(this->socket, SOL_SOCKET, SO_LINGER, &lingerOpt, sizeof(lingerOpt));
+
+    if (ret < 0) {
+        usrsctp_deregister_address(reinterpret_cast<void *>(this->id));
+
+        MS_THROW_ERROR("usrsctp_setsockopt(SO_LINGER) failed: %s", std::strerror(errno));
+    }
+
+    // Set SCTP_ENABLE_STREAM_RESET.
+    struct sctp_assoc_value av; // NOLINT(cppcoreguidelines-pro-type-member-init)
+
+    av.assoc_value = SCTP_ENABLE_RESET_STREAM_REQ | SCTP_ENABLE_RESET_ASSOC_REQ | SCTP_ENABLE_CHANGE_ASSOC_REQ;
+
+    ret = usrsctp_setsockopt(this->socket, IPPROTO_SCTP, SCTP_ENABLE_STREAM_RESET, &av, sizeof(av));
+
+    if (ret < 0) {
+        usrsctp_deregister_address(reinterpret_cast<void *>(this->id));
+
+        MS_THROW_ERROR("usrsctp_setsockopt(SCTP_ENABLE_STREAM_RESET) failed: %s", std::strerror(errno));
+    }
+
+    // Set SCTP_NODELAY.
+    uint32_t noDelay = 1;
+
+    ret = usrsctp_setsockopt(this->socket, IPPROTO_SCTP, SCTP_NODELAY, &noDelay, sizeof(noDelay));
+
+    if (ret < 0) {
+        usrsctp_deregister_address(reinterpret_cast<void *>(this->id));
+
+        MS_THROW_ERROR("usrsctp_setsockopt(SCTP_NODELAY) failed: %s", std::strerror(errno));
+    }
+
+    // Enable events.
+    struct sctp_event event; // NOLINT(cppcoreguidelines-pro-type-member-init)
+
+    std::memset(&event, 0, sizeof(event));
+    event.se_on = 1;
+
+    for (size_t i { 0 }; i < sizeof(EventTypes) / sizeof(uint16_t); ++i) {
+        event.se_type = EventTypes[i];
+
+        ret = usrsctp_setsockopt(this->socket, IPPROTO_SCTP, SCTP_EVENT, &event, sizeof(event));
+
+        if (ret < 0) {
+            usrsctp_deregister_address(reinterpret_cast<void *>(this->id));
+
+            MS_THROW_ERROR("usrsctp_setsockopt(SCTP_EVENT) failed: %s", std::strerror(errno));
+        }
+    }
+
+    // Init message.
+    struct sctp_initmsg initmsg; // NOLINT(cppcoreguidelines-pro-type-member-init)
+
+    std::memset(&initmsg, 0, sizeof(initmsg));
+    initmsg.sinit_num_ostreams  = this->os;
+    initmsg.sinit_max_instreams = this->mis;
+
+    ret = usrsctp_setsockopt(this->socket, IPPROTO_SCTP, SCTP_INITMSG, &initmsg, sizeof(initmsg));
+
+    if (ret < 0) {
+        usrsctp_deregister_address(reinterpret_cast<void *>(this->id));
+
+        MS_THROW_ERROR("usrsctp_setsockopt(SCTP_INITMSG) failed: %s", std::strerror(errno));
+    }
+
+    // Server side.
+    struct sockaddr_conn sconn; // NOLINT(cppcoreguidelines-pro-type-member-init)
+
+    std::memset(&sconn, 0, sizeof(sconn));
+    sconn.sconn_family = AF_CONN;
+    sconn.sconn_port   = htons(5000);
+    sconn.sconn_addr   = reinterpret_cast<void *>(this->id);
+#ifdef HAVE_SCONN_LEN
+    sconn.sconn_len = sizeof(sconn);
+#endif
+
+    ret = usrsctp_bind(this->socket, reinterpret_cast<struct sockaddr *>(&sconn), sizeof(sconn));
+
+    if (ret < 0) {
+        usrsctp_deregister_address(reinterpret_cast<void *>(this->id));
+
+        MS_THROW_ERROR("usrsctp_bind() failed: %s", std::strerror(errno));
+    }
+
+    auto bufferSize = static_cast<int>(sctpSendBufferSize);
+
+    if (usrsctp_setsockopt(this->socket, SOL_SOCKET, SO_SNDBUF, &bufferSize, sizeof(int)) < 0) {
+        usrsctp_deregister_address(reinterpret_cast<void *>(this->id));
+
+        MS_THROW_ERROR("usrsctp_setsockopt(SO_SNDBUF) failed: %s", std::strerror(errno));
+    }
+
+    // Register the SctpAssociation into the global map.
+    DepUsrSCTP::RegisterSctpAssociation(this);
+}
+
+SctpAssociation::~SctpAssociation()
+{
+    MS_TRACE();
+
+    usrsctp_set_ulpinfo(this->socket, nullptr);
+    usrsctp_close(this->socket);
+
+    // Deregister ourselves from usrsctp.
+    usrsctp_deregister_address(reinterpret_cast<void *>(this->id));
+
+    // Register the SctpAssociation from the global map.
+    DepUsrSCTP::DeregisterSctpAssociation(this);
+
+    delete[] this->messageBuffer;
+}
+
+void SctpAssociation::TransportConnected()
+{
+    MS_TRACE();
+
+    // Just run the SCTP stack if our state is 'new'.
+    if (this->state != SctpState::NEW)
+        return;
+
+    try {
+        int                  ret;
+        struct sockaddr_conn rconn; // NOLINT(cppcoreguidelines-pro-type-member-init)
+
+        std::memset(&rconn, 0, sizeof(rconn));
+        rconn.sconn_family = AF_CONN;
+        rconn.sconn_port   = htons(5000);
+        rconn.sconn_addr   = reinterpret_cast<void *>(this->id);
+#ifdef HAVE_SCONN_LEN
+        rconn.sconn_len = sizeof(rconn);
+#endif
+
+        ret = usrsctp_connect(this->socket, reinterpret_cast<struct sockaddr *>(&rconn), sizeof(rconn));
+
+        if (ret < 0 && errno != EINPROGRESS)
+            MS_THROW_ERROR("usrsctp_connect() failed: %s", std::strerror(errno));
+
+        // Disable MTU discovery.
+        sctp_paddrparams peerAddrParams; // NOLINT(cppcoreguidelines-pro-type-member-init)
+
+        std::memset(&peerAddrParams, 0, sizeof(peerAddrParams));
+        std::memcpy(&peerAddrParams.spp_address, &rconn, sizeof(rconn));
+        peerAddrParams.spp_flags = SPP_PMTUD_DISABLE;
+
+        // The MTU value provided specifies the space available for chunks in the
+        // packet, so let's subtract the SCTP header size.
+        peerAddrParams.spp_pathmtu = SctpMtu - sizeof(struct sctp_common_header);
+
+        ret = usrsctp_setsockopt(this->socket, IPPROTO_SCTP, SCTP_PEER_ADDR_PARAMS, &peerAddrParams,
+                                 sizeof(peerAddrParams));
+
+        if (ret < 0)
+            MS_THROW_ERROR("usrsctp_setsockopt(SCTP_PEER_ADDR_PARAMS) failed: %s", std::strerror(errno));
+
+        // Announce connecting state.
+        this->state = SctpState::CONNECTING;
+        this->listener->OnSctpAssociationConnecting(this);
+    } catch (const MediaSoupError & /*error*/) {
+        this->state = SctpState::FAILED;
+        this->listener->OnSctpAssociationFailed(this);
+    }
+}
+
+void SctpAssociation::FillJson(QJsonObject &jsonObject) const
+{
+    MS_TRACE();
+
+    // Add port (always 5000).
+    jsonObject[QLatin1String("port")] = 5000;
+
+    // Add OS.
+    jsonObject[QLatin1String("OS")] = this->os;
+
+    // Add MIS.
+    jsonObject[QLatin1String("MIS")] = this->mis;
+
+    // Add maxMessageSize.
+    jsonObject[QLatin1String("maxMessageSize")] = int(this->maxSctpMessageSize);
+
+    // Add sendBufferSize.
+    jsonObject[QLatin1String("sendBufferSize")] = qint64(this->sctpSendBufferSize);
+
+    // Add sctpBufferedAmountLowThreshold.
+    jsonObject[QLatin1String("sctpBufferedAmount")] = qint64(this->sctpBufferedAmount);
+
+    // Add isDataChannel.
+    jsonObject[QLatin1String("isDataChannel")] = this->isDataChannel;
+}
+
+void SctpAssociation::ProcessSctpData(const uint8_t *data, size_t len)
+{
+    MS_TRACE();
+
+#if MS_LOG_DEV_LEVEL == 3
+    MS_DUMP_DATA(data, len);
+#endif
+
+    usrsctp_conninput(reinterpret_cast<void *>(this->id), data, len, 0);
+}
+
+void SctpAssociation::SendSctpMessage(RTC::DataConsumer *dataConsumer, uint32_t ppid, const uint8_t *msg, size_t len,
+                                      onQueuedCallback *cb)
+{
+    MS_TRACE();
+
+    // This must be controlled by the DataConsumer.
+    MS_ASSERT(len <= this->maxSctpMessageSize,
+              "given message exceeds max allowed message size [message size:%lu, max message size:%lu]", len,
+              this->maxSctpMessageSize);
+
+    const auto &parameters = dataConsumer->GetSctpStreamParameters();
+
+    // Fill stcp_sendv_spa.
+    struct sctp_sendv_spa spa; // NOLINT(cppcoreguidelines-pro-type-member-init)
+
+    std::memset(&spa, 0, sizeof(spa));
+    spa.sendv_flags             = SCTP_SEND_SNDINFO_VALID;
+    spa.sendv_sndinfo.snd_sid   = parameters.streamId;
+    spa.sendv_sndinfo.snd_ppid  = htonl(ppid);
+    spa.sendv_sndinfo.snd_flags = SCTP_EOR;
+
+    // If ordered it must be reliable.
+    if (parameters.ordered) {
+        spa.sendv_prinfo.pr_policy = SCTP_PR_SCTP_NONE;
+        spa.sendv_prinfo.pr_value  = 0;
+    }
+    // Configure reliability: https://tools.ietf.org/html/rfc3758
+    else {
+        spa.sendv_flags |= SCTP_SEND_PRINFO_VALID;
+        spa.sendv_sndinfo.snd_flags |= SCTP_UNORDERED;
+
+        if (parameters.maxPacketLifeTime != 0) {
+            spa.sendv_prinfo.pr_policy = SCTP_PR_SCTP_TTL;
+            spa.sendv_prinfo.pr_value  = parameters.maxPacketLifeTime;
+        } else if (parameters.maxRetransmits != 0) {
+            spa.sendv_prinfo.pr_policy = SCTP_PR_SCTP_RTX;
+            spa.sendv_prinfo.pr_value  = parameters.maxRetransmits;
+        }
+    }
+
+    this->sctpBufferedAmount += len;
+
+    int ret = usrsctp_sendv(this->socket, msg, len, nullptr, 0, &spa, static_cast<socklen_t>(sizeof(spa)),
+                            SCTP_SENDV_SPA, 0);
+
+    if (ret > 0) {
+        // NOTE: 'usrsctp_sendv' returns the number of bytes sent.
+        this->listener->OnSctpAssociationBufferedAmount(this, this->sctpBufferedAmount);
+    }
+
+    if (ret < 0) {
+        this->sctpBufferedAmount -= ret;
+
+        MS_WARN_TAG(sctp, "error sending SCTP message [sid:%" PRIu16 ", ppid:%" PRIu32 ", message size:%zu]: %s",
+                    parameters.streamId, ppid, len, std::strerror(errno));
+
+        if (cb) {
+            (*cb)(false);
+
+            delete cb;
+        }
+    } else if (cb) {
+        (*cb)(true);
+
+        delete cb;
+    }
+
+    if (errno == EWOULDBLOCK || errno == EAGAIN) {
+        emit sctpSendBufferFull();
+    }
+}
+
+void SctpAssociation::HandleDataConsumer(RTC::DataConsumer *dataConsumer)
+{
+    MS_TRACE();
+
+    auto streamId = dataConsumer->GetSctpStreamParameters().streamId;
+
+    // We need more OS.
+    if (streamId > this->os - 1)
+        AddOutgoingStreams(/*force*/ false);
+}
+
+void SctpAssociation::DataProducerClosed(RTC::DataProducer *dataProducer)
+{
+    MS_TRACE();
+
+    auto streamId = dataProducer->GetSctpStreamParameters().streamId;
+
+    // Send SCTP_RESET_STREAMS to the remote.
+    // https://tools.ietf.org/html/draft-ietf-rtcweb-data-channel-13#section-6.7
+    if (this->isDataChannel)
+        ResetSctpStream(streamId, StreamDirection::OUTGOING);
+    else
+        ResetSctpStream(streamId, StreamDirection::INCOMING);
+}
+
+void SctpAssociation::DataConsumerClosed(RTC::DataConsumer *dataConsumer)
+{
+    MS_TRACE();
+
+    auto streamId = dataConsumer->GetSctpStreamParameters().streamId;
+
+    // Send SCTP_RESET_STREAMS to the remote.
+    ResetSctpStream(streamId, StreamDirection::OUTGOING);
+}
+
+void SctpAssociation::ResetSctpStream(uint16_t streamId, StreamDirection direction)
+{
+    MS_TRACE();
+
+    // Do nothing if an outgoing stream that could not be allocated by us.
+    if (direction == StreamDirection::OUTGOING && streamId > this->os - 1)
+        return;
+
+    int                     ret;
+    struct sctp_assoc_value av; // NOLINT(cppcoreguidelines-pro-type-member-init)
+    socklen_t               len = sizeof(av);
+
+    ret = usrsctp_getsockopt(this->socket, IPPROTO_SCTP, SCTP_RECONFIG_SUPPORTED, &av, &len);
+
+    if (ret == 0) {
+        if (av.assoc_value != 1) {
+            MS_DEBUG_TAG(sctp, "stream reconfiguration not negotiated");
+
+            return;
+        }
+    } else {
+        MS_WARN_TAG(sctp, "could not retrieve whether stream reconfiguration has been negotiated: %s\n",
+                    std::strerror(errno));
+
+        return;
+    }
+
+    // As per spec: https://tools.ietf.org/html/rfc6525#section-4.1
+    len = sizeof(sctp_assoc_t) + (2 + 1) * sizeof(uint16_t);
+
+    auto *srs = static_cast<struct sctp_reset_streams *>(std::malloc(len));
+
+    switch (direction) {
+    case StreamDirection::INCOMING:
+        srs->srs_flags = SCTP_STREAM_RESET_INCOMING;
+        break;
+
+    case StreamDirection::OUTGOING:
+        srs->srs_flags = SCTP_STREAM_RESET_OUTGOING;
+        break;
+    }
+
+    srs->srs_number_streams = 1;
+    srs->srs_stream_list[0] = streamId; // No need for htonl().
+
+    ret = usrsctp_setsockopt(this->socket, IPPROTO_SCTP, SCTP_RESET_STREAMS, srs, len);
+
+    if (ret == 0) {
+        MS_DEBUG_TAG(sctp, "SCTP_RESET_STREAMS sent [streamId:%" PRIu16 "]", streamId);
+    } else {
+        MS_WARN_TAG(sctp, "usrsctp_setsockopt(SCTP_RESET_STREAMS) failed: %s", std::strerror(errno));
+    }
+
+    std::free(srs);
+}
+
+void SctpAssociation::AddOutgoingStreams(bool force)
+{
+    MS_TRACE();
+
+    uint16_t additionalOs { 0 };
+
+    if (MaxSctpStreams - this->os >= 32)
+        additionalOs = 32;
+    else
+        additionalOs = MaxSctpStreams - this->os;
+
+    if (additionalOs == 0) {
+        MS_WARN_TAG(sctp, "cannot add more outgoing streams [OS:%" PRIu16 "]", this->os);
+
+        return;
+    }
+
+    auto nextDesiredOs = this->os + additionalOs;
+
+    // Already in progress, ignore (unless forced).
+    if (!force && nextDesiredOs == this->desiredOs)
+        return;
+
+    // Update desired value.
+    this->desiredOs = nextDesiredOs;
+
+    // If not connected, defer it.
+    if (this->state != SctpState::CONNECTED) {
+        MS_DEBUG_TAG(sctp, "SCTP not connected, deferring OS increase");
+
+        return;
+    }
+
+    struct sctp_add_streams sas; // NOLINT(cppcoreguidelines-pro-type-member-init)
+
+    std::memset(&sas, 0, sizeof(sas));
+    sas.sas_instrms  = 0;
+    sas.sas_outstrms = additionalOs;
+
+    MS_DEBUG_TAG(sctp, "adding %" PRIu16 " outgoing streams", additionalOs);
+
+    int ret
+        = usrsctp_setsockopt(this->socket, IPPROTO_SCTP, SCTP_ADD_STREAMS, &sas, static_cast<socklen_t>(sizeof(sas)));
+
+    if (ret < 0)
+        MS_WARN_TAG(sctp, "usrsctp_setsockopt(SCTP_ADD_STREAMS) failed: %s", std::strerror(errno));
+}
+
+void SctpAssociation::OnUsrSctpSendSctpData(void *buffer, size_t len)
+{
+    MS_TRACE();
+
+    const uint8_t *data = static_cast<uint8_t *>(buffer);
+
+#if MS_LOG_DEV_LEVEL == 3
+    MS_DUMP_DATA(data, len);
+#endif
+
+    this->listener->OnSctpAssociationSendData(this, data, len);
+}
+
+void SctpAssociation::OnUsrSctpReceiveSctpData(uint16_t streamId, uint16_t ssn, uint32_t ppid, int flags,
+                                               const uint8_t *data, size_t len)
+{
+    // Ignore WebRTC DataChannel Control DATA chunks.
+    if (ppid == 50) {
+        MS_WARN_TAG(sctp, "ignoring SCTP data with ppid:50 (WebRTC DataChannel Control)");
+
+        return;
+    }
+
+    if (this->messageBufferLen != 0 && ssn != this->lastSsnReceived) {
+        MS_WARN_TAG(sctp,
+                    "message chunk received with different SSN while buffer not empty, buffer discarded [ssn:%" PRIu16
+                    ", last ssn received:%" PRIu16 "]",
+                    ssn, this->lastSsnReceived);
+
+        this->messageBufferLen = 0;
+    }
+
+    // Update last SSN received.
+    this->lastSsnReceived = ssn;
+
+    auto eor = static_cast<bool>(flags & MSG_EOR);
+
+    if (this->messageBufferLen + len > this->maxSctpMessageSize) {
+        MS_WARN_TAG(sctp,
+                    "ongoing received message exceeds max allowed message size [message size:%lu, max message "
+                    "size:%lu, eor:%u]",
+                    this->messageBufferLen + len, this->maxSctpMessageSize, eor ? 1 : 0);
+
+        this->lastSsnReceived = 0;
+
+        return;
+    }
+
+    // If end of message and there is no buffered data, notify it directly.
+    if (eor && this->messageBufferLen == 0) {
+        MS_DEBUG_DEV("directly notifying listener [eor:1, buffer len:0]");
+
+        this->listener->OnSctpAssociationMessageReceived(this, streamId, ppid, data, len);
+    }
+    // If end of message and there is buffered data, append data and notify buffer.
+    else if (eor && this->messageBufferLen != 0) {
+        std::memcpy(this->messageBuffer + this->messageBufferLen, data, len);
+        this->messageBufferLen += len;
+
+        MS_DEBUG_DEV("notifying listener [eor:1, buffer len:%lu]", this->messageBufferLen);
+
+        this->listener->OnSctpAssociationMessageReceived(this, streamId, ppid, this->messageBuffer,
+                                                         this->messageBufferLen);
+
+        this->messageBufferLen = 0;
+    }
+    // If non end of message, append data to the buffer.
+    else if (!eor) {
+        // Allocate the buffer if not already done.
+        if (!this->messageBuffer)
+            this->messageBuffer = new uint8_t[this->maxSctpMessageSize];
+
+        std::memcpy(this->messageBuffer + this->messageBufferLen, data, len);
+        this->messageBufferLen += len;
+
+        MS_DEBUG_DEV("data buffered [eor:0, buffer len:%lu]", this->messageBufferLen);
+    }
+}
+
+void SctpAssociation::OnUsrSctpReceiveSctpNotification(union sctp_notification *notification, size_t len)
+{
+    if (notification->sn_header.sn_length != (uint32_t)len)
+        return;
+
+    switch (notification->sn_header.sn_type) {
+    case SCTP_ADAPTATION_INDICATION: {
+        MS_DEBUG_TAG(sctp, "SCTP adaptation indication [%x]", notification->sn_adaptation_event.sai_adaptation_ind);
+
+        break;
+    }
+
+    case SCTP_ASSOC_CHANGE: {
+        switch (notification->sn_assoc_change.sac_state) {
+        case SCTP_COMM_UP: {
+            MS_DEBUG_TAG(sctp, "SCTP association connected, streams [out:%" PRIu16 ", in:%" PRIu16 "]",
+                         notification->sn_assoc_change.sac_outbound_streams,
+                         notification->sn_assoc_change.sac_inbound_streams);
+
+            // Update our OS.
+            this->os = notification->sn_assoc_change.sac_outbound_streams;
+
+            // Increase if requested before connected.
+            if (this->desiredOs > this->os)
+                AddOutgoingStreams(/*force*/ true);
+
+            if (this->state != SctpState::CONNECTED) {
+                this->state = SctpState::CONNECTED;
+                this->listener->OnSctpAssociationConnected(this);
+            }
+
+            break;
+        }
+
+        case SCTP_COMM_LOST: {
+            if (notification->sn_header.sn_length > 0) {
+                static const size_t BufferSize { 1024 };
+                static char         buffer[BufferSize];
+
+                uint32_t len = notification->sn_header.sn_length;
+
+                for (uint32_t i { 0 }; i < len; ++i) {
+                    std::snprintf(buffer, BufferSize, " 0x%02x", notification->sn_assoc_change.sac_info[i]);
+                }
+
+                MS_DEBUG_TAG(sctp, "SCTP communication lost [info:%s]", buffer);
+            } else {
+                MS_DEBUG_TAG(sctp, "SCTP communication lost");
+            }
+
+            if (this->state != SctpState::CLOSED) {
+                this->state = SctpState::CLOSED;
+                this->listener->OnSctpAssociationClosed(this);
+            }
+
+            break;
+        }
+
+        case SCTP_RESTART: {
+            MS_DEBUG_TAG(sctp, "SCTP remote association restarted, streams [out:%" PRIu16 ", int:%" PRIu16 "]",
+                         notification->sn_assoc_change.sac_outbound_streams,
+                         notification->sn_assoc_change.sac_inbound_streams);
+
+            // Update our OS.
+            this->os = notification->sn_assoc_change.sac_outbound_streams;
+
+            // Increase if requested before connected.
+            if (this->desiredOs > this->os)
+                AddOutgoingStreams(/*force*/ true);
+
+            if (this->state != SctpState::CONNECTED) {
+                this->state = SctpState::CONNECTED;
+                this->listener->OnSctpAssociationConnected(this);
+            }
+
+            break;
+        }
+
+        case SCTP_SHUTDOWN_COMP: {
+            MS_DEBUG_TAG(sctp, "SCTP association gracefully closed");
+
+            if (this->state != SctpState::CLOSED) {
+                this->state = SctpState::CLOSED;
+                this->listener->OnSctpAssociationClosed(this);
+            }
+
+            break;
+        }
+
+        case SCTP_CANT_STR_ASSOC: {
+            if (notification->sn_header.sn_length > 0) {
+                static const size_t BufferSize { 1024 };
+                static char         buffer[BufferSize];
+
+                uint32_t len = notification->sn_header.sn_length;
+
+                for (uint32_t i { 0 }; i < len; ++i) {
+                    std::snprintf(buffer, BufferSize, " 0x%02x", notification->sn_assoc_change.sac_info[i]);
+                }
+
+                MS_WARN_TAG(sctp, "SCTP setup failed: %s", buffer);
+            }
+
+            if (this->state != SctpState::FAILED) {
+                this->state = SctpState::FAILED;
+                this->listener->OnSctpAssociationFailed(this);
+            }
+
+            break;
+        }
+
+        default:;
+        }
+
+        break;
+    }
+
+    // https://tools.ietf.org/html/rfc6525#section-6.1.2.
+    case SCTP_ASSOC_RESET_EVENT: {
+        MS_DEBUG_TAG(sctp, "SCTP association reset event received");
+
+        break;
+    }
+
+    // An Operation Error is not considered fatal in and of itself, but may be
+    // used with an ABORT chunk to report a fatal condition.
+    case SCTP_REMOTE_ERROR: {
+        static const size_t BufferSize { 1024 };
+        static char         buffer[BufferSize];
+
+        uint32_t len = notification->sn_remote_error.sre_length - sizeof(struct sctp_remote_error);
+
+        for (uint32_t i { 0 }; i < len; i++) {
+            std::snprintf(buffer, BufferSize, "0x%02x", notification->sn_remote_error.sre_data[i]);
+        }
+
+        MS_WARN_TAG(sctp, "remote SCTP association error [type:0x%04x, data:%s]",
+                    notification->sn_remote_error.sre_error, buffer);
+
+        break;
+    }
+
+    // When a peer sends a SHUTDOWN, SCTP delivers this notification to
+    // inform the application that it should cease sending data.
+    case SCTP_SHUTDOWN_EVENT: {
+        MS_DEBUG_TAG(sctp, "remote SCTP association shutdown");
+
+        if (this->state != SctpState::CLOSED) {
+            this->state = SctpState::CLOSED;
+            this->listener->OnSctpAssociationClosed(this);
+        }
+
+        break;
+    }
+
+    case SCTP_SEND_FAILED_EVENT: {
+        static const size_t BufferSize { 1024 };
+        static char         buffer[BufferSize];
+
+        uint32_t len = notification->sn_send_failed_event.ssfe_length - sizeof(struct sctp_send_failed_event);
+
+        for (uint32_t i { 0 }; i < len; ++i) {
+            std::snprintf(buffer, BufferSize, "0x%02x", notification->sn_send_failed_event.ssfe_data[i]);
+        }
+
+        MS_WARN_TAG(
+            sctp, "SCTP message sent failure [streamId:%" PRIu16 ", ppid:%" PRIu32 ", sent:%s, error:0x%08x, info:%s]",
+            notification->sn_send_failed_event.ssfe_info.snd_sid,
+            ntohl(notification->sn_send_failed_event.ssfe_info.snd_ppid),
+            (notification->sn_send_failed_event.ssfe_flags & SCTP_DATA_SENT) ? "yes" : "no",
+            notification->sn_send_failed_event.ssfe_error, buffer);
+
+        break;
+    }
+
+    case SCTP_STREAM_RESET_EVENT: {
+        bool     incoming { false };
+        bool     outgoing { false };
+        uint16_t numStreams = (notification->sn_strreset_event.strreset_length - sizeof(struct sctp_stream_reset_event))
+            / sizeof(uint16_t);
+
+        if (notification->sn_strreset_event.strreset_flags & SCTP_STREAM_RESET_INCOMING_SSN)
+            incoming = true;
+
+        if (notification->sn_strreset_event.strreset_flags & SCTP_STREAM_RESET_OUTGOING_SSN)
+            outgoing = true;
+
+        if (MS_HAS_DEBUG_TAG(sctp)) {
+            std::string streamIds;
+
+            for (uint16_t i { 0 }; i < numStreams; ++i) {
+                auto streamId = notification->sn_strreset_event.strreset_stream_list[i];
+
+                // Don't log more than 5 stream ids.
+                if (i > 4) {
+                    streamIds.append("...");
+
+                    break;
+                }
+
+                if (i > 0)
+                    streamIds.append(",");
+
+                streamIds.append(std::to_string(streamId));
+            }
+
+            MS_DEBUG_TAG(sctp, "SCTP stream reset event [flags:%x, i|o:%s|%s, num streams:%" PRIu16 ", stream ids:%s]",
+                         notification->sn_strreset_event.strreset_flags, incoming ? "true" : "false",
+                         outgoing ? "true" : "false", numStreams, streamIds.c_str());
+        }
+
+        // Special case for WebRTC DataChannels in which we must also reset our
+        // outgoing SCTP stream.
+        if (incoming && !outgoing && this->isDataChannel) {
+            for (uint16_t i { 0 }; i < numStreams; ++i) {
+                auto streamId = notification->sn_strreset_event.strreset_stream_list[i];
+
+                ResetSctpStream(streamId, StreamDirection::OUTGOING);
+            }
+        }
+
+        break;
+    }
+
+    case SCTP_STREAM_CHANGE_EVENT: {
+        if (notification->sn_strchange_event.strchange_flags == 0) {
+            MS_DEBUG_TAG(sctp, "SCTP stream changed, streams [out:%" PRIu16 ", in:%" PRIu16 ", flags:%x]",
+                         notification->sn_strchange_event.strchange_outstrms,
+                         notification->sn_strchange_event.strchange_instrms,
+                         notification->sn_strchange_event.strchange_flags);
+        } else if (notification->sn_strchange_event.strchange_flags & SCTP_STREAM_RESET_DENIED) {
+            MS_WARN_TAG(sctp, "SCTP stream change denied, streams [out:%" PRIu16 ", in:%" PRIu16 ", flags:%x]",
+                        notification->sn_strchange_event.strchange_outstrms,
+                        notification->sn_strchange_event.strchange_instrms,
+                        notification->sn_strchange_event.strchange_flags);
+
+            break;
+        } else if (notification->sn_strchange_event.strchange_flags & SCTP_STREAM_RESET_FAILED) {
+            MS_WARN_TAG(sctp, "SCTP stream change failed, streams [out:%" PRIu16 ", in:%" PRIu16 ", flags:%x]",
+                        notification->sn_strchange_event.strchange_outstrms,
+                        notification->sn_strchange_event.strchange_instrms,
+                        notification->sn_strchange_event.strchange_flags);
+
+            break;
+        }
+
+        // Update OS.
+        this->os = notification->sn_strchange_event.strchange_outstrms;
+
+        break;
+    }
+
+    default: {
+        MS_WARN_TAG(sctp, "unhandled SCTP event received [type:%" PRIu16 "]", notification->sn_header.sn_type);
+    }
+    }
+}
+
+void SctpAssociation::OnUsrSctpSentData(uint32_t freeBuffer)
+{
+    auto previousSctpBufferedAmount = this->sctpBufferedAmount;
+
+    this->sctpBufferedAmount = this->sctpSendBufferSize - freeBuffer;
+
+    if (this->sctpBufferedAmount != previousSctpBufferedAmount) {
+        this->listener->OnSctpAssociationBufferedAmount(this, this->sctpBufferedAmount);
+    }
+}
+} // namespace RTC
diff --git a/src/irisnet/noncore/sctp/SctpAssociation.hpp b/src/irisnet/noncore/sctp/SctpAssociation.hpp
new file mode 100644
index 00000000..a4daa8d1
--- /dev/null
+++ b/src/irisnet/noncore/sctp/SctpAssociation.hpp
@@ -0,0 +1,104 @@
+#ifndef MS_RTC_SCTP_ASSOCIATION_HPP
+#define MS_RTC_SCTP_ASSOCIATION_HPP
+
+//#include "common.hpp"
+//#include "Utils.hpp"
+#include "RTC/DataConsumer.hpp"
+#include "RTC/DataProducer.hpp"
+#include "usrsctp.h"
+#include <QJsonObject>
+#include <QtEndian>
+
+// using json = nlohmann::json;
+
+namespace RTC {
+class SctpAssociation : public QObject {
+    Q_OBJECT
+public:
+    enum class SctpState { NEW = 1, CONNECTING, CONNECTED, FAILED, CLOSED };
+
+private:
+    enum class StreamDirection { INCOMING = 1, OUTGOING };
+
+protected:
+    using onQueuedCallback = const std::function<void(bool queued)>;
+
+public:
+    class Listener {
+    public:
+        virtual void OnSctpAssociationConnecting(RTC::SctpAssociation *sctpAssociation) = 0;
+        virtual void OnSctpAssociationConnected(RTC::SctpAssociation *sctpAssociation)  = 0;
+        virtual void OnSctpAssociationFailed(RTC::SctpAssociation *sctpAssociation)     = 0;
+        virtual void OnSctpAssociationClosed(RTC::SctpAssociation *sctpAssociation)     = 0;
+        virtual void OnSctpAssociationSendData(RTC::SctpAssociation *sctpAssociation, const uint8_t *data, size_t len)
+            = 0;
+        virtual void OnSctpAssociationMessageReceived(RTC::SctpAssociation *sctpAssociation, uint16_t streamId,
+                                                      uint32_t ppid, const uint8_t *msg, size_t len)
+            = 0;
+        virtual void OnSctpAssociationBufferedAmount(RTC::SctpAssociation *sctpAssociation, uint32_t len) = 0;
+    };
+
+public:
+    static bool IsSctp(const uint8_t *data, size_t len)
+    {
+        return ((len >= 12) &&
+                // Must have Source Port Number and Destination Port Number set to 5000 (hack).
+                (qFromBigEndian<quint16>(data) == 5000) && (qFromBigEndian<quint16>(data + 2) == 5000));
+    }
+
+public:
+    SctpAssociation(Listener *listener, uint16_t os, uint16_t mis, size_t maxSctpMessageSize, size_t sctpSendBufferSize,
+                    bool isDataChannel);
+    ~SctpAssociation();
+
+public:
+    void      FillJson(QJsonObject &jsonObject) const;
+    void      TransportConnected();
+    SctpState GetState() const { return this->state; }
+    size_t    GetSctpBufferedAmount() const { return this->sctpBufferedAmount; }
+    void      ProcessSctpData(const uint8_t *data, size_t len);
+    void      SendSctpMessage(RTC::DataConsumer *dataConsumer, uint32_t ppid, const uint8_t *msg, size_t len,
+                              onQueuedCallback *cb = nullptr);
+    void      HandleDataConsumer(RTC::DataConsumer *dataConsumer);
+    void      DataProducerClosed(RTC::DataProducer *dataProducer);
+    void      DataConsumerClosed(RTC::DataConsumer *dataConsumer);
+
+private:
+    void ResetSctpStream(uint16_t streamId, StreamDirection);
+    void AddOutgoingStreams(bool force = false);
+
+    /* Callbacks fired by usrsctp events. */
+public:
+    void OnUsrSctpSendSctpData(void *buffer, size_t len);
+    void OnUsrSctpReceiveSctpData(uint16_t streamId, uint16_t ssn, uint32_t ppid, int flags, const uint8_t *data,
+                                  size_t len);
+    void OnUsrSctpReceiveSctpNotification(union sctp_notification *notification, size_t len);
+    void OnUsrSctpSentData(uint32_t freeBuffer);
+
+signals:
+    void sctpSendBufferFull();
+
+public:
+    uintptr_t id { 0u };
+
+private:
+    // Passed by argument.
+    Listener *listener { nullptr };
+    uint16_t  os { 1024u };
+    uint16_t  mis { 1024u };
+    size_t    maxSctpMessageSize { 262144u };
+    size_t    sctpSendBufferSize { 262144u };
+    size_t    sctpBufferedAmount { 0u };
+    bool      isDataChannel { false };
+    // Allocated by this.
+    uint8_t *messageBuffer { nullptr };
+    // Others.
+    SctpState      state { SctpState::NEW };
+    struct socket *socket { nullptr };
+    uint16_t       desiredOs { 0u };
+    size_t         messageBufferLen { 0u };
+    uint16_t       lastSsnReceived { 0u }; // Valid for us since no SCTP I-DATA support.
+};
+} // namespace RTC
+
+#endif

From b78819b268cef7c946b462a1465d9bc2d2eda730 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Thu, 29 Oct 2020 01:20:55 +0300
Subject: [PATCH 244/383] Pass transport features to addChannel in case
 transport supports many various channel configurations

---
 src/xmpp/xmpp-im/jingle-ft.cpp      |  2 +-
 src/xmpp/xmpp-im/jingle-ibb.cpp     |  6 +++---
 src/xmpp/xmpp-im/jingle-ibb.h       |  2 +-
 src/xmpp/xmpp-im/jingle-ice.cpp     | 28 +++++++++++++++++---------
 src/xmpp/xmpp-im/jingle-ice.h       |  2 +-
 src/xmpp/xmpp-im/jingle-s5b.cpp     | 12 +++++------
 src/xmpp/xmpp-im/jingle-s5b.h       |  2 +-
 src/xmpp/xmpp-im/jingle-transport.h |  8 +++++---
 src/xmpp/xmpp-im/jingle.h           | 31 ++++++++++++++++-------------
 9 files changed, 54 insertions(+), 39 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index fdc30d09..8567c830 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -646,7 +646,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
         connect(_transport.data(), &Transport::connected, this, [this]() {
             d->lastReason = Reason();
             d->lastError.reset();
-            d->connection = _transport->addChannel();
+            d->connection = _transport->addChannel(TransportFeature::Reliable | TransportFeature::DataOriented);
             if (!d->streamingMode) {
                 connect(d->connection.data(), &Connection::readyRead, this, [this]() {
                     if (!d->device) {
diff --git a/src/xmpp/xmpp-im/jingle-ibb.cpp b/src/xmpp/xmpp-im/jingle-ibb.cpp
index acd0297b..55c9c2e3 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.cpp
+++ b/src/xmpp/xmpp-im/jingle-ibb.cpp
@@ -351,12 +351,12 @@ namespace XMPP { namespace Jingle { namespace IBB {
 
     TransportFeatures Transport::features() const
     {
-        return TransportFeatures(TransportFeature::AlwaysConnect) | TransportFeature::Reliable | TransportFeature::Slow;
+        return TransportFeature::AlwaysConnect | TransportFeature::Reliable | TransportFeature::DataOriented;
     }
 
     int Transport::maxSupportedChannels() const { return -1; }
 
-    Connection::Ptr Transport::addChannel() const
+    Connection::Ptr Transport::addChannel(TransportFeatures features) const
     {
         return d->readyConnections.isEmpty() ? Connection::Ptr()
                                              : d->readyConnections.takeFirst().staticCast<XMPP::Jingle::Connection>();
@@ -394,7 +394,7 @@ namespace XMPP { namespace Jingle { namespace IBB {
 
     TransportFeatures Manager::features() const
     {
-        return TransportFeatures(TransportFeature::AlwaysConnect) | TransportFeature::Reliable | TransportFeature::Slow;
+        return TransportFeature::AlwaysConnect | TransportFeature::Reliable | TransportFeature::DataOriented;
     }
 
     void Manager::setJingleManager(XMPP::Jingle::Manager *jm) { d->jingleManager = jm; }
diff --git a/src/xmpp/xmpp-im/jingle-ibb.h b/src/xmpp/xmpp-im/jingle-ibb.h
index 66cb1feb..75117999 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.h
+++ b/src/xmpp/xmpp-im/jingle-ibb.h
@@ -43,7 +43,7 @@ namespace Jingle { namespace IBB {
         TransportFeatures           features() const override;
         int                         maxSupportedChannels() const override;
 
-        Connection::Ptr addChannel() const override;
+        Connection::Ptr addChannel(TransportFeatures features = TransportFeatures()) const override;
 
     private:
         friend class Manager;
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index ccec1fff..4eedf03f 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -20,6 +20,7 @@
 #include "jingle-ice.h"
 
 #include "ice176.h"
+#include "irisnet/noncore/sctp/DepUsrSCTP.hpp"
 #include "jingle-session.h"
 #include "netnames.h"
 #include "udpportreserver.h"
@@ -815,15 +816,16 @@ namespace XMPP { namespace Jingle { namespace ICE {
 
     bool Transport::isValid() const { return d != nullptr; }
 
-    TransportFeatures Transport::features() const
-    {
-        return TransportFeatures(TransportFeature::HardToConnect) | TransportFeature::Reliable | TransportFeature::Fast;
-    }
+    TransportFeatures Transport::features() const { return _pad->manager()->features(); }
 
     int Transport::maxSupportedChannels() const { return -1; };
 
-    Connection::Ptr Transport::addChannel() const
+    Connection::Ptr Transport::addChannel(TransportFeatures features) const
     {
+        // features define type of channel. reliable channels infer sctp
+        // if time-oriented - likely rtp
+        // if message-oriented and not time-oriented - likely sctp
+
         if (_state >= State::ApprovedToSend) {
             qWarning("Adding channel after negotiation start is not yet supported");
             return Connection::Ptr();
@@ -849,17 +851,25 @@ namespace XMPP { namespace Jingle { namespace ICE {
 
     Manager::~Manager()
     {
-        if (d->jingleManager)
+        if (d->jingleManager) {
+            DepUsrSCTP::ClassDestroy();
             d->jingleManager->unregisterTransport(NS);
+        }
     }
 
     TransportFeatures Manager::features() const
     {
-        return TransportFeatures(TransportFeature::Reliable) | TransportFeature::NotReliable
-            | TransportFeature::RealTime;
+        return TransportFeature::HighProbableConnect | TransportFeature::Reliable | TransportFeature::Unreliable
+            | TransportFeature::MessageOriented | TransportFeature::DataOriented | TransportFeature::TimeOriented;
     }
 
-    void Manager::setJingleManager(XMPP::Jingle::Manager *jm) { d->jingleManager = jm; }
+    void Manager::setJingleManager(XMPP::Jingle::Manager *jm)
+    {
+        d->jingleManager = jm;
+        if (jm) {
+            DepUsrSCTP::ClassInit();
+        }
+    }
 
     QSharedPointer<XMPP::Jingle::Transport> Manager::newTransport(const TransportManagerPad::Ptr &pad, Origin creator)
     {
diff --git a/src/xmpp/xmpp-im/jingle-ice.h b/src/xmpp/xmpp-im/jingle-ice.h
index 613140ad..f40244b1 100644
--- a/src/xmpp/xmpp-im/jingle-ice.h
+++ b/src/xmpp/xmpp-im/jingle-ice.h
@@ -140,7 +140,7 @@ namespace Jingle { namespace ICE {
         TransportFeatures           features() const override;
         int                         maxSupportedChannels() const override;
 
-        Connection::Ptr addChannel() const override;
+        Connection::Ptr addChannel(TransportFeatures features = TransportFeatures()) const override;
 
     private:
         friend class Manager;
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 1cb25917..846ee106 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -1634,16 +1634,16 @@ namespace XMPP { namespace Jingle { namespace S5B {
 
     bool Transport::isValid() const { return d != nullptr; }
 
-    TransportFeatures Transport::features() const
-    {
-        return TransportFeatures(TransportFeature::HardToConnect) | TransportFeature::Reliable | TransportFeature::Fast;
-    }
+    TransportFeatures Transport::features() const { return _pad->manager()->features(); }
 
     QString Transport::sid() const { return d->sid; }
 
     QString Transport::directAddr() const { return d->directAddr; }
 
-    Connection::Ptr Transport::addChannel() const { return d->connection.staticCast<XMPP::Jingle::Connection>(); }
+    Connection::Ptr Transport::addChannel(TransportFeatures features) const
+    {
+        return d->connection.staticCast<XMPP::Jingle::Connection>();
+    }
 
     //----------------------------------------------------------------
     // Manager
@@ -1670,7 +1670,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
 
     TransportFeatures Manager::features() const
     {
-        return TransportFeatures(TransportFeature::Reliable) | TransportFeature::Fast;
+        return TransportFeature::Reliable | TransportFeature::Fast | TransportFeature::DataOriented;
     }
 
     void Manager::setJingleManager(XMPP::Jingle::Manager *jm)
diff --git a/src/xmpp/xmpp-im/jingle-s5b.h b/src/xmpp/xmpp-im/jingle-s5b.h
index d947f1ec..dd829822 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.h
+++ b/src/xmpp/xmpp-im/jingle-s5b.h
@@ -143,7 +143,7 @@ namespace Jingle { namespace S5B {
 
         QString         sid() const;
         QString         directAddr() const;
-        Connection::Ptr addChannel() const override;
+        Connection::Ptr addChannel(TransportFeatures features = TransportFeatures()) const override;
 
     private:
         friend class Manager;
diff --git a/src/xmpp/xmpp-im/jingle-transport.h b/src/xmpp/xmpp-im/jingle-transport.h
index 0253203d..1219a098 100644
--- a/src/xmpp/xmpp-im/jingle-transport.h
+++ b/src/xmpp/xmpp-im/jingle-transport.h
@@ -119,9 +119,11 @@ namespace XMPP { namespace Jingle {
         virtual bool hasUpdates() const            = 0;
         virtual OutgoingTransportInfoUpdate takeOutgoingUpdate() = 0;
         virtual bool                        isValid() const      = 0;
-        virtual TransportFeatures           features() const     = 0;
-        virtual int                         maxSupportedChannels() const;
-        virtual Connection::Ptr             addChannel() const = 0; // returns established QIODevice-based connection
+
+        // returns all the available transport features while addChannel() can use just a subset of them
+        virtual TransportFeatures features() const = 0;
+        virtual int               maxSupportedChannels() const;
+        virtual Connection::Ptr   addChannel(TransportFeatures features = TransportFeatures()) const = 0;
     signals:
         void updated(); // found some candidates and they have to be sent. takeUpdate has to be called from this signal
                         // handler. if it's just always ready then signal has to be sent at least once otherwise
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index 8cc5cc9d..4508f929 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -136,20 +136,25 @@ namespace Jingle {
     For example all of them can enable p2p crypto mode (<security/> should work here)
     */
     enum class TransportFeature {
-        // connection establishment
-        HardToConnect = 0x01, // anything else but ibb
-        AlwaysConnect = 0x02, // ibb. basically it's always connected
-
-        // reliability
-        NotReliable = 0x10, // datagram-oriented
-        Reliable    = 0x20, // connection-orinted
-
-        // speed.
-        Slow     = 0x100, // only ibb is here probably
-        Fast     = 0x200, // basically all tcp-based and reliable part of sctp
-        RealTime = 0x400  // it's rather about synchronization of frames with time which implies fast
+        HighProbableConnect = 0x01, // e.g ICE
+        AlwaysConnect       = 0x02, // e.g. IBB. basically it's always connected
+
+        // exclusive
+        Unreliable = 0x04, // losses are acceptable
+        Reliable   = 0x08, // losses are unacceptable
+
+        Fast = 0x20, // assumes p2p or some light proxies like TURN/S5B (likely everything but IBB)
+
+        // exclusive
+        StreamOriented  = 0x200,
+        MessageOriented = 0x400, // if not set then it's stream oriented
+
+        // exclusive
+        DataOriented = 0x800, // the goal is to deliver data
+        TimeOriented = 0x1000 // the goal is keep data synchronized with time (e.g. for rtp)
     };
     Q_DECLARE_FLAGS(TransportFeatures, TransportFeature)
+    Q_DECLARE_OPERATORS_FOR_FLAGS(TransportFeatures)
 
     typedef QPair<QString, Origin>      ContentKey;
     typedef std::function<void(Task *)> OutgoingUpdateCB;
@@ -362,6 +367,4 @@ namespace Jingle {
 } // namespace Jingle
 } // namespace XMPP
 
-Q_DECLARE_OPERATORS_FOR_FLAGS(XMPP::Jingle::TransportFeatures)
-
 #endif // JINGLE_H

From 3030a8ac53db0b89ec6a373b9f66cf4985f8fcce Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sat, 31 Oct 2020 15:11:08 +0300
Subject: [PATCH 245/383] Temporary disable ICE transport

---
 src/xmpp/xmpp-im/client.cpp     |  2 +-
 src/xmpp/xmpp-im/jingle-ice.cpp | 23 ++++++++++++++++++++---
 src/xmpp/xmpp-im/jingle-ice.h   |  1 +
 src/xmpp/xmpp-im/jingle.cpp     |  6 ++++++
 src/xmpp/xmpp-im/jingle.h       |  3 ++-
 5 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
index 273f91fd..e2df33cf 100644
--- a/src/xmpp/xmpp-im/client.cpp
+++ b/src/xmpp/xmpp-im/client.cpp
@@ -181,7 +181,7 @@ Client::Client(QObject *par) : QObject(par)
     d->jingleICEManager = new Jingle::ICE::Manager(d->jingleManager);
     d->jingleManager->registerTransport(Jingle::S5B::NS, d->jingleS5BManager);
     d->jingleManager->registerTransport(Jingle::IBB::NS, d->jingleIBBManager);
-    d->jingleManager->registerTransport(Jingle::ICE::NS, d->jingleICEManager);
+    // d->jingleManager->registerTransport(Jingle::ICE::NS, d->jingleICEManager);
 }
 
 Client::~Client()
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index 4eedf03f..f63355d0 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -280,8 +280,9 @@ namespace XMPP { namespace Jingle { namespace ICE {
         QList<NetworkDatagram> datagrams;
         void *                 client;
         int                    channelIndex;
+        TransportFeatures      features;
 
-        Connection(int channelIndex) : channelIndex(channelIndex)
+        Connection(int channelIndex, TransportFeatures features) : channelIndex(channelIndex), features(features)
         {
             /*connect(client, &SocksClient::readyRead, this, &Connection::readyRead);
             connect(client, &SocksClient::bytesWritten, this, &Connection::bytesWritten);
@@ -820,16 +821,20 @@ namespace XMPP { namespace Jingle { namespace ICE {
 
     int Transport::maxSupportedChannels() const { return -1; };
 
+    // adding ice components (for rtp, rtcp, datachannel etc)
+    // but those are rather abstract channels and it's up to ice manager in TransportPad to decide
     Connection::Ptr Transport::addChannel(TransportFeatures features) const
     {
         // features define type of channel. reliable channels infer sctp
         // if time-oriented - likely rtp
-        // if message-oriented and not time-oriented - likely sctp
+        // if data-oriented - likely sctp
 
         if (_state >= State::ApprovedToSend) {
             qWarning("Adding channel after negotiation start is not yet supported");
             return Connection::Ptr();
         }
+
+        // find a gap in the list of channel indexes or just take last one
         int  channelIdx = 0;
         auto it         = d->channels.constBegin();
         while (it != d->channels.constEnd()) {
@@ -838,7 +843,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
             channelIdx++;
             ++it;
         }
-        auto conn = QSharedPointer<Connection>::create(channelIdx);
+        auto conn = QSharedPointer<Connection>::create(channelIdx, features);
         d->channels.insert(it, channelIdx, conn);
 
         return conn.staticCast<XMPP::Jingle::Connection>();
@@ -965,6 +970,18 @@ namespace XMPP { namespace Jingle { namespace ICE {
 
     TransportManager *Pad::manager() const { return _manager; }
 
+    void Pad::populateOutgoing(Action action, QDomElement &jingle)
+    {
+        if (action == Action::SessionInitiate || action == Action::SessionAccept) {
+            for (auto app : session()->contentList()) {
+                auto transport = app->transport();
+                if (transport && transport.dynamicCast<Transport>()) {
+                    // do grouping stuff
+                }
+            }
+        }
+    }
+
 } // namespace Ice
 } // namespace Jingle
 } // namespace XMPP
diff --git a/src/xmpp/xmpp-im/jingle-ice.h b/src/xmpp/xmpp-im/jingle-ice.h
index f40244b1..1cbcecd0 100644
--- a/src/xmpp/xmpp-im/jingle-ice.h
+++ b/src/xmpp/xmpp-im/jingle-ice.h
@@ -159,6 +159,7 @@ namespace Jingle { namespace ICE {
         QString           ns() const override;
         Session *         session() const override;
         TransportManager *manager() const override;
+        void              populateOutgoing(Action action, QDomElement &el) override;
 
         inline TcpPortScope *discoScope() const { return _discoScope; }
 
diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index 9364be89..70641be4 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -514,6 +514,12 @@ namespace XMPP { namespace Jingle {
     //----------------------------------------------------------------------------
     QDomElement SessionManagerPad::takeOutgoingSessionInfoUpdate() { return QDomElement(); }
 
+    void SessionManagerPad::populateOutgoing(Action action, QDomElement &el)
+    {
+        Q_UNUSED(action);
+        Q_UNUSED(el);
+    }
+
     QDomDocument *SessionManagerPad::doc() const { return session()->manager()->client()->doc(); }
 
     //----------------------------------------------------------------------------
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index 4508f929..234d7efa 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -136,7 +136,7 @@ namespace Jingle {
     For example all of them can enable p2p crypto mode (<security/> should work here)
     */
     enum class TransportFeature {
-        HighProbableConnect = 0x01, // e.g ICE
+        HighProbableConnect = 0x01, // e.g ICE. ICE will have priority over others thanks to Fast|MessageOriented
         AlwaysConnect       = 0x02, // e.g. IBB. basically it's always connected
 
         // exclusive
@@ -299,6 +299,7 @@ namespace Jingle {
         virtual QDomElement takeOutgoingSessionInfoUpdate();
         virtual QString     ns() const      = 0;
         virtual Session *   session() const = 0;
+        virtual void        populateOutgoing(Action action, QDomElement &el);
         QDomDocument *      doc() const;
     };
 

From 5768b31145abb267319abd810e9cbf91edb02bfb Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sat, 31 Oct 2020 15:18:17 +0300
Subject: [PATCH 246/383] Temporary enable qtnet module

qtnet module uses deprecated QNetworkConfigurationManager. So we need another solution, but there is no any yet
---
 src/irisnet/CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/irisnet/CMakeLists.txt b/src/irisnet/CMakeLists.txt
index 7f9051ff..17c46320 100644
--- a/src/irisnet/CMakeLists.txt
+++ b/src/irisnet/CMakeLists.txt
@@ -67,9 +67,9 @@ if(NOT USE_QJDNS)
 else()
     list(APPEND SOURCES corelib/netnames_jdns.cpp)
 endif()
-if (Qt5Network_VERSION VERSION_LESS 5.15.0)
+#if (Qt5Network_VERSION VERSION_LESS 5.15.0)
     list(APPEND SOURCES corelib/netinterface_qtnet.cpp)
-endif()
+#endif()
 
 set(HEADERS
     corelib/irisnetexport.h
@@ -128,9 +128,9 @@ if(NOT USE_QJDNS)
     set(QJDns_LIBRARY "")
 endif()
 
-if (Qt5Network_VERSION VERSION_LESS 5.15.0)
+#if (Qt5Network_VERSION VERSION_LESS 5.15.0)
     target_compile_definitions(irisnet PRIVATE HAVE_QTNET)
-endif()
+#endif()
 target_link_libraries(irisnet Qt5::Core Qt5::Network Qt5::Xml)
 if (BUNDLED_QCA)
     add_dependencies(irisnet QcaProject)

From 0d19930c75cea1da03a347c3539bdd92b83a2b97 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sat, 31 Oct 2020 15:34:04 +0300
Subject: [PATCH 247/383] Include missed QOBject for sctp assoc

---
 src/irisnet/noncore/sctp/SctpAssociation.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/irisnet/noncore/sctp/SctpAssociation.hpp b/src/irisnet/noncore/sctp/SctpAssociation.hpp
index a4daa8d1..df2a7073 100644
--- a/src/irisnet/noncore/sctp/SctpAssociation.hpp
+++ b/src/irisnet/noncore/sctp/SctpAssociation.hpp
@@ -7,6 +7,7 @@
 #include "RTC/DataProducer.hpp"
 #include "usrsctp.h"
 #include <QJsonObject>
+#include <QObject>
 #include <QtEndian>
 
 // using json = nlohmann::json;

From 36e1cbbb02dbf538e39a7892b6e437a3b6f13e64 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sat, 31 Oct 2020 16:09:07 +0300
Subject: [PATCH 248/383] Added include for functional (probably needed on some
 systems)

---
 src/irisnet/noncore/sctp/SctpAssociation.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/irisnet/noncore/sctp/SctpAssociation.hpp b/src/irisnet/noncore/sctp/SctpAssociation.hpp
index df2a7073..f6999b4d 100644
--- a/src/irisnet/noncore/sctp/SctpAssociation.hpp
+++ b/src/irisnet/noncore/sctp/SctpAssociation.hpp
@@ -9,6 +9,7 @@
 #include <QJsonObject>
 #include <QObject>
 #include <QtEndian>
+#include <functional>
 
 // using json = nlohmann::json;
 

From 08d061d83e2a867fc830a547652a50473c05314b Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sat, 31 Oct 2020 17:19:19 +0300
Subject: [PATCH 249/383] Added netlink-based network status monitor

---
 src/irisnet/CMakeLists.txt                 |  8 +-
 src/irisnet/corelib/netinterface_qtnet.cpp | 91 ++++++++++++++++++++--
 2 files changed, 85 insertions(+), 14 deletions(-)

diff --git a/src/irisnet/CMakeLists.txt b/src/irisnet/CMakeLists.txt
index 17c46320..1865b7ae 100644
--- a/src/irisnet/CMakeLists.txt
+++ b/src/irisnet/CMakeLists.txt
@@ -37,6 +37,7 @@ set(SOURCES
     corelib/netinterface.cpp
     corelib/netnames.cpp
     corelib/objectsession.cpp
+    corelib/netinterface_qtnet.cpp
 
     noncore/iceagent.cpp
     noncore/ice176.cpp
@@ -67,9 +68,6 @@ if(NOT USE_QJDNS)
 else()
     list(APPEND SOURCES corelib/netnames_jdns.cpp)
 endif()
-#if (Qt5Network_VERSION VERSION_LESS 5.15.0)
-    list(APPEND SOURCES corelib/netinterface_qtnet.cpp)
-#endif()
 
 set(HEADERS
     corelib/irisnetexport.h
@@ -128,9 +126,7 @@ if(NOT USE_QJDNS)
     set(QJDns_LIBRARY "")
 endif()
 
-#if (Qt5Network_VERSION VERSION_LESS 5.15.0)
-    target_compile_definitions(irisnet PRIVATE HAVE_QTNET)
-#endif()
+target_compile_definitions(irisnet PRIVATE HAVE_QTNET)
 target_link_libraries(irisnet Qt5::Core Qt5::Network Qt5::Xml)
 if (BUNDLED_QCA)
     add_dependencies(irisnet QcaProject)
diff --git a/src/irisnet/corelib/netinterface_qtnet.cpp b/src/irisnet/corelib/netinterface_qtnet.cpp
index f2433c2c..6aa95127 100644
--- a/src/irisnet/corelib/netinterface_qtnet.cpp
+++ b/src/irisnet/corelib/netinterface_qtnet.cpp
@@ -20,20 +20,95 @@
 
 #include <QNetworkInterface>
 
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
+#ifdef Q_OS_LINUX
+#include <asm/types.h>
+#include <linux/netlink.h>
+#include <linux/rtnetlink.h>
+#include <sys/socket.h>
+#include <unistd.h>
+
+class InterfaceMonitor : public QObject {
+    Q_OBJECT
+public:
+    InterfaceMonitor()
+    {
+        struct sockaddr_nl sa;
+
+        memset(&sa, 0, sizeof(sa));
+        sa.nl_family = AF_NETLINK;
+        sa.nl_groups = RTMGRP_LINK | RTMGRP_IPV4_IFADDR | RTMGRP_IPV6_IFADDR;
+
+        netlinkFd = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
+        if (netlinkFd == -1) {
+            return;
+        }
+        if (bind(netlinkFd, (struct sockaddr *)&sa, sizeof(sa)) == -1) {
+            close(netlinkFd);
+            netlinkFd = -1;
+            return;
+        }
+        notifier = new QSocketNotifier(netlinkFd, QSocketNotifier::Read, this);
+
+        connect(notifier, &QSocketNotifier::activated, this,
+                [=](QSocketDescriptor, QSocketNotifier::Type) { emit changed(); });
+    }
+
+    ~InterfaceMonitor()
+    {
+        if (notifier) {
+            delete notifier;
+            close(netlinkFd);
+        }
+    }
+
+signals:
+    void changed();
+
+private:
+    QSocketNotifier *notifier  = nullptr;
+    int              netlinkFd = -1;
+};
+
+#else
+// not linux version. polling? TODO. probably with Qt6 we can use QNetworkStatusMonitor
+class InterfaceMonitor : public QObject {
+    Q_OBJECT
+public:
+    InterfaceMonitor() { }
+
+signals:
+    void changed();
+};
+#endif
+#else // old Qt < 5.15
+class InterfaceMonitor : public QObject {
+    Q_OBJECT
+public:
+    InterfaceMonitor()
+    {
+        connect(&ncm, SIGNAL(configurationAdded(QNetworkConfiguration)), SIGNAL(changed()));
+        connect(&ncm, SIGNAL(configurationChanged(QNetworkConfiguration)), SIGNAL(changed()));
+        connect(&ncm, SIGNAL(configurationRemoved(QNetworkConfiguration)), SIGNAL(changed()));
+    }
+
+signals:
+    void changed();
+
+private:
+    QNetworkConfigurationManager ncm;
+};
+#endif
+
 namespace XMPP {
 class IrisQtNet : public NetInterfaceProvider {
     Q_OBJECT
     Q_INTERFACES(XMPP::NetInterfaceProvider)
 public:
-    QList<Info>                  info;
-    QNetworkConfigurationManager ncm;
+    QList<Info>      info;
+    InterfaceMonitor monitor;
 
-    IrisQtNet()
-    {
-        connect(&ncm, SIGNAL(configurationAdded(QNetworkConfiguration)), SLOT(check()));
-        connect(&ncm, SIGNAL(configurationChanged(QNetworkConfiguration)), SLOT(check()));
-        connect(&ncm, SIGNAL(configurationRemoved(QNetworkConfiguration)), SLOT(check()));
-    }
+    IrisQtNet() { connect(&monitor, &InterfaceMonitor::changed, this, &IrisQtNet::check); }
 
     void start() { poll(); }
 

From 2d4b3a7b7e982fb642ee17f051727f973c11b0f1 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sat, 31 Oct 2020 22:17:58 +0300
Subject: [PATCH 250/383] Fixed usrsctp bundle build

---
 CMakeLists.txt             | 7 +++----
 src/irisnet/CMakeLists.txt | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 22a3d8f8..ea36c6ee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,6 +40,7 @@ set( CMAKE_MODULE_PATH
 
 option( USE_QJDNS "Use qjdns/jdns library. Disabled by default for Qt5" OFF )
 option( SEPARATE_QJDNS "Build qjdns with iris library" OFF )
+option( JINGLE_ICE "Enable ICE Jingle transport for p2p file transfer" ON )
 option( BUNDLED_QCA "Adds: DTLS, Blake2b and other useful for XMPP crypto-stuff" OFF)
 option( BUNDLED_USRSCTP "Compile compatible usrsctp lib when system one is not available or uncompatible (required for datachannel jingle transport)" OFF)
 option( BUILD_IRIS_TOOLS "Build tools and examples" OFF)
@@ -139,10 +140,10 @@ if(NOT BUNDLED_USRSCTP)
 endif()
 if (NOT UsrSCTP_FOUND)
     message(STATUS "USRSCTP: using bundled")
-    set(USRSCTP_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/usrsctp)
+    set(USRSCTP_SOURCE_DIR usrsctplib${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/usrsctp)
     set(USRSCTP_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/usrsctp)
     set(USRSCTP_BUILD_DIR ${USRSCTP_PREFIX}/build)
-    set(USRSCTP_INCLUDE_DIR ${USRSCTP_SOURCE_DIR}/include)
+    set(USRSCTP_INCLUDE_DIR ${USRSCTP_PREFIX}/include)
     set(USRSCTP_LIBRARY ${USRSCTP_BUILD_DIR}/usrsctplib/${CMAKE_STATIC_LIBRARY_PREFIX}usrsctp${CMAKE_STATIC_LIBRARY_SUFFIX})
 
     include(ExternalProject)
@@ -159,7 +160,6 @@ if (NOT UsrSCTP_FOUND)
             SOURCE_DIR ${USRSCTP_SOURCE_DIR}
             CMAKE_ARGS ${USRSCTP_BUILD_OPTIONS}
             BUILD_BYPRODUCTS ${USRSCTP_LIBRARY}
-            INSTALL_COMMAND ""
             )
     else()
         include(FindGit)
@@ -174,7 +174,6 @@ if (NOT UsrSCTP_FOUND)
             GIT_TAG f4925bd5ebb2db38263eef0ec816bf393293cf9c
             CMAKE_ARGS ${USRSCTP_BUILD_OPTIONS}
             BUILD_BYPRODUCTS ${USRSCTP_LIBRARY}
-            INSTALL_COMMAND ""
             )
     endif()
     add_library(SctpLab::UsrSCTP UNKNOWN IMPORTED)
diff --git a/src/irisnet/CMakeLists.txt b/src/irisnet/CMakeLists.txt
index 1865b7ae..8b8c194e 100644
--- a/src/irisnet/CMakeLists.txt
+++ b/src/irisnet/CMakeLists.txt
@@ -132,7 +132,7 @@ if (BUNDLED_QCA)
     add_dependencies(irisnet QcaProject)
 endif()
 target_link_libraries(irisnet ${qca_LIB})
-target_link_libraries(irisnet ${USRSCTP_LIBRARY})
+target_link_libraries(irisnet SctpLab::UsrSCTP)
 target_link_libraries(irisnet ${QJDns_LIBRARY} ${EXTRA_LDFLAGS})
 
 # usrsctp requires pthread

From ac47d918735101160361fb8e898a6efe5083d69f Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 1 Nov 2020 13:33:01 +0300
Subject: [PATCH 251/383] Add usrsctp include dir independently on external
 project

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ea36c6ee..b0e739c7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -180,9 +180,9 @@ if (NOT UsrSCTP_FOUND)
     set_target_properties(SctpLab::UsrSCTP PROPERTIES
             IMPORTED_LOCATION "${USRSCTP_LIBRARY}"
             INTERFACE_COMPILE_DEFINITIONS "${USRSCTP_DEFINITIONS}"
-            INTERFACE_INCLUDE_DIRECTORIES "${USRSCTP_INCLUDE_DIR}"
             IMPORTED_LINK_INTERFACE_LANGUAGES "C")
     add_dependencies(SctpLab::UsrSCTP ${USRSCTP_LIBRARY})
+    include_directories(${USRSCTP_INCLUDE_DIR})
 endif()
 
 if(NOT USE_QJDNS AND SEPARATE_QJDNS)

From 129381ca70cb9076bc1b88f225f2b3146f5bb9e7 Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Sun, 1 Nov 2020 16:39:00 +0200
Subject: [PATCH 252/383] Fixed build with bundled usrsctp

Use system UsrSCTP by default
---
 CMakeLists.txt              | 36 ++++++++++++++++++++++++++----------
 src/irisnet/CMakeLists.txt  |  3 ++-
 usrsctp_remove_shared.patch | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 62 insertions(+), 11 deletions(-)
 create mode 100644 usrsctp_remove_shared.patch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b0e739c7..b3a23660 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -132,19 +132,23 @@ include_directories(
     ${Qca_INCLUDE_DIR}
 )
 
-if(NOT BUNDLED_USRSCTP)
-    find_package(UsrSCTP)
-    if (UsrSCTP_FOUND)
-        message(STATUS "USRSCTP: using system")
-    endif()
+find_package(UsrSCTP)
+if (NOT UsrSCTP_FOUND AND (NOT BUNDLED_USRSCTP))
+    message(FATAL_ERROR "UsrSCTP library not found. Try to install usrsctp library or enable BUNDLED_USRSCTP flag")
 endif()
-if (NOT UsrSCTP_FOUND)
+
+if (NOT UsrSCTP_FOUND AND BUNDLED_USRSCTP)
     message(STATUS "USRSCTP: using bundled")
-    set(USRSCTP_SOURCE_DIR usrsctplib${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/usrsctp)
+    set(USRSCTP_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/usrsctp)
     set(USRSCTP_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/usrsctp)
     set(USRSCTP_BUILD_DIR ${USRSCTP_PREFIX}/build)
-    set(USRSCTP_INCLUDE_DIR ${USRSCTP_PREFIX}/include)
+    if(NOT EXISTS ${USRSCTP_SOURCE_DIR})
+        list(APPEND USRSCTP_INCLUDE_DIR ${USRSCTP_PREFIX}/src/UsrSCTPProject/usrsctplib)
+    else()
+        list(APPEND USRSCTP_INCLUDE_DIR ${USRSCTP_SOURCE_DIR}/usrsctplib)
+    endif()
     set(USRSCTP_LIBRARY ${USRSCTP_BUILD_DIR}/usrsctplib/${CMAKE_STATIC_LIBRARY_PREFIX}usrsctp${CMAKE_STATIC_LIBRARY_SUFFIX})
+    find_package(Patch REQUIRED) #Temporary. Needed for patching usrsctp sources to disable shared libraries creation
 
     include(ExternalProject)
     #set CMake options and transfer the environment to an external project
@@ -160,6 +164,8 @@ if (NOT UsrSCTP_FOUND)
             SOURCE_DIR ${USRSCTP_SOURCE_DIR}
             CMAKE_ARGS ${USRSCTP_BUILD_OPTIONS}
             BUILD_BYPRODUCTS ${USRSCTP_LIBRARY}
+            PATCH_COMMAND ${Patch_EXECUTABLE} ${USRSCTP_SOURCE_DIR}/usrsctplib/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/usrsctp_remove_shared.patch
+            INSTALL_COMMAND ""
             )
     else()
         include(FindGit)
@@ -173,7 +179,8 @@ if (NOT UsrSCTP_FOUND)
             GIT_REPOSITORY https://github.com/sctplab/usrsctp.git
             GIT_TAG f4925bd5ebb2db38263eef0ec816bf393293cf9c
             CMAKE_ARGS ${USRSCTP_BUILD_OPTIONS}
-            BUILD_BYPRODUCTS ${USRSCTP_LIBRARY}
+            PATCH_COMMAND ${Patch_EXECUTABLE} ${USRSCTP_PREFIX}/src/UsrSCTPProject/usrsctplib/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/usrsctp_remove_shared.patch
+            INSTALL_COMMAND ""
             )
     endif()
     add_library(SctpLab::UsrSCTP UNKNOWN IMPORTED)
@@ -182,9 +189,18 @@ if (NOT UsrSCTP_FOUND)
             INTERFACE_COMPILE_DEFINITIONS "${USRSCTP_DEFINITIONS}"
             IMPORTED_LINK_INTERFACE_LANGUAGES "C")
     add_dependencies(SctpLab::UsrSCTP ${USRSCTP_LIBRARY})
-    include_directories(${USRSCTP_INCLUDE_DIR})
 endif()
 
+set(sctpLab_LIBRARY ${USRSCTP_LIBRARY})
+if(USRSCTP_INCLUDES)
+    set(sctpLab_INCLUDES ${USRSCTP_INCLUDES})
+else()
+    set(sctpLab_INCLUDES ${USRSCTP_INCLUDE_DIR})
+endif()
+include_directories(
+    ${sctpLab_INCLUDES}
+)
+
 if(NOT USE_QJDNS AND SEPARATE_QJDNS)
     message(FATAL_ERROR "SEPARATE_QJDNS flag enabled, but USE_QJDNS flag disabled.\nPlease enable flag USE_QJDNS or disable both flags")
 endif()
diff --git a/src/irisnet/CMakeLists.txt b/src/irisnet/CMakeLists.txt
index 8b8c194e..d60c1686 100644
--- a/src/irisnet/CMakeLists.txt
+++ b/src/irisnet/CMakeLists.txt
@@ -7,6 +7,7 @@ include_directories(
     noncore/cutestuff
     noncore/legacy
     ${QCA_INCLUDES}
+    ${sctpLab_INCLUDES}
 )
 
 set( CMAKE_MODULE_PATH
@@ -132,7 +133,7 @@ if (BUNDLED_QCA)
     add_dependencies(irisnet QcaProject)
 endif()
 target_link_libraries(irisnet ${qca_LIB})
-target_link_libraries(irisnet SctpLab::UsrSCTP)
+target_link_libraries(irisnet ${sctpLab_LIBRARY})
 target_link_libraries(irisnet ${QJDns_LIBRARY} ${EXTRA_LDFLAGS})
 
 # usrsctp requires pthread
diff --git a/usrsctp_remove_shared.patch b/usrsctp_remove_shared.patch
new file mode 100644
index 00000000..57c2dbf2
--- /dev/null
+++ b/usrsctp_remove_shared.patch
@@ -0,0 +1,34 @@
+--- a/usrsctplib/CMakeLists.txt
++++ b/usrsctplib/CMakeLists.txt
+@@ -163,10 +163,10 @@ list(APPEND usrsctp_sources
+ 	user_socket.c
+ )
+ 
+-add_library(usrsctp SHARED ${usrsctp_sources} ${usrsctp_headers})
++#add_library(usrsctp SHARED ${usrsctp_sources} ${usrsctp_headers})
+ add_library(usrsctp-static STATIC ${usrsctp_sources} ${usrsctp_headers})
+ 
+-target_include_directories(usrsctp PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
++#target_include_directories(usrsctp PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+ target_include_directories(usrsctp-static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+ 
+ if (WIN32)
+@@ -176,8 +176,8 @@ if (WIN32)
+ endif ()
+ 
+ set_target_properties(usrsctp-static PROPERTIES OUTPUT_NAME "usrsctp")
+-set_target_properties(usrsctp PROPERTIES IMPORT_SUFFIX "_import.lib")
+-set_target_properties(usrsctp PROPERTIES SOVERSION 1 VERSION 1.0.0)
++#set_target_properties(usrsctp PROPERTIES IMPORT_SUFFIX "_import.lib")
++#set_target_properties(usrsctp PROPERTIES SOVERSION 1 VERSION 1.0.0)
+ 
+ if (NOT DEFINED CMAKE_INSTALL_LIBDIR)
+ 	SET(CMAKE_INSTALL_LIBDIR lib)
+@@ -188,5 +188,6 @@ endif ()
+ # INSTALL LIBRARY AND HEADER
+ #################################################
+ 
+-install(TARGETS usrsctp usrsctp-static DESTINATION ${CMAKE_INSTALL_LIBDIR})
++#install(TARGETS usrsctp usrsctp-static DESTINATION ${CMAKE_INSTALL_LIBDIR})
++install(TARGETS usrsctp-static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ install(FILES usrsctp.h DESTINATION include)

From a6b2ae5b296b6c6b723a81ed2b2017ae20b5c129 Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Sun, 1 Nov 2020 17:42:39 +0200
Subject: [PATCH 253/383] Patch step for bundled usrsctp deteted

---
 CMakeLists.txt              |  2 --
 usrsctp_remove_shared.patch | 34 ----------------------------------
 2 files changed, 36 deletions(-)
 delete mode 100644 usrsctp_remove_shared.patch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b3a23660..24db4dec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -164,7 +164,6 @@ if (NOT UsrSCTP_FOUND AND BUNDLED_USRSCTP)
             SOURCE_DIR ${USRSCTP_SOURCE_DIR}
             CMAKE_ARGS ${USRSCTP_BUILD_OPTIONS}
             BUILD_BYPRODUCTS ${USRSCTP_LIBRARY}
-            PATCH_COMMAND ${Patch_EXECUTABLE} ${USRSCTP_SOURCE_DIR}/usrsctplib/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/usrsctp_remove_shared.patch
             INSTALL_COMMAND ""
             )
     else()
@@ -179,7 +178,6 @@ if (NOT UsrSCTP_FOUND AND BUNDLED_USRSCTP)
             GIT_REPOSITORY https://github.com/sctplab/usrsctp.git
             GIT_TAG f4925bd5ebb2db38263eef0ec816bf393293cf9c
             CMAKE_ARGS ${USRSCTP_BUILD_OPTIONS}
-            PATCH_COMMAND ${Patch_EXECUTABLE} ${USRSCTP_PREFIX}/src/UsrSCTPProject/usrsctplib/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/usrsctp_remove_shared.patch
             INSTALL_COMMAND ""
             )
     endif()
diff --git a/usrsctp_remove_shared.patch b/usrsctp_remove_shared.patch
deleted file mode 100644
index 57c2dbf2..00000000
--- a/usrsctp_remove_shared.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/usrsctplib/CMakeLists.txt
-+++ b/usrsctplib/CMakeLists.txt
-@@ -163,10 +163,10 @@ list(APPEND usrsctp_sources
- 	user_socket.c
- )
- 
--add_library(usrsctp SHARED ${usrsctp_sources} ${usrsctp_headers})
-+#add_library(usrsctp SHARED ${usrsctp_sources} ${usrsctp_headers})
- add_library(usrsctp-static STATIC ${usrsctp_sources} ${usrsctp_headers})
- 
--target_include_directories(usrsctp PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-+#target_include_directories(usrsctp PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
- target_include_directories(usrsctp-static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
- 
- if (WIN32)
-@@ -176,8 +176,8 @@ if (WIN32)
- endif ()
- 
- set_target_properties(usrsctp-static PROPERTIES OUTPUT_NAME "usrsctp")
--set_target_properties(usrsctp PROPERTIES IMPORT_SUFFIX "_import.lib")
--set_target_properties(usrsctp PROPERTIES SOVERSION 1 VERSION 1.0.0)
-+#set_target_properties(usrsctp PROPERTIES IMPORT_SUFFIX "_import.lib")
-+#set_target_properties(usrsctp PROPERTIES SOVERSION 1 VERSION 1.0.0)
- 
- if (NOT DEFINED CMAKE_INSTALL_LIBDIR)
- 	SET(CMAKE_INSTALL_LIBDIR lib)
-@@ -188,5 +188,6 @@ endif ()
- # INSTALL LIBRARY AND HEADER
- #################################################
- 
--install(TARGETS usrsctp usrsctp-static DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+#install(TARGETS usrsctp usrsctp-static DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+install(TARGETS usrsctp-static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- install(FILES usrsctp.h DESTINATION include)

From 2070073a625bd53747c5c1a9b684be79001e7b24 Mon Sep 17 00:00:00 2001
From: Vitaly Tonkacheyev <Vitozz@users.noreply.github.com>
Date: Sun, 1 Nov 2020 18:20:32 +0200
Subject: [PATCH 254/383] Update CMakeLists.txt

Removed patch dependency
---
 CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 24db4dec..5010f92f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -148,7 +148,6 @@ if (NOT UsrSCTP_FOUND AND BUNDLED_USRSCTP)
         list(APPEND USRSCTP_INCLUDE_DIR ${USRSCTP_SOURCE_DIR}/usrsctplib)
     endif()
     set(USRSCTP_LIBRARY ${USRSCTP_BUILD_DIR}/usrsctplib/${CMAKE_STATIC_LIBRARY_PREFIX}usrsctp${CMAKE_STATIC_LIBRARY_SUFFIX})
-    find_package(Patch REQUIRED) #Temporary. Needed for patching usrsctp sources to disable shared libraries creation
 
     include(ExternalProject)
     #set CMake options and transfer the environment to an external project

From 60a4307c59c2adaec9d97dd39aca00086096a084 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 3 Nov 2020 10:01:55 +0300
Subject: [PATCH 255/383] work in progress for jingle grouping support

---
 src/xmpp/xmpp-im/jingle-ice.cpp     | 20 ++++---
 src/xmpp/xmpp-im/jingle-ice.h       |  3 +-
 src/xmpp/xmpp-im/jingle-session.cpp | 84 ++++++++++++++++++++++++++---
 src/xmpp/xmpp-im/jingle-session.h   |  3 ++
 src/xmpp/xmpp-im/jingle.cpp         |  3 ++
 src/xmpp/xmpp-im/jingle.h           |  8 ++-
 6 files changed, 103 insertions(+), 18 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index f63355d0..ebbb0beb 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -961,7 +961,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
     Pad::Pad(Manager *manager, Session *session) : _manager(manager), _session(session)
     {
         auto reserver = _session->manager()->client()->tcpPortReserver();
-        _discoScope   = reserver->scope(QString::fromLatin1("s5b"));
+        _discoScope   = reserver->scope(QString::fromLatin1("ice"));
     }
 
     QString Pad::ns() const { return NS; }
@@ -970,16 +970,20 @@ namespace XMPP { namespace Jingle { namespace ICE {
 
     TransportManager *Pad::manager() const { return _manager; }
 
-    void Pad::populateOutgoing(Action action, QDomElement &jingle)
+    void Pad::onLocalAccepted()
     {
-        if (action == Action::SessionInitiate || action == Action::SessionAccept) {
-            for (auto app : session()->contentList()) {
-                auto transport = app->transport();
-                if (transport && transport.dynamicCast<Transport>()) {
-                    // do grouping stuff
-                }
+        if (!_session->isGroupingAllowed() && _session->role() != Origin::Initiator)
+            return;
+        QStringList bundle;
+        for (auto app : session()->contentList()) {
+            auto transport = app->transport();
+            if (transport && transport.dynamicCast<Transport>()) {
+                // do grouping stuff
+                bundle.append(app->contentName());
             }
         }
+        if (bundle.size() > 1)
+            _session->setGrouping(QLatin1String("BUNDLE"), bundle);
     }
 
 } // namespace Ice
diff --git a/src/xmpp/xmpp-im/jingle-ice.h b/src/xmpp/xmpp-im/jingle-ice.h
index 1cbcecd0..abab0fcd 100644
--- a/src/xmpp/xmpp-im/jingle-ice.h
+++ b/src/xmpp/xmpp-im/jingle-ice.h
@@ -159,7 +159,7 @@ namespace Jingle { namespace ICE {
         QString           ns() const override;
         Session *         session() const override;
         TransportManager *manager() const override;
-        void              populateOutgoing(Action action, QDomElement &el) override;
+        void              onLocalAccepted() override;
 
         inline TcpPortScope *discoScope() const { return _discoScope; }
 
@@ -167,6 +167,7 @@ namespace Jingle { namespace ICE {
         Manager *     _manager;
         Session *     _session;
         TcpPortScope *_discoScope;
+        bool          _allowGrouping = false;
     };
 
     class Manager : public TransportManager {
diff --git a/src/xmpp/xmpp-im/jingle-session.cpp b/src/xmpp/xmpp-im/jingle-session.cpp
index 173f2e15..47066fb5 100644
--- a/src/xmpp/xmpp-im/jingle-session.cpp
+++ b/src/xmpp/xmpp-im/jingle-session.cpp
@@ -21,6 +21,7 @@
 
 #include "jingle-application.h"
 #include "xmpp/jid/jid.h"
+#include "xmpp_caps.h"
 #include "xmpp_client.h"
 #include "xmpp_task.h"
 #include "xmpp_xmlcommon.h"
@@ -83,8 +84,10 @@ namespace XMPP { namespace Jingle {
         QMap<QString, QWeakPointer<TransportManagerPad>>   transportPads;
         QMap<ContentKey, Application *>                    contentList;
         QSet<Application *>                                signalingContent;
-        QList<Application *>
-            initialIncomingUnacceptedContent; // not yet acccepted applications from initial incoming request
+        QHash<QString, QStringList>                        groups;
+
+        // not yet acccepted applications from initial incoming request
+        QList<Application *> initialIncomingUnacceptedContent;
 
         // session level updates. session-info for example or some rejected apps
         QHash<Action, OutgoingUpdate> outgoingUpdates;
@@ -93,7 +96,9 @@ namespace XMPP { namespace Jingle {
         Jid     origFrom;   // "from" attr of IQ.
         Jid     otherParty; // either "from" or initiator/responder. it's where to send all requests.
         Jid     localParty; // that one will be set as initiator/responder if provided
-        bool    waitingAck = false;
+        bool    waitingAck      = false;
+        bool    needNotifyGroup = false; // whenever grouping info changes
+        bool    groupingAllowed = false;
 
         void setSessionFinished()
         {
@@ -113,6 +118,45 @@ namespace XMPP { namespace Jingle {
             q->deleteLater();
         }
 
+        QList<QDomElement> genGroupingXML()
+        {
+            QList<QDomElement> ret;
+            if (!groupingAllowed)
+                return ret;
+
+            QDomDocument &doc = *manager->client()->doc();
+
+            QHashIterator<QString, QStringList> it(groups);
+            while (it.hasNext()) {
+                it.next();
+                auto g = doc.createElementNS(QLatin1String("urn:xmpp:jingle:apps:grouping:0"), QLatin1String("group"));
+                g.setAttribute(QLatin1String("semantics"), it.key());
+                for (auto const &name : it.value()) {
+                    auto c = doc.createElement(QLatin1String("content"));
+                    c.setAttribute(QLatin1String("name"), name);
+                    g.appendChild(c);
+                }
+                ret.append(g);
+            }
+            return ret;
+        }
+
+        template <void (SessionManagerPad::*func)()> void notifyPads()
+        {
+            for (auto &weakPad : transportPads) {
+                auto pad = weakPad.lock();
+                if (pad) {
+                    (pad.get()->*func)(); // just calls pad's method
+                }
+            }
+            for (auto &weakPad : applicationPads) {
+                auto pad = weakPad.lock();
+                if (pad) {
+                    (pad.get()->*func)();
+                }
+            }
+        }
+
         void sendJingle(Action action, QList<QDomElement> update,
                         std::function<void(JT *)> callback = std::function<void(JT *)>())
         {
@@ -129,6 +173,13 @@ namespace XMPP { namespace Jingle {
             for (const QDomElement &e : update) {
                 xml.appendChild(e);
             }
+            if (needNotifyGroup
+                && (action == Action::SessionInitiate || action == Action::SessionAccept || action == Action::ContentAdd
+                    || action == Action::ContentAccept)) {
+                for (auto const &g : genGroupingXML())
+                    xml.appendChild(g);
+                needNotifyGroup = false;
+            }
 
             auto jt = new JT(manager->client()->rootTask());
             jt->request(otherParty, xml);
@@ -234,6 +285,8 @@ namespace XMPP { namespace Jingle {
                     finalState   = State::Pending;
                 }
 
+                notifyPads<&SessionManagerPad::onSend>();
+
                 QList<QDomElement> contents;
                 QList<AckHndl>     acceptApps;
                 for (const auto &app : contentList) {
@@ -246,6 +299,7 @@ namespace XMPP { namespace Jingle {
                         acceptApps.append(AckHndl { app, callback });
                     }
                 }
+
                 state = State::Unacked;
                 sendJingle(actionToSend, contents, [this, acceptApps, finalState](JT *jt) {
                     if (!jt->success())
@@ -884,10 +938,11 @@ namespace XMPP { namespace Jingle {
 
     Session::Session(Manager *manager, const Jid &peer, Origin role) : d(new Private)
     {
-        d->q          = this;
-        d->role       = role;
-        d->manager    = manager;
-        d->otherParty = peer;
+        d->q               = this;
+        d->role            = role;
+        d->manager         = manager;
+        d->otherParty      = peer;
+        d->groupingAllowed = checkPeerCaps(QLatin1String("urn:ietf:rfc:5888"));
         d->stepTimer.setSingleShot(true);
         d->stepTimer.setInterval(0);
         connect(&d->stepTimer, &QTimer::timeout, this, [this]() { d->doStep(); });
@@ -920,6 +975,13 @@ namespace XMPP { namespace Jingle {
 
     Origin Session::peerRole() const { return negateOrigin(d->role); }
 
+    bool Session::checkPeerCaps(const QString &ns) const
+    {
+        return d->manager->client()->capsManager()->disco(peer()).features().test(QStringList() << ns);
+    }
+
+    bool Session::isGroupingAllowed() const { return d->groupingAllowed; }
+
     XMPP::Stanza::Error Session::lastError() const { return d->lastError; }
 
     Application *Session::newContent(const QString &ns, Origin senders)
@@ -949,6 +1011,12 @@ namespace XMPP { namespace Jingle {
 
     const QMap<ContentKey, Application *> &Session::contentList() const { return d->contentList; }
 
+    void Session::setGrouping(const QString &groupType, const QStringList &group)
+    {
+        d->groups.insert(groupType, group);
+        d->needNotifyGroup = true;
+    }
+
     ApplicationManagerPad::Ptr Session::applicationPad(const QString &ns)
     {
         return d->applicationPads.value(ns).toStrongRef();
@@ -989,6 +1057,7 @@ namespace XMPP { namespace Jingle {
         for (auto &c : d->contentList) {
             c->prepare();
         }
+        d->notifyPads<&SessionManagerPad::onLocalAccepted>();
         d->planStep();
     }
 
@@ -1000,6 +1069,7 @@ namespace XMPP { namespace Jingle {
             for (auto &c : d->contentList) {
                 c->prepare();
             }
+            d->notifyPads<&SessionManagerPad::onLocalAccepted>();
             d->planStep();
         }
     }
diff --git a/src/xmpp/xmpp-im/jingle-session.h b/src/xmpp/xmpp-im/jingle-session.h
index b72a03d2..bc619a21 100644
--- a/src/xmpp/xmpp-im/jingle-session.h
+++ b/src/xmpp/xmpp-im/jingle-session.h
@@ -48,6 +48,8 @@ namespace XMPP { namespace Jingle {
 
         Origin role() const; // my role in session: initiator or responder
         Origin peerRole() const;
+        bool   checkPeerCaps(const QString &ns) const;
+        bool   isGroupingAllowed() const;
 
         XMPP::Stanza::Error lastError() const;
 
@@ -57,6 +59,7 @@ namespace XMPP { namespace Jingle {
         Application *                          content(const QString &contentName, Origin creator);
         void                                   addContent(Application *content);
         const QMap<ContentKey, Application *> &contentList() const;
+        void                                   setGrouping(const QString &groupType, const QStringList &group);
 
         ApplicationManagerPad::Ptr applicationPad(const QString &ns);
         TransportManagerPad::Ptr   transportPad(const QString &ns);
diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index 70641be4..d7a1e53c 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -520,6 +520,9 @@ namespace XMPP { namespace Jingle {
         Q_UNUSED(el);
     }
 
+    void SessionManagerPad::onLocalAccepted() { }
+    void SessionManagerPad::onSend() { }
+
     QDomDocument *SessionManagerPad::doc() const { return session()->manager()->client()->doc(); }
 
     //----------------------------------------------------------------------------
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index 234d7efa..4ac20e9a 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -299,8 +299,12 @@ namespace Jingle {
         virtual QDomElement takeOutgoingSessionInfoUpdate();
         virtual QString     ns() const      = 0;
         virtual Session *   session() const = 0;
-        virtual void        populateOutgoing(Action action, QDomElement &el);
-        QDomDocument *      doc() const;
+
+        virtual void onLocalAccepted(); // changing to prepare state
+        virtual void onSend();          // local stuff is prepared we are going to send it to remote
+
+        virtual void  populateOutgoing(Action action, QDomElement &el);
+        QDomDocument *doc() const;
     };
 
     class ApplicationManager;

From 518dac0d8d2d4cc67adad9564720819fe11c3162 Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Tue, 3 Nov 2020 13:51:34 +0200
Subject: [PATCH 256/383] Fixed build with MinGW. Fixed warnings with MinGW

---
 CMakeLists.txt                  | 7 +++++++
 src/xmpp/xmpp-im/jingle-ice.cpp | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5010f92f..622bc1ee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -132,6 +132,13 @@ include_directories(
     ${Qca_INCLUDE_DIR}
 )
 
+if((CMAKE_CROSSCOMPILING) AND (DEFINED MSYS) AND (EXISTS ${CMAKE_PREFIX_PATH}/include/stdint.h))
+    #Add SCTP_STDINT_INCLUDE definition to compile irisnet with usrsctp with MinGW
+    add_definitions(
+        -DSCTP_STDINT_INCLUDE="${CMAKE_PREFIX_PATH}/include/stdint.h"
+    )
+endif()
+
 find_package(UsrSCTP)
 if (NOT UsrSCTP_FOUND AND (NOT BUNDLED_USRSCTP))
     message(FATAL_ERROR "UsrSCTP library not found. Try to install usrsctp library or enable BUNDLED_USRSCTP flag")
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index ebbb0beb..8da3bb26 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -17,10 +17,11 @@
  *
  */
 
+#include "irisnet/noncore/sctp/DepUsrSCTP.hpp" //Do not move to avoid warnings with MinGW
+
 #include "jingle-ice.h"
 
 #include "ice176.h"
-#include "irisnet/noncore/sctp/DepUsrSCTP.hpp"
 #include "jingle-session.h"
 #include "netnames.h"
 #include "udpportreserver.h"

From 5a51206546959ebf6fc71e424d6ba4266ba3d752 Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Tue, 3 Nov 2020 17:54:22 +0200
Subject: [PATCH 257/383] Fixed link errors

---
 src/irisnet/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/irisnet/CMakeLists.txt b/src/irisnet/CMakeLists.txt
index d60c1686..e9ca3a5b 100644
--- a/src/irisnet/CMakeLists.txt
+++ b/src/irisnet/CMakeLists.txt
@@ -120,7 +120,7 @@ set(HEADERS
 add_library(irisnet STATIC ${SOURCES} ${HEADERS} )
 
 if(WIN32 AND (SEPARATE_QJDNS OR (NOT USE_QJDNS)))
-    set(EXTRA_LDFLAGS ws2_32)
+    set(EXTRA_LDFLAGS ws2_32 iphlpapi)
 endif()
 
 if(NOT USE_QJDNS)

From 2fa35259352e8aa74558c04d4d27dd444e7cffc6 Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Tue, 3 Nov 2020 18:57:59 +0200
Subject: [PATCH 258/383] An attempt to fix build with MSVC and bundled USRSCTP

---
 CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 622bc1ee..125e89a3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -184,6 +184,7 @@ if (NOT UsrSCTP_FOUND AND BUNDLED_USRSCTP)
             GIT_REPOSITORY https://github.com/sctplab/usrsctp.git
             GIT_TAG f4925bd5ebb2db38263eef0ec816bf393293cf9c
             CMAKE_ARGS ${USRSCTP_BUILD_OPTIONS}
+            BUILD_BYPRODUCTS ${USRSCTP_LIBRARY}
             INSTALL_COMMAND ""
             )
     endif()

From ec5f70c57b193ed02f3315c41f6632c879c5c330 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 4 Nov 2020 11:17:35 +0300
Subject: [PATCH 259/383] Get disco features from jingle manager

---
 src/xmpp/xmpp-im/client.cpp           |  5 +++--
 src/xmpp/xmpp-im/jingle-application.h |  2 ++
 src/xmpp/xmpp-im/jingle-ft.cpp        |  9 ++++++---
 src/xmpp/xmpp-im/jingle-ft.h          |  5 ++++-
 src/xmpp/xmpp-im/jingle-ibb.cpp       |  2 ++
 src/xmpp/xmpp-im/jingle-ibb.h         |  3 ++-
 src/xmpp/xmpp-im/jingle-ice.cpp       | 10 ++++++----
 src/xmpp/xmpp-im/jingle-ice.h         |  2 ++
 src/xmpp/xmpp-im/jingle-s5b.cpp       |  2 ++
 src/xmpp/xmpp-im/jingle-s5b.h         |  3 ++-
 src/xmpp/xmpp-im/jingle-transport.h   |  2 ++
 src/xmpp/xmpp-im/jingle.cpp           | 17 +++++++++++++++--
 src/xmpp/xmpp-im/jingle.h             |  2 ++
 13 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
index e2df33cf..ca73353f 100644
--- a/src/xmpp/xmpp-im/client.cpp
+++ b/src/xmpp/xmpp-im/client.cpp
@@ -1138,9 +1138,10 @@ DiscoItem Client::makeDiscoResult(const QString &node) const
     features.addFeature("urn:xmpp:time");
     features.addFeature("urn:xmpp:message-correct:0");
     features.addFeature("urn:xmpp:jingle:1");
+    for (auto const &feature : d->jingleManager->discoFeatures()) {
+        features.addFeature(feature);
+    }
     // TODO rather do foreach for all registered jingle apps and transports
-    features.addFeature("urn:xmpp:jingle:transports:s5b:1");
-    features.addFeature("urn:xmpp:jingle:transports:ibb:1");
     // TODO: since it depends on UI it needs a way to be disabled
     features.addFeature("urn:xmpp:jingle:apps:file-transfer:5");
     Hash::populateFeatures(features);
diff --git a/src/xmpp/xmpp-im/jingle-application.h b/src/xmpp/xmpp-im/jingle-application.h
index 5031ab22..5ba5fba6 100644
--- a/src/xmpp/xmpp-im/jingle-application.h
+++ b/src/xmpp/xmpp-im/jingle-application.h
@@ -193,6 +193,8 @@ namespace XMPP { namespace Jingle {
         // this method is supposed to gracefully close all related sessions as a preparation for plugin unload for
         // example
         virtual void closeAll() = 0;
+
+        virtual QStringList discoFeatures() const = 0;
     };
 
 }}
diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 8567c830..b3805361 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -401,6 +401,8 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
 
     void Manager::closeAll() { }
 
+    QStringList Manager::discoFeatures() const { return { NS }; }
+
     Client *Manager::client()
     {
         if (jingleManager) {
@@ -411,7 +413,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
 
     QStringList Manager::availableTransports() const
     {
-        return jingleManager->availableTransports(TransportFeature::Reliable);
+        return jingleManager->availableTransports(TransportFeature::Reliable | TransportFeature::DataOriented);
     }
 
     //----------------------------------------------------------------------------
@@ -643,10 +645,11 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
 
     void Application::initTransport()
     {
-        connect(_transport.data(), &Transport::connected, this, [this]() {
+        d->connection = _transport->addChannel(TransportFeature::Reliable | TransportFeature::DataOriented);
+        connect(d->connection.data(), &Connection::connected, this, [this]() {
             d->lastReason = Reason();
             d->lastError.reset();
-            d->connection = _transport->addChannel(TransportFeature::Reliable | TransportFeature::DataOriented);
+
             if (!d->streamingMode) {
                 connect(d->connection.data(), &Connection::readyRead, this, [this]() {
                     if (!d->device) {
diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index b4c186c2..81b58e64 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -197,7 +197,10 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
                                       Origin senders);
         ApplicationManagerPad *pad(Session *session); // pad factory
         void                   closeAll();
-        Client *               client();
+
+        QStringList discoFeatures() const override;
+
+        Client *client();
 
         QStringList availableTransports() const;
 
diff --git a/src/xmpp/xmpp-im/jingle-ibb.cpp b/src/xmpp/xmpp-im/jingle-ibb.cpp
index 55c9c2e3..68abb314 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.cpp
+++ b/src/xmpp/xmpp-im/jingle-ibb.cpp
@@ -408,6 +408,8 @@ namespace XMPP { namespace Jingle { namespace IBB {
 
     void Manager::closeAll() { emit abortAllRequested(); }
 
+    QStringList Manager::discoFeatures() const { return { NS }; }
+
     XMPP::Jingle::Connection::Ptr Manager::makeConnection(const Jid &peer, const QString &sid, size_t blockSize)
     {
         if (!sid.isEmpty() && d->connections.contains(qMakePair(peer, sid))) {
diff --git a/src/xmpp/xmpp-im/jingle-ibb.h b/src/xmpp/xmpp-im/jingle-ibb.h
index 75117999..c5db951c 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.h
+++ b/src/xmpp/xmpp-im/jingle-ibb.h
@@ -83,7 +83,8 @@ namespace Jingle { namespace IBB {
                                                              Origin                          creator) override;
         TransportManagerPad *                   pad(Session *session) override;
 
-        void closeAll() override;
+        void        closeAll() override;
+        QStringList discoFeatures() const override;
 
         Connection::Ptr makeConnection(const Jid &peer, const QString &sid, size_t blockSize);
         bool            handleIncoming(IBBConnection *c);
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index 8da3bb26..436137a0 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -113,7 +113,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
 
         void onOneFinished()
         {
-            if (--counter) {
+            if (!--counter) {
                 callback();
                 deleteLater();
             }
@@ -476,11 +476,11 @@ namespace XMPP { namespace Jingle { namespace ICE {
             stunRelayUdpPort = manager->stunRelayUdpPort;
             stunRelayTcpPort = manager->stunRelayTcpPort;
             if (!stunBindAddr.isNull() && stunBindPort > 0)
-                printf("STUN service: %s;%d\n", qPrintable(stunBindAddr.toString()), stunBindPort);
+                qDebug("STUN service: %s;%d", qPrintable(stunBindAddr.toString()), stunBindPort);
             if (!stunRelayUdpAddr.isNull() && stunRelayUdpPort > 0 && !manager->stunRelayUdpUser.isEmpty())
-                printf("TURN w/ UDP service: %s;%d\n", qPrintable(stunRelayUdpAddr.toString()), stunRelayUdpPort);
+                qDebug("TURN w/ UDP service: %s;%d", qPrintable(stunRelayUdpAddr.toString()), stunRelayUdpPort);
             if (!stunRelayTcpAddr.isNull() && stunRelayTcpPort > 0 && !manager->stunRelayTcpUser.isEmpty())
-                printf("TURN w/ TCP service: %s;%d\n", qPrintable(stunRelayTcpAddr.toString()), stunRelayTcpPort);
+                qDebug("TURN w/ TCP service: %s;%d", qPrintable(stunRelayTcpAddr.toString()), stunRelayTcpPort);
 
             QList<QHostAddress> listenAddrs;
             auto const          interfaces = QNetworkInterface::allInterfaces();
@@ -886,6 +886,8 @@ namespace XMPP { namespace Jingle { namespace ICE {
 
     void Manager::closeAll() { emit abortAllRequested(); }
 
+    QStringList Manager::discoFeatures() const { return { NS }; }
+
     void Manager::setBasePort(int port) { d->basePort = port; }
 
     void Manager::setExternalAddress(const QString &host) { d->extHost = host; }
diff --git a/src/xmpp/xmpp-im/jingle-ice.h b/src/xmpp/xmpp-im/jingle-ice.h
index abab0fcd..2c178a69 100644
--- a/src/xmpp/xmpp-im/jingle-ice.h
+++ b/src/xmpp/xmpp-im/jingle-ice.h
@@ -184,6 +184,8 @@ namespace Jingle { namespace ICE {
 
         void closeAll() override;
 
+        QStringList discoFeatures() const override;
+
         /**
          * @brief userProxy returns custom (set by user) SOCKS proxy JID
          * @return
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 846ee106..4274de5a 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -1702,6 +1702,8 @@ namespace XMPP { namespace Jingle { namespace S5B {
 
     void Manager::closeAll() { emit abortAllRequested(); }
 
+    QStringList Manager::discoFeatures() const { return { NS }; }
+
     void Manager::addKeyMapping(const QString &key, Transport *transport) { d->key2transport.insert(key, transport); }
 
     void Manager::removeKeyMapping(const QString &key) { d->key2transport.remove(key); }
diff --git a/src/xmpp/xmpp-im/jingle-s5b.h b/src/xmpp/xmpp-im/jingle-s5b.h
index dd829822..81705015 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.h
+++ b/src/xmpp/xmpp-im/jingle-s5b.h
@@ -186,7 +186,8 @@ namespace Jingle { namespace S5B {
                                                              Origin                          creator) override;
         TransportManagerPad *                   pad(Session *session) override;
 
-        void closeAll() override;
+        void        closeAll() override;
+        QStringList discoFeatures() const override;
 
         QString generateSid(const Jid &remote);
         void    registerSid(const Jid &remote, const QString &sid);
diff --git a/src/xmpp/xmpp-im/jingle-transport.h b/src/xmpp/xmpp-im/jingle-transport.h
index 1219a098..4ac520a4 100644
--- a/src/xmpp/xmpp-im/jingle-transport.h
+++ b/src/xmpp/xmpp-im/jingle-transport.h
@@ -201,6 +201,8 @@ namespace XMPP { namespace Jingle {
         // this method is supposed to gracefully close all related sessions as a preparation for plugin unload for
         // example
         virtual void closeAll() = 0;
+
+        virtual QStringList discoFeatures() const = 0;
     signals:
         void abortAllRequested(); // mostly used by transport instances to abort immediately
     };
diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index d7a1e53c..b8c626ab 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -663,12 +663,25 @@ namespace XMPP { namespace Jingle {
 
     QStringList Manager::availableTransports(const TransportFeatures &features) const
     {
-        QStringList ret;
+        QMap<int, QString> ret;
         for (auto it = d->transportManagers.cbegin(); it != d->transportManagers.cend(); ++it) {
             if (((*it)->features() & features) == features) {
-                ret.append(it.key());
+                ret.insert((*it)->features(), it.key());
             }
         }
+        // sorting by features is totally unreliable, so we have TransportSelector to do better job
+        return ret.values();
+    }
+
+    QStringList Manager::discoFeatures() const
+    {
+        QStringList ret;
+        for (auto const &mgr : d->applicationManagers) {
+            ret += mgr->discoFeatures();
+        }
+        for (auto const &mgr : d->transportManagers) {
+            ret += mgr->discoFeatures();
+        }
         return ret;
     }
 
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index 4ac20e9a..55a7243e 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -342,6 +342,8 @@ namespace Jingle {
                                           const QString &ns); // allocates new pad on transport manager
         QStringList          availableTransports(const TransportFeatures &features = TransportFeatures()) const;
 
+        QStringList discoFeatures() const;
+
         /**
          * @brief isAllowedParty checks if the remote jid allowed to initiate a session
          * @param jid - remote jid

From 76d8128e805c9ebf2476856e5c151698aea6d9ad Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 8 Nov 2020 01:25:34 +0300
Subject: [PATCH 260/383] ICE/DTLS transport: handling outgoing events in
 progress

---
 src/irisnet/noncore/ice176.cpp  |  16 +++
 src/irisnet/noncore/ice176.h    |  11 ++
 src/xmpp/xmpp-im/jingle-ice.cpp | 212 +++++++++++++++++---------------
 3 files changed, 139 insertions(+), 100 deletions(-)

diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index 3815fa96..7541323b 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -1688,6 +1688,22 @@ void Ice176::changeThread(QThread *thread)
     moveToThread(thread);
 }
 
+bool Ice176::isLocalGatheringComplete() const { return d->localGatheringComplete; }
+
+bool Ice176::isActive() const { return d->state == Private::Active; }
+
+QList<Ice176::SelectedCandidate> Ice176::selectedCandidates() const
+{
+    QList<Ice176::SelectedCandidate> ret;
+    for (auto const &c : d->components) {
+        if (c.selectedPair) {
+            const auto &local = c.selectedPair->local;
+            ret.append({ local->addr.addr, local->addr.port, local->componentId });
+        }
+    }
+    return ret;
+}
+
 } // namespace XMPP
 
 #include "ice176.moc"
diff --git a/src/irisnet/noncore/ice176.h b/src/irisnet/noncore/ice176.h
index 5d44b93f..b98e2cf0 100644
--- a/src/irisnet/noncore/ice176.h
+++ b/src/irisnet/noncore/ice176.h
@@ -74,6 +74,12 @@ class Ice176 : public QObject {
         QString      type;
     };
 
+    struct SelectedCandidate {
+        QHostAddress ip;
+        int          port        = -1;
+        int          componentId = -1;
+    };
+
     Ice176(QObject *parent = nullptr);
     ~Ice176();
 
@@ -149,6 +155,11 @@ class Ice176 : public QObject {
 
     void changeThread(QThread *thread);
 
+    bool isLocalGatheringComplete() const;
+    bool isActive() const;
+
+    QList<SelectedCandidate> selectedCandidates() const;
+
 signals:
     // indicates that the ice engine is started and is ready to receive
     //   peer creds and remote candidates
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index 436137a0..b250069a 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -21,6 +21,7 @@
 
 #include "jingle-ice.h"
 
+#include "dtls.h"
 #include "ice176.h"
 #include "jingle-session.h"
 #include "netnames.h"
@@ -28,6 +29,7 @@
 #include "xmpp/jid/jid.h"
 #include "xmpp_client.h"
 #include "xmpp_serverinfomanager.h"
+#include "xmpp_xmlcommon.h"
 
 #include <QElapsedTimer>
 #include <QNetworkInterface>
@@ -35,6 +37,7 @@
 
 namespace XMPP { namespace Jingle { namespace ICE {
     const QString NS(QStringLiteral("urn:xmpp:jingle:transports:ice:0"));
+    const QString NS_DTLS(QStringLiteral("urn:xmpp:jingle:apps:dtls:0"));
 
     // TODO: reject offers that don't contain at least one of audio or video
     // TODO: support candidate negotiations over the JingleRtpChannel thread
@@ -104,6 +107,37 @@ namespace XMPP { namespace Jingle { namespace ICE {
         return out;
     }
 
+    static std::array<const char *, 4> fpRoles { { "active", "passive", "actpass", "holdconn" } };
+    struct FingerPrint {
+        enum Setup { Active, Passive, ActPass, HoldConn };
+
+        Hash  hash;
+        Setup setup = Setup(-1);
+
+        FingerPrint(const QDomElement &el)
+        {
+            auto ht = el.attribute(QLatin1String("hash"));
+            hash    = QStringRef(&ht);
+            hash.setData(QByteArray::fromHex(el.text().toLatin1()));
+            auto setupIt = std::find(fpRoles.begin(), fpRoles.end(),
+                                     el.attribute(QLatin1String("setup")).toLatin1().constData());
+            setup        = Setup(setupIt == fpRoles.end() ? -1 : std::distance(fpRoles.begin(), setupIt));
+        }
+        FingerPrint(const Hash &hash, Setup setup) : hash(hash), setup(setup) { }
+
+        inline bool isValid() const
+        {
+            return hash.isValid() && !hash.data().isEmpty() && setup >= Active && setup <= HoldConn;
+        }
+        QDomElement toXml(QDomDocument *doc) const
+        {
+            auto fingerprint = XMLHelper::textTagNS(doc, NS_DTLS, QLatin1String("fingerprint"), hash.data().toHex(':'));
+            fingerprint.setAttribute(QLatin1String("hash"), hash.stringType());
+            fingerprint.setAttribute(QLatin1String("setup"), QLatin1String(fpRoles[setup]));
+            return fingerprint;
+        }
+    };
+
     class Resolver : public QObject {
         Q_OBJECT
         using QObject::QObject;
@@ -275,6 +309,35 @@ namespace XMPP { namespace Jingle { namespace ICE {
         return c;
     }
 
+    static QDomElement candidateToElement(QDomDocument *doc, const XMPP::Ice176::Candidate &c)
+    {
+        QDomElement e = doc->createElement("candidate");
+        e.setAttribute("component", QString::number(c.component));
+        e.setAttribute("foundation", c.foundation);
+        e.setAttribute("generation", QString::number(c.generation));
+        if (!c.id.isEmpty())
+            e.setAttribute("id", c.id);
+        e.setAttribute("ip", c.ip.toString());
+        if (c.network != -1)
+            e.setAttribute("network", QString::number(c.network));
+        else // weird?
+            e.setAttribute("network", QString::number(0));
+        e.setAttribute("port", QString::number(c.port));
+        e.setAttribute("priority", QString::number(c.priority));
+        e.setAttribute("protocol", c.protocol);
+        if (!c.rel_addr.isNull())
+            e.setAttribute("rel-addr", c.rel_addr.toString());
+        if (c.rel_port != -1)
+            e.setAttribute("rel-port", QString::number(c.rel_port));
+        // TODO: remove this?
+        // if(!c.rem_addr.isNull())
+        //    e.setAttribute("rem-addr", c.rem_addr.toString());
+        // if(c.rem_port != -1)
+        //    e.setAttribute("rem-port", QString::number(c.rem_port));
+        e.setAttribute("type", c.type);
+        return e;
+    }
+
     class Connection : public XMPP::Jingle::Connection {
         Q_OBJECT
     public:
@@ -337,7 +400,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
         bool                           offerSent                       = false;
         bool                           waitingAck                      = true;
         bool                           aborted                         = false;
-        bool                           proxyDiscoveryInProgress        = false; // if we have valid proxy requests
+        bool                           initialOfferReady               = false;
         bool                           remoteReportedGatheringComplete = false;
         bool                           iceStarted                      = false;
         quint16                        pendingActions                  = 0;
@@ -356,7 +419,8 @@ namespace XMPP { namespace Jingle { namespace ICE {
         TcpPortDiscoverer *disco        = nullptr;
         UdpPortReserver *  portReserver = nullptr;
         Resolver           resolver;
-        XMPP::Ice176 *     ice = nullptr;
+        XMPP::Ice176 *     ice  = nullptr;
+        XMPP::Dtls *       dtls = nullptr;
 
         QHostAddress extAddr;
         QHostAddress stunBindAddr, stunRelayUdpAddr, stunRelayTcpAddr;
@@ -545,16 +609,20 @@ namespace XMPP { namespace Jingle { namespace ICE {
                 iceStarted = true;
             });
             q->connect(ice, &XMPP::Ice176::error, [this](XMPP::Ice176::Error err) {
-                q->_lastReason = Reason(Reason::Condition::FailedTransport, "ICE failed");
+                q->_lastReason = Reason(Reason::Condition::FailedTransport, QString("ICE failed: %1").arg(err));
                 q->setState(State::Finished);
                 emit q->failed();
             });
             q->connect(ice, &XMPP::Ice176::localCandidatesReady,
                        [this](const QList<XMPP::Ice176::Candidate> &candidates) {
-                           localCandidates = candidates;
-                           if (q->_state >= State::ApprovedToSend)
+                           localCandidates += candidates;
+                           if (q->_state >= State::Unacked)
                                emit q->updated();
                        });
+            q->connect(ice, &XMPP::Ice176::localGatheringComplete, [this]() {
+                initialOfferReady = true;
+                emit q->updated();
+            });
             QObject::connect(
                 ice, &XMPP::Ice176::componentReady, q,
                 [this](int componentIdx) {
@@ -714,106 +782,48 @@ namespace XMPP { namespace Jingle { namespace ICE {
     {
         qDebug("taking outgoing update");
         OutgoingTransportInfoUpdate upd;
-        if (!isValid()) {
+        if (!isValid() || _state < State::ApprovedToSend || (_state == State::ApprovedToSend && !d->initialOfferReady)
+            || (_state > State::ApprovedToSend && d->localCandidates.isEmpty())) {
             return upd;
         }
 
-        auto makeUpdate = [&](QDomElement tel, std::function<void()> cb = std::function<void()>()) {
-            d->waitingAck = true;
-            return OutgoingTransportInfoUpdate { tel, [this, cb, trptr = QPointer<Transport>(d->q)](bool success) {
-                                                    if (!success || !trptr)
-                                                        return;
-                                                    d->waitingAck = false;
-                                                    if (cb)
-                                                        cb();
-                                                } };
-        };
+        auto        doc = _pad.staticCast<Pad>()->session()->manager()->client()->doc();
+        QDomElement tel = doc->createElementNS(NS, "transport");
+        tel.setAttribute(QLatin1String("pwd"), d->ice->localPassword());
+        tel.setAttribute(QLatin1String("ufrag"), d->ice->localUfrag());
+        if (d->dtls) {
+            tel.appendChild(
+                FingerPrint(d->dtls->fingerprint(),
+                            _pad->session()->role() == Origin::Initiator ? FingerPrint::ActPass : FingerPrint::Active)
+                    .toXml(doc));
+        }
 
-        auto doc = _pad.staticCast<Pad>()->session()->manager()->client()->doc();
+        for (auto const &cand : d->localCandidates) {
+            tel.appendChild(candidateToElement(doc, cand));
+        }
 
-        QDomElement tel = doc->createElementNS(NS, "transport");
-        // tel.setAttribute(QStringLiteral("sid"), d->sid);
-
-        // check where we make initial offer
-        bool noPending = (d->localCandidates.isEmpty() && !d->proxyDiscoveryInProgress
-                          && !(d->disco && d->disco->inProgressPortTypes()));
-        bool initial   = _state == State::ApprovedToSend && !d->offerSent
-            && ((!d->pendingActions && noPending) || d->pendingActions & Private::NewCandidate);
-
-        if (initial) {
-            d->offerSent = true;
-        }
-
-        if (d->pendingActions & Private::NewCandidate) {
-            d->pendingActions &= ~Private::NewCandidate;
-            QList<XMPP::Ice176::Candidate> candidatesToSend;
-            for (auto &c : d->localCandidates) {
-                //                if (c.state() != Candidate::New) {
-                //                    continue;
-                //                }
-                //                if (c.type() == Candidate::Proxy) {
-                //                    useProxy = true;
-                //                }
-                //                qDebug("sending local candidate: cid=%s", qPrintable(c.cid()));
-                //                tel.appendChild(c.toXml(doc));
-                //                candidatesToSend.append(c);
-                //                c.setState(Candidate::Unacked);
-            }
-            if (!candidatesToSend.isEmpty()) {
-                upd = makeUpdate(tel, [this, candidatesToSend, initial]() mutable {
-                    if (initial) {
-                        _state = _creator == _pad->session()->role() ? State::Pending : State::Accepted;
-                    }
-                    // d->checkAndFinishNegotiation();
-                });
-            } else {
-                qWarning("Got NewCandidate pending action but no candidate to send");
+        if (d->pendingActions & Private::GatheringComplete) {
+            tel.appendChild(doc->createElement(QLatin1String("gathering-complete")));
+            d->pendingActions &= ~Private::GatheringComplete;
+        }
+
+        if (d->pendingActions & Private::RemoteCandidate) {
+            for (auto const &c : d->ice->selectedCandidates()) {
+                auto rc = doc->createElement(QLatin1String("remote-candidate"));
+                rc.setAttribute(QLatin1String("component"), c.componentId);
+                rc.setAttribute(QLatin1String("ip"), c.ip.toString());
+                rc.setAttribute(QLatin1String("port"), c.port);
+                tel.appendChild(rc);
             }
-        } else if (d->pendingActions & Private::RemoteCandidate) {
             d->pendingActions &= ~Private::RemoteCandidate;
-            // we should have the only remote candidate in Pending state.
-            // all other has to be discarded by priority check
-            for (auto &c : d->remoteCandidates) {
-                //                if (c.state() != Candidate::Pending) {
-                //                    continue;
-                //                }
-                //                qDebug("sending candidate-used: cid=%s", qPrintable(c.cid()));
-                auto el = tel.appendChild(doc->createElement(QStringLiteral("remote-candidate"))).toElement();
-                // el.setAttribute(QStringLiteral("cid"), c.cid());
-                // c.setState(Candidate::Unacked);
-
-                upd = makeUpdate(tel, [this, c]() mutable {
-                    //                    if (c.state() == Candidate::Unacked) {
-                    //                        c.setState(Candidate::Accepted);
-                    //                        qDebug("ack: sending candidate-used: cid=%s", qPrintable(c.cid()));
-                    //                        d->remoteUsedCandidate = c;
-                    //                    }
-                    // d->checkAndFinishNegotiation();
-                });
-                break;
-            }
-            if (std::get<0>(upd).isNull()) {
-                qWarning("Got CandidateUsed pending action but no pending candidates");
-            }
-        } else if (d->pendingActions & Private::GatheringComplete) {
-            d->pendingActions &= ~Private::GatheringComplete;
-            qDebug("sending gathering-complete");
-            // we are here because all remote are already in Discardd state
-            tel.appendChild(doc->createElement(QStringLiteral("gathering-complete")));
-            upd = makeUpdate(tel, [this]() mutable {
-                // d->localReportedGatheringComplete = true;
-                // d->checkAndFinishNegotiation();
-            });
-        } else {
-            qDebug("sending empty transport-info");
-            upd = makeUpdate(tel, [this, initial]() mutable {
-                if (initial) {
-                    _state = _creator == _pad->session()->role() ? State::Pending : State::Accepted;
-                }
-            });
         }
 
-        return upd; // TODO
+        d->waitingAck = true;
+        return OutgoingTransportInfoUpdate { tel, [this, trptr = QPointer<Transport>(d->q)](bool success) {
+                                                if (!success || !trptr)
+                                                    return;
+                                                d->waitingAck = false;
+                                            } };
     }
 
     bool Transport::isValid() const { return d != nullptr; }
@@ -886,7 +896,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
 
     void Manager::closeAll() { emit abortAllRequested(); }
 
-    QStringList Manager::discoFeatures() const { return { NS }; }
+    QStringList Manager::discoFeatures() const { return { NS, NS_DTLS }; }
 
     void Manager::setBasePort(int port) { d->basePort = port; }
 
@@ -929,7 +939,8 @@ namespace XMPP { namespace Jingle { namespace ICE {
         d->stunProxy = tproxy;
     }
 
-    // void Manager::addKeyMapping(const QString &key, Transport *transport) { d->key2transport.insert(key, transport);
+    // void Manager::addKeyMapping(const QString &key, Transport *transport) { d->key2transport.insert(key,
+    // transport);
     // }
 
     // void Manager::removeKeyMapping(const QString &key) { d->key2transport.remove(key); }
@@ -937,8 +948,9 @@ namespace XMPP { namespace Jingle { namespace ICE {
     //    QString Manager::generateSid(const Jid &remote)
     //    {
     //        auto servers =
-    //        d->jingleManager->client()->tcpPortReserver()->scope(QString::fromLatin1("s5b"))->allServers(); QString
-    //        sid; QPair<Jid, QString> key; QString             key1; QString             key2; auto servChecker =
+    //        d->jingleManager->client()->tcpPortReserver()->scope(QString::fromLatin1("s5b"))->allServers();
+    //        QString sid; QPair<Jid, QString> key; QString             key1; QString             key2; auto
+    //        servChecker =
     //        [&](const TcpPortServer::Ptr &s) {
     //            return s.staticCast<S5BServer>()->hasKey(key1) || s.staticCast<S5BServer>()->hasKey(key2);
     //        };

From 0c0d97646d7c1a93e6faa423105fd7ff8b5992fd Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 15 Nov 2020 21:46:24 +0300
Subject: [PATCH 261/383] make jingle transports' channels a common jingle
 framework feature

---
 src/irisnet/noncore/ice176.cpp          |   1 +
 src/xmpp/xmpp-im/client.cpp             |   2 +-
 src/xmpp/xmpp-im/jingle-application.cpp |  22 +++-
 src/xmpp/xmpp-im/jingle-application.h   |   4 +
 src/xmpp/xmpp-im/jingle-ft.cpp          |  17 +++-
 src/xmpp/xmpp-im/jingle-ibb.cpp         |  37 +++----
 src/xmpp/xmpp-im/jingle-ibb.h           |   3 +-
 src/xmpp/xmpp-im/jingle-ice.cpp         | 128 ++++++++++++------------
 src/xmpp/xmpp-im/jingle-ice.h           |   3 +-
 src/xmpp/xmpp-im/jingle-s5b.cpp         |  46 +++++----
 src/xmpp/xmpp-im/jingle-s5b.h           |   8 +-
 src/xmpp/xmpp-im/jingle-transport.cpp   |   2 +
 src/xmpp/xmpp-im/jingle-transport.h     |   8 +-
 src/xmpp/xmpp-im/jingle.h               |   5 +-
 14 files changed, 165 insertions(+), 121 deletions(-)

diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index 7541323b..f58e1679 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -679,6 +679,7 @@ class Ice176::Private : public QObject {
 
     void flagComponentAsLowOverhead(int componentIndex)
     {
+        Q_ASSERT(size_t(componentIndex) < components.size());
         // FIXME: ok to assume in order?
         Component &c  = components[componentIndex];
         c.lowOverhead = true;
diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
index ca73353f..137fd77f 100644
--- a/src/xmpp/xmpp-im/client.cpp
+++ b/src/xmpp/xmpp-im/client.cpp
@@ -181,7 +181,7 @@ Client::Client(QObject *par) : QObject(par)
     d->jingleICEManager = new Jingle::ICE::Manager(d->jingleManager);
     d->jingleManager->registerTransport(Jingle::S5B::NS, d->jingleS5BManager);
     d->jingleManager->registerTransport(Jingle::IBB::NS, d->jingleIBBManager);
-    // d->jingleManager->registerTransport(Jingle::ICE::NS, d->jingleICEManager);
+    d->jingleManager->registerTransport(Jingle::ICE::NS, d->jingleICEManager);
 }
 
 Client::~Client()
diff --git a/src/xmpp/xmpp-im/jingle-application.cpp b/src/xmpp/xmpp-im/jingle-application.cpp
index 220d34d9..e3a5dc71 100644
--- a/src/xmpp/xmpp-im/jingle-application.cpp
+++ b/src/xmpp/xmpp-im/jingle-application.cpp
@@ -22,6 +22,8 @@
 #include "xmpp_client.h"
 #include "xmpp_task.h"
 
+#include <QTimer>
+
 namespace XMPP { namespace Jingle {
     //----------------------------------------------------------------------------
     // Application
@@ -276,14 +278,24 @@ namespace XMPP { namespace Jingle {
         }
 
         _transport = transport;
-        connect(transport.data(), &Transport::updated, this, &Application::updated);
-        connect(transport.data(), &Transport::failed, this, [this]() { selectNextTransport(); });
 
-        initTransport();
+        if (!transportInitTimer) {
+            transportInitTimer = new QTimer(this);
+            transportInitTimer->setSingleShot(true);
+            transportInitTimer->setInterval(0);
+            connect(transportInitTimer, &QTimer::timeout, this, [this]() {
+                connect(_transport.data(), &Transport::updated, this, &Application::updated);
+                connect(_transport.data(), &Transport::failed, this, [this]() { selectNextTransport(); });
+
+                initTransport();
 
-        if (_state >= State::Unacked) {
-            _transport->prepare();
+                if (_state >= State::ApprovedToSend) {
+                    _transport->prepare();
+                }
+            });
         }
+        transportInitTimer->start();
+
         return true;
     }
 
diff --git a/src/xmpp/xmpp-im/jingle-application.h b/src/xmpp/xmpp-im/jingle-application.h
index 5ba5fba6..42f60ca6 100644
--- a/src/xmpp/xmpp-im/jingle-application.h
+++ b/src/xmpp/xmpp-im/jingle-application.h
@@ -22,6 +22,8 @@
 
 #include "jingle-transport.h"
 
+class QTimer;
+
 namespace XMPP { namespace Jingle {
 
     class ApplicationManager;
@@ -172,6 +174,8 @@ namespace XMPP { namespace Jingle {
 
         // evaluated update to be sent
         Update _update;
+
+        QTimer *transportInitTimer = nullptr;
     };
 
     inline bool operator<(const Application::Update &a, const Application::Update &b)
diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index b3805361..497d122b 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -554,7 +554,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
             new NSTransportsList(pad->session(), static_cast<Manager *>(pad->manager())->availableTransports()));
     }
 
-    Application::~Application() { }
+    Application::~Application() { qDebug("jingle-ft: destroyed"); }
 
     void Application::setState(State state) { d->setState(state); }
 
@@ -645,7 +645,20 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
 
     void Application::initTransport()
     {
-        d->connection = _transport->addChannel(TransportFeature::Reliable | TransportFeature::DataOriented);
+        if (_creator == _pad->session()->role()) {
+            d->connection = _transport->addChannel(TransportFeature::Reliable | TransportFeature::DataOriented);
+        } else {
+            auto const &channels = _transport->channels();
+            if (channels.size()) {
+                d->connection = channels[0];
+            }
+        }
+        if (!d->connection) {
+            _transport->stop();
+            qWarning("No channel on %s transport", qPrintable(_transport->pad()->ns()));
+            selectNextTransport();
+            return;
+        }
         connect(d->connection.data(), &Connection::connected, this, [this]() {
             d->lastReason = Reason();
             d->lastError.reset();
diff --git a/src/xmpp/xmpp-im/jingle-ibb.cpp b/src/xmpp/xmpp-im/jingle-ibb.cpp
index 68abb314..036f953f 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.cpp
+++ b/src/xmpp/xmpp-im/jingle-ibb.cpp
@@ -97,9 +97,6 @@ namespace XMPP { namespace Jingle { namespace IBB {
             state = State::Finished;
         }
 
-    signals:
-        void connected();
-
     protected:
         qint64 writeData(const char *data, qint64 maxSize) { return connection->write(data, maxSize); }
 
@@ -135,7 +132,6 @@ namespace XMPP { namespace Jingle { namespace IBB {
     struct Transport::Private {
         Transport *                               q = nullptr;
         QMap<QString, QSharedPointer<Connection>> connections;
-        QList<QSharedPointer<Connection>>         readyConnections;
         size_t                                    defaultBlockSize = 4096;
         bool                                      started          = false;
 
@@ -172,14 +168,6 @@ namespace XMPP { namespace Jingle { namespace IBB {
             QObject::connect(ibbConn.data(), &Connection::connectionClosed, q, [this]() {
                 Connection *c = static_cast<Connection *>(q->sender());
                 connections.remove(c->sid);
-                QMutableListIterator<QSharedPointer<Connection>> it(readyConnections);
-                while (it.hasNext()) {
-                    auto &p = it.next();
-                    if (p.data() == c) {
-                        it.remove();
-                        break;
-                    }
-                }
             });
 
             return ibbConn;
@@ -202,6 +190,7 @@ namespace XMPP { namespace Jingle { namespace IBB {
     Transport::~Transport()
     {
         // we have to mark all of them as finished just in case they are captured somewhere else
+        qDebug("jingle-ibb: destroy");
         if (d) {
             for (auto &c : d->connections) {
                 c->close();
@@ -212,13 +201,8 @@ namespace XMPP { namespace Jingle { namespace IBB {
     void Transport::prepare()
     {
         setState(State::ApprovedToSend);
-        if (_creator == _pad->session()->role()) { // outgoing
-            auto c   = d->newStream(QString(), d->defaultBlockSize, _pad->session()->role());
+        for (auto &c : d->connections) {
             c->state = State::ApprovedToSend;
-        } else {
-            for (auto &c : d->connections) {
-                c->state = State::ApprovedToSend;
-            }
         }
         emit updated();
     }
@@ -351,15 +335,26 @@ namespace XMPP { namespace Jingle { namespace IBB {
 
     TransportFeatures Transport::features() const
     {
-        return TransportFeature::AlwaysConnect | TransportFeature::Reliable | TransportFeature::DataOriented;
+        return TransportFeature::AlwaysConnect | TransportFeature::Reliable | TransportFeature::StreamOriented
+            | TransportFeature::DataOriented;
     }
 
     int Transport::maxSupportedChannels() const { return -1; }
 
     Connection::Ptr Transport::addChannel(TransportFeatures features) const
     {
-        return d->readyConnections.isEmpty() ? Connection::Ptr()
-                                             : d->readyConnections.takeFirst().staticCast<XMPP::Jingle::Connection>();
+        Q_UNUSED(features); // IBB can't build different channels depending on features
+        return d->newStream(QString(), d->defaultBlockSize, _pad->session()->role());
+    }
+
+    std::vector<XMPP::Jingle::Connection::Ptr> Transport::channels() const
+    {
+        std::vector<Connection::Ptr> ret;
+        ret.reserve(d->connections.size());
+        for (auto const &v : d->connections) {
+            ret.push_back(v);
+        }
+        return ret;
     }
 
     Pad::Pad(Manager *manager, Session *session)
diff --git a/src/xmpp/xmpp-im/jingle-ibb.h b/src/xmpp/xmpp-im/jingle-ibb.h
index c5db951c..c698fee0 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.h
+++ b/src/xmpp/xmpp-im/jingle-ibb.h
@@ -43,7 +43,8 @@ namespace Jingle { namespace IBB {
         TransportFeatures           features() const override;
         int                         maxSupportedChannels() const override;
 
-        Connection::Ptr addChannel(TransportFeatures features = TransportFeatures()) const override;
+        Connection::Ptr              addChannel(TransportFeatures features = TransportFeatures()) const override;
+        std::vector<Connection::Ptr> channels() const override;
 
     private:
         friend class Manager;
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index b250069a..a5494caf 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -107,6 +107,24 @@ namespace XMPP { namespace Jingle { namespace ICE {
         return out;
     }
 
+    struct SctpKeeper {
+        using Ptr = std::shared_ptr<SctpKeeper>;
+
+        static std::weak_ptr<SctpKeeper> instance;
+        SctpKeeper() { DepUsrSCTP::ClassInit(); }
+        ~SctpKeeper() { DepUsrSCTP::ClassDestroy(); }
+        static Ptr use()
+        {
+            auto i = instance.lock();
+            if (!i) {
+                i        = std::make_shared<SctpKeeper>();
+                instance = i;
+            }
+            return i;
+        }
+    };
+    std::weak_ptr<SctpKeeper> SctpKeeper::instance;
+
     static std::array<const char *, 4> fpRoles { { "active", "passive", "actpass", "holdconn" } };
     struct FingerPrint {
         enum Setup { Active, Passive, ActPass, HoldConn };
@@ -198,7 +216,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
             printf("IceStopper done\n");
         }
 
-        void start(XMPP::UdpPortReserver *_portReserver, const QList<XMPP::Ice176 *> iceList)
+        void start(XMPP::UdpPortReserver *_portReserver, const QList<Ice176 *> iceList)
         {
             if (_portReserver) {
                 portReserver = _portReserver;
@@ -206,12 +224,12 @@ namespace XMPP { namespace Jingle { namespace ICE {
             }
             left = iceList;
 
-            for (XMPP::Ice176 *ice : left) {
+            for (Ice176 *ice : left) {
                 ice->setParent(this);
 
                 // TODO: error() also?
-                connect(ice, SIGNAL(stopped()), SLOT(ice_stopped()));
-                connect(ice, SIGNAL(error(XMPP::Ice176::Error)), SLOT(ice_error(XMPP::Ice176::Error)));
+                connect(ice, &Ice176::stopped, this, &IceStopper::ice_stopped);
+                connect(ice, &Ice176::error, this, &IceStopper::ice_error);
                 ice->stop();
             }
 
@@ -260,6 +278,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
         QString stunRelayTcpPass;
 
         XMPP::TurnClient::Proxy stunProxy;
+        SctpKeeper::Ptr         sctpInstance;
 
         // FIMME it's reuiqred to split transports by direction otherwise we gonna hit conflicts.
         // jid,transport-sid -> transport mapping
@@ -383,7 +402,11 @@ namespace XMPP { namespace Jingle { namespace ICE {
     private:
         friend class Transport;
 
-        void onConnected(Ice176 *ice) { emit connected(); }
+        void onConnected(Ice176 *ice)
+        {
+            qDebug("ice channel connected!");
+            emit connected();
+        }
 
         void enqueueIncomingUDP(const QByteArray &data)
         {
@@ -439,7 +462,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
 
         void flushRemoteCandidates()
         {
-            if (q->_state < State::ApprovedToSend || q->_state == State::Finished)
+            if (!ice || q->_state < State::ApprovedToSend || q->_state == State::Finished)
                 return;
             ice->setPeerUfrag(remoteUfrag);
             ice->setPeerPassword(remotePassword);
@@ -469,7 +492,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
                 remoteCandidates.append(ic); // TODO check for collisions!
                 candidatesAdded++;
             }
-            if (candidatesAdded) {
+            if (candidatesAdded && ice) {
                 QTimer::singleShot(0, q, [this]() { flushRemoteCandidates(); });
                 return true;
             }
@@ -595,7 +618,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
                     printf("  %s\n", qPrintable(s));
             }
 
-            ice = new XMPP::Ice176(q);
+            ice = new Ice176(q);
 
             iceStarted = false;
             //            iceA_status.channelsReady.resize(2);
@@ -603,8 +626,14 @@ namespace XMPP { namespace Jingle { namespace ICE {
             //            iceA_status.channelsReady[1] = false;
 
             q->connect(ice, &XMPP::Ice176::started, [this]() {
+                QSet<int> lowOverhead;
                 for (auto &c : channels) {
-                    ice->flagComponentAsLowOverhead((c->hints() & Connection::AvoidRelays) ? 0 : 1);
+                    if (!(c->hints() & Connection::AvoidRelays)) {
+                        lowOverhead.insert(c->channelIndex);
+                    }
+                }
+                for (auto componentIndex : lowOverhead) {
+                    ice->flagComponentAsLowOverhead(componentIndex);
                 }
                 iceStarted = true;
             });
@@ -615,21 +644,19 @@ namespace XMPP { namespace Jingle { namespace ICE {
             });
             q->connect(ice, &XMPP::Ice176::localCandidatesReady,
                        [this](const QList<XMPP::Ice176::Candidate> &candidates) {
+                           pendingActions |= NewCandidate;
                            localCandidates += candidates;
-                           if (q->_state >= State::Unacked)
-                               emit q->updated();
+                           emit q->updated();
                        });
             q->connect(ice, &XMPP::Ice176::localGatheringComplete, [this]() {
-                initialOfferReady = true;
+                pendingActions |= GatheringComplete;
                 emit q->updated();
             });
             QObject::connect(
-                ice, &XMPP::Ice176::componentReady, q,
-                [this](int componentIdx) {
+                ice, &XMPP::Ice176::readyToSendMedia, q,
+                [this]() {
                     for (auto &c : channels) {
-                        if (c->channelIndex == componentIdx) {
-                            c->onConnected(ice);
-                        }
+                        c->onConnected(ice);
                     }
                 },
                 Qt::QueuedConnection); // signal is not DOR-SS
@@ -706,10 +733,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
         });
     }
 
-    Transport::~Transport()
-    {
-        if (d) { }
-    }
+    Transport::~Transport() { qDebug("jingle-ice: destroyed"); }
 
     void Transport::prepare()
     {
@@ -780,13 +804,12 @@ namespace XMPP { namespace Jingle { namespace ICE {
 
     OutgoingTransportInfoUpdate Transport::takeOutgoingUpdate()
     {
-        qDebug("taking outgoing update");
         OutgoingTransportInfoUpdate upd;
-        if (!isValid() || _state < State::ApprovedToSend || (_state == State::ApprovedToSend && !d->initialOfferReady)
-            || (_state > State::ApprovedToSend && d->localCandidates.isEmpty())) {
+        if (!hasUpdates() || _state < State::ApprovedToSend || (isRemote() && _state == State::Pending)) {
             return upd;
         }
 
+        qDebug("jingle-ice: taking outgoing update");
         auto        doc = _pad.staticCast<Pad>()->session()->manager()->client()->doc();
         QDomElement tel = doc->createElementNS(NS, "transport");
         tel.setAttribute(QLatin1String("pwd"), d->ice->localPassword());
@@ -840,7 +863,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
         // if time-oriented - likely rtp
         // if data-oriented - likely sctp
 
-        if (_state >= State::ApprovedToSend) {
+        if (!((isLocal() && _state == State::Created) || (isRemote() && _state == State::Pending))) {
             qWarning("Adding channel after negotiation start is not yet supported");
             return Connection::Ptr();
         }
@@ -860,15 +883,27 @@ namespace XMPP { namespace Jingle { namespace ICE {
         return conn.staticCast<XMPP::Jingle::Connection>();
     }
 
+    std::vector<XMPP::Jingle::Connection::Ptr> Transport::channels() const
+    {
+        std::vector<Connection::Ptr> ret;
+        ret.reserve(d->channels.size());
+        for (auto const &v : d->channels) {
+            ret.push_back(v);
+        }
+        return ret;
+    }
+
     //----------------------------------------------------------------
     // Manager
     //----------------------------------------------------------------
-    Manager::Manager(QObject *parent) : TransportManager(parent), d(new Private) { }
+    Manager::Manager(QObject *parent) : TransportManager(parent), d(new Private)
+    {
+        d->sctpInstance = SctpKeeper::use();
+    }
 
     Manager::~Manager()
     {
         if (d->jingleManager) {
-            DepUsrSCTP::ClassDestroy();
             d->jingleManager->unregisterTransport(NS);
         }
     }
@@ -879,13 +914,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
             | TransportFeature::MessageOriented | TransportFeature::DataOriented | TransportFeature::TimeOriented;
     }
 
-    void Manager::setJingleManager(XMPP::Jingle::Manager *jm)
-    {
-        d->jingleManager = jm;
-        if (jm) {
-            DepUsrSCTP::ClassInit();
-        }
-    }
+    void Manager::setJingleManager(XMPP::Jingle::Manager *jm) { d->jingleManager = jm; }
 
     QSharedPointer<XMPP::Jingle::Transport> Manager::newTransport(const TransportManagerPad::Ptr &pad, Origin creator)
     {
@@ -939,37 +968,6 @@ namespace XMPP { namespace Jingle { namespace ICE {
         d->stunProxy = tproxy;
     }
 
-    // void Manager::addKeyMapping(const QString &key, Transport *transport) { d->key2transport.insert(key,
-    // transport);
-    // }
-
-    // void Manager::removeKeyMapping(const QString &key) { d->key2transport.remove(key); }
-
-    //    QString Manager::generateSid(const Jid &remote)
-    //    {
-    //        auto servers =
-    //        d->jingleManager->client()->tcpPortReserver()->scope(QString::fromLatin1("s5b"))->allServers();
-    //        QString sid; QPair<Jid, QString> key; QString             key1; QString             key2; auto
-    //        servChecker =
-    //        [&](const TcpPortServer::Ptr &s) {
-    //            return s.staticCast<S5BServer>()->hasKey(key1) || s.staticCast<S5BServer>()->hasKey(key2);
-    //        };
-
-    //        do {
-    //            sid  = QString("s5b_%1").arg(qrand() & 0xffff, 4, 16, QChar('0'));
-    //            key  = qMakePair(remote, sid);
-    //            key1 = makeKey(sid, remote, d->jingleManager->client()->jid());
-    //            key2 = makeKey(sid, d->jingleManager->client()->jid(), remote);
-    //        } while (d->sids.contains(key) || std::find_if(servers.begin(), servers.end(), servChecker) !=
-    //        servers.end()); return sid;
-    //    }
-
-    // void Manager::registerSid(const Jid &remote, const QString &sid) { d->sids.insert(qMakePair(remote, sid)); }
-
-    // Jid Manager::userProxy() const { return d->proxy; }
-
-    // void Manager::setUserProxy(const Jid &jid) { d->proxy = jid; }
-
     //----------------------------------------------------------------
     // Pad
     //----------------------------------------------------------------
diff --git a/src/xmpp/xmpp-im/jingle-ice.h b/src/xmpp/xmpp-im/jingle-ice.h
index 2c178a69..7bf8eeb4 100644
--- a/src/xmpp/xmpp-im/jingle-ice.h
+++ b/src/xmpp/xmpp-im/jingle-ice.h
@@ -140,7 +140,8 @@ namespace Jingle { namespace ICE {
         TransportFeatures           features() const override;
         int                         maxSupportedChannels() const override;
 
-        Connection::Ptr addChannel(TransportFeatures features = TransportFeatures()) const override;
+        Connection::Ptr              addChannel(TransportFeatures features = TransportFeatures()) const override;
+        std::vector<Connection::Ptr> channels() const override;
 
     private:
         friend class Manager;
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 4274de5a..cac771a1 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -50,20 +50,25 @@ namespace XMPP { namespace Jingle { namespace S5B {
         Q_OBJECT
 
         QList<NetworkDatagram> datagrams;
-        SocksClient *          client;
-        Transport::Mode        mode;
+        SocksClient *          client = nullptr;
+        Transport::Mode        mode   = Transport::Tcp;
 
     public:
-        Connection(SocksClient *client, Transport::Mode mode) : client(client), mode(mode)
+        void setSocksClient(SocksClient *client, Transport::Mode mode)
         {
+            if (!client->isOpen()) {
+                qCritical("Failed to set closed SockClient connection %p", client);
+                return;
+            }
+
+            this->client = client;
+            this->mode   = mode;
+
             connect(client, &SocksClient::readyRead, this, &Connection::readyRead);
             connect(client, &SocksClient::bytesWritten, this, &Connection::bytesWritten);
             connect(client, &SocksClient::aboutToClose, this, &Connection::aboutToClose);
-            if (client->isOpen()) {
-                setOpenMode(client->openMode());
-            } else {
-                qWarning("Creating S5B Transport connection on closed SockClient connection %p", client);
-            }
+            setOpenMode(client->openMode());
+            emit connected();
         }
 
         bool hasPendingDatagrams() const { return datagrams.size() > 0; }
@@ -82,13 +87,15 @@ namespace XMPP { namespace Jingle { namespace S5B {
                 return 0;
         }
 
-        qint64 bytesToWrite() const { return client->bytesToWrite(); }
+        qint64 bytesToWrite() const { return client ? client->bytesToWrite() : 0; }
 
         void close()
         {
-            if (client) {
-                client->disconnect(this);
+            if (!client) {
+                // was never opened
+                return;
             }
+            client->disconnect(this);
             XMPP::Jingle::Connection::close();
             client->deleteLater();
             client = nullptr;
@@ -601,6 +608,8 @@ namespace XMPP { namespace Jingle { namespace S5B {
         quint16      udpPort;
         QHostAddress udpAddress;
 
+        Private() : connection(QSharedPointer<Connection>::create()) { }
+
         inline Jid remoteJid() const { return q->_pad->session()->peer(); }
 
         QString generateCid() const
@@ -1107,7 +1116,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
                 if (c.isValid() && !isDup(c) && c.priority()) {
                     QObject::connect(s5bserv.data(), &S5BServer::incomingConnection, q,
                                      [this, c](SocksClient *sc, const QString &key) mutable {
-                                         if (!connection && key == directAddr
+                                         if (!connection->client && key == directAddr
                                              && (c.state() == Candidate::Pending || c.state() == Candidate::Unacked)) {
                                              c.incomingConnection(sc);
                                              c.server().data()->disconnect(q); // drop this connection.
@@ -1118,7 +1127,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
                                              return;
                                          }
                                          qDebug("Reject incoming socks5 connection with key %s (%s)", qPrintable(key),
-                                                connection ? "already has connection" : "key mismatch");
+                                                connection->client ? "already has connection" : "key mismatch");
                                          sc->requestDeny();
                                          sc->deleteLater();
                                      });
@@ -1126,7 +1135,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
                         s5bserv.data(), &S5BServer::incomingUdp, q,
                         [this, c](bool isInit, const QHostAddress &addr, int sourcePort, const QString &key,
                                   const QByteArray &data) {
-                            if (mode != Transport::Mode::Udp || !connection) {
+                            if (mode != Transport::Mode::Udp || !connection->client) {
                                 return false;
                             }
 
@@ -1170,7 +1179,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
 
         void handleConnected(Candidate &connCand)
         {
-            connection.reset(new Connection(connCand.takeSocksClient(), mode));
+            connection->setSocksClient(connCand.takeSocksClient(), mode);
             probingTimer.stop();
             negotiationFinishTimer.stop();
             proxyDiscoveryInProgress = false;
@@ -1640,11 +1649,14 @@ namespace XMPP { namespace Jingle { namespace S5B {
 
     QString Transport::directAddr() const { return d->directAddr; }
 
-    Connection::Ptr Transport::addChannel(TransportFeatures features) const
+    XMPP::Jingle::Connection::Ptr Transport::addChannel(TransportFeatures features) const
     {
-        return d->connection.staticCast<XMPP::Jingle::Connection>();
+        Q_UNUSED(features); // no way create something depending on features
+        return d->connection;
     }
 
+    std::vector<XMPP::Jingle::Connection::Ptr> Transport::channels() const { return { { d->connection } }; }
+
     //----------------------------------------------------------------
     // Manager
     //----------------------------------------------------------------
diff --git a/src/xmpp/xmpp-im/jingle-s5b.h b/src/xmpp/xmpp-im/jingle-s5b.h
index 81705015..167e28c7 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.h
+++ b/src/xmpp/xmpp-im/jingle-s5b.h
@@ -141,9 +141,11 @@ namespace Jingle { namespace S5B {
         bool                        isValid() const override;
         TransportFeatures           features() const override;
 
-        QString         sid() const;
-        QString         directAddr() const;
-        Connection::Ptr addChannel(TransportFeatures features = TransportFeatures()) const override;
+        QString sid() const;
+        QString directAddr() const;
+
+        Connection::Ptr              addChannel(TransportFeatures features = TransportFeatures()) const override;
+        std::vector<Connection::Ptr> channels() const override;
 
     private:
         friend class Manager;
diff --git a/src/xmpp/xmpp-im/jingle-transport.cpp b/src/xmpp/xmpp-im/jingle-transport.cpp
index 8fe6eb8b..68020656 100644
--- a/src/xmpp/xmpp-im/jingle-transport.cpp
+++ b/src/xmpp/xmpp-im/jingle-transport.cpp
@@ -33,6 +33,8 @@ namespace XMPP { namespace Jingle {
 
     bool Transport::isRemote() const { return _pad->session()->role() != _creator; }
 
+    void Transport::stop() { _state = State::Finished; }
+
     int Transport::maxSupportedChannels() const { return 1; }
 
     void Transport::setState(State newState)
diff --git a/src/xmpp/xmpp-im/jingle-transport.h b/src/xmpp/xmpp-im/jingle-transport.h
index 4ac520a4..65466816 100644
--- a/src/xmpp/xmpp-im/jingle-transport.h
+++ b/src/xmpp/xmpp-im/jingle-transport.h
@@ -115,15 +115,17 @@ namespace XMPP { namespace Jingle {
         virtual void start() = 0; // for local transport start searching for candidates (including probing proxy,stun
                                   // etc) for remote transport try to connect to all proposed hosts in order their
                                   // priority. in-band transport may just emit updated() here
+        virtual void stop();
         virtual bool update(const QDomElement &el) = 0; // accepts transport element on incoming transport-info
         virtual bool hasUpdates() const            = 0;
         virtual OutgoingTransportInfoUpdate takeOutgoingUpdate() = 0;
         virtual bool                        isValid() const      = 0;
 
         // returns all the available transport features while addChannel() can use just a subset of them
-        virtual TransportFeatures features() const = 0;
-        virtual int               maxSupportedChannels() const;
-        virtual Connection::Ptr   addChannel(TransportFeatures features = TransportFeatures()) const = 0;
+        virtual TransportFeatures            features() const = 0;
+        virtual int                          maxSupportedChannels() const;
+        virtual Connection::Ptr              addChannel(TransportFeatures features = TransportFeatures()) const = 0;
+        virtual std::vector<Connection::Ptr> channels() const                                                   = 0;
     signals:
         void updated(); // found some candidates and they have to be sent. takeUpdate has to be called from this signal
                         // handler. if it's just always ready then signal has to be sent at least once otherwise
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index 55a7243e..6bdb37ea 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -86,7 +86,8 @@ namespace Jingle {
       * Finished          - In failure case: Needs to report transport failure / replace / reject
 
      Remote transport states (remote initial offer or remote transport-replace):
-      * Created           - initial: local user hasn't accepted yet the offer
+      * Created           - short-term state before the initial offer has been parsed
+      * Pending           - initial: local user hasn't accepted yet the offer
       *                     replace: remote changes its own offer before local accepted anything
       * ApprovedToSend    - initial/replace: user accepted the offer. we are preparing our response
       * Unacked           - no iq "result" yet
@@ -147,7 +148,7 @@ namespace Jingle {
 
         // exclusive
         StreamOriented  = 0x200,
-        MessageOriented = 0x400, // if not set then it's stream oriented
+        MessageOriented = 0x400,
 
         // exclusive
         DataOriented = 0x800, // the goal is to deliver data

From 48b554f3692e1f736f82534f43625a4b29b963d2 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 16 Nov 2020 01:35:33 +0300
Subject: [PATCH 262/383] Early transport replace on the responder side is in
 progress

---
 src/xmpp/xmpp-im/client.cpp             |  2 +-
 src/xmpp/xmpp-im/jingle-application.cpp | 10 ++++++-
 src/xmpp/xmpp-im/jingle-application.h   |  2 ++
 src/xmpp/xmpp-im/jingle-ft.cpp          | 13 ++++----
 src/xmpp/xmpp-im/jingle-s5b.cpp         |  6 +++-
 src/xmpp/xmpp-im/jingle-session.cpp     | 40 ++++++++++++++++++++-----
 6 files changed, 58 insertions(+), 15 deletions(-)

diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
index 137fd77f..ca73353f 100644
--- a/src/xmpp/xmpp-im/client.cpp
+++ b/src/xmpp/xmpp-im/client.cpp
@@ -181,7 +181,7 @@ Client::Client(QObject *par) : QObject(par)
     d->jingleICEManager = new Jingle::ICE::Manager(d->jingleManager);
     d->jingleManager->registerTransport(Jingle::S5B::NS, d->jingleS5BManager);
     d->jingleManager->registerTransport(Jingle::IBB::NS, d->jingleIBBManager);
-    d->jingleManager->registerTransport(Jingle::ICE::NS, d->jingleICEManager);
+    // d->jingleManager->registerTransport(Jingle::ICE::NS, d->jingleICEManager);
 }
 
 Client::~Client()
diff --git a/src/xmpp/xmpp-im/jingle-application.cpp b/src/xmpp/xmpp-im/jingle-application.cpp
index e3a5dc71..37e3b39c 100644
--- a/src/xmpp/xmpp-im/jingle-application.cpp
+++ b/src/xmpp/xmpp-im/jingle-application.cpp
@@ -207,9 +207,17 @@ namespace XMPP { namespace Jingle {
         return OutgoingTransportInfoUpdate { transportEl, wrapCB };
     }
 
+    bool Application::isRemote() const { return _pad->session()->role() != _creator; }
+
     bool Application::selectNextTransport(const QSharedPointer<Transport> alikeTransport)
     {
         if (!_transportSelector->hasMoreTransports()) {
+            if (_transport) {
+                _transport->disconnect(this);
+                _transport.reset();
+            }
+            _state             = (isRemote() || _state > State::ApprovedToSend) ? State::Finishing : State::Finished;
+            _terminationReason = Reason(Reason::FailedTransport);
             emit updated(); // will be evaluated to content-remove
             return false;
         }
@@ -289,7 +297,7 @@ namespace XMPP { namespace Jingle {
 
                 initTransport();
 
-                if (_state >= State::ApprovedToSend) {
+                if (_transport && _transport->state() < State::Finishing && _state >= State::ApprovedToSend) {
                     _transport->prepare();
                 }
             });
diff --git a/src/xmpp/xmpp-im/jingle-application.h b/src/xmpp/xmpp-im/jingle-application.h
index 42f60ca6..e901cf23 100644
--- a/src/xmpp/xmpp-im/jingle-application.h
+++ b/src/xmpp/xmpp-im/jingle-application.h
@@ -74,6 +74,8 @@ namespace XMPP { namespace Jingle {
         inline QString                    contentName() const { return _contentName; }
         inline QSharedPointer<Transport>  transport() const { return _transport; }
         inline TransportSelector *        transportSelector() const { return _transportSelector.data(); }
+        bool                              isRemote() const;
+        inline bool                       isLocal() const { return !isRemote(); }
 
         virtual SetDescError setRemoteOffer(const QDomElement &description)  = 0;
         virtual SetDescError setRemoteAnswer(const QDomElement &description) = 0;
diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 497d122b..b16da7a5 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -455,9 +455,10 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
                 if (connection) {
                     connection->close();
                 }
-                q->disconnect(q->transport().data(), &Transport::updated, q, nullptr);
+                if (q->transport())
+                    q->disconnect(q->transport().data(), &Transport::updated, q, nullptr);
             }
-            if (s >= State::Finishing) {
+            if (s >= State::Finishing && q->transport()) {
                 q->disconnect(q->transport().data(), &Transport::failed, q, nullptr);
                 q->disconnect(q->transport().data(), &Transport::connected, q, nullptr);
                 // we can still try to send transport updates
@@ -645,7 +646,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
 
     void Application::initTransport()
     {
-        if (_creator == _pad->session()->role()) {
+        if (_transport->creator() == _pad->session()->role()) {
             d->connection = _transport->addChannel(TransportFeature::Reliable | TransportFeature::DataOriented);
         } else {
             auto const &channels = _transport->channels();
@@ -785,8 +786,10 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
             return;
 
         _terminationReason = Reason(cond, comment);
-        _transport->disconnect(this);
-        _transport.reset();
+        if (_transport) {
+            _transport->disconnect(this);
+            _transport.reset();
+        }
 
         if (_creator == _pad->session()->role() && _state <= State::ApprovedToSend) {
             // local content, not yet sent to remote
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index cac771a1..13c04722 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -1655,7 +1655,11 @@ namespace XMPP { namespace Jingle { namespace S5B {
         return d->connection;
     }
 
-    std::vector<XMPP::Jingle::Connection::Ptr> Transport::channels() const { return { { d->connection } }; }
+    std::vector<XMPP::Jingle::Connection::Ptr> Transport::channels() const
+    {
+        // return {}; // good to test transport failure
+        return { { d->connection } };
+    }
 
     //----------------------------------------------------------------
     // Manager
diff --git a/src/xmpp/xmpp-im/jingle-session.cpp b/src/xmpp/xmpp-im/jingle-session.cpp
index 47066fb5..35c81f07 100644
--- a/src/xmpp/xmpp-im/jingle-session.cpp
+++ b/src/xmpp/xmpp-im/jingle-session.cpp
@@ -210,10 +210,11 @@ namespace XMPP { namespace Jingle {
 
         void doStep()
         {
-            if (waitingAck) { // we will return here when ack is received. Session::Unacked is possible also only with
-                              // waitingAck
+            if (waitingAck || state == State::Finished) {
+                // in waitingAck we will return here later
                 return;
             }
+
             if (terminateReason.condition() && state != State::Finished) {
                 if (state != State::Created || role == Origin::Responder) {
                     sendJingle(Action::SessionTerminate,
@@ -222,8 +223,35 @@ namespace XMPP { namespace Jingle {
                 setSessionFinished();
                 return;
             }
-            if (state == State::Created || state == State::Finished) {
-                return; // we will start doing something when initiate() is called
+
+            if (state == State::Created && role == Origin::Responder) {
+                // we could fail very early if something went wrong with transports init for example
+                Reason reason;
+                bool   all = true;
+                for (auto const &c : contentList) {
+                    if (c->state() < State::Finishing) {
+                        all = false;
+                        break;
+                    }
+
+                    if (c->state() == State::Finishing) {
+                        auto upd = c->evaluateOutgoingUpdate();
+                        if (upd.action == Action::ContentRemove && upd.reason.condition()) {
+                            reason = upd.reason;
+                        }
+                    }
+                }
+                if (all) {
+                    terminateReason = reason;
+                    sendJingle(Action::SessionTerminate,
+                               QList<QDomElement>() << terminateReason.toXml(manager->client()->doc()));
+                    setSessionFinished();
+                    return;
+                }
+            }
+
+            if (state == State::Created) {
+                return; // should wait for user approval of send/accept
             }
 
             if (outgoingUpdates.size()) {
@@ -896,9 +924,7 @@ namespace XMPP { namespace Jingle {
                     return pad->incomingSessionInfo(jingleEl); // should return true if supported
                 }
             }
-            if (!hasElements) {
-                // TODO implement session ping
-                outgoingUpdates.insert(Action::SessionInfo, {});
+            if (!hasElements && state >= State::ApprovedToSend) {
                 return true;
             }
             return false;

From 7e9e4560ede42af11355c096330f5ce1d21f9075 Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Tue, 17 Nov 2020 12:20:04 +0200
Subject: [PATCH 263/383] An attempt to fix build with MSVC. Added d suffix to
 qca libraries in OS Windows in Debug configuration. Added lost include.

---
 CMakeLists.txt                  | 8 ++++++--
 src/xmpp/xmpp-im/jingle-ice.cpp | 2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 125e89a3..d6e5b204 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,10 @@ if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "Release")
 endif()
 
+if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND WIN32)
+    set(D "d")
+endif()
+
 get_directory_property(IS_SUBPROJECT PARENT_DIRECTORY)
 
 project(iris)
@@ -77,8 +81,8 @@ if(BUNDLED_QCA)
     else()
         list(APPEND Qca_INCLUDE_DIR ${QCA_SOURCE_DIR}/include/QtCrypto)
     endif()
-    set(Qca_CORE_LIB ${QCA_BUILD_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}qca-qt5${CMAKE_STATIC_LIBRARY_SUFFIX})
-    set(Qca_OSSL_LIB ${QCA_BUILD_DIR}/lib/qca-qt5/crypto/${CMAKE_STATIC_LIBRARY_PREFIX}qca-ossl${CMAKE_STATIC_LIBRARY_SUFFIX})
+    set(Qca_CORE_LIB ${QCA_BUILD_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}qca-qt5${D}${CMAKE_STATIC_LIBRARY_SUFFIX})
+    set(Qca_OSSL_LIB ${QCA_BUILD_DIR}/lib/qca-qt5/crypto/${CMAKE_STATIC_LIBRARY_PREFIX}qca-ossl${D}${CMAKE_STATIC_LIBRARY_SUFFIX})
     set(Qca_LIBRARY ${Qca_OSSL_LIB} ${Qca_CORE_LIB})
     if(IS_SUBPROJECT)
         set(Qca_LIBRARY_EXPORT ${Qca_LIBRARY} PARENT_SCOPE)
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index a5494caf..304f26a4 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -31,6 +31,8 @@
 #include "xmpp_serverinfomanager.h"
 #include "xmpp_xmlcommon.h"
 
+#include <array>
+
 #include <QElapsedTimer>
 #include <QNetworkInterface>
 #include <QTimer>

From 226d054394da9c23e4da8dad295f71ae842b1515 Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Tue, 17 Nov 2020 19:49:52 +0200
Subject: [PATCH 264/383] More work with MSVC compatibility

---
 src/irisnet/noncore/sctp/DepUsrSCTP.cpp | 4 ++--
 src/irisnet/noncore/sctp/Logger.hpp     | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/irisnet/noncore/sctp/DepUsrSCTP.cpp b/src/irisnet/noncore/sctp/DepUsrSCTP.cpp
index fe14f4d2..3a6c63c6 100644
--- a/src/irisnet/noncore/sctp/DepUsrSCTP.cpp
+++ b/src/irisnet/noncore/sctp/DepUsrSCTP.cpp
@@ -11,8 +11,8 @@
 #include <cstring>
 
 #define MS_TRACE()
-#define MS_WARN_TAG(args...)
-#define MS_DEBUG_TAG(args...)
+#define MS_WARN_TAG(args, ...)
+#define MS_DEBUG_TAG(args, ...)
 #define MS_ASSERT(cond, what) Q_ASSERT_X(cond, "sctp", what)
 
 /* Static. */
diff --git a/src/irisnet/noncore/sctp/Logger.hpp b/src/irisnet/noncore/sctp/Logger.hpp
index a03a07b0..e4ffd0c8 100644
--- a/src/irisnet/noncore/sctp/Logger.hpp
+++ b/src/irisnet/noncore/sctp/Logger.hpp
@@ -3,11 +3,11 @@
 #include <QtGlobal>
 #include <cinttypes>
 
-#define MS_WARN_TAG(tag, args...) qWarning("sctp:" args)
-#define MS_DEBUG_TAG(tag, args...) qDebug("sctp:" args)
+#define MS_WARN_TAG(tag, args, ...) qWarning("sctp:" args)
+#define MS_DEBUG_TAG(tag, args, ...) qDebug("sctp:" args)
 #define MS_TRACE()
-#define MS_ERROR(args...) qCritical(args)
-#define MS_DEBUG_DEV(args...) qDebug(args)
+#define MS_ERROR(args, ...) qCritical(args)
+#define MS_DEBUG_DEV(args, ...) qDebug(args)
 #define MS_HAS_DEBUG_TAG(tag) false
 
 #define MS_ABORT(desc, ...)                                                                                            \

From 8b048b2a4ac181e4098aefee2fc0433df1ca1113 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 17 Nov 2020 21:25:32 +0300
Subject: [PATCH 265/383] Pass more cmake configuration to bundled external
 projects

It didn't compile on MacOS without it
---
 CMakeLists.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d6e5b204..2d133018 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,7 +97,8 @@ if(BUNDLED_QCA)
         -DBUILD_SHARED_LIBS=OFF -DBUILD_PLUGINS=ossl -DLOAD_SHARED_PLUGINS=OFF
         -DBUILD_TESTS=OFF -DBUILD_TOOLS=OFF -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
         -DCMAKE_INSTALL_PREFIX=${QCA_PREFIX} -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
-        -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE})
+        -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+        -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER})
     if (EXISTS ${QCA_SOURCE_DIR})
         message(STATUS "QCA: found bundled sources")
         ExternalProject_Add(QcaProject
@@ -165,7 +166,8 @@ if (NOT UsrSCTP_FOUND AND BUNDLED_USRSCTP)
     set(USRSCTP_BUILD_OPTIONS
         -DBUILD_SHARED_LIBS=OFF -Dsctp_build_programs=OFF -Dsctp_debug=OFF -Dsctp_inet=OFF -Dsctp_inet6=OFF
         -DCMAKE_INSTALL_PREFIX=${USRSCTP_PREFIX} -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
-        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE})
+        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+        -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER})
     if (EXISTS ${USRSCTP_SOURCE_DIR})
         message(STATUS "USRSCTP: found bundled sources")
         ExternalProject_Add(UsrSCTPProject

From f83d9e03d24009b743d321ef31a0caf1ab89bd9d Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 17 Nov 2020 21:34:37 +0300
Subject: [PATCH 266/383] Fixed a few compilation warnings with clang

---
 src/xmpp/xmpp-im/jingle-ft.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index 81b58e64..ef561d8c 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -192,11 +192,11 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
     public:
         Manager(QObject *parent = nullptr);
         ~Manager();
-        void         setJingleManager(XMPP::Jingle::Manager *jm);
+        void         setJingleManager(XMPP::Jingle::Manager *jm) override;
         Application *startApplication(const ApplicationManagerPad::Ptr &pad, const QString &contentName, Origin creator,
-                                      Origin senders);
-        ApplicationManagerPad *pad(Session *session); // pad factory
-        void                   closeAll();
+                                      Origin senders) override;
+        ApplicationManagerPad *pad(Session *session) override; // pad factory
+        void                   closeAll() override;
 
         QStringList discoFeatures() const override;
 

From 0530df1b1c7889b5ce38fcbae0b4568bff01ba40 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 17 Nov 2020 22:31:00 +0300
Subject: [PATCH 267/383] Disable building qca macos framework

---
 CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d133018..0a9ad01e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,7 +98,8 @@ if(BUNDLED_QCA)
         -DBUILD_TESTS=OFF -DBUILD_TOOLS=OFF -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
         -DCMAKE_INSTALL_PREFIX=${QCA_PREFIX} -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
         -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
-        -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER})
+        -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+        -DOSX_FRAMEWORK=OFF)
     if (EXISTS ${QCA_SOURCE_DIR})
         message(STATUS "QCA: found bundled sources")
         ExternalProject_Add(QcaProject

From 8d8573dd2e14ee7df121f0a7cae904017e824a82 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 17 Nov 2020 22:36:32 +0300
Subject: [PATCH 268/383] Use similar hack with debug lib suffix like for
 Windows

---
 CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a9ad01e..d539d785 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,9 @@ endif()
 if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND WIN32)
     set(D "d")
 endif()
+if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND APPLE)
+    set(D "_debug")
+endif()
 
 get_directory_property(IS_SUBPROJECT PARENT_DIRECTORY)
 

From bbba324e49c6f9c440ac7e53e33d4d1dcc4ec50e Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 17 Nov 2020 22:43:21 +0300
Subject: [PATCH 269/383] Ensure apple libs are linked too when linked with
 bundled qca

---
 CMakeLists.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d539d785..83e4a524 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -87,6 +87,11 @@ if(BUNDLED_QCA)
     set(Qca_CORE_LIB ${QCA_BUILD_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}qca-qt5${D}${CMAKE_STATIC_LIBRARY_SUFFIX})
     set(Qca_OSSL_LIB ${QCA_BUILD_DIR}/lib/qca-qt5/crypto/${CMAKE_STATIC_LIBRARY_PREFIX}qca-ossl${D}${CMAKE_STATIC_LIBRARY_SUFFIX})
     set(Qca_LIBRARY ${Qca_OSSL_LIB} ${Qca_CORE_LIB})
+    if(APPLE)
+        set(COREFOUNDATION_LIBRARY "-framework CoreFoundation")
+        set(COREFOUNDATION_LIBRARY_SECURITY "-framework Security")
+        set(Qca_LIBRARY ${Qca_LIBRARY} ${COREFOUNDATION_LIBRARY} ${COREFOUNDATION_LIBRARY_SECURITY})
+    endif()
     if(IS_SUBPROJECT)
         set(Qca_LIBRARY_EXPORT ${Qca_LIBRARY} PARENT_SCOPE)
         set(Qca_INCLUDE_DIR_EXPORT ${Qca_INCLUDE_DIR} PARENT_SCOPE)

From 55e642f798b4eea066527e18dc6bfe759bcb0e1e Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Fri, 20 Nov 2020 16:47:29 +0200
Subject: [PATCH 270/383] An attempt to fix build with MacOSX

---
 CMakeLists.txt | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 83e4a524..63197d65 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -146,10 +146,18 @@ include_directories(
     ${Qca_INCLUDE_DIR}
 )
 
-if((CMAKE_CROSSCOMPILING) AND (DEFINED MSYS) AND (EXISTS ${CMAKE_PREFIX_PATH}/include/stdint.h))
+set(STDINT_FOUND OFF)
+find_file(STDINT_INCLUDE stdint.h)
+
+if(NOT ${STDINT_INCLUDE} STREQUAL "STDINT_INCLUDE-NOTFOUND")
+    message(STATUS "StdInt include found: ${STDINT_INCLUDE}")
+    set(STDINT_FOUND ON)
+endif()
+
+if((CMAKE_CROSSCOMPILING AND DEFINED MSYS) AND STDINT_FOUND)
     #Add SCTP_STDINT_INCLUDE definition to compile irisnet with usrsctp with MinGW
     add_definitions(
-        -DSCTP_STDINT_INCLUDE="${CMAKE_PREFIX_PATH}/include/stdint.h"
+        -DSCTP_STDINT_INCLUDE="${STDINT_INCLUDE}"
     )
 endif()
 

From 331e96aa932fe77a7b6ca8498d8dae45abe5b58a Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
Date: Mon, 23 Nov 2020 01:41:36 +0300
Subject: [PATCH 271/383] Add missed include

(See build logs for Ubuntu Xenial)
---
 src/xmpp/xmpp-im/jingle-ice.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index 304f26a4..f296d6d5 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -32,6 +32,7 @@
 #include "xmpp_xmlcommon.h"
 
 #include <array>
+#include <memory>
 
 #include <QElapsedTimer>
 #include <QNetworkInterface>

From 1b841a5a428c0795effd5528ccbe2625231d5920 Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
Date: Mon, 23 Nov 2020 01:43:57 +0300
Subject: [PATCH 272/383] Fix build with Qt < 5.11

(See build logs for Ubuntu Xenial)
---
 src/xmpp/xmpp-im/jingle-session.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-session.cpp b/src/xmpp/xmpp-im/jingle-session.cpp
index 35c81f07..93f9d59e 100644
--- a/src/xmpp/xmpp-im/jingle-session.cpp
+++ b/src/xmpp/xmpp-im/jingle-session.cpp
@@ -146,13 +146,13 @@ namespace XMPP { namespace Jingle {
             for (auto &weakPad : transportPads) {
                 auto pad = weakPad.lock();
                 if (pad) {
-                    (pad.get()->*func)(); // just calls pad's method
+                    (pad.data()->*func)(); // just calls pad's method
                 }
             }
             for (auto &weakPad : applicationPads) {
                 auto pad = weakPad.lock();
                 if (pad) {
-                    (pad.get()->*func)();
+                    (pad.data()->*func)();
                 }
             }
         }

From df6e1ab3e0c2fadb3b3f6c9bf67c03592853e027 Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
Date: Mon, 23 Nov 2020 20:01:06 +0300
Subject: [PATCH 273/383] Fix build with Qt < 5.9

---
 src/xmpp/xmpp-im/jingle-ice.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index f296d6d5..043ad500 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -152,7 +152,19 @@ namespace XMPP { namespace Jingle { namespace ICE {
         }
         QDomElement toXml(QDomDocument *doc) const
         {
-            auto fingerprint = XMLHelper::textTagNS(doc, NS_DTLS, QLatin1String("fingerprint"), hash.data().toHex(':'));
+            auto binToHex = [](const QByteArray &in) {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
+                return in.toHex(':');
+#else
+                QByteArray out = in.toHex();
+                int size = out.size();
+                for (int k = 2; k < size; k+=3, ++size) {
+                    out.insert(k, ':');
+                }
+                return out;
+#endif
+            };
+            auto fingerprint = XMLHelper::textTagNS(doc, NS_DTLS, QLatin1String("fingerprint"), binToHex(hash.data()));
             fingerprint.setAttribute(QLatin1String("hash"), hash.stringType());
             fingerprint.setAttribute(QLatin1String("setup"), QLatin1String(fpRoles[setup]));
             return fingerprint;

From 04d0b7efe0559443d7a6c97e2ae7753d6be10846 Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Mon, 23 Nov 2020 21:38:08 +0200
Subject: [PATCH 274/383] Fix build of bundled usrsctp if system exists

---
 CMakeLists.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 63197d65..0363cfc0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -161,12 +161,12 @@ if((CMAKE_CROSSCOMPILING AND DEFINED MSYS) AND STDINT_FOUND)
     )
 endif()
 
-find_package(UsrSCTP)
-if (NOT UsrSCTP_FOUND AND (NOT BUNDLED_USRSCTP))
-    message(FATAL_ERROR "UsrSCTP library not found. Try to install usrsctp library or enable BUNDLED_USRSCTP flag")
-endif()
-
-if (NOT UsrSCTP_FOUND AND BUNDLED_USRSCTP)
+if(NOT BUNDLED_USRSCTP)
+    find_package(UsrSCTP)
+    if (NOT UsrSCTP_FOUND)
+        message(FATAL_ERROR "UsrSCTP library not found. Try to install usrsctp library or enable BUNDLED_USRSCTP flag")
+    endif()
+else()
     message(STATUS "USRSCTP: using bundled")
     set(USRSCTP_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/usrsctp)
     set(USRSCTP_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/usrsctp)

From e02af9a0d7dd7be6d3b6c5ff9944a495ce464b7f Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Thu, 10 Dec 2020 14:11:47 +0200
Subject: [PATCH 275/383] Updated CMakeLists.txt: updated usrsctp git tag to
 last master branch commit

---
 CMakeLists.txt | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0363cfc0..c3c61ab8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -181,10 +181,11 @@ else()
     include(ExternalProject)
     #set CMake options and transfer the environment to an external project
     set(USRSCTP_BUILD_OPTIONS
-        -DBUILD_SHARED_LIBS=OFF -Dsctp_build_programs=OFF -Dsctp_debug=OFF -Dsctp_inet=OFF -Dsctp_inet6=OFF
-        -DCMAKE_INSTALL_PREFIX=${USRSCTP_PREFIX} -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
-        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
-        -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER})
+        -DBUILD_SHARED_LIBS=OFF -Dsctp_build_programs=OFF -Dsctp_build_shared_lib=OFF -Dsctp_debug=OFF
+        -Dsctp_inet=OFF -Dsctp_inet6=OFF -DCMAKE_INSTALL_PREFIX=${USRSCTP_PREFIX}
+        -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+        -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
+        -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER})
     if (EXISTS ${USRSCTP_SOURCE_DIR})
         message(STATUS "USRSCTP: found bundled sources")
         ExternalProject_Add(UsrSCTPProject
@@ -205,7 +206,7 @@ else()
             PREFIX ${USRSCTP_PREFIX}
             BINARY_DIR ${USRSCTP_BUILD_DIR}
             GIT_REPOSITORY https://github.com/sctplab/usrsctp.git
-            GIT_TAG f4925bd5ebb2db38263eef0ec816bf393293cf9c
+            GIT_TAG a17109528c75d01f6372d5c30851a639684c6e99
             CMAKE_ARGS ${USRSCTP_BUILD_OPTIONS}
             BUILD_BYPRODUCTS ${USRSCTP_LIBRARY}
             INSTALL_COMMAND ""

From 28ec6d130cab132852d4f61b2ecef6b071c5ae34 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Fri, 18 Dec 2020 00:12:35 +0300
Subject: [PATCH 276/383] Fixed warnings in sctp log macros

---
 src/irisnet/CMakeLists.txt          | 1 +
 src/irisnet/noncore/sctp/Logger.hpp | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/irisnet/CMakeLists.txt b/src/irisnet/CMakeLists.txt
index e9ca3a5b..15a58752 100644
--- a/src/irisnet/CMakeLists.txt
+++ b/src/irisnet/CMakeLists.txt
@@ -58,6 +58,7 @@ set(SOURCES
 
     noncore/sctp/SctpAssociation.cpp
     noncore/sctp/DepUsrSCTP.cpp
+    noncore/sctp/Logger.hpp
 )
 
 if(UNIX)
diff --git a/src/irisnet/noncore/sctp/Logger.hpp b/src/irisnet/noncore/sctp/Logger.hpp
index e4ffd0c8..ad36118a 100644
--- a/src/irisnet/noncore/sctp/Logger.hpp
+++ b/src/irisnet/noncore/sctp/Logger.hpp
@@ -3,11 +3,11 @@
 #include <QtGlobal>
 #include <cinttypes>
 
-#define MS_WARN_TAG(tag, args, ...) qWarning("sctp:" args)
-#define MS_DEBUG_TAG(tag, args, ...) qDebug("sctp:" args)
+#define MS_WARN_TAG(tag, ...) qWarning("sctp:" __VA_ARGS__)
+#define MS_DEBUG_TAG(tag, ...) qDebug("sctp:" __VA_ARGS__)
 #define MS_TRACE()
-#define MS_ERROR(args, ...) qCritical(args)
-#define MS_DEBUG_DEV(args, ...) qDebug(args)
+#define MS_ERROR(...) qCritical(__VA_ARGS__)
+#define MS_DEBUG_DEV(...) qDebug(__VA_ARGS__)
 #define MS_HAS_DEBUG_TAG(tag) false
 
 #define MS_ABORT(desc, ...)                                                                                            \

From 72ab793d2a860d2919e1516af575298f32376847 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 20 Dec 2020 02:06:33 +0300
Subject: [PATCH 277/383] wip: early (befire session accept) jingle transport
 replace on the receiver side

---
 src/xmpp/xmpp-im/jingle-application.cpp |  27 ++-
 src/xmpp/xmpp-im/jingle-application.h   |  26 ++-
 src/xmpp/xmpp-im/jingle-session.cpp     | 222 +++++++++++++-----------
 src/xmpp/xmpp-im/jingle.h               |  16 +-
 4 files changed, 164 insertions(+), 127 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-application.cpp b/src/xmpp/xmpp-im/jingle-application.cpp
index 37e3b39c..922de92b 100644
--- a/src/xmpp/xmpp-im/jingle-application.cpp
+++ b/src/xmpp/xmpp-im/jingle-application.cpp
@@ -65,7 +65,9 @@ namespace XMPP { namespace Jingle {
         switch (_state) {
         case State::ApprovedToSend:
             if (_transport->hasUpdates() && _transport->state() == State::ApprovedToSend) {
-                if (inTrReplace) {
+                if (_pendingTransportReplace == PendingTransportReplace::Planned) {
+                    _update = { Action::TransportReplace, _transportReplaceReason };
+                } else if (inTrReplace) { // both sides already know it's replace. but not accepted yet.
                     // either we are waiting for incoming transport-accept or local confirmation of remote
                     // transport-replace
                     bool localTranport = _pad->session()->role() == _transport->creator();
@@ -171,17 +173,12 @@ namespace XMPP { namespace Jingle {
                                            setState(State::Connecting);
                                    } };
         case Action::TransportInfo:
-            Q_ASSERT(_transport->hasUpdates());
-            std::tie(transportEl, transportCB) = wrapOutgoingTransportUpdate();
-            contentEl.appendChild(transportEl);
-            return OutgoingUpdate { updates, transportCB };
         case Action::TransportReplace:
-        case Action::TransportAccept: {
+        case Action::TransportAccept:
             Q_ASSERT(_transport->hasUpdates());
             std::tie(transportEl, transportCB) = wrapOutgoingTransportUpdate();
             contentEl.appendChild(transportEl);
             return OutgoingUpdate { updates, transportCB };
-        }
         default:
             break;
         }
@@ -194,15 +191,13 @@ namespace XMPP { namespace Jingle {
         QDomElement      transportEl;
         OutgoingUpdateCB transportCB;
         std::tie(transportEl, transportCB) = _transport->takeOutgoingUpdate();
-        auto wrapCB = [this, tr = _transport.toWeakRef(), cb = std::move(transportCB)](Task *task) {
+        auto wrapCB                        = [tr = _transport.toWeakRef(), cb = std::move(transportCB)](Task *task) {
             auto transport = tr.lock();
-            if (transport && cb)
-                cb(task);
-            if (_pendingTransportReplace == PendingTransportReplace::NeedAck) {
-                _pendingTransportReplace
-                    = task->success() ? PendingTransportReplace::InProgress : PendingTransportReplace::None;
-                emit updated();
+            if (!transport) {
+                return;
             }
+            if (cb)
+                cb(task);
         };
         return OutgoingTransportInfoUpdate { transportEl, wrapCB };
     }
@@ -261,11 +256,11 @@ namespace XMPP { namespace Jingle {
                 _transportSelector->backupTransport(_transport);
             }
 
-            if (transport->creator() == _pad->session()->role()) {
+            if (transport->creator() == _pad->session()->role()) { // if new transport is locally created
                 auto ts = _transport->state() == State::Finished ? _transport->prevState() : _transport->state();
                 if (_transport->creator() != _pad->session()->role() || ts > State::Unacked) {
                     // if remote knows of the current transport
-                    _pendingTransportReplace = PendingTransportReplace::InProgress;
+                    _pendingTransportReplace = PendingTransportReplace::Planned;
                 } else if (_transport->creator() == _pad->session()->role() && ts == State::Unacked) {
                     // if remote may know but we don't know yet about it
                     _pendingTransportReplace = PendingTransportReplace::NeedAck;
diff --git a/src/xmpp/xmpp-im/jingle-application.h b/src/xmpp/xmpp-im/jingle-application.h
index e901cf23..f310eb5b 100644
--- a/src/xmpp/xmpp-im/jingle-application.h
+++ b/src/xmpp/xmpp-im/jingle-application.h
@@ -63,6 +63,12 @@ namespace XMPP { namespace Jingle {
             IncompatibleParameters // this one is for <reason>
         };
 
+        enum ApplicationFlag {
+            InitialApplication = 0x1, // the app came with session-initiate
+            UserFlag           = 0x100
+        };
+        Q_DECLARE_FLAGS(ApplicationFlags, ApplicationFlag)
+
         virtual void setState(State state) = 0; // likely just remember the state and not generate any signals
         virtual XMPP::Stanza::Error lastError() const  = 0;
         virtual Reason              lastReason() const = 0;
@@ -76,6 +82,14 @@ namespace XMPP { namespace Jingle {
         inline TransportSelector *        transportSelector() const { return _transportSelector.data(); }
         bool                              isRemote() const;
         inline bool                       isLocal() const { return !isRemote(); }
+        inline ApplicationFlags           flags() const { return _flags; }
+        inline void                       markInitialApplication(bool state)
+        {
+            if (state)
+                _flags |= InitialApplication;
+            else
+                _flags &= ~InitialApplication;
+        }
 
         virtual SetDescError setRemoteOffer(const QDomElement &description)  = 0;
         virtual SetDescError setRemoteAnswer(const QDomElement &description) = 0;
@@ -146,9 +160,15 @@ namespace XMPP { namespace Jingle {
         void stateChanged(State);
 
     protected:
-        State _state = State::Created;
-
-        enum class PendingTransportReplace { None, NeedAck, InProgress };
+        State            _state = State::Created;
+        ApplicationFlags _flags;
+
+        enum class PendingTransportReplace {
+            None,      // not in the replace mode
+            Planned,   // didn't send a replacement yet. working on it.
+            NeedAck,   // we sent replacement. waiting for iq ack
+            InProgress // not yet accepted but acknowledged
+        };
 
         // has to be set when whatever way remote knows about the current transport
         // bool _remoteKnowsOfTheTransport = false;
diff --git a/src/xmpp/xmpp-im/jingle-session.cpp b/src/xmpp/xmpp-im/jingle-session.cpp
index 93f9d59e..9301cbfc 100644
--- a/src/xmpp/xmpp-im/jingle-session.cpp
+++ b/src/xmpp/xmpp-im/jingle-session.cpp
@@ -29,6 +29,15 @@
 #include <QPointer>
 #include <QTimer>
 
+template <class T> constexpr std::add_const_t<T> &as_const(T &t) noexcept { return t; }
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
+// this adds const to non-const objects (like std::as_const)
+template <typename T> Q_DECL_CONSTEXPR typename std::add_const<T>::type &qAsConst(T &t) noexcept { return t; }
+// prevent rvalue arguments:
+template <typename T> void qAsConst(const T &&) = delete;
+#endif
+
 namespace XMPP { namespace Jingle {
     //----------------------------------------------------------------------------
     // JT - Jingle Task
@@ -228,7 +237,7 @@ namespace XMPP { namespace Jingle {
                 // we could fail very early if something went wrong with transports init for example
                 Reason reason;
                 bool   all = true;
-                for (auto const &c : contentList) {
+                for (auto const &c : qAsConst(contentList)) {
                     if (c->state() < State::Finishing) {
                         all = false;
                         break;
@@ -265,97 +274,8 @@ namespace XMPP { namespace Jingle {
                 return;
             }
 
-            typedef std::tuple<QPointer<Application>, OutgoingUpdateCB> AckHndl; // will be used from callback on iq ack
-            if (state == State::ApprovedToSend) { // we are going to send session-initiate/accept (already accepted
-                                                  // by the user but not sent yet)
-                /*
-                 * For session-initiate everything is prety much straightforward, just any content with
-                 * Action::ContentAdd update type has to be added. But with session-accept things are more complicated
-                 *   1. Local client could add its content. So we have to check content origin too.
-                 *   2. Remote client could add more content before local session-accept. Then we have two options
-                 *         a) send content-accept and skip this content in session-accept later
-                 *         b) don't send content-accept and accept everything with session-accept
-                 *      We prefer option (b) in our implementation.
-                 */
-                if (role == Origin::Responder) {
-                    for (const auto &c : initialIncomingUnacceptedContent) {
-                        auto out = c->evaluateOutgoingUpdate();
-                        if (out.action == Action::ContentReject) {
-                            lastError
-                                = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
-                            setSessionFinished();
-                            return;
-                        }
-                        if (out.action != Action::ContentAccept) {
-                            return; // keep waiting.
-                        }
-                    }
-                } else {
-                    for (const auto &c : contentList) {
-                        auto out = c->evaluateOutgoingUpdate();
-                        if (out.action == Action::ContentRemove) {
-                            lastError
-                                = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
-                            setSessionFinished();
-                            return;
-                        }
-                        if (out.action != Action::ContentAdd) {
-                            return; // keep waiting.
-                        }
-                    }
-                }
-                Action actionToSend = Action::SessionAccept;
-                State  finalState   = State::Active;
-                // so all contents is ready for session-initiate. let's do it
-                if (role == Origin::Initiator) {
-                    sid          = manager->registerSession(q);
-                    actionToSend = Action::SessionInitiate;
-                    finalState   = State::Pending;
-                }
-
-                notifyPads<&SessionManagerPad::onSend>();
-
-                QList<QDomElement> contents;
-                QList<AckHndl>     acceptApps;
-                for (const auto &app : contentList) {
-                    QList<QDomElement> xml;
-                    OutgoingUpdateCB   callback;
-                    std::tie(xml, callback) = app->takeOutgoingUpdate();
-                    contents += xml;
-                    // p->setState(State::Unacked);
-                    if (callback) {
-                        acceptApps.append(AckHndl { app, callback });
-                    }
-                }
-
-                state = State::Unacked;
-                sendJingle(actionToSend, contents, [this, acceptApps, finalState](JT *jt) {
-                    if (!jt->success())
-                        return;
-                    state = finalState;
-                    for (const auto &h : acceptApps) {
-                        auto app      = std::get<0>(h);
-                        auto callback = std::get<1>(h);
-                        if (app) {
-                            callback(jt);
-                            if (role == Origin::Responder) {
-                                app->start();
-                            }
-                        }
-                    }
-                    if (finalState == State::Active) {
-                        emit q->activated();
-                    }
-                    planStep();
-                });
-
-                return;
-            }
-
-            // So session is either in State::Pending or State::Active here.
-            // State::Connecting status is skipped for session.
             QList<QDomElement> updateXml;
-            for (auto mp : applicationPads) {
+            for (auto &mp : applicationPads) {
                 auto        p  = mp.toStrongRef();
                 QDomElement el = p->takeOutgoingSessionInfoUpdate();
                 if (!el.isNull()) {
@@ -369,19 +289,33 @@ namespace XMPP { namespace Jingle {
                 }
             }
 
-            QMultiMap<Application::Update, Application *> updates;
+            typedef std::tuple<QPointer<Application>, OutgoingUpdateCB> AckHndl; // will be used from callback on iq ack
+            if (state == State::ApprovedToSend) { // we are going to send session-initiate/accept (already accepted
+                                                  // by the user but not sent yet)
+                if (trySendSessionAcceptOrInitiate()) {
+                    return; // accepted / initiated or finished with a failure
+                }
+            }
 
-            for (auto app : signalingContent) {
+            QMultiMap<Application::Update, Application *> updates;
+            for (auto app : qAsConst(signalingContent)) {
                 auto updateType = app->evaluateOutgoingUpdate();
                 if (updateType.action != Action::NoAction) {
+                    if (state == State::ApprovedToSend && app->flags() & Application::InitialApplication) {
+                        // We need pass here everthing not checked in trySendSessionAcceptOrInitiate
+                        if ((role == Origin::Initiator && updateType.action == Action::ContentAdd)
+                            || (role == Origin::Responder && updateType.action == Action::ContentAccept)) {
+                            continue; // skip in favor of trySendSessionAcceptOrInitiate
+                        }
+                    }
                     updates.insert(updateType, app);
                 }
             }
 
             QList<AckHndl> acceptApps;
             if (updates.size()) {
-                auto upd  = updates.begin().key(); // NOTE maybe some actions have more priority than others
-                auto apps = updates.values(upd);
+                auto       upd  = updates.begin().key(); // NOTE maybe some actions have more priority than others
+                auto const apps = updates.values(upd);
                 for (auto app : apps) {
                     QList<QDomElement> xml;
                     OutgoingUpdateCB   callback;
@@ -404,6 +338,92 @@ namespace XMPP { namespace Jingle {
             }
         }
 
+        bool trySendSessionAcceptOrInitiate()
+        {
+            /*
+             * For session-initiate everything is pretty much straightforward, just any content with
+             * Action::ContentAdd update type has to be added. But with session-accept things are more complicated
+             *   1. Local client could add its content. So we have to check content origin too.
+             *   2. Remote client could add more content before local session-accept. Then we have two options
+             *         a) send content-accept and skip this content in session-accept later
+             *         b) don't send content-accept and accept everything with session-accept
+             *      We prefer option (b) in our implementation.
+             */
+            typedef std::tuple<QPointer<Application>, OutgoingUpdateCB> AckHndl;
+            if (role == Origin::Responder) {
+                for (const auto &c : qAsConst(initialIncomingUnacceptedContent)) {
+                    auto out = c->evaluateOutgoingUpdate();
+                    if (out.action == Action::ContentReject) {
+                        lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
+                        setSessionFinished();
+                        return true;
+                    }
+                    if (out.action != Action::ContentAccept) {
+                        return false; // keep waiting.
+                    }
+                }
+            } else {
+                for (const auto &c : qAsConst(contentList)) {
+                    auto out = c->evaluateOutgoingUpdate();
+                    if (out.action == Action::ContentRemove) {
+                        lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
+                        setSessionFinished();
+                        return true;
+                    }
+                    if (out.action != Action::ContentAdd) {
+                        return false; // keep waiting.
+                    }
+                }
+            }
+            Action actionToSend = Action::SessionAccept;
+            State  finalState   = State::Active;
+            // so all contents is ready for session-initiate. let's do it
+            if (role == Origin::Initiator) {
+                sid          = manager->registerSession(q);
+                actionToSend = Action::SessionInitiate;
+                finalState   = State::Pending;
+            }
+
+            notifyPads<&SessionManagerPad::onSend>();
+
+            QList<QDomElement> contents;
+            QList<AckHndl>     acceptApps;
+            for (const auto &app : qAsConst(contentList)) {
+                QList<QDomElement> xml;
+                OutgoingUpdateCB   callback;
+                std::tie(xml, callback) = app->takeOutgoingUpdate();
+                contents += xml;
+                // p->setState(State::Unacked);
+                if (callback) {
+                    acceptApps.append(AckHndl { app, callback });
+                }
+            }
+
+            state = State::Unacked;
+            initialIncomingUnacceptedContent.clear();
+            sendJingle(actionToSend, contents, [this, acceptApps, finalState](JT *jt) {
+                if (!jt->success())
+                    return;
+                state = finalState;
+                for (const auto &h : acceptApps) {
+                    auto app      = std::get<0>(h);
+                    auto callback = std::get<1>(h);
+                    if (app) {
+                        callback(jt);
+                        if (role == Origin::Responder) {
+                            app->start();
+                        }
+                    }
+                }
+                if (finalState == State::Active) {
+                    emit q->activated();
+                }
+                planStep();
+            });
+
+            return true;
+        }
+
         Reason reason(const QDomElement &jingleEl)
         {
             QDomElement re = jingleEl.firstChildElement(QLatin1String("reason"));
@@ -655,7 +675,7 @@ namespace XMPP { namespace Jingle {
                 QTimer::singleShot(0, q, [this, rejectSet]() mutable {
                     auto               cond = rejectSet.first().second;
                     QList<QDomElement> rejects;
-                    for (auto const &i : rejectSet) {
+                    for (auto const &i : qAsConst(rejectSet)) {
                         rejects.append(i.first);
                     }
                     rejects += Reason(cond).toXml(manager->client()->doc());
@@ -702,7 +722,7 @@ namespace XMPP { namespace Jingle {
 
             if (apps.size()) {
                 Origin remoteRole = negateOrigin(role);
-                for (auto app : apps) {
+                for (auto app : qAsConst(apps)) {
                     addAndInitContent(remoteRole, app); // TODO check conflicts
                 }
                 QTimer::singleShot(0, q, [this]() { emit q->newContentReceived(); });
@@ -766,7 +786,7 @@ namespace XMPP { namespace Jingle {
 
             state = State::Connecting;
             if (apps.size()) {
-                for (auto app : apps) {
+                for (auto app : qAsConst(apps)) {
                     app->start();
                 }
             }
@@ -788,7 +808,7 @@ namespace XMPP { namespace Jingle {
             }
 
             if (apps.size() && state >= State::Active) {
-                for (auto app : apps) {
+                for (auto app : qAsConst(apps)) {
                     app->start(); // start accepted app. connection establishing and data transfer are inside
                 }
             }
@@ -1093,6 +1113,7 @@ namespace XMPP { namespace Jingle {
         if (d->role == Origin::Initiator && d->state == State::Created) {
             d->state = State::ApprovedToSend;
             for (auto &c : d->contentList) {
+                c->markInitialApplication(true);
                 c->prepare();
             }
             d->notifyPads<&SessionManagerPad::onLocalAccepted>();
@@ -1169,7 +1190,8 @@ namespace XMPP { namespace Jingle {
             if (!apps.size())
                 return false;
             d->initialIncomingUnacceptedContent = apps;
-            for (auto app : apps) {
+            for (auto app : qAsConst(apps)) {
+                app->markInitialApplication(true);
                 d->addAndInitContent(Origin::Initiator, app);
             }
             d->planStep();
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index 6bdb37ea..008246e8 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -100,8 +100,13 @@ namespace Jingle {
     */
     enum class State { Created, ApprovedToSend, Unacked, Pending, Accepted, Connecting, Active, Finishing, Finished };
 
-    enum class Action {
-        NoAction, // non-standard, just a default
+    enum class Action { // ordered by priority. first sent first
+        NoAction,       // non-standard, just a default
+        TransportAccept,
+        TransportInfo,
+        TransportReject,
+        TransportReplace,
+        SessionInfo,
         ContentAccept,
         ContentAdd,
         ContentModify,
@@ -110,13 +115,8 @@ namespace Jingle {
         DescriptionInfo,
         SecurityInfo,
         SessionAccept,
-        SessionInfo,
         SessionInitiate,
-        SessionTerminate,
-        TransportAccept,
-        TransportInfo,
-        TransportReject,
-        TransportReplace
+        SessionTerminate
     };
 
     inline uint qHash(const XMPP::Jingle::Action &o, uint seed = 0) { return ::qHash(int(o), seed); }

From 36838bd8d30f40114edcc431a69c0334ba8dcb36 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 21 Dec 2020 02:03:17 +0300
Subject: [PATCH 278/383] Make early jingle transport fallback working

---
 src/xmpp/xmpp-im/jingle-application.cpp | 39 +++++++++++++++++++------
 src/xmpp/xmpp-im/jingle-application.h   |  2 +-
 src/xmpp/xmpp-im/jingle-ibb.cpp         | 34 ++++++++++++++-------
 src/xmpp/xmpp-im/jingle-ibb.h           |  4 +--
 src/xmpp/xmpp-im/jingle-ice.cpp         |  8 ++---
 src/xmpp/xmpp-im/jingle-ice.h           |  2 +-
 src/xmpp/xmpp-im/jingle-s5b.cpp         |  7 ++++-
 src/xmpp/xmpp-im/jingle-s5b.h           |  2 +-
 src/xmpp/xmpp-im/jingle-transport.h     | 21 +++++++++----
 src/xmpp/xmpp-im/jingle.h               | 11 +++----
 10 files changed, 91 insertions(+), 39 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-application.cpp b/src/xmpp/xmpp-im/jingle-application.cpp
index 922de92b..8713652a 100644
--- a/src/xmpp/xmpp-im/jingle-application.cpp
+++ b/src/xmpp/xmpp-im/jingle-application.cpp
@@ -64,14 +64,14 @@ namespace XMPP { namespace Jingle {
 
         switch (_state) {
         case State::ApprovedToSend:
-            if (_transport->hasUpdates() && _transport->state() == State::ApprovedToSend) {
+            if (_transport->state() >= State::Accepted) {
+                _update
+                    = { _pad->session()->role() == _creator ? Action::ContentAdd : Action::ContentAccept, Reason() };
+            } else if (_transport->hasUpdates() && _transport->state() == State::ApprovedToSend) {
                 if (_pendingTransportReplace == PendingTransportReplace::Planned) {
                     _update = { Action::TransportReplace, _transportReplaceReason };
                 } else if (inTrReplace) { // both sides already know it's replace. but not accepted yet.
-                    // either we are waiting for incoming transport-accept or local confirmation of remote
-                    // transport-replace
-                    bool localTranport = _pad->session()->role() == _transport->creator();
-                    _update            = { localTranport ? Action::TransportInfo : Action::TransportAccept, Reason() };
+                    _update = { _transport->isLocal() ? Action::TransportInfo : Action::TransportAccept, Reason() };
                 } else
                     _update = { _pad->session()->role() == _creator ? Action::ContentAdd : Action::ContentAccept,
                                 Reason() };
@@ -163,7 +163,7 @@ namespace XMPP { namespace Jingle {
 
         case Action::ContentAccept:
             contentEl.appendChild(makeLocalAnswer());
-            std::tie(transportEl, transportCB) = wrapOutgoingTransportUpdate();
+            std::tie(transportEl, transportCB) = wrapOutgoingTransportUpdate(true);
             contentEl.appendChild(transportEl);
 
             setState(State::Unacked);
@@ -173,12 +173,33 @@ namespace XMPP { namespace Jingle {
                                            setState(State::Connecting);
                                    } };
         case Action::TransportInfo:
+            Q_ASSERT(_transport->hasUpdates());
+            std::tie(transportEl, transportCB) = wrapOutgoingTransportUpdate();
+            contentEl.appendChild(transportEl);
+            return OutgoingUpdate { updates, transportCB };
         case Action::TransportReplace:
+            Q_ASSERT(_transport->hasUpdates());
+            std::tie(transportEl, transportCB) = wrapOutgoingTransportUpdate();
+            contentEl.appendChild(transportEl);
+            if (_pendingTransportReplace == PendingTransportReplace::Planned) {
+                _pendingTransportReplace = PendingTransportReplace::NeedAck;
+            }
+            return OutgoingUpdate { updates, [this, transportCB](Task *task) {
+                                       transportCB(task);
+                                       if (task->success())
+                                           _pendingTransportReplace = PendingTransportReplace::InProgress;
+                                       // else transport will report failure from its callback => select next tran.
+                                   } };
         case Action::TransportAccept:
             Q_ASSERT(_transport->hasUpdates());
             std::tie(transportEl, transportCB) = wrapOutgoingTransportUpdate();
             contentEl.appendChild(transportEl);
-            return OutgoingUpdate { updates, transportCB };
+            return OutgoingUpdate { updates, [this, transportCB](Task *task) {
+                                       transportCB(task);
+                                       if (task->success())
+                                           _pendingTransportReplace = PendingTransportReplace::None;
+                                       // else transport will report failure from its callback => select next tran.
+                                   } };
         default:
             break;
         }
@@ -186,11 +207,11 @@ namespace XMPP { namespace Jingle {
         return OutgoingUpdate(); // TODO
     }
 
-    OutgoingTransportInfoUpdate Application::wrapOutgoingTransportUpdate()
+    OutgoingTransportInfoUpdate Application::wrapOutgoingTransportUpdate(bool ensureTransportElement)
     {
         QDomElement      transportEl;
         OutgoingUpdateCB transportCB;
-        std::tie(transportEl, transportCB) = _transport->takeOutgoingUpdate();
+        std::tie(transportEl, transportCB) = _transport->takeOutgoingUpdate(ensureTransportElement);
         auto wrapCB                        = [tr = _transport.toWeakRef(), cb = std::move(transportCB)](Task *task) {
             auto transport = tr.lock();
             if (!transport) {
diff --git a/src/xmpp/xmpp-im/jingle-application.h b/src/xmpp/xmpp-im/jingle-application.h
index f310eb5b..fefbad4e 100644
--- a/src/xmpp/xmpp-im/jingle-application.h
+++ b/src/xmpp/xmpp-im/jingle-application.h
@@ -147,7 +147,7 @@ namespace XMPP { namespace Jingle {
         /**
          * @brief wraps transport update so transport can be safely-deleted before callback is triggered
          */
-        OutgoingTransportInfoUpdate wrapOutgoingTransportUpdate();
+        OutgoingTransportInfoUpdate wrapOutgoingTransportUpdate(bool ensureTransportElement = false);
 
         /**
          * @brief initTransport in general connects any necessary for the application transport signals
diff --git a/src/xmpp/xmpp-im/jingle-ibb.cpp b/src/xmpp/xmpp-im/jingle-ibb.cpp
index 036f953f..2fb7cf6f 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.cpp
+++ b/src/xmpp/xmpp-im/jingle-ibb.cpp
@@ -252,6 +252,10 @@ namespace XMPP { namespace Jingle { namespace IBB {
             }
         } else {
             if ((*it)->creator != _pad->session()->role() || (*it)->state != State::Pending) {
+                if ((*it)->state >= State::Accepted && (*it)->state <= State::Active) {
+                    qWarning("Ignoring IBB transport in state: %d", int((*it)->state));
+                    return true;
+                }
                 qWarning("Unexpected IBB answer");
                 return false; // out of order or something like this
             }
@@ -282,26 +286,36 @@ namespace XMPP { namespace Jingle { namespace IBB {
         return false;
     }
 
-    OutgoingTransportInfoUpdate Transport::takeOutgoingUpdate()
+    OutgoingTransportInfoUpdate Transport::takeOutgoingUpdate(bool ensureTransportElement)
     {
         OutgoingTransportInfoUpdate upd;
         if (!isValid()) {
             return upd;
         }
 
-        QSharedPointer<Connection> connection;
-        for (auto &c : d->connections) {
-            if (c->state == State::ApprovedToSend) {
-                connection = c;
-                break;
+        auto doc = _pad->session()->manager()->client()->doc();
+        auto it  = std::find_if(d->connections.begin(), d->connections.end(),
+                               [](auto &c) { return c->state == State::ApprovedToSend; });
+
+        if (it == d->connections.end()) {
+            if (ensureTransportElement) {
+                // a really dirty workaround here which ignore the fact IBB may have more then one transport for
+                // a single content
+                it = std::find_if(d->connections.begin(), d->connections.end(),
+                                  [](auto &c) { return c->state > State::ApprovedToSend; });
+                if (it == d->connections.end()) {
+                    return upd;
+                }
+                QDomElement tel = doc->createElementNS(NS, "transport");
+                tel.setAttribute(QStringLiteral("sid"), it.value()->sid);
+                tel.setAttribute(QString::fromLatin1("block-size"), qulonglong(it.value()->_blockSize));
+                std::get<0>(upd) = tel;
             }
-        }
-
-        if (!connection)
             return upd;
+        }
 
+        auto connection   = it.value();
         connection->state = State::Unacked;
-        auto doc          = _pad->session()->manager()->client()->doc();
 
         QDomElement tel = doc->createElementNS(NS, "transport");
         tel.setAttribute(QStringLiteral("sid"), connection->sid);
diff --git a/src/xmpp/xmpp-im/jingle-ibb.h b/src/xmpp/xmpp-im/jingle-ibb.h
index c698fee0..98295fc3 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.h
+++ b/src/xmpp/xmpp-im/jingle-ibb.h
@@ -38,7 +38,7 @@ namespace Jingle { namespace IBB {
         void                        start() override;
         bool                        update(const QDomElement &transportEl) override;
         bool                        hasUpdates() const override;
-        OutgoingTransportInfoUpdate takeOutgoingUpdate() override;
+        OutgoingTransportInfoUpdate takeOutgoingUpdate(bool ensureTransportElement = false) override;
         bool                        isValid() const override;
         TransportFeatures           features() const override;
         int                         maxSupportedChannels() const override;
@@ -49,7 +49,7 @@ namespace Jingle { namespace IBB {
     private:
         friend class Manager;
 
-        class Private;
+        struct Private;
         QScopedPointer<Private> d;
     };
 
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index 043ad500..8fb20d5a 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -156,9 +156,9 @@ namespace XMPP { namespace Jingle { namespace ICE {
 #if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
                 return in.toHex(':');
 #else
-                QByteArray out = in.toHex();
-                int size = out.size();
-                for (int k = 2; k < size; k+=3, ++size) {
+                QByteArray out  = in.toHex();
+                int        size = out.size();
+                for (int k = 2; k < size; k += 3, ++size) {
                     out.insert(k, ':');
                 }
                 return out;
@@ -817,7 +817,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
 
     bool Transport::hasUpdates() const { return isValid() && d->pendingActions; }
 
-    OutgoingTransportInfoUpdate Transport::takeOutgoingUpdate()
+    OutgoingTransportInfoUpdate Transport::takeOutgoingUpdate([[maybe_unused]] bool ensureTransportElement = false)
     {
         OutgoingTransportInfoUpdate upd;
         if (!hasUpdates() || _state < State::ApprovedToSend || (isRemote() && _state == State::Pending)) {
diff --git a/src/xmpp/xmpp-im/jingle-ice.h b/src/xmpp/xmpp-im/jingle-ice.h
index 7bf8eeb4..8a623749 100644
--- a/src/xmpp/xmpp-im/jingle-ice.h
+++ b/src/xmpp/xmpp-im/jingle-ice.h
@@ -135,7 +135,7 @@ namespace Jingle { namespace ICE {
         void                        start() override;
         bool                        update(const QDomElement &transportEl) override;
         bool                        hasUpdates() const override;
-        OutgoingTransportInfoUpdate takeOutgoingUpdate() override;
+        OutgoingTransportInfoUpdate takeOutgoingUpdate(bool ensureTransportElement) override;
         bool                        isValid() const override;
         TransportFeatures           features() const override;
         int                         maxSupportedChannels() const override;
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 13c04722..7b313ed6 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -1465,7 +1465,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
 
     bool Transport::hasUpdates() const { return isValid() && d->pendingActions; }
 
-    OutgoingTransportInfoUpdate Transport::takeOutgoingUpdate()
+    OutgoingTransportInfoUpdate Transport::takeOutgoingUpdate(bool ensureTransportElement = false)
     {
         qDebug("taking outgoing update");
         OutgoingTransportInfoUpdate upd;
@@ -1638,6 +1638,11 @@ namespace XMPP { namespace Jingle { namespace S5B {
             });
         }
 
+        auto &atel = std::get<0>(upd);
+        if (atel.isNull() && ensureTransportElement) {
+            atel = tel;
+        }
+
         return upd; // TODO
     }
 
diff --git a/src/xmpp/xmpp-im/jingle-s5b.h b/src/xmpp/xmpp-im/jingle-s5b.h
index 167e28c7..a215ecd8 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.h
+++ b/src/xmpp/xmpp-im/jingle-s5b.h
@@ -137,7 +137,7 @@ namespace Jingle { namespace S5B {
         void                        start() override;
         bool                        update(const QDomElement &transportEl) override;
         bool                        hasUpdates() const override;
-        OutgoingTransportInfoUpdate takeOutgoingUpdate() override;
+        OutgoingTransportInfoUpdate takeOutgoingUpdate(bool ensureTransportElement) override;
         bool                        isValid() const override;
         TransportFeatures           features() const override;
 
diff --git a/src/xmpp/xmpp-im/jingle-transport.h b/src/xmpp/xmpp-im/jingle-transport.h
index 65466816..b99ae06d 100644
--- a/src/xmpp/xmpp-im/jingle-transport.h
+++ b/src/xmpp/xmpp-im/jingle-transport.h
@@ -118,8 +118,16 @@ namespace XMPP { namespace Jingle {
         virtual void stop();
         virtual bool update(const QDomElement &el) = 0; // accepts transport element on incoming transport-info
         virtual bool hasUpdates() const            = 0;
-        virtual OutgoingTransportInfoUpdate takeOutgoingUpdate() = 0;
-        virtual bool                        isValid() const      = 0;
+
+        /**
+         * @brief Get an session update from the transport which looks most appropriate
+         * @param ensureTransportElement - return minimal transport element even if no updates.
+         *                                 The parameters is mostly required to satisfy XEP-0166 requirement
+         *                                 for <transport/> element in the <content/> element
+         * @return dom element and optional task completion callback
+         */
+        virtual OutgoingTransportInfoUpdate takeOutgoingUpdate(bool ensureTransportElement = false) = 0;
+        virtual bool                        isValid() const                                         = 0;
 
         // returns all the available transport features while addChannel() can use just a subset of them
         virtual TransportFeatures            features() const = 0;
@@ -127,9 +135,12 @@ namespace XMPP { namespace Jingle {
         virtual Connection::Ptr              addChannel(TransportFeatures features = TransportFeatures()) const = 0;
         virtual std::vector<Connection::Ptr> channels() const                                                   = 0;
     signals:
-        void updated(); // found some candidates and they have to be sent. takeUpdate has to be called from this signal
-                        // handler. if it's just always ready then signal has to be sent at least once otherwise
-                        // session-initiate won't be sent.
+        /**
+         * found some candidates and they have to be sent. takeUpdate has to be called from this signal
+         * handler. if it's just always ready then signal has to be sent at least once otherwise
+         * session-initiate won't be sent.
+         */
+        void updated();
         void connected(); // this signal is for app logic. maybe to finally start drawing some progress bar
         void failed();    // transport ailed for whatever reason. aborted for example. _state will be State::Finished
         void stateChanged();
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index 008246e8..2f9a39ac 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -157,13 +157,14 @@ namespace Jingle {
     Q_DECLARE_FLAGS(TransportFeatures, TransportFeature)
     Q_DECLARE_OPERATORS_FOR_FLAGS(TransportFeatures)
 
-    typedef QPair<QString, Origin>      ContentKey;
-    typedef std::function<void(Task *)> OutgoingUpdateCB;
+    using ContentKey       = QPair<QString, Origin>;
+    using OutgoingUpdateCB = std::function<void(Task *)>;
 
     // list of elements to b inserted to <jingle> and success callback
-    typedef std::tuple<QList<QDomElement>, OutgoingUpdateCB> OutgoingUpdate;
-    typedef std::tuple<QDomElement, OutgoingUpdateCB>
-        OutgoingTransportInfoUpdate; // transport element and success callback
+    using OutgoingUpdate = std::tuple<QList<QDomElement>, OutgoingUpdateCB>;
+
+    // transport element and success callback
+    using OutgoingTransportInfoUpdate = std::tuple<QDomElement, OutgoingUpdateCB>;
 
     class ErrorUtil {
     public:

From a2d3cfdd3d3481681576fb2ad031c3e36257f323 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 27 Dec 2020 16:23:59 +0300
Subject: [PATCH 279/383] Drop transport replace status to none on receive
 transport-accept

---
 src/irisnet/noncore/tcpportreserver.cpp | 28 ++++++++++++++++--------
 src/irisnet/noncore/tcpportreserver.h   |  3 +++
 src/xmpp/xmpp-im/jingle-application.cpp | 29 +++++++++++++++----------
 src/xmpp/xmpp-im/jingle-application.h   |  3 ++-
 src/xmpp/xmpp-im/jingle-ft.cpp          |  5 +++--
 src/xmpp/xmpp-im/jingle-ft.h            |  2 +-
 src/xmpp/xmpp-im/jingle-ice.cpp         |  4 ++--
 src/xmpp/xmpp-im/jingle-s5b.cpp         |  3 ++-
 src/xmpp/xmpp-im/jingle-session.cpp     |  7 +++---
 9 files changed, 52 insertions(+), 32 deletions(-)

diff --git a/src/irisnet/noncore/tcpportreserver.cpp b/src/irisnet/noncore/tcpportreserver.cpp
index a6d00f3d..bd0c375b 100644
--- a/src/irisnet/noncore/tcpportreserver.cpp
+++ b/src/irisnet/noncore/tcpportreserver.cpp
@@ -44,7 +44,8 @@ bool TcpPortDiscoverer::setExternalHost(const QString &extHost, quint16 extPort,
     p.publishPort = extPort;
     server->setPortInfo(p);
     servers.append(server);
-    emit portAvailable();
+    if (started)
+        emit portAvailable();
     return true;
 }
 
@@ -55,12 +56,16 @@ TcpPortServer::PortTypes TcpPortDiscoverer::inProgressPortTypes() const
 
 bool TcpPortDiscoverer::isDepleted() const
 {
-    return servers.size() == 0; // TODO and no active subdiscoveries
+    if (started) {
+        return servers.size() == 0; // TODO and no active subdiscoveries
+    } else {
+        return typeMask == 0; // otherwise we will tell after start
+    }
 }
 
 TcpPortServer::PortTypes TcpPortDiscoverer::setTypeMask(TcpPortServer::PortTypes mask)
 {
-    this->typeMask = mask;
+    typeMask = mask;
     // drop ready ports if any
     auto it = std::remove_if(servers.begin(), servers.end(), [mask](auto &s) { return !(s->portType() & mask); });
     servers.erase(it, servers.end());
@@ -73,7 +78,7 @@ TcpPortServer::PortTypes TcpPortDiscoverer::setTypeMask(TcpPortServer::PortTypes
     return pendingTypes;
 }
 
-void TcpPortDiscoverer::start()
+void TcpPortDiscoverer::addLocalServers()
 {
     QList<QHostAddress> listenAddrs;
     auto const          interfaces = QNetworkInterface::allInterfaces();
@@ -84,8 +89,7 @@ void TcpPortDiscoverer::start()
         if (ni.flags() & QNetworkInterface::IsLoopBack) {
             continue;
         }
-        QList<QNetworkAddressEntry> entries = ni.addressEntries();
-        for (const QNetworkAddressEntry &na : entries) {
+        for (const QNetworkAddressEntry &na : ni.addressEntries()) {
             QHostAddress h = na.ip();
             if (h.isLoopback()) {
                 continue;
@@ -122,10 +126,16 @@ void TcpPortDiscoverer::start()
         server->setPortInfo(p);
         servers.append(server);
     }
+}
 
-    if (listenAddrs.size()) {
+void TcpPortDiscoverer::start()
+{
+    started = true;
+    if (typeMask & TcpPortServer::Direct)
+        addLocalServers();
+
+    if (servers.size())
         emit portAvailable();
-    }
 }
 
 void TcpPortDiscoverer::stop()
@@ -158,7 +168,7 @@ TcpPortDiscoverer *TcpPortScope::disco()
 {
     auto discoverer = new TcpPortDiscoverer(this);
     QMetaObject::invokeMethod(parent(), "newDiscoverer", Q_ARG(TcpPortDiscoverer *, discoverer));
-    QMetaObject::invokeMethod(discoverer, "start", Qt::QueuedConnection);
+    QMetaObject::invokeMethod(discoverer, &TcpPortDiscoverer::start, Qt::QueuedConnection);
     return discoverer;
 }
 
diff --git a/src/irisnet/noncore/tcpportreserver.h b/src/irisnet/noncore/tcpportreserver.h
index bc88decd..32615021 100644
--- a/src/irisnet/noncore/tcpportreserver.h
+++ b/src/irisnet/noncore/tcpportreserver.h
@@ -89,6 +89,9 @@ public slots:
     void portAvailable();
 
 private:
+    void addLocalServers();
+
+    bool                     started = false;
     TcpPortServer::PortTypes typeMask
         = TcpPortServer::PortTypes(TcpPortServer::Direct | TcpPortServer::NatAssited | TcpPortServer::Tunneled);
     TcpPortScope *            scope = nullptr;
diff --git a/src/xmpp/xmpp-im/jingle-application.cpp b/src/xmpp/xmpp-im/jingle-application.cpp
index 8713652a..ac517cea 100644
--- a/src/xmpp/xmpp-im/jingle-application.cpp
+++ b/src/xmpp/xmpp-im/jingle-application.cpp
@@ -261,6 +261,16 @@ namespace XMPP { namespace Jingle {
         return !_transport || _transportSelector->compare(t, _transport) > 0;
     }
 
+    void Application::incomingTransportAccept(const QDomElement &el)
+    {
+        if (_pendingTransportReplace != PendingTransportReplace::InProgress) {
+            return; // ignore out of order
+        }
+        _pendingTransportReplace = PendingTransportReplace::None;
+        if (_transport->update(el) && _state >= State::Connecting)
+            _transport->start();
+    }
+
     bool Application::isTransportReplaceEnabled() const { return true; }
 
     bool Application::setTransport(const QSharedPointer<Transport> &transport, const Reason &reason)
@@ -303,22 +313,17 @@ namespace XMPP { namespace Jingle {
 
         _transport = transport;
 
-        if (!transportInitTimer) {
-            transportInitTimer = new QTimer(this);
-            transportInitTimer->setSingleShot(true);
-            transportInitTimer->setInterval(0);
-            connect(transportInitTimer, &QTimer::timeout, this, [this]() {
-                connect(_transport.data(), &Transport::updated, this, &Application::updated);
-                connect(_transport.data(), &Transport::failed, this, [this]() { selectNextTransport(); });
-
-                initTransport();
+        connect(_transport.data(), &Transport::updated, this, &Application::updated);
+        connect(_transport.data(), &Transport::failed, this, [this]() { selectNextTransport(); });
 
-                if (_transport && _transport->state() < State::Finishing && _state >= State::ApprovedToSend) {
-                    _transport->prepare();
+        if (_transport && _transport->state() < State::Finishing && _state >= State::ApprovedToSend) {
+            QTimer::singleShot(0, this, [this, wp = _transport.toWeakRef()]() {
+                auto p = wp.lock();
+                if (p && p == _transport) {
+                    prepareTransport();
                 }
             });
         }
-        transportInitTimer->start();
 
         return true;
     }
diff --git a/src/xmpp/xmpp-im/jingle-application.h b/src/xmpp/xmpp-im/jingle-application.h
index fefbad4e..f1fd0e8d 100644
--- a/src/xmpp/xmpp-im/jingle-application.h
+++ b/src/xmpp/xmpp-im/jingle-application.h
@@ -142,6 +142,7 @@ namespace XMPP { namespace Jingle {
         virtual void remove(Reason::Condition cond = Reason::Success, const QString &comment = QString()) = 0;
 
         virtual void incomingRemove(const Reason &r) = 0;
+        void         incomingTransportAccept(const QDomElement &el);
 
     protected:
         /**
@@ -152,7 +153,7 @@ namespace XMPP { namespace Jingle {
         /**
          * @brief initTransport in general connects any necessary for the application transport signals
          */
-        virtual void initTransport() = 0;
+        virtual void prepareTransport() = 0;
 
     signals:
         void updated(); // signal for session it has to send updates to remote. so it will follow with
diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index b16da7a5..9854f44f 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -644,7 +644,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
 
     bool Application::isTransportReplaceEnabled() const { return _state < State::Active; }
 
-    void Application::initTransport()
+    void Application::prepareTransport()
     {
         if (_transport->creator() == _pad->session()->role()) {
             d->connection = _transport->addChannel(TransportFeature::Reliable | TransportFeature::DataOriented);
@@ -696,6 +696,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
                 emit connectionReady();
             }
         });
+        _transport->prepare();
     }
 
     void Application::setStreamingMode(bool mode)
@@ -767,7 +768,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
         }
         if (_transport) {
             d->setState(State::ApprovedToSend);
-            _transport->prepare();
+            prepareTransport();
         }
     }
 
diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index ef561d8c..1f4b1449 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -170,7 +170,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
 
     protected:
         void incomingRemove(const Reason &r) override;
-        void initTransport() override;
+        void prepareTransport() override;
 
     private:
         void prepareThumbnail(File &file);
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index 8fb20d5a..373ed7f2 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -1,6 +1,6 @@
 /*
- * jignle-s5b.cpp - Jingle SOCKS5 transport
- * Copyright (C) 2019  Sergey Ilinykh
+ * jignle-ice.cpp - Jingle ICE transport
+ * Copyright (C) 2020  Sergey Ilinykh
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 7b313ed6..f81dfe25 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -845,7 +845,8 @@ namespace XMPP { namespace Jingle { namespace S5B {
                     types |= TcpPortServer::Tunneled;
                 }
             }
-            if (!disco->setTypeMask(types)) {
+            disco->setTypeMask(types);
+            if (disco->isDepleted()) {
                 delete disco;
                 disco = nullptr;
             }
diff --git a/src/xmpp/xmpp-im/jingle-session.cpp b/src/xmpp/xmpp-im/jingle-session.cpp
index 9301cbfc..9c6712bf 100644
--- a/src/xmpp/xmpp-im/jingle-session.cpp
+++ b/src/xmpp/xmpp-im/jingle-session.cpp
@@ -915,17 +915,16 @@ namespace XMPP { namespace Jingle {
 
                 Application *app = contentList.value(ContentKey { cb.name, cb.creator });
                 if (!app || !app->transport() || app->transport()->creator() != role
-                    || app->transport()->state() != State::Pending) {
+                    || app->transport()->state() != State::Pending || transportNS != app->transport()->pad()->ns()) {
                     // ignore out of order
+                    qInfo("ignore out of order transport-accept");
                     continue;
                 }
                 updates.append(qMakePair(app, transportEl));
             }
 
             for (auto &u : updates) {
-                if (u.first->transport()->update(u.second) && u.first->state() >= State::Connecting) {
-                    u.first->transport()->start();
-                }
+                u.first->incomingTransportAccept(u.second);
                 // if update fails transport should trigger replace procedure
             }
 

From 1166678308b26502ac1d86daacd56405fff4fe53 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 28 Dec 2020 20:08:30 +0300
Subject: [PATCH 280/383] Bring back old way of slot call in tcpportreserver
 for backward compatibility

---
 src/irisnet/noncore/tcpportreserver.cpp |  2 +-
 src/xmpp/xmpp-im/jingle-ice.cpp         | 77 ++++++++++++++++++-------
 2 files changed, 57 insertions(+), 22 deletions(-)

diff --git a/src/irisnet/noncore/tcpportreserver.cpp b/src/irisnet/noncore/tcpportreserver.cpp
index bd0c375b..07cb1407 100644
--- a/src/irisnet/noncore/tcpportreserver.cpp
+++ b/src/irisnet/noncore/tcpportreserver.cpp
@@ -168,7 +168,7 @@ TcpPortDiscoverer *TcpPortScope::disco()
 {
     auto discoverer = new TcpPortDiscoverer(this);
     QMetaObject::invokeMethod(parent(), "newDiscoverer", Q_ARG(TcpPortDiscoverer *, discoverer));
-    QMetaObject::invokeMethod(discoverer, &TcpPortDiscoverer::start, Qt::QueuedConnection);
+    QMetaObject::invokeMethod(discoverer, "start", Qt::QueuedConnection);
     return discoverer;
 }
 
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index 373ed7f2..c429fa97 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -41,6 +41,7 @@
 namespace XMPP { namespace Jingle { namespace ICE {
     const QString NS(QStringLiteral("urn:xmpp:jingle:transports:ice:0"));
     const QString NS_DTLS(QStringLiteral("urn:xmpp:jingle:apps:dtls:0"));
+    const QString NS_SCTP(QStringLiteral("urn:xmpp:jingle:transports:dtls-sctp:1"));
 
     // TODO: reject offers that don't contain at least one of audio or video
     // TODO: support candidate negotiations over the JingleRtpChannel thread
@@ -128,6 +129,36 @@ namespace XMPP { namespace Jingle { namespace ICE {
     };
     std::weak_ptr<SctpKeeper> SctpKeeper::instance;
 
+    enum class SctpProtocol { None, WebRTCDataChannel };
+
+    struct SctpElement {
+        SctpProtocol protocol = SctpProtocol::None;
+        uint16_t     number   = 0;
+
+        QDomElement toXml(QDomDocument *doc)
+        {
+            QDomElement ret;
+            if (protocol == SctpProtocol::None)
+                return ret;
+            ret = doc->createElementNS(NS_SCTP, QLatin1String("sctpmap"));
+            ret.setAttribute(QLatin1String("protocol"), QLatin1String("webrtc-datachannel"));
+            ret.setAttribute(QLatin1String("number"), number);
+            return ret;
+        }
+
+        bool parse(const QDomElement &el)
+        {
+            if (el.namespaceURI() != NS_SCTP) {
+                return false;
+            }
+            auto p = el.attribute(QLatin1String("protocol"));
+            protocol
+                = (p == QLatin1String("webrtc-datachannel")) ? SctpProtocol::WebRTCDataChannel : SctpProtocol::None;
+            number = el.attribute(QLatin1String("number")).toInt();
+            return protocol != SctpProtocol::None && number > 0;
+        }
+    };
+
     static std::array<const char *, 4> fpRoles { { "active", "passive", "actpass", "holdconn" } };
     struct FingerPrint {
         enum Setup { Active, Passive, ActPass, HoldConn };
@@ -302,23 +333,6 @@ namespace XMPP { namespace Jingle { namespace ICE {
         //        Jid                         proxy;
     };
 
-    class JingleRtpRemoteCandidate {
-    public:
-        int          component;
-        QHostAddress addr;
-        int          port;
-
-        JingleRtpRemoteCandidate() : component(-1), port(-1) { }
-    };
-
-    class JingleRtpTrans {
-    public:
-        QString                         user;
-        QString                         pass;
-        QList<XMPP::Ice176::Candidate>  candidates;
-        QList<JingleRtpRemoteCandidate> remoteCandidates;
-    };
-
     static XMPP::Ice176::Candidate elementToCandidate(const QDomElement &e)
     {
         if (e.tagName() != "candidate")
@@ -447,6 +461,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
         QList<XMPP::Ice176::Candidate> remoteCandidates;
         QString                        remoteUfrag;
         QString                        remotePassword;
+        SctpElement                    sctp;
 
         // QString            sid;
         // Transport::Mode    mode = Transport::Tcp;
@@ -481,10 +496,30 @@ namespace XMPP { namespace Jingle { namespace ICE {
                 return;
             ice->setPeerUfrag(remoteUfrag);
             ice->setPeerPassword(remotePassword);
-            if (!remoteCandidates.isEmpty()) {
-                ice->addRemoteCandidates(remoteCandidates);
-                remoteCandidates.clear();
+            if (remoteCandidates.isEmpty())
+                return;
+            ice->addRemoteCandidates(remoteCandidates);
+
+            /*
+             * The channels split topic is somewhat complicated.
+             * We can talk about multiplexed rtp/rtcp channels, about sctp channels or maybe plain ICE components.
+             * In general it's upto the application controlling the transport to request proper amount of components.
+             *
+             */
+            for (auto const &c : remoteCandidates) {
+                if (std::none_of(channels.begin(), channels.end(),
+                                 [&c](auto const &channel) { return c.component == channel->channelIndex; })) {
+                    TransportFeatures features;
+                    if (sctp.protocol != SctpProtocol::None)
+                        features |= TransportFeature::DataOriented;
+                    channels.insert(c.component, QSharedPointer<Connection>::create(c.component, features));
+                }
             }
+
+            remoteCandidates.clear();
+
+            std::sort(remoteCandidates.begin(), remoteCandidates.end(),
+                      [](const auto &a, const auto &b) { return a.component < b.component; });
         }
 
         bool handleIncomingCandidate(const QDomElement &transportEl)
@@ -808,7 +843,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
                 return true;
             }
         } catch (std::runtime_error &e) {
-            qWarning("Transport updated failed: %s", e.what());
+            qWarning("Transport update failed: %s", e.what());
             return false;
         }
 

From ec6069716d73f1c38bcc1dedd154dc14862be399 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 14 Feb 2021 22:46:01 +0300
Subject: [PATCH 281/383] ICE jingle transport in progress

---
 src/irisnet/noncore/ice176.h          |   2 +-
 src/xmpp/xmpp-im/jingle-ibb.cpp       |  17 ++--
 src/xmpp/xmpp-im/jingle-ibb.h         |   8 +-
 src/xmpp/xmpp-im/jingle-ice.cpp       | 118 +++++++++++++++-----------
 src/xmpp/xmpp-im/jingle-ice.h         |   7 +-
 src/xmpp/xmpp-im/jingle-s5b.cpp       |   7 +-
 src/xmpp/xmpp-im/jingle-s5b.h         |   5 +-
 src/xmpp/xmpp-im/jingle-session.cpp   |   7 +-
 src/xmpp/xmpp-im/jingle-transport.cpp |   8 +-
 src/xmpp/xmpp-im/jingle-transport.h   |  61 ++++++++++++-
 src/xmpp/xmpp-im/jingle.h             |   2 +-
 11 files changed, 168 insertions(+), 74 deletions(-)

diff --git a/src/irisnet/noncore/ice176.h b/src/irisnet/noncore/ice176.h
index b98e2cf0..167b2f0e 100644
--- a/src/irisnet/noncore/ice176.h
+++ b/src/irisnet/noncore/ice176.h
@@ -97,7 +97,7 @@ class Ice176 : public QObject {
     // one per local address.  you must set local addresses first.
     void setExternalAddresses(const QList<ExternalAddress> &addrs);
 
-    void setStunBindService(const QHostAddress &addr, int port);
+    void setStunBindService(const QHostAddress &addr, int port); // REVIEW if we need both v4 and v6?
     void setStunRelayUdpService(const QHostAddress &addr, int port, const QString &user, const QCA::SecureArray &pass);
     void setStunRelayTcpService(const QHostAddress &addr, int port, const QString &user, const QCA::SecureArray &pass);
 
diff --git a/src/xmpp/xmpp-im/jingle-ibb.cpp b/src/xmpp/xmpp-im/jingle-ibb.cpp
index 2fb7cf6f..219ef590 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.cpp
+++ b/src/xmpp/xmpp-im/jingle-ibb.cpp
@@ -29,6 +29,8 @@
 #include <QRandomGenerator>
 #endif
 
+template <class T> constexpr std::add_const_t<T> &as_const(T &t) noexcept { return t; }
+
 namespace XMPP { namespace Jingle { namespace IBB {
     const QString NS(QStringLiteral("urn:xmpp:jingle:transports:ibb:1"));
 
@@ -353,20 +355,21 @@ namespace XMPP { namespace Jingle { namespace IBB {
             | TransportFeature::DataOriented;
     }
 
-    int Transport::maxSupportedChannels() const { return -1; }
+    int Transport::maxSupportedChannelsPerComponent(TransportFeatures) const { return -1; }
 
-    Connection::Ptr Transport::addChannel(TransportFeatures features) const
+    Connection::Ptr Transport::addChannel(TransportFeatures features, int) const
     {
-        Q_UNUSED(features); // IBB can't build different channels depending on features
+        if (features & TransportFeature::LiveOriented)
+            return {};
         return d->newStream(QString(), d->defaultBlockSize, _pad->session()->role());
     }
 
-    std::vector<XMPP::Jingle::Connection::Ptr> Transport::channels() const
+    QList<XMPP::Jingle::Connection::Ptr> Transport::channels() const
     {
-        std::vector<Connection::Ptr> ret;
+        QList<Connection::Ptr> ret;
         ret.reserve(d->connections.size());
-        for (auto const &v : d->connections) {
-            ret.push_back(v);
+        for (auto const &v : as_const(d->connections)) {
+            ret.append(v);
         }
         return ret;
     }
diff --git a/src/xmpp/xmpp-im/jingle-ibb.h b/src/xmpp/xmpp-im/jingle-ibb.h
index 98295fc3..b652f51e 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.h
+++ b/src/xmpp/xmpp-im/jingle-ibb.h
@@ -41,10 +41,10 @@ namespace Jingle { namespace IBB {
         OutgoingTransportInfoUpdate takeOutgoingUpdate(bool ensureTransportElement = false) override;
         bool                        isValid() const override;
         TransportFeatures           features() const override;
-        int                         maxSupportedChannels() const override;
+        int                         maxSupportedChannelsPerComponent(TransportFeatures features) const override;
 
-        Connection::Ptr              addChannel(TransportFeatures features = TransportFeatures()) const override;
-        std::vector<Connection::Ptr> channels() const override;
+        Connection::Ptr        addChannel(TransportFeatures features, int component = 0) const override;
+        QList<Connection::Ptr> channels() const override;
 
     private:
         friend class Manager;
@@ -91,7 +91,7 @@ namespace Jingle { namespace IBB {
         bool            handleIncoming(IBBConnection *c);
 
     private:
-        class Private;
+        struct Private;
         QScopedPointer<Private> d;
     };
 } // namespace IBB
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index c429fa97..f2a33fb6 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -391,10 +391,10 @@ namespace XMPP { namespace Jingle { namespace ICE {
     public:
         QList<NetworkDatagram> datagrams;
         void *                 client;
-        int                    channelIndex;
+        int                    component; // starting from 0
         TransportFeatures      features;
 
-        Connection(int channelIndex, TransportFeatures features) : channelIndex(channelIndex), features(features)
+        Connection(int component, TransportFeatures features) : component(component), features(features)
         {
             /*connect(client, &SocksClient::readyRead, this, &Connection::readyRead);
             connect(client, &SocksClient::bytesWritten, this, &Connection::bytesWritten);
@@ -457,7 +457,8 @@ namespace XMPP { namespace Jingle { namespace ICE {
         bool                           iceStarted                      = false;
         quint16                        pendingActions                  = 0;
         int                            proxiesInDiscoCount             = 0;
-        QList<XMPP::Ice176::Candidate> localCandidates; // cid to candidate mapping
+        int                            components                      = 0;
+        QList<XMPP::Ice176::Candidate> pendingLocalCandidates; // cid to candidate mapping
         QList<XMPP::Ice176::Candidate> remoteCandidates;
         QString                        remoteUfrag;
         QString                        remotePassword;
@@ -481,7 +482,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
         int          stunRelayUdpPort;
         int          stunRelayTcpPort;
 
-        QMap<int, QSharedPointer<Connection>> channels;
+        QList<QSharedPointer<Connection>> channels;
 
         // udp stuff
         bool         udpInitialized;
@@ -499,23 +500,6 @@ namespace XMPP { namespace Jingle { namespace ICE {
             if (remoteCandidates.isEmpty())
                 return;
             ice->addRemoteCandidates(remoteCandidates);
-
-            /*
-             * The channels split topic is somewhat complicated.
-             * We can talk about multiplexed rtp/rtcp channels, about sctp channels or maybe plain ICE components.
-             * In general it's upto the application controlling the transport to request proper amount of components.
-             *
-             */
-            for (auto const &c : remoteCandidates) {
-                if (std::none_of(channels.begin(), channels.end(),
-                                 [&c](auto const &channel) { return c.component == channel->channelIndex; })) {
-                    TransportFeatures features;
-                    if (sctp.protocol != SctpProtocol::None)
-                        features |= TransportFeature::DataOriented;
-                    channels.insert(c.component, QSharedPointer<Connection>::create(c.component, features));
-                }
-            }
-
             remoteCandidates.clear();
 
             std::sort(remoteCandidates.begin(), remoteCandidates.end(),
@@ -538,15 +522,43 @@ namespace XMPP { namespace Jingle { namespace ICE {
                     if (remoteUfrag.isEmpty() || remotePassword.isEmpty())
                         throw std::runtime_error("user fragment or password can't be empty");
                 }
+                if (ic.component > components) {
+                    if (q->_state >= State::ApprovedToSend) {
+                        throw std::runtime_error("too late to add components");
+                    }
+                    components = ic.component;
+                }
                 // qDebug("new remote candidate: %s", qPrintable(c.toString()));
                 remoteCandidates.append(ic); // TODO check for collisions!
                 candidatesAdded++;
             }
-            if (candidatesAdded && ice) {
+            if (!candidatesAdded) {
+                return false;
+            }
+            if (q->isRemote() && channels.empty()) {
+                /*
+                 * seems like initial offer
+                 *
+                 * The channels split topic is somewhat complicated.
+                 * We can talk about multiplexed rtp/rtcp channels, about sctp channels or maybe plain ICE components.
+                 * In general logic is as following:
+                 *  - no datachannels - amount of channels = amount of components
+                 *  - with datachannels - one channel for datachannel on component 1. one channel per component with
+                 *                        filtered out datachannel
+                 */
+                TransportFeatures features(TransportFeature::HighProbableConnect | TransportFeature::Fast
+                                           | TransportFeature::MessageOriented);
+                if (sctp.protocol != SctpProtocol::None) {
+                    channels.append(QSharedPointer<Connection>::create(0, features | TransportFeature::DataOriented));
+                }
+                for (int i = 0; i < components; i++) {
+                    channels.append(QSharedPointer<Connection>::create(i, features));
+                }
+            }
+            if (ice) {
                 QTimer::singleShot(0, q, [this]() { flushRemoteCandidates(); });
-                return true;
             }
-            return false;
+            return true;
         }
 
         bool handleIncomingRemoteCandidate(const QDomElement &transportEl)
@@ -561,7 +573,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
                 if (!(ok && ok2 && !ip.isNull()))
                     throw std::runtime_error("failed to parse remote-candidate");
                 /*
-                                auto cUsed = localCandidates.value(el.attribute(QStringLiteral("cid")));
+                                auto cUsed = pendingLocalCandidates.value(el.attribute(QStringLiteral("cid")));
                                 if (!cUsed) {
                                     throw std::runtime_error("failed to find incoming candidate-used candidate");
                                 }
@@ -592,7 +604,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
             if (!el.isNull()) {
                 remoteReportedGatheringComplete = true;
                 /*
-                for (auto &c : localCandidates) {
+                for (auto &c : pendingLocalCandidates) {
                     if (c.state() == Candidate::Pending) {
                         c.setState(Candidate::Discarded);
                     }
@@ -679,7 +691,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
                 QSet<int> lowOverhead;
                 for (auto &c : channels) {
                     if (!(c->hints() & Connection::AvoidRelays)) {
-                        lowOverhead.insert(c->channelIndex);
+                        lowOverhead.insert(c->component);
                     }
                 }
                 for (auto componentIndex : lowOverhead) {
@@ -695,7 +707,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
             q->connect(ice, &XMPP::Ice176::localCandidatesReady,
                        [this](const QList<XMPP::Ice176::Candidate> &candidates) {
                            pendingActions |= NewCandidate;
-                           localCandidates += candidates;
+                           pendingLocalCandidates += candidates;
                            emit q->updated();
                        });
             q->connect(ice, &XMPP::Ice176::localGatheringComplete, [this]() {
@@ -763,7 +775,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
                                             manager->stunRelayTcpPass.toUtf8());
 
             // RTP+RTCP
-            ice->setComponentCount(channels.count());
+            ice->setComponentCount(components);
 
             ice->setLocalFeatures(Ice176::Trickle);
 
@@ -871,9 +883,11 @@ namespace XMPP { namespace Jingle { namespace ICE {
                     .toXml(doc));
         }
 
-        for (auto const &cand : d->localCandidates) {
+        for (auto const &cand : d->pendingLocalCandidates) {
             tel.appendChild(candidateToElement(doc, cand));
         }
+        d->pendingLocalCandidates.clear();
+        d->pendingActions &= ~Private::NewCandidate;
 
         if (d->pendingActions & Private::GatheringComplete) {
             tel.appendChild(doc->createElement(QLatin1String("gathering-complete")));
@@ -903,11 +917,24 @@ namespace XMPP { namespace Jingle { namespace ICE {
 
     TransportFeatures Transport::features() const { return _pad->manager()->features(); }
 
-    int Transport::maxSupportedChannels() const { return -1; };
+    int Transport::maxSupportedChannelsPerComponent(TransportFeatures features) const
+    {
+        return features & TransportFeature::DataOriented ? 65536 : 1;
+    };
+
+    int Transport::addComponent()
+    {
+        if (_state >= State::ApprovedToSend) {
+            qWarning("adding component after ICE started is not supported");
+            return 0;
+        }
+        d->components++;
+        return d->components;
+    }
 
     // adding ice components (for rtp, rtcp, datachannel etc)
     // but those are rather abstract channels and it's up to ice manager in TransportPad to decide
-    Connection::Ptr Transport::addChannel(TransportFeatures features) const
+    Connection::Ptr Transport::addChannel(TransportFeatures features, int component) const
     {
         // features define type of channel. reliable channels infer sctp
         // if time-oriented - likely rtp
@@ -918,27 +945,22 @@ namespace XMPP { namespace Jingle { namespace ICE {
             return Connection::Ptr();
         }
 
-        // find a gap in the list of channel indexes or just take last one
-        int  channelIdx = 0;
-        auto it         = d->channels.constBegin();
-        while (it != d->channels.constEnd()) {
-            if (it.key() != channelIdx)
-                break;
-            channelIdx++;
-            ++it;
+        if (component >= d->components) {
+            d->components = component + 1;
         }
-        auto conn = QSharedPointer<Connection>::create(channelIdx, features);
-        d->channels.insert(it, channelIdx, conn);
+        // find a gap in the list of channel indexes or just take last one
+        auto conn
+            = QSharedPointer<Connection>::create(features & TransportFeature::DataOriented ? 0 : component, features);
+        d->channels.append(conn);
 
         return conn.staticCast<XMPP::Jingle::Connection>();
     }
 
-    std::vector<XMPP::Jingle::Connection::Ptr> Transport::channels() const
+    QList<XMPP::Jingle::Connection::Ptr> Transport::channels() const
     {
-        std::vector<Connection::Ptr> ret;
-        ret.reserve(d->channels.size());
-        for (auto const &v : d->channels) {
-            ret.push_back(v);
+        QList<XMPP::Jingle::Connection::Ptr> ret;
+        for (auto &c : d->channels) {
+            ret.append(c.staticCast<XMPP::Jingle::Connection>());
         }
         return ret;
     }
@@ -961,7 +983,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
     TransportFeatures Manager::features() const
     {
         return TransportFeature::HighProbableConnect | TransportFeature::Reliable | TransportFeature::Unreliable
-            | TransportFeature::MessageOriented | TransportFeature::DataOriented | TransportFeature::TimeOriented;
+            | TransportFeature::MessageOriented | TransportFeature::DataOriented | TransportFeature::LiveOriented;
     }
 
     void Manager::setJingleManager(XMPP::Jingle::Manager *jm) { d->jingleManager = jm; }
diff --git a/src/xmpp/xmpp-im/jingle-ice.h b/src/xmpp/xmpp-im/jingle-ice.h
index 8a623749..1f8fe1b0 100644
--- a/src/xmpp/xmpp-im/jingle-ice.h
+++ b/src/xmpp/xmpp-im/jingle-ice.h
@@ -138,10 +138,11 @@ namespace Jingle { namespace ICE {
         OutgoingTransportInfoUpdate takeOutgoingUpdate(bool ensureTransportElement) override;
         bool                        isValid() const override;
         TransportFeatures           features() const override;
-        int                         maxSupportedChannels() const override;
+        int                         maxSupportedChannelsPerComponent(TransportFeatures features) const override;
 
-        Connection::Ptr              addChannel(TransportFeatures features = TransportFeatures()) const override;
-        std::vector<Connection::Ptr> channels() const override;
+        int                    addComponent() override;
+        Connection::Ptr        addChannel(TransportFeatures features, int component = 0) const override;
+        QList<Connection::Ptr> channels() const override;
 
     private:
         friend class Manager;
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index f81dfe25..310fa4f4 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -1655,13 +1655,16 @@ namespace XMPP { namespace Jingle { namespace S5B {
 
     QString Transport::directAddr() const { return d->directAddr; }
 
-    XMPP::Jingle::Connection::Ptr Transport::addChannel(TransportFeatures features) const
+    int Transport::maxSupportedChannelsPerComponent(TransportFeatures) const { return 1; }
+
+    XMPP::Jingle::Connection::Ptr Transport::addChannel(TransportFeatures features, int) const
     {
+        // TODO consider features and create connections here.
         Q_UNUSED(features); // no way create something depending on features
         return d->connection;
     }
 
-    std::vector<XMPP::Jingle::Connection::Ptr> Transport::channels() const
+    QList<XMPP::Jingle::Connection::Ptr> Transport::channels() const
     {
         // return {}; // good to test transport failure
         return { { d->connection } };
diff --git a/src/xmpp/xmpp-im/jingle-s5b.h b/src/xmpp/xmpp-im/jingle-s5b.h
index a215ecd8..caad2921 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.h
+++ b/src/xmpp/xmpp-im/jingle-s5b.h
@@ -144,8 +144,9 @@ namespace Jingle { namespace S5B {
         QString sid() const;
         QString directAddr() const;
 
-        Connection::Ptr              addChannel(TransportFeatures features = TransportFeatures()) const override;
-        std::vector<Connection::Ptr> channels() const override;
+        int                    maxSupportedChannelsPerComponent(TransportFeatures features) const override;
+        Connection::Ptr        addChannel(TransportFeatures features, int component = 0) const override;
+        QList<Connection::Ptr> channels() const override;
 
     private:
         friend class Manager;
diff --git a/src/xmpp/xmpp-im/jingle-session.cpp b/src/xmpp/xmpp-im/jingle-session.cpp
index 9c6712bf..fc4b8e1f 100644
--- a/src/xmpp/xmpp-im/jingle-session.cpp
+++ b/src/xmpp/xmpp-im/jingle-session.cpp
@@ -539,7 +539,7 @@ namespace XMPP { namespace Jingle {
                     return ParseContentListResult(Unparsed, cond, QList<Application *>(), QList<QDomElement>());
                 }
 
-                auto contentName = app->contentName();
+                auto contentName = ce.attribute(QLatin1String("name"));
                 auto it          = addSet.find(contentName);
                 if (err != Private::AddContentError::Ok) {
                     // can't continue as well
@@ -991,6 +991,11 @@ namespace XMPP { namespace Jingle {
         d->stepTimer.setSingleShot(true);
         d->stepTimer.setInterval(0);
         connect(&d->stepTimer, &QTimer::timeout, this, [this]() { d->doStep(); });
+        connect(manager->client(), &Client::disconnected, this, [this]() {
+            d->waitingAck      = false;
+            d->terminateReason = Reason(Reason::ConnectivityError, QLatin1String("local side disconnected"));
+            d->setSessionFinished();
+        });
     }
 
     Session::~Session()
diff --git a/src/xmpp/xmpp-im/jingle-transport.cpp b/src/xmpp/xmpp-im/jingle-transport.cpp
index 68020656..eafed664 100644
--- a/src/xmpp/xmpp-im/jingle-transport.cpp
+++ b/src/xmpp/xmpp-im/jingle-transport.cpp
@@ -35,7 +35,11 @@ namespace XMPP { namespace Jingle {
 
     void Transport::stop() { _state = State::Finished; }
 
-    int Transport::maxSupportedChannels() const { return 1; }
+    int Transport::maxSupportedComponents() const { return 1; }
+
+    int Transport::addComponent() { return 0; }
+
+    int Transport::maxSupportedChannelsPerComponent(TransportFeatures) const { return 0; }
 
     void Transport::setState(State newState)
     {
@@ -60,6 +64,8 @@ namespace XMPP { namespace Jingle {
         return 0; // means "block" is not applicable for this kind of connection
     }
 
+    int Connection::component() const { return 0; }
+
     //----------------------------------------------------------------------------
     // TransportSelector
     //----------------------------------------------------------------------------
diff --git a/src/xmpp/xmpp-im/jingle-transport.h b/src/xmpp/xmpp-im/jingle-transport.h
index b99ae06d..3d5de034 100644
--- a/src/xmpp/xmpp-im/jingle-transport.h
+++ b/src/xmpp/xmpp-im/jingle-transport.h
@@ -63,6 +63,7 @@ namespace XMPP { namespace Jingle {
         virtual bool            hasPendingDatagrams() const;
         virtual NetworkDatagram receiveDatagram(qint64 maxSize = -1);
         virtual size_t          blockSize() const;
+        virtual int             component() const;
 
         inline void  setHints(Hints hints) { _hints = hints; }
         inline Hints hints() const { return _hints; }
@@ -130,10 +131,62 @@ namespace XMPP { namespace Jingle {
         virtual bool                        isValid() const                                         = 0;
 
         // returns all the available transport features while addChannel() can use just a subset of them
-        virtual TransportFeatures            features() const = 0;
-        virtual int                          maxSupportedChannels() const;
-        virtual Connection::Ptr              addChannel(TransportFeatures features = TransportFeatures()) const = 0;
-        virtual std::vector<Connection::Ptr> channels() const                                                   = 0;
+        virtual TransportFeatures features() const = 0;
+
+        // a component is basically is a subconnection usually with a dedicated IP port. A component may have one or
+        // more channels. Components are pretty much generic but channels aren't. Channels give connection objects,
+        // wbile components are rather indexes.
+
+        /**
+         * @brief maxSupportedComponents
+         * @return max number of components >=1.
+         *
+         * If the function returns -1 then it assumes number of components is unlimited. Even so it may depend on some
+         * factors like number of still available udp ports for example for udp based transport.
+         */
+        virtual int maxSupportedComponents() const;
+
+        /**
+         * @brief addComponent add another component to the transport connection
+         * @return index of the component (starting from 1 - second component. see below)
+         *
+         * Note, component with index 0 is considered to be always added since it doesn't make sense to have a transport
+         * w/o any component. So if the transport has just one component, the application should avoid calling this
+         * function.
+         */
+        virtual int addComponent();
+
+        /**
+         * @brief maxSupportedChannelsPerComponent returns max number supported channels for specific features set
+         * @param features - required features
+         * @return number of channel. 0 if not supported for given features set or non-zero if suported.
+         *
+         * Transports MUST reimplement this method, otherwise by default it's 0 (the transport won't work)
+         *
+         * Channels transfer some specific data. For example if those are DataOriented channels then for ICE transport
+         * we can assume max SCTP channels. Again for ICE and time-oriented channels it's 1 since the transport doesn't
+         * handle any channel protocols in this case and it's up to the application to do any multiplexing.
+         */
+        virtual int maxSupportedChannelsPerComponent(TransportFeatures features) const;
+
+        /**
+         * @brief addChannel adds a channel to the component.
+         * @param features   - required channel features. like DataOriented for example
+         * @param component  - index of component to add the channel to.
+         * @return connection object which eventually will fire `connected()` signal
+         *
+         * It's necessary to add components in advance since we always have at least one component.
+         * For example a file transfer transport may just call `addChannel(TransportFeature::DataOriented)` to have
+         * reliable connection object on the component 0. Transports not supporting components notation are considered
+         * to support just one component with index 0
+         */
+        virtual Connection::Ptr addChannel(TransportFeatures features, int component = 0) const = 0;
+
+        /**
+         * @brief channels
+         * @return the list of all added channels both local and remote
+         */
+        virtual QList<Connection::Ptr> channels() const = 0;
     signals:
         /**
          * found some candidates and they have to be sent. takeUpdate has to be called from this signal
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index 2f9a39ac..962ec3e4 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -152,7 +152,7 @@ namespace Jingle {
 
         // exclusive
         DataOriented = 0x800, // the goal is to deliver data
-        TimeOriented = 0x1000 // the goal is keep data synchronized with time (e.g. for rtp)
+        LiveOriented = 0x1000 // the goal is keep data synchronized with time (e.g. for rtp)
     };
     Q_DECLARE_FLAGS(TransportFeatures, TransportFeature)
     Q_DECLARE_OPERATORS_FOR_FLAGS(TransportFeatures)

From 14c3b2b7a40f059443886ddaba0d688e1339214d Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sat, 20 Feb 2021 18:58:56 +0300
Subject: [PATCH 282/383] Ensure turn/stun timeouts eventually lead to
 gathering-complete

---
 src/irisnet/noncore/icecomponent.cpp      | 47 +++++++++++++++--------
 src/irisnet/noncore/icelocaltransport.cpp |  6 +++
 src/irisnet/noncore/icelocaltransport.h   |  5 ++-
 src/xmpp/xmpp-im/client.cpp               |  2 +-
 src/xmpp/xmpp-im/jingle-ice.cpp           |  8 ++--
 5 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/src/irisnet/noncore/icecomponent.cpp b/src/irisnet/noncore/icecomponent.cpp
index 5b11df9f..38e8126a 100644
--- a/src/irisnet/noncore/icecomponent.cpp
+++ b/src/irisnet/noncore/icecomponent.cpp
@@ -30,6 +30,8 @@
 #include <QtCrypto>
 #include <stdlib.h>
 
+template <class T> constexpr std::add_const_t<T> &as_const(T &t) noexcept { return t; }
+
 namespace XMPP {
 static int calc_priority(int typePref, int localPref, int componentId)
 {
@@ -130,8 +132,14 @@ class IceComponent::Private : public QObject {
                 tryStopped();
         });
         connect(lt->sock.data(), SIGNAL(addressesChanged()), SLOT(lt_addressesChanged()));
-        connect(lt->sock.data(), &IceLocalTransport::error, this, [this, lt](int) {
-            if (eraseLocalTransport(lt))
+        connect(lt->sock.data(), &IceLocalTransport::error, this, [this, lt](int error) {
+            if (error == IceLocalTransport::ErrorStun) {
+                lt->stun_finished = true;
+                tryGatheringComplete();
+            } else if (error == IceLocalTransport::ErrorTurn) {
+                lt->turn_finished = true;
+                tryGatheringComplete();
+            } else if (eraseLocalTransport(lt))
                 tryGatheringComplete();
         });
         connect(lt->sock.data(), SIGNAL(debugLine(QString)), SLOT(lt_debugLine(QString)));
@@ -160,7 +168,7 @@ class IceComponent::Private : public QObject {
 
         // for now, only allow setting localAddrs once
         if (!pending.localAddrs.isEmpty() && config.localAddrs.isEmpty()) {
-            for (const Ice176::LocalAddress &la : pending.localAddrs) {
+            for (const Ice176::LocalAddress &la : as_const(pending.localAddrs)) {
                 // skip duplicate addrs
                 if (findLocalAddr(la.addr) != -1)
                     continue;
@@ -209,7 +217,7 @@ class IceComponent::Private : public QObject {
 
             bool need_doExt = false;
 
-            for (auto lt : udpTransports) {
+            for (auto lt : as_const(udpTransports)) {
                 // already assigned an ext address?  skip
                 if (!lt->extAddr.isNull())
                     continue;
@@ -239,7 +247,7 @@ class IceComponent::Private : public QObject {
 
                     ObjectSessionWatcher watch(&sess);
 
-                    for (auto lt : udpTransports) {
+                    for (auto lt : as_const(udpTransports)) {
                         if (lt->started) {
                             int addrAt = findLocalAddr(lt->addr);
                             Q_ASSERT(addrAt != -1);
@@ -288,7 +296,7 @@ class IceComponent::Private : public QObject {
             return;
         }
 
-        for (LocalTransport *lt : udpTransports)
+        for (LocalTransport *lt : as_const(udpTransports))
             lt->sock->stop();
 
         if (tcpTurn)
@@ -532,7 +540,7 @@ private slots:
         };
 
         bool allFinished = true;
-        for (const LocalTransport *lt : udpTransports) {
+        for (const LocalTransport *lt : as_const(udpTransports)) {
             if (!checkFinished(lt)) {
                 allFinished = false;
                 break;
@@ -596,18 +604,23 @@ private slots:
                 return;
         }
 
-        if (!lt->stun_started
-            && (!lt->sock->stunBindServiceAddress().isNull() || !lt->sock->stunRelayServiceAddress().isNull())) {
+        if (!lt->stun_started) {
             lt->stun_started = true;
-            lt->sock->stunStart();
-            if (!watch.isValid())
-                return;
+            if (useStunBind
+                && (!lt->sock->stunBindServiceAddress().isNull() || !lt->sock->stunRelayServiceAddress().isNull())) {
+                lt->sock->stunStart();
+                if (!watch.isValid())
+                    return;
+            } else {
+                lt->stun_finished = true;
+                lt->turn_finished = true;
+            }
         }
 
         // check completeness of various stuff
         if (!localFinished) {
             bool allStarted = true;
-            for (const LocalTransport *lt : udpTransports) {
+            for (const LocalTransport *lt : as_const(udpTransports)) {
                 if (!lt->started) {
                     allStarted = false;
                     break;
@@ -640,7 +653,7 @@ private slots:
 
         if (useStunBind && !lt->sock->serverReflexiveAddress().isNull() && !lt->stun_finished) {
             // automatically assign ext to related leaps, if possible
-            for (LocalTransport *i : udpTransports) {
+            for (LocalTransport *i : as_const(udpTransports)) {
                 if (i->extAddr.isNull() && i->sock->localAddress() == lt->sock->localAddress()) {
                     i->extAddr = lt->sock->serverReflexiveAddress();
                     if (i->started) {
@@ -672,6 +685,8 @@ private slots:
             lt->stun_finished = true;
 
             storeLocalNotReduntantCandidate(c);
+        } else if (useStunBind && !lt->sock->isStunAlive() && !lt->stun_finished) {
+            lt->stun_finished = true;
         }
 
         if (!lt->sock->relayedAddress().isNull() && !lt->turn_finished) {
@@ -696,6 +711,8 @@ private slots:
             lt->turn_finished = true;
 
             storeLocalNotReduntantCandidate(c);
+        } else if (!lt->sock->isTurnAlive() && !lt->turn_finished) {
+            lt->turn_finished = true;
         }
         if (!watch.isValid())
             return;
@@ -845,7 +862,7 @@ void IceComponent::flagPathAsLowOverhead(int id, const QHostAddress &addr, int p
 void IceComponent::setDebugLevel(DebugLevel level)
 {
     d->debugLevel = level;
-    for (const Private::LocalTransport *lt : d->udpTransports)
+    for (const Private::LocalTransport *lt : as_const(d->udpTransports))
         lt->sock->setDebugLevel(IceTransport::DebugLevel(level));
     if (d->tcpTurn)
         d->tcpTurn->setDebugLevel((IceTransport::DebugLevel)level);
diff --git a/src/irisnet/noncore/icelocaltransport.cpp b/src/irisnet/noncore/icelocaltransport.cpp
index 613a0089..a8fefa0d 100644
--- a/src/irisnet/noncore/icelocaltransport.cpp
+++ b/src/irisnet/noncore/icelocaltransport.cpp
@@ -294,6 +294,7 @@ class IceLocalTransport::Private : public QObject {
         connect(stunBinding, &StunBinding::error, this, [&](XMPP::StunBinding::Error) {
             delete stunBinding;
             stunBinding = nullptr;
+            emit q->error(IceLocalTransport::ErrorStun);
         });
         stunBinding->start(stunBindAddr, stunBindPort);
     }
@@ -645,6 +646,7 @@ private slots:
         if (wasActivated)
             return;
 
+        emit q->error(IceLocalTransport::ErrorTurn);
         // don't report any error
         // if(stunType == IceLocalTransport::Relay || (stunType == IceLocalTransport::Auto && !stunBinding))
         //    emit q->addressesChanged();
@@ -716,6 +718,10 @@ QHostAddress IceLocalTransport::relayedAddress() const { return d->relAddr; }
 
 int IceLocalTransport::relayedPort() const { return d->relPort; }
 
+bool IceLocalTransport::isStunAlive() const { return d->stunBinding != nullptr; }
+
+bool IceLocalTransport::isTurnAlive() const { return d->turn != nullptr; }
+
 void IceLocalTransport::addChannelPeer(const QHostAddress &addr, int port)
 {
     if (d->turn)
diff --git a/src/irisnet/noncore/icelocaltransport.h b/src/irisnet/noncore/icelocaltransport.h
index 03f56d36..2d709398 100644
--- a/src/irisnet/noncore/icelocaltransport.h
+++ b/src/irisnet/noncore/icelocaltransport.h
@@ -41,7 +41,7 @@ class IceLocalTransport : public IceTransport, public QEnableSharedFromThis<IceL
     Q_OBJECT
 
 public:
-    enum Error { ErrorBind = ErrorCustom };
+    enum Error { ErrorBind = ErrorCustom, ErrorStun, ErrorTurn };
 
     IceLocalTransport(QObject *parent = nullptr);
     ~IceLocalTransport();
@@ -75,6 +75,9 @@ class IceLocalTransport : public IceTransport, public QEnableSharedFromThis<IceL
     QHostAddress relayedAddress() const;
     int          relayedPort() const;
 
+    bool isStunAlive() const;
+    bool isTurnAlive() const;
+
     // reimplemented
     void       stop() override;
     bool       hasPendingDatagrams(int path) const override;
diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
index ca73353f..137fd77f 100644
--- a/src/xmpp/xmpp-im/client.cpp
+++ b/src/xmpp/xmpp-im/client.cpp
@@ -181,7 +181,7 @@ Client::Client(QObject *par) : QObject(par)
     d->jingleICEManager = new Jingle::ICE::Manager(d->jingleManager);
     d->jingleManager->registerTransport(Jingle::S5B::NS, d->jingleS5BManager);
     d->jingleManager->registerTransport(Jingle::IBB::NS, d->jingleIBBManager);
-    // d->jingleManager->registerTransport(Jingle::ICE::NS, d->jingleICEManager);
+    d->jingleManager->registerTransport(Jingle::ICE::NS, d->jingleICEManager);
 }
 
 Client::~Client()
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index f2a33fb6..0a2fb1c1 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -687,7 +687,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
             //            iceA_status.channelsReady[0] = false;
             //            iceA_status.channelsReady[1] = false;
 
-            q->connect(ice, &XMPP::Ice176::started, [this]() {
+            q->connect(ice, &XMPP::Ice176::started, q, [this]() {
                 QSet<int> lowOverhead;
                 for (auto &c : channels) {
                     if (!(c->hints() & Connection::AvoidRelays)) {
@@ -699,18 +699,18 @@ namespace XMPP { namespace Jingle { namespace ICE {
                 }
                 iceStarted = true;
             });
-            q->connect(ice, &XMPP::Ice176::error, [this](XMPP::Ice176::Error err) {
+            q->connect(ice, &XMPP::Ice176::error, q, [this](XMPP::Ice176::Error err) {
                 q->_lastReason = Reason(Reason::Condition::FailedTransport, QString("ICE failed: %1").arg(err));
                 q->setState(State::Finished);
                 emit q->failed();
             });
-            q->connect(ice, &XMPP::Ice176::localCandidatesReady,
+            q->connect(ice, &XMPP::Ice176::localCandidatesReady, q,
                        [this](const QList<XMPP::Ice176::Candidate> &candidates) {
                            pendingActions |= NewCandidate;
                            pendingLocalCandidates += candidates;
                            emit q->updated();
                        });
-            q->connect(ice, &XMPP::Ice176::localGatheringComplete, [this]() {
+            q->connect(ice, &XMPP::Ice176::localGatheringComplete, q, [this]() {
                 pendingActions |= GatheringComplete;
                 emit q->updated();
             });

From ae5d88de4f77f3a9d8519873c4c2129ec6ce085d Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sat, 20 Feb 2021 22:49:24 +0300
Subject: [PATCH 283/383] jingle-ice: in progress

---
 src/xmpp/xmpp-im/client.cpp             |  2 +-
 src/xmpp/xmpp-im/jingle-application.cpp |  2 +-
 src/xmpp/xmpp-im/jingle-ft.cpp          |  1 +
 src/xmpp/xmpp-im/jingle-ice.cpp         | 81 ++++++++++---------------
 src/xmpp/xmpp-im/jingle-session.cpp     |  8 +++
 5 files changed, 44 insertions(+), 50 deletions(-)

diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
index 137fd77f..ca73353f 100644
--- a/src/xmpp/xmpp-im/client.cpp
+++ b/src/xmpp/xmpp-im/client.cpp
@@ -181,7 +181,7 @@ Client::Client(QObject *par) : QObject(par)
     d->jingleICEManager = new Jingle::ICE::Manager(d->jingleManager);
     d->jingleManager->registerTransport(Jingle::S5B::NS, d->jingleS5BManager);
     d->jingleManager->registerTransport(Jingle::IBB::NS, d->jingleIBBManager);
-    d->jingleManager->registerTransport(Jingle::ICE::NS, d->jingleICEManager);
+    // d->jingleManager->registerTransport(Jingle::ICE::NS, d->jingleICEManager);
 }
 
 Client::~Client()
diff --git a/src/xmpp/xmpp-im/jingle-application.cpp b/src/xmpp/xmpp-im/jingle-application.cpp
index ac517cea..7491d0a5 100644
--- a/src/xmpp/xmpp-im/jingle-application.cpp
+++ b/src/xmpp/xmpp-im/jingle-application.cpp
@@ -109,7 +109,7 @@ namespace XMPP { namespace Jingle {
             }
 
             if (_transport->hasUpdates()) {
-                if (_transport->state() == State::Connecting)
+                if (_transport->state() >= State::ApprovedToSend && _transport->state() < State::Finished)
                     _update = { Action::TransportInfo, Reason() };
             } else if (_transport->state() == State::Finished) {
                 _update = { _transportSelector->hasMoreTransports() ? Action::TransportReplace : Action::ContentRemove,
diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 9854f44f..f898e8c7 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -722,6 +722,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
 
     OutgoingUpdate Application::takeOutgoingUpdate()
     {
+        qDebug("jingle-ft: take outgoing update");
         if (_update.action == Action::NoAction) {
             return OutgoingUpdate();
         }
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index 0a2fb1c1..953e9496 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -38,6 +38,8 @@
 #include <QNetworkInterface>
 #include <QTimer>
 
+template <class T> constexpr std::add_const_t<T> &as_const(T &t) noexcept { return t; }
+
 namespace XMPP { namespace Jingle { namespace ICE {
     const QString NS(QStringLiteral("urn:xmpp:jingle:transports:ice:0"));
     const QString NS_DTLS(QStringLiteral("urn:xmpp:jingle:apps:dtls:0"));
@@ -448,16 +450,15 @@ namespace XMPP { namespace Jingle { namespace ICE {
     public:
         enum PendingActions { NewCandidate = 1, RemoteCandidate = 2, GatheringComplete = 4 };
 
-        Transport *                    q                               = nullptr;
-        bool                           offerSent                       = false;
-        bool                           waitingAck                      = true;
-        bool                           aborted                         = false;
-        bool                           initialOfferReady               = false;
-        bool                           remoteReportedGatheringComplete = false;
-        bool                           iceStarted                      = false;
-        quint16                        pendingActions                  = 0;
-        int                            proxiesInDiscoCount             = 0;
-        int                            components                      = 0;
+        Transport *                    q                   = nullptr;
+        bool                           offerSent           = false;
+        bool                           waitingAck          = true;
+        bool                           aborted             = false;
+        bool                           initialOfferReady   = false;
+        bool                           iceStarted          = false;
+        quint16                        pendingActions      = 0;
+        int                            proxiesInDiscoCount = 0;
+        int                            components          = 0;
         QList<XMPP::Ice176::Candidate> pendingLocalCandidates; // cid to candidate mapping
         QList<XMPP::Ice176::Candidate> remoteCandidates;
         QString                        remoteUfrag;
@@ -495,6 +496,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
         {
             if (!ice || q->_state < State::ApprovedToSend || q->_state == State::Finished)
                 return;
+            qDebug("flushing remote candidates");
             ice->setPeerUfrag(remoteUfrag);
             ice->setPeerPassword(remotePassword);
             if (remoteCandidates.isEmpty())
@@ -567,32 +569,14 @@ namespace XMPP { namespace Jingle { namespace ICE {
             if (!el.isNull()) {
                 bool     ok, ok2;
                 auto     component = el.attribute(QLatin1String("component")).toUInt(&ok);
-                auto     ip        = QHostAddress(el.attribute(QLatin1String("ip")));
+                auto     ipStr     = el.attribute(QLatin1String("ip"));
+                auto     ip        = QHostAddress(ipStr);
                 uint16_t port      = el.attribute(QLatin1String("port")).toUShort(&ok2);
 
-                if (!(ok && ok2 && !ip.isNull()))
+                if (!(ok && ok2 && !ip.isNull() && component <= 256))
                     throw std::runtime_error("failed to parse remote-candidate");
-                /*
-                                auto cUsed = pendingLocalCandidates.value(el.attribute(QStringLiteral("cid")));
-                                if (!cUsed) {
-                                    throw std::runtime_error("failed to find incoming candidate-used candidate");
-                                }
-                                if (cUsed.state() == Candidate::Pending) {
-                                    cUsed.setState(Candidate::Accepted);
-                                    localUsedCandidate = cUsed;
-                                    updateMinimalPriorityOnConnected();
-                                    QTimer::singleShot(0, q, [this]() { checkAndFinishNegotiation(); });
-                                } else {
-                                    // we already rejected the candidate and either remote side already knows about it
-                   or will soon
-                                    // it's possible for example if we were able to connect to higher priority
-                   candidate, so
-                                    // we have o pretend like remote couldn't select anything better but finished
-                   already, in other
-                                    // words like if it sent candidate-error.
-                                    localUsedCandidate           = Candidate();
-                                }
-                                */
+
+                qDebug("recv remote-candidate notification: c%u %s:%hu", component, qPrintable(ipStr), port);
                 return true;
             }
             return false;
@@ -601,17 +585,9 @@ namespace XMPP { namespace Jingle { namespace ICE {
         bool handleIncomingGatheringComplete(const QDomElement &transportEl)
         {
             auto el = transportEl.firstChildElement(QStringLiteral("gathering-complete"));
-            if (!el.isNull()) {
-                remoteReportedGatheringComplete = true;
-                /*
-                for (auto &c : pendingLocalCandidates) {
-                    if (c.state() == Candidate::Pending) {
-                        c.setState(Candidate::Discarded);
-                    }
-                }
-                */
-                qDebug("recv gathering-complete: all local pending candidates were discarded");
-                // QTimer::singleShot(0, q, [this]() { checkAndFinishNegotiation(); });
+            if (!el.isNull() && ice) {
+                qDebug("recv gathering-complete");
+                ice->setRemoteGatheringComplete();
                 return true;
             }
             return false;
@@ -634,8 +610,12 @@ namespace XMPP { namespace Jingle { namespace ICE {
             QList<QHostAddress> listenAddrs;
             auto const          interfaces = QNetworkInterface::allInterfaces();
             for (const QNetworkInterface &ni : interfaces) {
+                if ((ni.flags() & (QNetworkInterface::IsRunning | QNetworkInterface::IsUp))
+                        != (QNetworkInterface::IsRunning | QNetworkInterface::IsUp)
+                    || ni.flags() & QNetworkInterface::IsLoopBack)
+                    continue;
                 QList<QNetworkAddressEntry> entries = ni.addressEntries();
-                for (const QNetworkAddressEntry &na : entries) {
+                for (const QNetworkAddressEntry &na : as_const(entries)) {
                     QHostAddress h = na.ip();
 
                     // skip localhost
@@ -661,7 +641,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
             QList<XMPP::Ice176::LocalAddress> localAddrs;
 
             QStringList strList;
-            for (const QHostAddress &h : listenAddrs) {
+            for (const QHostAddress &h : as_const(listenAddrs)) {
                 XMPP::Ice176::LocalAddress addr;
                 addr.addr = h;
                 localAddrs += addr;
@@ -708,6 +688,10 @@ namespace XMPP { namespace Jingle { namespace ICE {
                        [this](const QList<XMPP::Ice176::Candidate> &candidates) {
                            pendingActions |= NewCandidate;
                            pendingLocalCandidates += candidates;
+                           qDebug("discovered %d local candidates", candidates.size());
+                           for (auto const &c : candidates) {
+                               qDebug(" - %s:%d", qPrintable(c.ip.toString()), c.port);
+                           }
                            emit q->updated();
                        });
             q->connect(ice, &XMPP::Ice176::localGatheringComplete, q, [this]() {
@@ -717,6 +701,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
             QObject::connect(
                 ice, &XMPP::Ice176::readyToSendMedia, q,
                 [this]() {
+                    qDebug("Ready to send media!");
                     for (auto &c : channels) {
                         c->onConnected(ice);
                     }
@@ -756,7 +741,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
                 eaddr.base = addr;
                 eaddr.addr = extAddr;
                 extAddrs += eaddr;*/
-                for (const XMPP::Ice176::LocalAddress &la : localAddrs) {
+                for (const XMPP::Ice176::LocalAddress &la : as_const(localAddrs)) {
                     XMPP::Ice176::ExternalAddress ea;
                     ea.base = la;
                     ea.addr = extAddr;
@@ -883,7 +868,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
                     .toXml(doc));
         }
 
-        for (auto const &cand : d->pendingLocalCandidates) {
+        for (auto const &cand : as_const(d->pendingLocalCandidates)) {
             tel.appendChild(candidateToElement(doc, cand));
         }
         d->pendingLocalCandidates.clear();
diff --git a/src/xmpp/xmpp-im/jingle-session.cpp b/src/xmpp/xmpp-im/jingle-session.cpp
index fc4b8e1f..d46c028c 100644
--- a/src/xmpp/xmpp-im/jingle-session.cpp
+++ b/src/xmpp/xmpp-im/jingle-session.cpp
@@ -221,6 +221,7 @@ namespace XMPP { namespace Jingle {
         {
             if (waitingAck || state == State::Finished) {
                 // in waitingAck we will return here later
+                qDebug("jingle-doStep: skip step: %s", waitingAck ? "waitingAck" : "session already finished");
                 return;
             }
 
@@ -230,6 +231,7 @@ namespace XMPP { namespace Jingle {
                                QList<QDomElement>() << terminateReason.toXml(manager->client()->doc()));
                 }
                 setSessionFinished();
+                qDebug("jingle-doStep: the step finished the session due to terminationReason previously set");
                 return;
             }
 
@@ -255,11 +257,13 @@ namespace XMPP { namespace Jingle {
                     sendJingle(Action::SessionTerminate,
                                QList<QDomElement>() << terminateReason.toXml(manager->client()->doc()));
                     setSessionFinished();
+                    qDebug("jingle-doStep: all apps finished -> session finished");
                     return;
                 }
             }
 
             if (state == State::Created) {
+                qDebug("jingle-doStep: still in Created state. exit");
                 return; // should wait for user approval of send/accept
             }
 
@@ -271,6 +275,7 @@ namespace XMPP { namespace Jingle {
                 auto cb       = std::get<1>(updates);
                 outgoingUpdates.erase(it);
                 sendJingle(action, elements, cb);
+                qDebug("jingle-doStep: sent outgoingUpdates");
                 return;
             }
 
@@ -285,6 +290,7 @@ namespace XMPP { namespace Jingle {
                         if (!jt->success())
                             qWarning("failure for session-info is ignored");
                     });
+                    qDebug("jingle-doStep: sent session info");
                     return;
                 }
             }
@@ -293,11 +299,13 @@ namespace XMPP { namespace Jingle {
             if (state == State::ApprovedToSend) { // we are going to send session-initiate/accept (already accepted
                                                   // by the user but not sent yet)
                 if (trySendSessionAcceptOrInitiate()) {
+                    qDebug("jingle-doStep: session is not yet ready to be accepted/initiated");
                     return; // accepted / initiated or finished with a failure
                 }
             }
 
             QMultiMap<Application::Update, Application *> updates;
+            qDebug("jingle-doStep: %d applications have updates", signalingContent.size());
             for (auto app : qAsConst(signalingContent)) {
                 auto updateType = app->evaluateOutgoingUpdate();
                 if (updateType.action != Action::NoAction) {

From 2b7c3cd3cb5561c1b990f3da601b3c6e5f8106b4 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 21 Feb 2021 09:58:12 +0300
Subject: [PATCH 284/383] Make Jingle ICE establishing working

---
 src/xmpp/xmpp-im/jingle-ice.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index 953e9496..90a0c837 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -822,6 +822,8 @@ namespace XMPP { namespace Jingle { namespace ICE {
     {
         qDebug("Starting connecting");
         setState(State::Connecting);
+        d->flushRemoteCandidates();
+        d->ice->startChecks();
     }
 
     bool Transport::update(const QDomElement &transportEl)

From 263a135cd7767e4e24fbf26ec08dc0c7a4c86fcd Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 16 Mar 2021 10:30:41 +0300
Subject: [PATCH 285/383] jingle-ice: almost finished dtls negotiation

---
 src/irisnet/noncore/dtls.cpp        | 267 +++++++++++++++++++++++-----
 src/irisnet/noncore/dtls.h          |  55 +++++-
 src/xmpp/xmpp-im/jingle-ice.cpp     | 252 ++++++++++++++++----------
 src/xmpp/xmpp-im/jingle-transport.h |   1 +
 4 files changed, 423 insertions(+), 152 deletions(-)

diff --git a/src/irisnet/noncore/dtls.cpp b/src/irisnet/noncore/dtls.cpp
index fac22183..1712680d 100644
--- a/src/irisnet/noncore/dtls.cpp
+++ b/src/irisnet/noncore/dtls.cpp
@@ -1,4 +1,6 @@
 #include "dtls.h"
+#include "xmpp_xmlcommon.h"
+
 #include <QtCrypto>
 #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
 #include <QRandomGenerator>
@@ -7,29 +9,77 @@
 
 #define DTLS_DEBUG qDebug
 
+/*
+Connection flow
+
+                    juliet                   |                   romeo
+---------------------------------------------------------------------------------------
+1 |           setup:NotSet                   |               setup:NotSet
+2 |  generate cert + compute fingerprint     |
+3 |           setup:actpass                  |
+4 |                             ----send fingerprint----> validate
+5 |                             <-------iq result--------
+5 |                                          |               setup:active
+6 |                                          |  generate cert + compute fingerprint
+7 |               validate      <---send fingerprint-----
+8 |           setup:passive                  |
+9 |         start dtls server                |
+10|                             --------iq result------->
+11|                                          |             start dtls client
+12|================================= DTLS HANDSHAKE ===================================
+*/
+
 namespace XMPP {
+const QString NS_DTLS(QStringLiteral("urn:xmpp:jingle:apps:dtls:0"));
+
+static std::array<const char *, 4> fpRoles { { "active", "passive", "actpass", "holdconn" } };
+Dtls::FingerPrint::FingerPrint(const QDomElement &el)
+{
+    auto ht = el.attribute(QLatin1String("hash"));
+    hash    = QStringRef(&ht);
+    hash.setData(QByteArray::fromHex(el.text().toLatin1()));
+    auto setupIt
+        = std::find(fpRoles.begin(), fpRoles.end(), el.attribute(QLatin1String("setup")).toLatin1().constData());
+    setup = Setup(setupIt == fpRoles.end() ? -1 : std::distance(fpRoles.begin(), setupIt));
+}
+
+QDomElement Dtls::FingerPrint::toXml(QDomDocument *doc) const
+{
+    auto binToHex = [](const QByteArray &in) {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
+        return in.toHex(':');
+#else
+        QByteArray out  = in.toHex();
+        int        size = out.size();
+        for (int k = 2; k < size; k += 3, ++size) {
+            out.insert(k, ':');
+        }
+        return out;
+#endif
+    };
+    auto fingerprint = XMLHelper::textTagNS(doc, NS_DTLS, QLatin1String("fingerprint"), binToHex(hash.data()));
+    fingerprint.setAttribute(QLatin1String("hash"), hash.stringType());
+    fingerprint.setAttribute(QLatin1String("setup"), QLatin1String(fpRoles[setup]));
+    return fingerprint;
+}
 
 class Dtls::Private : public QObject {
     Q_OBJECT
 public:
-    Dtls *    q;
-    QCA::TLS *tls;
+    Dtls *           q;
+    QCA::TLS *       tls = nullptr;
+    QCA::PrivateKey  pkey;
+    QCA::Certificate cert;
+
+    QString localJid;
+    QString remoteJid;
+    // original fingerprints
+    FingerPrint localFingerprint;
+    FingerPrint remoteFingerprint;
 
-    Hash                         fingerprint;
-    Hash                         remoteFingerprint;
     QAbstractSocket::SocketError lastError = QAbstractSocket::UnknownSocketError;
 
-    Private(Dtls *q) : QObject(q), q(q)
-    {
-        tls = new QCA::TLS(QCA::TLS::Datagram);
-
-        connect(tls, &QCA::TLS::certificateRequested, tls, &QCA::TLS::continueAfterStep);
-        connect(tls, &QCA::TLS::handshaken, this, &Dtls::Private::tls_handshaken);
-        connect(tls, &QCA::TLS::readyRead, q, &Dtls::readyRead);
-        connect(tls, &QCA::TLS::readyReadOutgoing, q, &Dtls::readyReadOutgoing);
-        connect(tls, &QCA::TLS::closed, q, &Dtls::closed);
-        connect(tls, &QCA::TLS::error, this, &Dtls::Private::tls_error);
-    }
+    Private(Dtls *q) : QObject(q), q(q) { }
 
     static Hash computeFingerprint(const QCA::Certificate &cert, Hash::Type hashType)
     {
@@ -46,7 +96,7 @@ class Dtls::Private : public QObject {
         if (peerIdentity == QCA::TLS::Valid || peerIdentity == QCA::TLS::InvalidCertificate) {
             const auto  chain = tls->peerCertificateChain();
             const auto &cert  = chain.first();
-            if (computeFingerprint(cert, remoteFingerprint.type()) == remoteFingerprint) {
+            if (computeFingerprint(cert, remoteFingerprint.hash.type()) == remoteFingerprint.hash) {
                 DTLS_DEBUG("valid");
                 tls->continueAfterStep();
                 emit q->connected();
@@ -85,47 +135,135 @@ class Dtls::Private : public QObject {
         }
         emit q->errorOccurred(lastError);
     }
-};
 
-Dtls::Dtls(QObject *parent) : QObject(parent), d(new Private(this))
-{
-    if (!d->tls->context()) {
-        qWarning("DTLS is not supported by your version of QCA");
+    void setRemoteFingerprint(const FingerPrint &fp)
+    {
+        bool needRestart = false;
+        if (tls) {
+            if (remoteFingerprint == fp)
+                return;
+            // need to restart dtls. see rfc8842 (todo: but in fact we need more checks)
+            needRestart            = true;
+            localFingerprint.setup = Dtls::NotSet;
+        }
+        remoteFingerprint = localFingerprint;
+        if (needRestart)
+            emit q->needRestart();
+        if (localFingerprint.setup == Dtls::NotSet)
+            return; // will be handled in acceptIncoming
+
+        bool remoteActiveOrPassive
+            = remoteFingerprint.setup == Dtls::Passive || remoteFingerprint.setup == Dtls::Active;
+        if (localFingerprint.setup == Dtls::ActPass) { // response fingerprint
+            if (!remoteActiveOrPassive) {
+                qWarning("Unexpected remote fingerprint setup. Assume remote setup=active");
+                remoteFingerprint.setup = Dtls::Active;
+            }
+            localFingerprint.setup = remoteFingerprint.setup == Dtls::Active ? Dtls::Passive : Dtls::Active;
+            return;
+        }
+        // local is active or passive already, no idea in what scenario. probably something custom
+        bool roleConflict = remoteFingerprint.setup == localFingerprint.setup;
+        if (!roleConflict && !remoteActiveOrPassive)
+            return; // looks valid
+        if (roleConflict)
+            qWarning("setRemoteFingerprint: dtls role conflict");
+        if (!remoteActiveOrPassive)
+            qWarning("setRemoteFingerprint: expected active or passive remote fingerprint but got something else");
+        lastError = QAbstractSocket::OperationError;
+        emit q->errorOccurred(lastError);
     }
-}
 
-void Dtls::generateCertificate(const QString &localJid)
-{
-    QCA::CertificateOptions opts;
+    void acceptIncoming()
+    {
+        if (cert.isNull()) {
+            generateCertificate();
+        }
+        Q_ASSERT(localFingerprint.setup == Dtls::NotSet);
+        if (remoteFingerprint.setup == Dtls::ActPass) {
+            localFingerprint.setup  = Dtls::Active;
+            remoteFingerprint.setup = Dtls::Passive;
+        } else {
+            localFingerprint.setup = remoteFingerprint.setup == Dtls::Active ? Dtls::Passive : Dtls::Active;
+        }
+        if (localFingerprint.setup == Dtls::Passive) {
+            negotiate(); // start server
+        }
+    }
 
-    QCA::CertificateInfo info;
-    info.insert(QCA::CommonName, QStringLiteral("iris.psi-im.org"));
-    if (!localJid.isEmpty())
-        info.insert(QCA::XMPP, localJid);
-    opts.setInfo(info);
+    void negotiate()
+    {
+        if (tls) {
+            delete tls;
+        }
+
+        if (!remoteFingerprint.isValid()) {
+            qWarning("remote fingerprint is not set");
+            lastError = QAbstractSocket::SocketError::OperationError;
+            emit q->errorOccurred(lastError);
+            return;
+        }
+
+        tls = new QCA::TLS(QCA::TLS::Datagram);
+        tls->setCertificate(cert, pkey);
+
+        connect(tls, &QCA::TLS::certificateRequested, tls, &QCA::TLS::continueAfterStep);
+        connect(tls, &QCA::TLS::handshaken, this, &Dtls::Private::tls_handshaken);
+        connect(tls, &QCA::TLS::readyRead, q, &Dtls::readyRead);
+        connect(tls, &QCA::TLS::readyReadOutgoing, q, &Dtls::readyReadOutgoing);
+        connect(tls, &QCA::TLS::closed, q, &Dtls::closed);
+        connect(tls, &QCA::TLS::error, this, &Dtls::Private::tls_error);
+
+        if (localFingerprint.setup == Dtls::Passive) {
+            qDebug("Starting DTLS server");
+            tls->startServer();
+        } else {
+            qDebug("Starting DTLS client");
+            tls->startClient();
+        }
+    }
+
+    void generateCertificate()
+    {
+        QCA::CertificateOptions opts;
+
+        QCA::CertificateInfo info;
+        info.insert(QCA::CommonName, QStringLiteral("iris.psi-im.org"));
+        if (!localJid.isEmpty())
+            info.insert(QCA::XMPP, localJid);
+        opts.setInfo(info);
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
-    QCA::BigInteger sn(QRandomGenerator::global()->generate());
+        QCA::BigInteger sn(QRandomGenerator::global()->generate());
 #else
-    QCA::BigInteger sn(qrand());
+        QCA::BigInteger sn(qrand());
 #endif
-    opts.setSerialNumber(sn);
+        opts.setSerialNumber(sn);
 
-    auto nowUTC = QDateTime::currentDateTimeUtc();
-    opts.setValidityPeriod(nowUTC, nowUTC.addDays(30));
+        auto nowUTC = QDateTime::currentDateTimeUtc();
+        opts.setValidityPeriod(nowUTC, nowUTC.addDays(30));
 
-    QCA::Constraints constraints
-        = { { QCA::DigitalSignature, QCA::KeyEncipherment, QCA::DataEncipherment, QCA::ClientAuth, QCA::ServerAuth } };
-    opts.setConstraints(constraints);
-    opts.setAsCA();
+        QCA::Constraints constraints = { { QCA::DigitalSignature, QCA::KeyEncipherment, QCA::DataEncipherment,
+                                           QCA::ClientAuth, QCA::ServerAuth } };
+        opts.setConstraints(constraints);
+        opts.setAsCA();
 
-    auto pkey = QCA::KeyGenerator().createRSA(2048);
-    auto cert = QCA::Certificate(opts, pkey);
-    d->tls->setCertificate(cert, pkey);
-    d->fingerprint = Private::computeFingerprint(cert, Hash::Sha256);
+        pkey                  = QCA::KeyGenerator().createRSA(2048);
+        cert                  = QCA::Certificate(opts, pkey);
+        localFingerprint.hash = Private::computeFingerprint(cert, Hash::Sha256);
+    }
+};
+
+Dtls::Dtls(QObject *parent, const QString &localJid, const QString &remoteJid) : QObject(parent), d(new Private(this))
+{
+    d->localJid  = localJid;
+    d->remoteJid = remoteJid;
+    if (!d->tls->context()) {
+        qWarning("DTLS is not supported by your version of QCA");
+    }
 }
 
-void Dtls::setCertificate(const QCA::Certificate &cert, const QCA::PrivateKey &pkey)
+void Dtls::setLocalCertificate(const QCA::Certificate &cert, const QCA::PrivateKey &pkey)
 {
     Hash::Type hashType = Hash::Sha256;
     switch (cert.signatureAlgorithm()) {
@@ -144,18 +282,49 @@ void Dtls::setCertificate(const QCA::Certificate &cert, const QCA::PrivateKey &p
     }
 
     d->tls->setCertificate(cert, pkey);
-    d->fingerprint = Private::computeFingerprint(cert, hashType);
+    d->localFingerprint.hash = Private::computeFingerprint(cert, hashType);
 }
 
-Hash Dtls::fingerprint() { return d->fingerprint; }
+QCA::Certificate Dtls::localCertificate() const { return d->cert; }
 
-void Dtls::setRemoteFingerprint(const Hash &fingerprint) { d->remoteFingerprint = fingerprint; }
+QCA::Certificate Dtls::remoteCertificate() const
+{
+    if (!d->tls || d->tls->peerCertificateChain().isEmpty())
+        return {};
+    auto const &chain = d->tls->peerCertificateChain();
+    return chain.first();
+}
+
+void Dtls::initOutgoing()
+{
+    if (d->cert.isNull()) {
+        d->generateCertificate();
+    }
+    d->localFingerprint.setup = ActPass;
+}
+
+void Dtls::acceptIncoming() { d->acceptIncoming(); }
+
+void Dtls::onRemoteAcceptedFingerprint()
+{
+    if (d->localFingerprint.setup == Active) {
+        d->negotiate();
+    }
+}
+
+const Dtls::FingerPrint &Dtls::localFingerprint() const { return d->localFingerprint; }
+
+const Dtls::FingerPrint &Dtls::remoteFingerprint() const { return d->remoteFingerprint; }
+
+void Dtls::setRemoteFingerprint(const FingerPrint &fp) { d->setRemoteFingerprint(fp); }
 
 QAbstractSocket::SocketError Dtls::error() const { return d->lastError; }
 
-void Dtls::startServer() { d->tls->startServer(); }
+void Dtls::negotiate() { d->negotiate(); }
+
+bool Dtls::isStarted() const { return d->tls != nullptr; }
 
-void Dtls::startClient() { d->tls->startClient(); }
+bool Dtls::isSupported() { return QCA::isSupported("dtls"); }
 
 QByteArray Dtls::readDatagram()
 {
diff --git a/src/irisnet/noncore/dtls.h b/src/irisnet/noncore/dtls.h
index 0fe4e542..4579d01b 100644
--- a/src/irisnet/noncore/dtls.h
+++ b/src/irisnet/noncore/dtls.h
@@ -12,16 +12,51 @@ class PrivateKey;
 
 namespace XMPP {
 
+/*
+Calls order:
+juliet: startOutgoing() -> localFingerprint() -> network
+        network (remote fingerpring) -> setRemoteFingerprint() -> negotiate(start server) -> network (iq result)
+romeo:  setRemoteFingerprint() -> acceptIncoming() -> localFingerprint() -> network
+        network (iq result) -> negotiate(start client)
+*/
+
 class Dtls : public QObject {
     Q_OBJECT
 public:
-    explicit Dtls(QObject *parent = nullptr);
+    enum Setup { NotSet, Active, Passive, ActPass, HoldConn };
+
+    struct FingerPrint {
+        Hash  hash;
+        Setup setup = Setup(-1);
+
+        FingerPrint() : setup(NotSet) { }
+        FingerPrint(const QDomElement &el);
+        FingerPrint(const Hash &hash, Setup setup) : hash(hash), setup(setup) { }
+
+        inline bool operator==(const FingerPrint &other) const { return setup == other.setup || hash == other.hash; }
+        inline bool operator!=(const FingerPrint &other) const { return !(*this == other); }
+
+        inline bool isValid() const
+        {
+            return hash.isValid() && !hash.data().isEmpty() && setup >= Active && setup <= HoldConn;
+        }
+        QDomElement toXml(QDomDocument *doc) const;
+    };
 
-    // jid is used as subjectAltName XmppAddr identifier
-    void generateCertificate(const QString &localJid = QString());
-    void setCertificate(const QCA::Certificate &cert, const QCA::PrivateKey &pkey);
-    Hash fingerprint();
-    void setRemoteFingerprint(const Hash &fingerprint);
+    explicit Dtls(QObject *parent = nullptr, const QString &localJid = QString(), const QString &remoteJid = QString());
+
+    // state machine stuff
+    void initOutgoing();   // when it's our side first send dtls info
+    void acceptIncoming(); // when we need to response to the remote dtls info
+    void onRemoteAcceptedFingerprint();
+
+    void             setLocalCertificate(const QCA::Certificate &cert, const QCA::PrivateKey &pkey);
+    QCA::Certificate localCertificate() const;
+    QCA::Certificate remoteCertificate() const;
+
+    const FingerPrint &localFingerprint() const;
+    const FingerPrint &remoteFingerprint() const;
+    void               setRemoteFingerprint(const FingerPrint &fingerprint);
 
     QAbstractSocket::SocketError error() const;
 
@@ -30,9 +65,11 @@ class Dtls : public QObject {
     void       writeDatagram(const QByteArray &data);
     void       writeIncomingDatagram(const QByteArray &data);
 
-    void startServer();
-    void startClient();
+    bool isStarted() const;
+
+    static bool isSupported();
 signals:
+    void needRestart();
     void readyRead();
     void readyReadOutgoing();
     void connected();
@@ -40,6 +77,8 @@ class Dtls : public QObject {
     void closed();
 
 private:
+    void negotiate(); // yep. it's possible to make it public but not really necessary atm
+
     class Private;
     Private *d;
 };
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index 90a0c837..4e4a1d5e 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -161,49 +161,6 @@ namespace XMPP { namespace Jingle { namespace ICE {
         }
     };
 
-    static std::array<const char *, 4> fpRoles { { "active", "passive", "actpass", "holdconn" } };
-    struct FingerPrint {
-        enum Setup { Active, Passive, ActPass, HoldConn };
-
-        Hash  hash;
-        Setup setup = Setup(-1);
-
-        FingerPrint(const QDomElement &el)
-        {
-            auto ht = el.attribute(QLatin1String("hash"));
-            hash    = QStringRef(&ht);
-            hash.setData(QByteArray::fromHex(el.text().toLatin1()));
-            auto setupIt = std::find(fpRoles.begin(), fpRoles.end(),
-                                     el.attribute(QLatin1String("setup")).toLatin1().constData());
-            setup        = Setup(setupIt == fpRoles.end() ? -1 : std::distance(fpRoles.begin(), setupIt));
-        }
-        FingerPrint(const Hash &hash, Setup setup) : hash(hash), setup(setup) { }
-
-        inline bool isValid() const
-        {
-            return hash.isValid() && !hash.data().isEmpty() && setup >= Active && setup <= HoldConn;
-        }
-        QDomElement toXml(QDomDocument *doc) const
-        {
-            auto binToHex = [](const QByteArray &in) {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
-                return in.toHex(':');
-#else
-                QByteArray out  = in.toHex();
-                int        size = out.size();
-                for (int k = 2; k < size; k += 3, ++size) {
-                    out.insert(k, ':');
-                }
-                return out;
-#endif
-            };
-            auto fingerprint = XMLHelper::textTagNS(doc, NS_DTLS, QLatin1String("fingerprint"), binToHex(hash.data()));
-            fingerprint.setAttribute(QLatin1String("hash"), hash.stringType());
-            fingerprint.setAttribute(QLatin1String("setup"), QLatin1String(fpRoles[setup]));
-            return fingerprint;
-        }
-    };
-
     class Resolver : public QObject {
         Q_OBJECT
         using QObject::QObject;
@@ -391,10 +348,13 @@ namespace XMPP { namespace Jingle { namespace ICE {
     class Connection : public XMPP::Jingle::Connection {
         Q_OBJECT
     public:
+        enum DisconnectReason { DtlsClosed, SctpClosed };
+
         QList<NetworkDatagram> datagrams;
         void *                 client;
         int                    component; // starting from 0
         TransportFeatures      features;
+        DisconnectReason       disconnectReason;
 
         Connection(int component, TransportFeatures features) : component(component), features(features)
         {
@@ -433,12 +393,23 @@ namespace XMPP { namespace Jingle { namespace ICE {
     private:
         friend class Transport;
 
-        void onConnected(Ice176 *ice)
+        void onConnected()
         {
-            qDebug("ice channel connected!");
+            qDebug("jingle-ice: channel connected!");
             emit connected();
         }
 
+        void onError(QAbstractSocket::SocketError error) { qDebug("jingle-ice: channel failed: %d", error); }
+
+        void onDisconnected(DisconnectReason reason)
+        {
+            if (!isOpen())
+                return;
+            disconnectReason = reason;
+            setOpenMode(QIODevice::ReadOnly);
+            emit disconnected();
+        }
+
         void enqueueIncomingUDP(const QByteArray &data)
         {
             datagrams.append(NetworkDatagram { data });
@@ -448,17 +419,17 @@ namespace XMPP { namespace Jingle { namespace ICE {
 
     class Transport::Private {
     public:
-        enum PendingActions { NewCandidate = 1, RemoteCandidate = 2, GatheringComplete = 4 };
-
-        Transport *                    q                   = nullptr;
-        bool                           offerSent           = false;
-        bool                           waitingAck          = true;
-        bool                           aborted             = false;
-        bool                           initialOfferReady   = false;
-        bool                           iceStarted          = false;
-        quint16                        pendingActions      = 0;
-        int                            proxiesInDiscoCount = 0;
-        int                            components          = 0;
+        enum PendingActions { NewCandidate = 1, RemoteCandidate = 2, GatheringComplete = 4, NewFingerprint = 8 };
+
+        Transport *                    q                         = nullptr;
+        bool                           offerSent                 = false;
+        bool                           aborted                   = false;
+        bool                           initialOfferReady         = false;
+        bool                           iceStarted                = false;
+        bool                           remoteAcceptedFingerprint = false;
+        quint16                        pendingActions            = 0;
+        int                            proxiesInDiscoCount       = 0;
+        int                            components                = 0;
         QList<XMPP::Ice176::Candidate> pendingLocalCandidates; // cid to candidate mapping
         QList<XMPP::Ice176::Candidate> remoteCandidates;
         QString                        remoteUfrag;
@@ -474,8 +445,11 @@ namespace XMPP { namespace Jingle { namespace ICE {
         TcpPortDiscoverer *disco        = nullptr;
         UdpPortReserver *  portReserver = nullptr;
         Resolver           resolver;
-        XMPP::Ice176 *     ice  = nullptr;
-        XMPP::Dtls *       dtls = nullptr;
+        XMPP::Ice176 *     ice = nullptr;
+
+        QVector<XMPP::Dtls *> dtls; // for each ICE component
+        Dtls::Setup           localDtlsRole  = Dtls::ActPass;
+        Dtls::Setup           remoteDtlsRole = Dtls::ActPass;
 
         QHostAddress extAddr;
         QHostAddress stunBindAddr, stunRelayUdpAddr, stunRelayTcpAddr;
@@ -542,8 +516,8 @@ namespace XMPP { namespace Jingle { namespace ICE {
                  * seems like initial offer
                  *
                  * The channels split topic is somewhat complicated.
-                 * We can talk about multiplexed rtp/rtcp channels, about sctp channels or maybe plain ICE components.
-                 * In general logic is as following:
+                 * We can talk about multiplexed rtp/rtcp channels, about sctp channels or maybe plain ICE
+                 * components. In general logic is as following:
                  *  - no datachannels - amount of channels = amount of components
                  *  - with datachannels - one channel for datachannel on component 1. one channel per component with
                  *                        filtered out datachannel
@@ -593,6 +567,87 @@ namespace XMPP { namespace Jingle { namespace ICE {
             return false;
         }
 
+        bool handleDtlsFingerprint(const QDomElement &transportEl)
+        {
+            auto el = transportEl.firstChildElement(QStringLiteral("fingerprint"));
+            if (el.isNull())
+                return false;
+            qDebug("recv fingerprint");
+            if (el.namespaceURI() != NS_DTLS) {
+                qWarning("Unrecognized DTLS xmlns: %s. Parse it as if it were %s", qPrintable(el.namespaceURI()),
+                         qPrintable(NS_DTLS));
+            }
+            Dtls::FingerPrint fp(el);
+            if (!fp.isValid())
+                throw std::runtime_error("failed to parse remote fingerprint");
+            if (!Dtls::isSupported()) {
+                qWarning("Remote requested DTLS but it's not supported by used crypto libraries. Silently ignore..");
+                return true;
+            }
+            ensureDtlsCreated();
+            for (auto d : as_const(dtls))
+                d->setRemoteFingerprint(fp);
+            return true;
+        }
+
+        void makeDtlsPipeline(int componentIndex)
+        {
+            auto d = dtls[componentIndex];
+
+            if (componentIndex == 0) { // for other components it's the same but we don't need multiple fingerprints
+                d->connect(
+                    d, &Dtls::needRestart, q,
+                    [this, componentIndex]() {
+                        pendingActions |= NewFingerprint;
+                        remoteAcceptedFingerprint = false;
+                        emit q->updated();
+                    },
+                    Qt::QueuedConnection);
+            }
+            d->connect(d, &Dtls::readyRead, q, [this, componentIndex]() {
+                auto d = dtls[componentIndex]->readDatagram();
+                // pass data to sctp
+            });
+            d->connect(d, &Dtls::readyReadOutgoing, q, [this, componentIndex]() {
+                ice->writeDatagram(componentIndex, dtls[componentIndex]->readOutgoingDatagram());
+            });
+            d->connect(d, &Dtls::connected, q, [this, componentIndex]() {
+                for (auto &c : channels) {
+                    if (c->component != componentIndex)
+                        continue;
+                    if (c->features & TransportFeature::DataOriented) {
+                        qDebug("TODO dtls connected. neet to negotiate data channel");
+                    } else {
+                        qDebug("dtls connected. non-data channel connected");
+                        c->onConnected();
+                    }
+                }
+            });
+            d->connect(d, &Dtls::errorOccurred, q, [this, componentIndex](QAbstractSocket::SocketError error) {
+                qDebug("dtls failed for component %d", componentIndex);
+                for (auto &c : channels)
+                    if (c->component == componentIndex)
+                        c->onError(error);
+            });
+            d->connect(d, &Dtls::closed, q, [this, componentIndex]() {
+                qDebug("dtls closed for component %d", componentIndex);
+                for (auto &c : channels)
+                    if (c->component == componentIndex)
+                        c->onDisconnected(Connection::DtlsClosed);
+            });
+        }
+
+        void ensureDtlsCreated()
+        {
+            if (!dtls.isEmpty())
+                return;
+            for (int componentIndex = 0; componentIndex < components; componentIndex++) {
+                dtls.append(new Dtls(q, q->pad()->session()->me().full(), q->pad()->session()->peer().full()));
+                makeDtlsPipeline(componentIndex);
+            }
+            pendingActions |= NewFingerprint;
+        }
+
         void startIce()
         {
             auto manager = dynamic_cast<Manager *>(q->_pad->manager())->d.data();
@@ -656,7 +711,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
 
             if (!strList.isEmpty()) {
                 printf("Host addresses:\n");
-                for (const QString &s : strList)
+                for (const QString &s : as_const(strList))
                     printf("  %s\n", qPrintable(s));
             }
 
@@ -701,10 +756,15 @@ namespace XMPP { namespace Jingle { namespace ICE {
             QObject::connect(
                 ice, &XMPP::Ice176::readyToSendMedia, q,
                 [this]() {
-                    qDebug("Ready to send media!");
-                    for (auto &c : channels) {
-                        c->onConnected(ice);
-                    }
+                    qDebug("ICE reported ready to send media!");
+                    if (dtls.empty()) // if empty
+                        for (auto &c : channels) {
+                            if (!(c->features & TransportFeature::DataOriented))
+                                c->onConnected();
+                        }
+                    else if (remoteAcceptedFingerprint)
+                        for (auto &d : dtls)
+                            d->onRemoteAcceptedFingerprint();
                 },
                 Qt::QueuedConnection); // signal is not DOR-SS
 
@@ -786,18 +846,6 @@ namespace XMPP { namespace Jingle { namespace ICE {
     {
         qDebug("Prepare local offer");
         setState(State::ApprovedToSend);
-        // auto md = static_cast<Manager *>(_pad.staticCast<Pad>()->manager())->d.data();
-        /*
-         if (_creator == _pad->session()->role()) { // I'm creator
-             d->sid = _pad.staticCast<Pad>()->generateSid();
-         }
-         _pad.staticCast<Pad>()->registerSid(d->sid);
-         d->directAddr = makeKey(d->sid, _pad.staticCast<Pad>()->session()->initiator(),
-                                 _pad.staticCast<Pad>()->session()->responder());
-         m->addKeyMapping(d->directAddr, this);
- */
-        // auto scope = _pad.staticCast<Pad>()->discoScope();
-        // d->disco   = scope->disco(); // FIXME store and handle signale. delete when not needed
 
         auto manager = dynamic_cast<Manager *>(_pad->manager())->d.data();
 
@@ -809,11 +857,18 @@ namespace XMPP { namespace Jingle { namespace ICE {
                           [this]() {
                               printf("resolver finished\n");
                               d->startIce();
+                              if (Dtls::isSupported()) {
+                                  d->ensureDtlsCreated();
+                                  bool remote = isRemote();
+                                  for (auto d : as_const(d->dtls)) {
+                                      if (remote)
+                                          d->acceptIncoming();
+                                      else
+                                          d->initOutgoing();
+                                  }
+                              }
                           });
 
-        // connect(d->disco, &TcpPortDiscoverer::portAvailable, this, [this]() { d->onLocalServerDiscovered(); });
-        // d->onLocalServerDiscovered();
-
         emit updated();
     }
 
@@ -830,7 +885,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
     {
         try {
             if (d->handleIncomingCandidate(transportEl) || d->handleIncomingRemoteCandidate(transportEl)
-                || d->handleIncomingGatheringComplete(transportEl)) {
+                || d->handleIncomingGatheringComplete(transportEl) || d->handleDtlsFingerprint(transportEl)) {
                 if (_state == State::Created && _creator != _pad->session()->role()) {
                     // initial incoming transport
                     setState(State::Pending);
@@ -853,9 +908,8 @@ namespace XMPP { namespace Jingle { namespace ICE {
 
     OutgoingTransportInfoUpdate Transport::takeOutgoingUpdate([[maybe_unused]] bool ensureTransportElement = false)
     {
-        OutgoingTransportInfoUpdate upd;
         if (!hasUpdates() || _state < State::ApprovedToSend || (isRemote() && _state == State::Pending)) {
-            return upd;
+            return {};
         }
 
         qDebug("jingle-ice: taking outgoing update");
@@ -863,11 +917,10 @@ namespace XMPP { namespace Jingle { namespace ICE {
         QDomElement tel = doc->createElementNS(NS, "transport");
         tel.setAttribute(QLatin1String("pwd"), d->ice->localPassword());
         tel.setAttribute(QLatin1String("ufrag"), d->ice->localUfrag());
-        if (d->dtls) {
-            tel.appendChild(
-                FingerPrint(d->dtls->fingerprint(),
-                            _pad->session()->role() == Origin::Initiator ? FingerPrint::ActPass : FingerPrint::Active)
-                    .toXml(doc));
+        bool hasFingerprint = d->pendingActions & Private::NewFingerprint;
+        if (hasFingerprint && !d->dtls.isEmpty()) {
+            tel.appendChild(d->dtls[0]->localFingerprint().toXml(doc));
+            d->pendingActions &= ~Private::NewFingerprint;
         }
 
         for (auto const &cand : as_const(d->pendingLocalCandidates)) {
@@ -882,7 +935,8 @@ namespace XMPP { namespace Jingle { namespace ICE {
         }
 
         if (d->pendingActions & Private::RemoteCandidate) {
-            for (auto const &c : d->ice->selectedCandidates()) {
+            auto const &candidates = d->ice->selectedCandidates();
+            for (auto const &c : candidates) {
                 auto rc = doc->createElement(QLatin1String("remote-candidate"));
                 rc.setAttribute(QLatin1String("component"), c.componentId);
                 rc.setAttribute(QLatin1String("ip"), c.ip.toString());
@@ -892,12 +946,20 @@ namespace XMPP { namespace Jingle { namespace ICE {
             d->pendingActions &= ~Private::RemoteCandidate;
         }
 
-        d->waitingAck = true;
-        return OutgoingTransportInfoUpdate { tel, [this, trptr = QPointer<Transport>(d->q)](bool success) {
-                                                if (!success || !trptr)
-                                                    return;
-                                                d->waitingAck = false;
-                                            } };
+        return OutgoingTransportInfoUpdate { tel,
+                                             [this, trptr = QPointer<Transport>(d->q), hasFingerprint](bool success) {
+                                                 if (!success || !trptr)
+                                                     return;
+                                                 // if we send our fingerprint as a response to remotely initiated dtls
+                                                 // then on response we are sure remote server started dtls server and
+                                                 // we can connect now.
+                                                 if (hasFingerprint) {
+                                                     d->remoteAcceptedFingerprint = true;
+                                                 }
+                                                 if (hasFingerprint && d->ice && d->ice->canSendMedia())
+                                                     for (auto &d : d->dtls)
+                                                         d->onRemoteAcceptedFingerprint();
+                                             } };
     }
 
     bool Transport::isValid() const { return d != nullptr; }
diff --git a/src/xmpp/xmpp-im/jingle-transport.h b/src/xmpp/xmpp-im/jingle-transport.h
index 3d5de034..d5bd8573 100644
--- a/src/xmpp/xmpp-im/jingle-transport.h
+++ b/src/xmpp/xmpp-im/jingle-transport.h
@@ -70,6 +70,7 @@ namespace XMPP { namespace Jingle {
 
     signals:
         void connected();
+        void disconnected();
 
     protected:
         Hints _hints;

From eb894ae0f60ac4f79a803b3f0a34f80444236131 Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Thu, 8 Apr 2021 18:19:05 +0300
Subject: [PATCH 286/383] Fixed build with QJDNS in win32

---
 src/irisnet/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/irisnet/CMakeLists.txt b/src/irisnet/CMakeLists.txt
index 15a58752..4926a987 100644
--- a/src/irisnet/CMakeLists.txt
+++ b/src/irisnet/CMakeLists.txt
@@ -120,7 +120,7 @@ set(HEADERS
 
 add_library(irisnet STATIC ${SOURCES} ${HEADERS} )
 
-if(WIN32 AND (SEPARATE_QJDNS OR (NOT USE_QJDNS)))
+if(WIN32)
     set(EXTRA_LDFLAGS ws2_32 iphlpapi)
 endif()
 

From 5c5f3c6377c6267ceafe00d8b1ffcf15c0128146 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 19 Apr 2021 01:05:52 +0300
Subject: [PATCH 287/383] Make Jingle DTLS establishing working

---
 src/irisnet/noncore/dtls.cpp                  |  67 +-
 src/irisnet/noncore/dtls.h                    |   7 +-
 src/irisnet/noncore/ice176.cpp                |  19 +-
 src/irisnet/noncore/ice176.h                  |   5 +-
 src/irisnet/noncore/sctp/README.md            |   7 +-
 src/irisnet/noncore/sctp/RTC/DataConsumer.hpp |   2 +-
 src/irisnet/noncore/sctp/RTC/DataProducer.hpp |   2 +-
 src/irisnet/noncore/sctp/SctpAssociation.cpp  |  23 +-
 src/irisnet/noncore/sctp/SctpAssociation.hpp  |   9 +-
 src/xmpp/CMakeLists.txt                       |   8 +
 src/xmpp/xmpp-im/jingle-connection.cpp        |  38 +
 src/xmpp/xmpp-im/jingle-connection.h          |  92 ++
 src/xmpp/xmpp-im/jingle-ft.cpp                | 109 ++-
 src/xmpp/xmpp-im/jingle-ibb.cpp               |  38 +-
 src/xmpp/xmpp-im/jingle-ibb.h                 |   2 +-
 src/xmpp/xmpp-im/jingle-ice.cpp               | 912 ++++++++++--------
 src/xmpp/xmpp-im/jingle-ice.h                 |  92 +-
 src/xmpp/xmpp-im/jingle-s5b.cpp               |  27 +-
 src/xmpp/xmpp-im/jingle-s5b.h                 |   2 +-
 .../xmpp-im/jingle-sctp-association_p.cpp     | 177 ++++
 src/xmpp/xmpp-im/jingle-sctp-association_p.h  |  82 ++
 src/xmpp/xmpp-im/jingle-sctp.cpp              | 202 ++++
 src/xmpp/xmpp-im/jingle-sctp.h                | 102 ++
 src/xmpp/xmpp-im/jingle-session.cpp           |   5 +-
 src/xmpp/xmpp-im/jingle-transport.cpp         |  31 +-
 src/xmpp/xmpp-im/jingle-transport.h           | 106 +-
 .../xmpp-im/jingle-webrtc-datachannel_p.cpp   | 163 ++++
 .../xmpp-im/jingle-webrtc-datachannel_p.h     |  71 ++
 src/xmpp/xmpp-im/jingle.h                     |  10 +-
 29 files changed, 1720 insertions(+), 690 deletions(-)
 create mode 100644 src/xmpp/xmpp-im/jingle-connection.cpp
 create mode 100644 src/xmpp/xmpp-im/jingle-connection.h
 create mode 100644 src/xmpp/xmpp-im/jingle-sctp-association_p.cpp
 create mode 100644 src/xmpp/xmpp-im/jingle-sctp-association_p.h
 create mode 100644 src/xmpp/xmpp-im/jingle-sctp.cpp
 create mode 100644 src/xmpp/xmpp-im/jingle-sctp.h
 create mode 100644 src/xmpp/xmpp-im/jingle-webrtc-datachannel_p.cpp
 create mode 100644 src/xmpp/xmpp-im/jingle-webrtc-datachannel_p.h

diff --git a/src/irisnet/noncore/dtls.cpp b/src/irisnet/noncore/dtls.cpp
index 1712680d..f4d9c7ae 100644
--- a/src/irisnet/noncore/dtls.cpp
+++ b/src/irisnet/noncore/dtls.cpp
@@ -7,44 +7,51 @@
 #endif
 #include <QAbstractSocket>
 
-#define DTLS_DEBUG qDebug
+#define DTLS_DEBUG(msg, ...) qDebug("dtls: " msg, ##__VA_ARGS__)
 
 /*
 Connection flow
 
                     juliet                   |                   romeo
 ---------------------------------------------------------------------------------------
-1 |           setup:NotSet                   |               setup:NotSet
+1 |             setup:NotSet                 |               setup:NotSet
 2 |  generate cert + compute fingerprint     |
-3 |           setup:actpass                  |
+3 |             setup:actpass                |
 4 |                             ----send fingerprint----> validate
 5 |                             <-------iq result--------
 5 |                                          |               setup:active
 6 |                                          |  generate cert + compute fingerprint
 7 |               validate      <---send fingerprint-----
-8 |           setup:passive                  |
-9 |         start dtls server                |
+8 |            setup:passive                 |
+9 |          start dtls server               |
 10|                             --------iq result------->
 11|                                          |             start dtls client
 12|================================= DTLS HANDSHAKE ===================================
 */
 
 namespace XMPP {
-const QString NS_DTLS(QStringLiteral("urn:xmpp:jingle:apps:dtls:0"));
 
 static std::array<const char *, 4> fpRoles { { "active", "passive", "actpass", "holdconn" } };
-Dtls::FingerPrint::FingerPrint(const QDomElement &el)
+
+QString Dtls::FingerPrint::ns() { return QStringLiteral("urn:xmpp:jingle:apps:dtls:0"); }
+
+bool Dtls::FingerPrint::parse(const QDomElement &el)
 {
+    if (el.namespaceURI() != ns()) {
+        qWarning("Unrecognized DTLS xmlns: %s. Parse it as if it were %s", qPrintable(el.namespaceURI()),
+                 qPrintable(ns()));
+    }
     auto ht = el.attribute(QLatin1String("hash"));
     hash    = QStringRef(&ht);
     hash.setData(QByteArray::fromHex(el.text().toLatin1()));
-    auto setupIt
-        = std::find(fpRoles.begin(), fpRoles.end(), el.attribute(QLatin1String("setup")).toLatin1().constData());
-    setup = Setup(setupIt == fpRoles.end() ? -1 : std::distance(fpRoles.begin(), setupIt));
+    auto setupIt = std::find(fpRoles.begin(), fpRoles.end(), el.attribute(QLatin1String("setup")).toLatin1());
+    setup        = Setup(setupIt == fpRoles.end() ? NotSet : std::distance(fpRoles.begin(), setupIt) + 1);
+    return isValid();
 }
 
 QDomElement Dtls::FingerPrint::toXml(QDomDocument *doc) const
 {
+    Q_ASSERT(setup != NotSet);
     auto binToHex = [](const QByteArray &in) {
 #if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
         return in.toHex(':');
@@ -57,9 +64,10 @@ QDomElement Dtls::FingerPrint::toXml(QDomDocument *doc) const
         return out;
 #endif
     };
-    auto fingerprint = XMLHelper::textTagNS(doc, NS_DTLS, QLatin1String("fingerprint"), binToHex(hash.data()));
+    auto fingerprint
+        = XMLHelper::textTagNS(doc, ns(), QLatin1String("fingerprint"), QString::fromLatin1(binToHex(hash.data())));
     fingerprint.setAttribute(QLatin1String("hash"), hash.stringType());
-    fingerprint.setAttribute(QLatin1String("setup"), QLatin1String(fpRoles[setup]));
+    fingerprint.setAttribute(QLatin1String("setup"), QLatin1String(fpRoles[setup - 1]));
     return fingerprint;
 }
 
@@ -146,7 +154,7 @@ class Dtls::Private : public QObject {
             needRestart            = true;
             localFingerprint.setup = Dtls::NotSet;
         }
-        remoteFingerprint = localFingerprint;
+        remoteFingerprint = fp;
         if (needRestart)
             emit q->needRestart();
         if (localFingerprint.setup == Dtls::NotSet)
@@ -160,12 +168,17 @@ class Dtls::Private : public QObject {
                 remoteFingerprint.setup = Dtls::Active;
             }
             localFingerprint.setup = remoteFingerprint.setup == Dtls::Active ? Dtls::Passive : Dtls::Active;
+            if (localFingerprint.setup == Dtls::Passive)
+                negotiate();
             return;
         }
         // local is active or passive already, no idea in what scenario. probably something custom
         bool roleConflict = remoteFingerprint.setup == localFingerprint.setup;
-        if (!roleConflict && !remoteActiveOrPassive)
+        if (!roleConflict && !remoteActiveOrPassive) {
+            if (localFingerprint.setup == Dtls::Passive)
+                negotiate();
             return; // looks valid
+        }
         if (roleConflict)
             qWarning("setRemoteFingerprint: dtls role conflict");
         if (!remoteActiveOrPassive)
@@ -258,7 +271,7 @@ Dtls::Dtls(QObject *parent, const QString &localJid, const QString &remoteJid) :
 {
     d->localJid  = localJid;
     d->remoteJid = remoteJid;
-    if (!d->tls->context()) {
+    if (!isSupported()) {
         qWarning("DTLS is not supported by your version of QCA");
     }
 }
@@ -328,27 +341,43 @@ bool Dtls::isSupported() { return QCA::isSupported("dtls"); }
 
 QByteArray Dtls::readDatagram()
 {
+    if (!d->tls) {
+        DTLS_DEBUG("negotiation hasn't started yet. ignore readDatagram");
+        return {};
+    }
     QByteArray a = d->tls->read();
-    DTLS_DEBUG("dtls: read %d bytes of decrypted data", a.size());
+    DTLS_DEBUG("read %d bytes of decrypted data", a.size());
     return a;
 }
 
 QByteArray Dtls::readOutgoingDatagram()
 {
+    if (!d->tls) {
+        DTLS_DEBUG("negotiation hasn't started yet. ignore readOutgoingDatagram");
+        return {};
+    }
     auto ba = d->tls->readOutgoing();
-    DTLS_DEBUG("dtls: read outgoing packet of %d bytes", ba.size());
+    DTLS_DEBUG("read outgoing packet of %d bytes", ba.size());
     return ba;
 }
 
 void Dtls::writeDatagram(const QByteArray &data)
 {
-    DTLS_DEBUG("dtls: write %d bytes for encryption\n", data.size());
+    DTLS_DEBUG("write %d bytes for encryption\n", data.size());
+    if (!d->tls) {
+        DTLS_DEBUG("negotiation hasn't started yet. ignore writeDatagram");
+        return;
+    }
     d->tls->write(data);
 }
 
 void Dtls::writeIncomingDatagram(const QByteArray &data)
 {
-    DTLS_DEBUG("dtls: write incoming %d bytes for decryption\n", data.size());
+    DTLS_DEBUG("write incoming %d bytes for decryption\n", data.size());
+    if (!d->tls) {
+        DTLS_DEBUG("negotiation hasn't started yet. ignore incoming datagram");
+        return;
+    }
     d->tls->writeIncoming(data);
 }
 
diff --git a/src/irisnet/noncore/dtls.h b/src/irisnet/noncore/dtls.h
index 4579d01b..6e80ac01 100644
--- a/src/irisnet/noncore/dtls.h
+++ b/src/irisnet/noncore/dtls.h
@@ -30,12 +30,15 @@ class Dtls : public QObject {
         Setup setup = Setup(-1);
 
         FingerPrint() : setup(NotSet) { }
-        FingerPrint(const QDomElement &el);
+        inline FingerPrint(const QDomElement &el) { parse(el); }
         FingerPrint(const Hash &hash, Setup setup) : hash(hash), setup(setup) { }
 
+        static QString ns();
+
         inline bool operator==(const FingerPrint &other) const { return setup == other.setup || hash == other.hash; }
         inline bool operator!=(const FingerPrint &other) const { return !(*this == other); }
 
+        bool        parse(const QDomElement &el);
         inline bool isValid() const
         {
             return hash.isValid() && !hash.data().isEmpty() && setup >= Active && setup <= HoldConn;
@@ -47,7 +50,7 @@ class Dtls : public QObject {
 
     // state machine stuff
     void initOutgoing();   // when it's our side first send dtls info
-    void acceptIncoming(); // when we need to response to the remote dtls info
+    void acceptIncoming(); // when we need to respond to the remote dtls info
     void onRemoteAcceptedFingerprint();
 
     void             setLocalCertificate(const QCA::Certificate &cert, const QCA::PrivateKey &pkey);
diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index f58e1679..7359c0e3 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -348,7 +348,8 @@ class Ice176::Private : public QObject {
         if (state == Stopped || state == Stopping)
             return; // stopped as a result of previous error?
 
-        state = Stopping;
+        canStartChecks = false;
+        state          = Stopping;
         pacTimer.reset();
         checkTimer.stop();
 
@@ -367,7 +368,6 @@ class Ice176::Private : public QObject {
 
     void addRemoteCandidates(const QList<Candidate> &list)
     {
-        Q_ASSERT(state == Started || state == Starting);
         QList<IceComponent::CandidateInfo::Ptr> remoteCandidates;
         for (const Candidate &c : list) {
             auto ci       = IceComponent::CandidateInfo::Ptr::create();
@@ -1641,9 +1641,12 @@ QString Ice176::localUfrag() const { return d->localUser; }
 
 QString Ice176::localPassword() const { return d->localPass; }
 
-void Ice176::setPeerUfrag(const QString &ufrag) { d->peerUser = ufrag; }
-
-void Ice176::setPeerPassword(const QString &pass) { d->peerPass = pass; }
+void Ice176::setRemoteCredentials(const QString &ufrag, const QString &pass)
+{
+    // TODO detect restart
+    d->peerUser = ufrag;
+    d->peerPass = pass;
+}
 
 void Ice176::addRemoteCandidates(const QList<Candidate> &list) { d->addRemoteCandidates(list); }
 
@@ -1653,6 +1656,12 @@ void Ice176::setRemoteGatheringComplete()
     d->setRemoteGatheringComplete();
 }
 
+void Ice176::setRemoteSelectedCandidadates(const QList<Ice176::SelectedCandidate> &list)
+{
+    Q_UNUSED(list);
+    // This thing is likely useless since ICE knows exactly which pairs are nominated.
+}
+
 bool Ice176::canSendMedia() const { return d->readyToSendMedia; }
 
 bool Ice176::hasPendingDatagrams(int componentIndex) const { return !d->in[componentIndex].isEmpty(); }
diff --git a/src/irisnet/noncore/ice176.h b/src/irisnet/noncore/ice176.h
index 167b2f0e..9e06ead2 100644
--- a/src/irisnet/noncore/ice176.h
+++ b/src/irisnet/noncore/ice176.h
@@ -131,11 +131,10 @@ class Ice176 : public QObject {
     QString localUfrag() const;
     QString localPassword() const;
 
-    void setPeerUfrag(const QString &ufrag);
-    void setPeerPassword(const QString &pass);
-
+    void setRemoteCredentials(const QString &ufrag, const QString &pass);
     void addRemoteCandidates(const QList<Candidate> &list);
     void setRemoteGatheringComplete();
+    void setRemoteSelectedCandidadates(const QList<SelectedCandidate> &list);
 
     bool       canSendMedia() const;
     bool       hasPendingDatagrams(int componentIndex) const;
diff --git a/src/irisnet/noncore/sctp/README.md b/src/irisnet/noncore/sctp/README.md
index af44487f..d58abf46 100644
--- a/src/irisnet/noncore/sctp/README.md
+++ b/src/irisnet/noncore/sctp/README.md
@@ -1,6 +1,6 @@
 DataChannel implementation is borrowed from https://github.com/versatica/mediasoup/tree/v3/worker
-https://github.com/versatica/mediasoup/commit/45dfac41b35d5cd88822fbdf92bbb85e258b4017
-on Oct 21, 2020
+https://github.com/versatica/mediasoup/commit/d3d369ecf3e255a6da04cc6d35098a3fd6bd6f22
+on Mar 17, 2021
 
 Files taken:
 * DepUsrSCTP.cpp
@@ -10,9 +10,10 @@ Files taken:
 * MediaSoupErrors.hpp
 * Logger.hpp (partially, just to make it compile)
 
-Remaining files are writte nfrom scratch.
+Remaining files are written from scratch.
 
 Changes to aforementioned files:
 * removed not needed includes
 * fixed printf format lines to avoid warnings
 * replaced channel notifier with emit, added QObject stuff correspondingly
+* preserve errno in SctpAssociation::SendSctpMessage (possible rewrite by logs handling)
diff --git a/src/irisnet/noncore/sctp/RTC/DataConsumer.hpp b/src/irisnet/noncore/sctp/RTC/DataConsumer.hpp
index 6e1e1d42..1265a413 100644
--- a/src/irisnet/noncore/sctp/RTC/DataConsumer.hpp
+++ b/src/irisnet/noncore/sctp/RTC/DataConsumer.hpp
@@ -5,9 +5,9 @@
 namespace RTC {
 
 class DataConsumer {
-    SctpParameters sctpParameters;
 
 public:
+    SctpParameters        sctpParameters;
     const SctpParameters &GetSctpStreamParameters() const { return sctpParameters; }
 };
 
diff --git a/src/irisnet/noncore/sctp/RTC/DataProducer.hpp b/src/irisnet/noncore/sctp/RTC/DataProducer.hpp
index 47786521..af469777 100644
--- a/src/irisnet/noncore/sctp/RTC/DataProducer.hpp
+++ b/src/irisnet/noncore/sctp/RTC/DataProducer.hpp
@@ -5,9 +5,9 @@
 namespace RTC {
 
 class DataProducer {
+public:
     SctpParameters sctpParameters;
 
-public:
     const SctpParameters &GetSctpStreamParameters() const { return sctpParameters; }
 };
 
diff --git a/src/irisnet/noncore/sctp/SctpAssociation.cpp b/src/irisnet/noncore/sctp/SctpAssociation.cpp
index 619be327..5f044cb5 100644
--- a/src/irisnet/noncore/sctp/SctpAssociation.cpp
+++ b/src/irisnet/noncore/sctp/SctpAssociation.cpp
@@ -375,34 +375,30 @@ void SctpAssociation::SendSctpMessage(RTC::DataConsumer *dataConsumer, uint32_t
 
     this->sctpBufferedAmount += len;
 
+    // Notify the listener about the buffered amount increase regardless
+    // usrsctp_sendv result.
+    // In case of failure the correct value will be later provided by usrsctp
+    // via onSendSctpData.
+    this->listener->OnSctpAssociationBufferedAmount(this, this->sctpBufferedAmount);
+
     int ret = usrsctp_sendv(this->socket, msg, len, nullptr, 0, &spa, static_cast<socklen_t>(sizeof(spa)),
                             SCTP_SENDV_SPA, 0);
 
-    if (ret > 0) {
-        // NOTE: 'usrsctp_sendv' returns the number of bytes sent.
-        this->listener->OnSctpAssociationBufferedAmount(this, this->sctpBufferedAmount);
-    }
-
     if (ret < 0) {
-        this->sctpBufferedAmount -= ret;
-
+        auto errno_copy = errno;
         MS_WARN_TAG(sctp, "error sending SCTP message [sid:%" PRIu16 ", ppid:%" PRIu32 ", message size:%zu]: %s",
                     parameters.streamId, ppid, len, std::strerror(errno));
-
+        errno = errno_copy;
         if (cb) {
             (*cb)(false);
-
             delete cb;
         }
     } else if (cb) {
         (*cb)(true);
-
         delete cb;
     }
 
-    if (errno == EWOULDBLOCK || errno == EAGAIN) {
-        emit sctpSendBufferFull();
-    }
+    this->sendBufferFull = errno == EWOULDBLOCK || errno == EAGAIN;
 }
 
 void SctpAssociation::HandleDataConsumer(RTC::DataConsumer *dataConsumer)
@@ -841,6 +837,7 @@ void SctpAssociation::OnUsrSctpReceiveSctpNotification(union sctp_notification *
                 auto streamId = notification->sn_strreset_event.strreset_stream_list[i];
 
                 ResetSctpStream(streamId, StreamDirection::OUTGOING);
+                this->listener->OnSctpStreamClosed(this, streamId);
             }
         }
 
diff --git a/src/irisnet/noncore/sctp/SctpAssociation.hpp b/src/irisnet/noncore/sctp/SctpAssociation.hpp
index f6999b4d..af93d6f0 100644
--- a/src/irisnet/noncore/sctp/SctpAssociation.hpp
+++ b/src/irisnet/noncore/sctp/SctpAssociation.hpp
@@ -14,8 +14,7 @@
 // using json = nlohmann::json;
 
 namespace RTC {
-class SctpAssociation : public QObject {
-    Q_OBJECT
+class SctpAssociation {
 public:
     enum class SctpState { NEW = 1, CONNECTING, CONNECTED, FAILED, CLOSED };
 
@@ -38,6 +37,7 @@ class SctpAssociation : public QObject {
                                                       uint32_t ppid, const uint8_t *msg, size_t len)
             = 0;
         virtual void OnSctpAssociationBufferedAmount(RTC::SctpAssociation *sctpAssociation, uint32_t len) = 0;
+        virtual void OnSctpStreamClosed(RTC::SctpAssociation *sctpAssociation, uint16_t streamId)         = 0;
     };
 
 public:
@@ -64,6 +64,7 @@ class SctpAssociation : public QObject {
     void      HandleDataConsumer(RTC::DataConsumer *dataConsumer);
     void      DataProducerClosed(RTC::DataProducer *dataProducer);
     void      DataConsumerClosed(RTC::DataConsumer *dataConsumer);
+    bool      isSendBufferFull() const { return sendBufferFull; }
 
 private:
     void ResetSctpStream(uint16_t streamId, StreamDirection);
@@ -77,9 +78,6 @@ class SctpAssociation : public QObject {
     void OnUsrSctpReceiveSctpNotification(union sctp_notification *notification, size_t len);
     void OnUsrSctpSentData(uint32_t freeBuffer);
 
-signals:
-    void sctpSendBufferFull();
-
 public:
     uintptr_t id { 0u };
 
@@ -92,6 +90,7 @@ class SctpAssociation : public QObject {
     size_t    sctpSendBufferSize { 262144u };
     size_t    sctpBufferedAmount { 0u };
     bool      isDataChannel { false };
+    bool      sendBufferFull { false };
     // Allocated by this.
     uint8_t *messageBuffer { nullptr };
     // Others.
diff --git a/src/xmpp/CMakeLists.txt b/src/xmpp/CMakeLists.txt
index 833fc429..aabd0a75 100644
--- a/src/xmpp/CMakeLists.txt
+++ b/src/xmpp/CMakeLists.txt
@@ -95,6 +95,7 @@ set(HEADERS
     xmpp-im/xmpp_task.h
     xmpp-im/xmpp_tasks.h
     xmpp-im/jingle.h
+    xmpp-im/jingle-connection.h
     xmpp-im/jingle-transport.h
     xmpp-im/jingle-nstransportslist.h
     xmpp-im/jingle-application.h
@@ -103,6 +104,9 @@ set(HEADERS
     xmpp-im/jingle-ice.h
     xmpp-im/jingle-s5b.h
     xmpp-im/jingle-ibb.h
+    xmpp-im/jingle-sctp.h
+    xmpp-im/jingle-sctp-association_p.h
+    xmpp-im/jingle-webrtc-datachannel_p.h
 
     zlib/zlibcompressor.h
     zlib/zlibdecompressor.h
@@ -138,6 +142,7 @@ set(SOURCES
     xmpp-im/xmpp_xdata.cpp
     xmpp-im/xmpp_xmlcommon.cpp
     xmpp-im/jingle.cpp
+    xmpp-im/jingle-connection.cpp
     xmpp-im/jingle-session.cpp
     xmpp-im/jingle-application.cpp
     xmpp-im/jingle-transport.cpp
@@ -146,6 +151,9 @@ set(SOURCES
     xmpp-im/jingle-ice.cpp
     xmpp-im/jingle-s5b.cpp
     xmpp-im/jingle-ibb.cpp
+    xmpp-im/jingle-sctp.cpp
+    xmpp-im/jingle-sctp-association_p.cpp
+    xmpp-im/jingle-webrtc-datachannel_p.cpp
 
     base/randomnumbergenerator.cpp
     base/timezone.cpp
diff --git a/src/xmpp/xmpp-im/jingle-connection.cpp b/src/xmpp/xmpp-im/jingle-connection.cpp
new file mode 100644
index 00000000..63645af8
--- /dev/null
+++ b/src/xmpp/xmpp-im/jingle-connection.cpp
@@ -0,0 +1,38 @@
+/*
+ * jignle-connection.cpp - Jingle Connection - minimal data transfer unit for an application
+ * Copyright (C) 2021  Sergey Ilinykh
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "jingle-connection.h"
+
+namespace XMPP { namespace Jingle {
+
+    bool Connection::hasPendingDatagrams() const { return false; }
+
+    NetworkDatagram Connection::receiveDatagram(qint64 maxSize)
+    {
+        Q_UNUSED(maxSize)
+        return NetworkDatagram();
+    }
+
+    size_t Connection::blockSize() const
+    {
+        return 0; // means "block" is not applicable for this kind of connection
+    }
+
+    int Connection::component() const { return 0; }
+}}
diff --git a/src/xmpp/xmpp-im/jingle-connection.h b/src/xmpp/xmpp-im/jingle-connection.h
new file mode 100644
index 00000000..f2efce9c
--- /dev/null
+++ b/src/xmpp/xmpp-im/jingle-connection.h
@@ -0,0 +1,92 @@
+/*
+ * jignle-connection.h - Jingle Connection - minimal data transfer unit for an application
+ * Copyright (C) 2021  Sergey Ilinykh
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef JINGLE_CONNECTION_H
+#define JINGLE_CONNECTION_H
+
+/**
+ * A transport may have multiple connections.
+ * For example an ICE transport may have up to 65537 connections (65535 data/sctp-channels + 2 raw)
+ */
+
+#include "bytestream.h"
+#include "jingle.h"
+
+#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
+#include <QNetworkDatagram>
+#else
+#include <QHostAddress>
+#endif
+
+namespace XMPP { namespace Jingle {
+#if QT_VERSION < QT_VERSION_CHECK(5, 8, 0)
+    // stub implementation
+    class NetworkDatagram {
+    public:
+        bool       _valid = false;
+        QByteArray _data;
+        inline NetworkDatagram(const QByteArray &data, const QHostAddress &destinationAddress = QHostAddress(),
+                               quint16 port = 0) :
+            _valid(true),
+            _data(data)
+        {
+            Q_UNUSED(destinationAddress);
+            Q_UNUSED(port)
+        }
+        inline NetworkDatagram() { }
+
+        inline bool       isValid() const { return _valid; }
+        inline QByteArray data() const { return _data; }
+    };
+#else
+    typedef QNetworkDatagram NetworkDatagram;
+#endif
+
+    class Connection : public ByteStream {
+        Q_OBJECT
+    public:
+        using Ptr = QSharedPointer<Connection>; // will be shared between transport and application
+        virtual bool              hasPendingDatagrams() const;
+        virtual NetworkDatagram   receiveDatagram(qint64 maxSize = -1);
+        virtual size_t            blockSize() const;
+        virtual int               component() const;
+        virtual TransportFeatures features() const = 0;
+
+        inline void setId(const QString &id) { _id = id; }
+        inline bool isRemote() const { return _isRemote; }
+        inline void setRemote(bool value) { _isRemote = value; }
+
+    signals:
+        void connected();
+        void disconnected();
+
+    protected:
+        bool    _isRemote = false;
+        QString _id;
+    };
+
+    using ConnectionAcceptorCallback = std::function<bool(Connection::Ptr)>;
+    struct ConnectionAcceptor {
+        TransportFeatures          features;
+        ConnectionAcceptorCallback callback;
+        int                        componentIndex;
+    };
+}}
+
+#endif // JINGLE_CONNECTION_H
diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index f898e8c7..2459a644 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -29,6 +29,7 @@
 #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
 #include <QRandomGenerator>
 #endif
+#include <QPointer>
 #include <cmath>
 #include <functional>
 
@@ -460,7 +461,6 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
             }
             if (s >= State::Finishing && q->transport()) {
                 q->disconnect(q->transport().data(), &Transport::failed, q, nullptr);
-                q->disconnect(q->transport().data(), &Transport::connected, q, nullptr);
                 // we can still try to send transport updates
             }
             emit q->stateChanged(s);
@@ -540,6 +540,46 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
                 setState(State::Finished);
             }
         }
+
+        void setupConnection()
+        {
+            QObject::connect(connection.data(), &Connection::connected, q, [this]() {
+                lastReason = Reason();
+                lastError.reset();
+
+                if (!streamingMode) {
+                    connect(connection.data(), &Connection::readyRead, q, [this]() {
+                        if (!device) {
+                            return;
+                        }
+                        if (q->pad()->session()->role() != q->senders()) {
+                            readNextBlockFromTransport();
+                        }
+                    });
+                    connect(connection.data(), &Connection::bytesWritten, q, [this](qint64 bytes) {
+                        Q_UNUSED(bytes)
+                        if (q->pad()->session()->role() == q->senders() && !connection->bytesToWrite()) {
+                            writeNextBlockToTransport();
+                        }
+                    });
+                }
+
+                setState(State::Active);
+                if (!streamingMode) {
+                    if (acceptFile.range().isValid()) {
+                        bytesLeft = acceptFile.range().length;
+                        if (!bytesLeft)
+                            endlessRange = true;
+                        emit q->deviceRequested(acceptFile.range().offset, bytesLeft);
+                    } else {
+                        bytesLeft = acceptFile.size();
+                        emit q->deviceRequested(0, bytesLeft);
+                    }
+                } else {
+                    emit q->connectionReady();
+                }
+            });
+        }
     };
 
     Application::Application(const QSharedPointer<Pad> &pad, const QString &contentName, Origin creator,
@@ -646,56 +686,27 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
 
     void Application::prepareTransport()
     {
-        if (_transport->creator() == _pad->session()->role()) {
-            d->connection = _transport->addChannel(TransportFeature::Reliable | TransportFeature::DataOriented);
-        } else {
-            auto const &channels = _transport->channels();
-            if (channels.size()) {
-                d->connection = channels[0];
+        if (_transport->isLocal()) {
+            d->connection
+                = _transport->addChannel(TransportFeature::Reliable | TransportFeature::DataOriented, contentName());
+            if (!d->connection) {
+                _transport->stop();
+                qWarning("No channel on %s transport", qPrintable(_transport->pad()->ns()));
+                selectNextTransport();
+                return;
             }
+            d->setupConnection();
+        } else {
+            _transport->addAcceptor(TransportFeature::Reliable | TransportFeature::Ordered
+                                        | TransportFeature::DataOriented,
+                                    [this, self = QPointer<Application>(this)](Connection::Ptr connection) {
+                                        if (!self || d->connection)
+                                            return false;
+                                        d->connection = connection;
+                                        d->setupConnection();
+                                        return true;
+                                    });
         }
-        if (!d->connection) {
-            _transport->stop();
-            qWarning("No channel on %s transport", qPrintable(_transport->pad()->ns()));
-            selectNextTransport();
-            return;
-        }
-        connect(d->connection.data(), &Connection::connected, this, [this]() {
-            d->lastReason = Reason();
-            d->lastError.reset();
-
-            if (!d->streamingMode) {
-                connect(d->connection.data(), &Connection::readyRead, this, [this]() {
-                    if (!d->device) {
-                        return;
-                    }
-                    if (_pad->session()->role() != _senders) {
-                        d->readNextBlockFromTransport();
-                    }
-                });
-                connect(d->connection.data(), &Connection::bytesWritten, this, [this](qint64 bytes) {
-                    Q_UNUSED(bytes)
-                    if (_pad->session()->role() == _senders && !d->connection->bytesToWrite()) {
-                        d->writeNextBlockToTransport();
-                    }
-                });
-            }
-
-            d->setState(State::Active);
-            if (!d->streamingMode) {
-                if (d->acceptFile.range().isValid()) {
-                    d->bytesLeft = d->acceptFile.range().length;
-                    if (!d->bytesLeft)
-                        d->endlessRange = true;
-                    emit deviceRequested(d->acceptFile.range().offset, d->bytesLeft);
-                } else {
-                    d->bytesLeft = d->acceptFile.size();
-                    emit deviceRequested(0, d->bytesLeft);
-                }
-            } else {
-                emit connectionReady();
-            }
-        });
         _transport->prepare();
     }
 
diff --git a/src/xmpp/xmpp-im/jingle-ibb.cpp b/src/xmpp/xmpp-im/jingle-ibb.cpp
index 219ef590..7ef8d462 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.cpp
+++ b/src/xmpp/xmpp-im/jingle-ibb.cpp
@@ -75,6 +75,12 @@ namespace XMPP { namespace Jingle { namespace IBB {
             emit connected();
         }
 
+        TransportFeatures features() const
+        {
+            return TransportFeature::DataOriented | TransportFeature::StreamOriented | TransportFeature::Ordered
+                | TransportFeature::Reliable;
+        }
+
         size_t blockSize() const { return _blockSize; }
 
         qint64 bytesAvailable() const
@@ -162,11 +168,8 @@ namespace XMPP { namespace Jingle { namespace IBB {
             QObject::connect(ibbConn.data(), &Connection::connected, q, [this]() {
                 if (q->_state == State::Connecting) {
                     q->setState(State::Active);
-                    emit q->connected();
                 }
             });
-            connections.insert(ibbConn->sid, ibbConn);
-
             QObject::connect(ibbConn.data(), &Connection::connectionClosed, q, [this]() {
                 Connection *c = static_cast<Connection *>(q->sender());
                 connections.remove(c->sid);
@@ -203,10 +206,21 @@ namespace XMPP { namespace Jingle { namespace IBB {
     void Transport::prepare()
     {
         setState(State::ApprovedToSend);
-        for (auto &c : d->connections) {
+        auto it = d->connections.begin();
+        while (it != d->connections.end()) {
+            auto &c = it.value();
+            if (c->isRemote() && !notifyIncomingConnection(c)) {
+                it = d->connections.erase(it);
+                continue;
+            }
             c->state = State::ApprovedToSend;
+            ++it;
         }
-        emit updated();
+        if (d->connections.isEmpty()) {
+            _state = State::Finished;
+            emit failed();
+        } else
+            emit updated();
     }
 
     void Transport::start()
@@ -247,11 +261,14 @@ namespace XMPP { namespace Jingle { namespace IBB {
                 qWarning("failed to create IBB connection");
                 return false;
             }
+            c->setRemote(true);
             c->state = State::Pending;
-            if (_state == State::Created && _creator != _pad->session()->role()) {
+            if (_state == State::Created && isRemote()) {
                 // seems like we are just initing remote transport
                 setState(State::Pending);
-            }
+                d->connections.insert(sid, c);
+            } else if (!wasAccepted() || notifyIncomingConnection(c))
+                d->connections.insert(sid, c);
         } else {
             if ((*it)->creator != _pad->session()->role() || (*it)->state != State::Pending) {
                 if ((*it)->state >= State::Accepted && (*it)->state <= State::Active) {
@@ -357,11 +374,14 @@ namespace XMPP { namespace Jingle { namespace IBB {
 
     int Transport::maxSupportedChannelsPerComponent(TransportFeatures) const { return -1; }
 
-    Connection::Ptr Transport::addChannel(TransportFeatures features, int) const
+    Connection::Ptr Transport::addChannel(TransportFeatures features, const QString &id, int)
     {
         if (features & TransportFeature::LiveOriented)
             return {};
-        return d->newStream(QString(), d->defaultBlockSize, _pad->session()->role());
+        auto ibbConn = d->newStream(QString(), d->defaultBlockSize, _pad->session()->role());
+        ibbConn->setId(id);
+        d->connections.insert(ibbConn->sid, ibbConn);
+        return ibbConn;
     }
 
     QList<XMPP::Jingle::Connection::Ptr> Transport::channels() const
diff --git a/src/xmpp/xmpp-im/jingle-ibb.h b/src/xmpp/xmpp-im/jingle-ibb.h
index b652f51e..68c5a1b4 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.h
+++ b/src/xmpp/xmpp-im/jingle-ibb.h
@@ -43,7 +43,7 @@ namespace Jingle { namespace IBB {
         TransportFeatures           features() const override;
         int                         maxSupportedChannelsPerComponent(TransportFeatures features) const override;
 
-        Connection::Ptr        addChannel(TransportFeatures features, int component = 0) const override;
+        Connection::Ptr        addChannel(TransportFeatures features, const QString &id, int component = 0) override;
         QList<Connection::Ptr> channels() const override;
 
     private:
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index 4e4a1d5e..a8f78f9e 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -17,12 +17,13 @@
  *
  */
 
-#include "irisnet/noncore/sctp/DepUsrSCTP.hpp" //Do not move to avoid warnings with MinGW
+#include "jingle-sctp.h" //Do not move to avoid warnings with MinGW
 
 #include "jingle-ice.h"
 
 #include "dtls.h"
 #include "ice176.h"
+#include "jingle-sctp.h"
 #include "jingle-session.h"
 #include "netnames.h"
 #include "udpportreserver.h"
@@ -43,7 +44,178 @@ template <class T> constexpr std::add_const_t<T> &as_const(T &t) noexcept { retu
 namespace XMPP { namespace Jingle { namespace ICE {
     const QString NS(QStringLiteral("urn:xmpp:jingle:transports:ice:0"));
     const QString NS_DTLS(QStringLiteral("urn:xmpp:jingle:apps:dtls:0"));
-    const QString NS_SCTP(QStringLiteral("urn:xmpp:jingle:transports:dtls-sctp:1"));
+
+    static XMPP::Ice176::Candidate elementToCandidate(const QDomElement &e)
+    {
+        if (e.tagName() != "candidate")
+            return XMPP::Ice176::Candidate();
+
+        XMPP::Ice176::Candidate c;
+        c.component  = e.attribute("component").toInt();
+        c.foundation = e.attribute("foundation");
+        c.generation = e.attribute("generation").toInt();
+        c.id         = e.attribute("id");
+        c.ip         = QHostAddress(e.attribute("ip"));
+        c.network    = e.attribute("network").toInt();
+        c.port       = e.attribute("port").toInt();
+        c.priority   = e.attribute("priority").toInt();
+        c.protocol   = e.attribute("protocol");
+        c.rel_addr   = QHostAddress(e.attribute("rel-addr"));
+        c.rel_port   = e.attribute("rel-port").toInt();
+        // TODO: remove this?
+        // c.rem_addr = QHostAddress(e.attribute("rem-addr"));
+        // c.rem_port = e.attribute("rem-port").toInt();
+        c.type = e.attribute("type");
+
+        // TODO tcptype
+
+        return c;
+    }
+
+    static QDomElement candidateToElement(QDomDocument *doc, const XMPP::Ice176::Candidate &c)
+    {
+        QDomElement e = doc->createElement("candidate");
+        e.setAttribute("component", QString::number(c.component));
+        e.setAttribute("foundation", c.foundation);
+        e.setAttribute("generation", QString::number(c.generation));
+        if (!c.id.isEmpty())
+            e.setAttribute("id", c.id);
+        e.setAttribute("ip", c.ip.toString());
+        if (c.network != -1)
+            e.setAttribute("network", QString::number(c.network));
+        else // weird?
+            e.setAttribute("network", QString::number(0));
+        e.setAttribute("port", QString::number(c.port));
+        e.setAttribute("priority", QString::number(c.priority));
+        e.setAttribute("protocol", c.protocol);
+        if (!c.rel_addr.isNull())
+            e.setAttribute("rel-addr", c.rel_addr.toString());
+        if (c.rel_port != -1)
+            e.setAttribute("rel-port", QString::number(c.rel_port));
+        // TODO: remove this?
+        // if(!c.rem_addr.isNull())
+        //    e.setAttribute("rem-addr", c.rem_addr.toString());
+        // if(c.rem_port != -1)
+        //    e.setAttribute("rem-port", QString::number(c.rem_port));
+        e.setAttribute("type", c.type);
+        return e;
+    }
+
+    QDomElement remoteCandidateToElement(QDomDocument *doc, const Ice176::SelectedCandidate &c)
+    {
+        auto e = doc->createElement("remote-candidate");
+        e.setAttribute(QLatin1String("component"), c.componentId);
+        e.setAttribute(QLatin1String("ip"), c.ip.toString());
+        e.setAttribute(QLatin1String("port"), c.port);
+        return e;
+    }
+
+    Ice176::SelectedCandidate elementToRemoteCandidate(const QDomElement &el, bool *ok)
+    {
+        Ice176::SelectedCandidate c;
+        quint16                   tmp;
+        tmp = el.attribute(QLatin1String("component")).toUInt(ok);
+        *ok = *ok && tmp < 256;
+        if (!*ok)
+            return c;
+        c.componentId = tmp;
+        c.ip          = QHostAddress(el.attribute(QLatin1String("ip")));
+        c.port        = el.attribute(QLatin1String("port")).toUShort(ok);
+        *ok           = *ok && !c.ip.isNull();
+        return c;
+    }
+
+    struct Element {
+        QString                          pwd;
+        QString                          ufrag;
+        Dtls::FingerPrint                fingerprint;
+        SCTP::MapElement                 sctpMap;
+        QList<SCTP::ChannelElement>      sctpChannels;
+        QList<Ice176::Candidate>         candidates;
+        QList<Ice176::SelectedCandidate> remoteCandidates;
+        bool                             gatheringComplete = false;
+
+        void cleanupICE()
+        {
+            candidates.clear();
+            remoteCandidates.clear();
+            gatheringComplete = false;
+        }
+
+        QDomElement toXml(QDomDocument *doc) const
+        {
+            QDomElement tel = doc->createElementNS(NS, "transport");
+            if (!pwd.isEmpty())
+                tel.setAttribute(QLatin1String("pwd"), pwd);
+            if (!ufrag.isEmpty())
+                tel.setAttribute(QLatin1String("ufrag"), ufrag);
+            if (fingerprint.isValid())
+                tel.appendChild(fingerprint.toXml(doc));
+            if (sctpMap.isValid())
+                tel.appendChild(sctpMap.toXml(doc));
+            for (auto const &c : sctpChannels)
+                tel.appendChild(c.toXml(doc));
+            for (auto const &c : candidates)
+                tel.appendChild(candidateToElement(doc, c));
+            for (auto const &c : remoteCandidates) {
+                tel.appendChild(remoteCandidateToElement(doc, c));
+            }
+            if (gatheringComplete)
+                tel.appendChild(doc->createElement(QLatin1String("gathering-complete")));
+
+            return tel;
+        }
+
+        void parse(const QDomElement &el)
+        {
+            ufrag             = el.attribute(QLatin1String("ufrag"));
+            pwd               = el.attribute(QLatin1String("pwd"));
+            auto e            = el.firstChildElement(QLatin1String("gathering-complete"));
+            gatheringComplete = !e.isNull();
+
+            e = el.firstChildElement(QLatin1String("fingerprint"));
+            if (!e.isNull() && !fingerprint.parse(e))
+                throw std::runtime_error("invalid fingerprint");
+
+            if (fingerprint.isValid() && !Dtls::isSupported())
+                qWarning("Remote requested DTLS but it's not supported by used crypto libraries.");
+
+            e = el.firstChildElement(QLatin1String("sctpmap"));
+            if (!e.isNull() && !sctpMap.parse(e))
+                throw std::runtime_error("invalid sctpmap");
+
+            QString chTag(QStringLiteral("channel"));
+            for (e = el.firstChildElement(chTag); !e.isNull(); e = e.nextSiblingElement(chTag)) {
+                SCTP::ChannelElement channel;
+                if (!channel.parse(e))
+                    throw std::runtime_error("invalid sctp channel");
+                ;
+                sctpChannels.append(channel);
+            }
+            QString candTag(QStringLiteral("candidate"));
+            for (e = el.firstChildElement(candTag); !e.isNull(); e = e.nextSiblingElement(candTag)) {
+                auto c = elementToCandidate(e);
+                if (!c.component || c.type.isEmpty())
+                    throw std::runtime_error("invalid candidate");
+                ;
+                candidates.append(c);
+            }
+            if (!candidates.isEmpty()) {
+                if (ufrag.isEmpty() || pwd.isEmpty())
+                    throw std::runtime_error("user fragment or password can't be empty");
+            }
+
+            QString rcTag(QStringLiteral("remote-candidate"));
+            for (e = el.firstChildElement(rcTag); !e.isNull(); e = e.nextSiblingElement(rcTag)) {
+                bool                      ok;
+                Ice176::SelectedCandidate rc = elementToRemoteCandidate(e, &ok);
+                if (!ok)
+                    throw std::runtime_error("invalid remote candidate");
+                ;
+                remoteCandidates.append(rc);
+            }
+        }
+    };
 
     // TODO: reject offers that don't contain at least one of audio or video
     // TODO: support candidate negotiations over the JingleRtpChannel thread
@@ -113,54 +285,6 @@ namespace XMPP { namespace Jingle { namespace ICE {
         return out;
     }
 
-    struct SctpKeeper {
-        using Ptr = std::shared_ptr<SctpKeeper>;
-
-        static std::weak_ptr<SctpKeeper> instance;
-        SctpKeeper() { DepUsrSCTP::ClassInit(); }
-        ~SctpKeeper() { DepUsrSCTP::ClassDestroy(); }
-        static Ptr use()
-        {
-            auto i = instance.lock();
-            if (!i) {
-                i        = std::make_shared<SctpKeeper>();
-                instance = i;
-            }
-            return i;
-        }
-    };
-    std::weak_ptr<SctpKeeper> SctpKeeper::instance;
-
-    enum class SctpProtocol { None, WebRTCDataChannel };
-
-    struct SctpElement {
-        SctpProtocol protocol = SctpProtocol::None;
-        uint16_t     number   = 0;
-
-        QDomElement toXml(QDomDocument *doc)
-        {
-            QDomElement ret;
-            if (protocol == SctpProtocol::None)
-                return ret;
-            ret = doc->createElementNS(NS_SCTP, QLatin1String("sctpmap"));
-            ret.setAttribute(QLatin1String("protocol"), QLatin1String("webrtc-datachannel"));
-            ret.setAttribute(QLatin1String("number"), number);
-            return ret;
-        }
-
-        bool parse(const QDomElement &el)
-        {
-            if (el.namespaceURI() != NS_SCTP) {
-                return false;
-            }
-            auto p = el.attribute(QLatin1String("protocol"));
-            protocol
-                = (p == QLatin1String("webrtc-datachannel")) ? SctpProtocol::WebRTCDataChannel : SctpProtocol::None;
-            number = el.attribute(QLatin1String("number")).toInt();
-            return protocol != SctpProtocol::None && number > 0;
-        }
-    };
-
     class Resolver : public QObject {
         Q_OBJECT
         using QObject::QObject;
@@ -283,7 +407,6 @@ namespace XMPP { namespace Jingle { namespace ICE {
         QString stunRelayTcpPass;
 
         XMPP::TurnClient::Proxy stunProxy;
-        SctpKeeper::Ptr         sctpInstance;
 
         // FIMME it's reuiqred to split transports by direction otherwise we gonna hit conflicts.
         // jid,transport-sid -> transport mapping
@@ -292,103 +415,48 @@ namespace XMPP { namespace Jingle { namespace ICE {
         //        Jid                         proxy;
     };
 
-    static XMPP::Ice176::Candidate elementToCandidate(const QDomElement &e)
-    {
-        if (e.tagName() != "candidate")
-            return XMPP::Ice176::Candidate();
-
-        XMPP::Ice176::Candidate c;
-        c.component  = e.attribute("component").toInt();
-        c.foundation = e.attribute("foundation");
-        c.generation = e.attribute("generation").toInt();
-        c.id         = e.attribute("id");
-        c.ip         = QHostAddress(e.attribute("ip"));
-        c.network    = e.attribute("network").toInt();
-        c.port       = e.attribute("port").toInt();
-        c.priority   = e.attribute("priority").toInt();
-        c.protocol   = e.attribute("protocol");
-        c.rel_addr   = QHostAddress(e.attribute("rel-addr"));
-        c.rel_port   = e.attribute("rel-port").toInt();
-        // TODO: remove this?
-        // c.rem_addr = QHostAddress(e.attribute("rem-addr"));
-        // c.rem_port = e.attribute("rem-port").toInt();
-        c.type = e.attribute("type");
-        return c;
-    }
-
-    static QDomElement candidateToElement(QDomDocument *doc, const XMPP::Ice176::Candidate &c)
-    {
-        QDomElement e = doc->createElement("candidate");
-        e.setAttribute("component", QString::number(c.component));
-        e.setAttribute("foundation", c.foundation);
-        e.setAttribute("generation", QString::number(c.generation));
-        if (!c.id.isEmpty())
-            e.setAttribute("id", c.id);
-        e.setAttribute("ip", c.ip.toString());
-        if (c.network != -1)
-            e.setAttribute("network", QString::number(c.network));
-        else // weird?
-            e.setAttribute("network", QString::number(0));
-        e.setAttribute("port", QString::number(c.port));
-        e.setAttribute("priority", QString::number(c.priority));
-        e.setAttribute("protocol", c.protocol);
-        if (!c.rel_addr.isNull())
-            e.setAttribute("rel-addr", c.rel_addr.toString());
-        if (c.rel_port != -1)
-            e.setAttribute("rel-port", QString::number(c.rel_port));
-        // TODO: remove this?
-        // if(!c.rem_addr.isNull())
-        //    e.setAttribute("rem-addr", c.rem_addr.toString());
-        // if(c.rem_port != -1)
-        //    e.setAttribute("rem-port", QString::number(c.rem_port));
-        e.setAttribute("type", c.type);
-        return e;
-    }
-
-    class Connection : public XMPP::Jingle::Connection {
+    class RawConnection : public XMPP::Jingle::Connection {
         Q_OBJECT
     public:
-        enum DisconnectReason { DtlsClosed, SctpClosed };
+        using Ptr = QSharedPointer<RawConnection>;
+
+        enum DisconnectReason { None, DtlsClosed };
 
         QList<NetworkDatagram> datagrams;
-        void *                 client;
-        int                    component; // starting from 0
-        TransportFeatures      features;
-        DisconnectReason       disconnectReason;
+        DisconnectReason       disconnectReason = None;
+        quint8                 componentIndex   = 0;
+
+        RawConnection(quint8 componentIndex) : componentIndex(componentIndex) {};
 
-        Connection(int component, TransportFeatures features) : component(component), features(features)
+        int component() const override { return componentIndex; }
+
+        TransportFeatures features() const override
         {
-            /*connect(client, &SocksClient::readyRead, this, &Connection::readyRead);
-            connect(client, &SocksClient::bytesWritten, this, &Connection::bytesWritten);
-            connect(client, &SocksClient::aboutToClose, this, &Connection::aboutToClose);
-            if (client->isOpen()) {
-                setOpenMode(client->openMode());
-            } else {
-                qWarning("Creating S5B Transport connection on closed SockClient connection %p", client);
-            }*/
+            return TransportFeature::Fast | TransportFeature::MessageOriented | TransportFeature::HighProbableConnect
+                | TransportFeature::Unreliable;
         }
 
-        bool hasPendingDatagrams() const { return datagrams.size() > 0; }
+        bool hasPendingDatagrams() const override { return datagrams.size() > 0; }
 
-        NetworkDatagram receiveDatagram(qint64 maxSize = -1)
+        NetworkDatagram receiveDatagram(qint64 maxSize = -1) override
         {
             Q_UNUSED(maxSize) // TODO or not?
             return datagrams.size() ? datagrams.takeFirst() : NetworkDatagram();
         }
 
-        qint64 bytesAvailable() const { return 0; }
+        qint64 bytesAvailable() const override { return 0; }
 
-        qint64 bytesToWrite() const { return 0; /*client->bytesToWrite();*/ }
+        qint64 bytesToWrite() const override { return 0; /*client->bytesToWrite();*/ }
 
-        void close() { XMPP::Jingle::Connection::close(); }
+        void close() override { XMPP::Jingle::Connection::close(); }
 
     protected:
-        qint64 writeData(const char *data, qint64 maxSize)
+        qint64 writeData(const char *data, qint64 maxSize) override
         {
             return 0; // client->write(data, maxSize);
         }
 
-        qint64 readData(char *data, qint64 maxSize) { return 0; }
+        qint64 readData(char *data, qint64 maxSize) override { return 0; }
 
     private:
         friend class Transport;
@@ -417,9 +485,25 @@ namespace XMPP { namespace Jingle { namespace ICE {
         }
     };
 
+    struct Component {
+        int                           componentIndex = 0;
+        bool                          initialized    = false;
+        bool                          lowOverhead    = false;
+        Dtls *                        dtls           = nullptr;
+        SCTP::Association *           sctp           = nullptr;
+        QSharedPointer<RawConnection> rawConnection;
+        // QHash<quint16, Connection::Ptr> dataChannels;
+    };
+
     class Transport::Private {
     public:
-        enum PendingActions { NewCandidate = 1, RemoteCandidate = 2, GatheringComplete = 4, NewFingerprint = 8 };
+        enum PendingActions {
+            NewCandidate       = 1,
+            RemoteCandidate    = 2,
+            GatheringComplete  = 4,
+            NewFingerprint     = 8,
+            NewSctpAssociation = 16
+        };
 
         Transport *                    q                         = nullptr;
         bool                           offerSent                 = false;
@@ -429,12 +513,9 @@ namespace XMPP { namespace Jingle { namespace ICE {
         bool                           remoteAcceptedFingerprint = false;
         quint16                        pendingActions            = 0;
         int                            proxiesInDiscoCount       = 0;
-        int                            components                = 0;
+        QVector<Component>             components;
         QList<XMPP::Ice176::Candidate> pendingLocalCandidates; // cid to candidate mapping
-        QList<XMPP::Ice176::Candidate> remoteCandidates;
-        QString                        remoteUfrag;
-        QString                        remotePassword;
-        SctpElement                    sctp;
+        QScopedPointer<Element>        remoteState;
 
         // QString            sid;
         // Transport::Mode    mode = Transport::Tcp;
@@ -447,9 +528,9 @@ namespace XMPP { namespace Jingle { namespace ICE {
         Resolver           resolver;
         XMPP::Ice176 *     ice = nullptr;
 
-        QVector<XMPP::Dtls *> dtls; // for each ICE component
-        Dtls::Setup           localDtlsRole  = Dtls::ActPass;
-        Dtls::Setup           remoteDtlsRole = Dtls::ActPass;
+        Dtls::Setup      localDtlsRole  = Dtls::ActPass;
+        Dtls::Setup      remoteDtlsRole = Dtls::ActPass;
+        SCTP::MapElement sctp;
 
         QHostAddress extAddr;
         QHostAddress stunBindAddr, stunRelayUdpAddr, stunRelayTcpAddr;
@@ -457,7 +538,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
         int          stunRelayUdpPort;
         int          stunRelayTcpPort;
 
-        QList<QSharedPointer<Connection>> channels;
+        // QList<QSharedPointer<Connection>> channels;
 
         // udp stuff
         bool         udpInitialized;
@@ -466,188 +547,79 @@ namespace XMPP { namespace Jingle { namespace ICE {
 
         inline Jid remoteJid() const { return q->_pad->session()->peer(); }
 
-        void flushRemoteCandidates()
-        {
-            if (!ice || q->_state < State::ApprovedToSend || q->_state == State::Finished)
-                return;
-            qDebug("flushing remote candidates");
-            ice->setPeerUfrag(remoteUfrag);
-            ice->setPeerPassword(remotePassword);
-            if (remoteCandidates.isEmpty())
-                return;
-            ice->addRemoteCandidates(remoteCandidates);
-            remoteCandidates.clear();
-
-            std::sort(remoteCandidates.begin(), remoteCandidates.end(),
-                      [](const auto &a, const auto &b) { return a.component < b.component; });
-        }
-
-        bool handleIncomingCandidate(const QDomElement &transportEl)
+        Component &addComponent()
         {
-            QString candidateTag(QStringLiteral("candidate"));
-            int     candidatesAdded = 0;
-            for (QDomElement ce = transportEl.firstChildElement(candidateTag); !ce.isNull();
-                 ce             = ce.nextSiblingElement(candidateTag)) {
-                XMPP::Ice176::Candidate ic = elementToCandidate(ce);
-                if (ic.type.isEmpty()) {
-                    throw std::runtime_error("failed to parse incoming candidate");
-                }
-                if (!candidatesAdded) {
-                    remoteUfrag    = transportEl.attribute("ufrag");
-                    remotePassword = transportEl.attribute("pwd");
-                    if (remoteUfrag.isEmpty() || remotePassword.isEmpty())
-                        throw std::runtime_error("user fragment or password can't be empty");
-                }
-                if (ic.component > components) {
-                    if (q->_state >= State::ApprovedToSend) {
-                        throw std::runtime_error("too late to add components");
-                    }
-                    components = ic.component;
-                }
-                // qDebug("new remote candidate: %s", qPrintable(c.toString()));
-                remoteCandidates.append(ic); // TODO check for collisions!
-                candidatesAdded++;
-            }
-            if (!candidatesAdded) {
-                return false;
-            }
-            if (q->isRemote() && channels.empty()) {
-                /*
-                 * seems like initial offer
-                 *
-                 * The channels split topic is somewhat complicated.
-                 * We can talk about multiplexed rtp/rtcp channels, about sctp channels or maybe plain ICE
-                 * components. In general logic is as following:
-                 *  - no datachannels - amount of channels = amount of components
-                 *  - with datachannels - one channel for datachannel on component 1. one channel per component with
-                 *                        filtered out datachannel
-                 */
-                TransportFeatures features(TransportFeature::HighProbableConnect | TransportFeature::Fast
-                                           | TransportFeature::MessageOriented);
-                if (sctp.protocol != SctpProtocol::None) {
-                    channels.append(QSharedPointer<Connection>::create(0, features | TransportFeature::DataOriented));
-                }
-                for (int i = 0; i < components; i++) {
-                    channels.append(QSharedPointer<Connection>::create(i, features));
-                }
-            }
-            if (ice) {
-                QTimer::singleShot(0, q, [this]() { flushRemoteCandidates(); });
-            }
-            return true;
+            components.append(Component {});
+            auto &c          = components.last();
+            c.componentIndex = components.size() - 1;
+            return c;
         }
 
-        bool handleIncomingRemoteCandidate(const QDomElement &transportEl)
+        void setupDtls(int componentIndex)
         {
-            QDomElement el = transportEl.firstChildElement(QStringLiteral("remote-candidate"));
-            if (!el.isNull()) {
-                bool     ok, ok2;
-                auto     component = el.attribute(QLatin1String("component")).toUInt(&ok);
-                auto     ipStr     = el.attribute(QLatin1String("ip"));
-                auto     ip        = QHostAddress(ipStr);
-                uint16_t port      = el.attribute(QLatin1String("port")).toUShort(&ok2);
-
-                if (!(ok && ok2 && !ip.isNull() && component <= 256))
-                    throw std::runtime_error("failed to parse remote-candidate");
-
-                qDebug("recv remote-candidate notification: c%u %s:%hu", component, qPrintable(ipStr), port);
-                return true;
-            }
-            return false;
-        }
-
-        bool handleIncomingGatheringComplete(const QDomElement &transportEl)
-        {
-            auto el = transportEl.firstChildElement(QStringLiteral("gathering-complete"));
-            if (!el.isNull() && ice) {
-                qDebug("recv gathering-complete");
-                ice->setRemoteGatheringComplete();
-                return true;
-            }
-            return false;
-        }
+            qDebug("Setup DTLS");
+            Q_ASSERT(componentIndex < components.length());
+            if (components[componentIndex].dtls)
+                return;
+            components[componentIndex].dtls
+                = new Dtls(q, q->pad()->session()->me().full(), q->pad()->session()->peer().full());
 
-        bool handleDtlsFingerprint(const QDomElement &transportEl)
-        {
-            auto el = transportEl.firstChildElement(QStringLiteral("fingerprint"));
-            if (el.isNull())
-                return false;
-            qDebug("recv fingerprint");
-            if (el.namespaceURI() != NS_DTLS) {
-                qWarning("Unrecognized DTLS xmlns: %s. Parse it as if it were %s", qPrintable(el.namespaceURI()),
-                         qPrintable(NS_DTLS));
-            }
-            Dtls::FingerPrint fp(el);
-            if (!fp.isValid())
-                throw std::runtime_error("failed to parse remote fingerprint");
-            if (!Dtls::isSupported()) {
-                qWarning("Remote requested DTLS but it's not supported by used crypto libraries. Silently ignore..");
-                return true;
+            auto dtls = components[componentIndex].dtls;
+            if (q->isLocal()) {
+                dtls->initOutgoing();
+            } else {
+                dtls->setRemoteFingerprint(remoteState->fingerprint);
+                dtls->acceptIncoming();
             }
-            ensureDtlsCreated();
-            for (auto d : as_const(dtls))
-                d->setRemoteFingerprint(fp);
-            return true;
-        }
-
-        void makeDtlsPipeline(int componentIndex)
-        {
-            auto d = dtls[componentIndex];
 
             if (componentIndex == 0) { // for other components it's the same but we don't need multiple fingerprints
-                d->connect(
-                    d, &Dtls::needRestart, q,
+                dtls->connect(
+                    dtls, &Dtls::needRestart, q,
                     [this, componentIndex]() {
                         pendingActions |= NewFingerprint;
                         remoteAcceptedFingerprint = false;
                         emit q->updated();
                     },
                     Qt::QueuedConnection);
+                pendingActions |= NewFingerprint;
             }
-            d->connect(d, &Dtls::readyRead, q, [this, componentIndex]() {
-                auto d = dtls[componentIndex]->readDatagram();
+            dtls->connect(dtls, &Dtls::readyRead, q, [this, componentIndex]() {
+                auto d = components[componentIndex].dtls->readDatagram();
                 // pass data to sctp
             });
-            d->connect(d, &Dtls::readyReadOutgoing, q, [this, componentIndex]() {
-                ice->writeDatagram(componentIndex, dtls[componentIndex]->readOutgoingDatagram());
+            dtls->connect(dtls, &Dtls::readyReadOutgoing, q, [this, componentIndex]() {
+                ice->writeDatagram(componentIndex, components[componentIndex].dtls->readOutgoingDatagram());
             });
-            d->connect(d, &Dtls::connected, q, [this, componentIndex]() {
-                for (auto &c : channels) {
-                    if (c->component != componentIndex)
-                        continue;
-                    if (c->features & TransportFeature::DataOriented) {
-                        qDebug("TODO dtls connected. neet to negotiate data channel");
-                    } else {
-                        qDebug("dtls connected. non-data channel connected");
-                        c->onConnected();
-                    }
+            dtls->connect(dtls, &Dtls::connected, q, [this, componentIndex, dtls]() {
+                auto &c = components[componentIndex];
+                if (c.sctp) {
+                    // see rfc8864 (6.1) and rfc8832 (6)
+                    c.sctp->setIdSelector(dtls->localFingerprint().setup == Dtls::Active
+                                              ? SCTP::Association::IdSelector::Even
+                                              : SCTP::Association::IdSelector::Odd);
+                    c.sctp->onTransportConnected();
                 }
+                if (c.rawConnection)
+                    c.rawConnection->onConnected();
             });
-            d->connect(d, &Dtls::errorOccurred, q, [this, componentIndex](QAbstractSocket::SocketError error) {
+            dtls->connect(dtls, &Dtls::errorOccurred, q, [this, componentIndex](QAbstractSocket::SocketError error) {
                 qDebug("dtls failed for component %d", componentIndex);
-                for (auto &c : channels)
-                    if (c->component == componentIndex)
-                        c->onError(error);
+                auto &c = components[componentIndex];
+                if (c.sctp)
+                    c.sctp->onTransportError(error);
+                if (c.rawConnection)
+                    c.rawConnection->onError(error);
             });
-            d->connect(d, &Dtls::closed, q, [this, componentIndex]() {
+            dtls->connect(dtls, &Dtls::closed, q, [this, componentIndex]() {
                 qDebug("dtls closed for component %d", componentIndex);
-                for (auto &c : channels)
-                    if (c->component == componentIndex)
-                        c->onDisconnected(Connection::DtlsClosed);
+                auto &c = components[componentIndex];
+                if (c.rawConnection)
+                    c.rawConnection->onDisconnected(RawConnection::DtlsClosed);
+                if (c.sctp)
+                    c.sctp->onTransportClosed();
             });
         }
 
-        void ensureDtlsCreated()
-        {
-            if (!dtls.isEmpty())
-                return;
-            for (int componentIndex = 0; componentIndex < components; componentIndex++) {
-                dtls.append(new Dtls(q, q->pad()->session()->me().full(), q->pad()->session()->peer().full()));
-                makeDtlsPipeline(componentIndex);
-            }
-            pendingActions |= NewFingerprint;
-        }
-
         void startIce()
         {
             auto manager = dynamic_cast<Manager *>(q->_pad->manager())->d.data();
@@ -723,14 +695,9 @@ namespace XMPP { namespace Jingle { namespace ICE {
             //            iceA_status.channelsReady[1] = false;
 
             q->connect(ice, &XMPP::Ice176::started, q, [this]() {
-                QSet<int> lowOverhead;
-                for (auto &c : channels) {
-                    if (!(c->hints() & Connection::AvoidRelays)) {
-                        lowOverhead.insert(c->component);
-                    }
-                }
-                for (auto componentIndex : lowOverhead) {
-                    ice->flagComponentAsLowOverhead(componentIndex);
+                for (auto const &c : as_const(components)) {
+                    if (c.lowOverhead)
+                        ice->flagComponentAsLowOverhead(c.componentIndex);
                 }
                 iceStarted = true;
             });
@@ -753,20 +720,27 @@ namespace XMPP { namespace Jingle { namespace ICE {
                 pendingActions |= GatheringComplete;
                 emit q->updated();
             });
-            QObject::connect(
+            q->connect(
                 ice, &XMPP::Ice176::readyToSendMedia, q,
                 [this]() {
                     qDebug("ICE reported ready to send media!");
-                    if (dtls.empty()) // if empty
-                        for (auto &c : channels) {
-                            if (!(c->features & TransportFeature::DataOriented))
-                                c->onConnected();
-                        }
+                    if (!components[0].dtls) // if empty
+                        notifyRawConnected();
                     else if (remoteAcceptedFingerprint)
-                        for (auto &d : dtls)
-                            d->onRemoteAcceptedFingerprint();
+                        for (const auto &c : as_const(components))
+                            c.dtls->onRemoteAcceptedFingerprint();
                 },
                 Qt::QueuedConnection); // signal is not DOR-SS
+            q->connect(ice, &Ice176::readyRead, q, [this](int componentIndex) {
+                qDebug("ICE readyRead");
+                auto  buf       = ice->readDatagram(componentIndex);
+                auto &component = components[componentIndex];
+                if (component.dtls) {
+                    component.dtls->writeIncomingDatagram(buf);
+                } else if (component.rawConnection) {
+                    component.rawConnection->enqueueIncomingUDP(buf);
+                }
+            });
 
             ice->setProxy(manager->stunProxy);
             if (portReserver)
@@ -820,19 +794,179 @@ namespace XMPP { namespace Jingle { namespace ICE {
                                             manager->stunRelayTcpPass.toUtf8());
 
             // RTP+RTCP
-            ice->setComponentCount(components);
+            ice->setComponentCount(components.count());
 
             ice->setLocalFeatures(Ice176::Trickle);
 
+            setupRemoteICE(*remoteState);
+            remoteState->cleanupICE();
+
             auto mode = q->creator() == q->pad()->session()->role() ? XMPP::Ice176::Initiator : XMPP::Ice176::Responder;
             ice->start(mode);
         }
+
+        void setupRemoteICE(const Element &e)
+        {
+            Q_ASSERT(ice != nullptr);
+            if (!e.candidates.isEmpty()) {
+                ice->setRemoteCredentials(e.ufrag, e.pwd);
+                ice->addRemoteCandidates(e.candidates);
+            }
+            if (e.gatheringComplete) {
+                ice->setRemoteGatheringComplete();
+            }
+            if (e.remoteCandidates.size()) {
+                ice->setRemoteSelectedCandidadates(e.remoteCandidates);
+            }
+        }
+
+        void handleRemoteUpdate(const Element &e)
+        {
+            if (q->state() == State::Finished)
+                return;
+
+            if (ice) {
+                setupRemoteICE(e);
+            } else {
+                if (!e.candidates.isEmpty() || !e.ufrag.isEmpty()) {
+                    remoteState->ufrag = e.ufrag;
+                    remoteState->pwd   = e.pwd;
+                }
+
+                if (e.gatheringComplete) {
+                    remoteState->gatheringComplete = true;
+                }
+                remoteState->candidates += e.candidates;
+                if (e.remoteCandidates.size())
+                    remoteState->remoteCandidates = e.remoteCandidates;
+            }
+            if (e.fingerprint.isValid()) {
+                remoteState->fingerprint = e.fingerprint;
+                if (q->isLocal()) {
+                    // dtls already created for local transport on remote accept
+                    for (auto &c : components) {
+                        if (c.dtls)
+                            c.dtls->setRemoteFingerprint(e.fingerprint);
+                    }
+                }
+            }
+
+            if (e.sctpMap.isValid()) {
+                remoteState->sctpMap = e.sctpMap;
+                remoteState->sctpChannels += e.sctpChannels;
+            }
+
+            if (q->state() == State::Created && q->isRemote()) {
+                // initial incoming transport
+                q->setState(State::Pending);
+            }
+            if (q->state() == State::Pending && q->isLocal()) {
+                // initial acceptance by remote of the local transport
+                q->setState(State::Accepted);
+            }
+        }
+
+        bool isDataChannelSuppported() const { return Dtls::isSupported(); }
+
+        void notifyRawConnected()
+        {
+            auto const &acceptors = q->acceptors();
+            for (auto const &acceptor : acceptors) {
+                if (!(acceptor.features & TransportFeature::DataOriented))
+                    ensureRawConnection(acceptor.componentIndex); // TODO signals
+            }
+            for (auto &c : components) {
+                if (c.rawConnection)
+                    c.rawConnection->onConnected();
+            }
+        }
+
+        /**
+         * @brief ensureComponentExist adds an ICE component if missed and it's allowed atm for a channel
+         *        with given featuers.
+         * @param componentIndex  - desired component index (-1 for auto)
+         * @return actually allocated component index (e.g. when -1 passed).
+         *         returns -1 if something went wrong.
+         */
+        int ensureComponentExist(int componentIndex, bool lowOverhead = false)
+        {
+            if (componentIndex == -1) {
+                for (auto &c : components)
+                    if (!c.initialized) {
+                        componentIndex = c.componentIndex;
+                        break;
+                    }
+                if (componentIndex < 0)
+                    componentIndex = components.count();
+            }
+
+            if (componentIndex >= components.size()) {
+                if (ice) {
+                    qWarning("Adding channel after negotiation start is not yet supported");
+                    return -1;
+                }
+                for (int i = components.size(); i < componentIndex + 1; i++) {
+                    addComponent();
+                }
+            }
+            auto &c       = components[componentIndex];
+            c.initialized = true;
+            if (lowOverhead)
+                c.lowOverhead = true;
+            return componentIndex;
+        }
+
+        void ensureRawConnection(int componentIndex)
+        {
+            auto index = quint8(componentIndex);
+            if (components[index].rawConnection)
+                return;
+            components[index].rawConnection = RawConnection::Ptr::create(index);
+            if (q->isRemote() && !q->notifyIncomingConnection(components[index].rawConnection))
+                components[index].rawConnection.reset();
+            // Do we need anything else to do here? connect signals for example?
+        }
+
+        Connection::Ptr addDataChannel(TransportFeatures channelFeatures, const QString &label, int &componentIndex)
+        {
+            if (componentIndex == -1)
+                componentIndex = 0;
+
+            if (!Dtls::isSupported()) {
+                qWarning("An attempt to add a data channel while DTLS is not supported by current configuration");
+                return {};
+            }
+            componentIndex = ensureComponentExist(componentIndex, channelFeatures & TransportFeature::LowOverhead);
+            if (componentIndex < 0)
+                return {}; // failed to add component for the features
+
+            auto &c = components[componentIndex];
+            if (!c.sctp) {
+                // basically we can't accept remote transport with own stcp if it wasn't offered.
+                // but we can add new associations later with transport-info (undocumented in xep)
+                if (q->isRemote() && !q->wasAccepted() && !(remoteState && remoteState->sctpMap.isValid())) {
+                    qWarning("remote hasn't negotiated sctp association");
+                    return {};
+                }
+                c.sctp = new SCTP::Association(q);
+                pendingActions |= NewSctpAssociation;
+                if (q->wasAccepted() && q->state() != State::ApprovedToSend) // like we already sent our decision
+                    emit q->updated();
+                if (remoteState->sctpMap.isValid()) {
+                    // TODO if we already have associations params try to ruse them instead of making new one
+                }
+            }
+            Q_UNUSED(channelFeatures); // TODO
+            return c.sctp->newChannel(SCTP::Reliable, true, 0, 256, label);
+        }
     };
 
     Transport::Transport(const TransportManagerPad::Ptr &pad, Origin creator) :
         XMPP::Jingle::Transport(pad, creator), d(new Private)
     {
         d->q = this;
+        d->ensureComponentExist(0);
+        d->remoteState.reset(new Element {});
         connect(_pad->manager(), &TransportManager::abortAllRequested, this, [this]() {
             d->aborted = true;
             _state     = State::Finished;
@@ -846,27 +980,33 @@ namespace XMPP { namespace Jingle { namespace ICE {
     {
         qDebug("Prepare local offer");
         setState(State::ApprovedToSend);
+        auto const &a = acceptors();
+        for (auto const &acceptor : a) {
+            int ci = acceptor.componentIndex < 0 ? 0 : acceptor.componentIndex;
+            d->ensureComponentExist(ci, acceptor.features & TransportFeature::LowOverhead); // it won't fail
+        }
 
-        auto manager = dynamic_cast<Manager *>(_pad->manager())->d.data();
+        if (Dtls::isSupported()
+            && ((isLocal() && _pad->session()->checkPeerCaps(Dtls::FingerPrint::ns()))
+                || (isRemote() && d->remoteState->fingerprint.isValid()))) {
+            qDebug("initialize DTLS");
+
+            for (auto &c : d->components) {
+                d->setupDtls(c.componentIndex);
+            }
+
+            // TODO sctp
+        }
 
+        auto manager = dynamic_cast<Manager *>(_pad->manager())->d.data();
         Resolver::resolve(this,
                           { { manager->extHost, std::ref(d->extAddr) },
                             { manager->stunBindHost, std::ref(d->stunBindAddr) },
                             { manager->stunRelayUdpHost, std::ref(d->stunRelayUdpAddr) },
                             { manager->stunRelayTcpHost, std::ref(d->stunRelayTcpAddr) } },
                           [this]() {
-                              printf("resolver finished\n");
+                              qDebug("resolver finished");
                               d->startIce();
-                              if (Dtls::isSupported()) {
-                                  d->ensureDtlsCreated();
-                                  bool remote = isRemote();
-                                  for (auto d : as_const(d->dtls)) {
-                                      if (remote)
-                                          d->acceptIncoming();
-                                      else
-                                          d->initOutgoing();
-                                  }
-                              }
                           });
 
         emit updated();
@@ -877,76 +1017,53 @@ namespace XMPP { namespace Jingle { namespace ICE {
     {
         qDebug("Starting connecting");
         setState(State::Connecting);
-        d->flushRemoteCandidates();
         d->ice->startChecks();
     }
 
     bool Transport::update(const QDomElement &transportEl)
     {
         try {
-            if (d->handleIncomingCandidate(transportEl) || d->handleIncomingRemoteCandidate(transportEl)
-                || d->handleIncomingGatheringComplete(transportEl) || d->handleDtlsFingerprint(transportEl)) {
-                if (_state == State::Created && _creator != _pad->session()->role()) {
-                    // initial incoming transport
-                    setState(State::Pending);
-                }
-                if (_state == State::Pending && _creator == _pad->session()->role()) {
-                    // initial acceptance by remote of the local transport
-                    setState(State::Accepted);
-                }
-                return true;
-            }
+            Element e;
+            e.parse(transportEl);
+            QTimer::singleShot(0, this, [this, e]() { d->handleRemoteUpdate(e); });
+            return true;
         } catch (std::runtime_error &e) {
             qWarning("Transport update failed: %s", e.what());
             return false;
         }
-
-        return true;
     }
 
-    bool Transport::hasUpdates() const { return isValid() && d->pendingActions; }
+    bool Transport::hasUpdates() const
+    {
+        return isValid() && d->pendingActions && d->ice && _state >= State::ApprovedToSend
+            && !(isRemote() && _state == State::Pending);
+    }
 
     OutgoingTransportInfoUpdate Transport::takeOutgoingUpdate([[maybe_unused]] bool ensureTransportElement = false)
     {
-        if (!hasUpdates() || _state < State::ApprovedToSend || (isRemote() && _state == State::Pending)) {
+        if (!hasUpdates()) {
             return {};
         }
 
         qDebug("jingle-ice: taking outgoing update");
-        auto        doc = _pad.staticCast<Pad>()->session()->manager()->client()->doc();
-        QDomElement tel = doc->createElementNS(NS, "transport");
-        tel.setAttribute(QLatin1String("pwd"), d->ice->localPassword());
-        tel.setAttribute(QLatin1String("ufrag"), d->ice->localUfrag());
+        Element e;
+        e.ufrag = d->ice->localUfrag();
+        e.pwd   = d->ice->localPassword();
+
         bool hasFingerprint = d->pendingActions & Private::NewFingerprint;
-        if (hasFingerprint && !d->dtls.isEmpty()) {
-            tel.appendChild(d->dtls[0]->localFingerprint().toXml(doc));
-            d->pendingActions &= ~Private::NewFingerprint;
+        if (hasFingerprint && d->components[0].dtls) {
+            e.fingerprint = d->components[0].dtls->localFingerprint();
         }
+        e.candidates        = d->pendingLocalCandidates;
+        e.gatheringComplete = d->pendingActions & Private::GatheringComplete;
+        if (d->pendingActions & Private::RemoteCandidate)
+            e.remoteCandidates = d->ice->selectedCandidates();
+        // TODO sctp
 
-        for (auto const &cand : as_const(d->pendingLocalCandidates)) {
-            tel.appendChild(candidateToElement(doc, cand));
-        }
         d->pendingLocalCandidates.clear();
-        d->pendingActions &= ~Private::NewCandidate;
-
-        if (d->pendingActions & Private::GatheringComplete) {
-            tel.appendChild(doc->createElement(QLatin1String("gathering-complete")));
-            d->pendingActions &= ~Private::GatheringComplete;
-        }
-
-        if (d->pendingActions & Private::RemoteCandidate) {
-            auto const &candidates = d->ice->selectedCandidates();
-            for (auto const &c : candidates) {
-                auto rc = doc->createElement(QLatin1String("remote-candidate"));
-                rc.setAttribute(QLatin1String("component"), c.componentId);
-                rc.setAttribute(QLatin1String("ip"), c.ip.toString());
-                rc.setAttribute(QLatin1String("port"), c.port);
-                tel.appendChild(rc);
-            }
-            d->pendingActions &= ~Private::RemoteCandidate;
-        }
+        d->pendingActions = 0;
 
-        return OutgoingTransportInfoUpdate { tel,
+        return OutgoingTransportInfoUpdate { e.toXml(_pad.staticCast<Pad>()->session()->manager()->client()->doc()),
                                              [this, trptr = QPointer<Transport>(d->q), hasFingerprint](bool success) {
                                                  if (!success || !trptr)
                                                      return;
@@ -957,8 +1074,8 @@ namespace XMPP { namespace Jingle { namespace ICE {
                                                      d->remoteAcceptedFingerprint = true;
                                                  }
                                                  if (hasFingerprint && d->ice && d->ice->canSendMedia())
-                                                     for (auto &d : d->dtls)
-                                                         d->onRemoteAcceptedFingerprint();
+                                                     for (auto &c : d->components)
+                                                         c.dtls->onRemoteAcceptedFingerprint();
                                              } };
     }
 
@@ -971,45 +1088,40 @@ namespace XMPP { namespace Jingle { namespace ICE {
         return features & TransportFeature::DataOriented ? 65536 : 1;
     };
 
-    int Transport::addComponent()
+    void Transport::setComponentsCount(int count)
     {
         if (_state >= State::ApprovedToSend) {
             qWarning("adding component after ICE started is not supported");
-            return 0;
+            return;
+        }
+        for (int i = d->components.size(); i < count; i++) {
+            d->addComponent();
         }
-        d->components++;
-        return d->components;
     }
 
-    // adding ice components (for rtp, rtcp, datachannel etc)
-    // but those are rather abstract channels and it's up to ice manager in TransportPad to decide
-    Connection::Ptr Transport::addChannel(TransportFeatures features, int component) const
+    // adding ice channels/components (for rtp, rtcp, datachannel etc)
+    Connection::Ptr Transport::addChannel(TransportFeatures features, const QString &id, int componentIndex)
     {
-        // features define type of channel. reliable channels infer sctp
-        // if time-oriented - likely rtp
-        // if data-oriented - likely sctp
-
-        if (!((isLocal() && _state == State::Created) || (isRemote() && _state == State::Pending))) {
-            qWarning("Adding channel after negotiation start is not yet supported");
-            return Connection::Ptr();
-        }
-
-        if (component >= d->components) {
-            d->components = component + 1;
-        }
-        // find a gap in the list of channel indexes or just take last one
-        auto conn
-            = QSharedPointer<Connection>::create(features & TransportFeature::DataOriented ? 0 : component, features);
-        d->channels.append(conn);
-
-        return conn.staticCast<XMPP::Jingle::Connection>();
+        if (features & TransportFeature::DataOriented)
+            return d->addDataChannel(features, id, componentIndex);
+
+        componentIndex = d->ensureComponentExist(componentIndex, features & TransportFeature::LowOverhead);
+        if (componentIndex < 0)
+            return {}; // failed to add component for the features
+        d->ensureRawConnection(componentIndex);
+        auto &channel = d->components[componentIndex].rawConnection;
+        channel->setId(id);
+        return channel;
     }
 
     QList<XMPP::Jingle::Connection::Ptr> Transport::channels() const
     {
         QList<XMPP::Jingle::Connection::Ptr> ret;
-        for (auto &c : d->channels) {
-            ret.append(c.staticCast<XMPP::Jingle::Connection>());
+        for (auto &c : d->components) {
+            if (c.rawConnection)
+                ret.append(c.rawConnection.staticCast<XMPP::Jingle::Connection>());
+            if (c.sctp)
+                ret += c.sctp->channels();
         }
         return ret;
     }
@@ -1017,10 +1129,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
     //----------------------------------------------------------------
     // Manager
     //----------------------------------------------------------------
-    Manager::Manager(QObject *parent) : TransportManager(parent), d(new Private)
-    {
-        d->sctpInstance = SctpKeeper::use();
-    }
+    Manager::Manager(QObject *parent) : TransportManager(parent), d(new Private) { }
 
     Manager::~Manager()
     {
@@ -1032,7 +1141,8 @@ namespace XMPP { namespace Jingle { namespace ICE {
     TransportFeatures Manager::features() const
     {
         return TransportFeature::HighProbableConnect | TransportFeature::Reliable | TransportFeature::Unreliable
-            | TransportFeature::MessageOriented | TransportFeature::DataOriented | TransportFeature::LiveOriented;
+            | TransportFeature::MessageOriented | TransportFeature::LiveOriented
+            | (Dtls::isSupported() ? TransportFeature::DataOriented : TransportFeature(0));
     }
 
     void Manager::setJingleManager(XMPP::Jingle::Manager *jm) { d->jingleManager = jm; }
diff --git a/src/xmpp/xmpp-im/jingle-ice.h b/src/xmpp/xmpp-im/jingle-ice.h
index 1f8fe1b0..18a855b6 100644
--- a/src/xmpp/xmpp-im/jingle-ice.h
+++ b/src/xmpp/xmpp-im/jingle-ice.h
@@ -33,95 +33,7 @@ namespace Jingle { namespace ICE {
     extern const QString NS;
 
     class Transport;
-#if 0
-    class Candidate {
-    public:
-        enum Type {
-            None, // non standard, just a default
-            Proxy,
-            Tunnel,
-            Assisted,
-            Direct
-        };
-
-        enum { ProxyPreference = 10, TunnelPreference = 110, AssistedPreference = 120, DirectPreference = 126 };
-
-        /**
-         * Local candidates states:
-         *   Probing      - potential candidate but no ip:port yet. upnp for example
-         *   New          - candidate is ready to be sent to remote
-         *   Unacked      - candidate is sent to remote but no iq ack yet
-         *   Pending      - canidate sent to remote. we have iq ack but no "used" or "error"
-         *   Accepted     - we got "candidate-used" for this candidate
-         *   Activating   - only for proxy: we activate the proxy
-         *   Active       - use this candidate for actual data transfer
-         *   Discarded    - we got "candidate-error" so all pending were marked Discarded
-         *
-         * Remote candidates states:
-         *   New          - the candidate waits its turn to start connection probing
-         *   Probing      - connection probing
-         *   Pending      - connection was successful, but we didn't send candidate-used to remote
-         *   Unacked      - connection was successful and we sent candidate-used to remote but no iq ack yet
-         *   Accepted     - we sent candidate-used and got iq ack
-         *   Activating   - [not used]
-         *   Active       - use this candidate for actual data transfer
-         *   Discarded    - failed to connect to all remote candidates
-         */
-        enum State {
-            New,
-            Probing,
-            Pending,
-            Unacked,
-            Accepted,
-            Activating,
-            Active,
-            Discarded,
-        };
-
-        Candidate();
-        Candidate(Transport *transport, const QDomElement &el);
-        Candidate(const Candidate &other);
-        Candidate(Transport *transport, const Jid &proxy, const QString &cid, quint16 localPreference = 0);
-        Candidate(Transport *transport, const TcpPortServer::Ptr &server, const QString &cid,
-                  quint16 localPreference = 0);
-        ~Candidate();
-        Candidate &        operator=(const Candidate &other) = default;
-        inline bool        isValid() const { return d != nullptr; }
-        inline             operator bool() const { return isValid(); }
-        Type               type() const;
-        static const char *typeText(Type t);
-        QString            cid() const;
-        Jid                jid() const;
-        QString            host() const;
-        void               setHost(const QString &host);
-        quint16            port() const;
-        void               setPort(quint16 port);
-        quint16            localPort() const;
-        QHostAddress       localAddress() const;
-        State              state() const;
-        void               setState(State s);
-        static const char *stateText(State s);
-        quint32            priority() const;
-
-        QDomElement toXml(QDomDocument *doc) const;
-        QString     toString() const;
-
-        void connectToHost(const QString &key, State successState, QObject *callbackContext,
-                           std::function<void(bool)> callback, bool isUdp = false);
-        // bool               incomingConnection(SocksClient *sc);
-        // SocksClient *      takeSocksClient();
-        // void               deleteSocksClient();
-        TcpPortServer::Ptr server() const;
-
-        bool        operator==(const Candidate &other) const;
-        inline bool operator!=(const Candidate &other) const { return !(*this == other); }
 
-    private:
-        class Private;
-        friend class Transport;
-        QExplicitlySharedDataPointer<Private> d;
-    };
-#endif
     class Manager;
     class Transport : public XMPP::Jingle::Transport {
         Q_OBJECT
@@ -140,8 +52,8 @@ namespace Jingle { namespace ICE {
         TransportFeatures           features() const override;
         int                         maxSupportedChannelsPerComponent(TransportFeatures features) const override;
 
-        int                    addComponent() override;
-        Connection::Ptr        addChannel(TransportFeatures features, int component = 0) const override;
+        void                   setComponentsCount(int count) override;
+        Connection::Ptr        addChannel(TransportFeatures features, const QString &id, int component = -1) override;
         QList<Connection::Ptr> channels() const override;
 
     private:
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 310fa4f4..d0c9ffcb 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -71,6 +71,12 @@ namespace XMPP { namespace Jingle { namespace S5B {
             emit connected();
         }
 
+        TransportFeatures features() const
+        {
+            return TransportFeature::Fast | TransportFeature::DataOriented | TransportFeature::StreamOriented
+                | TransportFeature::Ordered | TransportFeature::Reliable;
+        }
+
         bool hasPendingDatagrams() const { return datagrams.size() > 0; }
 
         NetworkDatagram receiveDatagram(qint64 maxSize = -1)
@@ -1193,7 +1199,6 @@ namespace XMPP { namespace Jingle { namespace S5B {
                 localCandidates.clear();
                 remoteCandidates.clear();
                 q->setState(State::Active);
-                emit q->connected();
             });
         }
 
@@ -1359,7 +1364,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
         d->probingTimer.setSingleShot(true);
         d->negotiationFinishTimer.setSingleShot(true);
         d->negotiationFinishTimer.setInterval(5000); // TODO select the value smart way
-        connect(&d->probingTimer, &QTimer::timeout, [this]() { d->tryConnectToRemoteCandidate(); });
+        connect(&d->probingTimer, &QTimer::timeout, this, [this]() { d->tryConnectToRemoteCandidate(); });
         connect(&d->negotiationFinishTimer, &QTimer::timeout, this, [this]() { d->handleNegotiationTimeout(); });
         connect(_pad->manager(), &TransportManager::abortAllRequested, this, [this]() {
             d->aborted = true;
@@ -1406,6 +1411,14 @@ namespace XMPP { namespace Jingle { namespace S5B {
 
         d->discoS5BProxy();
 
+        if (isRemote() && !notifyIncomingConnection(d->connection)) {
+            // our the only connection wasn't accepted
+            _state      = State::Finished;
+            _lastReason = { Reason::IncompatibleParameters,
+                            QLatin1String("Application didn't accept the only incoming connection") };
+            emit failed();
+            return;
+        }
         emit updated();
     }
 
@@ -1430,7 +1443,8 @@ namespace XMPP { namespace Jingle { namespace S5B {
                 d->blockSize = bsn;
             }
         }
-        if (_state == State::Created && isRemote() && d->sid.isEmpty()) {
+        bool isNewIncoming = _state == State::Created && isRemote();
+        if (isNewIncoming && d->sid.isEmpty()) {
             d->sid = transportEl.attribute(QStringLiteral("sid"));
         }
         auto dstaddr = transportEl.attribute(QStringLiteral("dstaddr"));
@@ -1442,8 +1456,8 @@ namespace XMPP { namespace Jingle { namespace S5B {
             if (d->handleIncomingCandidate(transportEl) || d->handleIncomingCandidateUsed(transportEl)
                 || d->handleIncomingCandidateError(transportEl) || d->handleIncomingActivated(transportEl)
                 || d->handleIncomingProxyError(transportEl)) {
-                if (_state == State::Created && _creator != _pad->session()->role()) {
-                    // initial incoming transport
+                if (isNewIncoming) {
+                    d->connection->setRemote(true);
                     setState(State::Pending);
                 }
                 if (_state == State::Pending && _creator == _pad->session()->role()) {
@@ -1657,10 +1671,11 @@ namespace XMPP { namespace Jingle { namespace S5B {
 
     int Transport::maxSupportedChannelsPerComponent(TransportFeatures) const { return 1; }
 
-    XMPP::Jingle::Connection::Ptr Transport::addChannel(TransportFeatures features, int) const
+    XMPP::Jingle::Connection::Ptr Transport::addChannel(TransportFeatures features, const QString &id, int)
     {
         // TODO consider features and create connections here.
         Q_UNUSED(features); // no way create something depending on features
+        d->connection->setId(id);
         return d->connection;
     }
 
diff --git a/src/xmpp/xmpp-im/jingle-s5b.h b/src/xmpp/xmpp-im/jingle-s5b.h
index caad2921..93d45401 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.h
+++ b/src/xmpp/xmpp-im/jingle-s5b.h
@@ -145,7 +145,7 @@ namespace Jingle { namespace S5B {
         QString directAddr() const;
 
         int                    maxSupportedChannelsPerComponent(TransportFeatures features) const override;
-        Connection::Ptr        addChannel(TransportFeatures features, int component = 0) const override;
+        Connection::Ptr        addChannel(TransportFeatures features, const QString &id, int component = 0) override;
         QList<Connection::Ptr> channels() const override;
 
     private:
diff --git a/src/xmpp/xmpp-im/jingle-sctp-association_p.cpp b/src/xmpp/xmpp-im/jingle-sctp-association_p.cpp
new file mode 100644
index 00000000..829156a6
--- /dev/null
+++ b/src/xmpp/xmpp-im/jingle-sctp-association_p.cpp
@@ -0,0 +1,177 @@
+/*
+ * jignle-sctp-association_p.h - Private parto of Jingle SCTP Association
+ * Copyright (C) 2021  Sergey Ilinykh
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "jingle-sctp-association_p.h"
+#include "jingle-sctp.h"
+#include "jingle-webrtc-datachannel_p.h"
+
+namespace XMPP { namespace Jingle { namespace SCTP {
+
+    static constexpr int MAX_STREAMS          = 65535; // let's change when we need something but webrtc dc.
+    static constexpr int MAX_MESSAGE_SIZE     = 262144;
+    static constexpr int MAX_SEND_BUFFER_SIZE = 262144;
+
+    std::weak_ptr<Keeper> Keeper::instance;
+
+    Keeper::Keeper() { DepUsrSCTP::ClassInit(); }
+
+    Keeper::~Keeper() { DepUsrSCTP::ClassDestroy(); }
+
+    Keeper::Ptr Keeper::use()
+    {
+        auto i = instance.lock();
+        if (!i) {
+            i        = std::make_shared<Keeper>();
+            instance = i;
+        }
+        return i;
+    }
+
+    AssociationPrivate::AssociationPrivate(Association *q) :
+        q(q), keeper(Keeper::use()), assoc(this, MAX_STREAMS, MAX_STREAMS, MAX_MESSAGE_SIZE, MAX_SEND_BUFFER_SIZE, true)
+    {
+    }
+
+    void AssociationPrivate::OnSctpAssociationConnecting(RTC::SctpAssociation *)
+    {
+        qDebug("jignle-sctp: on connecting");
+    }
+
+    void AssociationPrivate::OnSctpAssociationConnected(RTC::SctpAssociation *) { qDebug("jignle-sctp: on connected"); }
+
+    void AssociationPrivate::OnSctpAssociationFailed(RTC::SctpAssociation *) { qDebug("jignle-sctp: on failed"); }
+
+    void AssociationPrivate::OnSctpAssociationClosed(RTC::SctpAssociation *) { qDebug("jignle-sctp: on closed"); }
+
+    void AssociationPrivate::OnSctpAssociationSendData(RTC::SctpAssociation *, const uint8_t *data, size_t len)
+    {
+        qDebug("jignle-sctp: on outgoing data");
+        QByteArray bytes((char *)data, len);
+        QMetaObject::invokeMethod(this, "onOutgoingData", Q_ARG(QByteArray, bytes));
+    }
+
+    void AssociationPrivate::OnSctpAssociationMessageReceived(RTC::SctpAssociation *, uint16_t streamId, uint32_t ppid,
+                                                              const uint8_t *msg, size_t len)
+    {
+        qDebug("jignle-sctp: on incoming data");
+        QByteArray bytes((char *)msg, len);
+        QMetaObject::invokeMethod(this, "onIncomingData", Q_ARG(QByteArray, bytes), Q_ARG(quint16, streamId),
+                                  Q_ARG(quint32, ppid));
+    }
+
+    void AssociationPrivate::OnSctpAssociationBufferedAmount(RTC::SctpAssociation *sctpAssociation, uint32_t len)
+    {
+        qDebug("jignle-sctp: on buffered data: %d", len);
+        Q_UNUSED(sctpAssociation);
+        Q_UNUSED(len);
+        // TODO control buffering to reduce memory consumption
+    }
+
+    void AssociationPrivate::OnSctpStreamClosed(RTC::SctpAssociation *sctpAssociation, uint16_t streamId)
+    {
+        qDebug("jignle-sctp: on stream closed");
+        Q_UNUSED(sctpAssociation);
+        QMetaObject::invokeMethod(this, "onStreamClosed", Q_ARG(quint16, streamId));
+    }
+
+    void AssociationPrivate::handleIncomingDataChannelOpen(const QByteArray &data, quint16 streamId)
+    {
+        auto channel = WebRTCDataChannel::fromChannelOpen(this, data);
+
+        channel->setStreamId(streamId);
+        pendingChannels.append(channel);
+        channels.insert(streamId, channel);
+
+        // acknowledge channel open instantly
+        QByteArray reply(4, 0);
+        reply[0] = DCEP_DATA_CHANNEL_ACK;
+        write(reply, streamId, PPID_DCEP);
+
+        emit q->newChannel();
+    }
+
+    bool AssociationPrivate::write(const QByteArray &data, quint16 streamId, quint32 ppid)
+    {
+        qDebug("jignle-sctp: write");
+        RTC::DataConsumer consumer;
+        consumer.sctpParameters.streamId = streamId;
+        consumer.sctpParameters.ordered  = true;
+        bool success;
+        assoc.SendSctpMessage(
+            &consumer, ppid, reinterpret_cast<const uint8_t *>(data.data()), data.size(),
+            new std::function<void(bool)>([this, &success](bool cb_success) { success = cb_success; }));
+        return success;
+    }
+
+    void AssociationPrivate::close(quint16 streamId)
+    {
+        qDebug("jignle-sctp: close");
+        RTC::DataProducer producer;
+        producer.sctpParameters.streamId = streamId;
+        assoc.DataProducerClosed(&producer);
+    }
+
+    quint16 AssociationPrivate::takeNextStreamId()
+    {
+        if (!channelsLeft)
+            return 0xffff; // impossible stream
+        auto id = nextStreamId;
+        while (channels.contains(id)) {
+            id += 2;
+            if (id == nextStreamId)
+                return 0xffff;
+        }
+        nextStreamId = id + 2;
+        return id;
+    }
+
+    void AssociationPrivate::onOutgoingData(const QByteArray &data)
+    {
+        outgoingQueue.enqueue(data);
+        emit q->readyReadOutgoing();
+    }
+
+    void AssociationPrivate::onIncomingData(const QByteArray &data, quint16 streamId, quint32 ppid)
+    {
+        auto it = channels.find(streamId);
+        if (it == channels.end()) {
+            if (ppid == PPID_DCEP) {
+                if (data.isEmpty()) {
+                    qWarning("jingle-sctp: dropping invalid dcep");
+                } else if (data[0] == DCEP_DATA_CHANNEL_OPEN) {
+                    handleIncomingDataChannelOpen(data, streamId);
+                }
+            } else
+                qWarning("jingle-sctp: data from unknown datachannel. ignoring");
+            return;
+        }
+        it->staticCast<WebRTCDataChannel>()->onIncomingData(data, ppid);
+    }
+
+    void AssociationPrivate::onStreamClosed(quint16 streamId)
+    {
+        auto it = channels.find(streamId);
+        if (it == channels.end()) {
+            qDebug("jingle-sctp: closing not existing stream %d", streamId);
+            return;
+        }
+        it->staticCast<WebRTCDataChannel>()->onDisconnected(WebRTCDataChannel::ChannelClosed);
+    }
+
+}}}
diff --git a/src/xmpp/xmpp-im/jingle-sctp-association_p.h b/src/xmpp/xmpp-im/jingle-sctp-association_p.h
new file mode 100644
index 00000000..91b6acd0
--- /dev/null
+++ b/src/xmpp/xmpp-im/jingle-sctp-association_p.h
@@ -0,0 +1,82 @@
+/*
+ * jignle-sctp-association_p.h - Private parto of Jingle SCTP Association
+ * Copyright (C) 2021  Sergey Ilinykh
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "jingle-connection.h"
+
+#include "irisnet/noncore/sctp/DepUsrSCTP.hpp"
+#include "irisnet/noncore/sctp/SctpAssociation.hpp"
+
+#include <QHash>
+#include <QQueue>
+
+#include <mutex>
+
+namespace XMPP { namespace Jingle { namespace SCTP {
+
+    struct Keeper {
+        using Ptr = std::shared_ptr<Keeper>;
+
+        static std::weak_ptr<Keeper> instance;
+        Keeper();
+        ~Keeper();
+        static Ptr use();
+    };
+
+    class Association;
+    class AssociationPrivate : public QObject, RTC::SctpAssociation::Listener {
+        Q_OBJECT
+    public:
+        Association *                   q;
+        Keeper::Ptr                     keeper;
+        RTC::SctpAssociation            assoc;
+        QQueue<QByteArray>              outgoingQueue;
+        std::mutex                      mutex;
+        QHash<quint16, Connection::Ptr> channels; // streamId -> WebRTCDataChannel
+        QQueue<Connection::Ptr>         pendingChannels;
+        QQueue<Connection::Ptr>         pendingLocalChannels;
+
+        bool    transportConnected = false;
+        bool    useOddStreamId     = false;
+        quint16 nextStreamId       = 0;
+        quint16 channelsLeft       = 32768;
+
+        AssociationPrivate(Association *q);
+
+        void OnSctpAssociationConnecting(RTC::SctpAssociation *) override;
+        void OnSctpAssociationConnected(RTC::SctpAssociation *) override;
+        void OnSctpAssociationFailed(RTC::SctpAssociation *) override;
+        void OnSctpAssociationClosed(RTC::SctpAssociation *) override;
+        void OnSctpAssociationSendData(RTC::SctpAssociation *, const uint8_t *data, size_t len) override;
+        void OnSctpAssociationMessageReceived(RTC::SctpAssociation *, uint16_t streamId, uint32_t ppid,
+                                              const uint8_t *msg, size_t len) override;
+        void OnSctpAssociationBufferedAmount(RTC::SctpAssociation *sctpAssociation, uint32_t len) override;
+        void OnSctpStreamClosed(RTC::SctpAssociation *sctpAssociation, uint16_t streamId) override;
+
+        void    handleIncomingDataChannelOpen(const QByteArray &data, quint16 streamId);
+        bool    write(const QByteArray &data, quint16 streamId, quint32 ppid);
+        void    close(quint16 streamId);
+        quint16 takeNextStreamId();
+
+    private Q_SLOTS:
+        void onOutgoingData(const QByteArray &data);
+        void onIncomingData(const QByteArray &data, quint16 streamId, quint32 ppid);
+        void onStreamClosed(quint16 streamId);
+    };
+
+}}}
diff --git a/src/xmpp/xmpp-im/jingle-sctp.cpp b/src/xmpp/xmpp-im/jingle-sctp.cpp
new file mode 100644
index 00000000..086693d4
--- /dev/null
+++ b/src/xmpp/xmpp-im/jingle-sctp.cpp
@@ -0,0 +1,202 @@
+/*
+ * jignle-sctp.cpp - Jingle SCTP
+ * Copyright (C) 2021  Sergey Ilinykh
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "jingle-sctp.h"
+
+#include "jingle-sctp-association_p.h"
+#include "jingle-transport.h"
+#include "jingle-webrtc-datachannel_p.h"
+#include "xmpp_xmlcommon.h"
+
+#include <QQueue>
+#include <QtEndian>
+
+#include <mutex>
+
+namespace XMPP { namespace Jingle { namespace SCTP {
+
+    QDomElement MapElement::toXml(QDomDocument *doc) const
+    {
+        QDomElement ret;
+        if (protocol == Protocol::None)
+            return ret;
+        ret = doc->createElementNS(ns(), QLatin1String("sctpmap"));
+        ret.setAttribute(QLatin1String("protocol"), QLatin1String("webrtc-datachannel"));
+        ret.setAttribute(QLatin1String("number"), port);
+        return ret;
+    }
+
+    bool MapElement::parse(const QDomElement &el)
+    {
+        if (el.namespaceURI() != ns()) {
+            return false;
+        }
+        auto p   = el.attribute(QLatin1String("protocol"));
+        protocol = (p == QLatin1String("webrtc-datachannel")) ? Protocol::WebRTCDataChannel : Protocol::None;
+        port     = el.attribute(QLatin1String("number")).toInt();
+        return protocol != Protocol::None && port > 0;
+    }
+
+    QDomElement ChannelElement::toXml(QDomDocument *doc) const
+    {
+        auto el = doc->createElementNS(ns(), QLatin1String("channel"));
+        el.setAttribute(QLatin1String("id"), id);
+        el.setAttribute(QLatin1String("maxPacketLifeTime"), maxPacketLifeTime);
+        el.setAttribute(QLatin1String("maxRetransmits"), maxRetransmits);
+        el.setAttribute(QLatin1String("negotiated"), negotiated);
+        el.setAttribute(QLatin1String("ordered"), ordered);
+        el.setAttribute(QLatin1String("protocol"), protocol);
+        return el;
+    }
+
+    bool ChannelElement::parse(const QDomElement &el)
+    {
+        if (el.namespaceURI() != webrtcDcNs()) {
+            return false;
+        }
+        bool ok;
+        id = el.attribute(QLatin1String("id")).toUShort(&ok); // REVIEW XEP says id is optional. but is it?
+        if (!ok)
+            return false;
+        QString mplt = el.attribute(QLatin1String("maxPacketLifeTime"));
+        QString mrtx = el.attribute(QLatin1String("maxRetransmits"));
+        if (!mplt.isEmpty()) {
+            maxPacketLifeTime = mplt.toUShort(&ok);
+            if (!ok)
+                return false;
+        }
+        if (!mrtx.isEmpty()) {
+            maxRetransmits = mrtx.toUShort(&ok);
+            if (!ok)
+                return false;
+        }
+        if (maxPacketLifeTime > 0 && maxRetransmits > 0) {
+            qWarning("found both maxPacketLifeTime and maxRetransmits. expected just one of them");
+            return false;
+        }
+        XMLHelper::readBoolAttribute(el, QLatin1String("negotiated"), &negotiated);
+        XMLHelper::readBoolAttribute(el, QLatin1String("ordered"), &ordered);
+        protocol = el.attribute(QLatin1String("protocol"));
+        return true;
+    }
+
+    QString ns() { return QStringLiteral("urn:xmpp:jingle:transports:dtls-sctp:1"); }
+    QString webrtcDcNs() { return QStringLiteral("urn:xmpp:jingle:transports:webrtc-datachannel:0"); }
+
+    Association::Association(QObject *parent) : QObject(parent), d(new AssociationPrivate(this)) { }
+
+    void Association::setIdSelector(Association::IdSelector selector)
+    {
+        switch (selector) {
+        case IdSelector::Even:
+            d->useOddStreamId = false;
+            if (d->nextStreamId & 1)
+                d->nextStreamId++;
+            break;
+        case IdSelector::Odd:
+            d->useOddStreamId = true;
+            if (!(d->nextStreamId & 1))
+                d->nextStreamId++;
+            break;
+        }
+    }
+
+    QByteArray Association::readOutgoing()
+    {
+        qDebug("jignle-sctp: read outgoing");
+        std::lock_guard<std::mutex> lock(d->mutex);
+        return d->outgoingQueue.isEmpty() ? QByteArray() : d->outgoingQueue.dequeue();
+    }
+
+    void Association::writeIncoming(const QByteArray &data)
+    {
+        qDebug("jignle-sctp: write incoming");
+        d->assoc.ProcessSctpData(reinterpret_cast<const uint8_t *>(data.data()), data.size());
+    }
+
+    int Association::pendingOutgoingDatagrams() const { return d->outgoingQueue.size(); }
+
+    int Association::pendingChannels() const { return d->pendingChannels.size(); }
+
+    Connection::Ptr Association::nextChannel()
+    {
+        if (d->pendingChannels.empty())
+            return {};
+        return d->pendingChannels.dequeue();
+    }
+
+    Connection::Ptr Association::newChannel(Reliability reliable, bool ordered, quint32 reliability, quint16 priority,
+                                            const QString &label, const QString &protocol)
+    {
+        int channelType = int(reliable);
+        if (ordered)
+            channelType |= 0x80;
+        auto channel
+            = QSharedPointer<WebRTCDataChannel>::create(d.data(), channelType, priority, reliability, label, protocol);
+        if (d->transportConnected) {
+            auto id = d->takeNextStreamId();
+            if (id == 0xffff)
+                return {};
+            channel->setStreamId(id);
+            d->channels.insert(id, channel);
+            d->channelsLeft--;
+            qWarning("TODO negotiate datachannel itself");
+        } else {
+            d->pendingLocalChannels.enqueue(channel);
+        }
+
+        return channel;
+    }
+
+    QList<Connection::Ptr> Association::channels() const { return d->channels.values() + d->pendingLocalChannels; }
+
+    void Association::onTransportConnected()
+    {
+        d->transportConnected = true;
+        while (d->pendingLocalChannels.size()) {
+            auto channel = d->pendingLocalChannels.dequeue().staticCast<WebRTCDataChannel>();
+            auto id      = d->takeNextStreamId();
+            if (id == 0xffff) { // impossible channel
+                channel->onError(QAbstractSocket::SocketResourceError);
+            } else {
+                channel->setStreamId(id);
+                d->channels.insert(id, channel);
+                d->channelsLeft--;
+            }
+        }
+        d->assoc.TransportConnected();
+    }
+
+    void Association::onTransportError(QAbstractSocket::SocketError error)
+    {
+        d->transportConnected = false;
+        for (auto &c : d->channels) {
+            c.staticCast<WebRTCDataChannel>()->onError(error);
+        }
+    }
+
+    void Association::onTransportClosed()
+    {
+        d->transportConnected = false;
+        for (auto &c : d->channels) {
+            c.staticCast<WebRTCDataChannel>()->onDisconnected(WebRTCDataChannel::TransportClosed);
+        }
+    }
+
+}}}
diff --git a/src/xmpp/xmpp-im/jingle-sctp.h b/src/xmpp/xmpp-im/jingle-sctp.h
new file mode 100644
index 00000000..e16d0c31
--- /dev/null
+++ b/src/xmpp/xmpp-im/jingle-sctp.h
@@ -0,0 +1,102 @@
+/*
+ * jignle-sctp.cpp - Jingle SCTP
+ * Copyright (C) 2021  Sergey Ilinykh
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef JINGLE_SCTP_H
+#define JINGLE_SCTP_H
+
+#include "jingle-connection.h"
+
+#include <QDomElement>
+#include <QObject>
+#include <QScopedPointer>
+
+#include <memory>
+
+class QDomDocument;
+
+namespace XMPP { namespace Jingle { namespace SCTP {
+    enum class Protocol { None, WebRTCDataChannel };
+    enum Reliability { Reliable, PartialRexmit, PartialTimers };
+
+    struct MapElement {
+        Protocol protocol = Protocol::None;
+        uint16_t port     = 0;
+        uint16_t streams  = 65535;
+
+        MapElement() = default;
+        inline MapElement(Protocol protocol, uint16_t port, uint16_t streams) :
+            protocol(protocol), port(port), streams(streams)
+        {
+        }
+        inline MapElement(const QDomElement &el) { parse(el); }
+        bool        isValid() const { return protocol != Protocol::None; }
+        QDomElement toXml(QDomDocument *doc) const;
+        bool        parse(const QDomElement &el);
+    };
+
+    struct ChannelElement {
+        uint16_t id                = 0;
+        uint16_t maxPacketLifeTime = 0;
+        uint16_t maxRetransmits    = 0;
+        bool     negotiated        = false;
+        bool     ordered           = true;
+        QString  protocol;
+
+        QDomElement toXml(QDomDocument *doc) const;
+        bool        parse(const QDomElement &el);
+    };
+
+    QString ns();
+    QString webrtcDcNs();
+
+    class AssociationPrivate;
+    class Association : public QObject {
+        Q_OBJECT;
+
+    public:
+        enum class IdSelector { Odd, Even };
+
+        Association(QObject *parent);
+
+        void                   setIdSelector(IdSelector selector);
+        QByteArray             readOutgoing();
+        void                   writeIncoming(const QByteArray &data);
+        int                    pendingOutgoingDatagrams() const;
+        int                    pendingChannels() const;
+        Connection::Ptr        nextChannel();
+        Connection::Ptr        newChannel(Reliability reliable = Reliable, bool ordered = true, quint32 reliability = 0,
+                                          quint16 priority = 256, const QString &label = QString(),
+                                          const QString &protocol = QString());
+        QList<Connection::Ptr> channels() const;
+        // call this when dtls connected
+        void onTransportConnected();
+        void onTransportError(QAbstractSocket::SocketError error);
+        void onTransportClosed();
+
+    signals:
+        void readyReadOutgoing();
+        void newChannel(bool);
+
+    private:
+        QScopedPointer<AssociationPrivate> d;
+    };
+
+}}}
+
+#endif
diff --git a/src/xmpp/xmpp-im/jingle-session.cpp b/src/xmpp/xmpp-im/jingle-session.cpp
index d46c028c..c8f4db02 100644
--- a/src/xmpp/xmpp-im/jingle-session.cpp
+++ b/src/xmpp/xmpp-im/jingle-session.cpp
@@ -410,8 +410,11 @@ namespace XMPP { namespace Jingle {
             state = State::Unacked;
             initialIncomingUnacceptedContent.clear();
             sendJingle(actionToSend, contents, [this, acceptApps, finalState](JT *jt) {
-                if (!jt->success())
+                if (!jt->success()) {
+                    qDebug("Seesion accept/initiate returned iq error");
+                    emit q->terminated();
                     return;
+                }
                 state = finalState;
                 for (const auto &h : acceptApps) {
                     auto app      = std::get<0>(h);
diff --git a/src/xmpp/xmpp-im/jingle-transport.cpp b/src/xmpp/xmpp-im/jingle-transport.cpp
index eafed664..bb895819 100644
--- a/src/xmpp/xmpp-im/jingle-transport.cpp
+++ b/src/xmpp/xmpp-im/jingle-transport.cpp
@@ -37,7 +37,7 @@ namespace XMPP { namespace Jingle {
 
     int Transport::maxSupportedComponents() const { return 1; }
 
-    int Transport::addComponent() { return 0; }
+    void Transport::setComponentsCount(int) { }
 
     int Transport::maxSupportedChannelsPerComponent(TransportFeatures) const { return 0; }
 
@@ -48,23 +48,30 @@ namespace XMPP { namespace Jingle {
         emit stateChanged();
     }
 
-    //----------------------------------------------------------------------------
-    // Connection
-    //----------------------------------------------------------------------------
-    bool Connection::hasPendingDatagrams() const { return false; }
-
-    NetworkDatagram Connection::receiveDatagram(qint64 maxSize)
+    bool Transport::wasAccepted() const
     {
-        Q_UNUSED(maxSize)
-        return NetworkDatagram();
+        if (isRemote())
+            return _state >= State::ApprovedToSend && _state != State::Pending;
+        return _state >= State::ApprovedToSend;
     }
 
-    size_t Connection::blockSize() const
+    void Transport::addAcceptor(TransportFeatures features, ConnectionAcceptorCallback &&acceptor, int componentIndex)
     {
-        return 0; // means "block" is not applicable for this kind of connection
+        _connectionAcceptors.append({ features, std::move(acceptor), componentIndex });
     }
 
-    int Connection::component() const { return 0; }
+    const QList<ConnectionAcceptor> &Transport::acceptors() const { return _connectionAcceptors; }
+
+    bool Transport::notifyIncomingConnection(Connection::Ptr connection) const
+    {
+        for (auto const &acceptor : _connectionAcceptors) {
+            if ((connection->features() & acceptor.features) == acceptor.features
+                && (acceptor.componentIndex < 0 || acceptor.componentIndex == connection->component())
+                && acceptor.callback(connection))
+                return true;
+        }
+        return false;
+    }
 
     //----------------------------------------------------------------------------
     // TransportSelector
diff --git a/src/xmpp/xmpp-im/jingle-transport.h b/src/xmpp/xmpp-im/jingle-transport.h
index d5bd8573..66b199bc 100644
--- a/src/xmpp/xmpp-im/jingle-transport.h
+++ b/src/xmpp/xmpp-im/jingle-transport.h
@@ -20,62 +20,10 @@
 #ifndef JINGLE_TRANSPORT_H
 #define JINGLE_TRANSPORT_H
 
-#include "bytestream.h"
+#include "jingle-connection.h"
 #include "jingle.h"
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
-#include <QNetworkDatagram>
-#else
-#include <QHostAddress>
-#endif
-
 namespace XMPP { namespace Jingle {
-#if QT_VERSION < QT_VERSION_CHECK(5, 8, 0)
-    // stub implementation
-    class NetworkDatagram {
-    public:
-        bool       _valid = false;
-        QByteArray _data;
-        inline NetworkDatagram(const QByteArray &data, const QHostAddress &destinationAddress = QHostAddress(),
-                               quint16 port = 0) :
-            _valid(true),
-            _data(data)
-        {
-            Q_UNUSED(destinationAddress);
-            Q_UNUSED(port)
-        }
-        inline NetworkDatagram() { }
-
-        inline bool       isValid() const { return _valid; }
-        inline QByteArray data() const { return _data; }
-    };
-#else
-    typedef QNetworkDatagram NetworkDatagram;
-#endif
-
-    class Connection : public ByteStream {
-        Q_OBJECT
-    public:
-        enum Hint { AvoidRelays = 1 };
-        Q_DECLARE_FLAGS(Hints, Hint)
-
-        using Ptr = QSharedPointer<Connection>; // will be shared between transport and application
-        virtual bool            hasPendingDatagrams() const;
-        virtual NetworkDatagram receiveDatagram(qint64 maxSize = -1);
-        virtual size_t          blockSize() const;
-        virtual int             component() const;
-
-        inline void  setHints(Hints hints) { _hints = hints; }
-        inline Hints hints() const { return _hints; }
-
-    signals:
-        void connected();
-        void disconnected();
-
-    protected:
-        Hints _hints;
-    };
-    Q_DECLARE_OPERATORS_FOR_FLAGS(Connection::Hints)
 
     class TransportManager;
     class TransportManagerPad : public SessionManagerPad {
@@ -136,7 +84,7 @@ namespace XMPP { namespace Jingle {
 
         // a component is basically is a subconnection usually with a dedicated IP port. A component may have one or
         // more channels. Components are pretty much generic but channels aren't. Channels give connection objects,
-        // wbile components are rather indexes.
+        // while components are rather indexes.
 
         /**
          * @brief maxSupportedComponents
@@ -148,14 +96,13 @@ namespace XMPP { namespace Jingle {
         virtual int maxSupportedComponents() const;
 
         /**
-         * @brief addComponent add another component to the transport connection
-         * @return index of the component (starting from 1 - second component. see below)
+         * @brief setComponentsCount set desired amount of components
          *
-         * Note, component with index 0 is considered to be always added since it doesn't make sense to have a transport
-         * w/o any component. So if the transport has just one component, the application should avoid calling this
-         * function.
+         * Note, by default there there is 1 component. So if 1 is enough for an application this function can be
+         * ignored. The function is not allowed to be called after negotiation has been started. In other words call
+         * it before `prepare()` call.
          */
-        virtual int addComponent();
+        virtual void setComponentsCount(int count);
 
         /**
          * @brief maxSupportedChannelsPerComponent returns max number supported channels for specific features set
@@ -173,7 +120,8 @@ namespace XMPP { namespace Jingle {
         /**
          * @brief addChannel adds a channel to the component.
          * @param features   - required channel features. like DataOriented for example
-         * @param component  - index of component to add the channel to.
+         * @param id         - channel id. can be used for demultiplexed incoming negotiations
+         * @param component  - index of component to add the channel to. If -1 then into the most appropriate.
          * @return connection object which eventually will fire `connected()` signal
          *
          * It's necessary to add components in advance since we always have at least one component.
@@ -181,13 +129,31 @@ namespace XMPP { namespace Jingle {
          * reliable connection object on the component 0. Transports not supporting components notation are considered
          * to support just one component with index 0
          */
-        virtual Connection::Ptr addChannel(TransportFeatures features, int component = 0) const = 0;
+        virtual Connection::Ptr addChannel(TransportFeatures features, const QString &id, int componentIndex = -1) = 0;
 
         /**
          * @brief channels
          * @return the list of all added channels both local and remote
          */
         virtual QList<Connection::Ptr> channels() const = 0;
+
+        /**
+         * @brief addAcceptor adds a connection acceptor for incoming connections
+         * @param features minimal required set of features of the connection
+         * @param acceptor a callback function which returns true is connection was accepted
+         * @param componentIndex index of component to catch connections on or -1 to catch on all components
+         *
+         * It's up to the application what to do with connecteion passed to the callback. If the callback returns true
+         * it mean application accepted the conenction and likely attached some signals to it and prepared for any use.
+         */
+        void addAcceptor(TransportFeatures features, ConnectionAcceptorCallback &&acceptor, int componentIndex = -1);
+
+        /**
+         * @brief acceptors returns all registered connection acceptors
+         * @return list of acceptors
+         */
+        const QList<ConnectionAcceptor> &acceptors() const;
+
     signals:
         /**
          * found some candidates and they have to be sent. takeUpdate has to be called from this signal
@@ -195,21 +161,31 @@ namespace XMPP { namespace Jingle {
          * session-initiate won't be sent.
          */
         void updated();
-        void connected(); // this signal is for app logic. maybe to finally start drawing some progress bar
-        void failed();    // transport ailed for whatever reason. aborted for example. _state will be State::Finished
+        void failed(); // transport ailed for whatever reason. aborted for example. _state will be State::Finished
         void stateChanged();
+        void newChannel(); // emitted when incomming channel doesn't to any channel expectation (see expectChannel)
 
     protected:
         // just updates state and signals about the change. No any loggic attached to the new state
         void setState(State newState);
 
+        // Where the user already gave his consent to transfer data. (one exception: State::Finished)
+        bool wasAccepted() const;
+
+        /**
+         * @brief notifyIncomingConnection checks all acceptors and return true if any accepted the connection
+         * @return acceptance status
+         */
+        bool notifyIncomingConnection(Connection::Ptr) const;
+
         State                               _state     = State::Created;
         State                               _prevState = State::Created;
         Origin                              _creator   = Origin::None;
         QSharedPointer<TransportManagerPad> _pad;
         Reason                              _lastReason;
         XMPP::Stanza::Error                 _lastError;
-        int                                 _channelCount = 1;
+        int                                 _componentsCount = 1;
+        QList<ConnectionAcceptor>           _connectionAcceptors;
     };
 
     // It's an available transports collection per application
diff --git a/src/xmpp/xmpp-im/jingle-webrtc-datachannel_p.cpp b/src/xmpp/xmpp-im/jingle-webrtc-datachannel_p.cpp
new file mode 100644
index 00000000..1422b5fb
--- /dev/null
+++ b/src/xmpp/xmpp-im/jingle-webrtc-datachannel_p.cpp
@@ -0,0 +1,163 @@
+/*
+ * jignle-webrtc-datachannel_p.cpp - WebRTC DataChannel implementation
+ * Copyright (C) 2021  Sergey Ilinykh
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "jingle-webrtc-datachannel_p.h"
+#include "jingle-sctp-association_p.h"
+
+#include <QtEndian>
+
+namespace XMPP { namespace Jingle { namespace SCTP {
+
+    WebRTCDataChannel::WebRTCDataChannel(AssociationPrivate *association, quint8 channelType, quint32 reliability,
+                                         quint16 priority, const QString &label, const QString &protocol) :
+        association(association),
+        channelType(channelType), reliability(reliability), priority(priority), label(label), protocol(protocol)
+    {
+    }
+
+    QSharedPointer<WebRTCDataChannel> WebRTCDataChannel::fromChannelOpen(AssociationPrivate *assoc,
+                                                                         const QByteArray &  data)
+    {
+        /*
+          0                   1                   2                   3
+          0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         |  Message Type |  Channel Type |            Priority           |
+         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         |                    Reliability Parameter                      |
+         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         |         Label Length          |       Protocol Length         |
+         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         \                                                               /
+         |                             Label                             |
+         /                                                               \
+         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         \                                                               /
+         |                            Protocol                           |
+         /                                                               \
+         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+        */
+        if (data.size() < 12) {
+            qWarning("jingle-sctp: truncated header for WebRTC DataChannel DATA_CHANNEL_OPEN. Dropping..");
+            return {};
+        }
+
+        quint8  channelType    = data[1];
+        quint16 priority       = qFromBigEndian<quint16>(data.data() + 2);
+        quint32 reliability    = qFromBigEndian<quint32>(data.data() + 4);
+        quint16 labelLength    = qFromBigEndian<quint16>(data.data() + 8);
+        auto    protoOff       = (12 + labelLength) + labelLength % 4;
+        quint16 protocolLength = qFromBigEndian<quint16>(data.data() + 10);
+        if (protoOff + protocolLength > data.size()) {
+            qWarning("jingle-sctp: truncated label or protocol in header for WebRTC DataChannel DATA_CHANNEL_OPEN. "
+                     "Dropping..");
+            return {};
+        }
+        QString label    = QString::fromUtf8(data.data() + 12, labelLength);
+        QString protocol = QString::fromUtf8(data.data() + protoOff, protocolLength);
+        return QSharedPointer<WebRTCDataChannel>::create(assoc, channelType, priority, reliability, label, protocol);
+    }
+
+    void WebRTCDataChannel::connect()
+    {
+        Q_ASSERT(streamId == -1);
+        auto utf8Label    = label.toUtf8();
+        auto utf8Protocol = protocol.toUtf8();
+
+        auto sz       = 12 + utf8Label.size();
+        auto protoOff = (sz + 3) & ~3;
+        sz += (utf8Protocol.size() + 3) & ~3;
+        QByteArray data(sz, 0);
+
+        data[0] = DCEP_DATA_CHANNEL_OPEN;
+        data[1] = channelType;
+        qToBigEndian(priority, data.data() + 2);
+        qToBigEndian(reliability, data.data() + 4);
+        qToBigEndian(utf8Label.size(), data.data() + 8);
+        qToBigEndian(utf8Protocol.size(), data.data() + 10);
+        data.replace(12, utf8Label.size(), utf8Label);
+        data.replace(protoOff, utf8Protocol.size(), utf8Protocol);
+
+        association->write(data, streamId, PPID_DCEP);
+    }
+
+    bool WebRTCDataChannel::hasPendingDatagrams() const { return datagrams.size() > 0; }
+
+    NetworkDatagram WebRTCDataChannel::receiveDatagram(qint64 maxSize)
+    {
+        Q_UNUSED(maxSize) // TODO or not?
+        return datagrams.size() ? datagrams.takeFirst() : NetworkDatagram();
+    }
+
+    qint64 WebRTCDataChannel::bytesAvailable() const { return 0; }
+
+    qint64 WebRTCDataChannel::bytesToWrite() const { return 0; /*client->bytesToWrite();*/ }
+
+    void WebRTCDataChannel::close() { XMPP::Jingle::Connection::close(); }
+
+    TransportFeatures WebRTCDataChannel::features() const
+    {
+        // FIXME return proper featuers
+        return TransportFeature::DataOriented | TransportFeature::Reliable | TransportFeature::Ordered
+            | TransportFeature::Fast;
+    }
+
+    qint64 WebRTCDataChannel::writeData(const char *data, qint64 maxSize)
+    {
+        return 0; // client->write(data, maxSize);
+    }
+
+    qint64 WebRTCDataChannel::readData(char *data, qint64 maxSize) { return 0; }
+
+    void WebRTCDataChannel::onConnected()
+    {
+        qDebug("jingle-sctp: channel connected!");
+        emit connected();
+    }
+
+    void WebRTCDataChannel::onError(QAbstractSocket::SocketError error)
+    {
+        qDebug("jingle-ice: channel failed: %d", error);
+    }
+
+    void WebRTCDataChannel::onDisconnected(DisconnectReason reason)
+    {
+        if (!(openMode() & QIODevice::WriteOnly))
+            return;
+        streamId         = -1;
+        disconnectReason = reason;
+        setOpenMode(QIODevice::ReadOnly);
+        emit disconnected();
+    }
+
+    void WebRTCDataChannel::onIncomingData(const QByteArray &data, quint32 ppid)
+    {
+        if (ppid == PPID_DCEP) {
+            if (data.isEmpty() || data[0] != DCEP_DATA_CHANNEL_ACK || !waitingAck) {
+                qWarning("jingle-sctp: unexpected DCEP. ignoring");
+                return;
+            }
+            emit connected();
+            return;
+        }
+        // check other PPIDs.
+        datagrams.append(NetworkDatagram { data });
+        emit readyRead();
+    }
+}}}
diff --git a/src/xmpp/xmpp-im/jingle-webrtc-datachannel_p.h b/src/xmpp/xmpp-im/jingle-webrtc-datachannel_p.h
new file mode 100644
index 00000000..360cb6d8
--- /dev/null
+++ b/src/xmpp/xmpp-im/jingle-webrtc-datachannel_p.h
@@ -0,0 +1,71 @@
+/*
+ * jignle-webrtc-datachannel_p.h - WebRTC DataChannel implementation
+ * Copyright (C) 2021  Sergey Ilinykh
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "jingle-connection.h"
+
+namespace XMPP { namespace Jingle { namespace SCTP {
+
+    enum : quint32 { PPID_DCEP = 50 };
+    enum : quint8 { DCEP_DATA_CHANNEL_ACK = 0x02, DCEP_DATA_CHANNEL_OPEN = 0x03 };
+
+    class AssociationPrivate;
+    class WebRTCDataChannel : public XMPP::Jingle::Connection {
+        Q_OBJECT
+    public:
+        enum DisconnectReason { TransportClosed, SctpClosed, ChannelClosed };
+
+        AssociationPrivate *   association;
+        QList<NetworkDatagram> datagrams;
+        DisconnectReason       disconnectReason = ChannelClosed;
+        bool                   waitingAck       = false;
+
+        quint8  channelType = 0;
+        quint32 reliability = 0;
+        quint16 priority    = 256;
+        QString label;
+        QString protocol;
+        int     streamId = -1;
+
+        WebRTCDataChannel(AssociationPrivate *association, quint8 channelType = 0, quint32 reliability = 0,
+                          quint16 priority = 256, const QString &label = QString(),
+                          const QString &protocol = QString());
+        static QSharedPointer<WebRTCDataChannel> fromChannelOpen(AssociationPrivate *assoc, const QByteArray &data);
+
+        void setStreamId(quint16 id) { streamId = id; }
+        void connect();
+
+        bool              hasPendingDatagrams() const override;
+        NetworkDatagram   receiveDatagram(qint64 maxSize = -1) override;
+        qint64            bytesAvailable() const override;
+        qint64            bytesToWrite() const override;
+        void              close() override;
+        TransportFeatures features() const override;
+
+    protected:
+        qint64 writeData(const char *data, qint64 maxSize);
+        qint64 readData(char *data, qint64 maxSize);
+
+    public:
+        void onConnected();
+        void onError(QAbstractSocket::SocketError error);
+        void onDisconnected(DisconnectReason reason);
+        void onIncomingData(const QByteArray &data, quint32 ppid);
+    };
+
+}}}
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index 962ec3e4..61bc43b2 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -140,11 +140,15 @@ namespace Jingle {
         HighProbableConnect = 0x01, // e.g ICE. ICE will have priority over others thanks to Fast|MessageOriented
         AlwaysConnect       = 0x02, // e.g. IBB. basically it's always connected
 
+        // 0x04 is reserved for possible Unordered
+        Ordered = 0x08, // where MessageOriented transport guarantees ordered delivery
+
         // exclusive
-        Unreliable = 0x04, // losses are acceptable
-        Reliable   = 0x08, // losses are unacceptable
+        Unreliable = 0x10, // losses are acceptable
+        Reliable   = 0x20, // losses are unacceptable
 
-        Fast = 0x20, // assumes p2p or some light proxies like TURN/S5B (likely everything but IBB)
+        Fast        = 0x40, // assumes p2p or some light proxies like TURN/S5B (likely everything but IBB)
+        LowOverhead = 0x80, // p2p only
 
         // exclusive
         StreamOriented  = 0x200,

From 7b767a40562bc6806b615f11ad418077a6db402e Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 19 Apr 2021 09:32:51 +0300
Subject: [PATCH 288/383] More flexible way of jingle app/transport
 registration

---
 src/xmpp/xmpp-im/client.cpp             |  8 ++++----
 src/xmpp/xmpp-im/jingle-application.cpp |  1 +
 src/xmpp/xmpp-im/jingle-application.h   |  3 ++-
 src/xmpp/xmpp-im/jingle-ft.cpp          |  2 +-
 src/xmpp/xmpp-im/jingle-ft.h            |  2 +-
 src/xmpp/xmpp-im/jingle-ibb.cpp         |  2 --
 src/xmpp/xmpp-im/jingle-ibb.h           |  1 -
 src/xmpp/xmpp-im/jingle-ice.cpp         |  5 ++---
 src/xmpp/xmpp-im/jingle-ice.h           |  5 +++--
 src/xmpp/xmpp-im/jingle-s5b.cpp         |  2 --
 src/xmpp/xmpp-im/jingle-s5b.h           |  1 -
 src/xmpp/xmpp-im/jingle-transport.cpp   |  2 ++
 src/xmpp/xmpp-im/jingle-transport.h     |  3 ++-
 src/xmpp/xmpp-im/jingle.cpp             | 16 ++++++++++------
 src/xmpp/xmpp-im/jingle.h               |  4 ++--
 15 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
index ca73353f..94e1da73 100644
--- a/src/xmpp/xmpp-im/client.cpp
+++ b/src/xmpp/xmpp-im/client.cpp
@@ -175,13 +175,13 @@ Client::Client(QObject *par) : QObject(par)
 
     d->jingleManager = new Jingle::Manager(this);
     auto ft          = new Jingle::FileTransfer::Manager(this);
-    d->jingleManager->registerApp(Jingle::FileTransfer::NS, ft);
+    d->jingleManager->registerApp(ft);
     d->jingleS5BManager = new Jingle::S5B::Manager(d->jingleManager);
     d->jingleIBBManager = new Jingle::IBB::Manager(d->jingleManager);
     d->jingleICEManager = new Jingle::ICE::Manager(d->jingleManager);
-    d->jingleManager->registerTransport(Jingle::S5B::NS, d->jingleS5BManager);
-    d->jingleManager->registerTransport(Jingle::IBB::NS, d->jingleIBBManager);
-    // d->jingleManager->registerTransport(Jingle::ICE::NS, d->jingleICEManager);
+    d->jingleManager->registerTransport(d->jingleS5BManager);
+    d->jingleManager->registerTransport(d->jingleIBBManager);
+    // d->jingleManager->registerTransport(d->jingleICEManager);
 }
 
 Client::~Client()
diff --git a/src/xmpp/xmpp-im/jingle-application.cpp b/src/xmpp/xmpp-im/jingle-application.cpp
index 7491d0a5..7bdf5183 100644
--- a/src/xmpp/xmpp-im/jingle-application.cpp
+++ b/src/xmpp/xmpp-im/jingle-application.cpp
@@ -29,6 +29,7 @@ namespace XMPP { namespace Jingle {
     // Application
     //----------------------------------------------------------------------------
     ApplicationManager::ApplicationManager(QObject *parent) : QObject(parent) { }
+    QStringList ApplicationManager::ns() const { return discoFeatures(); }
 
     //----------------------------------------------------------------------------
     // Application
diff --git a/src/xmpp/xmpp-im/jingle-application.h b/src/xmpp/xmpp-im/jingle-application.h
index f1fd0e8d..16b18fce 100644
--- a/src/xmpp/xmpp-im/jingle-application.h
+++ b/src/xmpp/xmpp-im/jingle-application.h
@@ -219,8 +219,9 @@ namespace XMPP { namespace Jingle {
 
         // this method is supposed to gracefully close all related sessions as a preparation for plugin unload for
         // example
-        virtual void closeAll() = 0;
+        virtual void closeAll(const QString &ns = QString()) = 0;
 
+        virtual QStringList ns() const;
         virtual QStringList discoFeatures() const = 0;
     };
 
diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 2459a644..38983d5b 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -400,7 +400,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
 
     ApplicationManagerPad *Manager::pad(Session *session) { return new Pad(this, session); }
 
-    void Manager::closeAll() { }
+    void Manager::closeAll(const QString &) { }
 
     QStringList Manager::discoFeatures() const { return { NS }; }
 
diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index 1f4b1449..3eb1ed9f 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -196,7 +196,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
         Application *startApplication(const ApplicationManagerPad::Ptr &pad, const QString &contentName, Origin creator,
                                       Origin senders) override;
         ApplicationManagerPad *pad(Session *session) override; // pad factory
-        void                   closeAll() override;
+        void                   closeAll(const QString &ns = QString()) override;
 
         QStringList discoFeatures() const override;
 
diff --git a/src/xmpp/xmpp-im/jingle-ibb.cpp b/src/xmpp/xmpp-im/jingle-ibb.cpp
index 7ef8d462..ca77c899 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.cpp
+++ b/src/xmpp/xmpp-im/jingle-ibb.cpp
@@ -438,8 +438,6 @@ namespace XMPP { namespace Jingle { namespace IBB {
 
     TransportManagerPad *Manager::pad(Session *session) { return new Pad(this, session); }
 
-    void Manager::closeAll() { emit abortAllRequested(); }
-
     QStringList Manager::discoFeatures() const { return { NS }; }
 
     XMPP::Jingle::Connection::Ptr Manager::makeConnection(const Jid &peer, const QString &sid, size_t blockSize)
diff --git a/src/xmpp/xmpp-im/jingle-ibb.h b/src/xmpp/xmpp-im/jingle-ibb.h
index 68c5a1b4..96773228 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.h
+++ b/src/xmpp/xmpp-im/jingle-ibb.h
@@ -84,7 +84,6 @@ namespace Jingle { namespace IBB {
                                                              Origin                          creator) override;
         TransportManagerPad *                   pad(Session *session) override;
 
-        void        closeAll() override;
         QStringList discoFeatures() const override;
 
         Connection::Ptr makeConnection(const Jid &peer, const QString &sid, size_t blockSize);
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index a8f78f9e..cb7b34ac 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -1154,9 +1154,8 @@ namespace XMPP { namespace Jingle { namespace ICE {
 
     TransportManagerPad *Manager::pad(Session *session) { return new Pad(this, session); }
 
-    void Manager::closeAll() { emit abortAllRequested(); }
-
-    QStringList Manager::discoFeatures() const { return { NS, NS_DTLS }; }
+    QStringList Manager::ns() const { return { NS }; }
+    QStringList Manager::discoFeatures() const { return { NS, NS_DTLS, SCTP::ns() }; }
 
     void Manager::setBasePort(int port) { d->basePort = port; }
 
diff --git a/src/xmpp/xmpp-im/jingle-ice.h b/src/xmpp/xmpp-im/jingle-ice.h
index 18a855b6..e0752d60 100644
--- a/src/xmpp/xmpp-im/jingle-ice.h
+++ b/src/xmpp/xmpp-im/jingle-ice.h
@@ -96,10 +96,11 @@ namespace Jingle { namespace ICE {
                                                              Origin                          creator) override;
         TransportManagerPad *                   pad(Session *session) override;
 
-        void closeAll() override;
-
+        QStringList ns() const override;
         QStringList discoFeatures() const override;
 
+        // TODO reimplement closeAll to support old protocols
+
         /**
          * @brief userProxy returns custom (set by user) SOCKS proxy JID
          * @return
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index d0c9ffcb..ef8c8676 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -1740,8 +1740,6 @@ namespace XMPP { namespace Jingle { namespace S5B {
 
     TransportManagerPad *Manager::pad(Session *session) { return new Pad(this, session); }
 
-    void Manager::closeAll() { emit abortAllRequested(); }
-
     QStringList Manager::discoFeatures() const { return { NS }; }
 
     void Manager::addKeyMapping(const QString &key, Transport *transport) { d->key2transport.insert(key, transport); }
diff --git a/src/xmpp/xmpp-im/jingle-s5b.h b/src/xmpp/xmpp-im/jingle-s5b.h
index 93d45401..dad31f6f 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.h
+++ b/src/xmpp/xmpp-im/jingle-s5b.h
@@ -189,7 +189,6 @@ namespace Jingle { namespace S5B {
                                                              Origin                          creator) override;
         TransportManagerPad *                   pad(Session *session) override;
 
-        void        closeAll() override;
         QStringList discoFeatures() const override;
 
         QString generateSid(const Jid &remote);
diff --git a/src/xmpp/xmpp-im/jingle-transport.cpp b/src/xmpp/xmpp-im/jingle-transport.cpp
index bb895819..832f53e0 100644
--- a/src/xmpp/xmpp-im/jingle-transport.cpp
+++ b/src/xmpp/xmpp-im/jingle-transport.cpp
@@ -25,6 +25,8 @@ namespace XMPP { namespace Jingle {
     // TransportManager
     //----------------------------------------------------------------------------
     TransportManager::TransportManager(QObject *parent) : QObject(parent) { }
+    QStringList TransportManager::ns() const { return discoFeatures(); }
+    void        TransportManager::closeAll(const QString &) { emit abortAllRequested(); }
 
     //----------------------------------------------------------------------------
     // Transport
diff --git a/src/xmpp/xmpp-im/jingle-transport.h b/src/xmpp/xmpp-im/jingle-transport.h
index 66b199bc..e92ae80f 100644
--- a/src/xmpp/xmpp-im/jingle-transport.h
+++ b/src/xmpp/xmpp-im/jingle-transport.h
@@ -243,8 +243,9 @@ namespace XMPP { namespace Jingle {
 
         // this method is supposed to gracefully close all related sessions as a preparation for plugin unload for
         // example
-        virtual void closeAll() = 0;
+        virtual void closeAll(const QString &ns = QString());
 
+        virtual QStringList ns() const;
         virtual QStringList discoFeatures() const = 0;
     signals:
         void abortAllRequested(); // mostly used by transport instances to abort immediately
diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index b8c626ab..949432c1 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -587,9 +587,11 @@ namespace XMPP { namespace Jingle {
 
     const Jid &Manager::redirectionJid() const { return d->redirectionJid; }
 
-    void Manager::registerApp(const QString &ns, ApplicationManager *app)
+    void Manager::registerApp(ApplicationManager *app)
     {
-        d->applicationManagers.insert(ns, app);
+        auto const &nss = app->ns();
+        for (auto const &ns : nss)
+            d->applicationManagers.insert(ns, app);
         app->setJingleManager(this);
     }
 
@@ -597,7 +599,7 @@ namespace XMPP { namespace Jingle {
     {
         auto appManager = d->applicationManagers.value(ns);
         if (appManager) {
-            appManager->closeAll();
+            appManager->closeAll(ns);
             d->applicationManagers.remove(ns);
         }
     }
@@ -613,9 +615,11 @@ namespace XMPP { namespace Jingle {
         return am->pad(session);
     }
 
-    void Manager::registerTransport(const QString &ns, TransportManager *transport)
+    void Manager::registerTransport(TransportManager *transport)
     {
-        d->transportManagers.insert(ns, transport);
+        auto const &nss = transport->ns();
+        for (auto const &ns : nss)
+            d->transportManagers.insert(ns, transport);
         transport->setJingleManager(this);
     }
 
@@ -623,7 +627,7 @@ namespace XMPP { namespace Jingle {
     {
         auto trManager = d->transportManagers.value(ns);
         if (trManager) {
-            trManager->closeAll();
+            trManager->closeAll(ns);
             d->transportManagers.remove(ns);
         }
     }
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index 61bc43b2..a8476357 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -335,13 +335,13 @@ namespace Jingle {
         void       setRedirection(const Jid &to);
         const Jid &redirectionJid() const;
 
-        void                   registerApp(const QString &ns, ApplicationManager *app);
+        void                   registerApp(ApplicationManager *app);
         void                   unregisterApp(const QString &ns);
         bool                   isRegisteredApplication(const QString &ns);
         ApplicationManagerPad *applicationPad(Session *      session,
                                               const QString &ns); // allocates new pad on application manager
 
-        void                 registerTransport(const QString &ns, TransportManager *transport);
+        void                 registerTransport(TransportManager *transport);
         void                 unregisterTransport(const QString &ns);
         bool                 isRegisteredTransport(const QString &ns);
         TransportManagerPad *transportPad(Session *      session,

From a4051066fc2cbca350106857ade7f2a009f75d91 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 19 Apr 2021 21:55:55 +0300
Subject: [PATCH 289/383] Make SCTP association handshake working

---
 src/xmpp/xmpp-im/client.cpp      |  2 +-
 src/xmpp/xmpp-im/jingle-ice.cpp  | 58 +++++++++++++++++++-------------
 src/xmpp/xmpp-im/jingle-sctp.cpp | 16 +++++++--
 src/xmpp/xmpp-im/jingle.cpp      |  2 +-
 src/xmpp/xmpp-im/jingle.h        |  2 +-
 5 files changed, 51 insertions(+), 29 deletions(-)

diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
index 94e1da73..48c99732 100644
--- a/src/xmpp/xmpp-im/client.cpp
+++ b/src/xmpp/xmpp-im/client.cpp
@@ -175,7 +175,7 @@ Client::Client(QObject *par) : QObject(par)
 
     d->jingleManager = new Jingle::Manager(this);
     auto ft          = new Jingle::FileTransfer::Manager(this);
-    d->jingleManager->registerApp(ft);
+    d->jingleManager->registerApplication(ft);
     d->jingleS5BManager = new Jingle::S5B::Manager(d->jingleManager);
     d->jingleIBBManager = new Jingle::IBB::Manager(d->jingleManager);
     d->jingleICEManager = new Jingle::ICE::Manager(d->jingleManager);
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index cb7b34ac..4b1f913b 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -486,11 +486,12 @@ namespace XMPP { namespace Jingle { namespace ICE {
     };
 
     struct Component {
-        int                           componentIndex = 0;
-        bool                          initialized    = false;
-        bool                          lowOverhead    = false;
-        Dtls *                        dtls           = nullptr;
-        SCTP::Association *           sctp           = nullptr;
+        int                           componentIndex  = 0;
+        bool                          initialized     = false;
+        bool                          lowOverhead     = false;
+        bool                          needDatachannel = false;
+        Dtls *                        dtls            = nullptr;
+        SCTP::Association *           sctp            = nullptr;
         QSharedPointer<RawConnection> rawConnection;
         // QHash<quint16, Connection::Ptr> dataChannels;
     };
@@ -509,7 +510,6 @@ namespace XMPP { namespace Jingle { namespace ICE {
         bool                           offerSent                 = false;
         bool                           aborted                   = false;
         bool                           initialOfferReady         = false;
-        bool                           iceStarted                = false;
         bool                           remoteAcceptedFingerprint = false;
         quint16                        pendingActions            = 0;
         int                            proxiesInDiscoCount       = 0;
@@ -584,8 +584,11 @@ namespace XMPP { namespace Jingle { namespace ICE {
                 pendingActions |= NewFingerprint;
             }
             dtls->connect(dtls, &Dtls::readyRead, q, [this, componentIndex]() {
-                auto d = components[componentIndex].dtls->readDatagram();
-                // pass data to sctp
+                auto &component = components[componentIndex];
+                auto  d         = component.dtls->readDatagram();
+                if (component.sctp) {
+                    component.sctp->writeIncoming(d);
+                }
             });
             dtls->connect(dtls, &Dtls::readyReadOutgoing, q, [this, componentIndex]() {
                 ice->writeDatagram(componentIndex, components[componentIndex].dtls->readOutgoingDatagram());
@@ -689,17 +692,11 @@ namespace XMPP { namespace Jingle { namespace ICE {
 
             ice = new Ice176(q);
 
-            iceStarted = false;
-            //            iceA_status.channelsReady.resize(2);
-            //            iceA_status.channelsReady[0] = false;
-            //            iceA_status.channelsReady[1] = false;
-
             q->connect(ice, &XMPP::Ice176::started, q, [this]() {
                 for (auto const &c : as_const(components)) {
                     if (c.lowOverhead)
                         ice->flagComponentAsLowOverhead(c.componentIndex);
                 }
-                iceStarted = true;
             });
             q->connect(ice, &XMPP::Ice176::error, q, [this](XMPP::Ice176::Error err) {
                 q->_lastReason = Reason(Reason::Condition::FailedTransport, QString("ICE failed: %1").arg(err));
@@ -927,6 +924,24 @@ namespace XMPP { namespace Jingle { namespace ICE {
             // Do we need anything else to do here? connect signals for example?
         }
 
+        void initSctpAssociation(int componentIndex)
+        {
+            auto &c = components[componentIndex];
+            Q_ASSERT(c.sctp == nullptr);
+            c.sctp = new SCTP::Association(q);
+            pendingActions |= NewSctpAssociation;
+            if (q->wasAccepted() && q->state() != State::ApprovedToSend) // like we already sent our decision
+                emit q->updated();
+            if (remoteState->sctpMap.isValid()) {
+                // TODO if we already have associations params try to ruse them instead of making new one
+            }
+            q->connect(c.sctp, &SCTP::Association::readyReadOutgoing, q, [this, componentIndex]() {
+                auto &c   = components[componentIndex];
+                auto  buf = c.sctp->readOutgoing();
+                c.dtls->writeDatagram(buf);
+            });
+        }
+
         Connection::Ptr addDataChannel(TransportFeatures channelFeatures, const QString &label, int &componentIndex)
         {
             if (componentIndex == -1)
@@ -948,13 +963,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
                     qWarning("remote hasn't negotiated sctp association");
                     return {};
                 }
-                c.sctp = new SCTP::Association(q);
-                pendingActions |= NewSctpAssociation;
-                if (q->wasAccepted() && q->state() != State::ApprovedToSend) // like we already sent our decision
-                    emit q->updated();
-                if (remoteState->sctpMap.isValid()) {
-                    // TODO if we already have associations params try to ruse them instead of making new one
-                }
+                initSctpAssociation(componentIndex);
             }
             Q_UNUSED(channelFeatures); // TODO
             return c.sctp->newChannel(SCTP::Reliable, true, 0, 256, label);
@@ -984,6 +993,8 @@ namespace XMPP { namespace Jingle { namespace ICE {
         for (auto const &acceptor : a) {
             int ci = acceptor.componentIndex < 0 ? 0 : acceptor.componentIndex;
             d->ensureComponentExist(ci, acceptor.features & TransportFeature::LowOverhead); // it won't fail
+            if (acceptor.features & TransportFeature::DataOriented)
+                d->components[ci].needDatachannel = true;
         }
 
         if (Dtls::isSupported()
@@ -993,9 +1004,10 @@ namespace XMPP { namespace Jingle { namespace ICE {
 
             for (auto &c : d->components) {
                 d->setupDtls(c.componentIndex);
+                if (isRemote() && c.needDatachannel && !c.sctp) {
+                    d->initSctpAssociation(c.componentIndex);
+                }
             }
-
-            // TODO sctp
         }
 
         auto manager = dynamic_cast<Manager *>(_pad->manager())->d.data();
diff --git a/src/xmpp/xmpp-im/jingle-sctp.cpp b/src/xmpp/xmpp-im/jingle-sctp.cpp
index 086693d4..fe528043 100644
--- a/src/xmpp/xmpp-im/jingle-sctp.cpp
+++ b/src/xmpp/xmpp-im/jingle-sctp.cpp
@@ -29,6 +29,8 @@
 
 #include <mutex>
 
+#define SCTP_DEBUG(msg, ...) qDebug("jingle-sctp: " msg, ##__VA_ARGS__)
+
 namespace XMPP { namespace Jingle { namespace SCTP {
 
     QDomElement MapElement::toXml(QDomDocument *doc) const
@@ -119,14 +121,14 @@ namespace XMPP { namespace Jingle { namespace SCTP {
 
     QByteArray Association::readOutgoing()
     {
-        qDebug("jignle-sctp: read outgoing");
+        SCTP_DEBUG("read outgoing");
         std::lock_guard<std::mutex> lock(d->mutex);
         return d->outgoingQueue.isEmpty() ? QByteArray() : d->outgoingQueue.dequeue();
     }
 
     void Association::writeIncoming(const QByteArray &data)
     {
-        qDebug("jignle-sctp: write incoming");
+        SCTP_DEBUG("write incoming");
         d->assoc.ProcessSctpData(reinterpret_cast<const uint8_t *>(data.data()), data.size());
     }
 
@@ -164,10 +166,18 @@ namespace XMPP { namespace Jingle { namespace SCTP {
         return channel;
     }
 
-    QList<Connection::Ptr> Association::channels() const { return d->channels.values() + d->pendingLocalChannels; }
+    QList<Connection::Ptr> Association::channels() const
+    {
+        QList<Connection::Ptr> ret;
+        ret.reserve(d->channels.size() + d->pendingLocalChannels.size());
+        ret += d->channels.values();
+        ret += d->pendingLocalChannels;
+        return ret;
+    }
 
     void Association::onTransportConnected()
     {
+        SCTP_DEBUG("starting sctp association");
         d->transportConnected = true;
         while (d->pendingLocalChannels.size()) {
             auto channel = d->pendingLocalChannels.dequeue().staticCast<WebRTCDataChannel>();
diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index 949432c1..3c7ff94f 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -587,7 +587,7 @@ namespace XMPP { namespace Jingle {
 
     const Jid &Manager::redirectionJid() const { return d->redirectionJid; }
 
-    void Manager::registerApp(ApplicationManager *app)
+    void Manager::registerApplication(ApplicationManager *app)
     {
         auto const &nss = app->ns();
         for (auto const &ns : nss)
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index a8476357..ef0c3656 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -335,7 +335,7 @@ namespace Jingle {
         void       setRedirection(const Jid &to);
         const Jid &redirectionJid() const;
 
-        void                   registerApp(ApplicationManager *app);
+        void                   registerApplication(ApplicationManager *app);
         void                   unregisterApp(const QString &ns);
         bool                   isRegisteredApplication(const QString &ns);
         ApplicationManagerPad *applicationPad(Session *      session,

From 3bad67ca565ef7ad44553fd0c9f841d9ebcf941a Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 20 Apr 2021 09:36:57 +0300
Subject: [PATCH 290/383] Fixed crash on sctp deinitialization

---
 src/xmpp/xmpp-im/jingle-ice.cpp                |  9 ++++++++-
 src/xmpp/xmpp-im/jingle-sctp-association_p.cpp | 12 ++++++++++--
 src/xmpp/xmpp-im/jingle-sctp-association_p.h   |  2 +-
 src/xmpp/xmpp-im/jingle-sctp.cpp               |  2 ++
 src/xmpp/xmpp-im/jingle-sctp.h                 |  3 ++-
 src/xmpp/xmpp-im/jingle-transport.h            |  1 -
 6 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index 4b1f913b..0d187459 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -983,7 +983,14 @@ namespace XMPP { namespace Jingle { namespace ICE {
         });
     }
 
-    Transport::~Transport() { qDebug("jingle-ice: destroyed"); }
+    Transport::~Transport()
+    {
+        for (auto &c : d->components) {
+            delete c.sctp;
+            delete c.dtls;
+        }
+        qDebug("jingle-ice: destroyed");
+    }
 
     void Transport::prepare()
     {
diff --git a/src/xmpp/xmpp-im/jingle-sctp-association_p.cpp b/src/xmpp/xmpp-im/jingle-sctp-association_p.cpp
index 829156a6..63419c55 100644
--- a/src/xmpp/xmpp-im/jingle-sctp-association_p.cpp
+++ b/src/xmpp/xmpp-im/jingle-sctp-association_p.cpp
@@ -29,9 +29,17 @@ namespace XMPP { namespace Jingle { namespace SCTP {
 
     std::weak_ptr<Keeper> Keeper::instance;
 
-    Keeper::Keeper() { DepUsrSCTP::ClassInit(); }
+    Keeper::Keeper()
+    {
+        qDebug("init usrsctp");
+        DepUsrSCTP::ClassInit();
+    }
 
-    Keeper::~Keeper() { DepUsrSCTP::ClassDestroy(); }
+    Keeper::~Keeper()
+    {
+        qDebug("deinit usrsctp");
+        DepUsrSCTP::ClassDestroy();
+    }
 
     Keeper::Ptr Keeper::use()
     {
diff --git a/src/xmpp/xmpp-im/jingle-sctp-association_p.h b/src/xmpp/xmpp-im/jingle-sctp-association_p.h
index 91b6acd0..1c6c716e 100644
--- a/src/xmpp/xmpp-im/jingle-sctp-association_p.h
+++ b/src/xmpp/xmpp-im/jingle-sctp-association_p.h
@@ -44,12 +44,12 @@ namespace XMPP { namespace Jingle { namespace SCTP {
     public:
         Association *                   q;
         Keeper::Ptr                     keeper;
-        RTC::SctpAssociation            assoc;
         QQueue<QByteArray>              outgoingQueue;
         std::mutex                      mutex;
         QHash<quint16, Connection::Ptr> channels; // streamId -> WebRTCDataChannel
         QQueue<Connection::Ptr>         pendingChannels;
         QQueue<Connection::Ptr>         pendingLocalChannels;
+        RTC::SctpAssociation            assoc;
 
         bool    transportConnected = false;
         bool    useOddStreamId     = false;
diff --git a/src/xmpp/xmpp-im/jingle-sctp.cpp b/src/xmpp/xmpp-im/jingle-sctp.cpp
index fe528043..cf51aeed 100644
--- a/src/xmpp/xmpp-im/jingle-sctp.cpp
+++ b/src/xmpp/xmpp-im/jingle-sctp.cpp
@@ -103,6 +103,8 @@ namespace XMPP { namespace Jingle { namespace SCTP {
 
     Association::Association(QObject *parent) : QObject(parent), d(new AssociationPrivate(this)) { }
 
+    Association::~Association() { }
+
     void Association::setIdSelector(Association::IdSelector selector)
     {
         switch (selector) {
diff --git a/src/xmpp/xmpp-im/jingle-sctp.h b/src/xmpp/xmpp-im/jingle-sctp.h
index e16d0c31..69add0c5 100644
--- a/src/xmpp/xmpp-im/jingle-sctp.h
+++ b/src/xmpp/xmpp-im/jingle-sctp.h
@@ -73,6 +73,7 @@ namespace XMPP { namespace Jingle { namespace SCTP {
         enum class IdSelector { Odd, Even };
 
         Association(QObject *parent);
+        ~Association();
 
         void                   setIdSelector(IdSelector selector);
         QByteArray             readOutgoing();
@@ -91,7 +92,7 @@ namespace XMPP { namespace Jingle { namespace SCTP {
 
     signals:
         void readyReadOutgoing();
-        void newChannel(bool);
+        void newIncomingChannel();
 
     private:
         QScopedPointer<AssociationPrivate> d;
diff --git a/src/xmpp/xmpp-im/jingle-transport.h b/src/xmpp/xmpp-im/jingle-transport.h
index e92ae80f..f27ff5e4 100644
--- a/src/xmpp/xmpp-im/jingle-transport.h
+++ b/src/xmpp/xmpp-im/jingle-transport.h
@@ -163,7 +163,6 @@ namespace XMPP { namespace Jingle {
         void updated();
         void failed(); // transport ailed for whatever reason. aborted for example. _state will be State::Finished
         void stateChanged();
-        void newChannel(); // emitted when incomming channel doesn't to any channel expectation (see expectChannel)
 
     protected:
         // just updates state and signals about the change. No any loggic attached to the new state

From 0349a2cc54c4e53d65e22f93a2907828ea2efbd7 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 21 Apr 2021 17:37:30 +0300
Subject: [PATCH 291/383] Move most of sctp association logic in a private
 class

---
 src/irisnet/noncore/icelocaltransport.cpp     |   2 +
 src/xmpp/xmpp-im/jingle-ice.cpp               |   7 +-
 .../xmpp-im/jingle-sctp-association_p.cpp     | 102 +++++++++++++++++-
 src/xmpp/xmpp-im/jingle-sctp-association_p.h  |  18 +++-
 src/xmpp/xmpp-im/jingle-sctp.cpp              |  85 ++-------------
 src/xmpp/xmpp-im/jingle-sctp.h                |   4 +-
 6 files changed, 129 insertions(+), 89 deletions(-)

diff --git a/src/irisnet/noncore/icelocaltransport.cpp b/src/irisnet/noncore/icelocaltransport.cpp
index a8fefa0d..e79e88f8 100644
--- a/src/irisnet/noncore/icelocaltransport.cpp
+++ b/src/irisnet/noncore/icelocaltransport.cpp
@@ -460,6 +460,8 @@ private slots:
             Datagram dg;
 
             QByteArray buf = sock->readDatagram(&from, &fromPort);
+            if (buf.isEmpty()) // it's weird we ever came here, but should relax static analyzer
+                break;
             if ((from == stunBindAddr && fromPort == stunBindPort)
                 || (from == stunRelayAddr && fromPort == stunRelayPort)) {
                 bool haveData = processIncomingStun(buf, from, fromPort, &dg);
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index 0d187459..a72cc76a 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -597,9 +597,8 @@ namespace XMPP { namespace Jingle { namespace ICE {
                 auto &c = components[componentIndex];
                 if (c.sctp) {
                     // see rfc8864 (6.1) and rfc8832 (6)
-                    c.sctp->setIdSelector(dtls->localFingerprint().setup == Dtls::Active
-                                              ? SCTP::Association::IdSelector::Even
-                                              : SCTP::Association::IdSelector::Odd);
+                    c.sctp->setIdSelector(dtls->localFingerprint().setup == Dtls::Active ? SCTP::IdSelector::Even
+                                                                                         : SCTP::IdSelector::Odd);
                     c.sctp->onTransportConnected();
                 }
                 if (c.rawConnection)
@@ -940,6 +939,8 @@ namespace XMPP { namespace Jingle { namespace ICE {
                 auto  buf = c.sctp->readOutgoing();
                 c.dtls->writeDatagram(buf);
             });
+            q->connect(c.sctp, &SCTP::Association::newIncomingChannel, q,
+                       [this, componentIndex]() { qDebug("new incoming sctp channel"); });
         }
 
         Connection::Ptr addDataChannel(TransportFeatures channelFeatures, const QString &label, int &componentIndex)
diff --git a/src/xmpp/xmpp-im/jingle-sctp-association_p.cpp b/src/xmpp/xmpp-im/jingle-sctp-association_p.cpp
index 63419c55..035d913c 100644
--- a/src/xmpp/xmpp-im/jingle-sctp-association_p.cpp
+++ b/src/xmpp/xmpp-im/jingle-sctp-association_p.cpp
@@ -21,6 +21,8 @@
 #include "jingle-sctp.h"
 #include "jingle-webrtc-datachannel_p.h"
 
+#define SCTP_DEBUG(msg, ...) qDebug("jingle-sctp: " msg, ##__VA_ARGS__)
+
 namespace XMPP { namespace Jingle { namespace SCTP {
 
     static constexpr int MAX_STREAMS          = 65535; // let's change when we need something but webrtc dc.
@@ -61,7 +63,13 @@ namespace XMPP { namespace Jingle { namespace SCTP {
         qDebug("jignle-sctp: on connecting");
     }
 
-    void AssociationPrivate::OnSctpAssociationConnected(RTC::SctpAssociation *) { qDebug("jignle-sctp: on connected"); }
+    void AssociationPrivate::OnSctpAssociationConnected(RTC::SctpAssociation *)
+    {
+        qDebug("jignle-sctp: on connected");
+        for (auto &channel : channels) {
+            channel.staticCast<WebRTCDataChannel>()->connect();
+        }
+    }
 
     void AssociationPrivate::OnSctpAssociationFailed(RTC::SctpAssociation *) { qDebug("jignle-sctp: on failed"); }
 
@@ -111,7 +119,23 @@ namespace XMPP { namespace Jingle { namespace SCTP {
         reply[0] = DCEP_DATA_CHANNEL_ACK;
         write(reply, streamId, PPID_DCEP);
 
-        emit q->newChannel();
+        emit q->newIncomingChannel();
+    }
+
+    void AssociationPrivate::setIdSelector(IdSelector selector)
+    {
+        switch (selector) {
+        case IdSelector::Even:
+            useOddStreamId = false;
+            if (nextStreamId & 1)
+                nextStreamId++;
+            break;
+        case IdSelector::Odd:
+            useOddStreamId = true;
+            if (!(nextStreamId & 1))
+                nextStreamId++;
+            break;
+        }
     }
 
     bool AssociationPrivate::write(const QByteArray &data, quint16 streamId, quint32 ppid)
@@ -149,6 +173,80 @@ namespace XMPP { namespace Jingle { namespace SCTP {
         return id;
     }
 
+    Connection::Ptr AssociationPrivate::newChannel(Reliability reliable, bool ordered, quint32 reliability,
+                                                   quint16 priority, const QString &label, const QString &protocol)
+    {
+        SCTP_DEBUG("adding new channel");
+        int channelType = int(reliable);
+        if (ordered)
+            channelType |= 0x80;
+        auto channel
+            = QSharedPointer<WebRTCDataChannel>::create(this, channelType, priority, reliability, label, protocol);
+        if (transportConnected) {
+            auto id = takeNextStreamId();
+            if (id == 0xffff)
+                return {};
+            channel->setStreamId(id);
+            channels.insert(id, channel);
+            channelsLeft--;
+            qWarning("TODO negotiate datachannel itself");
+        } else {
+            pendingLocalChannels.enqueue(channel);
+        }
+
+        return channel;
+    }
+
+    QList<Connection::Ptr> AssociationPrivate::allChannels() const
+    {
+        QList<Connection::Ptr> ret;
+        ret.reserve(channels.size() + pendingLocalChannels.size());
+        ret += channels.values();
+        ret += pendingLocalChannels;
+        return ret;
+    }
+
+    Connection::Ptr AssociationPrivate::nextChannel()
+    {
+        if (pendingChannels.empty())
+            return {};
+        return pendingChannels.dequeue();
+    }
+
+    void AssociationPrivate::onTransportConnected()
+    {
+        SCTP_DEBUG("starting sctp association");
+        transportConnected = true;
+        while (pendingLocalChannels.size()) {
+            auto channel = pendingLocalChannels.dequeue().staticCast<WebRTCDataChannel>();
+            auto id      = takeNextStreamId();
+            if (id == 0xffff) { // impossible channel
+                channel->onError(QAbstractSocket::SocketResourceError);
+            } else {
+                channel->setStreamId(id);
+                channels.insert(id, channel);
+                channelsLeft--;
+            }
+        }
+        assoc.TransportConnected();
+    }
+
+    void AssociationPrivate::onTransportError(QAbstractSocket::SocketError error)
+    {
+        transportConnected = false;
+        for (auto &c : channels) {
+            c.staticCast<WebRTCDataChannel>()->onError(error);
+        }
+    }
+
+    void AssociationPrivate::onTransportClosed()
+    {
+        transportConnected = false;
+        for (auto &c : channels) {
+            c.staticCast<WebRTCDataChannel>()->onDisconnected(WebRTCDataChannel::TransportClosed);
+        }
+    }
+
     void AssociationPrivate::onOutgoingData(const QByteArray &data)
     {
         outgoingQueue.enqueue(data);
diff --git a/src/xmpp/xmpp-im/jingle-sctp-association_p.h b/src/xmpp/xmpp-im/jingle-sctp-association_p.h
index 1c6c716e..f5630242 100644
--- a/src/xmpp/xmpp-im/jingle-sctp-association_p.h
+++ b/src/xmpp/xmpp-im/jingle-sctp-association_p.h
@@ -21,6 +21,7 @@
 
 #include "irisnet/noncore/sctp/DepUsrSCTP.hpp"
 #include "irisnet/noncore/sctp/SctpAssociation.hpp"
+#include "jingle-sctp.h"
 
 #include <QHash>
 #include <QQueue>
@@ -68,10 +69,19 @@ namespace XMPP { namespace Jingle { namespace SCTP {
         void OnSctpAssociationBufferedAmount(RTC::SctpAssociation *sctpAssociation, uint32_t len) override;
         void OnSctpStreamClosed(RTC::SctpAssociation *sctpAssociation, uint16_t streamId) override;
 
-        void    handleIncomingDataChannelOpen(const QByteArray &data, quint16 streamId);
-        bool    write(const QByteArray &data, quint16 streamId, quint32 ppid);
-        void    close(quint16 streamId);
-        quint16 takeNextStreamId();
+        void                   handleIncomingDataChannelOpen(const QByteArray &data, quint16 streamId);
+        void                   setIdSelector(IdSelector selector);
+        bool                   write(const QByteArray &data, quint16 streamId, quint32 ppid);
+        void                   close(quint16 streamId);
+        quint16                takeNextStreamId();
+        Connection::Ptr        newChannel(Reliability reliable, bool ordered, quint32 reliability, quint16 priority,
+                                          const QString &label, const QString &protocol);
+        QList<Connection::Ptr> allChannels() const;
+        Connection::Ptr        nextChannel();
+
+        void onTransportConnected();
+        void onTransportError(QAbstractSocket::SocketError error);
+        void onTransportClosed();
 
     private Q_SLOTS:
         void onOutgoingData(const QByteArray &data);
diff --git a/src/xmpp/xmpp-im/jingle-sctp.cpp b/src/xmpp/xmpp-im/jingle-sctp.cpp
index cf51aeed..aadfe56c 100644
--- a/src/xmpp/xmpp-im/jingle-sctp.cpp
+++ b/src/xmpp/xmpp-im/jingle-sctp.cpp
@@ -105,21 +105,7 @@ namespace XMPP { namespace Jingle { namespace SCTP {
 
     Association::~Association() { }
 
-    void Association::setIdSelector(Association::IdSelector selector)
-    {
-        switch (selector) {
-        case IdSelector::Even:
-            d->useOddStreamId = false;
-            if (d->nextStreamId & 1)
-                d->nextStreamId++;
-            break;
-        case IdSelector::Odd:
-            d->useOddStreamId = true;
-            if (!(d->nextStreamId & 1))
-                d->nextStreamId++;
-            break;
-        }
-    }
+    void Association::setIdSelector(IdSelector selector) { d->setIdSelector(selector); }
 
     QByteArray Association::readOutgoing()
     {
@@ -138,77 +124,20 @@ namespace XMPP { namespace Jingle { namespace SCTP {
 
     int Association::pendingChannels() const { return d->pendingChannels.size(); }
 
-    Connection::Ptr Association::nextChannel()
-    {
-        if (d->pendingChannels.empty())
-            return {};
-        return d->pendingChannels.dequeue();
-    }
+    Connection::Ptr Association::nextChannel() { return d->nextChannel(); }
 
     Connection::Ptr Association::newChannel(Reliability reliable, bool ordered, quint32 reliability, quint16 priority,
                                             const QString &label, const QString &protocol)
     {
-        int channelType = int(reliable);
-        if (ordered)
-            channelType |= 0x80;
-        auto channel
-            = QSharedPointer<WebRTCDataChannel>::create(d.data(), channelType, priority, reliability, label, protocol);
-        if (d->transportConnected) {
-            auto id = d->takeNextStreamId();
-            if (id == 0xffff)
-                return {};
-            channel->setStreamId(id);
-            d->channels.insert(id, channel);
-            d->channelsLeft--;
-            qWarning("TODO negotiate datachannel itself");
-        } else {
-            d->pendingLocalChannels.enqueue(channel);
-        }
-
-        return channel;
+        return d->newChannel(reliable, ordered, reliability, priority, label, protocol);
     }
 
-    QList<Connection::Ptr> Association::channels() const
-    {
-        QList<Connection::Ptr> ret;
-        ret.reserve(d->channels.size() + d->pendingLocalChannels.size());
-        ret += d->channels.values();
-        ret += d->pendingLocalChannels;
-        return ret;
-    }
+    QList<Connection::Ptr> Association::channels() const { return d->allChannels(); }
 
-    void Association::onTransportConnected()
-    {
-        SCTP_DEBUG("starting sctp association");
-        d->transportConnected = true;
-        while (d->pendingLocalChannels.size()) {
-            auto channel = d->pendingLocalChannels.dequeue().staticCast<WebRTCDataChannel>();
-            auto id      = d->takeNextStreamId();
-            if (id == 0xffff) { // impossible channel
-                channel->onError(QAbstractSocket::SocketResourceError);
-            } else {
-                channel->setStreamId(id);
-                d->channels.insert(id, channel);
-                d->channelsLeft--;
-            }
-        }
-        d->assoc.TransportConnected();
-    }
+    void Association::onTransportConnected() { d->onTransportConnected(); }
 
-    void Association::onTransportError(QAbstractSocket::SocketError error)
-    {
-        d->transportConnected = false;
-        for (auto &c : d->channels) {
-            c.staticCast<WebRTCDataChannel>()->onError(error);
-        }
-    }
+    void Association::onTransportError(QAbstractSocket::SocketError error) { d->onTransportError(error); }
 
-    void Association::onTransportClosed()
-    {
-        d->transportConnected = false;
-        for (auto &c : d->channels) {
-            c.staticCast<WebRTCDataChannel>()->onDisconnected(WebRTCDataChannel::TransportClosed);
-        }
-    }
+    void Association::onTransportClosed() { d->onTransportClosed(); }
 
 }}}
diff --git a/src/xmpp/xmpp-im/jingle-sctp.h b/src/xmpp/xmpp-im/jingle-sctp.h
index 69add0c5..92dab3dc 100644
--- a/src/xmpp/xmpp-im/jingle-sctp.h
+++ b/src/xmpp/xmpp-im/jingle-sctp.h
@@ -22,6 +22,7 @@
 
 #include "jingle-connection.h"
 
+#include <QAbstractSocket>
 #include <QDomElement>
 #include <QObject>
 #include <QScopedPointer>
@@ -33,6 +34,7 @@ class QDomDocument;
 namespace XMPP { namespace Jingle { namespace SCTP {
     enum class Protocol { None, WebRTCDataChannel };
     enum Reliability { Reliable, PartialRexmit, PartialTimers };
+    enum class IdSelector { Odd, Even };
 
     struct MapElement {
         Protocol protocol = Protocol::None;
@@ -70,8 +72,6 @@ namespace XMPP { namespace Jingle { namespace SCTP {
         Q_OBJECT;
 
     public:
-        enum class IdSelector { Odd, Even };
-
         Association(QObject *parent);
         ~Association();
 

From 05494c6e29dbdf454a2a5f8bd991b6ef1a78592c Mon Sep 17 00:00:00 2001
From: Vitaly Tonkacheyev <Vitozz@users.noreply.github.com>
Date: Thu, 22 Apr 2021 08:18:51 +0300
Subject: [PATCH 292/383] Refactoring (#63)

* Code refactoring using clion. Added fix-codestyle target to CMake targets.

* Codestyle fixed

* Refactoring using clazy analysis. Added missed emit keywords
---
 .clang-format                                 |   9 +
 CMakeLists.txt                                |   3 +
 cmake/modules/fix-codestyle.cmake             |  31 +
 qcm/b2.qcm                                    |  35 +-
 qcm/buildmode.qcm                             | 321 +++++------
 qcm/extra.qcm                                 | 108 ++--
 qcm/qjdns.qcm                                 |  84 ++-
 qcm/qt42.qcm                                  |  25 +-
 qcm/universal.qcm                             |  48 +-
 qcm/zlib.qcm                                  |  73 ++-
 src/irisnet/corelib/irisnetglobal.cpp         |   5 +-
 src/irisnet/corelib/netinterface_qtnet.cpp    |   2 +-
 src/irisnet/corelib/netinterface_unix.cpp     |   6 +-
 src/irisnet/corelib/netnames.cpp              |   8 +-
 src/irisnet/corelib/netnames_jdns.cpp         |  22 +-
 src/irisnet/corelib/objectsession.cpp         |   8 +-
 src/irisnet/noncore/cutestuff/bsocket.cpp     |   5 +-
 src/irisnet/noncore/cutestuff/bytestream.cpp  |   8 +-
 src/irisnet/noncore/cutestuff/httpconnect.cpp |  20 +-
 src/irisnet/noncore/cutestuff/httpconnect.h   |   2 +-
 src/irisnet/noncore/cutestuff/httppoll.cpp    |  63 ++-
 src/irisnet/noncore/cutestuff/httppoll.h      |  11 +-
 src/irisnet/noncore/cutestuff/socks.cpp       |  86 +--
 src/irisnet/noncore/cutestuff/socks.h         |   4 +-
 src/irisnet/noncore/ice176.cpp                |  26 +-
 src/irisnet/noncore/iceagent.cpp              |   2 +-
 src/irisnet/noncore/icecomponent.cpp          |   2 +-
 src/irisnet/noncore/icecomponent.h            |   8 +-
 src/irisnet/noncore/icelocaltransport.cpp     |  12 +-
 src/irisnet/noncore/icelocaltransport.h       |   2 +-
 src/irisnet/noncore/icetransport.h            |   2 +-
 src/irisnet/noncore/iceturntransport.cpp      |   8 +-
 src/irisnet/noncore/iceturntransport.h        |   2 +-
 src/irisnet/noncore/legacy/srvresolver.cpp    |  22 +-
 src/irisnet/noncore/processquit.cpp           |   2 +-
 src/irisnet/noncore/stunallocate.cpp          |  17 +-
 src/irisnet/noncore/stunallocate.h            |   8 +-
 src/irisnet/noncore/stunmessage.cpp           |  48 +-
 src/irisnet/noncore/stuntransaction.cpp       |   7 +-
 src/irisnet/noncore/stuntypes.cpp             |   9 +-
 src/irisnet/noncore/stunutil.cpp              |  28 +-
 src/irisnet/noncore/turnclient.cpp            |   6 +-
 src/irisnet/noncore/turnclient.h              |   2 +-
 src/irisnet/noncore/udpportreserver.cpp       |   2 +-
 src/xmpp/blake2/blake2b-ref.c                 | 535 +++++++++---------
 src/xmpp/blake2/blake2qt.cpp                  |  10 +-
 src/xmpp/blake2/blake2s-ref.c                 | 522 +++++++++--------
 src/xmpp/jid/jid.cpp                          |   5 +-
 src/xmpp/xmpp-core/compressionhandler.cpp     |   2 +-
 src/xmpp/xmpp-core/connector.cpp              |  12 +-
 src/xmpp/xmpp-core/protocol.cpp               |  24 +-
 src/xmpp/xmpp-core/securestream.cpp           |  40 +-
 src/xmpp/xmpp-core/simplesasl.cpp             |   8 +-
 src/xmpp/xmpp-core/sm.cpp                     |   4 +-
 src/xmpp/xmpp-core/stream.cpp                 |  66 +--
 src/xmpp/xmpp-core/tlshandler.cpp             |  17 +-
 src/xmpp/xmpp-core/xmpp_stanza.cpp            |   2 +-
 src/xmpp/xmpp-im/client.cpp                   |  29 +-
 src/xmpp/xmpp-im/filetransfer.cpp             |  26 +-
 src/xmpp/xmpp-im/httpfileupload.cpp           |   2 +-
 src/xmpp/xmpp-im/httpfileupload.h             |   2 +-
 src/xmpp/xmpp-im/jingle-ibb.cpp               |   2 +-
 src/xmpp/xmpp-im/jingle-ice.cpp               |   4 +-
 src/xmpp/xmpp-im/jingle-s5b.cpp               |   2 +-
 src/xmpp/xmpp-im/s5b.cpp                      |  81 ++-
 src/xmpp/xmpp-im/s5b.h                        |   2 +-
 src/xmpp/xmpp-im/types.cpp                    |   6 +-
 src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp        |   2 +-
 src/xmpp/xmpp-im/xmpp_caps.cpp                |   4 +-
 src/xmpp/xmpp-im/xmpp_ibb.cpp                 |  12 +-
 src/xmpp/xmpp-im/xmpp_message.h               |   4 +-
 src/xmpp/xmpp-im/xmpp_task.cpp                |   4 +-
 src/xmpp/xmpp-im/xmpp_tasks.cpp               |   6 +-
 src/xmpp/xmpp-im/xmpp_vcard.cpp               |  22 +-
 src/xmpp/xmpp-im/xmpp_xmlcommon.cpp           |  16 +-
 src/xmpp/zlib/zlibcompressor.cpp              |   2 +-
 src/xmpp/zlib/zlibdecompressor.cpp            |   2 +-
 tools/nettool/main.cpp                        |   2 +-
 78 files changed, 1299 insertions(+), 1382 deletions(-)
 create mode 100644 .clang-format
 create mode 100644 cmake/modules/fix-codestyle.cmake

diff --git a/.clang-format b/.clang-format
new file mode 100644
index 00000000..41b5a26c
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,9 @@
+BasedOnStyle: WebKit
+BreakConstructorInitializers: AfterColon
+PointerAlignment: Right
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: true
+AlignConsecutiveDeclarations: true
+AlignTrailingComments: true
+ColumnLimit: 120
+CompactNamespaces: true
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c3c61ab8..b2ee7056 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -258,3 +258,6 @@ add_subdirectory(src/xmpp)
 if(BUILD_IRIS_TOOLS)
     add_subdirectory(tools)
 endif()
+if(NOT IS_SUBPROJECT)
+    include(cmake/modules/fix-codestyle.cmake)
+endif()
diff --git a/cmake/modules/fix-codestyle.cmake b/cmake/modules/fix-codestyle.cmake
new file mode 100644
index 00000000..c23eb8c0
--- /dev/null
+++ b/cmake/modules/fix-codestyle.cmake
@@ -0,0 +1,31 @@
+cmake_minimum_required( VERSION 3.2.0 )
+
+#Find clang-format binary
+find_program(CLF_BIN clang-format DOC "Path to clang-format binary")
+if(CLF_BIN)
+    #Obtain list of source files
+    file(GLOB_RECURSE SRC_LIST
+        *.c
+        *.cc
+        *.cpp
+        *.hpp
+        *.h
+        *.mm
+        qcm/*.qcm
+    )
+    foreach(src_file ${SRC_LIST})
+        #Exclude libpsi
+        if("${src_file}" MATCHES ".*/jdns/.*")
+            list(REMOVE_ITEM SRC_LIST ${src_file})
+        endif()
+    endforeach()
+    add_custom_target(fix-codestyle
+        COMMAND ${CLF_BIN}
+        --verbose
+        -style=file
+        -i ${SRC_LIST}
+        WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+        COMMENT "Fix codestyle with clang-format"
+        VERBATIM
+    )
+endif()
diff --git a/qcm/b2.qcm b/qcm/b2.qcm
index e01c072e..fd50d855 100644
--- a/qcm/b2.qcm
+++ b/qcm/b2.qcm
@@ -9,15 +9,15 @@ arg: with-b2-lib=[path],Path to libb2 library or framework files
 //----------------------------------------------------------------------------
 // qc_b2
 //----------------------------------------------------------------------------
-class qc_b2 : public ConfObj
-{
+class qc_b2 : public ConfObj {
     bool use_system = false;
+
 public:
-    qc_b2(Conf *c) : ConfObj(c) {}
+    qc_b2(Conf *c) : ConfObj(c) { }
     QString name() const { return "LibB2"; }
     QString shortname() const { return "libb2"; }
-    QString resultString() const { return use_system? "system":"bundled"; }
-    bool exec()
+    QString resultString() const { return use_system ? "system" : "bundled"; }
+    bool    exec()
     {
         QString b2_incdir, b2_libdir;
         b2_incdir = conf->getenv("QC_WITH_B2_INC");
@@ -31,14 +31,13 @@ public:
             use_system = true;
         } else {
             QStringList incs;
-            QString version, libs, other;
-            if(conf->findPkgConfig("libb2", VersionAny, QString::null, &version, &incs, &libs, &other))
-            {
-                    for(int n = 0; n < incs.count(); ++n)
-                            conf->addIncludePath(incs[n]);
-                    if(!libs.isEmpty())
-                            conf->addLib(libs);
-                    use_system = true;
+            QString     version, libs, other;
+            if (conf->findPkgConfig("libb2", VersionAny, QString::null, &version, &incs, &libs, &other)) {
+                for (int n = 0; n < incs.count(); ++n)
+                    conf->addIncludePath(incs[n]);
+                if (!libs.isEmpty())
+                    conf->addLib(libs);
+                use_system = true;
             }
         }
 
@@ -51,15 +50,15 @@ public:
 
     bool checkCustomDirs(QString &b2_incdir, QString &b2_libdir)
     {
-        if ((b2_incdir.isEmpty() && !conf->findHeader("blake2.h", QStringList(), &b2_incdir)) ||
-            (!b2_incdir.isEmpty() && !conf->checkHeader(b2_incdir, "blake2.h"))) {
+        if ((b2_incdir.isEmpty() && !conf->findHeader("blake2.h", QStringList(), &b2_incdir))
+            || (!b2_incdir.isEmpty() && !conf->checkHeader(b2_incdir, "blake2.h"))) {
             printf("Headers not found!\n");
             return false;
         }
 
-        if((!b2_libdir.isEmpty() && conf->checkLibrary(b2_libdir, "b2")) ||
-           (b2_libdir.isEmpty() && conf->findLibrary("b2", &b2_libdir))) {
-            conf->addLib(b2_libdir.isEmpty()? "-lb2" : QString("-L%1 -lb2").arg(b2_libdir));
+        if ((!b2_libdir.isEmpty() && conf->checkLibrary(b2_libdir, "b2"))
+            || (b2_libdir.isEmpty() && conf->findLibrary("b2", &b2_libdir))) {
+            conf->addLib(b2_libdir.isEmpty() ? "-lb2" : QString("-L%1 -lb2").arg(b2_libdir));
             conf->addIncludePath(b2_incdir);
             return true;
         }
diff --git a/qcm/buildmode.qcm b/qcm/buildmode.qcm
index 74da89bc..2f4836fd 100644
--- a/qcm/buildmode.qcm
+++ b/qcm/buildmode.qcm
@@ -13,189 +13,172 @@ arg: framework,Build as a Mac framework (default).
 */
 
 #define QC_BUILDMODE
-bool qc_buildmode_release = false;
-bool qc_buildmode_debug = false;
-bool qc_buildmode_framework = false;
+bool qc_buildmode_release             = false;
+bool qc_buildmode_debug               = false;
+bool qc_buildmode_framework           = false;
 bool qc_buildmode_separate_debug_info = false;
 
-class qc_buildmode : public ConfObj
-{
+class qc_buildmode : public ConfObj {
 public:
-	qc_buildmode(Conf *c) : ConfObj(c) {}
-	QString name() const { return "buildmode"; }
-	QString shortname() const { return "buildmode"; }
-
-	// no output
-	QString checkString() const { return QString(); }
-
-	bool exec()
-	{
-		// first, parse out the options
-		bool opt_release = false;
-		bool opt_debug = false;
-		bool opt_debug_and_release = false;
-		bool opt_no_framework = false;
-		bool opt_framework = false;
-		bool opt_no_separate_debug_info = false;
-		bool opt_separate_debug_info = false;
-
-		if(conf->getenv("QC_RELEASE") == "Y")
-			opt_release = true;
-		if(conf->getenv("QC_DEBUG") == "Y")
-			opt_debug = true;
-		if(conf->getenv("QC_DEBUG_AND_RELEASE") == "Y")
-			opt_debug_and_release = true;
-		if(conf->getenv("QC_NO_FRAMEWORK") == "Y")
-			opt_no_framework = true;
-		if(conf->getenv("QC_FRAMEWORK") == "Y")
-			opt_framework = true;
-		if(conf->getenv("QC_NO_SEPARATE_DEBUG_INFO") == "Y")
-			opt_no_separate_debug_info = true;
-		if(conf->getenv("QC_SEPARATE_DEBUG_INFO") == "Y")
-			opt_separate_debug_info = true;
-
-		bool staticmode = false;
-		if(conf->getenv("QC_STATIC") == "Y")
-			staticmode = true;
+    qc_buildmode(Conf *c) : ConfObj(c) { }
+    QString name() const { return "buildmode"; }
+    QString shortname() const { return "buildmode"; }
+
+    // no output
+    QString checkString() const { return QString(); }
+
+    bool exec()
+    {
+        // first, parse out the options
+        bool opt_release                = false;
+        bool opt_debug                  = false;
+        bool opt_debug_and_release      = false;
+        bool opt_no_framework           = false;
+        bool opt_framework              = false;
+        bool opt_no_separate_debug_info = false;
+        bool opt_separate_debug_info    = false;
+
+        if (conf->getenv("QC_RELEASE") == "Y")
+            opt_release = true;
+        if (conf->getenv("QC_DEBUG") == "Y")
+            opt_debug = true;
+        if (conf->getenv("QC_DEBUG_AND_RELEASE") == "Y")
+            opt_debug_and_release = true;
+        if (conf->getenv("QC_NO_FRAMEWORK") == "Y")
+            opt_no_framework = true;
+        if (conf->getenv("QC_FRAMEWORK") == "Y")
+            opt_framework = true;
+        if (conf->getenv("QC_NO_SEPARATE_DEBUG_INFO") == "Y")
+            opt_no_separate_debug_info = true;
+        if (conf->getenv("QC_SEPARATE_DEBUG_INFO") == "Y")
+            opt_separate_debug_info = true;
+
+        bool staticmode = false;
+        if (conf->getenv("QC_STATIC") == "Y")
+            staticmode = true;
 
 #ifndef Q_OS_MAC
-		if(opt_debug_and_release)
-		{
-			printf("\nError: The --debug-and-release option is for mac only.\n");
-			exit(1);
-		}
-
-		if(opt_framework)
-		{
-			printf("\nError: The --framework option is for mac only.\n");
-			exit(1);
-		}
+        if (opt_debug_and_release) {
+            printf("\nError: The --debug-and-release option is for mac only.\n");
+            exit(1);
+        }
+
+        if (opt_framework) {
+            printf("\nError: The --framework option is for mac only.\n");
+            exit(1);
+        }
 #endif
 
-		if(opt_framework && opt_debug)
-		{
-			printf("\nError: Cannot use both --framework and --debug.\n");
-			exit(1);
-		}
-
-		// sanity check exclusive options
-		int x;
-
-		// build mode
-		x = 0;
-		if(opt_release)
-			++x;
-		if(opt_debug)
-			++x;
-		if(opt_debug_and_release)
-			++x;
-		if(x > 1)
-		{
-			printf("\nError: Use only one of --release, --debug, or --debug-and-release.\n");
-			exit(1);
-		}
-
-		// framework
-		if(opt_framework && staticmode)
-		{
-			printf("\nError: Cannot use both --framework and --static.\n");
-			exit(1);
-		}
-
-		x = 0;
-		if(opt_no_framework)
-			++x;
-		if(opt_framework)
-			++x;
-		if(x > 1)
-		{
-			printf("\nError: Use only one of --framework or --no-framework.\n");
-			exit(1);
-		}
-
-		// debug info
-		x = 0;
-		if(opt_no_separate_debug_info)
-			++x;
-		if(opt_separate_debug_info)
-			++x;
-		if(x > 1)
-		{
-			printf("\nError: Use only one of --separate-debug-info or --no-separate-debug-info\n");
-			exit(1);
-		}
-
-		// now process the options
-
-		if(opt_release)
-			qc_buildmode_release = true;
-		else if(opt_debug)
-			qc_buildmode_debug = true;
-		else if(opt_debug_and_release)
-		{
-			qc_buildmode_release = true;
-			qc_buildmode_debug = true;
-		}
-		else // default
-			qc_buildmode_release = true;
-
-		if(opt_framework)
-			qc_buildmode_framework = true;
-		else if(opt_no_framework)
-		{
-			// nothing to do
-		}
-		else // default
-		{
-			if(!staticmode && !opt_debug)
-				qc_buildmode_framework = true;
-		}
-
-		if(opt_separate_debug_info)
-			qc_buildmode_separate_debug_info = true;
-		else if(opt_no_separate_debug_info)
-		{
-			// nothing to do
-		}
-		else // default
-		{
+        if (opt_framework && opt_debug) {
+            printf("\nError: Cannot use both --framework and --debug.\n");
+            exit(1);
+        }
+
+        // sanity check exclusive options
+        int x;
+
+        // build mode
+        x = 0;
+        if (opt_release)
+            ++x;
+        if (opt_debug)
+            ++x;
+        if (opt_debug_and_release)
+            ++x;
+        if (x > 1) {
+            printf("\nError: Use only one of --release, --debug, or --debug-and-release.\n");
+            exit(1);
+        }
+
+        // framework
+        if (opt_framework && staticmode) {
+            printf("\nError: Cannot use both --framework and --static.\n");
+            exit(1);
+        }
+
+        x = 0;
+        if (opt_no_framework)
+            ++x;
+        if (opt_framework)
+            ++x;
+        if (x > 1) {
+            printf("\nError: Use only one of --framework or --no-framework.\n");
+            exit(1);
+        }
+
+        // debug info
+        x = 0;
+        if (opt_no_separate_debug_info)
+            ++x;
+        if (opt_separate_debug_info)
+            ++x;
+        if (x > 1) {
+            printf("\nError: Use only one of --separate-debug-info or --no-separate-debug-info\n");
+            exit(1);
+        }
+
+        // now process the options
+
+        if (opt_release)
+            qc_buildmode_release = true;
+        else if (opt_debug)
+            qc_buildmode_debug = true;
+        else if (opt_debug_and_release) {
+            qc_buildmode_release = true;
+            qc_buildmode_debug   = true;
+        } else // default
+            qc_buildmode_release = true;
+
+        if (opt_framework)
+            qc_buildmode_framework = true;
+        else if (opt_no_framework) {
+            // nothing to do
+        } else // default
+        {
+            if (!staticmode && !opt_debug)
+                qc_buildmode_framework = true;
+        }
+
+        if (opt_separate_debug_info)
+            qc_buildmode_separate_debug_info = true;
+        else if (opt_no_separate_debug_info) {
+            // nothing to do
+        } else // default
+        {
 #ifndef Q_OS_MAC
-			qc_buildmode_separate_debug_info = true;
+            qc_buildmode_separate_debug_info = true;
 #endif
-		}
-
-		// make the string
-		QStringList opts;
-		QString other;
-
-		if(qc_buildmode_release && qc_buildmode_debug)
-		{
-			opts += "debug_and_release";
-			opts += "build_all";
-		}
-		else if(qc_buildmode_release)
-			opts += "release";
-		else // qc_buildmode_debug
-			opts += "debug";
+        }
+
+        // make the string
+        QStringList opts;
+        QString     other;
+
+        if (qc_buildmode_release && qc_buildmode_debug) {
+            opts += "debug_and_release";
+            opts += "build_all";
+        } else if (qc_buildmode_release)
+            opts += "release";
+        else // qc_buildmode_debug
+            opts += "debug";
 
 #ifdef Q_OS_MAC
-		if(qc_buildmode_framework)
-			opts += "lib_bundle";
+        if (qc_buildmode_framework)
+            opts += "lib_bundle";
 #endif
 
-		if(qc_buildmode_separate_debug_info)
-		{
-			opts += "separate_debug_info";
-			other += "QMAKE_CFLAGS += -g\n";
-			other += "QMAKE_CXXFLAGS += -g\n";
-		}
+        if (qc_buildmode_separate_debug_info) {
+            opts += "separate_debug_info";
+            other += "QMAKE_CFLAGS += -g\n";
+            other += "QMAKE_CXXFLAGS += -g\n";
+        }
 
-		QString str = QString("CONFIG += ") + opts.join(" ") + '\n';
-		conf->addExtra(str);
+        QString str = QString("CONFIG += ") + opts.join(" ") + '\n';
+        conf->addExtra(str);
 
-		if(!other.isEmpty())
-			conf->addExtra(other);
+        if (!other.isEmpty())
+            conf->addExtra(other);
 
-		return true;
-	}
+        return true;
+    }
 };
diff --git a/qcm/extra.qcm b/qcm/extra.qcm
index 8d7b803b..0ad08253 100644
--- a/qcm/extra.qcm
+++ b/qcm/extra.qcm
@@ -6,77 +6,73 @@ arg: enable-tests,Build examples and unittests.
 -----END QCMOD-----
 */
 
-class qc_extra : public ConfObj
-{
+class qc_extra : public ConfObj {
 public:
-	qc_extra(Conf *c) : ConfObj(c) {}
-	QString name() const { return "extra"; }
-	QString shortname() const { return "extra"; }
+    qc_extra(Conf *c) : ConfObj(c) { }
+    QString name() const { return "extra"; }
+    QString shortname() const { return "extra"; }
 
-	// no output
-	QString checkString() const { return QString(); }
+    // no output
+    QString checkString() const { return QString(); }
 
-	bool exec()
-	{
-		QString str;
-		QFile f;
+    bool exec()
+    {
+        QString str;
+        QFile   f;
 
-		if(conf->getenv("QC_ENABLE_TESTS") == "Y")
-			str += "CONFIG += iris_tests\n";
+        if (conf->getenv("QC_ENABLE_TESTS") == "Y")
+            str += "CONFIG += iris_tests\n";
 
-		conf->addExtra(str);
+        conf->addExtra(str);
 
-		bool release = true;
-		bool debug = false;
-		bool debug_info = false;
-		bool universal = false;
-		QString sdk;
+        bool    release    = true;
+        bool    debug      = false;
+        bool    debug_info = false;
+        bool    universal  = false;
+        QString sdk;
 
 #ifdef QC_BUILDMODE
-		release = qc_buildmode_release;
-		debug = qc_buildmode_debug;
-		debug_info = qc_buildmode_separate_debug_info;
+        release    = qc_buildmode_release;
+        debug      = qc_buildmode_debug;
+        debug_info = qc_buildmode_separate_debug_info;
 #endif
 
 #ifdef QC_UNIVERSAL
-		universal = qc_universal_enabled;
-		sdk = qc_universal_sdk;
+        universal = qc_universal_enabled;
+        sdk       = qc_universal_sdk;
 #endif
 
-		// write confapp_unix.pri
-		str = QString();
-                QString var = conf->getenv("BINDIR");
-                if(!var.isEmpty())
-			str += QString("BINDIR = %1\n").arg(var);
-		if(debug) // debug or debug-and-release
-			str += QString("CONFIG += debug\n");
-		else // release
-			str += QString("CONFIG += release\n");
-		if(debug_info)
-		{
-			str += QString("CONFIG += separate_debug_info\n");
-			str += "QMAKE_CFLAGS += -g\n";
-			str += "QMAKE_CXXFLAGS += -g\n";
-		}
-		if(universal)
-		{
-			str +=
-			"contains(QT_CONFIG,x86):contains(QT_CONFIG,ppc) {\n"
-			"	CONFIG += x86 ppc\n"
-			"}\n";
+        // write confapp_unix.pri
+        str         = QString();
+        QString var = conf->getenv("BINDIR");
+        if (!var.isEmpty())
+            str += QString("BINDIR = %1\n").arg(var);
+        if (debug) // debug or debug-and-release
+            str += QString("CONFIG += debug\n");
+        else // release
+            str += QString("CONFIG += release\n");
+        if (debug_info) {
+            str += QString("CONFIG += separate_debug_info\n");
+            str += "QMAKE_CFLAGS += -g\n";
+            str += "QMAKE_CXXFLAGS += -g\n";
+        }
+        if (universal) {
+            str += "contains(QT_CONFIG,x86):contains(QT_CONFIG,ppc) {\n"
+                   "	CONFIG += x86 ppc\n"
+                   "}\n";
 
-			if(!sdk.isEmpty())
-				str += QString("QMAKE_MAC_SDK = %1\n").arg(sdk);
-		}
+            if (!sdk.isEmpty())
+                str += QString("QMAKE_MAC_SDK = %1\n").arg(sdk);
+        }
 #ifdef QC_QCA
-		if(!qc_qca_procode.isEmpty())
-			str += qc_qca_procode;
+        if (!qc_qca_procode.isEmpty())
+            str += qc_qca_procode;
 #endif
-		f.setFileName("confapp_unix.pri");
-		if(f.open(QFile::WriteOnly | QFile::Truncate))
-			f.write(str.toLatin1());
-		f.close();
+        f.setFileName("confapp_unix.pri");
+        if (f.open(QFile::WriteOnly | QFile::Truncate))
+            f.write(str.toLatin1());
+        f.close();
 
-		return true;
-	}
+        return true;
+    }
 };
diff --git a/qcm/qjdns.qcm b/qcm/qjdns.qcm
index 10c9a96d..4e1769fd 100644
--- a/qcm/qjdns.qcm
+++ b/qcm/qjdns.qcm
@@ -9,63 +9,61 @@ arg: with-qjdns-lib=[path],Path to QJDns library files
 //----------------------------------------------------------------------------
 // qc_qjdns
 //----------------------------------------------------------------------------
-class qc_qjdns : public ConfObj
-{
+class qc_qjdns : public ConfObj {
 public:
-	qc_qjdns(Conf *c) : ConfObj(c) {}
-	QString name() const { return "QJDns"; }
-	QString shortname() const { return "qjdns"; }
-	QString resultString() const
-	{
+    qc_qjdns(Conf *c) : ConfObj(c) { }
+    QString name() const { return "QJDns"; }
+    QString shortname() const { return "qjdns"; }
+    QString resultString() const
+    {
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-		return "Disabled for Qt5 and above";
+        return "Disabled for Qt5 and above";
 #else
-		return ConfObj::resultString();
+        return ConfObj::resultString();
 #endif
-	}
-	bool exec()
-	{
+    }
+    bool exec()
+    {
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-		return true; // hack. TODO: figure out how to force jdns
+        return true; // hack. TODO: figure out how to force jdns
 #endif
-		conf->addExtra("CONFIG += need_jdns");
+        conf->addExtra("CONFIG += need_jdns");
 #if defined Q_OS_WIN || defined Q_OS_MAC
-		// HACK: on Windows and Mac OS X, always use psi's bundled qjdns
-		conf->addExtra("CONFIG += iris-qjdns");
-		return true;
+        // HACK: on Windows and Mac OS X, always use psi's bundled qjdns
+        conf->addExtra("CONFIG += iris-qjdns");
+        return true;
 #else
-		QStringList incs;
-		QString version, libs, other;
-		QString s;
+        QStringList incs;
+        QString     version, libs, other;
+        QString     s;
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-		bool found = conf->findPkgConfig("qjdns-qt5", VersionMin, "2.0.3", &version, &incs, &libs, &other);
+        bool        found = conf->findPkgConfig("qjdns-qt5", VersionMin, "2.0.3", &version, &incs, &libs, &other);
 #else
-		bool found = conf->findPkgConfig("qjdns-qt4", VersionMin, "2.0.3", &version, &incs, &libs, &other);
+        bool found = conf->findPkgConfig("qjdns-qt4", VersionMin, "2.0.3", &version, &incs, &libs, &other);
 #endif
-		if(!found && !conf->findPkgConfig("qjdns", VersionMin, "2.0.0", &version, &incs, &libs, &other)) {
-			s = conf->getenv("QC_WITH_QJDNS_INC");
-			if ((!s.isEmpty() && conf->checkHeader(s, "qjdns.h")) ||
-				(s.isEmpty() && conf->findHeader("qjdns.h", QStringList(), &s))) {
-				incs.append(s);
-			}
+        if (!found && !conf->findPkgConfig("qjdns", VersionMin, "2.0.0", &version, &incs, &libs, &other)) {
+            s = conf->getenv("QC_WITH_QJDNS_INC");
+            if ((!s.isEmpty() && conf->checkHeader(s, "qjdns.h"))
+                || (s.isEmpty() && conf->findHeader("qjdns.h", QStringList(), &s))) {
+                incs.append(s);
+            }
 
-			s = conf->getenv("QC_WITH_QJDNS_LIB");
-			if((!s.isEmpty() && conf->checkLibrary(s, "qjdns")) ||
-			   (s.isEmpty() && conf->findLibrary("qjdns", &s))) {
-				libs = s.isEmpty()? "-lqjdns -ljdns" : QString("-L%1 -lqjdns -ljdns").arg(s);
-			}
-		}
+            s = conf->getenv("QC_WITH_QJDNS_LIB");
+            if ((!s.isEmpty() && conf->checkLibrary(s, "qjdns")) || (s.isEmpty() && conf->findLibrary("qjdns", &s))) {
+                libs = s.isEmpty() ? "-lqjdns -ljdns" : QString("-L%1 -lqjdns -ljdns").arg(s);
+            }
+        }
 
-		if (!incs.isEmpty() && !libs.isEmpty()) {
-			foreach(const QString &inc, incs) {
-				conf->addIncludePath(inc);
-			}
-			conf->addLib(libs);
-			conf->addExtra("CONFIG += ext-qjdns");
-		}
+        if (!incs.isEmpty() && !libs.isEmpty()) {
+            foreach (const QString &inc, incs) {
+                conf->addIncludePath(inc);
+            }
+            conf->addLib(libs);
+            conf->addExtra("CONFIG += ext-qjdns");
+        }
 
-		return true;
+        return true;
 #endif
-	}
+    }
 };
diff --git a/qcm/qt42.qcm b/qcm/qt42.qcm
index 753de7cf..2a97da17 100644
--- a/qcm/qt42.qcm
+++ b/qcm/qt42.qcm
@@ -3,18 +3,17 @@
 name: Qt >= 4.2
 -----END QCMOD-----
 */
-class qc_qt42 : public ConfObj
-{
+class qc_qt42 : public ConfObj {
 public:
-	qc_qt42(Conf *c) : ConfObj(c) {}
-	QString name() const { return "Qt >= 4.2"; }
-	QString shortname() const { return "qt42"; }
-	bool exec()
-	{
-		conf->debug(QString("QT_VERSION = 0x%1").arg(QString::number(QT_VERSION, 16)));
-		if(QT_VERSION >= 0x040200)
-			return true;
-		else
-			return false;
-	}
+    qc_qt42(Conf *c) : ConfObj(c) { }
+    QString name() const { return "Qt >= 4.2"; }
+    QString shortname() const { return "qt42"; }
+    bool    exec()
+    {
+        conf->debug(QString("QT_VERSION = 0x%1").arg(QString::number(QT_VERSION, 16)));
+        if (QT_VERSION >= 0x040200)
+            return true;
+        else
+            return false;
+    }
 };
diff --git a/qcm/universal.qcm b/qcm/universal.qcm
index 5b6f7c4d..5a97c987 100644
--- a/qcm/universal.qcm
+++ b/qcm/universal.qcm
@@ -8,42 +8,38 @@ arg: mac-sdk=[path],Path to Mac universal SDK (PPC host only).
 */
 
 #define QC_UNIVERSAL
-bool qc_universal_enabled = false;
+bool    qc_universal_enabled = false;
 QString qc_universal_sdk;
 
 //----------------------------------------------------------------------------
 // qc_universal
 //----------------------------------------------------------------------------
-class qc_universal : public ConfObj
-{
+class qc_universal : public ConfObj {
 public:
-	qc_universal(Conf *c) : ConfObj(c) {}
-	QString name() const { return "Mac universal binary support"; }
-	QString shortname() const { return "universal"; }
-	QString checkString() const { return QString(); }
+    qc_universal(Conf *c) : ConfObj(c) { }
+    QString name() const { return "Mac universal binary support"; }
+    QString shortname() const { return "universal"; }
+    QString checkString() const { return QString(); }
 
-	bool exec()
-	{
+    bool exec()
+    {
 #ifdef Q_OS_MAC
-		if(qc_getenv("QC_UNIVERSAL") == "Y")
-		{
-			qc_universal_enabled = true;
+        if (qc_getenv("QC_UNIVERSAL") == "Y") {
+            qc_universal_enabled = true;
 
-			QString str =
-			"contains(QT_CONFIG,x86):contains(QT_CONFIG,ppc) {\n"
-			"	CONFIG += x86 ppc\n"
-			"}\n";
+            QString str = "contains(QT_CONFIG,x86):contains(QT_CONFIG,ppc) {\n"
+                          "	CONFIG += x86 ppc\n"
+                          "}\n";
 
-			QString sdk = qc_getenv("QC_MAC_SDK");
-			if(!sdk.isEmpty())
-			{
-				str += QString("QMAKE_MAC_SDK = %1\n").arg(sdk);
-				qc_universal_sdk = sdk;
-			}
+            QString sdk = qc_getenv("QC_MAC_SDK");
+            if (!sdk.isEmpty()) {
+                str += QString("QMAKE_MAC_SDK = %1\n").arg(sdk);
+                qc_universal_sdk = sdk;
+            }
 
-			conf->addExtra(str);
-		}
+            conf->addExtra(str);
+        }
 #endif
-		return true;
-	}
+        return true;
+    }
 };
diff --git a/qcm/zlib.qcm b/qcm/zlib.qcm
index 15b4a5f5..fbed96f5 100644
--- a/qcm/zlib.qcm
+++ b/qcm/zlib.qcm
@@ -9,47 +9,44 @@ arg: with-zlib-lib=[path],Path to zlib library files
 //----------------------------------------------------------------------------
 // qc_zlib
 //----------------------------------------------------------------------------
-class qc_zlib : public ConfObj
-{
+class qc_zlib : public ConfObj {
 public:
-	qc_zlib(Conf *c) : ConfObj(c) {}
-	QString name() const { return "zlib"; }
-	QString shortname() const { return "zlib"; }
-	bool exec()
-	{
-		QString inc, lib;
-		QString s;
+    qc_zlib(Conf *c) : ConfObj(c) { }
+    QString name() const { return "zlib"; }
+    QString shortname() const { return "zlib"; }
+    bool    exec()
+    {
+        QString inc, lib;
+        QString s;
 
-		s = conf->getenv("QC_WITH_ZLIB_INC");
-		if(!s.isEmpty()) {
-			if(!conf->checkHeader(s, "zlib.h"))
-				return false;
-			inc = s;
-		}
-		else {
-			if(!conf->findHeader("zlib.h", QStringList(), &s))
-				return false;
-			inc = s;
-		}
+        s = conf->getenv("QC_WITH_ZLIB_INC");
+        if (!s.isEmpty()) {
+            if (!conf->checkHeader(s, "zlib.h"))
+                return false;
+            inc = s;
+        } else {
+            if (!conf->findHeader("zlib.h", QStringList(), &s))
+                return false;
+            inc = s;
+        }
 
-		s = conf->getenv("QC_WITH_ZLIB_LIB");
-		if(!s.isEmpty()) {
-			if(!conf->checkLibrary(s, "z"))
-				return false;
-			lib = s;
-		}
-		else {
-			if(!conf->findLibrary("z", &s))
-				return false;
-			lib = s;
-		}
+        s = conf->getenv("QC_WITH_ZLIB_LIB");
+        if (!s.isEmpty()) {
+            if (!conf->checkLibrary(s, "z"))
+                return false;
+            lib = s;
+        } else {
+            if (!conf->findLibrary("z", &s))
+                return false;
+            lib = s;
+        }
 
-		if(!inc.isEmpty())
-			conf->addIncludePath(inc);
-		if(!lib.isEmpty())
-			conf->addLib(QString("-L") + s);
-		conf->addLib("-lz");
+        if (!inc.isEmpty())
+            conf->addIncludePath(inc);
+        if (!lib.isEmpty())
+            conf->addLib(QString("-L") + s);
+        conf->addLib("-lz");
 
-		return true;
-	}
+        return true;
+    }
 };
diff --git a/src/irisnet/corelib/irisnetglobal.cpp b/src/irisnet/corelib/irisnetglobal.cpp
index 275fa686..11461560 100644
--- a/src/irisnet/corelib/irisnetglobal.cpp
+++ b/src/irisnet/corelib/irisnetglobal.cpp
@@ -112,10 +112,7 @@ class PluginInstance {
         if (!_instance || !other->_instance)
             return false;
 
-        if (qstrcmp(_instance->metaObject()->className(), other->_instance->metaObject()->className()) != 0)
-            return false;
-
-        return true;
+        return qstrcmp(_instance->metaObject()->className(), other->_instance->metaObject()->className()) == 0;
     }
 };
 
diff --git a/src/irisnet/corelib/netinterface_qtnet.cpp b/src/irisnet/corelib/netinterface_qtnet.cpp
index 6aa95127..2a303ad8 100644
--- a/src/irisnet/corelib/netinterface_qtnet.cpp
+++ b/src/irisnet/corelib/netinterface_qtnet.cpp
@@ -123,7 +123,7 @@ class IrisQtNet : public NetInterfaceProvider {
             Info i;
             i.id         = iface.name();
             i.name       = iface.humanReadableName();
-            i.isLoopback = (iface.flags() & QNetworkInterface::IsLoopBack);
+            i.isLoopback = bool(iface.flags() & QNetworkInterface::IsLoopBack);
             for (auto &ae : iface.addressEntries()) {
                 i.addresses.append(ae.ip());
             }
diff --git a/src/irisnet/corelib/netinterface_unix.cpp b/src/irisnet/corelib/netinterface_unix.cpp
index da1d2cbc..2d7ff31d 100644
--- a/src/irisnet/corelib/netinterface_unix.cpp
+++ b/src/irisnet/corelib/netinterface_unix.cpp
@@ -49,7 +49,7 @@ static QStringList read_proc_as_lines(const char *procfile)
     while (!feof(f)) {
         // max read on a proc is 4K
         QByteArray block(4096, 0);
-        int        ret = fread(block.data(), 1, block.size(), f);
+        int        ret = int(fread(block.data(), 1, size_t(block.size()), f));
         if (ret <= 0)
             break;
         block.resize(ret);
@@ -74,7 +74,7 @@ static QHostAddress linux_ipv6_to_qaddr(const QString &in)
     quint8 raw[16];
     for (int n = 0; n < 16; ++n) {
         bool ok;
-        int  x = in.mid(n * 2, 2).toInt(&ok, 16);
+        int  x = in.midRef(n * 2, 2).toInt(&ok, 16);
         if (!ok)
             return out;
         raw[n] = (quint8)x;
@@ -92,7 +92,7 @@ static QHostAddress linux_ipv4_to_qaddr(const QString &in)
     unsigned char *rawp = (unsigned char *)&raw;
     for (int n = 0; n < 4; ++n) {
         bool ok;
-        int  x = in.mid(n * 2, 2).toInt(&ok, 16);
+        int  x = in.midRef(n * 2, 2).toInt(&ok, 16);
         if (!ok)
             return out;
         rawp[n] = (unsigned char)x;
diff --git a/src/irisnet/corelib/netnames.cpp b/src/irisnet/corelib/netnames.cpp
index 1dd97225..fc990cdc 100644
--- a/src/irisnet/corelib/netnames.cpp
+++ b/src/irisnet/corelib/netnames.cpp
@@ -966,7 +966,7 @@ private slots:
     void provider_resolve_resultsReady(int id, const QList<XMPP::ServiceProvider::ResolveResult> &results)
     {
         ServiceResolver::Private *np = sres_instances.value(id);
-        emit                      np->q->resultReady(results[0].address, results[0].port);
+        emit                      np->q->resultReady(results[0].address, quint16(results[0].port));
     }
 
     void provider_publish_published(int id)
@@ -1039,7 +1039,7 @@ void NameResolver::start(const QByteArray &name, NameRecord::Type type, Mode mod
     int qType = recordType2Rtype(type);
     if (qType == -1)
         qType = JDNS_RTYPE_A;
-    NameManager::instance()->resolve_start(d, name, qType, mode == NameResolver::LongLived ? true : false);
+    NameManager::instance()->resolve_start(d, name, qType, mode == NameResolver::LongLived);
 }
 
 void NameResolver::stop()
@@ -1190,7 +1190,7 @@ void ServiceResolver::start(const QString &service, const QString &transport, co
 
     /* after we tried all SRV hosts, we shall connect directly (if requested) */
     if (port < std::numeric_limits<quint16>::max()) {
-        d->srvList.append(domain.toLocal8Bit(), port);
+        d->srvList.append(domain.toLocal8Bit(), quint16(port));
     } else {
         /* The only "valid" port above the valid port range is our specification of an invalid port */
         Q_ASSERT(port == std::numeric_limits<int>::max());
@@ -1361,7 +1361,7 @@ void ServiceResolver::try_next_srv()
     if (!d->srvList.isEmpty()) {
         XMPP::NameRecord record(d->srvList.takeNext());
         /* lookup host by name and specify port for later use */
-        start(record.name(), record.port());
+        start(record.name(), quint16(record.port()));
     } else {
 #ifdef NETNAMES_DEBUG
         NNDEBUG << "SRV list empty, failing";
diff --git a/src/irisnet/corelib/netnames_jdns.cpp b/src/irisnet/corelib/netnames_jdns.cpp
index d7a2f8ca..b5ce899a 100644
--- a/src/irisnet/corelib/netnames_jdns.cpp
+++ b/src/irisnet/corelib/netnames_jdns.cpp
@@ -204,7 +204,7 @@ class IdManager {
     }
 
 public:
-    IdManager() : at(0) {}
+    IdManager() : at(0) { }
 
     int reserveId()
     {
@@ -327,7 +327,7 @@ class JDnsGlobal : public QObject {
             //   fetching should not trigger any calls to
             //   updateMulticastInterfaces().  only future
             //   activity should do that.
-            for (const QString &id: netman.interfaces()) {
+            for (const QString &id : netman.interfaces()) {
                 NetInterface *iface = new NetInterface(id, &netman);
                 connect(iface, SIGNAL(unavailable()), SLOT(iface_unavailable()));
                 ifaces += iface;
@@ -441,7 +441,7 @@ class JDnsNameProvider : public NameProvider {
         NameResolver::Error error;
         NameResolver::Error localError;
 
-        Item(QObject *parent = 0) : id(-1), req(0), sess(parent), useLocal(false), localResult(false) {}
+        Item(QObject *parent = 0) : id(-1), req(0), sess(parent), useLocal(false), localResult(false) { }
 
         ~Item() { delete req; }
     };
@@ -646,7 +646,7 @@ private slots:
 
         if (req->success()) {
             QList<NameRecord> out;
-            for (const QJDns::Record &r: req->results()) {
+            for (const QJDns::Record &r : req->results()) {
                 // unless we are asking for all types, only
                 //   accept the type we asked for
                 if (i->type == QJDns::Any || r.type == i->type) {
@@ -1507,7 +1507,7 @@ public slots:
             doPublishTxt();
 
         // publish extra records as needed
-        for (JDnsPublishExtra *extra: extraList) {
+        for (JDnsPublishExtra *extra : extraList) {
             if (!extra->have)
                 doPublishExtra(extra);
         }
@@ -1653,7 +1653,7 @@ private slots:
     {
         QJDnsSharedRequest *req   = static_cast<QJDnsSharedRequest *>(sender());
         JDnsPublishExtra *  extra = 0;
-        for (JDnsPublishExtra *e: extraList) {
+        for (JDnsPublishExtra *e : extraList) {
             if (&e->pub == req) {
                 extra = e;
                 break;
@@ -1713,7 +1713,7 @@ class BrowseItem {
     JDnsBrowse *const browse;
     ObjectSession *   sess;
 
-    BrowseItem(int _id, JDnsBrowse *_browse) : id(_id), browse(_browse), sess(0) {}
+    BrowseItem(int _id, JDnsBrowse *_browse) : id(_id), browse(_browse), sess(0) { }
 
     ~BrowseItem()
     {
@@ -1762,7 +1762,7 @@ class ResolveItem {
     JDnsServiceResolve *const resolve;
     ObjectSession *           sess;
 
-    ResolveItem(int _id, JDnsServiceResolve *_resolve) : id(_id), resolve(_resolve), sess(0) {}
+    ResolveItem(int _id, JDnsServiceResolve *_resolve) : id(_id), resolve(_resolve), sess(0) { }
 
     ~ResolveItem()
     {
@@ -1811,7 +1811,7 @@ class PublishItem {
     JDnsPublish *const publish;
     ObjectSession *    sess;
 
-    PublishItem(int _id, JDnsPublish *_publish) : id(_id), publish(_publish), sess(0) {}
+    PublishItem(int _id, JDnsPublish *_publish) : id(_id), publish(_publish), sess(0) { }
 
     ~PublishItem()
     {
@@ -1862,7 +1862,7 @@ class PublishExtraItem {
     JDnsPublishExtra *const publish;
     ObjectSession *         sess;
 
-    PublishExtraItem(int _id, JDnsPublishExtra *_publish) : id(_id), publish(_publish), sess(0) {}
+    PublishExtraItem(int _id, JDnsPublishExtra *_publish) : id(_id), publish(_publish), sess(0) { }
 
     ~PublishExtraItem()
     {
@@ -2181,7 +2181,7 @@ class JDnsServiceProvider : public ServiceProvider {
         // remove all extra publishes associated with this publish.
         //   the association can be checked via QObject parenting.
         QSet<PublishExtraItem *> remove;
-        for (PublishExtraItem *i: publishExtraItemList.items) {
+        for (PublishExtraItem *i : publishExtraItemList.items) {
             if (static_cast<JDnsPublish *>(i->publish->parent()) == pi->publish)
                 remove += i;
         }
diff --git a/src/irisnet/corelib/objectsession.cpp b/src/irisnet/corelib/objectsession.cpp
index 77219a5c..ba784250 100644
--- a/src/irisnet/corelib/objectsession.cpp
+++ b/src/irisnet/corelib/objectsession.cpp
@@ -177,13 +177,7 @@ ObjectSessionWatcher::~ObjectSessionWatcher()
     delete d;
 }
 
-bool ObjectSessionWatcher::isValid() const
-{
-    if (d->sess)
-        return true;
-    else
-        return false;
-}
+bool ObjectSessionWatcher::isValid() const { return d->sess != nullptr; }
 
 ObjectSession::ObjectSession(QObject *parent) : QObject(parent) { d = new ObjectSessionPrivate(this); }
 
diff --git a/src/irisnet/noncore/cutestuff/bsocket.cpp b/src/irisnet/noncore/cutestuff/bsocket.cpp
index f42a3149..6c637209 100644
--- a/src/irisnet/noncore/cutestuff/bsocket.cpp
+++ b/src/irisnet/noncore/cutestuff/bsocket.cpp
@@ -663,11 +663,10 @@ void BSocket::qs_readyRead() { emit readyRead(); }
 
 void BSocket::qs_bytesWritten(qint64 x64)
 {
-    int x = x64;
 #ifdef BS_DEBUG_EXTRA
-    BSDEBUG << "BytesWritten [" << x << "]";
+    BSDEBUG << "BytesWritten [" << x64 << "]";
 #endif
-    emit bytesWritten(x);
+    emit bytesWritten(x64);
 }
 
 void BSocket::qs_error(QAbstractSocket::SocketError x)
diff --git a/src/irisnet/noncore/cutestuff/bytestream.cpp b/src/irisnet/noncore/cutestuff/bytestream.cpp
index 2a0603fe..b9d53ea6 100644
--- a/src/irisnet/noncore/cutestuff/bytestream.cpp
+++ b/src/irisnet/noncore/cutestuff/bytestream.cpp
@@ -79,8 +79,8 @@ qint64 ByteStream::writeData(const char *data, qint64 maxSize)
     if (!isOpen())
         return -1;
 
-    bool doWrite = bytesToWrite() == 0 ? true : false;
-    d->writeBuf.append(data, maxSize);
+    bool doWrite = bytesToWrite() == 0;
+    d->writeBuf.append(data, int(maxSize));
     if (doWrite)
         tryWrite();
     return maxSize;
@@ -92,8 +92,8 @@ qint64 ByteStream::writeData(const char *data, qint64 maxSize)
 qint64 ByteStream::readData(char *data, qint64 maxSize)
 {
     maxSize = maxSize > d->readBuf.size() ? d->readBuf.size() : maxSize;
-    memcpy(data, d->readBuf.constData(), maxSize);
-    d->readBuf.remove(0, maxSize);
+    memcpy(data, d->readBuf.constData(), size_t(maxSize));
+    d->readBuf.remove(0, int(maxSize));
     return maxSize;
 }
 
diff --git a/src/irisnet/noncore/cutestuff/httpconnect.cpp b/src/irisnet/noncore/cutestuff/httpconnect.cpp
index f6d4c22c..6cfb11e6 100644
--- a/src/irisnet/noncore/cutestuff/httpconnect.cpp
+++ b/src/irisnet/noncore/cutestuff/httpconnect.cpp
@@ -80,7 +80,7 @@ static bool extractMainHeader(const QString &line, QString *proto, int *code, QS
     if (n2 == -1)
         return false;
     if (code)
-        *code = line.mid(n, n2 - n).toInt();
+        *code = line.midRef(n, n2 - n).toInt();
     n = n2 + 1;
     if (msg)
         *msg = line.mid(n);
@@ -93,7 +93,7 @@ class HttpConnect::Private {
 
     BSocket sock;
     QString host;
-    int     port;
+    quint16 port;
     QString user, pass;
     QString real_host;
     int     real_port;
@@ -144,7 +144,7 @@ void HttpConnect::setAuth(const QString &user, const QString &pass)
     d->pass = pass;
 }
 
-void HttpConnect::connectToHost(const QString &proxyHost, int proxyPort, const QString &host, int port)
+void HttpConnect::connectToHost(const QString &proxyHost, quint16 proxyPort, const QString &host, int port)
 {
     resetConnection(true);
 
@@ -215,7 +215,7 @@ void HttpConnect::sock_connectionClosed()
 {
     if (d->active) {
         resetConnection();
-        connectionClosed();
+        emit connectionClosed();
     } else {
         setError(ErrProxyNeg);
     }
@@ -225,7 +225,7 @@ void HttpConnect::sock_delayedCloseFinished()
 {
     if (d->active) {
         resetConnection();
-        delayedCloseFinished();
+        emit delayedCloseFinished();
     }
 }
 
@@ -280,12 +280,12 @@ void HttpConnect::sock_readyRead()
 #endif
                     d->active = true;
                     setOpenMode(QIODevice::ReadWrite);
-                    connected();
+                    emit connected();
 
                     if (!d->recvBuf.isEmpty()) {
                         appendRead(d->recvBuf);
                         d->recvBuf.resize(0);
-                        readyRead();
+                        emit readyRead();
                         return;
                     }
                 } else {
@@ -319,7 +319,7 @@ void HttpConnect::sock_readyRead()
         }
     } else {
         appendRead(block);
-        readyRead();
+        emit readyRead();
         return;
     }
 }
@@ -327,7 +327,7 @@ void HttpConnect::sock_readyRead()
 void HttpConnect::sock_bytesWritten(qint64 x)
 {
     if (d->toWrite > 0) {
-        int size = x;
+        int size = int(x);
         if (d->toWrite < x)
             size = d->toWrite;
         d->toWrite -= size;
@@ -335,7 +335,7 @@ void HttpConnect::sock_bytesWritten(qint64 x)
     }
 
     if (d->active && x > 0)
-        bytesWritten(x);
+        emit bytesWritten(x);
 }
 
 void HttpConnect::sock_error(int x)
diff --git a/src/irisnet/noncore/cutestuff/httpconnect.h b/src/irisnet/noncore/cutestuff/httpconnect.h
index 61ef8ed0..04455323 100644
--- a/src/irisnet/noncore/cutestuff/httpconnect.h
+++ b/src/irisnet/noncore/cutestuff/httpconnect.h
@@ -31,7 +31,7 @@ class HttpConnect : public ByteStream {
     ~HttpConnect();
 
     void setAuth(const QString &user, const QString &pass = "");
-    void connectToHost(const QString &proxyHost, int proxyPort, const QString &host, int port);
+    void connectToHost(const QString &proxyHost, quint16 proxyPort, const QString &host, int port);
 
     // from ByteStream
     void   close();
diff --git a/src/irisnet/noncore/cutestuff/httppoll.cpp b/src/irisnet/noncore/cutestuff/httppoll.cpp
index d10ff99a..f75157f6 100644
--- a/src/irisnet/noncore/cutestuff/httppoll.cpp
+++ b/src/irisnet/noncore/cutestuff/httppoll.cpp
@@ -161,7 +161,7 @@ void HttpPoll::connectToHost(const QString &proxyHost, int proxyPort, const QUrl
         fprintf(stderr, ", auth {%s,%s}\n", d->user.latin1(), d->pass.latin1());
 #endif
     QPointer<QObject> self = this;
-    syncStarted();
+    emit              syncStarted();
     if (!self)
         return;
 
@@ -189,8 +189,8 @@ QByteArray HttpPoll::makePacket(const QString &ident, const QString &key, const
 
     QByteArray a;
     a.resize(len + block.size());
-    memcpy(a.data(), cs.data(), len);
-    memcpy(a.data() + len, block.data(), block.size());
+    memcpy(a.data(), cs.data(), size_t(len));
+    memcpy(a.data() + len, block.data(), size_t(block.size()));
     return a;
 }
 
@@ -198,7 +198,7 @@ int HttpPoll::pollInterval() const { return d->polltime; }
 
 void HttpPoll::setPollInterval(int seconds) { d->polltime = seconds; }
 
-bool HttpPoll::isOpen() const { return (d->state == 2 ? true : false); }
+bool HttpPoll::isOpen() const { return d->state == 2; }
 
 void HttpPoll::close()
 {
@@ -215,7 +215,7 @@ void HttpPoll::http_result()
 {
     // check for death :)
     QPointer<QObject> self = this;
-    syncFinished();
+    emit              syncFinished();
     if (!self)
         return;
 
@@ -240,7 +240,7 @@ void HttpPoll::http_result()
     if (id.right(2) == ":0") {
         if (id == "0:0" && d->state == 2) {
             resetConnection();
-            connectionClosed();
+            emit connectionClosed();
             return;
         } else {
             resetConnection();
@@ -263,13 +263,13 @@ void HttpPoll::http_result()
 
     // connecting
     if (justNowConnected) {
-        connected();
+        emit connected();
     } else {
         if (!d->out.isEmpty()) {
             int x = d->out.size();
             d->out.resize(0);
             takeWrite(x);
-            bytesWritten(x);
+            emit bytesWritten(x);
         }
     }
 
@@ -278,7 +278,7 @@ void HttpPoll::http_result()
 
     if (!block.isEmpty()) {
         appendRead(block);
-        readyRead();
+        emit readyRead();
     }
 
     if (!self)
@@ -289,7 +289,7 @@ void HttpPoll::http_result()
     } else {
         if (d->closing) {
             resetConnection();
-            delayedCloseFinished();
+            emit delayedCloseFinished();
             return;
         }
     }
@@ -336,7 +336,7 @@ void HttpPoll::do_sync()
     }
 
     QPointer<QObject> self = this;
-    syncStarted();
+    emit              syncStarted();
     if (!self)
         return;
 
@@ -376,10 +376,10 @@ static QString extractLine(QByteArray *buf, bool *found)
         if (buf->at(n) == '\r' && buf->at(n + 1) == '\n') {
             QByteArray cstr;
             cstr.resize(n);
-            memcpy(cstr.data(), buf->data(), n);
+            memcpy(cstr.data(), buf->data(), size_t(n));
             n += 2; // hack off CR/LF
 
-            memmove(buf->data(), buf->data() + n, buf->size() - n);
+            memmove(buf->data(), buf->data() + n, size_t(buf->size() - n));
             buf->resize(buf->size() - n);
             QString s = QString::fromUtf8(cstr);
 
@@ -406,7 +406,7 @@ static bool extractMainHeader(const QString &line, QString *proto, int *code, QS
     if (n2 == -1)
         return false;
     if (code)
-        *code = line.mid(n, n2 - n).toInt();
+        *code = line.midRef(n, n2 - n).toInt();
     n = n2 + 1;
     if (msg)
         *msg = line.mid(n);
@@ -467,9 +467,10 @@ void HttpProxyPost::setAuth(const QString &user, const QString &pass)
     d->pass = pass;
 }
 
-bool HttpProxyPost::isActive() const { return (d->sock.state() == BSocket::Idle ? false : true); }
+bool HttpProxyPost::isActive() const { return d->sock.state() != BSocket::Idle; }
 
-void HttpProxyPost::post(const QString &proxyHost, int proxyPort, const QUrl &url, const QByteArray &data, bool asProxy)
+void HttpProxyPost::post(const QString &proxyHost, quint16 proxyPort, const QUrl &url, const QByteArray &data,
+                         bool asProxy)
 {
     resetConnection(true);
 
@@ -566,7 +567,7 @@ void HttpProxyPost::sock_connectionClosed()
 {
     d->body = d->recvBuf;
     resetConnection();
-    result();
+    emit result();
 }
 
 void HttpProxyPost::tls_readyRead()
@@ -587,7 +588,7 @@ void HttpProxyPost::tls_error()
     fprintf(stderr, "HttpProxyGetStream: ssl error: %d\n", d->tls->errorCode());
 #endif
     resetConnection(true);
-    error(ErrConnectionRefused); // FIXME: bogus error
+    emit error(ErrConnectionRefused); // FIXME: bogus error
 }
 
 void HttpProxyPost::sock_readyRead()
@@ -630,7 +631,7 @@ void HttpProxyPost::processData(const QByteArray &block)
                 fprintf(stderr, "HttpProxyPost: invalid header!\n");
 #endif
                 resetConnection(true);
-                error(ErrProxyNeg);
+                emit error(ErrProxyNeg);
                 return;
             } else {
 #ifdef PROX_DEBUG
@@ -669,7 +670,7 @@ void HttpProxyPost::processData(const QByteArray &block)
                 fprintf(stderr, "HttpProxyPost: << Error >> [%s]\n", errStr.latin1());
 #endif
                 resetConnection(true);
-                error(err);
+                emit error(err);
                 return;
             }
         }
@@ -683,11 +684,11 @@ void HttpProxyPost::sock_error(int x)
 #endif
     resetConnection(true);
     if (x == BSocket::ErrHostNotFound)
-        error(ErrProxyConnect);
+        emit error(ErrProxyConnect);
     else if (x == BSocket::ErrConnectionRefused)
-        error(ErrProxyConnect);
+        emit error(ErrProxyConnect);
     else if (x == BSocket::ErrRead)
-        error(ErrProxyNeg);
+        emit error(ErrProxyNeg);
 }
 
 //----------------------------------------------------------------------------
@@ -748,7 +749,7 @@ void HttpProxyGetStream::setAuth(const QString &user, const QString &pass)
     d->pass = pass;
 }
 
-bool HttpProxyGetStream::isActive() const { return (d->sock.state() == BSocket::Idle ? false : true); }
+bool HttpProxyGetStream::isActive() const { return !(d->sock.state() == BSocket::Idle); }
 
 void HttpProxyGetStream::get(const QString &proxyHost, int proxyPort, const QString &url, bool ssl, bool asProxy)
 {
@@ -766,7 +767,7 @@ void HttpProxyGetStream::get(const QString &proxyHost, int proxyPort, const QStr
     else
         fprintf(stderr, ", auth {%s,%s}\n", d->user.latin1(), d->pass.latin1());
 #endif
-    d->sock.connectToHost(proxyHost, proxyPort);
+    d->sock.connectToHost(proxyHost, quint16(proxyPort));
 }
 
 void HttpProxyGetStream::stop() { resetConnection(); }
@@ -882,7 +883,7 @@ void HttpProxyGetStream::processData(const QByteArray &block)
                 fprintf(stderr, "HttpProxyGetStream: invalid header!\n");
 #endif
                 resetConnection(true);
-                error(ErrProxyNeg);
+                emit error(ErrProxyNeg);
                 return;
             } else {
 #ifdef PROX_DEBUG
@@ -931,7 +932,7 @@ void HttpProxyGetStream::processData(const QByteArray &block)
                 fprintf(stderr, "HttpProxyGetStream: << Error >> [%s]\n", errStr.latin1());
 #endif
                 resetConnection(true);
-                error(err);
+                emit error(err);
                 return;
             }
 
@@ -951,11 +952,11 @@ void HttpProxyGetStream::sock_error(int x)
 #endif
     resetConnection(true);
     if (x == BSocket::ErrHostNotFound)
-        error(ErrProxyConnect);
+        emit error(ErrProxyConnect);
     else if (x == BSocket::ErrConnectionRefused)
-        error(ErrProxyConnect);
+        emit error(ErrProxyConnect);
     else if (x == BSocket::ErrRead)
-        error(ErrProxyNeg);
+        emit error(ErrProxyNeg);
 }
 
 void HttpProxyGetStream::tls_readyRead()
@@ -976,7 +977,7 @@ void HttpProxyGetStream::tls_error()
     fprintf(stderr, "HttpProxyGetStream: ssl error: %d\n", d->tls->errorCode());
 #endif
     resetConnection(true);
-    error(ErrConnectionRefused); // FIXME: bogus error
+    emit error(ErrConnectionRefused); // FIXME: bogus error
 }
 
 // CS_NAMESPACE_END
diff --git a/src/irisnet/noncore/cutestuff/httppoll.h b/src/irisnet/noncore/cutestuff/httppoll.h
index 36ba95fc..a65a5bcc 100644
--- a/src/irisnet/noncore/cutestuff/httppoll.h
+++ b/src/irisnet/noncore/cutestuff/httppoll.h
@@ -77,11 +77,12 @@ class HttpProxyPost : public QObject {
 
     QAbstractSocket *abstractSocket() const;
 
-    void setUseSsl(bool state);
-    void setAuth(const QString &user, const QString &pass = "");
-    bool isActive() const;
-    void post(const QString &proxyHost, int proxyPort, const QUrl &url, const QByteArray &data, bool asProxy = true);
-    void stop();
+    void       setUseSsl(bool state);
+    void       setAuth(const QString &user, const QString &pass = "");
+    bool       isActive() const;
+    void       post(const QString &proxyHost, quint16 proxyPort, const QUrl &url, const QByteArray &data,
+                    bool asProxy = true);
+    void       stop();
     QByteArray body() const;
     QString    getHeader(const QString &) const;
 
diff --git a/src/irisnet/noncore/cutestuff/socks.cpp b/src/irisnet/noncore/cutestuff/socks.cpp
index 8f41fe78..b05e72ad 100644
--- a/src/irisnet/noncore/cutestuff/socks.cpp
+++ b/src/irisnet/noncore/cutestuff/socks.cpp
@@ -55,7 +55,7 @@ class SocksUDP::Private {
     QUdpSocket * sd;
     SocksClient *sc;
     QHostAddress routeAddr;
-    int          routePort;
+    quint16      routePort;
     QString      host;
     int          port;
 };
@@ -91,9 +91,9 @@ void SocksUDP::sd_activated()
 {
     while (d->sd->hasPendingDatagrams()) {
         QByteArray datagram;
-        datagram.resize(d->sd->pendingDatagramSize());
+        datagram.resize(int(d->sd->pendingDatagramSize()));
         d->sd->readDatagram(datagram.data(), datagram.size());
-        packetReady(datagram);
+        emit packetReady(datagram);
     }
 }
 
@@ -151,16 +151,16 @@ static int spc_get_version(QByteArray &from, SPCS_VERSION *s)
         return -1;
     if (from.size() < 2)
         return 0;
-    unsigned char mlen = from.at(1);
-    int           num  = mlen;
+    auto mlen = static_cast<unsigned char>(from.at(1));
+    int  num  = mlen;
     if (num > 16) // who the heck has over 16 auth methods??
         return -1;
     if (from.size() < 2 + num)
         return 0;
     QByteArray a = ByteStream::takeArray(from, 2 + num);
-    s->version   = a[0];
+    s->version   = static_cast<unsigned char>(a[0]);
     s->methodList.resize(num);
-    memcpy(s->methodList.data(), a.data() + 2, num);
+    memcpy(s->methodList.data(), a.data() + 2, size_t(num));
     return 1;
 }
 
@@ -174,8 +174,8 @@ static int sps_get_version(QByteArray &from, SPSS_VERSION *s)
     if (from.size() < 2)
         return 0;
     QByteArray a = ByteStream::takeArray(from, 2);
-    s->version   = a[0];
-    s->method    = a[1];
+    s->version   = static_cast<unsigned char>(a[0]);
+    s->method    = static_cast<unsigned char>(a[1]);
     return 1;
 }
 
@@ -192,9 +192,9 @@ static QByteArray spc_set_authUsername(const QByteArray &user, const QByteArray
     a.resize(1 + 1 + len1 + 1 + len2);
     a[0] = 0x01; // username auth version 1
     a[1] = len1;
-    memcpy(a.data() + 2, user.data(), len1);
+    memcpy(a.data() + 2, user.data(), size_t(len1));
     a[2 + len1] = len2;
-    memcpy(a.data() + 3 + len1, pass.data(), len2);
+    memcpy(a.data() + 3 + len1, pass.data(), size_t(len2));
     return a;
 }
 
@@ -215,15 +215,15 @@ static int spc_get_authUsername(QByteArray &from, SPCS_AUTHUSERNAME *s)
 {
     if (from.size() < 1)
         return 0;
-    unsigned char ver = from.at(0);
+    unsigned char ver = static_cast<unsigned char>(from.at(0));
     if (ver != 0x01)
         return -1;
     if (from.size() < 2)
         return 0;
-    unsigned char ulen = from.at(1);
+    unsigned char ulen = static_cast<unsigned char>(from.at(1));
     if ((int)from.size() < ulen + 3)
         return 0;
-    unsigned char plen = from.at(ulen + 2);
+    unsigned char plen = static_cast<unsigned char>(from.at(ulen + 2));
     if ((int)from.size() < ulen + plen + 3)
         return 0;
     QByteArray a = ByteStream::takeArray(from, ulen + plen + 3);
@@ -248,8 +248,8 @@ static int sps_get_authUsername(QByteArray &from, SPSS_AUTHUSERNAME *s)
     if (from.size() < 2)
         return 0;
     QByteArray a = ByteStream::takeArray(from, 2);
-    s->version   = a[0];
-    s->success   = ((char)a[1] == 0 ? true : false);
+    s->version   = static_cast<unsigned char>(a[0]);
+    s->success   = (char)a[1] == 0;
     return 1;
 }
 
@@ -308,7 +308,7 @@ static QByteArray sp_set_request(const QString &host, quint16 port, unsigned cha
     // host
     a.resize(at + hlen + 1);
     a[at++] = hlen;
-    memcpy(a.data() + at, h.data(), hlen);
+    memcpy(a.data() + at, h.data(), size_t(hlen));
     at += hlen;
 
     // port
@@ -334,9 +334,9 @@ static int sp_get_request(QByteArray &from, SPS_CONNREQ *s)
     if ((int)from.size() < full_len)
         return 0;
 
-    QString       host;
-    QHostAddress  addr;
-    unsigned char atype = from.at(3);
+    QString      host;
+    QHostAddress addr;
+    auto         atype = static_cast<unsigned char>(from.at(3));
 
     if (atype == 0x01) {
         full_len += 4;
@@ -349,7 +349,7 @@ static int sp_get_request(QByteArray &from, SPS_CONNREQ *s)
         ++full_len;
         if ((int)from.size() < full_len)
             return 0;
-        unsigned char host_len = from.at(4);
+        auto host_len = static_cast<unsigned char>(from.at(4));
         full_len += host_len;
         if ((int)from.size() < full_len)
             return 0;
@@ -375,8 +375,8 @@ static int sp_get_request(QByteArray &from, SPS_CONNREQ *s)
     quint16 p;
     memcpy(&p, a.data() + full_len - 2, 2);
 
-    s->version      = a[0];
-    s->cmd          = a[1];
+    s->version      = static_cast<unsigned char>(a[0]);
+    s->cmd          = static_cast<unsigned char>(a[1]);
     s->address_type = atype;
     s->host         = host;
     s->addr         = addr;
@@ -396,7 +396,7 @@ class SocksClient::Private {
     int     port;
     QString user, pass;
     QString real_host;
-    int     real_port;
+    quint16 real_port;
 
     QByteArray recvBuf;
     int        step;
@@ -404,13 +404,13 @@ class SocksClient::Private {
     bool       incoming, waiting;
 
     QString rhost;
-    int     rport;
+    quint16 rport;
 
     int pending;
 
     bool    udp;
     QString udpAddr;
-    int     udpPort;
+    quint16 udpPort;
 };
 
 SocksClient::SocksClient(QObject *parent) : ByteStream(parent)
@@ -492,7 +492,7 @@ void SocksClient::connectToHost(const QString &proxyHost, int proxyPort, const Q
     else
         fprintf(stderr, ", auth {%s,%s}\n", qPrintable(d->user), qPrintable(d->pass));
 #endif
-    d->sock.connectToHost(d->host, d->port);
+    d->sock.connectToHost(d->host, quint16(d->port));
 }
 
 void SocksClient::close()
@@ -565,7 +565,7 @@ void SocksClient::sock_delayedCloseFinished()
 {
     if (isOpen()) {
         resetConnection();
-        delayedCloseFinished();
+        emit delayedCloseFinished();
     }
 }
 
@@ -711,7 +711,7 @@ void SocksClient::processOutgoing(const QByteArray &block)
             if (!d->recvBuf.isEmpty()) {
                 appendRead(d->recvBuf);
                 d->recvBuf.resize(0);
-                readyRead();
+                emit readyRead();
             }
         }
     }
@@ -723,7 +723,7 @@ void SocksClient::do_request()
     fprintf(stderr, "SocksClient: Requesting ...\n");
 #endif
     d->step        = StepRequest;
-    int        cmd = d->udp ? REQ_UDPASSOCIATE : REQ_CONNECT;
+    auto       cmd = d->udp ? REQ_UDPASSOCIATE : REQ_CONNECT;
     QByteArray buf;
     if (!d->real_host.isEmpty())
         buf = sp_set_request(d->real_host, d->real_port, cmd);
@@ -734,7 +734,7 @@ void SocksClient::do_request()
 
 void SocksClient::sock_bytesWritten(qint64 x)
 {
-    int bytes = x;
+    int bytes = int(x);
     if (d->pending >= bytes) {
         d->pending -= bytes;
         bytes = 0;
@@ -743,7 +743,7 @@ void SocksClient::sock_bytesWritten(qint64 x)
         d->pending = 0;
     }
     if (bytes > 0)
-        bytesWritten(bytes);
+        emit bytesWritten(bytes);
 }
 
 void SocksClient::sock_error(int x)
@@ -805,7 +805,7 @@ void SocksClient::continueIncoming()
 
             int methods = 0;
             for (int n = 0; n < (int)s.methodList.size(); ++n) {
-                unsigned char c = s.methodList[n];
+                unsigned char c = static_cast<unsigned char>(s.methodList[n]);
                 if (c == 0x00)
                     methods |= AuthNone;
                 else if (c == 0x02)
@@ -823,7 +823,7 @@ void SocksClient::continueIncoming()
             return;
         } else if (r == 1) {
             d->waiting = true;
-            incomingAuth(s.user, s.pass);
+            emit incomingAuth(s.user, s.pass);
         }
     } else if (d->step == StepRequest) {
         SPS_CONNREQ s;
@@ -841,9 +841,9 @@ void SocksClient::continueIncoming()
                     d->rhost = s.addr.toString();
                 d->rport = s.port;
                 QIODevice::open(QIODevice::ReadWrite);
-                incomingConnectRequest(d->rhost, d->rport);
+                emit incomingConnectRequest(d->rhost, d->rport);
             } else if (s.cmd == REQ_UDPASSOCIATE) {
-                incomingUDPAssociateRequest();
+                emit incomingUDPAssociateRequest();
             } else {
                 requestDeny();
                 return;
@@ -917,11 +917,11 @@ void SocksClient::grantConnect()
     if (!d->recvBuf.isEmpty()) {
         appendRead(d->recvBuf);
         d->recvBuf.resize(0);
-        readyRead();
+        emit readyRead();
     }
 }
 
-void SocksClient::grantUDPAssociate(const QString &relayHost, int relayPort)
+void SocksClient::grantUDPAssociate(const QString &relayHost, quint16 relayPort)
 {
     if (d->step != StepRequest || !d->waiting)
         return;
@@ -1031,7 +1031,7 @@ SocksClient *SocksServer::takeIncoming()
     return c;
 }
 
-void SocksServer::writeUDP(const QHostAddress &addr, int port, const QByteArray &data)
+void SocksServer::writeUDP(const QHostAddress &addr, quint16 port, const QByteArray &data)
 {
     if (d->sd) {
         d->sd->writeDatagram(data.data(), data.size(), addr, port);
@@ -1043,7 +1043,7 @@ void SocksServer::newConnection()
     SocksClient *c = new SocksClient(d->serv->nextPendingConnection(), this);
     connect(c, SIGNAL(error(int)), this, SLOT(connectionError()));
     d->incomingConns.append(c);
-    incomingReady();
+    emit incomingReady();
 }
 
 void SocksServer::connectionError()
@@ -1056,13 +1056,13 @@ void SocksServer::connectionError()
 void SocksServer::sd_activated()
 {
     while (d->sd->hasPendingDatagrams()) {
-        QByteArray   datagram(d->sd->pendingDatagramSize(), Qt::Uninitialized);
+        QByteArray   datagram(int(d->sd->pendingDatagramSize()), Qt::Uninitialized);
         QHostAddress sender;
         quint16      senderPort;
         auto         sz = d->sd->readDatagram(datagram.data(), datagram.size(), &sender, &senderPort);
         if (sz >= 0) {
-            datagram.truncate(sz);
-            incomingUDP(sender.toString(), senderPort, d->sd->peerAddress(), d->sd->peerPort(), datagram);
+            datagram.truncate(int(sz));
+            emit incomingUDP(sender.toString(), senderPort, d->sd->peerAddress(), d->sd->peerPort(), datagram);
         }
     }
 }
diff --git a/src/irisnet/noncore/cutestuff/socks.h b/src/irisnet/noncore/cutestuff/socks.h
index 039b9a13..b7a190ec 100644
--- a/src/irisnet/noncore/cutestuff/socks.h
+++ b/src/irisnet/noncore/cutestuff/socks.h
@@ -74,7 +74,7 @@ class SocksClient : public ByteStream {
     void authGrant(bool);
     void requestDeny();
     void grantConnect();
-    void grantUDPAssociate(const QString &relayHost, int relayPort);
+    void grantUDPAssociate(const QString &relayHost, quint16 relayPort);
 
     // from ByteStream
     void   close();
@@ -140,7 +140,7 @@ class SocksServer : public QObject {
     QHostAddress address() const;
     SocksClient *takeIncoming();
 
-    void writeUDP(const QHostAddress &addr, int port, const QByteArray &data);
+    void writeUDP(const QHostAddress &addr, quint16 port, const QByteArray &data);
 
 signals:
     void incomingReady();
diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index 7359c0e3..5b15a312 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -66,8 +66,8 @@ static int getAddressScope(const QHostAddress &a)
             return 1;
     } else if (a.protocol() == QAbstractSocket::IPv4Protocol) {
         quint32 v4 = a.toIPv4Address();
-        quint8  a0 = v4 >> 24;
-        quint8  a1 = (v4 >> 16) & 0xff;
+        quint8  a0 = quint8(v4 >> 24);
+        quint8  a1 = quint8((v4 >> 16) & 0xff);
         if (a0 == 127)
             return 0;
         else if (a0 == 169 && a1 == 254)
@@ -283,7 +283,7 @@ class Ice176::Private : public QObject {
             // list size = componentCount * number of interfaces
             socketList = portReserver->borrowSockets(componentCount, this);
 
-        components.reserve(componentCount);
+        components.reserve(ulong(componentCount));
         for (int n = 0; n < componentCount; ++n) {
             components.emplace_back();
             Component &c = components.back();
@@ -602,7 +602,7 @@ class Ice176::Private : public QObject {
                 handlePairBindingError(pair, e);
         });
 
-        int prflx_priority = c.ic->peerReflexivePriority(lc.iceTransport, lc.path);
+        quint32 prflx_priority = c.ic->peerReflexivePriority(lc.iceTransport, lc.path);
         pair->binding->setPriority(prflx_priority);
 
         if (mode == Ice176::Initiator) {
@@ -843,7 +843,7 @@ class Ice176::Private : public QObject {
         Component &c = *findComponent(componentId);
         if (c.nominationTimer)
             return;
-        bool agrNom = (mode == Initiator ? localFeatures : remoteFeatures) & AggressiveNomination;
+        bool agrNom = bool((mode == Initiator ? localFeatures : remoteFeatures) & AggressiveNomination);
         if (!agrNom && mode == Responder)
             return; // responder will wait for nominated pairs till very end
 
@@ -875,7 +875,7 @@ class Ice176::Private : public QObject {
 
         CandidatePair::Ptr pair        = (it == checkList.pairs.end()) ? CandidatePair::Ptr() : *it;
         Component &        component   = *findComponent(locCand.info->componentId);
-        int                minPriority = component.highestPair ? component.highestPair->priority : 0;
+        qint64             minPriority = component.highestPair ? component.highestPair->priority : 0;
         if (pair) {
             if (pair->priority < minPriority) {
                 iceDebug(
@@ -1138,7 +1138,7 @@ class Ice176::Private : public QObject {
 
         if (pair->isNominated) {
             component.hasNominatedPairs = true;
-            bool agrNom                 = (mode == Initiator ? localFeatures : remoteFeatures) & AggressiveNomination;
+            bool agrNom = bool((mode == Initiator ? localFeatures : remoteFeatures) & AggressiveNomination);
             if (!agrNom) {
                 setSelectedPair(component.id);
             } else
@@ -1435,7 +1435,7 @@ private slots:
 
         while (sock->hasPendingDatagrams(path)) {
             QHostAddress fromAddr;
-            int          fromPort;
+            quint16      fromPort;
             QByteArray   buf = sock->readDatagram(path, &fromAddr, &fromPort);
 
             // iceDebug("port %d: received packet (%d bytes)", lt->sock->localPort(), buf.size());
@@ -1468,9 +1468,8 @@ private slots:
 
                 QList<StunMessage::Attribute> list;
                 StunMessage::Attribute        attr;
-                attr.type = StunTypes::XOR_MAPPED_ADDRESS;
-                attr.value
-                    = StunTypes::createXorPeerAddress(fromAddr, quint16(fromPort), response.magic(), response.id());
+                attr.type  = StunTypes::XOR_MAPPED_ADDRESS;
+                attr.value = StunTypes::createXorPeerAddress(fromAddr, fromPort, response.magic(), response.id());
                 list += attr;
 
                 response.setAttributes(list);
@@ -1679,10 +1678,7 @@ bool Ice176::isIPv6LinkLocalAddress(const QHostAddress &addr)
     quint16    hi    = addr6[0];
     hi <<= 8;
     hi += addr6[1];
-    if ((hi & 0xffc0) == 0xfe80)
-        return true;
-    else
-        return false;
+    return (hi & 0xffc0) == 0xfe80;
 }
 
 void Ice176::changeThread(QThread *thread)
diff --git a/src/irisnet/noncore/iceagent.cpp b/src/irisnet/noncore/iceagent.cpp
index 1e8cfde2..73d84d31 100644
--- a/src/irisnet/noncore/iceagent.cpp
+++ b/src/irisnet/noncore/iceagent.cpp
@@ -30,7 +30,7 @@ static QChar randomPrintableChar()
     // 26-51 = A-Z
     // 52-61 = 0-9
 
-    uchar c = QCA::Random::randomChar() % 62;
+    uchar c = static_cast<uchar>(QCA::Random::randomChar() % 62);
     if (c <= 25)
         return 'a' + c;
     else if (c <= 51)
diff --git a/src/irisnet/noncore/icecomponent.cpp b/src/irisnet/noncore/icecomponent.cpp
index 38e8126a..1641f517 100644
--- a/src/irisnet/noncore/icecomponent.cpp
+++ b/src/irisnet/noncore/icecomponent.cpp
@@ -311,7 +311,7 @@ class IceComponent::Private : public QObject {
             auto it = std::find_if(udpTransports.begin(), udpTransports.end(),
                                    [&](auto const &a) { return a->sock == lt; });
             Q_ASSERT(it != udpTransports.end());
-            addrAt = std::distance(udpTransports.begin(), it);
+            addrAt = int(std::distance(udpTransports.begin(), it));
             if (path == 1) {
                 // lower priority, but not as far as IceTurnTransport
                 addrAt += 512;
diff --git a/src/irisnet/noncore/icecomponent.h b/src/irisnet/noncore/icecomponent.h
index 956b3974..791cd30c 100644
--- a/src/irisnet/noncore/icecomponent.h
+++ b/src/irisnet/noncore/icecomponent.h
@@ -45,13 +45,7 @@ class IceComponent : public QObject {
 
         TransportAddress(const QHostAddress &_addr, int _port) : addr(_addr), port(_port) { }
 
-        bool operator==(const TransportAddress &other) const
-        {
-            if (addr == other.addr && port == other.port)
-                return true;
-            else
-                return false;
-        }
+        bool operator==(const TransportAddress &other) const { return addr == other.addr && port == other.port; }
 
         inline bool operator!=(const TransportAddress &other) const { return !operator==(other); }
         inline      operator QString() const { return QString("%1:%2").arg(addr.toString(), QString::number(port)); }
diff --git a/src/irisnet/noncore/icelocaltransport.cpp b/src/irisnet/noncore/icelocaltransport.cpp
index e79e88f8..84d11bb5 100644
--- a/src/irisnet/noncore/icelocaltransport.cpp
+++ b/src/irisnet/noncore/icelocaltransport.cpp
@@ -86,7 +86,7 @@ class SafeUdpSocket : public QObject {
             return QByteArray();
 
         QByteArray buf;
-        buf.resize(sock->pendingDatagramSize());
+        buf.resize(int(sock->pendingDatagramSize()));
         sock->readDatagram(buf.data(), buf.size(), address, port);
         return buf;
     }
@@ -146,7 +146,7 @@ class IceLocalTransport::Private : public QObject {
     class Datagram {
     public:
         QHostAddress addr;
-        int          port;
+        quint16      port;
         QByteArray   buf;
     };
 
@@ -545,7 +545,7 @@ private slots:
         }
     }
 
-    void pool_outgoingMessage(const QByteArray &packet, const QHostAddress &toAddress, int toPort)
+    void pool_outgoingMessage(const QByteArray &packet, const QHostAddress &toAddress, quint16 toPort)
     {
         // warning: read StunTransactionPool docs before modifying
         //   this function
@@ -659,7 +659,7 @@ private slots:
         WriteItem wi;
         wi.type = WriteItem::Turn;
         pendingWrites += wi;
-        sock->writeDatagram(buf, stunRelayAddr, stunRelayPort);
+        sock->writeDatagram(buf, stunRelayAddr, quint16(stunRelayPort));
     }
 
     void turn_debugLine(const QString &line) { emit q->debugLine(line); }
@@ -742,7 +742,7 @@ bool IceLocalTransport::hasPendingDatagrams(int path) const
     }
 }
 
-QByteArray IceLocalTransport::readDatagram(int path, QHostAddress *addr, int *port)
+QByteArray IceLocalTransport::readDatagram(int path, QHostAddress *addr, quint16 *port)
 {
     QList<Private::Datagram> *in = nullptr;
     if (path == Direct)
@@ -769,7 +769,7 @@ void IceLocalTransport::writeDatagram(int path, const QByteArray &buf, const QHo
         wi.addr = addr;
         wi.port = port;
         d->pendingWrites += wi;
-        d->sock->writeDatagram(buf, addr, port);
+        d->sock->writeDatagram(buf, addr, quint16(port));
     } else if (path == Relayed) {
         if (d->turn && d->turnActivated)
             d->turn->write(buf, addr, port);
diff --git a/src/irisnet/noncore/icelocaltransport.h b/src/irisnet/noncore/icelocaltransport.h
index 2d709398..2979e0f6 100644
--- a/src/irisnet/noncore/icelocaltransport.h
+++ b/src/irisnet/noncore/icelocaltransport.h
@@ -81,7 +81,7 @@ class IceLocalTransport : public IceTransport, public QEnableSharedFromThis<IceL
     // reimplemented
     void       stop() override;
     bool       hasPendingDatagrams(int path) const override;
-    QByteArray readDatagram(int path, QHostAddress *addr, int *port) override;
+    QByteArray readDatagram(int path, QHostAddress *addr, quint16 *port) override;
     void       writeDatagram(int path, const QByteArray &buf, const QHostAddress &addr, int port) override;
     void       addChannelPeer(const QHostAddress &addr, int port) override;
     void       setDebugLevel(DebugLevel level) override;
diff --git a/src/irisnet/noncore/icetransport.h b/src/irisnet/noncore/icetransport.h
index 3abcf3ef..857aa64e 100644
--- a/src/irisnet/noncore/icetransport.h
+++ b/src/irisnet/noncore/icetransport.h
@@ -40,7 +40,7 @@ class IceTransport : public QObject {
     virtual void stop() = 0;
 
     virtual bool       hasPendingDatagrams(int path) const                                                = 0;
-    virtual QByteArray readDatagram(int path, QHostAddress *addr, int *port)                              = 0;
+    virtual QByteArray readDatagram(int path, QHostAddress *addr, quint16 *port)                          = 0;
     virtual void       writeDatagram(int path, const QByteArray &buf, const QHostAddress &addr, int port) = 0;
     virtual void       addChannelPeer(const QHostAddress &addr, int port)                                 = 0;
 
diff --git a/src/irisnet/noncore/iceturntransport.cpp b/src/irisnet/noncore/iceturntransport.cpp
index 93fd2b15..a5795153 100644
--- a/src/irisnet/noncore/iceturntransport.cpp
+++ b/src/irisnet/noncore/iceturntransport.cpp
@@ -105,11 +105,11 @@ private slots:
         StunAllocate *allocate = turn.stunAllocate();
 
         QHostAddress saddr = allocate->reflexiveAddress();
-        quint16      sport = allocate->reflexivePort();
+        quint16      sport = quint16(allocate->reflexivePort());
         if (debugLevel >= IceTransport::DL_Info)
             emit q->debugLine(QString("Server says we are ") + saddr.toString() + ';' + QString::number(sport));
         saddr = allocate->relayedAddress();
-        sport = allocate->relayedPort();
+        sport = quint16(allocate->relayedPort());
         if (debugLevel >= IceTransport::DL_Info)
             emit q->debugLine(QString("Server relays via ") + saddr.toString() + ';' + QString::number(sport));
 
@@ -179,10 +179,10 @@ bool IceTurnTransport::hasPendingDatagrams(int path) const
     Q_ASSERT(path == 0);
     Q_UNUSED(path)
 
-    return (d->turn.packetsToRead() > 0 ? true : false);
+    return d->turn.packetsToRead() > 0;
 }
 
-QByteArray IceTurnTransport::readDatagram(int path, QHostAddress *addr, int *port)
+QByteArray IceTurnTransport::readDatagram(int path, QHostAddress *addr, quint16 *port)
 {
     Q_ASSERT(path == 0);
     Q_UNUSED(path)
diff --git a/src/irisnet/noncore/iceturntransport.h b/src/irisnet/noncore/iceturntransport.h
index 0769ea62..0b5910f4 100644
--- a/src/irisnet/noncore/iceturntransport.h
+++ b/src/irisnet/noncore/iceturntransport.h
@@ -57,7 +57,7 @@ class IceTurnTransport : public IceTransport, public QEnableSharedFromThis<IceTu
     // reimplemented
     virtual void       stop();
     virtual bool       hasPendingDatagrams(int path) const;
-    virtual QByteArray readDatagram(int path, QHostAddress *addr, int *port);
+    virtual QByteArray readDatagram(int path, QHostAddress *addr, quint16 *port);
     virtual void       writeDatagram(int path, const QByteArray &buf, const QHostAddress &addr, int port);
     virtual void       addChannelPeer(const QHostAddress &addr, int port);
     virtual void       setDebugLevel(DebugLevel level);
diff --git a/src/irisnet/noncore/legacy/srvresolver.cpp b/src/irisnet/noncore/legacy/srvresolver.cpp
index 8c1b43b9..08ab8bc6 100644
--- a/src/irisnet/noncore/legacy/srvresolver.cpp
+++ b/src/irisnet/noncore/legacy/srvresolver.cpp
@@ -198,8 +198,8 @@ void SrvResolver::nndns_resultsReady(const QList<XMPP::NameRecord> &results)
         // grab the server list and destroy the qdns object
         QList<Q3Dns::Server> list;
         for (int n = 0; n < results.count(); ++n) {
-            list += Q3Dns::Server(QString::fromLatin1(results[n].name()), results[n].priority(), results[n].weight(),
-                                  results[n].port());
+            list += Q3Dns::Server(QString::fromLatin1(results[n].name()), quint16(results[n].priority()),
+                                  quint16(results[n].weight()), quint16(results[n].port()));
         }
 
         d->nndns_busy = false;
@@ -207,14 +207,14 @@ void SrvResolver::nndns_resultsReady(const QList<XMPP::NameRecord> &results)
 
         if (list.isEmpty()) {
             stop();
-            resultsReady();
+            emit resultsReady();
             return;
         }
         sortSRVList(list);
         d->servers = list;
 
         if (d->srvonly)
-            resultsReady();
+            emit resultsReady();
         else {
             // kick it off
             d->aaaa = true;
@@ -237,8 +237,8 @@ void SrvResolver::nndns_resultsReady(const QList<XMPP::NameRecord> &results)
             d->aaaa = true;
 
             d->resultAddress = list.first();
-            d->resultPort    = port;
-            resultsReady();
+            d->resultPort    = quint16(port);
+            emit resultsReady();
         } else {
             if (!d->aaaa)
                 d->servers.removeFirst();
@@ -247,7 +247,7 @@ void SrvResolver::nndns_resultsReady(const QList<XMPP::NameRecord> &results)
             // failed?  bail if last one
             if (d->servers.isEmpty()) {
                 stop();
-                resultsReady();
+                emit resultsReady();
                 return;
             }
 
@@ -268,13 +268,13 @@ void SrvResolver::ndns_done()
 
     if (!r.isNull()) {
         d->resultAddress = d->ndns.result();
-        d->resultPort    = port;
-        resultsReady();
+        d->resultPort    = quint16(port);
+        emit resultsReady();
     } else {
         // failed?  bail if last one
         if (d->servers.isEmpty()) {
             stop();
-            resultsReady();
+            emit resultsReady();
             return;
         }
 
@@ -287,7 +287,7 @@ void SrvResolver::ndns_done()
 void SrvResolver::t_timeout()
 {
     stop();
-    resultsReady();
+    emit resultsReady();
 }
 
 // CS_NAMESPACE_END
diff --git a/src/irisnet/noncore/processquit.cpp b/src/irisnet/noncore/processquit.cpp
index 049cefdf..b6aa42a8 100644
--- a/src/irisnet/noncore/processquit.cpp
+++ b/src/irisnet/noncore/processquit.cpp
@@ -58,7 +58,7 @@ class SafeSocketNotifier : public QObject {
     }
 
     bool                  isEnabled() const { return sn->isEnabled(); }
-    int                   socket() const { return sn->socket(); }
+    int                   socket() const { return int(sn->socket()); }
     QSocketNotifier::Type type() const { return sn->type(); }
 
 public slots:
diff --git a/src/irisnet/noncore/stunallocate.cpp b/src/irisnet/noncore/stunallocate.cpp
index f98ea938..87dfcfcb 100644
--- a/src/irisnet/noncore/stunallocate.cpp
+++ b/src/irisnet/noncore/stunallocate.cpp
@@ -333,14 +333,14 @@ private slots:
         {
             StunMessage::Attribute a;
             a.type  = StunTypes::CHANNEL_NUMBER;
-            a.value = StunTypes::createChannelNumber(channelId);
+            a.value = StunTypes::createChannelNumber(quint16(channelId));
             list += a;
         }
 
         {
             StunMessage::Attribute a;
             a.type  = StunTypes::XOR_PEER_ADDRESS;
-            a.value = StunTypes::createXorPeerAddress(addr, port, message.magic(), message.id());
+            a.value = StunTypes::createXorPeerAddress(addr, quint16(port), message.magic(), message.id());
             list += a;
         }
 
@@ -1161,8 +1161,8 @@ QByteArray StunAllocate::encode(const QByteArray &datagram, const QHostAddress &
         if (datagram.size() > 65535)
             return QByteArray();
 
-        quint16 num = channelId;
-        quint16 len = datagram.size();
+        quint16 num = quint16(channelId);
+        quint16 len = quint16(datagram.size());
 
         int plen = len;
 
@@ -1176,7 +1176,7 @@ QByteArray StunAllocate::encode(const QByteArray &datagram, const QHostAddress &
         QByteArray out(4 + plen, 0);
         StunUtil::write16((quint8 *)out.data(), num);
         StunUtil::write16((quint8 *)out.data() + 2, len);
-        memcpy(out.data() + 4, datagram.data(), datagram.size());
+        memcpy(out.data() + 4, datagram.data(), size_t(datagram.size()));
 
         return out;
     } else {
@@ -1191,7 +1191,7 @@ QByteArray StunAllocate::encode(const QByteArray &datagram, const QHostAddress &
         {
             StunMessage::Attribute a;
             a.type  = StunTypes::XOR_PEER_ADDRESS;
-            a.value = StunTypes::createXorPeerAddress(addr, port, message.magic(), message.id());
+            a.value = StunTypes::createXorPeerAddress(addr, quint16(port), message.magic(), message.id());
             list += a;
         }
 
@@ -1250,10 +1250,7 @@ QByteArray StunAllocate::decode(const StunMessage &encoded, QHostAddress *addr,
 
 QString StunAllocate::errorString() const { return d->errorString; }
 
-bool StunAllocate::containsChannelData(const quint8 *data, int size)
-{
-    return (check_channelData(data, size) != -1 ? true : false);
-}
+bool StunAllocate::containsChannelData(const quint8 *data, int size) { return check_channelData(data, size) != -1; }
 
 QByteArray StunAllocate::readChannelData(const quint8 *data, int size)
 {
diff --git a/src/irisnet/noncore/stunallocate.h b/src/irisnet/noncore/stunallocate.h
index a7b9f1a1..d5260f11 100644
--- a/src/irisnet/noncore/stunallocate.h
+++ b/src/irisnet/noncore/stunallocate.h
@@ -42,13 +42,7 @@ class StunAllocate : public QObject {
 
         Channel(const QHostAddress &_address, int _port) : address(_address), port(_port) { }
 
-        inline bool operator==(const Channel &other)
-        {
-            if (address == other.address && port == other.port)
-                return true;
-            else
-                return false;
-        }
+        inline bool operator==(const Channel &other) { return address == other.address && port == other.port; }
 
         inline bool operator!=(const Channel &other) { return !operator==(other); }
     };
diff --git a/src/irisnet/noncore/stunmessage.cpp b/src/irisnet/noncore/stunmessage.cpp
index 66b90b88..1ce21ab4 100644
--- a/src/irisnet/noncore/stunmessage.cpp
+++ b/src/irisnet/noncore/stunmessage.cpp
@@ -139,7 +139,7 @@ static quint16 round_up_length(quint16 in)
 {
     Q_ASSERT(in <= ATTRIBUTE_VALUE_MAX);
     quint16 out       = in;
-    quint16 remainder = out % 4;
+    quint16 remainder = quint16(out % 4);
     if (remainder != 0)
         out += (4 - remainder);
     return out;
@@ -263,10 +263,7 @@ static bool fingerprint_check(const QByteArray &buf)
     const quint8 *p      = (const quint8 *)buf.data();
     quint32       fpval  = read32(p + at + 4);
     quint32       fpcalc = fingerprint_calc(p, at);
-    if (fpval == fpcalc)
-        return true;
-    else
-        return false;
+    return fpval == fpcalc;
 }
 
 // copy the input buffer and prepare for message integrity checking.  the
@@ -312,10 +309,7 @@ static bool message_integrity_check(const QByteArray &buf, int offset, const QBy
 {
     QByteArray mival  = QByteArray::fromRawData(buf.data() + offset + 4, 20);
     QByteArray micalc = message_integrity_calc((const quint8 *)buf.data(), offset, key);
-    if (mival == micalc)
-        return true;
-    else
-        return false;
+    return mival == micalc;
 }
 
 class StunMessage::Private : public QSharedData {
@@ -453,17 +447,17 @@ QByteArray StunMessage::toBinary(int validationFlags, const QByteArray &key) con
 
     // method bits are split into 3 sections
     quint16 m1, m2, m3;
-    m1 = d->method & 0x0f80; // M7-11
+    m1 = quint16(d->method & 0x0f80); // M7-11
     m1 <<= 2;
-    m2 = d->method & 0x0070; // M4-6
+    m2 = quint16(d->method & 0x0070); // M4-6
     m2 <<= 1;
-    m3 = d->method & 0x000f; // M0-3
+    m3 = quint16(d->method & 0x000f); // M0-3
 
     // class bits are split into 2 sections
     quint16 c1, c2;
-    c1 = classbits & 0x02; // C1
+    c1 = quint16(classbits & 0x02); // C1
     c1 <<= 7;
-    c2 = classbits & 0x01; // C0
+    c2 = quint16(classbits & 0x01); // C0
     c2 <<= 4;
 
     quint16 type = m1 | m2 | m3 | c1 | c2;
@@ -479,11 +473,11 @@ QByteArray StunMessage::toBinary(int validationFlags, const QByteArray &key) con
 
         p = (quint8 *)buf.data(); // follow the resize
 
-        memcpy(buf.data() + at + 4, i.value.data(), i.value.size());
+        memcpy(buf.data() + at + 4, i.value.data(), size_t(i.value.size()));
     }
 
     // set attribute area size
-    write16(p + 2, buf.size() - ATTRIBUTE_AREA_START);
+    write16(p + 2, quint16(buf.size() - ATTRIBUTE_AREA_START));
 
     if (validationFlags & MessageIntegrity) {
         quint16 alen = 20; // size of hmac(sha1)
@@ -494,7 +488,7 @@ QByteArray StunMessage::toBinary(int validationFlags, const QByteArray &key) con
         p = (quint8 *)buf.data(); // follow the resize
 
         // set attribute area size to include the new attribute
-        write16(p + 2, buf.size() - ATTRIBUTE_AREA_START);
+        write16(p + 2, quint16(buf.size() - ATTRIBUTE_AREA_START));
 
         // now calculate the hash and fill in the value
         QByteArray result = message_integrity_calc(p, at, key);
@@ -511,7 +505,7 @@ QByteArray StunMessage::toBinary(int validationFlags, const QByteArray &key) con
         p = (quint8 *)buf.data(); // follow the resize
 
         // set attribute area size to include the new attribute
-        write16(p + 2, buf.size() - ATTRIBUTE_AREA_START);
+        write16(p + 2, quint16(buf.size() - ATTRIBUTE_AREA_START));
 
         // now calculate the fingerprint and fill in the value
         quint32 fpcalc = fingerprint_calc(p, at);
@@ -563,17 +557,17 @@ StunMessage StunMessage::fromBinary(const QByteArray &a, ConvertResult *result,
 
     // method bits are split into 3 sections
     quint16 m1, m2, m3;
-    m1 = p[0] & 0x3e; // M7-11
+    m1 = quint16(p[0] & 0x3e); // M7-11
     m1 <<= 6;
-    m2 = p[1] & 0xe0; // M4-6
+    m2 = quint16(p[1] & 0xe0); // M4-6
     m2 >>= 1;
-    m3 = p[1] & 0x0f; // M0-3
+    m3 = quint16(p[1] & 0x0f); // M0-3
 
     // class bits are split into 2 sections
     quint8 c1, c2;
-    c1 = p[0] & 0x01; // C1
+    c1 = quint8(p[0] & 0x01); // C1
     c1 <<= 1;
-    c2 = p[1] & 0x10; // C0
+    c2 = quint8(p[1] & 0x10); // C0
     c2 >>= 4;
 
     quint16 method    = m1 | m2 | m3;
@@ -620,7 +614,7 @@ StunMessage StunMessage::fromBinary(const QByteArray &a, ConvertResult *result,
     return out;
 }
 
-bool StunMessage::isProbablyStun(const QByteArray &a) { return (check_and_get_length(a) != -1 ? true : false); }
+bool StunMessage::isProbablyStun(const QByteArray &a) { return check_and_get_length(a) != -1; }
 
 StunMessage::Class StunMessage::extractClass(const QByteArray &in)
 {
@@ -628,9 +622,9 @@ StunMessage::Class StunMessage::extractClass(const QByteArray &in)
 
     // class bits are split into 2 sections
     quint8 c1, c2;
-    c1 = p[0] & 0x01; // C1
+    c1 = quint8(p[0] & 0x01); // C1
     c1 <<= 1;
-    c2 = p[1] & 0x10; // C0
+    c2 = quint8(p[1] & 0x10); // C0
     c2 >>= 4;
 
     quint8 classbits = c1 | c2;
@@ -651,7 +645,7 @@ StunMessage::Class StunMessage::extractClass(const QByteArray &in)
 bool StunMessage::containsStun(const quint8 *data, int size)
 {
     // check_and_get_length does a full packet check so it works even on a stream
-    return (check_and_get_length(QByteArray::fromRawData((const char *)data, size)) != -1 ? true : false);
+    return check_and_get_length(QByteArray::fromRawData((const char *)data, size)) != -1;
 }
 
 QByteArray StunMessage::readStun(const quint8 *data, int size)
diff --git a/src/irisnet/noncore/stuntransaction.cpp b/src/irisnet/noncore/stuntransaction.cpp
index 7a1ea92a..327e6d51 100644
--- a/src/irisnet/noncore/stuntransaction.cpp
+++ b/src/irisnet/noncore/stuntransaction.cpp
@@ -331,10 +331,7 @@ private slots:
         if (!active)
             return false;
 
-        if (!to_addr.isNull() && (to_addr != from_addr || to_port != from_port))
-            return false;
-
-        return true;
+        return to_addr.isNull() || (to_addr == from_addr && to_port == from_port);
     }
 
     void processIncoming(const StunMessage &msg, bool authed)
@@ -440,7 +437,7 @@ private slots:
             return false;
         }
 
-        processIncoming(msg, (validationFlags & StunMessage::MessageIntegrity) ? true : false);
+        processIncoming(msg, (validationFlags & StunMessage::MessageIntegrity) != 0);
         return true;
     }
 
diff --git a/src/irisnet/noncore/stuntypes.cpp b/src/irisnet/noncore/stuntypes.cpp
index b3c1765c..309d6bcd 100644
--- a/src/irisnet/noncore/stuntypes.cpp
+++ b/src/irisnet/noncore/stuntypes.cpp
@@ -312,11 +312,8 @@ namespace StunTypes {
         if (val.size() != 1)
             return false;
 
-        unsigned char c = val[0];
-        if (c & 0x80)
-            *reserve = true;
-        else
-            *reserve = false;
+        unsigned char c = static_cast<unsigned char>(val[0]);
+        *reserve        = (c & 0x80) != 0;
 
         return true;
     }
@@ -326,7 +323,7 @@ namespace StunTypes {
         if (val.size() != 4)
             return false;
 
-        *proto = val[0];
+        *proto = quint8(val[0]);
         return true;
     }
 
diff --git a/src/irisnet/noncore/stunutil.cpp b/src/irisnet/noncore/stunutil.cpp
index 4331fe41..3bd24b92 100644
--- a/src/irisnet/noncore/stunutil.cpp
+++ b/src/irisnet/noncore/stunutil.cpp
@@ -61,28 +61,28 @@ namespace XMPP { namespace StunUtil {
 
     void write16(quint8 *out, quint16 i)
     {
-        out[0] = (i >> 8) & 0xff;
-        out[1] = i & 0xff;
+        out[0] = quint8((i >> 8) & 0xff);
+        out[1] = quint8(i & 0xff);
     }
 
     void write32(quint8 *out, quint32 i)
     {
-        out[0] = (i >> 24) & 0xff;
-        out[1] = (i >> 16) & 0xff;
-        out[2] = (i >> 8) & 0xff;
-        out[3] = i & 0xff;
+        out[0] = quint8((i >> 24) & 0xff);
+        out[1] = quint8((i >> 16) & 0xff);
+        out[2] = quint8((i >> 8) & 0xff);
+        out[3] = quint8(i & 0xff);
     }
 
     void write64(quint8 *out, quint64 i)
     {
-        out[0] = (i >> 56) & 0xff;
-        out[1] = (i >> 48) & 0xff;
-        out[2] = (i >> 40) & 0xff;
-        out[3] = (i >> 32) & 0xff;
-        out[4] = (i >> 24) & 0xff;
-        out[5] = (i >> 16) & 0xff;
-        out[6] = (i >> 8) & 0xff;
-        out[7] = i & 0xff;
+        out[0] = quint8((i >> 56) & 0xff);
+        out[1] = quint8((i >> 48) & 0xff);
+        out[2] = quint8((i >> 40) & 0xff);
+        out[3] = quint8((i >> 32) & 0xff);
+        out[4] = quint8((i >> 24) & 0xff);
+        out[5] = quint8((i >> 16) & 0xff);
+        out[6] = quint8((i >> 8) & 0xff);
+        out[7] = quint8(i & 0xff);
     }
 
     QCA::SecureArray saslPrep(const QCA::SecureArray &in)
diff --git a/src/irisnet/noncore/turnclient.cpp b/src/irisnet/noncore/turnclient.cpp
index 818ca0cf..c2a4f21e 100644
--- a/src/irisnet/noncore/turnclient.cpp
+++ b/src/irisnet/noncore/turnclient.cpp
@@ -120,7 +120,7 @@ class TurnClient::Private : public QObject {
     class Packet {
     public:
         QHostAddress addr;
-        int          port;
+        quint16      port;
         QByteArray   data;
 
         // for outbound
@@ -216,7 +216,7 @@ class TurnClient::Private : public QObject {
             bs         = s;
             connect(s, SIGNAL(connected()), SLOT(bs_connected()));
             connect(s, SIGNAL(error(int)), SLOT(bs_error(int)));
-            s->connectToHost(serverAddr.toString(), serverPort);
+            s->connectToHost(serverAddr.toString(), quint16(serverPort));
         }
 
         connect(bs, SIGNAL(connectionClosed()), SLOT(bs_connectionClosed()));
@@ -943,7 +943,7 @@ int TurnClient::packetsToRead() const { return d->in.count(); }
 
 int TurnClient::packetsToWrite() const { return d->outPending.count() + d->outPendingWrite; }
 
-QByteArray TurnClient::read(QHostAddress *addr, int *port)
+QByteArray TurnClient::read(QHostAddress *addr, quint16 *port)
 {
     if (!d->in.isEmpty()) {
         Private::Packet p = d->in.takeFirst();
diff --git a/src/irisnet/noncore/turnclient.h b/src/irisnet/noncore/turnclient.h
index e1d4baf2..af130567 100644
--- a/src/irisnet/noncore/turnclient.h
+++ b/src/irisnet/noncore/turnclient.h
@@ -135,7 +135,7 @@ class TurnClient : public QObject {
     int packetsToWrite() const;
 
     // TCP mode only
-    QByteArray read(QHostAddress *addr, int *port);
+    QByteArray read(QHostAddress *addr, quint16 *port);
 
     // for UDP, this call may emit outgoingDatagram() immediately (not
     //   DOR-DS safe)
diff --git a/src/irisnet/noncore/udpportreserver.cpp b/src/irisnet/noncore/udpportreserver.cpp
index c9d1acbd..3d5f4b60 100644
--- a/src/irisnet/noncore/udpportreserver.cpp
+++ b/src/irisnet/noncore/udpportreserver.cpp
@@ -253,7 +253,7 @@ private slots:
             for (const QHostAddress &a : neededAddrs) {
                 QUdpSocket *sock = new QUdpSocket(q);
 
-                if (!sock->bind(a, i.port)) {
+                if (!sock->bind(a, quint16(i.port))) {
                     delete sock;
                     continue;
                 }
diff --git a/src/xmpp/blake2/blake2b-ref.c b/src/xmpp/blake2/blake2b-ref.c
index ab5fbde8..e5273a8f 100644
--- a/src/xmpp/blake2/blake2b-ref.c
+++ b/src/xmpp/blake2/blake2b-ref.c
@@ -20,356 +20,347 @@
 #include <stdio.h>
 #include <string.h>
 
-static const uint64_t blake2b_IV[8] =
-{
-  0x6a09e667f3bcc908ULL, 0xbb67ae8584caa73bULL,
-  0x3c6ef372fe94f82bULL, 0xa54ff53a5f1d36f1ULL,
-  0x510e527fade682d1ULL, 0x9b05688c2b3e6c1fULL,
-  0x1f83d9abfb41bd6bULL, 0x5be0cd19137e2179ULL
+static const uint64_t blake2b_IV[8]
+    = { 0x6a09e667f3bcc908ULL, 0xbb67ae8584caa73bULL, 0x3c6ef372fe94f82bULL, 0xa54ff53a5f1d36f1ULL,
+        0x510e527fade682d1ULL, 0x9b05688c2b3e6c1fULL, 0x1f83d9abfb41bd6bULL, 0x5be0cd19137e2179ULL };
+
+static const uint8_t blake2b_sigma[12][16] = {
+    { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }, { 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 },
+    { 11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4 }, { 7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8 },
+    { 9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13 }, { 2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9 },
+    { 12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11 }, { 13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10 },
+    { 6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5 }, { 10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0 },
+    { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }, { 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 }
 };
 
-static const uint8_t blake2b_sigma[12][16] =
-{
-  {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15 } ,
-  { 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3 } ,
-  { 11,  8, 12,  0,  5,  2, 15, 13, 10, 14,  3,  6,  7,  1,  9,  4 } ,
-  {  7,  9,  3,  1, 13, 12, 11, 14,  2,  6,  5, 10,  4,  0, 15,  8 } ,
-  {  9,  0,  5,  7,  2,  4, 10, 15, 14,  1, 11, 12,  6,  8,  3, 13 } ,
-  {  2, 12,  6, 10,  0, 11,  8,  3,  4, 13,  7,  5, 15, 14,  1,  9 } ,
-  { 12,  5,  1, 15, 14, 13,  4, 10,  0,  7,  6,  3,  9,  2,  8, 11 } ,
-  { 13, 11,  7, 14, 12,  1,  3,  9,  5,  0, 15,  4,  8,  6,  2, 10 } ,
-  {  6, 15, 14,  9, 11,  3,  0,  8, 12,  2, 13,  7,  1,  4, 10,  5 } ,
-  { 10,  2,  8,  4,  7,  6,  1,  5, 15, 11,  9, 14,  3, 12, 13 , 0 } ,
-  {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15 } ,
-  { 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3 }
-};
-
-static void blake2b_set_lastnode( blake2b_state *S )
-{
-  S->f[1] = (uint64_t)-1;
-}
+static void blake2b_set_lastnode(blake2b_state *S) { S->f[1] = (uint64_t)-1; }
 
 /* Some helper functions, not necessarily useful */
-static int blake2b_is_lastblock( const blake2b_state *S )
-{
-  return S->f[0] != 0;
-}
+static int blake2b_is_lastblock(const blake2b_state *S) { return S->f[0] != 0; }
 
-static void blake2b_set_lastblock( blake2b_state *S )
+static void blake2b_set_lastblock(blake2b_state *S)
 {
-  if( S->last_node ) blake2b_set_lastnode( S );
+    if (S->last_node)
+        blake2b_set_lastnode(S);
 
-  S->f[0] = (uint64_t)-1;
+    S->f[0] = (uint64_t)-1;
 }
 
-static void blake2b_increment_counter( blake2b_state *S, const uint64_t inc )
+static void blake2b_increment_counter(blake2b_state *S, const uint64_t inc)
 {
-  S->t[0] += inc;
-  S->t[1] += ( S->t[0] < inc );
+    S->t[0] += inc;
+    S->t[1] += (S->t[0] < inc);
 }
 
-static void blake2b_init0( blake2b_state *S )
+static void blake2b_init0(blake2b_state *S)
 {
-  size_t i;
-  memset( S, 0, sizeof( blake2b_state ) );
+    size_t i;
+    memset(S, 0, sizeof(blake2b_state));
 
-  for( i = 0; i < 8; ++i ) S->h[i] = blake2b_IV[i];
+    for (i = 0; i < 8; ++i)
+        S->h[i] = blake2b_IV[i];
 }
 
 /* init xors IV with input parameter block */
-int blake2b_init_param( blake2b_state *S, const blake2b_param *P )
+int blake2b_init_param(blake2b_state *S, const blake2b_param *P)
 {
-  const uint8_t *p = ( const uint8_t * )( P );
-  size_t i;
+    const uint8_t *p = (const uint8_t *)(P);
+    size_t         i;
 
-  blake2b_init0( S );
+    blake2b_init0(S);
 
-  /* IV XOR ParamBlock */
-  for( i = 0; i < 8; ++i )
-    S->h[i] ^= load64( p + sizeof( S->h[i] ) * i );
+    /* IV XOR ParamBlock */
+    for (i = 0; i < 8; ++i)
+        S->h[i] ^= load64(p + sizeof(S->h[i]) * i);
 
-  S->outlen = P->digest_length;
-  return 0;
+    S->outlen = P->digest_length;
+    return 0;
 }
 
-int blake2b_init( blake2b_state *S, size_t outlen )
+int blake2b_init(blake2b_state *S, size_t outlen)
 {
-  blake2b_param P[1];
-
-  if ( ( !outlen ) || ( outlen > BLAKE2B_OUTBYTES ) ) return -1;
-
-  P->digest_length = (uint8_t)outlen;
-  P->key_length    = 0;
-  P->fanout        = 1;
-  P->depth         = 1;
-  store32( &P->leaf_length, 0 );
-  store32( &P->node_offset, 0 );
-  store32( &P->xof_length, 0 );
-  P->node_depth    = 0;
-  P->inner_length  = 0;
-  memset( P->reserved, 0, sizeof( P->reserved ) );
-  memset( P->salt,     0, sizeof( P->salt ) );
-  memset( P->personal, 0, sizeof( P->personal ) );
-  return blake2b_init_param( S, P );
+    blake2b_param P[1];
+
+    if ((!outlen) || (outlen > BLAKE2B_OUTBYTES))
+        return -1;
+
+    P->digest_length = (uint8_t)outlen;
+    P->key_length    = 0;
+    P->fanout        = 1;
+    P->depth         = 1;
+    store32(&P->leaf_length, 0);
+    store32(&P->node_offset, 0);
+    store32(&P->xof_length, 0);
+    P->node_depth   = 0;
+    P->inner_length = 0;
+    memset(P->reserved, 0, sizeof(P->reserved));
+    memset(P->salt, 0, sizeof(P->salt));
+    memset(P->personal, 0, sizeof(P->personal));
+    return blake2b_init_param(S, P);
 }
 
-int blake2b_init_key( blake2b_state *S, size_t outlen, const void *key, size_t keylen )
+int blake2b_init_key(blake2b_state *S, size_t outlen, const void *key, size_t keylen)
 {
-  blake2b_param P[1];
-
-  if ( ( !outlen ) || ( outlen > BLAKE2B_OUTBYTES ) ) return -1;
-
-  if ( !key || !keylen || keylen > BLAKE2B_KEYBYTES ) return -1;
-
-  P->digest_length = (uint8_t)outlen;
-  P->key_length    = (uint8_t)keylen;
-  P->fanout        = 1;
-  P->depth         = 1;
-  store32( &P->leaf_length, 0 );
-  store32( &P->node_offset, 0 );
-  store32( &P->xof_length, 0 );
-  P->node_depth    = 0;
-  P->inner_length  = 0;
-  memset( P->reserved, 0, sizeof( P->reserved ) );
-  memset( P->salt,     0, sizeof( P->salt ) );
-  memset( P->personal, 0, sizeof( P->personal ) );
-
-  if( blake2b_init_param( S, P ) < 0 ) return -1;
-
-  {
-    uint8_t block[BLAKE2B_BLOCKBYTES];
-    memset( block, 0, BLAKE2B_BLOCKBYTES );
-    memcpy( block, key, keylen );
-    blake2b_update( S, block, BLAKE2B_BLOCKBYTES );
-    secure_zero_memory( block, BLAKE2B_BLOCKBYTES ); /* Burn the key from stack */
-  }
-  return 0;
+    blake2b_param P[1];
+
+    if ((!outlen) || (outlen > BLAKE2B_OUTBYTES))
+        return -1;
+
+    if (!key || !keylen || keylen > BLAKE2B_KEYBYTES)
+        return -1;
+
+    P->digest_length = (uint8_t)outlen;
+    P->key_length    = (uint8_t)keylen;
+    P->fanout        = 1;
+    P->depth         = 1;
+    store32(&P->leaf_length, 0);
+    store32(&P->node_offset, 0);
+    store32(&P->xof_length, 0);
+    P->node_depth   = 0;
+    P->inner_length = 0;
+    memset(P->reserved, 0, sizeof(P->reserved));
+    memset(P->salt, 0, sizeof(P->salt));
+    memset(P->personal, 0, sizeof(P->personal));
+
+    if (blake2b_init_param(S, P) < 0)
+        return -1;
+
+    {
+        uint8_t block[BLAKE2B_BLOCKBYTES];
+        memset(block, 0, BLAKE2B_BLOCKBYTES);
+        memcpy(block, key, keylen);
+        blake2b_update(S, block, BLAKE2B_BLOCKBYTES);
+        secure_zero_memory(block, BLAKE2B_BLOCKBYTES); /* Burn the key from stack */
+    }
+    return 0;
 }
 
-#define G(r,i,a,b,c,d)                      \
-  do {                                      \
-    a = a + b + m[blake2b_sigma[r][2*i+0]]; \
-    d = rotr64(d ^ a, 32);                  \
-    c = c + d;                              \
-    b = rotr64(b ^ c, 24);                  \
-    a = a + b + m[blake2b_sigma[r][2*i+1]]; \
-    d = rotr64(d ^ a, 16);                  \
-    c = c + d;                              \
-    b = rotr64(b ^ c, 63);                  \
-  } while(0)
-
-#define ROUND(r)                    \
-  do {                              \
-    G(r,0,v[ 0],v[ 4],v[ 8],v[12]); \
-    G(r,1,v[ 1],v[ 5],v[ 9],v[13]); \
-    G(r,2,v[ 2],v[ 6],v[10],v[14]); \
-    G(r,3,v[ 3],v[ 7],v[11],v[15]); \
-    G(r,4,v[ 0],v[ 5],v[10],v[15]); \
-    G(r,5,v[ 1],v[ 6],v[11],v[12]); \
-    G(r,6,v[ 2],v[ 7],v[ 8],v[13]); \
-    G(r,7,v[ 3],v[ 4],v[ 9],v[14]); \
-  } while(0)
-
-static void blake2b_compress( blake2b_state *S, const uint8_t block[BLAKE2B_BLOCKBYTES] )
+#define G(r, i, a, b, c, d)                                                                                            \
+    do {                                                                                                               \
+        a = a + b + m[blake2b_sigma[r][2 * i + 0]];                                                                    \
+        d = rotr64(d ^ a, 32);                                                                                         \
+        c = c + d;                                                                                                     \
+        b = rotr64(b ^ c, 24);                                                                                         \
+        a = a + b + m[blake2b_sigma[r][2 * i + 1]];                                                                    \
+        d = rotr64(d ^ a, 16);                                                                                         \
+        c = c + d;                                                                                                     \
+        b = rotr64(b ^ c, 63);                                                                                         \
+    } while (0)
+
+#define ROUND(r)                                                                                                       \
+    do {                                                                                                               \
+        G(r, 0, v[0], v[4], v[8], v[12]);                                                                              \
+        G(r, 1, v[1], v[5], v[9], v[13]);                                                                              \
+        G(r, 2, v[2], v[6], v[10], v[14]);                                                                             \
+        G(r, 3, v[3], v[7], v[11], v[15]);                                                                             \
+        G(r, 4, v[0], v[5], v[10], v[15]);                                                                             \
+        G(r, 5, v[1], v[6], v[11], v[12]);                                                                             \
+        G(r, 6, v[2], v[7], v[8], v[13]);                                                                              \
+        G(r, 7, v[3], v[4], v[9], v[14]);                                                                              \
+    } while (0)
+
+static void blake2b_compress(blake2b_state *S, const uint8_t block[BLAKE2B_BLOCKBYTES])
 {
-  uint64_t m[16];
-  uint64_t v[16];
-  size_t i;
-
-  for( i = 0; i < 16; ++i ) {
-    m[i] = load64( block + i * sizeof( m[i] ) );
-  }
-
-  for( i = 0; i < 8; ++i ) {
-    v[i] = S->h[i];
-  }
-
-  v[ 8] = blake2b_IV[0];
-  v[ 9] = blake2b_IV[1];
-  v[10] = blake2b_IV[2];
-  v[11] = blake2b_IV[3];
-  v[12] = blake2b_IV[4] ^ S->t[0];
-  v[13] = blake2b_IV[5] ^ S->t[1];
-  v[14] = blake2b_IV[6] ^ S->f[0];
-  v[15] = blake2b_IV[7] ^ S->f[1];
-
-  ROUND( 0 );
-  ROUND( 1 );
-  ROUND( 2 );
-  ROUND( 3 );
-  ROUND( 4 );
-  ROUND( 5 );
-  ROUND( 6 );
-  ROUND( 7 );
-  ROUND( 8 );
-  ROUND( 9 );
-  ROUND( 10 );
-  ROUND( 11 );
-
-  for( i = 0; i < 8; ++i ) {
-    S->h[i] = S->h[i] ^ v[i] ^ v[i + 8];
-  }
+    uint64_t m[16];
+    uint64_t v[16];
+    size_t   i;
+
+    for (i = 0; i < 16; ++i) {
+        m[i] = load64(block + i * sizeof(m[i]));
+    }
+
+    for (i = 0; i < 8; ++i) {
+        v[i] = S->h[i];
+    }
+
+    v[8]  = blake2b_IV[0];
+    v[9]  = blake2b_IV[1];
+    v[10] = blake2b_IV[2];
+    v[11] = blake2b_IV[3];
+    v[12] = blake2b_IV[4] ^ S->t[0];
+    v[13] = blake2b_IV[5] ^ S->t[1];
+    v[14] = blake2b_IV[6] ^ S->f[0];
+    v[15] = blake2b_IV[7] ^ S->f[1];
+
+    ROUND(0);
+    ROUND(1);
+    ROUND(2);
+    ROUND(3);
+    ROUND(4);
+    ROUND(5);
+    ROUND(6);
+    ROUND(7);
+    ROUND(8);
+    ROUND(9);
+    ROUND(10);
+    ROUND(11);
+
+    for (i = 0; i < 8; ++i) {
+        S->h[i] = S->h[i] ^ v[i] ^ v[i + 8];
+    }
 }
 
 #undef G
 #undef ROUND
 
-int blake2b_update( blake2b_state *S, const void *pin, size_t inlen )
+int blake2b_update(blake2b_state *S, const void *pin, size_t inlen)
 {
-  const unsigned char * in = (const unsigned char *)pin;
-  if( inlen > 0 )
-  {
-    size_t left = S->buflen;
-    size_t fill = BLAKE2B_BLOCKBYTES - left;
-    if( inlen > fill )
-    {
-      S->buflen = 0;
-      memcpy( S->buf + left, in, fill ); /* Fill buffer */
-      blake2b_increment_counter( S, BLAKE2B_BLOCKBYTES );
-      blake2b_compress( S, S->buf ); /* Compress */
-      in += fill; inlen -= fill;
-      while(inlen > BLAKE2B_BLOCKBYTES) {
-        blake2b_increment_counter(S, BLAKE2B_BLOCKBYTES);
-        blake2b_compress( S, in );
-        in += BLAKE2B_BLOCKBYTES;
-        inlen -= BLAKE2B_BLOCKBYTES;
-      }
+    const unsigned char *in = (const unsigned char *)pin;
+    if (inlen > 0) {
+        size_t left = S->buflen;
+        size_t fill = BLAKE2B_BLOCKBYTES - left;
+        if (inlen > fill) {
+            S->buflen = 0;
+            memcpy(S->buf + left, in, fill); /* Fill buffer */
+            blake2b_increment_counter(S, BLAKE2B_BLOCKBYTES);
+            blake2b_compress(S, S->buf); /* Compress */
+            in += fill;
+            inlen -= fill;
+            while (inlen > BLAKE2B_BLOCKBYTES) {
+                blake2b_increment_counter(S, BLAKE2B_BLOCKBYTES);
+                blake2b_compress(S, in);
+                in += BLAKE2B_BLOCKBYTES;
+                inlen -= BLAKE2B_BLOCKBYTES;
+            }
+        }
+        memcpy(S->buf + S->buflen, in, inlen);
+        S->buflen += inlen;
     }
-    memcpy( S->buf + S->buflen, in, inlen );
-    S->buflen += inlen;
-  }
-  return 0;
+    return 0;
 }
 
-int blake2b_final( blake2b_state *S, void *out, size_t outlen )
+int blake2b_final(blake2b_state *S, void *out, size_t outlen)
 {
-  uint8_t buffer[BLAKE2B_OUTBYTES] = {0};
-  size_t i;
+    uint8_t buffer[BLAKE2B_OUTBYTES] = { 0 };
+    size_t  i;
 
-  if( out == NULL || outlen < S->outlen )
-    return -1;
+    if (out == NULL || outlen < S->outlen)
+        return -1;
 
-  if( blake2b_is_lastblock( S ) )
-    return -1;
+    if (blake2b_is_lastblock(S))
+        return -1;
 
-  blake2b_increment_counter( S, S->buflen );
-  blake2b_set_lastblock( S );
-  memset( S->buf + S->buflen, 0, BLAKE2B_BLOCKBYTES - S->buflen ); /* Padding */
-  blake2b_compress( S, S->buf );
+    blake2b_increment_counter(S, S->buflen);
+    blake2b_set_lastblock(S);
+    memset(S->buf + S->buflen, 0, BLAKE2B_BLOCKBYTES - S->buflen); /* Padding */
+    blake2b_compress(S, S->buf);
 
-  for( i = 0; i < 8; ++i ) /* Output full hash to temp buffer */
-    store64( buffer + sizeof( S->h[i] ) * i, S->h[i] );
+    for (i = 0; i < 8; ++i) /* Output full hash to temp buffer */
+        store64(buffer + sizeof(S->h[i]) * i, S->h[i]);
 
-  memcpy( out, buffer, S->outlen );
-  secure_zero_memory(buffer, sizeof(buffer));
-  return 0;
+    memcpy(out, buffer, S->outlen);
+    secure_zero_memory(buffer, sizeof(buffer));
+    return 0;
 }
 
 /* inlen, at least, should be uint64_t. Others can be size_t. */
-int blake2b( void *out, size_t outlen, const void *in, size_t inlen, const void *key, size_t keylen )
+int blake2b(void *out, size_t outlen, const void *in, size_t inlen, const void *key, size_t keylen)
 {
-  blake2b_state S[1];
+    blake2b_state S[1];
 
-  /* Verify parameters */
-  if ( NULL == in && inlen > 0 ) return -1;
+    /* Verify parameters */
+    if (NULL == in && inlen > 0)
+        return -1;
 
-  if ( NULL == out ) return -1;
+    if (NULL == out)
+        return -1;
 
-  if( NULL == key && keylen > 0 ) return -1;
+    if (NULL == key && keylen > 0)
+        return -1;
 
-  if( !outlen || outlen > BLAKE2B_OUTBYTES ) return -1;
+    if (!outlen || outlen > BLAKE2B_OUTBYTES)
+        return -1;
 
-  if( keylen > BLAKE2B_KEYBYTES ) return -1;
+    if (keylen > BLAKE2B_KEYBYTES)
+        return -1;
 
-  if( keylen > 0 )
-  {
-    if( blake2b_init_key( S, outlen, key, keylen ) < 0 ) return -1;
-  }
-  else
-  {
-    if( blake2b_init( S, outlen ) < 0 ) return -1;
-  }
+    if (keylen > 0) {
+        if (blake2b_init_key(S, outlen, key, keylen) < 0)
+            return -1;
+    } else {
+        if (blake2b_init(S, outlen) < 0)
+            return -1;
+    }
 
-  blake2b_update( S, ( const uint8_t * )in, inlen );
-  blake2b_final( S, out, outlen );
-  return 0;
+    blake2b_update(S, (const uint8_t *)in, inlen);
+    blake2b_final(S, out, outlen);
+    return 0;
 }
 
-int blake2( void *out, size_t outlen, const void *in, size_t inlen, const void *key, size_t keylen ) {
-  return blake2b(out, outlen, in, inlen, key, keylen);
+int blake2(void *out, size_t outlen, const void *in, size_t inlen, const void *key, size_t keylen)
+{
+    return blake2b(out, outlen, in, inlen, key, keylen);
 }
 
 #if defined(SUPERCOP)
-int crypto_hash( unsigned char *out, unsigned char *in, unsigned long long inlen )
+int crypto_hash(unsigned char *out, unsigned char *in, unsigned long long inlen)
 {
-  return blake2b( out, BLAKE2B_OUTBYTES, in, inlen, NULL, 0 );
+    return blake2b(out, BLAKE2B_OUTBYTES, in, inlen, NULL, 0);
 }
 #endif
 
 #if defined(BLAKE2B_SELFTEST)
 #include "blake2-kat.h"
 #include <string.h>
-int main( void )
+int main(void)
 {
-  uint8_t key[BLAKE2B_KEYBYTES];
-  uint8_t buf[BLAKE2_KAT_LENGTH];
-  size_t i, step;
+    uint8_t key[BLAKE2B_KEYBYTES];
+    uint8_t buf[BLAKE2_KAT_LENGTH];
+    size_t  i, step;
 
-  for( i = 0; i < BLAKE2B_KEYBYTES; ++i )
-    key[i] = ( uint8_t )i;
+    for (i = 0; i < BLAKE2B_KEYBYTES; ++i)
+        key[i] = (uint8_t)i;
 
-  for( i = 0; i < BLAKE2_KAT_LENGTH; ++i )
-    buf[i] = ( uint8_t )i;
+    for (i = 0; i < BLAKE2_KAT_LENGTH; ++i)
+        buf[i] = (uint8_t)i;
 
-  /* Test simple API */
-  for( i = 0; i < BLAKE2_KAT_LENGTH; ++i )
-  {
-    uint8_t hash[BLAKE2B_OUTBYTES];
-    blake2b( hash, BLAKE2B_OUTBYTES, buf, i, key, BLAKE2B_KEYBYTES );
+    /* Test simple API */
+    for (i = 0; i < BLAKE2_KAT_LENGTH; ++i) {
+        uint8_t hash[BLAKE2B_OUTBYTES];
+        blake2b(hash, BLAKE2B_OUTBYTES, buf, i, key, BLAKE2B_KEYBYTES);
 
-    if( 0 != memcmp( hash, blake2b_keyed_kat[i], BLAKE2B_OUTBYTES ) )
-    {
-      goto fail;
+        if (0 != memcmp(hash, blake2b_keyed_kat[i], BLAKE2B_OUTBYTES)) {
+            goto fail;
+        }
     }
-  }
 
-  /* Test streaming API */
-  for(step = 1; step < BLAKE2B_BLOCKBYTES; ++step) {
-    for (i = 0; i < BLAKE2_KAT_LENGTH; ++i) {
-      uint8_t hash[BLAKE2B_OUTBYTES];
-      blake2b_state S;
-      uint8_t * p = buf;
-      size_t mlen = i;
-      int err = 0;
-
-      if( (err = blake2b_init_key(&S, BLAKE2B_OUTBYTES, key, BLAKE2B_KEYBYTES)) < 0 ) {
-        goto fail;
-      }
-
-      while (mlen >= step) {
-        if ( (err = blake2b_update(&S, p, step)) < 0 ) {
-          goto fail;
+    /* Test streaming API */
+    for (step = 1; step < BLAKE2B_BLOCKBYTES; ++step) {
+        for (i = 0; i < BLAKE2_KAT_LENGTH; ++i) {
+            uint8_t       hash[BLAKE2B_OUTBYTES];
+            blake2b_state S;
+            uint8_t *     p    = buf;
+            size_t        mlen = i;
+            int           err  = 0;
+
+            if ((err = blake2b_init_key(&S, BLAKE2B_OUTBYTES, key, BLAKE2B_KEYBYTES)) < 0) {
+                goto fail;
+            }
+
+            while (mlen >= step) {
+                if ((err = blake2b_update(&S, p, step)) < 0) {
+                    goto fail;
+                }
+                mlen -= step;
+                p += step;
+            }
+            if ((err = blake2b_update(&S, p, mlen)) < 0) {
+                goto fail;
+            }
+            if ((err = blake2b_final(&S, hash, BLAKE2B_OUTBYTES)) < 0) {
+                goto fail;
+            }
+
+            if (0 != memcmp(hash, blake2b_keyed_kat[i], BLAKE2B_OUTBYTES)) {
+                goto fail;
+            }
         }
-        mlen -= step;
-        p += step;
-      }
-      if ( (err = blake2b_update(&S, p, mlen)) < 0) {
-        goto fail;
-      }
-      if ( (err = blake2b_final(&S, hash, BLAKE2B_OUTBYTES)) < 0) {
-        goto fail;
-      }
-
-      if (0 != memcmp(hash, blake2b_keyed_kat[i], BLAKE2B_OUTBYTES)) {
-        goto fail;
-      }
     }
-  }
 
-  puts( "ok" );
-  return 0;
+    puts("ok");
+    return 0;
 fail:
-  puts("error");
-  return -1;
+    puts("error");
+    return -1;
 }
 #endif
diff --git a/src/xmpp/blake2/blake2qt.cpp b/src/xmpp/blake2/blake2qt.cpp
index 50be9a32..c7d76d95 100644
--- a/src/xmpp/blake2/blake2qt.cpp
+++ b/src/xmpp/blake2/blake2qt.cpp
@@ -14,9 +14,9 @@ QByteArray computeBlake2Hash(const QByteArray &ba, Blake2DigestSize digestSize)
     // otherwise try to libb2 or bundled reference implementation depending on which is available
 
     size_t     digestSizeBytes = digestSize == Blake2Digest256 ? 32 : 64;
-    QByteArray ret(digestSizeBytes, Qt::Uninitialized);
+    QByteArray ret(int(digestSizeBytes), Qt::Uninitialized);
 
-    if (blake2b(ret.data(), digestSizeBytes, ba.data(), ba.size(), nullptr, 0) != 0) {
+    if (blake2b(ret.data(), digestSizeBytes, ba.data(), size_t(ba.size()), nullptr, 0) != 0) {
         ret.clear();
     }
 
@@ -43,15 +43,15 @@ QByteArray computeBlake2Hash(QIODevice *dev, Blake2DigestSize digestSize)
     QByteArray buf;
     // reading by 1Mb should work well with disk caches
     while ((buf = dev->read(1024 * 1024)).size() > 0) {
-        retCode = blake2b_update(&state, buf.data(), buf.size());
+        retCode = blake2b_update(&state, buf.data(), size_t(buf.size()));
         if (retCode != 0) {
             return QByteArray();
         }
     }
 
     QByteArray ret;
-    ret.resize(digestSizeBytes);
-    retCode = blake2b_final(&state, ret.data(), ret.size());
+    ret.resize(int(digestSizeBytes));
+    retCode = blake2b_final(&state, ret.data(), size_t(ret.size()));
     if (retCode != 0) {
         return QByteArray();
     }
diff --git a/src/xmpp/blake2/blake2s-ref.c b/src/xmpp/blake2/blake2s-ref.c
index f4e09dfc..170f87f8 100644
--- a/src/xmpp/blake2/blake2s-ref.c
+++ b/src/xmpp/blake2/blake2s-ref.c
@@ -20,347 +20,339 @@
 #include <stdio.h>
 #include <string.h>
 
-static const uint32_t blake2s_IV[8] =
-{
-  0x6A09E667UL, 0xBB67AE85UL, 0x3C6EF372UL, 0xA54FF53AUL,
-  0x510E527FUL, 0x9B05688CUL, 0x1F83D9ABUL, 0x5BE0CD19UL
+static const uint32_t blake2s_IV[8] = { 0x6A09E667UL, 0xBB67AE85UL, 0x3C6EF372UL, 0xA54FF53AUL,
+                                        0x510E527FUL, 0x9B05688CUL, 0x1F83D9ABUL, 0x5BE0CD19UL };
+
+static const uint8_t blake2s_sigma[10][16] = {
+    { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }, { 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 },
+    { 11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4 }, { 7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8 },
+    { 9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13 }, { 2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9 },
+    { 12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11 }, { 13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10 },
+    { 6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5 }, { 10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0 },
 };
 
-static const uint8_t blake2s_sigma[10][16] =
-{
-  {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15 } ,
-  { 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3 } ,
-  { 11,  8, 12,  0,  5,  2, 15, 13, 10, 14,  3,  6,  7,  1,  9,  4 } ,
-  {  7,  9,  3,  1, 13, 12, 11, 14,  2,  6,  5, 10,  4,  0, 15,  8 } ,
-  {  9,  0,  5,  7,  2,  4, 10, 15, 14,  1, 11, 12,  6,  8,  3, 13 } ,
-  {  2, 12,  6, 10,  0, 11,  8,  3,  4, 13,  7,  5, 15, 14,  1,  9 } ,
-  { 12,  5,  1, 15, 14, 13,  4, 10,  0,  7,  6,  3,  9,  2,  8, 11 } ,
-  { 13, 11,  7, 14, 12,  1,  3,  9,  5,  0, 15,  4,  8,  6,  2, 10 } ,
-  {  6, 15, 14,  9, 11,  3,  0,  8, 12,  2, 13,  7,  1,  4, 10,  5 } ,
-  { 10,  2,  8,  4,  7,  6,  1,  5, 15, 11,  9, 14,  3, 12, 13 , 0 } ,
-};
-
-static void blake2s_set_lastnode( blake2s_state *S )
-{
-  S->f[1] = (uint32_t)-1;
-}
+static void blake2s_set_lastnode(blake2s_state *S) { S->f[1] = (uint32_t)-1; }
 
 /* Some helper functions, not necessarily useful */
-static int blake2s_is_lastblock( const blake2s_state *S )
-{
-  return S->f[0] != 0;
-}
+static int blake2s_is_lastblock(const blake2s_state *S) { return S->f[0] != 0; }
 
-static void blake2s_set_lastblock( blake2s_state *S )
+static void blake2s_set_lastblock(blake2s_state *S)
 {
-  if( S->last_node ) blake2s_set_lastnode( S );
+    if (S->last_node)
+        blake2s_set_lastnode(S);
 
-  S->f[0] = (uint32_t)-1;
+    S->f[0] = (uint32_t)-1;
 }
 
-static void blake2s_increment_counter( blake2s_state *S, const uint32_t inc )
+static void blake2s_increment_counter(blake2s_state *S, const uint32_t inc)
 {
-  S->t[0] += inc;
-  S->t[1] += ( S->t[0] < inc );
+    S->t[0] += inc;
+    S->t[1] += (S->t[0] < inc);
 }
 
-static void blake2s_init0( blake2s_state *S )
+static void blake2s_init0(blake2s_state *S)
 {
-  size_t i;
-  memset( S, 0, sizeof( blake2s_state ) );
+    size_t i;
+    memset(S, 0, sizeof(blake2s_state));
 
-  for( i = 0; i < 8; ++i ) S->h[i] = blake2s_IV[i];
+    for (i = 0; i < 8; ++i)
+        S->h[i] = blake2s_IV[i];
 }
 
 /* init2 xors IV with input parameter block */
-int blake2s_init_param( blake2s_state *S, const blake2s_param *P )
+int blake2s_init_param(blake2s_state *S, const blake2s_param *P)
 {
-  const unsigned char *p = ( const unsigned char * )( P );
-  size_t i;
+    const unsigned char *p = (const unsigned char *)(P);
+    size_t               i;
 
-  blake2s_init0( S );
+    blake2s_init0(S);
 
-  /* IV XOR ParamBlock */
-  for( i = 0; i < 8; ++i )
-    S->h[i] ^= load32( &p[i * 4] );
+    /* IV XOR ParamBlock */
+    for (i = 0; i < 8; ++i)
+        S->h[i] ^= load32(&p[i * 4]);
 
-  S->outlen = P->digest_length;
-  return 0;
+    S->outlen = P->digest_length;
+    return 0;
 }
 
 /* Sequential blake2s initialization */
-int blake2s_init( blake2s_state *S, size_t outlen )
+int blake2s_init(blake2s_state *S, size_t outlen)
 {
-  blake2s_param P[1];
-
-  /* Move interval verification here? */
-  if ( ( !outlen ) || ( outlen > BLAKE2S_OUTBYTES ) ) return -1;
-
-  P->digest_length = (uint8_t)outlen;
-  P->key_length    = 0;
-  P->fanout        = 1;
-  P->depth         = 1;
-  store32( &P->leaf_length, 0 );
-  store32( &P->node_offset, 0 );
-  store16( &P->xof_length, 0 );
-  P->node_depth    = 0;
-  P->inner_length  = 0;
-  /* memset(P->reserved, 0, sizeof(P->reserved) ); */
-  memset( P->salt,     0, sizeof( P->salt ) );
-  memset( P->personal, 0, sizeof( P->personal ) );
-  return blake2s_init_param( S, P );
+    blake2s_param P[1];
+
+    /* Move interval verification here? */
+    if ((!outlen) || (outlen > BLAKE2S_OUTBYTES))
+        return -1;
+
+    P->digest_length = (uint8_t)outlen;
+    P->key_length    = 0;
+    P->fanout        = 1;
+    P->depth         = 1;
+    store32(&P->leaf_length, 0);
+    store32(&P->node_offset, 0);
+    store16(&P->xof_length, 0);
+    P->node_depth   = 0;
+    P->inner_length = 0;
+    /* memset(P->reserved, 0, sizeof(P->reserved) ); */
+    memset(P->salt, 0, sizeof(P->salt));
+    memset(P->personal, 0, sizeof(P->personal));
+    return blake2s_init_param(S, P);
 }
 
-int blake2s_init_key( blake2s_state *S, size_t outlen, const void *key, size_t keylen )
+int blake2s_init_key(blake2s_state *S, size_t outlen, const void *key, size_t keylen)
 {
-  blake2s_param P[1];
-
-  if ( ( !outlen ) || ( outlen > BLAKE2S_OUTBYTES ) ) return -1;
-
-  if ( !key || !keylen || keylen > BLAKE2S_KEYBYTES ) return -1;
-
-  P->digest_length = (uint8_t)outlen;
-  P->key_length    = (uint8_t)keylen;
-  P->fanout        = 1;
-  P->depth         = 1;
-  store32( &P->leaf_length, 0 );
-  store32( &P->node_offset, 0 );
-  store16( &P->xof_length, 0 );
-  P->node_depth    = 0;
-  P->inner_length  = 0;
-  /* memset(P->reserved, 0, sizeof(P->reserved) ); */
-  memset( P->salt,     0, sizeof( P->salt ) );
-  memset( P->personal, 0, sizeof( P->personal ) );
-
-  if( blake2s_init_param( S, P ) < 0 ) return -1;
-
-  {
-    uint8_t block[BLAKE2S_BLOCKBYTES];
-    memset( block, 0, BLAKE2S_BLOCKBYTES );
-    memcpy( block, key, keylen );
-    blake2s_update( S, block, BLAKE2S_BLOCKBYTES );
-    secure_zero_memory( block, BLAKE2S_BLOCKBYTES ); /* Burn the key from stack */
-  }
-  return 0;
+    blake2s_param P[1];
+
+    if ((!outlen) || (outlen > BLAKE2S_OUTBYTES))
+        return -1;
+
+    if (!key || !keylen || keylen > BLAKE2S_KEYBYTES)
+        return -1;
+
+    P->digest_length = (uint8_t)outlen;
+    P->key_length    = (uint8_t)keylen;
+    P->fanout        = 1;
+    P->depth         = 1;
+    store32(&P->leaf_length, 0);
+    store32(&P->node_offset, 0);
+    store16(&P->xof_length, 0);
+    P->node_depth   = 0;
+    P->inner_length = 0;
+    /* memset(P->reserved, 0, sizeof(P->reserved) ); */
+    memset(P->salt, 0, sizeof(P->salt));
+    memset(P->personal, 0, sizeof(P->personal));
+
+    if (blake2s_init_param(S, P) < 0)
+        return -1;
+
+    {
+        uint8_t block[BLAKE2S_BLOCKBYTES];
+        memset(block, 0, BLAKE2S_BLOCKBYTES);
+        memcpy(block, key, keylen);
+        blake2s_update(S, block, BLAKE2S_BLOCKBYTES);
+        secure_zero_memory(block, BLAKE2S_BLOCKBYTES); /* Burn the key from stack */
+    }
+    return 0;
 }
 
-#define G(r,i,a,b,c,d)                      \
-  do {                                      \
-    a = a + b + m[blake2s_sigma[r][2*i+0]]; \
-    d = rotr32(d ^ a, 16);                  \
-    c = c + d;                              \
-    b = rotr32(b ^ c, 12);                  \
-    a = a + b + m[blake2s_sigma[r][2*i+1]]; \
-    d = rotr32(d ^ a, 8);                   \
-    c = c + d;                              \
-    b = rotr32(b ^ c, 7);                   \
-  } while(0)
-
-#define ROUND(r)                    \
-  do {                              \
-    G(r,0,v[ 0],v[ 4],v[ 8],v[12]); \
-    G(r,1,v[ 1],v[ 5],v[ 9],v[13]); \
-    G(r,2,v[ 2],v[ 6],v[10],v[14]); \
-    G(r,3,v[ 3],v[ 7],v[11],v[15]); \
-    G(r,4,v[ 0],v[ 5],v[10],v[15]); \
-    G(r,5,v[ 1],v[ 6],v[11],v[12]); \
-    G(r,6,v[ 2],v[ 7],v[ 8],v[13]); \
-    G(r,7,v[ 3],v[ 4],v[ 9],v[14]); \
-  } while(0)
-
-static void blake2s_compress( blake2s_state *S, const uint8_t in[BLAKE2S_BLOCKBYTES] )
+#define G(r, i, a, b, c, d)                                                                                            \
+    do {                                                                                                               \
+        a = a + b + m[blake2s_sigma[r][2 * i + 0]];                                                                    \
+        d = rotr32(d ^ a, 16);                                                                                         \
+        c = c + d;                                                                                                     \
+        b = rotr32(b ^ c, 12);                                                                                         \
+        a = a + b + m[blake2s_sigma[r][2 * i + 1]];                                                                    \
+        d = rotr32(d ^ a, 8);                                                                                          \
+        c = c + d;                                                                                                     \
+        b = rotr32(b ^ c, 7);                                                                                          \
+    } while (0)
+
+#define ROUND(r)                                                                                                       \
+    do {                                                                                                               \
+        G(r, 0, v[0], v[4], v[8], v[12]);                                                                              \
+        G(r, 1, v[1], v[5], v[9], v[13]);                                                                              \
+        G(r, 2, v[2], v[6], v[10], v[14]);                                                                             \
+        G(r, 3, v[3], v[7], v[11], v[15]);                                                                             \
+        G(r, 4, v[0], v[5], v[10], v[15]);                                                                             \
+        G(r, 5, v[1], v[6], v[11], v[12]);                                                                             \
+        G(r, 6, v[2], v[7], v[8], v[13]);                                                                              \
+        G(r, 7, v[3], v[4], v[9], v[14]);                                                                              \
+    } while (0)
+
+static void blake2s_compress(blake2s_state *S, const uint8_t in[BLAKE2S_BLOCKBYTES])
 {
-  uint32_t m[16];
-  uint32_t v[16];
-  size_t i;
-
-  for( i = 0; i < 16; ++i ) {
-    m[i] = load32( in + i * sizeof( m[i] ) );
-  }
-
-  for( i = 0; i < 8; ++i ) {
-    v[i] = S->h[i];
-  }
-
-  v[ 8] = blake2s_IV[0];
-  v[ 9] = blake2s_IV[1];
-  v[10] = blake2s_IV[2];
-  v[11] = blake2s_IV[3];
-  v[12] = S->t[0] ^ blake2s_IV[4];
-  v[13] = S->t[1] ^ blake2s_IV[5];
-  v[14] = S->f[0] ^ blake2s_IV[6];
-  v[15] = S->f[1] ^ blake2s_IV[7];
-
-  ROUND( 0 );
-  ROUND( 1 );
-  ROUND( 2 );
-  ROUND( 3 );
-  ROUND( 4 );
-  ROUND( 5 );
-  ROUND( 6 );
-  ROUND( 7 );
-  ROUND( 8 );
-  ROUND( 9 );
-
-  for( i = 0; i < 8; ++i ) {
-    S->h[i] = S->h[i] ^ v[i] ^ v[i + 8];
-  }
+    uint32_t m[16];
+    uint32_t v[16];
+    size_t   i;
+
+    for (i = 0; i < 16; ++i) {
+        m[i] = load32(in + i * sizeof(m[i]));
+    }
+
+    for (i = 0; i < 8; ++i) {
+        v[i] = S->h[i];
+    }
+
+    v[8]  = blake2s_IV[0];
+    v[9]  = blake2s_IV[1];
+    v[10] = blake2s_IV[2];
+    v[11] = blake2s_IV[3];
+    v[12] = S->t[0] ^ blake2s_IV[4];
+    v[13] = S->t[1] ^ blake2s_IV[5];
+    v[14] = S->f[0] ^ blake2s_IV[6];
+    v[15] = S->f[1] ^ blake2s_IV[7];
+
+    ROUND(0);
+    ROUND(1);
+    ROUND(2);
+    ROUND(3);
+    ROUND(4);
+    ROUND(5);
+    ROUND(6);
+    ROUND(7);
+    ROUND(8);
+    ROUND(9);
+
+    for (i = 0; i < 8; ++i) {
+        S->h[i] = S->h[i] ^ v[i] ^ v[i + 8];
+    }
 }
 
 #undef G
 #undef ROUND
 
-int blake2s_update( blake2s_state *S, const void *pin, size_t inlen )
+int blake2s_update(blake2s_state *S, const void *pin, size_t inlen)
 {
-  const unsigned char * in = (const unsigned char *)pin;
-  if( inlen > 0 )
-  {
-    size_t left = S->buflen;
-    size_t fill = BLAKE2S_BLOCKBYTES - left;
-    if( inlen > fill )
-    {
-      S->buflen = 0;
-      memcpy( S->buf + left, in, fill ); /* Fill buffer */
-      blake2s_increment_counter( S, BLAKE2S_BLOCKBYTES );
-      blake2s_compress( S, S->buf ); /* Compress */
-      in += fill; inlen -= fill;
-      while(inlen > BLAKE2S_BLOCKBYTES) {
-        blake2s_increment_counter(S, BLAKE2S_BLOCKBYTES);
-        blake2s_compress( S, in );
-        in += BLAKE2S_BLOCKBYTES;
-        inlen -= BLAKE2S_BLOCKBYTES;
-      }
+    const unsigned char *in = (const unsigned char *)pin;
+    if (inlen > 0) {
+        size_t left = S->buflen;
+        size_t fill = BLAKE2S_BLOCKBYTES - left;
+        if (inlen > fill) {
+            S->buflen = 0;
+            memcpy(S->buf + left, in, fill); /* Fill buffer */
+            blake2s_increment_counter(S, BLAKE2S_BLOCKBYTES);
+            blake2s_compress(S, S->buf); /* Compress */
+            in += fill;
+            inlen -= fill;
+            while (inlen > BLAKE2S_BLOCKBYTES) {
+                blake2s_increment_counter(S, BLAKE2S_BLOCKBYTES);
+                blake2s_compress(S, in);
+                in += BLAKE2S_BLOCKBYTES;
+                inlen -= BLAKE2S_BLOCKBYTES;
+            }
+        }
+        memcpy(S->buf + S->buflen, in, inlen);
+        S->buflen += inlen;
     }
-    memcpy( S->buf + S->buflen, in, inlen );
-    S->buflen += inlen;
-  }
-  return 0;
+    return 0;
 }
 
-int blake2s_final( blake2s_state *S, void *out, size_t outlen )
+int blake2s_final(blake2s_state *S, void *out, size_t outlen)
 {
-  uint8_t buffer[BLAKE2S_OUTBYTES] = {0};
-  size_t i;
+    uint8_t buffer[BLAKE2S_OUTBYTES] = { 0 };
+    size_t  i;
 
-  if( out == NULL || outlen < S->outlen )
-    return -1;
+    if (out == NULL || outlen < S->outlen)
+        return -1;
 
-  if( blake2s_is_lastblock( S ) )
-    return -1;
+    if (blake2s_is_lastblock(S))
+        return -1;
 
-  blake2s_increment_counter( S, ( uint32_t )S->buflen );
-  blake2s_set_lastblock( S );
-  memset( S->buf + S->buflen, 0, BLAKE2S_BLOCKBYTES - S->buflen ); /* Padding */
-  blake2s_compress( S, S->buf );
+    blake2s_increment_counter(S, (uint32_t)S->buflen);
+    blake2s_set_lastblock(S);
+    memset(S->buf + S->buflen, 0, BLAKE2S_BLOCKBYTES - S->buflen); /* Padding */
+    blake2s_compress(S, S->buf);
 
-  for( i = 0; i < 8; ++i ) /* Output full hash to temp buffer */
-    store32( buffer + sizeof( S->h[i] ) * i, S->h[i] );
+    for (i = 0; i < 8; ++i) /* Output full hash to temp buffer */
+        store32(buffer + sizeof(S->h[i]) * i, S->h[i]);
 
-  memcpy( out, buffer, outlen );
-  secure_zero_memory(buffer, sizeof(buffer));
-  return 0;
+    memcpy(out, buffer, outlen);
+    secure_zero_memory(buffer, sizeof(buffer));
+    return 0;
 }
 
-int blake2s( void *out, size_t outlen, const void *in, size_t inlen, const void *key, size_t keylen )
+int blake2s(void *out, size_t outlen, const void *in, size_t inlen, const void *key, size_t keylen)
 {
-  blake2s_state S[1];
+    blake2s_state S[1];
 
-  /* Verify parameters */
-  if ( NULL == in && inlen > 0 ) return -1;
+    /* Verify parameters */
+    if (NULL == in && inlen > 0)
+        return -1;
 
-  if ( NULL == out ) return -1;
+    if (NULL == out)
+        return -1;
 
-  if ( NULL == key && keylen > 0) return -1;
+    if (NULL == key && keylen > 0)
+        return -1;
 
-  if( !outlen || outlen > BLAKE2S_OUTBYTES ) return -1;
+    if (!outlen || outlen > BLAKE2S_OUTBYTES)
+        return -1;
 
-  if( keylen > BLAKE2S_KEYBYTES ) return -1;
+    if (keylen > BLAKE2S_KEYBYTES)
+        return -1;
 
-  if( keylen > 0 )
-  {
-    if( blake2s_init_key( S, outlen, key, keylen ) < 0 ) return -1;
-  }
-  else
-  {
-    if( blake2s_init( S, outlen ) < 0 ) return -1;
-  }
+    if (keylen > 0) {
+        if (blake2s_init_key(S, outlen, key, keylen) < 0)
+            return -1;
+    } else {
+        if (blake2s_init(S, outlen) < 0)
+            return -1;
+    }
 
-  blake2s_update( S, ( const uint8_t * )in, inlen );
-  blake2s_final( S, out, outlen );
-  return 0;
+    blake2s_update(S, (const uint8_t *)in, inlen);
+    blake2s_final(S, out, outlen);
+    return 0;
 }
 
 #if defined(SUPERCOP)
-int crypto_hash( unsigned char *out, unsigned char *in, unsigned long long inlen )
+int crypto_hash(unsigned char *out, unsigned char *in, unsigned long long inlen)
 {
-  return blake2s( out, BLAKE2S_OUTBYTES, in, inlen, NULL, 0 );
+    return blake2s(out, BLAKE2S_OUTBYTES, in, inlen, NULL, 0);
 }
 #endif
 
 #if defined(BLAKE2S_SELFTEST)
 #include "blake2-kat.h"
 #include <string.h>
-int main( void )
+int main(void)
 {
-  uint8_t key[BLAKE2S_KEYBYTES];
-  uint8_t buf[BLAKE2_KAT_LENGTH];
-  size_t i, step;
+    uint8_t key[BLAKE2S_KEYBYTES];
+    uint8_t buf[BLAKE2_KAT_LENGTH];
+    size_t  i, step;
 
-  for( i = 0; i < BLAKE2S_KEYBYTES; ++i )
-    key[i] = ( uint8_t )i;
+    for (i = 0; i < BLAKE2S_KEYBYTES; ++i)
+        key[i] = (uint8_t)i;
 
-  for( i = 0; i < BLAKE2_KAT_LENGTH; ++i )
-    buf[i] = ( uint8_t )i;
+    for (i = 0; i < BLAKE2_KAT_LENGTH; ++i)
+        buf[i] = (uint8_t)i;
 
-  /* Test simple API */
-  for( i = 0; i < BLAKE2_KAT_LENGTH; ++i )
-  {
-    uint8_t hash[BLAKE2S_OUTBYTES];
-    blake2s( hash, BLAKE2S_OUTBYTES, buf, i, key, BLAKE2S_KEYBYTES );
+    /* Test simple API */
+    for (i = 0; i < BLAKE2_KAT_LENGTH; ++i) {
+        uint8_t hash[BLAKE2S_OUTBYTES];
+        blake2s(hash, BLAKE2S_OUTBYTES, buf, i, key, BLAKE2S_KEYBYTES);
 
-    if( 0 != memcmp( hash, blake2s_keyed_kat[i], BLAKE2S_OUTBYTES ) )
-    {
-      goto fail;
+        if (0 != memcmp(hash, blake2s_keyed_kat[i], BLAKE2S_OUTBYTES)) {
+            goto fail;
+        }
     }
-  }
 
-  /* Test streaming API */
-  for(step = 1; step < BLAKE2S_BLOCKBYTES; ++step) {
-    for (i = 0; i < BLAKE2_KAT_LENGTH; ++i) {
-      uint8_t hash[BLAKE2S_OUTBYTES];
-      blake2s_state S;
-      uint8_t * p = buf;
-      size_t mlen = i;
-      int err = 0;
-
-      if( (err = blake2s_init_key(&S, BLAKE2S_OUTBYTES, key, BLAKE2S_KEYBYTES)) < 0 ) {
-        goto fail;
-      }
-
-      while (mlen >= step) {
-        if ( (err = blake2s_update(&S, p, step)) < 0 ) {
-          goto fail;
+    /* Test streaming API */
+    for (step = 1; step < BLAKE2S_BLOCKBYTES; ++step) {
+        for (i = 0; i < BLAKE2_KAT_LENGTH; ++i) {
+            uint8_t       hash[BLAKE2S_OUTBYTES];
+            blake2s_state S;
+            uint8_t *     p    = buf;
+            size_t        mlen = i;
+            int           err  = 0;
+
+            if ((err = blake2s_init_key(&S, BLAKE2S_OUTBYTES, key, BLAKE2S_KEYBYTES)) < 0) {
+                goto fail;
+            }
+
+            while (mlen >= step) {
+                if ((err = blake2s_update(&S, p, step)) < 0) {
+                    goto fail;
+                }
+                mlen -= step;
+                p += step;
+            }
+            if ((err = blake2s_update(&S, p, mlen)) < 0) {
+                goto fail;
+            }
+            if ((err = blake2s_final(&S, hash, BLAKE2S_OUTBYTES)) < 0) {
+                goto fail;
+            }
+
+            if (0 != memcmp(hash, blake2s_keyed_kat[i], BLAKE2S_OUTBYTES)) {
+                goto fail;
+            }
         }
-        mlen -= step;
-        p += step;
-      }
-      if ( (err = blake2s_update(&S, p, mlen)) < 0) {
-        goto fail;
-      }
-      if ( (err = blake2s_final(&S, hash, BLAKE2S_OUTBYTES)) < 0) {
-        goto fail;
-      }
-
-      if (0 != memcmp(hash, blake2s_keyed_kat[i], BLAKE2S_OUTBYTES)) {
-        goto fail;
-      }
     }
-  }
 
-  puts( "ok" );
-  return 0;
+    puts("ok");
+    return 0;
 fail:
-  puts("error");
-  return -1;
+    puts("error");
+    return -1;
 }
 #endif
diff --git a/src/xmpp/jid/jid.cpp b/src/xmpp/jid/jid.cpp
index 3bf2e83f..7f2055d5 100644
--- a/src/xmpp/jid/jid.cpp
+++ b/src/xmpp/jid/jid.cpp
@@ -352,8 +352,5 @@ bool Jid::compare(const Jid &a, bool compareRes) const
     if (!valid || !a.valid)
         return false;
 
-    if (compareRes ? (f != a.f) : (b != a.b))
-        return false;
-
-    return true;
+    return !(compareRes ? (f != a.f) : (b != a.b));
 }
diff --git a/src/xmpp/xmpp-core/compressionhandler.cpp b/src/xmpp/xmpp-core/compressionhandler.cpp
index 500fd8ab..56dd078d 100644
--- a/src/xmpp/xmpp-core/compressionhandler.cpp
+++ b/src/xmpp/xmpp-core/compressionhandler.cpp
@@ -24,7 +24,7 @@ void CompressionHandler::writeIncoming(const QByteArray &a)
 {
     // qDebug("CompressionHandler::writeIncoming");
     // qDebug() << QString("Incoming %1 bytes").arg(a.size());
-    errorCode_ = decompressor_->write(a);
+    errorCode_ = int(decompressor_->write(a));
     if (!errorCode_)
         QTimer::singleShot(0, this, SIGNAL(readyRead()));
     else
diff --git a/src/xmpp/xmpp-core/connector.cpp b/src/xmpp/xmpp-core/connector.cpp
index 74d2966f..e3461826 100644
--- a/src/xmpp/xmpp-core/connector.cpp
+++ b/src/xmpp/xmpp-core/connector.cpp
@@ -325,13 +325,13 @@ void AdvancedConnector::connectToServer(const QString &server)
         if (!d->opt_host.isEmpty()) { /* if custom host:port */
             d->host = d->opt_host;
             d->port = d->opt_port;
-            s->connectToHost(d->host, d->port);
+            s->connectToHost(d->host, quint16(d->port));
             return;
         } else if (d->opt_ssl != Never) { /* if ssl forced or should be probed */
             d->port = XMPP_LEGACY_PORT;
         }
 
-        s->connectToHost(XMPP_CLIENT_SRV, XMPP_CLIENT_TRANSPORT, d->host, d->port);
+        s->connectToHost(XMPP_CLIENT_SRV, XMPP_CLIENT_TRANSPORT, d->host, quint16(d->port));
     }
 }
 
@@ -362,7 +362,7 @@ void AdvancedConnector::bs_connected()
 #endif
     if (d->proxy.type() == Proxy::None) {
         QHostAddress h = (static_cast<BSocket *>(d->bs))->peerAddress();
-        int          p = (static_cast<BSocket *>(d->bs))->peerPort();
+        quint16      p = (static_cast<BSocket *>(d->bs))->peerPort();
         setPeerAddress(h, p);
     }
 
@@ -467,7 +467,7 @@ void AdvancedConnector::bs_error(int x)
         BSocket *s = static_cast<BSocket *>(d->bs);
         d->port    = XMPP_DEFAULT_PORT;
         // at this moment we already tried everything from srv. so just try the host itself
-        s->connectToHost(d->host, d->port);
+        s->connectToHost(d->host, quint16(d->port));
     }
     /* otherwise we have no fallbacks and must have failed to connect */
     else {
@@ -480,9 +480,9 @@ void AdvancedConnector::bs_error(int x)
     }
 }
 
-void AdvancedConnector::http_syncStarted() { httpSyncStarted(); }
+void AdvancedConnector::http_syncStarted() { emit httpSyncStarted(); }
 
-void AdvancedConnector::http_syncFinished() { httpSyncFinished(); }
+void AdvancedConnector::http_syncFinished() { emit httpSyncFinished(); }
 
 void AdvancedConnector::t_timeout()
 {
diff --git a/src/xmpp/xmpp-core/protocol.cpp b/src/xmpp/xmpp-core/protocol.cpp
index 1bf8e88d..9890c5af 100644
--- a/src/xmpp/xmpp-core/protocol.cpp
+++ b/src/xmpp/xmpp-core/protocol.cpp
@@ -839,10 +839,7 @@ void CoreProtocol::handleStreamOpen(const Parser::Event &pe)
         }
     } else {
         if (!dialback) {
-            if (version.major >= 1 && !oldOnly)
-                old = false;
-            else
-                old = true;
+            old = version.major < 1 || oldOnly;
         }
     }
 }
@@ -873,11 +870,8 @@ bool CoreProtocol::isValidStanza(const QDomElement &e) const
 {
     QString      s    = e.tagName();
     Stanza::Kind kind = Stanza::kind(s);
-    if (e.namespaceURI() == (server ? NS_SERVER : NS_CLIENT)
-        && (kind == Stanza::Message || kind == Stanza::Presence || kind == Stanza::IQ))
-        return true;
-    else
-        return false;
+    return e.namespaceURI() == (server ? NS_SERVER : NS_CLIENT)
+        && (kind == Stanza::Message || kind == Stanza::Presence || kind == Stanza::IQ);
 }
 
 bool CoreProtocol::streamManagementHandleStanza(const QDomElement &e)
@@ -891,7 +885,7 @@ bool CoreProtocol::streamManagementHandleStanza(const QDomElement &e)
         event = ESend;
         return true;
     } else if (s == "a") {
-        quint32 last_id = e.attribute("h").toULong();
+        quint32 last_id = e.attribute("h").toUInt();
 #ifdef IRIS_SM_DEBUG
         qDebug() << "Stream Management: [<--] Received ack response from server with h =" << last_id;
 #endif
@@ -998,7 +992,7 @@ bool CoreProtocol::dialbackStep(const QDomElement &e)
                     QString key = e.text();
                     // TODO: report event
                 } else {
-                    bool   ok = (e.attribute("type") == "valid") ? true : false;
+                    bool   ok = e.attribute("type") == "valid";
                     DBItem i;
                     if (grabPendingItem(from, to, DBItem::ResultRequest, &i)) {
                         if (ok) {
@@ -1019,7 +1013,7 @@ bool CoreProtocol::dialbackStep(const QDomElement &e)
                     QString key = e.text();
                     // TODO: report event
                 } else {
-                    bool   ok = (e.attribute("type") == "valid") ? true : false;
+                    bool   ok = e.attribute("type") == "valid";
                     DBItem i;
                     if (grabPendingItem(from, to, DBItem::VerifyRequest, &i)) {
                         if (ok) {
@@ -1712,14 +1706,14 @@ bool CoreProtocol::normalStep(const QDomElement &e)
                             if (port_off != -1) { // looks valid
                                 sm_host = location.midRef(1, port_off - 1);
                                 if (location.length() > port_off + 2 && location.at(port_off + 1) == ':')
-                                    sm_port = location.mid(port_off + 2).toUInt();
+                                    sm_port = location.midRef(port_off + 2).toUInt();
                             }
                         }
                         if (port_off == 0) {
                             port_off = location.indexOf(':');
                             if (port_off != -1) {
                                 sm_host = location.leftRef(port_off);
-                                sm_port = location.mid(port_off + 1).toUInt();
+                                sm_port = location.midRef(port_off + 1).toUInt();
                             } else {
                                 sm_host = location.midRef(0);
                             }
@@ -1732,7 +1726,7 @@ bool CoreProtocol::normalStep(const QDomElement &e)
                 step  = Done;
                 return true;
             } else if (e.localName() == "resumed") {
-                sm.resume(e.attribute("h").toULong());
+                sm.resume(e.attribute("h").toUInt());
                 while (true) {
                     QDomElement st = sm.getUnacknowledgedStanza();
                     if (st.isNull())
diff --git a/src/xmpp/xmpp-core/securestream.cpp b/src/xmpp/xmpp-core/securestream.cpp
index 213a032f..1ddf8f13 100644
--- a/src/xmpp/xmpp-core/securestream.cpp
+++ b/src/xmpp/xmpp-core/securestream.cpp
@@ -256,13 +256,13 @@ private slots:
     void tls_handshaken()
     {
         tls_done = true;
-        tlsHandshaken();
+        emit tlsHandshaken();
     }
 
     void tls_readyRead()
     {
         QByteArray a = p.tls->read();
-        readyRead(a);
+        emit       readyRead(a);
     }
 
     void tls_readyReadOutgoing(int plainBytes)
@@ -270,21 +270,21 @@ private slots:
         QByteArray a = p.tls->readOutgoing();
         if (tls_done)
             layer.specifyEncoded(a.size(), plainBytes);
-        needWrite(a);
+        emit needWrite(a);
     }
 
     void tls_closed()
     {
         QByteArray a = p.tls->readUnprocessed();
-        tlsClosed(a);
+        emit       tlsClosed(a);
     }
 
-    void tls_error(int x) { error(x); }
+    void tls_error(int x) { emit error(x); }
 
     void sasl_readyRead()
     {
         QByteArray a = p.sasl->read();
-        readyRead(a);
+        emit       readyRead(a);
     }
 
     void sasl_readyReadOutgoing()
@@ -292,15 +292,15 @@ private slots:
         int        plainBytes;
         QByteArray a = p.sasl->readOutgoing(&plainBytes);
         layer.specifyEncoded(a.size(), plainBytes);
-        needWrite(a);
+        emit needWrite(a);
     }
 
-    void sasl_error() { error(p.sasl->errorCode()); }
+    void sasl_error() { emit error(p.sasl->errorCode()); }
 
     void compressionHandler_readyRead()
     {
         QByteArray a = p.compressionHandler->read();
-        readyRead(a);
+        emit       readyRead(a);
     }
 
     void compressionHandler_readyReadOutgoing()
@@ -308,29 +308,29 @@ private slots:
         int        plainBytes;
         QByteArray a = p.compressionHandler->readOutgoing(&plainBytes);
         layer.specifyEncoded(a.size(), plainBytes);
-        needWrite(a);
+        emit needWrite(a);
     }
 
-    void compressionHandler_error() { error(p.compressionHandler->errorCode()); }
+    void compressionHandler_error() { emit error(p.compressionHandler->errorCode()); }
 
 #ifdef USE_TLSHANDLER
     void tlsHandler_success()
     {
         tls_done = true;
-        tlsHandshaken();
+        emit tlsHandshaken();
     }
 
-    void tlsHandler_fail() { error(0); }
+    void tlsHandler_fail() { emit error(0); }
 
-    void tlsHandler_closed() { tlsClosed(QByteArray()); }
+    void tlsHandler_closed() { emit tlsClosed(QByteArray()); }
 
-    void tlsHandler_readyRead(const QByteArray &a) { readyRead(a); }
+    void tlsHandler_readyRead(const QByteArray &a) { emit readyRead(a); }
 
     void tlsHandler_readyReadOutgoing(const QByteArray &a, int plainBytes)
     {
         if (tls_done)
             layer.specifyEncoded(a.size(), plainBytes);
-        needWrite(a);
+        emit needWrite(a);
     }
 #endif
 };
@@ -546,19 +546,19 @@ void SecureStream::bs_readyRead()
 void SecureStream::bs_bytesWritten(qint64 bytes)
 {
     for (SecureLayer *s : d->layers) {
-        bytes = s->finished(bytes);
+        bytes = s->finished(int(bytes));
     }
 
     if (bytes > 0) {
         d->pending -= bytes;
-        bytesWritten(bytes);
+        emit bytesWritten(bytes);
     }
 }
 
 void SecureStream::layer_tlsHandshaken()
 {
     d->topInProgress = false;
-    tlsHandshaken();
+    emit tlsHandshaken();
 }
 
 void SecureStream::layer_tlsClosed(const QByteArray &)
@@ -566,7 +566,7 @@ void SecureStream::layer_tlsClosed(const QByteArray &)
     setOpenMode(QIODevice::NotOpen);
     d->active = false;
     d->deleteLayers();
-    tlsClosed();
+    emit tlsClosed();
 }
 
 void SecureStream::layer_readyRead(const QByteArray &a)
diff --git a/src/xmpp/xmpp-core/simplesasl.cpp b/src/xmpp/xmpp-core/simplesasl.cpp
index 3d697ec8..3b45144e 100644
--- a/src/xmpp/xmpp-core/simplesasl.cpp
+++ b/src/xmpp/xmpp-core/simplesasl.cpp
@@ -119,12 +119,10 @@ class SimpleSASLContext : public QCA::SASLContext {
 
     virtual void setConstraints(QCA::SASL::AuthFlags flags, int ssfMin, int)
     {
-        if (flags
+        capable = !(
+            flags
                 & (QCA::SASL::RequireForwardSecrecy | QCA::SASL::RequirePassCredentials | QCA::SASL::RequireMutualAuth)
-            || ssfMin > 0)
-            capable = false;
-        else
-            capable = true;
+            || ssfMin > 0);
         allow_plain = flags & QCA::SASL::AllowPlain;
     }
 
diff --git a/src/xmpp/xmpp-core/sm.cpp b/src/xmpp/xmpp-core/sm.cpp
index 2f42c539..417a67cb 100644
--- a/src/xmpp/xmpp-core/sm.cpp
+++ b/src/xmpp/xmpp-core/sm.cpp
@@ -77,7 +77,7 @@ void StreamManagement::resume(quint32 last_handled)
 void StreamManagement::setLocation(const QString &host, int port)
 {
     state_.resumption_location.host = host;
-    state_.resumption_location.port = port;
+    state_.resumption_location.port = quint16(port);
 }
 
 int StreamManagement::lastAckElapsed() const
@@ -85,7 +85,7 @@ int StreamManagement::lastAckElapsed() const
     if (!sm_timeout_data.elapsed_timer.isValid())
         return 0;
 
-    int msecs = sm_timeout_data.elapsed_timer.elapsed();
+    int msecs = int(sm_timeout_data.elapsed_timer.elapsed());
     int secs  = msecs / 1000;
     if (msecs % 1000 != 0)
         ++secs;
diff --git a/src/xmpp/xmpp-core/stream.cpp b/src/xmpp/xmpp-core/stream.cpp
index 9f7e1d91..0128cae7 100644
--- a/src/xmpp/xmpp-core/stream.cpp
+++ b/src/xmpp/xmpp-core/stream.cpp
@@ -328,7 +328,7 @@ void ClientStream::continueAfterWarning()
         if (!d->tls_warned && !d->using_tls) {
             d->tls_warned = true;
             d->state      = WaitTLS;
-            warning(WarnNoTLS);
+            emit warning(WarnNoTLS);
             return;
         }
         d->state = Connecting;
@@ -345,9 +345,9 @@ void ClientStream::accept()
     processNext();
 }
 
-bool ClientStream::isActive() const { return (d->state != Idle) ? true : false; }
+bool ClientStream::isActive() const { return d->state != Idle; }
 
-bool ClientStream::isAuthenticated() const { return (d->state == Active) ? true : false; }
+bool ClientStream::isAuthenticated() const { return d->state == Active; }
 
 void ClientStream::setUsername(const QString &s)
 {
@@ -545,7 +545,7 @@ void ClientStream::cr_connected()
     // d->client.startServerOut(d->server);
 
     d->client.startClientOut(d->jid, d->oldOnly, d->conn->useSSL(), d->doAuth, d->doCompress);
-    d->client.setAllowTLS(d->tlsHandler ? true : false);
+    d->client.setAllowTLS(d->tlsHandler != nullptr);
     d->client.setAllowBind(d->doBinding);
     d->client.setAllowPlain(d->allowPlain == AllowPlain || (d->allowPlain == AllowPlainOverTLS && d->conn->useSSL()));
     d->client.setLang(d->lang);
@@ -577,13 +577,13 @@ void ClientStream::cr_connected()
 void ClientStream::cr_error()
 {
     reset();
-    error(ErrConnection);
+    emit error(ErrConnection);
 }
 
 void ClientStream::bs_connectionClosed()
 {
     reset();
-    connectionClosed();
+    emit connectionClosed();
 }
 
 void ClientStream::bs_delayedCloseFinished()
@@ -622,9 +622,9 @@ void ClientStream::ss_readyRead()
 void ClientStream::ss_bytesWritten(qint64 bytes)
 {
     if (d->mode == Client)
-        d->client.outgoingDataWritten(bytes);
+        d->client.outgoingDataWritten(int(bytes));
     else
-        d->srv.outgoingDataWritten(bytes);
+        d->srv.outgoingDataWritten(int(bytes));
 
     if (d->notify & CoreProtocol::NSend) {
 #ifdef XMPP_DEBUG
@@ -638,7 +638,7 @@ void ClientStream::ss_tlsHandshaken()
 {
     QPointer<QObject> self = this;
     if (!d->quiet_reconnection)
-        securityLayerActivated(LayerTLS);
+        emit securityLayerActivated(LayerTLS);
     if (!self)
         return;
     d->client.setAllowPlain(d->allowPlain == AllowPlain || d->allowPlain == AllowPlainOverTLS);
@@ -648,7 +648,7 @@ void ClientStream::ss_tlsHandshaken()
 void ClientStream::ss_tlsClosed()
 {
     reset();
-    connectionClosed();
+    emit connectionClosed();
 }
 
 void ClientStream::ss_error(int x)
@@ -656,10 +656,10 @@ void ClientStream::ss_error(int x)
     if (x == SecureStream::ErrTLS) {
         reset();
         d->errCond = TLSFail;
-        error(ErrTLS);
+        emit error(ErrTLS);
     } else {
         reset();
-        error(ErrSecurityLayer);
+        emit error(ErrSecurityLayer);
     }
 }
 
@@ -697,7 +697,7 @@ void ClientStream::sasl_needParams(const QCA::SASL::Params &p)
     }*/
     if (p.needUsername() || p.needPassword() || p.canSendRealm()) {
         d->state = NeedParams;
-        needAuthParams(p.needUsername(), p.needPassword(), p.canSendRealm());
+        emit needAuthParams(p.needUsername(), p.needPassword(), p.canSendRealm());
     } else
         d->sasl->continueAfterParams();
 }
@@ -738,7 +738,7 @@ void ClientStream::sasl_error()
     d->errText = tr("Offered mechanisms: ") + d->client.features.sasl_mechs.join(", ");
     reset();
     d->errCond = x;
-    error(ErrAuth);
+    emit error(ErrAuth);
 }
 
 void ClientStream::srvProcessNext()
@@ -806,7 +806,7 @@ void ClientStream::srvProcessNext()
         case CoreProtocol::EError: {
             qDebug("Error! Code=%d\n", d->srv.errorCode);
             reset();
-            error(ErrProtocol);
+            emit error(ErrProtocol);
             // handleError();
             return;
         }
@@ -851,7 +851,7 @@ void ClientStream::srvProcessNext()
             // TODO: this isn' an error
             qDebug("peer closed\n");
             reset();
-            error(ErrProtocol);
+            emit error(ErrProtocol);
             return;
         }
         }
@@ -968,7 +968,7 @@ void ClientStream::processNext()
 
             if (d->client.old) {
                 d->state = WaitVersion;
-                warning(WarnOldVersion);
+                emit warning(WarnOldVersion);
                 return;
             }
             break;
@@ -983,7 +983,7 @@ void ClientStream::processNext()
             if (!d->tls_warned && !d->using_tls && !d->client.features.tls_supported) {
                 d->tls_warned = true;
                 d->state      = WaitTLS;
-                warning(WarnNoTLS);
+                emit warning(WarnNoTLS);
                 return;
             }
             break;
@@ -1003,7 +1003,7 @@ void ClientStream::processNext()
             d->state = Active;
             setNoopTime(d->noop_time);
             if (!d->quiet_reconnection)
-                authenticated();
+                emit authenticated();
             if (!self)
                 return;
             break;
@@ -1013,7 +1013,7 @@ void ClientStream::processNext()
             qDebug("DocumentClosed\n");
 #endif
             reset();
-            connectionClosed();
+            emit connectionClosed();
             return;
         }
         case CoreProtocol::EStanzaReady: {
@@ -1034,7 +1034,7 @@ void ClientStream::processNext()
 #ifdef XMPP_DEBUG
             qDebug("StanzasSent\n");
 #endif
-            stanzaWritten();
+            emit stanzaWritten();
             if (!self)
                 return;
             break;
@@ -1044,7 +1044,7 @@ void ClientStream::processNext()
             qDebug("Closed\n");
 #endif
             reset();
-            delayedCloseFinished();
+            emit delayedCloseFinished();
             return;
         }
         case CoreProtocol::EAck: {
@@ -1214,7 +1214,7 @@ bool ClientStream::handleNeed()
         if (d->sasl_ssf > 0) {
             QPointer<QObject> self = this;
             if (!d->quiet_reconnection)
-                securityLayerActivated(LayerSASL);
+                emit securityLayerActivated(LayerSASL);
             if (!self)
                 return false;
         }
@@ -1225,7 +1225,7 @@ bool ClientStream::handleNeed()
         qDebug("Need Password\n");
 #endif
         d->state = NeedParams;
-        needAuthParams(false, true, false);
+        emit needAuthParams(false, true, false);
         return false;
     }
     }
@@ -1290,10 +1290,10 @@ void ClientStream::handleError()
     int c = d->client.errorCode;
     if (c == CoreProtocol::ErrParse) {
         reset();
-        error(ErrParse);
+        emit error(ErrParse);
     } else if (c == CoreProtocol::ErrProtocol) {
         reset();
-        error(ErrProtocol);
+        emit error(ErrProtocol);
     } else if (c == CoreProtocol::ErrStream) {
         int         x        = d->client.errCond;
         QString     text     = d->client.errText;
@@ -1404,18 +1404,18 @@ void ClientStream::handleError()
         d->errAppSpec  = appSpec;
         if (connErr != -1) {
             d->errCond = connErr;
-            error(ErrNeg);
+            emit error(ErrNeg);
         } else {
             if (strErr != -1)
                 d->errCond = strErr;
             else
                 d->errCond = GenericStreamError;
-            error(ErrStream);
+            emit error(ErrStream);
         }
     } else if (c == CoreProtocol::ErrStartTLS) {
         reset();
         d->errCond = TLSStart;
-        error(ErrTLS);
+        emit error(ErrTLS);
     } else if (c == CoreProtocol::ErrAuth) {
         int x = d->client.errCond;
         int r = GenericAuthError;
@@ -1477,11 +1477,11 @@ void ClientStream::handleError()
         reset();
         d->errCond     = r;
         d->errLangText = d->client.errLangText;
-        error(ErrAuth);
+        emit error(ErrAuth);
     } else if (c == CoreProtocol::ErrPlain) {
         reset();
         d->errCond = NoMech;
-        error(ErrAuth);
+        emit error(ErrAuth);
     } else if (c == CoreProtocol::ErrBind) {
         int r = -1;
         if (d->client.errCond == CoreProtocol::BindBadRequest) {
@@ -1495,10 +1495,10 @@ void ClientStream::handleError()
         if (r != -1) {
             reset();
             d->errCond = r;
-            error(ErrBind);
+            emit error(ErrBind);
         } else {
             reset();
-            error(ErrProtocol);
+            emit error(ErrProtocol);
         }
     }
 }
diff --git a/src/xmpp/xmpp-core/tlshandler.cpp b/src/xmpp/xmpp-core/tlshandler.cpp
index ce9d98a6..6ee9f773 100644
--- a/src/xmpp/xmpp-core/tlshandler.cpp
+++ b/src/xmpp/xmpp-core/tlshandler.cpp
@@ -223,10 +223,7 @@ static bool cert_match_ipaddress(const QString &certname, const QByteArray &ipad
         return false;
 
     // not the same?
-    if (addr != ipaddress)
-        return false;
-
-    return true;
+    return addr == ipaddress;
 }
 
 static bool matchesHostName(const QCA::Certificate &cert, const QString &host)
@@ -375,7 +372,7 @@ void QCATLSHandler::continueAfterHandshake()
 {
     if (d->state == 2) {
         d->tls->continueAfterStep();
-        success();
+        emit success();
         d->state = 3;
     }
 }
@@ -383,23 +380,23 @@ void QCATLSHandler::continueAfterHandshake()
 void QCATLSHandler::tls_handshaken()
 {
     d->state = 2;
-    tlsHandshaken();
+    emit tlsHandshaken();
 }
 
-void QCATLSHandler::tls_readyRead() { readyRead(d->tls->read()); }
+void QCATLSHandler::tls_readyRead() { emit readyRead(d->tls->read()); }
 
 void QCATLSHandler::tls_readyReadOutgoing()
 {
     int        plainBytes;
     QByteArray buf = d->tls->readOutgoing(&plainBytes);
-    readyReadOutgoing(buf, plainBytes);
+    emit       readyReadOutgoing(buf, plainBytes);
 }
 
-void QCATLSHandler::tls_closed() { closed(); }
+void QCATLSHandler::tls_closed() { emit closed(); }
 
 void QCATLSHandler::tls_error()
 {
     d->err   = d->tls->errorCode();
     d->state = 0;
-    fail();
+    emit fail();
 }
diff --git a/src/xmpp/xmpp-core/xmpp_stanza.cpp b/src/xmpp/xmpp-core/xmpp_stanza.cpp
index a3e89b78..70dd947c 100644
--- a/src/xmpp/xmpp-core/xmpp_stanza.cpp
+++ b/src/xmpp/xmpp-core/xmpp_stanza.cpp
@@ -536,7 +536,7 @@ Stanza &Stanza::operator=(const Stanza &from)
 
 Stanza::~Stanza() { delete d; }
 
-bool Stanza::isNull() const { return (d ? false : true); }
+bool Stanza::isNull() const { return d == nullptr; }
 
 QDomElement Stanza::element() const { return d->e; }
 
diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
index 48c99732..ab3c2a9b 100644
--- a/src/xmpp/xmpp-im/client.cpp
+++ b/src/xmpp/xmpp-im/client.cpp
@@ -457,7 +457,7 @@ void Client::close(bool)
         d->stream->close();
         d->stream = nullptr;
     }
-    disconnected();
+    emit disconnected();
     cleanup(); // TODO wait till stream writes all data to the socket
 }
 
@@ -489,7 +489,7 @@ void Client::streamError(int)
     // error(e);
 
     // if(!e.isWarning()) {
-    disconnected();
+    emit disconnected();
     cleanup();
     //}
 } // namespace XMPP
@@ -702,9 +702,9 @@ void Client::ppPresence(const Jid &j, const Status &s)
         GroupChat &i = *it;
 
         if (i.j.compare(j, false)) {
-            bool us = (i.j.resource() == j.resource() || j.resource().isEmpty()) ? true : false;
+            bool us = i.j.resource() == j.resource() || j.resource().isEmpty();
 
-            debug(QString("for groupchat i=[%1] pres=[%2], [us=%3].\n").arg(i.j.full()).arg(j.full()).arg(us));
+            debug(QString("for groupchat i=[%1] pres=[%2], [us=%3].\n").arg(i.j.full(), j.full()).arg(us));
             switch (i.status) {
             case GroupChat::Connecting:
                 if (us && s.hasError()) {
@@ -768,7 +768,7 @@ void Client::ppPresence(const Jid &j, const Status &s)
 void Client::updateSelfPresence(const Jid &j, const Status &s)
 {
     ResourceList::Iterator rit   = d->resourceList.find(j.resource());
-    bool                   found = (rit == d->resourceList.end()) ? false : true;
+    bool                   found = rit != d->resourceList.end();
 
     // unavailable?  remove the resource
     if (!s.isAvailable()) {
@@ -799,13 +799,13 @@ void Client::updateSelfPresence(const Jid &j, const Status &s)
 void Client::updatePresence(LiveRosterItem *i, const Jid &j, const Status &s)
 {
     ResourceList::Iterator rit   = i->resourceList().find(j.resource());
-    bool                   found = (rit == i->resourceList().end()) ? false : true;
+    bool                   found = rit != i->resourceList().end();
 
     // unavailable?  remove the resource
     if (!s.isAvailable()) {
         if (found) {
             (*rit).setStatus(s);
-            debug(QString("Client: Removing resource from [%1]: name=[%2]\n").arg(i->jid().full()).arg(j.resource()));
+            debug(QString("Client: Removing resource from [%1]: name=[%2]\n").arg(i->jid().full(), j.resource()));
             emit resourceUnavailable(j, *rit);
             i->resourceList().erase(rit);
             i->setLastUnavailableStatus(s);
@@ -825,11 +825,11 @@ void Client::updatePresence(LiveRosterItem *i, const Jid &j, const Status &s)
         if (!found) {
             r = Resource(j.resource(), s);
             i->resourceList() += r;
-            debug(QString("Client: Adding resource to [%1]: name=[%2]\n").arg(i->jid().full()).arg(j.resource()));
+            debug(QString("Client: Adding resource to [%1]: name=[%2]\n").arg(i->jid().full(), j.resource()));
         } else {
             (*rit).setStatus(s);
             r = *rit;
-            debug(QString("Client: Updating resource to [%1]: name=[%2]\n").arg(i->jid().full()).arg(j.resource()));
+            debug(QString("Client: Updating resource to [%1]: name=[%2]\n").arg(i->jid().full(), j.resource()));
         }
 
         emit resourceAvailable(j, r);
@@ -857,10 +857,10 @@ void Client::pmMessage(const Message &m)
                 continue;
 
             if (i.status == GroupChat::Connected)
-                messageReceived(m);
+                emit messageReceived(m);
         }
     } else
-        messageReceived(m);
+        emit messageReceived(m);
 }
 
 void Client::prRoster(const Roster &r) { importRoster(r); }
@@ -1254,12 +1254,7 @@ const ResourceList &LiveRosterItem::resourceList() const { return v_resourceList
 
 ResourceList::ConstIterator LiveRosterItem::priority() const { return v_resourceList.priority(); }
 
-bool LiveRosterItem::isAvailable() const
-{
-    if (v_resourceList.count() > 0)
-        return true;
-    return false;
-}
+bool LiveRosterItem::isAvailable() const { return v_resourceList.count() > 0; }
 
 const Status &LiveRosterItem::lastUnavailableStatus() const { return v_lastUnavailableStatus; }
 
diff --git a/src/xmpp/xmpp-im/filetransfer.cpp b/src/xmpp/xmpp-im/filetransfer.cpp
index b71258f1..1324f773 100644
--- a/src/xmpp/xmpp-im/filetransfer.cpp
+++ b/src/xmpp/xmpp-im/filetransfer.cpp
@@ -143,27 +143,27 @@ void FileTransfer::sendFile(const Jid &to, const QString &fname, qlonglong size,
 
 int FileTransfer::dataSizeNeeded() const
 {
-    int pending = d->c->bytesToWrite();
+    quint64 pending = d->c->bytesToWrite();
     if (pending >= SENDBUFSIZE)
         return 0;
     qlonglong left = d->length - (d->sent + pending);
     int       size = SENDBUFSIZE - pending;
-    if ((qlonglong)size > left)
-        size = (int)left;
+    if (qlonglong(size) > left)
+        size = int(left);
     return size;
 }
 
 void FileTransfer::writeFileData(const QByteArray &a)
 {
-    int       pending = d->c->bytesToWrite();
+    quint64   pending = d->c->bytesToWrite();
     qlonglong left    = d->length - (d->sent + pending);
     if (left == 0)
         return;
 
     QByteArray block;
-    if ((qlonglong)a.size() > left) {
+    if (qlonglong(a.size()) > left) {
         block = a;
-        block.resize((uint)left);
+        block.resize(uint(left));
     } else
         block = a;
     d->c->write(block);
@@ -235,7 +235,7 @@ void FileTransfer::ft_finished()
             connect(d->c, SIGNAL(error(int)), SLOT(stream_error(int)));
 
             d->c->connectToJid(d->peer, d->id);
-            accepted();
+            emit accepted();
         } else {
             emit error(Err400);
             reset();
@@ -262,7 +262,7 @@ void FileTransfer::takeConnection(BSConnection *c)
     S5BConnection *s5b = dynamic_cast<S5BConnection *>(c);
     if (s5b && d->proxy.isValid())
         s5b->setProxy(d->proxy);
-    accepted();
+    emit accepted();
     QTimer::singleShot(0, this, SLOT(doAccept()));
 }
 
@@ -289,7 +289,7 @@ void FileTransfer::stream_readyRead()
     d->sent += a.size();
     //    if(d->sent == d->length) // we close it in stream_connectionClosed. at least for ibb
     //        reset();             // in other words we wait for another party to close the connection
-    readyRead(a);
+    emit readyRead(a);
 }
 
 void FileTransfer::stream_bytesWritten(qint64 x)
@@ -304,11 +304,11 @@ void FileTransfer::stream_error(int x)
 {
     reset();
     if (x == BSConnection::ErrRefused || x == BSConnection::ErrConnect)
-        error(ErrConnect);
+        emit error(ErrConnect);
     else if (x == BSConnection::ErrProxy)
-        error(ErrProxy);
+        emit error(ErrProxy);
     else
-        error(ErrStream);
+        emit error(ErrStream);
 }
 
 void FileTransfer::man_waitForAccept(const FTRequest &req, const QString &streamType)
@@ -421,7 +421,7 @@ void FileTransferManager::pft_incoming(const FTRequest &req)
     FileTransfer *ft = new FileTransfer(this);
     ft->man_waitForAccept(req, streamType);
     d->incoming.append(ft);
-    incomingReady();
+    emit incomingReady();
 }
 
 BytestreamManager *FileTransferManager::streamManager(const QString &ns) const
diff --git a/src/xmpp/xmpp-im/httpfileupload.cpp b/src/xmpp/xmpp-im/httpfileupload.cpp
index d5a3f2d1..1a70e04b 100644
--- a/src/xmpp/xmpp-im/httpfileupload.cpp
+++ b/src/xmpp/xmpp-im/httpfileupload.cpp
@@ -448,7 +448,7 @@ HttpFileUpload *HttpFileUploadManager::upload(const QString &srcFilename, const
     return hfu;
 }
 
-HttpFileUpload *HttpFileUploadManager::upload(QIODevice *source, size_t fsize, const QString &dstFilename,
+HttpFileUpload *HttpFileUploadManager::upload(QIODevice *source, quint64 fsize, const QString &dstFilename,
                                               const QString &mType)
 {
     auto                   hfu  = new HttpFileUpload(d->client, source, fsize, dstFilename, mType);
diff --git a/src/xmpp/xmpp-im/httpfileupload.h b/src/xmpp/xmpp-im/httpfileupload.h
index 8a4ae26a..2896bb0d 100644
--- a/src/xmpp/xmpp-im/httpfileupload.h
+++ b/src/xmpp/xmpp-im/httpfileupload.h
@@ -190,7 +190,7 @@ class HttpFileUploadManager : public QObject {
      * @param mType - meta type
      * @return returns a handler object which will signal "finished" when ready
      */
-    HttpFileUpload *upload(QIODevice *source, size_t fsize, const QString &dstFilename,
+    HttpFileUpload *upload(QIODevice *source, quint64 fsize, const QString &dstFilename,
                            const QString &mType = QString());
 
 private:
diff --git a/src/xmpp/xmpp-im/jingle-ibb.cpp b/src/xmpp/xmpp-im/jingle-ibb.cpp
index ca77c899..5a731c5c 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.cpp
+++ b/src/xmpp/xmpp-im/jingle-ibb.cpp
@@ -364,7 +364,7 @@ namespace XMPP { namespace Jingle { namespace IBB {
         return upd;
     }
 
-    bool Transport::isValid() const { return d; }
+    bool Transport::isValid() const { return bool(d); }
 
     TransportFeatures Transport::features() const
     {
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index a72cc76a..6c0f3919 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -231,8 +231,8 @@ namespace XMPP { namespace Jingle { namespace ICE {
                 return 1;
         } else if (a.protocol() == QAbstractSocket::IPv4Protocol) {
             quint32 v4 = a.toIPv4Address();
-            quint8  a0 = v4 >> 24;
-            quint8  a1 = (v4 >> 16) & 0xff;
+            quint8  a0 = quint8(v4 >> 24);
+            quint8  a1 = quint8((v4 >> 16) & 0xff);
             if (a0 == 127)
                 return 0;
             else if (a0 == 169 && a1 == 254)
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index ef8c8676..ceab7c3f 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -461,7 +461,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
 
     void Candidate::setPort(quint16 port) { d->port = port; }
 
-    quint16 Candidate::localPort() const { return d->server ? d->server->serverPort() : 0; }
+    quint16 Candidate::localPort() const { return quint16(d->server ? d->server->serverPort() : 0); }
 
     QHostAddress Candidate::localAddress() const { return d->server ? d->server->serverAddress() : QHostAddress(); }
 
diff --git a/src/xmpp/xmpp-im/s5b.cpp b/src/xmpp/xmpp-im/s5b.cpp
index 969adb8c..3f33f805 100644
--- a/src/xmpp/xmpp-im/s5b.cpp
+++ b/src/xmpp/xmpp-im/s5b.cpp
@@ -320,12 +320,12 @@ void S5BConnection::writeDatagram(const S5BDatagram &i)
 {
     QByteArray buf;
     buf.resize(i.data().size() + 4);
-    ushort     ssp  = htons(i.sourcePort());
-    ushort     sdp  = htons(i.destPort());
+    ushort     ssp  = htons(uint16_t(i.sourcePort()));
+    ushort     sdp  = htons(uint16_t(i.destPort()));
     QByteArray data = i.data();
     memcpy(buf.data(), &ssp, 2);
     memcpy(buf.data() + 2, &sdp, 2);
-    memcpy(buf.data() + 4, data.data(), data.size());
+    memcpy(buf.data() + 4, data.data(), size_t(data.size()));
     sendUDP(buf);
 }
 
@@ -427,7 +427,7 @@ void S5BConnection::sc_connectionClosed()
     }
     d->notifyClose = false;
     resetConnection();
-    connectionClosed();
+    emit connectionClosed();
 }
 
 void S5BConnection::sc_delayedCloseFinished()
@@ -452,7 +452,7 @@ void S5BConnection::sc_readyRead()
 void S5BConnection::sc_bytesWritten(qint64 x)
 {
     // echo
-    bytesWritten(x);
+    emit bytesWritten(x);
 }
 
 void S5BConnection::sc_error(int)
@@ -476,10 +476,10 @@ void S5BConnection::handleUDP(const QByteArray &buf)
     int        dest   = ntohs(sdp);
     QByteArray data;
     data.resize(buf.size() - 4);
-    memcpy(data.data(), buf.data() + 4, data.size());
+    memcpy(data.data(), buf.data() + 4, size_t(data.size()));
     d->dglist.append(new S5BDatagram(source, dest, data));
 
-    datagramReady();
+    emit datagramReady();
 }
 
 void S5BConnection::sendUDP(const QByteArray &buf)
@@ -717,12 +717,7 @@ S5BManager::Entry *S5BManager::findEntryBySID(const Jid &peer, const QString &si
     return nullptr;
 }
 
-bool S5BManager::srv_ownsHash(const QString &key) const
-{
-    if (findEntryByHash(key))
-        return true;
-    return false;
-}
+bool S5BManager::srv_ownsHash(const QString &key) const { return findEntryByHash(key) != nullptr; }
 
 void S5BManager::srv_incomingReady(SocksClient *sc, const QString &key)
 {
@@ -845,7 +840,7 @@ void S5BManager::item_tryingHosts(const StreamHostList &list)
     Item * i = static_cast<Item *>(sender());
     Entry *e = findEntry(i);
 
-    e->c->tryingHosts(list); // signal
+    emit e->c->tryingHosts(list); // signal
 }
 
 void S5BManager::item_proxyConnect()
@@ -853,7 +848,7 @@ void S5BManager::item_proxyConnect()
     Item * i = static_cast<Item *>(sender());
     Entry *e = findEntry(i);
 
-    e->c->proxyConnect(); // signal
+    emit e->c->proxyConnect(); // signal
 }
 
 void S5BManager::item_waitingForActivation()
@@ -861,7 +856,7 @@ void S5BManager::item_waitingForActivation()
     Item * i = static_cast<Item *>(sender());
     Entry *e = findEntry(i);
 
-    e->c->waitingForActivation(); // signal
+    emit e->c->waitingForActivation(); // signal
 }
 
 void S5BManager::item_connected()
@@ -903,16 +898,15 @@ void S5BManager::entryContinue(Entry *e)
         const S5BRequest &req = e->c->d->req;
         e->i->startTarget(e->sid, d->client->jid(), e->c->d->peer, req.dstaddr, req.hosts, req.id, req.fast, req.udp);
     } else {
-        e->i->startRequester(e->sid, d->client->jid(), e->c->d->peer, true,
-                             e->c->d->mode == S5BConnection::Datagram ? true : false);
-        e->c->requesting(); // signal
+        e->i->startRequester(e->sid, d->client->jid(), e->c->d->peer, true, e->c->d->mode == S5BConnection::Datagram);
+        emit e->c->requesting(); // signal
     }
 }
 
 void S5BManager::queryProxy(Entry *e)
 {
     QPointer<QObject> self = this;
-    e->c->proxyQuery(); // signal
+    emit              e->c->proxyQuery(); // signal
     if (!self)
         return;
 
@@ -954,7 +948,7 @@ void S5BManager::query_finished()
     }
 
     QPointer<QObject> self = this;
-    e->c->proxyResult(query->success()); // signal
+    emit              e->c->proxyResult(query->success()); // signal
     if (!self)
         return;
 
@@ -974,10 +968,7 @@ bool S5BManager::targetShouldOfferProxy(Entry *e)
     }
 
     // ensure we don't offer the same proxy as the requester
-    if (haveHost(hosts, e->c->d->proxy))
-        return false;
-
-    return true;
+    return !haveHost(hosts, e->c->d->proxy);
 }
 
 //----------------------------------------------------------------------------
@@ -1182,7 +1173,7 @@ void S5BManager::Item::doIncoming()
     connect(conn, SIGNAL(result(bool)), SLOT(conn_result(bool)));
 
     QPointer<QObject> self = this;
-    tryingHosts(list);
+    emit              tryingHosts(list);
     if (!self)
         return;
 
@@ -1261,7 +1252,7 @@ void S5BManager::Item::jt_finished()
                        qPrintable(peer.full()));
 #endif
                 resetConnection();
-                error(ErrWrongHost);
+                emit error(ErrWrongHost);
             }
         } else if (streamHost.compare(proxy.jid())) {
             // toss out any direct incoming, since it won't be used
@@ -1279,7 +1270,7 @@ void S5BManager::Item::jt_finished()
             list += proxy;
 
             QPointer<QObject> self = this;
-            proxyConnect();
+            emit              proxyConnect();
             if (!self)
                 return;
 
@@ -1290,7 +1281,7 @@ void S5BManager::Item::jt_finished()
                    qPrintable(peer.full()));
 #endif
             resetConnection();
-            error(ErrWrongHost);
+            emit error(ErrWrongHost);
         }
     } else {
 #ifdef S5B_DEBUG
@@ -1393,7 +1384,7 @@ void S5BManager::Item::proxy_result(bool b)
         delete proxy_conn;
         proxy_conn = nullptr;
         resetConnection();
-        error(ErrProxy);
+        emit error(ErrProxy);
     }
 }
 
@@ -1413,7 +1404,7 @@ void S5BManager::Item::proxy_finished()
             checkForActivation();
     } else {
         resetConnection();
-        error(ErrProxy);
+        emit error(ErrProxy);
     }
 }
 
@@ -1442,7 +1433,7 @@ void S5BManager::Item::sc_error(int)
     qDebug("sc_error\n");
 #endif
     resetConnection();
-    error(ErrConnect);
+    emit error(ErrConnect);
 }
 
 void S5BManager::Item::doConnectError()
@@ -1570,7 +1561,7 @@ void S5BManager::Item::checkForActivation()
     } else {
         // only emit waitingForActivation if there is nothing left to do
         if ((connSuccess || localFailed) && !proxy_task && !proxy_conn)
-            waitingForActivation();
+            emit waitingForActivation();
     }
 }
 
@@ -1593,12 +1584,12 @@ void S5BManager::Item::checkFailure()
         if (state == Requester) {
             resetConnection();
             if (statusCode == 404)
-                error(ErrConnect);
+                emit error(ErrConnect);
             else
-                error(ErrRefused);
+                emit error(ErrRefused);
         } else {
             resetConnection();
-            error(ErrConnect);
+            emit error(ErrConnect);
         }
     }
 }
@@ -1673,7 +1664,7 @@ private slots:
         qDebug("S5BConnector[%s]: error\n", qPrintable(host.host()));
 #endif
         cleanup();
-        result(false);
+        emit result(false);
     }
 
     void trySendUDP()
@@ -1681,7 +1672,7 @@ private slots:
         if (udp_tries == 5) {
             t.stop();
             cleanup();
-            result(false);
+            emit result(false);
             return;
         }
 
@@ -1706,7 +1697,7 @@ private slots:
         qDebug("S5BConnector[%s]: success\n", qPrintable(host.host()));
 #endif
         client->disconnect(this);
-        result(true);
+        emit result(true);
     }
 };
 
@@ -1814,7 +1805,7 @@ void S5BConnector::t_timeout()
 #ifdef S5B_DEBUG
     qDebug("S5BConnector: failed! (timeout)\n");
 #endif
-    result(false);
+    emit result(false);
 }
 
 void S5BConnector::man_udpSuccess(const Jid &streamHost)
@@ -1999,12 +1990,12 @@ bool JT_PushS5B::take(const QDomElement &e)
     if (e.tagName() == "message") {
         QDomElement x = e.elementsByTagName("udpsuccess").item(0).toElement();
         if (!x.isNull() && x.namespaceURI() == S5B_NS) {
-            incomingUDPSuccess(Jid(x.attribute("from")), x.attribute("dstaddr"));
+            emit incomingUDPSuccess(Jid(x.attribute("from")), x.attribute("dstaddr"));
             return true;
         }
         x = e.elementsByTagName("activate").item(0).toElement();
         if (!x.isNull() && x.namespaceURI() == "http://affinix.com/jabber/stream") {
-            incomingActivate(Jid(x.attribute("from")), x.attribute("sid"), Jid(x.attribute("jid")));
+            emit incomingActivate(Jid(x.attribute("from")), x.attribute("sid"), Jid(x.attribute("jid")));
             return true;
         }
         return false;
@@ -2061,7 +2052,7 @@ bool JT_PushS5B::take(const QDomElement &e)
     r.dstaddr = q.attribute("dstaddr"); // special case for muc as in xep-0065rc3
     r.hosts   = hosts;
     r.fast    = fast;
-    r.udp     = q.attribute("mode") == "udp" ? true : false;
+    r.udp     = q.attribute("mode") == "udp";
 
     emit incoming(r);
     return true;
@@ -2183,7 +2174,7 @@ private slots:
         expire.stop();
         delete client;
         client = nullptr;
-        result(false);
+        emit result(false);
     }
 };
 
@@ -2238,7 +2229,7 @@ S5BServer::~S5BServer()
     // basically to make QScopedPointer happy
 }
 
-void S5BServer::writeUDP(const QHostAddress &addr, int port, const QByteArray &data)
+void S5BServer::writeUDP(const QHostAddress &addr, quint16 port, const QByteArray &data)
 {
     d->serv.writeUDP(addr, port, data);
 }
diff --git a/src/xmpp/xmpp-im/s5b.h b/src/xmpp/xmpp-im/s5b.h
index 7cbdbe24..a394bf7e 100644
--- a/src/xmpp/xmpp-im/s5b.h
+++ b/src/xmpp/xmpp-im/s5b.h
@@ -242,7 +242,7 @@ class S5BServer : public TcpPortServer {
     S5BServer(QTcpServer *serverSocket);
     ~S5BServer();
 
-    void writeUDP(const QHostAddress &addr, int port, const QByteArray &data);
+    void writeUDP(const QHostAddress &addr, quint16 port, const QByteArray &data);
     bool isActive() const;
     bool hasKey(const QString &key);
     void registerKey(const QString &key);
diff --git a/src/xmpp/xmpp-im/types.cpp b/src/xmpp/xmpp-im/types.cpp
index 4bab096e..9e1ac64a 100644
--- a/src/xmpp/xmpp-im/types.cpp
+++ b/src/xmpp/xmpp-im/types.cpp
@@ -966,10 +966,10 @@ class Message::Private : public QSharedData {
     Message::CarbonDir       carbonDir         = Message::NoCarbon; // it's a forwarded message
     Message::ProcessingHints processingHints;
     QString                  replaceId;
-    QString                  originId;   // XEP-0359
+    QString                  originId;           // XEP-0359
     QString                  encryptionProtocol; // XEP-0380
-    Message::StanzaId        stanzaId;   // XEP-0359
-    QList<Reference>         references; // XEP-0385 and XEP-0372
+    Message::StanzaId        stanzaId;           // XEP-0359
+    QList<Reference>         references;         // XEP-0385 and XEP-0372
 };
 
 #define MessageD() (d ? d : (d = new Private))
diff --git a/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp b/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp
index 52c4c216..33576a6a 100644
--- a/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp
+++ b/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp
@@ -90,7 +90,7 @@ void BoBData::setMaxAge(unsigned int maxAge) { d->maxAge = maxAge; }
 void BoBData::fromXml(const QDomElement &data)
 {
     setCid(data.attribute("cid"));
-    d->maxAge = data.attribute("max-age").toInt();
+    d->maxAge = data.attribute("max-age").toUInt();
     d->type   = data.attribute("type");
     d->data   = QByteArray::fromBase64(data.text().replace("\n", "").toLatin1());
 }
diff --git a/src/xmpp/xmpp-im/xmpp_caps.cpp b/src/xmpp/xmpp-im/xmpp_caps.cpp
index 6a3e166a..ab1b327e 100644
--- a/src/xmpp/xmpp-im/xmpp_caps.cpp
+++ b/src/xmpp/xmpp-im/xmpp_caps.cpp
@@ -263,9 +263,7 @@ void CapsManager::updateCaps(const Jid &jid, const CapsSpec &c)
         } else {
             // Remove all caps specifications
             qWarning() << QString("caps.cpp: Illegal caps info from %1: node=%2, ver=%3")
-                              .arg(QString(jid.full()).replace('%', "%%"))
-                              .arg(fullNode)
-                              .arg(c.version());
+                              .arg(QString(jid.full()).replace('%', "%%"), fullNode, c.version());
             capsSpecs_.remove(jid.full());
         }
     } else {
diff --git a/src/xmpp/xmpp-im/xmpp_ibb.cpp b/src/xmpp/xmpp-im/xmpp_ibb.cpp
index 1f2141c4..0e81d289 100644
--- a/src/xmpp/xmpp-im/xmpp_ibb.cpp
+++ b/src/xmpp/xmpp-im/xmpp_ibb.cpp
@@ -177,13 +177,7 @@ QString IBBConnection::sid() const { return d->sid; }
 
 BytestreamManager *IBBConnection::manager() const { return d->m; }
 
-bool IBBConnection::isOpen() const
-{
-    if (d->state == Active)
-        return true;
-    else
-        return false;
-}
+bool IBBConnection::isOpen() const { return d->state == Active; }
 
 qint64 IBBConnection::writeData(const char *data, qint64 maxSize)
 {
@@ -192,7 +186,7 @@ qint64 IBBConnection::writeData(const char *data, qint64 maxSize)
         return 0;
     }
 
-    ByteStream::appendWrite(QByteArray::fromRawData(data, maxSize));
+    ByteStream::appendWrite(QByteArray::fromRawData(data, int(maxSize)));
     trySend();
     return maxSize;
 }
@@ -311,7 +305,7 @@ void IBBConnection::trySend()
 IBBData &IBBData::fromXml(const QDomElement &e)
 {
     sid  = e.attribute("sid");
-    seq  = e.attribute("seq").toInt();
+    seq  = quint16(e.attribute("seq").toInt());
     data = QByteArray::fromBase64(e.text().toUtf8());
     return *this;
 }
diff --git a/src/xmpp/xmpp-im/xmpp_message.h b/src/xmpp/xmpp-im/xmpp_message.h
index a5de37a6..da7b8ebb 100644
--- a/src/xmpp/xmpp-im/xmpp_message.h
+++ b/src/xmpp/xmpp-im/xmpp_message.h
@@ -208,8 +208,8 @@ class Message {
     void     setOriginId(const QString &id);
 
     // XEP-0380
-    QString  encryptionProtocol() const;
-    void     setEncryptionProtocol(const QString &protocol);
+    QString encryptionProtocol() const;
+    void    setEncryptionProtocol(const QString &protocol);
 
     // XEP-0385 and XEP-0372
     QList<Reference> references() const;
diff --git a/src/xmpp/xmpp-im/xmpp_task.cpp b/src/xmpp/xmpp-im/xmpp_task.cpp
index 7aa1de1a..709c2f55 100644
--- a/src/xmpp/xmpp-im/xmpp_task.cpp
+++ b/src/xmpp/xmpp-im/xmpp_task.cpp
@@ -302,8 +302,8 @@ QString Task::encryptionProtocol(const QDomElement &e) const
     if (e.elementsByTagNameNS("urn:xmpp:eme:0", "encryption").isEmpty())
         return QString();
 
-    QDomElement encryption = e.elementsByTagNameNS("urn:xmpp:eme:0", "encryption").at(0).toElement();
-    const QString &&ns = encryption.attribute("namespace");
+    QDomElement     encryption = e.elementsByTagNameNS("urn:xmpp:eme:0", "encryption").at(0).toElement();
+    const QString &&ns         = encryption.attribute("namespace");
 
     // https://xmpp.org/extensions/xep-0380.html#protocols
     QString protocol;
diff --git a/src/xmpp/xmpp-im/xmpp_tasks.cpp b/src/xmpp/xmpp-im/xmpp_tasks.cpp
index c41d172a..7baa42bd 100644
--- a/src/xmpp/xmpp-im/xmpp_tasks.cpp
+++ b/src/xmpp/xmpp-im/xmpp_tasks.cpp
@@ -539,7 +539,7 @@ bool JT_PushRoster::take(const QDomElement &e)
     if (!iqVerify(e, client()->host(), "", "jabber:iq:roster"))
         return false;
 
-    roster(xmlReadRoster(queryTag(e), true));
+    emit roster(xmlReadRoster(queryTag(e), true));
     send(createIQ(doc(), "result", e.attribute("from"), e.attribute("id")));
 
     return true;
@@ -688,7 +688,7 @@ bool JT_PushPresence::take(const QDomElement &e)
             if (!tag.isNull() && tag.namespaceURI() == "http://jabber.org/protocol/nick") {
                 nick = tagContent(tag);
             }
-            subscription(j, type, nick);
+            emit subscription(j, type, nick);
             return true;
         }
     }
@@ -779,7 +779,7 @@ bool JT_PushPresence::take(const QDomElement &e)
         p.setTimeStamp(stamp);
     }
 
-    presence(j, p);
+    emit presence(j, p);
 
     return true;
 }
diff --git a/src/xmpp/xmpp-im/xmpp_vcard.cpp b/src/xmpp/xmpp-im/xmpp_vcard.cpp
index 61c26fc4..2c56e4af 100644
--- a/src/xmpp/xmpp-im/xmpp_vcard.cpp
+++ b/src/xmpp/xmpp-im/xmpp_vcard.cpp
@@ -145,18 +145,16 @@ VCardPrivate::~VCardPrivate() { }
 
 bool VCardPrivate::isEmpty() const
 {
-    if (!version.isEmpty() || !fullName.isEmpty() || !familyName.isEmpty() || !givenName.isEmpty()
-        || !middleName.isEmpty() || !prefixName.isEmpty() || !suffixName.isEmpty() || !nickName.isEmpty()
-        || !photo.isEmpty() || !photoURI.isEmpty() || !bday.isEmpty() || !addressList.isEmpty() || !labelList.isEmpty()
-        || !phoneList.isEmpty() || !emailList.isEmpty() || !jid.isEmpty() || !mailer.isEmpty() || !timezone.isEmpty()
-        || !geo.lat.isEmpty() || !geo.lon.isEmpty() || !title.isEmpty() || !role.isEmpty() || !logo.isEmpty()
-        || !logoURI.isEmpty() || (agent && !agent->isEmpty()) || !agentURI.isEmpty() || !org.name.isEmpty()
-        || !org.unit.isEmpty() || !categories.isEmpty() || !note.isEmpty() || !prodId.isEmpty() || !rev.isEmpty()
-        || !sortString.isEmpty() || !sound.isEmpty() || !soundURI.isEmpty() || !soundPhonetic.isEmpty()
-        || !uid.isEmpty() || !url.isEmpty() || !desc.isEmpty() || (privacyClass != VCard::pcNone) || !key.isEmpty()) {
-        return false;
-    }
-    return true;
+    return !(!version.isEmpty() || !fullName.isEmpty() || !familyName.isEmpty() || !givenName.isEmpty()
+             || !middleName.isEmpty() || !prefixName.isEmpty() || !suffixName.isEmpty() || !nickName.isEmpty()
+             || !photo.isEmpty() || !photoURI.isEmpty() || !bday.isEmpty() || !addressList.isEmpty()
+             || !labelList.isEmpty() || !phoneList.isEmpty() || !emailList.isEmpty() || !jid.isEmpty()
+             || !mailer.isEmpty() || !timezone.isEmpty() || !geo.lat.isEmpty() || !geo.lon.isEmpty() || !title.isEmpty()
+             || !role.isEmpty() || !logo.isEmpty() || !logoURI.isEmpty() || (agent && !agent->isEmpty())
+             || !agentURI.isEmpty() || !org.name.isEmpty() || !org.unit.isEmpty() || !categories.isEmpty()
+             || !note.isEmpty() || !prodId.isEmpty() || !rev.isEmpty() || !sortString.isEmpty() || !sound.isEmpty()
+             || !soundURI.isEmpty() || !soundPhonetic.isEmpty() || !uid.isEmpty() || !url.isEmpty() || !desc.isEmpty()
+             || (privacyClass != VCard::pcNone) || !key.isEmpty());
 }
 
 VCard::VCard() { }
diff --git a/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp b/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
index 4f4a7ccb..3b57d9fa 100644
--- a/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
+++ b/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
@@ -66,13 +66,13 @@ QDateTime stamp2TS(const QString &ts)
     if (ts.length() != 17)
         return QDateTime();
 
-    int year  = ts.mid(0, 4).toInt();
-    int month = ts.mid(4, 2).toInt();
-    int day   = ts.mid(6, 2).toInt();
+    int year  = ts.midRef(0, 4).toInt();
+    int month = ts.midRef(4, 2).toInt();
+    int day   = ts.midRef(6, 2).toInt();
 
-    int hour = ts.mid(9, 2).toInt();
-    int min  = ts.mid(12, 2).toInt();
-    int sec  = ts.mid(15, 2).toInt();
+    int hour = ts.midRef(9, 2).toInt();
+    int min  = ts.midRef(12, 2).toInt();
+    int sec  = ts.midRef(15, 2).toInt();
 
     QDate xd;
     xd.setDate(year, month, day);
@@ -407,7 +407,7 @@ void readBoolEntry(const QDomElement &e, const QString &name, bool *v)
     QDomElement tag = e.firstChildElement(name);
     if (tag.isNull())
         return;
-    *v = (tagContent(tag) == "true") ? true : false;
+    *v = tagContent(tag) == "true";
 }
 
 void readSizeEntry(const QDomElement &e, const QString &name, QSize *v)
@@ -473,7 +473,7 @@ void readBoolAttribute(QDomElement e, const QString &name, bool *v)
 {
     if (e.hasAttribute(name)) {
         QString s = e.attribute(name);
-        *v        = (s == "true") ? true : false;
+        *v        = s == "true";
     }
 }
 
diff --git a/src/xmpp/zlib/zlibcompressor.cpp b/src/xmpp/zlib/zlibcompressor.cpp
index da6f067a..bb15c25e 100644
--- a/src/xmpp/zlib/zlibcompressor.cpp
+++ b/src/xmpp/zlib/zlibcompressor.cpp
@@ -43,7 +43,7 @@ int ZLibCompressor::write(const QByteArray &input) { return write(input, false);
 int ZLibCompressor::write(const QByteArray &input, bool flush)
 {
     int result;
-    zlib_stream_->avail_in = input.size();
+    zlib_stream_->avail_in = uInt(input.size());
     zlib_stream_->next_in  = (Bytef *)input.data();
     QByteArray output;
 
diff --git a/src/xmpp/zlib/zlibdecompressor.cpp b/src/xmpp/zlib/zlibdecompressor.cpp
index 9c67e6dd..c7d2567f 100644
--- a/src/xmpp/zlib/zlibdecompressor.cpp
+++ b/src/xmpp/zlib/zlibdecompressor.cpp
@@ -43,7 +43,7 @@ qint64 ZLibDecompressor::write(const QByteArray &input) { return write(input, fa
 qint64 ZLibDecompressor::write(const QByteArray &input, bool flush)
 {
     int result;
-    zlib_stream_->avail_in = input.size();
+    zlib_stream_->avail_in = uInt(input.size());
     zlib_stream_->next_in  = (Bytef *)input.data();
     QByteArray output;
 
diff --git a/tools/nettool/main.cpp b/tools/nettool/main.cpp
index eef9fe0f..2bead449 100644
--- a/tools/nettool/main.cpp
+++ b/tools/nettool/main.cpp
@@ -920,7 +920,7 @@ int main(int argc, char **argv)
         ResolveName a;
         a.name      = args[1];
         a.type      = (NameRecord::Type)x;
-        a.longlived = (args[0] == "rnamel") ? true : false;
+        a.longlived = args[0] == "rnamel";
         if (args[0] == "rname" && null_dump)
             a.null_dump = true;
         QObject::connect(&a, SIGNAL(quit()), &qapp, SLOT(quit()));

From 2ca07b359df7c195bf262111911be073322e09d3 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Thu, 22 Apr 2021 10:04:03 +0300
Subject: [PATCH 293/383] WebRTC DCEP in progress

---
 src/irisnet/noncore/icelocaltransport.cpp     |  4 +-
 src/irisnet/noncore/stuntransaction.cpp       |  6 +--
 src/irisnet/noncore/stuntransaction.h         |  2 +-
 src/xmpp/xmpp-im/jingle-connection.cpp        | 19 +++++++++
 src/xmpp/xmpp-im/jingle-connection.h          |  4 ++
 .../xmpp-im/jingle-sctp-association_p.cpp     | 16 ++++++--
 src/xmpp/xmpp-im/jingle-sctp-association_p.h  | 15 +++----
 .../xmpp-im/jingle-webrtc-datachannel_p.cpp   | 40 +++++++++++++------
 .../xmpp-im/jingle-webrtc-datachannel_p.h     | 34 +++++++++-------
 9 files changed, 95 insertions(+), 45 deletions(-)

diff --git a/src/irisnet/noncore/icelocaltransport.cpp b/src/irisnet/noncore/icelocaltransport.cpp
index 84d11bb5..52e3e722 100644
--- a/src/irisnet/noncore/icelocaltransport.cpp
+++ b/src/irisnet/noncore/icelocaltransport.cpp
@@ -260,8 +260,8 @@ class IceLocalTransport::Private : public QObject {
 
         pool = StunTransactionPool::Ptr::create(StunTransaction::Udp);
         pool->setDebugLevel((StunTransactionPool::DebugLevel)debugLevel);
-        connect(pool.data(), SIGNAL(outgoingMessage(QByteArray, QHostAddress, int)),
-                SLOT(pool_outgoingMessage(QByteArray, QHostAddress, int)));
+        connect(pool.data(), SIGNAL(outgoingMessage(QByteArray, QHostAddress, quint16)),
+                SLOT(pool_outgoingMessage(QByteArray, QHostAddress, quint16)));
         connect(pool.data(), SIGNAL(needAuthParams()), SLOT(pool_needAuthParams()));
         connect(pool.data(), SIGNAL(debugLine(QString)), SLOT(pool_debugLine(QString)));
 
diff --git a/src/irisnet/noncore/stuntransaction.cpp b/src/irisnet/noncore/stuntransaction.cpp
index 327e6d51..c0dff102 100644
--- a/src/irisnet/noncore/stuntransaction.cpp
+++ b/src/irisnet/noncore/stuntransaction.cpp
@@ -131,7 +131,7 @@ class StunTransactionPrivate : public QObject {
     QByteArray               id;
     QByteArray               packet;
     QHostAddress             to_addr;
-    int                      to_port;
+    quint16                  to_port;
 
     int     rto, rc, rm, ti;
     int     tries;
@@ -171,7 +171,7 @@ class StunTransactionPrivate : public QObject {
         t->deleteLater();
     }
 
-    void start(StunTransactionPool::Ptr _pool, const QHostAddress &toAddress, int toPort)
+    void start(StunTransactionPool::Ptr _pool, const QHostAddress &toAddress, quint16 toPort)
     {
         pool    = _pool;
         mode    = pool->d->mode;
@@ -326,7 +326,7 @@ private slots:
         pool->d->transmit(q);
     }
 
-    bool checkActiveAndFrom(const QHostAddress &from_addr, int from_port)
+    bool checkActiveAndFrom(const QHostAddress &from_addr, quint16 from_port)
     {
         if (!active)
             return false;
diff --git a/src/irisnet/noncore/stuntransaction.h b/src/irisnet/noncore/stuntransaction.h
index 5aec3a53..4bb5dc32 100644
--- a/src/irisnet/noncore/stuntransaction.h
+++ b/src/irisnet/noncore/stuntransaction.h
@@ -174,7 +174,7 @@ class StunTransactionPool : public QObject, public QEnableSharedFromThis<StunTra
     //   writeIncomingMessage() during outgoingMessage() could cause
     //   a transaction's finished() or error() signals to emit during
     //   start(), which would violate DOR-DS.
-    void outgoingMessage(const QByteArray &packet, const QHostAddress &addr, int port);
+    void outgoingMessage(const QByteArray &packet, const QHostAddress &addr, quint16 port);
 
     void needAuthParams();
 
diff --git a/src/xmpp/xmpp-im/jingle-connection.cpp b/src/xmpp/xmpp-im/jingle-connection.cpp
index 63645af8..1a5baf7e 100644
--- a/src/xmpp/xmpp-im/jingle-connection.cpp
+++ b/src/xmpp/xmpp-im/jingle-connection.cpp
@@ -25,10 +25,29 @@ namespace XMPP { namespace Jingle {
 
     NetworkDatagram Connection::receiveDatagram(qint64 maxSize)
     {
+        qCritical("Calling unimplemented function receiveDatagram");
         Q_UNUSED(maxSize)
         return NetworkDatagram();
     }
 
+    bool Connection::sendDatagram(const NetworkDatagram &)
+    {
+        qCritical("Calling unimplemented function sendDatagram");
+        return false;
+    }
+
+    qint64 Connection::writeData(const char *, qint64)
+    {
+        qCritical("Calling unimplemented function writeData");
+        return 0;
+    }
+
+    qint64 Connection::readData(char *, qint64)
+    {
+        qCritical("Calling unimplemented function readData");
+        return 0;
+    }
+
     size_t Connection::blockSize() const
     {
         return 0; // means "block" is not applicable for this kind of connection
diff --git a/src/xmpp/xmpp-im/jingle-connection.h b/src/xmpp/xmpp-im/jingle-connection.h
index f2efce9c..be0fd45b 100644
--- a/src/xmpp/xmpp-im/jingle-connection.h
+++ b/src/xmpp/xmpp-im/jingle-connection.h
@@ -64,6 +64,7 @@ namespace XMPP { namespace Jingle {
         using Ptr = QSharedPointer<Connection>; // will be shared between transport and application
         virtual bool              hasPendingDatagrams() const;
         virtual NetworkDatagram   receiveDatagram(qint64 maxSize = -1);
+        virtual bool              sendDatagram(const NetworkDatagram &data);
         virtual size_t            blockSize() const;
         virtual int               component() const;
         virtual TransportFeatures features() const = 0;
@@ -77,6 +78,9 @@ namespace XMPP { namespace Jingle {
         void disconnected();
 
     protected:
+        qint64 writeData(const char *data, qint64 maxSize);
+        qint64 readData(char *data, qint64 maxSize);
+
         bool    _isRemote = false;
         QString _id;
     };
diff --git a/src/xmpp/xmpp-im/jingle-sctp-association_p.cpp b/src/xmpp/xmpp-im/jingle-sctp-association_p.cpp
index 035d913c..e1293b43 100644
--- a/src/xmpp/xmpp-im/jingle-sctp-association_p.cpp
+++ b/src/xmpp/xmpp-im/jingle-sctp-association_p.cpp
@@ -112,6 +112,11 @@ namespace XMPP { namespace Jingle { namespace SCTP {
 
         channel->setStreamId(streamId);
         pendingChannels.append(channel);
+        auto it = channels.constFind(streamId);
+        if (it != channels.constEnd()) {
+            qWarning("datachannel %u was replaced", streamId);
+            (*it).staticCast<WebRTCDataChannel>()->onDisconnected(WebRTCDataChannel::ChannelReplaced);
+        }
         channels.insert(streamId, channel);
 
         // acknowledge channel open instantly
@@ -138,12 +143,15 @@ namespace XMPP { namespace Jingle { namespace SCTP {
         }
     }
 
-    bool AssociationPrivate::write(const QByteArray &data, quint16 streamId, quint32 ppid)
+    bool AssociationPrivate::write(const QByteArray &data, quint16 streamId, quint32 ppid, Reliability reliable,
+                                   bool ordered, quint32 reliability)
     {
-        qDebug("jignle-sctp: write");
+        qDebug("jignle-sctp: write %d bytes on stream %u with ppid %u", data.size(), streamId, ppid);
         RTC::DataConsumer consumer;
-        consumer.sctpParameters.streamId = streamId;
-        consumer.sctpParameters.ordered  = true;
+        consumer.sctpParameters.streamId          = streamId;
+        consumer.sctpParameters.ordered           = ordered; // ordered=true also enables reliability
+        consumer.sctpParameters.maxPacketLifeTime = reliable == PartialTimers ? reliability : 0;
+        consumer.sctpParameters.maxRetransmits    = reliable == PartialRexmit ? reliability : 0;
         bool success;
         assoc.SendSctpMessage(
             &consumer, ppid, reinterpret_cast<const uint8_t *>(data.data()), data.size(),
diff --git a/src/xmpp/xmpp-im/jingle-sctp-association_p.h b/src/xmpp/xmpp-im/jingle-sctp-association_p.h
index f5630242..4957b7f7 100644
--- a/src/xmpp/xmpp-im/jingle-sctp-association_p.h
+++ b/src/xmpp/xmpp-im/jingle-sctp-association_p.h
@@ -69,13 +69,14 @@ namespace XMPP { namespace Jingle { namespace SCTP {
         void OnSctpAssociationBufferedAmount(RTC::SctpAssociation *sctpAssociation, uint32_t len) override;
         void OnSctpStreamClosed(RTC::SctpAssociation *sctpAssociation, uint16_t streamId) override;
 
-        void                   handleIncomingDataChannelOpen(const QByteArray &data, quint16 streamId);
-        void                   setIdSelector(IdSelector selector);
-        bool                   write(const QByteArray &data, quint16 streamId, quint32 ppid);
-        void                   close(quint16 streamId);
-        quint16                takeNextStreamId();
-        Connection::Ptr        newChannel(Reliability reliable, bool ordered, quint32 reliability, quint16 priority,
-                                          const QString &label, const QString &protocol);
+        void            handleIncomingDataChannelOpen(const QByteArray &data, quint16 streamId);
+        void            setIdSelector(IdSelector selector);
+        bool            write(const QByteArray &data, quint16 streamId, quint32 ppid, Reliability reliable = Reliable,
+                              bool ordered = true, quint32 reliability = 0);
+        void            close(quint16 streamId);
+        quint16         takeNextStreamId();
+        Connection::Ptr newChannel(Reliability reliable, bool ordered, quint32 reliability, quint16 priority,
+                                   const QString &label, const QString &protocol);
         QList<Connection::Ptr> allChannels() const;
         Connection::Ptr        nextChannel();
 
diff --git a/src/xmpp/xmpp-im/jingle-webrtc-datachannel_p.cpp b/src/xmpp/xmpp-im/jingle-webrtc-datachannel_p.cpp
index 1422b5fb..6b5ae601 100644
--- a/src/xmpp/xmpp-im/jingle-webrtc-datachannel_p.cpp
+++ b/src/xmpp/xmpp-im/jingle-webrtc-datachannel_p.cpp
@@ -25,9 +25,11 @@
 namespace XMPP { namespace Jingle { namespace SCTP {
 
     WebRTCDataChannel::WebRTCDataChannel(AssociationPrivate *association, quint8 channelType, quint32 reliability,
-                                         quint16 priority, const QString &label, const QString &protocol) :
+                                         quint16 priority, const QString &label, const QString &protocol,
+                                         DcepState state) :
         association(association),
-        channelType(channelType), reliability(reliability), priority(priority), label(label), protocol(protocol)
+        channelType(channelType), reliability(reliability), priority(priority), label(label), protocol(protocol),
+        dcepState(state)
     {
     }
 
@@ -71,12 +73,16 @@ namespace XMPP { namespace Jingle { namespace SCTP {
         }
         QString label    = QString::fromUtf8(data.data() + 12, labelLength);
         QString protocol = QString::fromUtf8(data.data() + protoOff, protocolLength);
-        return QSharedPointer<WebRTCDataChannel>::create(assoc, channelType, priority, reliability, label, protocol);
+        // start with DcepNegotiated since caller will ack asap
+        auto channel       = QSharedPointer<WebRTCDataChannel>::create(assoc, channelType, priority, reliability, label,
+                                                                 protocol, DcepNegotiated);
+        channel->_isRemote = true;
+        return channel;
     }
 
     void WebRTCDataChannel::connect()
     {
-        Q_ASSERT(streamId == -1);
+        // Q_ASSERT(streamId == -1);
         auto utf8Label    = label.toUtf8();
         auto utf8Protocol = protocol.toUtf8();
 
@@ -94,6 +100,7 @@ namespace XMPP { namespace Jingle { namespace SCTP {
         data.replace(12, utf8Label.size(), utf8Label);
         data.replace(protoOff, utf8Protocol.size(), utf8Protocol);
 
+        dcepState = DcepOpening;
         association->write(data, streamId, PPID_DCEP);
     }
 
@@ -105,6 +112,16 @@ namespace XMPP { namespace Jingle { namespace SCTP {
         return datagrams.size() ? datagrams.takeFirst() : NetworkDatagram();
     }
 
+    bool WebRTCDataChannel::sendDatagram(const NetworkDatagram &data)
+    {
+        bool        ordered  = !(channelType & 0x80);
+        Reliability reliable = ordered ? Reliable
+            : (channelType & 0x3) == 1 ? PartialRexmit
+            : (channelType & 0x3) == 2 ? PartialTimers
+                                       : Reliable;
+        return association->write(data.data(), streamId, PPID_BINARY, reliable, ordered, reliability);
+    }
+
     qint64 WebRTCDataChannel::bytesAvailable() const { return 0; }
 
     qint64 WebRTCDataChannel::bytesToWrite() const { return 0; /*client->bytesToWrite();*/ }
@@ -118,13 +135,6 @@ namespace XMPP { namespace Jingle { namespace SCTP {
             | TransportFeature::Fast;
     }
 
-    qint64 WebRTCDataChannel::writeData(const char *data, qint64 maxSize)
-    {
-        return 0; // client->write(data, maxSize);
-    }
-
-    qint64 WebRTCDataChannel::readData(char *data, qint64 maxSize) { return 0; }
-
     void WebRTCDataChannel::onConnected()
     {
         qDebug("jingle-sctp: channel connected!");
@@ -142,14 +152,18 @@ namespace XMPP { namespace Jingle { namespace SCTP {
             return;
         streamId         = -1;
         disconnectReason = reason;
-        setOpenMode(QIODevice::ReadOnly);
+        setOpenMode(openMode() & ~QIODevice::WriteOnly);
         emit disconnected();
     }
 
     void WebRTCDataChannel::onIncomingData(const QByteArray &data, quint32 ppid)
     {
         if (ppid == PPID_DCEP) {
-            if (data.isEmpty() || data[0] != DCEP_DATA_CHANNEL_ACK || !waitingAck) {
+            if (dcepState == NoDcep) {
+                qWarning("jingle-sctp: got dcep on prenegotiated datachannel");
+                return;
+            }
+            if (data.isEmpty() || data[0] != DCEP_DATA_CHANNEL_ACK || dcepState != DcepOpening) {
                 qWarning("jingle-sctp: unexpected DCEP. ignoring");
                 return;
             }
diff --git a/src/xmpp/xmpp-im/jingle-webrtc-datachannel_p.h b/src/xmpp/xmpp-im/jingle-webrtc-datachannel_p.h
index 360cb6d8..2e9b0876 100644
--- a/src/xmpp/xmpp-im/jingle-webrtc-datachannel_p.h
+++ b/src/xmpp/xmpp-im/jingle-webrtc-datachannel_p.h
@@ -21,30 +21,37 @@
 
 namespace XMPP { namespace Jingle { namespace SCTP {
 
-    enum : quint32 { PPID_DCEP = 50 };
+    enum : quint32 {
+        PPID_DCEP         = 50,
+        PPID_STRING       = 51,
+        PPID_BINARY       = 53,
+        PPID_STRING_EMPTY = 56,
+        PPID_BINARY_EMPTY = 57
+    };
     enum : quint8 { DCEP_DATA_CHANNEL_ACK = 0x02, DCEP_DATA_CHANNEL_OPEN = 0x03 };
 
     class AssociationPrivate;
     class WebRTCDataChannel : public XMPP::Jingle::Connection {
         Q_OBJECT
     public:
-        enum DisconnectReason { TransportClosed, SctpClosed, ChannelClosed };
+        enum DisconnectReason { TransportClosed, SctpClosed, ChannelClosed, ChannelReplaced };
+        enum DcepState { NoDcep, DcepOpening, DcepNegotiated };
 
         AssociationPrivate *   association;
         QList<NetworkDatagram> datagrams;
         DisconnectReason       disconnectReason = ChannelClosed;
-        bool                   waitingAck       = false;
 
-        quint8  channelType = 0;
-        quint32 reliability = 0;
-        quint16 priority    = 256;
-        QString label;
-        QString protocol;
-        int     streamId = -1;
+        quint8    channelType = 0;
+        quint32   reliability = 0;
+        quint16   priority    = 256;
+        QString   label;
+        QString   protocol;
+        int       streamId  = -1;
+        DcepState dcepState = NoDcep;
 
         WebRTCDataChannel(AssociationPrivate *association, quint8 channelType = 0, quint32 reliability = 0,
-                          quint16 priority = 256, const QString &label = QString(),
-                          const QString &protocol = QString());
+                          quint16 priority = 256, const QString &label = QString(), const QString &protocol = QString(),
+                          DcepState state = NoDcep);
         static QSharedPointer<WebRTCDataChannel> fromChannelOpen(AssociationPrivate *assoc, const QByteArray &data);
 
         void setStreamId(quint16 id) { streamId = id; }
@@ -52,15 +59,12 @@ namespace XMPP { namespace Jingle { namespace SCTP {
 
         bool              hasPendingDatagrams() const override;
         NetworkDatagram   receiveDatagram(qint64 maxSize = -1) override;
+        bool              sendDatagram(const NetworkDatagram &data) override;
         qint64            bytesAvailable() const override;
         qint64            bytesToWrite() const override;
         void              close() override;
         TransportFeatures features() const override;
 
-    protected:
-        qint64 writeData(const char *data, qint64 maxSize);
-        qint64 readData(char *data, qint64 maxSize);
-
     public:
         void onConnected();
         void onError(QAbstractSocket::SocketError error);

From 013813a45ce088be1dabb2440af022060f2079d3 Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Fri, 23 Apr 2021 12:21:36 +0300
Subject: [PATCH 294/383] Fixed build with MSVC and probably with Xcode

---
 CMakeLists.txt                          | 3 +++
 src/irisnet/noncore/cutestuff/socks.cpp | 3 +++
 src/irisnet/noncore/dtls.cpp            | 2 ++
 src/xmpp/xmpp-im/s5b.cpp                | 3 +++
 4 files changed, 11 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b2ee7056..8aae9613 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -177,6 +177,9 @@ else()
         list(APPEND USRSCTP_INCLUDE_DIR ${USRSCTP_SOURCE_DIR}/usrsctplib)
     endif()
     set(USRSCTP_LIBRARY ${USRSCTP_BUILD_DIR}/usrsctplib/${CMAKE_STATIC_LIBRARY_PREFIX}usrsctp${CMAKE_STATIC_LIBRARY_SUFFIX})
+    if(WIN32 AND MSVC)
+        add_definitions(-DWIN32_LEAN_AND_MEAN)
+    endif()
 
     include(ExternalProject)
     #set CMake options and transfer the environment to an external project
diff --git a/src/irisnet/noncore/cutestuff/socks.cpp b/src/irisnet/noncore/cutestuff/socks.cpp
index b05e72ad..c8fc3799 100644
--- a/src/irisnet/noncore/cutestuff/socks.cpp
+++ b/src/irisnet/noncore/cutestuff/socks.cpp
@@ -42,6 +42,9 @@
 
 #ifdef Q_OS_WIN32
 #include <windows.h>
+#ifdef _MSC_VER
+#include <winsock2.h>
+#endif
 #endif
 
 // CS_NAMESPACE_BEGIN
diff --git a/src/irisnet/noncore/dtls.cpp b/src/irisnet/noncore/dtls.cpp
index f4d9c7ae..45685fa8 100644
--- a/src/irisnet/noncore/dtls.cpp
+++ b/src/irisnet/noncore/dtls.cpp
@@ -1,6 +1,8 @@
 #include "dtls.h"
 #include "xmpp_xmlcommon.h"
 
+#include <array>
+
 #include <QtCrypto>
 #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
 #include <QRandomGenerator>
diff --git a/src/xmpp/xmpp-im/s5b.cpp b/src/xmpp/xmpp-im/s5b.cpp
index 3f33f805..3527a4c0 100644
--- a/src/xmpp/xmpp-im/s5b.cpp
+++ b/src/xmpp/xmpp-im/s5b.cpp
@@ -32,6 +32,9 @@
 #include <stdlib.h>
 #ifdef Q_OS_WIN
 #include <windows.h>
+#ifdef _MSC_VER
+#include <winsock2.h>
+#endif
 #else
 #include <netinet/in.h>
 #endif

From 23bb95f8430710a5542d978987868c05e66768c2 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 25 Apr 2021 01:35:57 +0300
Subject: [PATCH 295/383] Added ConnectionWaiter for jingle appliation
 requiring just one connection with static features

---
 src/irisnet/noncore/sctp/SctpAssociation.cpp  |  7 --
 src/xmpp/xmpp-im/jingle-application.cpp       | 99 ++++++++++++++++++-
 src/xmpp/xmpp-im/jingle-application.h         |  2 +
 src/xmpp/xmpp-im/jingle-ft.cpp                | 88 +++++++----------
 src/xmpp/xmpp-im/jingle-ibb.cpp               | 12 +--
 .../xmpp-im/jingle-webrtc-datachannel_p.cpp   |  2 +
 6 files changed, 140 insertions(+), 70 deletions(-)

diff --git a/src/irisnet/noncore/sctp/SctpAssociation.cpp b/src/irisnet/noncore/sctp/SctpAssociation.cpp
index 5f044cb5..816c00af 100644
--- a/src/irisnet/noncore/sctp/SctpAssociation.cpp
+++ b/src/irisnet/noncore/sctp/SctpAssociation.cpp
@@ -556,13 +556,6 @@ void SctpAssociation::OnUsrSctpSendSctpData(void *buffer, size_t len)
 void SctpAssociation::OnUsrSctpReceiveSctpData(uint16_t streamId, uint16_t ssn, uint32_t ppid, int flags,
                                                const uint8_t *data, size_t len)
 {
-    // Ignore WebRTC DataChannel Control DATA chunks.
-    if (ppid == 50) {
-        MS_WARN_TAG(sctp, "ignoring SCTP data with ppid:50 (WebRTC DataChannel Control)");
-
-        return;
-    }
-
     if (this->messageBufferLen != 0 && ssn != this->lastSsnReceived) {
         MS_WARN_TAG(sctp,
                     "message chunk received with different SSN while buffer not empty, buffer discarded [ssn:%" PRIu16
diff --git a/src/xmpp/xmpp-im/jingle-application.cpp b/src/xmpp/xmpp-im/jingle-application.cpp
index 7bdf5183..5092d61a 100644
--- a/src/xmpp/xmpp-im/jingle-application.cpp
+++ b/src/xmpp/xmpp-im/jingle-application.cpp
@@ -22,9 +22,87 @@
 #include "xmpp_client.h"
 #include "xmpp_task.h"
 
+#include <QPointer>
 #include <QTimer>
 
 namespace XMPP { namespace Jingle {
+
+    class ConnectionWaiter : public QObject {
+        Q_OBJECT
+
+        std::function<void(Connection::Ptr)> ready;
+        std::function<void()>                failed;
+        Connection::Ptr                      connection;
+        QWeakPointer<Transport>              transport;
+
+        void waitConnected()
+        {
+            connect(connection.data(), &Connection::error, this,
+                    [this](int code) { onFailed(QString("error=%1").arg(code)); });
+            connect(connection.data(), &Connection::connected, this, &ConnectionWaiter::onReady);
+        }
+
+        void onFailed(const QString &errorMessage = QString())
+        {
+            if (!errorMessage.isEmpty())
+                qWarning("ConnectionWaiter: error: %s", qPrintable(errorMessage));
+            if (connection)
+                connection->disconnect(this); // qt signals
+            if (auto t = transport.lock()) {
+                t->disconnect(this);
+            }
+            failed();
+            deleteLater();
+        }
+
+        void onReady()
+        {
+            connection->disconnect(this); // qt signals
+            transport.lock()->disconnect(this);
+            ready(connection);
+            deleteLater();
+        }
+
+    public:
+        ConnectionWaiter(TransportFeatures features, std::function<void(Connection::Ptr)> &&ready,
+                         std::function<void()> &&failed, Application *app) :
+            QObject(app),
+            ready(std::move(ready)), failed(std::move(failed))
+        {
+            auto tr   = app->transport();
+            transport = tr;
+            Q_ASSERT(!tr.isNull());
+
+            connect(tr.data(), &Transport::stateChanged, this, [this]() {
+                if (transport.lock()->state() == State::Finished) {
+                    onFailed(QLatin1String("Transport is dead but no connection"));
+                }
+            });
+            if (tr->isLocal()) {
+                connection = tr->addChannel(features, app->contentName());
+                if (!connection) {
+                    onFailed(QString("No channel on %1 transport").arg(tr->pad()->ns()));
+                    return;
+                }
+                waitConnected();
+            } else {
+                app->transport()->addAcceptor(
+                    features, [this, self = QPointer<ConnectionWaiter>(this)](Connection::Ptr newConnection) {
+                        if (!self || connection)
+                            return false;
+                        connection = newConnection;
+                        if (connection->isOpen())
+                            onReady();
+                        else
+                            waitConnected();
+                        return true;
+                    });
+            }
+        }
+
+        ~ConnectionWaiter() { qDebug("~ConnectionWaiter"); }
+    };
+
     //----------------------------------------------------------------------------
     // Application
     //----------------------------------------------------------------------------
@@ -185,6 +263,8 @@ namespace XMPP { namespace Jingle {
             if (_pendingTransportReplace == PendingTransportReplace::Planned) {
                 _pendingTransportReplace = PendingTransportReplace::NeedAck;
             }
+            if (_update.reason.isValid())
+                updates << _update.reason.toXml(doc);
             return OutgoingUpdate { updates, [this, transportCB](Task *task) {
                                        transportCB(task);
                                        if (task->success())
@@ -224,6 +304,17 @@ namespace XMPP { namespace Jingle {
         return OutgoingTransportInfoUpdate { transportEl, wrapCB };
     }
 
+    void Application::expectSingleConnection(TransportFeatures features, std::function<void(Connection::Ptr)> &&ready)
+    {
+        new ConnectionWaiter(
+            features, std::move(ready),
+            [this]() {
+                _transport->stop();
+                selectNextTransport();
+            },
+            this);
+    }
+
     bool Application::isRemote() const { return _pad->session()->role() != _creator; }
 
     bool Application::selectNextTransport(const QSharedPointer<Transport> alikeTransport)
@@ -288,12 +379,12 @@ namespace XMPP { namespace Jingle {
                 _transportSelector->backupTransport(_transport);
             }
 
-            if (transport->creator() == _pad->session()->role()) { // if new transport is locally created
+            if (transport->isLocal()) {
                 auto ts = _transport->state() == State::Finished ? _transport->prevState() : _transport->state();
-                if (_transport->creator() != _pad->session()->role() || ts > State::Unacked) {
+                if (_transport->isRemote() || ts > State::Unacked) {
                     // if remote knows of the current transport
                     _pendingTransportReplace = PendingTransportReplace::Planned;
-                } else if (_transport->creator() == _pad->session()->role() && ts == State::Unacked) {
+                } else if (_transport->isLocal() && ts == State::Unacked) {
                     // if remote may know but we don't know yet about it
                     _pendingTransportReplace = PendingTransportReplace::NeedAck;
                 }
@@ -332,3 +423,5 @@ namespace XMPP { namespace Jingle {
     bool ApplicationManagerPad::incomingSessionInfo(const QDomElement &) { return false; /* unsupported by default */ }
 
 }}
+
+#include "jingle-application.moc"
diff --git a/src/xmpp/xmpp-im/jingle-application.h b/src/xmpp/xmpp-im/jingle-application.h
index 16b18fce..f19da243 100644
--- a/src/xmpp/xmpp-im/jingle-application.h
+++ b/src/xmpp/xmpp-im/jingle-application.h
@@ -155,6 +155,8 @@ namespace XMPP { namespace Jingle {
          */
         virtual void prepareTransport() = 0;
 
+        void expectSingleConnection(TransportFeatures features, std::function<void(Connection::Ptr)> &&ready);
+
     signals:
         void updated(); // signal for session it has to send updates to remote. so it will follow with
                         // takeOutgoingUpdate() eventually
diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 38983d5b..2c7e6de2 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -541,44 +541,43 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
             }
         }
 
-        void setupConnection()
+        void onConnectionConnected(Connection::Ptr newConnection)
         {
-            QObject::connect(connection.data(), &Connection::connected, q, [this]() {
-                lastReason = Reason();
-                lastError.reset();
-
-                if (!streamingMode) {
-                    connect(connection.data(), &Connection::readyRead, q, [this]() {
-                        if (!device) {
-                            return;
-                        }
-                        if (q->pad()->session()->role() != q->senders()) {
-                            readNextBlockFromTransport();
-                        }
-                    });
-                    connect(connection.data(), &Connection::bytesWritten, q, [this](qint64 bytes) {
-                        Q_UNUSED(bytes)
-                        if (q->pad()->session()->role() == q->senders() && !connection->bytesToWrite()) {
-                            writeNextBlockToTransport();
-                        }
-                    });
-                }
+            connection = newConnection;
+            lastReason = Reason();
+            lastError.reset();
 
-                setState(State::Active);
-                if (!streamingMode) {
-                    if (acceptFile.range().isValid()) {
-                        bytesLeft = acceptFile.range().length;
-                        if (!bytesLeft)
-                            endlessRange = true;
-                        emit q->deviceRequested(acceptFile.range().offset, bytesLeft);
-                    } else {
-                        bytesLeft = acceptFile.size();
-                        emit q->deviceRequested(0, bytesLeft);
+            if (!streamingMode) {
+                connect(connection.data(), &Connection::readyRead, q, [this]() {
+                    if (!device) {
+                        return;
+                    }
+                    if (q->pad()->session()->role() != q->senders()) {
+                        readNextBlockFromTransport();
                     }
+                });
+                connect(connection.data(), &Connection::bytesWritten, q, [this](qint64 bytes) {
+                    Q_UNUSED(bytes)
+                    if (q->pad()->session()->role() == q->senders() && !connection->bytesToWrite()) {
+                        writeNextBlockToTransport();
+                    }
+                });
+            }
+
+            setState(State::Active);
+            if (!streamingMode) {
+                if (acceptFile.range().isValid()) {
+                    bytesLeft = acceptFile.range().length;
+                    if (!bytesLeft)
+                        endlessRange = true;
+                    emit q->deviceRequested(acceptFile.range().offset, bytesLeft);
                 } else {
-                    emit q->connectionReady();
+                    bytesLeft = acceptFile.size();
+                    emit q->deviceRequested(0, bytesLeft);
                 }
-            });
+            } else {
+                emit q->connectionReady();
+            }
         }
     };
 
@@ -686,27 +685,8 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
 
     void Application::prepareTransport()
     {
-        if (_transport->isLocal()) {
-            d->connection
-                = _transport->addChannel(TransportFeature::Reliable | TransportFeature::DataOriented, contentName());
-            if (!d->connection) {
-                _transport->stop();
-                qWarning("No channel on %s transport", qPrintable(_transport->pad()->ns()));
-                selectNextTransport();
-                return;
-            }
-            d->setupConnection();
-        } else {
-            _transport->addAcceptor(TransportFeature::Reliable | TransportFeature::Ordered
-                                        | TransportFeature::DataOriented,
-                                    [this, self = QPointer<Application>(this)](Connection::Ptr connection) {
-                                        if (!self || d->connection)
-                                            return false;
-                                        d->connection = connection;
-                                        d->setupConnection();
-                                        return true;
-                                    });
-        }
+        expectSingleConnection(TransportFeature::Reliable | TransportFeature::DataOriented | TransportFeature::Ordered,
+                               [this](Connection::Ptr connection) { d->onConnectionConnected(connection); });
         _transport->prepare();
     }
 
diff --git a/src/xmpp/xmpp-im/jingle-ibb.cpp b/src/xmpp/xmpp-im/jingle-ibb.cpp
index 5a731c5c..c4f8ff4a 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.cpp
+++ b/src/xmpp/xmpp-im/jingle-ibb.cpp
@@ -143,6 +143,8 @@ namespace XMPP { namespace Jingle { namespace IBB {
         size_t                                    defaultBlockSize = 4096;
         bool                                      started          = false;
 
+        ~Private() { qDebug("destroying ibb private"); }
+
         void checkAndStartConnection(const QSharedPointer<Connection> &c)
         {
             if (c->connection || c->state != State::Accepted)
@@ -184,8 +186,8 @@ namespace XMPP { namespace Jingle { namespace IBB {
     {
         d->q = this;
         connect(pad->manager(), &TransportManager::abortAllRequested, this, [this]() {
-            for (auto &c : d->connections) {
-                c->close();
+            while (d->connections.size()) {
+                d->connections.first()->close();
             }
             // d->aborted = true;
             emit failed(); // TODO review if necessary. likely it's not
@@ -196,10 +198,8 @@ namespace XMPP { namespace Jingle { namespace IBB {
     {
         // we have to mark all of them as finished just in case they are captured somewhere else
         qDebug("jingle-ibb: destroy");
-        if (d) {
-            for (auto &c : d->connections) {
-                c->close();
-            }
+        while (d->connections.size()) {
+            d->connections.first()->close();
         }
     }
 
diff --git a/src/xmpp/xmpp-im/jingle-webrtc-datachannel_p.cpp b/src/xmpp/xmpp-im/jingle-webrtc-datachannel_p.cpp
index 6b5ae601..380166d1 100644
--- a/src/xmpp/xmpp-im/jingle-webrtc-datachannel_p.cpp
+++ b/src/xmpp/xmpp-im/jingle-webrtc-datachannel_p.cpp
@@ -77,6 +77,7 @@ namespace XMPP { namespace Jingle { namespace SCTP {
         auto channel       = QSharedPointer<WebRTCDataChannel>::create(assoc, channelType, priority, reliability, label,
                                                                  protocol, DcepNegotiated);
         channel->_isRemote = true;
+        channel->setOpenMode(QIODevice::ReadWrite);
         return channel;
     }
 
@@ -167,6 +168,7 @@ namespace XMPP { namespace Jingle { namespace SCTP {
                 qWarning("jingle-sctp: unexpected DCEP. ignoring");
                 return;
             }
+            setOpenMode(QIODevice::ReadWrite);
             emit connected();
             return;
         }

From d641ee4c328154287253462c5c9bce6b0249d04c Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 25 Apr 2021 03:17:42 +0300
Subject: [PATCH 296/383] Allow jingle-ft on a message-oriented transport

---
 src/xmpp/xmpp-im/jingle-ft.cpp                | 37 +++++++++++++------
 src/xmpp/xmpp-im/jingle-ice.cpp               | 10 ++++-
 .../xmpp-im/jingle-webrtc-datachannel_p.cpp   |  2 +-
 3 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 2c7e6de2..47ff7892 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -502,9 +502,16 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
                 return;
             }
             // qDebug("JINGLE-FT write %d bytes to connection", data.size());
-            if (connection->write(data) == -1) {
-                handleStreamFail();
-                return;
+            if (connection->features() & TransportFeature::MessageOriented) {
+                if (!connection->sendDatagram(data)) {
+                    handleStreamFail();
+                    return;
+                }
+            } else {
+                if (connection->write(data) == -1) {
+                    handleStreamFail();
+                    return;
+                }
             }
             emit q->progress(device->pos());
             bytesLeft -= data.size();
@@ -513,15 +520,20 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
         void readNextBlockFromTransport()
         {
             qint64 bytesAvail;
-            while (bytesLeft && (bytesAvail = connection->bytesAvailable())) {
-                qint64 sz = 65536; // shall we respect transport->blockSize() ?
-                if (sz > bytesLeft) {
-                    sz = bytesLeft;
-                }
-                if (sz > bytesAvail) {
-                    sz = bytesAvail;
+            while (bytesLeft && ((bytesAvail = connection->bytesAvailable()) || (connection->hasPendingDatagrams()))) {
+                QByteArray data;
+                if (connection->features() & TransportFeature::MessageOriented) {
+                    data = connection->receiveDatagram().data();
+                } else {
+                    qint64 sz = 65536; // shall we respect transport->blockSize() ?
+                    if (sz > bytesLeft) {
+                        sz = bytesLeft;
+                    }
+                    if (sz > bytesAvail) {
+                        sz = bytesAvail;
+                    }
+                    data = connection->read(sz);
                 }
-                QByteArray data = connection->read(sz);
                 // qDebug("JINGLE-FT read %d bytes from connection", data.size());
                 if (data.isEmpty()) {
                     handleStreamFail();
@@ -532,7 +544,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
                     return;
                 }
                 emit q->progress(device->pos());
-                bytesLeft -= sz;
+                bytesLeft -= data.size();
             }
             if (!bytesLeft) {
                 // TODO send <received>
@@ -543,6 +555,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
 
         void onConnectionConnected(Connection::Ptr newConnection)
         {
+            qDebug("jingle-ft: connected. ready to send user data");
             connection = newConnection;
             lastReason = Reason();
             lastError.reset();
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index 6c0f3919..091bd36f 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -939,8 +939,14 @@ namespace XMPP { namespace Jingle { namespace ICE {
                 auto  buf = c.sctp->readOutgoing();
                 c.dtls->writeDatagram(buf);
             });
-            q->connect(c.sctp, &SCTP::Association::newIncomingChannel, q,
-                       [this, componentIndex]() { qDebug("new incoming sctp channel"); });
+            q->connect(c.sctp, &SCTP::Association::newIncomingChannel, q, [this, componentIndex]() {
+                qDebug("new incoming sctp channel");
+                auto assoc   = components[componentIndex].sctp;
+                auto channel = assoc->nextChannel();
+                if (!q->notifyIncomingConnection(channel)) {
+                    channel->close();
+                }
+            });
         }
 
         Connection::Ptr addDataChannel(TransportFeatures channelFeatures, const QString &label, int &componentIndex)
diff --git a/src/xmpp/xmpp-im/jingle-webrtc-datachannel_p.cpp b/src/xmpp/xmpp-im/jingle-webrtc-datachannel_p.cpp
index 380166d1..e984d419 100644
--- a/src/xmpp/xmpp-im/jingle-webrtc-datachannel_p.cpp
+++ b/src/xmpp/xmpp-im/jingle-webrtc-datachannel_p.cpp
@@ -133,7 +133,7 @@ namespace XMPP { namespace Jingle { namespace SCTP {
     {
         // FIXME return proper featuers
         return TransportFeature::DataOriented | TransportFeature::Reliable | TransportFeature::Ordered
-            | TransportFeature::Fast;
+            | TransportFeature::Fast | TransportFeature::MessageOriented;
     }
 
     void WebRTCDataChannel::onConnected()

From cdb38d412eefd26ac4a2fd1c1289794b6741fb35 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 25 Apr 2021 18:59:24 +0300
Subject: [PATCH 297/383] Switch to C++17

---
 CMakeLists.txt                 | 2 +-
 tools/icetunnel/CMakeLists.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8aae9613..8a82655b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,7 +52,7 @@ option( BUNDLED_QCA "Adds: DTLS, Blake2b and other useful for XMPP crypto-stuff"
 option( BUNDLED_USRSCTP "Compile compatible usrsctp lib when system one is not available or uncompatible (required for datachannel jingle transport)" OFF)
 option( BUILD_IRIS_TOOLS "Build tools and examples" OFF)
 
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 
 include_directories(${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR})
 include_directories(include/iris)
diff --git a/tools/icetunnel/CMakeLists.txt b/tools/icetunnel/CMakeLists.txt
index 7a8101f7..decd8e05 100644
--- a/tools/icetunnel/CMakeLists.txt
+++ b/tools/icetunnel/CMakeLists.txt
@@ -1,6 +1,6 @@
 project (ICETunnel LANGUAGES CXX)
 set(CMAKE_AUTOMOC ON)
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 add_executable (icetunnel main.cpp)
 target_link_libraries (icetunnel PUBLIC iris Qt::Core Qt::Network)
 target_compile_definitions(icetunnel PUBLIC QCA_STATIC)

From 46a8059d25eddaaf647ea8326c5151e1ea67ca6d Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 26 Apr 2021 10:57:24 +0300
Subject: [PATCH 298/383] First working implementation of webrtc file transfer

---
 src/irisnet/noncore/sctp/DepUsrSCTP.cpp       |  2 +
 src/irisnet/noncore/sctp/README.md            |  1 +
 src/xmpp/xmpp-im/client.cpp                   |  2 +-
 src/xmpp/xmpp-im/jingle-connection.cpp        |  4 +-
 src/xmpp/xmpp-im/jingle-connection.h          |  4 +-
 src/xmpp/xmpp-im/jingle-ft.cpp                | 42 +++++++++++++----
 src/xmpp/xmpp-im/jingle-ice.cpp               |  2 +-
 src/xmpp/xmpp-im/jingle-s5b.cpp               |  2 +-
 .../xmpp-im/jingle-sctp-association_p.cpp     | 46 ++++++++++++++++++-
 src/xmpp/xmpp-im/jingle-sctp-association_p.h  | 37 +++++++++------
 src/xmpp/xmpp-im/jingle-sctp.cpp              |  4 +-
 .../xmpp-im/jingle-webrtc-datachannel_p.cpp   | 22 +++++----
 .../xmpp-im/jingle-webrtc-datachannel_p.h     | 20 +++++++-
 13 files changed, 146 insertions(+), 42 deletions(-)

diff --git a/src/irisnet/noncore/sctp/DepUsrSCTP.cpp b/src/irisnet/noncore/sctp/DepUsrSCTP.cpp
index 3a6c63c6..60a76eff 100644
--- a/src/irisnet/noncore/sctp/DepUsrSCTP.cpp
+++ b/src/irisnet/noncore/sctp/DepUsrSCTP.cpp
@@ -6,6 +6,7 @@
 //#include "Logger.hpp"
 #include <usrsctp.h>
 
+#include <QCoreApplication>
 #include <QTimer>
 
 #include <cstring>
@@ -158,6 +159,7 @@ DepUsrSCTP::Checker::Checker()
     MS_TRACE();
 
     this->timer = new QTimer();
+    QObject::connect(this->timer, &QTimer::timeout, qApp, [this]() { OnTimer(); });
 }
 
 DepUsrSCTP::Checker::~Checker()
diff --git a/src/irisnet/noncore/sctp/README.md b/src/irisnet/noncore/sctp/README.md
index d58abf46..ea1f44b6 100644
--- a/src/irisnet/noncore/sctp/README.md
+++ b/src/irisnet/noncore/sctp/README.md
@@ -17,3 +17,4 @@ Changes to aforementioned files:
 * fixed printf format lines to avoid warnings
 * replaced channel notifier with emit, added QObject stuff correspondingly
 * preserve errno in SctpAssociation::SendSctpMessage (possible rewrite by logs handling)
+* remove filtering out PPID 50
diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
index ab3c2a9b..7c1c3d6f 100644
--- a/src/xmpp/xmpp-im/client.cpp
+++ b/src/xmpp/xmpp-im/client.cpp
@@ -181,7 +181,7 @@ Client::Client(QObject *par) : QObject(par)
     d->jingleICEManager = new Jingle::ICE::Manager(d->jingleManager);
     d->jingleManager->registerTransport(d->jingleS5BManager);
     d->jingleManager->registerTransport(d->jingleIBBManager);
-    // d->jingleManager->registerTransport(d->jingleICEManager);
+    d->jingleManager->registerTransport(d->jingleICEManager);
 }
 
 Client::~Client()
diff --git a/src/xmpp/xmpp-im/jingle-connection.cpp b/src/xmpp/xmpp-im/jingle-connection.cpp
index 1a5baf7e..a030c890 100644
--- a/src/xmpp/xmpp-im/jingle-connection.cpp
+++ b/src/xmpp/xmpp-im/jingle-connection.cpp
@@ -23,14 +23,14 @@ namespace XMPP { namespace Jingle {
 
     bool Connection::hasPendingDatagrams() const { return false; }
 
-    NetworkDatagram Connection::receiveDatagram(qint64 maxSize)
+    NetworkDatagram Connection::readDatagram(qint64 maxSize)
     {
         qCritical("Calling unimplemented function receiveDatagram");
         Q_UNUSED(maxSize)
         return NetworkDatagram();
     }
 
-    bool Connection::sendDatagram(const NetworkDatagram &)
+    bool Connection::writeDatagram(const NetworkDatagram &)
     {
         qCritical("Calling unimplemented function sendDatagram");
         return false;
diff --git a/src/xmpp/xmpp-im/jingle-connection.h b/src/xmpp/xmpp-im/jingle-connection.h
index be0fd45b..1fcbc0c9 100644
--- a/src/xmpp/xmpp-im/jingle-connection.h
+++ b/src/xmpp/xmpp-im/jingle-connection.h
@@ -63,8 +63,8 @@ namespace XMPP { namespace Jingle {
     public:
         using Ptr = QSharedPointer<Connection>; // will be shared between transport and application
         virtual bool              hasPendingDatagrams() const;
-        virtual NetworkDatagram   receiveDatagram(qint64 maxSize = -1);
-        virtual bool              sendDatagram(const NetworkDatagram &data);
+        virtual NetworkDatagram   readDatagram(qint64 maxSize = -1);
+        virtual bool              writeDatagram(const NetworkDatagram &data);
         virtual size_t            blockSize() const;
         virtual int               component() const;
         virtual TransportFeatures features() const = 0;
diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 47ff7892..6d040e01 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -30,13 +30,18 @@
 #include <QRandomGenerator>
 #endif
 #include <QPointer>
+#include <QTimer>
+#include <chrono>
 #include <cmath>
 #include <functional>
 
+using namespace std::chrono_literals;
+
 namespace XMPP { namespace Jingle { namespace FileTransfer {
 
-    const QString NS            = QStringLiteral("urn:xmpp:jingle:apps:file-transfer:5");
-    const QString AMPLITUDES_NS = QStringLiteral("urn:audio:amplitudes");
+    const QString  NS               = QStringLiteral("urn:xmpp:jingle:apps:file-transfer:5");
+    const QString  AMPLITUDES_NS    = QStringLiteral("urn:audio:amplitudes");
+    constexpr auto RECEIVED_TIMEOUT = 30s;
 
     // tags
     static const QString AMPLITUDES_TAG = QStringLiteral("amplitudes");
@@ -445,6 +450,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
         qint64              bytesLeft = 0;
         QList<Hash>         outgoingChecksum;
         qint64              outgoingChecksumRangeOffset = 0, outgoingChecksumRangeLength = 0;
+        QTimer *            receivedTimer = nullptr;
 
         void setState(State s)
         {
@@ -466,17 +472,35 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
             emit q->stateChanged(s);
         }
 
+        void onReceived()
+        {
+            lastReason = Reason(Reason::Condition::Success);
+            setState(State::Finished);
+        }
+
         void handleStreamFail()
         {
             lastReason = Reason(Reason::Condition::FailedApplication, QString::fromLatin1("stream failed"));
             setState(State::Finished);
         }
 
+        void expectReceived()
+        {
+            if (receivedTimer || q->state() == State::Finished)
+                return;
+            receivedTimer = new QTimer(q);
+            receivedTimer->setSingleShot(true);
+            receivedTimer->setInterval(RECEIVED_TIMEOUT);
+            q->connect(receivedTimer, &QTimer::timeout, q, [this]() {
+                qDebug("Waiting for <received> timed out. But likely succeded anyway");
+                onReceived();
+            });
+        }
+
         void writeNextBlockToTransport()
         {
             if (!(endlessRange || bytesLeft)) {
-                lastReason = Reason(Reason::Condition::Success);
-                setState(State::Finished);
+                expectReceived();
                 return; // everything is written
             }
             auto sz = qint64(connection->blockSize());
@@ -501,9 +525,9 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
                 }
                 return;
             }
-            // qDebug("JINGLE-FT write %d bytes to connection", data.size());
+            qDebug("JINGLE-FT write %d bytes to connection", data.size());
             if (connection->features() & TransportFeature::MessageOriented) {
-                if (!connection->sendDatagram(data)) {
+                if (!connection->writeDatagram(data)) {
                     handleStreamFail();
                     return;
                 }
@@ -523,7 +547,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
             while (bytesLeft && ((bytesAvail = connection->bytesAvailable()) || (connection->hasPendingDatagrams()))) {
                 QByteArray data;
                 if (connection->features() & TransportFeature::MessageOriented) {
-                    data = connection->receiveDatagram().data();
+                    data = connection->readDatagram().data();
                 } else {
                     qint64 sz = 65536; // shall we respect transport->blockSize() ?
                     if (sz > bytesLeft) {
@@ -534,7 +558,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
                     }
                     data = connection->read(sz);
                 }
-                // qDebug("JINGLE-FT read %d bytes from connection", data.size());
+                qDebug("JINGLE-FT read %d bytes from connection", data.size());
                 if (data.isEmpty()) {
                     handleStreamFail();
                     return;
@@ -845,8 +869,8 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
 
     void Application::incomingReceived()
     {
-        // TODO
         qDebug("got received");
+        d->onReceived();
     }
 
     Pad::Pad(Manager *manager, Session *session) : _manager(manager), _session(session) { }
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index 091bd36f..177a9994 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -438,7 +438,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
 
         bool hasPendingDatagrams() const override { return datagrams.size() > 0; }
 
-        NetworkDatagram receiveDatagram(qint64 maxSize = -1) override
+        NetworkDatagram readDatagram(qint64 maxSize = -1) override
         {
             Q_UNUSED(maxSize) // TODO or not?
             return datagrams.size() ? datagrams.takeFirst() : NetworkDatagram();
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index ceab7c3f..3ca64e91 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -79,7 +79,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
 
         bool hasPendingDatagrams() const { return datagrams.size() > 0; }
 
-        NetworkDatagram receiveDatagram(qint64 maxSize = -1)
+        NetworkDatagram readDatagram(qint64 maxSize = -1)
         {
             Q_UNUSED(maxSize) // TODO or not?
             return datagrams.size() ? datagrams.takeFirst() : NetworkDatagram();
diff --git a/src/xmpp/xmpp-im/jingle-sctp-association_p.cpp b/src/xmpp/xmpp-im/jingle-sctp-association_p.cpp
index e1293b43..d6f0f509 100644
--- a/src/xmpp/xmpp-im/jingle-sctp-association_p.cpp
+++ b/src/xmpp/xmpp-im/jingle-sctp-association_p.cpp
@@ -96,6 +96,8 @@ namespace XMPP { namespace Jingle { namespace SCTP {
         qDebug("jignle-sctp: on buffered data: %d", len);
         Q_UNUSED(sctpAssociation);
         Q_UNUSED(len);
+        if (!dumpingOutogingBuffer)
+            procesOutgoingMessageQueue();
         // TODO control buffering to reduce memory consumption
     }
 
@@ -115,9 +117,11 @@ namespace XMPP { namespace Jingle { namespace SCTP {
         auto it = channels.constFind(streamId);
         if (it != channels.constEnd()) {
             qWarning("datachannel %u was replaced", streamId);
+            (*it)->disconnect(this);
             (*it).staticCast<WebRTCDataChannel>()->onDisconnected(WebRTCDataChannel::ChannelReplaced);
         }
         channels.insert(streamId, channel);
+        connectChannelSignals(channel);
 
         // acknowledge channel open instantly
         QByteArray reply(4, 0);
@@ -159,6 +163,36 @@ namespace XMPP { namespace Jingle { namespace SCTP {
         return success;
     }
 
+    void AssociationPrivate::procesOutgoingMessageQueue()
+    {
+        dumpingOutogingBuffer = true;
+        // keep going while we can fit the buffer
+        while (outgoingMessageQueue.size()) {
+
+            auto const &[connection, message] = outgoingMessageQueue.first();
+            if (int(MAX_SEND_BUFFER_SIZE - assoc.GetSctpBufferedAmount()) < message.data.size())
+                break;
+
+            bool        ordered  = !(message.channelType & 0x80);
+            Reliability reliable = ordered         ? Reliable
+                : (message.channelType & 0x3) == 1 ? PartialRexmit
+                : (message.channelType & 0x3) == 2 ? PartialTimers
+                                                   : Reliable;
+
+            if (write(message.data, message.streamId, PPID_BINARY, reliable, ordered, message.reliability)) {
+                int sz = message.data.size();
+                connection.staticCast<WebRTCDataChannel>()->onMessageWritten(sz);
+            } else if (assoc.isSendBufferFull())
+                break;
+            else {
+                qWarning("unexpected sctp write error");
+                connection.staticCast<WebRTCDataChannel>()->onError(QAbstractSocket::SocketResourceError);
+            }
+            outgoingMessageQueue.removeFirst();
+        }
+        dumpingOutogingBuffer = false;
+    }
+
     void AssociationPrivate::close(quint16 streamId)
     {
         qDebug("jignle-sctp: close");
@@ -201,6 +235,7 @@ namespace XMPP { namespace Jingle { namespace SCTP {
         } else {
             pendingLocalChannels.enqueue(channel);
         }
+        connectChannelSignals(channel);
 
         return channel;
     }
@@ -257,7 +292,7 @@ namespace XMPP { namespace Jingle { namespace SCTP {
 
     void AssociationPrivate::onOutgoingData(const QByteArray &data)
     {
-        outgoingQueue.enqueue(data);
+        outgoingPacketsQueue.enqueue(data);
         emit q->readyReadOutgoing();
     }
 
@@ -288,4 +323,13 @@ namespace XMPP { namespace Jingle { namespace SCTP {
         it->staticCast<WebRTCDataChannel>()->onDisconnected(WebRTCDataChannel::ChannelClosed);
     }
 
+    void AssociationPrivate::connectChannelSignals(Connection::Ptr channel)
+    {
+        auto dc = channel.staticCast<WebRTCDataChannel>();
+        dc->setOutgoingCallback([this, weakDc = dc.toWeakRef()](const WebRTCDataChannel::OutgoingDatagram &dg) {
+            outgoingMessageQueue.enqueue({ weakDc.lock(), dg });
+            procesOutgoingMessageQueue();
+        });
+    }
+
 }}}
diff --git a/src/xmpp/xmpp-im/jingle-sctp-association_p.h b/src/xmpp/xmpp-im/jingle-sctp-association_p.h
index 4957b7f7..d13c183f 100644
--- a/src/xmpp/xmpp-im/jingle-sctp-association_p.h
+++ b/src/xmpp/xmpp-im/jingle-sctp-association_p.h
@@ -17,11 +17,14 @@
  *
  */
 
+#pragma once
+
 #include "jingle-connection.h"
 
 #include "irisnet/noncore/sctp/DepUsrSCTP.hpp"
 #include "irisnet/noncore/sctp/SctpAssociation.hpp"
 #include "jingle-sctp.h"
+#include "jingle-webrtc-datachannel_p.h"
 
 #include <QHash>
 #include <QQueue>
@@ -43,19 +46,23 @@ namespace XMPP { namespace Jingle { namespace SCTP {
     class AssociationPrivate : public QObject, RTC::SctpAssociation::Listener {
         Q_OBJECT
     public:
-        Association *                   q;
-        Keeper::Ptr                     keeper;
-        QQueue<QByteArray>              outgoingQueue;
-        std::mutex                      mutex;
-        QHash<quint16, Connection::Ptr> channels; // streamId -> WebRTCDataChannel
-        QQueue<Connection::Ptr>         pendingChannels;
-        QQueue<Connection::Ptr>         pendingLocalChannels;
-        RTC::SctpAssociation            assoc;
-
-        bool    transportConnected = false;
-        bool    useOddStreamId     = false;
-        quint16 nextStreamId       = 0;
-        quint16 channelsLeft       = 32768;
+        using QualifiedOutgoingMessage = std::pair<Connection::Ptr, WebRTCDataChannel::OutgoingDatagram>;
+
+        Association *                    q;
+        Keeper::Ptr                      keeper;
+        QQueue<QByteArray>               outgoingPacketsQueue; // ready to be sent over dtls
+        QQueue<QualifiedOutgoingMessage> outgoingMessageQueue; // ready to be processed by sctp stack
+        std::mutex                       mutex;
+        QHash<quint16, Connection::Ptr>  channels; // streamId -> WebRTCDataChannel
+        QQueue<Connection::Ptr>          pendingChannels;
+        QQueue<Connection::Ptr>          pendingLocalChannels;
+        RTC::SctpAssociation             assoc;
+
+        bool    dumpingOutogingBuffer = false;
+        bool    transportConnected    = false;
+        bool    useOddStreamId        = false;
+        quint16 nextStreamId          = 0;
+        quint16 channelsLeft          = 32768;
 
         AssociationPrivate(Association *q);
 
@@ -88,6 +95,10 @@ namespace XMPP { namespace Jingle { namespace SCTP {
         void onOutgoingData(const QByteArray &data);
         void onIncomingData(const QByteArray &data, quint16 streamId, quint32 ppid);
         void onStreamClosed(quint16 streamId);
+
+    private:
+        void connectChannelSignals(Connection::Ptr channel);
+        void procesOutgoingMessageQueue();
     };
 
 }}}
diff --git a/src/xmpp/xmpp-im/jingle-sctp.cpp b/src/xmpp/xmpp-im/jingle-sctp.cpp
index aadfe56c..4b828a3e 100644
--- a/src/xmpp/xmpp-im/jingle-sctp.cpp
+++ b/src/xmpp/xmpp-im/jingle-sctp.cpp
@@ -111,7 +111,7 @@ namespace XMPP { namespace Jingle { namespace SCTP {
     {
         SCTP_DEBUG("read outgoing");
         std::lock_guard<std::mutex> lock(d->mutex);
-        return d->outgoingQueue.isEmpty() ? QByteArray() : d->outgoingQueue.dequeue();
+        return d->outgoingPacketsQueue.isEmpty() ? QByteArray() : d->outgoingPacketsQueue.dequeue();
     }
 
     void Association::writeIncoming(const QByteArray &data)
@@ -120,7 +120,7 @@ namespace XMPP { namespace Jingle { namespace SCTP {
         d->assoc.ProcessSctpData(reinterpret_cast<const uint8_t *>(data.data()), data.size());
     }
 
-    int Association::pendingOutgoingDatagrams() const { return d->outgoingQueue.size(); }
+    int Association::pendingOutgoingDatagrams() const { return d->outgoingPacketsQueue.size(); }
 
     int Association::pendingChannels() const { return d->pendingChannels.size(); }
 
diff --git a/src/xmpp/xmpp-im/jingle-webrtc-datachannel_p.cpp b/src/xmpp/xmpp-im/jingle-webrtc-datachannel_p.cpp
index e984d419..5aa3053a 100644
--- a/src/xmpp/xmpp-im/jingle-webrtc-datachannel_p.cpp
+++ b/src/xmpp/xmpp-im/jingle-webrtc-datachannel_p.cpp
@@ -105,22 +105,22 @@ namespace XMPP { namespace Jingle { namespace SCTP {
         association->write(data, streamId, PPID_DCEP);
     }
 
+    void WebRTCDataChannel::setOutgoingCallback(OutgoingCallback &&callback) { outgoingCallback = std::move(callback); }
+
     bool WebRTCDataChannel::hasPendingDatagrams() const { return datagrams.size() > 0; }
 
-    NetworkDatagram WebRTCDataChannel::receiveDatagram(qint64 maxSize)
+    NetworkDatagram WebRTCDataChannel::readDatagram(qint64 maxSize)
     {
         Q_UNUSED(maxSize) // TODO or not?
         return datagrams.size() ? datagrams.takeFirst() : NetworkDatagram();
     }
 
-    bool WebRTCDataChannel::sendDatagram(const NetworkDatagram &data)
+    bool WebRTCDataChannel::writeDatagram(const NetworkDatagram &data)
     {
-        bool        ordered  = !(channelType & 0x80);
-        Reliability reliable = ordered ? Reliable
-            : (channelType & 0x3) == 1 ? PartialRexmit
-            : (channelType & 0x3) == 2 ? PartialTimers
-                                       : Reliable;
-        return association->write(data.data(), streamId, PPID_BINARY, reliable, ordered, reliability);
+        Q_ASSERT(bool(outgoingCallback));
+        outgoingBufSize += data.data().size();
+        outgoingCallback({ quint16(streamId), channelType, PPID_BINARY, reliability, data.data() });
+        return true;
     }
 
     qint64 WebRTCDataChannel::bytesAvailable() const { return 0; }
@@ -176,4 +176,10 @@ namespace XMPP { namespace Jingle { namespace SCTP {
         datagrams.append(NetworkDatagram { data });
         emit readyRead();
     }
+
+    void WebRTCDataChannel::onMessageWritten(size_t size)
+    {
+        outgoingBufSize -= size;
+        emit bytesWritten(size);
+    }
 }}}
diff --git a/src/xmpp/xmpp-im/jingle-webrtc-datachannel_p.h b/src/xmpp/xmpp-im/jingle-webrtc-datachannel_p.h
index 2e9b0876..d1eb09ec 100644
--- a/src/xmpp/xmpp-im/jingle-webrtc-datachannel_p.h
+++ b/src/xmpp/xmpp-im/jingle-webrtc-datachannel_p.h
@@ -17,6 +17,8 @@
  *
  */
 
+#pragma once
+
 #include "jingle-connection.h"
 
 namespace XMPP { namespace Jingle { namespace SCTP {
@@ -37,9 +39,21 @@ namespace XMPP { namespace Jingle { namespace SCTP {
         enum DisconnectReason { TransportClosed, SctpClosed, ChannelClosed, ChannelReplaced };
         enum DcepState { NoDcep, DcepOpening, DcepNegotiated };
 
+        struct OutgoingDatagram {
+            quint16    streamId;
+            quint8     channelType;
+            quint8     ppid;
+            quint32    reliability;
+            QByteArray data;
+        };
+
+        using OutgoingCallback = std::function<void(const OutgoingDatagram &)>;
+
         AssociationPrivate *   association;
         QList<NetworkDatagram> datagrams;
         DisconnectReason       disconnectReason = ChannelClosed;
+        std::size_t            outgoingBufSize  = 0;
+        OutgoingCallback       outgoingCallback;
 
         quint8    channelType = 0;
         quint32   reliability = 0;
@@ -56,10 +70,11 @@ namespace XMPP { namespace Jingle { namespace SCTP {
 
         void setStreamId(quint16 id) { streamId = id; }
         void connect();
+        void setOutgoingCallback(OutgoingCallback &&callback);
 
         bool              hasPendingDatagrams() const override;
-        NetworkDatagram   receiveDatagram(qint64 maxSize = -1) override;
-        bool              sendDatagram(const NetworkDatagram &data) override;
+        NetworkDatagram   readDatagram(qint64 maxSize = -1) override;
+        bool              writeDatagram(const NetworkDatagram &data) override;
         qint64            bytesAvailable() const override;
         qint64            bytesToWrite() const override;
         void              close() override;
@@ -70,6 +85,7 @@ namespace XMPP { namespace Jingle { namespace SCTP {
         void onError(QAbstractSocket::SocketError error);
         void onDisconnected(DisconnectReason reason);
         void onIncomingData(const QByteArray &data, quint32 ppid);
+        void onMessageWritten(size_t size);
     };
 
 }}}

From 60ae6c3ee0be5b8d477f2340bc02eb2fa7676168 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 26 Apr 2021 12:13:17 +0300
Subject: [PATCH 299/383] Temporary disable Jingle ICE transport till backward
 compat fixes are added

---
 src/xmpp/xmpp-im/client.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
index 7c1c3d6f..ab3c2a9b 100644
--- a/src/xmpp/xmpp-im/client.cpp
+++ b/src/xmpp/xmpp-im/client.cpp
@@ -181,7 +181,7 @@ Client::Client(QObject *par) : QObject(par)
     d->jingleICEManager = new Jingle::ICE::Manager(d->jingleManager);
     d->jingleManager->registerTransport(d->jingleS5BManager);
     d->jingleManager->registerTransport(d->jingleIBBManager);
-    d->jingleManager->registerTransport(d->jingleICEManager);
+    // d->jingleManager->registerTransport(d->jingleICEManager);
 }
 
 Client::~Client()

From 3f622cd22ae518468e9b35d329fccabd9e7ad627 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 26 Apr 2021 21:35:52 +0300
Subject: [PATCH 300/383] A few optimizations

---
 src/xmpp/xmpp-im/client.cpp      |  9 ++---
 src/xmpp/xmpp-im/jingle.cpp      | 56 +++++++++++++++++++-------------
 src/xmpp/xmpp-im/xmpp_features.h |  5 +++
 3 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
index ab3c2a9b..02cb4ad5 100644
--- a/src/xmpp/xmpp-im/client.cpp
+++ b/src/xmpp/xmpp-im/client.cpp
@@ -1138,9 +1138,8 @@ DiscoItem Client::makeDiscoResult(const QString &node) const
     features.addFeature("urn:xmpp:time");
     features.addFeature("urn:xmpp:message-correct:0");
     features.addFeature("urn:xmpp:jingle:1");
-    for (auto const &feature : d->jingleManager->discoFeatures()) {
-        features.addFeature(feature);
-    }
+    features += d->jingleManager->discoFeatures();
+
     // TODO rather do foreach for all registered jingle apps and transports
     // TODO: since it depends on UI it needs a way to be disabled
     features.addFeature("urn:xmpp:jingle:apps:file-transfer:5");
@@ -1148,9 +1147,7 @@ DiscoItem Client::makeDiscoResult(const QString &node) const
     features.addFeature(NS_CAPS);
 
     // Client-specific features
-    for (const QString &i : d->features.list()) {
-        features.addFeature(i);
-    }
+    features += d->features;
 
     item.setFeatures(features);
 
diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index 3c7ff94f..d72de347 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -38,6 +38,7 @@
 #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
 #include <QRandomGenerator>
 #endif
+#include <QCoreApplication>
 
 namespace XMPP { namespace Jingle {
     const QString NS(QStringLiteral("urn:xmpp:jingle:1"));
@@ -179,25 +180,34 @@ namespace XMPP { namespace Jingle {
     //----------------------------------------------------------------------------
     // Reason
     //----------------------------------------------------------------------------
-    static const QMap<QString, Reason::Condition> reasonConditions = {
-        { QStringLiteral("alternative-session"), Reason::AlternativeSession },
-        { QStringLiteral("busy"), Reason::Busy },
-        { QStringLiteral("cancel"), Reason::Cancel },
-        { QStringLiteral("connectivity-error"), Reason::ConnectivityError },
-        { QStringLiteral("decline"), Reason::Decline },
-        { QStringLiteral("expired"), Reason::Expired },
-        { QStringLiteral("failed-application"), Reason::FailedApplication },
-        { QStringLiteral("failed-transport"), Reason::FailedTransport },
-        { QStringLiteral("general-error"), Reason::GeneralError },
-        { QStringLiteral("gone"), Reason::Gone },
-        { QStringLiteral("incompatible-parameters"), Reason::IncompatibleParameters },
-        { QStringLiteral("media-error"), Reason::MediaError },
-        { QStringLiteral("security-error"), Reason::SecurityError },
-        { QStringLiteral("success"), Reason::Success },
-        { QStringLiteral("timeout"), Reason::Timeout },
-        { QStringLiteral("unsupported-applications"), Reason::UnsupportedApplications },
-        { QStringLiteral("unsupported-transports"), Reason::UnsupportedTransports },
-    };
+    using ReasonMap = QMap<QString, Reason::Condition>;
+    const ReasonMap &reasonConditions()
+    {
+        static std::unique_ptr<ReasonMap> conditions;
+        if (!conditions) {
+            conditions.reset(new ReasonMap({
+                { QStringLiteral("alternative-session"), Reason::AlternativeSession },
+                { QStringLiteral("busy"), Reason::Busy },
+                { QStringLiteral("cancel"), Reason::Cancel },
+                { QStringLiteral("connectivity-error"), Reason::ConnectivityError },
+                { QStringLiteral("decline"), Reason::Decline },
+                { QStringLiteral("expired"), Reason::Expired },
+                { QStringLiteral("failed-application"), Reason::FailedApplication },
+                { QStringLiteral("failed-transport"), Reason::FailedTransport },
+                { QStringLiteral("general-error"), Reason::GeneralError },
+                { QStringLiteral("gone"), Reason::Gone },
+                { QStringLiteral("incompatible-parameters"), Reason::IncompatibleParameters },
+                { QStringLiteral("media-error"), Reason::MediaError },
+                { QStringLiteral("security-error"), Reason::SecurityError },
+                { QStringLiteral("success"), Reason::Success },
+                { QStringLiteral("timeout"), Reason::Timeout },
+                { QStringLiteral("unsupported-applications"), Reason::UnsupportedApplications },
+                { QStringLiteral("unsupported-transports"), Reason::UnsupportedTransports },
+            }));
+            QObject::connect(qApp, &QCoreApplication::destroyed, []() { conditions.release(); });
+        }
+        return *conditions;
+    }
 
     class Reason::Private : public QSharedData {
     public:
@@ -230,7 +240,7 @@ namespace XMPP { namespace Jingle {
             } else if (c.namespaceURI() != rns) {
                 // TODO add here all the extensions to reason.
             } else {
-                condition = reasonConditions.value(c.tagName());
+                condition = reasonConditions().value(c.tagName());
             }
         }
 
@@ -270,7 +280,7 @@ namespace XMPP { namespace Jingle {
     QDomElement Reason::toXml(QDomDocument *doc) const
     {
         if (d && d->cond != NoReason) {
-            for (auto r = reasonConditions.cbegin(); r != reasonConditions.cend(); ++r) {
+            for (auto r = reasonConditions().cbegin(); r != reasonConditions().cend(); ++r) {
                 if (r.value() == d->cond) {
                     QDomElement e = doc->createElement(QLatin1String("reason"));
                     e.appendChild(doc->createElement(r.key()));
@@ -680,10 +690,10 @@ namespace XMPP { namespace Jingle {
     QStringList Manager::discoFeatures() const
     {
         QStringList ret;
-        for (auto const &mgr : d->applicationManagers) {
+        for (auto const &mgr : qAsConst(d->applicationManagers)) {
             ret += mgr->discoFeatures();
         }
-        for (auto const &mgr : d->transportManagers) {
+        for (auto const &mgr : qAsConst(d->transportManagers)) {
             ret += mgr->discoFeatures();
         }
         return ret;
diff --git a/src/xmpp/xmpp-im/xmpp_features.h b/src/xmpp/xmpp-im/xmpp_features.h
index d85ceb07..e536b4c1 100644
--- a/src/xmpp/xmpp-im/xmpp_features.h
+++ b/src/xmpp/xmpp-im/xmpp_features.h
@@ -104,6 +104,11 @@ class Features {
 
     Features &  operator<<(const QString &feature);
     inline bool operator==(const Features &other) { return _list == other._list; }
+    Features &  operator+=(const Features &other)
+    {
+        _list += other._list;
+        return *this;
+    }
 
     class FeatureName;
 

From c2c15638e092285d670b5756e2a20b2e7a757dcc Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 27 Apr 2021 01:18:54 +0300
Subject: [PATCH 301/383] Check peer supports required jingle features of
 selected transport

---
 src/xmpp/xmpp-im/client.cpp                  |  2 +-
 src/xmpp/xmpp-im/jingle-ft.cpp               |  3 +-
 src/xmpp/xmpp-im/jingle-ibb.cpp              |  3 +-
 src/xmpp/xmpp-im/jingle-ice.cpp              |  3 +-
 src/xmpp/xmpp-im/jingle-nstransportslist.cpp |  6 +-
 src/xmpp/xmpp-im/jingle-s5b.cpp              |  3 +-
 src/xmpp/xmpp-im/jingle-transport.cpp        |  5 ++
 src/xmpp/xmpp-im/jingle-transport.h          |  7 ++-
 src/xmpp/xmpp-im/jingle.cpp                  | 65 ++++++++++----------
 9 files changed, 57 insertions(+), 40 deletions(-)

diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
index 02cb4ad5..f022f304 100644
--- a/src/xmpp/xmpp-im/client.cpp
+++ b/src/xmpp/xmpp-im/client.cpp
@@ -181,7 +181,7 @@ Client::Client(QObject *par) : QObject(par)
     d->jingleICEManager = new Jingle::ICE::Manager(d->jingleManager);
     d->jingleManager->registerTransport(d->jingleS5BManager);
     d->jingleManager->registerTransport(d->jingleIBBManager);
-    // d->jingleManager->registerTransport(d->jingleICEManager);
+    d->jingleManager->registerTransport(d->jingleICEManager);
 }
 
 Client::~Client()
diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 6d040e01..17be746a 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -419,7 +419,8 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
 
     QStringList Manager::availableTransports() const
     {
-        return jingleManager->availableTransports(TransportFeature::Reliable | TransportFeature::DataOriented);
+        return jingleManager->availableTransports(TransportFeature::Reliable | TransportFeature::Ordered
+                                                  | TransportFeature::DataOriented);
     }
 
     //----------------------------------------------------------------------------
diff --git a/src/xmpp/xmpp-im/jingle-ibb.cpp b/src/xmpp/xmpp-im/jingle-ibb.cpp
index c4f8ff4a..55682c6b 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.cpp
+++ b/src/xmpp/xmpp-im/jingle-ibb.cpp
@@ -426,7 +426,8 @@ namespace XMPP { namespace Jingle { namespace IBB {
 
     TransportFeatures Manager::features() const
     {
-        return TransportFeature::AlwaysConnect | TransportFeature::Reliable | TransportFeature::DataOriented;
+        return TransportFeature::AlwaysConnect | TransportFeature::Reliable | TransportFeature::Ordered
+            | TransportFeature::DataOriented;
     }
 
     void Manager::setJingleManager(XMPP::Jingle::Manager *jm) { d->jingleManager = jm; }
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index 177a9994..7ac7b818 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -1168,7 +1168,8 @@ namespace XMPP { namespace Jingle { namespace ICE {
     {
         return TransportFeature::HighProbableConnect | TransportFeature::Reliable | TransportFeature::Unreliable
             | TransportFeature::MessageOriented | TransportFeature::LiveOriented
-            | (Dtls::isSupported() ? TransportFeature::DataOriented : TransportFeature(0));
+            | (Dtls::isSupported() ? (TransportFeature::DataOriented | TransportFeature::Ordered)
+                                   : TransportFeature(0));
     }
 
     void Manager::setJingleManager(XMPP::Jingle::Manager *jm) { d->jingleManager = jm; }
diff --git a/src/xmpp/xmpp-im/jingle-nstransportslist.cpp b/src/xmpp/xmpp-im/jingle-nstransportslist.cpp
index 75b97c17..257192c3 100644
--- a/src/xmpp/xmpp-im/jingle-nstransportslist.cpp
+++ b/src/xmpp/xmpp-im/jingle-nstransportslist.cpp
@@ -42,7 +42,11 @@ namespace XMPP { namespace Jingle {
         do {
             auto t = _session->newOutgoingTransport(_transports[idx]);
             if (t) {
-                return t;
+                auto const discoFeatures = t->pad()->manager()->discoFeatures();
+                // FIXME next if is quite stupid. instead need to check a minimal set of features of desired connection.
+                if (std::all_of(discoFeatures.begin(), discoFeatures.end(),
+                                [this](auto const &f) { return _session->checkPeerCaps(f); }))
+                    return t;
             }
             _transports.removeAt(idx);
             idx = _transports.size() - 1;
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 3ca64e91..0386d668 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -1710,7 +1710,8 @@ namespace XMPP { namespace Jingle { namespace S5B {
 
     TransportFeatures Manager::features() const
     {
-        return TransportFeature::Reliable | TransportFeature::Fast | TransportFeature::DataOriented;
+        return TransportFeature::Reliable | TransportFeature::Fast | TransportFeature::DataOriented
+            | TransportFeature::Ordered;
     }
 
     void Manager::setJingleManager(XMPP::Jingle::Manager *jm)
diff --git a/src/xmpp/xmpp-im/jingle-transport.cpp b/src/xmpp/xmpp-im/jingle-transport.cpp
index 832f53e0..a95446b9 100644
--- a/src/xmpp/xmpp-im/jingle-transport.cpp
+++ b/src/xmpp/xmpp-im/jingle-transport.cpp
@@ -25,6 +25,11 @@ namespace XMPP { namespace Jingle {
     // TransportManager
     //----------------------------------------------------------------------------
     TransportManager::TransportManager(QObject *parent) : QObject(parent) { }
+
+    bool TransportManager::canMakeConnection(TransportFeatures desiredFeatures, const QString &)
+    {
+        return (features() & desiredFeatures) == desiredFeatures;
+    }
     QStringList TransportManager::ns() const { return discoFeatures(); }
     void        TransportManager::closeAll(const QString &) { emit abortAllRequested(); }
 
diff --git a/src/xmpp/xmpp-im/jingle-transport.h b/src/xmpp/xmpp-im/jingle-transport.h
index f27ff5e4..f6111fae 100644
--- a/src/xmpp/xmpp-im/jingle-transport.h
+++ b/src/xmpp/xmpp-im/jingle-transport.h
@@ -233,8 +233,11 @@ namespace XMPP { namespace Jingle {
 
         // may show more features than Transport instance. For example some transports may work in both reliable and not
         // reliable modes
-        virtual TransportFeatures features() const              = 0;
-        virtual void              setJingleManager(Manager *jm) = 0;
+        virtual TransportFeatures features() const = 0;
+
+        /// checks where the transport can make a connection with desired features while serving namespace `ns`
+        virtual bool canMakeConnection(TransportFeatures desiredFeatures, const QString &ns = QString());
+        virtual void setJingleManager(Manager *jm) = 0;
 
         // FIXME rename methods
         virtual QSharedPointer<Transport> newTransport(const TransportManagerPad::Ptr &pad, Origin creator) = 0;
diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index d72de347..3686e385 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -544,10 +544,10 @@ namespace XMPP { namespace Jingle {
         Manager *              manager;
         QScopedPointer<JTPush> pushTask;
         // ns -> application
-        QMap<QString, QPointer<ApplicationManager>> applicationManagers;
+        std::map<QString, QPointer<ApplicationManager>> applicationManagers;
         // ns -> parser function
-        QMap<QString, QPointer<TransportManager>> transportManagers;
-        std::function<bool(const Jid &)>          remoteJidCecker;
+        std::map<QString, QPointer<TransportManager>> transportManagers;
+        std::function<bool(const Jid &)>              remoteJidCecker;
 
         // when set/valid any incoming session initiate will be replied with redirection error
         Jid                                   redirectionJid;
@@ -578,10 +578,10 @@ namespace XMPP { namespace Jingle {
     Manager::~Manager()
     {
         for (auto &m : d->transportManagers) {
-            m->setJingleManager(nullptr);
+            m.second->setJingleManager(nullptr);
         }
         for (auto &m : d->applicationManagers) {
-            m->setJingleManager(nullptr);
+            m.second->setJingleManager(nullptr);
         }
     }
 
@@ -601,48 +601,46 @@ namespace XMPP { namespace Jingle {
     {
         auto const &nss = app->ns();
         for (auto const &ns : nss)
-            d->applicationManagers.insert(ns, app);
+            d->applicationManagers.emplace(ns, app);
         app->setJingleManager(this);
     }
 
     void Manager::unregisterApp(const QString &ns)
     {
-        auto appManager = d->applicationManagers.value(ns);
-        if (appManager) {
-            appManager->closeAll(ns);
-            d->applicationManagers.remove(ns);
+        auto node = d->applicationManagers.extract(ns);
+        if (node) {
+            node.mapped()->closeAll(ns);
         }
     }
 
-    bool Manager::isRegisteredApplication(const QString &ns) { return d->applicationManagers.contains(ns); }
+    bool Manager::isRegisteredApplication(const QString &ns) { return d->applicationManagers.count(ns); }
 
     ApplicationManagerPad *Manager::applicationPad(Session *session, const QString &ns)
     {
-        auto am = d->applicationManagers.value(ns);
-        if (!am) {
+        auto it = d->applicationManagers.find(ns);
+        if (it == d->applicationManagers.end()) {
             return nullptr;
         }
-        return am->pad(session);
+        return it->second->pad(session);
     }
 
     void Manager::registerTransport(TransportManager *transport)
     {
         auto const &nss = transport->ns();
         for (auto const &ns : nss)
-            d->transportManagers.insert(ns, transport);
+            d->transportManagers.emplace(ns, transport);
         transport->setJingleManager(this);
     }
 
     void Manager::unregisterTransport(const QString &ns)
     {
-        auto trManager = d->transportManagers.value(ns);
+        auto trManager = d->transportManagers.extract(ns);
         if (trManager) {
-            trManager->closeAll(ns);
-            d->transportManagers.remove(ns);
+            trManager.mapped()->closeAll(ns);
         }
     }
 
-    bool Manager::isRegisteredTransport(const QString &ns) { return d->transportManagers.contains(ns); }
+    bool Manager::isRegisteredTransport(const QString &ns) { return d->transportManagers.count(ns); }
 
     bool Manager::isAllowedParty(const Jid &jid) const
     {
@@ -668,33 +666,36 @@ namespace XMPP { namespace Jingle {
 
     TransportManagerPad *Manager::transportPad(Session *session, const QString &ns)
     {
-        auto transportManager = d->transportManagers.value(ns);
-        if (!transportManager) {
+        auto transportManager = d->transportManagers.find(ns);
+        if (transportManager == d->transportManagers.end()) {
             return nullptr;
         }
-        return transportManager->pad(session);
+        return transportManager->second->pad(session);
     }
 
     QStringList Manager::availableTransports(const TransportFeatures &features) const
     {
-        QMap<int, QString> ret;
-        for (auto it = d->transportManagers.cbegin(); it != d->transportManagers.cend(); ++it) {
-            if (((*it)->features() & features) == features) {
-                ret.insert((*it)->features(), it.key());
-            }
+        std::vector<std::pair<int, QString>> prio;
+        prio.reserve(d->transportManagers.size());
+        for (auto const &[ns, m] : d->transportManagers) {
+            if (m->canMakeConnection(features, ns))
+                prio.emplace_back(m->features(), ns);
         }
+        std::sort(prio.begin(), prio.end(), [](auto const &a, auto const &b) { return a.first < b.first; });
+        QStringList nss;
+        std::transform(prio.begin(), prio.end(), std::back_inserter(nss), [](auto const &p) { return p.second; });
+        return nss;
         // sorting by features is totally unreliable, so we have TransportSelector to do better job
-        return ret.values();
     }
 
     QStringList Manager::discoFeatures() const
     {
         QStringList ret;
-        for (auto const &mgr : qAsConst(d->applicationManagers)) {
-            ret += mgr->discoFeatures();
+        for (auto const &mgr : d->applicationManagers) {
+            ret += mgr.second->discoFeatures();
         }
-        for (auto const &mgr : qAsConst(d->transportManagers)) {
-            ret += mgr->discoFeatures();
+        for (auto const &mgr : d->transportManagers) {
+            ret += mgr.second->discoFeatures();
         }
         return ret;
     }

From bb3f4545cfe1be59537d93adf0a4fa4e1308525f Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 27 Apr 2021 10:06:16 +0300
Subject: [PATCH 302/383] fix build errors

---
 src/xmpp/xmpp-im/jingle.cpp | 52 ++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 29 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index 3686e385..1ea3d19a 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -181,33 +181,27 @@ namespace XMPP { namespace Jingle {
     // Reason
     //----------------------------------------------------------------------------
     using ReasonMap = QMap<QString, Reason::Condition>;
-    const ReasonMap &reasonConditions()
-    {
-        static std::unique_ptr<ReasonMap> conditions;
-        if (!conditions) {
-            conditions.reset(new ReasonMap({
-                { QStringLiteral("alternative-session"), Reason::AlternativeSession },
-                { QStringLiteral("busy"), Reason::Busy },
-                { QStringLiteral("cancel"), Reason::Cancel },
-                { QStringLiteral("connectivity-error"), Reason::ConnectivityError },
-                { QStringLiteral("decline"), Reason::Decline },
-                { QStringLiteral("expired"), Reason::Expired },
-                { QStringLiteral("failed-application"), Reason::FailedApplication },
-                { QStringLiteral("failed-transport"), Reason::FailedTransport },
-                { QStringLiteral("general-error"), Reason::GeneralError },
-                { QStringLiteral("gone"), Reason::Gone },
-                { QStringLiteral("incompatible-parameters"), Reason::IncompatibleParameters },
-                { QStringLiteral("media-error"), Reason::MediaError },
-                { QStringLiteral("security-error"), Reason::SecurityError },
-                { QStringLiteral("success"), Reason::Success },
-                { QStringLiteral("timeout"), Reason::Timeout },
-                { QStringLiteral("unsupported-applications"), Reason::UnsupportedApplications },
-                { QStringLiteral("unsupported-transports"), Reason::UnsupportedTransports },
-            }));
-            QObject::connect(qApp, &QCoreApplication::destroyed, []() { conditions.release(); });
-        }
-        return *conditions;
-    }
+
+    Q_GLOBAL_STATIC_WITH_ARGS(ReasonMap, reasonConditions,
+                              ({
+                                  { QLatin1String("alternative-session"), Reason::AlternativeSession },
+                                  { QLatin1String("busy"), Reason::Busy },
+                                  { QLatin1String("cancel"), Reason::Cancel },
+                                  { QLatin1String("connectivity-error"), Reason::ConnectivityError },
+                                  { QLatin1String("decline"), Reason::Decline },
+                                  { QLatin1String("expired"), Reason::Expired },
+                                  { QLatin1String("failed-application"), Reason::FailedApplication },
+                                  { QLatin1String("failed-transport"), Reason::FailedTransport },
+                                  { QLatin1String("general-error"), Reason::GeneralError },
+                                  { QLatin1String("gone"), Reason::Gone },
+                                  { QLatin1String("incompatible-parameters"), Reason::IncompatibleParameters },
+                                  { QLatin1String("media-error"), Reason::MediaError },
+                                  { QLatin1String("security-error"), Reason::SecurityError },
+                                  { QLatin1String("success"), Reason::Success },
+                                  { QLatin1String("timeout"), Reason::Timeout },
+                                  { QLatin1String("unsupported-applications"), Reason::UnsupportedApplications },
+                                  { QLatin1String("unsupported-transports"), Reason::UnsupportedTransports },
+                              }))
 
     class Reason::Private : public QSharedData {
     public:
@@ -240,7 +234,7 @@ namespace XMPP { namespace Jingle {
             } else if (c.namespaceURI() != rns) {
                 // TODO add here all the extensions to reason.
             } else {
-                condition = reasonConditions().value(c.tagName());
+                condition = reasonConditions->value(c.tagName());
             }
         }
 
@@ -280,7 +274,7 @@ namespace XMPP { namespace Jingle {
     QDomElement Reason::toXml(QDomDocument *doc) const
     {
         if (d && d->cond != NoReason) {
-            for (auto r = reasonConditions().cbegin(); r != reasonConditions().cend(); ++r) {
+            for (auto r = reasonConditions->cbegin(); r != reasonConditions->cend(); ++r) {
                 if (r.value() == d->cond) {
                     QDomElement e = doc->createElement(QLatin1String("reason"));
                     e.appendChild(doc->createElement(r.key()));

From 79738087da787c37656819b30b157218743850bd Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Thu, 29 Apr 2021 00:54:50 +0300
Subject: [PATCH 303/383] Introduce Transport::onFinish function to do final
 transport stuff

---
 src/xmpp/xmpp-im/jingle-application.cpp |  2 +-
 src/xmpp/xmpp-im/jingle-ibb.cpp         |  5 ++-
 src/xmpp/xmpp-im/jingle-ice.cpp         | 14 +++++---
 src/xmpp/xmpp-im/jingle-s5b.cpp         | 43 +++++++++++--------------
 src/xmpp/xmpp-im/jingle-transport.cpp   | 14 ++++++++
 src/xmpp/xmpp-im/jingle-transport.h     |  7 ++--
 6 files changed, 50 insertions(+), 35 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-application.cpp b/src/xmpp/xmpp-im/jingle-application.cpp
index 5092d61a..219c8e36 100644
--- a/src/xmpp/xmpp-im/jingle-application.cpp
+++ b/src/xmpp/xmpp-im/jingle-application.cpp
@@ -45,7 +45,7 @@ namespace XMPP { namespace Jingle {
         void onFailed(const QString &errorMessage = QString())
         {
             if (!errorMessage.isEmpty())
-                qWarning("ConnectionWaiter: error: %s", qPrintable(errorMessage));
+                qDebug("ConnectionWaiter: error: %s", qPrintable(errorMessage));
             if (connection)
                 connection->disconnect(this); // qt signals
             if (auto t = transport.lock()) {
diff --git a/src/xmpp/xmpp-im/jingle-ibb.cpp b/src/xmpp/xmpp-im/jingle-ibb.cpp
index 55682c6b..18a7bc66 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.cpp
+++ b/src/xmpp/xmpp-im/jingle-ibb.cpp
@@ -190,7 +190,7 @@ namespace XMPP { namespace Jingle { namespace IBB {
                 d->connections.first()->close();
             }
             // d->aborted = true;
-            emit failed(); // TODO review if necessary. likely it's not
+            onFinish(Reason::Cancel);
         });
     }
 
@@ -217,8 +217,7 @@ namespace XMPP { namespace Jingle { namespace IBB {
             ++it;
         }
         if (d->connections.isEmpty()) {
-            _state = State::Finished;
-            emit failed();
+            onFinish(Reason::GeneralError, QLatin1String("no connections registered"));
         } else
             emit updated();
     }
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index 7ac7b818..888d5987 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -545,6 +545,13 @@ namespace XMPP { namespace Jingle { namespace ICE {
         quint16      udpPort;
         QHostAddress udpAddress;
 
+        ~Private()
+        {
+            if (ice) {
+                ice->disconnect(q);
+            }
+        }
+
         inline Jid remoteJid() const { return q->_pad->session()->peer(); }
 
         Component &addComponent()
@@ -698,9 +705,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
                 }
             });
             q->connect(ice, &XMPP::Ice176::error, q, [this](XMPP::Ice176::Error err) {
-                q->_lastReason = Reason(Reason::Condition::FailedTransport, QString("ICE failed: %1").arg(err));
-                q->setState(State::Finished);
-                emit q->failed();
+                q->onFinish(Reason::Condition::FailedTransport, QString("ICE failed: %1").arg(err));
             });
             q->connect(ice, &XMPP::Ice176::localCandidatesReady, q,
                        [this](const QList<XMPP::Ice176::Candidate> &candidates) {
@@ -985,8 +990,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
         d->remoteState.reset(new Element {});
         connect(_pad->manager(), &TransportManager::abortAllRequested, this, [this]() {
             d->aborted = true;
-            _state     = State::Finished;
-            emit failed();
+            onFinish(Reason::Cancel);
         });
     }
 
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 0386d668..7fb07cdb 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -966,8 +966,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
                 } else
                     qDebug("checkAndFinishNegotiation not finished: preferred is not Active");
             } else { // both sides reported candidate error
-                q->setState(State::Finished);
-                emit q->failed();
+                q->onFinish(Reason::Condition::ConnectivityError, QLatin1String("both sides reported candidate error"));
             }
         }
 
@@ -1348,8 +1347,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
                 delete disco;
 
                 QTimer::singleShot(0, q, [this]() {
-                    q->setState(State::Finished);
-                    emit q->failed();
+                    q->onFinish(Reason::Condition::ConnectivityError, QLatin1String("got proxy error from the peer"));
                 });
                 return true;
             }
@@ -1368,8 +1366,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
         connect(&d->negotiationFinishTimer, &QTimer::timeout, this, [this]() { d->handleNegotiationTimeout(); });
         connect(_pad->manager(), &TransportManager::abortAllRequested, this, [this]() {
             d->aborted = true;
-            _state     = State::Finished;
-            emit failed();
+            onFinish(Reason::Condition::Cancel);
         });
     }
 
@@ -1413,10 +1410,8 @@ namespace XMPP { namespace Jingle { namespace S5B {
 
         if (isRemote() && !notifyIncomingConnection(d->connection)) {
             // our the only connection wasn't accepted
-            _state      = State::Finished;
-            _lastReason = { Reason::IncompatibleParameters,
-                            QLatin1String("Application didn't accept the only incoming connection") };
-            emit failed();
+            onFinish(Reason::IncompatibleParameters,
+                     QLatin1String("Application didn't accept the only incoming connection"));
             return;
         }
         emit updated();
@@ -1491,20 +1486,20 @@ namespace XMPP { namespace Jingle { namespace S5B {
         auto makeUpdate = [&](QDomElement tel, bool expectedSuccess = false,
                               std::function<void(Task *)> cb = std::function<void(Task *)>()) {
             d->waitingAck = true;
-            return OutgoingTransportInfoUpdate { tel,
-                                                 [this, cb, expectedSuccess,
-                                                  trptr = QPointer<Transport>(d->q)](Task *task) {
-                                                     if (!trptr)
-                                                         return;
-                                                     d->waitingAck = false;
-                                                     if (expectedSuccess && !task->success()) {
-                                                         _state = State::Finished;
-                                                         d->localCandidates.clear();
-                                                         d->remoteCandidates.clear();
-                                                         emit failed();
-                                                     } else if (cb)
-                                                         cb(task);
-                                                 } };
+            return OutgoingTransportInfoUpdate {
+                tel,
+                [this, cb, expectedSuccess, trptr = QPointer<Transport>(d->q)](Task *task) {
+                    if (!trptr)
+                        return;
+                    d->waitingAck = false;
+                    if (expectedSuccess && !task->success()) {
+                        d->localCandidates.clear();
+                        d->remoteCandidates.clear();
+                        onFinish(Reason::Condition::FailedTransport, QLatin1String("iq error"));
+                    } else if (cb)
+                        cb(task);
+                }
+            };
         };
 
         auto doc = _pad.staticCast<Pad>()->session()->manager()->client()->doc();
diff --git a/src/xmpp/xmpp-im/jingle-transport.cpp b/src/xmpp/xmpp-im/jingle-transport.cpp
index a95446b9..b0731656 100644
--- a/src/xmpp/xmpp-im/jingle-transport.cpp
+++ b/src/xmpp/xmpp-im/jingle-transport.cpp
@@ -20,6 +20,8 @@
 #include "jingle-transport.h"
 #include "jingle-session.h"
 
+#include <QPointer>
+
 namespace XMPP { namespace Jingle {
     //----------------------------------------------------------------------------
     // TransportManager
@@ -62,6 +64,18 @@ namespace XMPP { namespace Jingle {
         return _state >= State::ApprovedToSend;
     }
 
+    void Transport::onFinish(Reason::Condition condition, const QString &message)
+    {
+        _lastReason = Reason(condition, message);
+        _prevState  = _state;
+        _state      = State::Finished;
+        QPointer<Transport> p(this);
+        if (condition != Reason::Condition::Success && condition != Reason::Condition::NoReason)
+            emit failed();
+        if (p)
+            emit stateChanged();
+    }
+
     void Transport::addAcceptor(TransportFeatures features, ConnectionAcceptorCallback &&acceptor, int componentIndex)
     {
         _connectionAcceptors.append({ features, std::move(acceptor), componentIndex });
diff --git a/src/xmpp/xmpp-im/jingle-transport.h b/src/xmpp/xmpp-im/jingle-transport.h
index f6111fae..3b2c2e1f 100644
--- a/src/xmpp/xmpp-im/jingle-transport.h
+++ b/src/xmpp/xmpp-im/jingle-transport.h
@@ -165,12 +165,15 @@ namespace XMPP { namespace Jingle {
         void stateChanged();
 
     protected:
-        // just updates state and signals about the change. No any loggic attached to the new state
+        /// just updates state and signals about the change. No any loggic attached to the new state
         void setState(State newState);
 
-        // Where the user already gave his consent to transfer data. (one exception: State::Finished)
+        /// Where the user already gave his consent to transfer data. (one exception: State::Finished)
         bool wasAccepted() const;
 
+        /// Called in the end of life to trigger final events
+        void onFinish(Reason::Condition condition, const QString &message = QString());
+
         /**
          * @brief notifyIncomingConnection checks all acceptors and return true if any accepted the connection
          * @return acceptance status

From 87fcea8719a1d326e6fe539bb33136628c870401 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Fri, 30 Apr 2021 10:19:47 +0300
Subject: [PATCH 304/383] minor fixes

---
 src/xmpp/xmpp-im/jingle-ice.cpp | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index 888d5987..2b36b899 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -81,6 +81,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
         if (!c.id.isEmpty())
             e.setAttribute("id", c.id);
         e.setAttribute("ip", c.ip.toString());
+        // e.setAttribute("ip", "192.168.0.99");
         if (c.network != -1)
             e.setAttribute("network", QString::number(c.network));
         else // weird?
@@ -450,14 +451,6 @@ namespace XMPP { namespace Jingle { namespace ICE {
 
         void close() override { XMPP::Jingle::Connection::close(); }
 
-    protected:
-        qint64 writeData(const char *data, qint64 maxSize) override
-        {
-            return 0; // client->write(data, maxSize);
-        }
-
-        qint64 readData(char *data, qint64 maxSize) override { return 0; }
-
     private:
         friend class Transport;
 
@@ -705,7 +698,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
                 }
             });
             q->connect(ice, &XMPP::Ice176::error, q, [this](XMPP::Ice176::Error err) {
-                q->onFinish(Reason::Condition::FailedTransport, QString("ICE failed: %1").arg(err));
+                q->onFinish(Reason::Condition::ConnectivityError, QString("ICE failed: %1").arg(err));
             });
             q->connect(ice, &XMPP::Ice176::localCandidatesReady, q,
                        [this](const QList<XMPP::Ice176::Candidate> &candidates) {

From fb65f416cbcd1b6a7cbce04fb7940a8a25a404b6 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Fri, 30 Apr 2021 15:26:58 +0300
Subject: [PATCH 305/383] Enable bundled qca by default on macOS

---
 CMakeLists.txt | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a82655b..67d88666 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,10 +45,15 @@ set( CMAKE_MODULE_PATH
     "${PROJECT_SOURCE_DIR}/cmake/modules"
     )
 
+set( DEFAULT_BUNDLED_QCA OFF )
+if (APPLE)
+    set( DEFAULT_BUNDLED_QCA ON )
+endif()
+
 option( USE_QJDNS "Use qjdns/jdns library. Disabled by default for Qt5" OFF )
 option( SEPARATE_QJDNS "Build qjdns with iris library" OFF )
 option( JINGLE_ICE "Enable ICE Jingle transport for p2p file transfer" ON )
-option( BUNDLED_QCA "Adds: DTLS, Blake2b and other useful for XMPP crypto-stuff" OFF)
+option( BUNDLED_QCA "Adds: DTLS, Blake2b and other useful for XMPP crypto-stuff" ${DEFAULT_BUNDLED_QCA})
 option( BUNDLED_USRSCTP "Compile compatible usrsctp lib when system one is not available or uncompatible (required for datachannel jingle transport)" OFF)
 option( BUILD_IRIS_TOOLS "Build tools and examples" OFF)
 
@@ -97,6 +102,9 @@ if(BUNDLED_QCA)
         set(Qca_INCLUDE_DIR_EXPORT ${Qca_INCLUDE_DIR} PARENT_SCOPE)
     endif()
 
+    if ("${OPENSSL_ROOT_DIR}" STREQUAL "" AND APPLE)
+        set(OPENSSL_ROOT_DIR /usr/local/opt/openssl)
+    endif()
     find_package(OpenSSL REQUIRED)
 
     include(ExternalProject)

From fecd19ff9db47f9bfff91a83346536a521ee9710 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Fri, 30 Apr 2021 15:54:59 +0300
Subject: [PATCH 306/383] Mark virtual overrides as overrides

---
 src/irisnet/noncore/iceturntransport.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/irisnet/noncore/iceturntransport.h b/src/irisnet/noncore/iceturntransport.h
index 0b5910f4..fd0e9f3b 100644
--- a/src/irisnet/noncore/iceturntransport.h
+++ b/src/irisnet/noncore/iceturntransport.h
@@ -55,12 +55,12 @@ class IceTurnTransport : public IceTransport, public QEnableSharedFromThis<IceTu
     TurnClient::Error turnErrorCode() const;
 
     // reimplemented
-    virtual void       stop();
-    virtual bool       hasPendingDatagrams(int path) const;
-    virtual QByteArray readDatagram(int path, QHostAddress *addr, quint16 *port);
-    virtual void       writeDatagram(int path, const QByteArray &buf, const QHostAddress &addr, int port);
-    virtual void       addChannelPeer(const QHostAddress &addr, int port);
-    virtual void       setDebugLevel(DebugLevel level);
+    virtual void       stop() override;
+    virtual bool       hasPendingDatagrams(int path) const override;
+    virtual QByteArray readDatagram(int path, QHostAddress *addr, quint16 *port) override;
+    virtual void       writeDatagram(int path, const QByteArray &buf, const QHostAddress &addr, int port) override;
+    virtual void       addChannelPeer(const QHostAddress &addr, int port) override;
+    virtual void       setDebugLevel(DebugLevel level) override;
     virtual void       changeThread(QThread *thread) override;
 
 private:

From 669417b3c2e6d5804f8659f707cc8824bbcfe91f Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sat, 1 May 2021 23:03:45 +0300
Subject: [PATCH 307/383] Fixed fallback from ICE to S5B

---
 src/xmpp/xmpp-im/jingle-application.cpp |  33 +++---
 src/xmpp/xmpp-im/jingle-s5b.cpp         | 143 +++++++++++++-----------
 2 files changed, 92 insertions(+), 84 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-application.cpp b/src/xmpp/xmpp-im/jingle-application.cpp
index 219c8e36..97e8990c 100644
--- a/src/xmpp/xmpp-im/jingle-application.cpp
+++ b/src/xmpp/xmpp-im/jingle-application.cpp
@@ -126,7 +126,7 @@ namespace XMPP { namespace Jingle {
 
         // missing transport means it's an incoming application with invalid transport,
         // but basically it shouldn't happen
-        if ((_creator != _pad->session()->role() && _state == State::Pending) || !_transport) {
+        if ((isRemote() && _state == State::Pending) || !_transport) {
             return _update;
         }
 
@@ -168,28 +168,22 @@ namespace XMPP { namespace Jingle {
         case State::Connecting:
             if (inTrReplace) {
                 // for transport replace we handle just replace until it's finished
-                if (_transport->creator() == _pad->session()->role()) {
-                    if (_transport->state() == State::Finished)
-                        // replace over unconfirmed replace (2nd transport failed shortly)
-                        _update = { _transportSelector->hasMoreTransports() ? Action::TransportReplace
-                                                                            : Action::ContentRemove,
-                                    _transport->lastReason() };
-                    break;
-                }
-
-                if (_transport->hasUpdates() && _transport->state() == State::ApprovedToSend) {
-                    _update = { Action::TransportAccept, Reason() };
-                    break;
-                }
-                if (_transport->state() == State::Finished) {
-                    _update = { Action::TransportReject, _transport->lastReason() };
+                if (_transport->state() == State::Finished) { // 2nd transport failed shortly
+                    _update = { _transportSelector->hasMoreTransports()
+                                    ? (_transport->isLocal() ? Action::TransportReplace : Action::TransportReject)
+                                    : Action::ContentRemove,
+                                _transport->lastReason() };
+                } else if (_transport->hasUpdates() && _transport->state() == State::ApprovedToSend) {
+                    _update = { _transport->isLocal() ? Action::TransportInfo : Action::TransportAccept, Reason() };
                 }
                 break;
             }
 
             if (_transport->hasUpdates()) {
                 if (_transport->state() >= State::ApprovedToSend && _transport->state() < State::Finished)
-                    _update = { Action::TransportInfo, Reason() };
+                    _update = { _pendingTransportReplace == PendingTransportReplace::Planned ? Action::TransportReplace
+                                                                                             : Action::TransportInfo,
+                                Reason() };
             } else if (_transport->state() == State::Finished) {
                 _update = { _transportSelector->hasMoreTransports() ? Action::TransportReplace : Action::ContentRemove,
                             _transport->lastReason() };
@@ -277,8 +271,11 @@ namespace XMPP { namespace Jingle {
             contentEl.appendChild(transportEl);
             return OutgoingUpdate { updates, [this, transportCB](Task *task) {
                                        transportCB(task);
-                                       if (task->success())
+                                       if (task->success()) {
                                            _pendingTransportReplace = PendingTransportReplace::None;
+                                           if (_state == State::Connecting || _state == State::Active)
+                                               _transport->start();
+                                       }
                                        // else transport will report failure from its callback => select next tran.
                                    } };
         default:
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 7fb07cdb..a96284d5 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -581,18 +581,19 @@ namespace XMPP { namespace Jingle { namespace S5B {
     public:
         enum PendingActions { NewCandidate = 1, CandidateUsed = 2, CandidateError = 4, Activated = 8, ProxyError = 16 };
 
-        Transport *              q                            = nullptr;
-        bool                     p2pAllowed                   = true;
-        bool                     offerSent                    = false;
-        bool                     waitingAck                   = true;
-        bool                     aborted                      = false;
-        bool                     remoteReportedCandidateError = false;
-        bool                     localReportedCandidateError  = false;
-        bool                     proxyDiscoveryInProgress     = false; // if we have valid proxy requests
-        quint16                  pendingActions               = 0;
-        int                      proxiesInDiscoCount          = 0;
-        QMap<QString, Candidate> localCandidates; // cid to candidate mapping
-        QMap<QString, Candidate> remoteCandidates;
+        Transport *                  q                            = nullptr;
+        bool                         p2pAllowed                   = true;
+        bool                         offerSent                    = false;
+        bool                         waitingAck                   = true;
+        bool                         aborted                      = false;
+        bool                         remoteReportedCandidateError = false;
+        bool                         localReportedCandidateError  = false;
+        bool                         proxyDiscoveryInProgress     = false; // if we have valid proxy requests
+        quint16                      pendingActions               = 0;
+        int                          proxiesInDiscoCount          = 0;
+        QStringList                  localCandidatesTrack;
+        std::map<QString, Candidate> localCandidates; // cid to candidate mapping
+        std::map<QString, Candidate> remoteCandidates;
         Candidate localUsedCandidate;  // we received "candidate-used" for this candidate from localCandidates list
         Candidate remoteUsedCandidate; // we sent "candidate-used" for this candidate from remoteCandidates list
         QString   dstaddr;  // an address for xmpp proxy as it comes from remote. each side calculates it like sha1(sid
@@ -627,13 +628,13 @@ namespace XMPP { namespace Jingle { namespace S5B {
 #else
                 cid = QString("%1").arg(qrand() & 0xffff, 4, 16, QChar('0'));
 #endif
-            } while (localCandidates.contains(cid) || remoteCandidates.contains(cid));
+            } while (localCandidates.count(cid) || remoteCandidates.count(cid));
             return cid;
         }
 
         bool isDup(const Candidate &c) const
         {
-            for (auto const &rc : remoteCandidates) {
+            for (auto const &[_, rc] : remoteCandidates) {
                 if (c.host() == rc.host() && c.port() == rc.port()) {
                     return true;
                 }
@@ -651,9 +652,10 @@ namespace XMPP { namespace Jingle { namespace S5B {
                     return;
                 }
                 bool candidateUpdated = false;
-                auto c                = localCandidates.value(cid);
-                if (c && c.state() == Candidate::Probing) {
-                    auto sh = query->proxyInfo();
+                auto it               = localCandidates.find(cid);
+                if (it != localCandidates.end() && it->second.state() == Candidate::Probing) {
+                    auto &c  = it->second;
+                    auto  sh = query->proxyInfo();
                     if (query->success() && !sh.host().isEmpty() && sh.port()) {
                         // it can be discarded by this moment (e.g. got success on a higher priority
                         // candidate). so we have to check.
@@ -689,7 +691,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
                 Candidate c(q, proxy, generateCid());
                 if (!isDup(c)) {
                     qDebug("new local candidate: %s", qPrintable(c.toString()));
-                    localCandidates.insert(c.cid(), c);
+                    localCandidates.emplace(c.cid(), c);
                     queryS5BProxy(c.jid(), c.cid());
                 }
             }
@@ -717,13 +719,13 @@ namespace XMPP { namespace Jingle { namespace S5B {
                             continue;
                         }
                         Candidate c(q, i.jid(), generateCid(), localPref);
-                        localCandidates.insert(c.cid(), c);
+                        localCandidates.emplace(c.cid(), c);
                         qDebug("new local candidate: %s", qPrintable(c.toString()));
                         queryS5BProxy(i.jid(), c.cid());
                     }
                     if (!userProxyFound) {
                         Candidate c(q, userProxy, generateCid(), 1);
-                        localCandidates.insert(c.cid(), c);
+                        localCandidates.emplace(c.cid(), c);
                         qDebug("new local candidate: %s", qPrintable(c.toString()));
                         queryS5BProxy(userProxy, c.cid());
                     } else if (items.count() == 0) {
@@ -755,7 +757,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
             */
 
             qDebug("tryConnectToRemoteCandidate()");
-            for (auto &c : remoteCandidates) {
+            for (auto &[cid, c] : remoteCandidates) {
                 if (c.state() == Candidate::New) {
                     if (c.priority() > maxNewPrio) {
                         maxNew = QList<Candidate>();
@@ -804,7 +806,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
                         if (success) {
                             // let's reject candidates which are meaningless to try
                             bool hasUnckeckedNew = false;
-                            for (auto &c : remoteCandidates) {
+                            for (auto &[cid, c] : remoteCandidates) {
                                 if (c.state() == Candidate::New) {
                                     if (c.priority() <= mnc.priority()) {
                                         c.setState(Candidate::Discarded);
@@ -867,7 +869,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
             }
 
             // now local candidates
-            for (const auto &c : localCandidates) {
+            for (const auto &[_, c] : localCandidates) {
                 auto s = c.state();
                 if (s == Candidate::Probing || s == Candidate::New || s == Candidate::Unacked) {
                     qDebug("still has: a local candidte cid=%s in %s state", qPrintable(c.cid()),
@@ -979,7 +981,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
             bool    allRemoteDiscarded          = true;
             bool    hasConnectedRemoteCandidate = false;
             QString states;
-            for (const auto &c : remoteCandidates) {
+            for (const auto &[_, c] : remoteCandidates) {
                 auto s = c.state();
                 states += QString("\n%1").arg(c.toString());
                 if (s != Candidate::Discarded) {
@@ -1020,7 +1022,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
             // more local candidates are expected to be discovered
 
             if (q->_state != State::Connecting) { // if not started or already finished
-                qDebug("checkAndFinishNegotiation not finished: !connectionStarted || connection");
+                qDebug("checkAndFinishNegotiation not finished: q->_state != State::Connecting");
                 return;
             }
 
@@ -1059,18 +1061,18 @@ namespace XMPP { namespace Jingle { namespace S5B {
                 prio = localUsedCandidate.priority();
             }
             // find highest priority withing connected remote candidates
-            for (const auto &c : remoteCandidates) {
+            for (const auto &[_, c] : remoteCandidates) {
                 if (c.state() != Candidate::Discarded && c.state() >= Candidate::Pending && c.priority() > prio) {
                     prio = c.priority();
                 }
             }
 
-            for (auto &c : localCandidates) {
+            for (auto &[_, c] : localCandidates) {
                 if (c.priority() < prio && c.state() != Candidate::Discarded) {
                     c.setState(Candidate::Discarded);
                 }
             }
-            for (auto &c : remoteCandidates) {
+            for (auto &[_, c] : remoteCandidates) {
                 if (c.priority() < prio && c.state() != Candidate::Discarded) {
                     c.setState(Candidate::Discarded);
                 }
@@ -1099,7 +1101,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
 
             // now check and reset NewCandidate pending action
             bool haveNewCandidates = false;
-            for (auto &c : remoteCandidates) {
+            for (auto &[_, c] : remoteCandidates) {
                 if (c.state() == Candidate::New) {
                     haveNewCandidates = true;
                     break;
@@ -1172,7 +1174,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
                             connection->enqueueIncomingUDP(data); // man_udpReady
                             return true;
                         });
-                    localCandidates.insert(c.cid(), c);
+                    localCandidates.emplace(c.cid(), c);
                     qDebug("new local candidate: %s", qPrintable(c.toString()));
                     pendingActions |= NewCandidate;
                     hasNewCandidates = true;
@@ -1189,12 +1191,16 @@ namespace XMPP { namespace Jingle { namespace S5B {
             probingTimer.stop();
             negotiationFinishTimer.stop();
             proxyDiscoveryInProgress = false;
-            for (auto &rc : remoteCandidates) {
+            for (auto &[_, rc] : remoteCandidates) {
                 if (rc != connCand && rc.state() == Candidate::Probing) {
                     rc.deleteSocksClient();
                 }
             }
             QTimer::singleShot(0, q, [this]() {
+                for (const auto &[cid, candidate] : localCandidates) {
+                    if (candidate.state() == Candidate::Discarded)
+                        localCandidatesTrack.append(cid);
+                }
                 localCandidates.clear();
                 remoteCandidates.clear();
                 q->setState(State::Active);
@@ -1205,12 +1211,12 @@ namespace XMPP { namespace Jingle { namespace S5B {
         {
             // probingTimer.stop();
             proxyDiscoveryInProgress = false;
-            for (auto &rc : remoteCandidates) {
+            for (auto &[_, rc] : remoteCandidates) {
                 if (rc.state() <= Candidate::Probing) {
                     rc.setState(Candidate::Discarded);
                 }
             }
-            for (auto &rc : localCandidates) {
+            for (auto &[_, rc] : localCandidates) {
                 if (rc.state() <= Candidate::Probing) {
                     rc.setState(Candidate::Discarded);
                 }
@@ -1233,7 +1239,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
                     qDebug("new remote candidate discarded with forbidden p2p: %s", qPrintable(c));
                 } else {
                     qDebug("new remote candidate: %s", qPrintable(c.toString()));
-                    remoteCandidates.insert(c.cid(), c); // TODO check for collisions!
+                    remoteCandidates.emplace(c.cid(), c); // TODO check for collisions!
                     reallyAdded = true;
                 }
                 handled = true;
@@ -1250,12 +1256,15 @@ namespace XMPP { namespace Jingle { namespace S5B {
         {
             QDomElement el = transportEl.firstChildElement(QStringLiteral("candidate-used"));
             if (!el.isNull()) {
-                auto cid   = QStringLiteral("cid");
-                auto cUsed = localCandidates.value(el.attribute(cid));
-                if (!cUsed) {
+                auto cid = QStringLiteral("cid");
+                auto it  = localCandidates.find(el.attribute(cid));
+                if (it == localCandidates.end()) {
+                    if (localCandidatesTrack.contains(cid))
+                        return true; // likely discarded as not needed anymore
                     throw Stanza::Error(Stanza::Error::Cancel, Stanza::Error::ItemNotFound,
                                         QString("failed to find incoming candidate-used candidate %1").arg(cid));
                 }
+                auto &cUsed = it->second;
                 if (cUsed.state() == Candidate::Pending) {
                     if (cUsed.type() != Candidate::Proxy && !cUsed.isConnected()) {
                         throw Stanza::Error(
@@ -1285,7 +1294,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
             auto el = transportEl.firstChildElement(QStringLiteral("candidate-error"));
             if (!el.isNull()) {
                 remoteReportedCandidateError = true;
-                for (auto &c : localCandidates) {
+                for (auto &[_, c] : localCandidates) {
                     if (c.state() == Candidate::Pending) {
                         c.setState(Candidate::Discarded);
                     }
@@ -1322,11 +1331,12 @@ namespace XMPP { namespace Jingle { namespace S5B {
         {
             auto el = transportEl.firstChildElement(QStringLiteral("proxy-error"));
             if (!el.isNull()) {
-                auto c = localCandidates.value(el.attribute(QStringLiteral("cid")));
-                if (!c) {
+                auto it = localCandidates.find(el.attribute(QStringLiteral("cid")));
+                if (it == localCandidates.end()) {
                     throw Stanza::Error(Stanza::Error::Cancel, Stanza::Error::ItemNotFound,
                                         "failed to find incoming proxy-error candidate");
                 }
+                auto &c = it->second;
                 if (c != localUsedCandidate || c.state() != Candidate::Accepted) {
                     qDebug("Received <proxy-error> on a candidate in an inappropriate state. Ignored.");
                     return true;
@@ -1337,10 +1347,10 @@ namespace XMPP { namespace Jingle { namespace S5B {
                 // but we have to follow the standard.
 
                 // Discard everything
-                for (auto &c : localCandidates) {
+                for (auto &[_, c] : localCandidates) {
                     c.setState(Candidate::Discarded);
                 }
-                for (auto &c : remoteCandidates) {
+                for (auto &[_, c] : remoteCandidates) {
                     c.setState(Candidate::Discarded);
                 }
                 proxyDiscoveryInProgress = false;
@@ -1375,10 +1385,10 @@ namespace XMPP { namespace Jingle { namespace S5B {
         if (d) {
             // TODO unregister sid too
             static_cast<Manager *>(_pad.staticCast<Pad>()->manager())->removeKeyMapping(d->directAddr);
-            for (auto &c : d->remoteCandidates) {
+            for (auto &[_, c] : d->remoteCandidates) {
                 c.deleteSocksClient();
             }
-            for (auto &c : d->remoteCandidates) {
+            for (auto &[_, c] : d->remoteCandidates) {
                 auto srv = c.server();
                 if (srv) {
                     srv.staticCast<S5BServer>()->unregisterKey(d->directAddr);
@@ -1483,12 +1493,21 @@ namespace XMPP { namespace Jingle { namespace S5B {
             return upd;
         }
 
-        auto makeUpdate = [&](QDomElement tel, bool expectedSuccess = false,
-                              std::function<void(Task *)> cb = std::function<void(Task *)>()) {
+        // check where we make initial offer
+        bool noPending = (d->localCandidates.empty() && !d->proxyDiscoveryInProgress
+                          && !(d->disco && d->disco->inProgressPortTypes()));
+        bool initial   = _state == State::ApprovedToSend && !d->offerSent
+            && ((!d->pendingActions && noPending) || d->pendingActions & Private::NewCandidate);
+
+        auto makeUpdate = [this, initial](QDomElement tel, bool expectedSuccess = false,
+                                          std::function<void(Task *)> cb = std::function<void(Task *)>()) {
             d->waitingAck = true;
+            if (initial) {
+                _state = State::Unacked;
+            }
             return OutgoingTransportInfoUpdate {
                 tel,
-                [this, cb, expectedSuccess, trptr = QPointer<Transport>(d->q)](Task *task) {
+                [this, cb, expectedSuccess, trptr = QPointer<Transport>(d->q), initial](Task *task) {
                     if (!trptr)
                         return;
                     d->waitingAck = false;
@@ -1496,8 +1515,12 @@ namespace XMPP { namespace Jingle { namespace S5B {
                         d->localCandidates.clear();
                         d->remoteCandidates.clear();
                         onFinish(Reason::Condition::FailedTransport, QLatin1String("iq error"));
-                    } else if (cb)
+                    } else if (cb) {
+                        if (initial) {
+                            _state = isLocal() ? State::Pending : State::Accepted;
+                        }
                         cb(task);
+                    }
                 }
             };
         };
@@ -1507,12 +1530,6 @@ namespace XMPP { namespace Jingle { namespace S5B {
         QDomElement tel = doc->createElementNS(NS, "transport");
         tel.setAttribute(QStringLiteral("sid"), d->sid);
 
-        // check where we make initial offer
-        bool noPending = (d->localCandidates.isEmpty() && !d->proxyDiscoveryInProgress
-                          && !(d->disco && d->disco->inProgressPortTypes()));
-        bool initial   = _state == State::ApprovedToSend && !d->offerSent
-            && ((!d->pendingActions && noPending) || d->pendingActions & Private::NewCandidate);
-
         if (initial) {
             if (_creator == _pad->session()->role() && d->mode != Tcp) {
                 tel.setAttribute(QStringLiteral("mode"), "udp");
@@ -1525,7 +1542,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
             d->pendingActions &= ~Private::NewCandidate;
             bool             useProxy = false;
             QList<Candidate> candidatesToSend;
-            for (auto &c : d->localCandidates) {
+            for (auto &[_, c] : d->localCandidates) {
                 if (c.state() != Candidate::New) {
                     continue;
                 }
@@ -1545,9 +1562,6 @@ namespace XMPP { namespace Jingle { namespace S5B {
             if (!candidatesToSend.isEmpty()) {
                 upd = makeUpdate(tel, false, [this, candidatesToSend, initial](Task *jt) mutable {
                     if (jt->success()) {
-                        if (initial) {
-                            _state = _creator == _pad->session()->role() ? State::Pending : State::Accepted;
-                        }
                         for (auto &c : candidatesToSend) {
                             if (c.state() == Candidate::Unacked) {
                                 c.setState(Candidate::Pending);
@@ -1572,7 +1586,8 @@ namespace XMPP { namespace Jingle { namespace S5B {
             d->pendingActions &= ~Private::CandidateUsed;
             // we should have the only remote candidate in Pending state.
             // all other has to be discarded by priority check
-            for (auto &c : d->remoteCandidates) {
+            for (auto &it : d->remoteCandidates) {
+                auto &c = it.second;
                 if (c.state() != Candidate::Pending) {
                     continue;
                 }
@@ -1636,15 +1651,11 @@ namespace XMPP { namespace Jingle { namespace S5B {
             qDebug("sending empty transport-info");
             upd = makeUpdate(tel, false, [this, initial](Task *jt) mutable {
                 if (!jt->success()) {
-                    if (initial) {
-                        _state = State::Finished;
-                        emit failed();
-                    } else
+                    if (initial)
+                        onFinish(Reason::FailedTransport, QLatin1String("got it error for initial"));
+                    else
                         qWarning("Ignored failed IQ response");
                 }
-                if (initial) {
-                    _state = _creator == _pad->session()->role() ? State::Pending : State::Accepted;
-                }
             });
         }
 

From c82f036c82663af0a0cbbf3a4513056c92ff9dad Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 2 May 2021 13:15:30 +0300
Subject: [PATCH 308/383] httpupload: Send content-type with http request if
 ever requested via xmpp.

Closes https://github.com/psi-im/plugins/issues/90
---
 src/xmpp/xmpp-im/httpfileupload.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/xmpp/xmpp-im/httpfileupload.cpp b/src/xmpp/xmpp-im/httpfileupload.cpp
index 1a70e04b..dcb1997d 100644
--- a/src/xmpp/xmpp-im/httpfileupload.cpp
+++ b/src/xmpp/xmpp-im/httpfileupload.cpp
@@ -222,9 +222,11 @@ void HttpFileUpload::tryNextServer()
             setState(State::HttpRequest);
             // time for a http request
             QNetworkRequest req(d->result.putUrl);
-            for (auto &h : d->result.putHeaders) {
+            for (auto &h : d->result.putHeaders)
                 req.setRawHeader(h.name.toLatin1(), h.value.toLatin1());
-            }
+            if (!d->mediaType.isEmpty())
+                req.setHeader(QNetworkRequest::ContentTypeHeader, d->mediaType);
+
             auto reply = d->qnam->put(req, d->sourceDevice);
             connect(reply, &QNetworkReply::uploadProgress, this, &HttpFileUpload::progress);
             connect(reply, &QNetworkReply::finished, this, [this, reply]() {

From fb89ba3d09fedc906eed561aab4097e978d1fac9 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 3 May 2021 13:06:06 +0300
Subject: [PATCH 309/383] Avoid recursion on sctp outgoing buffer dumping

---
 src/xmpp/xmpp-im/jingle-sctp-association_p.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/xmpp/xmpp-im/jingle-sctp-association_p.cpp b/src/xmpp/xmpp-im/jingle-sctp-association_p.cpp
index d6f0f509..151bc649 100644
--- a/src/xmpp/xmpp-im/jingle-sctp-association_p.cpp
+++ b/src/xmpp/xmpp-im/jingle-sctp-association_p.cpp
@@ -165,6 +165,9 @@ namespace XMPP { namespace Jingle { namespace SCTP {
 
     void AssociationPrivate::procesOutgoingMessageQueue()
     {
+        if (dumpingOutogingBuffer)
+            return; // we don't need recursion here
+
         dumpingOutogingBuffer = true;
         // keep going while we can fit the buffer
         while (outgoingMessageQueue.size()) {

From d8fb6766b79ef67373c1be8aebb18bb1f32afb8e Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 4 May 2021 00:28:54 +0300
Subject: [PATCH 310/383] Make SCTP optional

---
 CMakeLists.txt                  | 84 ++-------------------------------
 cmake/modules/IrisSCTP.cmake    | 83 ++++++++++++++++++++++++++++++++
 src/irisnet/CMakeLists.txt      | 26 ++++++----
 src/xmpp/CMakeLists.txt         | 20 +++++---
 src/xmpp/xmpp-im/jingle-ice.cpp | 80 ++++++++++++++++++++++---------
 5 files changed, 176 insertions(+), 117 deletions(-)
 create mode 100644 cmake/modules/IrisSCTP.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 67d88666..9b895079 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,6 +14,8 @@ get_directory_property(IS_SUBPROJECT PARENT_DIRECTORY)
 project(iris)
 cmake_minimum_required(VERSION 3.2.0)
 
+include(CMakeDependentOption)
+
 #Set automoc and autouic policy
 if(POLICY CMP0071)
     if(${CMAKE_VERSION} VERSION_LESS "3.10.0")
@@ -52,9 +54,8 @@ endif()
 
 option( USE_QJDNS "Use qjdns/jdns library. Disabled by default for Qt5" OFF )
 option( SEPARATE_QJDNS "Build qjdns with iris library" OFF )
-option( JINGLE_ICE "Enable ICE Jingle transport for p2p file transfer" ON )
+option( JINGLE_SCTP "Enable SCTP over ICE Jingle transport / data channels" ON )
 option( BUNDLED_QCA "Adds: DTLS, Blake2b and other useful for XMPP crypto-stuff" ${DEFAULT_BUNDLED_QCA})
-option( BUNDLED_USRSCTP "Compile compatible usrsctp lib when system one is not available or uncompatible (required for datachannel jingle transport)" OFF)
 option( BUILD_IRIS_TOOLS "Build tools and examples" OFF)
 
 set(CMAKE_CXX_STANDARD 17)
@@ -162,85 +163,10 @@ if(NOT ${STDINT_INCLUDE} STREQUAL "STDINT_INCLUDE-NOTFOUND")
     set(STDINT_FOUND ON)
 endif()
 
-if((CMAKE_CROSSCOMPILING AND DEFINED MSYS) AND STDINT_FOUND)
-    #Add SCTP_STDINT_INCLUDE definition to compile irisnet with usrsctp with MinGW
-    add_definitions(
-        -DSCTP_STDINT_INCLUDE="${STDINT_INCLUDE}"
-    )
+if(JINGLE_SCTP)
+    include(IrisSCTP)
 endif()
 
-if(NOT BUNDLED_USRSCTP)
-    find_package(UsrSCTP)
-    if (NOT UsrSCTP_FOUND)
-        message(FATAL_ERROR "UsrSCTP library not found. Try to install usrsctp library or enable BUNDLED_USRSCTP flag")
-    endif()
-else()
-    message(STATUS "USRSCTP: using bundled")
-    set(USRSCTP_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/usrsctp)
-    set(USRSCTP_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/usrsctp)
-    set(USRSCTP_BUILD_DIR ${USRSCTP_PREFIX}/build)
-    if(NOT EXISTS ${USRSCTP_SOURCE_DIR})
-        list(APPEND USRSCTP_INCLUDE_DIR ${USRSCTP_PREFIX}/src/UsrSCTPProject/usrsctplib)
-    else()
-        list(APPEND USRSCTP_INCLUDE_DIR ${USRSCTP_SOURCE_DIR}/usrsctplib)
-    endif()
-    set(USRSCTP_LIBRARY ${USRSCTP_BUILD_DIR}/usrsctplib/${CMAKE_STATIC_LIBRARY_PREFIX}usrsctp${CMAKE_STATIC_LIBRARY_SUFFIX})
-    if(WIN32 AND MSVC)
-        add_definitions(-DWIN32_LEAN_AND_MEAN)
-    endif()
-
-    include(ExternalProject)
-    #set CMake options and transfer the environment to an external project
-    set(USRSCTP_BUILD_OPTIONS
-        -DBUILD_SHARED_LIBS=OFF -Dsctp_build_programs=OFF -Dsctp_build_shared_lib=OFF -Dsctp_debug=OFF
-        -Dsctp_inet=OFF -Dsctp_inet6=OFF -DCMAKE_INSTALL_PREFIX=${USRSCTP_PREFIX}
-        -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-        -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
-        -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER})
-    if (EXISTS ${USRSCTP_SOURCE_DIR})
-        message(STATUS "USRSCTP: found bundled sources")
-        ExternalProject_Add(UsrSCTPProject
-            PREFIX ${USRSCTP_PREFIX}
-            BINARY_DIR ${USRSCTP_BUILD_DIR}
-            SOURCE_DIR ${USRSCTP_SOURCE_DIR}
-            CMAKE_ARGS ${USRSCTP_BUILD_OPTIONS}
-            BUILD_BYPRODUCTS ${USRSCTP_LIBRARY}
-            INSTALL_COMMAND ""
-            )
-    else()
-        include(FindGit)
-        find_package(Git)
-        if(NOT Git_FOUND)
-            message(FATAL_ERROR "Git not found! Bundled UsrSCTP needs Git utility.\nPlease set GIT_EXECUTABLE variable or add git to PATH")
-        endif()
-        ExternalProject_Add(UsrSCTPProject
-            PREFIX ${USRSCTP_PREFIX}
-            BINARY_DIR ${USRSCTP_BUILD_DIR}
-            GIT_REPOSITORY https://github.com/sctplab/usrsctp.git
-            GIT_TAG a17109528c75d01f6372d5c30851a639684c6e99
-            CMAKE_ARGS ${USRSCTP_BUILD_OPTIONS}
-            BUILD_BYPRODUCTS ${USRSCTP_LIBRARY}
-            INSTALL_COMMAND ""
-            )
-    endif()
-    add_library(SctpLab::UsrSCTP UNKNOWN IMPORTED)
-    set_target_properties(SctpLab::UsrSCTP PROPERTIES
-            IMPORTED_LOCATION "${USRSCTP_LIBRARY}"
-            INTERFACE_COMPILE_DEFINITIONS "${USRSCTP_DEFINITIONS}"
-            IMPORTED_LINK_INTERFACE_LANGUAGES "C")
-    add_dependencies(SctpLab::UsrSCTP ${USRSCTP_LIBRARY})
-endif()
-
-set(sctpLab_LIBRARY ${USRSCTP_LIBRARY})
-if(USRSCTP_INCLUDES)
-    set(sctpLab_INCLUDES ${USRSCTP_INCLUDES})
-else()
-    set(sctpLab_INCLUDES ${USRSCTP_INCLUDE_DIR})
-endif()
-include_directories(
-    ${sctpLab_INCLUDES}
-)
-
 if(NOT USE_QJDNS AND SEPARATE_QJDNS)
     message(FATAL_ERROR "SEPARATE_QJDNS flag enabled, but USE_QJDNS flag disabled.\nPlease enable flag USE_QJDNS or disable both flags")
 endif()
diff --git a/cmake/modules/IrisSCTP.cmake b/cmake/modules/IrisSCTP.cmake
new file mode 100644
index 00000000..58a94f78
--- /dev/null
+++ b/cmake/modules/IrisSCTP.cmake
@@ -0,0 +1,83 @@
+cmake_dependent_option( BUNDLED_USRSCTP
+    "Compile compatible usrsctp lib when system one is not available or uncompatible (required for datachannel jingle transport)"
+    OFF "JINGLE_SCTP" OFF)
+
+if((CMAKE_CROSSCOMPILING AND DEFINED MSYS) AND STDINT_FOUND)
+    #Add SCTP_STDINT_INCLUDE definition to compile irisnet with usrsctp with MinGW
+    add_definitions(
+        -DSCTP_STDINT_INCLUDE="${STDINT_INCLUDE}"
+    )
+endif()
+
+if(NOT BUNDLED_USRSCTP)
+    find_package(UsrSCTP)
+    if (NOT UsrSCTP_FOUND)
+        message(FATAL_ERROR "UsrSCTP library not found. Try to install usrsctp library or enable BUNDLED_USRSCTP flag")
+    endif()
+else()
+    message(STATUS "USRSCTP: using bundled")
+    set(USRSCTP_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/usrsctp)
+    set(USRSCTP_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/usrsctp)
+    set(USRSCTP_BUILD_DIR ${USRSCTP_PREFIX}/build)
+    if(NOT EXISTS ${USRSCTP_SOURCE_DIR})
+        list(APPEND USRSCTP_INCLUDE_DIR ${USRSCTP_PREFIX}/src/UsrSCTPProject/usrsctplib)
+    else()
+        list(APPEND USRSCTP_INCLUDE_DIR ${USRSCTP_SOURCE_DIR}/usrsctplib)
+    endif()
+    set(USRSCTP_LIBRARY ${USRSCTP_BUILD_DIR}/usrsctplib/${CMAKE_STATIC_LIBRARY_PREFIX}usrsctp${CMAKE_STATIC_LIBRARY_SUFFIX})
+    if(WIN32 AND MSVC)
+        add_definitions(-DWIN32_LEAN_AND_MEAN)
+    endif()
+
+    include(ExternalProject)
+    #set CMake options and transfer the environment to an external project
+    set(USRSCTP_BUILD_OPTIONS
+        -DBUILD_SHARED_LIBS=OFF -Dsctp_build_programs=OFF -Dsctp_build_shared_lib=OFF -Dsctp_debug=OFF
+        -Dsctp_inet=OFF -Dsctp_inet6=OFF -DCMAKE_INSTALL_PREFIX=${USRSCTP_PREFIX}
+        -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+        -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
+        -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER})
+    if (EXISTS ${USRSCTP_SOURCE_DIR})
+        message(STATUS "USRSCTP: found bundled sources")
+        ExternalProject_Add(UsrSCTPProject
+            PREFIX ${USRSCTP_PREFIX}
+            BINARY_DIR ${USRSCTP_BUILD_DIR}
+            SOURCE_DIR ${USRSCTP_SOURCE_DIR}
+            CMAKE_ARGS ${USRSCTP_BUILD_OPTIONS}
+            BUILD_BYPRODUCTS ${USRSCTP_LIBRARY}
+            INSTALL_COMMAND ""
+            )
+    else()
+        include(FindGit)
+        find_package(Git)
+        if(NOT Git_FOUND)
+            message(FATAL_ERROR "Git not found! Bundled UsrSCTP needs Git utility.\nPlease set GIT_EXECUTABLE variable or add git to PATH")
+        endif()
+        ExternalProject_Add(UsrSCTPProject
+            PREFIX ${USRSCTP_PREFIX}
+            BINARY_DIR ${USRSCTP_BUILD_DIR}
+            GIT_REPOSITORY https://github.com/sctplab/usrsctp.git
+            GIT_TAG a17109528c75d01f6372d5c30851a639684c6e99
+            CMAKE_ARGS ${USRSCTP_BUILD_OPTIONS}
+            BUILD_BYPRODUCTS ${USRSCTP_LIBRARY}
+            INSTALL_COMMAND ""
+            )
+    endif()
+    add_library(SctpLab::UsrSCTP UNKNOWN IMPORTED)
+    set_target_properties(SctpLab::UsrSCTP PROPERTIES
+            IMPORTED_LOCATION "${USRSCTP_LIBRARY}"
+            INTERFACE_COMPILE_DEFINITIONS "${USRSCTP_DEFINITIONS}"
+            IMPORTED_LINK_INTERFACE_LANGUAGES "C")
+    add_dependencies(SctpLab::UsrSCTP ${USRSCTP_LIBRARY})
+endif()
+
+set(sctpLab_LIBRARY ${USRSCTP_LIBRARY})
+if(USRSCTP_INCLUDES)
+    set(sctpLab_INCLUDES ${USRSCTP_INCLUDES})
+else()
+    set(sctpLab_INCLUDES ${USRSCTP_INCLUDE_DIR})
+endif()
+include_directories(
+    ${sctpLab_INCLUDES}
+)
+add_compile_definitions(-DJINGLE_SCTP)
diff --git a/src/irisnet/CMakeLists.txt b/src/irisnet/CMakeLists.txt
index 4926a987..0a5b0490 100644
--- a/src/irisnet/CMakeLists.txt
+++ b/src/irisnet/CMakeLists.txt
@@ -55,10 +55,6 @@ set(SOURCES
     noncore/dtls.cpp
 
     noncore/cutestuff/bsocket.cpp
-
-    noncore/sctp/SctpAssociation.cpp
-    noncore/sctp/DepUsrSCTP.cpp
-    noncore/sctp/Logger.hpp
 )
 
 if(UNIX)
@@ -110,14 +106,24 @@ set(HEADERS
 
     noncore/legacy/ndns.h
     noncore/legacy/srvresolver.h
-
-    noncore/sctp/SctpAssociation.hpp
-    noncore/sctp/DepUsrSCTP.hpp
-    noncore/sctp/RTC/DataConsumer.hpp
-    noncore/sctp/RTC/DataProducer.hpp
-    noncore/sctp/RTC/SctpParameters.hpp
 )
 
+if(JINGLE_SCTP)
+    list(APPEND SOURCES
+        noncore/sctp/SctpAssociation.cpp
+        noncore/sctp/DepUsrSCTP.cpp
+        )
+
+    list(APPEND HEADERS
+        noncore/sctp/Logger.hpp
+        noncore/sctp/SctpAssociation.hpp
+        noncore/sctp/DepUsrSCTP.hpp
+        noncore/sctp/RTC/DataConsumer.hpp
+        noncore/sctp/RTC/DataProducer.hpp
+        noncore/sctp/RTC/SctpParameters.hpp
+        )
+endif()
+
 add_library(irisnet STATIC ${SOURCES} ${HEADERS} )
 
 if(WIN32)
diff --git a/src/xmpp/CMakeLists.txt b/src/xmpp/CMakeLists.txt
index aabd0a75..df547627 100644
--- a/src/xmpp/CMakeLists.txt
+++ b/src/xmpp/CMakeLists.txt
@@ -104,9 +104,6 @@ set(HEADERS
     xmpp-im/jingle-ice.h
     xmpp-im/jingle-s5b.h
     xmpp-im/jingle-ibb.h
-    xmpp-im/jingle-sctp.h
-    xmpp-im/jingle-sctp-association_p.h
-    xmpp-im/jingle-webrtc-datachannel_p.h
 
     zlib/zlibcompressor.h
     zlib/zlibdecompressor.h
@@ -151,9 +148,6 @@ set(SOURCES
     xmpp-im/jingle-ice.cpp
     xmpp-im/jingle-s5b.cpp
     xmpp-im/jingle-ibb.cpp
-    xmpp-im/jingle-sctp.cpp
-    xmpp-im/jingle-sctp-association_p.cpp
-    xmpp-im/jingle-webrtc-datachannel_p.cpp
 
     base/randomnumbergenerator.cpp
     base/timezone.cpp
@@ -179,6 +173,20 @@ set(SOURCES
     xmpp-im/xmpp_features.cpp
     )
 
+if(JINGLE_SCTP)
+    list(APPEND SOURCES
+        xmpp-im/jingle-sctp.cpp
+        xmpp-im/jingle-sctp-association_p.cpp
+        xmpp-im/jingle-webrtc-datachannel_p.cpp
+        )
+
+    list(APPEND HEADERS
+        xmpp-im/jingle-sctp.h
+        xmpp-im/jingle-sctp-association_p.h
+        xmpp-im/jingle-webrtc-datachannel_p.h
+        )
+endif()
+
 if(NOT MSVC)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
 endif()
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index 2b36b899..ce48f56e 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -17,13 +17,14 @@
  *
  */
 
+#ifdef JINGLE_SCTP
 #include "jingle-sctp.h" //Do not move to avoid warnings with MinGW
+#endif
 
 #include "jingle-ice.h"
 
 #include "dtls.h"
 #include "ice176.h"
-#include "jingle-sctp.h"
 #include "jingle-session.h"
 #include "netnames.h"
 #include "udpportreserver.h"
@@ -127,11 +128,13 @@ namespace XMPP { namespace Jingle { namespace ICE {
     }
 
     struct Element {
-        QString                          pwd;
-        QString                          ufrag;
-        Dtls::FingerPrint                fingerprint;
-        SCTP::MapElement                 sctpMap;
-        QList<SCTP::ChannelElement>      sctpChannels;
+        QString           pwd;
+        QString           ufrag;
+        Dtls::FingerPrint fingerprint;
+#ifdef JINGLE_SCTP
+        SCTP::MapElement            sctpMap;
+        QList<SCTP::ChannelElement> sctpChannels;
+#endif
         QList<Ice176::Candidate>         candidates;
         QList<Ice176::SelectedCandidate> remoteCandidates;
         bool                             gatheringComplete = false;
@@ -152,10 +155,12 @@ namespace XMPP { namespace Jingle { namespace ICE {
                 tel.setAttribute(QLatin1String("ufrag"), ufrag);
             if (fingerprint.isValid())
                 tel.appendChild(fingerprint.toXml(doc));
+#ifdef JINGLE_SCTP
             if (sctpMap.isValid())
                 tel.appendChild(sctpMap.toXml(doc));
             for (auto const &c : sctpChannels)
                 tel.appendChild(c.toXml(doc));
+#endif
             for (auto const &c : candidates)
                 tel.appendChild(candidateToElement(doc, c));
             for (auto const &c : remoteCandidates) {
@@ -180,7 +185,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
 
             if (fingerprint.isValid() && !Dtls::isSupported())
                 qWarning("Remote requested DTLS but it's not supported by used crypto libraries.");
-
+#ifdef JINGLE_SCTP
             e = el.firstChildElement(QLatin1String("sctpmap"));
             if (!e.isNull() && !sctpMap.parse(e))
                 throw std::runtime_error("invalid sctpmap");
@@ -193,6 +198,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
                 ;
                 sctpChannels.append(channel);
             }
+#endif
             QString candTag(QStringLiteral("candidate"));
             for (e = el.firstChildElement(candTag); !e.isNull(); e = e.nextSiblingElement(candTag)) {
                 auto c = elementToCandidate(e);
@@ -479,12 +485,14 @@ namespace XMPP { namespace Jingle { namespace ICE {
     };
 
     struct Component {
-        int                           componentIndex  = 0;
-        bool                          initialized     = false;
-        bool                          lowOverhead     = false;
-        bool                          needDatachannel = false;
-        Dtls *                        dtls            = nullptr;
-        SCTP::Association *           sctp            = nullptr;
+        int   componentIndex  = 0;
+        bool  initialized     = false;
+        bool  lowOverhead     = false;
+        bool  needDatachannel = false;
+        Dtls *dtls            = nullptr;
+#ifdef JINGLE_SCTP
+        SCTP::Association *sctp = nullptr;
+#endif
         QSharedPointer<RawConnection> rawConnection;
         // QHash<quint16, Connection::Ptr> dataChannels;
     };
@@ -521,9 +529,11 @@ namespace XMPP { namespace Jingle { namespace ICE {
         Resolver           resolver;
         XMPP::Ice176 *     ice = nullptr;
 
-        Dtls::Setup      localDtlsRole  = Dtls::ActPass;
-        Dtls::Setup      remoteDtlsRole = Dtls::ActPass;
+        Dtls::Setup localDtlsRole  = Dtls::ActPass;
+        Dtls::Setup remoteDtlsRole = Dtls::ActPass;
+#ifdef JINGLE_SCTP
         SCTP::MapElement sctp;
+#endif
 
         QHostAddress extAddr;
         QHostAddress stunBindAddr, stunRelayUdpAddr, stunRelayTcpAddr;
@@ -586,29 +596,35 @@ namespace XMPP { namespace Jingle { namespace ICE {
             dtls->connect(dtls, &Dtls::readyRead, q, [this, componentIndex]() {
                 auto &component = components[componentIndex];
                 auto  d         = component.dtls->readDatagram();
+#ifdef JINGLE_SCTP
                 if (component.sctp) {
                     component.sctp->writeIncoming(d);
                 }
+#endif
             });
             dtls->connect(dtls, &Dtls::readyReadOutgoing, q, [this, componentIndex]() {
                 ice->writeDatagram(componentIndex, components[componentIndex].dtls->readOutgoingDatagram());
             });
             dtls->connect(dtls, &Dtls::connected, q, [this, componentIndex, dtls]() {
                 auto &c = components[componentIndex];
+#ifdef JINGLE_SCTP
                 if (c.sctp) {
                     // see rfc8864 (6.1) and rfc8832 (6)
                     c.sctp->setIdSelector(dtls->localFingerprint().setup == Dtls::Active ? SCTP::IdSelector::Even
                                                                                          : SCTP::IdSelector::Odd);
                     c.sctp->onTransportConnected();
                 }
+#endif
                 if (c.rawConnection)
                     c.rawConnection->onConnected();
             });
             dtls->connect(dtls, &Dtls::errorOccurred, q, [this, componentIndex](QAbstractSocket::SocketError error) {
                 qDebug("dtls failed for component %d", componentIndex);
                 auto &c = components[componentIndex];
+#ifdef JINGLE_SCTP
                 if (c.sctp)
                     c.sctp->onTransportError(error);
+#endif
                 if (c.rawConnection)
                     c.rawConnection->onError(error);
             });
@@ -617,8 +633,10 @@ namespace XMPP { namespace Jingle { namespace ICE {
                 auto &c = components[componentIndex];
                 if (c.rawConnection)
                     c.rawConnection->onDisconnected(RawConnection::DtlsClosed);
+#ifdef JINGLE_SCTP
                 if (c.sctp)
                     c.sctp->onTransportClosed();
+#endif
             });
         }
 
@@ -844,12 +862,12 @@ namespace XMPP { namespace Jingle { namespace ICE {
                     }
                 }
             }
-
+#ifdef JINGLE_SCTP
             if (e.sctpMap.isValid()) {
                 remoteState->sctpMap = e.sctpMap;
                 remoteState->sctpChannels += e.sctpChannels;
             }
-
+#endif
             if (q->state() == State::Created && q->isRemote()) {
                 // initial incoming transport
                 q->setState(State::Pending);
@@ -920,7 +938,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
                 components[index].rawConnection.reset();
             // Do we need anything else to do here? connect signals for example?
         }
-
+#ifdef JINGLE_SCTP
         void initSctpAssociation(int componentIndex)
         {
             auto &c = components[componentIndex];
@@ -973,6 +991,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
             Q_UNUSED(channelFeatures); // TODO
             return c.sctp->newChannel(SCTP::Reliable, true, 0, 256, label);
         }
+#endif
     };
 
     Transport::Transport(const TransportManagerPad::Ptr &pad, Origin creator) :
@@ -990,7 +1009,9 @@ namespace XMPP { namespace Jingle { namespace ICE {
     Transport::~Transport()
     {
         for (auto &c : d->components) {
+#ifdef JINGLE_SCTP
             delete c.sctp;
+#endif
             delete c.dtls;
         }
         qDebug("jingle-ice: destroyed");
@@ -1015,9 +1036,11 @@ namespace XMPP { namespace Jingle { namespace ICE {
 
             for (auto &c : d->components) {
                 d->setupDtls(c.componentIndex);
+#ifdef JINGLE_SCTP
                 if (isRemote() && c.needDatachannel && !c.sctp) {
                     d->initSctpAssociation(c.componentIndex);
                 }
+#endif
             }
         }
 
@@ -1125,9 +1148,10 @@ namespace XMPP { namespace Jingle { namespace ICE {
     // adding ice channels/components (for rtp, rtcp, datachannel etc)
     Connection::Ptr Transport::addChannel(TransportFeatures features, const QString &id, int componentIndex)
     {
+#ifdef JINGLE_SCTP
         if (features & TransportFeature::DataOriented)
             return d->addDataChannel(features, id, componentIndex);
-
+#endif
         componentIndex = d->ensureComponentExist(componentIndex, features & TransportFeature::LowOverhead);
         if (componentIndex < 0)
             return {}; // failed to add component for the features
@@ -1143,8 +1167,10 @@ namespace XMPP { namespace Jingle { namespace ICE {
         for (auto &c : d->components) {
             if (c.rawConnection)
                 ret.append(c.rawConnection.staticCast<XMPP::Jingle::Connection>());
+#ifdef JINGLE_SCTP
             if (c.sctp)
                 ret += c.sctp->channels();
+#endif
         }
         return ret;
     }
@@ -1165,8 +1191,10 @@ namespace XMPP { namespace Jingle { namespace ICE {
     {
         return TransportFeature::HighProbableConnect | TransportFeature::Reliable | TransportFeature::Unreliable
             | TransportFeature::MessageOriented | TransportFeature::LiveOriented
-            | (Dtls::isSupported() ? (TransportFeature::DataOriented | TransportFeature::Ordered)
-                                   : TransportFeature(0));
+#ifdef JINGLE_SCTP
+            | (Dtls::isSupported() ? (TransportFeature::DataOriented | TransportFeature::Ordered) : TransportFeature(0))
+#endif
+            ;
     }
 
     void Manager::setJingleManager(XMPP::Jingle::Manager *jm) { d->jingleManager = jm; }
@@ -1179,7 +1207,15 @@ namespace XMPP { namespace Jingle { namespace ICE {
     TransportManagerPad *Manager::pad(Session *session) { return new Pad(this, session); }
 
     QStringList Manager::ns() const { return { NS }; }
-    QStringList Manager::discoFeatures() const { return { NS, NS_DTLS, SCTP::ns() }; }
+    QStringList Manager::discoFeatures() const
+    {
+        return { NS, NS_DTLS
+#ifdef JINGLE_SCTP
+                 ,
+                 SCTP::ns()
+#endif
+        };
+    }
 
     void Manager::setBasePort(int port) { d->basePort = port; }
 

From 63ca3e3cfbed7fe8fcd9bc468dde40b3c0db082f Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Tue, 4 May 2021 11:28:44 +0300
Subject: [PATCH 311/383] Fixed build with old cmake versions

---
 CMakeLists.txt               | 2 --
 cmake/modules/IrisSCTP.cmake | 5 ++++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b895079..a3899428 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,8 +14,6 @@ get_directory_property(IS_SUBPROJECT PARENT_DIRECTORY)
 project(iris)
 cmake_minimum_required(VERSION 3.2.0)
 
-include(CMakeDependentOption)
-
 #Set automoc and autouic policy
 if(POLICY CMP0071)
     if(${CMAKE_VERSION} VERSION_LESS "3.10.0")
diff --git a/cmake/modules/IrisSCTP.cmake b/cmake/modules/IrisSCTP.cmake
index 58a94f78..4eaa12e4 100644
--- a/cmake/modules/IrisSCTP.cmake
+++ b/cmake/modules/IrisSCTP.cmake
@@ -1,3 +1,6 @@
+cmake_minimum_required(VERSION 3.2.0)
+
+include(CMakeDependentOption)
 cmake_dependent_option( BUNDLED_USRSCTP
     "Compile compatible usrsctp lib when system one is not available or uncompatible (required for datachannel jingle transport)"
     OFF "JINGLE_SCTP" OFF)
@@ -80,4 +83,4 @@ endif()
 include_directories(
     ${sctpLab_INCLUDES}
 )
-add_compile_definitions(-DJINGLE_SCTP)
+add_definitions(-DJINGLE_SCTP)

From 8c82108821d6c433148fae47f7a17313fda70436 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 5 May 2021 20:11:04 +0300
Subject: [PATCH 312/383] qt container detach fix

---
 src/irisnet/noncore/ice176.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index 5b15a312..4deed1d5 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -630,7 +630,7 @@ class Ice176::Private : public QObject {
                 continue;
             }
 
-            for (IceComponent::CandidateInfo::Ptr rc : remoteCandidates) {
+            for (IceComponent::CandidateInfo::Ptr rc : qAsConst(remoteCandidates)) {
                 auto pair = makeCandidatesPair(lc, rc);
                 if (!pair.isNull())
                     pairs += pair;

From 726aadb03933d90bb55addebfa4fb40f1e389b87 Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
Date: Wed, 5 May 2021 23:31:32 +0300
Subject: [PATCH 313/383] Fix spelling errors

---
 src/xmpp/xmpp-im/jingle-ft.cpp      | 2 +-
 src/xmpp/xmpp-im/jingle-session.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 17be746a..09b327f5 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -493,7 +493,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
             receivedTimer->setSingleShot(true);
             receivedTimer->setInterval(RECEIVED_TIMEOUT);
             q->connect(receivedTimer, &QTimer::timeout, q, [this]() {
-                qDebug("Waiting for <received> timed out. But likely succeded anyway");
+                qDebug("Waiting for <received> timed out. But likely succeeded anyway");
                 onReceived();
             });
         }
diff --git a/src/xmpp/xmpp-im/jingle-session.cpp b/src/xmpp/xmpp-im/jingle-session.cpp
index c8f4db02..68e1d025 100644
--- a/src/xmpp/xmpp-im/jingle-session.cpp
+++ b/src/xmpp/xmpp-im/jingle-session.cpp
@@ -411,7 +411,7 @@ namespace XMPP { namespace Jingle {
             initialIncomingUnacceptedContent.clear();
             sendJingle(actionToSend, contents, [this, acceptApps, finalState](JT *jt) {
                 if (!jt->success()) {
-                    qDebug("Seesion accept/initiate returned iq error");
+                    qDebug("Session accept/initiate returned iq error");
                     emit q->terminated();
                     return;
                 }

From 23eaddafdb296c07ebfbbe81e4b406123c75aa06 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Thu, 6 May 2021 15:50:57 +0300
Subject: [PATCH 314/383] debug line in remove local ice transport

---
 src/irisnet/noncore/ice176.cpp       | 7 +++----
 src/irisnet/noncore/icecomponent.cpp | 3 +++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index 4deed1d5..376befab 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -630,7 +630,7 @@ class Ice176::Private : public QObject {
                 continue;
             }
 
-            for (IceComponent::CandidateInfo::Ptr rc : qAsConst(remoteCandidates)) {
+            for (const IceComponent::CandidateInfo::Ptr &rc : qAsConst(remoteCandidates)) {
                 auto pair = makeCandidatesPair(lc, rc);
                 if (!pair.isNull())
                     pairs += pair;
@@ -1276,9 +1276,8 @@ private slots:
                  cc.info->addr.port);
 
         if (!iceTransports.contains(cc.iceTransport)) {
-            connect(cc.iceTransport.data(), SIGNAL(readyRead(int)), SLOT(it_readyRead(int)));
-            connect(cc.iceTransport.data(), SIGNAL(datagramsWritten(int, int, QHostAddress, int)),
-                    SLOT(it_datagramsWritten(int, int, QHostAddress, int)));
+            connect(cc.iceTransport.data(), &IceTransport::readyRead, this, &Private::it_readyRead);
+            connect(cc.iceTransport.data(), &IceTransport::datagramsWritten, this, &Private::it_datagramsWritten);
 
             iceTransports += cc.iceTransport;
         }
diff --git a/src/irisnet/noncore/icecomponent.cpp b/src/irisnet/noncore/icecomponent.cpp
index 1641f517..b32ff952 100644
--- a/src/irisnet/noncore/icecomponent.cpp
+++ b/src/irisnet/noncore/icecomponent.cpp
@@ -514,6 +514,9 @@ class IceComponent::Private : public QObject {
     {
         ObjectSessionWatcher watch(&sess);
 
+        emit q->debugLine(QString("Stopping local transport: %1:%2")
+                              .arg(lt->sock->localAddress().toString(), QString::number(lt->sock->localPort())));
+
         removeLocalCandidates(lt->sock);
         if (!watch.isValid())
             return false;

From e2054b4570e2db69d335c024db4ac821d6dfe1bb Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 11 May 2021 00:59:46 +0300
Subject: [PATCH 315/383] jingle-ft: Don't call bytesWritten till we previous
 bytes were accounted

---
 src/xmpp/xmpp-im/jingle-ft.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 09b327f5..3aa9cff6 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -594,12 +594,15 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
                         readNextBlockFromTransport();
                     }
                 });
-                connect(connection.data(), &Connection::bytesWritten, q, [this](qint64 bytes) {
-                    Q_UNUSED(bytes)
-                    if (q->pad()->session()->role() == q->senders() && !connection->bytesToWrite()) {
-                        writeNextBlockToTransport();
-                    }
-                });
+                connect(
+                    connection.data(), &Connection::bytesWritten, q,
+                    [this](qint64 bytes) {
+                        Q_UNUSED(bytes)
+                        if (q->pad()->session()->role() == q->senders() && !connection->bytesToWrite()) {
+                            writeNextBlockToTransport();
+                        }
+                    },
+                    Qt::QueuedConnection);
             }
 
             setState(State::Active);

From fdb023bf88588829b81f509748d853afa950ad98 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Thu, 20 May 2021 10:23:40 +0300
Subject: [PATCH 316/383] Fix ibb destroy gets stuck

---
 src/xmpp/xmpp-im/jingle-ibb.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ibb.cpp b/src/xmpp/xmpp-im/jingle-ibb.cpp
index 18a7bc66..dcb6732c 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.cpp
+++ b/src/xmpp/xmpp-im/jingle-ibb.cpp
@@ -198,8 +198,9 @@ namespace XMPP { namespace Jingle { namespace IBB {
     {
         // we have to mark all of them as finished just in case they are captured somewhere else
         qDebug("jingle-ibb: destroy");
-        while (d->connections.size()) {
-            d->connections.first()->close();
+        auto connections = d->connections.values();
+        for (auto &c : connections) {
+            c->close();
         }
     }
 

From 837e26ac8f96cee2b634982e76c5ad9b1cf855ca Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 23 May 2021 00:56:07 +0300
Subject: [PATCH 317/383] Fixed usage of port server from jingle-ice

---
 include/iris/xmpp_encryption.h          |  1 +
 src/irisnet/noncore/dtls.cpp            | 18 +++++
 src/irisnet/noncore/dtls.h              | 18 +++++
 src/irisnet/noncore/ice176.cpp          | 97 +++++++++++++++++++++++--
 src/irisnet/noncore/ice176.h            |  2 +
 src/irisnet/noncore/udpportreserver.cpp | 19 ++---
 src/xmpp/CMakeLists.txt                 |  2 +
 src/xmpp/xmpp-im/jingle-ice.cpp         | 70 +-----------------
 src/xmpp/xmpp-im/xmpp_encryption.cpp    | 43 +++++++++++
 src/xmpp/xmpp-im/xmpp_encryption.h      | 74 +++++++++++++++++++
 10 files changed, 259 insertions(+), 85 deletions(-)
 create mode 100644 include/iris/xmpp_encryption.h
 create mode 100644 src/xmpp/xmpp-im/xmpp_encryption.cpp
 create mode 100644 src/xmpp/xmpp-im/xmpp_encryption.h

diff --git a/include/iris/xmpp_encryption.h b/include/iris/xmpp_encryption.h
new file mode 100644
index 00000000..5b3a05f5
--- /dev/null
+++ b/include/iris/xmpp_encryption.h
@@ -0,0 +1 @@
+#include "../../src/xmpp/xmpp-im/xmpp_encryption.h"
diff --git a/src/irisnet/noncore/dtls.cpp b/src/irisnet/noncore/dtls.cpp
index 45685fa8..fd62e60b 100644
--- a/src/irisnet/noncore/dtls.cpp
+++ b/src/irisnet/noncore/dtls.cpp
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2021  Sergey Ilinykh
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
 #include "dtls.h"
 #include "xmpp_xmlcommon.h"
 
diff --git a/src/irisnet/noncore/dtls.h b/src/irisnet/noncore/dtls.h
index 6e80ac01..3e7db21d 100644
--- a/src/irisnet/noncore/dtls.h
+++ b/src/irisnet/noncore/dtls.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (C) 2021  Sergey Ilinykh
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
 #ifndef XMPP_DTLS_H
 #define XMPP_DTLS_H
 
diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index 376befab..07268b20 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -30,6 +30,7 @@
 #include "udpportreserver.h"
 
 #include <QEvent>
+#include <QNetworkInterface>
 #include <QQueue>
 #include <QSet>
 #include <QTimer>
@@ -59,18 +60,16 @@ static qint64 calc_pair_priority(int a, int b)
 // FIXME: dry (this is in psi avcall also)
 static int getAddressScope(const QHostAddress &a)
 {
+    if (a.isLoopback())
+        return 0;
     if (a.protocol() == QAbstractSocket::IPv6Protocol) {
-        if (a == QHostAddress(QHostAddress::LocalHostIPv6))
-            return 0;
-        else if (XMPP::Ice176::isIPv6LinkLocalAddress(a))
+        if (XMPP::Ice176::isIPv6LinkLocalAddress(a))
             return 1;
     } else if (a.protocol() == QAbstractSocket::IPv4Protocol) {
         quint32 v4 = a.toIPv4Address();
         quint8  a0 = quint8(v4 >> 24);
         quint8  a1 = quint8((v4 >> 16) & 0xff);
-        if (a0 == 127)
-            return 0;
-        else if (a0 == 169 && a1 == 254)
+        if (a0 == 169 && a1 == 254)
             return 1;
         else if (a0 == 10)
             return 2;
@@ -83,6 +82,43 @@ static int getAddressScope(const QHostAddress &a)
     return 3;
 }
 
+// -1 = a is higher priority, 1 = b is higher priority, 0 = equal
+static int comparePriority(const QHostAddress &a, const QHostAddress &b)
+{
+    // prefer closer scope
+    int a_scope = getAddressScope(a);
+    int b_scope = getAddressScope(b);
+    if (a_scope < b_scope)
+        return -1;
+    else if (a_scope > b_scope)
+        return 1;
+
+    // prefer ipv6
+    if (a.protocol() == QAbstractSocket::IPv6Protocol && b.protocol() != QAbstractSocket::IPv6Protocol)
+        return -1;
+    else if (b.protocol() == QAbstractSocket::IPv6Protocol && a.protocol() != QAbstractSocket::IPv6Protocol)
+        return 1;
+
+    return 0;
+}
+
+static QList<QHostAddress> sortAddrs(const QList<QHostAddress> &in)
+{
+    QList<QHostAddress> out;
+
+    for (const QHostAddress &a : in) {
+        int at;
+        for (at = 0; at < out.count(); ++at) {
+            if (comparePriority(a, out[at]) < 0)
+                break;
+        }
+
+        out.insert(at, a);
+    }
+
+    return out;
+}
+
 class Ice176::Private : public QObject {
     Q_OBJECT
 
@@ -1709,6 +1745,55 @@ QList<Ice176::SelectedCandidate> Ice176::selectedCandidates() const
     return ret;
 }
 
+QList<QHostAddress> Ice176::availableNetworkAddresses()
+{
+    QList<QHostAddress> listenAddrs;
+    auto const          interfaces = QNetworkInterface::allInterfaces();
+#ifdef Q_OS_UNIX
+    static const auto ignored
+        = QStringList { QStringLiteral("vmnet"), QStringLiteral("vnic"), QStringLiteral("vboxnet") };
+#endif
+    for (const QNetworkInterface &ni : interfaces) {
+        if ((ni.flags() & (QNetworkInterface::IsRunning | QNetworkInterface::IsUp))
+                != (QNetworkInterface::IsRunning | QNetworkInterface::IsUp)
+            || ni.flags() & QNetworkInterface::IsLoopBack
+#ifdef Q_OS_UNIX
+            || std::any_of(ignored.begin(), ignored.end(), [&ni](auto const &ign) { return ni.name().startsWith(ign); })
+#elif Q_OS_WIN
+            || ni.humanReadableName().contains(QStringLiteral("VMnet"))
+#endif
+        )
+            continue;
+
+        QList<QNetworkAddressEntry> entries = ni.addressEntries();
+        for (const QNetworkAddressEntry &na : qAsConst(entries)) {
+            if (na.preferredLifetime().hasExpired() || na.netmask().isNull())
+                continue;
+
+            QHostAddress h = na.ip();
+            if (h.isNull() || h.isLoopback()
+                || !(h.protocol() == QAbstractSocket::IPv4Protocol || h.protocol() == QAbstractSocket::IPv6Protocol)
+                || (h.protocol() == QAbstractSocket::IPv4Protocol && h.toIPv4Address() < 0x01000000))
+                continue;
+
+            // don't put the same address in twice.
+            //   this also means that if there are
+            //   two link-local ipv6 interfaces
+            //   with the exact same address, we
+            //   only use the first one
+            if (listenAddrs.contains(h))
+                continue;
+
+            // TODO review if the next condition is needed (and the above too)
+            if (h.protocol() == QAbstractSocket::IPv6Protocol && XMPP::Ice176::isIPv6LinkLocalAddress(h))
+                h.setScopeId(ni.name());
+            listenAddrs += h;
+        }
+    }
+
+    return sortAddrs(listenAddrs);
+}
+
 } // namespace XMPP
 
 #include "ice176.moc"
diff --git a/src/irisnet/noncore/ice176.h b/src/irisnet/noncore/ice176.h
index 9e06ead2..d8a5bd33 100644
--- a/src/irisnet/noncore/ice176.h
+++ b/src/irisnet/noncore/ice176.h
@@ -159,6 +159,8 @@ class Ice176 : public QObject {
 
     QList<SelectedCandidate> selectedCandidates() const;
 
+    static QList<QHostAddress> availableNetworkAddresses();
+
 signals:
     // indicates that the ice engine is started and is ready to receive
     //   peer creds and remote candidates
diff --git a/src/irisnet/noncore/udpportreserver.cpp b/src/irisnet/noncore/udpportreserver.cpp
index 3d5f4b60..74c197c9 100644
--- a/src/irisnet/noncore/udpportreserver.cpp
+++ b/src/irisnet/noncore/udpportreserver.cpp
@@ -70,19 +70,14 @@ class UdpPortReserver::Private : public QObject {
 
     ~Private()
     {
-        bool lendingAny = false;
-        for (const Item &i : items) {
-            if (i.lent) {
-                lendingAny = true;
-                break;
-            }
-        }
+
+        bool lendingAny = std::any_of(items.begin(), items.end(), [](auto const &i) { return i.lent; });
 
         Q_ASSERT(!lendingAny);
         if (lendingAny)
             abort();
 
-        for (const Item &i : items) {
+        for (const Item &i : qAsConst(items)) {
             for (QUdpSocket *sock : i.sockList)
                 sock->deleteLater();
         }
@@ -101,7 +96,7 @@ class UdpPortReserver::Private : public QObject {
         QList<int> added;
         for (int x : newPorts) {
             bool found = false;
-            for (const Item &i : items) {
+            for (const Item &i : qAsConst(items)) {
                 if (i.port == x) {
                     found = true;
                     break;
@@ -117,7 +112,7 @@ class UdpPortReserver::Private : public QObject {
         // keep ports in sorted order
         std::sort(ports.begin(), ports.end());
 
-        for (int x : added) {
+        for (int x : qAsConst(added)) {
             int insert_before = items.count();
             for (int n = 0; n < items.count(); ++n) {
                 if (x < items[n].port) {
@@ -272,7 +267,7 @@ private slots:
 
             // don't care about this port anymore?
             if (!i.lent && !ports.contains(i.port)) {
-                for (QUdpSocket *sock : i.sockList)
+                for (QUdpSocket *sock : qAsConst(i.sockList))
                     sock->deleteLater();
 
                 items.removeAt(n);
@@ -343,7 +338,7 @@ private slots:
         QList<QUdpSocket *> out;
 
         i->lent = true;
-        for (QUdpSocket *sock : i->sockList) {
+        for (QUdpSocket *sock : qAsConst(i->sockList)) {
             i->lentAddrs += sock->localAddress();
             sock->disconnect(this);
             sock->setParent(parent);
diff --git a/src/xmpp/CMakeLists.txt b/src/xmpp/CMakeLists.txt
index df547627..185247e6 100644
--- a/src/xmpp/CMakeLists.txt
+++ b/src/xmpp/CMakeLists.txt
@@ -58,6 +58,7 @@ set(HEADERS
     xmpp-im/xmpp_vcard.h
     xmpp-im/xmpp_xdata.h
     xmpp-im/xmpp_xmlcommon.h
+    xmpp-im/xmpp_encryption.h
 
     base/randomnumbergenerator.h
     base/randrandomnumbergenerator.h
@@ -138,6 +139,7 @@ set(SOURCES
     xmpp-im/xmpp_vcard.cpp
     xmpp-im/xmpp_xdata.cpp
     xmpp-im/xmpp_xmlcommon.cpp
+    xmpp-im/xmpp_encryption.cpp
     xmpp-im/jingle.cpp
     xmpp-im/jingle-connection.cpp
     xmpp-im/jingle-session.cpp
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index ce48f56e..ef64a31d 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -255,43 +255,6 @@ namespace XMPP { namespace Jingle { namespace ICE {
         return 3;
     }
 
-    // -1 = a is higher priority, 1 = b is higher priority, 0 = equal
-    static int comparePriority(const QHostAddress &a, const QHostAddress &b)
-    {
-        // prefer closer scope
-        int a_scope = getAddressScope(a);
-        int b_scope = getAddressScope(b);
-        if (a_scope < b_scope)
-            return -1;
-        else if (a_scope > b_scope)
-            return 1;
-
-        // prefer ipv6
-        if (a.protocol() == QAbstractSocket::IPv6Protocol && b.protocol() != QAbstractSocket::IPv6Protocol)
-            return -1;
-        else if (b.protocol() == QAbstractSocket::IPv6Protocol && a.protocol() != QAbstractSocket::IPv6Protocol)
-            return 1;
-
-        return 0;
-    }
-
-    static QList<QHostAddress> sortAddrs(const QList<QHostAddress> &in)
-    {
-        QList<QHostAddress> out;
-
-        for (const QHostAddress &a : in) {
-            int at;
-            for (at = 0; at < out.count(); ++at) {
-                if (comparePriority(a, out[at]) < 0)
-                    break;
-            }
-
-            out.insert(at, a);
-        }
-
-        return out;
-    }
-
     class Resolver : public QObject {
         Q_OBJECT
         using QObject::QObject;
@@ -552,6 +515,8 @@ namespace XMPP { namespace Jingle { namespace ICE {
         {
             if (ice) {
                 ice->disconnect(q);
+                auto stopper = new IceStopper;
+                stopper->start(portReserver, QList<Ice176 *>() << ice);
             }
         }
 
@@ -654,36 +619,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
             if (!stunRelayTcpAddr.isNull() && stunRelayTcpPort > 0 && !manager->stunRelayTcpUser.isEmpty())
                 qDebug("TURN w/ TCP service: %s;%d", qPrintable(stunRelayTcpAddr.toString()), stunRelayTcpPort);
 
-            QList<QHostAddress> listenAddrs;
-            auto const          interfaces = QNetworkInterface::allInterfaces();
-            for (const QNetworkInterface &ni : interfaces) {
-                if ((ni.flags() & (QNetworkInterface::IsRunning | QNetworkInterface::IsUp))
-                        != (QNetworkInterface::IsRunning | QNetworkInterface::IsUp)
-                    || ni.flags() & QNetworkInterface::IsLoopBack)
-                    continue;
-                QList<QNetworkAddressEntry> entries = ni.addressEntries();
-                for (const QNetworkAddressEntry &na : as_const(entries)) {
-                    QHostAddress h = na.ip();
-
-                    // skip localhost
-                    if (getAddressScope(h) == 0)
-                        continue;
-
-                    // don't put the same address in twice.
-                    //   this also means that if there are
-                    //   two link-local ipv6 interfaces
-                    //   with the exact same address, we
-                    //   only use the first one
-                    if (listenAddrs.contains(h))
-                        continue;
-
-                    if (h.protocol() == QAbstractSocket::IPv6Protocol && XMPP::Ice176::isIPv6LinkLocalAddress(h))
-                        h.setScopeId(ni.name());
-                    listenAddrs += h;
-                }
-            }
-
-            listenAddrs = sortAddrs(listenAddrs);
+            auto listenAddrs = Ice176::availableNetworkAddresses();
 
             QList<XMPP::Ice176::LocalAddress> localAddrs;
 
diff --git a/src/xmpp/xmpp-im/xmpp_encryption.cpp b/src/xmpp/xmpp-im/xmpp_encryption.cpp
new file mode 100644
index 00000000..565f8539
--- /dev/null
+++ b/src/xmpp/xmpp-im/xmpp_encryption.cpp
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2021  Sergey Ilinykh
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "xmpp_encryption.h"
+
+namespace XMPP {
+
+class EncryptionManager::Private {
+public:
+    QList<EncryptionMethod *> methods;
+};
+
+EncryptionManager::~EncryptionManager() { }
+
+void EncryptionManager::registerMethod(EncryptionMethod *algo) { d->methods.append(algo); }
+
+void EncryptionManager::unregisterMethod(EncryptionMethod *algo) { d->methods.removeOne(algo); }
+
+EncryptionManager::MethodsMap EncryptionManager::methods() const
+{
+    MethodsMap ret;
+    for (auto const &m : qAsConst(d->methods)) {
+        ret[m->id()] = m->name();
+    }
+    return ret;
+}
+
+}
diff --git a/src/xmpp/xmpp-im/xmpp_encryption.h b/src/xmpp/xmpp-im/xmpp_encryption.h
new file mode 100644
index 00000000..f6cb35fa
--- /dev/null
+++ b/src/xmpp/xmpp-im/xmpp_encryption.h
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2021  Sergey Ilinykh
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <QObject>
+
+#include <map>
+#include <memory>
+
+#include "xmpp_features.h"
+
+class QDomElement;
+
+namespace XMPP {
+
+class EncryptedSession : public QObject {
+    Q_OBJECT
+public:
+    void write(const QDomElement &xml);
+    void writeIncoming(const QDomElement &xml);
+    void write(const QByteArray &xml);
+    void writeIncoming(const QByteArray &xml);
+
+    QByteArray read();
+    QByteArray readOutgoing();
+};
+
+class EncryptionMethod : public QObject {
+    Q_OBJECT
+public:
+    enum Capability {
+        XmppStanza  = 0x1, /* XML */
+        DataMessage = 0x2, /* all at once */
+        DataStream  = 0x4  /* incremental */
+    };
+    Q_DECLARE_FLAGS(Capabilities, Capability)
+
+    virtual QString           id() const                             = 0;
+    virtual QString           name() const                           = 0;
+    virtual Capabilities      capabilities() const                   = 0;
+    virtual EncryptedSession *startSession(const Capabilities &caps) = 0;
+    virtual Features          features()                             = 0;
+};
+
+class EncryptionManager : public QObject {
+    Q_OBJECT
+public:
+    ~EncryptionManager();
+    using MethodsMap = std::map<QString, QString>; // id to title
+
+    void       registerMethod(EncryptionMethod *algo);
+    void       unregisterMethod(EncryptionMethod *algo);
+    MethodsMap methods() const;
+
+private:
+    class Private;
+    std::unique_ptr<Private> d;
+};
+
+}

From 3edb5c7df742f796da70f9532a42a8080ab2501e Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 24 May 2021 00:42:58 +0300
Subject: [PATCH 318/383] Added threaded file hasher. Not used in file file
 transfer yet

---
 src/xmpp/CMakeLists.txt        |   1 +
 src/xmpp/blake2/blake2qt.cpp   |  84 ++++++---
 src/xmpp/blake2/blake2qt.h     |  26 ++-
 src/xmpp/xmpp-im/jingle-ft.cpp |  65 +++++++
 src/xmpp/xmpp-im/jingle-ft.h   |  20 ++
 src/xmpp/xmpp-im/types.cpp     | 223 ----------------------
 src/xmpp/xmpp-im/xmpp_hash.cpp | 329 +++++++++++++++++++++++++++++++++
 src/xmpp/xmpp-im/xmpp_hash.h   |  27 ++-
 8 files changed, 516 insertions(+), 259 deletions(-)
 create mode 100644 src/xmpp/xmpp-im/xmpp_hash.cpp

diff --git a/src/xmpp/CMakeLists.txt b/src/xmpp/CMakeLists.txt
index 185247e6..a05aad61 100644
--- a/src/xmpp/CMakeLists.txt
+++ b/src/xmpp/CMakeLists.txt
@@ -130,6 +130,7 @@ set(SOURCES
     xmpp-im/xmpp_caps.cpp
     xmpp-im/xmpp_discoinfotask.cpp
     xmpp-im/xmpp_discoitem.cpp
+    xmpp-im/xmpp_hash.cpp
     xmpp-im/xmpp_ibb.cpp
     xmpp-im/xmpp_reference.cpp
     xmpp-im/xmpp_serverinfomanager.cpp
diff --git a/src/xmpp/blake2/blake2qt.cpp b/src/xmpp/blake2/blake2qt.cpp
index c7d76d95..f2509fd5 100644
--- a/src/xmpp/blake2/blake2qt.cpp
+++ b/src/xmpp/blake2/blake2qt.cpp
@@ -9,54 +9,82 @@ namespace XMPP {
 static_assert(sizeof(blake2s_param) == BLAKE2S_OUTBYTES, "sizeof(blake2s_param) != BLAKE2S_OUTBYTES");
 static_assert(sizeof(blake2b_param) == BLAKE2B_OUTBYTES, "sizeof(blake2b_param) != BLAKE2B_OUTBYTES");
 
-QByteArray computeBlake2Hash(const QByteArray &ba, Blake2DigestSize digestSize)
+class Blake2Hash::Private {
+public:
+    blake2b_state state;
+};
+
+Blake2Hash::Blake2Hash(DigestSize digestSize) : d(new Private)
 {
-    // otherwise try to libb2 or bundled reference implementation depending on which is available
+    size_t digestSizeBytes = digestSize == Digest256 ? 32 : 64;
+    int    retCode         = blake2b_init(&d->state, digestSizeBytes);
+    if (retCode != 0)
+        d.reset();
+}
 
-    size_t     digestSizeBytes = digestSize == Blake2Digest256 ? 32 : 64;
-    QByteArray ret(int(digestSizeBytes), Qt::Uninitialized);
+Blake2Hash::Blake2Hash(Blake2Hash &&other) : d(other.d.release()) { }
 
-    if (blake2b(ret.data(), digestSizeBytes, ba.data(), size_t(ba.size()), nullptr, 0) != 0) {
-        ret.clear();
-    }
+Blake2Hash::~Blake2Hash() { }
 
-    return ret;
+bool Blake2Hash::addData(const QByteArray &data)
+{
+    return blake2b_update(&d->state, data.data(), size_t(data.size())) == 0;
 }
 
-QByteArray computeBlake2Hash(QIODevice *dev, Blake2DigestSize digestSize)
+bool Blake2Hash::addData(QIODevice *dev)
 {
-    if (!dev->isOpen()) {
+    bool isOpen = dev->isOpen();
+    if (!isOpen) {
         dev->open(QIODevice::ReadOnly);
     }
     if (!dev->isOpen()) {
-        return QByteArray();
+        return false;
     }
 
-    // otherwise try to libb2 or bundled reference implementation depending on which is available
-
-    size_t        digestSizeBytes = digestSize == Blake2Digest256 ? 32 : 64;
-    blake2b_state state;
-    int           retCode = blake2b_init(&state, digestSizeBytes);
-    if (retCode != 0) {
-        return QByteArray();
-    }
+    bool       ret = true;
     QByteArray buf;
     // reading by 1Mb should work well with disk caches
-    while ((buf = dev->read(1024 * 1024)).size() > 0) {
-        retCode = blake2b_update(&state, buf.data(), size_t(buf.size()));
-        if (retCode != 0) {
-            return QByteArray();
+    while ((buf = dev->read(1024 * 1024)).size() > 0)
+        if (!addData(buf)) {
+            ret = false;
+            break;
         }
-    }
 
+    if (!isOpen)
+        dev->close();
+    return ret;
+}
+
+QByteArray Blake2Hash::final()
+{
     QByteArray ret;
-    ret.resize(int(digestSizeBytes));
-    retCode = blake2b_final(&state, ret.data(), size_t(ret.size()));
-    if (retCode != 0) {
-        return QByteArray();
+    ret.resize(d->state.outlen);
+    if (blake2b_final(&d->state, ret.data(), size_t(ret.size())) == 0)
+        return ret;
+    return QByteArray();
+}
+
+QByteArray Blake2Hash::compute(const QByteArray &ba, DigestSize digestSize)
+{
+    // otherwise try to libb2 or bundled reference implementation depending on which is available
+
+    size_t     digestSizeBytes = digestSize == Digest256 ? 32 : 64;
+    QByteArray ret(int(digestSizeBytes), Qt::Uninitialized);
+
+    if (blake2b(ret.data(), digestSizeBytes, ba.data(), size_t(ba.size()), nullptr, 0) != 0) {
+        ret.clear();
     }
 
     return ret;
 }
 
+QByteArray Blake2Hash::compute(QIODevice *dev, DigestSize digestSize)
+{
+    Blake2Hash hash(digestSize);
+    if (!(hash.isValid() && hash.addData(dev)))
+        return QByteArray();
+
+    return hash.final();
+}
+
 } // namespace XMPP
diff --git a/src/xmpp/blake2/blake2qt.h b/src/xmpp/blake2/blake2qt.h
index e9f9f65f..e8965560 100644
--- a/src/xmpp/blake2/blake2qt.h
+++ b/src/xmpp/blake2/blake2qt.h
@@ -3,13 +3,33 @@
 
 #include <QByteArray>
 
+#include <memory>
+
 class QIODevice;
 
 namespace XMPP {
-enum Blake2DigestSize { Blake2Digest256, Blake2Digest512 };
 
-QByteArray computeBlake2Hash(const QByteArray &ba, Blake2DigestSize digestSize);
-QByteArray computeBlake2Hash(QIODevice *dev, Blake2DigestSize digestSize);
+class Blake2Hash {
+public:
+    enum DigestSize { Digest256, Digest512 };
+
+    Blake2Hash(DigestSize digestSize);
+    Blake2Hash(Blake2Hash &&other);
+    ~Blake2Hash();
+
+    bool       addData(const QByteArray &data);
+    bool       addData(QIODevice *dev);
+    QByteArray final();
+    bool       isValid() const { return d != nullptr; }
+
+    static QByteArray compute(const QByteArray &ba, DigestSize digestSize);
+    static QByteArray compute(QIODevice *dev, DigestSize digestSize);
+
+private:
+    class Private;
+    std::unique_ptr<Private> d;
+};
+
 } // namespace XMPP
 
 #endif // BLAKE2QT_H
diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 3aa9cff6..9da93d44 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -29,7 +29,11 @@
 #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
 #include <QRandomGenerator>
 #endif
+#include <QDeadlineTimer>
+#include <QMetaObject>
 #include <QPointer>
+#include <QSemaphore>
+#include <QThread>
 #include <QTimer>
 #include <chrono>
 #include <cmath>
@@ -423,6 +427,67 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
                                                   | TransportFeature::DataOriented);
     }
 
+    //----------------------------------------------------------------------------
+    // FileHasher
+    //----------------------------------------------------------------------------
+    class FileHasher::Private {
+    public:
+        std::uint64_t  startPos;
+        std::uint64_t  size;
+        QDeadlineTimer timer;
+        QThread        thread;
+        StreamHash     streamHash;
+
+        Private(std::uint64_t startPos, Hash::Type hashType) : startPos(startPos), streamHash(hashType) { }
+    };
+
+    FileHasher::FileHasher(std::uint64_t startPos, Hash::Type type) : d(new Private(startPos, type))
+    {
+        QSemaphore sem;
+        moveToThread(&d->thread);
+        QObject::connect(&d->thread, &QThread::started, this, [&sem]() { sem.release(); });
+        d->thread.start();
+        sem.acquire();
+    }
+
+    FileHasher::~FileHasher()
+    {
+        if (d->thread.isRunning()) {
+            addData(); // ensure exit called
+            d->thread.wait();
+        }
+    }
+
+    void FileHasher::addData(const QByteArray &data)
+    {
+        QTimer::singleShot(0, this, [data, this]() {
+            // executed in a thread
+            bool needDump = data.isEmpty() || d->timer.hasExpired();
+            d->size += data.size();
+            d->streamHash.addData(data);
+            if (needDump) {
+                auto h = d->streamHash.final();
+                if (!h.isValid())
+                    return;
+
+                Range range(d->startPos, d->size);
+                File  file;
+                file.setHashes(QList<Hash>() << h);
+                file.setRange(range);
+                emit hashReady(file);
+                d->startPos += d->size;
+                d->size = 0;
+                if (!data.isEmpty())
+                    d->streamHash.restart();
+            }
+
+            if (data.isEmpty()) // finalizing data
+                thread()->exit();
+        });
+        if (data.isEmpty())
+            d->thread.wait();
+    }
+
     //----------------------------------------------------------------------------
     // Application
     //----------------------------------------------------------------------------
diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index 3eb1ed9f..1a317047 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -88,6 +88,26 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
         QSharedDataPointer<Private> d;
     };
 
+    class FileHasher : public QObject {
+        Q_OBJECT
+    public:
+        FileHasher(std::uint64_t startPos, Hash::Type type);
+        ~FileHasher();
+
+        /**
+         * @brief addData add next portion of data for hash computation.
+         * @param data to be added to hash function. if empty it will signal hashing thread to exit
+         */
+        void addData(const QByteArray &data = QByteArray());
+
+    signals:
+        void hashReady(const XMPP::Jingle::FileTransfer::File &file);
+
+    private:
+        class Private;
+        std::unique_ptr<Private> d;
+    };
+
     class Checksum : public ContentBase {
     public:
         inline Checksum() { }
diff --git a/src/xmpp/xmpp-im/types.cpp b/src/xmpp/xmpp-im/types.cpp
index 9e1ac64a..0a1748b5 100644
--- a/src/xmpp/xmpp-im/types.cpp
+++ b/src/xmpp/xmpp-im/types.cpp
@@ -19,7 +19,6 @@
 
 #include "im.h"
 #include "protocol.h"
-#include "xmpp/blake2/blake2qt.h"
 #include "xmpp_bitsofbinary.h"
 #include "xmpp_captcha.h"
 #include "xmpp_features.h"
@@ -250,228 +249,6 @@ void Address::setDelivered(bool delivered) { v_delivered = delivered; }
 //! \param type - type
 void Address::setType(Type type) { v_type = type; }
 
-//----------------------------------------------------------------------------
-// Hash
-//----------------------------------------------------------------------------
-static const char *const sha1_synonims[] = { "sha1", nullptr };
-// NOTE: keep this in sync with enum. same order!
-static const struct {
-    const char *       text;
-    Hash::Type         hashType;
-    const char *const *synonims = nullptr;
-} hashTypes[] = { { "sha-1", Hash::Type::Sha1, sha1_synonims },
-                  { "sha-256", Hash::Type::Sha256 },
-                  { "sha-512", Hash::Type::Sha512 },
-                  { "sha3-256", Hash::Type::Sha3_256 },
-                  { "sha3-512", Hash::Type::Sha3_512 },
-                  { "blake2b-256", Hash::Type::Blake2b256 },
-                  { "blake2b-512", Hash::Type::Blake2b512 } };
-
-Hash::Hash(const QDomElement &el)
-{
-    QString algo = el.attribute(QLatin1String("algo"));
-    v_type       = parseType(QStringRef(&algo));
-    if (v_type != Unknown && el.tagName() == QLatin1String("hash")) {
-        v_data = QByteArray::fromBase64(el.text().toLatin1());
-        if (v_data.isEmpty()) {
-            v_type = Type::Unknown;
-        }
-    }
-}
-
-QString Hash::stringType() const
-{
-    if (!v_type)
-        return QString();
-    static_assert(LastType == (sizeof(hashTypes) / sizeof(hashTypes[0])), "hashType and enum are not in sync");
-    return QLatin1String(hashTypes[int(v_type) - 1].text);
-}
-
-Hash::Type Hash::parseType(const QStringRef &algo)
-{
-    if (!algo.isEmpty()) {
-        for (size_t n = 0; n < sizeof(hashTypes) / sizeof(hashTypes[0]); ++n) {
-            if (algo == QLatin1String(hashTypes[n].text)) {
-                return hashTypes[n].hashType;
-            }
-            if (hashTypes[n].synonims) {
-                auto cur = hashTypes[n].synonims;
-                while (*cur) {
-                    if (algo == QLatin1String(*cur)) {
-                        return hashTypes[n].hashType;
-                    }
-                    cur++;
-                }
-            }
-        }
-    }
-    return Unknown;
-}
-
-bool Hash::compute(const QByteArray &ba)
-{
-    v_data.clear();
-    switch (v_type) {
-    case Type::Sha1:
-        v_data = QCryptographicHash::hash(ba, QCryptographicHash::Sha1);
-        break;
-    case Type::Sha256:
-        v_data = QCryptographicHash::hash(ba, QCryptographicHash::Sha256);
-        break;
-    case Type::Sha512:
-        v_data = QCryptographicHash::hash(ba, QCryptographicHash::Sha512);
-        break;
-    case Type::Sha3_256:
-        v_data = QCryptographicHash::hash(ba, QCryptographicHash::Sha3_256);
-        break;
-    case Type::Sha3_512:
-        v_data = QCryptographicHash::hash(ba, QCryptographicHash::Sha3_512);
-        break;
-    case Type::Blake2b256:
-        v_data = computeBlake2Hash(ba, Blake2Digest256);
-        break;
-    case Type::Blake2b512:
-        v_data = computeBlake2Hash(ba, Blake2Digest512);
-        break;
-    case Type::Unknown:
-    default:
-        qDebug("invalid hash type");
-        return false;
-    }
-    return !v_data.isEmpty();
-}
-
-bool Hash::compute(QIODevice *dev)
-{
-    QString                       qcaType;
-    QCryptographicHash::Algorithm qtType  = QCryptographicHash::Algorithm(-1);
-    Blake2DigestSize              blakeDS = Blake2DigestSize(-1);
-
-    v_data.clear();
-
-    switch (v_type) {
-    case Type::Sha1:
-        qtType  = QCryptographicHash::Sha1;
-        qcaType = "sha1";
-        break;
-    case Type::Sha256:
-        qtType  = QCryptographicHash::Sha256;
-        qcaType = "sha256";
-        break;
-    case Type::Sha512:
-        qtType  = QCryptographicHash::Sha512;
-        qcaType = "sha512";
-        break;
-    case Type::Sha3_256:
-        qtType  = QCryptographicHash::Sha3_256;
-        qcaType = "sha3_256";
-        break;
-    case Type::Sha3_512:
-        qtType  = QCryptographicHash::Sha3_512;
-        qcaType = "sha3_512";
-        break;
-    case Type::Blake2b256:
-        qcaType = "blake2b_256";
-        blakeDS = Blake2Digest256;
-        break;
-    case Type::Blake2b512:
-        qcaType = "blake2b_512";
-        blakeDS = Blake2Digest512;
-        break;
-    case Type::Unknown:
-    default:
-        qDebug("invalid hash type");
-        return false;
-    }
-
-    if (!qcaType.isEmpty()) {
-        QCA::Hash hashObj(qcaType);
-        if (hashObj.context()) {
-            hashObj.update(dev);
-            v_data = hashObj.final().toByteArray();
-            if (!v_data.isEmpty())
-                return true;
-        }
-    }
-
-    if (qtType != QCryptographicHash::Algorithm(-1)) {
-        QCryptographicHash h(QCryptographicHash::Sha1);
-        h.addData(dev);
-        v_data = h.result();
-    } else if (blakeDS != Blake2DigestSize(-1)) {
-        v_data = computeBlake2Hash(dev, blakeDS);
-    }
-
-    return !v_data.isEmpty();
-}
-
-QDomElement Hash::toXml(QDomDocument *doc) const
-{
-    if (v_type != Type::Unknown) {
-        for (size_t n = 0; n < sizeof(hashTypes) / sizeof(hashTypes[0]); ++n) {
-            if (v_type == hashTypes[n].hashType) {
-                auto el = doc->createElementNS(HASH_NS, QLatin1String(v_data.isEmpty() ? "hash-used" : "hash"));
-                el.setAttribute(QLatin1String("algo"), QLatin1String(hashTypes[n].text));
-                if (!v_data.isEmpty()) {
-                    XMLHelper::setTagText(el, v_data.toBase64());
-                }
-                return el;
-            }
-        }
-    }
-    return QDomElement();
-}
-
-void Hash::populateFeatures(Features &features)
-{
-    features.addFeature("urn:xmpp:hashes:2");
-    for (size_t n = 0; n < sizeof(hashTypes) / sizeof(hashTypes[0]); ++n) {
-        features.addFeature(QLatin1String("urn:xmpp:hash-function-text-names:") + QLatin1String(hashTypes[n].text));
-    }
-}
-
-Hash Hash::from(XMPP::Hash::Type t, const QByteArray &fileData)
-{
-    Hash h(t);
-    if (!h.compute(fileData))
-        h.setType(Unknown);
-    return h;
-}
-
-Hash Hash::from(XMPP::Hash::Type t, QIODevice *dev)
-{
-    Hash h(t);
-    if (!h.compute(dev))
-        h.setType(Unknown);
-    return h;
-}
-
-Hash Hash::from(Hash::Type t, const QFileInfo &file)
-{
-    if (file.isReadable()) {
-        QFile f(file.filePath());
-        f.open(QIODevice::ReadOnly);
-        return from(t, &f);
-    }
-    return Hash();
-}
-
-Hash Hash::from(const QStringRef &str)
-{
-    auto ind = str.indexOf('+');
-    if (ind <= 0)
-        return Hash();
-    Hash hash(str.left(ind));
-    if (hash.isValid()) {
-        auto data = QByteArray::fromHex(str.mid(ind + 1).toLatin1());
-        if (data.size())
-            hash.setData(data);
-        else
-            hash = Hash();
-    }
-    return hash;
-}
-
 //----------------------------------------------------------------------------
 // RosterExchangeItem
 //----------------------------------------------------------------------------
diff --git a/src/xmpp/xmpp-im/xmpp_hash.cpp b/src/xmpp/xmpp-im/xmpp_hash.cpp
new file mode 100644
index 00000000..ca5387a3
--- /dev/null
+++ b/src/xmpp/xmpp-im/xmpp_hash.cpp
@@ -0,0 +1,329 @@
+/*
+ * Copyright (C) 2019-2021  Sergey Ilinykh
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "xmpp_hash.h"
+
+#include "xmpp/blake2/blake2qt.h"
+#include "xmpp_features.h"
+#include "xmpp_xmlcommon.h"
+
+#include <QCryptographicHash>
+#include <QFileInfo>
+#include <qca.h>
+
+namespace XMPP {
+
+//----------------------------------------------------------------------------
+// Hash
+//----------------------------------------------------------------------------
+static const char *const sha1_synonims[] = { "sha1", nullptr };
+// NOTE: keep this in sync with enum. same order!
+static const struct {
+    const char *       text;
+    Hash::Type         hashType;
+    const char *const *synonims = nullptr;
+} hashTypes[] = { { "sha-1", Hash::Type::Sha1, sha1_synonims },
+                  { "sha-256", Hash::Type::Sha256 },
+                  { "sha-512", Hash::Type::Sha512 },
+                  { "sha3-256", Hash::Type::Sha3_256 },
+                  { "sha3-512", Hash::Type::Sha3_512 },
+                  { "blake2b-256", Hash::Type::Blake2b256 },
+                  { "blake2b-512", Hash::Type::Blake2b512 } };
+
+using HashVariant = std::variant<std::nullptr_t, QCryptographicHash, QCA::Hash, Blake2Hash>;
+HashVariant findHasher(Hash::Type hashType)
+{
+    QString                       qcaType;
+    QCryptographicHash::Algorithm qtType  = QCryptographicHash::Algorithm(-1);
+    Blake2Hash::DigestSize        blakeDS = Blake2Hash::DigestSize(-1);
+
+    switch (hashType) {
+    case Hash::Type::Sha1:
+        qtType  = QCryptographicHash::Sha1;
+        qcaType = "sha1";
+        break;
+    case Hash::Type::Sha256:
+        qtType  = QCryptographicHash::Sha256;
+        qcaType = "sha256";
+        break;
+    case Hash::Type::Sha512:
+        qtType  = QCryptographicHash::Sha512;
+        qcaType = "sha512";
+        break;
+    case Hash::Type::Sha3_256:
+        qtType  = QCryptographicHash::Sha3_256;
+        qcaType = "sha3_256";
+        break;
+    case Hash::Type::Sha3_512:
+        qtType  = QCryptographicHash::Sha3_512;
+        qcaType = "sha3_512";
+        break;
+    case Hash::Type::Blake2b256:
+        qcaType = "blake2b_256";
+        blakeDS = Blake2Hash::Digest256;
+        break;
+    case Hash::Type::Blake2b512:
+        qcaType = "blake2b_512";
+        blakeDS = Blake2Hash::Digest512;
+        break;
+    case Hash::Type::Unknown:
+    default:
+        qDebug("invalid hash type");
+        return nullptr;
+    }
+
+    if (!qcaType.isEmpty()) {
+        QCA::Hash hashObj(qcaType);
+        if (hashObj.context()) {
+            return hashObj;
+        }
+    }
+
+    if (qtType != QCryptographicHash::Algorithm(-1)) {
+        return HashVariant { std::in_place_type<QCryptographicHash>, qtType };
+    } else if (blakeDS != Blake2Hash::DigestSize(-1)) {
+        Blake2Hash bh(blakeDS);
+        if (bh.isValid()) {
+            return HashVariant { std::in_place_type<Blake2Hash>, std::move(bh) };
+        }
+    }
+    return nullptr;
+}
+
+Hash::Hash(const QDomElement &el)
+{
+    QString algo = el.attribute(QLatin1String("algo"));
+    v_type       = parseType(QStringRef(&algo));
+    if (v_type != Unknown && el.tagName() == QLatin1String("hash")) {
+        v_data = QByteArray::fromBase64(el.text().toLatin1());
+        if (v_data.isEmpty()) {
+            v_type = Type::Unknown;
+        }
+    }
+}
+
+QString Hash::stringType() const
+{
+    if (!v_type)
+        return QString();
+    static_assert(LastType == (sizeof(hashTypes) / sizeof(hashTypes[0])), "hashType and enum are not in sync");
+    return QLatin1String(hashTypes[int(v_type) - 1].text);
+}
+
+Hash::Type Hash::parseType(const QStringRef &algo)
+{
+    if (!algo.isEmpty()) {
+        for (size_t n = 0; n < sizeof(hashTypes) / sizeof(hashTypes[0]); ++n) {
+            if (algo == QLatin1String(hashTypes[n].text)) {
+                return hashTypes[n].hashType;
+            }
+            if (hashTypes[n].synonims) {
+                auto cur = hashTypes[n].synonims;
+                while (*cur) {
+                    if (algo == QLatin1String(*cur)) {
+                        return hashTypes[n].hashType;
+                    }
+                    cur++;
+                }
+            }
+        }
+    }
+    return Unknown;
+}
+
+bool Hash::compute(const QByteArray &ba)
+{
+    v_data.clear();
+    auto hasher = findHasher(v_type);
+    std::visit(
+        [&ba, this](auto &&arg) {
+            using T = std::decay_t<decltype(arg)>;
+            if constexpr (std::is_same_v<T, QCA::Hash>) {
+                arg.update(ba);
+                v_data = arg.final().toByteArray();
+            } else if constexpr (std::is_same_v<T, QCryptographicHash>) {
+                arg.addData(ba);
+                v_data = arg.result();
+            } else if constexpr (std::is_same_v<T, Blake2Hash>) {
+                if (arg.addData(ba))
+                    v_data = arg.final();
+            }
+        },
+        hasher);
+
+    if (!v_data.isEmpty())
+        return true;
+
+    qDebug("failed to compute %s hash for %d bytes", qPrintable(stringType()), ba.size());
+    return false;
+}
+
+bool Hash::compute(QIODevice *dev)
+{
+    v_data.clear();
+    auto hasher = findHasher(v_type);
+    std::visit(
+        [dev, this](auto &&arg) {
+            using T = std::decay_t<decltype(arg)>;
+            if constexpr (std::is_same_v<T, QCA::Hash>) {
+                arg.update(dev);
+                v_data = arg.final().toByteArray();
+            } else if constexpr (std::is_same_v<T, QCryptographicHash>) {
+                arg.addData(dev);
+                v_data = arg.result();
+            } else if constexpr (std::is_same_v<T, Blake2Hash>) {
+                if (arg.addData(dev))
+                    v_data = arg.final();
+            }
+        },
+        hasher);
+
+    if (!v_data.isEmpty())
+        return true;
+
+    qDebug("failed to compute %s hash on device 0x%p", qPrintable(stringType()), dev);
+    return false;
+}
+
+QDomElement Hash::toXml(QDomDocument *doc) const
+{
+    if (v_type != Type::Unknown) {
+        for (size_t n = 0; n < sizeof(hashTypes) / sizeof(hashTypes[0]); ++n) {
+            if (v_type == hashTypes[n].hashType) {
+                auto el = doc->createElementNS(HASH_NS, QLatin1String(v_data.isEmpty() ? "hash-used" : "hash"));
+                el.setAttribute(QLatin1String("algo"), QLatin1String(hashTypes[n].text));
+                if (!v_data.isEmpty()) {
+                    XMLHelper::setTagText(el, v_data.toBase64());
+                }
+                return el;
+            }
+        }
+    }
+    return QDomElement();
+}
+
+void Hash::populateFeatures(Features &features)
+{
+    features.addFeature("urn:xmpp:hashes:2");
+    for (size_t n = 0; n < sizeof(hashTypes) / sizeof(hashTypes[0]); ++n) {
+        features.addFeature(QLatin1String("urn:xmpp:hash-function-text-names:") + QLatin1String(hashTypes[n].text));
+    }
+}
+
+Hash Hash::from(XMPP::Hash::Type t, const QByteArray &fileData)
+{
+    Hash h(t);
+    if (!h.compute(fileData))
+        h.setType(Unknown);
+    return h;
+}
+
+Hash Hash::from(XMPP::Hash::Type t, QIODevice *dev)
+{
+    Hash h(t);
+    if (!h.compute(dev))
+        h.setType(Unknown);
+    return h;
+}
+
+Hash Hash::from(Hash::Type t, const QFileInfo &file)
+{
+    if (file.isReadable()) {
+        QFile f(file.filePath());
+        f.open(QIODevice::ReadOnly);
+        return from(t, &f);
+    }
+    return Hash();
+}
+
+Hash Hash::from(const QStringRef &str)
+{
+    auto ind = str.indexOf('+');
+    if (ind <= 0)
+        return Hash();
+    Hash hash(str.left(ind));
+    if (hash.isValid()) {
+        auto data = QByteArray::fromHex(str.mid(ind + 1).toLatin1());
+        if (data.size())
+            hash.setData(data);
+        else
+            hash = Hash();
+    }
+    return hash;
+}
+
+class StreamHashPrivate {
+public:
+    Hash::Type  type;
+    HashVariant hasher;
+    StreamHashPrivate(Hash::Type type) : type(type), hasher(findHasher(type)) { }
+};
+
+StreamHash::StreamHash(Hash::Type type) : d(new StreamHashPrivate(type)) { }
+
+StreamHash::~StreamHash() { }
+
+bool StreamHash::addData(const QByteArray &data)
+{
+    if (data.isEmpty())
+        return true;
+
+    bool ret = true;
+    std::visit(
+        [&data, &ret, this](auto &&arg) {
+            using T = std::decay_t<decltype(arg)>;
+            if constexpr (std::is_same_v<T, QCA::Hash>) {
+                arg.update(data);
+            } else if constexpr (std::is_same_v<T, QCryptographicHash>) {
+                arg.addData(data);
+            } else if constexpr (std::is_same_v<T, Blake2Hash>) {
+                ret = arg.addData(data);
+            } else
+                ret = false;
+        },
+        d->hasher);
+    return ret;
+}
+
+Hash StreamHash::final()
+{
+    auto data = std::visit(
+        [this](auto &&arg) {
+            using T = std::decay_t<decltype(arg)>;
+            if constexpr (std::is_same_v<T, QCA::Hash>) {
+                return arg.final().toByteArray();
+            } else if constexpr (std::is_same_v<T, QCryptographicHash>) {
+                return arg.result();
+            } else if constexpr (std::is_same_v<T, Blake2Hash>) {
+                return arg.final();
+            }
+            return QByteArray();
+        },
+        d->hasher);
+
+    Hash h(d->type, data);
+    if (data.isEmpty()) {
+        qDebug("failed to compute %s hash on a stream", qPrintable(h.stringType()));
+        return {};
+    }
+    return h;
+}
+
+void StreamHash::restart() { d.reset(new StreamHashPrivate(d->type)); }
+
+} // namespace XMPP
diff --git a/src/xmpp/xmpp-im/xmpp_hash.h b/src/xmpp/xmpp-im/xmpp_hash.h
index f07fbd28..a94a7e2f 100644
--- a/src/xmpp/xmpp-im/xmpp_hash.h
+++ b/src/xmpp/xmpp-im/xmpp_hash.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019  Sergey Ilinykh
+ * Copyright (C) 2019-2021  Sergey Ilinykh
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,15 @@
 #ifndef XMPP_HASH_H
 #define XMPP_HASH_H
 
-#include "xmpp_stanza.h"
-
-#include <QFileInfo>
+#include <QHash>
 #include <QString>
 
+#include <memory>
+
 class QDomElement;
+class QFileInfo;
+class QIODevice;
+class QDomDocument;
 
 namespace XMPP {
 
@@ -66,7 +69,7 @@ class Hash {
     inline QByteArray toBase64() const { return v_data.toBase64(); }
     inline QString toString() const { return QString("%1+%2").arg(stringType(), QString::fromLatin1(v_data.toHex())); }
     bool           compute(const QByteArray &); // computes hash from passed data
-    bool           compute(QIODevice *dev);
+    bool           compute(QIODevice *dev);     // reads all the device and computes hash from the data
 
     QDomElement toXml(QDomDocument *doc) const;
     static void populateFeatures(XMPP::Features &);
@@ -80,6 +83,20 @@ class Hash {
     QByteArray v_data;
 };
 
+class StreamHashPrivate;
+class StreamHash {
+public:
+    StreamHash(Hash::Type type);
+    ~StreamHash();
+    bool addData(const QByteArray &data);
+    Hash final();
+    void restart();
+
+private:
+    friend class StreamHashPrivate;
+    std::unique_ptr<StreamHashPrivate> d;
+};
+
 Q_DECL_PURE_FUNCTION inline uint qHash(const Hash &hash, uint seed = 0) Q_DECL_NOTHROW
 {
     return qHash(hash.data(), seed);

From 88d1315613a0c3b26be2bb7f359dca0f2989c66e Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 24 May 2021 01:19:01 +0300
Subject: [PATCH 319/383] Emit ranges from file hasher, not whole files

---
 src/xmpp/xmpp-im/jingle-ft.cpp | 6 ++----
 src/xmpp/xmpp-im/jingle-ft.h   | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 9da93d44..526d0f06 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -471,10 +471,8 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
                     return;
 
                 Range range(d->startPos, d->size);
-                File  file;
-                file.setHashes(QList<Hash>() << h);
-                file.setRange(range);
-                emit hashReady(file);
+                range.hashes << h;
+                emit hashReady(range);
                 d->startPos += d->size;
                 d->size = 0;
                 if (!data.isEmpty())
diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index 1a317047..f0f80817 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -101,7 +101,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
         void addData(const QByteArray &data = QByteArray());
 
     signals:
-        void hashReady(const XMPP::Jingle::FileTransfer::File &file);
+        void hashReady(const XMPP::Jingle::FileTransfer::Range &range);
 
     private:
         class Private;

From d0155da2b8bfc469bfe3b019027a3c6b56e3b0ca Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Mon, 24 May 2021 13:11:00 +0300
Subject: [PATCH 320/383] Fixed compilation in windows os

---
 src/irisnet/noncore/ice176.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index 07268b20..d13d7477 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -1759,7 +1759,7 @@ QList<QHostAddress> Ice176::availableNetworkAddresses()
             || ni.flags() & QNetworkInterface::IsLoopBack
 #ifdef Q_OS_UNIX
             || std::any_of(ignored.begin(), ignored.end(), [&ni](auto const &ign) { return ni.name().startsWith(ign); })
-#elif Q_OS_WIN
+#elif defined(Q_OS_WIN)
             || ni.humanReadableName().contains(QStringLiteral("VMnet"))
 #endif
         )

From 3640b8826a10bbc0c6e5ae380b21eae7a802d64d Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 24 May 2021 15:17:11 +0300
Subject: [PATCH 321/383] Added missed include <variant>

---
 src/xmpp/xmpp-im/xmpp_hash.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/xmpp/xmpp-im/xmpp_hash.cpp b/src/xmpp/xmpp-im/xmpp_hash.cpp
index ca5387a3..9d67d555 100644
--- a/src/xmpp/xmpp-im/xmpp_hash.cpp
+++ b/src/xmpp/xmpp-im/xmpp_hash.cpp
@@ -26,6 +26,8 @@
 #include <QFileInfo>
 #include <qca.h>
 
+#include <variant>
+
 namespace XMPP {
 
 //----------------------------------------------------------------------------

From d22d4fab81c0bb492dd24a050f7b131fce752aaf Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 24 May 2021 15:23:42 +0300
Subject: [PATCH 322/383] Don't use preferredLifetime qith qt<5.11

---
 src/irisnet/noncore/ice176.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index d13d7477..8546896e 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -1767,7 +1767,11 @@ QList<QHostAddress> Ice176::availableNetworkAddresses()
 
         QList<QNetworkAddressEntry> entries = ni.addressEntries();
         for (const QNetworkAddressEntry &na : qAsConst(entries)) {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
             if (na.preferredLifetime().hasExpired() || na.netmask().isNull())
+#else
+            if (na.netmask().isNull())
+#endif
                 continue;
 
             QHostAddress h = na.ip();

From 58df95f6222f7dcf1bb0d64d486104f57e59c281 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 24 May 2021 15:30:44 +0300
Subject: [PATCH 323/383] Added missed QDeadLine timer header

---
 src/irisnet/noncore/ice176.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index 8546896e..182055bd 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -29,6 +29,7 @@
 #include "stuntypes.h"
 #include "udpportreserver.h"
 
+#include <QDeadlineTimer>
 #include <QEvent>
 #include <QNetworkInterface>
 #include <QQueue>

From 64ed82bd5fc030892026d9134f316a9c662da57d Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 26 May 2021 12:06:58 +0300
Subject: [PATCH 324/383] Threaded file hasher for filetransfer

---
 src/irisnet/noncore/dtls.cpp                  |   8 +-
 src/irisnet/noncore/sctp/Logger.hpp           |   9 +-
 src/xmpp/CMakeLists.txt                       |   2 +
 src/xmpp/xmpp-im/jingle-file.cpp              | 397 +++++++++++
 src/xmpp/xmpp-im/jingle-file.h                | 103 +++
 src/xmpp/xmpp-im/jingle-ft.cpp                | 650 ++++++------------
 src/xmpp/xmpp-im/jingle-ft.h                  |  77 +--
 src/xmpp/xmpp-im/jingle-ice.cpp               |   2 +-
 .../xmpp-im/jingle-sctp-association_p.cpp     |   8 +-
 src/xmpp/xmpp-im/jingle-sctp.cpp              |   4 +-
 src/xmpp/xmpp-im/jingle-session.cpp           |   2 +
 src/xmpp/xmpp-im/jingle-session.h             |  11 +-
 src/xmpp/xmpp-im/jingle.cpp                   |   5 +-
 src/xmpp/xmpp-im/jingle.h                     |   6 +-
 src/xmpp/xmpp-im/xmpp_features.cpp            |   2 +
 src/xmpp/xmpp-im/xmpp_features.h              |   3 +-
 src/xmpp/xmpp-im/xmpp_hash.cpp                |  20 +
 src/xmpp/xmpp-im/xmpp_hash.h                  |   1 +
 18 files changed, 770 insertions(+), 540 deletions(-)
 create mode 100644 src/xmpp/xmpp-im/jingle-file.cpp
 create mode 100644 src/xmpp/xmpp-im/jingle-file.h

diff --git a/src/irisnet/noncore/dtls.cpp b/src/irisnet/noncore/dtls.cpp
index fd62e60b..38c25b73 100644
--- a/src/irisnet/noncore/dtls.cpp
+++ b/src/irisnet/noncore/dtls.cpp
@@ -366,7 +366,7 @@ QByteArray Dtls::readDatagram()
         return {};
     }
     QByteArray a = d->tls->read();
-    DTLS_DEBUG("read %d bytes of decrypted data", a.size());
+    // DTLS_DEBUG("read %d bytes of decrypted data", a.size());
     return a;
 }
 
@@ -377,13 +377,13 @@ QByteArray Dtls::readOutgoingDatagram()
         return {};
     }
     auto ba = d->tls->readOutgoing();
-    DTLS_DEBUG("read outgoing packet of %d bytes", ba.size());
+    // DTLS_DEBUG("read outgoing packet of %d bytes", ba.size());
     return ba;
 }
 
 void Dtls::writeDatagram(const QByteArray &data)
 {
-    DTLS_DEBUG("write %d bytes for encryption\n", data.size());
+    // DTLS_DEBUG("write %d bytes for encryption\n", data.size());
     if (!d->tls) {
         DTLS_DEBUG("negotiation hasn't started yet. ignore writeDatagram");
         return;
@@ -393,7 +393,7 @@ void Dtls::writeDatagram(const QByteArray &data)
 
 void Dtls::writeIncomingDatagram(const QByteArray &data)
 {
-    DTLS_DEBUG("write incoming %d bytes for decryption\n", data.size());
+    // DTLS_DEBUG("write incoming %d bytes for decryption\n", data.size());
     if (!d->tls) {
         DTLS_DEBUG("negotiation hasn't started yet. ignore incoming datagram");
         return;
diff --git a/src/irisnet/noncore/sctp/Logger.hpp b/src/irisnet/noncore/sctp/Logger.hpp
index ad36118a..14247629 100644
--- a/src/irisnet/noncore/sctp/Logger.hpp
+++ b/src/irisnet/noncore/sctp/Logger.hpp
@@ -3,11 +3,18 @@
 #include <QtGlobal>
 #include <cinttypes>
 
+// #define PSI_ENABLE_SCTP_DEBUG
 #define MS_WARN_TAG(tag, ...) qWarning("sctp:" __VA_ARGS__)
+#ifdef PSI_ENABLE_SCTP_DEBUG
 #define MS_DEBUG_TAG(tag, ...) qDebug("sctp:" __VA_ARGS__)
 #define MS_TRACE()
-#define MS_ERROR(...) qCritical(__VA_ARGS__)
 #define MS_DEBUG_DEV(...) qDebug(__VA_ARGS__)
+#else
+#define MS_DEBUG_TAG(tag, ...)
+#define MS_TRACE()
+#define MS_DEBUG_DEV(...)
+#endif
+#define MS_ERROR(...) qCritical(__VA_ARGS__)
 #define MS_HAS_DEBUG_TAG(tag) false
 
 #define MS_ABORT(desc, ...)                                                                                            \
diff --git a/src/xmpp/CMakeLists.txt b/src/xmpp/CMakeLists.txt
index a05aad61..98962f73 100644
--- a/src/xmpp/CMakeLists.txt
+++ b/src/xmpp/CMakeLists.txt
@@ -105,6 +105,7 @@ set(HEADERS
     xmpp-im/jingle-ice.h
     xmpp-im/jingle-s5b.h
     xmpp-im/jingle-ibb.h
+    xmpp-im/jingle-file.h
 
     zlib/zlibcompressor.h
     zlib/zlibdecompressor.h
@@ -151,6 +152,7 @@ set(SOURCES
     xmpp-im/jingle-ice.cpp
     xmpp-im/jingle-s5b.cpp
     xmpp-im/jingle-ibb.cpp
+    xmpp-im/jingle-file.cpp
 
     base/randomnumbergenerator.cpp
     base/timezone.cpp
diff --git a/src/xmpp/xmpp-im/jingle-file.cpp b/src/xmpp/xmpp-im/jingle-file.cpp
new file mode 100644
index 00000000..29724e3f
--- /dev/null
+++ b/src/xmpp/xmpp-im/jingle-file.cpp
@@ -0,0 +1,397 @@
+/*
+ * jignle-file.h - Jingle file usually used in file transfer
+ * Copyright (C) 2019  Sergey Ilinykh
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "jingle-file.h"
+
+#include "xmpp_xmlcommon.h"
+
+#include <QDomDocument>
+#include <QSemaphore>
+#include <QThread>
+#include <QTimer>
+
+namespace XMPP::Jingle::FileTransfer {
+
+const QString NS = QStringLiteral("urn:xmpp:jingle:apps:file-transfer:5");
+
+static const QString THUMBNAIL_TAG  = QStringLiteral("thumbnail");
+static const QString RANGE_TAG      = QStringLiteral("range");
+static const QString DATE_TAG       = QStringLiteral("date");
+static const QString DESC_TAG       = QStringLiteral("desc");
+static const QString MEDIA_TYPE_TAG = QStringLiteral("media-type");
+static const QString NAME_TAG       = QStringLiteral("name");
+static const QString SIZE_TAG       = QStringLiteral("size");
+static const QString FILETAG        = QStringLiteral("file");
+static const QString AMPLITUDES_TAG = QStringLiteral("amplitudes");
+
+const QString AMPLITUDES_NS = QStringLiteral("urn:audio:amplitudes");
+
+QDomElement Range::toXml(QDomDocument *doc) const
+{
+    auto r = doc->createElement(RANGE_TAG);
+    if (length) {
+        r.setAttribute(QStringLiteral("length"), QString::number(length));
+    }
+    if (offset) {
+        r.setAttribute(QStringLiteral("offset"), QString::number(offset));
+    }
+    for (auto const &h : hashes) {
+        auto hel = h.toXml(doc);
+        if (!hel.isNull()) {
+            r.appendChild(hel);
+        }
+    }
+    return r;
+}
+
+//----------------------------------------------------------------------------
+// File
+//----------------------------------------------------------------------------
+class File::Private : public QSharedData {
+public:
+    bool          rangeSupported = false;
+    bool          hasSize        = false;
+    QDateTime     date;
+    QString       mediaType;
+    QString       name;
+    QString       desc;
+    std::uint64_t size = 0;
+    Range         range;
+    QList<Hash>   hashes;
+    Thumbnail     thumbnail;
+    QByteArray    amplitudes;
+};
+
+File::File() { }
+
+File::~File() { }
+
+File &File::operator=(const File &other)
+{
+    d = other.d;
+    return *this;
+}
+
+File::File(const File &other) : d(other.d) { }
+
+File::File(const QDomElement &file)
+{
+    QDateTime     date;
+    QString       mediaType;
+    QString       name;
+    QString       desc;
+    std::uint64_t size           = 0;
+    bool          rangeSupported = false;
+    bool          hasSize        = false;
+    Range         range;
+    QList<Hash>   hashes;
+    Thumbnail     thumbnail;
+    QByteArray    amplitudes;
+
+    bool ok;
+
+    for (QDomElement ce = file.firstChildElement(); !ce.isNull(); ce = ce.nextSiblingElement()) {
+
+        if (ce.tagName() == DATE_TAG) {
+            date = QDateTime::fromString(ce.text().left(19), Qt::ISODate);
+            if (!date.isValid()) {
+                return;
+            }
+
+        } else if (ce.tagName() == MEDIA_TYPE_TAG) {
+            mediaType = ce.text();
+
+        } else if (ce.tagName() == NAME_TAG) {
+            name = ce.text();
+
+        } else if (ce.tagName() == SIZE_TAG) {
+            size = ce.text().toULongLong(&ok);
+            if (!ok) {
+                return;
+            }
+            hasSize = true;
+
+        } else if (ce.tagName() == RANGE_TAG) {
+            if (ce.hasAttribute(QLatin1String("offset"))) {
+                range.offset = ce.attribute(QLatin1String("offset")).toLongLong(&ok);
+                if (!ok || range.offset < 0) {
+                    return;
+                }
+            }
+            if (ce.hasAttribute(QLatin1String("length"))) {
+                range.length = ce.attribute(QLatin1String("length")).toLongLong(&ok);
+                if (!ok || range.length <= 0) { // length should absent if we need to read till end of file.
+                    // 0-length is nonsense
+                    return;
+                }
+            }
+            QDomElement hashEl = ce.firstChildElement(QLatin1String("hash"));
+            for (; !hashEl.isNull(); hashEl = hashEl.nextSiblingElement(QLatin1String("hash"))) {
+                if (hashEl.namespaceURI() == HASH_NS) {
+                    auto hash = Hash(hashEl);
+                    if (hash.type() == Hash::Type::Unknown) {
+                        continue;
+                    }
+                    range.hashes.append(hash);
+                }
+            }
+            rangeSupported = true;
+
+        } else if (ce.tagName() == DESC_TAG) {
+            desc = ce.text();
+
+        } else if (ce.tagName() == QLatin1String("hash")) {
+            if (ce.namespaceURI() == HASH_NS) {
+                Hash h(ce);
+                if (h.type() == Hash::Type::Unknown) {
+                    return;
+                }
+                hashes.append(h);
+            }
+
+        } else if (ce.tagName() == QLatin1String("hash-used")) {
+            if (ce.namespaceURI() == HASH_NS) {
+                Hash h(ce);
+                if (h.type() == Hash::Type::Unknown) {
+                    return;
+                }
+                hashes.append(h);
+            }
+
+        } else if (ce.tagName() == THUMBNAIL_TAG) {
+            thumbnail = Thumbnail(ce);
+        } else if (ce.tagName() == AMPLITUDES_TAG && ce.namespaceURI() == AMPLITUDES_NS) {
+            amplitudes = QByteArray::fromBase64(ce.text().toLatin1());
+        }
+    }
+
+    auto p            = new Private;
+    p->date           = date;
+    p->mediaType      = mediaType;
+    p->name           = name;
+    p->desc           = desc;
+    p->size           = size;
+    p->rangeSupported = rangeSupported;
+    p->hasSize        = hasSize;
+    p->range          = range;
+    p->hashes         = hashes;
+    p->thumbnail      = thumbnail;
+    p->amplitudes     = amplitudes;
+
+    d = p;
+}
+
+QDomElement File::toXml(QDomDocument *doc) const
+{
+    if (!isValid() || d->hashes.isEmpty()) {
+        return QDomElement();
+    }
+    QDomElement el = doc->createElementNS(NS, QStringLiteral("file"));
+    if (d->date.isValid()) {
+        el.appendChild(XMLHelper::textTag(*doc, DATE_TAG, d->date.toString(Qt::ISODate)));
+    }
+    if (d->desc.size()) {
+        el.appendChild(XMLHelper::textTag(*doc, DESC_TAG, d->desc));
+    }
+    for (const auto &h : d->hashes) {
+        el.appendChild(h.toXml(doc));
+    }
+    if (d->mediaType.size()) {
+        el.appendChild(XMLHelper::textTag(*doc, MEDIA_TYPE_TAG, d->mediaType));
+    }
+    if (d->name.size()) {
+        el.appendChild(XMLHelper::textTag(*doc, NAME_TAG, d->name));
+    }
+    if (d->hasSize) {
+        el.appendChild(XMLHelper::textTag(*doc, SIZE_TAG, qint64(d->size)));
+    }
+    if (d->rangeSupported || d->range.isValid()) {
+        el.appendChild(d->range.toXml(doc));
+    }
+    if (d->thumbnail.isValid()) {
+        el.appendChild(d->thumbnail.toXml(doc));
+    }
+    if (d->amplitudes.size()) {
+        el.appendChild(XMLHelper::textTagNS(doc, AMPLITUDES_NS, AMPLITUDES_TAG, d->amplitudes));
+    }
+    return el;
+}
+
+bool File::merge(const File &other)
+{
+    if (!d->thumbnail.isValid()) {
+        d->thumbnail = other.thumbnail();
+    }
+    for (auto const &h : other.d->hashes) {
+        auto it = std::find_if(d->hashes.constBegin(), d->hashes.constEnd(),
+                               [&h](auto const &v) { return h.type() == v.type(); });
+        if (it == d->hashes.constEnd()) {
+            d->hashes.append(h);
+        } else if (h.data() != it->data()) {
+            return false; // hashes are different
+        }
+    }
+    return true;
+}
+
+bool File::hasComputedHashes() const
+{
+    if (!d)
+        return false;
+    for (auto const &h : d->hashes) {
+        if (h.data().size())
+            return true;
+    }
+    return false;
+}
+
+bool File::hasSize() const { return d->hasSize; }
+
+QDateTime File::date() const { return d ? d->date : QDateTime(); }
+
+QString File::description() const { return d ? d->desc : QString(); }
+
+QList<Hash> File::hashes() const { return d ? d->hashes : QList<Hash>(); }
+QList<Hash> File::computedHashes() const
+{
+    QList<Hash> ret;
+    if (!d)
+        return ret;
+    for (auto const &h : d->hashes) {
+        if (h.data().size())
+            ret.append(h);
+    }
+    return ret;
+}
+
+Hash File::hash(Hash::Type t) const
+{
+    if (d && d->hashes.count()) {
+        if (t == Hash::Unknown)
+            return d->hashes.at(0);
+        for (auto const &h : d->hashes) {
+            if (h.type() == t) {
+                return h;
+            }
+        }
+    }
+    return Hash();
+}
+
+QString File::mediaType() const { return d ? d->mediaType : QString(); }
+
+QString File::name() const { return d ? d->name : QString(); }
+
+std::uint64_t File::size() const { return d ? d->size : 0; }
+
+Range File::range() const { return d ? d->range : Range(); }
+
+Thumbnail File::thumbnail() const { return d ? d->thumbnail : Thumbnail(); }
+
+QByteArray File::amplitudes() const { return d ? d->amplitudes : QByteArray(); }
+
+void File::setDate(const QDateTime &date) { ensureD()->date = date; }
+
+void File::setDescription(const QString &desc) { ensureD()->desc = desc; }
+
+void File::addHash(const Hash &hash) { ensureD()->hashes.append(hash); }
+
+void File::setHashes(const QList<Hash> &hashes) { ensureD()->hashes = hashes; }
+
+void File::setMediaType(const QString &mediaType) { ensureD()->mediaType = mediaType; }
+
+void File::setName(const QString &name) { ensureD()->name = name; }
+
+void File::setSize(std::uint64_t size)
+{
+    ensureD()->size = size;
+    d->hasSize      = true;
+}
+
+void File::setRange(const Range &range)
+{
+    ensureD()->range  = range;
+    d->rangeSupported = true;
+}
+
+void File::setThumbnail(const Thumbnail &thumb) { ensureD()->thumbnail = thumb; }
+
+void File::setAmplitudes(const QByteArray &amplitudes) { d->amplitudes = amplitudes; }
+
+File::Private *File::ensureD()
+{
+    if (!d) {
+        d = new Private;
+    }
+    return d.data();
+}
+
+//----------------------------------------------------------------------------
+// FileHasher
+//----------------------------------------------------------------------------
+class FileHasher::Private {
+public:
+    QThread    thread;
+    StreamHash streamHash;
+    Hash       result;
+
+    Private(Hash::Type hashType) : streamHash(hashType) { }
+};
+
+FileHasher::FileHasher(Hash::Type type) : d(new Private(type))
+{
+    QSemaphore sem;
+    moveToThread(&d->thread);
+    QObject::connect(&d->thread, &QThread::started, this, [&sem]() { sem.release(); });
+    d->thread.start();
+    sem.acquire();
+}
+
+FileHasher::~FileHasher()
+{
+    if (d->thread.isRunning()) {
+        addData(); // ensure exit called
+        d->thread.wait();
+    }
+}
+
+void FileHasher::addData(const QByteArray &data)
+{
+    QTimer::singleShot(0, this, [data, this]() {
+        // executed in a thread
+        d->streamHash.addData(data);
+        if (data.isEmpty()) {
+            d->result = d->streamHash.final();
+            thread()->exit();
+        }
+    });
+    if (data.isEmpty())
+        d->thread.wait();
+}
+
+Hash FileHasher::result()
+{
+    if (d->thread.isRunning()) {
+        addData(); // ensure exit called
+        d->thread.wait();
+    }
+    return d->result;
+}
+
+}
diff --git a/src/xmpp/xmpp-im/jingle-file.h b/src/xmpp/xmpp-im/jingle-file.h
new file mode 100644
index 00000000..2dc3cd1b
--- /dev/null
+++ b/src/xmpp/xmpp-im/jingle-file.h
@@ -0,0 +1,103 @@
+/*
+ * jignle-file.h - Jingle file usually used in file transfer
+ * Copyright (C) 2019  Sergey Ilinykh
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef XMPP_JINGLE_FILETRANSFER_FILE_H
+#define XMPP_JINGLE_FILETRANSFER_FILE_H
+
+#include "xmpp_hash.h"
+#include "xmpp_thumbs.h"
+
+#include <QDateTime>
+#include <QObject>
+
+namespace XMPP::Jingle::FileTransfer {
+struct Range {
+    std::int64_t offset = 0;
+    std::int64_t length = 0; // 0 - from offset to the end of the file
+    QList<Hash>  hashes;
+
+    inline Range() { }
+    inline Range(std::int64_t offset, std::int64_t length) : offset(offset), length(length) { }
+    inline bool isValid() const { return hashes.size() || offset || length; }
+    inline      operator bool() const { return isValid(); }
+    QDomElement toXml(QDomDocument *doc) const;
+};
+
+class File {
+public:
+    File();
+    File(const File &other);
+    File(const QDomElement &file);
+    ~File();
+    File &      operator=(const File &other);
+    inline bool isValid() const { return d != nullptr; }
+    QDomElement toXml(QDomDocument *doc) const;
+    bool        merge(const File &other);
+    bool        hasComputedHashes() const;
+    bool        hasSize() const;
+
+    QDateTime   date() const;
+    QString     description() const;
+    QList<Hash> hashes() const;
+    QList<Hash> computedHashes() const;
+    Hash        hash(Hash::Type t = Hash::Unknown) const;
+    QString     mediaType() const;
+    QString     name() const;
+    uint64_t    size() const;
+    Range       range() const;
+    Thumbnail   thumbnail() const;
+    QByteArray  amplitudes() const;
+
+    void setDate(const QDateTime &date);
+    void setDescription(const QString &desc);
+    void addHash(const Hash &hash);
+    void setHashes(const QList<Hash> &hashes);
+    void setMediaType(const QString &mediaType);
+    void setName(const QString &name);
+    void setSize(uint64_t size);
+    void setRange(const Range &range = Range()); // default empty just to indicate it's supported
+    void setThumbnail(const Thumbnail &thumb);
+    void setAmplitudes(const QByteArray &amplitudes);
+
+private:
+    class Private;
+    Private *                   ensureD();
+    QSharedDataPointer<Private> d;
+};
+
+class FileHasher : public QObject {
+    Q_OBJECT
+public:
+    FileHasher(Hash::Type type);
+    ~FileHasher();
+
+    /**
+     * @brief addData add next portion of data for hash computation.
+     * @param data to be added to hash function. if empty it will signal hashing thread to exit
+     */
+    void addData(const QByteArray &data = QByteArray());
+    Hash result();
+
+private:
+    class Private;
+    std::unique_ptr<Private> d;
+};
+}
+
+#endif // XMPP_JINGLE_FILETRANSFER_FILE_H
diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 526d0f06..67f63f09 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -30,7 +30,9 @@
 #include <QRandomGenerator>
 #endif
 #include <QDeadlineTimer>
+#include <QFileInfo>
 #include <QMetaObject>
+#include <QMimeDatabase>
 #include <QPointer>
 #include <QSemaphore>
 #include <QThread>
@@ -44,321 +46,11 @@ using namespace std::chrono_literals;
 namespace XMPP { namespace Jingle { namespace FileTransfer {
 
     const QString  NS               = QStringLiteral("urn:xmpp:jingle:apps:file-transfer:5");
-    const QString  AMPLITUDES_NS    = QStringLiteral("urn:audio:amplitudes");
-    constexpr auto RECEIVED_TIMEOUT = 30s;
+    constexpr auto FINALIZE_TIMEOUT = 30s;
 
     // tags
-    static const QString AMPLITUDES_TAG = QStringLiteral("amplitudes");
-    static const QString FILETAG        = QStringLiteral("file");
-    static const QString DATE_TAG       = QStringLiteral("date");
-    static const QString DESC_TAG       = QStringLiteral("desc");
-    static const QString MEDIA_TYPE_TAG = QStringLiteral("media-type");
-    static const QString NAME_TAG       = QStringLiteral("name");
-    static const QString SIZE_TAG       = QStringLiteral("size");
-    static const QString RANGE_TAG      = QStringLiteral("range");
-    static const QString THUMBNAIL_TAG  = QStringLiteral("thumbnail");
-    static const QString CHECKSUM_TAG   = QStringLiteral("checksum");
-    static const QString RECEIVED_TAG   = QStringLiteral("received");
-
-    QDomElement Range::toXml(QDomDocument *doc) const
-    {
-        auto r = doc->createElement(RANGE_TAG);
-        if (length) {
-            r.setAttribute(QStringLiteral("length"), QString::number(length));
-        }
-        if (offset) {
-            r.setAttribute(QStringLiteral("offset"), QString::number(offset));
-        }
-        for (auto const &h : hashes) {
-            auto hel = h.toXml(doc);
-            if (!hel.isNull()) {
-                r.appendChild(hel);
-            }
-        }
-        return r;
-    }
-
-    //----------------------------------------------------------------------------
-    // File
-    //----------------------------------------------------------------------------
-    class File::Private : public QSharedData {
-    public:
-        bool        rangeSupported = false;
-        bool        hasSize        = false;
-        QDateTime   date;
-        QString     mediaType;
-        QString     name;
-        QString     desc;
-        qint64      size = 0;
-        Range       range;
-        QList<Hash> hashes;
-        Thumbnail   thumbnail;
-        QByteArray  amplitudes;
-    };
-
-    File::File() { }
-
-    File::~File() { }
-
-    File &File::operator=(const File &other)
-    {
-        d = other.d;
-        return *this;
-    }
-
-    File::File(const File &other) : d(other.d) { }
-
-    File::File(const QDomElement &file)
-    {
-        QDateTime   date;
-        QString     mediaType;
-        QString     name;
-        QString     desc;
-        qint64      size           = 0;
-        bool        rangeSupported = false;
-        bool        hasSize        = false;
-        Range       range;
-        QList<Hash> hashes;
-        Thumbnail   thumbnail;
-        QByteArray  amplitudes;
-
-        bool ok;
-
-        for (QDomElement ce = file.firstChildElement(); !ce.isNull(); ce = ce.nextSiblingElement()) {
-
-            if (ce.tagName() == DATE_TAG) {
-                date = QDateTime::fromString(ce.text().left(19), Qt::ISODate);
-                if (!date.isValid()) {
-                    return;
-                }
-
-            } else if (ce.tagName() == MEDIA_TYPE_TAG) {
-                mediaType = ce.text();
-
-            } else if (ce.tagName() == NAME_TAG) {
-                name = ce.text();
-
-            } else if (ce.tagName() == SIZE_TAG) {
-                size = ce.text().toLongLong(&ok);
-                if (!ok || size < 0) {
-                    return;
-                }
-                hasSize = true;
-
-            } else if (ce.tagName() == RANGE_TAG) {
-                if (ce.hasAttribute(QLatin1String("offset"))) {
-                    range.offset = ce.attribute(QLatin1String("offset")).toLongLong(&ok);
-                    if (!ok || range.offset < 0) {
-                        return;
-                    }
-                }
-                if (ce.hasAttribute(QLatin1String("length"))) {
-                    range.length = ce.attribute(QLatin1String("length")).toLongLong(&ok);
-                    if (!ok || range.length <= 0) { // length should absent if we need to read till end of file.
-                                                    // 0-length is nonsense
-                        return;
-                    }
-                }
-                QDomElement hashEl = ce.firstChildElement(QLatin1String("hash"));
-                for (; !hashEl.isNull(); hashEl = hashEl.nextSiblingElement(QLatin1String("hash"))) {
-                    if (hashEl.namespaceURI() == HASH_NS) {
-                        auto hash = Hash(hashEl);
-                        if (hash.type() == Hash::Type::Unknown) {
-                            continue;
-                        }
-                        range.hashes.append(hash);
-                    }
-                }
-                rangeSupported = true;
-
-            } else if (ce.tagName() == DESC_TAG) {
-                desc = ce.text();
-
-            } else if (ce.tagName() == QLatin1String("hash")) {
-                if (ce.namespaceURI() == HASH_NS) {
-                    Hash h(ce);
-                    if (h.type() == Hash::Type::Unknown) {
-                        return;
-                    }
-                    hashes.append(h);
-                }
-
-            } else if (ce.tagName() == QLatin1String("hash-used")) {
-                if (ce.namespaceURI() == HASH_NS) {
-                    Hash h(ce);
-                    if (h.type() == Hash::Type::Unknown) {
-                        return;
-                    }
-                    hashes.append(h);
-                }
-
-            } else if (ce.tagName() == THUMBNAIL_TAG) {
-                thumbnail = Thumbnail(ce);
-            } else if (ce.tagName() == AMPLITUDES_TAG && ce.namespaceURI() == AMPLITUDES_NS) {
-                amplitudes = QByteArray::fromBase64(ce.text().toLatin1());
-            }
-        }
-
-        auto p            = new Private;
-        p->date           = date;
-        p->mediaType      = mediaType;
-        p->name           = name;
-        p->desc           = desc;
-        p->size           = size;
-        p->rangeSupported = rangeSupported;
-        p->hasSize        = hasSize;
-        p->range          = range;
-        p->hashes         = hashes;
-        p->thumbnail      = thumbnail;
-        p->amplitudes     = amplitudes;
-
-        d = p;
-    }
-
-    QDomElement File::toXml(QDomDocument *doc) const
-    {
-        if (!isValid() || d->hashes.isEmpty()) {
-            return QDomElement();
-        }
-        QDomElement el = doc->createElementNS(NS, QStringLiteral("file"));
-        if (d->date.isValid()) {
-            el.appendChild(XMLHelper::textTag(*doc, DATE_TAG, d->date.toString(Qt::ISODate)));
-        }
-        if (d->desc.size()) {
-            el.appendChild(XMLHelper::textTag(*doc, DESC_TAG, d->desc));
-        }
-        for (const auto &h : d->hashes) {
-            el.appendChild(h.toXml(doc));
-        }
-        if (d->mediaType.size()) {
-            el.appendChild(XMLHelper::textTag(*doc, MEDIA_TYPE_TAG, d->mediaType));
-        }
-        if (d->name.size()) {
-            el.appendChild(XMLHelper::textTag(*doc, NAME_TAG, d->name));
-        }
-        if (d->hasSize) {
-            el.appendChild(XMLHelper::textTag(*doc, SIZE_TAG, d->size));
-        }
-        if (d->rangeSupported || d->range.isValid()) {
-            el.appendChild(d->range.toXml(doc));
-        }
-        if (d->thumbnail.isValid()) {
-            el.appendChild(d->thumbnail.toXml(doc));
-        }
-        if (d->amplitudes.size()) {
-            el.appendChild(XMLHelper::textTagNS(doc, AMPLITUDES_NS, AMPLITUDES_TAG, d->amplitudes));
-        }
-        return el;
-    }
-
-    bool File::merge(const File &other)
-    {
-        if (!d->thumbnail.isValid()) {
-            d->thumbnail = other.thumbnail();
-        }
-        for (auto const &h : other.d->hashes) {
-            auto it = std::find_if(d->hashes.constBegin(), d->hashes.constEnd(),
-                                   [&h](auto const &v) { return h.type() == v.type(); });
-            if (it == d->hashes.constEnd()) {
-                d->hashes.append(h);
-            } else if (h.data() != it->data()) {
-                return false; // hashes are different
-            }
-        }
-        return true;
-    }
-
-    bool File::hasComputedHashes() const
-    {
-        if (!d)
-            return false;
-        for (auto const &h : d->hashes) {
-            if (h.data().size())
-                return true;
-        }
-        return false;
-    }
-
-    bool File::hasSize() const { return d->hasSize; }
-
-    QDateTime File::date() const { return d ? d->date : QDateTime(); }
-
-    QString File::description() const { return d ? d->desc : QString(); }
-
-    QList<Hash> File::hashes() const { return d ? d->hashes : QList<Hash>(); }
-    QList<Hash> File::computedHashes() const
-    {
-        QList<Hash> ret;
-        if (!d)
-            return ret;
-        for (auto const &h : d->hashes) {
-            if (h.data().size())
-                ret.append(h);
-        }
-        return ret;
-    }
-
-    Hash File::hash(Hash::Type t) const
-    {
-        if (d && d->hashes.count()) {
-            if (t == Hash::Unknown)
-                return d->hashes.at(0);
-            for (auto const &h : d->hashes) {
-                if (h.type() == t) {
-                    return h;
-                }
-            }
-        }
-        return Hash();
-    }
-
-    QString File::mediaType() const { return d ? d->mediaType : QString(); }
-
-    QString File::name() const { return d ? d->name : QString(); }
-
-    qint64 File::size() const { return d ? d->size : 0; }
-
-    Range File::range() const { return d ? d->range : Range(); }
-
-    Thumbnail File::thumbnail() const { return d ? d->thumbnail : Thumbnail(); }
-
-    QByteArray File::amplitudes() const { return d ? d->amplitudes : QByteArray(); }
-
-    void File::setDate(const QDateTime &date) { ensureD()->date = date; }
-
-    void File::setDescription(const QString &desc) { ensureD()->desc = desc; }
-
-    void File::addHash(const Hash &hash) { ensureD()->hashes.append(hash); }
-
-    void File::setHashes(const QList<Hash> &hashes) { ensureD()->hashes = hashes; }
-
-    void File::setMediaType(const QString &mediaType) { ensureD()->mediaType = mediaType; }
-
-    void File::setName(const QString &name) { ensureD()->name = name; }
-
-    void File::setSize(qint64 size)
-    {
-        ensureD()->size = size;
-        d->hasSize      = true;
-    }
-
-    void File::setRange(const Range &range)
-    {
-        ensureD()->range  = range;
-        d->rangeSupported = true;
-    }
-
-    void File::setThumbnail(const Thumbnail &thumb) { ensureD()->thumbnail = thumb; }
-
-    void File::setAmplitudes(const QByteArray &amplitudes) { d->amplitudes = amplitudes; }
-
-    File::Private *File::ensureD()
-    {
-        if (!d) {
-            d = new Private;
-        }
-        return d.data();
-    }
+    static const QString CHECKSUM_TAG = QStringLiteral("checksum");
+    static const QString RECEIVED_TAG = QStringLiteral("received");
 
     //----------------------------------------------------------------------------
     // Checksum
@@ -372,7 +64,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
 
     QDomElement Checksum::toXml(QDomDocument *doc) const
     {
-        auto el = ContentBase::toXml(doc, "checksum");
+        auto el = ContentBase::toXml(doc, "checksum", NS);
         if (!el.isNull()) {
             el.appendChild(file.toXml(doc));
         }
@@ -382,7 +74,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
     //----------------------------------------------------------------------------
     // Received
     //----------------------------------------------------------------------------
-    QDomElement Received::toXml(QDomDocument *doc) const { return ContentBase::toXml(doc, "received"); }
+    QDomElement Received::toXml(QDomDocument *doc) const { return ContentBase::toXml(doc, RECEIVED_TAG, NS); }
 
     //----------------------------------------------------------------------------
     // ApplicationManager
@@ -427,65 +119,6 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
                                                   | TransportFeature::DataOriented);
     }
 
-    //----------------------------------------------------------------------------
-    // FileHasher
-    //----------------------------------------------------------------------------
-    class FileHasher::Private {
-    public:
-        std::uint64_t  startPos;
-        std::uint64_t  size;
-        QDeadlineTimer timer;
-        QThread        thread;
-        StreamHash     streamHash;
-
-        Private(std::uint64_t startPos, Hash::Type hashType) : startPos(startPos), streamHash(hashType) { }
-    };
-
-    FileHasher::FileHasher(std::uint64_t startPos, Hash::Type type) : d(new Private(startPos, type))
-    {
-        QSemaphore sem;
-        moveToThread(&d->thread);
-        QObject::connect(&d->thread, &QThread::started, this, [&sem]() { sem.release(); });
-        d->thread.start();
-        sem.acquire();
-    }
-
-    FileHasher::~FileHasher()
-    {
-        if (d->thread.isRunning()) {
-            addData(); // ensure exit called
-            d->thread.wait();
-        }
-    }
-
-    void FileHasher::addData(const QByteArray &data)
-    {
-        QTimer::singleShot(0, this, [data, this]() {
-            // executed in a thread
-            bool needDump = data.isEmpty() || d->timer.hasExpired();
-            d->size += data.size();
-            d->streamHash.addData(data);
-            if (needDump) {
-                auto h = d->streamHash.final();
-                if (!h.isValid())
-                    return;
-
-                Range range(d->startPos, d->size);
-                range.hashes << h;
-                emit hashReady(range);
-                d->startPos += d->size;
-                d->size = 0;
-                if (!data.isEmpty())
-                    d->streamHash.restart();
-            }
-
-            if (data.isEmpty()) // finalizing data
-                thread()->exit();
-        });
-        if (data.isEmpty())
-            d->thread.wait();
-    }
-
     //----------------------------------------------------------------------------
     // Application
     //----------------------------------------------------------------------------
@@ -513,8 +146,9 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
         QIODevice *         device    = nullptr;
         qint64              bytesLeft = 0;
         QList<Hash>         outgoingChecksum;
-        qint64              outgoingChecksumRangeOffset = 0, outgoingChecksumRangeLength = 0;
-        QTimer *            receivedTimer = nullptr;
+        QList<Hash>         incomingChecksum;
+        QTimer *            finalizeTimer = nullptr;
+        FileHasher *        hasher        = nullptr;
 
         void setState(State s)
         {
@@ -550,20 +184,49 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
 
         void expectReceived()
         {
-            if (receivedTimer || q->state() == State::Finished)
-                return;
-            receivedTimer = new QTimer(q);
-            receivedTimer->setSingleShot(true);
-            receivedTimer->setInterval(RECEIVED_TIMEOUT);
-            q->connect(receivedTimer, &QTimer::timeout, q, [this]() {
+            qDebug("waiting for <received>");
+            expectFinalize([this]() {
                 qDebug("Waiting for <received> timed out. But likely succeeded anyway");
                 onReceived();
             });
         }
 
+        void expectFinalize(std::function<void()> &&timeoutCallback)
+        {
+            if (finalizeTimer || q->state() == State::Finished)
+                return;
+            finalizeTimer = new QTimer(q);
+            finalizeTimer->setSingleShot(true);
+            finalizeTimer->setInterval(FINALIZE_TIMEOUT);
+            q->connect(finalizeTimer, &QTimer::timeout, q, timeoutCallback);
+        }
+
+        void setDevice(QIODevice *dev, bool closeOnFinish)
+        {
+            device              = dev;
+            closeDeviceOnFinish = closeOnFinish;
+            if (file.hash().isValid() && file.hash().data().isEmpty() && file.range().hashes.isEmpty()) {
+                // no precomputated hashes
+                hasher = new FileHasher(file.hash().type());
+            }
+            if (q->senders() == q->pad()->session()->role()) {
+                writeNextBlockToTransport();
+            } else {
+                readNextBlockFromTransport();
+            }
+        }
+
         void writeNextBlockToTransport()
         {
             if (!(endlessRange || bytesLeft)) {
+                if (hasher) {
+                    auto hash = hasher->result();
+                    if (hash.isValid()) {
+                        outgoingChecksum << hash;
+                        emit q->updated();
+                        return;
+                    }
+                }
                 expectReceived();
                 return; // everything is written
             }
@@ -583,13 +246,24 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
             if (data.isEmpty()) {
                 if (endlessRange) {
                     lastReason = Reason(Reason::Condition::Success);
+                    if (hasher) {
+                        auto hash = hasher->result();
+                        if (hash.isValid()) {
+                            outgoingChecksum << hash;
+                            emit q->updated();
+                            return;
+                        }
+                    }
                     setState(State::Finished);
                 } else {
                     handleStreamFail();
                 }
                 return;
             }
-            qDebug("JINGLE-FT write %d bytes to connection", data.size());
+            // qDebug("JINGLE-FT write %d bytes to connection", data.size());
+            if (hasher) {
+                hasher->addData(data);
+            }
             if (connection->features() & TransportFeature::MessageOriented) {
                 if (!connection->writeDatagram(data)) {
                     handleStreamFail();
@@ -622,11 +296,14 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
                     }
                     data = connection->read(sz);
                 }
-                qDebug("JINGLE-FT read %d bytes from connection", data.size());
+                // qDebug("JINGLE-FT read %d bytes from connection", data.size());
                 if (data.isEmpty()) {
                     handleStreamFail();
                     return;
                 }
+                if (hasher) {
+                    hasher->addData(data);
+                }
                 if (device->write(data) == -1) {
                     handleStreamFail();
                     return;
@@ -635,12 +312,13 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
                 bytesLeft -= data.size();
             }
             if (!bytesLeft) {
-                // TODO send <received>
-                lastReason = Reason(Reason::Condition::Success);
-                setState(State::Finished);
+                tryFinalizeIncoming();
             }
         }
 
+        bool amISender() const { return q->senders() == q->pad()->session()->role(); }
+        bool amIReceiver() const { return q->senders() != q->pad()->session()->role(); }
+
         void onConnectionConnected(Connection::Ptr newConnection)
         {
             qDebug("jingle-ft: connected. ready to send user data");
@@ -648,41 +326,87 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
             lastReason = Reason();
             lastError.reset();
 
-            if (!streamingMode) {
-                connect(connection.data(), &Connection::readyRead, q, [this]() {
-                    if (!device) {
-                        return;
-                    }
-                    if (q->pad()->session()->role() != q->senders()) {
-                        readNextBlockFromTransport();
+            if (streamingMode) {
+                setState(State::Active);
+                emit q->connectionReady();
+                return;
+            }
+
+            connect(connection.data(), &Connection::readyRead, q, [this]() {
+                if (!device) {
+                    return;
+                }
+                if (q->pad()->session()->role() != q->senders()) {
+                    readNextBlockFromTransport();
+                }
+            });
+            connect(
+                connection.data(), &Connection::bytesWritten, q,
+                [this](qint64 bytes) {
+                    Q_UNUSED(bytes)
+                    if (q->pad()->session()->role() == q->senders() && !connection->bytesToWrite()) {
+                        writeNextBlockToTransport();
                     }
-                });
-                connect(
-                    connection.data(), &Connection::bytesWritten, q,
-                    [this](qint64 bytes) {
-                        Q_UNUSED(bytes)
-                        if (q->pad()->session()->role() == q->senders() && !connection->bytesToWrite()) {
-                            writeNextBlockToTransport();
-                        }
-                    },
-                    Qt::QueuedConnection);
+                },
+                Qt::QueuedConnection);
+
+            if (amIReceiver()) {
+                connect(connection.data(), &Connection::disconnected, q, [this]() { tryFinalizeIncoming(); });
             }
 
             setState(State::Active);
-            if (!streamingMode) {
-                if (acceptFile.range().isValid()) {
-                    bytesLeft = acceptFile.range().length;
-                    if (!bytesLeft)
-                        endlessRange = true;
-                    emit q->deviceRequested(acceptFile.range().offset, bytesLeft);
-                } else {
-                    bytesLeft = acceptFile.size();
-                    emit q->deviceRequested(0, bytesLeft);
-                }
+            if (acceptFile.range().isValid()) {
+                bytesLeft = acceptFile.range().length;
+                if (!bytesLeft)
+                    endlessRange = true;
+                emit q->deviceRequested(acceptFile.range().offset, bytesLeft);
             } else {
-                emit q->connectionReady();
+                bytesLeft = acceptFile.size();
+                emit q->deviceRequested(0, bytesLeft);
             }
         }
+
+        void tryFinalizeIncoming()
+        {
+            if (q->_state == State::Finished || outgoingReceived || streamingMode)
+                return;
+            if (connection->isOpen() && bytesLeft)
+                return;
+
+            // data read finished. check other stuff
+            if (hasher && incomingChecksum.isEmpty()) {
+                qDebug("waiting for <checksum>");
+                expectFinalize([this]() {
+                    qDebug("Waiting for <checksum> timed out. But likely succeeded anyway");
+                    lastReason = Reason(Reason::Condition::Success);
+                    setState(State::Finished);
+                });
+                return;
+            }
+            if (hasher) {
+                auto expectedHash = hasher->result();
+                bool found        = false;
+                for (auto const &h : qAsConst(incomingChecksum)) {
+                    if (h.type() != expectedHash.type())
+                        continue;
+                    if (h == expectedHash) {
+                        qDebug("hurray! checksum matched!");
+                        lastReason = Reason(Reason::Condition::Success);
+                    } else {
+                        qDebug("failure! checksum mismatch! expected %s != %s", qPrintable(expectedHash.toString()),
+                               qPrintable(h.toString()));
+                        lastReason = Reason(Reason::Condition::MediaError, "checksum mismatch");
+                    }
+                    found = true;
+                    break;
+                }
+                if (!found)
+                    qDebug("haven't found %s checksum withing received checksums",
+                           qPrintable(expectedHash.stringType()));
+            }
+            outgoingReceived = true;
+            emit q->updated();
+        }
     };
 
     Application::Application(const QSharedPointer<Pad> &pad, const QString &contentName, Origin creator,
@@ -698,7 +422,11 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
             new NSTransportsList(pad->session(), static_cast<Manager *>(pad->manager())->availableTransports()));
     }
 
-    Application::~Application() { qDebug("jingle-ft: destroyed"); }
+    Application::~Application()
+    {
+        delete d->hasher;
+        qDebug("jingle-ft: destroyed");
+    }
 
     void Application::setState(State state) { d->setState(state); }
 
@@ -781,6 +509,30 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
 
     void Application::setFile(const File &file) { d->file = file; }
 
+    void Application::setFile(const QFileInfo &fi, const QString &description, const Thumbnail &thumb)
+    {
+        QMimeDatabase mimeDb;
+
+        auto hash = Hash::fastestHash(pad()->session()->peerFeatures());
+        if (hash.isValid() && fi.size() < 10e6) { // compute hash dynamically (in a thread) for large files
+            QFile f(fi.absoluteFilePath());
+            f.open(QIODevice::ReadOnly);
+            hash.compute(&f);
+            f.close();
+        }
+
+        File file;
+        file.setDate(fi.lastModified());
+        file.setDescription(description);
+        file.addHash(hash);
+        file.setMediaType(mimeDb.mimeTypeForFile(fi).name());
+        file.setName(fi.fileName());
+        file.setRange(); // indicate range support
+        file.setSize(quint64(fi.size()));
+        file.setThumbnail(thumb);
+        d->file = file;
+    }
+
     File Application::file() const { return d->file; }
 
     File Application::acceptFile() const { return d->acceptFile; }
@@ -796,6 +548,12 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
 
     void Application::setStreamingMode(bool mode)
     {
+        Q_ASSERT(_senders != _pad->session()->role());
+        if (_senders == _pad->session()->role()) {
+            qCritical("streaming mode is implmented only for receiving, not sending");
+            remove(Reason::GeneralError, "unsupported file sender streaming mode");
+            return;
+        }
         if (_state <= State::Connecting) {
             d->streamingMode = mode;
         }
@@ -828,18 +586,16 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
         if (_update.action == Action::SessionInfo && (d->outgoingChecksum.size() > 0 || d->outgoingReceived)) {
             if (d->outgoingReceived) {
                 d->outgoingReceived = false;
-                ContentBase cb(_pad->session()->role(), _contentName);
-                return OutgoingUpdate { QList<QDomElement>() << cb.toXml(doc, "received", NS),
+                Received received(creator(), _contentName);
+                return OutgoingUpdate { QList<QDomElement>() << received.toXml(doc),
                                         [this](bool) { d->setState(State::Finished); } };
             }
             if (!d->outgoingChecksum.isEmpty()) {
                 ContentBase cb(_pad->session()->role(), _contentName);
                 File        f;
-                if (d->outgoingChecksumRangeOffset || d->outgoingChecksumRangeLength) {
-                    Range r;
+                if (d->file.range().isValid()) {
+                    Range r  = d->file.range();
                     r.hashes = d->outgoingChecksum;
-                    r.offset = d->outgoingChecksumRangeOffset;
-                    r.length = d->outgoingChecksumRangeLength;
                     f.setRange(r);
                 } else {
                     f.setHashes(d->outgoingChecksum);
@@ -847,7 +603,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
                 auto el = cb.toXml(doc, "checksum", NS);
                 el.appendChild(f.toXml(doc));
                 d->outgoingChecksum.clear();
-                return OutgoingUpdate { QList<QDomElement>() << el, [this](bool) { d->setState(State::Finished); } };
+                return OutgoingUpdate { QList<QDomElement>() << el, [this](bool) { d->expectReceived(); } };
             }
         }
         if (_update.action == Action::ContentAdd && _creator == _pad->session()->role()) {
@@ -917,21 +673,20 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
             emit updated();
             return;
         }
-        d->device              = dev;
-        d->closeDeviceOnFinish = closeOnFinish;
-        if (_senders == _pad->session()->role()) {
-            d->writeNextBlockToTransport();
-        } else {
-            d->readNextBlockFromTransport();
-        }
+        d->setDevice(dev, closeOnFinish);
     }
 
     Connection::Ptr Application::connection() const { return d->connection.staticCast<XMPP::Jingle::Connection>(); }
 
     void Application::incomingChecksum(const QList<Hash> &hashes)
     {
-        // TODO
         qDebug("got checksum: %s", qPrintable(hashes.value(0).toString()));
+        if (!d->hasher || _senders != _pad->session()->peerRole()) {
+            qDebug("unexpected incoming checksum. was it negotiated?");
+            return;
+        }
+        d->incomingChecksum = hashes;
+        d->tryFinalizeIncoming();
     }
 
     void Application::incomingReceived()
@@ -967,22 +722,27 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
         return name;
     }
 
-    bool Pad::incomingSessionInfo(const QDomElement &el)
+    bool Pad::incomingSessionInfo(const QDomElement &jingle)
     {
-        if (el.tagName() == CHECKSUM_TAG) {
-            Checksum checksum(el);
-            auto     app = session()->content(checksum.name, checksum.creator);
-            if (app) {
-                static_cast<Application *>(app)->incomingChecksum(checksum.file.hashes());
-            }
-            return true;
-        } else if (el.tagName() == RECEIVED_TAG) {
-            Received received(el);
-            auto     app = session()->content(received.name, received.creator);
-            if (app) {
-                static_cast<Application *>(app)->incomingReceived();
+        for (auto el = jingle.firstChildElement(); !el.isNull(); el = el.nextSiblingElement()) {
+            if (el.tagName() == CHECKSUM_TAG) {
+                Checksum checksum(el);
+                auto     app = session()->content(checksum.name, checksum.creator);
+                if (app) {
+                    static_cast<Application *>(app)->incomingChecksum(checksum.file.hashes());
+                }
+                return true;
+            } else if (el.tagName() == RECEIVED_TAG) {
+                Received received(el);
+                auto     app = session()->content(received.name, received.creator);
+                if (app) {
+                    static_cast<Application *>(app)->incomingReceived();
+                }
+                return true;
+            } else {
+                // TODO report actual error
+                qDebug("unknown session-info: %s", qPrintable(el.tagName()));
             }
-            return true;
         }
         return false;
     }
diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index f0f80817..7d4a7969 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -21,6 +21,7 @@
 #define JINGLEFT_H
 
 #include "jingle-application.h"
+#include "jingle-file.h"
 #include "jingle.h"
 #include "xmpp_hash.h"
 
@@ -34,80 +35,6 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
     extern const QString NS;
     class Manager;
 
-    struct Range {
-        qint64      offset = 0;
-        qint64      length = 0; // 0 - from offset to the end of the file
-        QList<Hash> hashes;
-
-        inline Range() { }
-        inline Range(qint64 offset, qint64 length) : offset(offset), length(length) { }
-        inline bool isValid() const { return hashes.size() || offset || length; }
-        inline      operator bool() const { return isValid(); }
-        QDomElement toXml(QDomDocument *doc) const;
-    };
-
-    class File {
-    public:
-        File();
-        File(const File &other);
-        File(const QDomElement &file);
-        ~File();
-        File &      operator=(const File &other);
-        inline bool isValid() const { return d != nullptr; }
-        QDomElement toXml(QDomDocument *doc) const;
-        bool        merge(const File &other);
-        bool        hasComputedHashes() const;
-        bool        hasSize() const;
-
-        QDateTime   date() const;
-        QString     description() const;
-        QList<Hash> hashes() const;
-        QList<Hash> computedHashes() const;
-        Hash        hash(Hash::Type t = Hash::Unknown) const;
-        QString     mediaType() const;
-        QString     name() const;
-        qint64      size() const;
-        Range       range() const;
-        Thumbnail   thumbnail() const;
-        QByteArray  amplitudes() const;
-
-        void setDate(const QDateTime &date);
-        void setDescription(const QString &desc);
-        void addHash(const Hash &hash);
-        void setHashes(const QList<Hash> &hashes);
-        void setMediaType(const QString &mediaType);
-        void setName(const QString &name);
-        void setSize(qint64 size);
-        void setRange(const Range &range = Range()); // default empty just to indicate it's supported
-        void setThumbnail(const Thumbnail &thumb);
-        void setAmplitudes(const QByteArray &amplitudes);
-
-    private:
-        class Private;
-        Private *                   ensureD();
-        QSharedDataPointer<Private> d;
-    };
-
-    class FileHasher : public QObject {
-        Q_OBJECT
-    public:
-        FileHasher(std::uint64_t startPos, Hash::Type type);
-        ~FileHasher();
-
-        /**
-         * @brief addData add next portion of data for hash computation.
-         * @param data to be added to hash function. if empty it will signal hashing thread to exit
-         */
-        void addData(const QByteArray &data = QByteArray());
-
-    signals:
-        void hashReady(const XMPP::Jingle::FileTransfer::Range &range);
-
-    private:
-        class Private;
-        std::unique_ptr<Private> d;
-    };
-
     class Checksum : public ContentBase {
     public:
         inline Checksum() { }
@@ -119,6 +46,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
     };
 
     class Received : public ContentBase {
+    public:
         using ContentBase::ContentBase;
         QDomElement toXml(QDomDocument *doc) const;
     };
@@ -166,6 +94,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
         void                              start() override;
 
         void setFile(const File &file);
+        void setFile(const QFileInfo &fi, const QString &description, const Thumbnail &thumb);
         File file() const;
         File acceptFile() const;
 
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index ef64a31d..f91d35ee 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -680,7 +680,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
                 },
                 Qt::QueuedConnection); // signal is not DOR-SS
             q->connect(ice, &Ice176::readyRead, q, [this](int componentIndex) {
-                qDebug("ICE readyRead");
+                // qDebug("ICE readyRead");
                 auto  buf       = ice->readDatagram(componentIndex);
                 auto &component = components[componentIndex];
                 if (component.dtls) {
diff --git a/src/xmpp/xmpp-im/jingle-sctp-association_p.cpp b/src/xmpp/xmpp-im/jingle-sctp-association_p.cpp
index 151bc649..0bd62226 100644
--- a/src/xmpp/xmpp-im/jingle-sctp-association_p.cpp
+++ b/src/xmpp/xmpp-im/jingle-sctp-association_p.cpp
@@ -77,7 +77,7 @@ namespace XMPP { namespace Jingle { namespace SCTP {
 
     void AssociationPrivate::OnSctpAssociationSendData(RTC::SctpAssociation *, const uint8_t *data, size_t len)
     {
-        qDebug("jignle-sctp: on outgoing data");
+        // qDebug("jignle-sctp: on outgoing data");
         QByteArray bytes((char *)data, len);
         QMetaObject::invokeMethod(this, "onOutgoingData", Q_ARG(QByteArray, bytes));
     }
@@ -85,7 +85,7 @@ namespace XMPP { namespace Jingle { namespace SCTP {
     void AssociationPrivate::OnSctpAssociationMessageReceived(RTC::SctpAssociation *, uint16_t streamId, uint32_t ppid,
                                                               const uint8_t *msg, size_t len)
     {
-        qDebug("jignle-sctp: on incoming data");
+        // qDebug("jignle-sctp: on incoming data");
         QByteArray bytes((char *)msg, len);
         QMetaObject::invokeMethod(this, "onIncomingData", Q_ARG(QByteArray, bytes), Q_ARG(quint16, streamId),
                                   Q_ARG(quint32, ppid));
@@ -93,7 +93,7 @@ namespace XMPP { namespace Jingle { namespace SCTP {
 
     void AssociationPrivate::OnSctpAssociationBufferedAmount(RTC::SctpAssociation *sctpAssociation, uint32_t len)
     {
-        qDebug("jignle-sctp: on buffered data: %d", len);
+        // qDebug("jignle-sctp: on buffered data: %d", len);
         Q_UNUSED(sctpAssociation);
         Q_UNUSED(len);
         if (!dumpingOutogingBuffer)
@@ -150,7 +150,7 @@ namespace XMPP { namespace Jingle { namespace SCTP {
     bool AssociationPrivate::write(const QByteArray &data, quint16 streamId, quint32 ppid, Reliability reliable,
                                    bool ordered, quint32 reliability)
     {
-        qDebug("jignle-sctp: write %d bytes on stream %u with ppid %u", data.size(), streamId, ppid);
+        // qDebug("jignle-sctp: write %d bytes on stream %u with ppid %u", data.size(), streamId, ppid);
         RTC::DataConsumer consumer;
         consumer.sctpParameters.streamId          = streamId;
         consumer.sctpParameters.ordered           = ordered; // ordered=true also enables reliability
diff --git a/src/xmpp/xmpp-im/jingle-sctp.cpp b/src/xmpp/xmpp-im/jingle-sctp.cpp
index 4b828a3e..ddf1a730 100644
--- a/src/xmpp/xmpp-im/jingle-sctp.cpp
+++ b/src/xmpp/xmpp-im/jingle-sctp.cpp
@@ -109,14 +109,14 @@ namespace XMPP { namespace Jingle { namespace SCTP {
 
     QByteArray Association::readOutgoing()
     {
-        SCTP_DEBUG("read outgoing");
+        // SCTP_DEBUG("read outgoing");
         std::lock_guard<std::mutex> lock(d->mutex);
         return d->outgoingPacketsQueue.isEmpty() ? QByteArray() : d->outgoingPacketsQueue.dequeue();
     }
 
     void Association::writeIncoming(const QByteArray &data)
     {
-        SCTP_DEBUG("write incoming");
+        // SCTP_DEBUG("write incoming");
         d->assoc.ProcessSctpData(reinterpret_cast<const uint8_t *>(data.data()), data.size());
     }
 
diff --git a/src/xmpp/xmpp-im/jingle-session.cpp b/src/xmpp/xmpp-im/jingle-session.cpp
index 68e1d025..ad5cb7ad 100644
--- a/src/xmpp/xmpp-im/jingle-session.cpp
+++ b/src/xmpp/xmpp-im/jingle-session.cpp
@@ -1036,6 +1036,8 @@ namespace XMPP { namespace Jingle {
 
     Origin Session::peerRole() const { return negateOrigin(d->role); }
 
+    Features Session::peerFeatures() const { return d->manager->client()->capsManager()->disco(peer()).features(); }
+
     bool Session::checkPeerCaps(const QString &ns) const
     {
         return d->manager->client()->capsManager()->disco(peer()).features().test(QStringList() << ns);
diff --git a/src/xmpp/xmpp-im/jingle-session.h b/src/xmpp/xmpp-im/jingle-session.h
index bc619a21..a3df3ce1 100644
--- a/src/xmpp/xmpp-im/jingle-session.h
+++ b/src/xmpp/xmpp-im/jingle-session.h
@@ -22,6 +22,7 @@
 
 #include "jingle-application.h"
 #include "jingle-transport.h"
+#include "xmpp_features.h"
 
 namespace XMPP { namespace Jingle {
 
@@ -46,10 +47,12 @@ namespace XMPP { namespace Jingle {
         Jid     responder() const;
         QString sid() const;
 
-        Origin role() const; // my role in session: initiator or responder
-        Origin peerRole() const;
-        bool   checkPeerCaps(const QString &ns) const;
-        bool   isGroupingAllowed() const;
+        Origin   role() const; // my role in session: initiator or responder
+        Origin   peerRole() const;
+        bool     checkPeerCaps(const QString &ns) const;
+        Features peerFeatures() const;
+
+        bool isGroupingAllowed() const;
 
         XMPP::Stanza::Error lastError() const;
 
diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index 1ea3d19a..887f279a 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -312,13 +312,12 @@ namespace XMPP { namespace Jingle {
         disposition = el.attribute(QLatin1String("disposition")); // if empty, it's "session"
     }
 
-    QDomElement ContentBase::toXml(QDomDocument *doc, const char *tagName, const QString &ns) const
+    QDomElement ContentBase::toXml(QDomDocument *doc, const QString &tagName, const QString &ns) const
     {
         if (!isValid()) {
             return QDomElement();
         }
-        auto el = ns.isEmpty() ? doc->createElement(QLatin1String(tagName))
-                               : doc->createElementNS(ns, QLatin1String(tagName));
+        auto el = ns.isEmpty() ? doc->createElement(tagName) : doc->createElementNS(ns, tagName);
         setCreatorAttr(el, creator);
         el.setAttribute(QLatin1String("name"), name);
 
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index ef0c3656..a5d79bf4 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -270,7 +270,11 @@ namespace Jingle {
 
         inline bool isValid() const { return creator != Origin::None && !name.isEmpty(); }
 
-        QDomElement   toXml(QDomDocument *doc, const char *tagName, const QString &ns = QString()) const;
+        inline QDomElement toXml(QDomDocument *doc, const char *tagName, const QString &ns = QString()) const
+        {
+            return toXml(doc, QLatin1String(tagName), ns);
+        }
+        QDomElement   toXml(QDomDocument *doc, const QString &tagName, const QString &ns = QString()) const;
         static Origin creatorAttr(const QDomElement &el);
         static bool   setCreatorAttr(QDomElement &el, Origin creator);
 
diff --git a/src/xmpp/xmpp-im/xmpp_features.cpp b/src/xmpp/xmpp-im/xmpp_features.cpp
index 8c28cadf..1731a754 100644
--- a/src/xmpp/xmpp-im/xmpp_features.cpp
+++ b/src/xmpp/xmpp-im/xmpp_features.cpp
@@ -79,6 +79,8 @@ bool Features::test(const QStringList &ns) const
 
 bool Features::test(const QSet<QString> &ns) const { return _list.contains(ns); }
 
+bool Features::test(const QString &ns) const { return _list.contains(ns); }
+
 #define FID_MULTICAST "http://jabber.org/protocol/address"
 bool Features::hasMulticast() const
 {
diff --git a/src/xmpp/xmpp-im/xmpp_features.h b/src/xmpp/xmpp-im/xmpp_features.h
index e536b4c1..6849ded1 100644
--- a/src/xmpp/xmpp-im/xmpp_features.h
+++ b/src/xmpp/xmpp-im/xmpp_features.h
@@ -90,7 +90,8 @@ class Features {
     };
 
     // useful functions
-    inline bool test(const char *ns) const { return test(QSet<QString>() << QLatin1String(ns)); }
+    inline bool test(const char *ns) const { return test(QLatin1String(ns)); }
+    bool        test(const QString &) const;
     bool        test(const QStringList &) const;
     bool        test(const QSet<QString> &) const;
 
diff --git a/src/xmpp/xmpp-im/xmpp_hash.cpp b/src/xmpp/xmpp-im/xmpp_hash.cpp
index 9d67d555..3e58a87c 100644
--- a/src/xmpp/xmpp-im/xmpp_hash.cpp
+++ b/src/xmpp/xmpp-im/xmpp_hash.cpp
@@ -26,6 +26,7 @@
 #include <QFileInfo>
 #include <qca.h>
 
+#include <array>
 #include <variant>
 
 namespace XMPP {
@@ -269,6 +270,25 @@ Hash Hash::from(const QStringRef &str)
     return hash;
 }
 
+Hash Hash::fastestHash(const Features &features)
+{
+    std::array  qcaAlgos = { "blake2b_512", "blake2b_256", "sha1", "sha512", "sha256", "sha3_256", "sha3_512" };
+    std::array  qcaMap   = { Blake2b512, Blake2b256, Sha1, Sha512, Sha256, Sha3_256, Sha3_512 };
+    QStringList priorityFeatures;
+    priorityFeatures.reserve(qcaAlgos.size());
+    for (auto t : qcaMap) {
+        priorityFeatures.append(QString(QLatin1String("urn:xmpp:hash-function-text-names:"))
+                                + QLatin1String(hashTypes[int(t)].text));
+        // REVIEW modify hashTypes with priority info instead?
+    }
+    for (std::size_t i = 0; i < qcaAlgos.size(); i++) {
+        if (QCA::isSupported(qcaAlgos[i]) && features.test(priorityFeatures[i])) {
+            return Hash(qcaMap[i]);
+        }
+    }
+    return Hash(); // qca is the fastest and it defintiely has sha1. so no reason to use qt or custom blake
+}
+
 class StreamHashPrivate {
 public:
     Hash::Type  type;
diff --git a/src/xmpp/xmpp-im/xmpp_hash.h b/src/xmpp/xmpp-im/xmpp_hash.h
index a94a7e2f..f8aa0267 100644
--- a/src/xmpp/xmpp-im/xmpp_hash.h
+++ b/src/xmpp/xmpp-im/xmpp_hash.h
@@ -77,6 +77,7 @@ class Hash {
     static Hash from(XMPP::Hash::Type t, QIODevice *dev);
     static Hash from(XMPP::Hash::Type t, const QFileInfo &file);
     static Hash from(const QStringRef &str); // e.g. sha1+aabccddeeffaabbcc232387539465923645
+    static Hash fastestHash(const Features &features);
 
 private:
     Type       v_type = Type::Unknown;

From 1599010d0ff7b73da3bff1f3c6d4cb0d1611fb1e Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 26 May 2021 12:23:51 +0300
Subject: [PATCH 325/383] report FT error on checksum mismatch

---
 src/xmpp/xmpp-im/jingle-ft.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 67f63f09..e33b7493 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -395,7 +395,8 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
                     } else {
                         qDebug("failure! checksum mismatch! expected %s != %s", qPrintable(expectedHash.toString()),
                                qPrintable(h.toString()));
-                        lastReason = Reason(Reason::Condition::MediaError, "checksum mismatch");
+                        q->remove(Reason::Condition::MediaError, "checksum mismatch");
+                        return;
                     }
                     found = true;
                     break;

From 64f31ebf4a2816dafe060d0f8b3b4d7091bb9b88 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 26 May 2021 16:00:22 +0300
Subject: [PATCH 326/383] Added XEP-215 support: External Service Discovery

---
 src/xmpp/CMakeLists.txt                       |   3 +
 .../xmpp-im/xmpp_externalservicediscovery.cpp | 120 ++++++++++++++++++
 .../xmpp-im/xmpp_externalservicediscovery.h   |  51 ++++++++
 3 files changed, 174 insertions(+)
 create mode 100644 src/xmpp/xmpp-im/xmpp_externalservicediscovery.cpp
 create mode 100644 src/xmpp/xmpp-im/xmpp_externalservicediscovery.h

diff --git a/src/xmpp/CMakeLists.txt b/src/xmpp/CMakeLists.txt
index 98962f73..9fa72cb2 100644
--- a/src/xmpp/CMakeLists.txt
+++ b/src/xmpp/CMakeLists.txt
@@ -59,6 +59,7 @@ set(HEADERS
     xmpp-im/xmpp_xdata.h
     xmpp-im/xmpp_xmlcommon.h
     xmpp-im/xmpp_encryption.h
+    xmpp-im/xmpp_externalservicediscovery.h
 
     base/randomnumbergenerator.h
     base/randrandomnumbergenerator.h
@@ -142,6 +143,8 @@ set(SOURCES
     xmpp-im/xmpp_xdata.cpp
     xmpp-im/xmpp_xmlcommon.cpp
     xmpp-im/xmpp_encryption.cpp
+    xmpp-im/xmpp_externalservicediscovery.cpp
+
     xmpp-im/jingle.cpp
     xmpp-im/jingle-connection.cpp
     xmpp-im/jingle-session.cpp
diff --git a/src/xmpp/xmpp-im/xmpp_externalservicediscovery.cpp b/src/xmpp/xmpp-im/xmpp_externalservicediscovery.cpp
new file mode 100644
index 00000000..1b0d5900
--- /dev/null
+++ b/src/xmpp/xmpp-im/xmpp_externalservicediscovery.cpp
@@ -0,0 +1,120 @@
+#include "xmpp_externalservicediscovery.h"
+
+#include "xmpp_client.h"
+#include "xmpp_jid.h"
+#include "xmpp_xmlcommon.h"
+
+namespace XMPP {
+
+JT_ExternalServiceDiscovery::JT_ExternalServiceDiscovery(Task *parent) : Task(parent) { }
+
+void JT_ExternalServiceDiscovery::getServices(const QString &type)
+{
+    type_ = type;
+    credHost_.clear(); // to indicate it's services request, not creds
+}
+
+void JT_ExternalServiceDiscovery::getCredentials(const QString &host, const QString &type, uint16_t port)
+{
+    Q_ASSERT(!host.isEmpty());
+    Q_ASSERT(!type.isEmpty());
+    credHost_ = host;
+    type_     = type;
+    credPort_ = port;
+}
+
+void JT_ExternalServiceDiscovery::onGo()
+{
+    QDomElement iq    = createIQ(doc(), "get", client()->jid().domain(), id());
+    QDomElement query = doc()->createElementNS(QLatin1String("urn:xmpp:extdisco:2"),
+                                               QLatin1String(credHost_.isEmpty() ? "services" : "credentials"));
+    if (credHost_.isEmpty()) {
+        if (!type_.isEmpty()) {
+            query.setAttribute(QLatin1String("type"), type_);
+        }
+    } else {
+        QDomElement service = doc()->createElement(QLatin1String("service"));
+        service.setAttribute(QLatin1String("host"), credHost_);
+        service.setAttribute(QLatin1String("type"), type_);
+        query.appendChild(service);
+    }
+    iq.appendChild(query);
+    send(iq);
+}
+
+bool JT_ExternalServiceDiscovery::take(const QDomElement &x)
+{
+    if (!iqVerify(x, Jid(QString(), client()->jid().domain()), id()))
+        return false;
+
+    if (x.attribute("type") == "result") {
+        auto query = x.firstChildElement(QLatin1String(credHost_.isEmpty() ? "services" : "credentials"));
+        if (query.namespaceURI() != QLatin1String("urn:xmpp:extdisco:2")) {
+            setError(0, QLatin1String("invalid namespace"));
+            return true;
+        }
+        QString serviceTag(QLatin1String("service"));
+        for (auto el = query.firstChildElement(serviceTag); !el.isNull(); el = el.nextSiblingElement(serviceTag)) {
+            services_.append(Service {});
+            auto &s = services_.last();
+            if (!s.parse(el)) {
+                services_.removeLast();
+            }
+        }
+        setSuccess();
+    } else {
+        setError(x);
+    }
+
+    return true;
+}
+
+bool JT_ExternalServiceDiscovery::Service::parse(QDomElement &el)
+{
+    QString actionOpt     = el.attribute(QLatin1String("action"));
+    QString expiresOpt    = el.attribute(QLatin1String("expires"));
+    name                  = el.attribute(QLatin1String("name"));
+    password              = el.attribute(QLatin1String("password"));
+    QString restrictedOpt = el.attribute(QLatin1String("restricted"));
+    transport             = el.attribute(QLatin1String("transport"));
+    username              = el.attribute(QLatin1String("username"));
+    host                  = el.attribute(QLatin1String("host"));
+    QString portReq       = el.attribute(QLatin1String("port"));
+    type                  = el.attribute(QLatin1String("type"));
+
+    bool ok;
+    if (host.isEmpty() || portReq.isEmpty() || type.isEmpty())
+        return false;
+
+    port = portReq.toUShort(&ok);
+    if (!ok)
+        return false;
+
+    if (!expiresOpt.isEmpty()) {
+        expires = QDateTime::fromString(el.text().left(19), Qt::ISODate);
+        if (!expires.isValid())
+            return false;
+    }
+
+    if (actionOpt.isEmpty()) {
+        if (actionOpt == QLatin1String("add"))
+            action = Action::Add;
+        else if (actionOpt == QLatin1String("modify"))
+            action = Action::Modify;
+        else if (actionOpt == QLatin1String("delete"))
+            action = Action::Delete;
+        else
+            return false;
+    }
+
+    if (!restrictedOpt.isEmpty()) {
+        if (restrictedOpt == QLatin1String("true"))
+            restricted = true;
+        if (restrictedOpt != QLatin1String("false"))
+            return false;
+    }
+
+    return true;
+}
+
+} // namespace XMPP
diff --git a/src/xmpp/xmpp-im/xmpp_externalservicediscovery.h b/src/xmpp/xmpp-im/xmpp_externalservicediscovery.h
new file mode 100644
index 00000000..0737a700
--- /dev/null
+++ b/src/xmpp/xmpp-im/xmpp_externalservicediscovery.h
@@ -0,0 +1,51 @@
+#ifndef XMPP_EXTERNALSERVICEDISCOVERY_H
+#define XMPP_EXTERNALSERVICEDISCOVERY_H
+
+#include "xmpp_task.h"
+
+#include <QDateTime>
+#include <QObject>
+
+namespace XMPP {
+
+// XEP-0215 0.7
+class JT_ExternalServiceDiscovery : public Task {
+    Q_OBJECT
+public:
+    enum class Action { Add, Delete, Modify };
+
+    struct Service {
+        Action    action = Action::Add;
+        QDateTime expires;            // optional
+        QString   host;               // required
+        QString   name;               // optional
+        QString   password;           // optional
+        QString   port;               // required
+        bool      restricted = false; // optional
+        QString   transport;          // optional
+        QString   type;               // required
+        QString   username;           // optional
+
+        bool parse(QDomElement &el);
+    };
+
+    explicit JT_ExternalServiceDiscovery(Task *parent = nullptr);
+
+    void                           getServices(const QString &type = QString());
+    void                           getCredentials(const QString &host, const QString &type, std::uint16_t port = 0);
+    inline const QVector<Service> &services() const { return services_; }
+
+    void onGo();
+    bool take(const QDomElement &);
+
+private:
+    std::uint16_t credPort_ = 0;
+    QString       credHost_;
+    QString       type_;
+
+    QVector<Service> services_; // result
+};
+
+} // namespace XMPP
+
+#endif // XMPP_EXTERNALSERVICEDISCOVERY_H

From 9f3eff01278ad25d45a51518c7d2e1c5e1bd13a3 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 26 May 2021 19:34:37 +0300
Subject: [PATCH 327/383] Use external service discovery in ICE jingle
 transport

---
 src/xmpp/xmpp-im/client.cpp                   |  50 +++---
 src/xmpp/xmpp-im/jingle-ice.cpp               | 148 +++++++++++-------
 src/xmpp/xmpp-im/xmpp_client.h                |  29 ++--
 .../xmpp-im/xmpp_externalservicediscovery.cpp |  52 ++++--
 .../xmpp-im/xmpp_externalservicediscovery.h   |  66 +++++---
 5 files changed, 216 insertions(+), 129 deletions(-)

diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
index f022f304..1e7d0917 100644
--- a/src/xmpp/xmpp-im/client.cpp
+++ b/src/xmpp/xmpp-im/client.cpp
@@ -78,6 +78,7 @@
 #include "tcpportreserver.h"
 #include "xmpp_bitsofbinary.h"
 #include "xmpp_caps.h"
+#include "xmpp_externalservicediscovery.h"
 #include "xmpp_hash.h"
 #include "xmpp_ibb.h"
 #include "xmpp_serverinfomanager.h"
@@ -130,22 +131,23 @@ class Client::ClientPrivate {
     bool                    active           = false;
     bool                    capsOptimization = false; // don't send caps every time
 
-    LiveRoster             roster;
-    ResourceList           resourceList;
-    CapsManager *          capsman               = nullptr;
-    TcpPortReserver *      tcpPortReserver       = nullptr;
-    S5BManager *           s5bman                = nullptr;
-    Jingle::S5B::Manager * jingleS5BManager      = nullptr;
-    Jingle::IBB::Manager * jingleIBBManager      = nullptr;
-    Jingle::ICE::Manager * jingleICEManager      = nullptr;
-    IBBManager *           ibbman                = nullptr;
-    BoBManager *           bobman                = nullptr;
-    FileTransferManager *  ftman                 = nullptr;
-    ServerInfoManager *    serverInfoManager     = nullptr;
-    HttpFileUploadManager *httpFileUploadManager = nullptr;
-    Jingle::Manager *      jingleManager         = nullptr;
-    QList<GroupChat>       groupChatList;
-    EncryptionHandler *    encryptionHandler = nullptr;
+    LiveRoster                roster;
+    ResourceList              resourceList;
+    CapsManager *             capsman                  = nullptr;
+    TcpPortReserver *         tcpPortReserver          = nullptr;
+    S5BManager *              s5bman                   = nullptr;
+    Jingle::S5B::Manager *    jingleS5BManager         = nullptr;
+    Jingle::IBB::Manager *    jingleIBBManager         = nullptr;
+    Jingle::ICE::Manager *    jingleICEManager         = nullptr;
+    IBBManager *              ibbman                   = nullptr;
+    BoBManager *              bobman                   = nullptr;
+    FileTransferManager *     ftman                    = nullptr;
+    ServerInfoManager *       serverInfoManager        = nullptr;
+    ExternalServiceDiscovery *externalServiceDiscovery = nullptr;
+    HttpFileUploadManager *   httpFileUploadManager    = nullptr;
+    Jingle::Manager *         jingleManager            = nullptr;
+    QList<GroupChat>          groupChatList;
+    EncryptionHandler *       encryptionHandler = nullptr;
 };
 
 Client::Client(QObject *par) : QObject(par)
@@ -170,8 +172,9 @@ Client::Client(QObject *par) : QObject(par)
 
     d->capsman = new CapsManager(this);
 
-    d->serverInfoManager     = new ServerInfoManager(this);
-    d->httpFileUploadManager = new HttpFileUploadManager(this);
+    d->serverInfoManager        = new ServerInfoManager(this);
+    d->externalServiceDiscovery = new ExternalServiceDiscovery(this);
+    d->httpFileUploadManager    = new HttpFileUploadManager(this);
 
     d->jingleManager = new Jingle::Manager(this);
     auto ft          = new Jingle::FileTransfer::Manager(this);
@@ -290,6 +293,8 @@ bool Client::capsOptimizationAllowed() const
 
 ServerInfoManager *Client::serverInfoManager() const { return d->serverInfoManager; }
 
+ExternalServiceDiscovery *Client::externalServiceDiscovery() const { return d->externalServiceDiscovery; }
+
 HttpFileUploadManager *Client::httpFileUploadManager() const { return d->httpFileUploadManager; }
 
 Jingle::Manager *Client::jingleManager() const { return d->jingleManager; }
@@ -299,7 +304,7 @@ bool Client::isActive() const { return d->active; }
 QString Client::groupChatPassword(const QString &host, const QString &room) const
 {
     Jid jid(room + "@" + host);
-    for (const GroupChat &i : d->groupChatList) {
+    for (const GroupChat &i : qAsConst(d->groupChatList)) {
         if (i.j.compare(jid, false)) {
             return i.password;
         }
@@ -367,7 +372,7 @@ void Client::groupChatSetStatus(const QString &host, const QString &room, const
 {
     Jid  jid(room + "@" + host);
     bool found = false;
-    for (const GroupChat &i : d->groupChatList) {
+    for (const GroupChat &i : qAsConst(d->groupChatList)) {
         if (i.j.compare(jid, false)) {
             found = true;
             jid   = i.j;
@@ -426,7 +431,7 @@ void Client::groupChatLeaveAll(const QString &statusStr)
 QString Client::groupChatNick(const QString &host, const QString &room) const
 {
     Jid jid(room + "@" + host);
-    for (const GroupChat &gc : d->groupChatList) {
+    for (const GroupChat &gc : qAsConst(d->groupChatList)) {
         if (gc.j.compare(jid, false)) {
             return gc.j.resource();
         }
@@ -841,7 +846,8 @@ void Client::pmMessage(const Message &m)
     debug(QString("Client: Message from %1\n").arg(m.from().full()));
 
     // bits of binary. we can't do this in Message, since it knows nothing about Client
-    for (const BoBData &b : m.bobDataList()) {
+    auto const &dataList = m.bobDataList();
+    for (const BoBData &b : dataList) {
         d->bobman->append(b);
     }
 
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index f91d35ee..2702367a 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -30,6 +30,7 @@
 #include "udpportreserver.h"
 #include "xmpp/jid/jid.h"
 #include "xmpp_client.h"
+#include "xmpp_externalservicediscovery.h"
 #include "xmpp_serverinfomanager.h"
 #include "xmpp_xmlcommon.h"
 
@@ -224,37 +225,6 @@ namespace XMPP { namespace Jingle { namespace ICE {
         }
     };
 
-    // TODO: reject offers that don't contain at least one of audio or video
-    // TODO: support candidate negotiations over the JingleRtpChannel thread
-    //   boundary, so we can change candidates after the stream is active
-
-    // scope values: 0 = local, 1 = link-local, 2 = private, 3 = public
-    static int getAddressScope(const QHostAddress &a)
-    {
-        if (a.protocol() == QAbstractSocket::IPv6Protocol) {
-            if (a == QHostAddress(QHostAddress::LocalHostIPv6))
-                return 0;
-            else if (XMPP::Ice176::isIPv6LinkLocalAddress(a))
-                return 1;
-        } else if (a.protocol() == QAbstractSocket::IPv4Protocol) {
-            quint32 v4 = a.toIPv4Address();
-            quint8  a0 = quint8(v4 >> 24);
-            quint8  a1 = quint8((v4 >> 16) & 0xff);
-            if (a0 == 127)
-                return 0;
-            else if (a0 == 169 && a1 == 254)
-                return 1;
-            else if (a0 == 10)
-                return 2;
-            else if (a0 == 172 && a1 >= 16 && a1 <= 31)
-                return 2;
-            else if (a0 == 192 && a1 == 168)
-                return 2;
-        }
-
-        return 3;
-    }
-
     class Resolver : public QObject {
         Q_OBJECT
         using QObject::QObject;
@@ -275,10 +245,11 @@ namespace XMPP { namespace Jingle { namespace ICE {
 
         static void resolve(QObject *parent, ResolveList list, std::function<void()> &&callback)
         {
-            auto resolver      = new Resolver(parent);
+            auto resolver      = new Resolver(parent); // will be deleted when all finished. see onOneFinished
             resolver->counter  = list.size();
             resolver->callback = callback;
             for (auto &item : list) {
+                // FIXME hosts may dup in the list. needs optimization
                 auto *dns = new NameResolver(parent);
 
                 connect(dns, &NameResolver::resultsReady, resolver,
@@ -503,8 +474,11 @@ namespace XMPP { namespace Jingle { namespace ICE {
         int          stunBindPort;
         int          stunRelayUdpPort;
         int          stunRelayTcpPort;
-
-        // QList<QSharedPointer<Connection>> channels;
+        QString      stunRelayUdpUser;
+        QString      stunRelayUdpPass;
+        QString      stunRelayTcpUser;
+        QString      stunRelayTcpPass;
+        // QString
 
         // udp stuff
         bool         udpInitialized;
@@ -605,18 +579,88 @@ namespace XMPP { namespace Jingle { namespace ICE {
             });
         }
 
-        void startIce()
+        void findStunAndTurn()
         {
-            auto manager = dynamic_cast<Manager *>(q->_pad->manager())->d.data();
+            auto extDisco = q->pad()->session()->manager()->client()->externalServiceDiscovery();
+
+            if (extDisco->isSupported()) {
+                extDisco->services(q, [this](const ExternalServiceList &services) {
+                    ExternalService::Ptr stun;
+                    ExternalService::Ptr turnUdp;
+                    ExternalService::Ptr turnTcp;
+                    for (auto const &s : qAsConst(services)) {
+                        if (s->type == QLatin1String("stun"))
+                            stun = s;
+                        else if (s->type == QLatin1String("turn")) {
+                            if (s->transport == QLatin1String("tcp"))
+                                turnTcp = s;
+                            else
+                                turnUdp = s;
+                        }
+                    }
+                    Resolver::ResolveList resList;
+                    if (stun) {
+                        stunBindAddr.setAddress(stun->host);
+                        stunBindPort = stun->port;
+                        if (stunBindAddr.isNull())
+                            resList.emplace_back(stun->host, std::ref(stunBindAddr));
+                    }
+                    if (turnTcp) {
+                        stunRelayTcpAddr.setAddress(turnTcp->host);
+                        stunRelayTcpPort = turnTcp->port;
+                        stunRelayTcpUser = turnTcp->username;
+                        stunRelayTcpPass = turnTcp->password;
+                        if (stunRelayTcpAddr.isNull())
+                            resList.emplace_back(turnTcp->host, std::ref(stunRelayTcpAddr));
+                    }
+                    if (turnUdp) {
+                        stunRelayUdpAddr.setAddress(turnUdp->host);
+                        stunRelayUdpPort = turnUdp->port;
+                        stunRelayUdpUser = turnUdp->username;
+                        stunRelayUdpPass = turnUdp->password;
+                        if (stunRelayUdpAddr.isNull())
+                            resList.emplace_back(turnUdp->host, std::ref(stunRelayUdpAddr));
+                    }
+                    if (resList.empty()) {
+                        startIce();
+                    } else {
+                        Resolver::resolve(q, resList, [this]() {
+                            qDebug("resolver finished");
+                            startIce();
+                        });
+                    }
+                });
+                return;
+            }
 
+            auto manager     = dynamic_cast<Manager *>(q->pad()->manager())->d.data();
             stunBindPort     = manager->stunBindPort;
             stunRelayUdpPort = manager->stunRelayUdpPort;
             stunRelayTcpPort = manager->stunRelayTcpPort;
+            stunRelayUdpUser = manager->stunRelayUdpUser;
+            stunRelayUdpPass = manager->stunRelayUdpPass;
+            stunRelayTcpUser = manager->stunRelayTcpUser;
+            stunRelayTcpPass = manager->stunRelayTcpPass;
+            Resolver::resolve(q,
+                              { { manager->extHost, std::ref(extAddr) },
+                                { manager->stunBindHost, std::ref(stunBindAddr) },
+                                { manager->stunRelayUdpHost, std::ref(stunRelayUdpAddr) },
+                                { manager->stunRelayTcpHost, std::ref(stunRelayTcpAddr) } },
+                              [this]() {
+                                  qDebug("resolver finished");
+                                  startIce();
+                              });
+        }
+
+        void startIce()
+        {
+            auto manager = dynamic_cast<Manager *>(q->_pad->manager())->d.data();
+
             if (!stunBindAddr.isNull() && stunBindPort > 0)
                 qDebug("STUN service: %s;%d", qPrintable(stunBindAddr.toString()), stunBindPort);
-            if (!stunRelayUdpAddr.isNull() && stunRelayUdpPort > 0 && !manager->stunRelayUdpUser.isEmpty())
+            if (!stunRelayUdpAddr.isNull() && stunRelayUdpPort > 0 && !stunRelayUdpUser.isEmpty())
                 qDebug("TURN w/ UDP service: %s;%d", qPrintable(stunRelayUdpAddr.toString()), stunRelayUdpPort);
-            if (!stunRelayTcpAddr.isNull() && stunRelayTcpPort > 0 && !manager->stunRelayTcpUser.isEmpty())
+            if (!stunRelayTcpAddr.isNull() && stunRelayTcpPort > 0 && !stunRelayTcpUser.isEmpty())
                 qDebug("TURN w/ TCP service: %s;%d", qPrintable(stunRelayTcpAddr.toString()), stunRelayTcpPort);
 
             auto listenAddrs = Ice176::availableNetworkAddresses();
@@ -734,16 +778,14 @@ namespace XMPP { namespace Jingle { namespace ICE {
 
             if (!stunBindAddr.isNull() && stunBindPort > 0)
                 ice->setStunBindService(stunBindAddr, stunBindPort);
-            if (!stunRelayUdpAddr.isNull() && !manager->stunRelayUdpUser.isEmpty())
-                ice->setStunRelayUdpService(stunRelayUdpAddr, stunRelayUdpPort, manager->stunRelayUdpUser,
-                                            manager->stunRelayUdpPass.toUtf8());
-            if (!stunRelayTcpAddr.isNull() && !manager->stunRelayTcpUser.isEmpty())
-                ice->setStunRelayTcpService(stunRelayTcpAddr, stunRelayTcpPort, manager->stunRelayTcpUser,
-                                            manager->stunRelayTcpPass.toUtf8());
-
-            // RTP+RTCP
-            ice->setComponentCount(components.count());
+            if (!stunRelayUdpAddr.isNull() && !stunRelayUdpUser.isEmpty())
+                ice->setStunRelayUdpService(stunRelayUdpAddr, stunRelayUdpPort, stunRelayUdpUser,
+                                            stunRelayUdpPass.toUtf8());
+            if (!stunRelayTcpAddr.isNull() && !stunRelayTcpUser.isEmpty())
+                ice->setStunRelayTcpService(stunRelayTcpAddr, stunRelayTcpPort, stunRelayTcpUser,
+                                            stunRelayTcpPass.toUtf8());
 
+            ice->setComponentCount(components.count());
             ice->setLocalFeatures(Ice176::Trickle);
 
             setupRemoteICE(*remoteState);
@@ -980,17 +1022,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
             }
         }
 
-        auto manager = dynamic_cast<Manager *>(_pad->manager())->d.data();
-        Resolver::resolve(this,
-                          { { manager->extHost, std::ref(d->extAddr) },
-                            { manager->stunBindHost, std::ref(d->stunBindAddr) },
-                            { manager->stunRelayUdpHost, std::ref(d->stunRelayUdpAddr) },
-                            { manager->stunRelayTcpHost, std::ref(d->stunRelayTcpAddr) } },
-                          [this]() {
-                              qDebug("resolver finished");
-                              d->startIce();
-                          });
-
+        d->findStunAndTurn();
         emit updated();
     }
 
diff --git a/src/xmpp/xmpp-im/xmpp_client.h b/src/xmpp/xmpp-im/xmpp_client.h
index edf83034..1b4f0265 100644
--- a/src/xmpp/xmpp-im/xmpp_client.h
+++ b/src/xmpp/xmpp-im/xmpp_client.h
@@ -55,6 +55,8 @@ class ServerInfoManager;
 class Stream;
 class Task;
 class TcpPortReserver;
+class ExternalServiceDiscovery;
+
 namespace Jingle {
     class Manager;
     namespace S5B {
@@ -140,19 +142,20 @@ class Client : public QObject {
     void            setCapsOptimizationAllowed(bool allowed);
     bool            capsOptimizationAllowed() const;
 
-    void                   setTcpPortReserver(TcpPortReserver *portReserver);
-    TcpPortReserver *      tcpPortReserver() const;
-    S5BManager *           s5bManager() const;
-    IBBManager *           ibbManager() const;
-    BoBManager *           bobManager() const;
-    JidLinkManager *       jidLinkManager() const;
-    CapsManager *          capsManager() const;
-    ServerInfoManager *    serverInfoManager() const;
-    HttpFileUploadManager *httpFileUploadManager() const;
-    Jingle::Manager *      jingleManager() const;
-    Jingle::S5B::Manager * jingleS5BManager() const;
-    Jingle::IBB::Manager * jingleIBBManager() const;
-    Jingle::ICE::Manager * jingleICEManager() const;
+    void                      setTcpPortReserver(TcpPortReserver *portReserver);
+    TcpPortReserver *         tcpPortReserver() const;
+    S5BManager *              s5bManager() const;
+    IBBManager *              ibbManager() const;
+    BoBManager *              bobManager() const;
+    JidLinkManager *          jidLinkManager() const;
+    CapsManager *             capsManager() const;
+    ServerInfoManager *       serverInfoManager() const;
+    ExternalServiceDiscovery *externalServiceDiscovery() const;
+    HttpFileUploadManager *   httpFileUploadManager() const;
+    Jingle::Manager *         jingleManager() const;
+    Jingle::S5B::Manager *    jingleS5BManager() const;
+    Jingle::IBB::Manager *    jingleIBBManager() const;
+    Jingle::ICE::Manager *    jingleICEManager() const;
 
     void                 setFileTransferEnabled(bool b);
     FileTransferManager *fileTransferManager() const;
diff --git a/src/xmpp/xmpp-im/xmpp_externalservicediscovery.cpp b/src/xmpp/xmpp-im/xmpp_externalservicediscovery.cpp
index 1b0d5900..a8f56bb5 100644
--- a/src/xmpp/xmpp-im/xmpp_externalservicediscovery.cpp
+++ b/src/xmpp/xmpp-im/xmpp_externalservicediscovery.cpp
@@ -2,6 +2,7 @@
 
 #include "xmpp_client.h"
 #include "xmpp_jid.h"
+#include "xmpp_serverinfomanager.h"
 #include "xmpp_xmlcommon.h"
 
 namespace XMPP {
@@ -55,10 +56,10 @@ bool JT_ExternalServiceDiscovery::take(const QDomElement &x)
         }
         QString serviceTag(QLatin1String("service"));
         for (auto el = query.firstChildElement(serviceTag); !el.isNull(); el = el.nextSiblingElement(serviceTag)) {
-            services_.append(Service {});
-            auto &s = services_.last();
-            if (!s.parse(el)) {
-                services_.removeLast();
+            // services_.append(ExternalService {});
+            auto s = std::make_shared<ExternalService>();
+            if (s->parse(el)) {
+                services_.append(s);
             }
         }
         setSuccess();
@@ -69,7 +70,7 @@ bool JT_ExternalServiceDiscovery::take(const QDomElement &x)
     return true;
 }
 
-bool JT_ExternalServiceDiscovery::Service::parse(QDomElement &el)
+bool ExternalService::parse(QDomElement &el)
 {
     QString actionOpt     = el.attribute(QLatin1String("action"));
     QString expiresOpt    = el.attribute(QLatin1String("expires"));
@@ -96,16 +97,14 @@ bool JT_ExternalServiceDiscovery::Service::parse(QDomElement &el)
             return false;
     }
 
-    if (actionOpt.isEmpty()) {
-        if (actionOpt == QLatin1String("add"))
-            action = Action::Add;
-        else if (actionOpt == QLatin1String("modify"))
-            action = Action::Modify;
-        else if (actionOpt == QLatin1String("delete"))
-            action = Action::Delete;
-        else
-            return false;
-    }
+    if (actionOpt.isEmpty() || actionOpt == QLatin1String("add"))
+        action = Action::Add;
+    else if (actionOpt == QLatin1String("modify"))
+        action = Action::Modify;
+    else if (actionOpt == QLatin1String("delete"))
+        action = Action::Delete;
+    else
+        return false;
 
     if (!restrictedOpt.isEmpty()) {
         if (restrictedOpt == QLatin1String("true"))
@@ -117,4 +116,27 @@ bool JT_ExternalServiceDiscovery::Service::parse(QDomElement &el)
     return true;
 }
 
+ExternalServiceDiscovery::ExternalServiceDiscovery(Client *client) : client_(client) { }
+
+bool ExternalServiceDiscovery::isSupported() const
+{
+    return client_->serverInfoManager()->features().test("urn:xmpp:extdisco:2");
+}
+
+void ExternalServiceDiscovery::services(QObject *ctx, ServicesCallback &&callback, const QString &type)
+{
+    if (!isSupported()) {
+        callback({});
+        return;
+    }
+
+    // TODO optimize me (get cache, check action, etc)
+    auto task = new JT_ExternalServiceDiscovery(client_->rootTask());
+    connect(task, &Task::finished, ctx, [this, task, cb = std::move(callback)]() {
+        services_ = task->services();
+        cb(services_);
+    });
+    task->getServices(type);
+}
+
 } // namespace XMPP
diff --git a/src/xmpp/xmpp-im/xmpp_externalservicediscovery.h b/src/xmpp/xmpp-im/xmpp_externalservicediscovery.h
index 0737a700..0afc6ca0 100644
--- a/src/xmpp/xmpp-im/xmpp_externalservicediscovery.h
+++ b/src/xmpp/xmpp-im/xmpp_externalservicediscovery.h
@@ -5,35 +5,39 @@
 
 #include <QDateTime>
 #include <QObject>
+#include <memory>
 
 namespace XMPP {
 
+struct ExternalService {
+    using Ptr = std::shared_ptr<ExternalService>;
+    enum Action { Add, Delete, Modify };
+
+    Action        action = Action::Add;
+    QDateTime     expires;            // optional
+    QString       host;               // required
+    QString       name;               // optional
+    QString       password;           // optional
+    std::uint16_t port;               // required
+    bool          restricted = false; // optional
+    QString       transport;          // optional
+    QString       type;               // required
+    QString       username;           // optional
+
+    bool parse(QDomElement &el);
+};
+
+using ExternalServiceList = QVector<ExternalService::Ptr>;
+
 // XEP-0215 0.7
 class JT_ExternalServiceDiscovery : public Task {
     Q_OBJECT
 public:
-    enum class Action { Add, Delete, Modify };
-
-    struct Service {
-        Action    action = Action::Add;
-        QDateTime expires;            // optional
-        QString   host;               // required
-        QString   name;               // optional
-        QString   password;           // optional
-        QString   port;               // required
-        bool      restricted = false; // optional
-        QString   transport;          // optional
-        QString   type;               // required
-        QString   username;           // optional
-
-        bool parse(QDomElement &el);
-    };
-
     explicit JT_ExternalServiceDiscovery(Task *parent = nullptr);
 
-    void                           getServices(const QString &type = QString());
-    void                           getCredentials(const QString &host, const QString &type, std::uint16_t port = 0);
-    inline const QVector<Service> &services() const { return services_; }
+    void                              getServices(const QString &type = QString());
+    void                              getCredentials(const QString &host, const QString &type, std::uint16_t port = 0);
+    inline const ExternalServiceList &services() const { return services_; }
 
     void onGo();
     bool take(const QDomElement &);
@@ -43,7 +47,27 @@ class JT_ExternalServiceDiscovery : public Task {
     QString       credHost_;
     QString       type_;
 
-    QVector<Service> services_; // result
+    ExternalServiceList services_; // result
+};
+
+class ExternalServiceDiscovery : public QObject {
+    Q_OBJECT
+public:
+    using ServicesCallback = std::function<void(const ExternalServiceList &)>;
+
+    ExternalServiceDiscovery(Client *client);
+
+    bool isSupported() const;
+    void services(QObject *ctx, ServicesCallback &&callback, const QString &type = QString());
+signals:
+    // server push signals only
+    void serviceAdded(ExternalService::Ptr);
+    void serviceDeleted(ExternalService::Ptr);
+    void serviceModified(ExternalService::Ptr);
+
+private:
+    Client *            client_;
+    ExternalServiceList services_;
 };
 
 } // namespace XMPP

From 3b9971d1962866279f0f7bf893b22a04ee0b0122 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 26 May 2021 20:31:38 +0300
Subject: [PATCH 328/383] Bug fixes to extdisco after testing

---
 src/xmpp/xmpp-im/xmpp_externalservicediscovery.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/xmpp/xmpp-im/xmpp_externalservicediscovery.cpp b/src/xmpp/xmpp-im/xmpp_externalservicediscovery.cpp
index a8f56bb5..3184700c 100644
--- a/src/xmpp/xmpp-im/xmpp_externalservicediscovery.cpp
+++ b/src/xmpp/xmpp-im/xmpp_externalservicediscovery.cpp
@@ -92,7 +92,7 @@ bool ExternalService::parse(QDomElement &el)
         return false;
 
     if (!expiresOpt.isEmpty()) {
-        expires = QDateTime::fromString(el.text().left(19), Qt::ISODate);
+        expires = QDateTime::fromString(expiresOpt.left(19), Qt::ISODate);
         if (!expires.isValid())
             return false;
     }
@@ -107,9 +107,9 @@ bool ExternalService::parse(QDomElement &el)
         return false;
 
     if (!restrictedOpt.isEmpty()) {
-        if (restrictedOpt == QLatin1String("true"))
+        if (restrictedOpt == QLatin1String("true") || restrictedOpt == QLatin1String("1"))
             restricted = true;
-        if (restrictedOpt != QLatin1String("false"))
+        else if (restrictedOpt != QLatin1String("false") && restrictedOpt != QLatin1String("0"))
             return false;
     }
 
@@ -137,6 +137,7 @@ void ExternalServiceDiscovery::services(QObject *ctx, ServicesCallback &&callbac
         cb(services_);
     });
     task->getServices(type);
+    task->go(true);
 }
 
 } // namespace XMPP

From e26f95d2d4d0358d08e9389c62859111962e8bab Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 26 May 2021 20:40:59 +0300
Subject: [PATCH 329/383] Publish urn:xmpp:extdisco:2 in disco

---
 src/xmpp/xmpp-im/client.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
index 1e7d0917..68f1f31a 100644
--- a/src/xmpp/xmpp-im/client.cpp
+++ b/src/xmpp/xmpp-im/client.cpp
@@ -1144,6 +1144,7 @@ DiscoItem Client::makeDiscoResult(const QString &node) const
     features.addFeature("urn:xmpp:time");
     features.addFeature("urn:xmpp:message-correct:0");
     features.addFeature("urn:xmpp:jingle:1");
+    features.addFeature("urn:xmpp:extdisco:2");
     features += d->jingleManager->discoFeatures();
 
     // TODO rather do foreach for all registered jingle apps and transports

From faaf9cdf2efbbee3314821d2c7f0176100353092 Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Fri, 28 May 2021 21:20:25 +0300
Subject: [PATCH 330/383] Partially removed qjdns support

---
 CMakeLists.txt             | 21 +--------------------
 src/irisnet/CMakeLists.txt | 13 ++-----------
 src/xmpp/CMakeLists.txt    |  4 ----
 3 files changed, 3 insertions(+), 35 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a3899428..12acf3b0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,12 +46,10 @@ set( CMAKE_MODULE_PATH
     )
 
 set( DEFAULT_BUNDLED_QCA OFF )
-if (APPLE)
+if (APPLE OR MSVC)
     set( DEFAULT_BUNDLED_QCA ON )
 endif()
 
-option( USE_QJDNS "Use qjdns/jdns library. Disabled by default for Qt5" OFF )
-option( SEPARATE_QJDNS "Build qjdns with iris library" OFF )
 option( JINGLE_SCTP "Enable SCTP over ICE Jingle transport / data channels" ON )
 option( BUNDLED_QCA "Adds: DTLS, Blake2b and other useful for XMPP crypto-stuff" ${DEFAULT_BUNDLED_QCA})
 option( BUILD_IRIS_TOOLS "Build tools and examples" OFF)
@@ -72,11 +70,6 @@ if(Qt5Core_FOUND)
     endif()
 endif()
 
-if(USE_QJDNS)
-    message(WARNING "USE_QJDNS flag is enabled with Qt5. If you have problems with connection please disable this flag")
-    add_definitions(-DNEED_JDNS)
-endif()
-
 if(BUNDLED_QCA)
     message(STATUS "QCA: using bundled")
     set(QCA_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qca)
@@ -165,18 +158,6 @@ if(JINGLE_SCTP)
     include(IrisSCTP)
 endif()
 
-if(NOT USE_QJDNS AND SEPARATE_QJDNS)
-    message(FATAL_ERROR "SEPARATE_QJDNS flag enabled, but USE_QJDNS flag disabled.\nPlease enable flag USE_QJDNS or disable both flags")
-endif()
-
-if(USE_QJDNS AND (NOT SEPARATE_QJDNS))
-    include(src/jdns.cmake)
-elseif(USE_QJDNS)
-    set(QJDns_SUFFIX -qt5)
-    find_package(QJDns REQUIRED)
-    set(QJDns_LIBRARY ${QJDns_LIBRARY} PARENT_SCOPE)
-    include_directories( ${QJDns_INCLUDE_DIR} )
-endif()
 
 if (NOT BUNDLED_QCA)
     find_package(B2 QUIET)
diff --git a/src/irisnet/CMakeLists.txt b/src/irisnet/CMakeLists.txt
index 0a5b0490..d9a2889a 100644
--- a/src/irisnet/CMakeLists.txt
+++ b/src/irisnet/CMakeLists.txt
@@ -38,6 +38,7 @@ set(SOURCES
     corelib/netinterface.cpp
     corelib/netnames.cpp
     corelib/objectsession.cpp
+    corelib/netinterface_qtname.cpp
     corelib/netinterface_qtnet.cpp
 
     noncore/iceagent.cpp
@@ -61,12 +62,6 @@ if(UNIX)
     list(APPEND SOURCES corelib/netinterface_unix.cpp)
 endif()
 
-if(NOT USE_QJDNS)
-    list(APPEND SOURCES corelib/netinterface_qtname.cpp)
-else()
-    list(APPEND SOURCES corelib/netnames_jdns.cpp)
-endif()
-
 set(HEADERS
     corelib/irisnetexport.h
     corelib/irisnetglobal.h
@@ -130,10 +125,6 @@ if(WIN32)
     set(EXTRA_LDFLAGS ws2_32 iphlpapi)
 endif()
 
-if(NOT USE_QJDNS)
-    set(QJDns_LIBRARY "")
-endif()
-
 target_compile_definitions(irisnet PRIVATE HAVE_QTNET)
 target_link_libraries(irisnet Qt5::Core Qt5::Network Qt5::Xml)
 if (BUNDLED_QCA)
@@ -141,7 +132,7 @@ if (BUNDLED_QCA)
 endif()
 target_link_libraries(irisnet ${qca_LIB})
 target_link_libraries(irisnet ${sctpLab_LIBRARY})
-target_link_libraries(irisnet ${QJDns_LIBRARY} ${EXTRA_LDFLAGS})
+target_link_libraries(irisnet ${EXTRA_LDFLAGS})
 
 # usrsctp requires pthread
 if(NOT WIN32)
diff --git a/src/xmpp/CMakeLists.txt b/src/xmpp/CMakeLists.txt
index 9fa72cb2..5c2814eb 100644
--- a/src/xmpp/CMakeLists.txt
+++ b/src/xmpp/CMakeLists.txt
@@ -224,10 +224,6 @@ else()
 endif()
 
 
-if( SEPARATE_QJDNS AND WIN32)
-    set(EXTRA_LDFLAGS ws2_32)
-endif()
-
 target_link_libraries(iris PRIVATE ${EXTRA_LDFLAGS} stringprep irisnet)
 target_link_libraries(iris PUBLIC ${ZLIB_LIBRARY} Qt5::Core Qt5::Gui Qt5::Network Qt5::Xml)
 target_link_libraries(iris PUBLIC ${qca_LIB})

From e817b5e40a7397bf86e8f279cd48fe1774151ad3 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 31 May 2021 15:40:38 +0300
Subject: [PATCH 331/383] Added STUN discovery service

---
 include/iris/iceabstractstundisco.h           |   1 +
 src/irisnet/CMakeLists.txt                    |   1 +
 src/irisnet/noncore/iceabstractstundisco.h    |  54 ++++
 src/xmpp/CMakeLists.txt                       |   2 +
 src/xmpp/xmpp-im/jingle-ice.cpp               |  97 ++++----
 src/xmpp/xmpp-im/stundisco.cpp                | 234 ++++++++++++++++++
 src/xmpp/xmpp-im/stundisco.h                  |  47 ++++
 .../xmpp-im/xmpp_externalservicediscovery.cpp | 128 ++++++++--
 .../xmpp-im/xmpp_externalservicediscovery.h   | 106 ++++++--
 9 files changed, 578 insertions(+), 92 deletions(-)
 create mode 100644 include/iris/iceabstractstundisco.h
 create mode 100644 src/irisnet/noncore/iceabstractstundisco.h
 create mode 100644 src/xmpp/xmpp-im/stundisco.cpp
 create mode 100644 src/xmpp/xmpp-im/stundisco.h

diff --git a/include/iris/iceabstractstundisco.h b/include/iris/iceabstractstundisco.h
new file mode 100644
index 00000000..e1ff2fd5
--- /dev/null
+++ b/include/iris/iceabstractstundisco.h
@@ -0,0 +1 @@
+#include "../../src/irisnet/noncore/iceabstractstundisco.h"
diff --git a/src/irisnet/CMakeLists.txt b/src/irisnet/CMakeLists.txt
index d9a2889a..4ba13f38 100644
--- a/src/irisnet/CMakeLists.txt
+++ b/src/irisnet/CMakeLists.txt
@@ -92,6 +92,7 @@ set(HEADERS
     noncore/udpportreserver.h
     noncore/tcpportreserver.h
     noncore/dtls.h
+    noncore/iceabstractstundisco.h
 
     noncore/cutestuff/bsocket.h
     noncore/cutestuff/bytestream.h
diff --git a/src/irisnet/noncore/iceabstractstundisco.h b/src/irisnet/noncore/iceabstractstundisco.h
new file mode 100644
index 00000000..8c09c0c2
--- /dev/null
+++ b/src/irisnet/noncore/iceabstractstundisco.h
@@ -0,0 +1,54 @@
+#ifndef XMPP_ABSTRACTSTUNDISCO_H
+#define XMPP_ABSTRACTSTUNDISCO_H
+
+#include <QDeadlineTimer>
+#include <QHostAddress>
+#include <QList>
+#include <QObject>
+
+#include <functional>
+
+namespace XMPP {
+
+/**
+ * Monitors if new STUN services are available, changed or not available anymore.
+ */
+class AbstractStunDiscoMonitor : public QObject {
+    Q_OBJECT
+public:
+    enum Transport : std::uint8_t { Tcp, Udp };
+    enum Flag : std::uint8_t { Relay = 0x01, Tls = 0x02, Restricted = 0x04 };
+    Q_DECLARE_FLAGS(Flags, Flag)
+
+    struct Service {
+        using Ptr = std::shared_ptr<Service>;
+        QString             name;
+        QString             username;
+        QString             password;
+        QString             host;
+        QList<QHostAddress> addresses;
+        std::uint16_t       port = 0;
+        Transport           transport;
+        Flags               flags;
+        QDeadlineTimer      expires;
+    };
+
+    using QObject::QObject;
+
+    /**
+     * Check where initial discovery is still in progress and therefore it's worth waiting for completion
+     */
+    virtual bool isDiscoInProgress() const = 0;
+
+Q_SIGNALS:
+    void discoFinished(); // if impl did rediscovery, it will signal when finished. required for initial start()
+    void serviceAdded(Service::Ptr);
+    void serviceRemoved(Service::Ptr);
+    void serviceModified(Service::Ptr);
+};
+
+} // namespace XMPP
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(XMPP::AbstractStunDiscoMonitor::Flags)
+
+#endif // XMPP_ABSTRACTSTUNDISCO_H
diff --git a/src/xmpp/CMakeLists.txt b/src/xmpp/CMakeLists.txt
index 5c2814eb..b72a8ef3 100644
--- a/src/xmpp/CMakeLists.txt
+++ b/src/xmpp/CMakeLists.txt
@@ -60,6 +60,7 @@ set(HEADERS
     xmpp-im/xmpp_xmlcommon.h
     xmpp-im/xmpp_encryption.h
     xmpp-im/xmpp_externalservicediscovery.h
+    xmpp-im/stundisco.h
 
     base/randomnumbergenerator.h
     base/randrandomnumbergenerator.h
@@ -144,6 +145,7 @@ set(SOURCES
     xmpp-im/xmpp_xmlcommon.cpp
     xmpp-im/xmpp_encryption.cpp
     xmpp-im/xmpp_externalservicediscovery.cpp
+    xmpp-im/stundisco.cpp
 
     xmpp-im/jingle.cpp
     xmpp-im/jingle-connection.cpp
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index 2702367a..f6289864 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -35,6 +35,7 @@
 #include "xmpp_xmlcommon.h"
 
 #include <array>
+#include <chrono>
 #include <memory>
 
 #include <QElapsedTimer>
@@ -582,54 +583,56 @@ namespace XMPP { namespace Jingle { namespace ICE {
         void findStunAndTurn()
         {
             auto extDisco = q->pad()->session()->manager()->client()->externalServiceDiscovery();
-
+            using namespace std::chrono_literals;
             if (extDisco->isSupported()) {
-                extDisco->services(q, [this](const ExternalServiceList &services) {
-                    ExternalService::Ptr stun;
-                    ExternalService::Ptr turnUdp;
-                    ExternalService::Ptr turnTcp;
-                    for (auto const &s : qAsConst(services)) {
-                        if (s->type == QLatin1String("stun"))
-                            stun = s;
-                        else if (s->type == QLatin1String("turn")) {
-                            if (s->transport == QLatin1String("tcp"))
-                                turnTcp = s;
-                            else
-                                turnUdp = s;
-                        }
-                    }
-                    Resolver::ResolveList resList;
-                    if (stun) {
-                        stunBindAddr.setAddress(stun->host);
-                        stunBindPort = stun->port;
-                        if (stunBindAddr.isNull())
-                            resList.emplace_back(stun->host, std::ref(stunBindAddr));
-                    }
-                    if (turnTcp) {
-                        stunRelayTcpAddr.setAddress(turnTcp->host);
-                        stunRelayTcpPort = turnTcp->port;
-                        stunRelayTcpUser = turnTcp->username;
-                        stunRelayTcpPass = turnTcp->password;
-                        if (stunRelayTcpAddr.isNull())
-                            resList.emplace_back(turnTcp->host, std::ref(stunRelayTcpAddr));
-                    }
-                    if (turnUdp) {
-                        stunRelayUdpAddr.setAddress(turnUdp->host);
-                        stunRelayUdpPort = turnUdp->port;
-                        stunRelayUdpUser = turnUdp->username;
-                        stunRelayUdpPass = turnUdp->password;
-                        if (stunRelayUdpAddr.isNull())
-                            resList.emplace_back(turnUdp->host, std::ref(stunRelayUdpAddr));
-                    }
-                    if (resList.empty()) {
-                        startIce();
-                    } else {
-                        Resolver::resolve(q, resList, [this]() {
-                            qDebug("resolver finished");
-                            startIce();
-                        });
-                    }
-                });
+                extDisco->services(q,
+                                   [this](const ExternalServiceList &services) {
+                                       ExternalService::Ptr stun;
+                                       ExternalService::Ptr turnUdp;
+                                       ExternalService::Ptr turnTcp;
+                                       for (auto const &s : qAsConst(services)) {
+                                           if (s->type == QLatin1String("stun"))
+                                               stun = s;
+                                           else if (s->type == QLatin1String("turn")) {
+                                               if (s->transport == QLatin1String("tcp"))
+                                                   turnTcp = s;
+                                               else
+                                                   turnUdp = s;
+                                           }
+                                       }
+                                       Resolver::ResolveList resList;
+                                       if (stun) {
+                                           stunBindAddr.setAddress(stun->host);
+                                           stunBindPort = stun->port;
+                                           if (stunBindAddr.isNull())
+                                               resList.emplace_back(stun->host, std::ref(stunBindAddr));
+                                       }
+                                       if (turnTcp) {
+                                           stunRelayTcpAddr.setAddress(turnTcp->host);
+                                           stunRelayTcpPort = turnTcp->port;
+                                           stunRelayTcpUser = turnTcp->username;
+                                           stunRelayTcpPass = turnTcp->password;
+                                           if (stunRelayTcpAddr.isNull())
+                                               resList.emplace_back(turnTcp->host, std::ref(stunRelayTcpAddr));
+                                       }
+                                       if (turnUdp) {
+                                           stunRelayUdpAddr.setAddress(turnUdp->host);
+                                           stunRelayUdpPort = turnUdp->port;
+                                           stunRelayUdpUser = turnUdp->username;
+                                           stunRelayUdpPass = turnUdp->password;
+                                           if (stunRelayUdpAddr.isNull())
+                                               resList.emplace_back(turnUdp->host, std::ref(stunRelayUdpAddr));
+                                       }
+                                       if (resList.empty()) {
+                                           startIce();
+                                       } else {
+                                           Resolver::resolve(q, resList, [this]() {
+                                               qDebug("resolver finished");
+                                               startIce();
+                                           });
+                                       }
+                                   },
+                                   5min, { "stun", "turn" });
                 return;
             }
 
diff --git a/src/xmpp/xmpp-im/stundisco.cpp b/src/xmpp/xmpp-im/stundisco.cpp
new file mode 100644
index 00000000..32b61757
--- /dev/null
+++ b/src/xmpp/xmpp-im/stundisco.cpp
@@ -0,0 +1,234 @@
+/*
+ * stundisco.cpp - STUN/TURN service discoverer
+ * Copyright (C) 2021  Sergey Ilinykh
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "stundisco.h"
+
+#include "netnames.h"
+#include "xmpp_client.h"
+#include "xmpp_externalservicediscovery.h"
+
+#include <chrono>
+
+namespace XMPP {
+
+class StunDiscoMonitor : public AbstractStunDiscoMonitor {
+    Q_OBJECT
+public:
+    using StunList = QList<AbstractStunDiscoMonitor::Service::Ptr>;
+
+    StunDiscoMonitor(StunDiscoManager *manager) : AbstractStunDiscoMonitor(manager), manager_(manager)
+    {
+        auto extdisco = manager->client()->externalServiceDiscovery();
+        connect(extdisco, &ExternalServiceDiscovery::serviceAdded, this,
+                [this](const ExternalServiceList &l) { addNewServices(l); });
+        connect(extdisco, &ExternalServiceDiscovery::serviceModified, this,
+                [this](const ExternalServiceList &l) { modifyServices(l); });
+        connect(extdisco, &ExternalServiceDiscovery::serviceDeleted, this,
+                [this](const ExternalServiceList &l) { deleteServices(l); });
+
+        QTimer::singleShot(0, this, &StunDiscoMonitor::disco);
+    }
+
+    bool isDiscoInProgress() const { return inProgress_; }
+
+private:
+    static QStringList supportedServiceTypes()
+    {
+        return QStringList(
+            { QStringLiteral("stun"), QStringLiteral("stuns"), QStringLiteral("turn"), QStringLiteral("turns") });
+    }
+
+    void disco()
+    {
+        using namespace std::chrono_literals;
+        manager_->client()->externalServiceDiscovery()->services(
+            this, [this](auto const &list) { addNewServices(list); }, 5min, supportedServiceTypes());
+    }
+
+    void addNewServices(const ExternalServiceList &list)
+    {
+        StunList needCreds;
+        StunList needResolve;
+        for (auto const &l : list) {
+            auto s = std::make_shared<AbstractStunDiscoMonitor::Service>();
+            if (l->type.startsWith(QLatin1String("turn")))
+                s->flags |= AbstractStunDiscoMonitor::Relay;
+            else if (!l->type.startsWith(QLatin1String("stun")))
+                continue;
+            if (l->type.endsWith(QLatin1Char('s')))
+                s->flags |= AbstractStunDiscoMonitor::Tls;
+            if (l->restricted)
+                s->flags |= AbstractStunDiscoMonitor::Restricted;
+            s->transport
+                = l->transport == QLatin1String("tcp") ? AbstractStunDiscoMonitor::Tcp : AbstractStunDiscoMonitor::Udp;
+            s->expires  = l->expires; // it's definitely not expired. no need to check
+            s->port     = l->port;
+            s->name     = l->name;
+            s->username = l->username;
+            s->password = l->password;
+            s->host     = l->host;
+            QHostAddress addr(l->host);
+            if (addr.isNull())
+                needResolve.append(s);
+            else
+                s->addresses.append(addr);
+            if (l->restricted && s->password.isEmpty()) {
+                needCreds.append(s);
+            } else if (!s->addresses.isEmpty()) {
+                emit serviceAdded(s);
+            } else
+                pendingWork_.append(s);
+        }
+        bool final = needResolve.isEmpty() && needCreds.isEmpty();
+        if (!needResolve.isEmpty())
+            resolve(needResolve);
+        if (!needCreds.isEmpty())
+            getCreds(needCreds);
+        if (final) {
+            emit discoFinished();
+            deleteLater();
+        }
+    }
+
+    void modifyServices(const ExternalServiceList &list)
+    {
+        Q_UNUSED(list);
+        // TODO
+    }
+    void deleteServices(const ExternalServiceList &list)
+    {
+        Q_UNUSED(list);
+        // TODO
+    }
+
+    static QString extType(AbstractStunDiscoMonitor::Service::Ptr s)
+    {
+        bool isTls = s->flags & AbstractStunDiscoMonitor::Tls;
+        return QLatin1String(s->flags & AbstractStunDiscoMonitor::Relay ? (isTls ? "turns" : "turn")
+                                                                        : (isTls ? "stuns" : "stun"));
+    }
+
+    void resolve(const StunList &services)
+    {
+        QSet<QString> names;
+        for (auto const &s : services)
+            names.insert(s->host);
+
+        for (auto const &name : names) {
+            auto *dns = new NameResolver(this);
+
+            connect(dns, &NameResolver::resultsReady, this, [this, name](const QList<XMPP::NameRecord> &records) {
+                QList<QHostAddress> addresses;
+                for (const auto &r : records)
+                    addresses.append(r.address());
+                setAddresses(name, addresses);
+            });
+            connect(dns, &NameResolver::error, this,
+                    [this, name](XMPP::NameResolver::Error) { setAddresses(name, {}); });
+
+            dns->start(name.toLatin1());
+        }
+    }
+
+    void setAddresses(const QString &host, const QList<QHostAddress> &addresses)
+    {
+        for (auto const &s : qAsConst(pendingWork_)) {
+            if (s->host == host && s->addresses.isEmpty()) {
+                if (addresses.isEmpty())
+                    s->expires = QDeadlineTimer(); // expired
+                else
+                    s->addresses = addresses;
+            }
+        }
+        tryFinish();
+    }
+
+    void getCreds(const StunList &services)
+    {
+        QSet<ExternalServiceId> ids;
+        for (auto const &s : services) {
+            ExternalServiceId id;
+            id.host = s->host;
+            id.port = s->port;
+            id.type = extType(s);
+            ids.insert(id);
+        }
+        manager_->client()->externalServiceDiscovery()->credentials(
+            this,
+            [services, this](const ExternalServiceList &resolved) {
+                if (pendingWork_.isEmpty())
+                    return; // we are finsihed already
+                for (auto const &s : services) {
+                    if (s->expires.hasExpired())
+                        continue; // ditch it. either really expired or failed on dns
+                    QString etype = extType(s);
+                    auto    it
+                        = std::find_if(resolved.begin(), resolved.end(), [&s, &etype](ExternalService::Ptr const &r) {
+                              return s->host == r->host && etype == r->type && s->port == r->port;
+                          });
+                    if (it == resolved.end()) {
+                        s->expires = QDeadlineTimer(); // expired timer
+                        qDebug("no creds from server for %s:%hu %s", qPrintable(s->host), s->port, qPrintable(etype));
+                        continue; // failed to get creds? weird
+                    }
+                    s->username = (*it)->username;
+                    s->password = (*it)->password;
+                }
+                tryFinish();
+            },
+            ids);
+    }
+
+    void tryFinish()
+    {
+        Q_ASSERT(!pendingWork_.isEmpty());
+        auto it = pendingWork_.begin();
+        while (it != pendingWork_.end()) {
+            auto s = **it;
+            if (s.expires.hasExpired()) { // was marked invalid or really expired
+                it = pendingWork_.erase(it);
+                continue;
+            }
+            if (s.addresses.isEmpty() || (s.flags & AbstractStunDiscoMonitor::Restricted && s.password.isEmpty())) {
+                ++it;
+                continue; // in progress yet.
+            }
+            emit serviceAdded(*it);
+            it = pendingWork_.erase(it);
+        }
+        if (pendingWork_.isEmpty()) {
+            if (inProgress_)
+                emit discoFinished();
+        }
+    }
+
+    StunDiscoManager *                            manager_;
+    bool                                          inProgress_ = false; // initial disco
+    QList<AbstractStunDiscoMonitor::Service::Ptr> pendingWork_;
+};
+
+StunDiscoManager::StunDiscoManager(Client *client) : QObject(client) { client_ = client; }
+
+StunDiscoManager::~StunDiscoManager() { }
+
+AbstractStunDiscoMonitor *StunDiscoManager::createMonitor() { return new StunDiscoMonitor(this); }
+
+} // namespace XMPP
+
+#include "stundisco.moc"
diff --git a/src/xmpp/xmpp-im/stundisco.h b/src/xmpp/xmpp-im/stundisco.h
new file mode 100644
index 00000000..e21be800
--- /dev/null
+++ b/src/xmpp/xmpp-im/stundisco.h
@@ -0,0 +1,47 @@
+/*
+ * stundisco.h - STUN/TURN service discoverer
+ * Copyright (C) 2021  Sergey Ilinykh
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef XMPP_STUNDISCO_H
+#define XMPP_STUNDISCO_H
+
+#include "iceabstractstundisco.h"
+#include "xmpp_client.h"
+
+#include <memory>
+
+namespace XMPP {
+
+class Client;
+
+class StunDiscoManager : public QObject {
+    Q_OBJECT
+public:
+    StunDiscoManager(Client *client);
+    ~StunDiscoManager();
+
+    AbstractStunDiscoMonitor *createMonitor();
+    inline Client *           client() const { return client_; }
+
+private:
+    Client *client_;
+};
+
+} // namespace XMPP
+
+#endif // XMPP_STUNDISCO_H
diff --git a/src/xmpp/xmpp-im/xmpp_externalservicediscovery.cpp b/src/xmpp/xmpp-im/xmpp_externalservicediscovery.cpp
index 3184700c..f0e69e4a 100644
--- a/src/xmpp/xmpp-im/xmpp_externalservicediscovery.cpp
+++ b/src/xmpp/xmpp-im/xmpp_externalservicediscovery.cpp
@@ -1,3 +1,22 @@
+/*
+ * xmpp_externalservicedisco.cpp - Implementation of XEP-0215
+ * Copyright (C) 2021  Sergey Ilinykh
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
 #include "xmpp_externalservicediscovery.h"
 
 #include "xmpp_client.h"
@@ -12,32 +31,29 @@ JT_ExternalServiceDiscovery::JT_ExternalServiceDiscovery(Task *parent) : Task(pa
 void JT_ExternalServiceDiscovery::getServices(const QString &type)
 {
     type_ = type;
-    credHost_.clear(); // to indicate it's services request, not creds
+    creds_.clear(); // to indicate it's services request, not creds
 }
 
-void JT_ExternalServiceDiscovery::getCredentials(const QString &host, const QString &type, uint16_t port)
-{
-    Q_ASSERT(!host.isEmpty());
-    Q_ASSERT(!type.isEmpty());
-    credHost_ = host;
-    type_     = type;
-    credPort_ = port;
-}
+void JT_ExternalServiceDiscovery::getCredentials(const QSet<ExternalServiceId> &ids) { creds_ = ids; }
 
 void JT_ExternalServiceDiscovery::onGo()
 {
     QDomElement iq    = createIQ(doc(), "get", client()->jid().domain(), id());
     QDomElement query = doc()->createElementNS(QLatin1String("urn:xmpp:extdisco:2"),
-                                               QLatin1String(credHost_.isEmpty() ? "services" : "credentials"));
-    if (credHost_.isEmpty()) {
+                                               QLatin1String(creds_.isEmpty() ? "services" : "credentials"));
+    if (creds_.isEmpty()) {
         if (!type_.isEmpty()) {
             query.setAttribute(QLatin1String("type"), type_);
         }
     } else {
-        QDomElement service = doc()->createElement(QLatin1String("service"));
-        service.setAttribute(QLatin1String("host"), credHost_);
-        service.setAttribute(QLatin1String("type"), type_);
-        query.appendChild(service);
+        for (auto const &c : qAsConst(creds_)) {
+            QDomElement service = doc()->createElement(QLatin1String("service"));
+            service.setAttribute(QLatin1String("host"), c.host);
+            service.setAttribute(QLatin1String("type"), c.type);
+            if (c.port)
+                service.setAttribute(QLatin1String("port"), c.port);
+            query.appendChild(service);
+        }
     }
     iq.appendChild(query);
     send(iq);
@@ -49,7 +65,7 @@ bool JT_ExternalServiceDiscovery::take(const QDomElement &x)
         return false;
 
     if (x.attribute("type") == "result") {
-        auto query = x.firstChildElement(QLatin1String(credHost_.isEmpty() ? "services" : "credentials"));
+        auto query = x.firstChildElement(QLatin1String(creds_.isEmpty() ? "services" : "credentials"));
         if (query.namespaceURI() != QLatin1String("urn:xmpp:extdisco:2")) {
             setError(0, QLatin1String("invalid namespace"));
             return true;
@@ -92,9 +108,13 @@ bool ExternalService::parse(QDomElement &el)
         return false;
 
     if (!expiresOpt.isEmpty()) {
-        expires = QDateTime::fromString(expiresOpt.left(19), Qt::ISODate);
-        if (!expires.isValid())
+        auto date   = QDateTime::fromString(expiresOpt.left(19), Qt::ISODate);
+        auto curUtc = QDateTime::currentDateTimeUtc();
+        if (!date.isValid() || date < curUtc)
             return false;
+        expires.setDeadline(curUtc.msecsTo(date));
+    } else {
+        expires = QDeadlineTimer(QDeadlineTimer::Forever);
     }
 
     if (actionOpt.isEmpty() || actionOpt == QLatin1String("add"))
@@ -123,20 +143,78 @@ bool ExternalServiceDiscovery::isSupported() const
     return client_->serverInfoManager()->features().test("urn:xmpp:extdisco:2");
 }
 
-void ExternalServiceDiscovery::services(QObject *ctx, ServicesCallback &&callback, const QString &type)
+void ExternalServiceDiscovery::services(QObject *ctx, ServicesCallback &&callback, std::chrono::minutes minTtl,
+                                        const QStringList &types)
 {
     if (!isSupported()) {
         callback({});
         return;
     }
 
-    // TODO optimize me (get cache, check action, etc)
+    // check if cache is valid (no expired or ready to expire items)
+    ExternalServiceList ret;
+    bool                cacheValid = true;
+    for (auto const &s : qAsConst(services_)) {
+        if (!(types.isEmpty() || types.contains(s->type)))
+            continue; // not interesting for us
+        if (!(s->expires.isForever() || s->expires.remainingTimeAsDuration() > minTtl)) {
+            cacheValid = false;
+            break;
+        }
+        ret += s;
+    }
+
+    if (cacheValid && !ret.isEmpty()) {
+        callback(ret);
+        return;
+    }
+
+    if (currentTask) {
+        connect(currentTask, &Task::finished, ctx,
+                [this, types, cb = std::move(callback)]() { cb(cachedServices(types)); });
+    } else {
+        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();
+                cb(cachedServices(types));
+            });
+            currentTask->getServices();
+            currentTask->go(true);
+        } else {
+            auto task = new JT_ExternalServiceDiscovery(client_->rootTask());
+            auto type = types[0];
+            connect(task, &Task::finished, ctx,
+                    [this, task, type, cb = std::move(callback)]() { cb(task->services()); });
+            task->getServices(type);
+            task->go(true);
+            // in fact we can improve caching even more if start remembering specific repviously requested types,
+            // even if the result was negative.
+        }
+    }
+}
+
+ExternalServiceList ExternalServiceDiscovery::cachedServices(const QStringList &types)
+{
+    if (types.isEmpty())
+        return services_;
+
+    ExternalServiceList ret;
+    for (auto const &s : qAsConst(services_)) {
+        if (types.contains(s->type))
+            ret += s;
+    }
+    return ret;
+}
+
+void ExternalServiceDiscovery::credentials(QObject *ctx, ServicesCallback &&callback,
+                                           const QSet<ExternalServiceId> &ids)
+{
     auto task = new JT_ExternalServiceDiscovery(client_->rootTask());
-    connect(task, &Task::finished, ctx, [this, task, cb = std::move(callback)]() {
-        services_ = task->services();
-        cb(services_);
-    });
-    task->getServices(type);
+    connect(task, &Task::finished, ctx ? ctx : this,
+            [this, task, cb = std::move(callback)]() { cb(task->services()); });
+    task->getCredentials(ids);
     task->go(true);
 }
 
diff --git a/src/xmpp/xmpp-im/xmpp_externalservicediscovery.h b/src/xmpp/xmpp-im/xmpp_externalservicediscovery.h
index 0afc6ca0..a0ecf657 100644
--- a/src/xmpp/xmpp-im/xmpp_externalservicediscovery.h
+++ b/src/xmpp/xmpp-im/xmpp_externalservicediscovery.h
@@ -1,10 +1,36 @@
+/*
+ * xmpp_externalservicedisco.h - Implementation of XEP-0215
+ * Copyright (C) 2021  Sergey Ilinykh
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
 #ifndef XMPP_EXTERNALSERVICEDISCOVERY_H
 #define XMPP_EXTERNALSERVICEDISCOVERY_H
 
 #include "xmpp_task.h"
 
 #include <QDateTime>
+#include <QDeadlineTimer>
+#include <QHash>
 #include <QObject>
+#include <QPointer>
+#include <QSet>
+
+#include <chrono>
+#include <functional>
 #include <memory>
 
 namespace XMPP {
@@ -13,20 +39,36 @@ struct ExternalService {
     using Ptr = std::shared_ptr<ExternalService>;
     enum Action { Add, Delete, Modify };
 
-    Action        action = Action::Add;
-    QDateTime     expires;            // optional
-    QString       host;               // required
-    QString       name;               // optional
-    QString       password;           // optional
-    std::uint16_t port;               // required
-    bool          restricted = false; // optional
-    QString       transport;          // optional
-    QString       type;               // required
-    QString       username;           // optional
+    Action         action = Action::Add;
+    QDeadlineTimer expires;            // optional
+    QString        host;               // required
+    QString        name;               // optional
+    QString        password;           // optional
+    std::uint16_t  port;               // required
+    bool           restricted = false; // optional
+    QString        transport;          // optional
+    QString        type;               // required
+    QString        username;           // optional
 
     bool parse(QDomElement &el);
 };
 
+struct ExternalServiceId {
+    QString       host;
+    QString       type;
+    std::uint16_t port;
+
+    bool operator==(const ExternalServiceId &other) const
+    {
+        return host == other.host && type == other.type && port == other.port;
+    }
+};
+
+inline uint qHash(const ExternalServiceId &id, uint seed = 0)
+{
+    return ::qHash(id.host, seed) ^ ::qHash(id.type, seed) ^ ::qHash(id.port, seed);
+}
+
 using ExternalServiceList = QVector<ExternalService::Ptr>;
 
 // XEP-0215 0.7
@@ -36,16 +78,15 @@ class JT_ExternalServiceDiscovery : public Task {
     explicit JT_ExternalServiceDiscovery(Task *parent = nullptr);
 
     void                              getServices(const QString &type = QString());
-    void                              getCredentials(const QString &host, const QString &type, std::uint16_t port = 0);
+    void                              getCredentials(const QSet<ExternalServiceId> &ids);
     inline const ExternalServiceList &services() const { return services_; }
 
     void onGo();
     bool take(const QDomElement &);
 
 private:
-    std::uint16_t credPort_ = 0;
-    QString       credHost_;
-    QString       type_;
+    QSet<ExternalServiceId> creds_;
+    QString                 type_;
 
     ExternalServiceList services_; // result
 };
@@ -58,16 +99,41 @@ class ExternalServiceDiscovery : public QObject {
     ExternalServiceDiscovery(Client *client);
 
     bool isSupported() const;
-    void services(QObject *ctx, ServicesCallback &&callback, const QString &type = QString());
+
+    /**
+     * @brief Resuest services from server or use cached ones
+     * @param ctx           - if ctx dies, the request will be aborted
+     * @param callback      - callback to call when ready
+     * @param minTtl        - if service expires in less than minTtl it will be re-requested
+     * @param serviceTypes  - types of services to request. e.g "stun", "turn"
+     */
+    void services(QObject *ctx, ServicesCallback &&callback, std::chrono::minutes minTtl = std::chrono::minutes(1),
+                  const QStringList &types = QStringList());
+    ExternalServiceList cachedServices(const QStringList &type = QStringList());
+
+    /**
+     * @brief credentials resolves credentials for specific services
+     * @param ctx           - if ctx dies, the request will be aborted
+     * @param callback      - callback to call when ready
+     * @param ids           - identifier of services
+     *
+     * The credentials won't be cached since it's assumed if crdentials are returned with services request then
+     * the creds are constant values until the service is expired.
+     * Otherwise `restricted` flag has to be set and the credentials are requested when they are really needed.
+     * Most likely with `restricted` flag those are going to be temporal credentials. Even so the caller may cache them
+     * on its own risk.
+     */
+    void credentials(QObject *ctx, ServicesCallback &&callback, const QSet<ExternalServiceId> &ids);
 signals:
     // server push signals only
-    void serviceAdded(ExternalService::Ptr);
-    void serviceDeleted(ExternalService::Ptr);
-    void serviceModified(ExternalService::Ptr);
+    void serviceAdded(const ExternalServiceList &);
+    void serviceDeleted(ExternalServiceList &);
+    void serviceModified(ExternalServiceList &);
 
 private:
-    Client *            client_;
-    ExternalServiceList services_;
+    Client *                              client_;
+    QPointer<JT_ExternalServiceDiscovery> currentTask = nullptr; // for all services (no type)
+    ExternalServiceList                   services_;
 };
 
 } // namespace XMPP

From fc2439b0cc6fdbe34c196631fb0e32ef5deb99fd Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Mon, 31 May 2021 15:58:14 +0300
Subject: [PATCH 332/383] Fixed a couple of stupid ICE related bugs

---
 src/xmpp/xmpp-im/jingle-ice.cpp                    | 3 ++-
 src/xmpp/xmpp-im/xmpp_externalservicediscovery.cpp | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index f6289864..5065b710 100644
--- 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
index f0e69e4a..22531ec3 100644
--- 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();

From 4c20b746cd2599e25db946e0ef129f41ef086fc8 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 2 Jun 2021 08:46:09 +0300
Subject: [PATCH 333/383] An attempt to workaround usrsctp comilation failure
 while https://github.com/sctplab/usrsctp/issues/586 is still unsolved

---
 cmake/modules/IrisSCTP.cmake | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cmake/modules/IrisSCTP.cmake b/cmake/modules/IrisSCTP.cmake
index 4eaa12e4..bca0dd59 100644
--- a/cmake/modules/IrisSCTP.cmake
+++ b/cmake/modules/IrisSCTP.cmake
@@ -40,6 +40,9 @@ else()
         -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
         -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
         -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER})
+    if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+        list(APPEND USRSCTP_BUILD_OPTIONS -DCMAKE_C_FLAGS="-Wno-maybe-uninitialized")
+    endif()
     if (EXISTS ${USRSCTP_SOURCE_DIR})
         message(STATUS "USRSCTP: found bundled sources")
         ExternalProject_Add(UsrSCTPProject

From 9e2bd6d439ba134a82bc2bbbf6fdaeb8f18ce0a1 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Wed, 2 Jun 2021 21:43:17 +0300
Subject: [PATCH 334/383] ICE related fixes + advancing ICE discoverer
 integration

---
 src/irisnet/noncore/ice176.cpp                | 32 +++++++++++--
 src/irisnet/noncore/ice176.h                  |  2 +
 src/irisnet/noncore/iceabstractstundisco.h    |  4 +-
 src/irisnet/noncore/icecomponent.cpp          | 44 +++++++++--------
 src/irisnet/noncore/icelocaltransport.cpp     | 17 ++++---
 src/irisnet/noncore/iceturntransport.cpp      | 10 +++-
 src/irisnet/noncore/iceturntransport.h        |  4 +-
 src/irisnet/noncore/stunallocate.cpp          |  4 +-
 src/irisnet/noncore/stunallocate.h            |  2 +-
 src/irisnet/noncore/turnclient.cpp            | 21 ++++-----
 src/xmpp/xmpp-im/client.cpp                   |  5 ++
 src/xmpp/xmpp-im/jingle-ice.cpp               |  5 +-
 src/xmpp/xmpp-im/stundisco.cpp                | 47 +++++++++----------
 src/xmpp/xmpp-im/stundisco.h                  |  4 +-
 src/xmpp/xmpp-im/xmpp_client.h                |  2 +
 .../xmpp-im/xmpp_externalservicediscovery.cpp | 11 ++++-
 .../xmpp-im/xmpp_externalservicediscovery.h   |  1 +
 17 files changed, 137 insertions(+), 78 deletions(-)

diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index 182055bd..e91c9ef4 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -19,6 +19,7 @@
 
 #include "ice176.h"
 
+#include "iceabstractstundisco.h"
 #include "iceagent.h"
 #include "icecomponent.h"
 #include "icelocaltransport.h"
@@ -32,6 +33,7 @@
 #include <QDeadlineTimer>
 #include <QEvent>
 #include <QNetworkInterface>
+#include <QPointer>
 #include <QQueue>
 #include <QSet>
 #include <QTimer>
@@ -223,6 +225,7 @@ class Ice176::Private : public QObject {
     int                                     stunRelayTcpPort;
     QString                                 stunRelayTcpUser;
     QCA::SecureArray                        stunRelayTcpPass;
+    QPointer<AbstractStunDisco>             stunDiscoverer;
     QString                                 localUser, localPass;
     QString                                 peerUser, peerPass;
     std::vector<Component>                  components;
@@ -303,6 +306,17 @@ class Ice176::Private : public QObject {
         }
     }
 
+    void stunFound(AbstractStunDisco::Service::Ptr service)
+    {
+        qDebug("found %s: %s:%hu %s %s", (service->flags & AbstractStunDisco::Relay) ? "TURN" : "STUN",
+               qPrintable(service->host), service->port ? service->port : std::uint16_t(3478),
+               service->transport == AbstractStunDisco::Tcp ? "tcp" : "udp",
+               (service->flags & AbstractStunDisco::Tls) ? "tls" : "insecure");
+    }
+    void stunModified(AbstractStunDisco::Service::Ptr) { }
+    void stunRemoved(AbstractStunDisco::Service::Ptr) { }
+    void stunDiscoFinished() { }
+
     void start()
     {
         Q_ASSERT(state == Stopped);
@@ -1058,9 +1072,9 @@ class Ice176::Private : public QObject {
         out.priority = cc.info->priority;
         out.protocol = "udp";
         if (cc.info->type != IceComponent::HostType) {
-            out.rel_addr = cc.info->base.addr;
+            out.rel_addr = cc.info->related.addr;
             out.rel_addr.setScopeId(QString());
-            out.rel_port = cc.info->base.port;
+            out.rel_port = cc.info->related.port;
         } else {
             out.rel_addr = QHostAddress();
             out.rel_port = -1;
@@ -1073,7 +1087,7 @@ class Ice176::Private : public QObject {
     void dumpCandidatesAndStart()
     {
         QList<Ice176::Candidate> list;
-        for (auto const &cc : localCandidates) {
+        for (auto const &cc : qAsConst(localCandidates)) {
             Ice176::Candidate c;
             toOutCandidate(cc, c);
             list += c;
@@ -1354,7 +1368,7 @@ private slots:
         }
 
         bool iceTransportInUse = false;
-        for (const IceComponent::Candidate &lc : localCandidates) {
+        for (const IceComponent::Candidate &lc : qAsConst(localCandidates)) {
             if (lc.iceTransport == cc.iceTransport) {
                 iceTransportInUse = true;
                 break;
@@ -1641,6 +1655,16 @@ void Ice176::setStunRelayTcpService(const QHostAddress &addr, int port, const QS
 
 void Ice176::setAllowIpExposure(bool enabled) { d->allowIpExposure = enabled; }
 
+void Ice176::setStunDiscoverer(AbstractStunDisco *discoverer)
+{
+    discoverer->setParent(this);
+    d->stunDiscoverer = discoverer;
+    connect(d->stunDiscoverer, &AbstractStunDisco::serviceAdded, d, &Private::stunFound);
+    connect(d->stunDiscoverer, &AbstractStunDisco::serviceModified, d, &Private::stunModified);
+    connect(d->stunDiscoverer, &AbstractStunDisco::serviceRemoved, d, &Private::stunRemoved);
+    connect(d->stunDiscoverer, &AbstractStunDisco::discoFinished, d, &Private::stunDiscoFinished);
+}
+
 void Ice176::setUseLocal(bool enabled) { d->useLocal = enabled; }
 
 void Ice176::setUseStunBind(bool enabled) { d->useStunBind = enabled; }
diff --git a/src/irisnet/noncore/ice176.h b/src/irisnet/noncore/ice176.h
index d8a5bd33..063d5ee0 100644
--- a/src/irisnet/noncore/ice176.h
+++ b/src/irisnet/noncore/ice176.h
@@ -31,6 +31,7 @@ class SecureArray;
 
 namespace XMPP {
 class UdpPortReserver;
+class AbstractStunDisco;
 
 class Ice176 : public QObject {
     Q_OBJECT
@@ -108,6 +109,7 @@ class Ice176 : public QObject {
     void setUseStunRelayUdp(bool enabled);
     void setUseStunRelayTcp(bool enabled);
     void setAllowIpExposure(bool enabled);
+    void setStunDiscoverer(AbstractStunDisco *discoverer);
 
     void setComponentCount(int count);
 
diff --git a/src/irisnet/noncore/iceabstractstundisco.h b/src/irisnet/noncore/iceabstractstundisco.h
index 8c09c0c2..78fc523d 100644
--- a/src/irisnet/noncore/iceabstractstundisco.h
+++ b/src/irisnet/noncore/iceabstractstundisco.h
@@ -13,7 +13,7 @@ namespace XMPP {
 /**
  * Monitors if new STUN services are available, changed or not available anymore.
  */
-class AbstractStunDiscoMonitor : public QObject {
+class AbstractStunDisco : public QObject {
     Q_OBJECT
 public:
     enum Transport : std::uint8_t { Tcp, Udp };
@@ -49,6 +49,6 @@ class AbstractStunDiscoMonitor : public QObject {
 
 } // namespace XMPP
 
-Q_DECLARE_OPERATORS_FOR_FLAGS(XMPP::AbstractStunDiscoMonitor::Flags)
+Q_DECLARE_OPERATORS_FOR_FLAGS(XMPP::AbstractStunDisco::Flags)
 
 #endif // XMPP_ABSTRACTSTUNDISCO_H
diff --git a/src/irisnet/noncore/icecomponent.cpp b/src/irisnet/noncore/icecomponent.cpp
index b32ff952..58e24572 100644
--- a/src/irisnet/noncore/icecomponent.cpp
+++ b/src/irisnet/noncore/icecomponent.cpp
@@ -355,6 +355,7 @@ class IceComponent::Private : public QObject {
         auto ci  = IceComponent::CandidateInfo::Ptr::create();
         ci->addr = addr;
         ci->addr.addr.setScopeId(QString());
+        ci->related     = base->addr;
         ci->base        = base->addr;
         ci->type        = IceComponent::PeerReflexiveType;
         ci->priority    = priority;
@@ -452,6 +453,7 @@ class IceComponent::Private : public QObject {
             ci->priority    = choose_default_priority(ci->type, 65535 - addrAt, lt->isVpn, ci->componentId);
             ci->base.addr   = lt->sock->localAddress();
             ci->base.port   = lt->sock->localPort();
+            ci->related     = ci->base;
             ci->network     = lt->network;
             ci->foundation  = IceAgent::instance()->foundation(ServerReflexiveType, ci->base.addr);
 
@@ -672,6 +674,7 @@ private slots:
             ci->addr.port   = lt->sock->serverReflexivePort();
             ci->base.addr   = lt->sock->localAddress();
             ci->base.port   = lt->sock->localPort();
+            ci->related     = ci->base;
             ci->type        = ServerReflexiveType;
             ci->componentId = id;
             ci->priority    = choose_default_priority(ci->type, 65535 - addrAt, lt->isVpn, ci->componentId);
@@ -693,16 +696,17 @@ private slots:
         }
 
         if (!lt->sock->relayedAddress().isNull() && !lt->turn_finished) {
-            auto ci         = CandidateInfo::Ptr::create();
-            ci->addr.addr   = lt->sock->relayedAddress();
-            ci->addr.port   = lt->sock->relayedPort();
-            ci->base.addr   = lt->sock->relayedAddress();
-            ci->base.port   = lt->sock->relayedPort();
-            ci->type        = RelayedType;
-            ci->componentId = id;
-            ci->priority    = choose_default_priority(ci->type, 65535 - addrAt, lt->isVpn, ci->componentId);
-            ci->network     = lt->network;
-            ci->foundation  = IceAgent::instance()->foundation(
+            auto ci          = CandidateInfo::Ptr::create();
+            ci->addr.addr    = lt->sock->relayedAddress();
+            ci->addr.port    = lt->sock->relayedPort();
+            ci->base         = ci->addr;
+            ci->related.addr = lt->sock->serverReflexiveAddress();
+            ci->related.port = lt->sock->serverReflexivePort();
+            ci->type         = RelayedType;
+            ci->componentId  = id;
+            ci->priority     = choose_default_priority(ci->type, 65535 - addrAt, lt->isVpn, ci->componentId);
+            ci->network      = lt->network;
+            ci->foundation   = IceAgent::instance()->foundation(
                 RelayedType, ci->base.addr, lt->sock->stunRelayServiceAddress(), QAbstractSocket::UdpSocket);
 
             Candidate c;
@@ -730,15 +734,17 @@ private slots:
         // lower priority by making it seem like the last nic
         int addrAt = 1024;
 
-        auto ci         = CandidateInfo::Ptr::create();
-        ci->addr.addr   = tcpTurn->relayedAddress();
-        ci->addr.port   = tcpTurn->relayedPort();
-        ci->type        = RelayedType;
-        ci->componentId = id;
-        ci->priority    = choose_default_priority(ci->type, 65535 - addrAt, false, ci->componentId);
-        ci->base        = ci->addr;
-        ci->network     = 0; // not relevant
-        ci->foundation  = IceAgent::instance()->foundation(RelayedType, ci->base.addr, config.stunRelayTcpAddr,
+        auto ci          = CandidateInfo::Ptr::create();
+        ci->addr.addr    = tcpTurn->relayedAddress();
+        ci->addr.port    = tcpTurn->relayedPort();
+        ci->related.addr = tcpTurn->reflexiveAddress();
+        ci->related.port = tcpTurn->reflexivePort();
+        ci->type         = RelayedType;
+        ci->componentId  = id;
+        ci->priority     = choose_default_priority(ci->type, 65535 - addrAt, false, ci->componentId);
+        ci->base         = ci->addr;
+        ci->network      = 0; // not relevant
+        ci->foundation   = IceAgent::instance()->foundation(RelayedType, ci->base.addr, config.stunRelayTcpAddr,
                                                           QAbstractSocket::TcpSocket);
 
         Candidate c;
diff --git a/src/irisnet/noncore/icelocaltransport.cpp b/src/irisnet/noncore/icelocaltransport.cpp
index 52e3e722..dc90c992 100644
--- a/src/irisnet/noncore/icelocaltransport.cpp
+++ b/src/irisnet/noncore/icelocaltransport.cpp
@@ -306,15 +306,14 @@ class IceLocalTransport::Private : public QObject {
         }
         turn = new TurnClient(this);
         turn->setDebugLevel((TurnClient::DebugLevel)debugLevel);
-        connect(turn, SIGNAL(connected()), SLOT(turn_connected()));
-        connect(turn, SIGNAL(tlsHandshaken()), SLOT(turn_tlsHandshaken()));
-        connect(turn, SIGNAL(closed()), SLOT(turn_closed()));
-        connect(turn, SIGNAL(activated()), SLOT(turn_activated()));
-        connect(turn, SIGNAL(packetsWritten(int, QHostAddress, int)),
-                SLOT(turn_packetsWritten(int, QHostAddress, int)));
-        connect(turn, SIGNAL(error(XMPP::TurnClient::Error)), SLOT(turn_error(XMPP::TurnClient::Error)));
-        connect(turn, SIGNAL(outgoingDatagram(QByteArray)), SLOT(turn_outgoingDatagram(QByteArray)));
-        connect(turn, SIGNAL(debugLine(QString)), SLOT(turn_debugLine(QString)));
+        connect(turn, &TurnClient::connected, this, &Private::turn_connected);
+        connect(turn, &TurnClient::tlsHandshaken, this, &Private::turn_tlsHandshaken);
+        connect(turn, &TurnClient::closed, this, &Private::turn_closed);
+        connect(turn, &TurnClient::activated, this, &Private::turn_activated);
+        connect(turn, &TurnClient::packetsWritten, this, &Private::turn_packetsWritten);
+        connect(turn, &TurnClient::error, this, &Private::turn_error);
+        connect(turn, &TurnClient::outgoingDatagram, this, &Private::turn_outgoingDatagram);
+        connect(turn, &TurnClient::debugLine, this, &Private::turn_debugLine);
 
         turn->setClientSoftwareNameAndVersion(clientSoftware);
 
diff --git a/src/irisnet/noncore/iceturntransport.cpp b/src/irisnet/noncore/iceturntransport.cpp
index a5795153..90a0a79d 100644
--- a/src/irisnet/noncore/iceturntransport.cpp
+++ b/src/irisnet/noncore/iceturntransport.cpp
@@ -35,6 +35,8 @@ class IceTurnTransport::Private : public QObject {
     QCA::SecureArray  relayPass;
     QHostAddress      relayAddr;
     int               relayPort;
+    QHostAddress      refAddr;
+    int               refPort;
     TurnClient        turn;
     int               turnErrorCode = 0;
     int               debugLevel;
@@ -115,6 +117,8 @@ private slots:
 
         relayAddr = saddr;
         relayPort = sport;
+        refAddr   = allocate->reflexiveAddress();
+        refPort   = allocate->reflexivePort();
         started   = true;
 
         emit q->started();
@@ -164,7 +168,11 @@ void IceTurnTransport::start(const QHostAddress &addr, int port, TurnClient::Mod
 
 QHostAddress IceTurnTransport::relayedAddress() const { return d->relayAddr; }
 
-int IceTurnTransport::relayedPort() const { return d->relayPort; }
+quint16 IceTurnTransport::relayedPort() const { return d->relayPort; }
+
+QHostAddress IceTurnTransport::reflexiveAddress() const { return d->refAddr; }
+
+quint16 IceTurnTransport::reflexivePort() const { return d->refPort; }
 
 bool IceTurnTransport::isStarted() const { return d->started; }
 
diff --git a/src/irisnet/noncore/iceturntransport.h b/src/irisnet/noncore/iceturntransport.h
index fd0e9f3b..5d1c0ae0 100644
--- a/src/irisnet/noncore/iceturntransport.h
+++ b/src/irisnet/noncore/iceturntransport.h
@@ -49,7 +49,9 @@ class IceTurnTransport : public IceTransport, public QEnableSharedFromThis<IceTu
     void start(const QHostAddress &addr, int port, TurnClient::Mode mode = TurnClient::PlainMode);
 
     QHostAddress relayedAddress() const;
-    int          relayedPort() const;
+    quint16      relayedPort() const;
+    QHostAddress reflexiveAddress() const;
+    quint16      reflexivePort() const;
     bool         isStarted() const;
 
     TurnClient::Error turnErrorCode() const;
diff --git a/src/irisnet/noncore/stunallocate.cpp b/src/irisnet/noncore/stunallocate.cpp
index 87dfcfcb..abf847d0 100644
--- a/src/irisnet/noncore/stunallocate.cpp
+++ b/src/irisnet/noncore/stunallocate.cpp
@@ -427,7 +427,7 @@ class StunAllocate::Private : public QObject {
     DontFragmentState               dfState;
     QString                         clientSoftware, serverSoftware;
     QHostAddress                    reflexiveAddress, relayedAddress;
-    int                             reflexivePort, relayedPort;
+    quint16                         reflexivePort, relayedPort;
     StunMessage                     msg;
     int                             allocateLifetime;
     QTimer *                        allocateRefreshTimer;
@@ -1119,7 +1119,7 @@ int StunAllocate::reflexivePort() const { return d->reflexivePort; }
 
 QHostAddress StunAllocate::relayedAddress() const { return d->relayedAddress; }
 
-int StunAllocate::relayedPort() const { return d->relayedPort; }
+quint16 StunAllocate::relayedPort() const { return d->relayedPort; }
 
 QList<QHostAddress> StunAllocate::permissions() const { return d->permsOut; }
 
diff --git a/src/irisnet/noncore/stunallocate.h b/src/irisnet/noncore/stunallocate.h
index d5260f11..ebd171c0 100644
--- a/src/irisnet/noncore/stunallocate.h
+++ b/src/irisnet/noncore/stunallocate.h
@@ -62,7 +62,7 @@ class StunAllocate : public QObject {
     int          reflexivePort() const;
 
     QHostAddress relayedAddress() const;
-    int          relayedPort() const;
+    quint16      relayedPort() const;
 
     QList<QHostAddress> permissions() const;
     void                setPermissions(const QList<QHostAddress> &perms);
diff --git a/src/irisnet/noncore/turnclient.cpp b/src/irisnet/noncore/turnclient.cpp
index c2a4f21e..02948395 100644
--- a/src/irisnet/noncore/turnclient.cpp
+++ b/src/irisnet/noncore/turnclient.cpp
@@ -277,10 +277,9 @@ class TurnClient::Private : public QObject {
         if (!udp && !pool) {
             pool = StunTransactionPool::Ptr::create(StunTransaction::Tcp);
             pool->setDebugLevel((StunTransactionPool::DebugLevel)debugLevel);
-            connect(pool.data(), SIGNAL(outgoingMessage(QByteArray, QHostAddress, int)),
-                    SLOT(pool_outgoingMessage(QByteArray, QHostAddress, int)));
-            connect(pool.data(), SIGNAL(needAuthParams()), SLOT(pool_needAuthParams()));
-            connect(pool.data(), SIGNAL(debugLine(QString)), SLOT(pool_debugLine(QString)));
+            connect(pool.data(), &StunTransactionPool::outgoingMessage, this, &Private::pool_outgoingMessage);
+            connect(pool.data(), &StunTransactionPool::needAuthParams, this, &Private::pool_needAuthParams);
+            connect(pool.data(), &StunTransactionPool::debugLine, this, &Private::pool_debugLine);
 
             pool->setLongTermAuthEnabled(true);
             if (!user.isEmpty()) {
@@ -292,12 +291,12 @@ class TurnClient::Private : public QObject {
         }
 
         allocate = new StunAllocate(pool.data());
-        connect(allocate, SIGNAL(started()), SLOT(allocate_started()));
-        connect(allocate, SIGNAL(stopped()), SLOT(allocate_stopped()));
-        connect(allocate, SIGNAL(error(XMPP::StunAllocate::Error)), SLOT(allocate_error(XMPP::StunAllocate::Error)));
-        connect(allocate, SIGNAL(permissionsChanged()), SLOT(allocate_permissionsChanged()));
-        connect(allocate, SIGNAL(channelsChanged()), SLOT(allocate_channelsChanged()));
-        connect(allocate, SIGNAL(debugLine(QString)), SLOT(allocate_debugLine(QString)));
+        connect(allocate, &StunAllocate::started, this, &Private::allocate_started);
+        connect(allocate, &StunAllocate::stopped, this, &Private::allocate_stopped);
+        connect(allocate, &StunAllocate::error, this, &Private::allocate_error);
+        connect(allocate, &StunAllocate::permissionsChanged, this, &Private::allocate_permissionsChanged);
+        connect(allocate, &StunAllocate::channelsChanged, this, &Private::allocate_channelsChanged);
+        connect(allocate, &StunAllocate::debugLine, this, &Private::allocate_debugLine);
 
         allocate->setClientSoftwareNameAndVersion(clientSoftware);
 
@@ -772,7 +771,7 @@ private slots:
         emit q->error(TurnClient::ErrorTls);
     }
 
-    void pool_outgoingMessage(const QByteArray &packet, const QHostAddress &toAddress, int toPort)
+    void pool_outgoingMessage(const QByteArray &packet, const QHostAddress &toAddress, quint16 toPort)
     {
         // we aren't using IP-associated transactions
         Q_UNUSED(toAddress);
diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
index 68f1f31a..aa670726 100644
--- a/src/xmpp/xmpp-im/client.cpp
+++ b/src/xmpp/xmpp-im/client.cpp
@@ -75,6 +75,7 @@
 #include "jingle.h"
 #include "protocol.h"
 #include "s5b.h"
+#include "stundisco.h"
 #include "tcpportreserver.h"
 #include "xmpp_bitsofbinary.h"
 #include "xmpp_caps.h"
@@ -144,6 +145,7 @@ class Client::ClientPrivate {
     FileTransferManager *     ftman                    = nullptr;
     ServerInfoManager *       serverInfoManager        = nullptr;
     ExternalServiceDiscovery *externalServiceDiscovery = nullptr;
+    StunDiscoManager *        stunDiscoManager         = nullptr;
     HttpFileUploadManager *   httpFileUploadManager    = nullptr;
     Jingle::Manager *         jingleManager            = nullptr;
     QList<GroupChat>          groupChatList;
@@ -174,6 +176,7 @@ Client::Client(QObject *par) : QObject(par)
 
     d->serverInfoManager        = new ServerInfoManager(this);
     d->externalServiceDiscovery = new ExternalServiceDiscovery(this);
+    d->stunDiscoManager         = new StunDiscoManager(this);
     d->httpFileUploadManager    = new HttpFileUploadManager(this);
 
     d->jingleManager = new Jingle::Manager(this);
@@ -295,6 +298,8 @@ ServerInfoManager *Client::serverInfoManager() const { return d->serverInfoManag
 
 ExternalServiceDiscovery *Client::externalServiceDiscovery() const { return d->externalServiceDiscovery; }
 
+StunDiscoManager *Client::stunDiscoManager() const { return d->stunDiscoManager; }
+
 HttpFileUploadManager *Client::httpFileUploadManager() const { return d->httpFileUploadManager; }
 
 Jingle::Manager *Client::jingleManager() const { return d->jingleManager; }
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index 5065b710..3135a674 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -27,6 +27,7 @@
 #include "ice176.h"
 #include "jingle-session.h"
 #include "netnames.h"
+#include "stundisco.h"
 #include "udpportreserver.h"
 #include "xmpp/jid/jid.h"
 #include "xmpp_client.h"
@@ -788,6 +789,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
             if (!stunRelayTcpAddr.isNull() && !stunRelayTcpUser.isEmpty())
                 ice->setStunRelayTcpService(stunRelayTcpAddr, stunRelayTcpPort, stunRelayTcpUser,
                                             stunRelayTcpPass.toUtf8());
+            ice->setStunDiscoverer(q->pad()->session()->manager()->client()->stunDiscoManager()->createMonitor());
 
             ice->setComponentCount(components.count());
             ice->setLocalFeatures(Ice176::Trickle);
@@ -1054,7 +1056,8 @@ namespace XMPP { namespace Jingle { namespace ICE {
     bool Transport::hasUpdates() const
     {
         return isValid() && d->pendingActions && d->ice && _state >= State::ApprovedToSend
-            && !(isRemote() && _state == State::Pending);
+            && !(isRemote() && _state == State::Pending)
+            && (d->ice->isLocalGatheringComplete() || d->pendingLocalCandidates.size());
     }
 
     OutgoingTransportInfoUpdate Transport::takeOutgoingUpdate([[maybe_unused]] bool ensureTransportElement = false)
diff --git a/src/xmpp/xmpp-im/stundisco.cpp b/src/xmpp/xmpp-im/stundisco.cpp
index 32b61757..8f2751e2 100644
--- a/src/xmpp/xmpp-im/stundisco.cpp
+++ b/src/xmpp/xmpp-im/stundisco.cpp
@@ -27,12 +27,12 @@
 
 namespace XMPP {
 
-class StunDiscoMonitor : public AbstractStunDiscoMonitor {
+class StunDiscoMonitor : public AbstractStunDisco {
     Q_OBJECT
 public:
-    using StunList = QList<AbstractStunDiscoMonitor::Service::Ptr>;
+    using StunList = QList<AbstractStunDisco::Service::Ptr>;
 
-    StunDiscoMonitor(StunDiscoManager *manager) : AbstractStunDiscoMonitor(manager), manager_(manager)
+    StunDiscoMonitor(StunDiscoManager *manager) : AbstractStunDisco(manager), manager_(manager)
     {
         auto extdisco = manager->client()->externalServiceDiscovery();
         connect(extdisco, &ExternalServiceDiscovery::serviceAdded, this,
@@ -66,23 +66,22 @@ class StunDiscoMonitor : public AbstractStunDiscoMonitor {
         StunList needCreds;
         StunList needResolve;
         for (auto const &l : list) {
-            auto s = std::make_shared<AbstractStunDiscoMonitor::Service>();
+            auto s = std::make_shared<AbstractStunDisco::Service>();
             if (l->type.startsWith(QLatin1String("turn")))
-                s->flags |= AbstractStunDiscoMonitor::Relay;
+                s->flags |= AbstractStunDisco::Relay;
             else if (!l->type.startsWith(QLatin1String("stun")))
                 continue;
             if (l->type.endsWith(QLatin1Char('s')))
-                s->flags |= AbstractStunDiscoMonitor::Tls;
+                s->flags |= AbstractStunDisco::Tls;
             if (l->restricted)
-                s->flags |= AbstractStunDiscoMonitor::Restricted;
-            s->transport
-                = l->transport == QLatin1String("tcp") ? AbstractStunDiscoMonitor::Tcp : AbstractStunDiscoMonitor::Udp;
-            s->expires  = l->expires; // it's definitely not expired. no need to check
-            s->port     = l->port;
-            s->name     = l->name;
-            s->username = l->username;
-            s->password = l->password;
-            s->host     = l->host;
+                s->flags |= AbstractStunDisco::Restricted;
+            s->transport = l->transport == QLatin1String("tcp") ? AbstractStunDisco::Tcp : AbstractStunDisco::Udp;
+            s->expires   = l->expires; // it's definitely not expired. no need to check
+            s->port      = l->port;
+            s->name      = l->name;
+            s->username  = l->username;
+            s->password  = l->password;
+            s->host      = l->host;
             QHostAddress addr(l->host);
             if (addr.isNull())
                 needResolve.append(s);
@@ -117,11 +116,11 @@ class StunDiscoMonitor : public AbstractStunDiscoMonitor {
         // TODO
     }
 
-    static QString extType(AbstractStunDiscoMonitor::Service::Ptr s)
+    static QString extType(AbstractStunDisco::Service::Ptr s)
     {
-        bool isTls = s->flags & AbstractStunDiscoMonitor::Tls;
-        return QLatin1String(s->flags & AbstractStunDiscoMonitor::Relay ? (isTls ? "turns" : "turn")
-                                                                        : (isTls ? "stuns" : "stun"));
+        bool isTls = s->flags & AbstractStunDisco::Tls;
+        return QLatin1String(s->flags & AbstractStunDisco::Relay ? (isTls ? "turns" : "turn")
+                                                                 : (isTls ? "stuns" : "stun"));
     }
 
     void resolve(const StunList &services)
@@ -205,7 +204,7 @@ class StunDiscoMonitor : public AbstractStunDiscoMonitor {
                 it = pendingWork_.erase(it);
                 continue;
             }
-            if (s.addresses.isEmpty() || (s.flags & AbstractStunDiscoMonitor::Restricted && s.password.isEmpty())) {
+            if (s.addresses.isEmpty() || (s.flags & AbstractStunDisco::Restricted && s.password.isEmpty())) {
                 ++it;
                 continue; // in progress yet.
             }
@@ -218,16 +217,16 @@ class StunDiscoMonitor : public AbstractStunDiscoMonitor {
         }
     }
 
-    StunDiscoManager *                            manager_;
-    bool                                          inProgress_ = false; // initial disco
-    QList<AbstractStunDiscoMonitor::Service::Ptr> pendingWork_;
+    StunDiscoManager *                     manager_;
+    bool                                   inProgress_ = false; // initial disco
+    QList<AbstractStunDisco::Service::Ptr> pendingWork_;
 };
 
 StunDiscoManager::StunDiscoManager(Client *client) : QObject(client) { client_ = client; }
 
 StunDiscoManager::~StunDiscoManager() { }
 
-AbstractStunDiscoMonitor *StunDiscoManager::createMonitor() { return new StunDiscoMonitor(this); }
+AbstractStunDisco *StunDiscoManager::createMonitor() { return new StunDiscoMonitor(this); }
 
 } // namespace XMPP
 
diff --git a/src/xmpp/xmpp-im/stundisco.h b/src/xmpp/xmpp-im/stundisco.h
index e21be800..3560cf7d 100644
--- a/src/xmpp/xmpp-im/stundisco.h
+++ b/src/xmpp/xmpp-im/stundisco.h
@@ -35,8 +35,8 @@ class StunDiscoManager : public QObject {
     StunDiscoManager(Client *client);
     ~StunDiscoManager();
 
-    AbstractStunDiscoMonitor *createMonitor();
-    inline Client *           client() const { return client_; }
+    AbstractStunDisco *createMonitor();
+    inline Client *    client() const { return client_; }
 
 private:
     Client *client_;
diff --git a/src/xmpp/xmpp-im/xmpp_client.h b/src/xmpp/xmpp-im/xmpp_client.h
index 1b4f0265..03c5af8c 100644
--- a/src/xmpp/xmpp-im/xmpp_client.h
+++ b/src/xmpp/xmpp-im/xmpp_client.h
@@ -56,6 +56,7 @@ class Stream;
 class Task;
 class TcpPortReserver;
 class ExternalServiceDiscovery;
+class StunDiscoManager;
 
 namespace Jingle {
     class Manager;
@@ -151,6 +152,7 @@ class Client : public QObject {
     CapsManager *             capsManager() const;
     ServerInfoManager *       serverInfoManager() const;
     ExternalServiceDiscovery *externalServiceDiscovery() const;
+    StunDiscoManager *        stunDiscoManager() const;
     HttpFileUploadManager *   httpFileUploadManager() const;
     Jingle::Manager *         jingleManager() const;
     Jingle::S5B::Manager *    jingleS5BManager() const;
diff --git a/src/xmpp/xmpp-im/xmpp_externalservicediscovery.cpp b/src/xmpp/xmpp-im/xmpp_externalservicediscovery.cpp
index 22531ec3..096d72f7 100644
--- a/src/xmpp/xmpp-im/xmpp_externalservicediscovery.cpp
+++ b/src/xmpp/xmpp-im/xmpp_externalservicediscovery.cpp
@@ -112,7 +112,10 @@ bool ExternalService::parse(QDomElement &el)
         auto curUtc = QDateTime::currentDateTimeUtc();
         if (!date.isValid() || date < curUtc)
             return false;
-        expires.setDeadline(curUtc.msecsTo(date));
+        expires = QDeadlineTimer(curUtc.msecsTo(date));
+        if (expires.hasExpired())
+            qInfo("Server returned already expired service %s expired at %s UTC", qPrintable(*this),
+                  qPrintable(expiresOpt));
     } else {
         expires = QDeadlineTimer(QDeadlineTimer::Forever);
     }
@@ -136,6 +139,12 @@ bool ExternalService::parse(QDomElement &el)
     return true;
 }
 
+ExternalService::operator QString() const
+{
+    return QString(QLatin1String("ExternalService<name=%1 host=%2 port=%3 type=%4 transport=%5>"))
+        .arg(name, host, QString::number(port), type, transport);
+}
+
 ExternalServiceDiscovery::ExternalServiceDiscovery(Client *client) : client_(client) { }
 
 bool ExternalServiceDiscovery::isSupported() const
diff --git a/src/xmpp/xmpp-im/xmpp_externalservicediscovery.h b/src/xmpp/xmpp-im/xmpp_externalservicediscovery.h
index a0ecf657..3f78a7c2 100644
--- a/src/xmpp/xmpp-im/xmpp_externalservicediscovery.h
+++ b/src/xmpp/xmpp-im/xmpp_externalservicediscovery.h
@@ -51,6 +51,7 @@ struct ExternalService {
     QString        username;           // optional
 
     bool parse(QDomElement &el);
+         operator QString() const;
 };
 
 struct ExternalServiceId {

From b8c3b849cec6ec984568491cf2743fdf57dae766 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Fri, 4 Jun 2021 11:20:29 +0300
Subject: [PATCH 335/383] ICE: addr:port -> TransportAddress

---
 src/irisnet/CMakeLists.txt                |   1 +
 src/irisnet/noncore/ice176.cpp            | 128 ++++++-------
 src/irisnet/noncore/ice176.h              |   8 +-
 src/irisnet/noncore/icecomponent.cpp      | 172 ++++++++---------
 src/irisnet/noncore/icecomponent.h        |  29 +--
 src/irisnet/noncore/icelocaltransport.cpp | 215 +++++++++-------------
 src/irisnet/noncore/icelocaltransport.h   |  27 ++-
 src/irisnet/noncore/icetransport.h        |  11 +-
 src/irisnet/noncore/iceturntransport.cpp  |  68 +++----
 src/irisnet/noncore/iceturntransport.h    |  16 +-
 src/irisnet/noncore/stunallocate.cpp      | 155 +++++++---------
 src/irisnet/noncore/stunallocate.h        |  28 ++-
 src/irisnet/noncore/stunbinding.cpp       |  38 ++--
 src/irisnet/noncore/stunbinding.h         |   8 +-
 src/irisnet/noncore/stuntransaction.cpp   |  74 ++++----
 src/irisnet/noncore/stuntransaction.h     |  11 +-
 src/irisnet/noncore/stuntypes.cpp         |  75 ++++----
 src/irisnet/noncore/stuntypes.h           |  27 ++-
 src/irisnet/noncore/stunutil.h            |   1 +
 src/irisnet/noncore/tcpportreserver.cpp   |   7 +-
 src/irisnet/noncore/tcpportreserver.h     |   2 +-
 src/irisnet/noncore/transportaddress.h    |  33 ++++
 src/irisnet/noncore/turnclient.cpp        | 148 +++++++--------
 src/irisnet/noncore/turnclient.h          |  18 +-
 24 files changed, 575 insertions(+), 725 deletions(-)
 create mode 100644 src/irisnet/noncore/transportaddress.h

diff --git a/src/irisnet/CMakeLists.txt b/src/irisnet/CMakeLists.txt
index 4ba13f38..f3d23ee1 100644
--- a/src/irisnet/CMakeLists.txt
+++ b/src/irisnet/CMakeLists.txt
@@ -102,6 +102,7 @@ set(HEADERS
 
     noncore/legacy/ndns.h
     noncore/legacy/srvresolver.h
+    noncore/transportaddress.h
 )
 
 if(JINGLE_SCTP)
diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index e91c9ef4..4b3603fa 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -215,14 +215,11 @@ class Ice176::Private : public QObject {
     int                                     componentCount = 0;
     QList<Ice176::LocalAddress>             localAddrs;
     QList<Ice176::ExternalAddress>          extAddrs;
-    QHostAddress                            stunBindAddr;
-    int                                     stunBindPort;
-    QHostAddress                            stunRelayUdpAddr;
-    int                                     stunRelayUdpPort;
+    TransportAddress                        stunBindAddr;
+    TransportAddress                        stunRelayUdpAddr;
     QString                                 stunRelayUdpUser;
     QCA::SecureArray                        stunRelayUdpPass;
-    QHostAddress                            stunRelayTcpAddr;
-    int                                     stunRelayTcpPort;
+    TransportAddress                        stunRelayTcpAddr;
     QString                                 stunRelayTcpUser;
     QCA::SecureArray                        stunRelayTcpPass;
     QPointer<AbstractStunDisco>             stunDiscoverer;
@@ -308,9 +305,9 @@ class Ice176::Private : public QObject {
 
     void stunFound(AbstractStunDisco::Service::Ptr service)
     {
+        quint16 port = service->port ? service->port : ((service->flags & AbstractStunDisco::Tls) ? 5349 : 3478);
         qDebug("found %s: %s:%hu %s %s", (service->flags & AbstractStunDisco::Relay) ? "TURN" : "STUN",
-               qPrintable(service->host), service->port ? service->port : std::uint16_t(3478),
-               service->transport == AbstractStunDisco::Tcp ? "tcp" : "udp",
+               qPrintable(service->host), port, service->transport == AbstractStunDisco::Tcp ? "tcp" : "udp",
                (service->flags & AbstractStunDisco::Tls) ? "tls" : "insecure");
     }
     void stunModified(AbstractStunDisco::Service::Ptr) { }
@@ -340,15 +337,13 @@ class Ice176::Private : public QObject {
             Component &c = components.back();
             c.id         = n + 1;
             c.ic         = new IceComponent(c.id, this);
-            c.ic->setDebugLevel(IceComponent::DL_Info);
-            connect(c.ic, SIGNAL(candidateAdded(XMPP::IceComponent::Candidate)),
-                    SLOT(ic_candidateAdded(XMPP::IceComponent::Candidate)));
-            connect(c.ic, SIGNAL(candidateRemoved(XMPP::IceComponent::Candidate)),
-                    SLOT(ic_candidateRemoved(XMPP::IceComponent::Candidate)));
-            connect(c.ic, SIGNAL(localFinished()), SLOT(ic_localFinished()));
+            c.ic->setDebugLevel(IceComponent::DL_Packet);
+            connect(c.ic, &IceComponent::candidateAdded, this, &Private::ic_candidateAdded);
+            connect(c.ic, &IceComponent::candidateRemoved, this, &Private::ic_candidateRemoved);
+            connect(c.ic, &IceComponent::localFinished, this, &Private::ic_localFinished);
             connect(c.ic, &IceComponent::gatheringComplete, this, &Private::ic_gatheringComplete);
-            connect(c.ic, SIGNAL(stopped()), SLOT(ic_stopped()));
-            connect(c.ic, SIGNAL(debugLine(QString)), SLOT(ic_debugLine(QString)));
+            connect(c.ic, &IceComponent::stopped, this, &Private::ic_stopped);
+            connect(c.ic, &IceComponent::debugLine, this, &Private::ic_debugLine);
 
             c.ic->setClientSoftwareNameAndVersion("Iris");
             c.ic->setProxy(proxy);
@@ -356,12 +351,12 @@ class Ice176::Private : public QObject {
                 c.ic->setPortReserver(portReserver);
             c.ic->setLocalAddresses(localAddrs);
             c.ic->setExternalAddresses(extAddrs);
-            if (!stunBindAddr.isNull())
-                c.ic->setStunBindService(stunBindAddr, stunBindPort);
-            if (!stunRelayUdpAddr.isNull())
-                c.ic->setStunRelayUdpService(stunRelayUdpAddr, stunRelayUdpPort, stunRelayUdpUser, stunRelayUdpPass);
-            if (!stunRelayTcpAddr.isNull())
-                c.ic->setStunRelayTcpService(stunRelayTcpAddr, stunRelayTcpPort, stunRelayTcpUser, stunRelayTcpPass);
+            if (stunBindAddr.isValid())
+                c.ic->setStunBindService(stunBindAddr);
+            if (stunRelayUdpAddr.isValid())
+                c.ic->setStunRelayUdpService(stunRelayUdpAddr, stunRelayUdpUser, stunRelayUdpPass);
+            if (stunRelayTcpAddr.isValid())
+                c.ic->setStunRelayTcpService(stunRelayTcpAddr, stunRelayTcpUser, stunRelayTcpPass);
 
             c.ic->setUseLocal(useLocal && allowIpExposure);
             c.ic->setUseStunBind(useStunBind && allowIpExposure);
@@ -607,7 +602,7 @@ class Ice176::Private : public QObject {
         pair->foundation = pair->local->foundation + pair->remote->foundation;
         pair->state      = PInProgress;
 
-        int at = findLocalCandidate(pair->local->addr.addr, pair->local->addr.port);
+        int at = findLocalCandidate(pair->local->addr);
         Q_ASSERT(at != -1);
 
         auto &lc = localCandidates[at];
@@ -617,14 +612,13 @@ class Ice176::Private : public QObject {
         // read comment to the pool member how wrong it is
         pair->pool = StunTransactionPool::Ptr::create(StunTransaction::Udp);
         connect(pair->pool.data(), &StunTransactionPool::outgoingMessage, this,
-                [this, weakPair = pair.toWeakRef()](const QByteArray &packet, const QHostAddress &, int) {
+                [this, weakPair = pair.toWeakRef()](const QByteArray &packet, const TransportAddress &) {
                     auto pair = weakPair.toStrongRef();
                     if (!pair)
                         return;
-                    int at = findLocalCandidate(pair->local->addr.addr, pair->local->addr.port);
+                    int at = findLocalCandidate(pair->local->addr);
                     if (at == -1) { // FIXME: assert?
-                        qDebug("Failed to find local candidate %s:%d", qPrintable(pair->local->addr.addr.toString()),
-                               pair->local->addr.port);
+                        qDebug("Failed to find local candidate %s", qPrintable(pair->local->addr));
                         return;
                     }
 
@@ -635,7 +629,7 @@ class Ice176::Private : public QObject {
                              (mode == Initiator
                                   ? (pair->binding->useCandidate() ? " (nominating)" : "")
                                   : (pair->isTriggeredForNominated ? " (triggered check for nominated)" : "")));
-                    lc.iceTransport->writeDatagram(path, packet, pair->remote->addr.addr, pair->remote->addr.port);
+                    lc.iceTransport->writeDatagram(path, packet, pair->remote->addr);
                 });
 
         // pair->pool->setUsername(peerUser + ':' + localUser);
@@ -710,7 +704,7 @@ class Ice176::Private : public QObject {
             }
         }
 
-        int at = findLocalCandidate(pair->local->addr.addr, pair->local->addr.port);
+        int at = findLocalCandidate(pair->local->addr);
         if (at == -1) { // FIXME: assert?
             iceDebug("FIXME! Failed to find local candidate for componentId=%d, addr=%s", componentIndex + 1,
                      qPrintable(pair->local->addr));
@@ -721,7 +715,7 @@ class Ice176::Private : public QObject {
 
         int path = lc.path;
 
-        lc.iceTransport->writeDatagram(path, datagram, pair->remote->addr.addr, pair->remote->addr.port);
+        lc.iceTransport->writeDatagram(path, datagram, pair->remote->addr);
 
         // DOR-SR?
         QMetaObject::invokeMethod(q, "datagramsWritten", Qt::QueuedConnection, Q_ARG(int, componentIndex),
@@ -749,8 +743,7 @@ class Ice176::Private : public QObject {
                 newValid.push_back(p);
         checkList.validPairs = newValid;
 
-        auto &sa = selected->local->base;
-        auto &t  = localCandidates[findLocalCandidate(sa.addr, sa.port)].iceTransport;
+        auto t = findTransport(selected->local->base);
         Q_ASSERT(t.data() != nullptr);
 
         // cancel planned/active transactions
@@ -1012,17 +1005,24 @@ class Ice176::Private : public QObject {
         return -1;
     }
 
-    int findLocalCandidate(const QHostAddress &fromAddr, int fromPort)
+    int findLocalCandidate(const TransportAddress &fromAddr)
     {
         for (int n = 0; n < localCandidates.count(); ++n) {
-            const IceComponent::Candidate &cc = localCandidates[n];
-            if (cc.info->addr.addr == fromAddr && cc.info->addr.port == fromPort)
+            if (localCandidates[n].info->addr == fromAddr)
                 return n;
         }
 
         return -1;
     }
 
+    QSharedPointer<IceTransport> findTransport(const TransportAddress &addr)
+    {
+        auto c = findLocalCandidate(addr);
+        if (c >= 0)
+            return localCandidates[c].iceTransport;
+        return {};
+    }
+
     static QString candidateType_to_string(IceComponent::CandidateType type)
     {
         QString out;
@@ -1183,8 +1183,8 @@ class Ice176::Private : public QObject {
 
         // if (c.lowOverhead) { // commented out since we need turn permissions for all components
         iceDebug("component is flagged for low overhead.  setting up for %s", qPrintable(*pair));
-        auto &cc = localCandidates[findLocalCandidate(pair->local->addr.addr, pair->local->addr.port)];
-        component.ic->flagPathAsLowOverhead(cc.id, pair->remote->addr.addr, pair->remote->addr.port);
+        auto &cc = localCandidates[findLocalCandidate(pair->local->addr)];
+        component.ic->flagPathAsLowOverhead(cc.id, pair->remote->addr);
         //}
 
         if (pair->isNominated) {
@@ -1220,9 +1220,9 @@ class Ice176::Private : public QObject {
         iceDebug("check success for %s", qPrintable(QString(*pair)));
 
         // RFC8445 7.2.5.3.1.  Discovering Peer-Reflexive Candidates
-        auto mappedAddr = IceComponent::TransportAddress(binding->reflexiveAddress(), binding->reflexivePort());
-        if (pair->local->addr != mappedAddr) { // skip "If the valid pair equals the pair that generated the check"
-
+        auto mappedAddr = binding->reflexiveAddress();
+        // skip "If the valid pair equals the pair that generated the check"
+        if (pair->local->addr != binding->reflexiveAddress()) {
             // so mapped address doesn't match with local candidate sending binding request.
             // gotta find/create one
             auto locIt = std::find_if(localCandidates.begin(), localCandidates.end(), [&](const auto &c) {
@@ -1484,9 +1484,8 @@ private slots:
         IceTransport *sock = it;
 
         while (sock->hasPendingDatagrams(path)) {
-            QHostAddress fromAddr;
-            quint16      fromPort;
-            QByteArray   buf = sock->readDatagram(path, &fromAddr, &fromPort);
+            TransportAddress fromAddr;
+            QByteArray       buf = sock->readDatagram(path, fromAddr);
 
             // iceDebug("port %d: received packet (%d bytes)", lt->sock->localPort(), buf.size());
 
@@ -1497,8 +1496,7 @@ private slots:
             StunMessage                msg = StunMessage::fromBinary(buf, &result,
                                                       StunMessage::MessageIntegrity | StunMessage::Fingerprint, reqkey);
             if (!msg.isNull() && (msg.mclass() == StunMessage::Request || msg.mclass() == StunMessage::Indication)) {
-                iceDebug("received validated request or indication from %s:%d", qPrintable(fromAddr.toString()),
-                         fromPort);
+                iceDebug("received validated request or indication from %s", qPrintable(fromAddr));
                 QString user = QString::fromUtf8(msg.attribute(StunTypes::USERNAME));
                 if (requser != user) {
                     iceDebug("user [%s] is wrong.  it should be [%s].  skipping", qPrintable(user),
@@ -1519,32 +1517,31 @@ private slots:
                 QList<StunMessage::Attribute> list;
                 StunMessage::Attribute        attr;
                 attr.type  = StunTypes::XOR_MAPPED_ADDRESS;
-                attr.value = StunTypes::createXorPeerAddress(fromAddr, fromPort, response.magic(), response.id());
+                attr.value = StunTypes::createXorPeerAddress(fromAddr, response.magic(), response.id());
                 list += attr;
 
                 response.setAttributes(list);
 
                 QByteArray packet = response.toBinary(StunMessage::MessageIntegrity | StunMessage::Fingerprint, reqkey);
-                sock->writeDatagram(path, packet, fromAddr, fromPort);
+                sock->writeDatagram(path, packet, fromAddr);
 
                 if (state != Started) // only in started state we do triggered checks
                     return;
 
-                auto it        = std::find_if(remoteCandidates.begin(), remoteCandidates.end(),
-                                       [&](IceComponent::CandidateInfo::Ptr remCand) {
-                                           return remCand->componentId == locCand.info->componentId
-                                               && remCand->addr.addr == fromAddr && remCand->addr.port == fromPort;
-                                       });
+                auto it = std::find_if(
+                    remoteCandidates.begin(), remoteCandidates.end(), [&](IceComponent::CandidateInfo::Ptr remCand) {
+                        return remCand->componentId == locCand.info->componentId && remCand->addr == fromAddr;
+                    });
                 bool nominated = false;
                 if (mode == Responder)
                     nominated = msg.hasAttribute(StunTypes::USE_CANDIDATE);
                 if (it == remoteCandidates.end()) {
                     // RFC8445 7.3.1.3.  Learning Peer-Reflexive Candidates
-                    iceDebug("found NEW remote prflx! %s:%d", qPrintable(fromAddr.toString()), fromPort);
+                    iceDebug("found NEW remote prflx! %s", qPrintable(fromAddr));
                     quint32 priority;
                     StunTypes::parsePriority(msg.attribute(StunTypes::PRIORITY), &priority);
-                    auto remCand = IceComponent::CandidateInfo::makeRemotePrflx(locCand.info->componentId, fromAddr,
-                                                                                fromPort, priority);
+                    auto remCand
+                        = IceComponent::CandidateInfo::makeRemotePrflx(locCand.info->componentId, fromAddr, priority);
                     remoteCandidates += remCand;
                     doTriggeredCheck(locCand, remCand, nominated);
                 } else {
@@ -1556,7 +1553,7 @@ private slots:
                     buf, &result, StunMessage::MessageIntegrity | StunMessage::Fingerprint, reskey);
                 if (!msg.isNull()
                     && (msg.mclass() == StunMessage::SuccessResponse || msg.mclass() == StunMessage::ErrorResponse)) {
-                    iceDebug("received validated response from %s:%d to %s", qPrintable(fromAddr.toString()), fromPort,
+                    iceDebug("received validated response from %s to %s", qPrintable(fromAddr),
                              qPrintable(locCand.info->addr));
 
                     // FIXME: this is so gross and completely defeats the point of having pools
@@ -1600,13 +1597,12 @@ private slots:
         }
     }
 
-    void it_datagramsWritten(int path, int count, const QHostAddress &addr, int port)
+    void it_datagramsWritten(int path, int count, const TransportAddress &addr)
     {
         // TODO
         Q_UNUSED(path);
         Q_UNUSED(count);
         Q_UNUSED(addr);
-        Q_UNUSED(port);
     }
 };
 
@@ -1629,26 +1625,20 @@ void Ice176::setLocalAddresses(const QList<LocalAddress> &addrs) { d->updateLoca
 
 void Ice176::setExternalAddresses(const QList<ExternalAddress> &addrs) { d->updateExternalAddresses(addrs); }
 
-void Ice176::setStunBindService(const QHostAddress &addr, int port)
-{
-    d->stunBindAddr = addr;
-    d->stunBindPort = port;
-}
+void Ice176::setStunBindService(const QHostAddress &addr, quint16 port) { d->stunBindAddr = { addr, port }; }
 
-void Ice176::setStunRelayUdpService(const QHostAddress &addr, int port, const QString &user,
+void Ice176::setStunRelayUdpService(const QHostAddress &addr, quint16 port, const QString &user,
                                     const QCA::SecureArray &pass)
 {
-    d->stunRelayUdpAddr = addr;
-    d->stunRelayUdpPort = port;
+    d->stunRelayUdpAddr = { addr, port };
     d->stunRelayUdpUser = user;
     d->stunRelayUdpPass = pass;
 }
 
-void Ice176::setStunRelayTcpService(const QHostAddress &addr, int port, const QString &user,
+void Ice176::setStunRelayTcpService(const QHostAddress &addr, quint16 port, const QString &user,
                                     const QCA::SecureArray &pass)
 {
-    d->stunRelayTcpAddr = addr;
-    d->stunRelayTcpPort = port;
+    d->stunRelayTcpAddr = { addr, port };
     d->stunRelayTcpUser = user;
     d->stunRelayTcpPass = pass;
 }
diff --git a/src/irisnet/noncore/ice176.h b/src/irisnet/noncore/ice176.h
index 063d5ee0..b589f61b 100644
--- a/src/irisnet/noncore/ice176.h
+++ b/src/irisnet/noncore/ice176.h
@@ -98,9 +98,11 @@ class Ice176 : public QObject {
     // one per local address.  you must set local addresses first.
     void setExternalAddresses(const QList<ExternalAddress> &addrs);
 
-    void setStunBindService(const QHostAddress &addr, int port); // REVIEW if we need both v4 and v6?
-    void setStunRelayUdpService(const QHostAddress &addr, int port, const QString &user, const QCA::SecureArray &pass);
-    void setStunRelayTcpService(const QHostAddress &addr, int port, const QString &user, const QCA::SecureArray &pass);
+    void setStunBindService(const QHostAddress &addr, quint16 port); // REVIEW if we need both v4 and v6?
+    void setStunRelayUdpService(const QHostAddress &addr, quint16 port, const QString &user,
+                                const QCA::SecureArray &pass);
+    void setStunRelayTcpService(const QHostAddress &addr, quint16 port, const QString &user,
+                                const QCA::SecureArray &pass);
 
     // these all start out enabled, but can be disabled for diagnostic
     //   purposes
diff --git a/src/irisnet/noncore/icecomponent.cpp b/src/irisnet/noncore/icecomponent.cpp
index 58e24572..563f8da9 100644
--- a/src/irisnet/noncore/icecomponent.cpp
+++ b/src/irisnet/noncore/icecomponent.cpp
@@ -56,16 +56,13 @@ class IceComponent::Private : public QObject {
         // for example manually provided external address mapped to every local
         QList<Ice176::ExternalAddress> extAddrs;
 
-        QHostAddress stunBindAddr;
-        int          stunBindPort;
+        TransportAddress stunBindAddr;
 
-        QHostAddress     stunRelayUdpAddr;
-        int              stunRelayUdpPort;
+        TransportAddress stunRelayUdpAddr;
         QString          stunRelayUdpUser;
         QCA::SecureArray stunRelayUdpPass;
 
-        QHostAddress     stunRelayTcpAddr;
-        int              stunRelayTcpPort;
+        TransportAddress stunRelayTcpAddr;
         QString          stunRelayTcpUser;
         QCA::SecureArray stunRelayTcpPass;
     };
@@ -111,7 +108,7 @@ class IceComponent::Private : public QObject {
     bool                               localFinished   = false;
     // bool                               stunFinished      = false;
     bool gatheringComplete = false;
-    int  debugLevel        = DL_None;
+    int  debugLevel        = DL_Packet;
 
     Private(IceComponent *_q) : QObject(_q), q(_q), sess(this) { }
 
@@ -126,12 +123,12 @@ class IceComponent::Private : public QObject {
         lt->sock->setDebugLevel(IceTransport::DebugLevel(debugLevel));
         lt->network = la.network;
         lt->isVpn   = la.isVpn;
-        connect(lt->sock.data(), SIGNAL(started()), SLOT(lt_started()));
+        connect(lt->sock.data(), &IceLocalTransport::started, this, &Private::lt_started);
         connect(lt->sock.data(), &IceLocalTransport::stopped, this, [this, lt]() {
             if (eraseLocalTransport(lt))
                 tryStopped();
         });
-        connect(lt->sock.data(), SIGNAL(addressesChanged()), SLOT(lt_addressesChanged()));
+        connect(lt->sock.data(), &IceLocalTransport::addressesChanged, this, &Private::lt_addressesChanged);
         connect(lt->sock.data(), &IceLocalTransport::error, this, [this, lt](int error) {
             if (error == IceLocalTransport::ErrorStun) {
                 lt->stun_finished = true;
@@ -142,7 +139,7 @@ class IceComponent::Private : public QObject {
             } else if (eraseLocalTransport(lt))
                 tryGatheringComplete();
         });
-        connect(lt->sock.data(), SIGNAL(debugLine(QString)), SLOT(lt_debugLine(QString)));
+        connect(lt->sock.data(), &IceLocalTransport::debugLine, this, &Private::lt_debugLine);
         return lt;
     }
 
@@ -151,17 +148,14 @@ class IceComponent::Private : public QObject {
         Q_ASSERT(!stopping);
 
         // only allow setting stun stuff once
-        if ((!pending.stunBindAddr.isNull() && config.stunBindAddr.isNull())
-            || (!pending.stunRelayUdpAddr.isNull() && config.stunRelayUdpAddr.isNull())
-            || (!pending.stunRelayTcpAddr.isNull() && config.stunRelayTcpAddr.isNull())) {
+        if ((pending.stunBindAddr.isValid() && !config.stunBindAddr.isValid())
+            || (pending.stunRelayUdpAddr.isValid() && !config.stunRelayUdpAddr.isValid())
+            || (pending.stunRelayTcpAddr.isValid() && !config.stunRelayTcpAddr.isValid())) {
             config.stunBindAddr     = pending.stunBindAddr;
-            config.stunBindPort     = pending.stunBindPort;
             config.stunRelayUdpAddr = pending.stunRelayUdpAddr;
-            config.stunRelayUdpPort = pending.stunRelayUdpPort;
             config.stunRelayUdpUser = pending.stunRelayUdpUser;
             config.stunRelayUdpPass = pending.stunRelayUdpPass;
             config.stunRelayTcpAddr = pending.stunRelayTcpAddr;
-            config.stunRelayTcpPort = pending.stunRelayTcpPort;
             config.stunRelayTcpUser = pending.stunRelayTcpUser;
             config.stunRelayTcpPass = pending.stunRelayTcpPass;
         }
@@ -195,12 +189,12 @@ class IceComponent::Private : public QObject {
 
                 if (lt->addr.protocol() != QAbstractSocket::IPv6Protocol) {
                     lt->sock->setClientSoftwareNameAndVersion(clientSoftware);
-                    if (useStunBind && !config.stunBindAddr.isNull()) {
-                        lt->sock->setStunBindService(config.stunBindAddr, config.stunBindPort);
+                    if (useStunBind && config.stunBindAddr.isValid()) {
+                        lt->sock->setStunBindService(config.stunBindAddr);
                     }
-                    if (useStunRelayUdp && !config.stunRelayUdpAddr.isNull() && !config.stunRelayUdpUser.isEmpty()) {
-                        lt->sock->setStunRelayService(config.stunRelayUdpAddr, config.stunRelayUdpPort,
-                                                      config.stunRelayUdpUser, config.stunRelayUdpPass);
+                    if (useStunRelayUdp && config.stunRelayUdpAddr.isValid() && !config.stunRelayUdpUser.isEmpty()) {
+                        lt->sock->setStunRelayService(config.stunRelayUdpAddr, config.stunRelayUdpUser,
+                                                      config.stunRelayUdpPass);
                     }
                 }
 
@@ -222,15 +216,13 @@ class IceComponent::Private : public QObject {
                 if (!lt->extAddr.isNull())
                     continue;
 
-                QHostAddress laddr = lt->sock->localAddress();
-                int          lport = lt->sock->localPort();
-
-                if (laddr.protocol() == QAbstractSocket::IPv6Protocol)
+                auto laddr = lt->sock->localAddress();
+                if (laddr.addr.protocol() == QAbstractSocket::IPv6Protocol)
                     continue;
 
                 // find external address by address of local socket (external has to be configured that way)
                 auto eaIt = std::find_if(config.extAddrs.constBegin(), config.extAddrs.constEnd(), [&](auto const &ea) {
-                    return ea.base.addr == laddr && (ea.portBase == -1 || ea.portBase == lport);
+                    return ea.base.addr == laddr.addr && (ea.portBase == -1 || ea.portBase == laddr.port);
                 });
 
                 if (eaIt != config.extAddrs.constEnd()) {
@@ -260,21 +252,21 @@ class IceComponent::Private : public QObject {
                 });
         }
 
-        if (useStunRelayTcp && !config.stunRelayTcpAddr.isNull() && !config.stunRelayTcpUser.isEmpty() && !tcpTurn) {
+        if (useStunRelayTcp && config.stunRelayTcpAddr.isValid() && !config.stunRelayTcpUser.isEmpty() && !tcpTurn) {
             tcpTurn = QSharedPointer<IceTurnTransport>::create();
             tcpTurn->setDebugLevel(IceTransport::DebugLevel(debugLevel));
-            connect(tcpTurn.data(), SIGNAL(started()), SLOT(tt_started()));
-            connect(tcpTurn.data(), SIGNAL(stopped()), SLOT(tt_stopped()));
-            connect(tcpTurn.data(), SIGNAL(error(int)), SLOT(tt_error(int)));
-            connect(tcpTurn.data(), SIGNAL(debugLine(QString)), SLOT(tt_debugLine(QString)));
+            connect(tcpTurn.data(), &IceTurnTransport::started, this, &Private::tt_started);
+            connect(tcpTurn.data(), &IceTurnTransport::stopped, this, &Private::tt_stopped);
+            connect(tcpTurn.data(), &IceTurnTransport::error, this, &Private::tt_error);
+            connect(tcpTurn.data(), &IceTurnTransport::debugLine, this, &Private::tt_debugLine);
             tcpTurn->setClientSoftwareNameAndVersion(clientSoftware);
             tcpTurn->setProxy(proxy);
             tcpTurn->setUsername(config.stunRelayTcpUser);
             tcpTurn->setPassword(config.stunRelayTcpPass);
-            tcpTurn->start(config.stunRelayTcpAddr, config.stunRelayTcpPort);
+            tcpTurn->start(config.stunRelayTcpAddr);
 
-            emit q->debugLine(QString("starting TURN transport with server ") + config.stunRelayTcpAddr.toString() + ';'
-                              + QString::number(config.stunRelayTcpPort) + " for component " + QString::number(id));
+            emit q->debugLine(QLatin1String("starting TURN transport with server ") + config.stunRelayTcpAddr
+                              + " for component " + QString::number(id));
         }
 
         if (udpTransports.isEmpty() && !localFinished) {
@@ -324,7 +316,7 @@ class IceComponent::Private : public QObject {
         return choose_default_priority(PeerReflexiveType, 65535 - addrAt, false, id);
     }
 
-    void flagPathAsLowOverhead(int id, const QHostAddress &addr, int port)
+    void flagPathAsLowOverhead(int id, const TransportAddress &addr)
     {
         int at = -1;
         for (int n = 0; n < localCandidates.count(); ++n) {
@@ -341,16 +333,15 @@ class IceComponent::Private : public QObject {
 
         Candidate &c = localCandidates[at];
 
-        TransportAddress        ta(addr, port);
         QSet<TransportAddress> &addrs = channelPeers[c.id];
-        if (!addrs.contains(ta)) {
-            addrs += ta;
-            c.iceTransport->addChannelPeer(ta.addr, ta.port);
+        if (!addrs.contains(addr)) {
+            addrs += addr;
+            c.iceTransport->addChannelPeer(addr);
         }
     }
 
-    void addLocalPeerReflexiveCandidate(const IceComponent::TransportAddress &addr,
-                                        IceComponent::CandidateInfo::Ptr base, quint32 priority)
+    void addLocalPeerReflexiveCandidate(const TransportAddress &addr, IceComponent::CandidateInfo::Ptr base,
+                                        quint32 priority)
     {
         auto ci  = IceComponent::CandidateInfo::Ptr::create();
         ci->addr = addr;
@@ -447,12 +438,11 @@ class IceComponent::Private : public QObject {
         if (!lt->extAddr.isNull() && !lt->ext_finished) {
             auto ci         = CandidateInfo::Ptr::create();
             ci->addr.addr   = lt->extAddr;
-            ci->addr.port   = lt->sock->localPort();
+            ci->addr.port   = lt->sock->localAddress().port;
             ci->type        = ServerReflexiveType;
             ci->componentId = id;
             ci->priority    = choose_default_priority(ci->type, 65535 - addrAt, lt->isVpn, ci->componentId);
-            ci->base.addr   = lt->sock->localAddress();
-            ci->base.port   = lt->sock->localPort();
+            ci->base        = lt->sock->localAddress();
             ci->related     = ci->base;
             ci->network     = lt->network;
             ci->foundation  = IceAgent::instance()->foundation(ServerReflexiveType, ci->base.addr);
@@ -516,9 +506,7 @@ class IceComponent::Private : public QObject {
     {
         ObjectSessionWatcher watch(&sess);
 
-        emit q->debugLine(QString("Stopping local transport: %1:%2")
-                              .arg(lt->sock->localAddress().toString(), QString::number(lt->sock->localPort())));
-
+        emit q->debugLine(QLatin1String("Stopping local transport: ") + lt->sock->localAddress());
         removeLocalCandidates(lt->sock);
         if (!watch.isValid())
             return false;
@@ -540,8 +528,8 @@ private slots:
             return;
 
         auto checkFinished = [&](const LocalTransport *lt) {
-            return lt->started && (lt->sock->stunBindServiceAddress().isNull() || lt->stun_finished)
-                && (lt->sock->stunRelayServiceAddress().isNull() || lt->turn_finished);
+            return lt->started && (!lt->sock->stunBindServiceAddress().isValid() || lt->stun_finished)
+                && (!lt->sock->stunRelayServiceAddress().isValid() || lt->turn_finished);
         };
 
         bool allFinished = true;
@@ -583,8 +571,7 @@ private slots:
 
         if (useLocal) {
             auto ci         = CandidateInfo::Ptr::create();
-            ci->addr.addr   = lt->sock->localAddress();
-            ci->addr.port   = lt->sock->localPort();
+            ci->addr        = lt->sock->localAddress();
             ci->type        = HostType;
             ci->componentId = id;
             ci->priority    = choose_default_priority(ci->type, 65535 - addrAt, lt->isVpn, ci->componentId);
@@ -612,7 +599,7 @@ private slots:
         if (!lt->stun_started) {
             lt->stun_started = true;
             if (useStunBind
-                && (!lt->sock->stunBindServiceAddress().isNull() || !lt->sock->stunRelayServiceAddress().isNull())) {
+                && (lt->sock->stunBindServiceAddress().isValid() || lt->sock->stunRelayServiceAddress().isValid())) {
                 lt->sock->stunStart();
                 if (!watch.isValid())
                     return;
@@ -656,11 +643,11 @@ private slots:
 
         ObjectSessionWatcher watch(&sess);
 
-        if (useStunBind && !lt->sock->serverReflexiveAddress().isNull() && !lt->stun_finished) {
+        if (useStunBind && lt->sock->serverReflexiveAddress().isValid() && !lt->stun_finished) {
             // automatically assign ext to related leaps, if possible
             for (LocalTransport *i : as_const(udpTransports)) {
                 if (i->extAddr.isNull() && i->sock->localAddress() == lt->sock->localAddress()) {
-                    i->extAddr = lt->sock->serverReflexiveAddress();
+                    i->extAddr = lt->sock->serverReflexiveAddress().addr;
                     if (i->started) {
                         ensureExt(i, addrAt);
                         if (!watch.isValid())
@@ -670,10 +657,8 @@ private slots:
             }
 
             auto ci         = CandidateInfo::Ptr::create();
-            ci->addr.addr   = lt->sock->serverReflexiveAddress();
-            ci->addr.port   = lt->sock->serverReflexivePort();
-            ci->base.addr   = lt->sock->localAddress();
-            ci->base.port   = lt->sock->localPort();
+            ci->addr        = lt->sock->serverReflexiveAddress();
+            ci->base        = lt->sock->localAddress();
             ci->related     = ci->base;
             ci->type        = ServerReflexiveType;
             ci->componentId = id;
@@ -695,19 +680,17 @@ private slots:
             lt->stun_finished = true;
         }
 
-        if (!lt->sock->relayedAddress().isNull() && !lt->turn_finished) {
-            auto ci          = CandidateInfo::Ptr::create();
-            ci->addr.addr    = lt->sock->relayedAddress();
-            ci->addr.port    = lt->sock->relayedPort();
-            ci->base         = ci->addr;
-            ci->related.addr = lt->sock->serverReflexiveAddress();
-            ci->related.port = lt->sock->serverReflexivePort();
-            ci->type         = RelayedType;
-            ci->componentId  = id;
-            ci->priority     = choose_default_priority(ci->type, 65535 - addrAt, lt->isVpn, ci->componentId);
-            ci->network      = lt->network;
-            ci->foundation   = IceAgent::instance()->foundation(
-                RelayedType, ci->base.addr, lt->sock->stunRelayServiceAddress(), QAbstractSocket::UdpSocket);
+        if (lt->sock->relayedAddress().isValid() && !lt->turn_finished) {
+            auto ci         = CandidateInfo::Ptr::create();
+            ci->addr        = lt->sock->relayedAddress();
+            ci->base        = ci->addr;
+            ci->related     = lt->sock->serverReflexiveAddress();
+            ci->type        = RelayedType;
+            ci->componentId = id;
+            ci->priority    = choose_default_priority(ci->type, 65535 - addrAt, lt->isVpn, ci->componentId);
+            ci->network     = lt->network;
+            ci->foundation  = IceAgent::instance()->foundation(
+                RelayedType, ci->base.addr, lt->sock->stunRelayServiceAddress().addr, QAbstractSocket::UdpSocket);
 
             Candidate c;
             c.id           = getId();
@@ -734,17 +717,15 @@ private slots:
         // lower priority by making it seem like the last nic
         int addrAt = 1024;
 
-        auto ci          = CandidateInfo::Ptr::create();
-        ci->addr.addr    = tcpTurn->relayedAddress();
-        ci->addr.port    = tcpTurn->relayedPort();
-        ci->related.addr = tcpTurn->reflexiveAddress();
-        ci->related.port = tcpTurn->reflexivePort();
-        ci->type         = RelayedType;
-        ci->componentId  = id;
-        ci->priority     = choose_default_priority(ci->type, 65535 - addrAt, false, ci->componentId);
-        ci->base         = ci->addr;
-        ci->network      = 0; // not relevant
-        ci->foundation   = IceAgent::instance()->foundation(RelayedType, ci->base.addr, config.stunRelayTcpAddr,
+        auto ci         = CandidateInfo::Ptr::create();
+        ci->addr        = tcpTurn->relayedAddress();
+        ci->related     = tcpTurn->reflexiveAddress();
+        ci->type        = RelayedType;
+        ci->componentId = id;
+        ci->priority    = choose_default_priority(ci->type, 65535 - addrAt, false, ci->componentId);
+        ci->base        = ci->addr;
+        ci->network     = 0; // not relevant
+        ci->foundation  = IceAgent::instance()->foundation(RelayedType, ci->base.addr, config.stunRelayTcpAddr.addr,
                                                           QAbstractSocket::TcpSocket);
 
         Candidate c;
@@ -816,26 +797,20 @@ void IceComponent::setLocalAddresses(const QList<Ice176::LocalAddress> &addrs) {
 
 void IceComponent::setExternalAddresses(const QList<Ice176::ExternalAddress> &addrs) { d->pending.extAddrs = addrs; }
 
-void IceComponent::setStunBindService(const QHostAddress &addr, int port)
-{
-    d->pending.stunBindAddr = addr;
-    d->pending.stunBindPort = port;
-}
+void IceComponent::setStunBindService(const TransportAddress &addr) { d->pending.stunBindAddr = addr; }
 
-void IceComponent::setStunRelayUdpService(const QHostAddress &addr, int port, const QString &user,
+void IceComponent::setStunRelayUdpService(const TransportAddress &addr, const QString &user,
                                           const QCA::SecureArray &pass)
 {
     d->pending.stunRelayUdpAddr = addr;
-    d->pending.stunRelayUdpPort = port;
     d->pending.stunRelayUdpUser = user;
     d->pending.stunRelayUdpPass = pass;
 }
 
-void IceComponent::setStunRelayTcpService(const QHostAddress &addr, int port, const QString &user,
+void IceComponent::setStunRelayTcpService(const TransportAddress &addr, const QString &user,
                                           const QCA::SecureArray &pass)
 {
     d->pending.stunRelayTcpAddr = addr;
-    d->pending.stunRelayTcpPort = port;
     d->pending.stunRelayTcpUser = user;
     d->pending.stunRelayTcpPass = pass;
 }
@@ -857,15 +832,15 @@ int IceComponent::peerReflexivePriority(QSharedPointer<IceTransport> iceTranspor
     return d->peerReflexivePriority(iceTransport, path);
 }
 
-void IceComponent::addLocalPeerReflexiveCandidate(const IceComponent::TransportAddress &addr,
-                                                  IceComponent::CandidateInfo::Ptr base, quint32 priority)
+void IceComponent::addLocalPeerReflexiveCandidate(const TransportAddress &addr, IceComponent::CandidateInfo::Ptr base,
+                                                  quint32 priority)
 {
     d->addLocalPeerReflexiveCandidate(addr, base, priority);
 }
 
-void IceComponent::flagPathAsLowOverhead(int id, const QHostAddress &addr, int port)
+void IceComponent::flagPathAsLowOverhead(int id, const TransportAddress &addr)
 {
-    return d->flagPathAsLowOverhead(id, addr, port);
+    return d->flagPathAsLowOverhead(id, addr);
 }
 
 void IceComponent::setDebugLevel(DebugLevel level)
@@ -877,12 +852,11 @@ void IceComponent::setDebugLevel(DebugLevel level)
         d->tcpTurn->setDebugLevel((IceTransport::DebugLevel)level);
 }
 
-IceComponent::CandidateInfo::Ptr IceComponent::CandidateInfo::makeRemotePrflx(int                 componentId,
-                                                                              const QHostAddress &fromAddr,
-                                                                              quint16 fromPort, quint32 priority)
+IceComponent::CandidateInfo::Ptr
+IceComponent::CandidateInfo::makeRemotePrflx(int componentId, const TransportAddress &fromAddr, quint32 priority)
 {
     auto c  = IceComponent::CandidateInfo::Ptr::create();
-    c->addr = TransportAddress(fromAddr, fromPort);
+    c->addr = fromAddr;
     c->addr.addr.setScopeId(QString());
     c->type        = PeerReflexiveType;
     c->priority    = priority;
diff --git a/src/irisnet/noncore/icecomponent.h b/src/irisnet/noncore/icecomponent.h
index 791cd30c..29fd09ac 100644
--- a/src/irisnet/noncore/icecomponent.h
+++ b/src/irisnet/noncore/icecomponent.h
@@ -36,21 +36,6 @@ class IceComponent : public QObject {
 public:
     enum CandidateType { HostType, PeerReflexiveType, ServerReflexiveType, RelayedType };
 
-    class TransportAddress {
-    public:
-        QHostAddress addr;
-        int          port;
-
-        TransportAddress() : port(-1) { }
-
-        TransportAddress(const QHostAddress &_addr, int _port) : addr(_addr), port(_port) { }
-
-        bool operator==(const TransportAddress &other) const { return addr == other.addr && port == other.port; }
-
-        inline bool operator!=(const TransportAddress &other) const { return !operator==(other); }
-        inline      operator QString() const { return QString("%1:%2").arg(addr.toString(), QString::number(port)); }
-    };
-
     class CandidateInfo {
     public:
         using Ptr = QSharedPointer<CandidateInfo>;
@@ -67,7 +52,7 @@ class IceComponent : public QObject {
         QString foundation;
         QString id;
 
-        static Ptr  makeRemotePrflx(int componentId, const QHostAddress &fromAddr, quint16 fromPort, quint32 priority);
+        static Ptr  makeRemotePrflx(int componentId, const TransportAddress &fromAddr, quint32 priority);
         inline bool operator==(const CandidateInfo &o) const { return addr == o.addr && componentId == o.componentId; }
         inline bool operator==(CandidateInfo::Ptr o) const { return *this == *o; }
     };
@@ -111,9 +96,9 @@ class IceComponent : public QObject {
     void setExternalAddresses(const QList<Ice176::ExternalAddress> &addrs);
 
     // can be set at any time, but only once.  later changes are ignored
-    void setStunBindService(const QHostAddress &addr, int port);
-    void setStunRelayUdpService(const QHostAddress &addr, int port, const QString &user, const QCA::SecureArray &pass);
-    void setStunRelayTcpService(const QHostAddress &addr, int port, const QString &user, const QCA::SecureArray &pass);
+    void setStunBindService(const TransportAddress &addr);
+    void setStunRelayUdpService(const TransportAddress &addr, const QString &user, const QCA::SecureArray &pass);
+    void setStunRelayTcpService(const TransportAddress &addr, const QString &user, const QCA::SecureArray &pass);
 
     // these all start out enabled, but can be disabled for diagnostic
     //   purposes
@@ -136,7 +121,7 @@ class IceComponent : public QObject {
 
     void addLocalPeerReflexiveCandidate(const TransportAddress &addr, CandidateInfo::Ptr base, quint32 priority);
 
-    void flagPathAsLowOverhead(int id, const QHostAddress &addr, int port);
+    void flagPathAsLowOverhead(int id, const TransportAddress &addr);
 
     void setDebugLevel(DebugLevel level);
 
@@ -166,10 +151,6 @@ class IceComponent : public QObject {
     Private *d;
 };
 
-inline uint qHash(const XMPP::IceComponent::TransportAddress &key, uint seed = 0)
-{
-    return ::qHash(key.addr, seed) ^ ::qHash(key.port, seed);
-}
 } // namespace XMPP
 
 #endif // ICECOMPONENT_H
diff --git a/src/irisnet/noncore/icelocaltransport.cpp b/src/irisnet/noncore/icelocaltransport.cpp
index dc90c992..bffdb9cc 100644
--- a/src/irisnet/noncore/icelocaltransport.cpp
+++ b/src/irisnet/noncore/icelocaltransport.cpp
@@ -51,8 +51,8 @@ class SafeUdpSocket : public QObject {
     SafeUdpSocket(QUdpSocket *_sock, QObject *parent = nullptr) : QObject(parent), sess(this), sock(_sock)
     {
         sock->setParent(this);
-        connect(sock, SIGNAL(readyRead()), SLOT(sock_readyRead()));
-        connect(sock, SIGNAL(bytesWritten(qint64)), SLOT(sock_bytesWritten(qint64)));
+        connect(sock, &QUdpSocket::readyRead, this, &SafeUdpSocket::sock_readyRead);
+        connect(sock, &QUdpSocket::bytesWritten, this, &SafeUdpSocket::sock_bytesWritten);
 
         writtenCount = 0;
     }
@@ -74,26 +74,28 @@ class SafeUdpSocket : public QObject {
         return out;
     }
 
+    TransportAddress localTransportAddress() const { return { sock->localAddress(), sock->localPort() }; }
+
     QHostAddress localAddress() const { return sock->localAddress(); }
 
     quint16 localPort() const { return sock->localPort(); }
 
     bool hasPendingDatagrams() const { return sock->hasPendingDatagrams(); }
 
-    QByteArray readDatagram(QHostAddress *address = nullptr, quint16 *port = nullptr)
+    QByteArray readDatagram(TransportAddress &address)
     {
         if (!sock->hasPendingDatagrams())
             return QByteArray();
 
         QByteArray buf;
         buf.resize(int(sock->pendingDatagramSize()));
-        sock->readDatagram(buf.data(), buf.size(), address, port);
+        sock->readDatagram(buf.data(), buf.size(), &address.addr, &address.port);
         return buf;
     }
 
-    void writeDatagram(const QByteArray &buf, const QHostAddress &address, quint16 port)
+    void writeDatagram(const QByteArray &buf, const TransportAddress &address)
     {
-        sock->writeDatagram(buf, address, port);
+        sock->writeDatagram(buf, address.addr, address.port);
     }
 
 signals:
@@ -131,60 +133,47 @@ class IceLocalTransport::Private : public QObject {
     public:
         enum Type { Direct, Pool, Turn };
 
-        Type         type;
-        QHostAddress addr;
-        int          port;
+        Type             type;
+        TransportAddress addr;
     };
 
     class Written {
     public:
-        QHostAddress addr;
-        int          port;
-        int          count;
+        TransportAddress addr;
+        int              count;
     };
 
     class Datagram {
     public:
-        QHostAddress addr;
-        quint16      port;
-        QByteArray   buf;
+        TransportAddress addr;
+        QByteArray       buf;
     };
 
     IceLocalTransport *      q;
     ObjectSession            sess;
-    QUdpSocket *             extSock;
-    SafeUdpSocket *          sock;
+    QUdpSocket *             extSock = nullptr;
+    SafeUdpSocket *          sock    = nullptr;
     StunTransactionPool::Ptr pool;
-    StunBinding *            stunBinding;
-    TurnClient *             turn;
-    bool                     turnActivated;
-    QHostAddress             addr;
-    int                      port;
-    QHostAddress             refAddr;
-    int                      refPort;
+    StunBinding *            stunBinding   = nullptr;
+    TurnClient *             turn          = nullptr;
+    bool                     turnActivated = false;
+    TransportAddress         addr;
+    TransportAddress         refAddr;
+    TransportAddress         relAddr;
     QHostAddress             refAddrSource;
-    QHostAddress             relAddr;
-    int                      relPort;
-    QHostAddress             stunBindAddr;
-    int                      stunBindPort;
-    QHostAddress             stunRelayAddr;
-    int                      stunRelayPort;
+    TransportAddress         stunBindAddr;
+    TransportAddress         stunRelayAddr;
     QString                  stunUser;
     QCA::SecureArray         stunPass;
     QString                  clientSoftware;
     QList<Datagram>          in;
     QList<Datagram>          inRelayed;
     QList<WriteItem>         pendingWrites;
-    int                      retryCount;
-    bool                     stopping;
-    int                      debugLevel;
-
-    Private(IceLocalTransport *_q) :
-        QObject(_q), q(_q), sess(this), extSock(nullptr), sock(nullptr), pool(nullptr), stunBinding(nullptr),
-        turn(nullptr), turnActivated(false), port(-1), refPort(-1), relPort(-1), retryCount(0), stopping(false),
-        debugLevel(IceTransport::DL_None)
-    {
-    }
+    int                      retryCount = 0;
+    bool                     stopping   = false;
+    int                      debugLevel = IceTransport::DL_None;
+
+    Private(IceLocalTransport *_q) : QObject(_q), q(_q), sess(this) { }
 
     ~Private() { reset(); }
 
@@ -209,16 +198,11 @@ class IceLocalTransport::Private : public QObject {
             sock = nullptr;
         }
 
-        addr = QHostAddress();
-        port = -1;
-
-        refAddr       = QHostAddress();
-        refPort       = -1;
+        addr          = TransportAddress();
+        relAddr       = TransportAddress();
+        refAddr       = TransportAddress();
         refAddrSource = QHostAddress();
 
-        relAddr = QHostAddress();
-        relPort = -1;
-
         in.clear();
         inRelayed.clear();
         pendingWrites.clear();
@@ -238,12 +222,10 @@ class IceLocalTransport::Private : public QObject {
     {
         Q_ASSERT(sock);
         if (stopping) {
-            auto as = QString("%1:%2").arg(addr.toString(), QString::number(port));
-            emit q->debugLine(QString("local transport %1 is already stopping. just wait...").arg(as));
+            emit q->debugLine(QString("local transport %1 is already stopping. just wait...").arg(addr));
             return;
         } else {
-            auto as = QString("%1:%2").arg(addr.toString(), QString::number(port));
-            emit q->debugLine(QString("stopping local transport %1.").arg(as));
+            emit q->debugLine(QString("stopping local transport %1.").arg(addr));
         }
 
         stopping = true;
@@ -260,10 +242,9 @@ class IceLocalTransport::Private : public QObject {
 
         pool = StunTransactionPool::Ptr::create(StunTransaction::Udp);
         pool->setDebugLevel((StunTransactionPool::DebugLevel)debugLevel);
-        connect(pool.data(), SIGNAL(outgoingMessage(QByteArray, QHostAddress, quint16)),
-                SLOT(pool_outgoingMessage(QByteArray, QHostAddress, quint16)));
-        connect(pool.data(), SIGNAL(needAuthParams()), SLOT(pool_needAuthParams()));
-        connect(pool.data(), SIGNAL(debugLine(QString)), SLOT(pool_debugLine(QString)));
+        connect(pool.data(), &StunTransactionPool::outgoingMessage, this, &Private::pool_outgoingMessage);
+        connect(pool.data(), &StunTransactionPool::needAuthParams, this, &Private::pool_needAuthParams);
+        connect(pool.data(), &StunTransactionPool::debugLine, this, &Private::pool_debugLine);
 
         pool->setLongTermAuthEnabled(true);
         if (!stunUser.isEmpty()) {
@@ -277,14 +258,13 @@ class IceLocalTransport::Private : public QObject {
 
     void do_stun()
     {
-        if (stunBindAddr.isNull()) {
+        if (!stunBindAddr.isValid()) {
             return;
         }
         stunBinding = new StunBinding(pool.data());
         connect(stunBinding, &StunBinding::success, this, [&]() {
             refAddr       = stunBinding->reflexiveAddress();
-            refPort       = stunBinding->reflexivePort();
-            refAddrSource = stunBindAddr;
+            refAddrSource = stunBindAddr.addr;
 
             delete stunBinding;
             stunBinding = nullptr;
@@ -296,12 +276,12 @@ class IceLocalTransport::Private : public QObject {
             stunBinding = nullptr;
             emit q->error(IceLocalTransport::ErrorStun);
         });
-        stunBinding->start(stunBindAddr, stunBindPort);
+        stunBinding->start(stunBindAddr);
     }
 
     void do_turn()
     {
-        if (stunRelayAddr.isNull()) {
+        if (!stunRelayAddr.isValid()) {
             return;
         }
         turn = new TurnClient(this);
@@ -317,7 +297,7 @@ class IceLocalTransport::Private : public QObject {
 
         turn->setClientSoftwareNameAndVersion(clientSoftware);
 
-        turn->connectToHost(pool.data(), stunRelayAddr, stunRelayPort);
+        turn->connectToHost(pool.data(), stunRelayAddr);
     }
 
 private:
@@ -325,7 +305,7 @@ class IceLocalTransport::Private : public QObject {
     QUdpSocket *createSocket()
     {
         QUdpSocket *qsock = new QUdpSocket(this);
-        if (!qsock->bind(addr, 0)) {
+        if (!qsock->bind(addr.addr, 0)) {
             delete qsock;
             emit q->error(IceLocalTransport::ErrorBind);
             return nullptr;
@@ -336,11 +316,10 @@ class IceLocalTransport::Private : public QObject {
 
     void prepareSocket()
     {
-        addr = sock->localAddress();
-        port = sock->localPort();
+        addr = sock->localTransportAddress();
 
-        connect(sock, SIGNAL(readyRead()), SLOT(sock_readyRead()));
-        connect(sock, SIGNAL(datagramsWritten(int)), SLOT(sock_datagramsWritten(int)));
+        connect(sock, &SafeUdpSocket::readyRead, this, &Private::sock_readyRead);
+        connect(sock, &SafeUdpSocket::datagramsWritten, this, &Private::sock_datagramsWritten);
     }
 
     // return true if we are retrying, false if we should error out
@@ -373,12 +352,10 @@ class IceLocalTransport::Private : public QObject {
 
             prepareSocket();
 
-            refAddr       = QHostAddress();
-            refPort       = -1;
+            refAddr       = TransportAddress();
             refAddrSource = QHostAddress();
 
-            relAddr = QHostAddress();
-            relPort = -1;
+            relAddr = TransportAddress();
 
             do_turn();
 
@@ -392,18 +369,16 @@ class IceLocalTransport::Private : public QObject {
     }
 
     // return true if data packet, false if pool or nothing
-    bool processIncomingStun(const QByteArray &buf, const QHostAddress &fromAddr, int fromPort, Datagram *dg)
+    bool processIncomingStun(const QByteArray &buf, const TransportAddress &fromAddr, Datagram *dg)
     {
-        QByteArray   data;
-        QHostAddress dataAddr;
-        int          dataPort;
+        QByteArray       data;
+        TransportAddress dataAddr;
 
         bool notStun;
-        if (!pool->writeIncomingMessage(buf, &notStun, fromAddr, fromPort) && turn) {
-            data = turn->processIncomingDatagram(buf, notStun, &dataAddr, &dataPort);
+        if (!pool->writeIncomingMessage(buf, &notStun, fromAddr) && turn) {
+            data = turn->processIncomingDatagram(buf, notStun, dataAddr);
             if (!data.isNull()) {
                 dg->addr = dataAddr;
-                dg->port = dataPort;
                 dg->buf  = data;
                 return true;
             } else {
@@ -453,17 +428,15 @@ private slots:
         QList<Datagram> rreads; // relayed
 
         while (sock->hasPendingDatagrams()) {
-            QHostAddress from;
-            quint16      fromPort;
+            TransportAddress from;
+            Datagram         dg;
 
-            Datagram dg;
-
-            QByteArray buf = sock->readDatagram(&from, &fromPort);
+            QByteArray buf = sock->readDatagram(from);
             if (buf.isEmpty()) // it's weird we ever came here, but should relax static analyzer
                 break;
-            if ((from == stunBindAddr && fromPort == stunBindPort)
-                || (from == stunRelayAddr && fromPort == stunRelayPort)) {
-                bool haveData = processIncomingStun(buf, from, fromPort, &dg);
+            qDebug("got packet from %s", qPrintable(from));
+            if (from == stunBindAddr || from == stunRelayAddr) {
+                bool haveData = processIncomingStun(buf, from, &dg);
 
                 // processIncomingStun could cause signals to
                 //   emit.  for example, stopped()
@@ -474,7 +447,6 @@ private slots:
                     rreads += dg;
             } else {
                 dg.addr = from;
-                dg.port = fromPort;
                 dg.buf  = buf;
                 dreads += dg;
             }
@@ -506,7 +478,7 @@ private slots:
             if (wi.type == WriteItem::Direct) {
                 int at = -1;
                 for (int n = 0; n < dwrites.count(); ++n) {
-                    if (dwrites[n].addr == wi.addr && dwrites[n].port == wi.port) {
+                    if (dwrites[n].addr == wi.addr) {
                         at = n;
                         break;
                     }
@@ -517,7 +489,6 @@ private slots:
                 } else {
                     Written wr;
                     wr.addr  = wi.addr;
-                    wr.port  = wi.port;
                     wr.count = 1;
                     dwrites += wr;
                 }
@@ -532,7 +503,7 @@ private slots:
 
         if (!dwrites.isEmpty()) {
             for (const Written &wr : dwrites) {
-                emit q->datagramsWritten(Direct, wr.count, wr.addr, wr.port);
+                emit q->datagramsWritten(Direct, wr.count, wr.addr);
                 if (!watch.isValid())
                     return;
             }
@@ -544,7 +515,7 @@ private slots:
         }
     }
 
-    void pool_outgoingMessage(const QByteArray &packet, const QHostAddress &toAddress, quint16 toPort)
+    void pool_outgoingMessage(const QByteArray &packet, const TransportAddress &toAddress)
     {
         // warning: read StunTransactionPool docs before modifying
         //   this function
@@ -558,7 +529,7 @@ private slots:
         //                      .arg(toAddress.toString())
         //                      .arg(toPort));
 
-        sock->writeDatagram(packet, toAddress, toPort);
+        sock->writeDatagram(packet, toAddress);
     }
 
     void pool_needAuthParams()
@@ -602,29 +573,26 @@ private slots:
 
         // take reflexive address from TURN only if we are not using a
         //   separate STUN server
-        if (stunBindAddr.isNull() || stunBindAddr == stunRelayAddr) {
+        if (!stunBindAddr.isValid() || stunBindAddr == stunRelayAddr) {
             refAddr       = allocate->reflexiveAddress();
-            refPort       = allocate->reflexivePort();
-            refAddrSource = stunRelayAddr;
+            refAddrSource = stunRelayAddr.addr;
         }
 
         if (debugLevel >= IceTransport::DL_Info)
-            emit q->debugLine(QString("Server says we are ") + allocate->reflexiveAddress().toString() + ';'
-                              + QString::number(allocate->reflexivePort()));
+            emit q->debugLine(QLatin1String("Server says we are ") + allocate->reflexiveAddress());
 
         relAddr = allocate->relayedAddress();
-        relPort = allocate->relayedPort();
         if (debugLevel >= IceTransport::DL_Info)
-            emit q->debugLine(QString("Server relays via ") + relAddr.toString() + ';' + QString::number(relPort));
+            emit q->debugLine(QLatin1String("Server relays via ") + relAddr);
 
         turnActivated = true;
 
         emit q->addressesChanged();
     }
 
-    void turn_packetsWritten(int count, const QHostAddress &addr, int port)
+    void turn_packetsWritten(int count, const TransportAddress &addr)
     {
-        emit q->datagramsWritten(Relayed, count, addr, port);
+        emit q->datagramsWritten(Relayed, count, addr);
     }
 
     void turn_error(XMPP::TurnClient::Error e)
@@ -658,7 +626,7 @@ private slots:
         WriteItem wi;
         wi.type = WriteItem::Turn;
         pendingWrites += wi;
-        sock->writeDatagram(buf, stunRelayAddr, quint16(stunRelayPort));
+        sock->writeDatagram(buf, stunRelayAddr);
     }
 
     void turn_debugLine(const QString &line) { emit q->debugLine(line); }
@@ -678,55 +646,44 @@ void IceLocalTransport::start(QUdpSocket *sock)
 
 void IceLocalTransport::start(const QHostAddress &addr)
 {
-    d->addr = addr;
+    d->addr.addr = addr;
     d->start();
 }
 
 void IceLocalTransport::stop() { d->stop(); }
 
-void IceLocalTransport::setStunBindService(const QHostAddress &addr, int port)
-{
-    d->stunBindAddr = addr;
-    d->stunBindPort = port;
-}
+void IceLocalTransport::setStunBindService(const TransportAddress &addr) { d->stunBindAddr = addr; }
 
-void IceLocalTransport::setStunRelayService(const QHostAddress &addr, int port, const QString &user,
+void IceLocalTransport::setStunRelayService(const TransportAddress &addr, const QString &user,
                                             const QCA::SecureArray &pass)
 {
     d->stunRelayAddr = addr;
-    d->stunRelayPort = port;
     d->stunUser      = user;
     d->stunPass      = pass;
 }
 
-QHostAddress IceLocalTransport::stunBindServiceAddress() const { return d->stunBindAddr; }
+const TransportAddress &IceLocalTransport::stunBindServiceAddress() const { return d->stunBindAddr; }
 
-QHostAddress IceLocalTransport::stunRelayServiceAddress() const { return d->stunRelayAddr; }
+const TransportAddress &IceLocalTransport::stunRelayServiceAddress() const { return d->stunRelayAddr; }
 
 void IceLocalTransport::stunStart() { d->stunStart(); }
 
-QHostAddress IceLocalTransport::localAddress() const { return d->addr; }
+const TransportAddress &IceLocalTransport::localAddress() const { return d->addr; }
 
-int IceLocalTransport::localPort() const { return d->port; }
-
-QHostAddress IceLocalTransport::serverReflexiveAddress() const { return d->refAddr; }
-
-int IceLocalTransport::serverReflexivePort() const { return d->refPort; }
+const TransportAddress &IceLocalTransport::serverReflexiveAddress() const { return d->refAddr; }
 
 QHostAddress IceLocalTransport::reflexiveAddressSource() const { return d->refAddrSource; }
 
-QHostAddress IceLocalTransport::relayedAddress() const { return d->relAddr; }
-
-int IceLocalTransport::relayedPort() const { return d->relPort; }
+const TransportAddress &IceLocalTransport::relayedAddress() const { return d->relAddr; }
 
 bool IceLocalTransport::isStunAlive() const { return d->stunBinding != nullptr; }
 
 bool IceLocalTransport::isTurnAlive() const { return d->turn != nullptr; }
 
-void IceLocalTransport::addChannelPeer(const QHostAddress &addr, int port)
+void IceLocalTransport::addChannelPeer(const TransportAddress &addr)
 {
     if (d->turn)
-        d->turn->addChannelPeer(addr, port);
+        d->turn->addChannelPeer(addr);
 }
 
 bool IceLocalTransport::hasPendingDatagrams(int path) const
@@ -741,7 +698,7 @@ bool IceLocalTransport::hasPendingDatagrams(int path) const
     }
 }
 
-QByteArray IceLocalTransport::readDatagram(int path, QHostAddress *addr, quint16 *port)
+QByteArray IceLocalTransport::readDatagram(int path, TransportAddress &addr)
 {
     QList<Private::Datagram> *in = nullptr;
     if (path == Direct)
@@ -753,25 +710,23 @@ QByteArray IceLocalTransport::readDatagram(int path, QHostAddress *addr, quint16
 
     if (!in->isEmpty()) {
         Private::Datagram datagram = in->takeFirst();
-        *addr                      = datagram.addr;
-        *port                      = datagram.port;
+        addr                       = datagram.addr;
         return datagram.buf;
     } else
         return QByteArray();
 }
 
-void IceLocalTransport::writeDatagram(int path, const QByteArray &buf, const QHostAddress &addr, int port)
+void IceLocalTransport::writeDatagram(int path, const QByteArray &buf, const TransportAddress &addr)
 {
     if (path == Direct) {
         Private::WriteItem wi;
         wi.type = Private::WriteItem::Direct;
         wi.addr = addr;
-        wi.port = port;
         d->pendingWrites += wi;
-        d->sock->writeDatagram(buf, addr, quint16(port));
+        d->sock->writeDatagram(buf, addr);
     } else if (path == Relayed) {
         if (d->turn && d->turnActivated)
-            d->turn->write(buf, addr, port);
+            d->turn->write(buf, addr);
     } else
         Q_ASSERT(0);
 }
diff --git a/src/irisnet/noncore/icelocaltransport.h b/src/irisnet/noncore/icelocaltransport.h
index 2979e0f6..6d948727 100644
--- a/src/irisnet/noncore/icelocaltransport.h
+++ b/src/irisnet/noncore/icelocaltransport.h
@@ -56,24 +56,19 @@ class IceLocalTransport : public IceTransport, public QEnableSharedFromThis<IceL
     //   retries
     void start(const QHostAddress &addr);
 
-    void setStunBindService(const QHostAddress &addr, int port);
-    void setStunRelayService(const QHostAddress &addr, int port, const QString &user, const QCA::SecureArray &pass);
+    void setStunBindService(const TransportAddress &addr);
+    void setStunRelayService(const TransportAddress &addr, const QString &user, const QCA::SecureArray &pass);
 
-    QHostAddress stunBindServiceAddress() const;
-    QHostAddress stunRelayServiceAddress() const;
+    const TransportAddress &stunBindServiceAddress() const;
+    const TransportAddress &stunRelayServiceAddress() const;
 
     // obtain relay / reflexive
     void stunStart();
 
-    QHostAddress localAddress() const;
-    int          localPort() const;
-
-    QHostAddress serverReflexiveAddress() const;
-    int          serverReflexivePort() const;
-    QHostAddress reflexiveAddressSource() const; // address of stun/turn server provided the srflx
-
-    QHostAddress relayedAddress() const;
-    int          relayedPort() const;
+    const TransportAddress &localAddress() const;
+    const TransportAddress &serverReflexiveAddress() const;
+    QHostAddress            reflexiveAddressSource() const; // address of stun/turn server provided the srflx
+    const TransportAddress &relayedAddress() const;
 
     bool isStunAlive() const;
     bool isTurnAlive() const;
@@ -81,9 +76,9 @@ class IceLocalTransport : public IceTransport, public QEnableSharedFromThis<IceL
     // reimplemented
     void       stop() override;
     bool       hasPendingDatagrams(int path) const override;
-    QByteArray readDatagram(int path, QHostAddress *addr, quint16 *port) override;
-    void       writeDatagram(int path, const QByteArray &buf, const QHostAddress &addr, int port) override;
-    void       addChannelPeer(const QHostAddress &addr, int port) override;
+    QByteArray readDatagram(int path, TransportAddress &addr) override;
+    void       writeDatagram(int path, const QByteArray &buf, const TransportAddress &addr) override;
+    void       addChannelPeer(const TransportAddress &addr) override;
     void       setDebugLevel(DebugLevel level) override;
     void       changeThread(QThread *thread) override;
 
diff --git a/src/irisnet/noncore/icetransport.h b/src/irisnet/noncore/icetransport.h
index 857aa64e..6dc3f939 100644
--- a/src/irisnet/noncore/icetransport.h
+++ b/src/irisnet/noncore/icetransport.h
@@ -26,6 +26,7 @@
 class QHostAddress;
 
 namespace XMPP {
+class TransportAddress;
 class IceTransport : public QObject {
     Q_OBJECT
 
@@ -39,10 +40,10 @@ class IceTransport : public QObject {
 
     virtual void stop() = 0;
 
-    virtual bool       hasPendingDatagrams(int path) const                                                = 0;
-    virtual QByteArray readDatagram(int path, QHostAddress *addr, quint16 *port)                          = 0;
-    virtual void       writeDatagram(int path, const QByteArray &buf, const QHostAddress &addr, int port) = 0;
-    virtual void       addChannelPeer(const QHostAddress &addr, int port)                                 = 0;
+    virtual bool       hasPendingDatagrams(int path) const                                          = 0;
+    virtual QByteArray readDatagram(int path, TransportAddress &addr)                               = 0;
+    virtual void       writeDatagram(int path, const QByteArray &buf, const TransportAddress &addr) = 0;
+    virtual void       addChannelPeer(const TransportAddress &addr)                                 = 0;
 
     virtual void setDebugLevel(DebugLevel level) = 0;
     virtual void changeThread(QThread *thread)   = 0;
@@ -53,7 +54,7 @@ class IceTransport : public QObject {
     void error(int e);
 
     void readyRead(int path);
-    void datagramsWritten(int path, int count, const QHostAddress &addr, int port);
+    void datagramsWritten(int path, int count, const TransportAddress &addr);
 
     // not DOR-SS/DS safe
     void debugLine(const QString &str);
diff --git a/src/irisnet/noncore/iceturntransport.cpp b/src/irisnet/noncore/iceturntransport.cpp
index 90a0a79d..41f8328f 100644
--- a/src/irisnet/noncore/iceturntransport.cpp
+++ b/src/irisnet/noncore/iceturntransport.cpp
@@ -29,14 +29,11 @@ class IceTurnTransport::Private : public QObject {
 public:
     IceTurnTransport *q;
     int               mode;
-    QHostAddress      serverAddr;
-    int               serverPort;
+    TransportAddress  serverAddr;
     QString           relayUser;
     QCA::SecureArray  relayPass;
-    QHostAddress      relayAddr;
-    int               relayPort;
-    QHostAddress      refAddr;
-    int               refPort;
+    TransportAddress  relayAddr;
+    TransportAddress  refAddr;
     TurnClient        turn;
     int               turnErrorCode = 0;
     int               debugLevel;
@@ -44,24 +41,23 @@ class IceTurnTransport::Private : public QObject {
 
     Private(IceTurnTransport *_q) : QObject(_q), q(_q), turn(this), debugLevel(IceTransport::DL_None)
     {
-        connect(&turn, SIGNAL(connected()), SLOT(turn_connected()));
-        connect(&turn, SIGNAL(tlsHandshaken()), SLOT(turn_tlsHandshaken()));
-        connect(&turn, SIGNAL(closed()), SLOT(turn_closed()));
-        connect(&turn, SIGNAL(needAuthParams()), SLOT(turn_needAuthParams()));
-        connect(&turn, SIGNAL(retrying()), SLOT(turn_retrying()));
-        connect(&turn, SIGNAL(activated()), SLOT(turn_activated()));
-        connect(&turn, SIGNAL(readyRead()), SLOT(turn_readyRead()));
-        connect(&turn, SIGNAL(packetsWritten(int, QHostAddress, int)),
-                SLOT(turn_packetsWritten(int, QHostAddress, int)));
-        connect(&turn, SIGNAL(error(XMPP::TurnClient::Error)), SLOT(turn_error(XMPP::TurnClient::Error)));
-        connect(&turn, SIGNAL(debugLine(QString)), SLOT(turn_debugLine(QString)));
+        connect(&turn, &TurnClient::connected, this, &Private::turn_connected);
+        connect(&turn, &TurnClient::tlsHandshaken, this, &Private::turn_tlsHandshaken);
+        connect(&turn, &TurnClient::closed, this, &Private::turn_closed);
+        connect(&turn, &TurnClient::needAuthParams, this, &Private::turn_needAuthParams);
+        connect(&turn, &TurnClient::retrying, this, &Private::turn_retrying);
+        connect(&turn, &TurnClient::activated, this, &Private::turn_activated);
+        connect(&turn, &TurnClient::readyRead, this, &Private::turn_readyRead);
+        connect(&turn, &TurnClient::packetsWritten, this, &Private::turn_packetsWritten);
+        connect(&turn, &TurnClient::error, this, &Private::turn_error);
+        connect(&turn, &TurnClient::debugLine, this, &Private::turn_debugLine);
     }
 
     void start()
     {
         turn.setUsername(relayUser);
         turn.setPassword(relayPass);
-        turn.connectToHost(serverAddr, serverPort, (TurnClient::Mode)mode);
+        turn.connectToHost(serverAddr, (TurnClient::Mode)mode);
     }
 
     void stop() { turn.close(); }
@@ -106,19 +102,15 @@ private slots:
     {
         StunAllocate *allocate = turn.stunAllocate();
 
-        QHostAddress saddr = allocate->reflexiveAddress();
-        quint16      sport = quint16(allocate->reflexivePort());
+        auto saddr = allocate->reflexiveAddress();
         if (debugLevel >= IceTransport::DL_Info)
-            emit q->debugLine(QString("Server says we are ") + saddr.toString() + ';' + QString::number(sport));
+            emit q->debugLine(QLatin1String("Server says we are ") + saddr);
         saddr = allocate->relayedAddress();
-        sport = quint16(allocate->relayedPort());
         if (debugLevel >= IceTransport::DL_Info)
-            emit q->debugLine(QString("Server relays via ") + saddr.toString() + ';' + QString::number(sport));
+            emit q->debugLine(QLatin1String("Server relays via ") + saddr);
 
         relayAddr = saddr;
-        relayPort = sport;
         refAddr   = allocate->reflexiveAddress();
-        refPort   = allocate->reflexivePort();
         started   = true;
 
         emit q->started();
@@ -126,10 +118,7 @@ private slots:
 
     void turn_readyRead() { emit q->readyRead(0); }
 
-    void turn_packetsWritten(int count, const QHostAddress &addr, int port)
-    {
-        emit q->datagramsWritten(0, count, addr, port);
-    }
+    void turn_packetsWritten(int count, const TransportAddress &addr) { emit q->datagramsWritten(0, count, addr); }
 
     void turn_error(XMPP::TurnClient::Error e)
     {
@@ -158,25 +147,20 @@ void IceTurnTransport::setPassword(const QCA::SecureArray &pass) { d->relayPass
 
 void IceTurnTransport::setProxy(const TurnClient::Proxy &proxy) { d->turn.setProxy(proxy); }
 
-void IceTurnTransport::start(const QHostAddress &addr, int port, TurnClient::Mode mode)
+void IceTurnTransport::start(const TransportAddress &addr, TurnClient::Mode mode)
 {
     d->serverAddr = addr;
-    d->serverPort = port;
     d->mode       = mode;
     d->start();
 }
 
-QHostAddress IceTurnTransport::relayedAddress() const { return d->relayAddr; }
-
-quint16 IceTurnTransport::relayedPort() const { return d->relayPort; }
-
-QHostAddress IceTurnTransport::reflexiveAddress() const { return d->refAddr; }
+const TransportAddress &IceTurnTransport::relayedAddress() const { return d->relayAddr; }
 
-quint16 IceTurnTransport::reflexivePort() const { return d->refPort; }
+const TransportAddress &IceTurnTransport::reflexiveAddress() const { return d->refAddr; }
 
 bool IceTurnTransport::isStarted() const { return d->started; }
 
-void IceTurnTransport::addChannelPeer(const QHostAddress &addr, int port) { d->turn.addChannelPeer(addr, port); }
+void IceTurnTransport::addChannelPeer(const TransportAddress &addr) { d->turn.addChannelPeer(addr); }
 
 TurnClient::Error IceTurnTransport::turnErrorCode() const { return (TurnClient::Error)d->turnErrorCode; }
 
@@ -190,20 +174,20 @@ bool IceTurnTransport::hasPendingDatagrams(int path) const
     return d->turn.packetsToRead() > 0;
 }
 
-QByteArray IceTurnTransport::readDatagram(int path, QHostAddress *addr, quint16 *port)
+QByteArray IceTurnTransport::readDatagram(int path, TransportAddress &addr)
 {
     Q_ASSERT(path == 0);
     Q_UNUSED(path)
 
-    return d->turn.read(addr, port);
+    return d->turn.read(addr);
 }
 
-void IceTurnTransport::writeDatagram(int path, const QByteArray &buf, const QHostAddress &addr, int port)
+void IceTurnTransport::writeDatagram(int path, const QByteArray &buf, const TransportAddress &addr)
 {
     Q_ASSERT(path == 0);
     Q_UNUSED(path)
 
-    d->turn.write(buf, addr, port);
+    d->turn.write(buf, addr);
 }
 
 void IceTurnTransport::setDebugLevel(DebugLevel level)
diff --git a/src/irisnet/noncore/iceturntransport.h b/src/irisnet/noncore/iceturntransport.h
index 5d1c0ae0..1414e899 100644
--- a/src/irisnet/noncore/iceturntransport.h
+++ b/src/irisnet/noncore/iceturntransport.h
@@ -46,22 +46,20 @@ class IceTurnTransport : public IceTransport, public QEnableSharedFromThis<IceTu
 
     void setProxy(const TurnClient::Proxy &proxy);
 
-    void start(const QHostAddress &addr, int port, TurnClient::Mode mode = TurnClient::PlainMode);
+    void start(const TransportAddress &addr, TurnClient::Mode mode = TurnClient::PlainMode);
 
-    QHostAddress relayedAddress() const;
-    quint16      relayedPort() const;
-    QHostAddress reflexiveAddress() const;
-    quint16      reflexivePort() const;
-    bool         isStarted() const;
+    const TransportAddress &relayedAddress() const;
+    const TransportAddress &reflexiveAddress() const;
+    bool                    isStarted() const;
 
     TurnClient::Error turnErrorCode() const;
 
     // reimplemented
     virtual void       stop() override;
     virtual bool       hasPendingDatagrams(int path) const override;
-    virtual QByteArray readDatagram(int path, QHostAddress *addr, quint16 *port) override;
-    virtual void       writeDatagram(int path, const QByteArray &buf, const QHostAddress &addr, int port) override;
-    virtual void       addChannelPeer(const QHostAddress &addr, int port) override;
+    virtual QByteArray readDatagram(int path, TransportAddress &addr) override;
+    virtual void       writeDatagram(int path, const QByteArray &buf, const TransportAddress &addr) override;
+    virtual void       addChannelPeer(const TransportAddress &addr) override;
     virtual void       setDebugLevel(DebugLevel level) override;
     virtual void       changeThread(QThread *thread) override;
 
diff --git a/src/irisnet/noncore/stunallocate.cpp b/src/irisnet/noncore/stunallocate.cpp
index abf847d0..60d4a4f3 100644
--- a/src/irisnet/noncore/stunallocate.cpp
+++ b/src/irisnet/noncore/stunallocate.cpp
@@ -77,8 +77,7 @@ class StunAllocatePermission : public QObject {
     QTimer *                 timer;
     StunTransactionPool::Ptr pool;
     StunTransaction *        trans;
-    QHostAddress             stunAddr;
-    int                      stunPort;
+    TransportAddress         stunAddr;
     QHostAddress             addr;
     bool                     active;
 
@@ -88,7 +87,7 @@ class StunAllocatePermission : public QObject {
         QObject(_pool.data()), pool(_pool), trans(nullptr), addr(_addr), active(false)
     {
         timer = new QTimer(this);
-        connect(timer, SIGNAL(timeout()), SLOT(timer_timeout()));
+        connect(timer, &QTimer::timeout, this, &StunAllocatePermission::timer_timeout);
         timer->setSingleShot(true);
         timer->setInterval(PERM_INTERVAL);
     }
@@ -100,13 +99,11 @@ class StunAllocatePermission : public QObject {
         releaseAndDeleteLater(this, timer);
     }
 
-    void start(const QHostAddress &_addr, int _port)
+    void start(const TransportAddress &_addr)
     {
         Q_ASSERT(!active);
 
         stunAddr = _addr;
-        stunPort = _port;
-
         doTransaction();
     }
 
@@ -146,10 +143,10 @@ class StunAllocatePermission : public QObject {
     {
         Q_ASSERT(!trans);
         trans = new StunTransaction(this);
-        connect(trans, SIGNAL(createMessage(QByteArray)), SLOT(trans_createMessage(QByteArray)));
-        connect(trans, SIGNAL(finished(XMPP::StunMessage)), SLOT(trans_finished(XMPP::StunMessage)));
-        connect(trans, SIGNAL(error(XMPP::StunTransaction::Error)), SLOT(trans_error(XMPP::StunTransaction::Error)));
-        trans->start(pool.data(), stunAddr, stunPort);
+        connect(trans, &StunTransaction::createMessage, this, &StunAllocatePermission::trans_createMessage);
+        connect(trans, &StunTransaction::finished, this, &StunAllocatePermission::trans_finished);
+        connect(trans, &StunTransaction::error, this, &StunAllocatePermission::trans_error);
+        trans->start(pool.data(), stunAddr);
     }
 
     void restartTimer() { timer->start(); }
@@ -171,7 +168,7 @@ private slots:
         {
             StunMessage::Attribute a;
             a.type  = StunTypes::XOR_PEER_ADDRESS;
-            a.value = StunTypes::createXorPeerAddress(addr, 0, message.magic(), message.id());
+            a.value = StunTypes::createXorPeerAddress(TransportAddress { addr, 0 }, message.magic(), message.id());
             list += a;
         }
 
@@ -238,22 +235,19 @@ class StunAllocateChannel : public QObject {
 public:
     QTimer *                 timer;
     StunTransactionPool::Ptr pool;
-    StunTransaction *        trans;
-    QHostAddress             stunAddr;
-    int                      stunPort;
+    StunTransaction *        trans = nullptr;
+    TransportAddress         stunAddr;
     int                      channelId;
-    QHostAddress             addr;
-    int                      port;
-    bool                     active;
+    TransportAddress         addr;
+    bool                     active = false;
 
     enum Error { ErrorGeneric, ErrorProtocol, ErrorCapacity, ErrorForbidden, ErrorRejected, ErrorTimeout };
 
-    StunAllocateChannel(StunTransactionPool::Ptr _pool, int _channelId, const QHostAddress &_addr, int _port) :
-        QObject(_pool.data()), pool(_pool), trans(nullptr), channelId(_channelId), addr(_addr), port(_port),
-        active(false)
+    StunAllocateChannel(StunTransactionPool::Ptr _pool, int _channelId, const TransportAddress &_addr) :
+        QObject(_pool.data()), pool(_pool), trans(nullptr), channelId(_channelId), addr(_addr), active(false)
     {
         timer = new QTimer(this);
-        connect(timer, SIGNAL(timeout()), SLOT(timer_timeout()));
+        connect(timer, &QTimer::timeout, this, &StunAllocateChannel::timer_timeout);
         timer->setSingleShot(true);
         timer->setInterval(CHAN_INTERVAL);
     }
@@ -265,13 +259,11 @@ class StunAllocateChannel : public QObject {
         releaseAndDeleteLater(this, timer);
     }
 
-    void start(const QHostAddress &_addr, int _port)
+    void start(const TransportAddress &_addr)
     {
         Q_ASSERT(!active);
 
         stunAddr = _addr;
-        stunPort = _port;
-
         doTransaction();
     }
 
@@ -312,10 +304,10 @@ class StunAllocateChannel : public QObject {
     {
         Q_ASSERT(!trans);
         trans = new StunTransaction(this);
-        connect(trans, SIGNAL(createMessage(QByteArray)), SLOT(trans_createMessage(QByteArray)));
-        connect(trans, SIGNAL(finished(XMPP::StunMessage)), SLOT(trans_finished(XMPP::StunMessage)));
-        connect(trans, SIGNAL(error(XMPP::StunTransaction::Error)), SLOT(trans_error(XMPP::StunTransaction::Error)));
-        trans->start(pool.data(), stunAddr, stunPort);
+        connect(trans, &StunTransaction::createMessage, this, &StunAllocateChannel::trans_createMessage);
+        connect(trans, &StunTransaction::finished, this, &StunAllocateChannel::trans_finished);
+        connect(trans, &StunTransaction::error, this, &StunAllocateChannel::trans_error);
+        trans->start(pool.data(), stunAddr);
     }
 
     void restartTimer() { timer->start(); }
@@ -340,7 +332,7 @@ private slots:
         {
             StunMessage::Attribute a;
             a.type  = StunTypes::XOR_PEER_ADDRESS;
-            a.value = StunTypes::createXorPeerAddress(addr, quint16(port), message.magic(), message.id());
+            a.value = StunTypes::createXorPeerAddress(addr, message.magic(), message.id());
             list += a;
         }
 
@@ -420,14 +412,12 @@ class StunAllocate::Private : public QObject {
     ObjectSession                   sess;
     StunTransactionPool::Ptr        pool;
     StunTransaction *               trans;
-    QHostAddress                    stunAddr;
-    int                             stunPort;
+    TransportAddress                stunAddr;
     State                           state;
     QString                         errorString;
     DontFragmentState               dfState;
     QString                         clientSoftware, serverSoftware;
-    QHostAddress                    reflexiveAddress, relayedAddress;
-    quint16                         reflexivePort, relayedPort;
+    TransportAddress                reflexiveAddress, relayedAddress;
     StunMessage                     msg;
     int                             allocateLifetime;
     QTimer *                        allocateRefreshTimer;
@@ -444,7 +434,7 @@ class StunAllocate::Private : public QObject {
         erroringCode(-1)
     {
         allocateRefreshTimer = new QTimer(this);
-        connect(allocateRefreshTimer, SIGNAL(timeout()), SLOT(refresh()));
+        connect(allocateRefreshTimer, &QTimer::timeout, this, &Private::refresh);
         allocateRefreshTimer->setSingleShot(true);
     }
 
@@ -455,12 +445,11 @@ class StunAllocate::Private : public QObject {
         releaseAndDeleteLater(this, allocateRefreshTimer);
     }
 
-    void start(const QHostAddress &_addr = QHostAddress(), int _port = -1)
+    void start(const TransportAddress &_addr = TransportAddress())
     {
         Q_ASSERT(state == Stopped);
 
         stunAddr = _addr;
-        stunPort = _port;
 
         state = Starting;
         doTransaction();
@@ -518,7 +507,7 @@ class StunAllocate::Private : public QObject {
             if (!found) {
                 // delete related channels
                 for (int j = 0; j < channels.count(); ++j) {
-                    if (channels[j]->addr == perms[n]->addr) {
+                    if (channels[j]->addr.addr == perms[n]->addr) {
                         delete channels[j];
                         channels.removeAt(j);
                         --j; // adjust position
@@ -540,7 +529,7 @@ class StunAllocate::Private : public QObject {
             // wake up inactive perms now that we've freed space
             for (int n = 0; n < perms.count(); ++n) {
                 if (!perms[n]->active)
-                    perms[n]->start(stunAddr, stunPort);
+                    perms[n]->start(stunAddr);
             }
         }
 
@@ -556,11 +545,10 @@ class StunAllocate::Private : public QObject {
 
             if (!found) {
                 StunAllocatePermission *perm = new StunAllocatePermission(pool, newPerms[n]);
-                connect(perm, SIGNAL(ready()), SLOT(perm_ready()));
-                connect(perm, SIGNAL(error(XMPP::StunAllocatePermission::Error, QString)),
-                        SLOT(perm_error(XMPP::StunAllocatePermission::Error, QString)));
+                connect(perm, &StunAllocatePermission::ready, this, &Private::perm_ready);
+                connect(perm, &StunAllocatePermission::error, this, &Private::perm_error);
                 perms += perm;
-                perm->start(stunAddr, stunPort);
+                perm->start(stunAddr);
             }
         }
     }
@@ -579,7 +567,7 @@ class StunAllocate::Private : public QObject {
         for (int n = 0; n < channels.count(); ++n) {
             bool found = false;
             for (int k = 0; k < newChannels.count(); ++k) {
-                if (newChannels[k].address == channels[n]->addr && newChannels[k].port == channels[n]->port) {
+                if (newChannels[k].address == channels[n]->addr) {
                     found = true;
                     break;
                 }
@@ -608,7 +596,7 @@ class StunAllocate::Private : public QObject {
                         break;
 
                     channels[n]->channelId = channelId;
-                    channels[n]->start(stunAddr, stunPort);
+                    channels[n]->start(stunAddr);
                 }
             }
         }
@@ -617,7 +605,7 @@ class StunAllocate::Private : public QObject {
         for (int n = 0; n < newChannels.count(); ++n) {
             bool found = false;
             for (int k = 0; k < channels.count(); ++k) {
-                if (channels[k]->addr == newChannels[n].address && channels[k]->port == newChannels[n].port) {
+                if (channels[k]->addr == newChannels[n].address) {
                     found = true;
                     break;
                 }
@@ -627,7 +615,7 @@ class StunAllocate::Private : public QObject {
                 // look up the permission for this channel
                 int at = -1;
                 for (int k = 0; k < perms.count(); ++k) {
-                    if (perms[k]->addr == newChannels[n].address) {
+                    if (perms[k]->addr == newChannels[n].address.addr) {
                         at = k;
                         break;
                     }
@@ -637,15 +625,13 @@ class StunAllocate::Private : public QObject {
                 if (at != -1) {
                     int channelId = getFreeChannelNumber();
 
-                    StunAllocateChannel *channel
-                        = new StunAllocateChannel(pool, channelId, newChannels[n].address, newChannels[n].port);
-                    connect(channel, SIGNAL(ready()), SLOT(channel_ready()));
-                    connect(channel, SIGNAL(error(XMPP::StunAllocateChannel::Error, QString)),
-                            SLOT(channel_error(XMPP::StunAllocateChannel::Error, QString)));
+                    StunAllocateChannel *channel = new StunAllocateChannel(pool, channelId, newChannels[n].address);
+                    connect(channel, &StunAllocateChannel::ready, this, &Private::channel_ready);
+                    connect(channel, &StunAllocateChannel::error, this, &Private::channel_error);
                     channels += channel;
 
                     if (channelId != -1)
-                        channel->start(stunAddr, stunPort);
+                        channel->start(stunAddr);
                 }
             }
         }
@@ -669,10 +655,10 @@ class StunAllocate::Private : public QObject {
         return -1;
     }
 
-    int getChannel(const QHostAddress &addr, int port)
+    int getChannel(const TransportAddress &addr)
     {
         for (int n = 0; n < channels.count(); ++n) {
-            if (channels[n]->active && channels[n]->addr == addr && channels[n]->port == port)
+            if (channels[n]->active && channels[n]->addr == addr)
                 return channels[n]->channelId;
         }
 
@@ -682,12 +668,11 @@ class StunAllocate::Private : public QObject {
     // note that this function works even for inactive channels, so that
     //   incoming traffic that is received out-of-order with a
     //   ChannelBind success response is still processable
-    bool getAddressPort(int channelId, QHostAddress *addr, int *port)
+    bool getAddressPort(int channelId, TransportAddress &addr)
     {
         for (int n = 0; n < channels.count(); ++n) {
             if (channels[n]->channelId == channelId) {
-                *addr = channels[n]->addr;
-                *port = channels[n]->port;
+                addr = channels[n]->addr;
                 return true;
             }
         }
@@ -729,10 +714,10 @@ class StunAllocate::Private : public QObject {
     {
         Q_ASSERT(!trans);
         trans = new StunTransaction(this);
-        connect(trans, SIGNAL(createMessage(QByteArray)), SLOT(trans_createMessage(QByteArray)));
-        connect(trans, SIGNAL(finished(XMPP::StunMessage)), SLOT(trans_finished(XMPP::StunMessage)));
-        connect(trans, SIGNAL(error(XMPP::StunTransaction::Error)), SLOT(trans_error(XMPP::StunTransaction::Error)));
-        trans->start(pool.data(), stunAddr, stunPort);
+        connect(trans, &StunTransaction::createMessage, this, &Private::trans_createMessage);
+        connect(trans, &StunTransaction::finished, this, &Private::trans_finished);
+        connect(trans, &StunTransaction::error, this, &Private::trans_error);
+        trans->start(pool.data(), stunAddr);
     }
 
     void restartRefreshTimer()
@@ -763,7 +748,7 @@ class StunAllocate::Private : public QObject {
 
         for (int n = 0; n < channels.count(); ++n) {
             if (channels[n]->active)
-                newList += StunAllocate::Channel(channels[n]->addr, channels[n]->port);
+                newList += StunAllocate::Channel(channels[n]->addr);
         }
 
         if (newList == channelsOut)
@@ -933,20 +918,18 @@ private slots:
                 return;
             }
 
-            QHostAddress raddr;
-            quint16      rport;
+            TransportAddress raddr;
             if (!StunTypes::parseXorRelayedAddress(response.attribute(StunTypes::XOR_RELAYED_ADDRESS), response.magic(),
-                                                   response.id(), &raddr, &rport)) {
+                                                   response.id(), raddr)) {
                 cleanup();
                 errorString = "Unable to parse XOR-RELAYED-ADDRESS.";
                 emit q->error(StunAllocate::ErrorProtocol);
                 return;
             }
 
-            QHostAddress saddr;
-            quint16      sport;
+            TransportAddress saddr;
             if (!StunTypes::parseXorMappedAddress(response.attribute(StunTypes::XOR_MAPPED_ADDRESS), response.magic(),
-                                                  response.id(), &saddr, &sport)) {
+                                                  response.id(), saddr)) {
                 cleanup();
                 errorString = "Unable to parse XOR-MAPPED-ADDRESS.";
                 emit q->error(StunAllocate::ErrorProtocol);
@@ -966,9 +949,7 @@ private slots:
 
             allocateLifetime = lifetime;
             relayedAddress   = raddr;
-            relayedPort      = rport;
             reflexiveAddress = saddr;
-            reflexivePort    = sport;
 
             if (dfState == DF_Unknown)
                 dfState = DF_Supported;
@@ -1107,19 +1088,15 @@ void StunAllocate::setClientSoftwareNameAndVersion(const QString &str) { d->clie
 
 void StunAllocate::start() { d->start(); }
 
-void StunAllocate::start(const QHostAddress &addr, int port) { d->start(addr, port); }
+void StunAllocate::start(const TransportAddress &addr) { d->start(addr); }
 
 void StunAllocate::stop() { d->stop(); }
 
 QString StunAllocate::serverSoftwareNameAndVersion() const { return d->serverSoftware; }
 
-QHostAddress StunAllocate::reflexiveAddress() const { return d->reflexiveAddress; }
-
-int StunAllocate::reflexivePort() const { return d->reflexivePort; }
-
-QHostAddress StunAllocate::relayedAddress() const { return d->relayedAddress; }
+const TransportAddress &StunAllocate::reflexiveAddress() const { return d->reflexiveAddress; }
 
-quint16 StunAllocate::relayedPort() const { return d->relayedPort; }
+const TransportAddress &StunAllocate::relayedAddress() const { return d->relayedAddress; }
 
 QList<QHostAddress> StunAllocate::permissions() const { return d->permsOut; }
 
@@ -1129,9 +1106,9 @@ QList<StunAllocate::Channel> StunAllocate::channels() const { return d->channels
 
 void StunAllocate::setChannels(const QList<Channel> &channels) { d->setChannels(channels); }
 
-int StunAllocate::packetHeaderOverhead(const QHostAddress &addr, int port) const
+int StunAllocate::packetHeaderOverhead(const TransportAddress &addr) const
 {
-    int channelId = d->getChannel(addr, port);
+    int channelId = d->getChannel(addr);
 
     if (channelId != -1) {
         // overhead of ChannelData
@@ -1153,9 +1130,9 @@ int StunAllocate::packetHeaderOverhead(const QHostAddress &addr, int port) const
     return -1;
 }
 
-QByteArray StunAllocate::encode(const QByteArray &datagram, const QHostAddress &addr, int port)
+QByteArray StunAllocate::encode(const QByteArray &datagram, const TransportAddress &addr)
 {
-    int channelId = d->getChannel(addr, port);
+    int channelId = d->getChannel(addr);
 
     if (channelId != -1) {
         if (datagram.size() > 65535)
@@ -1191,7 +1168,7 @@ QByteArray StunAllocate::encode(const QByteArray &datagram, const QHostAddress &
         {
             StunMessage::Attribute a;
             a.type  = StunTypes::XOR_PEER_ADDRESS;
-            a.value = StunTypes::createXorPeerAddress(addr, quint16(port), message.magic(), message.id());
+            a.value = StunTypes::createXorPeerAddress(addr, message.magic(), message.id());
             list += a;
         }
 
@@ -1214,7 +1191,7 @@ QByteArray StunAllocate::encode(const QByteArray &datagram, const QHostAddress &
     }
 }
 
-QByteArray StunAllocate::decode(const QByteArray &encoded, QHostAddress *addr, int *port)
+QByteArray StunAllocate::decode(const QByteArray &encoded, TransportAddress &addr)
 {
     if (encoded.size() < 4)
         return QByteArray();
@@ -1224,27 +1201,25 @@ QByteArray StunAllocate::decode(const QByteArray &encoded, QHostAddress *addr, i
     if (encoded.size() - 4 < (int)len)
         return QByteArray();
 
-    if (!d->getAddressPort(num, addr, port))
+    if (!d->getAddressPort(num, addr))
         return QByteArray();
 
     return encoded.mid(4, len);
 }
 
-QByteArray StunAllocate::decode(const StunMessage &encoded, QHostAddress *addr, int *port)
+QByteArray StunAllocate::decode(const StunMessage &encoded, TransportAddress &addr)
 {
-    QHostAddress paddr;
-    quint16      pport;
+    TransportAddress paddr;
 
     if (!StunTypes::parseXorPeerAddress(encoded.attribute(StunTypes::XOR_PEER_ADDRESS), encoded.magic(), encoded.id(),
-                                        &paddr, &pport))
+                                        paddr))
         return QByteArray();
 
     QByteArray data = encoded.attribute(StunTypes::DATA);
     if (data.isNull())
         return QByteArray();
 
-    *addr = paddr;
-    *port = pport;
+    addr = paddr;
     return data;
 }
 
diff --git a/src/irisnet/noncore/stunallocate.h b/src/irisnet/noncore/stunallocate.h
index ebd171c0..88920b87 100644
--- a/src/irisnet/noncore/stunallocate.h
+++ b/src/irisnet/noncore/stunallocate.h
@@ -23,11 +23,14 @@
 #include <QList>
 #include <QObject>
 
+#include "transportaddress.h"
+
 class QByteArray;
 
 namespace XMPP {
 class StunMessage;
 class StunTransactionPool;
+class TransportAddress;
 
 class StunAllocate : public QObject {
     Q_OBJECT
@@ -37,13 +40,11 @@ class StunAllocate : public QObject {
 
     class Channel {
     public:
-        QHostAddress address;
-        int          port;
-
-        Channel(const QHostAddress &_address, int _port) : address(_address), port(_port) { }
+        TransportAddress address;
 
-        inline bool operator==(const Channel &other) { return address == other.address && port == other.port; }
+        Channel(const TransportAddress &_address) : address(_address) { }
 
+        inline bool operator==(const Channel &other) { return address == other.address; }
         inline bool operator!=(const Channel &other) { return !operator==(other); }
     };
 
@@ -53,16 +54,13 @@ class StunAllocate : public QObject {
     void setClientSoftwareNameAndVersion(const QString &str);
 
     void start();
-    void start(const QHostAddress &addr, int port); // use addr association
+    void start(const TransportAddress &addr); // use addr association
     void stop();
 
     QString serverSoftwareNameAndVersion() const;
 
-    QHostAddress reflexiveAddress() const;
-    int          reflexivePort() const;
-
-    QHostAddress relayedAddress() const;
-    quint16      relayedPort() const;
+    const TransportAddress &reflexiveAddress() const;
+    const TransportAddress &relayedAddress() const;
 
     QList<QHostAddress> permissions() const;
     void                setPermissions(const QList<QHostAddress> &perms);
@@ -70,11 +68,11 @@ class StunAllocate : public QObject {
     QList<Channel> channels() const;
     void           setChannels(const QList<Channel> &channels);
 
-    int packetHeaderOverhead(const QHostAddress &addr, int port) const;
+    int packetHeaderOverhead(const TransportAddress &addr) const;
 
-    QByteArray encode(const QByteArray &datagram, const QHostAddress &addr, int port);
-    QByteArray decode(const QByteArray &encoded, QHostAddress *addr = nullptr, int *port = nullptr);
-    QByteArray decode(const StunMessage &encoded, QHostAddress *addr = nullptr, int *port = nullptr);
+    QByteArray encode(const QByteArray &datagram, const TransportAddress &addr);
+    QByteArray decode(const QByteArray &encoded, TransportAddress &addr);
+    QByteArray decode(const StunMessage &encoded, TransportAddress &addr);
 
     QString errorString() const;
 
diff --git a/src/irisnet/noncore/stunbinding.cpp b/src/irisnet/noncore/stunbinding.cpp
index dd8124d3..2c22a6b2 100644
--- a/src/irisnet/noncore/stunbinding.cpp
+++ b/src/irisnet/noncore/stunbinding.cpp
@@ -21,8 +21,7 @@
 #include "stunmessage.h"
 #include "stuntransaction.h"
 #include "stuntypes.h"
-
-#include <QHostAddress>
+#include "transportaddress.h"
 
 namespace XMPP {
 class StunBinding::Private : public QObject {
@@ -32,10 +31,8 @@ class StunBinding::Private : public QObject {
     StunBinding *                   q;
     StunTransactionPool::Ptr        pool;
     QScopedPointer<StunTransaction> trans;
-    QHostAddress                    stunAddr;
-    int                             stunPort = 0;
-    QHostAddress                    addr;
-    int                             port = 0;
+    TransportAddress                stunAddr;
+    TransportAddress                addr;
     QString                         errorString;
     bool    use_extPriority = false, use_extIceControlling = false, use_extIceControlled = false;
     quint32 extPriority       = 0;
@@ -48,18 +45,16 @@ class StunBinding::Private : public QObject {
 
     ~Private() { }
 
-    void start(const QHostAddress &_addr = QHostAddress(), int _port = -1)
+    void start(const TransportAddress &_addr = TransportAddress())
     {
         Q_ASSERT(!trans);
 
         stunAddr = _addr;
-        stunPort = _port;
 
         trans.reset(new StunTransaction());
-        connect(trans.data(), SIGNAL(createMessage(QByteArray)), SLOT(trans_createMessage(QByteArray)));
-        connect(trans.data(), SIGNAL(finished(XMPP::StunMessage)), SLOT(trans_finished(XMPP::StunMessage)));
-        connect(trans.data(), SIGNAL(error(XMPP::StunTransaction::Error)),
-                SLOT(trans_error(XMPP::StunTransaction::Error)));
+        connect(trans.data(), &StunTransaction::createMessage, this, &Private::trans_createMessage);
+        connect(trans.data(), &StunTransaction::finished, this, &Private::trans_finished);
+        connect(trans.data(), &StunTransaction::error, this, &Private::trans_error);
 
         if (!stuser.isEmpty()) {
             trans->setShortTermUsername(stuser);
@@ -68,7 +63,7 @@ class StunBinding::Private : public QObject {
 
         trans->setFingerprintRequired(fpRequired);
 
-        trans->start(pool.data(), stunAddr, stunPort);
+        trans->start(pool.data(), stunAddr);
     }
 
     void cancel()
@@ -79,8 +74,7 @@ class StunBinding::Private : public QObject {
         t->disconnect(this);
         t->cancel(); // will self-delete the transaction either on incoming or timeout
         // just in case those too
-        addr = QHostAddress();
-        port = 0;
+        addr = TransportAddress();
         errorString.clear();
 
         // now the binding can be reused
@@ -153,13 +147,12 @@ private slots:
             return;
         }
 
-        QHostAddress saddr;
-        quint16      sport = 0;
+        TransportAddress saddr;
 
         QByteArray val;
         val = response.attribute(StunTypes::XOR_MAPPED_ADDRESS);
         if (!val.isNull()) {
-            if (!StunTypes::parseXorMappedAddress(val, response.magic(), response.id(), &saddr, &sport)) {
+            if (!StunTypes::parseXorMappedAddress(val, response.magic(), response.id(), saddr)) {
                 errorString = "Unable to parse XOR-MAPPED-ADDRESS response.";
                 emit q->error(StunBinding::ErrorProtocol);
                 return;
@@ -167,7 +160,7 @@ private slots:
         } else {
             val = response.attribute(StunTypes::MAPPED_ADDRESS);
             if (!val.isNull()) {
-                if (!StunTypes::parseMappedAddress(val, &saddr, &sport)) {
+                if (!StunTypes::parseMappedAddress(val, saddr)) {
                     errorString = "Unable to parse MAPPED-ADDRESS response.";
                     emit q->error(StunBinding::ErrorProtocol);
                     return;
@@ -180,7 +173,6 @@ private slots:
         }
 
         addr = saddr;
-        port = sport;
         emit q->success();
     }
 
@@ -238,13 +230,11 @@ void StunBinding::setFingerprintRequired(bool enabled) { d->fpRequired = enabled
 
 void StunBinding::start() { d->start(); }
 
-void StunBinding::start(const QHostAddress &addr, int port) { d->start(addr, port); }
+void StunBinding::start(const TransportAddress &addr) { d->start(addr); }
 
 void StunBinding::cancel() { d->cancel(); }
 
-QHostAddress StunBinding::reflexiveAddress() const { return d->addr; }
-
-int StunBinding::reflexivePort() const { return d->port; }
+const TransportAddress &StunBinding::reflexiveAddress() const { return d->addr; }
 
 QString StunBinding::errorString() const { return d->errorString; }
 } // namespace XMPP
diff --git a/src/irisnet/noncore/stunbinding.h b/src/irisnet/noncore/stunbinding.h
index 8ae244e5..bc659d56 100644
--- a/src/irisnet/noncore/stunbinding.h
+++ b/src/irisnet/noncore/stunbinding.h
@@ -21,10 +21,9 @@
 
 #include <QObject>
 
-class QHostAddress;
-
 namespace XMPP {
 class StunTransactionPool;
+class TransportAddress;
 
 class StunBinding : public QObject {
     Q_OBJECT
@@ -49,11 +48,10 @@ class StunBinding : public QObject {
     void setFingerprintRequired(bool enabled);
 
     void start();
-    void start(const QHostAddress &addr, int port); // use addr association
+    void start(const XMPP::TransportAddress &addr); // use addr association
     void cancel();
 
-    QHostAddress reflexiveAddress() const;
-    int          reflexivePort() const;
+    const TransportAddress &reflexiveAddress() const;
 
     // non-translatable diagnostic string for convenience
     QString errorString() const;
diff --git a/src/irisnet/noncore/stuntransaction.cpp b/src/irisnet/noncore/stuntransaction.cpp
index c0dff102..cc508413 100644
--- a/src/irisnet/noncore/stuntransaction.cpp
+++ b/src/irisnet/noncore/stuntransaction.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2009  Barracuda Networks, Inc.
+ * Copyright (C) 2013-2021 Psi IM team
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,6 +23,7 @@
 #include "stunmessage.h"
 #include "stuntypes.h"
 #include "stunutil.h"
+#include "transportaddress.h"
 
 #include <QElapsedTimer>
 #include <QHash>
@@ -104,7 +106,7 @@ class StunTransactionPoolPrivate : public QObject {
 
     StunTransactionPoolPrivate(StunTransactionPool *_q) :
         QObject(_q), q(_q), useLongTermAuth(false), needLongTermAuth(false), triedLongTermAuth(false),
-        debugLevel(StunTransactionPool::DL_None)
+        debugLevel(StunTransactionPool::DL_Packet)
     {
     }
 
@@ -124,41 +126,33 @@ class StunTransactionPrivate : public QObject {
     StunTransaction *q;
 
     StunTransactionPool::Ptr pool;
-    bool                     active;
+    bool                     active     = false;
     bool                     cancelling = false;
     StunTransaction::Mode    mode;
     StunMessage              origMessage;
     QByteArray               id;
     QByteArray               packet;
-    QHostAddress             to_addr;
-    quint16                  to_port;
+    TransportAddress         to_addr;
 
-    int     rto, rc, rm, ti;
+    // defaults from RFC 5389
+    int     rto = 500, rc = 7, rm = 16, ti = 39500;
     int     tries;
     int     last_interval;
     QTimer *t;
 
     QString       stuser;
     QString       stpass;
-    bool          fpRequired;
+    bool          fpRequired = false;
     QByteArray    key;
     QElapsedTimer time;
 
-    StunTransactionPrivate(StunTransaction *_q) : QObject(_q), q(_q), pool(nullptr), fpRequired(false)
+    StunTransactionPrivate(StunTransaction *_q) : QObject(_q), q(_q)
     {
         qRegisterMetaType<StunTransaction::Error>();
 
-        active = false;
-
         t = new QTimer(this);
-        connect(t, SIGNAL(timeout()), SLOT(t_timeout()));
+        connect(t, &QTimer::timeout, this, &StunTransactionPrivate::t_timeout);
         t->setSingleShot(true);
-
-        // defaults from RFC 5389
-        rto = 500;
-        rc  = 7;
-        rm  = 16;
-        ti  = 39500;
     }
 
     ~StunTransactionPrivate()
@@ -171,12 +165,11 @@ class StunTransactionPrivate : public QObject {
         t->deleteLater();
     }
 
-    void start(StunTransactionPool::Ptr _pool, const QHostAddress &toAddress, quint16 toPort)
+    void start(StunTransactionPool::Ptr _pool, const TransportAddress &toAddress)
     {
         pool    = _pool;
         mode    = pool->d->mode;
         to_addr = toAddress;
-        to_port = toPort;
 
         tryRequest();
     }
@@ -303,8 +296,8 @@ private slots:
         }
 
         QString dbg;
-        if (!to_addr.isNull())
-            dbg += QString("to=(") + to_addr.toString() + ';' + QString::number(to_port) + ')';
+        if (to_addr.isValid())
+            dbg += QString("to=(%1)").arg(to_addr);
 
         emit pool->debugLine(QString("stun transaction %1 timeout. retransmitting..").arg(dbg));
         transmit();
@@ -315,8 +308,8 @@ private slots:
     {
         if (pool->d->debugLevel >= StunTransactionPool::DL_Packet) {
             QString str = QString("STUN SEND: elapsed=") + QString::number(time.elapsed());
-            if (!to_addr.isNull())
-                str += QString(" to=(") + to_addr.toString() + ';' + QString::number(to_port) + ')';
+            if (to_addr.isValid())
+                str += QString(" to=(%1)").arg(to_addr);
             emit pool->debugLine(str);
 
             StunMessage msg = StunMessage::fromBinary(packet);
@@ -326,12 +319,12 @@ private slots:
         pool->d->transmit(q);
     }
 
-    bool checkActiveAndFrom(const QHostAddress &from_addr, quint16 from_port)
+    bool checkActiveAndFrom(const TransportAddress &from_addr)
     {
         if (!active)
             return false;
 
-        return to_addr.isNull() || (to_addr == from_addr && to_port == from_port);
+        return !to_addr.isValid() || (to_addr == from_addr);
     }
 
     void processIncoming(const StunMessage &msg, bool authed)
@@ -403,9 +396,9 @@ private slots:
     }
 
 public:
-    bool writeIncomingMessage(const StunMessage &msg, const QHostAddress &from_addr, int from_port)
+    bool writeIncomingMessage(const StunMessage &msg, const TransportAddress &from_addr)
     {
-        if (!checkActiveAndFrom(from_addr, from_port))
+        if (!checkActiveAndFrom(from_addr))
             return false;
 
         // if a StunMessage is passed directly to us then we assume
@@ -414,9 +407,9 @@ private slots:
         return true;
     }
 
-    bool writeIncomingMessage(const QByteArray &packet, bool *notStun, const QHostAddress &from_addr, int from_port)
+    bool writeIncomingMessage(const QByteArray &packet, bool *notStun, const TransportAddress &from_addr)
     {
-        if (!checkActiveAndFrom(from_addr, from_port)) {
+        if (!checkActiveAndFrom(from_addr)) {
             // could be STUN, don't really know for sure
             *notStun = false;
             return false;
@@ -454,10 +447,10 @@ StunTransaction::StunTransaction(QObject *parent) : QObject(parent) { d = new St
 
 StunTransaction::~StunTransaction() { delete d; }
 
-void StunTransaction::start(StunTransactionPool *pool, const QHostAddress &toAddress, int toPort)
+void StunTransaction::start(StunTransactionPool *pool, const TransportAddress &toAddress)
 {
     Q_ASSERT(!d->active);
-    d->start(pool->sharedFromThis(), toAddress, toPort);
+    d->start(pool->sharedFromThis(), toAddress);
 }
 
 void StunTransaction::cancel() { d->cancelling = true; }
@@ -530,7 +523,7 @@ void StunTransactionPoolPrivate::remove(StunTransaction *trans)
 
 void StunTransactionPoolPrivate::transmit(StunTransaction *trans)
 {
-    emit q->outgoingMessage(trans->d->packet, trans->d->to_addr, trans->d->to_port);
+    emit q->outgoingMessage(trans->d->packet, trans->d->to_addr);
 }
 
 StunTransactionPool::StunTransactionPool(StunTransaction::Mode mode)
@@ -548,12 +541,12 @@ StunTransactionPool::~StunTransactionPool()
 
 StunTransaction::Mode StunTransactionPool::mode() const { return d->mode; }
 
-bool StunTransactionPool::writeIncomingMessage(const StunMessage &msg, const QHostAddress &addr, int port)
+bool StunTransactionPool::writeIncomingMessage(const StunMessage &msg, const TransportAddress &addr)
 {
     if (d->debugLevel >= DL_Packet) {
         QString str = "STUN RECV";
-        if (!addr.isNull())
-            str += QString(" from=(") + addr.toString() + ';' + QString::number(port) + ')';
+        if (addr.isValid())
+            str += QString(" from=(%1)").arg(addr);
         emit debugLine(str);
         emit debugLine(StunTypes::print_packet_str(msg));
     }
@@ -568,11 +561,10 @@ bool StunTransactionPool::writeIncomingMessage(const StunMessage &msg, const QHo
     if (!trans)
         return false;
 
-    return trans->d->writeIncomingMessage(msg, addr, port);
+    return trans->d->writeIncomingMessage(msg, addr);
 }
 
-bool StunTransactionPool::writeIncomingMessage(const QByteArray &packet, bool *notStun, const QHostAddress &addr,
-                                               int port)
+bool StunTransactionPool::writeIncomingMessage(const QByteArray &packet, bool *notStun, const TransportAddress &addr)
 {
     if (!StunMessage::isProbablyStun(packet)) {
         // basic stun check failed?  surely not STUN
@@ -584,8 +576,8 @@ bool StunTransactionPool::writeIncomingMessage(const QByteArray &packet, bool *n
     if (d->debugLevel >= DL_Packet) {
         StunMessage msg = StunMessage::fromBinary(packet);
         QString     str = "STUN RECV";
-        if (!addr.isNull())
-            str += QString(" from=(") + addr.toString() + ';' + QString::number(port) + ')';
+        if (addr.isValid())
+            str += QString(" from=(%1)").arg(addr);
         emit debugLine(str);
         emit debugLine(StunTypes::print_packet_str(msg));
     }
@@ -612,7 +604,7 @@ bool StunTransactionPool::writeIncomingMessage(const QByteArray &packet, bool *n
     }
 
     bool _notStun = false;
-    bool ret      = trans->d->writeIncomingMessage(packet, &_notStun, addr, port);
+    bool ret      = trans->d->writeIncomingMessage(packet, &_notStun, addr);
     if (!ret && notStun)
         *notStun = _notStun;
     return ret;
@@ -645,7 +637,7 @@ void StunTransactionPool::continueAfterParams()
     d->needLongTermAuth  = false;
     d->triedLongTermAuth = true;
 
-    for (StunTransaction *trans : d->transactions) {
+    for (StunTransaction *trans : qAsConst(d->transactions)) {
         // the only reason an inactive transaction would be in the
         //   list is if it is waiting for an auth retry
         if (!trans->d->active && !trans->d->cancelling) {
diff --git a/src/irisnet/noncore/stuntransaction.h b/src/irisnet/noncore/stuntransaction.h
index 4bb5dc32..7086375c 100644
--- a/src/irisnet/noncore/stuntransaction.h
+++ b/src/irisnet/noncore/stuntransaction.h
@@ -21,9 +21,10 @@
 
 #include <QByteArray>
 #include <QEnableSharedFromThis>
-#include <QHostAddress>
 #include <QObject>
 
+#include "transportaddress.h"
+
 namespace QCA {
 class SecureArray;
 }
@@ -76,7 +77,7 @@ class StunTransaction : public QObject {
     //   specific endpoint
     // note: not DOR-DS safe.  this function will cause the pool's
     //   outgoingMessage() signal to be emitted.
-    void start(StunTransactionPool *pool, const QHostAddress &toAddress = QHostAddress(), int toPort = -1);
+    void start(StunTransactionPool *pool, const TransportAddress &toAddress = TransportAddress());
     void cancel();
 
     // pass message with class unset.  use transaction id from the
@@ -139,7 +140,7 @@ class StunTransactionPool : public QObject, public QEnableSharedFromThis<StunTra
     //   may cause a transaction to emit finished() or error() signals.
 
     // returns true if the message is owned by the pool, else false.
-    bool writeIncomingMessage(const StunMessage &msg, const QHostAddress &addr = QHostAddress(), int port = -1);
+    bool writeIncomingMessage(const StunMessage &msg, const TransportAddress &addr = TransportAddress());
 
     // returns true if the packet is surely a STUN message and owned by the
     //   pool, else false.  a packet must be owned by the pool to be
@@ -148,7 +149,7 @@ class StunTransactionPool : public QObject, public QEnableSharedFromThis<StunTra
     //   is surely not STUN, or set to false if it is unclear whether the
     //   packet is STUN or not.
     bool writeIncomingMessage(const QByteArray &packet, bool *notStun = nullptr,
-                              const QHostAddress &addr = QHostAddress(), int port = -1);
+                              const TransportAddress &addr = TransportAddress());
 
     void setLongTermAuthEnabled(bool enabled);
 
@@ -174,7 +175,7 @@ class StunTransactionPool : public QObject, public QEnableSharedFromThis<StunTra
     //   writeIncomingMessage() during outgoingMessage() could cause
     //   a transaction's finished() or error() signals to emit during
     //   start(), which would violate DOR-DS.
-    void outgoingMessage(const QByteArray &packet, const QHostAddress &addr, quint16 port);
+    void outgoingMessage(const QByteArray &packet, const TransportAddress &addr);
 
     void needAuthParams();
 
diff --git a/src/irisnet/noncore/stuntypes.cpp b/src/irisnet/noncore/stuntypes.cpp
index 309d6bcd..9f51e029 100644
--- a/src/irisnet/noncore/stuntypes.cpp
+++ b/src/irisnet/noncore/stuntypes.cpp
@@ -19,6 +19,7 @@
 #include "stuntypes.h"
 
 #include "stunutil.h"
+#include "transportaddress.h"
 
 #include <QtCrypto>
 #include <stdio.h>
@@ -62,23 +63,23 @@ namespace StunTypes {
         return false;
     }
 
-    QByteArray createMappedAddress(const QHostAddress &addr, quint16 port)
+    QByteArray createMappedAddress(const TransportAddress &addr)
     {
         QByteArray out;
 
-        if (addr.protocol() == QAbstractSocket::IPv6Protocol) {
+        if (addr.addr.protocol() == QAbstractSocket::IPv6Protocol) {
             out              = QByteArray(20, 0);
             out[1]           = 0x02; // IPv6
-            Q_IPV6ADDR addr6 = addr.toIPv6Address();
+            Q_IPV6ADDR addr6 = addr.addr.toIPv6Address();
             memcpy(out.data() + 4, addr6.c, 16);
-        } else if (addr.protocol() == QAbstractSocket::IPv4Protocol) {
+        } else if (addr.addr.protocol() == QAbstractSocket::IPv4Protocol) {
             out    = QByteArray(8, 0);
             out[1] = 0x01; // IPv4
-            write32((quint8 *)out.data() + 4, addr.toIPv4Address());
+            write32((quint8 *)out.data() + 4, addr.addr.toIPv4Address());
         } else
             Q_ASSERT(0);
 
-        write16((quint8 *)out.data() + 2, port);
+        write16((quint8 *)out.data() + 2, addr.port);
         return out;
     }
 
@@ -115,10 +116,10 @@ namespace StunTypes {
 
     QByteArray createNonce(const QString &nonce) { return nonce.left(STRING_MAX_CHARS).toUtf8(); }
 
-    QByteArray createXorMappedAddress(const QHostAddress &addr, quint16 port, const quint8 *magic, const quint8 *id)
+    QByteArray createXorMappedAddress(const TransportAddress &addr, const quint8 *magic, const quint8 *id)
     {
-        QByteArray out = createMappedAddress(addr, port);
-        if (addr.protocol() == QAbstractSocket::IPv6Protocol)
+        QByteArray out = createMappedAddress(addr);
+        if (addr.addr.protocol() == QAbstractSocket::IPv6Protocol)
             xorIPv6(&out, magic, id);
         else // IPv4
             xorIPv4(&out, magic);
@@ -140,14 +141,14 @@ namespace StunTypes {
         return val;
     }
 
-    QByteArray createXorPeerAddress(const QHostAddress &addr, quint16 port, const quint8 *magic, const quint8 *id)
+    QByteArray createXorPeerAddress(const TransportAddress &addr, const quint8 *magic, const quint8 *id)
     {
-        return createXorMappedAddress(addr, port, magic, id);
+        return createXorMappedAddress(addr, magic, id);
     }
 
-    QByteArray createXorRelayedAddress(const QHostAddress &addr, quint16 port, const quint8 *magic, const quint8 *id)
+    QByteArray createXorRelayedAddress(const TransportAddress &addr, const quint8 *magic, const quint8 *id)
     {
-        return createXorMappedAddress(addr, port, magic, id);
+        return createXorMappedAddress(addr, magic, id);
     }
 
     QByteArray createEvenPort(bool reserve)
@@ -183,7 +184,7 @@ namespace StunTypes {
 
     QByteArray createSoftware(const QString &str) { return str.left(STRING_MAX_CHARS).toUtf8(); }
 
-    QByteArray createAlternateServer(const QHostAddress &addr, quint16 port) { return createMappedAddress(addr, port); }
+    QByteArray createAlternateServer(const TransportAddress &addr) { return createMappedAddress(addr); }
 
     QByteArray createIceControlled(quint64 i)
     {
@@ -199,18 +200,18 @@ namespace StunTypes {
         return val;
     }
 
-    bool parseMappedAddress(const QByteArray &val, QHostAddress *addr, quint16 *port)
+    bool parseMappedAddress(const QByteArray &val, TransportAddress &addr)
     {
         if (val[1] == 0x02 && val.size() == 20) // IPv6
         {
-            *port          = read16((const quint8 *)val.data() + 2);
+            addr.port      = read16((const quint8 *)val.data() + 2);
             QByteArray buf = val.mid(4);
-            *addr          = QHostAddress((quint8 *)buf.data());
+            addr.addr      = QHostAddress((quint8 *)buf.data());
             return true;
         } else if (val[1] == 0x01 && val.size() == 8) // IPv4
         {
-            *port = read16((const quint8 *)val.data() + 2);
-            *addr = QHostAddress(read32((const quint8 *)val.data() + 4));
+            addr.port = read16((const quint8 *)val.data() + 2);
+            addr.addr = QHostAddress(read32((const quint8 *)val.data() + 4));
             return true;
         } else
             return false;
@@ -254,8 +255,7 @@ namespace StunTypes {
 
     bool parseNonce(const QByteArray &val, QString *nonce) { return validateString(val, nonce); }
 
-    bool parseXorMappedAddress(const QByteArray &val, const quint8 *magic, const quint8 *id, QHostAddress *addr,
-                               quint16 *port)
+    bool parseXorMappedAddress(const QByteArray &val, const quint8 *magic, const quint8 *id, TransportAddress &addr)
     {
         if (val.size() < 4)
             return false;
@@ -272,7 +272,7 @@ namespace StunTypes {
         } else
             return false;
 
-        return parseMappedAddress(buf, addr, port);
+        return parseMappedAddress(buf, addr);
     }
 
     bool parseChannelNumber(const QByteArray &val, quint16 *i)
@@ -295,16 +295,14 @@ namespace StunTypes {
         return true;
     }
 
-    bool parseXorPeerAddress(const QByteArray &val, const quint8 *magic, const quint8 *id, QHostAddress *addr,
-                             quint16 *port)
+    bool parseXorPeerAddress(const QByteArray &val, const quint8 *magic, const quint8 *id, TransportAddress &addr)
     {
-        return parseXorMappedAddress(val, magic, id, addr, port);
+        return parseXorMappedAddress(val, magic, id, addr);
     }
 
-    bool parseXorRelayedAddress(const QByteArray &val, const quint8 *magic, const quint8 *id, QHostAddress *addr,
-                                quint16 *port)
+    bool parseXorRelayedAddress(const QByteArray &val, const quint8 *magic, const quint8 *id, TransportAddress &addr)
     {
-        return parseXorMappedAddress(val, magic, id, addr, port);
+        return parseXorMappedAddress(val, magic, id, addr);
     }
 
     bool parseEvenPort(const QByteArray &val, bool *reserve)
@@ -352,10 +350,7 @@ namespace StunTypes {
         return true;
     }
 
-    bool parseAlternateServer(const QByteArray &val, QHostAddress *addr, quint16 *port)
-    {
-        return parseMappedAddress(val, addr, port);
-    }
+    bool parseAlternateServer(const QByteArray &val, TransportAddress &addr) { return parseMappedAddress(val, addr); }
 
     bool parseIceControlled(const QByteArray &val, quint64 *i)
     {
@@ -452,10 +447,9 @@ namespace StunTypes {
     {
         switch ((Attribute)type) {
         case MAPPED_ADDRESS: {
-            QHostAddress addr;
-            quint16      port;
-            if (parseMappedAddress(val, &addr, &port))
-                return addr.toString() + ';' + QString::number(port);
+            TransportAddress addr;
+            if (parseMappedAddress(val, addr))
+                return QString(addr);
             break;
         }
         case USERNAME: {
@@ -483,7 +477,7 @@ namespace StunTypes {
             if (parseUnknownAttributes(val, &typeList)) {
                 if (!typeList.isEmpty()) {
                     QStringList strList;
-                    for (quint16 i : typeList)
+                    for (quint16 i : qAsConst(typeList))
                         strList += QString::asprintf("0x%04x", i);
                     return strList.join(", ");
                 } else
@@ -504,10 +498,9 @@ namespace StunTypes {
             break;
         }
         case XOR_MAPPED_ADDRESS: {
-            QHostAddress addr;
-            quint16      port;
-            if (parseXorMappedAddress(val, magic, id, &addr, &port))
-                return addr.toString() + ';' + QString::number(port);
+            TransportAddress addr;
+            if (parseXorMappedAddress(val, magic, id, addr))
+                return QString(addr);
             break;
         }
         case CHANNEL_NUMBER: {
diff --git a/src/irisnet/noncore/stuntypes.h b/src/irisnet/noncore/stuntypes.h
index 636a527d..428db2b7 100644
--- a/src/irisnet/noncore/stuntypes.h
+++ b/src/irisnet/noncore/stuntypes.h
@@ -26,7 +26,9 @@
 #include <QList>
 #include <QString>
 
-namespace XMPP { namespace StunTypes {
+namespace XMPP {
+class TransportAddress;
+namespace StunTypes {
     enum Method {
         Binding          = 0x001,
         Allocate         = 0x003,
@@ -85,46 +87,43 @@ namespace XMPP { namespace StunTypes {
         RoleConflict = 487
     };
 
-    QByteArray createMappedAddress(const QHostAddress &addr, quint16 port);
+    QByteArray createMappedAddress(const XMPP::TransportAddress &addr);
     QByteArray createUsername(const QString &username);
     QByteArray createErrorCode(int code, const QString &reason);
     QByteArray createUnknownAttributes(const QList<quint16> &typeList);
     QByteArray createRealm(const QString &realm);
     QByteArray createNonce(const QString &nonce);
-    QByteArray createXorMappedAddress(const QHostAddress &addr, quint16 port, const quint8 *magic, const quint8 *id);
+    QByteArray createXorMappedAddress(const XMPP::TransportAddress &addr, const quint8 *magic, const quint8 *id);
     QByteArray createChannelNumber(quint16 i);
     QByteArray createLifetime(quint32 i);
-    QByteArray createXorPeerAddress(const QHostAddress &addr, quint16 port, const quint8 *magic, const quint8 *id);
-    QByteArray createXorRelayedAddress(const QHostAddress &addr, quint16 port, const quint8 *magic, const quint8 *id);
+    QByteArray createXorPeerAddress(const XMPP::TransportAddress &addr, const quint8 *magic, const quint8 *id);
+    QByteArray createXorRelayedAddress(const XMPP::TransportAddress &addr, const quint8 *magic, const quint8 *id);
     QByteArray createEvenPort(bool reserve);
     QByteArray createRequestedTransport(quint8 proto);
     QByteArray createReservationToken(const QByteArray &token);
     QByteArray createPriority(quint32 i);
     QByteArray createSoftware(const QString &str);
-    QByteArray createAlternateServer(const QHostAddress &addr, quint16 port);
+    QByteArray createAlternateServer(const XMPP::TransportAddress &addr);
     QByteArray createIceControlled(quint64 i);
     QByteArray createIceControlling(quint64 i);
 
-    bool parseMappedAddress(const QByteArray &val, QHostAddress *addr, quint16 *port);
+    bool parseMappedAddress(const QByteArray &val, TransportAddress &addr);
     bool parseUsername(const QByteArray &val, QString *username);
     bool parseErrorCode(const QByteArray &val, int *code, QString *reason);
     bool parseUnknownAttributes(const QByteArray &val, QList<quint16> *typeList);
     bool parseRealm(const QByteArray &val, QString *realm);
     bool parseNonce(const QByteArray &val, QString *nonce);
-    bool parseXorMappedAddress(const QByteArray &val, const quint8 *magic, const quint8 *id, QHostAddress *addr,
-                               quint16 *port);
+    bool parseXorMappedAddress(const QByteArray &val, const quint8 *magic, const quint8 *id, TransportAddress &addr);
     bool parseChannelNumber(const QByteArray &val, quint16 *i);
     bool parseLifetime(const QByteArray &val, quint32 *i);
-    bool parseXorPeerAddress(const QByteArray &val, const quint8 *magic, const quint8 *id, QHostAddress *addr,
-                             quint16 *port);
-    bool parseXorRelayedAddress(const QByteArray &val, const quint8 *magic, const quint8 *id, QHostAddress *addr,
-                                quint16 *port);
+    bool parseXorPeerAddress(const QByteArray &val, const quint8 *magic, const quint8 *id, TransportAddress &addr);
+    bool parseXorRelayedAddress(const QByteArray &val, const quint8 *magic, const quint8 *id, TransportAddress &addr);
     bool parseEvenPort(const QByteArray &val, bool *reserve);
     bool parseRequestedTransport(const QByteArray &val, quint8 *proto);
     bool parseReservationToken(const QByteArray &val, QByteArray *token);
     bool parsePriority(const QByteArray &val, quint32 *i);
     bool parseSoftware(const QByteArray &val, QString *str);
-    bool parseAlternateServer(const QByteArray &val, QHostAddress *addr, quint16 *port);
+    bool parseAlternateServer(const QByteArray &val, TransportAddress &addr);
     bool parseIceControlled(const QByteArray &val, quint64 *i);
     bool parseIceControlling(const QByteArray &val, quint64 *i);
 
diff --git a/src/irisnet/noncore/stunutil.h b/src/irisnet/noncore/stunutil.h
index 7ec74cf2..88aab1fc 100644
--- a/src/irisnet/noncore/stunutil.h
+++ b/src/irisnet/noncore/stunutil.h
@@ -33,6 +33,7 @@ namespace XMPP { namespace StunUtil {
     QCA::SecureArray saslPrep(const QCA::SecureArray &in);
 
 } // namespace StunUtil
+
 } // namespace XMPP
 
 #endif // STUNUTIL_H
diff --git a/src/irisnet/noncore/tcpportreserver.cpp b/src/irisnet/noncore/tcpportreserver.cpp
index 07cb1407..ef6bcda6 100644
--- a/src/irisnet/noncore/tcpportreserver.cpp
+++ b/src/irisnet/noncore/tcpportreserver.cpp
@@ -89,7 +89,8 @@ void TcpPortDiscoverer::addLocalServers()
         if (ni.flags() & QNetworkInterface::IsLoopBack) {
             continue;
         }
-        for (const QNetworkAddressEntry &na : ni.addressEntries()) {
+        auto const &addrs = ni.addressEntries();
+        for (const QNetworkAddressEntry &na : addrs) {
             QHostAddress h = na.ip();
             if (h.isLoopback()) {
                 continue;
@@ -167,7 +168,9 @@ TcpPortScope::~TcpPortScope() { }
 TcpPortDiscoverer *TcpPortScope::disco()
 {
     auto discoverer = new TcpPortDiscoverer(this);
-    QMetaObject::invokeMethod(parent(), "newDiscoverer", Q_ARG(TcpPortDiscoverer *, discoverer));
+    // clang-format off
+    QMetaObject::invokeMethod(parent(), "newDiscoverer", Q_ARG(TcpPortDiscoverer*,discoverer));
+    // clang-format on
     QMetaObject::invokeMethod(discoverer, "start", Qt::QueuedConnection);
     return discoverer;
 }
diff --git a/src/irisnet/noncore/tcpportreserver.h b/src/irisnet/noncore/tcpportreserver.h
index 32615021..19e25a11 100644
--- a/src/irisnet/noncore/tcpportreserver.h
+++ b/src/irisnet/noncore/tcpportreserver.h
@@ -122,7 +122,7 @@ class TcpPortScope : public QObject {
     TcpPortServer::Ptr bind(const QHostAddress &addr, quint16 port);
 
 private:
-    class Private;
+    struct Private;
     QScopedPointer<Private> d;
 };
 
diff --git a/src/irisnet/noncore/transportaddress.h b/src/irisnet/noncore/transportaddress.h
new file mode 100644
index 00000000..ea450801
--- /dev/null
+++ b/src/irisnet/noncore/transportaddress.h
@@ -0,0 +1,33 @@
+#ifndef TRANSPORTADDRESS_H
+#define TRANSPORTADDRESS_H
+
+#include <QHostAddress>
+
+namespace XMPP {
+
+class TransportAddress {
+public:
+    QHostAddress addr;
+    quint16      port = 0;
+
+    TransportAddress() = default;
+    TransportAddress(const QHostAddress &_addr, quint16 _port) : addr(_addr), port(_port) { }
+
+    bool isValid() const { return !addr.isNull(); }
+    bool operator==(const TransportAddress &other) const { return addr == other.addr && port == other.port; }
+
+    inline bool operator!=(const TransportAddress &other) const { return !operator==(other); }
+    inline      operator QString() const
+    {
+        return QString(QLatin1String("%1:%2")).arg(addr.toString(), QString::number(port));
+    }
+};
+
+inline uint qHash(const TransportAddress &key, uint seed = 0)
+{
+    return ::qHash(key.addr, seed) ^ ::qHash(key.port, seed);
+}
+
+}
+
+#endif // TRANSPORTADDRESS_H
diff --git a/src/irisnet/noncore/turnclient.cpp b/src/irisnet/noncore/turnclient.cpp
index 02948395..d1396aa3 100644
--- a/src/irisnet/noncore/turnclient.cpp
+++ b/src/irisnet/noncore/turnclient.cpp
@@ -79,8 +79,7 @@ class TurnClient::Private : public QObject {
     Proxy                    proxy;
     QString                  clientSoftware;
     TurnClient::Mode         mode = PlainMode;
-    QHostAddress             serverAddr;
-    int                      serverPort = 0;
+    TransportAddress         serverAddr;
     ObjectSession            sess;
     ByteStream *             bs            = nullptr;
     QCA::TLS *               tls           = nullptr;
@@ -101,16 +100,13 @@ class TurnClient::Private : public QObject {
     public:
         enum Type { Data, Other };
 
-        Type         type;
-        int          size;
-        QHostAddress addr;
-        int          port;
+        Type             type;
+        int              size;
+        TransportAddress addr;
 
-        WriteItem(int _size) : type(Other), size(_size), port(-1) { }
+        WriteItem(int _size) : type(Other), size(_size) { }
 
-        WriteItem(int _size, const QHostAddress &_addr, int _port) : type(Data), size(_size), addr(_addr), port(_port)
-        {
-        }
+        WriteItem(int _size, const TransportAddress &_addr) : type(Data), size(_size), addr(_addr) { }
     };
 
     QList<WriteItem> writeItems;
@@ -119,14 +115,13 @@ class TurnClient::Private : public QObject {
 
     class Packet {
     public:
-        QHostAddress addr;
-        quint16      port;
-        QByteArray   data;
+        TransportAddress addr;
+        QByteArray       data;
 
         // for outbound
         bool requireChannel;
 
-        Packet() : port(-1), requireChannel(false) { }
+        Packet() : requireChannel(false) { }
     };
 
     QList<Packet>                in;
@@ -137,9 +132,8 @@ class TurnClient::Private : public QObject {
 
     class Written {
     public:
-        QHostAddress addr;
-        int          port;
-        int          count;
+        TransportAddress addr;
+        int              count;
     };
 
     Private(TurnClient *_q) :
@@ -198,31 +192,31 @@ class TurnClient::Private : public QObject {
         if (proxy.type() == Proxy::HttpConnect) {
             HttpConnect *s = new HttpConnect(this);
             bs             = s;
-            connect(s, SIGNAL(connected()), SLOT(bs_connected()));
-            connect(s, SIGNAL(error(int)), SLOT(bs_error(int)));
+            connect(s, &HttpConnect::connected, this, &Private::bs_connected);
+            connect(s, &HttpConnect::error, this, &Private::bs_error);
             if (!proxy.user().isEmpty())
                 s->setAuth(proxy.user(), proxy.pass());
-            s->connectToHost(proxy.host(), proxy.port(), serverAddr.toString(), serverPort);
+            s->connectToHost(proxy.host(), proxy.port(), serverAddr.addr.toString(), serverAddr.port);
         } else if (proxy.type() == Proxy::Socks) {
             SocksClient *s = new SocksClient(this);
             bs             = s;
-            connect(s, SIGNAL(connected()), SLOT(bs_connected()));
-            connect(s, SIGNAL(error(int)), SLOT(bs_error(int)));
+            connect(s, &SocksClient::connected, this, &Private::bs_connected);
+            connect(s, &SocksClient::error, this, &Private::bs_error);
             if (!proxy.user().isEmpty())
                 s->setAuth(proxy.user(), proxy.pass());
-            s->connectToHost(proxy.host(), proxy.port(), serverAddr.toString(), serverPort);
+            s->connectToHost(proxy.host(), proxy.port(), serverAddr.addr.toString(), serverAddr.port);
         } else {
             BSocket *s = new BSocket(this);
             bs         = s;
-            connect(s, SIGNAL(connected()), SLOT(bs_connected()));
-            connect(s, SIGNAL(error(int)), SLOT(bs_error(int)));
-            s->connectToHost(serverAddr.toString(), quint16(serverPort));
+            connect(s, &BSocket::connected, this, &Private::bs_connected);
+            connect(s, &BSocket::error, this, &Private::bs_error);
+            s->connectToHost(serverAddr.addr.toString(), serverAddr.port);
         }
 
-        connect(bs, SIGNAL(connectionClosed()), SLOT(bs_connectionClosed()));
-        connect(bs, SIGNAL(delayedCloseFinished()), SLOT(bs_delayedCloseFinished()));
-        connect(bs, SIGNAL(readyRead()), SLOT(bs_readyRead()));
-        connect(bs, SIGNAL(bytesWritten(qint64)), SLOT(bs_bytesWritten(qint64)));
+        connect(bs, &ByteStream::connectionClosed, this, &Private::bs_connectionClosed);
+        connect(bs, &ByteStream::delayedCloseFinished, this, &Private::bs_delayedCloseFinished);
+        connect(bs, &ByteStream::readyRead, this, &Private::bs_readyRead);
+        connect(bs, &ByteStream::bytesWritten, this, &Private::bs_bytesWritten);
     }
 
     void do_close()
@@ -305,7 +299,7 @@ class TurnClient::Private : public QObject {
             emit q->debugLine("Allocating...");
         // only use addr association in udp mode
         if (udp)
-            allocate->start(serverAddr, serverPort);
+            allocate->start(serverAddr);
         else
             allocate->start();
     }
@@ -341,21 +335,20 @@ class TurnClient::Private : public QObject {
     {
         bool notStun;
         if (!pool->writeIncomingMessage(buf, &notStun)) {
-            QByteArray   data;
-            QHostAddress fromAddr;
-            int          fromPort;
+            QByteArray       data;
+            TransportAddress fromAddr;
 
-            data = processNonPoolPacket(buf, notStun, &fromAddr, &fromPort);
+            data = processNonPoolPacket(buf, notStun, fromAddr);
             if (!data.isNull())
-                processDataPacket(data, fromAddr, fromPort);
+                processDataPacket(data, fromAddr);
         }
     }
 
-    QByteArray processNonPoolPacket(const QByteArray &buf, bool notStun, QHostAddress *addr, int *port)
+    QByteArray processNonPoolPacket(const QByteArray &buf, bool notStun, TransportAddress &addr)
     {
         if (notStun) {
             // not stun?  maybe it is a data packet
-            QByteArray data = allocate->decode(buf, addr, port);
+            QByteArray data = allocate->decode(buf, addr);
             if (!data.isNull()) {
                 if (debugLevel >= TurnClient::DL_Packet)
                     emit q->debugLine("Received ChannelData-based data packet");
@@ -366,7 +359,7 @@ class TurnClient::Private : public QObject {
             //   let's see
             StunMessage message = StunMessage::fromBinary(buf);
             if (!message.isNull()) {
-                QByteArray data = allocate->decode(message, addr, port);
+                QByteArray data = allocate->decode(message, addr);
 
                 if (!data.isNull()) {
                     if (debugLevel >= TurnClient::DL_Packet)
@@ -387,27 +380,26 @@ class TurnClient::Private : public QObject {
         return QByteArray();
     }
 
-    void processDataPacket(const QByteArray &buf, const QHostAddress &addr, int port)
+    void processDataPacket(const QByteArray &buf, const TransportAddress &addr)
     {
         Packet p;
         p.addr = addr;
-        p.port = port;
         p.data = buf;
         in += p;
 
         emit q->readyRead();
     }
 
-    void writeOrQueue(const QByteArray &buf, const QHostAddress &addr, int port)
+    void writeOrQueue(const QByteArray &buf, const TransportAddress &addr)
     {
         Q_ASSERT(allocateStarted);
 
-        StunAllocate::Channel c(addr, port);
+        StunAllocate::Channel c(addr);
         bool                  writeImmediately = false;
         bool                  requireChannel   = pendingChannels.contains(c) || desiredChannels.contains(c);
 
         QList<QHostAddress> actualPerms = allocate->permissions();
-        if (actualPerms.contains(addr)) {
+        if (actualPerms.contains(addr.addr)) {
             if (requireChannel) {
                 QList<StunAllocate::Channel> actualChannels = allocate->channels();
                 if (actualChannels.contains(c))
@@ -417,16 +409,15 @@ class TurnClient::Private : public QObject {
         }
 
         if (writeImmediately) {
-            write(buf, addr, port);
+            write(buf, addr);
         } else {
             Packet p;
             p.addr           = addr;
-            p.port           = port;
             p.data           = buf;
             p.requireChannel = requireChannel;
             outPending += p;
 
-            ensurePermission(addr);
+            ensurePermission(addr.addr);
         }
     }
 
@@ -436,14 +427,14 @@ class TurnClient::Private : public QObject {
         QList<StunAllocate::Channel> actualChannels = allocate->channels();
         for (int n = 0; n < outPending.count(); ++n) {
             const Packet &p = outPending[n];
-            if (actualPerms.contains(p.addr)) {
-                StunAllocate::Channel c(p.addr, p.port);
+            if (actualPerms.contains(p.addr.addr)) {
+                StunAllocate::Channel c(p.addr);
                 if (!p.requireChannel || actualChannels.contains(c)) {
                     Packet po = outPending[n];
                     outPending.removeAt(n);
                     --n; // adjust position
 
-                    write(po.data, po.addr, po.port);
+                    write(po.data, po.addr);
                 }
             }
         }
@@ -455,7 +446,7 @@ class TurnClient::Private : public QObject {
             QList<QHostAddress>          actualPerms = allocate->permissions();
             QList<StunAllocate::Channel> list;
             for (int n = 0; n < pendingChannels.count(); ++n) {
-                if (actualPerms.contains(pendingChannels[n].address)) {
+                if (actualPerms.contains(pendingChannels[n].address.addr)) {
                     list += pendingChannels[n];
                     pendingChannels.removeAt(n);
                     --n; // adjust position
@@ -467,9 +458,9 @@ class TurnClient::Private : public QObject {
         }
     }
 
-    void write(const QByteArray &buf, const QHostAddress &addr, int port)
+    void write(const QByteArray &buf, const TransportAddress &addr)
     {
-        QByteArray packet = allocate->encode(buf, addr, port);
+        QByteArray packet = allocate->encode(buf, addr);
 
         if (debugLevel >= TurnClient::DL_Packet) {
             StunMessage msg = StunMessage::fromBinary(packet);
@@ -480,7 +471,7 @@ class TurnClient::Private : public QObject {
                 emit q->debugLine("Sending ChannelData-based data packet");
         }
 
-        writeItems += WriteItem(packet.size(), addr, port);
+        writeItems += WriteItem(packet.size(), addr);
         ++outPendingWrite;
         if (udp) {
             emit q->outgoingDatagram(packet);
@@ -510,8 +501,7 @@ class TurnClient::Private : public QObject {
         for (const StunAllocate::Channel &c : channels) {
             if (!desiredChannels.contains(c)) {
                 if (debugLevel >= TurnClient::DL_Info)
-                    emit q->debugLine(
-                        QString("Setting channel for peer address/port %1;%2").arg(c.address.toString()).arg(c.port));
+                    emit q->debugLine(QString("Setting channel for peer address/port %1").arg(c.address));
 
                 desiredChannels += c;
                 changed = true;
@@ -522,11 +512,11 @@ class TurnClient::Private : public QObject {
             allocate->setChannels(desiredChannels);
     }
 
-    void addChannelPeer(const QHostAddress &addr, int port)
+    void addChannelPeer(const TransportAddress &addr)
     {
-        ensurePermission(addr);
+        ensurePermission(addr.addr);
 
-        StunAllocate::Channel c(addr, port);
+        StunAllocate::Channel c(addr);
         if (!pendingChannels.contains(c) && !desiredChannels.contains(c)) {
             pendingChannels += c;
 
@@ -546,7 +536,7 @@ class TurnClient::Private : public QObject {
             if (wi.type == WriteItem::Data) {
                 int at = -1;
                 for (int n = 0; n < writtenDests.count(); ++n) {
-                    if (writtenDests[n].addr == wi.addr && writtenDests[n].port == wi.port) {
+                    if (writtenDests[n].addr == wi.addr) {
                         at = n;
                         break;
                     }
@@ -557,7 +547,6 @@ class TurnClient::Private : public QObject {
                 } else {
                     Written wr;
                     wr.addr  = wi.addr;
-                    wr.port  = wi.port;
                     wr.count = 1;
                     writtenDests += wr;
                 }
@@ -571,7 +560,7 @@ class TurnClient::Private : public QObject {
     {
         ObjectSessionWatcher watch(&sess);
         for (const Written &wr : writtenDests) {
-            emit q->packetsWritten(wr.count, wr.addr, wr.port);
+            emit q->packetsWritten(wr.count, wr.addr);
             if (!watch.isValid())
                 return;
         }
@@ -614,10 +603,10 @@ private slots:
 
         if (mode == TurnClient::TlsMode) {
             tls = new QCA::TLS(this);
-            connect(tls, SIGNAL(handshaken()), SLOT(tls_handshaken()));
-            connect(tls, SIGNAL(readyRead()), SLOT(tls_readyRead()));
-            connect(tls, SIGNAL(readyReadOutgoing()), SLOT(tls_readyReadOutgoing()));
-            connect(tls, SIGNAL(error()), SLOT(tls_error()));
+            connect(tls, &QCA::TLS::handshaken, this, &Private::tls_handshaken);
+            connect(tls, &QCA::TLS::readyRead, this, &Private::tls_readyRead);
+            connect(tls, &QCA::TLS::readyReadOutgoing, this, &Private::tls_readyReadOutgoing);
+            connect(tls, &QCA::TLS::error, this, &Private::tls_error);
             tlsHandshaken = false;
             if (debugLevel >= TurnClient::DL_Info)
                 emit q->debugLine("TLS handshaking...");
@@ -675,7 +664,7 @@ private slots:
             if (wi.type == WriteItem::Data) {
                 int at = -1;
                 for (int n = 0; n < writtenDests.count(); ++n) {
-                    if (writtenDests[n].addr == wi.addr && writtenDests[n].port == wi.port) {
+                    if (writtenDests[n].addr == wi.addr) {
                         at = n;
                         break;
                     }
@@ -686,7 +675,6 @@ private slots:
                 } else {
                     Written wr;
                     wr.addr  = wi.addr;
-                    wr.port  = wi.port;
                     wr.count = 1;
                     writtenDests += wr;
                 }
@@ -771,11 +759,10 @@ private slots:
         emit q->error(TurnClient::ErrorTls);
     }
 
-    void pool_outgoingMessage(const QByteArray &packet, const QHostAddress &toAddress, quint16 toPort)
+    void pool_outgoingMessage(const QByteArray &packet, const XMPP::TransportAddress &toAddress)
     {
         // we aren't using IP-associated transactions
         Q_UNUSED(toAddress);
-        Q_UNUSED(toPort);
 
         writeItems += WriteItem(packet.size());
 
@@ -868,31 +855,29 @@ void TurnClient::setProxy(const Proxy &proxy) { d->proxy = proxy; }
 
 void TurnClient::setClientSoftwareNameAndVersion(const QString &str) { d->clientSoftware = str; }
 
-void TurnClient::connectToHost(StunTransactionPool *pool, const QHostAddress &addr, int port)
+void TurnClient::connectToHost(StunTransactionPool *pool, const TransportAddress &addr)
 {
     d->serverAddr = addr;
-    d->serverPort = port;
     d->udp        = true;
     d->pool       = pool->sharedFromThis();
     d->in.clear();
     d->do_connect();
 }
 
-void TurnClient::connectToHost(const QHostAddress &addr, int port, Mode mode)
+void TurnClient::connectToHost(const TransportAddress &addr, Mode mode)
 {
     d->serverAddr = addr;
-    d->serverPort = port;
     d->udp        = false;
     d->mode       = mode;
     d->in.clear();
     d->do_connect();
 }
 
-QHostAddress TurnClient::serverAddress() const { return d->serverAddr; }
+const TransportAddress &TurnClient::serverAddress() const { return d->serverAddr; }
 
-QByteArray TurnClient::processIncomingDatagram(const QByteArray &buf, bool notStun, QHostAddress *addr, int *port)
+QByteArray TurnClient::processIncomingDatagram(const QByteArray &buf, bool notStun, TransportAddress &addr)
 {
-    return d->processNonPoolPacket(buf, notStun, addr, port);
+    return d->processNonPoolPacket(buf, notStun, addr);
 }
 
 void TurnClient::outgoingDatagramsWritten(int count) { d->udp_datagramsWritten(count); }
@@ -936,24 +921,23 @@ void TurnClient::close() { d->do_close(); }
 
 StunAllocate *TurnClient::stunAllocate() { return d->allocate; }
 
-void TurnClient::addChannelPeer(const QHostAddress &addr, int port) { d->addChannelPeer(addr, port); }
+void TurnClient::addChannelPeer(const TransportAddress &addr) { d->addChannelPeer(addr); }
 
 int TurnClient::packetsToRead() const { return d->in.count(); }
 
 int TurnClient::packetsToWrite() const { return d->outPending.count() + d->outPendingWrite; }
 
-QByteArray TurnClient::read(QHostAddress *addr, quint16 *port)
+QByteArray TurnClient::read(TransportAddress &addr)
 {
     if (!d->in.isEmpty()) {
         Private::Packet p = d->in.takeFirst();
-        *addr             = p.addr;
-        *port             = p.port;
+        addr              = p.addr;
         return p.data;
     } else
         return QByteArray();
 }
 
-void TurnClient::write(const QByteArray &buf, const QHostAddress &addr, int port) { d->writeOrQueue(buf, addr, port); }
+void TurnClient::write(const QByteArray &buf, const TransportAddress &addr) { d->writeOrQueue(buf, addr); }
 
 QString TurnClient::errorString() const { return d->errorString; }
 
diff --git a/src/irisnet/noncore/turnclient.h b/src/irisnet/noncore/turnclient.h
index af130567..3ddb66b0 100644
--- a/src/irisnet/noncore/turnclient.h
+++ b/src/irisnet/noncore/turnclient.h
@@ -24,6 +24,8 @@
 #include <QObject>
 #include <QString>
 
+#include "transportaddress.h"
+
 namespace QCA {
 class SecureArray;
 }
@@ -105,16 +107,16 @@ class TurnClient : public QObject {
     //   outgoingDatagramsWritten().  authentication happens through the
     //   pool and not through this class.  the turn addr/port is optional,
     //   and used only for addr association with the pool
-    void connectToHost(StunTransactionPool *pool, const QHostAddress &addr = QHostAddress(), int port = -1);
+    void connectToHost(StunTransactionPool *pool, const TransportAddress &addr = TransportAddress());
 
     // for TCP and TCP-TLS
-    void connectToHost(const QHostAddress &addr, int port, Mode mode = PlainMode);
+    void connectToHost(const TransportAddress &addr, Mode mode = PlainMode);
 
-    QHostAddress serverAddress() const;
+    const TransportAddress &serverAddress() const;
 
     // for UDP, use this function to process incoming packets instead of
     //   read().
-    QByteArray processIncomingDatagram(const QByteArray &buf, bool notStun, QHostAddress *addr, int *port);
+    QByteArray processIncomingDatagram(const QByteArray &buf, bool notStun, TransportAddress &addr);
 
     // call after writing datagrams from outgoingDatagram.  not DOR-DS safe
     void outgoingDatagramsWritten(int count);
@@ -129,17 +131,17 @@ class TurnClient : public QObject {
 
     StunAllocate *stunAllocate();
 
-    void addChannelPeer(const QHostAddress &addr, int port);
+    void addChannelPeer(const TransportAddress &addr);
 
     int packetsToRead() const;
     int packetsToWrite() const;
 
     // TCP mode only
-    QByteArray read(QHostAddress *addr, quint16 *port);
+    QByteArray read(TransportAddress &addr);
 
     // for UDP, this call may emit outgoingDatagram() immediately (not
     //   DOR-DS safe)
-    void write(const QByteArray &buf, const QHostAddress &addr, int port);
+    void write(const QByteArray &buf, const TransportAddress &addr);
 
     QString errorString() const;
 
@@ -157,7 +159,7 @@ class TurnClient : public QObject {
     // TCP mode only
     void readyRead();
 
-    void packetsWritten(int count, const QHostAddress &addr, int port);
+    void packetsWritten(int count, const TransportAddress &addr);
     void error(XMPP::TurnClient::Error e);
 
     // data packets to be sent to the TURN server, UDP mode only

From d10c878ea0cb05c439695683656d355927d749c6 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Fri, 4 Jun 2021 22:33:51 +0300
Subject: [PATCH 336/383] minor fixes

---
 cmake/modules/IrisSCTP.cmake               | 2 +-
 src/irisnet/noncore/iceabstractstundisco.h | 1 +
 src/irisnet/noncore/icelocaltransport.cpp  | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/cmake/modules/IrisSCTP.cmake b/cmake/modules/IrisSCTP.cmake
index bca0dd59..2c90f8b8 100644
--- a/cmake/modules/IrisSCTP.cmake
+++ b/cmake/modules/IrisSCTP.cmake
@@ -40,7 +40,7 @@ else()
         -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
         -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
         -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER})
-    if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
         list(APPEND USRSCTP_BUILD_OPTIONS -DCMAKE_C_FLAGS="-Wno-maybe-uninitialized")
     endif()
     if (EXISTS ${USRSCTP_SOURCE_DIR})
diff --git a/src/irisnet/noncore/iceabstractstundisco.h b/src/irisnet/noncore/iceabstractstundisco.h
index 78fc523d..8b625af2 100644
--- a/src/irisnet/noncore/iceabstractstundisco.h
+++ b/src/irisnet/noncore/iceabstractstundisco.h
@@ -7,6 +7,7 @@
 #include <QObject>
 
 #include <functional>
+#include <memory>
 
 namespace XMPP {
 
diff --git a/src/irisnet/noncore/icelocaltransport.cpp b/src/irisnet/noncore/icelocaltransport.cpp
index bffdb9cc..7abd720e 100644
--- a/src/irisnet/noncore/icelocaltransport.cpp
+++ b/src/irisnet/noncore/icelocaltransport.cpp
@@ -502,7 +502,7 @@ private slots:
         ObjectSessionWatcher watch(&sess);
 
         if (!dwrites.isEmpty()) {
-            for (const Written &wr : dwrites) {
+            for (const Written &wr : qAsConst(dwrites)) {
                 emit q->datagramsWritten(Direct, wr.count, wr.addr);
                 if (!watch.isValid())
                     return;
@@ -515,7 +515,7 @@ private slots:
         }
     }
 
-    void pool_outgoingMessage(const QByteArray &packet, const TransportAddress &toAddress)
+    void pool_outgoingMessage(const QByteArray &packet, const XMPP::TransportAddress &toAddress)
     {
         // warning: read StunTransactionPool docs before modifying
         //   this function
@@ -590,7 +590,7 @@ private slots:
         emit q->addressesChanged();
     }
 
-    void turn_packetsWritten(int count, const TransportAddress &addr)
+    void turn_packetsWritten(int count, const XMPP::TransportAddress &addr)
     {
         emit q->datagramsWritten(Relayed, count, addr);
     }

From 0d32c1dbd05e4f88aa15ca66802ba12b6a4bd0bc Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sat, 5 Jun 2021 18:42:57 +0300
Subject: [PATCH 337/383] Declare all RFC STUN attributes

---
 src/irisnet/noncore/stuntypes.h               | 64 +++++++++++++------
 .../xmpp-im/xmpp_externalservicediscovery.h   |  1 +
 2 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/src/irisnet/noncore/stuntypes.h b/src/irisnet/noncore/stuntypes.h
index 428db2b7..a2a0c15a 100644
--- a/src/irisnet/noncore/stuntypes.h
+++ b/src/irisnet/noncore/stuntypes.h
@@ -40,33 +40,55 @@ namespace StunTypes {
     };
 
     enum Attribute {
-        MAPPED_ADDRESS      = 0x0001,
-        USERNAME            = 0x0006,
-        MESSAGE_INTEGRITY   = 0x0008,
-        ERROR_CODE          = 0x0009,
-        UNKNOWN_ATTRIBUTES  = 0x000a,
-        REALM               = 0x0014,
-        NONCE               = 0x0015,
-        XOR_MAPPED_ADDRESS  = 0x0020,
-        CHANNEL_NUMBER      = 0x000c,
-        LIFETIME            = 0x000d,
-        XOR_PEER_ADDRESS    = 0x0012,
-        DATA                = 0x0013,
-        XOR_RELAYED_ADDRESS = 0x0016,
-        EVEN_PORT           = 0x0018,
-        REQUESTED_TRANSPORT = 0x0019,
-        DONT_FRAGMENT       = 0x001a,
-        RESERVATION_TOKEN   = 0x0022,
+        MAPPED_ADDRESS           = 0x0001,
+        USERNAME                 = 0x0006,
+        MESSAGE_INTEGRITY        = 0x0008,
+        ERROR_CODE               = 0x0009,
+        UNKNOWN_ATTRIBUTES       = 0x000a,
+        CHANNEL_NUMBER           = 0x000c,
+        LIFETIME                 = 0x000d,
+        XOR_PEER_ADDRESS         = 0x0012,
+        DATA                     = 0x0013, /* rfc8656 */
+        REALM                    = 0x0014,
+        NONCE                    = 0x0015,
+        XOR_RELAYED_ADDRESS      = 0x0016,
+        REQUESTED_ADDRESS_FAMILY = 0x0017, /* not implemented [RFC8656] */
+        EVEN_PORT                = 0x0018,
+        REQUESTED_TRANSPORT      = 0x0019,
+        DONT_FRAGMENT            = 0x001a,
+        ACCESS_TOKEN             = 0x001b, /* not implemented rfc7635 */
+        MESSAGE_INTEGRITY_SHA256 = 0x001c, /* not implemented [RFC8489] */
+        PASSWORD_ALGORITHM       = 0x001d, /* not implemented [RFC8489] */
+        USERHASH                 = 0x001e, /* not implemented [RFC8489] */
+        XOR_MAPPED_ADDRESS       = 0x0020,
+        RESERVATION_TOKEN        = 0x0022,
 
         PRIORITY      = 0x0024,
         USE_CANDIDATE = 0x0025,
 
-        SOFTWARE         = 0x8022,
-        ALTERNATE_SERVER = 0x8023,
-        FINGERPRINT      = 0x8028,
+        RESPONSE_PORT = 0x0027, /* not implemented */
+        CONNECTION_ID = 0x002a, /* not implemented rfc6062 */
+
+        ADDITIONAL_ADDRESS_FAMILY = 0x8000, /* not implemented [RFC8656] */
+        ADDRESS_ERROR_CODE        = 0x8001, /* not implemented [RFC8656] */
+        PASSWORD_ALGORITHMS       = 0x8002, /* not implemented [RFC8489] */
+        ALTERNATE_DOMAIN          = 0x8003, /* not implemented [RFC8489] */
+        ICMP                      = 0x8004, /* not implemented [RFC8656] */
+
+        SOFTWARE                     = 0x8022,
+        ALTERNATE_SERVER             = 0x8023,
+        TRANSACTION_TRANSMIT_COUNTER = 0x8025, /* not implemented [RFC7982] */
+        CACHE_TIMEOUT                = 0x8027, /* not implemented [RFC5780] */
+        FINGERPRINT                  = 0x8028,
 
         ICE_CONTROLLED  = 0x8029,
-        ICE_CONTROLLING = 0x802a
+        ICE_CONTROLLING = 0x802a,
+
+        RESPONSE_ORIGIN           = 0x802b, /* not implemented [RFC5780] */
+        OTHER_ADDRESS             = 0x802c, /* not implemented [RFC5780] */
+        ECN_CHECK                 = 0x802d, /* not implemented [RFC6679] */
+        THIRD_PARTY_AUTHORIZATION = 0x802e, /* not implemented [RFC7635] */
+        MOBILITY_TICKET           = 0x8030  /* not implemented [RFC8016] */
     };
 
     enum Error {
diff --git a/src/xmpp/xmpp-im/xmpp_externalservicediscovery.h b/src/xmpp/xmpp-im/xmpp_externalservicediscovery.h
index 3f78a7c2..11520dd2 100644
--- a/src/xmpp/xmpp-im/xmpp_externalservicediscovery.h
+++ b/src/xmpp/xmpp-im/xmpp_externalservicediscovery.h
@@ -28,6 +28,7 @@
 #include <QObject>
 #include <QPointer>
 #include <QSet>
+#include <QVector>
 
 #include <chrono>
 #include <functional>

From a1a3ea7ecc11207fc43c69dcbd5da9c1c8d85dcd Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 6 Jun 2021 00:54:36 +0300
Subject: [PATCH 338/383] Keep auth state per distination transport address

One local transport can communicate with multiple destinations in the same time. And if one of them requires authentication, another one may not. This led to a mishandling of such simple responses as Bind success responses from a public STUN server.
---
 src/irisnet/noncore/icelocaltransport.cpp |  4 +--
 src/irisnet/noncore/iceturntransport.cpp  |  4 +--
 src/irisnet/noncore/stuntransaction.cpp   | 41 +++++++++++------------
 src/irisnet/noncore/stuntransaction.h     |  4 +--
 src/irisnet/noncore/turnclient.cpp        |  6 ++--
 src/irisnet/noncore/turnclient.h          |  4 +--
 6 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/src/irisnet/noncore/icelocaltransport.cpp b/src/irisnet/noncore/icelocaltransport.cpp
index 7abd720e..b6f9d064 100644
--- a/src/irisnet/noncore/icelocaltransport.cpp
+++ b/src/irisnet/noncore/icelocaltransport.cpp
@@ -532,13 +532,13 @@ private slots:
         sock->writeDatagram(packet, toAddress);
     }
 
-    void pool_needAuthParams()
+    void pool_needAuthParams(const TransportAddress &addr)
     {
         // we can get this signal if the user did not provide
         //   creds to us.  however, since this class doesn't support
         //   prompting just continue on as if we had a blank
         //   user/pass
-        pool->continueAfterParams();
+        pool->continueAfterParams(addr);
     }
 
     void pool_debugLine(const QString &line) { emit q->debugLine(line); }
diff --git a/src/irisnet/noncore/iceturntransport.cpp b/src/irisnet/noncore/iceturntransport.cpp
index 41f8328f..033417ea 100644
--- a/src/irisnet/noncore/iceturntransport.cpp
+++ b/src/irisnet/noncore/iceturntransport.cpp
@@ -83,13 +83,13 @@ private slots:
         emit q->stopped();
     }
 
-    void turn_needAuthParams()
+    void turn_needAuthParams(const TransportAddress &addr)
     {
         // we can get this signal if the user did not provide
         //   creds to us.  however, since this class doesn't support
         //   prompting just continue on as if we had a blank
         //   user/pass
-        turn.continueAfterParams();
+        turn.continueAfterParams(addr);
     }
 
     void turn_retrying()
diff --git a/src/irisnet/noncore/stuntransaction.cpp b/src/irisnet/noncore/stuntransaction.cpp
index cc508413..6e0f15af 100644
--- a/src/irisnet/noncore/stuntransaction.cpp
+++ b/src/irisnet/noncore/stuntransaction.cpp
@@ -95,20 +95,16 @@ class StunTransactionPoolPrivate : public QObject {
     QSet<StunTransaction *>              transactions;
     QHash<StunTransaction *, QByteArray> transToId;
     QHash<QByteArray, StunTransaction *> idToTrans;
-    bool                                 useLongTermAuth;
-    bool                                 needLongTermAuth;
-    bool                                 triedLongTermAuth;
+    bool                                 useLongTermAuth  = false;
+    bool                                 needLongTermAuth = false;
+    QSet<TransportAddress>               triedLongTermAuth;
     QString                              user;
     QCA::SecureArray                     pass;
     QString                              realm;
     QString                              nonce;
-    int                                  debugLevel;
+    int                                  debugLevel = StunTransactionPool::DL_None;
 
-    StunTransactionPoolPrivate(StunTransactionPool *_q) :
-        QObject(_q), q(_q), useLongTermAuth(false), needLongTermAuth(false), triedLongTermAuth(false),
-        debugLevel(StunTransactionPool::DL_Packet)
-    {
-    }
+    StunTransactionPoolPrivate(StunTransactionPool *_q) : QObject(_q), q(_q) { }
 
     QByteArray generateId() const;
     void       insert(StunTransaction *trans);
@@ -327,7 +323,7 @@ private slots:
         return !to_addr.isValid() || (to_addr == from_addr);
     }
 
-    void processIncoming(const StunMessage &msg, bool authed)
+    void processIncoming(const StunMessage &msg, bool authed, const TransportAddress &from_addr)
     {
         active = false;
         t->stop();
@@ -343,6 +339,7 @@ private slots:
         // will be set to true when receiving an Unauthorized error
         bool unauthError = false;
 
+        bool triedLongTermAuth = pool->d->triedLongTermAuth.contains(from_addr);
         if (msg.mclass() == StunMessage::ErrorResponse && pool->d->useLongTermAuth) {
             // we'll handle certain error codes at this layer
             int     code;
@@ -351,7 +348,7 @@ private slots:
                 if (code == StunTypes::Unauthorized)
                     unauthError = true;
 
-                if (unauthError && !pool->d->triedLongTermAuth) {
+                if (unauthError && !triedLongTermAuth) {
                     QString realm;
                     QString nonce;
                     if (StunTypes::parseRealm(msg.attribute(StunTypes::REALM), &realm)
@@ -366,17 +363,17 @@ private slots:
                         if (!pool->d->needLongTermAuth) {
                             if (!pool->d->user.isEmpty()) {
                                 // creds already set?  use them
-                                pool->d->triedLongTermAuth = true;
+                                pool->d->triedLongTermAuth.insert(from_addr);
                                 retry();
                             } else {
                                 // else ask the user
-                                pool->d->needLongTermAuth = true;
-                                emit pool->needAuthParams();
+                                pool->d->triedLongTermAuth.insert(from_addr);
+                                emit pool->needAuthParams(from_addr);
                             }
                         }
                         return;
                     }
-                } else if (code == StunTypes::StaleNonce && pool->d->triedLongTermAuth) {
+                } else if (code == StunTypes::StaleNonce && triedLongTermAuth) {
                     QString nonce;
                     if (StunTypes::parseNonce(msg.attribute(StunTypes::NONCE), &nonce) && nonce != pool->d->nonce) {
                         pool->d->nonce = nonce;
@@ -388,7 +385,7 @@ private slots:
         }
 
         // require message integrity when auth is used
-        if (!unauthError && (!stuser.isEmpty() || pool->d->triedLongTermAuth) && !authed)
+        if (!unauthError && (!stuser.isEmpty() || triedLongTermAuth) && !authed)
             return;
 
         pool->d->remove(q);
@@ -403,7 +400,7 @@ private slots:
 
         // if a StunMessage is passed directly to us then we assume
         //   the user has authenticated the message as necessary
-        processIncoming(msg, true);
+        processIncoming(msg, true, from_addr);
         return true;
     }
 
@@ -430,7 +427,7 @@ private slots:
             return false;
         }
 
-        processIncoming(msg, (validationFlags & StunMessage::MessageIntegrity) != 0);
+        processIncoming(msg, (validationFlags & StunMessage::MessageIntegrity) != 0, from_addr);
         return true;
     }
 
@@ -620,7 +617,7 @@ void StunTransactionPool::setPassword(const QCA::SecureArray &password) { d->pas
 
 void StunTransactionPool::setRealm(const QString &realm) { d->realm = realm; }
 
-void StunTransactionPool::continueAfterParams()
+void StunTransactionPool::continueAfterParams(const TransportAddress &addr)
 {
     if (d->debugLevel >= DL_Info) {
         emit debugLine("continue after params:");
@@ -632,10 +629,10 @@ void StunTransactionPool::continueAfterParams()
 
     Q_ASSERT(d->useLongTermAuth);
     Q_ASSERT(d->needLongTermAuth);
-    Q_ASSERT(!d->triedLongTermAuth);
+    Q_ASSERT(!d->triedLongTermAuth.contains(addr));
 
-    d->needLongTermAuth  = false;
-    d->triedLongTermAuth = true;
+    d->needLongTermAuth = false;
+    d->triedLongTermAuth.insert(addr);
 
     for (StunTransaction *trans : qAsConst(d->transactions)) {
         // the only reason an inactive transaction would be in the
diff --git a/src/irisnet/noncore/stuntransaction.h b/src/irisnet/noncore/stuntransaction.h
index 7086375c..05558c12 100644
--- a/src/irisnet/noncore/stuntransaction.h
+++ b/src/irisnet/noncore/stuntransaction.h
@@ -157,7 +157,7 @@ class StunTransactionPool : public QObject, public QEnableSharedFromThis<StunTra
     void    setUsername(const QString &username);
     void    setPassword(const QCA::SecureArray &password);
     void    setRealm(const QString &realm);
-    void    continueAfterParams();
+    void    continueAfterParams(const TransportAddress &addr);
 
     // for use with stun indications
     QByteArray generateId() const;
@@ -177,7 +177,7 @@ class StunTransactionPool : public QObject, public QEnableSharedFromThis<StunTra
     //   start(), which would violate DOR-DS.
     void outgoingMessage(const QByteArray &packet, const TransportAddress &addr);
 
-    void needAuthParams();
+    void needAuthParams(const TransportAddress &);
 
     // not DOR-SS/DS safe
     void debugLine(const QString &line);
diff --git a/src/irisnet/noncore/turnclient.cpp b/src/irisnet/noncore/turnclient.cpp
index d1396aa3..09f38608 100644
--- a/src/irisnet/noncore/turnclient.cpp
+++ b/src/irisnet/noncore/turnclient.cpp
@@ -775,7 +775,7 @@ private slots:
             bs->write(packet);
     }
 
-    void pool_needAuthParams() { emit q->needAuthParams(); }
+    void pool_needAuthParams(const TransportAddress &addr) { emit q->needAuthParams(addr); }
 
     void pool_debugLine(const QString &line) { emit q->debugLine(line); }
 
@@ -911,10 +911,10 @@ void TurnClient::setRealm(const QString &realm)
         d->pool->setRealm(d->realm);
 }
 
-void TurnClient::continueAfterParams()
+void TurnClient::continueAfterParams(const TransportAddress &addr)
 {
     Q_ASSERT(d->pool);
-    d->pool->continueAfterParams();
+    d->pool->continueAfterParams(addr);
 }
 
 void TurnClient::close() { d->do_close(); }
diff --git a/src/irisnet/noncore/turnclient.h b/src/irisnet/noncore/turnclient.h
index 3ddb66b0..51d08c6d 100644
--- a/src/irisnet/noncore/turnclient.h
+++ b/src/irisnet/noncore/turnclient.h
@@ -125,7 +125,7 @@ class TurnClient : public QObject {
     void    setUsername(const QString &username);
     void    setPassword(const QCA::SecureArray &password);
     void    setRealm(const QString &realm);
-    void    continueAfterParams();
+    void    continueAfterParams(const TransportAddress &addr);
 
     void close();
 
@@ -152,7 +152,7 @@ class TurnClient : public QObject {
     void connected(); // tcp connected
     void tlsHandshaken();
     void closed();
-    void needAuthParams();
+    void needAuthParams(const TransportAddress &addr);
     void retrying();  // mismatch error received, starting all over
     void activated(); // ready for read/write
 

From ae8ed8c737f9f0b704090bba5fe0b444fc6a1f58 Mon Sep 17 00:00:00 2001
From: Mc-Pain <McPain2@mail.ru>
Date: Fri, 27 Aug 2021 12:15:54 +0300
Subject: [PATCH 339/383] Avoid nullptr dereference (#66)

takeSocksClient() could return nullptr which is passed to
setSocksClient() and dereferenced w/o checking causing crashes.

QIODevice::isOpen (this=this@entry=0x0) at io/qiodevice.cpp:603
XMPP::Jingle::S5B::Connection::setSocksClient (this=0x564434702370, client=0x0, mode=XMPP::Jingle::S5B::Transport::Tcp) at iris/src/xmpp/xmpp-im/jingle-s5b.cpp:59
                                                                    ^^^^^^^^^^
XMPP::Jingle::S5B::Transport::Private::handleConnected (this=0x564434712590, connCand=...) at iris/src/xmpp/xmpp-im/jingle-s5b.cpp:1190
XMPP::Jingle::S5B::Transport::Private::onBothSidesFinished (this=0x564434712590) at iris/src/xmpp/xmpp-im/jingle-s5b.cpp:967
[bt omitted]
---
 src/xmpp/xmpp-im/jingle-s5b.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index a96284d5..ebc3c025 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -56,7 +56,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
     public:
         void setSocksClient(SocksClient *client, Transport::Mode mode)
         {
-            if (!client->isOpen()) {
+            if (!client || !client->isOpen()) {
                 qCritical("Failed to set closed SockClient connection %p", client);
                 return;
             }

From 8873cbd104138ede27606b2b24726c5b3602aa18 Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Tue, 2 Nov 2021 15:39:58 +0200
Subject: [PATCH 340/383] Code refactoring. Fixed warnings

---
 src/irisnet/corelib/netinterface_qtname.cpp |  5 +-
 src/irisnet/corelib/netnames.cpp            | 58 ++++++++-------------
 src/irisnet/corelib/netnames.h              |  3 +-
 src/irisnet/noncore/cutestuff/httppoll.cpp  |  4 +-
 src/irisnet/noncore/ice176.cpp              |  2 +-
 src/irisnet/noncore/udpportreserver.cpp     |  4 +-
 src/xmpp/xmpp-core/parser.cpp               |  3 +-
 src/xmpp/xmpp-core/protocol.cpp             | 13 ++---
 src/xmpp/xmpp-core/securestream.cpp         |  4 +-
 src/xmpp/xmpp-core/stream.cpp               | 14 ++---
 src/xmpp/xmpp-core/tlshandler.cpp           |  2 +-
 src/xmpp/xmpp-im/filetransfer.cpp           | 10 ++--
 src/xmpp/xmpp-im/httpfileupload.cpp         |  2 +-
 src/xmpp/xmpp-im/jingle-ice.cpp             |  2 +-
 src/xmpp/xmpp-im/jingle-s5b.cpp             |  5 +-
 src/xmpp/xmpp-im/jingle-session.cpp         |  9 ++--
 src/xmpp/xmpp-im/s5b.cpp                    | 26 ++++-----
 src/xmpp/xmpp-im/types.cpp                  | 18 +++----
 src/xmpp/xmpp-im/xmpp_caps.cpp              |  4 +-
 src/xmpp/xmpp-im/xmpp_discoitem.cpp         |  6 ++-
 src/xmpp/xmpp-im/xmpp_ibb.cpp               |  2 +-
 src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp |  2 +-
 src/xmpp/xmpp-im/xmpp_tasks.cpp             |  7 +--
 src/xmpp/xmpp-im/xmpp_xdata.cpp             |  5 +-
 24 files changed, 104 insertions(+), 106 deletions(-)

diff --git a/src/irisnet/corelib/netinterface_qtname.cpp b/src/irisnet/corelib/netinterface_qtname.cpp
index 07a9cfa0..ec156b95 100644
--- a/src/irisnet/corelib/netinterface_qtname.cpp
+++ b/src/irisnet/corelib/netinterface_qtname.cpp
@@ -40,7 +40,7 @@ class IrisQtName : public NameProvider {
 
     ~IrisQtName()
     {
-        for (auto const &l : lookups) {
+        for (auto const &l : qAsConst(lookups)) {
             if (!l.isHostInfo) {
                 delete reinterpret_cast<QDnsLookup *>(l.handle);
             }
@@ -127,7 +127,8 @@ private slots:
             return;
         }
         QList<XMPP::NameRecord> results;
-        for (const auto &a : info.addresses()) {
+        const auto &            addresses = info.addresses();
+        for (const auto &a : addresses) {
             XMPP::NameRecord ir(info.hostName().toLatin1(), 5 * 60); // ttl = 5 mins
             ir.setAddress(a);
             results += ir;
diff --git a/src/irisnet/corelib/netnames.cpp b/src/irisnet/corelib/netnames.cpp
index fc990cdc..c5b70810 100644
--- a/src/irisnet/corelib/netnames.cpp
+++ b/src/irisnet/corelib/netnames.cpp
@@ -461,7 +461,7 @@ WeightedNameRecordList &WeightedNameRecordList::operator=(const WeightedNameReco
 {
     priorityGroups = other.priorityGroups;
     if (other.currentPriorityGroup != other.priorityGroups.end()) {
-        currentPriorityGroup = priorityGroups.find(other.currentPriorityGroup.key());
+        currentPriorityGroup = priorityGroups.find(other.currentPriorityGroup->first);
     } else {
         currentPriorityGroup = priorityGroups.end();
     }
@@ -478,7 +478,7 @@ bool WeightedNameRecordList::isEmpty() const
 XMPP::NameRecord WeightedNameRecordList::takeNext()
 {
     /* Find the next useful priority group */
-    while (currentPriorityGroup != priorityGroups.end() && currentPriorityGroup->empty()) {
+    while (currentPriorityGroup != priorityGroups.end() && currentPriorityGroup->second.empty()) {
         ++currentPriorityGroup;
     }
     /* There are no priority groups left, return failure */
@@ -491,7 +491,7 @@ XMPP::NameRecord WeightedNameRecordList::takeNext()
 
     /* Find the new total weight of this priority group */
     int totalWeight = 0;
-    for (const XMPP::NameRecord &record : *currentPriorityGroup) {
+    for (const auto &record : qAsConst(currentPriorityGroup->second)) {
         totalWeight += record.weight();
     }
 
@@ -511,9 +511,9 @@ XMPP::NameRecord WeightedNameRecordList::takeNext()
 #endif
 
     /* Iterate through the priority group until we found the randomly selected entry */
-    WeightedNameRecordPriorityGroup::iterator it(currentPriorityGroup->begin());
+    WeightedNameRecordPriorityGroup::iterator it(currentPriorityGroup->second.begin());
     for (int currentWeight = it->weight(); currentWeight < randomWeight; currentWeight += (++it)->weight()) { }
-    Q_ASSERT(it != currentPriorityGroup->end());
+    Q_ASSERT(it != currentPriorityGroup->second.end());
 
     /* We are going to delete the entry in the list, so save it */
     XMPP::NameRecord result(*it);
@@ -523,8 +523,8 @@ XMPP::NameRecord WeightedNameRecordList::takeNext()
 #endif
 
     /* Delete the entry from list, to prevent it from being tried multiple times */
-    currentPriorityGroup->remove(it->weight(), *it);
-    if (currentPriorityGroup->isEmpty()) {
+    currentPriorityGroup->second.remove(it->weight(), *it);
+    if (currentPriorityGroup->second.isEmpty()) {
         priorityGroups.erase(currentPriorityGroup++);
     }
 
@@ -542,10 +542,9 @@ void WeightedNameRecordList::clear()
 void WeightedNameRecordList::append(const XMPP::WeightedNameRecordList &list)
 {
     /* Copy over all records from all groups */
-    for (const WeightedNameRecordPriorityGroup &group : list.priorityGroups) {
-        for (const NameRecord &record : group) {
+    for (const auto &group : list.priorityGroups) {
+        for (const NameRecord &record : group.second)
             append(record);
-        }
     }
 
     /* Reset to beginning */
@@ -554,18 +553,8 @@ void WeightedNameRecordList::append(const XMPP::WeightedNameRecordList &list)
 
 void WeightedNameRecordList::append(const QList<XMPP::NameRecord> &list)
 {
-    for (const XMPP::NameRecord &record : list) {
-        if (record.type() != XMPP::NameRecord::Srv) {
-            continue;
-        }
-        WeightedNameRecordPriorityGroup group(priorityGroups.value(record.priority()));
-
-        group.insert(record.weight(), record);
-
-        if (!priorityGroups.contains(record.priority())) {
-            priorityGroups.insert(record.priority(), group);
-        }
-    }
+    for (const XMPP::NameRecord &record : list)
+        append(record);
 
     /* Reset to beginning */
     currentPriorityGroup = priorityGroups.begin();
@@ -573,14 +562,9 @@ void WeightedNameRecordList::append(const QList<XMPP::NameRecord> &list)
 
 void WeightedNameRecordList::append(const XMPP::NameRecord &record)
 {
-    WeightedNameRecordPriorityGroup group(priorityGroups.value(record.priority()));
-
     Q_ASSERT(record.type() == XMPP::NameRecord::Srv);
-    group.insert(record.weight(), record);
-
-    if (!priorityGroups.contains(record.priority())) {
-        priorityGroups.insert(record.priority(), group);
-    }
+    auto [it, _] = priorityGroups.try_emplace(record.priority(), WeightedNameRecordPriorityGroup {});
+    it->second.insert(record.weight(), record);
 
     /* Reset to beginning */
     currentPriorityGroup = priorityGroups.begin();
@@ -622,20 +606,22 @@ QDebug operator<<(QDebug dbg, const XMPP::WeightedNameRecordList &list)
     /* operator(QDebug, QMap const&) has a bug which makes it crash when trying to print the dereferenced end() iterator
      */
     if (!list.isEmpty()) {
+        dbg.nospace() << "current=" << *list.currentPriorityGroup
 #if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
-        dbg.nospace() << "current=" << *list.currentPriorityGroup << Qt::endl;
+                      << Qt::endl;
 #else
-        dbg.nospace() << "current=" << *list.currentPriorityGroup << endl;
+                      << endl;
 #endif
     }
 
     dbg.nospace() << "{";
 
-    for (int priority : list.priorityGroups.keys()) {
+    for (const auto &[priority, group] : list.priorityGroups) {
+        dbg.nospace() << "\t" << priority << "->" << group
 #if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
-        dbg.nospace() << "\t" << priority << "->" << list.priorityGroups.value(priority) << Qt::endl;
+                      << Qt::endl;
 #else
-        dbg.nospace() << "\t" << priority << "->" << list.priorityGroups.value(priority) << endl;
+                      << endl;
 #endif
     }
 
@@ -747,7 +733,7 @@ class NameManager : public QObject {
                 sub_instances_to_remove += it.key();
         }
 
-        for (int res_sub_id : sub_instances_to_remove) {
+        for (int res_sub_id : qAsConst(sub_instances_to_remove)) {
             res_sub_instances.remove(res_sub_id);
             p_local->resolve_stop(res_sub_id);
         }
@@ -1111,7 +1097,7 @@ void ServiceResolver::clear_resolvers()
 #endif
 
     /* cleanup all resolvers */
-    for (XMPP::NameResolver *resolver : d->resolverList) {
+    for (XMPP::NameResolver *resolver : qAsConst(d->resolverList)) {
         cleanup_resolver(resolver);
     }
 }
diff --git a/src/irisnet/corelib/netnames.h b/src/irisnet/corelib/netnames.h
index 87a9e093..859ddc50 100644
--- a/src/irisnet/corelib/netnames.h
+++ b/src/irisnet/corelib/netnames.h
@@ -25,6 +25,7 @@
 #include <QtCore>
 #include <QtNetwork>
 #include <limits>
+#include <memory>
 
 // it seems visual studio defines it somewhere
 #ifdef max
@@ -524,7 +525,7 @@ class IRISNET_EXPORT WeightedNameRecordList {
 
 private:
     typedef QMultiMap<int /* weight */, NameRecord>                   WeightedNameRecordPriorityGroup;
-    typedef QMap<int /* priority */, WeightedNameRecordPriorityGroup> WNRL;
+    typedef std::map<int /* priority */, WeightedNameRecordPriorityGroup> WNRL;
 
     WNRL           priorityGroups;
     WNRL::iterator currentPriorityGroup;
diff --git a/src/irisnet/noncore/cutestuff/httppoll.cpp b/src/irisnet/noncore/cutestuff/httppoll.cpp
index f75157f6..962a0e0c 100644
--- a/src/irisnet/noncore/cutestuff/httppoll.cpp
+++ b/src/irisnet/noncore/cutestuff/httppoll.cpp
@@ -501,7 +501,7 @@ QByteArray HttpProxyPost::body() const { return d->body; }
 
 QString HttpProxyPost::getHeader(const QString &var) const
 {
-    for (const QString &s : d->headerLines) {
+    for (const QString &s : qAsConst(d->headerLines)) {
         int n = s.indexOf(": ");
         if (n == -1)
             continue;
@@ -774,7 +774,7 @@ void HttpProxyGetStream::stop() { resetConnection(); }
 
 QString HttpProxyGetStream::getHeader(const QString &var) const
 {
-    for (const QString &s : d->headerLines) {
+    for (const QString &s : qAsConst(d->headerLines)) {
         int n = s.indexOf(": ");
         if (n == -1)
             continue;
diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index 4b3603fa..3ea92d44 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -1247,7 +1247,7 @@ class Ice176::Private : public QObject {
                     return p->local->base == locIt->info->base && p->remote->addr == pair->remote->addr
                         && p->local->componentId == locIt->info->componentId;
                 });
-                if (it == checkList.pairs.constEnd()) {
+                if (it == checkList.pairs.end()) {
                     // allow v4/v6 proto mismatch in case NAT does magic
                     pair = makeCandidatesPair(locIt->info, pair->remote);
                 } else {
diff --git a/src/irisnet/noncore/udpportreserver.cpp b/src/irisnet/noncore/udpportreserver.cpp
index 74c197c9..492dd1bf 100644
--- a/src/irisnet/noncore/udpportreserver.cpp
+++ b/src/irisnet/noncore/udpportreserver.cpp
@@ -240,12 +240,12 @@ private slots:
                 continue;
 
             QList<QHostAddress> neededAddrs;
-            for (const QHostAddress &a : addrs) {
+            for (const QHostAddress &a : qAsConst(addrs)) {
                 if (!i.haveAddress(a))
                     neededAddrs += a;
             }
 
-            for (const QHostAddress &a : neededAddrs) {
+            for (const QHostAddress &a : qAsConst(neededAddrs)) {
                 QUdpSocket *sock = new QUdpSocket(q);
 
                 if (!sock->bind(a, quint16(i.port))) {
diff --git a/src/xmpp/xmpp-core/parser.cpp b/src/xmpp/xmpp-core/parser.cpp
index 5046e341..20b1106b 100644
--- a/src/xmpp/xmpp-core/parser.cpp
+++ b/src/xmpp/xmpp-core/parser.cpp
@@ -209,7 +209,8 @@ class Parser::Private {
                 curElement = curElement.appendChild(newEl).toElement();
             }
 
-            for (auto const &a : reader.attributes()) {
+            const auto &attrs = reader.attributes();
+            for (auto const &a : attrs) {
                 QDomAttr da;
                 if (a.namespaceUri().isEmpty())
                     da = doc.createAttribute(a.name().toString());
diff --git a/src/xmpp/xmpp-core/protocol.cpp b/src/xmpp/xmpp-core/protocol.cpp
index 9890c5af..771bc991 100644
--- a/src/xmpp/xmpp-core/protocol.cpp
+++ b/src/xmpp/xmpp-core/protocol.cpp
@@ -989,7 +989,7 @@ bool CoreProtocol::dialbackStep(const QDomElement &e)
                 Jid to(Jid(e.attribute("to")).domain());
                 Jid from(Jid(e.attribute("from")).domain());
                 if (isIncoming()) {
-                    QString key = e.text();
+                    [[maybe_unused]] QString key = e.text();
                     // TODO: report event
                 } else {
                     bool   ok = e.attribute("type") == "valid";
@@ -1008,9 +1008,9 @@ bool CoreProtocol::dialbackStep(const QDomElement &e)
             } else if (e.tagName() == "verify") {
                 Jid     to(Jid(e.attribute("to")).domain());
                 Jid     from(Jid(e.attribute("from")).domain());
-                QString id = e.attribute("id");
+                [[maybe_unused]] QString id = e.attribute("id");
                 if (isIncoming()) {
-                    QString key = e.text();
+                    [[maybe_unused]] QString key = e.text();
                     // TODO: report event
                 } else {
                     bool   ok = e.attribute("type") == "valid";
@@ -1273,7 +1273,7 @@ bool CoreProtocol::normalStep(const QDomElement &e)
             }
         } else {
             QDomElement mechs = doc.createElementNS(NS_SASL, "mechanisms");
-            for (const QString &it : sasl_mechlist) {
+            for (const QString &it : qAsConst(sasl_mechlist)) {
                 QDomElement m = doc.createElement("mechanism");
                 m.appendChild(doc.createTextNode(it));
                 mechs.appendChild(m);
@@ -1363,7 +1363,7 @@ bool CoreProtocol::normalStep(const QDomElement &e)
             if (f.sasl_supported) {
 #ifdef XMPP_TEST
                 QString s = "SASL mechs:";
-                for (QStringList::ConstIterator it = f.sasl_mechs.begin(); it != f.sasl_mechs.end(); ++it)
+                for (QStringList::ConstIterator it = f.sasl_mechs.constBegin(); it != f.sasl_mechs.constEnd(); ++it)
                     s += QString(" [%1]").arg((*it));
                 TD::msg(s);
 #endif
@@ -1371,7 +1371,8 @@ bool CoreProtocol::normalStep(const QDomElement &e)
             if (f.compress_supported) {
 #ifdef XMPP_TEST
                 QString s = "Compression mechs:";
-                for (QStringList::ConstIterator it = f.compression_mechs.begin(); it != f.compression_mechs.end(); ++it)
+                for (QStringList::ConstIterator it = f.compression_mechs.constBegin();
+                     it != f.compression_mechs.constEnd(); ++it)
                     s += QString(" [%1]").arg((*it));
                 TD::msg(s);
 #endif
diff --git a/src/xmpp/xmpp-core/securestream.cpp b/src/xmpp/xmpp-core/securestream.cpp
index 1ddf8f13..bef8c637 100644
--- a/src/xmpp/xmpp-core/securestream.cpp
+++ b/src/xmpp/xmpp-core/securestream.cpp
@@ -417,7 +417,7 @@ void SecureStream::linkLayer(QObject *s)
 int SecureStream::calcPrebytes() const
 {
     int x = 0;
-    for (SecureLayer *s : d->layers) {
+    for (SecureLayer *s : qAsConst(d->layers)) {
         x += s->prebytes;
     }
     return (d->pending - x);
@@ -545,7 +545,7 @@ void SecureStream::bs_readyRead()
 
 void SecureStream::bs_bytesWritten(qint64 bytes)
 {
-    for (SecureLayer *s : d->layers) {
+    for (SecureLayer *s : qAsConst(d->layers)) {
         bytes = s->finished(int(bytes));
     }
 
diff --git a/src/xmpp/xmpp-core/stream.cpp b/src/xmpp/xmpp-core/stream.cpp
index 0128cae7..ca9b47dd 100644
--- a/src/xmpp/xmpp-core/stream.cpp
+++ b/src/xmpp/xmpp-core/stream.cpp
@@ -219,7 +219,7 @@ ClientStream::ClientStream(const QString &host, const QString &defRealm, ByteStr
     connect(d->bs, SIGNAL(delayedCloseFinished()), SLOT(bs_delayedCloseFinished()));
     connect(d->bs, SIGNAL(error(int)), SLOT(bs_error(int)));
 
-    QByteArray spare = d->bs->readAll();
+    [[maybe_unused]] QByteArray spare = d->bs->readAll();
 
     d->ss = new SecureStream(d->bs);
     connect(d->ss, SIGNAL(readyRead()), SLOT(ss_readyRead()));
@@ -272,7 +272,7 @@ void ClientStream::reset(bool all)
         }
     } else {
         QSharedPointer<QDomDocument> sd;
-        for (Stanza *s : d->in) {
+        for (Stanza *s : qAsConst(d->in)) {
             sd = s->unboundDocument(sd);
         }
     }
@@ -883,7 +883,7 @@ void ClientStream::processNext()
 #endif
         bool ok = d->client.processStep();
         // deal with send/received items
-        for (const XmlProtocol::TransferItem &i : d->client.transferItemList) {
+        for (const XmlProtocol::TransferItem &i : qAsConst(d->client.transferItemList)) {
             if (i.isExternal)
                 continue;
             QString str;
@@ -1125,7 +1125,8 @@ bool ClientStream::handleNeed()
 
         // ensure simplesasl provider is installed
         bool found = false;
-        for (QCA::Provider *p : QCA::providers()) {
+        const auto &providers = QCA::providers();
+        for (QCA::Provider *p : providers) {
             if (p->name() == "simplesasl") {
                 found = true;
                 break;
@@ -1148,7 +1149,7 @@ bool ClientStream::handleNeed()
         else {
             QMap<int, QString> prefOrdered;
             QStringList        unpreferred;
-            for (auto const &m : d->client.features.sasl_mechs) {
+            for (auto const &m : qAsConst(d->client.features.sasl_mechs)) {
                 int i = preference.indexOf(m);
                 if (i != -1) {
                     prefOrdered.insert(i, m);
@@ -1160,7 +1161,8 @@ bool ClientStream::handleNeed()
         }
 
         QString saslProvider;
-        for (const QString &mech : d->mechProviders.keys()) {
+        const auto &meches = d->mechProviders.keys();
+        for (const QString &mech : meches) {
             if (ml.contains(mech)) {
                 saslProvider = d->mechProviders[mech];
                 break;
diff --git a/src/xmpp/xmpp-core/tlshandler.cpp b/src/xmpp/xmpp-core/tlshandler.cpp
index 6ee9f773..e0daf4dd 100644
--- a/src/xmpp/xmpp-core/tlshandler.cpp
+++ b/src/xmpp/xmpp-core/tlshandler.cpp
@@ -164,7 +164,7 @@ static bool cert_match_domain(const QString &certname, const QString &acedomain)
         return false;
 
     // don't allow empty parts
-    for (const QString &s : parts_name) {
+    for (const QString &s : qAsConst(parts_name)) {
         if (s.isEmpty())
             return false;
     }
diff --git a/src/xmpp/xmpp-im/filetransfer.cpp b/src/xmpp/xmpp-im/filetransfer.cpp
index 1324f773..9299ae22 100644
--- a/src/xmpp/xmpp-im/filetransfer.cpp
+++ b/src/xmpp/xmpp-im/filetransfer.cpp
@@ -403,7 +403,7 @@ void FileTransferManager::setDisabled(const QString &ns, bool state)
 void FileTransferManager::pft_incoming(const FTRequest &req)
 {
     QString streamType;
-    for (const QString &ns : d->streamPriority) {
+    for (const QString &ns : qAsConst(d->streamPriority)) {
         if (req.streamTypes.contains(ns)) {
             BytestreamManager *manager = streamManager(ns);
             if (manager && manager->isAcceptableSID(req.from, req.id)) {
@@ -435,7 +435,7 @@ BytestreamManager *FileTransferManager::streamManager(const QString &ns) const
 QStringList FileTransferManager::streamPriority() const
 {
     QStringList ret;
-    for (const QString &ns : d->streamPriority) {
+    for (const QString &ns : qAsConst(d->streamPriority)) {
         if (!d->disabledStreamTypes.contains(ns)) {
             ret.append(ns);
         }
@@ -445,7 +445,7 @@ QStringList FileTransferManager::streamPriority() const
 
 void FileTransferManager::stream_incomingReady(BSConnection *c)
 {
-    for (FileTransfer *ft : d->list) {
+    for (FileTransfer *ft : qAsConst(d->list)) {
         if (ft->d->needStream && ft->d->peer.compare(c->peer()) && ft->d->id == c->sid()) {
             ft->takeConnection(c);
             return;
@@ -466,7 +466,7 @@ QString FileTransferManager::link(FileTransfer *ft)
 #else
         id = QString("ft_%1").arg(qrand() & 0xffff, 4, 16, QChar('0'));
 #endif
-        for (FileTransfer *ft : d->list) {
+        for (FileTransfer *ft : qAsConst(d->list)) {
             if (ft->d->peer.compare(ft->d->peer) && ft->d->id == id) {
                 found = true;
                 break;
@@ -581,7 +581,7 @@ bool JT_FT::take(const QDomElement &x)
             return true;
         }
 
-        QString id = si.attribute("id");
+        [[maybe_unused]] QString id = si.attribute("id");
 
         qlonglong range_offset = 0;
         qlonglong range_length = 0;
diff --git a/src/xmpp/xmpp-im/httpfileupload.cpp b/src/xmpp/xmpp-im/httpfileupload.cpp
index dcb1997d..cf0ffe6d 100644
--- a/src/xmpp/xmpp-im/httpfileupload.cpp
+++ b/src/xmpp/xmpp-im/httpfileupload.cpp
@@ -119,7 +119,7 @@ void HttpFileUpload::start()
                     xmlns = xmlns_v0_2_5;
                 }
                 if (ver != XEP0363::vUnknown) {
-                    QList<std::pair<HttpHost, int>> hosts;
+                    QVector<std::pair<HttpHost, int>> hosts;
                     const XData::Field field = item.registeredExtension(xmlns).getField(QLatin1String("max-file-size"));
                     if (field.isValid() && field.type() == XData::Field::Field_TextSingle)
                         sizeLimit = field.value().at(0).toULongLong();
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index 3135a674..ef6b33d1 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -296,7 +296,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
             }
             left = iceList;
 
-            for (Ice176 *ice : left) {
+            for (Ice176 *ice : qAsConst(left)) {
                 ice->setParent(this);
 
                 // TODO: error() also?
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index ebc3c025..c0806f5e 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -310,7 +310,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
 
         void setupIncomingSocksClient()
         {
-            connect(socksClient, &SocksClient::error, [this](int error) {
+            connect(socksClient, &SocksClient::error, this, [this](int error) {
                 Q_UNUSED(error)
                 state = Candidate::Discarded;
             });
@@ -1117,7 +1117,8 @@ namespace XMPP { namespace Jingle { namespace S5B {
         void onLocalServerDiscovered()
         {
             bool hasNewCandidates = false;
-            for (auto serv : disco->takeServers()) {
+            const auto &servers          = disco->takeServers();
+            for (const auto &serv : servers) {
                 auto s5bserv = serv.staticCast<S5BServer>();
                 s5bserv->registerKey(directAddr);
                 Candidate c(q, serv, generateCid());
diff --git a/src/xmpp/xmpp-im/jingle-session.cpp b/src/xmpp/xmpp-im/jingle-session.cpp
index ad5cb7ad..0f7490e3 100644
--- a/src/xmpp/xmpp-im/jingle-session.cpp
+++ b/src/xmpp/xmpp-im/jingle-session.cpp
@@ -185,7 +185,8 @@ namespace XMPP { namespace Jingle {
             if (needNotifyGroup
                 && (action == Action::SessionInitiate || action == Action::SessionAccept || action == Action::ContentAdd
                     || action == Action::ContentAccept)) {
-                for (auto const &g : genGroupingXML())
+                const auto xmls = genGroupingXML();
+                for (auto const &g : xmls)
                     xml.appendChild(g);
                 needNotifyGroup = false;
             }
@@ -830,7 +831,7 @@ namespace XMPP { namespace Jingle {
 
         bool handleIncomingTransportReplace(const QDomElement &jingleEl)
         {
-            QList<std::tuple<Application *, QSharedPointer<Transport>, QDomElement>> passed;
+            QVector<std::tuple<Application *, QSharedPointer<Transport>, QDomElement>> passed;
             QList<QDomElement>                                                       toReject;
             QString contentTag(QStringLiteral("content"));
             bool    doTieBreak = false;
@@ -913,7 +914,7 @@ namespace XMPP { namespace Jingle {
         bool handleIncomingTransportAccept(const QDomElement &jingleEl)
         {
             QString                                  contentTag(QStringLiteral("content"));
-            QList<QPair<Application *, QDomElement>> updates;
+            QVector<QPair<Application *, QDomElement>> updates;
             for (QDomElement ce = jingleEl.firstChildElement(contentTag); !ce.isNull();
                  ce             = ce.nextSiblingElement(contentTag)) {
                 ContentBase cb(ce);
@@ -963,7 +964,7 @@ namespace XMPP { namespace Jingle {
         bool handleIncomingTransportInfo(const QDomElement &jingleEl)
         {
             QString                                              contentTag(QStringLiteral("content"));
-            QList<QPair<QSharedPointer<Transport>, QDomElement>> updates;
+            QVector<QPair<QSharedPointer<Transport>, QDomElement>> updates;
             for (QDomElement ce = jingleEl.firstChildElement(contentTag); !ce.isNull();
                  ce             = ce.nextSiblingElement(contentTag)) {
                 Application *app = nullptr;
diff --git a/src/xmpp/xmpp-im/s5b.cpp b/src/xmpp/xmpp-im/s5b.cpp
index 3527a4c0..7a486965 100644
--- a/src/xmpp/xmpp-im/s5b.cpp
+++ b/src/xmpp/xmpp-im/s5b.cpp
@@ -656,7 +656,7 @@ bool S5BManager::isAcceptableSID(const Jid &peer, const QString &sid) const
     QString key     = makeKey(sid, d->client->jid(), peer);
     QString key_out = makeKey(sid, peer, d->client->jid()); // not valid in muc via proxy
 
-    for (Entry *e : d->activeList) {
+    for (Entry *e : qAsConst(d->activeList)) {
         if (e->i) {
             if (e->i->key == key || e->i->key == key_out)
                 return false;
@@ -677,7 +677,7 @@ const char *S5BManager::sidPrefix() const { return "s5b_"; }
 
 S5BConnection *S5BManager::findIncoming(const Jid &from, const QString &sid) const
 {
-    for (S5BConnection *c : d->incomingConns) {
+    for (S5BConnection *c : qAsConst(d->incomingConns)) {
         if (c->d->peer.compare(from) && c->d->sid == sid)
             return c;
     }
@@ -686,7 +686,7 @@ S5BConnection *S5BManager::findIncoming(const Jid &from, const QString &sid) con
 
 S5BManager::Entry *S5BManager::findEntry(S5BConnection *c) const
 {
-    for (Entry *e : d->activeList) {
+    for (Entry *e : qAsConst(d->activeList)) {
         if (e->c == c)
             return e;
     }
@@ -695,7 +695,7 @@ S5BManager::Entry *S5BManager::findEntry(S5BConnection *c) const
 
 S5BManager::Entry *S5BManager::findEntry(Item *i) const
 {
-    for (Entry *e : d->activeList) {
+    for (Entry *e : qAsConst(d->activeList)) {
         if (e->i == i)
             return e;
     }
@@ -704,7 +704,7 @@ S5BManager::Entry *S5BManager::findEntry(Item *i) const
 
 S5BManager::Entry *S5BManager::findEntryByHash(const QString &key) const
 {
-    for (Entry *e : d->activeList) {
+    for (Entry *e : qAsConst(d->activeList)) {
         if (e->i && e->i->key == key)
             return e;
     }
@@ -713,7 +713,7 @@ S5BManager::Entry *S5BManager::findEntryByHash(const QString &key) const
 
 S5BManager::Entry *S5BManager::findEntryBySID(const Jid &peer, const QString &sid) const
 {
-    for (Entry *e : d->activeList) {
+    for (Entry *e : qAsConst(d->activeList)) {
         if (e->i && e->i->peer.compare(peer) && e->sid == sid)
             return e;
     }
@@ -926,7 +926,7 @@ void S5BManager::query_finished()
 {
     JT_S5B *query = static_cast<JT_S5B *>(sender());
     Entry * e     = nullptr;
-    for (Entry *i : d->activeList) {
+    for (Entry *i : qAsConst(d->activeList)) {
         if (i->query == query) {
             e = i;
             break;
@@ -1145,7 +1145,7 @@ void S5BManager::Item::doIncoming()
     StreamHostList list;
     if (lateProxy) {
         // take just the proxy streamhosts
-        for (const StreamHost &it : in_hosts) {
+        for (const StreamHost &it : qAsConst(in_hosts)) {
             if (it.isProxy())
                 list += it;
         }
@@ -1155,7 +1155,7 @@ void S5BManager::Item::doIncoming()
         if ((state == Requester || (state == Target && fast)) && !proxy.jid().isValid()) {
             // take just the non-proxy streamhosts
             bool hasProxies = false;
-            for (const StreamHost &it : in_hosts) {
+            for (const StreamHost &it : qAsConst(in_hosts)) {
                 if (it.isProxy())
                     hasProxies = true;
                 else
@@ -1814,7 +1814,7 @@ void S5BConnector::t_timeout()
 void S5BConnector::man_udpSuccess(const Jid &streamHost)
 {
     // was anyone sending to this streamhost?
-    for (Item *i : d->itemList) {
+    for (Item *i : qAsConst(d->itemList)) {
         if (i->host.jid().compare(streamHost) && i->client_udp) {
             i->udpSuccess();
             return;
@@ -2144,13 +2144,13 @@ class S5BIncomingConnection : public QObject {
     S5BIncomingConnection(SocksClient *c) : QObject(nullptr)
     {
         client = c;
-        connect(client, &SocksClient::incomingMethods, [this](int methods) {
+        connect(client, &SocksClient::incomingMethods, this, [this](int methods) {
             if (methods & SocksClient::AuthNone)
                 client->chooseMethod(SocksClient::AuthNone);
             else
                 doError();
         });
-        connect(client, &SocksClient::incomingConnectRequest, [this](const QString &_host, int port) {
+        connect(client, &SocksClient::incomingConnectRequest, this, [this](const QString &_host, int port) {
             if (port == 0) {
                 host = _host;
                 client->disconnect(this);
@@ -2159,7 +2159,7 @@ class S5BIncomingConnection : public QObject {
             } else
                 doError();
         });
-        connect(client, &SocksClient::error, [this]() { doError(); });
+        connect(client, &SocksClient::error, this, [this]() { doError(); });
         connect(&expire, SIGNAL(timeout()), SLOT(doError()));
         resetExpiration();
     }
diff --git a/src/xmpp/xmpp-im/types.cpp b/src/xmpp/xmpp-im/types.cpp
index 0a1748b5..f9398cb3 100644
--- a/src/xmpp/xmpp-im/types.cpp
+++ b/src/xmpp/xmpp-im/types.cpp
@@ -976,7 +976,7 @@ AddressList Message::findAddresses(Address::Type t) const
         return AddressList();
     }
     AddressList matches;
-    for (Address a : d->addressList) {
+    for (const Address &a : qAsConst(d->addressList)) {
         if (a.type() == t)
             matches.append(a);
     }
@@ -1155,7 +1155,7 @@ Stanza Message::toStanza(Stream *stream) const
     if (containsHTML()) {
         QDomElement html = s.createElement("http://jabber.org/protocol/xhtml-im", "html");
         s.appendChild(html);
-        for (HTMLElement el : d->htmlElements) {
+        for (const HTMLElement &el : qAsConst(d->htmlElements)) {
             html.appendChild(s.doc().importNode(el.body(), true).toElement());
         }
     }
@@ -1181,7 +1181,7 @@ Stanza Message::toStanza(Stream *stream) const
     }
 
     // urls
-    for (const Url &uit : d->urlList) {
+    for (const Url &uit : qAsConst(d->urlList)) {
         QDomElement x = s.createElement("jabber:x:oob", "x");
         x.appendChild(s.createTextElement("jabber:x:oob", "url", uit.url()));
         if (!uit.desc().isEmpty())
@@ -1200,7 +1200,7 @@ Stanza Message::toStanza(Stream *stream) const
                 x.appendChild(s.createTextElement("jabber:x:event", "id", d->eventId));
         }
 
-        for (const MsgEvent &ev : d->eventList) {
+        for (const MsgEvent &ev : qAsConst(d->eventList)) {
             switch (ev) {
             case OfflineEvent:
                 x.appendChild(s.createElement("jabber:x:event", "offline"));
@@ -1287,7 +1287,7 @@ Stanza Message::toStanza(Stream *stream) const
     // addresses
     if (!d->addressList.isEmpty()) {
         QDomElement as = s.createElement("http://jabber.org/protocol/address", "addresses");
-        for (Address a : d->addressList) {
+        for (const Address &a : qAsConst(d->addressList)) {
             as.appendChild(a.toXml(s));
         }
         s.appendChild(as);
@@ -1296,7 +1296,7 @@ Stanza Message::toStanza(Stream *stream) const
     // roster item exchange
     if (!d->rosterExchangeItems.isEmpty()) {
         QDomElement rx = s.createElement("http://jabber.org/protocol/rosterx", "x");
-        for (RosterExchangeItem r : d->rosterExchangeItems) {
+        for (const RosterExchangeItem &r : qAsConst(d->rosterExchangeItems)) {
             rx.appendChild(r.toXml(s));
         }
         s.appendChild(rx);
@@ -1322,7 +1322,7 @@ Stanza Message::toStanza(Stream *stream) const
     // muc
     if (!d->mucInvites.isEmpty()) {
         QDomElement e = s.createElement("http://jabber.org/protocol/muc#user", "x");
-        for (MUCInvite i : d->mucInvites) {
+        for (const MUCInvite &i : qAsConst(d->mucInvites)) {
             e.appendChild(i.toXml(s.doc()));
         }
         if (!d->mucPassword.isEmpty()) {
@@ -1351,7 +1351,7 @@ Stanza Message::toStanza(Stream *stream) const
     }
 
     // bits of binary
-    for (const BoBData &bd : d->bobDataList) {
+    for (const BoBData &bd : qAsConst(d->bobDataList)) {
         s.appendChild(bd.toXml(&s.doc()));
     }
 
@@ -1397,7 +1397,7 @@ Stanza Message::toStanza(Stream *stream) const
     }
 
     // XEP-0372 and XEP-0385
-    for (auto const &r : d->references) {
+    for (auto const &r : qAsConst(d->references)) {
         s.appendChild(r.toXml(&s.doc()));
     }
 
diff --git a/src/xmpp/xmpp-im/xmpp_caps.cpp b/src/xmpp/xmpp-im/xmpp_caps.cpp
index ab1b327e..43fe9f46 100644
--- a/src/xmpp/xmpp-im/xmpp_caps.cpp
+++ b/src/xmpp/xmpp-im/xmpp_caps.cpp
@@ -89,7 +89,7 @@ void CapsRegistry::save()
     QDomElement  capabilities = doc.createElement("capabilities");
     doc.appendChild(capabilities);
     QHash<QString, CapsInfo>::ConstIterator i = capsInfo_.constBegin();
-    for (; i != capsInfo_.end(); i++) {
+    for (; i != capsInfo_.constEnd(); i++) {
         QDomElement info = i.value().toXml(&doc);
         info.setAttribute("node", i.key());
         capabilities.appendChild(info);
@@ -320,7 +320,7 @@ void CapsManager::updateDisco(const Jid &jid, const DiscoItem &item)
 void CapsManager::capsRegistered(const CapsSpec &cs)
 {
     // Notify affected jids.
-    for (const QString &s : capsJids_[cs.flatten()]) {
+    for (const QString &s : qAsConst(capsJids_[cs.flatten()])) {
         // qDebug() << QString("caps.cpp: Notifying %1.").arg(s.replace('%',"%%"));
         emit capsChanged(s);
     }
diff --git a/src/xmpp/xmpp-im/xmpp_discoitem.cpp b/src/xmpp/xmpp-im/xmpp_discoitem.cpp
index 0485006f..f959365e 100644
--- a/src/xmpp/xmpp-im/xmpp_discoitem.cpp
+++ b/src/xmpp/xmpp-im/xmpp_discoitem.cpp
@@ -117,7 +117,8 @@ QString DiscoItem::capsHash(QCryptographicHash::Algorithm algo) const
         }
         forms.insert(xd.registrarType(), xd);
     }
-    for (const XData &xd : forms.values()) {
+    const auto &xds = forms.values();
+    for (const XData &xd : xds) {
         prep << xd.registrarType();
         QMap<QString, QStringList> values;
         for (const XData::Field &f : xd.fields()) {
@@ -205,7 +206,8 @@ QDomElement DiscoItem::toDiscoInfoResult(QDomDocument *doc) const
         }
     }
 
-    for (const QString &f : d->features.list()) {
+    const QStringList &features = d->features.list();
+    for (const QString &f : features) {
         QDomElement fel = q.appendChild(doc->createElement(QLatin1String("feature"))).toElement();
         fel.setAttribute("var", f);
     }
diff --git a/src/xmpp/xmpp-im/xmpp_ibb.cpp b/src/xmpp/xmpp-im/xmpp_ibb.cpp
index 0e81d289..a2e921b7 100644
--- a/src/xmpp/xmpp-im/xmpp_ibb.cpp
+++ b/src/xmpp/xmpp-im/xmpp_ibb.cpp
@@ -413,7 +413,7 @@ void IBBManager::unlink(IBBConnection *c) { d->activeConns.removeAll(c); }
 
 IBBConnection *IBBManager::findConnection(const QString &sid, const Jid &peer) const
 {
-    for (IBBConnection *c : d->activeConns) {
+    for (IBBConnection *c : qAsConst(d->activeConns)) {
         if (c->sid() == sid && (peer.isEmpty() || c->peer().compare(peer)))
             return c;
     }
diff --git a/src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp b/src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp
index 505070d1..acc0e86d 100644
--- a/src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp
+++ b/src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp
@@ -266,7 +266,7 @@ void ServerInfoManager::disco_finished()
 
         // Identities
         DiscoItem::Identities is = jt->item().identities();
-        for (DiscoItem::Identity i : is) {
+        for (const DiscoItem::Identity &i : is) {
             if (i.category == "pubsub" && i.type == "pep")
                 _hasPEP = true;
         }
diff --git a/src/xmpp/xmpp-im/xmpp_tasks.cpp b/src/xmpp/xmpp-im/xmpp_tasks.cpp
index 7baa42bd..f54442f7 100644
--- a/src/xmpp/xmpp-im/xmpp_tasks.cpp
+++ b/src/xmpp/xmpp-im/xmpp_tasks.cpp
@@ -431,7 +431,7 @@ void JT_Roster::onGo()
         iq                = createIQ(doc(), "set", to.full(), id());
         QDomElement query = doc()->createElementNS("jabber:iq:roster", "query");
         iq.appendChild(query);
-        for (const QDomElement &it : d->itemList)
+        for (const QDomElement &it : qAsConst(d->itemList))
             query.appendChild(it);
         send(iq);
     } else if (type == GetDelimiter) {
@@ -452,7 +452,7 @@ QString JT_Roster::toString() const
 
     QDomElement i = doc()->createElement("request");
     i.setAttribute("type", "JT_Roster");
-    for (const QDomElement &it : d->itemList)
+    for (const QDomElement &it : qAsConst(d->itemList))
         i.appendChild(it);
     return lineEncode(Stream::xmlToString(i));
 }
@@ -615,7 +615,8 @@ void JT_Presence::pres(const Status &s)
         }
 
         // bits of binary
-        for (const BoBData &bd : s.bobDataList()) {
+        const auto &bdlist = s.bobDataList();
+        for (const BoBData &bd : bdlist) {
             tag.appendChild(bd.toXml(doc()));
         }
     }
diff --git a/src/xmpp/xmpp-im/xmpp_xdata.cpp b/src/xmpp/xmpp-im/xmpp_xdata.cpp
index c399c53d..a5a18494 100644
--- a/src/xmpp/xmpp-im/xmpp_xdata.cpp
+++ b/src/xmpp/xmpp-im/xmpp_xdata.cpp
@@ -268,7 +268,8 @@ QDomElement XData::Field::toXml(QDomDocument *doc, bool submitForm) const
         for (const MediaUri &uri : _mediaElement) {
             QDomElement uriEl = doc->createElement("uri");
             QString     type  = uri.mimeType;
-            for (const QString &k : uri.params.keys()) {
+            const QStringList &klist = uri.params.keys();
+            for (const QString &k : klist) {
                 type += ";" + k + "=" + uri.params[k];
             }
             uriEl.setAttribute("type", type);
@@ -300,7 +301,7 @@ QSize XData::Field::MediaElement::mediaSize() const { return _size; }
 
 bool XData::Field::MediaElement::checkSupport(const QStringList &wildcards)
 {
-    for (const XData::Field::MediaUri &uri : *this) {
+    for (const XData::Field::MediaUri &uri : qAsConst(*this)) {
         for (const QString &wildcard : wildcards) {
             if (QRegExp(wildcard, Qt::CaseSensitive, QRegExp::Wildcard).exactMatch(uri.mimeType)) {
                 return true;

From c5835d90f585951a24327484a4af4f12eef472a5 Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Wed, 3 Nov 2021 15:36:26 +0200
Subject: [PATCH 341/383] Code refactoring. Modernize loops

---
 src/irisnet/corelib/netnames.h                |  2 +-
 src/irisnet/noncore/cutestuff/httpconnect.cpp |  4 +-
 src/xmpp/sasl/digestmd5proplist.cpp           | 20 +++++-----
 src/xmpp/xmpp-core/protocol.cpp               | 13 +++----
 src/xmpp/xmpp-core/stream.cpp                 |  4 +-
 src/xmpp/xmpp-im/client.cpp                   |  4 +-
 src/xmpp/xmpp-im/filetransfer.cpp             |  4 +-
 src/xmpp/xmpp-im/jingle-s5b.cpp               |  2 +-
 src/xmpp/xmpp-im/jingle-session.cpp           |  6 +--
 src/xmpp/xmpp-im/s5b.cpp                      | 22 +++++------
 src/xmpp/xmpp-im/types.cpp                    |  8 ++--
 src/xmpp/xmpp-im/xmpp_task.cpp                |  3 +-
 src/xmpp/xmpp-im/xmpp_tasks.cpp               | 25 ++++++------
 src/xmpp/xmpp-im/xmpp_vcard.cpp               | 39 +++++++------------
 src/xmpp/xmpp-im/xmpp_xdata.cpp               | 30 +++++++-------
 src/xmpp/xmpp-im/xmpp_xmlcommon.cpp           |  4 +-
 16 files changed, 85 insertions(+), 105 deletions(-)

diff --git a/src/irisnet/corelib/netnames.h b/src/irisnet/corelib/netnames.h
index 859ddc50..5191fe73 100644
--- a/src/irisnet/corelib/netnames.h
+++ b/src/irisnet/corelib/netnames.h
@@ -524,7 +524,7 @@ class IRISNET_EXPORT WeightedNameRecordList {
     WeightedNameRecordList &operator<<(const NameRecord &);
 
 private:
-    typedef QMultiMap<int /* weight */, NameRecord>                   WeightedNameRecordPriorityGroup;
+    typedef QMultiMap<int /* weight */, NameRecord>                       WeightedNameRecordPriorityGroup;
     typedef std::map<int /* priority */, WeightedNameRecordPriorityGroup> WNRL;
 
     WNRL           priorityGroups;
diff --git a/src/irisnet/noncore/cutestuff/httpconnect.cpp b/src/irisnet/noncore/cutestuff/httpconnect.cpp
index 6cfb11e6..3fb2457a 100644
--- a/src/irisnet/noncore/cutestuff/httpconnect.cpp
+++ b/src/irisnet/noncore/cutestuff/httpconnect.cpp
@@ -269,8 +269,8 @@ void HttpConnect::sock_readyRead()
 #ifdef PROX_DEBUG
                     fprintf(stderr, "HttpConnect: header proto=[%s] code=[%d] msg=[%s]\n", qPrintable(proto), code,
                             qPrintable(msg));
-                    for (QStringList::ConstIterator it = d->headerLines.begin(); it != d->headerLines.end(); ++it)
-                        fprintf(stderr, "HttpConnect: * [%s]\n", qPrintable(*it));
+                    for (const auto &it : qAsConst(d->headerLines))
+                        fprintf(stderr, "HttpConnect: * [%s]\n", qPrintable(it));
 #endif
                 }
 
diff --git a/src/xmpp/sasl/digestmd5proplist.cpp b/src/xmpp/sasl/digestmd5proplist.cpp
index 58090747..b0e61615 100644
--- a/src/xmpp/sasl/digestmd5proplist.cpp
+++ b/src/xmpp/sasl/digestmd5proplist.cpp
@@ -31,9 +31,9 @@ void DIGESTMD5PropList::set(const QByteArray &var, const QByteArray &val)
 
 QByteArray DIGESTMD5PropList::get(const QByteArray &var) const
 {
-    for (ConstIterator it = begin(); it != end(); ++it) {
-        if ((*it).var == var)
-            return (*it).val;
+    for (const auto &it : qAsConst(*this)) {
+        if (it.var == var)
+            return it.val;
     }
     return QByteArray();
 }
@@ -42,14 +42,14 @@ QByteArray DIGESTMD5PropList::toString() const
 {
     QByteArray str;
     bool       first = true;
-    for (ConstIterator it = begin(); it != end(); ++it) {
+    for (const auto &it : qAsConst(*this)) {
         if (!first)
             str += ',';
-        if ((*it).var == "realm" || (*it).var == "nonce" || (*it).var == "username" || (*it).var == "cnonce"
-            || (*it).var == "digest-uri" || (*it).var == "authzid")
-            str += (*it).var + "=\"" + (*it).val + '\"';
+        if (it.var == "realm" || it.var == "nonce" || it.var == "username" || it.var == "cnonce"
+            || it.var == "digest-uri" || it.var == "authzid")
+            str += it.var + "=\"" + it.val + '\"';
         else
-            str += (*it).var + "=" + (*it).val;
+            str += it.var + "=" + it.val;
         first = false;
     }
     return str;
@@ -119,8 +119,8 @@ bool DIGESTMD5PropList::fromString(const QByteArray &str)
 int DIGESTMD5PropList::varCount(const QByteArray &var) const
 {
     int n = 0;
-    for (ConstIterator it = begin(); it != end(); ++it) {
-        if ((*it).var == var)
+    for (const auto &it : qAsConst(*this)) {
+        if (it.var == var)
             ++n;
     }
     return n;
diff --git a/src/xmpp/xmpp-core/protocol.cpp b/src/xmpp/xmpp-core/protocol.cpp
index 771bc991..e08509e7 100644
--- a/src/xmpp/xmpp-core/protocol.cpp
+++ b/src/xmpp/xmpp-core/protocol.cpp
@@ -1006,8 +1006,8 @@ bool CoreProtocol::dialbackStep(const QDomElement &e)
                     }
                 }
             } else if (e.tagName() == "verify") {
-                Jid     to(Jid(e.attribute("to")).domain());
-                Jid     from(Jid(e.attribute("from")).domain());
+                Jid                      to(Jid(e.attribute("to")).domain());
+                Jid                      from(Jid(e.attribute("from")).domain());
                 [[maybe_unused]] QString id = e.attribute("id");
                 if (isIncoming()) {
                     [[maybe_unused]] QString key = e.text();
@@ -1363,17 +1363,16 @@ bool CoreProtocol::normalStep(const QDomElement &e)
             if (f.sasl_supported) {
 #ifdef XMPP_TEST
                 QString s = "SASL mechs:";
-                for (QStringList::ConstIterator it = f.sasl_mechs.constBegin(); it != f.sasl_mechs.constEnd(); ++it)
-                    s += QString(" [%1]").arg((*it));
+                for (const auto &saslMech : qAsConst(f.sasl_mechs))
+                    s += QString(" [%1]").arg(saslMech);
                 TD::msg(s);
 #endif
             }
             if (f.compress_supported) {
 #ifdef XMPP_TEST
                 QString s = "Compression mechs:";
-                for (QStringList::ConstIterator it = f.compression_mechs.constBegin();
-                     it != f.compression_mechs.constEnd(); ++it)
-                    s += QString(" [%1]").arg((*it));
+                for (const auto &comprMech : qAsConst(f.compression_mechs))
+                    s += QString(" [%1]").arg(comprMech);
                 TD::msg(s);
 #endif
             }
diff --git a/src/xmpp/xmpp-core/stream.cpp b/src/xmpp/xmpp-core/stream.cpp
index ca9b47dd..2a73b964 100644
--- a/src/xmpp/xmpp-core/stream.cpp
+++ b/src/xmpp/xmpp-core/stream.cpp
@@ -1124,7 +1124,7 @@ bool ClientStream::handleNeed()
 #endif
 
         // ensure simplesasl provider is installed
-        bool found = false;
+        bool        found     = false;
         const auto &providers = QCA::providers();
         for (QCA::Provider *p : providers) {
             if (p->name() == "simplesasl") {
@@ -1160,7 +1160,7 @@ bool ClientStream::handleNeed()
             ml = prefOrdered.values() + unpreferred;
         }
 
-        QString saslProvider;
+        QString     saslProvider;
         const auto &meches = d->mechProviders.keys();
         for (const QString &mech : meches) {
             if (ml.contains(mech)) {
diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
index aa670726..118dc834 100644
--- a/src/xmpp/xmpp-im/client.cpp
+++ b/src/xmpp/xmpp-im/client.cpp
@@ -938,8 +938,8 @@ void Client::slotRosterRequestFinished()
 void Client::importRoster(const Roster &r)
 {
     emit beginImportRoster();
-    for (Roster::ConstIterator it = r.begin(); it != r.end(); ++it) {
-        importRosterItem(*it);
+    for (const auto &item : r) {
+        importRosterItem(item);
     }
     emit endImportRoster();
 }
diff --git a/src/xmpp/xmpp-im/filetransfer.cpp b/src/xmpp/xmpp-im/filetransfer.cpp
index 9299ae22..89118d9f 100644
--- a/src/xmpp/xmpp-im/filetransfer.cpp
+++ b/src/xmpp/xmpp-im/filetransfer.cpp
@@ -542,10 +542,10 @@ void JT_FT::request(const Jid &to, const QString &_id, const QString &fname, qlo
     QDomElement field = doc()->createElement("field");
     field.setAttribute("var", "stream-method");
     field.setAttribute("type", "list-single");
-    for (QStringList::ConstIterator it = streamTypes.begin(); it != streamTypes.end(); ++it) {
+    for (const auto &streamType : streamTypes) {
         QDomElement option = doc()->createElement("option");
         QDomElement value  = doc()->createElement("value");
-        value.appendChild(doc()->createTextNode(*it));
+        value.appendChild(doc()->createTextNode(streamType));
         option.appendChild(value);
         field.appendChild(option);
     }
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index c0806f5e..56fe1adf 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -1116,7 +1116,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
 
         void onLocalServerDiscovered()
         {
-            bool hasNewCandidates = false;
+            bool        hasNewCandidates = false;
             const auto &servers          = disco->takeServers();
             for (const auto &serv : servers) {
                 auto s5bserv = serv.staticCast<S5BServer>();
diff --git a/src/xmpp/xmpp-im/jingle-session.cpp b/src/xmpp/xmpp-im/jingle-session.cpp
index 0f7490e3..8953d560 100644
--- a/src/xmpp/xmpp-im/jingle-session.cpp
+++ b/src/xmpp/xmpp-im/jingle-session.cpp
@@ -832,7 +832,7 @@ namespace XMPP { namespace Jingle {
         bool handleIncomingTransportReplace(const QDomElement &jingleEl)
         {
             QVector<std::tuple<Application *, QSharedPointer<Transport>, QDomElement>> passed;
-            QList<QDomElement>                                                       toReject;
+            QList<QDomElement>                                                         toReject;
             QString contentTag(QStringLiteral("content"));
             bool    doTieBreak = false;
             for (QDomElement ce = jingleEl.firstChildElement(contentTag); !ce.isNull();
@@ -913,7 +913,7 @@ namespace XMPP { namespace Jingle {
 
         bool handleIncomingTransportAccept(const QDomElement &jingleEl)
         {
-            QString                                  contentTag(QStringLiteral("content"));
+            QString                                    contentTag(QStringLiteral("content"));
             QVector<QPair<Application *, QDomElement>> updates;
             for (QDomElement ce = jingleEl.firstChildElement(contentTag); !ce.isNull();
                  ce             = ce.nextSiblingElement(contentTag)) {
@@ -963,7 +963,7 @@ namespace XMPP { namespace Jingle {
 
         bool handleIncomingTransportInfo(const QDomElement &jingleEl)
         {
-            QString                                              contentTag(QStringLiteral("content"));
+            QString                                                contentTag(QStringLiteral("content"));
             QVector<QPair<QSharedPointer<Transport>, QDomElement>> updates;
             for (QDomElement ce = jingleEl.firstChildElement(contentTag); !ce.isNull();
                  ce             = ce.nextSiblingElement(contentTag)) {
diff --git a/src/xmpp/xmpp-im/s5b.cpp b/src/xmpp/xmpp-im/s5b.cpp
index 7a486965..84862363 100644
--- a/src/xmpp/xmpp-im/s5b.cpp
+++ b/src/xmpp/xmpp-im/s5b.cpp
@@ -58,8 +58,8 @@ static QString makeKey(const QString &sid, const Jid &requester, const Jid &targ
 
 static bool haveHost(const StreamHostList &list, const Jid &j)
 {
-    for (StreamHostList::ConstIterator it = list.begin(); it != list.end(); ++it) {
-        if ((*it).jid().compare(j))
+    for (const auto &streamHost : list) {
+        if (streamHost.jid().compare(j))
             return true;
     }
     return false;
@@ -965,8 +965,8 @@ bool S5BManager::targetShouldOfferProxy(Entry *e)
 
     // if target, don't offer any proxy if the requester already did
     const StreamHostList &hosts = e->c->d->req.hosts;
-    for (StreamHostList::ConstIterator it = hosts.begin(); it != hosts.end(); ++it) {
-        if ((*it).isProxy())
+    for (const auto &host : hosts) {
+        if (host.isProxy())
             return false;
     }
 
@@ -1747,8 +1747,8 @@ void S5BConnector::start(const Jid &self, const StreamHostList &hosts, const QSt
 #ifdef S5B_DEBUG
     qDebug("S5BConnector: starting [%p]!\n", this);
 #endif
-    for (StreamHostList::ConstIterator it = hosts.begin(); it != hosts.end(); ++it) {
-        Item *i = new Item(self, *it, key, udp);
+    for (const auto &host : hosts) {
+        Item *i = new Item(self, host, key, udp);
         connect(i, SIGNAL(result(bool)), SLOT(item_result(bool)));
         d->itemList.append(i);
         i->start();
@@ -1859,12 +1859,12 @@ void JT_S5B::request(const Jid &to, const QString &sid, const QString &dstaddr,
     }
     query.setAttribute("mode", udp ? "udp" : "tcp");
     iq.appendChild(query);
-    for (StreamHostList::ConstIterator it = hosts.begin(); it != hosts.end(); ++it) {
+    for (const auto &host : hosts) {
         QDomElement shost = doc()->createElement("streamhost");
-        shost.setAttribute("jid", (*it).jid().full());
-        shost.setAttribute("host", (*it).host());
-        shost.setAttribute("port", QString::number((*it).port()));
-        if ((*it).isProxy()) {
+        shost.setAttribute("jid", host.jid().full());
+        shost.setAttribute("host", host.host());
+        shost.setAttribute("port", QString::number(host.port()));
+        if (host.isProxy()) {
             QDomElement p = doc()->createElementNS("http://affinix.com/jabber/stream", "proxy");
             shost.appendChild(p);
         }
diff --git a/src/xmpp/xmpp-im/types.cpp b/src/xmpp/xmpp-im/types.cpp
index f9398cb3..e2834a30 100644
--- a/src/xmpp/xmpp-im/types.cpp
+++ b/src/xmpp/xmpp-im/types.cpp
@@ -2401,8 +2401,8 @@ bool RosterItem::isPush() const { return v_push; }
 
 bool RosterItem::inGroup(const QString &g) const
 {
-    for (QStringList::ConstIterator it = v_groups.begin(); it != v_groups.end(); ++it) {
-        if (*it == g)
+    for (const auto &vgroup : v_groups) {
+        if (vgroup == g)
             return true;
     }
     return false;
@@ -2449,8 +2449,8 @@ QDomElement RosterItem::toXml(QDomDocument *doc) const
     item.setAttribute("subscription", v_subscription.toString());
     if (!v_ask.isEmpty())
         item.setAttribute("ask", v_ask);
-    for (QStringList::ConstIterator it = v_groups.begin(); it != v_groups.end(); ++it)
-        item.appendChild(textTag(doc, "group", *it));
+    for (const auto &vgroup : v_groups)
+        item.appendChild(textTag(doc, "group", vgroup));
 
     return item;
 }
diff --git a/src/xmpp/xmpp-im/xmpp_task.cpp b/src/xmpp/xmpp-im/xmpp_task.cpp
index 709c2f55..d3a1f4c6 100644
--- a/src/xmpp/xmpp-im/xmpp_task.cpp
+++ b/src/xmpp/xmpp-im/xmpp_task.cpp
@@ -118,8 +118,7 @@ bool Task::take(const QDomElement &x)
 
     // pass along the xml
     Task *t;
-    for (QObjectList::ConstIterator it = p.begin(); it != p.end(); ++it) {
-        QObject *obj = *it;
+    for (QObject *obj : p) {
         if (!obj->inherits("XMPP::Task"))
             continue;
 
diff --git a/src/xmpp/xmpp-im/xmpp_tasks.cpp b/src/xmpp/xmpp-im/xmpp_tasks.cpp
index f54442f7..06247728 100644
--- a/src/xmpp/xmpp-im/xmpp_tasks.cpp
+++ b/src/xmpp/xmpp-im/xmpp_tasks.cpp
@@ -207,8 +207,7 @@ void JT_Register::setForm(const Form &form)
         query.appendChild(textTag(doc(), "key", form.key()));
 
     // fields
-    for (Form::ConstIterator it = form.begin(); it != form.end(); ++it) {
-        const FormField &f = *it;
+    for (const auto &f : form) {
         query.appendChild(textTag(doc(), f.realName(), f.value()));
     }
 }
@@ -372,8 +371,8 @@ void JT_Roster::set(const Jid &jid, const QString &name, const QStringList &grou
     item.setAttribute("jid", jid.full());
     if (!name.isEmpty())
         item.setAttribute("name", name);
-    for (QStringList::ConstIterator it = groups.begin(); it != groups.end(); ++it)
-        item.appendChild(textTag(doc(), "group", *it));
+    for (const auto &group : groups)
+        item.appendChild(textTag(doc(), "group", group));
     d->itemList += item;
 }
 
@@ -1083,8 +1082,7 @@ void JT_Search::set(const Form &form)
         query.appendChild(textTag(doc(), "key", form.key()));
 
     // fields
-    for (Form::ConstIterator it = form.begin(); it != form.end(); ++it) {
-        const FormField &f = *it;
+    for (const auto &f : form) {
         query.appendChild(textTag(doc(), f.realName(), f.value()));
     }
 }
@@ -1566,16 +1564,15 @@ void JT_DiscoPublish::set(const Jid &j, const DiscoList &list)
     // if ( !node.isEmpty() )
     //    query.setAttribute("node", node);
 
-    DiscoList::ConstIterator it = list.begin();
-    for (; it != list.end(); ++it) {
+    for (const auto &discoItem : list) {
         QDomElement w = doc()->createElement("item");
 
-        w.setAttribute("jid", (*it).jid().full());
-        if (!(*it).name().isEmpty())
-            w.setAttribute("name", (*it).name());
-        if (!(*it).node().isEmpty())
-            w.setAttribute("node", (*it).node());
-        w.setAttribute("action", DiscoItem::action2string((*it).action()));
+        w.setAttribute("jid", discoItem.jid().full());
+        if (!discoItem.name().isEmpty())
+            w.setAttribute("name", discoItem.name());
+        if (!discoItem.node().isEmpty())
+            w.setAttribute("node", discoItem.node());
+        w.setAttribute("action", DiscoItem::action2string(discoItem.action()));
 
         query.appendChild(w);
     }
diff --git a/src/xmpp/xmpp-im/xmpp_vcard.cpp b/src/xmpp/xmpp-im/xmpp_vcard.cpp
index 2c56e4af..0b2e288a 100644
--- a/src/xmpp/xmpp-im/xmpp_vcard.cpp
+++ b/src/xmpp/xmpp-im/xmpp_vcard.cpp
@@ -215,10 +215,8 @@ QDomElement VCard::toXml(QDomDocument *doc) const
         v.appendChild(textTag(doc, "BDAY", d->bday));
 
     if (!d->addressList.isEmpty()) {
-        AddressList::ConstIterator it = d->addressList.constBegin();
-        for (; it != d->addressList.end(); ++it) {
-            QDomElement    w = doc->createElement("ADR");
-            const Address &a = *it;
+        for (const auto &a : qAsConst(d->addressList)) {
+            QDomElement w = doc->createElement("ADR");
 
             if (a.home)
                 w.appendChild(emptyTag(doc, "HOME"));
@@ -255,10 +253,8 @@ QDomElement VCard::toXml(QDomDocument *doc) const
     }
 
     if (!d->labelList.isEmpty()) {
-        LabelList::ConstIterator it = d->labelList.constBegin();
-        for (; it != d->labelList.end(); ++it) {
-            QDomElement  w = doc->createElement("LABEL");
-            const Label &l = *it;
+        for (const auto &l : qAsConst(d->labelList)) {
+            QDomElement w = doc->createElement("LABEL");
 
             if (l.home)
                 w.appendChild(emptyTag(doc, "HOME"));
@@ -276,9 +272,8 @@ QDomElement VCard::toXml(QDomDocument *doc) const
                 w.appendChild(emptyTag(doc, "PREF"));
 
             if (!l.lines.isEmpty()) {
-                QStringList::ConstIterator it = l.lines.constBegin();
-                for (; it != l.lines.end(); ++it)
-                    w.appendChild(textTag(doc, "LINE", *it));
+                for (const auto &it : qAsConst(l.lines))
+                    w.appendChild(textTag(doc, "LINE", it));
             }
 
             v.appendChild(w);
@@ -286,10 +281,8 @@ QDomElement VCard::toXml(QDomDocument *doc) const
     }
 
     if (!d->phoneList.isEmpty()) {
-        PhoneList::ConstIterator it = d->phoneList.constBegin();
-        for (; it != d->phoneList.end(); ++it) {
-            QDomElement  w = doc->createElement("TEL");
-            const Phone &p = *it;
+        for (const auto &p : qAsConst(d->phoneList)) {
+            QDomElement w = doc->createElement("TEL");
 
             if (p.home)
                 w.appendChild(emptyTag(doc, "HOME"));
@@ -326,10 +319,8 @@ QDomElement VCard::toXml(QDomDocument *doc) const
     }
 
     if (!d->emailList.isEmpty()) {
-        EmailList::ConstIterator it = d->emailList.constBegin();
-        for (; it != d->emailList.end(); ++it) {
-            QDomElement  w = doc->createElement("EMAIL");
-            const Email &e = *it;
+        for (const auto &e : qAsConst(d->emailList)) {
+            QDomElement w = doc->createElement("EMAIL");
 
             if (e.pref)
                 w.appendChild(emptyTag(doc, "PREF"));
@@ -402,9 +393,8 @@ QDomElement VCard::toXml(QDomDocument *doc) const
             w.appendChild(textTag(doc, "ORGNAME", d->org.name));
 
         if (!d->org.unit.isEmpty()) {
-            QStringList::ConstIterator it = d->org.unit.constBegin();
-            for (; it != d->org.unit.end(); ++it)
-                w.appendChild(textTag(doc, "ORGUNIT", *it));
+            for (const auto &unit : qAsConst(d->org.unit))
+                w.appendChild(textTag(doc, "ORGUNIT", unit));
         }
 
         v.appendChild(w);
@@ -413,9 +403,8 @@ QDomElement VCard::toXml(QDomDocument *doc) const
     if (!d->categories.isEmpty()) {
         QDomElement w = doc->createElement("CATEGORIES");
 
-        QStringList::ConstIterator it = d->categories.constBegin();
-        for (; it != d->categories.end(); ++it)
-            w.appendChild(textTag(doc, "KEYWORD", *it));
+        for (const auto &c : qAsConst(d->categories))
+            w.appendChild(textTag(doc, "KEYWORD", c));
 
         v.appendChild(w);
     }
diff --git a/src/xmpp/xmpp-im/xmpp_xdata.cpp b/src/xmpp/xmpp-im/xmpp_xdata.cpp
index a5a18494..3ea65498 100644
--- a/src/xmpp/xmpp-im/xmpp_xdata.cpp
+++ b/src/xmpp/xmpp-im/xmpp_xdata.cpp
@@ -102,10 +102,9 @@ bool XData::Field::isValid() const
         return j.isValid();
     }
     if (_type == Field_JidMulti) {
-        QStringList::ConstIterator it       = _value.begin();
-        bool                       allValid = true;
-        for (; it != _value.end(); ++it) {
-            Jid j(*it);
+        bool allValid = true;
+        for (const auto &it : _value) {
+            Jid j(it);
             if (!j.isValid()) {
                 allValid = false;
                 break;
@@ -242,20 +241,19 @@ QDomElement XData::Field::toXml(QDomDocument *doc, bool submitForm) const
         f.appendChild(textTag(doc, "desc", _desc));
 
     if (!submitForm && !_options.isEmpty()) {
-        OptionList::ConstIterator it = _options.begin();
-        for (; it != _options.end(); ++it) {
+        for (const auto &it : _options) {
             QDomElement o = doc->createElement("option");
-            o.appendChild(textTag(doc, "value", (*it).value));
-            if (!(*it).label.isEmpty())
-                o.setAttribute("label", (*it).label);
+            o.appendChild(textTag(doc, "value", it.value));
+            if (!it.label.isEmpty())
+                o.setAttribute("label", it.label);
             f.appendChild(o);
         }
     }
 
     if (!_value.isEmpty()) {
-        QStringList::ConstIterator it = _value.begin();
-        for (; it != _value.end(); ++it)
-            f.appendChild(textTag(doc, "value", *it));
+
+        for (const auto &it : _value)
+            f.appendChild(textTag(doc, "value", it));
     }
 
     if (!_mediaElement.isEmpty()) {
@@ -266,8 +264,8 @@ QDomElement XData::Field::toXml(QDomDocument *doc, bool submitForm) const
             media.setAttribute("height", s.height());
         }
         for (const MediaUri &uri : _mediaElement) {
-            QDomElement uriEl = doc->createElement("uri");
-            QString     type  = uri.mimeType;
+            QDomElement        uriEl = doc->createElement("uri");
+            QString            type  = uri.mimeType;
             const QStringList &klist = uri.params.keys();
             for (const QString &k : klist) {
                 type += ";" + k + "=" + uri.params[k];
@@ -452,9 +450,7 @@ QDomElement XData::toXml(QDomDocument *doc, bool submitForm) const
         x.appendChild(textTag(doc, "instructions", d->instructions));
 
     if (!d->fields.isEmpty()) {
-        FieldList::ConstIterator it = d->fields.begin();
-        for (; it != d->fields.end(); ++it) {
-            Field f = *it;
+        for (const auto &f : qAsConst(d->fields)) {
             if (!(submitForm && f.var().isEmpty()))
                 x.appendChild(f.toXml(doc, submitForm));
         }
diff --git a/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp b/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
index 3b57d9fa..62d79817 100644
--- a/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
+++ b/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
@@ -347,8 +347,8 @@ QDomElement textTag(QDomDocument &doc, const QString &name, QRect &r)
 QDomElement stringListToXml(QDomDocument &doc, const QString &name, const QStringList &l)
 {
     QDomElement tag = doc.createElement(name);
-    for (QStringList::ConstIterator it = l.begin(); it != l.end(); ++it)
-        tag.appendChild(textTag(doc, "item", *it));
+    for (const auto &it : l)
+        tag.appendChild(textTag(doc, "item", it));
 
     return tag;
 }

From def63f9bd7c9c50dde22dbbd540e060ed47a53ab Mon Sep 17 00:00:00 2001
From: Sergei Ilinykh <rion4ik@gmail.com>
Date: Thu, 4 Nov 2021 10:38:31 +0300
Subject: [PATCH 342/383] Don't inc invalid iterator after erase

---
 src/irisnet/corelib/netnames.cpp | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/irisnet/corelib/netnames.cpp b/src/irisnet/corelib/netnames.cpp
index c5b70810..c606d0c1 100644
--- a/src/irisnet/corelib/netnames.cpp
+++ b/src/irisnet/corelib/netnames.cpp
@@ -525,7 +525,7 @@ XMPP::NameRecord WeightedNameRecordList::takeNext()
     /* Delete the entry from list, to prevent it from being tried multiple times */
     currentPriorityGroup->second.remove(it->weight(), *it);
     if (currentPriorityGroup->second.isEmpty()) {
-        priorityGroups.erase(currentPriorityGroup++);
+        currentPriorityGroup = priorityGroups.erase(currentPriorityGroup);
     }
 
     return result;
@@ -554,7 +554,8 @@ void WeightedNameRecordList::append(const XMPP::WeightedNameRecordList &list)
 void WeightedNameRecordList::append(const QList<XMPP::NameRecord> &list)
 {
     for (const XMPP::NameRecord &record : list)
-        append(record);
+        if (record.type() == XMPP::NameRecord::Srv)
+            append(record);
 
     /* Reset to beginning */
     currentPriorityGroup = priorityGroups.begin();
@@ -641,8 +642,8 @@ class ServiceLocalPublisher::Private {
 class NameManager : public QObject {
     Q_OBJECT
 public:
-    NameProvider *                      p_net, *p_local;
-    ServiceProvider *                   p_serv;
+    NameProvider                       *p_net, *p_local;
+    ServiceProvider                    *p_serv;
     QHash<int, NameResolver::Private *> res_instances;
     QHash<int, int>                     res_sub_instances;
 
@@ -687,7 +688,7 @@ class NameManager : public QObject {
         np->type      = qType;
         np->longLived = longLived;
         if (!p_net) {
-            NameProvider *           c    = 0;
+            NameProvider            *c    = 0;
             QList<IrisNetProvider *> list = irisNetProviders();
             for (int n = 0; n < list.count(); ++n) {
                 IrisNetProvider *p = list[n];
@@ -751,7 +752,7 @@ class NameManager : public QObject {
         QMutexLocker locker(nman_mutex());
 
         if (!p_serv) {
-            ServiceProvider *        c    = nullptr;
+            ServiceProvider         *c    = nullptr;
             QList<IrisNetProvider *> list = irisNetProviders();
             for (int n = 0; n < list.count(); ++n) {
                 IrisNetProvider *p = list[n];
@@ -786,7 +787,7 @@ class NameManager : public QObject {
         QMutexLocker locker(nman_mutex());
 
         if (!p_serv) {
-            ServiceProvider *        c    = nullptr;
+            ServiceProvider         *c    = nullptr;
             QList<IrisNetProvider *> list = irisNetProviders();
             for (int n = 0; n < list.count(); ++n) {
                 IrisNetProvider *p = list[n];
@@ -817,7 +818,7 @@ class NameManager : public QObject {
         QMutexLocker locker(nman_mutex());
 
         if (!p_serv) {
-            ServiceProvider *        c    = nullptr;
+            ServiceProvider         *c    = nullptr;
             QList<IrisNetProvider *> list = irisNetProviders();
             for (int n = 0; n < list.count(); ++n) {
                 IrisNetProvider *p = list[n];
@@ -852,7 +853,7 @@ private slots:
     void provider_resolve_resultsReady(int id, const QList<XMPP::NameRecord> &results)
     {
         NameResolver::Private *np = res_instances.value(id);
-        NameResolver *         q  = np->q; // resolve_cleanup deletes np
+        NameResolver          *q  = np->q; // resolve_cleanup deletes np
         if (!np->longLived)
             resolve_cleanup(np);
         emit q->resultsReady(results);
@@ -861,7 +862,7 @@ private slots:
     void provider_resolve_error(int id, XMPP::NameResolver::Error e)
     {
         NameResolver::Private *np = res_instances.value(id);
-        NameResolver *         q  = np->q; // resolve_cleanup deletes np
+        NameResolver          *q  = np->q; // resolve_cleanup deletes np
         resolve_cleanup(np);
         emit q->error(e);
     }
@@ -886,7 +887,7 @@ private slots:
     {
         // transfer to local
         if (!p_local) {
-            NameProvider *           c    = nullptr;
+            NameProvider            *c    = nullptr;
             QList<IrisNetProvider *> list = irisNetProviders();
             for (int n = 0; n < list.count(); ++n) {
                 IrisNetProvider *p = list[n];
@@ -1344,8 +1345,8 @@ void ServiceResolver::try_next_srv()
 #endif
 
     /* if there are still hosts we did not try */
-    if (!d->srvList.isEmpty()) {
-        XMPP::NameRecord record(d->srvList.takeNext());
+    XMPP::NameRecord record = d->srvList.takeNext();
+    if (!record.isNull()) {
         /* lookup host by name and specify port for later use */
         start(record.name(), quint16(record.port()));
     } else {

From d5e9c62d7d4d339221849f060b0e8feaa03c493a Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Fri, 5 Nov 2021 16:44:06 +0200
Subject: [PATCH 343/383] Updated CMake files. Added debug-related options

---
 CMakeLists.txt                        |  6 +++-
 cmake/modules/debug-definitions.cmake | 41 +++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 cmake/modules/debug-definitions.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 12acf3b0..206bce49 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,7 +46,7 @@ set( CMAKE_MODULE_PATH
     )
 
 set( DEFAULT_BUNDLED_QCA OFF )
-if (APPLE OR MSVC)
+if (APPLE OR (MSVC OR USE_MXE))
     set( DEFAULT_BUNDLED_QCA ON )
 endif()
 
@@ -61,6 +61,10 @@ include_directories(include/iris)
 
 set(CMAKE_AUTOMOC ON)
 
+if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug" OR ("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo"))
+    include(cmake/modules/debug-definitions.cmake)
+endif()
+
 find_package(Qt5 COMPONENTS Core Gui Xml Network REQUIRED)
 
 if(Qt5Core_FOUND)
diff --git a/cmake/modules/debug-definitions.cmake b/cmake/modules/debug-definitions.cmake
new file mode 100644
index 00000000..491ec711
--- /dev/null
+++ b/cmake/modules/debug-definitions.cmake
@@ -0,0 +1,41 @@
+cmake_minimum_required(VERSION 3.2.0)
+option(IRIS_NETNAMES_DEBUG "Add -DNETNAMES_DEBUG definition" OFF)
+option(IRIS_PSI_ENABLE_SCTP_DEBUG "Add -DPSI_ENABLE_SCTP_DEBUG definition" OFF)
+option(IRIS_ICE_DEBUG "Add -DICE_DEBUG definition" OFF)
+option(IRIS_PROX_DEBUG "Add -DPROX_DEBUG definition" OFF)
+option(IRIS_BS_DEBUG "Add -DBS_DEBUG definition" OFF)
+option(IRIS_S5B_DEBUG "Add -DS5B_DEBUG definition" OFF)
+option(IRIS_IBB_DEBUG "Add -DIBB_DEBUG definition" OFF)
+option(IRIS_SM_DEBUG "Add -DIRIS_SM_DEBUG definition" OFF)
+option(IRIS_XMPP_DEBUG "Add -DXMPP_DEBUG definition" OFF)
+option(IRIS_TESTDEBUG_H "Add -DTESTDEBUG_H definition" OFF)
+if(IRIS_NETNAMES_DEBUG)
+    add_definitions(-DNETNAMES_DEBUG)
+endif()
+if(IRIS_PSI_ENABLE_SCTP_DEBUG)
+    add_definitions(-DPSI_ENABLE_SCTP_DEBUG)
+endif()
+if(IRIS_ICE_DEBUG)
+    add_definitions(-DICE_DEBUG)
+endif()
+if(IRIS_PROX_DEBUG)
+    add_definitions(-DPROX_DEBUG)
+endif()
+if(IRIS_BS_DEBUG)
+    add_definitions(-DBS_DEBUG)
+endif()
+if(IRIS_S5B_DEBUG)
+    add_definitions(-DS5B_DEBUG)
+endif()
+if(IRIS_IBB_DEBUG)
+    add_definitions(-DIBB_DEBUG)
+endif()
+if(IRIS_SM_DEBUG)
+    add_definitions(-DIRIS_SM_DEBUG)
+endif()
+if(IRIS_XMPP_DEBUG)
+    add_definitions(-DXMPP_DEBUG)
+endif()
+if(IRIS_TESTDEBUG_H)
+    add_definitions(-DTESTDEBUG_H)
+endif()

From 3323264f97b33f7b2c5226f92743cbb54d33e296 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sat, 6 Nov 2021 22:46:44 +0300
Subject: [PATCH 344/383] Fixed a few compilation warnings

---
 src/xmpp/blake2/blake2qt.cpp                   | 2 +-
 src/xmpp/xmpp-im/jingle-ice.cpp                | 2 +-
 src/xmpp/xmpp-im/jingle-sctp-association_p.cpp | 4 ++--
 src/xmpp/xmpp-im/s5b.h                         | 2 +-
 src/xmpp/xmpp-im/xmpp_hash.cpp                 | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/xmpp/blake2/blake2qt.cpp b/src/xmpp/blake2/blake2qt.cpp
index f2509fd5..4173e3f0 100644
--- a/src/xmpp/blake2/blake2qt.cpp
+++ b/src/xmpp/blake2/blake2qt.cpp
@@ -58,7 +58,7 @@ bool Blake2Hash::addData(QIODevice *dev)
 QByteArray Blake2Hash::final()
 {
     QByteArray ret;
-    ret.resize(d->state.outlen);
+    ret.resize(int(d->state.outlen));
     if (blake2b_final(&d->state, ret.data(), size_t(ret.size())) == 0)
         return ret;
     return QByteArray();
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index ef6b33d1..ecf5ed50 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -248,7 +248,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
         static void resolve(QObject *parent, ResolveList list, std::function<void()> &&callback)
         {
             auto resolver      = new Resolver(parent); // will be deleted when all finished. see onOneFinished
-            resolver->counter  = list.size();
+            resolver->counter  = int(list.size());
             resolver->callback = callback;
             for (auto &item : list) {
                 // FIXME hosts may dup in the list. needs optimization
diff --git a/src/xmpp/xmpp-im/jingle-sctp-association_p.cpp b/src/xmpp/xmpp-im/jingle-sctp-association_p.cpp
index 0bd62226..cba6c7f1 100644
--- a/src/xmpp/xmpp-im/jingle-sctp-association_p.cpp
+++ b/src/xmpp/xmpp-im/jingle-sctp-association_p.cpp
@@ -78,7 +78,7 @@ namespace XMPP { namespace Jingle { namespace SCTP {
     void AssociationPrivate::OnSctpAssociationSendData(RTC::SctpAssociation *, const uint8_t *data, size_t len)
     {
         // qDebug("jignle-sctp: on outgoing data");
-        QByteArray bytes((char *)data, len);
+        QByteArray bytes((char *)data, int(len));
         QMetaObject::invokeMethod(this, "onOutgoingData", Q_ARG(QByteArray, bytes));
     }
 
@@ -86,7 +86,7 @@ namespace XMPP { namespace Jingle { namespace SCTP {
                                                               const uint8_t *msg, size_t len)
     {
         // qDebug("jignle-sctp: on incoming data");
-        QByteArray bytes((char *)msg, len);
+        QByteArray bytes((char *)msg, int(len));
         QMetaObject::invokeMethod(this, "onIncomingData", Q_ARG(QByteArray, bytes), Q_ARG(quint16, streamId),
                                   Q_ARG(quint32, ppid));
     }
diff --git a/src/xmpp/xmpp-im/s5b.h b/src/xmpp/xmpp-im/s5b.h
index a394bf7e..18e875d8 100644
--- a/src/xmpp/xmpp-im/s5b.h
+++ b/src/xmpp/xmpp-im/s5b.h
@@ -253,7 +253,7 @@ class S5BServer : public TcpPortServer {
     void incomingUdp(bool isInit, const QHostAddress &addr, int sourcePort, const QString &key, const QByteArray &data);
 
 private:
-    class Private;
+    struct Private;
     QScopedPointer<Private> d;
 };
 
diff --git a/src/xmpp/xmpp-im/xmpp_hash.cpp b/src/xmpp/xmpp-im/xmpp_hash.cpp
index 3e58a87c..92117195 100644
--- a/src/xmpp/xmpp-im/xmpp_hash.cpp
+++ b/src/xmpp/xmpp-im/xmpp_hash.cpp
@@ -275,13 +275,13 @@ Hash Hash::fastestHash(const Features &features)
     std::array  qcaAlgos = { "blake2b_512", "blake2b_256", "sha1", "sha512", "sha256", "sha3_256", "sha3_512" };
     std::array  qcaMap   = { Blake2b512, Blake2b256, Sha1, Sha512, Sha256, Sha3_256, Sha3_512 };
     QStringList priorityFeatures;
-    priorityFeatures.reserve(qcaAlgos.size());
+    priorityFeatures.reserve(int(qcaAlgos.size()));
     for (auto t : qcaMap) {
         priorityFeatures.append(QString(QLatin1String("urn:xmpp:hash-function-text-names:"))
                                 + QLatin1String(hashTypes[int(t)].text));
         // REVIEW modify hashTypes with priority info instead?
     }
-    for (std::size_t i = 0; i < qcaAlgos.size(); i++) {
+    for (int i = 0; i < qcaAlgos.size(); i++) {
         if (QCA::isSupported(qcaAlgos[i]) && features.test(priorityFeatures[i])) {
             return Hash(qcaMap[i]);
         }

From fe50669fa8fdd0393f18b70d3573811c0d404c48 Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Sun, 7 Nov 2021 20:01:39 +0300
Subject: [PATCH 345/383] Fixed crash on out sync arrayas of hashes

---
 src/xmpp/xmpp-im/xmpp_hash.cpp | 63 ++++++++++++++++------------------
 src/xmpp/xmpp-im/xmpp_hash.h   |  1 +
 2 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/src/xmpp/xmpp-im/xmpp_hash.cpp b/src/xmpp/xmpp-im/xmpp_hash.cpp
index 92117195..b44f2ef0 100644
--- a/src/xmpp/xmpp-im/xmpp_hash.cpp
+++ b/src/xmpp/xmpp-im/xmpp_hash.cpp
@@ -36,17 +36,17 @@ namespace XMPP {
 //----------------------------------------------------------------------------
 static const char *const sha1_synonims[] = { "sha1", nullptr };
 // NOTE: keep this in sync with enum. same order!
-static const struct {
-    const char *       text;
+struct HashDesc {
+    const char        *text;
     Hash::Type         hashType;
     const char *const *synonims = nullptr;
-} hashTypes[] = { { "sha-1", Hash::Type::Sha1, sha1_synonims },
-                  { "sha-256", Hash::Type::Sha256 },
-                  { "sha-512", Hash::Type::Sha512 },
-                  { "sha3-256", Hash::Type::Sha3_256 },
-                  { "sha3-512", Hash::Type::Sha3_512 },
-                  { "blake2b-256", Hash::Type::Blake2b256 },
-                  { "blake2b-512", Hash::Type::Blake2b512 } };
+};
+static const std::array hashTypes {
+    HashDesc { "unknown", Hash::Type::Unknown },        HashDesc { "sha-1", Hash::Type::Sha1, sha1_synonims },
+    HashDesc { "sha-256", Hash::Type::Sha256 },         HashDesc { "sha-512", Hash::Type::Sha512 },
+    HashDesc { "sha3-256", Hash::Type::Sha3_256 },      HashDesc { "sha3-512", Hash::Type::Sha3_512 },
+    HashDesc { "blake2b-256", Hash::Type::Blake2b256 }, HashDesc { "blake2b-512", Hash::Type::Blake2b512 }
+};
 
 using HashVariant = std::variant<std::nullptr_t, QCryptographicHash, QCA::Hash, Blake2Hash>;
 HashVariant findHasher(Hash::Type hashType)
@@ -122,24 +122,24 @@ Hash::Hash(const QDomElement &el)
 
 QString Hash::stringType() const
 {
-    if (!v_type)
-        return QString();
-    static_assert(LastType == (sizeof(hashTypes) / sizeof(hashTypes[0])), "hashType and enum are not in sync");
-    return QLatin1String(hashTypes[int(v_type) - 1].text);
+    if (!v_type || int(v_type) > LastType)
+        return QString(); // must be empty. other code relies on it
+    static_assert(LastType + 1 == hashTypes.size(), "hashType and enum are not in sync");
+    return QLatin1String(hashTypes[int(v_type)].text);
 }
 
 Hash::Type Hash::parseType(const QStringRef &algo)
 {
     if (!algo.isEmpty()) {
-        for (size_t n = 0; n < sizeof(hashTypes) / sizeof(hashTypes[0]); ++n) {
-            if (algo == QLatin1String(hashTypes[n].text)) {
-                return hashTypes[n].hashType;
+        for (auto const &hash : hashTypes) {
+            if (algo == QLatin1String(hash.text)) {
+                return hash.hashType;
             }
-            if (hashTypes[n].synonims) {
-                auto cur = hashTypes[n].synonims;
+            if (hash.synonims) {
+                auto cur = hash.synonims;
                 while (*cur) {
                     if (algo == QLatin1String(*cur)) {
-                        return hashTypes[n].hashType;
+                        return hash.hashType;
                     }
                     cur++;
                 }
@@ -205,17 +205,14 @@ bool Hash::compute(QIODevice *dev)
 
 QDomElement Hash::toXml(QDomDocument *doc) const
 {
-    if (v_type != Type::Unknown) {
-        for (size_t n = 0; n < sizeof(hashTypes) / sizeof(hashTypes[0]); ++n) {
-            if (v_type == hashTypes[n].hashType) {
-                auto el = doc->createElementNS(HASH_NS, QLatin1String(v_data.isEmpty() ? "hash-used" : "hash"));
-                el.setAttribute(QLatin1String("algo"), QLatin1String(hashTypes[n].text));
-                if (!v_data.isEmpty()) {
-                    XMLHelper::setTagText(el, v_data.toBase64());
-                }
-                return el;
-            }
+    auto stype = stringType();
+    if (!stype.isEmpty()) {
+        auto el = doc->createElementNS(HASH_NS, QLatin1String(v_data.isEmpty() ? "hash-used" : "hash"));
+        el.setAttribute(QLatin1String("algo"), stype);
+        if (!v_data.isEmpty()) {
+            XMLHelper::setTagText(el, v_data.toBase64());
         }
+        return el;
     }
     return QDomElement();
 }
@@ -223,8 +220,8 @@ QDomElement Hash::toXml(QDomDocument *doc) const
 void Hash::populateFeatures(Features &features)
 {
     features.addFeature("urn:xmpp:hashes:2");
-    for (size_t n = 0; n < sizeof(hashTypes) / sizeof(hashTypes[0]); ++n) {
-        features.addFeature(QLatin1String("urn:xmpp:hash-function-text-names:") + QLatin1String(hashTypes[n].text));
+    for (auto const &hash : hashTypes) {
+        features.addFeature(QLatin1String("urn:xmpp:hash-function-text-names:") + QLatin1String(hash.text));
     }
 }
 
@@ -307,7 +304,7 @@ bool StreamHash::addData(const QByteArray &data)
 
     bool ret = true;
     std::visit(
-        [&data, &ret, this](auto &&arg) {
+        [&data, &ret](auto &&arg) {
             using T = std::decay_t<decltype(arg)>;
             if constexpr (std::is_same_v<T, QCA::Hash>) {
                 arg.update(data);
@@ -325,7 +322,7 @@ bool StreamHash::addData(const QByteArray &data)
 Hash StreamHash::final()
 {
     auto data = std::visit(
-        [this](auto &&arg) {
+        [](auto &&arg) {
             using T = std::decay_t<decltype(arg)>;
             if constexpr (std::is_same_v<T, QCA::Hash>) {
                 return arg.final().toByteArray();
diff --git a/src/xmpp/xmpp-im/xmpp_hash.h b/src/xmpp/xmpp-im/xmpp_hash.h
index f8aa0267..50fc4da4 100644
--- a/src/xmpp/xmpp-im/xmpp_hash.h
+++ b/src/xmpp/xmpp-im/xmpp_hash.h
@@ -36,6 +36,7 @@ class Features;
 
 class Hash {
 public:
+    // NB: keep this in sync with Hash::fastestHash() and with hashTypes in cpp the file!
     enum Type {     // XEP-0300 Version 0.5.3 (2018-02-14)
         Unknown,    // not standard, just a default
         Sha1,       // SHOULD NOT

From d75e8b63a76c8d5271a6fea38a796af6e19bad7e Mon Sep 17 00:00:00 2001
From: Sergei Ilinykh <rion4ik@gmail.com>
Date: Sun, 7 Nov 2021 22:24:54 +0300
Subject: [PATCH 346/383] Avoid having null transport. Rather stop it when we
 don't need it

---
 src/xmpp/xmpp-im/jingle-application.cpp | 7 ++++++-
 src/xmpp/xmpp-im/jingle-ft.cpp          | 8 ++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-application.cpp b/src/xmpp/xmpp-im/jingle-application.cpp
index 97e8990c..06813810 100644
--- a/src/xmpp/xmpp-im/jingle-application.cpp
+++ b/src/xmpp/xmpp-im/jingle-application.cpp
@@ -306,6 +306,8 @@ namespace XMPP { namespace Jingle {
         new ConnectionWaiter(
             features, std::move(ready),
             [this]() {
+                qDebug("Application::expectSingleConnection: stopping failed %s transport",
+                       qPrintable(_transport->pad()->ns()));
                 _transport->stop();
                 selectNextTransport();
             },
@@ -318,8 +320,9 @@ namespace XMPP { namespace Jingle {
     {
         if (!_transportSelector->hasMoreTransports()) {
             if (_transport) {
+                qDebug("Application::selectNextTransport: stopping %s transport", qPrintable(_transport->pad()->ns()));
                 _transport->disconnect(this);
-                _transport.reset();
+                _transport->stop();
             }
             _state             = (isRemote() || _state > State::ApprovedToSend) ? State::Finishing : State::Finished;
             _terminationReason = Reason(Reason::FailedTransport);
@@ -396,6 +399,8 @@ namespace XMPP { namespace Jingle {
                     _transportReplaceReason = reason;
                 }
             }
+            qDebug("Application::setTransport: resetting %s transport in favor of %s",
+                   qPrintable(_transport->pad()->ns()), qPrintable(transport->pad()->ns()));
             _transport->disconnect(this);
             _transport.reset();
         }
diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index e33b7493..5ae76f51 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -143,12 +143,12 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
         XMPP::Stanza::Error lastError;
         Reason              lastReason;
         Connection::Ptr     connection;
-        QIODevice *         device    = nullptr;
+        QIODevice          *device    = nullptr;
         qint64              bytesLeft = 0;
         QList<Hash>         outgoingChecksum;
         QList<Hash>         incomingChecksum;
-        QTimer *            finalizeTimer = nullptr;
-        FileHasher *        hasher        = nullptr;
+        QTimer             *finalizeTimer = nullptr;
+        FileHasher         *hasher        = nullptr;
 
         void setState(State s)
         {
@@ -642,7 +642,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
         _terminationReason = Reason(cond, comment);
         if (_transport) {
             _transport->disconnect(this);
-            _transport.reset();
+            _transport->stop();
         }
 
         if (_creator == _pad->session()->role() && _state <= State::ApprovedToSend) {

From 2df988b010e21e2958e94509aed97997ae6424f9 Mon Sep 17 00:00:00 2001
From: Neustradamus <104737+Neustradamus@users.noreply.github.com>
Date: Sun, 14 Nov 2021 10:18:26 +0100
Subject: [PATCH 347/383] JEP -> XEP (#67)

JEP -> XEP
---
 README.md                          | 2 +-
 src/xmpp/xmpp-core/xmpp_stanza.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 2fc3ed76..81cc3d5e 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ Iris depends on Qt and QCA.
   * Roster management
   * Subscriptions
 
-* JEP extensions:
+* XEP extensions:
   * Version/Time requests
   * Service Discovery (disco, browse, and older ‘agents’ modes)
   * Account registration
diff --git a/src/xmpp/xmpp-core/xmpp_stanza.cpp b/src/xmpp/xmpp-core/xmpp_stanza.cpp
index 70dd947c..5aeb983f 100644
--- a/src/xmpp/xmpp-core/xmpp_stanza.cpp
+++ b/src/xmpp/xmpp-core/xmpp_stanza.cpp
@@ -55,7 +55,7 @@ using namespace XMPP;
     both type/condition and code.
     Error text in output XML is always presented in XMPP-style only.
 
-    All functions will always try to guess missing information based on mappings defined in the JEP.
+    All functions will always try to guess missing information based on mappings defined in the XEP.
 */
 
 /**

From 880fd4f7057af1c10a81efa122be1344666cb107 Mon Sep 17 00:00:00 2001
From: Neustradamus <104737+Neustradamus@users.noreply.github.com>
Date: Sun, 14 Nov 2021 16:09:34 +0100
Subject: [PATCH 348/383] vCard (#68)

vCard harmonization
---
 README.md                          | 2 +-
 src/xmpp/xmpp-im/xmpp_features.cpp | 2 +-
 src/xmpp/xmpp-im/xmpp_status.h     | 2 +-
 src/xmpp/xmpp-im/xmpp_tasks.cpp    | 4 ++--
 src/xmpp/xmpp-im/xmpp_vcard.cpp    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 81cc3d5e..fd19227e 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ Iris depends on Qt and QCA.
   * Account registration
   * Password changing
   * Agent/Transport registration
-  * VCards
+  * vCards
   * Basic Groupchat
   * OpenPGP capable
   * S5B Direct Connections
diff --git a/src/xmpp/xmpp-im/xmpp_features.cpp b/src/xmpp/xmpp-im/xmpp_features.cpp
index 1731a754..a165ffac 100644
--- a/src/xmpp/xmpp-im/xmpp_features.cpp
+++ b/src/xmpp/xmpp-im/xmpp_features.cpp
@@ -230,7 +230,7 @@ class Features::FeatureName : public QObject {
         id2s[FID_Groupchat]      = tr("Groupchat");
         id2s[FID_Gateway]        = tr("Gateway");
         id2s[FID_Disco]          = tr("Service Discovery");
-        id2s[FID_VCard]          = tr("VCard");
+        id2s[FID_VCard]          = tr("vCard");
         id2s[FID_AHCommand]      = tr("Execute command");
         id2s[FID_QueryVersion]   = tr("Query version");
         id2s[FID_MessageCarbons] = tr("Message Carbons");
diff --git a/src/xmpp/xmpp-im/xmpp_status.h b/src/xmpp/xmpp-im/xmpp_status.h
index 3208f425..2cc8ada3 100644
--- a/src/xmpp/xmpp-im/xmpp_status.h
+++ b/src/xmpp/xmpp-im/xmpp_status.h
@@ -131,7 +131,7 @@ class Status {
     void setXSigned(const QString &);
     void setSongTitle(const QString &);
 
-    // XEP-153: VCard-based Avatars
+    // XEP-0153: vCard-Based Avatars
     const QByteArray &photoHash() const;
     void              setPhotoHash(const QByteArray &);
     bool              hasPhotoHash() const;
diff --git a/src/xmpp/xmpp-im/xmpp_tasks.cpp b/src/xmpp/xmpp-im/xmpp_tasks.cpp
index 06247728..4e7b5494 100644
--- a/src/xmpp/xmpp-im/xmpp_tasks.cpp
+++ b/src/xmpp/xmpp-im/xmpp_tasks.cpp
@@ -985,7 +985,7 @@ void JT_VCard::set(const VCard &card)
     d->iq.appendChild(card.toXml(doc()));
 }
 
-// isTarget is when we setting target's vcard. for example in case of muc own vcard
+// isTarget is when we setting target's vCard. for example in case of muc own vCard
 void JT_VCard::set(const Jid &j, const VCard &card, bool isTarget)
 {
     type     = 1;
@@ -1021,7 +1021,7 @@ bool JT_VCard::take(const QDomElement &x)
                 }
             }
 
-            setError(ErrDisc + 1, tr("No VCard available"));
+            setError(ErrDisc + 1, tr("No vCard available"));
             return true;
         } else {
             setSuccess();
diff --git a/src/xmpp/xmpp-im/xmpp_vcard.cpp b/src/xmpp/xmpp-im/xmpp_vcard.cpp
index 0b2e288a..c72c06c8 100644
--- a/src/xmpp/xmpp-im/xmpp_vcard.cpp
+++ b/src/xmpp/xmpp-im/xmpp_vcard.cpp
@@ -33,7 +33,7 @@
 using namespace XMLHelper;
 
 //----------------------------------------------------------------------------
-// VCard
+// vCard
 //----------------------------------------------------------------------------
 QString openedImage2type(QIODevice *dev)
 {

From dc4010c1fe0fbf71b73ac8a3207c48f9975c1bfe Mon Sep 17 00:00:00 2001
From: Sergei Ilinykh <rion4ik@gmail.com>
Date: Tue, 14 Dec 2021 17:16:05 +0300
Subject: [PATCH 349/383] Added an operator to convert AdvancedConnector::Proxy
 to QNetworkProxy

---
 src/xmpp/xmpp-core/connector.cpp    |  6 ++++++
 src/xmpp/xmpp-core/xmpp.h           |  2 ++
 src/xmpp/xmpp-im/httpfileupload.cpp | 19 +++++++------------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/xmpp/xmpp-core/connector.cpp b/src/xmpp/xmpp-core/connector.cpp
index e3461826..eba9df53 100644
--- a/src/xmpp/xmpp-core/connector.cpp
+++ b/src/xmpp/xmpp-core/connector.cpp
@@ -137,6 +137,12 @@ void AdvancedConnector::Proxy::setUserPass(const QString &user, const QString &p
 
 void AdvancedConnector::Proxy::setPollInterval(int secs) { v_poll = secs; }
 
+AdvancedConnector::Proxy::operator QNetworkProxy()
+{
+    return QNetworkProxy(t == Socks ? QNetworkProxy::Socks5Proxy : QNetworkProxy::HttpProxy, v_host, v_port, v_user,
+                         v_pass);
+}
+
 //----------------------------------------------------------------------------
 // AdvancedConnector
 //----------------------------------------------------------------------------
diff --git a/src/xmpp/xmpp-core/xmpp.h b/src/xmpp/xmpp-core/xmpp.h
index a904ca82..8293ba99 100644
--- a/src/xmpp/xmpp-core/xmpp.h
+++ b/src/xmpp/xmpp-core/xmpp.h
@@ -123,6 +123,8 @@ class AdvancedConnector : public Connector {
         void setUserPass(const QString &user, const QString &pass);
         void setPollInterval(int secs);
 
+        operator QNetworkProxy();
+
     private:
         int     t = None;
         QUrl    v_url;
diff --git a/src/xmpp/xmpp-im/httpfileupload.cpp b/src/xmpp/xmpp-im/httpfileupload.cpp
index cf0ffe6d..ab8f06f6 100644
--- a/src/xmpp/xmpp-im/httpfileupload.cpp
+++ b/src/xmpp/xmpp-im/httpfileupload.cpp
@@ -41,8 +41,8 @@ static QLatin1String xmlns_v0_3_1("urn:xmpp:http:upload:0");
 class HttpFileUpload::Private {
 public:
     HttpFileUpload::State           state        = State::None;
-    XMPP::Client *                  client       = nullptr;
-    QIODevice *                     sourceDevice = nullptr;
+    XMPP::Client                   *client       = nullptr;
+    QIODevice                      *sourceDevice = nullptr;
     QPointer<QNetworkAccessManager> qnam         = nullptr;
     quint64                         fileSize     = 0;
     QString                         fileName;
@@ -369,7 +369,7 @@ bool JT_HTTPFileUpload::take(const QDomElement &e)
     bool                 correct_xmlns = false;
     QString              getUrl, putUrl;
     XEP0363::HttpHeaders headers;
-    const QDomElement &  slot = e.firstChildElement("slot");
+    const QDomElement   &slot = e.firstChildElement("slot");
     if (!slot.isNull()) {
         const QDomElement &get = slot.firstChildElement("get");
         const QDomElement &put = slot.firstChildElement("put");
@@ -419,11 +419,10 @@ bool JT_HTTPFileUpload::take(const QDomElement &e)
 
 class HttpFileUploadManager::Private {
 public:
-    Client *                            client = nullptr;
-    QPointer<QNetworkAccessManager>     qnam;
+    Client                             *client = nullptr;
+    QPointer<QNetworkAccessManager>     externalQnam;
     int                                 discoStatus = 0;
     QList<HttpFileUpload::HttpHost>     discoHosts;
-    bool                                externalQnam = false;
     std::list<HttpFileUpload::HttpHost> hosts;
 };
 
@@ -433,11 +432,7 @@ HttpFileUploadManager::~HttpFileUploadManager() { delete d; }
 
 int HttpFileUploadManager::discoveryStatus() const { return d->discoStatus; }
 
-void HttpFileUploadManager::setNetworkAccessManager(QNetworkAccessManager *qnam)
-{
-    d->externalQnam = true;
-    d->qnam         = qnam;
-}
+void HttpFileUploadManager::setNetworkAccessManager(QNetworkAccessManager *qnam) { d->externalQnam = qnam; }
 
 HttpFileUpload *HttpFileUploadManager::upload(const QString &srcFilename, const QString &dstFilename,
                                               const QString &mType)
@@ -454,7 +449,7 @@ HttpFileUpload *HttpFileUploadManager::upload(QIODevice *source, quint64 fsize,
                                               const QString &mType)
 {
     auto                   hfu  = new HttpFileUpload(d->client, source, fsize, dstFilename, mType);
-    QNetworkAccessManager *qnam = d->externalQnam ? d->qnam.data() : d->client->networkAccessManager();
+    QNetworkAccessManager *qnam = d->externalQnam ? d->externalQnam.data() : d->client->networkAccessManager();
     hfu->setNetworkAccessManager(qnam);
     QMetaObject::invokeMethod(hfu, "start", Qt::QueuedConnection);
     return hfu;

From 4012d807a07e994cb426c5e17b6d69bffd137aa1 Mon Sep 17 00:00:00 2001
From: Sergei Ilinykh <sergei.ilinykh@castlabs.com>
Date: Sun, 16 Jan 2022 00:36:52 +0300
Subject: [PATCH 350/383] encryption caps ideas

---
 src/xmpp/xmpp-im/xmpp_encryption.cpp | 5 +++--
 src/xmpp/xmpp-im/xmpp_encryption.h   | 7 +++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/xmpp/xmpp-im/xmpp_encryption.cpp b/src/xmpp/xmpp-im/xmpp_encryption.cpp
index 565f8539..02e84e47 100644
--- a/src/xmpp/xmpp-im/xmpp_encryption.cpp
+++ b/src/xmpp/xmpp-im/xmpp_encryption.cpp
@@ -31,11 +31,12 @@ void EncryptionManager::registerMethod(EncryptionMethod *algo) { d->methods.appe
 
 void EncryptionManager::unregisterMethod(EncryptionMethod *algo) { d->methods.removeOne(algo); }
 
-EncryptionManager::MethodsMap EncryptionManager::methods() const
+EncryptionManager::MethodsMap EncryptionManager::methods(EncryptionMethod::Capabilities caps) const
 {
     MethodsMap ret;
     for (auto const &m : qAsConst(d->methods)) {
-        ret[m->id()] = m->name();
+        if (caps & m->capabilities())
+            ret[m->id()] = m->name();
     }
     return ret;
 }
diff --git a/src/xmpp/xmpp-im/xmpp_encryption.h b/src/xmpp/xmpp-im/xmpp_encryption.h
index f6cb35fa..04351745 100644
--- a/src/xmpp/xmpp-im/xmpp_encryption.h
+++ b/src/xmpp/xmpp-im/xmpp_encryption.h
@@ -59,12 +59,15 @@ class EncryptionMethod : public QObject {
 class EncryptionManager : public QObject {
     Q_OBJECT
 public:
+    using MethodId   = QString;
+    using MethodName = QString;
+
     ~EncryptionManager();
-    using MethodsMap = std::map<QString, QString>; // id to title
+    using MethodsMap = std::map<MethodId, MethodName>;
 
     void       registerMethod(EncryptionMethod *algo);
     void       unregisterMethod(EncryptionMethod *algo);
-    MethodsMap methods() const;
+    MethodsMap methods(EncryptionMethod::Capabilities caps = EncryptionMethod::Capabilities(0xff)) const;
 
 private:
     class Private;

From c937a244d49605086078fa64bc88fd3c0d3d3535 Mon Sep 17 00:00:00 2001
From: Sergei Ilinykh <sergei.ilinykh@castlabs.com>
Date: Sun, 16 Jan 2022 00:39:37 +0300
Subject: [PATCH 351/383] Use TLS hostname check on host resolved from SRV.

It's more secure and allows to cover some tricky cases when JID domain
and actual connection hostname have nothing in common
---
 src/irisnet/corelib/irisnetplugin.h         | 12 +++---
 src/irisnet/corelib/netinterface_qtname.cpp | 16 ++++----
 src/irisnet/corelib/netnames.cpp            | 44 ++++++++++-----------
 src/irisnet/corelib/netnames.h              |  9 +++--
 src/irisnet/noncore/cutestuff/bsocket.cpp   | 23 ++++++-----
 src/irisnet/noncore/cutestuff/bsocket.h     |  1 +
 src/xmpp/xmpp-core/connector.cpp            |  3 ++
 src/xmpp/xmpp-core/stream.cpp               | 16 +++++---
 8 files changed, 66 insertions(+), 58 deletions(-)

diff --git a/src/irisnet/corelib/irisnetplugin.h b/src/irisnet/corelib/irisnetplugin.h
index 0cc8a81f..67941a47 100644
--- a/src/irisnet/corelib/irisnetplugin.h
+++ b/src/irisnet/corelib/irisnetplugin.h
@@ -35,12 +35,12 @@ class IRISNET_EXPORT IrisNetProvider : public QObject {
     Q_OBJECT
 
 public:
-    virtual NetInterfaceProvider *   createNetInterfaceProvider();
-    virtual NetGatewayProvider *     createNetGatewayProvider();
+    virtual NetInterfaceProvider    *createNetInterfaceProvider();
+    virtual NetGatewayProvider      *createNetGatewayProvider();
     virtual NetAvailabilityProvider *createNetAvailabilityProvider();
-    virtual NameProvider *           createNameProviderInternet();
-    virtual NameProvider *           createNameProviderLocal();
-    virtual ServiceProvider *        createServiceProvider();
+    virtual NameProvider            *createNameProviderInternet();
+    virtual NameProvider            *createNameProviderLocal();
+    virtual ServiceProvider         *createServiceProvider();
 };
 
 class IRISNET_EXPORT NetInterfaceProvider : public QObject {
@@ -135,7 +135,7 @@ class IRISNET_EXPORT ServiceProvider : public QObject {
         QMap<QString, QByteArray> attributes;
         QHostAddress              address;
         int                       port;
-        QByteArray                hostName; // optional
+        QString                   hostName; // optional
     };
 
     ServiceProvider(QObject *parent = nullptr) : QObject(parent) { }
diff --git a/src/irisnet/corelib/netinterface_qtname.cpp b/src/irisnet/corelib/netinterface_qtname.cpp
index ec156b95..c90c70e8 100644
--- a/src/irisnet/corelib/netinterface_qtname.cpp
+++ b/src/irisnet/corelib/netinterface_qtname.cpp
@@ -127,7 +127,7 @@ private slots:
             return;
         }
         QList<XMPP::NameRecord> results;
-        const auto &            addresses = info.addresses();
+        const auto             &addresses = info.addresses();
         for (const auto &a : addresses) {
             XMPP::NameRecord ir(info.hostName().toLatin1(), 5 * 60); // ttl = 5 mins
             ir.setAddress(a);
@@ -168,37 +168,37 @@ private slots:
 
         QList<XMPP::NameRecord> results;
         for (auto &qtr : lookup->hostAddressRecords()) {
-            XMPP::NameRecord ir(qtr.name().toLatin1(), qtr.timeToLive());
+            XMPP::NameRecord ir(qtr.name(), qtr.timeToLive());
             ir.setAddress(qtr.value());
             results += ir;
         }
         for (auto &qtr : lookup->mailExchangeRecords()) {
-            XMPP::NameRecord ir(qtr.name().toLatin1(), qtr.timeToLive());
+            XMPP::NameRecord ir(qtr.name(), qtr.timeToLive());
             ir.setMx(qtr.exchange().toLatin1(), qtr.preference());
             results += ir;
         }
         for (auto &qtr : lookup->nameServerRecords()) {
-            XMPP::NameRecord ir(qtr.name().toLatin1(), qtr.timeToLive());
+            XMPP::NameRecord ir(qtr.name(), qtr.timeToLive());
             ir.setNs(qtr.value().toLatin1());
             results += ir;
         }
         for (auto &qtr : lookup->pointerRecords()) {
-            XMPP::NameRecord ir(qtr.name().toLatin1(), qtr.timeToLive());
+            XMPP::NameRecord ir(qtr.name(), qtr.timeToLive());
             ir.setPtr(qtr.value().toLatin1());
             results += ir;
         }
         for (auto &qtr : lookup->canonicalNameRecords()) {
-            XMPP::NameRecord ir(qtr.name().toLatin1(), qtr.timeToLive());
+            XMPP::NameRecord ir(qtr.name(), qtr.timeToLive());
             ir.setCname(qtr.value().toLatin1());
             results += ir;
         }
         for (auto &qtr : lookup->serviceRecords()) {
-            XMPP::NameRecord ir(qtr.name().toLatin1(), qtr.timeToLive());
+            XMPP::NameRecord ir(qtr.name(), qtr.timeToLive());
             ir.setSrv(qtr.target().toLatin1(), qtr.port(), qtr.priority(), qtr.weight());
             results += ir;
         }
         for (auto &qtr : lookup->textRecords()) {
-            XMPP::NameRecord ir(qtr.name().toLatin1(), qtr.timeToLive());
+            XMPP::NameRecord ir(qtr.name(), qtr.timeToLive());
             ir.setTxt(qtr.values());
             results += ir;
         }
diff --git a/src/irisnet/corelib/netnames.cpp b/src/irisnet/corelib/netnames.cpp
index c606d0c1..e12f3c57 100644
--- a/src/irisnet/corelib/netnames.cpp
+++ b/src/irisnet/corelib/netnames.cpp
@@ -39,7 +39,7 @@ namespace XMPP {
 //----------------------------------------------------------------------------
 class NameRecord::Private : public QSharedData {
 public:
-    QByteArray       owner;
+    QString          owner; // de-ACE-ed version of domain name from dns reply
     NameRecord::Type type;
     int              ttl;
 
@@ -59,7 +59,7 @@ class NameRecord::Private : public QSharedData {
 
 NameRecord::NameRecord() : d(nullptr) { }
 
-NameRecord::NameRecord(const QByteArray &owner, int ttl) : d(nullptr)
+NameRecord::NameRecord(const QString &owner, int ttl) : d(nullptr)
 {
     setOwner(owner);
     setTtl(ttl);
@@ -108,7 +108,7 @@ bool NameRecord::operator==(const NameRecord &o)
 
 bool NameRecord::isNull() const { return (d ? false : true); }
 
-QByteArray NameRecord::owner() const
+QString NameRecord::owner() const
 {
     Q_ASSERT(d);
     return d->owner;
@@ -180,7 +180,7 @@ QByteArray NameRecord::rawData() const
     return d->rawData;
 }
 
-void NameRecord::setOwner(const QByteArray &name)
+void NameRecord::setOwner(const QString &name)
 {
     ENSURE_D
     d->owner = name;
@@ -702,8 +702,14 @@ class NameManager : public QObject {
             // use queued connections
             qRegisterMetaType<QList<XMPP::NameRecord>>("QList<XMPP::NameRecord>");
             qRegisterMetaType<XMPP::NameResolver::Error>("XMPP::NameResolver::Error");
-            connect(p_net, SIGNAL(resolve_resultsReady(int, QList<XMPP::NameRecord>)),
-                    SLOT(provider_resolve_resultsReady(int, QList<XMPP::NameRecord>)));
+            connect(p_net, &NameProvider::resolve_resultsReady, this,
+                    [this](int id, const QList<XMPP::NameRecord> &results) {
+                        NameResolver::Private *np = res_instances.value(id);
+                        NameResolver          *q  = np->q; // resolve_cleanup deletes np
+                        if (!np->longLived)
+                            resolve_cleanup(np);
+                        emit q->resultsReady(results);
+                    });
             connect(p_net, SIGNAL(resolve_error(int, XMPP::NameResolver::Error)),
                     SLOT(provider_resolve_error(int, XMPP::NameResolver::Error)));
             connect(p_net, SIGNAL(resolve_useLocal(int, QByteArray)), SLOT(provider_resolve_useLocal(int, QByteArray)));
@@ -801,9 +807,13 @@ class NameManager : public QObject {
             // use queued connections
             qRegisterMetaType<QList<XMPP::ServiceProvider::ResolveResult>>(
                 "QList<XMPP::ServiceProvider::ResolveResult>");
-            connect(p_serv, SIGNAL(resolve_resultsReady(int, QList<XMPP::ServiceProvider::ResolveResult>)),
-                    SLOT(provider_resolve_resultsReady(int, QList<XMPP::ServiceProvider::ResolveResult>)),
-                    Qt::QueuedConnection);
+            connect(
+                p_serv, &ServiceProvider::resolve_resultsReady, this,
+                [this](int id, const QList<XMPP::ServiceProvider::ResolveResult> &results) {
+                    ServiceResolver::Private *np = sres_instances.value(id);
+                    emit np->q->resultReady(results[0].address, quint16(results[0].port), results[0].hostName);
+                },
+                Qt::QueuedConnection);
         }
 
         /* store the id so we can stop it later */
@@ -850,14 +860,6 @@ class NameManager : public QObject {
     }
 
 private slots:
-    void provider_resolve_resultsReady(int id, const QList<XMPP::NameRecord> &results)
-    {
-        NameResolver::Private *np = res_instances.value(id);
-        NameResolver          *q  = np->q; // resolve_cleanup deletes np
-        if (!np->longLived)
-            resolve_cleanup(np);
-        emit q->resultsReady(results);
-    }
 
     void provider_resolve_error(int id, XMPP::NameResolver::Error e)
     {
@@ -950,12 +952,6 @@ private slots:
         emit np->q->error();
     }
 
-    void provider_resolve_resultsReady(int id, const QList<XMPP::ServiceProvider::ResolveResult> &results)
-    {
-        ServiceResolver::Private *np = sres_instances.value(id);
-        emit                      np->q->resultReady(results[0].address, quint16(results[0].port));
-    }
-
     void provider_publish_published(int id)
     {
         ServiceLocalPublisher::Private *np = slp_instances.value(id);
@@ -1329,7 +1325,7 @@ bool ServiceResolver::try_next_host()
     if (!d->hostList.empty()) {
         XMPP::NameRecord record(d->hostList.takeFirst());
         /* emit found address and the port specified earlier */
-        emit resultReady(record.address(), d->port);
+        emit resultReady(record.address(), d->port, record.owner());
         return true;
     }
 
diff --git a/src/irisnet/corelib/netnames.h b/src/irisnet/corelib/netnames.h
index 5191fe73..69ff18d9 100644
--- a/src/irisnet/corelib/netnames.h
+++ b/src/irisnet/corelib/netnames.h
@@ -128,7 +128,7 @@ class IRISNET_EXPORT NameRecord {
        For the record to be usable, call an appropriate set<em>X</em> function (where <em>X</em> is the desired type)
        afterwards.
     */
-    NameRecord(const QByteArray &owner, int ttl);
+    NameRecord(const QString &owner, int ttl);
 
     /**
        \brief Constructs a copy of \a from
@@ -167,7 +167,7 @@ class IRISNET_EXPORT NameRecord {
 
        \sa setOwner
     */
-    QByteArray owner() const;
+    QString owner() const;
 
     /**
        \brief Returns the TTL (time-to-live) of this record
@@ -255,7 +255,7 @@ class IRISNET_EXPORT NameRecord {
 
        \sa owner
     */
-    void setOwner(const QByteArray &name);
+    void setOwner(const QString &name);
 
     /**
        \brief Sets the TTL (time-to-live) of this record to \a ttl seconds
@@ -649,8 +649,9 @@ class IRISNET_EXPORT ServiceResolver : public QObject {
      * The lookup succeeded
      * \param address Resolved IP address
      * \param port Port the service resides on
+     * \param hostname Hostname form DNS reply with address:port
      */
-    void resultReady(const QHostAddress &address, quint16 port);
+    void resultReady(const QHostAddress &address, quint16 port, const QString &hostname);
     /*! The lookup failed */
     void error(XMPP::ServiceResolver::Error);
     /*! SRV domain:port records received. No IP yet. */
diff --git a/src/irisnet/noncore/cutestuff/bsocket.cpp b/src/irisnet/noncore/cutestuff/bsocket.cpp
index 6c637209..cf91c3f8 100644
--- a/src/irisnet/noncore/cutestuff/bsocket.cpp
+++ b/src/irisnet/noncore/cutestuff/bsocket.cpp
@@ -76,9 +76,10 @@ class HappyEyeballsConnector : public QObject {
     enum State { Failure, Created, Resolve, Connecting, Connected };
 
     struct SockData {
-        QTcpSocket *           sock;
+        QTcpSocket            *sock;
         QTcpSocketSignalRelay *relay;
         State                  state;
+        QString                hostname; // last resolved name
         XMPP::ServiceResolver *resolver;
     };
 
@@ -222,10 +223,8 @@ class HappyEyeballsConnector : public QObject {
     void initResolver(XMPP::ServiceResolver *resolver)
     {
         resolver->setParent(this);
-        connect(resolver, SIGNAL(resultReady(QHostAddress, quint16)), this,
-                SLOT(handleDnsReady(QHostAddress, quint16)));
-        connect(resolver, SIGNAL(error(XMPP::ServiceResolver::Error)), this,
-                SLOT(handleDnsError(XMPP::ServiceResolver::Error)));
+        connect(resolver, &XMPP::ServiceResolver::resultReady, this, &HappyEyeballsConnector::handleDnsReady);
+        connect(resolver, &XMPP::ServiceResolver::error, this, &HappyEyeballsConnector::handleDnsError);
     }
 
     void setCurrentByResolver(XMPP::ServiceResolver *resolver)
@@ -298,8 +297,8 @@ private slots:
         BSDEBUG << "splitting resolvers";
 #endif
         setCurrentByResolver(static_cast<XMPP::ServiceResolver *>(sender()));
-        SockData &                        sdv4 = sockets[lastIndex];
-        SockData &                        sdv6 = addSocket();
+        SockData                         &sdv4 = sockets[lastIndex];
+        SockData                         &sdv6 = addSocket();
         XMPP::ServiceResolver::ProtoSplit ps   = sdv4.resolver->happySplit();
         initResolver(ps.ipv4);
         initResolver(ps.ipv6);
@@ -322,13 +321,14 @@ private slots:
     }
 
     /* host resolved, now try to connect to it */
-    void handleDnsReady(const QHostAddress &address, quint16 port)
+    void handleDnsReady(const QHostAddress &address, quint16 port, const QString &hostname)
     {
 #ifdef BS_DEBUG
         BSDEBUG << "a:" << address << "p:" << port;
 #endif
         setCurrentByResolver(static_cast<XMPP::ServiceResolver *>(sender()));
-        sockets[lastIndex].state = Connecting;
+        sockets[lastIndex].state    = Connecting;
+        sockets[lastIndex].hostname = hostname;
         sockets[lastIndex].sock->connectToHost(address, port);
     }
 
@@ -381,7 +381,7 @@ class BSocket::Private {
         qsock_relay = nullptr;
     }
 
-    QTcpSocket *           qsock;
+    QTcpSocket            *qsock;
     QTcpSocketSignalRelay *qsock_relay;
     int                    state;
 
@@ -512,6 +512,8 @@ void BSocket::setSocket(QTcpSocket *s)
 
 int BSocket::state() const { return d->state; }
 
+const QString &BSocket::host() const { return d->host; }
+
 bool BSocket::isOpen() const
 {
     if (d->state == Connected)
@@ -622,6 +624,7 @@ void BSocket::qs_connected()
     HappyEyeballsConnector::SockData sd = d->connector->takeCurrent(this);
     d->qsock                            = sd.sock;
     d->qsock_relay                      = sd.relay;
+    d->host                             = sd.hostname;
     d->connector->deleteLater();
     qs_connected_step2(true);
 }
diff --git a/src/irisnet/noncore/cutestuff/bsocket.h b/src/irisnet/noncore/cutestuff/bsocket.h
index 66fc476e..079de448 100644
--- a/src/irisnet/noncore/cutestuff/bsocket.h
+++ b/src/irisnet/noncore/cutestuff/bsocket.h
@@ -55,6 +55,7 @@ class BSocket : public ByteStream {
     qintptr                  socket() const;
     void                     setSocket(QTcpSocket *);
     int                      state() const;
+    const QString           &host() const;
 
     // from ByteStream
     bool isOpen() const;
diff --git a/src/xmpp/xmpp-core/connector.cpp b/src/xmpp/xmpp-core/connector.cpp
index eba9df53..2f4fc5e2 100644
--- a/src/xmpp/xmpp-core/connector.cpp
+++ b/src/xmpp/xmpp-core/connector.cpp
@@ -380,6 +380,9 @@ void AdvancedConnector::bs_connected()
         setUseSSL(true);
     }
 
+    if (auto bs = qobject_cast<BSocket *>(d->bs); bs && !bs->host().isEmpty()) {
+        d->host = bs->host();
+    }
     d->mode = Connected;
     emit connected();
 }
diff --git a/src/xmpp/xmpp-core/stream.cpp b/src/xmpp/xmpp-core/stream.cpp
index 2a73b964..84995b12 100644
--- a/src/xmpp/xmpp-core/stream.cpp
+++ b/src/xmpp/xmpp-core/stream.cpp
@@ -157,11 +157,11 @@ class ClientStream::Private {
 
     bool in_rrsig = false;
 
-    Connector *   conn       = nullptr;
-    ByteStream *  bs         = nullptr;
-    TLSHandler *  tlsHandler = nullptr;
-    QCA::TLS *    tls        = nullptr;
-    QCA::SASL *   sasl       = nullptr;
+    Connector    *conn       = nullptr;
+    ByteStream   *bs         = nullptr;
+    TLSHandler   *tlsHandler = nullptr;
+    QCA::TLS     *tls        = nullptr;
+    QCA::SASL    *sasl       = nullptr;
     SecureStream *ss         = nullptr;
     CoreProtocol  client;
     CoreProtocol  srv;
@@ -1108,7 +1108,11 @@ bool ClientStream::handleNeed()
         qDebug("Need StartTLS\n");
 #endif
         d->using_tls = true;
-        d->ss->startTLSClient(d->tlsHandler, d->server, d->client.spare);
+        auto tlsHost = d->server;
+        if (!d->connectHost.isEmpty() && QHostAddress(d->connectHost).isNull()) {
+            tlsHost = d->connectHost;
+        }
+        d->ss->startTLSClient(d->tlsHandler, tlsHost, d->client.spare);
         return false;
     }
     case CoreProtocol::NCompress: {

From eb2f9944542d6f5b9bcb8f6251754a2e4761c5b1 Mon Sep 17 00:00:00 2001
From: Sergei Ilinykh <rion4ik@gmail.com>
Date: Wed, 19 Jan 2022 11:22:29 +0300
Subject: [PATCH 352/383] Don't check SRV resolved hostnames for valid
 certificates

XMPP host returns a certificate for xmpp domain and
not for SRV resolved hostname.
---
 src/xmpp/xmpp-core/stream.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/xmpp/xmpp-core/stream.cpp b/src/xmpp/xmpp-core/stream.cpp
index 84995b12..37a82025 100644
--- a/src/xmpp/xmpp-core/stream.cpp
+++ b/src/xmpp/xmpp-core/stream.cpp
@@ -1108,11 +1108,7 @@ bool ClientStream::handleNeed()
         qDebug("Need StartTLS\n");
 #endif
         d->using_tls = true;
-        auto tlsHost = d->server;
-        if (!d->connectHost.isEmpty() && QHostAddress(d->connectHost).isNull()) {
-            tlsHost = d->connectHost;
-        }
-        d->ss->startTLSClient(d->tlsHandler, tlsHost, d->client.spare);
+        d->ss->startTLSClient(d->tlsHandler, d->server, d->client.spare);
         return false;
     }
     case CoreProtocol::NCompress: {

From cb5b814a911222e7180c6cc4c98c03acefccd69c Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
Date: Sun, 23 Jan 2022 04:31:20 +0300
Subject: [PATCH 353/383] Fix spelling errors

---
 src/xmpp/xmpp-im/jingle-ft.cpp  | 4 ++--
 src/xmpp/xmpp-im/jingle-s5b.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 5ae76f51..2e0920ff 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -402,7 +402,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
                     break;
                 }
                 if (!found)
-                    qDebug("haven't found %s checksum withing received checksums",
+                    qDebug("haven't found %s checksum within received checksums",
                            qPrintable(expectedHash.stringType()));
             }
             outgoingReceived = true;
@@ -551,7 +551,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
     {
         Q_ASSERT(_senders != _pad->session()->role());
         if (_senders == _pad->session()->role()) {
-            qCritical("streaming mode is implmented only for receiving, not sending");
+            qCritical("streaming mode is implemented only for receiving, not sending");
             remove(Reason::GeneralError, "unsupported file sender streaming mode");
             return;
         }
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 56fe1adf..9145fb9a 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -1060,7 +1060,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
             if (localUsedCandidate && localUsedCandidate.state() != Candidate::Discarded) {
                 prio = localUsedCandidate.priority();
             }
-            // find highest priority withing connected remote candidates
+            // find highest priority within connected remote candidates
             for (const auto &[_, c] : remoteCandidates) {
                 if (c.state() != Candidate::Discarded && c.state() >= Candidate::Pending && c.priority() > prio) {
                     prio = c.priority();

From 97e366640ddd5c0fd3b9c2071bf5d98f1c9028c3 Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
Date: Sun, 23 Jan 2022 05:16:05 +0300
Subject: [PATCH 354/383] Update 3rdparty/stringprep/README.md

---
 3rdparty/stringprep/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/3rdparty/stringprep/README.md b/3rdparty/stringprep/README.md
index db1401bb..2ec00709 100644
--- a/3rdparty/stringprep/README.md
+++ b/3rdparty/stringprep/README.md
@@ -2,4 +2,6 @@ This is a stringprep library extracted from LibIDN and slightly rewritten to use
 
 The current version corresponds to 86e84739c5186faf3722a0f42e1e2db27870b3a5 commit of git://git.savannah.gnu.org/libidn.git
 
+The necessity of usage of separate stringprep library is described here: https://gitlab.com/libidn/libidn2/-/issues/28
+
 Note this directory contains generated rfc3454 files from rfc3454.txt. It's very unlikely these files will ever be regenerated but just in case the directory also contains both rfc3454.txt and a perl script to generate the files.

From e74796530ac73c1f1c67f80006587e200d17f854 Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Tue, 15 Mar 2022 10:17:17 +0200
Subject: [PATCH 355/383] Updated src/irisnet/CMakeLists.txt Add usrsctp
 library as dependency when BUNDLED_USRSCTP flag enabled.

---
 src/irisnet/CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/irisnet/CMakeLists.txt b/src/irisnet/CMakeLists.txt
index f3d23ee1..364c5a71 100644
--- a/src/irisnet/CMakeLists.txt
+++ b/src/irisnet/CMakeLists.txt
@@ -132,6 +132,9 @@ target_link_libraries(irisnet Qt5::Core Qt5::Network Qt5::Xml)
 if (BUNDLED_QCA)
     add_dependencies(irisnet QcaProject)
 endif()
+if (BUNDLED_USRSCTP)
+    add_dependencies(irisnet UsrSCTPProject)
+endif()
 target_link_libraries(irisnet ${qca_LIB})
 target_link_libraries(irisnet ${sctpLab_LIBRARY})
 target_link_libraries(irisnet ${EXTRA_LDFLAGS})

From 1b973ebcd6f2e48c92d0ebcbbae225e5c3650410 Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Sun, 27 Mar 2022 15:47:22 +0300
Subject: [PATCH 356/383] Updated CMake files. Code modernize

---
 CMakeLists.txt             | 7 +++----
 src/irisnet/CMakeLists.txt | 3 +--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 206bce49..f720cc6b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,8 +38,7 @@ set( IRIS_LIB_VERSION_STRING
 
 get_filename_component(ABS_PARENT_DIR "${CMAKE_CURRENT_LIST_DIR}/.." ABSOLUTE)
 
-set( CMAKE_MODULE_PATH
-    "${CMAKE_MODULE_PATH}"
+list(APPEND CMAKE_MODULE_PATH
     "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
     "${ABS_PARENT_DIR}/cmake/modules"
     "${PROJECT_SOURCE_DIR}/cmake/modules"
@@ -62,7 +61,7 @@ include_directories(include/iris)
 set(CMAKE_AUTOMOC ON)
 
 if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug" OR ("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo"))
-    include(cmake/modules/debug-definitions.cmake)
+    include(debug-definitions)
 endif()
 
 find_package(Qt5 COMPONENTS Core Gui Xml Network REQUIRED)
@@ -179,5 +178,5 @@ if(BUILD_IRIS_TOOLS)
     add_subdirectory(tools)
 endif()
 if(NOT IS_SUBPROJECT)
-    include(cmake/modules/fix-codestyle.cmake)
+    include(fix-codestyle)
 endif()
diff --git a/src/irisnet/CMakeLists.txt b/src/irisnet/CMakeLists.txt
index 364c5a71..db72f7ed 100644
--- a/src/irisnet/CMakeLists.txt
+++ b/src/irisnet/CMakeLists.txt
@@ -10,8 +10,7 @@ include_directories(
     ${sctpLab_INCLUDES}
 )
 
-set( CMAKE_MODULE_PATH
-    "${CMAKE_MODULE_PATH}"
+list(APPEND CMAKE_MODULE_PATH
     "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
     "${ABS_PARENT_DIR}/cmake/modules"
 )

From fab38213e5d587909f04f9292746cd0c31ccf5f8 Mon Sep 17 00:00:00 2001
From: Vyacheslav Karpukhin <vyacheslav@karpukhin.com>
Date: Sat, 23 Apr 2022 18:04:25 +0200
Subject: [PATCH 357/383] Use unique stanza ids; set origin-id for messages.
 (#69)

A lot of modern clients rely on the message ids to be unique per experimental XEP-0359. Let's not break their assumptions.
---
 src/xmpp/xmpp-im/client.cpp | 5 +----
 src/xmpp/xmpp-im/types.cpp  | 6 +++++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
index 118dc834..a1312f33 100644
--- a/src/xmpp/xmpp-im/client.cpp
+++ b/src/xmpp/xmpp-im/client.cpp
@@ -118,7 +118,6 @@ class Client::ClientPrivate {
 
     QPointer<ClientStream>  stream;
     QDomDocument            doc;
-    int                     id_seed = 0xaaaa;
     Task *                  root    = nullptr;
     QNetworkAccessManager * qnam    = nullptr;
     QString                 host, user, pass, resource;
@@ -564,9 +563,7 @@ void Client::debug(const QString &str) { emit debugText(str); }
 
 QString Client::genUniqueId()
 {
-    QString s = QString::asprintf("a%x", d->id_seed);
-    d->id_seed += 0x10;
-    return s;
+    return QUuid::createUuid().toString(QUuid::WithoutBraces);
 }
 
 Task *Client::rootTask() { return d->root; }
diff --git a/src/xmpp/xmpp-im/types.cpp b/src/xmpp/xmpp-im/types.cpp
index e2834a30..9539aa51 100644
--- a/src/xmpp/xmpp-im/types.cpp
+++ b/src/xmpp/xmpp-im/types.cpp
@@ -868,7 +868,11 @@ void Message::setFrom(const Jid &j)
     // d->flag = false;
 }
 
-void Message::setId(const QString &s) { MessageD()->id = s; }
+void Message::setId(const QString &s)
+{
+    MessageD()->id = s;
+    MessageD()->originId = s;
+}
 
 //! \brief Set Type of message
 //!

From a2fc18ae15e8553ec0f1ff079b6cc653800a45a1 Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Tue, 10 May 2022 21:28:05 +0300
Subject: [PATCH 358/383] Updated CMake files. Detect MXE environment by
 toolchain file

---
 CMakeLists.txt               | 14 ++++++++++++++
 cmake/modules/IrisSCTP.cmake |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f720cc6b..4e009699 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,6 +64,20 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug" OR ("${CMAKE_BUILD_TYPE}" STREQUAL "Re
     include(debug-definitions)
 endif()
 
+# Detect MXE cross-compilation
+if(NOT DEFINED USE_MXE AND (EXISTS "${CMAKE_TOOLCHAIN_FILE}"))
+    option( USE_MXE "Use MXE (cross-compilation build environment for MS Windows)" OFF )
+    string(TOLOWER ${CMAKE_TOOLCHAIN_FILE} TOOLCHAIN_FILE)
+    string(REGEX MATCH "mxe-conf" MXE_DETECTED "${TOOLCHAIN_FILE}")
+    if(MXE_DETECTED)
+        message(STATUS "MXE environment detected")
+        message(STATUS "MXE toolchain: ${CMAKE_TOOLCHAIN_FILE}")
+        message(STATUS "MXE root path: ${CMAKE_PREFIX_PATH}")
+        set(USE_MXE ON)
+        set(BUNDLED_USRSCTP ON)
+    endif()
+endif()
+
 find_package(Qt5 COMPONENTS Core Gui Xml Network REQUIRED)
 
 if(Qt5Core_FOUND)
diff --git a/cmake/modules/IrisSCTP.cmake b/cmake/modules/IrisSCTP.cmake
index 2c90f8b8..c27a3a94 100644
--- a/cmake/modules/IrisSCTP.cmake
+++ b/cmake/modules/IrisSCTP.cmake
@@ -5,7 +5,7 @@ cmake_dependent_option( BUNDLED_USRSCTP
     "Compile compatible usrsctp lib when system one is not available or uncompatible (required for datachannel jingle transport)"
     OFF "JINGLE_SCTP" OFF)
 
-if((CMAKE_CROSSCOMPILING AND DEFINED MSYS) AND STDINT_FOUND)
+if(USE_MXE AND STDINT_FOUND)
     #Add SCTP_STDINT_INCLUDE definition to compile irisnet with usrsctp with MinGW
     add_definitions(
         -DSCTP_STDINT_INCLUDE="${STDINT_INCLUDE}"

From 7a353c2e15e2a280fefd1602b9f9f539e943ca69 Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Sun, 15 May 2022 15:40:08 +0300
Subject: [PATCH 359/383] Updated CMake files. CMake minumum version raised up
 to 3.10. Some code modernize.

---
 3rdparty/stringprep/CMakeLists.txt    |  12 +--
 CMakeLists.txt                        | 137 ++++++--------------------
 IrisConfigVersion.cmake.in            |   6 +-
 cmake/modules/IrisQCA.cmake           |  79 +++++++++++++++
 cmake/modules/IrisSCTP.cmake          |   6 +-
 cmake/modules/debug-definitions.cmake |   2 +-
 cmake/modules/fix-codestyle.cmake     |   2 +-
 cmake/modules/policyRules.cmake       |  14 +++
 cmake_uninstall.cmake.in              |   4 +-
 src/irisnet/CMakeLists.txt            |   2 +-
 src/xmpp/CMakeLists.txt               |   6 +-
 11 files changed, 138 insertions(+), 132 deletions(-)
 create mode 100644 cmake/modules/IrisQCA.cmake
 create mode 100644 cmake/modules/policyRules.cmake

diff --git a/3rdparty/stringprep/CMakeLists.txt b/3rdparty/stringprep/CMakeLists.txt
index c7158f16..2ad9c7f9 100644
--- a/3rdparty/stringprep/CMakeLists.txt
+++ b/3rdparty/stringprep/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.2.0)
+cmake_minimum_required(VERSION 3.10.0)
 
 project(stringprep LANGUAGES CXX)
 
@@ -7,16 +7,12 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-if(CMAKE_VERSION VERSION_LESS "3.7.0")
-    set(CMAKE_INCLUDE_CURRENT_DIR ON)
-endif()
-
 find_package(Qt5 COMPONENTS Core REQUIRED)
 
 add_library(stringprep STATIC
-  stringprep.cpp
-  profiles.cpp
-  rfc3454.cpp
+    stringprep.cpp
+    profiles.cpp
+    rfc3454.cpp
 )
 target_compile_definitions(stringprep PRIVATE QSTRINGPREP_BUILDING)
 target_include_directories(stringprep PUBLIC
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4e009699..3025ebb9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,11 @@
+cmake_minimum_required(VERSION 3.10.0)
+project(iris)
+
 if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "Release")
 endif()
 
+#Sed d prefix for Windows OS debug builds
 if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND WIN32)
     set(D "d")
 endif()
@@ -9,26 +13,9 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND APPLE)
     set(D "_debug")
 endif()
 
+#Check if Iris is subproject
 get_directory_property(IS_SUBPROJECT PARENT_DIRECTORY)
 
-project(iris)
-cmake_minimum_required(VERSION 3.2.0)
-
-#Set automoc and autouic policy
-if(POLICY CMP0071)
-    if(${CMAKE_VERSION} VERSION_LESS "3.10.0")
-        cmake_policy(SET CMP0071 OLD)
-        message(STATUS "CMP0071 policy set to OLD")
-    else()
-        cmake_policy(SET CMP0071 NEW)
-        message(STATUS "CMP0071 policy set to NEW")
-    endif()
-endif()
-if(POLICY CMP0074)
-    cmake_policy(SET CMP0074 NEW)
-    message(STATUS "CMP0074 policy set to NEW")
-endif()
-
 set( IRIS_LIB_VERSION_MAJOR 1 )
 set( IRIS_LIB_VERSION_MINOR 0 )
 set( IRIS_LIB_VERSION_PATCH 0 )
@@ -44,26 +31,12 @@ list(APPEND CMAKE_MODULE_PATH
     "${PROJECT_SOURCE_DIR}/cmake/modules"
     )
 
-set( DEFAULT_BUNDLED_QCA OFF )
-if (APPLE OR (MSVC OR USE_MXE))
-    set( DEFAULT_BUNDLED_QCA ON )
-endif()
-
-option( JINGLE_SCTP "Enable SCTP over ICE Jingle transport / data channels" ON )
-option( BUNDLED_QCA "Adds: DTLS, Blake2b and other useful for XMPP crypto-stuff" ${DEFAULT_BUNDLED_QCA})
-option( BUILD_IRIS_TOOLS "Build tools and examples" OFF)
-
-set(CMAKE_CXX_STANDARD 17)
+include(policyRules)
 
-include_directories(${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR})
-include_directories(include/iris)
+set( DEFAULT_BUNDLED_QCA OFF )
 
 set(CMAKE_AUTOMOC ON)
 
-if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug" OR ("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo"))
-    include(debug-definitions)
-endif()
-
 # Detect MXE cross-compilation
 if(NOT DEFINED USE_MXE AND (EXISTS "${CMAKE_TOOLCHAIN_FILE}"))
     option( USE_MXE "Use MXE (cross-compilation build environment for MS Windows)" OFF )
@@ -78,6 +51,23 @@ if(NOT DEFINED USE_MXE AND (EXISTS "${CMAKE_TOOLCHAIN_FILE}"))
     endif()
 endif()
 
+if (APPLE OR (MSVC OR USE_MXE))
+    set( DEFAULT_BUNDLED_QCA ON )
+endif()
+
+option( JINGLE_SCTP "Enable SCTP over ICE Jingle transport / data channels" ON )
+option( BUNDLED_QCA "Adds: DTLS, Blake2b and other useful for XMPP crypto-stuff" ${DEFAULT_BUNDLED_QCA})
+option( BUILD_IRIS_TOOLS "Build tools and examples" OFF)
+
+set(CMAKE_CXX_STANDARD 17)
+
+include_directories(${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR})
+include_directories(include/iris)
+
+if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug" OR ("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo"))
+    include(debug-definitions)
+endif()
+
 find_package(Qt5 COMPONENTS Core Gui Xml Network REQUIRED)
 
 if(Qt5Core_FOUND)
@@ -87,83 +77,11 @@ if(Qt5Core_FOUND)
     endif()
 endif()
 
-if(BUNDLED_QCA)
-    message(STATUS "QCA: using bundled")
-    set(QCA_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qca)
-    set(QCA_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/qca)
-    set(QCA_BUILD_DIR ${QCA_PREFIX}/build)
-    set(Qca_INCLUDE_DIR ${QCA_BUILD_DIR})
-    if(NOT EXISTS ${QCA_SOURCE_DIR})
-        list(APPEND Qca_INCLUDE_DIR ${QCA_PREFIX}/src/QcaProject/include/QtCrypto)
-    else()
-        list(APPEND Qca_INCLUDE_DIR ${QCA_SOURCE_DIR}/include/QtCrypto)
-    endif()
-    set(Qca_CORE_LIB ${QCA_BUILD_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}qca-qt5${D}${CMAKE_STATIC_LIBRARY_SUFFIX})
-    set(Qca_OSSL_LIB ${QCA_BUILD_DIR}/lib/qca-qt5/crypto/${CMAKE_STATIC_LIBRARY_PREFIX}qca-ossl${D}${CMAKE_STATIC_LIBRARY_SUFFIX})
-    set(Qca_LIBRARY ${Qca_OSSL_LIB} ${Qca_CORE_LIB})
-    if(APPLE)
-        set(COREFOUNDATION_LIBRARY "-framework CoreFoundation")
-        set(COREFOUNDATION_LIBRARY_SECURITY "-framework Security")
-        set(Qca_LIBRARY ${Qca_LIBRARY} ${COREFOUNDATION_LIBRARY} ${COREFOUNDATION_LIBRARY_SECURITY})
-    endif()
-    if(IS_SUBPROJECT)
-        set(Qca_LIBRARY_EXPORT ${Qca_LIBRARY} PARENT_SCOPE)
-        set(Qca_INCLUDE_DIR_EXPORT ${Qca_INCLUDE_DIR} PARENT_SCOPE)
-    endif()
-
-    if ("${OPENSSL_ROOT_DIR}" STREQUAL "" AND APPLE)
-        set(OPENSSL_ROOT_DIR /usr/local/opt/openssl)
-    endif()
-    find_package(OpenSSL REQUIRED)
-
-    include(ExternalProject)
-    #set CMake options and transfer the environment to an external project
-    set(QCA_BUILD_OPTIONS
-        -DBUILD_SHARED_LIBS=OFF -DBUILD_PLUGINS=ossl -DLOAD_SHARED_PLUGINS=OFF
-        -DBUILD_TESTS=OFF -DBUILD_TOOLS=OFF -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-        -DCMAKE_INSTALL_PREFIX=${QCA_PREFIX} -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
-        -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
-        -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-        -DOSX_FRAMEWORK=OFF)
-    if (EXISTS ${QCA_SOURCE_DIR})
-        message(STATUS "QCA: found bundled sources")
-        ExternalProject_Add(QcaProject
-            PREFIX ${QCA_PREFIX}
-            BINARY_DIR ${QCA_BUILD_DIR}
-            SOURCE_DIR ${QCA_SOURCE_DIR}
-            CMAKE_ARGS ${QCA_BUILD_OPTIONS}
-            BUILD_BYPRODUCTS ${Qca_LIBRARY}
-            INSTALL_COMMAND ""
-            )
-    else()
-        include(FindGit)
-        find_package(Git)
-        if(NOT Git_FOUND)
-            message(FATAL_ERROR "Git not found! Bundled Qca needs Git utility.\nPlease set GIT_EXECUTABLE variable or add git to PATH")
-        endif()
-        ExternalProject_Add(QcaProject
-            PREFIX ${QCA_PREFIX}
-            BINARY_DIR ${QCA_BUILD_DIR}
-            GIT_REPOSITORY https://github.com/psi-im/qca.git
-            CMAKE_ARGS ${QCA_BUILD_OPTIONS}
-            BUILD_BYPRODUCTS ${Qca_LIBRARY}
-            INSTALL_COMMAND ""
-            )
-    endif()
-else()
-    message(WARNING "Disabling BUNDLED_QCA option makes impossible to use DTLS and PsiMedia")
-    message(STATUS "QCA: using system")
-    find_package(Qca REQUIRED)
-endif()
-
-set(QCA_INCLUDES ${Qca_INCLUDE_DIR})
-set(qca_LIB ${Qca_LIBRARY})
-
-include_directories(
-    ${Qca_INCLUDE_DIR}
-)
+#Find QCA package or use bundled if enabled
+include(IrisQCA)
 
 set(STDINT_FOUND OFF)
+
 find_file(STDINT_INCLUDE stdint.h)
 
 if(NOT ${STDINT_INCLUDE} STREQUAL "STDINT_INCLUDE-NOTFOUND")
@@ -171,6 +89,7 @@ if(NOT ${STDINT_INCLUDE} STREQUAL "STDINT_INCLUDE-NOTFOUND")
     set(STDINT_FOUND ON)
 endif()
 
+#Find SCTP package or use bundled if enabled
 if(JINGLE_SCTP)
     include(IrisSCTP)
 endif()
diff --git a/IrisConfigVersion.cmake.in b/IrisConfigVersion.cmake.in
index 2a2c2990..f7ec235a 100644
--- a/IrisConfigVersion.cmake.in
+++ b/IrisConfigVersion.cmake.in
@@ -1,9 +1,9 @@
 set(PACKAGE_VERSION "@IRIS_LIB_VERSION_STRING@")
 if(PACKAGE_FIND_VERSION VERSION_EQUAL PACKAGE_VERSION)
     set(PACKAGE_VERSION_EXACT TRUE)
-endif(PACKAGE_FIND_VERSION VERSION_EQUAL PACKAGE_VERSION)
+endif()
 if(NOT PACKAGE_FIND_VERSION VERSION_GREATER PACKAGE_VERSION)
     set(PACKAGE_VERSION_COMPATIBLE TRUE)
-else(NOT PACKAGE_FIND_VERSION VERSION_GREATER PACKAGE_VERSION)
+else()
     set(PACKAGE_VERSION_UNSUITABLE TRUE)
-endif(NOT PACKAGE_FIND_VERSION VERSION_GREATER PACKAGE_VERSION)
+endif()
diff --git a/cmake/modules/IrisQCA.cmake b/cmake/modules/IrisQCA.cmake
new file mode 100644
index 00000000..42787c33
--- /dev/null
+++ b/cmake/modules/IrisQCA.cmake
@@ -0,0 +1,79 @@
+cmake_minimum_required(VERSION 3.10.0)
+
+set(IrisQCAGitRepo "https://github.com/psi-im/qca.git")
+
+if(BUNDLED_QCA)
+    message(STATUS "QCA: using bundled")
+    set(QCA_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qca)
+    set(QCA_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/qca)
+    set(QCA_BUILD_DIR ${QCA_PREFIX}/build)
+    set(Qca_INCLUDE_DIR ${QCA_BUILD_DIR})
+    if(NOT EXISTS ${QCA_SOURCE_DIR})
+        list(APPEND Qca_INCLUDE_DIR ${QCA_PREFIX}/src/QcaProject/include/QtCrypto)
+    else()
+        list(APPEND Qca_INCLUDE_DIR ${QCA_SOURCE_DIR}/include/QtCrypto)
+    endif()
+    set(Qca_CORE_LIB ${QCA_BUILD_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}qca-qt5${D}${CMAKE_STATIC_LIBRARY_SUFFIX})
+    set(Qca_OSSL_LIB ${QCA_BUILD_DIR}/lib/qca-qt5/crypto/${CMAKE_STATIC_LIBRARY_PREFIX}qca-ossl${D}${CMAKE_STATIC_LIBRARY_SUFFIX})
+    set(Qca_LIBRARY ${Qca_OSSL_LIB} ${Qca_CORE_LIB})
+    if(APPLE)
+        set(COREFOUNDATION_LIBRARY "-framework CoreFoundation")
+        set(COREFOUNDATION_LIBRARY_SECURITY "-framework Security")
+        set(Qca_LIBRARY ${Qca_LIBRARY} ${COREFOUNDATION_LIBRARY} ${COREFOUNDATION_LIBRARY_SECURITY})
+    endif()
+    if(IS_SUBPROJECT)
+        set(Qca_LIBRARY_EXPORT ${Qca_LIBRARY} PARENT_SCOPE)
+        set(Qca_INCLUDE_DIR_EXPORT ${Qca_INCLUDE_DIR} PARENT_SCOPE)
+    endif()
+
+    if ("${OPENSSL_ROOT_DIR}" STREQUAL "" AND APPLE)
+        set(OPENSSL_ROOT_DIR /usr/local/opt/openssl)
+    endif()
+    find_package(OpenSSL REQUIRED)
+
+    include(ExternalProject)
+    #set CMake options and transfer the environment to an external project
+    set(QCA_BUILD_OPTIONS
+        -DBUILD_SHARED_LIBS=OFF -DBUILD_PLUGINS=ossl -DLOAD_SHARED_PLUGINS=OFF
+        -DBUILD_TESTS=OFF -DBUILD_TOOLS=OFF -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+        -DCMAKE_INSTALL_PREFIX=${QCA_PREFIX} -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
+        -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+        -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+        -DOSX_FRAMEWORK=OFF)
+    if (EXISTS ${QCA_SOURCE_DIR})
+        message(STATUS "QCA: found bundled sources")
+        ExternalProject_Add(QcaProject
+            PREFIX ${QCA_PREFIX}
+            BINARY_DIR ${QCA_BUILD_DIR}
+            SOURCE_DIR ${QCA_SOURCE_DIR}
+            CMAKE_ARGS ${QCA_BUILD_OPTIONS}
+            BUILD_BYPRODUCTS ${Qca_LIBRARY}
+            INSTALL_COMMAND ""
+            )
+    else()
+        include(FindGit)
+        find_package(Git)
+        if(NOT Git_FOUND)
+            message(FATAL_ERROR "Git not found! Bundled Qca needs Git utility.\nPlease set GIT_EXECUTABLE variable or add git to PATH")
+        endif()
+        ExternalProject_Add(QcaProject
+            PREFIX ${QCA_PREFIX}
+            BINARY_DIR ${QCA_BUILD_DIR}
+            GIT_REPOSITORY ${IrisQCAGitRepo}
+            CMAKE_ARGS ${QCA_BUILD_OPTIONS}
+            BUILD_BYPRODUCTS ${Qca_LIBRARY}
+            INSTALL_COMMAND ""
+            )
+    endif()
+else()
+    message(WARNING "Disabling BUNDLED_QCA option makes impossible to use DTLS and PsiMedia")
+    message(STATUS "QCA: using system")
+    find_package(Qca REQUIRED)
+endif()
+
+set(QCA_INCLUDES ${Qca_INCLUDE_DIR})
+set(qca_LIB ${Qca_LIBRARY})
+
+include_directories(
+    ${Qca_INCLUDE_DIR}
+)
diff --git a/cmake/modules/IrisSCTP.cmake b/cmake/modules/IrisSCTP.cmake
index c27a3a94..54e8b1c8 100644
--- a/cmake/modules/IrisSCTP.cmake
+++ b/cmake/modules/IrisSCTP.cmake
@@ -1,10 +1,12 @@
-cmake_minimum_required(VERSION 3.2.0)
+cmake_minimum_required(VERSION 3.10.0)
 
 include(CMakeDependentOption)
 cmake_dependent_option( BUNDLED_USRSCTP
     "Compile compatible usrsctp lib when system one is not available or uncompatible (required for datachannel jingle transport)"
     OFF "JINGLE_SCTP" OFF)
 
+set(IrisSCTPGitRepo "https://github.com/sctplab/usrsctp.git")
+
 if(USE_MXE AND STDINT_FOUND)
     #Add SCTP_STDINT_INCLUDE definition to compile irisnet with usrsctp with MinGW
     add_definitions(
@@ -62,7 +64,7 @@ else()
         ExternalProject_Add(UsrSCTPProject
             PREFIX ${USRSCTP_PREFIX}
             BINARY_DIR ${USRSCTP_BUILD_DIR}
-            GIT_REPOSITORY https://github.com/sctplab/usrsctp.git
+            GIT_REPOSITORY ${IrisSCTPGitRepo}
             GIT_TAG a17109528c75d01f6372d5c30851a639684c6e99
             CMAKE_ARGS ${USRSCTP_BUILD_OPTIONS}
             BUILD_BYPRODUCTS ${USRSCTP_LIBRARY}
diff --git a/cmake/modules/debug-definitions.cmake b/cmake/modules/debug-definitions.cmake
index 491ec711..21061873 100644
--- a/cmake/modules/debug-definitions.cmake
+++ b/cmake/modules/debug-definitions.cmake
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.2.0)
+cmake_minimum_required(VERSION 3.10.0)
 option(IRIS_NETNAMES_DEBUG "Add -DNETNAMES_DEBUG definition" OFF)
 option(IRIS_PSI_ENABLE_SCTP_DEBUG "Add -DPSI_ENABLE_SCTP_DEBUG definition" OFF)
 option(IRIS_ICE_DEBUG "Add -DICE_DEBUG definition" OFF)
diff --git a/cmake/modules/fix-codestyle.cmake b/cmake/modules/fix-codestyle.cmake
index c23eb8c0..cff163ac 100644
--- a/cmake/modules/fix-codestyle.cmake
+++ b/cmake/modules/fix-codestyle.cmake
@@ -1,4 +1,4 @@
-cmake_minimum_required( VERSION 3.2.0 )
+cmake_minimum_required( VERSION 3.10.0 )
 
 #Find clang-format binary
 find_program(CLF_BIN clang-format DOC "Path to clang-format binary")
diff --git a/cmake/modules/policyRules.cmake b/cmake/modules/policyRules.cmake
new file mode 100644
index 00000000..df9d386c
--- /dev/null
+++ b/cmake/modules/policyRules.cmake
@@ -0,0 +1,14 @@
+cmake_minimum_required( VERSION 3.10 )
+#Set automoc and autouic policy
+if(NOT POLICY_SET)
+    if(POLICY CMP0071)
+        cmake_policy(SET CMP0071 NEW)
+        message(STATUS "CMP0071 policy set to NEW")
+    endif()
+    if(POLICY CMP0074)
+        cmake_policy(SET CMP0074 NEW)
+        message(STATUS "CMP0074 policy set to NEW")
+    endif()
+    set(POLICY_SET ON)
+endif()
+
diff --git a/cmake_uninstall.cmake.in b/cmake_uninstall.cmake.in
index be7fbb2e..0585625e 100644
--- a/cmake_uninstall.cmake.in
+++ b/cmake_uninstall.cmake.in
@@ -1,6 +1,6 @@
 if(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
     message(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
-endif(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+endif()
 
 file(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
 string(REGEX REPLACE "\n" ";" files "${files}")
@@ -14,4 +14,4 @@ foreach(file ${files})
     if(NOT "${rm_retval}" STREQUAL 0)
         message(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
     endif(NOT "${rm_retval}" STREQUAL 0)
-endforeach(file)
+endforeach()
diff --git a/src/irisnet/CMakeLists.txt b/src/irisnet/CMakeLists.txt
index db72f7ed..54a383b2 100644
--- a/src/irisnet/CMakeLists.txt
+++ b/src/irisnet/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.2.0)
+cmake_minimum_required(VERSION 3.10.0)
 get_filename_component(ABS_PARENT_DIR "${CMAKE_CURRENT_LIST_DIR}/.." ABSOLUTE)
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/src/xmpp/CMakeLists.txt b/src/xmpp/CMakeLists.txt
index b72a8ef3..1250fccc 100644
--- a/src/xmpp/CMakeLists.txt
+++ b/src/xmpp/CMakeLists.txt
@@ -1,8 +1,4 @@
-cmake_minimum_required(VERSION 3.2.0)
-if(POLICY CMP0074)
-    cmake_policy(SET CMP0074 NEW)
-    message(STATUS "CMP0074 policy set to NEW")
-endif()
+cmake_minimum_required(VERSION 3.10.0)
 
 add_definitions(-DXMPP_TEST)
 

From 3b59054c997d6b68fc1dfdad19c101ae2787d8fb Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Sun, 15 May 2022 16:16:54 +0300
Subject: [PATCH 360/383] Updated policyRules.cmake. Fixed scope of POLICY_SET
 variable

---
 cmake/modules/policyRules.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/modules/policyRules.cmake b/cmake/modules/policyRules.cmake
index df9d386c..982e1ff3 100644
--- a/cmake/modules/policyRules.cmake
+++ b/cmake/modules/policyRules.cmake
@@ -9,6 +9,6 @@ if(NOT POLICY_SET)
         cmake_policy(SET CMP0074 NEW)
         message(STATUS "CMP0074 policy set to NEW")
     endif()
-    set(POLICY_SET ON)
+    set(POLICY_SET ON PARENT_SCOPE)
 endif()
 

From 3c308da714e2ae39507557576029b7fbcf92460c Mon Sep 17 00:00:00 2001
From: Sergey Ilinykh <rion4ik@gmail.com>
Date: Tue, 17 May 2022 17:50:18 +0300
Subject: [PATCH 361/383] Fixed compatibility with Qt 5.9

---
 src/xmpp/xmpp-im/client.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
index a1312f33..f99b5b36 100644
--- a/src/xmpp/xmpp-im/client.cpp
+++ b/src/xmpp/xmpp-im/client.cpp
@@ -563,7 +563,12 @@ void Client::debug(const QString &str) { emit debugText(str); }
 
 QString Client::genUniqueId()
 {
+#if QT_VERSION >= QT_VERSION_CHECK(5,11,0)
     return QUuid::createUuid().toString(QUuid::WithoutBraces);
+#else
+    auto s = QUuid::createUuid().toString();
+    return s.mid(1, s.size() - 2);
+#endif
 }
 
 Task *Client::rootTask() { return d->root; }

From 426be69d0fbe2bfb3193e156923f3f25b14d9aa3 Mon Sep 17 00:00:00 2001
From: Anna <cyber+dev@sysrq.in>
Date: Sun, 10 Mar 2024 16:17:10 +0500
Subject: [PATCH 362/383] Add installation support (#70)

* Change header links paths

* Alter includes

* Adapt CMake to new structure

* Add installation support

* Add initial CI

* Fix icetunnel includes

* Disable tools in CI

* Don't expose Zlib to public interface

* Don't expose libb2 to public interface

* Add libb2 to CI deps

* Add system include directory to public interface
---
 .github/workflows/ci.yml               |  64 +++++++
 3rdparty/stringprep/CMakeLists.txt     |  12 +-
 CMakeLists.txt                         | 233 ++++++++++++++++++++-----
 cmake/modules/IrisQCA.cmake            |  11 +-
 cmake/modules/IrisSCTP.cmake           |  28 +--
 include/iris/addressresolver.h         |   2 +-
 include/iris/bsocket.h                 |   2 +-
 include/iris/bytestream.h              |   2 +-
 include/iris/dtls.h                    |   2 +-
 include/iris/filetransfer.h            |   2 +-
 include/iris/httpconnect.h             |   2 +-
 include/iris/httpfileupload.h          |   2 +-
 include/iris/httppoll.h                |   2 +-
 include/iris/ice176.h                  |   2 +-
 include/iris/iceabstractstundisco.h    |   2 +-
 include/iris/iceagent.h                |   2 +-
 include/iris/im.h                      |   2 +-
 include/iris/irisnetexport.h           |   2 +-
 include/iris/irisnetglobal.h           |   2 +-
 include/iris/irisnetplugin.h           |   2 +-
 include/iris/jingle-application.h      |   2 +-
 include/iris/jingle-ft.h               |   2 +-
 include/iris/jingle-ice.h              |   2 +-
 include/iris/jingle-nstransportslist.h |   2 +-
 include/iris/jingle-s5b.h              |   2 +-
 include/iris/jingle-session.h          |   2 +-
 include/iris/jingle-transport.h        |   2 +-
 include/iris/jingle.h                  |   2 +-
 include/iris/ndns.h                    |   2 +-
 include/iris/netavailability.h         |   2 +-
 include/iris/netinterface.h            |   2 +-
 include/iris/netnames.h                |   2 +-
 include/iris/objectsession.h           |   2 +-
 include/iris/processquit.h             |   2 +-
 include/iris/s5b.h                     |   2 +-
 include/iris/socks.h                   |   2 +-
 include/iris/srvresolver.h             |   2 +-
 include/iris/stunallocate.h            |   2 +-
 include/iris/stunbinding.h             |   2 +-
 include/iris/stunmessage.h             |   2 +-
 include/iris/stuntransaction.h         |   2 +-
 include/iris/tcpportreserver.h         |   2 +-
 include/iris/turnclient.h              |   2 +-
 include/iris/udpportreserver.h         |   2 +-
 include/iris/xmpp.h                    |   2 +-
 include/iris/xmpp_address.h            |   2 +-
 include/iris/xmpp_agentitem.h          |   2 +-
 include/iris/xmpp_bitsofbinary.h       |   2 +-
 include/iris/xmpp_caps.h               |   2 +-
 include/iris/xmpp_captcha.h            |   2 +-
 include/iris/xmpp_chatstate.h          |   2 +-
 include/iris/xmpp_client.h             |   2 +-
 include/iris/xmpp_clientstream.h       |   2 +-
 include/iris/xmpp_discoinfotask.h      |   2 +-
 include/iris/xmpp_discoitem.h          |   2 +-
 include/iris/xmpp_encryption.h         |   2 +-
 include/iris/xmpp_encryptionhandler.h  |   2 +-
 include/iris/xmpp_features.h           |   2 +-
 include/iris/xmpp_hash.h               |   2 +-
 include/iris/xmpp_htmlelement.h        |   2 +-
 include/iris/xmpp_httpauthrequest.h    |   2 +-
 include/iris/xmpp_jid.h                |   2 +-
 include/iris/xmpp_liveroster.h         |   2 +-
 include/iris/xmpp_liverosteritem.h     |   2 +-
 include/iris/xmpp_message.h            |   2 +-
 include/iris/xmpp_muc.h                |   2 +-
 include/iris/xmpp_pubsubitem.h         |   2 +-
 include/iris/xmpp_pubsubretraction.h   |   2 +-
 include/iris/xmpp_reference.h          |   2 +-
 include/iris/xmpp_resource.h           |   2 +-
 include/iris/xmpp_resourcelist.h       |   2 +-
 include/iris/xmpp_roster.h             |   2 +-
 include/iris/xmpp_rosteritem.h         |   2 +-
 include/iris/xmpp_rosterx.h            |   2 +-
 include/iris/xmpp_serverinfomanager.h  |   2 +-
 include/iris/xmpp_stanza.h             |   2 +-
 include/iris/xmpp_status.h             |   2 +-
 include/iris/xmpp_stream.h             |   2 +-
 include/iris/xmpp_subsets.h            |   2 +-
 include/iris/xmpp_task.h               |   2 +-
 include/iris/xmpp_tasks.h              |   2 +-
 include/iris/xmpp_thumbs.h             |   2 +-
 include/iris/xmpp_url.h                |   2 +-
 include/iris/xmpp_vcard.h              |   2 +-
 include/iris/xmpp_xdata.h              |   2 +-
 include/iris/xmpp_xmlcommon.h          |   2 +-
 iris.pc.in                             |  10 +-
 src/irisnet/CMakeLists.txt             | 116 ++++--------
 src/irisnet/corelib/irisnetglobal.cpp  |   2 +-
 src/irisnet/corelib/netinterface.cpp   |   2 +-
 src/irisnet/corelib/netnames.cpp       |   2 +-
 src/irisnet/noncore/processquit.cpp    |   2 +-
 src/xmpp/CMakeLists.txt                | 180 ++++---------------
 src/xmpp/jid/jid.cpp                   |   2 +-
 src/xmpp/xmpp-core/stream.cpp          |   2 +-
 src/xmpp/xmpp-im/client.cpp            |   2 +-
 src/xmpp/xmpp-im/types.cpp             |   2 +-
 src/xmpp/xmpp-im/xmpp_tasks.cpp        |   2 +-
 tools/icetunnel/CMakeLists.txt         |  18 +-
 99 files changed, 449 insertions(+), 403 deletions(-)
 create mode 100644 .github/workflows/ci.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 00000000..886ff314
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,64 @@
+name: CI
+on:
+  - push
+  - pull_request
+  - workflow_dispatch
+
+jobs:
+  test-linux:
+    runs-on: ubuntu-latest
+    env:
+      CCACHE_DIR: ${{github.workspace}}/ccache
+      CCACHE_MAXSIZE: 100M
+    strategy:
+      matrix:
+        tag:
+          - minimal
+          - system-libs
+          - bundled-libs
+        include:
+          - tag: minimal
+            deps: |
+              libb2-dev
+              libqca-qt5-2-dev
+            options: -DIRIS_ENABLE_JINGLE_SCTP=OFF
+          - tag: system-libs
+            deps: |
+              libb2-dev
+              libqca-qt5-2-dev
+              libusrsctp-dev
+            options: -DIRIS_BUNDLED_QCA=OFF -DIRIS_BUNDLED_USRSCTP=OFF
+          - tag: bundled-libs
+            deps: null
+            options: -DIRIS_BUNDLED_QCA=ON -DIRIS_BUNDLED_USRSCTP=ON
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Install dependencies
+        uses: awalsh128/cache-apt-pkgs-action@latest
+        with:
+          packages: |
+            ${{matrix.deps}}
+            ccache
+            ninja-build
+            qtbase5-dev
+          version: ${{matrix.tag}}
+      - name: Configure
+        run: |
+          cmake -B ${{github.workspace}}/build -G Ninja \
+            -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+            -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+            ${{matrix.options}}
+      - name: Restore cache
+        uses: actions/cache/restore@v3
+        with:
+          key: ccache-linux-${{matrix.tag}}
+          path: ${{github.workspace}}/ccache
+      - name: Build
+        run: |
+          cmake --build ${{github.workspace}}/build -v -j $(nproc)
+      - name: Save cache
+        uses: actions/cache@v3
+        with:
+          key: ccache-linux-${{matrix.tag}}
+          path: ${{github.workspace}}/ccache
diff --git a/3rdparty/stringprep/CMakeLists.txt b/3rdparty/stringprep/CMakeLists.txt
index 2ad9c7f9..0e0684fe 100644
--- a/3rdparty/stringprep/CMakeLists.txt
+++ b/3rdparty/stringprep/CMakeLists.txt
@@ -1,7 +1,8 @@
 cmake_minimum_required(VERSION 3.10.0)
 
-project(stringprep LANGUAGES CXX)
-
+project(stringprep
+    LANGUAGES CXX
+)
 
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
@@ -14,13 +15,12 @@ add_library(stringprep STATIC
     profiles.cpp
     rfc3454.cpp
 )
+
 target_compile_definitions(stringprep PRIVATE QSTRINGPREP_BUILDING)
-target_include_directories(stringprep PUBLIC
-  ${CMAKE_CURRENT_SOURCE_DIR}
-)
 
 if(MSVC)
   target_compile_definitions(stringprep PRIVATE _CRT_SECURE_NO_WARNINGS _GENERATED_STDINT_H)
 endif()
 
-target_link_libraries(stringprep Qt5::Core)
+target_link_libraries(stringprep PUBLIC Qt5::Core)
+target_include_directories(stringprep PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3025ebb9..d680eabc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,45 +1,48 @@
 cmake_minimum_required(VERSION 3.10.0)
-project(iris)
+
+project(iris
+    DESCRIPTION "XMPP network library"
+    LANGUAGES C CXX
+)
 
 if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "Release")
 endif()
 
-#Sed d prefix for Windows OS debug builds
-if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND WIN32)
-    set(D "d")
-endif()
-if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND APPLE)
-    set(D "_debug")
+# Set 'd' prefix for Windows OS debug builds
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    if(WIN32)
+        set(D "d")
+    elseif(APPLE)
+        set(D "_debug")
+    endif()
 endif()
 
-#Check if Iris is subproject
+# Check if Iris is a subproject
 get_directory_property(IS_SUBPROJECT PARENT_DIRECTORY)
 
-set( IRIS_LIB_VERSION_MAJOR 1 )
-set( IRIS_LIB_VERSION_MINOR 0 )
-set( IRIS_LIB_VERSION_PATCH 0 )
-set( IRIS_LIB_VERSION_STRING
+set(IRIS_LIB_VERSION_MAJOR 1)
+set(IRIS_LIB_VERSION_MINOR 0)
+set(IRIS_LIB_VERSION_PATCH 0)
+set(IRIS_LIB_VERSION_STRING
     ${IRIS_LIB_VERSION_MAJOR}.${IRIS_LIB_VERSION_MINOR}.${IRIS_LIB_VERSION_PATCH}
-    )
-
-get_filename_component(ABS_PARENT_DIR "${CMAKE_CURRENT_LIST_DIR}/.." ABSOLUTE)
+)
 
 list(APPEND CMAKE_MODULE_PATH
     "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
-    "${ABS_PARENT_DIR}/cmake/modules"
-    "${PROJECT_SOURCE_DIR}/cmake/modules"
-    )
+    "${CMAKE_SOURCE_DIR}/cmake/modules"
+)
 
 include(policyRules)
 
-set( DEFAULT_BUNDLED_QCA OFF )
-
 set(CMAKE_AUTOMOC ON)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_CXX_STANDARD 11)
 
 # Detect MXE cross-compilation
+set(IRIS_DEFAULT_BUNDLED_USRSCTP OFF)
 if(NOT DEFINED USE_MXE AND (EXISTS "${CMAKE_TOOLCHAIN_FILE}"))
-    option( USE_MXE "Use MXE (cross-compilation build environment for MS Windows)" OFF )
+    option(USE_MXE "Use MXE (cross-compilation build environment for MS Windows)" OFF)
     string(TOLOWER ${CMAKE_TOOLCHAIN_FILE} TOOLCHAIN_FILE)
     string(REGEX MATCH "mxe-conf" MXE_DETECTED "${TOOLCHAIN_FILE}")
     if(MXE_DETECTED)
@@ -47,23 +50,24 @@ if(NOT DEFINED USE_MXE AND (EXISTS "${CMAKE_TOOLCHAIN_FILE}"))
         message(STATUS "MXE toolchain: ${CMAKE_TOOLCHAIN_FILE}")
         message(STATUS "MXE root path: ${CMAKE_PREFIX_PATH}")
         set(USE_MXE ON)
-        set(BUNDLED_USRSCTP ON)
+        set(IRIS_DEFAULT_BUNDLED_USRSCTP ON)
     endif()
 endif()
 
-if (APPLE OR (MSVC OR USE_MXE))
-    set( DEFAULT_BUNDLED_QCA ON )
+set(IRIS_DEFAULT_BUNDLED_QCA OFF)
+if(APPLE OR (MSVC OR USE_MXE))
+    set(IRIS_DEFAULT_BUNDLED_QCA ON)
 endif()
 
-option( JINGLE_SCTP "Enable SCTP over ICE Jingle transport / data channels" ON )
-option( BUNDLED_QCA "Adds: DTLS, Blake2b and other useful for XMPP crypto-stuff" ${DEFAULT_BUNDLED_QCA})
-option( BUILD_IRIS_TOOLS "Build tools and examples" OFF)
+option(IRIS_ENABLE_INSTALL "Enable installation" OFF)
+option(IRIS_ENABLE_JINGLE_SCTP "Enable SCTP over ICE Jingle transport / data channels" ON)
+option(IRIS_BUNDLED_QCA "Adds: DTLS, Blake2b and other useful for XMPP crypto-stuff" ${IRIS_DEFAULT_BUNDLED_QCA})
+option(IRIS_BUNDLED_USRSCTP "Compile compatible UsrSCTP lib (required for datachannel Jingle transport)" ${IRIS_DEFAULT_BUNDLED_USRSCTP})
+option(IRIS_BUILD_TOOLS "Build tools and examples" OFF)
+option(IRIS_ENABLE_DEBUG "Enable debugging code paths" OFF)
 
 set(CMAKE_CXX_STANDARD 17)
 
-include_directories(${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR})
-include_directories(include/iris)
-
 if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug" OR ("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo"))
     include(debug-definitions)
 endif()
@@ -72,16 +76,15 @@ find_package(Qt5 COMPONENTS Core Gui Xml Network REQUIRED)
 
 if(Qt5Core_FOUND)
     message(STATUS "Qt5 found, version ${Qt5Core_VERSION}")
-    if(BUNDLED_QCA AND("${Qt5Core_VERSION}" VERSION_LESS "5.6"))
-        message(FATAL_ERROR "Minimal Qt version for bundled Qca is 5.6. Please disable BUNDLED_QCA option")
+    if(IRIS_BUNDLED_QCA AND ("${Qt5Core_VERSION}" VERSION_LESS "5.6"))
+        message(FATAL_ERROR "Minimal Qt version for bundled Qca is 5.6. Please disable IRIS_BUNDLED_QCA option")
     endif()
 endif()
 
-#Find QCA package or use bundled if enabled
+# Find QCA package or use bundled if enabled
 include(IrisQCA)
 
 set(STDINT_FOUND OFF)
-
 find_file(STDINT_INCLUDE stdint.h)
 
 if(NOT ${STDINT_INCLUDE} STREQUAL "STDINT_INCLUDE-NOTFOUND")
@@ -89,27 +92,175 @@ if(NOT ${STDINT_INCLUDE} STREQUAL "STDINT_INCLUDE-NOTFOUND")
     set(STDINT_FOUND ON)
 endif()
 
-#Find SCTP package or use bundled if enabled
-if(JINGLE_SCTP)
+# Find SCTP package or use bundled if enabled
+if(IRIS_ENABLE_JINGLE_SCTP)
     include(IrisSCTP)
 endif()
 
-
-if (NOT BUNDLED_QCA)
+if(NOT IRIS_BUNDLED_QCA)
     find_package(B2 QUIET)
     if(B2_FOUND)
         message(STATUS "Found B2: ${B2_LIBRARY}")
     endif()
 endif()
 
-add_definitions(-DIRISNET_STATIC -DQSTRINGPREP_BUILDING)
-
 add_subdirectory(3rdparty/stringprep)
 add_subdirectory(src/irisnet)
 add_subdirectory(src/xmpp)
-if(BUILD_IRIS_TOOLS)
+
+if(IRIS_BUILD_TOOLS)
+    if(NOT IRIS_BUNDLED_QCA)
+        message(FATAL_ERROR "Bundled Qca is needed to build tools")
+    endif()
     add_subdirectory(tools)
 endif()
+
 if(NOT IS_SUBPROJECT)
     include(fix-codestyle)
 endif()
+
+if(IRIS_ENABLE_INSTALL)
+    include(CMakePackageConfigHelpers)
+    include(GNUInstallDirs)
+
+    write_basic_package_version_file(
+        ${CMAKE_CURRENT_BINARY_DIR}/IrisConfigVersion.cmake
+        VERSION ${IRIS_LIB_VERSION_STRING}
+        COMPATIBILITY SameMajorVersion
+    )
+    configure_file(
+        iris.pc.in
+        ${CMAKE_CURRENT_BINARY_DIR}/iris.pc
+        @ONLY
+    )
+
+    install(TARGETS iris
+        EXPORT iris
+        LIBRARY DESTINATION  ${CMAKE_INSTALL_LIBDIR}
+        ARCHIVE DESTINATION  ${CMAKE_INSTALL_LIBDIR}
+    )
+    install(EXPORT iris
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Iris
+        NAMESPACE iris::
+        FILE IrisConfig.cmake
+    )
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/IrisConfigVersion.cmake
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Iris
+    )
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iris.pc
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
+    )
+
+    set(IRISNET_CORELIB_HEADERS
+        src/irisnet/corelib/addressresolver.h
+        src/irisnet/corelib/irisnetexport.h
+        src/irisnet/corelib/irisnetglobal.h
+        src/irisnet/corelib/irisnetplugin.h
+        src/irisnet/corelib/netavailability.h
+        src/irisnet/corelib/netinterface.h
+        src/irisnet/corelib/netnames.h
+        src/irisnet/corelib/objectsession.h
+    )
+    set(IRISNET_NONCORE_HEADERS
+        src/irisnet/noncore/cutestuff/bsocket.h
+        src/irisnet/noncore/cutestuff/bytestream.h
+        src/irisnet/noncore/cutestuff/httpconnect.h
+        src/irisnet/noncore/cutestuff/httppoll.h
+        src/irisnet/noncore/cutestuff/socks.h
+        src/irisnet/noncore/dtls.h
+        src/irisnet/noncore/ice176.h
+        src/irisnet/noncore/iceabstractstundisco.h
+        src/irisnet/noncore/iceagent.h
+        src/irisnet/noncore/legacy/ndns.h
+        src/irisnet/noncore/legacy/srvresolver.h
+        src/irisnet/noncore/processquit.h
+        src/irisnet/noncore/stunallocate.h
+        src/irisnet/noncore/stunbinding.h
+        src/irisnet/noncore/stunmessage.h
+        src/irisnet/noncore/stuntransaction.h
+        src/irisnet/noncore/tcpportreserver.h
+        src/irisnet/noncore/turnclient.h
+        src/irisnet/noncore/udpportreserver.h
+    )
+    set(XMPP_JID_HEADERS
+        src/xmpp/jid/jid.h
+    )
+    set(XMPP_CORE_HEADERS
+        src/xmpp/xmpp-core/xmpp.h
+        src/xmpp/xmpp-core/xmpp_clientstream.h
+        src/xmpp/xmpp-core/xmpp_stanza.h
+        src/xmpp/xmpp-core/xmpp_stream.h
+    )
+    set(XMPP_IM_HEADERS
+        src/xmpp/xmpp-im/filetransfer.h
+        src/xmpp/xmpp-im/httpfileupload.h
+        src/xmpp/xmpp-im/im.h
+        src/xmpp/xmpp-im/jingle-application.h
+        src/xmpp/xmpp-im/jingle-ft.h
+        src/xmpp/xmpp-im/jingle-ice.h
+        src/xmpp/xmpp-im/jingle-nstransportslist.h
+        src/xmpp/xmpp-im/jingle-s5b.h
+        src/xmpp/xmpp-im/jingle-session.h
+        src/xmpp/xmpp-im/jingle-transport.h
+        src/xmpp/xmpp-im/jingle.h
+        src/xmpp/xmpp-im/s5b.h
+        src/xmpp/xmpp-im/xmpp_address.h
+        src/xmpp/xmpp-im/xmpp_agentitem.h
+        src/xmpp/xmpp-im/xmpp_bitsofbinary.h
+        src/xmpp/xmpp-im/xmpp_caps.h
+        src/xmpp/xmpp-im/xmpp_captcha.h
+        src/xmpp/xmpp-im/xmpp_chatstate.h
+        src/xmpp/xmpp-im/xmpp_client.h
+        src/xmpp/xmpp-im/xmpp_discoinfotask.h
+        src/xmpp/xmpp-im/xmpp_discoitem.h
+        src/xmpp/xmpp-im/xmpp_encryption.h
+        src/xmpp/xmpp-im/xmpp_encryptionhandler.h
+        src/xmpp/xmpp-im/xmpp_features.h
+        src/xmpp/xmpp-im/xmpp_hash.h
+        src/xmpp/xmpp-im/xmpp_htmlelement.h
+        src/xmpp/xmpp-im/xmpp_httpauthrequest.h
+        src/xmpp/xmpp-im/xmpp_liveroster.h
+        src/xmpp/xmpp-im/xmpp_liverosteritem.h
+        src/xmpp/xmpp-im/xmpp_message.h
+        src/xmpp/xmpp-im/xmpp_muc.h
+        src/xmpp/xmpp-im/xmpp_pubsubitem.h
+        src/xmpp/xmpp-im/xmpp_pubsubretraction.h
+        src/xmpp/xmpp-im/xmpp_reference.h
+        src/xmpp/xmpp-im/xmpp_resource.h
+        src/xmpp/xmpp-im/xmpp_resourcelist.h
+        src/xmpp/xmpp-im/xmpp_roster.h
+        src/xmpp/xmpp-im/xmpp_rosteritem.h
+        src/xmpp/xmpp-im/xmpp_rosterx.h
+        src/xmpp/xmpp-im/xmpp_serverinfomanager.h
+        src/xmpp/xmpp-im/xmpp_status.h
+        src/xmpp/xmpp-im/xmpp_subsets.h
+        src/xmpp/xmpp-im/xmpp_task.h
+        src/xmpp/xmpp-im/xmpp_tasks.h
+        src/xmpp/xmpp-im/xmpp_thumbs.h
+        src/xmpp/xmpp-im/xmpp_url.h
+        src/xmpp/xmpp-im/xmpp_vcard.h
+        src/xmpp/xmpp-im/xmpp_xdata.h
+        src/xmpp/xmpp-im/xmpp_xmlcommon.h
+    )
+
+    set(IRIS_INSTALL_INCLUDEDIR ${CMAKE_INSTALL_INCLUDEDIR}/xmpp/iris)
+    install(FILES ${IRISNET_CORELIB_HEADERS}
+        DESTINATION ${IRIS_INSTALL_INCLUDEDIR}/irisnet/corelib
+    )
+    install(FILES ${IRISNET_NONCORE_HEADERS}
+        DESTINATION ${IRIS_INSTALL_INCLUDEDIR}/irisnet/noncore
+    )
+    install(FILES ${XMPP_JID_HEADERS}
+        DESTINATION ${IRIS_INSTALL_INCLUDEDIR}/xmpp/jid
+    )
+    install(FILES ${XMPP_CORE_HEADERS}
+        DESTINATION ${IRIS_INSTALL_INCLUDEDIR}/xmpp/xmpp-core
+    )
+    install(FILES ${XMPP_IM_HEADERS}
+        DESTINATION ${IRIS_INSTALL_INCLUDEDIR}/xmpp/xmpp-im
+    )
+    install(DIRECTORY include/iris
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/xmpp
+        FILES_MATCHING PATTERN "*.h"
+    )
+endif()
diff --git a/cmake/modules/IrisQCA.cmake b/cmake/modules/IrisQCA.cmake
index 42787c33..4b87e45b 100644
--- a/cmake/modules/IrisQCA.cmake
+++ b/cmake/modules/IrisQCA.cmake
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10.0)
 
 set(IrisQCAGitRepo "https://github.com/psi-im/qca.git")
 
-if(BUNDLED_QCA)
+if(IRIS_BUNDLED_QCA)
     message(STATUS "QCA: using bundled")
     set(QCA_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qca)
     set(QCA_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/qca)
@@ -66,14 +66,7 @@ if(BUNDLED_QCA)
             )
     endif()
 else()
-    message(WARNING "Disabling BUNDLED_QCA option makes impossible to use DTLS and PsiMedia")
+    message(WARNING "Disabling IRIS_BUNDLED_QCA option makes impossible to use DTLS and PsiMedia")
     message(STATUS "QCA: using system")
     find_package(Qca REQUIRED)
 endif()
-
-set(QCA_INCLUDES ${Qca_INCLUDE_DIR})
-set(qca_LIB ${Qca_LIBRARY})
-
-include_directories(
-    ${Qca_INCLUDE_DIR}
-)
diff --git a/cmake/modules/IrisSCTP.cmake b/cmake/modules/IrisSCTP.cmake
index 54e8b1c8..42226968 100644
--- a/cmake/modules/IrisSCTP.cmake
+++ b/cmake/modules/IrisSCTP.cmake
@@ -1,23 +1,18 @@
 cmake_minimum_required(VERSION 3.10.0)
 
-include(CMakeDependentOption)
-cmake_dependent_option( BUNDLED_USRSCTP
-    "Compile compatible usrsctp lib when system one is not available or uncompatible (required for datachannel jingle transport)"
-    OFF "JINGLE_SCTP" OFF)
-
 set(IrisSCTPGitRepo "https://github.com/sctplab/usrsctp.git")
 
 if(USE_MXE AND STDINT_FOUND)
-    #Add SCTP_STDINT_INCLUDE definition to compile irisnet with usrsctp with MinGW
+    # Add SCTP_STDINT_INCLUDE definition to compile irisnet with usrsctp with MinGW
     add_definitions(
         -DSCTP_STDINT_INCLUDE="${STDINT_INCLUDE}"
     )
 endif()
 
-if(NOT BUNDLED_USRSCTP)
+if(NOT IRIS_BUNDLED_USRSCTP)
     find_package(UsrSCTP)
-    if (NOT UsrSCTP_FOUND)
-        message(FATAL_ERROR "UsrSCTP library not found. Try to install usrsctp library or enable BUNDLED_USRSCTP flag")
+    if(NOT UsrSCTP_FOUND)
+        message(FATAL_ERROR "UsrSCTP library not found. Try to install usrsctp library or enable IRIS_BUNDLED_USRSCTP flag")
     endif()
 else()
     message(STATUS "USRSCTP: using bundled")
@@ -25,9 +20,9 @@ else()
     set(USRSCTP_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/usrsctp)
     set(USRSCTP_BUILD_DIR ${USRSCTP_PREFIX}/build)
     if(NOT EXISTS ${USRSCTP_SOURCE_DIR})
-        list(APPEND USRSCTP_INCLUDE_DIR ${USRSCTP_PREFIX}/src/UsrSCTPProject/usrsctplib)
+        set(USRSCTP_INCLUDES ${USRSCTP_PREFIX}/src/UsrSCTPProject/usrsctplib)
     else()
-        list(APPEND USRSCTP_INCLUDE_DIR ${USRSCTP_SOURCE_DIR}/usrsctplib)
+        set(USRSCTP_INCLUDES ${USRSCTP_SOURCE_DIR}/usrsctplib)
     endif()
     set(USRSCTP_LIBRARY ${USRSCTP_BUILD_DIR}/usrsctplib/${CMAKE_STATIC_LIBRARY_PREFIX}usrsctp${CMAKE_STATIC_LIBRARY_SUFFIX})
     if(WIN32 AND MSVC)
@@ -78,14 +73,3 @@ else()
             IMPORTED_LINK_INTERFACE_LANGUAGES "C")
     add_dependencies(SctpLab::UsrSCTP ${USRSCTP_LIBRARY})
 endif()
-
-set(sctpLab_LIBRARY ${USRSCTP_LIBRARY})
-if(USRSCTP_INCLUDES)
-    set(sctpLab_INCLUDES ${USRSCTP_INCLUDES})
-else()
-    set(sctpLab_INCLUDES ${USRSCTP_INCLUDE_DIR})
-endif()
-include_directories(
-    ${sctpLab_INCLUDES}
-)
-add_definitions(-DJINGLE_SCTP)
diff --git a/include/iris/addressresolver.h b/include/iris/addressresolver.h
index 4e7e4455..6d771ec4 100644
--- a/include/iris/addressresolver.h
+++ b/include/iris/addressresolver.h
@@ -1 +1 @@
-#include "../../src/irisnet/corelib/addressresolver.h"
+#include "irisnet/corelib/addressresolver.h"
diff --git a/include/iris/bsocket.h b/include/iris/bsocket.h
index 5c7c906d..dc480185 100644
--- a/include/iris/bsocket.h
+++ b/include/iris/bsocket.h
@@ -1 +1 @@
-#include "../../src/irisnet/noncore/cutestuff/bsocket.h"
+#include "irisnet/noncore/cutestuff/bsocket.h"
diff --git a/include/iris/bytestream.h b/include/iris/bytestream.h
index cae0e2e9..5d276979 100644
--- a/include/iris/bytestream.h
+++ b/include/iris/bytestream.h
@@ -1 +1 @@
-#include "../../src/irisnet/noncore/cutestuff/bytestream.h"
+#include "irisnet/noncore/cutestuff/bytestream.h"
diff --git a/include/iris/dtls.h b/include/iris/dtls.h
index 02d353d7..7bfafddc 100644
--- a/include/iris/dtls.h
+++ b/include/iris/dtls.h
@@ -1 +1 @@
-#include "../../src/irisnet/noncore/dtls.h"
+#include "irisnet/noncore/dtls.h"
diff --git a/include/iris/filetransfer.h b/include/iris/filetransfer.h
index e17e8ab0..c9e5d59d 100644
--- a/include/iris/filetransfer.h
+++ b/include/iris/filetransfer.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/filetransfer.h"
+#include "xmpp/xmpp-im/filetransfer.h"
diff --git a/include/iris/httpconnect.h b/include/iris/httpconnect.h
index 91306af6..b0840552 100644
--- a/include/iris/httpconnect.h
+++ b/include/iris/httpconnect.h
@@ -1 +1 @@
-#include "../../src/irisnet/noncore/cutestuff/httpconnect.h"
+#include "irisnet/noncore/cutestuff/httpconnect.h"
diff --git a/include/iris/httpfileupload.h b/include/iris/httpfileupload.h
index 381b857d..efe0bb11 100644
--- a/include/iris/httpfileupload.h
+++ b/include/iris/httpfileupload.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/httpfileupload.h"
+#include "xmpp/xmpp-im/httpfileupload.h"
diff --git a/include/iris/httppoll.h b/include/iris/httppoll.h
index 5ac52eb5..162d67c0 100644
--- a/include/iris/httppoll.h
+++ b/include/iris/httppoll.h
@@ -1 +1 @@
-#include "../../src/irisnet/noncore/cutestuff/httppoll.h"
+#include "irisnet/noncore/cutestuff/httppoll.h"
diff --git a/include/iris/ice176.h b/include/iris/ice176.h
index 5a6360a5..adc42e8c 100644
--- a/include/iris/ice176.h
+++ b/include/iris/ice176.h
@@ -1 +1 @@
-#include "../../src/irisnet/noncore/ice176.h"
+#include "irisnet/noncore/ice176.h"
diff --git a/include/iris/iceabstractstundisco.h b/include/iris/iceabstractstundisco.h
index e1ff2fd5..9f3f6a8a 100644
--- a/include/iris/iceabstractstundisco.h
+++ b/include/iris/iceabstractstundisco.h
@@ -1 +1 @@
-#include "../../src/irisnet/noncore/iceabstractstundisco.h"
+#include "irisnet/noncore/iceabstractstundisco.h"
diff --git a/include/iris/iceagent.h b/include/iris/iceagent.h
index 61b9e68e..c8739eda 100644
--- a/include/iris/iceagent.h
+++ b/include/iris/iceagent.h
@@ -1 +1 @@
-#include "../../src/irisnet/noncore/iceagent.h"
+#include "irisnet/noncore/iceagent.h"
diff --git a/include/iris/im.h b/include/iris/im.h
index beb8c104..ee83ff9a 100644
--- a/include/iris/im.h
+++ b/include/iris/im.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/im.h"
+#include "xmpp/xmpp-im/im.h"
diff --git a/include/iris/irisnetexport.h b/include/iris/irisnetexport.h
index d169d1ed..9cb9d147 100644
--- a/include/iris/irisnetexport.h
+++ b/include/iris/irisnetexport.h
@@ -1 +1 @@
-#include "../../src/irisnet/corelib/irisnetexport.h"
+#include "irisnet/corelib/irisnetexport.h"
diff --git a/include/iris/irisnetglobal.h b/include/iris/irisnetglobal.h
index 28a55c73..552439d9 100644
--- a/include/iris/irisnetglobal.h
+++ b/include/iris/irisnetglobal.h
@@ -1 +1 @@
-#include "../../src/irisnet/corelib/irisnetglobal.h"
+#include "irisnet/corelib/irisnetglobal.h"
diff --git a/include/iris/irisnetplugin.h b/include/iris/irisnetplugin.h
index 2d4b0a3a..86d21917 100644
--- a/include/iris/irisnetplugin.h
+++ b/include/iris/irisnetplugin.h
@@ -1 +1 @@
-#include "../../src/irisnet/corelib/irisnetplugin.h"
+#include "irisnet/corelib/irisnetplugin.h"
diff --git a/include/iris/jingle-application.h b/include/iris/jingle-application.h
index adab289d..754225c1 100644
--- a/include/iris/jingle-application.h
+++ b/include/iris/jingle-application.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/jingle-application.h"
+#include "xmpp/xmpp-im/jingle-application.h"
diff --git a/include/iris/jingle-ft.h b/include/iris/jingle-ft.h
index a9880b3f..7caced0e 100644
--- a/include/iris/jingle-ft.h
+++ b/include/iris/jingle-ft.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/jingle-ft.h"
+#include "xmpp/xmpp-im/jingle-ft.h"
diff --git a/include/iris/jingle-ice.h b/include/iris/jingle-ice.h
index 98b263fb..6dd3e033 100644
--- a/include/iris/jingle-ice.h
+++ b/include/iris/jingle-ice.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/jingle-ice.h"
+#include "xmpp/xmpp-im/jingle-ice.h"
diff --git a/include/iris/jingle-nstransportslist.h b/include/iris/jingle-nstransportslist.h
index affbfd0e..a1f36859 100644
--- a/include/iris/jingle-nstransportslist.h
+++ b/include/iris/jingle-nstransportslist.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/jingle-nstransportslist.h"
+#include "xmpp/xmpp-im/jingle-nstransportslist.h"
diff --git a/include/iris/jingle-s5b.h b/include/iris/jingle-s5b.h
index 725e0a05..b34fceea 100644
--- a/include/iris/jingle-s5b.h
+++ b/include/iris/jingle-s5b.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/jingle-s5b.h"
+#include "xmpp/xmpp-im/jingle-s5b.h"
diff --git a/include/iris/jingle-session.h b/include/iris/jingle-session.h
index 78248dcf..d8c14eea 100644
--- a/include/iris/jingle-session.h
+++ b/include/iris/jingle-session.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/jingle-session.h"
+#include "xmpp/xmpp-im/jingle-session.h"
diff --git a/include/iris/jingle-transport.h b/include/iris/jingle-transport.h
index b83eb5a4..6898bd68 100644
--- a/include/iris/jingle-transport.h
+++ b/include/iris/jingle-transport.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/jingle-transport.h"
+#include "xmpp/xmpp-im/jingle-transport.h"
diff --git a/include/iris/jingle.h b/include/iris/jingle.h
index 73551781..c4d32a97 100644
--- a/include/iris/jingle.h
+++ b/include/iris/jingle.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/jingle.h"
+#include "xmpp/xmpp-im/jingle.h"
diff --git a/include/iris/ndns.h b/include/iris/ndns.h
index ea5c8b5f..9c270bba 100644
--- a/include/iris/ndns.h
+++ b/include/iris/ndns.h
@@ -1 +1 @@
-#include "../../src/irisnet/noncore/legacy/ndns.h"
+#include "irisnet/noncore/legacy/ndns.h"
diff --git a/include/iris/netavailability.h b/include/iris/netavailability.h
index 11ef9114..8079c5f6 100644
--- a/include/iris/netavailability.h
+++ b/include/iris/netavailability.h
@@ -1 +1 @@
-#include "../../src/irisnet/corelib/netavailability.h"
+#include "irisnet/corelib/netavailability.h"
diff --git a/include/iris/netinterface.h b/include/iris/netinterface.h
index 6e0e2333..4d95300d 100644
--- a/include/iris/netinterface.h
+++ b/include/iris/netinterface.h
@@ -1 +1 @@
-#include "../../src/irisnet/corelib/netinterface.h"
+#include "irisnet/corelib/netinterface.h"
diff --git a/include/iris/netnames.h b/include/iris/netnames.h
index 5ac6a1ee..804950ca 100644
--- a/include/iris/netnames.h
+++ b/include/iris/netnames.h
@@ -1 +1 @@
-#include "../../src/irisnet/corelib/netnames.h"
+#include "irisnet/corelib/netnames.h"
diff --git a/include/iris/objectsession.h b/include/iris/objectsession.h
index 31bb9009..e98bef86 100644
--- a/include/iris/objectsession.h
+++ b/include/iris/objectsession.h
@@ -1 +1 @@
-#include "../../src/irisnet/corelib/objectsession.h"
+#include "irisnet/corelib/objectsession.h"
diff --git a/include/iris/processquit.h b/include/iris/processquit.h
index 0f39f170..c92f192f 100644
--- a/include/iris/processquit.h
+++ b/include/iris/processquit.h
@@ -1 +1 @@
-#include "../../src/irisnet/noncore/processquit.h"
+#include "irisnet/noncore/processquit.h"
diff --git a/include/iris/s5b.h b/include/iris/s5b.h
index 6658c494..d868c241 100644
--- a/include/iris/s5b.h
+++ b/include/iris/s5b.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/s5b.h"
+#include "xmpp/xmpp-im/s5b.h"
diff --git a/include/iris/socks.h b/include/iris/socks.h
index ff5108ab..08cdb678 100644
--- a/include/iris/socks.h
+++ b/include/iris/socks.h
@@ -1 +1 @@
-#include "../../src/irisnet/noncore/cutestuff/socks.h"
+#include "irisnet/noncore/cutestuff/socks.h"
diff --git a/include/iris/srvresolver.h b/include/iris/srvresolver.h
index 7ece1aba..13ea4671 100644
--- a/include/iris/srvresolver.h
+++ b/include/iris/srvresolver.h
@@ -1 +1 @@
-#include "../../src/irisnet/noncore/legacy/srvresolver.h"
+#include "irisnet/noncore/legacy/srvresolver.h"
diff --git a/include/iris/stunallocate.h b/include/iris/stunallocate.h
index a1c9a746..4b5d7aa6 100644
--- a/include/iris/stunallocate.h
+++ b/include/iris/stunallocate.h
@@ -1 +1 @@
-#include "../../src/irisnet/noncore/stunallocate.h"
+#include "irisnet/noncore/stunallocate.h"
diff --git a/include/iris/stunbinding.h b/include/iris/stunbinding.h
index 86f92df1..5370cc52 100644
--- a/include/iris/stunbinding.h
+++ b/include/iris/stunbinding.h
@@ -1 +1 @@
-#include "../../src/irisnet/noncore/stunbinding.h"
+#include "irisnet/noncore/stunbinding.h"
diff --git a/include/iris/stunmessage.h b/include/iris/stunmessage.h
index 6025e7b8..40ac0d7c 100644
--- a/include/iris/stunmessage.h
+++ b/include/iris/stunmessage.h
@@ -1 +1 @@
-#include "../../src/irisnet/noncore/stunmessage.h"
+#include "irisnet/noncore/stunmessage.h"
diff --git a/include/iris/stuntransaction.h b/include/iris/stuntransaction.h
index 05d65576..fef1831c 100644
--- a/include/iris/stuntransaction.h
+++ b/include/iris/stuntransaction.h
@@ -1 +1 @@
-#include "../../src/irisnet/noncore/stuntransaction.h"
+#include "irisnet/noncore/stuntransaction.h"
diff --git a/include/iris/tcpportreserver.h b/include/iris/tcpportreserver.h
index ed0f9a46..5fa38181 100644
--- a/include/iris/tcpportreserver.h
+++ b/include/iris/tcpportreserver.h
@@ -1 +1 @@
-#include "../../src/irisnet/noncore/tcpportreserver.h"
+#include "irisnet/noncore/tcpportreserver.h"
diff --git a/include/iris/turnclient.h b/include/iris/turnclient.h
index 07de0434..1edf8d39 100644
--- a/include/iris/turnclient.h
+++ b/include/iris/turnclient.h
@@ -1 +1 @@
-#include "../../src/irisnet/noncore/turnclient.h"
+#include "irisnet/noncore/turnclient.h"
diff --git a/include/iris/udpportreserver.h b/include/iris/udpportreserver.h
index d7e93233..50101a1e 100644
--- a/include/iris/udpportreserver.h
+++ b/include/iris/udpportreserver.h
@@ -1 +1 @@
-#include "../../src/irisnet/noncore/udpportreserver.h"
+#include "irisnet/noncore/udpportreserver.h"
diff --git a/include/iris/xmpp.h b/include/iris/xmpp.h
index cbeb4bab..1ced3d12 100644
--- a/include/iris/xmpp.h
+++ b/include/iris/xmpp.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-core/xmpp.h"
+#include "xmpp/xmpp-core/xmpp.h"
diff --git a/include/iris/xmpp_address.h b/include/iris/xmpp_address.h
index a6b8a669..2d87c6db 100644
--- a/include/iris/xmpp_address.h
+++ b/include/iris/xmpp_address.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_address.h"
+#include "xmpp/xmpp-im/xmpp_address.h"
diff --git a/include/iris/xmpp_agentitem.h b/include/iris/xmpp_agentitem.h
index 4ac1d4ee..fd477af0 100644
--- a/include/iris/xmpp_agentitem.h
+++ b/include/iris/xmpp_agentitem.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_agentitem.h"
+#include "xmpp/xmpp-im/xmpp_agentitem.h"
diff --git a/include/iris/xmpp_bitsofbinary.h b/include/iris/xmpp_bitsofbinary.h
index 01b1bf8d..011ebf4a 100644
--- a/include/iris/xmpp_bitsofbinary.h
+++ b/include/iris/xmpp_bitsofbinary.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_bitsofbinary.h"
+#include "xmpp/xmpp-im/xmpp_bitsofbinary.h"
diff --git a/include/iris/xmpp_caps.h b/include/iris/xmpp_caps.h
index 4dde12ab..7b758b41 100644
--- a/include/iris/xmpp_caps.h
+++ b/include/iris/xmpp_caps.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_caps.h"
+#include "xmpp/xmpp-im/xmpp_caps.h"
diff --git a/include/iris/xmpp_captcha.h b/include/iris/xmpp_captcha.h
index 466b4315..1a00797f 100644
--- a/include/iris/xmpp_captcha.h
+++ b/include/iris/xmpp_captcha.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_captcha.h"
+#include "xmpp/xmpp-im/xmpp_captcha.h"
diff --git a/include/iris/xmpp_chatstate.h b/include/iris/xmpp_chatstate.h
index a09c9cc6..a4c29fa2 100644
--- a/include/iris/xmpp_chatstate.h
+++ b/include/iris/xmpp_chatstate.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_chatstate.h"
+#include "xmpp/xmpp-im/xmpp_chatstate.h"
diff --git a/include/iris/xmpp_client.h b/include/iris/xmpp_client.h
index 8d7b1ac7..44c3397f 100644
--- a/include/iris/xmpp_client.h
+++ b/include/iris/xmpp_client.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_client.h"
+#include "xmpp/xmpp-im/xmpp_client.h"
diff --git a/include/iris/xmpp_clientstream.h b/include/iris/xmpp_clientstream.h
index 090f8548..6f2054ba 100644
--- a/include/iris/xmpp_clientstream.h
+++ b/include/iris/xmpp_clientstream.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-core/xmpp_clientstream.h"
+#include "xmpp/xmpp-core/xmpp_clientstream.h"
diff --git a/include/iris/xmpp_discoinfotask.h b/include/iris/xmpp_discoinfotask.h
index 2e06c7be..38410b48 100644
--- a/include/iris/xmpp_discoinfotask.h
+++ b/include/iris/xmpp_discoinfotask.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_discoinfotask.h"
+#include "xmpp/xmpp-im/xmpp_discoinfotask.h"
diff --git a/include/iris/xmpp_discoitem.h b/include/iris/xmpp_discoitem.h
index 76c777f2..4e7a1fa1 100644
--- a/include/iris/xmpp_discoitem.h
+++ b/include/iris/xmpp_discoitem.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_discoitem.h"
+#include "xmpp/xmpp-im/xmpp_discoitem.h"
diff --git a/include/iris/xmpp_encryption.h b/include/iris/xmpp_encryption.h
index 5b3a05f5..895f43b1 100644
--- a/include/iris/xmpp_encryption.h
+++ b/include/iris/xmpp_encryption.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_encryption.h"
+#include "xmpp/xmpp-im/xmpp_encryption.h"
diff --git a/include/iris/xmpp_encryptionhandler.h b/include/iris/xmpp_encryptionhandler.h
index 26e56549..3c7aecd9 100644
--- a/include/iris/xmpp_encryptionhandler.h
+++ b/include/iris/xmpp_encryptionhandler.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_encryptionhandler.h"
+#include "xmpp/xmpp-im/xmpp_encryptionhandler.h"
diff --git a/include/iris/xmpp_features.h b/include/iris/xmpp_features.h
index caf6865d..2a06625a 100644
--- a/include/iris/xmpp_features.h
+++ b/include/iris/xmpp_features.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_features.h"
+#include "xmpp/xmpp-im/xmpp_features.h"
diff --git a/include/iris/xmpp_hash.h b/include/iris/xmpp_hash.h
index b27bbbd1..dc081bed 100644
--- a/include/iris/xmpp_hash.h
+++ b/include/iris/xmpp_hash.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_hash.h"
+#include "xmpp/xmpp-im/xmpp_hash.h"
diff --git a/include/iris/xmpp_htmlelement.h b/include/iris/xmpp_htmlelement.h
index 95bab250..fdf91719 100644
--- a/include/iris/xmpp_htmlelement.h
+++ b/include/iris/xmpp_htmlelement.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_htmlelement.h"
+#include "xmpp/xmpp-im/xmpp_htmlelement.h"
diff --git a/include/iris/xmpp_httpauthrequest.h b/include/iris/xmpp_httpauthrequest.h
index bec230e9..63646a1e 100644
--- a/include/iris/xmpp_httpauthrequest.h
+++ b/include/iris/xmpp_httpauthrequest.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_httpauthrequest.h"
+#include "xmpp/xmpp-im/xmpp_httpauthrequest.h"
diff --git a/include/iris/xmpp_jid.h b/include/iris/xmpp_jid.h
index bdb862da..94dc48d7 100644
--- a/include/iris/xmpp_jid.h
+++ b/include/iris/xmpp_jid.h
@@ -1 +1 @@
-#include "../../src/xmpp/jid/jid.h"
+#include "xmpp/jid/jid.h"
diff --git a/include/iris/xmpp_liveroster.h b/include/iris/xmpp_liveroster.h
index ab67fcbc..bab57092 100644
--- a/include/iris/xmpp_liveroster.h
+++ b/include/iris/xmpp_liveroster.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_liveroster.h"
+#include "xmpp/xmpp-im/xmpp_liveroster.h"
diff --git a/include/iris/xmpp_liverosteritem.h b/include/iris/xmpp_liverosteritem.h
index db5c2488..1a2efc15 100644
--- a/include/iris/xmpp_liverosteritem.h
+++ b/include/iris/xmpp_liverosteritem.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_liverosteritem.h"
+#include "xmpp/xmpp-im/xmpp_liverosteritem.h"
diff --git a/include/iris/xmpp_message.h b/include/iris/xmpp_message.h
index a75e34fa..29428d99 100644
--- a/include/iris/xmpp_message.h
+++ b/include/iris/xmpp_message.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_message.h"
+#include "xmpp/xmpp-im/xmpp_message.h"
diff --git a/include/iris/xmpp_muc.h b/include/iris/xmpp_muc.h
index 6f6fe741..6f0ae4d4 100644
--- a/include/iris/xmpp_muc.h
+++ b/include/iris/xmpp_muc.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_muc.h"
+#include "xmpp/xmpp-im/xmpp_muc.h"
diff --git a/include/iris/xmpp_pubsubitem.h b/include/iris/xmpp_pubsubitem.h
index 59f19b3b..780bff84 100644
--- a/include/iris/xmpp_pubsubitem.h
+++ b/include/iris/xmpp_pubsubitem.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_pubsubitem.h"
+#include "xmpp/xmpp-im/xmpp_pubsubitem.h"
diff --git a/include/iris/xmpp_pubsubretraction.h b/include/iris/xmpp_pubsubretraction.h
index d89799d4..49151f85 100644
--- a/include/iris/xmpp_pubsubretraction.h
+++ b/include/iris/xmpp_pubsubretraction.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_pubsubretraction.h"
+#include "xmpp/xmpp-im/xmpp_pubsubretraction.h"
diff --git a/include/iris/xmpp_reference.h b/include/iris/xmpp_reference.h
index 0dee0eae..fa00c922 100644
--- a/include/iris/xmpp_reference.h
+++ b/include/iris/xmpp_reference.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_reference.h"
+#include "xmpp/xmpp-im/xmpp_reference.h"
diff --git a/include/iris/xmpp_resource.h b/include/iris/xmpp_resource.h
index 2f5a9979..b0867cf5 100644
--- a/include/iris/xmpp_resource.h
+++ b/include/iris/xmpp_resource.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_resource.h"
+#include "xmpp/xmpp-im/xmpp_resource.h"
diff --git a/include/iris/xmpp_resourcelist.h b/include/iris/xmpp_resourcelist.h
index 5771cdd1..27f5d3ad 100644
--- a/include/iris/xmpp_resourcelist.h
+++ b/include/iris/xmpp_resourcelist.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_resourcelist.h"
+#include "xmpp/xmpp-im/xmpp_resourcelist.h"
diff --git a/include/iris/xmpp_roster.h b/include/iris/xmpp_roster.h
index 646f2970..27c9b32c 100644
--- a/include/iris/xmpp_roster.h
+++ b/include/iris/xmpp_roster.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_roster.h"
+#include "xmpp/xmpp-im/xmpp_roster.h"
diff --git a/include/iris/xmpp_rosteritem.h b/include/iris/xmpp_rosteritem.h
index f4d4cf7b..94c9d809 100644
--- a/include/iris/xmpp_rosteritem.h
+++ b/include/iris/xmpp_rosteritem.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_rosteritem.h"
+#include "xmpp/xmpp-im/xmpp_rosteritem.h"
diff --git a/include/iris/xmpp_rosterx.h b/include/iris/xmpp_rosterx.h
index 325b56a6..2d7a9728 100644
--- a/include/iris/xmpp_rosterx.h
+++ b/include/iris/xmpp_rosterx.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_rosterx.h"
+#include "xmpp/xmpp-im/xmpp_rosterx.h"
diff --git a/include/iris/xmpp_serverinfomanager.h b/include/iris/xmpp_serverinfomanager.h
index dd79d801..8c5d7f86 100644
--- a/include/iris/xmpp_serverinfomanager.h
+++ b/include/iris/xmpp_serverinfomanager.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_serverinfomanager.h"
+#include "xmpp/xmpp-im/xmpp_serverinfomanager.h"
diff --git a/include/iris/xmpp_stanza.h b/include/iris/xmpp_stanza.h
index 4f0b024d..e8cb64f7 100644
--- a/include/iris/xmpp_stanza.h
+++ b/include/iris/xmpp_stanza.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-core/xmpp_stanza.h"
+#include "xmpp/xmpp-core/xmpp_stanza.h"
diff --git a/include/iris/xmpp_status.h b/include/iris/xmpp_status.h
index 69511013..2c923b42 100644
--- a/include/iris/xmpp_status.h
+++ b/include/iris/xmpp_status.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_status.h"
+#include "xmpp/xmpp-im/xmpp_status.h"
diff --git a/include/iris/xmpp_stream.h b/include/iris/xmpp_stream.h
index 5c996666..5ce83e84 100644
--- a/include/iris/xmpp_stream.h
+++ b/include/iris/xmpp_stream.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-core/xmpp_stream.h"
+#include "xmpp/xmpp-core/xmpp_stream.h"
diff --git a/include/iris/xmpp_subsets.h b/include/iris/xmpp_subsets.h
index be99daa2..5b54bed1 100644
--- a/include/iris/xmpp_subsets.h
+++ b/include/iris/xmpp_subsets.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_subsets.h"
+#include "xmpp/xmpp-im/xmpp_subsets.h"
diff --git a/include/iris/xmpp_task.h b/include/iris/xmpp_task.h
index 0f8f4667..ac65e099 100644
--- a/include/iris/xmpp_task.h
+++ b/include/iris/xmpp_task.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_task.h"
+#include "xmpp/xmpp-im/xmpp_task.h"
diff --git a/include/iris/xmpp_tasks.h b/include/iris/xmpp_tasks.h
index 6cb81815..0dc03e84 100644
--- a/include/iris/xmpp_tasks.h
+++ b/include/iris/xmpp_tasks.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_tasks.h"
+#include "xmpp/xmpp-im/xmpp_tasks.h"
diff --git a/include/iris/xmpp_thumbs.h b/include/iris/xmpp_thumbs.h
index b24861a0..7715981f 100644
--- a/include/iris/xmpp_thumbs.h
+++ b/include/iris/xmpp_thumbs.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_thumbs.h"
+#include "xmpp/xmpp-im/xmpp_thumbs.h"
diff --git a/include/iris/xmpp_url.h b/include/iris/xmpp_url.h
index 16b3ac6a..674eb76d 100644
--- a/include/iris/xmpp_url.h
+++ b/include/iris/xmpp_url.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_url.h"
+#include "xmpp/xmpp-im/xmpp_url.h"
diff --git a/include/iris/xmpp_vcard.h b/include/iris/xmpp_vcard.h
index 285e6b5c..1210fdb3 100644
--- a/include/iris/xmpp_vcard.h
+++ b/include/iris/xmpp_vcard.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_vcard.h"
+#include "xmpp/xmpp-im/xmpp_vcard.h"
diff --git a/include/iris/xmpp_xdata.h b/include/iris/xmpp_xdata.h
index 417e71f7..8316f4c9 100644
--- a/include/iris/xmpp_xdata.h
+++ b/include/iris/xmpp_xdata.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_xdata.h"
+#include "xmpp/xmpp-im/xmpp_xdata.h"
diff --git a/include/iris/xmpp_xmlcommon.h b/include/iris/xmpp_xmlcommon.h
index 779b4b59..2c0d42c0 100644
--- a/include/iris/xmpp_xmlcommon.h
+++ b/include/iris/xmpp_xmlcommon.h
@@ -1 +1 @@
-#include "../../src/xmpp/xmpp-im/xmpp_xmlcommon.h"
+#include "xmpp/xmpp-im/xmpp_xmlcommon.h"
diff --git a/iris.pc.in b/iris.pc.in
index 676104d0..68f1faaa 100644
--- a/iris.pc.in
+++ b/iris.pc.in
@@ -1,10 +1,10 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-libdir=@LIB_INSTALL_DIR@
-includedir=@INCLUDE_INSTALL_DIR@/iris
+prefix="@CMAKE_INSTALL_PREFIX@"
+exec_prefix="${prefix}"
+libdir="${prefix}/@CMAKE_INSTALL_LIBDIR@"
+includedir="${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/xmpp"
 
 Name: iris
 Description: Iris is a comprehensive library for working with the XMPP protocol
-Version: @IRIS_LIB_MAJOR_VERSION@.@IRIS_LIB_MINOR_VERSION@.@IRIS_LIB_PATCH_VERSION@
+Version: @IRIS_LIB_VERSION_STRING@
 Libs: -L${libdir} -liris
 Cflags: -I${includedir}
diff --git a/src/irisnet/CMakeLists.txt b/src/irisnet/CMakeLists.txt
index 54a383b2..3d3a1aa0 100644
--- a/src/irisnet/CMakeLists.txt
+++ b/src/irisnet/CMakeLists.txt
@@ -1,21 +1,13 @@
 cmake_minimum_required(VERSION 3.10.0)
-get_filename_component(ABS_PARENT_DIR "${CMAKE_CURRENT_LIST_DIR}/.." ABSOLUTE)
-include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
-    corelib
-    noncore
-    noncore/cutestuff
-    noncore/legacy
-    ${QCA_INCLUDES}
-    ${sctpLab_INCLUDES}
-)
 
 list(APPEND CMAKE_MODULE_PATH
+    "${CMAKE_SOURCE_DIR}/cmake/modules"
     "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
-    "${ABS_PARENT_DIR}/cmake/modules"
 )
 
-set(SOURCES
+add_library(irisnet STATIC)
+
+target_sources(irisnet PRIVATE
     corelib/irisnetglobal.cpp
     corelib/irisnetplugin.cpp
 
@@ -58,88 +50,48 @@ set(SOURCES
 )
 
 if(UNIX)
-    list(APPEND SOURCES corelib/netinterface_unix.cpp)
+    target_sources(irisnet PRIVATE
+        corelib/netinterface_unix.cpp
+    )
 endif()
 
-set(HEADERS
-    corelib/irisnetexport.h
-    corelib/irisnetglobal.h
-    corelib/irisnetglobal_p.h
-
-    noncore/stunmessage.h
-    noncore/stuntypes.h
-    noncore/stunutil.h
-
-    corelib/addressresolver.h
-    corelib/irisnetplugin.h
-    corelib/netavailability.h
-    corelib/netinterface.h
-    corelib/netnames.h
-    corelib/objectsession.h
-
-    noncore/iceagent.h
-    noncore/ice176.h
-    noncore/icecomponent.h
-    noncore/icelocaltransport.h
-    noncore/icetransport.h
-    noncore/iceturntransport.h
-    noncore/processquit.h
-    noncore/stunallocate.h
-    noncore/stunbinding.h
-    noncore/stuntransaction.h
-    noncore/turnclient.h
-    noncore/udpportreserver.h
-    noncore/tcpportreserver.h
-    noncore/dtls.h
-    noncore/iceabstractstundisco.h
-
-    noncore/cutestuff/bsocket.h
-    noncore/cutestuff/bytestream.h
-    noncore/cutestuff/httpconnect.h
-    noncore/cutestuff/httppoll.h
-    noncore/cutestuff/socks.h
-
-    noncore/legacy/ndns.h
-    noncore/legacy/srvresolver.h
-    noncore/transportaddress.h
-)
-
-if(JINGLE_SCTP)
-    list(APPEND SOURCES
+if(IRIS_ENABLE_JINGLE_SCTP)
+    target_sources(irisnet PRIVATE
         noncore/sctp/SctpAssociation.cpp
         noncore/sctp/DepUsrSCTP.cpp
-        )
-
-    list(APPEND HEADERS
-        noncore/sctp/Logger.hpp
-        noncore/sctp/SctpAssociation.hpp
-        noncore/sctp/DepUsrSCTP.hpp
-        noncore/sctp/RTC/DataConsumer.hpp
-        noncore/sctp/RTC/DataProducer.hpp
-        noncore/sctp/RTC/SctpParameters.hpp
-        )
+    )
 endif()
 
-add_library(irisnet STATIC ${SOURCES} ${HEADERS} )
+if(IRIS_BUNDLED_QCA)
+    add_dependencies(irisnet QcaProject)
+endif()
 
-if(WIN32)
-    set(EXTRA_LDFLAGS ws2_32 iphlpapi)
+if(IRIS_ENABLE_JINGLE_SCTP AND IRIS_BUNDLED_USRSCTP)
+    add_dependencies(irisnet UsrSCTPProject)
 endif()
 
+target_include_directories(irisnet
+    PRIVATE
+        ${CMAKE_SOURCE_DIR}/include/iris
+        ${CMAKE_SOURCE_DIR}/src
+        ${Qca_INCLUDE_DIR}
+    PUBLIC
+        ${USRSCTP_INCLUDES}
+)
+
 target_compile_definitions(irisnet PRIVATE HAVE_QTNET)
-target_link_libraries(irisnet Qt5::Core Qt5::Network Qt5::Xml)
-if (BUNDLED_QCA)
-    add_dependencies(irisnet QcaProject)
-endif()
-if (BUNDLED_USRSCTP)
-    add_dependencies(irisnet UsrSCTPProject)
+
+if(WIN32)
+    target_link_libraries(irisnet PUBLIC ws2_32 iphlpapi)
 endif()
-target_link_libraries(irisnet ${qca_LIB})
-target_link_libraries(irisnet ${sctpLab_LIBRARY})
-target_link_libraries(irisnet ${EXTRA_LDFLAGS})
 
-# usrsctp requires pthread
+# UsrSCTP requires pthread
 if(NOT WIN32)
     find_package(Threads)
-    target_link_libraries(irisnet Threads::Threads)
+    target_link_libraries(irisnet PUBLIC Threads::Threads)
 endif()
+
+target_link_libraries(irisnet PUBLIC
+    ${Qca_LIBRARY} ${USRSCTP_LIBRARY}
+    Qt5::Core Qt5::Network Qt5::Xml
+)
diff --git a/src/irisnet/corelib/irisnetglobal.cpp b/src/irisnet/corelib/irisnetglobal.cpp
index 11461560..433a40df 100644
--- a/src/irisnet/corelib/irisnetglobal.cpp
+++ b/src/irisnet/corelib/irisnetglobal.cpp
@@ -16,7 +16,7 @@
  *
  */
 
-#include "irisnetglobal_p.h"
+#include "corelib/irisnetglobal_p.h"
 #include "irisnetplugin.h"
 
 namespace XMPP {
diff --git a/src/irisnet/corelib/netinterface.cpp b/src/irisnet/corelib/netinterface.cpp
index 5fb449c2..860e6d6b 100644
--- a/src/irisnet/corelib/netinterface.cpp
+++ b/src/irisnet/corelib/netinterface.cpp
@@ -18,7 +18,7 @@
 
 #include "netinterface.h"
 
-#include "irisnetglobal_p.h"
+#include "corelib/irisnetglobal_p.h"
 #include "irisnetplugin.h"
 
 #include <QDebug>
diff --git a/src/irisnet/corelib/netnames.cpp b/src/irisnet/corelib/netnames.cpp
index e12f3c57..adbf1b8a 100644
--- a/src/irisnet/corelib/netnames.cpp
+++ b/src/irisnet/corelib/netnames.cpp
@@ -20,7 +20,7 @@
 #include "netnames.h"
 
 #include "addressresolver.h"
-#include "irisnetglobal_p.h"
+#include "corelib/irisnetglobal_p.h"
 #include "irisnetplugin.h"
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
diff --git a/src/irisnet/noncore/processquit.cpp b/src/irisnet/noncore/processquit.cpp
index b6aa42a8..f30d2a73 100644
--- a/src/irisnet/noncore/processquit.cpp
+++ b/src/irisnet/noncore/processquit.cpp
@@ -19,7 +19,7 @@
 #include "processquit.h"
 
 #ifndef NO_IRISNET
-#include "irisnetglobal_p.h"
+#include "corelib/irisnetglobal_p.h"
 #endif
 
 #ifdef QT_GUI_LIB
diff --git a/src/xmpp/CMakeLists.txt b/src/xmpp/CMakeLists.txt
index 1250fccc..90ab90fc 100644
--- a/src/xmpp/CMakeLists.txt
+++ b/src/xmpp/CMakeLists.txt
@@ -1,115 +1,10 @@
 cmake_minimum_required(VERSION 3.10.0)
 
-add_definitions(-DXMPP_TEST)
-
 find_package(ZLIB REQUIRED)
-get_filename_component(ABS_PARENT_DIR "${CMAKE_CURRENT_LIST_DIR}/.." ABSOLUTE)
-get_filename_component(ABS_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE)
-include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_CURRENT_LIST_DIR}
-    ${ABS_PARENT_DIR}
-    ${ABS_PARENT_DIR}/irisnet/corelib
-    xmpp-core
-    xmpp-im
-    ${ZLIB_INCLUDE_DIRS}
-    ${QCA_INCLUDES}
-    )
 
-set(HEADERS
-    xmpp-core/parser.h
-    xmpp-core/protocol.h
-    xmpp-core/sm.h
-    xmpp-core/td.h
-    xmpp-core/xmlprotocol.h
-    xmpp-core/xmpp_stanza.h
-
-    xmpp-im/xmpp_address.h
-    xmpp-im/xmpp_hash.h
-    xmpp-im/xmpp_thumbs.h
-    xmpp-im/xmpp_agentitem.h
-    xmpp-im/xmpp_captcha.h
-    xmpp-im/xmpp_chatstate.h
-    xmpp-im/xmpp_discoitem.h
-    xmpp-im/xmpp_features.h
-    xmpp-im/xmpp_form.h
-    xmpp-im/xmpp_htmlelement.h
-    xmpp-im/xmpp_httpauthrequest.h
-    xmpp-im/xmpp_liveroster.h
-    xmpp-im/xmpp_liverosteritem.h
-    xmpp-im/xmpp_message.h
-    xmpp-im/xmpp_muc.h
-    xmpp-im/xmpp_reference.h
-    xmpp-im/xmpp_pubsubitem.h
-    xmpp-im/xmpp_pubsubretraction.h
-    xmpp-im/xmpp_receipts.h
-    xmpp-im/xmpp_resource.h
-    xmpp-im/xmpp_resourcelist.h
-    xmpp-im/xmpp_roster.h
-    xmpp-im/xmpp_rosteritem.h
-    xmpp-im/xmpp_rosterx.h
-    xmpp-im/xmpp_status.h
-    xmpp-im/xmpp_subsets.h
-    xmpp-im/xmpp_url.h
-    xmpp-im/xmpp_vcard.h
-    xmpp-im/xmpp_xdata.h
-    xmpp-im/xmpp_xmlcommon.h
-    xmpp-im/xmpp_encryption.h
-    xmpp-im/xmpp_externalservicediscovery.h
-    xmpp-im/stundisco.h
-
-    base/randomnumbergenerator.h
-    base/randrandomnumbergenerator.h
-    base/timezone.h
-
-    xmpp-im/im.h
-
-    jid/jid.h
-
-    sasl/digestmd5proplist.h
-    sasl/digestmd5response.h
-    sasl/plainmessage.h
-    sasl/scramsha1message.h
-    sasl/scramsha1response.h
-    sasl/scramsha1signature.h
-
-    blake2/blake2qt.h
-
-    xmpp-core/compressionhandler.h
-    xmpp-core/securestream.h
-    xmpp-core/xmpp.h
-    xmpp-core/xmpp_clientstream.h
-    xmpp-core/xmpp_stream.h
-
-    xmpp-im/xmpp_caps.h
-    xmpp-im/filetransfer.h
-    xmpp-im/httpfileupload.h
-    xmpp-im/s5b.h
-    xmpp-im/xmpp_bitsofbinary.h
-    xmpp-im/xmpp_bytestream.h
-    xmpp-im/xmpp_client.h
-    xmpp-im/xmpp_discoinfotask.h
-    xmpp-im/xmpp_ibb.h
-    xmpp-im/xmpp_serverinfomanager.h
-    xmpp-im/xmpp_task.h
-    xmpp-im/xmpp_tasks.h
-    xmpp-im/jingle.h
-    xmpp-im/jingle-connection.h
-    xmpp-im/jingle-transport.h
-    xmpp-im/jingle-nstransportslist.h
-    xmpp-im/jingle-application.h
-    xmpp-im/jingle-session.h
-    xmpp-im/jingle-ft.h
-    xmpp-im/jingle-ice.h
-    xmpp-im/jingle-s5b.h
-    xmpp-im/jingle-ibb.h
-    xmpp-im/jingle-file.h
-
-    zlib/zlibcompressor.h
-    zlib/zlibdecompressor.h
-    )
+add_library(iris)
 
-set(SOURCES
+target_sources(iris PRIVATE
     xmpp-core/compressionhandler.cpp
     xmpp-core/connector.cpp
     xmpp-core/parser.cpp
@@ -177,60 +72,57 @@ set(SOURCES
 
     xmpp-im/s5b.cpp
     xmpp-im/xmpp_features.cpp
-    )
+)
 
-if(JINGLE_SCTP)
-    list(APPEND SOURCES
+if(IRIS_ENABLE_JINGLE_SCTP)
+    target_compile_definitions(iris PRIVATE JINGLE_SCTP)
+    target_sources(iris PRIVATE
         xmpp-im/jingle-sctp.cpp
         xmpp-im/jingle-sctp-association_p.cpp
         xmpp-im/jingle-webrtc-datachannel_p.cpp
-        )
-
-    list(APPEND HEADERS
-        xmpp-im/jingle-sctp.h
-        xmpp-im/jingle-sctp-association_p.h
-        xmpp-im/jingle-webrtc-datachannel_p.h
-        )
-endif()
-
-if(NOT MSVC)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
+    )
 endif()
 
-add_library(iris
-    STATIC
-    ${HEADERS}
-    ${SOURCES}
-)
-
-set_property(TARGET iris PROPERTY C_STANDARD 11)
-
 if(B2_FOUND)
     message(STATUS "Building with system blake2 library")
-    target_compile_definitions(iris PUBLIC IRIS_SYSTEM_BLAKE2)
     target_link_libraries(iris PRIVATE ${B2_LIBRARY})
 else()
-    if (NOT BUNDLED_QCA)
+    if(NOT IRIS_BUNDLED_QCA)
         message(STATUS "No system blake2 and bundled QCA is disabled. Expect slow hashing.")
     endif()
     target_sources(iris PRIVATE
-            blake2/blake2b-ref.c
-            blake2/blake2s-ref.c
-            blake2/blake2.h
-            blake2/blake2-impl.h)
-    target_include_directories(iris PRIVATE blake2)
+        blake2/blake2b-ref.c
+        blake2/blake2s-ref.c
+    )
 endif()
 
+target_link_libraries(iris
+    PRIVATE
+        $<BUILD_INTERFACE:stringprep>
+        $<BUILD_INTERFACE:irisnet>
+        ZLIB::ZLIB
+    PUBLIC
+        ${Qca_LIBRARY}
+        Qt5::Core Qt5::Gui Qt5::Network Qt5::Xml
+)
 
-target_link_libraries(iris PRIVATE ${EXTRA_LDFLAGS} stringprep irisnet)
-target_link_libraries(iris PUBLIC ${ZLIB_LIBRARY} Qt5::Core Qt5::Gui Qt5::Network Qt5::Xml)
-target_link_libraries(iris PUBLIC ${qca_LIB})
-if (BUNDLED_QCA)
+if(IRIS_BUNDLED_QCA)
     add_dependencies(iris QcaProject)
-    include_directories(${Qca_INCLUDE_DIR})
-    target_include_directories(iris INTERFACE ${Qca_INCLUDE_DIR})
+    target_include_directories(iris PUBLIC ${Qca_INCLUDE_DIR})
     target_link_libraries(iris PUBLIC OpenSSL::SSL)
 endif()
 
-target_compile_definitions(iris INTERFACE IRISNET_STATIC)
-target_include_directories(iris INTERFACE ${ABS_ROOT_DIR}/include ${ABS_ROOT_DIR}/include/iris ${ABS_PARENT_DIR})
+if(IRIS_ENABLE_DEBUG)
+    target_compile_definitions(iris PRIVATE XMPP_TEST)
+endif()
+
+target_compile_definitions(iris PUBLIC IRISNET_STATIC)
+
+target_include_directories(iris
+    PRIVATE
+        ${CMAKE_SOURCE_DIR}/include/iris
+        ${CMAKE_SOURCE_DIR}/src
+        ${Qca_INCLUDE_DIR}
+    PUBLIC
+        $<INSTALL_INTERFACE:include/xmpp>
+)
diff --git a/src/xmpp/jid/jid.cpp b/src/xmpp/jid/jid.cpp
index 7f2055d5..12e455c7 100644
--- a/src/xmpp/jid/jid.cpp
+++ b/src/xmpp/jid/jid.cpp
@@ -20,7 +20,7 @@
 #include "xmpp/jid/jid.h"
 
 #ifndef NO_IRISNET
-#include "irisnetglobal_p.h"
+#include "irisnet/corelib/irisnetglobal_p.h"
 #endif
 
 #include "qstringprep.h"
diff --git a/src/xmpp/xmpp-core/stream.cpp b/src/xmpp/xmpp-core/stream.cpp
index 37a82025..b1ad1b7c 100644
--- a/src/xmpp/xmpp-core/stream.cpp
+++ b/src/xmpp/xmpp-core/stream.cpp
@@ -43,7 +43,7 @@
 
 #include "bytestream.h"
 #ifndef NO_IRISNET
-#include "irisnetglobal_p.h"
+#include "irisnet/corelib/irisnetglobal_p.h"
 #endif
 #include "protocol.h"
 #include "securestream.h"
diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
index f99b5b36..8b8daab4 100644
--- a/src/xmpp/xmpp-im/client.cpp
+++ b/src/xmpp/xmpp-im/client.cpp
@@ -73,10 +73,10 @@
 #include "jingle-ice.h"
 #include "jingle-s5b.h"
 #include "jingle.h"
-#include "protocol.h"
 #include "s5b.h"
 #include "stundisco.h"
 #include "tcpportreserver.h"
+#include "xmpp/xmpp-core/protocol.h"
 #include "xmpp_bitsofbinary.h"
 #include "xmpp_caps.h"
 #include "xmpp_externalservicediscovery.h"
diff --git a/src/xmpp/xmpp-im/types.cpp b/src/xmpp/xmpp-im/types.cpp
index 9539aa51..9d38467f 100644
--- a/src/xmpp/xmpp-im/types.cpp
+++ b/src/xmpp/xmpp-im/types.cpp
@@ -18,7 +18,7 @@
  */
 
 #include "im.h"
-#include "protocol.h"
+#include "xmpp/xmpp-core/protocol.h"
 #include "xmpp_bitsofbinary.h"
 #include "xmpp_captcha.h"
 #include "xmpp_features.h"
diff --git a/src/xmpp/xmpp-im/xmpp_tasks.cpp b/src/xmpp/xmpp-im/xmpp_tasks.cpp
index 4e7b5494..0b6a0ce3 100644
--- a/src/xmpp/xmpp-im/xmpp_tasks.cpp
+++ b/src/xmpp/xmpp-im/xmpp_tasks.cpp
@@ -93,7 +93,7 @@ static Roster xmlReadRoster(const QDomElement &q, bool push)
 // JT_Session
 //----------------------------------------------------------------------------
 //
-#include "protocol.h"
+#include "xmpp/xmpp-core/protocol.h"
 
 JT_Session::JT_Session(Task *parent) : Task(parent) { }
 
diff --git a/tools/icetunnel/CMakeLists.txt b/tools/icetunnel/CMakeLists.txt
index decd8e05..183db117 100644
--- a/tools/icetunnel/CMakeLists.txt
+++ b/tools/icetunnel/CMakeLists.txt
@@ -1,6 +1,16 @@
-project (ICETunnel LANGUAGES CXX)
+project(ICETunnel
+    LANGUAGES CXX
+)
+
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_CXX_STANDARD 17)
-add_executable (icetunnel main.cpp)
-target_link_libraries (icetunnel PUBLIC iris Qt::Core Qt::Network)
-target_compile_definitions(icetunnel PUBLIC QCA_STATIC)
+
+add_executable(icetunnel main.cpp)
+
+target_link_libraries(icetunnel PRIVATE iris Qt::Core Qt::Network)
+target_include_directories(icetunnel PRIVATE
+    ${CMAKE_SOURCE_DIR}/include
+    ${CMAKE_SOURCE_DIR}/include/iris
+    ${CMAKE_SOURCE_DIR}/src
+)
+target_compile_definitions(icetunnel PRIVATE QCA_STATIC)

From 3e1421a61a9e074b98cd8da8da4a159dc316e3a3 Mon Sep 17 00:00:00 2001
From: Sergei Ilinykh <sergei.ilinykh@castlabs.com>
Date: Mon, 11 Mar 2024 17:16:27 +0300
Subject: [PATCH 363/383] Make iris usable after previous merge

---
 CMakeLists.txt                             | 112 +----------------
 bundled.cmake                              |   2 +
 include/iris/xmpp_bytestream.h             |   1 +
 include/iris/xmpp_form.h                   |   1 +
 src/irisnet/CMakeLists.txt                 |  47 ++++++-
 src/irisnet/noncore/cutestuff/bsocket.cpp  |   4 +
 src/irisnet/noncore/cutestuff/bsocket.h    |   2 +-
 src/irisnet/noncore/cutestuff/httppoll.cpp |   8 +-
 src/irisnet/noncore/cutestuff/socks.cpp    |   3 +
 src/irisnet/noncore/iceabstractstundisco.h |   1 -
 src/irisnet/noncore/processquit.h          |   2 +-
 src/xmpp/CMakeLists.txt                    | 140 +++++++++++++++++++--
 src/xmpp/base/randomnumbergenerator.h      |   3 +-
 src/xmpp/base/randrandomnumbergenerator.h  |   2 +-
 src/xmpp/base/timezone.cpp                 |  73 +----------
 src/xmpp/base/timezone.h                   |   2 +
 src/xmpp/xmpp-core/connector.cpp           |   1 +
 src/xmpp/xmpp-core/xmpp.h                  |   5 +-
 src/xmpp/xmpp-im/im.h                      |  56 ++++-----
 src/xmpp/xmpp-im/jingle-connection.h       |   2 +-
 src/xmpp/xmpp-im/jingle-ice.h              |   4 +-
 src/xmpp/xmpp-im/jingle-s5b.h              |   2 +-
 src/xmpp/xmpp-im/jingle.h                  |   2 +-
 src/xmpp/xmpp-im/s5b.h                     |  10 +-
 src/xmpp/xmpp-im/xmpp_address.h            |   2 +-
 src/xmpp/xmpp-im/xmpp_bytestream.h         |   2 +-
 src/xmpp/xmpp-im/xmpp_httpauthrequest.h    |   2 +-
 src/xmpp/xmpp-im/xmpp_message.h            |   2 +-
 src/xmpp/xmpp-im/xmpp_task.h               |   2 +-
 29 files changed, 249 insertions(+), 246 deletions(-)
 create mode 100644 bundled.cmake
 create mode 100644 include/iris/xmpp_bytestream.h
 create mode 100644 include/iris/xmpp_form.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d680eabc..054ceeb4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,13 +59,15 @@ if(APPLE OR (MSVC OR USE_MXE))
     set(IRIS_DEFAULT_BUNDLED_QCA ON)
 endif()
 
-option(IRIS_ENABLE_INSTALL "Enable installation" OFF)
+option(IRIS_ENABLE_INSTALL "Enable installation" ON)
 option(IRIS_ENABLE_JINGLE_SCTP "Enable SCTP over ICE Jingle transport / data channels" ON)
 option(IRIS_BUNDLED_QCA "Adds: DTLS, Blake2b and other useful for XMPP crypto-stuff" ${IRIS_DEFAULT_BUNDLED_QCA})
 option(IRIS_BUNDLED_USRSCTP "Compile compatible UsrSCTP lib (required for datachannel Jingle transport)" ${IRIS_DEFAULT_BUNDLED_USRSCTP})
 option(IRIS_BUILD_TOOLS "Build tools and examples" OFF)
 option(IRIS_ENABLE_DEBUG "Enable debugging code paths" OFF)
 
+set(IRIS_INSTALL_INCLUDEDIR ${CMAKE_INSTALL_INCLUDEDIR}/xmpp/iris)
+
 set(CMAKE_CXX_STANDARD 17)
 
 if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug" OR ("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo"))
@@ -151,114 +153,6 @@ if(IRIS_ENABLE_INSTALL)
         DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
     )
 
-    set(IRISNET_CORELIB_HEADERS
-        src/irisnet/corelib/addressresolver.h
-        src/irisnet/corelib/irisnetexport.h
-        src/irisnet/corelib/irisnetglobal.h
-        src/irisnet/corelib/irisnetplugin.h
-        src/irisnet/corelib/netavailability.h
-        src/irisnet/corelib/netinterface.h
-        src/irisnet/corelib/netnames.h
-        src/irisnet/corelib/objectsession.h
-    )
-    set(IRISNET_NONCORE_HEADERS
-        src/irisnet/noncore/cutestuff/bsocket.h
-        src/irisnet/noncore/cutestuff/bytestream.h
-        src/irisnet/noncore/cutestuff/httpconnect.h
-        src/irisnet/noncore/cutestuff/httppoll.h
-        src/irisnet/noncore/cutestuff/socks.h
-        src/irisnet/noncore/dtls.h
-        src/irisnet/noncore/ice176.h
-        src/irisnet/noncore/iceabstractstundisco.h
-        src/irisnet/noncore/iceagent.h
-        src/irisnet/noncore/legacy/ndns.h
-        src/irisnet/noncore/legacy/srvresolver.h
-        src/irisnet/noncore/processquit.h
-        src/irisnet/noncore/stunallocate.h
-        src/irisnet/noncore/stunbinding.h
-        src/irisnet/noncore/stunmessage.h
-        src/irisnet/noncore/stuntransaction.h
-        src/irisnet/noncore/tcpportreserver.h
-        src/irisnet/noncore/turnclient.h
-        src/irisnet/noncore/udpportreserver.h
-    )
-    set(XMPP_JID_HEADERS
-        src/xmpp/jid/jid.h
-    )
-    set(XMPP_CORE_HEADERS
-        src/xmpp/xmpp-core/xmpp.h
-        src/xmpp/xmpp-core/xmpp_clientstream.h
-        src/xmpp/xmpp-core/xmpp_stanza.h
-        src/xmpp/xmpp-core/xmpp_stream.h
-    )
-    set(XMPP_IM_HEADERS
-        src/xmpp/xmpp-im/filetransfer.h
-        src/xmpp/xmpp-im/httpfileupload.h
-        src/xmpp/xmpp-im/im.h
-        src/xmpp/xmpp-im/jingle-application.h
-        src/xmpp/xmpp-im/jingle-ft.h
-        src/xmpp/xmpp-im/jingle-ice.h
-        src/xmpp/xmpp-im/jingle-nstransportslist.h
-        src/xmpp/xmpp-im/jingle-s5b.h
-        src/xmpp/xmpp-im/jingle-session.h
-        src/xmpp/xmpp-im/jingle-transport.h
-        src/xmpp/xmpp-im/jingle.h
-        src/xmpp/xmpp-im/s5b.h
-        src/xmpp/xmpp-im/xmpp_address.h
-        src/xmpp/xmpp-im/xmpp_agentitem.h
-        src/xmpp/xmpp-im/xmpp_bitsofbinary.h
-        src/xmpp/xmpp-im/xmpp_caps.h
-        src/xmpp/xmpp-im/xmpp_captcha.h
-        src/xmpp/xmpp-im/xmpp_chatstate.h
-        src/xmpp/xmpp-im/xmpp_client.h
-        src/xmpp/xmpp-im/xmpp_discoinfotask.h
-        src/xmpp/xmpp-im/xmpp_discoitem.h
-        src/xmpp/xmpp-im/xmpp_encryption.h
-        src/xmpp/xmpp-im/xmpp_encryptionhandler.h
-        src/xmpp/xmpp-im/xmpp_features.h
-        src/xmpp/xmpp-im/xmpp_hash.h
-        src/xmpp/xmpp-im/xmpp_htmlelement.h
-        src/xmpp/xmpp-im/xmpp_httpauthrequest.h
-        src/xmpp/xmpp-im/xmpp_liveroster.h
-        src/xmpp/xmpp-im/xmpp_liverosteritem.h
-        src/xmpp/xmpp-im/xmpp_message.h
-        src/xmpp/xmpp-im/xmpp_muc.h
-        src/xmpp/xmpp-im/xmpp_pubsubitem.h
-        src/xmpp/xmpp-im/xmpp_pubsubretraction.h
-        src/xmpp/xmpp-im/xmpp_reference.h
-        src/xmpp/xmpp-im/xmpp_resource.h
-        src/xmpp/xmpp-im/xmpp_resourcelist.h
-        src/xmpp/xmpp-im/xmpp_roster.h
-        src/xmpp/xmpp-im/xmpp_rosteritem.h
-        src/xmpp/xmpp-im/xmpp_rosterx.h
-        src/xmpp/xmpp-im/xmpp_serverinfomanager.h
-        src/xmpp/xmpp-im/xmpp_status.h
-        src/xmpp/xmpp-im/xmpp_subsets.h
-        src/xmpp/xmpp-im/xmpp_task.h
-        src/xmpp/xmpp-im/xmpp_tasks.h
-        src/xmpp/xmpp-im/xmpp_thumbs.h
-        src/xmpp/xmpp-im/xmpp_url.h
-        src/xmpp/xmpp-im/xmpp_vcard.h
-        src/xmpp/xmpp-im/xmpp_xdata.h
-        src/xmpp/xmpp-im/xmpp_xmlcommon.h
-    )
-
-    set(IRIS_INSTALL_INCLUDEDIR ${CMAKE_INSTALL_INCLUDEDIR}/xmpp/iris)
-    install(FILES ${IRISNET_CORELIB_HEADERS}
-        DESTINATION ${IRIS_INSTALL_INCLUDEDIR}/irisnet/corelib
-    )
-    install(FILES ${IRISNET_NONCORE_HEADERS}
-        DESTINATION ${IRIS_INSTALL_INCLUDEDIR}/irisnet/noncore
-    )
-    install(FILES ${XMPP_JID_HEADERS}
-        DESTINATION ${IRIS_INSTALL_INCLUDEDIR}/xmpp/jid
-    )
-    install(FILES ${XMPP_CORE_HEADERS}
-        DESTINATION ${IRIS_INSTALL_INCLUDEDIR}/xmpp/xmpp-core
-    )
-    install(FILES ${XMPP_IM_HEADERS}
-        DESTINATION ${IRIS_INSTALL_INCLUDEDIR}/xmpp/xmpp-im
-    )
     install(DIRECTORY include/iris
         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/xmpp
         FILES_MATCHING PATTERN "*.h"
diff --git a/bundled.cmake b/bundled.cmake
new file mode 100644
index 00000000..b9dc4842
--- /dev/null
+++ b/bundled.cmake
@@ -0,0 +1,2 @@
+set(IRIS_ENABLE_INSTALL OFF CACHE BOOL "Install iris headers" FORCE)
+add_subdirectory( ${CMAKE_CURRENT_LIST_DIR} )
diff --git a/include/iris/xmpp_bytestream.h b/include/iris/xmpp_bytestream.h
new file mode 100644
index 00000000..3afd0e3a
--- /dev/null
+++ b/include/iris/xmpp_bytestream.h
@@ -0,0 +1 @@
+#include "xmpp/xmpp-im/xmpp_bytestream.h"
diff --git a/include/iris/xmpp_form.h b/include/iris/xmpp_form.h
new file mode 100644
index 00000000..cd320c78
--- /dev/null
+++ b/include/iris/xmpp_form.h
@@ -0,0 +1 @@
+#include "xmpp/xmpp-im/xmpp_form.h"
diff --git a/src/irisnet/CMakeLists.txt b/src/irisnet/CMakeLists.txt
index 3d3a1aa0..6fbf7a72 100644
--- a/src/irisnet/CMakeLists.txt
+++ b/src/irisnet/CMakeLists.txt
@@ -7,7 +7,41 @@ list(APPEND CMAKE_MODULE_PATH
 
 add_library(irisnet STATIC)
 
+set(IRISNET_CORELIB_HEADERS
+    corelib/addressresolver.h
+    corelib/irisnetexport.h
+    corelib/irisnetglobal.h
+    corelib/irisnetplugin.h
+    corelib/netavailability.h
+    corelib/netinterface.h
+    corelib/netnames.h
+    corelib/objectsession.h
+)
+set(IRISNET_NONCORE_HEADERS
+    noncore/cutestuff/bsocket.h
+    noncore/cutestuff/bytestream.h
+    noncore/cutestuff/httpconnect.h
+    noncore/cutestuff/httppoll.h
+    noncore/cutestuff/socks.h
+    noncore/dtls.h
+    noncore/ice176.h
+    noncore/iceabstractstundisco.h
+    noncore/iceagent.h
+    noncore/legacy/ndns.h
+    noncore/legacy/srvresolver.h
+    noncore/processquit.h
+    noncore/stunallocate.h
+    noncore/stunbinding.h
+    noncore/stunmessage.h
+    noncore/stuntransaction.h
+    noncore/tcpportreserver.h
+    noncore/turnclient.h
+    noncore/udpportreserver.h
+)
+
 target_sources(irisnet PRIVATE
+    ${IRISNET_CORELIB_HEADERS}
+    ${IRISNET_NONCORE_HEADERS}
     corelib/irisnetglobal.cpp
     corelib/irisnetplugin.cpp
 
@@ -72,8 +106,8 @@ endif()
 
 target_include_directories(irisnet
     PRIVATE
-        ${CMAKE_SOURCE_DIR}/include/iris
-        ${CMAKE_SOURCE_DIR}/src
+        ${iris_SOURCE_DIR}/include/iris
+        ${iris_SOURCE_DIR}/src
         ${Qca_INCLUDE_DIR}
     PUBLIC
         ${USRSCTP_INCLUDES}
@@ -95,3 +129,12 @@ target_link_libraries(irisnet PUBLIC
     ${Qca_LIBRARY} ${USRSCTP_LIBRARY}
     Qt5::Core Qt5::Network Qt5::Xml
 )
+
+if(IRIS_ENABLE_INSTALL)
+    install(FILES ${IRISNET_CORELIB_HEADERS}
+        DESTINATION ${IRIS_INSTALL_INCLUDEDIR}/irisnet/corelib
+    )
+    install(FILES ${IRISNET_NONCORE_HEADERS}
+        DESTINATION ${IRIS_INSTALL_INCLUDEDIR}/irisnet/noncore
+    )
+endif()
diff --git a/src/irisnet/noncore/cutestuff/bsocket.cpp b/src/irisnet/noncore/cutestuff/bsocket.cpp
index cf91c3f8..a24ad6ec 100644
--- a/src/irisnet/noncore/cutestuff/bsocket.cpp
+++ b/src/irisnet/noncore/cutestuff/bsocket.cpp
@@ -20,9 +20,13 @@
 
 #include "bsocket.h"
 
+#include "netnames.h"
+
 #include <QHostAddress>
 #include <QMetaType>
 #include <QTcpSocket>
+#include <QTimer>
+
 #include <limits>
 
 //#define BS_DEBUG
diff --git a/src/irisnet/noncore/cutestuff/bsocket.h b/src/irisnet/noncore/cutestuff/bsocket.h
index 079de448..17498585 100644
--- a/src/irisnet/noncore/cutestuff/bsocket.h
+++ b/src/irisnet/noncore/cutestuff/bsocket.h
@@ -22,7 +22,6 @@
 #define CS_BSOCKET_H
 
 #include "bytestream.h"
-#include "netnames.h"
 
 #include <QAbstractSocket>
 #include <limits>
@@ -30,6 +29,7 @@
 class QByteArray;
 class QObject;
 class QString;
+class QTcpSocket;
 
 // CS_NAMESPACE_BEGIN
 /*!
diff --git a/src/irisnet/noncore/cutestuff/httppoll.cpp b/src/irisnet/noncore/cutestuff/httppoll.cpp
index 962a0e0c..b914f2bc 100644
--- a/src/irisnet/noncore/cutestuff/httppoll.cpp
+++ b/src/irisnet/noncore/cutestuff/httppoll.cpp
@@ -24,9 +24,11 @@
 #include <QByteArray>
 #include <QUrl>
 #include <QtCrypto>
-#include <qpointer.h>
-#include <qstringlist.h>
-#include <qtimer.h>
+#include <QPointer>
+#include <QHostAddress>
+#include <QStringList>
+#include <QTimer>
+
 #ifdef PROX_DEBUG
 #include <stdio.h>
 #endif
diff --git a/src/irisnet/noncore/cutestuff/socks.cpp b/src/irisnet/noncore/cutestuff/socks.cpp
index c8fc3799..6ccc625f 100644
--- a/src/irisnet/noncore/cutestuff/socks.cpp
+++ b/src/irisnet/noncore/cutestuff/socks.cpp
@@ -27,6 +27,9 @@
 #include <QSocketNotifier>
 #include <QStringList>
 #include <QTimer>
+#include <QUdpSocket>
+#include <QTcpSocket>
+#include <QTcpServer>
 
 //#define PROX_DEBUG
 #ifdef PROX_DEBUG
diff --git a/src/irisnet/noncore/iceabstractstundisco.h b/src/irisnet/noncore/iceabstractstundisco.h
index 8b625af2..f26ff9b6 100644
--- a/src/irisnet/noncore/iceabstractstundisco.h
+++ b/src/irisnet/noncore/iceabstractstundisco.h
@@ -6,7 +6,6 @@
 #include <QList>
 #include <QObject>
 
-#include <functional>
 #include <memory>
 
 namespace XMPP {
diff --git a/src/irisnet/noncore/processquit.h b/src/irisnet/noncore/processquit.h
index 26cc3958..39d0e2d8 100644
--- a/src/irisnet/noncore/processquit.h
+++ b/src/irisnet/noncore/processquit.h
@@ -23,7 +23,7 @@
 #include <QtCore>
 #define IRISNET_EXPORT
 #else
-#include "irisnetglobal.h"
+#include "../corelib/irisnetglobal.h"
 #endif
 
 #ifndef NO_IRISNET
diff --git a/src/xmpp/CMakeLists.txt b/src/xmpp/CMakeLists.txt
index 90ab90fc..ef1d4b81 100644
--- a/src/xmpp/CMakeLists.txt
+++ b/src/xmpp/CMakeLists.txt
@@ -4,7 +4,105 @@ find_package(ZLIB REQUIRED)
 
 add_library(iris)
 
+set(XMPP_JID_HEADERS jid/jid.h)
+
+set(XMPP_CORE_HEADERS
+    xmpp-core/parser.h
+    xmpp-core/protocol.h
+    xmpp-core/sm.h
+    xmpp-core/td.h
+    xmpp-core/xmlprotocol.h
+    xmpp-core/xmpp_stanza.h
+
+    xmpp-core/compressionhandler.h
+    xmpp-core/securestream.h
+    xmpp-core/xmpp.h
+    xmpp-core/xmpp_clientstream.h
+    xmpp-core/xmpp_stream.h
+)
+
+set(XMPP_IM_HEADERS
+    xmpp-im/xmpp_address.h
+    xmpp-im/xmpp_hash.h
+    xmpp-im/xmpp_thumbs.h
+    xmpp-im/xmpp_agentitem.h
+    xmpp-im/xmpp_captcha.h
+    xmpp-im/xmpp_chatstate.h
+    xmpp-im/xmpp_discoitem.h
+    xmpp-im/xmpp_features.h
+    xmpp-im/xmpp_form.h
+    xmpp-im/xmpp_htmlelement.h
+    xmpp-im/xmpp_httpauthrequest.h
+    xmpp-im/xmpp_liveroster.h
+    xmpp-im/xmpp_liverosteritem.h
+    xmpp-im/xmpp_message.h
+    xmpp-im/xmpp_muc.h
+    xmpp-im/xmpp_reference.h
+    xmpp-im/xmpp_pubsubitem.h
+    xmpp-im/xmpp_pubsubretraction.h
+    xmpp-im/xmpp_receipts.h
+    xmpp-im/xmpp_resource.h
+    xmpp-im/xmpp_resourcelist.h
+    xmpp-im/xmpp_roster.h
+    xmpp-im/xmpp_rosteritem.h
+    xmpp-im/xmpp_rosterx.h
+    xmpp-im/xmpp_status.h
+    xmpp-im/xmpp_subsets.h
+    xmpp-im/xmpp_url.h
+    xmpp-im/xmpp_vcard.h
+    xmpp-im/xmpp_xdata.h
+    xmpp-im/xmpp_xmlcommon.h
+    xmpp-im/xmpp_encryption.h
+    xmpp-im/xmpp_externalservicediscovery.h
+    xmpp-im/stundisco.h
+    xmpp-im/im.h
+    xmpp-im/xmpp_caps.h
+    xmpp-im/filetransfer.h
+    xmpp-im/httpfileupload.h
+    xmpp-im/s5b.h
+    xmpp-im/xmpp_bitsofbinary.h
+    xmpp-im/xmpp_bytestream.h
+    xmpp-im/xmpp_client.h
+    xmpp-im/xmpp_discoinfotask.h
+    xmpp-im/xmpp_ibb.h
+    xmpp-im/xmpp_serverinfomanager.h
+    xmpp-im/xmpp_task.h
+    xmpp-im/xmpp_tasks.h
+    xmpp-im/jingle.h
+    xmpp-im/jingle-connection.h
+    xmpp-im/jingle-transport.h
+    xmpp-im/jingle-nstransportslist.h
+    xmpp-im/jingle-application.h
+    xmpp-im/jingle-session.h
+    xmpp-im/jingle-ft.h
+    xmpp-im/jingle-ice.h
+    xmpp-im/jingle-s5b.h
+    xmpp-im/jingle-ibb.h
+    xmpp-im/jingle-file.h
+    xmpp-im/jingle-sctp.h
+)
+
+set(XMPP_HEADERS_PRIVATE
+    sasl/digestmd5proplist.h
+    sasl/digestmd5response.h
+    sasl/plainmessage.h
+    sasl/scramsha1message.h
+    sasl/scramsha1response.h
+    sasl/scramsha1signature.h
+    zlib/zlibcompressor.h
+    zlib/zlibdecompressor.h
+    blake2/blake2qt.h
+
+    base/randomnumbergenerator.h
+    base/randrandomnumbergenerator.h
+    base/timezone.h
+)
+
 target_sources(iris PRIVATE
+    ${XMPP_JID_HEADERS}
+    ${XMPP_CORE_HEADERS}
+    ${XMPP_IM_HEADERS}
+    ${XMPP_HEADERS_PRIVATE}
     xmpp-core/compressionhandler.cpp
     xmpp-core/connector.cpp
     xmpp-core/parser.cpp
@@ -79,7 +177,9 @@ if(IRIS_ENABLE_JINGLE_SCTP)
     target_sources(iris PRIVATE
         xmpp-im/jingle-sctp.cpp
         xmpp-im/jingle-sctp-association_p.cpp
+        xmpp-im/jingle-sctp-association_p.h
         xmpp-im/jingle-webrtc-datachannel_p.cpp
+        xmpp-im/jingle-webrtc-datachannel_p.h
     )
 endif()
 
@@ -118,11 +218,35 @@ endif()
 
 target_compile_definitions(iris PUBLIC IRISNET_STATIC)
 
-target_include_directories(iris
-    PRIVATE
-        ${CMAKE_SOURCE_DIR}/include/iris
-        ${CMAKE_SOURCE_DIR}/src
-        ${Qca_INCLUDE_DIR}
-    PUBLIC
-        $<INSTALL_INTERFACE:include/xmpp>
-)
+if(IS_SUBPROJECT)
+    target_include_directories(iris
+        PUBLIC
+            ${iris_SOURCE_DIR}/include
+            ${iris_SOURCE_DIR}/src
+            ${Qca_INCLUDE_DIR}
+        )
+    target_include_directories(iris
+        PRIVATE
+            ${iris_SOURCE_DIR}/include/iris
+        )
+else()
+    target_include_directories(iris
+        PRIVATE
+            ${iris_SOURCE_DIR}/include
+            ${iris_SOURCE_DIR}/src
+            ${Qca_INCLUDE_DIR}
+        )
+endif()
+target_include_directories(iris PUBLIC $<INSTALL_INTERFACE:include/xmpp>)
+
+if (IRIS_ENABLE_INSTALL)
+    install(FILES ${XMPP_JID_HEADERS}
+        DESTINATION ${IRIS_INSTALL_INCLUDEDIR}/xmpp/jid
+    )
+    install(FILES ${XMPP_CORE_HEADERS}
+        DESTINATION ${IRIS_INSTALL_INCLUDEDIR}/xmpp/xmpp-core
+    )
+    install(FILES ${XMPP_IM_HEADERS}
+        DESTINATION ${IRIS_INSTALL_INCLUDEDIR}/xmpp/xmpp-im
+    )
+endif()
diff --git a/src/xmpp/base/randomnumbergenerator.h b/src/xmpp/base/randomnumbergenerator.h
index 458fc138..a6e5f537 100644
--- a/src/xmpp/base/randomnumbergenerator.h
+++ b/src/xmpp/base/randomnumbergenerator.h
@@ -20,7 +20,8 @@
 #define RANDOMNUMBERGENERATOR_H
 
 namespace XMPP {
-class RandomNumberGenerator {
+
+class [[deprecated]] RandomNumberGenerator {
 public:
     virtual ~RandomNumberGenerator();
 
diff --git a/src/xmpp/base/randrandomnumbergenerator.h b/src/xmpp/base/randrandomnumbergenerator.h
index 069db228..224bc277 100644
--- a/src/xmpp/base/randrandomnumbergenerator.h
+++ b/src/xmpp/base/randrandomnumbergenerator.h
@@ -24,7 +24,7 @@
 #include <cstdlib>
 
 namespace XMPP {
-class RandRandomNumberGenerator : public RandomNumberGenerator {
+class [[deprecated]] RandRandomNumberGenerator : public RandomNumberGenerator {
 public:
     RandRandomNumberGenerator() { }
 
diff --git a/src/xmpp/base/timezone.cpp b/src/xmpp/base/timezone.cpp
index e31aef61..c1b937c5 100644
--- a/src/xmpp/base/timezone.cpp
+++ b/src/xmpp/base/timezone.cpp
@@ -18,90 +18,19 @@
 
 #include "timezone.h"
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 2, 0)
-#include <QByteArray>
-#include <QTime>
-#ifdef Q_OS_UNIX
-#include <time.h>
-#endif
-#ifdef Q_OS_WIN
-#include <windows.h>
-#endif
-#else
+
 #include <QTimeZone>
-#endif
 #include <QtGlobal>
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 2, 0)
-static bool    inited = false;
-static int     timezone_offset_;
-static QString timezone_str_;
-
-static void init()
-{
-#if defined(Q_OS_UNIX)
-    time_t x;
-    time(&x);
-    char str[256];
-    char fmt[32];
-    int  size;
-    strcpy(fmt, "%z");
-    size = strftime(str, 256, fmt, localtime(&x));
-    if (size && strncmp(fmt, str, size)) {
-        timezone_offset_
-            = QByteArray::fromRawData(str + 1, 2).toInt() * 60 + QByteArray::fromRawData(str + 3, 2).toInt();
-        if (str[0] == '-')
-            timezone_offset_ = -timezone_offset_;
-    }
-    strcpy(fmt, "%Z");
-    strftime(str, 256, fmt, localtime(&x));
-    if (strcmp(fmt, str))
-        timezone_str_ = str;
-
-#elif defined(Q_OS_WIN)
-    TIME_ZONE_INFORMATION i;
-    memset(&i, 0, sizeof(i));
-    bool inDST = (GetTimeZoneInformation(&i) == TIME_ZONE_ID_DAYLIGHT);
-    int  bias  = i.Bias;
-    if (inDST)
-        bias += i.DaylightBias;
-    timezone_offset_ = -bias;
-    timezone_str_    = "";
-    for (int n = 0; n < 32; ++n) {
-        int w = inDST ? i.DaylightName[n] : i.StandardName[n];
-        if (w == 0)
-            break;
-        timezone_str_ += QChar(w);
-    }
-
-#else
-    qWarning("Failed to properly init timezone data. Use UTC offset instead");
-    inited           = true;
-    timezone_offset_ = 0;
-    timezone_str_    = QLatin1String("N/A");
-#endif
-}
-#endif
 
 int TimeZone::offsetFromUtc()
 {
-#if QT_VERSION < QT_VERSION_CHECK(5, 2, 0)
-    if (!inited) {
-        init();
-    }
-    return timezone_offset_;
-#else
     return QTimeZone::systemTimeZone().offsetFromUtc(QDateTime::currentDateTime()) / 60;
-#endif
 }
 
 QString TimeZone::abbreviation()
 {
-#if QT_VERSION < QT_VERSION_CHECK(5, 2, 0)
-    return timezone_str_;
-#else
     return QTimeZone::systemTimeZone().abbreviation(QDateTime::currentDateTime());
-#endif
 }
 
 int TimeZone::tzdToInt(const QString &tzd)
diff --git a/src/xmpp/base/timezone.h b/src/xmpp/base/timezone.h
index 2a091c5a..6a20d9a8 100644
--- a/src/xmpp/base/timezone.h
+++ b/src/xmpp/base/timezone.h
@@ -19,6 +19,8 @@
 #ifndef IRIS_TIMEZONE_H
 #define IRIS_TIMEZONE_H
 
+// TODO <5.2.0 code was stripped away. remaining has to be put to some common utils
+
 #include <QObject>
 
 class TimeZone {
diff --git a/src/xmpp/xmpp-core/connector.cpp b/src/xmpp/xmpp-core/connector.cpp
index 2f4fc5e2..9fe4b7ff 100644
--- a/src/xmpp/xmpp-core/connector.cpp
+++ b/src/xmpp/xmpp-core/connector.cpp
@@ -38,6 +38,7 @@
 #include <QPointer>
 #include <QTimer>
 #include <QUrl>
+#include <QNetworkProxy>
 #include <qca.h>
 
 //#define XMPP_DEBUG
diff --git a/src/xmpp/xmpp-core/xmpp.h b/src/xmpp/xmpp-core/xmpp.h
index 8293ba99..70e058fb 100644
--- a/src/xmpp/xmpp-core/xmpp.h
+++ b/src/xmpp/xmpp-core/xmpp.h
@@ -20,11 +20,8 @@
 #ifndef XMPP_H
 #define XMPP_H
 
-#include "addressresolver.h"
-#include "xmpp/jid/jid.h"
+#include "iris/addressresolver.h"
 #include "xmpp_clientstream.h"
-#include "xmpp_stanza.h"
-#include "xmpp_stream.h"
 
 #include <QDomDocument>
 #include <QHostAddress>
diff --git a/src/xmpp/xmpp-im/im.h b/src/xmpp/xmpp-im/im.h
index 48438d13..e0f20d1b 100644
--- a/src/xmpp/xmpp-im/im.h
+++ b/src/xmpp/xmpp-im/im.h
@@ -20,33 +20,33 @@
 #ifndef XMPP_IM_H
 #define XMPP_IM_H
 
-#include "xmpp.h"
-#include "xmpp/jid/jid.h"
-#include "xmpp_address.h"
-#include "xmpp_agentitem.h"
-#include "xmpp_chatstate.h"
-#include "xmpp_client.h"
-#include "xmpp_discoitem.h"
-#include "xmpp_features.h"
-#include "xmpp_form.h"
-#include "xmpp_hash.h"
-#include "xmpp_htmlelement.h"
-#include "xmpp_httpauthrequest.h"
-#include "xmpp_liveroster.h"
-#include "xmpp_liverosteritem.h"
-#include "xmpp_message.h"
-#include "xmpp_muc.h"
-#include "xmpp_pubsubitem.h"
-#include "xmpp_pubsubretraction.h"
-#include "xmpp_resource.h"
-#include "xmpp_resourcelist.h"
-#include "xmpp_roster.h"
-#include "xmpp_rosteritem.h"
-#include "xmpp_rosterx.h"
-#include "xmpp_status.h"
-#include "xmpp_task.h"
-#include "xmpp_thumbs.h"
-#include "xmpp_url.h"
-#include "xmpp_xdata.h"
+#include "iris/xmpp.h"
+#include "iris/xmpp_jid.h"
+#include "iris/xmpp_address.h"
+#include "iris/xmpp_agentitem.h"
+#include "iris/xmpp_chatstate.h"
+#include "iris/xmpp_client.h"
+#include "iris/xmpp_discoitem.h"
+#include "iris/xmpp_features.h"
+#include "iris/xmpp_form.h"
+#include "iris/xmpp_hash.h"
+#include "iris/xmpp_htmlelement.h"
+#include "iris/xmpp_httpauthrequest.h"
+#include "iris/xmpp_liveroster.h"
+#include "iris/xmpp_liverosteritem.h"
+#include "iris/xmpp_message.h"
+#include "iris/xmpp_muc.h"
+#include "iris/xmpp_pubsubitem.h"
+#include "iris/xmpp_pubsubretraction.h"
+#include "iris/xmpp_resource.h"
+#include "iris/xmpp_resourcelist.h"
+#include "iris/xmpp_roster.h"
+#include "iris/xmpp_rosteritem.h"
+#include "iris/xmpp_rosterx.h"
+#include "iris/xmpp_status.h"
+#include "iris/xmpp_task.h"
+#include "iris/xmpp_thumbs.h"
+#include "iris/xmpp_url.h"
+#include "iris/xmpp_xdata.h"
 
 #endif // XMPP_IM_H
diff --git a/src/xmpp/xmpp-im/jingle-connection.h b/src/xmpp/xmpp-im/jingle-connection.h
index 1fcbc0c9..ff6b9e44 100644
--- a/src/xmpp/xmpp-im/jingle-connection.h
+++ b/src/xmpp/xmpp-im/jingle-connection.h
@@ -25,7 +25,7 @@
  * For example an ICE transport may have up to 65537 connections (65535 data/sctp-channels + 2 raw)
  */
 
-#include "bytestream.h"
+#include "iris/bytestream.h"
 #include "jingle.h"
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
diff --git a/src/xmpp/xmpp-im/jingle-ice.h b/src/xmpp/xmpp-im/jingle-ice.h
index e0752d60..65a3cab0 100644
--- a/src/xmpp/xmpp-im/jingle-ice.h
+++ b/src/xmpp/xmpp-im/jingle-ice.h
@@ -21,8 +21,8 @@
 #define JINGLE_ICE_H
 
 #include "jingle-transport.h"
-#include "tcpportreserver.h"
-#include "xmpp.h"
+#include "iris/tcpportreserver.h"
+#include "iris/xmpp.h"
 
 class QHostAddress;
 
diff --git a/src/xmpp/xmpp-im/jingle-s5b.h b/src/xmpp/xmpp-im/jingle-s5b.h
index dad31f6f..dad9f65f 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.h
+++ b/src/xmpp/xmpp-im/jingle-s5b.h
@@ -21,7 +21,7 @@
 #define JINGLE_S5B_H
 
 #include "jingle-transport.h"
-#include "tcpportreserver.h"
+#include "iris/tcpportreserver.h"
 
 class QHostAddress;
 class SocksClient;
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index a5d79bf4..9cf66c21 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -20,7 +20,7 @@
 #ifndef JINGLE_H
 #define JINGLE_H
 
-#include "xmpp_stanza.h"
+#include "iris/xmpp_stanza.h"
 
 #include <QSharedDataPointer>
 #include <QSharedPointer>
diff --git a/src/xmpp/xmpp-im/s5b.h b/src/xmpp/xmpp-im/s5b.h
index 18e875d8..2dd3fed1 100644
--- a/src/xmpp/xmpp-im/s5b.h
+++ b/src/xmpp/xmpp-im/s5b.h
@@ -20,16 +20,16 @@
 #ifndef XMPP_S5B_H
 #define XMPP_S5B_H
 
-#include "bytestream.h"
+#include "iris/bytestream.h"
 #include "xmpp/jid/jid.h"
-#include "xmpp_bytestream.h"
-#include "xmpp_stanza.h"
-#include "xmpp_task.h"
+#include "iris/xmpp_bytestream.h"
+#include "iris/xmpp_stanza.h"
+#include "iris/xmpp_task.h"
+#include "iris/tcpportreserver.h"
 
 #include <QHostAddress>
 #include <QList>
 #include <QObject>
-#include <tcpportreserver.h>
 
 class SocksClient;
 class SocksUDP;
diff --git a/src/xmpp/xmpp-im/xmpp_address.h b/src/xmpp/xmpp-im/xmpp_address.h
index 60ce564d..7fd04ae2 100644
--- a/src/xmpp/xmpp-im/xmpp_address.h
+++ b/src/xmpp/xmpp-im/xmpp_address.h
@@ -20,7 +20,7 @@
 #define XMPP_ADDRESS_H
 
 #include "xmpp/jid/jid.h"
-#include "xmpp_stanza.h"
+#include "iris/xmpp_stanza.h"
 
 #include <QString>
 
diff --git a/src/xmpp/xmpp-im/xmpp_bytestream.h b/src/xmpp/xmpp-im/xmpp_bytestream.h
index c805c8f4..d5c824a6 100644
--- a/src/xmpp/xmpp-im/xmpp_bytestream.h
+++ b/src/xmpp/xmpp-im/xmpp_bytestream.h
@@ -20,7 +20,7 @@
 #ifndef BYTESTREAM_MANAGER_H
 #define BYTESTREAM_MANAGER_H
 
-#include "bytestream.h"
+#include "iris/bytestream.h"
 #include "xmpp/jid/jid.h"
 
 #include <QObject>
diff --git a/src/xmpp/xmpp-im/xmpp_httpauthrequest.h b/src/xmpp/xmpp-im/xmpp_httpauthrequest.h
index 7756d9e5..882f7809 100644
--- a/src/xmpp/xmpp-im/xmpp_httpauthrequest.h
+++ b/src/xmpp/xmpp-im/xmpp_httpauthrequest.h
@@ -21,7 +21,7 @@
 
 #include <QString>
 
-#include "xmpp_stanza.h"
+#include "iris/xmpp_stanza.h"
 
 class QDomDocument;
 class QDomElement;
diff --git a/src/xmpp/xmpp-im/xmpp_message.h b/src/xmpp/xmpp-im/xmpp_message.h
index da7b8ebb..52b058cd 100644
--- a/src/xmpp/xmpp-im/xmpp_message.h
+++ b/src/xmpp/xmpp-im/xmpp_message.h
@@ -25,7 +25,7 @@
 #include "xmpp_receipts.h"
 #include "xmpp_reference.h"
 #include "xmpp_rosterx.h"
-#include "xmpp_stanza.h"
+#include "iris/xmpp_stanza.h"
 #include "xmpp_url.h"
 
 #include <QExplicitlySharedDataPointer>
diff --git a/src/xmpp/xmpp-im/xmpp_task.h b/src/xmpp/xmpp-im/xmpp_task.h
index 1fa60559..84f9f8d3 100644
--- a/src/xmpp/xmpp-im/xmpp_task.h
+++ b/src/xmpp/xmpp-im/xmpp_task.h
@@ -20,7 +20,7 @@
 #ifndef XMPP_TASK_H
 #define XMPP_TASK_H
 
-#include "xmpp_stanza.h"
+#include "iris/xmpp_stanza.h"
 
 #include <QObject>
 #include <QString>

From 6a9b7a2e8b30c128f7a4136e8a8e96a08d5080bb Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Thu, 14 Mar 2024 00:10:47 +0200
Subject: [PATCH 364/383] Updated CMake files. win32 compile fixed

---
 src/irisnet/CMakeLists.txt | 5 +++--
 src/xmpp/CMakeLists.txt    | 8 ++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/irisnet/CMakeLists.txt b/src/irisnet/CMakeLists.txt
index 6fbf7a72..826e154a 100644
--- a/src/irisnet/CMakeLists.txt
+++ b/src/irisnet/CMakeLists.txt
@@ -113,10 +113,10 @@ target_include_directories(irisnet
         ${USRSCTP_INCLUDES}
 )
 
-target_compile_definitions(irisnet PRIVATE HAVE_QTNET)
+target_compile_definitions(irisnet PRIVATE IRISNET_STATIC HAVE_QTNET)
 
 if(WIN32)
-    target_link_libraries(irisnet PUBLIC ws2_32 iphlpapi)
+    set(EXTRA_LDFLAGS ws2_32 iphlpapi)
 endif()
 
 # UsrSCTP requires pthread
@@ -128,6 +128,7 @@ endif()
 target_link_libraries(irisnet PUBLIC
     ${Qca_LIBRARY} ${USRSCTP_LIBRARY}
     Qt5::Core Qt5::Network Qt5::Xml
+    ${EXTRA_LDFLAGS}
 )
 
 if(IRIS_ENABLE_INSTALL)
diff --git a/src/xmpp/CMakeLists.txt b/src/xmpp/CMakeLists.txt
index ef1d4b81..09d93985 100644
--- a/src/xmpp/CMakeLists.txt
+++ b/src/xmpp/CMakeLists.txt
@@ -2,7 +2,11 @@ cmake_minimum_required(VERSION 3.10.0)
 
 find_package(ZLIB REQUIRED)
 
-add_library(iris)
+if(IS_SUBPROJECT)
+    add_library(iris STATIC)
+else()
+    add_library(iris)
+endif()
 
 set(XMPP_JID_HEADERS jid/jid.h)
 
@@ -216,7 +220,7 @@ if(IRIS_ENABLE_DEBUG)
     target_compile_definitions(iris PRIVATE XMPP_TEST)
 endif()
 
-target_compile_definitions(iris PUBLIC IRISNET_STATIC)
+target_compile_definitions(iris PUBLIC IRISNET_STATIC QSTRINGPREP_BUILDING)
 
 if(IS_SUBPROJECT)
     target_include_directories(iris

From 6285bd28d1b15d774e4ea4a662397a4befebfb8f Mon Sep 17 00:00:00 2001
From: Sergei Ilinykh <sergei.ilinykh@castlabs.com>
Date: Thu, 14 Mar 2024 15:48:01 +0300
Subject: [PATCH 365/383] qt6 support

---
 3rdparty/stringprep/CMakeLists.txt            | 13 ++++++--
 CMakeLists.txt                                | 14 +++++----
 cmake/modules/IrisQCA.cmake                   |  5 +++
 cmake/modules/policyRules.cmake               |  2 +-
 src/irisnet/CMakeLists.txt                    |  9 ++++--
 src/irisnet/corelib/netinterface_qtname.cpp   |  2 +-
 src/irisnet/corelib/netinterface_unix.cpp     |  4 +--
 src/irisnet/corelib/netnames.cpp              |  6 ++--
 src/irisnet/corelib/objectsession.cpp         |  2 +-
 src/irisnet/noncore/cutestuff/httpconnect.cpp |  4 +--
 src/irisnet/noncore/cutestuff/httppoll.cpp    |  6 ++--
 src/irisnet/noncore/dtls.cpp                  |  2 +-
 src/irisnet/noncore/ice176.cpp                |  8 ++---
 src/irisnet/noncore/iceagent.cpp              |  6 ++--
 src/irisnet/noncore/icelocaltransport.cpp     |  2 +-
 src/irisnet/noncore/stunallocate.cpp          |  2 +-
 src/irisnet/noncore/stunallocate.h            |  4 +--
 src/irisnet/noncore/stuntransaction.cpp       |  2 +-
 src/irisnet/noncore/stuntypes.cpp             |  2 +-
 src/irisnet/noncore/udpportreserver.cpp       | 14 ++++-----
 src/xmpp/CMakeLists.txt                       |  3 +-
 src/xmpp/sasl/digestmd5proplist.cpp           |  6 ++--
 src/xmpp/sasl/scramsha1response.cpp           | 31 +++++++++----------
 src/xmpp/sasl/scramsha1signature.cpp          | 15 ++++-----
 src/xmpp/xmpp-core/parser.cpp                 |  2 +-
 src/xmpp/xmpp-core/parser.h                   |  2 +-
 src/xmpp/xmpp-core/protocol.cpp               | 25 ++++++++-------
 src/xmpp/xmpp-core/securestream.cpp           |  4 +--
 src/xmpp/xmpp-core/stream.cpp                 |  6 ++--
 src/xmpp/xmpp-core/tlshandler.cpp             | 14 ++++++---
 src/xmpp/xmpp-core/xmlprotocol.cpp            |  8 -----
 src/xmpp/xmpp-im/client.cpp                   |  6 ++--
 src/xmpp/xmpp-im/filetransfer.cpp             |  8 ++---
 src/xmpp/xmpp-im/httpfileupload.cpp           |  3 +-
 src/xmpp/xmpp-im/jingle-ft.cpp                |  2 +-
 src/xmpp/xmpp-im/jingle-ice.cpp               |  4 +--
 src/xmpp/xmpp-im/jingle-s5b.cpp               |  3 +-
 src/xmpp/xmpp-im/jingle-session.cpp           | 24 +++++++-------
 src/xmpp/xmpp-im/jingle.h                     |  2 ++
 src/xmpp/xmpp-im/s5b.cpp                      | 20 ++++++------
 src/xmpp/xmpp-im/stundisco.cpp                |  2 +-
 src/xmpp/xmpp-im/types.cpp                    | 18 +++++------
 src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp        |  2 +-
 src/xmpp/xmpp-im/xmpp_caps.cpp                |  5 ++-
 src/xmpp/xmpp-im/xmpp_encryption.cpp          |  4 ++-
 src/xmpp/xmpp-im/xmpp_encryption.h            |  4 ++-
 .../xmpp-im/xmpp_externalservicediscovery.cpp |  6 ++--
 src/xmpp/xmpp-im/xmpp_hash.cpp                |  6 ++--
 src/xmpp/xmpp-im/xmpp_hash.h                  |  6 ++--
 src/xmpp/xmpp-im/xmpp_ibb.cpp                 |  2 +-
 src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp   |  6 ++--
 src/xmpp/xmpp-im/xmpp_serverinfomanager.h     | 11 ++++---
 src/xmpp/xmpp-im/xmpp_tasks.cpp               | 15 +++++----
 src/xmpp/xmpp-im/xmpp_vcard.cpp               | 17 +++++-----
 src/xmpp/xmpp-im/xmpp_xdata.cpp               |  9 ++++--
 src/xmpp/xmpp-im/xmpp_xmlcommon.cpp           | 12 +++----
 src/xmpp/xmpp-im/xmpp_xmlcommon.h             |  5 ++-
 tools/icetunnel/main.cpp                      |  2 +-
 58 files changed, 229 insertions(+), 200 deletions(-)

diff --git a/3rdparty/stringprep/CMakeLists.txt b/3rdparty/stringprep/CMakeLists.txt
index 0e0684fe..ff4bc9a6 100644
--- a/3rdparty/stringprep/CMakeLists.txt
+++ b/3rdparty/stringprep/CMakeLists.txt
@@ -8,12 +8,17 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-find_package(Qt5 COMPONENTS Core REQUIRED)
+if(QT_DEFAULT_MAJOR_VERSION LESS 6)
+    find_package(Qt5 5.10 REQUIRED COMPONENTS Core)
+else()
+    find_package(Qt6 REQUIRED COMPONENTS Core)
+endif()
 
 add_library(stringprep STATIC
     stringprep.cpp
     profiles.cpp
     rfc3454.cpp
+    qstringprep.h
 )
 
 target_compile_definitions(stringprep PRIVATE QSTRINGPREP_BUILDING)
@@ -22,5 +27,9 @@ if(MSVC)
   target_compile_definitions(stringprep PRIVATE _CRT_SECURE_NO_WARNINGS _GENERATED_STDINT_H)
 endif()
 
-target_link_libraries(stringprep PUBLIC Qt5::Core)
+if(QT_DEFAULT_MAJOR_VERSION LESS 6)
+    target_link_libraries(stringprep PUBLIC Qt5::Core)
+else()
+    target_link_libraries(stringprep PUBLIC Qt6::Core)
+endif()
 target_include_directories(stringprep PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 054ceeb4..bf032eed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,14 +74,16 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug" OR ("${CMAKE_BUILD_TYPE}" STREQUAL "Re
     include(debug-definitions)
 endif()
 
-find_package(Qt5 COMPONENTS Core Gui Xml Network REQUIRED)
+if(QT_DEFAULT_MAJOR_VERSION STREQUAL "")
+    set(QT_DEFAULT_MAJOR_VERSION 5)
+endif()
 
-if(Qt5Core_FOUND)
-    message(STATUS "Qt5 found, version ${Qt5Core_VERSION}")
-    if(IRIS_BUNDLED_QCA AND ("${Qt5Core_VERSION}" VERSION_LESS "5.6"))
-        message(FATAL_ERROR "Minimal Qt version for bundled Qca is 5.6. Please disable IRIS_BUNDLED_QCA option")
-    endif()
+if(QT_DEFAULT_MAJOR_VERSION LESS 6)
+    find_package(Qt5 5.10 REQUIRED COMPONENTS Core Gui Xml Network)
+else()
+    find_package(Qt6 REQUIRED COMPONENTS Core Gui Xml Network)
 endif()
+message(STATUS "Qt${QT_DEFAULT_MAJOR_VERSION} found, version ${Qt6Core_VERSION}")
 
 # Find QCA package or use bundled if enabled
 include(IrisQCA)
diff --git a/cmake/modules/IrisQCA.cmake b/cmake/modules/IrisQCA.cmake
index 4b87e45b..423dea32 100644
--- a/cmake/modules/IrisQCA.cmake
+++ b/cmake/modules/IrisQCA.cmake
@@ -40,6 +40,11 @@ if(IRIS_BUNDLED_QCA)
         -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
         -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
         -DOSX_FRAMEWORK=OFF)
+    if(QT_DEFAULT_MAJOR_VERSION LESS 6)
+        list(APPEND QCA_BUILD_OPTIONS -DBUILD_WITH_QT6=OFF)
+    else()
+        list(APPEND QCA_BUILD_OPTIONS -DBUILD_WITH_QT6=ON)
+    endif()
     if (EXISTS ${QCA_SOURCE_DIR})
         message(STATUS "QCA: found bundled sources")
         ExternalProject_Add(QcaProject
diff --git a/cmake/modules/policyRules.cmake b/cmake/modules/policyRules.cmake
index 982e1ff3..df9d386c 100644
--- a/cmake/modules/policyRules.cmake
+++ b/cmake/modules/policyRules.cmake
@@ -9,6 +9,6 @@ if(NOT POLICY_SET)
         cmake_policy(SET CMP0074 NEW)
         message(STATUS "CMP0074 policy set to NEW")
     endif()
-    set(POLICY_SET ON PARENT_SCOPE)
+    set(POLICY_SET ON)
 endif()
 
diff --git a/src/irisnet/CMakeLists.txt b/src/irisnet/CMakeLists.txt
index 826e154a..f1efe7eb 100644
--- a/src/irisnet/CMakeLists.txt
+++ b/src/irisnet/CMakeLists.txt
@@ -127,10 +127,15 @@ endif()
 
 target_link_libraries(irisnet PUBLIC
     ${Qca_LIBRARY} ${USRSCTP_LIBRARY}
-    Qt5::Core Qt5::Network Qt5::Xml
-    ${EXTRA_LDFLAGS}
 )
 
+if(QT_DEFAULT_MAJOR_VERSION LESS 6)
+    target_link_libraries(irisnet PUBLIC Qt5::Core Qt5::Network Qt5::Xml)
+else()
+    target_link_libraries(irisnet PUBLIC Qt6::Core Qt6::Network Qt6::Xml)
+endif()
+target_link_libraries(irisnet PUBLIC ${EXTRA_LDFLAGS})
+
 if(IRIS_ENABLE_INSTALL)
     install(FILES ${IRISNET_CORELIB_HEADERS}
         DESTINATION ${IRIS_INSTALL_INCLUDEDIR}/irisnet/corelib
diff --git a/src/irisnet/corelib/netinterface_qtname.cpp b/src/irisnet/corelib/netinterface_qtname.cpp
index c90c70e8..2e9d3cc1 100644
--- a/src/irisnet/corelib/netinterface_qtname.cpp
+++ b/src/irisnet/corelib/netinterface_qtname.cpp
@@ -40,7 +40,7 @@ class IrisQtName : public NameProvider {
 
     ~IrisQtName()
     {
-        for (auto const &l : qAsConst(lookups)) {
+        for (auto const &l : std::as_const(lookups)) {
             if (!l.isHostInfo) {
                 delete reinterpret_cast<QDnsLookup *>(l.handle);
             }
diff --git a/src/irisnet/corelib/netinterface_unix.cpp b/src/irisnet/corelib/netinterface_unix.cpp
index 2d7ff31d..8f55aa92 100644
--- a/src/irisnet/corelib/netinterface_unix.cpp
+++ b/src/irisnet/corelib/netinterface_unix.cpp
@@ -74,7 +74,7 @@ static QHostAddress linux_ipv6_to_qaddr(const QString &in)
     quint8 raw[16];
     for (int n = 0; n < 16; ++n) {
         bool ok;
-        int  x = in.midRef(n * 2, 2).toInt(&ok, 16);
+        int  x = QStringView{in}.mid(n * 2, 2).toInt(&ok, 16);
         if (!ok)
             return out;
         raw[n] = (quint8)x;
@@ -92,7 +92,7 @@ static QHostAddress linux_ipv4_to_qaddr(const QString &in)
     unsigned char *rawp = (unsigned char *)&raw;
     for (int n = 0; n < 4; ++n) {
         bool ok;
-        int  x = in.midRef(n * 2, 2).toInt(&ok, 16);
+        int  x = QStringView{in}.mid(n * 2, 2).toInt(&ok, 16);
         if (!ok)
             return out;
         rawp[n] = (unsigned char)x;
diff --git a/src/irisnet/corelib/netnames.cpp b/src/irisnet/corelib/netnames.cpp
index adbf1b8a..dc0bfc67 100644
--- a/src/irisnet/corelib/netnames.cpp
+++ b/src/irisnet/corelib/netnames.cpp
@@ -491,7 +491,7 @@ XMPP::NameRecord WeightedNameRecordList::takeNext()
 
     /* Find the new total weight of this priority group */
     int totalWeight = 0;
-    for (const auto &record : qAsConst(currentPriorityGroup->second)) {
+    for (const auto &record : std::as_const(currentPriorityGroup->second)) {
         totalWeight += record.weight();
     }
 
@@ -740,7 +740,7 @@ class NameManager : public QObject {
                 sub_instances_to_remove += it.key();
         }
 
-        for (int res_sub_id : qAsConst(sub_instances_to_remove)) {
+        for (int res_sub_id : std::as_const(sub_instances_to_remove)) {
             res_sub_instances.remove(res_sub_id);
             p_local->resolve_stop(res_sub_id);
         }
@@ -1094,7 +1094,7 @@ void ServiceResolver::clear_resolvers()
 #endif
 
     /* cleanup all resolvers */
-    for (XMPP::NameResolver *resolver : qAsConst(d->resolverList)) {
+    for (XMPP::NameResolver *resolver : std::as_const(d->resolverList)) {
         cleanup_resolver(resolver);
     }
 }
diff --git a/src/irisnet/corelib/objectsession.cpp b/src/irisnet/corelib/objectsession.cpp
index ba784250..e328ff80 100644
--- a/src/irisnet/corelib/objectsession.cpp
+++ b/src/irisnet/corelib/objectsession.cpp
@@ -84,7 +84,7 @@ class ObjectSessionPrivate : public QObject {
                     return false;
                 }
 
-                arg.data = QMetaType::create(arg.type, arg_data[n]);
+                arg.data = QMetaType(arg.type).create(arg_data[n]);
                 args += arg;
             }
 
diff --git a/src/irisnet/noncore/cutestuff/httpconnect.cpp b/src/irisnet/noncore/cutestuff/httpconnect.cpp
index 3fb2457a..ea1f064b 100644
--- a/src/irisnet/noncore/cutestuff/httpconnect.cpp
+++ b/src/irisnet/noncore/cutestuff/httpconnect.cpp
@@ -80,7 +80,7 @@ static bool extractMainHeader(const QString &line, QString *proto, int *code, QS
     if (n2 == -1)
         return false;
     if (code)
-        *code = line.midRef(n, n2 - n).toInt();
+        *code = QStringView{line}.mid(n, n2 - n).toInt();
     n = n2 + 1;
     if (msg)
         *msg = line.mid(n);
@@ -269,7 +269,7 @@ void HttpConnect::sock_readyRead()
 #ifdef PROX_DEBUG
                     fprintf(stderr, "HttpConnect: header proto=[%s] code=[%d] msg=[%s]\n", qPrintable(proto), code,
                             qPrintable(msg));
-                    for (const auto &it : qAsConst(d->headerLines))
+                    for (const auto &it : std::as_const(d->headerLines))
                         fprintf(stderr, "HttpConnect: * [%s]\n", qPrintable(it));
 #endif
                 }
diff --git a/src/irisnet/noncore/cutestuff/httppoll.cpp b/src/irisnet/noncore/cutestuff/httppoll.cpp
index b914f2bc..ab3a2c3c 100644
--- a/src/irisnet/noncore/cutestuff/httppoll.cpp
+++ b/src/irisnet/noncore/cutestuff/httppoll.cpp
@@ -408,7 +408,7 @@ static bool extractMainHeader(const QString &line, QString *proto, int *code, QS
     if (n2 == -1)
         return false;
     if (code)
-        *code = line.midRef(n, n2 - n).toInt();
+        *code = QStringView{line}.mid(n, n2 - n).toInt();
     n = n2 + 1;
     if (msg)
         *msg = line.mid(n);
@@ -503,7 +503,7 @@ QByteArray HttpProxyPost::body() const { return d->body; }
 
 QString HttpProxyPost::getHeader(const QString &var) const
 {
-    for (const QString &s : qAsConst(d->headerLines)) {
+    for (const QString &s : std::as_const(d->headerLines)) {
         int n = s.indexOf(": ");
         if (n == -1)
             continue;
@@ -776,7 +776,7 @@ void HttpProxyGetStream::stop() { resetConnection(); }
 
 QString HttpProxyGetStream::getHeader(const QString &var) const
 {
-    for (const QString &s : qAsConst(d->headerLines)) {
+    for (const QString &s : std::as_const(d->headerLines)) {
         int n = s.indexOf(": ");
         if (n == -1)
             continue;
diff --git a/src/irisnet/noncore/dtls.cpp b/src/irisnet/noncore/dtls.cpp
index 38c25b73..0efc16d5 100644
--- a/src/irisnet/noncore/dtls.cpp
+++ b/src/irisnet/noncore/dtls.cpp
@@ -62,7 +62,7 @@ bool Dtls::FingerPrint::parse(const QDomElement &el)
                  qPrintable(ns()));
     }
     auto ht = el.attribute(QLatin1String("hash"));
-    hash    = QStringRef(&ht);
+    hash    = QStringView{ht};
     hash.setData(QByteArray::fromHex(el.text().toLatin1()));
     auto setupIt = std::find(fpRoles.begin(), fpRoles.end(), el.attribute(QLatin1String("setup")).toLatin1());
     setup        = Setup(setupIt == fpRoles.end() ? NotSet : std::distance(fpRoles.begin(), setupIt) + 1);
diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index 3ea92d44..a1fb2a3f 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -675,7 +675,7 @@ class Ice176::Private : public QObject {
                 continue;
             }
 
-            for (const IceComponent::CandidateInfo::Ptr &rc : qAsConst(remoteCandidates)) {
+            for (const IceComponent::CandidateInfo::Ptr &rc : std::as_const(remoteCandidates)) {
                 auto pair = makeCandidatesPair(lc, rc);
                 if (!pair.isNull())
                     pairs += pair;
@@ -1087,7 +1087,7 @@ class Ice176::Private : public QObject {
     void dumpCandidatesAndStart()
     {
         QList<Ice176::Candidate> list;
-        for (auto const &cc : qAsConst(localCandidates)) {
+        for (auto const &cc : std::as_const(localCandidates)) {
             Ice176::Candidate c;
             toOutCandidate(cc, c);
             list += c;
@@ -1368,7 +1368,7 @@ private slots:
         }
 
         bool iceTransportInUse = false;
-        for (const IceComponent::Candidate &lc : qAsConst(localCandidates)) {
+        for (const IceComponent::Candidate &lc : std::as_const(localCandidates)) {
             if (lc.iceTransport == cc.iceTransport) {
                 iceTransportInUse = true;
                 break;
@@ -1781,7 +1781,7 @@ QList<QHostAddress> Ice176::availableNetworkAddresses()
             continue;
 
         QList<QNetworkAddressEntry> entries = ni.addressEntries();
-        for (const QNetworkAddressEntry &na : qAsConst(entries)) {
+        for (const QNetworkAddressEntry &na : std::as_const(entries)) {
 #if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
             if (na.preferredLifetime().hasExpired() || na.netmask().isNull())
 #else
diff --git a/src/irisnet/noncore/iceagent.cpp b/src/irisnet/noncore/iceagent.cpp
index 73d84d31..e3f2e338 100644
--- a/src/irisnet/noncore/iceagent.cpp
+++ b/src/irisnet/noncore/iceagent.cpp
@@ -32,11 +32,11 @@ static QChar randomPrintableChar()
 
     uchar c = static_cast<uchar>(QCA::Random::randomChar() % 62);
     if (c <= 25)
-        return 'a' + c;
+        return QChar::fromLatin1('a' + c);
     else if (c <= 51)
-        return 'A' + (c - 26);
+        return QChar::fromLatin1('A' + (c - 26));
     else
-        return '0' + (c - 52);
+        return QChar::fromLatin1('0' + (c - 52));
 }
 
 struct IceAgent::Private {
diff --git a/src/irisnet/noncore/icelocaltransport.cpp b/src/irisnet/noncore/icelocaltransport.cpp
index b6f9d064..fdb27543 100644
--- a/src/irisnet/noncore/icelocaltransport.cpp
+++ b/src/irisnet/noncore/icelocaltransport.cpp
@@ -502,7 +502,7 @@ private slots:
         ObjectSessionWatcher watch(&sess);
 
         if (!dwrites.isEmpty()) {
-            for (const Written &wr : qAsConst(dwrites)) {
+            for (const Written &wr : std::as_const(dwrites)) {
                 emit q->datagramsWritten(Direct, wr.count, wr.addr);
                 if (!watch.isValid())
                     return;
diff --git a/src/irisnet/noncore/stunallocate.cpp b/src/irisnet/noncore/stunallocate.cpp
index 60d4a4f3..4107e4c2 100644
--- a/src/irisnet/noncore/stunallocate.cpp
+++ b/src/irisnet/noncore/stunallocate.cpp
@@ -751,7 +751,7 @@ class StunAllocate::Private : public QObject {
                 newList += StunAllocate::Channel(channels[n]->addr);
         }
 
-        if (newList == channelsOut)
+        if (std::as_const(newList) == std::as_const(channelsOut))
             return false;
 
         channelsOut = newList;
diff --git a/src/irisnet/noncore/stunallocate.h b/src/irisnet/noncore/stunallocate.h
index 88920b87..dca6bf70 100644
--- a/src/irisnet/noncore/stunallocate.h
+++ b/src/irisnet/noncore/stunallocate.h
@@ -44,8 +44,8 @@ class StunAllocate : public QObject {
 
         Channel(const TransportAddress &_address) : address(_address) { }
 
-        inline bool operator==(const Channel &other) { return address == other.address; }
-        inline bool operator!=(const Channel &other) { return !operator==(other); }
+        inline bool operator==(const Channel &other) const { return address == other.address; }
+        inline bool operator!=(const Channel &other) const { return !operator==(other); }
     };
 
     StunAllocate(XMPP::StunTransactionPool *pool);
diff --git a/src/irisnet/noncore/stuntransaction.cpp b/src/irisnet/noncore/stuntransaction.cpp
index 6e0f15af..e9142673 100644
--- a/src/irisnet/noncore/stuntransaction.cpp
+++ b/src/irisnet/noncore/stuntransaction.cpp
@@ -634,7 +634,7 @@ void StunTransactionPool::continueAfterParams(const TransportAddress &addr)
     d->needLongTermAuth = false;
     d->triedLongTermAuth.insert(addr);
 
-    for (StunTransaction *trans : qAsConst(d->transactions)) {
+    for (StunTransaction *trans : std::as_const(d->transactions)) {
         // the only reason an inactive transaction would be in the
         //   list is if it is waiting for an auth retry
         if (!trans->d->active && !trans->d->cancelling) {
diff --git a/src/irisnet/noncore/stuntypes.cpp b/src/irisnet/noncore/stuntypes.cpp
index 9f51e029..fe0cbb39 100644
--- a/src/irisnet/noncore/stuntypes.cpp
+++ b/src/irisnet/noncore/stuntypes.cpp
@@ -477,7 +477,7 @@ namespace StunTypes {
             if (parseUnknownAttributes(val, &typeList)) {
                 if (!typeList.isEmpty()) {
                     QStringList strList;
-                    for (quint16 i : qAsConst(typeList))
+                    for (quint16 i : std::as_const(typeList))
                         strList += QString::asprintf("0x%04x", i);
                     return strList.join(", ");
                 } else
diff --git a/src/irisnet/noncore/udpportreserver.cpp b/src/irisnet/noncore/udpportreserver.cpp
index 492dd1bf..12b05d40 100644
--- a/src/irisnet/noncore/udpportreserver.cpp
+++ b/src/irisnet/noncore/udpportreserver.cpp
@@ -77,7 +77,7 @@ class UdpPortReserver::Private : public QObject {
         if (lendingAny)
             abort();
 
-        for (const Item &i : qAsConst(items)) {
+        for (const Item &i : std::as_const(items)) {
             for (QUdpSocket *sock : i.sockList)
                 sock->deleteLater();
         }
@@ -96,7 +96,7 @@ class UdpPortReserver::Private : public QObject {
         QList<int> added;
         for (int x : newPorts) {
             bool found = false;
-            for (const Item &i : qAsConst(items)) {
+            for (const Item &i : std::as_const(items)) {
                 if (i.port == x) {
                     found = true;
                     break;
@@ -112,7 +112,7 @@ class UdpPortReserver::Private : public QObject {
         // keep ports in sorted order
         std::sort(ports.begin(), ports.end());
 
-        for (int x : qAsConst(added)) {
+        for (int x : std::as_const(added)) {
             int insert_before = items.count();
             for (int n = 0; n < items.count(); ++n) {
                 if (x < items[n].port) {
@@ -240,12 +240,12 @@ private slots:
                 continue;
 
             QList<QHostAddress> neededAddrs;
-            for (const QHostAddress &a : qAsConst(addrs)) {
+            for (const QHostAddress &a : std::as_const(addrs)) {
                 if (!i.haveAddress(a))
                     neededAddrs += a;
             }
 
-            for (const QHostAddress &a : qAsConst(neededAddrs)) {
+            for (const QHostAddress &a : std::as_const(neededAddrs)) {
                 QUdpSocket *sock = new QUdpSocket(q);
 
                 if (!sock->bind(a, quint16(i.port))) {
@@ -267,7 +267,7 @@ private slots:
 
             // don't care about this port anymore?
             if (!i.lent && !ports.contains(i.port)) {
-                for (QUdpSocket *sock : qAsConst(i.sockList))
+                for (QUdpSocket *sock : std::as_const(i.sockList))
                     sock->deleteLater();
 
                 items.removeAt(n);
@@ -338,7 +338,7 @@ private slots:
         QList<QUdpSocket *> out;
 
         i->lent = true;
-        for (QUdpSocket *sock : qAsConst(i->sockList)) {
+        for (QUdpSocket *sock : std::as_const(i->sockList)) {
             i->lentAddrs += sock->localAddress();
             sock->disconnect(this);
             sock->setParent(parent);
diff --git a/src/xmpp/CMakeLists.txt b/src/xmpp/CMakeLists.txt
index 09d93985..1472522d 100644
--- a/src/xmpp/CMakeLists.txt
+++ b/src/xmpp/CMakeLists.txt
@@ -207,7 +207,7 @@ target_link_libraries(iris
         ZLIB::ZLIB
     PUBLIC
         ${Qca_LIBRARY}
-        Qt5::Core Qt5::Gui Qt5::Network Qt5::Xml
+        Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Gui Qt${QT_VERSION_MAJOR}::Network Qt${QT_VERSION_MAJOR}::Xml
 )
 
 if(IRIS_BUNDLED_QCA)
@@ -237,6 +237,7 @@ else()
     target_include_directories(iris
         PRIVATE
             ${iris_SOURCE_DIR}/include
+            ${iris_SOURCE_DIR}/include/iris
             ${iris_SOURCE_DIR}/src
             ${Qca_INCLUDE_DIR}
         )
diff --git a/src/xmpp/sasl/digestmd5proplist.cpp b/src/xmpp/sasl/digestmd5proplist.cpp
index b0e61615..e4bfc5ff 100644
--- a/src/xmpp/sasl/digestmd5proplist.cpp
+++ b/src/xmpp/sasl/digestmd5proplist.cpp
@@ -31,7 +31,7 @@ void DIGESTMD5PropList::set(const QByteArray &var, const QByteArray &val)
 
 QByteArray DIGESTMD5PropList::get(const QByteArray &var) const
 {
-    for (const auto &it : qAsConst(*this)) {
+    for (const auto &it : std::as_const(*this)) {
         if (it.var == var)
             return it.val;
     }
@@ -42,7 +42,7 @@ QByteArray DIGESTMD5PropList::toString() const
 {
     QByteArray str;
     bool       first = true;
-    for (const auto &it : qAsConst(*this)) {
+    for (const auto &it : std::as_const(*this)) {
         if (!first)
             str += ',';
         if (it.var == "realm" || it.var == "nonce" || it.var == "username" || it.var == "cnonce"
@@ -119,7 +119,7 @@ bool DIGESTMD5PropList::fromString(const QByteArray &str)
 int DIGESTMD5PropList::varCount(const QByteArray &var) const
 {
     int n = 0;
-    for (const auto &it : qAsConst(*this)) {
+    for (const auto &it : std::as_const(*this)) {
         if (it.var == var)
             ++n;
     }
diff --git a/src/xmpp/sasl/scramsha1response.cpp b/src/xmpp/sasl/scramsha1response.cpp
index 07df1669..9d568edc 100644
--- a/src/xmpp/sasl/scramsha1response.cpp
+++ b/src/xmpp/sasl/scramsha1response.cpp
@@ -22,7 +22,7 @@
 #include "xmpp/jid/jid.h"
 
 #include <QByteArray>
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QString>
 #include <QTextStream>
 #include <QtCrypto>
@@ -43,12 +43,11 @@ SCRAMSHA1Response::SCRAMSHA1Response(const QByteArray &server_first_message, con
     QString pass_in = QString::fromUtf8(password_in);
     QString pass_out;
 
-    QRegExp pattern("r=(.*),s=(.+),i=(\\d+)");
-    int     pos = pattern.indexIn(QString(server_first_message));
-    isValid_    = true;
-    if (pos < 0) {
+    QRegularExpression pattern("r=(.*),s=(.+),i=(\\d+)");
+    auto match = pattern.match(QString(server_first_message));
+    isValid_    = match.hasMatch();
+    if (!isValid_) {
         qWarning("SASL/SCRAM-SHA-1: Failed to match pattern for server-final-message.");
-        isValid_ = false;
         return;
     }
     QCA::PBKDF2 hi("sha1");
@@ -58,9 +57,9 @@ SCRAMSHA1Response::SCRAMSHA1Response(const QByteArray &server_first_message, con
         return;
     }
 
-    QString clientservernonce = pattern.cap(1);
-    QString salt              = pattern.cap(2);
-    QString icount            = pattern.cap(3);
+    QString clientservernonce = match.captured(1);
+    QString salt              = match.captured(2);
+    QString icount            = match.captured(3);
 
     unsigned int dkLen;
 
@@ -96,9 +95,8 @@ SCRAMSHA1Response::SCRAMSHA1Response(const QByteArray &server_first_message, con
 
     QString gs2_header;
     {
-        QRegExp pattern("(.+)n=.+");
-        pattern.indexIn(QString(client_first_message));
-        gs2_header = pattern.cap(1);
+        QRegularExpression pattern("(.+)n=.+");
+        gs2_header = pattern.match(QString(client_first_message)).captured(1);
     }
 
     QString     client_final_message;
@@ -108,13 +106,14 @@ SCRAMSHA1Response::SCRAMSHA1Response(const QByteArray &server_first_message, con
 
     // AuthMessage     := client-first-message-bare + "," + server-first-message + "," +
     // client-final-message-without-proof
-    QRegExp extract_cfmb_pattern("(n=.+)");
-    if (extract_cfmb_pattern.indexIn(QString(client_first_message)) < 0) {
-        isValid_ = false;
+    QRegularExpression extract_cfmb_pattern("(n=.+)");
+    match = extract_cfmb_pattern.match(QString(client_first_message));
+    isValid_ = match.hasMatch();
+    if (!isValid_) {
         return;
     }
 
-    QString client_first_message_bare = extract_cfmb_pattern.cap(1);
+    QString client_first_message_bare = match.captured(1);
 
     QCA::SecureArray auth_message = QCA::SecureArray(client_first_message_bare.toUtf8());
     auth_message += QCA::SecureArray(",") + QCA::SecureArray(server_first_message);
diff --git a/src/xmpp/sasl/scramsha1signature.cpp b/src/xmpp/sasl/scramsha1signature.cpp
index 4051fe06..f0785d1f 100644
--- a/src/xmpp/sasl/scramsha1signature.cpp
+++ b/src/xmpp/sasl/scramsha1signature.cpp
@@ -18,30 +18,27 @@
 
 #include "xmpp/sasl/scramsha1signature.h"
 
-#include "xmpp/base/randomnumbergenerator.h"
-
 #include <QByteArray>
-#include <QRegExp>
 #include <QString>
 #include <QTextStream>
 #include <QtCrypto>
+#include <QRegularExpression>
 #include <QtDebug>
 
 namespace XMPP {
 SCRAMSHA1Signature::SCRAMSHA1Signature(const QByteArray &      server_final_message,
                                        const QCA::SecureArray &server_signature_should)
 {
-    QRegExp pattern("v=([^,]*)");
-    int     pos = pattern.indexIn(QString(server_final_message));
-    isValid_    = true;
-    if (pos > -1) {
-        QString          server_signature = pattern.cap(1);
+    QRegularExpression pattern("v=([^,]*)");
+    auto match = pattern.match(QString(server_final_message));
+    isValid_    = match.hasMatch();
+    if (isValid_) {
+        QString          server_signature = match.captured(1);
         QCA::SecureArray server_sig(QCA::Base64().stringToArray(server_signature));
         if (server_sig != server_signature_should)
             isValid_ = false;
     } else {
         qWarning("SASL/SCRAM-SHA-1: Failed to match pattern for server-final-message.");
-        isValid_ = false;
     }
 }
 } // namespace XMPP
diff --git a/src/xmpp/xmpp-core/parser.cpp b/src/xmpp/xmpp-core/parser.cpp
index 20b1106b..df931c27 100644
--- a/src/xmpp/xmpp-core/parser.cpp
+++ b/src/xmpp/xmpp-core/parser.cpp
@@ -355,6 +355,6 @@ QByteArray Parser::unprocessed() const
     return ret;
 }
 
-QStringRef Parser::encoding() const { return d->reader.documentEncoding(); }
+QStringView Parser::encoding() const { return d->reader.documentEncoding(); }
 
 }
diff --git a/src/xmpp/xmpp-core/parser.h b/src/xmpp/xmpp-core/parser.h
index b4039ed9..0ea6a087 100644
--- a/src/xmpp/xmpp-core/parser.h
+++ b/src/xmpp/xmpp-core/parser.h
@@ -82,7 +82,7 @@ class Parser {
     void       appendData(const QByteArray &a);
     Event      readNext();
     QByteArray unprocessed() const;
-    QStringRef encoding() const;
+    QStringView encoding() const;
 
 private:
     class Private;
diff --git a/src/xmpp/xmpp-core/protocol.cpp b/src/xmpp/xmpp-core/protocol.cpp
index e08509e7..2f70e81e 100644
--- a/src/xmpp/xmpp-core/protocol.cpp
+++ b/src/xmpp/xmpp-core/protocol.cpp
@@ -48,7 +48,7 @@ static QString printArray(const QByteArray &a)
             QString str = QString::asprintf("[%02x]", c);
             s += str;
         } else
-            s += c;
+            s += QChar::fromLatin1(c);
     }
     return s;
 }
@@ -1273,7 +1273,7 @@ bool CoreProtocol::normalStep(const QDomElement &e)
             }
         } else {
             QDomElement mechs = doc.createElementNS(NS_SASL, "mechanisms");
-            for (const QString &it : qAsConst(sasl_mechlist)) {
+            for (const QString &it : std::as_const(sasl_mechlist)) {
                 QDomElement m = doc.createElement("mechanism");
                 m.appendChild(doc.createTextNode(it));
                 mechs.appendChild(m);
@@ -1363,7 +1363,7 @@ bool CoreProtocol::normalStep(const QDomElement &e)
             if (f.sasl_supported) {
 #ifdef XMPP_TEST
                 QString s = "SASL mechs:";
-                for (const auto &saslMech : qAsConst(f.sasl_mechs))
+                for (const auto &saslMech : std::as_const(f.sasl_mechs))
                     s += QString(" [%1]").arg(saslMech);
                 TD::msg(s);
 #endif
@@ -1371,7 +1371,7 @@ bool CoreProtocol::normalStep(const QDomElement &e)
             if (f.compress_supported) {
 #ifdef XMPP_TEST
                 QString s = "Compression mechs:";
-                for (const auto &comprMech : qAsConst(f.compression_mechs))
+                for (const auto &comprMech : std::as_const(f.compression_mechs))
                     s += QString(" [%1]").arg(comprMech);
                 TD::msg(s);
 #endif
@@ -1698,24 +1698,25 @@ bool CoreProtocol::normalStep(const QDomElement &e)
 #endif
                     QString location = e.attribute("location").trimmed();
                     if (!location.isEmpty()) {
-                        int        port_off = 0;
-                        QStringRef sm_host;
-                        int        sm_port = 0;
+                        int         port_off = 0;
+                        QStringView sm_host;
+                        int         sm_port = 0;
+                        auto location_view = QStringView{location};
                         if (location.startsWith('[')) { // ipv6
                             port_off = location.indexOf(']');
                             if (port_off != -1) { // looks valid
-                                sm_host = location.midRef(1, port_off - 1);
+                                sm_host = location_view.mid(1, port_off - 1);
                                 if (location.length() > port_off + 2 && location.at(port_off + 1) == ':')
-                                    sm_port = location.midRef(port_off + 2).toUInt();
+                                    sm_port = location_view.mid(port_off + 2).toUInt();
                             }
                         }
                         if (port_off == 0) {
                             port_off = location.indexOf(':');
                             if (port_off != -1) {
-                                sm_host = location.leftRef(port_off);
-                                sm_port = location.midRef(port_off + 1).toUInt();
+                                sm_host = location_view.left(port_off);
+                                sm_port = location_view.mid(port_off + 1).toUInt();
                             } else {
-                                sm_host = location.midRef(0);
+                                sm_host = location_view.mid(0);
                             }
                         }
                         sm.setLocation(sm_host.toString(), sm_port);
diff --git a/src/xmpp/xmpp-core/securestream.cpp b/src/xmpp/xmpp-core/securestream.cpp
index bef8c637..d6a6f0da 100644
--- a/src/xmpp/xmpp-core/securestream.cpp
+++ b/src/xmpp/xmpp-core/securestream.cpp
@@ -417,7 +417,7 @@ void SecureStream::linkLayer(QObject *s)
 int SecureStream::calcPrebytes() const
 {
     int x = 0;
-    for (SecureLayer *s : qAsConst(d->layers)) {
+    for (SecureLayer *s : std::as_const(d->layers)) {
         x += s->prebytes;
     }
     return (d->pending - x);
@@ -545,7 +545,7 @@ void SecureStream::bs_readyRead()
 
 void SecureStream::bs_bytesWritten(qint64 bytes)
 {
-    for (SecureLayer *s : qAsConst(d->layers)) {
+    for (SecureLayer *s : std::as_const(d->layers)) {
         bytes = s->finished(int(bytes));
     }
 
diff --git a/src/xmpp/xmpp-core/stream.cpp b/src/xmpp/xmpp-core/stream.cpp
index b1ad1b7c..aaedfdb7 100644
--- a/src/xmpp/xmpp-core/stream.cpp
+++ b/src/xmpp/xmpp-core/stream.cpp
@@ -272,7 +272,7 @@ void ClientStream::reset(bool all)
         }
     } else {
         QSharedPointer<QDomDocument> sd;
-        for (Stanza *s : qAsConst(d->in)) {
+        for (Stanza *s : std::as_const(d->in)) {
             sd = s->unboundDocument(sd);
         }
     }
@@ -883,7 +883,7 @@ void ClientStream::processNext()
 #endif
         bool ok = d->client.processStep();
         // deal with send/received items
-        for (const XmlProtocol::TransferItem &i : qAsConst(d->client.transferItemList)) {
+        for (const XmlProtocol::TransferItem &i : std::as_const(d->client.transferItemList)) {
             if (i.isExternal)
                 continue;
             QString str;
@@ -1149,7 +1149,7 @@ bool ClientStream::handleNeed()
         else {
             QMap<int, QString> prefOrdered;
             QStringList        unpreferred;
-            for (auto const &m : qAsConst(d->client.features.sasl_mechs)) {
+            for (auto const &m : std::as_const(d->client.features.sasl_mechs)) {
                 int i = preference.indexOf(m);
                 if (i != -1) {
                     prefOrdered.insert(i, m);
diff --git a/src/xmpp/xmpp-core/tlshandler.cpp b/src/xmpp/xmpp-core/tlshandler.cpp
index e0daf4dd..9c348aaf 100644
--- a/src/xmpp/xmpp-core/tlshandler.cpp
+++ b/src/xmpp/xmpp-core/tlshandler.cpp
@@ -20,8 +20,9 @@
 #include "qca.h"
 #include "xmpp.h"
 
-#include <qtimer.h>
-#include <qurl.h>
+#include <QRegularExpression>
+#include <QTimer>
+#include <QUrl>
 
 using namespace XMPP;
 // FIXME: remove this code once qca cert host checking works ...
@@ -136,7 +137,7 @@ static bool cert_match_domain(const QString &certname, const QString &acedomain)
     name = name.toLower();
 
     // ensure the cert field contains valid characters only
-    if (QRegExp("[^a-z0-9\\.\\*\\-]").indexIn(name) >= 0)
+    if (QRegularExpression("[^a-z0-9\\.\\*\\-]").match(name).hasMatch())
         return false;
 
         // hack into parts, and require at least 1 part
@@ -164,7 +165,7 @@ static bool cert_match_domain(const QString &certname, const QString &acedomain)
         return false;
 
     // don't allow empty parts
-    for (const QString &s : qAsConst(parts_name)) {
+    for (const QString &s : std::as_const(parts_name)) {
         if (s.isEmpty())
             return false;
     }
@@ -191,8 +192,11 @@ static bool cert_match_domain(const QString &certname, const QString &acedomain)
     for (int n = 0; n < parts_name.count(); ++n) {
         const QString &p1 = parts_name[n];
         const QString &p2 = parts_compare[n];
-
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
         if (!QRegExp(p1, Qt::CaseSensitive, QRegExp::Wildcard).exactMatch(p2))
+#else
+        if (!QRegularExpression::fromWildcard(QLatin1Char('^') + p1 + QLatin1Char('$'), Qt::CaseSensitive).match(p2).hasMatch())
+#endif
             return false;
     }
 
diff --git a/src/xmpp/xmpp-core/xmlprotocol.cpp b/src/xmpp/xmpp-core/xmlprotocol.cpp
index 98268818..ab89fed4 100644
--- a/src/xmpp/xmpp-core/xmlprotocol.cpp
+++ b/src/xmpp/xmpp-core/xmlprotocol.cpp
@@ -97,14 +97,6 @@ static QString xmlToString(const QDomElement &e, const QString &fakeNS, const QS
     QString out;
     {
         QTextStream ts(&out, QIODevice::WriteOnly);
-        // NOTE: Workaround for bug in QtXML https://bugreports.qt.io/browse/QTBUG-25291 (Qt4 only):
-        // Qt by default convert low surrogate to XML notation &#x....; and let high in binary!
-        //
-        // Qt is calling encode function per UTF-16 codepoint, which means that high and low
-        // surrogate pairs are encoded separately. So all encoding except UTF-16 will leads
-        // to damaged Unicode characters above 0xFFFF. Internal QString encoding is UTF-16
-        // so this should be safe as QString still contains valid Unicode characters.
-        ts.setCodec("UTF-16");
         fake.firstChild().save(ts, 0);
     }
     // 'clip' means to remove any unwanted (and unneeded) characters, such as a trailing newline
diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
index 8b8daab4..f3cfe9d9 100644
--- a/src/xmpp/xmpp-im/client.cpp
+++ b/src/xmpp/xmpp-im/client.cpp
@@ -308,7 +308,7 @@ bool Client::isActive() const { return d->active; }
 QString Client::groupChatPassword(const QString &host, const QString &room) const
 {
     Jid jid(room + "@" + host);
-    for (const GroupChat &i : qAsConst(d->groupChatList)) {
+    for (const GroupChat &i : std::as_const(d->groupChatList)) {
         if (i.j.compare(jid, false)) {
             return i.password;
         }
@@ -376,7 +376,7 @@ void Client::groupChatSetStatus(const QString &host, const QString &room, const
 {
     Jid  jid(room + "@" + host);
     bool found = false;
-    for (const GroupChat &i : qAsConst(d->groupChatList)) {
+    for (const GroupChat &i : std::as_const(d->groupChatList)) {
         if (i.j.compare(jid, false)) {
             found = true;
             jid   = i.j;
@@ -435,7 +435,7 @@ void Client::groupChatLeaveAll(const QString &statusStr)
 QString Client::groupChatNick(const QString &host, const QString &room) const
 {
     Jid jid(room + "@" + host);
-    for (const GroupChat &gc : qAsConst(d->groupChatList)) {
+    for (const GroupChat &gc : std::as_const(d->groupChatList)) {
         if (gc.j.compare(jid, false)) {
             return gc.j.resource();
         }
diff --git a/src/xmpp/xmpp-im/filetransfer.cpp b/src/xmpp/xmpp-im/filetransfer.cpp
index 89118d9f..8d63c956 100644
--- a/src/xmpp/xmpp-im/filetransfer.cpp
+++ b/src/xmpp/xmpp-im/filetransfer.cpp
@@ -403,7 +403,7 @@ void FileTransferManager::setDisabled(const QString &ns, bool state)
 void FileTransferManager::pft_incoming(const FTRequest &req)
 {
     QString streamType;
-    for (const QString &ns : qAsConst(d->streamPriority)) {
+    for (const QString &ns : std::as_const(d->streamPriority)) {
         if (req.streamTypes.contains(ns)) {
             BytestreamManager *manager = streamManager(ns);
             if (manager && manager->isAcceptableSID(req.from, req.id)) {
@@ -435,7 +435,7 @@ BytestreamManager *FileTransferManager::streamManager(const QString &ns) const
 QStringList FileTransferManager::streamPriority() const
 {
     QStringList ret;
-    for (const QString &ns : qAsConst(d->streamPriority)) {
+    for (const QString &ns : std::as_const(d->streamPriority)) {
         if (!d->disabledStreamTypes.contains(ns)) {
             ret.append(ns);
         }
@@ -445,7 +445,7 @@ QStringList FileTransferManager::streamPriority() const
 
 void FileTransferManager::stream_incomingReady(BSConnection *c)
 {
-    for (FileTransfer *ft : qAsConst(d->list)) {
+    for (FileTransfer *ft : std::as_const(d->list)) {
         if (ft->d->needStream && ft->d->peer.compare(c->peer()) && ft->d->id == c->sid()) {
             ft->takeConnection(c);
             return;
@@ -466,7 +466,7 @@ QString FileTransferManager::link(FileTransfer *ft)
 #else
         id = QString("ft_%1").arg(qrand() & 0xffff, 4, 16, QChar('0'));
 #endif
-        for (FileTransfer *ft : qAsConst(d->list)) {
+        for (FileTransfer *ft : std::as_const(d->list)) {
             if (ft->d->peer.compare(ft->d->peer) && ft->d->id == id) {
                 found = true;
                 break;
diff --git a/src/xmpp/xmpp-im/httpfileupload.cpp b/src/xmpp/xmpp-im/httpfileupload.cpp
index ab8f06f6..314a76be 100644
--- a/src/xmpp/xmpp-im/httpfileupload.cpp
+++ b/src/xmpp/xmpp-im/httpfileupload.cpp
@@ -28,7 +28,6 @@
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
-#include <QRegExp>
 
 using namespace XMPP;
 
@@ -103,7 +102,7 @@ void HttpFileUpload::start()
         featureOptions << (QSet<QString>() << xmlns_v0_2_5) << (QSet<QString>() << xmlns_v0_3_1);
     }
     d->client->serverInfoManager()->queryServiceInfo(
-        QLatin1String("store"), QLatin1String("file"), featureOptions, QRegExp("^(upload|http|stor|file|dis|drive).*"),
+        QLatin1String("store"), QLatin1String("file"), featureOptions, QRegularExpression("^(upload|http|stor|file|dis|drive).*"),
         ServerInfoManager::SQ_CheckAllOnNoMatch, [this](const QList<DiscoItem> &items) {
             d->httpHosts.clear();
             for (const auto &item : items) {
diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 2e0920ff..43d8dc2f 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -386,7 +386,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
             if (hasher) {
                 auto expectedHash = hasher->result();
                 bool found        = false;
-                for (auto const &h : qAsConst(incomingChecksum)) {
+                for (auto const &h : std::as_const(incomingChecksum)) {
                     if (h.type() != expectedHash.type())
                         continue;
                     if (h == expectedHash) {
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index ecf5ed50..02d49a9a 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -296,7 +296,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
             }
             left = iceList;
 
-            for (Ice176 *ice : qAsConst(left)) {
+            for (Ice176 *ice : std::as_const(left)) {
                 ice->setParent(this);
 
                 // TODO: error() also?
@@ -591,7 +591,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
                                        ExternalService::Ptr stun;
                                        ExternalService::Ptr turnUdp;
                                        ExternalService::Ptr turnTcp;
-                                       for (auto const &s : qAsConst(services)) {
+                                       for (auto const &s : std::as_const(services)) {
                                            if (s->type == QLatin1String("stun")
                                                && (s->transport.isEmpty() || s->transport == QLatin1String("udp")))
                                                stun = s;
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 9145fb9a..29bbdcd1 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -34,6 +34,7 @@
 #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
 #include <QRandomGenerator>
 #endif
+#include <QPointer>
 
 namespace XMPP { namespace Jingle { namespace S5B {
     const QString NS(QStringLiteral("urn:xmpp:jingle:transports:s5b:1"));
@@ -700,7 +701,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
             QList<QSet<QString>> featureOptions = { { "http://jabber.org/protocol/bytestreams" } };
             q->_pad->session()->manager()->client()->serverInfoManager()->queryServiceInfo(
                 QStringLiteral("proxy"), QStringLiteral("bytestreams"), featureOptions,
-                QRegExp("proxy.*|socks.*|stream.*|s5b.*"), ServerInfoManager::SQ_CheckAllOnNoMatch,
+                QRegularExpression("proxy.*|socks.*|stream.*|s5b.*"), ServerInfoManager::SQ_CheckAllOnNoMatch,
                 [this](const QList<DiscoItem> &items) {
                     if (!proxyDiscoveryInProgress) { // check if new results are ever/still expected
                         // seems like we have successful connection via higher priority channel. so nobody cares
diff --git a/src/xmpp/xmpp-im/jingle-session.cpp b/src/xmpp/xmpp-im/jingle-session.cpp
index 8953d560..034f0eec 100644
--- a/src/xmpp/xmpp-im/jingle-session.cpp
+++ b/src/xmpp/xmpp-im/jingle-session.cpp
@@ -33,9 +33,9 @@ template <class T> constexpr std::add_const_t<T> &as_const(T &t) noexcept { retu
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
 // this adds const to non-const objects (like std::as_const)
-template <typename T> Q_DECL_CONSTEXPR typename std::add_const<T>::type &qAsConst(T &t) noexcept { return t; }
+template <typename T> Q_DECL_CONSTEXPR typename std::add_const<T>::type &std::as_const(T &t) noexcept { return t; }
 // prevent rvalue arguments:
-template <typename T> void qAsConst(const T &&) = delete;
+template <typename T> void std::as_const(const T &&) = delete;
 #endif
 
 namespace XMPP { namespace Jingle {
@@ -240,7 +240,7 @@ namespace XMPP { namespace Jingle {
                 // we could fail very early if something went wrong with transports init for example
                 Reason reason;
                 bool   all = true;
-                for (auto const &c : qAsConst(contentList)) {
+                for (auto const &c : std::as_const(contentList)) {
                     if (c->state() < State::Finishing) {
                         all = false;
                         break;
@@ -307,7 +307,7 @@ namespace XMPP { namespace Jingle {
 
             QMultiMap<Application::Update, Application *> updates;
             qDebug("jingle-doStep: %d applications have updates", signalingContent.size());
-            for (auto app : qAsConst(signalingContent)) {
+            for (auto app : std::as_const(signalingContent)) {
                 auto updateType = app->evaluateOutgoingUpdate();
                 if (updateType.action != Action::NoAction) {
                     if (state == State::ApprovedToSend && app->flags() & Application::InitialApplication) {
@@ -360,7 +360,7 @@ namespace XMPP { namespace Jingle {
              */
             typedef std::tuple<QPointer<Application>, OutgoingUpdateCB> AckHndl;
             if (role == Origin::Responder) {
-                for (const auto &c : qAsConst(initialIncomingUnacceptedContent)) {
+                for (const auto &c : std::as_const(initialIncomingUnacceptedContent)) {
                     auto out = c->evaluateOutgoingUpdate();
                     if (out.action == Action::ContentReject) {
                         lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
@@ -372,7 +372,7 @@ namespace XMPP { namespace Jingle {
                     }
                 }
             } else {
-                for (const auto &c : qAsConst(contentList)) {
+                for (const auto &c : std::as_const(contentList)) {
                     auto out = c->evaluateOutgoingUpdate();
                     if (out.action == Action::ContentRemove) {
                         lastError = XMPP::Stanza::Error(XMPP::Stanza::Error::Cancel, XMPP::Stanza::Error::BadRequest);
@@ -397,7 +397,7 @@ namespace XMPP { namespace Jingle {
 
             QList<QDomElement> contents;
             QList<AckHndl>     acceptApps;
-            for (const auto &app : qAsConst(contentList)) {
+            for (const auto &app : std::as_const(contentList)) {
                 QList<QDomElement> xml;
                 OutgoingUpdateCB   callback;
                 std::tie(xml, callback) = app->takeOutgoingUpdate();
@@ -687,7 +687,7 @@ namespace XMPP { namespace Jingle {
                 QTimer::singleShot(0, q, [this, rejectSet]() mutable {
                     auto               cond = rejectSet.first().second;
                     QList<QDomElement> rejects;
-                    for (auto const &i : qAsConst(rejectSet)) {
+                    for (auto const &i : std::as_const(rejectSet)) {
                         rejects.append(i.first);
                     }
                     rejects += Reason(cond).toXml(manager->client()->doc());
@@ -734,7 +734,7 @@ namespace XMPP { namespace Jingle {
 
             if (apps.size()) {
                 Origin remoteRole = negateOrigin(role);
-                for (auto app : qAsConst(apps)) {
+                for (auto app : std::as_const(apps)) {
                     addAndInitContent(remoteRole, app); // TODO check conflicts
                 }
                 QTimer::singleShot(0, q, [this]() { emit q->newContentReceived(); });
@@ -798,7 +798,7 @@ namespace XMPP { namespace Jingle {
 
             state = State::Connecting;
             if (apps.size()) {
-                for (auto app : qAsConst(apps)) {
+                for (auto app : std::as_const(apps)) {
                     app->start();
                 }
             }
@@ -820,7 +820,7 @@ namespace XMPP { namespace Jingle {
             }
 
             if (apps.size() && state >= State::Active) {
-                for (auto app : qAsConst(apps)) {
+                for (auto app : std::as_const(apps)) {
                     app->start(); // start accepted app. connection establishing and data transfer are inside
                 }
             }
@@ -1208,7 +1208,7 @@ namespace XMPP { namespace Jingle {
             if (!apps.size())
                 return false;
             d->initialIncomingUnacceptedContent = apps;
-            for (auto app : qAsConst(apps)) {
+            for (auto app : std::as_const(apps)) {
                 app->markInitialApplication(true);
                 d->addAndInitContent(Origin::Initiator, app);
             }
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index 9cf66c21..014c5e6f 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -24,6 +24,8 @@
 
 #include <QSharedDataPointer>
 #include <QSharedPointer>
+#include <QObject>
+
 #include <functional>
 
 class QDomDocument;
diff --git a/src/xmpp/xmpp-im/s5b.cpp b/src/xmpp/xmpp-im/s5b.cpp
index 84862363..24300804 100644
--- a/src/xmpp/xmpp-im/s5b.cpp
+++ b/src/xmpp/xmpp-im/s5b.cpp
@@ -656,7 +656,7 @@ bool S5BManager::isAcceptableSID(const Jid &peer, const QString &sid) const
     QString key     = makeKey(sid, d->client->jid(), peer);
     QString key_out = makeKey(sid, peer, d->client->jid()); // not valid in muc via proxy
 
-    for (Entry *e : qAsConst(d->activeList)) {
+    for (Entry *e : std::as_const(d->activeList)) {
         if (e->i) {
             if (e->i->key == key || e->i->key == key_out)
                 return false;
@@ -677,7 +677,7 @@ const char *S5BManager::sidPrefix() const { return "s5b_"; }
 
 S5BConnection *S5BManager::findIncoming(const Jid &from, const QString &sid) const
 {
-    for (S5BConnection *c : qAsConst(d->incomingConns)) {
+    for (S5BConnection *c : std::as_const(d->incomingConns)) {
         if (c->d->peer.compare(from) && c->d->sid == sid)
             return c;
     }
@@ -686,7 +686,7 @@ S5BConnection *S5BManager::findIncoming(const Jid &from, const QString &sid) con
 
 S5BManager::Entry *S5BManager::findEntry(S5BConnection *c) const
 {
-    for (Entry *e : qAsConst(d->activeList)) {
+    for (Entry *e : std::as_const(d->activeList)) {
         if (e->c == c)
             return e;
     }
@@ -695,7 +695,7 @@ S5BManager::Entry *S5BManager::findEntry(S5BConnection *c) const
 
 S5BManager::Entry *S5BManager::findEntry(Item *i) const
 {
-    for (Entry *e : qAsConst(d->activeList)) {
+    for (Entry *e : std::as_const(d->activeList)) {
         if (e->i == i)
             return e;
     }
@@ -704,7 +704,7 @@ S5BManager::Entry *S5BManager::findEntry(Item *i) const
 
 S5BManager::Entry *S5BManager::findEntryByHash(const QString &key) const
 {
-    for (Entry *e : qAsConst(d->activeList)) {
+    for (Entry *e : std::as_const(d->activeList)) {
         if (e->i && e->i->key == key)
             return e;
     }
@@ -713,7 +713,7 @@ S5BManager::Entry *S5BManager::findEntryByHash(const QString &key) const
 
 S5BManager::Entry *S5BManager::findEntryBySID(const Jid &peer, const QString &sid) const
 {
-    for (Entry *e : qAsConst(d->activeList)) {
+    for (Entry *e : std::as_const(d->activeList)) {
         if (e->i && e->i->peer.compare(peer) && e->sid == sid)
             return e;
     }
@@ -926,7 +926,7 @@ void S5BManager::query_finished()
 {
     JT_S5B *query = static_cast<JT_S5B *>(sender());
     Entry * e     = nullptr;
-    for (Entry *i : qAsConst(d->activeList)) {
+    for (Entry *i : std::as_const(d->activeList)) {
         if (i->query == query) {
             e = i;
             break;
@@ -1145,7 +1145,7 @@ void S5BManager::Item::doIncoming()
     StreamHostList list;
     if (lateProxy) {
         // take just the proxy streamhosts
-        for (const StreamHost &it : qAsConst(in_hosts)) {
+        for (const StreamHost &it : std::as_const(in_hosts)) {
             if (it.isProxy())
                 list += it;
         }
@@ -1155,7 +1155,7 @@ void S5BManager::Item::doIncoming()
         if ((state == Requester || (state == Target && fast)) && !proxy.jid().isValid()) {
             // take just the non-proxy streamhosts
             bool hasProxies = false;
-            for (const StreamHost &it : qAsConst(in_hosts)) {
+            for (const StreamHost &it : std::as_const(in_hosts)) {
                 if (it.isProxy())
                     hasProxies = true;
                 else
@@ -1814,7 +1814,7 @@ void S5BConnector::t_timeout()
 void S5BConnector::man_udpSuccess(const Jid &streamHost)
 {
     // was anyone sending to this streamhost?
-    for (Item *i : qAsConst(d->itemList)) {
+    for (Item *i : std::as_const(d->itemList)) {
         if (i->host.jid().compare(streamHost) && i->client_udp) {
             i->udpSuccess();
             return;
diff --git a/src/xmpp/xmpp-im/stundisco.cpp b/src/xmpp/xmpp-im/stundisco.cpp
index 8f2751e2..4d29b587 100644
--- a/src/xmpp/xmpp-im/stundisco.cpp
+++ b/src/xmpp/xmpp-im/stundisco.cpp
@@ -147,7 +147,7 @@ class StunDiscoMonitor : public AbstractStunDisco {
 
     void setAddresses(const QString &host, const QList<QHostAddress> &addresses)
     {
-        for (auto const &s : qAsConst(pendingWork_)) {
+        for (auto const &s : std::as_const(pendingWork_)) {
             if (s->host == host && s->addresses.isEmpty()) {
                 if (addresses.isEmpty())
                     s->expires = QDeadlineTimer(); // expired
diff --git a/src/xmpp/xmpp-im/types.cpp b/src/xmpp/xmpp-im/types.cpp
index 9d38467f..b0e89223 100644
--- a/src/xmpp/xmpp-im/types.cpp
+++ b/src/xmpp/xmpp-im/types.cpp
@@ -980,7 +980,7 @@ AddressList Message::findAddresses(Address::Type t) const
         return AddressList();
     }
     AddressList matches;
-    for (const Address &a : qAsConst(d->addressList)) {
+    for (const Address &a : std::as_const(d->addressList)) {
         if (a.type() == t)
             matches.append(a);
     }
@@ -1159,7 +1159,7 @@ Stanza Message::toStanza(Stream *stream) const
     if (containsHTML()) {
         QDomElement html = s.createElement("http://jabber.org/protocol/xhtml-im", "html");
         s.appendChild(html);
-        for (const HTMLElement &el : qAsConst(d->htmlElements)) {
+        for (const HTMLElement &el : std::as_const(d->htmlElements)) {
             html.appendChild(s.doc().importNode(el.body(), true).toElement());
         }
     }
@@ -1185,7 +1185,7 @@ Stanza Message::toStanza(Stream *stream) const
     }
 
     // urls
-    for (const Url &uit : qAsConst(d->urlList)) {
+    for (const Url &uit : std::as_const(d->urlList)) {
         QDomElement x = s.createElement("jabber:x:oob", "x");
         x.appendChild(s.createTextElement("jabber:x:oob", "url", uit.url()));
         if (!uit.desc().isEmpty())
@@ -1204,7 +1204,7 @@ Stanza Message::toStanza(Stream *stream) const
                 x.appendChild(s.createTextElement("jabber:x:event", "id", d->eventId));
         }
 
-        for (const MsgEvent &ev : qAsConst(d->eventList)) {
+        for (const MsgEvent &ev : std::as_const(d->eventList)) {
             switch (ev) {
             case OfflineEvent:
                 x.appendChild(s.createElement("jabber:x:event", "offline"));
@@ -1291,7 +1291,7 @@ Stanza Message::toStanza(Stream *stream) const
     // addresses
     if (!d->addressList.isEmpty()) {
         QDomElement as = s.createElement("http://jabber.org/protocol/address", "addresses");
-        for (const Address &a : qAsConst(d->addressList)) {
+        for (const Address &a : std::as_const(d->addressList)) {
             as.appendChild(a.toXml(s));
         }
         s.appendChild(as);
@@ -1300,7 +1300,7 @@ Stanza Message::toStanza(Stream *stream) const
     // roster item exchange
     if (!d->rosterExchangeItems.isEmpty()) {
         QDomElement rx = s.createElement("http://jabber.org/protocol/rosterx", "x");
-        for (const RosterExchangeItem &r : qAsConst(d->rosterExchangeItems)) {
+        for (const RosterExchangeItem &r : std::as_const(d->rosterExchangeItems)) {
             rx.appendChild(r.toXml(s));
         }
         s.appendChild(rx);
@@ -1326,7 +1326,7 @@ Stanza Message::toStanza(Stream *stream) const
     // muc
     if (!d->mucInvites.isEmpty()) {
         QDomElement e = s.createElement("http://jabber.org/protocol/muc#user", "x");
-        for (const MUCInvite &i : qAsConst(d->mucInvites)) {
+        for (const MUCInvite &i : std::as_const(d->mucInvites)) {
             e.appendChild(i.toXml(s.doc()));
         }
         if (!d->mucPassword.isEmpty()) {
@@ -1355,7 +1355,7 @@ Stanza Message::toStanza(Stream *stream) const
     }
 
     // bits of binary
-    for (const BoBData &bd : qAsConst(d->bobDataList)) {
+    for (const BoBData &bd : std::as_const(d->bobDataList)) {
         s.appendChild(bd.toXml(&s.doc()));
     }
 
@@ -1401,7 +1401,7 @@ Stanza Message::toStanza(Stream *stream) const
     }
 
     // XEP-0372 and XEP-0385
-    for (auto const &r : qAsConst(d->references)) {
+    for (auto const &r : std::as_const(d->references)) {
         s.appendChild(r.toXml(&s.doc()));
     }
 
diff --git a/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp b/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp
index 33576a6a..9f9f8e69 100644
--- a/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp
+++ b/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp
@@ -59,7 +59,7 @@ Hash BoBData::cidToHash(const QString &cid)
 {
     if (!cid.endsWith(QLatin1String("@bob.xmpp.org")))
         return Hash();
-    return Hash::from(cid.leftRef(cid.size() - sizeof("@bob.xmpp.org") + 1));
+    return Hash::from(QStringView{cid}.left(cid.size() - sizeof("@bob.xmpp.org") + 1));
 }
 
 QString BoBData::cid() const
diff --git a/src/xmpp/xmpp-im/xmpp_caps.cpp b/src/xmpp/xmpp-im/xmpp_caps.cpp
index 43fe9f46..8100f125 100644
--- a/src/xmpp/xmpp-im/xmpp_caps.cpp
+++ b/src/xmpp/xmpp-im/xmpp_caps.cpp
@@ -35,7 +35,6 @@
 #include <QDebug>
 #include <QDomElement>
 #include <QFile>
-#include <QTextCodec>
 
 namespace XMPP {
 QDomElement CapsInfo::toXml(QDomDocument *doc) const
@@ -320,7 +319,7 @@ void CapsManager::updateDisco(const Jid &jid, const DiscoItem &item)
 void CapsManager::capsRegistered(const CapsSpec &cs)
 {
     // Notify affected jids.
-    for (const QString &s : qAsConst(capsJids_[cs.flatten()])) {
+    for (const QString &s : std::as_const(capsJids_[cs.flatten()])) {
         // qDebug() << QString("caps.cpp: Notifying %1.").arg(s.replace('%',"%%"));
         emit capsChanged(s);
     }
@@ -391,7 +390,7 @@ QString CapsManager::clientName(const Jid &jid) const
                 ds = 5;
             }
 
-            name = QStringRef(&node, startPos, node.size() - startPos - ds).toString();
+            name = QStringView{node}.mid(startPos, node.size() - startPos - ds).toString();
         }
 
         return name;
diff --git a/src/xmpp/xmpp-im/xmpp_encryption.cpp b/src/xmpp/xmpp-im/xmpp_encryption.cpp
index 02e84e47..25c21e2d 100644
--- a/src/xmpp/xmpp-im/xmpp_encryption.cpp
+++ b/src/xmpp/xmpp-im/xmpp_encryption.cpp
@@ -25,6 +25,8 @@ class EncryptionManager::Private {
     QList<EncryptionMethod *> methods;
 };
 
+EncryptionManager::EncryptionManager() : d(new Private) { }
+
 EncryptionManager::~EncryptionManager() { }
 
 void EncryptionManager::registerMethod(EncryptionMethod *algo) { d->methods.append(algo); }
@@ -34,7 +36,7 @@ void EncryptionManager::unregisterMethod(EncryptionMethod *algo) { d->methods.re
 EncryptionManager::MethodsMap EncryptionManager::methods(EncryptionMethod::Capabilities caps) const
 {
     MethodsMap ret;
-    for (auto const &m : qAsConst(d->methods)) {
+    for (auto const &m : std::as_const(d->methods)) {
         if (caps & m->capabilities())
             ret[m->id()] = m->name();
     }
diff --git a/src/xmpp/xmpp-im/xmpp_encryption.h b/src/xmpp/xmpp-im/xmpp_encryption.h
index 04351745..a76b0c16 100644
--- a/src/xmpp/xmpp-im/xmpp_encryption.h
+++ b/src/xmpp/xmpp-im/xmpp_encryption.h
@@ -16,12 +16,13 @@
  *
  */
 
+#include "xmpp_features.h"
+
 #include <QObject>
 
 #include <map>
 #include <memory>
 
-#include "xmpp_features.h"
 
 class QDomElement;
 
@@ -62,6 +63,7 @@ class EncryptionManager : public QObject {
     using MethodId   = QString;
     using MethodName = QString;
 
+    EncryptionManager();
     ~EncryptionManager();
     using MethodsMap = std::map<MethodId, MethodName>;
 
diff --git a/src/xmpp/xmpp-im/xmpp_externalservicediscovery.cpp b/src/xmpp/xmpp-im/xmpp_externalservicediscovery.cpp
index 096d72f7..c598b9e6 100644
--- a/src/xmpp/xmpp-im/xmpp_externalservicediscovery.cpp
+++ b/src/xmpp/xmpp-im/xmpp_externalservicediscovery.cpp
@@ -46,7 +46,7 @@ void JT_ExternalServiceDiscovery::onGo()
             query.setAttribute(QLatin1String("type"), type_);
         }
     } else {
-        for (auto const &c : qAsConst(creds_)) {
+        for (auto const &c : std::as_const(creds_)) {
             QDomElement service = doc()->createElement(QLatin1String("service"));
             service.setAttribute(QLatin1String("host"), c.host);
             service.setAttribute(QLatin1String("type"), c.type);
@@ -163,7 +163,7 @@ void ExternalServiceDiscovery::services(QObject *ctx, ServicesCallback &&callbac
     // check if cache is valid (no expired or ready to expire items)
     ExternalServiceList ret;
     bool                cacheValid = true;
-    for (auto const &s : qAsConst(services_)) {
+    for (auto const &s : std::as_const(services_)) {
         if (!(types.isEmpty() || types.contains(s->type)))
             continue; // not interesting for us
         if (!(s->expires.isForever() || s->expires.remainingTimeAsDuration() > minTtl)) {
@@ -210,7 +210,7 @@ ExternalServiceList ExternalServiceDiscovery::cachedServices(const QStringList &
         return services_;
 
     ExternalServiceList ret;
-    for (auto const &s : qAsConst(services_)) {
+    for (auto const &s : std::as_const(services_)) {
         if (types.contains(s->type))
             ret += s;
     }
diff --git a/src/xmpp/xmpp-im/xmpp_hash.cpp b/src/xmpp/xmpp-im/xmpp_hash.cpp
index b44f2ef0..1d5ab458 100644
--- a/src/xmpp/xmpp-im/xmpp_hash.cpp
+++ b/src/xmpp/xmpp-im/xmpp_hash.cpp
@@ -111,7 +111,7 @@ HashVariant findHasher(Hash::Type hashType)
 Hash::Hash(const QDomElement &el)
 {
     QString algo = el.attribute(QLatin1String("algo"));
-    v_type       = parseType(QStringRef(&algo));
+    v_type       = parseType(QStringView{algo});
     if (v_type != Unknown && el.tagName() == QLatin1String("hash")) {
         v_data = QByteArray::fromBase64(el.text().toLatin1());
         if (v_data.isEmpty()) {
@@ -128,7 +128,7 @@ QString Hash::stringType() const
     return QLatin1String(hashTypes[int(v_type)].text);
 }
 
-Hash::Type Hash::parseType(const QStringRef &algo)
+Hash::Type Hash::parseType(const QStringView &algo)
 {
     if (!algo.isEmpty()) {
         for (auto const &hash : hashTypes) {
@@ -251,7 +251,7 @@ Hash Hash::from(Hash::Type t, const QFileInfo &file)
     return Hash();
 }
 
-Hash Hash::from(const QStringRef &str)
+Hash Hash::from(const QStringView &str)
 {
     auto ind = str.indexOf('+');
     if (ind <= 0)
diff --git a/src/xmpp/xmpp-im/xmpp_hash.h b/src/xmpp/xmpp-im/xmpp_hash.h
index 50fc4da4..2c7d5de1 100644
--- a/src/xmpp/xmpp-im/xmpp_hash.h
+++ b/src/xmpp/xmpp-im/xmpp_hash.h
@@ -51,7 +51,7 @@ class Hash {
 
     inline Hash(Type type = Type::Unknown) : v_type(type) { }
     inline Hash(Type type, const QByteArray &data) : v_type(type), v_data(data) { }
-    inline Hash(const QStringRef &algo) : v_type(parseType(algo)) { }
+    inline Hash(const QStringView &algo) : v_type(parseType(algo)) { }
     Hash(const QDomElement &);
 
     inline bool operator==(const Hash &other) const { return v_type == other.v_type && v_data == other.v_data; }
@@ -62,7 +62,7 @@ class Hash {
     inline Type type() const { return v_type; }
     inline void setType(Type t) { v_type = t; }
     QString     stringType() const;
-    static Type parseType(const QStringRef &algo);
+    static Type parseType(const QStringView &algo);
 
     inline QByteArray data() const { return v_data; }
     inline void       setData(const QByteArray &d) { v_data = d; } // sets already computed hash
@@ -77,7 +77,7 @@ class Hash {
     static Hash from(Type t, const QByteArray &fileData);
     static Hash from(XMPP::Hash::Type t, QIODevice *dev);
     static Hash from(XMPP::Hash::Type t, const QFileInfo &file);
-    static Hash from(const QStringRef &str); // e.g. sha1+aabccddeeffaabbcc232387539465923645
+    static Hash from(const QStringView &str); // e.g. sha1+aabccddeeffaabbcc232387539465923645
     static Hash fastestHash(const Features &features);
 
 private:
diff --git a/src/xmpp/xmpp-im/xmpp_ibb.cpp b/src/xmpp/xmpp-im/xmpp_ibb.cpp
index a2e921b7..85745506 100644
--- a/src/xmpp/xmpp-im/xmpp_ibb.cpp
+++ b/src/xmpp/xmpp-im/xmpp_ibb.cpp
@@ -413,7 +413,7 @@ void IBBManager::unlink(IBBConnection *c) { d->activeConns.removeAll(c); }
 
 IBBConnection *IBBManager::findConnection(const QString &sid, const Jid &peer) const
 {
-    for (IBBConnection *c : qAsConst(d->activeConns)) {
+    for (IBBConnection *c : std::as_const(d->activeConns)) {
         if (c->sid() == sid && (peer.isEmpty() || c->peer().compare(peer)))
             return c;
     }
diff --git a/src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp b/src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp
index acc0e86d..5db2e3af 100644
--- a/src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp
+++ b/src/xmpp/xmpp-im/xmpp_serverinfomanager.cpp
@@ -112,8 +112,8 @@ void ServerInfoManager::checkPendingServiceQueries()
             QMapIterator<QString, ServiceInfo> si(_servicesInfo);
             while (si.hasNext()) {
                 si.next();
-                if (!sqIt->nameHint.isEmpty()) {
-                    if (sqIt->nameHint.isEmpty() || sqIt->nameHint.exactMatch(si.key())) {
+                if (sqIt->nameHint.isValid()) {
+                    if (!sqIt->nameHint.isValid() || sqIt->nameHint.match(si.key()).hasMatch()) {
                         sqIt->servicesToQuery.push_back(si.key());
                     } else if (sqIt->options & SQ_CheckAllOnNoMatch) {
                         sqIt->spareServicesToQuery.push_back(si.key());
@@ -230,7 +230,7 @@ void ServerInfoManager::appendQuery(const ServiceQuery &q)
 }
 
 void ServerInfoManager::queryServiceInfo(const QString &category, const QString &type,
-                                         const QList<QSet<QString>> &features, const QRegExp &nameHint,
+                                         const QList<QSet<QString>> &features, const QRegularExpression &nameHint,
                                          SQOptions options, std::function<void(const QList<DiscoItem> &items)> callback)
 {
     appendQuery(ServiceQuery(type, category, features, nameHint, options, std::move(callback)));
diff --git a/src/xmpp/xmpp-im/xmpp_serverinfomanager.h b/src/xmpp/xmpp-im/xmpp_serverinfomanager.h
index 7a0261f3..93a0518d 100644
--- a/src/xmpp/xmpp-im/xmpp_serverinfomanager.h
+++ b/src/xmpp/xmpp-im/xmpp_serverinfomanager.h
@@ -20,14 +20,15 @@
 #ifndef SERVERINFOMANAGER_H
 #define SERVERINFOMANAGER_H
 
-#include "xmpp_caps.h"
 #include "xmpp_discoitem.h"
+#include "xmpp_status.h"
 
 #include <QObject>
 #include <QString>
 #include <QVariant>
-#include <functional>
+#include <QRegularExpression>
 
+#include <functional>
 #include <list>
 
 namespace XMPP {
@@ -50,7 +51,7 @@ class ServerInfoManager : public QObject {
         const QString                                           type;
         const QString                                           category;
         const QList<QSet<QString>>                              features;
-        const QRegExp                                           nameHint;
+        const QRegularExpression                                nameHint;
         const SQOptions                                         options;
         const std::function<void(const QList<DiscoItem> &item)> callback;
         std::list<QString>                                      servicesToQuery;
@@ -59,7 +60,7 @@ class ServerInfoManager : public QObject {
         QList<DiscoItem>   result;
 
         ServiceQuery(const QString &type, const QString &category, const QList<QSet<QString>> &features,
-                     const QRegExp &nameHint, const SQOptions &options,
+                     const QRegularExpression &nameHint, const SQOptions &options,
                      const std::function<void(const QList<DiscoItem> &item)> &&callback) :
             type(type),
             category(category), features(features), nameHint(nameHint), options(options), callback(callback)
@@ -102,7 +103,7 @@ class ServerInfoManager : public QObject {
      Result: disco info for upload.jabber.ru will be returned.
     */
     void     queryServiceInfo(const QString &category, const QString &type, const QList<QSet<QString>> &features,
-                              const QRegExp &nameHint, SQOptions options,
+                              const QRegularExpression &nameHint, SQOptions options,
                               std::function<void(const QList<DiscoItem> &items)> callback);
     void     setServiceMeta(const Jid &service, const QString &key, const QVariant &value);
     QVariant serviceMeta(const Jid &service, const QString &key);
diff --git a/src/xmpp/xmpp-im/xmpp_tasks.cpp b/src/xmpp/xmpp-im/xmpp_tasks.cpp
index 0b6a0ce3..5afef0f3 100644
--- a/src/xmpp/xmpp-im/xmpp_tasks.cpp
+++ b/src/xmpp/xmpp-im/xmpp_tasks.cpp
@@ -29,16 +29,19 @@
 #include "xmpp_xmlcommon.h"
 
 #include <QList>
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QTimer>
 
 using namespace XMPP;
 
 static QString lineEncode(QString str)
 {
-    str.replace(QRegExp("\\\\"), "\\\\"); // backslash to double-backslash
-    str.replace(QRegExp("\\|"), "\\p");   // pipe to \p
-    str.replace(QRegExp("\n"), "\\n");    // newline to \n
+    static QRegularExpression backslash("\\\\");
+    static QRegularExpression pipe("\\|");
+    static QRegularExpression newline("\n");
+    str.replace(backslash, "\\\\"); // backslash to double-backslash
+    str.replace(pipe, "\\p");       // pipe to \p
+    str.replace(newline, "\\n");    // newline to \n
     return str;
 }
 
@@ -430,7 +433,7 @@ void JT_Roster::onGo()
         iq                = createIQ(doc(), "set", to.full(), id());
         QDomElement query = doc()->createElementNS("jabber:iq:roster", "query");
         iq.appendChild(query);
-        for (const QDomElement &it : qAsConst(d->itemList))
+        for (const QDomElement &it : std::as_const(d->itemList))
             query.appendChild(it);
         send(iq);
     } else if (type == GetDelimiter) {
@@ -451,7 +454,7 @@ QString JT_Roster::toString() const
 
     QDomElement i = doc()->createElement("request");
     i.setAttribute("type", "JT_Roster");
-    for (const QDomElement &it : qAsConst(d->itemList))
+    for (const QDomElement &it : std::as_const(d->itemList))
         i.appendChild(it);
     return lineEncode(Stream::xmlToString(i));
 }
diff --git a/src/xmpp/xmpp-im/xmpp_vcard.cpp b/src/xmpp/xmpp-im/xmpp_vcard.cpp
index c72c06c8..be1c0647 100644
--- a/src/xmpp/xmpp-im/xmpp_vcard.cpp
+++ b/src/xmpp/xmpp-im/xmpp_vcard.cpp
@@ -215,7 +215,7 @@ QDomElement VCard::toXml(QDomDocument *doc) const
         v.appendChild(textTag(doc, "BDAY", d->bday));
 
     if (!d->addressList.isEmpty()) {
-        for (const auto &a : qAsConst(d->addressList)) {
+        for (const auto &a : std::as_const(d->addressList)) {
             QDomElement w = doc->createElement("ADR");
 
             if (a.home)
@@ -253,7 +253,7 @@ QDomElement VCard::toXml(QDomDocument *doc) const
     }
 
     if (!d->labelList.isEmpty()) {
-        for (const auto &l : qAsConst(d->labelList)) {
+        for (const auto &l : std::as_const(d->labelList)) {
             QDomElement w = doc->createElement("LABEL");
 
             if (l.home)
@@ -272,7 +272,7 @@ QDomElement VCard::toXml(QDomDocument *doc) const
                 w.appendChild(emptyTag(doc, "PREF"));
 
             if (!l.lines.isEmpty()) {
-                for (const auto &it : qAsConst(l.lines))
+                for (const auto &it : std::as_const(l.lines))
                     w.appendChild(textTag(doc, "LINE", it));
             }
 
@@ -281,7 +281,7 @@ QDomElement VCard::toXml(QDomDocument *doc) const
     }
 
     if (!d->phoneList.isEmpty()) {
-        for (const auto &p : qAsConst(d->phoneList)) {
+        for (const auto &p : std::as_const(d->phoneList)) {
             QDomElement w = doc->createElement("TEL");
 
             if (p.home)
@@ -319,7 +319,7 @@ QDomElement VCard::toXml(QDomDocument *doc) const
     }
 
     if (!d->emailList.isEmpty()) {
-        for (const auto &e : qAsConst(d->emailList)) {
+        for (const auto &e : std::as_const(d->emailList)) {
             QDomElement w = doc->createElement("EMAIL");
 
             if (e.pref)
@@ -393,7 +393,7 @@ QDomElement VCard::toXml(QDomDocument *doc) const
             w.appendChild(textTag(doc, "ORGNAME", d->org.name));
 
         if (!d->org.unit.isEmpty()) {
-            for (const auto &unit : qAsConst(d->org.unit))
+            for (const auto &unit : std::as_const(d->org.unit))
                 w.appendChild(textTag(doc, "ORGUNIT", unit));
         }
 
@@ -403,7 +403,7 @@ QDomElement VCard::toXml(QDomDocument *doc) const
     if (!d->categories.isEmpty()) {
         QDomElement w = doc->createElement("CATEGORIES");
 
-        for (const auto &c : qAsConst(d->categories))
+        for (const auto &c : std::as_const(d->categories))
             w.appendChild(textTag(doc, "KEYWORD", c));
 
         v.appendChild(w);
@@ -495,8 +495,9 @@ VCard VCard::fromXml(const QDomElement &q)
         } else if (tag == "NICKNAME")
             v.d->nickName = i.text().trimmed();
         else if (tag == "PHOTO") {
+            static QRegularExpression newlines("[\r\n]+");
             v.d->photo
-                = QCA::Base64().stringToArray(subTagText(i, "BINVAL").replace(QRegExp("[\r\n]+"), "")).toByteArray();
+                = QCA::Base64().stringToArray(subTagText(i, "BINVAL").replace(newlines, "")).toByteArray();
             v.d->photoURI = subTagText(i, "EXTVAL");
         } else if (tag == "BDAY")
             v.d->bday = i.text().trimmed();
diff --git a/src/xmpp/xmpp-im/xmpp_xdata.cpp b/src/xmpp/xmpp-im/xmpp_xdata.cpp
index 3ea65498..572d4e47 100644
--- a/src/xmpp/xmpp-im/xmpp_xdata.cpp
+++ b/src/xmpp/xmpp-im/xmpp_xdata.cpp
@@ -24,6 +24,7 @@
 
 #include <QList>
 #include <QSharedDataPointer>
+#include <QRegularExpression>
 
 using namespace XMLHelper;
 using namespace XMPP;
@@ -299,9 +300,13 @@ QSize XData::Field::MediaElement::mediaSize() const { return _size; }
 
 bool XData::Field::MediaElement::checkSupport(const QStringList &wildcards)
 {
-    for (const XData::Field::MediaUri &uri : qAsConst(*this)) {
+    for (const XData::Field::MediaUri &uri : std::as_const(*this)) {
         for (const QString &wildcard : wildcards) {
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
             if (QRegExp(wildcard, Qt::CaseSensitive, QRegExp::Wildcard).exactMatch(uri.mimeType)) {
+#else
+            if (QRegularExpression::fromWildcard(QLatin1Char('^') + wildcard + QLatin1Char('$'), Qt::CaseSensitive).match(uri.mimeType).hasMatch()) {
+#endif
                 return true;
             }
         }
@@ -450,7 +455,7 @@ QDomElement XData::toXml(QDomDocument *doc, bool submitForm) const
         x.appendChild(textTag(doc, "instructions", d->instructions));
 
     if (!d->fields.isEmpty()) {
-        for (const auto &f : qAsConst(d->fields)) {
+        for (const auto &f : std::as_const(d->fields)) {
             if (!(submitForm && f.var().isEmpty()))
                 x.appendChild(f.toXml(doc, submitForm));
         }
diff --git a/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp b/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
index 62d79817..2a7e6f88 100644
--- a/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
+++ b/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
@@ -66,13 +66,13 @@ QDateTime stamp2TS(const QString &ts)
     if (ts.length() != 17)
         return QDateTime();
 
-    int year  = ts.midRef(0, 4).toInt();
-    int month = ts.midRef(4, 2).toInt();
-    int day   = ts.midRef(6, 2).toInt();
+    int year  = QStringView{ts}.mid(0, 4).toInt();
+    int month = QStringView{ts}.mid(4, 2).toInt();
+    int day   = QStringView{ts}.mid(6, 2).toInt();
 
-    int hour = ts.midRef(9, 2).toInt();
-    int min  = ts.midRef(12, 2).toInt();
-    int sec  = ts.midRef(15, 2).toInt();
+    int hour = QStringView{ts}.mid(9, 2).toInt();
+    int min  = QStringView{ts}.mid(12, 2).toInt();
+    int sec  = QStringView{ts}.mid(15, 2).toInt();
 
     QDate xd;
     xd.setDate(year, month, day);
diff --git a/src/xmpp/xmpp-im/xmpp_xmlcommon.h b/src/xmpp/xmpp-im/xmpp_xmlcommon.h
index e1a43805..7eb4f7db 100644
--- a/src/xmpp/xmpp-im/xmpp_xmlcommon.h
+++ b/src/xmpp/xmpp-im/xmpp_xmlcommon.h
@@ -20,14 +20,13 @@
 #ifndef XMPP_XMLCOMMON_H
 #define XMPP_XMLCOMMON_H
 
-#include <qdom.h>
-#include <qlist.h>
+#include <QDomNode>
+#include <QList>
 
 class QColor;
 class QDateTime;
 class QRect;
 class QSize;
-class QStringList;
 
 class XDomNodeList {
 public:
diff --git a/tools/icetunnel/main.cpp b/tools/icetunnel/main.cpp
index 45e990d4..98c686ca 100644
--- a/tools/icetunnel/main.cpp
+++ b/tools/icetunnel/main.cpp
@@ -292,7 +292,7 @@ static IceOffer iceblock_parse(const QStringList &in)
 
     body = lines.value(QLatin1String("dtls")).split(';');
     for (auto const &b : body) {
-        out.dtlsFingerprint += XMPP::Hash::from(QStringRef(&b));
+        out.dtlsFingerprint += XMPP::Hash::from(b);
     }
 
     return out;

From f29160247b896e2d7272aff0b46f3202a43cd80c Mon Sep 17 00:00:00 2001
From: Sergei Ilinykh <sergei.ilinykh@castlabs.com>
Date: Thu, 14 Mar 2024 16:23:00 +0300
Subject: [PATCH 366/383] minor build message fix

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf032eed..1d826864 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,7 +83,7 @@ if(QT_DEFAULT_MAJOR_VERSION LESS 6)
 else()
     find_package(Qt6 REQUIRED COMPONENTS Core Gui Xml Network)
 endif()
-message(STATUS "Qt${QT_DEFAULT_MAJOR_VERSION} found, version ${Qt6Core_VERSION}")
+message(STATUS "Qt${QT_DEFAULT_MAJOR_VERSION} found, version ${Qt${QT_DEFAULT_MAJOR_VERSION}Core_VERSION}")
 
 # Find QCA package or use bundled if enabled
 include(IrisQCA)

From 0438b1318878d7f376a7ecaac6482131e1b051b6 Mon Sep 17 00:00:00 2001
From: Sergei Ilinykh <rion4ik@gmail.com>
Date: Thu, 14 Mar 2024 17:28:02 +0300
Subject: [PATCH 367/383] reformat code

---
 .pre-commit-config.yaml                       |  2 +-
 TODO                                          |  1 -
 cmake/modules/FindQJDns.cmake                 |  6 +-
 cmake/modules/policyRules.cmake               |  1 -
 conf_win.pri.example                          |  6 +-
 confapp_win.pri.example                       |  6 +-
 qcm/extra.qcm                                 |  2 +-
 qcm/universal.qcm                             |  2 +-
 src/irisnet/appledns/appledns.cpp             | 14 ++---
 src/irisnet/appledns/qdnssd.cpp               | 16 ++---
 src/irisnet/appledns/sdtest.cpp               |  2 +-
 src/irisnet/corelib/addressresolver.cpp       |  4 +-
 src/irisnet/corelib/irisnetglobal.cpp         |  2 +-
 src/irisnet/corelib/netinterface.cpp          |  8 +--
 src/irisnet/corelib/netinterface_unix.cpp     |  4 +-
 src/irisnet/corelib/netnames.cpp              |  9 ++-
 src/irisnet/corelib/netnames_jdns.cpp         | 30 +++++-----
 src/irisnet/corelib/objectsession.cpp         |  4 +-
 src/irisnet/noncore/cutestuff/bsocket.cpp     |  2 +-
 src/irisnet/noncore/cutestuff/httpconnect.cpp |  4 +-
 src/irisnet/noncore/cutestuff/httppoll.cpp    | 10 ++--
 src/irisnet/noncore/cutestuff/socks.cpp       | 12 ++--
 src/irisnet/noncore/dtls.cpp                  |  6 +-
 src/irisnet/noncore/ice176.cpp                | 12 ++--
 src/irisnet/noncore/iceagent.h                |  2 +-
 src/irisnet/noncore/icecomponent.cpp          |  8 +--
 src/irisnet/noncore/icelocaltransport.cpp     | 12 ++--
 src/irisnet/noncore/sctp/DepUsrSCTP.cpp       |  6 +-
 src/irisnet/noncore/sctp/DepUsrSCTP.hpp       |  8 +--
 src/irisnet/noncore/sctp/SctpAssociation.cpp  |  7 +--
 src/irisnet/noncore/sctp/SctpAssociation.hpp  |  4 +-
 src/irisnet/noncore/stunallocate.cpp          | 14 ++---
 src/irisnet/noncore/stunbinding.cpp           |  2 +-
 src/irisnet/noncore/stunmessage.cpp           |  2 +-
 src/irisnet/noncore/stunmessage.h             |  4 +-
 src/irisnet/noncore/stuntransaction.cpp       |  2 +-
 src/irisnet/noncore/tcpportreserver.h         |  6 +-
 src/irisnet/noncore/turnclient.cpp            |  8 +--
 src/irisnet/noncore/udpportreserver.cpp       |  2 +-
 src/jdns.cmake                                |  2 +-
 src/xmpp/base/timezone.cpp                    | 12 +---
 src/xmpp/blake2/blake2-impl.h                 |  2 +-
 src/xmpp/blake2/blake2b-ref.c                 |  2 +-
 src/xmpp/blake2/blake2s-ref.c                 |  2 +-
 src/xmpp/jid/jid.h                            |  2 +-
 src/xmpp/qa/README                            |  6 +-
 src/xmpp/sasl/digestmd5response.cpp           |  3 +-
 src/xmpp/sasl/scramsha1message.cpp            |  3 +-
 src/xmpp/sasl/scramsha1response.cpp           |  6 +-
 src/xmpp/sasl/scramsha1signature.cpp          |  8 +--
 .../sasl/unittest/digestmd5responsetest.cpp   | 22 +++----
 src/xmpp/xmpp-core/compressionhandler.h       |  2 +-
 src/xmpp/xmpp-core/connector.cpp              |  4 +-
 src/xmpp/xmpp-core/parser.cpp                 |  2 +-
 src/xmpp/xmpp-core/parser.h                   |  8 +--
 src/xmpp/xmpp-core/protocol.cpp               |  4 +-
 src/xmpp/xmpp-core/securestream.cpp           |  8 +--
 src/xmpp/xmpp-core/sm.h                       |  4 +-
 src/xmpp/xmpp-core/stream.cpp                 | 13 ++---
 src/xmpp/xmpp-core/tlshandler.cpp             |  4 +-
 src/xmpp/xmpp-core/xmpp_stanza.cpp            |  2 +-
 src/xmpp/xmpp-im/client.cpp                   | 36 ++++++------
 src/xmpp/xmpp-im/filetransfer.cpp             |  8 +--
 src/xmpp/xmpp-im/filetransfer.h               |  2 +-
 src/xmpp/xmpp-im/httpfileupload.cpp           |  9 ++-
 src/xmpp/xmpp-im/im.h                         |  2 +-
 src/xmpp/xmpp-im/jingle-application.cpp       |  3 +-
 src/xmpp/xmpp-im/jingle-application.h         |  2 +-
 src/xmpp/xmpp-im/jingle-connection.h          |  4 +-
 src/xmpp/xmpp-im/jingle-file.h                |  4 +-
 src/xmpp/xmpp-im/jingle-ft.cpp                |  3 +-
 src/xmpp/xmpp-im/jingle-ft.h                  |  2 +-
 src/xmpp/xmpp-im/jingle-ibb.cpp               |  8 +--
 src/xmpp/xmpp-im/jingle-ibb.h                 |  4 +-
 src/xmpp/xmpp-im/jingle-ice.cpp               |  6 +-
 src/xmpp/xmpp-im/jingle-ice.h                 | 10 ++--
 src/xmpp/xmpp-im/jingle-nstransportslist.h    |  2 +-
 src/xmpp/xmpp-im/jingle-s5b.cpp               | 11 ++--
 src/xmpp/xmpp-im/jingle-s5b.h                 | 14 ++---
 src/xmpp/xmpp-im/jingle-sctp-association_p.h  |  2 +-
 src/xmpp/xmpp-im/jingle-session.cpp           |  6 +-
 src/xmpp/xmpp-im/jingle-session.h             |  2 +-
 src/xmpp/xmpp-im/jingle-transport.h           |  2 +-
 .../xmpp-im/jingle-webrtc-datachannel_p.cpp   |  9 ++-
 .../xmpp-im/jingle-webrtc-datachannel_p.h     |  2 +-
 src/xmpp/xmpp-im/jingle.cpp                   |  6 +-
 src/xmpp/xmpp-im/jingle.h                     | 23 ++++----
 src/xmpp/xmpp-im/s5b.cpp                      | 58 +++++++++----------
 src/xmpp/xmpp-im/s5b.h                        | 22 +++----
 src/xmpp/xmpp-im/stundisco.cpp                |  2 +-
 src/xmpp/xmpp-im/stundisco.h                  |  2 +-
 src/xmpp/xmpp-im/types.cpp                    |  9 ++-
 src/xmpp/xmpp-im/xmpp_address.h               |  4 +-
 src/xmpp/xmpp-im/xmpp_agentitem.h             |  8 +--
 src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp        |  2 +-
 src/xmpp/xmpp-im/xmpp_bitsofbinary.h          |  4 +-
 src/xmpp/xmpp-im/xmpp_caps.cpp                |  2 +-
 src/xmpp/xmpp-im/xmpp_caps.h                  |  6 +-
 src/xmpp/xmpp-im/xmpp_captcha.h               |  6 +-
 src/xmpp/xmpp-im/xmpp_client.h                | 34 +++++------
 src/xmpp/xmpp-im/xmpp_discoinfotask.h         |  4 +-
 src/xmpp/xmpp-im/xmpp_discoitem.h             |  8 +--
 src/xmpp/xmpp-im/xmpp_encryption.h            |  1 -
 .../xmpp-im/xmpp_externalservicediscovery.h   |  4 +-
 src/xmpp/xmpp-im/xmpp_features.cpp            |  2 +-
 src/xmpp/xmpp-im/xmpp_features.h              |  4 +-
 src/xmpp/xmpp-im/xmpp_form.h                  |  2 +-
 src/xmpp/xmpp-im/xmpp_hash.cpp                |  2 +-
 src/xmpp/xmpp-im/xmpp_ibb.cpp                 |  6 +-
 src/xmpp/xmpp-im/xmpp_ibb.h                   |  6 +-
 src/xmpp/xmpp-im/xmpp_liverosteritem.h        |  4 +-
 src/xmpp/xmpp-im/xmpp_message.h               |  2 +-
 src/xmpp/xmpp-im/xmpp_muc.h                   | 14 ++---
 src/xmpp/xmpp-im/xmpp_pubsubitem.h            |  2 +-
 src/xmpp/xmpp-im/xmpp_resource.h              |  2 +-
 src/xmpp/xmpp-im/xmpp_rosteritem.h            |  8 +--
 src/xmpp/xmpp-im/xmpp_rosterx.h               |  4 +-
 src/xmpp/xmpp-im/xmpp_serverinfomanager.h     | 11 ++--
 src/xmpp/xmpp-im/xmpp_status.h                | 16 ++---
 src/xmpp/xmpp-im/xmpp_task.cpp                |  2 +-
 src/xmpp/xmpp-im/xmpp_task.h                  |  6 +-
 src/xmpp/xmpp-im/xmpp_tasks.h                 |  8 +--
 src/xmpp/xmpp-im/xmpp_thumbs.h                |  4 +-
 src/xmpp/xmpp-im/xmpp_vcard.cpp               |  3 +-
 src/xmpp/xmpp-im/xmpp_vcard.h                 |  8 +--
 src/xmpp/xmpp-im/xmpp_xdata.cpp               |  6 +-
 src/xmpp/xmpp-im/xmpp_xdata.h                 |  4 +-
 src/xmpp/xmpp-im/xmpp_xmlcommon.cpp           | 12 ++--
 src/xmpp/zlib/zlibcompressor.h                |  2 +-
 src/xmpp/zlib/zlibdecompressor.h              |  2 +-
 tools/icetunnel/main.cpp                      |  8 +--
 tools/nettool/main.cpp                        | 14 ++---
 tools/xmpptest/xmpptest.cpp                   |  6 +-
 133 files changed, 437 insertions(+), 464 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index b454d589..57837bde 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,7 +1,7 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
 
-exclude: '^3rdparty'
+exclude: '^3rdparty|COPYING.*|src/jdns'
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v2.5.0
diff --git a/TODO b/TODO
index 49de0c4d..6d522fd9 100644
--- a/TODO
+++ b/TODO
@@ -43,4 +43,3 @@ questions:
 goal:
   support xmpp-core for tcp/httpbind
   xmpp-core should be "just another protocol"
-
diff --git a/cmake/modules/FindQJDns.cmake b/cmake/modules/FindQJDns.cmake
index 77568649..941e9ece 100644
--- a/cmake/modules/FindQJDns.cmake
+++ b/cmake/modules/FindQJDns.cmake
@@ -36,13 +36,13 @@ endif ()
 if ( UNIX AND NOT( APPLE OR CYGWIN ) )
     find_package( PkgConfig QUIET )
     pkg_check_modules( PC_QJDns QUIET jdns )
-    set ( QJDns_DEFINITIONS 
+    set ( QJDns_DEFINITIONS
         ${PC_QJDns_CFLAGS}
         ${PC_QJDns_CFLAGS_OTHER}
     )
 endif ( UNIX AND NOT( APPLE OR CYGWIN ) )
 
-set ( LIBINCS 
+set ( LIBINCS
     qjdns.h
 )
 
@@ -69,7 +69,7 @@ set(QJDns_NAMES
 find_library(
     QJDns_LIBRARY
     NAMES ${QJDns_NAMES}
-    HINTS 
+    HINTS
     ${PC_QJDns_LIBDIR}
     ${PC_QJDns_LIBRARY_DIRS}
     ${QJDNS_DIR}/lib
diff --git a/cmake/modules/policyRules.cmake b/cmake/modules/policyRules.cmake
index df9d386c..081ab755 100644
--- a/cmake/modules/policyRules.cmake
+++ b/cmake/modules/policyRules.cmake
@@ -11,4 +11,3 @@ if(NOT POLICY_SET)
     endif()
     set(POLICY_SET ON)
 endif()
-
diff --git a/conf_win.pri.example b/conf_win.pri.example
index e80c1b35..c8ad428b 100644
--- a/conf_win.pri.example
+++ b/conf_win.pri.example
@@ -9,9 +9,9 @@ LIBS += -L$$WINLOCAL_PREFIX/lib
 
 # zlib may have a different lib name depending on how it was compiled
 win32-g++ {
-	LIBS += -lz
+    LIBS += -lz
 }
 else {
-	LIBS += -lzlib   # static
-	#LIBS += -lzdll  # dll
+    LIBS += -lzlib   # static
+    #LIBS += -lzdll  # dll
 }
diff --git a/confapp_win.pri.example b/confapp_win.pri.example
index e80c1b35..c8ad428b 100644
--- a/confapp_win.pri.example
+++ b/confapp_win.pri.example
@@ -9,9 +9,9 @@ LIBS += -L$$WINLOCAL_PREFIX/lib
 
 # zlib may have a different lib name depending on how it was compiled
 win32-g++ {
-	LIBS += -lz
+    LIBS += -lz
 }
 else {
-	LIBS += -lzlib   # static
-	#LIBS += -lzdll  # dll
+    LIBS += -lzlib   # static
+    #LIBS += -lzdll  # dll
 }
diff --git a/qcm/extra.qcm b/qcm/extra.qcm
index 0ad08253..bf73ff86 100644
--- a/qcm/extra.qcm
+++ b/qcm/extra.qcm
@@ -58,7 +58,7 @@ public:
         }
         if (universal) {
             str += "contains(QT_CONFIG,x86):contains(QT_CONFIG,ppc) {\n"
-                   "	CONFIG += x86 ppc\n"
+                   "    CONFIG += x86 ppc\n"
                    "}\n";
 
             if (!sdk.isEmpty())
diff --git a/qcm/universal.qcm b/qcm/universal.qcm
index 5a97c987..dcfa9b62 100644
--- a/qcm/universal.qcm
+++ b/qcm/universal.qcm
@@ -28,7 +28,7 @@ public:
             qc_universal_enabled = true;
 
             QString str = "contains(QT_CONFIG,x86):contains(QT_CONFIG,ppc) {\n"
-                          "	CONFIG += x86 ppc\n"
+                          "    CONFIG += x86 ppc\n"
                           "}\n";
 
             QString sdk = qc_getenv("QC_MAC_SDK");
diff --git a/src/irisnet/appledns/appledns.cpp b/src/irisnet/appledns/appledns.cpp
index a84af2dd..80c3cbc0 100644
--- a/src/irisnet/appledns/appledns.cpp
+++ b/src/irisnet/appledns/appledns.cpp
@@ -223,8 +223,8 @@ class AppleProvider : public XMPP::IrisNetProvider {
         connect(&dns, SIGNAL(regResult(int, QDnsSd::RegResult)), SLOT(dns_regResult(int, QDnsSd::RegResult)));
     }
 
-    virtual XMPP::NameProvider *   createNameProviderInternet();
-    virtual XMPP::NameProvider *   createNameProviderLocal();
+    virtual XMPP::NameProvider    *createNameProviderInternet();
+    virtual XMPP::NameProvider    *createNameProviderLocal();
     virtual XMPP::ServiceProvider *createServiceProvider();
 
     int query(QDnsSdDelegate *p, const QByteArray &name, int qType)
@@ -300,7 +300,7 @@ private slots:
 class AppleBrowse : public QObject, public QDnsSdDelegate {
     Q_OBJECT
 public:
-    AppleProvider *              global;
+    AppleProvider               *global;
     int                          browse_id;
     QList<XMPP::ServiceInstance> instances;
     QHash<int, QByteArray>       pendingByQueryId; // waiting for TXT
@@ -421,7 +421,7 @@ class AppleBrowse : public QObject, public QDnsSdDelegate {
 class AppleBrowseLookup : public QObject, public QDnsSdDelegate {
     Q_OBJECT
 public:
-    AppleProvider *    global;
+    AppleProvider     *global;
     int                resolve_id;
     XMPP::NameResolver nameResolverAaaa;
     XMPP::NameResolver nameResolverA;
@@ -614,7 +614,7 @@ class AppleServiceProvider : public XMPP::ServiceProvider, public QDnsSdDelegate
     public:
         AppleServiceProvider *parent;
         int                   id;
-        AppleBrowse *         browse;
+        AppleBrowse          *browse;
 
         Browse(AppleServiceProvider *_parent) : parent(_parent), id(-1), browse(0) { }
 
@@ -629,7 +629,7 @@ class AppleServiceProvider : public XMPP::ServiceProvider, public QDnsSdDelegate
     public:
         AppleServiceProvider *parent;
         int                   id;
-        AppleBrowseLookup *   resolve;
+        AppleBrowseLookup    *resolve;
 
         Resolve(AppleServiceProvider *_parent) : parent(_parent), id(-1), resolve(0) { }
 
@@ -640,7 +640,7 @@ class AppleServiceProvider : public XMPP::ServiceProvider, public QDnsSdDelegate
         }
     };
 
-    AppleProvider *  global;
+    AppleProvider   *global;
     QList<Browse *>  browseList;
     QList<Resolve *> resolveList;
     IdManager        idManager;
diff --git a/src/irisnet/appledns/qdnssd.cpp b/src/irisnet/appledns/qdnssd.cpp
index 7c2816e8..abbb4e28 100644
--- a/src/irisnet/appledns/qdnssd.cpp
+++ b/src/irisnet/appledns/qdnssd.cpp
@@ -176,12 +176,12 @@ class IdManager {
 class QDnsSd::Private : public QObject {
     Q_OBJECT
 public:
-    QDnsSd *  q;
+    QDnsSd   *q;
     IdManager idManager;
 
     class SubRecord {
     public:
-        Private *  _self;
+        Private   *_self;
         int        _id;
         RecordRef *_sdref;
 
@@ -198,13 +198,13 @@ class QDnsSd::Private : public QObject {
     public:
         enum Type { Query, Browse, Resolve, Reg };
 
-        Private *           _self;
+        Private            *_self;
         int                 _type;
         int                 _id;
-        ServiceRef *        _sdref;
+        ServiceRef         *_sdref;
         int                 _sockfd;
         SafeSocketNotifier *_sn_read;
-        SafeTimer *         _errorTrigger;
+        SafeTimer          *_errorTrigger;
 
         bool                       _doSignal;
         LowLevelError              _lowLevelError;
@@ -522,7 +522,7 @@ private slots:
     void sn_activated()
     {
         SafeSocketNotifier *sn_read = static_cast<SafeSocketNotifier *>(sender());
-        Request *           req     = _requestsBySocket.value(sn_read);
+        Request            *req     = _requestsBySocket.value(sn_read);
         if (!req)
             return;
 
@@ -627,7 +627,7 @@ private slots:
     void doError()
     {
         SafeTimer *t   = static_cast<SafeTimer *>(sender());
-        Request *  req = _requestsByTimer.value(t);
+        Request   *req = _requestsByTimer.value(t);
         if (!req)
             return;
 
@@ -886,7 +886,7 @@ QList<QByteArray> QDnsSd::parseTxtRecord(const QByteArray &txtRecord)
     for (int n = 0; n < count; ++n) {
         QByteArray          keyBuf(256, 0);
         uint8_t             valueLen;
-        const void *        value;
+        const void         *value;
         DNSServiceErrorType err = TXTRecordGetItemAtIndex(txtRecord.size(), txtRecord.data(), n, keyBuf.size(),
                                                           keyBuf.data(), &valueLen, &value);
         if (err != kDNSServiceErr_NoError)
diff --git a/src/irisnet/appledns/sdtest.cpp b/src/irisnet/appledns/sdtest.cpp
index a9363aca..058c49f9 100644
--- a/src/irisnet/appledns/sdtest.cpp
+++ b/src/irisnet/appledns/sdtest.cpp
@@ -105,7 +105,7 @@ class App : public QObject {
     Q_OBJECT
 public:
     QList<Command> commands;
-    QDnsSd *       dns;
+    QDnsSd        *dns;
 
     App()
     {
diff --git a/src/irisnet/corelib/addressresolver.cpp b/src/irisnet/corelib/addressresolver.cpp
index ac4e9d37..98c4e961 100644
--- a/src/irisnet/corelib/addressresolver.cpp
+++ b/src/irisnet/corelib/addressresolver.cpp
@@ -28,7 +28,7 @@ class AddressResolver::Private : public QObject {
 public:
     enum State { AddressWait, AddressFirstCome };
 
-    AddressResolver *   q;
+    AddressResolver    *q;
     ObjectSession       sess;
     State               state;
     NameResolver        req6;
@@ -37,7 +37,7 @@ class AddressResolver::Private : public QObject {
     bool                done4;
     QList<QHostAddress> addrs6;
     QList<QHostAddress> addrs4;
-    QTimer *            opTimer;
+    QTimer             *opTimer;
 
     Private(AddressResolver *_q) : QObject(_q), q(_q), sess(this), req6(this), req4(this)
     {
diff --git a/src/irisnet/corelib/irisnetglobal.cpp b/src/irisnet/corelib/irisnetglobal.cpp
index 433a40df..91ebf346 100644
--- a/src/irisnet/corelib/irisnetglobal.cpp
+++ b/src/irisnet/corelib/irisnetglobal.cpp
@@ -42,7 +42,7 @@ extern IrisNetProvider *irisnet_createAppleProvider();
 class PluginInstance {
 private:
     QPluginLoader *_loader      = nullptr;
-    QObject *      _instance    = nullptr;
+    QObject       *_instance    = nullptr;
     bool           _ownInstance = false;
 
     PluginInstance() { }
diff --git a/src/irisnet/corelib/netinterface.cpp b/src/irisnet/corelib/netinterface.cpp
index 860e6d6b..0ceea7ed 100644
--- a/src/irisnet/corelib/netinterface.cpp
+++ b/src/irisnet/corelib/netinterface.cpp
@@ -88,7 +88,7 @@ private slots:
 
 private:
     // this are all protected by m
-    NetInterfaceProvider *            c;
+    NetInterfaceProvider             *c;
     QMutex                            m;
     QList<NetInterfaceProvider::Info> info;
 };
@@ -172,11 +172,11 @@ class NetTrackerThread : public QThread {
 
 private:
     QWaitCondition startCond;
-    QMutex *       startMutex = nullptr;
+    QMutex        *startMutex = nullptr;
     // these are all protected by global nettracker_mutex.
     int                      refs = 0;
     static NetTrackerThread *self;
-    NetTracker *             nettracker = nullptr;
+    NetTracker              *nettracker = nullptr;
 };
 
 NetTrackerThread *NetTrackerThread::self = nullptr;
@@ -250,7 +250,7 @@ class NetInterfaceManagerPrivate : public QObject {
 
     QList<NetInterfaceProvider::Info> info;
     QList<NetInterface *>             listeners;
-    NetTrackerThread *                tracker;
+    NetTrackerThread                 *tracker;
 
     bool pending;
 
diff --git a/src/irisnet/corelib/netinterface_unix.cpp b/src/irisnet/corelib/netinterface_unix.cpp
index 8f55aa92..7d5b4d99 100644
--- a/src/irisnet/corelib/netinterface_unix.cpp
+++ b/src/irisnet/corelib/netinterface_unix.cpp
@@ -74,7 +74,7 @@ static QHostAddress linux_ipv6_to_qaddr(const QString &in)
     quint8 raw[16];
     for (int n = 0; n < 16; ++n) {
         bool ok;
-        int  x = QStringView{in}.mid(n * 2, 2).toInt(&ok, 16);
+        int  x = QStringView { in }.mid(n * 2, 2).toInt(&ok, 16);
         if (!ok)
             return out;
         raw[n] = (quint8)x;
@@ -92,7 +92,7 @@ static QHostAddress linux_ipv4_to_qaddr(const QString &in)
     unsigned char *rawp = (unsigned char *)&raw;
     for (int n = 0; n < 4; ++n) {
         bool ok;
-        int  x = QStringView{in}.mid(n * 2, 2).toInt(&ok, 16);
+        int  x = QStringView { in }.mid(n * 2, 2).toInt(&ok, 16);
         if (!ok)
             return out;
         rawp[n] = (unsigned char)x;
diff --git a/src/irisnet/corelib/netnames.cpp b/src/irisnet/corelib/netnames.cpp
index dc0bfc67..ed6b23b1 100644
--- a/src/irisnet/corelib/netnames.cpp
+++ b/src/irisnet/corelib/netnames.cpp
@@ -28,7 +28,7 @@
 #endif
 #include <limits>
 
-//#define NETNAMES_DEBUG
+// #define NETNAMES_DEBUG
 #ifdef NETNAMES_DEBUG
 #define NNDEBUG (qDebug() << this << "#" << __FUNCTION__ << ":")
 #endif
@@ -308,8 +308,8 @@ QDebug operator<<(QDebug dbg, XMPP::NameRecord::Type type)
 
 QDebug operator<<(QDebug dbg, const XMPP::NameRecord &record)
 {
-    dbg.nospace() << "XMPP::NameRecord("
-                  << "owner=" << record.owner() << ", ttl=" << record.ttl() << ", type=" << record.type();
+    dbg.nospace() << "XMPP::NameRecord(" << "owner=" << record.owner() << ", ttl=" << record.ttl()
+                  << ", type=" << record.type();
 
     switch (record.type()) {
     case XMPP::NameRecord::A:
@@ -362,8 +362,7 @@ class ServiceInstance::Private : public QSharedData {
 ServiceInstance::ServiceInstance() : d(new Private) { }
 
 ServiceInstance::ServiceInstance(const QString &instance, const QString &type, const QString &domain,
-                                 const QMap<QString, QByteArray> &attribs) :
-    d(new Private)
+                                 const QMap<QString, QByteArray> &attribs) : d(new Private)
 {
     d->instance = instance;
     d->type     = type;
diff --git a/src/irisnet/corelib/netnames_jdns.cpp b/src/irisnet/corelib/netnames_jdns.cpp
index b5ce899a..e1d27cdf 100644
--- a/src/irisnet/corelib/netnames_jdns.cpp
+++ b/src/irisnet/corelib/netnames_jdns.cpp
@@ -21,7 +21,7 @@
 #include "objectsession.h"
 #include "qjdnsshared.h"
 
-//#define JDNS_DEBUG
+// #define JDNS_DEBUG
 
 Q_DECLARE_METATYPE(XMPP::NameRecord)
 // Q_DECLARE_METATYPE(XMPP::NameResolver::Error)
@@ -237,11 +237,11 @@ class JDnsGlobal : public QObject {
 
 public:
     QJDnsSharedDebug      db;
-    QJDnsShared *         uni_net, *uni_local, *mul;
+    QJDnsShared          *uni_net, *uni_local, *mul;
     QHostAddress          mul_addr4, mul_addr6;
     NetInterfaceManager   netman;
     QList<NetInterface *> ifaces;
-    QTimer *              updateTimer;
+    QTimer               *updateTimer;
 
     JDnsGlobal()
     {
@@ -424,7 +424,7 @@ class JDnsNameProvider : public NameProvider {
 public:
     enum Mode { Internet, Local };
 
-    JDnsGlobal *  global;
+    JDnsGlobal   *global;
     Mode          mode;
     IdManager     idman;
     ObjectSession sess;
@@ -637,7 +637,7 @@ private slots:
     void req_resultsReady()
     {
         QJDnsSharedRequest *req = static_cast<QJDnsSharedRequest *>(sender());
-        Item *              i   = getItemByReq(req);
+        Item               *i   = getItemByReq(req);
         Q_ASSERT(i);
 
         int id = i->id;
@@ -834,7 +834,7 @@ class JDnsServiceResolve : public QObject {
     QJDnsSharedRequest req6;   // for AAAA
     bool               haveTxt;
     SrvState           srvState;
-    QTimer *           opTimer;
+    QTimer            *opTimer;
 
     // out
     QList<QByteArray> attribs;
@@ -1344,7 +1344,7 @@ class JDnsPublishExtra : public QObject {
 private:
     friend class JDnsPublish;
 
-    JDnsPublish *      jdnsPub;
+    JDnsPublish       *jdnsPub;
     bool               started;
     QJDnsSharedRequest pub;
     QJDns::Record      rec;
@@ -1369,7 +1369,7 @@ class JDnsPublish : public QObject {
     Q_OBJECT
 
 public:
-    QJDnsShared *      jdns;
+    QJDnsShared       *jdns;
     QJDnsSharedRequest pub_srv;
     QJDnsSharedRequest pub_txt;
     QJDnsSharedRequest pub_ptr;
@@ -1652,7 +1652,7 @@ private slots:
     void pub_extra_ready()
     {
         QJDnsSharedRequest *req   = static_cast<QJDnsSharedRequest *>(sender());
-        JDnsPublishExtra *  extra = 0;
+        JDnsPublishExtra   *extra = 0;
         for (JDnsPublishExtra *e : extraList) {
             if (&e->pub == req) {
                 extra = e;
@@ -1711,7 +1711,7 @@ class BrowseItem {
 public:
     const int         id;
     JDnsBrowse *const browse;
-    ObjectSession *   sess;
+    ObjectSession    *sess;
 
     BrowseItem(int _id, JDnsBrowse *_browse) : id(_id), browse(_browse), sess(0) { }
 
@@ -1760,7 +1760,7 @@ class ResolveItem {
 public:
     const int                 id;
     JDnsServiceResolve *const resolve;
-    ObjectSession *           sess;
+    ObjectSession            *sess;
 
     ResolveItem(int _id, JDnsServiceResolve *_resolve) : id(_id), resolve(_resolve), sess(0) { }
 
@@ -1809,7 +1809,7 @@ class PublishItem {
 public:
     const int          id;
     JDnsPublish *const publish;
-    ObjectSession *    sess;
+    ObjectSession     *sess;
 
     PublishItem(int _id, JDnsPublish *_publish) : id(_id), publish(_publish), sess(0) { }
 
@@ -1860,7 +1860,7 @@ class PublishExtraItem {
 public:
     const int               id;
     JDnsPublishExtra *const publish;
-    ObjectSession *         sess;
+    ObjectSession          *sess;
 
     PublishExtraItem(int _id, JDnsPublishExtra *_publish) : id(_id), publish(_publish), sess(0) { }
 
@@ -2240,7 +2240,7 @@ private slots:
     void jr_finished()
     {
         JDnsServiceResolve *jr = static_cast<JDnsServiceResolve *>(sender());
-        ResolveItem *       i  = resolveItemList.itemByResolve(jr);
+        ResolveItem        *i  = resolveItemList.itemByResolve(jr);
         Q_ASSERT(i);
 
         // parse TXT list into attribute map
@@ -2289,7 +2289,7 @@ private slots:
     void jr_error(QJDnsSharedRequest::Error e)
     {
         JDnsServiceResolve *jr = static_cast<JDnsServiceResolve *>(sender());
-        ResolveItem *       i  = resolveItemList.itemByResolve(jr);
+        ResolveItem        *i  = resolveItemList.itemByResolve(jr);
         Q_ASSERT(i);
 
         ServiceResolver::Error err;
diff --git a/src/irisnet/corelib/objectsession.cpp b/src/irisnet/corelib/objectsession.cpp
index e328ff80..b3ee2d30 100644
--- a/src/irisnet/corelib/objectsession.cpp
+++ b/src/irisnet/corelib/objectsession.cpp
@@ -39,7 +39,7 @@ class ObjectSessionPrivate : public QObject {
 
     class MethodCall {
     public:
-        QObject *  obj;
+        QObject   *obj;
         QByteArray method;
         class Argument {
         public:
@@ -93,7 +93,7 @@ class ObjectSessionPrivate : public QObject {
     };
 
     QList<MethodCall *>                  pendingCalls;
-    QTimer *                             callTrigger;
+    QTimer                              *callTrigger;
     bool                                 paused;
     QList<ObjectSessionWatcherPrivate *> watchers;
 
diff --git a/src/irisnet/noncore/cutestuff/bsocket.cpp b/src/irisnet/noncore/cutestuff/bsocket.cpp
index a24ad6ec..2c487c28 100644
--- a/src/irisnet/noncore/cutestuff/bsocket.cpp
+++ b/src/irisnet/noncore/cutestuff/bsocket.cpp
@@ -29,7 +29,7 @@
 
 #include <limits>
 
-//#define BS_DEBUG
+// #define BS_DEBUG
 #ifdef BS_DEBUG
 #define BSDEBUG (qDebug() << this << "#" << __FUNCTION__ << ":")
 #endif
diff --git a/src/irisnet/noncore/cutestuff/httpconnect.cpp b/src/irisnet/noncore/cutestuff/httpconnect.cpp
index ea1f064b..dbf8c3c8 100644
--- a/src/irisnet/noncore/cutestuff/httpconnect.cpp
+++ b/src/irisnet/noncore/cutestuff/httpconnect.cpp
@@ -25,7 +25,7 @@
 #include <QStringList>
 #include <QtCrypto>
 
-//#define PROX_DEBUG
+// #define PROX_DEBUG
 #ifdef PROX_DEBUG
 #include <stdio.h>
 #endif
@@ -80,7 +80,7 @@ static bool extractMainHeader(const QString &line, QString *proto, int *code, QS
     if (n2 == -1)
         return false;
     if (code)
-        *code = QStringView{line}.mid(n, n2 - n).toInt();
+        *code = QStringView { line }.mid(n, n2 - n).toInt();
     n = n2 + 1;
     if (msg)
         *msg = line.mid(n);
diff --git a/src/irisnet/noncore/cutestuff/httppoll.cpp b/src/irisnet/noncore/cutestuff/httppoll.cpp
index ab3a2c3c..54ecffff 100644
--- a/src/irisnet/noncore/cutestuff/httppoll.cpp
+++ b/src/irisnet/noncore/cutestuff/httppoll.cpp
@@ -22,12 +22,12 @@
 #include "bsocket.h"
 
 #include <QByteArray>
-#include <QUrl>
-#include <QtCrypto>
-#include <QPointer>
 #include <QHostAddress>
+#include <QPointer>
 #include <QStringList>
 #include <QTimer>
+#include <QUrl>
+#include <QtCrypto>
 
 #ifdef PROX_DEBUG
 #include <stdio.h>
@@ -408,7 +408,7 @@ static bool extractMainHeader(const QString &line, QString *proto, int *code, QS
     if (n2 == -1)
         return false;
     if (code)
-        *code = QStringView{line}.mid(n, n2 - n).toInt();
+        *code = QStringView { line }.mid(n, n2 - n).toInt();
     n = n2 + 1;
     if (msg)
         *msg = line.mid(n);
@@ -431,7 +431,7 @@ class HttpProxyPost::Private {
     bool         asProxy;
     bool         useSsl;
     QString      host;
-    QCA::TLS *   tls;
+    QCA::TLS    *tls;
 };
 
 HttpProxyPost::HttpProxyPost(QObject *parent) : QObject(parent)
diff --git a/src/irisnet/noncore/cutestuff/socks.cpp b/src/irisnet/noncore/cutestuff/socks.cpp
index 6ccc625f..0dec764a 100644
--- a/src/irisnet/noncore/cutestuff/socks.cpp
+++ b/src/irisnet/noncore/cutestuff/socks.cpp
@@ -26,12 +26,12 @@
 #include <QPointer>
 #include <QSocketNotifier>
 #include <QStringList>
+#include <QTcpServer>
+#include <QTcpSocket>
 #include <QTimer>
 #include <QUdpSocket>
-#include <QTcpSocket>
-#include <QTcpServer>
 
-//#define PROX_DEBUG
+// #define PROX_DEBUG
 #ifdef PROX_DEBUG
 #include <stdio.h>
 #endif
@@ -58,7 +58,7 @@
 
 class SocksUDP::Private {
 public:
-    QUdpSocket * sd;
+    QUdpSocket  *sd;
     SocksClient *sc;
     QHostAddress routeAddr;
     quint16      routePort;
@@ -963,9 +963,9 @@ SocksUDP *SocksClient::createUDP(const QString &host, int port, const QHostAddre
 //----------------------------------------------------------------------------
 class SocksServer::Private {
 public:
-    QTcpServer *         serv = nullptr;
+    QTcpServer          *serv = nullptr;
     QList<SocksClient *> incomingConns;
-    QUdpSocket *         sd = nullptr;
+    QUdpSocket          *sd = nullptr;
 };
 
 SocksServer::SocksServer(QObject *parent) : QObject(parent) { d = new Private; }
diff --git a/src/irisnet/noncore/dtls.cpp b/src/irisnet/noncore/dtls.cpp
index 0efc16d5..5816dd12 100644
--- a/src/irisnet/noncore/dtls.cpp
+++ b/src/irisnet/noncore/dtls.cpp
@@ -62,7 +62,7 @@ bool Dtls::FingerPrint::parse(const QDomElement &el)
                  qPrintable(ns()));
     }
     auto ht = el.attribute(QLatin1String("hash"));
-    hash    = QStringView{ht};
+    hash    = QStringView { ht };
     hash.setData(QByteArray::fromHex(el.text().toLatin1()));
     auto setupIt = std::find(fpRoles.begin(), fpRoles.end(), el.attribute(QLatin1String("setup")).toLatin1());
     setup        = Setup(setupIt == fpRoles.end() ? NotSet : std::distance(fpRoles.begin(), setupIt) + 1);
@@ -94,8 +94,8 @@ QDomElement Dtls::FingerPrint::toXml(QDomDocument *doc) const
 class Dtls::Private : public QObject {
     Q_OBJECT
 public:
-    Dtls *           q;
-    QCA::TLS *       tls = nullptr;
+    Dtls            *q;
+    QCA::TLS        *tls = nullptr;
     QCA::PrivateKey  pkey;
     QCA::Certificate cert;
 
diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index a1fb2a3f..387aa3b1 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -189,7 +189,7 @@ class Ice176::Private : public QObject {
     class Component {
     public:
         int                     id              = 0;
-        IceComponent *          ic              = nullptr;
+        IceComponent           *ic              = nullptr;
         std::unique_ptr<QTimer> nominationTimer = std::unique_ptr<QTimer>();
         CandidatePair::Ptr      selectedPair; // final selected pair. won't be changed
         CandidatePair::Ptr      highestPair;  // current highest priority pair to send data
@@ -203,12 +203,12 @@ class Ice176::Private : public QObject {
         bool nominating = false; // with aggressive nomination it's always false
     };
 
-    Ice176 *                                q;
+    Ice176                                 *q;
     Ice176::Mode                            mode;
     State                                   state = Stopped;
     QTimer                                  checkTimer;
     TurnClient::Proxy                       proxy;
-    UdpPortReserver *                       portReserver = nullptr;
+    UdpPortReserver                        *portReserver = nullptr;
     std::unique_ptr<QTimer>                 pacTimer;
     int                                     nominationTimeout = 3000; // 3s
     int                                     pacTimeout = 30000; // 30s todo: compute from rto. see draft-ietf-ice-pac-06
@@ -663,7 +663,7 @@ class Ice176::Private : public QObject {
         pair->binding->start();
     }
 
-    void doPairing(const QList<IceComponent::Candidate> &         localCandidates,
+    void doPairing(const QList<IceComponent::Candidate>          &localCandidates,
                    const QList<IceComponent::CandidateInfo::Ptr> &remoteCandidates)
     {
         QList<QSharedPointer<CandidatePair>> pairs;
@@ -918,7 +918,7 @@ class Ice176::Private : public QObject {
                                [&](auto const &p) { return *(p->local) == locCand.info && *(p->remote) == remCand; });
 
         CandidatePair::Ptr pair        = (it == checkList.pairs.end()) ? CandidatePair::Ptr() : *it;
-        Component &        component   = *findComponent(locCand.info->componentId);
+        Component         &component   = *findComponent(locCand.info->componentId);
         qint64             minPriority = component.highestPair ? component.highestPair->priority : 0;
         if (pair) {
             if (pair->priority < minPriority) {
@@ -1494,7 +1494,7 @@ private slots:
 
             StunMessage::ConvertResult result;
             StunMessage                msg = StunMessage::fromBinary(buf, &result,
-                                                      StunMessage::MessageIntegrity | StunMessage::Fingerprint, reqkey);
+                                                                     StunMessage::MessageIntegrity | StunMessage::Fingerprint, reqkey);
             if (!msg.isNull() && (msg.mclass() == StunMessage::Request || msg.mclass() == StunMessage::Indication)) {
                 iceDebug("received validated request or indication from %s", qPrintable(fromAddr));
                 QString user = QString::fromUtf8(msg.attribute(StunTypes::USERNAME));
diff --git a/src/irisnet/noncore/iceagent.h b/src/irisnet/noncore/iceagent.h
index bd2566d8..4042d594 100644
--- a/src/irisnet/noncore/iceagent.h
+++ b/src/irisnet/noncore/iceagent.h
@@ -15,7 +15,7 @@ class IceAgent : public QObject {
     ~IceAgent();
 
     QString foundation(IceComponent::CandidateType type, const QHostAddress baseAddr,
-                       const QHostAddress &        stunServAddr     = QHostAddress(),
+                       const QHostAddress         &stunServAddr     = QHostAddress(),
                        QAbstractSocket::SocketType stunRequestProto = QAbstractSocket::UnknownSocketType);
 
     static QString randomCredential(int len);
diff --git a/src/irisnet/noncore/icecomponent.cpp b/src/irisnet/noncore/icecomponent.cpp
index 563f8da9..5f2cedd3 100644
--- a/src/irisnet/noncore/icecomponent.cpp
+++ b/src/irisnet/noncore/icecomponent.cpp
@@ -69,7 +69,7 @@ class IceComponent::Private : public QObject {
 
     class LocalTransport {
     public:
-        QUdpSocket *                      qsock;
+        QUdpSocket                       *qsock;
         QHostAddress                      addr;
         QSharedPointer<IceLocalTransport> sock;
         int                               network;
@@ -88,12 +88,12 @@ class IceComponent::Private : public QObject {
         }
     };
 
-    IceComponent *                     q;
+    IceComponent                      *q;
     ObjectSession                      sess;
     int                                id;
     QString                            clientSoftware;
     TurnClient::Proxy                  proxy;
-    UdpPortReserver *                  portReserver = nullptr;
+    UdpPortReserver                   *portReserver = nullptr;
     Config                             pending;
     Config                             config;
     bool                               stopping = false;
@@ -726,7 +726,7 @@ private slots:
         ci->base        = ci->addr;
         ci->network     = 0; // not relevant
         ci->foundation  = IceAgent::instance()->foundation(RelayedType, ci->base.addr, config.stunRelayTcpAddr.addr,
-                                                          QAbstractSocket::TcpSocket);
+                                                           QAbstractSocket::TcpSocket);
 
         Candidate c;
         c.id           = getId();
diff --git a/src/irisnet/noncore/icelocaltransport.cpp b/src/irisnet/noncore/icelocaltransport.cpp
index fdb27543..b0eb4870 100644
--- a/src/irisnet/noncore/icelocaltransport.cpp
+++ b/src/irisnet/noncore/icelocaltransport.cpp
@@ -44,7 +44,7 @@ class SafeUdpSocket : public QObject {
 
 private:
     ObjectSession sess;
-    QUdpSocket *  sock;
+    QUdpSocket   *sock;
     int           writtenCount;
 
 public:
@@ -149,13 +149,13 @@ class IceLocalTransport::Private : public QObject {
         QByteArray       buf;
     };
 
-    IceLocalTransport *      q;
+    IceLocalTransport       *q;
     ObjectSession            sess;
-    QUdpSocket *             extSock = nullptr;
-    SafeUdpSocket *          sock    = nullptr;
+    QUdpSocket              *extSock = nullptr;
+    SafeUdpSocket           *sock    = nullptr;
     StunTransactionPool::Ptr pool;
-    StunBinding *            stunBinding   = nullptr;
-    TurnClient *             turn          = nullptr;
+    StunBinding             *stunBinding   = nullptr;
+    TurnClient              *turn          = nullptr;
     bool                     turnActivated = false;
     TransportAddress         addr;
     TransportAddress         refAddr;
diff --git a/src/irisnet/noncore/sctp/DepUsrSCTP.cpp b/src/irisnet/noncore/sctp/DepUsrSCTP.cpp
index 60a76eff..68be85e5 100644
--- a/src/irisnet/noncore/sctp/DepUsrSCTP.cpp
+++ b/src/irisnet/noncore/sctp/DepUsrSCTP.cpp
@@ -2,8 +2,8 @@
 // #define MS_LOG_DEV_LEVEL 3
 
 #include "DepUsrSCTP.hpp"
-//#include "DepLibUV.hpp"
-//#include "Logger.hpp"
+// #include "DepLibUV.hpp"
+// #include "Logger.hpp"
 #include <usrsctp.h>
 
 #include <QCoreApplication>
@@ -58,7 +58,7 @@ inline static void sctpDebug(const char *format, ...)
 
 /* Static variables. */
 
-DepUsrSCTP::Checker *                                 DepUsrSCTP::checker { nullptr };
+DepUsrSCTP::Checker                                  *DepUsrSCTP::checker { nullptr };
 uint64_t                                              DepUsrSCTP::numSctpAssociations { 0u };
 uintptr_t                                             DepUsrSCTP::nextSctpAssociationId { 0u };
 std::unordered_map<uintptr_t, RTC::SctpAssociation *> DepUsrSCTP::mapIdSctpAssociation;
diff --git a/src/irisnet/noncore/sctp/DepUsrSCTP.hpp b/src/irisnet/noncore/sctp/DepUsrSCTP.hpp
index 55a0bdd1..09432dca 100644
--- a/src/irisnet/noncore/sctp/DepUsrSCTP.hpp
+++ b/src/irisnet/noncore/sctp/DepUsrSCTP.hpp
@@ -1,9 +1,9 @@
 #ifndef MS_DEP_USRSCTP_HPP
 #define MS_DEP_USRSCTP_HPP
 
-//#include "common.hpp"
+// #include "common.hpp"
 #include "SctpAssociation.hpp"
-//#include "handles/Timer.hpp"
+// #include "handles/Timer.hpp"
 #include <unordered_map>
 
 #include <QElapsedTimer>
@@ -26,7 +26,7 @@ class DepUsrSCTP {
         void OnTimer();
 
     private:
-        QTimer *      timer { nullptr };
+        QTimer       *timer { nullptr };
         QElapsedTimer elapsedTimer;
     };
 
@@ -39,7 +39,7 @@ class DepUsrSCTP {
     static RTC::SctpAssociation *RetrieveSctpAssociation(uintptr_t id);
 
 private:
-    static Checker *                                             checker;
+    static Checker                                              *checker;
     static uint64_t                                              numSctpAssociations;
     static uintptr_t                                             nextSctpAssociationId;
     static std::unordered_map<uintptr_t, RTC::SctpAssociation *> mapIdSctpAssociation;
diff --git a/src/irisnet/noncore/sctp/SctpAssociation.cpp b/src/irisnet/noncore/sctp/SctpAssociation.cpp
index 816c00af..eade02d3 100644
--- a/src/irisnet/noncore/sctp/SctpAssociation.cpp
+++ b/src/irisnet/noncore/sctp/SctpAssociation.cpp
@@ -5,7 +5,7 @@
 #include "DepUsrSCTP.hpp"
 #include "Logger.hpp"
 #include "MediaSoupErrors.hpp"
-//#include "Channel/Notifier.hpp"
+// #include "Channel/Notifier.hpp"
 #include <cstdlib> // std::malloc(), std::free()
 #include <cstring> // std::memset(), std::memcpy()
 #include <string>
@@ -89,9 +89,8 @@ static constexpr uint16_t MaxSctpStreams { 65535 };
 
 SctpAssociation::SctpAssociation(Listener *listener, uint16_t os, uint16_t mis, size_t maxSctpMessageSize,
                                  size_t sctpSendBufferSize, bool isDataChannel) :
-    listener(listener),
-    os(os), mis(mis), maxSctpMessageSize(maxSctpMessageSize), sctpSendBufferSize(sctpSendBufferSize),
-    isDataChannel(isDataChannel)
+    listener(listener), os(os), mis(mis), maxSctpMessageSize(maxSctpMessageSize),
+    sctpSendBufferSize(sctpSendBufferSize), isDataChannel(isDataChannel)
 {
     MS_TRACE();
 
diff --git a/src/irisnet/noncore/sctp/SctpAssociation.hpp b/src/irisnet/noncore/sctp/SctpAssociation.hpp
index af93d6f0..1e371f6a 100644
--- a/src/irisnet/noncore/sctp/SctpAssociation.hpp
+++ b/src/irisnet/noncore/sctp/SctpAssociation.hpp
@@ -1,8 +1,8 @@
 #ifndef MS_RTC_SCTP_ASSOCIATION_HPP
 #define MS_RTC_SCTP_ASSOCIATION_HPP
 
-//#include "common.hpp"
-//#include "Utils.hpp"
+// #include "common.hpp"
+// #include "Utils.hpp"
 #include "RTC/DataConsumer.hpp"
 #include "RTC/DataProducer.hpp"
 #include "usrsctp.h"
diff --git a/src/irisnet/noncore/stunallocate.cpp b/src/irisnet/noncore/stunallocate.cpp
index 4107e4c2..f61f0779 100644
--- a/src/irisnet/noncore/stunallocate.cpp
+++ b/src/irisnet/noncore/stunallocate.cpp
@@ -74,9 +74,9 @@ class StunAllocatePermission : public QObject {
     Q_OBJECT
 
 public:
-    QTimer *                 timer;
+    QTimer                  *timer;
     StunTransactionPool::Ptr pool;
-    StunTransaction *        trans;
+    StunTransaction         *trans;
     TransportAddress         stunAddr;
     QHostAddress             addr;
     bool                     active;
@@ -233,9 +233,9 @@ class StunAllocateChannel : public QObject {
     Q_OBJECT
 
 public:
-    QTimer *                 timer;
+    QTimer                  *timer;
     StunTransactionPool::Ptr pool;
-    StunTransaction *        trans = nullptr;
+    StunTransaction         *trans = nullptr;
     TransportAddress         stunAddr;
     int                      channelId;
     TransportAddress         addr;
@@ -408,10 +408,10 @@ class StunAllocate::Private : public QObject {
         Erroring // like stopping, but emits error when finished
     };
 
-    StunAllocate *                  q;
+    StunAllocate                   *q;
     ObjectSession                   sess;
     StunTransactionPool::Ptr        pool;
-    StunTransaction *               trans;
+    StunTransaction                *trans;
     TransportAddress                stunAddr;
     State                           state;
     QString                         errorString;
@@ -420,7 +420,7 @@ class StunAllocate::Private : public QObject {
     TransportAddress                reflexiveAddress, relayedAddress;
     StunMessage                     msg;
     int                             allocateLifetime;
-    QTimer *                        allocateRefreshTimer;
+    QTimer                         *allocateRefreshTimer;
     QList<StunAllocatePermission *> perms;
     QList<StunAllocateChannel *>    channels;
     QList<QHostAddress>             permQueue;
diff --git a/src/irisnet/noncore/stunbinding.cpp b/src/irisnet/noncore/stunbinding.cpp
index 2c22a6b2..15bda2ea 100644
--- a/src/irisnet/noncore/stunbinding.cpp
+++ b/src/irisnet/noncore/stunbinding.cpp
@@ -28,7 +28,7 @@ class StunBinding::Private : public QObject {
     Q_OBJECT
 
 public:
-    StunBinding *                   q;
+    StunBinding                    *q;
     StunTransactionPool::Ptr        pool;
     QScopedPointer<StunTransaction> trans;
     TransportAddress                stunAddr;
diff --git a/src/irisnet/noncore/stunmessage.cpp b/src/irisnet/noncore/stunmessage.cpp
index 1ce21ab4..24e3f225 100644
--- a/src/irisnet/noncore/stunmessage.cpp
+++ b/src/irisnet/noncore/stunmessage.cpp
@@ -431,7 +431,7 @@ QByteArray StunMessage::toBinary(int validationFlags, const QByteArray &key) con
 
     // header
     QByteArray buf(20, 0);
-    quint8 *   p = (quint8 *)buf.data();
+    quint8    *p = (quint8 *)buf.data();
 
     quint8 classbits = 0;
     if (d->mclass == Request)
diff --git a/src/irisnet/noncore/stunmessage.h b/src/irisnet/noncore/stunmessage.h
index 59df9fd2..dd2ba937 100644
--- a/src/irisnet/noncore/stunmessage.h
+++ b/src/irisnet/noncore/stunmessage.h
@@ -51,8 +51,8 @@ class StunMessage {
     bool             isNull() const;
     Class            mclass() const;
     quint16          method() const;
-    const quint8 *   magic() const; // 4 bytes
-    const quint8 *   id() const;    // 12 bytes
+    const quint8    *magic() const; // 4 bytes
+    const quint8    *id() const;    // 12 bytes
     QList<Attribute> attributes() const;
 
     // returns the first instance or null
diff --git a/src/irisnet/noncore/stuntransaction.cpp b/src/irisnet/noncore/stuntransaction.cpp
index e9142673..24bcc43c 100644
--- a/src/irisnet/noncore/stuntransaction.cpp
+++ b/src/irisnet/noncore/stuntransaction.cpp
@@ -90,7 +90,7 @@ class StunTransactionPoolPrivate : public QObject {
     Q_OBJECT
 
 public:
-    StunTransactionPool *                q;
+    StunTransactionPool                 *q;
     StunTransaction::Mode                mode;
     QSet<StunTransaction *>              transactions;
     QHash<StunTransaction *, QByteArray> transToId;
diff --git a/src/irisnet/noncore/tcpportreserver.h b/src/irisnet/noncore/tcpportreserver.h
index 19e25a11..16275203 100644
--- a/src/irisnet/noncore/tcpportreserver.h
+++ b/src/irisnet/noncore/tcpportreserver.h
@@ -45,7 +45,7 @@ class TcpPortServer : public QObject {
     inline void            setPortInfo(const Port &port) { this->port = port; }
     inline QHostAddress    serverAddress() const { return serverSocket->serverAddress(); }
     inline quint16         serverPort() const { return serverSocket->serverPort(); }
-    inline const QString & publishHost() const { return port.publishHost; }
+    inline const QString  &publishHost() const { return port.publishHost; }
     inline quint16         publishPort() const { return port.publishPort; }
     inline PortType        portType() const { return port.portType; }
     inline const QVariant &meta() const { return port.meta; }
@@ -94,7 +94,7 @@ public slots:
     bool                     started = false;
     TcpPortServer::PortTypes typeMask
         = TcpPortServer::PortTypes(TcpPortServer::Direct | TcpPortServer::NatAssited | TcpPortServer::Tunneled);
-    TcpPortScope *            scope = nullptr;
+    TcpPortScope             *scope = nullptr;
     QList<TcpPortServer::Ptr> servers;
 };
 
@@ -110,7 +110,7 @@ class TcpPortScope : public QObject {
 public:
     TcpPortScope();
     ~TcpPortScope();
-    TcpPortDiscoverer *       disco();
+    TcpPortDiscoverer        *disco();
     QList<TcpPortServer::Ptr> allServers() const;
 
 protected:
diff --git a/src/irisnet/noncore/turnclient.cpp b/src/irisnet/noncore/turnclient.cpp
index 09f38608..e0a0bfe2 100644
--- a/src/irisnet/noncore/turnclient.cpp
+++ b/src/irisnet/noncore/turnclient.cpp
@@ -75,19 +75,19 @@ class TurnClient::Private : public QObject {
     Q_OBJECT
 
 public:
-    TurnClient *             q;
+    TurnClient              *q;
     Proxy                    proxy;
     QString                  clientSoftware;
     TurnClient::Mode         mode = PlainMode;
     TransportAddress         serverAddr;
     ObjectSession            sess;
-    ByteStream *             bs            = nullptr;
-    QCA::TLS *               tls           = nullptr;
+    ByteStream              *bs            = nullptr;
+    QCA::TLS                *tls           = nullptr;
     bool                     tlsHandshaken = false;
     QByteArray               inStream;
     bool                     udp = false;
     StunTransactionPool::Ptr pool;
-    StunAllocate *           allocate        = nullptr;
+    StunAllocate            *allocate        = nullptr;
     bool                     allocateStarted = false;
     QString                  user;
     QCA::SecureArray         pass;
diff --git a/src/irisnet/noncore/udpportreserver.cpp b/src/irisnet/noncore/udpportreserver.cpp
index 12b05d40..e1d45f96 100644
--- a/src/irisnet/noncore/udpportreserver.cpp
+++ b/src/irisnet/noncore/udpportreserver.cpp
@@ -53,7 +53,7 @@ class UdpPortReserver::Private : public QObject {
         }
     };
 
-    UdpPortReserver *   q;
+    UdpPortReserver    *q;
     QList<QHostAddress> addrs;
     QList<int>          ports; // sorted.
 
diff --git a/src/jdns.cmake b/src/jdns.cmake
index 64d98145..a9fb359c 100644
--- a/src/jdns.cmake
+++ b/src/jdns.cmake
@@ -49,4 +49,4 @@ set(qjdns_HEADERS
 add_library(${QJDns_LIBRARY} STATIC ${qjdns_SRCS} ${qjdns_MOC_SRCS} ${qjdns_MOC_HDRS} ${qjdns_PUBLIC_HEADERS})
 
 target_link_libraries(${QJDns_LIBRARY} Qt5::Core Qt5::Network)
-target_link_libraries(${QJDns_LIBRARY} jdns) 
+target_link_libraries(${QJDns_LIBRARY} jdns)
diff --git a/src/xmpp/base/timezone.cpp b/src/xmpp/base/timezone.cpp
index c1b937c5..bf647592 100644
--- a/src/xmpp/base/timezone.cpp
+++ b/src/xmpp/base/timezone.cpp
@@ -18,20 +18,12 @@
 
 #include "timezone.h"
 
-
 #include <QTimeZone>
 #include <QtGlobal>
 
+int TimeZone::offsetFromUtc() { return QTimeZone::systemTimeZone().offsetFromUtc(QDateTime::currentDateTime()) / 60; }
 
-int TimeZone::offsetFromUtc()
-{
-    return QTimeZone::systemTimeZone().offsetFromUtc(QDateTime::currentDateTime()) / 60;
-}
-
-QString TimeZone::abbreviation()
-{
-    return QTimeZone::systemTimeZone().abbreviation(QDateTime::currentDateTime());
-}
+QString TimeZone::abbreviation() { return QTimeZone::systemTimeZone().abbreviation(QDateTime::currentDateTime()); }
 
 int TimeZone::tzdToInt(const QString &tzd)
 {
diff --git a/src/xmpp/blake2/blake2-impl.h b/src/xmpp/blake2/blake2-impl.h
index 1197c651..29d07fa6 100644
--- a/src/xmpp/blake2/blake2-impl.h
+++ b/src/xmpp/blake2/blake2-impl.h
@@ -75,7 +75,7 @@ static BLAKE2_INLINE void store16(void *dst, uint16_t w)
     uint8_t *p = (uint8_t *)dst;
     *p++       = (uint8_t)w;
     w >>= 8;
-    *p++       = (uint8_t)w;
+    *p++ = (uint8_t)w;
 #endif
 }
 
diff --git a/src/xmpp/blake2/blake2b-ref.c b/src/xmpp/blake2/blake2b-ref.c
index e5273a8f..a3a512e4 100644
--- a/src/xmpp/blake2/blake2b-ref.c
+++ b/src/xmpp/blake2/blake2b-ref.c
@@ -329,7 +329,7 @@ int main(void)
         for (i = 0; i < BLAKE2_KAT_LENGTH; ++i) {
             uint8_t       hash[BLAKE2B_OUTBYTES];
             blake2b_state S;
-            uint8_t *     p    = buf;
+            uint8_t      *p    = buf;
             size_t        mlen = i;
             int           err  = 0;
 
diff --git a/src/xmpp/blake2/blake2s-ref.c b/src/xmpp/blake2/blake2s-ref.c
index 170f87f8..33f3d875 100644
--- a/src/xmpp/blake2/blake2s-ref.c
+++ b/src/xmpp/blake2/blake2s-ref.c
@@ -321,7 +321,7 @@ int main(void)
         for (i = 0; i < BLAKE2_KAT_LENGTH; ++i) {
             uint8_t       hash[BLAKE2S_OUTBYTES];
             blake2s_state S;
-            uint8_t *     p    = buf;
+            uint8_t      *p    = buf;
             size_t        mlen = i;
             int           err  = 0;
 
diff --git a/src/xmpp/jid/jid.h b/src/xmpp/jid/jid.h
index 85a36ad6..e7c1a3a8 100644
--- a/src/xmpp/jid/jid.h
+++ b/src/xmpp/jid/jid.h
@@ -42,7 +42,7 @@ class StringPrepCache {
     QHash<QString, QString> saslprep_table;
 
     static QScopedPointer<StringPrepCache> _instance;
-    static StringPrepCache *               instance();
+    static StringPrepCache                *instance();
 
     StringPrepCache();
 };
diff --git a/src/xmpp/qa/README b/src/xmpp/qa/README
index 05425a06..d2f3b124 100644
--- a/src/xmpp/qa/README
+++ b/src/xmpp/qa/README
@@ -3,11 +3,11 @@ How to add unit tests to a module
 - Copy the qa/unittest.template module to the module dir, and rename it to
   'unittest'. Be careful not to copy '.svn'.
 - Create a file <classname>test.cpp for every class, and implement the tests
-	for each method.. See 'myclasstest.cpp' for a template.
+    for each method.. See 'myclasstest.cpp' for a template.
 - Add every <classname>test.cpp file to 'unittest.pri'
-- In 'unittest.pro', replace '$$MYMODULE' with the name of the module that you 
+- In 'unittest.pro', replace '$$MYMODULE' with the name of the module that you
   are unit testing. Also include all the modules that are required to compile
-	a standalone checker for the module under test. 
+    a standalone checker for the module under test.
 - Add an 'include' line to the list of unit tests in qa/unittests.pri. This
   is used to compile the full unit test suite of all modules.
 - Make sure 'qa/unittests.pro' contains the module under test, and make
diff --git a/src/xmpp/sasl/digestmd5response.cpp b/src/xmpp/sasl/digestmd5response.cpp
index 4f0094b5..4a89476d 100644
--- a/src/xmpp/sasl/digestmd5response.cpp
+++ b/src/xmpp/sasl/digestmd5response.cpp
@@ -28,8 +28,7 @@
 namespace XMPP {
 DIGESTMD5Response::DIGESTMD5Response(const QByteArray &challenge, const QString &service, const QString &host,
                                      const QString &arealm, const QString &user, const QString &authz,
-                                     const QByteArray &password, const RandomNumberGenerator &rand) :
-    isValid_(true)
+                                     const QByteArray &password, const RandomNumberGenerator &rand) : isValid_(true)
 {
     QString realm = arealm;
 
diff --git a/src/xmpp/sasl/scramsha1message.cpp b/src/xmpp/sasl/scramsha1message.cpp
index 74e3543a..60f51220 100644
--- a/src/xmpp/sasl/scramsha1message.cpp
+++ b/src/xmpp/sasl/scramsha1message.cpp
@@ -41,8 +41,7 @@ bool Normalize(const QString &username_in, QString &username_out)
 }
 
 SCRAMSHA1Message::SCRAMSHA1Message(const QString &authzid, const QString &authcid, const QByteArray &cnonce,
-                                   const RandomNumberGenerator &rand) :
-    isValid_(true)
+                                   const RandomNumberGenerator &rand) : isValid_(true)
 {
     QString    result;
     QByteArray clientnonce;
diff --git a/src/xmpp/sasl/scramsha1response.cpp b/src/xmpp/sasl/scramsha1response.cpp
index 9d568edc..62b2ee13 100644
--- a/src/xmpp/sasl/scramsha1response.cpp
+++ b/src/xmpp/sasl/scramsha1response.cpp
@@ -44,8 +44,8 @@ SCRAMSHA1Response::SCRAMSHA1Response(const QByteArray &server_first_message, con
     QString pass_out;
 
     QRegularExpression pattern("r=(.*),s=(.+),i=(\\d+)");
-    auto match = pattern.match(QString(server_first_message));
-    isValid_    = match.hasMatch();
+    auto               match = pattern.match(QString(server_first_message));
+    isValid_                 = match.hasMatch();
     if (!isValid_) {
         qWarning("SASL/SCRAM-SHA-1: Failed to match pattern for server-final-message.");
         return;
@@ -107,7 +107,7 @@ SCRAMSHA1Response::SCRAMSHA1Response(const QByteArray &server_first_message, con
     // AuthMessage     := client-first-message-bare + "," + server-first-message + "," +
     // client-final-message-without-proof
     QRegularExpression extract_cfmb_pattern("(n=.+)");
-    match = extract_cfmb_pattern.match(QString(client_first_message));
+    match    = extract_cfmb_pattern.match(QString(client_first_message));
     isValid_ = match.hasMatch();
     if (!isValid_) {
         return;
diff --git a/src/xmpp/sasl/scramsha1signature.cpp b/src/xmpp/sasl/scramsha1signature.cpp
index f0785d1f..1c9c71c5 100644
--- a/src/xmpp/sasl/scramsha1signature.cpp
+++ b/src/xmpp/sasl/scramsha1signature.cpp
@@ -19,19 +19,19 @@
 #include "xmpp/sasl/scramsha1signature.h"
 
 #include <QByteArray>
+#include <QRegularExpression>
 #include <QString>
 #include <QTextStream>
 #include <QtCrypto>
-#include <QRegularExpression>
 #include <QtDebug>
 
 namespace XMPP {
-SCRAMSHA1Signature::SCRAMSHA1Signature(const QByteArray &      server_final_message,
+SCRAMSHA1Signature::SCRAMSHA1Signature(const QByteArray       &server_final_message,
                                        const QCA::SecureArray &server_signature_should)
 {
     QRegularExpression pattern("v=([^,]*)");
-    auto match = pattern.match(QString(server_final_message));
-    isValid_    = match.hasMatch();
+    auto               match = pattern.match(QString(server_final_message));
+    isValid_                 = match.hasMatch();
     if (isValid_) {
         QString          server_signature = match.captured(1);
         QCA::SecureArray server_sig(QCA::Base64().stringToArray(server_signature));
diff --git a/src/xmpp/sasl/unittest/digestmd5responsetest.cpp b/src/xmpp/sasl/unittest/digestmd5responsetest.cpp
index 25c948bc..0224263d 100644
--- a/src/xmpp/sasl/unittest/digestmd5responsetest.cpp
+++ b/src/xmpp/sasl/unittest/digestmd5responsetest.cpp
@@ -38,12 +38,12 @@ private slots:
                                    "xmpp", "jabber.example.com", "example.com", "myuser", "myuser_authz", "mypass",
                                    IncrementingRandomNumberGenerator(255));
         QByteArray        expectedValue("username=\"myuser\",realm=\"example.com\","
-                                 "nonce=\"O6skKPuaCZEny3hteI19qXMBXSadoWs840MchORo\","
-                                 "cnonce=\"AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8=\","
-                                 "nc=00000001,"
-                                 "digest-uri=\"xmpp/jabber.example.com\","
-                                 "qop=auth,response=8fe15bc2aa31956b62d9de831b21a5d4,"
-                                 "charset=utf-8,authzid=\"myuser_authz\"");
+                                               "nonce=\"O6skKPuaCZEny3hteI19qXMBXSadoWs840MchORo\","
+                                               "cnonce=\"AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8=\","
+                                               "nc=00000001,"
+                                               "digest-uri=\"xmpp/jabber.example.com\","
+                                               "qop=auth,response=8fe15bc2aa31956b62d9de831b21a5d4,"
+                                               "charset=utf-8,authzid=\"myuser_authz\"");
 
         QVERIFY(response.isValid());
         QCOMPARE(response.getValue(), expectedValue);
@@ -57,11 +57,11 @@ private slots:
                                    "xmpp", "jabber.example.com", "example.com", "myuser", "", "mypass",
                                    IncrementingRandomNumberGenerator(255));
         QByteArray        expectedValue("username=\"myuser\",realm=\"example.com\","
-                                 "nonce=\"O6skKPuaCZEny3hteI19qXMBXSadoWs840MchORo\","
-                                 "cnonce=\"AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8=\","
-                                 "nc=00000001,"
-                                 "digest-uri=\"xmpp/jabber.example.com\","
-                                 "qop=auth,response=564b1c1cc16d97b019f18b14c979964b,charset=utf-8");
+                                               "nonce=\"O6skKPuaCZEny3hteI19qXMBXSadoWs840MchORo\","
+                                               "cnonce=\"AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8=\","
+                                               "nc=00000001,"
+                                               "digest-uri=\"xmpp/jabber.example.com\","
+                                               "qop=auth,response=564b1c1cc16d97b019f18b14c979964b,charset=utf-8");
 
         QVERIFY(response.isValid());
         QCOMPARE(response.getValue(), expectedValue);
diff --git a/src/xmpp/xmpp-core/compressionhandler.h b/src/xmpp/xmpp-core/compressionhandler.h
index 740f32ca..3f3479fd 100644
--- a/src/xmpp/xmpp-core/compressionhandler.h
+++ b/src/xmpp/xmpp-core/compressionhandler.h
@@ -25,7 +25,7 @@ class CompressionHandler : public QObject {
     void error();
 
 private:
-    ZLibCompressor *  compressor_;
+    ZLibCompressor   *compressor_;
     ZLibDecompressor *decompressor_;
     QBuffer           outgoing_buffer_, incoming_buffer_;
     int               errorCode_;
diff --git a/src/xmpp/xmpp-core/connector.cpp b/src/xmpp/xmpp-core/connector.cpp
index 9fe4b7ff..f73e8bd5 100644
--- a/src/xmpp/xmpp-core/connector.cpp
+++ b/src/xmpp/xmpp-core/connector.cpp
@@ -35,13 +35,13 @@
 #include "xmpp.h"
 
 #include <QList>
+#include <QNetworkProxy>
 #include <QPointer>
 #include <QTimer>
 #include <QUrl>
-#include <QNetworkProxy>
 #include <qca.h>
 
-//#define XMPP_DEBUG
+// #define XMPP_DEBUG
 #ifdef XMPP_DEBUG
 #define XDEBUG (qDebug() << this << "#" << __FUNCTION__ << ":")
 #endif
diff --git a/src/xmpp/xmpp-core/parser.cpp b/src/xmpp/xmpp-core/parser.cpp
index df931c27..5f00c3bf 100644
--- a/src/xmpp/xmpp-core/parser.cpp
+++ b/src/xmpp/xmpp-core/parser.cpp
@@ -160,7 +160,7 @@ class Parser::Private {
     QDomElement           element; // root part
     std::list<QByteArray> in;
     QXmlStreamReader      reader;
-    const char *          completeTag    = nullptr; // this is basically a workaround for bugs like QTBUG-14661
+    const char           *completeTag    = nullptr; // this is basically a workaround for bugs like QTBUG-14661
     int                   completeOffset = 0;
     bool                  streamOpened   = false;
     bool                  readerStarted  = false;
diff --git a/src/xmpp/xmpp-core/parser.h b/src/xmpp/xmpp-core/parser.h
index 0ea6a087..811bd4fe 100644
--- a/src/xmpp/xmpp-core/parser.h
+++ b/src/xmpp/xmpp-core/parser.h
@@ -78,10 +78,10 @@ class Parser {
     Parser();
     ~Parser();
 
-    void       reset();
-    void       appendData(const QByteArray &a);
-    Event      readNext();
-    QByteArray unprocessed() const;
+    void        reset();
+    void        appendData(const QByteArray &a);
+    Event       readNext();
+    QByteArray  unprocessed() const;
     QStringView encoding() const;
 
 private:
diff --git a/src/xmpp/xmpp-core/protocol.cpp b/src/xmpp/xmpp-core/protocol.cpp
index 2f70e81e..9cb3aca3 100644
--- a/src/xmpp/xmpp-core/protocol.cpp
+++ b/src/xmpp/xmpp-core/protocol.cpp
@@ -1700,8 +1700,8 @@ bool CoreProtocol::normalStep(const QDomElement &e)
                     if (!location.isEmpty()) {
                         int         port_off = 0;
                         QStringView sm_host;
-                        int         sm_port = 0;
-                        auto location_view = QStringView{location};
+                        int         sm_port       = 0;
+                        auto        location_view = QStringView { location };
                         if (location.startsWith('[')) { // ipv6
                             port_off = location.indexOf(']');
                             if (port_off != -1) { // looks valid
diff --git a/src/xmpp/xmpp-core/securestream.cpp b/src/xmpp/xmpp-core/securestream.cpp
index d6a6f0da..94c2d0d2 100644
--- a/src/xmpp/xmpp-core/securestream.cpp
+++ b/src/xmpp/xmpp-core/securestream.cpp
@@ -107,7 +107,7 @@ class SecureLayer : public QObject {
     enum { TLS, SASL, TLSH, Compression };
     int type;
     union {
-        QCA::TLS * tls;
+        QCA::TLS  *tls;
         QCA::SASL *sasl;
 #ifdef USE_TLSHANDLER
         XMPP::TLSHandler *tlsHandler;
@@ -339,7 +339,7 @@ private slots:
 
 class SecureStream::Private {
 public:
-    ByteStream *         bs;
+    ByteStream          *bs;
     QList<SecureLayer *> layers;
     int                  pending;
     int                  errorCode;
@@ -571,7 +571,7 @@ void SecureStream::layer_tlsClosed(const QByteArray &)
 
 void SecureStream::layer_readyRead(const QByteArray &a)
 {
-    SecureLayer *                  s = static_cast<SecureLayer *>(sender());
+    SecureLayer                   *s = static_cast<SecureLayer *>(sender());
     QList<SecureLayer *>::Iterator it(d->layers.begin());
     while ((*it) != s) {
         Q_ASSERT(it != d->layers.end());
@@ -591,7 +591,7 @@ void SecureStream::layer_readyRead(const QByteArray &a)
 
 void SecureStream::layer_needWrite(const QByteArray &a)
 {
-    SecureLayer *                  s = static_cast<SecureLayer *>(sender());
+    SecureLayer                   *s = static_cast<SecureLayer *>(sender());
     QList<SecureLayer *>::Iterator it(d->layers.begin());
     while ((*it) != s) {
         Q_ASSERT(it != d->layers.end());
diff --git a/src/xmpp/xmpp-core/sm.h b/src/xmpp/xmpp-core/sm.h
index 26fb5ac3..e85c85ec 100644
--- a/src/xmpp/xmpp-core/sm.h
+++ b/src/xmpp/xmpp-core/sm.h
@@ -28,7 +28,7 @@
 #define NS_STREAM_MANAGEMENT "urn:xmpp:sm:3"
 #define SM_TIMER_INTERVAL_SECS 40
 
-//#define IRIS_SM_DEBUG
+// #define IRIS_SM_DEBUG
 
 namespace XMPP {
 class SMState {
@@ -55,7 +55,7 @@ class SMState {
 class StreamManagement : QObject {
 public:
     StreamManagement(QObject *parent = nullptr);
-    XMPP::SMState &      state() { return state_; }
+    XMPP::SMState       &state() { return state_; }
     const XMPP::SMState &state() const { return state_; }
     bool                 isActive() const { return sm_started || sm_resumed; }
     bool                 isResumed() const { return sm_resumed; }
diff --git a/src/xmpp/xmpp-core/stream.cpp b/src/xmpp/xmpp-core/stream.cpp
index aaedfdb7..0384166c 100644
--- a/src/xmpp/xmpp-core/stream.cpp
+++ b/src/xmpp/xmpp-core/stream.cpp
@@ -59,10 +59,10 @@
 #include <QTimer>
 #include <QUrl>
 #include <QtCrypto>
-//#include <stdio.h>
+// #include <stdio.h>
 #include <stdlib.h>
 
-//#define XMPP_DEBUG
+// #define XMPP_DEBUG
 
 using namespace XMPP;
 
@@ -209,8 +209,7 @@ ClientStream::ClientStream(Connector *conn, TLSHandler *tlsHandler, QObject *par
 }
 
 ClientStream::ClientStream(const QString &host, const QString &defRealm, ByteStream *bs, QCA::TLS *tls,
-                           QObject *parent) :
-    Stream(parent)
+                           QObject *parent) : Stream(parent)
 {
     d       = new Private;
     d->mode = Server;
@@ -704,9 +703,9 @@ void ClientStream::sasl_needParams(const QCA::SASL::Params &p)
 
 void ClientStream::sasl_authCheck(const QString &user, const QString &)
 {
-    //#ifdef XMPP_DEBUG
-    //    qDebug("authcheck: [%s], [%s]\n", user.latin1(), authzid.latin1());
-    //#endif
+    // #ifdef XMPP_DEBUG
+    //     qDebug("authcheck: [%s], [%s]\n", user.latin1(), authzid.latin1());
+    // #endif
     QString u = user;
     int     n = u.indexOf('@');
     if (n != -1)
diff --git a/src/xmpp/xmpp-core/tlshandler.cpp b/src/xmpp/xmpp-core/tlshandler.cpp
index 9c348aaf..366f9023 100644
--- a/src/xmpp/xmpp-core/tlshandler.cpp
+++ b/src/xmpp/xmpp-core/tlshandler.cpp
@@ -195,7 +195,9 @@ static bool cert_match_domain(const QString &certname, const QString &acedomain)
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
         if (!QRegExp(p1, Qt::CaseSensitive, QRegExp::Wildcard).exactMatch(p2))
 #else
-        if (!QRegularExpression::fromWildcard(QLatin1Char('^') + p1 + QLatin1Char('$'), Qt::CaseSensitive).match(p2).hasMatch())
+        if (!QRegularExpression::fromWildcard(QLatin1Char('^') + p1 + QLatin1Char('$'), Qt::CaseSensitive)
+                 .match(p2)
+                 .hasMatch())
 #endif
             return false;
     }
diff --git a/src/xmpp/xmpp-core/xmpp_stanza.cpp b/src/xmpp/xmpp-core/xmpp_stanza.cpp
index 5aeb983f..b3779539 100644
--- a/src/xmpp/xmpp-core/xmpp_stanza.cpp
+++ b/src/xmpp/xmpp-core/xmpp_stanza.cpp
@@ -473,7 +473,7 @@ class Stanza::Private {
             return QLatin1String("iq");
     }
 
-    Stream *                     s;
+    Stream                      *s;
     QDomElement                  e;
     QSharedPointer<QDomDocument> sharedDoc;
 };
diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
index f3cfe9d9..8b9b1792 100644
--- a/src/xmpp/xmpp-im/client.cpp
+++ b/src/xmpp/xmpp-im/client.cpp
@@ -118,8 +118,8 @@ class Client::ClientPrivate {
 
     QPointer<ClientStream>  stream;
     QDomDocument            doc;
-    Task *                  root    = nullptr;
-    QNetworkAccessManager * qnam    = nullptr;
+    Task                   *root = nullptr;
+    QNetworkAccessManager  *qnam = nullptr;
     QString                 host, user, pass, resource;
     QString                 osName, osVersion, tzname, clientName, clientVersion;
     CapsSpec                caps, serverCaps;
@@ -133,22 +133,22 @@ class Client::ClientPrivate {
 
     LiveRoster                roster;
     ResourceList              resourceList;
-    CapsManager *             capsman                  = nullptr;
-    TcpPortReserver *         tcpPortReserver          = nullptr;
-    S5BManager *              s5bman                   = nullptr;
-    Jingle::S5B::Manager *    jingleS5BManager         = nullptr;
-    Jingle::IBB::Manager *    jingleIBBManager         = nullptr;
-    Jingle::ICE::Manager *    jingleICEManager         = nullptr;
-    IBBManager *              ibbman                   = nullptr;
-    BoBManager *              bobman                   = nullptr;
-    FileTransferManager *     ftman                    = nullptr;
-    ServerInfoManager *       serverInfoManager        = nullptr;
+    CapsManager              *capsman                  = nullptr;
+    TcpPortReserver          *tcpPortReserver          = nullptr;
+    S5BManager               *s5bman                   = nullptr;
+    Jingle::S5B::Manager     *jingleS5BManager         = nullptr;
+    Jingle::IBB::Manager     *jingleIBBManager         = nullptr;
+    Jingle::ICE::Manager     *jingleICEManager         = nullptr;
+    IBBManager               *ibbman                   = nullptr;
+    BoBManager               *bobman                   = nullptr;
+    FileTransferManager      *ftman                    = nullptr;
+    ServerInfoManager        *serverInfoManager        = nullptr;
     ExternalServiceDiscovery *externalServiceDiscovery = nullptr;
-    StunDiscoManager *        stunDiscoManager         = nullptr;
-    HttpFileUploadManager *   httpFileUploadManager    = nullptr;
-    Jingle::Manager *         jingleManager            = nullptr;
+    StunDiscoManager         *stunDiscoManager         = nullptr;
+    HttpFileUploadManager    *httpFileUploadManager    = nullptr;
+    Jingle::Manager          *jingleManager            = nullptr;
     QList<GroupChat>          groupChatList;
-    EncryptionHandler *       encryptionHandler = nullptr;
+    EncryptionHandler        *encryptionHandler = nullptr;
 };
 
 Client::Client(QObject *par) : QObject(par)
@@ -563,7 +563,7 @@ void Client::debug(const QString &str) { emit debugText(str); }
 
 QString Client::genUniqueId()
 {
-#if QT_VERSION >= QT_VERSION_CHECK(5,11,0)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
     return QUuid::createUuid().toString(QUuid::WithoutBraces);
 #else
     auto s = QUuid::createUuid().toString();
@@ -1294,7 +1294,7 @@ LiveRoster::~LiveRoster() { delete d; }
 LiveRoster &LiveRoster::operator=(const LiveRoster &other)
 {
     QList<LiveRosterItem>::operator=(other);
-    d->groupsDelimiter             = other.d->groupsDelimiter;
+    d->groupsDelimiter = other.d->groupsDelimiter;
     return *this;
 }
 void LiveRoster::flagAllForDelete()
diff --git a/src/xmpp/xmpp-im/filetransfer.cpp b/src/xmpp/xmpp-im/filetransfer.cpp
index 8d63c956..714d6e22 100644
--- a/src/xmpp/xmpp-im/filetransfer.cpp
+++ b/src/xmpp/xmpp-im/filetransfer.cpp
@@ -56,7 +56,7 @@ static QDomElement firstChildElement(const QDomElement &e)
 class FileTransfer::Private {
 public:
     FileTransferManager *m;
-    JT_FT *              ft;
+    JT_FT               *ft;
     Jid                  peer;
     QString              fname;
     qlonglong            size;
@@ -68,7 +68,7 @@ class FileTransfer::Private {
     Thumbnail            thumbnail;
     bool                 needStream;
     QString              id, iq_id;
-    BSConnection *       c;
+    BSConnection        *c;
     Jid                  proxy;
     int                  state;
     bool                 sender;
@@ -332,12 +332,12 @@ void FileTransfer::doAccept() { d->c->accept(); }
 //----------------------------------------------------------------------------
 class FileTransferManager::Private {
 public:
-    Client *                            client;
+    Client                             *client;
     QList<FileTransfer *>               list, incoming;
     QStringList                         streamPriority;
     QHash<QString, BytestreamManager *> streamMap;
     QSet<QString>                       disabledStreamTypes;
-    JT_PushFT *                         pft;
+    JT_PushFT                          *pft;
 };
 
 FileTransferManager::FileTransferManager(Client *client) : QObject(client)
diff --git a/src/xmpp/xmpp-im/filetransfer.h b/src/xmpp/xmpp-im/filetransfer.h
index cbf77dd9..6c8b57c5 100644
--- a/src/xmpp/xmpp-im/filetransfer.h
+++ b/src/xmpp/xmpp-im/filetransfer.h
@@ -113,7 +113,7 @@ class FileTransferManager : public QObject {
     bool isActive(const FileTransfer *ft) const;
     void setDisabled(const QString &ns, bool state = true);
 
-    Client *      client() const;
+    Client       *client() const;
     FileTransfer *createTransfer();
     FileTransfer *takeIncoming();
 
diff --git a/src/xmpp/xmpp-im/httpfileupload.cpp b/src/xmpp/xmpp-im/httpfileupload.cpp
index 314a76be..efbdc696 100644
--- a/src/xmpp/xmpp-im/httpfileupload.cpp
+++ b/src/xmpp/xmpp-im/httpfileupload.cpp
@@ -59,9 +59,7 @@ class HttpFileUpload::Private {
 };
 
 HttpFileUpload::HttpFileUpload(XMPP::Client *client, QIODevice *source, size_t fsize, const QString &dstFilename,
-                               const QString &mType) :
-    QObject(client),
-    d(new Private)
+                               const QString &mType) : QObject(client), d(new Private)
 {
     d->client       = client;
     d->sourceDevice = source;
@@ -102,8 +100,9 @@ void HttpFileUpload::start()
         featureOptions << (QSet<QString>() << xmlns_v0_2_5) << (QSet<QString>() << xmlns_v0_3_1);
     }
     d->client->serverInfoManager()->queryServiceInfo(
-        QLatin1String("store"), QLatin1String("file"), featureOptions, QRegularExpression("^(upload|http|stor|file|dis|drive).*"),
-        ServerInfoManager::SQ_CheckAllOnNoMatch, [this](const QList<DiscoItem> &items) {
+        QLatin1String("store"), QLatin1String("file"), featureOptions,
+        QRegularExpression("^(upload|http|stor|file|dis|drive).*"), ServerInfoManager::SQ_CheckAllOnNoMatch,
+        [this](const QList<DiscoItem> &items) {
             d->httpHosts.clear();
             for (const auto &item : items) {
                 const QStringList &l   = item.features().list();
diff --git a/src/xmpp/xmpp-im/im.h b/src/xmpp/xmpp-im/im.h
index e0f20d1b..d1175d56 100644
--- a/src/xmpp/xmpp-im/im.h
+++ b/src/xmpp/xmpp-im/im.h
@@ -21,7 +21,6 @@
 #define XMPP_IM_H
 
 #include "iris/xmpp.h"
-#include "iris/xmpp_jid.h"
 #include "iris/xmpp_address.h"
 #include "iris/xmpp_agentitem.h"
 #include "iris/xmpp_chatstate.h"
@@ -32,6 +31,7 @@
 #include "iris/xmpp_hash.h"
 #include "iris/xmpp_htmlelement.h"
 #include "iris/xmpp_httpauthrequest.h"
+#include "iris/xmpp_jid.h"
 #include "iris/xmpp_liveroster.h"
 #include "iris/xmpp_liverosteritem.h"
 #include "iris/xmpp_message.h"
diff --git a/src/xmpp/xmpp-im/jingle-application.cpp b/src/xmpp/xmpp-im/jingle-application.cpp
index 06813810..2c91bca4 100644
--- a/src/xmpp/xmpp-im/jingle-application.cpp
+++ b/src/xmpp/xmpp-im/jingle-application.cpp
@@ -66,8 +66,7 @@ namespace XMPP { namespace Jingle {
     public:
         ConnectionWaiter(TransportFeatures features, std::function<void(Connection::Ptr)> &&ready,
                          std::function<void()> &&failed, Application *app) :
-            QObject(app),
-            ready(std::move(ready)), failed(std::move(failed))
+            QObject(app), ready(std::move(ready)), failed(std::move(failed))
         {
             auto tr   = app->transport();
             transport = tr;
diff --git a/src/xmpp/xmpp-im/jingle-application.h b/src/xmpp/xmpp-im/jingle-application.h
index f19da243..cd3b06cb 100644
--- a/src/xmpp/xmpp-im/jingle-application.h
+++ b/src/xmpp/xmpp-im/jingle-application.h
@@ -79,7 +79,7 @@ namespace XMPP { namespace Jingle {
         inline Origin                     senders() const { return _senders; }
         inline QString                    contentName() const { return _contentName; }
         inline QSharedPointer<Transport>  transport() const { return _transport; }
-        inline TransportSelector *        transportSelector() const { return _transportSelector.data(); }
+        inline TransportSelector         *transportSelector() const { return _transportSelector.data(); }
         bool                              isRemote() const;
         inline bool                       isLocal() const { return !isRemote(); }
         inline ApplicationFlags           flags() const { return _flags; }
diff --git a/src/xmpp/xmpp-im/jingle-connection.h b/src/xmpp/xmpp-im/jingle-connection.h
index ff6b9e44..486026d1 100644
--- a/src/xmpp/xmpp-im/jingle-connection.h
+++ b/src/xmpp/xmpp-im/jingle-connection.h
@@ -42,9 +42,7 @@ namespace XMPP { namespace Jingle {
         bool       _valid = false;
         QByteArray _data;
         inline NetworkDatagram(const QByteArray &data, const QHostAddress &destinationAddress = QHostAddress(),
-                               quint16 port = 0) :
-            _valid(true),
-            _data(data)
+                               quint16 port = 0) : _valid(true), _data(data)
         {
             Q_UNUSED(destinationAddress);
             Q_UNUSED(port)
diff --git a/src/xmpp/xmpp-im/jingle-file.h b/src/xmpp/xmpp-im/jingle-file.h
index 2dc3cd1b..9bcb0dfd 100644
--- a/src/xmpp/xmpp-im/jingle-file.h
+++ b/src/xmpp/xmpp-im/jingle-file.h
@@ -45,7 +45,7 @@ class File {
     File(const File &other);
     File(const QDomElement &file);
     ~File();
-    File &      operator=(const File &other);
+    File       &operator=(const File &other);
     inline bool isValid() const { return d != nullptr; }
     QDomElement toXml(QDomDocument *doc) const;
     bool        merge(const File &other);
@@ -77,7 +77,7 @@ class File {
 
 private:
     class Private;
-    Private *                   ensureD();
+    Private                    *ensureD();
     QSharedDataPointer<Private> d;
 };
 
diff --git a/src/xmpp/xmpp-im/jingle-ft.cpp b/src/xmpp/xmpp-im/jingle-ft.cpp
index 43d8dc2f..b63a60b7 100644
--- a/src/xmpp/xmpp-im/jingle-ft.cpp
+++ b/src/xmpp/xmpp-im/jingle-ft.cpp
@@ -411,8 +411,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
     };
 
     Application::Application(const QSharedPointer<Pad> &pad, const QString &contentName, Origin creator,
-                             Origin senders) :
-        d(new Private)
+                             Origin senders) : d(new Private)
     {
         d->q         = this;
         _pad         = pad;
diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index 7d4a7969..bc9ab6f0 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -58,7 +58,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
         Pad(Manager *manager, Session *session);
         QDomElement         takeOutgoingSessionInfoUpdate() override;
         QString             ns() const override;
-        Session *           session() const override;
+        Session            *session() const override;
         ApplicationManager *manager() const override;
         QString             generateContentName(Origin senders) override;
         bool                incomingSessionInfo(const QDomElement &el) override;
diff --git a/src/xmpp/xmpp-im/jingle-ibb.cpp b/src/xmpp/xmpp-im/jingle-ibb.cpp
index dcb6732c..3b9b5661 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.cpp
+++ b/src/xmpp/xmpp-im/jingle-ibb.cpp
@@ -38,7 +38,7 @@ namespace XMPP { namespace Jingle { namespace IBB {
         Q_OBJECT
 
     public:
-        Client *       client;
+        Client        *client;
         Jid            peer;
         QString        sid;
         size_t         _blockSize;
@@ -138,7 +138,7 @@ namespace XMPP { namespace Jingle { namespace IBB {
     };
 
     struct Transport::Private {
-        Transport *                               q = nullptr;
+        Transport                                *q = nullptr;
         QMap<QString, QSharedPointer<Connection>> connections;
         size_t                                    defaultBlockSize = 4096;
         bool                                      started          = false;
@@ -314,7 +314,7 @@ namespace XMPP { namespace Jingle { namespace IBB {
 
         auto doc = _pad->session()->manager()->client()->doc();
         auto it  = std::find_if(d->connections.begin(), d->connections.end(),
-                               [](auto &c) { return c->state == State::ApprovedToSend; });
+                                [](auto &c) { return c->state == State::ApprovedToSend; });
 
         if (it == d->connections.end()) {
             if (ensureTransportElement) {
@@ -413,7 +413,7 @@ namespace XMPP { namespace Jingle { namespace IBB {
 
     struct Manager::Private {
         QHash<QPair<Jid, QString>, QSharedPointer<Connection>> connections;
-        XMPP::Jingle::Manager *                                jingleManager = nullptr;
+        XMPP::Jingle::Manager                                 *jingleManager = nullptr;
     };
 
     Manager::Manager(QObject *parent) : TransportManager(parent), d(new Private) { }
diff --git a/src/xmpp/xmpp-im/jingle-ibb.h b/src/xmpp/xmpp-im/jingle-ibb.h
index 96773228..7020a519 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.h
+++ b/src/xmpp/xmpp-im/jingle-ibb.h
@@ -62,7 +62,7 @@ namespace Jingle { namespace IBB {
 
         Pad(Manager *manager, Session *session);
         QString           ns() const override;
-        Session *         session() const override;
+        Session          *session() const override;
         TransportManager *manager() const override;
 
         Connection::Ptr makeConnection(const QString &sid, size_t blockSize);
@@ -82,7 +82,7 @@ namespace Jingle { namespace IBB {
         void                                    setJingleManager(XMPP::Jingle::Manager *jm) override;
         QSharedPointer<XMPP::Jingle::Transport> newTransport(const TransportManagerPad::Ptr &pad,
                                                              Origin                          creator) override;
-        TransportManagerPad *                   pad(Session *session) override;
+        TransportManagerPad                    *pad(Session *session) override;
 
         QStringList discoFeatures() const override;
 
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index 02d49a9a..fc63726a 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -443,7 +443,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
             NewSctpAssociation = 16
         };
 
-        Transport *                    q                         = nullptr;
+        Transport                     *q                         = nullptr;
         bool                           offerSent                 = false;
         bool                           aborted                   = false;
         bool                           initialOfferReady         = false;
@@ -461,9 +461,9 @@ namespace XMPP { namespace Jingle { namespace ICE {
         // QElapsedTimer      lastConnectionStart;
         // size_t             blockSize    = 8192;
         TcpPortDiscoverer *disco        = nullptr;
-        UdpPortReserver *  portReserver = nullptr;
+        UdpPortReserver   *portReserver = nullptr;
         Resolver           resolver;
-        XMPP::Ice176 *     ice = nullptr;
+        XMPP::Ice176      *ice = nullptr;
 
         Dtls::Setup localDtlsRole  = Dtls::ActPass;
         Dtls::Setup remoteDtlsRole = Dtls::ActPass;
diff --git a/src/xmpp/xmpp-im/jingle-ice.h b/src/xmpp/xmpp-im/jingle-ice.h
index 65a3cab0..58f858a4 100644
--- a/src/xmpp/xmpp-im/jingle-ice.h
+++ b/src/xmpp/xmpp-im/jingle-ice.h
@@ -20,9 +20,9 @@
 #ifndef JINGLE_ICE_H
 #define JINGLE_ICE_H
 
-#include "jingle-transport.h"
 #include "iris/tcpportreserver.h"
 #include "iris/xmpp.h"
+#include "jingle-transport.h"
 
 class QHostAddress;
 
@@ -71,15 +71,15 @@ namespace Jingle { namespace ICE {
 
         Pad(Manager *manager, Session *session);
         QString           ns() const override;
-        Session *         session() const override;
+        Session          *session() const override;
         TransportManager *manager() const override;
         void              onLocalAccepted() override;
 
         inline TcpPortScope *discoScope() const { return _discoScope; }
 
     private:
-        Manager *     _manager;
-        Session *     _session;
+        Manager      *_manager;
+        Session      *_session;
         TcpPortScope *_discoScope;
         bool          _allowGrouping = false;
     };
@@ -94,7 +94,7 @@ namespace Jingle { namespace ICE {
         void                                    setJingleManager(XMPP::Jingle::Manager *jm) override;
         QSharedPointer<XMPP::Jingle::Transport> newTransport(const TransportManagerPad::Ptr &pad,
                                                              Origin                          creator) override;
-        TransportManagerPad *                   pad(Session *session) override;
+        TransportManagerPad                    *pad(Session *session) override;
 
         QStringList ns() const override;
         QStringList discoFeatures() const override;
diff --git a/src/xmpp/xmpp-im/jingle-nstransportslist.h b/src/xmpp/xmpp-im/jingle-nstransportslist.h
index 6ed27d02..cc7c5363 100644
--- a/src/xmpp/xmpp-im/jingle-nstransportslist.h
+++ b/src/xmpp/xmpp-im/jingle-nstransportslist.h
@@ -44,7 +44,7 @@ namespace XMPP { namespace Jingle {
         bool replace(QSharedPointer<Transport> old, QSharedPointer<Transport> newer) override;
 
     private:
-        Session *   _session = nullptr;
+        Session    *_session = nullptr;
         QStringList _transports;
     };
 
diff --git a/src/xmpp/xmpp-im/jingle-s5b.cpp b/src/xmpp/xmpp-im/jingle-s5b.cpp
index 29bbdcd1..929041bf 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.cpp
+++ b/src/xmpp/xmpp-im/jingle-s5b.cpp
@@ -51,7 +51,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
         Q_OBJECT
 
         QList<NetworkDatagram> datagrams;
-        SocksClient *          client = nullptr;
+        SocksClient           *client = nullptr;
         Transport::Mode        mode   = Transport::Tcp;
 
     public:
@@ -137,7 +137,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
         Q_OBJECT
 
         QMap<QString, SocksClient *> clients;
-        SocksClient *                client = nullptr;
+        SocksClient                 *client = nullptr;
 
     public:
         using QObject::QObject;
@@ -236,7 +236,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
         Candidate::State    state    = Candidate::New;
 
         QSharedPointer<S5BServer> server;
-        SocksClient *             socksClient = nullptr;
+        SocksClient              *socksClient = nullptr;
 
         QString toString() const
         {
@@ -389,8 +389,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
     }
 
     Candidate::Candidate(Transport *transport, const TcpPortServer::Ptr &server, const QString &cid,
-                         quint16 localPreference) :
-        d(new Private)
+                         quint16 localPreference) : d(new Private)
     {
         Type type = None;
         switch (server->portType()) {
@@ -582,7 +581,7 @@ namespace XMPP { namespace Jingle { namespace S5B {
     public:
         enum PendingActions { NewCandidate = 1, CandidateUsed = 2, CandidateError = 4, Activated = 8, ProxyError = 16 };
 
-        Transport *                  q                            = nullptr;
+        Transport                   *q                            = nullptr;
         bool                         p2pAllowed                   = true;
         bool                         offerSent                    = false;
         bool                         waitingAck                   = true;
diff --git a/src/xmpp/xmpp-im/jingle-s5b.h b/src/xmpp/xmpp-im/jingle-s5b.h
index dad9f65f..91376179 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.h
+++ b/src/xmpp/xmpp-im/jingle-s5b.h
@@ -20,8 +20,8 @@
 #ifndef JINGLE_S5B_H
 #define JINGLE_S5B_H
 
-#include "jingle-transport.h"
 #include "iris/tcpportreserver.h"
+#include "jingle-transport.h"
 
 class QHostAddress;
 class SocksClient;
@@ -85,7 +85,7 @@ namespace Jingle { namespace S5B {
         Candidate(Transport *transport, const TcpPortServer::Ptr &server, const QString &cid,
                   quint16 localPreference = 0);
         ~Candidate();
-        Candidate &        operator=(const Candidate &other) = default;
+        Candidate         &operator=(const Candidate &other) = default;
         inline bool        isValid() const { return d != nullptr; }
         inline             operator bool() const { return isValid(); }
         Type               type() const;
@@ -110,7 +110,7 @@ namespace Jingle { namespace S5B {
         void               connectToHost(const QString &key, State successState, QObject *callbackContext,
                                          std::function<void(bool)> callback, bool isUdp = false);
         bool               incomingConnection(SocksClient *sc);
-        SocksClient *      takeSocksClient();
+        SocksClient       *takeSocksClient();
         void               deleteSocksClient();
         TcpPortServer::Ptr server() const;
         bool               isConnected() const;
@@ -163,7 +163,7 @@ namespace Jingle { namespace S5B {
 
         Pad(Manager *manager, Session *session);
         QString           ns() const override;
-        Session *         session() const override;
+        Session          *session() const override;
         TransportManager *manager() const override;
 
         QString generateSid() const;
@@ -172,8 +172,8 @@ namespace Jingle { namespace S5B {
         inline TcpPortScope *discoScope() const { return _discoScope; }
 
     private:
-        Manager *     _manager;
-        Session *     _session;
+        Manager      *_manager;
+        Session      *_session;
         TcpPortScope *_discoScope;
     };
 
@@ -187,7 +187,7 @@ namespace Jingle { namespace S5B {
         void                                    setJingleManager(XMPP::Jingle::Manager *jm) override;
         QSharedPointer<XMPP::Jingle::Transport> newTransport(const TransportManagerPad::Ptr &pad,
                                                              Origin                          creator) override;
-        TransportManagerPad *                   pad(Session *session) override;
+        TransportManagerPad                    *pad(Session *session) override;
 
         QStringList discoFeatures() const override;
 
diff --git a/src/xmpp/xmpp-im/jingle-sctp-association_p.h b/src/xmpp/xmpp-im/jingle-sctp-association_p.h
index d13c183f..312e715c 100644
--- a/src/xmpp/xmpp-im/jingle-sctp-association_p.h
+++ b/src/xmpp/xmpp-im/jingle-sctp-association_p.h
@@ -48,7 +48,7 @@ namespace XMPP { namespace Jingle { namespace SCTP {
     public:
         using QualifiedOutgoingMessage = std::pair<Connection::Ptr, WebRTCDataChannel::OutgoingDatagram>;
 
-        Association *                    q;
+        Association                     *q;
         Keeper::Ptr                      keeper;
         QQueue<QByteArray>               outgoingPacketsQueue; // ready to be sent over dtls
         QQueue<QualifiedOutgoingMessage> outgoingMessageQueue; // ready to be processed by sctp stack
diff --git a/src/xmpp/xmpp-im/jingle-session.cpp b/src/xmpp/xmpp-im/jingle-session.cpp
index 034f0eec..f0323406 100644
--- a/src/xmpp/xmpp-im/jingle-session.cpp
+++ b/src/xmpp/xmpp-im/jingle-session.cpp
@@ -542,7 +542,7 @@ namespace XMPP { namespace Jingle {
 
                 Private::AddContentError err;
                 Reason::Condition        cond;
-                Application *            app;
+                Application             *app;
 
                 std::tie(err, cond, app) = parseContentAdd(ce);
                 if (err == Private::AddContentError::Unparsed) {
@@ -640,7 +640,7 @@ namespace XMPP { namespace Jingle {
 
                 Private::AddContentError err;
                 Reason::Condition        cond;
-                Application *            app;
+                Application             *app;
 
                 std::tie(err, cond, app) = parseContentAccept(ce);
                 if (err == Private::AddContentError::Unparsed || err == Private::AddContentError::Unexpected) {
@@ -885,7 +885,7 @@ namespace XMPP { namespace Jingle {
             }
 
             for (auto &v : passed) {
-                Application *             app;
+                Application              *app;
                 QSharedPointer<Transport> transport;
                 QDomElement               ce;
                 std::tie(app, transport, ce) = v;
diff --git a/src/xmpp/xmpp-im/jingle-session.h b/src/xmpp/xmpp-im/jingle-session.h
index a3df3ce1..07425323 100644
--- a/src/xmpp/xmpp-im/jingle-session.h
+++ b/src/xmpp/xmpp-im/jingle-session.h
@@ -59,7 +59,7 @@ namespace XMPP { namespace Jingle {
         // make new local content but do not add it to session yet
         Application *newContent(const QString &ns, Origin senders = Origin::Both);
         // get registered content if any
-        Application *                          content(const QString &contentName, Origin creator);
+        Application                           *content(const QString &contentName, Origin creator);
         void                                   addContent(Application *content);
         const QMap<ContentKey, Application *> &contentList() const;
         void                                   setGrouping(const QString &groupType, const QStringList &group);
diff --git a/src/xmpp/xmpp-im/jingle-transport.h b/src/xmpp/xmpp-im/jingle-transport.h
index 3b2c2e1f..84c8b19f 100644
--- a/src/xmpp/xmpp-im/jingle-transport.h
+++ b/src/xmpp/xmpp-im/jingle-transport.h
@@ -244,7 +244,7 @@ namespace XMPP { namespace Jingle {
 
         // FIXME rename methods
         virtual QSharedPointer<Transport> newTransport(const TransportManagerPad::Ptr &pad, Origin creator) = 0;
-        virtual TransportManagerPad *     pad(Session *session)                                             = 0;
+        virtual TransportManagerPad      *pad(Session *session)                                             = 0;
 
         // this method is supposed to gracefully close all related sessions as a preparation for plugin unload for
         // example
diff --git a/src/xmpp/xmpp-im/jingle-webrtc-datachannel_p.cpp b/src/xmpp/xmpp-im/jingle-webrtc-datachannel_p.cpp
index 5aa3053a..501d641e 100644
--- a/src/xmpp/xmpp-im/jingle-webrtc-datachannel_p.cpp
+++ b/src/xmpp/xmpp-im/jingle-webrtc-datachannel_p.cpp
@@ -27,14 +27,13 @@ namespace XMPP { namespace Jingle { namespace SCTP {
     WebRTCDataChannel::WebRTCDataChannel(AssociationPrivate *association, quint8 channelType, quint32 reliability,
                                          quint16 priority, const QString &label, const QString &protocol,
                                          DcepState state) :
-        association(association),
-        channelType(channelType), reliability(reliability), priority(priority), label(label), protocol(protocol),
-        dcepState(state)
+        association(association), channelType(channelType), reliability(reliability), priority(priority), label(label),
+        protocol(protocol), dcepState(state)
     {
     }
 
     QSharedPointer<WebRTCDataChannel> WebRTCDataChannel::fromChannelOpen(AssociationPrivate *assoc,
-                                                                         const QByteArray &  data)
+                                                                         const QByteArray   &data)
     {
         /*
           0                   1                   2                   3
@@ -75,7 +74,7 @@ namespace XMPP { namespace Jingle { namespace SCTP {
         QString protocol = QString::fromUtf8(data.data() + protoOff, protocolLength);
         // start with DcepNegotiated since caller will ack asap
         auto channel       = QSharedPointer<WebRTCDataChannel>::create(assoc, channelType, priority, reliability, label,
-                                                                 protocol, DcepNegotiated);
+                                                                       protocol, DcepNegotiated);
         channel->_isRemote = true;
         channel->setOpenMode(QIODevice::ReadWrite);
         return channel;
diff --git a/src/xmpp/xmpp-im/jingle-webrtc-datachannel_p.h b/src/xmpp/xmpp-im/jingle-webrtc-datachannel_p.h
index d1eb09ec..031d30c7 100644
--- a/src/xmpp/xmpp-im/jingle-webrtc-datachannel_p.h
+++ b/src/xmpp/xmpp-im/jingle-webrtc-datachannel_p.h
@@ -49,7 +49,7 @@ namespace XMPP { namespace Jingle { namespace SCTP {
 
         using OutgoingCallback = std::function<void(const OutgoingDatagram &)>;
 
-        AssociationPrivate *   association;
+        AssociationPrivate    *association;
         QList<NetworkDatagram> datagrams;
         DisconnectReason       disconnectReason = ChannelClosed;
         std::size_t            outgoingBufSize  = 0;
diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index 887f279a..4819c866 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -486,7 +486,7 @@ namespace XMPP { namespace Jingle {
                           const QString &text = QString(), const QDomElement &jingleErr = QDomElement())
         {
             auto          resp = createIQ(client()->doc(), "error", iq.attribute(QStringLiteral("from")),
-                                 iq.attribute(QStringLiteral("id")));
+                                          iq.attribute(QStringLiteral("id")));
             Stanza::Error error(errType, errCond, text);
             auto          errEl = error.toXml(*client()->doc(), client()->stream().baseNS());
             if (!jingleErr.isNull()) {
@@ -533,8 +533,8 @@ namespace XMPP { namespace Jingle {
     //----------------------------------------------------------------------------
     class Manager::Private {
     public:
-        XMPP::Client *         client;
-        Manager *              manager;
+        XMPP::Client          *client;
+        Manager               *manager;
         QScopedPointer<JTPush> pushTask;
         // ns -> application
         std::map<QString, QPointer<ApplicationManager>> applicationManagers;
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index 014c5e6f..9763926d 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -22,9 +22,9 @@
 
 #include "iris/xmpp_stanza.h"
 
+#include <QObject>
 #include <QSharedDataPointer>
 #include <QSharedPointer>
-#include <QObject>
 
 #include <functional>
 
@@ -208,15 +208,15 @@ namespace Jingle {
         inline bool    isValid() const { return d != nullptr; }
         Action         action() const;
         const QString &sid() const;
-        const Jid &    initiator() const;
+        const Jid     &initiator() const;
         void           setInitiator(const Jid &jid);
-        const Jid &    responder() const;
+        const Jid     &responder() const;
         void           setResponder(const Jid &jid);
 
     private:
         class Private;
         QSharedDataPointer<Private> d;
-        Jingle::Private *           ensureD();
+        Jingle::Private            *ensureD();
     };
 
     class Reason {
@@ -249,7 +249,7 @@ namespace Jingle {
         Reason(Condition cond, const QString &text = QString());
         Reason(const QDomElement &el);
         Reason(const Reason &other);
-        Reason &    operator=(const Reason &);
+        Reason     &operator=(const Reason &);
         inline bool isValid() const { return d != nullptr; }
         Condition   condition() const;
         void        setCondition(Condition cond);
@@ -286,8 +286,7 @@ namespace Jingle {
         QString disposition; // default "session"
     };
 
-    class Security {
-    };
+    class Security { };
 
     /**
      * @brief The SessionManagerPad class - TransportManager/AppManager PAD
@@ -310,7 +309,7 @@ namespace Jingle {
     public:
         virtual QDomElement takeOutgoingSessionInfoUpdate();
         virtual QString     ns() const      = 0;
-        virtual Session *   session() const = 0;
+        virtual Session    *session() const = 0;
 
         virtual void onLocalAccepted(); // changing to prepare state
         virtual void onSend();          // local stuff is prepared we are going to send it to remote
@@ -344,13 +343,13 @@ namespace Jingle {
         void                   registerApplication(ApplicationManager *app);
         void                   unregisterApp(const QString &ns);
         bool                   isRegisteredApplication(const QString &ns);
-        ApplicationManagerPad *applicationPad(Session *      session,
+        ApplicationManagerPad *applicationPad(Session       *session,
                                               const QString &ns); // allocates new pad on application manager
 
         void                 registerTransport(TransportManager *transport);
         void                 unregisterTransport(const QString &ns);
         bool                 isRegisteredTransport(const QString &ns);
-        TransportManagerPad *transportPad(Session *      session,
+        TransportManagerPad *transportPad(Session       *session,
                                           const QString &ns); // allocates new pad on transport manager
         QStringList          availableTransports(const TransportFeatures &features = TransportFeatures()) const;
 
@@ -364,8 +363,8 @@ namespace Jingle {
         bool isAllowedParty(const Jid &jid) const;
         void setRemoteJidChecker(std::function<bool(const Jid &)> checker);
 
-        Session *           session(const Jid &remoteJid, const QString &sid);
-        Session *           newSession(const Jid &j);
+        Session            *session(const Jid &remoteJid, const QString &sid);
+        Session            *newSession(const Jid &j);
         QString             registerSession(Session *session);
         XMPP::Stanza::Error lastError() const;
 
diff --git a/src/xmpp/xmpp-im/s5b.cpp b/src/xmpp/xmpp-im/s5b.cpp
index 24300804..c0b9b18a 100644
--- a/src/xmpp/xmpp-im/s5b.cpp
+++ b/src/xmpp/xmpp-im/s5b.cpp
@@ -40,7 +40,7 @@
 #endif
 
 #define MAXSTREAMHOSTS 5
-//#define S5B_DEBUG
+// #define S5B_DEBUG
 
 static const char *S5B_NS = "http://jabber.org/protocol/bytestreams";
 
@@ -73,20 +73,20 @@ class S5BManager::Item : public QObject {
     enum { ErrRefused, ErrConnect, ErrWrongHost, ErrProxy };
     enum { Unknown, Fast, NotFast };
 
-    S5BManager *                     m     = nullptr;
+    S5BManager                      *m     = nullptr;
     int                              state = 0;
     QString                          sid, key, out_key, out_id, in_id;
     Jid                              self, peer;
     StreamHostList                   in_hosts;
-    JT_S5B *                         task       = nullptr;
-    JT_S5B *                         proxy_task = nullptr;
+    JT_S5B                          *task       = nullptr;
+    JT_S5B                          *proxy_task = nullptr;
     QList<QSharedPointer<S5BServer>> relatedServers;
-    SocksClient *                    client         = nullptr;
-    SocksClient *                    client_out     = nullptr;
-    SocksUDP *                       client_udp     = nullptr;
-    SocksUDP *                       client_out_udp = nullptr;
-    S5BConnector *                   conn           = nullptr;
-    S5BConnector *                   proxy_conn     = nullptr;
+    SocksClient                     *client         = nullptr;
+    SocksClient                     *client_out     = nullptr;
+    SocksUDP                        *client_udp     = nullptr;
+    SocksUDP                        *client_out_udp = nullptr;
+    S5BConnector                    *conn           = nullptr;
+    S5BConnector                    *proxy_conn     = nullptr;
     // S5BServersManager::S5BLocalServers *localServ = nullptr;
     bool       wantFast = false;
     StreamHost proxy;
@@ -158,9 +158,9 @@ QByteArray S5BDatagram::data() const { return _buf; }
 //----------------------------------------------------------------------------
 class S5BConnection::Private {
 public:
-    S5BManager *         m;
-    SocksClient *        sc;
-    SocksUDP *           su;
+    S5BManager          *m;
+    SocksClient         *sc;
+    SocksUDP            *su;
     int                  state;
     Jid                  peer;
     QString              sid;
@@ -503,9 +503,9 @@ class S5BManager::Entry {
     ~Entry() { delete query; }
 
     S5BConnection *c = nullptr;
-    Item *         i = nullptr;
+    Item          *i = nullptr;
     QString        sid;
-    JT_S5B *       query = nullptr;
+    JT_S5B        *query = nullptr;
     StreamHost     proxyInfo;
 
     bool         udp_init = false;
@@ -515,10 +515,10 @@ class S5BManager::Entry {
 
 class S5BManager::Private {
 public:
-    Client *          client;
+    Client           *client;
     QList<Entry *>    activeList;
     S5BConnectionList incomingConns;
-    JT_PushS5B *      ps;
+    JT_PushS5B       *ps;
 };
 
 S5BManager::S5BManager(Client *parent) : BytestreamManager(parent)
@@ -832,7 +832,7 @@ void S5BManager::con_sendUDP(S5BConnection *c, const QByteArray &buf)
 
 void S5BManager::item_accepted()
 {
-    Item * i = static_cast<Item *>(sender());
+    Item  *i = static_cast<Item *>(sender());
     Entry *e = findEntry(i);
 
     emit e->c->accepted(); // signal
@@ -840,7 +840,7 @@ void S5BManager::item_accepted()
 
 void S5BManager::item_tryingHosts(const StreamHostList &list)
 {
-    Item * i = static_cast<Item *>(sender());
+    Item  *i = static_cast<Item *>(sender());
     Entry *e = findEntry(i);
 
     emit e->c->tryingHosts(list); // signal
@@ -848,7 +848,7 @@ void S5BManager::item_tryingHosts(const StreamHostList &list)
 
 void S5BManager::item_proxyConnect()
 {
-    Item * i = static_cast<Item *>(sender());
+    Item  *i = static_cast<Item *>(sender());
     Entry *e = findEntry(i);
 
     emit e->c->proxyConnect(); // signal
@@ -856,7 +856,7 @@ void S5BManager::item_proxyConnect()
 
 void S5BManager::item_waitingForActivation()
 {
-    Item * i = static_cast<Item *>(sender());
+    Item  *i = static_cast<Item *>(sender());
     Entry *e = findEntry(i);
 
     emit e->c->waitingForActivation(); // signal
@@ -864,7 +864,7 @@ void S5BManager::item_waitingForActivation()
 
 void S5BManager::item_connected()
 {
-    Item * i = static_cast<Item *>(sender());
+    Item  *i = static_cast<Item *>(sender());
     Entry *e = findEntry(i);
 
     // grab the client
@@ -879,7 +879,7 @@ void S5BManager::item_connected()
 
 void S5BManager::item_error(int x)
 {
-    Item * i = static_cast<Item *>(sender());
+    Item  *i = static_cast<Item *>(sender());
     Entry *e = findEntry(i);
 
     e->c->man_failed(x);
@@ -925,7 +925,7 @@ void S5BManager::queryProxy(Entry *e)
 void S5BManager::query_finished()
 {
     JT_S5B *query = static_cast<JT_S5B *>(sender());
-    Entry * e     = nullptr;
+    Entry  *e     = nullptr;
     for (Entry *i : std::as_const(d->activeList)) {
         if (i->query == query) {
             e = i;
@@ -1310,7 +1310,7 @@ void S5BManager::Item::conn_result(bool b)
 {
     if (b) {
         SocksClient *sc     = conn->takeClient();
-        SocksUDP *   sc_udp = conn->takeUDP();
+        SocksUDP    *sc_udp = conn->takeUDP();
         StreamHost   h      = conn->streamHostUsed();
         delete conn;
         conn        = nullptr;
@@ -1364,7 +1364,7 @@ void S5BManager::Item::proxy_result(bool b)
 #endif
     if (b) {
         SocksClient *sc     = proxy_conn->takeClient();
-        SocksUDP *   sc_udp = proxy_conn->takeUDP();
+        SocksUDP    *sc_udp = proxy_conn->takeUDP();
         delete proxy_conn;
         proxy_conn = nullptr;
 
@@ -1614,7 +1614,7 @@ class S5BConnector::Item : public QObject {
     Q_OBJECT
 public:
     SocksClient *client;
-    SocksUDP *   client_udp;
+    SocksUDP    *client_udp;
     StreamHost   host;
     QString      key;
     bool         udp;
@@ -1706,8 +1706,8 @@ private slots:
 
 class S5BConnector::Private {
 public:
-    SocksClient * active;
-    SocksUDP *    active_udp;
+    SocksClient  *active;
+    SocksUDP     *active_udp;
     QList<Item *> itemList;
     QString       key;
     StreamHost    activeHost;
diff --git a/src/xmpp/xmpp-im/s5b.h b/src/xmpp/xmpp-im/s5b.h
index 2dd3fed1..5343d3e7 100644
--- a/src/xmpp/xmpp-im/s5b.h
+++ b/src/xmpp/xmpp-im/s5b.h
@@ -21,11 +21,11 @@
 #define XMPP_S5B_H
 
 #include "iris/bytestream.h"
-#include "xmpp/jid/jid.h"
+#include "iris/tcpportreserver.h"
 #include "iris/xmpp_bytestream.h"
 #include "iris/xmpp_stanza.h"
 #include "iris/xmpp_task.h"
-#include "iris/tcpportreserver.h"
+#include "xmpp/jid/jid.h"
 
 #include <QHostAddress>
 #include <QList>
@@ -143,12 +143,12 @@ class S5BManager : public BytestreamManager {
     ~S5BManager();
 
     static const char *ns();
-    Client *           client() const;
-    JT_PushS5B *       jtPush() const;
+    Client            *client() const;
+    JT_PushS5B        *jtPush() const;
 
     bool isAcceptableSID(const Jid &peer, const QString &sid) const;
 
-    BSConnection * createConnection();
+    BSConnection  *createConnection();
     S5BConnection *takeIncoming();
 
     class Item;
@@ -174,10 +174,10 @@ private slots:
     Private *d;
 
     S5BConnection *findIncoming(const Jid &from, const QString &sid) const;
-    Entry *        findEntry(S5BConnection *) const;
-    Entry *        findEntry(Item *) const;
-    Entry *        findEntryByHash(const QString &key) const;
-    Entry *        findEntryBySID(const Jid &peer, const QString &sid) const;
+    Entry         *findEntry(S5BConnection *) const;
+    Entry         *findEntry(Item *) const;
+    Entry         *findEntryByHash(const QString &key) const;
+    Entry         *findEntryBySID(const Jid &peer, const QString &sid) const;
 
     void entryContinue(Entry *e);
     void queryProxy(Entry *e);
@@ -210,7 +210,7 @@ class S5BConnector : public QObject {
     void         resetConnection();
     void         start(const Jid &self, const StreamHostList &hosts, const QString &key, bool udp, int timeout);
     SocksClient *takeClient();
-    SocksUDP *   takeUDP();
+    SocksUDP    *takeUDP();
     StreamHost   streamHostUsed() const;
 
     class Item;
@@ -315,7 +315,7 @@ class StreamHost {
 public:
     StreamHost();
 
-    const Jid &    jid() const;
+    const Jid     &jid() const;
     const QString &host() const;
     int            port() const;
     bool           isProxy() const;
diff --git a/src/xmpp/xmpp-im/stundisco.cpp b/src/xmpp/xmpp-im/stundisco.cpp
index 4d29b587..0ef2405c 100644
--- a/src/xmpp/xmpp-im/stundisco.cpp
+++ b/src/xmpp/xmpp-im/stundisco.cpp
@@ -217,7 +217,7 @@ class StunDiscoMonitor : public AbstractStunDisco {
         }
     }
 
-    StunDiscoManager *                     manager_;
+    StunDiscoManager                      *manager_;
     bool                                   inProgress_ = false; // initial disco
     QList<AbstractStunDisco::Service::Ptr> pendingWork_;
 };
diff --git a/src/xmpp/xmpp-im/stundisco.h b/src/xmpp/xmpp-im/stundisco.h
index 3560cf7d..17d645da 100644
--- a/src/xmpp/xmpp-im/stundisco.h
+++ b/src/xmpp/xmpp-im/stundisco.h
@@ -36,7 +36,7 @@ class StunDiscoManager : public QObject {
     ~StunDiscoManager();
 
     AbstractStunDisco *createMonitor();
-    inline Client *    client() const { return client_; }
+    inline Client     *client() const { return client_; }
 
 private:
     Client *client_;
diff --git a/src/xmpp/xmpp-im/types.cpp b/src/xmpp/xmpp-im/types.cpp
index b0e89223..509109a2 100644
--- a/src/xmpp/xmpp-im/types.cpp
+++ b/src/xmpp/xmpp-im/types.cpp
@@ -664,9 +664,8 @@ void HTMLElement::filterOutUnwantedRecursive(QDomElement &el, bool strict)
 {
     Q_UNUSED(strict) // TODO filter out not xhtml-im elements
 
-    static QSet<QString> unwanted = QSet<QString>() << "script"
-                                                    << "iframe";
-    QDomNode child = el.firstChild();
+    static QSet<QString> unwanted = QSet<QString>() << "script" << "iframe";
+    QDomNode             child    = el.firstChild();
     while (!child.isNull()) {
         QDomNode sibling = child.nextSibling();
         if (child.isElement()) {
@@ -870,7 +869,7 @@ void Message::setFrom(const Jid &j)
 
 void Message::setId(const QString &s)
 {
-    MessageD()->id = s;
+    MessageD()->id       = s;
     MessageD()->originId = s;
 }
 
@@ -2513,7 +2512,7 @@ Roster::Roster(const Roster &other) : QList<RosterItem>(other), d(new Roster::Pr
 Roster &Roster::operator=(const Roster &other)
 {
     QList<RosterItem>::operator=(other);
-    d->groupsDelimiter         = other.d->groupsDelimiter;
+    d->groupsDelimiter = other.d->groupsDelimiter;
     return *this;
 }
 
diff --git a/src/xmpp/xmpp-im/xmpp_address.h b/src/xmpp/xmpp-im/xmpp_address.h
index 7fd04ae2..24115fda 100644
--- a/src/xmpp/xmpp-im/xmpp_address.h
+++ b/src/xmpp/xmpp-im/xmpp_address.h
@@ -19,8 +19,8 @@
 #ifndef XMPP_ADDRESS_H
 #define XMPP_ADDRESS_H
 
-#include "xmpp/jid/jid.h"
 #include "iris/xmpp_stanza.h"
+#include "xmpp/jid/jid.h"
 
 #include <QString>
 
@@ -34,7 +34,7 @@ class Address {
     Address(Type type = Unknown, const Jid &jid = Jid());
     Address(const QDomElement &);
 
-    const Jid &    jid() const;
+    const Jid     &jid() const;
     const QString &uri() const;
     const QString &node() const;
     const QString &desc() const;
diff --git a/src/xmpp/xmpp-im/xmpp_agentitem.h b/src/xmpp/xmpp-im/xmpp_agentitem.h
index adb958d3..fb5e4a4f 100644
--- a/src/xmpp/xmpp-im/xmpp_agentitem.h
+++ b/src/xmpp/xmpp-im/xmpp_agentitem.h
@@ -30,10 +30,10 @@ class AgentItem {
 public:
     AgentItem() { }
 
-    const Jid &     jid() const { return v_jid; }
-    const QString & name() const { return v_name; }
-    const QString & category() const { return v_category; }
-    const QString & type() const { return v_type; }
+    const Jid      &jid() const { return v_jid; }
+    const QString  &name() const { return v_name; }
+    const QString  &category() const { return v_category; }
+    const QString  &type() const { return v_type; }
     const Features &features() const { return v_features; }
 
     void setJid(const Jid &j) { v_jid = j; }
diff --git a/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp b/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp
index 9f9f8e69..9cf164f7 100644
--- a/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp
+++ b/src/xmpp/xmpp-im/xmpp_bitsofbinary.cpp
@@ -59,7 +59,7 @@ Hash BoBData::cidToHash(const QString &cid)
 {
     if (!cid.endsWith(QLatin1String("@bob.xmpp.org")))
         return Hash();
-    return Hash::from(QStringView{cid}.left(cid.size() - sizeof("@bob.xmpp.org") + 1));
+    return Hash::from(QStringView { cid }.left(cid.size() - sizeof("@bob.xmpp.org") + 1));
 }
 
 QString BoBData::cid() const
diff --git a/src/xmpp/xmpp-im/xmpp_bitsofbinary.h b/src/xmpp/xmpp-im/xmpp_bitsofbinary.h
index e871d635..9c9f45f0 100644
--- a/src/xmpp/xmpp-im/xmpp_bitsofbinary.h
+++ b/src/xmpp/xmpp-im/xmpp_bitsofbinary.h
@@ -87,12 +87,12 @@ class BoBManager : public QObject {
     BoBData bobData(const QString &);
     // file data, mime type, max age in seconds
     BoBData append(const QByteArray &data, const QString &type, unsigned int maxAge = 0);
-    Hash    append(QFile &        file,
+    Hash    append(QFile         &file,
                    const QString &type = "application/octet-stream"); // this method adds just to runtime cache
     void    append(const BoBData &);
 
 private:
-    BoBCache *                                 _cache;
+    BoBCache                                  *_cache;
     QHash<XMPP::Hash, QPair<QString, QString>> _localFiles; // cid => (filename, mime)
 };
 } // namespace XMPP
diff --git a/src/xmpp/xmpp-im/xmpp_caps.cpp b/src/xmpp/xmpp-im/xmpp_caps.cpp
index 8100f125..5b53725b 100644
--- a/src/xmpp/xmpp-im/xmpp_caps.cpp
+++ b/src/xmpp/xmpp-im/xmpp_caps.cpp
@@ -390,7 +390,7 @@ QString CapsManager::clientName(const Jid &jid) const
                 ds = 5;
             }
 
-            name = QStringView{node}.mid(startPos, node.size() - startPos - ds).toString();
+            name = QStringView { node }.mid(startPos, node.size() - startPos - ds).toString();
         }
 
         return name;
diff --git a/src/xmpp/xmpp-im/xmpp_caps.h b/src/xmpp/xmpp-im/xmpp_caps.h
index 06038dfa..c528af9a 100644
--- a/src/xmpp/xmpp-im/xmpp_caps.h
+++ b/src/xmpp/xmpp-im/xmpp_caps.h
@@ -34,7 +34,7 @@ class CapsInfo {
     {
     }
     inline bool                   isValid() const { return _lastSeen.isValid(); }
-    inline const QDateTime &      lastSeen() const { return _lastSeen; }
+    inline const QDateTime       &lastSeen() const { return _lastSeen; }
     inline const XMPP::DiscoItem &disco() const { return _disco; }
     QDomElement                   toXml(QDomDocument *doc) const;
     static CapsInfo               fromXml(const QDomElement &ci);
@@ -69,7 +69,7 @@ public slots:
     virtual QByteArray loadData();                       // to have permanent cache
 
 private:
-    static CapsRegistry *    instance_;
+    static CapsRegistry     *instance_;
     QHash<QString, CapsInfo> capsInfo_;
 };
 
@@ -107,7 +107,7 @@ protected slots:
     void capsRegistered(const CapsSpec &);
 
 private:
-    Client *                      client_;
+    Client                       *client_;
     bool                          isEnabled_;
     QMap<QString, CapsSpec>       capsSpecs_;
     QMap<QString, QList<QString>> capsJids_;
diff --git a/src/xmpp/xmpp-im/xmpp_captcha.h b/src/xmpp/xmpp-im/xmpp_captcha.h
index 23af0d31..9f94eb47 100644
--- a/src/xmpp/xmpp-im/xmpp_captcha.h
+++ b/src/xmpp/xmpp-im/xmpp_captcha.h
@@ -45,9 +45,9 @@ class CaptchaChallenge {
     CaptchaChallenge &operator=(const CaptchaChallenge &);
 
     bool           isValid() const;
-    const Jid &    offendedJid() const;
-    const Jid &    arbiter() const;
-    const XData &  form() const;
+    const Jid     &offendedJid() const;
+    const Jid     &arbiter() const;
+    const XData   &form() const;
     QString        explanation() const;
     const UrlList &urls() const;
     State          state() const;
diff --git a/src/xmpp/xmpp-im/xmpp_client.h b/src/xmpp/xmpp-im/xmpp_client.h
index 03c5af8c..58e5f918 100644
--- a/src/xmpp/xmpp-im/xmpp_client.h
+++ b/src/xmpp/xmpp-im/xmpp_client.h
@@ -86,9 +86,9 @@ class Client : public QObject {
     void close(bool fast = false);
 
     bool                hasStream() const;
-    Stream &            stream();
+    Stream             &stream();
     QString             streamBaseNS() const;
-    const LiveRoster &  roster() const;
+    const LiveRoster   &roster() const;
     const ResourceList &resourceList() const;
     bool                isSessionRequired() const;
 
@@ -112,7 +112,7 @@ class Client : public QObject {
 
     void          debug(const QString &);
     QString       genUniqueId();
-    Task *        rootTask();
+    Task         *rootTask();
     QDomDocument *doc() const;
 
     QString  OSName() const;
@@ -144,20 +144,20 @@ class Client : public QObject {
     bool            capsOptimizationAllowed() const;
 
     void                      setTcpPortReserver(TcpPortReserver *portReserver);
-    TcpPortReserver *         tcpPortReserver() const;
-    S5BManager *              s5bManager() const;
-    IBBManager *              ibbManager() const;
-    BoBManager *              bobManager() const;
-    JidLinkManager *          jidLinkManager() const;
-    CapsManager *             capsManager() const;
-    ServerInfoManager *       serverInfoManager() const;
+    TcpPortReserver          *tcpPortReserver() const;
+    S5BManager               *s5bManager() const;
+    IBBManager               *ibbManager() const;
+    BoBManager               *bobManager() const;
+    JidLinkManager           *jidLinkManager() const;
+    CapsManager              *capsManager() const;
+    ServerInfoManager        *serverInfoManager() const;
     ExternalServiceDiscovery *externalServiceDiscovery() const;
-    StunDiscoManager *        stunDiscoManager() const;
-    HttpFileUploadManager *   httpFileUploadManager() const;
-    Jingle::Manager *         jingleManager() const;
-    Jingle::S5B::Manager *    jingleS5BManager() const;
-    Jingle::IBB::Manager *    jingleIBBManager() const;
-    Jingle::ICE::Manager *    jingleICEManager() const;
+    StunDiscoManager         *stunDiscoManager() const;
+    HttpFileUploadManager    *httpFileUploadManager() const;
+    Jingle::Manager          *jingleManager() const;
+    Jingle::S5B::Manager     *jingleS5BManager() const;
+    Jingle::IBB::Manager     *jingleIBBManager() const;
+    Jingle::ICE::Manager     *jingleICEManager() const;
 
     void                 setFileTransferEnabled(bool b);
     FileTransferManager *fileTransferManager() const;
@@ -165,7 +165,7 @@ class Client : public QObject {
     QString groupChatPassword(const QString &host, const QString &room) const;
     bool    groupChatJoin(const QString &host, const QString &room, const QString &nick,
                           const QString &password = QString(), int maxchars = -1, int maxstanzas = -1, int seconds = -1,
-                          const QDateTime &since = QDateTime(), const Status & = Status());
+                          const QDateTime &since = QDateTime(), const Status    & = Status());
     void    groupChatSetStatus(const QString &host, const QString &room, const Status &);
     void    groupChatChangeNick(const QString &host, const QString &room, const QString &nick, const Status &);
     void    groupChatLeave(const QString &host, const QString &room, const QString &statusStr = QString());
diff --git a/src/xmpp/xmpp-im/xmpp_discoinfotask.h b/src/xmpp/xmpp-im/xmpp_discoinfotask.h
index a5f4da11..81023223 100644
--- a/src/xmpp/xmpp-im/xmpp_discoinfotask.h
+++ b/src/xmpp/xmpp-im/xmpp_discoinfotask.h
@@ -41,8 +41,8 @@ class DiscoInfoTask : public Task {
     void get(const DiscoItem &);
 
     const DiscoItem &item() const;
-    const Jid &      jid() const;
-    const QString &  node() const;
+    const Jid       &jid() const;
+    const QString   &node() const;
 
     void onGo();
     bool take(const QDomElement &);
diff --git a/src/xmpp/xmpp-im/xmpp_discoitem.h b/src/xmpp/xmpp-im/xmpp_discoitem.h
index 281c33d1..f1022617 100644
--- a/src/xmpp/xmpp-im/xmpp_discoitem.h
+++ b/src/xmpp/xmpp-im/xmpp_discoitem.h
@@ -36,7 +36,7 @@ class DiscoItem {
     DiscoItem();
     ~DiscoItem();
 
-    const Jid &    jid() const;
+    const Jid     &jid() const;
     const QString &node() const;
     const QString &name() const;
 
@@ -60,9 +60,7 @@ class DiscoItem {
 
         inline Identity() { }
         inline Identity(const QString &categoty, const QString &type, const QString &lang = QString(),
-                        const QString &name = QString()) :
-            category(categoty),
-            type(type), lang(lang), name(name)
+                        const QString &name = QString()) : category(categoty), type(type), lang(lang), name(name)
         {
         }
         bool operator==(const Identity &other) const;
@@ -86,7 +84,7 @@ class DiscoItem {
     DiscoItem &operator=(const DiscoItem &);
     DiscoItem(const DiscoItem &);
 
-              operator AgentItem() const { return toAgentItem(); }
+    operator AgentItem() const { return toAgentItem(); }
     AgentItem toAgentItem() const;
     void      fromAgentItem(const AgentItem &);
 
diff --git a/src/xmpp/xmpp-im/xmpp_encryption.h b/src/xmpp/xmpp-im/xmpp_encryption.h
index a76b0c16..489d4fe3 100644
--- a/src/xmpp/xmpp-im/xmpp_encryption.h
+++ b/src/xmpp/xmpp-im/xmpp_encryption.h
@@ -23,7 +23,6 @@
 #include <map>
 #include <memory>
 
-
 class QDomElement;
 
 namespace XMPP {
diff --git a/src/xmpp/xmpp-im/xmpp_externalservicediscovery.h b/src/xmpp/xmpp-im/xmpp_externalservicediscovery.h
index 11520dd2..ec6f0d14 100644
--- a/src/xmpp/xmpp-im/xmpp_externalservicediscovery.h
+++ b/src/xmpp/xmpp-im/xmpp_externalservicediscovery.h
@@ -52,7 +52,7 @@ struct ExternalService {
     QString        username;           // optional
 
     bool parse(QDomElement &el);
-         operator QString() const;
+    operator QString() const;
 };
 
 struct ExternalServiceId {
@@ -133,7 +133,7 @@ class ExternalServiceDiscovery : public QObject {
     void serviceModified(ExternalServiceList &);
 
 private:
-    Client *                              client_;
+    Client                               *client_;
     QPointer<JT_ExternalServiceDiscovery> currentTask = nullptr; // for all services (no type)
     ExternalServiceList                   services_;
 };
diff --git a/src/xmpp/xmpp-im/xmpp_features.cpp b/src/xmpp/xmpp-im/xmpp_features.cpp
index a165ffac..8aa1f5be 100644
--- a/src/xmpp/xmpp-im/xmpp_features.cpp
+++ b/src/xmpp/xmpp-im/xmpp_features.cpp
@@ -59,7 +59,7 @@ void Features::setList(const QStringList &l)
 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
     _list = QSet<QString>(l.begin(), l.end());
 #else
-    _list   = QSet<QString>::fromList(l);
+    _list = QSet<QString>::fromList(l);
 #endif
 }
 
diff --git a/src/xmpp/xmpp-im/xmpp_features.h b/src/xmpp/xmpp-im/xmpp_features.h
index 6849ded1..00c0b2b4 100644
--- a/src/xmpp/xmpp-im/xmpp_features.h
+++ b/src/xmpp/xmpp-im/xmpp_features.h
@@ -103,9 +103,9 @@ class Features {
     static long    id(const QString &feature);
     static QString feature(long id);
 
-    Features &  operator<<(const QString &feature);
+    Features   &operator<<(const QString &feature);
     inline bool operator==(const Features &other) { return _list == other._list; }
-    Features &  operator+=(const Features &other)
+    Features   &operator+=(const Features &other)
     {
         _list += other._list;
         return *this;
diff --git a/src/xmpp/xmpp-im/xmpp_form.h b/src/xmpp/xmpp-im/xmpp_form.h
index e0bd99af..d45624bd 100644
--- a/src/xmpp/xmpp-im/xmpp_form.h
+++ b/src/xmpp/xmpp-im/xmpp_form.h
@@ -77,7 +77,7 @@ class SearchResult {
     SearchResult(const Jid &jid = "");
     ~SearchResult();
 
-    const Jid &    jid() const;
+    const Jid     &jid() const;
     const QString &nick() const;
     const QString &first() const;
     const QString &last() const;
diff --git a/src/xmpp/xmpp-im/xmpp_hash.cpp b/src/xmpp/xmpp-im/xmpp_hash.cpp
index 1d5ab458..558e0bcf 100644
--- a/src/xmpp/xmpp-im/xmpp_hash.cpp
+++ b/src/xmpp/xmpp-im/xmpp_hash.cpp
@@ -111,7 +111,7 @@ HashVariant findHasher(Hash::Type hashType)
 Hash::Hash(const QDomElement &el)
 {
     QString algo = el.attribute(QLatin1String("algo"));
-    v_type       = parseType(QStringView{algo});
+    v_type       = parseType(QStringView { algo });
     if (v_type != Unknown && el.tagName() == QLatin1String("hash")) {
         v_data = QByteArray::fromBase64(el.text().toLatin1());
         if (v_data.isEmpty()) {
diff --git a/src/xmpp/xmpp-im/xmpp_ibb.cpp b/src/xmpp/xmpp-im/xmpp_ibb.cpp
index 85745506..10873357 100644
--- a/src/xmpp/xmpp-im/xmpp_ibb.cpp
+++ b/src/xmpp/xmpp-im/xmpp_ibb.cpp
@@ -47,7 +47,7 @@ class IBBConnection::Private {
     Jid         peer;
     QString     sid;
     IBBManager *m = nullptr;
-    JT_IBB *    j = nullptr;
+    JT_IBB     *j = nullptr;
     QString     iq_id;
     QString     stanza;
 
@@ -325,10 +325,10 @@ class IBBManager::Private {
 public:
     Private() = default;
 
-    Client *          client = nullptr;
+    Client           *client = nullptr;
     IBBConnectionList activeConns;
     IBBConnectionList incomingConns;
-    JT_IBB *          ibb = nullptr;
+    JT_IBB           *ibb = nullptr;
 };
 
 IBBManager::IBBManager(Client *parent) : BytestreamManager(parent)
diff --git a/src/xmpp/xmpp-im/xmpp_ibb.h b/src/xmpp/xmpp-im/xmpp_ibb.h
index 0ceb5916..530ac757 100644
--- a/src/xmpp/xmpp-im/xmpp_ibb.h
+++ b/src/xmpp/xmpp-im/xmpp_ibb.h
@@ -37,7 +37,7 @@ class IBBData {
     IBBData() : seq(0) { }
     IBBData(const QString &sid, quint16 seq, const QByteArray &data) : sid(sid), seq(seq), data(data) { }
 
-    IBBData &   fromXml(const QDomElement &e);
+    IBBData    &fromXml(const QDomElement &e);
     QDomElement toXml(QDomDocument *) const;
 
     QString    sid;
@@ -98,10 +98,10 @@ class IBBManager : public BytestreamManager {
     ~IBBManager();
 
     static const char *ns();
-    Client *           client() const;
+    Client            *client() const;
 
     bool           isAcceptableSID(const Jid &peer, const QString &sid) const;
-    BSConnection * createConnection();
+    BSConnection  *createConnection();
     IBBConnection *takeIncoming();
 
 public slots:
diff --git a/src/xmpp/xmpp-im/xmpp_liverosteritem.h b/src/xmpp/xmpp-im/xmpp_liverosteritem.h
index 9ff16adf..b4c18397 100644
--- a/src/xmpp/xmpp-im/xmpp_liverosteritem.h
+++ b/src/xmpp/xmpp-im/xmpp_liverosteritem.h
@@ -33,10 +33,10 @@ class LiveRosterItem : public RosterItem {
 
     void setRosterItem(const RosterItem &);
 
-    ResourceList &         resourceList();
+    ResourceList          &resourceList();
     ResourceList::Iterator priority();
 
-    const ResourceList &        resourceList() const;
+    const ResourceList         &resourceList() const;
     ResourceList::ConstIterator priority() const;
 
     bool          isAvailable() const;
diff --git a/src/xmpp/xmpp-im/xmpp_message.h b/src/xmpp/xmpp-im/xmpp_message.h
index 52b058cd..79b15bcb 100644
--- a/src/xmpp/xmpp-im/xmpp_message.h
+++ b/src/xmpp/xmpp-im/xmpp_message.h
@@ -19,13 +19,13 @@
 #ifndef XMPP_MESSAGE_H
 #define XMPP_MESSAGE_H
 
+#include "iris/xmpp_stanza.h"
 #include "xmpp_address.h"
 #include "xmpp_chatstate.h"
 #include "xmpp_muc.h"
 #include "xmpp_receipts.h"
 #include "xmpp_reference.h"
 #include "xmpp_rosterx.h"
-#include "iris/xmpp_stanza.h"
 #include "xmpp_url.h"
 
 #include <QExplicitlySharedDataPointer>
diff --git a/src/xmpp/xmpp-im/xmpp_muc.h b/src/xmpp/xmpp-im/xmpp_muc.h
index 770f5ff3..8ef80658 100644
--- a/src/xmpp/xmpp-im/xmpp_muc.h
+++ b/src/xmpp/xmpp-im/xmpp_muc.h
@@ -42,10 +42,10 @@ class MUCItem {
     void setReason(const QString &);
 
     const QString &nick() const;
-    const Jid &    jid() const; // real jid of muc participant
+    const Jid     &jid() const; // real jid of muc participant
     Affiliation    affiliation() const;
     Role           role() const;
-    const Jid &    actor() const;
+    const Jid     &actor() const;
     const QString &reason() const;
 
     void        fromXml(const QDomElement &);
@@ -67,9 +67,9 @@ class MUCInvite {
     MUCInvite(const QDomElement &);
     MUCInvite(const Jid &to, const QString &reason = QString());
 
-    const Jid &    to() const;
+    const Jid     &to() const;
     void           setTo(const Jid &);
-    const Jid &    from() const;
+    const Jid     &from() const;
     void           setFrom(const Jid &);
     const QString &reason() const;
     void           setReason(const QString &);
@@ -92,9 +92,9 @@ class MUCDecline {
     MUCDecline(const Jid &to, const QString &reason);
     MUCDecline(const QDomElement &);
 
-    const Jid &    to() const;
+    const Jid     &to() const;
     void           setTo(const Jid &);
-    const Jid &    from() const;
+    const Jid     &from() const;
     void           setFrom(const Jid &);
     const QString &reason() const;
     void           setReason(const QString &);
@@ -113,7 +113,7 @@ class MUCDestroy {
     MUCDestroy();
     MUCDestroy(const QDomElement &);
 
-    const Jid &    jid() const;
+    const Jid     &jid() const;
     void           setJid(const Jid &);
     const QString &reason() const;
     void           setReason(const QString &);
diff --git a/src/xmpp/xmpp-im/xmpp_pubsubitem.h b/src/xmpp/xmpp-im/xmpp_pubsubitem.h
index ca6d6de6..0c0b283e 100644
--- a/src/xmpp/xmpp-im/xmpp_pubsubitem.h
+++ b/src/xmpp/xmpp-im/xmpp_pubsubitem.h
@@ -27,7 +27,7 @@ class PubSubItem {
 public:
     PubSubItem();
     PubSubItem(const QString &id, const QDomElement &payload);
-    const QString &    id() const;
+    const QString     &id() const;
     const QDomElement &payload() const;
 
 private:
diff --git a/src/xmpp/xmpp-im/xmpp_resource.h b/src/xmpp/xmpp-im/xmpp_resource.h
index 10a045f4..cdbe105f 100644
--- a/src/xmpp/xmpp-im/xmpp_resource.h
+++ b/src/xmpp/xmpp-im/xmpp_resource.h
@@ -30,7 +30,7 @@ class Resource {
 
     const QString &name() const;
     int            priority() const;
-    const Status & status() const;
+    const Status  &status() const;
 
     void setName(const QString &);
     void setStatus(const Status &);
diff --git a/src/xmpp/xmpp-im/xmpp_rosteritem.h b/src/xmpp/xmpp-im/xmpp_rosteritem.h
index e773ce33..13c7f11f 100644
--- a/src/xmpp/xmpp-im/xmpp_rosteritem.h
+++ b/src/xmpp/xmpp-im/xmpp_rosteritem.h
@@ -47,11 +47,11 @@ class RosterItem {
     virtual ~RosterItem();
     RosterItem &operator=(const RosterItem &other) = default;
 
-    const Jid &         jid() const;
-    const QString &     name() const;
-    const QStringList & groups() const;
+    const Jid          &jid() const;
+    const QString      &name() const;
+    const QStringList  &groups() const;
     const Subscription &subscription() const;
-    const QString &     ask() const;
+    const QString      &ask() const;
     bool                isPush() const;
     bool                inGroup(const QString &) const;
 
diff --git a/src/xmpp/xmpp-im/xmpp_rosterx.h b/src/xmpp/xmpp-im/xmpp_rosterx.h
index 98669d65..41bbfc9f 100644
--- a/src/xmpp/xmpp-im/xmpp_rosterx.h
+++ b/src/xmpp/xmpp-im/xmpp_rosterx.h
@@ -38,9 +38,9 @@ class RosterExchangeItem {
                        Action = Add);
     RosterExchangeItem(const QDomElement &);
 
-    const Jid &        jid() const;
+    const Jid         &jid() const;
     Action             action() const;
-    const QString &    name() const;
+    const QString     &name() const;
     const QStringList &groups() const;
     bool               isNull() const;
 
diff --git a/src/xmpp/xmpp-im/xmpp_serverinfomanager.h b/src/xmpp/xmpp-im/xmpp_serverinfomanager.h
index 93a0518d..8a6a795a 100644
--- a/src/xmpp/xmpp-im/xmpp_serverinfomanager.h
+++ b/src/xmpp/xmpp-im/xmpp_serverinfomanager.h
@@ -24,9 +24,9 @@
 #include "xmpp_status.h"
 
 #include <QObject>
+#include <QRegularExpression>
 #include <QString>
 #include <QVariant>
-#include <QRegularExpression>
 
 #include <functional>
 #include <list>
@@ -62,8 +62,7 @@ class ServerInfoManager : public QObject {
         ServiceQuery(const QString &type, const QString &category, const QList<QSet<QString>> &features,
                      const QRegularExpression &nameHint, const SQOptions &options,
                      const std::function<void(const QList<DiscoItem> &item)> &&callback) :
-            type(type),
-            category(category), features(features), nameHint(nameHint), options(options), callback(callback)
+            type(type), category(category), features(features), nameHint(nameHint), options(options), callback(callback)
         {
         }
     };
@@ -79,9 +78,9 @@ class ServerInfoManager : public QObject {
 public:
     ServerInfoManager(XMPP::Client *client);
 
-    const QString &                          multicastService() const;
+    const QString                           &multicastService() const;
     bool                                     hasPEP() const;
-    inline const Features &                  features() const { return _features; }
+    inline const Features                   &features() const { return _features; }
     bool                                     canMessageCarbons() const;
     inline const QMap<QString, QStringList> &extraServerInfo() const { return _extraServerInfo; }
 
@@ -124,7 +123,7 @@ private slots:
     void appendQuery(const ServiceQuery &q);
 
 private:
-    XMPP::Client *             _client = nullptr;
+    XMPP::Client              *_client = nullptr;
     CapsSpec                   _caps;
     Features                   _features;
     QString                    _multicastService;
diff --git a/src/xmpp/xmpp-im/xmpp_status.h b/src/xmpp/xmpp-im/xmpp_status.h
index 2cc8ada3..17c649cb 100644
--- a/src/xmpp/xmpp-im/xmpp_status.h
+++ b/src/xmpp/xmpp-im/xmpp_status.h
@@ -43,10 +43,10 @@ class CapsSpec {
     CapsSpec(const DiscoItem &disco, QCryptographicHash::Algorithm hashAlgo = QCryptographicHash::Sha1);
 
     bool                          isValid() const;
-    const QString &               node() const;
-    const QString &               version() const;
+    const QString                &node() const;
+    const QString                &version() const;
     QCryptographicHash::Algorithm hashAlgorithm() const;
-    inline const QStringList &    ext() const { return ext_; }
+    inline const QStringList     &ext() const { return ext_; }
     QString                       flatten() const;
 
     void resetVersion();
@@ -90,22 +90,22 @@ class Status {
     int            errorCode() const;
     const QString &errorString() const;
 
-    const QString & xsigned() const;
-    const QString & songTitle() const;
+    const QString  &xsigned() const;
+    const QString  &songTitle() const;
     const CapsSpec &caps() const;
 
     bool              isMUC() const;
     bool              hasMUCItem() const;
-    const MUCItem &   mucItem() const;
+    const MUCItem    &mucItem() const;
     bool              hasMUCDestroy() const;
     const MUCDestroy &mucDestroy() const;
     const QList<int> &getMUCStatuses() const;
-    const QString &   mucPassword() const;
+    const QString    &mucPassword() const;
     bool              hasMUCHistory() const;
     int               mucHistoryMaxChars() const;
     int               mucHistoryMaxStanzas() const;
     int               mucHistorySeconds() const;
-    const QDateTime & mucHistorySince() const;
+    const QDateTime  &mucHistorySince() const;
 
     static Type txt2type(const QString &stat);
 
diff --git a/src/xmpp/xmpp-im/xmpp_task.cpp b/src/xmpp/xmpp-im/xmpp_task.cpp
index d3a1f4c6..bdd7c2db 100644
--- a/src/xmpp/xmpp-im/xmpp_task.cpp
+++ b/src/xmpp/xmpp-im/xmpp_task.cpp
@@ -37,7 +37,7 @@ class Task::TaskPrivate {
     int                 statusCode = 0;
     QString             statusString;
     XMPP::Stanza::Error error;
-    Client *            client     = nullptr;
+    Client             *client     = nullptr;
     bool                insig      = false;
     bool                deleteme   = false;
     bool                autoDelete = false;
diff --git a/src/xmpp/xmpp-im/xmpp_task.h b/src/xmpp/xmpp-im/xmpp_task.h
index 84f9f8d3..15e2d260 100644
--- a/src/xmpp/xmpp-im/xmpp_task.h
+++ b/src/xmpp/xmpp-im/xmpp_task.h
@@ -40,14 +40,14 @@ class Task : public QObject {
     Task(Client *, bool isRoot);
     virtual ~Task();
 
-    Task *        parent() const;
-    Client *      client() const;
+    Task         *parent() const;
+    Client       *client() const;
     QDomDocument *doc() const;
     QString       id() const;
 
     bool                 success() const;
     int                  statusCode() const;
-    const QString &      statusString() const;
+    const QString       &statusString() const;
     const Stanza::Error &error() const;
 
     void setTimeout(int seconds) const;
diff --git a/src/xmpp/xmpp-im/xmpp_tasks.h b/src/xmpp/xmpp-im/xmpp_tasks.h
index dcd06a00..d500d3a1 100644
--- a/src/xmpp/xmpp-im/xmpp_tasks.h
+++ b/src/xmpp/xmpp-im/xmpp_tasks.h
@@ -49,7 +49,7 @@ class JT_Register : public Task {
     void changepw(const QString &pass);
     void unreg(const Jid &j = "");
 
-    const Form & form() const;
+    const Form  &form() const;
     bool         hasXData() const;
     const XData &xdata() const;
     bool         isRegistered() const;
@@ -223,7 +223,7 @@ class JT_VCard : public Task {
     void set(const VCard &);
     void set(const Jid &, const VCard &, bool isTarget = false);
 
-    const Jid &  jid() const;
+    const Jid   &jid() const;
     const VCard &vcard() const;
 
     void onGo();
@@ -242,7 +242,7 @@ class JT_Search : public Task {
     JT_Search(Task *parent);
     ~JT_Search();
 
-    const Form &               form() const;
+    const Form                &form() const;
     const QList<SearchResult> &results() const;
 
     bool         hasXData() const;
@@ -272,7 +272,7 @@ class JT_ClientVersion : public Task {
     void onGo();
     bool take(const QDomElement &);
 
-    const Jid &    jid() const;
+    const Jid     &jid() const;
     const QString &name() const;
     const QString &version() const;
     const QString &os() const;
diff --git a/src/xmpp/xmpp-im/xmpp_thumbs.h b/src/xmpp/xmpp-im/xmpp_thumbs.h
index 48bf3ddb..0fe02585 100644
--- a/src/xmpp/xmpp-im/xmpp_thumbs.h
+++ b/src/xmpp/xmpp-im/xmpp_thumbs.h
@@ -31,9 +31,7 @@ class Thumbnail {
     inline Thumbnail() : width(0), height(0) { }
     // data - for outgoing it's actual image data. for incoming - cid
     inline Thumbnail(const QByteArray &data, const QString &mimeType = QString(), quint32 width = 0,
-                     quint32 height = 0) :
-        data(data),
-        mimeType(mimeType), width(width), height(height)
+                     quint32 height = 0) : data(data), mimeType(mimeType), width(width), height(height)
     {
     }
     Thumbnail(const QDomElement &el);
diff --git a/src/xmpp/xmpp-im/xmpp_vcard.cpp b/src/xmpp/xmpp-im/xmpp_vcard.cpp
index be1c0647..3f3d509a 100644
--- a/src/xmpp/xmpp-im/xmpp_vcard.cpp
+++ b/src/xmpp/xmpp-im/xmpp_vcard.cpp
@@ -496,8 +496,7 @@ VCard VCard::fromXml(const QDomElement &q)
             v.d->nickName = i.text().trimmed();
         else if (tag == "PHOTO") {
             static QRegularExpression newlines("[\r\n]+");
-            v.d->photo
-                = QCA::Base64().stringToArray(subTagText(i, "BINVAL").replace(newlines, "")).toByteArray();
+            v.d->photo    = QCA::Base64().stringToArray(subTagText(i, "BINVAL").replace(newlines, "")).toByteArray();
             v.d->photoURI = subTagText(i, "EXTVAL");
         } else if (tag == "BDAY")
             v.d->bday = i.text().trimmed();
diff --git a/src/xmpp/xmpp-im/xmpp_vcard.h b/src/xmpp/xmpp-im/xmpp_vcard.h
index 23300138..5e442ade 100644
--- a/src/xmpp/xmpp-im/xmpp_vcard.h
+++ b/src/xmpp/xmpp-im/xmpp_vcard.h
@@ -105,7 +105,7 @@ class VCard {
         QString country;
     };
     typedef QList<Address> AddressList;
-    const AddressList &    addressList() const;
+    const AddressList     &addressList() const;
     void                   setAddressList(const AddressList &);
 
     class Label {
@@ -125,7 +125,7 @@ class VCard {
         QStringList lines;
     };
     typedef QList<Label> LabelList;
-    const LabelList &    labelList() const;
+    const LabelList     &labelList() const;
     void                 setLabelList(const LabelList &);
 
     class Phone {
@@ -149,7 +149,7 @@ class VCard {
         QString number;
     };
     typedef QList<Phone> PhoneList;
-    const PhoneList &    phoneList() const;
+    const PhoneList     &phoneList() const;
     void                 setPhoneList(const PhoneList &);
 
     class Email {
@@ -166,7 +166,7 @@ class VCard {
         QString userid;
     };
     typedef QList<Email> EmailList;
-    const EmailList &    emailList() const;
+    const EmailList     &emailList() const;
     void                 setEmailList(const EmailList &);
 
     const QString &jid() const;
diff --git a/src/xmpp/xmpp-im/xmpp_xdata.cpp b/src/xmpp/xmpp-im/xmpp_xdata.cpp
index 572d4e47..219d0f48 100644
--- a/src/xmpp/xmpp-im/xmpp_xdata.cpp
+++ b/src/xmpp/xmpp-im/xmpp_xdata.cpp
@@ -23,8 +23,8 @@
 #include "xmpp_xmlcommon.h"
 
 #include <QList>
-#include <QSharedDataPointer>
 #include <QRegularExpression>
+#include <QSharedDataPointer>
 
 using namespace XMLHelper;
 using namespace XMPP;
@@ -305,7 +305,9 @@ bool XData::Field::MediaElement::checkSupport(const QStringList &wildcards)
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
             if (QRegExp(wildcard, Qt::CaseSensitive, QRegExp::Wildcard).exactMatch(uri.mimeType)) {
 #else
-            if (QRegularExpression::fromWildcard(QLatin1Char('^') + wildcard + QLatin1Char('$'), Qt::CaseSensitive).match(uri.mimeType).hasMatch()) {
+            if (QRegularExpression::fromWildcard(QLatin1Char('^') + wildcard + QLatin1Char('$'), Qt::CaseSensitive)
+                    .match(uri.mimeType)
+                    .hasMatch()) {
 #endif
                 return true;
             }
diff --git a/src/xmpp/xmpp-im/xmpp_xdata.h b/src/xmpp/xmpp-im/xmpp_xdata.h
index 1b268bd9..29bcab6a 100644
--- a/src/xmpp/xmpp-im/xmpp_xdata.h
+++ b/src/xmpp/xmpp-im/xmpp_xdata.h
@@ -57,7 +57,7 @@ class XData {
     const QList<ReportField> &report() const;
 
     typedef QMap<QString, QString> ReportItem;
-    const QList<ReportItem> &      reportItems() const;
+    const QList<ReportItem>       &reportItems() const;
 
     void        fromXml(const QDomElement &);
     QDomElement toXml(QDomDocument *, bool submitForm = true) const;
@@ -152,7 +152,7 @@ class XData {
 
     const FieldList &fields() const;
     Field            getField(const QString &var) const;
-    Field &          fieldRef(const QString &var);
+    Field           &fieldRef(const QString &var);
     void             setFields(const FieldList &fl);
 
 private:
diff --git a/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp b/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
index 2a7e6f88..590080f8 100644
--- a/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
+++ b/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
@@ -66,13 +66,13 @@ QDateTime stamp2TS(const QString &ts)
     if (ts.length() != 17)
         return QDateTime();
 
-    int year  = QStringView{ts}.mid(0, 4).toInt();
-    int month = QStringView{ts}.mid(4, 2).toInt();
-    int day   = QStringView{ts}.mid(6, 2).toInt();
+    int year  = QStringView { ts }.mid(0, 4).toInt();
+    int month = QStringView { ts }.mid(4, 2).toInt();
+    int day   = QStringView { ts }.mid(6, 2).toInt();
 
-    int hour = QStringView{ts}.mid(9, 2).toInt();
-    int min  = QStringView{ts}.mid(12, 2).toInt();
-    int sec  = QStringView{ts}.mid(15, 2).toInt();
+    int hour = QStringView { ts }.mid(9, 2).toInt();
+    int min  = QStringView { ts }.mid(12, 2).toInt();
+    int sec  = QStringView { ts }.mid(15, 2).toInt();
 
     QDate xd;
     xd.setDate(year, month, day);
diff --git a/src/xmpp/zlib/zlibcompressor.h b/src/xmpp/zlib/zlibcompressor.h
index 754c5034..3d01da35 100644
--- a/src/xmpp/zlib/zlibcompressor.h
+++ b/src/xmpp/zlib/zlibcompressor.h
@@ -24,7 +24,7 @@ protected slots:
 
 private:
     QIODevice *device_;
-    z_stream * zlib_stream_;
+    z_stream  *zlib_stream_;
     bool       flushed_;
 };
 
diff --git a/src/xmpp/zlib/zlibdecompressor.h b/src/xmpp/zlib/zlibdecompressor.h
index 01b99153..6e8a71d2 100644
--- a/src/xmpp/zlib/zlibdecompressor.h
+++ b/src/xmpp/zlib/zlibdecompressor.h
@@ -24,7 +24,7 @@ protected slots:
 
 private:
     QIODevice *device_;
-    z_stream * zlib_stream_;
+    z_stream  *zlib_stream_;
     bool       flushed_;
 };
 
diff --git a/tools/icetunnel/main.cpp b/tools/icetunnel/main.cpp
index 98c686ca..92055d35 100644
--- a/tools/icetunnel/main.cpp
+++ b/tools/icetunnel/main.cpp
@@ -448,14 +448,14 @@ class App : public QObject {
     XMPP::NameResolver                dns;
     QHostAddress                      stunAddr;
     XMPP::UdpPortReserver             portReserver;
-    XMPP::Ice176 *                    ice = nullptr;
+    XMPP::Ice176                     *ice = nullptr;
     QList<XMPP::Dtls *>               dtls;
     QList<XMPP::Ice176::Candidate>    localCandidates;
     QList<XMPP::Ice176::LocalAddress> localAddrs;
     QList<Channel>                    channels;
-    QCA::Console *                    console = nullptr;
-    IceBlockReader *                  reader  = nullptr;
-    EnterPrompt *                     prompt  = nullptr;
+    QCA::Console                     *console = nullptr;
+    IceBlockReader                   *reader  = nullptr;
+    EnterPrompt                      *prompt  = nullptr;
     IceOffer                          inOffer;
 
     App() : portReserver(this) { }
diff --git a/tools/nettool/main.cpp b/tools/nettool/main.cpp
index 2bead449..fb6d3cff 100644
--- a/tools/nettool/main.cpp
+++ b/tools/nettool/main.cpp
@@ -36,7 +36,7 @@ static QString prompt(const QString &s)
     printf("* %s ", qPrintable(s));
     fflush(stdout);
     char    line[256];
-    char *  ret = fgets(line, 255, stdin);
+    char   *ret = fgets(line, 255, stdin);
     QString result;
     if (ret)
         result = QString::fromLocal8Bit(line);
@@ -48,9 +48,9 @@ static QString prompt(const QString &s)
 class NetMonitor : public QObject {
     Q_OBJECT
 public:
-    NetInterfaceManager * man;
+    NetInterfaceManager  *man;
     QList<NetInterface *> ifaces;
-    NetAvailability *     netavail;
+    NetAvailability      *netavail;
 
     ~NetMonitor()
     {
@@ -440,9 +440,9 @@ class StunBind : public QObject {
     QHostAddress             addr;
     int                      port;
     int                      localPort;
-    QUdpSocket *             sock;
+    QUdpSocket              *sock;
     StunTransactionPool::Ptr pool;
-    StunBinding *            binding;
+    StunBinding             *binding;
 
     ~StunBind()
     {
@@ -551,10 +551,10 @@ class TurnClientTest : public QObject {
     QString                  relayRealm;
     QHostAddress             peerAddr;
     int                      peerPort = 0;
-    QUdpSocket *             udp      = nullptr;
+    QUdpSocket              *udp      = nullptr;
     StunTransactionPool::Ptr pool;
     QList<bool>              writeItems; // true = turn-originated, false = external
-    TurnClient *             turn = nullptr;
+    TurnClient              *turn = nullptr;
 
     TurnClientTest() = default;
 
diff --git a/tools/xmpptest/xmpptest.cpp b/tools/xmpptest/xmpptest.cpp
index d15d4522..664110ae 100644
--- a/tools/xmpptest/xmpptest.cpp
+++ b/tools/xmpptest/xmpptest.cpp
@@ -203,9 +203,9 @@ class TestDlg : public QDialog, public Ui::TestUI {
 public:
     bool                     active, connected;
     XMPP::AdvancedConnector *conn;
-    QCA::TLS *               tls;
-    XMPP::QCATLSHandler *    tlsHandler;
-    XMPP::ClientStream *     stream;
+    QCA::TLS                *tls;
+    XMPP::QCATLSHandler     *tlsHandler;
+    XMPP::ClientStream      *stream;
     XMPP::Jid                jid;
 
     TestDlg(QWidget *parent = 0) : QDialog(parent)

From 33906e74ae0715fea6a8ea01d5257bb157d5234b Mon Sep 17 00:00:00 2001
From: Sergei Ilinykh <rion4ik@gmail.com>
Date: Thu, 14 Mar 2024 17:29:29 +0300
Subject: [PATCH 368/383] Remove obsoleted files

---
 3rdparty/stringprep/stringprep.pri          |    7 -
 3rdparty/stringprep/stringprep.pro          |    8 -
 bundled.cmake                               |    2 -
 common.pri                                  |   19 -
 conf_win.pri.example                        |   17 -
 confapp.pri                                 |    6 -
 confapp_win.pri.example                     |   17 -
 configure                                   | 2517 -------------------
 configure.exe                               |  Bin 124424 -> 0 bytes
 iris.pri                                    |   43 -
 iris.pro                                    |   22 -
 iris.qc                                     |   31 -
 qcm/README                                  |    5 -
 qcm/b2.qcm                                  |   69 -
 qcm/buildmode.qcm                           |  184 --
 qcm/extra.qcm                               |   78 -
 qcm/qca.qcm                                 |  180 --
 qcm/qjdns.qcm                               |   69 -
 qcm/qt42.qcm                                |   19 -
 qcm/universal.qcm                           |   45 -
 qcm/zlib.qcm                                |   52 -
 src/irisnet/appledns/appledns.pri           |    6 -
 src/irisnet/appledns/appledns.pro           |   14 -
 src/irisnet/appledns/sdtest.pro             |    9 -
 src/irisnet/corelib/corelib.pri             |   52 -
 src/irisnet/corelib/corelib.pro             |   17 -
 src/irisnet/irisnet.pro                     |   15 -
 src/irisnet/noncore/cutestuff/cutestuff.pri |   15 -
 src/irisnet/noncore/legacy/legacy.pri       |    7 -
 src/irisnet/noncore/noncore.pri             |   55 -
 src/irisnet/noncore/noncore.pro             |   15 -
 src/libbase.pri                             |    8 -
 src/src.pro                                 |   10 -
 src/xmpp/base/base.pri                      |   11 -
 src/xmpp/base/unittest/unittest.pri         |    3 -
 src/xmpp/base/unittest/unittest.pro         |    4 -
 src/xmpp/blake2/blake2.pri                  |   18 -
 src/xmpp/common.pri                         |    3 -
 src/xmpp/jid/jid.pri                        |    8 -
 src/xmpp/jid/unittest/unittest.pri          |    2 -
 src/xmpp/jid/unittest/unittest.pro          |    4 -
 src/xmpp/modules.pri                        |    7 -
 src/xmpp/qa/qttestutil/example/example.pro  |   23 -
 src/xmpp/qa/qttestutil/qttestutil.pri       |    5 -
 src/xmpp/qa/unittest.pri                    |   28 -
 src/xmpp/qa/unittest.template/unittest.pri  |    2 -
 src/xmpp/qa/unittest.template/unittest.pro  |    4 -
 src/xmpp/qa/unittests.pri                   |    4 -
 src/xmpp/qa/unittests/unittests.pro         |    6 -
 src/xmpp/sasl/sasl.pri                      |   18 -
 src/xmpp/sasl/unittest/unittest.pri         |    5 -
 src/xmpp/sasl/unittest/unittest.pro         |   12 -
 src/xmpp/xmpp.pri                           |  136 -
 src/xmpp/xmpp.pro                           |   17 -
 src/xmpp/zlib/zlib.pri                      |   10 -
 tools/icetunnel/icetunnel.pro               |   20 -
 tools/nettool/nettool.pro                   |   31 -
 tools/tools.pro                             |    2 -
 tools/xmpptest/xmpptest.pro                 |   10 -
 59 files changed, 4006 deletions(-)
 delete mode 100644 3rdparty/stringprep/stringprep.pri
 delete mode 100644 3rdparty/stringprep/stringprep.pro
 delete mode 100644 bundled.cmake
 delete mode 100644 common.pri
 delete mode 100644 conf_win.pri.example
 delete mode 100644 confapp.pri
 delete mode 100644 confapp_win.pri.example
 delete mode 100755 configure
 delete mode 100644 configure.exe
 delete mode 100644 iris.pri
 delete mode 100644 iris.pro
 delete mode 100644 iris.qc
 delete mode 100644 qcm/README
 delete mode 100644 qcm/b2.qcm
 delete mode 100644 qcm/buildmode.qcm
 delete mode 100644 qcm/extra.qcm
 delete mode 100644 qcm/qca.qcm
 delete mode 100644 qcm/qjdns.qcm
 delete mode 100644 qcm/qt42.qcm
 delete mode 100644 qcm/universal.qcm
 delete mode 100644 qcm/zlib.qcm
 delete mode 100644 src/irisnet/appledns/appledns.pri
 delete mode 100644 src/irisnet/appledns/appledns.pro
 delete mode 100644 src/irisnet/appledns/sdtest.pro
 delete mode 100644 src/irisnet/corelib/corelib.pri
 delete mode 100644 src/irisnet/corelib/corelib.pro
 delete mode 100644 src/irisnet/irisnet.pro
 delete mode 100644 src/irisnet/noncore/cutestuff/cutestuff.pri
 delete mode 100644 src/irisnet/noncore/legacy/legacy.pri
 delete mode 100644 src/irisnet/noncore/noncore.pri
 delete mode 100644 src/irisnet/noncore/noncore.pro
 delete mode 100644 src/libbase.pri
 delete mode 100644 src/src.pro
 delete mode 100644 src/xmpp/base/base.pri
 delete mode 100644 src/xmpp/base/unittest/unittest.pri
 delete mode 100644 src/xmpp/base/unittest/unittest.pro
 delete mode 100644 src/xmpp/blake2/blake2.pri
 delete mode 100644 src/xmpp/common.pri
 delete mode 100644 src/xmpp/jid/jid.pri
 delete mode 100644 src/xmpp/jid/unittest/unittest.pri
 delete mode 100644 src/xmpp/jid/unittest/unittest.pro
 delete mode 100644 src/xmpp/modules.pri
 delete mode 100644 src/xmpp/qa/qttestutil/example/example.pro
 delete mode 100644 src/xmpp/qa/qttestutil/qttestutil.pri
 delete mode 100644 src/xmpp/qa/unittest.pri
 delete mode 100644 src/xmpp/qa/unittest.template/unittest.pri
 delete mode 100644 src/xmpp/qa/unittest.template/unittest.pro
 delete mode 100644 src/xmpp/qa/unittests.pri
 delete mode 100644 src/xmpp/qa/unittests/unittests.pro
 delete mode 100644 src/xmpp/sasl/sasl.pri
 delete mode 100644 src/xmpp/sasl/unittest/unittest.pri
 delete mode 100644 src/xmpp/sasl/unittest/unittest.pro
 delete mode 100644 src/xmpp/xmpp.pri
 delete mode 100644 src/xmpp/xmpp.pro
 delete mode 100644 src/xmpp/zlib/zlib.pri
 delete mode 100644 tools/icetunnel/icetunnel.pro
 delete mode 100644 tools/nettool/nettool.pro
 delete mode 100644 tools/tools.pro
 delete mode 100644 tools/xmpptest/xmpptest.pro

diff --git a/3rdparty/stringprep/stringprep.pri b/3rdparty/stringprep/stringprep.pri
deleted file mode 100644
index 9c0767ce..00000000
--- a/3rdparty/stringprep/stringprep.pri
+++ /dev/null
@@ -1,7 +0,0 @@
-SOURCES *= $$PWD/rfc3454.cpp \
-    $$PWD/stringprep.cpp \
-    $$PWD/profiles.cpp
-HEADERS *= $$PWD/rfc3454.h
-    $$PWD/qstringprep.h
-INCLUDEPATH *= $$PWD
-OTHER_FILES *= $$PWD/CMakeLists.txt $$PWD/COPYING
diff --git a/3rdparty/stringprep/stringprep.pro b/3rdparty/stringprep/stringprep.pro
deleted file mode 100644
index 5845e5c9..00000000
--- a/3rdparty/stringprep/stringprep.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-TEMPLATE = lib
-TARGET = stringprep
-DESTDIR  = $$IRIS_BASE/lib
-CONFIG  += staticlib create_prl
-OBJECTS_DIR = .obj
-MOC_DIR = .moc
-UI_DIR = .ui
-include($$PWD/stringprep.pri)
diff --git a/bundled.cmake b/bundled.cmake
deleted file mode 100644
index b9dc4842..00000000
--- a/bundled.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-set(IRIS_ENABLE_INSTALL OFF CACHE BOOL "Install iris headers" FORCE)
-add_subdirectory( ${CMAKE_CURRENT_LIST_DIR} )
diff --git a/common.pri b/common.pri
deleted file mode 100644
index 99da6d0a..00000000
--- a/common.pri
+++ /dev/null
@@ -1,19 +0,0 @@
-# common stuff for iris.pro and iris.pri
-
-CONFIG -= c++11
-CONFIG += c++14
-
-# default build configuration
-!iris_build_pri {
-    # build appledns on mac
-    mac:CONFIG += appledns
-
-    # bundle appledns inside of irisnetcore on mac
-    mac:CONFIG += appledns_bundle
-
-    # bundle irisnetcore inside of iris
-    CONFIG += irisnetcore_bundle
-
-    # don't build iris, app will include iris.pri
-    #CONFIG += iris_bundle
-}
diff --git a/conf_win.pri.example b/conf_win.pri.example
deleted file mode 100644
index c8ad428b..00000000
--- a/conf_win.pri.example
+++ /dev/null
@@ -1,17 +0,0 @@
-load(winlocal.prf)
-
-# qca
-CONFIG += crypto
-
-# zlib
-INCLUDEPATH += $$WINLOCAL_PREFIX/include
-LIBS += -L$$WINLOCAL_PREFIX/lib
-
-# zlib may have a different lib name depending on how it was compiled
-win32-g++ {
-    LIBS += -lz
-}
-else {
-    LIBS += -lzlib   # static
-    #LIBS += -lzdll  # dll
-}
diff --git a/confapp.pri b/confapp.pri
deleted file mode 100644
index 9febe572..00000000
--- a/confapp.pri
+++ /dev/null
@@ -1,6 +0,0 @@
-unix:exists(confapp_unix.pri):include(confapp_unix.pri)
-windows:exists(confapp_win.pri):include(confapp_win.pri)
-
-include(common.pri)
-
-mac:QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
diff --git a/confapp_win.pri.example b/confapp_win.pri.example
deleted file mode 100644
index c8ad428b..00000000
--- a/confapp_win.pri.example
+++ /dev/null
@@ -1,17 +0,0 @@
-load(winlocal.prf)
-
-# qca
-CONFIG += crypto
-
-# zlib
-INCLUDEPATH += $$WINLOCAL_PREFIX/include
-LIBS += -L$$WINLOCAL_PREFIX/lib
-
-# zlib may have a different lib name depending on how it was compiled
-win32-g++ {
-    LIBS += -lz
-}
-else {
-    LIBS += -lzlib   # static
-    #LIBS += -lzdll  # dll
-}
diff --git a/configure b/configure
deleted file mode 100755
index 9d8c8370..00000000
--- a/configure
+++ /dev/null
@@ -1,2517 +0,0 @@
-#!/bin/sh
-#
-# Generated by qconf 2.0 ( https://github.com/psi-plus/qconf )
-#
-
-show_usage() {
-cat <<EOT
-Usage: $0 [OPTION]...
-
-This script creates necessary configuration files to build/install.
-
-Main options:
-  --qtdir=[path]        Directory where Qt is installed.
-  --static              Create a static library instead of shared.
-  --extraconf=[conf]    Extra configuration for nonstandard cases.
-  --verbose             Show extra configure output.
-  --qtselect=[N]        Select major Qt version (4 or 5).
-  --help                This help text.
-
-Project options:
-  --release                   Build with debugging turned off (default).
-  --debug                     Build with debugging turned on.
-  --debug-and-release         Build two versions, with and without debugging
-                              turned on (mac only).
-  --no-separate-debug-info    Do not store debug information in a separate
-                              file (default for mac).
-  --separate-debug-info       Strip debug information into a separate .debug
-                              file (default for non-mac).
-  --no-framework              Do not build as a Mac framework.
-  --framework                 Build as a Mac framework (default).
-  --universal                 Build with Mac universal binary support.
-  --mac-sdk=[path]            Path to Mac universal SDK (PPC host only).
-  --enable-tests              Build examples and unittests.
-
-Dependency options:
-  --with-qca-inc=[path]      Path to QCA include files
-  --with-qca-lib=[path]      Path to QCA library or framework files
-  --with-zlib-inc=[path]     Path to zlib include files
-  --with-zlib-lib=[path]     Path to zlib library files
-  --with-qjdns-inc=[path]    Path to QJDns include files
-  --with-qjdns-lib=[path]    Path to QJDns library files
-  --with-b2-inc=[path]       Path to libb2 include files
-  --with-b2-lib=[path]       Path to libb2 library or framework files
-
-EOT
-}
-
-# which/make detection adapted from Qt
-which_command() {
-    ALL_MATCHES=
-    if [ "$1" = "-a" ]; then
-        ALL_MATCHES="-a"
-        shift
-    fi
-
-    OLD_HOME=$HOME
-    HOME=/dev/null
-    export HOME
-
-    WHICH=`which which 2>/dev/null`
-    if echo $WHICH | grep 'shell built-in command' >/dev/null 2>&1; then
-        WHICH=which
-    elif [ -z "$WHICH" ]; then
-        if which which >/dev/null 2>&1; then
-            WHICH=which
-        else
-            for a in /usr/ucb /usr/bin /bin /usr/local/bin; do
-                if [ -x $a/which ]; then
-                    WHICH=$a/which
-                    break
-                fi
-            done
-        fi
-    fi
-
-    RET_CODE=1
-    if [ -z "$WHICH" ]; then
-        OLD_IFS=$IFS
-        IFS=:
-        for a in $PATH; do
-            if [ -x $a/$1 ]; then
-                echo "$a/$1"
-                RET_CODE=0
-                [ -z "$ALL_MATCHES" ] && break
-            fi
-        done
-        IFS=$OLD_IFS
-        export IFS
-    else
-        a=`"$WHICH" "$ALL_MATCHES" "$1" 2>/dev/null`
-        if [ ! -z "$a" -a -x "$a" ]; then
-            echo "$a"
-            RET_CODE=0
-        fi
-    fi
-    HOME=$OLD_HOME
-    export HOME
-    return $RET_CODE
-}
-WHICH=which_command
-
-# find a make command
-if [ -z "$MAKE" ]; then
-    MAKE=
-    for mk in gmake make; do
-        if $WHICH $mk >/dev/null 2>&1; then
-            MAKE=`$WHICH $mk`
-            break
-        fi
-    done
-    if [ -z "$MAKE" ]; then
-        echo "You don't seem to have 'make' or 'gmake' in your PATH."
-        echo "Cannot proceed."
-        exit 1
-    fi
-fi
-
-show_qt_info() {
-    printf "Be sure you have a proper Qt 4.0+ build environment set up.  This means not\n"
-    printf "just Qt, but also a C++ compiler, a make tool, and any other packages\n"
-    printf "necessary for compiling C++ programs.\n"
-    printf "\n"
-    printf "If you are certain everything is installed, then it could be that Qt is not\n"
-    printf "being recognized or that a different version of Qt is being detected by\n"
-    printf "mistake (for example, this could happen if \$QTDIR is pointing to a Qt 3\n"
-    printf "installation).  At least one of the following conditions must be satisfied:\n"
-    printf "\n"
-    printf " 1) --qtdir is set to the location of Qt\n"
-    printf " 2) \$QTDIR is set to the location of Qt\n"
-    printf " 3) QtCore is in the pkg-config database\n"
-    printf " 4) qmake is in the \$PATH\n"
-    printf "\n"
-    printf "This script will use the first one it finds to be true, checked in the above\n"
-    printf "order.  #3 and #4 are the recommended options.  #1 and #2 are mainly for\n"
-    printf "overriding the system configuration.\n"
-    printf "\n"
-}
-
-while [ $# -gt 0 ]; do
-    optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    case "$1" in
-        --qtdir=*)
-            EX_QTDIR=$optarg
-            shift
-            ;;
-
-        --static)
-            QC_STATIC="Y"
-            shift
-            ;;
-
-        --extraconf=*)
-            QC_EXTRACONF=$optarg
-            shift
-            ;;
-
-        --release)
-            QC_RELEASE="Y"
-            shift
-            ;;
-
-        --debug)
-            QC_DEBUG="Y"
-            shift
-            ;;
-
-        --debug-and-release)
-            QC_DEBUG_AND_RELEASE="Y"
-            shift
-            ;;
-
-        --no-separate-debug-info)
-            QC_NO_SEPARATE_DEBUG_INFO="Y"
-            shift
-            ;;
-
-        --separate-debug-info)
-            QC_SEPARATE_DEBUG_INFO="Y"
-            shift
-            ;;
-
-        --no-framework)
-            QC_NO_FRAMEWORK="Y"
-            shift
-            ;;
-
-        --framework)
-            QC_FRAMEWORK="Y"
-            shift
-            ;;
-
-        --universal)
-            QC_UNIVERSAL="Y"
-            shift
-            ;;
-
-        --mac-sdk=*)
-            QC_MAC_SDK=$optarg
-            shift
-            ;;
-
-        --enable-tests)
-            QC_ENABLE_TESTS="Y"
-            shift
-            ;;
-
-        --with-qca-inc=*)
-            QC_WITH_QCA_INC=$optarg
-            shift
-            ;;
-
-        --with-qca-lib=*)
-            QC_WITH_QCA_LIB=$optarg
-            shift
-            ;;
-
-        --with-zlib-inc=*)
-            QC_WITH_ZLIB_INC=$optarg
-            shift
-            ;;
-
-        --with-zlib-lib=*)
-            QC_WITH_ZLIB_LIB=$optarg
-            shift
-            ;;
-
-        --with-qjdns-inc=*)
-            QC_WITH_QJDNS_INC=$optarg
-            shift
-            ;;
-
-        --with-qjdns-lib=*)
-            QC_WITH_QJDNS_LIB=$optarg
-            shift
-            ;;
-
-        --with-b2-inc=*)
-            QC_WITH_B2_INC=$optarg
-            shift
-            ;;
-
-        --with-b2-lib=*)
-            QC_WITH_B2_LIB=$optarg
-            shift
-            ;;
-
-        --verbose)
-            QC_VERBOSE="Y"
-            shift
-            ;;
-        --qtselect=*)
-            QC_QTSELECT="${optarg}"
-            shift
-            ;;
-        --help) show_usage; exit ;;
-        *) echo "configure: WARNING: unrecognized options: $1" >&2; shift; ;;
-    esac
-done
-
-
-echo "Configuring Iris ..."
-
-if [ "$QC_VERBOSE" = "Y" ]; then
-echo
-echo EX_QTDIR=$EX_QTDIR
-echo QC_STATIC=$QC_STATIC
-echo QC_EXTRACONF=$QC_EXTRACONF
-echo QC_RELEASE=$QC_RELEASE
-echo QC_DEBUG=$QC_DEBUG
-echo QC_DEBUG_AND_RELEASE=$QC_DEBUG_AND_RELEASE
-echo QC_NO_SEPARATE_DEBUG_INFO=$QC_NO_SEPARATE_DEBUG_INFO
-echo QC_SEPARATE_DEBUG_INFO=$QC_SEPARATE_DEBUG_INFO
-echo QC_NO_FRAMEWORK=$QC_NO_FRAMEWORK
-echo QC_FRAMEWORK=$QC_FRAMEWORK
-echo QC_UNIVERSAL=$QC_UNIVERSAL
-echo QC_MAC_SDK=$QC_MAC_SDK
-echo QC_ENABLE_TESTS=$QC_ENABLE_TESTS
-echo QC_WITH_QCA_INC=$QC_WITH_QCA_INC
-echo QC_WITH_QCA_LIB=$QC_WITH_QCA_LIB
-echo QC_WITH_ZLIB_INC=$QC_WITH_ZLIB_INC
-echo QC_WITH_ZLIB_LIB=$QC_WITH_ZLIB_LIB
-echo QC_WITH_QJDNS_INC=$QC_WITH_QJDNS_INC
-echo QC_WITH_QJDNS_LIB=$QC_WITH_QJDNS_LIB
-echo QC_WITH_B2_INC=$QC_WITH_B2_INC
-echo QC_WITH_B2_LIB=$QC_WITH_B2_LIB
-echo
-fi
-
-printf "Verifying Qt build environment ... "
-
-if [ -z "$QC_QTSELECT" ]; then
-    QC_QTSELECT="$(echo $QT_SELECT | tr -d "qt")"
-fi
-
-if [ ! -z "$QC_QTSELECT" ]; then
-    QTSEARCHTEXT="$QC_QTSELECT"
-else
-    QTSEARCHTEXT="4 or 5"
-fi
-
-# run qmake and check version
-qmake_check() {
-    if [ -x "$1" ]; then
-        cmd="\"$1\" -query QT_VERSION"
-        if [ "$QC_VERBOSE" = "Y" ]; then
-            echo "running: $cmd"
-        fi
-        vout=`/bin/sh -c "$cmd" 2>&1`
-        case "${vout}" in
-            *.*.*)
-                vmaj="${vout%%.*}"
-                if [ ! -z "$QC_QTSELECT" ]; then
-                    if [ "$vmaj" = "$QC_QTSELECT" ]; then
-                        return 0
-                    fi
-                else
-                    if [ "$vmaj" = "4" ] || [ "$vmaj" = "5" ]; then
-                        return 0
-                    fi
-                fi
-                ;;
-        esac
-        if [ "$QC_VERBOSE" = "Y" ]; then
-            echo "Warning: $1 not for Qt ${QTSEARCHTEXT}"
-        fi
-    fi
-    return 1
-}
-
-if [ "$QC_VERBOSE" = "Y" ]; then
-    echo
-fi
-
-qm=""
-qt4_names="qmake-qt4 qmake4"
-qt5_names="qmake-qt5 qmake5"
-names="qmake"
-if [ -z "$QC_QTSELECT" ]; then
-    names="${qt5_names} ${qt4_names} $names"
-else
-    if [ "$QC_QTSELECT" = "4" ]; then
-        names="${qt4_names} $names"
-    elif [ "$QC_QTSELECT" -ge "5" ]; then
-        names="${qt5_names} $names"
-    fi
-fi
-
-if [ -z "$qm" ] && [ ! -z "$EX_QTDIR" ]; then
-    # qt4 check: --qtdir
-    for n in $names; do
-        qstr=$EX_QTDIR/bin/$n
-        if qmake_check "$qstr"; then
-            qm=$qstr
-            break
-        fi
-    done
-    if [ -z "$qm" ] && [ "$QC_VERBOSE" = "Y" ]; then
-        echo "Warning: qmake not found via --qtdir"
-    fi
-
-elif [ -z "$qm" ] && [ ! -z "$QTDIR" ]; then
-    # qt4 check: QTDIR
-    for n in $names; do
-        qstr=$QTDIR/bin/$n
-        if qmake_check "$qstr"; then
-            qm=$qstr
-            break
-        fi
-    done
-    if [ -z "$qm" ] && [ "$QC_VERBOSE" = "Y" ]; then
-        echo "Warning: qmake not found via \$QTDIR"
-    fi
-
-else
-    # Try all other implicit checks
-
-    # qtchooser
-    if [ -z "$qm" ]; then
-        qtchooser=$($WHICH qtchooser 2>/dev/null)
-        if [ ! -z "$qtchooser" ]; then
-            if [ ! -z "$QC_QTSELECT" ]; then
-                versions="$QC_QTSELECT"
-            else
-                cmd="$qtchooser --list-versions"
-                if [ "$QC_VERBOSE" = "Y" ]; then
-                    echo "running: $cmd"
-                fi
-                versions=`$cmd`
-            fi
-            for version in $versions; do
-                cmd="$qtchooser -run-tool=qmake -qt=${version} -query QT_INSTALL_BINS"
-                if [ "$QC_VERBOSE" = "Y" ]; then
-                    echo "running: $cmd"
-                fi
-                qtbins=`$cmd 2>/dev/null`
-                if [ ! -z "$qtbins" ] && qmake_check "$qtbins/qmake"; then
-                    qm="$qtbins/qmake"
-                    break
-                fi
-            done
-        fi
-    fi
-    if [ -z "$qm" ] && [ "$QC_VERBOSE" = "Y" ]; then
-        echo "Warning: qmake not found via qtchooser"
-    fi
-
-    # qt4: pkg-config
-    if [ -z "$qm" ]; then
-        cmd="pkg-config QtCore --variable=exec_prefix"
-        if [ "$QC_VERBOSE" = "Y" ]; then
-            echo "running: $cmd"
-        fi
-        str=`$cmd 2>/dev/null`
-        if [ ! -z "$str" ]; then
-            for n in $names; do
-                qstr=$str/bin/$n
-                if qmake_check "$qstr"; then
-                    qm=$qstr
-                    break
-                fi
-            done
-        fi
-    fi
-    if [ -z "$qm" ] && [ "$QC_VERBOSE" = "Y" ]; then
-        echo "Warning: qmake not found via pkg-config"
-    fi
-
-    # qmake in PATH
-    if [ -z "$qm" ]; then
-        for n in $names; do
-            qstr=`$WHICH -a $n 2>/dev/null`
-            for q in $qstr; do
-                if qmake_check "$q"; then
-                    qm="$q"
-                    break
-                fi
-            done
-            if [ ! -z "$qm" ]; then
-                break
-            fi
-        done
-    fi
-    if [ -z "$qm" ] && [ "$QC_VERBOSE" = "Y" ]; then
-        echo "Warning: qmake not found via \$PATH"
-    fi
-
-    # end of implicit checks
-fi
-
-if [ -z "$qm" ]; then
-    if [ "$QC_VERBOSE" = "Y" ]; then
-        echo " -> fail"
-    else
-        echo "fail"
-    fi
-    printf "\n"
-    printf "Reason: Unable to find the 'qmake' tool for Qt ${QTSEARCHTEXT}.\n"
-    printf "\n"
-    show_qt_info
-    exit 1;
-fi
-if [ "$QC_VERBOSE" = "Y" ]; then
-    echo qmake found in "$qm"
-fi
-
-# try to determine the active makespec
-defmakespec=$QMAKESPEC
-if [ -z "$defmakespec" ]; then
-    if $WHICH readlink >/dev/null 2>&1; then
-        READLINK=`$WHICH readlink`
-    fi
-    if [ ! -z "$READLINK" ]; then
-        qt_mkspecsdir=`"$qm" -query QT_INSTALL_DATA`/mkspecs
-        if [ -d "$qt_mkspecsdir" ] && [ -h "$qt_mkspecsdir/default" ]; then
-            defmakespec=`$READLINK $qt_mkspecsdir/default`
-        fi
-    fi
-fi
-
-if [ "$QC_VERBOSE" = "Y" ]; then
-    echo makespec is $defmakespec
-fi
-
-qm_spec=""
-# if the makespec is macx-xcode, force macx-g++
-if [ "$defmakespec" = "macx-xcode" ]; then
-    qm_spec=macx-g++
-    QMAKESPEC=$qm_spec
-    export QMAKESPEC
-    if [ "$QC_VERBOSE" = "Y" ]; then
-        echo overriding makespec to $qm_spec
-    fi
-fi
-
-gen_files() {
-cat >"$1/modules.cpp" <<EOT
-#line 1 "qt42.qcm"
-/*
------BEGIN QCMOD-----
-name: Qt >= 4.2
------END QCMOD-----
-*/
-class qc_qt42 : public ConfObj
-{
-public:
-    qc_qt42(Conf *c) : ConfObj(c) {}
-    QString name() const { return "Qt >= 4.2"; }
-    QString shortname() const { return "qt42"; }
-    bool exec()
-    {
-        conf->debug(QString("QT_VERSION = 0x%1").arg(QString::number(QT_VERSION, 16)));
-        if(QT_VERSION >= 0x040200)
-            return true;
-        else
-            return false;
-    }
-};
-#line 1 "buildmode.qcm"
-/*
------BEGIN QCMOD-----
-name: buildmode
-section: project
-arg: release,Build with debugging turned off (default).
-arg: debug,Build with debugging turned on.
-arg: debug-and-release,Build two versions, with and without debugging turned on (mac only).
-arg: no-separate-debug-info,Do not store debug information in a separate file (default for mac).
-arg: separate-debug-info,Strip debug information into a separate .debug file (default for non-mac).
-arg: no-framework,Do not build as a Mac framework.
-arg: framework,Build as a Mac framework (default).
------END QCMOD-----
-*/
-
-#define QC_BUILDMODE
-bool qc_buildmode_release = false;
-bool qc_buildmode_debug = false;
-bool qc_buildmode_framework = false;
-bool qc_buildmode_separate_debug_info = false;
-
-class qc_buildmode : public ConfObj
-{
-public:
-    qc_buildmode(Conf *c) : ConfObj(c) {}
-    QString name() const { return "buildmode"; }
-    QString shortname() const { return "buildmode"; }
-
-    // no output
-    QString checkString() const { return QString(); }
-
-    bool exec()
-    {
-        // first, parse out the options
-        bool opt_release = false;
-        bool opt_debug = false;
-        bool opt_debug_and_release = false;
-        bool opt_no_framework = false;
-        bool opt_framework = false;
-        bool opt_no_separate_debug_info = false;
-        bool opt_separate_debug_info = false;
-
-        if(conf->getenv("QC_RELEASE") == "Y")
-            opt_release = true;
-        if(conf->getenv("QC_DEBUG") == "Y")
-            opt_debug = true;
-        if(conf->getenv("QC_DEBUG_AND_RELEASE") == "Y")
-            opt_debug_and_release = true;
-        if(conf->getenv("QC_NO_FRAMEWORK") == "Y")
-            opt_no_framework = true;
-        if(conf->getenv("QC_FRAMEWORK") == "Y")
-            opt_framework = true;
-        if(conf->getenv("QC_NO_SEPARATE_DEBUG_INFO") == "Y")
-            opt_no_separate_debug_info = true;
-        if(conf->getenv("QC_SEPARATE_DEBUG_INFO") == "Y")
-            opt_separate_debug_info = true;
-
-        bool staticmode = false;
-        if(conf->getenv("QC_STATIC") == "Y")
-            staticmode = true;
-
-#ifndef Q_OS_MAC
-        if(opt_debug_and_release)
-        {
-            printf("\\nError: The --debug-and-release option is for mac only.\\n");
-            exit(1);
-        }
-
-        if(opt_framework)
-        {
-            printf("\\nError: The --framework option is for mac only.\\n");
-            exit(1);
-        }
-#endif
-
-        if(opt_framework && opt_debug)
-        {
-            printf("\\nError: Cannot use both --framework and --debug.\\n");
-            exit(1);
-        }
-
-        // sanity check exclusive options
-        int x;
-
-        // build mode
-        x = 0;
-        if(opt_release)
-            ++x;
-        if(opt_debug)
-            ++x;
-        if(opt_debug_and_release)
-            ++x;
-        if(x > 1)
-        {
-            printf("\\nError: Use only one of --release, --debug, or --debug-and-release.\\n");
-            exit(1);
-        }
-
-        // framework
-        if(opt_framework && staticmode)
-        {
-            printf("\\nError: Cannot use both --framework and --static.\\n");
-            exit(1);
-        }
-
-        x = 0;
-        if(opt_no_framework)
-            ++x;
-        if(opt_framework)
-            ++x;
-        if(x > 1)
-        {
-            printf("\\nError: Use only one of --framework or --no-framework.\\n");
-            exit(1);
-        }
-
-        // debug info
-        x = 0;
-        if(opt_no_separate_debug_info)
-            ++x;
-        if(opt_separate_debug_info)
-            ++x;
-        if(x > 1)
-        {
-            printf("\\nError: Use only one of --separate-debug-info or --no-separate-debug-info\\n");
-            exit(1);
-        }
-
-        // now process the options
-
-        if(opt_release)
-            qc_buildmode_release = true;
-        else if(opt_debug)
-            qc_buildmode_debug = true;
-        else if(opt_debug_and_release)
-        {
-            qc_buildmode_release = true;
-            qc_buildmode_debug = true;
-        }
-        else // default
-            qc_buildmode_release = true;
-
-        if(opt_framework)
-            qc_buildmode_framework = true;
-        else if(opt_no_framework)
-        {
-            // nothing to do
-        }
-        else // default
-        {
-            if(!staticmode && !opt_debug)
-                qc_buildmode_framework = true;
-        }
-
-        if(opt_separate_debug_info)
-            qc_buildmode_separate_debug_info = true;
-        else if(opt_no_separate_debug_info)
-        {
-            // nothing to do
-        }
-        else // default
-        {
-#ifndef Q_OS_MAC
-            qc_buildmode_separate_debug_info = true;
-#endif
-        }
-
-        // make the string
-        QStringList opts;
-        QString other;
-
-        if(qc_buildmode_release && qc_buildmode_debug)
-        {
-            opts += "debug_and_release";
-            opts += "build_all";
-        }
-        else if(qc_buildmode_release)
-            opts += "release";
-        else // qc_buildmode_debug
-            opts += "debug";
-
-#ifdef Q_OS_MAC
-        if(qc_buildmode_framework)
-            opts += "lib_bundle";
-#endif
-
-        if(qc_buildmode_separate_debug_info)
-        {
-            opts += "separate_debug_info";
-            other += "QMAKE_CFLAGS += -g\\n";
-            other += "QMAKE_CXXFLAGS += -g\\n";
-        }
-
-        QString str = QString("CONFIG += ") + opts.join(" ") + '\\n';
-        conf->addExtra(str);
-
-        if(!other.isEmpty())
-            conf->addExtra(other);
-
-        return true;
-    }
-};
-#line 1 "universal.qcm"
-/*
------BEGIN QCMOD-----
-name: Mac universal binary support
-section: project
-arg: universal,Build with Mac universal binary support.
-arg: mac-sdk=[path],Path to Mac universal SDK (PPC host only).
------END QCMOD-----
-*/
-
-#define QC_UNIVERSAL
-bool qc_universal_enabled = false;
-QString qc_universal_sdk;
-
-//----------------------------------------------------------------------------
-// qc_universal
-//----------------------------------------------------------------------------
-class qc_universal : public ConfObj
-{
-public:
-    qc_universal(Conf *c) : ConfObj(c) {}
-    QString name() const { return "Mac universal binary support"; }
-    QString shortname() const { return "universal"; }
-    QString checkString() const { return QString(); }
-
-    bool exec()
-    {
-#ifdef Q_OS_MAC
-        if(qc_getenv("QC_UNIVERSAL") == "Y")
-        {
-            qc_universal_enabled = true;
-
-            QString str =
-            "contains(QT_CONFIG,x86):contains(QT_CONFIG,ppc) {\\n"
-            "    CONFIG += x86 ppc\\n"
-            "}\\n";
-
-            QString sdk = qc_getenv("QC_MAC_SDK");
-            if(!sdk.isEmpty())
-            {
-                str += QString("QMAKE_MAC_SDK = %1\\n").arg(sdk);
-                qc_universal_sdk = sdk;
-            }
-
-            conf->addExtra(str);
-        }
-#endif
-        return true;
-    }
-};
-#line 1 "qca.qcm"
-/*
------BEGIN QCMOD-----
-name: QCA >= 2.0
-arg: with-qca-inc=[path],Path to QCA include files
-arg: with-qca-lib=[path],Path to QCA library or framework files
------END QCMOD-----
-*/
-
-// adapted from crypto.prf
-static QString internal_crypto_prf(const QString &incdir, const QString &libdir, const QString &frameworkdir)
-{
-    QString out = QString("QCA_INCDIR = %1\\n"
-                          "QCA_LIBDIR = %2\\n"
-                          "QMAKE_RPATHDIR = %2\\n"
-                          "QCA_FRAMEWORKDIR = %3\\n"
-                          "\\n"
-                          "CONFIG *= qt\\n"
-                          "\\n"
-                          "LINKAGE =\\n"
-                          "QCA_NAME = qca-qt5\\n"
-                          "\\n"
-                          "!isEmpty(QCA_FRAMEWORKDIR): {\\n"
-                          "    framework_dir = \$\$QCA_FRAMEWORKDIR\\n"
-                          "    exists(\$\$framework_dir/\$\${QCA_NAME}.framework) {\\n"
-                          "        #QMAKE_FRAMEWORKPATH *= \$\$framework_dir\\n"
-                          "        LIBS *= -F\$\$framework_dir\\n"
-                          "        INCLUDEPATH += \$\$framework_dir/\$\${QCA_NAME}.framework/Headers\\n"
-                          "        LINKAGE = -framework \$\${QCA_NAME}\\n"
-                          "    }\\n"
-                          "}\\n"
-                          "\\n"
-                          "# else, link normally\\n"
-                          "isEmpty(LINKAGE) {\\n"
-                          "    !isEmpty(QCA_INCDIR):INCLUDEPATH += \$\$QCA_INCDIR/QtCrypto\\n"
-                          "    !isEmpty(QCA_LIBDIR):LIBS += -L\$\$QCA_LIBDIR\\n"
-                          "    LINKAGE = -l\$\${QCA_NAME}\\n"
-                          "    CONFIG(debug, debug|release) {\\n"
-                          "        windows:LINKAGE = -l\$\${QCA_NAME}d\\n"
-                          "        mac:LINKAGE = -l\$\${QCA_NAME}_debug\\n"
-                          "    }\\n"
-                          "}\\n"
-                          "\\n"
-                          "LIBS += \$\$LINKAGE\\n")
-                      .arg(incdir, libdir, frameworkdir);
-    return out;
-}
-
-// set either libdir or frameworkdir, but not both
-static bool qca_try(Conf *conf, const QString &incdir, const QString &libdir, const QString &frameworkdir, bool release,
-                    bool debug, QString *_prf)
-{
-    QString proextra;
-    QString prf;
-    if (!incdir.isEmpty() || !libdir.isEmpty() || !frameworkdir.isEmpty()) {
-        prf = internal_crypto_prf(conf->escapePath(incdir), conf->escapePath(libdir), frameworkdir);
-    } else {
-        prf = "CONFIG += crypto\\n";
-    }
-    proextra = "CONFIG += qt\\n"
-               "CONFIG -= debug_and_release debug release\\n"
-               "QT -= gui\\n";
-    proextra += prf;
-
-    QString str = "#include <QtCrypto>\\n"
-                  "\\n"
-                  "int main()\\n"
-                  "{\\n"
-                  "    unsigned long x = QCA_VERSION;\\n"
-                  "    if(x >= 0x020000 && x < 0x030000) return 0; else return 1;\\n"
-                  "}\\n";
-
-    // test desired versions, potentially both release and debug
-
-    if (release) {
-        int ret;
-        if (!conf->doCompileAndLink(str, QStringList(), QString(), proextra + "CONFIG += release\\n", &ret) || ret != 0)
-            return false;
-    }
-
-    if (debug) {
-        int ret;
-        if (!conf->doCompileAndLink(str, QStringList(), QString(), proextra + "CONFIG += debug\\n", &ret) || ret != 0)
-            return false;
-    }
-
-    *_prf = prf;
-    return true;
-}
-
-static bool qca_try_lib(Conf *conf, const QString &incdir, const QString &libdir, bool release, bool debug,
-                        QString *prf)
-{
-    return qca_try(conf, incdir, libdir, QString(), release, debug, prf)
-        || qca_try(conf, incdir + "/Qca-qt5", libdir, QString(), release, debug, prf);
-}
-
-static bool qca_try_framework(Conf *conf, const QString &frameworkdir, bool release, bool debug, QString *prf)
-{
-    return qca_try(conf, QString(), QString(), frameworkdir, release, debug, prf);
-}
-
-static bool qca_try_ext_prf(Conf *conf, bool release, bool debug, QString *prf)
-{
-    return qca_try(conf, QString(), QString(), QString(), release, debug, prf);
-}
-
-//----------------------------------------------------------------------------
-// qc_qca
-//----------------------------------------------------------------------------
-class qc_qca : public ConfObj {
-public:
-    qc_qca(Conf *c) : ConfObj(c) { }
-    QString name() const { return "QCA >= 2.0"; }
-    QString shortname() const { return "qca"; }
-    bool    exec()
-    {
-        // get the build mode
-#ifdef QC_BUILDMODE
-        bool release = qc_buildmode_release;
-        bool debug   = qc_buildmode_debug;
-#else
-        // else, default to just release mode
-        bool release = true;
-        bool debug   = false;
-#endif
-
-        QString qca_incdir, qca_libdir, qca_crypto_prf;
-        qca_incdir = conf->getenv("QC_WITH_QCA_INC");
-        qca_libdir = conf->getenv("QC_WITH_QCA_LIB");
-
-#if defined(Q_OS_MAC)
-        if (!qca_libdir.isEmpty() && qca_try_framework(conf, qca_libdir, release, debug, &qca_crypto_prf)) {
-            conf->addExtra(qca_crypto_prf);
-            return true;
-        }
-#endif
-
-        if (!qca_incdir.isEmpty() && !qca_libdir.isEmpty()
-            && qca_try_lib(conf, qca_incdir, qca_libdir, release, debug, &qca_crypto_prf)) {
-            conf->addExtra(qca_crypto_prf);
-            return true;
-        }
-
-        if (qca_try_ext_prf(conf, release, debug, &qca_crypto_prf)) {
-            conf->addExtra(qca_crypto_prf);
-            return true;
-        }
-
-        QStringList incs;
-        QString     version, libs, other;
-
-        if (conf->findPkgConfig("qca2-qt5", VersionMin, "2.0.0", &version, &incs, &libs, &other)) {
-            for (int n = 0; n < incs.count(); ++n)
-                conf->addIncludePath(incs[n]);
-            if (!libs.isEmpty())
-                conf->addLib(libs);
-            return true;
-        }
-
-        QStringList prefixes;
-#ifndef Q_OS_WIN
-        prefixes += "/usr";
-        prefixes += "/usr/local";
-#endif
-        QString prefix = conf->getenv("PREFIX");
-        if (!prefix.isEmpty()) {
-            prefixes += prefix;
-        }
-
-        for (int n = 0; n < prefixes.count(); ++n) {
-            const QString &prefix = prefixes[n];
-            if (qca_try_lib(conf, prefix + "/include", prefix + "/lib", release, debug, &qca_crypto_prf)) {
-                conf->addExtra(qca_crypto_prf);
-                return true;
-            }
-        }
-
-        return false;
-    }
-};
-#line 1 "zlib.qcm"
-/*
------BEGIN QCMOD-----
-name: zlib
-arg: with-zlib-inc=[path],Path to zlib include files
-arg: with-zlib-lib=[path],Path to zlib library files
------END QCMOD-----
-*/
-
-//----------------------------------------------------------------------------
-// qc_zlib
-//----------------------------------------------------------------------------
-class qc_zlib : public ConfObj
-{
-public:
-    qc_zlib(Conf *c) : ConfObj(c) {}
-    QString name() const { return "zlib"; }
-    QString shortname() const { return "zlib"; }
-    bool exec()
-    {
-        QString inc, lib;
-        QString s;
-
-        s = conf->getenv("QC_WITH_ZLIB_INC");
-        if(!s.isEmpty()) {
-            if(!conf->checkHeader(s, "zlib.h"))
-                return false;
-            inc = s;
-        }
-        else {
-            if(!conf->findHeader("zlib.h", QStringList(), &s))
-                return false;
-            inc = s;
-        }
-
-        s = conf->getenv("QC_WITH_ZLIB_LIB");
-        if(!s.isEmpty()) {
-            if(!conf->checkLibrary(s, "z"))
-                return false;
-            lib = s;
-        }
-        else {
-            if(!conf->findLibrary("z", &s))
-                return false;
-            lib = s;
-        }
-
-        if(!inc.isEmpty())
-            conf->addIncludePath(inc);
-        if(!lib.isEmpty())
-            conf->addLib(QString("-L") + s);
-        conf->addLib("-lz");
-
-        return true;
-    }
-};
-#line 1 "extra.qcm"
-/*
------BEGIN QCMOD-----
-name: extra
-section: project
-arg: enable-tests,Build examples and unittests.
------END QCMOD-----
-*/
-
-class qc_extra : public ConfObj
-{
-public:
-    qc_extra(Conf *c) : ConfObj(c) {}
-    QString name() const { return "extra"; }
-    QString shortname() const { return "extra"; }
-
-    // no output
-    QString checkString() const { return QString(); }
-
-    bool exec()
-    {
-        QString str;
-        QFile f;
-
-        if(conf->getenv("QC_ENABLE_TESTS") == "Y")
-            str += "CONFIG += iris_tests\\n";
-
-        conf->addExtra(str);
-
-        bool release = true;
-        bool debug = false;
-        bool debug_info = false;
-        bool universal = false;
-        QString sdk;
-
-#ifdef QC_BUILDMODE
-        release = qc_buildmode_release;
-        debug = qc_buildmode_debug;
-        debug_info = qc_buildmode_separate_debug_info;
-#endif
-
-#ifdef QC_UNIVERSAL
-        universal = qc_universal_enabled;
-        sdk = qc_universal_sdk;
-#endif
-
-        // write confapp_unix.pri
-        str = QString();
-                QString var = conf->getenv("BINDIR");
-                if(!var.isEmpty())
-            str += QString("BINDIR = %1\\n").arg(var);
-        if(debug) // debug or debug-and-release
-            str += QString("CONFIG += debug\\n");
-        else // release
-            str += QString("CONFIG += release\\n");
-        if(debug_info)
-        {
-            str += QString("CONFIG += separate_debug_info\\n");
-            str += "QMAKE_CFLAGS += -g\\n";
-            str += "QMAKE_CXXFLAGS += -g\\n";
-        }
-        if(universal)
-        {
-            str +=
-            "contains(QT_CONFIG,x86):contains(QT_CONFIG,ppc) {\\n"
-            "    CONFIG += x86 ppc\\n"
-            "}\\n";
-
-            if(!sdk.isEmpty())
-                str += QString("QMAKE_MAC_SDK = %1\\n").arg(sdk);
-        }
-#ifdef QC_QCA
-        if(!qc_qca_procode.isEmpty())
-            str += qc_qca_procode;
-#endif
-        f.setFileName("confapp_unix.pri");
-        if(f.open(QFile::WriteOnly | QFile::Truncate))
-            f.write(str.toLatin1());
-        f.close();
-
-        return true;
-    }
-};
-#line 1 "qjdns.qcm"
-/*
------BEGIN QCMOD-----
-name: jdns
-arg: with-qjdns-inc=[path],Path to QJDns include files
-arg: with-qjdns-lib=[path],Path to QJDns library files
------END QCMOD-----
-*/
-
-//----------------------------------------------------------------------------
-// qc_qjdns
-//----------------------------------------------------------------------------
-class qc_qjdns : public ConfObj
-{
-public:
-    qc_qjdns(Conf *c) : ConfObj(c) {}
-    QString name() const { return "QJDns"; }
-    QString shortname() const { return "qjdns"; }
-    QString resultString() const
-    {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-        return "Disabled for Qt5 and above";
-#else
-        return ConfObj::resultString();
-#endif
-    }
-    bool exec()
-    {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-        return true; // hack. TODO: figure out how to force jdns
-#endif
-        conf->addExtra("CONFIG += need_jdns");
-#if defined Q_OS_WIN || defined Q_OS_MAC
-        // HACK: on Windows and Mac OS X, always use psi's bundled qjdns
-        conf->addExtra("CONFIG += iris-qjdns");
-        return true;
-#else
-        QStringList incs;
-        QString version, libs, other;
-        QString s;
-
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-        bool found = conf->findPkgConfig("qjdns-qt5", VersionMin, "2.0.3", &version, &incs, &libs, &other);
-#else
-        bool found = conf->findPkgConfig("qjdns-qt4", VersionMin, "2.0.3", &version, &incs, &libs, &other);
-#endif
-        if(!found && !conf->findPkgConfig("qjdns", VersionMin, "2.0.0", &version, &incs, &libs, &other)) {
-            s = conf->getenv("QC_WITH_QJDNS_INC");
-            if ((!s.isEmpty() && conf->checkHeader(s, "qjdns.h")) ||
-                (s.isEmpty() && conf->findHeader("qjdns.h", QStringList(), &s))) {
-                incs.append(s);
-            }
-
-            s = conf->getenv("QC_WITH_QJDNS_LIB");
-            if((!s.isEmpty() && conf->checkLibrary(s, "qjdns")) ||
-               (s.isEmpty() && conf->findLibrary("qjdns", &s))) {
-                libs = s.isEmpty()? "-lqjdns -ljdns" : QString("-L%1 -lqjdns -ljdns").arg(s);
-            }
-        }
-
-        if (!incs.isEmpty() && !libs.isEmpty()) {
-            foreach(const QString &inc, incs) {
-                conf->addIncludePath(inc);
-            }
-            conf->addLib(libs);
-            conf->addExtra("CONFIG += ext-qjdns");
-        }
-
-        return true;
-#endif
-    }
-};
-#line 1 "b2.qcm"
-/*
------BEGIN QCMOD-----
-name: libb2
-arg: with-b2-inc=[path],Path to libb2 include files
-arg: with-b2-lib=[path],Path to libb2 library or framework files
------END QCMOD-----
-*/
-
-//----------------------------------------------------------------------------
-// qc_b2
-//----------------------------------------------------------------------------
-class qc_b2 : public ConfObj
-{
-    bool use_system = false;
-public:
-    qc_b2(Conf *c) : ConfObj(c) {}
-    QString name() const { return "LibB2"; }
-    QString shortname() const { return "libb2"; }
-    QString resultString() const { return use_system? "system":"bundled"; }
-    bool exec()
-    {
-        QString b2_incdir, b2_libdir;
-        b2_incdir = conf->getenv("QC_WITH_B2_INC");
-        b2_libdir = conf->getenv("QC_WITH_B2_LIB");
-
-        if (b2_incdir.isEmpty() && b2_libdir.isEmpty()) {
-            if (!checkCustomDirs(b2_incdir, b2_libdir)) {
-                printf("b2 search paths provided but library is not found there. use bundled");
-                return true;
-            }
-            use_system = true;
-        } else {
-            QStringList incs;
-            QString version, libs, other;
-            if(conf->findPkgConfig("libb2", VersionAny, QString::null, &version, &incs, &libs, &other))
-            {
-                    for(int n = 0; n < incs.count(); ++n)
-                            conf->addIncludePath(incs[n]);
-                    if(!libs.isEmpty())
-                            conf->addLib(libs);
-                    use_system = true;
-            }
-        }
-
-        if (use_system) {
-            conf->addExtra("CONFIG += bundled_blake2");
-        }
-
-        return true;
-    }
-
-    bool checkCustomDirs(QString &b2_incdir, QString &b2_libdir)
-    {
-        if ((b2_incdir.isEmpty() && !conf->findHeader("blake2.h", QStringList(), &b2_incdir)) ||
-            (!b2_incdir.isEmpty() && !conf->checkHeader(b2_incdir, "blake2.h"))) {
-            printf("Headers not found!\\n");
-            return false;
-        }
-
-        if((!b2_libdir.isEmpty() && conf->checkLibrary(b2_libdir, "b2")) ||
-           (b2_libdir.isEmpty() && conf->findLibrary("b2", &b2_libdir))) {
-            conf->addLib(b2_libdir.isEmpty()? "-lb2" : QString("-L%1 -lb2").arg(b2_libdir));
-            conf->addIncludePath(b2_incdir);
-            return true;
-        }
-
-        printf("Libraries not found!\\n");
-        return false;
-    }
-};
-
-EOT
-cat >"$1/modules_new.cpp" <<EOT
-    o = new qc_qt42(conf);
-    o->required = true;
-    o->disabled = false;
-    o = new qc_buildmode(conf);
-    o->required = true;
-    o->disabled = false;
-    o = new qc_universal(conf);
-    o->required = true;
-    o->disabled = false;
-    o = new qc_qca(conf);
-    o->required = true;
-    o->disabled = false;
-    o = new qc_zlib(conf);
-    o->required = true;
-    o->disabled = false;
-    o = new qc_extra(conf);
-    o->required = true;
-    o->disabled = false;
-    o = new qc_qjdns(conf);
-    o->required = true;
-    o->disabled = false;
-    o = new qc_b2(conf);
-    o->required = true;
-    o->disabled = false;
-
-EOT
-cat >"$1/conf4.h" <<EOT
-/*
-Copyright (C) 2004-2008  Justin Karneges
-
-This file is free software; unlimited permission is given to copy and/or
-distribute it, with or without modifications, as long as this notice is
-preserved.
-*/
-
-#ifndef QC_CONF4_H
-#define QC_CONF4_H
-
-#include <QtCore>
-
-class Conf;
-
-enum VersionMode { VersionMin, VersionExact, VersionMax, VersionAny };
-
-// ConfObj
-//
-// Subclass ConfObj to create a new configuration module.
-class ConfObj {
-public:
-    Conf *conf;
-    bool  required;
-    bool  disabled;
-    bool  success;
-
-    ConfObj(Conf *c);
-    virtual ~ConfObj();
-
-    // long or descriptive name of what is being checked/performed
-    // example: "KDE >= 3.3"
-    virtual QString name() const = 0;
-
-    // short name
-    // example: "kde"
-    virtual QString shortname() const = 0;
-
-    // string to display during check
-    // default: "Checking for [name] ..."
-    virtual QString checkString() const;
-
-    // string to display after check
-    // default: "yes" or "no", based on result of exec()
-    virtual QString resultString() const;
-
-    // this is where the checking code goes
-    virtual bool exec() = 0;
-};
-
-// Conf
-//
-// Interact with this class from your ConfObj to perform detection
-// operations and to output configuration parameters.
-class Conf {
-public:
-    bool    debug_enabled;
-    QString qmake_path;
-    QString qmakespec;
-    QString maketool;
-
-    QString     DEFINES;
-    QStringList INCLUDEPATH;
-    QStringList LIBS;
-    QString     extra;
-
-    QList<ConfObj *>       list;
-    QMap<QString, QString> vars;
-
-    Conf();
-    ~Conf();
-
-    QString        getenv(const QString &var);
-    QString        qvar(const QString &s);
-    QString        normalizePath(const QString &s) const;
-    QString        escapeQmakeVar(const QString &s) const;
-    inline QString escapePath(const QString &s) /* prepare fs path for qmake file */
-    {
-        return escapeQmakeVar(normalizePath(s));
-    }
-    QString escapedIncludes() const;
-    QString escapedLibs() const;
-
-    bool exec();
-
-    void debug(const QString &s);
-
-    QString expandIncludes(const QString &inc);
-    QString expandLibs(const QString &lib);
-
-    int doCommand(const QString &s, QByteArray *out = 0);
-    int doCommand(const QString &prog, const QStringList &args, QByteArray *out = 0);
-
-    bool    doCompileAndLink(const QString &filedata, const QStringList &incs, const QString &libs,
-                             const QString &proextra, int *retcode = 0);
-    bool    checkHeader(const QString &path, const QString &h);
-    bool    findHeader(const QString &h, const QStringList &ext, QString *inc);
-    bool    checkLibrary(const QString &path, const QString &name);
-    bool    findLibrary(const QString &name, QString *lib);
-    QString findProgram(const QString &prog);
-    bool findSimpleLibrary(const QString &incvar, const QString &libvar, const QString &incname, const QString &libname,
-                           QString *incpath, QString *libs);
-    bool findFooConfig(const QString &path, QString *version, QStringList *incs, QString *libs, QString *otherflags);
-    bool findPkgConfig(const QString &name, VersionMode mode, const QString &req_version, QString *version,
-                       QStringList *incs, QString *libs, QString *otherflags);
-
-    void addDefine(const QString &str);
-    void addLib(const QString &str);
-    void addIncludePath(const QString &str);
-    void addExtra(const QString &str);
-
-private:
-    bool first_debug;
-
-    friend class ConfObj;
-    void added(ConfObj *o);
-};
-
-#endif
-
-EOT
-cat >"$1/conf4.cpp" <<EOT
-/*
-Copyright (C) 2004-2008  Justin Karneges
-
-This file is free software; unlimited permission is given to copy and/or
-distribute it, with or without modifications, as long as this notice is
-preserved.
-*/
-
-#include "conf4.h"
-
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#ifndef PATH_MAX
-#ifdef Q_OS_WIN
-#define PATH_MAX 260
-#endif
-#endif
-
-class MocTestObject : public QObject {
-
-    Q_OBJECT
-public:
-    MocTestObject() {}
-};
-
-QString qc_getenv(const QString &var)
-{
-    char *p = ::getenv(var.toLatin1().data());
-    if (!p)
-        return QString();
-    return QString(p);
-}
-
-QStringList qc_pathlist()
-{
-    QStringList list;
-    QString     path = qc_getenv("PATH");
-    if (!path.isEmpty()) {
-#ifdef Q_OS_WIN
-        list = path.split(';', QString::SkipEmptyParts);
-#else
-        list = path.split(':', QString::SkipEmptyParts);
-#endif
-    }
-#ifdef Q_OS_WIN
-    list.prepend(".");
-#endif
-    return list;
-}
-
-QString qc_findprogram(const QString &prog)
-{
-    QString     out;
-    QStringList list = qc_pathlist();
-    for (int n = 0; n < list.count(); ++n) {
-        QFileInfo fi(list[n] + '/' + prog);
-        if (fi.exists() && fi.isExecutable()) {
-            out = fi.filePath();
-            break;
-        }
-
-#ifdef Q_OS_WIN
-        // on windows, be sure to look for .exe
-        if (prog.right(4).toLower() != ".exe") {
-            fi = QFileInfo(list[n] + '/' + prog + ".exe");
-            if (fi.exists() && fi.isExecutable()) {
-                out = fi.filePath();
-                break;
-            }
-        }
-#endif
-    }
-    return out;
-}
-
-QString qc_findself(const QString &argv0)
-{
-#ifdef Q_OS_WIN
-    if (argv0.contains('\\\\'))
-#else
-    if (argv0.contains('/'))
-#endif
-        return argv0;
-    else
-        return qc_findprogram(argv0);
-}
-
-int qc_run_program_or_command(const QString &prog, const QStringList &args, const QString &command, QByteArray *out,
-                              bool showOutput)
-{
-    if (out)
-        out->clear();
-
-    QProcess process;
-    process.setReadChannel(QProcess::StandardOutput);
-
-    if (!prog.isEmpty())
-        process.start(prog, args);
-    else if (!command.isEmpty())
-        process.start(command);
-    else
-        return -1;
-
-    if (!process.waitForStarted(-1))
-        return -1;
-
-    QByteArray buf;
-
-    while (process.waitForReadyRead(-1)) {
-        buf = process.readAllStandardOutput();
-        if (out)
-            out->append(buf);
-        if (showOutput)
-            fprintf(stdout, "%s", buf.data());
-
-        buf = process.readAllStandardError();
-        if (showOutput)
-            fprintf(stderr, "%s", buf.data());
-    }
-
-    buf = process.readAllStandardError();
-    if (showOutput)
-        fprintf(stderr, "%s", buf.data());
-
-    // calling waitForReadyRead will cause the process to eventually be
-    //   marked as finished, so we should not need to separately call
-    //   waitForFinished. however, we will do it anyway just to be safe.
-    //   we won't check the return value since false could still mean
-    //   success (if the process had already been marked as finished).
-    process.waitForFinished(-1);
-
-    if (process.exitStatus() != QProcess::NormalExit)
-        return -1;
-
-    return process.exitCode();
-}
-
-int qc_runcommand(const QString &command, QByteArray *out, bool showOutput)
-{
-    return qc_run_program_or_command(QString(), QStringList(), command, out, showOutput);
-}
-
-int qc_runprogram(const QString &prog, const QStringList &args, QByteArray *out, bool showOutput)
-{
-    return qc_run_program_or_command(prog, args, QString(), out, showOutput);
-}
-
-bool qc_removedir(const QString &dirPath)
-{
-    QDir dir(dirPath);
-    if (!dir.exists())
-        return false;
-    QStringList list = dir.entryList();
-    foreach (QString s, list) {
-        if (s == "." || s == "..")
-            continue;
-        QFileInfo fi(dir.filePath(s));
-        if (fi.isDir()) {
-            if (!qc_removedir(fi.filePath()))
-                return false;
-        } else {
-            if (!dir.remove(s))
-                return false;
-        }
-    }
-    QString dirName = dir.dirName();
-    if (!dir.cdUp())
-        return false;
-    if (!dir.rmdir(dirName))
-        return false;
-    return true;
-}
-
-// simple command line arguemnts splitter able to understand quoted args.
-// the splitter removes quotes and unescapes symbols as well.
-QStringList qc_splitflags(const QString &flags)
-{
-    QStringList ret;
-    bool        searchStart = true;
-    bool        inQuotes    = false;
-    bool        escaped     = false;
-    QChar       quote, backslash = QLatin1Char('\\\\');
-    QString     buf;
-#ifdef PATH_MAX
-    buf.reserve(PATH_MAX);
-#endif
-    for (int i = 0; i < flags.length(); i++) {
-        if (searchStart && flags[i].isSpace()) {
-            continue;
-        }
-        if (searchStart) {
-            searchStart = false;
-            buf.clear();
-        }
-        if (escaped) {
-            buf += flags[i];
-            escaped = false;
-            continue;
-        }
-        // buf += flags[i];
-        if (inQuotes) {
-            if (quote == QLatin1Char('\\'')) {
-                if (flags[i] == quote) {
-                    inQuotes = false;
-                    continue;
-                }
-            } else { // we are in double quoetes
-                if (flags[i] == backslash && i < flags.length() - 1
-                    && (flags[i + 1] == QLatin1Char('"') || flags[i + 1] == backslash)) {
-                    // if next symbol is one of in parentheses ("\\)
-                    escaped = true;
-                    continue;
-                }
-            }
-        } else {
-            if (flags[i].isSpace()) {
-                ret.append(buf);
-                searchStart = true;
-                buf.clear();
-                continue;
-#ifndef Q_OS_WIN /* on windows backslash is just a path separator */
-            } else if (flags[i] == backslash) {
-                escaped = true;
-                continue; // just add next symbol
-#endif
-            } else if (flags[i] == QLatin1Char('\\'') || flags[i] == QLatin1Char('"')) {
-                inQuotes = true;
-                quote    = flags[i];
-                continue;
-            }
-        }
-        buf += flags[i];
-    }
-    if (buf.size()) {
-        ret.append(buf);
-    }
-    return ret;
-}
-
-void qc_splitcflags(const QString &cflags, QStringList *incs, QStringList *otherflags)
-{
-    incs->clear();
-    otherflags->clear();
-
-    QStringList cflagsList = qc_splitflags(cflags);
-    for (int n = 0; n < cflagsList.count(); ++n) {
-        QString str = cflagsList[n];
-        if (str.startsWith("-I")) {
-            // we want everything except the leading "-I"
-            incs->append(str.remove(0, 2));
-        } else {
-            // we want whatever is left
-            otherflags->append(str);
-        }
-    }
-}
-
-QString qc_escapeArg(const QString &str)
-{
-    QString out;
-    for (int n = 0; n < (int)str.length(); ++n) {
-        if (str[n] == '-')
-            out += '_';
-        else
-            out += str[n];
-    }
-    return out;
-}
-
-QString qc_trim_char(const QString &s, const QChar &ch)
-{
-    if (s.startsWith(ch) && s.endsWith(ch)) {
-        return s.mid(1, s.size() - 2);
-    }
-    return s;
-}
-
-// removes surrounding quotes, removes trailing slashes, converts to native separators.
-// accepts unescaped but possible quoted path
-QString qc_normalize_path(const QString &str)
-{
-    QString path = str.trimmed();
-    path         = qc_trim_char(path, QLatin1Char('"'));
-    path         = qc_trim_char(path, QLatin1Char('\\''));
-
-    // It's OK to use unix style'/' paths on windows Qt handles this without any problems.
-    // Using Windows-style '\\\\' can leads strange compilation error with MSYS which uses
-    // unix style.
-    QLatin1Char nativeSep('/');
-#ifdef Q_OS_WIN
-    path.replace(QLatin1Char('\\\\'), QLatin1Char('/'));
-#endif
-    // trim trailing slashes
-    while (path.length() && path[path.length() - 1] == nativeSep) {
-        path.resize(path.length() - 1);
-    }
-    return path;
-}
-
-// escape filesystem path to be added to qmake pro/pri file.
-QString qc_escape_string_var(const QString &str)
-{
-    QString path = str;
-    path.replace(QLatin1Char('\\\\'), QLatin1String("\\\\\\\\")).replace(QLatin1Char('"'), QLatin1String("\\\\\\""));
-    if (path.indexOf(QLatin1Char(' ')) != -1) { // has spaces
-        return QLatin1Char('"') + path + QLatin1Char('"');
-    }
-    return path;
-}
-
-// escapes each path in incs and join into single string suiable for INCLUDEPATH var
-QString qc_prepare_includepath(const QStringList &incs)
-{
-    if (incs.empty()) {
-        return QString();
-    }
-    QStringList ret;
-    foreach (const QString &path, incs) {
-        ret.append(qc_escape_string_var(path));
-    }
-    return ret.join(QLatin1String(" "));
-}
-
-// escapes each path in libs and to make it suiable for LIBS var
-// notice, entries of libs are every single arg for linker.
-QString qc_prepare_libs(const QStringList &libs)
-{
-    if (libs.isEmpty()) {
-        return QString();
-    }
-    QSet<QString> pathSet;
-    QStringList   paths;
-    QStringList   ordered;
-    foreach (const QString &arg, libs) {
-        if (arg.startsWith(QLatin1String("-L"))) {
-            QString path = qc_escape_string_var(arg.mid(2));
-            if (!pathSet.contains(path)) {
-                pathSet.insert(path);
-                paths.append(path);
-            }
-        } else if (arg.startsWith(QLatin1String("-l"))) {
-            ordered.append(arg);
-        } else {
-            ordered.append(qc_escape_string_var(arg));
-        }
-    }
-    QString ret;
-    if (paths.size()) {
-        ret += (QLatin1String(" -L") + paths.join(QLatin1String(" -L")) + QLatin1Char(' '));
-    }
-    return ret + ordered.join(QLatin1String(" "));
-}
-
-//----------------------------------------------------------------------------
-// ConfObj
-//----------------------------------------------------------------------------
-ConfObj::ConfObj(Conf *c)
-{
-    conf = c;
-    conf->added(this);
-    required = false;
-    disabled = false;
-    success  = false;
-}
-
-ConfObj::~ConfObj() {}
-
-QString ConfObj::checkString() const { return QString("Checking for %1 ...").arg(name()); }
-
-QString ConfObj::resultString() const
-{
-    if (success)
-        return "yes";
-    else
-        return "no";
-}
-
-//----------------------------------------------------------------------------
-// qc_internal_pkgconfig
-//----------------------------------------------------------------------------
-class qc_internal_pkgconfig : public ConfObj {
-public:
-    QString     pkgname, desc;
-    VersionMode mode;
-    QString     req_ver;
-
-    qc_internal_pkgconfig(Conf *c, const QString &_name, const QString &_desc, VersionMode _mode,
-                          const QString &_req_ver) :
-        ConfObj(c),
-        pkgname(_name), desc(_desc), mode(_mode), req_ver(_req_ver)
-    {
-    }
-
-    QString name() const { return desc; }
-    QString shortname() const { return pkgname; }
-
-    bool exec()
-    {
-        QStringList incs;
-        QString     version, libs, other;
-        if (!conf->findPkgConfig(pkgname, mode, req_ver, &version, &incs, &libs, &other))
-            return false;
-
-        for (int n = 0; n < incs.count(); ++n)
-            conf->addIncludePath(incs[n]);
-        if (!libs.isEmpty())
-            conf->addLib(libs);
-        // if(!other.isEmpty())
-        //    conf->addExtra(QString("QMAKE_CFLAGS += %1\\n").arg(other));
-
-        if (!required)
-            conf->addDefine("HAVE_PKG_" + qc_escapeArg(pkgname).toUpper());
-
-        return true;
-    }
-};
-
-//----------------------------------------------------------------------------
-// Conf
-//----------------------------------------------------------------------------
-Conf::Conf()
-{
-    // TODO: no more vars?
-    // vars.insert("QMAKE_INCDIR_X11", new QString(X11_INC));
-    // vars.insert("QMAKE_LIBDIR_X11", new QString(X11_LIBDIR));
-    // vars.insert("QMAKE_LIBS_X11",   new QString(X11_LIB));
-    // vars.insert("QMAKE_CC", CC);
-
-    debug_enabled = false;
-    first_debug   = true;
-}
-
-Conf::~Conf() { qDeleteAll(list); }
-
-void Conf::added(ConfObj *o) { list.append(o); }
-
-QString Conf::getenv(const QString &var) { return qc_getenv(var); }
-
-void Conf::debug(const QString &s)
-{
-    if (debug_enabled) {
-        if (first_debug)
-            printf("\\n");
-        first_debug = false;
-        printf(" * %s\\n", qPrintable(s));
-    }
-}
-
-bool Conf::exec()
-{
-    for (int n = 0; n < list.count(); ++n) {
-        ConfObj *o = list[n];
-
-        // if this was a disabled-by-default option, check if it was enabled
-        if (o->disabled) {
-            QString v = QString("QC_ENABLE_") + qc_escapeArg(o->shortname());
-            if (getenv(v) != "Y")
-                continue;
-        }
-        // and the opposite?
-        else {
-            QString v = QString("QC_DISABLE_") + qc_escapeArg(o->shortname());
-            if (getenv(v) == "Y")
-                continue;
-        }
-
-        bool    output = true;
-        QString check  = o->checkString();
-        if (check.isEmpty())
-            output = false;
-
-        if (output) {
-            printf("%s", check.toLatin1().data());
-            fflush(stdout);
-        }
-
-        first_debug = true;
-        bool ok     = o->exec();
-        o->success  = ok;
-
-        if (output) {
-            QString result = o->resultString();
-            if (!first_debug)
-                printf(" -> %s\\n", result.toLatin1().data());
-            else
-                printf(" %s\\n", result.toLatin1().data());
-        }
-
-        if (!ok && o->required) {
-            printf("\\nError: need %s!\\n", o->name().toLatin1().data());
-            return false;
-        }
-    }
-    return true;
-}
-
-QString Conf::qvar(const QString &s) { return vars.value(s); }
-
-QString Conf::normalizePath(const QString &s) const { return qc_normalize_path(s); }
-
-QString Conf::escapeQmakeVar(const QString &s) const { return qc_escape_string_var(s); }
-
-QString Conf::escapedIncludes() const { return qc_prepare_includepath(INCLUDEPATH); }
-
-QString Conf::escapedLibs() const { return qc_prepare_libs(LIBS); }
-
-QString Conf::expandIncludes(const QString &inc) { return QLatin1String("-I") + inc; }
-
-QString Conf::expandLibs(const QString &lib) { return QLatin1String("-L") + lib; }
-
-int Conf::doCommand(const QString &s, QByteArray *out)
-{
-    debug(QString("[%1]").arg(s));
-    int r = qc_runcommand(s, out, debug_enabled);
-    debug(QString("returned: %1").arg(r));
-    return r;
-}
-
-int Conf::doCommand(const QString &prog, const QStringList &args, QByteArray *out)
-{
-    QString fullcmd = prog;
-    QString argstr  = args.join(QLatin1String(" "));
-    if (!argstr.isEmpty())
-        fullcmd += QString(" ") + argstr;
-    debug(QString("[%1]").arg(fullcmd));
-    int r = qc_runprogram(prog, args, out, debug_enabled);
-    debug(QString("returned: %1").arg(r));
-    return r;
-}
-
-bool Conf::doCompileAndLink(const QString &filedata, const QStringList &incs, const QString &libs,
-                            const QString &proextra, int *retcode)
-{
-#ifdef Q_OS_WIN
-    QDir tmp("qconftemp");
-#else
-    QDir tmp(".qconftemp");
-#endif
-    QStringList normalizedLibs;
-    foreach (const QString &l, qc_splitflags(libs)) {
-        normalizedLibs.append(qc_normalize_path(l));
-    }
-
-    if (!tmp.mkdir("atest")) {
-        debug(QString("unable to create atest dir: %1").arg(tmp.absoluteFilePath("atest")));
-        return false;
-    }
-    QDir dir(tmp.filePath("atest"));
-    if (!dir.exists()) {
-        debug("atest dir does not exist");
-        return false;
-    }
-
-    QString fname = dir.filePath("atest.cpp");
-    QString out   = "atest";
-    QFile   f(fname);
-    if (!f.open(QFile::WriteOnly | QFile::Truncate)) {
-        debug("unable to open atest.cpp for writing");
-        return false;
-    }
-    if (f.write(filedata.toLatin1()) == -1) {
-        debug("error writing to atest.cpp");
-        return false;
-    }
-    f.close();
-
-    debug(QString("Wrote atest.cpp:\\n%1").arg(filedata));
-
-    QString pro = QString("CONFIG  += console\\n"
-                          "CONFIG  -= qt app_bundle\\n"
-                          "DESTDIR  = \$\$PWD\\n"
-                          "SOURCES += atest.cpp\\n");
-    QString inc = qc_prepare_includepath(incs);
-    if (!inc.isEmpty())
-        pro += "INCLUDEPATH += " + inc + '\\n';
-    QString escaped_libs = qc_prepare_libs(normalizedLibs);
-    if (!escaped_libs.isEmpty())
-        pro += "LIBS += " + escaped_libs + '\\n';
-    pro += proextra;
-
-    fname = dir.filePath("atest.pro");
-    f.setFileName(fname);
-    if (!f.open(QFile::WriteOnly | QFile::Truncate)) {
-        debug("unable to open atest.pro for writing");
-        return false;
-    }
-    if (f.write(pro.toLatin1()) == -1) {
-        debug("error writing to atest.pro");
-        return false;
-    }
-    f.close();
-
-    debug(QString("Wrote atest.pro:\\n%1").arg(pro));
-
-    QString oldpath = QDir::currentPath();
-    QDir::setCurrent(dir.path());
-
-    bool ok = false;
-    int  r  = doCommand(qmake_path, QStringList() << "atest.pro");
-    if (r == 0) {
-        r = doCommand(maketool, QStringList());
-        if (r == 0) {
-            ok = true;
-            if (retcode) {
-                QString runatest = out;
-#ifdef Q_OS_UNIX
-                runatest.prepend("./");
-#endif
-                *retcode = doCommand(runatest, QStringList());
-            }
-        }
-        r = doCommand(maketool, QStringList() << "distclean");
-        if (r != 0)
-            debug("error during atest distclean");
-    }
-
-    QDir::setCurrent(oldpath);
-
-    // cleanup
-    // dir.remove("atest.pro");
-    // dir.remove("atest.cpp");
-    // tmp.rmdir("atest");
-
-    // remove whole dir since distclean doesn't always work
-    qc_removedir(tmp.filePath("atest"));
-
-    if (!ok)
-        return false;
-    return true;
-}
-
-bool Conf::checkHeader(const QString &path, const QString &h) { return QDir(path).exists(h); }
-
-bool Conf::findHeader(const QString &h, const QStringList &ext, QString *inc)
-{
-    if (checkHeader("/usr/include", h)) {
-        *inc = "";
-        return true;
-    }
-    QStringList dirs;
-    dirs += "/usr/local/include";
-    dirs += ext;
-
-    QString prefix = qc_getenv("PREFIX");
-    if (!prefix.isEmpty()) {
-        prefix += "/include";
-        prefix = qc_normalize_path(prefix);
-        if (!dirs.contains(prefix))
-            dirs << prefix;
-    }
-
-    for (QStringList::ConstIterator it = dirs.begin(); it != dirs.end(); ++it) {
-        if (checkHeader(*it, h)) {
-            *inc = *it;
-            return true;
-        }
-    }
-    return false;
-}
-
-bool Conf::checkLibrary(const QString &path, const QString &name)
-{
-    QString str =
-        //"#include <stdio.h>\\n"
-        "int main()\\n"
-        "{\\n"
-        //"    printf(\\"library checker running\\\\\\\\n\\");\\n"
-        "    return 0;\\n"
-        "}\\n";
-
-    QString libs;
-    if (!path.isEmpty())
-        libs += QString("-L") + path + ' ';
-    libs += QString("-l") + name;
-    if (!doCompileAndLink(str, QStringList(), libs, QString()))
-        return false;
-    return true;
-}
-
-bool Conf::findLibrary(const QString &name, QString *lib)
-{
-    if (checkLibrary("", name)) {
-        *lib = "";
-        return true;
-    }
-    if (checkLibrary("/usr/local/lib", name)) {
-        *lib = "/usr/local/lib";
-        return true;
-    }
-
-    QString prefix = qc_getenv("PREFIX");
-    if (!prefix.isEmpty()) {
-        prefix += "/lib";
-        prefix = qc_normalize_path(prefix);
-        if (checkLibrary(prefix, name)) {
-            *lib = prefix;
-            return true;
-        }
-    }
-
-    return false;
-}
-
-QString Conf::findProgram(const QString &prog) { return qc_findprogram(prog); }
-
-bool Conf::findSimpleLibrary(const QString &incvar, const QString &libvar, const QString &incname,
-                             const QString &libname, QString *incpath, QString *libs)
-{
-    QString inc, lib;
-    QString s;
-
-    s = getenv(incvar).trimmed();
-    if (!s.isEmpty()) {
-        if (!checkHeader(s, incname)) {
-            if (debug_enabled)
-                printf("%s is not found in \\"%s\\"\\n", qPrintable(incname), qPrintable(s));
-            return false;
-        }
-        inc = s;
-    } else {
-        if (!findHeader(incname, QStringList(), &s)) {
-            if (debug_enabled)
-                printf("%s is not found anywhere\\n", qPrintable(incname));
-            return false;
-        }
-        inc = s;
-    }
-
-    s = getenv(libvar).trimmed();
-    if (!s.isEmpty()) {
-        if (!checkLibrary(s, libname)) {
-            if (debug_enabled)
-                printf("%s is not found in \\"%s\\"\\n", qPrintable(libname), qPrintable(s));
-            return false;
-        }
-        lib = s;
-    } else {
-        if (!findLibrary(libname, &s)) {
-            if (debug_enabled)
-                printf("%s is not found anywhere\\n", qPrintable(libname));
-            return false;
-        }
-        lib = s;
-    }
-
-    QString lib_out;
-    if (!lib.isEmpty())
-        lib_out += QString("-L") + s + " ";
-    lib_out += QString("-l") + libname;
-
-    *incpath = inc;
-    *libs    = lib_out;
-    return true;
-}
-
-bool Conf::findFooConfig(const QString &path, QString *version, QStringList *incs, QString *libs, QString *otherflags)
-{
-    QStringList args;
-    QByteArray  out;
-    int         ret;
-
-    args += "--version";
-    ret = doCommand(path, args, &out);
-    if (ret != 0)
-        return false;
-
-    QString version_out = QString::fromLatin1(out).trimmed();
-
-    args.clear();
-    args += "--libs";
-    ret = doCommand(path, args, &out);
-    if (ret != 0)
-        return false;
-
-    QString libs_out = QString::fromLatin1(out).trimmed();
-
-    args.clear();
-    args += "--cflags";
-    ret = doCommand(path, args, &out);
-    if (ret != 0)
-        return false;
-
-    QString cflags = QString::fromLatin1(out).trimmed();
-
-    QStringList incs_out, otherflags_out;
-    qc_splitcflags(cflags, &incs_out, &otherflags_out);
-
-    *version    = version_out;
-    *incs       = incs_out;
-    *libs       = libs_out;
-    *otherflags = otherflags_out.join(QLatin1String(" "));
-    return true;
-}
-
-bool Conf::findPkgConfig(const QString &name, VersionMode mode, const QString &req_version, QString *version,
-                         QStringList *incs, QString *libs, QString *otherflags)
-{
-    QStringList args;
-    QByteArray  out;
-    int         ret;
-
-    args += name;
-    args += "--exists";
-    ret = doCommand("pkg-config", args, &out);
-    if (ret != 0)
-        return false;
-
-    if (mode != VersionAny) {
-        args.clear();
-        args += name;
-        if (mode == VersionMin)
-            args += QString("--atleast-version=%1").arg(req_version);
-        else if (mode == VersionMax)
-            args += QString("--max-version=%1").arg(req_version);
-        else
-            args += QString("--exact-version=%1").arg(req_version);
-        ret = doCommand("pkg-config", args, &out);
-        if (ret != 0)
-            return false;
-    }
-
-    args.clear();
-    args += name;
-    args += "--modversion";
-    ret = doCommand("pkg-config", args, &out);
-    if (ret != 0)
-        return false;
-
-    QString version_out = QString::fromLatin1(out).trimmed();
-
-    args.clear();
-    args += name;
-    args += "--libs";
-    ret = doCommand("pkg-config", args, &out);
-    if (ret != 0)
-        return false;
-
-    QString libs_out = QString::fromLatin1(out).trimmed();
-
-    args.clear();
-    args += name;
-    args += "--cflags";
-    ret = doCommand("pkg-config", args, &out);
-    if (ret != 0)
-        return false;
-
-    QString cflags = QString::fromLatin1(out).trimmed();
-
-    QStringList incs_out, otherflags_out;
-    qc_splitcflags(cflags, &incs_out, &otherflags_out);
-
-    *version    = version_out;
-    *incs       = incs_out;
-    *libs       = libs_out;
-    *otherflags = otherflags_out.join(QLatin1String(" "));
-    return true;
-}
-
-void Conf::addDefine(const QString &str)
-{
-    if (DEFINES.isEmpty())
-        DEFINES = str;
-    else
-        DEFINES += QString(" ") + str;
-    debug(QString("DEFINES += %1").arg(str));
-}
-
-void Conf::addLib(const QString &str)
-{
-    QStringList libs = qc_splitflags(str);
-    foreach (const QString &lib, libs) {
-        if (lib.startsWith("-l")) {
-            LIBS.append(lib);
-        } else {
-            LIBS.append(qc_normalize_path(lib)); // we don't care about -L prefix since normalier does not touch it.
-        }
-    }
-    debug(QString("LIBS += %1").arg(str));
-}
-
-void Conf::addIncludePath(const QString &str)
-{
-    INCLUDEPATH.append(qc_normalize_path(str));
-    debug(QString("INCLUDEPATH += %1").arg(str));
-}
-
-void Conf::addExtra(const QString &str)
-{
-    extra += str + '\\n';
-    debug(QString("extra += %1").arg(str));
-}
-
-//----------------------------------------------------------------------------
-// main
-//----------------------------------------------------------------------------
-#include "conf4.moc"
-
-#ifdef HAVE_MODULES
-#include "modules.cpp"
-#endif
-
-int main(int argc, char **argv)
-{
-    QCoreApplication app(argc, argv);
-    Conf *           conf = new Conf;
-    ConfObj *        o    = 0;
-    Q_UNUSED(o);
-#ifdef HAVE_MODULES
-#include "modules_new.cpp"
-#endif
-
-    conf->debug_enabled = (qc_getenv("QC_VERBOSE") == "Y") ? true : false;
-    if (conf->debug_enabled)
-        printf(" -> ok\\n");
-    else
-        printf("ok\\n");
-
-    QString confCommand = qc_getenv("QC_COMMAND");
-    QString proName     = qc_getenv("QC_PROFILE");
-    conf->qmake_path    = qc_getenv("QC_QMAKE");
-    conf->qmakespec     = qc_getenv("QC_QMAKESPEC");
-    conf->maketool      = qc_getenv("QC_MAKETOOL");
-
-    if (conf->debug_enabled)
-        printf("conf command: [%s]\\n", qPrintable(confCommand));
-
-    QString confPath = qc_findself(confCommand);
-    if (confPath.isEmpty()) {
-        printf("Error: cannot find myself; rerun with an absolute path\\n");
-        return 1;
-    }
-
-    QString srcdir   = QFileInfo(confPath).absolutePath();
-    QString builddir = QDir::current().absolutePath();
-    QString proPath  = QDir(srcdir).filePath(proName);
-
-    if (conf->debug_enabled) {
-        printf("conf path:    [%s]\\n", qPrintable(confPath));
-        printf("srcdir:       [%s]\\n", qPrintable(srcdir));
-        printf("builddir:     [%s]\\n", qPrintable(builddir));
-        printf("profile:      [%s]\\n", qPrintable(proPath));
-        printf("qmake path:   [%s]\\n", qPrintable(conf->qmake_path));
-        printf("qmakespec:    [%s]\\n", qPrintable(conf->qmakespec));
-        printf("make tool:    [%s]\\n", qPrintable(conf->maketool));
-        printf("\\n");
-    }
-
-    bool success = false;
-    if (conf->exec()) {
-        QFile f("conf.pri");
-        if (!f.open(QFile::WriteOnly | QFile::Truncate)) {
-            printf("Error writing %s\\n", qPrintable(f.fileName()));
-            return 1;
-        }
-
-        QString str;
-        str += "# qconf\\n\\n";
-        str += "greaterThan(QT_MAJOR_VERSION, 4):CONFIG += c++11\\n";
-
-        QString var;
-        var = qc_normalize_path(qc_getenv("PREFIX"));
-        if (!var.isEmpty())
-            str += QString("PREFIX = %1\\n").arg(var);
-        var = qc_normalize_path(qc_getenv("BINDIR"));
-        if (!var.isEmpty())
-            str += QString("BINDIR = %1\\n").arg(var);
-        var = qc_normalize_path(qc_getenv("INCDIR"));
-        if (!var.isEmpty())
-            str += QString("INCDIR = %1\\n").arg(var);
-        var = qc_normalize_path(qc_getenv("LIBDIR"));
-        if (!var.isEmpty())
-            str += QString("LIBDIR = %1\\n").arg(var);
-        var = qc_normalize_path(qc_getenv("DATADIR"));
-        if (!var.isEmpty())
-            str += QString("DATADIR = %1\\n").arg(var);
-        str += '\\n';
-
-        if (qc_getenv("QC_STATIC") == "Y")
-            str += "CONFIG += staticlib\\n";
-
-        // TODO: don't need this?
-        // str += "QT_PATH_PLUGINS = " + QString(qInstallPathPlugins()) + '\\n';
-
-        if (!conf->DEFINES.isEmpty())
-            str += "DEFINES += " + conf->DEFINES + '\\n';
-        if (!conf->INCLUDEPATH.isEmpty())
-            str += "INCLUDEPATH += " + qc_prepare_includepath(conf->INCLUDEPATH) + '\\n';
-        if (!conf->LIBS.isEmpty())
-            str += "LIBS += " + qc_prepare_libs(conf->LIBS) + '\\n';
-        if (!conf->extra.isEmpty())
-            str += conf->extra;
-        str += '\\n';
-
-        var = qc_getenv("QC_EXTRACONF");
-        if (!var.isEmpty())
-            str += ("\\n# Extra conf from command line\\n" + var + "\\n");
-
-        QByteArray cs = str.toLatin1();
-        f.write(cs);
-        f.close();
-        success = true;
-    }
-    QString qmake_path = conf->qmake_path;
-    QString qmakespec  = conf->qmakespec;
-    delete conf;
-
-    if (!success)
-        return 1;
-
-    // run qmake on the project file
-    QStringList args;
-    if (!qmakespec.isEmpty()) {
-        args += "-spec";
-        args += qmakespec;
-    }
-    args += proPath;
-    int ret = qc_runprogram(qmake_path, args, 0, true);
-    if (ret != 0)
-        return 1;
-
-    return 0;
-}
-
-EOT
-cat >"$1/conf4.pro" <<EOT
-CONFIG  += console
-CONFIG  -= app_bundle
-QT      -= gui
-TARGET   = conf
-DESTDIR  = \$\$PWD
-
-HEADERS += conf4.h
-SOURCES += conf4.cpp
-
-
-DEFINES += HAVE_MODULES
-
-greaterThan(QT_MAJOR_VERSION, 4):CONFIG += c++11
-
-EOT
-}
-
-export EX_QTDIR
-export QC_STATIC
-export QC_EXTRACONF
-export QC_RELEASE
-export QC_DEBUG
-export QC_DEBUG_AND_RELEASE
-export QC_NO_SEPARATE_DEBUG_INFO
-export QC_SEPARATE_DEBUG_INFO
-export QC_NO_FRAMEWORK
-export QC_FRAMEWORK
-export QC_UNIVERSAL
-export QC_MAC_SDK
-export QC_ENABLE_TESTS
-export QC_WITH_QCA_INC
-export QC_WITH_QCA_LIB
-export QC_WITH_ZLIB_INC
-export QC_WITH_ZLIB_LIB
-export QC_WITH_QJDNS_INC
-export QC_WITH_QJDNS_LIB
-export QC_WITH_B2_INC
-export QC_WITH_B2_LIB
-export QC_VERBOSE
-export QC_QTSELECT
-rm -rf ".qconftemp"
-(
-    mkdir ".qconftemp"
-    gen_files ".qconftemp"
-    cd ".qconftemp"
-    if [ ! -z "$qm_spec" ]; then
-        "$qm" -spec $qm_spec conf4.pro >/dev/null
-    else
-        "$qm" conf4.pro >/dev/null
-    fi
-    $MAKE clean >/dev/null 2>&1
-    $MAKE >../conf.log 2>&1
-)
-
-if [ "$?" != "0" ]; then
-    rm -rf ".qconftemp"
-    if [ "$QC_VERBOSE" = "Y" ]; then
-        echo " -> fail"
-    else
-        echo "fail"
-    fi
-    printf "\n"
-    printf "Reason: There was an error compiling 'conf'.  See conf.log for details.\n"
-    printf "\n"
-    show_qt_info
-    if [ "$QC_VERBOSE" = "Y" ]; then
-        echo "conf.log:"
-        cat conf.log
-    fi
-    exit 1;
-fi
-
-QC_COMMAND=$0
-export QC_COMMAND
-QC_PROFILE=iris.pro
-export QC_PROFILE
-QC_QMAKE="$qm"
-export QC_QMAKE
-QC_QMAKESPEC=$qm_spec
-export QC_QMAKESPEC
-QC_MAKETOOL=$MAKE
-export QC_MAKETOOL
-".qconftemp/conf"
-ret="$?"
-if [ "$ret" = "1" ]; then
-    rm -rf ".qconftemp"
-    echo
-    exit 1;
-else
-    if [ "$ret" != "0" ]; then
-        rm -rf ".qconftemp"
-        if [ "$QC_VERBOSE" = "Y" ]; then
-            echo " -> fail"
-        else
-            echo "fail"
-        fi
-        echo
-        echo "Reason: Unexpected error launching 'conf'"
-        echo
-        exit 1;
-    fi
-fi
-rm -rf ".qconftemp"
-
-echo
-echo "Good, your configure finished.  Now run $MAKE."
-echo
diff --git a/configure.exe b/configure.exe
deleted file mode 100644
index 953703b782d714abe37b682ecdb78f0b507c5af8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 124424
zcmeEv3t(JTng5w&(uOuP0a6T5@d_!V(56Y7mKIu^G?})6yvU<1P?%0KlLt&@!aVxG
z7E&jH#vvHBD7vgRg4%Uat756bx`EcVVAY7|)&;SyRi`FugbMv*b^gEaJnkbm4G{a^
z-TyAPy}9>(=R4o~eCOPA&%IN1OFv6zj5)EVQjG1xkv13qJMo_`6wi3yw`Z^?&iVfP
z_c<!R|Ne%y_K4OQ4z-589a^(D7z{<VCchSr1-15|R$f!Db%cEW!gJ4^mM=-yx*4l<
zoQo?+@nOdPDTA?NY^r0rBQ1{$(TSodfaT(tgS{3z70`K_klTS%lAmumxWYxvmmFL#
z#x#LT6{rq2c@P)<jIGZUr<3{X+{0MjI2F4;%GhcW><n9B)W123vhwTkhXitA*OkCI
zwhgRyL!r+b_2Rsf0JYemGb^VHV{@^h!NRaW+&u&E4cLk1O6;Z$c&_;+0<eSdh$!K$
z5is?a@CutE5xOoRnY!rAzICw;gN5yaFSlVoaHe5zvEp+1%IX>j%GvM23F$%nO&iCH
z1~^}h;CrwWUYIV7jqv6d3q_U?cn~|`MX{SU7jvzczhEhce1bx32s`P$k%RO<E|#-m
zen~OEzMuXc!%p<Nv70uIw`dWE%p~8AVkf-&I7t7)@fKghuep2-$b`2;N8u;XV}%v+
zpMUk*{=O%!Ahvx^UrC4f$gJYQmhH<KbFr#h4rOfUa*_1xP{w-wY@L4ACeNa6k7nX@
zAb>wTgV7rfIrGy{DOtD-HJ$k>Y{~QIF_xIw35-W`yYVLve+F_t=3>1$$;I=*dHK3p
z@QQX655^D7QevStu}>bqj<Mk<TKW?+moXRH{%w+vaz`I>hKt3zvY)&uuVwq2(;d+d
z&>=0m=MFH9e~Vl=Bm2JFaFO`vDO?l}_Pmh&(BO$10qNUF(iOQ}ESU=l1mpOYC@RdQ
z3cX2D;W?^sF(57d@sYU$(JmJ|RGy#1#4$5h9G!VMK1#rWa%cj|vvA&9o}ZO0g!GT*
z;3|G#?*6{LpsMWMSUlMK>u;S0z}hu^jgQs${#$%x>udkKrzrXLYZ;q!pszgtlK8RF
zL+l8)LoTN{WQs$UIOK>!t~lh0!z?<)kB=r6ai_eV-LpN7G2Z|stK!!a>zs+@M?UIe
z!?{b3W_M3P5#&uG2d5x_vv+hf`)lu=1rPNM#$FlFa8mqI{FEcR`;YJjzwQ~#?sieN
z3@7v=A8{~8I*!Ypm$JLlP(D!P=P@x07UOvqM<?LK4}V!|C_a*v{5;GLK<D)?mYR7O
zazThkH-j)?<-k8qSR?tq1)#?eGKVs<AQE{#LGe~r{M_(`!mQmdM2mW!i@yI`BvE|O
zk-ayk>rL&RWbgOluQ|Hjyezx?d&5Z}O*hK^^k^oCCEm;J^ip(Y_LGe-?xQsJx_iix
z?SA%A25$~<U%LBy5B52GoG9#dKhO({ZAE(Nc|Eb5eBbNdnf+i57#F|P`#0IF63)*M
z+HFAV+wACFmY=)<r-`baz0OZ1vOW{v@95o{p9z%S%6w<?dX!yvTYv1ig!_Sb(wT_u
zJmj1LW~_G+F-U#|Norse=1I(?pzF;U;0IWCfC~WA3PHj0TN?PBOU<(9xks~b$nHj~
zK~3^k&kM0>$)iY4160!IKY8ozp4;}LJ#Z&J#f=Ad_nh~)R0=M5A1WrlM(7j@<l~-M
zR04jPyM&W)NPZF+Jue-~Afz-@$?o~vUsI|3c_5v54W}*ry}9|RnU4zxp9lgZu!$j2
z%M;YHh*|}xo%kY9iU&`;3T`k`OMmh@K>MOssP=>4Ig~-3BMQl{6v62SvQB*AG#WQ=
zW_me_S@J<yejm#F`PSI`>oxW9k(|VPAA?X7Z5t4RKkhw<0Nh7)dR~vtQQ(<_GBR_Z
zAc=bckb6s@(QaOliC8?3;2H!%rNf<|H8c=F{GenBAagi%(C!%|XRzpngnkW?L7G%#
zdY|oiA$ktbsb=bhKL4p(Z@+DSKdB9Q<0E;xKqT~7YB!#V8W-n<0TLeKWO0rU2m;UT
z7v|{a^m7imPm^?q+^6U;e9<%h)6PWWsf0VzF_gWRWq)U|*nK+gKIKTbPhIEE+WL!x
z`}A}BdEF%gP6!R!$@awzO=6T^CmKh48}gk5{xtGvuX`ln9*qx9BfwIQmjsHa+JN=|
zqa@r(D!m$|D8iLv=pgeX+#@K=B&%(Mo_+3L5K<wK4!KWqVJ`>ezFJ6j(lONgEY*9q
zuL=U5bR350JJRAfi*GwQ^`3v@i04Sk3`efQ_K^a_5*TDUaqR1PjY1FX$mZAvcEMsi
zX&rRGp^72GH!v=cCMZy%tV+1Eu6Cci&YgQtX2P8dV+?~Gfp7}$iK>%{#!Scaq*211
zLtM~4lAR!hyqf`;htDH%aY9!9+CG>r#hL6|q9L3=f-%sX1E5GYcoP?}tK<z=5pW(z
zf!B%skeop1j7T$v+GIj%G<`kCf5979GLs`G<J*$#-i#BE@+u<`mW!Fi#ms^iA!?FD
zH7ZWwE<GOKc03hbgVL+r$I0?=z;*7Ct=Dn)9d`_Y6oE$^LtF;XCo)pfk3)P!<y7A2
zh70$RXv0?uVh+dvKa$P3Rw0g?-F+4Ka(rp{9F$Xd?j7uPpGM3=(oCM`3FI(=(gc<n
zl&*tJu`K!h21%&beG*Z_V$(Ro6O?brf*(Q<LQ}H!FBfuK$G45@SpUv#m?hL4B_tQ3
z3BHw7ctUoMDz}i%M3nlMKKC)gk8+|T@ogjQURkNfC>4fJl0$$yx_|^AH?Wwr<9bAy
znL1%|n;)kN?=cZSKLMu!b~#|e2O8A{<RU;2or%Wdy)bZYqA}T<!`-98J(-Sl3j2r<
z&Z2na0ew=i;x2ofS`j&ro9a7|6x5M*kTZ~e^ZTfEfB;ni0cr|xo-`aM@MCm+z59EQ
z#t-D*dYec!1;BuNNya}@DG`vYWd`BQPM|E&2&#z3gT(iw6g(H`JE+C*WH)?KqVY5w
z&NJM#?h$H#r-$?6?$ZuaLHA(nsL>4LBP4@KO(_RON;E6c2!S%^Jli`ooMF@<b!A+w
zQc~xV4omqJndoX501agn35*iuh*UC%Bf#5MCAsgNq$Fh&a80U=l1q|NM)?i;Jx&+7
zC#QEmw?>WwEHd#2Rlw>QYGH?a*CYALMEy0Y)Cm4O^P+xojO|J2ZXoG~S8e$}gtO5S
zQqjxws370MsT7Y2@%KO+o-VC%7f4CZ<VnyKL>*$1!Xj}Y_DMcj{$<oxQD}9<H+f1T
z`;(N_q>A)A*&n%F1Eu75Fzn<e&Xmyy+^_$IA~lJ;3of#?@HpB*SpdR}P%}U_0&x!C
zP8B%3HdE9ZNw_kfImUat^~6CGIuE%=!IYi&8ve+-ZZk7fLoYk}%zrrhW)TZvD9$5`
zc&A&~PJ5eGe?*P5jCA25o0w#Q$w_pTy^SYj)+~j83<Tt9R~AVeM||*t%<J5v*&lJi
zwo?9{H+9`}blnlWy+e*c$Ivs!(#ZPj3UwP~DH|L%Y*0!xl)*<5s}aGYdi}mx;B2-;
z8mVKo1bZ6<AjXey1Ii6CmWSgoH++)!ZH*`O_@^6Im}87Uxm=(XuoM|oH%$&V%^brt
zcl;ldT4oJgM!X;cnF49anQF{1YM^D9YD_s(jh79-%u+Q*tj#x*-#VR(7Lwq@wX2}6
z8n`qQl!Eajg3&P~5YFNDu)tkB#z*Ipp{xa2=*us%0Vx`u1-2N}pauf!<h>tLY)h#E
znfs*ffB1$=_kiSKD-|Min2Ev_C+~fNGtY$>GsGG3Ua2I_)8TmpFBEV(y&R`1r6{?s
zMzm9VMmt9LkU&<<Q9+Ug^zp`O-!~FIItfLn*sR)k<o@OA@yQ)B$gM>J(;x^5I|b-S
z=g5z^_&--M<~SN3<ZbRaE_hDMG-Z)iphJ~!AxM$2crV}kZ?Ar(_wXA-eYMo29YZaL
z*mB^=K8@#|rJ@$GSj@%C-Z_ZzRQ!N;EAAP^4T+TJQj{y>NzgxVLC~vlfgAai8l(<i
z%DYJPbI3o-=EtV1%Y$sa2oa2XN4EYuIt@v6wWRYY(g4ZJeZ)|2V9Cd5WNwTy)`1xx
zjZGD!$qe&Yu|QI)5tL}y^(kX4_fNcGog7%w<)TsP1(fc9fqvsLASJH{Wdgw@e$)pB
zAFNY8CD<?K$T1X`di%%{4D5tWfk6)8ec87`iP)y2w6ABB`b^Xvew}MZBZzyh-oEW5
zmEL>VLHBE*K>a!L4vmhSMvXsW)&>I%O4Nq!2?zZ;A1M%%LtHoRgLWZtA%T&Zxny8`
z!o>J|?uaZtUOJQQaC5Q@`U=k#;!KXTzcWZ`<ii9oOWN=}QPPW+%?IP~+OShPmwFw6
z{^tUY{#79JAzG%?WQlA!@oiZwdIu!V%!R}>Hiq!hgXai+ZqT8;HAFZ?5vt(H$L?1u
ze_lF}LpQ11n!JI)u`iHg{irp3&hS*QrNKDFQ6`OV%Vg0Ouq1`=ik&C4p^In?`ede&
zaMMtS%!&i*a%*1>ijsfyN=T84zF(GX$As&nt}YiFpg)h2MEuO^%O!BVgTs+#av|sM
zNlu!;ATw`(?gPtEU9q?mB6ItLI7#vbu<81!@UAR<lMmQ2wBxu%z@;0E=vADLFzpD{
z+Kiwy?pC^a7>}ITiX#Q2vSt>fI!#i2fS5Y--|xlwaXviZc8@BdK5~Uss4|OCev455
z0Nn9~`W41PhERXxrXD%*TO7v<RX~D#41~J2y@u(pF98MO)e@8syrALf+2o!i`bbzX
zdv8V-yg)I@!;4$zN3T(X<abr~AVD36(bRnendqxrPkw_IEf{ORC0x`fT78mm4}lp*
z6vNlkEgFb{>YxLIh~XLi665p07|u8mA-BrhL)KkKBL5O)mR3&w-GUMkPXk3N{ZY=N
zP|b-a9nflc3V6;DO(1%e7=R-+@ZmU-5P{Ac%@l48u1xHC5V)Gghv*nYCZMX${DHZg
zk4Ov9Aqx%GB9;vA&tbX*+=;^nxscqNwI_LclaY5J=Qk>^cB2M(s1_&b++xt#ZqUiJ
z(D?z!QFJzpOXqxp&I1OWLGIo068&d^lx*arxa4<Oc$~i6EUUa<8OZ0RL2$|*=i-4J
z4oP6n^gIO|o2n^I3}i{?i9|JShlM!!3dvLf*1VIGT|2)?KlLiv6&B!EPf=$=Hz@q7
z78Up%>2i?xHj$Vz9*J*SNKn%^NSrH4jH83RpH0-}z+nkj7Val8m#yDL{zdOrQfk)Y
zXS~VgP>a}h8P|n^<PZdt0$;5pk;4$K#f1vUuO5Db#6t$-S3!^=8qaYWJayG`%4pd9
zstQ*$uchWiZYEi6W69OjM<v!-2cSpwn*-i!Q){8QdXhc_s<Pppd_P(NmBo$u2}Fh7
z{~qCz@gCu@C8>Uj8$-uCYT)e>cycBuY9f|2kUnTZsxcvr8c1s_NJs%XyEhG_Vhd6R
zS7uC8{Gp~dX=f98i#H71<%>w+S37tXS55IJsKL{b)S^N*>Ly@ecyPH&au{H#et0@4
zCx4E5JgE%7N7kqZghtF+V<w*lGN~trGa{U%im@*ELKGn^B#Bm`p`1p$UB^J>PD|x7
z6cHyByo^U5=pQJ!N+6i@_J{vSD)U|gI2q^ypbYwTp5=duDrjgQAU*Oxm+Nst^iv#R
zkPzIkns|b;g45;AVJ}KR>6}CEkrJpid?oR%GRi+;lowDr#wjDYI8pZ(w<vo;mXm$C
zJq#OK0KbC+B}lav#FF=dj13{tn5%ATrgB3?(Hdx?diWwaT(c5Hmiwquvltej*&fxr
ztkI*p=p&cv@#Eu4@rYUe2Xp-VD^JKOejY*%*~WjzE2|d2l^2Z20L{}`{0KL`3TVXC
z9i(+Hs_=0nf{iB@NFStvP88sr25-p+aL(&*A8B)vn@$2s-l78tCR{WKCrjSdgsO{x
zu54bXXsjlB?h&dnynxrio%D#fldeV2%kPw{MxObllg~UTtFJ;l#NjNCfE(kHd-sFl
z4r23z_kztVbP@4EjiT}obZr_RaM6DRVDj*vd1Ufj*QroufX?GY=QBVVrUAt_>8c-B
zO6HwJQ4WepyQc|ZtqCE5b1vB|sXsT}B0xoauZFc0KNvVEu||nbHqp_??oWup6>kbv
z@HPVeYAQ7kp8MQSke<Jp#RG<h%`qC2Gi-b$U#?hPtW?_%RGd4T!S6|&8*2U&u4L0(
ziBlo&r_wq4Y(ii9C$bqI;br%%LfZ!m=RM_+DN6&xzMdy&j0Xv+HO@y3NlinK1mQ1~
z2$1(Hmyo=pCzgZAi6!_$G-z3mmBw`jjhDgOs2@aqVp0JF(*LqylI$3P#6a&DK{s<Q
zFDJwkf-tV)+g`@__QMc1;eHvC@}4S1DxxODQ2bH(a$fmpeA`hLt?7G+R7<#z@)0c|
z-v-WxJXdh!7vtMrWHgccB5{9{TT8$&wZdV0FXnm^b6_NKHN1TII{8H5Q@n5};U1#G
zr+D>I-YK9u@4h#w>KtPLSIOB(oQK?pAv*5%4wFiR3m?ePLMRfoQ@BsZN`#(=ftUOf
zbWw4khx|X2FnY-UBd%1)6Ca#Mp>eXu1n<SUJ<@LkR1v4=uTN98YEkVVo!`K#@u>dA
zMJmh|IEa?YHZKz1QlvXhJ`d_pQ~L!$FXvFzYJNwc91bGg3F|ci{q^@$m-F}_cqAX;
zGoMG|+m1M5S0w+0D`4_uZ~(;#7!EeNNtfm^SP8f+dVBJ_z*Xw#wz?OXhOO?xl_D1t
z=gbEoZZ^Sh!?|ShyFArpyOOOYNv@SBLXEjZAq7-L`4WS|Zld6Tj64C?WARFS#FhMZ
z4mV+f^)=+rLaxljQByhdgTE&K#}>%s=%PSD7-zy4dhCPK&BXN?MgGLbsUQhziE@L|
zfBcrW@wxG>`Eyz9`mqEt(lZl`62VRo<RoC^k@ra1Ph3RA%k$^*=~c9WtVE8uB-yEn
zeG+whQRRu>aE?W?6p$~12)}B`FY3(!?h<e%w#&#WC;lA`8pX@>ei*l9m>n(8F95WF
zrXuFWX3(jaiCH!;dO4>?C=^0GW5>aRD07OB2#Tmc(-+R=;L-~@UOCPs%ZDxUQ_;ml
zvadD`hkT+$50thFj1q$N)us~$9#*01;}?QNd4AFGB?Oa`k)IU667VRJ8aY1=D*&a0
zDjh;Oyf}`uKS2p<32FDH2_JmcRP_N_^-u<NholtHonHh76#ge1lF$7vl{)c3S@j81
z)tf}s3n4`jN%5zdn2#w3l@nDG`zaIl<zuk-6ZUGtexJmC)`b0MltLq&_CthSN!Wja
zj3nasP1uLVV7C%>17Yu%*gr90e`*Z&Qo^n!?1v=w%O>nQ1$Gg9S%f|!3=~or(b7Gb
z-Q6rNN&j3V7d{_#qDnyLCTcT*JC|;ND&Z;9UERw`Q-ox9|4rKc*CxiV=5iBU$)~5#
zO`a>}slaFuB_sne-HP)^X#z_zYRJzQBPAC-LZB$({7qo0woQ;2Q-t+5vCFJA=t-Jn
zbsp;UmSqiVHVlLcMNIOK7jO(~IocQoZMqrq#}3=tVG2xS^A>MzXcvQ>3SE@)KtBiu
z+!1&<ET#GefvAN8u<SZ_=C<iTSOQO-j~-B-?tyuUK`%64j;vufX$PptNkSN!<`W5b
zEkP-wx%ugYprr(*$mLKvA?Vcvr3mFvIw9yxf>La8D4h^Abv~dJpBzdj1U&&LPv0jl
zOhdWgo83JC;rWF$&M;ZJ1ld;7ja|%3sZG3!BBFHamxx4SCdD+NydhD3LMSA=l-Y!G
zTB3ZNP)HFestF~-FBpA<P)L5I<4k@cCCvg>^220rX|0+3M3!Dar2#6HR-4IBWa-6J
zT1}<WPBZz5ES*iIMN}$nYv+4DN~!bU$vYvP@1vU|#EH5tLK?OQ!-n(NIKglOL2bcM
zLQq>UTuM+|Fk}+c77VYVe^yGKE0lx_Uj`J>yNsz7J>r%yaU0f&we%bRu-+KT<Rg$~
z#!sb3#ljM-|9v)#@%3)#rVGeuK%!1Rvlq1YO_zZt@GR?TF&mW^U*3RwV%}dxrya`R
z7YM@mskG>MSi2a#E`A`72kNch@>J0-tS9~p{f+*%r9Y7lQPQx!Yrj(fW4||J_d|{X
z3RPrC@(krijbzG)Ov7Jn=`S8sE9u07x`C4)#Y3rMa&=ul)pzbUtzYEVdTD<@<S!VY
zrO`z6hjd4Hiaef|-TfhOM54;XA^Ep#*j!=#6R-$nfR<HLwTA^@7S;~a%~~doe5?sx
zJm(%pZ9Fw3D6sDaHeZYlz$^mL^C8KIuhdTN0)G5JLGRI9_mliYBQ>+&V=e;TsupS+
z>&Jn@O;QXx7@O}Lgq!fZ@QtHn89Xi&>n(4~Or$5+@{eNm{-zbn`*6sPe-^qe&!E$u
ze;{pPD;!8`SeGR=l7ki@e;HSBlO_vNL&J^BccNPKvgMzkL)-F?)1iJ~GnzIKm-XJ3
zDHc(tjupRdBFl~W+zd(fK0)?5seEdPKXerppLL3O{0=#O`03@iqaBQW)<lXVP2M9&
zMdyI&hd_paknTwpF-ns)z#AT*Fff&H3d^YEeiM|7cm<$6uV;7P36mx-f`v|aaYkV?
zHs0bR%LcYW>z|kBuf|@BeI10E^RwsCl3YJupPz?a!(M>alml2fj=308=U`X|QK$U;
zDE*5cSSHq+!kNxTiQtJZor@Pcu>PHrk1LVWcSGviB}ilO|C6z4Y9hC<wgpUGg1Re*
zGje6(kb}{K8u^w39|4)A53Uhyw}LD!yazwpsQvO{m>?5(pR8|ve!j^ZZD120bP<*0
zXcq4lHNI#Ga+=9zfow7xe}>QHbk!fk-`X|32f=39KsS$$><5RzCNXmdu8Lnu+~8dL
zr%lrmcW0*8WG?+dIEEG4@n^G^?vMQ%3w@J+g*$o%dk<xI|D0qixi#@#s`t!q(j2e#
zmSrAF2b3iborBkzR%KzaiF`mkKuDw!<{wz1yohFxQ!|etHDG-*+!MjQeEgIvc3wP#
zgmS0_*|7I1XY_Z=yHG9qtN5wR=qtEcPhX_Sxd4YLFu{4GH=0iqmZ_O9bE-KQ3Vl5_
z^ATJi=#Ii_gqQqB%<L7vbb^{Dmx;>)xe}`~f%cd}+Xyreq??9rz>+Pv7HM{%3-UqY
zsq!@jZckXV@=ykqQ0qt*z({>g7Z%E6B8=hfh2(EwkV9NG0K{7j?*sf%(qrH5po`6;
zKk-vjvmc~}A3rrc`@u%g8Xz#;-}eDJ@VLC_!bM{F9$Y>31c6f7-SdF_6d@<dGWqiK
z;{e3>XKnur0V5TO=?ORk$p#qTqQAY32eS9pXZB%e1;%gYWOq|akH4v9ci+WNGPAp{
z#|c80tWeSlD{R2iJmneAOi~|CM4a*cnF-_`7wbb7ak2FJQ@xExk`JN=d?WCBc}e&M
z9(Tnr^$gy7?(iOj*LCmh?sBnhpXUzgTXt(-$-h8B<`_-nU>W!;eN{(P<j`{mYEG8m
z$?pC!u;nC)aH?}3oQ;{1qbfE`aWUK{?6eU1q~|)sLE=Vd&vV(``{CjfSK~VS$u80$
z`^lk}UiX3CA+#YZ+>dWNz_M2l^^VSYe*5pJ-0>zU_+<=Iv!8SyY3ZG!TRZzh4-&1J
zL~HMq?7c(1Kid8rXryq%vHC~7qgOW`5S3}tJ$tYF$c`z)&tARlK<{Y!^}XAUByR?|
z_xj<lCeEesaQrDz>g4KRahl5#r9)y`j{L*OKZCe_=~rX=-&za>_^tT+(9~M`u^gWu
zeYM<>GwB>H<wX2I7T$zHKBoMWcyCcPg5oc!XnxO2(d<<2Kl1Bg2i}i}{R!NTm4n;)
zn0ksI$h&oa@k_&Lz5Dyh9Esc>Ld3fjqr(T~`yT@jKnH3suZetmD1!h9EH=E8a*}F4
za|e77<&gU*N^p3Y4$G^5<9aHZ{l?IvZ6vaKNds;rf9^rkPQ;ETw!K{ZH@pInnz<8z
z-u<bW57W{8Vru3S{A5V1Bu>pdfXjukV+&))i(gq7dl7XO#)h{4jWfyX9erb{cM-{8
zVb;HI&qe=Q{+${KGJH&b|DYh@cJ?(oduRH#L*|UGxQm_RWP@noI3wL2U5A24AHWr6
zy2w2Qs|1W|i5b!X(g=?i^_P8sv;jU$%{&SzxjOwgp~O#=xxz!dBr~~mDq||0>-L)k
z0!i>o&D;UB#PVardl98SdOac)EmH5}Oy#s*6a_HXPvQP7xEU$X**gneVB+4)o>c7L
zbb3z<RAqj9f3l|dbwo|hz;Unyv2!tC=pCgOHdOzf1?@r3fkU!;3IkH_{^$x}8IqZn
zGg4<EWFH{Wd*93dBAJa)cni%)l3vV-Ipqr>-$9#74fk8dzlbLYlgouk+(tLV=N1q0
zQMW+TiE%T{Bras27ozV;q%A!fn>M^Mk-79|Q4NpUR#0sUcY`}nCAGxr%-$RLX#7<t
z*Uo}8{4>;kl&df_{O?l0f2AmZeAL3Qa2o^hm0=q6$Ielv^YKynbNkhG6F&iF>^Fxp
z$h@@a0(A?=3_mZ?qZbGy2aqJ8mVO<3pTvGC`5cn+@Ix{ll26gqC-rzrcP-n#gkCI+
zW?*QA`;_gQ^QJq*G9r3EDuIY>*}kOe7Fj<014&4Zf7jGwOqG?uxF@}CS@x6RDcMi1
z$nAN(uRJX;dP(sM{dnlS^k<u<rmxOi`n_;g{8>kQuwdz{;bigPt+x~X#<e1xW+gCR
zL$8Znjv)m){!P>MmooA0+JRXVVOV|FzmIZpawP%*N#?f$%W&1#FY<R+E-td4ykkn=
z`n0^B-^XSQAHsOzpd-G&VCf$sS5T)ygG;=BMuDGv6^!8USBUs4l05Ja%qo8U*4|P6
zdKl$LyazavX~;4)ejt->41^rtLE?uT!?02gEKhRGqd$D?@k<mEHWu;YMnakm^bBH7
zgHlvb`UBS}`^kr=5Eayeb#(lCm^mw&L9$Bz*Na-e7k1cTvO`~kBQN{OiYa(E@Q1~N
zudldLi%vzW&y5em0~p~IEIk}PQT#fm)%#O^;P;<rlJ7-?P0t|LIvWWYl8Gocy*wLD
zNBqE8!ZeTa3enjx4Lyypn&zM=JU`*ee`DyG<ojSIo!;=P=JvC;I7RnQh6iASyy!V(
zSG*+Vk#<-t=$+tpNbKo?@$eqozsn&V@lMtYl!Mz3(q-?fvFXF#M*NXIp3TK5xaYap
z)WixJoX+Zb>E2}G?kw=Q_4e(DIQl7%ln=n-lwi%<&`q_=>6P-n%KWVG%<U)WJbn&>
z07qW1X?V^v0Ia(i-89VtoQR{j>aDN8KQ;Rl8Y&$}_;JA5?PAn0Wc#A_cYg*4@>;3c
z-5(S9d*tx}dCZhYr#$A#W34>ylE-E8xI-SJ^4KPio$|O&9yiEiKpq?9ai2WymdD5C
z@iBQUk;kp_*e{P=^7ynoJ}i%e^0-qT*URH(dDP@FDedKw*N@2KX$kkq>jUz*S{^Iq
z@d<e>=SPvBlfOR5=K%K1M5N5YN(KG>K<aXGFvy{e&iTo^fBwI<06i@9ZE&$2*ssI+
z$8gMRa<SRiufkr4oi@5AIBjM)1pvi?+FXc@Gzr^P>0*1Z(+Klx7)Davcenpu76`OA
zwKg|<A|BtS1@npveSrY;c*6eH_DIwp_O#$TE`CpYuqDJe;vMsf7YdvkHhStLR$0Is
ziTER^=kt$OligHSQ@zqde=1h3t*G{_sH`cwvA$vzn_aYIGYdD7Meb@21zV#2j!ssh
zg~Hk*w*IaT@16ca|7JfcYx6hXskOIgm(7k`rujERw#YO#JEG0IE9MVx(Pl^3O%0wk
z?z;MlnrgPz8xFPyTdxIJqwmkOfZR<{TumdadUvI}tbwg>Y7ZKioRvh51%2AacCR*X
z-d#~&dl+@fE9&rd21Ru|+}X1^*6i8SSZ!&;YSQP7`1lSE#|bm-`s&6?@mE`L{T0PH
zEi7D5b|?&lS_P;+>J3Ms4Oe{{^Z5hOu-~uE-=eW_2gK9nN3{8OX>2~*)Wq;@omjvh
zDQxcSROg<ce-pnZvL%IWOdJVAoZ(|VOluDKy+OvU+v05x_<hq@2bgYJxL_VRf$=|g
zggRJ|pJ_(b!a}yGJxF+wjm`43_3EoxLwJiJ^?bsIzm{WXWjJqdjfJTg9x5y>q!h%~
z_`~fjybgTT6l)LoG=FeodpH#A@CT!WrZH{a^%}{?_#ejV{N6|?c&*kL^fm?jS~R4!
zw8MMRHotZycM}GAp-{kx0I(A7YYCB?;R=ch296!xI}j!t{ozP^2;V9ak<;l7M~E`J
zsjBowcYUq9Oq_Yvna-<jq>Fks-{)`f#sbm#oI@d3S+D1*sjFC3QC(U|PuO+28`{ub
zv`yZK<_&88a2OIahdMgj17w>kiNckInpO{g(>V_c3TB@_3L``cxd#b)EsJjHG?38V
z(AcV~N~_E1w6?BhWksc%PPsgELi#k+)KnU>GzR^fJN?a3KkUvW33y|{<~BnT$h|5Q
z^3Bz@gkmJ8@S>kg-X3Z5`ygp`XcPa`)9eTg?ItSMYGvNwl~Jv|qcaqaYV@g~u|;HL
zKU{%y6Z8fY3Z7NB`2(E{9%%|i{Oo3u8ZCT9O}(3ShW#z=n;DugHPH58b0FsP(<#xX
zBXSiT?uthI0qBGix~#2pudG<d=A)F&r}jTzR%P=eZQih-RaUH^w!WgGnhq7!WtENP
zZaOV5Z7Ahg0G|+A=3<S(JA<K3(q*uVr^Abw3x^Bl@T9}Ts$h2OTy1vi98D_-`=cAZ
zf#tYBtd)jaV?3gLp$;!Fg|Q3DYpO~ss^=KR5m-JJ@P^x?TeJe?N|do0SfeFCM)n3<
z{i<pW%(AkwX6+n?c+$fD2!fCz7@@C4I=q1ZHH;=If!!i#OmJ~QV|BTz#aKfq3d;vV
zk%$&*(IV}w!S<GRe7&pLuN5>@*3{R7cP-_iGh)?BEPT=lQ~V#n{y6p{*qtpdR)D<<
z`fQrFX>kcfNVL5JfrB89h5gq~W2HVHB#UUXJGC}6hF}Qs;%)WMi@<kij!e_mw1=ZH
zZ{Q}L?nR2?t$MakYuXa^qX9)VuTF*9m|mwg9EyStX9vwUwMW|!y*|HIw0ZVs!c*St
zjQC@|5X=+^HG7FKeaI{tYDNN4d11DXC##9-G_^-z!MpvM#O=bY#jY+FTUAzetya*!
zc*){<ouNqk=6SwN-f+vjuzzFGTx|vN9kSjQ4OUvUcHUZ83B2!s*mJa!!X<?Z(e}<*
zzxb`{FD+c~-?{$ZtN*+8|GxNn*M9HX@9)V!@5ayH7e9Y*{{H{n{%=oz>eJud&b|e(
zNRe-jyX%-^Yo_CpET?k^ret#frNs)zKATF>d=70I_9E;r19mBJSlJ9Mt!LT{=j!Qc
zci~WqRXRkk0sGNisZ<$`z$v<ShLg?3X#ji9Kq|EePa0V1jLe?2@^dq8yg&UuXFMZ)
zOWL&kr3Xt7m3|izlusu*k6_mxOQmQrH|XTlfeyi+z+Ny8oY2PVfr)mmM;`G1nGiVN
z73XHS?@Nz6({>S0;z+vE1l2C!-E787Youb%m%wA`Q$5-bquw$?Q1mzRYP^i#$5FoD
zT%Pu?9D(Yt$A16kQz@6Ze5+A^E8t&5x!+u#=GE&z0{95ZbIB))e|nCC5QzTM*pGc7
zm8!*2FHft~>%R<e&KFauD=hUd)9ar``GvbvsZw+OZ9+cs2W?~Rq5(#{HPpKXN1bnZ
zJUzIdo1B-sP_z&@bkuQ7x^Dou9_8d4y*$mO%iaa>CX|<$%R7Z^8eqGyCs2L>N4-8|
zNP9{MK{8U=)mTM$yBR0#7M;g&z}r!dVYopfBzRDLC+xNr<yV`_TSa+3VEHJ&ALZ$K
z+#~)VL;9O((h|Z}mB4FyJe8V_qb_Uu`*lAA0B`+rDpg_Tljhdtd;sPBD6g@U-^j~J
zj>l2{uPFbRx!ip}wS)Wj%a%v_ya>EGUrD7dFyqx2`qHNnW}$qIxjd~-mm?PmqYmXa
zSjt!G<s~TJigL;ax}IrmdU*rN52L)(QXbIDqbSe&YAUtCQodd<--+^dD8Iu}-lCU3
zf%4Cxyw_6RqnE#k^67h0sV$cBm|lJo<vx^OjH51p`h{tPK=#XppKt$qD)mWA{g3PQ
zOHlq3l=F!~)n3!e_3{Rk|8;`$D9UGlBbD-5=x@;L??ib!%C9w-Z{)?i%{_tgILfaw
zmkaao@)uFwhw@LG%hNu=2~ZrJMETSwQmH(|fv!KrbGE}0&$FD2y#c)EEOfrB%ef5Y
zyYQhdTJojSN&BQ;z8>Y5?8WL-GoSR&>g{1G%0KgDD%EVM@6qc&g7ROY9B)7v^l#$D
zT+gRb{!^5@%;l!s^D@d`NBQ;)Q~mU98AL$?=rqdL{!1$L^QortRj|VgQ@^_(IA_X@
z6eF}dzpM9=S|jg9H=u`Oysun_V+qRd!I5kePeW(xn>HhJ<^CDYvgv+#R*o*0_tn&v
zx`7YZ@a;^zRlnW_ToRkMx5BLiE}4Kfs$YbCwF!2n`USuvJ?8@V>o_Vsiqbv_@ynpd
zis`j8GD~s7WuW#j2;BD)F4S$1aJn4ZzbpZaXzu|&<xM?)M86*6g9&ofiW$r`-MCyW
z$0(>_qp583I39k!l^scE;@=P48;Mxi3|HE!8BU^6g8eYyShUMG!X@1f0Cp=u2zTv_
zGsZ_AP>A+P;NL{}%Ktc}aTMvk<Ph4oS??7zj#?SdNc*g5991@*@Y}GjKAcMJqI`7|
zjl0nQtQ6y}v|$rE25@KcrLxVg=ik0<x`9jlS@n#Z_3)*JQ?kt?fU7=?$8`t7fuaEX
ziO)Lhhk-*jpzTaDEkhaMJPq8(2~p)zshi)TT3Wm5as{;;vh#ZEbH9g=6yvDZ$LX1P
zs+it^I(M1tD0}*hQ7q|7et#LbaWih|ed#OX&KfQc#i)CF+Rge!Dfd|y@Jo)QQajD{
zkYnqn@zk<vdfKXK`>8H$Ml$We{uuBreU5jUz(`xoPs-j#?6dF7_6K_8iz4h<fSr#c
zZ5sA+?0JAK$B}GyUs~ymta$pC{qW*J_}K?A#asz+9+5abgmZs->5QEFoMkg|;~BUw
z@JySLi!6|XN?E0cQ2D!*5z>$fbKPUWWz$iKaLY`%r1uc^0QiudMLTiN$f=g;rF8lo
zGcrL6NmWDfY3%*LC7lFr?KB>Bw{aBSt~9i%M}Tvu#JMl6l60#8B3G_-dfE-fIcN)&
zIsNshJA}HbUyY|p`fCM!inlJ{ybPQMqF+BFYa{ahD)@!2A3>S+1EW8@A2~nkKC)RH
zHp{D<2KD#DR0qNI5Ve-H+W|tu;h+kDR>4d;5K6~6V;qxjsqJ)upUUmIxTbAvu2r~E
z;7$=JdTew8Mr}!LXQDy8Xy1i*S}r1F)mFvr6+zzJ{tGOytlwa|0m*}Yw`7+IR{Jm(
ztpYaQb_6#P$FZNrKJDX-U5dQ~`wiG{!QP3z8~Z1)@5cTt_7|}K0sEAlxTnNkguNR3
z8tivq-;8}H_Ag+kZ7+@ou)m1?81_-@X%C?;b`5(W_9fU?V6Vi!2743sJFthbZ^eEe
z_I~W2#{L-g$Fc9lK8XDX*nf)s81^LgSFyi|-HFBgS=cYcekt}Vuoq%qjNOI(2J8*k
zZ^zz-J&b)T_WQ6ui2Y&gpTqt*_Py8#u|JRfMeMI&Phx)+J8kdU@$A^~MOKdIy-|M|
zo|@wMWuRU@Kl~$e)8pl_VCHkI#A1rd_NK5myoDWbtnx?8V&O0zk>a6YGoDDY@7iG%
zKK7gm+RzsEdwl@1^fc73^hTom$v0yc&~+7GlCctNDyp%Prj)Un26VMI=nD|cO)z39
zAB5uWk|2ETN362~t8Yr#2RUR5R^@aw;OS{;glN(k`y`b#v^U>bhD8lgyjPG`5rqEU
z0G>jQRr!kaO22ob4b0}GSBAVkX$eU5@pS&EwHD8tL*Wj363mJF!>rX=?~gVH+qmpL
z_vU7QCp{~LG_Wv>I_m>|e<%Bpv%w$65)yCJuT05$oehBqL|x+z#Qf|N&NC8Wd!6!m
zFY3~>TgJYnAY3dO0b{XIAP~Z$h4v`ct$94H{wO_9_l8>|Y#FYxDj|vmB+QNT09Gq(
z<Ph8!<2vGxdc2*T9$Ga)vyvPVi$G%W9G|fdGLN^p!xsp$kK(K&((2)i*yot1S)6?V
zXKl2qfW5*zc!(biF?PPg(?Y**#n^2Q&JHH&U|yVun$Y?k9z0pTleMRLI_~5(JJUQ;
zgS*o_oy~Xv?`K^&3w8Q~_^}|I#kdZ?PV+>f-YEM$9mBp@CtH>7i3K^emUPd?NU#&j
zX`(IYVV&M4EVN)(I}!dUN4|0jd6zm{1Os-hv&A0*?lNafOCT1(K&{-_!db3#wn##i
z&K3%5Rz*kXQ}1kv`2BaXMkm&2VTsr}XUiruGSbuu%afrI8SRngU^E<H_d99X0dfC`
zv%}xfj743npPzMNO68MICGDr3P_P+GFW5iOS%k5FcGBttZ-B9{I3p768%`+Q4D}Hg
zbVk(n@iU_KFLV|ldkxZAkctn|8U8c&JvxhqVgdGJXM{H%%m_F)Dm5wjQeXG~aKF)A
zSM9D`xPY&k1FKx{`k%bhI<Rn5X-fuvcl+;dfui$Vx`;VBF1BI0aZT%;y0E{y{SUUl
z9v7R1-Ph$}+OBtf{Xf{#Hr42!oTdeF$HV{DV!b|}zu;G59xRQ0Lob)$cMtzVEbvw6
zA^nfpC#>^?|L?|LSUBJOKN4=9kM{)Tl@ww%A+4ar1z*<P-a5a1;gZGko42%LA$Vau
zE4y|*2L7#^N|r8I&zC#m#Jc1$>e;xE7CsiQ=j*)J>vRP^)`-sI6c#R6FBq{^)s0$d
zy|$omK?!qo{UVEkH5bA<9aK_=HIk4@o7WMI1^vrg{XwiHZ^orJ+}yUDWYFfds{b{>
zQ+o^N4`JsCKH9vNU}zqO+Rb;)>lC*hp)hlp?SS)fO(6&@C~W?JqW>mxl4A-VDyKQ8
z#)33T#$r|s`dOMYgCEkSM%rkN_1Hq(B((~}%nW{R0Gv~4r7FJ*0#y#T)^=p-*MfJZ
z(-(@-iug3A6DyH1C{N3B@`?(cmLbF-nbO-gFIns%r{HeL*N!`Cc&x&459SM<>rm3r
zSnc-Im#ub}H)4Id307NL*HBSf>8W$C@|3%4-B_$#U3N2bm}=F#J!im5vtrfPR#r3+
zrFxcbl&HEZD@#{#HuVjqm6gnCU{uwtS;sO=*Y2vCx|=;!74=o64P~o6qQVpdVPzv^
zDyypXVBNiEMO|q%kQOdrQzyn)T*5LZ#;C6$A?xvmy>2tks<g7v#EMNbitF5^_4PGn
zo{H)QPeTpa3A(u}*>pR~%32FXmVr@PR@PY6SXtWO_S7^stg5M~UgasRgB<4?IC!<7
zvSwAI+tXN2#W0zh%`l4HwH3DFY@?X$Rp~B8og4#L+gQKaQ^jq~&NIM7zY;D-DLdZ)
zm)A6|P~Zy;u)?mXWw{1aAp<(ofYz3ld+Jx$)HQfkHddE4&>KV-T1)HP4UKix_3S+c
zcx6pvo#%!|IJ>f<s-l7A8AWhc!`jk1$conu+=vvi%nElk-aRNoOtXs&)XK728AcZy
zKsc`)mMpJWc{97j0F$xsMnXB>L78Ph;bHeGcb%tvC2F|21M1m(jq;k>22bg#Ms}$I
zDqT}kQBHREtgNZ?l$Mv*vG*CJ^>~rMQvtu@Pu0Q&<O!yop?C><zfmH{0^L(ni})wn
zWjr1(GjOC^>Kp1{6L{frqX^Bav=VPQxJmal$O;^X-d*viD5_`q20odizI63UHrom-
zt86G|S6E>y8rYRq$m$Aiu9X!KqQF{IZz`H&En2y<&h4&cR~b<Ex(3gZqJ>MYp_ki`
z5ULyMG4-N1(=~Y03@`rN;`WHpV{?tNRfq^QOP-iK^`s3NOC_6UU=XkouM7#RRMsFY
z;LeIF#8Baxu<F4N?Ny@9x1!aSmfZ;ZN-tDY*H`P9MOMs)n``l!Tzx&<0DAST*jh}o
z6nR$M?5SN>Q^yt<g%pl;5E==WyjV}U1x8>CCqP+QS5w82O2$QkVdaZ`^=y%WA+ow9
z+>puyGMup3z@$hKj_{Z<t{E3YC$PjQE?u*3!J@@ya>ddK5Ut+0)`D5QV2N)1>x>ea
zqt;e5tfsb!Njg26N-Niv-dyiliH-%`5MDF%An@371EH}R>9~@bPNln=U2hcBudZ0x
zP|QAHKyGnU!&=vXp4B6G;a#yoa}Nx!)FAcCmO>eUJ!2|gSz6z~GaO#1de#ItWiQX#
zx{3xj+ixo6O}nbtv!<dHZ^U8Uogq<mO#@6^TUt?9ij2;_YbsKGHH`*DuY1s3DkZ&%
zH(YjToTAkgqW?c^DwB$l9ocgxxCpGu8rhxIv*%5P6ie&MR<ByYzBdL6&5GC&6Oi-~
zVMnQkecx0hQl*SZBy=kOfvtRHX(hN}^uu%MimD3sLlcf1U!adEui%{)JVn`O$b=&-
z!b64q$OK1H<-Wa1n&kykS!wwVjqt1pCH7-eNhLhaUc_S#KB%LiwP{c{<VdGMImK#e
z9mYMB`mNWsWH&j2lPDatWCg~OdcAcN^J19Bkyg~NEv=QKG7jKUWYAz(4uR#kRE%E7
z8Nz0!(<_w$|7J~&S95fL8nWi;5X(q5$LaC#I%ujaO-uJ+%ALRW=kc(N7Q7tk>BJOs
z`c)r?=2M)X!r!Txas2%f_H$O_X3D{)c|6nuV2}WtdRSV{IiE&hMml{Z3T5Tyvh!rw
zGL-!%ZjSR<&Xn^U=R49fFUg#pc|itvJI-_9Y&t=5-h(@jd^Uah^|*xdoxqzu{o3i*
zWjHQ?g9})C<}7?5EaO6)06M(_&?(u#r<18O*_C+KpXqQ^TtMjOyq{HEFdw7;X(a+Z
zqvC=OT$D!3BHrEpi!2ZU-!w)mh8>Q-%s3Z+9W)O>;rn*(d&PUed<uXueGY)nBxIz~
zTtfQi9FEH_yZOeV*5x<fTr~gs%PvcEfC()vO=CMJ%NC-InSgjZ6Bc;-hp7s@1P}R)
z8+Ocov^E9iHAh3?2+G7{2n74zvE@Kb`gRALvNaRS$>`k=O{%Wu0<lzQJ1yVpN^hBw
zIaoTw`ON<g+x&0Pvaki~2%zZuu>TDob7^(p@f|+8ftf7JRx7U@h>mo`$aovAhopGo
zI2>Uc{-WDp)T^X(2(7s<LVW{=uUOP^Jb0Gei7T4k6SX{erjN(Ve6^+lA@OML+JN9S
zd(Pe9^*NMxS$KUD5Sr(fwP?ivs-aIdNjQkBK_HQYA{qP`kYhTe5ax*jLK_((-SH;M
zZsynOPa%DYKwc1ybO&*@ZiP))U?Mjzk3&<JmgBE*MYU<QwxB~?t=sQ$NtT}o=M9v%
z0fGFG?)U)y+Bf88z7fB4$6@?c>-_{=MN0`TWwdN*rODcPh?*vR4<;z$CJS_^HmAcp
zp(g$+h6ae?9St}EK)8Ky#QG}Y4g_v_DG4ty{V4~0kHTTPFF1r`J_qI20fq7f$s&AV
zA}3FkFEm_p2_04%ss`Cd*UPa1V4`Sjg<-?-!p;<@_Kke8djek+-qDQJ3ugN$%U1#_
zEbs4V!dExO(x)}3x~4>ewF8m^H}V#T^YOMQ;FSu8BisW>HY7CKX&)dp7RWyU@`Mh-
zSA)DhOn4qfgE!jFZs6pdW2W;>K(3#raFhpygyg{x#K)-7wAnpK8iI^zQyyFbnDC&f
zP@XF9_;4+}^L{%LAmp9o1m2-a6bS{`Ns@F2y$J)gO`GypKVY(@@K2_UO|9QW%`Rz;
zGv(DEO6o>S`2`@9wG7A~0nv5ma{L95WjN#3;E)WUyDX6N0inDh=y>FZRmyc7kNn2U
zY8`?TrU9MeP*C<@D8)aoVnF0~SQ>N)PS{-3dQxdh0Co)^Z&)CufLw<g1S9Hd00~(j
zUO*N?c>^Z|$VV*@`ni__7RU}j{%C>FTVk(fo9R3X$a~H+L%s|M{hEToYabwAwLlI4
zQhL4_X9$o63*<L|e8~cN4Um%-NCrZ31MZRxUgrZcWPw}>ND;b5!T|wn*8=is3*<&X
zE}v<pb1NW^SRk!{?0t_J=Wal%kn{}heSkb<f&3#NKes@>0!S$ut5NG|K<KBb49G!1
zK5v20`(+=%OT7lpD}b!M#0)tBh=vZ{z<CW2C@N!>bjO#0`MVEf2^3<x6p#`e4M-6n
zPg&@=0J;5AGvz8kp0PkS0P<5E;_-z%bfa@221!C5eDMe055iiud;v+*dm_=6DJRe`
zg3=H27@NvtlqtA`4r;Mz0H)2J$23!^I8}LU2QEqPbjRl*uYIFDM&Du=IA`whT@Z!{
zq&sGzNndFpr1IEaKt&#l1|pGI=h%*ivUb;8X&;N$2DuLbXGr3tVb!H)v(Mw@Z!{s<
zLP`O-o4<1+AXN7u)T+f-WXbX-J99cDGmXv&+t`$yT>uF?8)fQD*?AoRqQ9U#Xx$3S
z>KgLbRhH)i%;n*uIID6Jr%am&M~(`Lz)1K4DnTFfCg_ykQe>fH#=!W9%Trzo)lKq@
z!GU`SLL4a0&^O5|9ONctzNG-yhF+>v93@UEjj_*&177*J+;R)y2wue1x)l;mX=y1z
z&xAu|6sv7Oc&k`l4`GN)x??N-#cpgWRu2Ls`&=w8?eK0M6Re*DfekXE#_My{m_*<Z
zFS5WGf60NK3ne1P#?f7l@Y{eRVr(27?$e4g%4~+6t-Mgg?X&xB*ypHjABqwy9c7=N
zphVb*ue0#bm)7v*JKaiOgP5JF#aT&^D13VsI9&=y&wip7Sq$CHm`%0Ha=_oJRR(}_
zCW{eSK0<pN)^GxcY@Y6L;V*GDHf4=p03@ujIl4JY>$i17=z8^YO^J?CU!A=Zy*g3p
zt@J9uX!%U7K*{_EU1o1oEFm{!Cb@nLrG?BIAE^?|ym_!NpH|M-7LLuUhNeG9g&F2b
z?44*DMNOfpg@k^=+xrBX5+aSU%XJT~Cx~93PLwrH;aqr-K6g332Rpf@f4>I}y(q5i
z8|k%s0=<;Xq??d=6TWrX><yc4<y8K8XENL6QGMKI$n;jeNWKl3>8@VLj2AnwObY9~
zo0SFLiOj1}Nn`*xcg*%qWG=wa>8)DI#k$Oxq40>;R>FqZcpCt@PPGEyj@|5f(c9)$
zxmCNUMdi23Y=$rF{vzJIT}+@C;ZW@C(%VG?AXdRujLijD_^X+}4r89xQ+f@~7qutK
zY;Q*|>W$A7V`3~(b_-d}=;Lr<+9XaXfhNYOxP?YEZ-G;qH31Is;O%q*J1ZN~JNCkc
zc;AR-B2BSFbp8T23L9$UW?H+QDPpbLJBgo(>`YWiujB-J5e~)ANj-kfJWi<Ab??9%
zPGb}YoeVg9h{w<Px)U$DqtIn00J|Cx4Z~b9o+n5dAVn5P6(F^kkK(Oc?}Y^~%HdC;
z*5uouF3)(gvU03m0trNJDS;Ir%9xGpT!49rGvyybCp&A%tJKod9qZ{Yf%Q$rShH?t
z@eNWej>X$khP~H9mVRlU@!Ba7Yz5A!!r>h50i+veI7q$;obIqd9s;Cjf!P-{x7wxS
zsOS~kNedU0;op@3j@aHw^md^Nm&ZZv)4Hj<+BW5P$Lm%EdBrp2+pzpr-SRt8b9~Fw
zui=W;jbXT_rL(xmusX3Dgs?*;(muc)yP*nwQ#Y#P7_rK0k;SZ>iNZUv*aN^978}c3
zT=P8kHms3@oFL-x%<a8fw+0@r(hP^y80>ina%>`NbQUgJx^ThLT8PH`K`!FYQ7dPW
ziZR^d^SP4^I)so$fun1x+feW#8$JRYC}7&`HYDw=E>dF&o$@&Cok;SW`8I60Ot)bh
zYFYiN+A@8^K}1w*#DjSf`tG&ajDLluT}pSWxFibSW}*f7a3;nQq?fS~jJA2eAt@%p
zp$uBISXrKG`2g94BZQFhZv><Zsu++D1F`|#E9sZ6`$EVJh~pYa{T`GVoAN~iKtdj)
zOr0rT>;i!Eauit&2)N1sI(G-<c%?B;<wpK0$dVFH@FeRo-Ct4Eu+mZf`hxB+OjLBx
ztBcKwjjsD3w;}1S7wIQ<-L3v2M5X&NW#@6|5FY8(Hi2GB=5L#2j<%U^9f%Cu1rG|D
zwQ*%8oM(WORPqpj4FRG{$RWP~#C451e*Ox`aZ9c95Gg|zoCSb%E>X2q4`SGG6&!In
zr?37f8?FQ3t>Q<Q(4nd7mLu74_XIX1Wa^jm(B8>Y>5ilLYxSA3^8ww?RBIItIrUBH
zm9tc2orz-O?dU}!h<0I(Q^k<<N=~4clKCZF=1z1>&E|0Cq;7>4Lgq8a#zx>2alJIz
zYCa4|tp)OFK>96^JyZ)r17lqG13<bgklzBb#{&5aAlh~2T3KlHwHC-#fb7vBcFSLf
zh`dZ0iXY!eMB(F}(()D(`UP3O;9NusjuSmMAJrpj6h0W!Tgg=xzt_FfLcgnF+o~wx
zVWZmVj&I<vH8QE}W{CrKz{w?$ZEKY{2pHgO!e1~pZOVqV%T)AUWhxb?XVZoeDG!EZ
zkVnH`dz61j;=t6vK>`_rqaqwjm1GZVtl<JO-;`ckb-h%HaXg!Pk-x}G!e76FxySbx
zc}e(-PtF^{$TPB!hI3(`Je*nmMQG$x@}%(TX9#55C|27hh*f37b6|ckN)a=_^1~Or
z@0*+r?Ru+T@9ng&-ETwYYjv6R4_=u1YJ6(~_UYn&N7k~NPw&kI4#gPdTPvc9jrAy@
z2pu=8%US)mqgQeQy+EGJc?>vYy>!Q1{2e2YTx-;?;#t3U&?VGI7rH#Gu$>-G<X`g$
zaw|G)WG)F=lnbRSkdh-Pw?GzG!YmT<cX8ig<4z{E@G9A7<9^{;;=b9&owBl(`)(We
z7vYGrp?jB&`zaguJvQ#6Htr8k%I{Gd_YoWS$86jW7~ExV)rBrkWC<X%Ih33%+h@_@
zc5w-{aa)R-ZZ#s4svj`bqBe#RB_Mkg9S%7MycEQE<|}wnOSuGCqAo|rAA8FM(XlwT
zmJ5}~*?5nSM;~w1<7WYfD2)4bNw%Fqn+JWUL9(M&N_jFtgmRJIPOqUckR?_Zb=%s`
zvavp0+<+?9=si3s?n`Xk_t?0%*|-ndxDQQ=d#;W912*oo3eaMo#WZVV)&1zCxcA%I
zPNt3fAbe%zUTDi&$0o)70ULLxjr-F!?wXBza#GxP*|_J~xDVO5ud#6-ofLO^a&58d
zqFNjGOq<`2*|?vY6n9!DW97cf#(kZQJARf})spQUzjDj_aI|H)Lg4MR_X9TFm)W?V
zv|0Xfo9>yD;+|vEomR_PtWn~!>3+LS_nb*_KW)=JYU55%vMll}F0^san-up^8}~LF
zcg@EALK}B&Qru73xOdvP(<)P|?pN5j7fg!#F&p=FHtsn#?yuUSu4q!+X@#vtuSFYd
z+-Y5{1!u9-ru&jfaX)F}9<XuGw{gGJ#@#h3?l0T8H`usm*|;ZdmR~(7?vL5H&$4lU
z(UxtR&JuT*E!)tVT8o!UI&HeYXtO+iXnYcxw#dePw~hM-8~4X;+}BNtdx?$v<2LR-
z8~437?i(h>eXfoBV>a&e{(!|7i$7=M-Zm-jPurrd#KwKZ7ImMtMP28lxI1mSZ?$n(
zPkQxn_+pn$_sx^yo@e9UZ{xn&X8Ev<d)K76XWF=T*|;yUalgUFeaED@m)p2MZR1Yw
zpMafl2ekMV8~6T6ao23zAGUF?wQ;}C#{J<*abIoYK4{~<*~UF-<GyQB+-KRi@3e8R
zv~k~R<Gy=R+>hJZ`+6JqTpRZ{ZS8%}q`1@a5GZ0q)S}Hc?nO54i*35^n-q6?7GmXI
zVB>zwmg~0Kbe|k|db7;RU9)jNYU6%~jr-uFbnmorPmZ;7$u1lBy_f@$GRr%u!;|8E
z*v8#u)BTj4yG{3@Npa7&McpGd?hRwDvG_q-)E%7^_imf+r^oUtdBUc9noaj(lj1&N
z<L<NRK5MKzi?eLHCnv?d(q{PsHtt((++VeEADtBUA)D^2ZQN<FDkEIX&oBOg&GM%v
z#r;Ja_evXgr;YnhZQR-QlNnJjvswNL8~1>X`|~!-XHJUy5u5JiHtwfwF+XVNF6X)*
z)aSbGPiEVK_;x>N?9%D9MBDH&7(9_T^paUCM`?kQv72p1Xgr*;bHd}{i1=ARPZfDY
z@u$EvTWxIeiH|+gE;7k1b$?_6-PO~;|3tk?x|CJNS+Av@WF1ysJ~PfWwJI_l^z7BT
zsVAXdnm~8ucT6bCmaF{Utt8Z+D*h+h2kSN8+V6(U%3>y&rQi2Wp!<J?-yhNS!eC&`
zrnES&EI)zYH>jN8z@ybMoAUb?!9qOS!dGk57YzJC{VfbPo<LQq=R2H610VsMA@DG&
zq|FP6@Vhqd^RNF*8<ITq)LWO?K@k9eX|sJ*U>q9~`bJ$ZXzI8K5TUP$6zc{~iJt4o
zUshg(%U2^z@ElFqN6~#}bLNA}%lgypB`PN<NXaNjTl?I{jLffQ>?Qkm#(kfSdy$QM
z(#F02EODo=E?D$hG}p%cxQ+XLXNmjcHtzX0?l0T8htCrChi%+*Y}^mqxUV=%+;`fz
zXW6(PuyJ2<mbh=VaX+c@p&s*(+qfS?^OVu@cg6f_8}}nN?%g)-)n|!&xsCf_8}}|7
zcY6Q-Z0KHK<NmmfyU)h`6G)tAgS%$q{+NyXdK>r7v&4Owjr*XD`(_*WDQC&@`8Mvm
zZQM85xObl=-7{_6AFy#Rw{bsh<b=Pg#m%yD-(};z&c^+gv!wfa8~0;2?ho6zf8i|o
zeVvW_%Qo&iZQOUBCGL4P?vL2GH`ut}aF#4T*T#L1jeDDo`|h*EJ;%m<r;U51jr*l%
ziF>Y%`@=Tw^oEgT{Ij^^EO9Tgaeu<bo$dmx+@C#5++8;A2W;H8+PGhMmSVoa#{H;`
zd%unQ=Ci~-%f`Lm#(lMo`?RxU`AQr2AshD{HtuWAlI~6$_Z>FwE*tmbXQ`K|wQ+yZ
z#{B^s_dCv#?n`XkpSE$2+PMGWEcu<;xSQrl#5`LG-AP;9`;oI``4SuVeKy@YZQNhb
zb@#}hqZDf$H9j|iZ=vDdoVHYoW-I7dB<U;J;u)gCc?>wagD#0f*!uz5D)mAw`SXin
zHJz&UBP(U`Lz1k3&sr;-5s3p*Ql7t9Y7wt#cwu6hoIMa<f@=48`I`+e2+1sdc9Jcz
zP`(JY)EIyy6h8~O!Gg1ZUd7P0AYP?_i03IJA+Lqsh^)2Ls;64mgvIDA1c-WON18Bp
z4<Kp`ARs$!wY~v}8Y2mu=WRH@l#oo&6gZ=R%tC9zO`?QM#e}75g92w3ASyP<V)7?P
zQNxh=19F<vfUE;#x150ybOL~=XA?xnvpL{tW*X=S%j1M?vC;V`L2}Hzz63}vNK(5H
zl=tyknn|7)0D)R2$R7Zi1&G0moKCIV(0v*p_;13Qg-fS}S0Nw<9iheD{9AAa<?D$E
zHlr2LyEpy1-|2hq^b@M$IU~geZPloy`dk4CS?CZ>7a$vOG-Rf)zt6Hr_<2CefkQL|
zov+*I90WwIeG)h?0-~Otz&rByU)yw<L5$H`Mq-1^j*D@MlwsQNYqs=bv3xTk;Z4+f
z+9KgOm>kWqMBRmeEVJO`%L!CN(*=MS5#>=oRts(huSTk6iIxsPaxJ{>21NDmLidLN
zQ8PIL@+d(-%JAve08w{;0_QnEXfwFKWP?ma3z!QWgU&^OsCgSf=So26PKvGs#0`jA
zFCicefRy0Wi1{W!tdzrmJfh?9Un$0y|7kNM>;jHjg(4_F0EmI(kw31x$Kv+^3l3p_
zjYC`}%7cK^>f8zE2;o?K@gEjC)OMPYducQ5^D1!EeXfvjD!!E2sZ;jQ&-&u$cf|^S
z#38Sr3mi2oA|UesQGKO=ECuAG?BfKa3Xm?G8dhBoh_!FJ8xY!zoOvH0nkAw>14t)u
zh^nCc&wxCP&Re{ZDzb#vmN$GXA2kf!zl~Z&df$X1b{LR63$K489E;4q2BhD_i@qmO
z)j)TMhCF`;&Mv){NB;csZi|<l@RiF_YX%_d4H2S+H*o+dvB<LskTy%LdO#>q2)!^)
z5I<H8h=@b_as~Znw0PF9JlKp{KHwPbJp_oFR~Ov30;2AT1mt6Y&?b4IU#8!vW){63
z1I`8@7+xL(#A@ds0<u$&4H^S@Axxfy&IoYUfvrL36d(a`7czUqPg%1fORY?Nu~obi
zL7L(d6ygWCQA=8*S^QwNc>b=eaRF-0weY$O5OrTbbi~hnck0}6!j=JtHlw}Q*dR@S
zv{@*JY&iD;lGLq16h8&X1D0A}1Z2<x`6eK{Es*_yKxvaaKLx~P!TB{Hxj-|l`ZqwH
zws4<?uhn*2YF!1$4hv)nAVkM#O{)MwsG7L12Sh!YB^y#7jDAq}7yXnw{h)ZK4ncLc
z5w+CFoN7_lx|`<%gI70jXjCAw1ja}~ALU-ehmkiP1de)I0nxEN0?4RE(=P+E9wk&R
zaDEKPV-}p>12U*f=#f8LKBPm4@|(cXbo=1DCjt6Vbn!-*im|B|SVqF~N7`K$Ix~Ue
z)9Dc9d_ZWE(Muy?WaD*~T1zZAgk1|rgHFdIe$t(3dM%#SF*eTBAyn&j)XLLq5hP@x
zj4^=xWqBnJ;q-8v9FyNa1BkV++{1BPCY*l(1UEM($oBx*W8wZYK-OCzzXjxR3*^s$
z(2TT^$FdQYl{${c+l243!0#4K-wT}8s0B3X_r(;<e1pIElTZY~nC(X3?6Jf~K-Mxc
zz}<j|H^P+P?*n9mE)S9XI3ObyI=dwuL!M^=sRXV8c?l2=5F^5qvX;R;9UtSQHYoEm
z+D<##PM!|I3A+F|v>CMu0HG0)%&Um8U^9Y)_l%^4rzPqSAo1o{Z0NGlxy=UY0VH72
z{iA>!w&=cB)*|iF_&01(JZAeLa5eyDSmV!t5T2pMxfhB`2INve)VvneWXuIfzeS#E
zS<A?W?SMorI2!?}<vl)0K=+l=P%N;+VvRU(#JVQ37;PT`#27ylWPoril)nlHZHCO>
zvq63Z$PtUhUIpZUPKV?P_=8Nm0jjvCy@#<=mRfm$WFa_=ma-5K%6<mqMnE3cYkByW
zL(z7)?uv3NaA-4R-Ux`1v8n7KK+vI^{I%OwYY>n@gO?bju+0{${uDS?8=eA0eO(#8
zs1Nx4ovsq%X~=UP0=^9pL$7>5PV2k~dl?|RERdT4p|&I1m#00_9E4%JEb{n(L!015
zmdAg#+Jf^SaID$yGk}!q{-XMO07>e#JdrJtsK0|ftV0Or+rW9uQtL1vYPJvs*nR`Z
zW*z4wt_uBa7*5eDwnCr3Db|YLRPhE|@q4`TvOU-mQs>^LCj2<Fx(c)h^-6*Q`d;zT
zi1y${Z=l^*3tAoMvcs#rL0`Zh#%*iZ?`g)b!{Gz7==6f#R=>~N*(u?jow9^~K$J5E
z#VCCg3}fbc`l=`fk9c)F;%TPeWMZDR?ZK)srDL$w$0JMSC$cL_amGL7mw)%&cbl{a
zC--X4%DU1jH-3|KRYf(%2Y}sBrvFA8uJG|Q{FX&)JFFj;R+CVle=K}OWlh<Q^%bi;
z73Iu>L1Z%t-o`vlG^)X%fO(*~ht^wpI=xX8wBVPJaT<=cdjm)se*c{mFZcx&=4tPs
zkA->oYoi|i>mD=|lGl--Yzm&c=u`9vj7~|B=z<Vv;#<Hl*Imt?js9>`DB@>ms-C-|
z^y3T!y(=2=2k=QCT;Pm;!H++iggcr8F`u8K@gWLH1aX2sR1dWnX96yWw1<Mgi1^Wq
z3Z26K&VaWWJfScRyf_Vc&S&#T>xf^fb5}E|>G46JDC%&l;Om<5jIU3FPEq<bpp9M#
zLxxc2x~>sVG~~gjXxle(60k8+QzROJC))hYcY5yXz(;nZmBjg7F@Jaq^ydZq0s(pl
z*^6uy4SSoTnE3QJgDTpJA`?Y<1PUX9xeA6Mx!jx@^MqqTPgAU=1wj*u;<p817y?D$
z`yi;=L9n$zA%_M+Xp{tiqx`{0EG+ziD{<#W@UXulv{AtEBj-G-$TH##T1UfMpbow(
z#Q#P^p#XlHBND}L7j$%x^i*a*c_SVR+z2xA*A6_*xc?&OsB35glLY+UV5}43$S4$S
zd2o8Tt1#!WCFsG|)I2`KqpNrUwJ-&uq#!}j02&jaK!z=z0O)O$nE_$ZjL&dmZV7j&
z<QiDS3J?iMeEAy1t-%=F*X-|%Qdr85{38EjD$I|Bf}f9q2%=8d+m0ZV-@Bn+yAd&5
zg(l<<6C;U*YB9idG^0XU{aXB{bKxSwMaWZw#Z)X;!W%|gM*AWeHig@xUizVQ)ZAPz
zfaIYzKcV2v)9I%lqoWXsws-hJ3mHQ+;7v$<WT(Q#MT?7xk^IOcv4k&L1ED5wfE$<S
zm_Ym|?5Mf6Q+B~myZfjd{9=%13x^{XLU*=PMyD^tm<lI`QwZTlG&>N<L{ci=8fo#i
z2N0^vv#Q=x7J{=jN9*9bFc<^kRxTM2Rx6y#Rp73{hwONRxzoQzC|5{nvapC4>Ih^y
zg}{TGN<Etvml!BspHD{_Q&+{;m>Qy8*(-S(D(h)tpvj9nRP(1<=TWo5$A>(gHPi#5
zl~i<~ms{bD_zj_LML=JPq+08i@i6v!#g=NGbyN_p@<%1+%22q}=fjsq4QqLf(y|a@
zXe=@JW<SXXtXj7&8~_!O>QGQcXGO3q77oLy90R2?{QbdLhw6^-k*%;7iG?!aI~*^J
z8Dtp4hlof2gcBMFI=@Xk!OH;!Wmz$zP)!+<Q3o(VxgbJ4#so-|4JIf*V@>X9IclI^
zOxDK?^1?bO@bFO!U)x&9$2b_y6pCM$T)b$}LNw?#?HJ>D1GV8$6q&(QyqGLs*I11o
z_r}l0*Sj0bYw&}`7+I(vj`ff;xD9Ax#B&q%VzvHoO9&Y%*zD&4;1BbJ$GcU|mc(2c
z_WLV^19_?CCub$q@ucDGJl^IGUjR9ur%_8jYz&Gd>(iU~%Ju+KHD@9!>&cm4A`UCP
zktmWZx&$=odVln-X-LVqy1df>m8y_07Vv|cpBhW4-k0EGt2A^Jz7b;r0YP8IXPBh6
z4S@)#pl!zdhOiZS#w<goY)6}y4UbUD`50xK0uR`AMtI_u++ixNt(aXvY7XGx8Xmo3
zSm6&NWwbX(xPTGlW{j*zKnzo;du|t!3)6{NMOfW}MjsjuZ}f8l7_@{i%!oCKdjuN5
z&;UhfPanF+Q$52T@<$QKk-V(kR3<ojJ0h(#c;eYz;)vNZ${-fc2@NL*L7Ue^+oWD8
z5RLc{^q8X!(@0T}^0bGVaPAAKA3{Liq5LdvDM}4bVN}TnmZB<7`J4n48`B2meFfJJ
zSafHOdkXwC1pQhW2Kb6O%4n|I<H2h;CaX-)8dU;N&S~>|JIyZih`@*S6c1=4(=1wi
zGm<zp0I9opj4N|sC;v>pDnm8Gmx<rCgqy_*Dct1u-dPCk$KIGA%e90G$0#hE-)T})
zIA0DhJyjLetJZods`+oM<Cn)*G_K-59`3HIQ!>e=1g1-#kYrqSVw^@Zu2MNUCn~Q{
zm3l7(10pws9>54$Xxh-;d?!z1(l+Q#Jx%CN4QetvF`D56EcCmrK^l(`MrFwBlWEQr
zD`S%%*H%n=N}0g8Ufgh2z+R$iMQMXo4a`uR$EKW$oCbhC6Q^w&1@m?YOnIjwu91}h
zr_nXPA<{WgKSwvW7_^eL%)cHE3L>=l?`)z_c&{^r+btqbog3Y3Mz?h8ZA&iVKry8u
z3`Gf1w8u^DL1N?ybe46%c(}_KjX=537&nTc;g}&HPZD&iA{<VN@*74_5pt1w>cZw=
z5sJ;GP(-s_xPThxo&IppAHca61m$?hY6eapB(06A!e=xqzAi=TX*LN`5E5~R5=%{7
zOOYE;1eQ_1YNlv%)*O#~%v+%?Xt+q?c@-tEGfT$%1Z&qQAEinm<fM<f!o)u2TyYCP
zGYFQLmu41g7=VF1#FLw_Vn<{ndC03&t@L|0`p4_Txa9K5gk(wrai%IQQR)UE(dk&5
zE_uw#QTG}(Bp&;`4O4)aa-w_!CpqE(79y31=s`08jL$EPI~-IoAch0xZh|^ptASPj
zU*1q-n&uHMQ<Ey=`QA-8pJ%k0d{Uz{AO%Eh8UAl*qbHa$FfILsxi1%Ofo2Hw@r!xD
zZglcSVii-nlC^w{EU(a^(W4-}nTG<H#cA%;fBHrR1l`x*VHEJ>U}<A>a{z-Mbfn%0
zO%`}=*yyQ~vtVTbZzO`zzvKZ8>-pSd1MXZ)BQzMJGu}&ElcjlFAq+0FmGJVIY&Rw|
z1?$^Fn~<DLLc+H^Y3V}pc?Ow;CJ;-cyw2v%P7%w7k5pSnmn@J70ppZNETo1h6@ZBQ
zX?rlJ9@uWIvAwTQALDUl#kU#)kKd`Q+HY|$qgrb_-ItpCS~LbPMhl*nfEPbdpoi33
z55`qX8Ix#?bgd*4kA)Ce&24u^qIY^aC~i#mdzO@HP6^Gji-#Z1IJgyMcCEN|)wI71
z(~WY8gA&ZvMUIKLwu&IyAnvEegaXZ7Sw^fz^q5=txOWz3zIhnizhV?KVUD(qan3yQ
zP(xJ9tQ*Zvi<t~lpc|tC*&s29u-xd0UIq$}d*4M#9q2x$n!$L(@Uaa+<vTTW5S&c`
zGS+XD(u}dhTV!RL+VHcR%4(`tdgxEZs<oKq*Qe<hFKN2Qe~s@N{E#h{iA~iSBWNGj
zYWYRltu?g`6*bkj6&4mwo7T|Q9?>Gr;r7m`CZ<6nTF_5pcT9z7H1*lu8pC`$?zuGT
znj=~?q&3CxOK$TqDISHTL8J=9D=oz5BqP^O)3kZ>_+0$*TWQArHcf8j?O_aQLm<1U
z4UZSJo1z+cODgz*Z(b23ar3CEh+`R_p4GgXEJROC6E(alx*aXlqD3(1QzXRnHY8tu
zE6LCKyJ^aMtU95v77X#0;KQ%dY0VggN4O9evC~rpixiZiHBMS5<JU0vjnTf4T+Nj)
zzqMLdxt>3U(D-<Q^p&>)T0w~h=8NWtn)Iub7GAjEe&Gc))d(9Secu7|S<Q@Fa&%%=
zK?S81<RWcTd$djC&%yA6^{rYoh7l*(t3@mD`CGiPKvasramLEPuO}oF6bkU#^YBoN
ze$UAwkf<Hq6jG{3<_e*J%uirJLqHgRqD_e()CxMh%~~iJ*doObhW>AR-?|)ClB8KS
zwzECT>6zKFT^qCgcgQLr1-bx5w~dJ^+JvO)QX>#TqN;j}GMO$Z$VSQ(%2WYO*S^gD
z*tgh6*k{`B^GjULB{K!0+iYypFqC;tgolT_hlhuUhsV6_m2~G787>P6Yjpq~k03b%
zNSyYPujufmNJDNRR=TCsozOhRKhUiJ4Dj{95O5Hs)`7q__PkDOTgE_&Z5O&fd0`YF
z!1ECe&_R5UZw6<ta!MK<WaJimL$v$|Bn*X>kKt!t7r&H`)p~&*Mu+o0wy4gAd&dnB
zL?GF6EQpKOIhg$hAsK+^(fsi6RY`#m<`ZZXs-PUk_Ugl;^W@1&@p3T45Q&1(?Q?Hp
ze$>TgS&owSsQY%0?tah%@(7$@*`g$d+iI74d)SS6mybAhVE*;N-aPgaGxQv>t(9d+
zmFzRB!juk$YS3Mc)m*PZvLYu$=|&iTMxk=s-ZbAewJr5Zjc4_|@lt!Q|8&?NmKyYW
zTYp&XQ-RlaRx0K#<`o-S+`m(5F5x<=?B8i>5f$_1DiyuO8UpjE0t0dWUU!iZ2C??T
z?$*xg`cuXk{AZnc@NH&mWfyLvo%Iz2Pkc5L<{JF?HD0a#u=8}8voU^u_AAqd_}aod
zIJ(!Cx7S$j??n^g%Rk_`_@DUnUn_bP5C5B&*j<K0K7sLX^-2#_{yVBX-rU_@d$Rm=
zd1uWWT<ed&*<>sKwMJLr@xP%`LycdjY6V6AMd3?u!S|a_9||Rc#G(Kxk-rVY-QGTX
zy#C$V)9vLA*8P<YcYGzC9xVft)ra`?*{{>_i{ET{?eX%1jkVpKwe6j4*8X)ETaZL6
z^ZokHx4RgL@bRtSQBnpXP%g8v{(xovN#OYS!h`>U#stv+KnaJGlu}T6DTDRTij$8W
z0Q*-5hC%aq+o7f96kMsC!TU#nry~Qv{@H;&xZ{vQ2?djuFc^#m`bYSMv8jLyuo0#5
z+2jB9IfGt`+eQ2J=<c0`*9Rx<*5ZxUJU<dNQf#d}+FX_2ExM?dXvEzAy12V=M@zu~
zPs`j`Y#nd~T}Tkd-8;onaeBUg41*4PrbnCme`>vN>4T-#jFsu|RdM5B7KN=;2S48b
z(wf=g<O#clO?PH#cR{<qFV0}PpY@A&z@>e!NJ<Z1Vz0WP3j3+0_YpJzd#-!XnQhIy
zZ_UgA`qBJ-8G;>axYOR+*`=JqTrR#YZoR#FyFI%AkEIt_TEhO}e)p^s%gq(He>*!n
zdk+wMN6B-N?bh2{cW>Rfbqg)d%vdi*XXjlO?j8@j$>XCv{KoTNTEE<D1vbg_4IXx<
z;#DZ!GG8*dp;lxIeOLk=#aNrusgNQTO|b@BQR)ee#@B*j7>lNsp;epKA`EEcHlM(*
z*MD;tvG`<$4mM0;(@6t0igNB^=3EW@Xs~%Fg64G8g>SV+npBD9m2u;(G8w$pVcPl}
z3jhv&sFDZI);Cr$&evKpC@?OA<Y1Yr2L0ECNo2K%hy#X4V}XG1xI#{BID;6rC-!@Q
z8MR8lY?5jT1wUNB1Q65fm%K`AW^obA4_hWieI`L$s@tk+&2`T#m0D}2qNf1zsE575
zxk6&J2)sbFjhm^^AyNg)@hbC@cO|Zs-|WI59$UW;uOWjMWT_Dtm4F%l7S+dcJOMPe
z9J&iNtGfGz9H)TN4z^Z%w)pz%qW#CVXxyA6u6XOJi%C|k>@=HLHMP|mz?29)4kT>3
zU`<t_l^8J&&=@Ewx5j~}w<~M0s^{A{;5GJV74kT+F8pe)bE1qYr(RIhmd{(sYAe32
z&wEE$4jvU-yPMmzP*v_IQL3+!;X+xXK{2C_<WBo}U!p;l;MD2DHzpO*InjnLy<z56
zkR|NG^L|_G2&^)Cqt0#lPL)83XUl<SlUfV~FV@oMSONEr>KZJrT_Y&%dvoh6dwn`z
z;5aSz2e2;Y6Ym5U+(wJ$jzZTB_pmC5Cz5flu-CBG9KywrXgfqs7H{tnOOzJ<TafYi
z{gyVH8Dh!UC%!W`Z=z11q_Cvvc{)-{W!@I|i`#rw&+ljGIGqvr4_}VZUpKkD>vQx2
z)`-Mdk_2|f4unVKOqAbd)F!h=p)?~>rf#Z-N@S`CYeN1DlQ4EwNSCfnn~{ZRsPd*=
z0kYK~U!zxQx-q%bg*)URQ{SO?t>#^$RzM&7@KM9Wr~5v$38J8w07}mq3_aJ-T#*!}
zYT^LNDk)9BE*h(p$BvAX3`8_A9S9eO!H!ZDgMsXCvCxyXQXwoAA2y!kb;>Yf_k-|M
z2@qZ-jin?g%eQnzXg+!=&h<fYNYScCP)dWCSK{F0P`#3A(NZ_+FiQ2m3rAuySG!eH
zsJVkRg$ePZU9Fica|YG46Ogi5hlE7aATWdZMVg1=4ZuS)kv9-%$cbQhFFq?U&vegZ
zIsmmZNph(G*|X<CwxyedSKNfrD34S5ZL^t~@LoieCmG~<;Ce%=!kAFkP?4G<W9ViT
zr>r?a2Nh_ER1J}=a*&(6QFw+hu6S|@V6wSAt6jsJAOoQTHHD-zGeUl$-`1n$hikhl
z-)t=Zewz>GUqEvy3CW_g%nv_QO9}Vg0R+xNK73`=*6mJ#Fk9Rd5m@*WqU<~E0+!s(
z;`;Ocb+)9-0))xS_Fo53U_;?K$Dts)&>OCuoQ~dgW`$Ix@=`==<j$JhDHD8~Q#obw
zjf;Hqqrp!T8c2OE<KUR{#oVg4-!SLi_q=B9*2xr3gW$mpPJ@6Z!k@V7atM~0Pr&&I
zL5roZ!2@nAE=psU^dG=+AcaOQ8+`C?h88CIAwt0q_e10i%SC2-*F-=huksPTh$c;x
ztiywpWGgIDv?-esiP3qUs?UW+20tIPF+N8KH5k&Zsyblq?Z5wacB$t1=_!54&^S_Y
zCTa{+DDcwX{31#zYwqwB1Q*yP-LNeQTaL*ze)y`SJfu@IL>9^}s4CThRv&P$-bRD!
zLx%k8@{V(3;La`{qnr#5^jXwky&~hwFj<aMP}r`VN;Pro5?<;%3%AsHtD6|vUT07u
z)oo7kO@=C%Y|46vRq$9sH)?j^nsg3E^d3&tj-XGD&ITulQh9ee8Z4Zi9ktY!a$;j&
z5OIlpoEXz0IGrn=As7iRO4qPOgwvmMwv`Yb1FgEpVIsxLS!`W!2ifb;?UwRcH=D3u
z=uDQ<tWo{IL$!<(FAuEr9SUQ$ls{>!3_X3ayz}j}H2^<2d#uiv6Iz+@+D6a~42{u*
zq7z<ktUrFZ{QI@y>j~vZq{leF41#jQ{q^WK6Dmx2eZ?nx0#2zjyQG@J310o%=A$4D
zyATH;^~D!uKobxk5V&#>V9@#EiwxT07hk;h?*6h6UYQ1Cz50*fHS@U&Nazv;r2wN!
zjZA^v41{u<Rp-C?fXdix-FUW&U1u~89aw_U(8tAZ5yFL#k?F8A$te;?QcAihfKcI&
z8*G!_PpJNRL3@4<imv|(%W=dR9Us4&P{-xc2F7$;&!icY$0(m&s&Ifpr7st^Mk}H@
zCm=&X%V4XXnq3mnpdG)Vg0Ih~fELDkF@JnPW~tIatQxk2=G24p7h5|`N2M7Y{=j*w
zA+QgklOb_9MF(bJNH+q|#rG6YCJEN0_Y<0M_I&Y$brt1j8w6dpuzf1@xi4rPPImXC
zrWqBO>h85*h+rm0)NIkkMlsfJT95wAwB{UKup<e%qsP~0XxlX0<H3EmgR$LSnTH)G
z7<B2Z?I@NWm)hlqz6r-%ZN~)*lO><VZ_r98&+TxbNnnps!Hc4xKIkEQ@`|DwZNTC$
ze<`jgqNRr^n(-CnHy{bfm`@ta7X&4AhX;G7U9R6c+U%@QE`OtK<4xM0G4dDDN|hFq
zg|wPXkQwdbFM^xX0mvmqYv+G|KmWB3)6{Wdu2<ttjT|G)qCmwL=e>YHXc`(v2rmdZ
zE7Tv*{v6a`LXYArS8n%fphKZy3#Lx#x4Cz~V-}s+h61vJsLs9Zne#pm{lO;15u6tV
z-N{t77AtbE0U8|-a1To$2*N;a-J%QdZSfTYL%!tiS&wbGbx%2FBk*<;L@Es|qKP3!
zCxaJ3>|qbF&`H4UDNbJ__X1}k-G?zwNYJB<2Zcbnj@mUyCy4|+R4~|*$Unv+!(|35
z$d`b?*yTQt*1e*SWzKD6`sX?jNaGs6Mz*FB6(wV?xQ3=?IhgRbxB^n;O3Vmieg$F!
z#pFmyU($i~=~0&^!GsS-Tr?2mC#V<eqArBdJ6q+XI+TaeK0=QQC?h%)HWjC;#lUk?
zH2wI%y8$d+TN<9Q%|)$KAm$jGDJv;g*$MAMgW4859C-_d*8zevuf4dX)<0-GB~+QM
z>c|#U<2d4lLeh~&TDe#k6KRsrAo-d%Q%9V}ZeVhf#qA16j>tJ7{3pXRLAephPvXRb
zJbW_u9bi`+cbFbMHj$zarwmHDpp>H%p>|lvh|?IM7(6QCbW3ZDjZ!?=3+08csA!>z
z1Q87f=zMsoWOF3h`F6it8rj8q{G?(6rGrk!tu|wCRP<6<Mk{KT3d>{eBQS1JK;u8)
zqst#VUBXEHKb>PzGSIp+@1;w)sKU!$#<or2`?iIba{7Z)2pLn=!|$#r_&s`qV$WiE
z^h>9*#NC&M57X!8twqRVYrzy}E$-AnuQJN+u;XzfQRB%h8X-o@kVXNYGs#s@5)$Gx
zC(pfa<<WSJm11XS(}|Eh&~Ap^kW%T`OP0;%AU@zHxEljOLLZd&c^|ISbuLsTz@($-
zRMN#dR{jmT8<1r`oh7b(Rqg&Qu`=P8ZBS4Q+n^*WKRzt@-OilJ<cZT)vZ-YzBVV&?
zDj5*e!zZs^tYA9nz38;j-#c`=VcPvpGgv(8_2-H<+`|jEXzv8T^r`~#HSmysbla>f
zeT;0v>IG{<j2)P_eVDzhw{XCuP8~!$-n`k5ql2jN6NGkMO?_Vk4S($al#EOk6=5U}
zQ4Ghx+kn8aa0y6*;Fl>YG)MNwqu$#t=#G&dqr-3vGZgnCvRAoyK0LGa74faSTV!H1
zZYP_TV<CQ=n_8iwdY(L8`)2)zR8I*dv~)s?WZoduw0Zp=<;QGl7OUf%SIv1>f)CE6
zYj~{#<h?Q&7#n0u=^z7VOdVJ~+JO)kuJ#~%$wQRHgNqJBwiiT8cZbL7Lzb@<4ZcuQ
zK)(gfTj^|}l7{m0pvhFbGAx+v$M^x2^6m<sb3n;@SPyZ<9T};F0=1R!T=rzNQu8*<
zC2i3P7~7|nzFo5M7`AAIA`=dvuuPMQmmDc+I8DOZ`EKest1gxn!zVp^;v*dV6Ftq~
z1%C$hf?vbRu=g`SemY4vCuMIkAN1Ho<Wm)Q+3r=Bdk4z8O{5lHwl)4?CKp;(>>r?E
z39tzfF0#=XA#&O<fDSDz`P~C>Z8%i}lly6=mG&rA^iV$4er~8_YeyUV2ntNoM+esa
zGbg{s4rS1Q6A1+>CM+SMLHDfZ(;8+YtpYGjRe*?}KkBsSHzeYP(^vwPMcVVne-<;e
zeAFn9UJ*y<REkJSHiW38=kzQ}rRivGlY$B3R@$ko&Ppf8q|k?tT&X_&(2d1E$&rpQ
z)JKS1!^r=JC(Yq(R#{M4NtP$+3CJw2!lMt|84KTO583#3<xsPF3KJn&V@`w^6ji$#
zvtt;#4h!Kt>C@6l9eWkR88EVJ3QRPb1pd^mQYor_-l%?QIy2+AWbbV?YHuB<tVm7B
zTClW2P~FOIh*$yf(_R2p`03#)WR`|&WN#&Q!&j;j!YH{q#Nc3(F2H$<_=O&8XMt@c
zTa*@siv|)7S7v|*>yNSPml}So!4H)VYLqlcIW|S>18fqMf?BSFgr>6^XN&ze?)1o`
z^ymV*;6i7Zb`s%};*dLm=y8t5;qf)Ckk>_j1eP#%7FFMmuU^Az2j%EmR7G8UqS47q
z)JG?Znhp|C!im^@+Gr(m7;;wPuy-!-Vv6u1tm-YIbcIKzfjVJBplJ}pU(bBhrDlvk
zd6_VnW@e5Suun)O_Lv8ENr<CV?t`Urw7?`;9np77OW!l0%_fga{H3r*J4hOhj5uAj
z9*!1d98qO0j0PLX;L*R0$W4yIqXoH{1<Ob(&CF6qlvHYWOG1OG<~yF=P7LpICWIIY
zRg(rGn%-Is(|OtU*6ay*@wYO*1+!1*VI}z{&EkT>htJ|d!s%ymX)P~~^mIsqvn_$;
zeiW0(!Rfj~kfERb#+F_DwY&1|+RDSuZ{~_y_{WiN^44DM4K?tUi{`D-Z)AfFDRO_-
zh--REL*W$+3LJ=ETFOy~qX_nPX`S#vNQqaKO8g}<@GcZPo2#2kI6#V|PB@Z;t$L<4
zf|nK;A9M>5`4CeWj8wH062;!{b`N)1m_wOpnVVCO$H4)@4ZQ4`9+?9g-!88_T*85<
z0+(GdGDB#@2-nT+;)l6n@A%E$yP+HzJ013}4-rnli1oulrL|(dBuLTJnO7c*PRO)?
z`l*8rlK9NRvj$IDe9x8G#dshLJc5IZvCvA+vX_liY;v=GIoZudc~QBVzOB0eTXE@4
z*_NCL)G0#y1s|?0E$ez#*V2^ELs}MrYKir$&Uw$Gp>qkQtfGSnG0s!;Ei1vxD_)Th
zS@J?iF&<}TI<@uEb*<N_UD(poNibOD4Hq!a;nZYD*JBpFJE<FCQOlWkTraS!<76T0
zSrc?_m9upiea+qQdTp(w%U4GmGY}C>Xz;rNYey-Hh%FiA(Br|RnBTa18_%=%7SJri
z4xP5JWio|p-vl(-!YG;Kk>LRa)ZIIHNv~h(HbiyVR319IK`GU(oTcr!xJJL-#|sjL
zniX}1<z1>c;Qb70S~sO!CFZ8Y{&Xo*(B1tzi6N0CI0{yTlxlR~Wx0(?bx`x-G1Z^I
znTJk(DpwwoKGit#xY7}=hXclThZF?amYb!m-2FSvW(MK-I;+9c2T6LMiDS~j<Gg*s
zPcb&q8u?^T4FzEj8Es-eFa$L}a(k(5Ghl#~S_OptKKPuy6Z?0<W+=V_6GSpZUwe4l
zs9iO!5LGMT^Ao^~tK<8gT16fDp|M;w2YB%@2e{YdU(p_-yjQS;JUCfJ(u+<2hp-jz
zS!JV>wf*cpBu8(6Lbi<2%ORc*e(vE4C<#;ak%NQxJg2S`8iO0V3wmf>ZI6@?gw0Q8
zT<9bHKW+x_cjPDtmv3-aV)9ttIGC6xeCi+PZ`gT52jZ5Vm*QVcB&zO8ld?)>nEsdh
z@4}SETt>&om>UB0Yt-F%pso16UdE)HWsU)K`3G$Ed2Rj;y1Jz0YqtHo8dt5vG?Azb
zRWIj%LlYZumhgA!-!Uv?vB>Xa(~Pnk>y;%tv|O2pY^dW>HJo|9lgeEJydrw`PV_=~
zz_`d<OGZxm3>1TM(0$U#OfjcIjYv_MzN28d+h5UzO%;SGIQ|0=j8a%CDPcQT!pqtg
zQo}8j#Fj;94QaMYI>Sf3ohgW;`ii=L(&mkf$p)RWGvFx37#da*<tQo*1Vf0A7-gX(
zQ3UVG{iW_|2E}pekXRkVE|jnKGe{7s)WH=C4p3_BHlil+-wF7r=ShM9JRN%|4Q)VC
z$qQG6u|!1Yi1w|AOq)T|mUvR-hge(4TK6xOwQd*JyJ+URzw5D?0dy)JNu(C?x{1a!
z^ak_y&$_SAdkln46)&D2`XW7;3ME(}AnLLJ1~1`d0fcAnvOviOC^>!!go7E44TVbr
zChLpK0tV~vL(zi#{fc$(F5pVlfBHX2kGL{8eRtM-@p4pjR%Q#tao?TCfB#+-e}J8W
zgu)N^kYyQHj#_eUZmUabA7sQYhJ&Ng8>Fhfhh($IJzRza`8?%q97En}#9}Xy-KI~E
z%mJFAb7XOF)`HB!MTL_UfP}<flBy3bCjO-l2jio6gv*?m(ijsq62eJTI{qRxg^ai!
zoIAZ?3vm;2wGxtTBUK}v85*{-BFAa(?tYu5h2!BHK0+}ID`1#CmTC7}mXB=(bb(KV
zm#77Y0&_0C55E{OWUhv_x40ZC{Cc$aHhhN_Qou#am;gd#n#jdP{@Om@*Ihw-EM)Oy
z;2im6Ow3QNYGNTl4xlhYq)P!p(vVrzV=`&Nnp0hoK65>hJ{z7NFt-YDrOq&{!oosJ
z{;YSN75~#;V`NEjbV%4D`zV@notccd;$U*1H!t@jA^Luo*+gV&=^idZIABekbPpYb
zZL2O7?T4#tJWKH9!k2os!5jAJJzL61CM1U;>lSI)pG2sy5MU!u%iyYuogAj7>V)8e
zaHq$6?}|fQ#^^oqb}TLw*sn056W^nI#gD}Grve%2>)RG;<X+lHR1OWmNm|~+%?xKs
z!fM0sy2Cd2vfBLtW?5dngpBBYhyXpoWJD5aTc$zX@+~4FgAL<N)7xVmp(qFuI4oWa
zB)>dD@=QdMl^kX%q^e3rfenFmo@vIw(J?PA=#Y@J(C-H4XD)^$fJqBnue@&$+JK`7
zdn}s3Uwy482AzSl^`+4h?jl6`>p1F4!$*fpp&Nm58<eBL#V+1OtK%Vi&MRm0$9`3-
zk<m*N;ws|W9<Oa@<z;1*9CNI`#40qeLQr5T<|c20K)$l!S=_iU1qvK47}_D1tw(#O
zUl}IBq`hBYZ!{hH+-zc18R)X}#9wI#@Y5WZ2f0^EcUfzSzs4I*RjCWiLljGp^>8UJ
zYLbx1N*!`H^hbvd+v7)%lWmdm-_<pjR_$S$VwO;Ykeo!TwzznMfq9T41TSEv%}nha
z+#(Q~2^EtL5qK~E^P3rcC5-Z}A=E|*orm0OokKHHhrWB0350c(mUU7<T2IEFiN()@
z-k}P19S5XRAj8{J%*>(b5-BiU8pe5f!J<_5xVP`~1A}AbJk<$cS5SZ)K6p3kE}xx2
zwcg;Y4~=2XjI9Ze2hPrB&B`FUhCNCc3-wSViNK`FA+HQrag7!ZZ{w_O1;jurr5fn<
zu>OoDg+e~18h&t$&frmT19HQC>4XNZnPjT4g=rZEB(j3aOQWIJPu%{c>gBphMJSe_
zB8nT4^$t()0q13nSc1qQQbCAQVGT|VAXqwSU&V<8bkP$B5JUjETFWv;$w*sb(QRB(
zbL=;%mMfrl&`%YN(P-UclveCYy+(0)9+ZGGJp13VCqb1;;R&j{Mid$o>u&})hbUp|
zrM60SgKNv62@BZ<2ZE`%8*Cu?DdFsLiBy?ZF<8FTs&?D#-ba*En5JM;sTizIzpyH4
z&v9%b&xfKe@I=Sq2*|1&ODXdgmX!6;%Wc5FP{O)eXg!HxoLE?WUbV%rJn8+6Xb)Z?
zWS)J=bgW10O-mo0^{~NKL<<ErzUq9(8K-SlbQu9XiT=>2vJD(8=42b_uDTIUpZy10
z&e=LmB5tr?ZKrEDS#Ay&UfxgEbHmYLZ%}!J0ie%xb;x`kNO}7Mmy599!ybQFD|&(A
z&Tnryr9J#j`SfUTu!FP7U=^=03R^i__TarPkZ?xo!5`LEcCrOqRuz*x?gb!2eY7G5
zsoBJ`ls&xr3#T+OSu8DCVd$$Qgh=j)mq;QCo@_jv#-k%<qgab>^_8BUQqTfgqE~<#
z)z2}^O58D^HcvWu`69Pg*gC5K)7Y;z$?L9Q#SKNGJCZ)oGG_>gA2tDCgt>r48L|jp
zzjr<8nx&=fSG`k7fcFG9GE%GN$N6fiFHNW}@d0c)hLtg6vY&||M1(%d<vN}A0=s3B
z!a7D%B}}9yi9s#T`KoCe%jrvCT;*is-5@cnOBrvp6iwCgu7#kR9Z*VaSBX(u=RH$L
zJ!~@%M>x^K<b#XX@qaS65*PCAsJCF*e`e`N$Isqy4Hr<Hj~Fxr@k?ME{@@*o(Y|^D
z7P{#1B|rOcg&>8V{vgF0<$$ZeK9-OYaf3xK98rw_!BX&eFnA?aI&h2UIEgNMupoY}
z&fQrKmcbibbTP{_`E3?P<njB^HgP!W0o_29T8i*Ex7Lklv+9SChxOD99z!A)Dv^ng
z(oLI0{`9d)p@>ga2#4L{N>(vg(mx{*tbQD_Z&CoKr7V5j_2<v8Bcw47wz@KlS|ki8
z;%%r2IHh2A{MKHVhKph+>WQ{9-Xf}!k)0e&ySRXo*Rt0vIas1(v&ay#g+plyHy}_h
z`7&jKnXeo8@GZUB6sLqMN>T(Ih*}sw=I<XMI2<x)roh${OLYuP)h$OF*$;-GK1FJ&
zm6u3D-aYPkVJJOZeaQ>|tU&|D2CuNoiDnJr9boe2S{WJevSRrJOxUD^HVXiw!ekg$
zFaZ!6GcL~GE@8$lF1*?6jlLP2p$}*99e3t$Lym|7Kjn%EC-%?jsAZuyFX@kFA5wUv
z)I0ts5R-w8ikv{KG!)L^^6_y_!Bj0(*v2M>bru)}c-CjWVeypreC8j!(-hIZhX8<0
zwW~w=>&}njY#n+&7E4LKUq*6@R&ir}ZL35OdVznYZ?~zZNiUn)la`>td95jZi6#Pp
zWzg%#$9RhkXUPO$%%XPhVlQEIu8Ch%y8}*vls9Lu;Pu4*0H)R6@MZUK4m%UY8%zt>
zPr$vA+@oWRCt-LjJ>s&7fnx(nQc?WIKrAqn6b*uC03<ja4zOK;J&bpV>C`*`fXB&a
z@2JZg2PI(u0HOGxe;p1<N%Bv}sfjYK#Xd)IEYRRm;*CgHLJ>dgv!Kf--MxN<V!nCI
z;YS%6UgCz(y<<u)vfp&Ew^HrBTwWM8N2y~R63I~XvA|0iFc5HytWJti!913<Z)<qp
zJT|R^DX<l+5h<pSt*ECPbaSJ&ZPKUKUbFHK=4~(!sqC4vC$uHQFc~-{RMD3v^K8sC
zk|-&9wJ^e&jwWfvEW3#vVDqY#Ll203Ez;5kY0*7Fa5i?e%Zpq*qQ&L2(bg(5KC+lU
zSG~_ceFcw#U030E5?xR>{h?N+Y9DzXl++3ob|?cO3qRvmz!^d7GBvkEo5<BR3vGs4
zBY=}u8SH5p4;)$i(BSCxdB2$chF6HEGTdfm^TD<ZURD+*e6deg(dUX`D&5Ygmsw!R
zjO5K4^Ac+CO>G2JpsDf(k+gZASg`?|^fGr6ql=HZzoxXdUp^OvrVb9DouZq8N>%uw
z=-CN?Pz(rmY!w5dL0=ft(7Z!&uK9ohSK(QQ8FAh{=_Bd9EYP@d#pM7sFQU(oc!AbR
z@%kJ&yr9Qmb1V=Nbz~^7l)|NZEaX?2s(Tzz-<|9aj`0-xQeEEGoXR1XC{V<`RUQNC
z^U4=iVgRCNDpBs^Bu_NTPV5p;JBGTYWqSQBMG@t*=!>+F`Sl4iFSG?y?o1vdIS=7*
z_wL};5El+|#k{2lf>@{{2Daj8-IaQnuCd-!FNQlUgz2;@Y-_yZFQAE&r9oI7a*>1d
z6+NV{5CSb6cl$47ZC3Pd-mDB#*sBLGl`35G@h<uwdq2TG+&<kqs9E$?hiqJ{PzVz;
zr){x&$*Y`jMl-RUf(7jlbMQv|GHBX4I85s3M}0yl&ajN54t`vJAjge>*;f~rGB$iC
z0zj>ov;8_2O^NmDSg?j8&q`9et{^LTv-L!DkkyX)n@CYUaV5tiI52d$IffV!n6w<^
zzymwAymUPOl<|#n4k4<FUNK+XuD~Efl=gmO>3#dB3c=dfCD)$OCX@;7)l!p?(HkJy
z$L@z|7{;#HHAm<lHv#)lQn*pQzy(-QwX&{%qTobz;qUzK)MO6*cY=op1eFrBdGN6$
zl$#&ofN&;j6~5#rA7=HKQ=e2unpRI|<q&^kF0ukUsL@Z8XgAPS(rE3ed(cdBIIL_#
z)j?a|)83Nhk)1VTV-gnv2gq~9;t(r@$oW)FPC%qGSZTbZ12ZcC;j9~@$@r|NzUl^`
z(xkD7W$0EWCvoh?Z?!r~Uz5<}^$^?ext&xiMq0@X1DQo(7s$4SPs9g8jPgvZPlH)2
zlW@LkrH_)WDx0>swUxL{*zs5>c_BndEdy;*z=|_EH4_9!8yR6<Owu~Vx{V2fd{)M0
z61WsAWJ!TYT@+Y=2?X!-_Xu`FQj2v)*1pe}rkeH59-LcTf4<ZEm~dBI_f&J^!E1EL
zl{0H+HI+PmW(!T3(TRhdcRcEVG^^DqNwbXIV$)QD$K9h*)<{b5*i@ofR4lNs5%v%0
zq|<S^jLU{0s#!b;cIk4fEV{bu*g>cEEa@066{gxsh-ieS{~Frj`uz1=Ut<Zy+5h@3
zF4ZA5_{sc^d|-vpPT*lC?s%W>kg$h{+dA3h=1irBVZA6O-?f9V5ED#Ofxs)ya>E5|
z3aW_UN!m9XZNr6=-eKo9{2Vq|F=yT}9%OhT!bgpDx2oYOKjR5b3Xo_PtjGKvVv2g=
zlMy4di#OmE<N($@?DswbG7;bxw6&V<dk7)q9aHCh*SyS_eL6q{sF?&36pGcSo9d)h
z2#JwBr3%5SB4PVT<U8q%2tr@>$Q!bZ9~s<{5qt+dlbX`h!pipxR(wul%p4~eE9)bi
z=G}ZK3mZ6cm;?iUoOj1vZkP}>?FZkZ;63AT+~VXfD9IRB4|RnziQY(1>ICFu4*>cZ
zJVY=2K=Hf)#T`)3uft*0$9UX3#4-r1>c61>i0O(YQnrA@4O6HD(>~h%<2GHRSa-vX
zrUn@RM<lhagfPb4?e1v@9Y8<p_Tbnp=#<lA+WJXlU7(Z*O^1KB<^TfZ4F1cdOuFrU
zT(;l?n<Ifu{wVE+r?3uXV5>X=<8*u&iZX*$su|<60m4E)MpS~~MFgMT4M*J*wNKQ`
zhcE;6AZh>@xVDH5ekmMQp;6K8f<xfqE_P-wB;8Rory%sUv;l(@AIu~5H6ZYTGf9Ou
zDrjR=LP9F+r*+?M;+FSxycD!rut^55Ap)Vn!<Sfk54qZlcD^a4tR78q>>Gl*_)~tP
z4Nu_1un@<QfPf9o$xTkz^J+APO~IE73S-%!q{bd#Ph1V0G?I`?#yO^{$71?;{)5To
z2tMbKSP9qIoX<<75PvUp?RK?fvhltfX)_T^EfBGfIKY9PI>buzAQ6dYgISUvRCD`1
zOroi5v6eG3qbDoMC2~f4XMG`j*EvDuy+mim3kjV;V7aRhKJS#Y3`iB4LKfgyM=1VW
zfyEKxSfKHa;00oJEDObUaTdYTBipi=U0!w1vhm{lV8uE{@OjDz{!TWere;NV<T0@K
zMJ%`7?UQmz0~Ro8lJ@zF!5Q3F-9vrV#6<K{Gn1w|iQ<D7={#Rz3e%ot(|pprjv<-Y
zlwT?P36_>XX5O(f+q^>IKsVz~tx8KmG8W~>OX4;%O!uM=Op^7z{?Ae&CxF0GYIqqH
zK>kWrZWDTbT+?$SwF^EVB*@enucaEbLxo^cIKpE^+3oi*NL?qod6lvgg=jyznhXQW
za@Q%5YKNY%xvUPUU~BZDw1U8X5xPku`Ld6{uV}y-T(g%7*}yI>*_UwC#O!})L~hSo
zNIiee-<N5(L!-&4<cC|h9OfRH($0^!<WGGQEk1?f3s}S>Eeyj7b3}Mwb4(*1Za0xZ
zez5f92Xaa9)Q28PWZWc{(f7E$>Jk=!*PXraRW8P^VIEg5kcacLe$nQ65AAZcX7SfJ
z1!C6BrE(6s9%BlVuHHy@`sxL_(|d8*5~A^SwN1r1JEI}gSb7x7DNOYP{4{74w}+TC
zeP>CZJ$zMZm{zj*RWtExad3eR3pySA#kE~+4n#?pwutl`BHu^a^sa=?is~Vv)lV6O
zVTFYKp_28#b1)mDQLM)uK?DXLTkc5v_`x<i(lUM+zz%i`C0<uW?7eA2`Qubk0p=nQ
zy$Wd^gr*jA<R!7ec{ZvqZkWj^V0UG6Bsr9%E%S{56Z?zima-^$!><i#jpP;nlX(va
zLvt|3?ny`h9z;T8m#y;`%nx9r%=AuRNS&KP?8PkBE)*xOiXxQTdJ=8SI&e26lazF)
zWbxF)*{B}-$Dm~v0dd$Q7E`FdxG2%XqGL6V**MVgT!G;p<0Pe`fa8=E;0Tf+sGLuZ
z8Y}CjMQFFbUH)!u_sPTG@3t`yhG}{kZXsh3WAmON>kv0;lQxX<(L<_nvzI(Ufnpq7
zm#x(ZQzyL;Ig6HdBzIXKRyI}yavJM*LQ=fKk_9%d+G55Fz4mVRhugOiHpIiC&MQ3O
zop^3U)Ypd5j@+6Jwe{sh0NYl*s5B1%<7=<10O^$#XQ(E>tX!*1fk`6d@ymB!ZPs2|
zvcqXmMz2?qS``O~j*lfYQ)gLmJ}b4=Zs2#GnnmP1>Kr5Pz>P|T(wFDu5KeuNt8s9H
zwM_&ev@z<s(yVkXU&b)Iax$}Lolosb4x^;|`9Si-19{?yq<A!ONJf6VN^zsO%KIpB
z-NqC6Bs4rX#7BsqR&=t`%`~%W<vPVCM9dUhvYv?a20kn)-qWBdAe`u>dcfdD*yG_^
zNijIT|8Cw6)AIgv9QDK$E8$Zpj|J!(ls0(@z(}to0YXYjcHgI_pMi;w72H(2Yw3m&
z?^{wpfR#*Ri4rC>Hs);Cpy5B3qElE3f>Vl6iAy5%ouLm5br_t&KZ?WhI^J1PLN4P>
z$VW~1udZ(|KiF8?{iqJWFW#QE1A*Wk)&So(&)fRoB(nTC!pb+i20=3uI?m^$ro5_~
zmIx~}QJ!jr=^9#_h#jlAxJz860*_f$V~{0_`se8A_<Z=%LNXJEL*0ZTNYgaZ6FZd-
z3q25T&X4p~$4=}fB}$LjO99>w?{J&@;bgQE+yXdXEW`!~jgYP+iXhh;Ea8+X=I^^E
zP=JkRMp%oVY>A<d5^$zfrht_YRL}*{;M)axg4NK#%;$XxcU{7i1Ly12A(N~i2yXtq
z+L{wPkQ;2?109t5e`Z*e7HUgN^#_>aWFQl@gmp4UVs%0Z`y5Z;I;l<zWz!mSOQ@kc
zBehV~4>ak-bHp;(S*h!23}iP-!y)4glsoKTtp*2b;%}`ZgCd-rTdoC3OSeM@V=a)0
zr<5bivVRTRtWfvBxQ0hvfeZV&<bIS)Vadc_h6$e?U;<@<iHTKg$EBqU9C~)UK&^%_
zOZ|BD_D|+R2=g@Ib8{KIWEN>V<A5zXs7kv_*b^9-CMy9|LGK<eAwRkSKXa?i1_83_
zVFXOk6Aezy%p_U0)gQw4Ub<#GLSnXq6J|0Z9Mxw24o<ouHqr5p-^Td8IF?11XpOpw
z#M^<hE|9hmrfD5*xkRRf_Ez7ClyiWn^YoUIf&f1OD-yfxZ*gipV{mZ|T}7D884kvi
z6n<!(+^yRzlpy2L$tkbif)$S4v{OAF$NawJUMzt8<ynbvNXXbGvK17gs1fB|lN%m+
z|1eIHAP*{*%)y>R^F={b{~kN{Z3+{SL$4N2UNLgEjX;Uv2rleo{wfL7dEWzI53uor
zlt)s9!P3b{B*eY_;oulKkr>k~(?tNDm?qT;%{<tv7Sc^fAqqM`P;v?KXgCIVSJ2iP
z#127y*wNw92|4EHM>fg1IwX{(<_|mK^o%jgwo1tGsItTIK@SxMs4z*Dnx+v*2RuIN
z2sERCbm0Pt_NyI?{9v|z<pz<G{V8VT$EKnq*wk4*Cnlc4pM7M?h{PV5W$cM;ng*Ls
z1*2{I^x6{R2c*|2UB)%bNW8&NPF4uulC*t)hDhQFap`$KXnRMJ5}k1i;~K;dDpGH$
zFSy4+1u!`7!srT}Aa41`bC&bY>(@9RgDXKa@#BPQt83dka7vKzUwrZ8`_&1>w>O_X
zU0K^ET7h7wVshc4gee~IFplf26#CavIl}L{d4u#oEA7Onk>6@T;Q#B-`xZOo&6<J3
zjEKxWowUy<om|_bD5Mp~;X<Rxkx1)g*cjrjr;W|y1|y0(1rhd_+;Z_(7<0sy4u%gL
zbEy6?!!7AK#ko$U@%aUY8z82`4L>U*ZE$?Z?Lm$<=<B7W0|aAX?_9LK3$nZbD^~O!
z4`(c}QuK%Vx-;7V<CF{o5ul^}DUm9&j>v*7alq@VuT0tE^m>p0YBZRbOvIC@O&XmM
zr02IP0W{=Ev3e+cgH>PIXAmlA0-Us6zT(G+7_45MIk6&U@Lg(i;FhBwDjLcwBnR{t
zDeTEH2yH?CcY7x5uES{VE-ObTPy99&*@O@9fsGhl9dsE%Diy02#%FVgrKD4`RKS?U
zqLP*flnEgyAtZxeN?JcZ^`DeDiyYM%ITaEVuf9*_biAhtq6drI{)kN}T*RhfS`jNl
zPeTUe#p>YUNxM1Y&EV{n;02Ycb<ujK$;gqCB;A$4tLO)*j%|CQy9uCEVrPrz=t2pX
zl2zv_aN}5=bqnjIE@Tt<+?A>aU(TJRD=JvrLHINwQ{qcbk!|xn*5p!Agasv|nDNz+
z>~>p?D~eb~1U@iJQf)YC9kjMxIDV7)M_Q4aT|-+6(n|p0ihaS0Wzjl#Xg<_-e#@({
z3^O*0C6i!+zP?ig&=a{gHTJ~bN&{i4RsV^;Dyb(Pa^y|DmcPKtM1dhOq&rZP`cm7n
z5hY%6Q%fY1Z0!t3>r8Dp!h{BYwV1xch5hb}ULS#~e1x$q&GJ4CJh^!j=V_B3k_0I`
zZ!j}z&O@SQe8k(>eLk-+lMj`l`hPwMYGi)nqDj3>4qZQU+5WW*KsLR&*p7KtJugpc
z;k7woo$Qf3+2i-=FF+wMb6`Gi!<dr0A%swfPltN$!(3<lV;>Qa_tLsj(|Ua?fAb5<
zm1LA=no?9{5ra69#Lz7kqZC@F!-bVHtHUrX%r2~!L!1+AHLi=2W@KJP0B?7h>9YH;
zcs?MEc8V5{{1R4p2rD4UY0gtpDied8$y7WW^*kn4p@o7O!`x*Pq|$4)x%-IXxpF~`
z>6A+qUZPI`WgPTU$teF>r%44Hr!JYPdbkArLo{RKDe!4@kBF{QQ!Cd{l)WGyK-E+M
z@i9M@9`m7(b`jQGG(Zq1#)|AkOKe2*0e2`SZv#4;g<&QJcUSG4_6aiWg;B@eRX$vs
zj(i}BueKz{m?t<abHNT<u}%+^vO9{|f<J{Wkk+}FGm$|-ZUmQ)ABehW2uPK8sZz%{
z2AInDVaqHl#$E8@R=V%|I9G=}m=hAu17z_W=|rBlq1LiZUT-UV7(B{sm7iQx^qET&
ze*p@pVA`<~eJOoRj2de*P~Ei{uNY3II|2ORU1kyvUTo6T<7C2TOBd^6h4mPSAI^Fo
z>)<`${MC5xZG9Z?0c9HAdmpV)L{<G&xb1zsAh+{Q<-Rby+m+>|3n(vPX|M!Xu+A8O
zg;2B$n<EThUQUexyrMXms-a~kW(00I#y*vdeo5X*Oc+d&AeQO>>NNjX${(5=fU;oV
zK8T{8Btp^kx)7933j3fB)^k=8(|&#)hs}6%fYA;`(DUegP<5_*E!RMN<2zLli{`6k
zqfr__;M(0<5&i{RZfS`*$o1%p<myT_y>NpK!~1GEyV#8cbMVIlb3YZ@Y~oUJ)`O~_
znAq9~_-NFhOlK=70)?R<ea7Y*B4^IztZp2jFivEXN89M=A84OgORsqf)gUoCuuKHV
z#IHT1G{WUr9P%ALG8_em(wLNY&J%kVkwm@tgODfeWtzCwxg^9`3xTX9yGM<lG{pE4
zlk*0HNO&Ps2@|{6r*UC|5WB!2Up=IZ<WTuw&7f+M+(<^8W}j@3-ZsKX=RqpOsKX{=
zEr`Vjs0`{B5|qlth>ZI^QcH%gbFGl#88PS601Zx7XIZZw7j$V&BOaER^LryGo#Du}
z<JVzJ$D)|2GLtz_g30Qd+Iu^(sgu387ilK5QJpsl=D3LCU~0U}dUFB~ouI6itA4(*
z@su19u~lJ}UygU=l|KRP!F<ydpIFk2YN;~1h|;`Zx5i9Y6Ucty+16F$C+yAGiR`lb
z^ZzHb7cw1Qa6-#tvzs%vC+=;#F{RG@wpWlTxXg53$$}OAed?<##03}1mv+vR8bQCJ
zEcfuBIdbeb>hs9g7{nBQAnAsR=0hP^#knznrMF*yjui0HbELT0I1fId>f>IqN3@`P
zGBZ?G@8#mav*g4g062WGt%Gz=hnm-t$9r)PJXSyR8|I&~td>?8uGtVhG8&vC4MA_D
zDF@h~JF57-#01~wp2&f9-2`~TjnR@tMCuwRk{x^}NVSK?<Qi;}>Rg{pL`o0QG@~QY
zQ-p*jvyJ-_6+*e17BBzA3!U(nec~nf{w;U^$>2b;_e;ioIRo@)bM@KA+BUXvm6Jsq
zGwnGNFGwJaZ_>8HE&;z_j)Sv~DOQRbH}K<U=kpftaa%q`N_f3BjzK6qa*fhbOb6Qv
z%t0K6h#%UA7@Ry!!*{Wi92xO)1AdYFtoUVX_u1oT+iR;G-o;>h(BnJg_dK>krwE5_
z<Mzhx{`m{{_@R*w#M52WIIHm8+S3P{+iTEU7O-FZPI3|AEM#KXa7L~H7i~Rv95MiW
z@CrUNQwf>I^g>=hOglG92!2IlPF0&FNUm%?dbIp_)q#2yc#I#zyTQIzsyunR`OW$U
z`lTdS<YTl#U6rjz%Ma@+@CvTlHl)J#leLw+6%SyLIu*p&$j;{G2I~j`rlu|X0H#Xn
z@ulL&tHYnlzR84!mB0|bqb^f~xZv}|>`rzgmE*(0$-G#+50<#|(E{g@Ge$hc09l;8
zBh-7ajj?g2nPQMp#^Vkp2|yGM63C2br0(V~GoYQp!!ur>isx9`GggmzSVazr8%{u5
zIHRa&!``dPousUcs;fyLOlN#Gh?Ee?s&y2D*%)GIGB=5NHPjOJodWSC_Oyw8(lhG|
z%Q>wT5vkfx+fc2k>$K3?buD`dN)21($6H2^8P{h`*VQ(n)m64kHrDI9$|TGD{Wvlk
zp>P<EC7nTGxjG<{X=H?4$rFJ1@U4RpW!EHC!Y=#-P97~4RHmNUNf-1Y%m_P`sSBYm
zJy#&4JICLZ4~sud*(QV2Bj5Z`PI5f&NMxG&lN-K~?SzpJN<Ojf@~e+9SQxREm>UTG
z_#Ad97>d1e_pq{xzkMO$$!9xARMpwq!4)}w*nG+vXnTG0@mz6tcF6)mVZR*Qym|Y!
z00{!=4P&DuHjE#t(Mm>TGRt`&NYY86F{&o|Ei{uLY%O*ymIMtYr<A#0b0It)tUpFD
zDvaq^>!Nrlh>yerHs{CUp&&jI4_M+Ki-&^vNIX`Tca}dE5rZ)f6B`5?*&C#d5|GF$
zEVAvL<(+ky6mF1(qKRO7K(rY8$jx?uHB>%Wu$t1--@2gEy9touBpwJw2_Kgji;~3o
z$;PwauRq>KFL-v|rT_Ihw!v|c0jH)X$LEMQ!l^BWn$&dVimLN5%j&cj$%2>-W_1I6
zR^Ug*iWW&$O%q0NU4%8rjfe*(+%0G5!bFsSj$Kp)G8AM5jO&OjT~{rWe5q-P2)t47
zO3s0yHI^9LjI7fp^igRdC8K7km$slS6XSaAhn=U(RJ@f*XtIJtVz~b2#Tt+72=@xP
zWY=s|Y$*1*eGX2tUF=xm2b5o+RkDGHy%1TmCh^v>FMb9hgw~TENAQT-DFtUwoQKmS
z4t(oVM>I3goYE~m(gw4lYWinI`AAD1N_qeRlbG^Xn)2%S?KBv7w2jp=LIOt~*M<cp
z7roKY67m=pr5#Th0#cD!Bw~@6n^=w7Rwv7tN0~J67oooPLR}^P(o8vh#RV~4-{M>X
z&Uh&iI+0|)?}7BMB)QFOM3eP$mw7ZQq=)vCcR07=ErVzRKmKp^fJn<9;Rr}P|Iymo
zVb=;C40&<hYwavQ{rwsrDa%^r10b!|w`<F*FgWNUA^&mbUn@EGp^p%2+-jk&T&B#D
z+3LG>Q7eYs`%mj<y&?YoLl1u$?EKkhfA_y1Ah95C6~m>}$a#pwr^r@)#>=Of%=7NT
zt((a9-oxcB-9GNW9`sKT$B*2oqvHH@p(u8k<dYY=NSsbf@=R~>HW2vCkhBVCeu|Zw
z)TvD0$vbBDG}j(2VEn*ZjhR7ZM-9uegI9YmkZ!Tx<sC<RXYb_Lgw{p$qd+q5BZ+8h
z{YY@8lkNb?+~D0w^9TbkOc9(hcufw(yU*ZMy@v*O*^GE?J36QVMlHR){j7U1c+p2v
zXk0CRrbU>#;phkvIOw(Qk1+e6*3?>hYd7lbziXW!mJ#<e<HQsI*zN3W9nEOdFCjKW
z<*2y2#Zy67iNPr{J@Pn~9FijJFX0ao+$H1bEC{`fJMg$S=E>SQUXKRH#{=9Bhim5t
zI7-ND5@5zT3dv<Xqu%hShjXw{b;xNsKmQuHMoOw<au3I`2!a95tfzfyA-8Ud*O-D|
z&YJEJIt#3;oV~BMS|St1CoH~k<Bwl)B&YYK2VjLP{)q><fnjTjFhEBzlDNV1`g6A>
Jnc=|g{|DLWcZL7}

diff --git a/iris.pri b/iris.pri
deleted file mode 100644
index eaf40ccc..00000000
--- a/iris.pri
+++ /dev/null
@@ -1,43 +0,0 @@
-IRIS_BASE = $$PWD
-include(common.pri)
-
-CONFIG *= link_prl # doesn't seems to work but at least it's documented unlike dependp_prl
-unix {  # most of devs are on Linux anyway
-    PRE_TARGETDEPS += $$top_iris_builddir/lib/libiris.a
-    PRE_TARGETDEPS += $$top_iris_builddir/lib/libirisnet.a
-}
-
-INCLUDEPATH += $$IRIS_BASE/include $$IRIS_BASE/include/iris $$IRIS_BASE/src
-
-iris_bundle:{
-    include(src/xmpp/xmpp.pri)
-}
-else {
-    isEmpty(top_iris_builddir):top_iris_builddir = $$PWD
-    LIBS += -L$$top_iris_builddir/lib -liris
-}
-
-# force on all windows, plus qca ordering workaround
-windows {
-    DEFINES += IRISNET_STATIC             # from irisnet
-    LIBS += -L$$top_iris_builddir/lib -lirisnet   # from iris
-    LIBS += -lWs2_32 -lAdvapi32   # from jdns
-    contains(LIBS, -lqca) {
-        LIBS -= -lqca
-        LIBS += -lqca
-    }
-    contains(LIBS, -lqcad) {
-        LIBS -= -lqcad
-        LIBS += -lqcad
-    }
-
-    contains(LIBS, -lz) {
-        LIBS -= -lz
-        LIBS += -lz
-    }
-
-    contains(LIBS, -lzlib) {
-        LIBS -= -lzlib
-        LIBS += -lzlib
-    }
-}
diff --git a/iris.pro b/iris.pro
deleted file mode 100644
index 4612f91f..00000000
--- a/iris.pro
+++ /dev/null
@@ -1,22 +0,0 @@
-TEMPLATE = subdirs
-
-IRIS_BASE = $$PWD
-isEmpty(top_iris_builddir):top_iris_builddir = .
-include($$top_iris_builddir/conf.pri)
-
-include(common.pri)
-
-# do we have a reason to enter the src dir?
-appledns:!appledns_bundle:CONFIG *= build_src
-!irisnetcore_bundle:CONFIG *= build_src
-!iris_bundle:CONFIG *= build_src
-
-sub_src.subdir = src
-sub_tools.subdir = tools
-sub_tools.depends = sub_src
-
-build_src:SUBDIRS += sub_src
-
-iris_tests:SUBDIRS += sub_tools
-
-OTHER_FILES += README.md CMakeLists.txt
diff --git a/iris.qc b/iris.qc
deleted file mode 100644
index 8ac35ae3..00000000
--- a/iris.qc
+++ /dev/null
@@ -1,31 +0,0 @@
-<qconf>
- <name>Iris</name>
- <profile>iris.pro</profile>
- <noprefix/>
- <lib/>
- <moddir>qcm</moddir>
- <dep type='qt42'>
-  <required/>
- </dep>
- <dep type='buildmode'>
-  <required/>
- </dep>
- <dep type='universal'>
-  <required/>
- </dep>
- <dep type='qca'>
-  <required/>
- </dep>
- <dep type='zlib'>
-  <required/>
- </dep>
- <dep type='extra'>
-  <required/>
- </dep>
- <dep type='qjdns'>
-  <required/>
- </dep>
- <dep type='b2'>
-  <required/>
- </dep>
-</qconf>
diff --git a/qcm/README b/qcm/README
deleted file mode 100644
index 4ca5ce2a..00000000
--- a/qcm/README
+++ /dev/null
@@ -1,5 +0,0 @@
-qt42, buildmode, and universal modules are all copied from qca.
-do not modify them here.
-
-the qca module is copied from qca, but modified here.  we should consider
-pushing the changes back.
diff --git a/qcm/b2.qcm b/qcm/b2.qcm
deleted file mode 100644
index fd50d855..00000000
--- a/qcm/b2.qcm
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
------BEGIN QCMOD-----
-name: libb2
-arg: with-b2-inc=[path],Path to libb2 include files
-arg: with-b2-lib=[path],Path to libb2 library or framework files
------END QCMOD-----
-*/
-
-//----------------------------------------------------------------------------
-// qc_b2
-//----------------------------------------------------------------------------
-class qc_b2 : public ConfObj {
-    bool use_system = false;
-
-public:
-    qc_b2(Conf *c) : ConfObj(c) { }
-    QString name() const { return "LibB2"; }
-    QString shortname() const { return "libb2"; }
-    QString resultString() const { return use_system ? "system" : "bundled"; }
-    bool    exec()
-    {
-        QString b2_incdir, b2_libdir;
-        b2_incdir = conf->getenv("QC_WITH_B2_INC");
-        b2_libdir = conf->getenv("QC_WITH_B2_LIB");
-
-        if (b2_incdir.isEmpty() && b2_libdir.isEmpty()) {
-            if (!checkCustomDirs(b2_incdir, b2_libdir)) {
-                printf("b2 search paths provided but library is not found there. use bundled");
-                return true;
-            }
-            use_system = true;
-        } else {
-            QStringList incs;
-            QString     version, libs, other;
-            if (conf->findPkgConfig("libb2", VersionAny, QString::null, &version, &incs, &libs, &other)) {
-                for (int n = 0; n < incs.count(); ++n)
-                    conf->addIncludePath(incs[n]);
-                if (!libs.isEmpty())
-                    conf->addLib(libs);
-                use_system = true;
-            }
-        }
-
-        if (use_system) {
-            conf->addExtra("CONFIG += bundled_blake2");
-        }
-
-        return true;
-    }
-
-    bool checkCustomDirs(QString &b2_incdir, QString &b2_libdir)
-    {
-        if ((b2_incdir.isEmpty() && !conf->findHeader("blake2.h", QStringList(), &b2_incdir))
-            || (!b2_incdir.isEmpty() && !conf->checkHeader(b2_incdir, "blake2.h"))) {
-            printf("Headers not found!\n");
-            return false;
-        }
-
-        if ((!b2_libdir.isEmpty() && conf->checkLibrary(b2_libdir, "b2"))
-            || (b2_libdir.isEmpty() && conf->findLibrary("b2", &b2_libdir))) {
-            conf->addLib(b2_libdir.isEmpty() ? "-lb2" : QString("-L%1 -lb2").arg(b2_libdir));
-            conf->addIncludePath(b2_incdir);
-            return true;
-        }
-
-        printf("Libraries not found!\n");
-        return false;
-    }
-};
diff --git a/qcm/buildmode.qcm b/qcm/buildmode.qcm
deleted file mode 100644
index 2f4836fd..00000000
--- a/qcm/buildmode.qcm
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
------BEGIN QCMOD-----
-name: buildmode
-section: project
-arg: release,Build with debugging turned off (default).
-arg: debug,Build with debugging turned on.
-arg: debug-and-release,Build two versions, with and without debugging turned on (mac only).
-arg: no-separate-debug-info,Do not store debug information in a separate file (default for mac).
-arg: separate-debug-info,Strip debug information into a separate .debug file (default for non-mac).
-arg: no-framework,Do not build as a Mac framework.
-arg: framework,Build as a Mac framework (default).
------END QCMOD-----
-*/
-
-#define QC_BUILDMODE
-bool qc_buildmode_release             = false;
-bool qc_buildmode_debug               = false;
-bool qc_buildmode_framework           = false;
-bool qc_buildmode_separate_debug_info = false;
-
-class qc_buildmode : public ConfObj {
-public:
-    qc_buildmode(Conf *c) : ConfObj(c) { }
-    QString name() const { return "buildmode"; }
-    QString shortname() const { return "buildmode"; }
-
-    // no output
-    QString checkString() const { return QString(); }
-
-    bool exec()
-    {
-        // first, parse out the options
-        bool opt_release                = false;
-        bool opt_debug                  = false;
-        bool opt_debug_and_release      = false;
-        bool opt_no_framework           = false;
-        bool opt_framework              = false;
-        bool opt_no_separate_debug_info = false;
-        bool opt_separate_debug_info    = false;
-
-        if (conf->getenv("QC_RELEASE") == "Y")
-            opt_release = true;
-        if (conf->getenv("QC_DEBUG") == "Y")
-            opt_debug = true;
-        if (conf->getenv("QC_DEBUG_AND_RELEASE") == "Y")
-            opt_debug_and_release = true;
-        if (conf->getenv("QC_NO_FRAMEWORK") == "Y")
-            opt_no_framework = true;
-        if (conf->getenv("QC_FRAMEWORK") == "Y")
-            opt_framework = true;
-        if (conf->getenv("QC_NO_SEPARATE_DEBUG_INFO") == "Y")
-            opt_no_separate_debug_info = true;
-        if (conf->getenv("QC_SEPARATE_DEBUG_INFO") == "Y")
-            opt_separate_debug_info = true;
-
-        bool staticmode = false;
-        if (conf->getenv("QC_STATIC") == "Y")
-            staticmode = true;
-
-#ifndef Q_OS_MAC
-        if (opt_debug_and_release) {
-            printf("\nError: The --debug-and-release option is for mac only.\n");
-            exit(1);
-        }
-
-        if (opt_framework) {
-            printf("\nError: The --framework option is for mac only.\n");
-            exit(1);
-        }
-#endif
-
-        if (opt_framework && opt_debug) {
-            printf("\nError: Cannot use both --framework and --debug.\n");
-            exit(1);
-        }
-
-        // sanity check exclusive options
-        int x;
-
-        // build mode
-        x = 0;
-        if (opt_release)
-            ++x;
-        if (opt_debug)
-            ++x;
-        if (opt_debug_and_release)
-            ++x;
-        if (x > 1) {
-            printf("\nError: Use only one of --release, --debug, or --debug-and-release.\n");
-            exit(1);
-        }
-
-        // framework
-        if (opt_framework && staticmode) {
-            printf("\nError: Cannot use both --framework and --static.\n");
-            exit(1);
-        }
-
-        x = 0;
-        if (opt_no_framework)
-            ++x;
-        if (opt_framework)
-            ++x;
-        if (x > 1) {
-            printf("\nError: Use only one of --framework or --no-framework.\n");
-            exit(1);
-        }
-
-        // debug info
-        x = 0;
-        if (opt_no_separate_debug_info)
-            ++x;
-        if (opt_separate_debug_info)
-            ++x;
-        if (x > 1) {
-            printf("\nError: Use only one of --separate-debug-info or --no-separate-debug-info\n");
-            exit(1);
-        }
-
-        // now process the options
-
-        if (opt_release)
-            qc_buildmode_release = true;
-        else if (opt_debug)
-            qc_buildmode_debug = true;
-        else if (opt_debug_and_release) {
-            qc_buildmode_release = true;
-            qc_buildmode_debug   = true;
-        } else // default
-            qc_buildmode_release = true;
-
-        if (opt_framework)
-            qc_buildmode_framework = true;
-        else if (opt_no_framework) {
-            // nothing to do
-        } else // default
-        {
-            if (!staticmode && !opt_debug)
-                qc_buildmode_framework = true;
-        }
-
-        if (opt_separate_debug_info)
-            qc_buildmode_separate_debug_info = true;
-        else if (opt_no_separate_debug_info) {
-            // nothing to do
-        } else // default
-        {
-#ifndef Q_OS_MAC
-            qc_buildmode_separate_debug_info = true;
-#endif
-        }
-
-        // make the string
-        QStringList opts;
-        QString     other;
-
-        if (qc_buildmode_release && qc_buildmode_debug) {
-            opts += "debug_and_release";
-            opts += "build_all";
-        } else if (qc_buildmode_release)
-            opts += "release";
-        else // qc_buildmode_debug
-            opts += "debug";
-
-#ifdef Q_OS_MAC
-        if (qc_buildmode_framework)
-            opts += "lib_bundle";
-#endif
-
-        if (qc_buildmode_separate_debug_info) {
-            opts += "separate_debug_info";
-            other += "QMAKE_CFLAGS += -g\n";
-            other += "QMAKE_CXXFLAGS += -g\n";
-        }
-
-        QString str = QString("CONFIG += ") + opts.join(" ") + '\n';
-        conf->addExtra(str);
-
-        if (!other.isEmpty())
-            conf->addExtra(other);
-
-        return true;
-    }
-};
diff --git a/qcm/extra.qcm b/qcm/extra.qcm
deleted file mode 100644
index bf73ff86..00000000
--- a/qcm/extra.qcm
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
------BEGIN QCMOD-----
-name: extra
-section: project
-arg: enable-tests,Build examples and unittests.
------END QCMOD-----
-*/
-
-class qc_extra : public ConfObj {
-public:
-    qc_extra(Conf *c) : ConfObj(c) { }
-    QString name() const { return "extra"; }
-    QString shortname() const { return "extra"; }
-
-    // no output
-    QString checkString() const { return QString(); }
-
-    bool exec()
-    {
-        QString str;
-        QFile   f;
-
-        if (conf->getenv("QC_ENABLE_TESTS") == "Y")
-            str += "CONFIG += iris_tests\n";
-
-        conf->addExtra(str);
-
-        bool    release    = true;
-        bool    debug      = false;
-        bool    debug_info = false;
-        bool    universal  = false;
-        QString sdk;
-
-#ifdef QC_BUILDMODE
-        release    = qc_buildmode_release;
-        debug      = qc_buildmode_debug;
-        debug_info = qc_buildmode_separate_debug_info;
-#endif
-
-#ifdef QC_UNIVERSAL
-        universal = qc_universal_enabled;
-        sdk       = qc_universal_sdk;
-#endif
-
-        // write confapp_unix.pri
-        str         = QString();
-        QString var = conf->getenv("BINDIR");
-        if (!var.isEmpty())
-            str += QString("BINDIR = %1\n").arg(var);
-        if (debug) // debug or debug-and-release
-            str += QString("CONFIG += debug\n");
-        else // release
-            str += QString("CONFIG += release\n");
-        if (debug_info) {
-            str += QString("CONFIG += separate_debug_info\n");
-            str += "QMAKE_CFLAGS += -g\n";
-            str += "QMAKE_CXXFLAGS += -g\n";
-        }
-        if (universal) {
-            str += "contains(QT_CONFIG,x86):contains(QT_CONFIG,ppc) {\n"
-                   "    CONFIG += x86 ppc\n"
-                   "}\n";
-
-            if (!sdk.isEmpty())
-                str += QString("QMAKE_MAC_SDK = %1\n").arg(sdk);
-        }
-#ifdef QC_QCA
-        if (!qc_qca_procode.isEmpty())
-            str += qc_qca_procode;
-#endif
-        f.setFileName("confapp_unix.pri");
-        if (f.open(QFile::WriteOnly | QFile::Truncate))
-            f.write(str.toLatin1());
-        f.close();
-
-        return true;
-    }
-};
diff --git a/qcm/qca.qcm b/qcm/qca.qcm
deleted file mode 100644
index ca7591d5..00000000
--- a/qcm/qca.qcm
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
------BEGIN QCMOD-----
-name: QCA >= 2.0
-arg: with-qca-inc=[path],Path to QCA include files
-arg: with-qca-lib=[path],Path to QCA library or framework files
------END QCMOD-----
-*/
-
-// adapted from crypto.prf
-static QString internal_crypto_prf(const QString &incdir, const QString &libdir, const QString &frameworkdir)
-{
-    QString out = QString("QCA_INCDIR = %1\n"
-                          "QCA_LIBDIR = %2\n"
-                          "QMAKE_RPATHDIR = %2\n"
-                          "QCA_FRAMEWORKDIR = %3\n"
-                          "\n"
-                          "CONFIG *= qt\n"
-                          "\n"
-                          "LINKAGE =\n"
-                          "QCA_NAME = qca-qt5\n"
-                          "\n"
-                          "!isEmpty(QCA_FRAMEWORKDIR): {\n"
-                          "    framework_dir = $$QCA_FRAMEWORKDIR\n"
-                          "    exists($$framework_dir/$${QCA_NAME}.framework) {\n"
-                          "        #QMAKE_FRAMEWORKPATH *= $$framework_dir\n"
-                          "        LIBS *= -F$$framework_dir\n"
-                          "        INCLUDEPATH += $$framework_dir/$${QCA_NAME}.framework/Headers\n"
-                          "        LINKAGE = -framework $${QCA_NAME}\n"
-                          "    }\n"
-                          "}\n"
-                          "\n"
-                          "# else, link normally\n"
-                          "isEmpty(LINKAGE) {\n"
-                          "    !isEmpty(QCA_INCDIR):INCLUDEPATH += $$QCA_INCDIR/QtCrypto\n"
-                          "    !isEmpty(QCA_LIBDIR):LIBS += -L$$QCA_LIBDIR\n"
-                          "    LINKAGE = -l$${QCA_NAME}\n"
-                          "    CONFIG(debug, debug|release) {\n"
-                          "        windows:LINKAGE = -l$${QCA_NAME}d\n"
-                          "        mac:LINKAGE = -l$${QCA_NAME}_debug\n"
-                          "    }\n"
-                          "}\n"
-                          "\n"
-                          "LIBS += $$LINKAGE\n")
-                      .arg(incdir, libdir, frameworkdir);
-    return out;
-}
-
-// set either libdir or frameworkdir, but not both
-static bool qca_try(Conf *conf, const QString &incdir, const QString &libdir, const QString &frameworkdir, bool release,
-                    bool debug, QString *_prf)
-{
-    QString proextra;
-    QString prf;
-    if (!incdir.isEmpty() || !libdir.isEmpty() || !frameworkdir.isEmpty()) {
-        prf = internal_crypto_prf(conf->escapePath(incdir), conf->escapePath(libdir), frameworkdir);
-    } else {
-        prf = "CONFIG += crypto\n";
-    }
-    proextra = "CONFIG += qt\n"
-               "CONFIG -= debug_and_release debug release\n"
-               "QT -= gui\n";
-    proextra += prf;
-
-    QString str = "#include <QtCrypto>\n"
-                  "\n"
-                  "int main()\n"
-                  "{\n"
-                  "    unsigned long x = QCA_VERSION;\n"
-                  "    if(x >= 0x020000 && x < 0x030000) return 0; else return 1;\n"
-                  "}\n";
-
-    // test desired versions, potentially both release and debug
-
-    if (release) {
-        int ret;
-        if (!conf->doCompileAndLink(str, QStringList(), QString(), proextra + "CONFIG += release\n", &ret) || ret != 0)
-            return false;
-    }
-
-    if (debug) {
-        int ret;
-        if (!conf->doCompileAndLink(str, QStringList(), QString(), proextra + "CONFIG += debug\n", &ret) || ret != 0)
-            return false;
-    }
-
-    *_prf = prf;
-    return true;
-}
-
-static bool qca_try_lib(Conf *conf, const QString &incdir, const QString &libdir, bool release, bool debug,
-                        QString *prf)
-{
-    return qca_try(conf, incdir, libdir, QString(), release, debug, prf)
-        || qca_try(conf, incdir + "/Qca-qt5", libdir, QString(), release, debug, prf);
-}
-
-static bool qca_try_framework(Conf *conf, const QString &frameworkdir, bool release, bool debug, QString *prf)
-{
-    return qca_try(conf, QString(), QString(), frameworkdir, release, debug, prf);
-}
-
-static bool qca_try_ext_prf(Conf *conf, bool release, bool debug, QString *prf)
-{
-    return qca_try(conf, QString(), QString(), QString(), release, debug, prf);
-}
-
-//----------------------------------------------------------------------------
-// qc_qca
-//----------------------------------------------------------------------------
-class qc_qca : public ConfObj {
-public:
-    qc_qca(Conf *c) : ConfObj(c) { }
-    QString name() const { return "QCA >= 2.0"; }
-    QString shortname() const { return "qca"; }
-    bool    exec()
-    {
-        // get the build mode
-#ifdef QC_BUILDMODE
-        bool release = qc_buildmode_release;
-        bool debug   = qc_buildmode_debug;
-#else
-        // else, default to just release mode
-        bool release = true;
-        bool debug   = false;
-#endif
-
-        QString qca_incdir, qca_libdir, qca_crypto_prf;
-        qca_incdir = conf->getenv("QC_WITH_QCA_INC");
-        qca_libdir = conf->getenv("QC_WITH_QCA_LIB");
-
-#if defined(Q_OS_MAC)
-        if (!qca_libdir.isEmpty() && qca_try_framework(conf, qca_libdir, release, debug, &qca_crypto_prf)) {
-            conf->addExtra(qca_crypto_prf);
-            return true;
-        }
-#endif
-
-        if (!qca_incdir.isEmpty() && !qca_libdir.isEmpty()
-            && qca_try_lib(conf, qca_incdir, qca_libdir, release, debug, &qca_crypto_prf)) {
-            conf->addExtra(qca_crypto_prf);
-            return true;
-        }
-
-        if (qca_try_ext_prf(conf, release, debug, &qca_crypto_prf)) {
-            conf->addExtra(qca_crypto_prf);
-            return true;
-        }
-
-        QStringList incs;
-        QString     version, libs, other;
-
-        if (conf->findPkgConfig("qca2-qt5", VersionMin, "2.0.0", &version, &incs, &libs, &other)) {
-            for (int n = 0; n < incs.count(); ++n)
-                conf->addIncludePath(incs[n]);
-            if (!libs.isEmpty())
-                conf->addLib(libs);
-            return true;
-        }
-
-        QStringList prefixes;
-#ifndef Q_OS_WIN
-        prefixes += "/usr";
-        prefixes += "/usr/local";
-#endif
-        QString prefix = conf->getenv("PREFIX");
-        if (!prefix.isEmpty()) {
-            prefixes += prefix;
-        }
-
-        for (int n = 0; n < prefixes.count(); ++n) {
-            const QString &prefix = prefixes[n];
-            if (qca_try_lib(conf, prefix + "/include", prefix + "/lib", release, debug, &qca_crypto_prf)) {
-                conf->addExtra(qca_crypto_prf);
-                return true;
-            }
-        }
-
-        return false;
-    }
-};
diff --git a/qcm/qjdns.qcm b/qcm/qjdns.qcm
deleted file mode 100644
index 4e1769fd..00000000
--- a/qcm/qjdns.qcm
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
------BEGIN QCMOD-----
-name: jdns
-arg: with-qjdns-inc=[path],Path to QJDns include files
-arg: with-qjdns-lib=[path],Path to QJDns library files
------END QCMOD-----
-*/
-
-//----------------------------------------------------------------------------
-// qc_qjdns
-//----------------------------------------------------------------------------
-class qc_qjdns : public ConfObj {
-public:
-    qc_qjdns(Conf *c) : ConfObj(c) { }
-    QString name() const { return "QJDns"; }
-    QString shortname() const { return "qjdns"; }
-    QString resultString() const
-    {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-        return "Disabled for Qt5 and above";
-#else
-        return ConfObj::resultString();
-#endif
-    }
-    bool exec()
-    {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-        return true; // hack. TODO: figure out how to force jdns
-#endif
-        conf->addExtra("CONFIG += need_jdns");
-#if defined Q_OS_WIN || defined Q_OS_MAC
-        // HACK: on Windows and Mac OS X, always use psi's bundled qjdns
-        conf->addExtra("CONFIG += iris-qjdns");
-        return true;
-#else
-        QStringList incs;
-        QString     version, libs, other;
-        QString     s;
-
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-        bool        found = conf->findPkgConfig("qjdns-qt5", VersionMin, "2.0.3", &version, &incs, &libs, &other);
-#else
-        bool found = conf->findPkgConfig("qjdns-qt4", VersionMin, "2.0.3", &version, &incs, &libs, &other);
-#endif
-        if (!found && !conf->findPkgConfig("qjdns", VersionMin, "2.0.0", &version, &incs, &libs, &other)) {
-            s = conf->getenv("QC_WITH_QJDNS_INC");
-            if ((!s.isEmpty() && conf->checkHeader(s, "qjdns.h"))
-                || (s.isEmpty() && conf->findHeader("qjdns.h", QStringList(), &s))) {
-                incs.append(s);
-            }
-
-            s = conf->getenv("QC_WITH_QJDNS_LIB");
-            if ((!s.isEmpty() && conf->checkLibrary(s, "qjdns")) || (s.isEmpty() && conf->findLibrary("qjdns", &s))) {
-                libs = s.isEmpty() ? "-lqjdns -ljdns" : QString("-L%1 -lqjdns -ljdns").arg(s);
-            }
-        }
-
-        if (!incs.isEmpty() && !libs.isEmpty()) {
-            foreach (const QString &inc, incs) {
-                conf->addIncludePath(inc);
-            }
-            conf->addLib(libs);
-            conf->addExtra("CONFIG += ext-qjdns");
-        }
-
-        return true;
-#endif
-    }
-};
diff --git a/qcm/qt42.qcm b/qcm/qt42.qcm
deleted file mode 100644
index 2a97da17..00000000
--- a/qcm/qt42.qcm
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
------BEGIN QCMOD-----
-name: Qt >= 4.2
------END QCMOD-----
-*/
-class qc_qt42 : public ConfObj {
-public:
-    qc_qt42(Conf *c) : ConfObj(c) { }
-    QString name() const { return "Qt >= 4.2"; }
-    QString shortname() const { return "qt42"; }
-    bool    exec()
-    {
-        conf->debug(QString("QT_VERSION = 0x%1").arg(QString::number(QT_VERSION, 16)));
-        if (QT_VERSION >= 0x040200)
-            return true;
-        else
-            return false;
-    }
-};
diff --git a/qcm/universal.qcm b/qcm/universal.qcm
deleted file mode 100644
index dcfa9b62..00000000
--- a/qcm/universal.qcm
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
------BEGIN QCMOD-----
-name: Mac universal binary support
-section: project
-arg: universal,Build with Mac universal binary support.
-arg: mac-sdk=[path],Path to Mac universal SDK (PPC host only).
------END QCMOD-----
-*/
-
-#define QC_UNIVERSAL
-bool    qc_universal_enabled = false;
-QString qc_universal_sdk;
-
-//----------------------------------------------------------------------------
-// qc_universal
-//----------------------------------------------------------------------------
-class qc_universal : public ConfObj {
-public:
-    qc_universal(Conf *c) : ConfObj(c) { }
-    QString name() const { return "Mac universal binary support"; }
-    QString shortname() const { return "universal"; }
-    QString checkString() const { return QString(); }
-
-    bool exec()
-    {
-#ifdef Q_OS_MAC
-        if (qc_getenv("QC_UNIVERSAL") == "Y") {
-            qc_universal_enabled = true;
-
-            QString str = "contains(QT_CONFIG,x86):contains(QT_CONFIG,ppc) {\n"
-                          "    CONFIG += x86 ppc\n"
-                          "}\n";
-
-            QString sdk = qc_getenv("QC_MAC_SDK");
-            if (!sdk.isEmpty()) {
-                str += QString("QMAKE_MAC_SDK = %1\n").arg(sdk);
-                qc_universal_sdk = sdk;
-            }
-
-            conf->addExtra(str);
-        }
-#endif
-        return true;
-    }
-};
diff --git a/qcm/zlib.qcm b/qcm/zlib.qcm
deleted file mode 100644
index fbed96f5..00000000
--- a/qcm/zlib.qcm
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
------BEGIN QCMOD-----
-name: zlib
-arg: with-zlib-inc=[path],Path to zlib include files
-arg: with-zlib-lib=[path],Path to zlib library files
------END QCMOD-----
-*/
-
-//----------------------------------------------------------------------------
-// qc_zlib
-//----------------------------------------------------------------------------
-class qc_zlib : public ConfObj {
-public:
-    qc_zlib(Conf *c) : ConfObj(c) { }
-    QString name() const { return "zlib"; }
-    QString shortname() const { return "zlib"; }
-    bool    exec()
-    {
-        QString inc, lib;
-        QString s;
-
-        s = conf->getenv("QC_WITH_ZLIB_INC");
-        if (!s.isEmpty()) {
-            if (!conf->checkHeader(s, "zlib.h"))
-                return false;
-            inc = s;
-        } else {
-            if (!conf->findHeader("zlib.h", QStringList(), &s))
-                return false;
-            inc = s;
-        }
-
-        s = conf->getenv("QC_WITH_ZLIB_LIB");
-        if (!s.isEmpty()) {
-            if (!conf->checkLibrary(s, "z"))
-                return false;
-            lib = s;
-        } else {
-            if (!conf->findLibrary("z", &s))
-                return false;
-            lib = s;
-        }
-
-        if (!inc.isEmpty())
-            conf->addIncludePath(inc);
-        if (!lib.isEmpty())
-            conf->addLib(QString("-L") + s);
-        conf->addLib("-lz");
-
-        return true;
-    }
-};
diff --git a/src/irisnet/appledns/appledns.pri b/src/irisnet/appledns/appledns.pri
deleted file mode 100644
index ff4c190f..00000000
--- a/src/irisnet/appledns/appledns.pri
+++ /dev/null
@@ -1,6 +0,0 @@
-QT *= network
-
-HEADERS += $$PWD/qdnssd.h
-SOURCES += $$PWD/qdnssd.cpp $$PWD/appledns.cpp
-
-!mac:LIBS += -ldns_sd
diff --git a/src/irisnet/appledns/appledns.pro b/src/irisnet/appledns/appledns.pro
deleted file mode 100644
index ff2bcf57..00000000
--- a/src/irisnet/appledns/appledns.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-IRIS_BASE = ../../..
-include(../../libbase.pri)
-
-TEMPLATE = lib
-CONFIG += plugin
-QT -= gui
-DESTDIR = $$IRIS_BASE/plugins
-
-VERSION = 1.0.0
-
-INCLUDEPATH *= $$PWD/../corelib
-LIBS += -L$$IRIS_BASE/lib -lirisnetcore
-
-include(appledns.pri)
diff --git a/src/irisnet/appledns/sdtest.pro b/src/irisnet/appledns/sdtest.pro
deleted file mode 100644
index 0f914347..00000000
--- a/src/irisnet/appledns/sdtest.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-CONFIG += console
-CONFIG -= app_bundle
-QT -= gui
-QT += network
-
-HEADERS += qdnssd.h
-SOURCES += qdnssd.cpp sdtest.cpp
-
-!mac:LIBS += -ldns_sd
diff --git a/src/irisnet/corelib/corelib.pri b/src/irisnet/corelib/corelib.pri
deleted file mode 100644
index f188bbfe..00000000
--- a/src/irisnet/corelib/corelib.pri
+++ /dev/null
@@ -1,52 +0,0 @@
-QT *= network
-
-HEADERS += \
-    $$PWD/objectsession.h \
-    $$PWD/irisnetexport.h \
-    $$PWD/irisnetplugin.h \
-    $$PWD/irisnetglobal.h \
-    $$PWD/irisnetglobal_p.h \
-    $$PWD/netinterface.h \
-    $$PWD/netavailability.h \
-    $$PWD/netnames.h \
-    $$PWD/addressresolver.h
-
-SOURCES += \
-    $$PWD/objectsession.cpp \
-    $$PWD/irisnetplugin.cpp \
-    $$PWD/irisnetglobal.cpp \
-    $$PWD/netinterface.cpp \
-    $$PWD/netavailability.cpp \
-    $$PWD/netnames.cpp \
-    $$PWD/addressresolver.cpp
-
-unix {
-    SOURCES += \
-        $$PWD/netinterface_unix.cpp
-}
-
-need_jdns|lessThan(QT_MAJOR_VERSION, 5) {
-    !ext-qjdns {
-        include(../../jdns/jdns.pri)
-        INCLUDEPATH += $$PWD/../../jdns
-    }
-
-    SOURCES += \
-        $$PWD/netnames_jdns.cpp
-
-    DEFINES += NEED_JDNS
-} else {
-    SOURCES += $$PWD/netinterface_qtname.cpp \
-}
-
-equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 15) {
-    SOURCES += $$PWD/netinterface_qtnet.cpp
-    DEFINES += HAVE_QTNET
-}
-
-#include(legacy/legacy.pri)
-
-appledns:appledns_bundle {
-    DEFINES += APPLEDNS_STATIC
-    include(../appledns/appledns.pri)
-}
diff --git a/src/irisnet/corelib/corelib.pro b/src/irisnet/corelib/corelib.pro
deleted file mode 100644
index 1df24aaa..00000000
--- a/src/irisnet/corelib/corelib.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-IRIS_BASE = ../../..
-
-TEMPLATE = lib
-QT      -= gui
-TARGET   = irisnetcore
-DESTDIR  = $$IRIS_BASE/lib
-windows:DLLDESTDIR = $$IRIS_BASE/bin
-
-VERSION = 1.0.0
-
-include(../../libbase.pri)
-include(corelib.pri)
-
-# fixme: irisnetcore builds as dll or bundled, never static?
-CONFIG += create_prl
-windows:!staticlib:DEFINES += IRISNET_MAKEDLL
-staticlib:PRL_EXPORT_DEFINES += IRISNET_STATIC
diff --git a/src/irisnet/irisnet.pro b/src/irisnet/irisnet.pro
deleted file mode 100644
index 092e139d..00000000
--- a/src/irisnet/irisnet.pro
+++ /dev/null
@@ -1,15 +0,0 @@
-TEMPLATE = subdirs
-
-include(../libbase.pri)
-
-sub_corelib.subdir = corelib
-sub_appledns.subdir = appledns
-sub_appledns.depends = sub_corelib
-sub_noncore.subdir = noncore
-!irisnetcore_bundle:sub_noncore.depends = sub_corelib
-
-!irisnetcore_bundle:SUBDIRS += sub_corelib
-appledns:!appledns_bundle:SUBDIRS += sub_appledns
-!iris_bundle:SUBDIRS += sub_noncore
-
-OTHER_FILES += CMakeLists.txt
diff --git a/src/irisnet/noncore/cutestuff/cutestuff.pri b/src/irisnet/noncore/cutestuff/cutestuff.pri
deleted file mode 100644
index f3fd8606..00000000
--- a/src/irisnet/noncore/cutestuff/cutestuff.pri
+++ /dev/null
@@ -1,15 +0,0 @@
-INCLUDEPATH += $$PWD
-
-HEADERS += \
-    $$PWD/bytestream.h \
-    $$PWD/bsocket.h \
-    $$PWD/httpconnect.h \
-    $$PWD/httppoll.h \
-    $$PWD/socks.h
-
-SOURCES += \
-    $$PWD/bytestream.cpp \
-    $$PWD/bsocket.cpp \
-    $$PWD/httpconnect.cpp \
-    $$PWD/httppoll.cpp \
-    $$PWD/socks.cpp
diff --git a/src/irisnet/noncore/legacy/legacy.pri b/src/irisnet/noncore/legacy/legacy.pri
deleted file mode 100644
index 7c8838da..00000000
--- a/src/irisnet/noncore/legacy/legacy.pri
+++ /dev/null
@@ -1,7 +0,0 @@
-HEADERS += \
-    $$PWD/ndns.h \
-    $$PWD/srvresolver.h
-
-SOURCES += \
-    $$PWD/ndns.cpp \
-    $$PWD/srvresolver.cpp
diff --git a/src/irisnet/noncore/noncore.pri b/src/irisnet/noncore/noncore.pri
deleted file mode 100644
index 9a4bcf16..00000000
--- a/src/irisnet/noncore/noncore.pri
+++ /dev/null
@@ -1,55 +0,0 @@
-IRIS_BASE = $$PWD/../../..
-
-QT *= network
-
-irisnetcore_bundle:{
-    include(../corelib/corelib.pri)
-}
-else {
-    LIBS += -L$$IRIS_BASE/lib -lirisnetcore
-}
-
-INCLUDEPATH += $$PWD/../corelib
-
-include($$PWD/cutestuff/cutestuff.pri)
-
-HEADERS += \
-    $$PWD/dtls.h \
-    $$PWD/iceagent.h \
-    $$PWD/processquit.h \
-    $$PWD/stunutil.h \
-    $$PWD/stunmessage.h \
-    $$PWD/stuntypes.h \
-    $$PWD/stuntransaction.h \
-    $$PWD/stunbinding.h \
-    $$PWD/stunallocate.h \
-    $$PWD/turnclient.h \
-    $$PWD/udpportreserver.h \
-    $$PWD/icetransport.h \
-    $$PWD/icelocaltransport.h \
-    $$PWD/iceturntransport.h \
-    $$PWD/icecomponent.h \
-    $$PWD/ice176.h \
-    $$PWD/tcpportreserver.h
-
-SOURCES += \
-    $$PWD/dtls.cpp \
-    $$PWD/iceagent.cpp \
-    $$PWD/processquit.cpp \
-    $$PWD/stunutil.cpp \
-    $$PWD/stunmessage.cpp \
-    $$PWD/stuntypes.cpp \
-    $$PWD/stuntransaction.cpp \
-    $$PWD/stunbinding.cpp \
-    $$PWD/stunallocate.cpp \
-    $$PWD/turnclient.cpp \
-    $$PWD/udpportreserver.cpp \
-    $$PWD/icetransport.cpp \
-    $$PWD/icelocaltransport.cpp \
-    $$PWD/iceturntransport.cpp \
-    $$PWD/icecomponent.cpp \
-    $$PWD/ice176.cpp \
-    $$PWD/tcpportreserver.cpp
-
-INCLUDEPATH += $$PWD/legacy
-include(legacy/legacy.pri)
diff --git a/src/irisnet/noncore/noncore.pro b/src/irisnet/noncore/noncore.pro
deleted file mode 100644
index 29ee6f57..00000000
--- a/src/irisnet/noncore/noncore.pro
+++ /dev/null
@@ -1,15 +0,0 @@
-IRIS_BASE = ../../..
-
-TEMPLATE = lib
-QT      -= gui
-TARGET   = irisnet
-DESTDIR  = $$IRIS_BASE/lib
-CONFIG  += staticlib create_prl crypto
-
-VERSION = 1.0.0
-
-include(../../libbase.pri)
-include(noncore.pri)
-
-windows:!staticlib:DEFINES += IRISNET_MAKEDLL
-staticlib:PRL_EXPORT_DEFINES += IRISNET_STATIC
diff --git a/src/libbase.pri b/src/libbase.pri
deleted file mode 100644
index 62b58536..00000000
--- a/src/libbase.pri
+++ /dev/null
@@ -1,8 +0,0 @@
-IRIS_BASE = $$PWD/..
-
-isEmpty(top_iris_builddir):top_iris_builddir = .
-include($$top_iris_builddir/../conf.pri)
-
-include(../common.pri)
-
-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
diff --git a/src/src.pro b/src/src.pro
deleted file mode 100644
index a5a5ca0c..00000000
--- a/src/src.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TEMPLATE = subdirs
-
-include(libbase.pri)
-
-sub_irisnet.subdir = irisnet
-sub_xmpp.subdir = xmpp
-sub_xmpp.depends = sub_irisnet
-
-SUBDIRS += sub_irisnet
-!iris_bundle:SUBDIRS += sub_xmpp
diff --git a/src/xmpp/base/base.pri b/src/xmpp/base/base.pri
deleted file mode 100644
index e9c463d4..00000000
--- a/src/xmpp/base/base.pri
+++ /dev/null
@@ -1,11 +0,0 @@
-INCLUDEPATH += $$PWD/../..
-DEPENDPATH += $$PWD/../..
-
-HEADERS += \
-    $$PWD/randomnumbergenerator.h \
-    $$PWD/randrandomnumbergenerator.h \
-    $$PWD/timezone.h
-
-SOURCES += \
-    $$PWD/randomnumbergenerator.cpp \
-    $$PWD/timezone.cpp
diff --git a/src/xmpp/base/unittest/unittest.pri b/src/xmpp/base/unittest/unittest.pri
deleted file mode 100644
index 0014eb89..00000000
--- a/src/xmpp/base/unittest/unittest.pri
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES += \
-    $$PWD/randrandomnumbergeneratortest.cpp \
-    $$PWD/randomnumbergeneratortest.cpp
diff --git a/src/xmpp/base/unittest/unittest.pro b/src/xmpp/base/unittest/unittest.pro
deleted file mode 100644
index 2a0edb78..00000000
--- a/src/xmpp/base/unittest/unittest.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-include(../../modules.pri)
-include($$IRIS_XMPP_QA_UNITTEST_MODULE)
-include($$IRIS_XMPP_BASE_MODULE)
-include(unittest.pri)
diff --git a/src/xmpp/blake2/blake2.pri b/src/xmpp/blake2/blake2.pri
deleted file mode 100644
index 6ed4bd71..00000000
--- a/src/xmpp/blake2/blake2.pri
+++ /dev/null
@@ -1,18 +0,0 @@
-INCLUDEPATH *= $$PWD/../..
-DEPENDPATH *= $$PWD/../..
-
-SOURCES += $$PWD/blake2qt.cpp
-
-bundled_blake2 {
-    SOURCES += \
-        $$PWD/blake2s-ref.c \
-        $$PWD/blake2b-ref.c
-    HEADERS += $$PWD/blake2.h
-    INCLUDEPATH += $PWD
-} else {
-    DEFINES += IRIS_SYSTEM_BLAKE2
-}
-
-HEADERS += $$PWD/blake2qt.h
-
-OTHER_FILES += $$PWD/README.md
diff --git a/src/xmpp/common.pri b/src/xmpp/common.pri
deleted file mode 100644
index 6cd8bb4f..00000000
--- a/src/xmpp/common.pri
+++ /dev/null
@@ -1,3 +0,0 @@
-OBJECTS_DIR = .obj
-MOC_DIR = .moc
-UI_DIR = .ui
diff --git a/src/xmpp/jid/jid.pri b/src/xmpp/jid/jid.pri
deleted file mode 100644
index b67e6ff3..00000000
--- a/src/xmpp/jid/jid.pri
+++ /dev/null
@@ -1,8 +0,0 @@
-INCLUDEPATH *= $$PWD/../..
-DEPENDPATH *= $$PWD/../..
-
-HEADERS += \
-    $$PWD/jid.h
-
-SOURCES += \
-    $$PWD/jid.cpp
diff --git a/src/xmpp/jid/unittest/unittest.pri b/src/xmpp/jid/unittest/unittest.pri
deleted file mode 100644
index e0994628..00000000
--- a/src/xmpp/jid/unittest/unittest.pri
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES += \
-    $$PWD/jidtest.cpp
diff --git a/src/xmpp/jid/unittest/unittest.pro b/src/xmpp/jid/unittest/unittest.pro
deleted file mode 100644
index fd9fa52b..00000000
--- a/src/xmpp/jid/unittest/unittest.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-include(../../modules.pri)
-include($$IRIS_XMPP_QA_UNITTEST_MODULE)
-include($$IRIS_XMPP_JID_MODULE)
-include(unittest.pri)
diff --git a/src/xmpp/modules.pri b/src/xmpp/modules.pri
deleted file mode 100644
index cc0a3632..00000000
--- a/src/xmpp/modules.pri
+++ /dev/null
@@ -1,7 +0,0 @@
-IRIS_XMPP_QA_UNITTEST_MODULE = $$PWD/qa/unittest.pri
-IRIS_XMPP_JID_MODULE = $$PWD/jid/jid.pri
-IRIS_XMPP_SASL_MODULE = $$PWD/sasl/sasl.pri
-IRIS_XMPP_BASE_MODULE = $$PWD/base/base.pri
-IRIS_XMPP_ZLIB_MODULE = $$PWD/zlib/zlib.pri
-IRIS_XMPP_BLAKE2_MODULE = $$PWD/blake2/blake2.pri
-IRIS_XMPP_STRINGPREP_MODULE = $$PWD/../../3rdparty/stringprep/stringprep.pri
diff --git a/src/xmpp/qa/qttestutil/example/example.pro b/src/xmpp/qa/qttestutil/example/example.pro
deleted file mode 100644
index 086b4790..00000000
--- a/src/xmpp/qa/qttestutil/example/example.pro
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Example unit test module with 2 unit test suites.
-#
-
-include(../qttestutil.pri)
-
-QT += testlib
-QT -= gui
-CONFIG -= app_bundle
-
-TARGET = checker
-
-SOURCES += \
-    myfirstclasstest.cpp \
-    mysecondclasstest.cpp \
-    ../simplechecker.cpp
-
-# Add an extra 'make check' target.
-QMAKE_EXTRA_TARGETS = check
-check.commands = \$(MAKE) && ./$(QMAKE_TARGET)
-
-# Cleanup the checker on 'make clean'
-QMAKE_CLEAN += $(QMAKE_TARGET)
diff --git a/src/xmpp/qa/qttestutil/qttestutil.pri b/src/xmpp/qa/qttestutil/qttestutil.pri
deleted file mode 100644
index e11607b3..00000000
--- a/src/xmpp/qa/qttestutil/qttestutil.pri
+++ /dev/null
@@ -1,5 +0,0 @@
-INCLUDEPATH *= $$PWD/..
-DEPENDPATH *= $$PWD/..
-
-SOURCES += \
-    $$PWD/testregistry.cpp
diff --git a/src/xmpp/qa/unittest.pri b/src/xmpp/qa/unittest.pri
deleted file mode 100644
index 85267535..00000000
--- a/src/xmpp/qa/unittest.pri
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Declares all common settings/includes for a unittest module.
-#
-# Include this file from your module's unittest project file to create a
-# standalone checker for the module.
-#
-
-CONFIG += crypto
-
-include($$PWD/qttestutil/qttestutil.pri)
-include($$PWD/../common.pri)
-
-QT += testlib
-QT -= gui
-CONFIG -= app_bundle
-
-INCLUDEPATH *= $$PWD
-DEPENDPATH *= $$PWD
-
-TARGET = checker
-
-SOURCES += \
-    $$PWD/qttestutil/simplechecker.cpp
-
-QMAKE_EXTRA_TARGETS = check
-check.commands = \$(MAKE) && ./checker
-
-QMAKE_CLEAN += $(QMAKE_TARGET)
diff --git a/src/xmpp/qa/unittest.template/unittest.pri b/src/xmpp/qa/unittest.template/unittest.pri
deleted file mode 100644
index fd93c47b..00000000
--- a/src/xmpp/qa/unittest.template/unittest.pri
+++ /dev/null
@@ -1,2 +0,0 @@
-SOURCES += \
-    $$PWD/myclasstest.cpp
diff --git a/src/xmpp/qa/unittest.template/unittest.pro b/src/xmpp/qa/unittest.template/unittest.pro
deleted file mode 100644
index e2574cbf..00000000
--- a/src/xmpp/qa/unittest.template/unittest.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-include(../../modules.pri)
-include($$IRIS_XMPP_QA_UNITTEST_MODULE)
-include($$MYMODULE)
-include(unittest.pri)
diff --git a/src/xmpp/qa/unittests.pri b/src/xmpp/qa/unittests.pri
deleted file mode 100644
index 2509e1e5..00000000
--- a/src/xmpp/qa/unittests.pri
+++ /dev/null
@@ -1,4 +0,0 @@
-# All available unit tests
-
-include($$PWD/../base/unittest/unittest.pri)
-include($$PWD/../sasl/unittest/unittest.pri)
diff --git a/src/xmpp/qa/unittests/unittests.pro b/src/xmpp/qa/unittests/unittests.pro
deleted file mode 100644
index 00176049..00000000
--- a/src/xmpp/qa/unittests/unittests.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-include(../../../../iris.pri)
-include(../unittests.pri)
-include(../unittest.pri)
-
-# FIXME
-include(../../../../../third-party/qca/qca.pri)
diff --git a/src/xmpp/sasl/sasl.pri b/src/xmpp/sasl/sasl.pri
deleted file mode 100644
index 1248370c..00000000
--- a/src/xmpp/sasl/sasl.pri
+++ /dev/null
@@ -1,18 +0,0 @@
-INCLUDEPATH *= $$PWD/../..
-DEPENDPATH *= $$PWD/../..
-
-HEADERS += \
-    $$PWD/plainmessage.h \
-    $$PWD/digestmd5proplist.h \
-    $$PWD/digestmd5response.h \
-    $$PWD/scramsha1message.h \
-    $$PWD/scramsha1response.h \
-    $$PWD/scramsha1signature.cpp
-
-SOURCES += \
-    $$PWD/plainmessage.cpp \
-    $$PWD/digestmd5proplist.cpp \
-    $$PWD/digestmd5response.cpp \
-    $$PWD/scramsha1message.cpp \
-    $$PWD/scramsha1response.cpp \
-    $$PWD/scramsha1signature.cpp
diff --git a/src/xmpp/sasl/unittest/unittest.pri b/src/xmpp/sasl/unittest/unittest.pri
deleted file mode 100644
index a4e78d02..00000000
--- a/src/xmpp/sasl/unittest/unittest.pri
+++ /dev/null
@@ -1,5 +0,0 @@
-SOURCES += \
-    $$PWD/plainmessagetest.cpp \
-    $$PWD/digestmd5responsetest.cpp \
-    $$PWD/scramsha1messagetest.cpp \
-    $$PWD/scramsha1responsetest.cpp
diff --git a/src/xmpp/sasl/unittest/unittest.pro b/src/xmpp/sasl/unittest/unittest.pro
deleted file mode 100644
index 055d8665..00000000
--- a/src/xmpp/sasl/unittest/unittest.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-include(../../modules.pri)
-include($$IRIS_XMPP_QA_UNITTEST_MODULE)
-include($$IRIS_XMPP_SASL_MODULE)
-include($$IRIS_XMPP_BASE_MODULE)
-include($$IRIS_XMPP_BASE64_MODULE)
-include($$IRIS_XMPP_JID_MODULE)
-include(unittest.pri)
-
-# QCA stuff.
-# TODO: Remove the dependency on QCA from this module
-include(../../../../../third-party/qca/qca.pri)
-include(../../../../../third-party/qca/qca-ossl.pri)
diff --git a/src/xmpp/xmpp.pri b/src/xmpp/xmpp.pri
deleted file mode 100644
index e5d2268e..00000000
--- a/src/xmpp/xmpp.pri
+++ /dev/null
@@ -1,136 +0,0 @@
-IRIS_BASE = $PWD/../..
-include(../libbase.pri)
-include($$PWD/modules.pri)
-
-QT *= xml network
-
-INCLUDEPATH += $$PWD/../irisnet/corelib $$PWD/../irisnet/noncore $$PWD/../irisnet/noncore/legacy $$PWD/../irisnet/noncore/cutestuff
-iris_bundle:{
-    include(../irisnet/noncore/noncore.pri)
-}
-else {
-    LIBS += -L$$top_iris_builddir/lib -lirisnet
-}
-
-include($$IRIS_XMPP_BASE_MODULE)
-include($$IRIS_XMPP_ZLIB_MODULE)
-include($$IRIS_XMPP_JID_MODULE)
-include($$IRIS_XMPP_SASL_MODULE)
-include($$IRIS_XMPP_BLAKE2_MODULE)
-include($$IRIS_XMPP_STRINGPREP_MODULE)
-
-DEFINES += XMPP_TEST
-
-INCLUDEPATH += \
-    $$PWD/ \
-    $$PWD/.. \
-    $$PWD/xmpp-core \
-    $$PWD/xmpp-im
-
-HEADERS += \
-    $$PWD/xmpp-core/compressionhandler.h \
-    $$PWD/xmpp-core/parser.h \
-    $$PWD/xmpp-core/protocol.h \
-    $$PWD/xmpp-core/securestream.h \
-    $$PWD/xmpp-core/sm.h \
-    $$PWD/xmpp-core/td.h \
-    $$PWD/xmpp-core/xmlprotocol.h \
-    $$PWD/xmpp-core/xmpp_clientstream.h \
-    $$PWD/xmpp-core/xmpp.h \
-    $$PWD/xmpp-core/xmpp_stanza.h \
-    $$PWD/xmpp-core/xmpp_stream.h \
-    $$PWD/xmpp-im/filetransfer.h \
-    $$PWD/xmpp-im/httpfileupload.h \
-    $$PWD/xmpp-im/im.h \
-    $$PWD/xmpp-im/jingle-ice.h \
-    $$PWD/xmpp-im/jingle.h \
-    $$PWD/xmpp-im/jingle-transport.h \
-    $$PWD/xmpp-im/jingle-nstransportslist.h \
-    $$PWD/xmpp-im/jingle-application.h \
-    $$PWD/xmpp-im/jingle-session.h \
-    $$PWD/xmpp-im/jingle-ft.h \
-    $$PWD/xmpp-im/jingle-ibb.h \
-    $$PWD/xmpp-im/jingle-s5b.h \
-    $$PWD/xmpp-im/s5b.h \
-    $$PWD/xmpp-im/xmpp_address.h \
-    $$PWD/xmpp-im/xmpp_agentitem.h \
-    $$PWD/xmpp-im/xmpp_bitsofbinary.h \
-    $$PWD/xmpp-im/xmpp_bytestream.h \
-    $$PWD/xmpp-im/xmpp_caps.h \
-    $$PWD/xmpp-im/xmpp_captcha.h \
-    $$PWD/xmpp-im/xmpp_chatstate.h \
-    $$PWD/xmpp-im/xmpp_client.h \
-    $$PWD/xmpp-im/xmpp_discoinfotask.h \
-    $$PWD/xmpp-im/xmpp_discoitem.h \
-    $$PWD/xmpp-im/xmpp_features.h \
-    $$PWD/xmpp-im/xmpp_form.h \
-    $$PWD/xmpp-im/xmpp_hash.h \
-    $$PWD/xmpp-im/xmpp_htmlelement.h \
-    $$PWD/xmpp-im/xmpp_httpauthrequest.h \
-    $$PWD/xmpp-im/xmpp_ibb.h \
-    $$PWD/xmpp-im/xmpp_liveroster.h \
-    $$PWD/xmpp-im/xmpp_liverosteritem.h \
-    $$PWD/xmpp-im/xmpp_message.h \
-    $$PWD/xmpp-im/xmpp_muc.h \
-    $$PWD/xmpp-im/xmpp_pubsubitem.h \
-    $$PWD/xmpp-im/xmpp_receipts.h \
-    $$PWD/xmpp-im/xmpp_reference.h \
-    $$PWD/xmpp-im/xmpp_resource.h \
-    $$PWD/xmpp-im/xmpp_resourcelist.h \
-    $$PWD/xmpp-im/xmpp_roster.h \
-    $$PWD/xmpp-im/xmpp_rosteritem.h \
-    $$PWD/xmpp-im/xmpp_rosterx.h \
-    $$PWD/xmpp-im/xmpp_serverinfomanager.h \
-    $$PWD/xmpp-im/xmpp_status.h \
-    $$PWD/xmpp-im/xmpp_subsets.h \
-    $$PWD/xmpp-im/xmpp_task.h \
-    $$PWD/xmpp-im/xmpp_tasks.h \
-    $$PWD/xmpp-im/xmpp_thumbs.h \
-    $$PWD/xmpp-im/xmpp_url.h \
-    $$PWD/xmpp-im/xmpp_vcard.h \
-    $$PWD/xmpp-im/xmpp_xdata.h \
-    $$PWD/xmpp-im/xmpp_xmlcommon.h
-
-SOURCES += \
-    $$PWD/xmpp-core/connector.cpp \
-    $$PWD/xmpp-core/tlshandler.cpp \
-    $$PWD/xmpp-core/securestream.cpp \
-    $$PWD/xmpp-core/parser.cpp \
-    $$PWD/xmpp-core/xmlprotocol.cpp \
-    $$PWD/xmpp-core/protocol.cpp \
-    $$PWD/xmpp-core/sm.cpp \
-    $$PWD/xmpp-core/compressionhandler.cpp \
-    $$PWD/xmpp-core/stream.cpp \
-    $$PWD/xmpp-core/simplesasl.cpp \
-    $$PWD/xmpp-core/xmpp_stanza.cpp \
-    $$PWD/xmpp-im/jingle-ice.cpp \
-    $$PWD/xmpp-im/types.cpp \
-    $$PWD/xmpp-im/client.cpp \
-    $$PWD/xmpp-im/xmpp_features.cpp \
-    $$PWD/xmpp-im/xmpp_discoitem.cpp \
-    $$PWD/xmpp-im/xmpp_discoinfotask.cpp \
-    $$PWD/xmpp-im/xmpp_xdata.cpp \
-    $$PWD/xmpp-im/xmpp_subsets.cpp \
-    $$PWD/xmpp-im/xmpp_task.cpp \
-    $$PWD/xmpp-im/xmpp_tasks.cpp \
-    $$PWD/xmpp-im/xmpp_xmlcommon.cpp \
-    $$PWD/xmpp-im/xmpp_vcard.cpp \
-    $$PWD/xmpp-im/xmpp_bytestream.cpp \
-    $$PWD/xmpp-im/s5b.cpp \
-    $$PWD/xmpp-im/xmpp_ibb.cpp \
-    $$PWD/xmpp-im/xmpp_reference.cpp \
-    $$PWD/xmpp-im/filetransfer.cpp \
-    $$PWD/xmpp-im/httpfileupload.cpp \
-    $$PWD/xmpp-im/xmpp_bitsofbinary.cpp \
-    $$PWD/xmpp-im/xmpp_caps.cpp \
-    $$PWD/xmpp-im/xmpp_serverinfomanager.cpp \
-    $$PWD/xmpp-im/jingle.cpp \
-    $$PWD/xmpp-im/jingle-transport.cpp \
-    $$PWD/xmpp-im/jingle-application.cpp \
-    $$PWD/xmpp-im/jingle-nstransportslist.cpp \
-    $$PWD/xmpp-im/jingle-session.cpp \
-    $$PWD/xmpp-im/jingle-ft.cpp \
-    $$PWD/xmpp-im/jingle-s5b.cpp \
-    $$PWD/xmpp-im/jingle-ibb.cpp
-
-OTHER_FILES += $$PWD/CMakeLists.txt
diff --git a/src/xmpp/xmpp.pro b/src/xmpp/xmpp.pro
deleted file mode 100644
index 32b0b236..00000000
--- a/src/xmpp/xmpp.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-IRIS_BASE = ../..
-
-TEMPLATE = lib
-#QT      -= gui
-TARGET   = iris
-DESTDIR  = $$IRIS_BASE/lib
-CONFIG  += staticlib create_prl crypto
-OBJECTS_DIR = .obj
-MOC_DIR = .moc
-UI_DIR = .ui
-
-VERSION = 1.0.0
-
-# static targets don't pick up prl defines
-DEFINES += IRISNET_STATIC
-
-include(xmpp.pri)
diff --git a/src/xmpp/zlib/zlib.pri b/src/xmpp/zlib/zlib.pri
deleted file mode 100644
index 9be9dac4..00000000
--- a/src/xmpp/zlib/zlib.pri
+++ /dev/null
@@ -1,10 +0,0 @@
-INCLUDEPATH *= $$PWD/../..
-DEPENDPATH *= $$PWD/../..
-
-HEADERS += \
-    $$PWD/zlibcompressor.h \
-    $$PWD/zlibdecompressor.h
-
-SOURCES += \
-    $$PWD/zlibcompressor.cpp \
-    $$PWD/zlibdecompressor.cpp
diff --git a/tools/icetunnel/icetunnel.pro b/tools/icetunnel/icetunnel.pro
deleted file mode 100644
index 11bd64d3..00000000
--- a/tools/icetunnel/icetunnel.pro
+++ /dev/null
@@ -1,20 +0,0 @@
-IRIS_BASE = ../..
-include(../../confapp.pri)
-
-CONFIG += console crypto
-CONFIG -= app_bundle
-QT -= gui
-QT += network
-
-CONFIG *= depend_prl
-
-INCLUDEPATH += ../../include ../../include/iris
-
-iris_bundle:{
-    include(../../src/irisnet/noncore/noncore.pri)
-}
-else {
-    LIBS += -L$$IRIS_BASE/lib -lirisnet
-}
-
-SOURCES += main.cpp
diff --git a/tools/nettool/nettool.pro b/tools/nettool/nettool.pro
deleted file mode 100644
index 0820fe4c..00000000
--- a/tools/nettool/nettool.pro
+++ /dev/null
@@ -1,31 +0,0 @@
-IRIS_BASE = ../..
-include(../../confapp.pri)
-
-CONFIG += console
-CONFIG -= app_bundle
-QT -= gui
-QT += network
-DESTDIR = ../../bin
-
-CONFIG *= depend_prl
-
-INCLUDEPATH += ../../include ../../include/iris
-
-iris_bundle:{
-    include(../../src/irisnet/noncore/noncore.pri)
-}
-else {
-    LIBS += -L$$IRIS_BASE/lib -lirisnet
-}
-
-# qt < 4.4 doesn't enable link_prl by default.  we could just enable it,
-#   except that in 4.3 or earlier the link_prl feature is too aggressive and
-#   pulls in unnecessary deps.  so, for 4.3 and earlier, we'll just explicitly
-#   specify the stuff the prl should have given us.
-# also, mingw seems to have broken prl support??
-win32-g++|contains($$list($$[QT_VERSION]), 4.0.*|4.1.*|4.2.*|4.3.*) {
-    DEFINES += IRISNET_STATIC             # from irisnet
-    windows:LIBS += -lWs2_32 -lAdvapi32   # from jdns
-}
-
-SOURCES += main.cpp
diff --git a/tools/tools.pro b/tools/tools.pro
deleted file mode 100644
index e677169a..00000000
--- a/tools/tools.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS = nettool icetunnel xmpptest
diff --git a/tools/xmpptest/xmpptest.pro b/tools/xmpptest/xmpptest.pro
deleted file mode 100644
index eee8edef..00000000
--- a/tools/xmpptest/xmpptest.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-IRIS_BASE = ../..
-include(../../confapp.pri)
-
-CONFIG -= app_bundle
-QT += xml network widgets
-
-include(../../iris.pri)
-
-SOURCES += xmpptest.cpp
-INTERFACES += test.ui

From a79090c28bdc45f0e68bdb26698541b011f9cc4a Mon Sep 17 00:00:00 2001
From: Sergei Ilinykh <rion4ik@gmail.com>
Date: Thu, 14 Mar 2024 23:34:45 +0300
Subject: [PATCH 369/383] Switch to Qt-native random number generator

---
 CMakeLists.txt                                |  2 +-
 src/xmpp/CMakeLists.txt                       |  4 --
 src/xmpp/base/randomnumbergenerator.cpp       | 31 ---------
 src/xmpp/base/randomnumbergenerator.h         | 36 -----------
 src/xmpp/base/randrandomnumbergenerator.h     | 37 -----------
 .../incrementingrandomnumbergenerator.h       | 48 --------------
 .../unittest/randomnumbergeneratortest.cpp    | 64 -------------------
 .../randrandomnumbergeneratortest.cpp         | 43 -------------
 src/xmpp/sasl/digestmd5response.cpp           |  6 +-
 src/xmpp/sasl/digestmd5response.h             |  4 +-
 src/xmpp/sasl/scramsha1message.cpp            |  8 +--
 src/xmpp/sasl/scramsha1message.h              |  5 +-
 src/xmpp/sasl/scramsha1response.cpp           |  4 +-
 src/xmpp/sasl/scramsha1response.h             |  4 +-
 .../sasl/unittest/digestmd5responsetest.cpp   |  9 ++-
 .../sasl/unittest/scramsha1messagetest.cpp    |  7 +-
 .../sasl/unittest/scramsha1responsetest.cpp   |  5 +-
 src/xmpp/xmpp-core/simplesasl.cpp             | 14 ++--
 18 files changed, 28 insertions(+), 303 deletions(-)
 delete mode 100644 src/xmpp/base/randomnumbergenerator.cpp
 delete mode 100644 src/xmpp/base/randomnumbergenerator.h
 delete mode 100644 src/xmpp/base/randrandomnumbergenerator.h
 delete mode 100644 src/xmpp/base/unittest/incrementingrandomnumbergenerator.h
 delete mode 100644 src/xmpp/base/unittest/randomnumbergeneratortest.cpp
 delete mode 100644 src/xmpp/base/unittest/randrandomnumbergeneratortest.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1d826864..1aab0947 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,7 +74,7 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug" OR ("${CMAKE_BUILD_TYPE}" STREQUAL "Re
     include(debug-definitions)
 endif()
 
-if(QT_DEFAULT_MAJOR_VERSION STREQUAL "")
+if("${QT_DEFAULT_MAJOR_VERSION}" STREQUAL "")
     set(QT_DEFAULT_MAJOR_VERSION 5)
 endif()
 
diff --git a/src/xmpp/CMakeLists.txt b/src/xmpp/CMakeLists.txt
index 1472522d..aaf3999e 100644
--- a/src/xmpp/CMakeLists.txt
+++ b/src/xmpp/CMakeLists.txt
@@ -96,9 +96,6 @@ set(XMPP_HEADERS_PRIVATE
     zlib/zlibcompressor.h
     zlib/zlibdecompressor.h
     blake2/blake2qt.h
-
-    base/randomnumbergenerator.h
-    base/randrandomnumbergenerator.h
     base/timezone.h
 )
 
@@ -152,7 +149,6 @@ target_sources(iris PRIVATE
     xmpp-im/jingle-ibb.cpp
     xmpp-im/jingle-file.cpp
 
-    base/randomnumbergenerator.cpp
     base/timezone.cpp
 
     zlib/zlibcompressor.cpp
diff --git a/src/xmpp/base/randomnumbergenerator.cpp b/src/xmpp/base/randomnumbergenerator.cpp
deleted file mode 100644
index 224d010c..00000000
--- a/src/xmpp/base/randomnumbergenerator.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2008  Remko Troncon
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-#include "xmpp/base/randomnumbergenerator.h"
-
-#include <cassert>
-
-namespace XMPP {
-RandomNumberGenerator::~RandomNumberGenerator() { }
-
-double RandomNumberGenerator::generateNumberBetween(double a, double b) const
-{
-    assert(b > a);
-    return a + (generateNumber() / getMaximumGeneratedNumber()) * (b - a);
-}
-} // namespace XMPP
diff --git a/src/xmpp/base/randomnumbergenerator.h b/src/xmpp/base/randomnumbergenerator.h
deleted file mode 100644
index a6e5f537..00000000
--- a/src/xmpp/base/randomnumbergenerator.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2008  Remko Troncon
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef RANDOMNUMBERGENERATOR_H
-#define RANDOMNUMBERGENERATOR_H
-
-namespace XMPP {
-
-class [[deprecated]] RandomNumberGenerator {
-public:
-    virtual ~RandomNumberGenerator();
-
-    double generateNumberBetween(double a, double b) const;
-
-protected:
-    virtual double generateNumber() const            = 0;
-    virtual double getMaximumGeneratedNumber() const = 0;
-};
-} // namespace XMPP
-
-#endif // RANDOMNUMBERGENERATOR_H
diff --git a/src/xmpp/base/randrandomnumbergenerator.h b/src/xmpp/base/randrandomnumbergenerator.h
deleted file mode 100644
index 224bc277..00000000
--- a/src/xmpp/base/randrandomnumbergenerator.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2008  Remko Troncon
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef RANDRANDOMNUMBERGENERATOR_H
-#define RANDRANDOMNUMBERGENERATOR_H
-
-#include "xmpp/base/randomnumbergenerator.h"
-
-#include <cstdlib>
-
-namespace XMPP {
-class [[deprecated]] RandRandomNumberGenerator : public RandomNumberGenerator {
-public:
-    RandRandomNumberGenerator() { }
-
-    virtual double generateNumber() const { return rand(); }
-
-    virtual double getMaximumGeneratedNumber() const { return RAND_MAX; }
-};
-} // namespace XMPP
-
-#endif // RANDRANDOMNUMBERGENERATOR_H
diff --git a/src/xmpp/base/unittest/incrementingrandomnumbergenerator.h b/src/xmpp/base/unittest/incrementingrandomnumbergenerator.h
deleted file mode 100644
index cde964f2..00000000
--- a/src/xmpp/base/unittest/incrementingrandomnumbergenerator.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2008  Remko Troncon
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef INCREMENTINGRANDOMNUMBERGENERATOR_H
-#define INCREMENTINGRANDOMNUMBERGENERATOR_H
-
-#include "xmpp/base/randomnumbergenerator.h"
-
-#include <QtDebug>
-
-namespace XMPP {
-class IncrementingRandomNumberGenerator : public RandomNumberGenerator {
-public:
-    IncrementingRandomNumberGenerator(int maximumNumber = 10) :
-        maximumNumber_(maximumNumber), currentNumber_(maximumNumber_)
-    {
-    }
-
-    virtual double generateNumber() const
-    {
-        currentNumber_ = (currentNumber_ + 1) % (maximumNumber_ + 1);
-        return currentNumber_;
-    }
-
-    virtual double getMaximumGeneratedNumber() const { return maximumNumber_; }
-
-private:
-    int         maximumNumber_;
-    mutable int currentNumber_;
-};
-} // namespace XMPP
-
-#endif // INCREMENTINGRANDOMNUMBERGENERATOR_H
diff --git a/src/xmpp/base/unittest/randomnumbergeneratortest.cpp b/src/xmpp/base/unittest/randomnumbergeneratortest.cpp
deleted file mode 100644
index 48a99fbe..00000000
--- a/src/xmpp/base/unittest/randomnumbergeneratortest.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2008  Remko Troncon
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-#include "xmpp/base/randomnumbergenerator.h"
-#include "qttestutil/qttestutil.h"
-
-#include <QObject>
-#include <QtTest/QtTest>
-
-using namespace XMPP;
-
-class RandomNumberGeneratorTest : public QObject {
-    Q_OBJECT
-
-private:
-    class DummyRandomNumberGenerator : public RandomNumberGenerator {
-    public:
-        DummyRandomNumberGenerator(double value, double maximum) : value_(value), maximum_(maximum) { }
-
-        double generateNumber() const { return value_; }
-        double getMaximumGeneratedNumber() const { return maximum_; }
-
-    private:
-        double value_;
-        double maximum_;
-    };
-
-private slots:
-    void testGenerateNumberBetween()
-    {
-        DummyRandomNumberGenerator testling(5, 10);
-        QCOMPARE(75.0, testling.generateNumberBetween(50.0, 100.0));
-    }
-
-    void testGenerateNumberBetween_Minimum()
-    {
-        DummyRandomNumberGenerator testling(0, 10);
-        QCOMPARE(0.0, testling.generateNumberBetween(0.0, 100.0));
-    }
-
-    void testGenerateNumberBetween_Maximum()
-    {
-        DummyRandomNumberGenerator testling(10, 10);
-        QCOMPARE(100.0, testling.generateNumberBetween(0.0, 100.0));
-    }
-};
-
-QTTESTUTIL_REGISTER_TEST(RandomNumberGeneratorTest);
-#include "randomnumbergeneratortest.moc"
diff --git a/src/xmpp/base/unittest/randrandomnumbergeneratortest.cpp b/src/xmpp/base/unittest/randrandomnumbergeneratortest.cpp
deleted file mode 100644
index 58ef5dbc..00000000
--- a/src/xmpp/base/unittest/randrandomnumbergeneratortest.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2008  Remko Troncon
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-#include "xmpp/base/randrandomnumbergenerator.h"
-#include "qttestutil/qttestutil.h"
-
-#include <QObject>
-#include <QtTest/QtTest>
-
-using namespace XMPP;
-
-class RandRandomNumberGeneratorTest : public QObject {
-    Q_OBJECT
-
-private slots:
-    void testGenerateNumber()
-    {
-        RandRandomNumberGenerator testling;
-
-        double a = testling.generateNumberBetween(0.0, 100.0);
-        double b = testling.generateNumberBetween(0.0, 100.0);
-
-        QVERIFY(a != b);
-    }
-};
-
-QTTESTUTIL_REGISTER_TEST(RandRandomNumberGeneratorTest);
-#include "randrandomnumbergeneratortest.moc"
diff --git a/src/xmpp/sasl/digestmd5response.cpp b/src/xmpp/sasl/digestmd5response.cpp
index 4a89476d..44b39f6f 100644
--- a/src/xmpp/sasl/digestmd5response.cpp
+++ b/src/xmpp/sasl/digestmd5response.cpp
@@ -18,17 +18,17 @@
 
 #include "xmpp/sasl/digestmd5response.h"
 
-#include "xmpp/base/randomnumbergenerator.h"
 #include "xmpp/sasl/digestmd5proplist.h"
 
 #include <QByteArray>
+#include <QRandomGenerator>
 #include <QtCrypto>
 #include <QtDebug>
 
 namespace XMPP {
 DIGESTMD5Response::DIGESTMD5Response(const QByteArray &challenge, const QString &service, const QString &host,
                                      const QString &arealm, const QString &user, const QString &authz,
-                                     const QByteArray &password, const RandomNumberGenerator &rand) : isValid_(true)
+                                     const QByteArray &password) : isValid_(true)
 {
     QString realm = arealm;
 
@@ -44,7 +44,7 @@ DIGESTMD5Response::DIGESTMD5Response(const QByteArray &challenge, const QString
     QByteArray a;
     a.resize(32);
     for (int n = 0; n < (int)a.size(); ++n) {
-        a[n] = (char)rand.generateNumberBetween(0, 255);
+        a[n] = (char)QRandomGenerator::global()->bounded(0, 256);
     }
     QByteArray cnonce = a.toBase64();
 
diff --git a/src/xmpp/sasl/digestmd5response.h b/src/xmpp/sasl/digestmd5response.h
index 26ca8e20..0f5d05d0 100644
--- a/src/xmpp/sasl/digestmd5response.h
+++ b/src/xmpp/sasl/digestmd5response.h
@@ -23,13 +23,11 @@
 #include <QString>
 
 namespace XMPP {
-class RandomNumberGenerator;
 
 class DIGESTMD5Response {
 public:
     DIGESTMD5Response(const QByteArray &challenge, const QString &service, const QString &host, const QString &realm,
-                      const QString &user, const QString &authz, const QByteArray &password,
-                      const RandomNumberGenerator &rand);
+                      const QString &user, const QString &authz, const QByteArray &password);
 
     const QByteArray &getValue() const { return value_; }
 
diff --git a/src/xmpp/sasl/scramsha1message.cpp b/src/xmpp/sasl/scramsha1message.cpp
index 60f51220..023d0986 100644
--- a/src/xmpp/sasl/scramsha1message.cpp
+++ b/src/xmpp/sasl/scramsha1message.cpp
@@ -18,10 +18,10 @@
 
 #include "xmpp/sasl/scramsha1message.h"
 
-#include "xmpp/base/randomnumbergenerator.h"
 #include "xmpp/jid/jid.h"
 
 #include <QDebug>
+#include <QRandomGenerator>
 #include <QString>
 #include <QTextStream>
 #include <QtCrypto>
@@ -40,8 +40,8 @@ bool Normalize(const QString &username_in, QString &username_out)
     }
 }
 
-SCRAMSHA1Message::SCRAMSHA1Message(const QString &authzid, const QString &authcid, const QByteArray &cnonce,
-                                   const RandomNumberGenerator &rand) : isValid_(true)
+SCRAMSHA1Message::SCRAMSHA1Message(const QString &authzid, const QString &authcid, const QByteArray &cnonce) :
+    isValid_(true)
 {
     QString    result;
     QByteArray clientnonce;
@@ -57,7 +57,7 @@ SCRAMSHA1Message::SCRAMSHA1Message(const QString &authzid, const QString &authci
         QByteArray a;
         a.resize(32);
         for (int n = 0; n < (int)a.size(); ++n) {
-            a[n] = (char)rand.generateNumberBetween(0, 255);
+            a[n] = (char)QRandomGenerator::global()->bounded(0, 256);
         }
         clientnonce = a.toBase64();
     } else
diff --git a/src/xmpp/sasl/scramsha1message.h b/src/xmpp/sasl/scramsha1message.h
index 98d7bbf6..d3260dcf 100644
--- a/src/xmpp/sasl/scramsha1message.h
+++ b/src/xmpp/sasl/scramsha1message.h
@@ -19,16 +19,13 @@
 #ifndef SCRAMSHA1MESSAGE_H
 #define SCRAMSHA1MESSAGE_H
 
-#include "xmpp/base/randomnumbergenerator.h"
-
 #include <QByteArray>
 #include <QString>
 
 namespace XMPP {
 class SCRAMSHA1Message {
 public:
-    SCRAMSHA1Message(const QString &authzid, const QString &authcid, const QByteArray &cnonce,
-                     const RandomNumberGenerator &rand);
+    SCRAMSHA1Message(const QString &authzid, const QString &authcid, const QByteArray &cnonce);
 
     const QByteArray &getValue() { return value_; }
 
diff --git a/src/xmpp/sasl/scramsha1response.cpp b/src/xmpp/sasl/scramsha1response.cpp
index 62b2ee13..22f92a31 100644
--- a/src/xmpp/sasl/scramsha1response.cpp
+++ b/src/xmpp/sasl/scramsha1response.cpp
@@ -18,7 +18,6 @@
 
 #include "xmpp/sasl/scramsha1response.h"
 
-#include "xmpp/base/randomnumbergenerator.h"
 #include "xmpp/jid/jid.h"
 
 #include <QByteArray>
@@ -36,8 +35,7 @@ QCA::SecureArray HMAC_SHA_1(const QCA::SecureArray &key, const QCA::SecureArray
 }
 
 SCRAMSHA1Response::SCRAMSHA1Response(const QByteArray &server_first_message, const QByteArray &password_in,
-                                     const QByteArray &client_first_message, const QString &salted_password_base64,
-                                     const RandomNumberGenerator &rand)
+                                     const QByteArray &client_first_message, const QString &salted_password_base64)
 {
     Q_UNUSED(rand);
     QString pass_in = QString::fromUtf8(password_in);
diff --git a/src/xmpp/sasl/scramsha1response.h b/src/xmpp/sasl/scramsha1response.h
index e4cb723f..c791c14a 100644
--- a/src/xmpp/sasl/scramsha1response.h
+++ b/src/xmpp/sasl/scramsha1response.h
@@ -24,13 +24,11 @@
 #include <QtCrypto>
 
 namespace XMPP {
-class RandomNumberGenerator;
 
 class SCRAMSHA1Response {
 public:
     SCRAMSHA1Response(const QByteArray &server_first_message, const QByteArray &password,
-                      const QByteArray &client_first_message, const QString &salted_password_base64,
-                      const RandomNumberGenerator &rand);
+                      const QByteArray &client_first_message, const QString &salted_password_base64);
 
     const QByteArray &getValue() const { return value_; }
 
diff --git a/src/xmpp/sasl/unittest/digestmd5responsetest.cpp b/src/xmpp/sasl/unittest/digestmd5responsetest.cpp
index 0224263d..af731af6 100644
--- a/src/xmpp/sasl/unittest/digestmd5responsetest.cpp
+++ b/src/xmpp/sasl/unittest/digestmd5responsetest.cpp
@@ -18,12 +18,13 @@
 
 #include "xmpp/sasl/digestmd5response.h"
 #include "qttestutil/qttestutil.h"
-#include "xmpp/base/unittest/incrementingrandomnumbergenerator.h"
 
 #include <QObject>
 #include <QtCrypto>
 #include <QtTest/QtTest>
 
+// TODO fix test adfter random generator removal
+
 using namespace XMPP;
 
 class DIGESTMD5ResponseTest : public QObject {
@@ -35,8 +36,7 @@ private slots:
         DIGESTMD5Response response("realm=\"example.com\","
                                    "nonce=\"O6skKPuaCZEny3hteI19qXMBXSadoWs840MchORo\","
                                    "qop=\"auth\",charset=\"utf-8\",algorithm=\"md5-sess\"",
-                                   "xmpp", "jabber.example.com", "example.com", "myuser", "myuser_authz", "mypass",
-                                   IncrementingRandomNumberGenerator(255));
+                                   "xmpp", "jabber.example.com", "example.com", "myuser", "myuser_authz", "mypass");
         QByteArray        expectedValue("username=\"myuser\",realm=\"example.com\","
                                                "nonce=\"O6skKPuaCZEny3hteI19qXMBXSadoWs840MchORo\","
                                                "cnonce=\"AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8=\","
@@ -54,8 +54,7 @@ private slots:
         DIGESTMD5Response response("realm=\"example.com\","
                                    "nonce=\"O6skKPuaCZEny3hteI19qXMBXSadoWs840MchORo\","
                                    "qop=\"auth\",charset=\"utf-8\",algorithm=\"md5-sess\"",
-                                   "xmpp", "jabber.example.com", "example.com", "myuser", "", "mypass",
-                                   IncrementingRandomNumberGenerator(255));
+                                   "xmpp", "jabber.example.com", "example.com", "myuser", "", "mypass");
         QByteArray        expectedValue("username=\"myuser\",realm=\"example.com\","
                                                "nonce=\"O6skKPuaCZEny3hteI19qXMBXSadoWs840MchORo\","
                                                "cnonce=\"AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8=\","
diff --git a/src/xmpp/sasl/unittest/scramsha1messagetest.cpp b/src/xmpp/sasl/unittest/scramsha1messagetest.cpp
index 9df7ca99..26582c73 100644
--- a/src/xmpp/sasl/unittest/scramsha1messagetest.cpp
+++ b/src/xmpp/sasl/unittest/scramsha1messagetest.cpp
@@ -18,12 +18,13 @@
 
 #include "xmpp/sasl/scramsha1message.h"
 #include "qttestutil/qttestutil.h"
-#include "xmpp/base/unittest/incrementingrandomnumbergenerator.h"
 
 #include <QObject>
 #include <QtCrypto>
 #include <QtTest/QtTest>
 
+// TODO fix test adfter random generator removal
+
 using namespace XMPP;
 
 class SCRAMSHA1MessageTest : public QObject {
@@ -34,12 +35,12 @@ private slots:
 
     void testConstructor_WithoutAuthzid()
     {
-        SCRAMSHA1Message msg1("", "testuser", QByteArray(0, ' '), IncrementingRandomNumberGenerator(255));
+        SCRAMSHA1Message msg1("", "testuser", QByteArray(0, ' '));
         QByteArray       msg1_good("n,,n=testuser,r=AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8=");
         QVERIFY(msg1.isValid());
         QCOMPARE(msg1.getValue(), msg1_good);
 
-        SCRAMSHA1Message msg2("", "username=test,man", QByteArray(0, ' '), IncrementingRandomNumberGenerator(255));
+        SCRAMSHA1Message msg2("", "username=test,man", QByteArray(0, ' '));
         QByteArray       msg2_good("n,,n=username=3Dtest=2Cman,r=AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8=");
         QVERIFY(msg2.isValid());
         QCOMPARE(msg2.getValue(), msg2_good);
diff --git a/src/xmpp/sasl/unittest/scramsha1responsetest.cpp b/src/xmpp/sasl/unittest/scramsha1responsetest.cpp
index 96b232dd..7835fb52 100644
--- a/src/xmpp/sasl/unittest/scramsha1responsetest.cpp
+++ b/src/xmpp/sasl/unittest/scramsha1responsetest.cpp
@@ -18,13 +18,14 @@
 
 #include "xmpp/sasl/scramsha1response.h"
 #include "qttestutil/qttestutil.h"
-#include "xmpp/base/unittest/incrementingrandomnumbergenerator.h"
 #include "xmpp/sasl/scramsha1signature.h"
 
 #include <QObject>
 #include <QtCrypto>
 #include <QtTest/QtTest>
 
+// TODO fix test adfter random generator removal
+
 using namespace XMPP;
 
 class SCRAMSHA1ResponseTest : public QObject {
@@ -37,7 +38,7 @@ private slots:
     {
         if (QCA::isSupported("hmac(sha1)")) {
             SCRAMSHA1Response resp1("r=fyko+d2lbbFgONRv9qkxdawL3rfcNHYJY1ZVvWVs7j,s=QSXCR+Q6sek8bf92,i=4096", "pencil",
-                                    "n,,n=user,r=fyko+d2lbbFgONRv9qkxdawL", "", IncrementingRandomNumberGenerator(255));
+                                    "n,,n=user,r=fyko+d2lbbFgONRv9qkxdawL", "");
             const QCA::SecureArray sig = resp1.getServerSignature();
             QByteArray             resp_sig("v=rmF9pqV8S7suAoZWja4dJRkFsKQ=");
             SCRAMSHA1Signature     sig1(resp_sig, sig);
diff --git a/src/xmpp/xmpp-core/simplesasl.cpp b/src/xmpp/xmpp-core/simplesasl.cpp
index 3b45144e..c61f7bca 100644
--- a/src/xmpp/xmpp-core/simplesasl.cpp
+++ b/src/xmpp/xmpp-core/simplesasl.cpp
@@ -19,7 +19,6 @@
 
 #include "simplesasl.h"
 
-#include "xmpp/base/randrandomnumbergenerator.h"
 #include "xmpp/sasl/digestmd5response.h"
 #include "xmpp/sasl/plainmessage.h"
 #include "xmpp/sasl/scramsha1message.h"
@@ -28,13 +27,12 @@
 
 #include <QByteArray>
 #include <QDebug>
+#include <QHostAddress>
 #include <QList>
 #include <QObject>
+#include <QStringList>
 #include <QtCrypto>
 #include <qca.h>
-#include <qhostaddress.h>
-#include <qstringlist.h>
-#include <stdlib.h>
 
 namespace XMPP {
 class SimpleSASLContext : public QCA::SASLContext {
@@ -202,7 +200,7 @@ class SimpleSASLContext : public QCA::SASLContext {
                 out_buf = PLAINMessage(authz, user, pass.toByteArray()).getValue();
             } else if (out_mech == "SCRAM-SHA-1") {
                 // send client-first-message
-                SCRAMSHA1Message msg(authz, user, QByteArray(0, ' '), RandRandomNumberGenerator());
+                SCRAMSHA1Message msg(authz, user, QByteArray(0, ' '));
                 if (msg.isValid()) {
                     out_buf              = msg.getValue();
                     client_first_message = out_buf;
@@ -239,8 +237,7 @@ class SimpleSASLContext : public QCA::SASLContext {
                     goto ready;
                 }
 
-                DIGESTMD5Response response(in_buf, service, host, realm, user, authz, pass.toByteArray(),
-                                           RandRandomNumberGenerator());
+                DIGESTMD5Response response(in_buf, service, host, realm, user, authz, pass.toByteArray());
                 if (!response.isValid()) {
                     authCondition_ = QCA::SASL::BadProtocol;
                     result_        = Error;
@@ -274,8 +271,7 @@ class SimpleSASLContext : public QCA::SASLContext {
                 if (prop.isValid()) {
                     salted_password_base64 = prop.toString();
                 }
-                SCRAMSHA1Response response(in_buf, pass.toByteArray(), client_first_message, salted_password_base64,
-                                           RandRandomNumberGenerator());
+                SCRAMSHA1Response response(in_buf, pass.toByteArray(), client_first_message, salted_password_base64);
                 if (!response.isValid()) {
                     authCondition_ = QCA::SASL::BadProtocol;
                     result_        = Error;

From 99d930be0c63b9c9e079f902d04268b030689ed0 Mon Sep 17 00:00:00 2001
From: Sergei Ilinykh <rion4ik@gmail.com>
Date: Fri, 15 Mar 2024 16:50:26 +0300
Subject: [PATCH 370/383] Added a few missed consts

---
 src/irisnet/corelib/netnames.cpp | 2 +-
 src/irisnet/corelib/netnames.h   | 2 +-
 src/xmpp/xmpp-im/types.cpp       | 2 +-
 src/xmpp/xmpp-im/xmpp_features.h | 2 +-
 src/xmpp/xmpp-im/xmpp_muc.h      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/irisnet/corelib/netnames.cpp b/src/irisnet/corelib/netnames.cpp
index ed6b23b1..64be6fbe 100644
--- a/src/irisnet/corelib/netnames.cpp
+++ b/src/irisnet/corelib/netnames.cpp
@@ -75,7 +75,7 @@ NameRecord &NameRecord::operator=(const NameRecord &from)
     return *this;
 }
 
-bool NameRecord::operator==(const NameRecord &o)
+bool NameRecord::operator==(const NameRecord &o) const
 {
     if (isNull() != o.isNull() || owner() != o.owner() || ttl() != o.ttl() || type() != o.type()) {
         return false;
diff --git a/src/irisnet/corelib/netnames.h b/src/irisnet/corelib/netnames.h
index 69ff18d9..81767f63 100644
--- a/src/irisnet/corelib/netnames.h
+++ b/src/irisnet/corelib/netnames.h
@@ -148,7 +148,7 @@ class IRISNET_EXPORT NameRecord {
     /**
        \brief Compares \a other with this object
     */
-    bool operator==(const NameRecord &other);
+    bool operator==(const NameRecord &other) const;
 
     /**
        \brief Returns true if this record object is null, otherwise returns false
diff --git a/src/xmpp/xmpp-im/types.cpp b/src/xmpp/xmpp-im/types.cpp
index 509109a2..c7d88027 100644
--- a/src/xmpp/xmpp-im/types.cpp
+++ b/src/xmpp/xmpp-im/types.cpp
@@ -448,7 +448,7 @@ QDomElement MUCItem::toXml(QDomDocument &d)
     return e;
 }
 
-bool MUCItem::operator==(const MUCItem &o)
+bool MUCItem::operator==(const MUCItem &o) const
 {
     return !nick_.compare(o.nick_) && ((!jid_.isValid() && !o.jid_.isValid()) || jid_.compare(o.jid_, true))
         && ((!actor_.isValid() && !o.actor_.isValid()) || actor_.compare(o.actor_, true))
diff --git a/src/xmpp/xmpp-im/xmpp_features.h b/src/xmpp/xmpp-im/xmpp_features.h
index 00c0b2b4..6b7f3885 100644
--- a/src/xmpp/xmpp-im/xmpp_features.h
+++ b/src/xmpp/xmpp-im/xmpp_features.h
@@ -104,7 +104,7 @@ class Features {
     static QString feature(long id);
 
     Features   &operator<<(const QString &feature);
-    inline bool operator==(const Features &other) { return _list == other._list; }
+    inline bool operator==(const Features &other) const { return _list == other._list; }
     Features   &operator+=(const Features &other)
     {
         _list += other._list;
diff --git a/src/xmpp/xmpp-im/xmpp_muc.h b/src/xmpp/xmpp-im/xmpp_muc.h
index 8ef80658..d5e36f83 100644
--- a/src/xmpp/xmpp-im/xmpp_muc.h
+++ b/src/xmpp/xmpp-im/xmpp_muc.h
@@ -51,7 +51,7 @@ class MUCItem {
     void        fromXml(const QDomElement &);
     QDomElement toXml(QDomDocument &);
 
-    bool operator==(const MUCItem &o);
+    bool operator==(const MUCItem &o) const;
 
 private:
     QString     nick_;

From 8fdf6880838fb9a847326b8ffcefe4248a985a22 Mon Sep 17 00:00:00 2001
From: Sergei Ilinykh <rion4ik@gmail.com>
Date: Sat, 16 Mar 2024 16:36:39 +0300
Subject: [PATCH 371/383] Qt6 cmake fixes

---
 cmake/modules/FindQca.cmake | 10 +++++-----
 cmake/modules/IrisQCA.cmake |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cmake/modules/FindQca.cmake b/cmake/modules/FindQca.cmake
index 96ea7d40..55ac4932 100644
--- a/cmake/modules/FindQca.cmake
+++ b/cmake/modules/FindQca.cmake
@@ -34,11 +34,11 @@ if (Qca_INCLUDE_DIR AND Qca_LIBRARY)
 endif()
 
 set(EXTRA_PATH_SUFFIXES
-    qt5/Qca-qt5/QtCrypto
-    Qca-qt5/QtCrypto
+    qt5/Qca-qt${QT_DEFAULT_MAJOR_VERSION}/QtCrypto
+    Qca-qt${QT_DEFAULT_MAJOR_VERSION}/QtCrypto
     qt5/QtCrypto
-    qt/Qca-qt5/QtCrypto
-    lib/qca-qt5.framework/Versions/2/Headers
+    qt/Qca-qt${QT_DEFAULT_MAJOR_VERSION}/QtCrypto
+    lib/qca-qt${QT_DEFAULT_MAJOR_VERSION}.framework/Versions/2/Headers
 )
 
 find_path(
@@ -52,7 +52,7 @@ find_path(
 
 find_library(
     Qca_LIBRARY
-    NAMES qca-qt5${D}
+    NAMES qca-qt${QT_DEFAULT_MAJOR_VERSION}${D}
     HINTS
     ${QCA_DIR}/lib
     ${QCA_DIR}/bin
diff --git a/cmake/modules/IrisQCA.cmake b/cmake/modules/IrisQCA.cmake
index 423dea32..e43b80fd 100644
--- a/cmake/modules/IrisQCA.cmake
+++ b/cmake/modules/IrisQCA.cmake
@@ -13,8 +13,8 @@ if(IRIS_BUNDLED_QCA)
     else()
         list(APPEND Qca_INCLUDE_DIR ${QCA_SOURCE_DIR}/include/QtCrypto)
     endif()
-    set(Qca_CORE_LIB ${QCA_BUILD_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}qca-qt5${D}${CMAKE_STATIC_LIBRARY_SUFFIX})
-    set(Qca_OSSL_LIB ${QCA_BUILD_DIR}/lib/qca-qt5/crypto/${CMAKE_STATIC_LIBRARY_PREFIX}qca-ossl${D}${CMAKE_STATIC_LIBRARY_SUFFIX})
+    set(Qca_CORE_LIB ${QCA_BUILD_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}qca-qt${QT_DEFAULT_MAJOR_VERSION}${D}${CMAKE_STATIC_LIBRARY_SUFFIX})
+    set(Qca_OSSL_LIB ${QCA_BUILD_DIR}/lib/qca-qt${QT_DEFAULT_MAJOR_VERSION}/crypto/${CMAKE_STATIC_LIBRARY_PREFIX}qca-ossl${D}${CMAKE_STATIC_LIBRARY_SUFFIX})
     set(Qca_LIBRARY ${Qca_OSSL_LIB} ${Qca_CORE_LIB})
     if(APPLE)
         set(COREFOUNDATION_LIBRARY "-framework CoreFoundation")

From 126cdb5651fb0cad7edf61ad4af311e186cb2c3e Mon Sep 17 00:00:00 2001
From: Sergei Ilinykh <rion4ik@gmail.com>
Date: Sat, 16 Mar 2024 18:50:20 +0300
Subject: [PATCH 372/383] Fixed regressions

---
 src/irisnet/noncore/cutestuff/bsocket.cpp | 13 ++++++-------
 src/xmpp/xmpp-core/tlshandler.cpp         |  5 ++---
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/irisnet/noncore/cutestuff/bsocket.cpp b/src/irisnet/noncore/cutestuff/bsocket.cpp
index 2c487c28..3f677077 100644
--- a/src/irisnet/noncore/cutestuff/bsocket.cpp
+++ b/src/irisnet/noncore/cutestuff/bsocket.cpp
@@ -43,13 +43,12 @@ class QTcpSocketSignalRelay : public QObject {
     QTcpSocketSignalRelay(QTcpSocket *sock, QObject *parent = nullptr) : QObject(parent)
     {
         qRegisterMetaType<QAbstractSocket::SocketError>("QAbstractSocket::SocketError");
-        connect(sock, SIGNAL(hostFound()), SLOT(sock_hostFound()), Qt::QueuedConnection);
-        connect(sock, SIGNAL(connected()), SLOT(sock_connected()), Qt::QueuedConnection);
-        connect(sock, SIGNAL(disconnected()), SLOT(sock_disconnected()), Qt::QueuedConnection);
-        connect(sock, SIGNAL(readyRead()), SLOT(sock_readyRead()), Qt::QueuedConnection);
-        connect(sock, SIGNAL(bytesWritten(qint64)), SLOT(sock_bytesWritten(qint64)), Qt::QueuedConnection);
-        connect(sock, SIGNAL(error(QAbstractSocket::SocketError)), SLOT(sock_error(QAbstractSocket::SocketError)),
-                Qt::QueuedConnection);
+        connect(sock, &QTcpSocket::hostFound, this, &QTcpSocketSignalRelay::sock_hostFound, Qt::QueuedConnection);
+        connect(sock, &QTcpSocket::connected, this, &QTcpSocketSignalRelay::sock_connected, Qt::QueuedConnection);
+        connect(sock, &QTcpSocket::disconnected, this, &QTcpSocketSignalRelay::sock_disconnected, Qt::QueuedConnection);
+        connect(sock, &QTcpSocket::readyRead, this, &QTcpSocketSignalRelay::sock_readyRead, Qt::QueuedConnection);
+        connect(sock, &QTcpSocket::bytesWritten, this, &QTcpSocketSignalRelay::sock_bytesWritten, Qt::QueuedConnection);
+        connect(sock, &QTcpSocket::errorOccurred, this, &QTcpSocketSignalRelay::sock_error, Qt::QueuedConnection);
     }
 
 signals:
diff --git a/src/xmpp/xmpp-core/tlshandler.cpp b/src/xmpp/xmpp-core/tlshandler.cpp
index 366f9023..807afe6d 100644
--- a/src/xmpp/xmpp-core/tlshandler.cpp
+++ b/src/xmpp/xmpp-core/tlshandler.cpp
@@ -195,9 +195,8 @@ static bool cert_match_domain(const QString &certname, const QString &acedomain)
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
         if (!QRegExp(p1, Qt::CaseSensitive, QRegExp::Wildcard).exactMatch(p2))
 #else
-        if (!QRegularExpression::fromWildcard(QLatin1Char('^') + p1 + QLatin1Char('$'), Qt::CaseSensitive)
-                 .match(p2)
-                 .hasMatch())
+        // note, wildcards a by default anchored. so exact match
+        if (!QRegularExpression::fromWildcard(p1, Qt::CaseSensitive).match(p2).hasMatch())
 #endif
             return false;
     }

From 09dd48f24094165eb317563f69e56410d0bb86f3 Mon Sep 17 00:00:00 2001
From: Sergei Ilinykh <rion4ik@gmail.com>
Date: Mon, 18 Mar 2024 02:15:43 +0300
Subject: [PATCH 373/383] Fixed deprecation warnings

---
 3rdparty/stringprep/stringprep.cpp         |  8 +++++---
 src/irisnet/corelib/objectsession.cpp      | 12 ++++++++++++
 src/irisnet/noncore/cutestuff/httppoll.cpp |  2 +-
 src/irisnet/noncore/ice176.cpp             |  6 +++---
 src/irisnet/noncore/stunbinding.cpp        | 20 ++++++++++----------
 src/irisnet/noncore/stuntypes.cpp          |  2 +-
 src/irisnet/noncore/tcpportreserver.h      |  2 +-
 src/xmpp/jid/jid.cpp                       |  4 ++--
 src/xmpp/jid/jid.h                         |  5 ++---
 src/xmpp/xmpp-im/jingle-application.h      |  6 +++---
 src/xmpp/xmpp-im/jingle-ft.h               |  2 +-
 src/xmpp/xmpp-im/jingle-ibb.h              |  4 ++--
 src/xmpp/xmpp-im/jingle-ice.cpp            | 11 ++++-------
 src/xmpp/xmpp-im/jingle-ice.h              |  4 ++--
 src/xmpp/xmpp-im/jingle-s5b.h              |  4 ++--
 src/xmpp/xmpp-im/jingle-sctp.h             |  3 +--
 src/xmpp/xmpp-im/jingle-session.cpp        |  8 ++++----
 src/xmpp/xmpp-im/jingle-session.h          |  2 +-
 src/xmpp/xmpp-im/jingle.cpp                |  6 +++---
 src/xmpp/xmpp-im/jingle.h                  |  2 +-
 src/xmpp/xmpp-im/s5b.cpp                   |  2 +-
 src/xmpp/xmpp-im/s5b.h                     |  2 +-
 src/xmpp/xmpp-im/xmpp_hash.cpp             |  2 +-
 src/xmpp/xmpp-im/xmpp_xmlcommon.cpp        |  4 ++++
 24 files changed, 68 insertions(+), 55 deletions(-)

diff --git a/3rdparty/stringprep/stringprep.cpp b/3rdparty/stringprep/stringprep.cpp
index f5793f69..d7f581ba 100644
--- a/3rdparty/stringprep/stringprep.cpp
+++ b/3rdparty/stringprep/stringprep.cpp
@@ -101,7 +101,7 @@ static int stringprep_apply_table_to_string(QVector<uint> &ucs4, const Stringpre
 {
     std::ptrdiff_t pos;
     size_t         i, maplen;
-    uint32_t *     src    = ucs4.data(); /* points to unprocessed data */
+    uint32_t      *src    = ucs4.data(); /* points to unprocessed data */
     size_t         srclen = ucs4.size(); /* length of unprocessed data */
 
     while ((pos = stringprep_find_string_in_table(src, srclen, &i, table, table_size)) != -1) {
@@ -177,7 +177,8 @@ int stringprep_4i(QString &input, Stringprep_profile_flags flags, const Stringpr
                 /* Profile requires NFKC, but callee asked for no NFKC. */
                 return STRINGPREP_FLAG_ERROR;
 
-            ucs4vector = QString::fromUcs4(ucs4vector.data(), ucs4vector.length())
+            static_assert(sizeof(char32_t) == sizeof(uint));
+            ucs4vector = QString::fromUcs4(reinterpret_cast<char32_t *>(ucs4vector.data()), ucs4vector.length())
                              .normalized(QString::NormalizationForm_KC)
                              .toUcs4();
             break;
@@ -264,7 +265,8 @@ int stringprep_4i(QString &input, Stringprep_profile_flags flags, const Stringpr
         }
     }
 
-    input = QString::fromUcs4(ucs4vector.data(), ucs4vector.size());
+    static_assert(sizeof(char32_t) == sizeof(uint));
+    input = QString::fromUcs4(reinterpret_cast<char32_t *>(ucs4vector.data()), ucs4vector.size());
 
     return STRINGPREP_OK;
 }
diff --git a/src/irisnet/corelib/objectsession.cpp b/src/irisnet/corelib/objectsession.cpp
index b3ee2d30..ade6f717 100644
--- a/src/irisnet/corelib/objectsession.cpp
+++ b/src/irisnet/corelib/objectsession.cpp
@@ -55,7 +55,11 @@ class ObjectSessionPrivate : public QObject {
         void clearArgs()
         {
             for (int n = 0; n < args.count(); ++n)
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
                 QMetaType::destroy(args[n].type, args[n].data);
+#else
+                QMetaType(args[n].type).destroy(args[n].data);
+#endif
             args.clear();
         }
 
@@ -78,7 +82,11 @@ class ObjectSessionPrivate : public QObject {
                     break;
 
                 Argument arg;
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
                 arg.type = QMetaType::type(arg_name[n]);
+#else
+                arg.type = QMetaType::fromName(arg_name[n]).id();
+#endif
                 if (!arg.type) {
                     clearArgs();
                     return false;
@@ -149,7 +157,11 @@ private slots:
 
         QGenericArgument arg[10];
         for (int n = 0; n < call->args.count(); ++n)
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
             arg[n] = QGenericArgument(QMetaType::typeName(call->args[n].type), call->args[n].data);
+#else
+            arg[n] = QGenericArgument(QMetaType(call->args[n].type).name(), call->args[n].data);
+#endif
 
         bool ok;
         ok = QMetaObject::invokeMethod(call->obj, call->method.data(), Qt::DirectConnection, arg[0], arg[1], arg[2],
diff --git a/src/irisnet/noncore/cutestuff/httppoll.cpp b/src/irisnet/noncore/cutestuff/httppoll.cpp
index 54ecffff..1abdbccc 100644
--- a/src/irisnet/noncore/cutestuff/httppoll.cpp
+++ b/src/irisnet/noncore/cutestuff/httppoll.cpp
@@ -848,7 +848,7 @@ void HttpProxyGetStream::sock_readyRead()
 
 void HttpProxyGetStream::processData(const QByteArray &block)
 {
-    printf("processData: %d bytes\n", block.size());
+    printf("processData: %lld bytes\n", block.size());
     if (!d->inHeader) {
         emit dataReady(block);
         return;
diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index 387aa3b1..62d7b387 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -453,7 +453,7 @@ class Ice176::Private : public QObject {
         }
         this->remoteCandidates += remoteCandidates;
 
-        iceDebug("adding %d remote candidates. total=%d", remoteCandidates.count(), this->remoteCandidates.count());
+        iceDebug("adding %lld remote candidates. total=%lld", remoteCandidates.count(), this->remoteCandidates.count());
         doPairing(localCandidates, remoteCandidates);
     }
 
@@ -508,7 +508,7 @@ class Ice176::Private : public QObject {
     void addChecklistPairs(const QList<QSharedPointer<CandidatePair>> &pairs)
     {
 #ifdef ICE_DEBUG
-        iceDebug("%d new pairs", pairs.count());
+        iceDebug("%lld new pairs", pairs.count());
         for (auto &p : pairs)
             p->logNew = true;
 #endif
@@ -549,7 +549,7 @@ class Ice176::Private : public QObject {
         while (checkList.pairs.count() > max_pairs)
             checkList.pairs.removeLast();
 #ifdef ICE_DEBUG
-        iceDebug("%d after pruning (just new below):", checkList.pairs.count());
+        iceDebug("%lld after pruning (just new below):", checkList.pairs.count());
         for (auto &p : checkList.pairs) {
             if (p->logNew)
                 iceDebug("C%d, %s", p->local->componentId, qPrintable(*p));
diff --git a/src/irisnet/noncore/stunbinding.cpp b/src/irisnet/noncore/stunbinding.cpp
index 15bda2ea..b40de926 100644
--- a/src/irisnet/noncore/stunbinding.cpp
+++ b/src/irisnet/noncore/stunbinding.cpp
@@ -28,12 +28,12 @@ class StunBinding::Private : public QObject {
     Q_OBJECT
 
 public:
-    StunBinding                    *q;
-    StunTransactionPool::Ptr        pool;
-    QScopedPointer<StunTransaction> trans;
-    TransportAddress                stunAddr;
-    TransportAddress                addr;
-    QString                         errorString;
+    StunBinding                     *q;
+    StunTransactionPool::Ptr         pool;
+    std::unique_ptr<StunTransaction> trans;
+    TransportAddress                 stunAddr;
+    TransportAddress                 addr;
+    QString                          errorString;
     bool    use_extPriority = false, use_extIceControlling = false, use_extIceControlled = false;
     quint32 extPriority       = 0;
     bool    extUseCandidate   = false;
@@ -52,9 +52,9 @@ class StunBinding::Private : public QObject {
         stunAddr = _addr;
 
         trans.reset(new StunTransaction());
-        connect(trans.data(), &StunTransaction::createMessage, this, &Private::trans_createMessage);
-        connect(trans.data(), &StunTransaction::finished, this, &Private::trans_finished);
-        connect(trans.data(), &StunTransaction::error, this, &Private::trans_error);
+        connect(trans.get(), &StunTransaction::createMessage, this, &Private::trans_createMessage);
+        connect(trans.get(), &StunTransaction::finished, this, &Private::trans_finished);
+        connect(trans.get(), &StunTransaction::error, this, &Private::trans_error);
 
         if (!stuser.isEmpty()) {
             trans->setShortTermUsername(stuser);
@@ -70,7 +70,7 @@ class StunBinding::Private : public QObject {
     {
         if (!trans)
             return;
-        auto t = trans.take();
+        auto t = trans.release();
         t->disconnect(this);
         t->cancel(); // will self-delete the transaction either on incoming or timeout
         // just in case those too
diff --git a/src/irisnet/noncore/stuntypes.cpp b/src/irisnet/noncore/stuntypes.cpp
index fe0cbb39..1982f778 100644
--- a/src/irisnet/noncore/stuntypes.cpp
+++ b/src/irisnet/noncore/stuntypes.cpp
@@ -624,7 +624,7 @@ namespace StunTypes {
                     if (!val.isEmpty())
                         out += QString(" = %1").arg(val);
                 } else
-                    out += QString::asprintf("  Unknown attribute (0x%04x) of %d bytes", a.type, a.value.size());
+                    out += QString::asprintf("  Unknown attribute (0x%04x) of %lld bytes", a.type, a.value.size());
             }
         } else
             out += "\n  (None)";
diff --git a/src/irisnet/noncore/tcpportreserver.h b/src/irisnet/noncore/tcpportreserver.h
index 16275203..bece3be4 100644
--- a/src/irisnet/noncore/tcpportreserver.h
+++ b/src/irisnet/noncore/tcpportreserver.h
@@ -123,7 +123,7 @@ class TcpPortScope : public QObject {
 
 private:
     struct Private;
-    QScopedPointer<Private> d;
+    std::unique_ptr<Private> d;
 };
 
 /**
diff --git a/src/xmpp/jid/jid.cpp b/src/xmpp/jid/jid.cpp
index 12e455c7..5295e58b 100644
--- a/src/xmpp/jid/jid.cpp
+++ b/src/xmpp/jid/jid.cpp
@@ -31,7 +31,7 @@ using namespace XMPP;
 //----------------------------------------------------------------------------
 // StringPrepCache
 //----------------------------------------------------------------------------
-QScopedPointer<StringPrepCache> StringPrepCache::_instance;
+std::unique_ptr<StringPrepCache> StringPrepCache::_instance;
 
 bool StringPrepCache::nameprep(const QString &in, int maxbytes, QString &out)
 {
@@ -155,7 +155,7 @@ StringPrepCache *StringPrepCache::instance()
         irisNetAddPostRoutine(cleanup); // REVIEW probably not necessary since heap will be deallocated with destructors
 #endif
     }
-    return _instance.data();
+    return _instance.get();
 }
 
 StringPrepCache::StringPrepCache() { }
diff --git a/src/xmpp/jid/jid.h b/src/xmpp/jid/jid.h
index e7c1a3a8..f31dfd4c 100644
--- a/src/xmpp/jid/jid.h
+++ b/src/xmpp/jid/jid.h
@@ -22,7 +22,6 @@
 
 #include <QByteArray>
 #include <QHash>
-#include <QScopedPointer>
 #include <QString>
 
 namespace XMPP {
@@ -41,8 +40,8 @@ class StringPrepCache {
     QHash<QString, QString> resourceprep_table;
     QHash<QString, QString> saslprep_table;
 
-    static QScopedPointer<StringPrepCache> _instance;
-    static StringPrepCache                *instance();
+    static std::unique_ptr<StringPrepCache> _instance;
+    static StringPrepCache                 *instance();
 
     StringPrepCache();
 };
diff --git a/src/xmpp/xmpp-im/jingle-application.h b/src/xmpp/xmpp-im/jingle-application.h
index cd3b06cb..3b0edbbc 100644
--- a/src/xmpp/xmpp-im/jingle-application.h
+++ b/src/xmpp/xmpp-im/jingle-application.h
@@ -79,7 +79,7 @@ namespace XMPP { namespace Jingle {
         inline Origin                     senders() const { return _senders; }
         inline QString                    contentName() const { return _contentName; }
         inline QSharedPointer<Transport>  transport() const { return _transport; }
-        inline TransportSelector         *transportSelector() const { return _transportSelector.data(); }
+        inline TransportSelector         *transportSelector() const { return _transportSelector.get(); }
         bool                              isRemote() const;
         inline bool                       isLocal() const { return !isRemote(); }
         inline ApplicationFlags           flags() const { return _flags; }
@@ -185,8 +185,8 @@ namespace XMPP { namespace Jingle {
         Origin  _senders;
 
         // current transport. either local or remote. has info about origin and state
-        QSharedPointer<Transport>         _transport;
-        QScopedPointer<TransportSelector> _transportSelector;
+        QSharedPointer<Transport>          _transport;
+        std::unique_ptr<TransportSelector> _transportSelector;
 
         // if transport-replace is in progress. will be set to true when accepted by both sides.
         PendingTransportReplace _pendingTransportReplace = PendingTransportReplace::None;
diff --git a/src/xmpp/xmpp-im/jingle-ft.h b/src/xmpp/xmpp-im/jingle-ft.h
index bc9ab6f0..589622cb 100644
--- a/src/xmpp/xmpp-im/jingle-ft.h
+++ b/src/xmpp/xmpp-im/jingle-ft.h
@@ -133,7 +133,7 @@ namespace XMPP { namespace Jingle { namespace FileTransfer {
 
     private:
         class Private;
-        QScopedPointer<Private> d;
+        std::unique_ptr<Private> d;
     };
 
     class Manager : public XMPP::Jingle::ApplicationManager {
diff --git a/src/xmpp/xmpp-im/jingle-ibb.h b/src/xmpp/xmpp-im/jingle-ibb.h
index 7020a519..6dbdba13 100644
--- a/src/xmpp/xmpp-im/jingle-ibb.h
+++ b/src/xmpp/xmpp-im/jingle-ibb.h
@@ -50,7 +50,7 @@ namespace Jingle { namespace IBB {
         friend class Manager;
 
         struct Private;
-        QScopedPointer<Private> d;
+        std::unique_ptr<Private> d;
     };
 
     class Manager;
@@ -91,7 +91,7 @@ namespace Jingle { namespace IBB {
 
     private:
         struct Private;
-        QScopedPointer<Private> d;
+        std::unique_ptr<Private> d;
     };
 } // namespace IBB
 } // namespace Jingle
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index fc63726a..96386e91 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -33,10 +33,7 @@
 #include "xmpp_client.h"
 #include "xmpp_externalservicediscovery.h"
 #include "xmpp_serverinfomanager.h"
-#include "xmpp_xmlcommon.h"
 
-#include <array>
-#include <chrono>
 #include <memory>
 
 #include <QElapsedTimer>
@@ -452,7 +449,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
         int                            proxiesInDiscoCount       = 0;
         QVector<Component>             components;
         QList<XMPP::Ice176::Candidate> pendingLocalCandidates; // cid to candidate mapping
-        QScopedPointer<Element>        remoteState;
+        std::unique_ptr<Element>       remoteState;
 
         // QString            sid;
         // Transport::Mode    mode = Transport::Tcp;
@@ -638,7 +635,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
                 return;
             }
 
-            auto manager     = dynamic_cast<Manager *>(q->pad()->manager())->d.data();
+            auto manager     = dynamic_cast<Manager *>(q->pad()->manager())->d.get();
             stunBindPort     = manager->stunBindPort;
             stunRelayUdpPort = manager->stunRelayUdpPort;
             stunRelayTcpPort = manager->stunRelayTcpPort;
@@ -659,7 +656,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
 
         void startIce()
         {
-            auto manager = dynamic_cast<Manager *>(q->_pad->manager())->d.data();
+            auto manager = dynamic_cast<Manager *>(q->_pad->manager())->d.get();
 
             if (!stunBindAddr.isNull() && stunBindPort > 0)
                 qDebug("STUN service: %s;%d", qPrintable(stunBindAddr.toString()), stunBindPort);
@@ -707,7 +704,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
                        [this](const QList<XMPP::Ice176::Candidate> &candidates) {
                            pendingActions |= NewCandidate;
                            pendingLocalCandidates += candidates;
-                           qDebug("discovered %d local candidates", candidates.size());
+                           qDebug("discovered %lld local candidates", candidates.size());
                            for (auto const &c : candidates) {
                                qDebug(" - %s:%d", qPrintable(c.ip.toString()), c.port);
                            }
diff --git a/src/xmpp/xmpp-im/jingle-ice.h b/src/xmpp/xmpp-im/jingle-ice.h
index 58f858a4..990d8b08 100644
--- a/src/xmpp/xmpp-im/jingle-ice.h
+++ b/src/xmpp/xmpp-im/jingle-ice.h
@@ -60,7 +60,7 @@ namespace Jingle { namespace ICE {
         friend class Manager;
 
         class Private;
-        QScopedPointer<Private> d;
+        std::unique_ptr<Private> d;
     };
 
     class Pad : public TransportManagerPad {
@@ -129,7 +129,7 @@ namespace Jingle { namespace ICE {
     private:
         friend class Transport;
         class Private;
-        QScopedPointer<Private> d;
+        std::unique_ptr<Private> d;
     };
 } // namespace Ice
 } // namespace Jingle
diff --git a/src/xmpp/xmpp-im/jingle-s5b.h b/src/xmpp/xmpp-im/jingle-s5b.h
index 91376179..00dddaa3 100644
--- a/src/xmpp/xmpp-im/jingle-s5b.h
+++ b/src/xmpp/xmpp-im/jingle-s5b.h
@@ -152,7 +152,7 @@ namespace Jingle { namespace S5B {
         friend class Manager;
 
         class Private;
-        QScopedPointer<Private> d;
+        std::unique_ptr<Private> d;
     };
 
     class Pad : public TransportManagerPad {
@@ -212,7 +212,7 @@ namespace Jingle { namespace S5B {
 
     private:
         class Private;
-        QScopedPointer<Private> d;
+        std::unique_ptr<Private> d;
     };
 } // namespace S5B
 } // namespace Jingle
diff --git a/src/xmpp/xmpp-im/jingle-sctp.h b/src/xmpp/xmpp-im/jingle-sctp.h
index 92dab3dc..0ac2d1ee 100644
--- a/src/xmpp/xmpp-im/jingle-sctp.h
+++ b/src/xmpp/xmpp-im/jingle-sctp.h
@@ -25,7 +25,6 @@
 #include <QAbstractSocket>
 #include <QDomElement>
 #include <QObject>
-#include <QScopedPointer>
 
 #include <memory>
 
@@ -95,7 +94,7 @@ namespace XMPP { namespace Jingle { namespace SCTP {
         void newIncomingChannel();
 
     private:
-        QScopedPointer<AssociationPrivate> d;
+        std::unique_ptr<AssociationPrivate> d;
     };
 
 }}}
diff --git a/src/xmpp/xmpp-im/jingle-session.cpp b/src/xmpp/xmpp-im/jingle-session.cpp
index f0323406..ab2233c2 100644
--- a/src/xmpp/xmpp-im/jingle-session.cpp
+++ b/src/xmpp/xmpp-im/jingle-session.cpp
@@ -306,7 +306,7 @@ namespace XMPP { namespace Jingle {
             }
 
             QMultiMap<Application::Update, Application *> updates;
-            qDebug("jingle-doStep: %d applications have updates", signalingContent.size());
+            qDebug("jingle-doStep: %lld applications have updates", signalingContent.size());
             for (auto app : std::as_const(signalingContent)) {
                 auto updateType = app->evaluateOutgoingUpdate();
                 if (updateType.action != Action::NoAction) {
@@ -510,7 +510,7 @@ namespace XMPP { namespace Jingle {
                 return result { Unsupported, trReason == Reason::NoReason ? Reason::UnsupportedApplications : trReason,
                                 nullptr };
             }
-            QScopedPointer<Application> app(appPad->manager()->startApplication(appPad, c.name, c.creator, c.senders));
+            std::unique_ptr<Application> app(appPad->manager()->startApplication(appPad, c.name, c.creator, c.senders));
             if (!app)
                 return result { Unparsed, Reason::Success, nullptr };
 
@@ -522,10 +522,10 @@ namespace XMPP { namespace Jingle {
             }
 
             if (app->setTransport(std::get<2>(trpr))) {
-                return result { Ok, Reason::Success, app.take() };
+                return result { Ok, Reason::Success, app.release() };
             }
             // TODO We can do transport-replace in all cases where std::get<1>(trpr) != NoReason
-            return result { Unsupported, Reason::IncompatibleParameters, app.take() };
+            return result { Unsupported, Reason::IncompatibleParameters, app.release() };
         }
 
         typedef std::tuple<AddContentError, Reason::Condition, QList<Application *>, QList<QDomElement>>
diff --git a/src/xmpp/xmpp-im/jingle-session.h b/src/xmpp/xmpp-im/jingle-session.h
index 07425323..8f60683e 100644
--- a/src/xmpp/xmpp-im/jingle-session.h
+++ b/src/xmpp/xmpp-im/jingle-session.h
@@ -95,7 +95,7 @@ namespace XMPP { namespace Jingle {
         bool updateFromXml(Action action, const QDomElement &jingleEl);
 
         class Private;
-        QScopedPointer<Private> d;
+        std::unique_ptr<Private> d;
     };
 }}
 
diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
index 4819c866..20ae9c15 100644
--- a/src/xmpp/xmpp-im/jingle.cpp
+++ b/src/xmpp/xmpp-im/jingle.cpp
@@ -533,9 +533,9 @@ namespace XMPP { namespace Jingle {
     //----------------------------------------------------------------------------
     class Manager::Private {
     public:
-        XMPP::Client          *client;
-        Manager               *manager;
-        QScopedPointer<JTPush> pushTask;
+        XMPP::Client           *client;
+        Manager                *manager;
+        std::unique_ptr<JTPush> pushTask;
         // ns -> application
         std::map<QString, QPointer<ApplicationManager>> applicationManagers;
         // ns -> parser function
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index 9763926d..845977b8 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -377,7 +377,7 @@ namespace Jingle {
         Session *incomingSessionInitiate(const Jid &from, const Jingle &jingle, const QDomElement &jingleEl);
 
         class Private;
-        QScopedPointer<Private> d;
+        std::unique_ptr<Private> d;
     };
 
     Origin negateOrigin(Origin o);
diff --git a/src/xmpp/xmpp-im/s5b.cpp b/src/xmpp/xmpp-im/s5b.cpp
index c0b9b18a..0398ac63 100644
--- a/src/xmpp/xmpp-im/s5b.cpp
+++ b/src/xmpp/xmpp-im/s5b.cpp
@@ -2229,7 +2229,7 @@ S5BServer::S5BServer(QTcpServer *serverSocket) : TcpPortServer(serverSocket), d(
 
 S5BServer::~S5BServer()
 {
-    // basically to make QScopedPointer happy
+    // basically to make std::unique_ptr happy
 }
 
 void S5BServer::writeUDP(const QHostAddress &addr, quint16 port, const QByteArray &data)
diff --git a/src/xmpp/xmpp-im/s5b.h b/src/xmpp/xmpp-im/s5b.h
index 5343d3e7..5fff63b4 100644
--- a/src/xmpp/xmpp-im/s5b.h
+++ b/src/xmpp/xmpp-im/s5b.h
@@ -254,7 +254,7 @@ class S5BServer : public TcpPortServer {
 
 private:
     struct Private;
-    QScopedPointer<Private> d;
+    std::unique_ptr<Private> d;
 };
 
 class JT_S5B : public Task {
diff --git a/src/xmpp/xmpp-im/xmpp_hash.cpp b/src/xmpp/xmpp-im/xmpp_hash.cpp
index 558e0bcf..9db6af47 100644
--- a/src/xmpp/xmpp-im/xmpp_hash.cpp
+++ b/src/xmpp/xmpp-im/xmpp_hash.cpp
@@ -172,7 +172,7 @@ bool Hash::compute(const QByteArray &ba)
     if (!v_data.isEmpty())
         return true;
 
-    qDebug("failed to compute %s hash for %d bytes", qPrintable(stringType()), ba.size());
+    qDebug("failed to compute %s hash for %lld bytes", qPrintable(stringType()), ba.size());
     return false;
 }
 
diff --git a/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp b/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
index 590080f8..e0f29c8e 100644
--- a/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
+++ b/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
@@ -445,8 +445,12 @@ void readColorEntry(const QDomElement &e, const QString &name, QColor *v)
     QDomElement tag = e.firstChildElement(name);
     if (tag.isNull())
         return;
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     QColor c;
     c.setNamedColor(tagContent(tag));
+#else
+    auto c = QColor::fromString(tagContent(tag));
+#endif
     if (c.isValid())
         *v = c;
 }

From 93da53b7136e2525c13aa69aed753427f04ab79e Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Mon, 18 Mar 2024 09:39:31 +0200
Subject: [PATCH 374/383] Missed include fix

---
 src/xmpp/jid/jid.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/xmpp/jid/jid.h b/src/xmpp/jid/jid.h
index f31dfd4c..44a3dfbb 100644
--- a/src/xmpp/jid/jid.h
+++ b/src/xmpp/jid/jid.h
@@ -23,6 +23,7 @@
 #include <QByteArray>
 #include <QHash>
 #include <QString>
+#include <memory>
 
 namespace XMPP {
 class StringPrepCache {

From ff6ced362cb2c5d8320bc44968f3f8f77e09c906 Mon Sep 17 00:00:00 2001
From: Sergei Ilinykh <rion4ik@gmail.com>
Date: Mon, 18 Mar 2024 14:04:14 +0300
Subject: [PATCH 375/383] a comment fix

---
 src/xmpp/xmpp-core/tlshandler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/xmpp/xmpp-core/tlshandler.cpp b/src/xmpp/xmpp-core/tlshandler.cpp
index 807afe6d..fdb48c2d 100644
--- a/src/xmpp/xmpp-core/tlshandler.cpp
+++ b/src/xmpp/xmpp-core/tlshandler.cpp
@@ -195,7 +195,7 @@ static bool cert_match_domain(const QString &certname, const QString &acedomain)
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
         if (!QRegExp(p1, Qt::CaseSensitive, QRegExp::Wildcard).exactMatch(p2))
 #else
-        // note, wildcards a by default anchored. so exact match
+        // note, wildcards are by default anchored. so exact match
         if (!QRegularExpression::fromWildcard(p1, Qt::CaseSensitive).match(p2).hasMatch())
 #endif
             return false;

From 6adb7806890bef9182739fdf1a32b75460248151 Mon Sep 17 00:00:00 2001
From: Sergei Ilinykh <rion4ik@gmail.com>
Date: Mon, 18 Mar 2024 14:14:48 +0300
Subject: [PATCH 376/383] More fixes to compilation warnings

---
 src/irisnet/noncore/cutestuff/httppoll.cpp | 2 +-
 src/irisnet/noncore/ice176.cpp             | 7 ++++---
 src/irisnet/noncore/stuntypes.cpp          | 3 ++-
 src/xmpp/xmpp-im/jingle-ice.cpp            | 2 +-
 src/xmpp/xmpp-im/jingle-session.cpp        | 2 +-
 src/xmpp/xmpp-im/xmpp_hash.cpp             | 2 +-
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/irisnet/noncore/cutestuff/httppoll.cpp b/src/irisnet/noncore/cutestuff/httppoll.cpp
index 1abdbccc..84fb8703 100644
--- a/src/irisnet/noncore/cutestuff/httppoll.cpp
+++ b/src/irisnet/noncore/cutestuff/httppoll.cpp
@@ -848,7 +848,7 @@ void HttpProxyGetStream::sock_readyRead()
 
 void HttpProxyGetStream::processData(const QByteArray &block)
 {
-    printf("processData: %lld bytes\n", block.size());
+    printf("processData: %lld bytes\n", qsizetype(block.size()));
     if (!d->inHeader) {
         emit dataReady(block);
         return;
diff --git a/src/irisnet/noncore/ice176.cpp b/src/irisnet/noncore/ice176.cpp
index 62d7b387..e5870e26 100644
--- a/src/irisnet/noncore/ice176.cpp
+++ b/src/irisnet/noncore/ice176.cpp
@@ -453,7 +453,8 @@ class Ice176::Private : public QObject {
         }
         this->remoteCandidates += remoteCandidates;
 
-        iceDebug("adding %lld remote candidates. total=%lld", remoteCandidates.count(), this->remoteCandidates.count());
+        iceDebug("adding %lld remote candidates. total=%lld", qsizetype(remoteCandidates.count()),
+                 qsizetype(this->remoteCandidates.count()));
         doPairing(localCandidates, remoteCandidates);
     }
 
@@ -508,7 +509,7 @@ class Ice176::Private : public QObject {
     void addChecklistPairs(const QList<QSharedPointer<CandidatePair>> &pairs)
     {
 #ifdef ICE_DEBUG
-        iceDebug("%lld new pairs", pairs.count());
+        iceDebug("%lld new pairs", qsizetype(pairs.count()));
         for (auto &p : pairs)
             p->logNew = true;
 #endif
@@ -549,7 +550,7 @@ class Ice176::Private : public QObject {
         while (checkList.pairs.count() > max_pairs)
             checkList.pairs.removeLast();
 #ifdef ICE_DEBUG
-        iceDebug("%lld after pruning (just new below):", checkList.pairs.count());
+        iceDebug("%lld after pruning (just new below):", qsizetype(checkList.pairs.count()));
         for (auto &p : checkList.pairs) {
             if (p->logNew)
                 iceDebug("C%d, %s", p->local->componentId, qPrintable(*p));
diff --git a/src/irisnet/noncore/stuntypes.cpp b/src/irisnet/noncore/stuntypes.cpp
index 1982f778..4a35daff 100644
--- a/src/irisnet/noncore/stuntypes.cpp
+++ b/src/irisnet/noncore/stuntypes.cpp
@@ -624,7 +624,8 @@ namespace StunTypes {
                     if (!val.isEmpty())
                         out += QString(" = %1").arg(val);
                 } else
-                    out += QString::asprintf("  Unknown attribute (0x%04x) of %lld bytes", a.type, a.value.size());
+                    out += QString::asprintf("  Unknown attribute (0x%04x) of %lld bytes", a.type,
+                                             qsizetype(a.value.size()));
             }
         } else
             out += "\n  (None)";
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
index 96386e91..f60a49f4 100644
--- a/src/xmpp/xmpp-im/jingle-ice.cpp
+++ b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -704,7 +704,7 @@ namespace XMPP { namespace Jingle { namespace ICE {
                        [this](const QList<XMPP::Ice176::Candidate> &candidates) {
                            pendingActions |= NewCandidate;
                            pendingLocalCandidates += candidates;
-                           qDebug("discovered %lld local candidates", candidates.size());
+                           qDebug("discovered %lld local candidates", qsizetype(candidates.size()));
                            for (auto const &c : candidates) {
                                qDebug(" - %s:%d", qPrintable(c.ip.toString()), c.port);
                            }
diff --git a/src/xmpp/xmpp-im/jingle-session.cpp b/src/xmpp/xmpp-im/jingle-session.cpp
index ab2233c2..f5ea6898 100644
--- a/src/xmpp/xmpp-im/jingle-session.cpp
+++ b/src/xmpp/xmpp-im/jingle-session.cpp
@@ -306,7 +306,7 @@ namespace XMPP { namespace Jingle {
             }
 
             QMultiMap<Application::Update, Application *> updates;
-            qDebug("jingle-doStep: %lld applications have updates", signalingContent.size());
+            qDebug("jingle-doStep: %lld applications have updates", qsizetype(signalingContent.size()));
             for (auto app : std::as_const(signalingContent)) {
                 auto updateType = app->evaluateOutgoingUpdate();
                 if (updateType.action != Action::NoAction) {
diff --git a/src/xmpp/xmpp-im/xmpp_hash.cpp b/src/xmpp/xmpp-im/xmpp_hash.cpp
index 9db6af47..decfb0e4 100644
--- a/src/xmpp/xmpp-im/xmpp_hash.cpp
+++ b/src/xmpp/xmpp-im/xmpp_hash.cpp
@@ -172,7 +172,7 @@ bool Hash::compute(const QByteArray &ba)
     if (!v_data.isEmpty())
         return true;
 
-    qDebug("failed to compute %s hash for %lld bytes", qPrintable(stringType()), ba.size());
+    qDebug("failed to compute %s hash for %lld bytes", qPrintable(stringType()), qsizetype(ba.size()));
     return false;
 }
 

From 4a239581517c0b8941ed348b7ac02a644ac18b9b Mon Sep 17 00:00:00 2001
From: Sergei Ilinykh <rion4ik@gmail.com>
Date: Sun, 24 Mar 2024 20:18:56 +0300
Subject: [PATCH 377/383] Fixed crash on Jingle transport reject

---
 src/xmpp/xmpp-im/jingle-session.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/xmpp/xmpp-im/jingle-session.cpp b/src/xmpp/xmpp-im/jingle-session.cpp
index f5ea6898..a836bd46 100644
--- a/src/xmpp/xmpp-im/jingle-session.cpp
+++ b/src/xmpp/xmpp-im/jingle-session.cpp
@@ -904,7 +904,12 @@ namespace XMPP { namespace Jingle {
                 lastError = ErrorUtil::makeTieBreak(*manager->client()->doc());
                 return false;
             } else if (toReject.size()) {
-                outgoingUpdates.insert(Action::TransportReject, OutgoingUpdate { toReject, OutgoingUpdateCB() });
+                QList<QDomElement> rejectImported;
+                std::transform(toReject.begin(), toReject.end(), std::back_inserter(rejectImported),
+                               [this](const QDomElement &e) {
+                                   return manager->client()->doc()->importNode(e.cloneNode(true), true).toElement();
+                               });
+                outgoingUpdates.insert(Action::TransportReject, OutgoingUpdate { rejectImported, OutgoingUpdateCB() });
             }
 
             planStep();

From 6f17799a82cb4dc8b1ed6c87cbdbb98e7b1f8b06 Mon Sep 17 00:00:00 2001
From: Sergei Ilinykh <rion4ik@gmail.com>
Date: Mon, 25 Mar 2024 19:44:10 +0300
Subject: [PATCH 378/383] qt6 compat

---
 src/xmpp/jid/jid.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/xmpp/jid/jid.h b/src/xmpp/jid/jid.h
index 44a3dfbb..4c4ff08f 100644
--- a/src/xmpp/jid/jid.h
+++ b/src/xmpp/jid/jid.h
@@ -91,10 +91,18 @@ class Jid {
     bool    valid, null;
 };
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 Q_DECL_PURE_FUNCTION inline uint qHash(const XMPP::Jid &key, uint seed = 0) Q_DECL_NOTHROW
 {
     return qHash(key.full(), seed);
 }
+#else
+Q_DECL_PURE_FUNCTION inline uint qHash(const XMPP::Jid &key, size_t seed = 0) Q_DECL_NOTHROW
+{
+    return qHash(key.full(), seed);
+}
+#endif
+
 } // namespace XMPP
 
 #endif // XMPP_JID_H

From 3d7c2b4b1c23370c83459fa37d7852cdd7bb8ec9 Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Wed, 27 Mar 2024 15:55:00 +0200
Subject: [PATCH 379/383] Less warnings with Qt6

---
 src/irisnet/noncore/icetransport.h               | 4 ++++
 src/irisnet/noncore/transportaddress.h           | 5 +++++
 src/xmpp/jid/jid.h                               | 2 +-
 src/xmpp/xmpp-im/jingle.h                        | 8 ++++++++
 src/xmpp/xmpp-im/xmpp_externalservicediscovery.h | 4 ++++
 src/xmpp/xmpp-im/xmpp_hash.h                     | 4 ++++
 6 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/irisnet/noncore/icetransport.h b/src/irisnet/noncore/icetransport.h
index 6dc3f939..5bf6ecef 100644
--- a/src/irisnet/noncore/icetransport.h
+++ b/src/irisnet/noncore/icetransport.h
@@ -60,7 +60,11 @@ class IceTransport : public QObject {
     void debugLine(const QString &str);
 };
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 inline uint qHash(const QWeakPointer<IceTransport> &p) { return qHash(p.toStrongRef().data()); }
+#else
+inline size_t qHash(const QWeakPointer<IceTransport> &p) { return qHash(p.toStrongRef().data()); }
+#endif
 
 } // namespace XMPP
 
diff --git a/src/irisnet/noncore/transportaddress.h b/src/irisnet/noncore/transportaddress.h
index ea450801..fec62a3c 100644
--- a/src/irisnet/noncore/transportaddress.h
+++ b/src/irisnet/noncore/transportaddress.h
@@ -23,7 +23,12 @@ class TransportAddress {
     }
 };
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+
 inline uint qHash(const TransportAddress &key, uint seed = 0)
+#else
+inline size_t qHash(const TransportAddress &key, size_t seed = 0)
+#endif
 {
     return ::qHash(key.addr, seed) ^ ::qHash(key.port, seed);
 }
diff --git a/src/xmpp/jid/jid.h b/src/xmpp/jid/jid.h
index 4c4ff08f..08966774 100644
--- a/src/xmpp/jid/jid.h
+++ b/src/xmpp/jid/jid.h
@@ -97,7 +97,7 @@ Q_DECL_PURE_FUNCTION inline uint qHash(const XMPP::Jid &key, uint seed = 0) Q_DE
     return qHash(key.full(), seed);
 }
 #else
-Q_DECL_PURE_FUNCTION inline uint qHash(const XMPP::Jid &key, size_t seed = 0) Q_DECL_NOTHROW
+Q_DECL_PURE_FUNCTION inline size_t qHash(const XMPP::Jid &key, size_t seed = 0) Q_DECL_NOTHROW
 {
     return qHash(key.full(), seed);
 }
diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
index 845977b8..6ea71c1b 100644
--- a/src/xmpp/xmpp-im/jingle.h
+++ b/src/xmpp/xmpp-im/jingle.h
@@ -43,7 +43,11 @@ namespace Jingle {
 
     enum class Origin { None, Both, Initiator, Responder };
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     inline uint qHash(const XMPP::Jingle::Origin &o, uint seed = 0) { return ::qHash(int(o), seed); }
+#else
+    inline size_t qHash(const XMPP::Jingle::Origin &o, size_t seed = 0) { return ::qHash(int(o), seed); }
+#endif
 
     /*
      Session states:
@@ -121,7 +125,11 @@ namespace Jingle {
         SessionTerminate
     };
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     inline uint qHash(const XMPP::Jingle::Action &o, uint seed = 0) { return ::qHash(int(o), seed); }
+#else
+    inline size_t qHash(const XMPP::Jingle::Action &o, size_t seed = 0) { return ::qHash(int(o), seed); }
+#endif
 
     /*
     Categorization by speed, reliability and connectivity
diff --git a/src/xmpp/xmpp-im/xmpp_externalservicediscovery.h b/src/xmpp/xmpp-im/xmpp_externalservicediscovery.h
index ec6f0d14..563603c2 100644
--- a/src/xmpp/xmpp-im/xmpp_externalservicediscovery.h
+++ b/src/xmpp/xmpp-im/xmpp_externalservicediscovery.h
@@ -66,7 +66,11 @@ struct ExternalServiceId {
     }
 };
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 inline uint qHash(const ExternalServiceId &id, uint seed = 0)
+#else
+inline size_t qHash(const ExternalServiceId &id, size_t seed = 0)
+#endif
 {
     return ::qHash(id.host, seed) ^ ::qHash(id.type, seed) ^ ::qHash(id.port, seed);
 }
diff --git a/src/xmpp/xmpp-im/xmpp_hash.h b/src/xmpp/xmpp-im/xmpp_hash.h
index 2c7d5de1..67400493 100644
--- a/src/xmpp/xmpp-im/xmpp_hash.h
+++ b/src/xmpp/xmpp-im/xmpp_hash.h
@@ -99,7 +99,11 @@ class StreamHash {
     std::unique_ptr<StreamHashPrivate> d;
 };
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 Q_DECL_PURE_FUNCTION inline uint qHash(const Hash &hash, uint seed = 0) Q_DECL_NOTHROW
+#else
+Q_DECL_PURE_FUNCTION inline size_t qHash(const Hash &hash, size_t seed = 0) Q_DECL_NOTHROW
+#endif
 {
     return qHash(hash.data(), seed);
 }

From efbb115150b886a96acd4778495a23847033e37d Mon Sep 17 00:00:00 2001
From: Vitozz <thetvg@gmail.com>
Date: Tue, 2 Apr 2024 19:34:37 +0300
Subject: [PATCH 380/383] Fixed another Qt6 warning

---
 src/irisnet/noncore/iceagent.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/irisnet/noncore/iceagent.cpp b/src/irisnet/noncore/iceagent.cpp
index e3f2e338..cd90bea0 100644
--- a/src/irisnet/noncore/iceagent.cpp
+++ b/src/irisnet/noncore/iceagent.cpp
@@ -18,7 +18,11 @@ struct Foundation {
     };
 };
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 inline uint qHash(const Foundation &f, uint seed = 0)
+#else
+inline size_t qHash(const Foundation &f, size_t seed = 0)
+#endif
 {
     auto tmp = uint(f.stunRequestProto) & (uint(f.type) << 8);
     return qHash(f.baseAddr, seed) ^ qHash(f.stunServAddr, seed) ^ tmp;

From 6cb4fb06a51a2511324683ee5a3b3e97a3a0a4a1 Mon Sep 17 00:00:00 2001
From: Sergei Ilinykh <rion4ik@gmail.com>
Date: Wed, 3 Apr 2024 13:18:13 +0300
Subject: [PATCH 381/383] Some debug info

---
 src/xmpp/xmpp-im/jingle-application.cpp | 10 +++++++---
 src/xmpp/xmpp-im/jingle-session.cpp     |  1 +
 src/xmpp/xmpp-im/jingle-transport.cpp   |  1 +
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/xmpp/xmpp-im/jingle-application.cpp b/src/xmpp/xmpp-im/jingle-application.cpp
index 2c91bca4..8e704c05 100644
--- a/src/xmpp/xmpp-im/jingle-application.cpp
+++ b/src/xmpp/xmpp-im/jingle-application.cpp
@@ -73,8 +73,10 @@ namespace XMPP { namespace Jingle {
             Q_ASSERT(!tr.isNull());
 
             connect(tr.data(), &Transport::stateChanged, this, [this]() {
-                if (transport.lock()->state() == State::Finished) {
-                    onFailed(QLatin1String("Transport is dead but no connection"));
+                auto locked = transport.lock();
+                if (locked->state() == State::Finished) {
+                    onFailed(QLatin1String("Transport") + locked->pad()->ns()
+                             + QLatin1String(" is in finished state and no connection => transport failure"));
                 }
             });
             if (tr->isLocal()) {
@@ -317,6 +319,7 @@ namespace XMPP { namespace Jingle {
 
     bool Application::selectNextTransport(const QSharedPointer<Transport> alikeTransport)
     {
+        qDebug("selecting next transport");
         if (!_transportSelector->hasMoreTransports()) {
             if (_transport) {
                 qDebug("Application::selectNextTransport: stopping %s transport", qPrintable(_transport->pad()->ns()));
@@ -369,7 +372,6 @@ namespace XMPP { namespace Jingle {
         if (!isTransportReplaceEnabled() || !_transportSelector->replace(_transport, transport))
             return false;
 
-        qDebug("setting transport %s", qPrintable(transport->pad()->ns()));
         // in case we automatically select a new transport on our own we definitely will come up to this point
         if (_transport) {
             if (_transport->state() < State::Unacked && _transport->creator() == _pad->session()->role()
@@ -402,6 +404,8 @@ namespace XMPP { namespace Jingle {
                    qPrintable(_transport->pad()->ns()), qPrintable(transport->pad()->ns()));
             _transport->disconnect(this);
             _transport.reset();
+        } else {
+            qDebug("setting transport %s", qPrintable(transport->pad()->ns()));
         }
 
         _transport = transport;
diff --git a/src/xmpp/xmpp-im/jingle-session.cpp b/src/xmpp/xmpp-im/jingle-session.cpp
index a836bd46..0e76a5a3 100644
--- a/src/xmpp/xmpp-im/jingle-session.cpp
+++ b/src/xmpp/xmpp-im/jingle-session.cpp
@@ -831,6 +831,7 @@ namespace XMPP { namespace Jingle {
 
         bool handleIncomingTransportReplace(const QDomElement &jingleEl)
         {
+            qDebug("handle incoming transport replace");
             QVector<std::tuple<Application *, QSharedPointer<Transport>, QDomElement>> passed;
             QList<QDomElement>                                                         toReject;
             QString contentTag(QStringLiteral("content"));
diff --git a/src/xmpp/xmpp-im/jingle-transport.cpp b/src/xmpp/xmpp-im/jingle-transport.cpp
index b0731656..434ebea6 100644
--- a/src/xmpp/xmpp-im/jingle-transport.cpp
+++ b/src/xmpp/xmpp-im/jingle-transport.cpp
@@ -66,6 +66,7 @@ namespace XMPP { namespace Jingle {
 
     void Transport::onFinish(Reason::Condition condition, const QString &message)
     {
+        qDebug("Transport::onFinish: %s", qPrintable(_pad->ns()));
         _lastReason = Reason(condition, message);
         _prevState  = _state;
         _state      = State::Finished;

From 37be14ebcc415a2b68ccce81a7aadb3bc72cb9b9 Mon Sep 17 00:00:00 2001
From: Sergei Ilinykh <rion4ik@gmail.com>
Date: Sat, 6 Apr 2024 15:17:50 +0300
Subject: [PATCH 382/383] Introduce Message::isPoorSubject()

---
 src/xmpp/xmpp-im/types.cpp      | 117 +++++++++++++++++---------------
 src/xmpp/xmpp-im/xmpp_message.h |   1 +
 2 files changed, 63 insertions(+), 55 deletions(-)

diff --git a/src/xmpp/xmpp-im/types.cpp b/src/xmpp/xmpp-im/types.cpp
index c7d88027..06f9a063 100644
--- a/src/xmpp/xmpp-im/types.cpp
+++ b/src/xmpp/xmpp-im/types.cpp
@@ -702,7 +702,8 @@ class Message::Private : public QSharedData {
 
     StringMap     subject, body;
     QString       thread;
-    bool          threadSend = false;
+    bool          threadSend  = false;
+    bool          pureSubject = false; // set during parsing is subject exists body doesn't
     Stanza::Error error;
 
     // extensions
@@ -777,6 +778,8 @@ Message::~Message() { }
 //! \brief Check if it's exactly the same instance.
 bool Message::operator==(const Message &from) const { return d == from.d; }
 
+bool Message::isPureSubject() const { return d && d->pureSubject; }
+
 //! \brief Return receiver's Jid information.
 Jid Message::to() const { return d ? d->to : Jid(); }
 
@@ -890,6 +893,7 @@ void Message::setLang(const QString &s) { MessageD()->lang = s; }
 void Message::setSubject(const QString &s, const QString &lang)
 {
     MessageD()->subject[lang] = s;
+    d->pureSubject            = !d->subject.isEmpty() && d->thread.isEmpty() && d->body.isEmpty();
     // d->flag = false;
 }
 
@@ -901,6 +905,7 @@ void Message::setSubject(const QString &s, const QString &lang)
 void Message::setBody(const QString &s, const QString &lang)
 {
     MessageD()->body[lang] = s;
+    d->pureSubject         = !d->subject.isEmpty() && d->thread.isEmpty() && d->body.isEmpty();
     // d->flag = false;
 }
 
@@ -915,6 +920,7 @@ void Message::setThread(const QString &s, bool send)
 {
     MessageD()->threadSend = send;
     d->thread              = s;
+    d->pureSubject         = !d->subject.isEmpty() && d->thread.isEmpty() && d->body.isEmpty();
 }
 
 void Message::setError(const Stanza::Error &err) { MessageD()->error = err; }
@@ -1446,70 +1452,71 @@ bool Message::fromStanza(const Stanza &s, bool useTimeZoneOffset, int timeZoneOf
 
     XDomNodeList nl = root.childNodes();
     int          n;
-    for (n = 0; n < nl.count(); ++n) {
-        QDomNode i = nl.item(n);
-        if (i.isElement()) {
-            QDomElement e = i.toElement();
-            if (e.namespaceURI() == s.baseNS()) {
-                if (e.tagName() == QLatin1String("subject")) {
-                    QString lang = e.attributeNS(NS_XML, "lang", "");
-                    if (lang.isEmpty() || !(lang = XMLHelper::sanitizedLang(lang)).isEmpty()) {
-                        d->subject[lang] = e.text();
-                    }
-                } else if (e.tagName() == QLatin1String("body")) {
-                    QString lang = e.attributeNS(NS_XML, "lang", "");
-                    if (lang.isEmpty() || !(lang = XMLHelper::sanitizedLang(lang)).isEmpty()) {
-                        d->body[lang] = e.text();
-                    }
-                } else if (e.tagName() == QLatin1String("thread"))
-                    d->thread = e.text();
-            } else if (e.tagName() == QLatin1String("event")
-                       && e.namespaceURI() == QLatin1String("http://jabber.org/protocol/pubsub#event")) {
-                for (QDomNode enode = e.firstChild(); !enode.isNull(); enode = enode.nextSibling()) {
-                    QDomElement eel = enode.toElement();
-                    if (eel.tagName() == QLatin1String("items")) {
-                        d->pubsubNode = eel.attribute("node");
-                        for (QDomNode inode = eel.firstChild(); !inode.isNull(); inode = inode.nextSibling()) {
-                            QDomElement o = inode.toElement();
-                            if (o.tagName() == QLatin1String("item")) {
-                                for (QDomNode j = o.firstChild(); !j.isNull(); j = j.nextSibling()) {
-                                    QDomElement item = j.toElement();
-                                    if (!item.isNull()) {
-                                        d->pubsubItems += PubSubItem(o.attribute("id"), item);
-                                    }
+    bool         hasBodyOrThread = false;
+    bool         hasSubject      = false;
+    for (QDomElement e = root.firstChildElement(); !e.isNull(); e = e.nextSiblingElement()) {
+        if (e.namespaceURI() == s.baseNS()) {
+            if (e.tagName() == QLatin1String("subject")) {
+                hasSubject   = true;
+                QString lang = e.attributeNS(NS_XML, "lang", "");
+                if (lang.isEmpty() || !(lang = XMLHelper::sanitizedLang(lang)).isEmpty()) {
+                    d->subject[lang] = e.text();
+                }
+            } else if (e.tagName() == QLatin1String("body")) {
+                hasBodyOrThread = true;
+                QString lang    = e.attributeNS(NS_XML, "lang", "");
+                if (lang.isEmpty() || !(lang = XMLHelper::sanitizedLang(lang)).isEmpty()) {
+                    d->body[lang] = e.text();
+                }
+            } else if (e.tagName() == QLatin1String("thread")) {
+                hasBodyOrThread = true;
+                d->thread       = e.text();
+            }
+        } else if (e.tagName() == QLatin1String("event")
+                   && e.namespaceURI() == QLatin1String("http://jabber.org/protocol/pubsub#event")) {
+            for (QDomNode enode = e.firstChild(); !enode.isNull(); enode = enode.nextSibling()) {
+                QDomElement eel = enode.toElement();
+                if (eel.tagName() == QLatin1String("items")) {
+                    d->pubsubNode = eel.attribute("node");
+                    for (QDomNode inode = eel.firstChild(); !inode.isNull(); inode = inode.nextSibling()) {
+                        QDomElement o = inode.toElement();
+                        if (o.tagName() == QLatin1String("item")) {
+                            for (QDomNode j = o.firstChild(); !j.isNull(); j = j.nextSibling()) {
+                                QDomElement item = j.toElement();
+                                if (!item.isNull()) {
+                                    d->pubsubItems += PubSubItem(o.attribute("id"), item);
                                 }
                             }
-                            if (o.tagName() == "retract") {
-                                d->pubsubRetractions += PubSubRetraction(o.attribute("id"));
-                            }
+                        }
+                        if (o.tagName() == "retract") {
+                            d->pubsubRetractions += PubSubRetraction(o.attribute("id"));
                         }
                     }
                 }
-            } else if (e.tagName() == QLatin1String("no-permanent-store")
-                       && e.namespaceURI() == QLatin1String("urn:xmpp:hints")) {
-                d->processingHints |= NoPermanentStore;
-            } else if (e.tagName() == QLatin1String("no-store")
-                       && e.namespaceURI() == QLatin1String("urn:xmpp:hints")) {
-                d->processingHints |= NoStore;
-            } else if (e.tagName() == QLatin1String("no-copy") && e.namespaceURI() == QLatin1String("urn:xmpp:hints")) {
-                d->processingHints |= NoCopy;
-            } else if (e.tagName() == QLatin1String("store") && e.namespaceURI() == QLatin1String("urn:xmpp:hints")) {
-                d->processingHints |= Store;
-            } else if (e.tagName() == QLatin1String("origin-id")
-                       && e.namespaceURI() == QLatin1String("urn:xmpp:sid:0")) {
-                d->originId = e.attribute(QStringLiteral("id"));
-            } else if (e.tagName() == QLatin1String("stanza-id")
-                       && e.namespaceURI() == QLatin1String("urn:xmpp:sid:0")) {
-                d->stanzaId.id = e.attribute(QStringLiteral("id"));
-                d->stanzaId.by = Jid(e.attribute(QStringLiteral("by")));
             }
+        } else if (e.tagName() == QLatin1String("no-permanent-store")
+                   && e.namespaceURI() == QLatin1String("urn:xmpp:hints")) {
+            d->processingHints |= NoPermanentStore;
+        } else if (e.tagName() == QLatin1String("no-store") && e.namespaceURI() == QLatin1String("urn:xmpp:hints")) {
+            d->processingHints |= NoStore;
+        } else if (e.tagName() == QLatin1String("no-copy") && e.namespaceURI() == QLatin1String("urn:xmpp:hints")) {
+            d->processingHints |= NoCopy;
+        } else if (e.tagName() == QLatin1String("store") && e.namespaceURI() == QLatin1String("urn:xmpp:hints")) {
+            d->processingHints |= Store;
+        } else if (e.tagName() == QLatin1String("origin-id") && e.namespaceURI() == QLatin1String("urn:xmpp:sid:0")) {
+            d->originId = e.attribute(QStringLiteral("id"));
+        } else if (e.tagName() == QLatin1String("stanza-id") && e.namespaceURI() == QLatin1String("urn:xmpp:sid:0")) {
+            d->stanzaId.id = e.attribute(QStringLiteral("id"));
+            d->stanzaId.by = Jid(e.attribute(QStringLiteral("by")));
+        }
 
-            else {
-                // printf("extension element: [%s]\n", e.tagName().latin1());
-            }
+        else {
+            // printf("extension element: [%s]\n", e.tagName().latin1());
         }
     }
 
+    d->pureSubject = hasSubject && !hasBodyOrThread; // this is somewhat important for muc
+
     if (s.type() == "error")
         d->error = s.error();
 
diff --git a/src/xmpp/xmpp-im/xmpp_message.h b/src/xmpp/xmpp-im/xmpp_message.h
index 79b15bcb..cdb8ad38 100644
--- a/src/xmpp/xmpp-im/xmpp_message.h
+++ b/src/xmpp/xmpp-im/xmpp_message.h
@@ -71,6 +71,7 @@ class Message {
     ~Message();
     bool        operator==(const Message &from) const;
     inline bool isNull() const { return d == nullptr; }
+    bool        isPureSubject() const;
 
     Jid           to() const;
     Jid           from() const;

From d8b219b02eaa92fb5df1b63f7ebcdf50345ce13a Mon Sep 17 00:00:00 2001
From: Sergei Ilinykh <rion4ik@gmail.com>
Date: Sat, 6 Apr 2024 20:33:01 +0300
Subject: [PATCH 383/383] Added missed nick attribute to mut item actor

---
 src/xmpp/xmpp-im/types.cpp      | 26 +++++++++++++-------------
 src/xmpp/xmpp-im/xmpp_ibb.cpp   |  3 +--
 src/xmpp/xmpp-im/xmpp_ibb.h     |  2 +-
 src/xmpp/xmpp-im/xmpp_muc.h     | 14 +++++++++++---
 src/xmpp/xmpp-im/xmpp_tasks.cpp |  6 +-----
 5 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/src/xmpp/xmpp-im/types.cpp b/src/xmpp/xmpp-im/types.cpp
index 06f9a063..09058f44 100644
--- a/src/xmpp/xmpp-im/types.cpp
+++ b/src/xmpp/xmpp-im/types.cpp
@@ -28,7 +28,6 @@
 
 #include <QList>
 #include <QMap>
-#include <type_traits>
 
 #define NS_XML "http://www.w3.org/XML/1998/namespace"
 
@@ -336,7 +335,7 @@ void MUCItem::setAffiliation(Affiliation a) { affiliation_ = a; }
 
 void MUCItem::setRole(Role r) { role_ = r; }
 
-void MUCItem::setActor(const Jid &a) { actor_ = a; }
+void MUCItem::setActor(const Actor &a) { actor_ = a; }
 
 void MUCItem::setReason(const QString &r) { reason_ = r; }
 
@@ -348,7 +347,7 @@ MUCItem::Affiliation MUCItem::affiliation() const { return affiliation_; }
 
 MUCItem::Role MUCItem::role() const { return role_; }
 
-const Jid &MUCItem::actor() const { return actor_; }
+const MUCItem::Actor &MUCItem::actor() const { return actor_; }
 
 const QString &MUCItem::reason() const { return reason_; }
 
@@ -384,14 +383,11 @@ void MUCItem::fromXml(const QDomElement &e)
         role_ = NoRole;
     }
 
-    for (QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling()) {
-        QDomElement i = n.toElement();
-        if (i.isNull())
-            continue;
-
-        if (i.tagName() == QLatin1String("actor"))
-            actor_ = Jid(i.attribute(QLatin1String("jid")));
-        else if (i.tagName() == QLatin1String("reason"))
+    for (QDomElement i = e.firstChildElement(); !i.isNull(); i = i.nextSiblingElement()) {
+        if (i.tagName() == QLatin1String("actor")) {
+            actor_.jid  = Jid(i.attribute(QLatin1String("jid")));
+            actor_.nick = i.attribute(QLatin1String("nick"));
+        } else if (i.tagName() == QLatin1String("reason"))
             reason_ = i.text();
     }
 }
@@ -448,11 +444,15 @@ QDomElement MUCItem::toXml(QDomDocument &d)
     return e;
 }
 
+bool MUCItem::Actor::operator==(const Actor &o) const
+{
+    return ((!jid.isValid() && !o.jid.isValid()) || jid.compare(o.jid, true)) && (nick == o.nick);
+}
+
 bool MUCItem::operator==(const MUCItem &o) const
 {
     return !nick_.compare(o.nick_) && ((!jid_.isValid() && !o.jid_.isValid()) || jid_.compare(o.jid_, true))
-        && ((!actor_.isValid() && !o.actor_.isValid()) || actor_.compare(o.actor_, true))
-        && affiliation_ == o.affiliation_ && role_ == o.role_ && !reason_.compare(o.reason_);
+        && (actor_ == o.actor_) && affiliation_ == o.affiliation_ && role_ == o.role_ && !reason_.compare(o.reason_);
 }
 
 //----------------------------------------------------------------------------
diff --git a/src/xmpp/xmpp-im/xmpp_ibb.cpp b/src/xmpp/xmpp-im/xmpp_ibb.cpp
index 10873357..645c7b95 100644
--- a/src/xmpp/xmpp-im/xmpp_ibb.cpp
+++ b/src/xmpp/xmpp-im/xmpp_ibb.cpp
@@ -23,9 +23,8 @@
 #include "xmpp_stream.h"
 #include "xmpp_xmlcommon.h"
 
+#include <QTimer>
 #include <QtCrypto>
-#include <qtimer.h>
-#include <stdlib.h>
 
 #define IBB_PACKET_DELAY 0
 
diff --git a/src/xmpp/xmpp-im/xmpp_ibb.h b/src/xmpp/xmpp-im/xmpp_ibb.h
index 530ac757..6b475881 100644
--- a/src/xmpp/xmpp-im/xmpp_ibb.h
+++ b/src/xmpp/xmpp-im/xmpp_ibb.h
@@ -46,7 +46,7 @@ class IBBData {
 };
 
 // this is an IBB connection.  use it much like a qsocket
-class IBBConnection : public BSConnection {
+class IBBConnection final : public BSConnection {
     Q_OBJECT
 public:
     static const int PacketSize = 4096;
diff --git a/src/xmpp/xmpp-im/xmpp_muc.h b/src/xmpp/xmpp-im/xmpp_muc.h
index d5e36f83..ffd69e0d 100644
--- a/src/xmpp/xmpp-im/xmpp_muc.h
+++ b/src/xmpp/xmpp-im/xmpp_muc.h
@@ -31,6 +31,13 @@ class MUCItem {
     enum Affiliation { UnknownAffiliation, Outcast, NoAffiliation, Member, Admin, Owner };
     enum Role { UnknownRole, NoRole, Visitor, Participant, Moderator };
 
+    struct Actor {
+        Jid     jid;
+        QString nick;
+
+        bool operator==(const Actor &o) const;
+    };
+
     MUCItem(Role = UnknownRole, Affiliation = UnknownAffiliation);
     MUCItem(const QDomElement &);
 
@@ -38,14 +45,14 @@ class MUCItem {
     void setJid(const Jid &);
     void setAffiliation(Affiliation);
     void setRole(Role);
-    void setActor(const Jid &);
+    void setActor(const Actor &);
     void setReason(const QString &);
 
     const QString &nick() const;
     const Jid     &jid() const; // real jid of muc participant
     Affiliation    affiliation() const;
     Role           role() const;
-    const Jid     &actor() const;
+    const Actor   &actor() const;
     const QString &reason() const;
 
     void        fromXml(const QDomElement &);
@@ -55,7 +62,8 @@ class MUCItem {
 
 private:
     QString     nick_;
-    Jid         jid_, actor_;
+    Jid         jid_;
+    Actor       actor_;
     Affiliation affiliation_;
     Role        role_;
     QString     reason_;
diff --git a/src/xmpp/xmpp-im/xmpp_tasks.cpp b/src/xmpp/xmpp-im/xmpp_tasks.cpp
index 5afef0f3..608b3c4d 100644
--- a/src/xmpp/xmpp-im/xmpp_tasks.cpp
+++ b/src/xmpp/xmpp-im/xmpp_tasks.cpp
@@ -753,11 +753,7 @@ bool JT_PushPresence::take(const QDomElement &e)
                     QByteArray::fromHex(tagContent(t).toLatin1())); // if hash is empty this may mean photo removal
             // else vcard.hasPhotoHash() returns false and that's mean user is not yet ready to advertise his image
         } else if (i.tagName() == "x" && i.namespaceURI() == "http://jabber.org/protocol/muc#user") {
-            for (QDomNode muc_n = i.firstChild(); !muc_n.isNull(); muc_n = muc_n.nextSibling()) {
-                QDomElement muc_e = muc_n.toElement();
-                if (muc_e.isNull())
-                    continue;
-
+            for (QDomElement muc_e = i.firstChildElement(); !muc_e.isNull(); muc_e = muc_e.nextSiblingElement()) {
                 if (muc_e.tagName() == "item")
                     p.setMUCItem(MUCItem(muc_e));
                 else if (muc_e.tagName() == "status")