wip

[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 7da64e295012550a6f915d7b1a9467d5c47022e3..3c127a9505102d71c3ce5a1611f06125eea4aedd 100644 (file)
--- a/src/transport/test_plugin_transport_http.c
+++ b/src/transport/test_plugin_transport_http.c
@@ -37,7 +37,7 @@
 #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>
@@ -459,10 +459,10 @@ shutdown_clean ()
 
   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();
-  GNUNET_DISK_directory_remove ("/tmp/test_plugin_transport_http");
+  GNUNET_DISK_directory_remove ("/tmp/test_gnunet_transport_plugin_http");
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Exiting testcase\n");
   exit(fail);
@@ -505,13 +505,13 @@ static void run_connection_tests( int phase , void * cls);
  * Recieves messages from plugin, in real world transport
  */
 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)
+receive (void *cls, const struct GNUNET_PeerIdentity *peer,
+        const struct GNUNET_MessageHeader *message,
+        const struct GNUNET_TRANSPORT_ATS_Information *ats,
+        uint32_t ats_count,
+        struct Session *session,
+        const char *sender_address,
+        uint16_t sender_address_len)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testcase recieved new message from peer `%s' with type %u and length %u, session %X\n",  GNUNET_i2s(peer), ntohs(message->type), ntohs(message->size),session);
 
@@ -1159,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;
     }
@@ -1185,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;
     }
@@ -1311,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",
@@ -1322,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
@@ -1333,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 */