OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

vnc: fix reverse mode

Browse Source 
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 <kraxel@redhat.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Message-id: 1489480018-11443-1-git-send-email-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2017-03-14 09:26:58 +01:00
parent 8bce03e393
commit e5766eb404
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ui/vnc.c
View File

@ -3401,6 +3401,7 @@ vnc_display_create_creds(bool x509,
static int vnc_display_get_address(const char *addrstr, static int vnc_display_get_address(const char *addrstr,
bool websocket, bool websocket,
bool reverse,
int displaynum, int displaynum,
int to, int to,
bool has_ipv4, bool has_ipv4,
@ -3480,21 +3481,22 @@ static int vnc_display_get_address(const char *addrstr,
inet->port = g_strdup(port); inet->port = g_strdup(port);
} }
} else { } else {
int offset = reverse ? 0 : 5900;
if (parse_uint_full(port, &baseport, 10) < 0) { if (parse_uint_full(port, &baseport, 10) < 0) {
error_setg(errp, "can't convert to a number: %s", port); error_setg(errp, "can't convert to a number: %s", port);
goto cleanup; goto cleanup;
} }
if (baseport > 65535 || if (baseport > 65535 ||
baseport + 5900 > 65535) { baseport + offset > 65535) {
error_setg(errp, "port %s out of range", port); error_setg(errp, "port %s out of range", port);
goto cleanup; goto cleanup;
} }
inet->port = g_strdup_printf( inet->port = g_strdup_printf(
"%d", (int)baseport + 5900); "%d", (int)baseport + offset);
if (to) { if (to) {
inet->has_to = true; inet->has_to = true;
inet->to = to + 5900; inet->to = to + offset;
} }
} }
@ -3516,6 +3518,7 @@ static int vnc_display_get_address(const char *addrstr,
} }
static int vnc_display_get_addresses(QemuOpts *opts, static int vnc_display_get_addresses(QemuOpts *opts,
bool reverse,
SocketAddress ***retsaddr, SocketAddress ***retsaddr,
size_t *retnsaddr, size_t *retnsaddr,
SocketAddress ***retwsaddr, SocketAddress ***retwsaddr,
@ -3555,7 +3558,7 @@ static int vnc_display_get_addresses(QemuOpts *opts,
qemu_opt_iter_init(&addriter, opts, "vnc"); qemu_opt_iter_init(&addriter, opts, "vnc");
while ((addr = qemu_opt_iter_next(&addriter)) != NULL) { while ((addr = qemu_opt_iter_next(&addriter)) != NULL) {
int rv; int rv;
rv = vnc_display_get_address(addr, false, 0, to, rv = vnc_display_get_address(addr, false, reverse, 0, to,
has_ipv4, has_ipv6, has_ipv4, has_ipv6,
ipv4, ipv6, ipv4, ipv6,
&saddr, errp); &saddr, errp);
@ -3580,7 +3583,7 @@ static int vnc_display_get_addresses(QemuOpts *opts,
qemu_opt_iter_init(&addriter, opts, "websocket"); qemu_opt_iter_init(&addriter, opts, "websocket");
while ((addr = qemu_opt_iter_next(&addriter)) != NULL) { while ((addr = qemu_opt_iter_next(&addriter)) != NULL) {
if (vnc_display_get_address(addr, true, displaynum, to, if (vnc_display_get_address(addr, true, reverse, displaynum, to,
has_ipv4, has_ipv6, has_ipv4, has_ipv6,
ipv4, ipv6, ipv4, ipv6,
&wsaddr, errp) < 0) { &wsaddr, errp) < 0) {
@ -3777,7 +3780,8 @@ void vnc_display_open(const char *id, Error **errp)
return; return;
} }
if (vnc_display_get_addresses(opts, &saddr, &nsaddr, reverse = qemu_opt_get_bool(opts, "reverse", false);
if (vnc_display_get_addresses(opts, reverse, &saddr, &nsaddr,
&wsaddr, &nwsaddr, errp) < 0) { &wsaddr, &nwsaddr, errp) < 0) {
goto fail; goto fail;
} }
@ -3803,7 +3807,6 @@ void vnc_display_open(const char *id, Error **errp)
} }
} }
reverse = qemu_opt_get_bool(opts, "reverse", false);
lock_key_sync = qemu_opt_get_bool(opts, "lock-key-sync", true); lock_key_sync = qemu_opt_get_bool(opts, "lock-key-sync", true);
key_delay_ms = qemu_opt_get_number(opts, "key-delay-ms", 1); key_delay_ms = qemu_opt_get_number(opts, "key-delay-ms", 1);
sasl = qemu_opt_get_bool(opts, "sasl", false); sasl = qemu_opt_get_bool(opts, "sasl", false);