projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f82fe76)
fix
authorChristian Grothoff <christian@grothoff.org>
Fri, 10 Jun 2011 09:53:29 +0000 (09:53 +0000)
committerChristian Grothoff <christian@grothoff.org>
Fri, 10 Jun 2011 09:53:29 +0000 (09:53 +0000)
20 files changed:
src/testing/test_testing_connect_peer1.conf patch | blob | history
src/testing/test_testing_connect_peer2.conf patch | blob | history
src/testing/test_testing_data.conf patch | blob | history
src/testing/test_testing_data_remote.conf patch | blob | history
src/testing/test_testing_data_topology_2d_torus.conf patch | blob | history
src/testing/test_testing_data_topology_blacklist.conf patch | blob | history
src/testing/test_testing_data_topology_churn.conf patch | blob | history
src/testing/test_testing_data_topology_clique.conf patch | blob | history
src/testing/test_testing_data_topology_clique_dfs.conf patch | blob | history
src/testing/test_testing_data_topology_clique_minimum.conf patch | blob | history
src/testing/test_testing_data_topology_clique_random.conf patch | blob | history
src/testing/test_testing_data_topology_erdos_renyi.conf patch | blob | history
src/testing/test_testing_data_topology_internat.conf patch | blob | history
src/testing/test_testing_data_topology_none.conf patch | blob | history
src/testing/test_testing_data_topology_ring.conf patch | blob | history
src/testing/test_testing_data_topology_scale_free.conf patch | blob | history
src/testing/test_testing_data_topology_small_world_ring.conf patch | blob | history
src/testing/test_testing_data_topology_small_world_torus.conf patch | blob | history
src/testing/test_testing_data_topology_stability.conf patch | blob | history
src/testing/test_testing_peergroup_data.conf patch | blob | history

diff --git a/src/testing/test_testing_connect_peer1.conf b/src/testing/test_testing_connect_peer1.conf
index d5b2f6178736110241aca87a63d5a83979d2ab84..fec00cbe7442fd43ad27111a26e9d38016c7ae75 100644 (file)
--- 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 0b40fb53477c416310dab50b49a269a5fbc6ffc4..4b63d4721f6962c2ad6253dac7a0d531e50765c7 100644 (file)
--- 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 80b2fdfc1d8d6e6927dcfc6c3a6a55c99ff0d868..e9a443a1c454b6ee76bcf48c80d500b6dccfcda1 100644 (file)
--- 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 0f76fb862316dcaf3fed372c342962b00c443168..70308176454222ed2151d5b495cd3314d7daadb3 100644 (file)
--- 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 dcc63334e3087bc7adfea92d193b741fd58fa621..66b35c7fc5e67950588c04632154862f6bfe1f83 100644 (file)
--- 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 f970e40a41323bb2e50da368ba549e5097e9f0f3..bd50557c989a6556eccb9501a1c746b8241cba20 100644 (file)
--- 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 650eea729bc994f238a278f3c8a91172ab2a6c31..449c0d82bb08a8c03cdaa0bf565b11152c008137 100644 (file)
--- 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 ab86fbf1356746ff3761df62703f7df1b8f07e8d..0bd569b6afc811f11fbd87acf759f9dc4907199f 100644 (file)
--- 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 a088803b3de0a8b363da94210c0372b896b9bc83..0b8bd83d86c40dc755b4b3fcfe6d4ab3bf8fd309 100644 (file)
--- 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 d6904d6197c68a92cfbbc29a5a17d4eeb0dbebe0..69e287dccf923a5c0fb42f51861cd0c34af33a49 100644 (file)
--- 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 0630d0ae779bcd94fd34beb172d085cf26ffddf0..f992adc8a43a5e2369ac9472658d69e6a18adb44 100644 (file)
--- 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 81e385239a749a6c34d50b235862b965ad4bb084..9ceb0c31a78865ca40b04e02784da6c701af1973 100644 (file)
--- 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 460f25a668e95688b2700e61a0c3f9fa8f7e3cfb..2bfa20917e002f20332bd9ca97d2d4229ac060bd 100644 (file)
--- 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 6ef4c3697b9095cc70291a4ba98c6bce5e368404..0991a1d7d1aacb8918d0f9bd989dcf802f8bce89 100644 (file)
--- 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 2405125af5dd6c1189ef8cbaf65695accc7c43a2..d590d3b49e9148e6d226cef88ec53c08b9a9cf32 100644 (file)
--- 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 b55aad8b20440925c13aaa73f710b76084120ffe..f3acfa6b009e782dd6c672fd43096d20314b8503 100644 (file)
--- 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 162b14c0b2a0b5fd9cb465bf2b3755238c50d2f2..24a3b7517bd75b55b16e8d4aa99f0ba1d764de3c 100644 (file)
--- 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 b52fa0cdbfc86ef6a14db019869303a91247c756..c6c2dc6a36cc19dc5db51991d240563e2f666719 100644 (file)
--- 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 9976e0f74ab671db1bd0bac5d63591efdcc3662d..bef645a25eddd2c489c26eb22f94edd8e40c543c 100644 (file)
--- 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 2e6b6db6c8355646060aaee653b31d6ece9d225b..9db8f9ede3a28c82819ce57cef1d6cfc8d76fcb1 100644 (file)
--- 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
Unnamed repository; edit this file 'description' to name the repository.