fix #4546

[oweals/gnunet.git] / src / namecache / gnunet-service-namecache.c

diff --git a/src/namecache/gnunet-service-namecache.c b/src/namecache/gnunet-service-namecache.c
index 832f02b45660e687d90e9fbf4aa1cc5ca9336270..e01dfcdf30b10a4d64abfbb7b42d163d9c4efb04 100644 (file)
--- a/src/namecache/gnunet-service-namecache.c
+++ b/src/namecache/gnunet-service-namecache.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2012, 2013 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2012, 2013 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.
 */
 
 /**
@@ -105,10 +105,9 @@ static struct GNUNET_SERVER_NotificationContext *monitor_nc;
  * Task run during shutdown.
  *
  * @param cls unused
- * @param tc unused
  */
 static void
-cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+cleanup_task (void *cls)
 {
   struct NamecacheClient *nc;
 
@@ -215,7 +214,7 @@ struct LookupBlockContext
  */
 static void
 handle_lookup_block_it (void *cls,
-                       const struct GNUNET_NAMESTORE_Block *block)
+                       const struct GNUNET_GNSRECORD_Block *block)
 {
   struct LookupBlockContext *lnc = cls;
   struct LookupBlockResponseMessage *r;
@@ -316,7 +315,7 @@ handle_block_cache (void *cls,
   struct NamecacheClient *nc;
   const struct BlockCacheMessage *rp_msg;
   struct BlockCacheResponseMessage rpr_msg;
-  struct GNUNET_NAMESTORE_Block *block;
+  struct GNUNET_GNSRECORD_Block *block;
   size_t esize;
   int res;
 
@@ -329,7 +328,7 @@ handle_block_cache (void *cls,
   }
   rp_msg = (const struct BlockCacheMessage *) message;
   esize = ntohs (rp_msg->gns_header.header.size) - sizeof (struct BlockCacheMessage);
-  block = GNUNET_malloc (sizeof (struct GNUNET_NAMESTORE_Block) + esize);
+  block = GNUNET_malloc (sizeof (struct GNUNET_GNSRECORD_Block) + esize);
   block->signature = rp_msg->signature;
   block->derived_key = rp_msg->derived_key;
   block->purpose.size = htonl (sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose) +
@@ -405,8 +404,8 @@ run (void *cls, struct GNUNET_SERVER_Handle *server,
   GNUNET_SERVER_disconnect_notify (server,
                                    &client_disconnect_notification,
                                    NULL);
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &cleanup_task,
-                                NULL);
+  GNUNET_SCHEDULER_add_shutdown (&cleanup_task,
+                                NULL);
 }
 
 
@@ -426,4 +425,3 @@ main (int argc, char *const *argv)
 }
 
 /* end of gnunet-service-namecache.c */
-