diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-02-16 11:01:40 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-02-24 11:35:20 +0000 |
commit | fc2b42c874fb41487b86700a04e932e2afaded94 (patch) | |
tree | 17fc2b6146a769fe8272db3a732882ed13a8b9cd /src | |
parent | 0694a8ba6394ba194fabc2201ad4549a2b97fc55 (diff) | |
download | qtwebsockets-fc2b42c874fb41487b86700a04e932e2afaded94.tar.gz |
client ping should be masked
Task-number: QTBUG-42298
Change-Id: I4c01052823ce48b737d30ac2e0ef11836124bc4f
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Reviewed-by: Neil Williams
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/websockets/qwebsocket_p.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp index 45913e5..ced197e 100644 --- a/src/websockets/qwebsocket_p.cpp +++ b/src/websockets/qwebsocket_p.cpp @@ -440,8 +440,13 @@ void QWebSocketPrivate::ping(const QByteArray &payload) { QByteArray payloadTruncated = payload.left(125); m_pingTimer.restart(); + quint32 maskingKey = 0; + if (m_mustMask) + maskingKey = generateMaskingKey(); QByteArray pingFrame = getFrameHeader(QWebSocketProtocol::OpCodePing, payloadTruncated.size(), - 0 /*do not mask*/, true); + maskingKey, true); + if (m_mustMask) + QWebSocketProtocol::mask(&payloadTruncated, maskingKey); pingFrame.append(payloadTruncated); qint64 ret = writeFrame(pingFrame); Q_UNUSED(ret); |