From nobody Mon Feb 9 09:15:35 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1486660000788958.0228385864024; Thu, 9 Feb 2017 09:06:40 -0800 (PST) Received: from localhost ([::1]:39085 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cbsB4-0003af-KH for importer@patchew.org; Thu, 09 Feb 2017 12:06:38 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48249) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cbrsl-0003mH-N9 for qemu-devel@nongnu.org; Thu, 09 Feb 2017 11:47:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cbrsk-0003GP-6D for qemu-devel@nongnu.org; Thu, 09 Feb 2017 11:47:43 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33664) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cbrsj-0003Fj-UR for qemu-devel@nongnu.org; Thu, 09 Feb 2017 11:47:42 -0500 Received: from smtp.corp.redhat.com (int-mx16.intmail.prod.int.phx2.redhat.com [10.5.11.28]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 13A962B7847 for ; Thu, 9 Feb 2017 16:47:42 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-117-196.ams2.redhat.com [10.36.117.196]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4A7D022FA0B; Thu, 9 Feb 2017 16:47:37 +0000 (UTC) Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id 6288D80B18; Thu, 9 Feb 2017 17:47:24 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 9 Feb 2017 17:47:17 +0100 Message-Id: <1486658842-7143-6-git-send-email-kraxel@redhat.com> In-Reply-To: <1486658842-7143-1-git-send-email-kraxel@redhat.com> References: <1486658842-7143-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.74 on 10.5.11.28 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 09 Feb 2017 16:47:42 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL v2 05/10] ui: refactor VncDisplay to allow multiple listening sockets X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: "Daniel P. Berrange" Currently there is only a single listener for plain VNC and a single listener for websockets VNC. This means that if getaddrinfo() returns multiple IP addresses, for a hostname, the VNC server can only listen on one of them. This is just bearable if listening on wildcard interface, or if the host only has a single network interface to listen on, but if there are multiple NICs and the VNC server needs to listen on 2 or more specific IP addresses, it can't be done. This refactors the VncDisplay state so that it holds an array of listening sockets, but still only listens on one socket. Reviewed-by: Eric Blake Signed-off-by: Daniel P. Berrange Message-id: 20170203120649.15637-4-berrange@redhat.com Signed-off-by: Gerd Hoffmann --- ui/vnc.c | 103 +++++++++++++++++++++++++++++++++++++++++------------------= ---- ui/vnc.h | 10 ++++--- 2 files changed, 73 insertions(+), 40 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index d0a08a7..52df32d 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -224,8 +224,12 @@ static VncServerInfo *vnc_server_info_get(VncDisplay *= vd) VncServerInfo *info; Error *err =3D NULL; =20 + if (!vd->nlsock) { + return NULL; + } + info =3D g_malloc0(sizeof(*info)); - vnc_init_basic_info_from_server_addr(vd->lsock, + vnc_init_basic_info_from_server_addr(vd->lsock[0], qapi_VncServerInfo_base(info), &e= rr); info->has_auth =3D true; info->auth =3D g_strdup(vnc_auth_name(vd)); @@ -371,7 +375,7 @@ VncInfo *qmp_query_vnc(Error **errp) VncDisplay *vd =3D vnc_display_find(NULL); SocketAddress *addr =3D NULL; =20 - if (vd =3D=3D NULL || !vd->lsock) { + if (vd =3D=3D NULL || !vd->nlsock) { info->enabled =3D false; } else { info->enabled =3D true; @@ -384,7 +388,7 @@ VncInfo *qmp_query_vnc(Error **errp) return info; } =20 - addr =3D qio_channel_socket_get_local_address(vd->lsock, errp); + addr =3D qio_channel_socket_get_local_address(vd->lsock[0], errp); if (!addr) { goto out_error; } @@ -547,6 +551,7 @@ VncInfo2List *qmp_query_vnc_servers(Error **errp) VncInfo2 *info; VncDisplay *vd; DeviceState *dev; + size_t i; =20 QTAILQ_FOREACH(vd, &vnc_displays, next) { info =3D g_new0(VncInfo2, 1); @@ -560,13 +565,14 @@ VncInfo2List *qmp_query_vnc_servers(Error **errp) info->has_display =3D true; info->display =3D g_strdup(dev->id); } - if (vd->lsock !=3D NULL) { + for (i =3D 0; i < vd->nlsock; i++) { info->server =3D qmp_query_server_entry( - vd->lsock, false, vd->auth, vd->subauth, info->server); + vd->lsock[i], false, vd->auth, vd->subauth, info->server); } - if (vd->lwebsock !=3D NULL) { + for (i =3D 0; i < vd->nlwebsock; i++) { info->server =3D qmp_query_server_entry( - vd->lwebsock, true, vd->ws_auth, vd->ws_subauth, info->ser= ver); + vd->lwebsock[i], true, vd->ws_auth, + vd->ws_subauth, info->server); } =20 item =3D g_new0(VncInfo2List, 1); @@ -3085,15 +3091,22 @@ static gboolean vnc_listen_io(QIOChannel *ioc, VncDisplay *vd =3D opaque; QIOChannelSocket *sioc =3D NULL; Error *err =3D NULL; + bool isWebsock =3D false; + size_t i; + + for (i =3D 0; i < vd->nlwebsock; i++) { + if (ioc =3D=3D QIO_CHANNEL(vd->lwebsock[i])) { + isWebsock =3D true; + break; + } + } =20 sioc =3D qio_channel_socket_accept(QIO_CHANNEL_SOCKET(ioc), &err); if (sioc !=3D NULL) { qio_channel_set_name(QIO_CHANNEL(sioc), - ioc !=3D QIO_CHANNEL(vd->lsock) ? - "vnc-ws-server" : "vnc-server"); + isWebsock ? "vnc-ws-server" : "vnc-server"); qio_channel_set_delay(QIO_CHANNEL(sioc), false); - vnc_connect(vd, sioc, false, - ioc !=3D QIO_CHANNEL(vd->lsock)); + vnc_connect(vd, sioc, false, isWebsock); object_unref(OBJECT(sioc)); } else { /* client probably closed connection before we got there */ @@ -3153,24 +3166,33 @@ void vnc_display_init(const char *id) =20 static void vnc_display_close(VncDisplay *vd) { + size_t i; if (!vd) { return; } vd->is_unix =3D false; - if (vd->lsock !=3D NULL) { - if (vd->lsock_tag) { - g_source_remove(vd->lsock_tag); + for (i =3D 0; i < vd->nlsock; i++) { + if (vd->lsock_tag[i]) { + g_source_remove(vd->lsock_tag[i]); } - object_unref(OBJECT(vd->lsock)); - vd->lsock =3D NULL; + object_unref(OBJECT(vd->lsock[i])); } - if (vd->lwebsock !=3D NULL) { - if (vd->lwebsock_tag) { - g_source_remove(vd->lwebsock_tag); + g_free(vd->lsock); + g_free(vd->lsock_tag); + vd->lsock =3D NULL; + vd->nlsock =3D 0; + + for (i =3D 0; i < vd->nlwebsock; i++) { + if (vd->lwebsock_tag[i]) { + g_source_remove(vd->lwebsock_tag[i]); } - object_unref(OBJECT(vd->lwebsock)); - vd->lwebsock =3D NULL; + object_unref(OBJECT(vd->lwebsock[i])); } + g_free(vd->lwebsock); + g_free(vd->lwebsock_tag); + vd->lwebsock =3D NULL; + vd->nlwebsock =3D 0; + vd->auth =3D VNC_AUTH_INVALID; vd->subauth =3D VNC_AUTH_INVALID; if (vd->tlscreds) { @@ -3220,7 +3242,11 @@ static void vnc_display_print_local_addr(VncDisplay = *vd) SocketAddress *addr; Error *err =3D NULL; =20 - addr =3D qio_channel_socket_get_local_address(vd->lsock, &err); + if (!vd->nlsock) { + return; + } + + addr =3D qio_channel_socket_get_local_address(vd->lsock[0], &err); if (!addr) { return; } @@ -3784,8 +3810,6 @@ void vnc_display_open(const char *id, Error **errp) if (reverse) { /* connect to viewer */ QIOChannelSocket *sioc =3D NULL; - vd->lsock =3D NULL; - vd->lwebsock =3D NULL; if (ws_enabled) { error_setg(errp, "Cannot use websockets in reverse mode"); goto fail; @@ -3799,30 +3823,36 @@ void vnc_display_open(const char *id, Error **errp) vnc_connect(vd, sioc, false, false); object_unref(OBJECT(sioc)); } else { - vd->lsock =3D qio_channel_socket_new(); - qio_channel_set_name(QIO_CHANNEL(vd->lsock), "vnc-listen"); - if (qio_channel_socket_listen_sync(vd->lsock, saddr, errp) < 0) { + vd->nlsock =3D 1; + vd->lsock =3D g_new0(QIOChannelSocket *, 1); + vd->lsock_tag =3D g_new0(guint, 1); + + vd->lsock[0] =3D qio_channel_socket_new(); + qio_channel_set_name(QIO_CHANNEL(vd->lsock[0]), "vnc-listen"); + if (qio_channel_socket_listen_sync(vd->lsock[0], saddr, errp) < 0)= { goto fail; } vd->is_unix =3D saddr->type =3D=3D SOCKET_ADDRESS_KIND_UNIX; =20 if (ws_enabled) { - vd->lwebsock =3D qio_channel_socket_new(); - qio_channel_set_name(QIO_CHANNEL(vd->lwebsock), "vnc-ws-listen= "); - if (qio_channel_socket_listen_sync(vd->lwebsock, + vd->nlwebsock =3D 1; + vd->lwebsock =3D g_new0(QIOChannelSocket *, 1); + vd->lwebsock_tag =3D g_new0(guint, 1); + + vd->lwebsock[0] =3D qio_channel_socket_new(); + qio_channel_set_name(QIO_CHANNEL(vd->lwebsock[0]), "vnc-ws-lis= ten"); + if (qio_channel_socket_listen_sync(vd->lwebsock[0], wsaddr, errp) < 0) { - object_unref(OBJECT(vd->lsock)); - vd->lsock =3D NULL; goto fail; } } =20 - vd->lsock_tag =3D qio_channel_add_watch( - QIO_CHANNEL(vd->lsock), + vd->lsock_tag[0] =3D qio_channel_add_watch( + QIO_CHANNEL(vd->lsock[0]), G_IO_IN, vnc_listen_io, vd, NULL); if (ws_enabled) { - vd->lwebsock_tag =3D qio_channel_add_watch( - QIO_CHANNEL(vd->lwebsock), + vd->lwebsock_tag[0] =3D qio_channel_add_watch( + QIO_CHANNEL(vd->lwebsock[0]), G_IO_IN, vnc_listen_io, vd, NULL); } } @@ -3836,6 +3866,7 @@ void vnc_display_open(const char *id, Error **errp) return; =20 fail: + vnc_display_close(vd); qapi_free_SocketAddress(saddr); qapi_free_SocketAddress(wsaddr); ws_enabled =3D false; diff --git a/ui/vnc.h b/ui/vnc.h index d8c9de5..694cf32 100644 --- a/ui/vnc.h +++ b/ui/vnc.h @@ -146,10 +146,12 @@ struct VncDisplay int num_exclusive; int connections_limit; VncSharePolicy share_policy; - QIOChannelSocket *lsock; - guint lsock_tag; - QIOChannelSocket *lwebsock; - guint lwebsock_tag; + size_t nlsock; + QIOChannelSocket **lsock; + guint *lsock_tag; + size_t nlwebsock; + QIOChannelSocket **lwebsock; + guint *lwebsock_tag; DisplaySurface *ds; DisplayChangeListener dcl; kbd_layout_t *kbd_layout; --=20 1.8.3.1