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

nbd: strip braces from literal IPv6 address in URI

Browse Source 
Otherwise they would get passed to getaddrinfo and fail with:
address resolution failed for [::1]🔢 Name or service not known

(Broken by commit v1.4.0-736-gf17c90b)

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Cc: qemu-stable@nongnu.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Ján Tomko 2013-06-03 17:54:56 +02:00 committed by Paolo Bonzini
parent 391b7b9701
commit 2330790879
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
block/nbd.c
View File

@ -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)); qdict_put(options, "path", qstring_from_str(qp->p[0].value));
} else { } else {
QString *host;
/* nbd[+tcp]://host[:port]/export */ /* nbd[+tcp]://host[:port]/export */
if (!uri->server) { if (!uri->server) {
ret = -EINVAL; ret = -EINVAL;
goto out; 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) { if (uri->port) {
char* port_str = g_strdup_printf("%d", uri->port); char* port_str = g_strdup_printf("%d", uri->port);
qdict_put(options, "port", qstring_from_str(port_str)); qdict_put(options, "port", qstring_from_str(port_str));