Page MenuHomeFreeBSD
Files F135495228

D31905.id95619.diff
No OneTemporary
Actions

D31905.id95619.diff
View Options

diff --git a/tests/sys/netpfil/common/dummynet.sh b/tests/sys/netpfil/common/dummynet.sh
--- a/tests/sys/netpfil/common/dummynet.sh
+++ b/tests/sys/netpfil/common/dummynet.sh
@@ -53,7 +53,9 @@
firewall_config alcatraz ${fw} \
"ipfw" \
- "ipfw add 1000 pipe 1 ip from any to any"
+ "ipfw add 1000 pipe 1 ip from any to any" \
+ "pf" \
+ "pass dnpipe 1"
# single ping succeeds just fine
atf_check -s exit:0 -o ignore ping -c 1 192.0.2.2
@@ -95,7 +97,9 @@
firewall_config alcatraz ${fw} \
"ipfw" \
- "ipfw add 1000 pipe 1 ip6 from any to any"
+ "ipfw add 1000 pipe 1 ip6 from any to any" \
+ "pf" \
+ "pass dnpipe 1"
# Single ping succeeds
atf_check -s exit:0 -o ignore ping6 -c 1 2001:db8:42::2
@@ -149,7 +153,10 @@
"ipfw" \
"ipfw add 1000 queue 100 tcp from 192.0.2.2 to any out" \
"ipfw add 1001 queue 200 icmp from 192.0.2.2 to any out" \
- "ipfw add 1002 allow ip from any to any"
+ "ipfw add 1002 allow ip from any to any" \
+ "pf" \
+ "pass in proto tcp dnqueue (0, 100)" \
+ "pass in proto icmp dnqueue (0, 200)"
# Single ping succeeds
atf_check -s exit:0 -o ignore ping -c 1 192.0.2.2
@@ -188,7 +195,10 @@
"ipfw" \
"ipfw add 1000 queue 200 tcp from 192.0.2.2 to any out" \
"ipfw add 1001 queue 100 icmp from 192.0.2.2 to any out" \
- "ipfw add 1002 allow ip from any to any"
+ "ipfw add 1002 allow ip from any to any" \
+ "pf" \
+ "pass in proto tcp dnqueue (0, 200)" \
+ "pass in proto icmp dnqueue (0, 100)"
jexec alcatraz ping -f -s 1300 192.0.2.1 &
sleep 1
@@ -253,8 +263,8 @@
"ipfw add 1000 queue 200 ipv6-icmp from 2001:db8:42::2 to any out" \
"ipfw add 1002 allow ip6 from any to any" \
"pf" \
- "pass out proto tcp dnqueue 100" \
- "pass out proto icmp6 dnqueue 200"
+ "pass in proto tcp dnqueue (0, 100)" \
+ "pass in proto icmp6 dnqueue (0, 200)"
# Single ping succeeds
atf_check -s exit:0 -o ignore ping6 -c 1 2001:db8:42::2
@@ -295,8 +305,8 @@
"ipfw add 1000 queue 100 ipv6-icmp from 2001:db8:42::2 to any out" \
"ipfw add 1002 allow ip6 from any to any" \
"pf" \
- "pass out proto tcp dnqueue 200" \
- "pass out proto icmp6 dnqueue 100"
+ "pass in proto tcp dnqueue (0, 200)" \
+ "pass in proto icmp6 dnqueue (0, 100)"
fails=0
for i in `seq 1 3`
@@ -322,9 +332,13 @@
setup_tests \
pipe \
ipfw \
+ pf \
pipe_v6 \
ipfw \
+ pf \
queue \
ipfw \
+ pf \
queue_v6 \
- ipfw
+ ipfw \
+ pf
diff --git a/tests/sys/netpfil/common/utils.subr b/tests/sys/netpfil/common/utils.subr
--- a/tests/sys/netpfil/common/utils.subr
+++ b/tests/sys/netpfil/common/utils.subr
@@ -111,11 +111,14 @@
atf_skip "This test requires dummynet"
fi
- if [ ${firewall} == "ipfw" ]; then
+ case $firewall in
+ ipfw|pf)
# Nothing. This is okay.
- else
+ ;;
+ *)
atf_skip "${firewall} does not support dummynet"
- fi
+ ;;
+ esac
}
nat_init()

File Metadata

Mime Type
text/plain
Expires
Tue, Nov 11, 7:50 AM (12 h, 5 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
25085257
Default Alt Text
D31905.id95619.diff (2 KB)

Event Timeline