Commit 3a3f8705 authored by Daniel P. Berrangé's avatar Daniel P. Berrangé
Browse files

io: include full error message in websocket handshake trace 



When the websocket handshake fails it is useful to log the real
error message via the trace points for debugging purposes.

Fixes bug: #1715186

Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: default avatarDaniel P. Berrange <berrange@redhat.com>
parent f69a8bde

io/channel-websock.c

+4 −3
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ static gboolean qio_channel_websock_handshake_send(QIOChannel *ioc, 
                            &err);



    if (ret < 0) {

        trace_qio_channel_websock_handshake_fail(ioc);

        trace_qio_channel_websock_handshake_fail(ioc, error_get_pretty(err));

        qio_task_set_error(task, err);

        qio_task_complete(task);

        return FALSE;
@@ -516,7 +516,8 @@ static gboolean qio_channel_websock_handshake_send(QIOChannel *ioc, 
    buffer_advance(&wioc->encoutput, ret);

    if (wioc->encoutput.offset == 0) {

        if (wioc->io_err) {

            trace_qio_channel_websock_handshake_fail(ioc);

            trace_qio_channel_websock_handshake_fail(

                ioc, error_get_pretty(wioc->io_err));

            qio_task_set_error(task, wioc->io_err);

            wioc->io_err = NULL;

            qio_task_complete(task);
@@ -547,7 +548,7 @@ static gboolean qio_channel_websock_handshake_io(QIOChannel *ioc, 
         * client connection, as most of the time we have an

         * HTTP 4xx err response to send instead

         */

        trace_qio_channel_websock_handshake_fail(ioc);

        trace_qio_channel_websock_handshake_fail(ioc, error_get_pretty(err));

        qio_task_set_error(task, err);

        qio_task_complete(task);

        return FALSE;

io/trace-events

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 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"



# io/channel-command.c