From nobody Wed Nov 13 10:34:32 2024 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 4XpKQw5fl7z5dSvC; Wed, 13 Nov 2024 10:34:32 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XpKQw4wGDz4TCs; Wed, 13 Nov 2024 10:34:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731494072; 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=PSw6PWxfGkiHM5cntJq9zy8PZ+hhjAyZN8viyNIvxDU=; b=MZDvnKtdG7AjZ1uGNeKLRAk65GbWvVzhXpcJbPvGrZoprbDsG3dt986TpOKxx2RgNBRbjC Iyv17xBaiNbRsmmEOO0n/pU650W7r0A/QNmdYGZoLSN4myyeEaW94aQGaayhvOwtGuBv73 R0L7wHQcO/+DifiPLSKT5xQdPIbGdPWoAkZZ45akvjP7GWzGXdkxv72NIsXoCSvAFhZM08 K8uRPawd5e78Rqdbnqg/J37l5EqISvBZXT7YBnVEH3+htr60MnEK1KTcmr2DkuJlECrpwN SbphaRfKdz9PE1mTt6UJVC7g/7TdqdSp7YF7d4jYtCBRykSaoH5YJ716Ysiwag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731494072; 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=PSw6PWxfGkiHM5cntJq9zy8PZ+hhjAyZN8viyNIvxDU=; b=OtAm5jH5gvV6jXxMu97AT5NVnOu7+qOeRKROR/eeWfjVT22q1wPwlXL5UgtaxMuyRs28+T DgplDSLxfmbBO7emzMpBeorYoFGW+sPbQm1vs8qy6LwP1aktLZzPeuOsYev5enWGquJYhM k1sz1+pS3TZ3K9GMMl+GAhEzMn8WDRZVRd2BsgFLWwP9QrV/vAEsvbA5TETAfim8WzLqTd Zl5PECe/5fHyJIdaElY4UGHkT21f1/rqEllFwH6Z3kxjkMNrXfJVTxWvZgnIDg6ZtAT3WM ON6KM09IT5J6WUSM3S0uHZaN9PMlxaKBiqZoA6+6qWH/hT5YlDOMDLNHJn5o3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731494072; a=rsa-sha256; cv=none; b=Emnq6HEtdA5Qb5qX1NzI/xlwQW/SD0C5aFgz+hQglrf5bvY4tDJ27y3d3lUuNfSlQUOavp LcDen1d4sXniE295786FDGm9Zc+uwoEJinj+fnycLaTXsQcsbDvX0S7DaWxTXPHO9OyCf0 tGU+rAeX3L/78v3yDW7tvIgiJoeYwqlMn+jN/mzcn21DeOa2bD1cGvNrUBzE9lZvdOFf+y 2KQozJQL2Uq/9fXCgZeJ/B3fgZNPHAwb/70T6rdlU25WIkTF2zGtgWlJsRZi/1MtGuDvyY yc94YqPnb2v9hFYPOFGEcRqY96vY59C5+l4zWzGMJSUefXKYq6iBa+YXroa5SA== 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 4XpKQw4XBWzrWc; Wed, 13 Nov 2024 10:34:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4ADAYWhX046478; Wed, 13 Nov 2024 10:34:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4ADAYWhO046475; Wed, 13 Nov 2024 10:34:32 GMT (envelope-from git) Date: Wed, 13 Nov 2024 10:34:32 GMT Message-Id: <202411131034.4ADAYWhO046475@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: 3b337076ba61 - main - pf: remove stale no_df tests from fragemtation_*.sh 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 3b337076ba61ccb7280543ebe3737bc32b7f8a89 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=3b337076ba61ccb7280543ebe3737bc32b7f8a89 commit 3b337076ba61ccb7280543ebe3737bc32b7f8a89 Author: Franco Fichtner AuthorDate: 2024-11-13 07:49:49 +0000 Commit: Kristof Provost CommitDate: 2024-11-13 09:34:08 +0000 pf: remove stale no_df tests from fragemtation_*.sh compat: test case add was previously removed but not the test itself pass: test was added twice Reviewed by: kp Differential Revision: https://reviews.freebsd.org/D47535 --- tests/sys/netpfil/pf/fragmentation_compat.sh | 47 ----------------------- tests/sys/netpfil/pf/fragmentation_pass.sh | 56 +--------------------------- 2 files changed, 1 insertion(+), 102 deletions(-) diff --git a/tests/sys/netpfil/pf/fragmentation_compat.sh b/tests/sys/netpfil/pf/fragmentation_compat.sh index 21ce6b734ea1..e9b89f5ff170 100644 --- a/tests/sys/netpfil/pf/fragmentation_compat.sh +++ b/tests/sys/netpfil/pf/fragmentation_compat.sh @@ -326,53 +326,6 @@ reassemble_cleanup() pft_cleanup } -atf_test_case "no_df" "cleanup" -no_df_head() -{ - atf_set descr 'Test removing of DF flag' - atf_set require.user root -} - -no_df_body() -{ - setup_router_server_ipv4 - - ifconfig ${epair_tester}a mtu 9000 - jexec router ifconfig ${epair_tester}b mtu 9000 - jexec router ifconfig ${epair_server}a mtu 1500 - jexec server ifconfig ${epair_server}b mtu 1500 - - # Sanity check. - ping_server_check_reply exit:0 --ping-type=icmp - - pft_set_rules router \ - "scrub fragment reassemble" \ - "pass out" \ - "block in" \ - "pass in inet proto icmp all icmp-type echoreq" - - # Ping with normal, fragmentable packets. - ping_server_check_reply exit:0 --ping-type=icmp --send-length=2000 - - # Ping with non-fragmentable packets, this will fail. - ping_server_check_reply exit:1 --ping-type=icmp --send-length=2000 --send-flags DF - - pft_set_rules router \ - "scrub any reassemble" \ - "pass out" \ - "block in" \ - "pass in inet proto icmp all icmp-type echoreq" - - # Ping with non-fragmentable packets again. - # This time pf will strip the DF flag. - ping_server_check_reply exit:0 --ping-type=icmp --send-length=2000 --send-flags DF -} - -no_df_cleanup() -{ - pft_cleanup -} - atf_init_test_cases() { atf_add_test_case "too_many_fragments" diff --git a/tests/sys/netpfil/pf/fragmentation_pass.sh b/tests/sys/netpfil/pf/fragmentation_pass.sh index 94a25cc41988..2399eb0374bb 100644 --- a/tests/sys/netpfil/pf/fragmentation_pass.sh +++ b/tests/sys/netpfil/pf/fragmentation_pass.sh @@ -340,61 +340,6 @@ no_df_head() atf_set require.user root } -no_df_body() -{ - setup_router_server_ipv4 - - ifconfig ${epair_tester}a mtu 9000 - jexec router ifconfig ${epair_tester}b mtu 9000 - jexec router ifconfig ${epair_server}a mtu 1500 - jexec server ifconfig ${epair_server}b mtu 1500 - - # Sanity check. - ping_server_check_reply exit:0 --ping-type=icmp - - pft_set_rules router \ - "set reassemble no" \ - "pass out" \ - "block in" \ - "pass in inet proto icmp all icmp-type echoreq" - - # Ping with normal, fragmentable packets. - ping_server_check_reply exit:1 --ping-type=icmp --send-length=2000 - - pft_set_rules router \ - "set reassemble yes" \ - "pass out" \ - "block in" \ - "pass in inet proto icmp all icmp-type echoreq" - - # Ping with normal, fragmentable packets. - ping_server_check_reply exit:0 --ping-type=icmp --send-length=2000 - - # Ping with non-fragmentable packets. - ping_server_check_reply exit:1 --ping-type=icmp --send-length=2000 --send-flags DF - - pft_set_rules router \ - "set reassemble yes no-df" \ - "pass out" \ - "block in" \ - "pass in inet proto icmp all icmp-type echoreq" - - # Ping with non-fragmentable packets again. - # This time pf will strip the DF flag. - ping_server_check_reply exit:0 --ping-type=icmp --send-length=2000 --send-flags DF -} -no_df_cleanup() -{ - pft_cleanup -} - -atf_test_case "no_df" "cleanup" -no_df_head() -{ - atf_set descr 'Test removing of DF flag' - atf_set require.user root -} - no_df_body() { setup_router_server_ipv4 @@ -420,6 +365,7 @@ no_df_body() # getting properly forwarded. ping_server_check_reply exit:0 --ping-type=icmp --send-length=2000 --send-flags DF } + no_df_cleanup() { pft_cleanup