From a349dc58f136caf04ad9e13948eed9e8c6f73c41 Mon Sep 17 00:00:00 2001 From: Andreas Steffen Date: Mon, 26 Nov 2007 22:24:08 +0000 Subject: [PATCH] bob is passive responder in p2pnat scenario --- .../tests/p2pnat/medsrv-psk/hosts/bob/etc/ipsec.conf | 4 ++-- testing/tests/p2pnat/medsrv-psk/pretest.dat | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) 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 487a45d8c..8d8d9391f 100755 --- a/testing/tests/p2pnat/medsrv-psk/hosts/bob/etc/ipsec.conf +++ b/testing/tests/p2pnat/medsrv-psk/hosts/bob/etc/ipsec.conf @@ -23,7 +23,7 @@ conn medsrv rightid=carol@strongswan.org authby=psk p2p_mediation=yes - auto=add + auto=start conn p2p leftcert=bobCert.pem @@ -33,4 +33,4 @@ conn p2p rightsubnet=PH_IP_ALICE/32 p2p_mediated_by=medsrv p2p_peerid=6cu1UTVw@medsrv.org - auto=start + auto=add diff --git a/testing/tests/p2pnat/medsrv-psk/pretest.dat b/testing/tests/p2pnat/medsrv-psk/pretest.dat index 55710652c..a5c9a2fbb 100644 --- a/testing/tests/p2pnat/medsrv-psk/pretest.dat +++ b/testing/tests/p2pnat/medsrv-psk/pretest.dat @@ -3,19 +3,17 @@ moon::/etc/init.d/iptables start 2> /dev/null carol::/etc/init.d/iptables start 2> /dev/null sun::/etc/init.d/iptables start 2> /dev/null bob::/etc/init.d/iptables start 2> /dev/null -moon::conntrack -F moon::iptables -t nat -A POSTROUTING -o eth0 -s 10.1.0.0/16 -p udp -j SNAT --to-source PH_IP_MOON:1100-1200 moon::iptables -t nat -A POSTROUTING -o eth0 -s 10.1.0.0/16 -p tcp -j SNAT --to-source PH_IP_MOON:2000-2100 moon::iptables -A FORWARD -i eth1 -o eth0 -s 10.1.0.0/16 -j ACCEPT moon::iptables -A FORWARD -i eth0 -o eth1 -d 10.1.0.0/16 -j ACCEPT -sun::conntrack -F sun::iptables -t nat -A POSTROUTING -o eth0 -s 10.2.0.0/16 -p udp -j SNAT --to-source PH_IP_SUN:1200-1300 sun::iptables -t nat -A POSTROUTING -o eth0 -s 10.2.0.0/16 -p tcp -j SNAT --to-source PH_IP_SUN:2000-2100 sun::iptables -A FORWARD -i eth1 -o eth0 -s 10.2.0.0/16 -j ACCEPT sun::iptables -A FORWARD -i eth0 -o eth1 -d 10.2.0.0/16 -j ACCEPT carol::ipsec start carol::sleep 1 -alice::ipsec start -alice::sleep 1 -bob::ipsec start -bob::sleep 10 +bob::ipsec start +bob::sleep 1 +alice::ipsec start +alice::sleep 2