qemu-socket: allow hostnames starting with a digit
According to RFC 1123 [1], hostnames can start with a digit too. [1] http://tools.ietf.org/html/rfc1123#page-13 Signed-off-by: Ján Tomko <jtomko@redhat.com> Cc: qemu-stable@nongnu.org [Use strspn, not strcspn. - Paolo] Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
afd59989db
commit
391b7b9701
@ -24,7 +24,6 @@
|
||||
|
||||
#include "monitor/monitor.h"
|
||||
#include "qemu/sockets.h"
|
||||
#include "qemu-common.h" /* for qemu_isdigit */
|
||||
#include "qemu/main-loop.h"
|
||||
|
||||
#ifndef AI_ADDRCONFIG
|
||||
@ -511,19 +510,15 @@ InetSocketAddress *inet_parse(const char *str, Error **errp)
|
||||
goto fail;
|
||||
}
|
||||
addr->ipv6 = addr->has_ipv6 = true;
|
||||
} else if (qemu_isdigit(str[0])) {
|
||||
/* IPv4 addr */
|
||||
if (2 != sscanf(str, "%64[0-9.]:%32[^,]%n", host, port, &pos)) {
|
||||
error_setg(errp, "error parsing IPv4 address '%s'", str);
|
||||
goto fail;
|
||||
}
|
||||
addr->ipv4 = addr->has_ipv4 = true;
|
||||
} else {
|
||||
/* hostname */
|
||||
/* hostname or IPv4 addr */
|
||||
if (2 != sscanf(str, "%64[^:]:%32[^,]%n", host, port, &pos)) {
|
||||
error_setg(errp, "error parsing address '%s'", str);
|
||||
goto fail;
|
||||
}
|
||||
if (host[strspn(host, "0123456789.")] == '\0') {
|
||||
addr->ipv4 = addr->has_ipv4 = true;
|
||||
}
|
||||
}
|
||||
|
||||
addr->host = g_strdup(host);
|
||||
|
Loading…
Reference in New Issue
Block a user