more information why nat tests fail

[oweals/gnunet.git] / src / namecache / namecache_api.c

diff --git a/src/namecache/namecache_api.c b/src/namecache/namecache_api.c
index 942272b999b9a55720c20c7e14371783a1bb6eb7..26d80f4bff83b9cdee995882162ce3933a4e3534 100644 (file)
--- a/src/namecache/namecache_api.c
+++ b/src/namecache/namecache_api.c
@@ -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_GNSRECORD_BlockProcessor block_proc;
+  GNUNET_NAMECACHE_BlockProcessor block_proc;
 
   /**
    * Closure for @e block_proc.
@@ -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;
 }
@@ -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_GNSRECORD_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));