-/*
-QWebSockets implements the WebSocket protocol as defined in RFC 6455.
-Copyright (C) 2013 Kurt Pattyn (pattyn.kurt@gmail.com)
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtWebSockets module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
#include "qwebsocket.h"
#include "qwebsocket_p.h"
+#include "qwebsocketprotocol_p.h"
#include "qwebsockethandshakerequest_p.h"
#include "qwebsockethandshakeresponse_p.h"
-#include <QUrl>
-#include <QTcpSocket>
-#include <QByteArray>
-#include <QtEndian>
-#include <QCryptographicHash>
-#include <QRegularExpression>
-#include <QStringList>
-#include <QHostAddress>
-#include <QStringBuilder> //for more efficient string concatenation
+
+#include <QtCore/QUrl>
+#include <QtNetwork/QAuthenticator>
+#include <QtNetwork/QTcpSocket>
+#include <QtCore/QByteArray>
+#include <QtCore/QtEndian>
+#include <QtCore/QCryptographicHash>
+#include <QtCore/QRegularExpression>
+#include <QtCore/QStringList>
+#include <QtNetwork/QHostAddress>
+#include <QtCore/QStringBuilder> //for more efficient string concatenation
#ifndef QT_NONETWORKPROXY
-#include <QNetworkProxy>
+#include <QtNetwork/QNetworkProxy>
+#endif
+#ifndef QT_NO_SSL
+#include <QtNetwork/QSslConfiguration>
+#include <QtNetwork/QSslError>
#endif
-#include <QDebug>
+#include <QtCore/QDebug>
#include <limits>
const quint64 FRAME_SIZE_IN_BYTES = 512 * 512 * 2; //maximum size of a frame when sending a message
+QWebSocketConfiguration::QWebSocketConfiguration() :
+#ifndef QT_NO_SSL
+ m_sslConfiguration(QSslConfiguration::defaultConfiguration()),
+ m_ignoredSslErrors(),
+ m_ignoreSslErrors(false),
+#endif
+#ifndef QT_NONETWORKPROXY
+ m_proxy(QNetworkProxy::DefaultProxy)
+#endif
+{
+}
+
/*!
\internal
*/
-QWebSocketPrivate::QWebSocketPrivate(const QString &origin, QWebSocketProtocol::Version version, QWebSocket *pWebSocket, QObject *parent) :
- QObject(parent),
+QWebSocketPrivate::QWebSocketPrivate(const QString &origin, QWebSocketProtocol::Version version,
+ QWebSocket *pWebSocket) :
+ QObjectPrivate(),
q_ptr(pWebSocket),
- m_pSocket(new QTcpSocket(this)),
- m_errorString(),
+ m_pSocket(),
+ m_errorString(QWebSocket::tr("Unknown error")),
m_version(version),
m_resourceName(),
m_requestUrl(),
m_protocol(),
m_extension(),
m_socketState(QAbstractSocket::UnconnectedState),
+ m_pauseMode(QAbstractSocket::PauseNever),
+ m_readBufferSize(0),
m_key(),
m_mustMask(true),
m_isClosingHandshakeSent(false),
m_isClosingHandshakeReceived(false),
+ m_closeCode(QWebSocketProtocol::CloseCodeNormal),
+ m_closeReason(),
m_pingTimer(),
- m_dataProcessor()
+ m_dataProcessor(),
+ m_configuration()
{
- Q_ASSERT(pWebSocket);
- makeConnections(m_pSocket);
- qsrand(static_cast<uint>(QDateTime::currentMSecsSinceEpoch()));
}
/*!
\internal
*/
-QWebSocketPrivate::QWebSocketPrivate(QTcpSocket *pTcpSocket, QWebSocketProtocol::Version version, QWebSocket *pWebSocket, QObject *parent) :
- QObject(parent),
+QWebSocketPrivate::QWebSocketPrivate(QTcpSocket *pTcpSocket, QWebSocketProtocol::Version version,
+ QWebSocket *pWebSocket) :
+ QObjectPrivate(),
q_ptr(pWebSocket),
m_pSocket(pTcpSocket),
m_errorString(pTcpSocket->errorString()),
m_protocol(),
m_extension(),
m_socketState(pTcpSocket->state()),
+ m_pauseMode(pTcpSocket->pauseMode()),
+ m_readBufferSize(pTcpSocket->readBufferSize()),
m_key(),
m_mustMask(true),
m_isClosingHandshakeSent(false),
m_isClosingHandshakeReceived(false),
+ m_closeCode(QWebSocketProtocol::CloseCodeNormal),
+ m_closeReason(),
m_pingTimer(),
- m_dataProcessor()
+ m_dataProcessor(),
+ m_configuration()
{
- Q_ASSERT(pWebSocket);
- makeConnections(m_pSocket);
+}
+
+/*!
+ \internal
+*/
+void QWebSocketPrivate::init()
+{
+ Q_ASSERT(q_ptr);
+ //TODO: need a better randomizer
+ qsrand(static_cast<uint>(QDateTime::currentMSecsSinceEpoch()));
+
+ if (m_pSocket) {
+ makeConnections(m_pSocket.data());
+ }
}
/*!
*/
QWebSocketPrivate::~QWebSocketPrivate()
{
+ if (!m_pSocket)
+ return;
if (state() == QAbstractSocket::ConnectedState)
- {
- close(QWebSocketProtocol::CC_GOING_AWAY, tr("Connection closed"));
- }
- releaseConnections(m_pSocket);
- m_pSocket->deleteLater();
- m_pSocket = Q_NULLPTR;
+ close(QWebSocketProtocol::CloseCodeGoingAway, QWebSocket::tr("Connection closed"));
+ releaseConnections(m_pSocket.data());
}
/*!
*/
void QWebSocketPrivate::abort()
{
- m_pSocket->abort();
+ if (m_pSocket)
+ m_pSocket->abort();
}
/*!
*/
QAbstractSocket::SocketError QWebSocketPrivate::error() const
{
- return m_pSocket->error();
+ QAbstractSocket::SocketError err = QAbstractSocket::UnknownSocketError;
+ if (Q_LIKELY(m_pSocket))
+ err = m_pSocket->error();
+ return err;
}
/*!
*/
QString QWebSocketPrivate::errorString() const
{
+ QString errMsg;
if (!m_errorString.isEmpty())
- {
- return m_errorString;
- }
- else
- {
- return m_pSocket->errorString();
- }
+ errMsg = m_errorString;
+ else if (m_pSocket)
+ errMsg = m_pSocket->errorString();
+ return errMsg;
}
/*!
*/
bool QWebSocketPrivate::flush()
{
- return m_pSocket->flush();
+ bool result = true;
+ if (Q_LIKELY(m_pSocket))
+ result = m_pSocket->flush();
+ return result;
+}
+
+/*!
+ \internal
+ */
+qint64 QWebSocketPrivate::sendTextMessage(const QString &message)
+{
+ return doWriteFrames(message.toUtf8(), false);
}
/*!
\internal
*/
-qint64 QWebSocketPrivate::write(const char *message)
+qint64 QWebSocketPrivate::sendBinaryMessage(const QByteArray &data)
{
- //TODO: create a QByteArray from message, and directly call doWriteData
- //now the data is converted to a string, and then converted back to a bytearray
- return write(QString::fromUtf8(message));
+ return doWriteFrames(data, true);
}
+#ifndef QT_NO_SSL
/*!
\internal
*/
-qint64 QWebSocketPrivate::write(const char *message, qint64 maxSize)
+void QWebSocketPrivate::setSslConfiguration(const QSslConfiguration &sslConfiguration)
{
- //TODO: create a QByteArray from message, and directly call doWriteData
- //now the data is converted to a string, and then converted back to a bytearray
- return write(QString::fromUtf8(message, static_cast<int>(maxSize)));
+ m_configuration.m_sslConfiguration = sslConfiguration;
}
/*!
\internal
*/
-qint64 QWebSocketPrivate::write(const QString &message)
+QSslConfiguration QWebSocketPrivate::sslConfiguration() const
{
- return doWriteData(message.toUtf8(), false);
+ return m_configuration.m_sslConfiguration;
}
/*!
\internal
*/
-qint64 QWebSocketPrivate::write(const QByteArray &data)
+void QWebSocketPrivate::ignoreSslErrors(const QList<QSslError> &errors)
+{
+ m_configuration.m_ignoredSslErrors = errors;
+}
+
+/*!
+ * \internal
+ */
+void QWebSocketPrivate::ignoreSslErrors()
{
- return doWriteData(data, true);
+ m_configuration.m_ignoreSslErrors = true;
+ if (Q_LIKELY(m_pSocket)) {
+ QSslSocket *pSslSocket = qobject_cast<QSslSocket *>(m_pSocket.data());
+ if (Q_LIKELY(pSslSocket))
+ pSslSocket->ignoreSslErrors();
+ }
}
+#endif
+
/*!
+ Called from QWebSocketServer
\internal
*/
QWebSocket *QWebSocketPrivate::upgradeFrom(QTcpSocket *pTcpSocket,
const QWebSocketHandshakeResponse &response,
QObject *parent)
{
- QWebSocket *pWebSocket = new QWebSocket(pTcpSocket, response.getAcceptedVersion(), parent);
- pWebSocket->d_func()->setExtension(response.getAcceptedExtension());
- pWebSocket->d_func()->setOrigin(request.origin());
- pWebSocket->d_func()->setRequestUrl(request.requestUrl());
- pWebSocket->d_func()->setProtocol(response.getAcceptedProtocol());
- pWebSocket->d_func()->setResourceName(request.requestUrl().toString(QUrl::RemoveUserInfo));
- //a server should not send masked frames
- pWebSocket->d_func()->enableMasking(false);
+ QWebSocket *pWebSocket = new QWebSocket(pTcpSocket, response.acceptedVersion(), parent);
+ if (Q_LIKELY(pWebSocket)) {
+ pWebSocket->d_func()->setExtension(response.acceptedExtension());
+ pWebSocket->d_func()->setOrigin(request.origin());
+ pWebSocket->d_func()->setRequestUrl(request.requestUrl());
+ pWebSocket->d_func()->setProtocol(response.acceptedProtocol());
+ pWebSocket->d_func()->setResourceName(request.requestUrl().toString(QUrl::RemoveUserInfo));
+ //a server should not send masked frames
+ pWebSocket->d_func()->enableMasking(false);
+ }
return pWebSocket;
}
*/
void QWebSocketPrivate::close(QWebSocketProtocol::CloseCode closeCode, QString reason)
{
- Q_Q(QWebSocket);
- if (!m_isClosingHandshakeSent)
- {
- quint32 maskingKey = 0;
- if (m_mustMask)
- {
- maskingKey = generateMaskingKey();
- }
+ if (Q_UNLIKELY(!m_pSocket))
+ return;
+ if (!m_isClosingHandshakeSent) {
+ Q_Q(QWebSocket);
const quint16 code = qToBigEndian<quint16>(closeCode);
QByteArray payload;
payload.append(static_cast<const char *>(static_cast<const void *>(&code)), 2);
if (!reason.isEmpty())
- {
payload.append(reason.toUtf8());
- }
- if (m_mustMask)
- {
+ quint32 maskingKey = 0;
+ if (m_mustMask) {
+ maskingKey = generateMaskingKey();
QWebSocketProtocol::mask(payload.data(), payload.size(), maskingKey);
}
- QByteArray frame = getFrameHeader(QWebSocketProtocol::OC_CLOSE, payload.size(), maskingKey, true);
+ QByteArray frame = getFrameHeader(QWebSocketProtocol::OpCodeClose,
+ payload.size(), maskingKey, true);
frame.append(payload);
m_pSocket->write(frame);
m_pSocket->flush();
*/
void QWebSocketPrivate::open(const QUrl &url, bool mask)
{
- m_dataProcessor.clear();
- m_isClosingHandshakeReceived = false;
- m_isClosingHandshakeSent = false;
-
- setRequestUrl(url);
- QString resourceName = url.path();
- if (!url.query().isEmpty())
- {
- if (!resourceName.endsWith(QChar::fromLatin1('?')))
- {
- resourceName.append(QChar::fromLatin1('?'));
- }
- resourceName.append(url.query());
+ //just delete the old socket for the moment;
+ //later, we can add more 'intelligent' handling by looking at the url
+ //m_pSocket.reset();
+ QTcpSocket *pTcpSocket = m_pSocket.take();
+ if (pTcpSocket) {
+ releaseConnections(pTcpSocket);
+ pTcpSocket->deleteLater();
}
- if (resourceName.isEmpty())
- {
- resourceName = QStringLiteral("/");
+ //if (m_url != url)
+ if (Q_LIKELY(!m_pSocket)) {
+ Q_Q(QWebSocket);
+
+ m_dataProcessor.clear();
+ m_isClosingHandshakeReceived = false;
+ m_isClosingHandshakeSent = false;
+
+ setRequestUrl(url);
+ QString resourceName = url.path();
+ if (!url.query().isEmpty()) {
+ if (!resourceName.endsWith(QChar::fromLatin1('?'))) {
+ resourceName.append(QChar::fromLatin1('?'));
+ }
+ resourceName.append(url.query());
+ }
+ if (resourceName.isEmpty())
+ resourceName = QStringLiteral("/");
+ setResourceName(resourceName);
+ enableMasking(mask);
+
+ #ifndef QT_NO_SSL
+ if (url.scheme() == QStringLiteral("wss")) {
+ if (!QSslSocket::supportsSsl()) {
+ const QString message =
+ QWebSocket::tr("SSL Sockets are not supported on this platform.");
+ setErrorString(message);
+ Q_EMIT q->error(QAbstractSocket::UnsupportedSocketOperationError);
+ } else {
+ QSslSocket *sslSocket = new QSslSocket(q);
+ m_pSocket.reset(sslSocket);
+ if (Q_LIKELY(m_pSocket)) {
+ m_pSocket->setSocketOption(QAbstractSocket::LowDelayOption, 1);
+ m_pSocket->setSocketOption(QAbstractSocket::KeepAliveOption, 1);
+ m_pSocket->setReadBufferSize(m_readBufferSize);
+ m_pSocket->setPauseMode(m_pauseMode);
+
+ makeConnections(m_pSocket.data());
+ QObject::connect(sslSocket, &QSslSocket::encryptedBytesWritten, q,
+ &QWebSocket::bytesWritten);
+ setSocketState(QAbstractSocket::ConnectingState);
+
+ sslSocket->setSslConfiguration(m_configuration.m_sslConfiguration);
+ if (Q_UNLIKELY(m_configuration.m_ignoreSslErrors))
+ sslSocket->ignoreSslErrors();
+ else
+ sslSocket->ignoreSslErrors(m_configuration.m_ignoredSslErrors);
+ #ifndef QT_NO_NETWORKPROXY
+ sslSocket->setProxy(m_configuration.m_proxy);
+ #endif
+ sslSocket->connectToHostEncrypted(url.host(), url.port(443));
+ } else {
+ const QString message = QWebSocket::tr("Out of memory.");
+ setErrorString(message);
+ Q_EMIT q->error(QAbstractSocket::SocketResourceError);
+ }
+ }
+ } else
+ #endif
+ if (url.scheme() == QStringLiteral("ws")) {
+ m_pSocket.reset(new QTcpSocket(q));
+ if (Q_LIKELY(m_pSocket)) {
+ m_pSocket->setSocketOption(QAbstractSocket::LowDelayOption, 1);
+ m_pSocket->setSocketOption(QAbstractSocket::KeepAliveOption, 1);
+ m_pSocket->setReadBufferSize(m_readBufferSize);
+ m_pSocket->setPauseMode(m_pauseMode);
+
+ makeConnections(m_pSocket.data());
+ QObject::connect(m_pSocket.data(), &QAbstractSocket::bytesWritten, q,
+ &QWebSocket::bytesWritten);
+ setSocketState(QAbstractSocket::ConnectingState);
+ #ifndef QT_NO_NETWORKPROXY
+ m_pSocket->setProxy(m_configuration.m_proxy);
+ #endif
+ m_pSocket->connectToHost(url.host(), url.port(80));
+ } else {
+ const QString message = QWebSocket::tr("Out of memory.");
+ setErrorString(message);
+ Q_EMIT q->error(QAbstractSocket::SocketResourceError);
+ }
+ } else {
+ const QString message =
+ QWebSocket::tr("Unsupported websockets scheme: %1").arg(url.scheme());
+ setErrorString(message);
+ Q_EMIT q->error(QAbstractSocket::UnsupportedSocketOperationError);
+ }
}
- setResourceName(resourceName);
- enableMasking(mask);
-
- setSocketState(QAbstractSocket::ConnectingState);
-
- m_pSocket->connectToHost(url.host(), url.port(80));
}
/*!
*/
void QWebSocketPrivate::ping(const QByteArray &payload)
{
- Q_ASSERT(payload.length() < 126);
+ QByteArray payloadTruncated = payload.left(125);
m_pingTimer.restart();
- QByteArray pingFrame = getFrameHeader(QWebSocketProtocol::OC_PING, payload.size(), 0 /*do not mask*/, true);
- pingFrame.append(payload);
- writeFrame(pingFrame);
+ QByteArray pingFrame = getFrameHeader(QWebSocketProtocol::OpCodePing, payloadTruncated.size(),
+ 0 /*do not mask*/, true);
+ pingFrame.append(payloadTruncated);
+ qint64 ret = writeFrame(pingFrame);
+ Q_UNUSED(ret);
}
/*!
\internal
- Sets the version to use for the websocket protocol; this must be set before the socket is opened.
+ Sets the version to use for the websocket protocol;
+ this must be set before the socket is opened.
*/
void QWebSocketPrivate::setVersion(QWebSocketProtocol::Version version)
{
- m_version = version;
+ if (m_version != version)
+ m_version = version;
}
/*!
*/
void QWebSocketPrivate::setResourceName(const QString &resourceName)
{
- m_resourceName = resourceName;
+ if (m_resourceName != resourceName)
+ m_resourceName = resourceName;
}
/*!
*/
void QWebSocketPrivate::setRequestUrl(const QUrl &requestUrl)
{
- m_requestUrl = requestUrl;
+ if (m_requestUrl != requestUrl)
+ m_requestUrl = requestUrl;
}
/*!
*/
void QWebSocketPrivate::setOrigin(const QString &origin)
{
- m_origin = origin;
+ if (m_origin != origin)
+ m_origin = origin;
}
/*!
*/
void QWebSocketPrivate::setProtocol(const QString &protocol)
{
- m_protocol = protocol;
+ if (m_protocol != protocol)
+ m_protocol = protocol;
}
/*!
*/
void QWebSocketPrivate::setExtension(const QString &extension)
{
- m_extension = extension;
+ if (m_extension != extension)
+ m_extension = extension;
}
/*!
*/
void QWebSocketPrivate::enableMasking(bool enable)
{
- m_mustMask = enable;
-}
-
-/*!
- * \internal
- */
-qint64 QWebSocketPrivate::doWriteData(const QByteArray &data, bool isBinary)
-{
- return doWriteFrames(data, isBinary);
+ if (m_mustMask != enable)
+ m_mustMask = enable;
}
/*!
*/
void QWebSocketPrivate::makeConnections(const QTcpSocket *pTcpSocket)
{
+ Q_ASSERT(pTcpSocket);
Q_Q(QWebSocket);
- //pass through signals
- connect(pTcpSocket, SIGNAL(error(QAbstractSocket::SocketError)), q, SIGNAL(error(QAbstractSocket::SocketError)));
- connect(pTcpSocket, SIGNAL(proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *)), q, SIGNAL(proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *)));
- connect(pTcpSocket, SIGNAL(readChannelFinished()), q, SIGNAL(readChannelFinished()));
- connect(pTcpSocket, SIGNAL(aboutToClose()), q, SIGNAL(aboutToClose()));
- //connect(pTcpSocket, SIGNAL(bytesWritten(qint64)), q, SIGNAL(bytesWritten(qint64)));
-
- //catch signals
- connect(pTcpSocket, SIGNAL(stateChanged(QAbstractSocket::SocketState)), this, SLOT(processStateChanged(QAbstractSocket::SocketState)));
- connect(pTcpSocket, SIGNAL(readyRead()), this, SLOT(processData()));
+ if (Q_LIKELY(pTcpSocket)) {
+ //pass through signals
+ typedef void (QAbstractSocket:: *ASErrorSignal)(QAbstractSocket::SocketError);
+ typedef void (QWebSocket:: *WSErrorSignal)(QAbstractSocket::SocketError);
+ QObject::connect(pTcpSocket,
+ static_cast<ASErrorSignal>(&QAbstractSocket::error),
+ q, static_cast<WSErrorSignal>(&QWebSocket::error));
+ QObject::connect(pTcpSocket, &QAbstractSocket::proxyAuthenticationRequired, q,
+ &QWebSocket::proxyAuthenticationRequired);
+ QObject::connect(pTcpSocket, &QAbstractSocket::readChannelFinished, q,
+ &QWebSocket::readChannelFinished);
+ QObject::connect(pTcpSocket, &QAbstractSocket::aboutToClose, q, &QWebSocket::aboutToClose);
+
+ //catch signals
+ QObjectPrivate::connect(pTcpSocket, &QAbstractSocket::stateChanged, this,
+ &QWebSocketPrivate::processStateChanged);
+ //!!!important to use a QueuedConnection here;
+ //with QTcpSocket there is no problem, but with QSslSocket the processing hangs
+ QObjectPrivate::connect(pTcpSocket, &QAbstractSocket::readyRead, this,
+ &QWebSocketPrivate::processData, Qt::QueuedConnection);
+ }
- connect(&m_dataProcessor, SIGNAL(textFrameReceived(QString,bool)), q, SIGNAL(textFrameReceived(QString,bool)));
- connect(&m_dataProcessor, SIGNAL(binaryFrameReceived(QByteArray,bool)), q, SIGNAL(binaryFrameReceived(QByteArray,bool)));
- connect(&m_dataProcessor, SIGNAL(binaryMessageReceived(QByteArray)), q, SIGNAL(binaryMessageReceived(QByteArray)));
- connect(&m_dataProcessor, SIGNAL(textMessageReceived(QString)), q, SIGNAL(textMessageReceived(QString)));
- connect(&m_dataProcessor, SIGNAL(errorEncountered(QWebSocketProtocol::CloseCode,QString)), this, SLOT(close(QWebSocketProtocol::CloseCode,QString)));
- connect(&m_dataProcessor, SIGNAL(pingReceived(QByteArray)), this, SLOT(processPing(QByteArray)));
- connect(&m_dataProcessor, SIGNAL(pongReceived(QByteArray)), this, SLOT(processPong(QByteArray)));
- connect(&m_dataProcessor, SIGNAL(closeReceived(QWebSocketProtocol::CloseCode,QString)), this, SLOT(processClose(QWebSocketProtocol::CloseCode,QString)));
+ QObject::connect(&m_dataProcessor, &QWebSocketDataProcessor::textFrameReceived, q,
+ &QWebSocket::textFrameReceived);
+ QObject::connect(&m_dataProcessor, &QWebSocketDataProcessor::binaryFrameReceived, q,
+ &QWebSocket::binaryFrameReceived);
+ QObject::connect(&m_dataProcessor, &QWebSocketDataProcessor::binaryMessageReceived, q,
+ &QWebSocket::binaryMessageReceived);
+ QObject::connect(&m_dataProcessor, &QWebSocketDataProcessor::textMessageReceived, q,
+ &QWebSocket::textMessageReceived);
+ QObjectPrivate::connect(&m_dataProcessor, &QWebSocketDataProcessor::errorEncountered, this,
+ &QWebSocketPrivate::close);
+ QObjectPrivate::connect(&m_dataProcessor, &QWebSocketDataProcessor::pingReceived, this,
+ &QWebSocketPrivate::processPing);
+ QObjectPrivate::connect(&m_dataProcessor, &QWebSocketDataProcessor::pongReceived, this,
+ &QWebSocketPrivate::processPong);
+ QObjectPrivate::connect(&m_dataProcessor, &QWebSocketDataProcessor::closeReceived, this,
+ &QWebSocketPrivate::processClose);
}
/*!
*/
void QWebSocketPrivate::releaseConnections(const QTcpSocket *pTcpSocket)
{
- Q_Q(QWebSocket);
- if (pTcpSocket)
- {
- //pass through signals
- disconnect(pTcpSocket, SIGNAL(error(QAbstractSocket::SocketError)), q, SIGNAL(error(QAbstractSocket::SocketError)));
- disconnect(pTcpSocket, SIGNAL(proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *)), q, SIGNAL(proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *)));
- disconnect(pTcpSocket, SIGNAL(readChannelFinished()), q, SIGNAL(readChannelFinished()));
- disconnect(pTcpSocket, SIGNAL(aboutToClose()), q, SIGNAL(aboutToClose()));
- //disconnect(pTcpSocket, SIGNAL(bytesWritten(qint64)), q, SIGNAL(bytesWritten(qint64)));
-
- //catched signals
- disconnect(pTcpSocket, SIGNAL(stateChanged(QAbstractSocket::SocketState)), this, SLOT(processStateChanged(QAbstractSocket::SocketState)));
- disconnect(pTcpSocket, SIGNAL(readyRead()), this, SLOT(processData()));
- }
- disconnect(&m_dataProcessor, SIGNAL(pingReceived(QByteArray)), this, SLOT(processPing(QByteArray)));
- disconnect(&m_dataProcessor, SIGNAL(pongReceived(QByteArray)), this, SLOT(processPong(QByteArray)));
- disconnect(&m_dataProcessor, SIGNAL(closeReceived(QWebSocketProtocol::CloseCode,QString)), this, SLOT(processClose(QWebSocketProtocol::CloseCode,QString)));
- disconnect(&m_dataProcessor, SIGNAL(textFrameReceived(QString,bool)), q, SIGNAL(textFrameReceived(QString,bool)));
- disconnect(&m_dataProcessor, SIGNAL(binaryFrameReceived(QByteArray,bool)), q, SIGNAL(binaryFrameReceived(QByteArray,bool)));
- disconnect(&m_dataProcessor, SIGNAL(binaryMessageReceived(QByteArray)), q, SIGNAL(binaryMessageReceived(QByteArray)));
- disconnect(&m_dataProcessor, SIGNAL(textMessageReceived(QString)), q, SIGNAL(textMessageReceived(QString)));
- disconnect(&m_dataProcessor, SIGNAL(errorEncountered(QWebSocketProtocol::CloseCode,QString)), this, SLOT(close(QWebSocketProtocol::CloseCode,QString)));
+ if (Q_LIKELY(pTcpSocket))
+ pTcpSocket->disconnect(pTcpSocket);
+ m_dataProcessor.disconnect(&m_dataProcessor);
}
/*!
/*!
* \internal
*/
-QByteArray QWebSocketPrivate::getFrameHeader(QWebSocketProtocol::OpCode opCode, quint64 payloadLength, quint32 maskingKey, bool lastFrame) const
+QWebSocketProtocol::CloseCode QWebSocketPrivate::closeCode() const
+{
+ return m_closeCode;
+}
+
+/*!
+ * \internal
+ */
+QString QWebSocketPrivate::closeReason() const
+{
+ return m_closeReason;
+}
+
+/*!
+ * \internal
+ */
+QByteArray QWebSocketPrivate::getFrameHeader(QWebSocketProtocol::OpCode opCode,
+ quint64 payloadLength, quint32 maskingKey,
+ bool lastFrame)
{
QByteArray header;
quint8 byte = 0x00;
bool ok = payloadLength <= 0x7FFFFFFFFFFFFFFFULL;
- if (ok)
- {
- //FIN, RSV1-3, opcode
- byte = static_cast<quint8>((opCode & 0x0F) | (lastFrame ? 0x80 : 0x00)); //FIN, opcode
- //RSV-1, RSV-2 and RSV-3 are zero
+ if (Q_LIKELY(ok)) {
+ //FIN, RSV1-3, opcode (RSV-1, RSV-2 and RSV-3 are zero)
+ byte = static_cast<quint8>((opCode & 0x0F) | (lastFrame ? 0x80 : 0x00));
header.append(static_cast<char>(byte));
- //Now write the masking bit and the payload length byte
byte = 0x00;
if (maskingKey != 0)
- {
byte |= 0x80;
- }
- if (payloadLength <= 125)
- {
+ if (payloadLength <= 125) {
byte |= static_cast<quint8>(payloadLength);
header.append(static_cast<char>(byte));
- }
- else if (payloadLength <= 0xFFFFU)
- {
+ } else if (payloadLength <= 0xFFFFU) {
byte |= 126;
header.append(static_cast<char>(byte));
quint16 swapped = qToBigEndian<quint16>(static_cast<quint16>(payloadLength));
header.append(static_cast<const char *>(static_cast<const void *>(&swapped)), 2);
- }
- else if (payloadLength <= 0x7FFFFFFFFFFFFFFFULL)
- {
+ } else if (payloadLength <= 0x7FFFFFFFFFFFFFFFULL) {
byte |= 127;
header.append(static_cast<char>(byte));
quint64 swapped = qToBigEndian<quint64>(payloadLength);
header.append(static_cast<const char *>(static_cast<const void *>(&swapped)), 8);
}
- //Write mask
- if (maskingKey != 0)
- {
- header.append(static_cast<const char *>(static_cast<const void *>(&maskingKey)), sizeof(quint32));
+ if (maskingKey != 0) {
+ const quint32 mask = qToBigEndian<quint32>(maskingKey);
+ header.append(static_cast<const char *>(static_cast<const void *>(&mask)),
+ sizeof(quint32));
}
- }
- else
- {
- //setErrorString("WebSocket::getHeader: payload too big!");
- //Q_EMIT q_ptr->error(QAbstractSocket::DatagramTooLargeError);
- qDebug() << "WebSocket::getHeader: payload too big!";
+ } else {
+ setErrorString(QStringLiteral("WebSocket::getHeader: payload too big!"));
+ Q_EMIT q_ptr->error(QAbstractSocket::DatagramTooLargeError);
}
return header;
*/
qint64 QWebSocketPrivate::doWriteFrames(const QByteArray &data, bool isBinary)
{
+ qint64 payloadWritten = 0;
+ if (Q_UNLIKELY(!m_pSocket) || (state() != QAbstractSocket::ConnectedState))
+ return payloadWritten;
+
Q_Q(QWebSocket);
- const QWebSocketProtocol::OpCode firstOpCode = isBinary ? QWebSocketProtocol::OC_BINARY : QWebSocketProtocol::OC_TEXT;
+ const QWebSocketProtocol::OpCode firstOpCode = isBinary ?
+ QWebSocketProtocol::OpCodeBinary : QWebSocketProtocol::OpCodeText;
int numFrames = data.size() / FRAME_SIZE_IN_BYTES;
QByteArray tmpData(data);
tmpData.detach();
char *payload = tmpData.data();
- quint64 sizeLeft = static_cast<quint64>(data.size()) % FRAME_SIZE_IN_BYTES;
- if (sizeLeft)
- {
+ quint64 sizeLeft = quint64(data.size()) % FRAME_SIZE_IN_BYTES;
+ if (Q_LIKELY(sizeLeft))
++numFrames;
- }
- if (numFrames == 0) //catch the case where the payload is zero bytes; in that case, we still need to send a frame
- {
+
+ //catch the case where the payload is zero bytes;
+ //in this case, we still need to send a frame
+ if (Q_UNLIKELY(numFrames == 0))
numFrames = 1;
- }
quint64 currentPosition = 0;
qint64 bytesWritten = 0;
- qint64 payloadWritten = 0;
quint64 bytesLeft = data.size();
- for (int i = 0; i < numFrames; ++i)
- {
+ for (int i = 0; i < numFrames; ++i) {
quint32 maskingKey = 0;
if (m_mustMask)
- {
maskingKey = generateMaskingKey();
- }
const bool isLastFrame = (i == (numFrames - 1));
const bool isFirstFrame = (i == 0);
const quint64 size = qMin(bytesLeft, FRAME_SIZE_IN_BYTES);
- const QWebSocketProtocol::OpCode opcode = isFirstFrame ? firstOpCode : QWebSocketProtocol::OC_CONTINUE;
+ const QWebSocketProtocol::OpCode opcode = isFirstFrame ? firstOpCode
+ : QWebSocketProtocol::OpCodeContinue;
//write header
bytesWritten += m_pSocket->write(getFrameHeader(opcode, size, maskingKey, isLastFrame));
//write payload
- if (size > 0)
- {
+ if (Q_LIKELY(size > 0)) {
char *currentData = payload + currentPosition;
if (m_mustMask)
- {
QWebSocketProtocol::mask(currentData, size, maskingKey);
- }
qint64 written = m_pSocket->write(currentData, static_cast<qint64>(size));
- if (written > 0)
- {
+ if (Q_LIKELY(written > 0)) {
bytesWritten += written;
payloadWritten += written;
- }
- else
- {
- setErrorString(tr("Error writing bytes to socket: %1.").arg(m_pSocket->errorString()));
- qDebug() << errorString();
+ } else {
m_pSocket->flush();
+ setErrorString(QWebSocket::tr("Error writing bytes to socket: %1.")
+ .arg(m_pSocket->errorString()));
Q_EMIT q->error(QAbstractSocket::NetworkError);
break;
}
currentPosition += size;
bytesLeft -= size;
}
- if (payloadWritten != data.size())
- {
- setErrorString(tr("Bytes written %1 != %2.").arg(payloadWritten).arg(data.size()));
- qDebug() << errorString();
+ if (Q_UNLIKELY(payloadWritten != data.size())) {
+ setErrorString(QWebSocket::tr("Bytes written %1 != %2.")
+ .arg(payloadWritten).arg(data.size()));
Q_EMIT q->error(QAbstractSocket::NetworkError);
}
return payloadWritten;
*/
quint32 QWebSocketPrivate::generateRandomNumber() const
{
- return static_cast<quint32>((static_cast<double>(qrand()) / RAND_MAX) * std::numeric_limits<quint32>::max());
+ //TODO: need a better randomizer
+ return quint32((double(qrand()) / RAND_MAX) * std::numeric_limits<quint32>::max());
}
/*!
{
QByteArray key;
- for (int i = 0; i < 4; ++i)
- {
- quint32 tmp = generateRandomNumber();
+ for (int i = 0; i < 4; ++i) {
+ const quint32 tmp = generateRandomNumber();
key.append(static_cast<const char *>(static_cast<const void *>(&tmp)), sizeof(quint32));
}
/*!
\internal
*/
-QString QWebSocketPrivate::calculateAcceptKey(const QString &key) const
+QString QWebSocketPrivate::calculateAcceptKey(const QByteArray &key) const
{
- const QString tmpKey = key % QStringLiteral("258EAFA5-E914-47DA-95CA-C5AB0DC85B11");
- const QByteArray hash = QCryptographicHash::hash(tmpKey.toLatin1(), QCryptographicHash::Sha1);
- return QString::fromLatin1(hash.toBase64());
+ const QByteArray tmpKey = key + QByteArrayLiteral("258EAFA5-E914-47DA-95CA-C5AB0DC85B11");
+ const QByteArray hash = QCryptographicHash::hash(tmpKey, QCryptographicHash::Sha1).toBase64();
+ return QString::fromLatin1(hash);
}
/*!
qint64 QWebSocketPrivate::writeFrames(const QList<QByteArray> &frames)
{
qint64 written = 0;
- for (int i = 0; i < frames.size(); ++i)
- {
- written += writeFrame(frames[i]);
+ if (Q_LIKELY(m_pSocket)) {
+ QList<QByteArray>::const_iterator it;
+ for (it = frames.cbegin(); it < frames.cend(); ++it)
+ written += writeFrame(*it);
}
return written;
}
*/
qint64 QWebSocketPrivate::writeFrame(const QByteArray &frame)
{
- return m_pSocket->write(frame);
+ qint64 written = 0;
+ if (Q_LIKELY(m_pSocket))
+ written = m_pSocket->write(frame);
+ return written;
}
/*!
*/
QString readLine(QTcpSocket *pSocket)
{
+ Q_ASSERT(pSocket);
QString line;
char c;
- while (pSocket->getChar(&c))
- {
- if (c == '\r')
- {
+ while (pSocket->getChar(&c)) {
+ if (c == char('\r')) {
pSocket->getChar(&c);
break;
- }
- else
- {
+ } else {
line.append(QChar::fromLatin1(c));
}
}
void QWebSocketPrivate::processHandshake(QTcpSocket *pSocket)
{
Q_Q(QWebSocket);
- if (!pSocket)
- {
+ if (Q_UNLIKELY(!pSocket))
return;
- }
bool ok = false;
QString errorDescription;
int httpStatusCode;
QString httpStatusMessage;
const QRegularExpressionMatch match = regExp.match(statusLine);
- if (match.hasMatch())
- {
+ if (Q_LIKELY(match.hasMatch())) {
QStringList tokens = match.capturedTexts();
tokens.removeFirst(); //remove the search string
- if (tokens.length() == 3)
- {
+ if (tokens.length() == 3) {
httpProtocol = tokens[0];
httpStatusCode = tokens[1].toInt();
httpStatusMessage = tokens[2].trimmed();
ok = true;
}
}
- if (!ok)
- {
- errorDescription = tr("Invalid statusline in response: %1.").arg(statusLine);
- }
- else
- {
+ if (Q_UNLIKELY(!ok)) {
+ errorDescription = QWebSocket::tr("Invalid statusline in response: %1.").arg(statusLine);
+ } else {
QString headerLine = readLine(pSocket);
QMap<QString, QString> headers;
- while (!headerLine.isEmpty())
- {
- const QStringList headerField = headerLine.split(QStringLiteral(": "), QString::SkipEmptyParts);
- headers.insertMulti(headerField[0], headerField[1]);
+ while (!headerLine.isEmpty()) {
+ const QStringList headerField = headerLine.split(QStringLiteral(": "),
+ QString::SkipEmptyParts);
+ if (headerField.size() == 2) {
+ headers.insertMulti(headerField[0], headerField[1]);
+ }
headerLine = readLine(pSocket);
}
- const QString acceptKey = headers.value(QStringLiteral("Sec-WebSocket-Accept"), QStringLiteral(""));
- const QString upgrade = headers.value(QStringLiteral("Upgrade"), QStringLiteral(""));
- const QString connection = headers.value(QStringLiteral("Connection"), QStringLiteral(""));
- //unused for the moment
- //const QString extensions = headers.value(QStringLiteral("Sec-WebSocket-Extensions"), QStringLiteral(""));
- //const QString protocol = headers.value(QStringLiteral("Sec-WebSocket-Protocol"), QStringLiteral(""));
- const QString version = headers.value(QStringLiteral("Sec-WebSocket-Version"), QStringLiteral(""));
-
- if (httpStatusCode == 101) //HTTP/x.y 101 Switching Protocols
- {
+ const QString acceptKey = headers.value(QStringLiteral("Sec-WebSocket-Accept"),
+ QString());
+ const QString upgrade = headers.value(QStringLiteral("Upgrade"), QString());
+ const QString connection = headers.value(QStringLiteral("Connection"), QString());
+// unused for the moment
+// const QString extensions = headers.value(QStringLiteral("Sec-WebSocket-Extensions"),
+// QString());
+// const QString protocol = headers.value(QStringLiteral("Sec-WebSocket-Protocol"),
+// QString());
+ const QString version = headers.value(QStringLiteral("Sec-WebSocket-Version"),
+ QString());
+
+ if (Q_LIKELY(httpStatusCode == 101)) {
+ //HTTP/x.y 101 Switching Protocols
bool conversionOk = false;
const float version = httpProtocol.midRef(5).toFloat(&conversionOk);
//TODO: do not check the httpStatusText right now
(!conversionOk || (version < 1.1f)) ||
(upgrade.toLower() != QStringLiteral("websocket")) ||
(connection.toLower() != QStringLiteral("upgrade")));
- if (ok)
- {
- const QString accept = calculateAcceptKey(QString::fromLatin1(m_key));
+ if (ok) {
+ const QString accept = calculateAcceptKey(m_key);
ok = (accept == acceptKey);
if (!ok)
- {
- errorDescription = tr("Accept-Key received from server %1 does not match the client key %2.").arg(acceptKey).arg(accept);
- }
- }
- else
- {
- errorDescription = tr("QWebSocketPrivate::processHandshake: Invalid statusline in response: %1.").arg(statusLine);
+ errorDescription =
+ QWebSocket::tr("Accept-Key received from server %1 does not match the client key %2.")
+ .arg(acceptKey).arg(accept);
+ } else {
+ errorDescription =
+ QWebSocket::tr("QWebSocketPrivate::processHandshake: Invalid statusline in response: %1.")
+ .arg(statusLine);
}
- }
- else if (httpStatusCode == 400) //HTTP/1.1 400 Bad Request
- {
- if (!version.isEmpty())
- {
- const QStringList versions = version.split(QStringLiteral(", "), QString::SkipEmptyParts);
- if (!versions.contains(QString::number(QWebSocketProtocol::currentVersion())))
- {
+ } else if (httpStatusCode == 400) {
+ //HTTP/1.1 400 Bad Request
+ if (!version.isEmpty()) {
+ const QStringList versions = version.split(QStringLiteral(", "),
+ QString::SkipEmptyParts);
+ if (!versions.contains(QString::number(QWebSocketProtocol::currentVersion()))) {
//if needed to switch protocol version, then we are finished here
//because we cannot handle other protocols than the RFC one (v13)
- errorDescription = tr("Handshake: Server requests a version that we don't support: %1.").arg(versions.join(QStringLiteral(", ")));
+ errorDescription =
+ QWebSocket::tr("Handshake: Server requests a version that we don't support: %1.")
+ .arg(versions.join(QStringLiteral(", ")));
ok = false;
- }
- else
- {
+ } else {
//we tried v13, but something different went wrong
- errorDescription = tr("QWebSocketPrivate::processHandshake: Unknown error condition encountered. Aborting connection.");
+ errorDescription =
+ QWebSocket::tr("QWebSocketPrivate::processHandshake: Unknown error condition encountered. Aborting connection.");
ok = false;
}
}
- }
- else
- {
- errorDescription = tr("QWebSocketPrivate::processHandshake: Unhandled http status code: %1 (%2).").arg(httpStatusCode).arg(httpStatusMessage);
+ } else {
+ errorDescription =
+ QWebSocket::tr("QWebSocketPrivate::processHandshake: Unhandled http status code: %1 (%2).")
+ .arg(httpStatusCode).arg(httpStatusMessage);
ok = false;
}
- if (!ok)
- {
- qDebug() << errorDescription;
+ if (!ok) {
setErrorString(errorDescription);
Q_EMIT q->error(QAbstractSocket::ConnectionRefusedError);
- }
- else
- {
+ } else {
//handshake succeeded
setSocketState(QAbstractSocket::ConnectedState);
Q_EMIT q->connected();
*/
void QWebSocketPrivate::processStateChanged(QAbstractSocket::SocketState socketState)
{
+ Q_ASSERT(m_pSocket);
Q_Q(QWebSocket);
QAbstractSocket::SocketState webSocketState = this->state();
- switch (socketState)
- {
+ switch (socketState) {
case QAbstractSocket::ConnectedState:
- {
- if (webSocketState == QAbstractSocket::ConnectingState)
- {
+ if (webSocketState == QAbstractSocket::ConnectingState) {
m_key = generateKey();
- QString handshake = createHandShakeRequest(m_resourceName, m_requestUrl.host() % QStringLiteral(":") % QString::number(m_requestUrl.port(80)), origin(), QStringLiteral(""), QStringLiteral(""), m_key);
+ const QString handshake =
+ createHandShakeRequest(m_resourceName,
+ m_requestUrl.host()
+ % QStringLiteral(":")
+ % QString::number(m_requestUrl.port(80)),
+ origin(),
+ QString(),
+ QString(),
+ m_key);
m_pSocket->write(handshake.toLatin1());
}
break;
- }
+
case QAbstractSocket::ClosingState:
- {
if (webSocketState == QAbstractSocket::ConnectedState)
- {
setSocketState(QAbstractSocket::ClosingState);
- }
break;
- }
+
case QAbstractSocket::UnconnectedState:
- {
- if (webSocketState != QAbstractSocket::UnconnectedState)
- {
+ if (webSocketState != QAbstractSocket::UnconnectedState) {
setSocketState(QAbstractSocket::UnconnectedState);
Q_EMIT q->disconnected();
}
break;
- }
+
case QAbstractSocket::HostLookupState:
case QAbstractSocket::ConnectingState:
case QAbstractSocket::BoundState:
case QAbstractSocket::ListeningState:
- {
//do nothing
//to make C++ compiler happy;
break;
- }
default:
- {
break;
}
- }
}
-//order of events:
-//connectToHost is called
-//our socket state is set to "connecting", and tcpSocket->connectToHost is called
-//the tcpsocket is opened, a handshake message is sent; a readyRead signal is thrown
-//this signal is catched by processData
-//when OUR socket state is in the "connecting state", this means that
-//we have received data from the server (response to handshake), and that we
-//should "upgrade" our socket to a websocket (connected state)
-//if our socket was already upgraded, then we need to process websocket data
/*!
\internal
*/
void QWebSocketPrivate::processData()
{
- while (m_pSocket->bytesAvailable())
- {
+ Q_ASSERT(m_pSocket);
+ while (m_pSocket->bytesAvailable()) {
if (state() == QAbstractSocket::ConnectingState)
- {
- processHandshake(m_pSocket);
- }
+ processHandshake(m_pSocket.data());
else
- {
- m_dataProcessor.process(m_pSocket);
- }
+ m_dataProcessor.process(m_pSocket.data());
}
}
/*!
\internal
*/
-void QWebSocketPrivate::processPing(QByteArray data)
+void QWebSocketPrivate::processPing(const QByteArray &data)
{
+ Q_ASSERT(m_pSocket);
quint32 maskingKey = 0;
if (m_mustMask)
- {
maskingKey = generateMaskingKey();
- }
- m_pSocket->write(getFrameHeader(QWebSocketProtocol::OC_PONG, data.size(), maskingKey, true));
- if (data.size() > 0)
- {
+ m_pSocket->write(getFrameHeader(QWebSocketProtocol::OpCodePong, data.size(), maskingKey, true));
+ if (data.size() > 0) {
+ QByteArray maskedData = data;
if (m_mustMask)
- {
- QWebSocketProtocol::mask(&data, maskingKey);
- }
- m_pSocket->write(data);
+ QWebSocketProtocol::mask(&maskedData, maskingKey);
+ m_pSocket->write(maskedData);
}
}
/*!
\internal
*/
-void QWebSocketPrivate::processPong(QByteArray data)
+void QWebSocketPrivate::processPong(const QByteArray &data)
{
Q_Q(QWebSocket);
Q_EMIT q->pong(static_cast<quint64>(m_pingTimer.elapsed()), data);
QStringLiteral("Connection: Upgrade") <<
QStringLiteral("Sec-WebSocket-Key: ") % QString::fromLatin1(key);
if (!origin.isEmpty())
- {
handshakeRequest << QStringLiteral("Origin: ") % origin;
- }
- handshakeRequest << QStringLiteral("Sec-WebSocket-Version: ") % QString::number(QWebSocketProtocol::currentVersion());
+ handshakeRequest << QStringLiteral("Sec-WebSocket-Version: ")
+ % QString::number(QWebSocketProtocol::currentVersion());
if (extensions.length() > 0)
- {
handshakeRequest << QStringLiteral("Sec-WebSocket-Extensions: ") % extensions;
- }
if (protocols.length() > 0)
- {
handshakeRequest << QStringLiteral("Sec-WebSocket-Protocol: ") % protocols;
- }
handshakeRequest << QStringLiteral("\r\n");
return handshakeRequest.join(QStringLiteral("\r\n"));
/*!
\internal
*/
-bool QWebSocketPrivate::waitForConnected(int msecs)
-{
- return m_pSocket->waitForConnected(msecs);
-}
-
-/*!
- \internal
- */
-bool QWebSocketPrivate::waitForDisconnected(int msecs)
-{
- return m_pSocket->waitForDisconnected(msecs);
-}
-
-/*!
- \internal
- */
void QWebSocketPrivate::setSocketState(QAbstractSocket::SocketState state)
{
Q_Q(QWebSocket);
- if (m_socketState != state)
- {
+ if (m_socketState != state) {
m_socketState = state;
Q_EMIT q->stateChanged(m_socketState);
}
*/
void QWebSocketPrivate::setErrorString(const QString &errorString)
{
- m_errorString = errorString;
+ if (m_errorString != errorString)
+ m_errorString = errorString;
}
/*!
*/
QHostAddress QWebSocketPrivate::localAddress() const
{
- return m_pSocket->localAddress();
+ QHostAddress address;
+ if (Q_LIKELY(m_pSocket))
+ address = m_pSocket->localAddress();
+ return address;
}
/*!
*/
quint16 QWebSocketPrivate::localPort() const
{
- return m_pSocket->localPort();
+ quint16 port = 0;
+ if (Q_LIKELY(m_pSocket))
+ port = m_pSocket->localPort();
+ return port;
}
/*!
*/
QAbstractSocket::PauseModes QWebSocketPrivate::pauseMode() const
{
- return m_pSocket->pauseMode();
+ return m_pauseMode;
}
/*!
*/
QHostAddress QWebSocketPrivate::peerAddress() const
{
- return m_pSocket->peerAddress();
+ QHostAddress address;
+ if (Q_LIKELY(m_pSocket))
+ address = m_pSocket->peerAddress();
+ return address;
}
/*!
*/
QString QWebSocketPrivate::peerName() const
{
- return m_pSocket->peerName();
+ QString name;
+ if (Q_LIKELY(m_pSocket))
+ name = m_pSocket->peerName();
+ return name;
}
/*!
*/
quint16 QWebSocketPrivate::peerPort() const
{
- return m_pSocket->peerPort();
+ quint16 port = 0;
+ if (Q_LIKELY(m_pSocket))
+ port = m_pSocket->peerPort();
+ return port;
}
+#ifndef QT_NO_NETWORKPROXY
/*!
\internal
*/
QNetworkProxy QWebSocketPrivate::proxy() const
{
- return m_pSocket->proxy();
+ return m_configuration.m_proxy;
}
/*!
\internal
*/
-qint64 QWebSocketPrivate::readBufferSize() const
-{
- return m_pSocket->readBufferSize();
-}
-
-/*!
- \internal
- */
-void QWebSocketPrivate::resume()
-{
- m_pSocket->resume();
-}
-
-/*!
- \internal
- */
-void QWebSocketPrivate::setPauseMode(QAbstractSocket::PauseModes pauseMode)
+void QWebSocketPrivate::setProxy(const QNetworkProxy &networkProxy)
{
- m_pSocket->setPauseMode(pauseMode);
+ if (networkProxy != networkProxy)
+ m_configuration.m_proxy = networkProxy;
}
+#endif //QT_NO_NETWORKPROXY
/*!
\internal
*/
-void QWebSocketPrivate::setProxy(const QNetworkProxy &networkProxy)
+qint64 QWebSocketPrivate::readBufferSize() const
{
- m_pSocket->setProxy(networkProxy);
+ return m_readBufferSize;
}
/*!
\internal
*/
-void QWebSocketPrivate::setReadBufferSize(qint64 size)
+void QWebSocketPrivate::resume()
{
- m_pSocket->setReadBufferSize(size);
+ if (Q_LIKELY(m_pSocket))
+ m_pSocket->resume();
}
/*!
- \internal
+ \internal
*/
-void QWebSocketPrivate::setSocketOption(QAbstractSocket::SocketOption option, const QVariant &value)
+void QWebSocketPrivate::setPauseMode(QAbstractSocket::PauseModes pauseMode)
{
- m_pSocket->setSocketOption(option, value);
+ m_pauseMode = pauseMode;
+ if (Q_LIKELY(m_pSocket))
+ m_pSocket->setPauseMode(m_pauseMode);
}
/*!
\internal
*/
-QVariant QWebSocketPrivate::socketOption(QAbstractSocket::SocketOption option)
+void QWebSocketPrivate::setReadBufferSize(qint64 size)
{
- return m_pSocket->socketOption(option);
+ m_readBufferSize = size;
+ if (Q_LIKELY(m_pSocket))
+ m_pSocket->setReadBufferSize(m_readBufferSize);
}
/*!
*/
bool QWebSocketPrivate::isValid() const
{
- return m_pSocket->isValid();
+ return (m_pSocket && m_pSocket->isValid() &&
+ (m_socketState == QAbstractSocket::ConnectedState));
}
QT_END_NAMESPACE
projects / contrib / qtwebsockets.git / blobdiff