diff options
author | Bart Polot <bart@net.in.tum.de> | 2012-12-20 13:24:15 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2012-12-20 13:24:15 +0000 |
commit | 158a7faca398f0626c5c5377ae774c697e48f0c6 (patch) | |
tree | 91244214e0f49c180eb09e71c0e4b932c583aa96 /src/mesh | |
parent | 850227f909bc0c350998734e6ba503c4a872b345 (diff) | |
download | gnunet-158a7faca398f0626c5c5377ae774c697e48f0c6.tar.gz gnunet-158a7faca398f0626c5c5377ae774c697e48f0c6.zip |
- fixes, consistency, test name
Diffstat (limited to 'src/mesh')
-rw-r--r-- | src/mesh/test_mesh_small.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/mesh/test_mesh_small.c b/src/mesh/test_mesh_small.c index f51fb9706..0e3df5ca8 100644 --- a/src/mesh/test_mesh_small.c +++ b/src/mesh/test_mesh_small.c | |||
@@ -233,7 +233,6 @@ show_end_data (void) | |||
233 | static void | 233 | static void |
234 | shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 234 | shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
235 | { | 235 | { |
236 | fprintf(stderr, "b"); | ||
237 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Ending test.\n"); | 236 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Ending test.\n"); |
238 | shutdown_handle = GNUNET_SCHEDULER_NO_TASK; | 237 | shutdown_handle = GNUNET_SCHEDULER_NO_TASK; |
239 | } | 238 | } |
@@ -251,7 +250,6 @@ disconnect_mesh_peers (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
251 | long line = (long) cls; | 250 | long line = (long) cls; |
252 | unsigned int i; | 251 | unsigned int i; |
253 | 252 | ||
254 | fprintf(stderr, "a"); | ||
255 | for (i = 0; i < 3; i++) | 253 | for (i = 0; i < 3; i++) |
256 | if (NULL != t_op[i]) | 254 | if (NULL != t_op[i]) |
257 | { | 255 | { |
@@ -673,7 +671,7 @@ ch (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
673 | struct GNUNET_PeerIdentity *dest; | 671 | struct GNUNET_PeerIdentity *dest; |
674 | 672 | ||
675 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 673 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
676 | "peer %s connected\n", GNUNET_i2s (peer)); | 674 | "%ld peer %s connected\n", i, GNUNET_i2s (peer)); |
677 | 675 | ||
678 | if (0 == memcmp (p_id[2], peer, sizeof (struct GNUNET_PeerIdentity)) && | 676 | if (0 == memcmp (p_id[2], peer, sizeof (struct GNUNET_PeerIdentity)) && |
679 | i == 0L) | 677 | i == 0L) |
@@ -792,6 +790,7 @@ pi_cb (void *cls, | |||
792 | return; | 790 | return; |
793 | } | 791 | } |
794 | p_id[i] = pinfo->result.id; | 792 | p_id[i] = pinfo->result.id; |
793 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " id: %s\n", GNUNET_i2s (p_id[i])); | ||
795 | p_ids++; | 794 | p_ids++; |
796 | if ((MULTICAST == test && p_ids < 3) || p_ids < 2) | 795 | if ((MULTICAST == test && p_ids < 3) || p_ids < 2) |
797 | return; | 796 | return; |
@@ -822,7 +821,7 @@ tmain (void *cls, | |||
822 | peers_running = num_peers; | 821 | peers_running = num_peers; |
823 | h1 = meshes[0]; | 822 | h1 = meshes[0]; |
824 | h2 = meshes[num_peers - 1]; | 823 | h2 = meshes[num_peers - 1]; |
825 | t = GNUNET_MESH_tunnel_create (h1, NULL, &ch, &dh, (void *) 1L); | 824 | t = GNUNET_MESH_tunnel_create (h1, NULL, &ch, &dh, (void *) 0L); |
826 | if (SPEED_MIN == test) | 825 | if (SPEED_MIN == test) |
827 | { | 826 | { |
828 | GNUNET_MESH_tunnel_speed_min(t); | 827 | GNUNET_MESH_tunnel_speed_min(t); |
@@ -949,7 +948,7 @@ main (int argc, char *argv[]) | |||
949 | } | 948 | } |
950 | 949 | ||
951 | p_ids = 0; | 950 | p_ids = 0; |
952 | GNUNET_MESH_TEST_run (test_name, | 951 | GNUNET_MESH_TEST_run ("test_mesh_small", |
953 | "test_mesh_small.conf", | 952 | "test_mesh_small.conf", |
954 | 5, | 953 | 5, |
955 | &tmain, | 954 | &tmain, |