From nobody Tue Jun 11 13:27:39 2024 X-Original-To: dev-commits-src-branches@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 4Vz8cD42b1z5LgCw; Tue, 11 Jun 2024 13:27:40 +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 4Vz8cD1LpDz4fjY; Tue, 11 Jun 2024 13:27:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718112460; 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=CHRWY0guO7Rnr4of2N3ya8sMMzr6M3J5Kdz0izQHV0Y=; b=xLiashf6P7IXjJNgS8GFgs/MI0Oah9eRM5IEn9c/W0LRXdSj8Vz9mLQqKMeML/cDyNFTMZ kmmenBtYUEOoCuA6g/EMxGIVibPxQCeNeRhXdgryKDAKKbhoTH7tFpAdfH61CCUSoS9hxm ERaGiHo2u2NLxB9zOKqGNR9LVVF8oTjf+ahuDZTr0A0h2zMm5G9CJnspKmqzWZ/+Pr9fdX +pA3+cDqYTeoECJJke8J3TOq0XP8KjJww0bwBldMqPhtFRoh+3ZSmX6ZMlhLA80WOnMvfx UhjQZXUpfyXSFLfs5sI3r4DJ5Xb0zJ8ab5lzDrg3Yi1L92/7ZrSp17aPIqtL6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718112460; a=rsa-sha256; cv=none; b=q8GIeDhylmIC356GnGKRsliBoIpRkPGqtwox93PqwFHwvk+YQ8xaiHp/+DTyFcl3Ch7HKR N/fZELNFXMPDwPvXKxFWBFhI7pAYfydrFo0eRNq5WxcUt/I0WxribS0rhaWQOevFXCtZqK hiW4XIHYbhs1KIgQi5CyEmlYjUDXSJ/BhMYfI/98Dgw6BtJsivooJAPk5/u3MJxCnrPu4i kEv2+p275xHEWghAUEAZZykt7cqF+A7nZEFBIG2F1aKoNjrH50EexdAEV+UatfkhZuIO2S ugdyEXXeLYkQbTw28EKO6+pkk7F4DITNeNlti2J1uXfUpWMv1rlDcDqAsOmRQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718112460; 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=CHRWY0guO7Rnr4of2N3ya8sMMzr6M3J5Kdz0izQHV0Y=; b=NWZL0DFHvnwnlnaP+Xzc1voKjPFbMcZ/gSzIZ/HaRD6kMeiDexTB9qwLfZqX20/wIO+lIW 40HJzpzNz7G/eGtNltnBvd0YZTlolWKdJvZYrVSLvGLplMis7DFw8+wiHihgzeXGWs0Y4r ROxNO+yWedPILn1xZdSB7OSMaC7T1jMKnrAdjd8bG9siz+kjy7xJbBtfa2NXOy4UBagX+R z2GTzq6NZg1wzCBM1VYwXwLxgF09nUthzXzBwSnp1anAqtz68UJ1+ucgqsS1i2F8B7naL9 KSFd8+w+pCauShJLlyS2JEt7FdOBugPAWMdheXqfdD5HagPbcl5YgPenhmHP2Q== 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 4Vz8cD0mBYz199H; Tue, 11 Jun 2024 13:27:40 +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 45BDRdSA072884; Tue, 11 Jun 2024 13:27:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45BDRdmv072881; Tue, 11 Jun 2024 13:27:39 GMT (envelope-from git) Date: Tue, 11 Jun 2024 13:27:39 GMT Message-Id: <202406111327.45BDRdmv072881@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 357d111ef71f - stable/14 - pf tests: make ether:dummynet test a little more robust List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 357d111ef71fabba9590d2f59a1539d5d27a1f82 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=357d111ef71fabba9590d2f59a1539d5d27a1f82 commit 357d111ef71fabba9590d2f59a1539d5d27a1f82 Author: Kristof Provost AuthorDate: 2024-06-01 20:37:36 +0000 Commit: Kristof Provost CommitDate: 2024-06-11 06:05:38 +0000 pf tests: make ether:dummynet test a little more robust Allow slightly more bandwidth, but cause ping to give up sooner. MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 1c5b886e111663d3c7e30beddae9c10445f620d4) --- tests/sys/netpfil/pf/ether.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/sys/netpfil/pf/ether.sh b/tests/sys/netpfil/pf/ether.sh index 9a1ab1b005d7..e1855949476b 100644 --- a/tests/sys/netpfil/pf/ether.sh +++ b/tests/sys/netpfil/pf/ether.sh @@ -415,7 +415,7 @@ dummynet_body() # Sanity check atf_check -s exit:0 -o ignore ping -i .1 -c 3 -s 1200 192.0.2.2 - jexec alcatraz dnctl pipe 1 config bw 30Byte/s + jexec alcatraz dnctl pipe 1 config bw 300Byte/s jexec alcatraz pfctl -e pft_set_rules alcatraz \ "ether pass in dnpipe 1" @@ -430,14 +430,14 @@ dummynet_body() ping -i .1 -c 5 -s 1200 192.0.2.2 # We should now be hitting the limits and get this packet dropped. - atf_check -s exit:2 -o ignore ping -c 1 -s 1200 192.0.2.2 + atf_check -s exit:2 -o ignore ping -c 1 -t 1 -s 1200 192.0.2.2 # We can now also dummynet outbound traffic! pft_set_rules alcatraz \ "ether pass out dnpipe 1" # We should still be hitting the limits and get this packet dropped. - atf_check -s exit:2 -o ignore ping -c 1 -s 1200 192.0.2.2 + atf_check -s exit:2 -o ignore ping -c 1 -t 1 -s 1200 192.0.2.2 } dummynet_cleanup()