From nobody Thu May 2 03:53:03 2024 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 1489480108317189.12290703166627; Tue, 14 Mar 2017 01:28:28 -0700 (PDT) Received: from localhost ([::1]:57073 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cnhog-0004mm-DT for importer@patchew.org; Tue, 14 Mar 2017 04:28:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45227) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cnhoD-0004mW-Ip for qemu-devel@nongnu.org; Tue, 14 Mar 2017 04:27:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cnho8-0000cN-Kj for qemu-devel@nongnu.org; Tue, 14 Mar 2017 04:27:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37778) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cnho8-0000bm-Co for qemu-devel@nongnu.org; Tue, 14 Mar 2017 04:27:52 -0400 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 4A4017E9E1 for ; Tue, 14 Mar 2017 08:27:52 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-116-69.ams2.redhat.com [10.36.116.69]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v2E8RoGM022672; Tue, 14 Mar 2017 04:27:51 -0400 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id 13B848097C; Tue, 14 Mar 2017 09:27:49 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 14 Mar 2017 09:26:58 +0100 Message-Id: <1489480018-11443-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.26]); Tue, 14 Mar 2017 08:27:52 +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] [PATCH] vnc: fix reverse mode 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" vnc server in reverse mode (qemu -vnc localhost:$nr,reverse) interprets $nr as display number (i.e. with 5900 offset) in recent qemu versions. Historical and documented behavior is interpreting $nr as port number though. So we should bring code and documentation in line. Given that default listening port for viewers is 5500 the 5900 offset is pretty inconvinient, because it is simply impossible to connect to port 5500. So, lets fix the code not the docs. Signed-off-by: Gerd Hoffmann Reviewed-by: Daniel P. Berrange --- ui/vnc.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index 51f4b30..a72ea2b 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -3501,6 +3501,7 @@ vnc_display_create_creds(bool x509, =20 static int vnc_display_get_address(const char *addrstr, bool websocket, + bool reverse, int displaynum, int to, bool has_ipv4, @@ -3580,21 +3581,22 @@ static int vnc_display_get_address(const char *addr= str, inet->port =3D g_strdup(port); } } else { + int offset =3D reverse ? 0 : 5900; if (parse_uint_full(port, &baseport, 10) < 0) { error_setg(errp, "can't convert to a number: %s", port); goto cleanup; } if (baseport > 65535 || - baseport + 5900 > 65535) { + baseport + offset > 65535) { error_setg(errp, "port %s out of range", port); goto cleanup; } inet->port =3D g_strdup_printf( - "%d", (int)baseport + 5900); + "%d", (int)baseport + offset); =20 if (to) { inet->has_to =3D true; - inet->to =3D to + 5900; + inet->to =3D to + offset; } } =20 @@ -3616,6 +3618,7 @@ static int vnc_display_get_address(const char *addrst= r, } =20 static int vnc_display_get_addresses(QemuOpts *opts, + bool reverse, SocketAddress ***retsaddr, size_t *retnsaddr, SocketAddress ***retwsaddr, @@ -3655,7 +3658,7 @@ static int vnc_display_get_addresses(QemuOpts *opts, qemu_opt_iter_init(&addriter, opts, "vnc"); while ((addr =3D qemu_opt_iter_next(&addriter)) !=3D NULL) { int rv; - rv =3D vnc_display_get_address(addr, false, 0, to, + rv =3D vnc_display_get_address(addr, false, reverse, 0, to, has_ipv4, has_ipv6, ipv4, ipv6, &saddr, errp); @@ -3680,7 +3683,7 @@ static int vnc_display_get_addresses(QemuOpts *opts, =20 qemu_opt_iter_init(&addriter, opts, "websocket"); while ((addr =3D qemu_opt_iter_next(&addriter)) !=3D NULL) { - if (vnc_display_get_address(addr, true, displaynum, to, + if (vnc_display_get_address(addr, true, reverse, displaynum, to, has_ipv4, has_ipv6, ipv4, ipv6, &wsaddr, errp) < 0) { @@ -3876,7 +3879,8 @@ void vnc_display_open(const char *id, Error **errp) return; } =20 - if (vnc_display_get_addresses(opts, &saddr, &nsaddr, + reverse =3D qemu_opt_get_bool(opts, "reverse", false); + if (vnc_display_get_addresses(opts, reverse, &saddr, &nsaddr, &wsaddr, &nwsaddr, errp) < 0) { goto fail; } @@ -3902,7 +3906,6 @@ void vnc_display_open(const char *id, Error **errp) } } =20 - reverse =3D qemu_opt_get_bool(opts, "reverse", false); lock_key_sync =3D qemu_opt_get_bool(opts, "lock-key-sync", true); key_delay_ms =3D qemu_opt_get_number(opts, "key-delay-ms", 1); sasl =3D qemu_opt_get_bool(opts, "sasl", false); --=20 1.8.3.1