aboutsummaryrefslogtreecommitdiff
path: root/src/transport/test_transport_api_manipulation_send_tcp.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/transport/test_transport_api_manipulation_send_tcp.c')
-rw-r--r--src/transport/test_transport_api_manipulation_send_tcp.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/transport/test_transport_api_manipulation_send_tcp.c b/src/transport/test_transport_api_manipulation_send_tcp.c
index 381d7d38a..f1ead389c 100644
--- a/src/transport/test_transport_api_manipulation_send_tcp.c
+++ b/src/transport/test_transport_api_manipulation_send_tcp.c
@@ -59,9 +59,9 @@ static int s_connected;
59 59
60static int s_sending; 60static int s_sending;
61 61
62static GNUNET_SCHEDULER_TaskIdentifier die_task; 62static struct GNUNET_SCHEDULER_Task * die_task;
63 63
64static GNUNET_SCHEDULER_TaskIdentifier send_task; 64static struct GNUNET_SCHEDULER_Task * send_task;
65 65
66static struct PeerContext *p1; 66static struct PeerContext *p1;
67 67
@@ -90,10 +90,10 @@ end ()
90{ 90{
91 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peers\n"); 91 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "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 GNUNET_SCHEDULER_cancel (die_task); 97 GNUNET_SCHEDULER_cancel (die_task);
98 98
99 if (th != NULL) 99 if (th != NULL)
@@ -107,12 +107,12 @@ end ()
107static void 107static void
108end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 108end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
109{ 109{
110 die_task = GNUNET_SCHEDULER_NO_TASK; 110 die_task = NULL;
111 111
112 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n"); 112 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n");
113 113
114 114
115 if (send_task != GNUNET_SCHEDULER_NO_TASK) 115 if (send_task != NULL)
116 GNUNET_SCHEDULER_cancel (send_task); 116 GNUNET_SCHEDULER_cancel (send_task);
117 117
118 if (cc != NULL) 118 if (cc != NULL)
@@ -244,7 +244,7 @@ notify_ready (void *cls, size_t size, void *buf)
244 { 244 {
245 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 245 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
246 "Timeout occurred while waiting for transmit_ready\n"); 246 "Timeout occurred while waiting for transmit_ready\n");
247 if (GNUNET_SCHEDULER_NO_TASK != die_task) 247 if (NULL != die_task)
248 GNUNET_SCHEDULER_cancel (die_task); 248 GNUNET_SCHEDULER_cancel (die_task);
249 die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); 249 die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
250 ok = 42; 250 ok = 42;
@@ -275,7 +275,7 @@ static void
275sendtask (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 275sendtask (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
276{ 276{
277 struct GNUNET_ATS_Information ats[1]; 277 struct GNUNET_ATS_Information ats[1];
278 send_task = GNUNET_SCHEDULER_NO_TASK; 278 send_task = NULL;
279 279
280 if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0) 280 if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
281 return; 281 return;
@@ -424,7 +424,7 @@ run (void *cls, char *const *args, const char *cfgfile,
424 if ((p1 == NULL) || (p2 == NULL)) 424 if ((p1 == NULL) || (p2 == NULL))
425 { 425 {
426 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Fail! Could not start peers!\n"); 426 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Fail! Could not start peers!\n");
427 if (die_task != GNUNET_SCHEDULER_NO_TASK) 427 if (die_task != NULL)
428 GNUNET_SCHEDULER_cancel (die_task); 428 GNUNET_SCHEDULER_cancel (die_task);
429 die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); 429 die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
430 return; 430 return;
@@ -444,7 +444,7 @@ check ()
444 GNUNET_GETOPT_OPTION_END 444 GNUNET_GETOPT_OPTION_END
445 }; 445 };
446 446
447 send_task = GNUNET_SCHEDULER_NO_TASK; 447 send_task = NULL;
448 448
449 ok = 1; 449 ok = 1;
450 GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, test_name, 450 GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, test_name,