aboutsummaryrefslogtreecommitdiff
path: root/ui
diff options
context:
space:
mode:
authorDaniel P. Berrange <berrange@redhat.com>2017-02-03 12:06:42 +0000
committerGerd Hoffmann <kraxel@redhat.com>2017-02-08 14:59:37 +0100
commit1b1aeb5828c978af2ec4478e552884004f23c470 (patch)
tree56593705cea430a5eb198ef0fc9c8d9a34b4ab9f /ui
parent537848ee62195fc06c328b1cd64f4218f404a7f1 (diff)
ui: fix regression handling bare 'websocket' option to -vnc
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 <kraxel@redhat.com> 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 <eblake@redhat.com> Signed-off-by: Daniel P. Berrange <berrange@redhat.com> Message-id: 20170203120649.15637-2-berrange@redhat.com Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'ui')
-rw-r--r--ui/vnc.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/ui/vnc.c b/ui/vnc.c
index f2701e5974..b0889b10b6 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;