projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
-more libexec fixes for OpenSUSE
[oweals/gnunet.git]
/
src
/
util
/
test_service.c
diff --git
a/src/util/test_service.c
b/src/util/test_service.c
index daafa6cd35628ae91d133fd5f2b3a878b90d47ee..be49d18775bdab993c6d063b939b037578858397 100644
(file)
--- a/
src/util/test_service.c
+++ b/
src/util/test_service.c
@@
-31,8
+31,6
@@
#include "gnunet_time_lib.h"
#include "gnunet_time_lib.h"
-#define VERBOSE GNUNET_NO
-
#define PORT 12435
#define MY_TYPE 256
#define PORT 12435
#define MY_TYPE 256
@@
-41,18
+39,49
@@
static struct GNUNET_SERVICE_Context *sctx;
static int ok = 1;
static int ok = 1;
+static struct GNUNET_CLIENT_Connection *client;
+
+
+
+
+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)
{
static size_t
build_msg (void *cls, size_t size, void *buf)
{
- struct GNUNET_CLIENT_Connection *client = cls;
struct GNUNET_MessageHeader *msg = buf;
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));
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));
- GNUNET_CLIENT_disconnect (client, GNUNET_NO);
return sizeof (struct GNUNET_MessageHeader);
}
return sizeof (struct GNUNET_MessageHeader);
}
@@
-61,7
+90,6
@@
static void
ready (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
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");
GNUNET_assert (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Service confirmed running\n");
@@
-71,49
+99,38
@@
ready (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
"Client connecting, waiting to transmit\n");
GNUNET_CLIENT_notify_transmit_ready (client,
sizeof (struct GNUNET_MessageHeader),
"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);
-}
-
-static void
-do_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- GNUNET_SERVICE_stop (sctx);
+ GNUNET_TIME_UNIT_SECONDS, GNUNET_NO,
+ &build_msg, NULL);
}
static void
}
static void
-recv_cb (void *cls,
- struct GNUNET_SERVER_Client *client,
+recv_cb (void *cls, struct GNUNET_SERVER_Client *sc,
const struct GNUNET_MessageHeader *message)
{
const struct GNUNET_MessageHeader *message)
{
+ if (NULL == message)
+ return;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Receiving client message...\n");
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 ();
+ GNUNET_SERVER_receive_done (sc, GNUNET_OK);
+ GNUNET_SCHEDULER_add_now (&do_stop, NULL);
ok = 0;
}
ok = 0;
}
+
static struct GNUNET_SERVER_MessageHandler myhandlers[] = {
{&recv_cb, NULL, MY_TYPE, sizeof (struct GNUNET_MessageHeader)},
{NULL, NULL, 0, 0}
};
static struct GNUNET_SERVER_MessageHandler myhandlers[] = {
{&recv_cb, NULL, MY_TYPE, sizeof (struct GNUNET_MessageHeader)},
{NULL, NULL, 0, 0}
};
-
-
static void
static void
-runner (void *cls,
- 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);
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);
+ GNUNET_CLIENT_service_test ("test_service", cfg, GNUNET_TIME_UNIT_SECONDS,
+ &ready, (void *) cfg);
}
}
@@
-129,19
+146,11
@@
check ()
"test_service",
"-c",
"test_service_data.conf",
"test_service",
"-c",
"test_service_data.conf",
- "-L",
-#if VERBOSE
- "DEBUG",
-#else
- "WARNING",
-#endif
NULL
};
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting service\n");
GNUNET_assert (GNUNET_OK ==
NULL
};
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting service\n");
GNUNET_assert (GNUNET_OK ==
- GNUNET_SERVICE_run (5,
- argv,
- "test_service",
+ GNUNET_SERVICE_run (3, argv, "test_service",
GNUNET_SERVICE_OPTION_NONE, &runner, &ok));
GNUNET_assert (0 == ok);
return ok;
GNUNET_SERVICE_OPTION_NONE, &runner, &ok));
GNUNET_assert (0 == ok);
return ok;
@@
-151,7
+160,6
@@
static void
ready6 (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
ready6 (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, "V6 ready\n");
GNUNET_assert (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "V6 ready\n");
GNUNET_assert (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE));
@@
-160,20
+168,18
@@
ready6 (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "V6 client connected\n");
GNUNET_CLIENT_notify_transmit_ready (client,
sizeof (struct GNUNET_MessageHeader),
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, NULL
);
}
static void
}
static void
-runner6 (void *cls,
- 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);
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 ("test_service6",
- cfg, GNUNET_TIME_UNIT_SECONDS, &ready6,
- (void *) cfg);
+ GNUNET_CLIENT_service_test ("test_service6", cfg, GNUNET_TIME_UNIT_SECONDS,
+ &ready6, (void *) cfg);
}
/**
}
/**
@@
-187,21
+193,13
@@
check6 ()
"test_service6",
"-c",
"test_service_data.conf",
"test_service6",
"-c",
"test_service_data.conf",
- "-L",
-#if VERBOSE
- "DEBUG",
-#else
- "WARNING",
-#endif
NULL
};
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting v6 service\n");
GNUNET_assert (GNUNET_OK ==
NULL
};
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 (3, argv, "test_service6",
+ GNUNET_SERVICE_OPTION_NONE, &runner6,
+ &ok));
GNUNET_assert (0 == ok);
return ok;
}
GNUNET_assert (0 == ok);
return ok;
}
@@
-209,15
+207,13
@@
check6 ()
static void
static void
-start_stop_main (void *cls,
- 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");
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);
+ 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;
GNUNET_assert (NULL != sctx);
runner (cls, GNUNET_SERVICE_get_server (sctx), cfg);
*ret = 0;
@@
-231,12
+227,6
@@
check_start_stop ()
"test-service-program",
"-c",
"test_service_data.conf",
"test-service-program",
"-c",
"test_service_data.conf",
- "-L",
-#if VERBOSE
- "DEBUG",
-#else
- "WARNING",
-#endif
NULL
};
const struct GNUNET_GETOPT_CommandLineOption options[] = {
NULL
};
const struct GNUNET_GETOPT_CommandLineOption options[] = {
@@
-245,12
+235,9
@@
check_start_stop ()
int ret = 1;
GNUNET_assert (GNUNET_OK ==
int ret = 1;
GNUNET_assert (GNUNET_OK ==
- GNUNET_PROGRAM_run (5,
- argv,
- "test-service-program",
- "no help",
+ GNUNET_PROGRAM_run (3, argv, "test-service-program", "no help",
options, &start_stop_main, &ret));
options, &start_stop_main, &ret));
-
+
GNUNET_break (0 == ret);
return ret;
}
GNUNET_break (0 == ret);
return ret;
}
@@
-263,28
+250,23
@@
main (int argc, char *argv[])
struct GNUNET_NETWORK_Handle *s = NULL;
GNUNET_log_setup ("test-service",
struct GNUNET_NETWORK_Handle *s = NULL;
GNUNET_log_setup ("test-service",
-#if VERBOSE
- "DEBUG",
-#else
"WARNING",
"WARNING",
-#endif
NULL);
ret += check ();
ret += check ();
NULL);
ret += check ();
ret += check ();
-
// FIXME
#ifndef MINGW
s = GNUNET_NETWORK_socket_create (PF_INET6, SOCK_STREAM, 0);
#endif
if (NULL == s)
{
// FIXME
#ifndef MINGW
s = GNUNET_NETWORK_socket_create (PF_INET6, SOCK_STREAM, 0);
#endif
if (NULL == s)
{
- if ((errno == ENOBUFS) ||
- (errno == E
NOMEM) || (errno == ENFILE) || (errno == E
ACCES))
+ if ((errno == ENOBUFS) ||
(errno == ENOMEM) || (errno == ENFILE) ||
+ (errno == EACCES))
{
GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "socket");
return 1;
}
{
GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "socket");
return 1;
}
-
fprintf
(stderr,
+
FPRINTF
(stderr,
"IPv6 support seems to not be available (%s), not testing it!\n",
strerror (errno));
}
"IPv6 support seems to not be available (%s), not testing it!\n",
strerror (errno));
}
@@
-294,7
+276,6
@@
main (int argc, char *argv[])
ret += check6 ();
}
ret += check_start_stop ();
ret += check6 ();
}
ret += check_start_stop ();
-
return ret;
}
return ret;
}