cleanup

diff --git a/src/dht/gnunet-service-dht.c b/src/dht/gnunet-service-dht.c
index c4eec97ec93fd2728034c73e16de8ec2e8808674..ce1687df9dafae44cb076565a455eb1b2461b3b7 100644 (file)
--- a/src/dht/gnunet-service-dht.c
+++ b/src/dht/gnunet-service-dht.c
@@ -27,7 +27,7 @@
  * TODO:
  * - decide which 'benchmark'/test functions to keep (malicious code, kademlia, etc.)
  * - decide on 'stop_on_closest', 'stop_on_found', 'do_find_peer', 'paper_forwarding'
- * - use OPTION_MULTIPLE instead of linked list ofr the forward_list.hashmap
+ * - use OPTION_MULTIPLE instead of linked list for the forward_list.hashmap
  * - use different 'struct DHT_MessageContext' for the different types of
  *   messages (currently rather confusing, especially with things like
  *   peer bloom filters occuring when processing replies).

diff --git a/src/dht/test_dht_twopeer_data.conf b/src/dht/test_dht_twopeer_data.conf
index 0f4d4188ec647361c9a03709b781802516cf8bd4..49465ffef958d4744b5fc9e1c41304dd0d91a620 100644 (file)
--- a/src/dht/test_dht_twopeer_data.conf
+++ b/src/dht/test_dht_twopeer_data.conf
@@ -1,5 +1,6 @@
-[fs]
-AUTOSTART = NO
+[PATHS]
+DEFAULTCONFIG = test_dht_twopeer_data.conf
+SERVICEHOME = /tmp/test-dht-twopeer/
 
 [resolver]
 AUTOSTART = YES
@@ -9,7 +10,6 @@ DEBUG = NO
 AUTOSTART = YES
 #PREFIX = xterm -T dht -e gdb --args
 PORT = 2100
-PUT_PEER_IDENTITIES = YES
 
 [block]
 plugins = test dht dns
@@ -47,11 +47,6 @@ HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 [gnunetd]
 HOSTKEY = $SERVICEHOME/.hostkey
 
-[PATHS]
-DEFAULTCONFIG = test_dht_twopeer_data.conf
-SERVICEHOME = /tmp/test-dht-twopeer/
-
-
 [nat]
 DISABLEV6 = YES
 ENABLE_UPNP = NO
@@ -64,9 +59,12 @@ USE_LOCALADDR = YES
 [dns]
 AUTOSTART = NO
 
-
+[mesh]
+AUTOSTART = NO
 
 [nse]
 AUTOSTART = NO
 
+[fs]
+AUTOSTART = NO