From 5a2f79450f5de00dab58b41e39810a8212781828 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 24 Jul 2018 14:39:25 +0200
Subject: [server] Cleanup and simplify SslServer

---
 src/server/net/sslserver.h | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

(limited to 'src/server/net/sslserver.h')

diff --git a/src/server/net/sslserver.h b/src/server/net/sslserver.h
index 6e8f26e..03d947a 100644
--- a/src/server/net/sslserver.h
+++ b/src/server/net/sslserver.h
@@ -17,11 +17,12 @@
 #ifndef SSLSERVER_H_
 #define SSLSERVER_H_
 
-#include <QtCore/QList>
+#include <QHash>
 #include <QtNetwork/QTcpServer>
 #include <QtNetwork/QSslError>
 
 class QSslSocket;
+class QTimer;
 
 /**
  * Class for handling ssl server connections.
@@ -30,26 +31,17 @@ class SslServer : public QTcpServer
 {
 	Q_OBJECT
 
-private Q_SLOTS:
+private slots:
 	void sslErrors ( const QList<QSslError> & errors );
-	void sock_closed();
-	void sock_error(QAbstractSocket::SocketError err);
 
 public:
-	SslServer();
+	explicit SslServer();
 	virtual ~SslServer();
 
-	virtual bool hasPendingConnections () const;
-	// This one has to return a TcpSocket as we're overwriting from the base class
-	// just cast it to QSslSocket later
-	virtual QTcpSocket* nextPendingConnection();
-
 protected:
 	void incomingConnection(qintptr handle);
-	void timerEvent(QTimerEvent* event);
-	QList<QSslSocket*> _pending;
-	QList<QSslSocket*> _delete;
-	int _tmr;
+	QHash<QSslSocket*, qint64> _pending; // Queue for connected but unencrypted connections
+	QTimer* _timer;
 };
 
 #endif /* SSLSERVER_H_ */
-- 
cgit v1.2.3-55-g7522