X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fidentserver.h;h=3723c2528b428c39e6762d084c4ac8672106c06b;hp=5aa827373790d61a51bda8df762f9e92c7a6a9d2;hb=c194ed5fb3d15e14b9364f9796d3521910dc72fe;hpb=9451580d19875b23ec52af64585496efb7268e0f

diff --git a/src/core/identserver.h b/src/core/identserver.h
index 5aa82737..3723c252 100644
--- a/src/core/identserver.h
+++ b/src/core/identserver.h
@@ -20,32 +20,65 @@
 
 #pragma once
 
+#include <list>
+
+#include <QHash>
+#include <QObject>
+#include <QPointer>
+#include <QString>
 #include <QTcpServer>
 #include <QTcpSocket>
 
 #include "coreidentity.h"
 
-class IdentServer : public QObject {
-Q_OBJECT
+struct Request
+{
+    QPointer<QTcpSocket> socket;
+    uint16_t localPort;
+    QString query;
+    qint64 transactionId;
+    qint64 requestId;
+
+    friend bool operator==(const Request &a, const Request &b);
+
+    void respondSuccess(const QString &user);
+    void respondError(const QString &error);
+};
+
+
+class IdentServer : public QObject
+{
+    Q_OBJECT
+
 public:
-    IdentServer(bool strict, QObject *parent);
-    ~IdentServer();
+    IdentServer(QObject *parent = nullptr);
 
     bool startListening();
     void stopListening(const QString &msg);
+    qint64 addWaitingSocket();
+
 public slots:
-    bool addSocket(const CoreIdentity *identity, const QHostAddress &localAddress, quint16 localPort, const QHostAddress &peerAddress, quint16 peerPort);
-    bool removeSocket(const CoreIdentity *identity, const QHostAddress &localAddress, quint16 localPort, const QHostAddress &peerAddress, quint16 peerPort);
+    void addSocket(const CoreIdentity *identity, const QHostAddress &localAddress, quint16 localPort, const QHostAddress &peerAddress, quint16 peerPort, qint64 socketId);
+    void removeSocket(const CoreIdentity *identity, const QHostAddress &localAddress, quint16 localPort, const QHostAddress &peerAddress, quint16 peerPort, qint64 socketId);
 
 private slots:
     void incomingConnection();
-
     void respond();
 
 private:
-    QTcpServer _server, _v6server;
+    bool responseAvailable(Request request) const;
+
+    qint64 lowestSocketId() const;
 
-    bool _strict;
+    void processWaiting(qint64 socketId);
+
+    void removeWaitingSocket(qint64 socketId);
+
+    QTcpServer _server, _v6server;
 
     QHash<uint16_t, QString> _connections;
+    std::list<Request> _requestQueue;
+    std::list<qint64> _waiting;
+    qint64 _socketId{0};
+    qint64 _requestId{0};
 };