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

fixes
---

diff --git a/src/chat/test_chat_data.conf b/src/chat/test_chat_data.conf
index ec554d05e..60a2f7d0b 100644
--- a/src/chat/test_chat_data.conf
+++ b/src/chat/test_chat_data.conf
@@ -35,3 +35,12 @@ BINARY = gnunet-service-chat
 
 [testing]
 WEAKRANDOM = YES
+
+[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/chat/test_chat_peer1.conf b/src/chat/test_chat_peer1.conf
index af4aa91ae..f76c5076c 100644
--- a/src/chat/test_chat_peer1.conf
+++ b/src/chat/test_chat_peer1.conf
@@ -74,4 +74,12 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 [mesh]
-AUTOSTART = NO
\ No newline at end of file
+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/chat/test_chat_peer2.conf b/src/chat/test_chat_peer2.conf
index a9feb1b82..9c57ecd4e 100644
--- a/src/chat/test_chat_peer2.conf
+++ b/src/chat/test_chat_peer2.conf
@@ -75,3 +75,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/chat/test_chat_peer3.conf b/src/chat/test_chat_peer3.conf
index a76ec0365..8b307298d 100644
--- a/src/chat/test_chat_peer3.conf
+++ b/src/chat/test_chat_peer3.conf
@@ -75,3 +75,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/dht/test_dht_api_data.conf b/src/dht/test_dht_api_data.conf
index c6553ea33..50e46caaf 100644
--- a/src/dht/test_dht_api_data.conf
+++ b/src/dht/test_dht_api_data.conf
@@ -62,3 +62,12 @@ HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 [gnunetd]
 HOSTKEY = $SERVICEHOME/.hostkey
 
+
+[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/dht/test_dht_api_peer1.conf b/src/dht/test_dht_api_peer1.conf
index 7c4d48366..0312df913 100644
--- a/src/dht/test_dht_api_peer1.conf
+++ b/src/dht/test_dht_api_peer1.conf
@@ -51,3 +51,12 @@ HOSTKEY = $SERVICEHOME/.hostkey
 DEFAULTCONFIG = test_dht_api_peer1.conf
 SERVICEHOME = /tmp/test-gnunetd-dht-peer-1/
 
+
+[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/dht/test_dht_multipeer_data.conf b/src/dht/test_dht_multipeer_data.conf
index 4219f6cf9..a3247e6bf 100644
--- a/src/dht/test_dht_multipeer_data.conf
+++ b/src/dht/test_dht_multipeer_data.conf
@@ -96,3 +96,12 @@ HOSTKEY = $SERVICEHOME/.hostkey
 [PATHS]
 DEFAULTCONFIG = test_dht_multipeer_data.conf
 SERVICEHOME = /tmp/test-dht-multipeer/
+
+[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/dht/test_dht_twopeer_data.conf b/src/dht/test_dht_twopeer_data.conf
index 08d21662a..044245a87 100644
--- a/src/dht/test_dht_twopeer_data.conf
+++ b/src/dht/test_dht_twopeer_data.conf
@@ -51,3 +51,12 @@ HOSTKEY = $SERVICEHOME/.hostkey
 DEFAULTCONFIG = test_dht_twopeer_data.conf
 SERVICEHOME = /tmp/test-dht-twopeer/
 
+
+[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/dht/test_dhtlog_data.conf b/src/dht/test_dhtlog_data.conf
index 26244af0d..ab108b5dc 100644
--- a/src/dht/test_dhtlog_data.conf
+++ b/src/dht/test_dhtlog_data.conf
@@ -46,3 +46,12 @@ USER = dht
 PASSWORD = dht
 SERVER = 
 MYSQL_PORT = 3306
+
+[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/dv/test_transport_dv_data.conf b/src/dv/test_transport_dv_data.conf
index 17a85167c..27c50bae8 100644
--- a/src/dv/test_transport_dv_data.conf
+++ b/src/dv/test_transport_dv_data.conf
@@ -61,3 +61,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