[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 03/10] ui: fix regression handling bare 'websocket
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL v2 03/10] ui: fix regression handling bare 'websocket' option to -vnc |
Date: |
Thu, 9 Feb 2017 17:47:15 +0100 |
From: "Daniel P. Berrange" <address@hidden>
The -vnc argument is documented as accepting two syntaxes for
the 'websocket' option, either a bare option name, or a port
number. If using the bare option name, it is supposed to apply
the display number as an offset to base port 5700. e.g.
-vnc localhost:3,websocket
should listen on port 5703, however, this was broken in 2.3.0 since
commit 4db14629c38611061fc19ec6927405923de84f08
Author: Gerd Hoffmann <address@hidden>
Date: Tue Sep 16 12:33:03 2014 +0200
vnc: switch to QemuOpts, allow multiple servers
instead qemu tries to listen on port "on" which gets looked up in
/etc/services and fails.
Fixes bug: #1455912
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/vnc.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/ui/vnc.c b/ui/vnc.c
index f2701e5..b0889b1 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -3558,7 +3558,13 @@ void vnc_display_open(const char *id, Error **errp)
wsaddr->type = SOCKET_ADDRESS_KIND_INET;
inet = wsaddr->u.inet.data = g_new0(InetSocketAddress, 1);
inet->host = g_strdup(saddr->u.inet.data->host);
- inet->port = g_strdup(websocket);
+ if (g_str_equal(websocket, "") ||
+ g_str_equal(websocket, "on")) {
+ inet->port = g_strdup_printf(
+ "%d", (int)baseport + 5700);
+ } else {
+ inet->port = g_strdup(websocket);
+ }
if (to) {
inet->has_to = true;
--
1.8.3.1
- [Qemu-devel] [PULL v2 00/10] vnc: add support for multiple listening sockets., Gerd Hoffmann, 2017/02/09
- [Qemu-devel] [PULL v2 02/10] vnc: do not disconnect on EAGAIN, Gerd Hoffmann, 2017/02/09
- [Qemu-devel] [PULL v2 01/10] ui/vnc: Drop unused vnc_has_job() and vnc_jobs_clear(), Gerd Hoffmann, 2017/02/09
- [Qemu-devel] [PULL v2 03/10] ui: fix regression handling bare 'websocket' option to -vnc,
Gerd Hoffmann <=
- [Qemu-devel] [PULL v2 04/10] ui: fix reporting of VNC auth in query-vnc-servers, Gerd Hoffmann, 2017/02/09
- [Qemu-devel] [PULL v2 09/10] util: add iterators for QemuOpts values, Gerd Hoffmann, 2017/02/09
- [Qemu-devel] [PULL v2 05/10] ui: refactor VncDisplay to allow multiple listening sockets, Gerd Hoffmann, 2017/02/09
- [Qemu-devel] [PULL v2 07/10] ui: extract code to connect/listen from vnc_display_open, Gerd Hoffmann, 2017/02/09
- [Qemu-devel] [PULL v2 08/10] ui: let VNC server listen on all resolved IP addresses, Gerd Hoffmann, 2017/02/09
- [Qemu-devel] [PULL v2 10/10] ui: add ability to specify multiple VNC listen addresses, Gerd Hoffmann, 2017/02/09
- [Qemu-devel] [PULL v2 06/10] ui: refactor code for populating SocketAddress from vnc_display_open, Gerd Hoffmann, 2017/02/09
- Re: [Qemu-devel] [PULL v2 00/10] vnc: add support for multiple listening sockets., Peter Maydell, 2017/02/09
- Re: [Qemu-devel] [PULL v2 00/10] vnc: add support for multiple listening sockets., Paolo Bonzini, 2017/02/16