From nobody Tue Jul 4 19:19:40 2023 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 4QwXfj20pLz4lNxD; Tue, 4 Jul 2023 19:19:41 +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 4QwXfj1SThz4QH5; Tue, 4 Jul 2023 19:19:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688498381; 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=Y2YHF9FolAUYIrS4lO7PaBcnny9YISg/KnpojweUZ0Q=; b=t15i56DiKCK9vne4IC9/7Sa0r27r7iIDcZz1zF2Lbtt9ysuT7PVoKWUDBIsI7IlVxZH+Rc r+EhdomwPUGPXNO8SpgqnYrVTmV0xaIexyUPt5jhSc83C0zOfn5kC4rTbCroKY/BFMNBZh d/XBQtsyqSLSQhl/VmYrlU6MJBEV6EElqHpUTWxaiy1Pizv1VExnYfAl63Ft4gJ8kvKhAF rASU2NA+XMYLrMw31NaqNdU2CZpVn5rNEzI+EKKBMynNfwg9B6S4FEF11viub1PTHj3kL1 +jX20hNDnfnxQBbdMLkFlF6HcywGyEKP6MnKcUvnPmZDIvGHYRAcjhDSEKfJ4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688498381; 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=Y2YHF9FolAUYIrS4lO7PaBcnny9YISg/KnpojweUZ0Q=; b=ZEFzD72rho+4KSckgpR1b2UrqLqfInZrriZM0XxBn4lBLE6MPWMgwtlyFMRteWxzdMWmBe LBoJwDvDMRzzJf/P5MPBR3Y9EDZXRFx5gF4yjy0lppbe9Si3/NwISOcoajUWIeZY7XDRlw ORUSAlCpXBCsnXufIBGTnfH7CwrOilRICjc50cYCU/z3ufIi1NMS25k417JvUrWpgGO2Vk wB6NGO6+ce5iNiXrb8jLb5j54ccS/RW3QIRzfZmJl537zEdvdMqocCWGTIqWr/k/PrTzEl xuiocU1WoH2F83dGDDIvLRH17YaWoC2byYP0s9kSsUbk0w8FrOXQMD3TCPCsWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688498381; a=rsa-sha256; cv=none; b=a9/ztl4N0Imbae+LVNcNLA6zF2PVZnGC5FBsvPEj9BFqGzeXoJWkyd2XZ1Y+XA2+VTyFOE nXXBzbLOrsuoGa75JICJX9FCLtmuxjG0fEiKKEI1BCQbExsZ3+5MYJ9PNoUWr4+d/7v0Qq 8KtFVcTiQ2RBWXC4IUf5iF2sL1OtkOOQvibe1ZW8coehufheyNo+hlT5h6VLb3KVqpeLEW NSJcOraj2NDGUH5+2+71t9CsZ31aN5+/HAQpR03SUCWzPnKR1F4BDw/8lBOYHQNKDNa5y+ f/ciH8JURZKBrDP9FXeRKwhJ1viN/dL6ZBhGZ+h4pM+ouGXBEQCHxglymCeLhQ== 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 4QwXfj0QH9zlGG; Tue, 4 Jul 2023 19:19:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 364JJetW097104; Tue, 4 Jul 2023 19:19:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 364JJeB1097103; Tue, 4 Jul 2023 19:19:40 GMT (envelope-from git) Date: Tue, 4 Jul 2023 19:19:40 GMT Message-Id: <202307041919.364JJeB1097103@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Cochard Subject: git: 150d8ca9f3ba - main - socket afinet tests: using dynamic ports instead of the same static port 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: olivier X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 150d8ca9f3baa0c0b049ce2e6ba4a88dc5d8e341 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/src/commit/?id=150d8ca9f3baa0c0b049ce2e6ba4a88dc5d8e341 commit 150d8ca9f3baa0c0b049ce2e6ba4a88dc5d8e341 Author: Olivier Cochard AuthorDate: 2023-07-04 19:11:24 +0000 Commit: Olivier Cochard CommitDate: 2023-07-04 19:17:56 +0000 socket afinet tests: using dynamic ports instead of the same static port Allows these tests to be run in parallel. Approved by: markj Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D40859 --- tests/sys/netinet/socket_afinet.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/tests/sys/netinet/socket_afinet.c b/tests/sys/netinet/socket_afinet.c index 482f767dd094..8c6bb4ccd294 100644 --- a/tests/sys/netinet/socket_afinet.c +++ b/tests/sys/netinet/socket_afinet.c @@ -82,7 +82,7 @@ ATF_TC_BODY(socket_afinet_bind_ok, tc) bzero(&sin, sizeof(sin)); sin.sin_family = AF_INET; sin.sin_len = sizeof(sin); - sin.sin_port = htons(6666); + sin.sin_port = htons(0); sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); rc = bind(sd, (struct sockaddr *)&sin, sizeof(sin)); ATF_CHECK_EQ(0, rc); @@ -95,6 +95,7 @@ ATF_TC_BODY(socket_afinet_poll_no_rdhup, tc) { int ss, ss2, cs, rc; struct sockaddr_in sin; + socklen_t slen; struct pollfd pfd; int one = 1; @@ -108,12 +109,15 @@ ATF_TC_BODY(socket_afinet_poll_no_rdhup, tc) bzero(&sin, sizeof(sin)); sin.sin_family = AF_INET; sin.sin_len = sizeof(sin); - sin.sin_port = htons(6666); + sin.sin_port = htons(0); sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); rc = bind(ss, (struct sockaddr *)&sin, sizeof(sin)); ATF_CHECK_EQ(0, rc); rc = listen(ss, 1); ATF_CHECK_EQ(0, rc); + slen = sizeof(sin); + rc = getsockname(ss, (struct sockaddr *)&sin, &slen); + ATF_CHECK_EQ(0, rc); /* Client connects, server accepts. */ cs = socket(PF_INET, SOCK_STREAM, 0); @@ -154,6 +158,7 @@ ATF_TC_BODY(socket_afinet_poll_rdhup, tc) { int ss, ss2, cs, rc; struct sockaddr_in sin; + socklen_t slen; struct pollfd pfd; char buffer; int one = 1; @@ -168,12 +173,15 @@ ATF_TC_BODY(socket_afinet_poll_rdhup, tc) bzero(&sin, sizeof(sin)); sin.sin_family = AF_INET; sin.sin_len = sizeof(sin); - sin.sin_port = htons(6666); + sin.sin_port = htons(0); sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); rc = bind(ss, (struct sockaddr *)&sin, sizeof(sin)); ATF_CHECK_EQ(0, rc); rc = listen(ss, 1); ATF_CHECK_EQ(0, rc); + slen = sizeof(sin); + rc = getsockname(ss, (struct sockaddr *)&sin, &slen); + ATF_CHECK_EQ(0, rc); /* Client connects, server accepts. */ cs = socket(PF_INET, SOCK_STREAM, 0); @@ -232,6 +240,7 @@ ATF_TC_WITHOUT_HEAD(socket_afinet_stream_reconnect); ATF_TC_BODY(socket_afinet_stream_reconnect, tc) { struct sockaddr_in sin; + socklen_t slen; int ss, cs, rc; /* @@ -245,12 +254,15 @@ ATF_TC_BODY(socket_afinet_stream_reconnect, tc) bzero(&sin, sizeof(sin)); sin.sin_family = AF_INET; sin.sin_len = sizeof(sin); - sin.sin_port = htons(6666); + sin.sin_port = htons(0); sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); rc = bind(ss, (struct sockaddr *)&sin, sizeof(sin)); ATF_CHECK_EQ(0, rc); rc = listen(ss, 1); ATF_CHECK_EQ(0, rc); + slen = sizeof(sin); + rc = getsockname(ss, (struct sockaddr *)&sin, &slen); + ATF_CHECK_EQ(0, rc); /* Client connects, shuts down. */ cs = socket(PF_INET, SOCK_STREAM, 0);