From nobody Tue Oct 15 17:10:10 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XSgZq1WGwz5YjyB; Tue, 15 Oct 2024 17:10:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XSgZq12Fnz4SGJ; Tue, 15 Oct 2024 17:10:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729012211; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/7H9MxiMP3jkTAnaX7cOsq9dsKXnZ29G6N7IWd9sgMI=; b=vDh6IKbBB8+ImsbPHfdYiTxvt7iU/VDf5agoIA7Q0J7C6rvuaK3EJvivIvDyY/0bE40yEZ FQeUEBF5JGdfEV6D/sgQOBYW1u13F7rszHywfN6Lb8V+JIQnyGzdYHJQ0zaC7y05wO0KuT 275NRu/BAvZWzksdMG3Rh2XKQ5koc01qxPfH7Xxi/3mK7M7a0KlUssyyA+rjnQxRvyz8+I 1lPgs719G4493SpDMdCwCLHH+m5/a9Obe5+OOvwgcuPK0rl6zpqea+ZjkrWKQI81XSF0BT U5LcxnsAGuc98Q08hNjkSmSIeS+WkEWQSFK2BEKlGV7mns816q55DEuXvRlbyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729012211; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/7H9MxiMP3jkTAnaX7cOsq9dsKXnZ29G6N7IWd9sgMI=; b=Bxk7V6LSAs/ftu5gOk4VzAPziJhbX+14LQKhO7YnrFr7tR8tmux1DEcv+Qd5TRtBUMJOm1 4jHwKGjrqHfqPrOl21WAXjlE85bamfCy/GzuaTufeB8mAjmnOLsI/0S73U3Xq94fDmwpOY qtgo1P00yzVgJP4U1nSXDRYd9F5cYmkN6PNP05pUdo76R8KPs1B9e80uBHz/7CB0I/6a0y K8vVIaFnKKC+yiBL18h4QhmpbaYCibWw/LCdreVVWCl6cFoC6jy/qYvPsfXTwGAn9H7wgK 7NwQFez3GqDAACZfWjv2uk79meDCbGx2oBFQcLFuCARWLer5izzhmmahv/QdVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729012211; a=rsa-sha256; cv=none; b=t7TiYZvDHLGvynU3mb25xkWwz1b2x8eZdbwql2A7/ssuWv4mZEbdEKhzbkDeKGPOgNkqtz jVzPY8oo6rXDOa/Rq0tGmq15xWZIxR2IjVS5dN4YmoAfbT/7n6XVE0pp215WWkBip0uMb7 uBvqEpAumgpRjxqWYayoP2UHz7jxP6HdukRzmP5/vBNhDcvtRz7AQUZ16EaNUyj3hrsEIA 6bOhxGgvJFYTn3IAYIQCGQ+2qs1d/QAQlT9QXN8jYvuXNpvM/fKWuRoXpwKaX1Vl2gzLV/ NZPt9CBwfz63n3FJYO+xrt8AEdScqbD//zo8DSCe5W2bU6TLTcoqRniN3GdFEg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XSgZq0dHjzWl9; Tue, 15 Oct 2024 17:10:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49FHAAPi099509; Tue, 15 Oct 2024 17:10:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49FHAA6a099497; Tue, 15 Oct 2024 17:10:10 GMT (envelope-from git) Date: Tue, 15 Oct 2024 17:10:10 GMT Message-Id: <202410151710.49FHAA6a099497@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Igor Ostapenko Subject: git: 9b86b272bfdb - main - tests: Move netpfil/pf/divapp to netpfil/common/ List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: igoro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9b86b272bfdb1fead5bf65d301c5df784c3165af Auto-Submitted: auto-generated The branch main has been updated by igoro: URL: https://cgit.FreeBSD.org/src/commit/?id=9b86b272bfdb1fead5bf65d301c5df784c3165af commit 9b86b272bfdb1fead5bf65d301c5df784c3165af Author: Igor Ostapenko AuthorDate: 2024-10-15 17:03:42 +0000 Commit: Igor Ostapenko CommitDate: 2024-10-15 17:08:01 +0000 tests: Move netpfil/pf/divapp to netpfil/common/ 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 --- ObsoleteFiles.inc | 3 +++ tests/sys/netpfil/common/Makefile | 3 +++ tests/sys/netpfil/{pf => common}/divapp.c | 2 +- tests/sys/netpfil/pf/Makefile | 3 --- tests/sys/netpfil/pf/divert-to.sh | 20 ++++++++++---------- 5 files changed, 17 insertions(+), 14 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 01f2609353cd..aa4dedbc9265 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -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 diff --git a/tests/sys/netpfil/common/Makefile b/tests/sys/netpfil/common/Makefile index 4cd3f1a8a156..0938bd9d9c7e 100644 --- a/tests/sys/netpfil/common/Makefile +++ b/tests/sys/netpfil/common/Makefile @@ -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 \ diff --git a/tests/sys/netpfil/pf/divapp.c b/tests/sys/netpfil/common/divapp.c similarity index 99% rename from tests/sys/netpfil/pf/divapp.c rename to tests/sys/netpfil/common/divapp.c index 908c41eaa67f..f3e41f010fef 100644 --- a/tests/sys/netpfil/pf/divapp.c +++ b/tests/sys/netpfil/common/divapp.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. */ -/* Used by tests like divert-to.sh */ +/* Used by divert(4) related tests */ #include #include diff --git a/tests/sys/netpfil/pf/Makefile b/tests/sys/netpfil/pf/Makefile index 38548336377a..7e701cb09c50 100644 --- a/tests/sys/netpfil/pf/Makefile +++ b/tests/sys/netpfil/pf/Makefile @@ -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 \ diff --git a/tests/sys/netpfil/pf/divert-to.sh b/tests/sys/netpfil/pf/divert-to.sh index b27d321d7825..ae44cd5d51af 100644 --- a/tests/sys/netpfil/pf/divert-to.sh +++ b/tests/sys/netpfil/pf/divert-to.sh @@ -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