Module Name: src
Committed By: ozaki-r
Date: Fri Oct 20 03:43:51 UTC 2017
Modified Files:
src/tests/net/ipsec: common.sh t_ipsec_misc.sh
Log Message:
Fix incomplete SP setups
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/net/ipsec/common.sh
cvs rdiff -u -r1.18 -r1.19 src/tests/net/ipsec/t_ipsec_misc.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/ipsec/common.sh
diff -u src/tests/net/ipsec/common.sh:1.6 src/tests/net/ipsec/common.sh:1.7
--- src/tests/net/ipsec/common.sh:1.6 Tue Aug 8 02:27:03 2017
+++ src/tests/net/ipsec/common.sh Fri Oct 20 03:43:51 2017
@@ -1,4 +1,4 @@
-# $NetBSD: common.sh,v 1.6 2017/08/08 02:27:03 ozaki-r Exp $
+# $NetBSD: common.sh,v 1.7 2017/10/20 03:43:51 ozaki-r Exp $
#
# Copyright (c) 2017 Internet Initiative Japan Inc.
# All rights reserved.
@@ -67,6 +67,9 @@ check_sp_entries()
atf_check -s exit:0 \
-o match:"$local_addr\[any\] $remote_addr\[any\] 255\(reserved\)" \
$HIJACKING setkey -D -P
+ atf_check -s exit:0 \
+ -o match:"$remote_addr\[any\] $local_addr\[any\] 255\(reserved\)" \
+ $HIJACKING setkey -D -P
# TODO: more detail checks
}
Index: src/tests/net/ipsec/t_ipsec_misc.sh
diff -u src/tests/net/ipsec/t_ipsec_misc.sh:1.18 src/tests/net/ipsec/t_ipsec_misc.sh:1.19
--- src/tests/net/ipsec/t_ipsec_misc.sh:1.18 Thu Aug 3 03:16:27 2017
+++ src/tests/net/ipsec/t_ipsec_misc.sh Fri Oct 20 03:43:51 2017
@@ -1,4 +1,4 @@
-# $NetBSD: t_ipsec_misc.sh,v 1.18 2017/08/03 03:16:27 ozaki-r Exp $
+# $NetBSD: t_ipsec_misc.sh,v 1.19 2017/10/20 03:43:51 ozaki-r Exp $
#
# Copyright (c) 2017 Internet Initiative Japan Inc.
# All rights reserved.
@@ -625,6 +625,7 @@ setup_sp()
export RUMP_SERVER=$SOCK_LOCAL
cat > $tmpfile <<-EOF
spdadd $ip_local $ip_peer any -P out ipsec $proto/transport//require;
+ spdadd $ip_peer $ip_local any -P in ipsec $proto/transport//require;
EOF
$DEBUG && cat $tmpfile
atf_check -s exit:0 -o empty $HIJACKING setkey -c < $tmpfile
@@ -633,6 +634,7 @@ setup_sp()
export RUMP_SERVER=$SOCK_PEER
cat > $tmpfile <<-EOF
spdadd $ip_peer $ip_local any -P out ipsec $proto/transport//require;
+ spdadd $ip_local $ip_peer any -P in ipsec $proto/transport//require;
EOF
$DEBUG && cat $tmpfile
atf_check -s exit:0 -o empty $HIJACKING setkey -c < $tmpfile
