Module Name:    src
Committed By:   ozaki-r
Date:           Mon Aug 31 06:16:08 UTC 2015

Modified Files:
        src/distrib/sets/lists/tests: mi
        src/tests/net/icmp: Makefile
Added Files:
        src/tests/net/icmp: t_icmp_redirect.sh

Log Message:
Add tests for ICMP redirect timeout


To generate a diff of this commit:
cvs rdiff -u -r1.643 -r1.644 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.4 -r1.5 src/tests/net/icmp/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/net/icmp/t_icmp_redirect.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.643 src/distrib/sets/lists/tests/mi:1.644
--- src/distrib/sets/lists/tests/mi:1.643	Thu Aug 27 12:59:36 2015
+++ src/distrib/sets/lists/tests/mi	Mon Aug 31 06:16:08 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.643 2015/08/27 12:59:36 rjs Exp $
+# $NetBSD: mi,v 1.644 2015/08/31 06:16:08 ozaki-r Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -3134,6 +3134,7 @@
 ./usr/tests/net/icmp/Kyuafile			tests-net-tests		atf,rump,kyua
 ./usr/tests/net/icmp/t_forward			tests-net-tests		atf,rump
 ./usr/tests/net/icmp/t_forward			tests-net-tests		atf,rump
+./usr/tests/net/icmp/t_icmp_redirect		tests-net-tests		atf,rump
 ./usr/tests/net/icmp/t_ping			tests-net-tests		atf,rump
 ./usr/tests/net/icmp/t_ping2			tests-net-tests		atf,rump
 ./usr/tests/net/if				tests-net-tests		compattestfile,atf

Index: src/tests/net/icmp/Makefile
diff -u src/tests/net/icmp/Makefile:1.4 src/tests/net/icmp/Makefile:1.5
--- src/tests/net/icmp/Makefile:1.4	Tue Jun 10 04:28:40 2014
+++ src/tests/net/icmp/Makefile	Mon Aug 31 06:16:08 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/06/10 04:28:40 he Exp $
+# $NetBSD: Makefile,v 1.5 2015/08/31 06:16:08 ozaki-r Exp $
 #
 
 .include <bsd.own.mk>
@@ -8,7 +8,7 @@ TESTSDIR=	${TESTSBASE}/net/icmp
 TESTS_C=	t_forward
 TESTS_C+=	t_ping
 
-TESTS_SH=	t_ping2
+TESTS_SH=	t_ping2 t_icmp_redirect
 
 LDADD+=		-lrumpnet_shmif -lrumpnet_netinet -lrumpnet_net -lrumpnet
 LDADD+=		-lrump -lrumpuser -lrump -lpthread

Added files:

Index: src/tests/net/icmp/t_icmp_redirect.sh
diff -u /dev/null src/tests/net/icmp/t_icmp_redirect.sh:1.1
--- /dev/null	Mon Aug 31 06:16:08 2015
+++ src/tests/net/icmp/t_icmp_redirect.sh	Mon Aug 31 06:16:08 2015
@@ -0,0 +1,216 @@
+#	$NetBSD: t_icmp_redirect.sh,v 1.1 2015/08/31 06:16:08 ozaki-r Exp $
+#
+# Copyright (c) 2015 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+# Most codes are derived from tests/net/route/t_flags.sh
+
+netserver=\
+"rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_shmif"
+SOCK_LOCAL=unix://commsock1
+SOCK_PEER=unix://commsock2
+SOCK_GW=unix://commsock3
+BUS=bus1
+BUS2=bus2
+REDIRECT_TIMEOUT=5
+
+DEBUG=false
+
+atf_test_case icmp_redirect_timeout cleanup
+
+icmp_redirect_timeout_head()
+{
+
+	atf_set "descr" "Tests for ICMP redirect timeout";
+	atf_set "require.progs" "rump_server";
+}
+
+setup_local()
+{
+
+	atf_check -s exit:0 ${netserver} ${SOCK_LOCAL}
+
+	export RUMP_SERVER=$SOCK_LOCAL
+	atf_check -s exit:0 -o ignore rump.ifconfig shmif0 create
+	atf_check -s exit:0 -o ignore rump.ifconfig shmif0 linkstr ${BUS}
+	atf_check -s exit:0 -o ignore rump.ifconfig shmif0 10.0.0.2/24
+	atf_check -s exit:0 -o ignore rump.ifconfig shmif0 up
+
+	atf_check -s exit:0 -o ignore rump.sysctl -w \
+	    net.inet.icmp.redirtimeout=$REDIRECT_TIMEOUT
+
+	$DEBUG && rump.ifconfig
+	$DEBUG && rump.netstat -rn -f inet
+}
+
+setup_peer()
+{
+
+	atf_check -s exit:0 ${netserver} ${SOCK_PEER}
+
+	export RUMP_SERVER=$SOCK_PEER
+	atf_check -s exit:0 -o ignore rump.ifconfig shmif0 create
+	atf_check -s exit:0 -o ignore rump.ifconfig shmif0 linkstr ${BUS}
+	atf_check -s exit:0 -o ignore rump.ifconfig shmif0 10.0.0.1/24
+	atf_check -s exit:0 -o ignore rump.ifconfig shmif0 up
+
+	$DEBUG && rump.ifconfig
+	$DEBUG && rump.netstat -rn -f inet
+}
+
+setup_gw()
+{
+
+	atf_check -s exit:0 ${netserver} ${SOCK_GW}
+
+	export RUMP_SERVER=$SOCK_GW
+	atf_check -s exit:0 -o ignore rump.ifconfig shmif0 create
+	atf_check -s exit:0 -o ignore rump.ifconfig shmif0 linkstr ${BUS}
+	atf_check -s exit:0 -o ignore rump.ifconfig shmif0 10.0.0.254/24
+	atf_check -s exit:0 -o ignore rump.ifconfig shmif0 up
+
+	atf_check -s exit:0 -o ignore rump.ifconfig shmif1 create
+	atf_check -s exit:0 -o ignore rump.ifconfig shmif1 linkstr ${BUS2}
+	atf_check -s exit:0 -o ignore rump.ifconfig shmif1 10.0.2.1/24
+	atf_check -s exit:0 -o ignore rump.ifconfig shmif1 alias 10.0.2.2/24
+	atf_check -s exit:0 -o ignore rump.ifconfig shmif1 up
+
+	# Wait until DAD completes (10 sec at most)
+	atf_check -s exit:0 -o ignore rump.ifconfig -w 10
+	atf_check -s not-exit:0 -x "rump.ifconfig shmif1 |grep -q tentative"
+
+	$DEBUG && rump.ifconfig
+	$DEBUG && rump.netstat -rn -f inet
+}
+
+teardown_gw()
+{
+
+	env RUMP_SERVER=$SOCK_GW rump.halt
+}
+
+check_entry_flags()
+{
+	local ip=$(echo $1 |sed 's/\./\\./g')
+	local flags=$2
+
+	atf_check -s exit:0 -o match:" $flags " -e ignore -x \
+	    "rump.netstat -rn -f inet | grep ^'$ip'"
+}
+
+check_entry_gw()
+{
+	local ip=$(echo $1 |sed 's/\./\\./g')
+	local gw=$2
+
+	atf_check -s exit:0 -o match:" $gw " -e ignore -x \
+	    "rump.netstat -rn -f inet | grep ^'$ip'"
+}
+
+check_entry_fail()
+{
+	local ip=$(echo $1 |sed 's/\./\\./g')
+	local flags=$2  # Not used currently
+
+	atf_check -s not-exit:0 -e ignore -x \
+	    "rump.netstat -rn -f inet | grep ^'$ip'"
+}
+
+icmp_redirect_timeout_body()
+{
+
+	$DEBUG && ulimit -c unlimited
+
+	setup_local
+	setup_peer
+
+	### Testing Dynamic flag ###
+
+	#
+	# Setup a gateway 10.0.0.254. 10.0.2.1 is behind it.
+	#
+	setup_gw
+
+	#
+	# Teach the peer that 10.0.2.* is behind 10.0.0.254
+	#
+	export RUMP_SERVER=$SOCK_PEER
+	atf_check -s exit:0 -o ignore rump.route add -net 10.0.2.0/24 10.0.0.254
+	# Up, Gateway, Static
+	check_entry_flags 10.0.2/24 UGS
+
+	#
+	# Setup the default gateway to the peer, 10.0.0.1
+	#
+	export RUMP_SERVER=$SOCK_LOCAL
+	atf_check -s exit:0 -o ignore rump.route add default 10.0.0.1
+	# Up, Gateway, Static
+	check_entry_flags default UGS
+
+	# Try ping 10.0.2.1
+	atf_check -s exit:0 -o ignore rump.ping -n -w 1 -c 1 10.0.2.1
+	$DEBUG && rump.netstat -rn -f inet
+
+	# Up, Gateway, Host, Dynamic
+	check_entry_flags 10.0.2.1 UGHD
+	check_entry_gw 10.0.2.1 10.0.0.254
+
+	atf_check -s exit:0 sleep $((REDIRECT_TIMEOUT + 2))
+
+	# The dynamic entry should be expired and removed
+	check_entry_fail 10.0.2.1
+
+	export RUMP_SERVER=$SOCK_PEER
+	$DEBUG && rump.netstat -rn -f inet
+
+	teardown_gw
+}
+
+dump()
+{
+
+	shmif_dumpbus -p - $BUS 2>/dev/null | tcpdump -n -e -r -
+	gdb -ex bt /usr/bin/rump_server rump_server.core
+}
+
+cleanup()
+{
+
+	env RUMP_SERVER=$SOCK_LOCAL rump.halt
+	env RUMP_SERVER=$SOCK_PEER rump.halt
+}
+
+icmp_redirect_timeout_cleanup()
+{
+
+	$DEBUG && dump
+	cleanup
+}
+
+atf_init_test_cases()
+{
+
+	atf_add_test_case icmp_redirect_timeout
+}

Reply via email to