226d06402b
The system was just treating IP (and optionally port) as a unique identifier, so if a peer had multiple possible paths to a client they would connect multiple times. This fixes that by generating using QUuid in each client. We then use this during broadcast, replacing the username we sent before (which was not used), and as part of the greeting. The greeting now is more complex, since we need to send both username and the ID. Change-Id: I6c6c2ffd5198406aad48445a68dd6aab36de69c0 Reviewed-by: Konrad Kujawa <konrad.kujawa@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
50 lines
1020 B
C++
50 lines
1020 B
C++
// Copyright (C) 2016 The Qt Company Ltd.
|
|
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
|
|
|
|
#ifndef PEERMANAGER_H
|
|
#define PEERMANAGER_H
|
|
|
|
#include <QByteArray>
|
|
#include <QList>
|
|
#include <QObject>
|
|
#include <QTimer>
|
|
#include <QUdpSocket>
|
|
|
|
class Client;
|
|
class Connection;
|
|
|
|
class PeerManager : public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
explicit PeerManager(Client *client);
|
|
|
|
void setServerPort(int port);
|
|
QString userName() const;
|
|
QByteArray uniqueId() const;
|
|
void startBroadcasting();
|
|
bool isLocalHostAddress(const QHostAddress &address) const;
|
|
|
|
signals:
|
|
void newConnection(Connection *connection);
|
|
|
|
private slots:
|
|
void sendBroadcastDatagram();
|
|
void readBroadcastDatagram();
|
|
|
|
private:
|
|
void updateAddresses();
|
|
|
|
Client *client = nullptr;
|
|
QList<QHostAddress> broadcastAddresses;
|
|
QList<QHostAddress> ipAddresses;
|
|
QUdpSocket broadcastSocket;
|
|
QTimer broadcastTimer;
|
|
QString username;
|
|
QByteArray localUniqueId;
|
|
int serverPort = 0;
|
|
};
|
|
|
|
#endif
|