aboutsummaryrefslogtreecommitdiff
path: root/src/hostlist
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-05-25 00:31:29 +0000
committerChristian Grothoff <christian@grothoff.org>2011-05-25 00:31:29 +0000
commit9cc7fea00a1af2f2c6ff7238405eed7a4023f7a5 (patch)
tree515f5977f13730d96f0ac5f97b3e8fa6897281da /src/hostlist
parent739130474d3d636d39bcfc16ebceb606ff37bd2c (diff)
downloadgnunet-9cc7fea00a1af2f2c6ff7238405eed7a4023f7a5.tar.gz
gnunet-9cc7fea00a1af2f2c6ff7238405eed7a4023f7a5.zip
nomesh
Diffstat (limited to 'src/hostlist')
-rw-r--r--src/hostlist/learning_data.conf4
-rw-r--r--src/hostlist/test_gnunet_daemon_hostlist.c10
-rw-r--r--src/hostlist/test_gnunet_daemon_hostlist.conf4
-rw-r--r--src/hostlist/test_gnunet_daemon_hostlist_data.conf6
-rw-r--r--src/hostlist/test_gnunet_daemon_hostlist_learning.c8
-rw-r--r--src/hostlist/test_gnunet_daemon_hostlist_peer1.conf6
-rw-r--r--src/hostlist/test_gnunet_daemon_hostlist_peer2.conf7
-rw-r--r--src/hostlist/test_gnunet_daemon_hostlist_reconnect.c12
-rw-r--r--src/hostlist/test_learning_adv_peer.conf6
-rw-r--r--src/hostlist/test_learning_learn_peer.conf6
-rw-r--r--src/hostlist/test_learning_learn_peer2.conf6
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 =
18[testing] 18[testing]
19WEAKRANDOM = YES 19WEAKRANDOM = YES
20 20
21[mesh]
22AUTOSTART = NO
23
24
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[])
234 234
235 int ret; 235 int ret;
236 236
237 GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-hostlist-peer-1"); 237 GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-1");
238 GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-hostlist-peer-2"); 238 GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-2");
239 GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist");
239 GNUNET_log_setup ("test-gnunet-daemon-hostlist", 240 GNUNET_log_setup ("test-gnunet-daemon-hostlist",
240#if VERBOSE 241#if VERBOSE
241 "DEBUG", 242 "DEBUG",
@@ -244,8 +245,9 @@ main (int argc, char *argv[])
244#endif 245#endif
245 NULL); 246 NULL);
246 ret = check (); 247 ret = check ();
247 GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-hostlist-peer-1"); 248 GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-1");
248 GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-hostlist-peer-2"); 249 GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-2");
250 GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist");
249 return ret; 251 return ret;
250} 252}
251 253
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
47SERVERS = http://localhost:22471/ 47SERVERS = http://localhost:22471/
48HTTP-PROXY = 48HTTP-PROXY =
49HTTPPORT = 12471 49HTTPPORT = 12471
50[mesh]
51AUTOSTART = NO
52
53
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 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/test-gnunetd-hostlist/ 2SERVICEHOME = /tmp/test-gnunet-hostlist/
3DEFAULTCONFIG = /etc/gnunetd.conf 3DEFAULTCONFIG = /etc/gnunetd.conf
4 4
5[hostlist] 5[hostlist]
@@ -59,3 +59,7 @@ AUTOSTART = NO
59 59
60[datastore] 60[datastore]
61AUTOSTART = NO 61AUTOSTART = NO
62[mesh]
63AUTOSTART = NO
64
65
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[])
538{ 538{
539 int ret; 539 int ret;
540 540
541 GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-hostlist-peer-1"); 541 GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-1");
542 GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-hostlist-peer-2"); 542 GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-2");
543 GNUNET_log_setup ("test-gnunet-daemon-hostlist", 543 GNUNET_log_setup ("test-gnunet-daemon-hostlist",
544#if VERBOSE 544#if VERBOSE
545 "DEBUG", 545 "DEBUG",
@@ -548,8 +548,8 @@ main (int argc, char *argv[])
548#endif 548#endif
549 NULL); 549 NULL);
550 ret = check (); 550 ret = check ();
551 GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-hostlist-peer-1"); 551 GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-1");
552 GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-hostlist-peer-2"); 552 GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-2");
553 if (GNUNET_YES == GNUNET_DISK_file_test ("hostlists_learn_peer.file")) 553 if (GNUNET_YES == GNUNET_DISK_file_test ("hostlists_learn_peer.file"))
554 { 554 {
555 if (0 == UNLINK("hostlists_learn_peer.file")) 555 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 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/test-gnunetd-hostlist-peer-1/ 2SERVICEHOME = /tmp/test-gnunet-hostlist-peer-1/
3DEFAULTCONFIG = test_gnunet_daemon_hostlist_peer1.conf 3DEFAULTCONFIG = test_gnunet_daemon_hostlist_peer1.conf
4 4
5[resolver] 5[resolver]
@@ -64,3 +64,7 @@ AUTOSTART = NO
64[dht] 64[dht]
65AUTOSTART = NO 65AUTOSTART = NO
66 66
67[mesh]
68AUTOSTART = NO
69
70
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 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/test-gnunetd-hostlist-peer-2/ 2SERVICEHOME = /tmp/test-gnunet-hostlist-peer-2/
3DEFAULTCONFIG = test_gnunet_daemon_hostlist_peer2.conf 3DEFAULTCONFIG = test_gnunet_daemon_hostlist_peer2.conf
4 4
5[resolver] 5[resolver]
@@ -61,4 +61,7 @@ AUTOSTART = NO
61AUTOSTART = NO 61AUTOSTART = NO
62 62
63[dht] 63[dht]
64AUTOSTART = NO \ No newline at end of file 64AUTOSTART = NO[mesh]
65AUTOSTART = NO
66
67
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[])
238 238
239 int ret; 239 int ret;
240 240
241 GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-hostlist-peer-1"); 241 GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-1");
242 GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-hostlist-peer-2"); 242 GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-2");
243 GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-3");
243 GNUNET_log_setup ("test-gnunet-daemon-hostlist", 244 GNUNET_log_setup ("test-gnunet-daemon-hostlist",
244#if VERBOSE 245#if VERBOSE
245 "DEBUG", 246 "DEBUG",
@@ -255,9 +256,10 @@ main (int argc, char *argv[])
255 ret = check (); 256 ret = check ();
256 fprintf (stderr, ".\n"); 257 fprintf (stderr, ".\n");
257 } 258 }
258 GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-hostlist-peer-1"); 259 GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-1");
259 GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-hostlist-peer-2"); 260 GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-2");
261 GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-3");
260 return ret; 262 return ret;
261} 263}
262 264
263/* end of test_gnunet_daemon_hostlist.c */ 265/* 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 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/test-hostlist-peer-2/ 2SERVICEHOME = /tmp/test-gnunet-hostlist-peer-1/
3DEFAULTCONFIG = test_learning_adv_peer.conf 3DEFAULTCONFIG = test_learning_adv_peer.conf
4 4
5[resolver] 5[resolver]
@@ -61,3 +61,7 @@ AUTOSTART = NO
61 61
62[dht] 62[dht]
63AUTOSTART = NO 63AUTOSTART = NO
64[mesh]
65AUTOSTART = NO
66
67
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 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/test-hostlist-peer-1/ 2SERVICEHOME = /tmp/test-gnunet-hostlist-peer-2/
3DEFAULTCONFIG = test_learning_learn_peer.conf 3DEFAULTCONFIG = test_learning_learn_peer.conf
4 4
5[resolver] 5[resolver]
@@ -61,3 +61,7 @@ AUTOSTART = NO
61 61
62[dht] 62[dht]
63AUTOSTART = NO 63AUTOSTART = NO
64[mesh]
65AUTOSTART = NO
66
67
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 @@
1[PATHS] 1[PATHS]
2SERVICEHOME = /tmp/test-gnunetd-hostlist-peer-3/ 2SERVICEHOME = /tmp/test-gnunet-hostlist-peer-3/
3DEFAULTCONFIG = test_learning_learn_peer2.conf 3DEFAULTCONFIG = test_learning_learn_peer2.conf
4 4
5[resolver] 5[resolver]
@@ -53,3 +53,7 @@ HOSTLISTFILE = hostlists_learn_peer2.file
53[topology] 53[topology]
54#DEBUG = YES 54#DEBUG = YES
55#PREFIX = valgrind --tool=memcheck 55#PREFIX = valgrind --tool=memcheck
56[mesh]
57AUTOSTART = NO
58
59