From 9cc7fea00a1af2f2c6ff7238405eed7a4023f7a5 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Wed, 25 May 2011 00:31:29 +0000
Subject: [PATCH] nomesh

---
 src/hostlist/learning_data.conf                      |  4 ++++
 src/hostlist/test_gnunet_daemon_hostlist.c           | 10 ++++++----
 src/hostlist/test_gnunet_daemon_hostlist.conf        |  4 ++++
 src/hostlist/test_gnunet_daemon_hostlist_data.conf   |  6 +++++-
 src/hostlist/test_gnunet_daemon_hostlist_learning.c  |  8 ++++----
 src/hostlist/test_gnunet_daemon_hostlist_peer1.conf  |  6 +++++-
 src/hostlist/test_gnunet_daemon_hostlist_peer2.conf  |  7 +++++--
 src/hostlist/test_gnunet_daemon_hostlist_reconnect.c | 12 +++++++-----
 src/hostlist/test_learning_adv_peer.conf             |  6 +++++-
 src/hostlist/test_learning_learn_peer.conf           |  6 +++++-
 src/hostlist/test_learning_learn_peer2.conf          |  6 +++++-
 11 files changed, 55 insertions(+), 20 deletions(-)

diff --git a/src/hostlist/learning_data.conf b/src/hostlist/learning_data.conf
index 301154535..4c872b03b 100644
--- a/src/hostlist/learning_data.conf
+++ b/src/hostlist/learning_data.conf
@@ -18,3 +18,7 @@ HTTP-PROXY =
 [testing]
 WEAKRANDOM = YES
 
+[mesh]
+AUTOSTART = NO
+
+
diff --git a/src/hostlist/test_gnunet_daemon_hostlist.c b/src/hostlist/test_gnunet_daemon_hostlist.c
index b3859f6c8..7e42dda59 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist.c
@@ -234,8 +234,9 @@ main (int argc, char *argv[])
   
   int ret;
 
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-hostlist-peer-1");
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-hostlist-peer-2");
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-1");
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-2");
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist");
   GNUNET_log_setup ("test-gnunet-daemon-hostlist",
 #if VERBOSE
                     "DEBUG",
@@ -244,8 +245,9 @@ main (int argc, char *argv[])
 #endif
                     NULL);
   ret = check ();
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-hostlist-peer-1");
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-hostlist-peer-2");
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-1");
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-2");
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist");
   return ret; 
 }
 
diff --git a/src/hostlist/test_gnunet_daemon_hostlist.conf b/src/hostlist/test_gnunet_daemon_hostlist.conf
index 9541f6de5..a371a0a8d 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist.conf
@@ -47,3 +47,7 @@ OPTIONS = -b
 SERVERS = http://localhost:22471/
 HTTP-PROXY = 
 HTTPPORT = 12471
+[mesh]
+AUTOSTART = NO
+
+
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_data.conf b/src/hostlist/test_gnunet_daemon_hostlist_data.conf
index 41fafd8b8..b7cf7b1ac 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_data.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_data.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-hostlist/
+SERVICEHOME = /tmp/test-gnunet-hostlist/
 DEFAULTCONFIG = /etc/gnunetd.conf
 
 [hostlist]
@@ -59,3 +59,7 @@ AUTOSTART = NO
 
 [datastore]
 AUTOSTART = NO
+[mesh]
+AUTOSTART = NO
+
+
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_learning.c b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
index 9fc429223..9a9e98cfe 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_learning.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
@@ -538,8 +538,8 @@ main (int argc, char *argv[])
 { 
   int ret;
 
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-hostlist-peer-1");
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-hostlist-peer-2");
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-1");
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-2");
   GNUNET_log_setup ("test-gnunet-daemon-hostlist",
 #if VERBOSE
                     "DEBUG",
@@ -548,8 +548,8 @@ main (int argc, char *argv[])
 #endif
                     NULL);
   ret = check ();
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-hostlist-peer-1");
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-hostlist-peer-2");
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-1");
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-2");
   if (GNUNET_YES == GNUNET_DISK_file_test ("hostlists_learn_peer.file"))
     {
       if (0 == UNLINK("hostlists_learn_peer.file"))
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
index 4d7d32859..109e69214 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-hostlist-peer-1/
+SERVICEHOME = /tmp/test-gnunet-hostlist-peer-1/
 DEFAULTCONFIG = test_gnunet_daemon_hostlist_peer1.conf
 
 [resolver]
@@ -64,3 +64,7 @@ AUTOSTART = NO
 [dht]
 AUTOSTART = NO
 
+[mesh]
+AUTOSTART = NO
+
+
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
index 49ccdccfa..fdedf6e38 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-hostlist-peer-2/
+SERVICEHOME = /tmp/test-gnunet-hostlist-peer-2/
 DEFAULTCONFIG = test_gnunet_daemon_hostlist_peer2.conf
 
 [resolver]
@@ -61,4 +61,7 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 [dht]
-AUTOSTART = NO
\ No newline at end of file
+AUTOSTART = NO[mesh]
+AUTOSTART = NO
+
+
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c b/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c
index f3ce5747c..7b6c858d4 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c
@@ -238,8 +238,9 @@ main (int argc, char *argv[])
   
   int ret;
 
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-hostlist-peer-1");
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-hostlist-peer-2");
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-1");
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-2");
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-3");
   GNUNET_log_setup ("test-gnunet-daemon-hostlist",
 #if VERBOSE
                     "DEBUG",
@@ -255,9 +256,10 @@ main (int argc, char *argv[])
       ret = check ();
       fprintf (stderr, ".\n");
     }
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-hostlist-peer-1");
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-hostlist-peer-2");
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-1");
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-2");
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-3");
   return ret; 
 }
 
-/* end of test_gnunet_daemon_hostlist.c */
+/* end of test_gnunet_daemon_hostlist_reconnect.c */
diff --git a/src/hostlist/test_learning_adv_peer.conf b/src/hostlist/test_learning_adv_peer.conf
index 9a364b0ab..cc9e8154c 100644
--- a/src/hostlist/test_learning_adv_peer.conf
+++ b/src/hostlist/test_learning_adv_peer.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test-hostlist-peer-2/
+SERVICEHOME = /tmp/test-gnunet-hostlist-peer-1/
 DEFAULTCONFIG = test_learning_adv_peer.conf
 
 [resolver]
@@ -61,3 +61,7 @@ AUTOSTART = NO
 
 [dht]
 AUTOSTART = NO
+[mesh]
+AUTOSTART = NO
+
+
diff --git a/src/hostlist/test_learning_learn_peer.conf b/src/hostlist/test_learning_learn_peer.conf
index c2d02e1d3..a147b88be 100644
--- a/src/hostlist/test_learning_learn_peer.conf
+++ b/src/hostlist/test_learning_learn_peer.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test-hostlist-peer-1/
+SERVICEHOME = /tmp/test-gnunet-hostlist-peer-2/
 DEFAULTCONFIG = test_learning_learn_peer.conf
 
 [resolver]
@@ -61,3 +61,7 @@ AUTOSTART = NO
 
 [dht]
 AUTOSTART = NO
+[mesh]
+AUTOSTART = NO
+
+
diff --git a/src/hostlist/test_learning_learn_peer2.conf b/src/hostlist/test_learning_learn_peer2.conf
index 51c3fca52..b281802ca 100644
--- a/src/hostlist/test_learning_learn_peer2.conf
+++ b/src/hostlist/test_learning_learn_peer2.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-hostlist-peer-3/
+SERVICEHOME = /tmp/test-gnunet-hostlist-peer-3/
 DEFAULTCONFIG = test_learning_learn_peer2.conf
 
 [resolver]
@@ -53,3 +53,7 @@ HOSTLISTFILE = hostlists_learn_peer2.file
 [topology]
 #DEBUG = YES
 #PREFIX = valgrind --tool=memcheck
+[mesh]
+AUTOSTART = NO
+
+
-- 
2.25.1