Page MenuHomeFreeBSD
Files F102682085

D47535.diff
No OneTemporary
Actions

D47535.diff
View Options

diff --git a/tests/sys/netpfil/pf/fragmentation_compat.sh b/tests/sys/netpfil/pf/fragmentation_compat.sh
--- a/tests/sys/netpfil/pf/fragmentation_compat.sh
+++ b/tests/sys/netpfil/pf/fragmentation_compat.sh
@@ -326,53 +326,6 @@
pft_cleanup
}
-atf_test_case "no_df" "cleanup"
-no_df_head()
-{
- atf_set descr 'Test removing of DF flag'
- atf_set require.user root
-}
-
-no_df_body()
-{
- setup_router_server_ipv4
-
- ifconfig ${epair_tester}a mtu 9000
- jexec router ifconfig ${epair_tester}b mtu 9000
- jexec router ifconfig ${epair_server}a mtu 1500
- jexec server ifconfig ${epair_server}b mtu 1500
-
- # Sanity check.
- ping_server_check_reply exit:0 --ping-type=icmp
-
- pft_set_rules router \
- "scrub fragment reassemble" \
- "pass out" \
- "block in" \
- "pass in inet proto icmp all icmp-type echoreq"
-
- # Ping with normal, fragmentable packets.
- ping_server_check_reply exit:0 --ping-type=icmp --send-length=2000
-
- # Ping with non-fragmentable packets, this will fail.
- ping_server_check_reply exit:1 --ping-type=icmp --send-length=2000 --send-flags DF
-
- pft_set_rules router \
- "scrub any reassemble" \
- "pass out" \
- "block in" \
- "pass in inet proto icmp all icmp-type echoreq"
-
- # Ping with non-fragmentable packets again.
- # This time pf will strip the DF flag.
- ping_server_check_reply exit:0 --ping-type=icmp --send-length=2000 --send-flags DF
-}
-
-no_df_cleanup()
-{
- pft_cleanup
-}
-
atf_init_test_cases()
{
atf_add_test_case "too_many_fragments"
diff --git a/tests/sys/netpfil/pf/fragmentation_pass.sh b/tests/sys/netpfil/pf/fragmentation_pass.sh
--- a/tests/sys/netpfil/pf/fragmentation_pass.sh
+++ b/tests/sys/netpfil/pf/fragmentation_pass.sh
@@ -340,61 +340,6 @@
atf_set require.user root
}
-no_df_body()
-{
- setup_router_server_ipv4
-
- ifconfig ${epair_tester}a mtu 9000
- jexec router ifconfig ${epair_tester}b mtu 9000
- jexec router ifconfig ${epair_server}a mtu 1500
- jexec server ifconfig ${epair_server}b mtu 1500
-
- # Sanity check.
- ping_server_check_reply exit:0 --ping-type=icmp
-
- pft_set_rules router \
- "set reassemble no" \
- "pass out" \
- "block in" \
- "pass in inet proto icmp all icmp-type echoreq"
-
- # Ping with normal, fragmentable packets.
- ping_server_check_reply exit:1 --ping-type=icmp --send-length=2000
-
- pft_set_rules router \
- "set reassemble yes" \
- "pass out" \
- "block in" \
- "pass in inet proto icmp all icmp-type echoreq"
-
- # Ping with normal, fragmentable packets.
- ping_server_check_reply exit:0 --ping-type=icmp --send-length=2000
-
- # Ping with non-fragmentable packets.
- ping_server_check_reply exit:1 --ping-type=icmp --send-length=2000 --send-flags DF
-
- pft_set_rules router \
- "set reassemble yes no-df" \
- "pass out" \
- "block in" \
- "pass in inet proto icmp all icmp-type echoreq"
-
- # Ping with non-fragmentable packets again.
- # This time pf will strip the DF flag.
- ping_server_check_reply exit:0 --ping-type=icmp --send-length=2000 --send-flags DF
-}
-no_df_cleanup()
-{
- pft_cleanup
-}
-
-atf_test_case "no_df" "cleanup"
-no_df_head()
-{
- atf_set descr 'Test removing of DF flag'
- atf_set require.user root
-}
-
no_df_body()
{
setup_router_server_ipv4
@@ -420,6 +365,7 @@
# getting properly forwarded.
ping_server_check_reply exit:0 --ping-type=icmp --send-length=2000 --send-flags DF
}
+
no_df_cleanup()
{
pft_cleanup

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 16, 7:28 PM (20 h, 41 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14663481
Default Alt Text
D47535.diff (3 KB)

Event Timeline