From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55192) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dSn3v-0005vG-OS for qemu-devel@nongnu.org; Wed, 05 Jul 2017 12:22:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dSn3u-00043Z-LC for qemu-devel@nongnu.org; Wed, 05 Jul 2017 12:21:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42538) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dSn3u-00042R-Bp for qemu-devel@nongnu.org; Wed, 05 Jul 2017 12:21:58 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5953580480 for ; Wed, 5 Jul 2017 16:21:57 +0000 (UTC) Date: Wed, 5 Jul 2017 12:21:53 -0400 (EDT) From: =?utf-8?Q?Marc-Andr=C3=A9?= Lureau Message-ID: <57935658.47275852.1499271713596.JavaMail.zimbra@redhat.com> In-Reply-To: <20170705144302.32017-1-dgilbert@redhat.com> References: <20170705144302.32017-1-dgilbert@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] hmp: Update info vnc List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Dr. David Alan Gilbert (git)" Cc: qemu-devel@nongnu.org, berrange@redhat.com, lcapitulino@redhat.com, armbru@redhat.com ----- Original Message ----- > From: "Dr. David Alan Gilbert" >=20 > The QMP query-vnc interfaces have gained a lot more information that > the HMP interfaces hasn't got yet. Update it. >=20 > Note the output format has changed, but this is HMP so that's OK. >=20 > In particular, this now includes client information for reverse > connections: >=20 > -vnc :0 > (qemu) info vnc > default: > Server: 0.0.0.0:5900 (ipv4) > Auth: none (Sub: none) > Auth: none (Sub: none) >=20 > (Now connect a client) >=20 > (qemu) info vnc > default: > Server: 0.0.0.0:5900 (ipv4) > Auth: none (Sub: none) > Client: 127.0.0.1:51828 (ipv4) > x509_dname: none > username: none > Auth: none (Sub: none) >=20 > -vnc localhost:7000,reverse > (qemu) info vnc > default: > Client: ::1:7000 (ipv6) > x509_dname: none > username: none > Auth: none (Sub: none) >=20 > -vnc :1,password,id=3Drev -vnc localhost:7000,reverse > (qemu) info vnc > default: > Client: ::1:7000 (ipv6) > x509_dname: none > username: none > Auth: none (Sub: none) > rev: > Server: 0.0.0.0:5901 (ipv4) > Auth: vnc (Sub: none) > Client: 127.0.0.1:53616 (ipv4) > x509_dname: none > username: none > Auth: vnc (Sub: none) >=20 > This was originally RH bz 1461682 >=20 > Signed-off-by: Dr. David Alan Gilbert > --- > hmp.c | 98 > ++++++++++++++++++++++++++++++++++++++++++++++--------------------- > 1 file changed, 67 insertions(+), 31 deletions(-) >=20 > diff --git a/hmp.c b/hmp.c > index dee40284c1..c11a5fe2c6 100644 > --- a/hmp.c > +++ b/hmp.c > @@ -600,50 +600,86 @@ void hmp_info_blockstats(Monitor *mon, const QDict > *qdict) > qapi_free_BlockStatsList(stats_list); > } > =20 > +/* Helper for hmp_info_vnc_clients, _servers */ > +static void hmp_info_VncBasicInfo(Monitor *mon, VncBasicInfo *info, > + const char *name) > +{ > + monitor_printf(mon, " %s: %s:%s (%s%s)\n", > + name, > + info->host, > + info->service, > + NetworkAddressFamily_lookup[info->family], > + info->websocket ? " (Websocket)" : ""); > +} > + > +/* Helper displaying and euth and crypt info */ > +static void hmp_info_vnc_authcrypt(Monitor *mon, const char *indent, > + VncPrimaryAuth auth, > + VncVencryptSubAuth *vencrypt) > +{ > + monitor_printf(mon, "%sAuth: %s (Sub: %s)\n", indent, > + VncPrimaryAuth_lookup[auth], > + vencrypt ? VncVencryptSubAuth_lookup[*vencrypt] : > "none"); > +} > + > +static void hmp_info_vnc_clients(Monitor *mon, VncClientInfoList *client= ) > +{ > + while (client) { > + VncClientInfo *cinfo =3D client->value; > + > + hmp_info_VncBasicInfo(mon, (VncBasicInfo *)cinfo, "Client"); > + monitor_printf(mon, " x509_dname: %s\n", > + cinfo->x509_dname ? Why not use has_x509_dname ? > + cinfo->x509_dname : "none"); > + monitor_printf(mon, " username: %s\n", sasl_username would be more clear > + cinfo->has_sasl_username ? > + cinfo->sasl_username : "none"); > + > + client =3D client->next; > + } > +} > + > +static void hmp_info_vnc_servers(Monitor *mon, VncServerInfo2List *serve= r) > +{ > + while (server) { > + VncServerInfo2 *sinfo =3D server->value; > + hmp_info_VncBasicInfo(mon, (VncBasicInfo *)sinfo, "Server"); > + hmp_info_vnc_authcrypt(mon, " ", sinfo->auth, > + sinfo->has_vencrypt ? &sinfo->vencrypt : > NULL); > + server =3D server->next; > + } > +} > + > void hmp_info_vnc(Monitor *mon, const QDict *qdict) > { > - VncInfo *info; > + VncInfo2List *info2l; > Error *err =3D NULL; > - VncClientInfoList *client; > =20 > - info =3D qmp_query_vnc(&err); > + info2l =3D qmp_query_vnc_servers(&err); > if (err) { > error_report_err(err); > return; > } > - > - if (!info->enabled) { > - monitor_printf(mon, "Server: disabled\n"); > - goto out; > - } > - > - monitor_printf(mon, "Server:\n"); > - if (info->has_host && info->has_service) { > - monitor_printf(mon, " address: %s:%s\n", info->host, > info->service); > - } > - if (info->has_auth) { > - monitor_printf(mon, " auth: %s\n", info->auth); > + if (!info2l) { > + monitor_printf(mon, "None\n"); > + return; > } > =20 > - if (!info->has_clients || info->clients =3D=3D NULL) { > - monitor_printf(mon, "Client: none\n"); > - } else { > - for (client =3D info->clients; client; client =3D client->next) = { > - monitor_printf(mon, "Client:\n"); > - monitor_printf(mon, " address: %s:%s\n", > - client->value->host, > - client->value->service); > - monitor_printf(mon, " x509_dname: %s\n", > - client->value->x509_dname ? > - client->value->x509_dname : "none"); > - monitor_printf(mon, " username: %s\n", > - client->value->has_sasl_username ? > - client->value->sasl_username : "none"); > + while (info2l) { > + VncInfo2 *info =3D info2l->value; > + monitor_printf(mon, "%s:\n", info->id); > + hmp_info_vnc_servers(mon, info->server); > + hmp_info_vnc_clients(mon, info->clients); > + hmp_info_vnc_authcrypt(mon, " ", info->auth, > + info->has_vencrypt ? &info->vencrypt : NULL); > + if (info->has_display) { > + monitor_printf(mon, " Display: %s\n", info->display); > } > + info2l =3D info2l->next; > } > =20 > -out: > - qapi_free_VncInfo(info); > + qapi_free_VncInfo2List(info2l); > + > } > =20 > #ifdef CONFIG_SPICE > -- > 2.13.0 Looks good to me otherwise Reviewed-by: Marc-Andr=C3=A9 Lureau