On 12/19/2014 02:04 AM, Gerd Hoffmann wrote:
> Add websockets bool to VncBasicInfo, report websocket server sockets,
> flag websocket client connections.
>
> Signed-off-by: Gerd Hoffmann <kra...@redhat.com>
> ---
> qapi-schema.json | 5 ++++-
> ui/vnc.c | 15 ++++++++++++---
> 2 files changed, 16 insertions(+), 4 deletions(-)
>
> diff --git a/qapi-schema.json b/qapi-schema.json
> index 2d45d4c..07deb71 100644
> --- a/qapi-schema.json
> +++ b/qapi-schema.json
> @@ -672,12 +672,15 @@
> #
> # @family: address family
> #
> +# @websocket: true in case the socket is a websocket (since 2.3).
> +#
> # Since: 2.1
> ##
> { 'type': 'VncBasicInfo',
> 'data': { 'host': 'str',
> 'service': 'str',
> - 'family': 'NetworkAddressFamily' } }
> + 'family': 'NetworkAddressFamily',
> + 'websocket': 'bool' } }
This says the field is mandatory;
> +++ b/ui/vnc.c
> @@ -353,6 +353,9 @@ static VncClientInfo *qmp_query_vnc_client(const VncState
> *client)
> info->base->host = g_strdup(host);
> info->base->service = g_strdup(serv);
> info->base->family = inet_netfamily(sa.ss_family);
> +#ifdef CONFIG_VNC_WS
> + info->base->websocket = client->websocket;
> +#endif
while this only conditionally assigns it. Fortunately, in the context
not shown here, you use g_malloc0 for initializing info->base, so it
works out.
Reviewed-by: Eric Blake <ebl...@redhat.com>
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
