Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F107325083
D29622.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
1 KB
Referenced Files
None
Subscribers
None
D29622.diff
View Options
diff --git a/tests/sys/netpfil/pf/nat.sh b/tests/sys/netpfil/pf/nat.sh
--- a/tests/sys/netpfil/pf/nat.sh
+++ b/tests/sys/netpfil/pf/nat.sh
@@ -52,7 +52,7 @@
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_cleanup()
{
+ rm -f inetd-echo.pid
pft_cleanup
}
diff --git a/tests/sys/netpfil/pf/synproxy.sh b/tests/sys/netpfil/pf/synproxy.sh
--- a/tests/sys/netpfil/pf/synproxy.sh
+++ b/tests/sys/netpfil/pf/synproxy.sh
@@ -53,7 +53,7 @@
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_cleanup()
{
+ rm -f inetd-singsing.pid
pft_cleanup
}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Mon, Jan 13, 12:41 PM (21 h, 1 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15782068
Default Alt Text
D29622.diff (1 KB)
Attached To
Mode
D29622: pf tests: make synproxy and nat work correctly even if inetd is running
Attached
Detach File
Event Timeline
Log In to Comment