Index: stable/12/tests/sys/netpfil/pf/set_skip.sh =================================================================== --- stable/12/tests/sys/netpfil/pf/set_skip.sh (revision 367057) +++ stable/12/tests/sys/netpfil/pf/set_skip.sh (revision 367058) @@ -1,67 +1,100 @@ # $FreeBSD$ . $(atf_get_srcdir)/utils.subr atf_test_case "set_skip_group" "cleanup" set_skip_group_head() { atf_set descr 'Basic set skip test' atf_set require.user root } set_skip_group_body() { # See PR 229241 pft_init vnet_mkjail alcatraz jexec alcatraz ifconfig lo0 127.0.0.1/8 up jexec alcatraz ifconfig lo0 group foo jexec alcatraz pfctl -e pft_set_rules alcatraz "set skip on foo" \ "block in proto icmp" jexec alcatraz ifconfig atf_check -s exit:0 -o ignore jexec alcatraz ping -c 1 127.0.0.1 } set_skip_group_cleanup() { pft_cleanup } atf_test_case "set_skip_group_lo" "cleanup" set_skip_group_lo_head() { atf_set descr 'Basic set skip test, lo' atf_set require.user root } set_skip_group_lo_body() { # See PR 229241 pft_init vnet_mkjail alcatraz jexec alcatraz ifconfig lo0 127.0.0.1/8 up jexec alcatraz pfctl -e pft_set_rules alcatraz "set skip on lo" \ "block on lo0" atf_check -s exit:0 -o ignore jexec alcatraz ping -c 1 127.0.0.1 pft_set_rules noflush alcatraz "set skip on lo" \ "block on lo0" atf_check -s exit:0 -o ignore jexec alcatraz ping -c 1 127.0.0.1 jexec alcatraz pfctl -s rules } set_skip_group_lo_cleanup() { pft_cleanup } +atf_test_case "set_skip_dynamic" "cleanup" +set_skip_dynamic_head() +{ + atf_set descr "Cope with group changes" + atf_set require.user root +} + +set_skip_dynamic_body() +{ + pft_init + + set -x + + vnet_mkjail alcatraz + jexec alcatraz pfctl -e + pft_set_rules alcatraz "set skip on epair" \ + "block" + + epair=$(vnet_mkepair) + ifconfig ${epair}a 192.0.2.2/24 up + ifconfig ${epair}b vnet alcatraz + + jexec alcatraz ifconfig ${epair}b 192.0.2.1/24 up + + atf_check -s exit:0 -o ignore jexec alcatraz ping -c 1 192.0.2.2 +} + +set_skip_dynamic_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "set_skip_group" atf_add_test_case "set_skip_group_lo" + atf_add_test_case "set_skip_dynamic" } Index: stable/12 =================================================================== --- stable/12 (revision 367057) +++ stable/12 (revision 367058) Property changes on: stable/12 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r366648