From f6bad19e765e73886a1e5b6d32f0a7551e5757ba Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Tue, 11 May 2010 13:16:00 +0000 Subject: moving code where it belongs: --- src/util/test_service.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'src/util/test_service.c') diff --git a/src/util/test_service.c b/src/util/test_service.c index 544f86fba..5f3146205 100644 --- a/src/util/test_service.c +++ b/src/util/test_service.c @@ -43,24 +43,18 @@ static struct GNUNET_SERVICE_Context *sctx; static int ok = 1; -void -end_cont (void *cls, - int reason) -{ - if (sctx != NULL) - GNUNET_SERVICE_stop (sctx); - else - GNUNET_SCHEDULER_shutdown (sched); - ok = 0; -} - static void end_it (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { struct GNUNET_CLIENT_Connection *client = cls; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutting down service\n"); - GNUNET_CLIENT_service_shutdown (sched, client, GNUNET_TIME_UNIT_FOREVER_REL, &end_cont, NULL); + GNUNET_CLIENT_disconnect (client, GNUNET_NO); + if (sctx != NULL) + { + GNUNET_SERVICE_stop (sctx); + sctx = NULL; + } } -- cgit v1.2.3