Il 03/06/2013 17:54, Ján Tomko ha scritto:
> Otherwise they would get passed to getaddrinfo and fail with:
> address resolution failed for [::1]:1234: Name or service not known
Hmm... Hai Huang found a similar problem:
error: internal error unable to execute QEMU command 'nbd-server-start':
address resolution failed for [::]:5900: Name or service not known
This one is a libvirt bug, but perhaps it's simpler to just have a
wrapper for getaddrinfo that strips brackets (and not strip the brackets
in inet_parse, too).
Paolo
> (Broken by commit v1.4.0-736-gf17c90b)
>
> Signed-off-by: Ján Tomko <jto...@redhat.com>
> ---
> block/nbd.c | 11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/block/nbd.c b/block/nbd.c
> index 30e3b78..9c480b8 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));
>
