From patchwork Mon Jan 23 14:26:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= X-Patchwork-Id: 718602 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3v6YZ21dYhz9srZ for ; Tue, 24 Jan 2017 01:27:54 +1100 (AEDT) Received: from localhost ([::1]:42411 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cVfb5-0001y9-Ps for incoming@patchwork.ozlabs.org; Mon, 23 Jan 2017 09:27:51 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43721) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cVfZt-0000nV-Iw for qemu-devel@nongnu.org; Mon, 23 Jan 2017 09:26:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cVfZs-0006Hz-5c for qemu-devel@nongnu.org; Mon, 23 Jan 2017 09:26:37 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40262) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cVfZr-0006Hu-W0 for qemu-devel@nongnu.org; Mon, 23 Jan 2017 09:26:36 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2DC3381255; Mon, 23 Jan 2017 14:26:36 +0000 (UTC) Received: from t460.redhat.com (ovpn-117-108.ams2.redhat.com [10.36.117.108]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v0NEQWO4007616; Mon, 23 Jan 2017 09:26:34 -0500 From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Mon, 23 Jan 2017 14:26:22 +0000 Message-Id: <20170123142629.11110-2-berrange@redhat.com> In-Reply-To: <20170123142629.11110-1-berrange@redhat.com> References: <20170123142629.11110-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 23 Jan 2017 14:26:36 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL v1 1/8] sockets: add ability to disable DNS resolution for InetSocketAddress X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 | 3 +++ 2 files changed, 8 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..d63b011 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -141,6 +141,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;