*/
#include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_constants.h"
#include "gnunet_util_lib.h"
#include "gnunet_hello_lib.h"
#include "gnunet_peerinfo_service.h"
#include "gnunet_statistics_service.h"
#include "gnunet_protocols.h"
-#include "gnunet_signatures.h"
#include "gnunet_transport_plugin.h"
-
#include "transport.h"
/**
* How long until we give up on transmitting the message?
*/
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
+#define WAIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
-/**
- * Our public key.
- */
-static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded my_public_key;
+#define HOSTKEY_FILE "test_plugin_hostkey.ecc"
/**
- * Our identity.
+ * Our public key.
*/
static struct GNUNET_PeerIdentity my_identity;
/**
* Our private key.
*/
-static struct GNUNET_CRYPTO_RsaPrivateKey *my_private_key;
+static struct GNUNET_CRYPTO_EddsaPrivateKey *my_private_key;
/**
* Our configuration.
*/
struct GNUNET_STATISTICS_Handle *stats;
+/**
+ * Our HELLO
+ */
+struct GNUNET_HELLO_Message *hello;
+
/**
* Number of neighbours we'd like to have.
*/
*/
struct GNUNET_TRANSPORT_PluginFunctions *api;
+/**
+ * Helper handler
+ */
+struct GNUNET_HELPER_Handle *suid_helper;
+
+/**
+ * Timeout task
+ */
+static GNUNET_SCHEDULER_TaskIdentifier timeout_endbadly;
+
/**
* Timeout task
*/
-static GNUNET_SCHEDULER_TaskIdentifier timeout_task;
+static GNUNET_SCHEDULER_TaskIdentifier timeout_wait;
/**
* Library name
*/
static char *libname;
+/**
+ * Plugin addresses head
+ */
struct AddressWrapper *head;
+
+/**
+ * Plugin addresses tail
+ */
struct AddressWrapper *tail;
+unsigned int addresses_reported;
+
+unsigned int pretty_printers_running;
+
/**
* Did the test pass or fail?
*/
void *addr;
size_t addrlen;
+
+ char *addrstring;
};
+
static void
end ()
{
- if (NULL != head)
- {
+ struct AddressWrapper *w;
+ int c = 0;
+ ok = 0;
+ if (GNUNET_SCHEDULER_NO_TASK != timeout_endbadly)
+ {
+ GNUNET_SCHEDULER_cancel (timeout_endbadly);
+ timeout_endbadly = GNUNET_SCHEDULER_NO_TASK;
}
+ if (NULL != api)
+ GNUNET_PLUGIN_unload (libname, api);
- if (GNUNET_SCHEDULER_NO_TASK != timeout_task)
+ while (NULL != head)
{
- GNUNET_SCHEDULER_cancel (timeout_task);
- timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ w = head;
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Plugin did not remove address `%s'\n", w->addrstring);
+ GNUNET_CONTAINER_DLL_remove (head, tail, w);
+ c ++;
+ GNUNET_free (w->addr);
+ GNUNET_free (w->addrstring);
+ GNUNET_free (w);
}
-
- if (NULL != api)
+ if (c > 0)
{
- GNUNET_PLUGIN_unload (libname, api);
+ GNUNET_break (0);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Plugin did not remove %u addresses \n", c);
+ ok = 1;
}
+
+
GNUNET_free (libname);
libname = NULL;
GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
stats = NULL;
- ok = 0;
+ if (NULL != suid_helper)
+ {
+ GNUNET_HELPER_stop (suid_helper, GNUNET_NO);
+ suid_helper = NULL;
+ }
}
-static void
+static void
end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct AddressWrapper *w;
int c = 0;
- timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ timeout_endbadly = GNUNET_SCHEDULER_NO_TASK;
+ if (GNUNET_SCHEDULER_NO_TASK != timeout_wait)
+ {
+ GNUNET_SCHEDULER_cancel (timeout_wait);
+ timeout_wait = GNUNET_SCHEDULER_NO_TASK;
+ }
+
+ if (pretty_printers_running > 0)
+ {
+ timeout_endbadly = GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_UNIT_SECONDS, &end_badly, &ok);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Have pending calls to pretty_printer ... deferring shutdown\n");
+ return;
+ }
+
+ if (NULL != cls)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Test took too long to execute, timeout .... \n");
+ }
+
if (NULL != libname)
{
if (NULL != api)
libname = NULL;
}
- w = head;
while (NULL != head)
{
+ w = head;
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Plugin did not remove address `%s'\n", w->addrstring);
GNUNET_CONTAINER_DLL_remove (head, tail, w);
c ++;
GNUNET_free (w->addr);
+ GNUNET_free (w->addrstring);
GNUNET_free (w);
}
if (c > 0)
{
GNUNET_break (0);
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Plugin did not remove %u addresses \n"), c);
+ "Plugin did not remove %u addresses\n", c);
}
if (NULL != stats)
stats = NULL;
}
+ if (NULL != suid_helper)
+ {
+ GNUNET_HELPER_stop (suid_helper, GNUNET_NO);
+ suid_helper = NULL;
+ }
+
ok = 1;
}
+static void
+wait_end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ timeout_wait = GNUNET_SCHEDULER_NO_TASK;
+ if (0 == addresses_reported)
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Plugin did not report any addresses, could not check address conversion functions\n");
+ end ();
+}
+
+
static void
end_badly_now ()
{
- if (GNUNET_SCHEDULER_NO_TASK != timeout_task)
+ if (GNUNET_SCHEDULER_NO_TASK != timeout_wait)
{
- GNUNET_SCHEDULER_cancel (timeout_task);
- timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_SCHEDULER_cancel (timeout_wait);
+ timeout_wait = GNUNET_SCHEDULER_NO_TASK;
}
- timeout_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+ if (GNUNET_SCHEDULER_NO_TASK != timeout_endbadly)
+ {
+ GNUNET_SCHEDULER_cancel (timeout_endbadly);
+ timeout_endbadly = GNUNET_SCHEDULER_NO_TASK;
+ }
+ timeout_endbadly = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
}
env_receive (void *cls,
const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_MessageHeader *message,
- const struct GNUNET_ATS_Information *ats,
- uint32_t ats_count,
struct Session * session,
const char *sender_address,
uint16_t sender_address_len)
{
/* do nothing */
- GNUNET_break (0);
return GNUNET_TIME_relative_get_zero_();
}
+static int got_reply;
+
+
+/**
+ * Take the given address and append it to the set of results sent back to
+ * the client.
+ *
+ * @param cls the transmission context used ('struct GNUNET_SERVER_TransmitContext*')
+ * @param buf text to transmit
+ */
+static void
+address_pretty_printer_cb (void *cls, const char *buf)
+{
+ if (NULL != buf)
+ {
+ got_reply = GNUNET_YES;
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Pretty address : `%s'\n", buf);
+ pretty_printers_running --;
+ }
+ else
+ {
+ if (GNUNET_NO == got_reply)
+ {
+ pretty_printers_running --;
+ GNUNET_break (0);
+ end_badly_now ();
+ }
+ }
+}
+
+
static void
env_notify_address (void *cls,
int add_remove,
const void *addr,
- size_t addrlen)
+ size_t addrlen,
+ const char *plugin)
{
struct AddressWrapper *w;
- char *a2s;
+ struct AddressWrapper *wtmp;
void *s2a;
size_t s2a_len;
if (GNUNET_YES == add_remove)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Adding address of length %u\n"), addrlen);
+ addresses_reported ++;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Adding address of length %u\n", addrlen);
- w = GNUNET_malloc (sizeof (struct AddressWrapper));
+ for (wtmp = head; NULL != wtmp; wtmp = wtmp->next)
+ {
+ if ((addrlen == wtmp->addrlen) && (0 == memcmp (addr, wtmp->addr, addrlen)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Duplicate address notification .... \n");
+ return;
+ }
+ }
+
+ w = GNUNET_new (struct AddressWrapper);
w->addr = GNUNET_malloc (addrlen);
w->addrlen = addrlen;
memcpy (w->addr, addr, addrlen);
GNUNET_CONTAINER_DLL_insert(head, tail, w);
-
- a2s = strdup (api->address_to_string (api, w->addr, w->addrlen));
- if (NULL == a2s)
+ got_reply = GNUNET_NO;
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Testing: address_to_string \n");
+ w->addrstring = strdup (api->address_to_string (api, w->addr, w->addrlen));
+ if (NULL == w->addrstring)
{
GNUNET_break (0);
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Plugin cannot convert address to string!\n"));
+ "Plugin cannot convert address to string!\n");
end_badly_now();
return;
}
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Plugin added address `%s'\n", w->addrstring);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Testing address_to_string: OK\n");
+ }
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("Plugin added address `%s'\n"), a2s);
-
- if (GNUNET_OK != api->string_to_address (api, a2s, strlen (a2s)+1, &s2a, &s2a_len))
+ "Testing: string_to_address \n");
+ s2a = NULL;
+ s2a_len = 0;
+ if ((GNUNET_OK != api->string_to_address (api, w->addrstring, strlen (w->addrstring)+1, &s2a, &s2a_len)) || (NULL == s2a))
{
GNUNET_break (0);
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Plugin cannot convert string to address!\n"));
+ "Plugin cannot convert string to address!\n");
end_badly_now();
return;
}
+ /*
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Plugin creates `%s' %u\n",api->address_to_string (api, s2a, s2a_len), s2a_len);
+
+ int c1;
+ for (c1 = 0; c1 < s2a_len; c1++ )
+ fprintf (stderr, "%u == %u\n", ((char *) s2a)[c1], ((char *) w->addr)[c1]);
+ */
if (s2a_len != w->addrlen)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Plugin creates different address length when converting address->string->address: %u != %u\n"), w->addrlen, s2a_len);
+ "Plugin creates different address length when converting address->string->address: %u != %u\n", w->addrlen, s2a_len);
}
- else
+ else if (0 != memcmp (s2a, w->addr, s2a_len))
{
- if (0 != memcmp (s2a, w->addr, s2a_len))
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Plugin creates different address length when connecting back and forth!\n"));
+ "Plugin creates different address length when converting back and forth %i!\n", memcmp (s2a, w->addr, s2a_len));
}
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Testing string_to_address: OK\n");
+ }
+ GNUNET_free (s2a);
+
+ pretty_printers_running ++;
+ api->address_pretty_printer (api->cls, plugin, addr, addrlen,
+ GNUNET_YES, GNUNET_TIME_UNIT_MINUTES,
+ &address_pretty_printer_cb,
+ w);
if (GNUNET_OK != api->check_address (api->cls, w->addr, w->addrlen))
{
GNUNET_break (0);
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Plugin refuses added address!\n"));
+ "Plugin refuses added address!\n");
end_badly_now();
return;
}
+ if (GNUNET_SCHEDULER_NO_TASK != timeout_wait)
+ {
+ GNUNET_SCHEDULER_cancel (timeout_wait);
+ timeout_wait = GNUNET_SCHEDULER_NO_TASK;
+ }
+
+ timeout_wait = GNUNET_SCHEDULER_add_delayed (WAIT, &wait_end, NULL);
+
}
else if (GNUNET_NO == add_remove)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Removing address of length %u\n"), addrlen);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Removing address of length %u\n", addrlen);
w = head;
while (NULL != w)
{
GNUNET_break (0);
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Plugin removes address never added!\n"));
+ "Plugin removes address never added!\n");
end_badly_now();
return;
}
GNUNET_CONTAINER_DLL_remove (head, tail, w);
GNUNET_free (w->addr);
+ GNUNET_free (w->addrstring);
GNUNET_free (w);
}
else
{
GNUNET_break (0);
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Invalid operation\n"));
+ "Invalid operation: %u\n", add_remove);
end_badly_now ();
+ return;
}
}
-struct GNUNET_ATS_Information
+
+static struct GNUNET_ATS_Information
env_get_address_type (void *cls,
const struct sockaddr *addr,
size_t addrlen)
{
struct GNUNET_ATS_Information ats;
- ats.type = htonl (0);
- ats.value = htonl (0);
+ ats.type = htonl (GNUNET_ATS_NETWORK_TYPE);
+ ats.value = htonl (GNUNET_ATS_NET_LOOPBACK);
return ats;
}
-const struct GNUNET_MessageHeader *
-env_get_our_hello (void)
+static const struct GNUNET_MessageHeader *
+env_get_our_hello ()
{
- GNUNET_break (0);
- return NULL;
+ return (const struct GNUNET_MessageHeader *) hello;
}
-void env_session_end (void *cls,
- const struct GNUNET_PeerIdentity *peer,
- struct Session * session)
+
+static void
+env_session_end (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ struct Session * session)
{
+}
+
+static void
+env_update_metrics (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ const void *address,
+ uint16_t address_len,
+ struct Session *session,
+ const struct GNUNET_ATS_Information *ats,
+ uint32_t ats_count)
+{
}
+
static void
setup_plugin_environment ()
{
env.my_identity = &my_identity;
env.max_connections = max_connect_per_transport;
env.stats = stats;
-
env.receive = &env_receive;
env.notify_address = &env_notify_address;
env.get_address_type = &env_get_address_type;
+ env.update_address_metrics = &env_update_metrics;
env.get_our_hello = &env_get_our_hello;
env.session_end = &env_session_end;
}
+static int
+handle_helper_message (void *cls, void *client,
+ const struct GNUNET_MessageHeader *hdr)
+{
+ return GNUNET_OK;
+}
+
+
/**
* Runs the test.
*
char *plugin;
char *sep;
- timeout_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, end_badly, NULL);
+ 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,
- "GNUNETD", "HOSTKEY",
- &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"));
+ "Transport service is lacking key configuration settings. Exiting.\n");
+ return;
+ }
+ if (NULL == (stats = GNUNET_STATISTICS_create ("transport", cfg)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Could not create statistics. Exiting.\n");
+ GNUNET_free (keyfile);
+ end_badly_now ();
return;
}
- stats = GNUNET_STATISTICS_create ("transport", cfg);
- if (NULL == stats)
+ if (GNUNET_OK != GNUNET_DISK_file_test (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))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "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))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Could not create statistics. Exiting.\n"));
+ "Could not copy hostkey `%s' to destination `%s'. Exiting.\n",
+ HOSTKEY_FILE, keyfile);
+ GNUNET_free (keyfile);
end_badly_now ();
return;
}
+
max_connect_per_transport = (uint32_t) tneigh;
- my_private_key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
+ my_private_key = GNUNET_CRYPTO_eddsa_key_create_from_file (keyfile);
GNUNET_free (keyfile);
- if (my_private_key == NULL)
+ if (NULL == my_private_key)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Transport service could not access hostkey. Exiting.\n"));
+ "Could not access hostkey. Exiting.\n");
end_badly_now ();
return;
}
- GNUNET_CRYPTO_rsa_key_get_public (my_private_key, &my_public_key);
- GNUNET_CRYPTO_hash (&my_public_key, sizeof (my_public_key),
- &my_identity.hashPubKey);
+ GNUNET_CRYPTO_eddsa_key_get_public (my_private_key, &my_identity.public_key);
+
+ hello = GNUNET_HELLO_create (&my_identity.public_key, NULL, NULL, GNUNET_NO);
/* load plugins... */
setup_plugin_environment ();
- plugin = strrchr(argv[0],'_');
+ GNUNET_assert (strlen (argv[0]) > strlen ("test_plugin_"));
+ plugin = strstr(argv[0],"test_plugin_");
sep = strrchr(argv[0],'.');
if (NULL == plugin)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Not a valid test name\n"));
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Not a valid test name\n");
end_badly_now ();
return;
}
- plugin++;
+ plugin += strlen ("test_plugin_");
if (NULL != sep)
sep[0] = '\0';
+ /* Hack for WLAN: start a second helper */
+ if (0 == strcmp (plugin, "wlan"))
+ {
+ char * helper_argv[3];
+ helper_argv[0] = (char *) "gnunet-helper-transport-wlan-dummy";
+ helper_argv[1] = (char *) "2";
+ helper_argv[2] = NULL;
+ suid_helper = GNUNET_HELPER_start (GNUNET_NO,
+ "gnunet-helper-transport-wlan-dummy",
+ helper_argv,
+ &handle_helper_message,
+ NULL,
+ NULL);
+ }
+
/* Loading plugin */
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Loading transport plugin %s\n"), plugin);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Loading transport plugin %s\n", plugin);
GNUNET_asprintf (&libname, "libgnunet_plugin_transport_%s", plugin);
api = GNUNET_PLUGIN_load (libname, &env);
if (api == NULL)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Failed to load transport plugin for tcp\n"));
+ "Failed to load transport plugin for %s\n", plugin);
end_badly_now ();
return;
}
+ timeout_wait = GNUNET_SCHEDULER_add_delayed (WAIT, &wait_end, NULL);
+
/* Check if all functions are implemented */
if (NULL == api->address_pretty_printer)
{
end_badly_now ();
return;
}
+
}
/**
- * The main function for the transport service.
+ * The main function for the test
*
* @param argc number of arguments from the command line
* @param argv command line arguments
};
int ret;
+ GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-plugin-transport");
+
char *const argv_prog[] = {
"test_plugin_transport",
"-c",
"test_plugin_transport_data.conf",
- "-L", "WARNING",
NULL
};
GNUNET_log_setup ("test-plugin-transport",
"WARNING",
NULL);
ok = 1; /* set to fail */
- ret = (GNUNET_OK == GNUNET_PROGRAM_run (5,
- argv_prog,
- "test-plugin-transport",
- "testcase",
- options,
- &run,
- (void *) argv)) ? ok : 1;
+ 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");
return ret;
}
projects / oweals / gnunet.git / blobdiff