diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2011-08-12 00:42:16 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2011-08-12 00:42:16 +0000 |
commit | 202d53014183b98b27cdc88fef11b5f9f6b97f00 (patch) | |
tree | bbc982cbe7f46d695e639e623f2aebbb10d5a874 /src/transport/test_transport_testing.c | |
parent | 96c4f70b09d1413e2fedba83b2dcbeba13c9b1f7 (diff) | |
download | gnunet-202d53014183b98b27cdc88fef11b5f9f6b97f00.tar.gz gnunet-202d53014183b98b27cdc88fef11b5f9f6b97f00.zip |
connecting peers fully implemented ... time for PIIZZA!
Diffstat (limited to 'src/transport/test_transport_testing.c')
-rw-r--r-- | src/transport/test_transport_testing.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/transport/test_transport_testing.c b/src/transport/test_transport_testing.c index d9789d980..514dd2b6e 100644 --- a/src/transport/test_transport_testing.c +++ b/src/transport/test_transport_testing.c | |||
@@ -84,6 +84,11 @@ end_badly () | |||
84 | static void | 84 | static void |
85 | testing_connect_cb (struct PeerContext * p1, struct PeerContext * p2, void *cls) | 85 | testing_connect_cb (struct PeerContext * p1, struct PeerContext * p2, void *cls) |
86 | { | 86 | { |
87 | char * p1_c = strdup (GNUNET_i2s(&p1->id)); | ||
88 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Peers connected: %s <-> %s\n", | ||
89 | p1_c, | ||
90 | GNUNET_i2s (&p2->id)); | ||
91 | GNUNET_free(p1_c); | ||
87 | end(); | 92 | end(); |
88 | } | 93 | } |
89 | 94 | ||
@@ -96,9 +101,6 @@ notify_connect (void *cls, | |||
96 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer `%s' connected \n", | 101 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer `%s' connected \n", |
97 | GNUNET_i2s (peer)); | 102 | GNUNET_i2s (peer)); |
98 | connected++; | 103 | connected++; |
99 | |||
100 | if (connected == 2) | ||
101 | end (); | ||
102 | } | 104 | } |
103 | 105 | ||
104 | static void | 106 | static void |
@@ -155,7 +157,7 @@ run (void *cls, | |||
155 | 157 | ||
156 | 158 | ||
157 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connecting peers\n"); | 159 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connecting peers\n"); |
158 | GNUNET_TRANSPORT_TESTING_connect_peers(p1, p2, NULL, NULL); | 160 | GNUNET_TRANSPORT_TESTING_connect_peers(p1, p2, &testing_connect_cb, NULL); |
159 | } | 161 | } |
160 | 162 | ||
161 | int | 163 | int |