Commit 1fdc4c5d authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 90586a78 59f183bb

include/io/channel-websock.h

+2 −0
Original line number Diff line number Diff line
@@ -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;

};



/**

io/channel-websock.c

+341 −155

File changed.

Preview size limit exceeded, changes collapsed.

io/trace-events

+6 −1
Original line number Diff line number Diff line
@@ -46,8 +46,13 @@ qio_channel_websock_new_server(void *ioc, void *master) "Websock new client ioc= 
qio_channel_websock_handshake_start(void *ioc) "Websock handshake start ioc=%p"

qio_channel_websock_handshake_pending(void *ioc, int status) "Websock handshake pending ioc=%p status=%d"

qio_channel_websock_handshake_reply(void *ioc) "Websock handshake reply ioc=%p"

qio_channel_websock_handshake_fail(void *ioc) "Websock handshake fail ioc=%p"

qio_channel_websock_handshake_fail(void *ioc, const char *msg) "Websock handshake fail ioc=%p err=%s"

qio_channel_websock_handshake_complete(void *ioc) "Websock handshake complete ioc=%p"

qio_channel_websock_header_partial_decode(void *ioc, size_t payloadlen, unsigned char fin, unsigned char opcode, unsigned char has_mask) "Websocket header decoded ioc=%p payload-len=%zu fin=0x%x opcode=0x%x has_mask=0x%x"

qio_channel_websock_header_full_decode(void *ioc, size_t headerlen, size_t payloadlen, uint32_t mask) "Websocket header decoded ioc=%p header-len=%zu payload-len=%zu mask=0x%x"

qio_channel_websock_payload_decode(void *ioc, uint8_t opcode, size_t payload_remain) "Websocket header decoded ioc=%p opcode=0x%x payload-remain=%zu"

qio_channel_websock_encode(void *ioc, uint8_t opcode, size_t payloadlen, size_t headerlen) "Websocket encoded ioc=%p opcode=0x%x header-len=%zu payload-len=%zu"

qio_channel_websock_close(void *ioc) "Websocket close ioc=%p"



# io/channel-command.c

qio_channel_command_new_pid(void *ioc, int writefd, int readfd, int pid) "Command new pid ioc=%p writefd=%d readfd=%d pid=%d"

ui/vnc-auth-vencrypt.c

+3 −0
Original line number Diff line number Diff line
@@ -75,6 +75,9 @@ static void vnc_tls_handshake_done(QIOTask *task, 
        vnc_client_error(vs);

        error_free(err);

    } else {

        if (vs->ioc_tag) {

            g_source_remove(vs->ioc_tag);

        }

        vs->ioc_tag = qio_channel_add_watch(

            vs->ioc, G_IO_IN | G_IO_OUT, vnc_client_io, vs, NULL);

        start_auth_vencrypt_subauth(vs);

ui/vnc-ws.c

+6 −0
Original line number Diff line number Diff line
@@ -37,6 +37,9 @@ static void vncws_tls_handshake_done(QIOTask *task, 
        error_free(err);

    } else {

        VNC_DEBUG("TLS handshake complete, starting websocket handshake\n");

        if (vs->ioc_tag) {

            g_source_remove(vs->ioc_tag);

        }

        vs->ioc_tag = qio_channel_add_watch(

            QIO_CHANNEL(vs->ioc), G_IO_IN, vncws_handshake_io, vs, NULL);

    }
@@ -97,6 +100,9 @@ static void vncws_handshake_done(QIOTask *task, 
    } else {

        VNC_DEBUG("Websock handshake complete, starting VNC protocol\n");

        vnc_start_protocol(vs);

        if (vs->ioc_tag) {

            g_source_remove(vs->ioc_tag);

        }

        vs->ioc_tag = qio_channel_add_watch(

            vs->ioc, G_IO_IN, vnc_client_io, vs, NULL);

    }