projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #155 from TheOneRing/improve_connect
[quassel.git]
/
src
/
core
/
sslserver.h
diff --git
a/src/core/sslserver.h
b/src/core/sslserver.h
index
1d01d28
..
9b69a8c
100644
(file)
--- a/
src/core/sslserver.h
+++ b/
src/core/sslserver.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-
09 by the Quassel Project
*
+ * Copyright (C) 2005-
2015 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 *
@@
-15,7
+15,7
@@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 5
9 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
+ * 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
***************************************************************************/
#ifndef SSLSERVER_H
***************************************************************************/
#ifndef SSLSERVER_H
@@
-28,29
+28,38
@@
#include <QTcpServer>
#include <QLinkedList>
#include <QTcpServer>
#include <QLinkedList>
-class SslServer : public QTcpServer {
- Q_OBJECT
+class SslServer : public QTcpServer
+{
+ Q_OBJECT
public:
public:
- SslServer(QObject *parent = 0);
+
SslServer(QObject *parent = 0);
- virtual inline bool hasPendingConnections() const { return !_pendingConnections.isEmpty(); }
- virtual QTcpSocket *nextPendingConnection();
+
virtual inline bool hasPendingConnections() const { return !_pendingConnections.isEmpty(); }
+
virtual QTcpSocket *nextPendingConnection();
- virtual inline const QSslCertificate &certificate() const { return _cert; }
- virtual inline const QSslKey &key() const { return _key; }
-
virtual inline bool certIsValid() const { return _certIs
Valid; }
+
virtual inline const QSslCertificate &certificate() const { return _cert; }
+
virtual inline const QSslKey &key() const { return _key; }
+
virtual inline bool isCertValid() const { return _isCert
Valid; }
protected:
protected:
- virtual void incomingConnection(int socketDescriptor);
+#if QT_VERSION >= 0x050000
+ virtual void incomingConnection(qintptr socketDescriptor);
+#else
+ virtual void incomingConnection(int socketDescriptor);
+#endif
+
+ virtual bool setCertificate(const QString &path, const QString &keyPath);
private:
private:
- QLinkedList<QTcpSocket *> _pendingConnections;
- QSslCertificate _cert;
- QSslKey _key;
- bool _certIsValid;
+ QLinkedList<QTcpSocket *> _pendingConnections;
+ QSslCertificate _cert;
+ QSslKey _key;
+ QList<QSslCertificate> _ca;
+ bool _isCertValid;
};
};
+
#endif //HAVE_SSL
#endif //SSLSERVER_H
#endif //HAVE_SSL
#endif //SSLSERVER_H