diff options
author | Christian Grothoff <christian@grothoff.org> | 2009-10-05 09:56:25 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2009-10-05 09:56:25 +0000 |
commit | d75fb1880a887a8f5339c5e8cf5e9d2b8755fdad (patch) | |
tree | f8dff53b4b88b0d87ca31a772607ee51fb0653ec /src/core/test_core_api.c | |
parent | b9b0940e261a4b1713d909f0a2fd54134ed5b148 (diff) | |
download | gnunet-d75fb1880a887a8f5339c5e8cf5e9d2b8755fdad.tar.gz gnunet-d75fb1880a887a8f5339c5e8cf5e9d2b8755fdad.zip |
improving ARM API
Diffstat (limited to 'src/core/test_core_api.c')
-rw-r--r-- | src/core/test_core_api.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/test_core_api.c b/src/core/test_core_api.c index 13c1dc48e..d72af8254 100644 --- a/src/core/test_core_api.c +++ b/src/core/test_core_api.c | |||
@@ -82,8 +82,8 @@ terminate_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
82 | GNUNET_CORE_disconnect (p2.ch); | 82 | GNUNET_CORE_disconnect (p2.ch); |
83 | GNUNET_TRANSPORT_disconnect (p1.th); | 83 | GNUNET_TRANSPORT_disconnect (p1.th); |
84 | GNUNET_TRANSPORT_disconnect (p2.th); | 84 | GNUNET_TRANSPORT_disconnect (p2.th); |
85 | GNUNET_ARM_stop_service ("core", p1.cfg, sched, TIMEOUT, NULL, NULL); | 85 | GNUNET_ARM_stop_services (p1.cfg, sched, "core", NULL); |
86 | GNUNET_ARM_stop_service ("core", p2.cfg, sched, TIMEOUT, NULL, NULL); | 86 | GNUNET_ARM_stop_services (p2.cfg, sched, "core", NULL); |
87 | ok = 0; | 87 | ok = 0; |
88 | } | 88 | } |
89 | 89 | ||
@@ -96,8 +96,8 @@ terminate_task_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
96 | GNUNET_CORE_disconnect (p2.ch); | 96 | GNUNET_CORE_disconnect (p2.ch); |
97 | GNUNET_TRANSPORT_disconnect (p1.th); | 97 | GNUNET_TRANSPORT_disconnect (p1.th); |
98 | GNUNET_TRANSPORT_disconnect (p2.th); | 98 | GNUNET_TRANSPORT_disconnect (p2.th); |
99 | GNUNET_ARM_stop_service ("core", p1.cfg, sched, TIMEOUT, NULL, NULL); | 99 | GNUNET_ARM_stop_services (p1.cfg, sched, "core", NULL); |
100 | GNUNET_ARM_stop_service ("core", p2.cfg, sched, TIMEOUT, NULL, NULL); | 100 | GNUNET_ARM_stop_services (p2.cfg, sched, "core", NULL); |
101 | ok = 42; | 101 | ok = 42; |
102 | } | 102 | } |
103 | 103 | ||
@@ -303,7 +303,7 @@ setup_peer (struct PeerContext *p, const char *cfgname) | |||
303 | sleep (1); /* allow ARM to start */ | 303 | sleep (1); /* allow ARM to start */ |
304 | #endif | 304 | #endif |
305 | GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); | 305 | GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); |
306 | GNUNET_ARM_start_service ("core", p->cfg, sched, TIMEOUT, NULL, NULL); | 306 | GNUNET_ARM_start_services (p->cfg, sched, "core", NULL); |
307 | p->th = GNUNET_TRANSPORT_connect (sched, p->cfg, p, NULL, NULL, NULL); | 307 | p->th = GNUNET_TRANSPORT_connect (sched, p->cfg, p, NULL, NULL, NULL); |
308 | GNUNET_assert (p->th != NULL); | 308 | GNUNET_assert (p->th != NULL); |
309 | GNUNET_TRANSPORT_get_hello (p->th, TIMEOUT, &process_hello, p); | 309 | GNUNET_TRANSPORT_get_hello (p->th, TIMEOUT, &process_hello, p); |