projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cmake: avoid de-duplication of user's CXXFLAGS
[quassel.git]
/
src
/
core
/
sslserver.h
diff --git
a/src/core/sslserver.h
b/src/core/sslserver.h
index
609ec77
..
4997daa
100644
(file)
--- a/
src/core/sslserver.h
+++ b/
src/core/sslserver.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-20
18
by the Quassel Project *
+ * Copyright (C) 2005-20
22
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-20,26
+20,22
@@
#pragma once
#pragma once
-#ifdef HAVE_SSL
-
+#include <QFile>
#include <QSslCertificate>
#include <QSslKey>
#include <QTcpServer>
#include <QSslCertificate>
#include <QSslKey>
#include <QTcpServer>
-#include <QLinkedList>
-#include
<QFile>
+
+#include
"metricsserver.h"
class SslServer : public QTcpServer
{
Q_OBJECT
public:
class SslServer : public QTcpServer
{
Q_OBJECT
public:
- SslServer(QObject *parent = 0);
-
- bool hasPendingConnections() const override { return !_pendingConnections.isEmpty(); }
- QTcpSocket *nextPendingConnection() override;
+ SslServer(QObject* parent = nullptr);
- const QSslCertificate
&
certificate() const { return _cert; }
- const QSslKey
&
key() const { return _key; }
+ const QSslCertificate
&
certificate() const { return _cert; }
+ const QSslKey
&
key() const { return _key; }
bool isCertValid() const { return _isCertValid; }
/**
bool isCertValid() const { return _isCertValid; }
/**
@@
-52,14
+48,12
@@
public:
*/
bool reloadCerts();
*/
bool reloadCerts();
+ void setMetricsServer(MetricsServer* metricsServer);
+
protected:
protected:
-#if QT_VERSION >= 0x050000
void incomingConnection(qintptr socketDescriptor) override;
void incomingConnection(qintptr socketDescriptor) override;
-#else
- void incomingConnection(int socketDescriptor) override;
-#endif
- bool setCertificate(const QString
&path, const QString &
keyPath);
+ bool setCertificate(const QString
& path, const QString&
keyPath);
private:
/**
private:
/**
@@
-71,18
+65,18
@@
private:
* @return True if certificates loaded successfully, otherwise false.
*/
bool loadCerts();
* @return True if certificates loaded successfully, otherwise false.
*/
bool loadCerts();
- QSslKey loadKey(QFile *keyFile);
+ QSslKey loadKey(QFile* keyFile);
+
+ MetricsServer* _metricsServer{nullptr};
- QLinkedList<QTcpSocket *> _pendingConnections;
QSslCertificate _cert;
QSslKey _key;
QList<QSslCertificate> _ca;
QSslCertificate _cert;
QSslKey _key;
QList<QSslCertificate> _ca;
- bool _isCertValid;
+ bool _isCertValid
{false}
;
// Used when reloading certificates later
// 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)
-};
+ 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;
+};