diff options
author | Lars Schmertmann <Lars.Schmertmann@governikus.de> | 2019-11-08 14:55:54 +0100 |
---|---|---|
committer | Lars Schmertmann <Lars.Schmertmann@governikus.de> | 2020-01-21 13:57:21 +0100 |
commit | 9f1bfd08c47de2a1f59b406ae57e5a90d2670ea6 (patch) | |
tree | 3ed1ef59dadadee9008be92fd48d7ebd94763f8b /src/websockets/qwebsocket_p.cpp | |
parent | 370a7c165bf3bb46195b7077c5a88bd97bb67d17 (diff) | |
download | qtwebsockets-9f1bfd08c47de2a1f59b406ae57e5a90d2670ea6.tar.gz |
Use the new functions/signals introduced in QSslSocket
Task-number: QTBUG-68419
Change-Id: Icdc41079cb946d4316cc0ec2ae40522e6de52725
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/websockets/qwebsocket_p.cpp')
-rw-r--r-- | src/websockets/qwebsocket_p.cpp | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp index 17f0224..01b58b5 100644 --- a/src/websockets/qwebsocket_p.cpp +++ b/src/websockets/qwebsocket_p.cpp @@ -285,6 +285,18 @@ void QWebSocketPrivate::ignoreSslErrors() } /*! + * \internal + */ +void QWebSocketPrivate::continueInterruptedHandshake() +{ + if (Q_LIKELY(m_pSocket)) { + QSslSocket *pSslSocket = qobject_cast<QSslSocket *>(m_pSocket); + if (Q_LIKELY(pSslSocket)) + pSslSocket->continueInterruptedHandshake(); + } +} + +/*! * \internal */ void QWebSocketPrivate::_q_updateSslConfiguration() @@ -612,6 +624,14 @@ void QWebSocketPrivate::makeConnections(QTcpSocket *pTcpSocket) q, &QWebSocket::sslErrors); QObjectPrivate::connect(sslSocket, &QSslSocket::encrypted, this, &QWebSocketPrivate::_q_updateSslConfiguration); + QObject::connect(sslSocket, &QSslSocket::peerVerifyError, + q, &QWebSocket::peerVerifyError); + QObject::connect(sslSocket, &QSslSocket::alertSent, + q, &QWebSocket::alertSent); + QObject::connect(sslSocket, &QSslSocket::alertReceived, + q, &QWebSocket::alertReceived); + QObject::connect(sslSocket, &QSslSocket::handshakeInterruptedOnError, + q, &QWebSocket::handshakeInterruptedOnError); } else #endif // QT_NO_SSL { |