From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36107) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cVh0W-0004vp-8F for qemu-devel@nongnu.org; Mon, 23 Jan 2017 10:58:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cVh0V-0006Qg-Cr for qemu-devel@nongnu.org; Mon, 23 Jan 2017 10:58:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51730) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cVh0V-0006Qb-7K for qemu-devel@nongnu.org; Mon, 23 Jan 2017 10:58:11 -0500 From: "Daniel P. Berrange" Date: Mon, 23 Jan 2017 15:57:30 +0000 Message-Id: <20170123155737.3793-2-berrange@redhat.com> In-Reply-To: <20170123155737.3793-1-berrange@redhat.com> References: <20170123155737.3793-1-berrange@redhat.com> Subject: [Qemu-devel] [PULL v2 1/8] sockets: add ability to disable DNS resolution for InetSocketAddress List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , "Daniel P. Berrange" Add a 'numeric' flag to the InetSocketAddress struct to allow the caller to indicate that DNS should be skipped for the host/port fields. This is useful if the caller knows the address is already numeric and wants to guarantee no (potentially blocking) DNS lookups are attempted. Reviewed-by: Eric Blake Signed-off-by: Daniel P. Berrange --- qapi-schema.json | 5 +++++ util/qemu-sockets.c | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/qapi-schema.json b/qapi-schema.json index ddc8783..ac55f4a 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3983,6 +3983,10 @@ # # @port: port part of the address, or lowest port if @to is present # +# @numeric: #optional true if the host/port are guaranteed to be numeric, +# false if name resolution should be attempted. Defaults to false. +# (Since 2.9) +# # @to: highest port to try # # @ipv4: whether to accept IPv4 addresses, default try both IPv4 and IPv6 @@ -3997,6 +4001,7 @@ 'data': { 'host': 'str', 'port': 'str', + '*numeric': 'bool', '*to': 'uint16', '*ipv4': 'bool', '*ipv6': 'bool' } } diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index fe1d07a..b6d99cb 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -38,6 +38,10 @@ # define AI_V4MAPPED 0 #endif +#ifndef AI_NUMERICSERV +# define AI_NUMERICSERV 0 +#endif + static int inet_getport(struct addrinfo *e) { @@ -141,6 +145,9 @@ static int inet_listen_saddr(InetSocketAddress *saddr, memset(&ai,0, sizeof(ai)); ai.ai_flags = AI_PASSIVE; + if (saddr->has_numeric && saddr->numeric) { + ai.ai_flags |= AI_NUMERICHOST | AI_NUMERICSERV; + } ai.ai_family = inet_ai_family_from_address(saddr, &err); ai.ai_socktype = SOCK_STREAM; -- 2.9.3