9 files changed, 1494 insertions, 0 deletions

diff --git a/src/service/namecache/.gitignore b/src/service/namecache/.gitignore
new file mode 100644
index 000000000..280bf9f39
--- /dev/null
+++ b/src/service/namecache/.gitignore
@@ -0,0 +1,6 @@
+gnunet-service-namecache
+test_namecache_api_cache_block
+test_plugin_namecache_postgres
+test_plugin_namecache_sqlite
+zonefiles
+test_plugin_namecache_flat
diff --git a/src/service/namecache/Makefile.am b/src/service/namecache/Makefile.am
new file mode 100644
index 000000000..7a8305491
--- /dev/null
+++ b/src/service/namecache/Makefile.am
@@ -0,0 +1,76 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include $(POSTGRESQL_CPPFLAGS)
+
+plugindir = $(libdir)/gnunet
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+pkgcfg_DATA = \
+   namecache.conf
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+  XLIBS = -lgcov
+endif
+
+# testcases do not even build yet; thus: experimental!
+TESTING_TESTS = \
+ test_namecache_api_cache_block
+
+if HAVE_SQLITE
+#check_PROGRAMS = \
+# $(TESTING_TESTS)
+endif
+
+if ENABLE_TEST_RUN
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
+TESTS = \
+  $(check_PROGRAMS)
+endif
+
+lib_LTLIBRARIES = \
+  libgnunetnamecache.la
+
+
+libgnunetnamecache_la_SOURCES = \
+  namecache_api.c \
+  namecache.h
+libgnunetnamecache_la_LIBADD = \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(GN_LIBINTL)
+libgnunetnamecache_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS)  \
+  -version-info 0:0:0
+
+
+libexec_PROGRAMS = \
+ gnunet-service-namecache
+
+gnunet_service_namecache_SOURCES = \
+ gnunet-service-namecache.c
+
+gnunet_service_namecache_LDADD = \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  libgnunetnamecache.la \
+  $(GN_LIBINTL)
+
+
+test_namecache_api_cache_block_SOURCES = \
+ test_namecache_api_cache_block.c
+test_namecache_api_cache_block_LDADD = \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  libgnunetnamecache.la \
+  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la
+
+
+EXTRA_DIST = \
+  test_namecache_api.conf
diff --git a/src/service/namecache/gnunet-service-namecache.c b/src/service/namecache/gnunet-service-namecache.c
new file mode 100644
index 000000000..dce843801
--- /dev/null
+++ b/src/service/namecache/gnunet-service-namecache.c
@@ -0,0 +1,390 @@
+/*
+     This file is part of GNUnet.
+     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 Affero General Public License as published
+     by the Free Software Foundation, either version 3 of the License,
+     or (at your option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Affero General Public License for more details.
+
+     You should have received a copy of the GNU Affero General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
+
+/**
+ * @file namecache/gnunet-service-namecache.c
+ * @brief namecache for the GNUnet naming system
+ * @author Matthias Wachs
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_statistics_service.h"
+#include "gnunet_namecache_service.h"
+#include "gnunet_namecache_plugin.h"
+#include "gnunet_signatures.h"
+#include "namecache.h"
+
+#define LOG_STRERROR_FILE(kind, syscall, \
+                          filename) GNUNET_log_from_strerror_file (kind, "util", \
+                                                                   syscall, \
+                                                                   filename)
+
+
+/**
+ * A namecache client
+ */
+struct NamecacheClient
+{
+  /**
+   * The client
+   */
+  struct GNUNET_SERVICE_Client *client;
+
+  /**
+   * The message queue to talk to @e client.
+   */
+  struct GNUNET_MQ_Handle *mq;
+};
+
+
+/**
+ * Configuration handle.
+ */
+static const struct GNUNET_CONFIGURATION_Handle *GSN_cfg;
+
+/**
+ * Handle to the statistics service
+ */
+static struct GNUNET_STATISTICS_Handle *statistics;
+
+/**
+ * Database handle
+ */
+static struct GNUNET_NAMECACHE_PluginFunctions *GSN_database;
+
+/**
+ * Name of the database plugin
+ */
+static char *db_lib_name;
+
+
+/**
+ * Task run during shutdown.
+ *
+ * @param cls unused
+ */
+static void
+cleanup_task (void *cls)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Stopping namecache service\n");
+  GNUNET_break (NULL ==
+                GNUNET_PLUGIN_unload (db_lib_name,
+                                      GSN_database));
+  GNUNET_free (db_lib_name);
+  db_lib_name = NULL;
+  if (NULL != statistics)
+  {
+    GNUNET_STATISTICS_destroy (statistics,
+                               GNUNET_NO);
+    statistics = NULL;
+  }
+}
+
+
+/**
+ * Called whenever a client is disconnected.
+ * Frees our resources associated with that client.
+ *
+ * @param cls closure
+ * @param client identification of the client
+ * @param app_ctx the `struct NamecacheClient` for this @a client
+ */
+static void
+client_disconnect_cb (void *cls,
+                      struct GNUNET_SERVICE_Client *client,
+                      void *app_ctx)
+{
+  struct NamecacheClient *nc = app_ctx;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Client %p disconnected\n",
+              client);
+  GNUNET_free (nc);
+}
+
+
+/**
+ * Add a client to our list of active clients.
+ *
+ * @param cls NULL
+ * @param client client to add
+ * @param mq queue to talk to @a client
+ * @return internal namecache client structure for this client
+ */
+static void *
+client_connect_cb (void *cls,
+                   struct GNUNET_SERVICE_Client *client,
+                   struct GNUNET_MQ_Handle *mq)
+{
+  struct NamecacheClient *nc;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Client %p connected\n",
+              client);
+  nc = GNUNET_new (struct NamecacheClient);
+  nc->client = client;
+  nc->mq = mq;
+  return nc;
+}
+
+
+/**
+ * Context for name lookups passed from #handle_lookup_block to
+ * #handle_lookup_block_it as closure
+ */
+struct LookupBlockContext
+{
+  /**
+   * The client to send the response to
+   */
+  struct NamecacheClient *nc;
+
+  /**
+   * Operation id for the name lookup
+   */
+  uint32_t request_id;
+
+  /**
+   * Lookup status
+   */
+  int status;
+};
+
+
+/**
+ * A #GNUNET_NAMECACHE_BlockCallback for name lookups in #handle_lookup_block
+ *
+ * @param cls a `struct LookupNameContext *` with information about the request
+ * @param block the block
+ */
+static void
+handle_lookup_block_it (void *cls,
+                        const struct GNUNET_GNSRECORD_Block *block)
+{
+  struct LookupBlockContext *lnc = cls;
+  struct GNUNET_MQ_Envelope *env;
+  struct LookupBlockResponseMessage *r;
+  size_t bsize;
+
+  bsize = GNUNET_GNSRECORD_block_get_size (block);
+  env = GNUNET_MQ_msg_extra (r,
+                             bsize,
+                             GNUNET_MESSAGE_TYPE_NAMECACHE_LOOKUP_BLOCK_RESPONSE);
+  r->gns_header.r_id = htonl (lnc->request_id);
+  GNUNET_memcpy (&r[1],
+                 block,
+                 bsize);
+  GNUNET_STATISTICS_update (statistics,
+                            "blocks found in cache",
+                            1,
+                            GNUNET_NO);
+  r->expire = GNUNET_TIME_absolute_hton (
+    GNUNET_GNSRECORD_block_get_expiration (block));
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Sending NAMECACHE_LOOKUP_BLOCK_RESPONSE message\n");
+  GNUNET_MQ_send (lnc->nc->mq,
+                  env);
+}
+
+
+/**
+ * Handles a #GNUNET_MESSAGE_TYPE_NAMECACHE_LOOKUP_BLOCK message
+ *
+ * @param cls a `struct NamecacheClient *`
+ * @param ln_msg the inbound message
+ */
+static void
+handle_lookup_block (void *cls,
+                     const struct LookupBlockMessage *ln_msg)
+{
+  struct NamecacheClient *nc = cls;
+  struct GNUNET_MQ_Envelope *env;
+  struct LookupBlockContext lnc;
+  struct LookupBlockResponseMessage *zir_end;
+  int ret;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Received NAMECACHE_LOOKUP_BLOCK message\n");
+  GNUNET_STATISTICS_update (statistics,
+                            "blocks looked up",
+                            1,
+                            GNUNET_NO);
+  lnc.request_id = ntohl (ln_msg->gns_header.r_id);
+  lnc.nc = nc;
+  lnc.status = GNUNET_OK;
+  if (GNUNET_SYSERR ==
+      (ret = GSN_database->lookup_block (GSN_database->cls,
+                                         &ln_msg->query,
+                                         &handle_lookup_block_it,
+                                         &lnc)))
+  {
+    /* internal error (in database plugin); might be best to just hang up on
+       plugin rather than to signal that there are 'no' results, which
+       might also be false... */
+    GNUNET_break (0);
+    GNUNET_SERVICE_client_drop (nc->client);
+    return;
+  }
+  if ((0 == ret) || (GNUNET_SYSERR == lnc.status))
+  {
+    /* no records match at all, generate empty response */
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Sending empty NAMECACHE_LOOKUP_BLOCK_RESPONSE message\n");
+    env = GNUNET_MQ_msg (zir_end,
+                         GNUNET_MESSAGE_TYPE_NAMECACHE_LOOKUP_BLOCK_RESPONSE);
+    zir_end->gns_header.r_id = ln_msg->gns_header.r_id;
+    GNUNET_MQ_send (nc->mq,
+                    env);
+  }
+  GNUNET_SERVICE_client_continue (nc->client);
+}
+
+
+/**
+ * Check a #GNUNET_MESSAGE_TYPE_NAMECACHE_BLOCK_CACHE message
+ *
+ * @param cls our `struct NamecacheClient`
+ * @param rp_msg message to process
+ * @return #GNUNET_OK (always fine)
+ */
+static int
+check_block_cache (void *cls,
+                   const struct BlockCacheMessage *rp_msg)
+{
+  return GNUNET_OK;
+}
+
+
+/**
+ * Handles a #GNUNET_MESSAGE_TYPE_NAMECACHE_BLOCK_CACHE message
+ *
+ * @param cls our `struct NamecacheClient`
+ * @param rp_msg message to process
+ */
+static void
+handle_block_cache (void *cls,
+                    const struct BlockCacheMessage *rp_msg)
+{
+  struct NamecacheClient *nc = cls;
+  struct GNUNET_MQ_Envelope *env;
+  struct BlockCacheResponseMessage *rpr_msg;
+  struct GNUNET_GNSRECORD_Block *block;
+  size_t esize;
+  int res;
+
+  GNUNET_STATISTICS_update (statistics,
+                            "blocks cached",
+                            1,
+                            GNUNET_NO);
+  esize = ntohs (rp_msg->gns_header.header.size) - sizeof(struct
+                                                          BlockCacheMessage);
+  block = GNUNET_malloc (esize);
+  memcpy (block, &rp_msg[1], esize);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Received NAMECACHE_BLOCK_CACHE message with type %u\n",
+              htonl (block->type));
+  res = GSN_database->cache_block (GSN_database->cls,
+                                   block);
+  GNUNET_free (block);
+  env = GNUNET_MQ_msg (rpr_msg,
+                       GNUNET_MESSAGE_TYPE_NAMECACHE_BLOCK_CACHE_RESPONSE);
+  rpr_msg->gns_header.r_id = rp_msg->gns_header.r_id;
+  rpr_msg->op_result = htonl (res);
+  GNUNET_MQ_send (nc->mq,
+                  env);
+  GNUNET_SERVICE_client_continue (nc->client);
+}
+
+
+/**
+ * Process namecache requests.
+ *
+ * @param cls closure
+ * @param cfg configuration to use
+ * @param service the initialized service
+ */
+static void
+run (void *cls,
+     const struct GNUNET_CONFIGURATION_Handle *cfg,
+     struct GNUNET_SERVICE_Handle *service)
+{
+  char *database;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Starting namecache service\n");
+  GSN_cfg = cfg;
+
+  /* Loading database plugin */
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (cfg,
+                                             "namecache",
+                                             "database",
+                                             &database))
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "No database backend configured\n");
+
+  GNUNET_asprintf (&db_lib_name,
+                   "libgnunet_plugin_namecache_%s",
+                   database);
+  GSN_database = GNUNET_PLUGIN_load (db_lib_name,
+                                     (void *) GSN_cfg);
+  GNUNET_free (database);
+  if (NULL == GSN_database)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Could not load database backend `%s'\n",
+                db_lib_name);
+    GNUNET_SCHEDULER_add_now (&cleanup_task,
+                              NULL);
+    return;
+  }
+  statistics = GNUNET_STATISTICS_create ("namecache",
+                                         cfg);
+
+  /* Configuring server handles */
+  GNUNET_SCHEDULER_add_shutdown (&cleanup_task,
+                                 NULL);
+}
+
+
+/**
+ * Define "main" method using service macro.
+ */
+GNUNET_SERVICE_MAIN
+  ("namecache",
+  GNUNET_SERVICE_OPTION_NONE,
+  &run,
+  &client_connect_cb,
+  &client_disconnect_cb,
+  NULL,
+  GNUNET_MQ_hd_fixed_size (lookup_block,
+                           GNUNET_MESSAGE_TYPE_NAMECACHE_LOOKUP_BLOCK,
+                           struct LookupBlockMessage,
+                           NULL),
+  GNUNET_MQ_hd_var_size (block_cache,
+                         GNUNET_MESSAGE_TYPE_NAMECACHE_BLOCK_CACHE,
+                         struct BlockCacheMessage,
+                         NULL),
+  GNUNET_MQ_handler_end ());
+
+
+/* end of gnunet-service-namecache.c */
diff --git a/src/service/namecache/meson.build b/src/service/namecache/meson.build
new file mode 100644
index 000000000..72dafcd9d
--- /dev/null
+++ b/src/service/namecache/meson.build
@@ -0,0 +1,41 @@
+libgnunetnamecache_src = ['namecache_api.c']
+
+gnunetnamecache_src = ['gnunet-namecache.c']
+gnunetservicenamecache_src = ['gnunet-service-namecache.c']
+
+configure_file(input : 'namecache.conf.in',
+               output : 'namecache.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
+
+
+if get_option('monolith')
+  foreach p : libgnunetnamecache_src + gnunetservicenamecache_src
+    gnunet_src += 'namecache/' + p
+  endforeach
+endif
+
+libgnunetnamecache = library('gnunetnamecache',
+        libgnunetnamecache_src,
+        soversion: '0',
+        version: '0.0.0',
+        dependencies: [libgnunetutil_dep,
+                       libgnunetgnsrecord_dep],
+        include_directories: [incdir, configuration_inc],
+        install: true,
+        install_dir: get_option('libdir'))
+libgnunetnamecache_dep = declare_dependency(link_with : libgnunetnamecache)
+pkg.generate(libgnunetnamecache, url: 'https://www.gnunet.org',
+             description : 'Provides API for storing GNS records to a cache')
+
+executable ('gnunet-service-namecache',
+            gnunetservicenamecache_src,
+            dependencies: [libgnunetnamecache_dep,
+                           libgnunetutil_dep,
+                           libgnunetgnsrecord_dep,
+                           libgnunetstatistics_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('libdir')/'gnunet'/'libexec')
+
diff --git a/src/service/namecache/namecache.conf.in b/src/service/namecache/namecache.conf.in
new file mode 100644
index 000000000..6bf75454b
--- /dev/null
+++ b/src/service/namecache/namecache.conf.in
@@ -0,0 +1,29 @@
+[namecache]
+START_ON_DEMAND = @START_ON_DEMAND@
+RUN_PER_USER = NO
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-namecache.sock
+UNIX_MATCH_UID = NO
+UNIX_MATCH_GID = YES
+@UNIXONLY@ PORT = 2113
+HOSTNAME = localhost
+BINARY = gnunet-service-namecache
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+DATABASE = sqlite
+
+# Disables use of caching by GNS. Useful for systems that
+# publish very large zones and are CPU bound, if they do not
+# also do a large number of lookups.
+DISABLE = NO
+
+[namecache-sqlite]
+FILENAME = $GNUNET_DATA_HOME/namecache/sqlite.db
+
+[namecache-flat]
+FILENAME = $GNUNET_DATA_HOME/namecache/flat.db
+
+[namecache-postgres]
+CONFIG = postgres:///gnunet
+SQL_DIR = ${DATADIR}/sql/
+
+
diff --git a/src/service/namecache/namecache.h b/src/service/namecache/namecache.h
new file mode 100644
index 000000000..cb4d1bcdd
--- /dev/null
+++ b/src/service/namecache/namecache.h
@@ -0,0 +1,131 @@
+/*
+     This file is part of GNUnet.
+     Copyright (C) 2011-2013 GNUnet e.V.
+
+     GNUnet is free software: you can redistribute it and/or modify it
+     under the terms of the GNU Affero General Public License as published
+     by the Free Software Foundation, either version 3 of the License,
+     or (at your option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Affero General Public License for more details.
+
+     You should have received a copy of the GNU Affero General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
+
+/**
+ * @file namecache/namecache.h
+ * @brief common internal definitions for namecache service
+ * @author Matthias Wachs
+ * @author Christian Grothoff
+ */
+#ifndef NAMECACHE_H
+#define NAMECACHE_H
+
+/**
+ * Maximum length of any name, including 0-termination.
+ */
+#define MAX_NAME_LEN 256
+
+GNUNET_NETWORK_STRUCT_BEGIN
+
+/**
+ * Generic namecache message with op id
+ */
+struct GNUNET_NAMECACHE_Header
+{
+  /**
+   * header.type will be GNUNET_MESSAGE_TYPE_NAMECACHE_*
+   * header.size will be message size
+   */
+  struct GNUNET_MessageHeader header;
+
+  /**
+   * Request ID in NBO
+   */
+  uint32_t r_id GNUNET_PACKED;
+};
+
+
+/**
+ * Lookup a block in the namecache
+ */
+struct LookupBlockMessage
+{
+  /**
+   * Type will be #GNUNET_MESSAGE_TYPE_NAMECACHE_LOOKUP_BLOCK
+   */
+  struct GNUNET_NAMECACHE_Header gns_header;
+
+  /**
+   * The query.
+   */
+  struct GNUNET_HashCode query GNUNET_PACKED;
+};
+
+
+/**
+ * Lookup response
+ */
+struct LookupBlockResponseMessage
+{
+  /**
+   * Type will be #GNUNET_MESSAGE_TYPE_NAMECACHE_LOOKUP_BLOCK_RESPONSE
+   */
+  struct GNUNET_NAMECACHE_Header gns_header;
+
+  /**
+   * Expiration time
+   */
+  struct GNUNET_TIME_AbsoluteNBO expire;
+
+  /* followed by encrypted block data */
+};
+
+
+/**
+ * Cache a record in the namecache.
+ */
+struct BlockCacheMessage
+{
+  /**
+   * Type will be #GNUNET_MESSAGE_TYPE_NAMECACHE_BLOCK_CACHE
+   */
+  struct GNUNET_NAMECACHE_Header gns_header;
+
+  /**
+   * Expiration time
+   */
+  struct GNUNET_TIME_AbsoluteNBO expire;
+
+  /* followed by encrypted block data */
+};
+
+
+/**
+ * Response to a request to cache a block.
+ */
+struct BlockCacheResponseMessage
+{
+  /**
+   * Type will be #GNUNET_MESSAGE_TYPE_NAMECACHE_BLOCK_CACHE_RESPONSE
+   */
+  struct GNUNET_NAMECACHE_Header gns_header;
+
+  /**
+   * #GNUNET_OK on success, #GNUNET_SYSERR error
+   */
+  int32_t op_result GNUNET_PACKED;
+};
+
+
+GNUNET_NETWORK_STRUCT_END
+
+
+/* end of namecache.h */
+#endif
diff --git a/src/service/namecache/namecache_api.c b/src/service/namecache/namecache_api.c
new file mode 100644
index 000000000..fb4b0e304
--- /dev/null
+++ b/src/service/namecache/namecache_api.c
@@ -0,0 +1,564 @@
+/*
+     This file is part of GNUnet.
+     Copyright (C) 2010-2013, 2016 GNUnet e.V.
+
+     GNUnet is free software: you can redistribute it and/or modify it
+     under the terms of the GNU Affero General Public License as published
+     by the Free Software Foundation, either version 3 of the License,
+     or (at your option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Affero General Public License for more details.
+
+     You should have received a copy of the GNU Affero General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
+
+/**
+ * @file namecache/namecache_api.c
+ * @brief API to access the NAMECACHE service
+ * @author Martin Schanzenbach
+ * @author Matthias Wachs
+ * @author Christian Grothoff
+ */
+
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_constants.h"
+#include "gnunet_gnsrecord_lib.h"
+#include "gnunet_signatures.h"
+#include "gnunet_namecache_service.h"
+#include "namecache.h"
+
+
+#define LOG(kind, ...) GNUNET_log_from (kind, "namecache-api", __VA_ARGS__)
+
+
+/**
+ * An QueueEntry used to store information for a pending
+ * NAMECACHE record operation
+ */
+struct GNUNET_NAMECACHE_QueueEntry
+{
+  /**
+   * Kept in a DLL.
+   */
+  struct GNUNET_NAMECACHE_QueueEntry *next;
+
+  /**
+   * Kept in a DLL.
+   */
+  struct GNUNET_NAMECACHE_QueueEntry *prev;
+
+  /**
+   * Main handle to access the namecache.
+   */
+  struct GNUNET_NAMECACHE_Handle *nsh;
+
+  /**
+   * Continuation to call
+   */
+  GNUNET_NAMECACHE_ContinuationWithStatus cont;
+
+  /**
+   * Closure for @e cont.
+   */
+  void *cont_cls;
+
+  /**
+   * Function to call with the blocks we get back; or NULL.
+   */
+  GNUNET_NAMECACHE_BlockProcessor block_proc;
+
+  /**
+   * Closure for @e block_proc.
+   */
+  void *block_proc_cls;
+
+  /**
+   * The operation id this zone iteration operation has
+   */
+  uint32_t op_id;
+};
+
+
+/**
+ * Connection to the NAMECACHE service.
+ */
+struct GNUNET_NAMECACHE_Handle
+{
+  /**
+   * Configuration to use.
+   */
+  const struct GNUNET_CONFIGURATION_Handle *cfg;
+
+  /**
+   * Message queue to service.
+   */
+  struct GNUNET_MQ_Handle *mq;
+
+  /**
+   * Currently pending transmission request (or NULL).
+   */
+  struct GNUNET_CLIENT_TransmitHandle *th;
+
+  /**
+   * Head of pending namecache queue entries
+   */
+  struct GNUNET_NAMECACHE_QueueEntry *op_head;
+
+  /**
+   * Tail of pending namecache queue entries
+   */
+  struct GNUNET_NAMECACHE_QueueEntry *op_tail;
+
+  /**
+   * Reconnect task
+   */
+  struct GNUNET_SCHEDULER_Task *reconnect_task;
+
+  /**
+   * Delay introduced before we reconnect.
+   */
+  struct GNUNET_TIME_Relative reconnect_delay;
+
+  /**
+   * Should we reconnect to service due to some serious error?
+   */
+  int reconnect;
+
+  /**
+   * The last operation id used for a NAMECACHE operation
+   */
+  uint32_t last_op_id_used;
+};
+
+
+/**
+ * Disconnect from service and then reconnect.
+ *
+ * @param h our handle
+ */
+static void
+force_reconnect (struct GNUNET_NAMECACHE_Handle *h);
+
+
+/**
+ * Find queue entry for the given @a rid.
+ *
+ * @param h handle to search
+ * @param rid request ID to look for
+ * @return NULL if not found, otherwise the queue entry (removed from the queue)
+ */
+static struct GNUNET_NAMECACHE_QueueEntry *
+find_qe (struct GNUNET_NAMECACHE_Handle *h,
+         uint32_t rid)
+{
+  struct GNUNET_NAMECACHE_QueueEntry *qe;
+
+  for (qe = h->op_head; qe != NULL; qe = qe->next)
+  {
+    if (qe->op_id == rid)
+    {
+      GNUNET_CONTAINER_DLL_remove (h->op_head,
+                                   h->op_tail,
+                                   qe);
+      return qe;
+    }
+  }
+  return NULL;
+}
+
+
+/**
+ * Handle an incoming message of type
+ * #GNUNET_MESSAGE_TYPE_NAMECACHE_LOOKUP_BLOCK_RESPONSE.
+ *
+ * @param cls the `struct GNUNET_NAMECACHE_Handle`
+ * @param msg the message we received
+ */
+static int
+check_lookup_block_response (void *cls,
+                             const struct LookupBlockResponseMessage *msg)
+{
+  /* any length will do, format validation is in handler */
+  return GNUNET_OK;
+}
+
+
+/**
+ * Handle an incoming message of type
+ * #GNUNET_MESSAGE_TYPE_NAMECACHE_LOOKUP_BLOCK_RESPONSE.
+ *
+ * @param cls the `struct GNUNET_NAMECACHE_Handle`
+ * @param msg the message we received
+ */
+static void
+handle_lookup_block_response (void *cls,
+                              const struct LookupBlockResponseMessage *msg)
+{
+  struct GNUNET_NAMECACHE_Handle *h = cls;
+  size_t size;
+  struct GNUNET_NAMECACHE_QueueEntry *qe;
+
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Received LOOKUP_BLOCK_RESPONSE\n");
+  qe = find_qe (h,
+                ntohl (msg->gns_header.r_id));
+  if (NULL == qe)
+    return;
+  if (0 == GNUNET_TIME_absolute_ntoh (msg->expire).abs_value_us)
+  {
+    /* no match found */
+    if (NULL != qe->block_proc)
+      qe->block_proc (qe->block_proc_cls,
+                      NULL);
+    GNUNET_free (qe);
+    return;
+  }
+  size = ntohs (msg->gns_header.header.size)
+         - sizeof(struct LookupBlockResponseMessage);
+  {
+    char buf[size] GNUNET_ALIGN;
+    struct GNUNET_GNSRECORD_Block *block;
+
+    memset (buf, 0, size);
+    block = (struct GNUNET_GNSRECORD_Block *) buf;
+    GNUNET_memcpy (block,
+                   &msg[1],
+                   size);
+    if (GNUNET_OK !=
+        GNUNET_GNSRECORD_block_verify (block))
+    {
+      GNUNET_break (0);
+      if (NULL != qe->block_proc)
+        qe->block_proc (qe->block_proc_cls,
+                        NULL);
+      force_reconnect (h);
+    }
+    else
+    {
+      if (NULL != qe->block_proc)
+        qe->block_proc (qe->block_proc_cls,
+                        block);
+    }
+  }
+  GNUNET_free (qe);
+}
+
+
+/**
+ * Handle an incoming message of type
+ * #GNUNET_MESSAGE_TYPE_NAMECACHE_BLOCK_CACHE_RESPONSE
+ *
+ * @param cls the `struct GNUNET_NAMECACHE_Handle`
+ * @param msg the message we received
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR on error and we did NOT notify the client
+ */
+static void
+handle_block_cache_response (void *cls,
+                             const struct BlockCacheResponseMessage *msg)
+{
+  struct GNUNET_NAMECACHE_Handle *h = cls;
+  struct GNUNET_NAMECACHE_QueueEntry *qe;
+  int res;
+
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Received BLOCK_CACHE_RESPONSE\n");
+  qe = find_qe (h,
+                ntohl (msg->gns_header.r_id));
+  if (NULL == qe)
+    return;
+  res = ntohl (msg->op_result);
+  /* TODO: add actual error message from namecache to response... */
+  if (NULL != qe->cont)
+    qe->cont (qe->cont_cls,
+              res,
+              (GNUNET_OK == res)
+              ? NULL
+              : _ ("Namecache failed to cache block"));
+  GNUNET_free (qe);
+}
+
+
+/**
+ * Generic error handler, called with the appropriate error code and
+ * the same closure specified at the creation of the message queue.
+ * Not every message queue implementation supports an error handler.
+ *
+ * @param cls closure with the `struct GNUNET_NAMECACHE_Handle *`
+ * @param error error code
+ */
+static void
+mq_error_handler (void *cls,
+                  enum GNUNET_MQ_Error error)
+{
+  struct GNUNET_NAMECACHE_Handle *h = cls;
+
+  force_reconnect (h);
+}
+
+
+/**
+ * Reconnect to namecache service.
+ *
+ * @param h the handle to the NAMECACHE service
+ */
+static void
+reconnect (struct GNUNET_NAMECACHE_Handle *h)
+{
+  struct GNUNET_MQ_MessageHandler handlers[] = {
+    GNUNET_MQ_hd_var_size (lookup_block_response,
+                           GNUNET_MESSAGE_TYPE_NAMECACHE_LOOKUP_BLOCK_RESPONSE,
+                           struct LookupBlockResponseMessage,
+                           h),
+    GNUNET_MQ_hd_fixed_size (block_cache_response,
+                             GNUNET_MESSAGE_TYPE_NAMECACHE_BLOCK_CACHE_RESPONSE,
+                             struct BlockCacheResponseMessage,
+                             h),
+    GNUNET_MQ_handler_end ()
+  };
+
+  GNUNET_assert (NULL == h->mq);
+  h->mq = GNUNET_CLIENT_connect (h->cfg,
+                                 "namecache",
+                                 handlers,
+                                 &mq_error_handler,
+                                 h);
+}
+
+
+/**
+ * Re-establish the connection to the service.
+ *
+ * @param cls handle to use to re-connect.
+ */
+static void
+reconnect_task (void *cls)
+{
+  struct GNUNET_NAMECACHE_Handle *h = cls;
+
+  h->reconnect_task = NULL;
+  reconnect (h);
+}
+
+
+/**
+ * Disconnect from service and then reconnect.
+ *
+ * @param h our handle
+ */
+static void
+force_reconnect (struct GNUNET_NAMECACHE_Handle *h)
+{
+  struct GNUNET_NAMECACHE_QueueEntry *qe;
+
+  h->reconnect = GNUNET_NO;
+  GNUNET_MQ_destroy (h->mq);
+  h->mq = NULL;
+  while (NULL != (qe = h->op_head))
+  {
+    GNUNET_CONTAINER_DLL_remove (h->op_head,
+                                 h->op_tail,
+                                 qe);
+    if (NULL != qe->cont)
+      qe->cont (qe->cont_cls,
+                GNUNET_SYSERR,
+                _ ("Error communicating with namecache service"));
+    GNUNET_free (qe);
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Reconnecting to namecache\n");
+  h->reconnect_delay = GNUNET_TIME_STD_BACKOFF (h->reconnect_delay);
+  h->reconnect_task = GNUNET_SCHEDULER_add_delayed (h->reconnect_delay,
+                                                    &reconnect_task,
+                                                    h);
+}
+
+
+/**
+ * Get a fresh operation id to distinguish between namecache requests
+ *
+ * @param h the namecache handle
+ * @return next operation id to use
+ */
+static uint32_t
+get_op_id (struct GNUNET_NAMECACHE_Handle *h)
+{
+  return h->last_op_id_used++;
+}
+
+
+/**
+ * Initialize the connection with the NAMECACHE service.
+ *
+ * @param cfg configuration to use
+ * @return handle to the GNS service, or NULL on error
+ */
+struct GNUNET_NAMECACHE_Handle *
+GNUNET_NAMECACHE_connect (const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+  struct GNUNET_NAMECACHE_Handle *h;
+
+  h = GNUNET_new (struct GNUNET_NAMECACHE_Handle);
+  h->cfg = cfg;
+  reconnect (h);
+  if (NULL == h->mq)
+  {
+    GNUNET_free (h);
+    return NULL;
+  }
+  return h;
+}
+
+
+/**
+ * Disconnect from the namecache service (and free associated
+ * resources).
+ *
+ * @param h handle to the namecache
+ */
+void
+GNUNET_NAMECACHE_disconnect (struct GNUNET_NAMECACHE_Handle *h)
+{
+  struct GNUNET_NAMECACHE_QueueEntry *q;
+
+  GNUNET_break (NULL == h->op_head);
+  while (NULL != (q = h->op_head))
+  {
+    GNUNET_CONTAINER_DLL_remove (h->op_head,
+                                 h->op_tail,
+                                 q);
+    GNUNET_free (q);
+  }
+  if (NULL != h->mq)
+  {
+    GNUNET_MQ_destroy (h->mq);
+    h->mq = NULL;
+  }
+  if (NULL != h->reconnect_task)
+  {
+    GNUNET_SCHEDULER_cancel (h->reconnect_task);
+    h->reconnect_task = NULL;
+  }
+  GNUNET_free (h);
+}
+
+
+/**
+ * Store an item in the namecache.  If the item is already present,
+ * it is replaced with the new record.
+ *
+ * @param h handle to the namecache
+ * @param block block to store
+ * @param cont continuation to call when done
+ * @param cont_cls closure for @a cont
+ * @return handle to abort the request, NULL on error
+ */
+struct GNUNET_NAMECACHE_QueueEntry *
+GNUNET_NAMECACHE_block_cache (struct GNUNET_NAMECACHE_Handle *h,
+                              const struct GNUNET_GNSRECORD_Block *block,
+                              GNUNET_NAMECACHE_ContinuationWithStatus cont,
+                              void *cont_cls)
+{
+  struct GNUNET_NAMECACHE_QueueEntry *qe;
+  struct BlockCacheMessage *msg;
+  struct GNUNET_MQ_Envelope *env;
+  uint32_t rid;
+  size_t blen;
+
+  if (NULL == h->mq)
+    return NULL;
+  blen = GNUNET_GNSRECORD_block_get_size (block);
+  rid = get_op_id (h);
+  qe = GNUNET_new (struct GNUNET_NAMECACHE_QueueEntry);
+  qe->nsh = h;
+  qe->cont = cont;
+  qe->cont_cls = cont_cls;
+  qe->op_id = rid;
+  GNUNET_CONTAINER_DLL_insert_tail (h->op_head,
+                                    h->op_tail,
+                                    qe);
+  /* send msg */
+  env = GNUNET_MQ_msg_extra (msg,
+                             blen,
+                             GNUNET_MESSAGE_TYPE_NAMECACHE_BLOCK_CACHE);
+  msg->gns_header.r_id = htonl (rid);
+  GNUNET_memcpy (&msg[1],
+                 block,
+                 blen);
+  GNUNET_MQ_send (h->mq,
+                  env);
+  return qe;
+}
+
+
+/**
+ * Get a result for a particular key from the namecache.  The processor
+ * will only be called once.
+ *
+ * @param h handle to the namecache
+ * @param derived_hash hash of zone key combined with name to lookup
+ * @param proc function to call on the matching block, or with
+ *        NULL if there is no matching block
+ * @param proc_cls closure for @a proc
+ * @return a handle that can be used to cancel, NULL on error
+ */
+struct GNUNET_NAMECACHE_QueueEntry *
+GNUNET_NAMECACHE_lookup_block (struct GNUNET_NAMECACHE_Handle *h,
+                               const struct GNUNET_HashCode *derived_hash,
+                               GNUNET_NAMECACHE_BlockProcessor proc,
+                               void *proc_cls)
+{
+  struct GNUNET_NAMECACHE_QueueEntry *qe;
+  struct LookupBlockMessage *msg;
+  struct GNUNET_MQ_Envelope *env;
+  uint32_t rid;
+
+  if (NULL == h->mq)
+    return NULL;
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Looking for block under %s\n",
+       GNUNET_h2s (derived_hash));
+  rid = get_op_id (h);
+  qe = GNUNET_new (struct GNUNET_NAMECACHE_QueueEntry);
+  qe->nsh = h;
+  qe->block_proc = proc;
+  qe->block_proc_cls = proc_cls;
+  qe->op_id = rid;
+  GNUNET_CONTAINER_DLL_insert_tail (h->op_head,
+                                    h->op_tail,
+                                    qe);
+  env = GNUNET_MQ_msg (msg,
+                       GNUNET_MESSAGE_TYPE_NAMECACHE_LOOKUP_BLOCK);
+  msg->gns_header.r_id = htonl (rid);
+  msg->query = *derived_hash;
+  GNUNET_MQ_send (h->mq,
+                  env);
+  return qe;
+}
+
+
+/**
+ * Cancel a namecache operation.  The final callback from the
+ * operation must not have been done yet.
+ *
+ * @param qe operation to cancel
+ */
+void
+GNUNET_NAMECACHE_cancel (struct GNUNET_NAMECACHE_QueueEntry *qe)
+{
+  struct GNUNET_NAMECACHE_Handle *h = qe->nsh;
+
+  GNUNET_CONTAINER_DLL_remove (h->op_head,
+                               h->op_tail,
+                               qe);
+  GNUNET_free (qe);
+}
+
+
+/* end of namecache_api.c */
diff --git a/src/service/namecache/test_namecache_api.conf b/src/service/namecache/test_namecache_api.conf
new file mode 100644
index 000000000..b1ae31f14
--- /dev/null
+++ b/src/service/namecache/test_namecache_api.conf
@@ -0,0 +1,13 @@
+[PATHS]
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-namecache/
+
+[namecache]
+DATABASE = sqlite
+
+[namecache-sqlite]
+FILENAME = $GNUNET_TEST_HOME/namecache/sqlite_test.db
+
+[namecache-postgres]
+CONFIG = connect_timeout=10; dbname=gnunetcheck
+TEMPORARY_TABLE = YES
+
diff --git a/src/service/namecache/test_namecache_api_cache_block.c b/src/service/namecache/test_namecache_api_cache_block.c
new file mode 100644
index 000000000..3a18a72e1
--- /dev/null
+++ b/src/service/namecache/test_namecache_api_cache_block.c
@@ -0,0 +1,244 @@
+/*
+     This file is part of GNUnet.
+     Copyright (C) 2012 GNUnet e.V.
+
+     GNUnet is free software: you can redistribute it and/or modify it
+     under the terms of the GNU Affero General Public License as published
+     by the Free Software Foundation, either version 3 of the License,
+     or (at your option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Affero General Public License for more details.
+
+     You should have received a copy of the GNU Affero General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
+/**
+ * @file namecache/test_namecache_api.c
+ * @brief testcase for namecache_api.c: store a record and perform a lookup
+ */
+#include "platform.h"
+#include "gnunet_namecache_service.h"
+#include "gnunet_testing_lib.h"
+
+#define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
+
+#define TEST_RECORD_DATALEN 123
+
+#define TEST_RECORD_DATA 'a'
+
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 100)
+
+
+static struct GNUNET_NAMECACHE_Handle *nsh;
+
+static struct GNUNET_SCHEDULER_Task *endbadly_task;
+
+static struct GNUNET_CRYPTO_PrivateKey privkey;
+
+static struct GNUNET_CRYPTO_PublicKey pubkey;
+
+static int res;
+
+static struct GNUNET_NAMECACHE_QueueEntry *nsqe;
+
+
+static void
+cleanup ()
+{
+  if (NULL != nsh)
+  {
+    GNUNET_NAMECACHE_disconnect (nsh);
+    nsh = NULL;
+  }
+  GNUNET_SCHEDULER_shutdown ();
+}
+
+
+/**
+ * Re-establish the connection to the service.
+ *
+ * @param cls handle to use to re-connect.
+ */
+static void
+endbadly (void *cls)
+{
+  if (NULL != nsqe)
+  {
+    GNUNET_NAMECACHE_cancel (nsqe);
+    nsqe = NULL;
+  }
+  cleanup ();
+  res = 1;
+}
+
+
+static void
+end (void *cls)
+{
+  cleanup ();
+  res = 0;
+}
+
+
+static void
+rd_decrypt_cb (void *cls,
+               unsigned int rd_count,
+               const struct GNUNET_GNSRECORD_Data *rd)
+{
+  char rd_cmp_data[TEST_RECORD_DATALEN];
+
+  GNUNET_assert (1 == rd_count);
+  GNUNET_assert (NULL != rd);
+
+  memset (rd_cmp_data, 'a', TEST_RECORD_DATALEN);
+
+  GNUNET_assert (TEST_RECORD_TYPE == rd[0].record_type);
+  GNUNET_assert (TEST_RECORD_DATALEN == rd[0].data_size);
+  GNUNET_assert (0 == memcmp (&rd_cmp_data, rd[0].data, TEST_RECORD_DATALEN));
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Block was decrypted successfully \n");
+
+  GNUNET_SCHEDULER_add_now (&end, NULL);
+}
+
+
+static void
+name_lookup_proc (void *cls,
+                  const struct GNUNET_GNSRECORD_Block *block)
+{
+  const char *name = cls;
+
+  nsqe = NULL;
+
+  GNUNET_assert (NULL != cls);
+
+  if (endbadly_task != NULL)
+  {
+    GNUNET_SCHEDULER_cancel (endbadly_task);
+    endbadly_task = NULL;
+  }
+
+  if (NULL == block)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _ ("Namecache returned no block\n"));
+    if (NULL != endbadly_task)
+      GNUNET_SCHEDULER_cancel (endbadly_task);
+    endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+    return;
+  }
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Namecache returned block, decrypting \n");
+  GNUNET_assert (GNUNET_OK == GNUNET_GNSRECORD_block_decrypt (block,
+                                                              &pubkey, name,
+                                                              &rd_decrypt_cb,
+                                                              (void *) name));
+}
+
+
+static void
+cache_cont (void *cls, int32_t success, const char *emsg)
+{
+  const char *name = cls;
+  struct GNUNET_HashCode derived_hash;
+
+  GNUNET_assert (NULL != cls);
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Name store cached record for `%s': %s\n",
+              name,
+              (success == GNUNET_OK) ? "SUCCESS" : "FAIL");
+
+  /* Create derived hash */
+  GNUNET_GNSRECORD_query_from_public_key (&pubkey, name, &derived_hash);
+
+  nsqe = GNUNET_NAMECACHE_lookup_block (nsh, &derived_hash,
+                                        &name_lookup_proc, (void *) name);
+}
+
+
+static void
+run (void *cls,
+     const struct GNUNET_CONFIGURATION_Handle *cfg,
+     struct GNUNET_TESTING_Peer *peer)
+{
+  struct GNUNET_GNSRECORD_Data rd;
+  struct GNUNET_GNSRECORD_Block *block;
+  const char *name = "dummy.dummy.gnunet";
+
+  endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
+                                                &endbadly, NULL);
+  privkey.type = htonl (GNUNET_GNSRECORD_TYPE_PKEY);
+  GNUNET_CRYPTO_ecdsa_key_create (&privkey.ecdsa_key);
+  GNUNET_CRYPTO_key_get_public (&privkey, &pubkey);
+
+
+  rd.expiration_time = GNUNET_TIME_absolute_get ().abs_value_us + 10000000000;
+  rd.record_type = TEST_RECORD_TYPE;
+  rd.data_size = TEST_RECORD_DATALEN;
+  rd.data = GNUNET_malloc (TEST_RECORD_DATALEN);
+  rd.flags = 0;
+  memset ((char *) rd.data, 'a', TEST_RECORD_DATALEN);
+  GNUNET_assert (GNUNET_OK == GNUNET_GNSRECORD_block_create (&privkey,
+                                                             GNUNET_TIME_UNIT_FOREVER_ABS,
+                                                             name, &rd, 1,
+                                                             &block));
+  if (NULL == block)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Namecache cannot cache no block!\n");
+    GNUNET_SCHEDULER_shutdown ();
+    GNUNET_free (block);
+    return;
+  }
+
+  nsh = GNUNET_NAMECACHE_connect (cfg);
+  if (NULL == nsh)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _ ("Namecache cannot connect to namecache\n"));
+    GNUNET_SCHEDULER_shutdown ();
+    GNUNET_free (block);
+    return;
+  }
+  GNUNET_break (NULL != nsh);
+
+  nsqe = GNUNET_NAMECACHE_block_cache (nsh,
+                                       block,
+                                       &cache_cont, (void *) name);
+  if (NULL == nsqe)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _ ("Namecache cannot cache no block\n"));
+  }
+  GNUNET_free (block);
+  GNUNET_free_nz ((void *) rd.data);
+}
+
+
+int
+main (int argc, char *argv[])
+{
+  GNUNET_DISK_purge_cfg_dir
+    ("test_namecache_api.conf",
+     "GNUNET_TEST_HOME");
+  res = 1;
+  if (0 !=
+      GNUNET_TESTING_service_run ("test-namecache-api",
+                                  "namecache",
+                                  "test_namecache_api.conf",
+                                  &run,
+                                  NULL))
+    return 1;
+  return res;
+}
+
+
+/* end of test_namecache_api_cache_block.c */