diff options
author | Bart Polot <bart@net.in.tum.de> | 2011-10-03 17:30:18 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2011-10-03 17:30:18 +0000 |
commit | 06e247a83238ace88b3705e4551bc01b44cfe166 (patch) | |
tree | 58b63f16f07736fccf3a99038a4e13c60fea2b52 /src/mesh | |
parent | e0ebb234fd577963c74d65b7db470edb2ea6b5ab (diff) | |
download | gnunet-06e247a83238ace88b3705e4551bc01b44cfe166.tar.gz gnunet-06e247a83238ace88b3705e4551bc01b44cfe166.zip |
Tweaked test configuration and log messages
Diffstat (limited to 'src/mesh')
-rw-r--r-- | src/mesh/gnunet-service-mesh.c | 3 | ||||
-rw-r--r-- | src/mesh/test_mesh_small.conf | 6 | ||||
-rw-r--r-- | src/mesh/test_mesh_small_unicast.c | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c index 2c31ad68c..cf78528f1 100644 --- a/src/mesh/gnunet-service-mesh.c +++ b/src/mesh/gnunet-service-mesh.c | |||
@@ -1249,7 +1249,7 @@ send_core_create_path (void *cls, size_t size, void *buf) | |||
1249 | GNUNET_free (info); | 1249 | GNUNET_free (info); |
1250 | 1250 | ||
1251 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1251 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1252 | "MESH: %u bytes long create path sent!\n", | 1252 | "MESH: CREATE PATH (%u bytes long) sent!\n", |
1253 | size_needed); | 1253 | size_needed); |
1254 | return size_needed; | 1254 | return size_needed; |
1255 | } | 1255 | } |
@@ -1406,6 +1406,7 @@ send_core_path_ack (void *cls, size_t size, void *buf) | |||
1406 | GNUNET_free (info); | 1406 | GNUNET_free (info); |
1407 | /* TODO add signature */ | 1407 | /* TODO add signature */ |
1408 | 1408 | ||
1409 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: PATH ACK sent!\n"); | ||
1409 | return sizeof (struct GNUNET_MESH_PathACK); | 1410 | return sizeof (struct GNUNET_MESH_PathACK); |
1410 | } | 1411 | } |
1411 | 1412 | ||
diff --git a/src/mesh/test_mesh_small.conf b/src/mesh/test_mesh_small.conf index 0c7485c20..df4595289 100644 --- a/src/mesh/test_mesh_small.conf +++ b/src/mesh/test_mesh_small.conf | |||
@@ -13,7 +13,7 @@ PORT = 10000 | |||
13 | 13 | ||
14 | [dht] | 14 | [dht] |
15 | DEBUG = NO | 15 | DEBUG = NO |
16 | AUTOSTART = YES | 16 | AUTOSTART = NO |
17 | ACCEPT_FROM6 = ::1; | 17 | ACCEPT_FROM6 = ::1; |
18 | ACCEPT_FROM = 127.0.0.1; | 18 | ACCEPT_FROM = 127.0.0.1; |
19 | HOSTNAME = localhost | 19 | HOSTNAME = localhost |
@@ -76,6 +76,6 @@ MAX_OUTSTANDING_CONNECTIONS = 75 | |||
76 | DELETE_FILES = YES | 76 | DELETE_FILES = YES |
77 | 77 | ||
78 | [test_mesh_small] | 78 | [test_mesh_small] |
79 | WAIT_TIME = 70 | 79 | WAIT_TIME = 90 |
80 | CONNECTION_LIMIT = 10 | 80 | CONNECTION_LIMIT = 16 |
81 | DATA_OUTPUT_FILE=data_output | 81 | DATA_OUTPUT_FILE=data_output |
diff --git a/src/mesh/test_mesh_small_unicast.c b/src/mesh/test_mesh_small_unicast.c index 4cd07c095..f7247b5f2 100644 --- a/src/mesh/test_mesh_small_unicast.c +++ b/src/mesh/test_mesh_small_unicast.c | |||
@@ -278,7 +278,7 @@ do_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
278 | GNUNET_MESH_peer_request_connect_add(t, &d2->id); | 278 | GNUNET_MESH_peer_request_connect_add(t, &d2->id); |
279 | GNUNET_SCHEDULER_cancel (disconnect_task); | 279 | GNUNET_SCHEDULER_cancel (disconnect_task); |
280 | disconnect_task = GNUNET_SCHEDULER_add_delayed( | 280 | disconnect_task = GNUNET_SCHEDULER_add_delayed( |
281 | GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 10), | 281 | GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 30), |
282 | &disconnect_mesh_peers, NULL); | 282 | &disconnect_mesh_peers, NULL); |
283 | } | 283 | } |
284 | 284 | ||