From nobody Mon Feb 9 06:49:10 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 1486660224883872.2942374166582; Thu, 9 Feb 2017 09:10:24 -0800 (PST) Received: from localhost ([::1]:39130 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cbsEh-0006zM-2b for importer@patchew.org; Thu, 09 Feb 2017 12:10:23 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48286) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cbrsm-0003mt-G4 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-0003Hf-Uc for qemu-devel@nongnu.org; Thu, 09 Feb 2017 11:47:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34760) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cbrsk-0003GJ-KM for qemu-devel@nongnu.org; Thu, 09 Feb 2017 11:47:42 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C20CDC05493E 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 int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v19GlaWm030136; Thu, 9 Feb 2017 11:47:38 -0500 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id 8ED1E80B99; Thu, 9 Feb 2017 17:47:24 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 9 Feb 2017 17:47:19 +0100 Message-Id: <1486658842-7143-8-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.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); 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 07/10] ui: extract code to connect/listen from vnc_display_open 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" The code which takes a SocketAddress and connects/listens on the network is going to get more complicated to deal with multiple listeners. Pull it out into a separate method to avoid making the vnc_display_open method even more complex. Reviewed-by: Eric Blake Signed-off-by: Daniel P. Berrange Message-id: 20170203120649.15637-6-berrange@redhat.com Signed-off-by: Gerd Hoffmann --- ui/vnc.c | 122 +++++++++++++++++++++++++++++++++++++++++------------------= ---- 1 file changed, 80 insertions(+), 42 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index 7e988c6..02c0b89 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -3667,6 +3667,84 @@ static int vnc_display_get_addresses(QemuOpts *opts, return -1; } =20 +static int vnc_display_connect(VncDisplay *vd, + SocketAddress *saddr, + SocketAddress *wsaddr, + Error **errp) +{ + /* connect to viewer */ + QIOChannelSocket *sioc =3D NULL; + if (wsaddr) { + error_setg(errp, "Cannot use websockets in reverse mode"); + return -1; + } + vd->is_unix =3D saddr->type =3D=3D SOCKET_ADDRESS_KIND_UNIX; + sioc =3D qio_channel_socket_new(); + qio_channel_set_name(QIO_CHANNEL(sioc), "vnc-reverse"); + if (qio_channel_socket_connect_sync(sioc, saddr, errp) < 0) { + return -1; + } + vnc_connect(vd, sioc, false, false); + object_unref(OBJECT(sioc)); + return 0; +} + + +static int vnc_display_listen_addr(VncDisplay *vd, + SocketAddress *addr, + const char *name, + QIOChannelSocket ***lsock, + guint **lsock_tag, + size_t *nlsock, + Error **errp) +{ + *nlsock =3D 1; + *lsock =3D g_new0(QIOChannelSocket *, 1); + *lsock_tag =3D g_new0(guint, 1); + + (*lsock)[0] =3D qio_channel_socket_new(); + qio_channel_set_name(QIO_CHANNEL((*lsock)[0]), name); + if (qio_channel_socket_listen_sync((*lsock)[0], addr, errp) < 0) { + return -1; + } + + (*lsock_tag)[0] =3D qio_channel_add_watch( + QIO_CHANNEL((*lsock)[0]), + G_IO_IN, vnc_listen_io, vd, NULL); + + return 0; +} + + +static int vnc_display_listen(VncDisplay *vd, + SocketAddress *saddr, + SocketAddress *wsaddr, + Error **errp) +{ + vd->is_unix =3D saddr->type =3D=3D SOCKET_ADDRESS_KIND_UNIX; + + if (vnc_display_listen_addr(vd, saddr, + "vnc-listen", + &vd->lsock, + &vd->lsock_tag, + &vd->nlsock, + errp) < 0) { + return -1; + } + if (wsaddr && + vnc_display_listen_addr(vd, wsaddr, + "vnc-ws-listen", + &vd->lwebsock, + &vd->lwebsock_tag, + &vd->nlwebsock, + errp) < 0) { + return -1; + } + + return 0; +} + + void vnc_display_open(const char *id, Error **errp) { VncDisplay *vd =3D vnc_display_find(id); @@ -3889,53 +3967,13 @@ void vnc_display_open(const char *id, Error **errp) } =20 if (reverse) { - /* connect to viewer */ - QIOChannelSocket *sioc =3D NULL; - if (wsaddr) { - error_setg(errp, "Cannot use websockets in reverse mode"); + if (vnc_display_connect(vd, saddr, wsaddr, errp) < 0) { goto fail; } - vd->is_unix =3D saddr->type =3D=3D SOCKET_ADDRESS_KIND_UNIX; - sioc =3D qio_channel_socket_new(); - qio_channel_set_name(QIO_CHANNEL(sioc), "vnc-reverse"); - if (qio_channel_socket_connect_sync(sioc, saddr, errp) < 0) { - goto fail; - } - vnc_connect(vd, sioc, false, false); - object_unref(OBJECT(sioc)); } else { - 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)= { + if (vnc_display_listen(vd, saddr, wsaddr, errp) < 0) { goto fail; } - vd->is_unix =3D saddr->type =3D=3D SOCKET_ADDRESS_KIND_UNIX; - - if (wsaddr) { - 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) { - goto fail; - } - } - - vd->lsock_tag[0] =3D qio_channel_add_watch( - QIO_CHANNEL(vd->lsock[0]), - G_IO_IN, vnc_listen_io, vd, NULL); - if (wsaddr) { - vd->lwebsock_tag[0] =3D qio_channel_add_watch( - QIO_CHANNEL(vd->lwebsock[0]), - G_IO_IN, vnc_listen_io, vd, NULL); - } } =20 if (qemu_opt_get(opts, "to")) { --=20 1.8.3.1