fixing compilation issues

2 files changed, 25 insertions, 86 deletions

diff --git a/src/transport/test_plugin_transport.c b/src/transport/test_plugin_transport.c
index 407150d3a..2248f007e 100644
--- a/src/transport/test_plugin_transport.c
+++ b/src/transport/test_plugin_transport.c
@@ -94,10 +94,11 @@ static int ok;
  */
 static void
 receive (void *cls,
-         struct GNUNET_TIME_Relative
-         latency,
          const struct GNUNET_PeerIdentity
-         *peer, const struct GNUNET_MessageHeader *message)
+         *peer, const struct GNUNET_MessageHeader *message,
+         uint32_t distance,
+         const char *sender_address,
+         size_t sender_address_len)
 {
   /* do nothing */
 }
@@ -137,43 +138,6 @@ unload_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 }
 
 
-static GNUNET_SCHEDULER_TaskIdentifier validation_timeout_task;
-
-
-static void
-validation_notification (void *cls,
-                         const char *name,
-                         const struct GNUNET_PeerIdentity *peer,
-                         uint32_t challenge, const char *sender_addr)
-{
-  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);
-
-  ok = 0;                       /* if the last test succeeded, report success */
-  GNUNET_SCHEDULER_add_continuation (sched,
-                                     &unload_task,
-                                     (void *) cfg,
-                                     GNUNET_SCHEDULER_REASON_PREREQ_DONE);
-}
-
-
-static void
-validation_failed (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  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
@@ -185,9 +149,10 @@ validation_failed (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  *  work for other plugins; we should ask
  *  the plugin about its address instead...).
  */
-/* FIXME: won't work on IPv6 enabled systems where IPv4 mapping
- * isn't enabled (eg. FreeBSD > 4)
- */
+/* FIXME: this is TCP/UDP-specific and won't work
+   for HTTP/SMTP/DV; we should instead use an
+   address that we get from the plugin itself
+   (if it is willing/able to give us one...) */
 static void
 test_validation ()
 {
@@ -200,11 +165,14 @@ test_validation ()
   soaddr.sin_family = AF_INET;
   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, TIMEOUT, &validation_failed, NULL);
+  GNUNET_assert (GNUNET_OK ==
+                 api->check_address (api->cls,
+                                     &soaddr, sizeof (soaddr)));
+  ok = 0;
+  GNUNET_SCHEDULER_add_continuation (sched,
+                                     &unload_task,
+                                     (void *) cfg,
+                                     GNUNET_SCHEDULER_REASON_PREREQ_DONE);
 }
 
 
@@ -213,13 +181,10 @@ setup_plugin_environment ()
 {
   env.cfg = cfg;
   env.sched = sched;
-  env.my_public_key = &my_public_key;
-  env.my_private_key = my_private_key;
   env.my_identity = &my_identity;
   env.cls = &env;
   env.receive = &receive;
   env.notify_address = &notify_address;
-  env.notify_validation = &validation_notification;
   env.max_connections = max_connect_per_transport;
 }
 
diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c
index 7ce02c757..8cf8daf5e 100644
--- a/src/transport/test_transport_api.c
+++ b/src/transport/test_transport_api.c
@@ -84,20 +84,12 @@ end ()
 }
 
 
-/**
- * Function called by the transport for each received message.
- *
- * @param cls closure
- * @param latency estimated latency for communicating with the
- *             given peer
- * @param peer (claimed) identity of the other peer
- * @param message the message
- */
 static void
 notify_receive (void *cls,
-                struct GNUNET_TIME_Relative latency,
                 const struct GNUNET_PeerIdentity *peer,
-                const struct GNUNET_MessageHeader *message)
+                const struct GNUNET_MessageHeader *message,
+                struct GNUNET_TIME_Relative latency,
+                uint32_t distance)
 {
   GNUNET_assert (ok == 7);
   OKPP;
@@ -110,19 +102,11 @@ notify_receive (void *cls,
 }
 
 
-/**
- * Function called to notify transport users that another
- * peer connected to us.
- *
- * @param cls closure
- * @param transport the transport service handle
- * @param peer the peer that disconnected
- * @param latency current latency of the connection
- */
 static void
 notify_connect (void *cls,
                 const struct GNUNET_PeerIdentity *peer,
-                struct GNUNET_TIME_Relative latency)
+                struct GNUNET_TIME_Relative latency,
+                uint32_t distance)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Peer `%4s' connected to us (%p)!\n", GNUNET_i2s (peer), cls);
@@ -131,14 +115,6 @@ notify_connect (void *cls,
 }
 
 
-/**
- * Function called to notify transport users that another
- * peer disconnected from us.
- *
- * @param cls closure
- * @param transport the transport service handle
- * @param peer the peer that disconnected
- */
 static void
 notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
 {
@@ -187,12 +163,11 @@ notify_ready (void *cls, size_t size, void *buf)
 
 static void
 exchange_hello_last (void *cls,
-                     struct GNUNET_TIME_Relative latency,
-                     const struct GNUNET_PeerIdentity *peer,
                      const struct GNUNET_MessageHeader *message)
 {
   struct PeerContext *me = cls;
 
+  GNUNET_TRANSPORT_get_hello (p2.th, &exchange_hello_last, me);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Exchanging HELLO with peer (%p)!\n", cls);
   GNUNET_assert (ok >= 3);
@@ -214,12 +189,11 @@ exchange_hello_last (void *cls,
 
 static void
 exchange_hello (void *cls,
-                struct GNUNET_TIME_Relative latency,
-                const struct GNUNET_PeerIdentity *peer,
                 const struct GNUNET_MessageHeader *message)
 {
   struct PeerContext *me = cls;
 
+  GNUNET_TRANSPORT_get_hello_cancel (p1.th, &exchange_hello, me);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Exchanging HELLO with peer (%p)!\n", cls);
   GNUNET_assert (ok >= 2);
@@ -228,7 +202,7 @@ exchange_hello (void *cls,
   GNUNET_assert (GNUNET_OK ==
                  GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *)
                                       message, &me->id));
-  GNUNET_TRANSPORT_get_hello (p2.th, TIMEOUT, &exchange_hello_last, &p2);
+  GNUNET_TRANSPORT_get_hello (p2.th, &exchange_hello_last, &p2);
 }
 
 static void
@@ -272,7 +246,7 @@ run (void *cls,
 
   setup_peer (&p1, "test_transport_api_peer1.conf");
   setup_peer (&p2, "test_transport_api_peer2.conf");
-  GNUNET_TRANSPORT_get_hello (p1.th, TIMEOUT, &exchange_hello, &p1);
+  GNUNET_TRANSPORT_get_hello (p1.th, &exchange_hello, &p1);
 }