Module Name: src
Committed By: knakahara
Date: Thu Nov 5 00:02:59 UTC 2015
Modified Files:
src/distrib/sets/lists/tests: mi
src/etc/mtree: NetBSD.dist.tests
src/tests/net: Makefile
Added Files:
src/tests/net/if_gif: Makefile t_gif.sh
Log Message:
add basic if_gif tests to ATF.
To generate a diff of this commit:
cvs rdiff -u -r1.650 -r1.651 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.120 -r1.121 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r1.25 -r1.26 src/tests/net/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/net/if_gif/Makefile \
src/tests/net/if_gif/t_gif.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.650 src/distrib/sets/lists/tests/mi:1.651
--- src/distrib/sets/lists/tests/mi:1.650 Wed Oct 14 16:33:42 2015
+++ src/distrib/sets/lists/tests/mi Thu Nov 5 00:02:59 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.650 2015/10/14 16:33:42 christos Exp $
+# $NetBSD: mi,v 1.651 2015/11/05 00:02:59 knakahara Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -3154,6 +3154,10 @@
./usr/tests/net/if_bridge/Atffile tests-net-tests atf,rump
./usr/tests/net/if_bridge/Kyuafile tests-net-tests atf,rump,kyua
./usr/tests/net/if_bridge/t_bridge tests-net-tests atf,rump
+./usr/tests/net/if_gif tests-net-tests compattestfile,atf
+./usr/tests/net/if_gif/Atffile tests-net-tests atf,rump
+./usr/tests/net/if_gif/Kyuafile tests-net-tests atf,rump,kyua
+./usr/tests/net/if_gif/t_gif tests-net-tests atf,rump
./usr/tests/net/if_loop tests-net-tests compattestfile,atf
./usr/tests/net/if_loop/Atffile tests-net-tests atf,rump
./usr/tests/net/if_loop/Kyuafile tests-net-tests atf,rump,kyua
Index: src/etc/mtree/NetBSD.dist.tests
diff -u src/etc/mtree/NetBSD.dist.tests:1.120 src/etc/mtree/NetBSD.dist.tests:1.121
--- src/etc/mtree/NetBSD.dist.tests:1.120 Thu Sep 24 16:02:39 2015
+++ src/etc/mtree/NetBSD.dist.tests Thu Nov 5 00:02:59 2015
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.tests,v 1.120 2015/09/24 16:02:39 christos Exp $
+# $NetBSD: NetBSD.dist.tests,v 1.121 2015/11/05 00:02:59 knakahara Exp $
./usr/libdata/debug/usr/tests
./usr/libdata/debug/usr/tests/atf
@@ -318,6 +318,7 @@
./usr/tests/net/icmp
./usr/tests/net/if
./usr/tests/net/if_bridge
+./usr/tests/net/if_gif
./usr/tests/net/if_loop
./usr/tests/net/in_cksum
./usr/tests/net/mcast
Index: src/tests/net/Makefile
diff -u src/tests/net/Makefile:1.25 src/tests/net/Makefile:1.26
--- src/tests/net/Makefile:1.25 Mon Aug 3 09:54:20 2015
+++ src/tests/net/Makefile Thu Nov 5 00:02:59 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2015/08/03 09:54:20 ozaki-r Exp $
+# $NetBSD: Makefile,v 1.26 2015/11/05 00:02:59 knakahara Exp $
.include <bsd.own.mk>
@@ -6,8 +6,8 @@ TESTSDIR= ${TESTSBASE}/net
TESTS_SUBDIRS= fdpass in_cksum net sys
.if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE)
-TESTS_SUBDIRS+= arp bpf bpfilter carp icmp if if_bridge if_loop mcast
-TESTS_SUBDIRS+= mpls ndp npf route
+TESTS_SUBDIRS+= arp bpf bpfilter carp icmp if if_bridge if_gif if_loop
+TESTS_SUBDIRS+= mcast mpls ndp npf route
.if (${MKSLJIT} != "no")
TESTS_SUBDIRS+= bpfjit
.endif
Added files:
Index: src/tests/net/if_gif/Makefile
diff -u /dev/null src/tests/net/if_gif/Makefile:1.1
--- /dev/null Thu Nov 5 00:02:59 2015
+++ src/tests/net/if_gif/Makefile Thu Nov 5 00:02:59 2015
@@ -0,0 +1,10 @@
+# $NetBSD: Makefile,v 1.1 2015/11/05 00:02:59 knakahara Exp $
+#
+
+.include <bsd.own.mk>
+
+TESTSDIR= ${TESTSBASE}/net/if_gif
+
+TESTS_SH= t_gif
+
+.include <bsd.test.mk>
Index: src/tests/net/if_gif/t_gif.sh
diff -u /dev/null src/tests/net/if_gif/t_gif.sh:1.1
--- /dev/null Thu Nov 5 00:02:59 2015
+++ src/tests/net/if_gif/t_gif.sh Thu Nov 5 00:02:59 2015
@@ -0,0 +1,494 @@
+#! /usr/bin/atf-sh
+# $NetBSD: t_gif.sh,v 1.1 2015/11/05 00:02:59 knakahara Exp $
+#
+# Copyright (c) 2015 Internet Initiative Japan 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.
+#
+
+server="rump_server -v -lrumpnet -lrumpnet_net -lrumpnet_netinet \
+ -lrumpnet_netinet6 -lrumpnet_shmif -lrumpnet_gif"
+
+SOCK1=unix://commsock1 # for ROUTER1
+SOCK2=unix://commsock2 # for ROUTER2
+ROUTER1_LANIP=192.168.1.1
+ROUTER1_LANNET=192.168.1.0/24
+ROUTER1_WANIP=10.0.0.1
+ROUTER1_GIFIP=172.16.1.1
+ROUTER2_LANIP=192.168.2.1
+ROUTER2_LANNET=192.168.2.0/24
+ROUTER2_WANIP=10.0.0.2
+ROUTER2_GIFIP=172.16.2.1
+
+ROUTER1_LANIP6=fc00:1::1
+ROUTER1_LANNET6=fc00:1::/64
+ROUTER1_WANIP6=fc00::1
+ROUTER1_GIFIP6=fc00:3::1
+ROUTER2_LANIP6=fc00:2::1
+ROUTER2_LANNET6=fc00:2::/64
+ROUTER2_WANIP6=fc00::2
+ROUTER2_GIFIP6=fc00:4::1
+
+TIMEOUT=5
+
+atf_test_case basicv4overv4 cleanup
+atf_test_case basicv4overv6 cleanup
+atf_test_case basicv6overv4 cleanup
+atf_test_case basicv6overv6 cleanup
+
+basicv4overv4_head()
+{
+ atf_set "descr" "Does IPv4 over IPv4 if_gif tests"
+ atf_set "require.progs" "rump_server"
+}
+
+basicv4overv6_head()
+{
+ atf_set "descr" "Does IPv4 over IPv6 if_gif tests"
+ atf_set "require.progs" "rump_server"
+}
+
+basicv6overv4_head()
+{
+ atf_set "descr" "Does IPv6 over IPv4 if_gif tests"
+ atf_set "require.progs" "rump_server"
+}
+
+basicv6overv6_head()
+{
+ atf_set "descr" "Does IPv6 over IPv6 if_gif tests"
+ atf_set "require.progs" "rump_server"
+}
+
+setup_router()
+{
+ sock=${1}
+ lan=${2}
+ lan_mode=${3}
+ wan=${4}
+ wan_mode=${5}
+
+ export RUMP_SERVER=${sock}
+ atf_check -s exit:0 rump.ifconfig shmif0 create
+ atf_check -s exit:0 rump.ifconfig shmif0 linkstr bus0
+ if [ ${lan_mode} = "ipv6" ]; then
+ atf_check -s exit:0 rump.ifconfig shmif0 inet6 ${lan}
+ else
+ atf_check -s exit:0 rump.ifconfig shmif0 inet ${lan} netmask 0xffffff00
+ fi
+ atf_check -s exit:0 rump.ifconfig shmif0 up
+ rump.ifconfig shmif0
+
+ atf_check -s exit:0 rump.ifconfig shmif1 create
+ atf_check -s exit:0 rump.ifconfig shmif1 linkstr bus1
+ if [ ${wan_mode} = "ipv6" ]; then
+ atf_check -s exit:0 rump.ifconfig shmif1 inet6 ${wan}
+ else
+ atf_check -s exit:0 rump.ifconfig shmif1 inet ${wan} netmask 0xff000000
+ fi
+ atf_check -s exit:0 rump.ifconfig shmif1 up
+ rump.ifconfig shmif1
+}
+
+test_router()
+{
+ sock=${1}
+ lan=${2}
+ lan_mode=${3}
+ wan=${4}
+ wan_mode=${5}
+
+ export RUMP_SERVER=${sock}
+ atf_check -s exit:0 -o match:shmif0 rump.ifconfig
+ if [ ${lan_mode} = "ipv6" ]; then
+ atf_check -s exit:0 -o ignore rump.ping6 -n -c 1 -X $TIMEOUT ${lan}
+ else
+ atf_check -s exit:0 -o ignore rump.ping -n -c 1 -w $TIMEOUT ${lan}
+ fi
+
+ atf_check -s exit:0 -o match:shmif1 rump.ifconfig
+ if [ ${wan_mode} = "ipv6" ]; then
+ atf_check -s exit:0 -o ignore rump.ping6 -n -c 1 -X $TIMEOUT ${wan}
+ else
+ atf_check -s exit:0 -o ignore rump.ping -n -c 1 -w $TIMEOUT ${wan}
+ fi
+}
+
+setup()
+{
+ inner=${1}
+ outer=${2}
+
+ atf_check -s exit:0 ${server} $SOCK1
+ atf_check -s exit:0 ${server} $SOCK2
+
+ router1_lan=""
+ router1_lan_mode=""
+ router2_lan=""
+ router2_lan_mode=""
+ if [ ${inner} = "ipv6" ]; then
+ router1_lan=$ROUTER1_LANIP6
+ router1_lan_mode="ipv6"
+ router2_lan=$ROUTER2_LANIP6
+ router2_lan_mode="ipv6"
+ else
+ router1_lan=$ROUTER1_LANIP
+ router1_lan_mode="ipv4"
+ router2_lan=$ROUTER2_LANIP
+ router2_lan_mode="ipv4"
+ fi
+
+ if [ ${outer} = "ipv6" ]; then
+ setup_router $SOCK1 ${router1_lan} ${router1_lan_mode} \
+ $ROUTER1_WANIP6 ipv6
+ setup_router $SOCK2 ${router2_lan} ${router2_lan_mode} \
+ $ROUTER2_WANIP6 ipv6
+ else
+ setup_router $SOCK1 ${router1_lan} ${router1_lan_mode} \
+ $ROUTER1_WANIP ipv4
+ setup_router $SOCK2 ${router2_lan} ${router2_lan_mode} \
+ $ROUTER2_WANIP ipv4
+ fi
+}
+
+test_setup()
+{
+ inner=${1}
+ outer=${2}
+
+ router1_lan=""
+ router1_lan_mode=""
+ router2_lan=""
+ router2_lan_mode=""
+ if [ ${inner} = "ipv6" ]; then
+ router1_lan=$ROUTER1_LANIP6
+ router1_lan_mode="ipv6"
+ router2_lan=$ROUTER2_LANIP6
+ router2_lan_mode="ipv6"
+ else
+ router1_lan=$ROUTER1_LANIP
+ router1_lan_mode="ipv4"
+ router2_lan=$ROUTER2_LANIP
+ router2_lan_mode="ipv4"
+ fi
+ if [ ${outer} = "ipv6" ]; then
+ test_router $SOCK1 ${router1_lan} ${router1_lan_mode} \
+ $ROUTER1_WANIP6 ipv6
+ test_router $SOCK2 ${router2_lan} ${router2_lan_mode} \
+ $ROUTER2_WANIP6 ipv6
+ else
+ test_router $SOCK1 ${router1_lan} ${router1_lan_mode} \
+ $ROUTER1_WANIP ipv4
+ test_router $SOCK2 ${router2_lan} ${router2_lan_mode} \
+ $ROUTER2_WANIP ipv4
+ fi
+}
+
+setup_if_gif()
+{
+ sock=${1}
+ addr=${2}
+ remote=${3}
+ inner=${4}
+ src=${5}
+ dst=${6}
+ peernet=${7}
+
+ export RUMP_SERVER=${sock}
+ atf_check -s exit:0 rump.ifconfig gif0 create
+ atf_check -s exit:0 rump.ifconfig gif0 tunnel ${src} ${dst}
+ if [ ${inner} = "ipv6" ]; then
+ atf_check -s exit:0 rump.ifconfig gif0 inet6 ${addr}/128 ${remote}
+ atf_check -s exit:0 -o ignore rump.route add -inet6 ${peernet} ${addr}
+ else
+ atf_check -s exit:0 rump.ifconfig gif0 inet ${addr}/32 ${remote}
+ atf_check -s exit:0 -o ignore rump.route add -inet ${peernet} ${addr}
+ fi
+
+ rump.ifconfig gif0
+ rump.route -nL show
+}
+
+setup_tunnel()
+{
+ inner=${1}
+ outer=${2}
+
+ addr=""
+ remote=""
+ src=""
+ dst=""
+ peernet=""
+
+ if [ ${inner} = "ipv6" ]; then
+ addr=$ROUTER1_GIFIP6
+ remote=$ROUTER2_GIFIP6
+ peernet=$ROUTER2_LANNET6
+ else
+ addr=$ROUTER1_GIFIP
+ remote=$ROUTER2_GIFIP
+ peernet=$ROUTER2_LANNET
+ fi
+ if [ ${outer} = "ipv6" ]; then
+ src=$ROUTER1_WANIP6
+ dst=$ROUTER2_WANIP6
+ else
+ src=$ROUTER1_WANIP
+ dst=$ROUTER2_WANIP
+ fi
+ setup_if_gif $SOCK1 ${addr} ${remote} ${inner} \
+ ${src} ${dst} ${peernet}
+
+ if [ $inner = "ipv6" ]; then
+ addr=$ROUTER2_GIFIP6
+ remote=$ROUTER1_GIFIP6
+ peernet=$ROUTER1_LANNET6
+ else
+ addr=$ROUTER2_GIFIP
+ remote=$ROUTER1_GIFIP
+ peernet=$ROUTER1_LANNET
+ fi
+ if [ $outer = "ipv6" ]; then
+ src=$ROUTER2_WANIP6
+ dst=$ROUTER1_WANIP6
+ else
+ src=$ROUTER2_WANIP
+ dst=$ROUTER1_WANIP
+ fi
+ setup_if_gif $SOCK2 ${addr} ${remote} ${inner} \
+ ${src} ${dst} ${peernet}
+}
+
+test_setup_tunnel()
+{
+ mode=${1}
+
+ peernet=""
+ opt=""
+ if [ ${inner} = "ipv6" ]; then
+ peernet=$ROUTER2_LANNET6
+ opt="-inet6"
+ else
+ peernet=$ROUTER2_LANNET
+ opt="-inet"
+ fi
+ export RUMP_SERVER=$SOCK1
+ atf_check -s exit:0 -o match:gif0 rump.ifconfig
+ atf_check -s exit:0 -o match:gif0 rump.route -nL get ${opt} ${peernet}
+
+ if [ ${inner} = "ipv6" ]; then
+ peernet=$ROUTER1_LANNET6
+ opt="-inet6"
+ else
+ peernet=$ROUTER1_LANNET
+ opt="-inet"
+ fi
+ export RUMP_SERVER=$SOCK2
+ atf_check -s exit:0 -o match:gif0 rump.ifconfig
+ atf_check -s exit:0 -o match:gif0 rump.route -nL get ${opt} ${peernet}
+}
+
+teardown_tunnel()
+{
+ export RUMP_SERVER=$SOCK1
+ atf_check -s exit:0 rump.ifconfig gif0 deletetunnel
+ atf_check -s exit:0 rump.ifconfig gif0 destroy
+
+ export RUMP_SERVER=$SOCK2
+ atf_check -s exit:0 rump.ifconfig gif0 deletetunnel
+ atf_check -s exit:0 rump.ifconfig gif0 destroy
+}
+
+cleanup()
+{
+ env RUMP_SERVER=$SOCK1 rump.halt
+ env RUMP_SERVER=$SOCK2 rump.halt
+}
+
+dump_bus()
+{
+ /usr/bin/shmif_dumpbus -p - bus0 2>/dev/null| /usr/sbin/tcpdump -n -e -r -
+ /usr/bin/shmif_dumpbus -p - bus1 2>/dev/null| /usr/sbin/tcpdump -n -e -r -
+}
+
+test_ping_failure()
+{
+ mode=$1
+
+ export RUMP_SERVER=$SOCK1
+ if [ ${mode} = "ipv6" ]; then
+ atf_check -s not-exit:0 -o ignore -e ignore \
+ rump.ping6 -n -X $TIMEOUT -c 1 -S $ROUTER1_LANIP6 \
+ $ROUTER2_LANIP6
+ else
+ atf_check -s not-exit:0 -o ignore -e ignore \
+ rump.ping -n -w $TIMEOUT -c 1 -I $ROUTER1_LANIP \
+ $ROUTER2_LANIP
+ fi
+
+ export RUMP_SERVER=$SOCK2
+ if [ ${mode} = "ipv6" ]; then
+ atf_check -s not-exit:0 -o ignore -e ignore \
+ rump.ping6 -n -X $TIMEOUT -c 1 -S $ROUTER2_LANIP6 \
+ $ROUTER1_LANIP6
+ else
+ atf_check -s not-exit:0 -o ignore -e ignore \
+ rump.ping -n -w $TIMEOUT -c 1 -I $ROUTER1_LANIP \
+ $ROUTER2_LANIP
+ fi
+}
+
+test_ping_success()
+{
+ mode=$1
+
+ export RUMP_SERVER=$SOCK1
+ rump.ifconfig -v gif0
+ if [ ${mode} = "ipv6" ]; then
+ # XXX
+ # rump.ping6 rarely fails with the message that
+ # "failed to get receiving hop limit".
+ # This is a known issue being analyzed.
+ atf_check -s exit:0 -o ignore \
+ rump.ping6 -n -X $TIMEOUT -c 1 -S $ROUTER1_LANIP6 \
+ $ROUTER2_LANIP6
+ else
+ atf_check -s exit:0 -o ignore \
+ rump.ping -n -w $TIMEOUT -c 1 -I $ROUTER1_LANIP \
+ $ROUTER2_LANIP
+ fi
+ rump.ifconfig -v gif0
+
+ export RUMP_SERVER=$SOCK2
+ rump.ifconfig -v gif0
+ if [ ${mode} = "ipv6" ]; then
+ atf_check -s exit:0 -o ignore \
+ rump.ping6 -n -X $TIMEOUT -c 1 -S $ROUTER2_LANIP6 \
+ $ROUTER1_LANIP6
+ else
+ atf_check -s exit:0 -o ignore \
+ rump.ping -n -w $TIMEOUT -c 1 -I $ROUTER2_LANIP \
+ $ROUTER1_LANIP
+ fi
+ rump.ifconfig -v gif0
+}
+
+basicv4overv4_body()
+{
+ setup ipv4 ipv4
+ test_setup ipv4 ipv4
+
+ # Enable once PR kern/49219 is fixed
+ #test_ping_failure
+
+ setup_tunnel ipv4 ipv4
+ sleep 1
+ test_setup_tunnel ipv4
+ test_ping_success ipv4
+
+ teardown_tunnel
+ test_ping_failure ipv4
+}
+
+basicv4overv6_body()
+{
+ setup ipv4 ipv6
+ test_setup ipv4 ipv6
+
+ # Enable once PR kern/49219 is fixed
+ #test_ping_failure
+
+ setup_tunnel ipv4 ipv6
+ sleep 1
+ test_setup_tunnel ipv4
+ test_ping_success ipv4
+
+ teardown_tunnel
+ test_ping_failure ipv4
+}
+
+basicv6overv4_body()
+{
+ setup ipv6 ipv4
+ test_setup ipv6 ipv4
+
+ # Enable once PR kern/49219 is fixed
+ #test_ping_failure
+
+ setup_tunnel ipv6 ipv4
+ sleep 1
+ test_setup_tunnel ipv6
+ test_ping_success ipv6
+
+ teardown_tunnel
+ test_ping_failure ipv6
+}
+
+basicv6overv6_body()
+{
+ setup ipv6 ipv6
+ test_setup ipv6 ipv6
+
+ # Enable once PR kern/49219 is fixed
+ #test_ping_failure
+
+ setup_tunnel ipv6 ipv6
+ sleep 1
+ test_setup_tunnel ipv6
+ test_ping_success ipv6
+
+ teardown_tunnel
+ test_ping_failure ipv6
+}
+
+basicv4overv4_cleanup()
+{
+ dump_bus
+ cleanup
+}
+
+basicv4overv6_cleanup()
+{
+ dump_bus
+ cleanup
+}
+
+basicv6overv4_cleanup()
+{
+ dump_bus
+ cleanup
+}
+
+basicv6overv6_cleanup()
+{
+ dump_bus
+ cleanup
+}
+
+atf_init_test_cases()
+{
+ atf_add_test_case basicv4overv4
+ atf_add_test_case basicv4overv6
+ atf_add_test_case basicv6overv4
+ atf_add_test_case basicv6overv6
+}
