diff options
author | Tobias Brunner <tobias@strongswan.org> | 2008-03-27 12:31:35 +0000 |
---|---|---|
committer | Tobias Brunner <tobias@strongswan.org> | 2008-03-27 12:31:35 +0000 |
commit | e74bc8e51dfc64ebf4044992ee9244214455d617 (patch) | |
tree | 9ecaf0e1225f369699bb271301201924de50ac25 /testing/tests/p2pnat | |
parent | b42421a04c0b2377b1b2a352c641d0891f8dbfba (diff) | |
download | strongswan-e74bc8e51dfc64ebf4044992ee9244214455d617.tar.bz2 strongswan-e74bc8e51dfc64ebf4044992ee9244214455d617.tar.xz |
changed external interface to the mediation extension.
Diffstat (limited to 'testing/tests/p2pnat')
6 files changed, 14 insertions, 14 deletions
diff --git a/testing/tests/p2pnat/behind-same-nat/hosts/alice/etc/ipsec.conf b/testing/tests/p2pnat/behind-same-nat/hosts/alice/etc/ipsec.conf index 6ddb04a2f..b47f157f6 100755 --- a/testing/tests/p2pnat/behind-same-nat/hosts/alice/etc/ipsec.conf +++ b/testing/tests/p2pnat/behind-same-nat/hosts/alice/etc/ipsec.conf @@ -21,7 +21,7 @@ conn medsrv leftid=6cu1UTVw@medsrv.org right=PH_IP_CAROL rightid=carol@strongswan.org - p2p_mediation=yes + mediation=yes authby=psk auto=add @@ -31,6 +31,6 @@ conn peer right=%any rightid=@venus.strongswan.org rightsubnet=PH_IP_VENUS/32 - p2p_mediated_by=medsrv - p2p_peerid=F1ubAio8@medsrv.org + mediated_by=medsrv + me_peerid=F1ubAio8@medsrv.org auto=start diff --git a/testing/tests/p2pnat/behind-same-nat/hosts/carol/etc/ipsec.conf b/testing/tests/p2pnat/behind-same-nat/hosts/carol/etc/ipsec.conf index 712d888b1..e38922cf4 100755 --- a/testing/tests/p2pnat/behind-same-nat/hosts/carol/etc/ipsec.conf +++ b/testing/tests/p2pnat/behind-same-nat/hosts/carol/etc/ipsec.conf @@ -21,5 +21,5 @@ conn medsrv leftid=carol@strongswan.org leftfirewall=yes right=%any - p2p_mediation=yes + mediation=yes auto=add diff --git a/testing/tests/p2pnat/behind-same-nat/hosts/venus/etc/ipsec.conf b/testing/tests/p2pnat/behind-same-nat/hosts/venus/etc/ipsec.conf index 0a4bb644b..3943c361e 100755 --- a/testing/tests/p2pnat/behind-same-nat/hosts/venus/etc/ipsec.conf +++ b/testing/tests/p2pnat/behind-same-nat/hosts/venus/etc/ipsec.conf @@ -22,7 +22,7 @@ conn medsrv right=PH_IP_CAROL rightid=carol@strongswan.org authby=psk - p2p_mediation=yes + mediation=yes auto=start conn peer @@ -31,6 +31,6 @@ conn peer right=%any rightid=alice@strongswan.org rightsubnet=PH_IP_ALICE/32 - p2p_mediated_by=medsrv - p2p_peerid=6cu1UTVw@medsrv.org + mediated_by=medsrv + me_peerid=6cu1UTVw@medsrv.org auto=add 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 8dd41424e..99a50d5d8 100755 --- a/testing/tests/p2pnat/medsrv-psk/hosts/alice/etc/ipsec.conf +++ b/testing/tests/p2pnat/medsrv-psk/hosts/alice/etc/ipsec.conf @@ -21,7 +21,7 @@ conn medsrv leftid=6cu1UTVw@medsrv.org right=PH_IP_CAROL rightid=carol@strongswan.org - p2p_mediation=yes + mediation=yes authby=psk auto=add @@ -31,6 +31,6 @@ conn peer right=%any rightid=bob@strongswan.org rightsubnet=PH_IP_BOB/32 - p2p_mediated_by=medsrv - p2p_peerid=av9oEPMz@medsrv.org + mediated_by=medsrv + me_peerid=av9oEPMz@medsrv.org auto=start 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 abf4320b1..39dee8521 100755 --- a/testing/tests/p2pnat/medsrv-psk/hosts/bob/etc/ipsec.conf +++ b/testing/tests/p2pnat/medsrv-psk/hosts/bob/etc/ipsec.conf @@ -22,7 +22,7 @@ conn medsrv right=PH_IP_CAROL rightid=carol@strongswan.org authby=psk - p2p_mediation=yes + mediation=yes auto=start conn peer @@ -31,6 +31,6 @@ conn peer right=%any rightid=alice@strongswan.org rightsubnet=PH_IP_ALICE/32 - p2p_mediated_by=medsrv - p2p_peerid=6cu1UTVw@medsrv.org + mediated_by=medsrv + me_peerid=6cu1UTVw@medsrv.org auto=add diff --git a/testing/tests/p2pnat/medsrv-psk/hosts/carol/etc/ipsec.conf b/testing/tests/p2pnat/medsrv-psk/hosts/carol/etc/ipsec.conf index 712d888b1..e38922cf4 100755 --- a/testing/tests/p2pnat/medsrv-psk/hosts/carol/etc/ipsec.conf +++ b/testing/tests/p2pnat/medsrv-psk/hosts/carol/etc/ipsec.conf @@ -21,5 +21,5 @@ conn medsrv leftid=carol@strongswan.org leftfirewall=yes right=%any - p2p_mediation=yes + mediation=yes auto=add |