projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7391304)
nomesh
authorChristian Grothoff <christian@grothoff.org>
Wed, 25 May 2011 00:31:29 +0000 (00:31 +0000)
committerChristian Grothoff <christian@grothoff.org>
Wed, 25 May 2011 00:31:29 +0000 (00:31 +0000)
src/hostlist/learning_data.conf patch | blob | history
src/hostlist/test_gnunet_daemon_hostlist.c patch | blob | history
src/hostlist/test_gnunet_daemon_hostlist.conf patch | blob | history
src/hostlist/test_gnunet_daemon_hostlist_data.conf patch | blob | history
src/hostlist/test_gnunet_daemon_hostlist_learning.c patch | blob | history
src/hostlist/test_gnunet_daemon_hostlist_peer1.conf patch | blob | history
src/hostlist/test_gnunet_daemon_hostlist_peer2.conf patch | blob | history
src/hostlist/test_gnunet_daemon_hostlist_reconnect.c patch | blob | history
src/hostlist/test_learning_adv_peer.conf patch | blob | history
src/hostlist/test_learning_learn_peer.conf patch | blob | history
src/hostlist/test_learning_learn_peer2.conf patch | blob | history

diff --git a/src/hostlist/learning_data.conf b/src/hostlist/learning_data.conf
index 301154535e9c4b84326b7fc2435fefd728af0309..4c872b03b6c02d83a9ffc8d6de558da49ee3ed83 100644 (file)
--- 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 b3859f6c82622e9798a656dc18a75011a042a4d7..7e42dda592f4c8b19b47b61a57dd4666c02edae1 100644 (file)
--- 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 9541f6de56ddb6b809301892df568a0607a231fa..a371a0a8d374899950141189ab65482dbc433e71 100644 (file)
--- 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 41fafd8b82d0dd4b7a9e3398f8034b37aab81b34..b7cf7b1ac3ba332a32c29231e9f4358bdddbc14c 100644 (file)
--- 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 9fc4292238590e7689a507c59cd06b1799b2a946..9a9e98cfecdb8adc81217b83aa14d1024fd2380c 100644 (file)
--- 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 4d7d328594b9fd7efe6f13c5e6d8e4325f7ac3d2..109e69214cac85ad97832c59865febc7323a80b9 100644 (file)
--- 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 49ccdccfac214d48594c0805d4373491806e5f71..fdedf6e38bd57e20b21c463dcdcb10f98c47fa27 100644 (file)
--- 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 f3ce5747c758572fb839a1c0580c000755bddeeb..7b6c858d4d2b0f148433ca3bb307fa7c1a27c466 100644 (file)
--- 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 9a364b0abcf211cd9901549bc776148c390e0791..cc9e8154c2d85668b39ca44b2b31a24e755c69a3 100644 (file)
--- 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 c2d02e1d36e57d4bc8ae0e55afd55874e04c61ee..a147b88bef51c79670ff6ba84b161caf0a186fc7 100644 (file)
--- 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 51c3fca52e898106b9dd55cc5aecfc2afbea2e0c..b281802ca8e92db54fc7989f2f207303fe1360f5 100644 (file)
--- 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
+
+
Unnamed repository; edit this file 'description' to name the repository.