From nobody Tue Aug 13 12:15:10 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 4Wjr1V6lBFz5SZN8; Tue, 13 Aug 2024 12:15:10 +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 4Wjr1V6BFXz4vvQ; Tue, 13 Aug 2024 12:15:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723551310; 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=+Q+ANIc9LwVNCC+bzQCJv+v3/FJXyWMbrs/uEn5vHfQ=; b=GMHGa0RZcOQGX0nRlvqJOasoVuzOVhGwOm+6s4KuiImk9j5SbLwhcLcbP3BsTL10/oRPcp 6vsm35bRa7jGs7D7IEKKjCR+p637FVSzb3qrxRM6hnwshXVVE5UnW2bbt13Tz5tnbXJDze PixU41B0HpOFBbZxFtPwftzNzDF2altf3WaatGWw6/6KcYIKok6zBeD2fVQOU5H2CaG/pp eUIt9a+yH438jNqJiNlBsdhgyX+l/9WLePShxAiLBGOjgedP2ze7M77xuJoFyMWIfVkULG zaUp7PcMvPuuqOELb/jKhcIdyCHKmJarwz//RCLAv3upazUYE6OV6NConpFCJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723551310; a=rsa-sha256; cv=none; b=P0WZ5WwYjEgvAq2JUk627WEAuA+nuE85Hqvqljk5uLpQiOqk4Ht8nKxSF1zOm9cP+NuHhP ZJn7UHSlrYIr4dz9K1VTQwzFle88gDHwvpY1UV6nobWeDkaxi2B2A1jTmzp1V+Sfqhrsah 5X0koarhvo7OzZIj+5xJULHrwQP8VCmwrBaaJQDck+rryW0bUb2jTQIRH8DGFkmK/IYn+P UMBmy4uZIwHDDwfZujZsHgfpj5CXT6/mPEFM4J+JFS2fzwRsmV7HMI/wze63OVSeGSLRFs 7iHpDghrQTMuVlAg9s1NagGiQyYjA+Ok6Ac71O6IYQsdY+asOk7ZNG+3CxASkQ== 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=1723551310; 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=+Q+ANIc9LwVNCC+bzQCJv+v3/FJXyWMbrs/uEn5vHfQ=; b=uGx9VUGBfS8OqEecxR93B6y0Npg/PCHifBMhCySVFdpBrWsy2nCKoNxsVOyblHptyVkI3y BMP3fYY5QzPgDmeZ/ZA9HmAK8k07EKKOZcBHCAI5GbsneOl4Em+cKCEqsTJYoS0h63LE0h N5Ft2i6/lExQ8NEUSBQzjlXAzdLyQi5+hZlOafFMaprHyRqS2agu5rKLRvKdE2LNlORK2r YzM6nVihXFzpM1job7vPX0B/rDT3D2f4B1azHs+06nF+bqndB9g+YHi6O2ij5ndpWFWVI8 UVsWfGeLZU9HK/liUYR9HqqvdI3RSqsfAcbq6Lo5JzwcR8P6djZ1y2OMkfT7bw== 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 4Wjr1V5nTGz18by; Tue, 13 Aug 2024 12:15:10 +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 47DCFAvB010195; Tue, 13 Aug 2024 12:15:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47DCFAFN010192; Tue, 13 Aug 2024 12:15:10 GMT (envelope-from git) Date: Tue, 13 Aug 2024 12:15:10 GMT Message-Id: <202408131215.47DCFAFN010192@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: d1deb682f2f0 - main - pf tests: Make if_enc.sh stick to utils.subr interface 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: d1deb682f2f01788f6a6a84ec24ba3d6605d000f Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=d1deb682f2f01788f6a6a84ec24ba3d6605d000f commit d1deb682f2f01788f6a6a84ec24ba3d6605d000f Author: Igor Ostapenko AuthorDate: 2024-08-13 11:32:37 +0000 Commit: Kristof Provost CommitDate: 2024-08-13 12:14:08 +0000 pf tests: Make if_enc.sh stick to utils.subr interface Reviewed by: kp Differential Revision: https://reviews.freebsd.org/D46280 --- tests/sys/netpfil/pf/if_enc.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/sys/netpfil/pf/if_enc.sh b/tests/sys/netpfil/pf/if_enc.sh index a6d258e40e33..2e9060d4aa68 100644 --- a/tests/sys/netpfil/pf/if_enc.sh +++ b/tests/sys/netpfil/pf/if_enc.sh @@ -172,10 +172,10 @@ ipfwoff_ip4_pfil_in_after_stripping_body() jexec bgw sysctl net.inet.ipsec.filtertunnel=0 jexec bgw sysctl net.enc.in.ipsec_filter_mask=2 # after stripping jexec bgw sysctl net.enc.out.ipsec_filter_mask=1 # before outer header - echo ' - rdr on enc0 proto tcp to 4.0.0.1 port 666 -> 4.0.0.44 - pass - ' | jexec bgw pfctl -ef- + jexec bgw pfctl -e + pft_set_rules bgw \ + "rdr on enc0 proto tcp to 4.0.0.1 port 666 -> 4.0.0.44" \ + "pass" # Prepare the catcher on host b echo "unexpected" > ./receiver