#include "gnunet_scheduler_lib.h"
#include "gnunet_time_lib.h"
+
#define VERBOSE GNUNET_NO
#define PORT 12435
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 (client);
- if (sctx != NULL)
- GNUNET_SERVICE_stop (sctx);
+ GNUNET_CLIENT_service_shutdown (sched, client, GNUNET_TIME_UNIT_FOREVER_REL, &end_cont, NULL);
}
msg->type = htons (MY_TYPE);
msg->size = htons (sizeof (struct GNUNET_MessageHeader));
GNUNET_SCHEDULER_add_continuation (sched,
- GNUNET_YES,
&end_it,
client,
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
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_assert (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE));
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_assert (client != NULL);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
{NULL, NULL, 0, 0}
};
+
+
+
static void
runner (void *cls,
struct GNUNET_SCHEDULER_Handle *sched,
(void *) cfg);
}
-static void
-term (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
- int *ok = cls;
- *ok = 0;
-}
/**
* Main method, starts scheduler with task1,
static int
check ()
{
- int ok = 1;
+ ok = 1;
char *const argv[] = {
"test_service",
"-c",
GNUNET_SERVICE_run (5,
argv,
"test_service",
- &runner, &ok, &term, &ok));
+ GNUNET_SERVICE_OPTION_NONE,
+ &runner, &ok));
GNUNET_assert (0 == ok);
return ok;
}
static int
check6 ()
{
- int ok = 1;
char *const argv[] = {
"test_service6",
"-c",
GNUNET_SERVICE_run (5,
argv,
"test_service6",
- &runner6, &ok, &term, &ok));
+ GNUNET_SERVICE_OPTION_NONE,
+ &runner6, &ok));
GNUNET_assert (0 == ok);
return ok;
}
static int
check6d ()
{
- int ok = 1;
+ ok = 1;
char *const argv[] = {
"test_service6",
"-c",
GNUNET_SERVICE_run (6,
argv,
"test_service6",
- &runner6, &ok, &term, &ok));
+ GNUNET_SERVICE_OPTION_NONE,
+ &runner6, &ok));
GNUNET_break (0 == ok);
return ok;
}
main (int argc, char *argv[])
{
int ret = 0;
- struct GNUNET_NETWORK_Handle *s;
+ struct GNUNET_NETWORK_Handle *s = NULL;
GNUNET_log_setup ("test-service",
#if VERBOSE
NULL);
ret += check ();
ret += check ();
+
+ // FIXME
+#ifndef MINGW
s = GNUNET_NETWORK_socket_create (PF_INET6, SOCK_STREAM, 0);
+#endif
if (NULL == s)
{
if ((errno == ENOBUFS) ||