mediation extension adapted to the naming convention of the current version of the draft. note: the external interface (config, autotools) has not yet been changed

testing/tests/p2pnat/behind-same-nat/hosts/alice/etc/init.d/iptables

@@ -25,7 +25,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
 

testing/tests/p2pnat/behind-same-nat/hosts/alice/etc/ipsec.conf

@@ -25,7 +25,7 @@ conn medsrv
 	authby=psk
 	auto=add
 
-conn p2p 
+conn peer
 	leftcert=aliceCert.pem
 	[email protected]
 	right=%any

testing/tests/p2pnat/behind-same-nat/hosts/venus/etc/init.d/iptables

@@ -25,7 +25,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
 

testing/tests/p2pnat/behind-same-nat/hosts/venus/etc/ipsec.conf

@@ -25,7 +25,7 @@ conn medsrv
 	p2p_mediation=yes
 	auto=start
 
-conn p2p 
+conn peer 
 	leftcert=venusCert.pem
 	[email protected]
 	right=%any