diff options
author | Bart Polot <bart.polot+gnunet@gmail.com> | 2017-02-20 19:19:26 +0100 |
---|---|---|
committer | Bart Polot <bart.polot+gnunet@gmail.com> | 2017-02-20 19:19:26 +0100 |
commit | 95737e2443cacc12d0b3076c72aa35d9c80ca2a0 (patch) | |
tree | 188e13dca1eab94736ffa850059e2797ee180074 /src/cadet | |
parent | ba5817a7dbaef67b871606431d9a9a7f82d5bdf8 (diff) | |
download | gnunet-95737e2443cacc12d0b3076c72aa35d9c80ca2a0.tar.gz gnunet-95737e2443cacc12d0b3076c72aa35d9c80ca2a0.zip |
- minor changes: doxygen, log, code order, code legibility
Diffstat (limited to 'src/cadet')
-rw-r--r-- | src/cadet/test_cadet_local_mq.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/cadet/test_cadet_local_mq.c b/src/cadet/test_cadet_local_mq.c index d3917b94a..785a8844f 100644 --- a/src/cadet/test_cadet_local_mq.c +++ b/src/cadet/test_cadet_local_mq.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of GNUnet. | 2 | This file is part of GNUnet. |
3 | Copyright (C) 2011 GNUnet e.V. | 3 | Copyright (C) 2017 GNUnet e.V. |
4 | 4 | ||
5 | GNUnet is free software; you can redistribute it and/or modify | 5 | GNUnet is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published | 6 | it under the terms of the GNU General Public License as published |
@@ -189,7 +189,7 @@ handle_data_received (void *cls, | |||
189 | 189 | ||
190 | payload = GNUNET_ntohll (msg->payload); | 190 | payload = GNUNET_ntohll (msg->payload); |
191 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 191 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
192 | "Data callback payload %llu with cls: %p! Shutting down.\n", | 192 | "Data callback payload %llu with cls: %p! Shutting down.\n", |
193 | (unsigned long long) payload, | 193 | (unsigned long long) payload, |
194 | cls); | 194 | cls); |
195 | GNUNET_assert (42 == payload); | 195 | GNUNET_assert (42 == payload); |
@@ -266,15 +266,22 @@ run (void *cls, | |||
266 | const struct GNUNET_CONFIGURATION_Handle *cfg, | 266 | const struct GNUNET_CONFIGURATION_Handle *cfg, |
267 | struct GNUNET_TESTING_Peer *peer) | 267 | struct GNUNET_TESTING_Peer *peer) |
268 | { | 268 | { |
269 | struct GNUNET_TIME_Relative start_delay; | 269 | struct GNUNET_MQ_MessageHandler handlers[] = { |
270 | GNUNET_MQ_hd_fixed_size (data_received, | ||
271 | TEST_MESSAGE_TYPE, | ||
272 | struct GNUNET_CADET_TestMsg, | ||
273 | cadet_peer_2), | ||
274 | GNUNET_MQ_handler_end () | ||
275 | }; | ||
276 | struct GNUNET_TIME_Relative delay; | ||
277 | |||
270 | me = peer; | 278 | me = peer; |
271 | GNUNET_SCHEDULER_add_shutdown (&do_shutdown, | 279 | GNUNET_SCHEDULER_add_shutdown (&do_shutdown, |
272 | NULL); | 280 | NULL); |
273 | abort_task = | 281 | delay = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 15); |
274 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply | 282 | abort_task = GNUNET_SCHEDULER_add_delayed (delay, |
275 | (GNUNET_TIME_UNIT_SECONDS, 15), | 283 | &do_abort, |
276 | &do_abort, | 284 | (void *) (long) __LINE__); |
277 | (void *) (long) __LINE__); | ||
278 | cadet_peer_1 = GNUNET_CADET_connecT (cfg); | 285 | cadet_peer_1 = GNUNET_CADET_connecT (cfg); |
279 | cadet_peer_2 = GNUNET_CADET_connecT (cfg); | 286 | cadet_peer_2 = GNUNET_CADET_connecT (cfg); |
280 | 287 | ||
@@ -282,20 +289,13 @@ run (void *cls, | |||
282 | (NULL == cadet_peer_2) ) | 289 | (NULL == cadet_peer_2) ) |
283 | { | 290 | { |
284 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 291 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
285 | "Couldn't connect to cadet\n"); | 292 | "Couldn't connect to cadet\n"); |
286 | result = GNUNET_SYSERR; | 293 | result = GNUNET_SYSERR; |
287 | GNUNET_SCHEDULER_shutdown (); | 294 | GNUNET_SCHEDULER_shutdown (); |
288 | return; | 295 | return; |
289 | } | 296 | } |
290 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "CADET 1: %p\n", cadet_peer_1); | 297 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "CADET 1: %p\n", cadet_peer_1); |
291 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "CADET 2: %p\n", cadet_peer_2); | 298 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "CADET 2: %p\n", cadet_peer_2); |
292 | struct GNUNET_MQ_MessageHandler handlers[] = { | ||
293 | GNUNET_MQ_hd_fixed_size (data_received, | ||
294 | TEST_MESSAGE_TYPE, | ||
295 | struct GNUNET_CADET_TestMsg, | ||
296 | cadet_peer_2), | ||
297 | GNUNET_MQ_handler_end () | ||
298 | }; | ||
299 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "handlers 2: %p\n", handlers); | 299 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "handlers 2: %p\n", handlers); |
300 | GNUNET_CADET_open_porT (cadet_peer_2, /* cadet handle */ | 300 | GNUNET_CADET_open_porT (cadet_peer_2, /* cadet handle */ |
301 | GC_u2h (TEST_PORT_ID), /* port id */ | 301 | GC_u2h (TEST_PORT_ID), /* port id */ |
@@ -304,9 +304,9 @@ run (void *cls, | |||
304 | NULL, /* window size handler */ | 304 | NULL, /* window size handler */ |
305 | &disconnected, /* disconnect handler */ | 305 | &disconnected, /* disconnect handler */ |
306 | handlers); /* traffic handlers */ | 306 | handlers); /* traffic handlers */ |
307 | start_delay = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 2); | 307 | delay = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 2); |
308 | if (NULL == connect_task) | 308 | if (NULL == connect_task) |
309 | connect_task = GNUNET_SCHEDULER_add_delayed (start_delay, | 309 | connect_task = GNUNET_SCHEDULER_add_delayed (delay, |
310 | &do_connect, | 310 | &do_connect, |
311 | NULL); | 311 | NULL); |
312 | } | 312 | } |