X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Futil%2Ftest_service.c;h=eff8c75703d4baec7a0aafecb3f373543b70bc7b;hb=e62ce5b19244ae28472bf0e02b19c3f905f1ee0a;hp=6148fa2cc56cfe1e448a8b681fa5149f7db81c7b;hpb=bed8e0d389aacc368b3dd9704d355b284236fea3;p=oweals%2Fgnunet.git diff --git a/src/util/test_service.c b/src/util/test_service.c index 6148fa2cc..eff8c7570 100644 --- a/src/util/test_service.c +++ b/src/util/test_service.c @@ -4,7 +4,7 @@ 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 @@ -31,14 +31,12 @@ #include "gnunet_time_lib.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_EXTRA_LOGGING #define PORT 12435 #define MY_TYPE 256 -static struct GNUNET_SCHEDULER_Handle *sched; - static struct GNUNET_SERVICE_Context *sctx; static int ok = 1; @@ -67,48 +65,52 @@ ready (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) GNUNET_assert (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE)); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Service confirmed running\n"); - sched = tc->sched; - client = GNUNET_CLIENT_connect (tc->sched, "test_service", cfg); + client = GNUNET_CLIENT_connect ("test_service", cfg); GNUNET_assert (client != NULL); 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, client); + GNUNET_TIME_UNIT_SECONDS, 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, +recv_cb (void *cls, struct GNUNET_SERVER_Client *client, const struct GNUNET_MessageHeader *message) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Receiving client message...\n"); GNUNET_SERVER_receive_done (client, GNUNET_OK); - GNUNET_SCHEDULER_shutdown (sched); + if (sctx != NULL) + GNUNET_SCHEDULER_add_now (&do_stop, NULL); + else + GNUNET_SCHEDULER_shutdown (); 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_SCHEDULER_Handle *sched, - struct GNUNET_SERVER_Handle *server, +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 (sched, - "test_service", - cfg, GNUNET_TIME_UNIT_SECONDS, &ready, - (void *) cfg); + GNUNET_CLIENT_service_test ("test_service", cfg, GNUNET_TIME_UNIT_SECONDS, + &ready, (void *) cfg); } @@ -134,11 +136,8 @@ check () }; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting service\n"); GNUNET_assert (GNUNET_OK == - GNUNET_SERVICE_run (5, - argv, - "test_service", - GNUNET_SERVICE_OPTION_NONE, - &runner, &ok)); + GNUNET_SERVICE_run (5, argv, "test_service", + GNUNET_SERVICE_OPTION_NONE, &runner, &ok)); GNUNET_assert (0 == ok); return ok; } @@ -150,29 +149,24 @@ ready6 (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 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, sizeof (struct GNUNET_MessageHeader), - GNUNET_TIME_UNIT_SECONDS, - GNUNET_NO, &build_msg, client); + GNUNET_TIME_UNIT_SECONDS, GNUNET_NO, + &build_msg, client); } static void -runner6 (void *cls, - struct GNUNET_SCHEDULER_Handle *sched, - struct GNUNET_SERVER_Handle *server, +runner6 (void *cls, 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", - cfg, GNUNET_TIME_UNIT_SECONDS, &ready6, - (void *) cfg); + GNUNET_CLIENT_service_test ("test_service6", cfg, GNUNET_TIME_UNIT_SECONDS, + &ready6, (void *) cfg); } /** @@ -196,11 +190,9 @@ check6 () }; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting v6 service\n"); GNUNET_assert (GNUNET_OK == - GNUNET_SERVICE_run (5, - argv, - "test_service6", - GNUNET_SERVICE_OPTION_NONE, - &runner6, &ok)); + GNUNET_SERVICE_run (5, argv, "test_service6", + GNUNET_SERVICE_OPTION_NONE, &runner6, + &ok)); GNUNET_assert (0 == ok); return ok; } @@ -208,17 +200,15 @@ check6 () static void -start_stop_main (void *cls, - struct GNUNET_SCHEDULER_Handle *sched, - char *const *args, - const char *cfgfile, +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", sched, cfg); - runner (cls, sched, GNUNET_SERVICE_get_server (sctx), cfg); + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting service using start method\n"); + sctx = GNUNET_SERVICE_start ("test_service", cfg); + GNUNET_assert (NULL != sctx); + runner (cls, GNUNET_SERVICE_get_server (sctx), cfg); *ret = 0; } @@ -242,11 +232,9 @@ check_start_stop () GNUNET_GETOPT_OPTION_END }; int ret = 1; + GNUNET_assert (GNUNET_OK == - GNUNET_PROGRAM_run (5, - argv, - "test-service-program", - "no help", + GNUNET_PROGRAM_run (5, argv, "test-service-program", "no help", options, &start_stop_main, &ret)); GNUNET_break (0 == ret); @@ -275,22 +263,22 @@ main (int argc, char *argv[]) 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"); - return 1; - } - fprintf (stderr, - "IPv6 support seems to not be available (%s), not testing it!\n", - strerror (errno)); + GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "socket"); + return 1; } + FPRINTF (stderr, + "IPv6 support seems to not be available (%s), not testing it!\n", + strerror (errno)); + } else - { - GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (s)); - ret += check6 (); - } + { + GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (s)); + ret += check6 (); + } ret += check_start_stop (); return ret;