D49007.id151035.diff
No OneTemporary
Actions

Size

27 KB

Referenced Files

None

Subscribers

None

D49007.id151035.diff
View Options

	diff --git a/tests/sys/net/if_bridge_test.sh b/tests/sys/net/if_bridge_test.sh
	--- a/tests/sys/net/if_bridge_test.sh
	+++ b/tests/sys/net/if_bridge_test.sh
	@@ -271,7 +271,7 @@
	{
	atf_set descr 'Bridge span test'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	span_body()
	@@ -420,7 +420,7 @@
	{
	atf_set descr 'Check STP validation'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	stp_validation_body()
	diff --git a/tests/sys/net/if_vlan.sh b/tests/sys/net/if_vlan.sh
	--- a/tests/sys/net/if_vlan.sh
	+++ b/tests/sys/net/if_vlan.sh
	@@ -257,7 +257,7 @@
	{
	atf_set descr 'Set VLAN PCP through BPF'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	bpf_pcp_body()
	diff --git a/tests/sys/netinet/divert.sh b/tests/sys/netinet/divert.sh
	--- a/tests/sys/netinet/divert.sh
	+++ b/tests/sys/netinet/divert.sh
	@@ -41,7 +41,7 @@

	atf_set descr 'Test diverting IPv4 packet to remote destination'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	ipdivert_ip_output_remote_success_body() {
	@@ -96,7 +96,7 @@

	atf_set descr 'Test diverting IPv4 packet to remote destination'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	ipdivert_ip_input_local_success_body() {
	diff --git a/tests/sys/netinet/forward.sh b/tests/sys/netinet/forward.sh
	--- a/tests/sys/netinet/forward.sh
	+++ b/tests/sys/netinet/forward.sh
	@@ -34,7 +34,7 @@

	atf_set descr 'Test valid IPv4 on-stick fastforwarding to iface'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	fwd_ip_icmp_iface_fast_success_body() {
	@@ -90,7 +90,7 @@

	atf_set descr 'Test valid IPv4 on-stick fastforwarding to gw'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	fwd_ip_icmp_gw_fast_success_body() {
	@@ -150,7 +150,7 @@

	atf_set descr 'Test valid IPv4 on-stick "slow" forwarding to iface'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	fwd_ip_icmp_iface_slow_success_body() {
	@@ -204,7 +204,7 @@

	atf_set descr 'Test valid IPv4 on-stick "slow" forwarding to gw'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	fwd_ip_icmp_gw_slow_success_body() {
	diff --git a/tests/sys/netinet/redirect.sh b/tests/sys/netinet/redirect.sh
	--- a/tests/sys/netinet/redirect.sh
	+++ b/tests/sys/netinet/redirect.sh
	@@ -34,7 +34,7 @@

	atf_set descr 'Test valid IPv4 redirect'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	valid_redirect_body() {
	diff --git a/tests/sys/netinet6/divert.sh b/tests/sys/netinet6/divert.sh
	--- a/tests/sys/netinet6/divert.sh
	+++ b/tests/sys/netinet6/divert.sh
	@@ -41,7 +41,7 @@

	atf_set descr 'Test valid IPv6 redirect'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	ipdivert_ip6_output_remote_success_body() {
	diff --git a/tests/sys/netinet6/exthdr.sh b/tests/sys/netinet6/exthdr.sh
	--- a/tests/sys/netinet6/exthdr.sh
	+++ b/tests/sys/netinet6/exthdr.sh
	@@ -32,7 +32,7 @@

	atf_set descr 'Test IPv6 extension header code paths'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	exthdr_body() {
	diff --git a/tests/sys/netinet6/forward6.sh b/tests/sys/netinet6/forward6.sh
	--- a/tests/sys/netinet6/forward6.sh
	+++ b/tests/sys/netinet6/forward6.sh
	@@ -34,7 +34,7 @@

	atf_set descr 'Test valid IPv6 global unicast fast-forwarding to interface'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	fwd_ip6_gu_icmp_iface_fast_success_body() {
	@@ -104,7 +104,7 @@

	atf_set descr 'Test valid IPv6 global unicast fast-forwarding to GU gw'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	fwd_ip6_gu_icmp_gw_gu_fast_success_body() {
	@@ -178,7 +178,7 @@

	atf_set descr 'Test valid IPv6 global unicast fast-forwarding to LL gw'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	fwd_ip6_gu_icmp_gw_ll_fast_success_body() {
	@@ -253,7 +253,7 @@

	atf_set descr 'Test valid IPv6 global unicast fast-forwarding to interface'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	fwd_ip6_gu_icmp_iface_slow_success_body() {
	@@ -322,7 +322,7 @@

	atf_set descr 'Test valid IPv6 global unicast fast-forwarding to GU gw'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	fwd_ip6_gu_icmp_gw_gu_slow_success_body() {
	@@ -397,7 +397,7 @@

	atf_set descr 'Test valid IPv6 global unicast fast-forwarding to LL gw'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	fwd_ip6_gu_icmp_gw_ll_slow_success_body() {
	diff --git a/tests/sys/netinet6/frag6/frag6.subr b/tests/sys/netinet6/frag6/frag6.subr
	--- a/tests/sys/netinet6/frag6/frag6.subr
	+++ b/tests/sys/netinet6/frag6/frag6.subr
	@@ -31,7 +31,7 @@
	{
	atf_set descr 'Test IPv6 fragmentation code'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	frag6_body()
	diff --git a/tests/sys/netinet6/mld.sh b/tests/sys/netinet6/mld.sh
	--- a/tests/sys/netinet6/mld.sh
	+++ b/tests/sys/netinet6/mld.sh
	@@ -32,7 +32,7 @@

	atf_set descr 'Test for correct Ethernet Destination MAC address'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	mldraw01_body() {
	diff --git a/tests/sys/netinet6/ndp.sh b/tests/sys/netinet6/ndp.sh
	--- a/tests/sys/netinet6/ndp.sh
	+++ b/tests/sys/netinet6/ndp.sh
	@@ -134,7 +134,7 @@
	ndp_slaac_default_route_head() {
	atf_set descr 'Test default route installation via SLAAC'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	ndp_slaac_default_route_body() {
	diff --git a/tests/sys/netinet6/redirect.sh b/tests/sys/netinet6/redirect.sh
	--- a/tests/sys/netinet6/redirect.sh
	+++ b/tests/sys/netinet6/redirect.sh
	@@ -34,7 +34,7 @@

	atf_set descr 'Test valid IPv6 redirect'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	valid_redirect_body() {
	diff --git a/tests/sys/netinet6/scapyi386.sh b/tests/sys/netinet6/scapyi386.sh
	--- a/tests/sys/netinet6/scapyi386.sh
	+++ b/tests/sys/netinet6/scapyi386.sh
	@@ -32,7 +32,7 @@

	atf_set descr 'Test for correct Ethernet Destination MAC address'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	scapyi386_body() {
	diff --git a/tests/sys/netpfil/common/forward.sh b/tests/sys/netpfil/common/forward.sh
	--- a/tests/sys/netpfil/common/forward.sh
	+++ b/tests/sys/netpfil/common/forward.sh
	@@ -33,7 +33,7 @@
	{
	atf_set descr 'Basic forwarding test'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	v4_body()
	diff --git a/tests/sys/netpfil/common/tos.sh b/tests/sys/netpfil/common/tos.sh
	--- a/tests/sys/netpfil/common/tos.sh
	+++ b/tests/sys/netpfil/common/tos.sh
	@@ -33,7 +33,7 @@
	{
	atf_set descr 'set-tos test'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	tos_body()
	diff --git a/tests/sys/netpfil/pf/dup.sh b/tests/sys/netpfil/pf/dup.sh
	--- a/tests/sys/netpfil/pf/dup.sh
	+++ b/tests/sys/netpfil/pf/dup.sh
	@@ -33,7 +33,7 @@
	{
	atf_set descr 'dup-to test'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	dup_to_body()
	diff --git a/tests/sys/netpfil/pf/ether.sh b/tests/sys/netpfil/pf/ether.sh
	--- a/tests/sys/netpfil/pf/ether.sh
	+++ b/tests/sys/netpfil/pf/ether.sh
	@@ -643,7 +643,7 @@
	{
	atf_set descr 'Test overly short Ethernet packets'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	short_pkt_body()
	@@ -686,7 +686,7 @@
	{
	atf_set descr 'Test bridge-to keyword'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	bridge_to_body()
	diff --git a/tests/sys/netpfil/pf/forward.sh b/tests/sys/netpfil/pf/forward.sh
	--- a/tests/sys/netpfil/pf/forward.sh
	+++ b/tests/sys/netpfil/pf/forward.sh
	@@ -35,7 +35,7 @@
	atf_set require.user root

	# We need scapy to be installed for out test scripts to work
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	v4_body()
	@@ -94,7 +94,7 @@
	{
	atf_set descr 'Basic IPv6 forwarding test'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	v6_body()
	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
	@@ -74,7 +74,7 @@
	{
	atf_set descr 'IPv6 fragmentation test'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	v6_body()
	@@ -230,7 +230,7 @@
	{
	atf_set descr 'ping fragment that overlaps fragment at index boundary and replace it'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	overreplace_body()
	@@ -248,7 +248,7 @@
	{
	atf_set descr 'ping fragment that overlaps the first fragment at index boundary'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	overindex_body()
	@@ -266,7 +266,7 @@
	{
	atf_set descr 'ping fragment at index boundary that cannot be requeued'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	overlimit_body()
	diff --git a/tests/sys/netpfil/pf/fragmentation_no_reassembly.sh b/tests/sys/netpfil/pf/fragmentation_no_reassembly.sh
	--- a/tests/sys/netpfil/pf/fragmentation_no_reassembly.sh
	+++ b/tests/sys/netpfil/pf/fragmentation_no_reassembly.sh
	@@ -32,7 +32,7 @@
	{
	atf_set descr 'Matching non-fragmented IPv4 packets'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	match_full_v4_body()
	@@ -63,7 +63,7 @@
	{
	atf_set descr 'Matching fragmented IPv4 packets'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	match_fragment_v4_body()
	@@ -93,7 +93,7 @@
	{
	atf_set descr 'Scrub rules override "set reassemble" for IPv4'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	compat_override_v4_body()
	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
	@@ -77,7 +77,7 @@
	{
	atf_set descr 'IPv6 fragmentation test'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	v6_body()
	@@ -305,7 +305,7 @@
	{
	atf_set descr 'ping fragment that overlaps fragment at index boundary and replace it'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	overreplace_body()
	@@ -323,7 +323,7 @@
	{
	atf_set descr 'ping fragment that overlaps the first fragment at index boundary'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	overindex_body()
	@@ -341,7 +341,7 @@
	{
	atf_set descr 'ping fragment at index boundary that cannot be requeued'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	overlimit_body()
	@@ -359,7 +359,7 @@
	{
	atf_set descr 'ping fragment at index boundary which modifies pf hole counter'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	overhole_body()
	@@ -377,7 +377,7 @@
	{
	atf_set descr 'overlapping ping fragments which modifies pf hole counter'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	adjhole_body()
	@@ -443,7 +443,7 @@
	{
	atf_set descr 'Test removing of DF flag'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	no_df_body()
	@@ -482,7 +482,7 @@
	{
	atf_set descr 'Test reassembly on the slow path'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	reassemble_slowpath_body()
	@@ -611,7 +611,7 @@
	{
	atf_set descr 'Test dummynet on NATed fragmented traffic'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	dummynet_fragmented_body()
	diff --git a/tests/sys/netpfil/pf/get_state.sh b/tests/sys/netpfil/pf/get_state.sh
	--- a/tests/sys/netpfil/pf/get_state.sh
	+++ b/tests/sys/netpfil/pf/get_state.sh
	@@ -33,7 +33,7 @@
	{
	atf_set descr 'Test retrieving many states'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	many_body()
	diff --git a/tests/sys/netpfil/pf/icmp.sh b/tests/sys/netpfil/pf/icmp.sh
	--- a/tests/sys/netpfil/pf/icmp.sh
	+++ b/tests/sys/netpfil/pf/icmp.sh
	@@ -33,7 +33,7 @@
	{
	atf_set descr 'Test CVE-2019-5598'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	cve_2019_5598_body()
	diff --git a/tests/sys/netpfil/pf/icmp6.sh b/tests/sys/netpfil/pf/icmp6.sh
	--- a/tests/sys/netpfil/pf/icmp6.sh
	+++ b/tests/sys/netpfil/pf/icmp6.sh
	@@ -33,7 +33,7 @@
	{
	atf_set descr 'Test ICMPv6 echo with ID 0 keep being blocked'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	zero_id_body()
	diff --git a/tests/sys/netpfil/pf/killstate.sh b/tests/sys/netpfil/pf/killstate.sh
	--- a/tests/sys/netpfil/pf/killstate.sh
	+++ b/tests/sys/netpfil/pf/killstate.sh
	@@ -47,7 +47,7 @@
	{
	atf_set descr 'Test killing states by IPv4 address'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	v4_body()
	@@ -110,7 +110,7 @@
	{
	atf_set descr 'Test killing states by IPv6 address'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	v6_body()
	@@ -177,7 +177,7 @@
	{
	atf_set descr 'Test killing states by label'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	label_body()
	@@ -241,7 +241,7 @@
	{
	atf_set descr 'Test killing states with multiple labels by label'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	multilabel_body()
	@@ -321,7 +321,7 @@
	{
	atf_set descr 'Test killing states by route-to/reply-to address'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	gateway_body()
	@@ -462,7 +462,7 @@
	{
	atf_set descr 'Test killing states based on interface'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	interface_body()
	@@ -518,7 +518,7 @@
	{
	atf_set descr 'Test killing states by id'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	id_body()
	@@ -579,7 +579,7 @@
	{
	atf_set descr 'Test killing states by their NAT-ed IP address'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	nat_body()
	diff --git a/tests/sys/netpfil/pf/max_states.sh b/tests/sys/netpfil/pf/max_states.sh
	--- a/tests/sys/netpfil/pf/max_states.sh
	+++ b/tests/sys/netpfil/pf/max_states.sh
	@@ -31,7 +31,7 @@
	{
	atf_set descr 'Max states per rule'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	max_states_body()
	diff --git a/tests/sys/netpfil/pf/modulate.sh b/tests/sys/netpfil/pf/modulate.sh
	--- a/tests/sys/netpfil/pf/modulate.sh
	+++ b/tests/sys/netpfil/pf/modulate.sh
	@@ -31,7 +31,7 @@
	{
	atf_set descr 'IPv4 TCP sequence number modulation'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	modulate_v4_body()
	@@ -54,7 +54,7 @@
	{
	atf_set descr 'IPv6 TCP sequence number modulation'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	modulate_v6_body()
	diff --git a/tests/sys/netpfil/pf/pass_block.sh b/tests/sys/netpfil/pf/pass_block.sh
	--- a/tests/sys/netpfil/pf/pass_block.sh
	+++ b/tests/sys/netpfil/pf/pass_block.sh
	@@ -232,7 +232,7 @@
	{
	atf_set descr "Test unicast reverse path forwarding check"
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	urpf_body()
	diff --git a/tests/sys/netpfil/pf/pflog.sh b/tests/sys/netpfil/pf/pflog.sh
	--- a/tests/sys/netpfil/pf/pflog.sh
	+++ b/tests/sys/netpfil/pf/pflog.sh
	@@ -34,7 +34,7 @@
	{
	atf_set descr 'Test that we do not log malformed packets as passing'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	malformed_body()
	diff --git a/tests/sys/netpfil/pf/pflow.sh b/tests/sys/netpfil/pf/pflow.sh
	--- a/tests/sys/netpfil/pf/pflow.sh
	+++ b/tests/sys/netpfil/pf/pflow.sh
	@@ -85,7 +85,7 @@
	{
	atf_set descr 'Test set state-defaults pflow'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	state_defaults_body()
	@@ -146,7 +146,7 @@
	{
	atf_set descr 'Test pflow over IPv6'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	v6_body()
	@@ -188,7 +188,7 @@
	{
	atf_set descr 'Test pflow export for NAT44'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	nat_body()
	@@ -239,7 +239,7 @@
	{
	atf_set descr 'Test per-rule pflow option'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	rule_body()
	diff --git a/tests/sys/netpfil/pf/pfsync.sh b/tests/sys/netpfil/pf/pfsync.sh
	--- a/tests/sys/netpfil/pf/pfsync.sh
	+++ b/tests/sys/netpfil/pf/pfsync.sh
	@@ -126,7 +126,7 @@
	{
	atf_set descr 'Defer mode pfsync test'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	defer_body()
	@@ -907,7 +907,7 @@
	{
	atf_set descr 'Test route-to with pfsync version 13.1'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	route_to_1301_body()
	@@ -947,7 +947,7 @@
	{
	atf_set descr 'Test route-to with pfsync version 13.1 and incompatible ruleset'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	route_to_1301_bad_ruleset_body()
	@@ -997,7 +997,7 @@
	{
	atf_set descr 'Test route-to with pfsync version 13.1 and different interface'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	route_to_1301_bad_rpool_body()
	@@ -1045,7 +1045,7 @@
	{
	atf_set descr 'Test route-to with pfsync version 14.0'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	route_to_1400_bad_ruleset_body()
	@@ -1085,7 +1085,7 @@
	{
	atf_set descr 'Test route-to with pfsync version 14.0'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	route_to_1400_bad_ifname_body()
	diff --git a/tests/sys/netpfil/pf/route_to.sh b/tests/sys/netpfil/pf/route_to.sh
	--- a/tests/sys/netpfil/pf/route_to.sh
	+++ b/tests/sys/netpfil/pf/route_to.sh
	@@ -256,7 +256,7 @@
	{
	atf_set descr 'Test that ICMP packets are correct for route-to + NAT'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	icmp_nat_body()
	@@ -516,7 +516,7 @@
	{
	atf_set descr 'Test that reply-to states bind to the expected interface'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	ifbound_reply_to_body()
	@@ -572,7 +572,7 @@
	{
	atf_set descr 'Test that reply-to states bind to the expected interface for IPv6'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	ifbound_reply_to_v6_body()
	@@ -632,7 +632,7 @@
	{
	atf_set descr 'Test that reply-to states bind to the expected non-default-route interface after rdr and dummynet'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	ifbound_reply_to_rdr_dummynet_body()
	diff --git a/tests/sys/netpfil/pf/rtable.sh b/tests/sys/netpfil/pf/rtable.sh
	--- a/tests/sys/netpfil/pf/rtable.sh
	+++ b/tests/sys/netpfil/pf/rtable.sh
	@@ -31,7 +31,7 @@
	{
	atf_set descr 'Test IPv4 forwarding with rtable'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	forward_v4_body()
	@@ -78,7 +78,7 @@
	{
	atf_set descr 'Test IPv6 forwarding with rtable'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	forward_v6_body()
	diff --git a/tests/sys/netpfil/pf/scrub.sh b/tests/sys/netpfil/pf/scrub.sh
	--- a/tests/sys/netpfil/pf/scrub.sh
	+++ b/tests/sys/netpfil/pf/scrub.sh
	@@ -32,7 +32,7 @@
	{
	atf_set descr 'Test IPv4 scrub "mss" rule'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	max_mss_v4_body()
	@@ -57,7 +57,7 @@
	{
	atf_set descr 'Test IPv6 scrub "mss" rule'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	max_mss_v6_body()
	@@ -82,7 +82,7 @@
	{
	atf_set descr 'Test IPv4 scub "set-tos" rule'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	set_tos_v4_body()
	@@ -103,7 +103,7 @@
	{
	atf_set descr 'Test IPv6 scub "set-tos" rule'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	set_tos_v6_body()
	@@ -124,7 +124,7 @@
	{
	atf_set descr 'Test IPv4 scub "min-ttl" rule'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	min_ttl_v4_body()
	@@ -145,7 +145,7 @@
	{
	atf_set descr 'Test IPv6 scub "min-ttl" rule'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	min_ttl_v6_body()
	@@ -166,7 +166,7 @@
	{
	atf_set descr 'Test IPv4 "no scrub" rule'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	no_scrub_v4_body()
	@@ -189,7 +189,7 @@
	{
	atf_set descr 'Test IPv6 "no scrub" rule'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	no_scrub_v6_body()
	diff --git a/tests/sys/netpfil/pf/scrub_compat.sh b/tests/sys/netpfil/pf/scrub_compat.sh
	--- a/tests/sys/netpfil/pf/scrub_compat.sh
	+++ b/tests/sys/netpfil/pf/scrub_compat.sh
	@@ -33,7 +33,7 @@
	{
	atf_set descr 'Test IPv4 scrub "mss" rule'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	max_mss_v4_body()
	@@ -58,7 +58,7 @@
	{
	atf_set descr 'Test IPv6 scrub "mss" rule'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	max_mss_v6_body()
	@@ -83,7 +83,7 @@
	{
	atf_set descr 'Test IPv4 scub "set-tos" rule'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	set_tos_v4_body()
	@@ -104,7 +104,7 @@
	{
	atf_set descr 'Test IPv6 scub "set-tos" rule'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	set_tos_v6_body()
	@@ -125,7 +125,7 @@
	{
	atf_set descr 'Test IPv4 scub "min-ttl" rule'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	min_ttl_v4_body()
	@@ -146,7 +146,7 @@
	{
	atf_set descr 'Test IPv6 scub "min-ttl" rule'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	min_ttl_v6_body()
	@@ -167,7 +167,7 @@
	{
	atf_set descr 'Test IPv4 "no scrub" rule'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	no_scrub_v4_body()
	@@ -190,7 +190,7 @@
	{
	atf_set descr 'Test IPv6 "no scrub" rule'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	no_scrub_v6_body()
	diff --git a/tests/sys/netpfil/pf/scrub_pass.sh b/tests/sys/netpfil/pf/scrub_pass.sh
	--- a/tests/sys/netpfil/pf/scrub_pass.sh
	+++ b/tests/sys/netpfil/pf/scrub_pass.sh
	@@ -33,7 +33,7 @@
	{
	atf_set descr 'Test IPv4 pass "mss" rule'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	max_mss_v4_body()
	@@ -58,7 +58,7 @@
	{
	atf_set descr 'Test IPv6 pass "mss" rule'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	max_mss_v6_body()
	@@ -83,7 +83,7 @@
	{
	atf_set descr 'Test IPv4 pass "set-tos" rule'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	set_tos_v4_body()
	@@ -104,7 +104,7 @@
	{
	atf_set descr 'Test IPv6 pass "set-tos" rule'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	set_tos_v6_body()
	@@ -125,7 +125,7 @@
	{
	atf_set descr 'Test IPv4 pass "min-ttl" rule'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	min_ttl_v4_body()
	@@ -146,7 +146,7 @@
	{
	atf_set descr 'Test IPv6 pass "min-ttl" rule'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	min_ttl_v6_body()
	diff --git a/tests/sys/netpfil/pf/set_tos.sh b/tests/sys/netpfil/pf/set_tos.sh
	--- a/tests/sys/netpfil/pf/set_tos.sh
	+++ b/tests/sys/netpfil/pf/set_tos.sh
	@@ -37,7 +37,7 @@
	atf_set require.user root

	# We need scapy to be installed for out test scripts to work
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	v4_body()
	@@ -122,7 +122,7 @@
	atf_set require.user root

	# We need scapy to be installed for out test scripts to work
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	v6_body()
	diff --git a/tests/sys/netpfil/pf/src_track.sh b/tests/sys/netpfil/pf/src_track.sh
	--- a/tests/sys/netpfil/pf/src_track.sh
	+++ b/tests/sys/netpfil/pf/src_track.sh
	@@ -132,7 +132,7 @@
	{
	atf_set descr 'Max connections per source per rule'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	max_src_conn_rule_body()
	@@ -192,7 +192,7 @@
	{
	atf_set descr 'Max states per source per rule'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	max_src_states_rule_body()
	@@ -261,7 +261,7 @@
	{
	atf_set descr 'Max states per source global'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	max_src_states_global_body()
	@@ -311,7 +311,7 @@
	{
	atf_set descr 'Max states per source per rule with route-to'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	route_to_body()
	diff --git a/tests/sys/netpfil/pf/syncookie.sh b/tests/sys/netpfil/pf/syncookie.sh
	--- a/tests/sys/netpfil/pf/syncookie.sh
	+++ b/tests/sys/netpfil/pf/syncookie.sh
	@@ -322,7 +322,7 @@
	{
	atf_set descr 'Ensure that we do not create until SYN\|ACK'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	nostate_body()
	@@ -368,7 +368,7 @@
	{
	atf_set descr 'Ensure that we do not create until SYN\|ACK'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	nostate_v6_body()
	@@ -415,7 +415,7 @@
	{
	atf_set descr 'Adaptive mode test'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	adaptive_body()
	diff --git a/tests/sys/netpfil/pf/tcp.sh b/tests/sys/netpfil/pf/tcp.sh
	--- a/tests/sys/netpfil/pf/tcp.sh
	+++ b/tests/sys/netpfil/pf/tcp.sh
	@@ -33,7 +33,7 @@
	{
	atf_set descr 'Check sequence number validation in RST packets'
	atf_set require.user root
	- atf_set require.progs scapy
	+ atf_set require.progs python3 scapy
	}

	rst_body()

File Metadata

Mime Type: text/plain
Expires: Sat, Dec 13, 1:56 AM (7 h, 18 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 26901078
Default Alt Text: D49007.id151035.diff (27 KB)

D49007.id151035.diffNo OneTemporaryActions

D49007.id151035.diffView Options

File Metadata

Event Timeline

D49007.id151035.diff
No OneTemporary
Actions

D49007.id151035.diff
View Options