diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/websockets/qwebsocket_p.cpp | 1 | ||||
-rw-r--r-- | src/websockets/qwebsocketdataprocessor_p.cpp | 1 | ||||
-rw-r--r-- | src/websockets/qwebsocketframe_p.cpp | 1 | ||||
-rw-r--r-- | src/websockets/qwebsocketprotocol.h | 18 | ||||
-rw-r--r-- | src/websockets/qwebsocketprotocol_p.cpp (renamed from src/websockets/qwebsocketprotocol.cpp) | 2 | ||||
-rw-r--r-- | src/websockets/qwebsocketprotocol_p.h | 75 | ||||
-rw-r--r-- | src/websockets/websockets.pro | 3 |
7 files changed, 81 insertions, 20 deletions
diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp index 90116a3..b9d7e62 100644 --- a/src/websockets/qwebsocket_p.cpp +++ b/src/websockets/qwebsocket_p.cpp @@ -41,6 +41,7 @@ #include "qwebsocket.h" #include "qwebsocket_p.h" +#include "qwebsocketprotocol_p.h" #include "qwebsockethandshakerequest_p.h" #include "qwebsockethandshakeresponse_p.h" #include <QUrl> diff --git a/src/websockets/qwebsocketdataprocessor_p.cpp b/src/websockets/qwebsocketdataprocessor_p.cpp index b2b3cf9..733bb50 100644 --- a/src/websockets/qwebsocketdataprocessor_p.cpp +++ b/src/websockets/qwebsocketdataprocessor_p.cpp @@ -54,6 +54,7 @@ */ #include "qwebsocketdataprocessor_p.h" #include "qwebsocketprotocol.h" +#include "qwebsocketprotocol_p.h" #include "qwebsocketframe_p.h" #include <QtEndian> #include <limits.h> diff --git a/src/websockets/qwebsocketframe_p.cpp b/src/websockets/qwebsocketframe_p.cpp index 26a8f09..d93bd59 100644 --- a/src/websockets/qwebsocketframe_p.cpp +++ b/src/websockets/qwebsocketframe_p.cpp @@ -53,6 +53,7 @@ */ #include "qwebsocketframe_p.h" +#include "qwebsocketprotocol_p.h" #include <QtEndian> #include <QDebug> diff --git a/src/websockets/qwebsocketprotocol.h b/src/websockets/qwebsocketprotocol.h index 1a4097d..0fd342b 100644 --- a/src/websockets/qwebsocketprotocol.h +++ b/src/websockets/qwebsocketprotocol.h @@ -48,7 +48,6 @@ QT_BEGIN_NAMESPACE class QString; -class QByteArray; namespace QWebSocketProtocol { @@ -105,23 +104,6 @@ enum OpCode OC_RESERVED_F = 0xF }; - -inline bool isOpCodeReserved(OpCode code) -{ - return ((code > OC_BINARY) && (code < OC_CLOSE)) || (code > OC_PONG); -} -inline bool isCloseCodeValid(int closeCode) -{ - return (closeCode > 999) && (closeCode < 5000) && - (closeCode != CC_RESERVED_1004) && //see RFC6455 7.4.1 - (closeCode != CC_MISSING_STATUS_CODE) && - (closeCode != CC_ABNORMAL_DISCONNECTION) && - ((closeCode >= 3000) || (closeCode < 1012)); -} - -void Q_AUTOTEST_EXPORT mask(QByteArray *payload, quint32 maskingKey); -void Q_AUTOTEST_EXPORT mask(char *payload, quint64 size, quint32 maskingKey); - inline Version currentVersion() { return V_LATEST; } } //end namespace QWebSocketProtocol diff --git a/src/websockets/qwebsocketprotocol.cpp b/src/websockets/qwebsocketprotocol_p.cpp index 7068981..4316a4b 100644 --- a/src/websockets/qwebsocketprotocol.cpp +++ b/src/websockets/qwebsocketprotocol_p.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qwebsocketprotocol.h" +#include "private/qwebsocketprotocol_p.h" #include <QString> #include <QSet> #include <QtEndian> diff --git a/src/websockets/qwebsocketprotocol_p.h b/src/websockets/qwebsocketprotocol_p.h new file mode 100644 index 0000000..e775179 --- /dev/null +++ b/src/websockets/qwebsocketprotocol_p.h @@ -0,0 +1,75 @@ +/**************************************************************************** +** +** 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$ +** +****************************************************************************/ + +#ifndef QWEBSOCKETPROTOCOL_P_H +#define QWEBSOCKETPROTOCOL_P_H + +#include <qglobal.h> +#include "QtWebSockets/qwebsocketprotocol.h" + +QT_BEGIN_NAMESPACE + +class QString; +class QByteArray; + +namespace QWebSocketProtocol +{ +inline bool isOpCodeReserved(OpCode code) +{ + return ((code > OC_BINARY) && (code < OC_CLOSE)) || (code > OC_PONG); +} + +inline bool isCloseCodeValid(int closeCode) +{ + return (closeCode > 999) && (closeCode < 5000) && + (closeCode != CC_RESERVED_1004) && //see RFC6455 7.4.1 + (closeCode != CC_MISSING_STATUS_CODE) && + (closeCode != CC_ABNORMAL_DISCONNECTION) && + ((closeCode >= 3000) || (closeCode < 1012)); +} + +void Q_AUTOTEST_EXPORT mask(QByteArray *payload, quint32 maskingKey); +void Q_AUTOTEST_EXPORT mask(char *payload, quint64 size, quint32 maskingKey); +} //end namespace QWebSocketProtocol + +QT_END_NAMESPACE + +#endif // QWEBSOCKETPROTOCOL_P_H diff --git a/src/websockets/websockets.pro b/src/websockets/websockets.pro index 84bf8e3..f17fcbd 100644 --- a/src/websockets/websockets.pro +++ b/src/websockets/websockets.pro @@ -21,6 +21,7 @@ PUBLIC_HEADERS += \ PRIVATE_HEADERS += \ $$PWD/qwebsocket_p.h \ $$PWD/qwebsocketserver_p.h \ + $$PWD/qwebsocketprotocol_p.h \ $$PWD/qwebsockethandshakerequest_p.h \ $$PWD/qwebsockethandshakeresponse_p.h \ $$PWD/qwebsocketdataprocessor_p.h \ @@ -32,7 +33,7 @@ SOURCES += \ $$PWD/qwebsocket_p.cpp \ $$PWD/qwebsocketserver.cpp \ $$PWD/qwebsocketserver_p.cpp \ - $$PWD/qwebsocketprotocol.cpp \ + $$PWD/qwebsocketprotocol_p.cpp \ $$PWD/qwebsockethandshakerequest_p.cpp \ $$PWD/qwebsockethandshakeresponse_p.cpp \ $$PWD/qwebsocketdataprocessor_p.cpp \ |