diff options
author | Ján Tomko <jtomko@redhat.com> | 2015-04-27 17:03:14 +0200 |
---|---|---|
committer | Gerd Hoffmann <kraxel@redhat.com> | 2015-05-20 10:23:08 +0200 |
commit | 274c3b52e10466a4771d591f6298ef61e8354ce0 (patch) | |
tree | 590ff6fe4ba7f9cd7b0e41ac277ac167b3e7be47 | |
parent | eba05e922e8e7f307bc5d4104a78797e55124e97 (diff) |
Strip brackets from vnc host
Commit v2.2.0-1530-ge556032 vnc: switch to inet_listen_opts
bypassed the use of inet_parse in inet_listen, making literal
IPv6 addresses enclosed in brackets fail:
qemu-kvm: -vnc [::1]:0: Failed to start VNC server on `(null)': address
resolution failed for [::1]:5900: Name or service not known
Strip the brackets to make it work again.
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-rw-r--r-- | ui/vnc.c | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -3482,7 +3482,14 @@ void vnc_display_open(const char *id, Error **errp) h = strrchr(vnc, ':'); if (h) { - char *host = g_strndup(vnc, h - vnc); + char *host; + size_t hlen = h - vnc; + + if (vnc[0] == '[' && vnc[hlen - 1] == ']') { + host = g_strndup(vnc + 1, hlen - 2); + } else { + host = g_strndup(vnc, hlen); + } qemu_opt_set(sopts, "host", host, &error_abort); qemu_opt_set(wsopts, "host", host, &error_abort); qemu_opt_set(sopts, "port", h+1, &error_abort); |