aboutsummaryrefslogtreecommitdiffstats
path: root/testing/tests/p2pnat/medsrv-psk
diff options
context:
space:
mode:
Diffstat (limited to 'testing/tests/p2pnat/medsrv-psk')
-rw-r--r--testing/tests/p2pnat/medsrv-psk/evaltest.dat8
-rwxr-xr-xtesting/tests/p2pnat/medsrv-psk/hosts/alice/etc/init.d/iptables2
-rwxr-xr-xtesting/tests/p2pnat/medsrv-psk/hosts/alice/etc/ipsec.conf2
-rwxr-xr-xtesting/tests/p2pnat/medsrv-psk/hosts/bob/etc/ipsec.conf2
4 files changed, 7 insertions, 7 deletions
diff --git a/testing/tests/p2pnat/medsrv-psk/evaltest.dat b/testing/tests/p2pnat/medsrv-psk/evaltest.dat
index b8280c325..ba14bb858 100644
--- a/testing/tests/p2pnat/medsrv-psk/evaltest.dat
+++ b/testing/tests/p2pnat/medsrv-psk/evaltest.dat
@@ -2,10 +2,10 @@ alice::ipsec statusall::medsrv.*ESTABLISHED::YES
bob::ipsec statusall::medsrv.*ESTABLISHED::YES
carol::ipsec statusall::medsrv.*ESTABLISHED.*PH_IP_MOON.*6cu1UTVw@medsrv.org::YES
carol::ipsec statusall::medsrv.*ESTABLISHED.*PH_IP_SUN.*v9oEPMz@medsrv.org::YES
-alice::ipsec statusall::p2p.*ESTABLISHED::YES
-bob::ipsec statusall::p2p.*ESTABLISHED::YES
-alice::ipsec statusall::p2p.*INSTALLED::YES
-bob::ipsec statusall::p2p.*INSTALLED::YES
+alice::ipsec statusall::peer.*ESTABLISHED::YES
+bob::ipsec statusall::peer.*ESTABLISHED::YES
+alice::ipsec statusall::peer.*INSTALLED::YES
+bob::ipsec statusall::peer.*INSTALLED::YES
alice::ping -c 1 PH_IP_BOB::64 bytes from PH_IP_BOB: icmp_seq=1::YES
bob::ping -c 1 PH_IP_ALICE::64 bytes from PH_IP_ALICE: icmp_seq=1::YES
moon::tcpdump::IP moon.strongswan.org.* > sun.strongswan.org.*: UDP::YES
diff --git a/testing/tests/p2pnat/medsrv-psk/hosts/alice/etc/init.d/iptables b/testing/tests/p2pnat/medsrv-psk/hosts/alice/etc/init.d/iptables
index 09b4cabfa..c6371c745 100755
--- a/testing/tests/p2pnat/medsrv-psk/hosts/alice/etc/init.d/iptables
+++ b/testing/tests/p2pnat/medsrv-psk/hosts/alice/etc/init.d/iptables
@@ -21,7 +21,7 @@ start() {
iptables -A INPUT -i eth0 -p udp --sport 500 --dport 500 -j ACCEPT
iptables -A OUTPUT -o eth0 -p udp --dport 500 --sport 500 -j ACCEPT
- # allow NAT-T including P2P
+ # allow NAT-T
iptables -A INPUT -i eth0 -p udp --dport 4500 -j ACCEPT
iptables -A OUTPUT -o eth0 -p udp --sport 4500 -j ACCEPT
diff --git a/testing/tests/p2pnat/medsrv-psk/hosts/alice/etc/ipsec.conf b/testing/tests/p2pnat/medsrv-psk/hosts/alice/etc/ipsec.conf
index 370934ce7..8dd41424e 100755
--- a/testing/tests/p2pnat/medsrv-psk/hosts/alice/etc/ipsec.conf
+++ b/testing/tests/p2pnat/medsrv-psk/hosts/alice/etc/ipsec.conf
@@ -25,7 +25,7 @@ conn medsrv
authby=psk
auto=add
-conn p2p
+conn peer
leftcert=aliceCert.pem
leftid=alice@strongswan.org
right=%any
diff --git a/testing/tests/p2pnat/medsrv-psk/hosts/bob/etc/ipsec.conf b/testing/tests/p2pnat/medsrv-psk/hosts/bob/etc/ipsec.conf
index 8d8d9391f..abf4320b1 100755
--- a/testing/tests/p2pnat/medsrv-psk/hosts/bob/etc/ipsec.conf
+++ b/testing/tests/p2pnat/medsrv-psk/hosts/bob/etc/ipsec.conf
@@ -25,7 +25,7 @@ conn medsrv
p2p_mediation=yes
auto=start
-conn p2p
+conn peer
leftcert=bobCert.pem
leftid=bob@strongswan.org
right=%any