include element type in hash

[oweals/gnunet.git] / src / core / test_core_api_send_to_self.c

diff --git a/src/core/test_core_api_send_to_self.c b/src/core/test_core_api_send_to_self.c
index c56e227e5741418003b4ffcedc92e415307b62b3..4b1a94ceaa370dac276553ff3518f224abdfe1dc 100644 (file)
--- a/src/core/test_core_api_send_to_self.c
+++ b/src/core/test_core_api_send_to_self.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2010 Christian Grothoff
+     Copyright (C) 2010 Christian Grothoff
 
      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.
 */
 
 /**
@@ -38,7 +38,7 @@ static int ret;
 /**
  * Handle to the cleanup task.
  */
-GNUNET_SCHEDULER_TaskIdentifier die_task;
+struct GNUNET_SCHEDULER_Task * die_task;
 
 /**
  * Identity of this peer.
@@ -57,7 +57,7 @@ struct GNUNET_CORE_Handle *core;
 static void
 cleanup (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tskctx)
 {
-  die_task = GNUNET_SCHEDULER_NO_TASK;
+  die_task = NULL;
 
   if (core != NULL)
   {
@@ -71,10 +71,9 @@ cleanup (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tskctx)
 
 static int
 receive (void *cls, const struct GNUNET_PeerIdentity *other,
-         const struct GNUNET_MessageHeader *message,
-         const struct GNUNET_ATS_Information *atsi, unsigned int atsi_count)
+         const struct GNUNET_MessageHeader *message)
 {
-  if (die_task != GNUNET_SCHEDULER_NO_TASK)
+  if (die_task != NULL)
     GNUNET_SCHEDULER_cancel (die_task);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received message from peer %s\n",
               GNUNET_i2s (other));
@@ -104,12 +103,12 @@ send_message (void *cls, size_t size, void *buf)
 
 
 static void
-init (void *cls, struct GNUNET_CORE_Handle *core,
+init (void *cls,
       const struct GNUNET_PeerIdentity *my_identity)
 {
-  if (core == NULL)
+  if (NULL == my_identity)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Could NOT connect to CORE;\n");
+    GNUNET_break (0);
     return;
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -120,8 +119,7 @@ init (void *cls, struct GNUNET_CORE_Handle *core,
 
 
 static void
-connect_cb (void *cls, const struct GNUNET_PeerIdentity *peer,
-            const struct GNUNET_ATS_Information *atsi, unsigned int atsi_count)
+connect_cb (void *cls, const struct GNUNET_PeerIdentity *peer)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connected to peer %s.\n",
               GNUNET_i2s (peer));
@@ -154,7 +152,7 @@ run (void *cls,
   };
   core =
     GNUNET_CORE_connect (cfg, NULL, &init, &connect_cb, NULL, NULL,
-                        0, NULL, 0, handlers); 
+                        0, NULL, 0, handlers);
   die_task =
       GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
                                     (GNUNET_TIME_UNIT_SECONDS, 300), &cleanup,