[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 4/7] io: Allow empty websocket payload
From: |
Brandon Carpenter |
Subject: |
[Qemu-devel] [PATCH v3 4/7] io: Allow empty websocket payload |
Date: |
Tue, 12 Sep 2017 08:21:50 -0700 |
Some browsers send pings/pongs with no payload, so allow empty payloads
instead of closing the connection.
Signed-off-by: Brandon Carpenter <address@hidden>
---
io/channel-websock.c | 62 +++++++++++++++++++++++++---------------------------
1 file changed, 30 insertions(+), 32 deletions(-)
diff --git a/io/channel-websock.c b/io/channel-websock.c
index ced24135ec..3183aeff77 100644
--- a/io/channel-websock.c
+++ b/io/channel-websock.c
@@ -603,44 +603,42 @@ static int
qio_channel_websock_decode_payload(QIOChannelWebsock *ioc,
Error **errp)
{
size_t i;
- size_t payload_len;
+ size_t payload_len = 0;
uint32_t *payload32;
- if (!ioc->payload_remain) {
- error_setg(errp,
- "Decoding payload but no bytes of payload remain");
- return -1;
- }
-
- /* If we aren't at the end of the payload, then drop
- * off the last bytes, so we're always multiple of 4
- * for purpose of unmasking, except at end of payload
- */
- if (ioc->encinput.offset < ioc->payload_remain) {
- payload_len = ioc->encinput.offset - (ioc->encinput.offset % 4);
- } else {
- payload_len = ioc->payload_remain;
- }
- if (payload_len == 0) {
- return QIO_CHANNEL_ERR_BLOCK;
- }
+ if (ioc->payload_remain) {
+ /* If we aren't at the end of the payload, then drop
+ * off the last bytes, so we're always multiple of 4
+ * for purpose of unmasking, except at end of payload
+ */
+ if (ioc->encinput.offset < ioc->payload_remain) {
+ payload_len = ioc->encinput.offset - (ioc->encinput.offset % 4);
+ } else {
+ payload_len = ioc->payload_remain;
+ }
+ if (payload_len == 0) {
+ return QIO_CHANNEL_ERR_BLOCK;
+ }
- ioc->payload_remain -= payload_len;
+ ioc->payload_remain -= payload_len;
- /* unmask frame */
- /* process 1 frame (32 bit op) */
- payload32 = (uint32_t *)ioc->encinput.buffer;
- for (i = 0; i < payload_len / 4; i++) {
- payload32[i] ^= ioc->mask.u;
- }
- /* process the remaining bytes (if any) */
- for (i *= 4; i < payload_len; i++) {
- ioc->encinput.buffer[i] ^= ioc->mask.c[i % 4];
+ /* unmask frame */
+ /* process 1 frame (32 bit op) */
+ payload32 = (uint32_t *)ioc->encinput.buffer;
+ for (i = 0; i < payload_len / 4; i++) {
+ payload32[i] ^= ioc->mask.u;
+ }
+ /* process the remaining bytes (if any) */
+ for (i *= 4; i < payload_len; i++) {
+ ioc->encinput.buffer[i] ^= ioc->mask.c[i % 4];
+ }
}
- buffer_reserve(&ioc->rawinput, payload_len);
- buffer_append(&ioc->rawinput, ioc->encinput.buffer, payload_len);
- buffer_advance(&ioc->encinput, payload_len);
+ if (payload_len) {
+ buffer_reserve(&ioc->rawinput, payload_len);
+ buffer_append(&ioc->rawinput, ioc->encinput.buffer, payload_len);
+ buffer_advance(&ioc->encinput, payload_len);
+ }
return 0;
}
--
2.14.1
--
CONFIDENTIALITY NOTICE: This e-mail message, including any attachments, is
for the sole use of the intended recipient(s) and may contain proprietary,
confidential or privileged information or otherwise be protected by law.
Any unauthorized review, use, disclosure or distribution is prohibited. If
you are not the intended recipient, please notify the sender and destroy
all copies and the original message.
- [Qemu-devel] [PATCH v3 0/7] Update websocket code to more fully support the RFC, Brandon Carpenter, 2017/09/12
- [Qemu-devel] [PATCH v3 3/7] io: Add support for fragmented websocket binary frames, Brandon Carpenter, 2017/09/12
- [Qemu-devel] [PATCH v3 2/7] io: Small updates in preparation for websocket changes, Brandon Carpenter, 2017/09/12
- [Qemu-devel] [PATCH v3 1/7] io: Always remove an old channel watch before adding a new one, Brandon Carpenter, 2017/09/12
- [Qemu-devel] [PATCH v3 4/7] io: Allow empty websocket payload,
Brandon Carpenter <=
- [Qemu-devel] [PATCH v3 7/7] io: Attempt to send websocket close messages to client, Brandon Carpenter, 2017/09/12
- [Qemu-devel] [PATCH v3 6/7] io: Reply to ping frames, Brandon Carpenter, 2017/09/12
- [Qemu-devel] [PATCH v3 5/7] io: Ignore websocket PING and PONG frames, Brandon Carpenter, 2017/09/12
- Re: [Qemu-devel] [PATCH v3 0/7] Update websocket code to more fully support the RFC, Stefan Hajnoczi, 2017/09/18
- Re: [Qemu-devel] [PATCH v3 0/7] Update websocket code to more fully support the RFC, Brandon Carpenter, 2017/09/20