[GNUnet-SVN] r15288 - gnunet/src/hostlist

[gnunet]

Author: grothoff
Date: 2011-05-25 02:31:29 +0200 (Wed, 25 May 2011)
New Revision: 15288

Modified:
   gnunet/src/hostlist/learning_data.conf
   gnunet/src/hostlist/test_gnunet_daemon_hostlist.c
   gnunet/src/hostlist/test_gnunet_daemon_hostlist.conf
   gnunet/src/hostlist/test_gnunet_daemon_hostlist_data.conf
   gnunet/src/hostlist/test_gnunet_daemon_hostlist_learning.c
   gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
   gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
   gnunet/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c
   gnunet/src/hostlist/test_learning_adv_peer.conf
   gnunet/src/hostlist/test_learning_learn_peer.conf
   gnunet/src/hostlist/test_learning_learn_peer2.conf
Log:
nomesh

Modified: gnunet/src/hostlist/learning_data.conf
===================================================================
--- gnunet/src/hostlist/learning_data.conf      2011-05-25 00:19:22 UTC (rev 
15287)
+++ gnunet/src/hostlist/learning_data.conf      2011-05-25 00:31:29 UTC (rev 
15288)
@@ -18,3 +18,7 @@
 [testing]
 WEAKRANDOM = YES
 
+[mesh]
+AUTOSTART = NO
+
+

Modified: gnunet/src/hostlist/test_gnunet_daemon_hostlist.c
===================================================================
--- gnunet/src/hostlist/test_gnunet_daemon_hostlist.c   2011-05-25 00:19:22 UTC 
(rev 15287)
+++ gnunet/src/hostlist/test_gnunet_daemon_hostlist.c   2011-05-25 00:31:29 UTC 
(rev 15288)
@@ -234,8 +234,9 @@
   
   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 @@
 #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; 
 }
 

Modified: gnunet/src/hostlist/test_gnunet_daemon_hostlist.conf
===================================================================
--- gnunet/src/hostlist/test_gnunet_daemon_hostlist.conf        2011-05-25 
00:19:22 UTC (rev 15287)
+++ gnunet/src/hostlist/test_gnunet_daemon_hostlist.conf        2011-05-25 
00:31:29 UTC (rev 15288)
@@ -47,3 +47,7 @@
 SERVERS = http://localhost:22471/
 HTTP-PROXY = 
 HTTPPORT = 12471
+[mesh]
+AUTOSTART = NO
+
+

Modified: gnunet/src/hostlist/test_gnunet_daemon_hostlist_data.conf
===================================================================
--- gnunet/src/hostlist/test_gnunet_daemon_hostlist_data.conf   2011-05-25 
00:19:22 UTC (rev 15287)
+++ gnunet/src/hostlist/test_gnunet_daemon_hostlist_data.conf   2011-05-25 
00:31:29 UTC (rev 15288)
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-hostlist/
+SERVICEHOME = /tmp/test-gnunet-hostlist/
 DEFAULTCONFIG = /etc/gnunetd.conf
 
 [hostlist]
@@ -59,3 +59,7 @@
 
 [datastore]
 AUTOSTART = NO
+[mesh]
+AUTOSTART = NO
+
+

Modified: gnunet/src/hostlist/test_gnunet_daemon_hostlist_learning.c
===================================================================
--- gnunet/src/hostlist/test_gnunet_daemon_hostlist_learning.c  2011-05-25 
00:19:22 UTC (rev 15287)
+++ gnunet/src/hostlist/test_gnunet_daemon_hostlist_learning.c  2011-05-25 
00:31:29 UTC (rev 15288)
@@ -538,8 +538,8 @@
 { 
   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 @@
 #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"))

Modified: gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
===================================================================
--- gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf  2011-05-25 
00:19:22 UTC (rev 15287)
+++ gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf  2011-05-25 
00:31:29 UTC (rev 15288)
@@ -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 @@
 [dht]
 AUTOSTART = NO
 
+[mesh]
+AUTOSTART = NO
+
+

Modified: gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
===================================================================
--- gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf  2011-05-25 
00:19:22 UTC (rev 15287)
+++ gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf  2011-05-25 
00:31:29 UTC (rev 15288)
@@ -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
 
 [dht]
-AUTOSTART = NO
\ No newline at end of file
+AUTOSTART = NO[mesh]
+AUTOSTART = NO
+
+

Modified: gnunet/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c
===================================================================
--- gnunet/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c 2011-05-25 
00:19:22 UTC (rev 15287)
+++ gnunet/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c 2011-05-25 
00:31:29 UTC (rev 15288)
@@ -238,8 +238,9 @@
   
   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 @@
       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 */

Modified: gnunet/src/hostlist/test_learning_adv_peer.conf
===================================================================
--- gnunet/src/hostlist/test_learning_adv_peer.conf     2011-05-25 00:19:22 UTC 
(rev 15287)
+++ gnunet/src/hostlist/test_learning_adv_peer.conf     2011-05-25 00:31:29 UTC 
(rev 15288)
@@ -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 @@
 
 [dht]
 AUTOSTART = NO
+[mesh]
+AUTOSTART = NO
+
+

Modified: gnunet/src/hostlist/test_learning_learn_peer.conf
===================================================================
--- gnunet/src/hostlist/test_learning_learn_peer.conf   2011-05-25 00:19:22 UTC 
(rev 15287)
+++ gnunet/src/hostlist/test_learning_learn_peer.conf   2011-05-25 00:31:29 UTC 
(rev 15288)
@@ -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 @@
 
 [dht]
 AUTOSTART = NO
+[mesh]
+AUTOSTART = NO
+
+

Modified: gnunet/src/hostlist/test_learning_learn_peer2.conf
===================================================================
--- gnunet/src/hostlist/test_learning_learn_peer2.conf  2011-05-25 00:19:22 UTC 
(rev 15287)
+++ gnunet/src/hostlist/test_learning_learn_peer2.conf  2011-05-25 00:31:29 UTC 
(rev 15288)
@@ -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 @@
 [topology]
 #DEBUG = YES
 #PREFIX = valgrind --tool=memcheck
+[mesh]
+AUTOSTART = NO
+
+