Sat Jun 27 06:57:44 2020 UTC ()
Add a basic test for enabling/disabling network interface capabilities.


(jruoho)
diff -r1.856 -r1.857 src/distrib/sets/lists/tests/mi
diff -r1.6 -r1.7 src/tests/sbin/ifconfig/Makefile
diff -r0 -r1.1 src/tests/sbin/ifconfig/t_capabilities.sh

cvs diff -r1.856 -r1.857 src/distrib/sets/lists/tests/mi (expand / switch to unified diff)

--- src/distrib/sets/lists/tests/mi 2020/06/27 05:20:34 1.856
+++ src/distrib/sets/lists/tests/mi 2020/06/27 06:57:44 1.857
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mi,v 1.856 2020/06/27 05:20:34 jruoho Exp $ 1# $NetBSD: mi,v 1.857 2020/06/27 06:57:44 jruoho Exp $
2# 2#
3# Note: don't delete entries from here - mark them as "obsolete" instead. 3# Note: don't delete entries from here - mark them as "obsolete" instead.
4# 4#
5./etc/mtree/set.tests tests-sys-root 5./etc/mtree/set.tests tests-sys-root
6./usr/libdata/debug/usr/tests tests-base-debug compattestdir 6./usr/libdata/debug/usr/tests tests-base-debug compattestdir
7./usr/libdata/debug/usr/tests/atf tests-atf-debug compattestfile,atf 7./usr/libdata/debug/usr/tests/atf tests-atf-debug compattestfile,atf
8./usr/libdata/debug/usr/tests/atf/atf-c tests-atf-debug compattestfile,atf 8./usr/libdata/debug/usr/tests/atf/atf-c tests-atf-debug compattestfile,atf
9./usr/libdata/debug/usr/tests/atf/atf-c++ tests-atf-debug compattestfile,atf 9./usr/libdata/debug/usr/tests/atf/atf-c++ tests-atf-debug compattestfile,atf
10./usr/libdata/debug/usr/tests/atf/atf-c++/detail tests-atf-debug compattestfile,atf 10./usr/libdata/debug/usr/tests/atf/atf-c++/detail tests-atf-debug compattestfile,atf
11./usr/libdata/debug/usr/tests/atf/atf-c/detail tests-atf-debug compattestfile,atf 11./usr/libdata/debug/usr/tests/atf/atf-c/detail tests-atf-debug compattestfile,atf
12./usr/libdata/debug/usr/tests/atf/atf-compile tests-obsolete obsolete 12./usr/libdata/debug/usr/tests/atf/atf-compile tests-obsolete obsolete
13./usr/libdata/debug/usr/tests/atf/atf-report tests-obsolete obsolete 13./usr/libdata/debug/usr/tests/atf/atf-report tests-obsolete obsolete
14./usr/libdata/debug/usr/tests/atf/atf-run tests-obsolete obsolete 14./usr/libdata/debug/usr/tests/atf/atf-run tests-obsolete obsolete
@@ -3985,26 +3985,27 @@ @@ -3985,26 +3985,27 @@
3985./usr/tests/sbin/gpt/gpt.2part.show.uuid tests-sbin-tests compattestfile,atf 3985./usr/tests/sbin/gpt/gpt.2part.show.uuid tests-sbin-tests compattestfile,atf
3986./usr/tests/sbin/gpt/gpt.backup tests-sbin-tests compattestfile,atf 3986./usr/tests/sbin/gpt/gpt.backup tests-sbin-tests compattestfile,atf
3987./usr/tests/sbin/gpt/gpt.disklabel tests-sbin-tests compattestfile,atf 3987./usr/tests/sbin/gpt/gpt.disklabel tests-sbin-tests compattestfile,atf
3988./usr/tests/sbin/gpt/gpt.disklabel.show.normal tests-sbin-tests compattestfile,atf 3988./usr/tests/sbin/gpt/gpt.disklabel.show.normal tests-sbin-tests compattestfile,atf
3989./usr/tests/sbin/gpt/gpt.empty.show.normal tests-sbin-tests compattestfile,atf 3989./usr/tests/sbin/gpt/gpt.empty.show.normal tests-sbin-tests compattestfile,atf
3990./usr/tests/sbin/gpt/gpt.removepart.show.normal tests-sbin-tests compattestfile,atf 3990./usr/tests/sbin/gpt/gpt.removepart.show.normal tests-sbin-tests compattestfile,atf
3991./usr/tests/sbin/gpt/gpt.resizedisk.show.normal tests-sbin-tests compattestfile,atf 3991./usr/tests/sbin/gpt/gpt.resizedisk.show.normal tests-sbin-tests compattestfile,atf
3992./usr/tests/sbin/gpt/gpt.resizepart.show.normal tests-sbin-tests compattestfile,atf 3992./usr/tests/sbin/gpt/gpt.resizepart.show.normal tests-sbin-tests compattestfile,atf
3993./usr/tests/sbin/gpt/t_gpt tests-sbin-tests compattestfile,atf 3993./usr/tests/sbin/gpt/t_gpt tests-sbin-tests compattestfile,atf
3994./usr/tests/sbin/ifconfig tests-sbin-tests compattestfile,atf 3994./usr/tests/sbin/ifconfig tests-sbin-tests compattestfile,atf
3995./usr/tests/sbin/ifconfig/Atffile tests-sbin-tests compattestfile,atf 3995./usr/tests/sbin/ifconfig/Atffile tests-sbin-tests compattestfile,atf
3996./usr/tests/sbin/ifconfig/Kyuafile tests-sbin-tests compattestfile,atf,kyua 3996./usr/tests/sbin/ifconfig/Kyuafile tests-sbin-tests compattestfile,atf,kyua
3997./usr/tests/sbin/ifconfig/t_bridge tests-sbin-tests compattestfile,atf 3997./usr/tests/sbin/ifconfig/t_bridge tests-sbin-tests compattestfile,atf
 3998./usr/tests/sbin/ifconfig/t_capabilities tests-sbin-tests compattestfile,atf
3998./usr/tests/sbin/ifconfig/t_nonexistent tests-sbin-tests compattestfile,atf 3999./usr/tests/sbin/ifconfig/t_nonexistent tests-sbin-tests compattestfile,atf
3999./usr/tests/sbin/ifconfig/t_repeated_scan tests-sbin-tests compattestfile,atf 4000./usr/tests/sbin/ifconfig/t_repeated_scan tests-sbin-tests compattestfile,atf
4000./usr/tests/sbin/ifconfig/t_repeated_updown tests-sbin-tests compattestfile,atf 4001./usr/tests/sbin/ifconfig/t_repeated_updown tests-sbin-tests compattestfile,atf
4001./usr/tests/sbin/ifconfig/t_tap tests-sbin-tests compattestfile,atf 4002./usr/tests/sbin/ifconfig/t_tap tests-sbin-tests compattestfile,atf
4002./usr/tests/sbin/ifconfig/t_woptions tests-sbin-tests compattestfile,atf 4003./usr/tests/sbin/ifconfig/t_woptions tests-sbin-tests compattestfile,atf
4003./usr/tests/sbin/newfs tests-sbin-tests compattestfile,atf 4004./usr/tests/sbin/newfs tests-sbin-tests compattestfile,atf
4004./usr/tests/sbin/newfs/Atffile tests-sbin-tests compattestfile,atf 4005./usr/tests/sbin/newfs/Atffile tests-sbin-tests compattestfile,atf
4005./usr/tests/sbin/newfs/Kyuafile tests-sbin-tests compattestfile,atf,kyua 4006./usr/tests/sbin/newfs/Kyuafile tests-sbin-tests compattestfile,atf,kyua
4006./usr/tests/sbin/newfs/t_enable_quotas tests-sbin-tests compattestfile,atf 4007./usr/tests/sbin/newfs/t_enable_quotas tests-sbin-tests compattestfile,atf
4007./usr/tests/sbin/newfs_msdos tests-sbin-tests compattestfile,atf 4008./usr/tests/sbin/newfs_msdos tests-sbin-tests compattestfile,atf
4008./usr/tests/sbin/newfs_msdos/Atffile tests-sbin-tests compattestfile,atf 4009./usr/tests/sbin/newfs_msdos/Atffile tests-sbin-tests compattestfile,atf
4009./usr/tests/sbin/newfs_msdos/Kyuafile tests-sbin-tests compattestfile,atf,kyua 4010./usr/tests/sbin/newfs_msdos/Kyuafile tests-sbin-tests compattestfile,atf,kyua
4010./usr/tests/sbin/newfs_msdos/t_create tests-sbin-tests compattestfile,atf 4011./usr/tests/sbin/newfs_msdos/t_create tests-sbin-tests compattestfile,atf

cvs diff -r1.6 -r1.7 src/tests/sbin/ifconfig/Makefile (expand / switch to unified diff)

--- src/tests/sbin/ifconfig/Makefile 2020/06/27 05:07:07 1.6
+++ src/tests/sbin/ifconfig/Makefile 2020/06/27 06:57:44 1.7
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1# $NetBSD: Makefile,v 1.6 2020/06/27 05:07:07 jruoho Exp $ 1# $NetBSD: Makefile,v 1.7 2020/06/27 06:57:44 jruoho Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5TESTSDIR= ${TESTSBASE}/sbin/ifconfig 5TESTSDIR= ${TESTSBASE}/sbin/ifconfig
6 6
7TESTS_SH= t_bridge \ 7TESTS_SH= t_bridge \
 8 t_capabilities \
8 t_nonexistent \ 9 t_nonexistent \
9 t_repeated_scan \ 10 t_repeated_scan \
10 t_repeated_updown \ 11 t_repeated_updown \
11 t_tap \ 12 t_tap \
12 t_woptions 13 t_woptions
13 14
14.include <bsd.test.mk> 15.include <bsd.test.mk>

File Added: src/tests/sbin/ifconfig/t_capabilities.sh
# $NetBSD: t_capabilities.sh,v 1.1 2020/06/27 06:57:44 jruoho Exp $
#
# Copyright (c) 2020 The NetBSD Foundation, Inc.
# All rights reserved.
#
# This code is derived from software contributed to The NetBSD Foundation
# by Jukka Ruohonen.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
setcap() {

	echo "Request: $1 $2 ($3)"
	ifconfig $1 $2

	if [ $4 -eq 1 ]; then

		if [ ! $? -eq 0 ]; then
			atf_fail "Failed to enable $3 for $1"
		fi

		if [ -z "$(ifconfig $1 | grep "enabled" | grep $3)" ]; then
			atf_fail "Failed to enable $3 for $1"
		fi

		echo "Request: $1 -$2 (-$3)"
		ifconfig $1 -$2

		if [ ! $? -eq 0 ]; then
			atf_fail "Failed to disable $3 for $1"
		fi

		if [ ! -z "$(ifconfig $1 | grep "enabled" | grep $3)" ]; then
			atf_fail "Failed to disable $3 for $1"
		fi
	fi
}

parsecap() {

	i=$1
	checkrv=$3
	x=$(echo $2 | sed "s/.*<//" | sed "s/>//")

	export IFS=","

	for y in $x; do

		z=""

		if [ $y = "TSO4" ]; then
			z="tso4"
		elif [ $y = "IP4CSUM_Rx" ]; then
			z="ip4csum-rx"
		elif [ $y = "IP4CSUM_Tx" ]; then
			z="ip4csum-tx"
		elif [ $y = "TCP4CSUM_Rx" ]; then
			z="tcp4csum-rx"
		elif [ $y = "TCP4CSUM_Tx" ]; then
			z="tcp4csum-tx"
		elif [ $y = "UDP4CSUM_Rx" ]; then
			z="udp4csum-rx"
		elif [ $y = "UDP4CSUM_Tx" ]; then
			z="udp4csum-tx"
		elif [ $y = "TCP6CSUM_Rx" ]; then
			z="tcp6csum-rx"
		elif [ $y = "TCP6CSUM_Tx" ]; then
			z="tcp6csum-tx"
		elif [ $y = "UDP6CSUM_Rx" ]; then
			z="udp6csum-rx"
		elif [ $y = "UDP6CSUM_Tx" ]; then
			z="udp6csum-tx"
		elif [ $y = "TSO6" ]; then
			z="tso6"
		fi

		if [ -z $z ]; then
			echo "Skipping unrecognized $y for $i"
		else
			setcap $i $z $y $checkrv
		fi
	done

	unset IFS
}

atf_test_case basic
basic_head() {
	atf_set "require.user" "root"
	atf_set "descr" "Test setting interface capabilities"
}

basic_body() {

	for i in $(ifconfig -l); do

		c=$(ifconfig $i | grep "capabilities")

		if [ -z "$c" ]; then
			echo "Skipping $i, no capabilities"
			continue
		fi

		if [ ! -z "$(echo $i | grep ixg)" ]; then
			echo "Skipping $i (PR kern/50933)"
			continue
		fi

		enabled=$(ifconfig $i | grep "enabled")

		for l in $c; do

			if [ ! -z "$(echo $l | grep "ec_capabilities")" ]; then
				continue
			fi

			parsecap $i $l 1
		done

		if [ ! -z "$enabled" ]; then

			echo "Restoring capabilities for $i"

			for l in $enabled; do

				ec=$(echo $l | grep "ec_enabled")

				if [ ! -z "$ec" ]; then
					continue
				fi

				parsecap $i $l 0
			done
	       fi
	done
}

atf_init_test_cases() {
	atf_add_test_case basic
}