diff options
Diffstat (limited to 'src/transport/test_transport_api_limited_sockets.c')
-rw-r--r-- | src/transport/test_transport_api_limited_sockets.c | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/src/transport/test_transport_api_limited_sockets.c b/src/transport/test_transport_api_limited_sockets.c index 20dc3ed2e..f165a5771 100644 --- a/src/transport/test_transport_api_limited_sockets.c +++ b/src/transport/test_transport_api_limited_sockets.c | |||
@@ -77,7 +77,7 @@ static GNUNET_TRANSPORT_TESTING_ConnectRequest cc; | |||
77 | 77 | ||
78 | struct GNUNET_TRANSPORT_TransmitHandle *th; | 78 | struct GNUNET_TRANSPORT_TransmitHandle *th; |
79 | 79 | ||
80 | struct GNUNET_TRANSPORT_TESTING_handle * tth; | 80 | struct GNUNET_TRANSPORT_TESTING_handle *tth; |
81 | 81 | ||
82 | char *cfg_file_p1; | 82 | char *cfg_file_p1; |
83 | 83 | ||
@@ -138,8 +138,7 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
138 | static void | 138 | static void |
139 | notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer, | 139 | notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer, |
140 | const struct GNUNET_MessageHeader *message, | 140 | const struct GNUNET_MessageHeader *message, |
141 | const struct GNUNET_ATS_Information *ats, | 141 | const struct GNUNET_ATS_Information *ats, uint32_t ats_count) |
142 | uint32_t ats_count) | ||
143 | { | 142 | { |
144 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 143 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
145 | "Received message of type %d from peer %s!\n", | 144 | "Received message of type %d from peer %s!\n", |
@@ -185,8 +184,7 @@ notify_ready (void *cls, size_t size, void *buf) | |||
185 | 184 | ||
186 | static void | 185 | static void |
187 | notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer, | 186 | notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer, |
188 | const struct GNUNET_ATS_Information *ats, | 187 | const struct GNUNET_ATS_Information *ats, uint32_t ats_count) |
189 | uint32_t ats_count) | ||
190 | { | 188 | { |
191 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer `%4s' connected to us (%p)!\n", | 189 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer `%4s' connected to us (%p)!\n", |
192 | GNUNET_i2s (peer), cls); | 190 | GNUNET_i2s (peer), cls); |
@@ -230,15 +228,15 @@ testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls) | |||
230 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &sendtask, NULL); | 228 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &sendtask, NULL); |
231 | } | 229 | } |
232 | 230 | ||
233 | void start_cb (struct PeerContext * p, | 231 | void |
234 | void *cls) | 232 | start_cb (struct PeerContext *p, void *cls) |
235 | { | 233 | { |
236 | static int started; | 234 | static int started; |
235 | |||
237 | started++; | 236 | started++; |
238 | 237 | ||
239 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer %u (`%s') started\n", | 238 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer %u (`%s') started\n", p->no, |
240 | p->no, | 239 | GNUNET_i2s (&p->id)); |
241 | GNUNET_i2s (&p->id)); | ||
242 | 240 | ||
243 | if (started != 2) | 241 | if (started != 2) |
244 | return; | 242 | return; |
@@ -257,14 +255,12 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
257 | tth = GNUNET_TRANSPORT_TESTING_init (); | 255 | tth = GNUNET_TRANSPORT_TESTING_init (); |
258 | 256 | ||
259 | p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, cfg_file_p1, 1, | 257 | p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, cfg_file_p1, 1, |
260 | ¬ify_receive, | 258 | ¬ify_receive, ¬ify_connect, |
261 | ¬ify_connect, ¬ify_disconnect, | 259 | ¬ify_disconnect, &start_cb, |
262 | &start_cb, | ||
263 | NULL); | 260 | NULL); |
264 | p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, cfg_file_p2, 2, | 261 | p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, cfg_file_p2, 2, |
265 | ¬ify_receive, | 262 | ¬ify_receive, ¬ify_connect, |
266 | ¬ify_connect, ¬ify_disconnect, | 263 | ¬ify_disconnect, &start_cb, |
267 | &start_cb, | ||
268 | NULL); | 264 | NULL); |
269 | if ((p1 == NULL) || (p2 == NULL)) | 265 | if ((p1 == NULL) || (p2 == NULL)) |
270 | { | 266 | { |