/*
This file is part of GNUnet.
- (C) 2009, 2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2009, 2013, 2016 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
* @file util/test_service.c
#include "platform.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 int ok = 1;
+static int global_ret = 1;
-static struct GNUNET_CLIENT_Connection *client;
+static struct GNUNET_MQ_Handle *mq;
static void
-do_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- if (NULL != client)
- {
- GNUNET_CLIENT_disconnect (client);
- client = NULL;
- }
- if (NULL != sctx)
- {
- GNUNET_SERVICE_stop (sctx);
- sctx = NULL;
- }
- else
- {
- GNUNET_SCHEDULER_shutdown ();
- }
-}
-
-
-static size_t
-build_msg (void *cls, size_t size, void *buf)
+handle_recv (void *cls,
+ const struct GNUNET_MessageHeader *message)
{
- struct GNUNET_MessageHeader *msg = buf;
-
- if (size < sizeof (struct GNUNET_MessageHeader))
- {
- /* timeout */
- GNUNET_break (0);
- GNUNET_SCHEDULER_add_now (&do_stop, NULL);
- ok = 1;
- return 0;
- }
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Client connected, transmitting\n");
- GNUNET_assert (size >= sizeof (struct GNUNET_MessageHeader));
- msg->type = htons (MY_TYPE);
- msg->size = htons (sizeof (struct GNUNET_MessageHeader));
- return sizeof (struct GNUNET_MessageHeader);
-}
-
-
-static void
-ready (void *cls,
- int result)
-{
- const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
-
- 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);
+ struct GNUNET_SERVICE_Client *client = cls;
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Client connecting, waiting to transmit\n");
- GNUNET_CLIENT_notify_transmit_ready (client,
- sizeof (struct GNUNET_MessageHeader),
- GNUNET_TIME_UNIT_SECONDS, GNUNET_NO,
- &build_msg, NULL);
-}
-
-
-static void
-recv_cb (void *cls, struct GNUNET_SERVER_Client *sc,
- const struct GNUNET_MessageHeader *message)
-{
- 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);
- ok = 0;
-}
-
-
-static struct GNUNET_SERVER_MessageHandler myhandlers[] = {
- {&recv_cb, NULL, MY_TYPE, sizeof (struct GNUNET_MessageHeader)},
- {NULL, NULL, 0, 0}
-};
-
-
-static void
-runner (void *cls, 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 ("test_service", cfg, GNUNET_TIME_UNIT_SECONDS,
- &ready, (void *) cfg);
+ "Received client message...\n");
+ GNUNET_SERVICE_client_continue (client);
+ global_ret = 2;
+ GNUNET_MQ_destroy (mq);
+ mq = NULL;
}
/**
- * Main method, starts scheduler with task1,
- * checks that "ok" is correct at the end.
+ * Function called when the client connects to the service.
+ *
+ * @param cls the name of the service
+ * @param c connecting client
+ * @param mq message queue to talk to the client
+ * @return @a c so we have the client handle in the future
*/
-static int
-check ()
+static void *
+connect_cb (void *cls,
+ struct GNUNET_SERVICE_Client *c,
+ struct GNUNET_MQ_Handle *mq)
{
- ok = 1;
- char *const argv[] = {
- "test_service",
- "-c",
- "test_service_data.conf",
- NULL
- };
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting service\n");
- GNUNET_assert (GNUNET_OK ==
- GNUNET_SERVICE_run (3, argv, "test_service",
- GNUNET_SERVICE_OPTION_NONE, &runner, &ok));
- GNUNET_assert (0 == ok);
- return ok;
+ /* FIXME: in the future, do something with mq
+ to test sending messages to the client! */
+ return c;
}
+/**
+ * Function called when the client disconnects.
+ *
+ * @param cls our service name
+ * @param c disconnecting client
+ * @param internal_cls must match @a c
+ */
static void
-ready6 (void *cls,
- int result)
+disconnect_cb (void *cls,
+ struct GNUNET_SERVICE_Client *c,
+ void *internal_cls)
{
- const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "V6 ready\n");
- 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");
- GNUNET_CLIENT_notify_transmit_ready (client,
- sizeof (struct GNUNET_MessageHeader),
- GNUNET_TIME_UNIT_SECONDS, GNUNET_NO,
- &build_msg, NULL);
+ GNUNET_assert (c == internal_cls);
+ if (2 == global_ret)
+ {
+ GNUNET_SCHEDULER_shutdown ();
+ global_ret = 0;
+ }
}
+/**
+ * Initialization function of the service. Starts
+ * a client to connect to the service.
+ *
+ * @param cls the name of the service (const char *)
+ * @param cfg the configuration we use
+ * @param sh handle to the service
+ */
static void
-runner6 (void *cls, struct GNUNET_SERVER_Handle *server,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
+service_init (void *cls,
+ const struct GNUNET_CONFIGURATION_Handle *cfg,
+ struct GNUNET_SERVICE_Handle *sh)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Initializing v6 service\n");
- GNUNET_SERVER_add_handlers (server, myhandlers);
- GNUNET_CLIENT_service_test ("test_service6", cfg, GNUNET_TIME_UNIT_SECONDS,
- &ready6, (void *) cfg);
+ const char *service_name = cls;
+ struct GNUNET_MQ_Envelope *env;
+ struct GNUNET_MessageHeader *msg;
+
+ mq = GNUNET_CLIENT_connect (cfg,
+ service_name,
+ NULL,
+ NULL,
+ NULL);
+ GNUNET_assert (NULL != mq);
+ env = GNUNET_MQ_msg (msg,
+ MY_TYPE);
+ GNUNET_MQ_send (mq,
+ env);
}
/**
- * Main method, starts scheduler with task1,
- * checks that "ok" is correct at the end.
+ * Main method, starts the service and initiates
+ * the running of the test.
+ *
+ * @param sname name of the service to run
*/
static int
-check6 ()
+check (const char *sname)
{
- char *const argv[] = {
- "test_service6",
- "-c",
- "test_service_data.conf",
- NULL
+ struct GNUNET_MQ_MessageHandler myhandlers[] = {
+ GNUNET_MQ_hd_fixed_size (recv,
+ MY_TYPE,
+ struct GNUNET_MessageHeader,
+ NULL),
+ GNUNET_MQ_handler_end ()
};
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting v6 service\n");
- GNUNET_assert (GNUNET_OK ==
- GNUNET_SERVICE_run (3, argv, "test_service6",
- GNUNET_SERVICE_OPTION_NONE, &runner6,
- &ok));
- GNUNET_assert (0 == ok);
- return ok;
-}
-
-
-static void
-start_stop_main (void *cls, 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", cfg, GNUNET_SERVICE_OPTION_NONE);
- GNUNET_assert (NULL != sctx);
- runner (cls, GNUNET_SERVICE_get_server (sctx), cfg);
- *ret = 0;
-}
-
-
-static int
-check_start_stop ()
-{
char *const argv[] = {
- "test-service-program",
+ (char *) sname,
"-c",
"test_service_data.conf",
NULL
};
- const struct GNUNET_GETOPT_CommandLineOption options[] = {
- GNUNET_GETOPT_OPTION_END
- };
- int ret = 1;
-
- 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;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Starting `%s' service\n",
+ sname);
+ global_ret = 1;
+ GNUNET_assert (0 ==
+ GNUNET_SERVICE_ruN_ (3,
+ argv,
+ sname,
+ GNUNET_SERVICE_OPTION_NONE,
+ &service_init,
+ &connect_cb,
+ &disconnect_cb,
+ (void *) sname,
+ myhandlers));
+ return global_ret;
}
int
-main (int argc, char *argv[])
+main (int argc,
+ char *argv[])
{
int ret = 0;
struct GNUNET_NETWORK_Handle *s = NULL;
GNUNET_log_setup ("test-service",
"WARNING",
NULL);
- ret += check ();
- ret += check ();
- // FIXME
+ ret += check ("test_service");
+ ret += check ("test_service");
#ifndef MINGW
- s = GNUNET_NETWORK_socket_create (PF_INET6, SOCK_STREAM, 0);
+ s = GNUNET_NETWORK_socket_create (PF_INET6,
+ SOCK_STREAM,
+ 0);
#endif
if (NULL == s)
{
- if ((errno == ENOBUFS) || (errno == ENOMEM) || (errno == ENFILE) ||
- (errno == EACCES))
+ if ( (errno == ENOBUFS) ||
+ (errno == ENOMEM) ||
+ (errno == ENFILE) ||
+ (errno == EACCES) )
{
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "socket");
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR,
+ "socket");
return 1;
}
FPRINTF (stderr,
}
else
{
- GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (s));
- ret += check6 ();
+ GNUNET_break (GNUNET_OK ==
+ GNUNET_NETWORK_socket_close (s));
+ ret += check ("test_service6");
}
- ret += check_start_stop ();
return ret;
}
projects / oweals / gnunet.git / blobdiff