gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r17075 - gnunet/src/dht


From: gnunet
Subject: [GNUnet-SVN] r17075 - gnunet/src/dht
Date: Tue, 27 Sep 2011 22:47:22 +0200

Author: grothoff
Date: 2011-09-27 22:47:21 +0200 (Tue, 27 Sep 2011)
New Revision: 17075

Removed:
   gnunet/src/dht/dhtlog.c
   gnunet/src/dht/dhtlog.h
   gnunet/src/dht/gnunet-service-dht.c
   gnunet/src/dht/plugin_dhtlog_dummy.c
   gnunet/src/dht/plugin_dhtlog_mysql.c
   gnunet/src/dht/plugin_dhtlog_mysql_dump.c
Modified:
   gnunet/src/dht/Makefile.am
   gnunet/src/dht/gnunet-dht-get.c
Log:
DCE

Modified: gnunet/src/dht/Makefile.am
===================================================================
--- gnunet/src/dht/Makefile.am  2011-09-27 20:45:02 UTC (rev 17074)
+++ gnunet/src/dht/Makefile.am  2011-09-27 20:47:21 UTC (rev 17075)
@@ -5,10 +5,6 @@
 
 plugindir = $(libdir)/gnunet
 
-if HAVE_MYSQL
- MYSQL_PLUGIN = libgnunet_plugin_dhtlog_mysql.la
-endif
-
 if HAVE_ZLIB
  ZLIB_LNK = -lz
 endif
@@ -20,57 +16,9 @@
 
 lib_LTLIBRARIES = \
  libgnunetdht.la \
- libgnunetdhtnew.la \
- libgnunetdhtlog.la
+ libgnunetdhtnew.la 
 
-plugin_LTLIBRARIES = \
- $(MYSQL_PLUGIN) \
- libgnunet_plugin_dhtlog_dummy.la \
- libgnunet_plugin_dhtlog_mysql_dump.la \
- libgnunet_plugin_dhtlog_mysql_dump_load.la  
 
-
-libgnunet_plugin_dhtlog_mysql_la_SOURCES = \
-  plugin_dhtlog_mysql.c
-libgnunet_plugin_dhtlog_mysql_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lz -lsqlite3
-libgnunet_plugin_dhtlog_mysql_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS) $(MYSQL_LDFLAGS) -lmysqlclient
-libgnunet_plugin_dhtlog_mysql_la_CPFLAGS = \
- $(MYSQL_CPPFLAGS)
-
-libgnunet_plugin_dhtlog_dummy_la_SOURCES = \
-  plugin_dhtlog_dummy.c
-libgnunet_plugin_dhtlog_dummy_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(XLIB)
-libgnunet_plugin_dhtlog_dummy_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-libgnunet_plugin_dhtlog_mysql_dump_la_SOURCES = \
-  plugin_dhtlog_mysql_dump.c
-libgnunet_plugin_dhtlog_mysql_dump_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(XLIB)
-libgnunet_plugin_dhtlog_mysql_dump_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-libgnunet_plugin_dhtlog_mysql_dump_load_la_SOURCES = \
-  plugin_dhtlog_mysql_dump_load.c
-libgnunet_plugin_dhtlog_mysql_dump_load_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(XLIB)
-libgnunet_plugin_dhtlog_mysql_dump_load_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-libgnunetdhtlog_la_SOURCES = \
-  dhtlog.c dhtlog.h
-libgnunetdhtlog_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la
-libgnunetdhtlog_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS) $(WINFLAGS) \
-  -version-info 0:0:0
-
 libgnunetdht_la_SOURCES = \
   dht_api.c dht.h \
   dht_api_get_put.c \
@@ -92,7 +40,6 @@
   -version-info 0:0:0
 
 bin_PROGRAMS = \
- gnunet-service-dht \
  gnunet-service-dht-new \
  gnunet-dht-get \
  gnunet-dht-put
@@ -102,21 +49,6 @@
  gnunet-dht-driver 
 endif
 
-gnunet_service_dht_SOURCES = \
- gnunet-service-dht.c         
-gnunet_service_dht_LDADD = \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/core/libgnunetcore.la \
-  $(top_builddir)/src/nse/libgnunetnse.la \
-  $(top_builddir)/src/transport/libgnunettransport.la \
-  $(top_builddir)/src/hello/libgnunethello.la \
-  $(top_builddir)/src/block/libgnunetblock.la \
-  $(top_builddir)/src/datacache/libgnunetdatacache.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/dht/libgnunetdhtlog.la -lm
-gnunet_service_dht_DEPENDENCIES = \
-  libgnunetdhtlog.la                             
-
 gnunet_service_dht_new_SOURCES = \
  gnunet-service-dht-new.c gnunet-service-dht.h \
  gnunet-service-dht_clients.c gnunet-service-dht_clients.h \

Deleted: gnunet/src/dht/dhtlog.c
===================================================================
--- gnunet/src/dht/dhtlog.c     2011-09-27 20:45:02 UTC (rev 17074)
+++ gnunet/src/dht/dhtlog.c     2011-09-27 20:47:21 UTC (rev 17075)
@@ -1,93 +0,0 @@
-/*
-     This file is part of GNUnet.
-     (C) 2006 - 2009 Christian Grothoff (and other contributing authors)
-
-     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, 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.
-*/
-
-/**
- * @file src/dht/dhtlog.c
- * @brief Plugin loaded to load logging
- *        to record DHT operations
- * @author Nathan Evans
- *
- * Database: Loaded by plugin MySQL
- */
-
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "dhtlog.h"
-
-static char *libname;
-
-/*
- * Provides the dhtlog api
- *
- * @param c the configuration to use to connect to a server
- *
- * @return the handle to the server, or NULL on error
- */
-struct GNUNET_DHTLOG_Handle *
-GNUNET_DHTLOG_connect (const struct GNUNET_CONFIGURATION_Handle *c)
-{
-  struct GNUNET_DHTLOG_Plugin *plugin;
-  struct GNUNET_DHTLOG_Handle *api;
-  char *plugin_name;
-
-  plugin = GNUNET_malloc (sizeof (struct GNUNET_DHTLOG_Plugin));
-  plugin->cfg = c;
-  if (GNUNET_OK ==
-      GNUNET_CONFIGURATION_get_value_string (c, "DHTLOG", "PLUGIN",
-                                             &plugin_name))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Loading `%s' dhtlog plugin\n"),
-                plugin_name);
-    GNUNET_asprintf (&libname, "libgnunet_plugin_dhtlog_%s", plugin_name);
-    GNUNET_PLUGIN_load (libname, plugin);
-  }
-
-  if (plugin->dhtlog_api == NULL)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _("Failed to load dhtlog plugin for `%s'\n"), plugin_name);
-    GNUNET_free (plugin_name);
-    GNUNET_free (plugin);
-    return NULL;
-  }
-
-  api = plugin->dhtlog_api;
-  GNUNET_free (plugin_name);
-  GNUNET_free (plugin);
-  return api;
-}
-
-/**
- * Shutdown the module.
- */
-void
-GNUNET_DHTLOG_disconnect (struct GNUNET_DHTLOG_Handle *api)
-{
-#if DEBUG_DHTLOG
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MySQL DHT Logger: database 
shutdown\n");
-#endif
-  if (api != NULL)
-  {
-    GNUNET_PLUGIN_unload (libname, api);
-  }
-  GNUNET_free_non_null (libname);
-}
-
-/* end of dhtlog.c */

Deleted: gnunet/src/dht/dhtlog.h
===================================================================
--- gnunet/src/dht/dhtlog.h     2011-09-27 20:45:02 UTC (rev 17074)
+++ gnunet/src/dht/dhtlog.h     2011-09-27 20:47:21 UTC (rev 17075)
@@ -1,394 +0,0 @@
-/*
-     This file is part of GNUnet
-     (C) 2006 Christian Grothoff (and other contributing authors)
-
-     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, 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.
-*/
-
-/**
- * @file src/dht/dhtlog.h
- *
- * @brief dhtlog is a service that implements logging of dht operations
- * for testing
- * @author Nathan Evans
- */
-
-#ifndef GNUNET_DHTLOG_SERVICE_H
-#define GNUNET_DHTLOG_SERVICE_H
-
-#include "gnunet_util_lib.h"
-
-#ifdef __cplusplus
-extern "C"
-{
-#if 0                           /* keep Emacsens' auto-indent happy */
-}
-#endif
-#endif
-
-typedef enum
-{
-  /**
-   * Type for a DHT GET message
-   */
-  DHTLOG_GET = 1,
-
-  /**
-   * Type for a DHT PUT message
-   */
-  DHTLOG_PUT = 2,
-
-  /**
-   * Type for a DHT FIND PEER message
-   */
-  DHTLOG_FIND_PEER = 3,
-
-  /**
-   * Type for a DHT RESULT message
-   */
-  DHTLOG_RESULT = 4,
-
-  /**
-   * Generic DHT ROUTE message
-   */
-  DHTLOG_ROUTE = 5,
-
-} DHTLOG_MESSAGE_TYPES;
-
-struct GNUNET_DHTLOG_TrialInfo
-{
-  /**
-   * Outside of database identifier for the trial.
-   */
-  unsigned int other_identifier;
-
-  /** Number of nodes in the trial */
-  unsigned int num_nodes;
-
-  /** Type of initial topology */
-  unsigned int topology;
-
-  /** Topology to blacklist peers to */
-  unsigned int blacklist_topology;
-
-  /** Initially connect peers in this topology */
-  unsigned int connect_topology;
-
-  /** Option to modify connect topology */
-  unsigned int connect_topology_option;
-
-  /** Modifier for the connect option */
-  float connect_topology_option_modifier;
-
-  /** Percentage parameter used for certain topologies */
-  float topology_percentage;
-
-  /** Probability parameter used for certain topologies */
-  float topology_probability;
-
-  /** Number of puts in the trial */
-  unsigned int puts;
-
-  /** Number of gets in the trial */
-  unsigned int gets;
-
-  /** Concurrent puts/gets in the trial (max allowed) */
-  unsigned int concurrent;
-
-  /** How long between initial connection and issuing puts/gets */
-  unsigned int settle_time;
-
-  /** How many times to do put/get loop */
-  unsigned int num_rounds;
-
-  /** Number of malicious getters */
-  unsigned int malicious_getters;
-
-  /** Number of malicious putters */
-  unsigned int malicious_putters;
-
-  /** Number of malicious droppers */
-  unsigned int malicious_droppers;
-
-  /** Frequency of malicious get requests */
-  unsigned int malicious_get_frequency;
-
-  /** Frequency of malicious put requests */
-  unsigned int malicious_put_frequency;
-
-  /** Stop forwarding put/find_peer requests when peer is closer than others */
-  unsigned int stop_closest;
-
-  /** Stop forwarding get requests when data found */
-  unsigned int stop_found;
-
-  /**
-   * Routing behaves as it would in Kademlia (modified to work recursively,
-   * and with our other GNUnet constraints).
-   */
-  unsigned int strict_kademlia;
-
-  /** Number of gets that were reported successful */
-  unsigned int gets_succeeded;
-
-  /** Message for this trial */
-  char *message;
-};
-
-struct GNUNET_DHTLOG_Handle
-{
-
-  /*
-   * Inserts the specified query into the dhttests.queries table
-   *
-   * @param sqlqueruid inserted query uid
-   * @param queryid dht query id
-   * @param type type of the query
-   * @param hops number of hops query traveled
-   * @param succeeded whether or not query was successful
-   * @param node the node the query hit
-   * @param key the key of the query
-   *
-   * @return GNUNET_OK on success, GNUNET_SYSERR on failure.
-   */
-  int (*insert_query) (unsigned long long *sqlqueryuid,
-                       unsigned long long queryid, DHTLOG_MESSAGE_TYPES type,
-                       unsigned int hops, int succeeded,
-                       const struct GNUNET_PeerIdentity * node,
-                       const GNUNET_HashCode * key);
-
-  /*
-   * Inserts the specified trial into the dhttests.trials table
-   *
-   * @param trial_info general information about this trial
-   *
-   * @return GNUNET_OK on success, GNUNET_SYSERR on failure
-   */
-  int (*insert_trial) (struct GNUNET_DHTLOG_TrialInfo * trial_info);
-
-  /*
-   * Inserts the specified stats into the dhttests.node_statistics table
-   *
-   * @param peer the peer inserting the statistic
-   * @param route_requests route requests seen
-   * @param route_forwards route requests forwarded
-   * @param result_requests route result requests seen
-   * @param client_requests client requests initiated
-   * @param result_forwards route results forwarded
-   * @param gets get requests handled
-   * @param puts put requests handle
-   * @param data_inserts data inserted at this node
-   * @param find_peer_requests find peer requests seen
-   * @param find_peers_started find peer requests initiated at this node
-   * @param gets_started get requests initiated at this node
-   * @param puts_started put requests initiated at this node
-   * @param find_peer_responses_received find peer responses received locally
-   * @param get_responses_received get responses received locally
-   * @param find_peer_responses_sent find peer responses sent from this node
-   * @param get_responses_sent get responses sent from this node
-   *
-   * @return GNUNET_OK on success, GNUNET_SYSERR on failure
-   */
-  int (*insert_stat) (const struct GNUNET_PeerIdentity * peer,
-                      unsigned int route_requests, unsigned int route_forwards,
-                      unsigned int result_requests,
-                      unsigned int client_requests,
-                      unsigned int result_forwards, unsigned int gets,
-                      unsigned int puts, unsigned int data_inserts,
-                      unsigned int find_peer_requests,
-                      unsigned int find_peers_started,
-                      unsigned int gets_started, unsigned int puts_started,
-                      unsigned int find_peer_responses_received,
-                      unsigned int get_responses_received,
-                      unsigned int find_peer_responses_sent,
-                      unsigned int get_responses_sent);
-
-  /*
-   * Update dhttests.trials table with current server time as end time
-   *
-   * @param gets_succeeded how many gets did the trial report successful
-   *
-   * @return GNUNET_OK on success, GNUNET_SYSERR on failure.
-   */
-  int (*update_trial) (unsigned int gets_succeeded);
-
-  /*
-   * Update dhttests.nodes table setting the identified
-   * node as a malicious dropper.
-   *
-   * @param peer the peer that was set to be malicious
-   *
-   * @return GNUNET_OK on success, GNUNET_SYSERR on failure.
-   */
-  int (*set_malicious) (struct GNUNET_PeerIdentity * peer);
-
-  /*
-   * Records the current topology (number of connections, time, trial)
-   *
-   * @param num_connections how many connections are in the topology
-   *
-   * @return GNUNET_OK on success, GNUNET_SYSERR on failure
-   */
-  int (*insert_topology) (int num_connections);
-
-  /*
-   * Records a connection between two peers in the current topology
-   *
-   * @param first one side of the connection
-   * @param second other side of the connection
-   *
-   * @return GNUNET_OK on success, GNUNET_SYSERR on failure
-   */
-  int (*insert_extended_topology) (const struct GNUNET_PeerIdentity * first,
-                                   const struct GNUNET_PeerIdentity * second);
-
-  /*
-   * Inserts the specified stats into the dhttests.generic_stats table
-   *
-   * @param peer the peer inserting the statistic
-   * @param name the name of the statistic
-   * @param section the section of the statistic
-   * @param value the value of the statistic
-   *
-   * @return GNUNET_OK on success, GNUNET_SYSERR on failure
-   */
-  int (*add_generic_stat) (const struct GNUNET_PeerIdentity * peer,
-                           const char *name, const char *section,
-                           uint64_t value);
-
-  /*
-   * Inserts the specified round into the dhttests.rounds table
-   *
-   * @param round_type the type of round that is being started
-   * @param round_count counter for the round (if applicable)
-   *
-   * @return GNUNET_OK on success, GNUNET_SYSERR on failure
-   */
-  int (*insert_round) (unsigned int round_type, unsigned int round_count);
-
-  /*
-   * Inserts the specified round results into the
-   * dhttests.processed_round_details table
-   *
-   * @param round_type the type of round that is being started
-   * @param round_count counter for the round (if applicable)
-   * @param num_messages the total number of messages initiated
-   * @param num_messages_succeeded the number of messages that succeeded
-   *
-   * @return GNUNET_OK on success, GNUNET_SYSERR on failure
-   */
-  int (*insert_round_details) (unsigned int round_type,
-                               unsigned int round_count,
-                               unsigned int num_messages,
-                               unsigned int num_messages_succeeded);
-
-  /*
-   * Update dhttests.trials table with total connections information
-   *
-   * @param totalConnections the number of connections
-   *
-   * @return GNUNET_OK on success, GNUNET_SYSERR on failure.
-   */
-  int (*update_connections) (unsigned int totalConnections);
-
-  /*
-   * Update dhttests.trials table with total connections information
-   *
-   * @param connections the number of connections
-   *
-   * @return GNUNET_OK on success, GNUNET_SYSERR on failure.
-   */
-  int (*update_topology) (unsigned int connections);
-
-  /*
-   * Inserts the specified route information into the dhttests.routes table
-   *
-   * @param sqlqueruid inserted query uid
-   * @param queryid dht query id
-   * @param type type of the query
-   * @param hops number of hops query traveled
-   * @param succeeded whether or not query was successful
-   * @param node the node the query hit
-   * @param key the key of the query
-   * @param from_node the node that sent the message to node
-   * @param to_node next node to forward message to
-   *
-   * @return GNUNET_OK on success, GNUNET_SYSERR on failure.
-   */
-  int (*insert_route) (unsigned long long *sqlqueryuid,
-                       unsigned long long queryid, unsigned int type,
-                       unsigned int hops, int succeeded,
-                       const struct GNUNET_PeerIdentity * node,
-                       const GNUNET_HashCode * key,
-                       const struct GNUNET_PeerIdentity * from_node,
-                       const struct GNUNET_PeerIdentity * to_node);
-
-  /*
-   * Inserts the specified node into the dhttests.nodes table
-   *
-   * @param nodeuid the inserted node uid
-   * @param node the node to insert
-   *
-   * @return GNUNET_OK on success, GNUNET_SYSERR on failure
-   */
-  int (*insert_node) (unsigned long long *nodeuid,
-                      struct GNUNET_PeerIdentity * node);
-
-  /*
-   * Inserts the specified dhtkey into the dhttests.dhtkeys table,
-   * stores return value of dhttests.dhtkeys.dhtkeyuid into dhtkeyuid
-   *
-   * @param dhtkeyuid return value
-   * @param dhtkey hashcode of key to insert
-   *
-   * @return GNUNET_OK on success, GNUNET_SYSERR on failure
-   */
-  int (*insert_dhtkey) (unsigned long long *dhtkeyuid,
-                        const GNUNET_HashCode * dhtkey);
-
-};
-
-struct GNUNET_DHTLOG_Plugin
-{
-  const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-  struct GNUNET_DHTLOG_Handle *dhtlog_api;
-};
-
-/**
- * Connect to mysql server using the DHT log plugin.
- *
- * @param c a configuration to use
- */
-struct GNUNET_DHTLOG_Handle *
-GNUNET_DHTLOG_connect (const struct GNUNET_CONFIGURATION_Handle *c);
-
-/**
- * Shutdown the module.
- */
-void
-GNUNET_DHTLOG_disconnect (struct GNUNET_DHTLOG_Handle *api);
-
-
-#if 0                           /* keep Emacsens' auto-indent happy */
-{
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-/* end of dhtlog.h */
-#endif

Modified: gnunet/src/dht/gnunet-dht-get.c
===================================================================
--- gnunet/src/dht/gnunet-dht-get.c     2011-09-27 20:45:02 UTC (rev 17074)
+++ gnunet/src/dht/gnunet-dht-get.c     2011-09-27 20:47:21 UTC (rev 17075)
@@ -61,7 +61,6 @@
  */
 static struct GNUNET_DHT_Handle *dht_handle;
 
-
 /**
  * Global handle of the configuration
  */
@@ -121,7 +120,7 @@
  * @param size number of bytes in data
  * @param data pointer to the result data
  */
-void
+static void
 get_result_iterator (void *cls, struct GNUNET_TIME_Absolute exp,
                      const GNUNET_HashCode * key,
                      const struct GNUNET_PeerIdentity *get_path,

Deleted: gnunet/src/dht/gnunet-service-dht.c
===================================================================
--- gnunet/src/dht/gnunet-service-dht.c 2011-09-27 20:45:02 UTC (rev 17074)
+++ gnunet/src/dht/gnunet-service-dht.c 2011-09-27 20:47:21 UTC (rev 17075)
@@ -1,4773 +0,0 @@
-/*
-     This file is part of GNUnet.
-     (C) 2009, 2010, 2011 Christian Grothoff (and other contributing authors)
-
-     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 3, 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.
-*/
-
-/**
- * @file dht/gnunet-service-dht.c
- * @brief GNUnet DHT service
- * @author Christian Grothoff
- * @author Nathan Evans
- *
- * TODO:
- * - decide which 'benchmark'/test functions to keep (malicious code, 
kademlia, etc.)
- * - decide on 'stop_on_closest', 'stop_on_found', 'do_find_peer', 
'paper_forwarding'
- * - use OPTION_MULTIPLE instead of linked list for the forward_list.hashmap
- * - use different 'struct DHT_MessageContext' for the different types of
- *   messages (currently rather confusing, especially with things like
- *   peer bloom filters occuring when processing replies).
- * - why do we have request UIDs again?
- */
-
-#include "platform.h"
-#include "gnunet_block_lib.h"
-#include "gnunet_constants.h"
-#include "gnunet_protocols.h"
-#include "gnunet_nse_service.h"
-#include "gnunet_core_service.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_datacache_lib.h"
-#include "gnunet_transport_service.h"
-#include "gnunet_hello_lib.h"
-#include "gnunet_dht_service.h"
-#include "gnunet_statistics_service.h"
-#include "dhtlog.h"
-#include "dht.h"
-#include <fenv.h>
-
-
-/**
- * How many buckets will we allow total.
- */
-#define MAX_BUCKETS sizeof (GNUNET_HashCode) * 8
-
-/**
- * Should the DHT issue FIND_PEER requests to get better routing tables?
- */
-#define DEFAULT_DO_FIND_PEER GNUNET_YES
-
-/**
- * Defines whether find peer requests send their HELLO's outgoing,
- * or expect replies to contain hellos.
- */
-#define FIND_PEER_WITH_HELLO GNUNET_YES
-
-/**
- * What is the maximum number of peers in a given bucket.
- */
-#define DEFAULT_BUCKET_SIZE 4
-
-#define DEFAULT_CORE_QUEUE_SIZE 32
-
-/**
- * Minimum number of peers we need for "good" routing,
- * any less than this and we will allow messages to
- * travel much further through the network!
- */
-#define MINIMUM_PEER_THRESHOLD 20
-
-/**
- * Number of requests we track at most (for routing replies).
- */
-#define DHT_MAX_RECENT (1024 * 16)
-
-/**
- * How long do we wait at most when queueing messages with core
- * that we are sending on behalf of other peers.
- */
-#define DHT_DEFAULT_P2P_TIMEOUT GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS, 10)
-
-/**
- * Default importance for handling messages on behalf of other peers.
- */
-#define DHT_DEFAULT_P2P_IMPORTANCE 0
-
-/**
- * How long to keep recent requests around by default.
- */
-#define DEFAULT_RECENT_REMOVAL GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS, 60)
-
-/**
- * Default time to wait to send find peer messages sent by the dht service.
- */
-#define DHT_DEFAULT_FIND_PEER_TIMEOUT GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS, 30)
-
-/**
- * Default importance for find peer messages sent by the dht service.
- */
-#define DHT_DEFAULT_FIND_PEER_IMPORTANCE 8
-
-/**
- * Default replication parameter for find peer messages sent by the dht 
service.
- */
-#define DHT_DEFAULT_FIND_PEER_REPLICATION 4
-
-/**
- * How long at least to wait before sending another find peer request.
- */
-#define DHT_MINIMUM_FIND_PEER_INTERVAL 
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 2)
-
-/**
- * How long at most to wait before sending another find peer request.
- */
-#define DHT_MAXIMUM_FIND_PEER_INTERVAL 
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 8)
-
-/**
- * How often to update our preference levels for peers in our routing tables.
- */
-#define DHT_DEFAULT_PREFERENCE_INTERVAL 
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 2)
-
-/**
- * How long at most on average will we allow a reply forward to take
- * (before we quit sending out new requests)
- */
-#define MAX_REQUEST_TIME GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS, 1)
-
-/**
- * How many initial requests to send out (in true Kademlia fashion)
- */
-#define DEFAULT_KADEMLIA_REPLICATION 3
-
-/**
- * Default frequency for sending malicious get messages
- */
-#define DEFAULT_MALICIOUS_GET_FREQUENCY GNUNET_TIME_UNIT_SECONDS
-
-/**
- * Default frequency for sending malicious put messages
- */
-#define DEFAULT_MALICIOUS_PUT_FREQUENCY GNUNET_TIME_UNIT_SECONDS
-
-/**
- * How many time differences between requesting a core send and
- * the actual callback to remember.
- */
-#define MAX_REPLY_TIMES 8
-
-
-/**
- * Linked list of messages to send to clients.
- */
-struct P2PPendingMessage
-{
-  /**
-   * Pointer to next item in the list
-   */
-  struct P2PPendingMessage *next;
-
-  /**
-   * Pointer to previous item in the list
-   */
-  struct P2PPendingMessage *prev;
-
-  /**
-   * Message importance level.
-   */
-  unsigned int importance;
-
-  /**
-   * Time when this request was scheduled to be sent.
-   */
-  struct GNUNET_TIME_Absolute scheduled;
-
-  /**
-   * How long to wait before sending message.
-   */
-  struct GNUNET_TIME_Relative timeout;
-
-  /**
-   * Actual message to be sent; // avoid allocation
-   */
-  const struct GNUNET_MessageHeader *msg;       // msg = (cast) &pm[1]; // 
memcpy (&pm[1], data, len);
-
-};
-
-
-/**
- * Per-peer information.
- */
-struct PeerInfo
-{
-  /**
-   * Next peer entry (DLL)
-   */
-  struct PeerInfo *next;
-
-  /**
-   *  Prev peer entry (DLL)
-   */
-  struct PeerInfo *prev;
-
-  /**
-   * Count of outstanding messages for peer.
-   */
-  unsigned int pending_count;
-
-  /**
-   * Head of pending messages to be sent to this peer.
-   */
-  struct P2PPendingMessage *head;
-
-  /**
-   * Tail of pending messages to be sent to this peer.
-   */
-  struct P2PPendingMessage *tail;
-
-  /**
-   * Core handle for sending messages to this peer.
-   */
-  struct GNUNET_CORE_TransmitHandle *th;
-
-  /**
-   * Task for scheduling message sends.
-   */
-  GNUNET_SCHEDULER_TaskIdentifier send_task;
-
-  /**
-   * Task for scheduling preference updates
-   */
-  GNUNET_SCHEDULER_TaskIdentifier preference_task;
-
-  /**
-   * Preference update context
-   */
-  struct GNUNET_CORE_InformationRequestContext *info_ctx;
-
-  /**
-   * What is the identity of the peer?
-   */
-  struct GNUNET_PeerIdentity id;
-
-#if 0
-  /**
-   * What is the average latency for replies received?
-   */
-  struct GNUNET_TIME_Relative latency;
-
-  /**
-   * Transport level distance to peer.
-   */
-  unsigned int distance;
-#endif
-
-  /**
-   * Task for scheduling periodic ping messages for this peer.
-   */
-  GNUNET_SCHEDULER_TaskIdentifier ping_task;
-};
-
-
-/**
- * Peers are grouped into buckets.
- */
-struct PeerBucket
-{
-  /**
-   * Head of DLL
-   */
-  struct PeerInfo *head;
-
-  /**
-   * Tail of DLL
-   */
-  struct PeerInfo *tail;
-
-  /**
-   * Number of peers in the bucket.
-   */
-  unsigned int peers_size;
-};
-
-
-/**
- * Linked list of messages to send to clients.
- */
-struct PendingMessage
-{
-  /**
-   * Pointer to next item in the list
-   */
-  struct PendingMessage *next;
-
-  /**
-   * Pointer to previous item in the list
-   */
-  struct PendingMessage *prev;
-
-  /**
-   * Actual message to be sent; // avoid allocation
-   */
-  const struct GNUNET_MessageHeader *msg;       // msg = (cast) &pm[1]; // 
memcpy (&pm[1], data, len);
-
-};
-
-
-/**
- * Struct containing information about a client,
- * handle to connect to it, and any pending messages
- * that need to be sent to it.
- */
-struct ClientList
-{
-  /**
-   * Linked list of active clients
-   */
-  struct ClientList *next;
-
-  /**
-   * The handle to this client
-   */
-  struct GNUNET_SERVER_Client *client_handle;
-
-  /**
-   * Handle to the current transmission request, NULL
-   * if none pending.
-   */
-  struct GNUNET_CONNECTION_TransmitHandle *transmit_handle;
-
-  /**
-   * Linked list of pending messages for this client
-   */
-  struct PendingMessage *pending_head;
-
-  /**
-   * Tail of linked list of pending messages for this client
-   */
-  struct PendingMessage *pending_tail;
-};
-
-
-/**
- * Context containing information about a DHT message received.
- */
-struct DHT_MessageContext
-{
-  /**
-   * The client this request was received from.
-   * (NULL if received from another peer)
-   */
-  struct ClientList *client;
-
-  /**
-   * The peer this request was received from.
-   */
-  struct GNUNET_PeerIdentity peer;
-
-  /**
-   * Bloomfilter for this routing request.
-   */
-  struct GNUNET_CONTAINER_BloomFilter *bloom;
-
-  /**
-   * extended query (see gnunet_block_lib.h).
-   */
-  const void *xquery;
-
-  /**
-   * Bloomfilter to filter out duplicate replies.
-   */
-  struct GNUNET_CONTAINER_BloomFilter *reply_bf;
-
-  /**
-   * The key this request was about
-   */
-  GNUNET_HashCode key;
-
-  /**
-   * How long should we wait to transmit this request?
-   */
-  struct GNUNET_TIME_Relative timeout;
-
-  /**
-   * The unique identifier of this request
-   */
-  uint64_t unique_id;
-
-  /**
-   * Number of bytes in xquery.
-   */
-  size_t xquery_size;
-
-  /**
-   * Mutator value for the reply_bf, see gnunet_block_lib.h
-   */
-  uint32_t reply_bf_mutator;
-
-  /**
-   * Desired replication level
-   */
-  uint32_t replication;
-
-  /**
-   * Network size estimate, either ours or the sum of
-   * those routed to thus far. =~ Log of number of peers
-   * chosen from for this request.
-   */
-  uint32_t network_size;
-
-  /**
-   * Any message options for this request
-   */
-  uint32_t msg_options;
-
-  /**
-   * How many hops has the message already traversed?
-   */
-  uint32_t hop_count;
-
-  /**
-   * How many peer identities are present in the path history?
-   */
-  uint32_t path_history_len;
-
-  /**
-   * Path history.
-   */
-  char *path_history;
-
-  /**
-   * How important is this message?
-   */
-  unsigned int importance;
-
-  /**
-   * Should we (still) forward the request on to other peers?
-   */
-  int do_forward;
-
-  /**
-   * Did we forward this message? (may need to remember it!)
-   */
-  int forwarded;
-
-  /**
-   * Are we the closest known peer to this key (out of our neighbors?)
-   */
-  int closest;
-};
-
-
-/**
- * Record used for remembering what peers are waiting for what
- * responses (based on search key).
- */
-struct DHTRouteSource
-{
-  /**
-   * This is a DLL.
-   */
-  struct DHTRouteSource *next;
-
-  /**
-   * This is a DLL.
-   */
-  struct DHTRouteSource *prev;
-
-  /**
-   * UID of the request, 0 if from another peer.
-   */
-  uint64_t uid;
-
-  /**
-   * Source of the request.  Replies should be forwarded to
-   * this peer.
-   */
-  struct GNUNET_PeerIdentity source;
-
-  /**
-   * If this was a local request, remember the client; otherwise NULL.
-   */
-  struct ClientList *client;
-
-  /**
-   * Pointer to this nodes heap location (for removal)
-   */
-  struct GNUNET_CONTAINER_HeapNode *hnode;
-
-  /**
-   * Back pointer to the record storing this information.
-   */
-  struct DHTQueryRecord *record;
-
-  /**
-   * Task to remove this entry on timeout.
-   */
-  GNUNET_SCHEDULER_TaskIdentifier delete_task;
-
-  /**
-   * Bloomfilter of peers we have already sent back as
-   * replies to the initial request.  Allows us to not
-   * forward the same peer multiple times for a find peer
-   * request.
-   */
-  struct GNUNET_CONTAINER_BloomFilter *find_peers_responded;
-
-};
-
-
-/**
- * Entry in the DHT routing table.
- */
-struct DHTQueryRecord
-{
-  /**
-   * Head of DLL for result forwarding.
-   */
-  struct DHTRouteSource *head;
-
-  /**
-   * Tail of DLL for result forwarding.
-   */
-  struct DHTRouteSource *tail;
-
-  /**
-   * Key that the record concerns.
-   */
-  GNUNET_HashCode key;
-
-};
-
-
-/**
- * Context used to calculate the number of find peer messages
- * per X time units since our last scheduled find peer message
- * was sent.  If we have seen too many messages, delay or don't
- * send our own out.
- */
-struct FindPeerMessageContext
-{
-  unsigned int count;
-
-  struct GNUNET_TIME_Absolute start;
-
-  struct GNUNET_TIME_Absolute end;
-};
-
-
-/**
- * DHT Routing results structure
- */
-struct DHTResults
-{
-  /**
-   * Min heap for removal upon reaching limit
-   */
-  struct GNUNET_CONTAINER_Heap *minHeap;
-
-
-  /**
-   * Hashmap for fast key based lookup
-   */
-  struct GNUNET_CONTAINER_MultiHashMap *hashmap;
-};
-
-
-/**
- * DHT structure for recent requests.
- */
-struct RecentRequests
-{
-  /**
-   * Min heap for removal upon reaching limit
-   */
-  struct GNUNET_CONTAINER_Heap *minHeap;
-
-#if HAVE_UID_FOR_TESTING > 1
-  /**
-   * Hashmap for key based lookup
-   */
-  struct GNUNET_CONTAINER_MultiHashMap *hashmap;
-#endif
-
-};
-
-
-struct RecentRequest
-{
-  /**
-   * Position of this node in the min heap.
-   */
-  struct GNUNET_CONTAINER_HeapNode *heap_node;
-
-  /**
-   * Bloomfilter containing entries for peers
-   * we forwarded this request to.
-   */
-  struct GNUNET_CONTAINER_BloomFilter *bloom;
-
-  /**
-   * Timestamp of this request, for ordering
-   * the min heap.
-   */
-  struct GNUNET_TIME_Absolute timestamp;
-
-  /**
-   * Key of this request.
-   */
-  GNUNET_HashCode key;
-
-  /**
-   * Unique identifier for this request, 0 if from another peer.
-   */
-  uint64_t uid;
-
-  /**
-   * Task to remove this entry on timeout.
-   */
-  GNUNET_SCHEDULER_TaskIdentifier remove_task;
-};
-
-
-/**
- * log of the current network size estimate, used as the point where
- * we switch between random and deterministic routing.  Default
- * value of 4.0 is used if NSE module is not available (i.e. not
- * configured).
- */
-static double log_of_network_size_estimate = 4.0;
-
-/**
- * Recent requests by hash/uid and by time inserted.
- */
-static struct RecentRequests recent;
-
-/**
- * Context to use to calculate find peer rates.
- */
-static struct FindPeerMessageContext find_peer_context;
-
-/**
- * Don't use our routing algorithm, always route
- * to closest peer; initially send requests to 3
- * peers.
- */
-static int strict_kademlia;
-
-/**
- * Routing option to end routing when closest peer found.
- */
-static int stop_on_closest;
-
-/**
- * Routing option to end routing when data is found.
- */
-static int stop_on_found;
-
-/**
- * Whether DHT needs to manage find peer requests, or
- * an external force will do it on behalf of the DHT.
- */
-static int do_find_peer;
-
-/**
- * Use exactly the forwarding formula as described in
- * the paper if set to GNUNET_YES, otherwise use the
- * slightly modified version.
- */
-static int paper_forwarding;
-
-/**
- * PUT Peer Identities of peers we know about into
- * the datacache.
- */
-static int put_peer_identities;
-
-/**
- * Use the "real" distance metric when selecting the
- * next routing hop.  Can be less accurate.
- */
-static int use_real_distance;
-
-/**
- * How many peers have we added since we sent out our last
- * find peer request?
- */
-static unsigned int newly_found_peers;
-
-/**
- * Container of active queries we should remember
- */
-static struct DHTResults forward_list;
-
-/**
- * Handle to the datacache service (for inserting/retrieving data)
- */
-static struct GNUNET_DATACACHE_Handle *datacache;
-
-/**
- * Handle for the statistics service.
- */
-struct GNUNET_STATISTICS_Handle *stats;
-
-/**
- * Handle to get our current HELLO.
- */
-static struct GNUNET_TRANSPORT_GetHelloHandle *ghh;
-
-/**
- * The configuration the DHT service is running with
- */
-static const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-/**
- * Handle to the core service
- */
-static struct GNUNET_CORE_Handle *coreAPI;
-
-/**
- * Handle to the transport service, for getting our hello
- */
-static struct GNUNET_TRANSPORT_Handle *transport_handle;
-
-/**
- * The identity of our peer.
- */
-static struct GNUNET_PeerIdentity my_identity;
-
-/**
- * Short id of the peer, for printing
- */
-static char *my_short_id;
-
-/**
- * Our HELLO
- */
-static struct GNUNET_MessageHeader *my_hello;
-
-/**
- * Task to run when we shut down, cleaning up all our trash
- */
-static GNUNET_SCHEDULER_TaskIdentifier cleanup_task;
-
-/**
- * The lowest currently used bucket.
- */
-static unsigned int lowest_bucket;      /* Initially equal to MAX_BUCKETS - 1 
*/
-
-/**
- * The buckets (Kademlia routing table, complete with growth).
- * Array of size MAX_BUCKET_SIZE.
- */
-static struct PeerBucket k_buckets[MAX_BUCKETS];
-
-/**
- * Hash map of all known peers, for easy removal from k_buckets on disconnect.
- */
-static struct GNUNET_CONTAINER_MultiHashMap *all_known_peers;
-
-/**
- * Recently seen find peer requests.
- */
-static struct GNUNET_CONTAINER_MultiHashMap *recent_find_peer_requests;
-
-/**
- * Maximum size for each bucket.
- */
-static unsigned int bucket_size = DEFAULT_BUCKET_SIZE;
-
-/**
- * List of active clients.
- */
-static struct ClientList *client_list;
-
-/**
- * Handle to the DHT logger.
- */
-static struct GNUNET_DHTLOG_Handle *dhtlog_handle;
-
-/**
- * Whether or not to send routing debugging information
- * to the dht logging server
- */
-static unsigned int debug_routes;
-
-/**
- * Whether or not to send FULL route information to
- * logging server
- */
-static unsigned int debug_routes_extended;
-
-/**
- * GNUNET_YES or GNUNET_NO, whether or not to act as
- * a malicious node which drops all messages
- */
-static unsigned int malicious_dropper;
-
-/**
- * GNUNET_YES or GNUNET_NO, whether or not to act as
- * a malicious node which sends out lots of GETS
- */
-static unsigned int malicious_getter;
-
-/**
- * GNUNET_YES or GNUNET_NO, whether or not to act as
- * a malicious node which sends out lots of PUTS
- */
-static unsigned int malicious_putter;
-
-/**
- * Frequency for malicious get requests.
- */
-static struct GNUNET_TIME_Relative malicious_get_frequency;
-
-/**
- * Frequency for malicious put requests.
- */
-static struct GNUNET_TIME_Relative malicious_put_frequency;
-
-/**
- * Kademlia replication
- */
-static unsigned long long kademlia_replication;
-
-/**
- * Reply times for requests, if we are busy, don't send any
- * more requests!
- */
-static struct GNUNET_TIME_Relative reply_times[MAX_REPLY_TIMES];
-
-/**
- * Current counter for replies.
- */
-static unsigned int reply_counter;
-
-/**
- * Our handle to the BLOCK library.
- */
-static struct GNUNET_BLOCK_Context *block_context;
-
-/**
- * Network size estimation handle.
- */
-static struct GNUNET_NSE_Handle *nse;
-
-
-/**
- * Callback that is called when network size estimate is updated.
- *
- * @param cls closure
- * @param timestamp time when the estimate was received from the server (or 
created by the server)
- * @param logestimate the log(Base 2) value of the current network size 
estimate
- * @param std_dev standard deviation for the estimate
- *
- */
-static void
-update_network_size_estimate (void *cls, struct GNUNET_TIME_Absolute timestamp,
-                              double logestimate, double std_dev)
-{
-  log_of_network_size_estimate = logestimate;
-}
-
-
-/**
- * Forward declaration.
- */
-static size_t
-send_generic_reply (void *cls, size_t size, void *buf);
-
-
-/** Declare here so retry_core_send is aware of it */
-static size_t
-core_transmit_notify (void *cls, size_t size, void *buf);
-
-
-/**
- * Convert unique ID to hash code.
- *
- * @param uid unique ID to convert
- * @param hash set to uid (extended with zeros)
- */
-static void
-hash_from_uid (uint64_t uid, GNUNET_HashCode * hash)
-{
-  memset (hash, 0, sizeof (GNUNET_HashCode));
-  *((uint64_t *) hash) = uid;
-}
-
-
-/**
- * Given the largest send delay, artificially decrease it
- * so the next time around we may have a chance at sending
- * again.
- */
-static void
-decrease_max_send_delay (struct GNUNET_TIME_Relative max_time)
-{
-  unsigned int i;
-
-  for (i = 0; i < MAX_REPLY_TIMES; i++)
-  {
-    if (reply_times[i].rel_value == max_time.rel_value)
-    {
-      reply_times[i].rel_value = reply_times[i].rel_value / 2;
-      return;
-    }
-  }
-}
-
-
-/**
- * Find the maximum send time of the recently sent values.
- *
- * @return the average time between asking core to send a message
- *         and when the buffer for copying it is passed
- */
-static struct GNUNET_TIME_Relative
-get_max_send_delay ()
-{
-  unsigned int i;
-  struct GNUNET_TIME_Relative max_time;
-
-  max_time = GNUNET_TIME_relative_get_zero ();
-
-  for (i = 0; i < MAX_REPLY_TIMES; i++)
-  {
-    if (reply_times[i].rel_value > max_time.rel_value)
-      max_time.rel_value = reply_times[i].rel_value;
-  }
-#if DEBUG_DHT
-  if (max_time.rel_value > MAX_REQUEST_TIME.rel_value)
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Max send delay was %llu\n",
-                (unsigned long long) max_time.rel_value);
-#endif
-  return max_time;
-}
-
-
-static void
-increment_stats (const char *value)
-{
-  if (stats == NULL)
-    return;
-  GNUNET_STATISTICS_update (stats, value, 1, GNUNET_NO);
-}
-
-
-static void
-decrement_stats (const char *value)
-{
-  if (stats == NULL)
-    return;
-  GNUNET_STATISTICS_update (stats, value, -1, GNUNET_NO);
-}
-
-
-/**
- *  Try to send another message from our core send list
- */
-static void
-try_core_send (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  struct PeerInfo *peer = cls;
-  struct P2PPendingMessage *pending;
-  size_t ssize;
-
-  peer->send_task = GNUNET_SCHEDULER_NO_TASK;
-
-  if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
-    return;
-
-  if (peer->th != NULL)
-    return;                     /* Message send already in progress */
-
-  pending = peer->head;
-  if (pending != NULL)
-  {
-    ssize = ntohs (pending->msg->size);
-#if DEBUG_DHT > 1
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "`%s:%s': Calling notify_transmit_ready with size %d for peer 
%s\n",
-                my_short_id, "DHT", ssize, GNUNET_i2s (&peer->id));
-#endif
-    pending->scheduled = GNUNET_TIME_absolute_get ();
-    reply_counter++;
-    if (reply_counter >= MAX_REPLY_TIMES)
-      reply_counter = 0;
-    peer->th =
-        GNUNET_CORE_notify_transmit_ready (coreAPI, GNUNET_YES,
-                                           pending->importance,
-                                           pending->timeout, &peer->id, ssize,
-                                           &core_transmit_notify, peer);
-    if (peer->th == NULL)
-      increment_stats ("# notify transmit ready failed");
-  }
-}
-
-
-/**
- * Function called to send a request out to another peer.
- * Called both for locally initiated requests and those
- * received from other peers.
- *
- * @param msg the encapsulated message
- * @param peer the peer to forward the message to
- * @param msg_ctx the context of the message (hop count, bloom, etc.)
- */
-static void
-forward_result_message (const struct GNUNET_MessageHeader *msg,
-                        struct PeerInfo *peer,
-                        struct DHT_MessageContext *msg_ctx)
-{
-  struct GNUNET_DHT_P2PRouteResultMessage *result_message;
-  struct P2PPendingMessage *pending;
-  size_t msize;
-  size_t psize;
-  char *path_start;
-  char *path_offset;
-
-#if DEBUG_PATH
-  unsigned int i;
-#endif
-
-  increment_stats (STAT_RESULT_FORWARDS);
-  msize =
-      sizeof (struct GNUNET_DHT_P2PRouteResultMessage) + ntohs (msg->size) +
-      (sizeof (struct GNUNET_PeerIdentity) * msg_ctx->path_history_len);
-  GNUNET_assert (msize <= GNUNET_SERVER_MAX_MESSAGE_SIZE);
-  psize = sizeof (struct P2PPendingMessage) + msize;
-  pending = GNUNET_malloc (psize);
-  pending->msg = (struct GNUNET_MessageHeader *) &pending[1];
-  pending->importance = DHT_SEND_PRIORITY;
-  pending->timeout = GNUNET_TIME_relative_get_forever ();
-  result_message = (struct GNUNET_DHT_P2PRouteResultMessage *) pending->msg;
-  result_message->header.size = htons (msize);
-  result_message->header.type =
-      htons (GNUNET_MESSAGE_TYPE_DHT_P2P_ROUTE_RESULT);
-  result_message->outgoing_path_length = htonl (msg_ctx->path_history_len);
-  if (msg_ctx->path_history_len > 0)
-  {
-    /* End of pending is where enc_msg starts */
-    path_start = (char *) &pending[1];
-    /* Offset by the size of the enc_msg */
-    path_start += ntohs (msg->size);
-    memcpy (path_start, msg_ctx->path_history,
-            msg_ctx->path_history_len * (sizeof (struct GNUNET_PeerIdentity)));
-#if DEBUG_PATH
-    for (i = 0; i < msg_ctx->path_history_len; i++)
-    {
-      path_offset =
-          &msg_ctx->path_history[i * sizeof (struct GNUNET_PeerIdentity)];
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "(forward_result) Key %s Found peer %d:%s\n",
-                  GNUNET_h2s (&msg_ctx->key), i,
-                  GNUNET_i2s ((struct GNUNET_PeerIdentity *) path_offset));
-    }
-#endif
-  }
-  result_message->options = htonl (msg_ctx->msg_options);
-  result_message->hop_count = htonl (msg_ctx->hop_count + 1);
-#if HAVE_UID_FOR_TESTING 
-  result_message->unique_id = GNUNET_htonll (msg_ctx->unique_id);
-#endif
-  memcpy (&result_message->key, &msg_ctx->key, sizeof (GNUNET_HashCode));
-  /* Copy the enc_msg, then the path history as well! */
-  memcpy (&result_message[1], msg, ntohs (msg->size));
-  path_offset = (char *) &result_message[1];
-  path_offset += ntohs (msg->size);
-  /* If we have path history, copy it to the end of the whole thing */
-  if (msg_ctx->path_history_len > 0)
-    memcpy (path_offset, msg_ctx->path_history,
-            msg_ctx->path_history_len * (sizeof (struct GNUNET_PeerIdentity)));
-#if DEBUG_DHT > 1
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "%s:%s Adding pending message size %d for peer %s\n", 
my_short_id,
-              "DHT", msize, GNUNET_i2s (&peer->id));
-#endif
-  peer->pending_count++;
-  increment_stats ("# pending messages scheduled");
-  GNUNET_CONTAINER_DLL_insert_after (peer->head, peer->tail, peer->tail,
-                                     pending);
-  if (peer->send_task == GNUNET_SCHEDULER_NO_TASK)
-    peer->send_task = GNUNET_SCHEDULER_add_now (&try_core_send, peer);
-}
-
-
-/**
- * Called when core is ready to send a message we asked for
- * out to the destination.
- *
- * @param cls closure (NULL)
- * @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
-core_transmit_notify (void *cls, size_t size, void *buf)
-{
-  struct PeerInfo *peer = cls;
-  char *cbuf = buf;
-  struct P2PPendingMessage *pending;
-
-  size_t off;
-  size_t msize;
-
-  peer->th = NULL;
-  if (buf == NULL)
-  {
-    /* client disconnected */
-#if DEBUG_DHT
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "`%s:%s': buffer was NULL\n",
-                my_short_id, "DHT");
-#endif
-    return 0;
-  }
-
-  if (peer->head == NULL)
-    return 0;
-
-  off = 0;
-  pending = peer->head;
-#if DUMB
-  reply_times[reply_counter] =
-      GNUNET_TIME_absolute_get_difference (pending->scheduled,
-                                           GNUNET_TIME_absolute_get ());
-  msize = ntohs (pending->msg->size);
-  if (msize <= size)
-  {
-    off = msize;
-    memcpy (cbuf, pending->msg, msize);
-    peer->pending_count--;
-    increment_stats ("# pending messages sent");
-    GNUNET_assert (peer->pending_count >= 0);
-    GNUNET_CONTAINER_DLL_remove (peer->head, peer->tail, pending);
-    GNUNET_free (pending);
-  }
-#else
-  while (NULL != pending &&
-         (size - off >= (msize = ntohs (pending->msg->size))))
-  {
-    memcpy (&cbuf[off], pending->msg, msize);
-    off += msize;
-    peer->pending_count--;
-    increment_stats ("# pending messages sent");
-    GNUNET_CONTAINER_DLL_remove (peer->head, peer->tail, pending);
-    GNUNET_free (pending);
-    pending = peer->head;
-  }
-#endif
-  if ((peer->head != NULL) && (peer->send_task == GNUNET_SCHEDULER_NO_TASK))
-    peer->send_task = GNUNET_SCHEDULER_add_now (&try_core_send, peer);
-
-  return off;
-}
-
-
-/**
- * Compute the distance between have and target as a 32-bit value.
- * Differences in the lower bits must count stronger than differences
- * in the higher bits.
- *
- * @return 0 if have==target, otherwise a number
- *           that is larger as the distance between
- *           the two hash codes increases
- */
-static unsigned int
-distance (const GNUNET_HashCode * target, const GNUNET_HashCode * have)
-{
-  unsigned int bucket;
-  unsigned int msb;
-  unsigned int lsb;
-  unsigned int i;
-
-  /* We have to represent the distance between two 2^9 (=512)-bit
-   * numbers as a 2^5 (=32)-bit number with "0" being used for the
-   * two numbers being identical; furthermore, we need to
-   * guarantee that a difference in the number of matching
-   * bits is always represented in the result.
-   *
-   * We use 2^32/2^9 numerical values to distinguish between
-   * hash codes that have the same LSB bit distance and
-   * use the highest 2^9 bits of the result to signify the
-   * number of (mis)matching LSB bits; if we have 0 matching
-   * and hence 512 mismatching LSB bits we return -1 (since
-   * 512 itself cannot be represented with 9 bits) */
-
-  /* first, calculate the most significant 9 bits of our
-   * result, aka the number of LSBs */
-  bucket = GNUNET_CRYPTO_hash_matching_bits (target, have);
-  /* bucket is now a value between 0 and 512 */
-  if (bucket == 512)
-    return 0;                   /* perfect match */
-  if (bucket == 0)
-    return (unsigned int) -1;   /* LSB differs; use max (if we did the 
bit-shifting
-                                 * below, we'd end up with max+1 (overflow)) */
-
-  /* calculate the most significant bits of the final result */
-  msb = (512 - bucket) << (32 - 9);
-  /* calculate the 32-9 least significant bits of the final result by
-   * looking at the differences in the 32-9 bits following the
-   * mismatching bit at 'bucket' */
-  lsb = 0;
-  for (i = bucket + 1;
-       (i < sizeof (GNUNET_HashCode) * 8) && (i < bucket + 1 + 32 - 9); i++)
-  {
-    if (GNUNET_CRYPTO_hash_get_bit (target, i) !=
-        GNUNET_CRYPTO_hash_get_bit (have, i))
-      lsb |= (1 << (bucket + 32 - 9 - i));      /* first bit set will be 10,
-                                                 * last bit set will be 31 -- 
if
-                                                 * i does not reach 512 
first... */
-  }
-  return msb | lsb;
-}
-
-
-/**
- * Return a number that is larger the closer the
- * "have" GNUNET_hash code is to the "target".
- *
- * @return inverse distance metric, non-zero.
- *         Must fudge the value if NO bits match.
- */
-static unsigned int
-inverse_distance (const GNUNET_HashCode * target, const GNUNET_HashCode * have)
-{
-  if (GNUNET_CRYPTO_hash_matching_bits (target, have) == 0)
-    return 1;                   /* Never return 0! */
-  return ((unsigned int) -1) - distance (target, have);
-}
-
-
-/**
- * Find the optimal bucket for this key, regardless
- * of the current number of buckets in use.
- *
- * @param hc the hashcode to compare our identity to
- *
- * @return the proper bucket index, or GNUNET_SYSERR
- *         on error (same hashcode)
- */
-static int
-find_bucket (const GNUNET_HashCode * hc)
-{
-  unsigned int bits;
-
-  bits = GNUNET_CRYPTO_hash_matching_bits (&my_identity.hashPubKey, hc);
-  if (bits == MAX_BUCKETS)
-    return GNUNET_SYSERR;
-  return MAX_BUCKETS - bits - 1;
-}
-
-
-/**
- * Find which k-bucket this peer should go into,
- * taking into account the size of the k-bucket
- * array.  This means that if more bits match than
- * there are currently buckets, lowest_bucket will
- * be returned.
- *
- * @param hc GNUNET_HashCode we are finding the bucket for.
- *
- * @return the proper bucket index for this key,
- *         or GNUNET_SYSERR on error (same hashcode)
- */
-static int
-find_current_bucket (const GNUNET_HashCode * hc)
-{
-  int actual_bucket;
-
-  actual_bucket = find_bucket (hc);
-  if (actual_bucket == GNUNET_SYSERR)   /* hc and our peer identity match! */
-    return lowest_bucket;
-  if (actual_bucket < lowest_bucket)    /* actual_bucket not yet used */
-    return lowest_bucket;
-  return actual_bucket;
-}
-
-
-/**
- * Find a routing table entry from a peer identity
- *
- * @param peer the peer identity to look up
- *
- * @return the routing table entry, or NULL if not found
- */
-static struct PeerInfo *
-find_peer_by_id (const struct GNUNET_PeerIdentity *peer)
-{
-  int bucket;
-  struct PeerInfo *pos;
-
-  bucket = find_current_bucket (&peer->hashPubKey);
-
-  if (0 == memcmp (&my_identity, peer, sizeof (struct GNUNET_PeerIdentity)))
-    return NULL;
-
-  pos = k_buckets[bucket].head;
-  while (pos != NULL)
-  {
-    if (0 == memcmp (&pos->id, peer, sizeof (struct GNUNET_PeerIdentity)))
-      return pos;
-    pos = pos->next;
-  }
-  return NULL;                  /* No such peer. */
-}
-
-/* Forward declaration */
-static void
-update_core_preference (void *cls,
-                        const struct GNUNET_SCHEDULER_TaskContext *tc);
-
-
-/**
- * Function called with statistics about the given peer.
- *
- * @param cls closure
- * @param peer identifies the peer
- * @param bpm_out set to the current bandwidth limit (sending) for this peer
- * @param amount set to the amount that was actually reserved or unreserved;
- *               either the full requested amount or zero (no partial 
reservations)
- * @param res_delay if the reservation could not be satisfied (amount was 0), 
how
- *        long should the client wait until re-trying?
- * @param preference current traffic preference for the given peer
- */
-static void
-update_core_preference_finish (void *cls,
-                               const struct GNUNET_PeerIdentity *peer,
-                               struct GNUNET_BANDWIDTH_Value32NBO bpm_out,
-                               int32_t amount,
-                               struct GNUNET_TIME_Relative res_delay,
-                               uint64_t preference)
-{
-  struct PeerInfo *peer_info = cls;
-
-  peer_info->info_ctx = NULL;
-  GNUNET_SCHEDULER_add_delayed (DHT_DEFAULT_PREFERENCE_INTERVAL,
-                                &update_core_preference, peer_info);
-}
-
-static void
-update_core_preference (void *cls,
-                        const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  struct PeerInfo *peer = cls;
-  uint64_t preference;
-  unsigned int matching;
-
-  if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
-  {
-    return;
-  }
-  matching =
-      GNUNET_CRYPTO_hash_matching_bits (&my_identity.hashPubKey,
-                                        &peer->id.hashPubKey);
-  if (matching >= 64)
-  {
-#if DEBUG_DHT
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Peer identifier matches by %u bits, only shifting as much as 
we can!\n",
-                matching);
-#endif
-    matching = 63;
-  }
-  preference = 1LL << matching;
-  peer->info_ctx =
-      GNUNET_CORE_peer_change_preference (coreAPI, &peer->id,
-                                          GNUNET_TIME_UNIT_FOREVER_REL,
-                                          GNUNET_BANDWIDTH_VALUE_MAX, 0,
-                                          preference,
-                                          &update_core_preference_finish, 
peer);
-}
-
-
-/**
- * Given a peer and its corresponding bucket,
- * remove it from that bucket.  Does not free
- * the PeerInfo struct, nor cancel messages
- * or free messages waiting to be sent to this
- * peer!
- *
- * @param peer the peer to remove
- * @param bucket the bucket the peer belongs to
- */
-static void
-remove_peer (struct PeerInfo *peer, unsigned int bucket)
-{
-  GNUNET_assert (k_buckets[bucket].peers_size > 0);
-  GNUNET_CONTAINER_DLL_remove (k_buckets[bucket].head, k_buckets[bucket].tail,
-                               peer);
-  k_buckets[bucket].peers_size--;
-#if CHANGE_LOWEST
-  if ((bucket == lowest_bucket) && (k_buckets[lowest_bucket].peers_size == 0) 
&&
-      (lowest_bucket < MAX_BUCKETS - 1))
-    lowest_bucket++;
-#endif
-}
-
-/**
- * Removes peer from a bucket, then frees associated
- * resources and frees peer.
- *
- * @param peer peer to be removed and freed
- * @param bucket which bucket this peer belongs to
- */
-static void
-delete_peer (struct PeerInfo *peer, unsigned int bucket)
-{
-  struct P2PPendingMessage *pos;
-  struct P2PPendingMessage *next;
-
-  remove_peer (peer, bucket);   /* First remove the peer from its bucket */
-  if (peer->send_task != GNUNET_SCHEDULER_NO_TASK)
-    GNUNET_SCHEDULER_cancel (peer->send_task);
-  if ((peer->th != NULL) && (coreAPI != NULL))
-    GNUNET_CORE_notify_transmit_ready_cancel (peer->th);
-
-  pos = peer->head;
-  while (pos != NULL)           /* Remove any pending messages for this peer */
-  {
-    increment_stats
-        ("# dht pending messages discarded (due to disconnect/shutdown)");
-    next = pos->next;
-    GNUNET_free (pos);
-    pos = next;
-  }
-
-  GNUNET_assert (GNUNET_CONTAINER_multihashmap_contains
-                 (all_known_peers, &peer->id.hashPubKey));
-  GNUNET_assert (GNUNET_YES ==
-                 GNUNET_CONTAINER_multihashmap_remove (all_known_peers,
-                                                       &peer->id.hashPubKey,
-                                                       peer));
-  GNUNET_free (peer);
-  decrement_stats (STAT_PEERS_KNOWN);
-}
-
-
-/**
- * Iterator over hash map entries.
- *
- * @param cls closure
- * @param key current key code
- * @param value PeerInfo of the peer to move to new lowest bucket
- * @return GNUNET_YES if we should continue to
- *         iterate,
- *         GNUNET_NO if not.
- */
-static int
-move_lowest_bucket (void *cls, const GNUNET_HashCode * key, void *value)
-{
-  struct PeerInfo *peer = value;
-  int new_bucket;
-
-  GNUNET_assert (lowest_bucket > 0);
-  new_bucket = lowest_bucket - 1;
-  remove_peer (peer, lowest_bucket);
-  GNUNET_CONTAINER_DLL_insert_after (k_buckets[new_bucket].head,
-                                     k_buckets[new_bucket].tail,
-                                     k_buckets[new_bucket].tail, peer);
-  k_buckets[new_bucket].peers_size++;
-  return GNUNET_YES;
-}
-
-
-/**
- * The current lowest bucket is full, so change the lowest
- * bucket to the next lower down, and move any appropriate
- * entries in the current lowest bucket to the new bucket.
- */
-static void
-enable_next_bucket ()
-{
-  struct GNUNET_CONTAINER_MultiHashMap *to_remove;
-  struct PeerInfo *pos;
-
-  GNUNET_assert (lowest_bucket > 0);
-  to_remove = GNUNET_CONTAINER_multihashmap_create (bucket_size);
-  pos = k_buckets[lowest_bucket].head;
-
-  /* Populate the array of peers which should be in the next lowest bucket */
-  while (pos != NULL)
-  {
-    if (find_bucket (&pos->id.hashPubKey) < lowest_bucket)
-      GNUNET_CONTAINER_multihashmap_put (to_remove, &pos->id.hashPubKey, pos,
-                                         
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
-    pos = pos->next;
-  }
-
-  /* Remove peers from lowest bucket, insert into next lowest bucket */
-  GNUNET_CONTAINER_multihashmap_iterate (to_remove, &move_lowest_bucket, NULL);
-  GNUNET_CONTAINER_multihashmap_destroy (to_remove);
-  lowest_bucket = lowest_bucket - 1;
-}
-
-
-/**
- * Find the closest peer in our routing table to the
- * given hashcode.
- *
- * @return The closest peer in our routing table to the
- *         key, or NULL on error.
- */
-static struct PeerInfo *
-find_closest_peer (const GNUNET_HashCode * hc)
-{
-  struct PeerInfo *pos;
-  struct PeerInfo *current_closest;
-  unsigned int lowest_distance;
-  unsigned int temp_distance;
-  int bucket;
-  int count;
-
-  lowest_distance = -1;
-
-  if (k_buckets[lowest_bucket].peers_size == 0)
-    return NULL;
-
-  current_closest = NULL;
-  for (bucket = lowest_bucket; bucket < MAX_BUCKETS; bucket++)
-  {
-    pos = k_buckets[bucket].head;
-    count = 0;
-    while ((pos != NULL) && (count < bucket_size))
-    {
-      temp_distance = distance (&pos->id.hashPubKey, hc);
-      if (temp_distance <= lowest_distance)
-      {
-        lowest_distance = temp_distance;
-        current_closest = pos;
-      }
-      pos = pos->next;
-      count++;
-    }
-  }
-  GNUNET_assert (current_closest != NULL);
-  return current_closest;
-}
-
-
-/**
- * Function called to send a request out to another peer.
- * Called both for locally initiated requests and those
- * received from other peers.
- *
- * @param msg the encapsulated message
- * @param peer the peer to forward the message to
- * @param msg_ctx the context of the message (hop count, bloom, etc.)
- */
-static void
-forward_message (const struct GNUNET_MessageHeader *msg, struct PeerInfo *peer,
-                 struct DHT_MessageContext *msg_ctx)
-{
-  struct GNUNET_DHT_P2PRouteMessage *route_message;
-  struct P2PPendingMessage *pending;
-  size_t msize;
-  size_t psize;
-  char *route_path;
-
-  increment_stats (STAT_ROUTE_FORWARDS);
-  GNUNET_assert (peer != NULL);
-  if ((msg_ctx->closest != GNUNET_YES) &&
-      (peer == find_closest_peer (&msg_ctx->key)))
-    increment_stats (STAT_ROUTE_FORWARDS_CLOSEST);
-
-  msize =
-      sizeof (struct GNUNET_DHT_P2PRouteMessage) + ntohs (msg->size) +
-      (msg_ctx->path_history_len * sizeof (struct GNUNET_PeerIdentity));
-  GNUNET_assert (msize <= GNUNET_SERVER_MAX_MESSAGE_SIZE);
-  psize = sizeof (struct P2PPendingMessage) + msize;
-  pending = GNUNET_malloc (psize);
-  pending->msg = (struct GNUNET_MessageHeader *) &pending[1];
-  pending->importance = msg_ctx->importance;
-  pending->timeout = msg_ctx->timeout;
-  route_message = (struct GNUNET_DHT_P2PRouteMessage *) pending->msg;
-  route_message->header.size = htons (msize);
-  route_message->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_P2P_ROUTE);
-  route_message->options = htonl (msg_ctx->msg_options);
-  route_message->hop_count = htonl (msg_ctx->hop_count + 1);
-  route_message->network_size = htonl (msg_ctx->network_size);
-  route_message->desired_replication_level = htonl (msg_ctx->replication);
-#if HAVE_UID_FOR_TESTING 
-  route_message->unique_id = GNUNET_htonll (msg_ctx->unique_id);
-#endif
-  if (msg_ctx->bloom != NULL)
-    GNUNET_assert (GNUNET_OK ==
-                   GNUNET_CONTAINER_bloomfilter_get_raw_data (msg_ctx->bloom,
-                                                              route_message->
-                                                              bloomfilter,
-                                                              DHT_BLOOM_SIZE));
-  memcpy (&route_message->key, &msg_ctx->key, sizeof (GNUNET_HashCode));
-  memcpy (&route_message[1], msg, ntohs (msg->size));
-  if (GNUNET_DHT_RO_RECORD_ROUTE ==
-      (msg_ctx->msg_options & GNUNET_DHT_RO_RECORD_ROUTE))
-  {
-    route_message->outgoing_path_length = htonl (msg_ctx->path_history_len);
-    /* Set pointer to start of enc_msg */
-    route_path = (char *) &route_message[1];
-    /* Offset to the end of the enc_msg */
-    route_path += ntohs (msg->size);
-    /* Copy the route_path after enc_msg */
-    memcpy (route_path, msg_ctx->path_history,
-            msg_ctx->path_history_len * sizeof (struct GNUNET_PeerIdentity));
-  }
-#if DEBUG_DHT > 1
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "%s:%s Adding pending message size %d for peer %s\n", 
my_short_id,
-              "DHT", msize, GNUNET_i2s (&peer->id));
-#endif
-  peer->pending_count++;
-  increment_stats ("# pending messages scheduled");
-  GNUNET_CONTAINER_DLL_insert_after (peer->head, peer->tail, peer->tail,
-                                     pending);
-  if (peer->send_task == GNUNET_SCHEDULER_NO_TASK)
-    peer->send_task = GNUNET_SCHEDULER_add_now (&try_core_send, peer);
-}
-
-
-/**
- * Task run to check for messages that need to be sent to a client.
- *
- * @param client a ClientList, containing the client and any messages to be 
sent to it
- */
-static void
-process_pending_messages (struct ClientList *client)
-{
-  if ((client->pending_head == NULL) || (client->transmit_handle != NULL))
-    return;
-  client->transmit_handle =
-      GNUNET_SERVER_notify_transmit_ready (client->client_handle,
-                                           ntohs (client->pending_head->
-                                                  msg->size),
-                                           GNUNET_TIME_UNIT_FOREVER_REL,
-                                           &send_generic_reply, client);
-}
-
-/**
- * Callback called as a result of issuing a GNUNET_SERVER_notify_transmit_ready
- * request.  A ClientList is passed as closure, take the head of the list
- * and copy it into buf, which has the result of sending the message to the
- * client.
- *
- * @param cls closure to this call
- * @param size maximum number of bytes available to send
- * @param buf where to copy the actual message to
- *
- * @return the number of bytes actually copied, 0 indicates failure
- */
-static size_t
-send_generic_reply (void *cls, size_t size, void *buf)
-{
-  struct ClientList *client = cls;
-  char *cbuf = buf;
-  struct PendingMessage *reply;
-  size_t off;
-  size_t msize;
-
-  client->transmit_handle = NULL;
-  if (buf == NULL)
-  {
-    /* client disconnected */
-    return 0;
-  }
-  off = 0;
-  while ((NULL != (reply = client->pending_head)) &&
-         (size >= off + (msize = ntohs (reply->msg->size))))
-  {
-    GNUNET_CONTAINER_DLL_remove (client->pending_head, client->pending_tail,
-                                 reply);
-    memcpy (&cbuf[off], reply->msg, msize);
-    GNUNET_free (reply);
-    off += msize;
-  }
-  process_pending_messages (client);
-#if DEBUG_DHT
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Transmitted %u bytes of replies to client\n",
-              (unsigned int) off);
-#endif
-  return off;
-}
-
-
-/**
- * Add a PendingMessage to the clients list of messages to be sent
- *
- * @param client the active client to send the message to
- * @param pending_message the actual message to send
- */
-static void
-add_pending_message (struct ClientList *client,
-                     struct PendingMessage *pending_message)
-{
-  GNUNET_CONTAINER_DLL_insert_after (client->pending_head, 
client->pending_tail,
-                                     client->pending_tail, pending_message);
-  process_pending_messages (client);
-}
-
-
-/**
- * Called when a reply needs to be sent to a client, as
- * a result it found to a GET or FIND PEER request.
- *
- * @param client the client to send the reply to
- * @param message the encapsulated message to send
- * @param msg_ctx the context of the received message
- */
-static void
-send_reply_to_client (struct ClientList *client,
-                      const struct GNUNET_MessageHeader *message,
-                      struct DHT_MessageContext *msg_ctx)
-{
-  struct GNUNET_DHT_RouteResultMessage *reply;
-  struct PendingMessage *pending_message;
-  uint16_t msize;
-  size_t tsize;
-  char *reply_offset;
-
-#if DEBUG_PATH
-  char *path_offset;
-  unsigned int i;
-#endif
-#if DEBUG_DHT
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "`%s:%s': Sending reply to client.\n",
-              my_short_id, "DHT");
-#endif
-  msize = ntohs (message->size);
-  tsize =
-      sizeof (struct GNUNET_DHT_RouteResultMessage) + msize +
-      (msg_ctx->path_history_len * sizeof (struct GNUNET_PeerIdentity));
-  if (tsize >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
-  {
-    GNUNET_break_op (0);
-    return;
-  }
-  pending_message = GNUNET_malloc (sizeof (struct PendingMessage) + tsize);
-  pending_message->msg = (struct GNUNET_MessageHeader *) &pending_message[1];
-  reply = (struct GNUNET_DHT_RouteResultMessage *) &pending_message[1];
-  reply->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_LOCAL_ROUTE_RESULT);
-  reply->header.size = htons (tsize);
-  reply->outgoing_path_length = htonl (msg_ctx->path_history_len);
-  reply->unique_id = GNUNET_htonll (msg_ctx->unique_id);
-  memcpy (&reply->key, &msg_ctx->key, sizeof (GNUNET_HashCode));
-  reply_offset = (char *) &reply[1];
-  memcpy (&reply[1], message, msize);
-  if (msg_ctx->path_history_len > 0)
-  {
-    reply_offset += msize;
-    memcpy (reply_offset, msg_ctx->path_history,
-            msg_ctx->path_history_len * sizeof (struct GNUNET_PeerIdentity));
-  }
-#if DEBUG_PATH
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Returning message with outgoing path length %d\n",
-              msg_ctx->path_history_len);
-  for (i = 0; i < msg_ctx->path_history_len; i++)
-  {
-    path_offset =
-        &msg_ctx->path_history[i * sizeof (struct GNUNET_PeerIdentity)];
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Found peer %d:%s\n", i,
-                GNUNET_i2s ((struct GNUNET_PeerIdentity *) path_offset));
-  }
-#endif
-  add_pending_message (client, pending_message);
-}
-
-/**
- * Consider whether or not we would like to have this peer added to
- * our routing table.  Check whether bucket for this peer is full,
- * if so return negative; if not return positive.  Since peers are
- * only added on CORE level connect, this doesn't actually add the
- * peer to the routing table.
- *
- * @param peer the peer we are considering adding
- *
- * @return GNUNET_YES if we want this peer, GNUNET_NO if not (bucket
- *         already full)
- */
-static int
-consider_peer (struct GNUNET_PeerIdentity *peer)
-{
-  int bucket;
-
-  if ((GNUNET_YES ==
-       GNUNET_CONTAINER_multihashmap_contains (all_known_peers,
-                                               &peer->hashPubKey)) ||
-      (0 == memcmp (&my_identity, peer, sizeof (struct GNUNET_PeerIdentity))))
-    return GNUNET_NO;           /* We already know this peer (are connected 
even!) */
-  bucket = find_current_bucket (&peer->hashPubKey);
-
-  if ((k_buckets[bucket].peers_size < bucket_size) ||
-      ((bucket == lowest_bucket) && (lowest_bucket > 0)))
-    return GNUNET_YES;
-
-  return GNUNET_NO;
-}
-
-
-/**
- * Task used to remove forwarding entries, either
- * after timeout, when full, or on shutdown.
- *
- * @param cls the entry to remove
- * @param tc context, reason, etc.
- */
-static void
-remove_forward_entry (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  struct DHTRouteSource *source_info = cls;
-  struct DHTQueryRecord *record;
-
-  source_info = GNUNET_CONTAINER_heap_remove_node (source_info->hnode);
-  record = source_info->record;
-  GNUNET_CONTAINER_DLL_remove (record->head, record->tail, source_info);
-
-  if (record->head == NULL)     /* No more entries in DLL */
-  {
-    GNUNET_assert (GNUNET_YES ==
-                   GNUNET_CONTAINER_multihashmap_remove (forward_list.hashmap,
-                                                         &record->key, 
record));
-    GNUNET_free (record);
-  }
-  if (source_info->find_peers_responded != NULL)
-    GNUNET_CONTAINER_bloomfilter_free (source_info->find_peers_responded);
-  GNUNET_free (source_info);
-}
-
-/**
- * Main function that handles whether or not to route a result
- * message to other peers, or to send to our local client.
- *
- * @param msg the result message to be routed
- * @param msg_ctx context of the message we are routing
- *
- * @return the number of peers the message was routed to,
- *         GNUNET_SYSERR on failure
- */
-static int
-route_result_message (struct GNUNET_MessageHeader *msg,
-                      struct DHT_MessageContext *msg_ctx)
-{
-  struct GNUNET_PeerIdentity new_peer;
-  struct DHTQueryRecord *record;
-  struct DHTRouteSource *pos;
-  struct PeerInfo *peer_info;
-  const struct GNUNET_MessageHeader *hello_msg;
-
-#if DEBUG_DHT > 1
-  unsigned int i;
-#endif
-
-  increment_stats (STAT_RESULTS);
-  /**
-   * If a find peer result message is received and contains a valid
-   * HELLO for another peer, offer it to the transport service.
-   */
-  if (ntohs (msg->type) == GNUNET_MESSAGE_TYPE_DHT_FIND_PEER_RESULT)
-  {
-    if (ntohs (msg->size) <= sizeof (struct GNUNET_MessageHeader))
-      GNUNET_break_op (0);
-
-    hello_msg = &msg[1];
-    if ((ntohs (hello_msg->type) != GNUNET_MESSAGE_TYPE_HELLO) ||
-        (GNUNET_SYSERR ==
-         GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *) hello_msg,
-                              &new_peer)))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "%s:%s Received non-HELLO message type in find peer result 
message!\n",
-                  my_short_id, "DHT");
-      GNUNET_break_op (0);
-      return GNUNET_NO;
-    }
-    else                        /* We have a valid hello, and peer id stored 
in new_peer */
-    {
-      find_peer_context.count++;
-      increment_stats (STAT_FIND_PEER_REPLY);
-      if (GNUNET_YES == consider_peer (&new_peer))
-      {
-        increment_stats (STAT_HELLOS_PROVIDED);
-        GNUNET_TRANSPORT_offer_hello (transport_handle, hello_msg, NULL, NULL);
-        GNUNET_CORE_peer_request_connect (coreAPI, &new_peer, NULL, NULL);
-      }
-    }
-  }
-
-  if (malicious_dropper == GNUNET_YES)
-    record = NULL;
-  else
-    record =
-        GNUNET_CONTAINER_multihashmap_get (forward_list.hashmap, 
&msg_ctx->key);
-
-  if (record == NULL)           /* No record of this message! */
-  {
-#if DEBUG_DHT
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "`%s:%s': Have no record of response key %s uid %llu\n",
-                my_short_id, "DHT", GNUNET_h2s (&msg_ctx->key),
-                msg_ctx->unique_id);
-#endif
-#if DEBUG_DHT_ROUTING
-    if ((debug_routes_extended) && (dhtlog_handle != NULL))
-    {
-      dhtlog_handle->insert_route (NULL, msg_ctx->unique_id, DHTLOG_RESULT,
-                                   msg_ctx->hop_count, GNUNET_SYSERR,
-                                   &my_identity, &msg_ctx->key, &msg_ctx->peer,
-                                   NULL);
-    }
-#endif
-    return 0;
-  }
-
-  pos = record->head;
-  while (pos != NULL)
-  {
-#if STRICT_FORWARDING
-    if (ntohs (msg->type) == GNUNET_MESSAGE_TYPE_DHT_FIND_PEER_RESULT)  /* If 
we have already forwarded this peer id, don't do it again! */
-    {
-      if (GNUNET_YES ==
-          GNUNET_CONTAINER_bloomfilter_test (pos->find_peers_responded,
-                                             &new_peer.hashPubKey))
-      {
-        increment_stats ("# find peer responses NOT forwarded (bloom match)");
-        pos = pos->next;
-        continue;
-      }
-      else
-      {
-        GNUNET_CONTAINER_bloomfilter_add (pos->find_peers_responded,
-                                          &new_peer.hashPubKey);
-      }
-    }
-#endif
-
-    if (0 == memcmp (&pos->source, &my_identity, sizeof (struct 
GNUNET_PeerIdentity)))  /* Local client (or DHT) initiated request! */
-    {
-#if DEBUG_DHT
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "`%s:%s': Sending response key %s uid %llu to client\n",
-                  my_short_id, "DHT", GNUNET_h2s (&msg_ctx->key),
-                  msg_ctx->unique_id);
-#endif
-#if DEBUG_DHT_ROUTING
-      if ((debug_routes_extended) && (dhtlog_handle != NULL))
-      {
-        dhtlog_handle->insert_route (NULL, msg_ctx->unique_id, DHTLOG_RESULT,
-                                     msg_ctx->hop_count, GNUNET_YES,
-                                     &my_identity, &msg_ctx->key, 
&msg_ctx->peer,
-                                     NULL);
-      }
-#endif
-      increment_stats (STAT_RESULTS_TO_CLIENT);
-      if (ntohs (msg->type) == GNUNET_MESSAGE_TYPE_DHT_GET_RESULT)
-        increment_stats (STAT_GET_REPLY);
-#if DEBUG_DHT > 1
-      for (i = 0; i < msg_ctx->path_history_len; i++)
-      {
-        char *path_offset;
-
-        path_offset =
-            &msg_ctx->path_history[i * sizeof (struct GNUNET_PeerIdentity)];
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                    "(before client) Key %s Found peer %d:%s\n",
-                    GNUNET_h2s (&msg_ctx->key), i,
-                    GNUNET_i2s ((struct GNUNET_PeerIdentity *) path_offset));
-      }
-#endif
-      send_reply_to_client (pos->client, msg, msg_ctx);
-    }
-    else                        /* Send to peer */
-    {
-      peer_info = find_peer_by_id (&pos->source);
-      if (peer_info == NULL)    /* Didn't find the peer in our routing table, 
perhaps peer disconnected! */
-      {
-        pos = pos->next;
-        continue;
-      }
-#if DEBUG_DHT
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                 "`%s:%s': Forwarding response key %s uid %llu to peer %s\n",
-                 my_short_id, "DHT", GNUNET_h2s (&msg_ctx->key),
-                 msg_ctx->unique_id, GNUNET_i2s (&peer_info->id));
-#endif
-#if DEBUG_DHT_ROUTING
-      if ((debug_routes_extended) && (dhtlog_handle != NULL))
-      {
-       dhtlog_handle->insert_route (NULL, msg_ctx->unique_id, DHTLOG_RESULT,
-                                    msg_ctx->hop_count, GNUNET_NO,
-                                    &my_identity, &msg_ctx->key,
-                                    &msg_ctx->peer, &pos->source);
-      }
-#endif
-      forward_result_message (msg, peer_info, msg_ctx);
-      /* Try removing forward entries after sending once, only allows ONE 
response per request */
-      if (pos->delete_task != GNUNET_SCHEDULER_NO_TASK)
-      {
-       GNUNET_SCHEDULER_cancel (pos->delete_task);
-       pos->delete_task =
-         GNUNET_SCHEDULER_add_now (&remove_forward_entry, pos);        
-      }
-    }
-    pos = pos->next;
-  }
-  return 0;
-}
-
-
-/**
- * Iterator for local get request results,
- *
- * @param cls closure for iterator, a DatacacheGetContext
- * @param exp when does this value expire?
- * @param key the key this data is stored under
- * @param size the size of the data identified by key
- * @param data the actual data
- * @param type the type of the data
- *
- * @return GNUNET_OK to continue iteration, anything else
- * to stop iteration.
- */
-static int
-datacache_get_iterator (void *cls, struct GNUNET_TIME_Absolute exp,
-                        const GNUNET_HashCode * key, size_t size,
-                        const char *data, enum GNUNET_BLOCK_Type type)
-{
-  struct DHT_MessageContext *msg_ctx = cls;
-  struct DHT_MessageContext new_msg_ctx;
-  struct GNUNET_DHT_GetResultMessage *get_result;
-  enum GNUNET_BLOCK_EvaluationResult eval;
-  const struct DHTPutEntry *put_entry;
-  int get_size;
-  char *path_offset;
-
-#if DEBUG_PATH
-  unsigned int i;
-#endif
-
-#if DEBUG_DHT
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "`%s:%s': Received `%s' response from datacache\n", my_short_id,
-              "DHT", "GET");
-#endif
-
-  put_entry = (const struct DHTPutEntry *) data;
-
-  if (size !=
-      sizeof (struct DHTPutEntry) + put_entry->data_size +
-      (put_entry->path_length * sizeof (struct GNUNET_PeerIdentity)))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Path + data size doesn't add up for data inserted into 
datacache!\nData size %d, path length %d, expected %d, got %d\n",
-                put_entry->data_size, put_entry->path_length,
-                sizeof (struct DHTPutEntry) + put_entry->data_size +
-                (put_entry->path_length * sizeof (struct GNUNET_PeerIdentity)),
-                size);
-    msg_ctx->do_forward = GNUNET_NO;
-    return GNUNET_OK;
-  }
-
-  eval =
-      GNUNET_BLOCK_evaluate (block_context, type, key, &msg_ctx->reply_bf,
-                             msg_ctx->reply_bf_mutator, msg_ctx->xquery,
-                             msg_ctx->xquery_size, &put_entry[1],
-                             put_entry->data_size);
-
-  switch (eval)
-  {
-  case GNUNET_BLOCK_EVALUATION_OK_LAST:
-    msg_ctx->do_forward = GNUNET_NO;
-  case GNUNET_BLOCK_EVALUATION_OK_MORE:
-    memcpy (&new_msg_ctx, msg_ctx, sizeof (struct DHT_MessageContext));
-    if (GNUNET_DHT_RO_RECORD_ROUTE ==
-        (msg_ctx->msg_options & GNUNET_DHT_RO_RECORD_ROUTE))
-    {
-      new_msg_ctx.msg_options = GNUNET_DHT_RO_RECORD_ROUTE;
-#if DEBUG_PATH
-      for (i = 0; i < new_msg_ctx.path_history_len; i++)
-      {
-        path_offset =
-            &new_msg_ctx.path_history[i * sizeof (struct GNUNET_PeerIdentity)];
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                    "(get_iterator) Key %s Found peer %d:%s\n",
-                    GNUNET_h2s (&msg_ctx->key), i,
-                    GNUNET_i2s ((struct GNUNET_PeerIdentity *) path_offset));
-      }
-#endif
-    }
-
-    get_size =
-        sizeof (struct GNUNET_DHT_GetResultMessage) + put_entry->data_size +
-        (put_entry->path_length * sizeof (struct GNUNET_PeerIdentity));
-    get_result = GNUNET_malloc (get_size);
-    get_result->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_GET_RESULT);
-    get_result->header.size = htons (get_size);
-    get_result->expiration = GNUNET_TIME_absolute_hton (exp);
-    get_result->type = htons (type);
-    get_result->put_path_length = htons (put_entry->path_length);
-    path_offset = (char *) &put_entry[1];
-    path_offset += put_entry->data_size;
-#if DEBUG_PATH
-    for (i = 0; i < put_entry->path_length; i++)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "(get_iterator PUT path) Key %s Found peer %d:%s\n",
-                  GNUNET_h2s (&msg_ctx->key), i,
-                  GNUNET_i2s ((struct GNUNET_PeerIdentity *)
-                              &path_offset[i *
-                                           sizeof (struct
-                                                   GNUNET_PeerIdentity)]));
-    }
-#endif
-    /* Copy the actual data and the path_history to the end of the get result 
*/
-    memcpy (&get_result[1], &put_entry[1],
-            put_entry->data_size +
-            (put_entry->path_length * sizeof (struct GNUNET_PeerIdentity)));
-    new_msg_ctx.peer = my_identity;
-    new_msg_ctx.bloom = NULL;
-    new_msg_ctx.hop_count = 0;
-    new_msg_ctx.importance = DHT_DEFAULT_P2P_IMPORTANCE + 2;   /* Make result 
routing a higher priority */
-    new_msg_ctx.timeout = DHT_DEFAULT_P2P_TIMEOUT;
-    increment_stats (STAT_GET_RESPONSE_START);
-    route_result_message (&get_result->header, &new_msg_ctx);
-    GNUNET_free (get_result);
-    break;
-  case GNUNET_BLOCK_EVALUATION_OK_DUPLICATE:
-#if DEBUG_DHT
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "`%s:%s': Duplicate block error\n",
-                my_short_id, "DHT");
-#endif
-    break;
-  case GNUNET_BLOCK_EVALUATION_RESULT_INVALID:
-#if DEBUG_DHT
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "`%s:%s': Invalid request error\n",
-                my_short_id, "DHT");
-#endif
-    break;
-  case GNUNET_BLOCK_EVALUATION_REQUEST_VALID:
-#if DEBUG_DHT
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "`%s:%s': Valid request, no results.\n", my_short_id, "DHT");
-#endif
-    GNUNET_break (0);
-    break;
-  case GNUNET_BLOCK_EVALUATION_REQUEST_INVALID:
-    GNUNET_break_op (0);
-    msg_ctx->do_forward = GNUNET_NO;
-    break;
-  case GNUNET_BLOCK_EVALUATION_TYPE_NOT_SUPPORTED:
-#if DEBUG_DHT
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "`%s:%s': Unsupported block type (%u) in response!\n",
-                my_short_id, "DHT", type);
-#endif
-    /* msg_ctx->do_forward = GNUNET_NO;  // not sure... */
-    break;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Main function that handles whether or not to route a message to other
- * peers.
- *
- * @param msg the message to be routed
- * @param msg_ctx the context containing all pertinent information about the 
message
- */
-static void
-route_message (const struct GNUNET_MessageHeader *msg,
-               struct DHT_MessageContext *msg_ctx);
-
-
-/**
- * Server handler for all dht get requests, look for data,
- * if found, send response either to clients or other peers.
- *
- * @param msg the actual get message
- * @param msg_ctx struct containing pertinent information about the get request
- *
- * @return number of items found for GET request
- */
-static unsigned int
-handle_dht_get (const struct GNUNET_MessageHeader *msg,
-                struct DHT_MessageContext *msg_ctx)
-{
-  const struct GNUNET_DHT_GetMessage *get_msg;
-  uint16_t msize;
-  uint16_t bf_size;
-  unsigned int results;
-  const char *end;
-  enum GNUNET_BLOCK_Type type;
-
-  msize = ntohs (msg->size);
-  if (msize < sizeof (struct GNUNET_DHT_GetMessage))
-  {
-    GNUNET_break (0);
-    return 0;
-  }
-  get_msg = (const struct GNUNET_DHT_GetMessage *) msg;
-  bf_size = ntohs (get_msg->bf_size);
-  msg_ctx->xquery_size = ntohs (get_msg->xquery_size);
-  msg_ctx->reply_bf_mutator = get_msg->bf_mutator;
-  if (msize !=
-      sizeof (struct GNUNET_DHT_GetMessage) + bf_size + msg_ctx->xquery_size)
-  {
-    GNUNET_break_op (0);
-    return 0;
-  }
-  end = (const char *) &get_msg[1];
-  if (msg_ctx->xquery_size == 0)
-  {
-    msg_ctx->xquery = NULL;
-  }
-  else
-  {
-    msg_ctx->xquery = (const void *) end;
-    end += msg_ctx->xquery_size;
-  }
-  if (bf_size == 0)
-  {
-    msg_ctx->reply_bf = NULL;
-  }
-  else
-  {
-    msg_ctx->reply_bf =
-        GNUNET_CONTAINER_bloomfilter_init (end, bf_size,
-                                           GNUNET_DHT_GET_BLOOMFILTER_K);
-  }
-  type = (enum GNUNET_BLOCK_Type) ntohl (get_msg->type);
-#if DEBUG_DHT
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "`%s:%s': Received `%s' request, message type %u, key %s, uid 
%llu\n",
-              my_short_id, "DHT", "GET", type, GNUNET_h2s (&msg_ctx->key),
-              msg_ctx->unique_id);
-#endif
-  increment_stats (STAT_GETS);
-  results = 0;
-#if HAVE_MALICIOUS
-  if (type == GNUNET_BLOCK_DHT_MALICIOUS_MESSAGE_TYPE)
-  {
-    GNUNET_CONTAINER_bloomfilter_free (msg_ctx->reply_bf);
-    return results;
-  }
-#endif
-  msg_ctx->do_forward = GNUNET_YES;
-  if (datacache != NULL)
-    results =
-        GNUNET_DATACACHE_get (datacache, &msg_ctx->key, type,
-                              &datacache_get_iterator, msg_ctx);
-#if DEBUG_DHT
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "`%s:%s': Found %d results for `%s' request uid %llu\n",
-              my_short_id, "DHT", results, "GET", msg_ctx->unique_id);
-#endif
-  if (results >= 1)
-  {
-#if DEBUG_DHT_ROUTING
-    if ((debug_routes) && (dhtlog_handle != NULL))
-    {
-      dhtlog_handle->insert_query (NULL, msg_ctx->unique_id, DHTLOG_GET,
-                                   msg_ctx->hop_count, GNUNET_YES, 
&my_identity,
-                                   &msg_ctx->key);
-    }
-
-    if ((debug_routes_extended) && (dhtlog_handle != NULL))
-    {
-      dhtlog_handle->insert_route (NULL, msg_ctx->unique_id, DHTLOG_ROUTE,
-                                   msg_ctx->hop_count, GNUNET_YES, 
&my_identity,
-                                   &msg_ctx->key, &msg_ctx->peer, NULL);
-    }
-#endif
-  }
-  else
-  {
-    /* check query valid */
-    if (GNUNET_BLOCK_EVALUATION_REQUEST_INVALID ==
-        GNUNET_BLOCK_evaluate (block_context, type, &msg_ctx->key,
-                               &msg_ctx->reply_bf, msg_ctx->reply_bf_mutator,
-                               msg_ctx->xquery, msg_ctx->xquery_size, NULL, 0))
-    {
-      GNUNET_break_op (0);
-      msg_ctx->do_forward = GNUNET_NO;
-    }
-  }
-
-  if (msg_ctx->hop_count == 0)  /* Locally initiated request */
-  {
-#if DEBUG_DHT_ROUTING
-    if ((debug_routes) && (dhtlog_handle != NULL))
-    {
-      dhtlog_handle->insert_query (NULL, msg_ctx->unique_id, DHTLOG_GET,
-                                   msg_ctx->hop_count, GNUNET_NO, &my_identity,
-                                   &msg_ctx->key);
-    }
-#endif
-  }
-  if (msg_ctx->do_forward == GNUNET_YES)
-    route_message (msg, msg_ctx);
-  GNUNET_CONTAINER_bloomfilter_free (msg_ctx->reply_bf);
-  return results;
-}
-
-
-static void
-remove_recent_find_peer (void *cls,
-                         const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  GNUNET_HashCode *key = cls;
-
-  GNUNET_assert (GNUNET_YES ==
-                 GNUNET_CONTAINER_multihashmap_remove
-                 (recent_find_peer_requests, key, NULL));
-  GNUNET_free (key);
-}
-
-
-/**
- * Server handler for initiating local dht find peer requests
- *
- * @param find_msg the actual find peer message
- * @param msg_ctx struct containing pertinent information about the request
- *
- */
-static void
-handle_dht_find_peer (const struct GNUNET_MessageHeader *find_msg,
-                      struct DHT_MessageContext *msg_ctx)
-{
-  struct GNUNET_MessageHeader *find_peer_result;
-  struct GNUNET_DHT_FindPeerMessage *find_peer_message;
-  struct DHT_MessageContext *new_msg_ctx;
-  struct GNUNET_CONTAINER_BloomFilter *incoming_bloom;
-  size_t hello_size;
-  size_t tsize;
-  GNUNET_HashCode *recent_hash;
-  struct GNUNET_MessageHeader *other_hello;
-  size_t other_hello_size;
-  struct GNUNET_PeerIdentity peer_id;
-
-  find_peer_message = (struct GNUNET_DHT_FindPeerMessage *) find_msg;
-  GNUNET_break_op (ntohs (find_msg->size) >=
-                   (sizeof (struct GNUNET_DHT_FindPeerMessage)));
-  if (ntohs (find_msg->size) < sizeof (struct GNUNET_DHT_FindPeerMessage))
-    return;
-  other_hello = NULL;
-  other_hello_size = 0;
-  if (ntohs (find_msg->size) > sizeof (struct GNUNET_DHT_FindPeerMessage))
-  {
-    other_hello_size =
-        ntohs (find_msg->size) - sizeof (struct GNUNET_DHT_FindPeerMessage);
-    other_hello = GNUNET_malloc (other_hello_size);
-    memcpy (other_hello, &find_peer_message[1], other_hello_size);
-    if ((GNUNET_HELLO_size ((struct GNUNET_HELLO_Message *) other_hello) == 0)
-        || (GNUNET_OK !=
-            GNUNET_HELLO_get_id ((struct GNUNET_HELLO_Message *) other_hello,
-                                 &peer_id)))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "Received invalid HELLO message in find peer request!\n");
-      GNUNET_free (other_hello);
-      return;
-    }
-#if FIND_PEER_WITH_HELLO
-    if (GNUNET_YES == consider_peer (&peer_id))
-    {
-      increment_stats (STAT_HELLOS_PROVIDED);
-      GNUNET_TRANSPORT_offer_hello (transport_handle, other_hello, NULL, NULL);
-      GNUNET_CORE_peer_request_connect (coreAPI, &peer_id, NULL, NULL);
-      route_message (find_msg, msg_ctx);
-      GNUNET_free (other_hello);
-      return;
-    }
-    else                        /* We don't want this peer! */
-    {
-      route_message (find_msg, msg_ctx);
-      GNUNET_free (other_hello);
-      return;
-    }
-#endif
-  }
-
-#if DEBUG_DHT
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "`%s:%s': Received `%s' request from client, key %s (msg size 
%d, we expected %d)\n",
-              my_short_id, "DHT", "FIND PEER", GNUNET_h2s (&msg_ctx->key),
-              ntohs (find_msg->size), sizeof (struct GNUNET_MessageHeader));
-#endif
-  if (my_hello == NULL)
-  {
-#if DEBUG_DHT
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "`%s': Our HELLO is null, can't return.\n", "DHT");
-#endif
-    GNUNET_free_non_null (other_hello);
-    route_message (find_msg, msg_ctx);
-    return;
-  }
-
-  incoming_bloom =
-      GNUNET_CONTAINER_bloomfilter_init (find_peer_message->bloomfilter,
-                                         DHT_BLOOM_SIZE, DHT_BLOOM_K);
-  if (GNUNET_YES ==
-      GNUNET_CONTAINER_bloomfilter_test (incoming_bloom,
-                                         &my_identity.hashPubKey))
-  {
-    increment_stats (STAT_BLOOM_FIND_PEER);
-    GNUNET_CONTAINER_bloomfilter_free (incoming_bloom);
-    GNUNET_free_non_null (other_hello);
-    route_message (find_msg, msg_ctx);
-    return;                     /* We match the bloomfilter, do not send a 
response to this peer (they likely already know us!) */
-  }
-  GNUNET_CONTAINER_bloomfilter_free (incoming_bloom);
-
-#if RESTRICT_FIND_PEER
-
-  /**
-   * Ignore any find peer requests from a peer we have seen very recently.
-   */
-  if (GNUNET_YES == GNUNET_CONTAINER_multihashmap_contains 
(recent_find_peer_requests, &msg_ctx->key))  /* We have recently responded to a 
find peer request for this peer! */
-  {
-    increment_stats ("# dht find peer requests ignored (recently seen!)");
-    GNUNET_free_non_null (other_hello);
-    return;
-  }
-
-  /**
-   * Use this check to only allow the peer to respond to find peer requests if
-   * it would be beneficial to have the requesting peer in this peers routing
-   * table.  Can be used to thwart peers flooding the network with find peer
-   * requests that we don't care about.  However, if a new peer is joining
-   * the network and has no other peers this is a problem (assume all buckets
-   * full, no one will respond!).
-   */
-  memcpy (&peer_id.hashPubKey, &msg_ctx->key, sizeof (GNUNET_HashCode));
-  if (GNUNET_NO == consider_peer (&peer_id))
-  {
-    increment_stats ("# dht find peer requests ignored (do not need!)");
-    GNUNET_free_non_null (other_hello);
-    route_message (find_msg, msg_ctx);
-    return;
-  }
-#endif
-
-  recent_hash = GNUNET_malloc (sizeof (GNUNET_HashCode));
-  memcpy (recent_hash, &msg_ctx->key, sizeof (GNUNET_HashCode));
-  if (GNUNET_SYSERR !=
-      GNUNET_CONTAINER_multihashmap_put (recent_find_peer_requests,
-                                         &msg_ctx->key, NULL,
-                                         
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY))
-  {
-#if DEBUG_DHT
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Adding recent remove task for key `%s`!\n",
-                GNUNET_h2s (&msg_ctx->key));
-#endif
-    /* Only add a task if there wasn't one for this key already! */
-    GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
-                                  (GNUNET_TIME_UNIT_SECONDS, 30),
-                                  &remove_recent_find_peer, recent_hash);
-  }
-  else
-  {
-    GNUNET_free (recent_hash);
-#if DEBUG_DHT
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Received duplicate find peer request too soon!\n");
-#endif
-  }
-
-  /* Simplistic find_peer functionality, always return our hello */
-  hello_size = ntohs (my_hello->size);
-  tsize = hello_size + sizeof (struct GNUNET_MessageHeader);
-
-  if (tsize >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
-  {
-    GNUNET_break_op (0);
-    GNUNET_free_non_null (other_hello);
-    return;
-  }
-
-  find_peer_result = GNUNET_malloc (tsize);
-  find_peer_result->type = htons (GNUNET_MESSAGE_TYPE_DHT_FIND_PEER_RESULT);
-  find_peer_result->size = htons (tsize);
-  memcpy (&find_peer_result[1], my_hello, hello_size);
-#if DEBUG_DHT
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "`%s': Sending hello size %d to requesting peer.\n", "DHT",
-              hello_size);
-#endif
-
-  new_msg_ctx = GNUNET_malloc (sizeof (struct DHT_MessageContext));
-  memcpy (new_msg_ctx, msg_ctx, sizeof (struct DHT_MessageContext));
-  new_msg_ctx->peer = my_identity;
-  new_msg_ctx->bloom =
-      GNUNET_CONTAINER_bloomfilter_init (NULL, DHT_BLOOM_SIZE, DHT_BLOOM_K);
-  new_msg_ctx->hop_count = 0;
-  new_msg_ctx->importance = DHT_DEFAULT_P2P_IMPORTANCE + 2;     /* Make find 
peer requests a higher priority */
-  new_msg_ctx->timeout = DHT_DEFAULT_P2P_TIMEOUT;
-  increment_stats (STAT_FIND_PEER_ANSWER);
-  if (GNUNET_DHT_RO_RECORD_ROUTE ==
-      (msg_ctx->msg_options & GNUNET_DHT_RO_RECORD_ROUTE))
-  {
-    new_msg_ctx->msg_options = GNUNET_DHT_RO_RECORD_ROUTE;
-    new_msg_ctx->path_history_len = msg_ctx->path_history_len;
-    /* Assign to previous msg_ctx path history, caller should free after our 
return */
-    new_msg_ctx->path_history = msg_ctx->path_history;
-  }
-  route_result_message (find_peer_result, new_msg_ctx);
-  GNUNET_free (new_msg_ctx);
-#if DEBUG_DHT_ROUTING
-  if ((debug_routes) && (dhtlog_handle != NULL))
-  {
-    dhtlog_handle->insert_query (NULL, msg_ctx->unique_id, DHTLOG_FIND_PEER,
-                                 msg_ctx->hop_count, GNUNET_YES, &my_identity,
-                                 &msg_ctx->key);
-  }
-#endif
-  GNUNET_free_non_null (other_hello);
-  GNUNET_free (find_peer_result);
-  route_message (find_msg, msg_ctx);
-}
-
-
-/**
- * Server handler for initiating local dht put requests
- *
- * @param msg the actual put message
- * @param msg_ctx struct containing pertinent information about the request
- */
-static void
-handle_dht_put (const struct GNUNET_MessageHeader *msg,
-                struct DHT_MessageContext *msg_ctx)
-{
-  const struct GNUNET_DHT_PutMessage *put_msg;
-  struct DHTPutEntry *put_entry;
-  unsigned int put_size;
-  char *path_offset;
-  enum GNUNET_BLOCK_Type put_type;
-  size_t data_size;
-  int ret;
-  GNUNET_HashCode key;
-  struct DHTQueryRecord *record;
-
-  GNUNET_assert (ntohs (msg->size) >= sizeof (struct GNUNET_DHT_PutMessage));
-
-  put_msg = (const struct GNUNET_DHT_PutMessage *) msg;
-  put_type = (enum GNUNET_BLOCK_Type) ntohl (put_msg->type);
-#if HAVE_MALICIOUS
-  if (put_type == GNUNET_BLOCK_DHT_MALICIOUS_MESSAGE_TYPE)
-  {
-#if DEBUG_DHT_ROUTING
-    if ((debug_routes_extended) && (dhtlog_handle != NULL))
-    {
-          /** Log routes that die due to high load! */
-      dhtlog_handle->insert_route (NULL, msg_ctx->unique_id, DHTLOG_ROUTE,
-                                   msg_ctx->hop_count, GNUNET_SYSERR,
-                                   &my_identity, &msg_ctx->key, &msg_ctx->peer,
-                                   NULL);
-    }
-#endif
-    return;
-  }
-#endif
-  data_size =
-      ntohs (put_msg->header.size) - sizeof (struct GNUNET_DHT_PutMessage);
-  ret =
-      GNUNET_BLOCK_get_key (block_context, put_type, &put_msg[1], data_size,
-                            &key);
-  if (GNUNET_NO == ret)
-  {
-#if DEBUG_DHT_ROUTING
-    if ((debug_routes_extended) && (dhtlog_handle != NULL))
-    {
-      dhtlog_handle->insert_route (NULL, msg_ctx->unique_id, DHTLOG_ROUTE,
-                                   msg_ctx->hop_count, GNUNET_SYSERR,
-                                   &my_identity, &msg_ctx->key, &msg_ctx->peer,
-                                   NULL);
-    }
-#endif
-    /* invalid reply */
-    GNUNET_break_op (0);
-    return;
-  }
-  if ((GNUNET_YES == ret) &&
-      (0 != memcmp (&key, &msg_ctx->key, sizeof (GNUNET_HashCode))))
-  {
-#if DEBUG_DHT_ROUTING
-    if ((debug_routes_extended) && (dhtlog_handle != NULL))
-    {
-      dhtlog_handle->insert_route (NULL, msg_ctx->unique_id, DHTLOG_ROUTE,
-                                   msg_ctx->hop_count, GNUNET_SYSERR,
-                                   &my_identity, &msg_ctx->key, &msg_ctx->peer,
-                                   NULL);
-    }
-#endif
-    /* invalid wrapper: key mismatch! */
-    GNUNET_break_op (0);
-    return;
-  }
-  /* ret == GNUNET_SYSERR means that there is no known relationship between
-   * data and the key, so we cannot check it */
-#if DEBUG_DHT
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "`%s:%s': Received `%s' request (inserting data!), message type 
%d, key %s, uid %llu\n",
-              my_short_id, "DHT", "PUT", put_type, GNUNET_h2s (&msg_ctx->key),
-              msg_ctx->unique_id);
-#endif
-#if DEBUG_DHT_ROUTING
-  if (msg_ctx->hop_count == 0)  /* Locally initiated request */
-  {
-    if ((debug_routes) && (dhtlog_handle != NULL))
-    {
-      dhtlog_handle->insert_query (NULL, msg_ctx->unique_id, DHTLOG_PUT,
-                                   msg_ctx->hop_count, GNUNET_NO, &my_identity,
-                                   &msg_ctx->key);
-    }
-  }
-#endif
-
-  record = GNUNET_CONTAINER_multihashmap_get(forward_list.hashmap,
-                                             &msg_ctx->key);
-  if (NULL != record)
-  {
-    struct DHTRouteSource *pos;
-    struct GNUNET_DHT_GetResultMessage *get_result;
-    struct DHT_MessageContext new_msg_ctx;
-    size_t get_size;
-
-    pos = record->head;
-    while (pos != NULL)
-    {
-      /* TODO: do only for local started requests? or also for remote peers? */
-      /* TODO: include this in statistics? under what? */
-      /* TODO: reverse order of path_history? */
-      if (NULL == pos->client)
-      {
-        pos = pos->next;
-        continue;
-      }
-
-      memcpy (&new_msg_ctx, msg_ctx, sizeof (struct DHT_MessageContext));
-      if (GNUNET_DHT_RO_RECORD_ROUTE ==
-          (msg_ctx->msg_options & GNUNET_DHT_RO_RECORD_ROUTE))
-      {
-        new_msg_ctx.msg_options = GNUNET_DHT_RO_RECORD_ROUTE;
-#if DEBUG_PATH
-        for (i = 0; i < new_msg_ctx.path_history_len; i++)
-        {
-          path_offset =
-              &new_msg_ctx.path_history[i * sizeof (struct 
GNUNET_PeerIdentity)];
-          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                      "(put for active get) Key %s Found peer %d:%s\n",
-                      GNUNET_h2s (&msg_ctx->key), i,
-                      GNUNET_i2s ((struct GNUNET_PeerIdentity *) path_offset));
-        }
-#endif
-      }
-
-      get_size =
-          sizeof (struct GNUNET_DHT_GetResultMessage) + data_size +
-          (msg_ctx->path_history_len * sizeof (struct GNUNET_PeerIdentity));
-      get_result = GNUNET_malloc (get_size);
-      get_result->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_GET_RESULT);
-      get_result->header.size = htons (get_size);
-      get_result->expiration = put_msg->expiration;
-      get_result->type = put_msg->type;
-      get_result->put_path_length = htons (msg_ctx->path_history_len);
-
-      /* Copy the actual data and the path_history to the end of the get 
result */
-      memcpy (&get_result[1], &put_msg[1], data_size);
-      path_offset = (char *) &get_result[1];
-      path_offset += data_size;
-      memcpy (path_offset, msg_ctx->path_history,
-              msg_ctx->path_history_len * sizeof (struct GNUNET_PeerIdentity));
-      new_msg_ctx.peer = my_identity;
-      new_msg_ctx.bloom = NULL;
-      new_msg_ctx.hop_count = 0;
-      /* Make result routing a higher priority */
-      new_msg_ctx.importance = DHT_DEFAULT_P2P_IMPORTANCE + 2;
-      new_msg_ctx.timeout = DHT_DEFAULT_P2P_TIMEOUT;
-      new_msg_ctx.unique_id = pos->uid;
-      send_reply_to_client(pos->client, &get_result->header, &new_msg_ctx);
-      GNUNET_free (get_result);
-      pos = pos->next;
-    }
-  }
-
-  if (msg_ctx->closest != GNUNET_YES)
-  {
-    route_message (msg, msg_ctx);
-    return;
-  }
-
-#if DEBUG_DHT
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "`%s:%s': Received `%s' request (inserting data!), message type 
%d, key %s, uid %llu\n",
-              my_short_id, "DHT", "PUT", put_type, GNUNET_h2s (&msg_ctx->key),
-              msg_ctx->unique_id);
-#endif
-
-#if DEBUG_DHT_ROUTING
-  if ((debug_routes_extended) && (dhtlog_handle != NULL))
-  {
-    dhtlog_handle->insert_route (NULL, msg_ctx->unique_id, DHTLOG_ROUTE,
-                                 msg_ctx->hop_count, GNUNET_YES, &my_identity,
-                                 &msg_ctx->key, &msg_ctx->peer, NULL);
-  }
-
-  if ((debug_routes) && (dhtlog_handle != NULL))
-  {
-    dhtlog_handle->insert_query (NULL, msg_ctx->unique_id, DHTLOG_PUT,
-                                 msg_ctx->hop_count, GNUNET_YES, &my_identity,
-                                 &msg_ctx->key);
-  }
-#endif
-
-  increment_stats (STAT_PUTS_INSERTED);
-  if (datacache != NULL)
-  {
-    /* Put size is actual data size plus struct overhead plus path length (if 
any) */
-    put_size =
-        data_size + sizeof (struct DHTPutEntry) +
-        (msg_ctx->path_history_len * sizeof (struct GNUNET_PeerIdentity));
-    put_entry = GNUNET_malloc (put_size);
-    put_entry->data_size = data_size;
-    put_entry->path_length = msg_ctx->path_history_len;
-    /* Copy data to end of put entry */
-    memcpy (&put_entry[1], &put_msg[1], data_size);
-    if (msg_ctx->path_history_len > 0)
-    {
-      /* Copy path after data */
-      path_offset = (char *) &put_entry[1];
-      path_offset += data_size;
-      memcpy (path_offset, msg_ctx->path_history,
-              msg_ctx->path_history_len * sizeof (struct GNUNET_PeerIdentity));
-    }
-
-    ret =
-        GNUNET_DATACACHE_put (datacache, &msg_ctx->key, put_size,
-                              (const char *) put_entry, put_type,
-                              GNUNET_TIME_absolute_ntoh (put_msg->expiration));
-    GNUNET_free (put_entry);
-  }
-  else
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "`%s:%s': %s request received, but have no datacache!\n",
-                my_short_id, "DHT", "PUT");
-
-  if (stop_on_closest == GNUNET_NO)
-    route_message (msg, msg_ctx);
-}
-
-
-/**
- * To how many peers should we (on average)
- * forward the request to obtain the desired
- * target_replication count (on average).
- *
- * returns: target_replication / (est. hops) + (target_replication * hop_count)
- * where est. hops is typically 2 * the routing table depth
- *
- * @param hop_count number of hops the message has traversed
- * @param target_replication the number of total paths desired
- *
- * @return Some number of peers to forward the message to
- */
-static unsigned int
-get_forward_count (unsigned int hop_count, size_t target_replication)
-{
-  uint32_t random_value;
-  unsigned int forward_count;
-  float target_value;
-
-  /**
-   * If we are behaving in strict kademlia mode, send multiple initial 
requests,
-   * but then only send to 1 or 0 peers based strictly on the number of hops.
-   */
-  if (strict_kademlia == GNUNET_YES)
-  {
-    if (hop_count == 0)
-      return kademlia_replication;
-    if (hop_count < log_of_network_size_estimate * 2.0)
-      return 1;
-    return 0;
-  }
-
-  if (hop_count > log_of_network_size_estimate * 2.0)
-  {
-    if (GNUNET_YES == paper_forwarding)
-    {
-      /* Once we have reached our ideal number of hops, don't stop forwarding! 
*/
-      return 1;
-    }
-#if DEBUG_DHT
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Hop count too high (est %f, lowest %d), NOT Forwarding 
request\n",
-                log_of_network_size_estimate * 2.0, lowest_bucket);
-#endif
-    return 0;
-  }
-
-  if (GNUNET_YES == paper_forwarding)
-  {
-    /* FIXME: re-run replication trials with this formula */
-    target_value =
-        1 + (target_replication - 1.0) / (log_of_network_size_estimate +
-                                          ((float) (target_replication - 1.0) *
-                                           hop_count));
-    /* Set forward count to floor of target_value */
-    forward_count = (unsigned int) target_value;
-    /* Subtract forward_count (floor) from target_value (yields value between 
0 and 1) */
-    target_value = target_value - forward_count;
-    random_value =
-        GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, UINT32_MAX);
-
-    if (random_value < (target_value * UINT32_MAX))
-      forward_count += 1;
-  }
-  else
-  {
-    random_value = 0;
-    forward_count = 1;
-    target_value =
-        target_replication / (log_of_network_size_estimate +
-                              ((float) target_replication * hop_count));
-    if (target_value > 1)
-    {
-      /* Set forward count to floor of target_value */
-      forward_count = (unsigned int) target_value;
-      /* Subtract forward_count (floor) from target_value (yields value 
between 0 and 1) */
-      target_value = target_value - forward_count;
-    }
-    else
-      random_value =
-          GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, UINT32_MAX);
-
-    if (random_value < (target_value * UINT32_MAX))
-      forward_count += 1;
-  }
-
-  return forward_count;
-}
-
-
-/**
- * Check whether my identity is closer than any known peers.
- * If a non-null bloomfilter is given, check if this is the closest
- * peer that hasn't already been routed to.
- *
- * @param target hash code to check closeness to
- * @param bloom bloomfilter, exclude these entries from the decision
- * @return GNUNET_YES if node location is closest,
- *         GNUNET_NO otherwise.
- */
-static int
-am_closest_peer (const GNUNET_HashCode * target,
-                 struct GNUNET_CONTAINER_BloomFilter *bloom)
-{
-  int bits;
-  int other_bits;
-  int bucket_num;
-  int count;
-  struct PeerInfo *pos;
-  unsigned int my_distance;
-
-  if (0 == memcmp (&my_identity.hashPubKey, target, sizeof (GNUNET_HashCode)))
-    return GNUNET_YES;
-
-  bucket_num = find_current_bucket (target);
-
-  bits = GNUNET_CRYPTO_hash_matching_bits (&my_identity.hashPubKey, target);
-  my_distance = distance (&my_identity.hashPubKey, target);
-  pos = k_buckets[bucket_num].head;
-  count = 0;
-  while ((pos != NULL) && (count < bucket_size))
-  {
-    if ((bloom != NULL) &&
-        (GNUNET_YES ==
-         GNUNET_CONTAINER_bloomfilter_test (bloom, &pos->id.hashPubKey)))
-    {
-      pos = pos->next;
-      continue;                 /* Skip already checked entries */
-    }
-
-    other_bits = GNUNET_CRYPTO_hash_matching_bits (&pos->id.hashPubKey, 
target);
-    if (other_bits > bits)
-      return GNUNET_NO;
-    else if (other_bits == bits)        /* We match the same number of bits */
-    {
-      if (strict_kademlia != GNUNET_YES)        /* Return that we at as close 
as any other peer */
-        return GNUNET_YES;
-      if (distance (&pos->id.hashPubKey, target) < my_distance) /* Check all 
known peers, only return if we are the true closest */
-        return GNUNET_NO;
-    }
-    pos = pos->next;
-  }
-
-  /* No peers closer, we are the closest! */
-  return GNUNET_YES;
-}
-
-
-/**
- * Select a peer from the routing table that would be a good routing
- * destination for sending a message for "target".  The resulting peer
- * must not be in the set of blocked peers.<p>
- *
- * Note that we should not ALWAYS select the closest peer to the
- * target, peers further away from the target should be chosen with
- * exponentially declining probability.
- *
- * @param target the key we are selecting a peer to route to
- * @param bloom a bloomfilter containing entries this request has seen already
- * @param hops how many hops has this message traversed thus far
- *
- * @return Peer to route to, or NULL on error
- */
-static struct PeerInfo *
-select_peer (const GNUNET_HashCode * target,
-             struct GNUNET_CONTAINER_BloomFilter *bloom, unsigned int hops)
-{
-  unsigned int bc;
-  unsigned int count;
-  unsigned int selected;
-  struct PeerInfo *pos;
-  unsigned int distance;
-  unsigned int largest_distance;
-  struct PeerInfo *chosen;
-
-  /** If we are doing kademlia routing (saves some cycles) */
-  if ((strict_kademlia == GNUNET_YES) || (hops >= 
log_of_network_size_estimate))
-  {
-    /* greedy selection (closest peer that is not in bloomfilter) */
-    largest_distance = 0;
-    chosen = NULL;
-    for (bc = lowest_bucket; bc < MAX_BUCKETS; bc++)
-    {
-      pos = k_buckets[bc].head;
-      count = 0;
-      while ((pos != NULL) && (count < bucket_size))
-      {
-        /* If we are doing strict Kademlia routing, then checking the 
bloomfilter is basically cheating! */
-        if (GNUNET_NO ==
-            GNUNET_CONTAINER_bloomfilter_test (bloom, &pos->id.hashPubKey))
-        {
-          distance = inverse_distance (target, &pos->id.hashPubKey);
-          if (distance > largest_distance)
-          {
-            chosen = pos;
-            largest_distance = distance;
-          }
-        }
-        count++;
-        pos = pos->next;
-      }
-    }
-    if ((largest_distance > 0) && (chosen != NULL))
-    {
-      GNUNET_CONTAINER_bloomfilter_add (bloom, &chosen->id.hashPubKey);
-      return chosen;
-    }
-    return NULL;                /* no peer available or we are the closest */
-  }
-
-
-  /* select "random" peer */
-  /* count number of peers that are available and not filtered */
-  count = 0;
-  for (bc = lowest_bucket; bc < MAX_BUCKETS; bc++)
-  {
-    pos = k_buckets[bc].head;
-    while ((pos != NULL) && (count < bucket_size))
-    {
-      if (GNUNET_YES ==
-          GNUNET_CONTAINER_bloomfilter_test (bloom, &pos->id.hashPubKey))
-      {
-        pos = pos->next;
-       increment_stats ("# peer blocked from selection by Bloom filter");
-        continue;               /* Ignore bloomfiltered peers */
-      }
-      count++;
-      pos = pos->next;
-    }
-  }
-  if (count == 0)               /* No peers to select from! */
-  {
-    increment_stats ("# failed to select peer");
-    return NULL;
-  }
-  /* Now actually choose a peer */
-  selected = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, count);
-  count = 0;
-  for (bc = lowest_bucket; bc < MAX_BUCKETS; bc++)
-  {
-    pos = k_buckets[bc].head;
-    while ((pos != NULL) && (count < bucket_size))
-    {
-      if (GNUNET_YES ==
-          GNUNET_CONTAINER_bloomfilter_test (bloom, &pos->id.hashPubKey))
-      {
-        pos = pos->next;
-        continue;               /* Ignore bloomfiltered peers */
-      }
-      if (0 == selected--)
-        return pos;
-      pos = pos->next;
-    }
-  }
-  GNUNET_break (0);
-  return NULL;
-}
-
-
-/**
- * Task used to remove recent entries, either
- * after timeout, when full, or on shutdown.
- *
- * @param cls the entry to remove
- * @param tc context, reason, etc.
- */
-static void
-remove_recent (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  struct RecentRequest *req = cls;
-  static GNUNET_HashCode hash;
-
-  GNUNET_assert (req != NULL);
-  hash_from_uid (req->uid, &hash);
-#if HAVE_UID_FOR_TESTING > 1
-  GNUNET_assert (GNUNET_YES ==
-                 GNUNET_CONTAINER_multihashmap_remove (recent.hashmap, &hash,
-                                                       req));
-#endif
-  GNUNET_CONTAINER_heap_remove_node (req->heap_node);
-  GNUNET_CONTAINER_bloomfilter_free (req->bloom);
-  GNUNET_free (req);
-
-  /*
-   * if ( (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0) && (0 == 
GNUNET_CONTAINER_multihashmap_size(recent.hashmap)) && (0 == 
GNUNET_CONTAINER_heap_get_size(recent.minHeap)))
-   * {
-   * GNUNET_CONTAINER_multihashmap_destroy(recent.hashmap);
-   * GNUNET_CONTAINER_heap_destroy(recent.minHeap);
-   * }
-   */
-}
-
-/**
- * Remember this routing request so that if a reply is
- * received we can either forward it to the correct peer
- * or return the result locally.
- *
- * @param msg_ctx Context of the route request
- *
- * @return GNUNET_YES if this response was cached, GNUNET_NO if not
- */
-static int
-cache_response (struct DHT_MessageContext *msg_ctx)
-{
-  struct DHTQueryRecord *record;
-  struct DHTRouteSource *source_info;
-  struct DHTRouteSource *pos;
-  struct GNUNET_TIME_Absolute now;
-  unsigned int current_size;
-
-  current_size = GNUNET_CONTAINER_multihashmap_size (forward_list.hashmap);
-
-#if DELETE_WHEN_FULL
-  while (current_size >= MAX_OUTSTANDING_FORWARDS)
-  {
-    source_info = GNUNET_CONTAINER_heap_remove_root (forward_list.minHeap);
-    GNUNET_assert (source_info != NULL);
-    record = source_info->record;
-    GNUNET_CONTAINER_DLL_remove (record->head, record->tail, source_info);
-    if (record->head == NULL)   /* No more entries in DLL */
-    {
-      GNUNET_assert (GNUNET_YES ==
-                     GNUNET_CONTAINER_multihashmap_remove 
(forward_list.hashmap,
-                                                           &record->key,
-                                                           record));
-      GNUNET_free (record);
-    }
-    if (source_info->delete_task != GNUNET_SCHEDULER_NO_TASK)
-    {
-      GNUNET_SCHEDULER_cancel (source_info->delete_task);
-      source_info->delete_task = GNUNET_SCHEDULER_NO_TASK;
-    }
-    if (source_info->find_peers_responded != NULL)
-      GNUNET_CONTAINER_bloomfilter_free (source_info->find_peers_responded);
-    GNUNET_free (source_info);
-    current_size = GNUNET_CONTAINER_multihashmap_size (forward_list.hashmap);
-  }
-#endif
-  /** Non-local request and have too many outstanding forwards, discard! */
-  if ((current_size >= MAX_OUTSTANDING_FORWARDS) && (msg_ctx->client == NULL))
-    return GNUNET_NO;
-
-  now = GNUNET_TIME_absolute_get ();
-  record =
-      GNUNET_CONTAINER_multihashmap_get (forward_list.hashmap, &msg_ctx->key);
-  if (record != NULL)           /* Already know this request! */
-  {
-    pos = record->head;
-    while (pos != NULL)
-    {
-      if (0 ==
-         memcmp (&msg_ctx->peer, &pos->source,
-                 sizeof (struct GNUNET_PeerIdentity)))
-       break;                  /* Already have this peer in reply list! */
-      pos = pos->next;
-    }
-    if ((pos != NULL) && (pos->client == msg_ctx->client))      /* Seen this 
already */
-    {
-      GNUNET_CONTAINER_heap_update_cost (forward_list.minHeap, pos->hnode,
-                                         now.abs_value);
-      return GNUNET_NO;
-    }
-  }
-  else
-  {
-    record = GNUNET_malloc (sizeof (struct DHTQueryRecord));
-    GNUNET_assert (GNUNET_OK ==
-                   GNUNET_CONTAINER_multihashmap_put (forward_list.hashmap,
-                                                      &msg_ctx->key, record,
-                                                      
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
-    memcpy (&record->key, &msg_ctx->key, sizeof (GNUNET_HashCode));
-  }
-
-  source_info = GNUNET_malloc (sizeof (struct DHTRouteSource));
-  source_info->record = record;
-  source_info->delete_task =
-      GNUNET_SCHEDULER_add_delayed (DHT_FORWARD_TIMEOUT, &remove_forward_entry,
-                                    source_info);
-  source_info->find_peers_responded =
-      GNUNET_CONTAINER_bloomfilter_init (NULL, DHT_BLOOM_SIZE, DHT_BLOOM_K);
-  source_info->source = msg_ctx->peer;
-  GNUNET_CONTAINER_DLL_insert_after (record->head, record->tail, record->tail,
-                                     source_info);
-  if (msg_ctx->client != NULL)  /* For local request, set timeout so high it 
effectively never gets pushed out */
-  {
-    source_info->client = msg_ctx->client;
-    now = GNUNET_TIME_absolute_get_forever ();
-  }
-  source_info->hnode =
-      GNUNET_CONTAINER_heap_insert (forward_list.minHeap, source_info,
-                                    now.abs_value);
-  source_info->uid = msg_ctx->unique_id;
-#if DEBUG_DHT > 1
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "`%s:%s': Created new forward source info for %s uid %llu\n",
-              my_short_id, "DHT", GNUNET_h2s (&msg_ctx->key),
-              msg_ctx->unique_id);
-#endif
-  return GNUNET_YES;
-}
-
-
-/**
- * Main function that handles whether or not to route a message to other
- * peers.
- *
- * @param msg the message to be routed
- * @param msg_ctx the context containing all pertinent information about the 
message
- */
-static void
-route_message (const struct GNUNET_MessageHeader *msg,
-               struct DHT_MessageContext *msg_ctx)
-{
-  int i;
-  struct PeerInfo *selected;
-
-#if DEBUG_DHT_ROUTING > 1
-  struct PeerInfo *nearest;
-#endif
-  unsigned int target_forward_count;
-  unsigned int forward_count;
-  struct RecentRequest *recent_req;
-#if HAVE_UID_FOR_TESTING > 1
-  GNUNET_HashCode unique_hash;
-#endif
-  char *stat_forward_count;
-  char *temp_stat_str;
-
-#if DEBUG_DHT_ROUTING
-  int ret;
-#endif
-
-  if (malicious_dropper == GNUNET_YES)
-  {
-#if DEBUG_DHT_ROUTING
-    if ((debug_routes_extended) && (dhtlog_handle != NULL))
-    {
-      dhtlog_handle->insert_route (NULL, msg_ctx->unique_id, DHTLOG_ROUTE,
-                                   msg_ctx->hop_count, GNUNET_SYSERR,
-                                   &my_identity, &msg_ctx->key, &msg_ctx->peer,
-                                   NULL);
-    }
-#endif
-    if (msg_ctx->bloom != NULL)
-    {
-      GNUNET_CONTAINER_bloomfilter_free (msg_ctx->bloom);
-      msg_ctx->bloom = NULL;
-    }
-    return;
-  }
-
-  increment_stats (STAT_ROUTES);
-  target_forward_count =
-      get_forward_count (msg_ctx->hop_count, msg_ctx->replication);
-  GNUNET_asprintf (&stat_forward_count, "# forward counts of %d",
-                   target_forward_count);
-  increment_stats (stat_forward_count);
-  GNUNET_free (stat_forward_count);
-  if (msg_ctx->bloom == NULL)
-    msg_ctx->bloom =
-        GNUNET_CONTAINER_bloomfilter_init (NULL, DHT_BLOOM_SIZE, DHT_BLOOM_K);
-
-  if ((stop_on_closest == GNUNET_YES) && (msg_ctx->closest == GNUNET_YES) &&
-      (ntohs (msg->type) == GNUNET_MESSAGE_TYPE_DHT_PUT))
-    target_forward_count = 0;
-
-  /**
-   * NOTICE:  In Kademlia, a find peer request goes no further if the peer 
doesn't return
-   * any closer peers (which is being checked for below).  Since we are doing 
recursive
-   * routing we have no choice but to stop forwarding in this case.  This 
means that at
-   * any given step the request may NOT be forwarded to alpha peers (because 
routes will
-   * stop and the parallel route will not be aware of it).  Of course, 
assuming that we
-   * have fulfilled the Kademlia requirements for routing table fullness this 
will never
-   * ever ever be a problem.
-   *
-   * However, is this fair?
-   *
-   * Since we use these requests to build our routing tables (and we build 
them in the
-   * testing driver) we will ignore this restriction for FIND_PEER messages so 
that
-   * routing tables still get constructed.
-   */
-  if ((GNUNET_YES == strict_kademlia) && (msg_ctx->closest == GNUNET_YES) &&
-      (msg_ctx->hop_count > 0) &&
-      (ntohs (msg->type) != GNUNET_MESSAGE_TYPE_DHT_FIND_PEER))
-    target_forward_count = 0;
-
-#if HAVE_UID_FOR_TESTING > 1
-  /* BUG HERE: recent uses unique_id! So if all unique-IDs are 0, we get
-     easily into trouble!!! Also, this should not even be necessary... */
-  hash_from_uid (msg_ctx->unique_id, &unique_hash);
-  if (GNUNET_YES ==
-      GNUNET_CONTAINER_multihashmap_contains (recent.hashmap, &unique_hash))
-  {
-    recent_req =
-        GNUNET_CONTAINER_multihashmap_get (recent.hashmap, &unique_hash);
-    GNUNET_assert (recent_req != NULL);
-    if (0 != memcmp (&recent_req->key, &msg_ctx->key, sizeof 
(GNUNET_HashCode)))
-      increment_stats (STAT_DUPLICATE_UID);
-    else
-    {
-      increment_stats (STAT_RECENT_SEEN);
-      GNUNET_CONTAINER_bloomfilter_or2 (msg_ctx->bloom, recent_req->bloom,
-                                        DHT_BLOOM_SIZE);
-    }
-  }
-  else
-#endif
-  {
-    recent_req = GNUNET_malloc (sizeof (struct RecentRequest));
-    recent_req->uid = msg_ctx->unique_id;
-    memcpy (&recent_req->key, &msg_ctx->key, sizeof (GNUNET_HashCode));
-    recent_req->remove_task =
-        GNUNET_SCHEDULER_add_delayed (DEFAULT_RECENT_REMOVAL, &remove_recent,
-                                      recent_req);
-    recent_req->heap_node =
-        GNUNET_CONTAINER_heap_insert (recent.minHeap, recent_req,
-                                      GNUNET_TIME_absolute_get ().abs_value);
-    recent_req->bloom =
-        GNUNET_CONTAINER_bloomfilter_init (NULL, DHT_BLOOM_SIZE, DHT_BLOOM_K);
-#if HAVE_UID_FOR_TESTING > 1
-    GNUNET_CONTAINER_multihashmap_put (recent.hashmap, &unique_hash, 
recent_req,
-                                      
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
-#endif
-  }
-
-  if (GNUNET_CONTAINER_heap_get_size (recent.minHeap) > DHT_MAX_RECENT)
-  {
-    recent_req = GNUNET_CONTAINER_heap_peek (recent.minHeap);
-    GNUNET_assert (recent_req != NULL);
-    GNUNET_SCHEDULER_cancel (recent_req->remove_task);
-    recent_req->remove_task =
-        GNUNET_SCHEDULER_add_now (&remove_recent, recent_req);
-  }
-
-  forward_count = 0;
-  for (i = 0; i < target_forward_count; i++)
-  {
-    selected = select_peer (&msg_ctx->key, msg_ctx->bloom, msg_ctx->hop_count);
-    if (selected == NULL)
-      break;    
-    forward_count++;
-    if (GNUNET_CRYPTO_hash_matching_bits
-       (&selected->id.hashPubKey,
-        &msg_ctx->key) >=
-       GNUNET_CRYPTO_hash_matching_bits (&my_identity.hashPubKey,
-                                         &msg_ctx->key))
-      GNUNET_asprintf (&temp_stat_str,
-                      "# requests routed to close(r) peer hop %u",
-                      msg_ctx->hop_count);
-    else
-      GNUNET_asprintf (&temp_stat_str,
-                      "# requests routed to less close peer hop %u",
-                      msg_ctx->hop_count);
-    if (temp_stat_str != NULL)
-    {
-      increment_stats (temp_stat_str);
-      GNUNET_free (temp_stat_str);
-    }
-    GNUNET_CONTAINER_bloomfilter_add (msg_ctx->bloom,
-                                     &selected->id.hashPubKey);
-#if DEBUG_DHT_ROUTING > 1
-    nearest = find_closest_peer (&msg_ctx->key);
-    nearest_buf = GNUNET_strdup (GNUNET_i2s (&nearest->id));
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-               "`%s:%s': Forwarding request key %s uid %llu to peer %s 
(closest %s, bits %d, distance %u)\n",
-               my_short_id, "DHT", GNUNET_h2s (&msg_ctx->key),
-               msg_ctx->unique_id, GNUNET_i2s (&selected->id), nearest_buf,
-               GNUNET_CRYPTO_hash_matching_bits (&nearest->id.hashPubKey,
-                                                 msg_ctx->key),
-               distance (&nearest->id.hashPubKey, msg_ctx->key));
-    GNUNET_free (nearest_buf);
-#endif
-#if DEBUG_DHT_ROUTING
-    if ((debug_routes_extended) && (dhtlog_handle != NULL))
-    {
-      dhtlog_handle->insert_route (NULL, msg_ctx->unique_id, DHTLOG_ROUTE,
-                                  msg_ctx->hop_count, GNUNET_NO,
-                                  &my_identity, &msg_ctx->key, &msg_ctx->peer,
-                                  &selected->id);
-    }
-#endif
-    forward_message (msg, selected, msg_ctx);    
-  }
-
-  if (msg_ctx->bloom != NULL)
-  {
-    GNUNET_CONTAINER_bloomfilter_or2 (recent_req->bloom, msg_ctx->bloom,
-                                      DHT_BLOOM_SIZE);
-    GNUNET_CONTAINER_bloomfilter_free (msg_ctx->bloom);
-    msg_ctx->bloom = NULL;
-  }
-
-#if DEBUG_DHT_ROUTING
-  if (forward_count == 0)
-    ret = GNUNET_SYSERR;
-  else
-    ret = GNUNET_NO;
-
-  if ((debug_routes_extended) && (dhtlog_handle != NULL))
-  {
-    dhtlog_handle->insert_route (NULL, msg_ctx->unique_id, DHTLOG_ROUTE,
-                                 msg_ctx->hop_count, ret, &my_identity,
-                                 &msg_ctx->key, &msg_ctx->peer, NULL);
-  }
-#endif
-}
-
-
-/**
- * Main function that handles whether or not to route a message to other
- * peers.
- *
- * @param msg the message to be routed
- * @param msg_ctx the context containing all pertinent information about the 
message
- */
-static void
-demultiplex_message (const struct GNUNET_MessageHeader *msg,
-                     struct DHT_MessageContext *msg_ctx)
-{
-  /* FIXME: Should we use closest excluding those we won't route to (the 
bloomfilter problem)? */
-  msg_ctx->closest = am_closest_peer (&msg_ctx->key, msg_ctx->bloom);
-
-  switch (ntohs (msg->type))
-  {
-  case GNUNET_MESSAGE_TYPE_DHT_GET:    /* Add to hashmap of requests seen, 
search for data (always) */
-    cache_response (msg_ctx);
-    handle_dht_get (msg, msg_ctx);
-    break;
-  case GNUNET_MESSAGE_TYPE_DHT_PUT:    /* Check if closest, if so insert data. 
*/
-    increment_stats (STAT_PUTS);
-    handle_dht_put (msg, msg_ctx);
-    break;
-  case GNUNET_MESSAGE_TYPE_DHT_FIND_PEER:      /* Check if closest and not 
started by us, check options, add to requests seen */
-    increment_stats (STAT_FIND_PEER);
-    if (((msg_ctx->hop_count > 0) &&
-         (0 !=
-          memcmp (&msg_ctx->peer, &my_identity,
-                  sizeof (struct GNUNET_PeerIdentity)))) ||
-        (msg_ctx->client != NULL))
-    {
-      cache_response (msg_ctx);
-      if ((msg_ctx->closest == GNUNET_YES) ||
-          (msg_ctx->msg_options == GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE))
-        handle_dht_find_peer (msg, msg_ctx);
-    }
-    else
-      route_message (msg, msg_ctx);
-#if DEBUG_DHT_ROUTING
-    if (msg_ctx->hop_count == 0)        /* Locally initiated request */
-    {
-      if ((debug_routes) && (dhtlog_handle != NULL))
-      {
-        dhtlog_handle->insert_dhtkey (NULL, &msg_ctx->key);
-        dhtlog_handle->insert_query (NULL, msg_ctx->unique_id, 
DHTLOG_FIND_PEER,
-                                     msg_ctx->hop_count, GNUNET_NO,
-                                     &my_identity, &msg_ctx->key);
-      }
-    }
-#endif
-    break;
-  default:
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "`%s': Message type (%d) not handled, forwarding anyway!\n",
-                "DHT", ntohs (msg->type));
-    route_message (msg, msg_ctx);
-  }
-}
-
-
-/**
- * Iterator over hash map entries.
- *
- * @param cls client to search for in source routes
- * @param key current key code (ignored)
- * @param value value in the hash map, a DHTQueryRecord
- * @return GNUNET_YES if we should continue to
- *         iterate,
- *         GNUNET_NO if not.
- */
-static int
-find_client_records (void *cls, const GNUNET_HashCode * key, void *value)
-{
-  struct ClientList *client = cls;
-  struct DHTQueryRecord *record = value;
-  struct DHTRouteSource *pos;
-
-  pos = record->head;
-  while (pos != NULL)
-  {
-    if (pos->client == client)
-      break;
-    pos = pos->next;
-  }
-  if (pos != NULL)
-  {
-    GNUNET_CONTAINER_DLL_remove (record->head, record->tail, pos);
-    GNUNET_CONTAINER_heap_remove_node (pos->hnode);
-    if (pos->delete_task != GNUNET_SCHEDULER_NO_TASK)
-    {
-      GNUNET_SCHEDULER_cancel (pos->delete_task);
-      pos->delete_task = GNUNET_SCHEDULER_NO_TASK;
-    }
-    if (pos->find_peers_responded != NULL)
-      GNUNET_CONTAINER_bloomfilter_free (pos->find_peers_responded);
-    GNUNET_free (pos);
-  }
-  if (record->head == NULL)     /* No more entries in DLL */
-  {
-    GNUNET_assert (GNUNET_YES ==
-                   GNUNET_CONTAINER_multihashmap_remove (forward_list.hashmap,
-                                                         &record->key, 
record));
-    GNUNET_free (record);
-  }
-  return GNUNET_YES;
-}
-
-/**
- * Functions with this signature are called whenever a client
- * is disconnected on the network level.
- *
- * @param cls closure (NULL for dht)
- * @param client identification of the client; NULL
- *        for the last call when the server is destroyed
- */
-static void
-handle_client_disconnect (void *cls, struct GNUNET_SERVER_Client *client)
-{
-  struct ClientList *pos = client_list;
-  struct ClientList *prev;
-  struct ClientList *found;
-  struct PendingMessage *reply;
-
-  prev = NULL;
-  found = NULL;
-  while (pos != NULL)
-  {
-    if (pos->client_handle == client)
-    {
-      if (prev != NULL)
-        prev->next = pos->next;
-      else
-        client_list = pos->next;
-      found = pos;
-      break;
-    }
-    prev = pos;
-    pos = pos->next;
-  }
-
-  if (found != NULL)
-  {
-    if (found->transmit_handle != NULL)
-      GNUNET_CONNECTION_notify_transmit_ready_cancel (found->transmit_handle);
-
-    while (NULL != (reply = found->pending_head))
-    {
-      GNUNET_CONTAINER_DLL_remove (found->pending_head, found->pending_tail,
-                                   reply);
-      GNUNET_free (reply);
-    }
-    GNUNET_CONTAINER_multihashmap_iterate (forward_list.hashmap,
-                                           &find_client_records, found);
-    GNUNET_free (found);
-  }
-}
-
-/**
- * Find a client if it exists, add it otherwise.
- *
- * @param client the server handle to the client
- *
- * @return the client if found, a new client otherwise
- */
-static struct ClientList *
-find_active_client (struct GNUNET_SERVER_Client *client)
-{
-  struct ClientList *pos = client_list;
-  struct ClientList *ret;
-
-  while (pos != NULL)
-  {
-    if (pos->client_handle == client)
-      return pos;
-    pos = pos->next;
-  }
-
-  ret = GNUNET_malloc (sizeof (struct ClientList));
-  ret->client_handle = client;
-  ret->next = client_list;
-  client_list = ret;
-
-  return ret;
-}
-
-#if HAVE_MALICIOUS
-/**
- * Task to send a malicious put message across the network.
- *
- * @param cls closure for this task
- * @param tc the context under which the task is running
- */
-static void
-malicious_put_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  static struct GNUNET_DHT_PutMessage put_message;
-  static struct DHT_MessageContext msg_ctx;
-  static GNUNET_HashCode key;
-  uint32_t random_key;
-
-  if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
-    return;
-  put_message.header.size = htons (sizeof (struct GNUNET_DHT_PutMessage));
-  put_message.header.type = htons (GNUNET_MESSAGE_TYPE_DHT_PUT);
-  put_message.type = htonl (GNUNET_BLOCK_DHT_MALICIOUS_MESSAGE_TYPE);
-  put_message.expiration =
-      GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_get_forever ());
-  memset (&msg_ctx, 0, sizeof (struct DHT_MessageContext));
-  random_key =
-      GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, UINT32_MAX);
-  GNUNET_CRYPTO_hash (&random_key, sizeof (uint32_t), &key);
-  memcpy (&msg_ctx.key, &key, sizeof (GNUNET_HashCode));
-  msg_ctx.unique_id =
-      GNUNET_ntohll (GNUNET_CRYPTO_random_u64
-                     (GNUNET_CRYPTO_QUALITY_WEAK, UINT64_MAX));
-  msg_ctx.replication = ntohl (DHT_DEFAULT_FIND_PEER_REPLICATION);
-  msg_ctx.msg_options = ntohl (0);
-  msg_ctx.network_size = log_of_network_size_estimate;
-  msg_ctx.peer = my_identity;
-  msg_ctx.importance = DHT_DEFAULT_P2P_IMPORTANCE;
-  msg_ctx.timeout = DHT_DEFAULT_P2P_TIMEOUT;
-#if DEBUG_DHT_ROUTING
-  if (dhtlog_handle != NULL)
-    dhtlog_handle->insert_dhtkey (NULL, &key);
-#endif
-  increment_stats (STAT_PUT_START);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "%s:%s Sending malicious PUT message with hash %s\n", 
my_short_id,
-              "DHT", GNUNET_h2s (&key));
-  demultiplex_message (&put_message.header, &msg_ctx);
-  GNUNET_SCHEDULER_add_delayed (malicious_put_frequency, &malicious_put_task,
-                                NULL);
-}
-
-
-/**
- * Task to send a malicious put message across the network.
- *
- * @param cls closure for this task
- * @param tc the context under which the task is running
- */
-static void
-malicious_get_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  static struct GNUNET_DHT_GetMessage get_message;
-  struct DHT_MessageContext msg_ctx;
-  static GNUNET_HashCode key;
-  uint32_t random_key;
-
-  if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
-    return;
-
-  get_message.header.size = htons (sizeof (struct GNUNET_DHT_GetMessage));
-  get_message.header.type = htons (GNUNET_MESSAGE_TYPE_DHT_GET);
-  get_message.type = htonl (GNUNET_BLOCK_DHT_MALICIOUS_MESSAGE_TYPE);
-  memset (&msg_ctx, 0, sizeof (struct DHT_MessageContext));
-  random_key =
-      GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, UINT32_MAX);
-  GNUNET_CRYPTO_hash (&random_key, sizeof (uint32_t), &key);
-  memcpy (&msg_ctx.key, &key, sizeof (GNUNET_HashCode));
-  msg_ctx.unique_id =
-      GNUNET_ntohll (GNUNET_CRYPTO_random_u64
-                     (GNUNET_CRYPTO_QUALITY_WEAK, UINT64_MAX));
-  msg_ctx.replication = ntohl (DHT_DEFAULT_FIND_PEER_REPLICATION);
-  msg_ctx.msg_options = ntohl (0);
-  msg_ctx.network_size = log_of_network_size_estimate;
-  msg_ctx.peer = my_identity;
-  msg_ctx.importance = DHT_DEFAULT_P2P_IMPORTANCE;
-  msg_ctx.timeout = DHT_DEFAULT_P2P_TIMEOUT;
-#if DEBUG_DHT_ROUTING
-  if (dhtlog_handle != NULL)
-    dhtlog_handle->insert_dhtkey (NULL, &key);
-#endif
-  increment_stats (STAT_GET_START);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "%s:%s Sending malicious GET message with hash %s\n", 
my_short_id,
-              "DHT", GNUNET_h2s (&key));
-  demultiplex_message (&get_message.header, &msg_ctx);
-  GNUNET_SCHEDULER_add_delayed (malicious_get_frequency, &malicious_get_task,
-                                NULL);
-}
-#endif
-
-
-/**
- * Iterator over hash map entries.
- *
- * @param cls closure
- * @param key current key code
- * @param value value in the hash map
- * @return GNUNET_YES if we should continue to
- *         iterate,
- *         GNUNET_NO if not.
- */
-static int
-add_known_to_bloom (void *cls, const GNUNET_HashCode * key, void *value)
-{
-  struct GNUNET_CONTAINER_BloomFilter *bloom = cls;
-
-  GNUNET_CONTAINER_bloomfilter_add (bloom, key);
-  return GNUNET_YES;
-}
-
-/**
- * Task to send a find peer message for our own peer identifier
- * so that we can find the closest peers in the network to ourselves
- * and attempt to connect to them.
- *
- * @param cls closure for this task
- * @param tc the context under which the task is running
- */
-static void
-send_find_peer_message (void *cls,
-                        const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  struct GNUNET_DHT_FindPeerMessage *find_peer_msg;
-  struct DHT_MessageContext msg_ctx;
-  struct GNUNET_TIME_Relative next_send_time;
-  struct GNUNET_CONTAINER_BloomFilter *temp_bloom;
-
-  if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
-    return;
-
-  if ((newly_found_peers > bucket_size) && (GNUNET_YES == do_find_peer))       
 /* If we are finding peers already, no need to send out our request right now! 
*/
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Have %d newly found peers since last find peer message 
sent!\n",
-                newly_found_peers);
-    GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES,
-                                  &send_find_peer_message, NULL);
-    newly_found_peers = 0;
-    return;
-  }
-
-  increment_stats (STAT_FIND_PEER_START);
-#if FIND_PEER_WITH_HELLO
-  find_peer_msg =
-      GNUNET_malloc (sizeof (struct GNUNET_DHT_FindPeerMessage) +
-                     GNUNET_HELLO_size ((struct GNUNET_HELLO_Message *)
-                                        my_hello));
-  find_peer_msg->header.size =
-      htons (sizeof (struct GNUNET_DHT_FindPeerMessage) +
-             GNUNET_HELLO_size ((struct GNUNET_HELLO_Message *) my_hello));
-  memcpy (&find_peer_msg[1], my_hello,
-          GNUNET_HELLO_size ((struct GNUNET_HELLO_Message *) my_hello));
-#else
-  find_peer_msg = GNUNET_malloc (sizeof (struct GNUNET_DHT_FindPeerMessage));
-  find_peer_msg->header.size =
-      htons (sizeof (struct GNUNET_DHT_FindPeerMessage));
-#endif
-  find_peer_msg->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_FIND_PEER);
-  temp_bloom =
-      GNUNET_CONTAINER_bloomfilter_init (NULL, DHT_BLOOM_SIZE, DHT_BLOOM_K);
-  GNUNET_CONTAINER_multihashmap_iterate (all_known_peers, &add_known_to_bloom,
-                                         temp_bloom);
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_CONTAINER_bloomfilter_get_raw_data (temp_bloom,
-                                                            find_peer_msg->
-                                                            bloomfilter,
-                                                            DHT_BLOOM_SIZE));
-  GNUNET_CONTAINER_bloomfilter_free (temp_bloom);
-  memset (&msg_ctx, 0, sizeof (struct DHT_MessageContext));
-  memcpy (&msg_ctx.key, &my_identity.hashPubKey, sizeof (GNUNET_HashCode));
-  msg_ctx.unique_id =
-      GNUNET_ntohll (GNUNET_CRYPTO_random_u64
-                     (GNUNET_CRYPTO_QUALITY_STRONG, UINT64_MAX));
-  msg_ctx.replication = DHT_DEFAULT_FIND_PEER_REPLICATION;
-  msg_ctx.msg_options = GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE;
-  msg_ctx.network_size = log_of_network_size_estimate;
-  msg_ctx.peer = my_identity;
-  msg_ctx.importance = DHT_DEFAULT_FIND_PEER_IMPORTANCE;
-  msg_ctx.timeout = DHT_DEFAULT_FIND_PEER_TIMEOUT;
-
-  demultiplex_message (&find_peer_msg->header, &msg_ctx);
-  GNUNET_free (find_peer_msg);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "`%s:%s': Sent `%s' request to some (?) peers\n", my_short_id,
-              "DHT", "FIND PEER");
-  if (newly_found_peers < bucket_size)
-  {
-    next_send_time.rel_value =
-        (DHT_MAXIMUM_FIND_PEER_INTERVAL.rel_value / 2) +
-        GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_STRONG,
-                                  DHT_MAXIMUM_FIND_PEER_INTERVAL.rel_value / 
2);
-  }
-  else
-  {
-    next_send_time.rel_value =
-        DHT_MINIMUM_FIND_PEER_INTERVAL.rel_value +
-        GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_STRONG,
-                                  DHT_MAXIMUM_FIND_PEER_INTERVAL.rel_value -
-                                  DHT_MINIMUM_FIND_PEER_INTERVAL.rel_value);
-  }
-
-  GNUNET_assert (next_send_time.rel_value != 0);
-  find_peer_context.count = 0;
-  newly_found_peers = 0;
-  find_peer_context.start = GNUNET_TIME_absolute_get ();
-  if (GNUNET_YES == do_find_peer)
-  {
-    GNUNET_SCHEDULER_add_delayed (next_send_time, &send_find_peer_message,
-                                  NULL);
-  }
-}
-
-/**
- * Handler for any generic DHT messages, calls the appropriate handler
- * depending on message type, sends confirmation if responses aren't otherwise
- * expected.
- *
- * @param cls closure for the service
- * @param client the client we received this message from
- * @param message the actual message received
- */
-static void
-handle_dht_local_route_request (void *cls, struct GNUNET_SERVER_Client *client,
-                                const struct GNUNET_MessageHeader *message)
-{
-  const struct GNUNET_DHT_RouteMessage *dht_msg =
-      (const struct GNUNET_DHT_RouteMessage *) message;
-  const struct GNUNET_MessageHeader *enc_msg;
-  struct DHT_MessageContext msg_ctx;
-
-  enc_msg = (const struct GNUNET_MessageHeader *) &dht_msg[1];
-#if DEBUG_DHT
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "`%s:%s': Received `%s' request from client, message type %d, 
key %s, uid %llu\n",
-              my_short_id, "DHT", "GENERIC", ntohs (message->type),
-              GNUNET_h2s (&dht_msg->key), GNUNET_ntohll (dht_msg->unique_id));
-#endif
-#if DEBUG_DHT_ROUTING
-  if (dhtlog_handle != NULL)
-    dhtlog_handle->insert_dhtkey (NULL, &dht_msg->key);
-#endif
-
-  memset (&msg_ctx, 0, sizeof (struct DHT_MessageContext));
-  msg_ctx.client = find_active_client (client);
-  memcpy (&msg_ctx.key, &dht_msg->key, sizeof (GNUNET_HashCode));
-  msg_ctx.unique_id = GNUNET_ntohll (dht_msg->unique_id);
-  msg_ctx.replication = ntohl (dht_msg->desired_replication_level);
-  msg_ctx.msg_options = ntohl (dht_msg->options);
-  if (GNUNET_DHT_RO_RECORD_ROUTE ==
-      (msg_ctx.msg_options & GNUNET_DHT_RO_RECORD_ROUTE))
-  {
-    msg_ctx.path_history = GNUNET_malloc (sizeof (struct GNUNET_PeerIdentity));
-    memcpy (msg_ctx.path_history, &my_identity,
-            sizeof (struct GNUNET_PeerIdentity));
-    msg_ctx.path_history_len = 1;
-  }
-  msg_ctx.network_size = log_of_network_size_estimate;
-  msg_ctx.peer = my_identity;
-  msg_ctx.importance = DHT_DEFAULT_P2P_IMPORTANCE + 4;  /* Make local routing 
a higher priority */
-  msg_ctx.timeout = DHT_DEFAULT_P2P_TIMEOUT;
-
-  if (ntohs (enc_msg->type) == GNUNET_MESSAGE_TYPE_DHT_GET)
-    increment_stats (STAT_GET_START);
-  else if (ntohs (enc_msg->type) == GNUNET_MESSAGE_TYPE_DHT_PUT)
-    increment_stats (STAT_PUT_START);
-  else if (ntohs (enc_msg->type) == GNUNET_MESSAGE_TYPE_DHT_FIND_PEER)
-    increment_stats (STAT_FIND_PEER_START);
-
-  if (GNUNET_YES == malicious_dropper)
-  {
-    if (ntohs (enc_msg->type) == GNUNET_MESSAGE_TYPE_DHT_GET)
-    {
-#if DEBUG_DHT_ROUTING
-      if ((debug_routes) && (dhtlog_handle != NULL))
-      {
-        dhtlog_handle->insert_query (NULL, msg_ctx.unique_id, DHTLOG_GET,
-                                     msg_ctx.hop_count, GNUNET_NO, 
&my_identity,
-                                     &msg_ctx.key);
-      }
-#endif
-    }
-    else if (ntohs (enc_msg->type) == GNUNET_MESSAGE_TYPE_DHT_PUT)
-    {
-#if DEBUG_DHT_ROUTING
-      if ((debug_routes) && (dhtlog_handle != NULL))
-      {
-        dhtlog_handle->insert_query (NULL, msg_ctx.unique_id, DHTLOG_PUT,
-                                     msg_ctx.hop_count, GNUNET_NO, 
&my_identity,
-                                     &msg_ctx.key);
-      }
-#endif
-    }
-    GNUNET_SERVER_receive_done (client, GNUNET_OK);
-    GNUNET_free_non_null (msg_ctx.path_history);
-    return;
-  }
-
-  demultiplex_message (enc_msg, &msg_ctx);
-  GNUNET_SERVER_receive_done (client, GNUNET_OK);
-
-}
-
-/**
- * Handler for any locally received DHT control messages,
- * sets malicious flags mostly for now.
- *
- * @param cls closure for the service
- * @param client the client we received this message from
- * @param message the actual message received
- *
- */
-static void
-handle_dht_control_message (void *cls, struct GNUNET_SERVER_Client *client,
-                            const struct GNUNET_MessageHeader *message)
-{
-  const struct GNUNET_DHT_ControlMessage *dht_control_msg =
-      (const struct GNUNET_DHT_ControlMessage *) message;
-
-#if DEBUG_DHT
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "`%s:%s': Received `%s' request from client, command %d\n",
-              my_short_id, "DHT", "CONTROL", ntohs (dht_control_msg->command));
-#endif
-
-  switch (ntohs (dht_control_msg->command))
-  {
-  case GNUNET_MESSAGE_TYPE_DHT_FIND_PEER:
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Sending self seeking find peer request!\n");
-    GNUNET_SCHEDULER_add_now (&send_find_peer_message, NULL);
-    break;
-#if HAVE_MALICIOUS
-  case GNUNET_MESSAGE_TYPE_DHT_MALICIOUS_GET:
-    if (ntohs (dht_control_msg->variable) > 0)
-      malicious_get_frequency.rel_value = ntohs (dht_control_msg->variable);
-    if (malicious_get_frequency.rel_value == 0)
-      malicious_get_frequency = DEFAULT_MALICIOUS_GET_FREQUENCY;
-    if (malicious_getter != GNUNET_YES)
-      GNUNET_SCHEDULER_add_now (&malicious_get_task, NULL);
-    malicious_getter = GNUNET_YES;
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "%s:%s Initiating malicious GET behavior, frequency %llu\n",
-                my_short_id, "DHT", malicious_get_frequency.rel_value);
-    break;
-  case GNUNET_MESSAGE_TYPE_DHT_MALICIOUS_PUT:
-    if (ntohs (dht_control_msg->variable) > 0)
-      malicious_put_frequency.rel_value = ntohs (dht_control_msg->variable);
-    if (malicious_put_frequency.rel_value == 0)
-      malicious_put_frequency = DEFAULT_MALICIOUS_PUT_FREQUENCY;
-    if (malicious_putter != GNUNET_YES)
-      GNUNET_SCHEDULER_add_now (&malicious_put_task, NULL);
-    malicious_putter = GNUNET_YES;
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "%s:%s Initiating malicious PUT behavior, frequency %d\n",
-                my_short_id, "DHT", malicious_put_frequency);
-    break;
-  case GNUNET_MESSAGE_TYPE_DHT_MALICIOUS_DROP:
-#if DEBUG_DHT_ROUTING
-    if ((malicious_dropper != GNUNET_YES) && (dhtlog_handle != NULL))
-      dhtlog_handle->set_malicious (&my_identity);
-#endif
-    malicious_dropper = GNUNET_YES;
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "%s:%s Initiating malicious DROP behavior\n", my_short_id,
-                "DHT");
-    break;
-#endif
-  default:
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "%s:%s Unknown control command type `%d'!\n", my_short_id,
-                "DHT", ntohs (dht_control_msg->command));
-    break;
-  }
-
-  GNUNET_SERVER_receive_done (client, GNUNET_OK);
-}
-
-/**
- * Handler for any generic DHT stop messages, calls the appropriate handler
- * depending on message type (if processed locally)
- *
- * @param cls closure for the service
- * @param client the client we received this message from
- * @param message the actual message received
- *
- */
-static void
-handle_dht_local_route_stop (void *cls, struct GNUNET_SERVER_Client *client,
-                             const struct GNUNET_MessageHeader *message)
-{
-
-  const struct GNUNET_DHT_StopMessage *dht_stop_msg =
-      (const struct GNUNET_DHT_StopMessage *) message;
-  struct DHTQueryRecord *record;
-  struct DHTRouteSource *pos;
-
-#if DEBUG_DHT
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "`%s:%s': Received `%s' request from client, uid %llu\n",
-              my_short_id, "DHT", "GENERIC STOP",
-              GNUNET_ntohll (dht_stop_msg->unique_id));
-#endif
-  record =
-      GNUNET_CONTAINER_multihashmap_get (forward_list.hashmap,
-                                         &dht_stop_msg->key);
-  if (record != NULL)
-  {
-    pos = record->head;
-
-    while (pos != NULL)
-    {
-      /* If the client is non-null (local request) and the client matches the 
requesting client, remove the entry. */
-      if ((pos->client != NULL) && (pos->client->client_handle == client))
-      {
-        if (pos->delete_task != GNUNET_SCHEDULER_NO_TASK)
-          GNUNET_SCHEDULER_cancel (pos->delete_task);
-        pos->delete_task =
-            GNUNET_SCHEDULER_add_now (&remove_forward_entry, pos);
-      }
-      pos = pos->next;
-    }
-  }
-
-  GNUNET_SERVER_receive_done (client, GNUNET_OK);
-}
-
-
-/**
- * Core handler for p2p route requests.
- *
- * @param cls closure
- * @param message message
- * @param peer peer identity this notification is about
- * @param atsi performance data
- * @return GNUNET_OK to keep the connection open,
- *         GNUNET_SYSERR to close it (signal serious error)
- */
-static int
-handle_dht_p2p_route_request (void *cls, const struct GNUNET_PeerIdentity 
*peer,
-                              const struct GNUNET_MessageHeader *message,
-                              const struct GNUNET_TRANSPORT_ATS_Information
-                              *atsi)
-{
-#if DEBUG_DHT
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "`%s:%s': Received P2P request from peer %s\n", my_short_id,
-              "DHT", GNUNET_i2s (peer));
-#endif
-  struct GNUNET_DHT_P2PRouteMessage *incoming =
-      (struct GNUNET_DHT_P2PRouteMessage *) message;
-  struct GNUNET_MessageHeader *enc_msg =
-      (struct GNUNET_MessageHeader *) &incoming[1];
-  struct DHT_MessageContext *msg_ctx;
-  char *route_path;
-  int path_size;
-
-  if (ntohs (enc_msg->size) >= GNUNET_SERVER_MAX_MESSAGE_SIZE - 1)
-  {
-    GNUNET_break_op (0);
-    return GNUNET_YES;
-  }
-
-  if (malicious_dropper == GNUNET_YES)
-  {
-#if DEBUG_DHT_ROUTING
-    if ((debug_routes_extended) && (dhtlog_handle != NULL))
-    {
-          /** Log routes that die due to high load! */
-      dhtlog_handle->insert_route (NULL, 
-#if HAVE_UID_FOR_TESTING
-                                  GNUNET_ntohll (incoming->unique_id),
-#else
-                                  0,
-#endif
-                                   DHTLOG_ROUTE, ntohl (incoming->hop_count),
-                                   GNUNET_SYSERR, &my_identity, &incoming->key,
-                                   peer, NULL);
-    }
-#endif
-    return GNUNET_YES;
-  }
-
-  if (get_max_send_delay ().rel_value > MAX_REQUEST_TIME.rel_value)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Sending of previous replies took too long, backing off!\n");
-    increment_stats ("# route requests dropped due to high load");
-    decrease_max_send_delay (get_max_send_delay ());
-#if DEBUG_DHT_ROUTING
-    if ((debug_routes_extended) && (dhtlog_handle != NULL))
-    {
-        /** Log routes that die due to high load! */
-      dhtlog_handle->insert_route (NULL, 
-#if HAVE_UID_FOR_TESTING
-                                  GNUNET_ntohll (incoming->unique_id),
-#else
-                                  0,
-#endif
-                                   DHTLOG_ROUTE, ntohl (incoming->hop_count),
-                                   GNUNET_SYSERR, &my_identity, &incoming->key,
-                                   peer, NULL);
-    }
-#endif
-    return GNUNET_YES;
-  }
-  msg_ctx = GNUNET_malloc (sizeof (struct DHT_MessageContext));
-  msg_ctx->bloom =
-      GNUNET_CONTAINER_bloomfilter_init (incoming->bloomfilter, DHT_BLOOM_SIZE,
-                                         DHT_BLOOM_K);
-  GNUNET_assert (msg_ctx->bloom != NULL);
-  msg_ctx->hop_count = ntohl (incoming->hop_count);
-  memcpy (&msg_ctx->key, &incoming->key, sizeof (GNUNET_HashCode));
-  msg_ctx->replication = ntohl (incoming->desired_replication_level);
-#if HAVE_UID_FOR_TESTING
-  msg_ctx->unique_id = GNUNET_ntohll (incoming->unique_id);
-#endif
-  msg_ctx->msg_options = ntohl (incoming->options);
-  if (GNUNET_DHT_RO_RECORD_ROUTE ==
-      (msg_ctx->msg_options & GNUNET_DHT_RO_RECORD_ROUTE))
-  {
-    path_size =
-        ntohl (incoming->outgoing_path_length) *
-        sizeof (struct GNUNET_PeerIdentity);
-    if (ntohs (message->size) !=
-        (sizeof (struct GNUNET_DHT_P2PRouteMessage) + ntohs (enc_msg->size) +
-         path_size))
-    {
-      GNUNET_break_op (0);
-      GNUNET_free (msg_ctx);
-      return GNUNET_YES;
-    }
-    route_path = (char *) &incoming[1];
-    route_path = route_path + ntohs (enc_msg->size);
-    msg_ctx->path_history =
-        GNUNET_malloc (sizeof (struct GNUNET_PeerIdentity) + path_size);
-    memcpy (msg_ctx->path_history, route_path, path_size);
-    memcpy (&msg_ctx->path_history[path_size], &my_identity,
-            sizeof (struct GNUNET_PeerIdentity));
-    msg_ctx->path_history_len = ntohl (incoming->outgoing_path_length) + 1;
-  }
-  msg_ctx->network_size = ntohl (incoming->network_size);
-  msg_ctx->peer = *peer;
-  msg_ctx->importance = DHT_DEFAULT_P2P_IMPORTANCE;
-  msg_ctx->timeout = DHT_DEFAULT_P2P_TIMEOUT;
-  demultiplex_message (enc_msg, msg_ctx);
-  if (msg_ctx->bloom != NULL)
-  {
-    GNUNET_CONTAINER_bloomfilter_free (msg_ctx->bloom);
-    msg_ctx->bloom = NULL;
-  }
-  GNUNET_free (msg_ctx);
-  return GNUNET_YES;
-}
-
-
-/**
- * Core handler for p2p route results.
- *
- * @param cls closure
- * @param message message
- * @param peer peer identity this notification is about
- * @param atsi performance data
- *
- */
-static int
-handle_dht_p2p_route_result (void *cls, const struct GNUNET_PeerIdentity *peer,
-                             const struct GNUNET_MessageHeader *message,
-                             const struct GNUNET_TRANSPORT_ATS_Information
-                             *atsi)
-{
-#if DEBUG_DHT
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "`%s:%s': Received request from peer %s\n", my_short_id, "DHT",
-              GNUNET_i2s (peer));
-#endif
-  const struct GNUNET_DHT_P2PRouteResultMessage *incoming =
-      (const struct GNUNET_DHT_P2PRouteResultMessage *) message;
-  struct GNUNET_MessageHeader *enc_msg =
-      (struct GNUNET_MessageHeader *) &incoming[1];
-  struct DHT_MessageContext msg_ctx;
-
-#if DEBUG_PATH
-  char *path_offset;
-  unsigned int i;
-#endif
-  if (ntohs (enc_msg->size) >= GNUNET_SERVER_MAX_MESSAGE_SIZE - 1)
-  {
-    GNUNET_break_op (0);
-    return GNUNET_YES;
-  }
-
-  if (malicious_dropper == GNUNET_YES)
-  {
-#if DEBUG_DHT_ROUTING
-    if ((debug_routes_extended) && (dhtlog_handle != NULL))
-    {
-          /** Log routes that die due to high load! */
-      dhtlog_handle->insert_route (NULL, 
-#if HAVE_UID_FOR_TESTING
-                                  GNUNET_ntohll (incoming->unique_id),
-#else
-                                  0,
-#endif
-                                   DHTLOG_ROUTE, ntohl (incoming->hop_count),
-                                   GNUNET_SYSERR, &my_identity, &incoming->key,
-                                   peer, NULL);
-    }
-#endif
-    return GNUNET_YES;
-  }
-
-  memset (&msg_ctx, 0, sizeof (struct DHT_MessageContext));
-  memcpy (&msg_ctx.key, &incoming->key, sizeof (GNUNET_HashCode));
-#if HAVE_UID_FOR_TESTING
-  msg_ctx.unique_id = GNUNET_ntohll (incoming->unique_id);
-#endif
-  msg_ctx.msg_options = ntohl (incoming->options);
-  msg_ctx.hop_count = ntohl (incoming->hop_count);
-  msg_ctx.peer = *peer;
-  msg_ctx.importance = DHT_DEFAULT_P2P_IMPORTANCE + 2;  /* Make result routing 
a higher priority */
-  msg_ctx.timeout = DHT_DEFAULT_P2P_TIMEOUT;
-  if ((GNUNET_DHT_RO_RECORD_ROUTE ==
-       (msg_ctx.msg_options & GNUNET_DHT_RO_RECORD_ROUTE)) &&
-      (ntohl (incoming->outgoing_path_length) > 0))
-  {
-    if (ntohs (message->size) -
-        sizeof (struct GNUNET_DHT_P2PRouteResultMessage) -
-        ntohs (enc_msg->size) !=
-        ntohl (incoming->outgoing_path_length) *
-        sizeof (struct GNUNET_PeerIdentity))
-    {
-#if DEBUG_DHT
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Return message indicated a path was included, but sizes are 
wrong: Total size %d, enc size %d, left %d, expected %d\n",
-                  ntohs (message->size), ntohs (enc_msg->size),
-                  ntohs (message->size) -
-                  sizeof (struct GNUNET_DHT_P2PRouteResultMessage) -
-                  ntohs (enc_msg->size),
-                  ntohl (incoming->outgoing_path_length) *
-                  sizeof (struct GNUNET_PeerIdentity));
-#endif
-      GNUNET_break_op (0);
-      return GNUNET_NO;
-    }
-    msg_ctx.path_history = (char *) &incoming[1];
-    msg_ctx.path_history += ntohs (enc_msg->size);
-    msg_ctx.path_history_len = ntohl (incoming->outgoing_path_length);
-#if DEBUG_PATH
-    for (i = 0; i < msg_ctx.path_history_len; i++)
-    {
-      path_offset =
-          &msg_ctx.path_history[i * sizeof (struct GNUNET_PeerIdentity)];
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "(handle_p2p_route_result) Key %s Found peer %d:%s\n",
-                  GNUNET_h2s (&msg_ctx.key), i,
-                  GNUNET_i2s ((struct GNUNET_PeerIdentity *) path_offset));
-    }
-#endif
-  }
-  route_result_message (enc_msg, &msg_ctx);
-  return GNUNET_YES;
-}
-
-
-/**
- * Receive the HELLO from transport service,
- * free current and replace if necessary.
- *
- * @param cls NULL
- * @param message HELLO message of peer
- */
-static void
-process_hello (void *cls, const struct GNUNET_MessageHeader *message)
-{
-#if DEBUG_DHT
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received our `%s' from transport service\n", "HELLO");
-#endif
-
-  GNUNET_assert (message != NULL);
-  GNUNET_free_non_null (my_hello);
-  my_hello = GNUNET_malloc (ntohs (message->size));
-  memcpy (my_hello, message, ntohs (message->size));
-}
-
-
-/**
- * Task run during shutdown.
- *
- * @param cls unused
- * @param tc unused
- */
-static void
-shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  int bucket_count;
-  struct PeerInfo *pos;
-
-  if (NULL != ghh)
-  {
-    GNUNET_TRANSPORT_get_hello_cancel (ghh);
-    ghh = NULL;
-  }
-  if (transport_handle != NULL)
-  {
-    GNUNET_free_non_null (my_hello);
-    GNUNET_TRANSPORT_disconnect (transport_handle);
-    transport_handle = NULL;
-  }
-  if (NULL != nse)
-  {
-    GNUNET_NSE_disconnect (nse);
-    nse = NULL;
-  }
-  if (coreAPI != NULL)
-  {
-#if DEBUG_DHT
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%s:%s Disconnecting core!\n",
-                my_short_id, "DHT");
-#endif
-    GNUNET_CORE_disconnect (coreAPI);
-    coreAPI = NULL;
-  }
-  for (bucket_count = lowest_bucket; bucket_count < MAX_BUCKETS; 
bucket_count++)
-  {
-    while (k_buckets[bucket_count].head != NULL)
-    {
-      pos = k_buckets[bucket_count].head;
-#if DEBUG_DHT
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "%s:%s Removing peer %s from bucket %d!\n", my_short_id,
-                  "DHT", GNUNET_i2s (&pos->id), bucket_count);
-#endif
-      delete_peer (pos, bucket_count);
-    }
-  }
-  if (datacache != NULL)
-  {
-#if DEBUG_DHT
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%s:%s Destroying datacache!\n",
-                my_short_id, "DHT");
-#endif
-    GNUNET_DATACACHE_destroy (datacache);
-    datacache = NULL;
-  }
-  if (stats != NULL)
-  {
-    GNUNET_STATISTICS_destroy (stats, GNUNET_YES);
-    stats = NULL;
-  }
-  if (dhtlog_handle != NULL)
-  {
-    GNUNET_DHTLOG_disconnect (dhtlog_handle);
-    dhtlog_handle = NULL;
-  }
-  if (block_context != NULL)
-  {
-    GNUNET_BLOCK_context_destroy (block_context);
-    block_context = NULL;
-  }
-  GNUNET_free_non_null (my_short_id);
-  my_short_id = NULL;
-}
-
-
-/**
- * To be called on core init/fail.
- *
- * @param cls service closure
- * @param server handle to the server for this service
- * @param identity the public identity of this peer
- * @param publicKey the public key of this peer
- */
-static void
-core_init (void *cls, struct GNUNET_CORE_Handle *server,
-           const struct GNUNET_PeerIdentity *identity,
-           const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey)
-{
-
-  if (server == NULL)
-  {
-#if DEBUG_DHT
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%s: Connection to core FAILED!\n",
-                "dht", GNUNET_i2s (identity));
-#endif
-    GNUNET_SCHEDULER_cancel (cleanup_task);
-    GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
-    return;
-  }
-#if DEBUG_DHT
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "%s: Core connection initialized, I am peer: %s\n", "dht",
-              GNUNET_i2s (identity));
-#endif
-
-  /* Copy our identity so we can use it */
-  memcpy (&my_identity, identity, sizeof (struct GNUNET_PeerIdentity));
-  if (my_short_id != NULL)
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "%s Receive CORE INIT message but have already been 
initialized! Did CORE fail?\n",
-                "DHT SERVICE");
-  my_short_id = GNUNET_strdup (GNUNET_i2s (&my_identity));
-  if (dhtlog_handle != NULL)
-    dhtlog_handle->insert_node (NULL, &my_identity);
-}
-
-
-static struct GNUNET_SERVER_MessageHandler plugin_handlers[] = {
-  {&handle_dht_local_route_request, NULL, GNUNET_MESSAGE_TYPE_DHT_LOCAL_ROUTE,
-   0},
-  {&handle_dht_local_route_stop, NULL,
-   GNUNET_MESSAGE_TYPE_DHT_LOCAL_ROUTE_STOP, 0},
-  {&handle_dht_control_message, NULL, GNUNET_MESSAGE_TYPE_DHT_CONTROL, 0},
-  {NULL, NULL, 0, 0}
-};
-
-
-static struct GNUNET_CORE_MessageHandler core_handlers[] = {
-  {&handle_dht_p2p_route_request, GNUNET_MESSAGE_TYPE_DHT_P2P_ROUTE, 0},
-  {&handle_dht_p2p_route_result, GNUNET_MESSAGE_TYPE_DHT_P2P_ROUTE_RESULT, 0},
-  {NULL, 0, 0}
-};
-
-
-/**
- * Method called whenever a peer connects.
- *
- * @param cls closure
- * @param peer peer identity this notification is about
- * @param atsi performance data
- */
-static void
-handle_core_connect (void *cls, const struct GNUNET_PeerIdentity *peer,
-                     const struct GNUNET_TRANSPORT_ATS_Information *atsi)
-{
-  struct PeerInfo *ret;
-  struct DHTPutEntry *put_entry;
-  int peer_bucket;
-
-  /* Check for connect to self message */
-  if (0 == memcmp (&my_identity, peer, sizeof (struct GNUNET_PeerIdentity)))
-    return;
-
-#if DEBUG_DHT
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "%s:%s Receives core connect message for peer %s distance %d!\n",
-              my_short_id, "dht", GNUNET_i2s (peer), distance);
-#endif
-
-  if (GNUNET_YES ==
-      GNUNET_CONTAINER_multihashmap_contains (all_known_peers,
-                                              &peer->hashPubKey))
-  {
-#if DEBUG_DHT
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "%s:%s Received %s message for peer %s, but already have peer 
in RT!",
-                my_short_id, "DHT", "CORE CONNECT", GNUNET_i2s (peer));
-#endif
-    GNUNET_break (0);
-    return;
-  }
-
-  if ((datacache != NULL) && (GNUNET_YES == put_peer_identities))
-  {
-    put_entry =
-        GNUNET_malloc (sizeof (struct DHTPutEntry) +
-                       sizeof (struct GNUNET_PeerIdentity));
-    put_entry->path_length = 0;
-    put_entry->data_size = sizeof (struct GNUNET_PeerIdentity);
-    memcpy (&put_entry[1], peer, sizeof (struct GNUNET_PeerIdentity));
-    GNUNET_DATACACHE_put (datacache, &peer->hashPubKey,
-                          sizeof (struct DHTPutEntry) +
-                          sizeof (struct GNUNET_PeerIdentity),
-                          (char *) put_entry, GNUNET_BLOCK_TYPE_DHT_HELLO,
-                          GNUNET_TIME_absolute_get_forever ());
-    GNUNET_free (put_entry);
-  }
-  else if (datacache == NULL)
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "DHT has no connection to datacache!\n");
-
-  peer_bucket = find_current_bucket (&peer->hashPubKey);
-  GNUNET_assert (peer_bucket >= lowest_bucket);
-  GNUNET_assert (peer_bucket < MAX_BUCKETS);
-  ret = GNUNET_malloc (sizeof (struct PeerInfo));
-#if 0
-  ret->latency = latency;
-  ret->distance = distance;
-#endif
-  ret->id = *peer;
-  GNUNET_CONTAINER_DLL_insert_after (k_buckets[peer_bucket].head,
-                                     k_buckets[peer_bucket].tail,
-                                     k_buckets[peer_bucket].tail, ret);
-  k_buckets[peer_bucket].peers_size++;
-#if DO_UPDATE_PREFERENCE
-  if ((GNUNET_CRYPTO_hash_matching_bits
-       (&my_identity.hashPubKey, &peer->hashPubKey) > 0) &&
-      (k_buckets[peer_bucket].peers_size <= bucket_size))
-    ret->preference_task =
-        GNUNET_SCHEDULER_add_now (&update_core_preference, ret);
-#endif
-  if ((k_buckets[lowest_bucket].peers_size) >= bucket_size)
-    enable_next_bucket ();
-  newly_found_peers++;
-  GNUNET_CONTAINER_multihashmap_put (all_known_peers, &peer->hashPubKey, ret,
-                                     
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
-  increment_stats (STAT_PEERS_KNOWN);
-
-#if DEBUG_DHT
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "%s:%s Adding peer to routing list: %s\n", my_short_id, "DHT",
-              ret == NULL ? "NOT ADDED" : "PEER ADDED");
-#endif
-}
-
-
-/**
- * Method called whenever a peer disconnects.
- *
- * @param cls closure
- * @param peer peer identity this notification is about
- */
-static void
-handle_core_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
-{
-  struct PeerInfo *to_remove;
-  int current_bucket;
-
-  /* Check for disconnect from self message */
-  if (0 == memcmp (&my_identity, peer, sizeof (struct GNUNET_PeerIdentity)))
-    return;
-#if DEBUG_DHT
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "%s:%s: Received peer disconnect message for peer `%s' from 
%s\n",
-              my_short_id, "DHT", GNUNET_i2s (peer), "CORE");
-#endif
-
-  if (GNUNET_YES !=
-      GNUNET_CONTAINER_multihashmap_contains (all_known_peers,
-                                              &peer->hashPubKey))
-  {
-    GNUNET_break (0);
-#if DEBUG_DHT
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "%s:%s: do not have peer `%s' in RT, can't disconnect!\n",
-                my_short_id, "DHT", GNUNET_i2s (peer));
-#endif
-    return;
-  }
-  increment_stats (STAT_DISCONNECTS);
-  GNUNET_assert (GNUNET_CONTAINER_multihashmap_contains
-                 (all_known_peers, &peer->hashPubKey));
-  to_remove =
-      GNUNET_CONTAINER_multihashmap_get (all_known_peers, &peer->hashPubKey);
-  GNUNET_assert (to_remove != NULL);
-  if (NULL != to_remove->info_ctx)
-  {
-    GNUNET_CORE_peer_change_preference_cancel (to_remove->info_ctx);
-    to_remove->info_ctx = NULL;
-  }
-  GNUNET_assert (0 ==
-                 memcmp (peer, &to_remove->id,
-                         sizeof (struct GNUNET_PeerIdentity)));
-  current_bucket = find_current_bucket (&to_remove->id.hashPubKey);
-  delete_peer (to_remove, current_bucket);
-}
-
-
-/**
- * Process dht requests.
- *
- * @param cls closure
- * @param server the initialized server
- * @param c configuration to use
- */
-static void
-run (void *cls, struct GNUNET_SERVER_Handle *server,
-     const struct GNUNET_CONFIGURATION_Handle *c)
-{
-  struct GNUNET_TIME_Relative next_send_time;
-  unsigned long long temp_config_num;
-
-  cfg = c;
-  datacache = GNUNET_DATACACHE_create (cfg, "dhtcache");
-  GNUNET_SERVER_add_handlers (server, plugin_handlers);
-  GNUNET_SERVER_disconnect_notify (server, &handle_client_disconnect, NULL);
-  nse = GNUNET_NSE_connect (cfg, &update_network_size_estimate, NULL);
-  coreAPI = GNUNET_CORE_connect (cfg,   /* Main configuration */
-                                 DEFAULT_CORE_QUEUE_SIZE,       /* queue size 
*/
-                                 NULL,  /* Closure passed to DHT functions */
-                                 &core_init,    /* Call core_init once 
connected */
-                                 &handle_core_connect,  /* Handle connects */
-                                 &handle_core_disconnect,       /* remove 
peers on disconnects */
-                                 NULL,  /* Do we care about "status" updates? 
*/
-                                 NULL,  /* Don't want notified about all 
incoming messages */
-                                 GNUNET_NO,     /* For header only inbound 
notification */
-                                 NULL,  /* Don't want notified about all 
outbound messages */
-                                 GNUNET_NO,     /* For header only outbound 
notification */
-                                 core_handlers);        /* Register these 
handlers */
-
-  if (coreAPI == NULL)
-    return;
-  transport_handle =
-      GNUNET_TRANSPORT_connect (cfg, NULL, NULL, NULL, NULL, NULL);
-  if (transport_handle != NULL)
-    ghh = GNUNET_TRANSPORT_get_hello (transport_handle, &process_hello, NULL);
-  else
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Failed to connect to transport service!\n");
-  block_context = GNUNET_BLOCK_context_create (cfg);
-  lowest_bucket = MAX_BUCKETS - 1;
-  forward_list.hashmap =
-      GNUNET_CONTAINER_multihashmap_create (MAX_OUTSTANDING_FORWARDS / 10);
-  forward_list.minHeap =
-      GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN);
-  all_known_peers = GNUNET_CONTAINER_multihashmap_create (MAX_BUCKETS / 8);
-  GNUNET_assert (all_known_peers != NULL);
-  if (GNUNET_YES ==
-      GNUNET_CONFIGURATION_get_value_yesno (cfg, "dht_testing",
-                                            "mysql_logging"))
-  {
-    debug_routes = GNUNET_YES;
-  }
-
-  if (GNUNET_YES ==
-      GNUNET_CONFIGURATION_get_value_yesno (cfg, "dht", "strict_kademlia"))
-  {
-    strict_kademlia = GNUNET_YES;
-  }
-
-  if (GNUNET_YES ==
-      GNUNET_CONFIGURATION_get_value_yesno (cfg, "dht", "stop_on_closest"))
-  {
-    stop_on_closest = GNUNET_YES;
-  }
-
-  if (GNUNET_YES ==
-      GNUNET_CONFIGURATION_get_value_yesno (cfg, "dht", "stop_found"))
-  {
-    stop_on_found = GNUNET_YES;
-  }
-
-  if (GNUNET_YES ==
-      GNUNET_CONFIGURATION_get_value_yesno (cfg, "dht", "malicious_getter"))
-  {
-    malicious_getter = GNUNET_YES;
-    if (GNUNET_NO ==
-        GNUNET_CONFIGURATION_get_value_time (cfg, "DHT",
-                                             "MALICIOUS_GET_FREQUENCY",
-                                             &malicious_get_frequency))
-      malicious_get_frequency = DEFAULT_MALICIOUS_GET_FREQUENCY;
-  }
-
-  if (GNUNET_YES ==
-      GNUNET_CONFIGURATION_get_value_yesno (cfg, "dht", "malicious_putter"))
-  {
-    malicious_putter = GNUNET_YES;
-    if (GNUNET_NO ==
-        GNUNET_CONFIGURATION_get_value_time (cfg, "DHT",
-                                             "MALICIOUS_PUT_FREQUENCY",
-                                             &malicious_put_frequency))
-      malicious_put_frequency = DEFAULT_MALICIOUS_PUT_FREQUENCY;
-  }
-
-  if (GNUNET_OK ==
-      GNUNET_CONFIGURATION_get_value_number (cfg, "DHT", "bucket_size",
-                                             &temp_config_num))
-  {
-    bucket_size = (unsigned int) temp_config_num;
-  }
-
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_number (cfg, "DHT", "kad_alpha",
-                                             &kademlia_replication))
-  {
-    kademlia_replication = DEFAULT_KADEMLIA_REPLICATION;
-  }
-
-  if (GNUNET_YES ==
-      GNUNET_CONFIGURATION_get_value_yesno (cfg, "dht", "malicious_dropper"))
-  {
-    malicious_dropper = GNUNET_YES;
-  }
-
-  if (GNUNET_NO ==
-      GNUNET_CONFIGURATION_get_value_yesno (cfg, "dht", "do_find_peer"))
-  {
-    do_find_peer = GNUNET_NO;
-  }
-  else
-    do_find_peer = GNUNET_YES;
-
-  if (GNUNET_YES ==
-      GNUNET_CONFIGURATION_get_value_yesno (cfg, "dht", "use_real_distance"))
-    use_real_distance = GNUNET_YES;
-
-  if (GNUNET_YES ==
-      GNUNET_CONFIGURATION_get_value_yesno (cfg, "dht_testing",
-                                            "mysql_logging_extended"))
-  {
-    debug_routes = GNUNET_YES;
-    debug_routes_extended = GNUNET_YES;
-  }
-
-#if DEBUG_DHT_ROUTING
-  if (GNUNET_YES == debug_routes)
-  {
-    dhtlog_handle = GNUNET_DHTLOG_connect (cfg);
-    if (dhtlog_handle == NULL)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "Could not connect to mysql logging server, logging will not 
happen!");
-    }
-  }
-#endif
-
-  if (GNUNET_YES ==
-      GNUNET_CONFIGURATION_get_value_yesno (cfg, "dht", "paper_forwarding"))
-    paper_forwarding = GNUNET_YES;
-
-  if (GNUNET_YES ==
-      GNUNET_CONFIGURATION_get_value_yesno (cfg, "dht", "put_peer_identities"))
-    put_peer_identities = GNUNET_YES;
-
-  stats = GNUNET_STATISTICS_create ("dht", cfg);
-
-  if (stats != NULL)
-  {
-    GNUNET_STATISTICS_set (stats, STAT_ROUTES, 0, GNUNET_NO);
-    GNUNET_STATISTICS_set (stats, STAT_ROUTE_FORWARDS, 0, GNUNET_NO);
-    GNUNET_STATISTICS_set (stats, STAT_ROUTE_FORWARDS_CLOSEST, 0, GNUNET_NO);
-    GNUNET_STATISTICS_set (stats, STAT_RESULTS, 0, GNUNET_NO);
-    GNUNET_STATISTICS_set (stats, STAT_RESULTS_TO_CLIENT, 0, GNUNET_NO);
-    GNUNET_STATISTICS_set (stats, STAT_RESULT_FORWARDS, 0, GNUNET_NO);
-    GNUNET_STATISTICS_set (stats, STAT_GETS, 0, GNUNET_NO);
-    GNUNET_STATISTICS_set (stats, STAT_PUTS, 0, GNUNET_NO);
-    GNUNET_STATISTICS_set (stats, STAT_PUTS_INSERTED, 0, GNUNET_NO);
-    GNUNET_STATISTICS_set (stats, STAT_FIND_PEER, 0, GNUNET_NO);
-    GNUNET_STATISTICS_set (stats, STAT_FIND_PEER_START, 0, GNUNET_NO);
-    GNUNET_STATISTICS_set (stats, STAT_GET_START, 0, GNUNET_NO);
-    GNUNET_STATISTICS_set (stats, STAT_PUT_START, 0, GNUNET_NO);
-    GNUNET_STATISTICS_set (stats, STAT_FIND_PEER_REPLY, 0, GNUNET_NO);
-    GNUNET_STATISTICS_set (stats, STAT_FIND_PEER_ANSWER, 0, GNUNET_NO);
-    GNUNET_STATISTICS_set (stats, STAT_BLOOM_FIND_PEER, 0, GNUNET_NO);
-    GNUNET_STATISTICS_set (stats, STAT_GET_REPLY, 0, GNUNET_NO);
-    GNUNET_STATISTICS_set (stats, STAT_GET_RESPONSE_START, 0, GNUNET_NO);
-    GNUNET_STATISTICS_set (stats, STAT_HELLOS_PROVIDED, 0, GNUNET_NO);
-    GNUNET_STATISTICS_set (stats, STAT_DISCONNECTS, 0, GNUNET_NO);
-  }
-  if (GNUNET_YES == do_find_peer)
-  {
-    next_send_time.rel_value =
-        DHT_MINIMUM_FIND_PEER_INTERVAL.rel_value +
-        GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_STRONG,
-                                  (DHT_MAXIMUM_FIND_PEER_INTERVAL.rel_value /
-                                   2) -
-                                  DHT_MINIMUM_FIND_PEER_INTERVAL.rel_value);
-    find_peer_context.start = GNUNET_TIME_absolute_get ();
-    GNUNET_SCHEDULER_add_delayed (next_send_time, &send_find_peer_message,
-                                  &find_peer_context);
-  }
-
-  /* Scheduled the task to clean up when shutdown is called */
-  cleanup_task =
-      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
-                                    &shutdown_task, NULL);
-}
-
-
-/**
- * The main function for the dht service.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
- */
-int
-main (int argc, char *const *argv)
-{
-  int ret;
-
-#if HAVE_UID_FOR_TESTING > 1
-  recent.hashmap = GNUNET_CONTAINER_multihashmap_create (DHT_MAX_RECENT / 2);
-#endif
-  recent.minHeap =
-      GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN);
-  recent_find_peer_requests =
-      GNUNET_CONTAINER_multihashmap_create (MAX_BUCKETS / 8);
-  ret =
-      (GNUNET_OK ==
-       GNUNET_SERVICE_run (argc, argv, "dht", GNUNET_SERVICE_OPTION_NONE, &run,
-                           NULL)) ? 0 : 1;
-#if HAVE_UID_FOR_TESTING > 1
-  GNUNET_assert (0 == GNUNET_CONTAINER_multihashmap_size (recent.hashmap));
-  GNUNET_CONTAINER_multihashmap_destroy (recent.hashmap);
-  recent.hashmap = NULL;
-#endif
-  GNUNET_assert (0 == GNUNET_CONTAINER_heap_get_size (recent.minHeap));
-  GNUNET_CONTAINER_heap_destroy (recent.minHeap);
-  recent.minHeap = NULL;
-  GNUNET_CONTAINER_multihashmap_destroy (recent_find_peer_requests);
-  recent_find_peer_requests = NULL;
-  return ret;
-}
-
-/* end of gnunet-service-dht.c */

Deleted: gnunet/src/dht/plugin_dhtlog_dummy.c
===================================================================
--- gnunet/src/dht/plugin_dhtlog_dummy.c        2011-09-27 20:45:02 UTC (rev 
17074)
+++ gnunet/src/dht/plugin_dhtlog_dummy.c        2011-09-27 20:47:21 UTC (rev 
17075)
@@ -1,347 +0,0 @@
-/*
-     This file is part of GNUnet.
-     (C) 2006 - 2009 Christian Grothoff (and other contributing authors)
-
-     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, 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.
-*/
-
-/**
- * @file src/dht/plugin_dhtlog_dummy.c
- * @brief Dummy logging plugin to test logging calls
- * @author Nathan Evans
- *
- * Database: NONE
- */
-
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "dhtlog.h"
-
-#define DEBUG_DHTLOG GNUNET_NO
-
-/*
- * Inserts the specified trial into the dhttests.trials table
- *
- * @param trial_info struct containing the data to insert about this trial
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure
- */
-int
-add_trial (struct GNUNET_DHTLOG_TrialInfo *trial_info)
-{
-  return GNUNET_OK;
-}
-
-/*
- * Inserts the specified round into the dhttests.rounds table
- *
- * @param round_type the type of round that is being started
- * @param round_count counter for the round (if applicable)
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure
- */
-int
-add_round (unsigned int round_type, unsigned int round_count)
-{
-  return GNUNET_OK;
-}
-
-/*
- * Inserts the specified round results into the
- * dhttests.processed_round_details table
- *
- * @param round_type the type of round that is being started
- * @param round_count counter for the round (if applicable)
- * @param num_messages the total number of messages initiated
- * @param num_messages_succeeded the number of messages that succeeded
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure
- */
-int
-add_round_details (unsigned int round_type, unsigned int round_count,
-                   unsigned int num_messages,
-                   unsigned int num_messages_succeded)
-{
-  return GNUNET_OK;
-}
-
-/*
- * Inserts the specified dhtkey into the dhttests.dhtkeys table,
- * stores return value of dhttests.dhtkeys.dhtkeyuid into dhtkeyuid
- *
- * @param dhtkeyuid return value
- * @param dhtkey hashcode of key to insert
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure
- */
-int
-add_dhtkey (unsigned long long *dhtkeyuid, const GNUNET_HashCode * dhtkey)
-{
-  *dhtkeyuid = 1171;
-  return GNUNET_OK;
-}
-
-
-/*
- * Inserts the specified node into the dhttests.nodes table
- *
- * @param nodeuid the inserted node uid
- * @param node the node to insert
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure
- */
-int
-add_node (unsigned long long *nodeuid, struct GNUNET_PeerIdentity *node)
-{
-  *nodeuid = 1337;
-  return GNUNET_OK;
-}
-
-/*
- * Update dhttests.trials table with current server time as end time
- *
- * @param gets_succeeded how many gets did the testcase report as successful
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure.
- */
-int
-update_trials (unsigned int gets_succeeded)
-{
-  return GNUNET_OK;
-}
-
-
-/*
- * Inserts the specified stats into the dhttests.generic_stats table
- *
- * @param peer the peer inserting the statistic
- * @param name the name of the statistic
- * @param section the section of the statistic
- * @param value the value of the statistic
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure
- */
-int
-add_generic_stat (const struct GNUNET_PeerIdentity *peer, const char *name,
-                  const char *section, uint64_t value)
-{
-  return GNUNET_OK;
-}
-
-/*
- * Update dhttests.trials table with total connections information
- *
- * @param totalConnections the number of connections
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure.
- */
-int
-add_connections (unsigned int totalConnections)
-{
-  return GNUNET_OK;
-}
-
-/*
- * Inserts the specified query into the dhttests.queries table
- *
- * @param sqlqueruid inserted query uid
- * @param queryid dht query id
- * @param type type of the query
- * @param hops number of hops query traveled
- * @param succeeded whether or not query was successful
- * @param node the node the query hit
- * @param key the key of the query
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure.
- */
-int
-add_query (unsigned long long *sqlqueryuid, unsigned long long queryid,
-           unsigned int type, unsigned int hops, int succeeded,
-           const struct GNUNET_PeerIdentity *node, const GNUNET_HashCode * key)
-{
-  *sqlqueryuid = 17;
-  return GNUNET_OK;
-}
-
-/*
- * Inserts the specified route information into the dhttests.routes table
- *
- * @param sqlqueruid inserted query uid
- * @param queryid dht query id
- * @param type type of the query
- * @param hops number of hops query traveled
- * @param succeeded whether or not query was successful
- * @param node the node the query hit
- * @param key the key of the query
- * @param from_node the node that sent the message to node
- * @param to_node next node to forward message to
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure.
- */
-int
-add_route (unsigned long long *sqlqueryuid, unsigned long long queryid,
-           unsigned int type, unsigned int hops, int succeeded,
-           const struct GNUNET_PeerIdentity *node, const GNUNET_HashCode * key,
-           const struct GNUNET_PeerIdentity *from_node,
-           const struct GNUNET_PeerIdentity *to_node)
-{
-  *sqlqueryuid = 18;
-  return GNUNET_OK;
-}
-
-
-/*
- * Records the current topology (number of connections, time, trial)
- *
- * @param num_connections how many connections are in the topology
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure
- */
-int
-add_topology (int num_connections)
-{
-  return GNUNET_OK;
-}
-
-/*
- * Records a connection between two peers in the current topology
- *
- * @param first one side of the connection
- * @param second other side of the connection
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure
- */
-int
-add_extended_topology (const struct GNUNET_PeerIdentity *first,
-                       const struct GNUNET_PeerIdentity *second)
-{
-  return GNUNET_OK;
-}
-
-/*
- * Update dhttests.topology table with total connections information
- *
- * @param totalConnections the number of connections
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure.
- */
-int
-update_topology (unsigned int connections)
-{
-  return GNUNET_OK;
-}
-
-/*
- * Update dhttests.nodes table setting the identified
- * node as a malicious dropper.
- *
- * @param peer the peer that was set to be malicious
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure.
- */
-int
-set_malicious (struct GNUNET_PeerIdentity *peer)
-{
-  return GNUNET_OK;
-}
-
-/*
- * Inserts the specified stats into the dhttests.node_statistics table
- *
- * @param peer the peer inserting the statistic
- * @param route_requests route requests seen
- * @param route_forwards route requests forwarded
- * @param result_requests route result requests seen
- * @param client_requests client requests initiated
- * @param result_forwards route results forwarded
- * @param gets get requests handled
- * @param puts put requests handle
- * @param data_inserts data inserted at this node
- * @param find_peer_requests find peer requests seen
- * @param find_peers_started find peer requests initiated at this node
- * @param gets_started get requests initiated at this node
- * @param puts_started put requests initiated at this node
- * @param find_peer_responses_received find peer responses received locally
- * @param get_responses_received get responses received locally
- * @param find_peer_responses_sent find peer responses sent from this node
- * @param get_responses_sent get responses sent from this node
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure
- */
-int
-insert_stat (const struct GNUNET_PeerIdentity *peer,
-             unsigned int route_requests, unsigned int route_forwards,
-             unsigned int result_requests, unsigned int client_requests,
-             unsigned int result_forwards, unsigned int gets, unsigned int 
puts,
-             unsigned int data_inserts, unsigned int find_peer_requests,
-             unsigned int find_peers_started, unsigned int gets_started,
-             unsigned int puts_started,
-             unsigned int find_peer_responses_received,
-             unsigned int get_responses_received,
-             unsigned int find_peer_responses_sent,
-             unsigned int get_responses_sent)
-{
-  return GNUNET_OK;
-}
-
-/*
- * Provides the dhtlog api
- *
- * @param c the configuration to use to connect to a server
- *
- * @return the handle to the server, or NULL on error
- */
-void *
-libgnunet_plugin_dhtlog_dummy_init (void *cls)
-{
-  struct GNUNET_DHTLOG_Plugin *plugin = cls;
-
-#if DEBUG_DHTLOG
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "DUMMY DHT Logger: initializing.\n");
-#endif
-  GNUNET_assert (plugin->dhtlog_api == NULL);
-  plugin->dhtlog_api = GNUNET_malloc (sizeof (struct GNUNET_DHTLOG_Handle));
-  plugin->dhtlog_api->add_generic_stat = &add_generic_stat;
-  plugin->dhtlog_api->insert_round = &add_round;
-  plugin->dhtlog_api->insert_round_details = &add_round_details;
-  plugin->dhtlog_api->insert_stat = &insert_stat;
-  plugin->dhtlog_api->insert_trial = &add_trial;
-  plugin->dhtlog_api->insert_query = &add_query;
-  plugin->dhtlog_api->update_trial = &update_trials;
-  plugin->dhtlog_api->set_malicious = &set_malicious;
-  plugin->dhtlog_api->insert_route = &add_route;
-  plugin->dhtlog_api->insert_node = &add_node;
-  plugin->dhtlog_api->insert_dhtkey = &add_dhtkey;
-  plugin->dhtlog_api->update_connections = &add_connections;
-  plugin->dhtlog_api->insert_topology = &add_topology;
-  plugin->dhtlog_api->update_topology = &update_topology;
-  plugin->dhtlog_api->insert_extended_topology = &add_extended_topology;
-  return plugin;
-}
-
-/**
- * Shutdown the plugin.
- */
-void *
-libgnunet_plugin_dhtlog_dummy_done (void *cls)
-{
-#if DEBUG_DHTLOG
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "DUMMY DHT Logger: shutdown\n");
-#endif
-  return NULL;
-}
-
-/* end of plugin_dhtlog_dummy.c */

Deleted: gnunet/src/dht/plugin_dhtlog_mysql.c
===================================================================
--- gnunet/src/dht/plugin_dhtlog_mysql.c        2011-09-27 20:45:02 UTC (rev 
17074)
+++ gnunet/src/dht/plugin_dhtlog_mysql.c        2011-09-27 20:47:21 UTC (rev 
17075)
@@ -1,1612 +0,0 @@
-/*
-     This file is part of GNUnet.
-     (C) 2006 - 2009 Christian Grothoff (and other contributing authors)
-
-     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, 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.
-*/
-
-/**
- * @file src/dht/plugin_dhtlog_mysql.c
- * @brief MySQL logging plugin to record DHT operations to MySQL server
- * @author Nathan Evans
- *
- * Database: MySQL
- */
-
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "dhtlog.h"
-#include <mysql/mysql.h>
-
-
-#define DEBUG_DHTLOG GNUNET_YES
-
-/**
- * Maximum number of supported parameters for a prepared
- * statement.  Increase if needed.
- */
-#define MAX_PARAM 32
-
-/**
- * A generic statement handle to use
- * for prepared statements.  This way,
- * once the statement is initialized
- * we don't redo work.
- */
-struct StatementHandle
-{
-  /**
-   * Internal statement
-   */
-  MYSQL_STMT *statement;
-
-  /**
-   * Textual query
-   */
-  char *query;
-
-  /**
-   * Whether or not the handle is valid
-   */
-  int valid;
-};
-
-/**
- * Type of a callback that will be called for each
- * data set returned from MySQL.
- *
- * @param cls user-defined argument
- * @param num_values number of elements in values
- * @param values values returned by MySQL
- * @return GNUNET_OK to continue iterating, GNUNET_SYSERR to abort
- */
-typedef int (*GNUNET_MysqlDataProcessor) (void *cls, unsigned int num_values,
-                                          MYSQL_BIND * values);
-
-static unsigned long max_varchar_len;
-
-/**
- * The configuration the DHT service is running with
- */
-static const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-static unsigned long long current_trial = 0;    /* I like to assign 0, just to 
remember */
-
-/**
- * Connection to the MySQL Server.
- */
-static MYSQL *conn;
-
-#define INSERT_QUERIES_STMT "INSERT INTO queries (trialuid, querytype, hops, 
dhtkeyuid, dhtqueryid, succeeded, nodeuid, time) "\
-                          "VALUES (?, ?, ?, ?, ?, ?, ?, NOW())"
-static struct StatementHandle *insert_query;
-
-#define INSERT_ROUTES_STMT "INSERT INTO routes (trialuid, querytype, hops, 
dhtkeyuid, dhtqueryid, succeeded, nodeuid, from_node, to_node) "\
-                          "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)"
-static struct StatementHandle *insert_route;
-
-#define INSERT_NODES_STMT "INSERT INTO nodes (trialuid, nodeid, nodebits) "\
-                          "VALUES (?, ?, ?)"
-static struct StatementHandle *insert_node;
-
-#define INSERT_ROUNDS_STMT "INSERT INTO rounds (trialuid, round_type, 
round_count, starttime) "\
-                          "VALUES (?, ?, ?, NOW())"
-
-static struct StatementHandle *insert_round;
-
-#define INSERT_ROUND_DETAILS_STMT "INSERT INTO rounds (trialuid, round_type, 
round_count, starttime, endtime, num_messages, num_messages_succeeded) "\
-                          "VALUES (?, ?, ?, NOW(), NOW(), ?, ?)"
-
-static struct StatementHandle *insert_round_details;
-
-#define INSERT_TRIALS_STMT "INSERT INTO trials"\
-                            "(starttime, other_trial_identifier, numnodes, 
topology,"\
-                            "topology_percentage, topology_probability,"\
-                            "blacklist_topology, connect_topology, 
connect_topology_option,"\
-                            "connect_topology_option_modifier, puts, gets, "\
-                            "concurrent, settle_time, num_rounds, 
malicious_getters,"\
-                            "malicious_putters, malicious_droppers, 
malicious_get_frequency,"\
-                            "malicious_put_frequency, stop_closest, 
stop_found, strict_kademlia, "\
-                            "gets_succeeded, message) "\
-                            "VALUES (NOW(), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 
?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"
-
-static struct StatementHandle *insert_trial;
-
-#define INSERT_STAT_STMT "INSERT INTO node_statistics"\
-                            "(trialuid, nodeuid, route_requests,"\
-                            "route_forwards, result_requests,"\
-                            "client_results, result_forwards, gets,"\
-                            "puts, data_inserts, find_peer_requests, "\
-                            "find_peers_started, gets_started, puts_started, 
find_peer_responses_received,"\
-                            "get_responses_received, find_peer_responses_sent, 
get_responses_sent) "\
-                            "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 
?, ?, ?, ?)"
-
-static struct StatementHandle *insert_stat;
-
-#define INSERT_GENERIC_STAT_STMT "INSERT INTO generic_stats" \
-                                 "(trialuid, nodeuid, section, name, value)"\
-                                 "VALUES (?, ?, ?, ?, ?)"
-static struct StatementHandle *insert_generic_stat;
-
-#define INSERT_DHTKEY_STMT "INSERT INTO dhtkeys (dhtkey, trialuid, keybits) "\
-                          "VALUES (?, ?, ?)"
-static struct StatementHandle *insert_dhtkey;
-
-#define UPDATE_TRIALS_STMT "UPDATE trials set endtime=NOW(), gets_succeeded = 
? where trialuid = ?"
-static struct StatementHandle *update_trial;
-
-#define UPDATE_CONNECTIONS_STMT "UPDATE trials set totalConnections = ? where 
trialuid = ?"
-static struct StatementHandle *update_connection;
-
-#define GET_TRIAL_STMT "SELECT MAX( trialuid ) FROM trials"
-static struct StatementHandle *get_trial;
-
-#define GET_TOPOLOGY_STMT "SELECT MAX( topology_uid ) FROM topology"
-static struct StatementHandle *get_topology;
-
-#define GET_DHTKEYUID_STMT "SELECT dhtkeyuid FROM dhtkeys where dhtkey = ? and 
trialuid = ?"
-static struct StatementHandle *get_dhtkeyuid;
-
-#define GET_NODEUID_STMT "SELECT nodeuid FROM nodes where trialuid = ? and 
nodeid = ?"
-static struct StatementHandle *get_nodeuid;
-
-#define INSERT_TOPOLOGY_STMT "INSERT INTO topology (trialuid, date, 
connections) "\
-                             "VALUES (?, NOW(), ?)"
-static struct StatementHandle *insert_topology;
-
-#define EXTEND_TOPOLOGY_STMT "INSERT INTO extended_topology (topology_uid, 
uid_first, uid_second) "\
-                             "VALUES (?, ?, ?)"
-static struct StatementHandle *extend_topology;
-
-#define SET_MALICIOUS_STMT "update nodes set malicious_dropper = 1  where 
trialuid = ? and nodeid = ?"
-static struct StatementHandle *update_node_malicious;
-
-#define UPDATE_TOPOLOGY_STMT "update topology set connections = ?  where 
topology_uid = ?"
-static struct StatementHandle *update_topology;
-
-/**
- * Run a query (not a select statement)
- *
- * @return GNUNET_OK if executed, GNUNET_SYSERR if an error occurred
- */
-int
-run_statement (const char *statement)
-{
-  mysql_query (conn, statement);
-  if (mysql_error (conn)[0])
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "mysql_query");
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-/*
- * Creates tables if they don't already exist for dht logging
- */
-static int
-itable ()
-{
-#define MRUNS(a) (GNUNET_OK != run_statement (a) )
-
-  if (MRUNS
-      ("CREATE TABLE IF NOT EXISTS `dhtkeys` ("
-       "dhtkeyuid int(10) unsigned NOT NULL auto_increment COMMENT 'Unique Key 
given to each query',"
-       "`dhtkey` varchar(255) NOT NULL COMMENT 'The ASCII value of the key 
being searched for',"
-       "trialuid int(10) unsigned NOT NULL," "keybits blob NOT NULL,"
-       "UNIQUE KEY `dhtkeyuid` (`dhtkeyuid`)"
-       ") ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1"))
-    return GNUNET_SYSERR;
-
-  if (MRUNS
-      ("CREATE TABLE IF NOT EXISTS `nodes` ("
-       "`nodeuid` int(10) unsigned NOT NULL auto_increment,"
-       "`trialuid` int(10) unsigned NOT NULL," "`nodeid` varchar(255) NOT 
NULL,"
-       "`nodebits` blob NOT NULL," "PRIMARY KEY  (`nodeuid`)"
-       ") ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1"))
-    return GNUNET_SYSERR;
-
-  if (MRUNS
-      ("CREATE TABLE IF NOT EXISTS `queries` ("
-       "`trialuid` int(10) unsigned NOT NULL,"
-       "`queryuid` int(10) unsigned NOT NULL auto_increment,"
-       "`dhtqueryid` bigint(20) NOT NULL,"
-       "`querytype` enum('1','2','3','4','5') NOT NULL,"
-       "`hops` int(10) unsigned NOT NULL," "`succeeded` tinyint NOT NULL,"
-       "`nodeuid` int(10) unsigned NOT NULL,"
-       "`time` timestamp NOT NULL default CURRENT_TIMESTAMP,"
-       "`dhtkeyuid` int(10) unsigned NOT NULL," "PRIMARY KEY  (`queryuid`)"
-       ") ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1"))
-    return GNUNET_SYSERR;
-
-  if (MRUNS
-      ("CREATE TABLE IF NOT EXISTS `routes` ("
-       "`trialuid` int(10) unsigned NOT NULL,"
-       "`queryuid` int(10) unsigned NOT NULL auto_increment,"
-       "`dhtqueryid` bigint(20) NOT NULL,"
-       "`querytype` enum('1','2','3','4','5') NOT NULL,"
-       "`hops` int(10) unsigned NOT NULL," "`succeeded` tinyint NOT NULL,"
-       "`nodeuid` int(10) unsigned NOT NULL,"
-       "`time` timestamp NOT NULL default CURRENT_TIMESTAMP,"
-       "`dhtkeyuid` int(10) unsigned NOT NULL,"
-       "`from_node` int(10) unsigned NOT NULL,"
-       "`to_node` int(10) unsigned NOT NULL," "PRIMARY KEY  (`queryuid`)"
-       ") ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1"))
-    return GNUNET_SYSERR;
-
-  if (MRUNS
-      ("CREATE TABLE IF NOT EXISTS `trials` ("
-       "`trialuid` int(10) unsigned NOT NULL auto_increment,"
-       "`other_trial_identifier` int(10) unsigned NOT NULL default '0',"
-       "`numnodes` int(10) unsigned NOT NULL," "`topology` int(10) NOT NULL,"
-       "`blacklist_topology` int(11) NOT NULL,"
-       "`connect_topology` int(11) NOT NULL,"
-       "`connect_topology_option` int(11) NOT NULL,"
-       "`topology_percentage` float NOT NULL,"
-       "`topology_probability` float NOT NULL,"
-       "`connect_topology_option_modifier` float NOT NULL,"
-       "`starttime` datetime NOT NULL," "`endtime` datetime NOT NULL,"
-       "`puts` int(10) unsigned NOT NULL," "`gets` int(10) unsigned NOT NULL,"
-       "`concurrent` int(10) unsigned NOT NULL,"
-       "`settle_time` int(10) unsigned NOT NULL,"
-       "`totalConnections` int(10) unsigned NOT NULL,"
-       "`message` text NOT NULL," "`num_rounds` int(10) unsigned NOT NULL,"
-       "`malicious_getters` int(10) unsigned NOT NULL,"
-       "`malicious_putters` int(10) unsigned NOT NULL,"
-       "`malicious_droppers` int(10) unsigned NOT NULL,"
-       "`topology_modifier` double NOT NULL,"
-       "`malicious_get_frequency` int(10) unsigned NOT NULL,"
-       "`malicious_put_frequency` int(10) unsigned NOT NULL,"
-       "`stop_closest` int(10) unsigned NOT NULL,"
-       "`stop_found` int(10) unsigned NOT NULL,"
-       "`strict_kademlia` int(10) unsigned NOT NULL,"
-       "`gets_succeeded` int(10) unsigned NOT NULL,"
-       "PRIMARY KEY  (`trialuid`)," "UNIQUE KEY `trialuid` (`trialuid`)"
-       ") ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1"))
-    return GNUNET_SYSERR;
-
-  if (MRUNS
-      ("CREATE TABLE IF NOT EXISTS `topology` ("
-       "`topology_uid` int(10) unsigned NOT NULL AUTO_INCREMENT,"
-       "`trialuid` int(10) unsigned NOT NULL," "`date` datetime NOT NULL,"
-       "`connections` int(10) unsigned NOT NULL,"
-       "PRIMARY KEY (`topology_uid`)) ENGINE=MyISAM  DEFAULT CHARSET=utf8 
AUTO_INCREMENT=1"))
-    return GNUNET_SYSERR;
-
-  if (MRUNS
-      ("CREATE TABLE IF NOT EXISTS `extended_topology` ("
-       "`extended_uid` int(10) unsigned NOT NULL AUTO_INCREMENT,"
-       "`topology_uid` int(10) unsigned NOT NULL,"
-       "`uid_first` int(10) unsigned NOT NULL,"
-       "`uid_second` int(10) unsigned NOT NULL," "PRIMARY KEY (`extended_uid`)"
-       ") ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1"))
-    return GNUNET_SYSERR;
-
-  if (MRUNS
-      ("CREATE TABLE IF NOT EXISTS `node_statistics` ("
-       "`stat_uid` int(10) unsigned NOT NULL AUTO_INCREMENT,"
-       "`trialuid` int(10) unsigned NOT NULL,"
-       "`nodeuid` int(10) unsigned NOT NULL,"
-       "`route_requests` int(10) unsigned NOT NULL,"
-       "`route_forwards` int(10) unsigned NOT NULL,"
-       "`result_requests` int(10) unsigned NOT NULL,"
-       "`client_results` int(10) unsigned NOT NULL,"
-       "`result_forwards` int(10) unsigned NOT NULL,"
-       "`gets` int(10) unsigned NOT NULL," "`puts` int(10) unsigned NOT NULL,"
-       "`data_inserts` int(10) unsigned NOT NULL,"
-       "`find_peer_requests` int(10) unsigned NOT NULL,"
-       "`find_peers_started` int(10) unsigned NOT NULL,"
-       "`gets_started` int(10) unsigned NOT NULL,"
-       "`puts_started` int(10) unsigned NOT NULL,"
-       "`find_peer_responses_received` int(10) unsigned NOT NULL,"
-       "`get_responses_received` int(10) unsigned NOT NULL,"
-       "`find_peer_responses_sent` int(10) unsigned NOT NULL,"
-       "`get_responses_sent` int(10) unsigned NOT NULL,"
-       "PRIMARY KEY (`stat_uid`)"
-       ") ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;"))
-    return GNUNET_SYSERR;
-
-  if (MRUNS ("SET AUTOCOMMIT = 1"))
-    return GNUNET_SYSERR;
-
-  return GNUNET_OK;
-#undef MRUNS
-}
-
-/**
- * Create a prepared statement.
- *
- * @return NULL on error
- */
-struct StatementHandle *
-prepared_statement_create (const char *statement)
-{
-  struct StatementHandle *ret;
-
-  ret = GNUNET_malloc (sizeof (struct StatementHandle));
-  ret->query = GNUNET_strdup (statement);
-  return ret;
-}
-
-/**
- * Close a prepared statement.
- *
- * @return NULL on error
- */
-void
-prepared_statement_close (struct StatementHandle *s)
-{
-  if (s == NULL)
-  {
-    return;
-  }
-
-  GNUNET_free_non_null (s->query);
-
-  if (s->valid == GNUNET_YES)
-    mysql_stmt_close (s->statement);
-  GNUNET_free (s);
-}
-
-/*
- * Initialize the prepared statements for use with dht test logging
- */
-static int
-iopen (struct GNUNET_DHTLOG_Plugin *plugin)
-{
-  int ret;
-  my_bool reconnect;
-  unsigned int timeout;
-  char *user;
-  char *password;
-  char *server;
-  char *database;
-  unsigned long long port;
-
-  conn = mysql_init (NULL);
-  if (conn == NULL)
-    return GNUNET_SYSERR;
-
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (plugin->cfg, "MYSQL", "DATABASE",
-                                             &database))
-  {
-    database = GNUNET_strdup ("gnunet");
-  }
-
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (plugin->cfg, "MYSQL", "USER",
-                                             &user))
-  {
-    user = GNUNET_strdup ("dht");
-  }
-
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (plugin->cfg, "MYSQL", "PASSWORD",
-                                             &password))
-  {
-    password = GNUNET_strdup ("dhttest**");
-  }
-
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (plugin->cfg, "MYSQL", "SERVER",
-                                             &server))
-  {
-    server = GNUNET_strdup ("localhost");
-  }
-
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_number (plugin->cfg, "MYSQL", 
"MYSQL_PORT",
-                                             &port))
-  {
-    port = 0;
-  }
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Connecting to mysql with: user %s, pass %s, server %s, database 
%s, port %d\n",
-              user, password, server, database, port);
-
-  reconnect = 0;
-  timeout = 60;                 /* in seconds */
-  mysql_options (conn, MYSQL_OPT_RECONNECT, &reconnect);
-  mysql_options (conn, MYSQL_OPT_CONNECT_TIMEOUT, (const void *) &timeout);
-  mysql_options (conn, MYSQL_SET_CHARSET_NAME, "UTF8");
-  mysql_options (conn, MYSQL_OPT_READ_TIMEOUT, (const void *) &timeout);
-  mysql_options (conn, MYSQL_OPT_WRITE_TIMEOUT, (const void *) &timeout);
-  mysql_real_connect (conn, server, user, password, database,
-                      (unsigned int) port, NULL, CLIENT_IGNORE_SIGPIPE);
-
-  GNUNET_free_non_null (server);
-  GNUNET_free_non_null (password);
-  GNUNET_free_non_null (user);
-  GNUNET_free_non_null (database);
-
-  if (mysql_error (conn)[0])
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "mysql_real_connect");
-    return GNUNET_SYSERR;
-  }
-
-#if OLD
-  db = GNUNET_MYSQL_database_open (coreAPI->ectx, coreAPI->cfg);
-  if (db == NULL)
-    return GNUNET_SYSERR;
-#endif
-
-  ret = itable ();
-
-#define PINIT(a,b) (NULL == (a = prepared_statement_create(b)))
-  if (PINIT (insert_query, INSERT_QUERIES_STMT) ||
-      PINIT (insert_route, INSERT_ROUTES_STMT) ||
-      PINIT (insert_trial, INSERT_TRIALS_STMT) ||
-      PINIT (insert_round, INSERT_ROUNDS_STMT) ||
-      PINIT (insert_round_details, INSERT_ROUND_DETAILS_STMT) ||
-      PINIT (insert_stat, INSERT_STAT_STMT) ||
-      PINIT (insert_generic_stat, INSERT_GENERIC_STAT_STMT) ||
-      PINIT (insert_node, INSERT_NODES_STMT) ||
-      PINIT (insert_dhtkey, INSERT_DHTKEY_STMT) ||
-      PINIT (update_trial, UPDATE_TRIALS_STMT) ||
-      PINIT (get_dhtkeyuid, GET_DHTKEYUID_STMT) ||
-      PINIT (get_nodeuid, GET_NODEUID_STMT) ||
-      PINIT (update_connection, UPDATE_CONNECTIONS_STMT) ||
-      PINIT (get_trial, GET_TRIAL_STMT) ||
-      PINIT (get_topology, GET_TOPOLOGY_STMT) ||
-      PINIT (insert_topology, INSERT_TOPOLOGY_STMT) ||
-      PINIT (update_topology, UPDATE_TOPOLOGY_STMT) ||
-      PINIT (extend_topology, EXTEND_TOPOLOGY_STMT) ||
-      PINIT (update_node_malicious, SET_MALICIOUS_STMT))
-  {
-    return GNUNET_SYSERR;
-  }
-#undef PINIT
-
-  return ret;
-}
-
-static int
-return_ok (void *cls, unsigned int num_values, MYSQL_BIND * values)
-{
-  return GNUNET_OK;
-}
-
-/**
- * Prepare a statement for running.
- *
- * @return GNUNET_OK on success
- */
-static int
-prepare_statement (struct StatementHandle *ret)
-{
-  if (GNUNET_YES == ret->valid)
-    return GNUNET_OK;
-
-  ret->statement = mysql_stmt_init (conn);
-  if (ret->statement == NULL)
-    return GNUNET_SYSERR;
-
-  if (mysql_stmt_prepare (ret->statement, ret->query, strlen (ret->query)))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "mysql_stmt_prepare `%s', %s",
-                ret->query, mysql_error (conn));
-    mysql_stmt_close (ret->statement);
-    ret->statement = NULL;
-    return GNUNET_SYSERR;
-  }
-  ret->valid = GNUNET_YES;
-  return GNUNET_OK;
-}
-
-/**
- * Bind the parameters for the given MySQL statement
- * and run it.
- *
- * @param s statement to bind and run
- * @param ap arguments for the binding
- * @return GNUNET_SYSERR on error, GNUNET_OK on success
- */
-static int
-init_params (struct StatementHandle *s, va_list ap)
-{
-  MYSQL_BIND qbind[MAX_PARAM];
-  unsigned int pc;
-  unsigned int off;
-  enum enum_field_types ft;
-
-  pc = mysql_stmt_param_count (s->statement);
-  if (pc > MAX_PARAM)
-  {
-    /* increase internal constant! */
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  memset (qbind, 0, sizeof (qbind));
-  off = 0;
-  ft = 0;
-  while ((pc > 0) && (-1 != (ft = va_arg (ap, enum enum_field_types))))
-  {
-    qbind[off].buffer_type = ft;
-    switch (ft)
-    {
-    case MYSQL_TYPE_FLOAT:
-      qbind[off].buffer = va_arg (ap, float *);
-
-      break;
-    case MYSQL_TYPE_LONGLONG:
-      qbind[off].buffer = va_arg (ap, unsigned long long *);
-      qbind[off].is_unsigned = va_arg (ap, int);
-
-      break;
-    case MYSQL_TYPE_LONG:
-      qbind[off].buffer = va_arg (ap, unsigned int *);
-      qbind[off].is_unsigned = va_arg (ap, int);
-
-      break;
-    case MYSQL_TYPE_VAR_STRING:
-    case MYSQL_TYPE_STRING:
-    case MYSQL_TYPE_BLOB:
-      qbind[off].buffer = va_arg (ap, void *);
-      qbind[off].buffer_length = va_arg (ap, unsigned long);
-      qbind[off].length = va_arg (ap, unsigned long *);
-
-      break;
-    default:
-      /* unsupported type */
-      GNUNET_break (0);
-      return GNUNET_SYSERR;
-    }
-    pc--;
-    off++;
-  }
-  if (!((pc == 0) && (ft != -1) && (va_arg (ap, int) == -1)))
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  if (mysql_stmt_bind_param (s->statement, qbind))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _("`%s' failed at %s:%d with error: %s\n"),
-                "mysql_stmt_bind_param", __FILE__, __LINE__,
-                mysql_stmt_error (s->statement));
-    return GNUNET_SYSERR;
-  }
-
-  if (mysql_stmt_execute (s->statement))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _("`%s' failed at %s:%d with error: %s\n"),
-                "mysql_stmt_execute", __FILE__, __LINE__,
-                mysql_stmt_error (s->statement));
-    return GNUNET_SYSERR;
-  }
-
-  return GNUNET_OK;
-}
-
-/**
- * Run a prepared SELECT statement.
- *
- * @param s handle to the statement we should execute
- * @param result_size number of results in set
- * @param results pointer to already initialized MYSQL_BIND
- *        array (of sufficient size) for passing results
- * @param processor function to call on each result
- * @param processor_cls extra argument to processor
- * @param ... pairs and triplets of "MYSQL_TYPE_XXX" keys and their respective
- *        values (size + buffer-reference for pointers); terminated
- *        with "-1"
- *
- * @return GNUNET_SYSERR on error, otherwise
- *         the number of successfully affected (or queried) rows
- */
-int
-prepared_statement_run_select (struct StatementHandle *s,
-                               unsigned int result_size, MYSQL_BIND * results,
-                               GNUNET_MysqlDataProcessor processor,
-                               void *processor_cls, ...)
-{
-  va_list ap;
-  int ret;
-  unsigned int rsize;
-  int total;
-
-  if (GNUNET_OK != prepare_statement (s))
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  va_start (ap, processor_cls);
-  if (GNUNET_OK != init_params (s, ap))
-  {
-    GNUNET_break (0);
-    va_end (ap);
-    return GNUNET_SYSERR;
-  }
-  va_end (ap);
-  rsize = mysql_stmt_field_count (s->statement);
-  if (rsize > result_size)
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  if (mysql_stmt_bind_result (s->statement, results))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _("`%s' failed at %s:%d with error: %s\n"),
-                "mysql_stmt_bind_result", __FILE__, __LINE__,
-                mysql_stmt_error (s->statement));
-    return GNUNET_SYSERR;
-  }
-
-  total = 0;
-  while (1)
-  {
-    ret = mysql_stmt_fetch (s->statement);
-    if (ret == MYSQL_NO_DATA)
-      break;
-    if (ret != 0)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _("`%s' failed at %s:%d with error: %s\n"),
-                  "mysql_stmt_fetch", __FILE__, __LINE__,
-                  mysql_stmt_error (s->statement));
-      return GNUNET_SYSERR;
-    }
-    if (processor != NULL)
-      if (GNUNET_OK != processor (processor_cls, rsize, results))
-        break;
-    total++;
-  }
-  mysql_stmt_reset (s->statement);
-  return total;
-}
-
-
-static int
-get_node_uid (unsigned long long *nodeuid, const GNUNET_HashCode * peerHash)
-{
-  MYSQL_BIND rbind[1];
-  struct GNUNET_CRYPTO_HashAsciiEncoded encPeer;
-  unsigned long long p_len;
-
-  memset (rbind, 0, sizeof (rbind));
-  rbind[0].buffer_type = MYSQL_TYPE_LONGLONG;
-  rbind[0].buffer = nodeuid;
-  rbind[0].is_unsigned = GNUNET_YES;
-
-  GNUNET_CRYPTO_hash_to_enc (peerHash, &encPeer);
-  p_len = strlen ((char *) &encPeer);
-
-  if (1 !=
-      prepared_statement_run_select (get_nodeuid, 1, rbind, return_ok, NULL,
-                                     MYSQL_TYPE_LONGLONG, &current_trial,
-                                     GNUNET_YES, MYSQL_TYPE_VAR_STRING,
-                                     &encPeer, max_varchar_len, &p_len, -1))
-  {
-#if DEBUG_DHTLOG
-    fprintf (stderr, "FAILED\n");
-#endif
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-static int
-get_current_trial (unsigned long long *trialuid)
-{
-  MYSQL_BIND rbind[1];
-
-  memset (rbind, 0, sizeof (rbind));
-  rbind[0].buffer_type = MYSQL_TYPE_LONG;
-  rbind[0].is_unsigned = 1;
-  rbind[0].buffer = trialuid;
-
-  if ((GNUNET_OK !=
-       prepared_statement_run_select (get_trial, 1, rbind, return_ok, NULL,
-                                      -1)))
-  {
-    return GNUNET_SYSERR;
-  }
-
-  return GNUNET_OK;
-}
-
-static int
-get_current_topology (unsigned long long *topologyuid)
-{
-  MYSQL_BIND rbind[1];
-
-  memset (rbind, 0, sizeof (rbind));
-  rbind[0].buffer_type = MYSQL_TYPE_LONGLONG;
-  rbind[0].is_unsigned = 1;
-  rbind[0].buffer = topologyuid;
-
-  if ((GNUNET_OK !=
-       prepared_statement_run_select (get_topology, 1, rbind, return_ok, NULL,
-                                      -1)))
-  {
-    return GNUNET_SYSERR;
-  }
-
-  return GNUNET_OK;
-}
-
-static int
-get_dhtkey_uid (unsigned long long *dhtkeyuid, const GNUNET_HashCode * key)
-{
-  MYSQL_BIND rbind[1];
-  struct GNUNET_CRYPTO_HashAsciiEncoded encKey;
-  unsigned long long k_len;
-
-  memset (rbind, 0, sizeof (rbind));
-  rbind[0].buffer_type = MYSQL_TYPE_LONG;
-  rbind[0].is_unsigned = 1;
-  rbind[0].buffer = dhtkeyuid;
-  GNUNET_CRYPTO_hash_to_enc (key, &encKey);
-  k_len = strlen ((char *) &encKey);
-#if DEBUG_DHTLOG
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Searching for dhtkey `%s' in trial %llu\n", GNUNET_h2s (key),
-              current_trial);
-#endif
-  if ((GNUNET_OK !=
-       prepared_statement_run_select (get_dhtkeyuid, 1, rbind, return_ok, NULL,
-                                      MYSQL_TYPE_VAR_STRING, &encKey,
-                                      max_varchar_len, &k_len,
-                                      MYSQL_TYPE_LONGLONG, &current_trial,
-                                      GNUNET_YES, -1)))
-  {
-    return GNUNET_SYSERR;
-  }
-
-  return GNUNET_OK;
-}
-
-/**
- * Run a prepared statement that does NOT produce results.
- *
- * @param s handle to the statement we should execute
- * @param insert_id NULL or address where to store the row ID of whatever
- *        was inserted (only for INSERT statements!)
- * @param ... pairs and triplets of "MYSQL_TYPE_XXX" keys and their respective
- *        values (size + buffer-reference for pointers); terminated
- *        with "-1"
- *
- * @return GNUNET_SYSERR on error, otherwise
- *         the number of successfully affected rows
- */
-int
-prepared_statement_run (struct StatementHandle *s,
-                        unsigned long long *insert_id, ...)
-{
-  va_list ap;
-  int affected;
-
-  if (GNUNET_OK != prepare_statement (s))
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  GNUNET_assert (s->valid == GNUNET_YES);
-  if (s->statement == NULL)
-    return GNUNET_SYSERR;
-
-  va_start (ap, insert_id);
-
-  if (GNUNET_OK != init_params (s, ap))
-  {
-    va_end (ap);
-    return GNUNET_SYSERR;
-  }
-
-  va_end (ap);
-  affected = mysql_stmt_affected_rows (s->statement);
-  if (NULL != insert_id)
-    *insert_id = (unsigned long long) mysql_stmt_insert_id (s->statement);
-  mysql_stmt_reset (s->statement);
-
-  return affected;
-}
-
-/*
- * Inserts the specified trial into the dhttests.trials table
- *
- * @param trial_info struct containing the data to insert about this trial
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure
- */
-int
-add_trial (struct GNUNET_DHTLOG_TrialInfo *trial_info)
-{
-  MYSQL_STMT *stmt;
-  int ret;
-  unsigned long long m_len;
-
-  m_len = strlen (trial_info->message);
-
-  stmt = mysql_stmt_init (conn);
-  if (GNUNET_OK !=
-      (ret =
-       prepared_statement_run (insert_trial, &current_trial, MYSQL_TYPE_LONG,
-                               &trial_info->other_identifier, GNUNET_YES,
-                               MYSQL_TYPE_LONG, &trial_info->num_nodes,
-                               GNUNET_YES, MYSQL_TYPE_LONG,
-                               &trial_info->topology, GNUNET_YES,
-                               MYSQL_TYPE_FLOAT,
-                               &trial_info->topology_percentage,
-                               MYSQL_TYPE_FLOAT,
-                               &trial_info->topology_probability,
-                               MYSQL_TYPE_LONG, 
&trial_info->blacklist_topology,
-                               GNUNET_YES, MYSQL_TYPE_LONG,
-                               &trial_info->connect_topology, GNUNET_YES,
-                               MYSQL_TYPE_LONG,
-                               &trial_info->connect_topology_option, 
GNUNET_YES,
-                               MYSQL_TYPE_FLOAT,
-                               &trial_info->connect_topology_option_modifier,
-                               MYSQL_TYPE_LONG, &trial_info->puts, GNUNET_YES,
-                               MYSQL_TYPE_LONG, &trial_info->gets, GNUNET_YES,
-                               MYSQL_TYPE_LONG, &trial_info->concurrent,
-                               GNUNET_YES, MYSQL_TYPE_LONG,
-                               &trial_info->settle_time, GNUNET_YES,
-                               MYSQL_TYPE_LONG, &trial_info->num_rounds,
-                               GNUNET_YES, MYSQL_TYPE_LONG,
-                               &trial_info->malicious_getters, GNUNET_YES,
-                               MYSQL_TYPE_LONG, &trial_info->malicious_putters,
-                               GNUNET_YES, MYSQL_TYPE_LONG,
-                               &trial_info->malicious_droppers, GNUNET_YES,
-                               MYSQL_TYPE_LONG,
-                               &trial_info->malicious_get_frequency, 
GNUNET_YES,
-                               MYSQL_TYPE_LONG,
-                               &trial_info->malicious_put_frequency, 
GNUNET_YES,
-                               MYSQL_TYPE_LONG, &trial_info->stop_closest,
-                               GNUNET_YES, MYSQL_TYPE_LONG,
-                               &trial_info->stop_found, GNUNET_YES,
-                               MYSQL_TYPE_LONG, &trial_info->strict_kademlia,
-                               GNUNET_YES, MYSQL_TYPE_LONG,
-                               &trial_info->gets_succeeded, GNUNET_YES,
-                               MYSQL_TYPE_BLOB, trial_info->message,
-                               max_varchar_len + max_varchar_len, &m_len, -1)))
-  {
-    if (ret == GNUNET_SYSERR)
-    {
-      mysql_stmt_close (stmt);
-      return GNUNET_SYSERR;
-    }
-  }
-
-  get_current_trial (&current_trial);
-
-  mysql_stmt_close (stmt);
-  return GNUNET_OK;
-}
-
-/*
- * Inserts the specified round into the dhttests.rounds table
- *
- * @param round_type the type of round that is being started
- * @param round_count counter for the round (if applicable)
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure
- */
-int
-add_round (unsigned int round_type, unsigned int round_count)
-{
-
-  MYSQL_STMT *stmt;
-  int ret;
-
-  stmt = mysql_stmt_init (conn);
-  ret =
-      prepared_statement_run (insert_round, NULL, MYSQL_TYPE_LONGLONG,
-                              &current_trial, GNUNET_YES, MYSQL_TYPE_LONG,
-                              &round_type, GNUNET_YES, MYSQL_TYPE_LONG,
-                              &round_count, GNUNET_YES, -1);
-  mysql_stmt_close (stmt);
-  if (ret != GNUNET_OK)
-    return GNUNET_SYSERR;
-  return ret;
-}
-
-/*
- * Inserts the specified round results into the
- * dhttests.processed_round_details table
- *
- * @param round_type the type of round that is being started
- * @param round_count counter for the round (if applicable)
- * @param num_messages the total number of messages initiated
- * @param num_messages_succeeded the number of messages that succeeded
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure
- */
-int
-add_round_details (unsigned int round_type, unsigned int round_count,
-                   unsigned int num_messages,
-                   unsigned int num_messages_succeeded)
-{
-  MYSQL_STMT *stmt;
-  int ret;
-
-  stmt = mysql_stmt_init (conn);
-  ret =
-      prepared_statement_run (insert_round_details, NULL, MYSQL_TYPE_LONGLONG,
-                              &current_trial, GNUNET_YES, MYSQL_TYPE_LONG,
-                              &round_type, GNUNET_YES, MYSQL_TYPE_LONG,
-                              &round_count, GNUNET_YES, MYSQL_TYPE_LONG,
-                              &num_messages, GNUNET_YES, MYSQL_TYPE_LONG,
-                              &num_messages_succeeded, GNUNET_YES, -1);
-  mysql_stmt_close (stmt);
-  if (ret != GNUNET_OK)
-    return GNUNET_SYSERR;
-  return ret;
-}
-
-/*
- * Inserts the specified stats into the dhttests.node_statistics table
- *
- * @param peer the peer inserting the statistic
- * @param route_requests route requests seen
- * @param route_forwards route requests forwarded
- * @param result_requests route result requests seen
- * @param client_requests client requests initiated
- * @param result_forwards route results forwarded
- * @param gets get requests handled
- * @param puts put requests handle
- * @param data_inserts data inserted at this node
- * @param find_peer_requests find peer requests seen
- * @param find_peers_started find peer requests initiated at this node
- * @param gets_started get requests initiated at this node
- * @param puts_started put requests initiated at this node
- * @param find_peer_responses_received find peer responses received locally
- * @param get_responses_received get responses received locally
- * @param find_peer_responses_sent find peer responses sent from this node
- * @param get_responses_sent get responses sent from this node
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure
- */
-int
-add_stat (const struct GNUNET_PeerIdentity *peer, unsigned int route_requests,
-          unsigned int route_forwards, unsigned int result_requests,
-          unsigned int client_requests, unsigned int result_forwards,
-          unsigned int gets, unsigned int puts, unsigned int data_inserts,
-          unsigned int find_peer_requests, unsigned int find_peers_started,
-          unsigned int gets_started, unsigned int puts_started,
-          unsigned int find_peer_responses_received,
-          unsigned int get_responses_received,
-          unsigned int find_peer_responses_sent,
-          unsigned int get_responses_sent)
-{
-  MYSQL_STMT *stmt;
-  int ret;
-  unsigned long long peer_uid;
-  unsigned long long return_uid;
-
-  if (peer == NULL)
-    return GNUNET_SYSERR;
-
-  if (GNUNET_OK != get_node_uid (&peer_uid, &peer->hashPubKey))
-  {
-    return GNUNET_SYSERR;
-  }
-
-  stmt = mysql_stmt_init (conn);
-  if (GNUNET_OK !=
-      (ret =
-       prepared_statement_run (insert_stat, &return_uid, MYSQL_TYPE_LONGLONG,
-                               &current_trial, GNUNET_YES, MYSQL_TYPE_LONGLONG,
-                               &peer_uid, GNUNET_YES, MYSQL_TYPE_LONG,
-                               &route_requests, GNUNET_YES, MYSQL_TYPE_LONG,
-                               &route_forwards, GNUNET_YES, MYSQL_TYPE_LONG,
-                               &result_requests, GNUNET_YES, MYSQL_TYPE_LONG,
-                               &client_requests, GNUNET_YES, MYSQL_TYPE_LONG,
-                               &result_forwards, GNUNET_YES, MYSQL_TYPE_LONG,
-                               &gets, GNUNET_YES, MYSQL_TYPE_LONG, &puts,
-                               GNUNET_YES, MYSQL_TYPE_LONG, &data_inserts,
-                               GNUNET_YES, MYSQL_TYPE_LONG, 
&find_peer_requests,
-                               GNUNET_YES, MYSQL_TYPE_LONG, 
&find_peers_started,
-                               GNUNET_YES, MYSQL_TYPE_LONG, &gets_started,
-                               GNUNET_YES, MYSQL_TYPE_LONG, &puts_started,
-                               GNUNET_YES, MYSQL_TYPE_LONG,
-                               &find_peer_responses_received, GNUNET_YES,
-                               MYSQL_TYPE_LONG, &get_responses_received,
-                               GNUNET_YES, MYSQL_TYPE_LONG,
-                               &find_peer_responses_sent, GNUNET_YES,
-                               MYSQL_TYPE_LONG, &get_responses_sent, 
GNUNET_YES,
-                               -1)))
-  {
-    if (ret == GNUNET_SYSERR)
-    {
-      mysql_stmt_close (stmt);
-      return GNUNET_SYSERR;
-    }
-  }
-
-  mysql_stmt_close (stmt);
-  return GNUNET_OK;
-}
-
-/*
- * Inserts the specified stats into the dhttests.generic_stats table
- *
- * @param peer the peer inserting the statistic
- * @param name the name of the statistic
- * @param section the section of the statistic
- * @param value the value of the statistic
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure
- */
-int
-add_generic_stat (const struct GNUNET_PeerIdentity *peer, const char *name,
-                  const char *section, uint64_t value)
-{
-  unsigned long long peer_uid;
-  unsigned long long section_len;
-  unsigned long long name_len;
-  int ret;
-
-  if (peer == NULL)
-    return GNUNET_SYSERR;
-
-  if (GNUNET_OK != get_node_uid (&peer_uid, &peer->hashPubKey))
-  {
-    return GNUNET_SYSERR;
-  }
-
-  section_len = strlen (section);
-  name_len = strlen (name);
-
-  if (GNUNET_OK !=
-      (ret =
-       prepared_statement_run (insert_generic_stat, NULL, MYSQL_TYPE_LONGLONG,
-                               &current_trial, GNUNET_YES, MYSQL_TYPE_LONGLONG,
-                               &peer_uid, GNUNET_YES, MYSQL_TYPE_VAR_STRING,
-                               &section, max_varchar_len, &section_len,
-                               MYSQL_TYPE_VAR_STRING, &name, max_varchar_len,
-                               &name_len, MYSQL_TYPE_LONGLONG, &value,
-                               GNUNET_YES, -1)))
-  {
-    if (ret == GNUNET_SYSERR)
-    {
-      return GNUNET_SYSERR;
-    }
-  }
-  return GNUNET_OK;
-}
-
-/*
- * Inserts the specified dhtkey into the dhttests.dhtkeys table,
- * stores return value of dhttests.dhtkeys.dhtkeyuid into dhtkeyuid
- *
- * @param dhtkeyuid return value
- * @param dhtkey hashcode of key to insert
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure
- */
-int
-add_dhtkey (unsigned long long *dhtkeyuid, const GNUNET_HashCode * dhtkey)
-{
-
-  int ret;
-  struct GNUNET_CRYPTO_HashAsciiEncoded encKey;
-  unsigned long long k_len;
-  unsigned long long h_len;
-  unsigned long long curr_dhtkeyuid;
-
-  GNUNET_CRYPTO_hash_to_enc (dhtkey, &encKey);
-  k_len = strlen ((char *) &encKey);
-  h_len = sizeof (GNUNET_HashCode);
-  curr_dhtkeyuid = 0;
-  ret = get_dhtkey_uid (&curr_dhtkeyuid, dhtkey);
-  if (curr_dhtkeyuid != 0)      /* dhtkey already exists */
-  {
-    if (dhtkeyuid != NULL)
-      *dhtkeyuid = curr_dhtkeyuid;
-    return GNUNET_OK;
-  }
-  else if (ret == GNUNET_SYSERR)
-  {
-#if DEBUG_DHTLOG
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Failed to get dhtkeyuid!\n");
-#endif
-  }
-
-  if (GNUNET_OK !=
-      (ret =
-       prepared_statement_run (insert_dhtkey, dhtkeyuid, MYSQL_TYPE_VAR_STRING,
-                               &encKey, max_varchar_len, &k_len,
-                               MYSQL_TYPE_LONG, &current_trial, GNUNET_YES,
-                               MYSQL_TYPE_BLOB, dhtkey,
-                               sizeof (GNUNET_HashCode), &h_len, -1)))
-  {
-    if (ret == GNUNET_SYSERR)
-    {
-      return GNUNET_SYSERR;
-    }
-  }
-
-  return GNUNET_OK;
-}
-
-
-
-/*
- * Inserts the specified node into the dhttests.nodes table
- *
- * @param nodeuid the inserted node uid
- * @param node the node to insert
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure
- */
-int
-add_node (unsigned long long *nodeuid, struct GNUNET_PeerIdentity *node)
-{
-  struct GNUNET_CRYPTO_HashAsciiEncoded encPeer;
-  unsigned long p_len;
-  unsigned long h_len;
-  int ret;
-
-  if (node == NULL)
-    return GNUNET_SYSERR;
-
-  GNUNET_CRYPTO_hash_to_enc (&node->hashPubKey, &encPeer);
-  p_len = (unsigned long) strlen ((char *) &encPeer);
-  h_len = sizeof (GNUNET_HashCode);
-  if (GNUNET_OK !=
-      (ret =
-       prepared_statement_run (insert_node, nodeuid, MYSQL_TYPE_LONGLONG,
-                               &current_trial, GNUNET_YES,
-                               MYSQL_TYPE_VAR_STRING, &encPeer, 
max_varchar_len,
-                               &p_len, MYSQL_TYPE_BLOB, &node->hashPubKey,
-                               sizeof (GNUNET_HashCode), &h_len, -1)))
-  {
-    if (ret == GNUNET_SYSERR)
-    {
-      return GNUNET_SYSERR;
-    }
-  }
-  return GNUNET_OK;
-}
-
-/*
- * Update dhttests.trials table with current server time as end time
- *
- * @param gets_succeeded how many gets did the testcase report as successful
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure.
- */
-int
-update_trials (unsigned int gets_succeeded)
-{
-  int ret;
-
-  if (GNUNET_OK !=
-      (ret =
-       prepared_statement_run (update_trial, NULL, MYSQL_TYPE_LONG,
-                               &gets_succeeded, GNUNET_YES, 
MYSQL_TYPE_LONGLONG,
-                               &current_trial, GNUNET_YES, -1)))
-  {
-    if (ret == GNUNET_SYSERR)
-    {
-      return GNUNET_SYSERR;
-    }
-  }
-  if (ret > 0)
-    return GNUNET_OK;
-  else
-    return GNUNET_SYSERR;
-}
-
-
-/*
- * Update dhttests.nodes table setting the identified
- * node as a malicious dropper.
- *
- * @param peer the peer that was set to be malicious
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure.
- */
-int
-set_malicious (struct GNUNET_PeerIdentity *peer)
-{
-  unsigned long long p_len;
-  int ret;
-  char *temp_str;
-
-  temp_str = GNUNET_strdup (GNUNET_h2s_full (&peer->hashPubKey));
-  p_len = strlen (temp_str);
-
-  if (GNUNET_OK !=
-      (ret =
-       prepared_statement_run (update_node_malicious, NULL, 
MYSQL_TYPE_LONGLONG,
-                               &current_trial, GNUNET_YES,
-                               MYSQL_TYPE_VAR_STRING, temp_str, 
max_varchar_len,
-                               &p_len, -1)))
-  {
-    if (ret == GNUNET_SYSERR)
-    {
-      return GNUNET_SYSERR;
-    }
-  }
-  return GNUNET_OK;
-}
-
-
-/*
- * Update dhttests.trials table with total connections information
- *
- * @param totalConnections the number of connections
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure.
- */
-int
-add_connections (unsigned int totalConnections)
-{
-  int ret;
-
-  if (GNUNET_OK !=
-      (ret =
-       prepared_statement_run (update_connection, NULL, MYSQL_TYPE_LONG,
-                               &totalConnections, GNUNET_YES,
-                               MYSQL_TYPE_LONGLONG, &current_trial, GNUNET_YES,
-                               -1)))
-  {
-    if (ret == GNUNET_SYSERR)
-    {
-      return GNUNET_SYSERR;
-    }
-  }
-  if (ret > 0)
-    return GNUNET_OK;
-  else
-    return GNUNET_SYSERR;
-}
-
-/*
- * Inserts the specified query into the dhttests.queries table
- *
- * @param sqlqueruid inserted query uid
- * @param queryid dht query id
- * @param type type of the query
- * @param hops number of hops query traveled
- * @param succeeded whether or not query was successful
- * @param node the node the query hit
- * @param key the key of the query
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure.
- */
-int
-add_query (unsigned long long *sqlqueryuid, unsigned long long queryid,
-           unsigned int type, unsigned int hops, int succeeded,
-           const struct GNUNET_PeerIdentity *node, const GNUNET_HashCode * key)
-{
-  int ret;
-  unsigned long long peer_uid, key_uid;
-
-  peer_uid = 0;
-  key_uid = 0;
-
-  if ((node != NULL) &&
-      (GNUNET_OK == get_node_uid (&peer_uid, &node->hashPubKey)))
-  {
-
-  }
-  else
-  {
-    return GNUNET_SYSERR;
-  }
-
-  if ((key != NULL) && (GNUNET_OK == get_dhtkey_uid (&key_uid, key)))
-  {
-
-  }
-  else if ((key != NULL) && (key->bits[(512 / 8 / sizeof (unsigned int)) - 1] 
== 42))   /* Malicious marker */
-  {
-    key_uid = 0;
-  }
-  else
-  {
-    return GNUNET_SYSERR;
-  }
-
-  if (GNUNET_OK !=
-      (ret =
-       prepared_statement_run (insert_query, sqlqueryuid, MYSQL_TYPE_LONGLONG,
-                               &current_trial, GNUNET_YES, MYSQL_TYPE_LONG,
-                               &type, GNUNET_NO, MYSQL_TYPE_LONG, &hops,
-                               GNUNET_YES, MYSQL_TYPE_LONGLONG, &key_uid,
-                               GNUNET_YES, MYSQL_TYPE_LONGLONG, &queryid,
-                               GNUNET_YES, MYSQL_TYPE_LONG, &succeeded,
-                               GNUNET_NO, MYSQL_TYPE_LONGLONG, &peer_uid,
-                               GNUNET_YES, -1)))
-  {
-    if (ret == GNUNET_SYSERR)
-    {
-      return GNUNET_SYSERR;
-    }
-  }
-  if (ret > 0)
-    return GNUNET_OK;
-  else
-    return GNUNET_SYSERR;
-}
-
-/*
- * Inserts the specified route information into the dhttests.routes table
- *
- * @param sqlqueruid inserted query uid
- * @param queryid dht query id
- * @param type type of the query
- * @param hops number of hops query traveled
- * @param succeeded whether or not query was successful
- * @param node the node the query hit
- * @param key the key of the query
- * @param from_node the node that sent the message to node
- * @param to_node next node to forward message to
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure.
- */
-int
-add_route (unsigned long long *sqlqueryuid, unsigned long long queryid,
-           unsigned int type, unsigned int hops, int succeeded,
-           const struct GNUNET_PeerIdentity *node, const GNUNET_HashCode * key,
-           const struct GNUNET_PeerIdentity *from_node,
-           const struct GNUNET_PeerIdentity *to_node)
-{
-  unsigned long long peer_uid = 0;
-  unsigned long long key_uid = 0;
-  unsigned long long from_uid = 0;
-  unsigned long long to_uid = 0;
-  int ret;
-
-  if (from_node != NULL)
-    get_node_uid (&from_uid, &from_node->hashPubKey);
-
-  if (to_node != NULL)
-    get_node_uid (&to_uid, &to_node->hashPubKey);
-  else
-    to_uid = 0;
-
-  if ((node != NULL))
-  {
-    if (1 != get_node_uid (&peer_uid, &node->hashPubKey))
-    {
-      return GNUNET_SYSERR;
-    }
-  }
-  else
-    return GNUNET_SYSERR;
-
-  if ((key != NULL))
-  {
-    if (1 != get_dhtkey_uid (&key_uid, key))
-    {
-      return GNUNET_SYSERR;
-    }
-  }
-  else
-    return GNUNET_SYSERR;
-
-  if (GNUNET_OK !=
-      (ret =
-       prepared_statement_run (insert_route, sqlqueryuid, MYSQL_TYPE_LONGLONG,
-                               &current_trial, GNUNET_YES, MYSQL_TYPE_LONG,
-                               &type, GNUNET_NO, MYSQL_TYPE_LONG, &hops,
-                               GNUNET_YES, MYSQL_TYPE_LONGLONG, &key_uid,
-                               GNUNET_YES, MYSQL_TYPE_LONGLONG, &queryid,
-                               GNUNET_YES, MYSQL_TYPE_LONG, &succeeded,
-                               GNUNET_NO, MYSQL_TYPE_LONGLONG, &peer_uid,
-                               GNUNET_YES, MYSQL_TYPE_LONGLONG, &from_uid,
-                               GNUNET_YES, MYSQL_TYPE_LONGLONG, &to_uid,
-                               GNUNET_YES, -1)))
-  {
-    if (ret == GNUNET_SYSERR)
-    {
-      return GNUNET_SYSERR;
-    }
-  }
-  if (ret > 0)
-    return GNUNET_OK;
-  else
-    return GNUNET_SYSERR;
-}
-
-/*
- * Update dhttests.topology table with total connections information
- *
- * @param totalConnections the number of connections
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure.
- */
-int
-update_current_topology (unsigned int connections)
-{
-  int ret;
-  unsigned long long topologyuid;
-
-  get_current_topology (&topologyuid);
-
-  if (GNUNET_OK !=
-      (ret =
-       prepared_statement_run (update_topology, NULL, MYSQL_TYPE_LONG,
-                               &connections, GNUNET_YES, MYSQL_TYPE_LONGLONG,
-                               &topologyuid, GNUNET_YES, -1)))
-  {
-    if (ret == GNUNET_SYSERR)
-    {
-      return GNUNET_SYSERR;
-    }
-  }
-  if (ret > 0)
-    return GNUNET_OK;
-  return GNUNET_SYSERR;
-
-}
-
-/*
- * Records the current topology (number of connections, time, trial)
- *
- * @param num_connections how many connections are in the topology
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure
- */
-int
-add_topology (int num_connections)
-{
-  int ret;
-
-  if (GNUNET_OK !=
-      (ret =
-       prepared_statement_run (insert_topology, NULL, MYSQL_TYPE_LONGLONG,
-                               &current_trial, GNUNET_YES, MYSQL_TYPE_LONG,
-                               &num_connections, GNUNET_YES, -1)))
-  {
-    if (ret == GNUNET_SYSERR)
-    {
-      return GNUNET_SYSERR;
-    }
-  }
-  if (ret > 0)
-    return GNUNET_OK;
-  return GNUNET_SYSERR;
-}
-
-/*
- * Records a connection between two peers in the current topology
- *
- * @param first one side of the connection
- * @param second other side of the connection
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure
- */
-int
-add_extended_topology (const struct GNUNET_PeerIdentity *first,
-                       const struct GNUNET_PeerIdentity *second)
-{
-  int ret;
-  unsigned long long first_uid;
-  unsigned long long second_uid;
-  unsigned long long topologyuid;
-
-  if (GNUNET_OK != get_current_topology (&topologyuid))
-    return GNUNET_SYSERR;
-  if (GNUNET_OK != get_node_uid (&first_uid, &first->hashPubKey))
-    return GNUNET_SYSERR;
-  if (GNUNET_OK != get_node_uid (&second_uid, &second->hashPubKey))
-    return GNUNET_SYSERR;
-
-  if (GNUNET_OK !=
-      (ret =
-       prepared_statement_run (extend_topology, NULL, MYSQL_TYPE_LONGLONG,
-                               &topologyuid, GNUNET_YES, MYSQL_TYPE_LONGLONG,
-                               &first_uid, GNUNET_YES, MYSQL_TYPE_LONGLONG,
-                               &second_uid, GNUNET_YES, -1)))
-  {
-    if (ret == GNUNET_SYSERR)
-    {
-      return GNUNET_SYSERR;
-    }
-  }
-  if (ret > 0)
-    return GNUNET_OK;
-  return GNUNET_SYSERR;
-}
-
-
-/*
- * Provides the dhtlog api
- *
- * @param c the configuration to use to connect to a server
- *
- * @return the handle to the server, or NULL on error
- */
-void *
-libgnunet_plugin_dhtlog_mysql_init (void *cls)
-{
-  struct GNUNET_DHTLOG_Plugin *plugin = cls;
-
-  cfg = plugin->cfg;
-  max_varchar_len = 255;
-#if DEBUG_DHTLOG
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "MySQL DHT Logger: initializing database\n");
-#endif
-
-  if (iopen (plugin) != GNUNET_OK)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                _
-                ("Failed to initialize MySQL database connection for 
dhtlog.\n"));
-    return NULL;
-  }
-
-  GNUNET_assert (plugin->dhtlog_api == NULL);
-  plugin->dhtlog_api = GNUNET_malloc (sizeof (struct GNUNET_DHTLOG_Handle));
-  plugin->dhtlog_api->insert_trial = &add_trial;
-  plugin->dhtlog_api->insert_stat = &add_stat;
-  plugin->dhtlog_api->insert_round = &add_round;
-  plugin->dhtlog_api->insert_round_details = &add_round_details;
-  plugin->dhtlog_api->add_generic_stat = &add_generic_stat;
-  plugin->dhtlog_api->insert_query = &add_query;
-  plugin->dhtlog_api->update_trial = &update_trials;
-  plugin->dhtlog_api->insert_route = &add_route;
-  plugin->dhtlog_api->insert_node = &add_node;
-  plugin->dhtlog_api->insert_dhtkey = &add_dhtkey;
-  plugin->dhtlog_api->update_connections = &add_connections;
-  plugin->dhtlog_api->insert_topology = &add_topology;
-  plugin->dhtlog_api->update_topology = &update_current_topology;
-  plugin->dhtlog_api->insert_extended_topology = &add_extended_topology;
-  plugin->dhtlog_api->set_malicious = &set_malicious;
-  get_current_trial (&current_trial);
-
-  return plugin;
-}
-
-/**
- * Shutdown the plugin.
- */
-void *
-libgnunet_plugin_dhtlog_mysql_done (void *cls)
-{
-  struct GNUNET_DHTLOG_Handle *dhtlog_api = cls;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MySQL DHT Logger: database 
shutdown\n");
-  GNUNET_assert (dhtlog_api != NULL);
-  prepared_statement_close (insert_query);
-  prepared_statement_close (insert_route);
-  prepared_statement_close (insert_trial);
-  prepared_statement_close (insert_round);
-  prepared_statement_close (insert_round_details);
-  prepared_statement_close (insert_node);
-  prepared_statement_close (insert_dhtkey);
-  prepared_statement_close (update_trial);
-  prepared_statement_close (get_dhtkeyuid);
-  prepared_statement_close (get_nodeuid);
-  prepared_statement_close (update_connection);
-  prepared_statement_close (get_trial);
-  prepared_statement_close (get_topology);
-  prepared_statement_close (insert_topology);
-  prepared_statement_close (update_topology);
-  prepared_statement_close (extend_topology);
-  prepared_statement_close (update_node_malicious);
-
-  if (conn != NULL)
-    mysql_close (conn);
-  conn = NULL;
-  mysql_library_end ();
-  GNUNET_free (dhtlog_api);
-  return NULL;
-}
-
-/* end of plugin_dhtlog_mysql.c */

Deleted: gnunet/src/dht/plugin_dhtlog_mysql_dump.c
===================================================================
--- gnunet/src/dht/plugin_dhtlog_mysql_dump.c   2011-09-27 20:45:02 UTC (rev 
17074)
+++ gnunet/src/dht/plugin_dhtlog_mysql_dump.c   2011-09-27 20:47:21 UTC (rev 
17075)
@@ -1,964 +0,0 @@
-/*
-     This file is part of GNUnet.
-     (C) 2006 - 2009 Christian Grothoff (and other contributing authors)
-
-     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, 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.
-*/
-
-/**
- * @file src/dht/plugin_dhtlog_mysql_dump.c
- * @brief MySQL logging plugin to record DHT operations to MySQL server,
- *        but write all queries to file instead of the actual server
- *        so that they can be imported later.  The idea is that connecting
- *        to the MySQL server X times can be really problematic, but hopefully
- *        writing to a single file is more reliable.
- * @author Nathan Evans
- *
- * Database: MySQL
- */
-
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "dhtlog.h"
-
-
-#define DEBUG_DHTLOG GNUNET_YES
-
-/**
- * Maximum number of supported parameters for a prepared
- * statement.  Increase if needed.
- */
-#define MAX_PARAM 32
-
-
-static unsigned long max_varchar_len;
-
-/**
- * The configuration the DHT service is running with
- */
-static const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-#define INSERT_QUERIES_STMT "prepare insert_query from 'INSERT INTO queries 
(trialuid, querytype, hops, dhtkeyuid, dhtqueryid, succeeded, nodeuid, time) "\
-                          "VALUES (@temp_trial, ?, ?, ?, ?, ?, ?, ?)'"
-
-#define INSERT_ROUTES_STMT "prepare insert_route from 'INSERT INTO routes 
(trialuid, querytype, hops, dhtkeyuid, dhtqueryid, succeeded, nodeuid, 
from_node, to_node) "\
-                          "VALUES (@temp_trial, ?, ?, ?, ?, ?, ?, ?, ?)'"
-
-#define INSERT_NODES_STMT "prepare insert_node from 'INSERT ignore INTO nodes 
(trialuid, nodeid) "\
-                          "VALUES (@temp_trial, ?)'"
-
-#define INSERT_TOPOLOGY_STMT "prepare insert_topology from 'INSERT INTO 
topology (trialuid, date, connections) "\
-                             "VALUES (@temp_trial, ?, ?)'"
-
-#define INSERT_ROUND_STMT "prepare insert_round from 'INSERT INTO rounds 
(trialuid, round_type, round_count, starttime) VALUES (@temp_trial, @rtype, 
@rcount, @curr_time)'"
-
-#define INSERT_ROUND_DETAILS_STMT "prepare insert_round_details from 'INSERT 
INTO processed_trial_rounds "\
-                                  "(trialuid, round_type, round_count, 
starttime, endtime, num_messages, num_messages_succeeded)"\
-                                  "VALUES (@temp_trial, @rtype, @rcount, 
@curr_time, @curr_time, @totalmsgs, @msgssucceeded)'"
-
-#define EXTEND_TOPOLOGY_STMT "prepare extend_topology from 'INSERT INTO 
extended_topology (topology_uid, uid_first, uid_second) "\
-                             "VALUES (@temp_topology, ?, ?)'"
-
-#define UPDATE_TOPOLOGY_STMT "prepare update_topology from 'update topology 
set connections = ?  where topology_uid = @temp_topology'"
-
-#define SET_MALICIOUS_STMT "prepare set_malicious from 'update nodes set 
malicious_dropper = 1  where trialuid = @temp_trial and nodeid = @temp_node'"
-
-#define INSERT_TRIALS_STMT "prepare insert_trial from 'INSERT INTO trials"\
-                           "(starttime, other_trial_identifier, numnodes, 
topology,"\
-                           "topology_percentage, topology_probability,"\
-                           "blacklist_topology, connect_topology, 
connect_topology_option,"\
-                           "connect_topology_option_modifier, puts, gets, "\
-                           "concurrent, settle_time, num_rounds, 
malicious_getters,"\
-                           "malicious_putters, malicious_droppers, 
malicious_get_frequency,"\
-                           "malicious_put_frequency, stop_closest, stop_found, 
strict_kademlia, "\
-                           "gets_succeeded, message) "\
-                           "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 
?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)'"
-
-#define INSERT_GENERIC_STAT_STMT "prepare insert_generic_stat from 'INSERT 
INTO generic_stats" \
-                                 "(trialuid, nodeuid, section, name, value)"\
-                                 "VALUES (@temp_trial, @temp_node, 
@temp_section, @temp_stat, @temp_value)'"
-
-#define INSERT_STAT_STMT "prepare insert_stat from 'INSERT INTO 
node_statistics"\
-                            "(trialuid, nodeuid, route_requests,"\
-                            "route_forwards, result_requests,"\
-                            "client_results, result_forwards, gets,"\
-                            "puts, data_inserts, find_peer_requests, "\
-                            "find_peers_started, gets_started, puts_started, 
find_peer_responses_received,"\
-                            "get_responses_received, find_peer_responses_sent, 
get_responses_sent) "\
-                            "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 
?, ?, ?, ?)'"
-
-#define INSERT_DHTKEY_STMT "prepare insert_dhtkey from 'INSERT ignore INTO 
dhtkeys (dhtkey, trialuid) "\
-                           "VALUES (?, @temp_trial)'"
-
-#define UPDATE_TRIALS_STMT "prepare update_trial from 'UPDATE trials set 
endtime= ?, gets_succeeded = ? where trialuid = @temp_trial'"
-
-#define UPDATE_CONNECTIONS_STMT "prepare update_conn from 'UPDATE trials set 
totalConnections = ? where trialuid = @temp_trial'"
-
-#define GET_TRIAL_STMT "prepare select_trial from 'SELECT MAX( trialuid ) FROM 
trials into @temp_trial'"
-
-#define GET_TOPOLOGY_STMT "prepare select_topology from 'SELECT MAX( 
topology_uid ) FROM topology into @temp_topology'"
-
-#define GET_DHTKEYUID_STMT "prepare get_dhtkeyuid from 'SELECT dhtkeyuid FROM 
dhtkeys where dhtkey = ? and trialuid = @temp_trial'"
-
-#define GET_NODEUID_STMT "prepare get_nodeuid from 'SELECT nodeuid FROM nodes 
where trialuid = @temp_trial and nodeid = ?'"
-
-#define DATE_STR_SIZE 50
-
-/**
- * File to dump all sql statements to.
- */
-FILE *outfile;
-
-
-static char *
-get_sql_time ()
-{
-  static char date[DATE_STR_SIZE];
-  time_t timetmp;
-  struct tm *tmptr;
-
-  time (&timetmp);
-  memset (date, 0, DATE_STR_SIZE);
-  tmptr = localtime (&timetmp);
-  if (NULL != tmptr)
-    strftime (date, DATE_STR_SIZE, "%Y-%m-%d %H:%M:%S", tmptr);
-  else
-    strcpy (date, "");
-
-  return date;
-}
-
-/**
- * Create a prepared statement.
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure
- */
-static int
-prepared_statement_create (const char *statement)
-{
-  if (fprintf (outfile, "%s;\n", statement) > 0)
-    return GNUNET_OK;
-
-  return GNUNET_SYSERR;
-}
-
-/*
- * Initialize the prepared statements for use with dht test logging
- */
-static int
-iopen ()
-{
-#define PINIT(a) (GNUNET_OK != (prepared_statement_create(a)))
-  if (PINIT (INSERT_QUERIES_STMT) || PINIT (INSERT_ROUTES_STMT) ||
-      PINIT (INSERT_ROUND_STMT) || PINIT (INSERT_ROUND_DETAILS_STMT) ||
-      PINIT (INSERT_TRIALS_STMT) || PINIT (SET_MALICIOUS_STMT) ||
-      PINIT (INSERT_GENERIC_STAT_STMT) || PINIT (INSERT_STAT_STMT) ||
-      PINIT (INSERT_NODES_STMT) || PINIT (INSERT_DHTKEY_STMT) ||
-      PINIT (UPDATE_TRIALS_STMT) || PINIT (GET_DHTKEYUID_STMT) ||
-      PINIT (GET_NODEUID_STMT) || PINIT (UPDATE_CONNECTIONS_STMT) ||
-      PINIT (INSERT_TOPOLOGY_STMT) || PINIT (EXTEND_TOPOLOGY_STMT) ||
-      PINIT (UPDATE_TOPOLOGY_STMT) || PINIT (GET_TRIAL_STMT) ||
-      PINIT (GET_TOPOLOGY_STMT))
-  {
-    return GNUNET_SYSERR;
-  }
-#undef PINIT
-
-  return GNUNET_OK;
-}
-
-/*
- * Inserts the specified round into the dhttests.rounds table
- *
- * @param round_type the type of round that is being started
- * @param round_count counter for the round (if applicable)
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure
- */
-int
-add_round (unsigned int round_type, unsigned int round_count)
-{
-  int ret;
-
-  if (outfile == NULL)
-    return GNUNET_SYSERR;
-
-  ret =
-      fprintf (outfile,
-               "set @curr_time = \"%s\", @rtype = \"%u\", @rcount = \"%u\";\n",
-               get_sql_time (), round_type, round_count);
-
-  if (ret < 0)
-    return GNUNET_SYSERR;
-  ret = fprintf (outfile, "execute insert_round;\n");
-
-  if (ret >= 0)
-    return GNUNET_OK;
-  return GNUNET_SYSERR;
-}
-
-/*
- * Inserts the specified round results into the
- * dhttests.processed_round_details table
- *
- * @param round_type the type of round that is being started
- * @param round_count counter for the round (if applicable)
- * @param num_messages the total number of messages initiated
- * @param num_messages_succeeded the number of messages that succeeded
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure
- */
-int
-add_round_details (unsigned int round_type, unsigned int round_count,
-                   unsigned int num_messages,
-                   unsigned int num_messages_succeeded)
-{
-  int ret;
-
-  if (outfile == NULL)
-    return GNUNET_SYSERR;
-
-  ret =
-      fprintf (outfile,
-               "set @curr_time = \"%s\", @rtype = \"%u\", @rcount = \"%u\", 
@totalmsgs = \"%u\", @msgssucceeded = \"%u\";\n",
-               get_sql_time (), round_type, round_count, num_messages,
-               num_messages_succeeded);
-
-  if (ret < 0)
-    return GNUNET_SYSERR;
-  ret = fprintf (outfile, "execute insert_round_details;\n");
-
-  if (ret >= 0)
-    return GNUNET_OK;
-  return GNUNET_SYSERR;
-}
-
-/*
- * Records the current topology (number of connections, time, trial)
- *
- * @param num_connections how many connections are in the topology
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure
- */
-int
-add_topology (int num_connections)
-{
-  int ret;
-
-  if (outfile == NULL)
-    return GNUNET_SYSERR;
-
-  ret =
-      fprintf (outfile, "set @date = \"%s\", @num = %d;\n", get_sql_time (),
-               num_connections);
-
-  if (ret < 0)
-    return GNUNET_SYSERR;
-  ret = fprintf (outfile, "execute insert_topology using " "@date, @num;\n");
-  if (ret < 0)
-    return GNUNET_SYSERR;
-
-  ret = fprintf (outfile, "execute select_topology;\n");
-
-  if (ret >= 0)
-    return GNUNET_OK;
-  return GNUNET_SYSERR;
-}
-
-/*
- * Records a connection between two peers in the current topology
- *
- * @param first one side of the connection
- * @param second other side of the connection
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure
- */
-int
-add_extended_topology (const struct GNUNET_PeerIdentity *first,
-                       const struct GNUNET_PeerIdentity *second)
-{
-  int ret;
-
-  if (outfile == NULL)
-    return GNUNET_SYSERR;
-
-  if (first != NULL)
-    ret =
-        fprintf (outfile,
-                 "select nodeuid from nodes where trialuid = @temp_trial and 
nodeid = \"%s\" into @temp_first_node;\n",
-                 GNUNET_h2s_full (&first->hashPubKey));
-  else
-    ret = fprintf (outfile, "set @temp_first_node = 0;\n");
-
-  if (ret < 0)
-    return GNUNET_SYSERR;
-
-  if (second != NULL)
-    ret =
-        fprintf (outfile,
-                 "select nodeuid from nodes where trialuid = @temp_trial and 
nodeid = \"%s\" into @temp_second_node;\n",
-                 GNUNET_h2s_full (&second->hashPubKey));
-  else
-    ret = fprintf (outfile, "set @temp_second_node = 0;\n");
-
-  if (ret < 0)
-    return GNUNET_SYSERR;
-
-  ret =
-      fprintf (outfile,
-               "execute extend_topology using "
-               "@temp_first_node, @temp_second_node;\n");
-
-  if (ret >= 0)
-    return GNUNET_OK;
-  return GNUNET_SYSERR;
-}
-
-
-/*
- * Inserts the specified trial into the dhttests.trials table
- *
- * @param trial_info struct containing the data to insert about this trial
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure
- */
-int
-add_trial (struct GNUNET_DHTLOG_TrialInfo *trial_info)
-{
-  int ret;
-
-  if (outfile == NULL)
-    return GNUNET_SYSERR;
-
-  ret =
-      fprintf (outfile,
-               "set @date = \"%s\", @oid = %u, @num = %u, @topology = %u, @bl 
= %u, "
-               "@connect = %u, @c_t_o = %u, @c_t_o_m = %f, @t_p = %f, "
-               "@t_pr = %f, @puts = %u, @gets = %u, "
-               "@concurrent = %u, @settle = %u, @rounds = %u, "
-               "@m_gets = %u, @m_puts = %u, @m_drops = %u, "
-               "@m_g_f = %u, @m_p_f = %u, @s_c = %u, @s_f = %u,"
-               "@s_k = %u, @g_s = %u, @message = \"%s\";\n", get_sql_time (),
-               trial_info->other_identifier, trial_info->num_nodes,
-               trial_info->topology, trial_info->blacklist_topology,
-               trial_info->connect_topology,
-               trial_info->connect_topology_option,
-               trial_info->connect_topology_option_modifier,
-               trial_info->topology_percentage,
-               trial_info->topology_probability, trial_info->puts,
-               trial_info->gets, trial_info->concurrent,
-               trial_info->settle_time, trial_info->num_rounds,
-               trial_info->malicious_getters, trial_info->malicious_putters,
-               trial_info->malicious_droppers,
-               trial_info->malicious_get_frequency,
-               trial_info->malicious_put_frequency, trial_info->stop_closest,
-               trial_info->stop_found, trial_info->strict_kademlia,
-               trial_info->gets_succeeded, trial_info->message);
-
-  if (ret < 0)
-    return GNUNET_SYSERR;
-  ret =
-      fprintf (outfile,
-               "execute insert_trial using "
-               "@date, @oid, @num, @topology, @t_p, @t_pr,"
-               " @bl, @connect, @c_t_o," "@c_t_o_m, @puts, @gets,"
-               "@concurrent, @settle, @rounds," "@m_gets, @m_puts, @m_drops,"
-               "@m_g_f, @m_p_f, @s_c, @s_f," "@s_k, @g_s, @message;\n");
-  if (ret < 0)
-    return GNUNET_SYSERR;
-  ret = fprintf (outfile, "execute select_trial;\n");
-
-  if (ret >= 0)
-    return GNUNET_OK;
-  return GNUNET_SYSERR;
-}
-
-
-/*
- * Inserts the specified stats into the dhttests.generic_stats table
- *
- * @param peer the peer inserting the statistic
- * @param name the name of the statistic
- * @param section the section of the statistic
- * @param value the value of the statistic
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure
- */
-int
-add_generic_stat (const struct GNUNET_PeerIdentity *peer, const char *name,
-                  const char *section, uint64_t value)
-{
-  int ret;
-
-  if (outfile == NULL)
-    return GNUNET_SYSERR;
-
-  if (peer != NULL)
-    ret =
-        fprintf (outfile,
-                 "select nodeuid from nodes where trialuid = @temp_trial and 
nodeid = \"%s\" into @temp_node;\n",
-                 GNUNET_h2s_full (&peer->hashPubKey));
-  else
-    ret = fprintf (outfile, "set @temp_node = 0;\n");
-
-  if (ret < 0)
-    return GNUNET_SYSERR;
-
-  ret =
-      fprintf (outfile,
-               "set @temp_section = \"%s\", @temp_stat = \"%s\", @temp_value = 
%llu;\n",
-               section, name, (unsigned long long) value);
-
-  if (ret < 0)
-    return GNUNET_SYSERR;
-
-  ret = fprintf (outfile, "execute insert_generic_stat;\n");
-
-  if (ret < 0)
-    return GNUNET_SYSERR;
-  return GNUNET_OK;
-}
-
-
-/*
- * Inserts the specified stats into the dhttests.node_statistics table
- *
- * @param peer the peer inserting the statistic
- * @param route_requests route requests seen
- * @param route_forwards route requests forwarded
- * @param result_requests route result requests seen
- * @param client_requests client requests initiated
- * @param result_forwards route results forwarded
- * @param gets get requests handled
- * @param puts put requests handle
- * @param data_inserts data inserted at this node
- * @param find_peer_requests find peer requests seen
- * @param find_peers_started find peer requests initiated at this node
- * @param gets_started get requests initiated at this node
- * @param puts_started put requests initiated at this node
- * @param find_peer_responses_received find peer responses received locally
- * @param get_responses_received get responses received locally
- * @param find_peer_responses_sent find peer responses sent from this node
- * @param get_responses_sent get responses sent from this node
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure
- */
-int
-add_stat (const struct GNUNET_PeerIdentity *peer, unsigned int route_requests,
-          unsigned int route_forwards, unsigned int result_requests,
-          unsigned int client_requests, unsigned int result_forwards,
-          unsigned int gets, unsigned int puts, unsigned int data_inserts,
-          unsigned int find_peer_requests, unsigned int find_peers_started,
-          unsigned int gets_started, unsigned int puts_started,
-          unsigned int find_peer_responses_received,
-          unsigned int get_responses_received,
-          unsigned int find_peer_responses_sent,
-          unsigned int get_responses_sent)
-{
-  int ret;
-
-  if (outfile == NULL)
-    return GNUNET_SYSERR;
-
-  if (peer != NULL)
-    ret =
-        fprintf (outfile,
-                 "select nodeuid from nodes where trialuid = @temp_trial and 
nodeid = \"%s\" into @temp_node;\n",
-                 GNUNET_h2s_full (&peer->hashPubKey));
-  else
-    ret = fprintf (outfile, "set @temp_node = 0;\n");
-  if (ret < 0)
-    return GNUNET_SYSERR;
-
-  ret =
-      fprintf (outfile,
-               "set @r_r = %u, @r_f = %u, @res_r = %u, @c_r = %u, "
-               "@res_f = %u, @gets = %u, @puts = %u, @d_i = %u, "
-               "@f_p_r = %u, @f_p_s = %u, @g_s = %u, @p_s = %u, "
-               "@f_p_r_r = %u, @g_r_r = %u, @f_p_r_s = %u, @g_r_s = %u;\n",
-               route_requests, route_forwards, result_requests, 
client_requests,
-               result_forwards, gets, puts, data_inserts, find_peer_requests,
-               find_peers_started, gets_started, puts_started,
-               find_peer_responses_received, get_responses_received,
-               find_peer_responses_sent, get_responses_sent);
-
-  if (ret < 0)
-    return GNUNET_SYSERR;
-
-  ret =
-      fprintf (outfile,
-               "execute insert_stat using "
-               "@temp_trial, @temp_node, @r_r, @r_f, @res_r, @c_r, "
-               "@res_f, @gets, @puts, @d_i, " "@f_p_r, @f_p_s, @g_s, @p_s, "
-               "@f_p_r_r, @g_r_r, @f_p_r_s, @g_r_s;\n");
-  if (ret < 0)
-    return GNUNET_SYSERR;
-  return GNUNET_OK;
-}
-
-/*
- * Inserts the specified dhtkey into the dhttests.dhtkeys table,
- * stores return value of dhttests.dhtkeys.dhtkeyuid into dhtkeyuid
- *
- * @param dhtkeyuid return value
- * @param dhtkey hashcode of key to insert
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure
- */
-int
-add_dhtkey (unsigned long long *dhtkeyuid, const GNUNET_HashCode * dhtkey)
-{
-  int ret;
-
-  if (dhtkeyuid != NULL)
-    *dhtkeyuid = 0;
-
-  if (outfile == NULL)
-    return GNUNET_SYSERR;
-
-  if (dhtkey != NULL)
-    ret =
-        fprintf (outfile, "set @dhtkey = \"%s\";\n", GNUNET_h2s_full (dhtkey));
-  else
-    ret = fprintf (outfile, "set @dhtkey = XXXXX;\n");
-
-  if (ret < 0)
-    return GNUNET_SYSERR;
-  ret = fprintf (outfile, "execute insert_dhtkey using @dhtkey;\n");
-
-  if (ret >= 0)
-    return GNUNET_OK;
-  return GNUNET_SYSERR;
-}
-
-/*
- * Inserts the specified node into the dhttests.nodes table
- *
- * @param nodeuid the inserted node uid
- * @param node the node to insert
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure
- */
-int
-add_node (unsigned long long *nodeuid, struct GNUNET_PeerIdentity *node)
-{
-  int ret;
-
-  if (node == NULL)
-    return GNUNET_SYSERR;
-
-  if (outfile == NULL)
-    return GNUNET_SYSERR;
-
-  ret =
-      fprintf (outfile, "set @node = \"%s\";\n",
-               GNUNET_h2s_full (&node->hashPubKey));
-
-  if (ret < 0)
-    return GNUNET_SYSERR;
-
-  ret = fprintf (outfile, "execute insert_node using @node;\n");
-
-  if (ret >= 0)
-    return GNUNET_OK;
-  return GNUNET_SYSERR;
-}
-
-/*
- * Update dhttests.trials table with current server time as end time
- *
- * @param gets_succeeded how many gets did the testcase report as successful
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure.
- */
-int
-update_trials (unsigned int gets_succeeded)
-{
-  int ret;
-
-  if (outfile == NULL)
-    return GNUNET_SYSERR;
-
-  ret =
-      fprintf (outfile, "set @date = \"%s\", @g_s = %u;\n", get_sql_time (),
-               gets_succeeded);
-
-  if (ret < 0)
-    return GNUNET_SYSERR;
-
-  ret = fprintf (outfile, "execute update_trial using @date, @g_s;\n");
-
-  if (ret >= 0)
-    return GNUNET_OK;
-  else
-    return GNUNET_SYSERR;
-}
-
-
-/*
- * Update dhttests.nodes table setting the identified
- * node as a malicious dropper.
- *
- * @param peer the peer that was set to be malicious
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure.
- */
-int
-set_malicious (struct GNUNET_PeerIdentity *peer)
-{
-  int ret;
-
-  if (outfile == NULL)
-    return GNUNET_SYSERR;
-
-  ret =
-      fprintf (outfile, "set @temp_node = \"%s\";\n",
-               GNUNET_h2s_full (&peer->hashPubKey));
-
-  if (ret < 0)
-    return GNUNET_SYSERR;
-
-  ret = fprintf (outfile, "execute set_malicious;\n");
-
-  if (ret >= 0)
-    return GNUNET_OK;
-  else
-    return GNUNET_SYSERR;
-}
-
-
-/*
- * Update dhttests.trials table with total connections information
- *
- * @param totalConnections the number of connections
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure.
- */
-int
-add_connections (unsigned int totalConnections)
-{
-  int ret;
-
-  if (outfile == NULL)
-    return GNUNET_SYSERR;
-
-  ret = fprintf (outfile, "set @conns = %u;\n", totalConnections);
-
-  if (ret < 0)
-    return GNUNET_SYSERR;
-
-  ret = fprintf (outfile, "execute update_conn using @conns;\n");
-
-  if (ret >= 0)
-    return GNUNET_OK;
-  else
-    return GNUNET_SYSERR;
-}
-
-
-/*
- * Update dhttests.topology table with total connections information
- *
- * @param totalConnections the number of connections
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure.
- */
-int
-update_topology (unsigned int connections)
-{
-  int ret;
-
-  if (outfile == NULL)
-    return GNUNET_SYSERR;
-
-  ret = fprintf (outfile, "set @temp_conns = %u;\n", connections);
-
-  if (ret < 0)
-    return GNUNET_SYSERR;
-
-  ret = fprintf (outfile, "execute update_topology using @temp_conns;\n");
-
-  if (ret >= 0)
-    return GNUNET_OK;
-  else
-    return GNUNET_SYSERR;
-}
-
-/*
- * Inserts the specified query into the dhttests.queries table
- *
- * @param sqlqueruid inserted query uid
- * @param queryid dht query id
- * @param type type of the query
- * @param hops number of hops query traveled
- * @param succeeded whether or not query was successful
- * @param node the node the query hit
- * @param key the key of the query
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure.
- */
-int
-add_query (unsigned long long *sqlqueryuid, unsigned long long queryid,
-           unsigned int type, unsigned int hops, int succeeded,
-           const struct GNUNET_PeerIdentity *node, const GNUNET_HashCode * key)
-{
-  int ret;
-
-  if (outfile == NULL)
-    return GNUNET_SYSERR;
-
-  if (sqlqueryuid != NULL)
-    *sqlqueryuid = 0;
-
-  if (key != NULL)
-    ret =
-        fprintf (outfile,
-                 "select dhtkeyuid from dhtkeys where trialuid = @temp_trial 
and dhtkey = \"%s\" into @temp_dhtkey;\n",
-                 GNUNET_h2s_full (key));
-  else
-    ret = fprintf (outfile, "set @temp_dhtkey = 0;\n");
-
-  if (ret < 0)
-    return GNUNET_SYSERR;
-
-  if (node != NULL)
-    ret =
-        fprintf (outfile,
-                 "select nodeuid from nodes where trialuid = @temp_trial and 
nodeid = \"%s\" into @temp_node;\n",
-                 GNUNET_h2s_full (&node->hashPubKey));
-  else
-    ret = fprintf (outfile, "set @temp_node = 0;\n");
-
-  if (ret < 0)
-    return GNUNET_SYSERR;
-
-  ret =
-      fprintf (outfile,
-               "set @qid = %llu, @type = %u, @hops = %u, @succ = %d, @time = 
\"%s\";\n",
-               queryid, type, hops, succeeded, get_sql_time ());
-
-  if (ret < 0)
-    return GNUNET_SYSERR;
-
-  ret =
-      fprintf (outfile,
-               "execute insert_query using @type, @hops, @temp_dhtkey, @qid, 
@succ, @temp_node, @time;\n");
-
-  if (ret >= 0)
-    return GNUNET_OK;
-  else
-    return GNUNET_SYSERR;
-}
-
-/*
- * Inserts the specified route information into the dhttests.routes table
- *
- * @param sqlqueruid inserted query uid
- * @param queryid dht query id
- * @param type type of the query
- * @param hops number of hops query traveled
- * @param succeeded whether or not query was successful
- * @param node the node the query hit
- * @param key the key of the query
- * @param from_node the node that sent the message to node
- * @param to_node next node to forward message to
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure.
- */
-int
-add_route (unsigned long long *sqlqueryuid, unsigned long long queryid,
-           unsigned int type, unsigned int hops, int succeeded,
-           const struct GNUNET_PeerIdentity *node, const GNUNET_HashCode * key,
-           const struct GNUNET_PeerIdentity *from_node,
-           const struct GNUNET_PeerIdentity *to_node)
-{
-  int ret;
-
-  if (outfile == NULL)
-    return GNUNET_SYSERR;
-
-  if (sqlqueryuid != NULL)
-    *sqlqueryuid = 0;
-
-  if (key != NULL)
-    ret =
-        fprintf (outfile,
-                 "select dhtkeyuid from dhtkeys where trialuid = @temp_trial 
and dhtkey = \"%s\" into @temp_dhtkey;\n",
-                 GNUNET_h2s_full (key));
-  else
-    ret = fprintf (outfile, "set @temp_dhtkey = 0;\n");
-
-  if (ret < 0)
-    return GNUNET_SYSERR;
-
-  if (node != NULL)
-    ret =
-        fprintf (outfile,
-                 "select nodeuid from nodes where trialuid = @temp_trial and 
nodeid = \"%s\" into @temp_node;\n",
-                 GNUNET_h2s_full (&node->hashPubKey));
-  else
-    ret = fprintf (outfile, "set @temp_node = 0;\n");
-
-  if (ret < 0)
-    return GNUNET_SYSERR;
-
-  if (from_node != NULL)
-    ret =
-        fprintf (outfile,
-                 "select nodeuid from nodes where trialuid = @temp_trial and 
nodeid = \"%s\" into @temp_from_node;\n",
-                 GNUNET_h2s_full (&from_node->hashPubKey));
-  else
-    ret = fprintf (outfile, "set @temp_from_node = 0;\n");
-
-  if (ret < 0)
-    return GNUNET_SYSERR;
-
-  if (to_node != NULL)
-    ret =
-        fprintf (outfile,
-                 "select nodeuid from nodes where trialuid = @temp_trial and 
nodeid = \"%s\" into @temp_to_node;\n",
-                 GNUNET_h2s_full (&to_node->hashPubKey));
-  else
-    ret = fprintf (outfile, "set @temp_to_node = 0;\n");
-
-  if (ret < 0)
-    return GNUNET_SYSERR;
-
-  ret =
-      fprintf (outfile,
-               "set @qid = %llu, @type = %u, @hops = %u, @succ = %d;\n",
-               queryid, type, hops, succeeded);
-
-  if (ret < 0)
-    return GNUNET_SYSERR;
-
-  ret =
-      fprintf (outfile,
-               "execute insert_route using @type, @hops, @temp_dhtkey, @qid, 
@succ, @temp_node, @temp_from_node, @temp_to_node;\n");
-
-  if (ret >= 0)
-    return GNUNET_OK;
-  else
-    return GNUNET_SYSERR;
-}
-
-/*
- * Provides the dhtlog api
- *
- * @param c the configuration to use to connect to a server
- *
- * @return the handle to the server, or NULL on error
- */
-void *
-libgnunet_plugin_dhtlog_mysql_dump_init (void *cls)
-{
-  struct GNUNET_DHTLOG_Plugin *plugin = cls;
-  char *outfile_name;
-  char *outfile_path;
-  char *fn;
-  int dirwarn;
-
-  cfg = plugin->cfg;
-  max_varchar_len = 255;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "MySQL (DUMP) DHT Logger: initializing\n");
-
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (plugin->cfg, "MYSQLDUMP", "PATH",
-                                             &outfile_path))
-  {
-    outfile_path = GNUNET_strdup ("");
-  }
-
-  GNUNET_asprintf (&outfile_name, "%s%s-%d", outfile_path, "mysqldump",
-                   getpid ());
-
-  fn = GNUNET_STRINGS_filename_expand (outfile_name);
-
-  if (fn == NULL)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                _("Failed to get full path for `%s'\n"), outfile_name);
-    GNUNET_free (outfile_path);
-    GNUNET_free (outfile_name);
-    return NULL;
-  }
-
-  dirwarn = (GNUNET_OK != GNUNET_DISK_directory_create_for_file (fn));
-  outfile = FOPEN (fn, "w");
-
-  if (outfile == NULL)
-  {
-    GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "fopen", fn);
-    if (dirwarn)
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  _("Failed to create or access directory for log file 
`%s'\n"),
-                  fn);
-    GNUNET_free (outfile_path);
-    GNUNET_free (outfile_name);
-    GNUNET_free (fn);
-    return NULL;
-  }
-
-  GNUNET_free (outfile_path);
-  GNUNET_free (outfile_name);
-  GNUNET_free (fn);
-
-  if (iopen () != GNUNET_OK)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                _("Failed to create file for dhtlog.\n"));
-    fclose (outfile);
-    return NULL;
-  }
-  GNUNET_assert (plugin->dhtlog_api == NULL);
-  plugin->dhtlog_api = GNUNET_malloc (sizeof (struct GNUNET_DHTLOG_Handle));
-  plugin->dhtlog_api->insert_trial = &add_trial;
-  plugin->dhtlog_api->insert_round = &add_round;
-  plugin->dhtlog_api->insert_round_details = &add_round_details;
-  plugin->dhtlog_api->insert_stat = &add_stat;
-  plugin->dhtlog_api->insert_query = &add_query;
-  plugin->dhtlog_api->update_trial = &update_trials;
-  plugin->dhtlog_api->insert_route = &add_route;
-  plugin->dhtlog_api->insert_node = &add_node;
-  plugin->dhtlog_api->insert_dhtkey = &add_dhtkey;
-  plugin->dhtlog_api->update_connections = &add_connections;
-  plugin->dhtlog_api->insert_topology = &add_topology;
-  plugin->dhtlog_api->insert_extended_topology = &add_extended_topology;
-  plugin->dhtlog_api->update_topology = &update_topology;
-  plugin->dhtlog_api->set_malicious = &set_malicious;
-  plugin->dhtlog_api->add_generic_stat = &add_generic_stat;
-
-  return plugin;
-}
-
-/**
- * Shutdown the plugin.
- */
-void *
-libgnunet_plugin_dhtlog_mysql_dump_done (void *cls)
-{
-  struct GNUNET_DHTLOG_Handle *dhtlog_api = cls;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MySQL DHT Logger: database 
shutdown\n");
-  GNUNET_assert (dhtlog_api != NULL);
-
-  GNUNET_free (dhtlog_api);
-  return NULL;
-}
-
-/* end of plugin_dhtlog_mysql.c */




reply via email to

[Prev in Thread] Current Thread [Next in Thread]