X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fidentserver.h;h=3723c2528b428c39e6762d084c4ac8672106c06b;hb=f27435c3d1b2793718e483449c7d6a62ee6cac8e;hp=4d4aecc5185214392b17dc6ffbdd90b40ca8f568;hpb=41b9d689945e784b160a25d12076600ff4b7ae90;p=quassel.git

diff --git a/src/core/identserver.h b/src/core/identserver.h
index 4d4aecc5..3723c252 100644
--- a/src/core/identserver.h
+++ b/src/core/identserver.h
@@ -20,45 +20,55 @@
 
 #pragma once
 
+#include <list>
+
+#include <QHash>
+#include <QObject>
+#include <QPointer>
+#include <QString>
 #include <QTcpServer>
 #include <QTcpSocket>
 
 #include "coreidentity.h"
 
-struct Request {
-    QTcpSocket *socket;
+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
+
+class IdentServer : public QObject
+{
+    Q_OBJECT
+
 public:
-    IdentServer(bool strict, QObject *parent);
-    ~IdentServer() override;
+    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, qint64 socketId);
-    bool removeSocket(const CoreIdentity *identity, const QHostAddress &localAddress, quint16 localPort, const QHostAddress &peerAddress, quint16 peerPort, qint64 socketId);
+    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:
-    bool responseAvailable(Request request);
-    void responseUnavailable(Request request);
-
-    QString sysIdentForIdentity(const CoreIdentity *identity) const;
+    bool responseAvailable(Request request) const;
 
-    bool hasSocketsBelowId(qint64 socketId);
+    qint64 lowestSocketId() const;
 
     void processWaiting(qint64 socketId);
 
@@ -66,11 +76,9 @@ private:
 
     QTcpServer _server, _v6server;
 
-    bool _strict;
-
     QHash<uint16_t, QString> _connections;
     std::list<Request> _requestQueue;
     std::list<qint64> _waiting;
-    qint64 _socketId;
-    qint64 _requestId;
+    qint64 _socketId{0};
+    qint64 _requestId{0};
 };