diff options
Diffstat (limited to 'src/cadet/test_cadet_single.c')
-rw-r--r-- | src/cadet/test_cadet_single.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/cadet/test_cadet_single.c b/src/cadet/test_cadet_single.c index d5c19ac01..93a50c02c 100644 --- a/src/cadet/test_cadet_single.c +++ b/src/cadet/test_cadet_single.c | |||
@@ -59,7 +59,7 @@ do_send (void *cls, size_t size, void *buf); | |||
59 | * Shutdown nicely | 59 | * Shutdown nicely |
60 | */ | 60 | */ |
61 | static void | 61 | static void |
62 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 62 | do_shutdown (void *cls) |
63 | { | 63 | { |
64 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "shutdown\n"); | 64 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "shutdown\n"); |
65 | if (NULL != abort_task) | 65 | if (NULL != abort_task) |
@@ -88,7 +88,7 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
88 | * Something went wrong and timed out. Kill everything and set error flag | 88 | * Something went wrong and timed out. Kill everything and set error flag |
89 | */ | 89 | */ |
90 | static void | 90 | static void |
91 | do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 91 | do_abort (void *cls) |
92 | { | 92 | { |
93 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ABORT\n"); | 93 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ABORT\n"); |
94 | result = GNUNET_SYSERR; | 94 | result = GNUNET_SYSERR; |
@@ -98,7 +98,7 @@ do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
98 | GNUNET_SCHEDULER_cancel (shutdown_task); | 98 | GNUNET_SCHEDULER_cancel (shutdown_task); |
99 | shutdown_task = NULL; | 99 | shutdown_task = NULL; |
100 | } | 100 | } |
101 | do_shutdown (cls, tc); | 101 | do_shutdown (cls); |
102 | } | 102 | } |
103 | 103 | ||
104 | 104 | ||
@@ -247,14 +247,15 @@ do_send (void *cls, size_t size, void *buf) | |||
247 | * Connect to other client and send data | 247 | * Connect to other client and send data |
248 | * | 248 | * |
249 | * @param cls Closue (unused). | 249 | * @param cls Closue (unused). |
250 | * @param tc TaskContext. | ||
251 | */ | 250 | */ |
252 | static void | 251 | static void |
253 | do_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 252 | do_connect (void *cls) |
254 | { | 253 | { |
255 | struct GNUNET_PeerIdentity id; | 254 | struct GNUNET_PeerIdentity id; |
256 | size_t size = sizeof (struct GNUNET_MessageHeader) + DATA_SIZE; | 255 | size_t size = sizeof (struct GNUNET_MessageHeader) + DATA_SIZE; |
256 | const struct GNUNET_SCHEDULER_TaskContext *tc; | ||
257 | 257 | ||
258 | tc = GNUNET_SCHEDULER_get_task_context (); | ||
258 | if ((GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason) != 0) | 259 | if ((GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason) != 0) |
259 | return; | 260 | return; |
260 | 261 | ||