#include "gnunet_protocols.h"
#include "gnunet_program_lib.h"
#include "gnunet_signatures.h"
-#include "plugin_transport.h"
+#include "gnunet_transport_plugin.h"
#include "transport.h"
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
/**
* How long until we give up on transmitting the message?
*/
static struct GNUNET_CRYPTO_RsaPrivateKey *my_private_key;
-/**
- * Our scheduler.
- */
-struct GNUNET_SCHEDULER_Handle *sched;
-
/**
* Our configuration.
*/
/**
*/
static void
-receive (void *cls,
- const struct GNUNET_PeerIdentity
- *peer, const struct GNUNET_MessageHeader *message,
- uint32_t distance,
- const char *sender_address,
- size_t sender_address_len)
+receive (void *cls, const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_MessageHeader *message, uint32_t distance,
+ const char *sender_address, size_t sender_address_len)
{
/* do nothing */
}
void
-notify_address (void *cls,
- const char *name,
- const void *addr,
- size_t addrlen, struct GNUNET_TIME_Relative expires)
+notify_address (void *cls, const char *name, const void *addr, size_t addrlen,
+ struct GNUNET_TIME_Relative expires)
{
}
unload_plugins (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg)
{
GNUNET_assert (NULL ==
- GNUNET_PLUGIN_unload ("libgnunet_plugin_transport_tcp",
- api));
+ GNUNET_PLUGIN_unload ("libgnunet_plugin_transport_tcp", api));
if (my_private_key != NULL)
GNUNET_CRYPTO_rsa_key_free (my_private_key);
unload_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct GNUNET_CONFIGURATION_Handle *cfg = cls;
+
unload_plugins (NULL, cfg);
}
soaddr.sin_port = htons (2368 /* FIXME: get from config! */ );
soaddr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
GNUNET_assert (GNUNET_OK ==
- api->check_address (api->cls,
- &soaddr, sizeof (soaddr)));
+ api->check_address (api->cls, &soaddr, sizeof (soaddr)));
ok = 0;
- GNUNET_SCHEDULER_add_continuation (sched,
- &unload_task,
- (void *) cfg,
+ GNUNET_SCHEDULER_add_continuation (&unload_task, (void *) cfg,
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
}
setup_plugin_environment ()
{
env.cfg = cfg;
- env.sched = sched;
env.my_identity = &my_identity;
env.cls = &env;
env.receive = &receive;
* Runs the test.
*
* @param cls closure
- * @param s scheduler to use
* @param c configuration to use
*/
static void
-run (void *cls,
- struct GNUNET_SCHEDULER_Handle *s,
- 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)
{
unsigned long long tneigh;
char *keyfile;
char *libname;
- sched = s;
cfg = c;
/* parse configuration */
if ((GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_number (c,
- "TRANSPORT",
- "NEIGHBOUR_LIMIT",
+ GNUNET_CONFIGURATION_get_value_number (c, "TRANSPORT", "NEIGHBOUR_LIMIT",
&tneigh)) ||
(GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_filename (c,
- "GNUNETD",
- "HOSTKEY", &keyfile)))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _
- ("Transport service is lacking key configuration settings. Exiting.\n"));
- GNUNET_SCHEDULER_shutdown (s);
- return;
- }
+ GNUNET_CONFIGURATION_get_value_filename (c, "GNUNETD", "HOSTKEY",
+ &keyfile)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _
+ ("Transport service is lacking key configuration settings. Exiting.\n"));
+ GNUNET_SCHEDULER_shutdown (s);
+ return;
+ }
max_connect_per_transport = (uint32_t) tneigh;
my_private_key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
GNUNET_free (keyfile);
if (my_private_key == NULL)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _
- ("Transport service could not access hostkey. Exiting.\n"));
- GNUNET_SCHEDULER_shutdown (s);
- return;
- }
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Transport service could not access hostkey. Exiting.\n"));
+ GNUNET_SCHEDULER_shutdown (s);
+ 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_hash (&my_public_key, sizeof (my_public_key),
+ &my_identity.hashPubKey);
api = GNUNET_PLUGIN_load (libname, &env);
GNUNET_free (libname);
if (api == NULL)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Failed to load transport plugin for tcp\n"));
- /* FIXME: set some error code for main */
- return;
- }
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Failed to load transport plugin for tcp\n"));
+ /* FIXME: set some error code for main */
+ return;
+ }
test_validation ();
}
GNUNET_GETOPT_OPTION_END
};
int ret;
+
char *const argv_prog[] = {
"test_plugin_transport",
"-c",
#endif
NULL);
ok = 1; /* set to fail */
- ret = (GNUNET_OK ==
- GNUNET_PROGRAM_run (5,
- argv_prog,
- "test-plugin-transport",
- "testcase", options, &run, NULL)) ? ok : 1;
+ ret =
+ (GNUNET_OK ==
+ GNUNET_PROGRAM_run (5, argv_prog, "test-plugin-transport", "testcase",
+ options, &run, NULL)) ? ok : 1;
GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-plugin-transport");
return ret;
}