rewrite from scratch

1 files changed, 39 insertions, 156 deletions

diff --git a/src/transport/test_plugin_transport_http.c b/src/transport/test_plugin_transport_http.c
index 84de2ca25..0ce1766c9 100644
--- a/src/transport/test_plugin_transport_http.c
+++ b/src/transport/test_plugin_transport_http.c
@@ -99,13 +99,6 @@ static struct GNUNET_TRANSPORT_PluginEnvironment env;
 static struct GNUNET_TRANSPORT_PluginFunctions *api;
 
 /**
- * Did the test pass or fail?
- */
-static int fail;
-
-pid_t pid;
-
-/**
  * ID of the task controlling the locking between two hostlist tests
  */
 static GNUNET_SCHEDULER_TaskIdentifier ti_check_stat;
@@ -113,16 +106,21 @@ static GNUNET_SCHEDULER_TaskIdentifier ti_check_stat;
 static unsigned int timeout_count;
 
 /**
+ * Did the test pass or fail?
+ */
+static int fail;
+
+/**
  * Initialize Environment for this plugin
  */
 static struct GNUNET_TIME_Relative
 receive (void *cls,
-         const struct GNUNET_PeerIdentity * peer,
-         const struct GNUNET_MessageHeader * message,
-         uint32_t distance,
-         struct Session *session,
-         const char *sender_address,
-         uint16_t sender_address_len)
+         const struct GNUNET_PeerIdentity * peer,
+         const struct GNUNET_MessageHeader * message,
+         uint32_t distance,
+         struct Session *session,
+         const char *sender_address,
+         uint16_t sender_address_len)
 {
   /* do nothing */
   return GNUNET_TIME_UNIT_ZERO;
@@ -132,33 +130,13 @@ void
 notify_address (void *cls,
                 const char *name,
                 const void *addr,
-                uint16_t addrlen, 
-                struct GNUNET_TIME_Relative expires)
-{
-}
-
-/**
- * Simple example test that invokes
- * the check_address function of the plugin.
- */
-/* FIXME: won't work on IPv6 enabled systems where IPv4 mapping
- * isn't enabled (eg. FreeBSD > 4)
- */
-static void
-shutdown_clean ()
+                uint16_t addrlen,
+                struct GNUNET_TIME_Relative expires)
 {
-  GNUNET_assert (NULL ==
-                 GNUNET_PLUGIN_unload ("libgnunet_plugin_transport_http",
-                                       api));
-  if (my_private_key != NULL)
-    GNUNET_CRYPTO_rsa_key_free (my_private_key);
 
-  if (ti_check_stat != GNUNET_SCHEDULER_NO_TASK)
-    GNUNET_SCHEDULER_cancel(sched, ti_check_stat);
-  GNUNET_SCHEDULER_shutdown(sched);
-  return;
 }
 
+
 static void
 setup_plugin_environment ()
 {
@@ -172,30 +150,23 @@ setup_plugin_environment ()
   env.max_connections = max_connect_per_transport;
 }
 
-static int
-process_stat (void *cls,
-              const char *subsystem,
-              const char *name,
-              uint64_t value,
-              int is_persistent)
+/**
+ * Simple example test that invokes
+ * the check_address function of the plugin.
+ */
+/* FIXME: won't work on IPv6 enabled systems where IPv4 mapping
+ * isn't enabled (eg. FreeBSD > 4)
+ */
+static void
+shutdown_clean ()
 {
-  if (value==1)
-    {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutdown, plugin failed \n");
-    fail = GNUNET_YES;
-    shutdown_clean();
-    return GNUNET_YES;
-    }
-  if (value==2)
-    {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutdown, plugin not failed \n");
-    shutdown_clean();
-    return GNUNET_YES;
-    }
-  return GNUNET_YES;
+  GNUNET_assert (NULL ==
+                 GNUNET_PLUGIN_unload ("libgnunet_plugin_transport_http",
+                                       api));
+  GNUNET_SCHEDULER_shutdown(sched);
+  return;
 }
 
-
 /**
  * Task that checks if we should try to download a hostlist.
  * If so, we initiate the download, otherwise we schedule
@@ -205,12 +176,11 @@ static void
 task_check_stat (void *cls,
             const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-
   ti_check_stat = GNUNET_SCHEDULER_NO_TASK;
   if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
     return;
 
-  if ( timeout_count > 10 )
+  if ( timeout_count > 5 )
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testcase timeout\n",  timeout_count);
     fail = GNUNET_YES;
@@ -219,14 +189,6 @@ task_check_stat (void *cls,
   }
   timeout_count++;
 
-  GNUNET_STATISTICS_get (stats,
-                         "http-transport",
-                         gettext_noop("shutdown"),
-                         GNUNET_TIME_UNIT_MINUTES,
-                         NULL,
-                         &process_stat,
-                         NULL);
-
   ti_check_stat = GNUNET_SCHEDULER_add_delayed (sched, STAT_INTERVALL, &task_check_stat, NULL);
   return;
 }
@@ -244,98 +206,26 @@ run (void *cls,
      char *const *args,
      const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *c)
 {
-  unsigned long long tneigh;
-  char *keyfile;
-  char *libname;
+  char * libname;
 
   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)))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _("Transport service is lacking key configuration settings.  Exiting.\n"));
-      GNUNET_SCHEDULER_shutdown (s);
-      return;
-    }
-
-  pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-statistics",
-                                 "gnunet-service-statistics",
-                                 "-L", "DEBUG",
-                                 "-c", "test_plugin_transport_data_http.conf", NULL);
-
-
-  if ( pid == -1)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                     _("Failed to start service for `%s' http transport plugin test.\n"),
-                     "statistics");
-    GNUNET_SCHEDULER_shutdown (s);
-    return;
-  }
-
-  stats = GNUNET_STATISTICS_create (sched, "http-transport", cfg);
-  env.stats = stats;
-  /*
-  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_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 HTTP transport plugin\n"));
   GNUNET_asprintf (&libname, "libgnunet_plugin_transport_http");
 
   api = GNUNET_PLUGIN_load (libname, &env);
-  if (api != NULL )
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Loading http transport plugin `%s' was successful\n",libname);
-
   GNUNET_free (libname);
   if (api == NULL)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _("Failed to load http transport plugin\n"));
-      fail = GNUNET_YES;
-      shutdown_clean ();
-      return;
-
-    }
-  fail = GNUNET_NO;
-
-  char * test_message  = "Hello World!";
-  size_t bs = 0;
-  size_t size = strlen(test_message) +1;
-
-  /* Testing to send */
-  bs = api->send(NULL, &my_identity,test_message,size,0, TIMEOUT, NULL, NULL, 0, GNUNET_NO, NULL, NULL);
-  GNUNET_assert ( bs == size);
-
-  /* check statistics */
-  ti_check_stat = GNUNET_SCHEDULER_add_now(sched, &task_check_stat, NULL);
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("Failed to load transport plugin for udp\n"));
+    return;
+  }
 
-  return;
+  ti_check_stat = GNUNET_SCHEDULER_add_now (sched, &task_check_stat, NULL);
 }
 
 
@@ -349,7 +239,6 @@ run (void *cls,
 int
 main (int argc, char *const *argv)
 {
-  return GNUNET_NO;
   static struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_OPTION_END
   };
@@ -373,20 +262,14 @@ main (int argc, char *const *argv)
                     "WARNING",
 #endif
                     NULL);
-  fail = GNUNET_YES;
   ret = (GNUNET_OK ==
          GNUNET_PROGRAM_run (5,
                              argv_prog,
                              "test_plugin_transport_http",
-                             "testcase", options, &run, NULL)) ? fail : 1;
+                             "testcase", options, &run, NULL)) ? GNUNET_YES : 1;
   GNUNET_DISK_directory_remove ("/tmp/test_plugin_transport_http");
 
-  if (0 != PLIBC_KILL (pid, SIGTERM))
-  {
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-    fail = 1;
-  }
-  return fail;
+  return GNUNET_NO;
 }
 
 /* end of test_plugin_transport_http.c */