/*
This file is part of GNUnet.
- Copyright (C) 2009 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2009, 2018 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
static void
-end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+end_badly (void *cls)
{
struct AddressWrapper *w;
int c = 0;
}
static void
-wait_end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+wait_end (void *cls)
{
timeout_wait = NULL;
if (0 == addresses_reported)
static struct GNUNET_TIME_Relative
env_receive (void *cls,
const struct GNUNET_HELLO_Address *address,
- struct Session *session,
+ struct GNUNET_ATS_Session *session,
const struct GNUNET_MessageHeader *message)
{
/* do nothing */
static void
-test_addr_string (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+test_addr_string (void *cls)
{
struct AddressWrapper *w = cls;
void *s2a;
{
GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
"Plugin creates different address length when converting address->string->address: %u != %u\n",
- w->address->address_length, s2a_len);
+ (unsigned int) w->address->address_length,
+ (unsigned int) s2a_len);
}
else if (0 != memcmp (s2a, w->address->address, s2a_len))
{
addresses_reported++;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Adding address of length %u\n",
- address->address_length);
+ (unsigned int) address->address_length);
for (wtmp = head; NULL != wtmp; wtmp = wtmp->next)
{
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Removing address of length %u\n",
- address->address_length);
+ (unsigned int) address->address_length);
w = head;
while (NULL != w)
{
static void
env_session_end (void *cls,
const struct GNUNET_HELLO_Address *address,
- struct Session *session)
+ struct GNUNET_ATS_Session *session)
{
}
static int
-handle_helper_message (void *cls, void *client,
+handle_helper_message (void *cls,
const struct GNUNET_MessageHeader *hdr)
{
return GNUNET_OK;
* @param c configuration to use
*/
static void
-run (void *cls, char * const *args, const char *cfgfile,
- const struct GNUNET_CONFIGURATION_Handle *c)
+run (void *cls,
+ char * const *args,
+ const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *c)
{
char * const *argv = cls;
unsigned long long tneigh;
char *plugin;
char *sep;
- timeout_endbadly = GNUNET_SCHEDULER_add_delayed (TIMEOUT, end_badly, &ok);
-
+ timeout_endbadly = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
+ &end_badly,
+ &ok);
cfg = c;
/* parse configuration */
- if ((GNUNET_OK
- != GNUNET_CONFIGURATION_get_value_number (c, "TRANSPORT",
- "NEIGHBOUR_LIMIT", &tneigh))
- || (GNUNET_OK
- != GNUNET_CONFIGURATION_get_value_filename (c, "PEER", "PRIVATE_KEY",
- &keyfile)))
+ if ( (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_number (c,
+ "TRANSPORT",
+ "NEIGHBOUR_LIMIT",
+ &tneigh)) ||
+ (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_filename (c,
+ "PEER",
+ "PRIVATE_KEY",
+ &keyfile)))
{
GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
"Transport service is lacking key configuration settings. Exiting.\n");
return;
}
- if (NULL == (stats = GNUNET_STATISTICS_create ("transport", cfg)))
+ if (NULL == (stats = GNUNET_STATISTICS_create ("transport",
+ cfg)))
{
GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
- "Could not create statistics. Exiting.\n");
+ "Could not create statistics. Exiting.\n");
GNUNET_free(keyfile);
end_badly_now ();
return;
if (GNUNET_OK != GNUNET_DISK_file_test (HOSTKEY_FILE))
{
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Hostkey `%s' missing. Exiting.\n",
- HOSTKEY_FILE);
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+ "Hostkey `%s' missing. Exiting.\n",
+ HOSTKEY_FILE);
GNUNET_free(keyfile);
end_badly_now ();
return;
}
- if (GNUNET_OK != GNUNET_DISK_directory_create_for_file (keyfile))
+ if (GNUNET_OK !=
+ GNUNET_DISK_directory_create_for_file (keyfile))
{
GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
- "Could not create a directory for hostkey `%s'. Exiting.\n", keyfile);
+ "Could not create a directory for hostkey `%s'. Exiting.\n",
+ keyfile);
GNUNET_free(keyfile);
end_badly_now ();
return;
}
- if (GNUNET_OK != GNUNET_DISK_file_copy (HOSTKEY_FILE, keyfile))
+ if (GNUNET_OK !=
+ GNUNET_DISK_file_copy (HOSTKEY_FILE,
+ keyfile))
{
GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
- "Could not copy hostkey `%s' to destination `%s'. Exiting.\n",
- HOSTKEY_FILE, keyfile);
+ "Could not copy hostkey `%s' to destination `%s'. Exiting.\n",
+ HOSTKEY_FILE,
+ keyfile);
GNUNET_free(keyfile);
end_badly_now ();
return;
end_badly_now ();
return;
}
-
}
+
/**
* The main function for the test
*
* @return 0 ok, 1 on error
*/
int
-main (int argc, char * const *argv)
+main (int argc,
+ char * const *argv)
{
static struct GNUNET_GETOPT_CommandLineOption options[] = {
- GNUNET_GETOPT_OPTION_END };
+ GNUNET_GETOPT_OPTION_END
+ };
int ret;
-
- GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-plugin-transport");
-
- char * const argv_prog[] = { "test_plugin_transport", "-c",
- "test_plugin_transport_data.conf", NULL };
- GNUNET_log_setup ("test-plugin-transport", "WARNING", NULL );
+ char * const argv_prog[] = {
+ "test_plugin_transport",
+ "-c",
+ "test_plugin_transport_data.conf",
+ NULL
+ };
+
+ GNUNET_log_setup ("test-plugin-transport",
+ "WARNING",
+ NULL);
+ GNUNET_DISK_purge_cfg_dir ("test_plugin_transport_data.conf",
+ "GNUNET_TEST_HOME");
ok = 1; /* set to fail */
ret =
(GNUNET_OK
== GNUNET_PROGRAM_run (3, argv_prog, "test-plugin-transport",
"testcase", options, &run, (void *) argv)) ? ok : 1;
- GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-plugin-transport");
+ GNUNET_DISK_purge_cfg_dir ("test_plugin_transport_data.conf",
+ "GNUNET_TEST_HOME");
return ret;
}