aboutsummaryrefslogtreecommitdiff
path: root/src/transport/test_transport_blacklisting.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2016-04-09 23:14:03 +0000
committerChristian Grothoff <christian@grothoff.org>2016-04-09 23:14:03 +0000
commit29e6158507a0758192075ac6ece7ba8e75ddc49a (patch)
treeb91ded48da322f8ba4c9bb0f5504228aa036c2d1 /src/transport/test_transport_blacklisting.c
parent5dfcb058ab5db9ae0c4b147d8a99c64ca0980028 (diff)
downloadgnunet-29e6158507a0758192075ac6ece7ba8e75ddc49a.tar.gz
gnunet-29e6158507a0758192075ac6ece7ba8e75ddc49a.zip
small API change: do no longer pass rarely needed GNUNET_SCHEDULER_TaskContext to all scheduler tasks; instead, allow the relatively few tasks that need it to obtain the context via GNUNET_SCHEDULER_get_task_context()
Diffstat (limited to 'src/transport/test_transport_blacklisting.c')
-rw-r--r--src/transport/test_transport_blacklisting.c21
1 files changed, 14 insertions, 7 deletions
diff --git a/src/transport/test_transport_blacklisting.c b/src/transport/test_transport_blacklisting.c
index 8ac198cfe..6cb598f2f 100644
--- a/src/transport/test_transport_blacklisting.c
+++ b/src/transport/test_transport_blacklisting.c
@@ -85,11 +85,13 @@ static struct GNUNET_SCHEDULER_Task * stage_task;
85#define OKPP do { ok++; } while (0) 85#define OKPP do { ok++; } while (0)
86#endif 86#endif
87 87
88
88static void 89static void
89run_stage(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc); 90run_stage(void *cls);
91
90 92
91static void 93static void
92end(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 94end (void *cls)
93{ 95{
94 GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Stopping\n"); 96 GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Stopping\n");
95 97
@@ -129,8 +131,9 @@ end(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
129 } 131 }
130} 132}
131 133
134
132static void 135static void
133end_badly(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 136end_badly (void *cls)
134{ 137{
135 die_task = NULL; 138 die_task = NULL;
136 139
@@ -172,17 +175,20 @@ testing_connect_cb(struct PeerContext *p1, struct PeerContext *p2, void *cls)
172 stage_task = GNUNET_SCHEDULER_add_now (&run_stage, NULL ); 175 stage_task = GNUNET_SCHEDULER_add_now (&run_stage, NULL );
173} 176}
174 177
178
175static void 179static void
176connect_timeout(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 180connect_timeout(void *cls)
177{ 181{
178 GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Peers not connected, next stage\n"); 182 GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Peers not connected, next stage\n");
179 timeout_task = NULL; 183 timeout_task = NULL;
180 stage_task = GNUNET_SCHEDULER_add_now (&run_stage, NULL ); 184 stage_task = GNUNET_SCHEDULER_add_now (&run_stage, NULL);
181} 185}
182 186
187
183static int started; 188static int started;
184 189
185void 190
191static void
186start_cb(struct PeerContext *p, void *cls) 192start_cb(struct PeerContext *p, void *cls)
187{ 193{
188 194
@@ -243,8 +249,9 @@ static int check_blacklist_config (char *cfg_file,
243 return GNUNET_OK; 249 return GNUNET_OK;
244} 250}
245 251
252
246static void 253static void
247run_stage(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 254run_stage (void *cls)
248{ 255{
249 stage_task = NULL; 256 stage_task = NULL;
250 if (NULL != die_task) 257 if (NULL != die_task)