From nobody Tue Jun 04 14:59:38 2024 X-Original-To: dev-commits-src-main@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 4VttzZ5wymz5Lc6W; Tue, 04 Jun 2024 14:59: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 4VttzZ4Pywz4rTd; Tue, 4 Jun 2024 14:59:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717513178; 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=GznJ25zeRLfVa0Md4VTk2+69uEwZ2ryurJyvlNiagrw=; b=ICRF8HZm7hdZ3uhp7OcMsvjeQZLDtHke/tnAVZ7KIoEbx5Nve8lilYdDpF2gbu/tp6OEmp KnfOCicLxUmzRNEao0Pz/TjbJkS5fNF1VwF7UqfpI8YhE2GoFvuHf+8J0JdB9KDla3JP1X b61liNUTRZvrG1/ObOhTGn4VsPHeE/qxO8TApKLYICHjhpewEPds/GWuL8E5tV1eLm7NCY L6L1bwhIZRFgkxbei3rLr9LHwFHGmsAb8oFaF5iyxQ30dM3Zu23bGw6oFhXp2md5AiY3iU RCPat/OXcQqEYtam6k/kY5vV1x5nQmV3cX0ochYsdMAjSe8PMlIGezGrrS7NEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717513178; a=rsa-sha256; cv=none; b=M5KX1zji0nTicMNKGs/5s04N/N74mAQLEpF41tU3lUx72hxDnPdPzYG06fhO1ercMEYWle MopNXVlXrpJvOSHrPVjoaou729OPNYJ5GTfnZaRZyy7yZYDgwo/XDYRJXrVJS5uJ2tnAoZ +8hJwb9w0r5iRUlNkmuv6sJPg6QstTcW5xBgawDdvfI62u1I1WX5xZO7TVSsNT2nzdGfnv vV9ekOFCxTNQzDNNNLf7QLNKmOYymPz6Xob2ZJO3GhPrpR6LCZWT4MOrcxw674vZJEXsw0 wDmUNNdzVgXw0U408lmi6aG8DCGtY/atk9tdzigM1vdQBOc0kVt2WC74lEqt1w== 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=1717513178; 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=GznJ25zeRLfVa0Md4VTk2+69uEwZ2ryurJyvlNiagrw=; b=mR3G/mD9pSy4mEhHZs+nVO7rZtSyFRv4p2QjkvqMF1a7bBw/MdfNKykl99Vesk4nHGkAMG r89Bo++ItaQgST46yA+NXsaCSv+V4qHtqmAZIEEGK3vwA0lW/Fdv2DxHWLwolyqPfJOhsc l8H5gGUbSfxU0/Tg0xkgjn6HVIpWQwBU+we/TdSGPoQWZavqcZK4c6CFwsYA0juQUM1BSJ XZTJ+15YCwnG/Dfv3/quZI0PO1kIp6ikztNaytM+dzULH6f9n9iI94TOm4P6CtNSGNsGfm 17iDHGnaReugQR1eoB80xDTlO2JbfgXq/i9fCWt2yMrX4H+U2qWZ3CQlb5r4rA== 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 4VttzZ3zz4zN7w; Tue, 4 Jun 2024 14:59:38 +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 454ExcIQ050289; Tue, 4 Jun 2024 14:59:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 454Excwu050286; Tue, 4 Jun 2024 14:59:38 GMT (envelope-from git) Date: Tue, 4 Jun 2024 14:59:38 GMT Message-Id: <202406041459.454Excwu050286@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 1c5b886e1116 - main - pf tests: make ether:dummynet test a little more robust List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 1c5b886e111663d3c7e30beddae9c10445f620d4 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=1c5b886e111663d3c7e30beddae9c10445f620d4 commit 1c5b886e111663d3c7e30beddae9c10445f620d4 Author: Kristof Provost AuthorDate: 2024-06-01 20:37:36 +0000 Commit: Kristof Provost CommitDate: 2024-06-04 12:59:59 +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") --- 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()