git: 38b25dade179 - stable/12 - pf tests: make synproxy and nat work correctly even if inetd is running
Kristof Provost
kp at FreeBSD.org
Wed Apr 14 13:08:30 UTC 2021
The branch stable/12 has been updated by kp:
URL: https://cgit.FreeBSD.org/src/commit/?id=38b25dade179bec0eeccff95a5ae354e7304e474
commit 38b25dade179bec0eeccff95a5ae354e7304e474
Author: Kurosawa Takahiro <takahiro.kurosawa at gmail.com>
AuthorDate: 2021-04-07 06:17:51 +0000
Commit: Kristof Provost <kp at FreeBSD.org>
CommitDate: 2021-04-14 08:17:14 +0000
pf tests: make synproxy and nat work correctly even if inetd is running
tests/sys/netfil/pf/synproxy fails if inetd has been running
outside of the jail because pidfile_open() fails with EEXIST.
tests/sys/netfil/pf/nat has the same problem but the test succeeds
because whether inetd is running is not so important.
Fix the problem by changing the pidfile path from the default
location.
Reviewed by: kp
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D29622
(cherry picked from commit 5a5623397c73e46b206289d32d1d6b9de420da9c)
---
tests/sys/netpfil/pf/nat.sh | 3 ++-
tests/sys/netpfil/pf/synproxy.sh | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/tests/sys/netpfil/pf/nat.sh b/tests/sys/netpfil/pf/nat.sh
index 6ce84310ce84..99a0ca870c85 100755
--- a/tests/sys/netpfil/pf/nat.sh
+++ b/tests/sys/netpfil/pf/nat.sh
@@ -27,7 +27,7 @@ exhaust_body()
jexec nat sysctl net.inet.ip.forwarding=1
jexec echo ifconfig ${epair_echo}b 198.51.100.2/24 up
- jexec echo /usr/sbin/inetd $(atf_get_srcdir)/echo_inetd.conf
+ jexec echo /usr/sbin/inetd -p inetd-echo.pid $(atf_get_srcdir)/echo_inetd.conf
# Enable pf!
jexec nat pfctl -e
@@ -55,6 +55,7 @@ exhaust_body()
exhaust_cleanup()
{
+ rm -f inetd-echo.pid
pft_cleanup
}
diff --git a/tests/sys/netpfil/pf/synproxy.sh b/tests/sys/netpfil/pf/synproxy.sh
index bb4161f58d42..6203723adbe8 100755
--- a/tests/sys/netpfil/pf/synproxy.sh
+++ b/tests/sys/netpfil/pf/synproxy.sh
@@ -28,7 +28,7 @@ synproxy_body()
jexec singsing ifconfig ${link}b 198.51.100.2/24 up
jexec singsing route add default 198.51.100.1
- jexec singsing /usr/sbin/inetd $(atf_get_srcdir)/echo_inetd.conf
+ jexec singsing /usr/sbin/inetd -p inetd-singsing.pid $(atf_get_srcdir)/echo_inetd.conf
jexec alcatraz pfctl -e
pft_set_rules alcatraz "set fail-policy return" \
@@ -50,6 +50,7 @@ synproxy_body()
synproxy_cleanup()
{
+ rm -f inetd-singsing.pid
pft_cleanup
}
More information about the dev-commits-src-all
mailing list