From 6ce818a10c5f6fd2314524f5d701e13752e4a662 Mon Sep 17 00:00:00 2001 From: Aleksey Lysenko Date: Fri, 30 Dec 2016 21:45:11 +0200 Subject: Add a function to hand off a tcp socket to the websocket server MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This method allows a listening port to process connections with different protocols. It lets the websocket server handle a TCP socket, upgrading it to a websocket [ChangeLog][QWebSocketServer] Add support to handle external QTcpSocket Done-with: André Klitzing Task-number: QTBUG-54276 Change-Id: Ia36b481dc87d6f3806e9f1e61e75e528640f1937 Reviewed-by: Timur Pocheptsov --- src/websockets/qwebsocketserver.cpp | 14 ++++++++++++++ src/websockets/qwebsocketserver.h | 3 +++ src/websockets/qwebsocketserver_p.cpp | 26 +++++++++++++++----------- src/websockets/qwebsocketserver_p.h | 3 +++ 4 files changed, 35 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/websockets/qwebsocketserver.cpp b/src/websockets/qwebsocketserver.cpp index f8ecdf2..e4cfe12 100644 --- a/src/websockets/qwebsocketserver.cpp +++ b/src/websockets/qwebsocketserver.cpp @@ -612,4 +612,18 @@ QList QWebSocketServer::supportedVersions() const return d->supportedVersions(); } +/*! + Upgrades a tcp \a socket to websocket. + + The QWebSocketServer object will take ownership of the socket + object and delete it when appropriate. + + \since 5.9 +*/ +void QWebSocketServer::handleConnection(QTcpSocket *socket) const +{ + Q_D(const QWebSocketServer); + d->handleConnection(socket); +} + QT_END_NAMESPACE diff --git a/src/websockets/qwebsocketserver.h b/src/websockets/qwebsocketserver.h index 511a55b..f846290 100644 --- a/src/websockets/qwebsocketserver.h +++ b/src/websockets/qwebsocketserver.h @@ -54,6 +54,7 @@ QT_BEGIN_NAMESPACE +class QTcpSocket; class QWebSocketServerPrivate; class QWebSocket; class QWebSocketCorsAuthenticator; @@ -118,6 +119,8 @@ public: QList supportedVersions() const; + void handleConnection(QTcpSocket *socket) const; + Q_SIGNALS: void acceptError(QAbstractSocket::SocketError socketError); void serverError(QWebSocketProtocol::CloseCode closeCode); diff --git a/src/websockets/qwebsocketserver_p.cpp b/src/websockets/qwebsocketserver_p.cpp index d675056..b7972b0 100644 --- a/src/websockets/qwebsocketserver_p.cpp +++ b/src/websockets/qwebsocketserver_p.cpp @@ -384,17 +384,8 @@ void QWebSocketServerPrivate::setError(QWebSocketProtocol::CloseCode code, const */ void QWebSocketServerPrivate::onNewConnection() { - while (m_pTcpServer->hasPendingConnections()) { - QTcpSocket *pTcpSocket = m_pTcpServer->nextPendingConnection(); - //use a queued connection because a QSslSocket - //needs the event loop to process incoming data - //if not queued, data is incomplete when handshakeReceived is called - QObjectPrivate::connect(pTcpSocket, &QTcpSocket::readyRead, - this, &QWebSocketServerPrivate::handshakeReceived, - Qt::QueuedConnection); - QObjectPrivate::connect(pTcpSocket, &QTcpSocket::disconnected, - this, &QWebSocketServerPrivate::onSocketDisconnected); - } + while (m_pTcpServer->hasPendingConnections()) + handleConnection(m_pTcpServer->nextPendingConnection()); } /*! @@ -491,4 +482,17 @@ void QWebSocketServerPrivate::handshakeReceived() } } +void QWebSocketServerPrivate::handleConnection(QTcpSocket *pTcpSocket) const +{ + if (Q_LIKELY(pTcpSocket)) { + // Use a queued connection because a QSslSocket needs the event loop to process incoming + // data. If not queued, data is incomplete when handshakeReceived is called. + QObjectPrivate::connect(pTcpSocket, &QTcpSocket::readyRead, + this, &QWebSocketServerPrivate::handshakeReceived, + Qt::QueuedConnection); + QObjectPrivate::connect(pTcpSocket, &QTcpSocket::disconnected, + this, &QWebSocketServerPrivate::onSocketDisconnected); + } +} + QT_END_NAMESPACE diff --git a/src/websockets/qwebsocketserver_p.h b/src/websockets/qwebsocketserver_p.h index 6aabebd..0ca7495 100644 --- a/src/websockets/qwebsocketserver_p.h +++ b/src/websockets/qwebsocketserver_p.h @@ -65,6 +65,7 @@ QT_BEGIN_NAMESPACE class QTcpServer; +class QTcpSocket; class QWebSocketServer; class QWebSocketServerPrivate : public QObjectPrivate @@ -120,6 +121,8 @@ public: void setError(QWebSocketProtocol::CloseCode code, const QString &errorString); + void handleConnection(QTcpSocket *pTcpSocket) const; + QWebSocketServer * const q_ptr; private: -- cgit v1.2.1