From 5707c2b3cc6e0312302642914154689d8afda7a0 Mon Sep 17 00:00:00 2001

From: "Daniel P. Berrange" <berrange@redhat.com>

Date: Mon, 5 Feb 2018 11:09:56 +0100

Subject: [PATCH 02/20] ui: add tracing of VNC operations related to QIOChannel

RH-Author: Daniel P. Berrange <berrange@redhat.com>

Message-id: <20180205111012.6210-2-berrange@redhat.com>

Patchwork-id: 78884

O-Subject: [RHV-7.5 qemu-kvm-rhev PATCH v2 01/17] ui: add tracing of VNC operations related to QIOChannel

Bugzilla: 1527404

RH-Acked-by: Gerd Hoffmann <kraxel@redhat.com>

RH-Acked-by: Laszlo Ersek <lersek@redhat.com>

RH-Acked-by: Thomas Huth <thuth@redhat.com>

From: "Daniel P. Berrange" <berrange@redhat.com>

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>

(cherry picked from commit ad6374c43e572e6e53020a97e72e9ea525b08334)

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 ui/trace-events        |  6 ++++++

 ui/vnc-auth-vencrypt.c |  2 ++

 ui/vnc-ws.c            |  6 +++---

 ui/vnc.c               | 11 ++++++++---

 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/ui/trace-events b/ui/trace-events

index 34c2213..e4c02e4 100644

--- a/ui/trace-events

+++ b/ui/trace-events

@@ -29,6 +29,12 @@ vnc_key_event_ext(bool down, int sym, int keycode, const char *name) "down %d, s

 vnc_key_event_map(bool down, int sym, int keycode, const char *name) "down %d, sym 0x%x -> keycode 0x%x [%s]"

 vnc_key_sync_numlock(bool on) "%d"

 vnc_key_sync_capslock(bool on) "%d"

+vnc_client_eof(void *state, void *ioc) "VNC client EOF state=%p ioc=%p"

+vnc_client_io_error(void *state, void *ioc, const char *msg) "VNC client I/O error state=%p ioc=%p errmsg=%s"

+vnc_client_connect(void *state, void *ioc) "VNC client connect state=%p ioc=%p"

+vnc_client_disconnect_start(void *state, void *ioc) "VNC client disconnect start state=%p ioc=%p"

+vnc_client_disconnect_finish(void *state, void *ioc) "VNC client disconnect finish state=%p ioc=%p"

+vnc_client_io_wrap(void *state, void *ioc, const char *type) "VNC client I/O wrap state=%p ioc=%p type=%s"

 # ui/input.c

 input_event_key_number(int conidx, int number, const char *qcode, bool down) "con %d, key number 0x%x [%s], down %d"

diff --git a/ui/vnc-auth-vencrypt.c b/ui/vnc-auth-vencrypt.c

index c3eece4..2a3766a 100644

--- a/ui/vnc-auth-vencrypt.c

+++ b/ui/vnc-auth-vencrypt.c

@@ -28,6 +28,7 @@

 #include "vnc.h"

 #include "qapi/error.h"

 #include "qemu/main-loop.h"

+#include "trace.h"

 static void start_auth_vencrypt_subauth(VncState *vs)

 {

@@ -124,6 +125,7 @@ static int protocol_client_vencrypt_auth(VncState *vs, uint8_t *data, size_t len

         VNC_DEBUG("Start TLS VeNCrypt 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,

diff --git a/ui/vnc-ws.c b/ui/vnc-ws.c

index eaf3095..6ccad22 100644

--- a/ui/vnc-ws.c

+++ b/ui/vnc-ws.c

@@ -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)

@@ -53,7 +54,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;

@@ -73,9 +73,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,

@@ -116,7 +116,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;

@@ -127,6 +126,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,

diff --git a/ui/vnc.c b/ui/vnc.c

index 4e1d94f..66783ec 100644

--- a/ui/vnc.c

+++ b/ui/vnc.c

@@ -1118,6 +1118,7 @@ static void vnc_disconnect_start(VncState *vs)

     if (vs->disconnecting) {

         return;

     }

+    trace_vnc_client_disconnect_start(vs, vs->ioc);

     vnc_set_share_mode(vs, VNC_SHARE_MODE_DISCONNECTED);

     if (vs->ioc_tag) {

         g_source_remove(vs->ioc_tag);

@@ -1131,6 +1132,8 @@ void vnc_disconnect_finish(VncState *vs)

 {

     int i;

+    trace_vnc_client_disconnect_finish(vs, vs->ioc);

+

     vnc_jobs_join(vs); /* Wait encoding jobs */

     vnc_lock_output(vs);

@@ -1184,11 +1187,12 @@ ssize_t vnc_client_io_error(VncState *vs, ssize_t ret, Error **errp)

 {

     if (ret <= 0) {

         if (ret == 0) {

-            VNC_DEBUG("Closing down client sock: EOF\n");

+            trace_vnc_client_eof(vs, vs->ioc);

             vnc_disconnect_start(vs);

         } else if (ret != QIO_CHANNEL_ERR_BLOCK) {

-            VNC_DEBUG("Closing down client sock: ret %zd (%s)\n",

-                      ret, errp ? error_get_pretty(*errp) : "Unknown");

+            trace_vnc_client_io_error(vs, vs->ioc,

+                                      errp ? error_get_pretty(*errp) :

+                                      "Unknown");

             vnc_disconnect_start(vs);

         }

@@ -2885,6 +2889,7 @@ static void vnc_connect(VncDisplay *vd, QIOChannelSocket *sioc,

     bool first_client = QTAILQ_EMPTY(&vd->clients);

     int i;

+    trace_vnc_client_connect(vs, sioc);

     vs->sioc = sioc;

     object_ref(OBJECT(vs->sioc));

     vs->ioc = QIO_CHANNEL(sioc);

-- 

1.8.3.1