From nobody Wed Oct 02 12:20:58 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 4XJYn65JSQz5YRpX; Wed, 02 Oct 2024 12:20:58 +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 4XJYn63x99z4XLm; Wed, 2 Oct 2024 12:20:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727871658; 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=cZA3Tq95jH9+UkMBWcBy14AVxmuYeM5q5UYcVlMbkX8=; b=LE8fAervarzFYxiyTOuDg9tmF+07O5igHNCwBNSNcRTgtII1FMdmXDkhJcKGbS/ic7D7pu kgiGcNrE3AUUeN83o703wfOHLY32wW9u3xgk1a8V5ayS/MBTbU2jEk5LCOfW3Qz6Tdjs3O uS1BY+mTb3zLclNskrOR60td80AUT7/l8DPaXddOS3FF6Ff8o2LKuQ9HJvyGxFvIuG6wzn uRndS2k6J33Le1MaxLZ6JnrJGnIAqcVHUUS620gHGmibmTmT2s5H3Asrq0YHOMIQ6C13sV LjBdz+gNJKcGT2uUVlFs+/tssr3nPCSJO4P2S8tGizLQG1SACNty0bfKcalhSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727871658; 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=cZA3Tq95jH9+UkMBWcBy14AVxmuYeM5q5UYcVlMbkX8=; b=mamkIOBikA+PMkd2BXufzlmseyKPd4JoMmF4XH7h4KFq8T05M2vr60qgWD1Ywg6pyDgy6Q B9/h5An8Oi812+zEerzpQPlfxP+9Sq/pUzkRk9i584hVf/R0o4uKVMZo2pJP6feERWPlAa hkWmYREosCR4qucWGAJ4Br2ZUs0apknX0h6M6LFe3eAHQItvYwGdwWp5JhM08aZBIyTY/v G2Ls5jglU7SDNve27ZHM3cb34vhWcLl5f7RPUM1aQKKSvOcZZY3btyljfJ7ahocQkTYhJS Wj4G0WcJe/chfxe/E2tQDxOCZ7c8LqGeghrfiwabVd6SuuiOstzPa0y8cx1fmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727871658; a=rsa-sha256; cv=none; b=dKFxUINYC2ZtgOGz7JvFmnU7enGuRf1LtDm/KjCI+otobWlMjnIYfRcjdVe2BQXPqDnhC2 FEAbd3yrMy3nFGr1/hNla0lcJVaI7J1qX1a8TGiy5Ryp4rsGjv5VVeNyQIAkzj+379l6wB +w5tY6TUOVyv/fzDPVg++152cX0F9dNHuRdWhZSkqRj+KrlWpyW8ZbFL8deRHwfA2NSo5T O7jMGxV0BtAXoWp1GKhqsOgFN+pu5/pe0++MBdmIMbRbWjdxH+YN6XeHW8iroLuFEhxc0Y CQykdRKNsD00VM/MCtYh6SzGhUUfZeY2MFG9BktfrlXrY+Z/t/DQj5WTum71JA== 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 4XJYn63Dshz1KjC; Wed, 2 Oct 2024 12:20:58 +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 492CKwcP091505; Wed, 2 Oct 2024 12:20:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 492CKwUl091502; Wed, 2 Oct 2024 12:20:58 GMT (envelope-from git) Date: Wed, 2 Oct 2024 12:20:58 GMT Message-Id: <202410021220.492CKwUl091502@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: c17a0f62da17 - main - pf tests: use unique pid files for inetd processes 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: c17a0f62da173df5e4a5433dfb90ef9f8dab98d4 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c17a0f62da173df5e4a5433dfb90ef9f8dab98d4 commit c17a0f62da173df5e4a5433dfb90ef9f8dab98d4 Author: Kristof Provost AuthorDate: 2024-10-02 09:59:23 +0000 Commit: Kristof Provost CommitDate: 2024-10-02 10:03:19 +0000 pf tests: use unique pid files for inetd processes Ensure that we don't conflict with other inetd processes running in other jails by setting an explicit pid file (rather than relying on the default /var/run/ inetd.pid). This could lead to failure to start inetd, which in turn could cause test failures. Sponsored by: Rubicon Communications, LLC ("Netgate") --- tests/sys/netpfil/pf/ether.sh | 4 ++-- tests/sys/netpfil/pf/utils.subr | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/sys/netpfil/pf/ether.sh b/tests/sys/netpfil/pf/ether.sh index 0369e0e57ee6..104baf468aa4 100644 --- a/tests/sys/netpfil/pf/ether.sh +++ b/tests/sys/netpfil/pf/ether.sh @@ -286,7 +286,7 @@ captive_body() # Run the echo server only on the gw, so we know we've redirectly # correctly if we get an echo message. - jexec gw /usr/sbin/inetd $(atf_get_srcdir)/echo_inetd.conf + jexec gw /usr/sbin/inetd -p ${PWD}/echo_inetd.pid $(atf_get_srcdir)/echo_inetd.conf # Confirm that we're getting redirected atf_check -s exit:0 -o match:"^foo$" -x "echo foo | nc -N 198.51.100.2 7" @@ -304,7 +304,7 @@ captive_body() atf_check -s exit:1 -x "echo foo | nc -N 198.51.100.2 7" # Start a server in srv - jexec srv /usr/sbin/inetd $(atf_get_srcdir)/echo_inetd.conf + jexec srv /usr/sbin/inetd -p ${PWD}/echo_inetd.pid $(atf_get_srcdir)/echo_inetd.conf # And now we can talk to that one. atf_check -s exit:0 -o match:"^foo$" -x "echo foo | nc -N 198.51.100.2 7" diff --git a/tests/sys/netpfil/pf/utils.subr b/tests/sys/netpfil/pf/utils.subr index 0b7ee621e6fa..c854ad5e69d8 100644 --- a/tests/sys/netpfil/pf/utils.subr +++ b/tests/sys/netpfil/pf/utils.subr @@ -217,7 +217,7 @@ setup_router_server_ipv4() jexec server route add -net ${net_tester} ${net_server_host_router} inetd_conf=$(mktemp) echo "discard stream tcp nowait root internal" > $inetd_conf - jexec server inetd $inetd_conf + jexec server inetd -p ${PWD}/inetd.pid $inetd_conf } # Create a bare router jail. @@ -271,7 +271,7 @@ setup_router_server_ipv6() jexec server route add -6 ${net_tester} ${net_server_host_router} inetd_conf=$(mktemp) echo "discard stream tcp6 nowait root internal" > $inetd_conf - jexec server inetd $inetd_conf + jexec server inetd -p ${PWD}/inetd.pid $inetd_conf } # Ping the dummy static NDP target.