git: 0050d0e9281f - stable/13 - pf tests: make synproxy and nat work correctly even if inetd is running
Kristof Provost
kp at FreeBSD.org
Wed Apr 14 13:08:13 UTC 2021
The branch stable/13 has been updated by kp:
URL: https://cgit.FreeBSD.org/src/commit/?id=0050d0e9281f051ee37cd24bc0dff4da1df8e930
commit 0050d0e9281f051ee37cd24bc0dff4da1df8e930
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:16:06 +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 499c137eee9c..3fabb32db80f 100644
--- a/tests/sys/netpfil/pf/nat.sh
+++ b/tests/sys/netpfil/pf/nat.sh
@@ -52,7 +52,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
@@ -80,6 +80,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 f4d6df46fa78..aedbb8885129 100644
--- a/tests/sys/netpfil/pf/synproxy.sh
+++ b/tests/sys/netpfil/pf/synproxy.sh
@@ -53,7 +53,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" \
@@ -75,6 +75,7 @@ synproxy_body()
synproxy_cleanup()
{
+ rm -f inetd-singsing.pid
pft_cleanup
}
More information about the dev-commits-src-branches
mailing list