Module Name: src
Committed By: knakahara
Date: Fri Nov 25 08:43:16 UTC 2022
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/net/if_gif: Makefile
src/tests/net/if_ipsec: Makefile
src/tests/net/if_pppoe: Makefile
Added Files:
src/tests/net/if_gif: t_gif_unnumbered.sh
src/tests/net/if_ipsec: t_ipsec_unnumbered.sh
src/tests/net/if_pppoe: t_pppoe_unnumbered.sh
Log Message:
Add ATF for unnumbered interfaces.
To generate a diff of this commit:
cvs rdiff -u -r1.1235 -r1.1236 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.2 -r1.3 src/tests/net/if_gif/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/net/if_gif/t_gif_unnumbered.sh
cvs rdiff -u -r1.3 -r1.4 src/tests/net/if_ipsec/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/net/if_ipsec/t_ipsec_unnumbered.sh
cvs rdiff -u -r1.3 -r1.4 src/tests/net/if_pppoe/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/net/if_pppoe/t_pppoe_unnumbered.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.1235 src/distrib/sets/lists/tests/mi:1.1236
--- src/distrib/sets/lists/tests/mi:1.1235 Tue Nov 22 17:35:45 2022
+++ src/distrib/sets/lists/tests/mi Fri Nov 25 08:43:15 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1235 2022/11/22 17:35:45 jakllsch Exp $
+# $NetBSD: mi,v 1.1236 2022/11/25 08:43:15 knakahara Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -4165,12 +4165,14 @@
./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_gif/t_gif_unnumbered tests-net-tests atf,rump
./usr/tests/net/if_ipsec tests-net-tests compattestfile,atf
./usr/tests/net/if_ipsec/Atffile tests-net-tests atf,rump
./usr/tests/net/if_ipsec/Kyuafile tests-net-tests atf,rump,kyua
./usr/tests/net/if_ipsec/t_ipsec tests-net-tests atf,rump
./usr/tests/net/if_ipsec/t_ipsec_natt tests-net-tests atf,rump
./usr/tests/net/if_ipsec/t_ipsec_pfil tests-net-tests atf,rump
+./usr/tests/net/if_ipsec/t_ipsec_unnumbered tests-net-tests atf,rump
./usr/tests/net/if_l2tp tests-net-tests compattestfile,atf
./usr/tests/net/if_l2tp/Atffile tests-net-tests atf,rump
./usr/tests/net/if_l2tp/Kyuafile tests-net-tests atf,rump,kyua
@@ -4188,6 +4190,7 @@
./usr/tests/net/if_pppoe/Atffile tests-net-tests atf,rump
./usr/tests/net/if_pppoe/Kyuafile tests-net-tests atf,rump,kyua
./usr/tests/net/if_pppoe/t_pppoe tests-net-tests atf,rump
+./usr/tests/net/if_pppoe/t_pppoe_unnumbered tests-net-tests atf,rump
./usr/tests/net/if_tap tests-net-tests compattestfile,atf
./usr/tests/net/if_tap/Atffile tests-net-tests atf,rump
./usr/tests/net/if_tap/Kyuafile tests-net-tests atf,rump,kyua
Index: src/tests/net/if_gif/Makefile
diff -u src/tests/net/if_gif/Makefile:1.2 src/tests/net/if_gif/Makefile:1.3
--- src/tests/net/if_gif/Makefile:1.2 Thu Nov 24 09:03:53 2016
+++ src/tests/net/if_gif/Makefile Fri Nov 25 08:43:16 2022
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2016/11/24 09:03:53 ozaki-r Exp $
+# $NetBSD: Makefile,v 1.3 2022/11/25 08:43:16 knakahara Exp $
#
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/net/if_gif
-.for name in gif
+.for name in gif gif_unnumbered
TESTS_SH+= t_${name}
TESTS_SH_SRC_t_${name}= ../net_common.sh t_${name}.sh
.endfor
Index: src/tests/net/if_ipsec/Makefile
diff -u src/tests/net/if_ipsec/Makefile:1.3 src/tests/net/if_ipsec/Makefile:1.4
--- src/tests/net/if_ipsec/Makefile:1.3 Thu Jan 17 02:49:11 2019
+++ src/tests/net/if_ipsec/Makefile Fri Nov 25 08:43:16 2022
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2019/01/17 02:49:11 knakahara Exp $
+# $NetBSD: Makefile,v 1.4 2022/11/25 08:43:16 knakahara Exp $
#
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/net/if_ipsec
-.for name in ipsec ipsec_natt ipsec_pfil
+.for name in ipsec ipsec_natt ipsec_pfil ipsec_unnumbered
TESTS_SH+= t_${name}
TESTS_SH_SRC_t_${name}= ../net_common.sh t_${name}.sh \
../ipsec/common.sh ../ipsec/algorithms.sh
Index: src/tests/net/if_pppoe/Makefile
diff -u src/tests/net/if_pppoe/Makefile:1.3 src/tests/net/if_pppoe/Makefile:1.4
--- src/tests/net/if_pppoe/Makefile:1.3 Thu Nov 24 09:03:53 2016
+++ src/tests/net/if_pppoe/Makefile Fri Nov 25 08:43:16 2022
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2016/11/24 09:03:53 ozaki-r Exp $
+# $NetBSD: Makefile,v 1.4 2022/11/25 08:43:16 knakahara Exp $
#
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/net/if_pppoe
-.for name in pppoe
+.for name in pppoe pppoe_unnumbered
TESTS_SH+= t_${name}
TESTS_SH_SRC_t_${name}= ../net_common.sh t_${name}.sh
.endfor
Added files:
Index: src/tests/net/if_gif/t_gif_unnumbered.sh
diff -u /dev/null src/tests/net/if_gif/t_gif_unnumbered.sh:1.1
--- /dev/null Fri Nov 25 08:43:16 2022
+++ src/tests/net/if_gif/t_gif_unnumbered.sh Fri Nov 25 08:43:16 2022
@@ -0,0 +1,225 @@
+# $NetBSD: t_gif_unnumbered.sh,v 1.1 2022/11/25 08:43:16 knakahara Exp $
+#
+# Copyright (c) 2022 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.
+#
+
+SOCK_LOCAL=unix://gif_local
+SOCK_REMOTE=unix://gif_remote
+BUS_LOCAL_I=./bus_gif_local_inner
+BUS_REMOTE_I=./bus_gif_remote_inner
+BUS_GLOBAL=./bus_gif_global
+
+DEBUG=${DEBUG:-false}
+TIMEOUT=5
+
+setup_servers_ipv4()
+{
+
+ rump_server_start $SOCK_LOCAL gif
+ rump_server_start $SOCK_REMOTE gif
+ rump_server_add_iface $SOCK_LOCAL shmif0 $BUS_GLOBAL
+ rump_server_add_iface $SOCK_LOCAL shmif1 $BUS_LOCAL_I
+ rump_server_add_iface $SOCK_REMOTE shmif0 $BUS_GLOBAL
+ rump_server_add_iface $SOCK_REMOTE shmif1 $BUS_REMOTE_I
+}
+
+setup_servers_ipv6()
+{
+
+ rump_server_start $SOCK_LOCAL netinet6 gif
+ rump_server_start $SOCK_REMOTE netinet6 gif
+ rump_server_add_iface $SOCK_LOCAL shmif0 $BUS_GLOBAL
+ rump_server_add_iface $SOCK_LOCAL shmif1 $BUS_LOCAL_I
+ rump_server_add_iface $SOCK_REMOTE shmif0 $BUS_GLOBAL
+ rump_server_add_iface $SOCK_REMOTE shmif1 $BUS_REMOTE_I
+}
+
+setup_servers()
+{
+ local proto=$1
+
+ setup_servers_$proto
+}
+
+test_gif_unnumbered_ipv4()
+{
+ local ip_local_i=192.168.22.1
+ local ip_local_i_subnet=192.168.22.0/24
+ local ip_local_o=10.0.0.2
+ local ip_remote_i=192.168.33.1
+ local ip_remote_i_subnet=192.168.33.0/24
+ local ip_remote_o=10.0.0.3
+ local outfile=./out
+
+ setup_servers ipv4
+
+ export RUMP_SERVER=$SOCK_LOCAL
+ atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.dad_count=0
+ atf_check -s exit:0 rump.ifconfig shmif0 $ip_local_o/24
+ atf_check -s exit:0 rump.ifconfig shmif1 $ip_local_i/24
+
+ export RUMP_SERVER=$SOCK_REMOTE
+ atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.dad_count=0
+ atf_check -s exit:0 rump.ifconfig shmif0 $ip_remote_o/24
+ atf_check -s exit:0 rump.ifconfig shmif1 $ip_remote_i/24
+
+ export RUMP_SERVER=$SOCK_LOCAL
+ atf_check -s exit:0 -o ignore rump.ping -c 1 -n -w $TIMEOUT $ip_remote_o
+
+ # setup gif(4) as unnumbered for local
+ export RUMP_SERVER=$SOCK_LOCAL
+ atf_check -s exit:0 -o ignore rump.ifconfig gif0 create
+ atf_check -s exit:0 -o ignore \
+ rump.ifconfig gif0 tunnel $ip_local_o $ip_remote_o
+ atf_check -s exit:0 -o ignore rump.ifconfig gif0 unnumbered
+ atf_check -s exit:0 -o ignore rump.ifconfig gif0 $ip_local_i/32
+ atf_check -s exit:0 -o ignore \
+ rump.route add -inet $ip_remote_i_subnet -ifp gif0 $ip_local_i
+ $DEBUG && rump.ifconfig -v gif0
+ $DEBUG && rump.route -nL show
+
+ # setup gif(4) as unnumbered for remote
+ export RUMP_SERVER=$SOCK_REMOTE
+ atf_check -s exit:0 -o ignore rump.ifconfig gif0 create
+ atf_check -s exit:0 -o ignore \
+ rump.ifconfig gif0 tunnel $ip_remote_o $ip_local_o
+ atf_check -s exit:0 -o ignore rump.ifconfig gif0 unnumbered
+ atf_check -s exit:0 -o ignore rump.ifconfig gif0 $ip_remote_i/32
+ atf_check -s exit:0 -o ignore \
+ rump.route add -inet $ip_local_i_subnet -ifp gif0 $ip_remote_i
+ $DEBUG && rump.ifconfig -v gif0
+ $DEBUG && rump.route -nL show
+
+ # test unnumbered gif(4)
+ extract_new_packets $BUS_GLOBAL > $outfile
+ export RUMP_SERVER=$SOCK_LOCAL
+ atf_check -s exit:0 -o ignore \
+ rump.ping -c 1 -n -w $TIMEOUT -I $ip_local_i $ip_remote_i
+ extract_new_packets $BUS_GLOBAL > $outfile
+ $DEBUG && cat $outfile
+ atf_check -s exit:0 \
+ -o match:"$ip_local_o > $ip_remote_o: $ip_local_i > $ip_remote_i: ICMP echo request" \
+ cat $outfile
+ atf_check -s exit:0 \
+ -o match:"$ip_remote_o > $ip_local_o: $ip_remote_i > $ip_local_i: ICMP echo reply" \
+ cat $outfile
+}
+
+test_gif_unnumbered_ipv6()
+{
+ local ip_local_i=192.168.22.1
+ local ip_local_i_subnet=192.168.22.0/24
+ local ip_local_o=fc00::2
+ local ip_remote_i=192.168.33.1
+ local ip_remote_i_subnet=192.168.33.0/24
+ local ip_remote_o=fc00::3
+ local outfile=./out
+
+ setup_servers ipv6
+
+ export RUMP_SERVER=$SOCK_LOCAL
+ atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.dad_count=0
+ atf_check -s exit:0 rump.sysctl -q -w net.inet6.ip6.dad_count=0
+ atf_check -s exit:0 rump.ifconfig shmif0 inet6 $ip_local_o/64
+ atf_check -s exit:0 rump.ifconfig shmif1 $ip_local_i/24
+
+ export RUMP_SERVER=$SOCK_REMOTE
+ atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.dad_count=0
+ atf_check -s exit:0 rump.sysctl -q -w net.inet6.ip6.dad_count=0
+ atf_check -s exit:0 rump.ifconfig shmif0 inet6 $ip_remote_o/64
+ atf_check -s exit:0 rump.ifconfig shmif1 $ip_remote_i/24
+
+ export RUMP_SERVER=$SOCK_LOCAL
+ atf_check -s exit:0 -o ignore rump.ping6 -c 1 -n -X $TIMEOUT $ip_remote_o
+
+ # setup gif(4) as unnumbered for local
+ export RUMP_SERVER=$SOCK_LOCAL
+ atf_check -s exit:0 -o ignore rump.ifconfig gif0 create
+ atf_check -s exit:0 -o ignore \
+ rump.ifconfig gif0 tunnel $ip_local_o $ip_remote_o
+ atf_check -s exit:0 -o ignore rump.ifconfig gif0 unnumbered
+ atf_check -s exit:0 -o ignore rump.ifconfig gif0 $ip_local_i/32
+ atf_check -s exit:0 -o ignore \
+ rump.route add -inet $ip_remote_i_subnet -ifp gif0 $ip_local_i
+ $DEBUG && rump.ifconfig -v gif0
+ $DEBUG && rump.route -nL show
+
+ # setup gif(4) as unnumbered for remote
+ export RUMP_SERVER=$SOCK_REMOTE
+ atf_check -s exit:0 -o ignore rump.ifconfig gif0 create
+ atf_check -s exit:0 -o ignore \
+ rump.ifconfig gif0 tunnel $ip_remote_o $ip_local_o
+ atf_check -s exit:0 -o ignore rump.ifconfig gif0 unnumbered
+ atf_check -s exit:0 -o ignore rump.ifconfig gif0 $ip_remote_i/32
+ atf_check -s exit:0 -o ignore \
+ rump.route add -inet $ip_local_i_subnet -ifp gif0 $ip_remote_i
+ $DEBUG && rump.ifconfig -v gif0
+ $DEBUG && rump.route -nL show
+
+ # test unnumbered gif(4)
+ extract_new_packets $BUS_GLOBAL > $outfile
+ export RUMP_SERVER=$SOCK_LOCAL
+ atf_check -s exit:0 -o ignore \
+ rump.ping -c 1 -n -w $TIMEOUT -I $ip_local_i $ip_remote_i
+ extract_new_packets $BUS_GLOBAL > $outfile
+ $DEBUG && cat $outfile
+ atf_check -s exit:0 \
+ -o match:"$ip_local_o > $ip_remote_o: $ip_local_i > $ip_remote_i: ICMP echo request" \
+ cat $outfile
+ atf_check -s exit:0 \
+ -o match:"$ip_remote_o > $ip_local_o: $ip_remote_i > $ip_local_i: ICMP echo reply" \
+ cat $outfile
+}
+
+add_test_gif_unnumbered()
+{
+ outer=$1
+
+ name="gif_unnumbered_over${outer}"
+ desc="Does unnumbered gif over ${outer}"
+
+ atf_test_case ${name} cleanup
+ eval "
+ ${name}_head() {
+ atf_set descr \"${desc}\"
+ atf_set require.progs rump_server
+ }
+ ${name}_body() {
+ test_gif_unnumbered_${outer}
+ rump_server_destroy_ifaces
+ }
+ ${name}_cleanup() {
+ \$DEBUG && dump
+ cleanup
+ }"
+ atf_add_test_case ${name}
+}
+
+atf_init_test_cases()
+{
+
+ add_test_gif_unnumbered ipv4
+ add_test_gif_unnumbered ipv6
+}
Index: src/tests/net/if_ipsec/t_ipsec_unnumbered.sh
diff -u /dev/null src/tests/net/if_ipsec/t_ipsec_unnumbered.sh:1.1
--- /dev/null Fri Nov 25 08:43:16 2022
+++ src/tests/net/if_ipsec/t_ipsec_unnumbered.sh Fri Nov 25 08:43:16 2022
@@ -0,0 +1,277 @@
+# $NetBSD: t_ipsec_unnumbered.sh,v 1.1 2022/11/25 08:43:16 knakahara Exp $
+#
+# Copyright (c) 2022 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.
+#
+
+SOCK_LOCAL=unix://ipsec_local
+SOCK_REMOTE=unix://ipsec_remote
+BUS_LOCAL_I=./bus_ipsec_local_inner
+BUS_REMOTE_I=./bus_ipsec_remote_inner
+BUS_GLOBAL=./bus_ipsec_global
+
+DEBUG=${DEBUG:-false}
+TIMEOUT=7
+
+setup_servers_ipv4()
+{
+
+ rump_server_crypto_start $SOCK_LOCAL netipsec ipsec
+ rump_server_crypto_start $SOCK_REMOTE netipsec ipsec
+ rump_server_add_iface $SOCK_LOCAL shmif0 $BUS_GLOBAL
+ rump_server_add_iface $SOCK_LOCAL shmif1 $BUS_LOCAL_I
+ rump_server_add_iface $SOCK_REMOTE shmif0 $BUS_GLOBAL
+ rump_server_add_iface $SOCK_REMOTE shmif1 $BUS_REMOTE_I
+}
+
+setup_servers_ipv6()
+{
+
+ rump_server_crypto_start $SOCK_LOCAL netipsec netinet6 ipsec
+ rump_server_crypto_start $SOCK_REMOTE netipsec netinet6 ipsec
+ rump_server_add_iface $SOCK_LOCAL shmif0 $BUS_GLOBAL
+ rump_server_add_iface $SOCK_LOCAL shmif1 $BUS_LOCAL_I
+ rump_server_add_iface $SOCK_REMOTE shmif0 $BUS_GLOBAL
+ rump_server_add_iface $SOCK_REMOTE shmif1 $BUS_REMOTE_I
+}
+
+setup_servers()
+{
+ local proto=$1
+
+ setup_servers_$proto
+}
+
+add_sa()
+{
+ local outer=$1
+ local proto=$2
+ local algo="$3"
+ local src=$4
+ local dst=$5
+ local tmpfile=./tmp
+ local spi=10000
+ local algo_args="$(generate_algo_args esp $algo)"
+ local uniq=8200 # 8192(reqid_base) + 2 * 4(lo0, shmif0, shmif1 and ipsec0)
+
+ export RUMP_SERVER=$SOCK_LOCAL
+ cat > $tmpfile <<-EOF
+ add $src $dst $proto $((spi)) -u $uniq -m transport $algo_args;
+ add $dst $src $proto $((spi + 1)) -u $uniq -m transport $algo_args;
+ EOF
+ $DEBUG && cat $tmpfile
+ atf_check -s exit:0 -o empty $HIJACKING setkey -c < $tmpfile
+ $DEBUG && $HIJACKING setkey -D
+ # XXX it can be expired if $lifetime is very short
+ #check_sa_entries $SOCK_LOCAL $ip_local $ip_remote
+
+ export RUMP_SERVER=$SOCK_REMOTE
+ cat > $tmpfile <<-EOF
+ add $src $dst $proto $((spi)) -u $uniq -m transport $algo_args;
+ add $dst $src $proto $((spi + 1)) -u $uniq -m transport $algo_args;
+ EOF
+ $DEBUG && cat $tmpfile
+ atf_check -s exit:0 -o empty $HIJACKING setkey -c < $tmpfile
+ $DEBUG && $HIJACKING setkey -D
+}
+
+test_ipsecif_unnumbered_ipv4()
+{
+ local algo=$1
+ local ip_local_i=192.168.22.1
+ local ip_local_i_subnet=192.168.22.0/24
+ local ip_local_o=10.0.0.2
+ local ip_remote_i=192.168.33.1
+ local ip_remote_i_subnet=192.168.33.0/24
+ local ip_remote_o=10.0.0.3
+ local outfile=./out
+
+ setup_servers ipv4
+
+ export RUMP_SERVER=$SOCK_LOCAL
+ atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.dad_count=0
+ atf_check -s exit:0 rump.sysctl -q -w net.ipsecif.use_fixed_reqid=1
+ atf_check -s exit:0 rump.ifconfig shmif0 $ip_local_o/24
+ atf_check -s exit:0 rump.ifconfig shmif1 $ip_local_i/24
+
+ export RUMP_SERVER=$SOCK_REMOTE
+ atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.dad_count=0
+ atf_check -s exit:0 rump.sysctl -q -w net.ipsecif.use_fixed_reqid=1
+ atf_check -s exit:0 rump.ifconfig shmif0 $ip_remote_o/24
+ atf_check -s exit:0 rump.ifconfig shmif1 $ip_remote_i/24
+
+ export RUMP_SERVER=$SOCK_LOCAL
+ atf_check -s exit:0 -o ignore rump.ping -c 1 -n -w $TIMEOUT $ip_remote_o
+
+ # setup ipsecif(4) as unnumbered for local
+ export RUMP_SERVER=$SOCK_LOCAL
+ atf_check -s exit:0 -o ignore rump.ifconfig ipsec0 create
+ atf_check -s exit:0 -o ignore \
+ rump.ifconfig ipsec0 tunnel $ip_local_o $ip_remote_o
+ atf_check -s exit:0 -o ignore rump.ifconfig ipsec0 unnumbered
+ atf_check -s exit:0 -o ignore rump.ifconfig ipsec0 $ip_local_i/32
+ atf_check -s exit:0 -o ignore \
+ rump.route add -inet $ip_remote_i_subnet -ifp ipsec0 $ip_local_i
+ $DEBUG && rump.ifconfig -v ipsec0
+ $DEBUG && $HIJACKING setkey -DP
+ $DEBUG && rump.route -nL show
+
+ # setup ipsecif(4) as unnumbered for remote
+ export RUMP_SERVER=$SOCK_REMOTE
+ atf_check -s exit:0 -o ignore rump.ifconfig ipsec0 create
+ atf_check -s exit:0 -o ignore \
+ rump.ifconfig ipsec0 tunnel $ip_remote_o $ip_local_o
+ atf_check -s exit:0 -o ignore rump.ifconfig ipsec0 unnumbered
+ atf_check -s exit:0 -o ignore rump.ifconfig ipsec0 $ip_remote_i/32
+ atf_check -s exit:0 -o ignore \
+ rump.route add -inet $ip_local_i_subnet -ifp ipsec0 $ip_remote_i
+ $DEBUG && rump.ifconfig -v ipsec0
+ $DEBUG && $HIJACKING setkey -DP
+ $DEBUG && rump.route -nL show
+
+ add_sa ipv4 esp $algo $ip_local_o $ip_remote_o
+
+ # test unnumbered ipsecif(4)
+ extract_new_packets $BUS_GLOBAL > $outfile
+ export RUMP_SERVER=$SOCK_LOCAL
+ atf_check -s exit:0 -o ignore \
+ rump.ping -c 1 -n -w $TIMEOUT -I $ip_local_i $ip_remote_i
+ extract_new_packets $BUS_GLOBAL > $outfile
+ $DEBUG && cat $outfile
+ atf_check -s exit:0 \
+ -o match:"$ip_local_o > $ip_remote_o: ESP" \
+ cat $outfile
+ atf_check -s exit:0 \
+ -o match:"$ip_remote_o > $ip_local_o: ESP" \
+ cat $outfile
+}
+
+test_ipsecif_unnumbered_ipv6()
+{
+ local algo=$1
+ local ip_local_i=192.168.22.1
+ local ip_local_i_subnet=192.168.22.0/24
+ local ip_local_o=fc00::2
+ local ip_remote_i=192.168.33.1
+ local ip_remote_i_subnet=192.168.33.0/24
+ local ip_remote_o=fc00::3
+ local outfile=./out
+
+ setup_servers ipv6
+
+ export RUMP_SERVER=$SOCK_LOCAL
+ atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.dad_count=0
+ atf_check -s exit:0 rump.sysctl -q -w net.inet6.ip6.dad_count=0
+ atf_check -s exit:0 rump.sysctl -q -w net.ipsecif.use_fixed_reqid=1
+ atf_check -s exit:0 rump.ifconfig shmif0 inet6 $ip_local_o/64
+ atf_check -s exit:0 rump.ifconfig shmif1 $ip_local_i/24
+
+ export RUMP_SERVER=$SOCK_REMOTE
+ atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.dad_count=0
+ atf_check -s exit:0 rump.sysctl -q -w net.inet6.ip6.dad_count=0
+ atf_check -s exit:0 rump.sysctl -q -w net.ipsecif.use_fixed_reqid=1
+ atf_check -s exit:0 rump.ifconfig shmif0 inet6 $ip_remote_o/64
+ atf_check -s exit:0 rump.ifconfig shmif1 $ip_remote_i/24
+
+ export RUMP_SERVER=$SOCK_LOCAL
+ atf_check -s exit:0 -o ignore rump.ping6 -c 1 -n -X $TIMEOUT $ip_remote_o
+
+ # setup ipsecif(4) as unnumbered for local
+ export RUMP_SERVER=$SOCK_LOCAL
+ atf_check -s exit:0 -o ignore rump.ifconfig ipsec0 create
+ atf_check -s exit:0 -o ignore \
+ rump.ifconfig ipsec0 tunnel $ip_local_o $ip_remote_o
+ atf_check -s exit:0 -o ignore rump.ifconfig ipsec0 unnumbered
+ atf_check -s exit:0 -o ignore rump.ifconfig ipsec0 $ip_local_i/32
+ atf_check -s exit:0 -o ignore \
+ rump.route add -inet $ip_remote_i_subnet -ifp ipsec0 $ip_local_i
+ $DEBUG && rump.ifconfig -v ipsec0
+ $DEBUG && rump.route -nL show
+
+ # setup ipsecif(4) as unnumbered for remote
+ export RUMP_SERVER=$SOCK_REMOTE
+ atf_check -s exit:0 -o ignore rump.ifconfig ipsec0 create
+ atf_check -s exit:0 -o ignore \
+ rump.ifconfig ipsec0 tunnel $ip_remote_o $ip_local_o
+ atf_check -s exit:0 -o ignore rump.ifconfig ipsec0 unnumbered
+ atf_check -s exit:0 -o ignore rump.ifconfig ipsec0 $ip_remote_i/32
+ atf_check -s exit:0 -o ignore \
+ rump.route add -inet $ip_local_i_subnet -ifp ipsec0 $ip_remote_i
+ $DEBUG && rump.ifconfig -v ipsec0
+ $DEBUG && rump.route -nL show
+
+ add_sa ipv6 esp $algo $ip_local_o $ip_remote_o
+
+ # test unnumbered gif(4)
+ extract_new_packets $BUS_GLOBAL > $outfile
+ export RUMP_SERVER=$SOCK_LOCAL
+ atf_check -s exit:0 -o ignore \
+ rump.ping -c 1 -n -w $TIMEOUT -I $ip_local_i $ip_remote_i
+ extract_new_packets $BUS_GLOBAL > $outfile
+ $DEBUG && cat $outfile
+ atf_check -s exit:0 \
+ -o match:"$ip_local_o > $ip_remote_o: ESP" \
+ cat $outfile
+ atf_check -s exit:0 \
+ -o match:"$ip_remote_o > $ip_local_o: ESP" \
+ cat $outfile
+}
+
+add_test_ipsecif_unnumbered()
+{
+ local outer=$1
+ local algo=$2
+ local _algo=$(echo $algo | sed 's/-//g')
+ local name=
+ local desc=
+
+ name="ipsecif_unnumbered_over${outer}_${_algo}"
+ desc="Does unnumbered ipsecif over ${outer} $algo"
+
+ atf_test_case ${name} cleanup
+ eval "
+ ${name}_head() {
+ atf_set descr \"${desc}\"
+ atf_set require.progs rump_server setkey
+ }
+ ${name}_body() {
+ test_ipsecif_unnumbered_${outer} $algo
+ rump_server_destroy_ifaces
+ }
+ ${name}_cleanup() {
+ \$DEBUG && dump
+ cleanup
+ }"
+ atf_add_test_case ${name}
+}
+
+atf_init_test_cases()
+{
+ local algo=
+
+ for algo in $ESP_ENCRYPTION_ALGORITHMS_MINIMUM; do
+ add_test_ipsecif_unnumbered ipv4 $algo
+ add_test_ipsecif_unnumbered ipv6 $algo
+ done
+}
Index: src/tests/net/if_pppoe/t_pppoe_unnumbered.sh
diff -u /dev/null src/tests/net/if_pppoe/t_pppoe_unnumbered.sh:1.1
--- /dev/null Fri Nov 25 08:43:16 2022
+++ src/tests/net/if_pppoe/t_pppoe_unnumbered.sh Fri Nov 25 08:43:16 2022
@@ -0,0 +1,223 @@
+# $NetBSD: t_pppoe_unnumbered.sh,v 1.1 2022/11/25 08:43:16 knakahara Exp $
+#
+# Copyright (c) 2022 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=unix://pppoe_server
+CLIENT=unix://pppoe_client
+
+SERVER_IP=10.0.0.1
+CLIENT_IP=10.1.1.1
+AUTHNAME=foo...@baz.com
+SECRET=oink
+BUS_G=bus_global
+BUS_CLIENT_L=bus_client_local
+TIMEOUT=3
+WAITTIME=10
+DEBUG=${DEBUG:-false}
+
+atf_ifconfig()
+{
+
+ atf_check -s exit:0 rump.ifconfig $*
+}
+
+atf_pppoectl()
+{
+
+ atf_check -s exit:0 -x "$HIJACKING pppoectl $*"
+}
+
+setup_ifaces()
+{
+
+ rump_server_add_iface $SERVER shmif0 $BUS_G
+ rump_server_add_iface $CLIENT shmif0 $BUS_G
+ rump_server_add_iface $CLIENT shmif1 $BUS_CLIENT_L
+ rump_server_add_iface $SERVER pppoe0
+ rump_server_add_iface $CLIENT pppoe0
+
+ export RUMP_SERVER=$SERVER
+
+ atf_ifconfig shmif0 up
+ $inet && atf_ifconfig pppoe0 \
+ inet $SERVER_IP $CLIENT_IP down
+ atf_ifconfig pppoe0 link0
+
+ $DEBUG && rump.ifconfig pppoe0 debug
+ $DEBUG && rump.ifconfig
+ $DEBUG && $HIJACKING pppoectl -d pppoe0
+ unset RUMP_SERVER
+
+ export RUMP_SERVER=$CLIENT
+ atf_ifconfig shmif0 up
+
+ $inet && atf_ifconfig pppoe0 \
+ inet $CLIENT_IP/32 0.0.0.1 down
+
+ $DEBUG && rump.ifconfig pppoe0 debug
+ $DEBUG && rump.ifconfig
+ $DEBUG && $HIJACKING pppoectl -d pppoe0
+
+ atf_ifconfig shmif1 inet $CLIENT_IP/29
+ unset RUMP_SERVER
+}
+
+setup()
+{
+ inet=true
+
+ if [ $# -ne 0 ]; then
+ eval $@
+ fi
+
+ rump_server_start $SERVER pppoe
+ rump_server_start $CLIENT pppoe
+
+ setup_ifaces
+
+ export RUMP_SERVER=$SERVER
+ atf_pppoectl -e shmif0 pppoe0
+ unset RUMP_SERVER
+
+ export RUMP_SERVER=$CLIENT
+ atf_pppoectl -e shmif0 pppoe0
+ unset RUMP_SERVER
+}
+
+wait_for_opened()
+{
+ local cp=$1
+ local dontfail=$2
+ local n=$WAITTIME
+
+ for i in $(seq $n); do
+ $HIJACKING pppoectl -dd pppoe0 | grep -q "$cp state: opened"
+ if [ $? = 0 ]; then
+ rump.ifconfig -w 10
+ return
+ fi
+ sleep 1
+ done
+
+ if [ "$dontfail" != "dontfail" ]; then
+ atf_fail "Couldn't connect to the server for $n seconds."
+ fi
+}
+
+wait_for_disconnected()
+{
+ local dontfail=$1
+ local n=$WAITTIME
+
+ for i in $(seq $n); do
+ # If PPPoE client is disconnected by PPPoE server, then
+ # the LCP state will of the client is in a starting to send PADI.
+ $HIJACKING pppoectl -dd pppoe0 | grep -q \
+ -e "LCP state: initial" -e "LCP state: starting"
+ [ $? = 0 ] && return
+
+ sleep 1
+ done
+
+ if [ "$dontfail" != "dontfail" ]; then
+ atf_fail "Couldn't disconnect for $n seconds."
+ fi
+}
+
+run_test_unnumbered()
+{
+ local auth="chap"
+ local cp="IPCP"
+ setup
+
+ # As pppoe client doesn't support rechallenge yet.
+ local server_optparam=""
+ if [ $auth = "chap" ]; then
+ server_optparam="norechallenge"
+ fi
+
+ export RUMP_SERVER=$SERVER
+ atf_pppoectl pppoe0 "hisauthproto=$auth" \
+ "hisauthname=$AUTHNAME" "hisauthsecret=$SECRET" \
+ "myauthproto=none" $server_optparam
+ atf_ifconfig pppoe0 up
+ unset RUMP_SERVER
+
+ export RUMP_SERVER=$CLIENT
+ atf_pppoectl pppoe0 \
+ "myauthname=$AUTHNAME" "myauthsecret=$SECRET" \
+ "myauthproto=$auth" "hisauthproto=none"
+ atf_ifconfig pppoe0 unnumbered
+ atf_ifconfig pppoe0 up
+ $DEBUG && rump.ifconfig
+ $DEBUG && rump.route -nL show
+ wait_for_opened $cp
+ atf_check -s exit:0 -o ignore \
+ rump.route add -inet default -ifp pppoe0 $CLIENT_IP
+ atf_check -s exit:0 -o ignore \
+ rump.ping -c 1 -w $TIMEOUT -I $CLIENT_IP $SERVER_IP
+ unset RUMP_SERVER
+
+ # test for disconnection from client just in case
+ export RUMP_SERVER=$CLIENT
+ atf_ifconfig pppoe0 down
+ wait_for_disconnected
+ export RUMP_SERVER=$SERVER
+ wait_for_disconnected
+ $DEBUG && $HIJACKING pppoectl -d pppoe0
+ atf_check -s not-exit:0 -o ignore -e ignore \
+ rump.ping -c 1 -w $TIMEOUT $CLIENT_IP
+ atf_check -s exit:0 -o match:'initial' -x "$HIJACKING pppoectl -d pppoe0"
+ unset RUMP_SERVER
+}
+
+atf_test_case pppoe_unnumbered cleanup
+
+pppoe_unnumbered_head()
+{
+
+ atf_set "descr" "Does pppoe unnumbered tests"
+ atf_set "require.progs" "rump_server pppoectl"
+}
+
+pppoe_unnumbered_body()
+{
+
+ run_test_unnumbered
+}
+
+pppoe_unnumbered_cleanup()
+{
+
+ $DEBUG && dump
+ cleanup
+}
+
+atf_init_test_cases()
+{
+
+ atf_add_test_case pppoe_unnumbered
+}
