-doxygen
[oweals/gnunet.git] / src / transport / test_plugin_transport.c
index 60a33c65acc67decbbf99aa61b40355672c86f72..98806fbb83362a184f7330cb4fa438dd3fbbc802 100644 (file)
@@ -4,7 +4,7 @@
 
      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 2, or (at your
+     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
      Boston, MA 02111-1307, USA.
 */
 /**
- * @file transport/test_transport_api.c
+ * @file transport/test_plugin_transport.c
  * @brief testcase for transport_api.c
  * @author Sailor Siraj
  * @author Christian Grothoff
  */
 
 #include "platform.h"
-#include "gnunet_constants.h"
-#include "gnunet_getopt_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_hello_lib.h"
-#include "gnunet_os_lib.h"
 #include "gnunet_peerinfo_service.h"
-#include "gnunet_plugin_lib.h"
+#include "gnunet_statistics_service.h"
 #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_NO
-
 /**
  * How long until we give up on transmitting the message?
  */
+#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 scheduler.
+ * Our configuration.
  */
-struct GNUNET_SCHEDULER_Handle *sched;
+const struct GNUNET_CONFIGURATION_Handle *cfg;
 
 /**
  * Our configuration.
  */
-const struct GNUNET_CONFIGURATION_Handle *cfg;
+struct GNUNET_STATISTICS_Handle *stats;
+
+/**
+ * Our HELLO
+ */
+struct GNUNET_HELLO_Message *hello;
 
 /**
  * Number of neighbours we'd like to have.
@@ -85,254 +82,651 @@ struct GNUNET_TRANSPORT_PluginEnvironment env;
 struct GNUNET_TRANSPORT_PluginFunctions *api;
 
 /**
- * Did the test pass or fail?
+ * Helper handler
  */
-static int ok;
+struct GNUNET_HELPER_Handle *suid_helper;
+
+/**
+ * Timeout task
+ */
+static GNUNET_SCHEDULER_TaskIdentifier timeout_endbadly;
+
+/**
+ * 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;
 
 /**
- * Initialize Environment for this plugin
+ * Did the test pass or fail?
  */
-struct ReadyList * 
-receive(void *cls,void *plugin_context,
-       struct ReadyList *
-       service_context,
-       struct GNUNET_TIME_Relative
-       latency,
-       const struct GNUNET_PeerIdentity
-       * peer,
-       const struct GNUNET_MessageHeader
-       * message)
+static int ok;
+
+
+struct AddressWrapper
+{
+  struct AddressWrapper *next;
+
+  struct AddressWrapper *prev;
+
+  void *addr;
+
+  size_t addrlen;
+
+  char *addrstring;
+};
+
+
+static void
+end ()
+{
+  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);
+
+  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);
+    ok = 1;
+  }
+
+
+  GNUNET_free (libname);
+  libname = NULL;
+  GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
+  stats = NULL;
+
+  if (NULL != suid_helper)
+  {
+    GNUNET_HELPER_stop (suid_helper, GNUNET_NO);
+    suid_helper = NULL;
+  }
+}
+
+
+static void
+end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  struct AddressWrapper *w;
+  int c = 0;
+
+  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)
+      GNUNET_PLUGIN_unload (libname, api);
+    GNUNET_free (libname);
+    libname = NULL;
+  }
+
+  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);
+  }
+
+  if (NULL != stats)
+  {
+    GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
+    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)
 {
-  return NULL;
+  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 ();
 }
 
-void notify_address(void *cls,
-                   const char *name,
-                   const void *addr,
-                   size_t addrlen,
-                   struct
-                   GNUNET_TIME_Relative
-                   expires)
+
+static void
+end_badly_now ()
 {
+  if (GNUNET_SCHEDULER_NO_TASK != timeout_wait)
+  {
+      GNUNET_SCHEDULER_cancel (timeout_wait);
+      timeout_wait = GNUNET_SCHEDULER_NO_TASK;
+  }
+  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);
 }
 
-void lookup (void *cls,
-            struct GNUNET_TIME_Relative
-            timeout,
-            const struct
-            GNUNET_PeerIdentity * target,
-            GNUNET_TRANSPORT_AddressCallback
-            iter, void *iter_cls)
-{      
+
+static struct GNUNET_TIME_Relative
+env_receive (void *cls,
+            const struct GNUNET_PeerIdentity *peer,
+            const struct GNUNET_MessageHeader *message,
+            struct Session * session,
+            const char *sender_address,
+            uint16_t sender_address_len)
+{
+  /* do nothing */
+  return GNUNET_TIME_relative_get_zero_();
 }
 
 
+static int got_reply;
+
+
 /**
- * Function called when the service shuts
- * down.  Unloads our plugins.
+ * Take the given address and append it to the set of results sent back to
+ * the client.
  *
- * @param cls closure
- * @param cfg configuration to use
+ * @param cls the transmission context used ('struct GNUNET_SERVER_TransmitContext*')
+ * @param buf text to transmit
  */
 static void
-unload_plugins (void *cls, 
-               const struct GNUNET_CONFIGURATION_Handle *cfg)
-{  
-  GNUNET_assert (NULL == GNUNET_PLUGIN_unload ("libgnunet_plugin_transport_tcp",api));
-  if (my_private_key != NULL)
-    GNUNET_CRYPTO_rsa_key_free (my_private_key);
-  
+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 GNUNET_SCHEDULER_TaskIdentifier validation_timeout_task;
+static void
+env_notify_address (void *cls,
+                    int add_remove,
+                    const void *addr,
+                    size_t addrlen,
+                    const char *plugin)
+{
+  struct AddressWrapper *w;
+  struct AddressWrapper *wtmp;
+  void *s2a;
+  size_t s2a_len;
+
+  if (GNUNET_YES == add_remove)
+  {
+      addresses_reported ++;
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Adding address of length %u\n", addrlen);
+
+      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);
+      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");
+          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,
+                  "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");
+          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);
+      }
+      else if (0 != memcmp (s2a, w->addr, s2a_len))
+      {
+            GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                        "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");
+          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_DEBUG,
+                  "Removing address of length %u\n", addrlen);
+
+      w = head;
+      while (NULL != w)
+      {
+          if ((addrlen == w->addrlen) && (0 == memcmp (w->addr, addr, addrlen)))
+          {
+            break;
+          }
+          w = w->next;
+      }
+
+      if (w == NULL)
+      {
+          GNUNET_break (0);
+          GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                      "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: %u\n", add_remove);
+      end_badly_now ();
+      return;
+  }
+}
 
 
-static void 
-validation_notification (void *cls,
-                        const char *name,
-                        const struct GNUNET_PeerIdentity *peer,
-                        uint32_t challenge,
-                        const char *sender_addr)
+static struct GNUNET_ATS_Information
+env_get_address_type (void *cls,
+                     const struct sockaddr *addr,
+                     size_t addrlen)
 {
-  /* Sailor: 'test_validation' should get here
-     if the validation worked; so we cancel the
-     "delayed" task that will cause failure */
-  if (validation_timeout_task != GNUNET_SCHEDULER_NO_TASK)
-    {
-      GNUNET_SCHEDULER_cancel (sched, validation_timeout_task);
-      validation_timeout_task = GNUNET_SCHEDULER_NO_TASK;
-    }
-
-  GNUNET_assert (challenge == 42);
-  
-  /* Sailor: if this is the last test, calling this function
-     here will end the process. */
-  ok = 0; /* if the last test succeeded, report success */
-  unload_plugins (NULL, cfg);
+  struct GNUNET_ATS_Information ats;
+  ats.type = htonl (GNUNET_ATS_NETWORK_TYPE);
+  ats.value = htonl (GNUNET_ATS_NET_LOOPBACK);
+  return ats;
+}
+
+
+static const struct GNUNET_MessageHeader *
+env_get_our_hello ()
+{
+  return (const struct GNUNET_MessageHeader *) hello;
 }
 
 
 static void
-validation_failed (void *cls,
-                  const struct GNUNET_SCHEDULER_TaskContext *tc)
+env_session_end (void *cls,
+                const struct GNUNET_PeerIdentity *peer,
+                struct Session * session)
 {
-  validation_timeout_task = GNUNET_SCHEDULER_NO_TASK;
-  GNUNET_break (0); /* output error */
-  /* the "validation_notification" was not called
-     in a timely fashion; we should set an error
-     code for main and shut down */  
-  unload_plugins (NULL, cfg);
 }
 
 
-/**
- * Simple example test that invokes
- * the "validate" function of the plugin
- * and tries to see if the plugin would
- * succeed to validate its own address.
- * (This test is not well-written since
- *  we hand-compile the address which
- *  kind-of works for TCP but would not
- *  work for other plugins; we should ask
- *  the plugin about its address instead...).
- */
 static void
-test_validation ()
+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)
 {
-  struct sockaddr_in soaddr;
-  
-  memset (&soaddr, 0, sizeof(soaddr));
-#if HAVE_SOCKADDR_IN_SIN_LEN
-  soaddr.sin_len = sizeof (soaddr);
-#endif
-  soaddr.sin_family = AF_INET;
-  /* Sailor: set this port to 2367 to see the
-     testcase fail after 30s (because validation
-     fails); obviously the test should be
-     modified to test both successful and
-     unsuccessful validation in the end... */
-  soaddr.sin_port = htons(2368 /* FIXME: get from config! */);
-  soaddr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
-  api->validate (api->cls,
-                &my_identity,
-                42,
-                TIMEOUT,
-                &soaddr,
-                sizeof(soaddr));                
-  /* add job to catch failure (timeout) */
-  validation_timeout_task =
-    GNUNET_SCHEDULER_add_delayed (sched,
-                                 GNUNET_NO,
-                                 GNUNET_SCHEDULER_PRIORITY_KEEP,
-                                 GNUNET_SCHEDULER_NO_TASK,
-                                 TIMEOUT,
-                                 &validation_failed,
-                                 NULL);
 }
 
 
-static void setup_plugin_environment()
+static void
+setup_plugin_environment ()
 {
-  env.cfg  = cfg;
-  env.sched = sched;
-  env.my_public_key = &my_public_key;
-  env.my_private_key = my_private_key;
+  env.cfg = cfg;
+  env.cls = &env;
   env.my_identity = &my_identity;
-  env.cls=&env;
-  env.receive=&receive;
-  env.lookup=&lookup;
-  env.notify_address=&notify_address;
-  env.notify_validation = &validation_notification;
-  env.max_connections = max_connect_per_transport;       
-}      
+  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.
  *
  * @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,
+run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *c)
-{ 
+{
+  char *const *argv = cls;
   unsigned long long tneigh;
   char *keyfile;
-  char *libname;
+  char *plugin;
+  char *sep;
+
+  timeout_endbadly = GNUNET_SCHEDULER_add_delayed (TIMEOUT, end_badly, &ok);
 
-  sched = s;
   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");
+    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;
+  }
+
+  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,
-                  _("Transport service is lacking key configuration settings.  Exiting.\n"));
-      GNUNET_SCHEDULER_shutdown (s);
+                  "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)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _("Transport service could not access hostkey.  Exiting.\n"));
-      GNUNET_SCHEDULER_shutdown (s);
+  if (NULL == my_private_key)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Could not access hostkey.  Exiting.\n");
+    end_badly_now ();
+    return;
+  }
+  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 ();
+
+  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");
+      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);
-  
-
-  
-  /* load plugins... */  
-  setup_plugin_environment();
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              _("Loading tcp transport plugin\n"));
-  GNUNET_asprintf (&libname, "libgnunet_plugin_transport_tcp");
-
-  api = GNUNET_PLUGIN_load(libname, &env);
+  }
+  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_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"));
-      /* FIXME: set some error code for main */
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "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)
+  {
+      GNUNET_break (0);
+      end_badly_now ();
       return;
-    } 
-  /* Sailor: if we had no real tests, we
-     could call this function
-     here to end the process; instead, I'll
-     show how one could run a single test below. 
-     Note that the test is not particularly well-written,
-     it just serves to illustrate (also,
-     the "validation_notification" function above is
-     part of the test.*/
-  if (0)
-    unload_plugins (NULL, cfg);
-  else
-    test_validation ();
+  }
+  if (NULL == api->address_to_string)
+  {
+      GNUNET_break (0);
+      end_badly_now ();
+      return;
+  }
+  GNUNET_assert (NULL != api->check_address);
+  if (NULL == api->check_address)
+  {
+      GNUNET_break (0);
+      end_badly_now ();
+      return;
+  }
+  GNUNET_assert (NULL != api->disconnect);
+  if (NULL == api->disconnect)
+  {
+      GNUNET_break (0);
+      end_badly_now ();
+      return;
+  }
+  GNUNET_assert (NULL != api->get_session);
+  if (NULL == api->get_session)
+  {
+      GNUNET_break (0);
+      end_badly_now ();
+      return;
+  }
+  if (NULL == api->address_pretty_printer)
+  {
+      GNUNET_break (0);
+      end_badly_now ();
+      return;
+  }
+  if (NULL == api->string_to_address)
+  {
+      GNUNET_break (0);
+      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
@@ -345,33 +739,26 @@ main (int argc, char *const *argv)
     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",
-    "-L",
-#if VERBOSE
-    "DEBUG",
-#else
-    "WARNING",
-#endif
     NULL
-  };  
+  };
   GNUNET_log_setup ("test-plugin-transport",
-#if VERBOSE
-                    "DEBUG",
-#else
                     "WARNING",
-#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;
+                    NULL);
+  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");
   return ret;
 }