[Qemu-devel] [PATCH] qapi: Adding websocket information inside VncInfo structure.

[Julio Faracco <jcfaracco@gmail.com>]

When the user setup a vnc server to QEMU using the argument "-vnc
0.0.0.0:0,websocket=5701" for example, he cannot get information about which
websocket port VNC is running. The command "info vnc" shows only details about
the main VNC server and the clients. You can confirm that a websocket service
is running, checking the ports that are opened. This commit introduce two new
fields inside "VncInfo" either: "webservice" which contains the port as a
string and the boolean value "has_websocket" that copies the status of
ws_enabled from VNC Display.

Fixes #1486278

Signed-Off-By: Julio Faracco <jcfaracco@gmail.com>
---
 hmp.c            |  3 +++
 qapi-schema.json |  3 ++-
 ui/vnc.c         | 25 +++++++++++++++++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/hmp.c b/hmp.c
index 5048eee..3fc74e0 100644
--- a/hmp.c
+++ b/hmp.c
@@ -559,6 +559,9 @@ void hmp_info_vnc(Monitor *mon, const QDict *qdict)
     if (info->has_host && info->has_service) {
         monitor_printf(mon, "     address: %s:%s\n", info->host, info->service);
     }
+    if(info->has_websocket) {
+        monitor_printf(mon, "   websocket: %s:%s\n", info->host, info->webservice);
+    }
     if (info->has_auth) {
         monitor_printf(mon, "        auth: %s\n", info->auth);
     }
diff --git a/qapi-schema.json b/qapi-schema.json
index a386605..e97f78f 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -916,7 +916,8 @@
 { 'struct': 'VncInfo',
   'data': {'enabled': 'bool', '*host': 'str',
            '*family': 'NetworkAddressFamily',
-           '*service': 'str', '*auth': 'str', '*clients': ['VncClientInfo']} }
+           '*service': 'str', '*auth': 'str', '*clients': ['VncClientInfo'],
+           '*webservice': 'str', 'has_websocket': 'bool'} }
 
 ##
 # @VncPriAuth:
diff --git a/ui/vnc.c b/ui/vnc.c
index d73966a..68b5960 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -411,6 +411,7 @@ VncInfo *qmp_query_vnc(Error **errp)
         socklen_t salen = sizeof(sa);
         char host[NI_MAXHOST];
         char serv[NI_MAXSERV];
+        char webserv[NI_MAXSERV];
 
         info->enabled = true;
 
@@ -447,6 +448,30 @@ VncInfo *qmp_query_vnc(Error **errp)
 
         info->has_auth = true;
         info->auth = g_strdup(vnc_auth_name(vd));
+
+        info->has_websocket = vd->ws_enabled;
+
+        if (vd->ws_enabled) {
+            if (vd->lwebsock == -1) {
+                return info;
+            }
+
+            if (getsockname(vd->lwebsock, (struct sockaddr *)&sa,
+                            &salen) == -1) {
+                error_setg(errp, QERR_UNDEFINED_ERROR);
+                goto out_error;
+            }
+
+            if (getnameinfo((struct sockaddr *)&sa, salen,
+                            host, sizeof(host),
+                            webserv, sizeof(serv),
+                            NI_NUMERICHOST | NI_NUMERICSERV) < 0) {
+                error_setg(errp, QERR_UNDEFINED_ERROR);
+                goto out_error;
+            }
+        }
+
+        info->webservice = g_strdup(webserv);
     }
 
     return info;
-- 
1.9.1