(no commit message)

[oweals/gnunet.git] / src / transport / test_plugin_transport_http.c

diff --git a/src/transport/test_plugin_transport_http.c b/src/transport/test_plugin_transport_http.c
index c192dc08f63e28e2d04a98fc7e1402e36e752aa9..6b6463f1a1ef92d91971935af2a6b3ffb7b03408 100644 (file)
--- a/src/transport/test_plugin_transport_http.c
+++ b/src/transport/test_plugin_transport_http.c
@@ -37,12 +37,10 @@
 #include "gnunet_service_lib.h"
 #include "gnunet_crypto_lib.h"
 
-#include "plugin_transport.h"
+#include "gnunet_transport_plugin.h"
 #include "gnunet_statistics_service.h"
 #include "transport.h"
 #include <curl/curl.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
 
 #define VERBOSE GNUNET_NO
 #define DEBUG_CURL GNUNET_NO
@@ -164,6 +162,10 @@ struct HTTP_Transfer
  */
 struct IPv4HttpAddress
 {
+  struct IPv4HttpAddress * next;
+
+  struct IPv4HttpAddress * prev;
+
   /**
    * IPv4 address, in network byte order.
    */
@@ -182,6 +184,10 @@ struct IPv4HttpAddress
  */
 struct IPv6HttpAddress
 {
+  struct IPv6HttpAddress * next;
+
+  struct IPv6HttpAddress * prev;
+
   /**
    * IPv6 address.
    */
@@ -194,6 +200,7 @@ struct IPv6HttpAddress
 
 };
 
+
 /**
  * Our public key.
  */
@@ -224,11 +231,6 @@ static long long unsigned int port;
  */
 static char * test_addr;
 
-/**
- * Our scheduler.
- */
-struct GNUNET_SCHEDULER_Handle *sched;
-
 /**
  * Our statistics handle.
  */
@@ -439,28 +441,28 @@ shutdown_clean ()
 
   if (ti_send != GNUNET_SCHEDULER_NO_TASK)
   {
-    GNUNET_SCHEDULER_cancel(sched,ti_send);
+    GNUNET_SCHEDULER_cancel(ti_send);
     ti_send = GNUNET_SCHEDULER_NO_TASK;
   }
 
   if (http_task_send != GNUNET_SCHEDULER_NO_TASK)
   {
-    GNUNET_SCHEDULER_cancel(sched,http_task_send);
+    GNUNET_SCHEDULER_cancel(http_task_send);
     http_task_send = GNUNET_SCHEDULER_NO_TASK;
   }
 
   if (ti_timeout != GNUNET_SCHEDULER_NO_TASK)
   {
-    GNUNET_SCHEDULER_cancel(sched,ti_timeout);
+    GNUNET_SCHEDULER_cancel(ti_timeout);
     ti_timeout = GNUNET_SCHEDULER_NO_TASK;
   }
 
   GNUNET_free(test_addr);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Unloading http plugin\n");
-  GNUNET_assert (NULL == GNUNET_PLUGIN_unload ("libgnunet_plugin_transport_http", api));
+  GNUNET_assert (NULL == GNUNET_PLUGIN_unload ("libgnunet_gnunet_transport_plugin_http", api));
 
-  GNUNET_SCHEDULER_shutdown(sched);
-  GNUNET_DISK_directory_remove ("/tmp/test_plugin_transport_http");
+  GNUNET_SCHEDULER_shutdown();
+  GNUNET_DISK_directory_remove ("/tmp/test_gnunet_transport_plugin_http");
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Exiting testcase\n");
   exit(fail);
@@ -774,8 +776,7 @@ static size_t send_prepare( struct HTTP_Transfer * result)
   gws = GNUNET_NETWORK_fdset_create ();
   GNUNET_NETWORK_fdset_copy_native (grs, &rs, max + 1);
   GNUNET_NETWORK_fdset_copy_native (gws, &ws, max + 1);
-  http_task_send = GNUNET_SCHEDULER_add_select (sched,
-                                   GNUNET_SCHEDULER_PRIORITY_DEFAULT,
+  http_task_send = GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT,
                                    GNUNET_SCHEDULER_NO_TASK,
                                    GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 0),
                                    grs,
@@ -857,7 +858,7 @@ notify_address (void *cls,
                 addrlen);
       return;
     }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              _("Transport plugin notification for address: `%s':%u\n"),
              address,
              port);
@@ -900,7 +901,6 @@ static void
 setup_plugin_environment ()
 {
   env.cfg = cfg;
-  env.sched = sched;
   env.stats = stats;
   env.my_identity = &my_identity;
   env.cls = &env;
@@ -1116,17 +1116,14 @@ static void run_connection_tests( int phase , void * cls)
  * 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)
 {
   char * libname;
-  sched = s;
   cfg = c;
   char *keyfile;
   unsigned long long tneigh;
@@ -1162,7 +1159,7 @@ run (void *cls,
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   _("Transport service is lacking key configuration settings.  Exiting.\n"));
-      GNUNET_SCHEDULER_shutdown (s);
+      GNUNET_SCHEDULER_shutdown ();
       fail = 1;
       return;
     }
@@ -1188,7 +1185,7 @@ run (void *cls,
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   _("Transport service could not access hostkey.  Exiting.\n"));
-      GNUNET_SCHEDULER_shutdown (s);
+      GNUNET_SCHEDULER_shutdown ();
       fail = 1;
       return;
     }
@@ -1203,8 +1200,8 @@ run (void *cls,
 
   /* load plugins... */
   setup_plugin_environment ();
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Loading HTTP transport plugin `%s'\n"),"libgnunet_plugin_transport_http");
   GNUNET_asprintf (&libname, "libgnunet_plugin_transport_http");
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Loading HTTP transport plugin `%s'\n"),libname);
   api = GNUNET_PLUGIN_load (libname, &env);
   GNUNET_free (libname);
   if (api == NULL)
@@ -1215,7 +1212,8 @@ run (void *cls,
     return;
   }
 
-  ti_timeout = GNUNET_SCHEDULER_add_delayed (sched, TEST_TIMEOUT, &task_timeout, NULL);
+
+  ti_timeout = GNUNET_SCHEDULER_add_delayed (TEST_TIMEOUT, &task_timeout, NULL);
 
   /* testing plugin functionality */
   GNUNET_assert (0!=fail_notify_address_count);
@@ -1242,12 +1240,7 @@ run (void *cls,
   fail_pretty_printer=GNUNET_NO;
   fail_addr_to_str=GNUNET_NO;
 
-  /* Suggesting addresses with wrong port*/
   struct IPv4HttpAddress failing_addr;
-  failing_addr.ipv4_addr = htonl(INADDR_LOOPBACK);
-  failing_addr.u_port = htons(0);
-  suggest_res = api->check_address (api->cls,&failing_addr,sizeof (struct IPv4HttpAddress));
-  GNUNET_assert (GNUNET_SYSERR == suggest_res);
 
   /* Suggesting addresses with wrong size*/
   failing_addr.ipv4_addr = htonl(INADDR_LOOPBACK);
@@ -1318,7 +1311,7 @@ main (int argc, char *const *argv)
   };
   int ret;
   char *const argv_prog[] = {
-    "test_plugin_transport_http",
+    "test_gnunet_transport_plugin_http",
     "-c",
     "test_plugin_transport_data_http.conf",
     "-L",
@@ -1329,7 +1322,7 @@ main (int argc, char *const *argv)
 #endif
     NULL
   };
-  GNUNET_log_setup ("test_plugin_transport_http",
+  GNUNET_log_setup ("test_gnunet_transport_plugin_http",
 #if VERBOSE
                     "DEBUG",
 #else
@@ -1340,12 +1333,12 @@ main (int argc, char *const *argv)
   ret = (GNUNET_OK ==
          GNUNET_PROGRAM_run (5,
                              argv_prog,
-                             "test_plugin_transport_http",
+                             "test_gnunet_transport_plugin_http",
                              "testcase", options, &run, NULL)) ? GNUNET_NO : GNUNET_YES;
 
-    GNUNET_DISK_directory_remove ("/tmp/test_plugin_transport_http");
+  GNUNET_DISK_directory_remove ("/tmp/test_gnunet_transport_plugin_http");
 
   return fail;
 }
 
-/* end of test_plugin_transport_http.c */
+/* end of test_gnunet_transport_plugin_http.c */