diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-10-05 14:44:12 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-10-05 14:44:12 +0100 |
| commit | 1fdc4c5d82a6a4b327776f10ad435eb8bdd70089 (patch) | |
| tree | 5e0d69958740732297faa45467a4ed6c6c52aedb /include | |
| parent | 90586a78ffaee2e0fc74c16da44e985697fd7472 (diff) | |
| parent | 59f183bbd54eecffb8915bffe03f9c2720b28bcc (diff) | |
Merge remote-tracking branch 'remotes/berrange/tags/pull-qio-2017-10-04-1' into staging
Merge qio 2017/10/04 v1
# gpg: Signature made Wed 04 Oct 2017 13:23:04 BST
# gpg: using RSA key 0xBE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg: aka "Daniel P. Berrange <berrange@redhat.com>"
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF
* remotes/berrange/tags/pull-qio-2017-10-04-1:
io: add trace events for websockets frame handling
io: Attempt to send websocket close messages to client
io: Reply to ping frames
io: Ignore websocket PING and PONG frames
io: Allow empty websocket payload
io: Add support for fragmented websocket binary frames
io: Small updates in preparation for websocket changes
ui: Always remove an old VNC channel watch before adding a new one
io: use case insensitive check for Connection & Upgrade websock headers
io: include full error message in websocket handshake trace
io: send proper HTTP response for websocket errors
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/io/channel-websock.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/io/channel-websock.h b/include/io/channel-websock.h index 3c9ff84727..ff32d8651b 100644 --- a/include/io/channel-websock.h +++ b/include/io/channel-websock.h @@ -60,11 +60,13 @@ struct QIOChannelWebsock { Buffer encoutput; Buffer rawinput; Buffer rawoutput; + Buffer ping_reply; size_t payload_remain; QIOChannelWebsockMask mask; guint io_tag; Error *io_err; gboolean io_eof; + uint8_t opcode; }; /** |