mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-07 09:43:56 -06:00
ui: add tracing of VNC operations related to QIOChannel
Trace anything which opens/closes/wraps a QIOChannel in the VNC server. Signed-off-by: Daniel P. Berrange <berrange@redhat.com> Message-id: 20170921121528.23935-2-berrange@redhat.com Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
parent
f4924974c7
commit
ad6374c43e
4 changed files with 19 additions and 6 deletions
|
@ -23,6 +23,7 @@
|
|||
#include "vnc.h"
|
||||
#include "io/channel-websock.h"
|
||||
#include "qemu/bswap.h"
|
||||
#include "trace.h"
|
||||
|
||||
static void vncws_tls_handshake_done(QIOTask *task,
|
||||
gpointer user_data)
|
||||
|
@ -50,7 +51,6 @@ gboolean vncws_tls_handshake_io(QIOChannel *ioc G_GNUC_UNUSED,
|
|||
QIOChannelTLS *tls;
|
||||
Error *err = NULL;
|
||||
|
||||
VNC_DEBUG("TLS Websocket connection required\n");
|
||||
if (vs->ioc_tag) {
|
||||
g_source_remove(vs->ioc_tag);
|
||||
vs->ioc_tag = 0;
|
||||
|
@ -70,9 +70,9 @@ gboolean vncws_tls_handshake_io(QIOChannel *ioc G_GNUC_UNUSED,
|
|||
|
||||
qio_channel_set_name(QIO_CHANNEL(tls), "vnc-ws-server-tls");
|
||||
|
||||
VNC_DEBUG("Start TLS WS handshake process\n");
|
||||
object_unref(OBJECT(vs->ioc));
|
||||
vs->ioc = QIO_CHANNEL(tls);
|
||||
trace_vnc_client_io_wrap(vs, vs->ioc, "tls");
|
||||
vs->tls = qio_channel_tls_get_session(tls);
|
||||
|
||||
qio_channel_tls_handshake(tls,
|
||||
|
@ -110,7 +110,6 @@ gboolean vncws_handshake_io(QIOChannel *ioc G_GNUC_UNUSED,
|
|||
VncState *vs = opaque;
|
||||
QIOChannelWebsock *wioc;
|
||||
|
||||
VNC_DEBUG("Websocket negotiate starting\n");
|
||||
if (vs->ioc_tag) {
|
||||
g_source_remove(vs->ioc_tag);
|
||||
vs->ioc_tag = 0;
|
||||
|
@ -121,6 +120,7 @@ gboolean vncws_handshake_io(QIOChannel *ioc G_GNUC_UNUSED,
|
|||
|
||||
object_unref(OBJECT(vs->ioc));
|
||||
vs->ioc = QIO_CHANNEL(wioc);
|
||||
trace_vnc_client_io_wrap(vs, vs->ioc, "websock");
|
||||
|
||||
qio_channel_websock_handshake(wioc,
|
||||
vncws_handshake_done,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue