1 files changed, 23 insertions, 29 deletions

diff --git a/examples/network/network-chat/client.cpp b/examples/network/network-chat/client.cpp
index c9b165f724..c637224127 100644
--- a/examples/network/network-chat/client.cpp
+++ b/examples/network/network-chat/client.cpp
@@ -1,15 +1,18 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
-#include <QtNetwork>
-
 #include "client.h"
 #include "connection.h"
 #include "peermanager.h"
 
+#include <QHostInfo>
+
+#include <algorithm>
+#include <functional>
+
 Client::Client()
+    : peerManager(new PeerManager(this))
 {
-    peerManager = new PeerManager(this);
     peerManager->setServerPort(server.serverPort());
     peerManager->startBroadcasting();
 
@@ -24,7 +27,7 @@ void Client::sendMessage(const QString &message)
     if (message.isEmpty())
         return;
 
-    for (Connection *connection : qAsConst(peers))
+    for (Connection *connection : std::as_const(peers))
         connection->sendMessage(message);
 }
 
@@ -34,43 +37,35 @@ QString Client::nickName() const
            + ':' + QString::number(server.serverPort());
 }
 
-bool Client::hasConnection(const QHostAddress &senderIp, int senderPort) const
+bool Client::hasConnection(const QByteArray &peerUniqueId) const
 {
-    if (senderPort == -1)
-        return peers.contains(senderIp);
-
-    if (!peers.contains(senderIp))
-        return false;
-
-    const QList<Connection *> connections = peers.values(senderIp);
-    for (const Connection *connection : connections) {
-        if (connection->peerPort() == senderPort)
-            return true;
-    }
-
-    return false;
+    return peers.contains(peerUniqueId);
 }
 
 void Client::newConnection(Connection *connection)
 {
-    connection->setGreetingMessage(peerManager->userName());
-
-    connect(connection, &Connection::errorOccurred, this, &Client::connectionError);
-    connect(connection, &Connection::disconnected, this, &Client::disconnected);
+    connection->setGreetingMessage(peerManager->userName(), peerManager->uniqueId());
     connect(connection, &Connection::readyForUse, this, &Client::readyForUse);
+    connect(connection, &Connection::errorOccurred, connection, &QObject::deleteLater);
+    connect(connection, &Connection::disconnected, connection, &QObject::deleteLater);
 }
 
 void Client::readyForUse()
 {
     Connection *connection = qobject_cast<Connection *>(sender());
-    if (!connection || hasConnection(connection->peerAddress(),
-                                     connection->peerPort()))
+    if (!connection || hasConnection(connection->uniqueId())) {
+        if (connection) {
+            connection->disconnectFromHost();
+            connection->deleteLater();
+        }
         return;
+    }
 
-    connect(connection,  &Connection::newMessage,
-            this, &Client::newMessage);
+    connect(connection, &Connection::errorOccurred, this, &Client::connectionError);
+    connect(connection, &Connection::disconnected, this, &Client::disconnected);
+    connect(connection, &Connection::newMessage, this, &Client::newMessage);
 
-    peers.insert(connection->peerAddress(), connection);
+    peers.insert(connection->uniqueId(), connection);
     QString nick = connection->name();
     if (!nick.isEmpty())
         emit newParticipant(nick);
@@ -90,8 +85,7 @@ void Client::connectionError(QAbstractSocket::SocketError /* socketError */)
 
 void Client::removeConnection(Connection *connection)
 {
-    if (peers.contains(connection->peerAddress())) {
-        peers.remove(connection->peerAddress());
+    if (peers.remove(connection->uniqueId())) {
         QString nick = connection->name();
         if (!nick.isEmpty())
             emit participantLeft(nick);