From nobody Wed Jul 13 16:47:37 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 0A8B517FC416; Wed, 13 Jul 2022 16:47:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ljk7Y4CnDz3WRZ; Wed, 13 Jul 2022 16:47:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657730857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EN4pOxiLdP5y7DE5Cb87MF1eXy0byMJpA/oFVBWJIK0=; b=okBeK5S0Zy113VgN3ODJp/0i3gOwAHlZgJBkrPpw0w6Xl6EKWoBL89gHr0VcDtcLt167zC yNjo2I4JBEJ9LyrA6RoxW/tvq06m4etl/frIMr8y5JpIW5RHuOALSXy1LCAZr8Fx2TNBen sV2jVyPKocMTawBVhEr8WpTMUtRfwb7kZJcTlx00CZ+aJx1KMV3L+WK/Nnilm9VUudtpir j77mXy5jKihsn+aBsafq9OqIod7aPeUyqIq6t3CE9qZVB4CJLXvX1tZjI8vhY8m7jPOUAH DCwaAzHbBvpHhL7lKxg/iMYVJYZ91PGWaGw5q+v7pXc+Fq4/tVa1WLLKso3Ckw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ljk7Y39LjzW3J; Wed, 13 Jul 2022 16:47:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26DGlbqO052179; Wed, 13 Jul 2022 16:47:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26DGlbnj052178; Wed, 13 Jul 2022 16:47:37 GMT (envelope-from git) Date: Wed, 13 Jul 2022 16:47:37 GMT Message-Id: <202207131647.26DGlbnj052178@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 1a2520a3d7b4 - stable/13 - ktls_test: Add a helper function to close sockets. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1a2520a3d7b4506f17e578b50f6a80f07271a7d8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657730857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EN4pOxiLdP5y7DE5Cb87MF1eXy0byMJpA/oFVBWJIK0=; b=vlTHcpAv5Kp+9MF1ckRPOMcKfcZ2SKqxZ98YmQJBolNP4zRqa2Mc9K2cnK/liXwQ09B5LY ieUwP4vByaHfnrqt17s0LIRitbNAo5XUKxkzcvfIz1BECerT+YwcxDRF5QH3SrK/LHOGxw 5S8+rey9irehZ0qi+ZAIaZtwjzx+sD23VZUlu+P1+48jkqJKqiufkQTDjFTPQEasqF0YQZ 2nO/5jQGI2kNgSuvjSjbDS4h+Z2pZvNq9mIAWQW5+Og8Uremtdg/oC0fBHpBDsFZGucEqe 8q+tZ0a7c+CiketF5cXNk4j5A9wS5xHjvagi5cy00Qv0nsAqOe7t2yNs9X9PMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657730857; a=rsa-sha256; cv=none; b=V18BB4w5qgHb11E9mFAs49SU3LQ66FPLhaw0fGtHNBo3qgiyozLVbkauBbnBsSbMNTPiUN wE5fsXS+LcAyyAX7gmjbOgknLfDw0qPC0Qwq5I7GRGiHdETjos8pKwsxRy2WKDp1F/Ep29 LLHtPrrvBxBks9pWxNbUyphrBK0GKmhxwA+Y/jUFjZ0qLmKNHoBU00oHuTk1e2jAitWkcz PDzVFQcR49ugMK7jpigQW2kS/5ojV/kCA6I6wjprhI/ht9cPG+ajhQIhXe7bpBFnGWTOIz OdLmT3Ia+EVKYjheGzUwn1tDjVlY9mOEqDq3CtOZnSx+vxSj7xUg3AxEYSJ9rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=1a2520a3d7b4506f17e578b50f6a80f07271a7d8 commit 1a2520a3d7b4506f17e578b50f6a80f07271a7d8 Author: John Baldwin AuthorDate: 2022-06-14 17:34:38 +0000 Commit: John Baldwin CommitDate: 2022-07-13 16:19:26 +0000 ktls_test: Add a helper function to close sockets. Reviewed by: markj Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D35425 (cherry picked from commit 2c1052053340af562e3121a41545419fa71e65f7) --- tests/sys/kern/ktls_test.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/sys/kern/ktls_test.c b/tests/sys/kern/ktls_test.c index 759a23455f25..d5cbc727734a 100644 --- a/tests/sys/kern/ktls_test.c +++ b/tests/sys/kern/ktls_test.c @@ -88,7 +88,7 @@ alloc_buffer(size_t len) } static bool -socketpair_tcp(int *sv) +socketpair_tcp(int sv[2]) { struct pollfd pfd; struct sockaddr_in sin; @@ -161,6 +161,13 @@ socketpair_tcp(int *sv) return (true); } +static void +close_sockets(int sv[2]) +{ + ATF_REQUIRE(close(sv[1]) == 0); + ATF_REQUIRE(close(sv[0]) == 0); +} + static void fd_set_blocking(int fd) { @@ -993,8 +1000,7 @@ test_ktls_transmit_app_data(struct tls_enable *en, uint64_t seqno, size_t len) free(decrypted); free(plaintext); - ATF_REQUIRE(close(sockets[1]) == 0); - ATF_REQUIRE(close(sockets[0]) == 0); + close_sockets(sockets); ATF_REQUIRE(close(kq) == 0); } @@ -1079,8 +1085,7 @@ test_ktls_transmit_control(struct tls_enable *en, uint64_t seqno, uint8_t type, free(decrypted); free(plaintext); - ATF_REQUIRE(close(sockets[1]) == 0); - ATF_REQUIRE(close(sockets[0]) == 0); + close_sockets(sockets); } static void @@ -1142,8 +1147,7 @@ test_ktls_transmit_empty_fragment(struct tls_enable *en, uint64_t seqno) out: free(outbuf); - ATF_REQUIRE(close(sockets[1]) == 0); - ATF_REQUIRE(close(sockets[0]) == 0); + close_sockets(sockets); } static size_t @@ -1282,8 +1286,7 @@ test_ktls_receive_app_data(struct tls_enable *en, uint64_t seqno, size_t len, free(received); free(plaintext); - ATF_REQUIRE(close(sockets[1]) == 0); - ATF_REQUIRE(close(sockets[0]) == 0); + close_sockets(sockets); ATF_REQUIRE(close(kq) == 0); } @@ -1532,8 +1535,7 @@ test_ktls_invalid_transmit_cipher_suite(struct tls_enable *en) sizeof(*en)) == -1); ATF_REQUIRE(errno == EINVAL); - ATF_REQUIRE(close(sockets[1]) == 0); - ATF_REQUIRE(close(sockets[0]) == 0); + close_sockets(sockets); } #define GEN_INVALID_TRANSMIT_TEST(name, cipher_alg, key_size, auth_alg, \ @@ -1665,8 +1667,7 @@ test_ktls_invalid_receive_cipher_suite(struct tls_enable *en) sizeof(*en)) == -1); ATF_REQUIRE(errno == EINVAL); - ATF_REQUIRE(close(sockets[1]) == 0); - ATF_REQUIRE(close(sockets[0]) == 0); + close_sockets(sockets); } #define GEN_INVALID_RECEIVE_TEST(name, cipher_alg, key_size, auth_alg, \ @@ -1705,8 +1706,7 @@ test_ktls_unsupported_receive_cipher_suite(struct tls_enable *en) sizeof(*en)) == -1); ATF_REQUIRE(errno == EPROTONOSUPPORT); - ATF_REQUIRE(close(sockets[1]) == 0); - ATF_REQUIRE(close(sockets[0]) == 0); + close_sockets(sockets); } #define GEN_UNSUPPORTED_RECEIVE_TEST(name, cipher_alg, key_size, \