From: Christian Grothoff <christian@grothoff.org>
Date: Fri, 10 Jun 2011 09:53:29 +0000 (+0000)
Subject: fix
X-Git-Tag: initial-import-from-subversion-38251~18276
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8d4b8f91ac792069e558da02e4959c6578571dfe;p=oweals%2Fgnunet.git

fix
---

diff --git a/src/testing/test_testing_connect_peer1.conf b/src/testing/test_testing_connect_peer1.conf
index d5b2f6178..fec00cbe7 100644
--- a/src/testing/test_testing_connect_peer1.conf
+++ b/src/testing/test_testing_connect_peer1.conf
@@ -56,3 +56,12 @@ AUTOSTART = NO
 
 [mesh]
 AUTOSTART = NO
+
+[nat]
+DISABLEV6 = YES
+BINDTO = 127.0.0.1
+ENABLE_UPNP = NO
+BEHIND_NAT = NO
+ALLOW_NAT = NO
+INTERNAL_ADDRESS = 127.0.0.1
+EXTERNAL_ADDRESS = 127.0.0.1
diff --git a/src/testing/test_testing_connect_peer2.conf b/src/testing/test_testing_connect_peer2.conf
index 0b40fb534..4b63d4721 100644
--- a/src/testing/test_testing_connect_peer2.conf
+++ b/src/testing/test_testing_connect_peer2.conf
@@ -58,3 +58,12 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nat]
+DISABLEV6 = YES
+BINDTO = 127.0.0.1
+ENABLE_UPNP = NO
+BEHIND_NAT = NO
+ALLOW_NAT = NO
+INTERNAL_ADDRESS = 127.0.0.1
+EXTERNAL_ADDRESS = 127.0.0.1
diff --git a/src/testing/test_testing_data.conf b/src/testing/test_testing_data.conf
index 80b2fdfc1..e9a443a1c 100644
--- a/src/testing/test_testing_data.conf
+++ b/src/testing/test_testing_data.conf
@@ -43,3 +43,12 @@ AUTOSTART = NO
 
 [mesh]
 AUTOSTART = NO
+
+[nat]
+DISABLEV6 = YES
+BINDTO = 127.0.0.1
+ENABLE_UPNP = NO
+BEHIND_NAT = NO
+ALLOW_NAT = NO
+INTERNAL_ADDRESS = 127.0.0.1
+EXTERNAL_ADDRESS = 127.0.0.1
diff --git a/src/testing/test_testing_data_remote.conf b/src/testing/test_testing_data_remote.conf
index 0f76fb862..703081764 100644
--- a/src/testing/test_testing_data_remote.conf
+++ b/src/testing/test_testing_data_remote.conf
@@ -40,3 +40,12 @@ MAX_OUTSTANDING_SSH = 5
 AUTOSTART = NO
 
 
+
+[nat]
+DISABLEV6 = YES
+BINDTO = 127.0.0.1
+ENABLE_UPNP = NO
+BEHIND_NAT = NO
+ALLOW_NAT = NO
+INTERNAL_ADDRESS = 127.0.0.1
+EXTERNAL_ADDRESS = 127.0.0.1
diff --git a/src/testing/test_testing_data_topology_2d_torus.conf b/src/testing/test_testing_data_topology_2d_torus.conf
index dcc63334e..66b35c7fc 100644
--- a/src/testing/test_testing_data_topology_2d_torus.conf
+++ b/src/testing/test_testing_data_topology_2d_torus.conf
@@ -40,3 +40,12 @@ HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 AUTOSTART = NO
 
 
+
+[nat]
+DISABLEV6 = YES
+BINDTO = 127.0.0.1
+ENABLE_UPNP = NO
+BEHIND_NAT = NO
+ALLOW_NAT = NO
+INTERNAL_ADDRESS = 127.0.0.1
+EXTERNAL_ADDRESS = 127.0.0.1
diff --git a/src/testing/test_testing_data_topology_blacklist.conf b/src/testing/test_testing_data_topology_blacklist.conf
index f970e40a4..bd50557c9 100644
--- a/src/testing/test_testing_data_topology_blacklist.conf
+++ b/src/testing/test_testing_data_topology_blacklist.conf
@@ -53,3 +53,12 @@ HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 AUTOSTART = NO
 
 
+
+[nat]
+DISABLEV6 = YES
+BINDTO = 127.0.0.1
+ENABLE_UPNP = NO
+BEHIND_NAT = NO
+ALLOW_NAT = NO
+INTERNAL_ADDRESS = 127.0.0.1
+EXTERNAL_ADDRESS = 127.0.0.1
diff --git a/src/testing/test_testing_data_topology_churn.conf b/src/testing/test_testing_data_topology_churn.conf
index 650eea729..449c0d82b 100644
--- a/src/testing/test_testing_data_topology_churn.conf
+++ b/src/testing/test_testing_data_topology_churn.conf
@@ -48,3 +48,12 @@ HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 AUTOSTART = NO
 
 
+
+[nat]
+DISABLEV6 = YES
+BINDTO = 127.0.0.1
+ENABLE_UPNP = NO
+BEHIND_NAT = NO
+ALLOW_NAT = NO
+INTERNAL_ADDRESS = 127.0.0.1
+EXTERNAL_ADDRESS = 127.0.0.1
diff --git a/src/testing/test_testing_data_topology_clique.conf b/src/testing/test_testing_data_topology_clique.conf
index ab86fbf13..0bd569b6a 100644
--- a/src/testing/test_testing_data_topology_clique.conf
+++ b/src/testing/test_testing_data_topology_clique.conf
@@ -55,3 +55,12 @@ HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 AUTOSTART = NO
 
 
+
+[nat]
+DISABLEV6 = YES
+BINDTO = 127.0.0.1
+ENABLE_UPNP = NO
+BEHIND_NAT = NO
+ALLOW_NAT = NO
+INTERNAL_ADDRESS = 127.0.0.1
+EXTERNAL_ADDRESS = 127.0.0.1
diff --git a/src/testing/test_testing_data_topology_clique_dfs.conf b/src/testing/test_testing_data_topology_clique_dfs.conf
index a088803b3..0b8bd83d8 100644
--- a/src/testing/test_testing_data_topology_clique_dfs.conf
+++ b/src/testing/test_testing_data_topology_clique_dfs.conf
@@ -52,3 +52,12 @@ HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 AUTOSTART = NO
 
 
+
+[nat]
+DISABLEV6 = YES
+BINDTO = 127.0.0.1
+ENABLE_UPNP = NO
+BEHIND_NAT = NO
+ALLOW_NAT = NO
+INTERNAL_ADDRESS = 127.0.0.1
+EXTERNAL_ADDRESS = 127.0.0.1
diff --git a/src/testing/test_testing_data_topology_clique_minimum.conf b/src/testing/test_testing_data_topology_clique_minimum.conf
index d6904d619..69e287dcc 100644
--- a/src/testing/test_testing_data_topology_clique_minimum.conf
+++ b/src/testing/test_testing_data_topology_clique_minimum.conf
@@ -52,3 +52,12 @@ HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 AUTOSTART = NO
 
 
+
+[nat]
+DISABLEV6 = YES
+BINDTO = 127.0.0.1
+ENABLE_UPNP = NO
+BEHIND_NAT = NO
+ALLOW_NAT = NO
+INTERNAL_ADDRESS = 127.0.0.1
+EXTERNAL_ADDRESS = 127.0.0.1
diff --git a/src/testing/test_testing_data_topology_clique_random.conf b/src/testing/test_testing_data_topology_clique_random.conf
index 0630d0ae7..f992adc8a 100644
--- a/src/testing/test_testing_data_topology_clique_random.conf
+++ b/src/testing/test_testing_data_topology_clique_random.conf
@@ -54,3 +54,12 @@ HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 AUTOSTART = NO
 
 
+
+[nat]
+DISABLEV6 = YES
+BINDTO = 127.0.0.1
+ENABLE_UPNP = NO
+BEHIND_NAT = NO
+ALLOW_NAT = NO
+INTERNAL_ADDRESS = 127.0.0.1
+EXTERNAL_ADDRESS = 127.0.0.1
diff --git a/src/testing/test_testing_data_topology_erdos_renyi.conf b/src/testing/test_testing_data_topology_erdos_renyi.conf
index 81e385239..9ceb0c31a 100644
--- a/src/testing/test_testing_data_topology_erdos_renyi.conf
+++ b/src/testing/test_testing_data_topology_erdos_renyi.conf
@@ -40,3 +40,12 @@ HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 AUTOSTART = NO
 
 
+
+[nat]
+DISABLEV6 = YES
+BINDTO = 127.0.0.1
+ENABLE_UPNP = NO
+BEHIND_NAT = NO
+ALLOW_NAT = NO
+INTERNAL_ADDRESS = 127.0.0.1
+EXTERNAL_ADDRESS = 127.0.0.1
diff --git a/src/testing/test_testing_data_topology_internat.conf b/src/testing/test_testing_data_topology_internat.conf
index 460f25a66..2bfa20917 100644
--- a/src/testing/test_testing_data_topology_internat.conf
+++ b/src/testing/test_testing_data_topology_internat.conf
@@ -40,3 +40,12 @@ HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 AUTOSTART = NO
 
 
+
+[nat]
+DISABLEV6 = YES
+BINDTO = 127.0.0.1
+ENABLE_UPNP = NO
+BEHIND_NAT = NO
+ALLOW_NAT = NO
+INTERNAL_ADDRESS = 127.0.0.1
+EXTERNAL_ADDRESS = 127.0.0.1
diff --git a/src/testing/test_testing_data_topology_none.conf b/src/testing/test_testing_data_topology_none.conf
index 6ef4c3697..0991a1d7d 100644
--- a/src/testing/test_testing_data_topology_none.conf
+++ b/src/testing/test_testing_data_topology_none.conf
@@ -57,3 +57,12 @@ HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 AUTOSTART = NO
 
 
+
+[nat]
+DISABLEV6 = YES
+BINDTO = 127.0.0.1
+ENABLE_UPNP = NO
+BEHIND_NAT = NO
+ALLOW_NAT = NO
+INTERNAL_ADDRESS = 127.0.0.1
+EXTERNAL_ADDRESS = 127.0.0.1
diff --git a/src/testing/test_testing_data_topology_ring.conf b/src/testing/test_testing_data_topology_ring.conf
index 2405125af..d590d3b49 100644
--- a/src/testing/test_testing_data_topology_ring.conf
+++ b/src/testing/test_testing_data_topology_ring.conf
@@ -40,3 +40,12 @@ HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 AUTOSTART = NO
 
 
+
+[nat]
+DISABLEV6 = YES
+BINDTO = 127.0.0.1
+ENABLE_UPNP = NO
+BEHIND_NAT = NO
+ALLOW_NAT = NO
+INTERNAL_ADDRESS = 127.0.0.1
+EXTERNAL_ADDRESS = 127.0.0.1
diff --git a/src/testing/test_testing_data_topology_scale_free.conf b/src/testing/test_testing_data_topology_scale_free.conf
index b55aad8b2..f3acfa6b0 100644
--- a/src/testing/test_testing_data_topology_scale_free.conf
+++ b/src/testing/test_testing_data_topology_scale_free.conf
@@ -50,3 +50,12 @@ HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 AUTOSTART = NO
 
 
+
+[nat]
+DISABLEV6 = YES
+BINDTO = 127.0.0.1
+ENABLE_UPNP = NO
+BEHIND_NAT = NO
+ALLOW_NAT = NO
+INTERNAL_ADDRESS = 127.0.0.1
+EXTERNAL_ADDRESS = 127.0.0.1
diff --git a/src/testing/test_testing_data_topology_small_world_ring.conf b/src/testing/test_testing_data_topology_small_world_ring.conf
index 162b14c0b..24a3b7517 100644
--- a/src/testing/test_testing_data_topology_small_world_ring.conf
+++ b/src/testing/test_testing_data_topology_small_world_ring.conf
@@ -40,3 +40,12 @@ HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 AUTOSTART = NO
 
 
+
+[nat]
+DISABLEV6 = YES
+BINDTO = 127.0.0.1
+ENABLE_UPNP = NO
+BEHIND_NAT = NO
+ALLOW_NAT = NO
+INTERNAL_ADDRESS = 127.0.0.1
+EXTERNAL_ADDRESS = 127.0.0.1
diff --git a/src/testing/test_testing_data_topology_small_world_torus.conf b/src/testing/test_testing_data_topology_small_world_torus.conf
index b52fa0cdb..c6c2dc6a3 100644
--- a/src/testing/test_testing_data_topology_small_world_torus.conf
+++ b/src/testing/test_testing_data_topology_small_world_torus.conf
@@ -40,3 +40,12 @@ HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 AUTOSTART = NO
 
 
+
+[nat]
+DISABLEV6 = YES
+BINDTO = 127.0.0.1
+ENABLE_UPNP = NO
+BEHIND_NAT = NO
+ALLOW_NAT = NO
+INTERNAL_ADDRESS = 127.0.0.1
+EXTERNAL_ADDRESS = 127.0.0.1
diff --git a/src/testing/test_testing_data_topology_stability.conf b/src/testing/test_testing_data_topology_stability.conf
index 9976e0f74..bef645a25 100644
--- a/src/testing/test_testing_data_topology_stability.conf
+++ b/src/testing/test_testing_data_topology_stability.conf
@@ -54,3 +54,12 @@ HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 AUTOSTART = NO
 
 
+
+[nat]
+DISABLEV6 = YES
+BINDTO = 127.0.0.1
+ENABLE_UPNP = NO
+BEHIND_NAT = NO
+ALLOW_NAT = NO
+INTERNAL_ADDRESS = 127.0.0.1
+EXTERNAL_ADDRESS = 127.0.0.1
diff --git a/src/testing/test_testing_peergroup_data.conf b/src/testing/test_testing_peergroup_data.conf
index 2e6b6db6c..9db8f9ede 100644
--- a/src/testing/test_testing_peergroup_data.conf
+++ b/src/testing/test_testing_peergroup_data.conf
@@ -57,3 +57,12 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 
+
+[nat]
+DISABLEV6 = YES
+BINDTO = 127.0.0.1
+ENABLE_UPNP = NO
+BEHIND_NAT = NO
+ALLOW_NAT = NO
+INTERNAL_ADDRESS = 127.0.0.1
+EXTERNAL_ADDRESS = 127.0.0.1