 @@ -1,14 +1,14 @@
-#	$NetBSD: t_ipsec.sh,v 1.4 2018/03/13 03:50:26 knakahara Exp $
+#	$NetBSD: t_ipsec.sh,v 1.5 2018/12/25 03:28:29 knakahara Exp $
+#
 # Copyright (c) 2017 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.
+#
 @@ -95,35 +95,35 @@ setup_router()
 	local wan=${4}
 	local wan_mode=${5}
 	rump_server_add_iface $sock shmif0 bus0
 	rump_server_add_iface $sock shmif1 bus1
 	export RUMP_SERVER=${sock}
 	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
+	$DEBUG && rump.ifconfig shmif0
 	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
+	$DEBUG && rump.ifconfig shmif1
 	unset RUMP_SERVER
+}
 test_router()
+{
 	local sock=${1}
 	local lan=${2}
 	local lan_mode=${3}
 	local wan=${4}
 	local wan_mode=${5}
 	export RUMP_SERVER=${sock}
 	atf_check -s exit:0 -o match:shmif0 rump.ifconfig
 @@ -237,28 +237,28 @@ setup_if_ipsec()
 	local peernet=${7}
 	export RUMP_SERVER=${sock}
 	atf_check -s exit:0 rump.ifconfig ipsec0 create
 	atf_check -s exit:0 rump.ifconfig ipsec0 tunnel ${src} ${dst}
 	if [ ${inner} = "ipv6" ]; then
 		atf_check -s exit:0 rump.ifconfig ipsec0 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 ipsec0 inet ${addr}/32 ${remote}
 		atf_check -s exit:0 -o ignore rump.route add -inet ${peernet} ${addr}
 	fi
-	rump.ifconfig ipsec0
+	$DEBUG && rump.ifconfig ipsec0
-	rump.route -nL show
+	$DEBUG && rump.route -nL show
+}
 setup_if_ipsec_sa()
+{
 	local sock=${1}
 	local src=${2}
 	local dst=${3}
 	local mode=${4}
 	local proto=${5}
 	local algo=${6}
 	local dir=${7}
 	local tmpfile=./tmp
 @@ -416,27 +416,27 @@ setup_dummy_if_ipsec()
 	local inner=${4}
 	local src=${5}
 	local dst=${6}
 	export RUMP_SERVER=${sock}
 	atf_check -s exit:0 rump.ifconfig ipsec1 create
 	atf_check -s exit:0 rump.ifconfig ipsec1 tunnel ${src} ${dst}
 	if [ ${inner} = "ipv6" ]; then
 		atf_check -s exit:0 rump.ifconfig ipsec1 inet6 ${addr}/128 ${remote}
 	else
 		atf_check -s exit:0 rump.ifconfig ipsec1 inet ${addr}/32 ${remote}
 	fi
-	rump.ifconfig ipsec1
+	$DEBUG && rump.ifconfig ipsec1
 	unset RUMP_SERVER
+}
 setup_dummy_if_ipsec_sa()
+{
 	local sock=${1}
 	local src=${2}
 	local dst=${3}
 	local mode=${4}
 	local proto=${5}
 	local algo=${6}
 	local dir=${7}
 @@ -559,27 +559,27 @@ setup_recursive_if_ipsec()
 	local dir=${10}
 	export RUMP_SERVER=${sock}
 	atf_check -s exit:0 rump.ifconfig ${ipsec} create
 	atf_check -s exit:0 rump.ifconfig ${ipsec} tunnel ${src} ${dst}
 	if [ ${inner} = "ipv6" ]; then
 		atf_check -s exit:0 rump.ifconfig ${ipsec} inet6 ${addr}/128 ${remote}
 	else
 		atf_check -s exit:0 rump.ifconfig ${ipsec} inet ${addr}/32 ${remote}
 	fi
 	setup_if_ipsec_sa $sock ${src} ${dst} ${inner} ${proto} ${algo} ${dir}
 	export RUMP_SERVER=${sock}
-	rump.ifconfig ${ipsec}
+	$DEBUG && rump.ifconfig ${ipsec}
 	unset RUMP_SERVER
+}
 # test in ROUTER1 only
 setup_recursive_tunnels()
+{
 	local mode=${1}
 	local proto=${2}
 	local algo=${3}
 	local addr=""
 	local remote=""
 	local src=""
 @@ -670,128 +670,128 @@ test_ping_failure()
 		atf_check -s not-exit:0 -o ignore -e ignore \
 			rump.ping -n -w $TIMEOUT -c 1 -I $ROUTER1_LANIP \
 			$ROUTER2_LANIP
 	fi
 	unset RUMP_SERVER
+}
 test_ping_success()
+{
 	mode=$1
 	export RUMP_SERVER=$SOCK1
-	rump.ifconfig -v ipsec0
+	$DEBUG && rump.ifconfig -v ipsec0
 	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 ipsec0
+	$DEBUG && rump.ifconfig -v ipsec0
 	export RUMP_SERVER=$SOCK2
-	rump.ifconfig -v ipsec0
+	$DEBUG && rump.ifconfig -v ipsec0
 	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 ipsec0
+	$DEBUG && rump.ifconfig -v ipsec0
 	unset RUMP_SERVER
+}
 test_change_tunnel_duplicate()
+{
 	local mode=$1
 	local newsrc=""
 	local newdst=""
 	if [ ${mode} = "ipv6" ]; then
 		newsrc=$ROUTER1_WANIP6_DUMMY
 		newdst=$ROUTER2_WANIP6_DUMMY
 	else
 		newsrc=$ROUTER1_WANIP_DUMMY
 		newdst=$ROUTER2_WANIP_DUMMY
 	fi
 	export RUMP_SERVER=$SOCK1
-	rump.ifconfig -v ipsec0
+	$DEBUG && rump.ifconfig -v ipsec0
-	rump.ifconfig -v ipsec1
+	$DEBUG && rump.ifconfig -v ipsec1
 	atf_check -s exit:0 -e match:SIOCSLIFPHYADDR \
 		rump.ifconfig ipsec0 tunnel ${newsrc} ${newdst}
-	rump.ifconfig -v ipsec0
+	$DEBUG && rump.ifconfig -v ipsec0
-	rump.ifconfig -v ipsec1
+	$DEBUG && rump.ifconfig -v ipsec1
 	if [ ${mode} = "ipv6" ]; then
 		newsrc=$ROUTER2_WANIP6_DUMMY
 		newdst=$ROUTER1_WANIP6_DUMMY
 	else
 		newsrc=$ROUTER2_WANIP_DUMMY
 		newdst=$ROUTER1_WANIP_DUMMY
 	fi
 	export RUMP_SERVER=$SOCK2
-	rump.ifconfig -v ipsec0
+	$DEBUG && rump.ifconfig -v ipsec0
-	rump.ifconfig -v ipsec1
+	$DEBUG && rump.ifconfig -v ipsec1
 	atf_check -s exit:0 -e match:SIOCSLIFPHYADDR \
 		rump.ifconfig ipsec0 tunnel ${newsrc} ${newdst}
-	rump.ifconfig -v ipsec0
+	$DEBUG && rump.ifconfig -v ipsec0
-	rump.ifconfig -v ipsec1
+	$DEBUG && rump.ifconfig -v ipsec1
 	unset RUMP_SERVER
+}
 test_change_tunnel_success()
+{
 	local mode=$1
 	local newsrc=""
 	local newdst=""
 	if [ ${mode} = "ipv6" ]; then
 		newsrc=$ROUTER1_WANIP6_DUMMY
 		newdst=$ROUTER2_WANIP6_DUMMY
 	else
 		newsrc=$ROUTER1_WANIP_DUMMY
 		newdst=$ROUTER2_WANIP_DUMMY
 	fi
 	export RUMP_SERVER=$SOCK1
-	rump.ifconfig -v ipsec0
+	$DEBUG && rump.ifconfig -v ipsec0
 	atf_check -s exit:0 \
 		rump.ifconfig ipsec0 tunnel ${newsrc} ${newdst}
-	rump.ifconfig -v ipsec0
+	$DEBUG && rump.ifconfig -v ipsec0
 	if [ ${mode} = "ipv6" ]; then
 		newsrc=$ROUTER2_WANIP6_DUMMY
 		newdst=$ROUTER1_WANIP6_DUMMY
 	else
 		newsrc=$ROUTER2_WANIP_DUMMY
 		newdst=$ROUTER1_WANIP_DUMMY
 	fi
 	export RUMP_SERVER=$SOCK2
-	rump.ifconfig -v ipsec0
+	$DEBUG && rump.ifconfig -v ipsec0
 	atf_check -s exit:0 \
 		rump.ifconfig ipsec0 tunnel ${newsrc} ${newdst}
-	rump.ifconfig -v ipsec0
+	$DEBUG && rump.ifconfig -v ipsec0
 	unset RUMP_SERVER
+}
 basic_setup()
+{
 	local inner=$1
 	local outer=$2
 	local proto=$3
 	local algo=$4
 	setup ${inner} ${outer}
 	test_setup ${inner} ${outer}