diff mbox

[v2] Strip brackets from vnc host

Message ID 73fa95920a361fb45b888b367e8fdf9ff0ba1416.1430146883.git.jtomko@redhat.com
State New
Headers show

Commit Message

Ján Tomko April 27, 2015, 3:03 p.m. UTC 
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>
---
v2: Fixed spacing around operators
    cc'd qemu-stable

 ui/vnc.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

Comments

Gerd Hoffmann April 28, 2015, 9:37 a.m. UTC | #1 
On Mo, 2015-04-27 at 17:03 +0200, Ján Tomko wrote:
> 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.

added to vnc queue.

thanks,
  Gerd
diff mbox

Patch

diff --git a/ui/vnc.c b/ui/vnc.c
index cffb5b7..f989dfb 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);