projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement a Full Domain Hash (FDH) for RSA signatures and blind signatures
[oweals/gnunet.git]
/
src
/
util
/
test_service.c
diff --git
a/src/util/test_service.c
b/src/util/test_service.c
index 9b43f924dc80f40d4f9a29ead5cc87483f7f3ef0..88f99f95ac1d96a49a278388c46672299607feec 100644
(file)
--- a/
src/util/test_service.c
+++ b/
src/util/test_service.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet.
/*
This file is part of GNUnet.
- (C) 2009 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2009, 2013 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
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@
-14,27
+14,23
@@
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
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., 5
9 Temple Place - Suite 330
,
- Boston, MA 0211
1-1307
, USA.
+ Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+ Boston, MA 0211
0-1301
, USA.
*/
/**
* @file util/test_service.c
* @brief tests for service.c
*/
/**
* @file util/test_service.c
* @brief tests for service.c
+ * @author Christian Grothoff
*/
#include "platform.h"
*/
#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 VERBOSE GNUNET_YES
-
#define PORT 12435
#define PORT 12435
+/**
+ * Message type we use for testing.
+ */
#define MY_TYPE 256
static struct GNUNET_SERVICE_Context *sctx;
#define MY_TYPE 256
static struct GNUNET_SERVICE_Context *sctx;
@@
-44,8
+40,6
@@
static int ok = 1;
static struct GNUNET_CLIENT_Connection *client;
static struct GNUNET_CLIENT_Connection *client;
-
-
static void
do_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
static void
do_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
@@
-89,11
+83,12
@@
build_msg (void *cls, size_t size, void *buf)
static void
static void
-ready (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+ready (void *cls,
+ int result)
{
const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
{
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);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Service confirmed running\n");
client = GNUNET_CLIENT_connect ("test_service", cfg);
GNUNET_assert (client != NULL);
@@
-110,8
+105,7
@@
static void
recv_cb (void *cls, struct GNUNET_SERVER_Client *sc,
const struct GNUNET_MessageHeader *message)
{
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);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Receiving client message...\n");
GNUNET_SERVER_receive_done (sc, GNUNET_OK);
GNUNET_SCHEDULER_add_now (&do_stop, NULL);
@@
-148,29
+142,25
@@
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;
}
+
static void
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");
{
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");
client = GNUNET_CLIENT_connect ("test_service6", cfg);
GNUNET_assert (client != NULL);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "V6 client connected\n");
@@
-180,6
+170,7
@@
ready6 (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
&build_msg, NULL);
}
&build_msg, NULL);
}
+
static void
runner6 (void *cls, struct GNUNET_SERVER_Handle *server,
const struct GNUNET_CONFIGURATION_Handle *cfg)
static void
runner6 (void *cls, struct GNUNET_SERVER_Handle *server,
const struct GNUNET_CONFIGURATION_Handle *cfg)
@@
-190,6
+181,7
@@
runner6 (void *cls, struct GNUNET_SERVER_Handle *server,
&ready6, (void *) cfg);
}
&ready6, (void *) cfg);
}
+
/**
* Main method, starts scheduler with task1,
* checks that "ok" is correct at the end.
/**
* Main method, starts scheduler with task1,
* checks that "ok" is correct at the end.
@@
-201,17
+193,11
@@
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_run (
3
, argv, "test_service6",
GNUNET_SERVICE_OPTION_NONE, &runner6,
&ok));
GNUNET_assert (0 == ok);
GNUNET_SERVICE_OPTION_NONE, &runner6,
&ok));
GNUNET_assert (0 == ok);
@@
-219,7
+205,6
@@
check6 ()
}
}
-
static void
start_stop_main (void *cls, char *const *args, const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
static void
start_stop_main (void *cls, char *const *args, const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
@@
-241,12
+226,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[] = {
@@
-255,7
+234,7
@@
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));
GNUNET_break (0 == ret);
options, &start_stop_main, &ret));
GNUNET_break (0 == ret);
@@
-270,11
+249,7
@@
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 ();