aboutsummaryrefslogtreecommitdiff
path: root/src/transport/test_transport_api_monitor_peers.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/transport/test_transport_api_monitor_peers.c')
-rw-r--r--src/transport/test_transport_api_monitor_peers.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/transport/test_transport_api_monitor_peers.c b/src/transport/test_transport_api_monitor_peers.c
index fd6abe53b..ef425d444 100644
--- a/src/transport/test_transport_api_monitor_peers.c
+++ b/src/transport/test_transport_api_monitor_peers.c
@@ -53,9 +53,9 @@ static int s_connected;
53 53
54static int s_sending; 54static int s_sending;
55 55
56static GNUNET_SCHEDULER_TaskIdentifier die_task; 56static struct GNUNET_SCHEDULER_Task * die_task;
57 57
58static GNUNET_SCHEDULER_TaskIdentifier send_task; 58static struct GNUNET_SCHEDULER_Task * send_task;
59 59
60static struct PeerContext *p1; 60static struct PeerContext *p1;
61 61
@@ -90,13 +90,13 @@ end ()
90 GNUNET_log (GNUNET_ERROR_TYPE_INFO, 90 GNUNET_log (GNUNET_ERROR_TYPE_INFO,
91 "Stopping peers\n"); 91 "Stopping peers\n");
92 92
93 if (send_task != GNUNET_SCHEDULER_NO_TASK) 93 if (send_task != NULL)
94 GNUNET_SCHEDULER_cancel (send_task); 94 GNUNET_SCHEDULER_cancel (send_task);
95 95
96 if (die_task != GNUNET_SCHEDULER_NO_TASK) 96 if (die_task != NULL)
97 { 97 {
98 GNUNET_SCHEDULER_cancel (die_task); 98 GNUNET_SCHEDULER_cancel (die_task);
99 die_task = GNUNET_SCHEDULER_NO_TASK; 99 die_task = NULL;
100 } 100 }
101 101
102 if (th != NULL) 102 if (th != NULL)
@@ -131,12 +131,12 @@ static void
131end_badly (void *cls, 131end_badly (void *cls,
132 const struct GNUNET_SCHEDULER_TaskContext *tc) 132 const struct GNUNET_SCHEDULER_TaskContext *tc)
133{ 133{
134 die_task = GNUNET_SCHEDULER_NO_TASK; 134 die_task = NULL;
135 135
136 GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Fail! Stopping peers\n"); 136 GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Fail! Stopping peers\n");
137 137
138 138
139 if (send_task != GNUNET_SCHEDULER_NO_TASK) 139 if (send_task != NULL)
140 GNUNET_SCHEDULER_cancel (send_task); 140 GNUNET_SCHEDULER_cancel (send_task);
141 141
142 if (cc != NULL) 142 if (cc != NULL)
@@ -227,7 +227,7 @@ notify_ready (void *cls, size_t size, void *buf)
227 { 227 {
228 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 228 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
229 "Timeout occurred while waiting for transmit_ready\n"); 229 "Timeout occurred while waiting for transmit_ready\n");
230 if (GNUNET_SCHEDULER_NO_TASK != die_task) 230 if (NULL != die_task)
231 GNUNET_SCHEDULER_cancel (die_task); 231 GNUNET_SCHEDULER_cancel (die_task);
232 die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); 232 die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
233 ok = 42; 233 ok = 42;
@@ -257,7 +257,7 @@ notify_ready (void *cls, size_t size, void *buf)
257static void 257static void
258sendtask (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 258sendtask (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
259{ 259{
260 send_task = GNUNET_SCHEDULER_NO_TASK; 260 send_task = NULL;
261 261
262 if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0) 262 if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
263 return; 263 return;
@@ -460,7 +460,7 @@ run (void *cls, char *const *args, const char *cfgfile,
460 if ((p1 == NULL) || (p2 == NULL)) 460 if ((p1 == NULL) || (p2 == NULL))
461 { 461 {
462 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Fail! Could not start peers!\n"); 462 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Fail! Could not start peers!\n");
463 if (die_task != GNUNET_SCHEDULER_NO_TASK) 463 if (die_task != NULL)
464 GNUNET_SCHEDULER_cancel (die_task); 464 GNUNET_SCHEDULER_cancel (die_task);
465 die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); 465 die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
466 return; 466 return;
@@ -480,7 +480,7 @@ check ()
480 GNUNET_GETOPT_OPTION_END 480 GNUNET_GETOPT_OPTION_END
481 }; 481 };
482 482
483 send_task = GNUNET_SCHEDULER_NO_TASK; 483 send_task = NULL;
484 484
485 ok = 1; 485 ok = 1;
486 GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, test_name, 486 GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, test_name,