From 5fcb9bf746669971a2eb1fe28f26c782641f80e2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A1n=20Tomko?= Date: Mon, 3 Jun 2013 17:54:56 +0200 Subject: [PATCH] nbd: strip braces from literal IPv6 address in URI MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Otherwise they would get passed to getaddrinfo and fail with: address resolution failed for [::1]:1234: Name or service not known (Broken by commit v1.4.0-736-gf17c90b) Signed-off-by: Ján Tomko Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini (cherry picked from commit 23307908790cd8fad91220863d7712c571ddc977) Signed-off-by: Michael Roth --- block/nbd.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/block/nbd.c b/block/nbd.c index 30e3b78e1..9c480b8f2 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -118,13 +118,22 @@ static int nbd_parse_uri(const char *filename, QDict *options) } qdict_put(options, "path", qstring_from_str(qp->p[0].value)); } else { + QString *host; /* nbd[+tcp]://host[:port]/export */ if (!uri->server) { ret = -EINVAL; goto out; } - qdict_put(options, "host", qstring_from_str(uri->server)); + /* strip braces from literal IPv6 address */ + if (uri->server[0] == '[') { + host = qstring_from_substr(uri->server, 1, + strlen(uri->server) - 2); + } else { + host = qstring_from_str(uri->server); + } + + qdict_put(options, "host", host); if (uri->port) { char* port_str = g_strdup_printf("%d", uri->port); qdict_put(options, "port", qstring_from_str(port_str)); -- 2.39.2