[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r21839 - gnunet/src/testing
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r21839 - gnunet/src/testing |
|
Date: |
Sun, 10 Jun 2012 02:28:14 +0200 |
Author: grothoff
Date: 2012-06-10 02:28:14 +0200 (Sun, 10 Jun 2012)
New Revision: 21839
Added:
gnunet/src/testing/test_testing_peerstartup.c
gnunet/src/testing/test_testing_portreservation.c
gnunet/src/testing/test_testing_servicestartup.c
gnunet/src/testing/testing.c
Removed:
gnunet/src/testing/test_testing_new_peerstartup.c
gnunet/src/testing/test_testing_new_portreservation.c
gnunet/src/testing/test_testing_new_servicestartup.c
gnunet/src/testing/testing_new.c
Modified:
gnunet/src/testing/Makefile.am
Log:
-renamefest
Modified: gnunet/src/testing/Makefile.am
===================================================================
--- gnunet/src/testing/Makefile.am 2012-06-10 00:04:55 UTC (rev 21838)
+++ gnunet/src/testing/Makefile.am 2012-06-10 00:28:14 UTC (rev 21839)
@@ -18,7 +18,7 @@
libgnunettesting.la
libgnunettesting_la_SOURCES = \
- testing_new.c
+ testing.c
libgnunettesting_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
$(LTLIBINTL)
@@ -28,32 +28,32 @@
check_PROGRAMS = \
- test_testing_new_portreservation \
- test_testing_new_peerstartup \
- test_testing_new_servicestartup
+ test_testing_portreservation \
+ test_testing_peerstartup \
+ test_testing_servicestartup
if ENABLE_TEST_RUN
TESTS = \
- test_testing_new_portreservation \
- test_testing_new_peerstartup \
- test_testing_new_servicestartup
+ test_testing_portreservation \
+ test_testing_peerstartup \
+ test_testing_servicestartup
endif
-test_testing_new_portreservation_SOURCES = \
- test_testing_new_portreservation.c
-test_testing_new_portreservation_LDADD = \
+test_testing_portreservation_SOURCES = \
+ test_testing_portreservation.c
+test_testing_portreservation_LDADD = \
$(top_builddir)/src/testing/libgnunettesting.la \
$(top_builddir)/src/util/libgnunetutil.la
-test_testing_new_peerstartup_SOURCES = \
- test_testing_new_peerstartup.c
-test_testing_new_peerstartup_LDADD = \
+test_testing_peerstartup_SOURCES = \
+ test_testing_peerstartup.c
+test_testing_peerstartup_LDADD = \
$(top_builddir)/src/testing/libgnunettesting.la \
$(top_builddir)/src/util/libgnunetutil.la
-test_testing_new_servicestartup_SOURCES = \
- test_testing_new_servicestartup.c
-test_testing_new_servicestartup_LDADD = \
+test_testing_servicestartup_SOURCES = \
+ test_testing_servicestartup.c
+test_testing_servicestartup_LDADD = \
$(top_builddir)/src/testing/libgnunettesting.la \
$(top_builddir)/src/util/libgnunetutil.la
Deleted: gnunet/src/testing/test_testing_new_peerstartup.c
===================================================================
--- gnunet/src/testing/test_testing_new_peerstartup.c 2012-06-10 00:04:55 UTC
(rev 21838)
+++ gnunet/src/testing/test_testing_new_peerstartup.c 2012-06-10 00:28:14 UTC
(rev 21839)
@@ -1,161 +0,0 @@
-/*
- This file is part of GNUnet
- (C) 2008, 2009, 2012 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
- 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
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- 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.
- */
-
-/**
- * @file testing/test_testing_new_peerstartup.c
- * @brief test case for testing peer startup and shutdown using new testing
- * library
- * @author Sree Harsha Totakura
- */
-
-#include "platform.h"
-#include "gnunet_configuration_lib.h"
-#include "gnunet_os_lib.h"
-#include "gnunet_testing_lib-new.h"
-
-#define LOG(kind,...) \
- GNUNET_log (kind, __VA_ARGS__)
-
-#define TIME_REL_SEC(sec) \
- GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, sec)
-
-/**
- * The testing context
- */
-struct TestingContext
-{
- /**
- * The testing system
- */
- struct GNUNET_TESTING_System *system;
-
- /**
- * The peer which has been started by the testing system
- */
- struct GNUNET_TESTING_Peer *peer;
-
- /**
- * The running configuration of the peer
- */
- struct GNUNET_CONFIGURATION_Handle *cfg;
-};
-
-
-/**
- * Task for shutdown
- *
- * @param cls the testing context
- * @param tc the tast context
- */
-static void
-do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct TestingContext *test_ctx = cls;
-
- GNUNET_assert (GNUNET_OK == GNUNET_TESTING_peer_stop (test_ctx->peer));
- GNUNET_TESTING_peer_destroy (test_ctx->peer);
- GNUNET_CONFIGURATION_destroy (test_ctx->cfg);
- GNUNET_TESTING_hostkeys_unload (test_ctx->system);
- GNUNET_TESTING_system_destroy (test_ctx->system, GNUNET_YES);
- GNUNET_free (test_ctx);
-}
-
-
-/**
- * Main point of test execution
- */
-static void
-run (void *cls, char *const *args, const char *cfgfile,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
- struct GNUNET_TESTING_System *system;
- struct GNUNET_TESTING_Peer *peer;
- struct GNUNET_CONFIGURATION_Handle *new_cfg;
- struct TestingContext *test_ctx;
- char *data_dir;
- char *hostkeys_file;
- char *emsg;
- char *_tmpdir;
- char *tmpdir;
-#ifdef MINGW
- char *tmpdir_w;
-#endif
-
- struct GNUNET_PeerIdentity id;
-
- _tmpdir = getenv ("TMP");
- if (NULL == _tmpdir)
- _tmpdir = getenv ("TEMP");
- if (NULL == _tmpdir)
- _tmpdir = getenv ("TMPDIR");
- if (NULL == _tmpdir)
- _tmpdir = "/tmp";
- GNUNET_asprintf (&tmpdir, "%s/%s", _tmpdir,
"test-gnunet-testing_new-XXXXXX");
-#ifdef MINGW
- tmpdir_w = GNUNET_malloc (MAX_PATH + 1);
- GNUNET_assert (ERROR_SUCCESS == plibc_conv_to_win_path (tmpdir, tmpdir_w));
- GNUNET_free (tmpdir);
- tmpdir = tmpdir_w;
- //GNUNET_assert (0 == _mktemp_s (tmpdir, strlen (tmpdir) + 1));
-#else
- GNUNET_assert (mkdtemp (tmpdir) == tmpdir);
-#endif
- /* LOG (GNUNET_ERROR_TYPE_ERROR, */
- /* "Temporary directory: %s\n", tmpdir); */
- system = GNUNET_TESTING_system_create (tmpdir,
- "127.0.0.1");
- GNUNET_assert (NULL != system);
- GNUNET_free (tmpdir);
- data_dir = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_DATADIR);
- GNUNET_asprintf (&hostkeys_file, "%s/testing_hostkeys.dat", data_dir);
- GNUNET_free (data_dir);
- GNUNET_assert (GNUNET_OK ==
- GNUNET_TESTING_hostkeys_load (system, hostkeys_file));
- GNUNET_free (hostkeys_file);
- new_cfg = GNUNET_CONFIGURATION_dup (cfg);
- emsg = NULL;
- peer = GNUNET_TESTING_peer_configure (system, new_cfg, 0, &id, &emsg);
- GNUNET_assert (NULL != peer);
- GNUNET_assert (NULL == emsg);
- GNUNET_assert (GNUNET_OK == GNUNET_TESTING_peer_start (peer));
- test_ctx = GNUNET_malloc (sizeof (struct TestingContext));
- test_ctx->system = system;
- test_ctx->peer = peer;
- test_ctx->cfg = new_cfg;
- GNUNET_SCHEDULER_add_delayed (TIME_REL_SEC (5),
- &do_shutdown, test_ctx);
-
-}
-
-
-int main (int argc, char *argv[])
-{
- struct GNUNET_GETOPT_CommandLineOption options[] = {
- GNUNET_GETOPT_OPTION_END
- };
-
- if (GNUNET_OK !=
- GNUNET_PROGRAM_run (argc, argv,
- "test_testing_new_peerstartup",
- "test case for peerstartup using new testing
library",
- options, &run, NULL))
- return 1;
- return 0;
-}
Deleted: gnunet/src/testing/test_testing_new_portreservation.c
===================================================================
--- gnunet/src/testing/test_testing_new_portreservation.c 2012-06-10
00:04:55 UTC (rev 21838)
+++ gnunet/src/testing/test_testing_new_portreservation.c 2012-06-10
00:28:14 UTC (rev 21839)
@@ -1,90 +0,0 @@
-/*
- This file is part of GNUnet
- (C) 2008, 2009, 2012 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
- 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
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- 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.
- */
-
-/**
- * @file testing/test_testing_new_portreservation.c
- * @brief test case for testing port reservation routines from the new testing
- * library API
- * @author Sree Harsha Totakura
- */
-
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib-new.h"
-
-#define LOG(kind,...) \
- GNUNET_log (kind, __VA_ARGS__)
-
-/**
- * Main point of test execution
- */
-static void
-run (void *cls, char *const *args, const char *cfgfile,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
- struct GNUNET_TESTING_System *system;
- uint16_t new_port1;
- uint16_t new_port2;
- uint16_t old_port1;
-
- system = GNUNET_TESTING_system_create ("/tmp/gnunet-testing-new",
- "localhost");
- GNUNET_assert (NULL != system);
- new_port1 = GNUNET_TESTING_reserve_port (system, GNUNET_YES);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Reserved TCP port %u\n", new_port1);
- GNUNET_assert (0 != new_port1);
- new_port2 = GNUNET_TESTING_reserve_port (system, GNUNET_YES);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Reserved TCP port %u\n", new_port2);
- GNUNET_assert (0 != new_port2);
- GNUNET_assert (new_port1 != new_port2);
- GNUNET_TESTING_release_port (system, GNUNET_YES, new_port1);
- old_port1 = new_port1;
- new_port1 = 0;
- new_port1 = GNUNET_TESTING_reserve_port (system, GNUNET_YES);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Reserved TCP port %u\n", new_port1);
- GNUNET_assert (0 != new_port1);
- GNUNET_assert (old_port1 == new_port1);
- GNUNET_TESTING_release_port (system, GNUNET_YES, new_port1);
- GNUNET_TESTING_release_port (system, GNUNET_YES, new_port2);
- GNUNET_TESTING_system_destroy (system, GNUNET_NO);
-}
-
-int main (int argc, char *argv[])
-{
- struct GNUNET_GETOPT_CommandLineOption options[] = {
- GNUNET_GETOPT_OPTION_END
- };
- if (GNUNET_OK !=
- GNUNET_PROGRAM_run (argc,
- argv,
- "test_testing_new_portreservation",
- "test case for testing port reservation routines"
- " from the new testing library API",
- options,
- &run,
- NULL))
- {
- return 1;
- }
- return 0;
-}
Deleted: gnunet/src/testing/test_testing_new_servicestartup.c
===================================================================
--- gnunet/src/testing/test_testing_new_servicestartup.c 2012-06-10
00:04:55 UTC (rev 21838)
+++ gnunet/src/testing/test_testing_new_servicestartup.c 2012-06-10
00:28:14 UTC (rev 21839)
@@ -1,111 +0,0 @@
-/*
- This file is part of GNUnet
- (C) 2008, 2009, 2012 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
- 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
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- 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.
- */
-
-/**
- * @file testing/test_testing_new_servicestartup.c
- * @brief test case for testing service startup using new testing API
- * @author Sree Harsha Totakura
- */
-
-#include "platform.h"
-#include "gnunet_scheduler_lib.h"
-#include "gnunet_testing_lib-new.h"
-
-
-#define LOG(kind,...) \
- GNUNET_log (kind, __VA_ARGS__)
-
-#define TIME_REL_SEC(sec) \
- GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, sec)
-
-/**
- * Global test status
- */
-static int test_success;
-
-/**
- * The shutdown task. Used to signal that testing is done and service has to be
- * stopped
- *
- * @param cls NULL
- */
-static void
-shutdown_task(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- test_success = GNUNET_YES;
- GNUNET_SCHEDULER_shutdown ();
-}
-
-
-/**
- * The testing callback function
- *
- * @param cls NULL
- * @param cfg the configuration with which the current testing service is run
- */
-static void
-test_run (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
- GNUNET_assert (NULL == cls);
- GNUNET_assert (NULL != cfg);
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Service arm started successfully\n");
- GNUNET_SCHEDULER_add_delayed (TIME_REL_SEC (3), &shutdown_task, NULL);
-}
-
-
-/**
- * The main point of execution
- */
-int main (int argc, char *argv[])
-{
- char *_tmpdir;
- char *tmpdir;
-#ifdef MINGW
- char *tmpdir_w;
-#endif
-
- GNUNET_log_setup ("test_testing_new_servicestartup", "DEBUG", NULL);
- _tmpdir = getenv ("TMP");
- if (NULL == _tmpdir)
- _tmpdir = getenv ("TEMP");
- if (NULL == _tmpdir)
- _tmpdir = getenv ("TMPDIR");
- if (NULL == _tmpdir)
- _tmpdir = "/tmp";
- GNUNET_asprintf (&tmpdir, "%s/%s", _tmpdir,
"test-gnunet-testing_new-XXXXXX");
-#ifdef MINGW
- tmpdir_w = GNUNET_malloc (MAX_PATH + 1);
- GNUNET_assert (ERROR_SUCCESS == plibc_conv_to_win_path (tmpdir, tmpdir_w));
- GNUNET_free (tmpdir);
- tmpdir = tmpdir_w;
- //GNUNET_assert (0 == _mktemp_s (tmpdir, strlen (tmpdir) + 1));
-#else
- GNUNET_assert (mkdtemp (tmpdir) == tmpdir);
-#endif
-
- test_success = GNUNET_NO;
- GNUNET_assert (0 == GNUNET_TESTING_service_run (tmpdir,
- "arm",
- "test_testing_defaults.conf",
- &test_run,
- NULL));
- GNUNET_free (tmpdir);
- return (GNUNET_YES == test_success) ? 0 : 1;
-}
Copied: gnunet/src/testing/test_testing_peerstartup.c (from rev 21820,
gnunet/src/testing/test_testing_new_peerstartup.c)
===================================================================
--- gnunet/src/testing/test_testing_peerstartup.c
(rev 0)
+++ gnunet/src/testing/test_testing_peerstartup.c 2012-06-10 00:28:14 UTC
(rev 21839)
@@ -0,0 +1,161 @@
+/*
+ This file is part of GNUnet
+ (C) 2008, 2009, 2012 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
+ 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
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ 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.
+ */
+
+/**
+ * @file testing/test_testing_new_peerstartup.c
+ * @brief test case for testing peer startup and shutdown using new testing
+ * library
+ * @author Sree Harsha Totakura
+ */
+
+#include "platform.h"
+#include "gnunet_configuration_lib.h"
+#include "gnunet_os_lib.h"
+#include "gnunet_testing_lib-new.h"
+
+#define LOG(kind,...) \
+ GNUNET_log (kind, __VA_ARGS__)
+
+#define TIME_REL_SEC(sec) \
+ GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, sec)
+
+/**
+ * The testing context
+ */
+struct TestingContext
+{
+ /**
+ * The testing system
+ */
+ struct GNUNET_TESTING_System *system;
+
+ /**
+ * The peer which has been started by the testing system
+ */
+ struct GNUNET_TESTING_Peer *peer;
+
+ /**
+ * The running configuration of the peer
+ */
+ struct GNUNET_CONFIGURATION_Handle *cfg;
+};
+
+
+/**
+ * Task for shutdown
+ *
+ * @param cls the testing context
+ * @param tc the tast context
+ */
+static void
+do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct TestingContext *test_ctx = cls;
+
+ GNUNET_assert (GNUNET_OK == GNUNET_TESTING_peer_stop (test_ctx->peer));
+ GNUNET_TESTING_peer_destroy (test_ctx->peer);
+ GNUNET_CONFIGURATION_destroy (test_ctx->cfg);
+ GNUNET_TESTING_hostkeys_unload (test_ctx->system);
+ GNUNET_TESTING_system_destroy (test_ctx->system, GNUNET_YES);
+ GNUNET_free (test_ctx);
+}
+
+
+/**
+ * Main point of test execution
+ */
+static void
+run (void *cls, char *const *args, const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+ struct GNUNET_TESTING_System *system;
+ struct GNUNET_TESTING_Peer *peer;
+ struct GNUNET_CONFIGURATION_Handle *new_cfg;
+ struct TestingContext *test_ctx;
+ char *data_dir;
+ char *hostkeys_file;
+ char *emsg;
+ char *_tmpdir;
+ char *tmpdir;
+#ifdef MINGW
+ char *tmpdir_w;
+#endif
+
+ struct GNUNET_PeerIdentity id;
+
+ _tmpdir = getenv ("TMP");
+ if (NULL == _tmpdir)
+ _tmpdir = getenv ("TEMP");
+ if (NULL == _tmpdir)
+ _tmpdir = getenv ("TMPDIR");
+ if (NULL == _tmpdir)
+ _tmpdir = "/tmp";
+ GNUNET_asprintf (&tmpdir, "%s/%s", _tmpdir,
"test-gnunet-testing_new-XXXXXX");
+#ifdef MINGW
+ tmpdir_w = GNUNET_malloc (MAX_PATH + 1);
+ GNUNET_assert (ERROR_SUCCESS == plibc_conv_to_win_path (tmpdir, tmpdir_w));
+ GNUNET_free (tmpdir);
+ tmpdir = tmpdir_w;
+ //GNUNET_assert (0 == _mktemp_s (tmpdir, strlen (tmpdir) + 1));
+#else
+ GNUNET_assert (mkdtemp (tmpdir) == tmpdir);
+#endif
+ /* LOG (GNUNET_ERROR_TYPE_ERROR, */
+ /* "Temporary directory: %s\n", tmpdir); */
+ system = GNUNET_TESTING_system_create (tmpdir,
+ "127.0.0.1");
+ GNUNET_assert (NULL != system);
+ GNUNET_free (tmpdir);
+ data_dir = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_DATADIR);
+ GNUNET_asprintf (&hostkeys_file, "%s/testing_hostkeys.dat", data_dir);
+ GNUNET_free (data_dir);
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_TESTING_hostkeys_load (system, hostkeys_file));
+ GNUNET_free (hostkeys_file);
+ new_cfg = GNUNET_CONFIGURATION_dup (cfg);
+ emsg = NULL;
+ peer = GNUNET_TESTING_peer_configure (system, new_cfg, 0, &id, &emsg);
+ GNUNET_assert (NULL != peer);
+ GNUNET_assert (NULL == emsg);
+ GNUNET_assert (GNUNET_OK == GNUNET_TESTING_peer_start (peer));
+ test_ctx = GNUNET_malloc (sizeof (struct TestingContext));
+ test_ctx->system = system;
+ test_ctx->peer = peer;
+ test_ctx->cfg = new_cfg;
+ GNUNET_SCHEDULER_add_delayed (TIME_REL_SEC (5),
+ &do_shutdown, test_ctx);
+
+}
+
+
+int main (int argc, char *argv[])
+{
+ struct GNUNET_GETOPT_CommandLineOption options[] = {
+ GNUNET_GETOPT_OPTION_END
+ };
+
+ if (GNUNET_OK !=
+ GNUNET_PROGRAM_run (argc, argv,
+ "test_testing_new_peerstartup",
+ "test case for peerstartup using new testing
library",
+ options, &run, NULL))
+ return 1;
+ return 0;
+}
Copied: gnunet/src/testing/test_testing_portreservation.c (from rev 21820,
gnunet/src/testing/test_testing_new_portreservation.c)
===================================================================
--- gnunet/src/testing/test_testing_portreservation.c
(rev 0)
+++ gnunet/src/testing/test_testing_portreservation.c 2012-06-10 00:28:14 UTC
(rev 21839)
@@ -0,0 +1,90 @@
+/*
+ This file is part of GNUnet
+ (C) 2008, 2009, 2012 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
+ 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
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ 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.
+ */
+
+/**
+ * @file testing/test_testing_new_portreservation.c
+ * @brief test case for testing port reservation routines from the new testing
+ * library API
+ * @author Sree Harsha Totakura
+ */
+
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_testing_lib-new.h"
+
+#define LOG(kind,...) \
+ GNUNET_log (kind, __VA_ARGS__)
+
+/**
+ * Main point of test execution
+ */
+static void
+run (void *cls, char *const *args, const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+ struct GNUNET_TESTING_System *system;
+ uint16_t new_port1;
+ uint16_t new_port2;
+ uint16_t old_port1;
+
+ system = GNUNET_TESTING_system_create ("/tmp/gnunet-testing-new",
+ "localhost");
+ GNUNET_assert (NULL != system);
+ new_port1 = GNUNET_TESTING_reserve_port (system, GNUNET_YES);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Reserved TCP port %u\n", new_port1);
+ GNUNET_assert (0 != new_port1);
+ new_port2 = GNUNET_TESTING_reserve_port (system, GNUNET_YES);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Reserved TCP port %u\n", new_port2);
+ GNUNET_assert (0 != new_port2);
+ GNUNET_assert (new_port1 != new_port2);
+ GNUNET_TESTING_release_port (system, GNUNET_YES, new_port1);
+ old_port1 = new_port1;
+ new_port1 = 0;
+ new_port1 = GNUNET_TESTING_reserve_port (system, GNUNET_YES);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Reserved TCP port %u\n", new_port1);
+ GNUNET_assert (0 != new_port1);
+ GNUNET_assert (old_port1 == new_port1);
+ GNUNET_TESTING_release_port (system, GNUNET_YES, new_port1);
+ GNUNET_TESTING_release_port (system, GNUNET_YES, new_port2);
+ GNUNET_TESTING_system_destroy (system, GNUNET_NO);
+}
+
+int main (int argc, char *argv[])
+{
+ struct GNUNET_GETOPT_CommandLineOption options[] = {
+ GNUNET_GETOPT_OPTION_END
+ };
+ if (GNUNET_OK !=
+ GNUNET_PROGRAM_run (argc,
+ argv,
+ "test_testing_new_portreservation",
+ "test case for testing port reservation routines"
+ " from the new testing library API",
+ options,
+ &run,
+ NULL))
+ {
+ return 1;
+ }
+ return 0;
+}
Copied: gnunet/src/testing/test_testing_servicestartup.c (from rev 21820,
gnunet/src/testing/test_testing_new_servicestartup.c)
===================================================================
--- gnunet/src/testing/test_testing_servicestartup.c
(rev 0)
+++ gnunet/src/testing/test_testing_servicestartup.c 2012-06-10 00:28:14 UTC
(rev 21839)
@@ -0,0 +1,111 @@
+/*
+ This file is part of GNUnet
+ (C) 2008, 2009, 2012 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
+ 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
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ 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.
+ */
+
+/**
+ * @file testing/test_testing_new_servicestartup.c
+ * @brief test case for testing service startup using new testing API
+ * @author Sree Harsha Totakura
+ */
+
+#include "platform.h"
+#include "gnunet_scheduler_lib.h"
+#include "gnunet_testing_lib-new.h"
+
+
+#define LOG(kind,...) \
+ GNUNET_log (kind, __VA_ARGS__)
+
+#define TIME_REL_SEC(sec) \
+ GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, sec)
+
+/**
+ * Global test status
+ */
+static int test_success;
+
+/**
+ * The shutdown task. Used to signal that testing is done and service has to be
+ * stopped
+ *
+ * @param cls NULL
+ */
+static void
+shutdown_task(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ test_success = GNUNET_YES;
+ GNUNET_SCHEDULER_shutdown ();
+}
+
+
+/**
+ * The testing callback function
+ *
+ * @param cls NULL
+ * @param cfg the configuration with which the current testing service is run
+ */
+static void
+test_run (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+ GNUNET_assert (NULL == cls);
+ GNUNET_assert (NULL != cfg);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Service arm started successfully\n");
+ GNUNET_SCHEDULER_add_delayed (TIME_REL_SEC (3), &shutdown_task, NULL);
+}
+
+
+/**
+ * The main point of execution
+ */
+int main (int argc, char *argv[])
+{
+ char *_tmpdir;
+ char *tmpdir;
+#ifdef MINGW
+ char *tmpdir_w;
+#endif
+
+ GNUNET_log_setup ("test_testing_new_servicestartup", "DEBUG", NULL);
+ _tmpdir = getenv ("TMP");
+ if (NULL == _tmpdir)
+ _tmpdir = getenv ("TEMP");
+ if (NULL == _tmpdir)
+ _tmpdir = getenv ("TMPDIR");
+ if (NULL == _tmpdir)
+ _tmpdir = "/tmp";
+ GNUNET_asprintf (&tmpdir, "%s/%s", _tmpdir,
"test-gnunet-testing_new-XXXXXX");
+#ifdef MINGW
+ tmpdir_w = GNUNET_malloc (MAX_PATH + 1);
+ GNUNET_assert (ERROR_SUCCESS == plibc_conv_to_win_path (tmpdir, tmpdir_w));
+ GNUNET_free (tmpdir);
+ tmpdir = tmpdir_w;
+ //GNUNET_assert (0 == _mktemp_s (tmpdir, strlen (tmpdir) + 1));
+#else
+ GNUNET_assert (mkdtemp (tmpdir) == tmpdir);
+#endif
+
+ test_success = GNUNET_NO;
+ GNUNET_assert (0 == GNUNET_TESTING_service_run (tmpdir,
+ "arm",
+ "test_testing_defaults.conf",
+ &test_run,
+ NULL));
+ GNUNET_free (tmpdir);
+ return (GNUNET_YES == test_success) ? 0 : 1;
+}
Copied: gnunet/src/testing/testing.c (from rev 21820,
gnunet/src/testing/testing_new.c)
===================================================================
--- gnunet/src/testing/testing.c (rev 0)
+++ gnunet/src/testing/testing.c 2012-06-10 00:28:14 UTC (rev 21839)
@@ -0,0 +1,1010 @@
+/*
+ This file is part of GNUnet
+ (C) 2008, 2009, 2012 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
+ 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
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ 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.
+ */
+
+/**
+ * @file testing/testing_new.c
+ * @brief convenience API for writing testcases for GNUnet
+ * Many testcases need to start and stop a peer/service
+ * and this library is supposed to make that easier
+ * for TESTCASES. Normal programs should always
+ * use functions from gnunet_{util,arm}_lib.h. This API is
+ * ONLY for writing testcases (or internal use of the testbed).
+ * @author Christian Grothoff
+ *
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_testing_lib-new.h"
+
+#define LOG(kind,...) \
+ GNUNET_log_from (kind, "gnunettestingnew", __VA_ARGS__)
+
+
+/**
+ * Size of a hostkey when written to a file
+ */
+#define HOSTKEYFILESIZE 914
+
+
+/**
+ * Handle for a system on which GNUnet peers are executed;
+ * a system is used for reserving unique paths and ports.
+ */
+struct GNUNET_TESTING_System
+{
+ /**
+ * Prefix (i.e. "/tmp/gnunet-testing/") we prepend to each
+ * SERVICEHOME.
+ */
+ char *tmppath;
+
+ /**
+ * The hostname of the controller
+ */
+ char *controller;
+
+ /**
+ * Hostkeys data, contains "HOSTKEYFILESIZE * total_hostkeys" bytes.
+ */
+ char *hostkeys_data;
+
+ /**
+ * Bitmap where each TCP port that has already been reserved for
+ * some GNUnet peer is recorded. Note that we additionally need to
+ * test if a port is already in use by non-GNUnet components before
+ * assigning it to a peer/service. If we detect that a port is
+ * already in use, we also mark it in this bitmap. So all the bits
+ * that are zero merely indicate ports that MIGHT be available for
+ * peers.
+ */
+ uint32_t reserved_tcp_ports[65536 / 32];
+
+ /**
+ * Bitmap where each UDP port that has already been reserved for
+ * some GNUnet peer is recorded. Note that we additionally need to
+ * test if a port is already in use by non-GNUnet components before
+ * assigning it to a peer/service. If we detect that a port is
+ * already in use, we also mark it in this bitmap. So all the bits
+ * that are zero merely indicate ports that MIGHT be available for
+ * peers.
+ */
+ uint32_t reserved_udp_ports[65536 / 32];
+
+ /**
+ * Counter we use to make service home paths unique on this system;
+ * the full path consists of the tmppath and this number. Each
+ * UNIXPATH for a peer is also modified to include the respective
+ * path counter to ensure uniqueness. This field is incremented
+ * by one for each configured peer. Even if peers are destroyed,
+ * we never re-use path counters.
+ */
+ uint32_t path_counter;
+
+ /**
+ * The number of hostkeys
+ */
+ uint32_t total_hostkeys;
+};
+
+
+/**
+ * Handle for a GNUnet peer controlled by testing.
+ */
+struct GNUNET_TESTING_Peer
+{
+
+ /**
+ * Path to the configuration file for this peer.
+ */
+ char *cfgfile;
+
+ /**
+ * Binary to be executed during 'GNUNET_TESTING_peer_start'.
+ * Typically 'gnunet-service-arm' (but can be set to a
+ * specific service by 'GNUNET_TESTING_service_run' if
+ * necessary).
+ */
+ char *main_binary;
+
+ /**
+ * Handle to the running binary of the service, NULL if the
+ * peer/service is currently not running.
+ */
+ struct GNUNET_OS_Process *main_process;
+};
+
+
+/**
+ * Lowest port used for GNUnet testing. Should be high enough to not
+ * conflict with other applications running on the hosts but be low
+ * enough to not conflict with client-ports (typically starting around
+ * 32k).
+ */
+#define LOW_PORT 12000
+
+
+/**
+ * Highest port used for GNUnet testing. Should be low enough to not
+ * conflict with the port range for "local" ports (client apps; see
+ * /proc/sys/net/ipv4/ip_local_port_range on Linux for example).
+ */
+#define HIGH_PORT 56000
+
+
+/**
+ * Create a system handle. There must only be one system
+ * handle per operating system.
+ *
+ * @param tmppath prefix path to use for all service homes
+ * @param controller hostname of the controlling host,
+ * service configurations are modified to allow
+ * control connections from this host; can be NULL
+ * @return handle to this system, NULL on error
+ */
+struct GNUNET_TESTING_System *
+GNUNET_TESTING_system_create (const char *tmppath,
+ const char *controller)
+{
+ struct GNUNET_TESTING_System *system;
+
+ if (NULL == tmppath)
+ {
+ LOG (GNUNET_ERROR_TYPE_ERROR, _("tmppath cannot be NULL\n"));
+ return NULL;
+ }
+ system = GNUNET_malloc (sizeof (struct GNUNET_TESTING_System));
+ system->tmppath = GNUNET_strdup (tmppath);
+ if (NULL != controller)
+ system->controller = GNUNET_strdup (controller);
+ return system;
+}
+
+
+/**
+ * Free system resources.
+ *
+ * @param system system to be freed
+ * @param remove_paths should the 'tmppath' and all subdirectories
+ * be removed (clean up on shutdown)?
+ */
+void
+GNUNET_TESTING_system_destroy (struct GNUNET_TESTING_System *system,
+ int remove_paths)
+{
+ if (NULL != system->hostkeys_data)
+ {
+ GNUNET_break (0); /* Use GNUNET_TESTING_hostkeys_unload() */
+ GNUNET_TESTING_hostkeys_unload (system);
+ }
+ if (GNUNET_YES == remove_paths)
+ GNUNET_DISK_directory_remove (system->tmppath);
+ GNUNET_free (system->tmppath);
+ GNUNET_free_non_null (system->controller);
+ GNUNET_free (system);
+}
+
+
+/**
+ * Reserve a TCP or UDP port for a peer.
+ *
+ * @param system system to use for reservation tracking
+ * @param is_tcp GNUNET_YES for TCP ports, GNUNET_NO for UDP
+ * @return 0 if no free port was available
+ */
+uint16_t
+GNUNET_TESTING_reserve_port (struct GNUNET_TESTING_System *system,
+ int is_tcp)
+{
+ struct GNUNET_NETWORK_Handle *socket;
+ struct addrinfo hint;
+ struct addrinfo *ret;
+ uint32_t *port_buckets;
+ char *open_port_str;
+ int bind_status;
+ uint32_t xor_image;
+ uint16_t index;
+ uint16_t open_port;
+ uint16_t pos;
+
+ /*
+ FIXME: Instead of using getaddrinfo we should try to determine the port
+ status by the following heurestics.
+
+ On systems which support both IPv4 and IPv6, only ports open on both
+ address families are considered open.
+ On system with either IPv4 or IPv6. A port is considered open if it's
+ open in the respective address family
+ */
+ hint.ai_family = AF_UNSPEC; /* IPv4 and IPv6 */
+ hint.ai_socktype = (GNUNET_YES == is_tcp)? SOCK_STREAM : SOCK_DGRAM;
+ hint.ai_protocol = 0;
+ hint.ai_addrlen = 0;
+ hint.ai_addr = NULL;
+ hint.ai_canonname = NULL;
+ hint.ai_next = NULL;
+ hint.ai_flags = AI_PASSIVE | AI_NUMERICSERV; /* Wild card address */
+ port_buckets = (GNUNET_YES == is_tcp) ?
+ system->reserved_tcp_ports : system->reserved_udp_ports;
+ for (index = (LOW_PORT / 32) + 1; index < (HIGH_PORT / 32); index++)
+ {
+ xor_image = (UINT32_MAX ^ port_buckets[index]);
+ if (0 == xor_image) /* Ports in the bucket are full */
+ continue;
+ pos = 0;
+ while (pos < 32)
+ {
+ if (0 == ((xor_image >> pos) & 1U))
+ {
+ pos++;
+ continue;
+ }
+ open_port = (index * 32) + pos;
+ GNUNET_asprintf (&open_port_str, "%u", (unsigned int) open_port);
+ ret = NULL;
+ GNUNET_assert (0 == getaddrinfo (NULL, open_port_str, &hint, &ret));
+ GNUNET_free (open_port_str);
+ socket = GNUNET_NETWORK_socket_create (ret->ai_family,
+ (GNUNET_YES == is_tcp) ?
+ SOCK_STREAM : SOCK_DGRAM,
+ 0);
+ GNUNET_assert (NULL != socket);
+ bind_status = GNUNET_NETWORK_socket_bind (socket,
+ ret->ai_addr,
+ ret->ai_addrlen);
+ freeaddrinfo (ret);
+ GNUNET_NETWORK_socket_close (socket);
+ socket = NULL;
+ port_buckets[index] |= (1U << pos); /* Set the port bit */
+ if (GNUNET_OK == bind_status)
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Found a free port %u\n", (unsigned int) open_port);
+ return open_port;
+ }
+ pos++;
+ }
+ }
+ return 0;
+}
+
+
+/**
+ * Release reservation of a TCP or UDP port for a peer
+ * (used during GNUNET_TESTING_peer_destroy).
+ *
+ * @param system system to use for reservation tracking
+ * @param is_tcp GNUNET_YES for TCP ports, GNUNET_NO for UDP
+ * @param port reserved port to release
+ */
+void
+GNUNET_TESTING_release_port (struct GNUNET_TESTING_System *system,
+ int is_tcp,
+ uint16_t port)
+{
+ uint32_t *port_buckets;
+ uint16_t bucket;
+ uint16_t pos;
+
+ port_buckets = (GNUNET_YES == is_tcp) ?
+ system->reserved_tcp_ports : system->reserved_udp_ports;
+ bucket = port / 32;
+ pos = port % 32;
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Releasing port %u\n", port);
+ if (0 == (port_buckets[bucket] & (1U << pos)))
+ {
+ GNUNET_break(0); /* Port was not reserved by us using reserve_port() */
+ return;
+ }
+ port_buckets[bucket] &= ~(1U << pos);
+}
+
+
+/**
+ * Reserve a SERVICEHOME path for a peer.
+ *
+ * @param system system to use for reservation tracking
+ * @return NULL on error, otherwise fresh unique path to use
+ * as the servicehome for the peer; must be freed by the caller
+ */
+// static
+char *
+reserve_path (struct GNUNET_TESTING_System *system)
+{
+ char *reserved_path;
+
+ GNUNET_asprintf (&reserved_path,
+ "%s/%u", system->tmppath, system->path_counter++);
+ return reserved_path;
+}
+
+
+/**
+ * Testing includes a number of pre-created hostkeys for faster peer
+ * startup. This function loads such keys into memory from a file.
+ *
+ * @param system the testing system handle
+ * @param filename the path of the hostkeys file
+ * @return GNUNET_OK on success; GNUNET_SYSERR on error
+ */
+int
+GNUNET_TESTING_hostkeys_load (struct GNUNET_TESTING_System *system,
+ const char *filename)
+{
+ struct GNUNET_DISK_FileHandle *fd;
+ uint64_t fs;
+
+ if (GNUNET_YES != GNUNET_DISK_file_test (filename))
+ {
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ _("Hostkeys file not found: %s\n"), filename);
+ return GNUNET_SYSERR;
+ }
+ /* Check hostkey file size, read entire thing into memory */
+ fd = GNUNET_DISK_file_open (filename, GNUNET_DISK_OPEN_READ,
+ GNUNET_DISK_PERM_NONE);
+ if (NULL == fd)
+ {
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ _("Could not open hostkeys file: %s\n"), filename);
+ return GNUNET_SYSERR;
+ }
+ if (GNUNET_OK !=
+ GNUNET_DISK_file_size (filename, &fs, GNUNET_YES, GNUNET_YES))
+ fs = 0;
+ if (0 == fs)
+ {
+ GNUNET_DISK_file_close (fd);
+ return GNUNET_SYSERR; /* File is empty */
+ }
+ if (0 != (fs % HOSTKEYFILESIZE))
+ {
+ GNUNET_DISK_file_close (fd);
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ _("Incorrect hostkey file format: %s\n"), filename);
+ return GNUNET_SYSERR;
+ }
+ GNUNET_break (NULL == system->hostkeys_data);
+ system->total_hostkeys = fs / HOSTKEYFILESIZE;
+ system->hostkeys_data = GNUNET_malloc_large (fs); /* free in hostkeys_unload
*/
+ GNUNET_assert (fs == GNUNET_DISK_file_read (fd, system->hostkeys_data, fs));
+ GNUNET_DISK_file_close (fd);
+ return GNUNET_OK;
+}
+
+
+/**
+ * Function to remove the loaded hostkeys
+ *
+ * @param system the testing system handle
+ */
+void
+GNUNET_TESTING_hostkeys_unload (struct GNUNET_TESTING_System *system)
+{
+ GNUNET_break (NULL != system->hostkeys_data);
+ GNUNET_free_non_null (system->hostkeys_data);
+ system->hostkeys_data = NULL;
+ system->total_hostkeys = 0;
+}
+
+
+/**
+ * Testing includes a number of pre-created hostkeys for
+ * faster peer startup. This function can be used to
+ * access the n-th key of those pre-created hostkeys; note
+ * that these keys are ONLY useful for testing and not
+ * secure as the private keys are part of the public
+ * GNUnet source code.
+ *
+ * This is primarily a helper function used internally
+ * by 'GNUNET_TESTING_peer_configure'.
+ *
+ * @param system the testing system handle
+ * @param key_number desired pre-created hostkey to obtain
+ * @param id set to the peer's identity (hash of the public
+ * key; if NULL, GNUNET_SYSERR is returned immediately
+ * @return GNUNET_SYSERR on error (not enough keys)
+ */
+int
+GNUNET_TESTING_hostkey_get (const struct GNUNET_TESTING_System *system,
+ uint32_t key_number,
+ struct GNUNET_PeerIdentity *id)
+{
+ struct GNUNET_CRYPTO_RsaPrivateKey *private_key;
+ struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded public_key;
+
+ if ((NULL == id) || (NULL == system->hostkeys_data))
+ return GNUNET_SYSERR;
+ if (key_number >= system->total_hostkeys)
+ {
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ _("Key number %u does not exist\n"), key_number);
+ return GNUNET_SYSERR;
+ }
+ private_key = GNUNET_CRYPTO_rsa_decode_key (system->hostkeys_data +
+ (key_number * HOSTKEYFILESIZE),
+ HOSTKEYFILESIZE);
+ if (NULL == private_key)
+ {
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ _("Error while decoding key %u\n"), key_number);
+ return GNUNET_SYSERR;
+ }
+ GNUNET_CRYPTO_rsa_key_get_public (private_key, &public_key);
+ GNUNET_CRYPTO_hash (&public_key,
+ sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
+ &(id->hashPubKey));
+ GNUNET_CRYPTO_rsa_key_free (private_key);
+ return GNUNET_OK;
+}
+
+
+/**
+ * Structure for holding data to build new configurations from a configuration
+ * template
+ */
+struct UpdateContext
+{
+ /**
+ * The system for which we are building configurations
+ */
+ struct GNUNET_TESTING_System *system;
+
+ /**
+ * The configuration we are building
+ */
+ struct GNUNET_CONFIGURATION_Handle *cfg;
+
+ /**
+ * The customized service home path for this peer
+ */
+ char *service_home;
+
+ /**
+ * build status - to signal error while building a configuration
+ */
+ int status;
+};
+
+
+/**
+ * Function to iterate over options. Copies
+ * the options to the target configuration,
+ * updating PORT values as needed.
+ *
+ * @param cls the UpdateContext
+ * @param section name of the section
+ * @param option name of the option
+ * @param value value of the option
+ */
+static void
+update_config (void *cls, const char *section, const char *option,
+ const char *value)
+{
+ struct UpdateContext *uc = cls;
+ unsigned int ival;
+ char cval[12];
+ char uval[128];
+ char *single_variable;
+ char *per_host_variable;
+ unsigned long long num_per_host;
+ uint16_t new_port;
+
+ if (GNUNET_OK != uc->status)
+ return;
+ if (! ((0 == strcmp (option, "PORT"))
+ || (0 == strcmp (option, "UNIXPATH"))
+ || (0 == strcmp (option, "HOSTNAME"))))
+ return;
+ GNUNET_asprintf (&single_variable, "single_%s_per_host", section);
+ GNUNET_asprintf (&per_host_variable, "num_%s_per_host", section);
+ if ((0 == strcmp (option, "PORT")) && (1 == SSCANF (value, "%u", &ival)))
+ {
+ if ((ival != 0) &&
+ (GNUNET_YES !=
+ GNUNET_CONFIGURATION_get_value_yesno (uc->cfg, "testing",
+ single_variable)))
+ {
+ /* FIXME: What about UDP? */
+ new_port = GNUNET_TESTING_reserve_port (uc->system, GNUNET_YES);
+ if (0 == new_port)
+ {
+ uc->status = GNUNET_SYSERR;
+ return;
+ }
+ GNUNET_snprintf (cval, sizeof (cval), "%u", new_port);
+ value = cval;
+ }
+ else if ((ival != 0) &&
+ (GNUNET_YES ==
+ GNUNET_CONFIGURATION_get_value_yesno (uc->cfg, "testing",
+ single_variable)) &&
+ GNUNET_CONFIGURATION_get_value_number (uc->cfg, "testing",
+ per_host_variable,
+ &num_per_host))
+ {
+ /* GNUNET_snprintf (cval, sizeof (cval), "%u", */
+ /* ival + ctx->fdnum % num_per_host); */
+ /* value = cval; */
+ GNUNET_break (0); /* FIXME */
+ }
+ }
+ if (0 == strcmp (option, "UNIXPATH"))
+ {
+ if (GNUNET_YES !=
+ GNUNET_CONFIGURATION_get_value_yesno (uc->cfg, "testing",
+ single_variable))
+ {
+ GNUNET_snprintf (uval, sizeof (uval), "%s/%s.sock",
+ uc->service_home, section);
+ value = uval;
+ }
+ else if ((GNUNET_YES ==
+ GNUNET_CONFIGURATION_get_value_number (uc->cfg, "testing",
+ per_host_variable,
+ &num_per_host)) &&
+ (num_per_host > 0))
+ {
+ GNUNET_break(0); /* FIXME */
+ }
+ }
+ if ((0 == strcmp (option, "HOSTNAME")) && (NULL != uc->system->controller))
+ {
+ value = uc->system->controller;
+ }
+ GNUNET_free (single_variable);
+ GNUNET_free (per_host_variable);
+ GNUNET_CONFIGURATION_set_value_string (uc->cfg, section, option, value);
+}
+
+
+/**
+ * Section iterator to set ACCEPT_FROM in all sections
+ *
+ * @param cls the UpdateContext
+ * @param section name of the section
+ */
+static void
+update_config_sections (void *cls,
+ const char *section)
+{
+ struct UpdateContext *uc = cls;
+ char *orig_allowed_hosts;
+ char *allowed_hosts;
+
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_string (uc->cfg, section, "ACCEPT_FROM",
+ &orig_allowed_hosts))
+ {
+ orig_allowed_hosts = GNUNET_strdup ("127.0.0.1;");
+ }
+ if (NULL == uc->system->controller)
+ allowed_hosts = GNUNET_strdup (orig_allowed_hosts);
+ else
+ GNUNET_asprintf (&allowed_hosts, "%s%s;", orig_allowed_hosts,
+ uc->system->controller);
+ GNUNET_free (orig_allowed_hosts);
+ GNUNET_CONFIGURATION_set_value_string (uc->cfg, section, "ACCEPT_FROM",
+ allowed_hosts);
+ GNUNET_free (allowed_hosts);
+}
+
+
+/**
+ * Create a new configuration using the given configuration
+ * as a template; ports and paths will be modified to select
+ * available ports on the local system. If we run
+ * out of "*port" numbers, return SYSERR.
+ *
+ * This is primarily a helper function used internally
+ * by 'GNUNET_TESTING_peer_configure'.
+ *
+ * @param system system to use to coordinate resource usage
+ * @param cfg template configuration to update
+ * @return GNUNET_OK on success, GNUNET_SYSERR on error - the configuration
will
+ * be incomplete and should not be used there upon
+ */
+int
+GNUNET_TESTING_configuration_create (struct GNUNET_TESTING_System *system,
+ struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+ struct UpdateContext uc;
+ char *default_config;
+
+ uc.system = system;
+ uc.cfg = cfg;
+ uc.status = GNUNET_OK;
+ GNUNET_asprintf (&uc.service_home, "%s/%u", system->tmppath,
+ system->path_counter++);
+ GNUNET_asprintf (&default_config, "%s/config", uc.service_home);
+ GNUNET_CONFIGURATION_set_value_string (cfg, "PATHS", "DEFAULTCONFIG",
+ default_config);
+ GNUNET_free (default_config);
+ GNUNET_CONFIGURATION_set_value_string (cfg, "PATHS", "SERVICEHOME",
+ uc.service_home);
+ /* make PORTs and UNIXPATHs unique */
+ GNUNET_CONFIGURATION_iterate (cfg, &update_config, &uc);
+ /* allow connections to services from system controller host */
+ GNUNET_CONFIGURATION_iterate_sections (cfg, &update_config_sections, &uc);
+ /* enable loopback-based connections between peers */
+ GNUNET_CONFIGURATION_set_value_string (cfg,
+ "nat",
+ "USE_LOCALADDR", "YES");
+ GNUNET_free (uc.service_home);
+ return uc.status;
+}
+
+
+/**
+ * Configure a GNUnet peer. GNUnet must be installed on the local
+ * system and available in the PATH.
+ *
+ * @param system system to use to coordinate resource usage
+ * @param cfg configuration to use; will be UPDATED (to reflect needed
+ * changes in port numbers and paths)
+ * @param key_number number of the hostkey to use for the peer
+ * @param id identifier for the daemon, will be set, can be NULL
+ * @param emsg set to error message (set to NULL on success), can be NULL
+ * @return handle to the peer, NULL on error
+ */
+struct GNUNET_TESTING_Peer *
+GNUNET_TESTING_peer_configure (struct GNUNET_TESTING_System *system,
+ struct GNUNET_CONFIGURATION_Handle *cfg,
+ uint32_t key_number,
+ struct GNUNET_PeerIdentity *id,
+ char **emsg)
+{
+ struct GNUNET_TESTING_Peer *peer;
+ struct GNUNET_DISK_FileHandle *fd;
+ char *service_home;
+ char hostkey_filename[128];
+ char *config_filename;
+ char *emsg_;
+
+ if (NULL != emsg)
+ *emsg = NULL;
+ if (GNUNET_OK != GNUNET_TESTING_configuration_create (system, cfg))
+ {
+ GNUNET_asprintf (&emsg_,
+ _("Failed to create configuration for peer (not enough
free ports?)\n"));
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s", *emsg_);
+ if (NULL != emsg)
+ *emsg = emsg_;
+ else
+ GNUNET_free (emsg_);
+ return NULL;
+ }
+ if (key_number >= system->total_hostkeys)
+ {
+ GNUNET_asprintf (&emsg_,
+ _("You attempted to create a testbed with more than %u
hosts. Please precompute more hostkeys first.\n"),
+ (unsigned int) system->total_hostkeys);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s", *emsg_);
+ if (NULL != emsg)
+ *emsg = emsg_;
+ else
+ GNUNET_free (emsg_);
+ return NULL;
+ }
+ if ((NULL != id) &&
+ (GNUNET_SYSERR == GNUNET_TESTING_hostkey_get (system, key_number, id)))
+ {
+ GNUNET_asprintf (&emsg_,
+ _("Failed to initialize hostkey for peer %u\n"),
+ (unsigned int) key_number);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s", *emsg_);
+ if (NULL != emsg)
+ *emsg = emsg_;
+ else
+ GNUNET_free (emsg_);
+ return NULL;
+ }
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_string (cfg, "PATHS",
+ "SERVICEHOME",
+ &service_home));
+ GNUNET_snprintf (hostkey_filename, sizeof (hostkey_filename), "%s/.hostkey",
+ service_home);
+ GNUNET_free (service_home);
+ fd = GNUNET_DISK_file_open (hostkey_filename,
+ GNUNET_DISK_OPEN_CREATE | GNUNET_DISK_OPEN_WRITE,
+ GNUNET_DISK_PERM_USER_READ
+ | GNUNET_DISK_PERM_USER_WRITE);
+ if (NULL == fd)
+ {
+ GNUNET_break (0);
+ return NULL;
+ }
+ if (HOSTKEYFILESIZE !=
+ GNUNET_DISK_file_write (fd, system->hostkeys_data
+ + (key_number * HOSTKEYFILESIZE),
+ HOSTKEYFILESIZE))
+ {
+ GNUNET_asprintf (&emsg_,
+ _("Failed to write hostkey file for peer %u: %s\n"),
+ (unsigned int) key_number,
+ STRERROR (errno));
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s", *emsg_);
+ if (NULL != emsg)
+ *emsg = emsg_;
+ else
+ GNUNET_free (emsg_);
+ GNUNET_DISK_file_close (fd);
+ return NULL;
+ }
+ GNUNET_DISK_file_close (fd);
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_string
+ (cfg, "PATHS", "DEFAULTCONFIG", &config_filename));
+ if (GNUNET_OK != GNUNET_CONFIGURATION_write (cfg, config_filename))
+ {
+ GNUNET_asprintf (&emsg_,
+ _("Failed to write configuration file `%s' for peer %u:
%s\n"),
+ config_filename,
+ (unsigned int) key_number,
+ STRERROR (errno));
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s", *emsg_);
+ if (NULL != emsg)
+ *emsg = emsg_;
+ else
+ GNUNET_free (emsg_);
+ GNUNET_free (config_filename);
+ return NULL;
+ }
+ peer = GNUNET_malloc (sizeof (struct GNUNET_TESTING_Peer));
+ peer->cfgfile = config_filename; /* Free in peer_destroy */
+ peer->main_binary = GNUNET_strdup ("gnunet-service-arm");
+ return peer;
+}
+
+
+/**
+ * Start the peer.
+ *
+ * @param peer peer to start
+ * @return GNUNET_OK on success, GNUNET_SYSERR on error (i.e. peer already
running)
+ */
+int
+GNUNET_TESTING_peer_start (struct GNUNET_TESTING_Peer *peer)
+{
+ if (NULL != peer->main_process)
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ GNUNET_assert (NULL != peer->cfgfile);
+ peer->main_process = GNUNET_OS_start_process (GNUNET_YES, NULL, NULL,
+ peer->main_binary,
+ peer->main_binary,
+ "-c",
+ peer->cfgfile,
+ NULL);
+ if (NULL == peer->main_process)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Failed to start `%s': %s\n"),
+ peer->main_binary,
+ STRERROR (errno));
+ return GNUNET_SYSERR;
+ }
+ return GNUNET_OK;
+}
+
+
+/**
+ * Stop the peer.
+ *
+ * @param peer peer to stop
+ * @return GNUNET_OK on success, GNUNET_SYSERR on error (i.e. peer not running)
+ */
+int
+GNUNET_TESTING_peer_stop (struct GNUNET_TESTING_Peer *peer)
+{
+ if (NULL == peer->main_process)
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ (void) GNUNET_OS_process_kill (peer->main_process, SIGTERM);
+ GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (peer->main_process));
+ GNUNET_OS_process_destroy (peer->main_process);
+ peer->main_process = NULL;
+ return GNUNET_OK;
+}
+
+
+/**
+ * Destroy the peer. Releases resources locked during peer configuration.
+ * If the peer is still running, it will be stopped AND a warning will be
+ * printed (users of the API should stop the peer explicitly first).
+ *
+ * @param peer peer to destroy
+ */
+void
+GNUNET_TESTING_peer_destroy (struct GNUNET_TESTING_Peer *peer)
+{
+ if (NULL != peer->main_process)
+ {
+ GNUNET_break (0);
+ GNUNET_TESTING_peer_stop (peer);
+ }
+ GNUNET_free (peer->cfgfile);
+ GNUNET_free (peer->main_binary);
+ GNUNET_free (peer);
+}
+
+
+/**
+ * Start a single peer and run a test using the testing library.
+ * Starts a peer using the given configuration and then invokes the
+ * given callback. This function ALSO initializes the scheduler loop
+ * and should thus be called directly from "main". The testcase
+ * should self-terminate by invoking 'GNUNET_SCHEDULER_shutdown'.
+ *
+ * @param tmppath path for storing temporary data for the test
+ * @param cfgfilename name of the configuration file to use;
+ * use NULL to only run with defaults
+ * @param tm main function of the testcase
+ * @param tm_cls closure for 'tm'
+ * @return 0 on success, 1 on error
+ */
+int
+GNUNET_TESTING_peer_run (const char *tmppath,
+ const char *cfgfilename,
+ GNUNET_TESTING_TestMain tm,
+ void *tm_cls)
+{
+ return GNUNET_TESTING_service_run (tmppath, "arm",
+ cfgfilename, tm, tm_cls);
+}
+
+
+/**
+ * Structure for holding service data
+ */
+struct ServiceContext
+{
+ /**
+ * The configuration of the peer in which the service is run
+ */
+ const struct GNUNET_CONFIGURATION_Handle *cfg;
+
+ /**
+ * Callback to signal service startup
+ */
+ GNUNET_TESTING_TestMain tm;
+
+ /**
+ * Closure for the above callback
+ */
+ void *tm_cls;
+};
+
+
+/**
+ * Callback to be called when SCHEDULER has been started
+ *
+ * @param cls the ServiceContext
+ * @param tc the TaskContext
+ */
+static void
+service_run_main (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct ServiceContext *sc = cls;
+
+ sc->tm (sc->tm_cls, sc->cfg);
+}
+
+
+/**
+ * Start a single service (no ARM, except of course if the given
+ * service name is 'arm') and run a test using the testing library.
+ * Starts a service using the given configuration and then invokes the
+ * given callback. This function ALSO initializes the scheduler loop
+ * and should thus be called directly from "main". The testcase
+ * should self-terminate by invoking 'GNUNET_SCHEDULER_shutdown'.
+ *
+ * This function is useful if the testcase is for a single service
+ * and if that service doesn't itself depend on other services.
+ *
+ * @param tmppath path for storing temporary data for the test
+ * @param service_name name of the service to run
+ * @param cfgfilename name of the configuration file to use;
+ * use NULL to only run with defaults
+ * @param tm main function of the testcase
+ * @param tm_cls closure for 'tm'
+ * @return 0 on success, 1 on error
+ */
+int
+GNUNET_TESTING_service_run (const char *tmppath,
+ const char *service_name,
+ const char *cfgfilename,
+ GNUNET_TESTING_TestMain tm,
+ void *tm_cls)
+{
+ struct ServiceContext sc;
+ struct GNUNET_TESTING_System *system;
+ struct GNUNET_TESTING_Peer *peer;
+ struct GNUNET_CONFIGURATION_Handle *cfg;
+ char *data_dir;
+ char *hostkeys_file;
+
+ data_dir = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_DATADIR);
+ GNUNET_asprintf (&hostkeys_file, "%s/testing_hostkeys.dat", data_dir);
+ GNUNET_free (data_dir);
+ system = GNUNET_TESTING_system_create (tmppath, "127.0.0.1");
+ if (NULL == system)
+ {
+ GNUNET_free (hostkeys_file);
+ return 1;
+ }
+ if (GNUNET_OK != GNUNET_TESTING_hostkeys_load (system, hostkeys_file))
+ {
+ GNUNET_free (hostkeys_file);
+ GNUNET_TESTING_system_destroy (system, GNUNET_YES);
+ return 1;
+ }
+ GNUNET_free (hostkeys_file);
+ cfg = GNUNET_CONFIGURATION_create ();
+ if (GNUNET_OK != GNUNET_CONFIGURATION_load (cfg, cfgfilename))
+ {
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ _("Failed to load configuration from %s\n"), cfgfilename);
+ GNUNET_CONFIGURATION_destroy (cfg);
+ GNUNET_TESTING_system_destroy (system, GNUNET_YES);
+ return 1;
+ }
+ peer = GNUNET_TESTING_peer_configure (system, cfg, 0, NULL, NULL);
+ if (NULL == peer)
+ {
+ GNUNET_CONFIGURATION_destroy (cfg);
+ GNUNET_TESTING_hostkeys_unload (system);
+ GNUNET_TESTING_system_destroy (system, GNUNET_YES);
+ return 1;
+ }
+ GNUNET_TESTING_hostkeys_unload (system);
+ GNUNET_free (peer->main_binary);
+ GNUNET_asprintf (&peer->main_binary, "gnunet-service-%s", service_name);
+ if (GNUNET_OK != GNUNET_TESTING_peer_start (peer))
+ {
+ GNUNET_TESTING_peer_destroy (peer);
+ GNUNET_CONFIGURATION_destroy (cfg);
+ GNUNET_TESTING_system_destroy (system, GNUNET_YES);
+ return 1;
+ }
+ sc.cfg = cfg;
+ sc.tm = tm;
+ sc.tm_cls = tm_cls;
+ GNUNET_SCHEDULER_run (&service_run_main, &sc); /* Scheduler loop */
+ if (GNUNET_OK != GNUNET_TESTING_peer_stop (peer))
+ {
+ GNUNET_TESTING_peer_destroy (peer);
+ GNUNET_CONFIGURATION_destroy (cfg);
+ GNUNET_TESTING_system_destroy (system, GNUNET_YES);
+ return 1;
+ }
+ GNUNET_TESTING_peer_destroy (peer);
+ GNUNET_CONFIGURATION_destroy (cfg);
+ GNUNET_TESTING_system_destroy (system, GNUNET_YES);
+ return 0;
+}
+
+
+/* end of testing_new.c */
Deleted: gnunet/src/testing/testing_new.c
===================================================================
--- gnunet/src/testing/testing_new.c 2012-06-10 00:04:55 UTC (rev 21838)
+++ gnunet/src/testing/testing_new.c 2012-06-10 00:28:14 UTC (rev 21839)
@@ -1,1010 +0,0 @@
-/*
- This file is part of GNUnet
- (C) 2008, 2009, 2012 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
- 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
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- 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.
- */
-
-/**
- * @file testing/testing_new.c
- * @brief convenience API for writing testcases for GNUnet
- * Many testcases need to start and stop a peer/service
- * and this library is supposed to make that easier
- * for TESTCASES. Normal programs should always
- * use functions from gnunet_{util,arm}_lib.h. This API is
- * ONLY for writing testcases (or internal use of the testbed).
- * @author Christian Grothoff
- *
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib-new.h"
-
-#define LOG(kind,...) \
- GNUNET_log_from (kind, "gnunettestingnew", __VA_ARGS__)
-
-
-/**
- * Size of a hostkey when written to a file
- */
-#define HOSTKEYFILESIZE 914
-
-
-/**
- * Handle for a system on which GNUnet peers are executed;
- * a system is used for reserving unique paths and ports.
- */
-struct GNUNET_TESTING_System
-{
- /**
- * Prefix (i.e. "/tmp/gnunet-testing/") we prepend to each
- * SERVICEHOME.
- */
- char *tmppath;
-
- /**
- * The hostname of the controller
- */
- char *controller;
-
- /**
- * Hostkeys data, contains "HOSTKEYFILESIZE * total_hostkeys" bytes.
- */
- char *hostkeys_data;
-
- /**
- * Bitmap where each TCP port that has already been reserved for
- * some GNUnet peer is recorded. Note that we additionally need to
- * test if a port is already in use by non-GNUnet components before
- * assigning it to a peer/service. If we detect that a port is
- * already in use, we also mark it in this bitmap. So all the bits
- * that are zero merely indicate ports that MIGHT be available for
- * peers.
- */
- uint32_t reserved_tcp_ports[65536 / 32];
-
- /**
- * Bitmap where each UDP port that has already been reserved for
- * some GNUnet peer is recorded. Note that we additionally need to
- * test if a port is already in use by non-GNUnet components before
- * assigning it to a peer/service. If we detect that a port is
- * already in use, we also mark it in this bitmap. So all the bits
- * that are zero merely indicate ports that MIGHT be available for
- * peers.
- */
- uint32_t reserved_udp_ports[65536 / 32];
-
- /**
- * Counter we use to make service home paths unique on this system;
- * the full path consists of the tmppath and this number. Each
- * UNIXPATH for a peer is also modified to include the respective
- * path counter to ensure uniqueness. This field is incremented
- * by one for each configured peer. Even if peers are destroyed,
- * we never re-use path counters.
- */
- uint32_t path_counter;
-
- /**
- * The number of hostkeys
- */
- uint32_t total_hostkeys;
-};
-
-
-/**
- * Handle for a GNUnet peer controlled by testing.
- */
-struct GNUNET_TESTING_Peer
-{
-
- /**
- * Path to the configuration file for this peer.
- */
- char *cfgfile;
-
- /**
- * Binary to be executed during 'GNUNET_TESTING_peer_start'.
- * Typically 'gnunet-service-arm' (but can be set to a
- * specific service by 'GNUNET_TESTING_service_run' if
- * necessary).
- */
- char *main_binary;
-
- /**
- * Handle to the running binary of the service, NULL if the
- * peer/service is currently not running.
- */
- struct GNUNET_OS_Process *main_process;
-};
-
-
-/**
- * Lowest port used for GNUnet testing. Should be high enough to not
- * conflict with other applications running on the hosts but be low
- * enough to not conflict with client-ports (typically starting around
- * 32k).
- */
-#define LOW_PORT 12000
-
-
-/**
- * Highest port used for GNUnet testing. Should be low enough to not
- * conflict with the port range for "local" ports (client apps; see
- * /proc/sys/net/ipv4/ip_local_port_range on Linux for example).
- */
-#define HIGH_PORT 56000
-
-
-/**
- * Create a system handle. There must only be one system
- * handle per operating system.
- *
- * @param tmppath prefix path to use for all service homes
- * @param controller hostname of the controlling host,
- * service configurations are modified to allow
- * control connections from this host; can be NULL
- * @return handle to this system, NULL on error
- */
-struct GNUNET_TESTING_System *
-GNUNET_TESTING_system_create (const char *tmppath,
- const char *controller)
-{
- struct GNUNET_TESTING_System *system;
-
- if (NULL == tmppath)
- {
- LOG (GNUNET_ERROR_TYPE_ERROR, _("tmppath cannot be NULL\n"));
- return NULL;
- }
- system = GNUNET_malloc (sizeof (struct GNUNET_TESTING_System));
- system->tmppath = GNUNET_strdup (tmppath);
- if (NULL != controller)
- system->controller = GNUNET_strdup (controller);
- return system;
-}
-
-
-/**
- * Free system resources.
- *
- * @param system system to be freed
- * @param remove_paths should the 'tmppath' and all subdirectories
- * be removed (clean up on shutdown)?
- */
-void
-GNUNET_TESTING_system_destroy (struct GNUNET_TESTING_System *system,
- int remove_paths)
-{
- if (NULL != system->hostkeys_data)
- {
- GNUNET_break (0); /* Use GNUNET_TESTING_hostkeys_unload() */
- GNUNET_TESTING_hostkeys_unload (system);
- }
- if (GNUNET_YES == remove_paths)
- GNUNET_DISK_directory_remove (system->tmppath);
- GNUNET_free (system->tmppath);
- GNUNET_free_non_null (system->controller);
- GNUNET_free (system);
-}
-
-
-/**
- * Reserve a TCP or UDP port for a peer.
- *
- * @param system system to use for reservation tracking
- * @param is_tcp GNUNET_YES for TCP ports, GNUNET_NO for UDP
- * @return 0 if no free port was available
- */
-uint16_t
-GNUNET_TESTING_reserve_port (struct GNUNET_TESTING_System *system,
- int is_tcp)
-{
- struct GNUNET_NETWORK_Handle *socket;
- struct addrinfo hint;
- struct addrinfo *ret;
- uint32_t *port_buckets;
- char *open_port_str;
- int bind_status;
- uint32_t xor_image;
- uint16_t index;
- uint16_t open_port;
- uint16_t pos;
-
- /*
- FIXME: Instead of using getaddrinfo we should try to determine the port
- status by the following heurestics.
-
- On systems which support both IPv4 and IPv6, only ports open on both
- address families are considered open.
- On system with either IPv4 or IPv6. A port is considered open if it's
- open in the respective address family
- */
- hint.ai_family = AF_UNSPEC; /* IPv4 and IPv6 */
- hint.ai_socktype = (GNUNET_YES == is_tcp)? SOCK_STREAM : SOCK_DGRAM;
- hint.ai_protocol = 0;
- hint.ai_addrlen = 0;
- hint.ai_addr = NULL;
- hint.ai_canonname = NULL;
- hint.ai_next = NULL;
- hint.ai_flags = AI_PASSIVE | AI_NUMERICSERV; /* Wild card address */
- port_buckets = (GNUNET_YES == is_tcp) ?
- system->reserved_tcp_ports : system->reserved_udp_ports;
- for (index = (LOW_PORT / 32) + 1; index < (HIGH_PORT / 32); index++)
- {
- xor_image = (UINT32_MAX ^ port_buckets[index]);
- if (0 == xor_image) /* Ports in the bucket are full */
- continue;
- pos = 0;
- while (pos < 32)
- {
- if (0 == ((xor_image >> pos) & 1U))
- {
- pos++;
- continue;
- }
- open_port = (index * 32) + pos;
- GNUNET_asprintf (&open_port_str, "%u", (unsigned int) open_port);
- ret = NULL;
- GNUNET_assert (0 == getaddrinfo (NULL, open_port_str, &hint, &ret));
- GNUNET_free (open_port_str);
- socket = GNUNET_NETWORK_socket_create (ret->ai_family,
- (GNUNET_YES == is_tcp) ?
- SOCK_STREAM : SOCK_DGRAM,
- 0);
- GNUNET_assert (NULL != socket);
- bind_status = GNUNET_NETWORK_socket_bind (socket,
- ret->ai_addr,
- ret->ai_addrlen);
- freeaddrinfo (ret);
- GNUNET_NETWORK_socket_close (socket);
- socket = NULL;
- port_buckets[index] |= (1U << pos); /* Set the port bit */
- if (GNUNET_OK == bind_status)
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Found a free port %u\n", (unsigned int) open_port);
- return open_port;
- }
- pos++;
- }
- }
- return 0;
-}
-
-
-/**
- * Release reservation of a TCP or UDP port for a peer
- * (used during GNUNET_TESTING_peer_destroy).
- *
- * @param system system to use for reservation tracking
- * @param is_tcp GNUNET_YES for TCP ports, GNUNET_NO for UDP
- * @param port reserved port to release
- */
-void
-GNUNET_TESTING_release_port (struct GNUNET_TESTING_System *system,
- int is_tcp,
- uint16_t port)
-{
- uint32_t *port_buckets;
- uint16_t bucket;
- uint16_t pos;
-
- port_buckets = (GNUNET_YES == is_tcp) ?
- system->reserved_tcp_ports : system->reserved_udp_ports;
- bucket = port / 32;
- pos = port % 32;
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Releasing port %u\n", port);
- if (0 == (port_buckets[bucket] & (1U << pos)))
- {
- GNUNET_break(0); /* Port was not reserved by us using reserve_port() */
- return;
- }
- port_buckets[bucket] &= ~(1U << pos);
-}
-
-
-/**
- * Reserve a SERVICEHOME path for a peer.
- *
- * @param system system to use for reservation tracking
- * @return NULL on error, otherwise fresh unique path to use
- * as the servicehome for the peer; must be freed by the caller
- */
-// static
-char *
-reserve_path (struct GNUNET_TESTING_System *system)
-{
- char *reserved_path;
-
- GNUNET_asprintf (&reserved_path,
- "%s/%u", system->tmppath, system->path_counter++);
- return reserved_path;
-}
-
-
-/**
- * Testing includes a number of pre-created hostkeys for faster peer
- * startup. This function loads such keys into memory from a file.
- *
- * @param system the testing system handle
- * @param filename the path of the hostkeys file
- * @return GNUNET_OK on success; GNUNET_SYSERR on error
- */
-int
-GNUNET_TESTING_hostkeys_load (struct GNUNET_TESTING_System *system,
- const char *filename)
-{
- struct GNUNET_DISK_FileHandle *fd;
- uint64_t fs;
-
- if (GNUNET_YES != GNUNET_DISK_file_test (filename))
- {
- LOG (GNUNET_ERROR_TYPE_ERROR,
- _("Hostkeys file not found: %s\n"), filename);
- return GNUNET_SYSERR;
- }
- /* Check hostkey file size, read entire thing into memory */
- fd = GNUNET_DISK_file_open (filename, GNUNET_DISK_OPEN_READ,
- GNUNET_DISK_PERM_NONE);
- if (NULL == fd)
- {
- LOG (GNUNET_ERROR_TYPE_ERROR,
- _("Could not open hostkeys file: %s\n"), filename);
- return GNUNET_SYSERR;
- }
- if (GNUNET_OK !=
- GNUNET_DISK_file_size (filename, &fs, GNUNET_YES, GNUNET_YES))
- fs = 0;
- if (0 == fs)
- {
- GNUNET_DISK_file_close (fd);
- return GNUNET_SYSERR; /* File is empty */
- }
- if (0 != (fs % HOSTKEYFILESIZE))
- {
- GNUNET_DISK_file_close (fd);
- LOG (GNUNET_ERROR_TYPE_ERROR,
- _("Incorrect hostkey file format: %s\n"), filename);
- return GNUNET_SYSERR;
- }
- GNUNET_break (NULL == system->hostkeys_data);
- system->total_hostkeys = fs / HOSTKEYFILESIZE;
- system->hostkeys_data = GNUNET_malloc_large (fs); /* free in hostkeys_unload
*/
- GNUNET_assert (fs == GNUNET_DISK_file_read (fd, system->hostkeys_data, fs));
- GNUNET_DISK_file_close (fd);
- return GNUNET_OK;
-}
-
-
-/**
- * Function to remove the loaded hostkeys
- *
- * @param system the testing system handle
- */
-void
-GNUNET_TESTING_hostkeys_unload (struct GNUNET_TESTING_System *system)
-{
- GNUNET_break (NULL != system->hostkeys_data);
- GNUNET_free_non_null (system->hostkeys_data);
- system->hostkeys_data = NULL;
- system->total_hostkeys = 0;
-}
-
-
-/**
- * Testing includes a number of pre-created hostkeys for
- * faster peer startup. This function can be used to
- * access the n-th key of those pre-created hostkeys; note
- * that these keys are ONLY useful for testing and not
- * secure as the private keys are part of the public
- * GNUnet source code.
- *
- * This is primarily a helper function used internally
- * by 'GNUNET_TESTING_peer_configure'.
- *
- * @param system the testing system handle
- * @param key_number desired pre-created hostkey to obtain
- * @param id set to the peer's identity (hash of the public
- * key; if NULL, GNUNET_SYSERR is returned immediately
- * @return GNUNET_SYSERR on error (not enough keys)
- */
-int
-GNUNET_TESTING_hostkey_get (const struct GNUNET_TESTING_System *system,
- uint32_t key_number,
- struct GNUNET_PeerIdentity *id)
-{
- struct GNUNET_CRYPTO_RsaPrivateKey *private_key;
- struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded public_key;
-
- if ((NULL == id) || (NULL == system->hostkeys_data))
- return GNUNET_SYSERR;
- if (key_number >= system->total_hostkeys)
- {
- LOG (GNUNET_ERROR_TYPE_ERROR,
- _("Key number %u does not exist\n"), key_number);
- return GNUNET_SYSERR;
- }
- private_key = GNUNET_CRYPTO_rsa_decode_key (system->hostkeys_data +
- (key_number * HOSTKEYFILESIZE),
- HOSTKEYFILESIZE);
- if (NULL == private_key)
- {
- LOG (GNUNET_ERROR_TYPE_ERROR,
- _("Error while decoding key %u\n"), key_number);
- return GNUNET_SYSERR;
- }
- GNUNET_CRYPTO_rsa_key_get_public (private_key, &public_key);
- GNUNET_CRYPTO_hash (&public_key,
- sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
- &(id->hashPubKey));
- GNUNET_CRYPTO_rsa_key_free (private_key);
- return GNUNET_OK;
-}
-
-
-/**
- * Structure for holding data to build new configurations from a configuration
- * template
- */
-struct UpdateContext
-{
- /**
- * The system for which we are building configurations
- */
- struct GNUNET_TESTING_System *system;
-
- /**
- * The configuration we are building
- */
- struct GNUNET_CONFIGURATION_Handle *cfg;
-
- /**
- * The customized service home path for this peer
- */
- char *service_home;
-
- /**
- * build status - to signal error while building a configuration
- */
- int status;
-};
-
-
-/**
- * Function to iterate over options. Copies
- * the options to the target configuration,
- * updating PORT values as needed.
- *
- * @param cls the UpdateContext
- * @param section name of the section
- * @param option name of the option
- * @param value value of the option
- */
-static void
-update_config (void *cls, const char *section, const char *option,
- const char *value)
-{
- struct UpdateContext *uc = cls;
- unsigned int ival;
- char cval[12];
- char uval[128];
- char *single_variable;
- char *per_host_variable;
- unsigned long long num_per_host;
- uint16_t new_port;
-
- if (GNUNET_OK != uc->status)
- return;
- if (! ((0 == strcmp (option, "PORT"))
- || (0 == strcmp (option, "UNIXPATH"))
- || (0 == strcmp (option, "HOSTNAME"))))
- return;
- GNUNET_asprintf (&single_variable, "single_%s_per_host", section);
- GNUNET_asprintf (&per_host_variable, "num_%s_per_host", section);
- if ((0 == strcmp (option, "PORT")) && (1 == SSCANF (value, "%u", &ival)))
- {
- if ((ival != 0) &&
- (GNUNET_YES !=
- GNUNET_CONFIGURATION_get_value_yesno (uc->cfg, "testing",
- single_variable)))
- {
- /* FIXME: What about UDP? */
- new_port = GNUNET_TESTING_reserve_port (uc->system, GNUNET_YES);
- if (0 == new_port)
- {
- uc->status = GNUNET_SYSERR;
- return;
- }
- GNUNET_snprintf (cval, sizeof (cval), "%u", new_port);
- value = cval;
- }
- else if ((ival != 0) &&
- (GNUNET_YES ==
- GNUNET_CONFIGURATION_get_value_yesno (uc->cfg, "testing",
- single_variable)) &&
- GNUNET_CONFIGURATION_get_value_number (uc->cfg, "testing",
- per_host_variable,
- &num_per_host))
- {
- /* GNUNET_snprintf (cval, sizeof (cval), "%u", */
- /* ival + ctx->fdnum % num_per_host); */
- /* value = cval; */
- GNUNET_break (0); /* FIXME */
- }
- }
- if (0 == strcmp (option, "UNIXPATH"))
- {
- if (GNUNET_YES !=
- GNUNET_CONFIGURATION_get_value_yesno (uc->cfg, "testing",
- single_variable))
- {
- GNUNET_snprintf (uval, sizeof (uval), "%s/%s.sock",
- uc->service_home, section);
- value = uval;
- }
- else if ((GNUNET_YES ==
- GNUNET_CONFIGURATION_get_value_number (uc->cfg, "testing",
- per_host_variable,
- &num_per_host)) &&
- (num_per_host > 0))
- {
- GNUNET_break(0); /* FIXME */
- }
- }
- if ((0 == strcmp (option, "HOSTNAME")) && (NULL != uc->system->controller))
- {
- value = uc->system->controller;
- }
- GNUNET_free (single_variable);
- GNUNET_free (per_host_variable);
- GNUNET_CONFIGURATION_set_value_string (uc->cfg, section, option, value);
-}
-
-
-/**
- * Section iterator to set ACCEPT_FROM in all sections
- *
- * @param cls the UpdateContext
- * @param section name of the section
- */
-static void
-update_config_sections (void *cls,
- const char *section)
-{
- struct UpdateContext *uc = cls;
- char *orig_allowed_hosts;
- char *allowed_hosts;
-
- if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_string (uc->cfg, section, "ACCEPT_FROM",
- &orig_allowed_hosts))
- {
- orig_allowed_hosts = GNUNET_strdup ("127.0.0.1;");
- }
- if (NULL == uc->system->controller)
- allowed_hosts = GNUNET_strdup (orig_allowed_hosts);
- else
- GNUNET_asprintf (&allowed_hosts, "%s%s;", orig_allowed_hosts,
- uc->system->controller);
- GNUNET_free (orig_allowed_hosts);
- GNUNET_CONFIGURATION_set_value_string (uc->cfg, section, "ACCEPT_FROM",
- allowed_hosts);
- GNUNET_free (allowed_hosts);
-}
-
-
-/**
- * Create a new configuration using the given configuration
- * as a template; ports and paths will be modified to select
- * available ports on the local system. If we run
- * out of "*port" numbers, return SYSERR.
- *
- * This is primarily a helper function used internally
- * by 'GNUNET_TESTING_peer_configure'.
- *
- * @param system system to use to coordinate resource usage
- * @param cfg template configuration to update
- * @return GNUNET_OK on success, GNUNET_SYSERR on error - the configuration
will
- * be incomplete and should not be used there upon
- */
-int
-GNUNET_TESTING_configuration_create (struct GNUNET_TESTING_System *system,
- struct GNUNET_CONFIGURATION_Handle *cfg)
-{
- struct UpdateContext uc;
- char *default_config;
-
- uc.system = system;
- uc.cfg = cfg;
- uc.status = GNUNET_OK;
- GNUNET_asprintf (&uc.service_home, "%s/%u", system->tmppath,
- system->path_counter++);
- GNUNET_asprintf (&default_config, "%s/config", uc.service_home);
- GNUNET_CONFIGURATION_set_value_string (cfg, "PATHS", "DEFAULTCONFIG",
- default_config);
- GNUNET_free (default_config);
- GNUNET_CONFIGURATION_set_value_string (cfg, "PATHS", "SERVICEHOME",
- uc.service_home);
- /* make PORTs and UNIXPATHs unique */
- GNUNET_CONFIGURATION_iterate (cfg, &update_config, &uc);
- /* allow connections to services from system controller host */
- GNUNET_CONFIGURATION_iterate_sections (cfg, &update_config_sections, &uc);
- /* enable loopback-based connections between peers */
- GNUNET_CONFIGURATION_set_value_string (cfg,
- "nat",
- "USE_LOCALADDR", "YES");
- GNUNET_free (uc.service_home);
- return uc.status;
-}
-
-
-/**
- * Configure a GNUnet peer. GNUnet must be installed on the local
- * system and available in the PATH.
- *
- * @param system system to use to coordinate resource usage
- * @param cfg configuration to use; will be UPDATED (to reflect needed
- * changes in port numbers and paths)
- * @param key_number number of the hostkey to use for the peer
- * @param id identifier for the daemon, will be set, can be NULL
- * @param emsg set to error message (set to NULL on success), can be NULL
- * @return handle to the peer, NULL on error
- */
-struct GNUNET_TESTING_Peer *
-GNUNET_TESTING_peer_configure (struct GNUNET_TESTING_System *system,
- struct GNUNET_CONFIGURATION_Handle *cfg,
- uint32_t key_number,
- struct GNUNET_PeerIdentity *id,
- char **emsg)
-{
- struct GNUNET_TESTING_Peer *peer;
- struct GNUNET_DISK_FileHandle *fd;
- char *service_home;
- char hostkey_filename[128];
- char *config_filename;
- char *emsg_;
-
- if (NULL != emsg)
- *emsg = NULL;
- if (GNUNET_OK != GNUNET_TESTING_configuration_create (system, cfg))
- {
- GNUNET_asprintf (&emsg_,
- _("Failed to create configuration for peer (not enough
free ports?)\n"));
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s", *emsg_);
- if (NULL != emsg)
- *emsg = emsg_;
- else
- GNUNET_free (emsg_);
- return NULL;
- }
- if (key_number >= system->total_hostkeys)
- {
- GNUNET_asprintf (&emsg_,
- _("You attempted to create a testbed with more than %u
hosts. Please precompute more hostkeys first.\n"),
- (unsigned int) system->total_hostkeys);
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s", *emsg_);
- if (NULL != emsg)
- *emsg = emsg_;
- else
- GNUNET_free (emsg_);
- return NULL;
- }
- if ((NULL != id) &&
- (GNUNET_SYSERR == GNUNET_TESTING_hostkey_get (system, key_number, id)))
- {
- GNUNET_asprintf (&emsg_,
- _("Failed to initialize hostkey for peer %u\n"),
- (unsigned int) key_number);
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s", *emsg_);
- if (NULL != emsg)
- *emsg = emsg_;
- else
- GNUNET_free (emsg_);
- return NULL;
- }
- GNUNET_assert (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_string (cfg, "PATHS",
- "SERVICEHOME",
- &service_home));
- GNUNET_snprintf (hostkey_filename, sizeof (hostkey_filename), "%s/.hostkey",
- service_home);
- GNUNET_free (service_home);
- fd = GNUNET_DISK_file_open (hostkey_filename,
- GNUNET_DISK_OPEN_CREATE | GNUNET_DISK_OPEN_WRITE,
- GNUNET_DISK_PERM_USER_READ
- | GNUNET_DISK_PERM_USER_WRITE);
- if (NULL == fd)
- {
- GNUNET_break (0);
- return NULL;
- }
- if (HOSTKEYFILESIZE !=
- GNUNET_DISK_file_write (fd, system->hostkeys_data
- + (key_number * HOSTKEYFILESIZE),
- HOSTKEYFILESIZE))
- {
- GNUNET_asprintf (&emsg_,
- _("Failed to write hostkey file for peer %u: %s\n"),
- (unsigned int) key_number,
- STRERROR (errno));
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s", *emsg_);
- if (NULL != emsg)
- *emsg = emsg_;
- else
- GNUNET_free (emsg_);
- GNUNET_DISK_file_close (fd);
- return NULL;
- }
- GNUNET_DISK_file_close (fd);
- GNUNET_assert (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_string
- (cfg, "PATHS", "DEFAULTCONFIG", &config_filename));
- if (GNUNET_OK != GNUNET_CONFIGURATION_write (cfg, config_filename))
- {
- GNUNET_asprintf (&emsg_,
- _("Failed to write configuration file `%s' for peer %u:
%s\n"),
- config_filename,
- (unsigned int) key_number,
- STRERROR (errno));
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s", *emsg_);
- if (NULL != emsg)
- *emsg = emsg_;
- else
- GNUNET_free (emsg_);
- GNUNET_free (config_filename);
- return NULL;
- }
- peer = GNUNET_malloc (sizeof (struct GNUNET_TESTING_Peer));
- peer->cfgfile = config_filename; /* Free in peer_destroy */
- peer->main_binary = GNUNET_strdup ("gnunet-service-arm");
- return peer;
-}
-
-
-/**
- * Start the peer.
- *
- * @param peer peer to start
- * @return GNUNET_OK on success, GNUNET_SYSERR on error (i.e. peer already
running)
- */
-int
-GNUNET_TESTING_peer_start (struct GNUNET_TESTING_Peer *peer)
-{
- if (NULL != peer->main_process)
- {
- GNUNET_break (0);
- return GNUNET_SYSERR;
- }
- GNUNET_assert (NULL != peer->cfgfile);
- peer->main_process = GNUNET_OS_start_process (GNUNET_YES, NULL, NULL,
- peer->main_binary,
- peer->main_binary,
- "-c",
- peer->cfgfile,
- NULL);
- if (NULL == peer->main_process)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Failed to start `%s': %s\n"),
- peer->main_binary,
- STRERROR (errno));
- return GNUNET_SYSERR;
- }
- return GNUNET_OK;
-}
-
-
-/**
- * Stop the peer.
- *
- * @param peer peer to stop
- * @return GNUNET_OK on success, GNUNET_SYSERR on error (i.e. peer not running)
- */
-int
-GNUNET_TESTING_peer_stop (struct GNUNET_TESTING_Peer *peer)
-{
- if (NULL == peer->main_process)
- {
- GNUNET_break (0);
- return GNUNET_SYSERR;
- }
- (void) GNUNET_OS_process_kill (peer->main_process, SIGTERM);
- GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (peer->main_process));
- GNUNET_OS_process_destroy (peer->main_process);
- peer->main_process = NULL;
- return GNUNET_OK;
-}
-
-
-/**
- * Destroy the peer. Releases resources locked during peer configuration.
- * If the peer is still running, it will be stopped AND a warning will be
- * printed (users of the API should stop the peer explicitly first).
- *
- * @param peer peer to destroy
- */
-void
-GNUNET_TESTING_peer_destroy (struct GNUNET_TESTING_Peer *peer)
-{
- if (NULL != peer->main_process)
- {
- GNUNET_break (0);
- GNUNET_TESTING_peer_stop (peer);
- }
- GNUNET_free (peer->cfgfile);
- GNUNET_free (peer->main_binary);
- GNUNET_free (peer);
-}
-
-
-/**
- * Start a single peer and run a test using the testing library.
- * Starts a peer using the given configuration and then invokes the
- * given callback. This function ALSO initializes the scheduler loop
- * and should thus be called directly from "main". The testcase
- * should self-terminate by invoking 'GNUNET_SCHEDULER_shutdown'.
- *
- * @param tmppath path for storing temporary data for the test
- * @param cfgfilename name of the configuration file to use;
- * use NULL to only run with defaults
- * @param tm main function of the testcase
- * @param tm_cls closure for 'tm'
- * @return 0 on success, 1 on error
- */
-int
-GNUNET_TESTING_peer_run (const char *tmppath,
- const char *cfgfilename,
- GNUNET_TESTING_TestMain tm,
- void *tm_cls)
-{
- return GNUNET_TESTING_service_run (tmppath, "arm",
- cfgfilename, tm, tm_cls);
-}
-
-
-/**
- * Structure for holding service data
- */
-struct ServiceContext
-{
- /**
- * The configuration of the peer in which the service is run
- */
- const struct GNUNET_CONFIGURATION_Handle *cfg;
-
- /**
- * Callback to signal service startup
- */
- GNUNET_TESTING_TestMain tm;
-
- /**
- * Closure for the above callback
- */
- void *tm_cls;
-};
-
-
-/**
- * Callback to be called when SCHEDULER has been started
- *
- * @param cls the ServiceContext
- * @param tc the TaskContext
- */
-static void
-service_run_main (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct ServiceContext *sc = cls;
-
- sc->tm (sc->tm_cls, sc->cfg);
-}
-
-
-/**
- * Start a single service (no ARM, except of course if the given
- * service name is 'arm') and run a test using the testing library.
- * Starts a service using the given configuration and then invokes the
- * given callback. This function ALSO initializes the scheduler loop
- * and should thus be called directly from "main". The testcase
- * should self-terminate by invoking 'GNUNET_SCHEDULER_shutdown'.
- *
- * This function is useful if the testcase is for a single service
- * and if that service doesn't itself depend on other services.
- *
- * @param tmppath path for storing temporary data for the test
- * @param service_name name of the service to run
- * @param cfgfilename name of the configuration file to use;
- * use NULL to only run with defaults
- * @param tm main function of the testcase
- * @param tm_cls closure for 'tm'
- * @return 0 on success, 1 on error
- */
-int
-GNUNET_TESTING_service_run (const char *tmppath,
- const char *service_name,
- const char *cfgfilename,
- GNUNET_TESTING_TestMain tm,
- void *tm_cls)
-{
- struct ServiceContext sc;
- struct GNUNET_TESTING_System *system;
- struct GNUNET_TESTING_Peer *peer;
- struct GNUNET_CONFIGURATION_Handle *cfg;
- char *data_dir;
- char *hostkeys_file;
-
- data_dir = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_DATADIR);
- GNUNET_asprintf (&hostkeys_file, "%s/testing_hostkeys.dat", data_dir);
- GNUNET_free (data_dir);
- system = GNUNET_TESTING_system_create (tmppath, "127.0.0.1");
- if (NULL == system)
- {
- GNUNET_free (hostkeys_file);
- return 1;
- }
- if (GNUNET_OK != GNUNET_TESTING_hostkeys_load (system, hostkeys_file))
- {
- GNUNET_free (hostkeys_file);
- GNUNET_TESTING_system_destroy (system, GNUNET_YES);
- return 1;
- }
- GNUNET_free (hostkeys_file);
- cfg = GNUNET_CONFIGURATION_create ();
- if (GNUNET_OK != GNUNET_CONFIGURATION_load (cfg, cfgfilename))
- {
- LOG (GNUNET_ERROR_TYPE_ERROR,
- _("Failed to load configuration from %s\n"), cfgfilename);
- GNUNET_CONFIGURATION_destroy (cfg);
- GNUNET_TESTING_system_destroy (system, GNUNET_YES);
- return 1;
- }
- peer = GNUNET_TESTING_peer_configure (system, cfg, 0, NULL, NULL);
- if (NULL == peer)
- {
- GNUNET_CONFIGURATION_destroy (cfg);
- GNUNET_TESTING_hostkeys_unload (system);
- GNUNET_TESTING_system_destroy (system, GNUNET_YES);
- return 1;
- }
- GNUNET_TESTING_hostkeys_unload (system);
- GNUNET_free (peer->main_binary);
- GNUNET_asprintf (&peer->main_binary, "gnunet-service-%s", service_name);
- if (GNUNET_OK != GNUNET_TESTING_peer_start (peer))
- {
- GNUNET_TESTING_peer_destroy (peer);
- GNUNET_CONFIGURATION_destroy (cfg);
- GNUNET_TESTING_system_destroy (system, GNUNET_YES);
- return 1;
- }
- sc.cfg = cfg;
- sc.tm = tm;
- sc.tm_cls = tm_cls;
- GNUNET_SCHEDULER_run (&service_run_main, &sc); /* Scheduler loop */
- if (GNUNET_OK != GNUNET_TESTING_peer_stop (peer))
- {
- GNUNET_TESTING_peer_destroy (peer);
- GNUNET_CONFIGURATION_destroy (cfg);
- GNUNET_TESTING_system_destroy (system, GNUNET_YES);
- return 1;
- }
- GNUNET_TESTING_peer_destroy (peer);
- GNUNET_CONFIGURATION_destroy (cfg);
- GNUNET_TESTING_system_destroy (system, GNUNET_YES);
- return 0;
-}
-
-
-/* end of testing_new.c */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r21839 - gnunet/src/testing,
gnunet <=