diff options
author | Kurt Pattyn <pattyn.kurt@gmail.com> | 2013-11-02 12:49:57 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-02 12:51:38 +0100 |
commit | 800ec535e684befd60c7fa11baff5dafbc9f020c (patch) | |
tree | b13591079718e361fbd74f378f44a5d9c90759f1 /src/websockets/qwebsocketprotocol.cpp | |
parent | 97c8e5a36dde11ddf238678e5711e5979c2c106b (diff) | |
download | qtwebsockets-800ec535e684befd60c7fa11baff5dafbc9f020c.tar.gz |
Move non-public methods from websocketprotocol to private header
Add bigendian conversion of masks to unit tests
Change-Id: I3f23fb62aac1c6d06e5fafb1bd4bc47cc03765ce
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Diffstat (limited to 'src/websockets/qwebsocketprotocol.cpp')
-rw-r--r-- | src/websockets/qwebsocketprotocol.cpp | 188 |
1 files changed, 0 insertions, 188 deletions
diff --git a/src/websockets/qwebsocketprotocol.cpp b/src/websockets/qwebsocketprotocol.cpp deleted file mode 100644 index 7068981..0000000 --- a/src/websockets/qwebsocketprotocol.cpp +++ /dev/null @@ -1,188 +0,0 @@ -/**************************************************************************** -** -** 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 "qwebsocketprotocol.h" -#include <QString> -#include <QSet> -#include <QtEndian> - -/*! - \enum QWebSocketProtocol::CloseCode - - \inmodule QtWebSockets - - The close codes supported by WebSockets V13 - - \value CC_NORMAL Normal closure - \value CC_GOING_AWAY Going away - \value CC_PROTOCOL_ERROR Protocol error - \value CC_DATATYPE_NOT_SUPPORTED Unsupported data - \value CC_RESERVED_1004 Reserved - \value CC_MISSING_STATUS_CODE No status received - \value CC_ABNORMAL_DISCONNECTION Abnormal closure - \value CC_WRONG_DATATYPE Invalid frame payload data - \value CC_POLICY_VIOLATED Policy violation - \value CC_TOO_MUCH_DATA Message too big - \value CC_MISSING_EXTENSION Mandatory extension missing - \value CC_BAD_OPERATION Internal server error - \value CC_TLS_HANDSHAKE_FAILED TLS handshake failed - - \sa \l{QWebSocket::} {close()} -*/ -/*! - \enum QWebSocketProtocol::Version - - \inmodule QtWebSockets - - \brief The different defined versions of the Websocket protocol. - - For an overview of the differences between the different protocols, see - <http://code.google.com/p/pywebsocket/wiki/WebSocketProtocolSpec> - - \value V_Unknow - \value V_0 hixie76: http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol-76 & hybi-00: http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-00. - Works with key1, key2 and a key in the payload. - Attribute: Sec-WebSocket-Draft value 0. - \value V_4 hybi-04: http://tools.ietf.org/id/draft-ietf-hybi-thewebsocketprotocol-04.txt. - Changed handshake: key1, key2, key3 ==> Sec-WebSocket-Key, Sec-WebSocket-Nonce, Sec-WebSocket-Accept - Sec-WebSocket-Draft renamed to Sec-WebSocket-Version - Sec-WebSocket-Version = 4 - \value V_5 hybi-05: http://tools.ietf.org/id/draft-ietf-hybi-thewebsocketprotocol-05.txt. - Sec-WebSocket-Version = 5 - Removed Sec-WebSocket-Nonce - Added Sec-WebSocket-Accept - \value V_6 Sec-WebSocket-Version = 6. - \value V_7 hybi-07: http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-07. - Sec-WebSocket-Version = 7 - \value V_8 hybi-8, hybi-9, hybi-10, hybi-11 and hybi-12. - Status codes 1005 and 1006 are added and all codes are now unsigned - Internal error results in 1006 - \value V_13 hybi-13, hybi14, hybi-15, hybi-16, hybi-17 and RFC 6455. - Sec-WebSocket-Version = 13 - Status code 1004 is now reserved - Added 1008, 1009 and 1010 - Must support TLS - Clarify multiple version support - \value V_LATEST Refers to the latest know version to QWebSockets. -*/ - -/*! - \fn QWebSocketProtocol::isOpCodeReserved(OpCode code) - Checks if \a code is a valid OpCode - \internal -*/ - -/*! - \fn QWebSocketProtocol::isCloseCodeValid(int closeCode) - Checks if \a closeCode is a valid web socket close code - \internal -*/ - -/*! - \fn QWebSocketProtocol::currentVersion() - Returns the latest version that WebSocket is supporting - \internal -*/ - -QT_BEGIN_NAMESPACE - -/** - * @brief Contains constants related to the WebSocket standard. - */ -namespace QWebSocketProtocol -{ -/*! - Parses the \a versionString and converts it to a Version value - \internal - */ -Version versionFromString(const QString &versionString) -{ - bool ok = false; - Version version = V_Unknow; - const int ver = versionString.toInt(&ok); - QSet<Version> supportedVersions; - supportedVersions << V_0 << V_4 << V_5 << V_6 << V_7 << V_8 << V_13; - if (ok) - { - if (supportedVersions.contains(static_cast<Version>(ver))) - { - version = static_cast<Version>(ver); - } - } - return version; -} - -/*! - Mask the \a payload with the given \a maskingKey and stores the result back in \a payload. - \internal - */ -void mask(QByteArray *payload, quint32 maskingKey) -{ - mask(payload->data(), payload->size(), maskingKey); -} - -/*! - Masks the \a payload of length \a size with the given \a maskingKey and stores the result back in \a payload. - \internal - */ -void mask(char *payload, quint64 size, quint32 maskingKey) -{ - quint32 *payloadData = reinterpret_cast<quint32 *>(payload); - const quint32 numIterations = static_cast<quint32>(size / sizeof(quint32)); - const quint32 remainder = size % sizeof(quint32); - quint32 i; - for (i = 0; i < numIterations; ++i) - { - *(payloadData + i) ^= maskingKey; - } - if (remainder) - { - const quint32 offset = i * static_cast<quint32>(sizeof(quint32)); - const uchar *mask = reinterpret_cast<uchar *>(&maskingKey); - for (quint32 i = 0; i < remainder; ++i) - { - *(payload + offset + i) ^= static_cast<char>(mask[(i + offset) % 4]); - } - } -} -} //end namespace WebSocketProtocol - -QT_END_NAMESPACE |