1 files changed, 138 insertions, 0 deletions
diff --git a/tests/sys/netpfil/pf/table.sh b/tests/sys/netpfil/pf/table.sh
index 65492545a13b..6761ce652beb 100644
--- a/tests/sys/netpfil/pf/table.sh
+++ b/tests/sys/netpfil/pf/table.sh
@@ -673,6 +673,141 @@ large_cleanup()
 	pft_cleanup
 }
 
+atf_test_case "show_recursive" "cleanup"
+show_recursive_head()
+{
+	atf_set descr 'Test displaying tables in every anchor'
+	atf_set require.user root
+}
+
+show_recursive_body()
+{
+	pft_init
+
+	vnet_mkjail alcatraz
+
+	pft_set_rules alcatraz \
+
+	(echo "table <bar> persist"
+	 echo "block in quick from <bar> to any"
+	) | jexec alcatraz pfctl -a anchorage -f -
+
+	pft_set_rules noflush alcatraz \
+	    "table <foo> counters { 192.0.2.1 }" \
+	    "pass in from <foo>" \
+	    "anchor anchorage"
+
+	jexec alcatraz pfctl -sr -a "*"
+
+	atf_check -s exit:0 -e ignore -o match:'-pa-r--	bar@anchorage' \
+	    jexec alcatraz pfctl -v -a "*" -sT
+	atf_check -s exit:0 -e ignore -o match:'--a-r-C	foo' \
+	    jexec alcatraz pfctl -v -a "*" -sT
+}
+
+show_recursive_cleanup()
+{
+	pft_cleanup
+}
+
+atf_test_case "in_anchor" "cleanup"
+in_anchor_head()
+{
+	atf_set descr 'Test declaring tables in anchors'
+	atf_set require.user root
+}
+
+in_anchor_body()
+{
+	pft_init
+
+	epair_send=$(vnet_mkepair)
+	ifconfig ${epair_send}a 192.0.2.1/24 up
+
+	vnet_mkjail alcatraz ${epair_send}b
+	jexec alcatraz ifconfig ${epair_send}b 192.0.2.2/24 up
+
+	jexec alcatraz pfctl -e
+
+	pft_set_rules alcatraz \
+	    "block all" \
+	    "anchor \"foo\" {\n
+	        table <bar> counters { 192.0.2.1 }\n
+	        pass in from <bar>\n
+	    }\n"
+
+	atf_check -s exit:0 -o ignore ping -c 3 192.0.2.2
+
+	jexec alcatraz pfctl -sr -a "*" -vv
+	jexec alcatraz pfctl -sT -a "*" -vv
+}
+
+in_anchor_cleanup()
+{
+	pft_cleanup
+}
+
+atf_test_case "replace" "cleanup"
+replace_head()
+{
+	atf_set descr 'Test table replace command'
+	atf_set require.user root
+}
+
+replace_body()
+{
+	pft_init
+	pwd=$(pwd)
+
+	epair_send=$(vnet_mkepair)
+	ifconfig ${epair_send}a 192.0.2.1/24 up
+
+	vnet_mkjail alcatraz ${epair_send}b
+	jexec alcatraz ifconfig ${epair_send}b 192.0.2.2/24 up
+	jexec alcatraz pfctl -e
+
+	pft_set_rules alcatraz \
+	    "table <foo> counters { 192.0.2.1 }" \
+	    "block all" \
+	    "pass in from <foo> to any" \
+	    "pass out from any to <foo>" \
+	    "set skip on lo"
+
+	atf_check -s exit:0 -o ignore ping -c 3 192.0.2.2
+
+	# Replace the address
+	atf_check -s exit:0 -e "match:1 addresses added." -e "match:1 addresses deleted." \
+	    jexec alcatraz pfctl -t foo -T replace 192.0.2.3
+	atf_check -s exit:0 -o "match:192.0.2.3" \
+	    jexec alcatraz pfctl -t foo -T show
+	atf_check -s exit:2 -o ignore ping -c 3 192.0.2.2
+
+	# Negated address
+	atf_check -s exit:0 -e "match:1 addresses changed." \
+	    jexec alcatraz pfctl -t foo -T replace "!192.0.2.3"
+
+	# Now add 500 addresses
+	for i in `seq 1 2`; do
+		for j in `seq 1 250`; do
+			echo "1.${i}.${j}.1" >> ${pwd}/foo.lst
+		done
+	done
+	atf_check -s exit:0 -e "match:500 addresses added." -e "match:1 addresses deleted." \
+	    jexec alcatraz pfctl -t foo -T replace -f ${pwd}/foo.lst
+
+	atf_check -s exit:0 -o "not-match:192.0.2.3" \
+	    jexec alcatraz pfctl -t foo -T show
+
+	# Loading the same list produces no changes.
+	atf_check -s exit:0 -e "match:no changes." \
+	    jexec alcatraz pfctl -t foo -T replace -f ${pwd}/foo.lst
+}
+
+replace_cleanup()
+{
+	pft_cleanup
+}
+
 atf_init_test_cases()
 {
 	atf_add_test_case "v4_counters"
@@ -689,4 +824,7 @@ atf_init_test_cases()
 	atf_add_test_case "anchor"
 	atf_add_test_case "flush"
 	atf_add_test_case "large"
+	atf_add_test_case "show_recursive"
+	atf_add_test_case "in_anchor"
+	atf_add_test_case "replace"
 }