From f6fc306aa623bcc6ce38668c237273d516c017e7 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Mon, 15 Jun 2015 07:14:18 +0200 Subject: [PATCH 011/217] Strip brackets from vnc host MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-id: <1434352458-9252-2-git-send-email-kraxel@redhat.com> Patchwork-id: 66129 O-Subject: [RHEL-7.2 qemu-kvm-rhev PATCH 1/1] Strip brackets from vnc host Bugzilla: 1229073 RH-Acked-by: Miroslav Rezanina RH-Acked-by: Bandan Das RH-Acked-by: Dr. David Alan Gilbert From: Ján Tomko 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 Reviewed-by: Eric Blake Signed-off-by: Gerd Hoffmann (cherry picked from commit 274c3b52e10466a4771d591f6298ef61e8354ce0) Signed-off-by: Miroslav Rezanina --- ui/vnc.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ui/vnc.c b/ui/vnc.c index bd6f8a7..14c0037 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -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); -- 1.8.3.1