X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fsslserver.h;h=eead9bfeda7c6a2baa398adab2cc00f49dfdd58a;hp=8e91ddd317c7fa6f965e7458de85c5bbb9ee6893;hb=HEAD;hpb=cc6e7c08709c4e761e2fd9c2e322751015497003

diff --git a/src/core/sslserver.h b/src/core/sslserver.h
index 8e91ddd3..4997daae 100644
--- a/src/core/sslserver.h
+++ b/src/core/sslserver.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2019 by the Quassel Project                        *
+ *   Copyright (C) 2005-2022 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,13 +20,12 @@
 
 #pragma once
 
-#ifdef HAVE_SSL
+#include <QFile>
+#include <QSslCertificate>
+#include <QSslKey>
+#include <QTcpServer>
 
-#    include <QFile>
-#    include <QLinkedList>
-#    include <QSslCertificate>
-#    include <QSslKey>
-#    include <QTcpServer>
+#include "metricsserver.h"
 
 class SslServer : public QTcpServer
 {
@@ -35,9 +34,6 @@ class SslServer : public QTcpServer
 public:
     SslServer(QObject* parent = nullptr);
 
-    bool hasPendingConnections() const override { return !_pendingConnections.isEmpty(); }
-    QTcpSocket* nextPendingConnection() override;
-
     const QSslCertificate& certificate() const { return _cert; }
     const QSslKey& key() const { return _key; }
     bool isCertValid() const { return _isCertValid; }
@@ -52,6 +48,8 @@ public:
      */
     bool reloadCerts();
 
+    void setMetricsServer(MetricsServer* metricsServer);
+
 protected:
     void incomingConnection(qintptr socketDescriptor) override;
 
@@ -69,7 +67,8 @@ private:
     bool loadCerts();
     QSslKey loadKey(QFile* keyFile);
 
-    QLinkedList<QTcpSocket*> _pendingConnections;
+    MetricsServer* _metricsServer{nullptr};
+
     QSslCertificate _cert;
     QSslKey _key;
     QList<QSslCertificate> _ca;
@@ -78,6 +77,6 @@ private:
     // Used when reloading certificates later
     QString _sslCertPath;  /// Path to the certificate file
     QString _sslKeyPath;   /// Path to the private key file (may be in same file as above)
-};
 
-#endif  // HAVE_SSL
+    QDateTime _certificateExpires;
+};