GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
+ by the Free Software Foundation; either version 3, or (at your
option) any later version.
GNUnet is distributed in the hope that it will be useful, but
#define MY_TYPE 256
-static struct GNUNET_SCHEDULER_Handle *sched;
-
static struct GNUNET_SERVICE_Context *sctx;
static int ok = 1;
-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 (client);
- if (sctx != NULL)
- GNUNET_SERVICE_stop (sctx);
- else
- GNUNET_SCHEDULER_shutdown (sched);
- ok = 0;
-}
-
-
static size_t
build_msg (void *cls, size_t size, void *buf)
{
GNUNET_assert (size >= sizeof (struct GNUNET_MessageHeader));
msg->type = htons (MY_TYPE);
msg->size = htons (sizeof (struct GNUNET_MessageHeader));
- GNUNET_SCHEDULER_add_continuation (sched,
- &end_it,
- client,
- GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ GNUNET_CLIENT_disconnect (client, GNUNET_NO);
return sizeof (struct GNUNET_MessageHeader);
}
+
static void
ready (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
struct GNUNET_CLIENT_Connection *client;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Service confirmed running\n");
- sched = tc->sched;
GNUNET_assert (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE));
- client = GNUNET_CLIENT_connect (tc->sched, "test_service", cfg);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Service confirmed running\n");
+ client = GNUNET_CLIENT_connect ("test_service", cfg);
GNUNET_assert (client != NULL);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Client connecting, waiting to transmit\n");
GNUNET_NO, &build_msg, client);
}
+static void
+do_stop (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ GNUNET_SERVICE_stop (sctx);
+}
+
+
static void
recv_cb (void *cls,
struct GNUNET_SERVER_Client *client,
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Receiving client message...\n");
GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ if (sctx != NULL)
+ GNUNET_SCHEDULER_add_now (&do_stop, NULL);
+ else
+ GNUNET_SCHEDULER_shutdown ();
+ ok = 0;
}
static struct GNUNET_SERVER_MessageHandler myhandlers[] = {
static void
runner (void *cls,
- struct GNUNET_SCHEDULER_Handle *sched,
struct GNUNET_SERVER_Handle *server,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Service initializing\n");
GNUNET_SERVER_add_handlers (server, myhandlers);
- GNUNET_CLIENT_service_test (sched,
- "test_service",
+ GNUNET_CLIENT_service_test ("test_service",
cfg, GNUNET_TIME_UNIT_SECONDS, &ready,
(void *) cfg);
}
struct GNUNET_CLIENT_Connection *client;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "V6 ready\n");
- sched = tc->sched;
GNUNET_assert (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE));
- client = GNUNET_CLIENT_connect (tc->sched, "test_service6", cfg);
+ client = GNUNET_CLIENT_connect ("test_service6", cfg);
GNUNET_assert (client != NULL);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "V6 client connected\n");
GNUNET_CLIENT_notify_transmit_ready (client,
static void
runner6 (void *cls,
- struct GNUNET_SCHEDULER_Handle *sched,
struct GNUNET_SERVER_Handle *server,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Initializing v6 service\n");
GNUNET_SERVER_add_handlers (server, myhandlers);
- GNUNET_CLIENT_service_test (sched,
- "test_service6",
+ GNUNET_CLIENT_service_test ("test_service6",
cfg, GNUNET_TIME_UNIT_SECONDS, &ready6,
(void *) cfg);
}
}
-/**
- * Main method, starts scheduler with task1,
- * checks that "ok" is correct at the end.
- */
-static int
-check6d ()
-{
- ok = 1;
- char *const argv[] = {
- "test_service6",
- "-c",
- "test_service_data.conf",
- "-L",
-#if VERBOSE
- "DEBUG",
-#else
- "WARNING",
-#endif
- "-d",
- NULL
- };
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting V6 as daemon\n");
- GNUNET_assert (GNUNET_OK ==
- GNUNET_SERVICE_run (6,
- argv,
- "test_service6",
- GNUNET_SERVICE_OPTION_NONE,
- &runner6, &ok));
- GNUNET_break (0 == ok);
- return ok;
-}
-
static void
start_stop_main (void *cls,
- struct GNUNET_SCHEDULER_Handle *sched,
char *const *args,
const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
int *ret = cls;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Starting service using start method\n");
- sctx = GNUNET_SERVICE_start ("test_service", sched, cfg);
- runner (cls, sched, GNUNET_SERVICE_get_server (sctx), cfg);
+ sctx = GNUNET_SERVICE_start ("test_service", cfg);
+ GNUNET_assert (NULL != sctx);
+ runner (cls, GNUNET_SERVICE_get_server (sctx), cfg);
*ret = 0;
}
{
GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (s));
ret += check6 ();
- ret += check6d (); /* with daemonization */
}
ret += check_start_stop ();