summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorJán Tomko <jtomko@redhat.com>2013-06-03 17:54:55 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2013-06-18 11:42:45 +0200
commit391b7b9701ba3318e890ec0cba97a3c654bfa667 (patch)
tree255782681df5ba383b62a96fcffa6d3c59552c40 /util
parentafd59989db90683fa127fec501d2633bcfbd6379 (diff)
downloadhqemu-391b7b9701ba3318e890ec0cba97a3c654bfa667.zip
hqemu-391b7b9701ba3318e890ec0cba97a3c654bfa667.tar.gz
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>
Diffstat (limited to 'util')
-rw-r--r--util/qemu-sockets.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index fdd8dc4..96eca2a 100644
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -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);
OpenPOWER on IntegriCloud