/*
This file is part of GNUnet.
- (C) 2010 Christian Grothoff
+ Copyright (C) 2010 Christian Grothoff
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
* @brief
* @author Philipp Toelke
*/
-#include <platform.h>
-#include <gnunet_common.h>
-#include <gnunet_program_lib.h>
-#include <gnunet_protocols.h>
-#include <gnunet_core_service.h>
-#include <gnunet_constants.h>
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_testing_lib.h"
+#include "gnunet_protocols.h"
+#include "gnunet_core_service.h"
+#include "gnunet_constants.h"
/**
* Final status code.
/**
* Handle to the cleanup task.
*/
-GNUNET_SCHEDULER_TaskIdentifier die_task;
-
-static struct GNUNET_PeerIdentity myself;
+struct GNUNET_SCHEDULER_Task * die_task;
/**
- * Configuration to load for the new peer.
+ * Identity of this peer.
*/
-struct GNUNET_CONFIGURATION_Handle *core_cfg;
+static struct GNUNET_PeerIdentity myself;
/**
* The handle to core
*/
struct GNUNET_CORE_Handle *core;
-/**
- * Handle to gnunet-service-arm.
- */
-struct GNUNET_OS_Process *arm_proc;
/**
* Function scheduled as very last function, cleans up after us
static void
cleanup (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tskctx)
{
- die_task = GNUNET_SCHEDULER_NO_TASK;
+ die_task = NULL;
if (core != NULL)
{
GNUNET_CORE_disconnect (core);
core = NULL;
}
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peer\n");
- if (0 != GNUNET_OS_process_kill (arm_proc, SIGTERM))
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-
- if (GNUNET_OS_process_wait (arm_proc) != GNUNET_OK)
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "ARM process %u stopped\n", GNUNET_OS_process_get_pid (arm_proc));
- GNUNET_OS_process_close (arm_proc);
- arm_proc = NULL;
-
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Ending test.\n");
}
+
static int
receive (void *cls, const struct GNUNET_PeerIdentity *other,
- const struct GNUNET_MessageHeader *message,
- const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+ const struct GNUNET_MessageHeader *message)
{
- if (die_task != GNUNET_SCHEDULER_NO_TASK)
+ if (die_task != NULL)
GNUNET_SCHEDULER_cancel (die_task);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received message from peer %s\n",
GNUNET_i2s (other));
+ GNUNET_assert (GNUNET_MESSAGE_TYPE_DUMMY == ntohs (message->type));
+ GNUNET_assert (0 == memcmp (other, &myself, sizeof (myself)));
GNUNET_SCHEDULER_add_now (&cleanup, NULL);
ret = 0;
return GNUNET_OK;
}
+
static size_t
send_message (void *cls, size_t size, void *buf)
{
struct GNUNET_MessageHeader *hdr = buf;
hdr->size = htons (sizeof (struct GNUNET_MessageHeader));
- hdr->type = htons (GNUNET_MESSAGE_TYPE_VPN_SERVICE_UDP);
+ hdr->type = htons (GNUNET_MESSAGE_TYPE_DUMMY);
return ntohs (hdr->size);
}
+
static void
-init (void *cls, struct GNUNET_CORE_Handle *core,
- const struct GNUNET_PeerIdentity *my_identity,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *pk)
+init (void *cls,
+ const struct GNUNET_PeerIdentity *my_identity)
{
- if (core == NULL)
+ if (NULL == my_identity)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Could NOT connect to CORE;\n");
+ GNUNET_break (0);
return;
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
memcpy (&myself, my_identity, sizeof (struct GNUNET_PeerIdentity));
}
+
static void
-connect_cb (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+connect_cb (void *cls, const struct GNUNET_PeerIdentity *peer)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connected to peer %s.\n",
GNUNET_i2s (peer));
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Connected to myself; sending message!\n");
- GNUNET_CORE_notify_transmit_ready (core,
- GNUNET_YES,
- 0, GNUNET_TIME_UNIT_FOREVER_REL,
- peer,
+ GNUNET_CORE_notify_transmit_ready (core, GNUNET_YES, 0,
+ GNUNET_TIME_UNIT_FOREVER_REL, peer,
sizeof (struct GNUNET_MessageHeader),
send_message, NULL);
}
* Main function that will be run by the scheduler.
*
* @param cls closure
- * @param args remaining command-line arguments
- * @param cfgfile name of the configuration file used (for saving, can be NULL!)
* @param cfg configuration
*/
static void
run (void *cls,
- char *const *args,
- const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
+ const struct GNUNET_CONFIGURATION_Handle *cfg,
+ struct GNUNET_TESTING_Peer *peer)
{
const static struct GNUNET_CORE_MessageHandler handlers[] = {
- {&receive, GNUNET_MESSAGE_TYPE_VPN_SERVICE_UDP, 0},
+ {&receive, GNUNET_MESSAGE_TYPE_DUMMY, 0},
{NULL, 0, 0}
};
-
- core_cfg = GNUNET_CONFIGURATION_create ();
-
- arm_proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
- "gnunet-service-arm",
-#if VERBOSE
- "-L", "DEBUG",
-#endif
- "-c", "test_core_api_peer1.conf", NULL);
-
- GNUNET_assert (GNUNET_OK ==
- GNUNET_CONFIGURATION_load (core_cfg,
- "test_core_api_peer1.conf"));
-
- core = GNUNET_CORE_connect (core_cfg,
- 42,
- NULL,
- &init,
- &connect_cb,
- NULL, NULL, NULL, 0, NULL, 0, handlers);
-
+ core =
+ GNUNET_CORE_connect (cfg, NULL, &init, &connect_cb, NULL, NULL,
+ 0, NULL, 0, handlers);
die_task =
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
- (GNUNET_TIME_UNIT_SECONDS, 60), &cleanup,
- cls);
+ (GNUNET_TIME_UNIT_SECONDS, 300), &cleanup,
+ NULL);
}
-static int
-check ()
-{
- char *const argv[] = { "test-core-api-send-to-self",
- "-c",
- "test_core_api_data.conf",
-#if VERBOSE
- "-L", "DEBUG",
-#endif
- NULL
- };
-
- static const struct GNUNET_GETOPT_CommandLineOption options[] = {
- GNUNET_GETOPT_OPTION_END
- };
-
- ret = 1;
-
- return (GNUNET_OK ==
- GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
- argv,
- "test_core_api_send_to_self",
- gettext_noop ("help text"),
- options, &run, NULL)) ? ret : 1;
-}
-
/**
- * The main function to obtain template from gnunetd.
+ * The main function to test sending a message to the local peer via core
*
* @param argc number of arguments from the command line
* @param argv command line arguments
int
main (int argc, char *argv[])
{
- GNUNET_log_setup ("test-core-api-send-to-self",
-#if VERBOSE
- "DEBUG",
-#else
- "WARNING",
-#endif
- NULL);
- ret = check ();
- GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-1");
+ if (0 != GNUNET_TESTING_peer_run ("test-core-api-send-to-self",
+ "test_core_api_peer1.conf",
+ &run, NULL))
+ return 1;
return ret;
}
projects / oweals / gnunet.git / blobdiff