/*
This file is part of GNUnet.
- (C) 2009 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2009, 2013 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
/**
* @file util/test_service.c
* @brief tests for service.c
+ * @author Christian Grothoff
*/
#include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_client_lib.h"
-#include "gnunet_getopt_lib.h"
-#include "gnunet_program_lib.h"
-#include "gnunet_service_lib.h"
-#include "gnunet_scheduler_lib.h"
-#include "gnunet_time_lib.h"
+#include "gnunet_util_lib.h"
#define PORT 12435
+/**
+ * Message type we use for testing.
+ */
#define MY_TYPE 256
static struct GNUNET_SERVICE_Context *sctx;
static struct GNUNET_CLIENT_Connection *client;
-
-
static void
do_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
static void
-ready (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+ready (void *cls,
+ int result)
{
const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
- GNUNET_assert (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE));
+ GNUNET_assert (GNUNET_YES == result);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Service confirmed running\n");
client = GNUNET_CLIENT_connect ("test_service", cfg);
GNUNET_assert (client != NULL);
recv_cb (void *cls, struct GNUNET_SERVER_Client *sc,
const struct GNUNET_MessageHeader *message)
{
- if (NULL == message)
- return;
+ GNUNET_assert (NULL != message);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Receiving client message...\n");
GNUNET_SERVER_receive_done (sc, GNUNET_OK);
GNUNET_SCHEDULER_add_now (&do_stop, NULL);
return ok;
}
+
static void
-ready6 (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+ready6 (void *cls,
+ int result)
{
const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "V6 ready\n");
- GNUNET_assert (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE));
+ GNUNET_assert (GNUNET_YES == result);
client = GNUNET_CLIENT_connect ("test_service6", cfg);
GNUNET_assert (client != NULL);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "V6 client connected\n");
&build_msg, NULL);
}
+
static void
runner6 (void *cls, struct GNUNET_SERVER_Handle *server,
const struct GNUNET_CONFIGURATION_Handle *cfg)
&ready6, (void *) cfg);
}
+
/**
* Main method, starts scheduler with task1,
* checks that "ok" is correct at the end.
}
-
static void
start_stop_main (void *cls, char *const *args, const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
GNUNET_assert (GNUNET_OK ==
GNUNET_PROGRAM_run (3, argv, "test-service-program", "no help",
options, &start_stop_main, &ret));
-
+
GNUNET_break (0 == ret);
return ret;
}