d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pf tests: make synproxy and nat work correctly even if inetd is running

Browse Source 
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
This commit is contained in:
Kurosawa Takahiro 2021-04-07 08:17:51 +02:00 committed by Kristof Provost
parent 86a52e262a
commit 5a5623397c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/sys/netpfil/pf/nat.sh
View File

@ -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
}

3
tests/sys/netpfil/pf/synproxy.sh
View File

@ -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
}