LRN: use bindto instead of use-localaddr

diff --git a/src/dht/test_dht_api_peer1.conf b/src/dht/test_dht_api_peer1.conf
index fc08be8c4e358a52c92b61ee8f79de45825e62c5..ae0d2ff496b383175b3cd768a7ff462aeaca5ec0 100644 (file)
--- a/src/dht/test_dht_api_peer1.conf
+++ b/src/dht/test_dht_api_peer1.conf
@@ -40,6 +40,7 @@ DEBUG = NO
 [transport-tcp]
 TIMEOUT = 300000
 PORT = 12368
+BINDTO = 127.0.0.1
 
 [TESTING]
 WEAKRANDOM = YES

diff --git a/src/dht/test_dht_multipeer_data.conf b/src/dht/test_dht_multipeer_data.conf
index 9aae4a258ae369efcd11aa62727642d3cb3129d8..e792aa6e386f696ce5d889e0189278bdbabca5e0 100644 (file)
--- a/src/dht/test_dht_multipeer_data.conf
+++ b/src/dht/test_dht_multipeer_data.conf
@@ -71,6 +71,7 @@ DEBUG = NO
 [transport-tcp]
 TIMEOUT = 300000
 PORT = 12368
+BINDTO = 127.0.0.1
 
 [DHT_TESTING]
 MYSQL_LOGGING_EXTENDED = NO
@@ -104,7 +105,7 @@ BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = YES
+USE_LOCALADDR = NO
 
 [dns]
 AUTOSTART = NO

diff --git a/src/dht/test_dht_twopeer_data.conf b/src/dht/test_dht_twopeer_data.conf
index 49465ffef958d4744b5fc9e1c41304dd0d91a620..7733f6405eca5ff2ac7ce9798c1f5d2675adacd6 100644 (file)
--- a/src/dht/test_dht_twopeer_data.conf
+++ b/src/dht/test_dht_twopeer_data.conf
@@ -38,6 +38,7 @@ DEBUG = NO
 [transport-tcp]
 TIMEOUT = 300000
 PORT = 12368
+BINDTO = 127.0.0.1
 
 [TESTING]
 WEAKRANDOM = YES
@@ -54,7 +55,7 @@ BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = YES
+USE_LOCALADDR = NO
 
 [dns]
 AUTOSTART = NO

diff --git a/src/dht/test_dhtlog_data.conf b/src/dht/test_dhtlog_data.conf
index cc3fbf72df3f4eddc77656451ca884acb3131673..22fb6ed465e29c1f5ec7aceef8a4938c93e8520b 100644 (file)
--- a/src/dht/test_dhtlog_data.conf
+++ b/src/dht/test_dhtlog_data.conf
@@ -24,6 +24,7 @@ DEBUG = NO
 [transport-tcp]
 TIMEOUT = 300000
 PORT = 12368
+BINDTO = 127.0.0.1
 
 [TESTING]
 WEAKRANDOM = YES

diff --git a/src/dv/test_transport_dv_data.conf b/src/dv/test_transport_dv_data.conf
index 156fff03ab838b5a2a4eaee031a6c629c7935f96..5eb2b6c1c0c7bbd528e4b2be4b618655e851f99c 100644 (file)
--- a/src/dv/test_transport_dv_data.conf
+++ b/src/dv/test_transport_dv_data.conf
@@ -11,12 +11,7 @@ PORT = 2565
 PLUGINS = tcp dv
 BLACKLIST_FILE = $SERVICEHOME/blacklist
 BINARY = gnunet-service-transport
-# FIXME: this should do nothing, why does LRN say it is needed?
-USE_LOCALADDR = YES
-
-[nat]
-# FIXME: probably a 'bindto' setting would be better?
-USE_LOCALADDR = YES
+USE_LOCALADDR = NO
 
 [arm]
 PORT = 2566
@@ -27,6 +22,7 @@ PORT = 2567
 
 [transport-tcp]
 PORT = 2568
+BINDTO = 127.0.0.1
 
 [transport-udp]
 PORT = 2568