Module Name: src
Committed By: ozaki-r
Date: Mon Aug 19 03:22:06 UTC 2019
Modified Files:
src/tests/net/arp: t_arp.sh
src/tests/net/carp: t_basic.sh
src/tests/net/if_bridge: t_bridge.sh t_rtable.sh
src/tests/net/if_gif: t_gif.sh
src/tests/net/if_ipsec: t_ipsec.sh t_ipsec_natt.sh t_ipsec_pfil.sh
src/tests/net/if_l2tp: t_l2tp.sh
src/tests/net/if_pppoe: t_pppoe.sh
src/tests/net/if_tap: t_tap.sh
src/tests/net/ipsec: t_ipsec_gif.sh t_ipsec_l2tp.sh t_ipsec_natt.sh
Log Message:
tests: use rump_server_add_iface to create interfaces
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/tests/net/arp/t_arp.sh
cvs rdiff -u -r1.7 -r1.8 src/tests/net/carp/t_basic.sh
cvs rdiff -u -r1.18 -r1.19 src/tests/net/if_bridge/t_bridge.sh
cvs rdiff -u -r1.6 -r1.7 src/tests/net/if_bridge/t_rtable.sh
cvs rdiff -u -r1.12 -r1.13 src/tests/net/if_gif/t_gif.sh
cvs rdiff -u -r1.9 -r1.10 src/tests/net/if_ipsec/t_ipsec.sh
cvs rdiff -u -r1.2 -r1.3 src/tests/net/if_ipsec/t_ipsec_natt.sh
cvs rdiff -u -r1.1 -r1.2 src/tests/net/if_ipsec/t_ipsec_pfil.sh
cvs rdiff -u -r1.4 -r1.5 src/tests/net/if_l2tp/t_l2tp.sh
cvs rdiff -u -r1.18 -r1.19 src/tests/net/if_pppoe/t_pppoe.sh
cvs rdiff -u -r1.9 -r1.10 src/tests/net/if_tap/t_tap.sh
cvs rdiff -u -r1.7 -r1.8 src/tests/net/ipsec/t_ipsec_gif.sh \
src/tests/net/ipsec/t_ipsec_l2tp.sh
cvs rdiff -u -r1.2 -r1.3 src/tests/net/ipsec/t_ipsec_natt.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/net/arp/t_arp.sh
diff -u src/tests/net/arp/t_arp.sh:1.37 src/tests/net/arp/t_arp.sh:1.38
--- src/tests/net/arp/t_arp.sh:1.37 Mon May 13 17:55:08 2019
+++ src/tests/net/arp/t_arp.sh Mon Aug 19 03:22:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: t_arp.sh,v 1.37 2019/05/13 17:55:08 bad Exp $
+# $NetBSD: t_arp.sh,v 1.38 2019/08/19 03:22:05 ozaki-r Exp $
#
# Copyright (c) 2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -485,7 +485,7 @@ test_proxy_arp()
# Test#1: First setup an endpoint then create proxy arp entry
#
export RUMP_SERVER=$SOCKDST
- atf_check -s exit:0 rump.ifconfig tap1 create
+ rump_server_add_iface $SOCKDST tap1
atf_check -s exit:0 rump.ifconfig tap1 $IP4DST_PROXYARP1/24 up
atf_check -s exit:0 rump.ifconfig -w 10
@@ -536,7 +536,7 @@ test_proxy_arp()
atf_check -s exit:0 -x "cat ./out |grep -q '$pkt'"
export RUMP_SERVER=$SOCKDST
- atf_check -s exit:0 rump.ifconfig tap2 create
+ rump_server_add_iface $SOCKDST tap2
atf_check -s exit:0 rump.ifconfig tap2 $IP4DST_PROXYARP2/24 up
atf_check -s exit:0 rump.ifconfig -w 10
Index: src/tests/net/carp/t_basic.sh
diff -u src/tests/net/carp/t_basic.sh:1.7 src/tests/net/carp/t_basic.sh:1.8
--- src/tests/net/carp/t_basic.sh:1.7 Thu Aug 3 03:16:26 2017
+++ src/tests/net/carp/t_basic.sh Mon Aug 19 03:22:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: t_basic.sh,v 1.7 2017/08/03 03:16:26 ozaki-r Exp $
+# $NetBSD: t_basic.sh,v 1.8 2019/08/19 03:22:05 ozaki-r Exp $
#
# Copyright (c) 2017 Internet Initiative Japan Inc.
# All rights reserved.
@@ -60,7 +60,7 @@ setup_carp()
atf_check -s exit:0 -o match:'0.->.1' \
rump.sysctl -w net.inet.carp.log=1
fi
- atf_check -s exit:0 rump.ifconfig $carpif create
+ rump_server_add_iface $sock $carpif
if [ $carpdevip = yes ]; then
atf_check -s exit:0 rump.ifconfig shmif0 $ip/24 up
atf_check -s exit:0 rump.ifconfig $carpif \
@@ -200,7 +200,7 @@ setup_carp6()
atf_check -s exit:0 -o match:'0.->.1' \
rump.sysctl -w net.inet.carp.log=1
fi
- atf_check -s exit:0 rump.ifconfig $carpif create
+ rump_server_add_iface $sock $carpif
if [ $carpdevip = yes ]; then
atf_check -s exit:0 rump.ifconfig shmif0 inet6 $ip up
atf_check -s exit:0 rump.ifconfig $carpif inet6 \
Index: src/tests/net/if_bridge/t_bridge.sh
diff -u src/tests/net/if_bridge/t_bridge.sh:1.18 src/tests/net/if_bridge/t_bridge.sh:1.19
--- src/tests/net/if_bridge/t_bridge.sh:1.18 Thu Feb 1 05:22:01 2018
+++ src/tests/net/if_bridge/t_bridge.sh Mon Aug 19 03:22:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: t_bridge.sh,v 1.18 2018/02/01 05:22:01 ozaki-r Exp $
+# $NetBSD: t_bridge.sh,v 1.19 2019/08/19 03:22:05 ozaki-r Exp $
#
# Copyright (c) 2014 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -169,7 +169,7 @@ setup6()
setup_bridge()
{
export RUMP_SERVER=$SOCK2
- atf_check -s exit:0 rump.ifconfig bridge0 create
+ rump_server_add_iface $SOCK2 bridge0
atf_check -s exit:0 rump.ifconfig bridge0 up
export LD_PRELOAD=/usr/lib/librumphijack.so
Index: src/tests/net/if_bridge/t_rtable.sh
diff -u src/tests/net/if_bridge/t_rtable.sh:1.6 src/tests/net/if_bridge/t_rtable.sh:1.7
--- src/tests/net/if_bridge/t_rtable.sh:1.6 Tue Jul 9 02:50:24 2019
+++ src/tests/net/if_bridge/t_rtable.sh Mon Aug 19 03:22:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: t_rtable.sh,v 1.6 2019/07/09 02:50:24 ozaki-r Exp $
+# $NetBSD: t_rtable.sh,v 1.7 2019/08/19 03:22:05 ozaki-r Exp $
#
# Copyright (c) 2017 Internet Initiative Japan Inc.
# All rights reserved.
@@ -79,7 +79,7 @@ setup_bridge()
{
export RUMP_SERVER=$SOCK2
- atf_check -s exit:0 rump.ifconfig bridge0 create
+ rump_server_add_iface $SOCK2 bridge0
atf_check -s exit:0 rump.ifconfig bridge0 up
export LD_PRELOAD=/usr/lib/librumphijack.so
Index: src/tests/net/if_gif/t_gif.sh
diff -u src/tests/net/if_gif/t_gif.sh:1.12 src/tests/net/if_gif/t_gif.sh:1.13
--- src/tests/net/if_gif/t_gif.sh:1.12 Thu Feb 1 05:22:01 2018
+++ src/tests/net/if_gif/t_gif.sh Mon Aug 19 03:22:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: t_gif.sh,v 1.12 2018/02/01 05:22:01 ozaki-r Exp $
+# $NetBSD: t_gif.sh,v 1.13 2019/08/19 03:22:05 ozaki-r Exp $
#
# Copyright (c) 2015 Internet Initiative Japan Inc.
# All rights reserved.
@@ -221,7 +221,7 @@ setup_if_gif()
peernet=${7}
export RUMP_SERVER=${sock}
- atf_check -s exit:0 rump.ifconfig gif0 create
+ rump_server_add_iface $sock gif0
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}
@@ -335,7 +335,7 @@ setup_dummy_if_gif()
dst=${6}
export RUMP_SERVER=${sock}
- atf_check -s exit:0 rump.ifconfig gif1 create
+ rump_server_add_iface $sock gif1
atf_check -s exit:0 rump.ifconfig gif1 tunnel ${src} ${dst}
if [ ${inner} = "ipv6" ]; then
atf_check -s exit:0 rump.ifconfig gif1 inet6 ${addr}/128 ${remote}
@@ -422,7 +422,7 @@ setup_recursive_if_gif()
dst=${7}
export RUMP_SERVER=${sock}
- atf_check -s exit:0 rump.ifconfig ${gif} create
+ rump_server_add_iface $sock $gif
atf_check -s exit:0 rump.ifconfig ${gif} tunnel ${src} ${dst}
if [ ${inner} = "ipv6" ]; then
atf_check -s exit:0 rump.ifconfig ${gif} inet6 ${addr}/128 ${remote}
Index: src/tests/net/if_ipsec/t_ipsec.sh
diff -u src/tests/net/if_ipsec/t_ipsec.sh:1.9 src/tests/net/if_ipsec/t_ipsec.sh:1.10
--- src/tests/net/if_ipsec/t_ipsec.sh:1.9 Tue Jan 15 05:34:37 2019
+++ src/tests/net/if_ipsec/t_ipsec.sh Mon Aug 19 03:22:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: t_ipsec.sh,v 1.9 2019/01/15 05:34:37 knakahara Exp $
+# $NetBSD: t_ipsec.sh,v 1.10 2019/08/19 03:22:05 ozaki-r Exp $
#
# Copyright (c) 2017 Internet Initiative Japan Inc.
# All rights reserved.
@@ -243,7 +243,7 @@ setup_if_ipsec()
local peernet=${7}
export RUMP_SERVER=${sock}
- atf_check -s exit:0 rump.ifconfig ipsec0 create
+ rump_server_add_iface $sock ipsec0
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}
@@ -426,7 +426,7 @@ setup_dummy_if_ipsec()
local dst=${6}
export RUMP_SERVER=${sock}
- atf_check -s exit:0 rump.ifconfig ipsec1 create
+ rump_server_add_iface $sock ipsec1
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}
@@ -568,7 +568,7 @@ setup_recursive_if_ipsec()
local dir=${10}
export RUMP_SERVER=${sock}
- atf_check -s exit:0 rump.ifconfig ${ipsec} create
+ rump_server_add_iface $sock $ipsec
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}
Index: src/tests/net/if_ipsec/t_ipsec_natt.sh
diff -u src/tests/net/if_ipsec/t_ipsec_natt.sh:1.2 src/tests/net/if_ipsec/t_ipsec_natt.sh:1.3
--- src/tests/net/if_ipsec/t_ipsec_natt.sh:1.2 Wed Dec 26 08:59:41 2018
+++ src/tests/net/if_ipsec/t_ipsec_natt.sh Mon Aug 19 03:22:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: t_ipsec_natt.sh,v 1.2 2018/12/26 08:59:41 knakahara Exp $
+# $NetBSD: t_ipsec_natt.sh,v 1.3 2019/08/19 03:22:05 ozaki-r Exp $
#
# Copyright (c) 2018 Internet Initiative Japan Inc.
# All rights reserved.
@@ -61,7 +61,7 @@ setup_ipsecif()
local peer_ip=$8
export RUMP_SERVER=$sock
- atf_check -s exit:0 rump.ifconfig ipsec$ifid create
+ rump_server_add_iface $sock ipsec$ifid
atf_check -s exit:0 rump.ifconfig ipsec$ifid link0 # enable NAT-T
atf_check -s exit:0 rump.ifconfig ipsec$ifid tunnel ${src_ip},${src_port} ${dst_ip},${dst_port}
atf_check -s exit:0 rump.ifconfig ipsec$ifid ${ipsecif_ip}/32
Index: src/tests/net/if_ipsec/t_ipsec_pfil.sh
diff -u src/tests/net/if_ipsec/t_ipsec_pfil.sh:1.1 src/tests/net/if_ipsec/t_ipsec_pfil.sh:1.2
--- src/tests/net/if_ipsec/t_ipsec_pfil.sh:1.1 Thu Jan 17 02:49:11 2019
+++ src/tests/net/if_ipsec/t_ipsec_pfil.sh Mon Aug 19 03:22:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: t_ipsec_pfil.sh,v 1.1 2019/01/17 02:49:11 knakahara Exp $
+# $NetBSD: t_ipsec_pfil.sh,v 1.2 2019/08/19 03:22:05 ozaki-r Exp $
#
# Copyright (c) 2019 Internet Initiative Japan Inc.
# All rights reserved.
@@ -75,7 +75,7 @@ setup_if_ipsec()
local dst=$4
local peernet=$5
- atf_check -s exit:0 rump.ifconfig ipsec0 create
+ rump_server_add_iface $RUMP_SERVER ipsec0
atf_check -s exit:0 rump.ifconfig ipsec0 tunnel $src $dst
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
Index: src/tests/net/if_l2tp/t_l2tp.sh
diff -u src/tests/net/if_l2tp/t_l2tp.sh:1.4 src/tests/net/if_l2tp/t_l2tp.sh:1.5
--- src/tests/net/if_l2tp/t_l2tp.sh:1.4 Thu Feb 1 05:22:01 2018
+++ src/tests/net/if_l2tp/t_l2tp.sh Mon Aug 19 03:22:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: t_l2tp.sh,v 1.4 2018/02/01 05:22:01 ozaki-r Exp $
+# $NetBSD: t_l2tp.sh,v 1.5 2019/08/19 03:22:05 ozaki-r Exp $
#
# Copyright (c) 2017 Internet Initiative Japan Inc.
# All rights reserved.
@@ -227,12 +227,12 @@ setup_if_l2tp()
export RUMP_SERVER=${sock}
- atf_check -s exit:0 rump.ifconfig l2tp0 create
+ rump_server_add_iface $sock l2tp0
atf_check -s exit:0 rump.ifconfig l2tp0 tunnel ${src} ${dst}
atf_check -s exit:0 rump.ifconfig l2tp0 session ${src_session} ${dst_session}
atf_check -s exit:0 rump.ifconfig l2tp0 up
- atf_check -s exit:0 rump.ifconfig bridge0 create
+ rump_server_add_iface $sock bridge0
atf_check -s exit:0 rump.ifconfig bridge0 up
export LD_PRELOAD=/usr/lib/librumphijack.so
atf_check -s exit:0 brconfig bridge0 add shmif0
Index: src/tests/net/if_pppoe/t_pppoe.sh
diff -u src/tests/net/if_pppoe/t_pppoe.sh:1.18 src/tests/net/if_pppoe/t_pppoe.sh:1.19
--- src/tests/net/if_pppoe/t_pppoe.sh:1.18 Thu Feb 1 05:22:01 2018
+++ src/tests/net/if_pppoe/t_pppoe.sh Mon Aug 19 03:22:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: t_pppoe.sh,v 1.18 2018/02/01 05:22:01 ozaki-r Exp $
+# $NetBSD: t_pppoe.sh,v 1.19 2019/08/19 03:22:05 ozaki-r Exp $
#
# Copyright (c) 2016 Internet Initiative Japan Inc.
# All rights reserved.
@@ -79,7 +79,7 @@ setup()
export RUMP_SERVER=$SERVER
atf_check -s exit:0 rump.ifconfig shmif0 up
- atf_check -s exit:0 rump.ifconfig pppoe0 create
+ rump_server_add_iface $SERVER pppoe0
$inet && atf_check -s exit:0 rump.ifconfig pppoe0 \
inet $SERVER_IP $CLIENT_IP down
atf_check -s exit:0 rump.ifconfig pppoe0 link0
@@ -93,7 +93,7 @@ setup()
export RUMP_SERVER=$CLIENT
atf_check -s exit:0 rump.ifconfig shmif0 up
- atf_check -s exit:0 rump.ifconfig pppoe0 create
+ rump_server_add_iface $CLIENT pppoe0
$inet && atf_check -s exit:0 rump.ifconfig pppoe0 \
inet 0.0.0.0 0.0.0.1 down
Index: src/tests/net/if_tap/t_tap.sh
diff -u src/tests/net/if_tap/t_tap.sh:1.9 src/tests/net/if_tap/t_tap.sh:1.10
--- src/tests/net/if_tap/t_tap.sh:1.9 Mon May 13 17:55:08 2019
+++ src/tests/net/if_tap/t_tap.sh Mon Aug 19 03:22:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: t_tap.sh,v 1.9 2019/05/13 17:55:08 bad Exp $
+# $NetBSD: t_tap.sh,v 1.10 2019/08/19 03:22:05 ozaki-r Exp $
#
# Copyright (c) 2016 Internet Initiative Japan Inc.
# All rights reserved.
@@ -97,7 +97,7 @@ tap_stand_alone_body()
export RUMP_SERVER=${SOCK_LOCAL}
atf_check -s exit:0 rump.ifconfig shmif0 $IP4_LOCAL delete
atf_check -s exit:0 rump.ifconfig shmif0 inet6 $IP6_LOCAL delete
- atf_check -s exit:0 rump.ifconfig tap0 create
+ rump_server_add_iface $SOCK_LOCAL tap0
atf_check -s exit:0 rump.ifconfig tap0 $IP4_TAP
atf_check -s exit:0 rump.ifconfig tap0 inet6 $IP6_TAP
atf_check -s exit:0 rump.ifconfig tap0 up
@@ -142,13 +142,13 @@ tap_bridged_body()
atf_check -s exit:0 rump.ifconfig shmif0 $IP4_LOCAL
atf_check -s exit:0 rump.ifconfig shmif0 inet6 $IP6_LOCAL
atf_check -s exit:0 rump.ifconfig shmif0 up
- atf_check -s exit:0 rump.ifconfig tap0 create
+ rump_server_add_iface $SOCK_LOCAL tap0
atf_check -s exit:0 rump.ifconfig tap0 $IP4_TAP
atf_check -s exit:0 rump.ifconfig tap0 inet6 $IP6_TAP
atf_check -s exit:0 rump.ifconfig tap0 up
atf_check -s exit:0 rump.ifconfig -w 10
- atf_check -s exit:0 rump.ifconfig bridge0 create
+ rump_server_add_iface $SOCK_LOCAL bridge0
atf_check -s exit:0 rump.ifconfig bridge0 up
export LD_PRELOAD=/usr/lib/librumphijack.so
atf_check -s exit:0 brconfig bridge0 add shmif0
Index: src/tests/net/ipsec/t_ipsec_gif.sh
diff -u src/tests/net/ipsec/t_ipsec_gif.sh:1.7 src/tests/net/ipsec/t_ipsec_gif.sh:1.8
--- src/tests/net/ipsec/t_ipsec_gif.sh:1.7 Thu Aug 3 03:16:27 2017
+++ src/tests/net/ipsec/t_ipsec_gif.sh Mon Aug 19 03:22:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: t_ipsec_gif.sh,v 1.7 2017/08/03 03:16:27 ozaki-r Exp $
+# $NetBSD: t_ipsec_gif.sh,v 1.8 2019/08/19 03:22:05 ozaki-r Exp $
#
# Copyright (c) 2017 Internet Initiative Japan Inc.
# All rights reserved.
@@ -98,7 +98,7 @@ test_ipsec4_gif()
export RUMP_SERVER=$SOCK_TUN_LOCAL
atf_check -s exit:0 rump.ifconfig shmif0 $ip_gw_local/24
atf_check -s exit:0 rump.ifconfig shmif1 $ip_gwlo_tun/24
- atf_check -s exit:0 rump.ifconfig gif0 create
+ rump_server_add_iface $SOCK_TUN_LOCAL gif0
atf_check -s exit:0 rump.ifconfig gif0 \
tunnel $ip_gwlo_tun $ip_gwre_tun
atf_check -s exit:0 rump.ifconfig gif0 \
@@ -110,7 +110,7 @@ test_ipsec4_gif()
export RUMP_SERVER=$SOCK_TUN_REMOTE
atf_check -s exit:0 rump.ifconfig shmif0 $ip_gw_remote/24
atf_check -s exit:0 rump.ifconfig shmif1 $ip_gwre_tun/24
- atf_check -s exit:0 rump.ifconfig gif0 create
+ rump_server_add_iface $SOCK_TUN_REMOTE gif0
atf_check -s exit:0 rump.ifconfig gif0 \
tunnel $ip_gwre_tun $ip_gwlo_tun
atf_check -s exit:0 rump.ifconfig gif0 \
@@ -250,7 +250,7 @@ test_ipsec6_gif()
export RUMP_SERVER=$SOCK_TUN_LOCAL
atf_check -s exit:0 rump.ifconfig shmif0 inet6 $ip_gw_local/64
atf_check -s exit:0 rump.ifconfig shmif1 inet6 $ip_gwlo_tun/64
- atf_check -s exit:0 rump.ifconfig gif0 create
+ rump_server_add_iface $SOCK_TUN_LOCAL gif0
atf_check -s exit:0 rump.ifconfig gif0 \
tunnel $ip_gwlo_tun $ip_gwre_tun
atf_check -s exit:0 rump.ifconfig gif0 \
@@ -262,7 +262,7 @@ test_ipsec6_gif()
export RUMP_SERVER=$SOCK_TUN_REMOTE
atf_check -s exit:0 rump.ifconfig shmif0 inet6 $ip_gw_remote/64
atf_check -s exit:0 rump.ifconfig shmif1 inet6 $ip_gwre_tun/64
- atf_check -s exit:0 rump.ifconfig gif0 create
+ rump_server_add_iface $SOCK_TUN_REMOTE gif0
atf_check -s exit:0 rump.ifconfig gif0 \
tunnel $ip_gwre_tun $ip_gwlo_tun
atf_check -s exit:0 rump.ifconfig gif0 \
Index: src/tests/net/ipsec/t_ipsec_l2tp.sh
diff -u src/tests/net/ipsec/t_ipsec_l2tp.sh:1.7 src/tests/net/ipsec/t_ipsec_l2tp.sh:1.8
--- src/tests/net/ipsec/t_ipsec_l2tp.sh:1.7 Thu Aug 3 03:16:27 2017
+++ src/tests/net/ipsec/t_ipsec_l2tp.sh Mon Aug 19 03:22:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: t_ipsec_l2tp.sh,v 1.7 2017/08/03 03:16:27 ozaki-r Exp $
+# $NetBSD: t_ipsec_l2tp.sh,v 1.8 2019/08/19 03:22:05 ozaki-r Exp $
#
# Copyright (c) 2017 Internet Initiative Japan Inc.
# All rights reserved.
@@ -96,12 +96,12 @@ test_ipsec4_l2tp()
export RUMP_SERVER=$SOCK_TUN_LOCAL
atf_check -s exit:0 rump.ifconfig shmif0 up
atf_check -s exit:0 rump.ifconfig shmif1 $ip_gwlo_tun/24
- atf_check -s exit:0 rump.ifconfig l2tp0 create
+ rump_server_add_iface $SOCK_TUN_LOCAL l2tp0
atf_check -s exit:0 rump.ifconfig l2tp0 \
tunnel $ip_gwlo_tun $ip_gwre_tun
atf_check -s exit:0 rump.ifconfig l2tp0 session 1234 4321
atf_check -s exit:0 rump.ifconfig l2tp0 up
- atf_check -s exit:0 rump.ifconfig bridge0 create
+ rump_server_add_iface $SOCK_TUN_LOCAL bridge0
atf_check -s exit:0 rump.ifconfig bridge0 up
atf_check -s exit:0 $HIJACKING brconfig bridge0 add l2tp0
atf_check -s exit:0 $HIJACKING brconfig bridge0 add shmif0
@@ -109,12 +109,12 @@ test_ipsec4_l2tp()
export RUMP_SERVER=$SOCK_TUN_REMOTE
atf_check -s exit:0 rump.ifconfig shmif0 up
atf_check -s exit:0 rump.ifconfig shmif1 $ip_gwre_tun/24
- atf_check -s exit:0 rump.ifconfig l2tp0 create
+ rump_server_add_iface $SOCK_TUN_REMOTE l2tp0
atf_check -s exit:0 rump.ifconfig l2tp0 \
tunnel $ip_gwre_tun $ip_gwlo_tun
atf_check -s exit:0 rump.ifconfig l2tp0 session 4321 1234
atf_check -s exit:0 rump.ifconfig l2tp0 up
- atf_check -s exit:0 rump.ifconfig bridge0 create
+ rump_server_add_iface $SOCK_TUN_REMOTE bridge0
atf_check -s exit:0 rump.ifconfig bridge0 up
atf_check -s exit:0 $HIJACKING brconfig bridge0 add l2tp0
atf_check -s exit:0 $HIJACKING brconfig bridge0 add shmif0
@@ -238,12 +238,12 @@ test_ipsec6_l2tp()
export RUMP_SERVER=$SOCK_TUN_LOCAL
atf_check -s exit:0 rump.ifconfig shmif0 up
atf_check -s exit:0 rump.ifconfig shmif1 inet6 $ip_gwlo_tun/64
- atf_check -s exit:0 rump.ifconfig l2tp0 create
+ rump_server_add_iface $SOCK_TUN_LOCAL l2tp0
atf_check -s exit:0 rump.ifconfig l2tp0 \
tunnel $ip_gwlo_tun $ip_gwre_tun
atf_check -s exit:0 rump.ifconfig l2tp0 session 1234 4321
atf_check -s exit:0 rump.ifconfig l2tp0 up
- atf_check -s exit:0 rump.ifconfig bridge0 create
+ rump_server_add_iface $SOCK_TUN_LOCAL bridge0
atf_check -s exit:0 rump.ifconfig bridge0 up
atf_check -s exit:0 $HIJACKING brconfig bridge0 add l2tp0
atf_check -s exit:0 $HIJACKING brconfig bridge0 add shmif0
@@ -251,12 +251,12 @@ test_ipsec6_l2tp()
export RUMP_SERVER=$SOCK_TUN_REMOTE
atf_check -s exit:0 rump.ifconfig shmif0 up
atf_check -s exit:0 rump.ifconfig shmif1 inet6 $ip_gwre_tun/64
- atf_check -s exit:0 rump.ifconfig l2tp0 create
+ rump_server_add_iface $SOCK_TUN_REMOTE l2tp0
atf_check -s exit:0 rump.ifconfig l2tp0 \
tunnel $ip_gwre_tun $ip_gwlo_tun
atf_check -s exit:0 rump.ifconfig l2tp0 session 4321 1234
atf_check -s exit:0 rump.ifconfig l2tp0 up
- atf_check -s exit:0 rump.ifconfig bridge0 create
+ rump_server_add_iface $SOCK_TUN_REMOTE bridge0
atf_check -s exit:0 rump.ifconfig bridge0 up
atf_check -s exit:0 $HIJACKING brconfig bridge0 add l2tp0
atf_check -s exit:0 $HIJACKING brconfig bridge0 add shmif0
Index: src/tests/net/ipsec/t_ipsec_natt.sh
diff -u src/tests/net/ipsec/t_ipsec_natt.sh:1.2 src/tests/net/ipsec/t_ipsec_natt.sh:1.3
--- src/tests/net/ipsec/t_ipsec_natt.sh:1.2 Thu Nov 22 04:51:41 2018
+++ src/tests/net/ipsec/t_ipsec_natt.sh Mon Aug 19 03:22:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: t_ipsec_natt.sh,v 1.2 2018/11/22 04:51:41 knakahara Exp $
+# $NetBSD: t_ipsec_natt.sh,v 1.3 2019/08/19 03:22:05 ozaki-r Exp $
#
# Copyright (c) 2017 Internet Initiative Japan Inc.
# All rights reserved.
@@ -402,7 +402,7 @@ test_ipsec_natt_transport_ipv6_without_n
# Create ESP-UDP ipsecif(4) connections
export RUMP_SERVER=$SOCK_LOCAL
- atf_check -s exit:0 rump.ifconfig ipsec0 create
+ rump_server_add_iface $SOCK_LOCAL ipsec0
atf_check -s exit:0 rump.ifconfig ipsec0 link0 # enable nat-t
atf_check -s exit:0 rump.ifconfig ipsec0 link2 # ensure IPv6 forward
atf_check -s exit:0 rump.ifconfig ipsec0 tunnel $ip_local_phys $ip_remote_phys
@@ -415,7 +415,7 @@ test_ipsec_natt_transport_ipv6_without_n
$ip_local_phys 10000 $port
export RUMP_SERVER=$SOCK_REMOTE
- atf_check -s exit:0 rump.ifconfig ipsec0 create
+ rump_server_add_iface $SOCK_REMOTE ipsec0
atf_check -s exit:0 rump.ifconfig ipsec0 link0 # enable nat-t
atf_check -s exit:0 rump.ifconfig ipsec0 link2 # ensure IPv6 forward
atf_check -s exit:0 rump.ifconfig ipsec0 tunnel $ip_remote_phys $ip_local_phys
