glitch in the license text detected by hyazinthe, thank you!
[oweals/gnunet.git] / src / datastore / gnunet-service-datastore.c
index 01778b1b790ceb0287c9987d8bafc80f47a5de7f..127cb235c43defc5c5cada36729b1a4964b479e2 100644 (file)
@@ -1,21 +1,16 @@
 /*
      This file is part of GNUnet
-     (C) 2004, 2005, 2006, 2007, 2009 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2004-2014, 2016 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
-     by the Free Software Foundation; either version 2, or (at your
-     option) any later version.
+     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
-     General Public License for more details.
-
-     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.
+     Affero General Public License for more details.
 */
 
 /**
@@ -28,7 +23,7 @@
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
 #include "gnunet_statistics_service.h"
-#include "plugin_datastore.h"
+#include "gnunet_datastore_plugin.h"
 #include "datastore.h"
 
 /**
  */
 #define MAX_PENDING 1024
 
+/**
+ * Limit size of bloom filter to 2 GB.
+ */
+#define MAX_BF_SIZE ((uint32_t) (1LL << 31))
+
 /**
  * How long are we at most keeping "expired" content
  * past the expiration date in the database?
  */
 #define MAX_EXPIRE_DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 15)
 
-#define QUOTA_STAT_NAME gettext_noop ("# bytes used in file-sharing datastore")
+/**
+ * How fast are we allowed to query the database for deleting
+ * expired content? (1 item per second).
+ */
+#define MIN_EXPIRE_DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1)
+
+/**
+ * Name under which we store current space consumption.
+ */
+static char *quota_stat_name;
+
+/**
+ * Task to timeout stat GET.
+ */
+static struct GNUNET_SCHEDULER_Task *stat_timeout_task;
 
 /**
  * After how many payload-changing operations
@@ -85,7 +99,7 @@ struct DatastorePlugin
 /**
  * Linked list of active reservations.
  */
-struct ReservationList 
+struct ReservationList
 {
 
   /**
@@ -96,7 +110,7 @@ struct ReservationList
   /**
    * Client that made the reservation.
    */
-  struct GNUNET_SERVER_Client *client;
+  struct GNUNET_SERVICE_Client *client;
 
   /**
    * Number of bytes (still) reserved.
@@ -133,9 +147,19 @@ static struct ReservationList *reservations;
 static struct GNUNET_CONTAINER_BloomFilter *filter;
 
 /**
- * How much space are we allowed to use?
+ * Name of our plugin.
  */
-static unsigned long long quota;
+static char *plugin_name;
+
+/**
+ * Our configuration.
+ */
+static const struct GNUNET_CONFIGURATION_Handle *cfg;
+
+/**
+ * Handle for reporting statistics.
+ */
+static struct GNUNET_STATISTICS_Handle *stats;
 
 /**
  * How much space are we using for the cache?  (space available for
@@ -149,134 +173,73 @@ static unsigned long long cache_size;
  * How much space have we currently reserved?
  */
 static unsigned long long reserved;
-  
+
 /**
  * How much data are we currently storing
  * in the database?
  */
 static unsigned long long payload;
 
-/**
- * Number of updates that were made to the
- * payload value since we last synchronized
- * it with the statistics service.
- */
-static unsigned int lastSync;
-
-/**
- * Did we get an answer from statistics?
- */
-static int stats_worked;
-
 /**
  * Identity of the task that is used to delete
  * expired content.
  */
-static GNUNET_SCHEDULER_TaskIdentifier expired_kill_task;
+static struct GNUNET_SCHEDULER_Task *expired_kill_task;
 
 /**
- * Our configuration.
+ * Minimum time that content should have to not be discarded instantly
+ * (time stamp of any content that we've been discarding recently to
+ * stay below the quota).  FOREVER if we had to expire content with
+ * non-zero priority.
  */
-const struct GNUNET_CONFIGURATION_Handle *cfg;
+static struct GNUNET_TIME_Absolute min_expiration;
 
 /**
- * Our scheduler.
+ * How much space are we allowed to use?
  */
-struct GNUNET_SCHEDULER_Handle *sched; 
+static unsigned long long quota;
 
 /**
- * Handle for reporting statistics.
+ * Should the database be dropped on exit?
  */
-static struct GNUNET_STATISTICS_Handle *stats;
-
+static int do_drop;
 
 /**
- * Synchronize our utilization statistics with the 
- * statistics service.
+ * Should we refresh the BF when the DB is loaded?
  */
-static void 
-sync_stats ()
-{
-  GNUNET_STATISTICS_set (stats,
-                        QUOTA_STAT_NAME,
-                        payload,
-                        GNUNET_YES);
-  lastSync = 0;
-}
-
-
-
+static int refresh_bf;
 
 /**
- * Function called once the transmit operation has
- * either failed or succeeded.
- *
- * @param cls closure
- * @param status GNUNET_OK on success, GNUNET_SYSERR on error
+ * Number of updates that were made to the
+ * payload value since we last synchronized
+ * it with the statistics service.
  */
-typedef void (*TransmitContinuation)(void *cls,
-                                    int status);
-
+static unsigned int last_sync;
 
 /**
- * Context for transmitting replies to clients.
+ * Did we get an answer from statistics?
  */
-struct TransmitCallbackContext 
-{
-  
-  /**
-   * We keep these in a doubly-linked list (for cleanup).
-   */
-  struct TransmitCallbackContext *next;
-  
-  /**
-   * We keep these in a doubly-linked list (for cleanup).
-   */
-  struct TransmitCallbackContext *prev;
-  
-  /**
-   * The message that we're asked to transmit.
-   */
-  struct GNUNET_MessageHeader *msg;
-  
-  /**
-   * Handle for the transmission request.
-   */
-  struct GNUNET_CONNECTION_TransmitHandle *th;
-
-  /**
-   * Client that we are transmitting to.
-   */
-  struct GNUNET_SERVER_Client *client;
-
-  /**
-   * Function to call once msg has been transmitted
-   * (or at least added to the buffer).
-   */
-  TransmitContinuation tc;
-
-  /**
-   * Closure for tc.
-   */
-  void *tc_cls;
+static int stats_worked;
 
-  /**
-   * GNUNET_YES if we are supposed to signal the server
-   * completion of the client's request.
-   */
-  int end;
-};
 
-  
 /**
- * Head of the doubly-linked list (for cleanup).
+ * Synchronize our utilization statistics with the
+ * statistics service.
  */
-static struct TransmitCallbackContext *tcc_head;
+static void
+sync_stats ()
+{
+  GNUNET_STATISTICS_set (stats,
+                         quota_stat_name,
+                         payload,
+                         GNUNET_YES);
+  GNUNET_STATISTICS_set (stats,
+                         "# utilization by current datastore",
+                         payload,
+                         GNUNET_NO);
+  last_sync = 0;
+}
 
-/**
- * Tail of the doubly-linked list (for cleanup).
- */
-static struct TransmitCallbackContext *tcc_tail;
 
 /**
  * Have we already cleaned up the TCCs and are hence no longer
@@ -289,6 +252,10 @@ static int cleaning_done;
  */
 static struct GNUNET_STATISTICS_GetHandle *stat_get;
 
+/**
+ * Handle to our server.
+ */
+static struct GNUNET_SERVICE_Handle *service;
 
 /**
  * Task that is used to remove expired entries from
@@ -297,11 +264,9 @@ static struct GNUNET_STATISTICS_GetHandle *stat_get;
  * content quickly.
  *
  * @param cls not used
- * @param tc task context
- */ 
+ */
 static void
-delete_expired (void *cls,
-               const struct GNUNET_SCHEDULER_TaskContext *tc);
+delete_expired (void *cls);
 
 
 /**
@@ -310,67 +275,70 @@ delete_expired (void *cls,
  * expired items, re-schedule the "delete_expired" task.
  *
  * @param cls not used
- * @param next_cls closure to pass to the "next" function.
  * @param key key for the content
  * @param size number of bytes in data
  * @param data content stored
  * @param type type of the content
  * @param priority priority of the content
  * @param anonymity anonymity-level for the content
+ * @param replication replication-level for the content
  * @param expiration expiration time for the content
  * @param uid unique identifier for the datum;
  *        maybe 0 if no unique identifier is available
  *
- * @return GNUNET_SYSERR to abort the iteration, GNUNET_OK to continue
+ * @return #GNUNET_SYSERR to abort the iteration, #GNUNET_OK to continue
  *         (continue on call to "next", of course),
- *         GNUNET_NO to delete the item and continue (if supported)
+ *         #GNUNET_NO to delete the item and continue (if supported)
  */
-static int 
+static int
 expired_processor (void *cls,
-                  void *next_cls,
-                  const GNUNET_HashCode * key,
-                  uint32_t size,
-                  const void *data,
-                  enum GNUNET_BLOCK_Type type,
-                  uint32_t priority,
-                  uint32_t anonymity,
-                  struct GNUNET_TIME_Absolute
-                  expiration, 
-                  uint64_t uid)
+                   const struct GNUNET_HashCode *key,
+                   uint32_t size,
+                   const void *data,
+                   enum GNUNET_BLOCK_Type type,
+                   uint32_t priority,
+                   uint32_t anonymity,
+                   uint32_t replication,
+                   struct GNUNET_TIME_Absolute expiration,
+                   uint64_t uid)
 {
   struct GNUNET_TIME_Absolute now;
 
-  if (key == NULL) 
-    {
-      expired_kill_task 
-       = GNUNET_SCHEDULER_add_delayed (sched,
-                                       MAX_EXPIRE_DELAY,
-                                       &delete_expired,
-                                       NULL);
-      return GNUNET_SYSERR;
-    }
+  if (NULL == key)
+  {
+    expired_kill_task =
+        GNUNET_SCHEDULER_add_delayed_with_priority (MAX_EXPIRE_DELAY,
+                                                   GNUNET_SCHEDULER_PRIORITY_IDLE,
+                                                   &delete_expired, NULL);
+    return GNUNET_SYSERR;
+  }
   now = GNUNET_TIME_absolute_get ();
-  if (expiration.value > now.value)
-    {
-      /* finished processing */
-      plugin->api->next_request (next_cls, GNUNET_YES);
-      return GNUNET_SYSERR;
-    }
-  plugin->api->next_request (next_cls, GNUNET_NO);
-#if DEBUG_DATASTORE
+  if (expiration.abs_value_us > now.abs_value_us)
+  {
+    /* finished processing */
+    expired_kill_task =
+        GNUNET_SCHEDULER_add_delayed_with_priority (MAX_EXPIRE_DELAY,
+                                                   GNUNET_SCHEDULER_PRIORITY_IDLE,
+                                                   &delete_expired, NULL);
+    return GNUNET_SYSERR;
+  }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Deleting content `%s' of type %u that expired %llu ms ago\n",
-             GNUNET_h2s (key),
-             type,
-             (unsigned long long) (now.value - expiration.value));
-#endif
+              "Deleting content `%s' of type %u that expired %s ago\n",
+              GNUNET_h2s (key), type,
+             GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_difference (expiration,
+                                                                                          now),
+                                                     GNUNET_YES));
+  min_expiration = now;
   GNUNET_STATISTICS_update (stats,
-                           gettext_noop ("# bytes expired"),
-                           size,
-                           GNUNET_YES);
-  GNUNET_CONTAINER_bloomfilter_remove (filter,
-                                      key);
-  return GNUNET_NO; /* delete */
+                            gettext_noop ("# bytes expired"),
+                            size,
+                            GNUNET_YES);
+  GNUNET_CONTAINER_bloomfilter_remove (filter, key);
+  expired_kill_task =
+      GNUNET_SCHEDULER_add_delayed_with_priority (MIN_EXPIRE_DELAY,
+                                                 GNUNET_SCHEDULER_PRIORITY_IDLE,
+                                                 &delete_expired, NULL);
+  return GNUNET_NO;
 }
 
 
@@ -381,79 +349,72 @@ expired_processor (void *cls,
  * content quickly.
  *
  * @param cls not used
- * @param tc task context
- */ 
+ */
 static void
-delete_expired (void *cls,
-               const struct GNUNET_SCHEDULER_TaskContext *tc)
+delete_expired (void *cls)
 {
-  expired_kill_task = GNUNET_SCHEDULER_NO_TASK;
-  plugin->api->iter_ascending_expiration (plugin->api->cls, 
-                                         0,
-                                         &expired_processor,
-                                         NULL);
+  expired_kill_task = NULL;
+  plugin->api->get_expiration (plugin->api->cls,
+                              &expired_processor,
+                              NULL);
 }
 
 
 /**
- * An iterator over a set of items stored in the datastore.
+ * An iterator over a set of items stored in the datastore
+ * that deletes until we're happy with respect to our quota.
  *
  * @param cls closure
- * @param next_cls closure to pass to the "next" function.
  * @param key key for the content
  * @param size number of bytes in data
  * @param data content stored
  * @param type type of the content
  * @param priority priority of the content
  * @param anonymity anonymity-level for the content
+ * @param replication replication-level for the content
  * @param expiration expiration time for the content
  * @param uid unique identifier for the datum;
  *        maybe 0 if no unique identifier is available
- *
- * @return GNUNET_SYSERR to abort the iteration, GNUNET_OK to continue
+ * @return #GNUNET_SYSERR to abort the iteration, #GNUNET_OK to continue
  *         (continue on call to "next", of course),
- *         GNUNET_NO to delete the item and continue (if supported)
- */
-static int 
-manage (void *cls,
-       void *next_cls,
-       const GNUNET_HashCode * key,
-       uint32_t size,
-       const void *data,
-       enum GNUNET_BLOCK_Type type,
-       uint32_t priority,
-       uint32_t anonymity,
-       struct GNUNET_TIME_Absolute
-       expiration, 
-       uint64_t uid)
+ *         #GNUNET_NO to delete the item and continue (if supported)
+ */
+static int
+quota_processor (void *cls,
+                 const struct GNUNET_HashCode *key,
+                 uint32_t size,
+                 const void *data,
+                 enum GNUNET_BLOCK_Type type,
+                 uint32_t priority,
+                 uint32_t anonymity,
+                 uint32_t replication,
+                 struct GNUNET_TIME_Absolute expiration,
+                 uint64_t uid)
 {
   unsigned long long *need = cls;
 
   if (NULL == key)
-    {
-      GNUNET_free (need);
-      return GNUNET_SYSERR;
-    }
+    return GNUNET_SYSERR;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Deleting %llu bytes of low-priority (%u) content `%s' of type %u at %s prior to expiration (still trying to free another %llu bytes)\n",
+              (unsigned long long) (size + GNUNET_DATASTORE_ENTRY_OVERHEAD),
+             (unsigned int) priority,
+              GNUNET_h2s (key), type,
+             GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_remaining (expiration),
+                                                     GNUNET_YES),
+             *need);
   if (size + GNUNET_DATASTORE_ENTRY_OVERHEAD > *need)
     *need = 0;
   else
     *need -= size + GNUNET_DATASTORE_ENTRY_OVERHEAD;
-  plugin->api->next_request (next_cls, 
-                            (0 == *need) ? GNUNET_YES : GNUNET_NO);
-#if DEBUG_DATASTORE
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Deleting %llu bytes of low-priority content `%s' of type %u (still trying to free another %llu bytes)\n",
-             (unsigned long long) (size + GNUNET_DATASTORE_ENTRY_OVERHEAD),
-             GNUNET_h2s (key),
-             type,
-             *need);
-#endif
+  if (priority > 0)
+    min_expiration = GNUNET_TIME_UNIT_FOREVER_ABS;
+  else
+    min_expiration = expiration;
   GNUNET_STATISTICS_update (stats,
-                           gettext_noop ("# bytes purged (low-priority)"),
-                           size,
-                           GNUNET_YES);
-  GNUNET_CONTAINER_bloomfilter_remove (filter,
-                                      key);
+                            gettext_noop ("# bytes purged (low-priority)"),
+                            size, GNUNET_YES);
+  GNUNET_CONTAINER_bloomfilter_remove (filter, key);
   return GNUNET_NO;
 }
 
@@ -473,145 +434,19 @@ manage (void *cls,
 static void
 manage_space (unsigned long long need)
 {
-  unsigned long long *n;
+  unsigned long long last;
 
-#if DEBUG_DATASTORE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Asked to free up %llu bytes of cache space\n",
-             need);
-#endif
-  n = GNUNET_malloc (sizeof(unsigned long long));
-  *n = need;
-  plugin->api->iter_low_priority (plugin->api->cls,
-                                 0,
-                                 &manage,
-                                 n);
-}
-
-
-/**
- * Function called to notify a client about the socket
- * begin ready to queue more data.  "buf" will be
- * NULL and "size" zero if the socket was closed for
- * writing in the meantime.
- *
- * @param cls closure
- * @param size number of bytes available in buf
- * @param buf where the callee should write the message
- * @return number of bytes written to buf
- */
-static size_t
-transmit_callback (void *cls,
-                  size_t size, void *buf)
-{
-  struct TransmitCallbackContext *tcc = cls;
-  size_t msize;
-  
-  tcc->th = NULL;
-  GNUNET_CONTAINER_DLL_remove (tcc_head,
-                              tcc_tail,
-                              tcc);
-  msize = ntohs(tcc->msg->size);
-  if (size == 0)
-    {
-#if DEBUG_DATASTORE
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                 "Transmission failed.\n");
-#endif
-      if (tcc->tc != NULL)
-       tcc->tc (tcc->tc_cls, GNUNET_SYSERR);
-      if (GNUNET_YES == tcc->end)
-       GNUNET_SERVER_receive_done (tcc->client, GNUNET_SYSERR);       
-      GNUNET_SERVER_client_drop (tcc->client);
-      GNUNET_free (tcc->msg);
-      GNUNET_free (tcc);
-      return 0;
-    }
-  GNUNET_assert (size >= msize);
-  memcpy (buf, tcc->msg, msize);
-  if (tcc->tc != NULL)
-    tcc->tc (tcc->tc_cls, GNUNET_OK);
-  if (GNUNET_YES == tcc->end)
-    {
-      GNUNET_SERVER_receive_done (tcc->client, GNUNET_OK);
-    }
-  else
-    {
-#if DEBUG_DATASTORE
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                 "Response transmitted, more pending!\n");
-#endif
-    }
-  GNUNET_SERVER_client_drop (tcc->client);
-  GNUNET_free (tcc->msg);
-  GNUNET_free (tcc);
-  return msize;
-}
-
-
-/**
- * Transmit the given message to the client.
- *
- * @param client target of the message
- * @param msg message to transmit, will be freed!
- * @param tc function to call afterwards
- * @param tc_cls closure for tc
- * @param end is this the last response (and we should
- *        signal the server completion accodingly after
- *        transmitting this message)?
- */
-static void
-transmit (struct GNUNET_SERVER_Client *client,
-         struct GNUNET_MessageHeader *msg,
-         TransmitContinuation tc,
-         void *tc_cls,
-         int end)
-{
-  struct TransmitCallbackContext *tcc;
-
-  if (GNUNET_YES == cleaning_done)
-    {
-#if DEBUG_DATASTORE
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                 "Shutdown in progress, aborting transmission.\n");
-#endif
-      GNUNET_free (msg);
-      if (NULL != tc)
-       tc (tc_cls, GNUNET_SYSERR);
-      return;
-    }
-  tcc = GNUNET_malloc (sizeof(struct TransmitCallbackContext));
-  tcc->msg = msg;
-  tcc->client = client;
-  tcc->tc = tc;
-  tcc->tc_cls = tc_cls;
-  tcc->end = end;
-  if (NULL ==
-      (tcc->th = GNUNET_SERVER_notify_transmit_ready (client,
-                                                     ntohs(msg->size),
-                                                     GNUNET_TIME_UNIT_FOREVER_REL,
-                                                     &transmit_callback,
-                                                     tcc)))
-    {
-      GNUNET_break (0);
-      if (GNUNET_YES == end)
-       {
-#if DEBUG_DATASTORE
-         GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                     "Disconnecting client.\n");
-#endif   
-         GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-       }
-      if (NULL != tc)
-       tc (tc_cls, GNUNET_SYSERR);
-      GNUNET_free (msg);
-      GNUNET_free (tcc);
-      return;
-    }
-  GNUNET_SERVER_client_keep (client);
-  GNUNET_CONTAINER_DLL_insert (tcc_head,
-                              tcc_tail,
-                              tcc);
+              "Asked to free up %llu bytes of cache space\n",
+              need);
+  last = 0;
+  while ((need > 0) && (last != need))
+  {
+    last = need;
+    plugin->api->get_expiration (plugin->api->cls,
+                                 &quota_processor,
+                                 &need);
+  }
 }
 
 
@@ -623,51 +458,28 @@ transmit (struct GNUNET_SERVER_Client *client,
  * @param msg optional error message (can be NULL)
  */
 static void
-transmit_status (struct GNUNET_SERVER_Client *client,
-                int code,
-                const char *msg)
+transmit_status (struct GNUNET_SERVICE_Client *client,
+                 int code,
+                 const char *msg)
 {
+  struct GNUNET_MQ_Envelope *env;
   struct StatusMessage *sm;
   size_t slen;
 
-#if DEBUG_DATASTORE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Transmitting `%s' message with value %d and message `%s'\n",
-             "STATUS",
-             code,
-             msg != NULL ? msg : "(none)");
-#endif
-  slen = (msg == NULL) ? 0 : strlen(msg) + 1;  
-  sm = GNUNET_malloc (sizeof(struct StatusMessage) + slen);
-  sm->header.size = htons(sizeof(struct StatusMessage) + slen);
-  sm->header.type = htons(GNUNET_MESSAGE_TYPE_DATASTORE_STATUS);
-  sm->status = htonl(code);
-  if (slen > 0)
-    memcpy (&sm[1], msg, slen);  
-  transmit (client, &sm->header, NULL, NULL, GNUNET_YES);
-}
-
-
-/**
- * Function called once the transmit operation has
- * either failed or succeeded.
- *
- * @param next_cls closure for calling "next_request" callback
- * @param status GNUNET_OK on success, GNUNET_SYSERR on error
- */
-static void 
-get_next(void *next_cls,
-        int status)
-{
-  if (status != GNUNET_OK)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                 _("Failed to transmit an item to the client; aborting iteration.\n"));
-      if (plugin != NULL)
-       plugin->api->next_request (next_cls, GNUNET_YES);
-      return;
-    }
-  plugin->api->next_request (next_cls, GNUNET_NO);
+              "Transmitting `%s' message with value %d and message `%s'\n",
+              "STATUS", code, msg != NULL ? msg : "(none)");
+  slen = (msg == NULL) ? 0 : strlen (msg) + 1;
+  env = GNUNET_MQ_msg_extra (sm,
+                             slen,
+                             GNUNET_MESSAGE_TYPE_DATASTORE_STATUS);
+  sm->status = htonl (code);
+  sm->min_expiration = GNUNET_TIME_absolute_hton (min_expiration);
+  GNUNET_memcpy (&sm[1],
+                 msg,
+                 slen);
+  GNUNET_MQ_send (GNUNET_SERVICE_client_get_mq (client),
+                  env);
 }
 
 
@@ -675,76 +487,78 @@ get_next(void *next_cls,
  * Function that will transmit the given datastore entry
  * to the client.
  *
- * @param cls closure, pointer to the client (of type GNUNET_SERVER_Client).
- * @param next_cls closure to use to ask for the next item
+ * @param cls closure, pointer to the client (of type `struct GNUNET_SERVICE_Client`).
  * @param key key for the content
  * @param size number of bytes in data
  * @param data content stored
  * @param type type of the content
  * @param priority priority of the content
  * @param anonymity anonymity-level for the content
+ * @param replication replication-level for the content
  * @param expiration expiration time for the content
  * @param uid unique identifier for the datum;
  *        maybe 0 if no unique identifier is available
- *
- * @return GNUNET_SYSERR to abort the iteration, GNUNET_OK to continue,
- *         GNUNET_NO to delete the item and continue (if supported)
+ * @return #GNUNET_SYSERR to abort the iteration, #GNUNET_OK to continue,
+ *         #GNUNET_NO to delete the item and continue (if supported)
  */
 static int
 transmit_item (void *cls,
-              void *next_cls,
-              const GNUNET_HashCode * key,
-              uint32_t size,
-              const void *data,
-              enum GNUNET_BLOCK_Type type,
-              uint32_t priority,
-              uint32_t anonymity,
-              struct GNUNET_TIME_Absolute
-              expiration, uint64_t uid)
+               const struct GNUNET_HashCode *key,
+               uint32_t size,
+               const void *data,
+               enum GNUNET_BLOCK_Type type,
+               uint32_t priority,
+               uint32_t anonymity,
+               uint32_t replication,
+               struct GNUNET_TIME_Absolute expiration,
+               uint64_t uid)
 {
-  struct GNUNET_SERVER_Client *client = cls;
+  struct GNUNET_SERVICE_Client *client = cls;
+  struct GNUNET_MQ_Envelope *env;
   struct GNUNET_MessageHeader *end;
   struct DataMessage *dm;
 
-  if (key == NULL)
-    {
-      /* transmit 'DATA_END' */
-#if DEBUG_DATASTORE
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                 "Transmitting `%s' message\n",
-                 "DATA_END");
-#endif
-      end = GNUNET_malloc (sizeof(struct GNUNET_MessageHeader));
-      end->size = htons(sizeof(struct GNUNET_MessageHeader));
-      end->type = htons(GNUNET_MESSAGE_TYPE_DATASTORE_DATA_END);
-      transmit (client, end, NULL, NULL, GNUNET_YES);
-      GNUNET_SERVER_client_drop (client);
-      return GNUNET_OK;
-    }
-  dm = GNUNET_malloc (sizeof(struct DataMessage) + size);
-  dm->header.size = htons(sizeof(struct DataMessage) + size);
-  dm->header.type = htons(GNUNET_MESSAGE_TYPE_DATASTORE_DATA);
-  dm->rid = htonl(0);
-  dm->size = htonl(size);
-  dm->type = htonl(type);
-  dm->priority = htonl(priority);
-  dm->anonymity = htonl(anonymity);
-  dm->expiration = GNUNET_TIME_absolute_hton(expiration);
-  dm->uid = GNUNET_htonll(uid);
+  if (NULL == key)
+  {
+    /* transmit 'DATA_END' */
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Transmitting DATA_END message\n");
+    env = GNUNET_MQ_msg (end,
+                         GNUNET_MESSAGE_TYPE_DATASTORE_DATA_END);
+    GNUNET_MQ_send (GNUNET_SERVICE_client_get_mq (client),
+                    env);
+    return GNUNET_OK;
+  }
+  GNUNET_assert (sizeof (struct DataMessage) + size <
+                 GNUNET_MAX_MESSAGE_SIZE);
+  env = GNUNET_MQ_msg_extra (dm,
+                             size,
+                             GNUNET_MESSAGE_TYPE_DATASTORE_DATA);
+  dm->rid = htonl (0);
+  dm->size = htonl (size);
+  dm->type = htonl (type);
+  dm->priority = htonl (priority);
+  dm->anonymity = htonl (anonymity);
+  dm->replication = htonl (replication);
+  dm->expiration = GNUNET_TIME_absolute_hton (expiration);
+  dm->uid = GNUNET_htonll (uid);
   dm->key = *key;
-  memcpy (&dm[1], data, size);
-#if DEBUG_DATASTORE
+  GNUNET_memcpy (&dm[1],
+                 data,
+                 size);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Transmitting `%s' message for `%s' of type %u\n",
-             "DATA",
-             GNUNET_h2s (key),
-             type);
-#endif
+              "Transmitting DATA message for `%s' of type %u with expiration %s (in: %s)\n",
+              GNUNET_h2s (key),
+              type,
+              GNUNET_STRINGS_absolute_time_to_string (expiration),
+              GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_remaining (expiration),
+                                                     GNUNET_YES));
   GNUNET_STATISTICS_update (stats,
-                           gettext_noop ("# results found"),
-                           1,
-                           GNUNET_NO);
-  transmit (client, &dm->header, &get_next, next_cls, GNUNET_NO);
+                            gettext_noop ("# results found"),
+                            1,
+                            GNUNET_NO);
+  GNUNET_MQ_send (GNUNET_SERVICE_client_get_mq (client),
+                  env);
   return GNUNET_OK;
 }
 
@@ -752,73 +566,70 @@ transmit_item (void *cls,
 /**
  * Handle RESERVE-message.
  *
- * @param cls closure
- * @param client identification of the client
+ * @param cls identification of the client
  * @param message the actual message
  */
 static void
 handle_reserve (void *cls,
-               struct GNUNET_SERVER_Client *client,
-               const struct GNUNET_MessageHeader *message)
+                const struct ReserveMessage *msg)
 {
   /**
    * Static counter to produce reservation identifiers.
    */
   static int reservation_gen;
-
-  const struct ReserveMessage *msg = (const struct ReserveMessage*) message;
+  struct GNUNET_SERVICE_Client *client = cls;
   struct ReservationList *e;
   unsigned long long used;
   unsigned long long req;
   uint64_t amount;
   uint32_t entries;
 
-#if DEBUG_DATASTORE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Processing `%s' request\n",
-             "RESERVE");
-#endif
-  amount = GNUNET_ntohll(msg->amount);
-  entries = ntohl(msg->entries);
+              "Processing RESERVE request\n");
+  amount = GNUNET_ntohll (msg->amount);
+  entries = ntohl (msg->entries);
   used = payload + reserved;
   req = amount + ((unsigned long long) GNUNET_DATASTORE_ENTRY_OVERHEAD) * entries;
   if (used + req > quota)
+  {
+    if (quota < used)
+      used = quota;             /* cheat a bit for error message (to avoid negative numbers) */
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                _("Insufficient space (%llu bytes are available) to satisfy RESERVE request for %llu bytes\n"),
+                quota - used,
+                req);
+    if (cache_size < req)
     {
-      if (quota < used)
-       used = quota; /* cheat a bit for error message (to avoid negative numbers) */
+      /* TODO: document this in the FAQ; essentially, if this
+       * message happens, the insertion request could be blocked
+       * by less-important content from migration because it is
+       * larger than 1/8th of the overall available space, and
+       * we only reserve 1/8th for "fresh" insertions */
       GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                 _("Insufficient space (%llu bytes are available) to satisfy `%s' request for %llu bytes\n"),
-                 quota - used,
-                 "RESERVE",
-                 req);
-      if (cache_size < req)
-       {
-         /* TODO: document this in the FAQ; essentially, if this
-            message happens, the insertion request could be blocked
-            by less-important content from migration because it is
-            larger than 1/8th of the overall available space, and
-            we only reserve 1/8th for "fresh" insertions */
-         GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                     _("The requested amount (%llu bytes) is larger than the cache size (%llu bytes)\n"),
-                     req,
-                     cache_size);
-         transmit_status (client, 0, 
-                          gettext_noop ("Insufficient space to satisfy request and "
-                                        "requested amount is larger than cache size"));
-       }
-      else
-       {
-         transmit_status (client, 0, 
-                          gettext_noop ("Insufficient space to satisfy request"));
-       }
-      return;      
+                  _("The requested amount (%llu bytes) is larger than the cache size (%llu bytes)\n"),
+                  req,
+                  cache_size);
+      transmit_status (client,
+                       0,
+                       gettext_noop
+                       ("Insufficient space to satisfy request and "
+                        "requested amount is larger than cache size"));
+    }
+    else
+    {
+      transmit_status (client,
+                       0,
+                       gettext_noop ("Insufficient space to satisfy request"));
     }
+    GNUNET_SERVICE_client_continue (client);
+    return;
+  }
   reserved += req;
   GNUNET_STATISTICS_set (stats,
-                        gettext_noop ("# reserved"),
-                        reserved,
-                        GNUNET_NO);
-  e = GNUNET_malloc (sizeof(struct ReservationList));
+                         gettext_noop ("# reserved"),
+                         reserved,
+                         GNUNET_NO);
+  e = GNUNET_new (struct ReservationList);
   e->next = reservations;
   reservations = e;
   e->client = client;
@@ -826,230 +637,159 @@ handle_reserve (void *cls,
   e->entries = entries;
   e->rid = ++reservation_gen;
   if (reservation_gen < 0)
-    reservation_gen = 0; /* wrap around */
-  transmit_status (client, e->rid, NULL);
+    reservation_gen = 0;        /* wrap around */
+  transmit_status (client,
+                   e->rid,
+                   NULL);
+  GNUNET_SERVICE_client_continue (client);
 }
 
 
 /**
  * Handle RELEASE_RESERVE-message.
  *
- * @param cls closure
- * @param client identification of the client
+ * @param cls identification of the client
  * @param message the actual message
  */
 static void
 handle_release_reserve (void *cls,
-                       struct GNUNET_SERVER_Client *client,
-                       const struct GNUNET_MessageHeader *message)
+                        const struct ReleaseReserveMessage *msg)
 {
-  const struct ReleaseReserveMessage *msg = (const struct ReleaseReserveMessage*) message;
+  struct GNUNET_SERVICE_Client *client = cls;
   struct ReservationList *pos;
   struct ReservationList *prev;
   struct ReservationList *next;
-  int rid = ntohl(msg->rid);
+  int rid = ntohl (msg->rid);
   unsigned long long rem;
 
-#if DEBUG_DATASTORE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Processing `%s' request\n",
-             "RELEASE_RESERVE");
-#endif
+              "Processing RELEASE_RESERVE request\n");
   next = reservations;
   prev = NULL;
   while (NULL != (pos = next))
+  {
+    next = pos->next;
+    if (rid == pos->rid)
     {
-      next = pos->next;
-      if (rid == pos->rid)
-       {
-         if (prev == NULL)
-           reservations = next;
-         else
-           prev->next = next;
-         rem = pos->amount + ((unsigned long long) GNUNET_DATASTORE_ENTRY_OVERHEAD) * pos->entries;
-         GNUNET_assert (reserved >= rem);
-         reserved -= rem;
-         GNUNET_STATISTICS_set (stats,
-                        gettext_noop ("# reserved"),
-                                reserved,
-                                GNUNET_NO);
-#if DEBUG_DATASTORE
-         GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                     "Returning %llu remaining reserved bytes to storage pool\n",
-                     rem);
-#endif   
-         GNUNET_free (pos);
-         transmit_status (client, GNUNET_OK, NULL);
-         return;
-       }       
-      prev = pos;
+      if (prev == NULL)
+        reservations = next;
+      else
+        prev->next = next;
+      rem =
+          pos->amount +
+          ((unsigned long long) GNUNET_DATASTORE_ENTRY_OVERHEAD) * pos->entries;
+      GNUNET_assert (reserved >= rem);
+      reserved -= rem;
+      GNUNET_STATISTICS_set (stats,
+                             gettext_noop ("# reserved"),
+                             reserved,
+                             GNUNET_NO);
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Returning %llu remaining reserved bytes to storage pool\n",
+                  rem);
+      GNUNET_free (pos);
+      transmit_status (client,
+                       GNUNET_OK,
+                       NULL);
+      GNUNET_SERVICE_client_continue (client);
+      return;
     }
+    prev = pos;
+  }
   GNUNET_break (0);
-  transmit_status (client, GNUNET_SYSERR, gettext_noop ("Could not find matching reservation"));
+  transmit_status (client,
+                   GNUNET_SYSERR,
+                   gettext_noop ("Could not find matching reservation"));
+  GNUNET_SERVICE_client_continue (client);
 }
 
 
 /**
  * Check that the given message is a valid data message.
  *
- * @return NULL if the message is not well-formed, otherwise the message
+ * @param dm message to check
+ * @return #GNUNET_SYSERR is not well-formed, otherwise #GNUNET_OK
  */
-static const struct DataMessage *
-check_data (const struct GNUNET_MessageHeader *message)
+static int
+check_data (const struct DataMessage *dm)
 {
   uint16_t size;
   uint32_t dsize;
-  const struct DataMessage *dm;
 
-  size = ntohs(message->size);
-  if (size < sizeof(struct DataMessage))
-    { 
-      GNUNET_break (0);
-      return NULL;
-    }
-  dm = (const struct DataMessage *) message;
-  dsize = ntohl(dm->size);
-  if (size != dsize + sizeof(struct DataMessage))
-    {
-      GNUNET_break (0);
-      return NULL;
-    }
-  return dm;
+  size = ntohs (dm->header.size);
+  dsize = ntohl (dm->size);
+  if (size != dsize + sizeof (struct DataMessage))
+  {
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_OK;
 }
 
 
 /**
- * Context for a put request used to see if the content is
- * already present.
- */
-struct PutContext
-{
-  /**
-   * Client to notify on completion.
-   */
-  struct GNUNET_SERVER_Client *client;
-
-  /**
-   * Did we find the data already in the database?
-   */
-  int is_present;
-  
-  /* followed by the 'struct DataMessage' */
-};
-
-
-/**
- * Actually put the data message.
+ * Put continuation.
+ *
+ * @param cls closure
+ * @param key key for the item stored
+ * @param size size of the item stored
+ * @param status #GNUNET_OK if inserted, #GNUNET_NO if updated,
+ *        or #GNUNET_SYSERROR if error
+ * @param msg error message on error
  */
 static void
-execute_put (struct GNUNET_SERVER_Client *client,
-            const struct DataMessage *dm)
+put_continuation (void *cls,
+                  const struct GNUNET_HashCode *key,
+                  uint32_t size,
+                  int status,
+                  const char *msg)
 {
-  uint32_t size;
-  char *msg;
-  int ret;
-
-  size = ntohl(dm->size);
-  msg = NULL;
-  ret = plugin->api->put (plugin->api->cls,
-                         &dm->key,
-                         size,
-                         &dm[1],
-                         ntohl(dm->type),
-                         ntohl(dm->priority),
-                         ntohl(dm->anonymity),
-                         GNUNET_TIME_absolute_ntoh(dm->expiration),
-                         &msg);
-  if (GNUNET_OK == ret)
-    {
-      GNUNET_STATISTICS_update (stats,
-                               gettext_noop ("# bytes stored"),
-                               size,
-                               GNUNET_YES);
-      GNUNET_CONTAINER_bloomfilter_add (filter,
-                                       &dm->key);
-#if DEBUG_DATASTORE
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                 "Successfully stored %u bytes of type %u under key `%s'\n",
-                 size,
-                 ntohl(dm->type),
-                 GNUNET_h2s (&dm->key));
-#endif
-    }
-  transmit_status (client, 
-                  (GNUNET_SYSERR == ret) ? GNUNET_SYSERR : GNUNET_OK, 
-                  msg);
-  GNUNET_free_non_null (msg);
+  struct GNUNET_SERVICE_Client *client = cls;
+
+  if (GNUNET_OK == status)
+  {
+    GNUNET_STATISTICS_update (stats,
+                              gettext_noop ("# bytes stored"),
+                              size,
+                              GNUNET_YES);
+    GNUNET_CONTAINER_bloomfilter_add (filter,
+                                      key);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Successfully stored %u bytes under key `%s'\n",
+                size,
+                GNUNET_h2s (key));
+  }
+  transmit_status (client,
+                   GNUNET_SYSERR == status ? GNUNET_SYSERR : GNUNET_OK,
+                   msg);
   if (quota - reserved - cache_size < payload)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                 _("Need %llu bytes more space (%llu allowed, using %llu)\n"),
-                 (unsigned long long) size + GNUNET_DATASTORE_ENTRY_OVERHEAD,
-                 (unsigned long long) (quota - reserved - cache_size),
-                 (unsigned long long) payload);
-      manage_space (size + GNUNET_DATASTORE_ENTRY_OVERHEAD);
-    }
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                _("Need %llu bytes more space (%llu allowed, using %llu)\n"),
+                (unsigned long long) size + GNUNET_DATASTORE_ENTRY_OVERHEAD,
+                (unsigned long long) (quota - reserved - cache_size),
+                (unsigned long long) payload);
+    manage_space (size + GNUNET_DATASTORE_ENTRY_OVERHEAD);
+  }
 }
 
 
-
 /**
- * Function that will check if the given datastore entry
- * matches the put and if none match executes the put.
+ * Verify PUT-message.
  *
- * @param cls closure, pointer to the client (of type 'struct PutContext').
- * @param next_cls closure to use to ask for the next item
- * @param key key for the content
- * @param size number of bytes in data
- * @param data content stored
- * @param type type of the content
- * @param priority priority of the content
- * @param anonymity anonymity-level for the content
- * @param expiration expiration time for the content
- * @param uid unique identifier for the datum;
- *        maybe 0 if no unique identifier is available
- *
- * @return GNUNET_SYSERR to abort the iteration, GNUNET_OK to continue,
- *         GNUNET_NO to delete the item and continue (if supported)
+ * @param cls identification of the client
+ * @param message the actual message
+ * @return #GNUNET_OK if @a dm is well-formed
  */
 static int
-check_present (void *cls,
-              void *next_cls,
-              const GNUNET_HashCode * key,
-              uint32_t size,
-              const void *data,
-              enum GNUNET_BLOCK_Type type,
-              uint32_t priority,
-              uint32_t anonymity,
-              struct GNUNET_TIME_Absolute
-              expiration, uint64_t uid)
+check_put (void *cls,
+           const struct DataMessage *dm)
 {
-  struct PutContext *pc = cls;
-  const struct DataMessage *dm;
-
-  dm = (const struct DataMessage*) &pc[1];
-  if (key == NULL)
-    {
-      if (pc->is_present == GNUNET_YES)        
-       transmit_status (pc->client, GNUNET_OK, NULL);
-      else
-       execute_put (pc->client, dm);
-      GNUNET_SERVER_client_drop (pc->client);
-      GNUNET_free (pc);
-      return GNUNET_SYSERR;
-    }
-  if ( (size == ntohl(dm->size)) &&
-       (0 == memcmp (&dm[1],
-                    data,
-                    size)) )
-    {
-      pc->is_present = GNUNET_YES;
-      plugin->api->next_request (next_cls, GNUNET_YES);
-    }
-  else
-    {
-      plugin->api->next_request (next_cls, GNUNET_NO);
-    }
+  if (GNUNET_OK != check_data (dm))
+  {
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
+  }
   return GNUNET_OK;
 }
 
@@ -1057,275 +797,272 @@ check_present (void *cls,
 /**
  * Handle PUT-message.
  *
- * @param cls closure
- * @param client identification of the client
+ * @param cls identification of the client
  * @param message the actual message
  */
 static void
 handle_put (void *cls,
-           struct GNUNET_SERVER_Client *client,
-           const struct GNUNET_MessageHeader *message)
+            const struct DataMessage *dm)
 {
-  const struct DataMessage *dm = check_data (message);
+  struct GNUNET_SERVICE_Client *client = cls;
   int rid;
   struct ReservationList *pos;
-  struct PutContext *pc;
   uint32_t size;
 
-  if ( (dm == NULL) ||
-       (ntohl(dm->type) == 0) ) 
-    {
-      GNUNET_break (0);
-      GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-      return;
-    }
-#if DEBUG_DATASTORE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Processing `%s' request for `%s' of type %u\n",
-             "PUT",
-             GNUNET_h2s (&dm->key),
-             ntohl (dm->type));
-#endif
-  rid = ntohl(dm->rid);
-  size = ntohl(dm->size);
+              "Processing PUT request for `%s' of type %u\n",
+              GNUNET_h2s (&dm->key),
+              (uint32_t) ntohl (dm->type));
+  rid = ntohl (dm->rid);
+  size = ntohl (dm->size);
   if (rid > 0)
+  {
+    pos = reservations;
+    while ((NULL != pos) && (rid != pos->rid))
+      pos = pos->next;
+    GNUNET_break (pos != NULL);
+    if (NULL != pos)
     {
-      pos = reservations;
-      while ( (NULL != pos) &&
-             (rid != pos->rid) )
-       pos = pos->next;
-      GNUNET_break (pos != NULL);
-      if (NULL != pos)
-       {
-         GNUNET_break (pos->entries > 0);
-         GNUNET_break (pos->amount >= size);
-         pos->entries--;
-         pos->amount -= size;
-         reserved -= (size + GNUNET_DATASTORE_ENTRY_OVERHEAD);
-         GNUNET_STATISTICS_set (stats,
-                                gettext_noop ("# reserved"),
-                                reserved,
-                                GNUNET_NO);
-       }
-    }
-  if (GNUNET_YES == GNUNET_CONTAINER_bloomfilter_test (filter,
-                                                      &dm->key))
-    {
-      pc = GNUNET_malloc (sizeof (struct PutContext) + size + sizeof (struct DataMessage));
-      pc->client = client;
-      GNUNET_SERVER_client_keep (client);
-      memcpy (&pc[1], dm, size + sizeof (struct DataMessage));
-      plugin->api->get (plugin->api->cls,
-                       &dm->key,
-                       NULL,
-                       ntohl (dm->type),
-                       &check_present,
-                       pc);      
-      return;
+      GNUNET_break (pos->entries > 0);
+      GNUNET_break (pos->amount >= size);
+      pos->entries--;
+      pos->amount -= size;
+      reserved -= (size + GNUNET_DATASTORE_ENTRY_OVERHEAD);
+      GNUNET_STATISTICS_set (stats,
+                             gettext_noop ("# reserved"),
+                             reserved,
+                             GNUNET_NO);
     }
-  execute_put (client, dm);
+  }
+  bool absent = GNUNET_NO == GNUNET_CONTAINER_bloomfilter_test (filter,
+                                                                &dm->key);
+  plugin->api->put (plugin->api->cls,
+                    &dm->key,
+                    absent,
+                    ntohl (dm->size),
+                    &dm[1],
+                    ntohl (dm->type),
+                    ntohl (dm->priority),
+                    ntohl (dm->anonymity),
+                    ntohl (dm->replication),
+                    GNUNET_TIME_absolute_ntoh (dm->expiration),
+                    &put_continuation,
+                    client);
+  GNUNET_SERVICE_client_continue (client);
 }
 
 
 /**
- * Handle GET-message.
+ * Handle #GNUNET_MESSAGE_TYPE_DATASTORE_GET-message.
  *
- * @param cls closure
- * @param client identification of the client
- * @param message the actual message
+ * @param cls identification of the client
+ * @param msg the actual message
  */
 static void
 handle_get (void *cls,
-           struct GNUNET_SERVER_Client *client,
-           const struct GNUNET_MessageHeader *message)
+            const struct GetMessage *msg)
 {
-  const struct GetMessage *msg;
-  uint16_t size;
+  struct GNUNET_SERVICE_Client *client = cls;
 
-  size = ntohs(message->size);
-  if ( (size != sizeof(struct GetMessage)) &&
-       (size != sizeof(struct GetMessage) - sizeof(GNUNET_HashCode)) )
-    {
-      GNUNET_break (0);
-      GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-      return;
-    }
-  msg = (const struct GetMessage*) message;
-#if DEBUG_DATASTORE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Processing `%s' request for `%s' of type %u\n",
-             "GET",
-             GNUNET_h2s (&msg->key),
-             ntohl (msg->type));
-#endif
+              "Processing GET request of type %u\n",
+              (uint32_t) ntohl (msg->type));
   GNUNET_STATISTICS_update (stats,
-                           gettext_noop ("# GET requests received"),
-                           1,
-                           GNUNET_NO);
-  GNUNET_SERVER_client_keep (client);
-  if ( (size == sizeof(struct GetMessage)) &&
-       (GNUNET_YES != GNUNET_CONTAINER_bloomfilter_test (filter,
-                                                        &msg->key)) )
-    {
-      /* don't bother database... */
-#if DEBUG_DATASTORE
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                 "Empty result set for `%s' request for `%s' (bloomfilter).\n",
-                 "GET",
-                 GNUNET_h2s (&msg->key));
-#endif 
-      GNUNET_STATISTICS_update (stats,
-                               gettext_noop ("# requests filtered by bloomfilter"),
-                               1,
-                               GNUNET_NO);
-      transmit_item (client,
-                    NULL, NULL, 0, NULL, 0, 0, 0, 
-                    GNUNET_TIME_UNIT_ZERO_ABS, 0);
-      return;
-    }
-  plugin->api->get (plugin->api->cls,
-                   ((size == sizeof(struct GetMessage)) ? &msg->key : NULL),
-                   NULL,
-                   ntohl(msg->type),
-                   &transmit_item,
-                   client);    
+                            gettext_noop ("# GET requests received"),
+                            1,
+                            GNUNET_NO);
+  plugin->api->get_key (plugin->api->cls,
+                        GNUNET_ntohll (msg->next_uid),
+                        msg->random,
+                        NULL,
+                        ntohl (msg->type),
+                        &transmit_item,
+                        client);
+  GNUNET_SERVICE_client_continue (client);
 }
 
 
 /**
- * Handle UPDATE-message.
+ * Handle #GNUNET_MESSAGE_TYPE_DATASTORE_GET_KEY-message.
  *
  * @param cls closure
- * @param client identification of the client
- * @param message the actual message
+ * @param msg the actual message
  */
 static void
-handle_update (void *cls,
-              struct GNUNET_SERVER_Client *client,
-              const struct GNUNET_MessageHeader *message)
+handle_get_key (void *cls,
+                const struct GetKeyMessage *msg)
 {
-  const struct UpdateMessage *msg;
-  int ret;
-  char *emsg;
+  struct GNUNET_SERVICE_Client *client = cls;
 
-  GNUNET_STATISTICS_update (stats,
-                           gettext_noop ("# UPDATE requests received"),
-                           1,
-                           GNUNET_NO);
-  msg = (const struct UpdateMessage*) message;
-  emsg = NULL;
-#if DEBUG_DATASTORE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Processing `%s' request for %llu\n",
-             "UPDATE",
-             (unsigned long long) GNUNET_ntohll (msg->uid));
-#endif
-  ret = plugin->api->update (plugin->api->cls,
-                            GNUNET_ntohll(msg->uid),
-                            (int32_t) ntohl(msg->priority),
-                            GNUNET_TIME_absolute_ntoh(msg->expiration),
-                            &emsg);
-  transmit_status (client, ret, emsg);
-  GNUNET_free_non_null (emsg);
+              "Processing GET request for `%s' of type %u\n",
+              GNUNET_h2s (&msg->key),
+              (uint32_t) ntohl (msg->type));
+  GNUNET_STATISTICS_update (stats,
+                            gettext_noop ("# GET KEY requests received"),
+                            1,
+                            GNUNET_NO);
+  if (GNUNET_YES !=
+      GNUNET_CONTAINER_bloomfilter_test (filter,
+                                         &msg->key))
+  {
+    /* don't bother database... */
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Empty result set for GET request for `%s' (bloomfilter).\n",
+                GNUNET_h2s (&msg->key));
+    GNUNET_STATISTICS_update (stats,
+                              gettext_noop
+                              ("# requests filtered by bloomfilter"),
+                              1,
+                              GNUNET_NO);
+    transmit_item (client,
+                   NULL, 0, NULL, 0, 0, 0, 0,
+                   GNUNET_TIME_UNIT_ZERO_ABS,
+                   0);
+    GNUNET_SERVICE_client_continue (client);
+    return;
+  }
+  plugin->api->get_key (plugin->api->cls,
+                        GNUNET_ntohll (msg->next_uid),
+                        msg->random,
+                        &msg->key,
+                        ntohl (msg->type),
+                        &transmit_item,
+                        client);
+  GNUNET_SERVICE_client_continue (client);
 }
 
 
 /**
- * Handle GET_RANDOM-message.
+ * Handle GET_REPLICATION-message.
  *
- * @param cls closure
- * @param client identification of the client
+ * @param cls identification of the client
  * @param message the actual message
  */
 static void
-handle_get_random (void *cls,
-                  struct GNUNET_SERVER_Client *client,
-                  const struct GNUNET_MessageHeader *message)
+handle_get_replication (void *cls,
+                        const struct GNUNET_MessageHeader *message)
 {
-#if DEBUG_DATASTORE
+  struct GNUNET_SERVICE_Client *client = cls;
+
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Processing `%s' request\n",
-             "GET_RANDOM");
-#endif
+              "Processing GET_REPLICATION request\n");
   GNUNET_STATISTICS_update (stats,
-                           gettext_noop ("# GET RANDOM requests received"),
-                           1,
-                           GNUNET_NO);
-  GNUNET_SERVER_client_keep (client);
-  plugin->api->iter_migration_order (plugin->api->cls,
-                                    0,
-                                    &transmit_item,
-                                    client);  
+                            gettext_noop ("# GET REPLICATION requests received"),
+                            1,
+                            GNUNET_NO);
+  plugin->api->get_replication (plugin->api->cls,
+                                &transmit_item,
+                                client);
+  GNUNET_SERVICE_client_continue (client);
 }
 
 
 /**
- * Context for the 'remove_callback'.
+ * Handle GET_ZERO_ANONYMITY-message.
+ *
+ * @param cls client identification of the client
+ * @param message the actual message
  */
-struct RemoveContext 
+static void
+handle_get_zero_anonymity (void *cls,
+                           const struct GetZeroAnonymityMessage *msg)
 {
-  /**
-   * Client for whom we're doing the remvoing.
-   */
-  struct GNUNET_SERVER_Client *client;
-
-  /**
-   * GNUNET_YES if we managed to remove something.
-   */
-  int found;
-};
+  struct GNUNET_SERVICE_Client *client = cls;
+  enum GNUNET_BLOCK_Type type;
+
+  type = (enum GNUNET_BLOCK_Type) ntohl (msg->type);
+  if (type == GNUNET_BLOCK_TYPE_ANY)
+  {
+    GNUNET_break (0);
+    GNUNET_SERVICE_client_drop (client);
+    return;
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Processing GET_ZERO_ANONYMITY request\n");
+  GNUNET_STATISTICS_update (stats,
+                            gettext_noop ("# GET ZERO ANONYMITY requests received"),
+                            1,
+                            GNUNET_NO);
+  plugin->api->get_zero_anonymity (plugin->api->cls,
+                                   GNUNET_ntohll (msg->next_uid),
+                                   type,
+                                   &transmit_item,
+                                   client);
+  GNUNET_SERVICE_client_continue (client);
+}
 
 
 /**
- * Callback function that will cause the item that is passed
- * in to be deleted (by returning GNUNET_NO).
+ * Remove continuation.
+ *
+ * @param cls closure
+ * @param key key for the content
+ * @param size number of bytes in data
+ * @param status #GNUNET_OK if removed, #GNUNET_NO if not found,
+ *        or #GNUNET_SYSERROR if error
+ * @param msg error message on error
  */
-static int
-remove_callback (void *cls,
-                void *next_cls,
-                const GNUNET_HashCode * key,
-                uint32_t size,
-                const void *data,
-                enum GNUNET_BLOCK_Type type,
-                uint32_t priority,
-                uint32_t anonymity,
-                struct GNUNET_TIME_Absolute
-                expiration, uint64_t uid)
+static void
+remove_continuation (void *cls,
+                     const struct GNUNET_HashCode *key,
+                     uint32_t size,
+                     int status,
+                     const char *msg)
 {
-  struct RemoveContext *rc = cls;
-
-  if (key == NULL)
-    {
-#if DEBUG_DATASTORE
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                 "No further matches for `%s' request.\n",
-                 "REMOVE");
-#endif 
-      if (GNUNET_YES == rc->found)
-       transmit_status (rc->client, GNUNET_OK, NULL);       
-      else
-       transmit_status (rc->client, GNUNET_NO, _("Content not found"));        
-      GNUNET_SERVER_client_drop (rc->client);
-      GNUNET_free (rc);
-      return GNUNET_OK; /* last item */
-    }
-  rc->found = GNUNET_YES;
-#if DEBUG_DATASTORE
+  struct GNUNET_SERVICE_Client *client = cls;
+
+  if (GNUNET_SYSERR == status)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "REMOVE request failed: %s.\n",
+                msg);
+    transmit_status (client,
+                     GNUNET_NO,
+                     msg);
+    return;
+  }
+  if (GNUNET_NO == status)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Content not found for REMOVE request.\n");
+    transmit_status (client,
+                     GNUNET_NO,
+                     _("Content not found"));
+    return;
+  }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Item %llu matches `%s' request for key `%s' and type %u.\n",
-             (unsigned long long) uid,
-             "REMOVE",
-             GNUNET_h2s (key),
-             type);
-#endif 
+              "Item matches REMOVE request for key `%s'.\n",
+              GNUNET_h2s (key));
   GNUNET_STATISTICS_update (stats,
-                           gettext_noop ("# bytes removed (explicit request)"),
-                           size,
-                           GNUNET_YES);
+                            gettext_noop ("# bytes removed (explicit request)"),
+                            size,
+                            GNUNET_YES);
   GNUNET_CONTAINER_bloomfilter_remove (filter,
-                                      key);
-  plugin->api->next_request (next_cls, GNUNET_YES);
-  return GNUNET_NO;
+                                       key);
+  transmit_status (client,
+                   GNUNET_OK,
+                   NULL);
+}
+
+
+/**
+ * Verify REMOVE-message.
+ *
+ * @param cls identification of the client
+ * @param message the actual message
+ * @return #GNUNET_OK if @a dm is well-formed
+ */
+static int
+check_remove (void *cls,
+              const struct DataMessage *dm)
+{
+  if (GNUNET_OK != check_data (dm))
+  {
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_OK;
 }
 
 
@@ -1338,64 +1075,42 @@ remove_callback (void *cls,
  */
 static void
 handle_remove (void *cls,
-            struct GNUNET_SERVER_Client *client,
-            const struct GNUNET_MessageHeader *message)
+               const struct DataMessage *dm)
 {
-  const struct DataMessage *dm = check_data (message);
-  GNUNET_HashCode vhash;
-  struct RemoveContext *rc;
+  struct GNUNET_SERVICE_Client *client = cls;
 
-  if (dm == NULL)
-    {
-      GNUNET_break (0);
-      GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-      return;
-    }
-#if DEBUG_DATASTORE
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Processing `%s' request for `%s' of type %u\n",
-             "REMOVE",
-             GNUNET_h2s (&dm->key),
-             ntohl (dm->type));
-#endif
   GNUNET_STATISTICS_update (stats,
-                           gettext_noop ("# REMOVE requests received"),
-                           1,
-                           GNUNET_NO);
-  rc = GNUNET_malloc (sizeof(struct RemoveContext));
-  GNUNET_SERVER_client_keep (client);
-  rc->client = client;
-  GNUNET_CRYPTO_hash (&dm[1],
-                     ntohl(dm->size),
-                     &vhash);
-  plugin->api->get (plugin->api->cls,
-                   &dm->key,
-                   &vhash,
-                   ntohl(dm->type),
-                   &remove_callback,
-                   rc);
+                            gettext_noop ("# REMOVE requests received"),
+                            1, GNUNET_NO);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Processing REMOVE request for `%s'\n",
+              GNUNET_h2s (&dm->key));
+  plugin->api->remove_key (plugin->api->cls,
+                           &dm->key,
+                           ntohl (dm->size),
+                           &dm[1],
+                           &remove_continuation,
+                           client);
+  GNUNET_SERVICE_client_continue (client);
 }
 
 
 /**
  * Handle DROP-message.
  *
- * @param cls closure
- * @param client identification of the client
+ * @param cls identification of the client
  * @param message the actual message
  */
 static void
 handle_drop (void *cls,
-            struct GNUNET_SERVER_Client *client,
-            const struct GNUNET_MessageHeader *message)
+             const struct GNUNET_MessageHeader *message)
 {
-#if DEBUG_DATASTORE
+  struct GNUNET_SERVICE_Client *client = cls;
+
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Processing `%s' request\n",
-             "DROP");
-#endif
-  plugin->api->drop (plugin->api->cls);
-  GNUNET_SERVER_receive_done (client, GNUNET_OK);
+              "Processing DROP request\n");
+  do_drop = GNUNET_YES;
+  GNUNET_SERVICE_client_continue (client);
 }
 
 
@@ -1404,27 +1119,30 @@ handle_drop (void *cls,
  * change in their disk utilization.
  *
  * @param cls closure (NULL)
- * @param delta change in disk utilization, 
+ * @param delta change in disk utilization,
  *        0 for "reset to empty"
  */
 static void
 disk_utilization_change_cb (void *cls,
-                           int delta)
+                            int delta)
 {
-  if ( (delta < 0) &&
-       (payload < -delta) )
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                 _("Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"),
-                 (long long) payload,
-                 (long long) -delta);
-      payload = plugin->api->get_size (plugin->api->cls);
-      sync_stats ();
-      return;
-    }
+  if ((delta < 0) && (payload < -delta))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                _("Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"),
+                (long long) payload,
+                (long long) -delta);
+    plugin->api->estimate_size (plugin->api->cls,
+                                &payload);
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                _("New payload: %lld\n"),
+                (long long) payload);
+     sync_stats ();
+    return;
+  }
   payload += delta;
-  lastSync++;
-  if (lastSync >= MAX_STAT_SYNC_LAG)
+  last_sync++;
+  if (last_sync >= MAX_STAT_SYNC_LAG)
     sync_stats ();
 }
 
@@ -1436,81 +1154,60 @@ disk_utilization_change_cb (void *cls,
  * @param subsystem name of subsystem that created the statistic
  * @param name the name of the datum
  * @param value the current value
- * @param is_persistent GNUNET_YES if the value is persistent, GNUNET_NO if not
- * @return GNUNET_OK to continue, GNUNET_SYSERR to abort iteration
+ * @param is_persistent #GNUNET_YES if the value is persistent, #GNUNET_NO if not
+ * @return #GNUNET_OK to continue, #GNUNET_SYSERR to abort iteration
  */
 static int
 process_stat_in (void *cls,
-                const char *subsystem,
-                const char *name,
-                uint64_t value,
-                int is_persistent)
+                 const char *subsystem,
+                 const char *name,
+                 uint64_t value,
+                 int is_persistent)
 {
-  GNUNET_assert (stats_worked == GNUNET_NO);
+  GNUNET_assert (GNUNET_NO == stats_worked);
   stats_worked = GNUNET_YES;
   payload += value;
-#if DEBUG_SQLITE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Notification from statistics about existing payload (%llu), new payload is %llu\n",
-             value,
-             payload);
-#endif
+              "Notification from statistics about existing payload (%llu), new payload is %llu\n",
+              (unsigned long long) value,
+              (unsigned long long) payload);
   return GNUNET_OK;
 }
 
 
-static void
-process_stat_done (void *cls,
-                  int success)
-{
-  struct DatastorePlugin *plugin = cls;
-
-  stat_get = NULL;
-  if (stats_worked == GNUNET_NO) 
-    payload = plugin->api->get_size (plugin->api->cls);
-}
-
-
 /**
  * Load the datastore plugin.
  */
 static struct DatastorePlugin *
-load_plugin () 
+load_plugin ()
 {
   struct DatastorePlugin *ret;
   char *libname;
-  char *name;
 
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (cfg,
-                                             "DATASTORE", "DATABASE", &name))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                 _("No `%s' specified for `%s' in configuration!\n"),
-                 "DATABASE",
-                 "DATASTORE");
-      return NULL;
-    }
-  ret = GNUNET_malloc (sizeof(struct DatastorePlugin));
+  ret = GNUNET_new (struct DatastorePlugin);
   ret->env.cfg = cfg;
-  ret->env.sched = sched;  
   ret->env.duc = &disk_utilization_change_cb;
   ret->env.cls = NULL;
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              _("Loading `%s' datastore plugin\n"), name);
-  GNUNET_asprintf (&libname, "libgnunet_plugin_datastore_%s", name);
-  ret->short_name = name;
+              _("Loading `%s' datastore plugin\n"),
+              plugin_name);
+  GNUNET_asprintf (&libname,
+                   "libgnunet_plugin_datastore_%s",
+                   plugin_name);
+  ret->short_name = GNUNET_strdup (plugin_name);
   ret->lib_name = libname;
-  ret->api = GNUNET_PLUGIN_load (libname, &ret->env);
-  if (ret->api == NULL)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _("Failed to load datastore plugin for `%s'\n"), name);
-      GNUNET_free (ret->short_name);
-      GNUNET_free (libname);
-      GNUNET_free (ret);
-      return NULL;
-    }
+  ret->api = GNUNET_PLUGIN_load (libname,
+                                 &ret->env);
+  if (NULL == ret->api)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("Failed to load datastore plugin for `%s'\n"),
+                plugin_name);
+    GNUNET_free (ret->short_name);
+    GNUNET_free (libname);
+    GNUNET_free (ret);
+    return NULL;
+  }
   return ret;
 }
 
@@ -1524,10 +1221,8 @@ load_plugin ()
 static void
 unload_plugin (struct DatastorePlugin *plug)
 {
-#if DEBUG_DATASTORE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Datastore service is unloading plugin...\n");
-#endif
   GNUNET_break (NULL == GNUNET_PLUGIN_unload (plug->lib_name, plug->api));
   GNUNET_free (plug->lib_name);
   GNUNET_free (plug->short_name);
@@ -1536,115 +1231,240 @@ unload_plugin (struct DatastorePlugin *plug)
 
 
 /**
- * Final task run after shutdown.  Unloads plugins and disconnects us from
- * statistics.
+ * Initialization complete, start operating the service.
+ */
+static void
+begin_service ()
+{
+  GNUNET_SERVICE_resume (service);
+  expired_kill_task
+    = GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_IDLE,
+                                          &delete_expired,
+                                          NULL);
+}
+
+
+/**
+ * Adds a given @a key to the bloomfilter in @a cls @a count times.
+ *
+ * @param cls the bloomfilter
+ * @param key key to add
+ * @param count number of times to add key
+ */
+static void
+add_key_to_bloomfilter (void *cls,
+                       const struct GNUNET_HashCode *key,
+                       unsigned int count)
+{
+  struct GNUNET_CONTAINER_BloomFilter *bf = cls;
+
+  if (NULL == key)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+               _("Bloomfilter construction complete.\n"));
+    begin_service ();
+    return;
+  }
+
+  while (0 < count--)
+    GNUNET_CONTAINER_bloomfilter_add (bf,
+                                      key);
+}
+
+
+/**
+ * We finished receiving the statistic.  Initialize the plugin; if
+ * loading the statistic failed, run the estimator.
+ *
+ * @param cls NULL
+ * @param success #GNUNET_NO if we failed to read the stat
  */
 static void
-unload_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+process_stat_done (void *cls,
+                   int success)
 {
-  unload_plugin (plugin);
-  plugin = NULL;
-  if (filter != NULL)
+  stat_get = NULL;
+  if (NULL != stat_timeout_task)
+  {
+    GNUNET_SCHEDULER_cancel (stat_timeout_task);
+    stat_timeout_task = NULL;
+  }
+  plugin = load_plugin ();
+  if (NULL == plugin)
+  {
+    GNUNET_CONTAINER_bloomfilter_free (filter);
+    filter = NULL;
+    if (NULL != stats)
     {
-      GNUNET_CONTAINER_bloomfilter_free (filter);
-      filter = NULL;
+      GNUNET_STATISTICS_destroy (stats,
+                                 GNUNET_YES);
+      stats = NULL;
     }
-  if (lastSync > 0)
-    sync_stats ();
-  if (stat_get != NULL)
+    return;
+  }
+
+  if (GNUNET_NO == stats_worked)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Failed to obtain value from statistics service, recomputing it\n");
+    plugin->api->estimate_size (plugin->api->cls,
+                                &payload);
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                _("New payload: %lld\n"),
+                (long long) payload);
+  }
+
+  if (GNUNET_YES == refresh_bf)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+               _("Rebuilding bloomfilter.  Please be patient.\n"));
+    if (NULL != plugin->api->get_keys)
     {
-      GNUNET_STATISTICS_get_cancel (stat_get);
-      stat_get = NULL;
+      plugin->api->get_keys (plugin->api->cls,
+                             &add_key_to_bloomfilter,
+                             filter);
+      return;
     }
-  if (stats != NULL)
+    else
     {
-      GNUNET_STATISTICS_destroy (stats, GNUNET_YES);
-      stats = NULL;
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                 _("Plugin does not support get_keys function. Please fix!\n"));
     }
+  }
+  begin_service ();
 }
 
 
 /**
- * Last task run during shutdown.  Disconnects us from
- * the transport and core.
+ * Fetching stats took to long, run without.
+ *
+ * @param cls NULL
  */
 static void
-cleaning_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+stat_timeout (void *cls)
 {
-  struct TransmitCallbackContext *tcc;
+  stat_timeout_task = NULL;
+  GNUNET_STATISTICS_get_cancel (stat_get);
+  process_stat_done (NULL,
+                     GNUNET_NO);
+}
+
 
+/**
+ * Task run during shutdown.
+ */
+static void
+cleaning_task (void *cls)
+{
   cleaning_done = GNUNET_YES;
-  while (NULL != (tcc = tcc_head))
-    {
-      GNUNET_CONTAINER_DLL_remove (tcc_head,
-                                  tcc_tail,
-                                  tcc);
-      if (tcc->th != NULL)
-       {
-         GNUNET_CONNECTION_notify_transmit_ready_cancel (tcc->th);
-         GNUNET_SERVER_client_drop (tcc->client);
-       }
-      if (NULL != tcc->tc)
-       tcc->tc (tcc->tc_cls, GNUNET_SYSERR);
-      GNUNET_free (tcc->msg);
-      GNUNET_free (tcc);
-    }
-  if (expired_kill_task != GNUNET_SCHEDULER_NO_TASK)
-    {
-      GNUNET_SCHEDULER_cancel (sched,
-                              expired_kill_task);
-      expired_kill_task = GNUNET_SCHEDULER_NO_TASK;
-    }
-  GNUNET_SCHEDULER_add_continuation (sched,
-                                    &unload_task,
-                                    NULL,
-                                    GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+  if (NULL != expired_kill_task)
+  {
+    GNUNET_SCHEDULER_cancel (expired_kill_task);
+    expired_kill_task = NULL;
+  }
+  if (GNUNET_YES == do_drop)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Dropping database!\n");
+    plugin->api->drop (plugin->api->cls);
+    payload = 0;
+    last_sync++;
+  }
+  if (NULL != plugin)
+  {
+    unload_plugin (plugin);
+    plugin = NULL;
+  }
+  if (NULL != filter)
+  {
+    GNUNET_CONTAINER_bloomfilter_free (filter);
+    filter = NULL;
+  }
+  if (NULL != stat_get)
+  {
+    GNUNET_STATISTICS_get_cancel (stat_get);
+    stat_get = NULL;
+  }
+  if (NULL != stat_timeout_task)
+  {
+    GNUNET_SCHEDULER_cancel (stat_timeout_task);
+    stat_timeout_task = NULL;
+  }
+  GNUNET_free_non_null (plugin_name);
+  plugin_name = NULL;
+  if (last_sync > 0)
+    sync_stats ();
+  if (NULL != stats)
+  {
+    GNUNET_STATISTICS_destroy (stats,
+                               GNUNET_YES);
+    stats = NULL;
+  }
+  GNUNET_free (quota_stat_name);
+  quota_stat_name = NULL;
+}
+
+
+/**
+ * Add a client to our list of active clients.
+ *
+ * @param cls NULL
+ * @param client client to add
+ * @param mq message queue for @a client
+ * @return @a client
+ */
+static void *
+client_connect_cb (void *cls,
+                  struct GNUNET_SERVICE_Client *client,
+                  struct GNUNET_MQ_Handle *mq)
+{
+  return client;
 }
 
 
 /**
- * Function that removes all active reservations made
- * by the given client and releases the space for other
- * requests.
+ * 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 must match @a client
  */
 static void
-cleanup_reservations (void *cls,
-                     struct GNUNET_SERVER_Client
-                     * client)
+client_disconnect_cb (void *cls,
+                     struct GNUNET_SERVICE_Client *client,
+                     void *app_ctx)
 {
   struct ReservationList *pos;
   struct ReservationList *prev;
   struct ReservationList *next;
 
-  if (client == NULL)
-    return;
+  GNUNET_assert (app_ctx == client);
   prev = NULL;
   pos = reservations;
   while (NULL != pos)
+  {
+    next = pos->next;
+    if (pos->client == client)
     {
-      next = pos->next;
-      if (pos->client == client)
-       {
-         if (prev == NULL)
-           reservations = next;
-         else
-           prev->next = next;
-         reserved -= pos->amount + pos->entries * GNUNET_DATASTORE_ENTRY_OVERHEAD;
-         GNUNET_free (pos);
-       }
+      if (NULL == prev)
+        reservations = next;
       else
-       {
-         prev = pos;
-       }
-      pos = next;
+        prev->next = next;
+      reserved -= pos->amount + pos->entries * GNUNET_DATASTORE_ENTRY_OVERHEAD;
+      GNUNET_free (pos);
+    }
+    else
+    {
+      prev = pos;
     }
+    pos = next;
+  }
   GNUNET_STATISTICS_set (stats,
-                        gettext_noop ("# reserved"),
-                        reserved,
-                        GNUNET_NO);
+                         gettext_noop ("# reserved"),
+                         reserved,
+                         GNUNET_NO);
+
 }
 
 
@@ -1652,137 +1472,212 @@ cleanup_reservations (void *cls,
  * Process datastore requests.
  *
  * @param cls closure
- * @param s scheduler to use
- * @param server the initialized server
+ * @param serv the initialized service
  * @param c configuration to use
  */
 static void
 run (void *cls,
-     struct GNUNET_SCHEDULER_Handle *s,
-     struct GNUNET_SERVER_Handle *server,
-     const struct GNUNET_CONFIGURATION_Handle *c)
+     const struct GNUNET_CONFIGURATION_Handle *c,
+     struct GNUNET_SERVICE_Handle *serv)
 {
-  static const struct GNUNET_SERVER_MessageHandler handlers[] = {
-    {&handle_reserve, NULL, GNUNET_MESSAGE_TYPE_DATASTORE_RESERVE, 
-     sizeof(struct ReserveMessage) }, 
-    {&handle_release_reserve, NULL, GNUNET_MESSAGE_TYPE_DATASTORE_RELEASE_RESERVE, 
-     sizeof(struct ReleaseReserveMessage) }, 
-    {&handle_put, NULL, GNUNET_MESSAGE_TYPE_DATASTORE_PUT, 0 }, 
-    {&handle_update, NULL, GNUNET_MESSAGE_TYPE_DATASTORE_UPDATE, 
-     sizeof (struct UpdateMessage) }, 
-    {&handle_get, NULL, GNUNET_MESSAGE_TYPE_DATASTORE_GET, 0 }, 
-    {&handle_get_random, NULL, GNUNET_MESSAGE_TYPE_DATASTORE_GET_RANDOM, 
-     sizeof(struct GNUNET_MessageHeader) }, 
-    {&handle_remove, NULL, GNUNET_MESSAGE_TYPE_DATASTORE_REMOVE, 0 }, 
-    {&handle_drop, NULL, GNUNET_MESSAGE_TYPE_DATASTORE_DROP, 
-     sizeof(struct GNUNET_MessageHeader) }, 
-    {NULL, NULL, 0, 0}
-  };
   char *fn;
+  char *pfn;
   unsigned int bf_size;
 
-  sched = s;
+  service = serv;
   cfg = c;
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_number (cfg,
-                                             "DATASTORE", "QUOTA", &quota))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                 _("No `%s' specified for `%s' in configuration!\n"),
-                 "QUOTA",
-                 "DATASTORE");
-      return;
-    }
-  stats = GNUNET_STATISTICS_create (sched, "datastore", cfg);
+      GNUNET_CONFIGURATION_get_value_string (cfg,
+                                             "DATASTORE",
+                                             "DATABASE",
+                                             &plugin_name))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               "DATABASE",
+                               "DATASTORE");
+    return;
+  }
+  GNUNET_asprintf (&quota_stat_name,
+                  _("# bytes used in file-sharing datastore `%s'"),
+                  plugin_name);
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_size (cfg,
+                                           "DATASTORE",
+                                           "QUOTA",
+                                           &quota))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               "QUOTA",
+                               "DATASTORE");
+    return;
+  }
+  stats = GNUNET_STATISTICS_create ("datastore",
+                                    cfg);
   GNUNET_STATISTICS_set (stats,
-                        gettext_noop ("# quota"),
-                        quota,
-                        GNUNET_NO);
-  cache_size = quota / 8; /* Or should we make this an option? */
+                         gettext_noop ("# quota"),
+                         quota,
+                         GNUNET_NO);
+  cache_size = quota / 8;       /* Or should we make this an option? */
   GNUNET_STATISTICS_set (stats,
-                        gettext_noop ("# cache size"),
-                        cache_size,
-                        GNUNET_NO);
-  bf_size = quota / 32; /* 8 bit per entry, 1 bit per 32 kb in DB */
+                         gettext_noop ("# cache size"),
+                         cache_size,
+                         GNUNET_NO);
+  if (quota / (32 * 1024LL) > MAX_BF_SIZE)
+    bf_size = MAX_BF_SIZE;
+  else
+    bf_size = quota / (32 * 1024LL);         /* 8 bit per entry, 1 bit per 32 kb in DB */
   fn = NULL;
-  if ( (GNUNET_OK !=
-       GNUNET_CONFIGURATION_get_value_filename (cfg,
-                                                "DATASTORE",
-                                                "BLOOMFILTER",
-                                                &fn)) ||
-       (GNUNET_OK !=
-       GNUNET_DISK_directory_create_for_file (fn)) )
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                 _("Could not use specified filename `%s' for bloomfilter.\n"),
-                 fn != NULL ? fn : "");
-      GNUNET_free_non_null (fn);
-      fn = NULL;
-    }
-  filter = GNUNET_CONTAINER_bloomfilter_load (fn, bf_size, 5);  /* approx. 3% false positives at max use */  
-  GNUNET_free_non_null (fn);
-  if (filter == NULL)
+  if ((GNUNET_OK !=
+       GNUNET_CONFIGURATION_get_value_filename (cfg,
+                                                "DATASTORE",
+                                                "BLOOMFILTER",
+                                                &fn)) ||
+      (GNUNET_OK != GNUNET_DISK_directory_create_for_file (fn)))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                _("Could not use specified filename `%s' for bloomfilter.\n"),
+                NULL != fn ? fn : "");
+    GNUNET_free_non_null (fn);
+    fn = NULL;
+  }
+  if (NULL != fn)
+  {
+    GNUNET_asprintf (&pfn, "%s.%s", fn, plugin_name);
+    if (GNUNET_YES == GNUNET_DISK_file_test (pfn))
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                 _("Failed to initialize bloomfilter.\n"));
-      if (stats != NULL)
+      filter = GNUNET_CONTAINER_bloomfilter_load (pfn, bf_size, 5);        /* approx. 3% false positives at max use */
+      if (NULL == filter)
+      {
+       /* file exists but not valid, remove and try again, but refresh */
+       if (0 != UNLINK (pfn))
        {
-         GNUNET_STATISTICS_destroy (stats, GNUNET_YES);
-         stats = NULL;
+         /* failed to remove, run without file */
+         GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                     _("Failed to remove bogus bloomfilter file `%s'\n"),
+                     pfn);
+         GNUNET_free (pfn);
+         pfn = NULL;
+         filter = GNUNET_CONTAINER_bloomfilter_load (NULL, bf_size, 5);        /* approx. 3% false positives at max use */
+         refresh_bf = GNUNET_YES;
        }
-      return;
-    }
-  plugin = load_plugin ();
-  if (NULL == plugin)
-    {
-      GNUNET_CONTAINER_bloomfilter_free (filter);
-      filter = NULL;
-      if (stats != NULL)
+       else
        {
-         GNUNET_STATISTICS_destroy (stats, GNUNET_YES);
-         stats = NULL;
+         /* try again after remove */
+         filter = GNUNET_CONTAINER_bloomfilter_load (pfn, bf_size, 5);        /* approx. 3% false positives at max use */
+         refresh_bf = GNUNET_YES;
+         if (NULL == filter)
+         {
+           /* failed yet again, give up on using file */
+           GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                       _("Failed to remove bogus bloomfilter file `%s'\n"),
+                       pfn);
+           GNUNET_free (pfn);
+           pfn = NULL;
+           filter = GNUNET_CONTAINER_bloomfilter_init (NULL, bf_size, 5);        /* approx. 3% false positives at max use */
+         }
        }
-      return;
+      }
+      else
+      {
+       /* normal case: have an existing valid bf file, no need to refresh */
+       refresh_bf = GNUNET_NO;
+      }
     }
-  stat_get = GNUNET_STATISTICS_get (stats,
-                                   "datastore",
-                                   QUOTA_STAT_NAME,
-                                   GNUNET_TIME_UNIT_SECONDS,
-                                   &process_stat_done,
-                                   &process_stat_in,
-                                   plugin);
-  GNUNET_SERVER_disconnect_notify (server, &cleanup_reservations, NULL);
-  GNUNET_SERVER_add_handlers (server, handlers);
-  expired_kill_task
-    = GNUNET_SCHEDULER_add_with_priority (sched,
-                                         GNUNET_SCHEDULER_PRIORITY_IDLE,
-                                         &delete_expired, NULL);
-  GNUNET_SCHEDULER_add_delayed (sched,
-                                GNUNET_TIME_UNIT_FOREVER_REL,
-                                &cleaning_task, NULL);
+    else
+    {
+      filter = GNUNET_CONTAINER_bloomfilter_load (pfn, bf_size, 5);        /* approx. 3% false positives at max use */
+      refresh_bf = GNUNET_YES;
+    }
+    GNUNET_free (pfn);
+  }
+  else
+  {
+    filter = GNUNET_CONTAINER_bloomfilter_init (NULL,
+                                                bf_size,
+                                                5);      /* approx. 3% false positives at max use */
+    refresh_bf = GNUNET_YES;
+  }
+  GNUNET_free_non_null (fn);
+  if (NULL == filter)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("Failed to initialize bloomfilter.\n"));
+    if (NULL != stats)
+    {
+      GNUNET_STATISTICS_destroy (stats,
+                                 GNUNET_YES);
+      stats = NULL;
+    }
+    return;
+  }
+  GNUNET_SERVICE_suspend (service);
+  stat_get =
+      GNUNET_STATISTICS_get (stats,
+                             "datastore",
+                             quota_stat_name,
+                             &process_stat_done,
+                             &process_stat_in,
+                             NULL);
+  if (NULL == stat_get)
+    process_stat_done (NULL,
+                       GNUNET_SYSERR);
+  else
+    stat_timeout_task
+      = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+                                      &stat_timeout,
+                                      NULL);
+  GNUNET_SCHEDULER_add_shutdown (&cleaning_task,
+                                NULL);
 }
 
 
 /**
- * The main function for the datastore service.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
+ * Define "main" method using service macro.
  */
-int
-main (int argc, char *const *argv)
-{
-  int ret;
-
-  ret = (GNUNET_OK ==
-         GNUNET_SERVICE_run (argc,
-                             argv,
-                             "datastore",
-                            GNUNET_SERVICE_OPTION_NONE,
-                            &run, NULL)) ? 0 : 1;
-  return ret;
-}
+GNUNET_SERVICE_MAIN
+("datastore",
+ GNUNET_SERVICE_OPTION_NONE,
+ &run,
+ &client_connect_cb,
+ &client_disconnect_cb,
+ NULL,
+ GNUNET_MQ_hd_fixed_size (reserve,
+                          GNUNET_MESSAGE_TYPE_DATASTORE_RESERVE,
+                          struct ReserveMessage,
+                          NULL),
+ GNUNET_MQ_hd_fixed_size (release_reserve,
+                          GNUNET_MESSAGE_TYPE_DATASTORE_RELEASE_RESERVE,
+                          struct ReleaseReserveMessage,
+                          NULL),
+ GNUNET_MQ_hd_var_size (put,
+                        GNUNET_MESSAGE_TYPE_DATASTORE_PUT,
+                        struct DataMessage,
+                        NULL),
+ GNUNET_MQ_hd_fixed_size (get,
+                          GNUNET_MESSAGE_TYPE_DATASTORE_GET,
+                          struct GetMessage,
+                          NULL),
+ GNUNET_MQ_hd_fixed_size (get_key,
+                          GNUNET_MESSAGE_TYPE_DATASTORE_GET_KEY,
+                          struct GetKeyMessage,
+                          NULL),
+ GNUNET_MQ_hd_fixed_size (get_replication,
+                          GNUNET_MESSAGE_TYPE_DATASTORE_GET_REPLICATION,
+                          struct GNUNET_MessageHeader,
+                          NULL),
+ GNUNET_MQ_hd_fixed_size (get_zero_anonymity,
+                          GNUNET_MESSAGE_TYPE_DATASTORE_GET_ZERO_ANONYMITY,
+                          struct GetZeroAnonymityMessage,
+                          NULL),
+ GNUNET_MQ_hd_var_size (remove,
+                        GNUNET_MESSAGE_TYPE_DATASTORE_REMOVE,
+                        struct DataMessage,
+                        NULL),
+ GNUNET_MQ_hd_fixed_size (drop,
+                          GNUNET_MESSAGE_TYPE_DATASTORE_DROP,
+                          struct GNUNET_MessageHeader,
+                          NULL),
+ GNUNET_MQ_handler_end ());
 
 
 /* end of gnunet-service-datastore.c */