From patchwork Mon Feb 5 15:24:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= X-Patchwork-Id: 869372 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) 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 3zZsYb65N3z9s75 for ; Tue, 6 Feb 2018 02:52:51 +1100 (AEDT) Received: from localhost ([::1]:55739 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eij4c-0002zt-0L for incoming@patchwork.ozlabs.org; Mon, 05 Feb 2018 10:52:50 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55306) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eiif2-0006A1-39 for qemu-devel@nongnu.org; Mon, 05 Feb 2018 10:26:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eiif0-00027N-Ue for qemu-devel@nongnu.org; Mon, 05 Feb 2018 10:26:24 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40302) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eiif0-00025X-N4 for qemu-devel@nongnu.org; Mon, 05 Feb 2018 10:26:22 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0F16A6E769 for ; Mon, 5 Feb 2018 15:26:22 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.42.22.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id CA9F55D6B4; Mon, 5 Feb 2018 15:26:17 +0000 (UTC) From: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= To: qemu-devel@nongnu.org Date: Mon, 5 Feb 2018 15:24:50 +0000 Message-Id: <20180205152455.12088-5-berrange@redhat.com> In-Reply-To: <20180205152455.12088-1-berrange@redhat.com> References: <20180205152455.12088-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 05 Feb 2018 15:26:22 +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] [PATCH v4 4/9] sockets: strengthen test suite IP protocol availability checks 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: "Dr. David Alan Gilbert" , Markus Armbruster , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: "Daniel P. Berrange" Instead of just checking whether it is possible to bind() on a socket, also check that we can successfully connect() to the socket we bound to. This more closely replicates the level of functionality that tests will actually use. Reviewed-by: Marc-André Lureau Signed-off-by: Daniel P. Berrange --- tests/socket-helpers.c | 67 +++++++++++++++++++++++++++++++++++++++++++------- tests/socket-helpers.h | 4 +-- 2 files changed, 60 insertions(+), 11 deletions(-) diff --git a/tests/socket-helpers.c b/tests/socket-helpers.c index 13b6bb38eb..161aa5da09 100644 --- a/tests/socket-helpers.c +++ b/tests/socket-helpers.c @@ -30,10 +30,15 @@ # define EAI_ADDRFAMILY 0 #endif -int socket_can_bind(const char *hostname) +int socket_can_bind_connect(const char *hostname) { - int fd = -1; + int lfd = -1, cfd = -1, afd = -1; struct addrinfo ai, *res = NULL; + struct sockaddr_storage ss; + socklen_t sslen = sizeof(ss); + int soerr; + socklen_t soerrlen = sizeof(soerr); + bool check_soerr = false; int rc; int ret = -1; @@ -54,24 +59,68 @@ int socket_can_bind(const char *hostname) goto cleanup; } - fd = qemu_socket(res->ai_family, res->ai_socktype, res->ai_protocol); - if (fd < 0) { + lfd = qemu_socket(res->ai_family, res->ai_socktype, res->ai_protocol); + if (lfd < 0) { goto cleanup; } - if (bind(fd, res->ai_addr, res->ai_addrlen) < 0) { + cfd = qemu_socket(res->ai_family, res->ai_socktype, res->ai_protocol); + if (cfd < 0) { + goto cleanup; + } + + if (bind(lfd, res->ai_addr, res->ai_addrlen) < 0) { if (errno == EADDRNOTAVAIL) { goto done; } goto cleanup; } + if (listen(lfd, 1) < 0) { + goto cleanup; + } + + if (getsockname(lfd, (struct sockaddr *)&ss, &sslen) < 0) { + goto cleanup; + } + + qemu_set_nonblock(cfd); + if (connect(cfd, (struct sockaddr *)&ss, sslen) < 0) { + if (errno == EINPROGRESS) { + check_soerr = true; + } else { + goto cleanup; + } + } + + sslen = sizeof(ss); + afd = accept(lfd, (struct sockaddr *)&ss, &sslen); + if (afd < 0) { + goto cleanup; + } + + if (check_soerr) { + if (qemu_getsockopt(cfd, SOL_SOCKET, SO_ERROR, &soerr, &soerrlen) < 0) { + goto cleanup; + } + if (soerr) { + errno = soerr; + goto cleanup; + } + } + done: ret = 0; cleanup: - if (fd != -1) { - close(fd); + if (afd != -1) { + close(afd); + } + if (cfd != -1) { + close(cfd); + } + if (lfd != -1) { + close(lfd); } if (res) { freeaddrinfo(res); @@ -84,7 +133,7 @@ int socket_check_protocol_support(bool *has_ipv4, bool *has_ipv6) { *has_ipv4 = *has_ipv6 = false; - if (socket_can_bind("127.0.0.1") < 0) { + if (socket_can_bind_connect("127.0.0.1") < 0) { if (errno != EADDRNOTAVAIL) { return -1; } @@ -92,7 +141,7 @@ int socket_check_protocol_support(bool *has_ipv4, bool *has_ipv6) *has_ipv4 = true; } - if (socket_can_bind("::1") < 0) { + if (socket_can_bind_connect("::1") < 0) { if (errno != EADDRNOTAVAIL) { return -1; } diff --git a/tests/socket-helpers.h b/tests/socket-helpers.h index efa96eddc2..1c07d6d656 100644 --- a/tests/socket-helpers.h +++ b/tests/socket-helpers.h @@ -21,13 +21,13 @@ /* * @hostname: a DNS name or numeric IP address * - * Check whether it is possible to bind to ports + * Check whether it is possible to bind & connect to ports * on the DNS name or IP address @hostname. If an IP address * is used, it must not be a wildcard address. * * Returns 0 on success, -1 on error with errno set */ -int socket_can_bind(const char *hostname); +int socket_can_bind_connect(const char *hostname); /* * @has_ipv4: set to true on return if IPv4 is available