diff options
author | Bart Polot <bart@net.in.tum.de> | 2013-06-14 10:49:54 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2013-06-14 10:49:54 +0000 |
commit | 1d0dc833d1121914d42475d3c8b9e2e326a625fd (patch) | |
tree | 3c507e9e2d7bf88d9ab8f7b8b7593ce3614fa2ca | |
parent | 5a8b58263b47eb9e5d82f47aad6931f24158a815 (diff) | |
download | gnunet-1d0dc833d1121914d42475d3c8b9e2e326a625fd.tar.gz gnunet-1d0dc833d1121914d42475d3c8b9e2e326a625fd.zip |
- fix
-rw-r--r-- | src/mesh/test_mesh2.conf | 20 | ||||
-rw-r--r-- | src/mesh/test_mesh2_small.c | 12 |
2 files changed, 18 insertions, 14 deletions
diff --git a/src/mesh/test_mesh2.conf b/src/mesh/test_mesh2.conf index 9d57a49d1..a517d2a35 100644 --- a/src/mesh/test_mesh2.conf +++ b/src/mesh/test_mesh2.conf | |||
@@ -1,8 +1,5 @@ | |||
1 | [fs] | 1 | [PATHS] |
2 | AUTOSTART = NO | 2 | SERVICEHOME = /tmp/test-mesh/ |
3 | |||
4 | [resolver] | ||
5 | AUTOSTART = NO | ||
6 | 3 | ||
7 | [mesh] | 4 | [mesh] |
8 | BINARY = gnunet-service-mesh-new | 5 | BINARY = gnunet-service-mesh-new |
@@ -21,6 +18,16 @@ DHT_REPLICATION_LEVEL = 3 | |||
21 | MAX_TUNNELS = 10 | 18 | MAX_TUNNELS = 10 |
22 | MAX_MSGS_QUEUE = 20 | 19 | MAX_MSGS_QUEUE = 20 |
23 | 20 | ||
21 | [testbed] | ||
22 | NUM_PEERS = 5 | ||
23 | OVERLAY_TOPOLOGY = LINE | ||
24 | |||
25 | [fs] | ||
26 | AUTOSTART = NO | ||
27 | |||
28 | [resolver] | ||
29 | AUTOSTART = NO | ||
30 | |||
24 | [vpn] | 31 | [vpn] |
25 | AUTOSTART = NO | 32 | AUTOSTART = NO |
26 | PORT = 10012 | 33 | PORT = 10012 |
@@ -67,9 +74,6 @@ WEAKRANDOM = YES | |||
67 | [gnunetd] | 74 | [gnunetd] |
68 | HOSTKEY = $SERVICEHOME/.hostkey | 75 | HOSTKEY = $SERVICEHOME/.hostkey |
69 | 76 | ||
70 | [PATHS] | ||
71 | SERVICEHOME = /tmp/test-mesh/ | ||
72 | |||
73 | [dns] | 77 | [dns] |
74 | AUTOSTART = NO | 78 | AUTOSTART = NO |
75 | 79 | ||
diff --git a/src/mesh/test_mesh2_small.c b/src/mesh/test_mesh2_small.c index b1631570d..f7f7e930f 100644 --- a/src/mesh/test_mesh2_small.c +++ b/src/mesh/test_mesh2_small.c | |||
@@ -239,15 +239,15 @@ disconnect_mesh_peers (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
239 | long line = (long) cls; | 239 | long line = (long) cls; |
240 | unsigned int i; | 240 | unsigned int i; |
241 | 241 | ||
242 | for (i = 0; i < 3; i++) | 242 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
243 | "disconnecting mesh service of peers, called from line %ld\n", | ||
244 | line); | ||
245 | for (i = 0; i < 4; i++) | ||
243 | if (NULL != t_op[i]) | 246 | if (NULL != t_op[i]) |
244 | { | 247 | { |
245 | GNUNET_TESTBED_operation_done (t_op[i]); | 248 | GNUNET_TESTBED_operation_done (t_op[i]); |
246 | t_op[i] = NULL; | 249 | t_op[i] = NULL; |
247 | } | 250 | } |
248 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
249 | "disconnecting mesh service of peers, called from line %ld\n", | ||
250 | line); | ||
251 | disconnect_task = GNUNET_SCHEDULER_NO_TASK; | 251 | disconnect_task = GNUNET_SCHEDULER_NO_TASK; |
252 | if (NULL != t) | 252 | if (NULL != t) |
253 | { | 253 | { |
@@ -825,8 +825,8 @@ main (int argc, char *argv[]) | |||
825 | } | 825 | } |
826 | 826 | ||
827 | p_ids = 0; | 827 | p_ids = 0; |
828 | GNUNET_MESH_TEST_run ("test_mesh_small", | 828 | GNUNET_MESH_TEST_run ("test_mesh2_small", |
829 | "test_mesh_small.conf", | 829 | "test_mesh2.conf", |
830 | 5, | 830 | 5, |
831 | &tmain, | 831 | &tmain, |
832 | NULL, | 832 | NULL, |