aboutsummaryrefslogtreecommitdiff
path: root/src/transport/test_plugin_transport.c
diff options
context:
space:
mode:
authorNathan S. Evans <evans@in.tum.de>2010-11-05 18:21:50 +0000
committerNathan S. Evans <evans@in.tum.de>2010-11-05 18:21:50 +0000
commit75a33a1499cf60ea4364c9aa673816629a6c1413 (patch)
tree0620da4312bb04de4d7b65074fdd3b0c3dd6cc0e /src/transport/test_plugin_transport.c
parent7217c601ad30760872823193d62307e7a335d226 (diff)
downloadgnunet-75a33a1499cf60ea4364c9aa673816629a6c1413.tar.gz
gnunet-75a33a1499cf60ea4364c9aa673816629a6c1413.zip
big scheduler refactoring, expect some issues
Diffstat (limited to 'src/transport/test_plugin_transport.c')
-rw-r--r--src/transport/test_plugin_transport.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/src/transport/test_plugin_transport.c b/src/transport/test_plugin_transport.c
index 398dcf92b..11e00b80e 100644
--- a/src/transport/test_plugin_transport.c
+++ b/src/transport/test_plugin_transport.c
@@ -60,11 +60,6 @@ static struct GNUNET_PeerIdentity my_identity;
60static struct GNUNET_CRYPTO_RsaPrivateKey *my_private_key; 60static struct GNUNET_CRYPTO_RsaPrivateKey *my_private_key;
61 61
62/** 62/**
63 * Our scheduler.
64 */
65struct GNUNET_SCHEDULER_Handle *sched;
66
67/**
68 * Our configuration. 63 * Our configuration.
69 */ 64 */
70const struct GNUNET_CONFIGURATION_Handle *cfg; 65const struct GNUNET_CONFIGURATION_Handle *cfg;
@@ -168,8 +163,7 @@ test_validation ()
168 api->check_address (api->cls, 163 api->check_address (api->cls,
169 &soaddr, sizeof (soaddr))); 164 &soaddr, sizeof (soaddr)));
170 ok = 0; 165 ok = 0;
171 GNUNET_SCHEDULER_add_continuation (sched, 166 GNUNET_SCHEDULER_add_continuation (&unload_task,
172 &unload_task,
173 (void *) cfg, 167 (void *) cfg,
174 GNUNET_SCHEDULER_REASON_PREREQ_DONE); 168 GNUNET_SCHEDULER_REASON_PREREQ_DONE);
175} 169}
@@ -179,7 +173,6 @@ static void
179setup_plugin_environment () 173setup_plugin_environment ()
180{ 174{
181 env.cfg = cfg; 175 env.cfg = cfg;
182 env.sched = sched;
183 env.my_identity = &my_identity; 176 env.my_identity = &my_identity;
184 env.cls = &env; 177 env.cls = &env;
185 env.receive = &receive; 178 env.receive = &receive;
@@ -192,12 +185,10 @@ setup_plugin_environment ()
192 * Runs the test. 185 * Runs the test.
193 * 186 *
194 * @param cls closure 187 * @param cls closure
195 * @param s scheduler to use
196 * @param c configuration to use 188 * @param c configuration to use
197 */ 189 */
198static void 190static void
199run (void *cls, 191run (void *cls,
200 struct GNUNET_SCHEDULER_Handle *s,
201 char *const *args, 192 char *const *args,
202 const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *c) 193 const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *c)
203{ 194{
@@ -205,7 +196,6 @@ run (void *cls,
205 char *keyfile; 196 char *keyfile;
206 char *libname; 197 char *libname;
207 198
208 sched = s;
209 cfg = c; 199 cfg = c;
210 /* parse configuration */ 200 /* parse configuration */
211 if ((GNUNET_OK != 201 if ((GNUNET_OK !=