From nobody Thu Sep 26 15:18:41 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 4XDy0x73JBz5XQG1; Thu, 26 Sep 2024 15:18: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XDy0x6TwMz4jmd; Thu, 26 Sep 2024 15:18:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727363921; 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=yY5swstHorbRrfwmRL2NHyQ4QFUHfQ5R738mDpXbAUk=; b=GAH5f3m2FZJeNsoZqU2Ebrr4bBrQoQEiShqt72hYwG9Chzd+Vw7y0AblRJOyEmTLP87HWT AQd4iaAVXjJljHSORNcJu2U05cc00xW69CjlbpabaC0pV4ys01DWVA/w7rYV0Vfn5k8wzg Nzb0r5KcI+MneIPjrx1/X3ZeZ1PmA1UiOnsaLuVwNA83+lP9HwdvuB1Vo9j6/k4dT81MIV PY1gj0GHWOErTKJo/rumoebL0UjynlFnBYLhHrZloxm+aOtcHot6PY2CsaKffVywxDuln2 XQpcKwFcGWywCs5QYQq8STiUOBwOMyU7uyOMD5ifxm0BEecPoL6OrjoSABvJog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727363921; 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=yY5swstHorbRrfwmRL2NHyQ4QFUHfQ5R738mDpXbAUk=; b=l6Sj0ug15Duz/ulJJkQo4CF7NVHD7ErcsoEUshw+7ToWLpUQe7eiJAkOIerFjQec7wSNr0 pJmvem6N/f9VvvcW1lUYOmo8rwpBjGBoTJ1y1L4hUcEvT29hpybmICFuDfiyZ6THOLYITX Cu7Eqy0yuOdm5iGHmfDYzN1IT89d6sZ1L+fr4GkP6sFJrCC9ST1SXZmPGFxHiMmtCQ3rQn DwUL2ScoTde1wY5+Atop5WGC1hlxvUKCVO9BPVmOhVHqJsTdiazMa8WMHac8nuPoW9tQZG DW98Tut0iIVsF0yA2tsHYQseJg9JN8+RmfeI1z2NEBEWMzYLVmbgSZMjQDEmOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727363921; a=rsa-sha256; cv=none; b=OHah5TrK/ShiTrFr7sVLz4X5k0b+heOGAMHmirLXzk7Zv+hIlEb+HtoZbfrctE2vNUNFkj Ujj9z1dUcuM2SN6nadPH/4f3hg5zacDoHA7MYI1Khdrg/wuF4QsIUlFrDxjnOIR+rQT+Ky nfuMpXqkPXejp7CzpyVQP2sm2BIBNpgpHnzTKigSsvyU6MEWmOyTD9tRC975YB7RmmDAaB zXCyyUzf4BXXRNQSCY/iEJs45xbSfdDvxmL34OCRusclan4z20FGHQRq4CJy0qWFEqMrWY Su/+fk3TvR9mMtCuCsCOA50GLxTNqb3O3Hz4UOnNO0mULzdRY5pCRB8kj1YHPQ== 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 4XDy0x5zZhz12HJ; Thu, 26 Sep 2024 15:18:41 +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 48QFIfWA088340; Thu, 26 Sep 2024 15:18:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48QFIfWb088337; Thu, 26 Sep 2024 15:18:41 GMT (envelope-from git) Date: Thu, 26 Sep 2024 15:18:41 GMT Message-Id: <202409261518.48QFIfWb088337@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: f28d5ac5c4a4 - main - pf tests: fix max_states test 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: f28d5ac5c4a498883b626db163c86b5112889078 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f28d5ac5c4a498883b626db163c86b5112889078 commit f28d5ac5c4a498883b626db163c86b5112889078 Author: Kajetan Staszkiewicz AuthorDate: 2024-09-26 14:48:57 +0000 Commit: Kristof Provost CommitDate: 2024-09-26 14:50:45 +0000 pf tests: fix max_states test Ensure our rule with '(max 3)' only matches the TCP states we're counting. Reviewed by: kp Differential Revision: https://reviews.freebsd.org/D46795 --- tests/sys/netpfil/pf/max_states.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/sys/netpfil/pf/max_states.sh b/tests/sys/netpfil/pf/max_states.sh index 677d6f473d97..03142eeaffa6 100755 --- a/tests/sys/netpfil/pf/max_states.sh +++ b/tests/sys/netpfil/pf/max_states.sh @@ -39,14 +39,14 @@ max_states_body() pft_set_rules router \ "block" \ - "pass quick inet6 proto icmp6 icmp6-type { neighbrsol, neighbradv }" \ - "pass in on ${epair_tester}b keep state (max 3)" \ - "pass out on ${epair_server}a keep state" + "pass inet6 proto icmp6 icmp6-type { neighbrsol, neighbradv }" \ + "pass in on ${epair_tester}b inet6 proto tcp keep state (max 3)" \ + "pass out on ${epair_server}a inet6 proto tcp keep state" - # The exact limit is off by 1 ping_dummy_check_request exit:0 --ping-type=tcpsyn --send-sport=4201 ping_dummy_check_request exit:0 --ping-type=tcpsyn --send-sport=4202 - ping_dummy_check_request exit:1 --ping-type=tcpsyn --send-sport=4203 + ping_dummy_check_request exit:0 --ping-type=tcpsyn --send-sport=4203 + ping_dummy_check_request exit:1 --ping-type=tcpsyn --send-sport=4204 } max_states_cleanup()