From nobody Mon Oct 2 09:33:27 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 4RzbNm2m6nz4vrKN; Mon, 2 Oct 2023 09:33:28 +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 4RzbNm26B0z4Sms; Mon, 2 Oct 2023 09:33:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696239208; 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=2DHDPqwEslfbjc6qYeBYmBmaHsXIIgNVxPEi/Ni/PH4=; b=w9S7RP5I9lZ4Dr24t7FTCBeD50eNDTj3xODJOAEYmZoXVvRFez09t+1c5MA/zGMEI/ielX zbiNumR6ApWByLMe7P6MiDPP4d7Ccd3MBE5SHKJIMDj4ghI335zoczhQ/abim06vsnEl2E Mf2kC9HKgcxt1jM7a2cnwEbbS/k1+uIc0cpF0csQUwYAmWbBnH6kROBQBfdvlAgYUeBgei 9s8MMLi3mpRkvJcKJdh6f+FM3p4cew+OwD3WaIyKQP6Zh8igbXHB2AVBZzK9NRK0MLmipq k+MpvinTOKIqeLFrAZuj7YtOxWCrtHUKUlHPLoI+ninRxslG49cq6IwDZJ9Mdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696239208; a=rsa-sha256; cv=none; b=fgzlPT0+G7hsIhvp08ZN1yHEYyDEwH+Wf1w9EeztwHPwX1tCMR5Bzf27nRQheMuyxTExVD 9Q1PKi/BKeaHW6n0ic91cHdFwiOafW5tqXun8GZYXKQS2wZqdX9v0cvivvMEqxed6/DRSh Ht5PuCiDvYVIgRQYYMEM82k1VBCSjCja/jkrM0QB3zd9TrIkf32Df8+oddMqd5rxez7k4P mO3ifaJ2O6FU0NzveJX2PVumGp1q8LQ4+xts3xsvtgPblB64Wr5fCA+ePlZqaX9Zz86E6H AuyrpCy2RAIW1RefFqW6kJdfaD1QWsumlByKLpD3lBSG4n37qBMnlqdLb8SAkg== 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=1696239208; 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=2DHDPqwEslfbjc6qYeBYmBmaHsXIIgNVxPEi/Ni/PH4=; b=O/4ojy7M1m0JJ59CxZxyEbX36nn4/r+cWxHw3BdO6OpVCb4sfUNCuDF/WzqmoZAI1Oe3j1 QKHjJy0dUBQwj2nKcriFtVLgt6eT9RhtW4xVA4xuCpEfzAgzUzbs425PBb7pgaj00BY13B Dhs9GtR2VSfPMBzeLXCYkaiU26tPJfMbBmsGTYv68emDv1BkHUdUlWvIg+FOeW6D/2n2Lw TAMFI4AAiwSrpUsrnw+HIEj4EMalu0lpC5+vItffHmV5xYRyZJc3K9BobTLF/1xOlv+G4P gIeUl9g0WR53FkbO3eDZNjWYsRUROrcW+PACgVtP2/SG4+/IO5sj24VdDacosw== 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 4RzbNm0NCHz16YY; Mon, 2 Oct 2023 09:33:28 +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 3929XRf8003225; Mon, 2 Oct 2023 09:33:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3929XRNh003223; Mon, 2 Oct 2023 09:33:27 GMT (envelope-from git) Date: Mon, 2 Oct 2023 09:33:27 GMT Message-Id: <202310020933.3929XRNh003223@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: 35dd8c4e7887 - stable/14 - pf tests: extend SCTP tests to test state removal through ASCONF 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 35dd8c4e7887874f883668111e1c58d583d78f4b Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=35dd8c4e7887874f883668111e1c58d583d78f4b commit 35dd8c4e7887874f883668111e1c58d583d78f4b Author: Kristof Provost AuthorDate: 2023-09-05 17:00:49 +0000 Commit: Kristof Provost CommitDate: 2023-10-02 09:32:14 +0000 pf tests: extend SCTP tests to test state removal through ASCONF pf can now mark shut down multihomed connections shutting down. Verify that pf does the right thing. MFC after: 3 weeks Sponsored by: Orange Business Services (cherry picked from commit 97340b68d18bbbdebf0f73ed900c5a33894061dd) --- tests/sys/netpfil/pf/sctp.py | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/tests/sys/netpfil/pf/sctp.py b/tests/sys/netpfil/pf/sctp.py index b24d0c414ac8..5e6dca5dd64b 100644 --- a/tests/sys/netpfil/pf/sctp.py +++ b/tests/sys/netpfil/pf/sctp.py @@ -342,6 +342,24 @@ class TestSCTP(VnetTestTemplate): assert re.search(r"all sctp 192.0.2.1:.*192.0.2.3:1234", states) assert re.search(r"all sctp 192.0.2.10:.*192.0.2.3:1234", states) + # Now remove 192.0.2.1 as an address + client.bindx("192.0.2.1", False) + + # We can still communicate + try: + client.send(b"More data", 0) + rcvd = self.wait_object(srv_vnet.pipe, 5) + print(rcvd) + assert rcvd['ppid'] == 0 + assert rcvd['data'] =="More data" + finally: + # Debug output + ToolsHelper.print_output("/sbin/pfctl -ss -vv") + + # Verify that state is closing + states = ToolsHelper.get_output("/sbin/pfctl -ss") + assert re.search(r"all sctp 192.0.2.1:.*192.0.2.3:1234.*SHUTDOWN", states) + class TestSCTPv6(VnetTestTemplate): REQUIRED_MODULES = ["sctp", "pf"] TOPOLOGY = { @@ -440,3 +458,21 @@ class TestSCTPv6(VnetTestTemplate): states = ToolsHelper.get_output("/sbin/pfctl -ss") assert re.search(r"all sctp 2001:db8::1\[.*2001:db8::3\[1234\]", states) assert re.search(r"all sctp 2001:db8::10\[.*2001:db8::3\[1234\]", states) + + # Now remove 2001:db8::1 as an address + client.bindx("2001:db8::1", False) + + # Wecan still communicate + try: + client.send(b"More data", 0) + rcvd = self.wait_object(srv_vnet.pipe, 5) + print(rcvd) + assert rcvd['ppid'] == 0 + assert rcvd['data'] == "More data" + finally: + # Debug output + ToolsHelper.print_output("/sbin/pfctl -ss -vv") + + # Verify that the state is closing + states = ToolsHelper.get_output("/sbin/pfctl -ss") + assert re.search(r"all sctp 2001:db8::1\[.*2001:db8::3\[1234\].*SHUTDOWN", states)