Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Add test cases for IPComp
details: https://anonhg.NetBSD.org/src/rev/eca4793b5c02
branches: trunk
changeset: 825195:eca4793b5c02
user: ozaki-r <ozaki-r%NetBSD.org@localhost>
date: Mon Jul 03 06:01:16 2017 +0000
description:
Add test cases for IPComp
diffstat:
distrib/sets/lists/tests/mi | 3 +-
tests/net/ipsec/Makefile | 5 +-
tests/net/ipsec/algorithms.sh | 21 +-
tests/net/ipsec/common.sh | 13 +-
tests/net/ipsec/t_ipsec_transport.sh | 80 ++++-
tests/net/ipsec/t_ipsec_tunnel_ipcomp.sh | 409 +++++++++++++++++++++++++++++++
6 files changed, 510 insertions(+), 21 deletions(-)
diffs (truncated from 645 to 300 lines):
diff -r 195c4601513e -r eca4793b5c02 distrib/sets/lists/tests/mi
--- a/distrib/sets/lists/tests/mi Mon Jul 03 03:12:42 2017 +0000
+++ b/distrib/sets/lists/tests/mi Mon Jul 03 06:01:16 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.753 2017/06/09 06:09:01 knakahara Exp $
+# $NetBSD: mi,v 1.754 2017/07/03 06:01:16 ozaki-r Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -3319,6 +3319,7 @@
./usr/tests/net/ipsec/t_ipsec_sysctl tests-net-tests atf,rump
./usr/tests/net/ipsec/t_ipsec_transport tests-net-tests atf,rump
./usr/tests/net/ipsec/t_ipsec_tunnel tests-net-tests atf,rump
+./usr/tests/net/ipsec/t_ipsec_tunnel_ipcomp tests-net-tests atf,rump
./usr/tests/net/ipsec/t_ipsec_tunnel_odd tests-net-tests atf,rump
./usr/tests/net/mcast tests-net-tests compattestfile,atf
./usr/tests/net/mcast/Atffile tests-net-tests atf,rump
diff -r 195c4601513e -r eca4793b5c02 tests/net/ipsec/Makefile
--- a/tests/net/ipsec/Makefile Mon Jul 03 03:12:42 2017 +0000
+++ b/tests/net/ipsec/Makefile Mon Jul 03 06:01:16 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2017/05/15 09:58:22 ozaki-r Exp $
+# $NetBSD: Makefile,v 1.7 2017/07/03 06:01:16 ozaki-r Exp $
#
.include <bsd.own.mk>
@@ -6,7 +6,8 @@
TESTSDIR= ${TESTSBASE}/net/ipsec
.for name in ipsec_ah_keys ipsec_esp_keys ipsec_gif ipsec_l2tp ipsec_misc \
- ipsec_sysctl ipsec_transport ipsec_tunnel ipsec_tunnel_odd
+ ipsec_sysctl ipsec_transport ipsec_tunnel ipsec_tunnel_ipcomp \
+ ipsec_tunnel_odd
TESTS_SH+= t_${name}
TESTS_SH_SRC_t_${name}= ../net_common.sh ./common.sh ./algorithms.sh \
t_${name}.sh
diff -r 195c4601513e -r eca4793b5c02 tests/net/ipsec/algorithms.sh
--- a/tests/net/ipsec/algorithms.sh Mon Jul 03 03:12:42 2017 +0000
+++ b/tests/net/ipsec/algorithms.sh Mon Jul 03 06:01:16 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: algorithms.sh,v 1.4 2017/05/12 02:34:45 ozaki-r Exp $
+# $NetBSD: algorithms.sh,v 1.5 2017/07/03 06:01:16 ozaki-r Exp $
#
# Copyright (c) 2017 Internet Initiative Japan Inc.
# All rights reserved.
@@ -111,6 +111,12 @@
#valid_keys_tcpmd5="8 640"
#invalid_keys_tcpmd5="648"
+IPCOMP_COMPRESSION_ALGORITHMS="deflate"
+IPCOMP_COMPRESSION_ALGORITHMS_MINIMUM="deflate"
+valid_keys_deflate="0"
+invalid_keys_deflate="8"
+minlen_deflate="90"
+
get_one_valid_keylen()
{
local algo=$1
@@ -170,7 +176,18 @@
if [ $proto = esp ]; then
echo "-E $algo $key"
+ elif [ $proto = ah ]; then
+ echo "-A $algo $key"
else
- echo "-A $algo $key"
+ echo "-C $algo $key"
fi
}
+
+get_minlen()
+{
+ local algo=$1
+ local minlen=
+
+ eval minlen="\$minlen_${algo}"
+ echo $minlen
+}
diff -r 195c4601513e -r eca4793b5c02 tests/net/ipsec/common.sh
--- a/tests/net/ipsec/common.sh Mon Jul 03 03:12:42 2017 +0000
+++ b/tests/net/ipsec/common.sh Mon Jul 03 06:01:16 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: common.sh,v 1.3 2017/05/15 09:56:47 ozaki-r Exp $
+# $NetBSD: common.sh,v 1.4 2017/07/03 06:01:16 ozaki-r Exp $
#
# Copyright (c) 2017 Internet Initiative Japan Inc.
# All rights reserved.
@@ -53,3 +53,14 @@
$HIJACKING setkey -D
# TODO: more detail checks
}
+
+generate_pktproto()
+{
+ local proto=$1
+
+ if [ $proto = ipcomp ]; then
+ echo IPComp
+ else
+ echo $proto | tr 'a-z' 'A-Z'
+ fi
+}
diff -r 195c4601513e -r eca4793b5c02 tests/net/ipsec/t_ipsec_transport.sh
--- a/tests/net/ipsec/t_ipsec_transport.sh Mon Jul 03 03:12:42 2017 +0000
+++ b/tests/net/ipsec/t_ipsec_transport.sh Mon Jul 03 06:01:16 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: t_ipsec_transport.sh,v 1.4 2017/05/12 02:34:45 ozaki-r Exp $
+# $NetBSD: t_ipsec_transport.sh,v 1.5 2017/07/03 06:01:16 ozaki-r Exp $
#
# Copyright (c) 2017 Internet Initiative Japan Inc.
# All rights reserved.
@@ -31,6 +31,17 @@
DEBUG=${DEBUG:-false}
+check_packets()
+{
+ local outfile=$1
+ local src=$2
+ local dst=$3
+ local pktproto=$4
+
+ atf_check -s exit:0 -o match:"$src > $dst: $pktproto" cat $outfile
+ atf_check -s exit:0 -o match:"$dst > $src: $pktproto" cat $outfile
+}
+
test_ipsec4_transport()
{
local proto=$1
@@ -39,8 +50,9 @@
local ip_peer=10.0.0.2
local tmpfile=./tmp
local outfile=./out
- local proto_cap=$(echo $proto | tr 'a-z' 'A-Z')
+ local pktproto=$(generate_pktproto $proto)
local algo_args="$(generate_algo_args $proto $algo)"
+ local pktsize=
rump_server_crypto_start $SOCK_LOCAL netipsec
rump_server_crypto_start $SOCK_PEER netipsec
@@ -88,13 +100,30 @@
check_sa_entries $SOCK_PEER $ip_local $ip_peer
export RUMP_SERVER=$SOCK_LOCAL
- atf_check -s exit:0 -o ignore rump.ping -c 1 -n -w 3 $ip_peer
+ if [ $proto = ipcomp ]; then
+ # IPComp sends a packet as-is if a compressed payload of
+ # the packet is greater than or equal to the original payload.
+ # So we have to fill a payload with 1 to let IPComp always send
+ # a compressed packet.
- extract_new_packets $BUS > $outfile
- atf_check -s exit:0 -o match:"$ip_local > $ip_peer: $proto_cap" \
- cat $outfile
- atf_check -s exit:0 -o match:"$ip_peer > $ip_local: $proto_cap" \
- cat $outfile
+ # pktsize == minlen - 1
+ pktsize=$(($(get_minlen $algo) - 8 - 1))
+ atf_check -s exit:0 -o ignore \
+ rump.ping -c 1 -n -w 3 -s $pktsize -p ff $ip_peer
+ extract_new_packets $BUS > $outfile
+ check_packets $outfile $ip_local $ip_peer ICMP
+
+ # pktsize == minlen
+ pktsize=$(($(get_minlen $algo) - 8))
+ atf_check -s exit:0 -o ignore \
+ rump.ping -c 1 -n -w 3 -s $pktsize -p ff $ip_peer
+ extract_new_packets $BUS > $outfile
+ check_packets $outfile $ip_local $ip_peer $pktproto
+ else
+ atf_check -s exit:0 -o ignore rump.ping -c 1 -n -w 3 $ip_peer
+ extract_new_packets $BUS > $outfile
+ check_packets $outfile $ip_local $ip_peer $pktproto
+ fi
test_flush_entries $SOCK_LOCAL
test_flush_entries $SOCK_PEER
@@ -108,7 +137,7 @@
local ip_peer=fd00::2
local tmpfile=./tmp
local outfile=./out
- local proto_cap=$(echo $proto | tr 'a-z' 'A-Z')
+ local pktproto=$(generate_pktproto $proto)
local algo_args="$(generate_algo_args $proto $algo)"
rump_server_crypto_start $SOCK_LOCAL netinet6 netipsec
@@ -157,13 +186,30 @@
check_sa_entries $SOCK_PEER $ip_local $ip_peer
export RUMP_SERVER=$SOCK_LOCAL
- atf_check -s exit:0 -o ignore rump.ping6 -c 1 -n -X 3 $ip_peer
+ if [ $proto = ipcomp ]; then
+ # IPComp sends a packet as-is if a compressed payload of
+ # the packet is greater than or equal to the original payload.
+ # So we have to fill a payload with 1 to let IPComp always send
+ # a compressed packet.
- extract_new_packets $BUS > $outfile
- atf_check -s exit:0 -o match:"$ip_local > $ip_peer: $proto_cap" \
- cat $outfile
- atf_check -s exit:0 -o match:"$ip_peer > $ip_local: $proto_cap" \
- cat $outfile
+ # pktsize == minlen - 1
+ pktsize=$(($(get_minlen $algo) - 8 - 1))
+ atf_check -s exit:0 -o ignore \
+ rump.ping6 -c 1 -n -X 3 -s $pktsize -p ff $ip_peer
+ extract_new_packets $BUS > $outfile
+ check_packets $outfile $ip_local $ip_peer ICMP6
+
+ # pktsize == minlen
+ pktsize=$(($(get_minlen $algo) - 8))
+ atf_check -s exit:0 -o ignore \
+ rump.ping6 -c 1 -n -X 3 -s $pktsize -p ff $ip_peer
+ extract_new_packets $BUS > $outfile
+ check_packets $outfile $ip_local $ip_peer $pktproto
+ else
+ atf_check -s exit:0 -o ignore rump.ping6 -c 1 -n -X 3 $ip_peer
+ extract_new_packets $BUS > $outfile
+ check_packets $outfile $ip_local $ip_peer $pktproto
+ fi
test_flush_entries $SOCK_LOCAL
test_flush_entries $SOCK_PEER
@@ -223,4 +269,8 @@
add_test_transport_mode ipv4 ah $algo
add_test_transport_mode ipv6 ah $algo
done
+ for algo in $IPCOMP_COMPRESSION_ALGORITHMS; do
+ add_test_transport_mode ipv4 ipcomp $algo
+ add_test_transport_mode ipv6 ipcomp $algo
+ done
}
diff -r 195c4601513e -r eca4793b5c02 tests/net/ipsec/t_ipsec_tunnel_ipcomp.sh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/net/ipsec/t_ipsec_tunnel_ipcomp.sh Mon Jul 03 06:01:16 2017 +0000
@@ -0,0 +1,409 @@
+# $NetBSD: t_ipsec_tunnel_ipcomp.sh,v 1.1 2017/07/03 06:01:16 ozaki-r 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.
+#
+# 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_TUNNEL_LOCAL=unix://ipsec_tunel_local
+SOCK_TUNNEL_REMOTE=unix://ipsec_tunnel_remote
+SOCK_REMOTE=unix://ipsec_remote
+BUS_LOCAL=./bus_ipsec_local
+BUS_TUNNEL=./bus_ipsec_tunnel
+BUS_REMOTE=./bus_ipsec_remote
+
+DEBUG=${DEBUG:-false}
+
+setup_servers()
+{
+
+ # See https://www.netbsd.org/docs/network/ipsec/#sample_vpn
+ rump_server_crypto_start $SOCK_LOCAL netinet6
+ rump_server_crypto_start $SOCK_TUNNEL_LOCAL netipsec netinet6
+ rump_server_crypto_start $SOCK_TUNNEL_REMOTE netipsec netinet6
+ rump_server_crypto_start $SOCK_REMOTE netinet6
+ rump_server_add_iface $SOCK_LOCAL shmif0 $BUS_LOCAL
+ rump_server_add_iface $SOCK_TUNNEL_LOCAL shmif0 $BUS_LOCAL
+ rump_server_add_iface $SOCK_TUNNEL_LOCAL shmif1 $BUS_TUNNEL
+ rump_server_add_iface $SOCK_TUNNEL_REMOTE shmif0 $BUS_REMOTE
+ rump_server_add_iface $SOCK_TUNNEL_REMOTE shmif1 $BUS_TUNNEL
+ rump_server_add_iface $SOCK_REMOTE shmif0 $BUS_REMOTE
+}
+
+check_tunnel_ipcomp_packets()
+{
+ local outfile=$1
+ local osrc=$2
+ local odst=$3
+ local oproto=$4
+ local isrc=$5
+ local idst=$6
+ local iproto=$7
+
+ $DEBUG && cat $outfile
Home |
Main Index |
Thread Index |
Old Index