kgess-mirror/freebsd-src
1
0
Fork 0
mirror of https://git.freebsd.org/src.git synced 2026-01-16 23:02:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

tests: Move netpfil/pf/divapp to netpfil/common/

Browse source 
It's intended to be used by both ipfw and pf.

Reviewed by:	kp, markj
Approved by:	kp (mentor)
Differential Revision:	https://reviews.freebsd.org/D47110
This commit is contained in:
Igor Ostapenko 2024-10-15 17:03:42 +00:00
parent f5f8d7c9cd
commit 9b86b272bf
5 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ObsoleteFiles.inc
View file

@ -51,6 +51,9 @@
# xargs -n1 | sort | uniq -d;
# done
# 20241014: move divapp to netpfil/common/
OLD_FILES+=usr/tests/sys/netpfil/pf/divapp
# 20240930: libmd bumped to version 7
OLD_LIBS+=lib/libmd.so.6

3
tests/sys/netpfil/common/Makefile
View file

@ -1,6 +1,7 @@
PACKAGE= tests
TESTSDIR= ${TESTSBASE}/sys/netpfil/common
BINDIR= ${TESTSDIR}
ATF_TESTS_SH+= \
@ -16,6 +17,8 @@ ATF_TESTS_SH+= \
TEST_METADATA+= execenv="jail"
TEST_METADATA+= execenv_jail_params="vnet allow.raw_sockets"
PROGS= divapp
${PACKAGE}FILES+= \
utils.subr \
runner.subr \

2
tests/sys/netpfil/pf/divapp.c → tests/sys/netpfil/common/divapp.c
View file

@ -25,7 +25,7 @@
* SUCH DAMAGE.
*/
/* Used by tests like divert-to.sh */
/* Used by divert(4) related tests */
#include <errno.h>
#include <stdlib.h>

3
tests/sys/netpfil/pf/Makefile
View file

@ -1,7 +1,6 @@
PACKAGE= tests
TESTSDIR= ${TESTSBASE}/sys/netpfil/pf
BINDIR= ${TESTSDIR}
TESTS_SUBDIRS+= ioctl
ATF_TESTS_SH+= altq \
@ -62,8 +61,6 @@ ATF_TESTS_PYTEST+= sctp.py
TEST_METADATA+= execenv="jail"
TEST_METADATA+= execenv_jail_params="vnet allow.raw_sockets"
PROGS= divapp
${PACKAGE}FILES+= CVE-2019-5597.py \
CVE-2019-5598.py \
daytime_inetd.conf \

20
tests/sys/netpfil/pf/divert-to.sh
View file

@ -98,7 +98,7 @@ in_div_body()
"pass all" \
"pass in inet proto icmp icmp-type echoreq divert-to 127.0.0.1 port 2000"
jexec div $(atf_get_srcdir)/divapp 2000 &
jexec div $(atf_get_srcdir)/../common/divapp 2000 &
divapp_pid=$!
# Wait for the divapp to be ready
sleep 1
@ -137,7 +137,7 @@ in_div_in_body()
"pass all" \
"pass in inet proto icmp icmp-type echoreq divert-to 127.0.0.1 port 2000 no state"
jexec div $(atf_get_srcdir)/divapp 2000 divert-back &
jexec div $(atf_get_srcdir)/../common/divapp 2000 divert-back &
divapp_pid=$!
# Wait for the divapp to be ready
sleep 1
@ -177,7 +177,7 @@ out_div_body()
"pass in inet proto icmp icmp-type echoreq no state" \
"pass out inet proto icmp icmp-type echorep divert-to 127.0.0.1 port 2000 no state"
jexec div $(atf_get_srcdir)/divapp 2000 &
jexec div $(atf_get_srcdir)/../common/divapp 2000 &
divapp_pid=$!
# Wait for the divapp to be ready
sleep 1
@ -217,7 +217,7 @@ out_div_out_body()
"pass in inet proto icmp icmp-type echoreq no state" \
"pass out inet proto icmp icmp-type echorep divert-to 127.0.0.1 port 2000 no state"
jexec div $(atf_get_srcdir)/divapp 2000 divert-back &
jexec div $(atf_get_srcdir)/../common/divapp 2000 divert-back &
divapp_pid=$!
# Wait for the divapp to be ready
sleep 1
@ -271,9 +271,9 @@ in_div_in_fwd_out_div_out_body()
"pass in inet proto icmp icmp-type echoreq divert-to 127.0.0.1 port 2001 no state" \
"pass out inet proto icmp icmp-type echoreq divert-to 127.0.0.1 port 2002 no state"
jexec router $(atf_get_srcdir)/divapp 2001 divert-back &
jexec router $(atf_get_srcdir)/../common/divapp 2001 divert-back &
indivapp_pid=$!
jexec router $(atf_get_srcdir)/divapp 2002 divert-back &
jexec router $(atf_get_srcdir)/../common/divapp 2002 divert-back &
outdivapp_pid=$!
# Wait for the divappS to be ready
sleep 1
@ -322,9 +322,9 @@ in_dn_in_div_in_out_div_out_dn_out_body()
"pass in inet proto icmp icmp-type echoreq divert-to 127.0.0.1 port 1001 no state" \
"pass out inet proto icmp icmp-type echorep divert-to 127.0.0.1 port 1002 no state"
jexec alcatraz $(atf_get_srcdir)/divapp 1001 divert-back &
jexec alcatraz $(atf_get_srcdir)/../common/divapp 1001 divert-back &
indivapp_pid=$!
jexec alcatraz $(atf_get_srcdir)/divapp 1002 divert-back &
jexec alcatraz $(atf_get_srcdir)/../common/divapp 1002 divert-back &
outdivapp_pid=$!
# Wait for the divappS to be ready
sleep 1
@ -351,9 +351,9 @@ in_dn_in_div_in_out_div_out_dn_out_body()
"pass in inet proto icmp icmp-type echoreq divert-to 127.0.0.1 port 2001 no state" \
"pass out inet proto icmp icmp-type echorep divert-to 127.0.0.1 port 2002 no state"
jexec alcatraz $(atf_get_srcdir)/divapp 2001 divert-back &
jexec alcatraz $(atf_get_srcdir)/../common/divapp 2001 divert-back &
indivapp_pid=$!
jexec alcatraz $(atf_get_srcdir)/divapp 2002 divert-back &
jexec alcatraz $(atf_get_srcdir)/../common/divapp 2002 divert-back &
outdivapp_pid=$!
# Wait for the divappS to be ready
sleep 1