modernize: Use '= default' instead of empty ctor/dtor bodies

[quassel.git] / src / core / identserver.h

diff --git a/src/core/identserver.h b/src/core/identserver.h
index 5aa8273..3723c25 100644 (file)
--- a/src/core/identserver.h
+++ b/src/core/identserver.h
@@ -20,32 +20,65 @@
 
 #pragma once
 
 
 #pragma once
 

+#include <list>
+
+#include <QHash>
+#include <QObject>
+#include <QPointer>
+#include <QString>

 #include <QTcpServer>
 #include <QTcpSocket>
 
 #include "coreidentity.h"
 
 #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:
 public:

-    IdentServer(bool strict, QObject *parent);
-    ~IdentServer();
+    IdentServer(QObject *parent = nullptr);

 
     bool startListening();
     void stopListening(const QString &msg);
 
     bool startListening();
     void stopListening(const QString &msg);

+    qint64 addWaitingSocket();
+

 public slots:
 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();
 
 private slots:
     void incomingConnection();

-

     void respond();
 
 private:
     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;
 
     QHash<uint16_t, QString> _connections;

+    std::list<Request> _requestQueue;
+    std::list<qint64> _waiting;
+    qint64 _socketId{0};
+    qint64 _requestId{0};

 };
 };