trying again to fix test_service timeout on v6 failure

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

diff --git a/src/transport/test_plugin_transport.c b/src/transport/test_plugin_transport.c
index 84c9362e9d1007249433e585ccea1d7e0d231756..1d92588ea2672a56302def669c1758334797e881 100644 (file)
--- a/src/transport/test_plugin_transport.c
+++ b/src/transport/test_plugin_transport.c
@@ -1,6 +1,6 @@
 /*
  This file is part of GNUnet.
- Copyright (C) 2009 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2009 GNUnet e.V.
 
  GNUnet is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 /**
  * @file transport/test_plugin_transport.c
@@ -184,7 +184,7 @@ end ()
 
 
 static void
-end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+end_badly (void *cls)
 {
   struct AddressWrapper *w;
   int c = 0;
@@ -255,7 +255,7 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 }
 
 static void
-wait_end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+wait_end (void *cls)
 {
   timeout_wait = NULL;
   if (0 == addresses_reported)
@@ -285,7 +285,7 @@ end_badly_now ()
 static struct GNUNET_TIME_Relative
 env_receive (void *cls,
              const struct GNUNET_HELLO_Address *address,
-             struct Session *session,
+             struct GNUNET_ATS_Session *session,
              const struct GNUNET_MessageHeader *message)
 {
   /* do nothing */
@@ -325,8 +325,7 @@ address_pretty_printer_cb (void *cls, const char *address, int res)
 
 
 static void
-test_addr_string (void *cls,
-                  const struct GNUNET_SCHEDULER_TaskContext *tc)
+test_addr_string (void *cls)
 {
   struct AddressWrapper *w = cls;
   void *s2a;
@@ -381,7 +380,8 @@ test_addr_string (void *cls,
   {
     GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
                "Plugin creates different address length when converting address->string->address: %u != %u\n",
-               w->address->address_length, s2a_len);
+               (unsigned int) w->address->address_length,
+               (unsigned int) s2a_len);
   }
   else if (0 != memcmp (s2a, w->address->address, s2a_len))
   {
@@ -440,7 +440,7 @@ env_notify_address (void *cls,
     addresses_reported++;
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                "Adding address of length %u\n",
-                address->address_length);
+                (unsigned int) address->address_length);
 
     for (wtmp = head; NULL != wtmp; wtmp = wtmp->next)
     {
@@ -466,7 +466,7 @@ env_notify_address (void *cls,
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Removing address of length %u\n",
-                address->address_length);
+                (unsigned int) address->address_length);
     w = head;
     while (NULL != w)
     {
@@ -520,7 +520,7 @@ env_get_our_hello ()
 static void
 env_session_end (void *cls,
                  const struct GNUNET_HELLO_Address *address,
-                 struct Session *session)
+                 struct GNUNET_ATS_Session *session)
 {
 
 }
@@ -552,7 +552,7 @@ setup_plugin_environment ()
 
 
 static int
-handle_helper_message (void *cls, void *client,
+handle_helper_message (void *cls,
                        const struct GNUNET_MessageHeader *hdr)
 {
   return GNUNET_OK;