X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fnamecache%2Fnamecache_api.c;h=288d53b19d4d563f5df6152ac2b6ba9c3db47e2b;hb=56c021a3748c30b93e4ac3a03b6dc685400960d4;hp=a28ed7d539fe6b99a1d7d86a1cf4cf0aa2a471c4;hpb=6308c2556c54ea8a19b33bfe16bd2f81eae65e86;p=oweals%2Fgnunet.git

diff --git a/src/namecache/namecache_api.c b/src/namecache/namecache_api.c
index a28ed7d53..288d53b19 100644
--- a/src/namecache/namecache_api.c
+++ b/src/namecache/namecache_api.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2010-2013 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2010-2013 Christian Grothoff (and other contributing authors)
 
      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.
 */
 
 /**
@@ -31,10 +31,9 @@
 #include "gnunet_crypto_lib.h"
 #include "gnunet_constants.h"
 #include "gnunet_dnsparser_lib.h"
-#include "gnunet_arm_service.h"
+#include "gnunet_gnsrecord_lib.h"
 #include "gnunet_signatures.h"
 #include "gnunet_namecache_service.h"
-#include "gnunet_namestore_service.h"
 #include "namecache.h"
 
 
@@ -76,7 +75,7 @@ struct GNUNET_NAMECACHE_QueueEntry
   /**
    * Function to call with the blocks we get back; or NULL.
    */
-  GNUNET_NAMESTORE_BlockProcessor block_proc;
+  GNUNET_NAMECACHE_BlockProcessor block_proc;
 
   /**
    * Closure for @e block_proc.
@@ -160,7 +159,7 @@ struct GNUNET_NAMECACHE_Handle
   /**
    * Reconnect task
    */
-  GNUNET_SCHEDULER_TaskIdentifier reconnect_task;
+  struct GNUNET_SCHEDULER_Task * reconnect_task;
 
   /**
    * Delay introduced before we reconnect.
@@ -208,8 +207,8 @@ handle_lookup_block_response (struct GNUNET_NAMECACHE_QueueEntry *qe,
 			      const struct LookupBlockResponseMessage *msg,
 			      size_t size)
 {
-  struct GNUNET_NAMESTORE_Block *block;
-  char buf[size + sizeof (struct GNUNET_NAMESTORE_Block)
+  struct GNUNET_GNSRECORD_Block *block;
+  char buf[size + sizeof (struct GNUNET_GNSRECORD_Block)
 	   - sizeof (struct LookupBlockResponseMessage)];
 
   LOG (GNUNET_ERROR_TYPE_DEBUG,
@@ -223,7 +222,7 @@ handle_lookup_block_response (struct GNUNET_NAMECACHE_QueueEntry *qe,
     return GNUNET_OK;
   }
 
-  block = (struct GNUNET_NAMESTORE_Block *) buf;
+  block = (struct GNUNET_GNSRECORD_Block *) buf;
   block->signature = msg->signature;
   block->derived_key = msg->derived_key;
   block->purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_GNS_RECORD_SIGN);
@@ -235,7 +234,7 @@ handle_lookup_block_response (struct GNUNET_NAMECACHE_QueueEntry *qe,
 	  &msg[1],
 	  size - sizeof (struct LookupBlockResponseMessage));
   if (GNUNET_OK !=
-      GNUNET_NAMESTORE_block_verify (block))
+      GNUNET_GNSRECORD_block_verify (block))
   {
     GNUNET_break (0);
     return GNUNET_SYSERR;
@@ -272,8 +271,8 @@ handle_block_cache_response (struct GNUNET_NAMECACHE_QueueEntry *qe,
   if (NULL != qe->cont)
     qe->cont (qe->cont_cls,
 	      res,
-	      (GNUNET_OK == res) ?
-	      NULL
+	      (GNUNET_OK == res)
+	      ? NULL
 	      : _("Namecache failed to cache block"));
   return GNUNET_OK;
 }
@@ -504,7 +503,7 @@ reconnect_task (void *cls,
 {
   struct GNUNET_NAMECACHE_Handle *h = cls;
 
-  h->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
+  h->reconnect_task = NULL;
   reconnect (h);
 }
 
@@ -602,10 +601,10 @@ GNUNET_NAMECACHE_disconnect (struct GNUNET_NAMECACHE_Handle *h)
     GNUNET_CLIENT_disconnect (h->client);
     h->client = NULL;
   }
-  if (GNUNET_SCHEDULER_NO_TASK != h->reconnect_task)
+  if (NULL != h->reconnect_task)
   {
     GNUNET_SCHEDULER_cancel (h->reconnect_task);
-    h->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
+    h->reconnect_task = NULL;
   }
   GNUNET_free (h);
 }
@@ -623,7 +622,7 @@ GNUNET_NAMECACHE_disconnect (struct GNUNET_NAMECACHE_Handle *h)
  */
 struct GNUNET_NAMECACHE_QueueEntry *
 GNUNET_NAMECACHE_block_cache (struct GNUNET_NAMECACHE_Handle *h,
-			      const struct GNUNET_NAMESTORE_Block *block,
+			      const struct GNUNET_GNSRECORD_Block *block,
 			      GNUNET_NAMECACHE_ContinuationWithStatus cont,
 			      void *cont_cls)
 {
@@ -683,7 +682,7 @@ GNUNET_NAMECACHE_block_cache (struct GNUNET_NAMECACHE_Handle *h,
 struct GNUNET_NAMECACHE_QueueEntry *
 GNUNET_NAMECACHE_lookup_block (struct GNUNET_NAMECACHE_Handle *h,
 			       const struct GNUNET_HashCode *derived_hash,
-			       GNUNET_NAMESTORE_BlockProcessor proc, void *proc_cls)
+			       GNUNET_NAMECACHE_BlockProcessor proc, void *proc_cls)
 {
   struct GNUNET_NAMECACHE_QueueEntry *qe;
   struct PendingMessage *pe;
@@ -691,8 +690,6 @@ GNUNET_NAMECACHE_lookup_block (struct GNUNET_NAMECACHE_Handle *h,
   size_t msg_size;
   uint32_t rid;
 
-  GNUNET_assert (NULL != h);
-  GNUNET_assert (NULL != derived_hash);
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Looking for block under %s\n",
        GNUNET_h2s (derived_hash));