Re: [Qemu-devel] PATCH: 1/7: Extend 'info vnc' output to show client

[Daniel P. Berrange]

The current 'info vnc' monitor output just displays the VNC server address
as provided by the -vnc command line flag. This isn't particularly useful
since it doesn't tell you what VNC is actually listening on. eg, if you
use '-vnc :1' it is useful to know whether this translated to '0.0.0.0:5901'
or chose IPv6 ':::5901'.  It is also useful to know the address of the
client that is currently connected. It is also useful to know the active
authentication (if any).

This patch tweaks the monitor output to look like:

   (qemu) info vnc
   Server: active
        address: 0.0.0.0:5901
           auth: vencrypt+x509+sasl
   Client: none

And when a client is connected

   (qemu) info vnc
   Server: active
        address: 0.0.0.0:5901
           auth: vencrypt+x509+sasl
   Client: active
        address: 127.0.0.1:42956

More data will be added to this later in the patch series...

The 'addr_to_string' helper method in this patch is overly generic
for the needs of this patch alone. This is because it will be re-used
by the later SASL patches in this series, where the flexibility is
important.

   Signed-off-by: Daniel P. Berrange <address@hidden>


 vnc.c |  132 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 124 insertions(+), 8 deletions(-)

Daniel


diff -r 34bb2693ebd2 vnc.c
--- a/vnc.c     Thu Feb 12 12:28:12 2009 +0000
+++ b/vnc.c     Thu Feb 12 12:28:19 2009 +0000
@@ -154,19 +154,127 @@ struct VncState
 static VncState *vnc_state; /* needed for info vnc */
 static DisplayChangeListener *dcl;
 
+static char *addr_to_string(const char *format,
+                           struct sockaddr_storage *sa,
+                           socklen_t salen) {
+    char *addr;
+    char host[NI_MAXHOST];
+    char serv[NI_MAXSERV];
+    int err;
+
+    if ((err = getnameinfo((struct sockaddr *)sa, salen,
+                          host, sizeof(host),
+                          serv, sizeof(serv),
+                          NI_NUMERICHOST | NI_NUMERICSERV)) != 0) {
+       VNC_DEBUG("Cannot resolve address %d: %s\n",
+                 err, gai_strerror(err));
+       return NULL;
+    }
+
+    if (asprintf(&addr, format, host, serv) < 0)
+       return NULL;
+
+    return addr;
+}
+
+static char *vnc_socket_local_addr(const char *format, int fd) {
+    struct sockaddr_storage sa;
+    socklen_t salen;
+
+    salen = sizeof(sa);
+    if (getsockname(fd, (struct sockaddr*)&sa, &salen) < 0)
+       return NULL;
+
+    return addr_to_string(format, &sa, salen);
+}
+
+static char *vnc_socket_remote_addr(const char *format, int fd) {
+    struct sockaddr_storage sa;
+    socklen_t salen;
+
+    salen = sizeof(sa);
+    if (getpeername(fd, (struct sockaddr*)&sa, &salen) < 0)
+       return NULL;
+
+    return addr_to_string(format, &sa, salen);
+}
+
+static const char *vnc_auth_name(VncState *vs) {
+    switch (vs->auth) {
+    case VNC_AUTH_INVALID:
+       return "invalid";
+    case VNC_AUTH_NONE:
+       return "none";
+    case VNC_AUTH_VNC:
+       return "vnc";
+    case VNC_AUTH_RA2:
+       return "ra2";
+    case VNC_AUTH_RA2NE:
+       return "ra2ne";
+    case VNC_AUTH_TIGHT:
+       return "tight";
+    case VNC_AUTH_ULTRA:
+       return "ultra";
+    case VNC_AUTH_TLS:
+       return "tls";
+    case VNC_AUTH_VENCRYPT:
+#ifdef CONFIG_VNC_TLS
+       switch (vs->subauth) {
+       case VNC_AUTH_VENCRYPT_PLAIN:
+           return "vencrypt+plain";
+       case VNC_AUTH_VENCRYPT_TLSNONE:
+           return "vencrypt+tls+none";
+       case VNC_AUTH_VENCRYPT_TLSVNC:
+           return "vencrypt+tls+vnc";
+       case VNC_AUTH_VENCRYPT_TLSPLAIN:
+           return "vencrypt+tls+plain";
+       case VNC_AUTH_VENCRYPT_X509NONE:
+           return "vencrypt+x509+none";
+       case VNC_AUTH_VENCRYPT_X509VNC:
+           return "vencrypt+x509+vnc";
+       case VNC_AUTH_VENCRYPT_X509PLAIN:
+           return "vencrypt+x509+plain";
+       default:
+           return "vencrypt";
+       }
+#else
+       return "vencrypt";
+#endif
+    }
+    return "unknown";
+}
+
+#define VNC_SOCKET_FORMAT_PRETTY "local %s:%s"
+
 void do_info_vnc(void)
 {
     if (vnc_state == NULL || vnc_state->display == NULL)
-       term_printf("VNC server disabled\n");
+       term_printf("Server: disabled\n");
     else {
-       term_printf("VNC server active on: ");
-       term_print_filename(vnc_state->display);
-       term_printf("\n");
+       char *serverAddr = vnc_socket_local_addr("     address: %s:%s\n",
+                                                vnc_state->lsock);
 
-       if (vnc_state->csock == -1)
-           term_printf("No client connected\n");
-       else
-           term_printf("Client connected\n");
+       if (!serverAddr)
+           return;
+
+       term_puts("Server: active\n");
+       term_puts(serverAddr);
+       free(serverAddr);
+       term_printf("        auth: %s\n", vnc_auth_name(vnc_state));
+
+       if (vnc_state->csock == -1) {
+           term_puts("Client: none\n");
+       } else {
+           char *clientAddr =
+               vnc_socket_remote_addr("     address: %s:%s\n",
+                                      vnc_state->csock);
+           if (!clientAddr)
+               return;
+
+           term_puts("Client: active\n");
+           term_puts(clientAddr);
+           free(clientAddr);
+       }
     }
 }
 
@@ -2518,3 +2626,11 @@ int vnc_display_open(DisplayState *ds, c
 
     return qemu_set_fd_handler2(vs->lsock, vnc_listen_poll, vnc_listen_read, 
NULL, vs);
 }
+
+/*
+ * Local variables:
+ *  c-indent-level: 4
+ *  c-basic-offset: 4
+ *  tab-width: 8
+ * End:
+ */


-- 
|: Red Hat, Engineering, London   -o-   http://people.redhat.com/berrange/ :|
|: http://libvirt.org  -o-  http://virt-manager.org  -o-  http://ovirt.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: GnuPG: 7D3B9505  -o-  F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|